From 56ae2403401402cad2f4b703709ed424dbe9d423 Mon Sep 17 00:00:00 2001
From: Maxim Filonov <53992153+sl1depengwyn@users.noreply.github.com>
Date: Fri, 19 May 2023 14:04:04 +0300
Subject: [PATCH 001/909] Add polygon edge support

---
 CHANGELOG.md                                  |   1 +
 .../lib/ethereum_jsonrpc/geth.ex              |  30 +-
 .../ethereum_jsonrpc/geth/polygon_tracer.ex   | 355 ++++++++++++++++++
 .../lib/ethereum_jsonrpc/geth/tracer.ex       |   2 +-
 apps/indexer/lib/indexer/block/fetcher.ex     |   3 +-
 .../lib/indexer/block/realtime/fetcher.ex     |   2 +-
 .../indexer/fetcher/internal_transaction.ex   |   2 +-
 7 files changed, 384 insertions(+), 11 deletions(-)
 create mode 100644 apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/geth/polygon_tracer.ex

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 24d5ab771455..c6234368b2c9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,7 @@
 ## Current
 
 ### Features
+- [#7513](https://github.com/blockscout/blockscout/pull/7513) - Add Polygon Edge support
 
 ### Fixes
 
diff --git a/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/geth.ex b/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/geth.ex
index e280ae5f9c33..a12434ea959e 100644
--- a/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/geth.ex
+++ b/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/geth.ex
@@ -8,7 +8,7 @@ defmodule EthereumJSONRPC.Geth do
   import EthereumJSONRPC, only: [id_to_params: 1, integer_to_quantity: 1, json_rpc: 2, request: 1]
 
   alias EthereumJSONRPC.{FetchedBalance, FetchedCode, PendingTransaction, Utility.CommonHelper}
-  alias EthereumJSONRPC.Geth.{Calls, Tracer}
+  alias EthereumJSONRPC.Geth.{Calls, PolygonTracer, Tracer}
 
   @behaviour EthereumJSONRPC.Variant
 
@@ -94,14 +94,25 @@ defmodule EthereumJSONRPC.Geth do
 
     tracer =
       case Application.get_env(:ethereum_jsonrpc, __MODULE__)[:tracer] do
-        "js" -> @tracer
-        "call_tracer" -> "callTracer"
+        "js" ->
+          %{"tracer" => @tracer}
+
+        "call_tracer" ->
+          %{"tracer" => "callTracer"}
+
+        _ ->
+          %{
+            "enableMemory" => true,
+            "disableStack" => false,
+            "disableStorage" => true,
+            "enableReturnData" => false
+          }
       end
 
     request(%{
       id: id,
       method: "debug_traceTransaction",
-      params: [hash_data, %{tracer: tracer, timeout: debug_trace_transaction_timeout}]
+      params: [hash_data, %{timeout: debug_trace_transaction_timeout} |> Map.merge(tracer)]
     })
   end
 
@@ -126,10 +137,15 @@ defmodule EthereumJSONRPC.Geth do
       receipts_map = Enum.into(receipts, %{}, fn %{id: id, result: receipt} -> {id, receipt} end)
       txs_map = Enum.into(txs, %{}, fn %{id: id, result: tx} -> {id, tx} end)
 
+      tracer =
+        if Application.get_env(:ethereum_jsonrpc, __MODULE__)[:tracer] == "polygon_edge",
+          do: PolygonTracer,
+          else: Tracer
+
       responses
       |> Enum.map(fn %{id: id, result: %{"structLogs" => _} = result} ->
         debug_trace_transaction_response_to_internal_transactions_params(
-          %{id: id, result: Tracer.replay(result, Map.fetch!(receipts_map, id), Map.fetch!(txs_map, id))},
+          %{id: id, result: tracer.replay(result, Map.fetch!(receipts_map, id), Map.fetch!(txs_map, id))},
           id_to_params
         )
       end)
@@ -158,7 +174,7 @@ defmodule EthereumJSONRPC.Geth do
              {id, %{created_contract_address_hash: address, block_number: block_number}} ->
                FetchedCode.request(%{id: id, block_quantity: integer_to_quantity(block_number), address: address})
 
-             {id, %{type: "selfdestruct", from: hash_data, block_number: block_number}} ->
+             {id, %{type: "selfdestruct", from_address_hash: hash_data, block_number: block_number}} ->
                FetchedBalance.request(%{id: id, block_quantity: integer_to_quantity(block_number), hash_data: hash_data})
 
              _ ->
@@ -244,7 +260,7 @@ defmodule EthereumJSONRPC.Geth do
   def prepare_calls(calls) do
     case Application.get_env(:ethereum_jsonrpc, __MODULE__)[:tracer] do
       "call_tracer" -> {calls, 0} |> parse_call_tracer_calls([], [], false) |> Enum.reverse()
-      "js" -> calls
+      _ -> calls
     end
   end
 
diff --git a/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/geth/polygon_tracer.ex b/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/geth/polygon_tracer.ex
new file mode 100644
index 000000000000..ce08951bc7f4
--- /dev/null
+++ b/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/geth/polygon_tracer.ex
@@ -0,0 +1,355 @@
+defmodule EthereumJSONRPC.Geth.PolygonTracer do
+  @moduledoc """
+  Elixir implementation of a custom tracer (`priv/js/ethereum_jsonrpc/geth/debug_traceTransaction/tracer.js`)
+  for Polygon edge nodes that don't support specifying tracer in [debug_traceTransaction](https://geth.ethereum.org/docs/interacting-with-geth/rpc/ns-debug#debugtracetransaction) calls.
+  """
+
+  import EthereumJSONRPC, only: [integer_to_quantity: 1, quantity_to_integer: 1]
+
+  @burn_address "0x0000000000000000000000000000000000000000"
+
+  def replay(
+        %{"structLogs" => logs, "gas" => top_call_gas, "returnValue" => return_value} = result,
+        %{"contractAddress" => contract_address},
+        %{"from" => from, "to" => to, "value" => value, "input" => input}
+      )
+      when is_list(logs) do
+    top =
+      to
+      |> if do
+        %{
+          "type" => "call",
+          "callType" => "call",
+          "to" => to,
+          "input" => input,
+          "output" => Map.get(result, "return", "0x" <> Map.get(result, "returnValue", ""))
+        }
+      else
+        %{
+          "type" => "create",
+          "init" => input,
+          "createdContractAddressHash" => contract_address,
+          "createdContractCode" => "0x" <> return_value
+        }
+      end
+      |> Map.merge(%{
+        "from" => from,
+        "traceAddress" => [],
+        "value" => value,
+        "gas" => 0,
+        "gasUsed" => 0
+      })
+
+    ctx = %{
+      depth: 1,
+      stack: [top],
+      trace_address: [0],
+      calls: [[]],
+      descended: false
+    }
+
+    logs
+    |> Enum.reduce(ctx, &step/2)
+    |> finalize(top_call_gas)
+  end
+
+  defp step(%{"error" => _}, %{stack: [%{"error" => _} | _]} = ctx), do: ctx
+
+  defp step(
+         %{"error" => _} = log,
+         %{
+           depth: stack_depth,
+           stack: [call | stack],
+           trace_address: [_, trace_index | trace_address],
+           calls: [subsubcalls, subcalls | calls]
+         } = ctx
+       ) do
+    call = process_return(log, Map.put(call, "error", "error"))
+
+    subsubcalls =
+      subsubcalls
+      |> Stream.map(fn
+        subcalls when is_list(subcalls) -> subcalls
+        subcall when is_map(subcall) -> %{subcall | "from" => call["createdContractAddressHash"] || call["to"]}
+      end)
+      |> Enum.reverse()
+
+    %{
+      ctx
+      | depth: stack_depth - 1,
+        stack: stack,
+        trace_address: [trace_index + 1 | trace_address],
+        calls: [[subsubcalls, call | subcalls] | calls]
+    }
+  end
+
+  defp step(
+         %{"gas" => log_gas} = log,
+         %{
+           stack: [%{"gas" => call_gas} = call | stack],
+           descended: true
+         } = ctx
+       ) do
+    gas = max(call_gas, log_gas)
+    call = %{call | "gas" => gas}
+    step(log, %{ctx | stack: [call | stack], descended: false})
+  end
+
+  defp step(
+         %{"depth" => log_depth} = log,
+         %{
+           depth: stack_depth,
+           stack: [call | stack],
+           trace_address: [_, trace_index | trace_address],
+           calls: [subsubcalls, subcalls | calls]
+         } = ctx
+       )
+       when log_depth == stack_depth - 1 do
+    call = process_return(log, call)
+
+    subsubcalls =
+      subsubcalls
+      |> Stream.map(fn
+        subcalls when is_list(subcalls) -> subcalls
+        subcall when is_map(subcall) -> %{subcall | "from" => call["createdContractAddressHash"] || call["to"]}
+      end)
+      |> Enum.reverse()
+
+    step(log, %{
+      ctx
+      | depth: stack_depth - 1,
+        stack: stack,
+        trace_address: [trace_index + 1 | trace_address],
+        calls: [[subsubcalls, call | subcalls] | calls]
+    })
+  end
+
+  defp step(%{"gas" => log_gas, "gasCost" => log_gas_cost} = log, %{stack: [%{"gas" => call_gas} = call | stack]} = ctx) do
+    gas = max(call_gas, log_gas)
+    op(log, %{ctx | stack: [%{call | "gas" => gas, "gasUsed" => gas - log_gas - log_gas_cost} | stack]})
+  end
+
+  defp op(%{"op" => "CREATE"} = log, ctx), do: create_op(log, ctx)
+  defp op(%{"op" => "CREATE2"} = log, ctx), do: create_op(log, ctx, "create2")
+  defp op(%{"op" => "SELFDESTRUCT"} = log, ctx), do: self_destruct_op(log, ctx)
+  defp op(%{"op" => "CALL"} = log, ctx), do: call_op(log, "call", ctx)
+  defp op(%{"op" => "CALLCODE"} = log, ctx), do: call_op(log, "callcode", ctx)
+  defp op(%{"op" => "DELEGATECALL"} = log, ctx), do: call_op(log, "delegatecall", ctx)
+  defp op(%{"op" => "STATICCALL"} = log, ctx), do: call_op(log, "staticcall", ctx)
+  defp op(%{"op" => "REVERT"}, ctx), do: revert_op(ctx)
+  defp op(_, ctx), do: ctx
+
+  defp process_return(
+         %{"stack" => log_stack},
+         %{"type" => create} = call
+       )
+       when create in ~w(create create2) do
+    [ret | _] = Enum.reverse(log_stack)
+
+    ret
+    |> quantity_to_integer()
+    |> case do
+      0 ->
+        Map.put(call, "error", call["error"] || "internal failure")
+
+      _ ->
+        %{call | "createdContractAddressHash" => ret}
+    end
+  end
+
+  defp process_return(
+         %{"stack" => log_stack, "memory" => log_memory},
+         %{"outputOffset" => out_off, "outputLength" => out_len} = call
+       ) do
+    [ret | _] = Enum.reverse(log_stack)
+
+    ret
+    |> quantity_to_integer()
+    |> case do
+      0 ->
+        Map.put(call, "error", call["error"] || "internal failure")
+
+      _ ->
+        output =
+          log_memory
+          |> IO.iodata_to_binary()
+          |> String.slice(out_off, out_len)
+
+        %{call | "output" => "0x" <> output}
+    end
+    |> Map.drop(["outputOffset", "outputLength"])
+  end
+
+  defp process_return(_log, call) do
+    call
+  end
+
+  defp create_op(
+         %{"stack" => log_stack, "memory" => log_memory},
+         %{depth: stack_depth, stack: stack, trace_address: trace_address, calls: calls} = ctx,
+         type \\ "create"
+       ) do
+    [value, input_length | _] = Enum.reverse(log_stack)
+
+    init =
+      log_memory
+      |> IO.iodata_to_binary()
+      |> String.slice(0, quantity_to_integer(input_length) * 2)
+
+    call = %{
+      "type" => type,
+      "from" => nil,
+      "traceAddress" => Enum.reverse(trace_address),
+      "init" => "0x" <> init,
+      "gas" => 0,
+      "gasUsed" => 0,
+      "value" => value,
+      "createdContractAddressHash" => nil,
+      "createdContractCode" => "0x"
+    }
+
+    %{
+      ctx
+      | depth: stack_depth + 1,
+        stack: [call | stack],
+        trace_address: [0 | trace_address],
+        calls: [[] | calls],
+        descended: true
+    }
+  end
+
+  defp self_destruct_op(
+         %{"stack" => log_stack, "gas" => log_gas, "gasCost" => log_gas_cost},
+         %{trace_address: [trace_index | trace_address], calls: [subcalls | calls]} = ctx
+       ) do
+    [to | _] = Enum.reverse(log_stack)
+
+    if quantity_to_integer(to) in 1..8 do
+      ctx
+    else
+      call = %{
+        "type" => "selfdestruct",
+        "from" => nil,
+        "to" => to,
+        "traceAddress" => Enum.reverse([trace_index | trace_address]),
+        "gas" => log_gas,
+        "gasUsed" => log_gas_cost,
+        "value" => "0x0"
+      }
+
+      %{ctx | trace_address: [trace_index + 1 | trace_address], calls: [[call | subcalls] | calls]}
+    end
+  end
+
+  defp call_op(
+         %{"stack" => call_stack},
+         call_type,
+         %{
+           depth: stack_depth,
+           stack: stack,
+           trace_address: trace_address,
+           calls: calls
+         } = ctx
+       )
+       when length(call_stack) < 3 do
+    call = %{
+      "type" => "call",
+      "callType" => call_type,
+      "from" => nil,
+      "to" => @burn_address,
+      "traceAddress" => Enum.reverse(trace_address),
+      "input" => "0x",
+      "output" => "0x",
+      "outputOffset" => 0,
+      "outputLength" => 0,
+      "gas" => 0,
+      "gasUsed" => 0,
+      "value" => "0x0"
+    }
+
+    %{
+      ctx
+      | depth: stack_depth + 1,
+        stack: [call | stack],
+        trace_address: [0 | trace_address],
+        calls: [[] | calls],
+        descended: true
+    }
+  end
+
+  defp call_op(
+         %{"stack" => log_stack, "memory" => log_memory},
+         call_type,
+         %{
+           depth: stack_depth,
+           stack: [%{"value" => parent_value} = parent | stack],
+           trace_address: trace_address,
+           calls: calls
+         } = ctx
+       ) do
+    log_stack = Enum.reverse(log_stack)
+
+    {value, [input_length, output_length | _]} =
+      case call_type do
+        "delegatecall" ->
+          {parent_value, log_stack}
+
+        "staticcall" ->
+          {"0x0", log_stack}
+
+        _ ->
+          [value | rest] = log_stack
+          {value, rest}
+      end
+
+    input =
+      log_memory
+      |> IO.iodata_to_binary()
+      |> String.slice(0, quantity_to_integer(input_length) * 2)
+
+    call = %{
+      "type" => "call",
+      "callType" => call_type,
+      "from" => nil,
+      "to" => @burn_address,
+      "traceAddress" => Enum.reverse(trace_address),
+      "input" => "0x" <> input,
+      "output" => "0x",
+      "outputOffset" => quantity_to_integer(input_length) * 2,
+      "outputLength" => quantity_to_integer(output_length) * 2,
+      "gas" => 0,
+      "gasUsed" => 0,
+      "value" => value
+    }
+
+    %{
+      ctx
+      | depth: stack_depth + 1,
+        stack: [call, parent | stack],
+        trace_address: [0 | trace_address],
+        calls: [[] | calls],
+        descended: true
+    }
+  end
+
+  defp revert_op(%{stack: [last | stack]} = ctx) do
+    %{ctx | stack: [Map.put(last, "error", "execution reverted") | stack]}
+  end
+
+  defp finalize(%{stack: [top], calls: [calls]}, top_call_gas) do
+    calls =
+      Enum.map(calls, fn
+        subcalls when is_list(subcalls) ->
+          subcalls
+
+        subcall when is_map(subcall) ->
+          %{subcall | "from" => top["createdContractAddressHash"] || top["to"]}
+      end)
+
+    [%{top | "gasUsed" => top_call_gas} | Enum.reverse(calls)]
+    |> List.flatten()
+    |> Enum.map(fn %{"gas" => gas, "gasUsed" => gas_used} = call ->
+      %{call | "gas" => integer_to_quantity(gas), "gasUsed" => gas_used |> max(0) |> integer_to_quantity()}
+    end)
+  end
+end
diff --git a/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/geth/tracer.ex b/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/geth/tracer.ex
index 8ccf42730caf..92aa18fc3d4c 100644
--- a/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/geth/tracer.ex
+++ b/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/geth/tracer.ex
@@ -311,7 +311,7 @@ defmodule EthereumJSONRPC.Geth.Tracer do
     [%{top | "gasUsed" => top_call_gas} | Enum.reverse(calls)]
     |> List.flatten()
     |> Enum.map(fn %{"gas" => gas, "gasUsed" => gas_used} = call ->
-      %{call | "gas" => integer_to_quantity(gas), "gasUsed" => gas_used |> max(0) |> integer_to_quantity()}
+      %{call | "gas" => integer_to_quantity(gas), "gasUsed" => integer_to_quantity(gas_used)}
     end)
   end
 end
diff --git a/apps/indexer/lib/indexer/block/fetcher.ex b/apps/indexer/lib/indexer/block/fetcher.ex
index 27d5c079e8a1..7f5758fbbe40 100644
--- a/apps/indexer/lib/indexer/block/fetcher.ex
+++ b/apps/indexer/lib/indexer/block/fetcher.ex
@@ -558,6 +558,7 @@ defmodule Indexer.Block.Fetcher do
            hash: hash
          } = address_params
        ) do
-    {{hash, fetched_coin_balance_block_number}, Map.delete(address_params, :fetched_coin_balance_block_number)}
+    {{String.downcase(hash), fetched_coin_balance_block_number},
+     Map.delete(address_params, :fetched_coin_balance_block_number)}
   end
 end
diff --git a/apps/indexer/lib/indexer/block/realtime/fetcher.ex b/apps/indexer/lib/indexer/block/realtime/fetcher.ex
index 3a1571a6e50c..a179718883bc 100644
--- a/apps/indexer/lib/indexer/block/realtime/fetcher.ex
+++ b/apps/indexer/lib/indexer/block/realtime/fetcher.ex
@@ -485,7 +485,7 @@ defmodule Indexer.Block.Realtime.Fetcher do
             block_number
 
           _ ->
-            Map.fetch!(address_hash_to_block_number, address_hash)
+            Map.fetch!(address_hash_to_block_number, String.downcase(address_hash))
         end
 
       %{hash_data: address_hash, block_quantity: integer_to_quantity(block_number)}
diff --git a/apps/indexer/lib/indexer/fetcher/internal_transaction.ex b/apps/indexer/lib/indexer/fetcher/internal_transaction.ex
index 1f249da9f1e2..fcb7843269e8 100644
--- a/apps/indexer/lib/indexer/fetcher/internal_transaction.ex
+++ b/apps/indexer/lib/indexer/fetcher/internal_transaction.ex
@@ -220,7 +220,7 @@ defmodule Indexer.Fetcher.InternalTransaction do
 
     address_hash_to_block_number =
       Enum.into(addresses_params, %{}, fn %{fetched_coin_balance_block_number: block_number, hash: hash} ->
-        {hash, block_number}
+        {String.downcase(hash), block_number}
       end)
 
     empty_block_numbers =

From 83e67a6361c7253f60ff42996ef0bf2beb3140fe Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 23 May 2023 19:11:47 +0000
Subject: [PATCH 002/909] Bump cldr_utils from 2.23.1 to 2.24.0

Bumps [cldr_utils](https://github.com/elixir-cldr/cldr_utils) from 2.23.1 to 2.24.0.
- [Release notes](https://github.com/elixir-cldr/cldr_utils/releases)
- [Changelog](https://github.com/elixir-cldr/cldr_utils/blob/master/CHANGELOG.md)
- [Commits](https://github.com/elixir-cldr/cldr_utils/compare/v2.23.1...v2.24.0)

---
updated-dependencies:
- dependency-name: cldr_utils
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 mix.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mix.lock b/mix.lock
index acd1b4d9a85d..77842df8d101 100644
--- a/mix.lock
+++ b/mix.lock
@@ -15,7 +15,7 @@
   "castore": {:hex, :castore, "1.0.2", "0c6292ecf3e3f20b7c88408f00096337c4bfd99bd46cc2fe63413ddbe45b3573", [:mix], [], "hexpm", "40b2dd2836199203df8500e4a270f10fc006cc95adc8a319e148dc3077391d96"},
   "cbor": {:hex, :cbor, "1.0.1", "39511158e8ea5a57c1fcb9639aaa7efde67129678fee49ebbda780f6f24959b0", [:mix], [], "hexpm", "5431acbe7a7908f17f6a9cd43311002836a34a8ab01876918d8cfb709cd8b6a2"},
   "certifi": {:hex, :certifi, "2.9.0", "6f2a475689dd47f19fb74334859d460a2dc4e3252a3324bd2111b8f0429e7e21", [:rebar3], [], "hexpm", "266da46bdb06d6c6d35fde799bcb28d36d985d424ad7c08b5bb48f5b5cdd4641"},
-  "cldr_utils": {:hex, :cldr_utils, "2.23.1", "5c7df90f10b2ffe2519124f3c0cba1bfc0a303d91c34c2e130e86c4f7bf1840c", [:mix], [{:castore, "~> 0.1 or ~> 1.0", [hex: :castore, repo: "hexpm", optional: true]}, {:certifi, "~> 2.5", [hex: :certifi, repo: "hexpm", optional: true]}, {:decimal, "~> 1.9 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: false]}], "hexpm", "42242882f76499fc28e59c80da8b832904cbe68ea50eeb42e65350b0dae7640c"},
+  "cldr_utils": {:hex, :cldr_utils, "2.24.0", "5b356769f2baf9dd25b166e9f1b2a5ce955d5b556bc07f56c959cfff1ec9543e", [:mix], [{:castore, "~> 0.1 or ~> 1.0", [hex: :castore, repo: "hexpm", optional: true]}, {:certifi, "~> 2.5", [hex: :certifi, repo: "hexpm", optional: true]}, {:decimal, "~> 1.9 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: false]}], "hexpm", "3fde251e0bbbe473230561019dd6c2958d82a10c134bb5b8b4e21a694196cf85"},
   "cloak": {:hex, :cloak, "1.1.2", "7e0006c2b0b98d976d4f559080fabefd81f0e0a50a3c4b621f85ceeb563e80bb", [:mix], [{:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}], "hexpm", "940d5ac4fcd51b252930fd112e319ea5ae6ab540b722f3ca60a85666759b9585"},
   "cloak_ecto": {:hex, :cloak_ecto, "1.2.0", "e86a3df3bf0dc8980f70406bcb0af2858bac247d55494d40bc58a152590bd402", [:mix], [{:cloak, "~> 1.1.1", [hex: :cloak, repo: "hexpm", optional: false]}, {:ecto, "~> 3.0", [hex: :ecto, repo: "hexpm", optional: false]}], "hexpm", "8bcc677185c813fe64b786618bd6689b1707b35cd95acaae0834557b15a0c62f"},
   "coerce": {:hex, :coerce, "1.0.1", "211c27386315dc2894ac11bc1f413a0e38505d808153367bd5c6e75a4003d096", [:mix], [], "hexpm", "b44a691700f7a1a15b4b7e2ff1fa30bebd669929ac8aa43cffe9e2f8bf051cf1"},

From 4096336d4ba0861f5e02129866f76c838f99da38 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 23 May 2023 19:12:18 +0000
Subject: [PATCH 003/909] Bump ex_cldr_units from 3.16.0 to 3.16.1

Bumps [ex_cldr_units](https://github.com/elixir-cldr/cldr_units) from 3.16.0 to 3.16.1.
- [Release notes](https://github.com/elixir-cldr/cldr_units/releases)
- [Changelog](https://github.com/elixir-cldr/cldr_units/blob/main/CHANGELOG.md)
- [Commits](https://github.com/elixir-cldr/cldr_units/compare/v3.16.0...v3.16.1)

---
updated-dependencies:
- dependency-name: ex_cldr_units
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 mix.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/mix.lock b/mix.lock
index acd1b4d9a85d..011321f9629e 100644
--- a/mix.lock
+++ b/mix.lock
@@ -15,7 +15,7 @@
   "castore": {:hex, :castore, "1.0.2", "0c6292ecf3e3f20b7c88408f00096337c4bfd99bd46cc2fe63413ddbe45b3573", [:mix], [], "hexpm", "40b2dd2836199203df8500e4a270f10fc006cc95adc8a319e148dc3077391d96"},
   "cbor": {:hex, :cbor, "1.0.1", "39511158e8ea5a57c1fcb9639aaa7efde67129678fee49ebbda780f6f24959b0", [:mix], [], "hexpm", "5431acbe7a7908f17f6a9cd43311002836a34a8ab01876918d8cfb709cd8b6a2"},
   "certifi": {:hex, :certifi, "2.9.0", "6f2a475689dd47f19fb74334859d460a2dc4e3252a3324bd2111b8f0429e7e21", [:rebar3], [], "hexpm", "266da46bdb06d6c6d35fde799bcb28d36d985d424ad7c08b5bb48f5b5cdd4641"},
-  "cldr_utils": {:hex, :cldr_utils, "2.23.1", "5c7df90f10b2ffe2519124f3c0cba1bfc0a303d91c34c2e130e86c4f7bf1840c", [:mix], [{:castore, "~> 0.1 or ~> 1.0", [hex: :castore, repo: "hexpm", optional: true]}, {:certifi, "~> 2.5", [hex: :certifi, repo: "hexpm", optional: true]}, {:decimal, "~> 1.9 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: false]}], "hexpm", "42242882f76499fc28e59c80da8b832904cbe68ea50eeb42e65350b0dae7640c"},
+  "cldr_utils": {:hex, :cldr_utils, "2.24.0", "5b356769f2baf9dd25b166e9f1b2a5ce955d5b556bc07f56c959cfff1ec9543e", [:mix], [{:castore, "~> 0.1 or ~> 1.0", [hex: :castore, repo: "hexpm", optional: true]}, {:certifi, "~> 2.5", [hex: :certifi, repo: "hexpm", optional: true]}, {:decimal, "~> 1.9 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: false]}], "hexpm", "3fde251e0bbbe473230561019dd6c2958d82a10c134bb5b8b4e21a694196cf85"},
   "cloak": {:hex, :cloak, "1.1.2", "7e0006c2b0b98d976d4f559080fabefd81f0e0a50a3c4b621f85ceeb563e80bb", [:mix], [{:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}], "hexpm", "940d5ac4fcd51b252930fd112e319ea5ae6ab540b722f3ca60a85666759b9585"},
   "cloak_ecto": {:hex, :cloak_ecto, "1.2.0", "e86a3df3bf0dc8980f70406bcb0af2858bac247d55494d40bc58a152590bd402", [:mix], [{:cloak, "~> 1.1.1", [hex: :cloak, repo: "hexpm", optional: false]}, {:ecto, "~> 3.0", [hex: :ecto, repo: "hexpm", optional: false]}], "hexpm", "8bcc677185c813fe64b786618bd6689b1707b35cd95acaae0834557b15a0c62f"},
   "coerce": {:hex, :coerce, "1.0.1", "211c27386315dc2894ac11bc1f413a0e38505d808153367bd5c6e75a4003d096", [:mix], [], "hexpm", "b44a691700f7a1a15b4b7e2ff1fa30bebd669929ac8aa43cffe9e2f8bf051cf1"},
@@ -36,7 +36,7 @@
   "deep_merge": {:hex, :deep_merge, "1.0.0", "b4aa1a0d1acac393bdf38b2291af38cb1d4a52806cf7a4906f718e1feb5ee961", [:mix], [], "hexpm", "ce708e5f094b9cd4e8f2be4f00d2f4250c4095be93f8cd6d018c753894885430"},
   "dialyxir": {:hex, :dialyxir, "1.3.0", "fd1672f0922b7648ff9ce7b1b26fcf0ef56dda964a459892ad15f6b4410b5284", [:mix], [{:erlex, ">= 0.2.6", [hex: :erlex, repo: "hexpm", optional: false]}], "hexpm", "00b2a4bcd6aa8db9dcb0b38c1225b7277dca9bc370b6438715667071a304696f"},
   "digital_token": {:hex, :digital_token, "0.4.0", "2ad6894d4a40be8b2890aad286ecd5745fa473fa5699d80361a8c94428edcd1f", [:mix], [{:cldr_utils, "~> 2.17", [hex: :cldr_utils, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: false]}], "hexpm", "a178edf61d1fee5bb3c34e14b0f4ee21809ee87cade8738f87337e59e5e66e26"},
-  "earmark_parser": {:hex, :earmark_parser, "1.4.31", "a93921cdc6b9b869f519213d5bc79d9e218ba768d7270d46fdcf1c01bacff9e2", [:mix], [], "hexpm", "317d367ee0335ef037a87e46c91a2269fef6306413f731e8ec11fc45a7efd059"},
+  "earmark_parser": {:hex, :earmark_parser, "1.4.32", "fa739a0ecfa34493de19426681b23f6814573faee95dfd4b4aafe15a7b5b32c6", [:mix], [], "hexpm", "b8b0dd77d60373e77a3d7e8afa598f325e49e8663a51bcc2b88ef41838cca755"},
   "ecto": {:hex, :ecto, "3.10.1", "c6757101880e90acc6125b095853176a02da8f1afe056f91f1f90b80c9389822", [:mix], [{:decimal, "~> 1.6 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}, {:telemetry, "~> 0.4 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "d2ac4255f1601bdf7ac74c0ed971102c6829dc158719b94bd30041bbad77f87a"},
   "ecto_sql": {:hex, :ecto_sql, "3.10.1", "6ea6b3036a0b0ca94c2a02613fd9f742614b5cfe494c41af2e6571bb034dd94c", [:mix], [{:db_connection, "~> 2.5 or ~> 2.4.1", [hex: :db_connection, repo: "hexpm", optional: false]}, {:ecto, "~> 3.10.0", [hex: :ecto, repo: "hexpm", optional: false]}, {:myxql, "~> 0.6.0", [hex: :myxql, repo: "hexpm", optional: true]}, {:postgrex, "~> 0.16.0 or ~> 0.17.0 or ~> 1.0", [hex: :postgrex, repo: "hexpm", optional: true]}, {:tds, "~> 2.1.1 or ~> 2.2", [hex: :tds, repo: "hexpm", optional: true]}, {:telemetry, "~> 0.4.0 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "f6a25bdbbd695f12c8171eaff0851fa4c8e72eec1e98c7364402dda9ce11c56b"},
   "elixir_make": {:hex, :elixir_make, "0.6.3", "bc07d53221216838d79e03a8019d0839786703129599e9619f4ab74c8c096eac", [:mix], [], "hexpm", "f5cbd651c5678bcaabdbb7857658ee106b12509cd976c2c2fca99688e1daf716"},
@@ -46,7 +46,7 @@
   "ex_cldr_currencies": {:hex, :ex_cldr_currencies, "2.15.0", "aadd34e91cfac7ef6b03fe8f47f8c6fa8c5daf3f89b5d9fee64ec545ded839cf", [:mix], [{:ex_cldr, "~> 2.34", [hex: :ex_cldr, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}], "hexpm", "0521316396c66877a2d636219767560bb2397c583341fcb154ecf9f3000e6ff8"},
   "ex_cldr_lists": {:hex, :ex_cldr_lists, "2.10.0", "4d4c9877da2d0417fd832907d69974e8328969f75fafc79b05ccf85f549f6281", [:mix], [{:ex_cldr_numbers, "~> 2.25", [hex: :ex_cldr_numbers, repo: "hexpm", optional: false]}, {:ex_doc, "~> 0.18", [hex: :ex_doc, repo: "hexpm", optional: true]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}], "hexpm", "adc040cde7b97f7fd7c0b35dd69ddb6fcf607303ae6355bb1851deae1f8b0652"},
   "ex_cldr_numbers": {:hex, :ex_cldr_numbers, "2.31.1", "ad3e8a33e8cb8d048173f2c89cf6fcec9f1694d99f890a75bc745894c3868d5b", [:mix], [{:decimal, "~> 1.6 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: false]}, {:digital_token, "~> 0.3 or ~> 1.0", [hex: :digital_token, repo: "hexpm", optional: false]}, {:ex_cldr, "~> 2.37", [hex: :ex_cldr, repo: "hexpm", optional: false]}, {:ex_cldr_currencies, ">= 2.14.2", [hex: :ex_cldr_currencies, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}], "hexpm", "a94c40f4bf60f0e69c34977f33caeda483677232699ab0a6a98025ea011fabcf"},
-  "ex_cldr_units": {:hex, :ex_cldr_units, "3.16.0", "90e4f89a12dc94de561a435f10cb0c2059a1f29942e41ba3352cd37cb673769c", [:mix], [{:decimal, "~> 1.6 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: false]}, {:ex_cldr_lists, "~> 2.10", [hex: :ex_cldr_lists, repo: "hexpm", optional: false]}, {:ex_cldr_numbers, "~> 2.31", [hex: :ex_cldr_numbers, repo: "hexpm", optional: false]}, {:ex_doc, "~> 0.18", [hex: :ex_doc, repo: "hexpm", optional: true]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}], "hexpm", "0546957cbb2d92a675fba91c6819a0a42b028f3193d1c4c7ad27d241e492520b"},
+  "ex_cldr_units": {:hex, :ex_cldr_units, "3.16.1", "04be7de0b59b37c83e60dbfaa63538c455ed532af6202e8a501e0ebe5f9cd55d", [:mix], [{:cldr_utils, "~> 2.24", [hex: :cldr_utils, repo: "hexpm", optional: false]}, {:decimal, "~> 1.6 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: false]}, {:ex_cldr_lists, "~> 2.10", [hex: :ex_cldr_lists, repo: "hexpm", optional: false]}, {:ex_cldr_numbers, "~> 2.31", [hex: :ex_cldr_numbers, repo: "hexpm", optional: false]}, {:ex_doc, "~> 0.18", [hex: :ex_doc, repo: "hexpm", optional: true]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}], "hexpm", "f358029e6f56ae19887e598062dade1ddd0ad03c06384ed397ca3dc3ac8b0584"},
   "ex_doc": {:hex, :ex_doc, "0.29.4", "6257ecbb20c7396b1fe5accd55b7b0d23f44b6aa18017b415cb4c2b91d997729", [:mix], [{:earmark_parser, "~> 1.4.31", [hex: :earmark_parser, repo: "hexpm", optional: false]}, {:makeup_elixir, "~> 0.14", [hex: :makeup_elixir, repo: "hexpm", optional: false]}, {:makeup_erlang, "~> 0.1", [hex: :makeup_erlang, repo: "hexpm", optional: false]}], "hexpm", "2c6699a737ae46cb61e4ed012af931b57b699643b24dabe2400a8168414bc4f5"},
   "ex_json_schema": {:hex, :ex_json_schema, "0.9.2", "c9a42e04e70cd70eb11a8903a22e8ec344df16edef4cb8e6ec84ed0caffc9f0f", [:mix], [{:decimal, "~> 2.0", [hex: :decimal, repo: "hexpm", optional: false]}], "hexpm", "4854329cb352b6c01c4c4b8dbfb3be14dc5bea19ea13e0eafade4ff22ba55224"},
   "ex_keccak": {:hex, :ex_keccak, "0.7.1", "0169f4b0c5073c5df61581d6282b12f1a1b764dcfcda4eeb1c819b5194c9ced0", [:mix], [{:rustler, ">= 0.0.0", [hex: :rustler, repo: "hexpm", optional: true]}, {:rustler_precompiled, "~> 0.6.1", [hex: :rustler_precompiled, repo: "hexpm", optional: false]}], "hexpm", "c18c19f66b6545b4b46b0c71c0cc0079de84e30b26365a92961e91697e8724ed"},

From abefd4b5bc9daa67dbb325794be40462612d6f83 Mon Sep 17 00:00:00 2001
From: Viktor Baranov <baranov.viktor.27@gmail.com>
Date: Wed, 24 May 2023 10:57:38 +0300
Subject: [PATCH 004/909] Allow hyphen in DB username

---
 CHANGELOG.md                                         |  2 ++
 apps/explorer/lib/explorer/repo/config_helper.ex     |  2 +-
 .../test/explorer/repo/config_helper_test.exs        | 12 ++++++++++++
 3 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1e005d61469a..1e1dc39a6652 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,6 +12,8 @@
 
 ### Chore
 
+- [#7543](https://github.com/blockscout/blockscout/pull/7543) - Allow hyphen in DB username
+
 <details>
   <summary>Dependencies version bumps</summary>
 
diff --git a/apps/explorer/lib/explorer/repo/config_helper.ex b/apps/explorer/lib/explorer/repo/config_helper.ex
index dd13d83a2cb4..edf73d4dbdc9 100644
--- a/apps/explorer/lib/explorer/repo/config_helper.ex
+++ b/apps/explorer/lib/explorer/repo/config_helper.ex
@@ -36,7 +36,7 @@ defmodule Explorer.Repo.ConfigHelper do
 
   # sobelow_skip ["DOS.StringToAtom"]
   defp extract_parameters(database_url) do
-    ~r/\w*:\/\/(?<username>\w+):(?<password>[a-zA-Z0-9-*#!%^&$_]*)?@(?<hostname>(([a-zA-Z0-9]|[a-zA-Z0-9][a-zA-Z0-9\-]*[a-zA-Z0-9])\.)*([A-Za-z0-9]|[A-Za-z0-9][A-Za-z0-9\-]*[A-Za-z0-9])):(?<port>\d+)\/(?<database>[a-zA-Z0-9_-]*)/
+    ~r/\w*:\/\/(?<username>[a-zA-Z0-9_-]*):(?<password>[a-zA-Z0-9-*#!%^&$_]*)?@(?<hostname>(([a-zA-Z0-9]|[a-zA-Z0-9][a-zA-Z0-9\-]*[a-zA-Z0-9])\.)*([A-Za-z0-9]|[A-Za-z0-9][A-Za-z0-9\-]*[A-Za-z0-9])):(?<port>\d+)\/(?<database>[a-zA-Z0-9_-]*)/
     |> Regex.named_captures(database_url)
     |> Keyword.new(fn {k, v} -> {String.to_atom(k), v} end)
     |> Keyword.put(:url, database_url)
diff --git a/apps/explorer/test/explorer/repo/config_helper_test.exs b/apps/explorer/test/explorer/repo/config_helper_test.exs
index 2b5a32b8dab8..06ba3a03dbc8 100644
--- a/apps/explorer/test/explorer/repo/config_helper_test.exs
+++ b/apps/explorer/test/explorer/repo/config_helper_test.exs
@@ -40,6 +40,18 @@ defmodule Explorer.Repo.ConfigHelperTest do
       assert result[:database] == "test-database"
     end
 
+    test "parse params from database url with hyphen in database user name" do
+      database_url = "postgresql://test-username:password@hostname.test.com:7777/database"
+
+      result = ConfigHelper.get_db_config(%{url: database_url, env_func: fn _ -> nil end})
+
+      assert result[:username] == "test-username"
+      assert result[:password] == "password"
+      assert result[:hostname] == "hostname.test.com"
+      assert result[:port] == "7777"
+      assert result[:database] == "database"
+    end
+
     test "parse params from database url with special characters in password" do
       database_url = "postgresql://test_username:awN!l#W*g$P%t-l^q&d@hostname.test.com:7777/test_database"
 

From a973866d1c0e0e63af4b6607704b17b9e55fe64b Mon Sep 17 00:00:00 2001
From: Qwerty5Uiop <alex000010@bk.ru>
Date: Wed, 24 May 2023 11:54:15 +0400
Subject: [PATCH 005/909] Add ERC-1155 signatures to
 uncataloged_token_transfer_block_numbers

---
 CHANGELOG.md                        | 1 +
 apps/explorer/lib/explorer/chain.ex | 5 ++++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1e005d61469a..5dba4f9d848d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,7 @@
 ### Features
 
 - [#7532](https://github.com/blockscout/blockscout/pull/7532) - Handle empty id in json rpc responses
+- [#7544](https://github.com/blockscout/blockscout/pull/7544) - Add ERC-1155 signatures to uncataloged_token_transfer_block_numbers
 
 ### Fixes
 
diff --git a/apps/explorer/lib/explorer/chain.ex b/apps/explorer/lib/explorer/chain.ex
index 64417ffdf9eb..b6ac5099561e 100644
--- a/apps/explorer/lib/explorer/chain.ex
+++ b/apps/explorer/lib/explorer/chain.ex
@@ -5093,7 +5093,10 @@ defmodule Explorer.Chain do
     query =
       from(l in Log,
         as: :log,
-        where: l.first_topic == unquote(TokenTransfer.constant()),
+        where:
+          l.first_topic == unquote(TokenTransfer.constant()) or
+            l.first_topic == unquote(TokenTransfer.erc1155_single_transfer_signature()) or
+            l.first_topic == unquote(TokenTransfer.erc1155_batch_transfer_signature()),
         where:
           not exists(
             from(tf in TokenTransfer,

From 8f35f856f46c8e5b22151a8db7409f3b3373a1ca Mon Sep 17 00:00:00 2001
From: Viktor Baranov <baranov.viktor.27@gmail.com>
Date: Wed, 24 May 2023 13:42:16 +0300
Subject: [PATCH 006/909] Check if cached exchange rate is empty before
 replacing DB value in stats API

---
 CHANGELOG.md                                              | 1 +
 .../controllers/api/v2/stats_controller.ex                | 8 +++++++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1e1dc39a6652..b59bed51984e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,7 @@
 
 ### Fixes
 
+- [#7545](https://github.com/blockscout/blockscout/pull/7545) - Check if cached exchange rate is empty before replacing DB value in stats API
 - [#7516](https://github.com/blockscout/blockscout/pull/7516) - Fix shrinking logo in Safari
 
 ### Chore
diff --git a/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/stats_controller.ex b/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/stats_controller.ex
index 20c93f33bbca..5707d1b15f54 100644
--- a/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/stats_controller.ex
+++ b/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/stats_controller.ex
@@ -99,7 +99,13 @@ defmodule BlockScoutWeb.API.V2.StatsController do
       recent_market_history
       |> case do
         [today | the_rest] ->
-          [%{today | closing_price: exchange_rate.usd_value} | the_rest]
+          [
+            %{
+              today
+              | closing_price: if(exchange_rate.usd_value, do: exchange_rate.usd_value, else: today.closing_price)
+            }
+            | the_rest
+          ]
 
         data ->
           data

From 95803917eb676425a4ceda3fcfc78172ee6e2b48 Mon Sep 17 00:00:00 2001
From: Viktor Baranov <baranov.viktor.27@gmail.com>
Date: Wed, 24 May 2023 14:48:23 +0300
Subject: [PATCH 007/909] API v2: fix today coin price

---
 CHANGELOG.md                                   |  3 ++-
 .../controllers/api/v2/stats_controller.ex     |  2 +-
 apps/explorer/lib/explorer/market/market.ex    | 18 ++++++++++++++++++
 3 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b59bed51984e..08e23cdffd52 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,7 +8,8 @@
 
 ### Fixes
 
-- [#7545](https://github.com/blockscout/blockscout/pull/7545) - Check if cached exchange rate is empty before replacing DB value in stats API
+- [](https://github.com/blockscout/blockscout/pull/7546) - API v2: fix today coin price (use in-memory or cached in DB value)
+- [#7545](https://github.com/blockscout/blockscout/pull/7545) - API v2: Check if cached exchange rate is empty before replacing DB value in stats API
 - [#7516](https://github.com/blockscout/blockscout/pull/7516) - Fix shrinking logo in Safari
 
 ### Chore
diff --git a/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/stats_controller.ex b/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/stats_controller.ex
index 5707d1b15f54..d6974c090caf 100644
--- a/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/stats_controller.ex
+++ b/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/stats_controller.ex
@@ -46,7 +46,7 @@ defmodule BlockScoutWeb.API.V2.StatsController do
         "total_addresses" => @api_true |> Chain.address_estimated_count() |> to_string(),
         "total_transactions" => TransactionCache.estimated_count() |> to_string(),
         "average_block_time" => AverageBlockTime.average_block_time() |> Duration.to_milliseconds(),
-        "coin_price" => exchange_rate.usd_value,
+        "coin_price" => exchange_rate.usd_value || Market.get_native_coin_exchange_rate_from_db(),
         "total_gas_used" => GasUsage.total() |> to_string(),
         "transactions_today" => Enum.at(transaction_stats, 0).number_of_transactions |> to_string(),
         "gas_used_today" => Enum.at(transaction_stats, 0).gas_used,
diff --git a/apps/explorer/lib/explorer/market/market.ex b/apps/explorer/lib/explorer/market/market.ex
index d2dead1d2e8b..466c6c56170f 100644
--- a/apps/explorer/lib/explorer/market/market.ex
+++ b/apps/explorer/lib/explorer/market/market.ex
@@ -25,6 +25,24 @@ defmodule Explorer.Market do
     MarketHistoryCache.fetch()
   end
 
+  @doc """
+  Retrieves today's native coin exchange rate from the database.
+  """
+  @spec get_native_coin_exchange_rate_from_db() :: Token.t() | nil
+  def get_native_coin_exchange_rate_from_db do
+    today =
+      case fetch_recent_history() do
+        [today | _the_rest] -> today
+        _ -> nil
+      end
+
+    if today do
+      Map.get(today, :closing_price)
+    else
+      nil
+    end
+  end
+
   @doc false
   def bulk_insert_history(records) do
     records_without_zeroes =

From d2a338c13f5156bfe6403bd5431d64355a7d463f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 24 May 2023 19:02:41 +0000
Subject: [PATCH 008/909] Bump webpack from 5.83.1 to 5.84.0 in
 /apps/block_scout_web/assets

Bumps [webpack](https://github.com/webpack/webpack) from 5.83.1 to 5.84.0.
- [Release notes](https://github.com/webpack/webpack/releases)
- [Commits](https://github.com/webpack/webpack/compare/v5.83.1...v5.84.0)

---
updated-dependencies:
- dependency-name: webpack
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 apps/block_scout_web/assets/package-lock.json | 66 +++++++++----------
 apps/block_scout_web/assets/package.json      |  2 +-
 2 files changed, 34 insertions(+), 34 deletions(-)

diff --git a/apps/block_scout_web/assets/package-lock.json b/apps/block_scout_web/assets/package-lock.json
index bba41766e553..cefd4ea1ed39 100644
--- a/apps/block_scout_web/assets/package-lock.json
+++ b/apps/block_scout_web/assets/package-lock.json
@@ -92,7 +92,7 @@
         "sass": "^1.62.1",
         "sass-loader": "^13.3.0",
         "style-loader": "^3.3.3",
-        "webpack": "^5.83.1",
+        "webpack": "^5.84.0",
         "webpack-cli": "^5.1.1"
       },
       "engines": {
@@ -4136,6 +4136,15 @@
         "node": ">=0.4.0"
       }
     },
+    "node_modules/acorn-import-assertions": {
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/acorn-import-assertions/-/acorn-import-assertions-1.9.0.tgz",
+      "integrity": "sha512-cmMwop9x+8KFhxvKrKfPYmN6/pKTYYHBqLa0DfvVZcKMJWNyWLnaqND7dx/qn66R7ewM1UX5XMaDVP5wlVTaVA==",
+      "dev": true,
+      "peerDependencies": {
+        "acorn": "^8"
+      }
+    },
     "node_modules/acorn-jsx": {
       "version": "5.3.2",
       "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz",
@@ -6715,9 +6724,9 @@
       }
     },
     "node_modules/enhanced-resolve": {
-      "version": "5.14.0",
-      "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.14.0.tgz",
-      "integrity": "sha512-+DCows0XNwLDcUhbFJPdlQEVnT2zXlCv7hPxemTz86/O+B/hCQ+mb7ydkPKiflpVraqLPCAfu7lDy+hBXueojw==",
+      "version": "5.14.1",
+      "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.14.1.tgz",
+      "integrity": "sha512-Vklwq2vDKtl0y/vtwjSesgJ5MYS7Etuk5txS8VdKL4AOS1aUlD96zqIfsOSLQsdv3xgMRbtkWM8eG9XDfKUPow==",
       "dev": true,
       "dependencies": {
         "graceful-fs": "^4.2.4",
@@ -16824,9 +16833,9 @@
       }
     },
     "node_modules/webpack": {
-      "version": "5.83.1",
-      "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.83.1.tgz",
-      "integrity": "sha512-TNsG9jDScbNuB+Lb/3+vYolPplCS3bbEaJf+Bj0Gw4DhP3ioAflBb1flcRt9zsWITyvOhM96wMQNRWlSX52DgA==",
+      "version": "5.84.0",
+      "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.84.0.tgz",
+      "integrity": "sha512-XezNK3kwJq6IyeoZmZ1uEqQs+42nTqIi4jYM/YjLwaJedUC1N3bwnCC0+UcnHJPfqWX0kGrQnMIvZZyWYaIZrA==",
       "dev": true,
       "dependencies": {
         "@types/eslint-scope": "^3.7.3",
@@ -16835,10 +16844,10 @@
         "@webassemblyjs/wasm-edit": "^1.11.5",
         "@webassemblyjs/wasm-parser": "^1.11.5",
         "acorn": "^8.7.1",
-        "acorn-import-assertions": "^1.7.6",
+        "acorn-import-assertions": "^1.9.0",
         "browserslist": "^4.14.5",
         "chrome-trace-event": "^1.0.2",
-        "enhanced-resolve": "^5.14.0",
+        "enhanced-resolve": "^5.14.1",
         "es-module-lexer": "^1.2.1",
         "eslint-scope": "5.1.1",
         "events": "^3.2.0",
@@ -16937,15 +16946,6 @@
         "node": ">=10.0.0"
       }
     },
-    "node_modules/webpack/node_modules/acorn-import-assertions": {
-      "version": "1.8.0",
-      "resolved": "https://registry.npmjs.org/acorn-import-assertions/-/acorn-import-assertions-1.8.0.tgz",
-      "integrity": "sha512-m7VZ3jwz4eK6A4Vtt8Ew1/mNbP24u0FhdyfA7fSvnJR6LMdfOYnmuIrrJAgrYfYJ10F/otaHTtrtrtmHdMNzEw==",
-      "dev": true,
-      "peerDependencies": {
-        "acorn": "^8"
-      }
-    },
     "node_modules/webpack/node_modules/schema-utils": {
       "version": "3.1.2",
       "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.2.tgz",
@@ -20399,6 +20399,13 @@
         }
       }
     },
+    "acorn-import-assertions": {
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/acorn-import-assertions/-/acorn-import-assertions-1.9.0.tgz",
+      "integrity": "sha512-cmMwop9x+8KFhxvKrKfPYmN6/pKTYYHBqLa0DfvVZcKMJWNyWLnaqND7dx/qn66R7ewM1UX5XMaDVP5wlVTaVA==",
+      "dev": true,
+      "requires": {}
+    },
     "acorn-jsx": {
       "version": "5.3.2",
       "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz",
@@ -22363,9 +22370,9 @@
       }
     },
     "enhanced-resolve": {
-      "version": "5.14.0",
-      "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.14.0.tgz",
-      "integrity": "sha512-+DCows0XNwLDcUhbFJPdlQEVnT2zXlCv7hPxemTz86/O+B/hCQ+mb7ydkPKiflpVraqLPCAfu7lDy+hBXueojw==",
+      "version": "5.14.1",
+      "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.14.1.tgz",
+      "integrity": "sha512-Vklwq2vDKtl0y/vtwjSesgJ5MYS7Etuk5txS8VdKL4AOS1aUlD96zqIfsOSLQsdv3xgMRbtkWM8eG9XDfKUPow==",
       "dev": true,
       "requires": {
         "graceful-fs": "^4.2.4",
@@ -30081,9 +30088,9 @@
       "dev": true
     },
     "webpack": {
-      "version": "5.83.1",
-      "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.83.1.tgz",
-      "integrity": "sha512-TNsG9jDScbNuB+Lb/3+vYolPplCS3bbEaJf+Bj0Gw4DhP3ioAflBb1flcRt9zsWITyvOhM96wMQNRWlSX52DgA==",
+      "version": "5.84.0",
+      "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.84.0.tgz",
+      "integrity": "sha512-XezNK3kwJq6IyeoZmZ1uEqQs+42nTqIi4jYM/YjLwaJedUC1N3bwnCC0+UcnHJPfqWX0kGrQnMIvZZyWYaIZrA==",
       "dev": true,
       "requires": {
         "@types/eslint-scope": "^3.7.3",
@@ -30092,10 +30099,10 @@
         "@webassemblyjs/wasm-edit": "^1.11.5",
         "@webassemblyjs/wasm-parser": "^1.11.5",
         "acorn": "^8.7.1",
-        "acorn-import-assertions": "^1.7.6",
+        "acorn-import-assertions": "^1.9.0",
         "browserslist": "^4.14.5",
         "chrome-trace-event": "^1.0.2",
-        "enhanced-resolve": "^5.14.0",
+        "enhanced-resolve": "^5.14.1",
         "es-module-lexer": "^1.2.1",
         "eslint-scope": "5.1.1",
         "events": "^3.2.0",
@@ -30112,13 +30119,6 @@
         "webpack-sources": "^3.2.3"
       },
       "dependencies": {
-        "acorn-import-assertions": {
-          "version": "1.8.0",
-          "resolved": "https://registry.npmjs.org/acorn-import-assertions/-/acorn-import-assertions-1.8.0.tgz",
-          "integrity": "sha512-m7VZ3jwz4eK6A4Vtt8Ew1/mNbP24u0FhdyfA7fSvnJR6LMdfOYnmuIrrJAgrYfYJ10F/otaHTtrtrtmHdMNzEw==",
-          "dev": true,
-          "requires": {}
-        },
         "schema-utils": {
           "version": "3.1.2",
           "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.2.tgz",
diff --git a/apps/block_scout_web/assets/package.json b/apps/block_scout_web/assets/package.json
index a668f06934d4..7b9297e836d5 100644
--- a/apps/block_scout_web/assets/package.json
+++ b/apps/block_scout_web/assets/package.json
@@ -104,7 +104,7 @@
     "sass": "^1.62.1",
     "sass-loader": "^13.3.0",
     "style-loader": "^3.3.3",
-    "webpack": "^5.83.1",
+    "webpack": "^5.84.0",
     "webpack-cli": "^5.1.1"
   },
   "jest": {

From 49a01a8a258a995b820a441c2fb26d372f7b62be Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 24 May 2023 19:05:04 +0000
Subject: [PATCH 009/909] Bump briefly from `20d1318` to `678a376`

Bumps [briefly](https://github.com/CargoSense/briefly) from `20d1318` to `678a376`.
- [Release notes](https://github.com/CargoSense/briefly/releases)
- [Commits](https://github.com/CargoSense/briefly/compare/20d1318ec22259923ebd94331c0227895f1faa70...678a3763e72a7d1f23ac71b209b96bd199bffbbb)

---
updated-dependencies:
- dependency-name: briefly
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 mix.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mix.lock b/mix.lock
index 011321f9629e..b42fef2ad0f8 100644
--- a/mix.lock
+++ b/mix.lock
@@ -8,7 +8,7 @@
   "bcrypt_elixir": {:hex, :bcrypt_elixir, "3.0.1", "9be815469e6bfefec40fa74658ecbbe6897acfb57614df1416eeccd4903f602c", [:make, :mix], [{:comeonin, "~> 5.3", [hex: :comeonin, repo: "hexpm", optional: false]}, {:elixir_make, "~> 0.6", [hex: :elixir_make, repo: "hexpm", optional: false]}], "hexpm", "486bb95efb645d1efc6794c1ddd776a186a9a713abf06f45708a6ce324fb96cf"},
   "benchee": {:hex, :benchee, "1.1.0", "f3a43817209a92a1fade36ef36b86e1052627fd8934a8b937ac9ab3a76c43062", [:mix], [{:deep_merge, "~> 1.0", [hex: :deep_merge, repo: "hexpm", optional: false]}, {:statistex, "~> 1.0", [hex: :statistex, repo: "hexpm", optional: false]}], "hexpm", "7da57d545003165a012b587077f6ba90b89210fd88074ce3c60ce239eb5e6d93"},
   "benchee_csv": {:hex, :benchee_csv, "1.0.0", "0b3b9223290bfcb8003552705bec9bcf1a89b4a83b70bd686e45295c264f3d16", [:mix], [{:benchee, ">= 0.99.0 and < 2.0.0", [hex: :benchee, repo: "hexpm", optional: false]}, {:csv, "~> 2.0", [hex: :csv, repo: "hexpm", optional: false]}], "hexpm", "cdefb804c021dcf7a99199492026584be9b5a21d6644ac0d01c81c5d97c520d5"},
-  "briefly": {:git, "https://github.com/CargoSense/briefly.git", "20d1318ec22259923ebd94331c0227895f1faa70", []},
+  "briefly": {:git, "https://github.com/CargoSense/briefly.git", "678a3763e72a7d1f23ac71b209b96bd199bffbbb", []},
   "bunt": {:hex, :bunt, "0.2.1", "e2d4792f7bc0ced7583ab54922808919518d0e57ee162901a16a1b6664ef3b14", [:mix], [], "hexpm", "a330bfb4245239787b15005e66ae6845c9cd524a288f0d141c148b02603777a5"},
   "bureaucrat": {:hex, :bureaucrat, "0.2.9", "d98e4d2b9bdbf22e4a45c2113ce8b38b5b63278506c6ff918e3b943a4355d85b", [:mix], [{:inflex, ">= 1.10.0", [hex: :inflex, repo: "hexpm", optional: false]}, {:phoenix, ">= 1.2.0", [hex: :phoenix, repo: "hexpm", optional: true]}, {:plug, ">= 1.0.0", [hex: :plug, repo: "hexpm", optional: false]}, {:poison, "~> 1.5 or ~> 2.0 or ~> 3.0 or ~> 4.0", [hex: :poison, repo: "hexpm", optional: true]}], "hexpm", "111c8dd84382a62e1026ae011d592ceee918553e5203fe8448d9ba6ccbdfff7d"},
   "bypass": {:hex, :bypass, "2.1.0", "909782781bf8e20ee86a9cabde36b259d44af8b9f38756173e8f5e2e1fabb9b1", [:mix], [{:plug, "~> 1.7", [hex: :plug, repo: "hexpm", optional: false]}, {:plug_cowboy, "~> 2.0", [hex: :plug_cowboy, repo: "hexpm", optional: false]}, {:ranch, "~> 1.3", [hex: :ranch, repo: "hexpm", optional: false]}], "hexpm", "d9b5df8fa5b7a6efa08384e9bbecfe4ce61c77d28a4282f79e02f1ef78d96b80"},

From 1184ae6a199f1535babf3f19cdf1d8a70738e904 Mon Sep 17 00:00:00 2001
From: Viktor Baranov <baranov.viktor.27@gmail.com>
Date: Thu, 25 May 2023 11:46:48 +0300
Subject: [PATCH 010/909] Update .tool-versions

---
 .tool-versions | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.tool-versions b/.tool-versions
index ac759f5a58da..c1333377682e 100644
--- a/.tool-versions
+++ b/.tool-versions
@@ -1,3 +1,3 @@
-elixir 1.14.4-otp-25
-erlang 25.3
+elixir 1.14.5-otp-26
+erlang 26.0
 nodejs 18.13.0

From d09d3fb127ab0a133f51a362cfe066bb68dc0fb6 Mon Sep 17 00:00:00 2001
From: Maxim Filonov <53992153+sl1depengwyn@users.noreply.github.com>
Date: Mon, 22 May 2023 16:41:19 +0300
Subject: [PATCH 011/909] Fix gwei to wei in database

---
 apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/withdrawal.ex   | 4 ++--
 ...0230522130735_withdrawals_gwei_amount_to_wei_amount.exs | 7 +++++++
 2 files changed, 9 insertions(+), 2 deletions(-)
 create mode 100644 apps/explorer/priv/repo/migrations/20230522130735_withdrawals_gwei_amount_to_wei_amount.exs

diff --git a/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/withdrawal.ex b/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/withdrawal.ex
index 6c86c73d4344..3763fc5d66c0 100644
--- a/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/withdrawal.ex
+++ b/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/withdrawal.ex
@@ -45,7 +45,7 @@ defmodule EthereumJSONRPC.Withdrawal do
       ...> )
       %{
         address_hash: "0x388ea662ef2c223ec0b047d41bf3c0f362142ad5",
-        amount: 4040000000000,
+        amount: 4040000000000000000000,
         block_hash: "0x7f035c5f3c0678250853a1fde6027def7cac1812667bd0d5ab7ccb94eb8b6f3a",
         block_number: 3,
         index: 3867,
@@ -67,7 +67,7 @@ defmodule EthereumJSONRPC.Withdrawal do
       address_hash: address_hash,
       block_hash: block_hash,
       block_number: block_number,
-      amount: amount
+      amount: amount * 1_000_000_000
     }
   end
 
diff --git a/apps/explorer/priv/repo/migrations/20230522130735_withdrawals_gwei_amount_to_wei_amount.exs b/apps/explorer/priv/repo/migrations/20230522130735_withdrawals_gwei_amount_to_wei_amount.exs
new file mode 100644
index 000000000000..e18bf417516e
--- /dev/null
+++ b/apps/explorer/priv/repo/migrations/20230522130735_withdrawals_gwei_amount_to_wei_amount.exs
@@ -0,0 +1,7 @@
+defmodule Explorer.Repo.Migrations.WithdrawalsGweiAmountToWeiAmount do
+  use Ecto.Migration
+
+  def change do
+    execute("UPDATE withdrawals SET amount = amount * 1000000000")
+  end
+end

From aa277623b9d859d8eae12a82bda5d0cab01fceac Mon Sep 17 00:00:00 2001
From: Maxim Filonov <53992153+sl1depengwyn@users.noreply.github.com>
Date: Mon, 22 May 2023 16:41:27 +0300
Subject: [PATCH 012/909] Fix wording

---
 .../lib/block_scout_web/templates/withdrawal/index.html.eex     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/block_scout_web/lib/block_scout_web/templates/withdrawal/index.html.eex b/apps/block_scout_web/lib/block_scout_web/templates/withdrawal/index.html.eex
index fffcff6c721b..33e6809ed697 100644
--- a/apps/block_scout_web/lib/block_scout_web/templates/withdrawal/index.html.eex
+++ b/apps/block_scout_web/lib/block_scout_web/templates/withdrawal/index.html.eex
@@ -8,7 +8,7 @@
         <%= render BlockScoutWeb.CommonComponentsView, "_pagination_container.html", position: "top", cur_page_number: @page_number, show_pagination_limit: true, data_next_page_button: true, data_prev_page_button: true %>
       </div>
       
-      <p><%= gettext("There are %{withdrawals_count} withdrawals total that withdrawn %{withdrawals_sum}", withdrawals_count: BlockScoutWeb.Cldr.Number.to_string!(@withdrawals_count, format: "#,###"), withdrawals_sum: format_wei_value(@withdrawals_sum, :ether)) %></p> 
+      <p><%= gettext("%{withdrawals_count} withdrawals processed and %{withdrawals_sum} withdrawn.", withdrawals_count: BlockScoutWeb.Cldr.Number.to_string!(@withdrawals_count, format: "#,###"), withdrawals_sum: format_wei_value(@withdrawals_sum, :ether)) %></p> 
 
       <button data-error-message class="alert alert-danger col-12 text-left" style="display: none;">
         <span href="#" class="alert-link"><%= gettext("Something went wrong, click to reload.") %></span>

From c82bc7eb0706f0655f331243fc07e119b957e93a Mon Sep 17 00:00:00 2001
From: Maxim Filonov <53992153+sl1depengwyn@users.noreply.github.com>
Date: Mon, 22 May 2023 18:44:12 +0300
Subject: [PATCH 013/909] Add withdrawals count field for blocks

---
 CHANGELOG.md                                           |  3 ++-
 .../controllers/api/v2/block_controller.ex             |  3 ++-
 .../lib/block_scout_web/views/api/v2/block_view.ex     |  8 ++++----
 apps/block_scout_web/priv/gettext/default.pot          | 10 +++++-----
 .../priv/gettext/en/LC_MESSAGES/default.po             | 10 +++++-----
 .../lib/ethereum_jsonrpc/withdrawals.ex                |  2 +-
 apps/explorer/lib/explorer/chain.ex                    |  2 +-
 .../lib/explorer/chain/cache/withdrawals_sum.ex        |  3 ++-
 8 files changed, 22 insertions(+), 19 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5c2e8b3a2470..33fbfdcc2d6d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,7 +9,8 @@
 
 ### Fixes
 
-- [](https://github.com/blockscout/blockscout/pull/7546) - API v2: fix today coin price (use in-memory or cached in DB value)
+- [#7537](https://github.com/blockscout/blockscout/pull/7537) - Withdrawals fixes and improvements
+- [#7546](https://github.com/blockscout/blockscout/pull/7546) - API v2: fix today coin price (use in-memory or cached in DB value)
 - [#7545](https://github.com/blockscout/blockscout/pull/7545) - API v2: Check if cached exchange rate is empty before replacing DB value in stats API
 - [#7516](https://github.com/blockscout/blockscout/pull/7516) - Fix shrinking logo in Safari
 
diff --git a/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/block_controller.ex b/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/block_controller.ex
index 11492b242027..865127d756a0 100644
--- a/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/block_controller.ex
+++ b/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/block_controller.ex
@@ -35,7 +35,8 @@ defmodule BlockScoutWeb.API.V2.BlockController do
       :uncles => :optional,
       :nephews => :optional,
       :rewards => :optional,
-      :transactions => :optional
+      :transactions => :optional,
+      :withdrawals => :optional
     },
     api?: true
   ]
diff --git a/apps/block_scout_web/lib/block_scout_web/views/api/v2/block_view.ex b/apps/block_scout_web/lib/block_scout_web/views/api/v2/block_view.ex
index 3a9e914400b8..fd0c1cc897da 100644
--- a/apps/block_scout_web/lib/block_scout_web/views/api/v2/block_view.ex
+++ b/apps/block_scout_web/lib/block_scout_web/views/api/v2/block_view.ex
@@ -7,8 +7,6 @@ defmodule BlockScoutWeb.API.V2.BlockView do
   alias Explorer.Chain.Block
   alias Explorer.Counters.BlockPriorityFeeCounter
 
-  @api_true [api?: true]
-
   def render("message.json", assigns) do
     ApiView.render("message.json", assigns)
   end
@@ -61,8 +59,7 @@ defmodule BlockScoutWeb.API.V2.BlockView do
       "burnt_fees_percentage" => burnt_fees_percentage(burned_fee, tx_fees),
       "type" => block |> BlockView.block_type() |> String.downcase(),
       "tx_fees" => tx_fees,
-      "has_beacon_chain_withdrawals" =>
-        if(single_block?, do: Chain.check_if_withdrawals_in_block(block.hash, @api_true), else: nil)
+      "withdrawals_count" => count_withdrawals(block)
     }
   end
 
@@ -107,4 +104,7 @@ defmodule BlockScoutWeb.API.V2.BlockView do
 
   def count_transactions(%Block{transactions: txs}) when is_list(txs), do: Enum.count(txs)
   def count_transactions(_), do: nil
+
+  def count_withdrawals(%Block{withdrawals: withdrawals}) when is_list(withdrawals), do: Enum.count(withdrawals)
+  def count_withdrawals(_), do: nil
 end
diff --git a/apps/block_scout_web/priv/gettext/default.pot b/apps/block_scout_web/priv/gettext/default.pot
index 1d3e636fbb14..3f0ed1b650bb 100644
--- a/apps/block_scout_web/priv/gettext/default.pot
+++ b/apps/block_scout_web/priv/gettext/default.pot
@@ -2642,11 +2642,6 @@ msgstr ""
 msgid "The total gas amount used in the block and its percentage of gas filled in the block."
 msgstr ""
 
-#: lib/block_scout_web/templates/withdrawal/index.html.eex:11
-#, elixir-autogen, elixir-format
-msgid "There are %{withdrawals_count} withdrawals total that withdrawn %{withdrawals_sum}"
-msgstr ""
-
 #: lib/block_scout_web/templates/address_validation/index.html.eex:16
 #, elixir-autogen, elixir-format
 msgid "There are no blocks validated by this address."
@@ -3664,3 +3659,8 @@ msgstr ""
 #, elixir-autogen, elixir-format
 msgid "New Smart Contract Verification via metadata JSON"
 msgstr ""
+
+#: lib/block_scout_web/templates/withdrawal/index.html.eex:11
+#, elixir-autogen, elixir-format
+msgid "%{withdrawals_count} withdrawals processed and %{withdrawals_sum} withdrawn."
+msgstr ""
diff --git a/apps/block_scout_web/priv/gettext/en/LC_MESSAGES/default.po b/apps/block_scout_web/priv/gettext/en/LC_MESSAGES/default.po
index 374b4a60914d..740c7bd0635b 100644
--- a/apps/block_scout_web/priv/gettext/en/LC_MESSAGES/default.po
+++ b/apps/block_scout_web/priv/gettext/en/LC_MESSAGES/default.po
@@ -2642,11 +2642,6 @@ msgstr ""
 msgid "The total gas amount used in the block and its percentage of gas filled in the block."
 msgstr ""
 
-#: lib/block_scout_web/templates/withdrawal/index.html.eex:11
-#, elixir-autogen, elixir-format
-msgid "There are %{withdrawals_count} withdrawals total that withdrawn %{withdrawals_sum}"
-msgstr ""
-
 #: lib/block_scout_web/templates/address_validation/index.html.eex:16
 #, elixir-autogen, elixir-format
 msgid "There are no blocks validated by this address."
@@ -3664,3 +3659,8 @@ msgstr ""
 #, elixir-autogen, elixir-format, fuzzy
 msgid "New Smart Contract Verification via metadata JSON"
 msgstr ""
+
+#: lib/block_scout_web/templates/withdrawal/index.html.eex:11
+#, elixir-autogen, elixir-format, fuzzy
+msgid "%{withdrawals_count} withdrawals processed and %{withdrawals_sum} withdrawn."
+msgstr ""
diff --git a/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/withdrawals.ex b/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/withdrawals.ex
index 1c520b9f9a44..863857eee573 100644
--- a/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/withdrawals.ex
+++ b/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/withdrawals.ex
@@ -26,7 +26,7 @@ defmodule EthereumJSONRPC.Withdrawals do
       [
         %{
           address_hash: "0x388ea662ef2c223ec0b047d41bf3c0f362142ad5",
-          amount: 4040000000000,
+          amount: 4040000000000000000000,
           block_hash: "0x7f035c5f3c0678250853a1fde6027def7cac1812667bd0d5ab7ccb94eb8b6f3a",
           index: 3867,
           validator_index: 1721,
diff --git a/apps/explorer/lib/explorer/chain.ex b/apps/explorer/lib/explorer/chain.ex
index b6ac5099561e..fbba8d1a3a23 100644
--- a/apps/explorer/lib/explorer/chain.ex
+++ b/apps/explorer/lib/explorer/chain.ex
@@ -6871,7 +6871,7 @@ defmodule Explorer.Chain do
   end
 
   def sum_withdrawals do
-    Repo.aggregate(Withdrawal, :max, :index, timeout: :infinity)
+    Repo.aggregate(Withdrawal, :sum, :amount, timeout: :infinity)
   end
 
   def upsert_count_withdrawals(index) do
diff --git a/apps/explorer/lib/explorer/chain/cache/withdrawals_sum.ex b/apps/explorer/lib/explorer/chain/cache/withdrawals_sum.ex
index b19a0a328274..d38504311aeb 100644
--- a/apps/explorer/lib/explorer/chain/cache/withdrawals_sum.ex
+++ b/apps/explorer/lib/explorer/chain/cache/withdrawals_sum.ex
@@ -12,6 +12,7 @@ defmodule Explorer.Chain.Cache.WithdrawalsSum do
   use GenServer
 
   alias Explorer.Chain
+  alias Explorer.Chain.Wei
 
   @counter_type "withdrawals_sum"
 
@@ -68,7 +69,7 @@ defmodule Explorer.Chain.Cache.WithdrawalsSum do
 
     params = %{
       counter_type: @counter_type,
-      value: withdrawals_sum
+      value: withdrawals_sum |> Wei.to(:wei)
     }
 
     Chain.upsert_last_fetched_counter(params)

From 4eff389d717c039254e0a1539ca5ce70dae7505c Mon Sep 17 00:00:00 2001
From: Maxim Filonov <53992153+sl1depengwyn@users.noreply.github.com>
Date: Thu, 25 May 2023 17:50:12 +0300
Subject: [PATCH 014/909] Fix count on empty database

---
 CHANGELOG.md                                              | 2 +-
 apps/explorer/lib/explorer/chain/cache/withdrawals_sum.ex | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 33fbfdcc2d6d..cb93e703ef2e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,7 +9,7 @@
 
 ### Fixes
 
-- [#7537](https://github.com/blockscout/blockscout/pull/7537) - Withdrawals fixes and improvements
+- [#7537](https://github.com/blockscout/blockscout/pull/7537), [#7553](https://github.com/blockscout/blockscout/pull/7553) - Withdrawals fixes and improvements
 - [#7546](https://github.com/blockscout/blockscout/pull/7546) - API v2: fix today coin price (use in-memory or cached in DB value)
 - [#7545](https://github.com/blockscout/blockscout/pull/7545) - API v2: Check if cached exchange rate is empty before replacing DB value in stats API
 - [#7516](https://github.com/blockscout/blockscout/pull/7516) - Fix shrinking logo in Safari
diff --git a/apps/explorer/lib/explorer/chain/cache/withdrawals_sum.ex b/apps/explorer/lib/explorer/chain/cache/withdrawals_sum.ex
index d38504311aeb..cac2cf3a0384 100644
--- a/apps/explorer/lib/explorer/chain/cache/withdrawals_sum.ex
+++ b/apps/explorer/lib/explorer/chain/cache/withdrawals_sum.ex
@@ -69,7 +69,7 @@ defmodule Explorer.Chain.Cache.WithdrawalsSum do
 
     params = %{
       counter_type: @counter_type,
-      value: withdrawals_sum |> Wei.to(:wei)
+      value: (withdrawals_sum && Wei.to(withdrawals_sum, :wei)) || 0
     }
 
     Chain.upsert_last_fetched_counter(params)

From b0d6b98e237914c45a0dc209f1c229a1da43c36e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 25 May 2023 19:02:19 +0000
Subject: [PATCH 015/909] Bump webpack from 5.84.0 to 5.84.1 in
 /apps/block_scout_web/assets

Bumps [webpack](https://github.com/webpack/webpack) from 5.84.0 to 5.84.1.
- [Release notes](https://github.com/webpack/webpack/releases)
- [Commits](https://github.com/webpack/webpack/compare/v5.84.0...v5.84.1)

---
updated-dependencies:
- dependency-name: webpack
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 apps/block_scout_web/assets/package-lock.json | 14 +++++++-------
 apps/block_scout_web/assets/package.json      |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/apps/block_scout_web/assets/package-lock.json b/apps/block_scout_web/assets/package-lock.json
index cefd4ea1ed39..5951995bafa2 100644
--- a/apps/block_scout_web/assets/package-lock.json
+++ b/apps/block_scout_web/assets/package-lock.json
@@ -92,7 +92,7 @@
         "sass": "^1.62.1",
         "sass-loader": "^13.3.0",
         "style-loader": "^3.3.3",
-        "webpack": "^5.84.0",
+        "webpack": "^5.84.1",
         "webpack-cli": "^5.1.1"
       },
       "engines": {
@@ -16833,9 +16833,9 @@
       }
     },
     "node_modules/webpack": {
-      "version": "5.84.0",
-      "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.84.0.tgz",
-      "integrity": "sha512-XezNK3kwJq6IyeoZmZ1uEqQs+42nTqIi4jYM/YjLwaJedUC1N3bwnCC0+UcnHJPfqWX0kGrQnMIvZZyWYaIZrA==",
+      "version": "5.84.1",
+      "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.84.1.tgz",
+      "integrity": "sha512-ZP4qaZ7vVn/K8WN/p990SGATmrL1qg4heP/MrVneczYtpDGJWlrgZv55vxaV2ul885Kz+25MP2kSXkPe3LZfmg==",
       "dev": true,
       "dependencies": {
         "@types/eslint-scope": "^3.7.3",
@@ -30088,9 +30088,9 @@
       "dev": true
     },
     "webpack": {
-      "version": "5.84.0",
-      "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.84.0.tgz",
-      "integrity": "sha512-XezNK3kwJq6IyeoZmZ1uEqQs+42nTqIi4jYM/YjLwaJedUC1N3bwnCC0+UcnHJPfqWX0kGrQnMIvZZyWYaIZrA==",
+      "version": "5.84.1",
+      "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.84.1.tgz",
+      "integrity": "sha512-ZP4qaZ7vVn/K8WN/p990SGATmrL1qg4heP/MrVneczYtpDGJWlrgZv55vxaV2ul885Kz+25MP2kSXkPe3LZfmg==",
       "dev": true,
       "requires": {
         "@types/eslint-scope": "^3.7.3",
diff --git a/apps/block_scout_web/assets/package.json b/apps/block_scout_web/assets/package.json
index 7b9297e836d5..da8b27450eb3 100644
--- a/apps/block_scout_web/assets/package.json
+++ b/apps/block_scout_web/assets/package.json
@@ -104,7 +104,7 @@
     "sass": "^1.62.1",
     "sass-loader": "^13.3.0",
     "style-loader": "^3.3.3",
-    "webpack": "^5.84.0",
+    "webpack": "^5.84.1",
     "webpack-cli": "^5.1.1"
   },
   "jest": {

From 2b522f89b213daf3be54206d10988584301191ba Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 25 May 2023 19:05:37 +0000
Subject: [PATCH 016/909] Bump phoenix_pubsub from 2.1.1 to 2.1.2

Bumps [phoenix_pubsub](https://github.com/phoenixframework/phoenix_pubsub) from 2.1.1 to 2.1.2.
- [Changelog](https://github.com/phoenixframework/phoenix_pubsub/blob/main/CHANGELOG.md)
- [Commits](https://github.com/phoenixframework/phoenix_pubsub/compare/v2.1.1...v2.1.2)

---
updated-dependencies:
- dependency-name: phoenix_pubsub
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 mix.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mix.lock b/mix.lock
index b42fef2ad0f8..6b6aaada5edf 100644
--- a/mix.lock
+++ b/mix.lock
@@ -102,7 +102,7 @@
   "phoenix_ecto": {:hex, :phoenix_ecto, "4.4.1", "fe7a02387a7d26002a46b97e9879591efee7ebffe5f5e114fd196632e6e4a08d", [:mix], [{:ecto, "~> 3.5", [hex: :ecto, repo: "hexpm", optional: false]}, {:phoenix_html, "~> 2.14.2 or ~> 3.0", [hex: :phoenix_html, repo: "hexpm", optional: true]}, {:plug, "~> 1.9", [hex: :plug, repo: "hexpm", optional: false]}], "hexpm", "ddccf8b4966180afe7630b105edb3402b1ca485e7468109540d262e842048ba4"},
   "phoenix_html": {:hex, :phoenix_html, "3.0.4", "232d41884fe6a9c42d09f48397c175cd6f0d443aaa34c7424da47604201df2e1", [:mix], [{:plug, "~> 1.5", [hex: :plug, repo: "hexpm", optional: true]}], "hexpm", "ce17fd3cf815b2ed874114073e743507704b1f5288bb03c304a77458485efc8b"},
   "phoenix_live_reload": {:hex, :phoenix_live_reload, "1.3.3", "3a53772a6118d5679bf50fc1670505a290e32a1d195df9e069d8c53ab040c054", [:mix], [{:file_system, "~> 0.2.1 or ~> 0.3", [hex: :file_system, repo: "hexpm", optional: false]}, {:phoenix, "~> 1.4", [hex: :phoenix, repo: "hexpm", optional: false]}], "hexpm", "766796676e5f558dbae5d1bdb066849673e956005e3730dfd5affd7a6da4abac"},
-  "phoenix_pubsub": {:hex, :phoenix_pubsub, "2.1.1", "ba04e489ef03763bf28a17eb2eaddc2c20c6d217e2150a61e3298b0f4c2012b5", [:mix], [], "hexpm", "81367c6d1eea5878ad726be80808eb5a787a23dee699f96e72b1109c57cdd8d9"},
+  "phoenix_pubsub": {:hex, :phoenix_pubsub, "2.1.2", "a4950b63ace57720b0fc1c6da083c53346b36f99021de89595cc4f026288ff51", [:mix], [], "hexpm", "45741676a94c71f9afdfed9d22d49b6856c026ff504db04e3dc03a1d86f8201c"},
   "plug": {:hex, :plug, "1.14.2", "cff7d4ec45b4ae176a227acd94a7ab536d9b37b942c8e8fa6dfc0fff98ff4d80", [:mix], [{:mime, "~> 1.0 or ~> 2.0", [hex: :mime, repo: "hexpm", optional: false]}, {:plug_crypto, "~> 1.1.1 or ~> 1.2", [hex: :plug_crypto, repo: "hexpm", optional: false]}, {:telemetry, "~> 0.4.3 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "842fc50187e13cf4ac3b253d47d9474ed6c296a8732752835ce4a86acdf68d13"},
   "plug_cowboy": {:hex, :plug_cowboy, "2.6.1", "9a3bbfceeb65eff5f39dab529e5cd79137ac36e913c02067dba3963a26efe9b2", [:mix], [{:cowboy, "~> 2.7", [hex: :cowboy, repo: "hexpm", optional: false]}, {:cowboy_telemetry, "~> 0.3", [hex: :cowboy_telemetry, repo: "hexpm", optional: false]}, {:plug, "~> 1.14", [hex: :plug, repo: "hexpm", optional: false]}], "hexpm", "de36e1a21f451a18b790f37765db198075c25875c64834bcc82d90b309eb6613"},
   "plug_crypto": {:hex, :plug_crypto, "1.2.5", "918772575e48e81e455818229bf719d4ab4181fcbf7f85b68a35620f78d89ced", [:mix], [], "hexpm", "26549a1d6345e2172eb1c233866756ae44a9609bd33ee6f99147ab3fd87fd842"},

From c046ae55ad416d8b8c27c4702943b62d9e8bed63 Mon Sep 17 00:00:00 2001
From: Viktor Baranov <baranov.viktor.27@gmail.com>
Date: Fri, 26 May 2023 12:13:31 +0300
Subject: [PATCH 017/909] Temporarily comment test job

---
 .../publish-docker-image-every-push.yml       | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/publish-docker-image-every-push.yml b/.github/workflows/publish-docker-image-every-push.yml
index 94b8727136f7..46a0cffc1c4d 100644
--- a/.github/workflows/publish-docker-image-every-push.yml
+++ b/.github/workflows/publish-docker-image-every-push.yml
@@ -91,13 +91,13 @@ jobs:
             SESSION_COOKIE_DOMAIN=k8s-dev.blockscout.com
             BLOCKSCOUT_VERSION=v${{ env.RELEASE_VERSION }}-beta.+commit.${{ env.SHORT_SHA }}
             RELEASE_VERSION=${{ env.RELEASE_VERSION }}
-  tests:
-    needs: push_to_registry
-    uses: blockscout/blockscout-ci-cd/.github/workflows/e2e_new.yaml@master
-    with:
-      blockscoutImage: blockscout/blockscout:${{ needs.push_to_registry.outputs.release-version }}-prerelease-${{ needs.push_to_registry.outputs.short-sha }}
-      blockscoutIngressHost: e2e-blockscout-$GITHUB_SHA_SHORT
-      frontendIngressHost: e2e-blockscout-$GITHUB_SHA_SHORT
-      gethIngressHost: e2e-geth-$GITHUB_SHA_SHORT
-      scVerifierIngressHost: e2e-sc-verifier-$GITHUB_SHA_SHORT
-    secrets: inherit
+  # tests:
+  #   needs: push_to_registry
+  #   uses: blockscout/blockscout-ci-cd/.github/workflows/e2e_new.yaml@master
+  #   with:
+  #     blockscoutImage: blockscout/blockscout:${{ needs.push_to_registry.outputs.release-version }}-prerelease-${{ needs.push_to_registry.outputs.short-sha }}
+  #     blockscoutIngressHost: e2e-blockscout-$GITHUB_SHA_SHORT
+  #     frontendIngressHost: e2e-blockscout-$GITHUB_SHA_SHORT
+  #     gethIngressHost: e2e-geth-$GITHUB_SHA_SHORT
+  #     scVerifierIngressHost: e2e-sc-verifier-$GITHUB_SHA_SHORT
+  #   secrets: inherit

From bf4e194519f51026c042a6b27f32156cd99d5119 Mon Sep 17 00:00:00 2001
From: Viktor Baranov <baranov.viktor.27@gmail.com>
Date: Fri, 26 May 2023 13:04:56 +0300
Subject: [PATCH 018/909] Remove fallback from Read methods

---
 apps/explorer/lib/explorer/smart_contract/helper.ex | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/apps/explorer/lib/explorer/smart_contract/helper.ex b/apps/explorer/lib/explorer/smart_contract/helper.ex
index 697327a75b9b..c2476ee713d6 100644
--- a/apps/explorer/lib/explorer/smart_contract/helper.ex
+++ b/apps/explorer/lib/explorer/smart_contract/helper.ex
@@ -12,6 +12,8 @@ defmodule Explorer.SmartContract.Helper do
 
   def constructor?(function), do: function["type"] == "constructor"
 
+  def fallback?(function), do: function["type"] == "fallback"
+
   def event?(function), do: function["type"] == "event"
 
   def error?(function), do: function["type"] == "error"
@@ -22,7 +24,7 @@ defmodule Explorer.SmartContract.Helper do
   @spec read_with_wallet_method?(%{}) :: true | false
   def read_with_wallet_method?(function),
     do:
-      !error?(function) && !event?(function) && !constructor?(function) && nonpayable?(function) &&
+      !error?(function) && !event?(function) && !constructor?(function) && !fallback?(function) && nonpayable?(function) &&
         !empty_outputs?(function)
 
   def empty_inputs?(function), do: function["inputs"] == []

From 4f327909c081bfcf6071df2cdf1edb3f157a1c8b Mon Sep 17 00:00:00 2001
From: Viktor Baranov <baranov.viktor.27@gmail.com>
Date: Fri, 26 May 2023 13:07:47 +0300
Subject: [PATCH 019/909] Remove fallback from Read methods

---
 CHANGELOG.md                                                 | 1 +
 .../controllers/api/v2/smart_contract_controller_test.exs    | 5 +----
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a325b927a58d..79391096363e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,6 +10,7 @@
 
 ### Fixes
 
+- [#7562](https://github.com/blockscout/blockscout/pull/7562) - Remove fallback from Read methods
 - [#7537](https://github.com/blockscout/blockscout/pull/7537), [#7553](https://github.com/blockscout/blockscout/pull/7553) - Withdrawals fixes and improvements
 - [#7546](https://github.com/blockscout/blockscout/pull/7546) - API v2: fix today coin price (use in-memory or cached in DB value)
 - [#7545](https://github.com/blockscout/blockscout/pull/7545) - API v2: Check if cached exchange rate is empty before replacing DB value in stats API
diff --git a/apps/block_scout_web/test/block_scout_web/controllers/api/v2/smart_contract_controller_test.exs b/apps/block_scout_web/test/block_scout_web/controllers/api/v2/smart_contract_controller_test.exs
index deb18a3fd9c3..1c182d9cb9ec 100644
--- a/apps/block_scout_web/test/block_scout_web/controllers/api/v2/smart_contract_controller_test.exs
+++ b/apps/block_scout_web/test/block_scout_web/controllers/api/v2/smart_contract_controller_test.exs
@@ -461,8 +461,7 @@ defmodule BlockScoutWeb.API.V2.SmartContractControllerTest do
           "outputs" => [],
           "name" => "disableWhitelist",
           "inputs" => [%{"type" => "bool", "name" => "disable", "internalType" => "bool"}]
-        },
-        %{"type" => "fallback"}
+        }
       ]
 
       target_contract = insert(:smart_contract, abi: abi)
@@ -496,8 +495,6 @@ defmodule BlockScoutWeb.API.V2.SmartContractControllerTest do
                "inputs" => [%{"type" => "address", "name" => "_address", "internalType" => "address"}],
                "method_id" => "c683630d"
              } in response
-
-      assert %{"type" => "fallback"} in response
     end
 
     test "get array of addresses within read-methods", %{conn: conn} do

From 2ce256889e169b4cf1b76e966b4052fa482ddb6f Mon Sep 17 00:00:00 2001
From: Viktor Baranov <baranov.viktor.27@gmail.com>
Date: Fri, 26 May 2023 14:15:46 +0300
Subject: [PATCH 020/909] Remove fallback from Read methods

---
 .../controllers/api/v2/smart_contract_controller_test.exs    | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/apps/block_scout_web/test/block_scout_web/controllers/api/v2/smart_contract_controller_test.exs b/apps/block_scout_web/test/block_scout_web/controllers/api/v2/smart_contract_controller_test.exs
index 1c182d9cb9ec..7525beafd303 100644
--- a/apps/block_scout_web/test/block_scout_web/controllers/api/v2/smart_contract_controller_test.exs
+++ b/apps/block_scout_web/test/block_scout_web/controllers/api/v2/smart_contract_controller_test.exs
@@ -461,7 +461,8 @@ defmodule BlockScoutWeb.API.V2.SmartContractControllerTest do
           "outputs" => [],
           "name" => "disableWhitelist",
           "inputs" => [%{"type" => "bool", "name" => "disable", "internalType" => "bool"}]
-        }
+        },
+        %{"type" => "fallback"}
       ]
 
       target_contract = insert(:smart_contract, abi: abi)
@@ -495,6 +496,8 @@ defmodule BlockScoutWeb.API.V2.SmartContractControllerTest do
                "inputs" => [%{"type" => "address", "name" => "_address", "internalType" => "address"}],
                "method_id" => "c683630d"
              } in response
+
+      refute %{"type" => "fallback"} in response
     end
 
     test "get array of addresses within read-methods", %{conn: conn} do

From 4c51a862a866faf91b15629d8b96a96a314269fb Mon Sep 17 00:00:00 2001
From: Viktor Baranov <baranov.viktor.27@gmail.com>
Date: Fri, 26 May 2023 16:10:17 +0300
Subject: [PATCH 021/909] Return contract type in address view

---
 CHANGELOG.md                                   |  2 ++
 .../views/api/v2/address_view.ex               | 18 +++++++++++++++++-
 .../api/v2/address_controller_test.exs         |  3 ++-
 3 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 79391096363e..6fdec2157408 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,7 @@
 ## Current
 
 ### Features
+
 - [#7513](https://github.com/blockscout/blockscout/pull/7513) - Add Polygon Edge support
 
 - [#7532](https://github.com/blockscout/blockscout/pull/7532) - Handle empty id in json rpc responses
@@ -10,6 +11,7 @@
 
 ### Fixes
 
+- [#7564](https://github.com/blockscout/blockscout/pull/7564) - Return contract type in address view
 - [#7562](https://github.com/blockscout/blockscout/pull/7562) - Remove fallback from Read methods
 - [#7537](https://github.com/blockscout/blockscout/pull/7537), [#7553](https://github.com/blockscout/blockscout/pull/7553) - Withdrawals fixes and improvements
 - [#7546](https://github.com/blockscout/blockscout/pull/7546) - API v2: fix today coin price (use in-memory or cached in DB value)
diff --git a/apps/block_scout_web/lib/block_scout_web/views/api/v2/address_view.ex b/apps/block_scout_web/lib/block_scout_web/views/api/v2/address_view.ex
index e044cf7ffb6e..90d85355e287 100644
--- a/apps/block_scout_web/lib/block_scout_web/views/api/v2/address_view.ex
+++ b/apps/block_scout_web/lib/block_scout_web/views/api/v2/address_view.ex
@@ -108,7 +108,8 @@ defmodule BlockScoutWeb.API.V2.AddressView do
       "has_tokens" => Chain.check_if_tokens_at_address(address.hash, @api_true),
       "has_token_transfers" => Chain.check_if_token_transfers_at_address(address.hash, @api_true),
       "watchlist_address_id" => Chain.select_watchlist_address_id(get_watchlist_id(conn), address.hash),
-      "has_beacon_chain_withdrawals" => Chain.check_if_withdrawals_at_address(address.hash, @api_true)
+      "has_beacon_chain_withdrawals" => Chain.check_if_withdrawals_at_address(address.hash, @api_true),
+      "contract_type" => contract_type(address)
     })
   end
 
@@ -170,4 +171,19 @@ defmodule BlockScoutWeb.API.V2.AddressView do
 
     TokenView.render("token_instance.json", %{token_instance: token_instance, token: token})
   end
+
+  @spec contract_type(term) :: nil | :solidity | :vyper | :yul
+  def contract_type(%Address{smart_contract: nil}), do: nil
+
+  def contract_type(%Address{smart_contract: %SmartContract{}} = address) do
+    if address.smart_contract.is_vyper_contract do
+      :vyper
+    else
+      if address.smart_contract.abi do
+        :solidity
+      else
+        :yul
+      end
+    end
+  end
 end
diff --git a/apps/block_scout_web/test/block_scout_web/controllers/api/v2/address_controller_test.exs b/apps/block_scout_web/test/block_scout_web/controllers/api/v2/address_controller_test.exs
index b414a917bc7c..0902bf47eb8f 100644
--- a/apps/block_scout_web/test/block_scout_web/controllers/api/v2/address_controller_test.exs
+++ b/apps/block_scout_web/test/block_scout_web/controllers/api/v2/address_controller_test.exs
@@ -67,7 +67,8 @@ defmodule BlockScoutWeb.API.V2.AddressControllerTest do
         "has_tokens" => false,
         "has_token_transfers" => false,
         "watchlist_address_id" => nil,
-        "has_beacon_chain_withdrawals" => false
+        "has_beacon_chain_withdrawals" => false,
+        "contract_type" => nil
       }
 
       request = get(conn, "/api/v2/addresses/#{Address.checksum(address.hash)}")

From c3bc18f470c429a3aa7cde4964b8bbae832e5224 Mon Sep 17 00:00:00 2001
From: Viktor Baranov <baranov.viktor.27@gmail.com>
Date: Fri, 26 May 2023 17:07:55 +0300
Subject: [PATCH 022/909] Account: check composed email beofre sending

---
 CHANGELOG.md                                  |  1 +
 .../lib/explorer/account/notifier/notify.ex   | 21 ++++++++++++-------
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6fdec2157408..a152366bff6e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,6 +11,7 @@
 
 ### Fixes
 
+- [#7566](https://github.com/blockscout/blockscout/pull/7566) - Account: check composed email beofre sending
 - [#7564](https://github.com/blockscout/blockscout/pull/7564) - Return contract type in address view
 - [#7562](https://github.com/blockscout/blockscout/pull/7562) - Remove fallback from Read methods
 - [#7537](https://github.com/blockscout/blockscout/pull/7537), [#7553](https://github.com/blockscout/blockscout/pull/7553) - Withdrawals fixes and improvements
diff --git a/apps/explorer/lib/explorer/account/notifier/notify.ex b/apps/explorer/lib/explorer/account/notifier/notify.ex
index b64b4bd47a5a..70e633be8da8 100644
--- a/apps/explorer/lib/explorer/account/notifier/notify.ex
+++ b/apps/explorer/lib/explorer/account/notifier/notify.ex
@@ -96,14 +96,19 @@ defmodule Explorer.Account.Notifier.Notify do
 
     email = Email.compose(notification, address)
 
-    case Mailer.deliver_now(email, response: true) do
-      {:ok, _email, response} ->
-        Logger.info("--- email delivery response: SUCCESS", fetcher: :account)
-        Logger.info(response, fetcher: :account)
-
-      {:error, error} ->
-        Logger.info("--- email delivery response: FAILED", fetcher: :account)
-        Logger.info(error, fetcher: :account)
+    if email do
+      case Mailer.deliver_now(email, response: true) do
+        {:ok, _email, response} ->
+          Logger.info("--- email delivery response: SUCCESS", fetcher: :account)
+          Logger.info(response, fetcher: :account)
+
+        {:error, error} ->
+          Logger.info("--- email delivery response: FAILED", fetcher: :account)
+          Logger.info(error, fetcher: :account)
+      end
+    else
+      Logger.info("--- email delivery response: FAILED", fetcher: :account)
+      Logger.info("Email is not composed (is nil)", fetcher: :account)
     end
   end
 

From 36129a1a099695b0173b40349195e0dcfc7c6275 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 26 May 2023 19:01:27 +0000
Subject: [PATCH 023/909] Bump @babel/core from 7.21.8 to 7.22.1 in
 /apps/block_scout_web/assets

Bumps [@babel/core](https://github.com/babel/babel/tree/HEAD/packages/babel-core) from 7.21.8 to 7.22.1.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/commits/v7.22.1/packages/babel-core)

---
updated-dependencies:
- dependency-name: "@babel/core"
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 apps/block_scout_web/assets/package-lock.json | 230 +++++++++---------
 apps/block_scout_web/assets/package.json      |   2 +-
 2 files changed, 116 insertions(+), 116 deletions(-)

diff --git a/apps/block_scout_web/assets/package-lock.json b/apps/block_scout_web/assets/package-lock.json
index 5951995bafa2..e667a9389fc0 100644
--- a/apps/block_scout_web/assets/package-lock.json
+++ b/apps/block_scout_web/assets/package-lock.json
@@ -71,7 +71,7 @@
         "xss": "^1.0.14"
       },
       "devDependencies": {
-        "@babel/core": "^7.21.8",
+        "@babel/core": "^7.22.1",
         "@babel/preset-env": "^7.21.5",
         "autoprefixer": "^10.4.14",
         "babel-loader": "^9.1.2",
@@ -252,28 +252,28 @@
       }
     },
     "node_modules/@babel/compat-data": {
-      "version": "7.21.7",
-      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.21.7.tgz",
-      "integrity": "sha512-KYMqFYTaenzMK4yUtf4EW9wc4N9ef80FsbMtkwool5zpwl4YrT1SdWYSTRcT94KO4hannogdS+LxY7L+arP3gA==",
+      "version": "7.22.0",
+      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.22.0.tgz",
+      "integrity": "sha512-OgCMbbNCD/iA8cjMt+Zhp+nIC7XKaEaTG8zjvZPjGbhkppq1NIMWiZn7EaZRxUDHn4Ul265scRqg94N2WiFaGw==",
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/core": {
-      "version": "7.21.8",
-      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.21.8.tgz",
-      "integrity": "sha512-YeM22Sondbo523Sz0+CirSPnbj9bG3P0CdHcBZdqUuaeOaYEFbOLoGU7lebvGP6P5J/WE9wOn7u7C4J9HvS1xQ==",
+      "version": "7.22.1",
+      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.22.1.tgz",
+      "integrity": "sha512-Hkqu7J4ynysSXxmAahpN1jjRwVJ+NdpraFLIWflgjpVob3KNyK3/tIUc7Q7szed8WMp0JNa7Qtd1E9Oo22F9gA==",
       "dependencies": {
         "@ampproject/remapping": "^2.2.0",
         "@babel/code-frame": "^7.21.4",
-        "@babel/generator": "^7.21.5",
-        "@babel/helper-compilation-targets": "^7.21.5",
-        "@babel/helper-module-transforms": "^7.21.5",
-        "@babel/helpers": "^7.21.5",
-        "@babel/parser": "^7.21.8",
-        "@babel/template": "^7.20.7",
-        "@babel/traverse": "^7.21.5",
-        "@babel/types": "^7.21.5",
+        "@babel/generator": "^7.22.0",
+        "@babel/helper-compilation-targets": "^7.22.1",
+        "@babel/helper-module-transforms": "^7.22.1",
+        "@babel/helpers": "^7.22.0",
+        "@babel/parser": "^7.22.0",
+        "@babel/template": "^7.21.9",
+        "@babel/traverse": "^7.22.1",
+        "@babel/types": "^7.22.0",
         "convert-source-map": "^1.7.0",
         "debug": "^4.1.0",
         "gensync": "^1.0.0-beta.2",
@@ -289,11 +289,11 @@
       }
     },
     "node_modules/@babel/generator": {
-      "version": "7.21.5",
-      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.21.5.tgz",
-      "integrity": "sha512-SrKK/sRv8GesIW1bDagf9cCG38IOMYZusoe1dfg0D8aiUe3Amvoj1QtjTPAWcfrZFvIwlleLb0gxzQidL9w14w==",
+      "version": "7.22.0",
+      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.22.0.tgz",
+      "integrity": "sha512-tyzR0OsH88AelgukhL2rbEUCLKBGmy2G9Th/5vpyOt0zf44Be61kvIQXjCwTSX8t+qJ/vMwZfhK6mPdrMLZXRg==",
       "dependencies": {
-        "@babel/types": "^7.21.5",
+        "@babel/types": "^7.22.0",
         "@jridgewell/gen-mapping": "^0.3.2",
         "@jridgewell/trace-mapping": "^0.3.17",
         "jsesc": "^2.5.1"
@@ -327,11 +327,11 @@
       }
     },
     "node_modules/@babel/helper-compilation-targets": {
-      "version": "7.21.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.21.5.tgz",
-      "integrity": "sha512-1RkbFGUKex4lvsB9yhIfWltJM5cZKUftB2eNajaDv3dCMEp49iBG0K14uH8NnX9IPux2+mK7JGEOB0jn48/J6w==",
+      "version": "7.22.1",
+      "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.22.1.tgz",
+      "integrity": "sha512-Rqx13UM3yVB5q0D/KwQ8+SPfX/+Rnsy1Lw1k/UwOC4KC6qrzIQoY3lYnBu5EHKBlEHHcj0M0W8ltPSkD8rqfsQ==",
       "dependencies": {
-        "@babel/compat-data": "^7.21.5",
+        "@babel/compat-data": "^7.22.0",
         "@babel/helper-validator-option": "^7.21.0",
         "browserslist": "^4.21.3",
         "lru-cache": "^5.1.1",
@@ -412,9 +412,9 @@
       }
     },
     "node_modules/@babel/helper-environment-visitor": {
-      "version": "7.21.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.21.5.tgz",
-      "integrity": "sha512-IYl4gZ3ETsWocUWgsFZLM5i1BYx9SoemminVEXadgLBa9TdeorzgLKm8wWLA6J1N/kT3Kch8XIk1laNzYoHKvQ==",
+      "version": "7.22.1",
+      "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.22.1.tgz",
+      "integrity": "sha512-Z2tgopurB/kTbidvzeBrc2To3PUP/9i5MUe+fU6QJCQDyPwSH2oRapkLw3KGECDYSjhQZCNxEvNvZlLw8JjGwA==",
       "engines": {
         "node": ">=6.9.0"
       }
@@ -478,18 +478,18 @@
       }
     },
     "node_modules/@babel/helper-module-transforms": {
-      "version": "7.21.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.21.5.tgz",
-      "integrity": "sha512-bI2Z9zBGY2q5yMHoBvJ2a9iX3ZOAzJPm7Q8Yz6YeoUjU/Cvhmi2G4QyTNyPBqqXSgTjUxRg3L0xV45HvkNWWBw==",
+      "version": "7.22.1",
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.22.1.tgz",
+      "integrity": "sha512-dxAe9E7ySDGbQdCVOY/4+UcD8M9ZFqZcZhSPsPacvCG4M+9lwtDDQfI2EoaSvmf7W/8yCBkGU0m7Pvt1ru3UZw==",
       "dependencies": {
-        "@babel/helper-environment-visitor": "^7.21.5",
+        "@babel/helper-environment-visitor": "^7.22.1",
         "@babel/helper-module-imports": "^7.21.4",
         "@babel/helper-simple-access": "^7.21.5",
         "@babel/helper-split-export-declaration": "^7.18.6",
         "@babel/helper-validator-identifier": "^7.19.1",
-        "@babel/template": "^7.20.7",
-        "@babel/traverse": "^7.21.5",
-        "@babel/types": "^7.21.5"
+        "@babel/template": "^7.21.9",
+        "@babel/traverse": "^7.22.1",
+        "@babel/types": "^7.22.0"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -624,13 +624,13 @@
       }
     },
     "node_modules/@babel/helpers": {
-      "version": "7.21.5",
-      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.21.5.tgz",
-      "integrity": "sha512-BSY+JSlHxOmGsPTydUkPf1MdMQ3M81x5xGCOVgWM3G8XH77sJ292Y2oqcp0CbbgxhqBuI46iUz1tT7hqP7EfgA==",
+      "version": "7.22.0",
+      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.22.0.tgz",
+      "integrity": "sha512-I/hZCYErxdjuUnJpJxHmCESB3AdcOAFjj+K6+of9JyWBeAhggR9NQoUHI481pRNH87cx77mbpx0cygzXlvGayA==",
       "dependencies": {
-        "@babel/template": "^7.20.7",
-        "@babel/traverse": "^7.21.5",
-        "@babel/types": "^7.21.5"
+        "@babel/template": "^7.21.9",
+        "@babel/traverse": "^7.22.0",
+        "@babel/types": "^7.22.0"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -650,9 +650,9 @@
       }
     },
     "node_modules/@babel/parser": {
-      "version": "7.21.8",
-      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.21.8.tgz",
-      "integrity": "sha512-6zavDGdzG3gUqAdWvlLFfk+36RilI+Pwyuuh7HItyeScCWP3k6i8vKclAQ0bM/0y/Kz/xiwvxhMv9MgTJP5gmA==",
+      "version": "7.22.0",
+      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.22.0.tgz",
+      "integrity": "sha512-DA65VCJRetcFmJnt9/hEmRvXNCwk0V86dxG6p6N13hzDazaLRjGdTGPGgjxZOtLuFgWzOSRX4grybmRXwQ9bSg==",
       "bin": {
         "parser": "bin/babel-parser.js"
       },
@@ -1861,31 +1861,31 @@
       }
     },
     "node_modules/@babel/template": {
-      "version": "7.20.7",
-      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.20.7.tgz",
-      "integrity": "sha512-8SegXApWe6VoNw0r9JHpSteLKTpTiLZ4rMlGIm9JQ18KiCtyQiAMEazujAHrUS5flrcqYZa75ukev3P6QmUwUw==",
+      "version": "7.21.9",
+      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.21.9.tgz",
+      "integrity": "sha512-MK0X5k8NKOuWRamiEfc3KEJiHMTkGZNUjzMipqCGDDc6ijRl/B7RGSKVGncu4Ro/HdyzzY6cmoXuKI2Gffk7vQ==",
       "dependencies": {
-        "@babel/code-frame": "^7.18.6",
-        "@babel/parser": "^7.20.7",
-        "@babel/types": "^7.20.7"
+        "@babel/code-frame": "^7.21.4",
+        "@babel/parser": "^7.21.9",
+        "@babel/types": "^7.21.5"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/traverse": {
-      "version": "7.21.5",
-      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.21.5.tgz",
-      "integrity": "sha512-AhQoI3YjWi6u/y/ntv7k48mcrCXmus0t79J9qPNlk/lAsFlCiJ047RmbfMOawySTHtywXhbXgpx/8nXMYd+oFw==",
+      "version": "7.22.1",
+      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.22.1.tgz",
+      "integrity": "sha512-lAWkdCoUFnmwLBhIRLciFntGYsIIoC6vIbN8zrLPqBnJmPu7Z6nzqnKd7FsxQUNAvZfVZ0x6KdNvNp8zWIOHSQ==",
       "dependencies": {
         "@babel/code-frame": "^7.21.4",
-        "@babel/generator": "^7.21.5",
-        "@babel/helper-environment-visitor": "^7.21.5",
+        "@babel/generator": "^7.22.0",
+        "@babel/helper-environment-visitor": "^7.22.1",
         "@babel/helper-function-name": "^7.21.0",
         "@babel/helper-hoist-variables": "^7.18.6",
         "@babel/helper-split-export-declaration": "^7.18.6",
-        "@babel/parser": "^7.21.5",
-        "@babel/types": "^7.21.5",
+        "@babel/parser": "^7.22.0",
+        "@babel/types": "^7.22.0",
         "debug": "^4.1.0",
         "globals": "^11.1.0"
       },
@@ -1894,9 +1894,9 @@
       }
     },
     "node_modules/@babel/types": {
-      "version": "7.21.5",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.21.5.tgz",
-      "integrity": "sha512-m4AfNvVF2mVC/F7fDEdH2El3HzUg9It/XsCxZiOTTA3m3qYfcSVSbTfM6Q9xG+hYDniZssYhlXKKUMD5m8tF4Q==",
+      "version": "7.22.0",
+      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.22.0.tgz",
+      "integrity": "sha512-NtXlm3f6cNWIv003cETdlz9sss0VMNtplyatFohxWPz90AbwuhCbHbQopkGis6bG1vOunDLN0FF/4Uv5i8LFZQ==",
       "dependencies": {
         "@babel/helper-string-parser": "^7.21.5",
         "@babel/helper-validator-identifier": "^7.19.1",
@@ -17512,25 +17512,25 @@
       }
     },
     "@babel/compat-data": {
-      "version": "7.21.7",
-      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.21.7.tgz",
-      "integrity": "sha512-KYMqFYTaenzMK4yUtf4EW9wc4N9ef80FsbMtkwool5zpwl4YrT1SdWYSTRcT94KO4hannogdS+LxY7L+arP3gA=="
+      "version": "7.22.0",
+      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.22.0.tgz",
+      "integrity": "sha512-OgCMbbNCD/iA8cjMt+Zhp+nIC7XKaEaTG8zjvZPjGbhkppq1NIMWiZn7EaZRxUDHn4Ul265scRqg94N2WiFaGw=="
     },
     "@babel/core": {
-      "version": "7.21.8",
-      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.21.8.tgz",
-      "integrity": "sha512-YeM22Sondbo523Sz0+CirSPnbj9bG3P0CdHcBZdqUuaeOaYEFbOLoGU7lebvGP6P5J/WE9wOn7u7C4J9HvS1xQ==",
+      "version": "7.22.1",
+      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.22.1.tgz",
+      "integrity": "sha512-Hkqu7J4ynysSXxmAahpN1jjRwVJ+NdpraFLIWflgjpVob3KNyK3/tIUc7Q7szed8WMp0JNa7Qtd1E9Oo22F9gA==",
       "requires": {
         "@ampproject/remapping": "^2.2.0",
         "@babel/code-frame": "^7.21.4",
-        "@babel/generator": "^7.21.5",
-        "@babel/helper-compilation-targets": "^7.21.5",
-        "@babel/helper-module-transforms": "^7.21.5",
-        "@babel/helpers": "^7.21.5",
-        "@babel/parser": "^7.21.8",
-        "@babel/template": "^7.20.7",
-        "@babel/traverse": "^7.21.5",
-        "@babel/types": "^7.21.5",
+        "@babel/generator": "^7.22.0",
+        "@babel/helper-compilation-targets": "^7.22.1",
+        "@babel/helper-module-transforms": "^7.22.1",
+        "@babel/helpers": "^7.22.0",
+        "@babel/parser": "^7.22.0",
+        "@babel/template": "^7.21.9",
+        "@babel/traverse": "^7.22.1",
+        "@babel/types": "^7.22.0",
         "convert-source-map": "^1.7.0",
         "debug": "^4.1.0",
         "gensync": "^1.0.0-beta.2",
@@ -17539,11 +17539,11 @@
       }
     },
     "@babel/generator": {
-      "version": "7.21.5",
-      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.21.5.tgz",
-      "integrity": "sha512-SrKK/sRv8GesIW1bDagf9cCG38IOMYZusoe1dfg0D8aiUe3Amvoj1QtjTPAWcfrZFvIwlleLb0gxzQidL9w14w==",
+      "version": "7.22.0",
+      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.22.0.tgz",
+      "integrity": "sha512-tyzR0OsH88AelgukhL2rbEUCLKBGmy2G9Th/5vpyOt0zf44Be61kvIQXjCwTSX8t+qJ/vMwZfhK6mPdrMLZXRg==",
       "requires": {
-        "@babel/types": "^7.21.5",
+        "@babel/types": "^7.22.0",
         "@jridgewell/gen-mapping": "^0.3.2",
         "@jridgewell/trace-mapping": "^0.3.17",
         "jsesc": "^2.5.1"
@@ -17568,11 +17568,11 @@
       }
     },
     "@babel/helper-compilation-targets": {
-      "version": "7.21.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.21.5.tgz",
-      "integrity": "sha512-1RkbFGUKex4lvsB9yhIfWltJM5cZKUftB2eNajaDv3dCMEp49iBG0K14uH8NnX9IPux2+mK7JGEOB0jn48/J6w==",
+      "version": "7.22.1",
+      "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.22.1.tgz",
+      "integrity": "sha512-Rqx13UM3yVB5q0D/KwQ8+SPfX/+Rnsy1Lw1k/UwOC4KC6qrzIQoY3lYnBu5EHKBlEHHcj0M0W8ltPSkD8rqfsQ==",
       "requires": {
-        "@babel/compat-data": "^7.21.5",
+        "@babel/compat-data": "^7.22.0",
         "@babel/helper-validator-option": "^7.21.0",
         "browserslist": "^4.21.3",
         "lru-cache": "^5.1.1",
@@ -17634,9 +17634,9 @@
       }
     },
     "@babel/helper-environment-visitor": {
-      "version": "7.21.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.21.5.tgz",
-      "integrity": "sha512-IYl4gZ3ETsWocUWgsFZLM5i1BYx9SoemminVEXadgLBa9TdeorzgLKm8wWLA6J1N/kT3Kch8XIk1laNzYoHKvQ=="
+      "version": "7.22.1",
+      "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.22.1.tgz",
+      "integrity": "sha512-Z2tgopurB/kTbidvzeBrc2To3PUP/9i5MUe+fU6QJCQDyPwSH2oRapkLw3KGECDYSjhQZCNxEvNvZlLw8JjGwA=="
     },
     "@babel/helper-explode-assignable-expression": {
       "version": "7.18.6",
@@ -17682,18 +17682,18 @@
       }
     },
     "@babel/helper-module-transforms": {
-      "version": "7.21.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.21.5.tgz",
-      "integrity": "sha512-bI2Z9zBGY2q5yMHoBvJ2a9iX3ZOAzJPm7Q8Yz6YeoUjU/Cvhmi2G4QyTNyPBqqXSgTjUxRg3L0xV45HvkNWWBw==",
+      "version": "7.22.1",
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.22.1.tgz",
+      "integrity": "sha512-dxAe9E7ySDGbQdCVOY/4+UcD8M9ZFqZcZhSPsPacvCG4M+9lwtDDQfI2EoaSvmf7W/8yCBkGU0m7Pvt1ru3UZw==",
       "requires": {
-        "@babel/helper-environment-visitor": "^7.21.5",
+        "@babel/helper-environment-visitor": "^7.22.1",
         "@babel/helper-module-imports": "^7.21.4",
         "@babel/helper-simple-access": "^7.21.5",
         "@babel/helper-split-export-declaration": "^7.18.6",
         "@babel/helper-validator-identifier": "^7.19.1",
-        "@babel/template": "^7.20.7",
-        "@babel/traverse": "^7.21.5",
-        "@babel/types": "^7.21.5"
+        "@babel/template": "^7.21.9",
+        "@babel/traverse": "^7.22.1",
+        "@babel/types": "^7.22.0"
       }
     },
     "@babel/helper-optimise-call-expression": {
@@ -17789,13 +17789,13 @@
       }
     },
     "@babel/helpers": {
-      "version": "7.21.5",
-      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.21.5.tgz",
-      "integrity": "sha512-BSY+JSlHxOmGsPTydUkPf1MdMQ3M81x5xGCOVgWM3G8XH77sJ292Y2oqcp0CbbgxhqBuI46iUz1tT7hqP7EfgA==",
+      "version": "7.22.0",
+      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.22.0.tgz",
+      "integrity": "sha512-I/hZCYErxdjuUnJpJxHmCESB3AdcOAFjj+K6+of9JyWBeAhggR9NQoUHI481pRNH87cx77mbpx0cygzXlvGayA==",
       "requires": {
-        "@babel/template": "^7.20.7",
-        "@babel/traverse": "^7.21.5",
-        "@babel/types": "^7.21.5"
+        "@babel/template": "^7.21.9",
+        "@babel/traverse": "^7.22.0",
+        "@babel/types": "^7.22.0"
       }
     },
     "@babel/highlight": {
@@ -17809,9 +17809,9 @@
       }
     },
     "@babel/parser": {
-      "version": "7.21.8",
-      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.21.8.tgz",
-      "integrity": "sha512-6zavDGdzG3gUqAdWvlLFfk+36RilI+Pwyuuh7HItyeScCWP3k6i8vKclAQ0bM/0y/Kz/xiwvxhMv9MgTJP5gmA=="
+      "version": "7.22.0",
+      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.22.0.tgz",
+      "integrity": "sha512-DA65VCJRetcFmJnt9/hEmRvXNCwk0V86dxG6p6N13hzDazaLRjGdTGPGgjxZOtLuFgWzOSRX4grybmRXwQ9bSg=="
     },
     "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": {
       "version": "7.18.6",
@@ -18625,36 +18625,36 @@
       }
     },
     "@babel/template": {
-      "version": "7.20.7",
-      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.20.7.tgz",
-      "integrity": "sha512-8SegXApWe6VoNw0r9JHpSteLKTpTiLZ4rMlGIm9JQ18KiCtyQiAMEazujAHrUS5flrcqYZa75ukev3P6QmUwUw==",
+      "version": "7.21.9",
+      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.21.9.tgz",
+      "integrity": "sha512-MK0X5k8NKOuWRamiEfc3KEJiHMTkGZNUjzMipqCGDDc6ijRl/B7RGSKVGncu4Ro/HdyzzY6cmoXuKI2Gffk7vQ==",
       "requires": {
-        "@babel/code-frame": "^7.18.6",
-        "@babel/parser": "^7.20.7",
-        "@babel/types": "^7.20.7"
+        "@babel/code-frame": "^7.21.4",
+        "@babel/parser": "^7.21.9",
+        "@babel/types": "^7.21.5"
       }
     },
     "@babel/traverse": {
-      "version": "7.21.5",
-      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.21.5.tgz",
-      "integrity": "sha512-AhQoI3YjWi6u/y/ntv7k48mcrCXmus0t79J9qPNlk/lAsFlCiJ047RmbfMOawySTHtywXhbXgpx/8nXMYd+oFw==",
+      "version": "7.22.1",
+      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.22.1.tgz",
+      "integrity": "sha512-lAWkdCoUFnmwLBhIRLciFntGYsIIoC6vIbN8zrLPqBnJmPu7Z6nzqnKd7FsxQUNAvZfVZ0x6KdNvNp8zWIOHSQ==",
       "requires": {
         "@babel/code-frame": "^7.21.4",
-        "@babel/generator": "^7.21.5",
-        "@babel/helper-environment-visitor": "^7.21.5",
+        "@babel/generator": "^7.22.0",
+        "@babel/helper-environment-visitor": "^7.22.1",
         "@babel/helper-function-name": "^7.21.0",
         "@babel/helper-hoist-variables": "^7.18.6",
         "@babel/helper-split-export-declaration": "^7.18.6",
-        "@babel/parser": "^7.21.5",
-        "@babel/types": "^7.21.5",
+        "@babel/parser": "^7.22.0",
+        "@babel/types": "^7.22.0",
         "debug": "^4.1.0",
         "globals": "^11.1.0"
       }
     },
     "@babel/types": {
-      "version": "7.21.5",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.21.5.tgz",
-      "integrity": "sha512-m4AfNvVF2mVC/F7fDEdH2El3HzUg9It/XsCxZiOTTA3m3qYfcSVSbTfM6Q9xG+hYDniZssYhlXKKUMD5m8tF4Q==",
+      "version": "7.22.0",
+      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.22.0.tgz",
+      "integrity": "sha512-NtXlm3f6cNWIv003cETdlz9sss0VMNtplyatFohxWPz90AbwuhCbHbQopkGis6bG1vOunDLN0FF/4Uv5i8LFZQ==",
       "requires": {
         "@babel/helper-string-parser": "^7.21.5",
         "@babel/helper-validator-identifier": "^7.19.1",
diff --git a/apps/block_scout_web/assets/package.json b/apps/block_scout_web/assets/package.json
index da8b27450eb3..9b17d7f09623 100644
--- a/apps/block_scout_web/assets/package.json
+++ b/apps/block_scout_web/assets/package.json
@@ -83,7 +83,7 @@
     "xss": "^1.0.14"
   },
   "devDependencies": {
-    "@babel/core": "^7.21.8",
+    "@babel/core": "^7.22.1",
     "@babel/preset-env": "^7.21.5",
     "autoprefixer": "^10.4.14",
     "babel-loader": "^9.1.2",

From 13fcbf054a7c465efe271d54cf7addbaf61bdb0d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 26 May 2023 19:02:04 +0000
Subject: [PATCH 024/909] Bump postcss-loader from 7.3.0 to 7.3.1 in
 /apps/block_scout_web/assets

Bumps [postcss-loader](https://github.com/webpack-contrib/postcss-loader) from 7.3.0 to 7.3.1.
- [Release notes](https://github.com/webpack-contrib/postcss-loader/releases)
- [Changelog](https://github.com/webpack-contrib/postcss-loader/blob/master/CHANGELOG.md)
- [Commits](https://github.com/webpack-contrib/postcss-loader/compare/v7.3.0...v7.3.1)

---
updated-dependencies:
- dependency-name: postcss-loader
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 apps/block_scout_web/assets/package-lock.json | 14 +++++++-------
 apps/block_scout_web/assets/package.json      |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/apps/block_scout_web/assets/package-lock.json b/apps/block_scout_web/assets/package-lock.json
index 5951995bafa2..f008497ab31e 100644
--- a/apps/block_scout_web/assets/package-lock.json
+++ b/apps/block_scout_web/assets/package-lock.json
@@ -88,7 +88,7 @@
         "jest-environment-jsdom": "^29.5.0",
         "mini-css-extract-plugin": "^2.7.6",
         "postcss": "^8.4.23",
-        "postcss-loader": "^7.3.0",
+        "postcss-loader": "^7.3.1",
         "sass": "^1.62.1",
         "sass-loader": "^13.3.0",
         "style-loader": "^3.3.3",
@@ -13441,9 +13441,9 @@
       }
     },
     "node_modules/postcss-loader": {
-      "version": "7.3.0",
-      "resolved": "https://registry.npmjs.org/postcss-loader/-/postcss-loader-7.3.0.tgz",
-      "integrity": "sha512-qLAFjvR2BFNz1H930P7mj1iuWJFjGey/nVhimfOAAQ1ZyPpcClAxP8+A55Sl8mBvM+K2a9Pjgdj10KpANWrNfw==",
+      "version": "7.3.1",
+      "resolved": "https://registry.npmjs.org/postcss-loader/-/postcss-loader-7.3.1.tgz",
+      "integrity": "sha512-uevGt8yy2gvruNvzy8jxgYSSnyqBcA7CnS6/57qoZnUMM51XgsTqxIpWZWdHyvIyo4ov0lCgnzIbhtWwVFI8lg==",
       "dev": true,
       "dependencies": {
         "cosmiconfig": "^8.1.3",
@@ -27551,9 +27551,9 @@
       "requires": {}
     },
     "postcss-loader": {
-      "version": "7.3.0",
-      "resolved": "https://registry.npmjs.org/postcss-loader/-/postcss-loader-7.3.0.tgz",
-      "integrity": "sha512-qLAFjvR2BFNz1H930P7mj1iuWJFjGey/nVhimfOAAQ1ZyPpcClAxP8+A55Sl8mBvM+K2a9Pjgdj10KpANWrNfw==",
+      "version": "7.3.1",
+      "resolved": "https://registry.npmjs.org/postcss-loader/-/postcss-loader-7.3.1.tgz",
+      "integrity": "sha512-uevGt8yy2gvruNvzy8jxgYSSnyqBcA7CnS6/57qoZnUMM51XgsTqxIpWZWdHyvIyo4ov0lCgnzIbhtWwVFI8lg==",
       "dev": true,
       "requires": {
         "cosmiconfig": "^8.1.3",
diff --git a/apps/block_scout_web/assets/package.json b/apps/block_scout_web/assets/package.json
index da8b27450eb3..e469a97d8e82 100644
--- a/apps/block_scout_web/assets/package.json
+++ b/apps/block_scout_web/assets/package.json
@@ -100,7 +100,7 @@
     "jest-environment-jsdom": "^29.5.0",
     "mini-css-extract-plugin": "^2.7.6",
     "postcss": "^8.4.23",
-    "postcss-loader": "^7.3.0",
+    "postcss-loader": "^7.3.1",
     "sass": "^1.62.1",
     "sass-loader": "^13.3.0",
     "style-loader": "^3.3.3",

From e2c83881ce1c781e3d013a59f44cc2b6f2431861 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 26 May 2023 19:02:06 +0000
Subject: [PATCH 025/909] Bump number from 1.0.3 to 1.0.4

Bumps [number](https://github.com/danielberkompas/number) from 1.0.3 to 1.0.4.
- [Changelog](https://github.com/danielberkompas/number/blob/master/CHANGELOG.md)
- [Commits](https://github.com/danielberkompas/number/compare/v1.0.3...v1.0.4)

---
updated-dependencies:
- dependency-name: number
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 mix.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mix.lock b/mix.lock
index 6b6aaada5edf..e9c07b1cbc2d 100644
--- a/mix.lock
+++ b/mix.lock
@@ -92,7 +92,7 @@
   "nimble_csv": {:hex, :nimble_csv, "1.2.0", "4e26385d260c61eba9d4412c71cea34421f296d5353f914afe3f2e71cce97722", [:mix], [], "hexpm", "d0628117fcc2148178b034044c55359b26966c6eaa8e2ce15777be3bbc91b12a"},
   "nimble_options": {:hex, :nimble_options, "1.0.2", "92098a74df0072ff37d0c12ace58574d26880e522c22801437151a159392270e", [:mix], [], "hexpm", "fd12a8db2021036ce12a309f26f564ec367373265b53e25403f0ee697380f1b8"},
   "nimble_parsec": {:hex, :nimble_parsec, "1.3.1", "2c54013ecf170e249e9291ed0a62e5832f70a476c61da16f6aac6dca0189f2af", [:mix], [], "hexpm", "2682e3c0b2eb58d90c6375fc0cc30bc7be06f365bf72608804fb9cffa5e1b167"},
-  "number": {:hex, :number, "1.0.3", "932c8a2d478a181c624138958ca88a78070332191b8061717270d939778c9857", [:mix], [{:decimal, "~> 1.5 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: false]}], "hexpm", "dd397bbc096b2ca965a6a430126cc9cf7b9ef7421130def69bcf572232ca0f18"},
+  "number": {:hex, :number, "1.0.4", "3e6e6032a3c1d4c3760e77a42c580a57a15545dd993af380809da30fe51a032c", [:mix], [{:decimal, "~> 1.5 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: false]}], "hexpm", "16f7516584ef2be812af4f33f2eaf3f9b9f6ed8892f45853eb93113f83721e42"},
   "numbers": {:hex, :numbers, "5.2.4", "f123d5bb7f6acc366f8f445e10a32bd403c8469bdbce8ce049e1f0972b607080", [:mix], [{:coerce, "~> 1.0", [hex: :coerce, repo: "hexpm", optional: false]}, {:decimal, "~> 1.9 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: true]}], "hexpm", "eeccf5c61d5f4922198395bf87a465b6f980b8b862dd22d28198c5e6fab38582"},
   "oauth2": {:hex, :oauth2, "2.0.1", "70729503e05378697b958919bb2d65b002ba6b28c8112328063648a9348aaa3f", [:mix], [{:hackney, "~> 1.13", [hex: :hackney, repo: "hexpm", optional: false]}], "hexpm", "c64e20d4d105bcdbcbe03170fb530d0eddc3a3e6b135a87528a22c8aecf74c52"},
   "optimal": {:hex, :optimal, "0.3.6", "46bbf52fbbbd238cda81e02560caa84f93a53c75620f1fe19e81e4ae7b07d1dd", [:mix], [], "hexpm", "1a06ea6a653120226b35b283a1cd10039550f2c566edcdec22b29316d73640fd"},

From 69b94e4fa3efe344278f5a838d7c5070450b97b9 Mon Sep 17 00:00:00 2001
From: Viktor Baranov <baranov.viktor.27@gmail.com>
Date: Mon, 29 May 2023 10:21:18 +0300
Subject: [PATCH 026/909] Revert update to Erlang/OTP 26

---
 .tool-versions | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.tool-versions b/.tool-versions
index c1333377682e..ac759f5a58da 100644
--- a/.tool-versions
+++ b/.tool-versions
@@ -1,3 +1,3 @@
-elixir 1.14.5-otp-26
-erlang 26.0
+elixir 1.14.4-otp-25
+erlang 25.3
 nodejs 18.13.0

From 5b5f77c316df9bf8d10153faa298a20f7bb4e7a6 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 29 May 2023 09:29:10 +0000
Subject: [PATCH 027/909] Bump @babel/preset-env in
 /apps/block_scout_web/assets

Bumps [@babel/preset-env](https://github.com/babel/babel/tree/HEAD/packages/babel-preset-env) from 7.21.5 to 7.22.2.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/commits/v7.22.2/packages/babel-preset-env)

---
updated-dependencies:
- dependency-name: "@babel/preset-env"
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 apps/block_scout_web/assets/package-lock.json | 1315 ++++++++++-------
 apps/block_scout_web/assets/package.json      |    2 +-
 2 files changed, 775 insertions(+), 542 deletions(-)

diff --git a/apps/block_scout_web/assets/package-lock.json b/apps/block_scout_web/assets/package-lock.json
index 7096d0bbb3fc..0f7fa49f1d36 100644
--- a/apps/block_scout_web/assets/package-lock.json
+++ b/apps/block_scout_web/assets/package-lock.json
@@ -72,7 +72,7 @@
       },
       "devDependencies": {
         "@babel/core": "^7.22.1",
-        "@babel/preset-env": "^7.21.5",
+        "@babel/preset-env": "^7.22.2",
         "autoprefixer": "^10.4.14",
         "babel-loader": "^9.1.2",
         "copy-webpack-plugin": "^11.0.0",
@@ -252,9 +252,9 @@
       }
     },
     "node_modules/@babel/compat-data": {
-      "version": "7.22.0",
-      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.22.0.tgz",
-      "integrity": "sha512-OgCMbbNCD/iA8cjMt+Zhp+nIC7XKaEaTG8zjvZPjGbhkppq1NIMWiZn7EaZRxUDHn4Ul265scRqg94N2WiFaGw==",
+      "version": "7.22.3",
+      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.22.3.tgz",
+      "integrity": "sha512-aNtko9OPOwVESUFp3MZfD8Uzxl7JzSeJpd7npIoxCasU37PFbAQRpKglkaKwlHOyeJdrREpo8TW8ldrkYWwvIQ==",
       "engines": {
         "node": ">=6.9.0"
       }
@@ -358,19 +358,20 @@
       "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g=="
     },
     "node_modules/@babel/helper-create-class-features-plugin": {
-      "version": "7.21.4",
-      "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.21.4.tgz",
-      "integrity": "sha512-46QrX2CQlaFRF4TkwfTt6nJD7IHq8539cCL7SDpqWSDeJKY1xylKKY5F/33mJhLZ3mFvKv2gGrVS6NkyF6qs+Q==",
+      "version": "7.22.1",
+      "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.22.1.tgz",
+      "integrity": "sha512-SowrZ9BWzYFgzUMwUmowbPSGu6CXL5MSuuCkG3bejahSpSymioPmuLdhPxNOc9MjuNGjy7M/HaXvJ8G82Lywlw==",
       "dev": true,
       "dependencies": {
         "@babel/helper-annotate-as-pure": "^7.18.6",
-        "@babel/helper-environment-visitor": "^7.18.9",
+        "@babel/helper-environment-visitor": "^7.22.1",
         "@babel/helper-function-name": "^7.21.0",
-        "@babel/helper-member-expression-to-functions": "^7.21.0",
+        "@babel/helper-member-expression-to-functions": "^7.22.0",
         "@babel/helper-optimise-call-expression": "^7.18.6",
-        "@babel/helper-replace-supers": "^7.20.7",
+        "@babel/helper-replace-supers": "^7.22.1",
         "@babel/helper-skip-transparent-expression-wrappers": "^7.20.0",
-        "@babel/helper-split-export-declaration": "^7.18.6"
+        "@babel/helper-split-export-declaration": "^7.18.6",
+        "semver": "^6.3.0"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -380,13 +381,14 @@
       }
     },
     "node_modules/@babel/helper-create-regexp-features-plugin": {
-      "version": "7.21.4",
-      "resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.21.4.tgz",
-      "integrity": "sha512-M00OuhU+0GyZ5iBBN9czjugzWrEq2vDpf/zCYHxxf93ul/Q5rv+a5h+/+0WnI1AebHNVtl5bFV0qsJoH23DbfA==",
+      "version": "7.22.1",
+      "resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.22.1.tgz",
+      "integrity": "sha512-WWjdnfR3LPIe+0EY8td7WmjhytxXtjKAEpnAxun/hkNiyOaPlvGK+NZaBFIdi9ndYV3Gav7BpFvtUwnaJlwi1w==",
       "dev": true,
       "dependencies": {
         "@babel/helper-annotate-as-pure": "^7.18.6",
-        "regexpu-core": "^5.3.1"
+        "regexpu-core": "^5.3.1",
+        "semver": "^6.3.0"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -455,12 +457,12 @@
       }
     },
     "node_modules/@babel/helper-member-expression-to-functions": {
-      "version": "7.21.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.21.0.tgz",
-      "integrity": "sha512-Muu8cdZwNN6mRRNG6lAYErJ5X3bRevgYR2O8wN0yn7jJSnGDu6eG59RfT29JHxGUovyfrh6Pj0XzmR7drNVL3Q==",
+      "version": "7.22.3",
+      "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.22.3.tgz",
+      "integrity": "sha512-Gl7sK04b/2WOb6OPVeNy9eFKeD3L6++CzL3ykPOWqTn08xgYYK0wz4TUh2feIImDXxcVW3/9WQ1NMKY66/jfZA==",
       "dev": true,
       "dependencies": {
-        "@babel/types": "^7.21.0"
+        "@babel/types": "^7.22.3"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -534,17 +536,17 @@
       }
     },
     "node_modules/@babel/helper-replace-supers": {
-      "version": "7.20.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.20.7.tgz",
-      "integrity": "sha512-vujDMtB6LVfNW13jhlCrp48QNslK6JXi7lQG736HVbHz/mbf4Dc7tIRh1Xf5C0rF7BP8iiSxGMCmY6Ci1ven3A==",
+      "version": "7.22.1",
+      "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.22.1.tgz",
+      "integrity": "sha512-ut4qrkE4AuSfrwHSps51ekR1ZY/ygrP1tp0WFm8oVq6nzc/hvfV/22JylndIbsf2U2M9LOMwiSddr6y+78j+OQ==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-environment-visitor": "^7.18.9",
-        "@babel/helper-member-expression-to-functions": "^7.20.7",
+        "@babel/helper-environment-visitor": "^7.22.1",
+        "@babel/helper-member-expression-to-functions": "^7.22.0",
         "@babel/helper-optimise-call-expression": "^7.18.6",
-        "@babel/template": "^7.20.7",
-        "@babel/traverse": "^7.20.7",
-        "@babel/types": "^7.20.7"
+        "@babel/template": "^7.21.9",
+        "@babel/traverse": "^7.22.1",
+        "@babel/types": "^7.22.0"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -676,14 +678,14 @@
       }
     },
     "node_modules/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": {
-      "version": "7.20.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.20.7.tgz",
-      "integrity": "sha512-sbr9+wNE5aXMBBFBICk01tt7sBf2Oc9ikRFEcem/ZORup9IMUdNhW7/wVLEbbtlWOsEubJet46mHAL2C8+2jKQ==",
+      "version": "7.22.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.22.3.tgz",
+      "integrity": "sha512-6r4yRwEnorYByILoDRnEqxtojYKuiIv9FojW2E8GUKo9eWBwbKcd9IiZOZpdyXc64RmyGGyPu3/uAcrz/dq2kQ==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.20.2",
+        "@babel/helper-plugin-utils": "^7.21.5",
         "@babel/helper-skip-transparent-expression-wrappers": "^7.20.0",
-        "@babel/plugin-proposal-optional-chaining": "^7.20.7"
+        "@babel/plugin-transform-optional-chaining": "^7.22.3"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -692,221 +694,6 @@
         "@babel/core": "^7.13.0"
       }
     },
-    "node_modules/@babel/plugin-proposal-async-generator-functions": {
-      "version": "7.20.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.20.7.tgz",
-      "integrity": "sha512-xMbiLsn/8RK7Wq7VeVytytS2L6qE69bXPB10YCmMdDZbKF4okCqY74pI/jJQ/8U0b/F6NrT2+14b8/P9/3AMGA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-environment-visitor": "^7.18.9",
-        "@babel/helper-plugin-utils": "^7.20.2",
-        "@babel/helper-remap-async-to-generator": "^7.18.9",
-        "@babel/plugin-syntax-async-generators": "^7.8.4"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-proposal-class-properties": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.18.6.tgz",
-      "integrity": "sha512-cumfXOF0+nzZrrN8Rf0t7M+tF6sZc7vhQwYQck9q1/5w2OExlD+b4v4RpMJFaV1Z7WcDRgO6FqvxqxGlwo+RHQ==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-create-class-features-plugin": "^7.18.6",
-        "@babel/helper-plugin-utils": "^7.18.6"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-proposal-class-static-block": {
-      "version": "7.21.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-class-static-block/-/plugin-proposal-class-static-block-7.21.0.tgz",
-      "integrity": "sha512-XP5G9MWNUskFuP30IfFSEFB0Z6HzLIUcjYM4bYOPHXl7eiJ9HFv8tWj6TXTN5QODiEhDZAeI4hLok2iHFFV4hw==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-create-class-features-plugin": "^7.21.0",
-        "@babel/helper-plugin-utils": "^7.20.2",
-        "@babel/plugin-syntax-class-static-block": "^7.14.5"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.12.0"
-      }
-    },
-    "node_modules/@babel/plugin-proposal-dynamic-import": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.18.6.tgz",
-      "integrity": "sha512-1auuwmK+Rz13SJj36R+jqFPMJWyKEDd7lLSdOj4oJK0UTgGueSAtkrCvz9ewmgyU/P941Rv2fQwZJN8s6QruXw==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.18.6",
-        "@babel/plugin-syntax-dynamic-import": "^7.8.3"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-proposal-export-namespace-from": {
-      "version": "7.18.9",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.18.9.tgz",
-      "integrity": "sha512-k1NtHyOMvlDDFeb9G5PhUXuGj8m/wiwojgQVEhJ/fsVsMCpLyOP4h0uGEjYJKrRI+EVPlb5Jk+Gt9P97lOGwtA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.18.9",
-        "@babel/plugin-syntax-export-namespace-from": "^7.8.3"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-proposal-json-strings": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.18.6.tgz",
-      "integrity": "sha512-lr1peyn9kOdbYc0xr0OdHTZ5FMqS6Di+H0Fz2I/JwMzGmzJETNeOFq2pBySw6X/KFL5EWDjlJuMsUGRFb8fQgQ==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.18.6",
-        "@babel/plugin-syntax-json-strings": "^7.8.3"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-proposal-logical-assignment-operators": {
-      "version": "7.20.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.20.7.tgz",
-      "integrity": "sha512-y7C7cZgpMIjWlKE5T7eJwp+tnRYM89HmRvWM5EQuB5BoHEONjmQ8lSNmBUwOyy/GFRsohJED51YBF79hE1djug==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.20.2",
-        "@babel/plugin-syntax-logical-assignment-operators": "^7.10.4"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-proposal-nullish-coalescing-operator": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.18.6.tgz",
-      "integrity": "sha512-wQxQzxYeJqHcfppzBDnm1yAY0jSRkUXR2z8RePZYrKwMKgMlE8+Z6LUno+bd6LvbGh8Gltvy74+9pIYkr+XkKA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.18.6",
-        "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-proposal-numeric-separator": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.18.6.tgz",
-      "integrity": "sha512-ozlZFogPqoLm8WBr5Z8UckIoE4YQ5KESVcNudyXOR8uqIkliTEgJ3RoketfG6pmzLdeZF0H/wjE9/cCEitBl7Q==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.18.6",
-        "@babel/plugin-syntax-numeric-separator": "^7.10.4"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-proposal-object-rest-spread": {
-      "version": "7.20.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.20.7.tgz",
-      "integrity": "sha512-d2S98yCiLxDVmBmE8UjGcfPvNEUbA1U5q5WxaWFUGRzJSVAZqm5W6MbPct0jxnegUZ0niLeNX+IOzEs7wYg9Dg==",
-      "dev": true,
-      "dependencies": {
-        "@babel/compat-data": "^7.20.5",
-        "@babel/helper-compilation-targets": "^7.20.7",
-        "@babel/helper-plugin-utils": "^7.20.2",
-        "@babel/plugin-syntax-object-rest-spread": "^7.8.3",
-        "@babel/plugin-transform-parameters": "^7.20.7"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-proposal-optional-catch-binding": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.18.6.tgz",
-      "integrity": "sha512-Q40HEhs9DJQyaZfUjjn6vE8Cv4GmMHCYuMGIWUnlxH6400VGxOuwWsPt4FxXxJkC/5eOzgn0z21M9gMT4MOhbw==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.18.6",
-        "@babel/plugin-syntax-optional-catch-binding": "^7.8.3"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-proposal-optional-chaining": {
-      "version": "7.21.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.21.0.tgz",
-      "integrity": "sha512-p4zeefM72gpmEe2fkUr/OnOXpWEf8nAgk7ZYVqqfFiyIG7oFfVZcCrU64hWn5xp4tQ9LkV4bTIa5rD0KANpKNA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.20.2",
-        "@babel/helper-skip-transparent-expression-wrappers": "^7.20.0",
-        "@babel/plugin-syntax-optional-chaining": "^7.8.3"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-proposal-private-methods": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.18.6.tgz",
-      "integrity": "sha512-nutsvktDItsNn4rpGItSNV2sz1XwS+nfU0Rg8aCx3W3NOKVzdMjJRu0O5OkgDp3ZGICSTbgRpxZoWsxoKRvbeA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-create-class-features-plugin": "^7.18.6",
-        "@babel/helper-plugin-utils": "^7.18.6"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
     "node_modules/@babel/plugin-proposal-private-property-in-object": {
       "version": "7.21.0",
       "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.21.0.tgz",
@@ -1031,6 +818,21 @@
         "@babel/core": "^7.0.0-0"
       }
     },
+    "node_modules/@babel/plugin-syntax-import-attributes": {
+      "version": "7.22.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-attributes/-/plugin-syntax-import-attributes-7.22.3.tgz",
+      "integrity": "sha512-i35jZJv6aO7hxEbIWQ41adVfOzjm9dcYDNeWlBMd8p0ZQRtNUCBrmGwZt+H5lb+oOC9a3svp956KP0oWGA1YsA==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.21.5"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
     "node_modules/@babel/plugin-syntax-import-meta": {
       "version": "7.10.4",
       "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-meta/-/plugin-syntax-import-meta-7.10.4.tgz",
@@ -1187,6 +989,22 @@
         "@babel/core": "^7.0.0-0"
       }
     },
+    "node_modules/@babel/plugin-syntax-unicode-sets-regex": {
+      "version": "7.18.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-unicode-sets-regex/-/plugin-syntax-unicode-sets-regex-7.18.6.tgz",
+      "integrity": "sha512-727YkEAPwSIQTv5im8QHz3upqp92JTWhidIC81Tdx4VJYIte/VndKf1qKrfnnhPLiPghStWfvC/iFaMCQu7Nqg==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-create-regexp-features-plugin": "^7.18.6",
+        "@babel/helper-plugin-utils": "^7.18.6"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0"
+      }
+    },
     "node_modules/@babel/plugin-transform-arrow-functions": {
       "version": "7.21.5",
       "resolved": "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.21.5.tgz",
@@ -1202,6 +1020,24 @@
         "@babel/core": "^7.0.0-0"
       }
     },
+    "node_modules/@babel/plugin-transform-async-generator-functions": {
+      "version": "7.22.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-generator-functions/-/plugin-transform-async-generator-functions-7.22.3.tgz",
+      "integrity": "sha512-36A4Aq48t66btydbZd5Fk0/xJqbpg/v4QWI4AH4cYHBXy9Mu42UOupZpebKFiCFNT9S9rJFcsld0gsv0ayLjtA==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-environment-visitor": "^7.22.1",
+        "@babel/helper-plugin-utils": "^7.21.5",
+        "@babel/helper-remap-async-to-generator": "^7.18.9",
+        "@babel/plugin-syntax-async-generators": "^7.8.4"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
     "node_modules/@babel/plugin-transform-async-to-generator": {
       "version": "7.20.7",
       "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.20.7.tgz",
@@ -1249,6 +1085,39 @@
         "@babel/core": "^7.0.0-0"
       }
     },
+    "node_modules/@babel/plugin-transform-class-properties": {
+      "version": "7.22.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-class-properties/-/plugin-transform-class-properties-7.22.3.tgz",
+      "integrity": "sha512-mASLsd6rhOrLZ5F3WbCxkzl67mmOnqik0zrg5W6D/X0QMW7HtvnoL1dRARLKIbMP3vXwkwziuLesPqWVGIl6Bw==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-create-class-features-plugin": "^7.22.1",
+        "@babel/helper-plugin-utils": "^7.21.5"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-class-static-block": {
+      "version": "7.22.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-class-static-block/-/plugin-transform-class-static-block-7.22.3.tgz",
+      "integrity": "sha512-5BirgNWNOx7cwbTJCOmKFJ1pZjwk5MUfMIwiBBvsirCJMZeQgs5pk6i1OlkVg+1Vef5LfBahFOrdCnAWvkVKMw==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-create-class-features-plugin": "^7.22.1",
+        "@babel/helper-plugin-utils": "^7.21.5",
+        "@babel/plugin-syntax-class-static-block": "^7.14.5"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.12.0"
+      }
+    },
     "node_modules/@babel/plugin-transform-classes": {
       "version": "7.21.0",
       "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.21.0.tgz",
@@ -1334,6 +1203,22 @@
         "@babel/core": "^7.0.0-0"
       }
     },
+    "node_modules/@babel/plugin-transform-dynamic-import": {
+      "version": "7.22.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dynamic-import/-/plugin-transform-dynamic-import-7.22.1.tgz",
+      "integrity": "sha512-rlhWtONnVBPdmt+jeewS0qSnMz/3yLFrqAP8hHC6EDcrYRSyuz9f9yQhHvVn2Ad6+yO9fHXac5piudeYrInxwQ==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.21.5",
+        "@babel/plugin-syntax-dynamic-import": "^7.8.3"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
     "node_modules/@babel/plugin-transform-exponentiation-operator": {
       "version": "7.18.6",
       "resolved": "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.18.6.tgz",
@@ -1350,6 +1235,22 @@
         "@babel/core": "^7.0.0-0"
       }
     },
+    "node_modules/@babel/plugin-transform-export-namespace-from": {
+      "version": "7.22.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-export-namespace-from/-/plugin-transform-export-namespace-from-7.22.3.tgz",
+      "integrity": "sha512-5Ti1cHLTDnt3vX61P9KZ5IG09bFXp4cDVFJIAeCZuxu9OXXJJZp5iP0n/rzM2+iAutJY+KWEyyHcRaHlpQ/P5g==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.21.5",
+        "@babel/plugin-syntax-export-namespace-from": "^7.8.3"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
     "node_modules/@babel/plugin-transform-for-of": {
       "version": "7.21.5",
       "resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.21.5.tgz",
@@ -1382,6 +1283,22 @@
         "@babel/core": "^7.0.0-0"
       }
     },
+    "node_modules/@babel/plugin-transform-json-strings": {
+      "version": "7.22.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-json-strings/-/plugin-transform-json-strings-7.22.3.tgz",
+      "integrity": "sha512-IuvOMdeOOY2X4hRNAT6kwbePtK21BUyrAEgLKviL8pL6AEEVUVcqtRdN/HJXBLGIbt9T3ETmXRnFedRRmQNTYw==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.21.5",
+        "@babel/plugin-syntax-json-strings": "^7.8.3"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
     "node_modules/@babel/plugin-transform-literals": {
       "version": "7.18.9",
       "resolved": "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.18.9.tgz",
@@ -1397,6 +1314,22 @@
         "@babel/core": "^7.0.0-0"
       }
     },
+    "node_modules/@babel/plugin-transform-logical-assignment-operators": {
+      "version": "7.22.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-logical-assignment-operators/-/plugin-transform-logical-assignment-operators-7.22.3.tgz",
+      "integrity": "sha512-CbayIfOw4av2v/HYZEsH+Klks3NC2/MFIR3QR8gnpGNNPEaq2fdlVCRYG/paKs7/5hvBLQ+H70pGWOHtlNEWNA==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.21.5",
+        "@babel/plugin-syntax-logical-assignment-operators": "^7.10.4"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
     "node_modules/@babel/plugin-transform-member-expression-literals": {
       "version": "7.18.6",
       "resolved": "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.18.6.tgz",
@@ -1446,14 +1379,14 @@
       }
     },
     "node_modules/@babel/plugin-transform-modules-systemjs": {
-      "version": "7.20.11",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.20.11.tgz",
-      "integrity": "sha512-vVu5g9BPQKSFEmvt2TA4Da5N+QVS66EX21d8uoOihC+OCpUoGvzVsXeqFdtAEfVa5BILAeFt+U7yVmLbQnAJmw==",
+      "version": "7.22.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.22.3.tgz",
+      "integrity": "sha512-V21W3bKLxO3ZjcBJZ8biSvo5gQ85uIXW2vJfh7JSWf/4SLUSr1tOoHX3ruN4+Oqa2m+BKfsxTR1I+PsvkIWvNw==",
       "dev": true,
       "dependencies": {
         "@babel/helper-hoist-variables": "^7.18.6",
-        "@babel/helper-module-transforms": "^7.20.11",
-        "@babel/helper-plugin-utils": "^7.20.2",
+        "@babel/helper-module-transforms": "^7.22.1",
+        "@babel/helper-plugin-utils": "^7.21.5",
         "@babel/helper-validator-identifier": "^7.19.1"
       },
       "engines": {
@@ -1480,13 +1413,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-named-capturing-groups-regex": {
-      "version": "7.20.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.20.5.tgz",
-      "integrity": "sha512-mOW4tTzi5iTLnw+78iEq3gr8Aoq4WNRGpmSlrogqaiCBoR1HFhpU4JkpQFOHfeYx3ReVIFWOQJS4aZBRvuZ6mA==",
+      "version": "7.22.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.22.3.tgz",
+      "integrity": "sha512-c6HrD/LpUdNNJsISQZpds3TXvfYIAbo+efE9aWmY/PmSRD0agrJ9cPMt4BmArwUQ7ZymEWTFjTyp+yReLJZh0Q==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-create-regexp-features-plugin": "^7.20.5",
-        "@babel/helper-plugin-utils": "^7.20.2"
+        "@babel/helper-create-regexp-features-plugin": "^7.22.1",
+        "@babel/helper-plugin-utils": "^7.21.5"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1496,12 +1429,63 @@
       }
     },
     "node_modules/@babel/plugin-transform-new-target": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.18.6.tgz",
-      "integrity": "sha512-DjwFA/9Iu3Z+vrAn+8pBUGcjhxKguSMlsFqeCKbhb9BAV756v0krzVK04CRDi/4aqmk8BsHb4a/gFcaA5joXRw==",
+      "version": "7.22.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.22.3.tgz",
+      "integrity": "sha512-5RuJdSo89wKdkRTqtM9RVVJzHum9c2s0te9rB7vZC1zKKxcioWIy+xcu4OoIAjyFZhb/bp5KkunuLin1q7Ct+w==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.18.6"
+        "@babel/helper-plugin-utils": "^7.21.5"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-nullish-coalescing-operator": {
+      "version": "7.22.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-nullish-coalescing-operator/-/plugin-transform-nullish-coalescing-operator-7.22.3.tgz",
+      "integrity": "sha512-CpaoNp16nX7ROtLONNuCyenYdY/l7ZsR6aoVa7rW7nMWisoNoQNIH5Iay/4LDyRjKMuElMqXiBoOQCDLTMGZiw==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.21.5",
+        "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-numeric-separator": {
+      "version": "7.22.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-numeric-separator/-/plugin-transform-numeric-separator-7.22.3.tgz",
+      "integrity": "sha512-+AF88fPDJrnseMh5vD9+SH6wq4ZMvpiTMHh58uLs+giMEyASFVhcT3NkoyO+NebFCNnpHJEq5AXO2txV4AGPDQ==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.21.5",
+        "@babel/plugin-syntax-numeric-separator": "^7.10.4"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-object-rest-spread": {
+      "version": "7.22.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-rest-spread/-/plugin-transform-object-rest-spread-7.22.3.tgz",
+      "integrity": "sha512-38bzTsqMMCI46/TQnJwPPpy33EjLCc1Gsm2hRTF6zTMWnKsN61vdrpuzIEGQyKEhDSYDKyZHrrd5FMj4gcUHhw==",
+      "dev": true,
+      "dependencies": {
+        "@babel/compat-data": "^7.22.3",
+        "@babel/helper-compilation-targets": "^7.22.1",
+        "@babel/helper-plugin-utils": "^7.21.5",
+        "@babel/plugin-syntax-object-rest-spread": "^7.8.3",
+        "@babel/plugin-transform-parameters": "^7.22.3"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1526,13 +1510,80 @@
         "@babel/core": "^7.0.0-0"
       }
     },
+    "node_modules/@babel/plugin-transform-optional-catch-binding": {
+      "version": "7.22.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-optional-catch-binding/-/plugin-transform-optional-catch-binding-7.22.3.tgz",
+      "integrity": "sha512-bnDFWXFzWY0BsOyqaoSXvMQ2F35zutQipugog/rqotL2S4ciFOKlRYUu9djt4iq09oh2/34hqfRR2k1dIvuu4g==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.21.5",
+        "@babel/plugin-syntax-optional-catch-binding": "^7.8.3"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-optional-chaining": {
+      "version": "7.22.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-optional-chaining/-/plugin-transform-optional-chaining-7.22.3.tgz",
+      "integrity": "sha512-63v3/UFFxhPKT8j8u1jTTGVyITxl7/7AfOqK8C5gz1rHURPUGe3y5mvIf68eYKGoBNahtJnTxBKug4BQOnzeJg==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.21.5",
+        "@babel/helper-skip-transparent-expression-wrappers": "^7.20.0",
+        "@babel/plugin-syntax-optional-chaining": "^7.8.3"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
     "node_modules/@babel/plugin-transform-parameters": {
-      "version": "7.21.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.21.3.tgz",
-      "integrity": "sha512-Wxc+TvppQG9xWFYatvCGPvZ6+SIUxQ2ZdiBP+PHYMIjnPXD+uThCshaz4NZOnODAtBjjcVQQ/3OKs9LW28purQ==",
+      "version": "7.22.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.22.3.tgz",
+      "integrity": "sha512-x7QHQJHPuD9VmfpzboyGJ5aHEr9r7DsAsdxdhJiTB3J3j8dyl+NFZ+rX5Q2RWFDCs61c06qBfS4ys2QYn8UkMw==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.20.2"
+        "@babel/helper-plugin-utils": "^7.21.5"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-private-methods": {
+      "version": "7.22.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-private-methods/-/plugin-transform-private-methods-7.22.3.tgz",
+      "integrity": "sha512-fC7jtjBPFqhqpPAE+O4LKwnLq7gGkD3ZmC2E3i4qWH34mH3gOg2Xrq5YMHUq6DM30xhqM1DNftiRaSqVjEG+ug==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-create-class-features-plugin": "^7.22.1",
+        "@babel/helper-plugin-utils": "^7.21.5"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-private-property-in-object": {
+      "version": "7.22.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-private-property-in-object/-/plugin-transform-private-property-in-object-7.22.3.tgz",
+      "integrity": "sha512-C7MMl4qWLpgVCbXfj3UW8rR1xeCnisQ0cU7YJHV//8oNBS0aCIVg1vFnZXxOckHhEpQyqNNkWmvSEWnMLlc+Vw==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-annotate-as-pure": "^7.18.6",
+        "@babel/helper-create-class-features-plugin": "^7.22.1",
+        "@babel/helper-plugin-utils": "^7.21.5",
+        "@babel/plugin-syntax-private-property-in-object": "^7.14.5"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1709,6 +1760,22 @@
         "@babel/core": "^7.0.0-0"
       }
     },
+    "node_modules/@babel/plugin-transform-unicode-property-regex": {
+      "version": "7.22.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-property-regex/-/plugin-transform-unicode-property-regex-7.22.3.tgz",
+      "integrity": "sha512-5ScJ+OmdX+O6HRuMGW4kv7RL9vIKdtdAj9wuWUKy1wbHY3jaM/UlyIiC1G7J6UJiiyMukjjK0QwL3P0vBd0yYg==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-create-regexp-features-plugin": "^7.22.1",
+        "@babel/helper-plugin-utils": "^7.21.5"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
     "node_modules/@babel/plugin-transform-unicode-regex": {
       "version": "7.18.6",
       "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.18.6.tgz",
@@ -1725,39 +1792,42 @@
         "@babel/core": "^7.0.0-0"
       }
     },
+    "node_modules/@babel/plugin-transform-unicode-sets-regex": {
+      "version": "7.22.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-sets-regex/-/plugin-transform-unicode-sets-regex-7.22.3.tgz",
+      "integrity": "sha512-hNufLdkF8vqywRp+P55j4FHXqAX2LRUccoZHH7AFn1pq5ZOO2ISKW9w13bFZVjBoTqeve2HOgoJCcaziJVhGNw==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-create-regexp-features-plugin": "^7.22.1",
+        "@babel/helper-plugin-utils": "^7.21.5"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0"
+      }
+    },
     "node_modules/@babel/preset-env": {
-      "version": "7.21.5",
-      "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.21.5.tgz",
-      "integrity": "sha512-wH00QnTTldTbf/IefEVyChtRdw5RJvODT/Vb4Vcxq1AZvtXj6T0YeX0cAcXhI6/BdGuiP3GcNIL4OQbI2DVNxg==",
+      "version": "7.22.2",
+      "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.22.2.tgz",
+      "integrity": "sha512-UPNK9pgphMULvA2EMKIWHU90C47PKyuvQ8pE1MzH7l9PgFcRabdrHhlePpBuWxYZQ+TziP2nycKoI5C1Yhdm9Q==",
       "dev": true,
       "dependencies": {
-        "@babel/compat-data": "^7.21.5",
-        "@babel/helper-compilation-targets": "^7.21.5",
+        "@babel/compat-data": "^7.22.0",
+        "@babel/helper-compilation-targets": "^7.22.1",
         "@babel/helper-plugin-utils": "^7.21.5",
         "@babel/helper-validator-option": "^7.21.0",
         "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": "^7.18.6",
-        "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": "^7.20.7",
-        "@babel/plugin-proposal-async-generator-functions": "^7.20.7",
-        "@babel/plugin-proposal-class-properties": "^7.18.6",
-        "@babel/plugin-proposal-class-static-block": "^7.21.0",
-        "@babel/plugin-proposal-dynamic-import": "^7.18.6",
-        "@babel/plugin-proposal-export-namespace-from": "^7.18.9",
-        "@babel/plugin-proposal-json-strings": "^7.18.6",
-        "@babel/plugin-proposal-logical-assignment-operators": "^7.20.7",
-        "@babel/plugin-proposal-nullish-coalescing-operator": "^7.18.6",
-        "@babel/plugin-proposal-numeric-separator": "^7.18.6",
-        "@babel/plugin-proposal-object-rest-spread": "^7.20.7",
-        "@babel/plugin-proposal-optional-catch-binding": "^7.18.6",
-        "@babel/plugin-proposal-optional-chaining": "^7.21.0",
-        "@babel/plugin-proposal-private-methods": "^7.18.6",
+        "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": "^7.22.0",
         "@babel/plugin-proposal-private-property-in-object": "^7.21.0",
-        "@babel/plugin-proposal-unicode-property-regex": "^7.18.6",
         "@babel/plugin-syntax-async-generators": "^7.8.4",
         "@babel/plugin-syntax-class-properties": "^7.12.13",
         "@babel/plugin-syntax-class-static-block": "^7.14.5",
         "@babel/plugin-syntax-dynamic-import": "^7.8.3",
         "@babel/plugin-syntax-export-namespace-from": "^7.8.3",
         "@babel/plugin-syntax-import-assertions": "^7.20.0",
+        "@babel/plugin-syntax-import-attributes": "^7.22.0",
         "@babel/plugin-syntax-import-meta": "^7.10.4",
         "@babel/plugin-syntax-json-strings": "^7.8.3",
         "@babel/plugin-syntax-logical-assignment-operators": "^7.10.4",
@@ -1768,28 +1838,43 @@
         "@babel/plugin-syntax-optional-chaining": "^7.8.3",
         "@babel/plugin-syntax-private-property-in-object": "^7.14.5",
         "@babel/plugin-syntax-top-level-await": "^7.14.5",
+        "@babel/plugin-syntax-unicode-sets-regex": "^7.18.6",
         "@babel/plugin-transform-arrow-functions": "^7.21.5",
+        "@babel/plugin-transform-async-generator-functions": "^7.22.0",
         "@babel/plugin-transform-async-to-generator": "^7.20.7",
         "@babel/plugin-transform-block-scoped-functions": "^7.18.6",
         "@babel/plugin-transform-block-scoping": "^7.21.0",
+        "@babel/plugin-transform-class-properties": "^7.22.0",
+        "@babel/plugin-transform-class-static-block": "^7.22.0",
         "@babel/plugin-transform-classes": "^7.21.0",
         "@babel/plugin-transform-computed-properties": "^7.21.5",
         "@babel/plugin-transform-destructuring": "^7.21.3",
         "@babel/plugin-transform-dotall-regex": "^7.18.6",
         "@babel/plugin-transform-duplicate-keys": "^7.18.9",
+        "@babel/plugin-transform-dynamic-import": "^7.22.1",
         "@babel/plugin-transform-exponentiation-operator": "^7.18.6",
+        "@babel/plugin-transform-export-namespace-from": "^7.22.0",
         "@babel/plugin-transform-for-of": "^7.21.5",
         "@babel/plugin-transform-function-name": "^7.18.9",
+        "@babel/plugin-transform-json-strings": "^7.22.0",
         "@babel/plugin-transform-literals": "^7.18.9",
+        "@babel/plugin-transform-logical-assignment-operators": "^7.22.0",
         "@babel/plugin-transform-member-expression-literals": "^7.18.6",
         "@babel/plugin-transform-modules-amd": "^7.20.11",
         "@babel/plugin-transform-modules-commonjs": "^7.21.5",
-        "@babel/plugin-transform-modules-systemjs": "^7.20.11",
+        "@babel/plugin-transform-modules-systemjs": "^7.22.0",
         "@babel/plugin-transform-modules-umd": "^7.18.6",
-        "@babel/plugin-transform-named-capturing-groups-regex": "^7.20.5",
-        "@babel/plugin-transform-new-target": "^7.18.6",
+        "@babel/plugin-transform-named-capturing-groups-regex": "^7.22.0",
+        "@babel/plugin-transform-new-target": "^7.22.0",
+        "@babel/plugin-transform-nullish-coalescing-operator": "^7.22.0",
+        "@babel/plugin-transform-numeric-separator": "^7.22.0",
+        "@babel/plugin-transform-object-rest-spread": "^7.22.0",
         "@babel/plugin-transform-object-super": "^7.18.6",
-        "@babel/plugin-transform-parameters": "^7.21.3",
+        "@babel/plugin-transform-optional-catch-binding": "^7.22.0",
+        "@babel/plugin-transform-optional-chaining": "^7.22.0",
+        "@babel/plugin-transform-parameters": "^7.22.0",
+        "@babel/plugin-transform-private-methods": "^7.22.0",
+        "@babel/plugin-transform-private-property-in-object": "^7.22.0",
         "@babel/plugin-transform-property-literals": "^7.18.6",
         "@babel/plugin-transform-regenerator": "^7.21.5",
         "@babel/plugin-transform-reserved-words": "^7.18.6",
@@ -1799,13 +1884,15 @@
         "@babel/plugin-transform-template-literals": "^7.18.9",
         "@babel/plugin-transform-typeof-symbol": "^7.18.9",
         "@babel/plugin-transform-unicode-escapes": "^7.21.5",
+        "@babel/plugin-transform-unicode-property-regex": "^7.22.0",
         "@babel/plugin-transform-unicode-regex": "^7.18.6",
+        "@babel/plugin-transform-unicode-sets-regex": "^7.22.0",
         "@babel/preset-modules": "^0.1.5",
-        "@babel/types": "^7.21.5",
-        "babel-plugin-polyfill-corejs2": "^0.3.3",
-        "babel-plugin-polyfill-corejs3": "^0.6.0",
-        "babel-plugin-polyfill-regenerator": "^0.4.1",
-        "core-js-compat": "^3.25.1",
+        "@babel/types": "^7.22.0",
+        "babel-plugin-polyfill-corejs2": "^0.4.2",
+        "babel-plugin-polyfill-corejs3": "^0.8.1",
+        "babel-plugin-polyfill-regenerator": "^0.5.0",
+        "core-js-compat": "^3.30.2",
         "semver": "^6.3.0"
       },
       "engines": {
@@ -1815,13 +1902,44 @@
         "@babel/core": "^7.0.0-0"
       }
     },
+    "node_modules/@babel/preset-env/node_modules/@babel/helper-define-polyfill-provider": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.4.0.tgz",
+      "integrity": "sha512-RnanLx5ETe6aybRi1cO/edaRH+bNYWaryCEmjDDYyNr4wnSzyOp8T0dWipmqVHKEY3AbVKUom50AKSlj1zmKbg==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-compilation-targets": "^7.17.7",
+        "@babel/helper-plugin-utils": "^7.16.7",
+        "debug": "^4.1.1",
+        "lodash.debounce": "^4.0.8",
+        "resolve": "^1.14.2",
+        "semver": "^6.1.2"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.4.0-0"
+      }
+    },
+    "node_modules/@babel/preset-env/node_modules/babel-plugin-polyfill-corejs2": {
+      "version": "0.4.3",
+      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.4.3.tgz",
+      "integrity": "sha512-bM3gHc337Dta490gg+/AseNB9L4YLHxq1nGKZZSHbhXv4aTYU2MD2cjza1Ru4S6975YLTaL1K8uJf6ukJhhmtw==",
+      "dev": true,
+      "dependencies": {
+        "@babel/compat-data": "^7.17.7",
+        "@babel/helper-define-polyfill-provider": "^0.4.0",
+        "semver": "^6.1.1"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
     "node_modules/@babel/preset-env/node_modules/babel-plugin-polyfill-regenerator": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.4.1.tgz",
-      "integrity": "sha512-NtQGmyQDXjQqQ+IzRkBVwEOz9lQ4zxAQZgoAYEtU9dJjnl1Oc98qnN7jcp+bE7O7aYzVpavXE3/VKXNzUbh7aw==",
+      "version": "0.5.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.5.0.tgz",
+      "integrity": "sha512-hDJtKjMLVa7Z+LwnTCxoDLQj6wdc+B8dun7ayF2fYieI6OzfuvcLMB32ihJZ4UhCBwNYGl5bg/x/P9cMdnkc2g==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-define-polyfill-provider": "^0.3.3"
+        "@babel/helper-define-polyfill-provider": "^0.4.0"
       },
       "peerDependencies": {
         "@babel/core": "^7.0.0-0"
@@ -1894,9 +2012,9 @@
       }
     },
     "node_modules/@babel/types": {
-      "version": "7.22.0",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.22.0.tgz",
-      "integrity": "sha512-NtXlm3f6cNWIv003cETdlz9sss0VMNtplyatFohxWPz90AbwuhCbHbQopkGis6bG1vOunDLN0FF/4Uv5i8LFZQ==",
+      "version": "7.22.3",
+      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.22.3.tgz",
+      "integrity": "sha512-P3na3xIQHTKY4L0YOG7pM8M8uoUIB910WQaSiiMCZUC2Cy8XFEQONGABFnHWBa2gpGKODTAJcNhi5Zk0sLRrzg==",
       "dependencies": {
         "@babel/helper-string-parser": "^7.21.5",
         "@babel/helper-validator-identifier": "^7.19.1",
@@ -4668,18 +4786,35 @@
       }
     },
     "node_modules/babel-plugin-polyfill-corejs3": {
-      "version": "0.6.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.6.0.tgz",
-      "integrity": "sha512-+eHqR6OPcBhJOGgsIar7xoAB1GcSwVUA3XjAd7HJNzOXT4wv6/H7KIdA/Nc60cvUlDbKApmqNvD1B1bzOt4nyA==",
+      "version": "0.8.1",
+      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.8.1.tgz",
+      "integrity": "sha512-ikFrZITKg1xH6pLND8zT14UPgjKHiGLqex7rGEZCH2EvhsneJaJPemmpQaIZV5AL03II+lXylw3UmddDK8RU5Q==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-define-polyfill-provider": "^0.3.3",
-        "core-js-compat": "^3.25.1"
+        "@babel/helper-define-polyfill-provider": "^0.4.0",
+        "core-js-compat": "^3.30.1"
       },
       "peerDependencies": {
         "@babel/core": "^7.0.0-0"
       }
     },
+    "node_modules/babel-plugin-polyfill-corejs3/node_modules/@babel/helper-define-polyfill-provider": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.4.0.tgz",
+      "integrity": "sha512-RnanLx5ETe6aybRi1cO/edaRH+bNYWaryCEmjDDYyNr4wnSzyOp8T0dWipmqVHKEY3AbVKUom50AKSlj1zmKbg==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-compilation-targets": "^7.17.7",
+        "@babel/helper-plugin-utils": "^7.16.7",
+        "debug": "^4.1.1",
+        "lodash.debounce": "^4.0.8",
+        "resolve": "^1.14.2",
+        "semver": "^6.1.2"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.4.0-0"
+      }
+    },
     "node_modules/babel-plugin-polyfill-regenerator": {
       "version": "0.3.1",
       "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.3.1.tgz",
@@ -5735,11 +5870,11 @@
       }
     },
     "node_modules/core-js-compat": {
-      "version": "3.25.1",
-      "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.25.1.tgz",
-      "integrity": "sha512-pOHS7O0i8Qt4zlPW/eIFjwp+NrTPx+wTL0ctgI2fHn31sZOq89rDsmtc/A2vAX7r6shl+bmVI+678He46jgBlw==",
+      "version": "3.30.2",
+      "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.30.2.tgz",
+      "integrity": "sha512-nriW1nuJjUgvkEjIot1Spwakz52V9YkYHZAQG6A1eCgC8AA1p0zngrQEP9R0+V6hji5XilWKG1Bd0YRppmGimA==",
       "dependencies": {
-        "browserslist": "^4.21.3"
+        "browserslist": "^4.21.5"
       },
       "funding": {
         "type": "opencollective",
@@ -17512,9 +17647,9 @@
       }
     },
     "@babel/compat-data": {
-      "version": "7.22.0",
-      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.22.0.tgz",
-      "integrity": "sha512-OgCMbbNCD/iA8cjMt+Zhp+nIC7XKaEaTG8zjvZPjGbhkppq1NIMWiZn7EaZRxUDHn4Ul265scRqg94N2WiFaGw=="
+      "version": "7.22.3",
+      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.22.3.tgz",
+      "integrity": "sha512-aNtko9OPOwVESUFp3MZfD8Uzxl7JzSeJpd7npIoxCasU37PFbAQRpKglkaKwlHOyeJdrREpo8TW8ldrkYWwvIQ=="
     },
     "@babel/core": {
       "version": "7.22.1",
@@ -17595,29 +17730,31 @@
       }
     },
     "@babel/helper-create-class-features-plugin": {
-      "version": "7.21.4",
-      "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.21.4.tgz",
-      "integrity": "sha512-46QrX2CQlaFRF4TkwfTt6nJD7IHq8539cCL7SDpqWSDeJKY1xylKKY5F/33mJhLZ3mFvKv2gGrVS6NkyF6qs+Q==",
+      "version": "7.22.1",
+      "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.22.1.tgz",
+      "integrity": "sha512-SowrZ9BWzYFgzUMwUmowbPSGu6CXL5MSuuCkG3bejahSpSymioPmuLdhPxNOc9MjuNGjy7M/HaXvJ8G82Lywlw==",
       "dev": true,
       "requires": {
         "@babel/helper-annotate-as-pure": "^7.18.6",
-        "@babel/helper-environment-visitor": "^7.18.9",
+        "@babel/helper-environment-visitor": "^7.22.1",
         "@babel/helper-function-name": "^7.21.0",
-        "@babel/helper-member-expression-to-functions": "^7.21.0",
+        "@babel/helper-member-expression-to-functions": "^7.22.0",
         "@babel/helper-optimise-call-expression": "^7.18.6",
-        "@babel/helper-replace-supers": "^7.20.7",
+        "@babel/helper-replace-supers": "^7.22.1",
         "@babel/helper-skip-transparent-expression-wrappers": "^7.20.0",
-        "@babel/helper-split-export-declaration": "^7.18.6"
+        "@babel/helper-split-export-declaration": "^7.18.6",
+        "semver": "^6.3.0"
       }
     },
     "@babel/helper-create-regexp-features-plugin": {
-      "version": "7.21.4",
-      "resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.21.4.tgz",
-      "integrity": "sha512-M00OuhU+0GyZ5iBBN9czjugzWrEq2vDpf/zCYHxxf93ul/Q5rv+a5h+/+0WnI1AebHNVtl5bFV0qsJoH23DbfA==",
+      "version": "7.22.1",
+      "resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.22.1.tgz",
+      "integrity": "sha512-WWjdnfR3LPIe+0EY8td7WmjhytxXtjKAEpnAxun/hkNiyOaPlvGK+NZaBFIdi9ndYV3Gav7BpFvtUwnaJlwi1w==",
       "dev": true,
       "requires": {
         "@babel/helper-annotate-as-pure": "^7.18.6",
-        "regexpu-core": "^5.3.1"
+        "regexpu-core": "^5.3.1",
+        "semver": "^6.3.0"
       }
     },
     "@babel/helper-define-polyfill-provider": {
@@ -17665,12 +17802,12 @@
       }
     },
     "@babel/helper-member-expression-to-functions": {
-      "version": "7.21.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.21.0.tgz",
-      "integrity": "sha512-Muu8cdZwNN6mRRNG6lAYErJ5X3bRevgYR2O8wN0yn7jJSnGDu6eG59RfT29JHxGUovyfrh6Pj0XzmR7drNVL3Q==",
+      "version": "7.22.3",
+      "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.22.3.tgz",
+      "integrity": "sha512-Gl7sK04b/2WOb6OPVeNy9eFKeD3L6++CzL3ykPOWqTn08xgYYK0wz4TUh2feIImDXxcVW3/9WQ1NMKY66/jfZA==",
       "dev": true,
       "requires": {
-        "@babel/types": "^7.21.0"
+        "@babel/types": "^7.22.3"
       }
     },
     "@babel/helper-module-imports": {
@@ -17723,17 +17860,17 @@
       }
     },
     "@babel/helper-replace-supers": {
-      "version": "7.20.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.20.7.tgz",
-      "integrity": "sha512-vujDMtB6LVfNW13jhlCrp48QNslK6JXi7lQG736HVbHz/mbf4Dc7tIRh1Xf5C0rF7BP8iiSxGMCmY6Ci1ven3A==",
+      "version": "7.22.1",
+      "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.22.1.tgz",
+      "integrity": "sha512-ut4qrkE4AuSfrwHSps51ekR1ZY/ygrP1tp0WFm8oVq6nzc/hvfV/22JylndIbsf2U2M9LOMwiSddr6y+78j+OQ==",
       "dev": true,
       "requires": {
-        "@babel/helper-environment-visitor": "^7.18.9",
-        "@babel/helper-member-expression-to-functions": "^7.20.7",
+        "@babel/helper-environment-visitor": "^7.22.1",
+        "@babel/helper-member-expression-to-functions": "^7.22.0",
         "@babel/helper-optimise-call-expression": "^7.18.6",
-        "@babel/template": "^7.20.7",
-        "@babel/traverse": "^7.20.7",
-        "@babel/types": "^7.20.7"
+        "@babel/template": "^7.21.9",
+        "@babel/traverse": "^7.22.1",
+        "@babel/types": "^7.22.0"
       }
     },
     "@babel/helper-simple-access": {
@@ -17823,151 +17960,14 @@
       }
     },
     "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": {
-      "version": "7.20.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.20.7.tgz",
-      "integrity": "sha512-sbr9+wNE5aXMBBFBICk01tt7sBf2Oc9ikRFEcem/ZORup9IMUdNhW7/wVLEbbtlWOsEubJet46mHAL2C8+2jKQ==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.20.2",
-        "@babel/helper-skip-transparent-expression-wrappers": "^7.20.0",
-        "@babel/plugin-proposal-optional-chaining": "^7.20.7"
-      }
-    },
-    "@babel/plugin-proposal-async-generator-functions": {
-      "version": "7.20.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.20.7.tgz",
-      "integrity": "sha512-xMbiLsn/8RK7Wq7VeVytytS2L6qE69bXPB10YCmMdDZbKF4okCqY74pI/jJQ/8U0b/F6NrT2+14b8/P9/3AMGA==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-environment-visitor": "^7.18.9",
-        "@babel/helper-plugin-utils": "^7.20.2",
-        "@babel/helper-remap-async-to-generator": "^7.18.9",
-        "@babel/plugin-syntax-async-generators": "^7.8.4"
-      }
-    },
-    "@babel/plugin-proposal-class-properties": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.18.6.tgz",
-      "integrity": "sha512-cumfXOF0+nzZrrN8Rf0t7M+tF6sZc7vhQwYQck9q1/5w2OExlD+b4v4RpMJFaV1Z7WcDRgO6FqvxqxGlwo+RHQ==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-create-class-features-plugin": "^7.18.6",
-        "@babel/helper-plugin-utils": "^7.18.6"
-      }
-    },
-    "@babel/plugin-proposal-class-static-block": {
-      "version": "7.21.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-class-static-block/-/plugin-proposal-class-static-block-7.21.0.tgz",
-      "integrity": "sha512-XP5G9MWNUskFuP30IfFSEFB0Z6HzLIUcjYM4bYOPHXl7eiJ9HFv8tWj6TXTN5QODiEhDZAeI4hLok2iHFFV4hw==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-create-class-features-plugin": "^7.21.0",
-        "@babel/helper-plugin-utils": "^7.20.2",
-        "@babel/plugin-syntax-class-static-block": "^7.14.5"
-      }
-    },
-    "@babel/plugin-proposal-dynamic-import": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.18.6.tgz",
-      "integrity": "sha512-1auuwmK+Rz13SJj36R+jqFPMJWyKEDd7lLSdOj4oJK0UTgGueSAtkrCvz9ewmgyU/P941Rv2fQwZJN8s6QruXw==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.18.6",
-        "@babel/plugin-syntax-dynamic-import": "^7.8.3"
-      }
-    },
-    "@babel/plugin-proposal-export-namespace-from": {
-      "version": "7.18.9",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.18.9.tgz",
-      "integrity": "sha512-k1NtHyOMvlDDFeb9G5PhUXuGj8m/wiwojgQVEhJ/fsVsMCpLyOP4h0uGEjYJKrRI+EVPlb5Jk+Gt9P97lOGwtA==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.18.9",
-        "@babel/plugin-syntax-export-namespace-from": "^7.8.3"
-      }
-    },
-    "@babel/plugin-proposal-json-strings": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.18.6.tgz",
-      "integrity": "sha512-lr1peyn9kOdbYc0xr0OdHTZ5FMqS6Di+H0Fz2I/JwMzGmzJETNeOFq2pBySw6X/KFL5EWDjlJuMsUGRFb8fQgQ==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.18.6",
-        "@babel/plugin-syntax-json-strings": "^7.8.3"
-      }
-    },
-    "@babel/plugin-proposal-logical-assignment-operators": {
-      "version": "7.20.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.20.7.tgz",
-      "integrity": "sha512-y7C7cZgpMIjWlKE5T7eJwp+tnRYM89HmRvWM5EQuB5BoHEONjmQ8lSNmBUwOyy/GFRsohJED51YBF79hE1djug==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.20.2",
-        "@babel/plugin-syntax-logical-assignment-operators": "^7.10.4"
-      }
-    },
-    "@babel/plugin-proposal-nullish-coalescing-operator": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.18.6.tgz",
-      "integrity": "sha512-wQxQzxYeJqHcfppzBDnm1yAY0jSRkUXR2z8RePZYrKwMKgMlE8+Z6LUno+bd6LvbGh8Gltvy74+9pIYkr+XkKA==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.18.6",
-        "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3"
-      }
-    },
-    "@babel/plugin-proposal-numeric-separator": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.18.6.tgz",
-      "integrity": "sha512-ozlZFogPqoLm8WBr5Z8UckIoE4YQ5KESVcNudyXOR8uqIkliTEgJ3RoketfG6pmzLdeZF0H/wjE9/cCEitBl7Q==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.18.6",
-        "@babel/plugin-syntax-numeric-separator": "^7.10.4"
-      }
-    },
-    "@babel/plugin-proposal-object-rest-spread": {
-      "version": "7.20.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.20.7.tgz",
-      "integrity": "sha512-d2S98yCiLxDVmBmE8UjGcfPvNEUbA1U5q5WxaWFUGRzJSVAZqm5W6MbPct0jxnegUZ0niLeNX+IOzEs7wYg9Dg==",
-      "dev": true,
-      "requires": {
-        "@babel/compat-data": "^7.20.5",
-        "@babel/helper-compilation-targets": "^7.20.7",
-        "@babel/helper-plugin-utils": "^7.20.2",
-        "@babel/plugin-syntax-object-rest-spread": "^7.8.3",
-        "@babel/plugin-transform-parameters": "^7.20.7"
-      }
-    },
-    "@babel/plugin-proposal-optional-catch-binding": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.18.6.tgz",
-      "integrity": "sha512-Q40HEhs9DJQyaZfUjjn6vE8Cv4GmMHCYuMGIWUnlxH6400VGxOuwWsPt4FxXxJkC/5eOzgn0z21M9gMT4MOhbw==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.18.6",
-        "@babel/plugin-syntax-optional-catch-binding": "^7.8.3"
-      }
-    },
-    "@babel/plugin-proposal-optional-chaining": {
-      "version": "7.21.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.21.0.tgz",
-      "integrity": "sha512-p4zeefM72gpmEe2fkUr/OnOXpWEf8nAgk7ZYVqqfFiyIG7oFfVZcCrU64hWn5xp4tQ9LkV4bTIa5rD0KANpKNA==",
+      "version": "7.22.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.22.3.tgz",
+      "integrity": "sha512-6r4yRwEnorYByILoDRnEqxtojYKuiIv9FojW2E8GUKo9eWBwbKcd9IiZOZpdyXc64RmyGGyPu3/uAcrz/dq2kQ==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.20.2",
+        "@babel/helper-plugin-utils": "^7.21.5",
         "@babel/helper-skip-transparent-expression-wrappers": "^7.20.0",
-        "@babel/plugin-syntax-optional-chaining": "^7.8.3"
-      }
-    },
-    "@babel/plugin-proposal-private-methods": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.18.6.tgz",
-      "integrity": "sha512-nutsvktDItsNn4rpGItSNV2sz1XwS+nfU0Rg8aCx3W3NOKVzdMjJRu0O5OkgDp3ZGICSTbgRpxZoWsxoKRvbeA==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-create-class-features-plugin": "^7.18.6",
-        "@babel/helper-plugin-utils": "^7.18.6"
+        "@babel/plugin-transform-optional-chaining": "^7.22.3"
       }
     },
     "@babel/plugin-proposal-private-property-in-object": {
@@ -18055,6 +18055,15 @@
         "@babel/helper-plugin-utils": "^7.19.0"
       }
     },
+    "@babel/plugin-syntax-import-attributes": {
+      "version": "7.22.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-attributes/-/plugin-syntax-import-attributes-7.22.3.tgz",
+      "integrity": "sha512-i35jZJv6aO7hxEbIWQ41adVfOzjm9dcYDNeWlBMd8p0ZQRtNUCBrmGwZt+H5lb+oOC9a3svp956KP0oWGA1YsA==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.21.5"
+      }
+    },
     "@babel/plugin-syntax-import-meta": {
       "version": "7.10.4",
       "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-meta/-/plugin-syntax-import-meta-7.10.4.tgz",
@@ -18163,6 +18172,16 @@
         "@babel/helper-plugin-utils": "^7.19.0"
       }
     },
+    "@babel/plugin-syntax-unicode-sets-regex": {
+      "version": "7.18.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-unicode-sets-regex/-/plugin-syntax-unicode-sets-regex-7.18.6.tgz",
+      "integrity": "sha512-727YkEAPwSIQTv5im8QHz3upqp92JTWhidIC81Tdx4VJYIte/VndKf1qKrfnnhPLiPghStWfvC/iFaMCQu7Nqg==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-create-regexp-features-plugin": "^7.18.6",
+        "@babel/helper-plugin-utils": "^7.18.6"
+      }
+    },
     "@babel/plugin-transform-arrow-functions": {
       "version": "7.21.5",
       "resolved": "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.21.5.tgz",
@@ -18172,6 +18191,18 @@
         "@babel/helper-plugin-utils": "^7.21.5"
       }
     },
+    "@babel/plugin-transform-async-generator-functions": {
+      "version": "7.22.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-generator-functions/-/plugin-transform-async-generator-functions-7.22.3.tgz",
+      "integrity": "sha512-36A4Aq48t66btydbZd5Fk0/xJqbpg/v4QWI4AH4cYHBXy9Mu42UOupZpebKFiCFNT9S9rJFcsld0gsv0ayLjtA==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-environment-visitor": "^7.22.1",
+        "@babel/helper-plugin-utils": "^7.21.5",
+        "@babel/helper-remap-async-to-generator": "^7.18.9",
+        "@babel/plugin-syntax-async-generators": "^7.8.4"
+      }
+    },
     "@babel/plugin-transform-async-to-generator": {
       "version": "7.20.7",
       "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.20.7.tgz",
@@ -18201,6 +18232,27 @@
         "@babel/helper-plugin-utils": "^7.20.2"
       }
     },
+    "@babel/plugin-transform-class-properties": {
+      "version": "7.22.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-class-properties/-/plugin-transform-class-properties-7.22.3.tgz",
+      "integrity": "sha512-mASLsd6rhOrLZ5F3WbCxkzl67mmOnqik0zrg5W6D/X0QMW7HtvnoL1dRARLKIbMP3vXwkwziuLesPqWVGIl6Bw==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-create-class-features-plugin": "^7.22.1",
+        "@babel/helper-plugin-utils": "^7.21.5"
+      }
+    },
+    "@babel/plugin-transform-class-static-block": {
+      "version": "7.22.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-class-static-block/-/plugin-transform-class-static-block-7.22.3.tgz",
+      "integrity": "sha512-5BirgNWNOx7cwbTJCOmKFJ1pZjwk5MUfMIwiBBvsirCJMZeQgs5pk6i1OlkVg+1Vef5LfBahFOrdCnAWvkVKMw==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-create-class-features-plugin": "^7.22.1",
+        "@babel/helper-plugin-utils": "^7.21.5",
+        "@babel/plugin-syntax-class-static-block": "^7.14.5"
+      }
+    },
     "@babel/plugin-transform-classes": {
       "version": "7.21.0",
       "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.21.0.tgz",
@@ -18256,6 +18308,16 @@
         "@babel/helper-plugin-utils": "^7.18.9"
       }
     },
+    "@babel/plugin-transform-dynamic-import": {
+      "version": "7.22.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dynamic-import/-/plugin-transform-dynamic-import-7.22.1.tgz",
+      "integrity": "sha512-rlhWtONnVBPdmt+jeewS0qSnMz/3yLFrqAP8hHC6EDcrYRSyuz9f9yQhHvVn2Ad6+yO9fHXac5piudeYrInxwQ==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.21.5",
+        "@babel/plugin-syntax-dynamic-import": "^7.8.3"
+      }
+    },
     "@babel/plugin-transform-exponentiation-operator": {
       "version": "7.18.6",
       "resolved": "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.18.6.tgz",
@@ -18266,6 +18328,16 @@
         "@babel/helper-plugin-utils": "^7.18.6"
       }
     },
+    "@babel/plugin-transform-export-namespace-from": {
+      "version": "7.22.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-export-namespace-from/-/plugin-transform-export-namespace-from-7.22.3.tgz",
+      "integrity": "sha512-5Ti1cHLTDnt3vX61P9KZ5IG09bFXp4cDVFJIAeCZuxu9OXXJJZp5iP0n/rzM2+iAutJY+KWEyyHcRaHlpQ/P5g==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.21.5",
+        "@babel/plugin-syntax-export-namespace-from": "^7.8.3"
+      }
+    },
     "@babel/plugin-transform-for-of": {
       "version": "7.21.5",
       "resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.21.5.tgz",
@@ -18286,6 +18358,16 @@
         "@babel/helper-plugin-utils": "^7.18.9"
       }
     },
+    "@babel/plugin-transform-json-strings": {
+      "version": "7.22.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-json-strings/-/plugin-transform-json-strings-7.22.3.tgz",
+      "integrity": "sha512-IuvOMdeOOY2X4hRNAT6kwbePtK21BUyrAEgLKviL8pL6AEEVUVcqtRdN/HJXBLGIbt9T3ETmXRnFedRRmQNTYw==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.21.5",
+        "@babel/plugin-syntax-json-strings": "^7.8.3"
+      }
+    },
     "@babel/plugin-transform-literals": {
       "version": "7.18.9",
       "resolved": "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.18.9.tgz",
@@ -18295,6 +18377,16 @@
         "@babel/helper-plugin-utils": "^7.18.9"
       }
     },
+    "@babel/plugin-transform-logical-assignment-operators": {
+      "version": "7.22.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-logical-assignment-operators/-/plugin-transform-logical-assignment-operators-7.22.3.tgz",
+      "integrity": "sha512-CbayIfOw4av2v/HYZEsH+Klks3NC2/MFIR3QR8gnpGNNPEaq2fdlVCRYG/paKs7/5hvBLQ+H70pGWOHtlNEWNA==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.21.5",
+        "@babel/plugin-syntax-logical-assignment-operators": "^7.10.4"
+      }
+    },
     "@babel/plugin-transform-member-expression-literals": {
       "version": "7.18.6",
       "resolved": "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.18.6.tgz",
@@ -18326,14 +18418,14 @@
       }
     },
     "@babel/plugin-transform-modules-systemjs": {
-      "version": "7.20.11",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.20.11.tgz",
-      "integrity": "sha512-vVu5g9BPQKSFEmvt2TA4Da5N+QVS66EX21d8uoOihC+OCpUoGvzVsXeqFdtAEfVa5BILAeFt+U7yVmLbQnAJmw==",
+      "version": "7.22.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.22.3.tgz",
+      "integrity": "sha512-V21W3bKLxO3ZjcBJZ8biSvo5gQ85uIXW2vJfh7JSWf/4SLUSr1tOoHX3ruN4+Oqa2m+BKfsxTR1I+PsvkIWvNw==",
       "dev": true,
       "requires": {
         "@babel/helper-hoist-variables": "^7.18.6",
-        "@babel/helper-module-transforms": "^7.20.11",
-        "@babel/helper-plugin-utils": "^7.20.2",
+        "@babel/helper-module-transforms": "^7.22.1",
+        "@babel/helper-plugin-utils": "^7.21.5",
         "@babel/helper-validator-identifier": "^7.19.1"
       }
     },
@@ -18348,22 +18440,55 @@
       }
     },
     "@babel/plugin-transform-named-capturing-groups-regex": {
-      "version": "7.20.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.20.5.tgz",
-      "integrity": "sha512-mOW4tTzi5iTLnw+78iEq3gr8Aoq4WNRGpmSlrogqaiCBoR1HFhpU4JkpQFOHfeYx3ReVIFWOQJS4aZBRvuZ6mA==",
+      "version": "7.22.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.22.3.tgz",
+      "integrity": "sha512-c6HrD/LpUdNNJsISQZpds3TXvfYIAbo+efE9aWmY/PmSRD0agrJ9cPMt4BmArwUQ7ZymEWTFjTyp+yReLJZh0Q==",
       "dev": true,
       "requires": {
-        "@babel/helper-create-regexp-features-plugin": "^7.20.5",
-        "@babel/helper-plugin-utils": "^7.20.2"
+        "@babel/helper-create-regexp-features-plugin": "^7.22.1",
+        "@babel/helper-plugin-utils": "^7.21.5"
       }
     },
     "@babel/plugin-transform-new-target": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.18.6.tgz",
-      "integrity": "sha512-DjwFA/9Iu3Z+vrAn+8pBUGcjhxKguSMlsFqeCKbhb9BAV756v0krzVK04CRDi/4aqmk8BsHb4a/gFcaA5joXRw==",
+      "version": "7.22.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.22.3.tgz",
+      "integrity": "sha512-5RuJdSo89wKdkRTqtM9RVVJzHum9c2s0te9rB7vZC1zKKxcioWIy+xcu4OoIAjyFZhb/bp5KkunuLin1q7Ct+w==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.18.6"
+        "@babel/helper-plugin-utils": "^7.21.5"
+      }
+    },
+    "@babel/plugin-transform-nullish-coalescing-operator": {
+      "version": "7.22.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-nullish-coalescing-operator/-/plugin-transform-nullish-coalescing-operator-7.22.3.tgz",
+      "integrity": "sha512-CpaoNp16nX7ROtLONNuCyenYdY/l7ZsR6aoVa7rW7nMWisoNoQNIH5Iay/4LDyRjKMuElMqXiBoOQCDLTMGZiw==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.21.5",
+        "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3"
+      }
+    },
+    "@babel/plugin-transform-numeric-separator": {
+      "version": "7.22.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-numeric-separator/-/plugin-transform-numeric-separator-7.22.3.tgz",
+      "integrity": "sha512-+AF88fPDJrnseMh5vD9+SH6wq4ZMvpiTMHh58uLs+giMEyASFVhcT3NkoyO+NebFCNnpHJEq5AXO2txV4AGPDQ==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.21.5",
+        "@babel/plugin-syntax-numeric-separator": "^7.10.4"
+      }
+    },
+    "@babel/plugin-transform-object-rest-spread": {
+      "version": "7.22.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-rest-spread/-/plugin-transform-object-rest-spread-7.22.3.tgz",
+      "integrity": "sha512-38bzTsqMMCI46/TQnJwPPpy33EjLCc1Gsm2hRTF6zTMWnKsN61vdrpuzIEGQyKEhDSYDKyZHrrd5FMj4gcUHhw==",
+      "dev": true,
+      "requires": {
+        "@babel/compat-data": "^7.22.3",
+        "@babel/helper-compilation-targets": "^7.22.1",
+        "@babel/helper-plugin-utils": "^7.21.5",
+        "@babel/plugin-syntax-object-rest-spread": "^7.8.3",
+        "@babel/plugin-transform-parameters": "^7.22.3"
       }
     },
     "@babel/plugin-transform-object-super": {
@@ -18376,13 +18501,56 @@
         "@babel/helper-replace-supers": "^7.18.6"
       }
     },
+    "@babel/plugin-transform-optional-catch-binding": {
+      "version": "7.22.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-optional-catch-binding/-/plugin-transform-optional-catch-binding-7.22.3.tgz",
+      "integrity": "sha512-bnDFWXFzWY0BsOyqaoSXvMQ2F35zutQipugog/rqotL2S4ciFOKlRYUu9djt4iq09oh2/34hqfRR2k1dIvuu4g==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.21.5",
+        "@babel/plugin-syntax-optional-catch-binding": "^7.8.3"
+      }
+    },
+    "@babel/plugin-transform-optional-chaining": {
+      "version": "7.22.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-optional-chaining/-/plugin-transform-optional-chaining-7.22.3.tgz",
+      "integrity": "sha512-63v3/UFFxhPKT8j8u1jTTGVyITxl7/7AfOqK8C5gz1rHURPUGe3y5mvIf68eYKGoBNahtJnTxBKug4BQOnzeJg==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.21.5",
+        "@babel/helper-skip-transparent-expression-wrappers": "^7.20.0",
+        "@babel/plugin-syntax-optional-chaining": "^7.8.3"
+      }
+    },
     "@babel/plugin-transform-parameters": {
-      "version": "7.21.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.21.3.tgz",
-      "integrity": "sha512-Wxc+TvppQG9xWFYatvCGPvZ6+SIUxQ2ZdiBP+PHYMIjnPXD+uThCshaz4NZOnODAtBjjcVQQ/3OKs9LW28purQ==",
+      "version": "7.22.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.22.3.tgz",
+      "integrity": "sha512-x7QHQJHPuD9VmfpzboyGJ5aHEr9r7DsAsdxdhJiTB3J3j8dyl+NFZ+rX5Q2RWFDCs61c06qBfS4ys2QYn8UkMw==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.20.2"
+        "@babel/helper-plugin-utils": "^7.21.5"
+      }
+    },
+    "@babel/plugin-transform-private-methods": {
+      "version": "7.22.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-private-methods/-/plugin-transform-private-methods-7.22.3.tgz",
+      "integrity": "sha512-fC7jtjBPFqhqpPAE+O4LKwnLq7gGkD3ZmC2E3i4qWH34mH3gOg2Xrq5YMHUq6DM30xhqM1DNftiRaSqVjEG+ug==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-create-class-features-plugin": "^7.22.1",
+        "@babel/helper-plugin-utils": "^7.21.5"
+      }
+    },
+    "@babel/plugin-transform-private-property-in-object": {
+      "version": "7.22.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-private-property-in-object/-/plugin-transform-private-property-in-object-7.22.3.tgz",
+      "integrity": "sha512-C7MMl4qWLpgVCbXfj3UW8rR1xeCnisQ0cU7YJHV//8oNBS0aCIVg1vFnZXxOckHhEpQyqNNkWmvSEWnMLlc+Vw==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-annotate-as-pure": "^7.18.6",
+        "@babel/helper-create-class-features-plugin": "^7.22.1",
+        "@babel/helper-plugin-utils": "^7.21.5",
+        "@babel/plugin-syntax-private-property-in-object": "^7.14.5"
       }
     },
     "@babel/plugin-transform-property-literals": {
@@ -18492,6 +18660,16 @@
         "@babel/helper-plugin-utils": "^7.21.5"
       }
     },
+    "@babel/plugin-transform-unicode-property-regex": {
+      "version": "7.22.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-property-regex/-/plugin-transform-unicode-property-regex-7.22.3.tgz",
+      "integrity": "sha512-5ScJ+OmdX+O6HRuMGW4kv7RL9vIKdtdAj9wuWUKy1wbHY3jaM/UlyIiC1G7J6UJiiyMukjjK0QwL3P0vBd0yYg==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-create-regexp-features-plugin": "^7.22.1",
+        "@babel/helper-plugin-utils": "^7.21.5"
+      }
+    },
     "@babel/plugin-transform-unicode-regex": {
       "version": "7.18.6",
       "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.18.6.tgz",
@@ -18502,39 +18680,36 @@
         "@babel/helper-plugin-utils": "^7.18.6"
       }
     },
+    "@babel/plugin-transform-unicode-sets-regex": {
+      "version": "7.22.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-sets-regex/-/plugin-transform-unicode-sets-regex-7.22.3.tgz",
+      "integrity": "sha512-hNufLdkF8vqywRp+P55j4FHXqAX2LRUccoZHH7AFn1pq5ZOO2ISKW9w13bFZVjBoTqeve2HOgoJCcaziJVhGNw==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-create-regexp-features-plugin": "^7.22.1",
+        "@babel/helper-plugin-utils": "^7.21.5"
+      }
+    },
     "@babel/preset-env": {
-      "version": "7.21.5",
-      "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.21.5.tgz",
-      "integrity": "sha512-wH00QnTTldTbf/IefEVyChtRdw5RJvODT/Vb4Vcxq1AZvtXj6T0YeX0cAcXhI6/BdGuiP3GcNIL4OQbI2DVNxg==",
+      "version": "7.22.2",
+      "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.22.2.tgz",
+      "integrity": "sha512-UPNK9pgphMULvA2EMKIWHU90C47PKyuvQ8pE1MzH7l9PgFcRabdrHhlePpBuWxYZQ+TziP2nycKoI5C1Yhdm9Q==",
       "dev": true,
       "requires": {
-        "@babel/compat-data": "^7.21.5",
-        "@babel/helper-compilation-targets": "^7.21.5",
+        "@babel/compat-data": "^7.22.0",
+        "@babel/helper-compilation-targets": "^7.22.1",
         "@babel/helper-plugin-utils": "^7.21.5",
         "@babel/helper-validator-option": "^7.21.0",
         "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": "^7.18.6",
-        "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": "^7.20.7",
-        "@babel/plugin-proposal-async-generator-functions": "^7.20.7",
-        "@babel/plugin-proposal-class-properties": "^7.18.6",
-        "@babel/plugin-proposal-class-static-block": "^7.21.0",
-        "@babel/plugin-proposal-dynamic-import": "^7.18.6",
-        "@babel/plugin-proposal-export-namespace-from": "^7.18.9",
-        "@babel/plugin-proposal-json-strings": "^7.18.6",
-        "@babel/plugin-proposal-logical-assignment-operators": "^7.20.7",
-        "@babel/plugin-proposal-nullish-coalescing-operator": "^7.18.6",
-        "@babel/plugin-proposal-numeric-separator": "^7.18.6",
-        "@babel/plugin-proposal-object-rest-spread": "^7.20.7",
-        "@babel/plugin-proposal-optional-catch-binding": "^7.18.6",
-        "@babel/plugin-proposal-optional-chaining": "^7.21.0",
-        "@babel/plugin-proposal-private-methods": "^7.18.6",
+        "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": "^7.22.0",
         "@babel/plugin-proposal-private-property-in-object": "^7.21.0",
-        "@babel/plugin-proposal-unicode-property-regex": "^7.18.6",
         "@babel/plugin-syntax-async-generators": "^7.8.4",
         "@babel/plugin-syntax-class-properties": "^7.12.13",
         "@babel/plugin-syntax-class-static-block": "^7.14.5",
         "@babel/plugin-syntax-dynamic-import": "^7.8.3",
         "@babel/plugin-syntax-export-namespace-from": "^7.8.3",
         "@babel/plugin-syntax-import-assertions": "^7.20.0",
+        "@babel/plugin-syntax-import-attributes": "^7.22.0",
         "@babel/plugin-syntax-import-meta": "^7.10.4",
         "@babel/plugin-syntax-json-strings": "^7.8.3",
         "@babel/plugin-syntax-logical-assignment-operators": "^7.10.4",
@@ -18545,28 +18720,43 @@
         "@babel/plugin-syntax-optional-chaining": "^7.8.3",
         "@babel/plugin-syntax-private-property-in-object": "^7.14.5",
         "@babel/plugin-syntax-top-level-await": "^7.14.5",
+        "@babel/plugin-syntax-unicode-sets-regex": "^7.18.6",
         "@babel/plugin-transform-arrow-functions": "^7.21.5",
+        "@babel/plugin-transform-async-generator-functions": "^7.22.0",
         "@babel/plugin-transform-async-to-generator": "^7.20.7",
         "@babel/plugin-transform-block-scoped-functions": "^7.18.6",
         "@babel/plugin-transform-block-scoping": "^7.21.0",
+        "@babel/plugin-transform-class-properties": "^7.22.0",
+        "@babel/plugin-transform-class-static-block": "^7.22.0",
         "@babel/plugin-transform-classes": "^7.21.0",
         "@babel/plugin-transform-computed-properties": "^7.21.5",
         "@babel/plugin-transform-destructuring": "^7.21.3",
         "@babel/plugin-transform-dotall-regex": "^7.18.6",
         "@babel/plugin-transform-duplicate-keys": "^7.18.9",
+        "@babel/plugin-transform-dynamic-import": "^7.22.1",
         "@babel/plugin-transform-exponentiation-operator": "^7.18.6",
+        "@babel/plugin-transform-export-namespace-from": "^7.22.0",
         "@babel/plugin-transform-for-of": "^7.21.5",
         "@babel/plugin-transform-function-name": "^7.18.9",
+        "@babel/plugin-transform-json-strings": "^7.22.0",
         "@babel/plugin-transform-literals": "^7.18.9",
+        "@babel/plugin-transform-logical-assignment-operators": "^7.22.0",
         "@babel/plugin-transform-member-expression-literals": "^7.18.6",
         "@babel/plugin-transform-modules-amd": "^7.20.11",
         "@babel/plugin-transform-modules-commonjs": "^7.21.5",
-        "@babel/plugin-transform-modules-systemjs": "^7.20.11",
+        "@babel/plugin-transform-modules-systemjs": "^7.22.0",
         "@babel/plugin-transform-modules-umd": "^7.18.6",
-        "@babel/plugin-transform-named-capturing-groups-regex": "^7.20.5",
-        "@babel/plugin-transform-new-target": "^7.18.6",
+        "@babel/plugin-transform-named-capturing-groups-regex": "^7.22.0",
+        "@babel/plugin-transform-new-target": "^7.22.0",
+        "@babel/plugin-transform-nullish-coalescing-operator": "^7.22.0",
+        "@babel/plugin-transform-numeric-separator": "^7.22.0",
+        "@babel/plugin-transform-object-rest-spread": "^7.22.0",
         "@babel/plugin-transform-object-super": "^7.18.6",
-        "@babel/plugin-transform-parameters": "^7.21.3",
+        "@babel/plugin-transform-optional-catch-binding": "^7.22.0",
+        "@babel/plugin-transform-optional-chaining": "^7.22.0",
+        "@babel/plugin-transform-parameters": "^7.22.0",
+        "@babel/plugin-transform-private-methods": "^7.22.0",
+        "@babel/plugin-transform-private-property-in-object": "^7.22.0",
         "@babel/plugin-transform-property-literals": "^7.18.6",
         "@babel/plugin-transform-regenerator": "^7.21.5",
         "@babel/plugin-transform-reserved-words": "^7.18.6",
@@ -18576,23 +18766,50 @@
         "@babel/plugin-transform-template-literals": "^7.18.9",
         "@babel/plugin-transform-typeof-symbol": "^7.18.9",
         "@babel/plugin-transform-unicode-escapes": "^7.21.5",
+        "@babel/plugin-transform-unicode-property-regex": "^7.22.0",
         "@babel/plugin-transform-unicode-regex": "^7.18.6",
+        "@babel/plugin-transform-unicode-sets-regex": "^7.22.0",
         "@babel/preset-modules": "^0.1.5",
-        "@babel/types": "^7.21.5",
-        "babel-plugin-polyfill-corejs2": "^0.3.3",
-        "babel-plugin-polyfill-corejs3": "^0.6.0",
-        "babel-plugin-polyfill-regenerator": "^0.4.1",
-        "core-js-compat": "^3.25.1",
+        "@babel/types": "^7.22.0",
+        "babel-plugin-polyfill-corejs2": "^0.4.2",
+        "babel-plugin-polyfill-corejs3": "^0.8.1",
+        "babel-plugin-polyfill-regenerator": "^0.5.0",
+        "core-js-compat": "^3.30.2",
         "semver": "^6.3.0"
       },
       "dependencies": {
+        "@babel/helper-define-polyfill-provider": {
+          "version": "0.4.0",
+          "resolved": "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.4.0.tgz",
+          "integrity": "sha512-RnanLx5ETe6aybRi1cO/edaRH+bNYWaryCEmjDDYyNr4wnSzyOp8T0dWipmqVHKEY3AbVKUom50AKSlj1zmKbg==",
+          "dev": true,
+          "requires": {
+            "@babel/helper-compilation-targets": "^7.17.7",
+            "@babel/helper-plugin-utils": "^7.16.7",
+            "debug": "^4.1.1",
+            "lodash.debounce": "^4.0.8",
+            "resolve": "^1.14.2",
+            "semver": "^6.1.2"
+          }
+        },
+        "babel-plugin-polyfill-corejs2": {
+          "version": "0.4.3",
+          "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.4.3.tgz",
+          "integrity": "sha512-bM3gHc337Dta490gg+/AseNB9L4YLHxq1nGKZZSHbhXv4aTYU2MD2cjza1Ru4S6975YLTaL1K8uJf6ukJhhmtw==",
+          "dev": true,
+          "requires": {
+            "@babel/compat-data": "^7.17.7",
+            "@babel/helper-define-polyfill-provider": "^0.4.0",
+            "semver": "^6.1.1"
+          }
+        },
         "babel-plugin-polyfill-regenerator": {
-          "version": "0.4.1",
-          "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.4.1.tgz",
-          "integrity": "sha512-NtQGmyQDXjQqQ+IzRkBVwEOz9lQ4zxAQZgoAYEtU9dJjnl1Oc98qnN7jcp+bE7O7aYzVpavXE3/VKXNzUbh7aw==",
+          "version": "0.5.0",
+          "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.5.0.tgz",
+          "integrity": "sha512-hDJtKjMLVa7Z+LwnTCxoDLQj6wdc+B8dun7ayF2fYieI6OzfuvcLMB32ihJZ4UhCBwNYGl5bg/x/P9cMdnkc2g==",
           "dev": true,
           "requires": {
-            "@babel/helper-define-polyfill-provider": "^0.3.3"
+            "@babel/helper-define-polyfill-provider": "^0.4.0"
           }
         }
       }
@@ -18652,9 +18869,9 @@
       }
     },
     "@babel/types": {
-      "version": "7.22.0",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.22.0.tgz",
-      "integrity": "sha512-NtXlm3f6cNWIv003cETdlz9sss0VMNtplyatFohxWPz90AbwuhCbHbQopkGis6bG1vOunDLN0FF/4Uv5i8LFZQ==",
+      "version": "7.22.3",
+      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.22.3.tgz",
+      "integrity": "sha512-P3na3xIQHTKY4L0YOG7pM8M8uoUIB910WQaSiiMCZUC2Cy8XFEQONGABFnHWBa2gpGKODTAJcNhi5Zk0sLRrzg==",
       "requires": {
         "@babel/helper-string-parser": "^7.21.5",
         "@babel/helper-validator-identifier": "^7.19.1",
@@ -20801,13 +21018,29 @@
       }
     },
     "babel-plugin-polyfill-corejs3": {
-      "version": "0.6.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.6.0.tgz",
-      "integrity": "sha512-+eHqR6OPcBhJOGgsIar7xoAB1GcSwVUA3XjAd7HJNzOXT4wv6/H7KIdA/Nc60cvUlDbKApmqNvD1B1bzOt4nyA==",
+      "version": "0.8.1",
+      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.8.1.tgz",
+      "integrity": "sha512-ikFrZITKg1xH6pLND8zT14UPgjKHiGLqex7rGEZCH2EvhsneJaJPemmpQaIZV5AL03II+lXylw3UmddDK8RU5Q==",
       "dev": true,
       "requires": {
-        "@babel/helper-define-polyfill-provider": "^0.3.3",
-        "core-js-compat": "^3.25.1"
+        "@babel/helper-define-polyfill-provider": "^0.4.0",
+        "core-js-compat": "^3.30.1"
+      },
+      "dependencies": {
+        "@babel/helper-define-polyfill-provider": {
+          "version": "0.4.0",
+          "resolved": "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.4.0.tgz",
+          "integrity": "sha512-RnanLx5ETe6aybRi1cO/edaRH+bNYWaryCEmjDDYyNr4wnSzyOp8T0dWipmqVHKEY3AbVKUom50AKSlj1zmKbg==",
+          "dev": true,
+          "requires": {
+            "@babel/helper-compilation-targets": "^7.17.7",
+            "@babel/helper-plugin-utils": "^7.16.7",
+            "debug": "^4.1.1",
+            "lodash.debounce": "^4.0.8",
+            "resolve": "^1.14.2",
+            "semver": "^6.1.2"
+          }
+        }
       }
     },
     "babel-plugin-polyfill-regenerator": {
@@ -21620,11 +21853,11 @@
       "integrity": "sha512-uBJiDmwqsbJCWHAwjrx3cvjbMXP7xD72Dmsn5LOJpiRmE3WbBbN5rCqQ2Qh6Ek6/eOrjlWngEynBWo4VxerQhg=="
     },
     "core-js-compat": {
-      "version": "3.25.1",
-      "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.25.1.tgz",
-      "integrity": "sha512-pOHS7O0i8Qt4zlPW/eIFjwp+NrTPx+wTL0ctgI2fHn31sZOq89rDsmtc/A2vAX7r6shl+bmVI+678He46jgBlw==",
+      "version": "3.30.2",
+      "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.30.2.tgz",
+      "integrity": "sha512-nriW1nuJjUgvkEjIot1Spwakz52V9YkYHZAQG6A1eCgC8AA1p0zngrQEP9R0+V6hji5XilWKG1Bd0YRppmGimA==",
       "requires": {
-        "browserslist": "^4.21.3"
+        "browserslist": "^4.21.5"
       }
     },
     "core-util-is": {
diff --git a/apps/block_scout_web/assets/package.json b/apps/block_scout_web/assets/package.json
index a9ddbc22063f..bb285497d4b6 100644
--- a/apps/block_scout_web/assets/package.json
+++ b/apps/block_scout_web/assets/package.json
@@ -84,7 +84,7 @@
   },
   "devDependencies": {
     "@babel/core": "^7.22.1",
-    "@babel/preset-env": "^7.21.5",
+    "@babel/preset-env": "^7.22.2",
     "autoprefixer": "^10.4.14",
     "babel-loader": "^9.1.2",
     "copy-webpack-plugin": "^11.0.0",

From 56b0b220d035dd925da381e26e92ef6a089326f0 Mon Sep 17 00:00:00 2001
From: Viktor Baranov <baranov.viktor.27@gmail.com>
Date: Mon, 29 May 2023 12:30:54 +0300
Subject: [PATCH 028/909] Check left blocks in pending block operations in
 order to decide, if we need to display indexing int tx banner at the top

---
 .tool-versions                                |  2 +-
 CHANGELOG.md                                  |  1 +
 apps/explorer/lib/explorer/application.ex     | 12 +--
 apps/explorer/lib/explorer/chain.ex           | 60 ++++++++++-----
 .../chain/cache/pending_block_operation.ex    | 73 +++++++++++++++++++
 apps/explorer/test/explorer/chain_test.exs    | 13 ++++
 config/runtime.exs                            | 11 ++-
 7 files changed, 145 insertions(+), 27 deletions(-)
 create mode 100644 apps/explorer/lib/explorer/chain/cache/pending_block_operation.ex

diff --git a/.tool-versions b/.tool-versions
index ac759f5a58da..44d2a271304f 100644
--- a/.tool-versions
+++ b/.tool-versions
@@ -1,3 +1,3 @@
-elixir 1.14.4-otp-25
+elixir 1.14.5-otp-25
 erlang 25.3
 nodejs 18.13.0
diff --git a/CHANGELOG.md b/CHANGELOG.md
index a152366bff6e..34cab17583a7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -21,6 +21,7 @@
 
 ### Chore
 
+- [#7576](https://github.com/blockscout/blockscout/pull/7576) - Check left blocks in pending block operations in order to decide, if we need to display indexing int tx banner at the top
 - [#7543](https://github.com/blockscout/blockscout/pull/7543) - Allow hyphen in DB username
 
 <details>
diff --git a/apps/explorer/lib/explorer/application.ex b/apps/explorer/lib/explorer/application.ex
index 4a00c0ed8d88..076ada679548 100644
--- a/apps/explorer/lib/explorer/application.ex
+++ b/apps/explorer/lib/explorer/application.ex
@@ -18,6 +18,7 @@ defmodule Explorer.Application do
     GasUsage,
     MinMissingBlockNumber,
     NetVersion,
+    PendingBlockOperation,
     Transaction,
     Transactions,
     TransactionsApiV2,
@@ -55,21 +56,22 @@ defmodule Explorer.Application do
       Explorer.SmartContract.VyperDownloader,
       {Registry, keys: :duplicate, name: Registry.ChainEvents, id: Registry.ChainEvents},
       {Admin.Recovery, [[], [name: Admin.Recovery]]},
-      Transaction,
+      Accounts,
       AddressSum,
       AddressSumMinusBurnt,
       Block,
+      BlockNumber,
       Blocks,
       GasPriceOracle,
       GasUsage,
       NetVersion,
-      BlockNumber,
-      con_cache_child_spec(MarketHistoryCache.cache_name()),
-      con_cache_child_spec(RSK.cache_name(), ttl_check_interval: :timer.minutes(1), global_ttl: :timer.minutes(30)),
+      PendingBlockOperation,
+      Transaction,
       Transactions,
       TransactionsApiV2,
-      Accounts,
       Uncles,
+      con_cache_child_spec(MarketHistoryCache.cache_name()),
+      con_cache_child_spec(RSK.cache_name(), ttl_check_interval: :timer.minutes(1), global_ttl: :timer.minutes(30)),
       {Redix, redix_opts()},
       {Explorer.Utility.MissingRangesManipulator, []}
     ]
diff --git a/apps/explorer/lib/explorer/chain.ex b/apps/explorer/lib/explorer/chain.ex
index fbba8d1a3a23..59ad4956052e 100644
--- a/apps/explorer/lib/explorer/chain.ex
+++ b/apps/explorer/lib/explorer/chain.ex
@@ -82,6 +82,7 @@ defmodule Explorer.Chain do
 
   alias Explorer.Chain.Cache.Block, as: BlockCache
   alias Explorer.Chain.Cache.Helper, as: CacheHelper
+  alias Explorer.Chain.Cache.PendingBlockOperation, as: PendingBlockOperationCache
   alias Explorer.Chain.Fetcher.{CheckBytecodeMatchingOnDemand, LookUpSmartContractSourcesOnDemand}
   alias Explorer.Chain.Import.Runner
   alias Explorer.Chain.InternalTransaction.{CallType, Type}
@@ -1344,27 +1345,46 @@ defmodule Explorer.Chain do
       if variant == EthereumJSONRPC.Ganache || variant == EthereumJSONRPC.Arbitrum do
         true
       else
-        with {:transactions_exist, true} <- {:transactions_exist, select_repo(options).exists?(Transaction)},
-             min_block_number when not is_nil(min_block_number) <-
-               select_repo(options).aggregate(Transaction, :min, :block_number) do
-          min_block_number =
-            min_block_number
-            |> Decimal.max(EthereumJSONRPC.first_block_to_fetch(:trace_first_block))
-            |> Decimal.to_integer()
-
-          query =
-            from(
-              block in Block,
-              join: pending_ops in assoc(block, :pending_operations),
-              where: block.consensus and block.number == ^min_block_number
-            )
+        check_left_blocks_to_index_internal_transactions(options)
+      end
+    end
+  end
 
-          !select_repo(options).exists?(query)
-        else
-          {:transactions_exist, false} -> true
-          nil -> false
-        end
+  defp check_left_blocks_to_index_internal_transactions(options) do
+    with {:transactions_exist, true} <- {:transactions_exist, select_repo(options).exists?(Transaction)},
+         min_block_number when not is_nil(min_block_number) <-
+           select_repo(options).aggregate(Transaction, :min, :block_number) do
+      min_block_number =
+        min_block_number
+        |> Decimal.max(EthereumJSONRPC.first_block_to_fetch(:trace_first_block))
+        |> Decimal.to_integer()
+
+      query =
+        from(
+          block in Block,
+          join: pending_ops in assoc(block, :pending_operations),
+          where: block.consensus and block.number == ^min_block_number
+        )
+
+      if select_repo(options).exists?(query) do
+        false
+      else
+        check_indexing_internal_transactions_threshold()
       end
+    else
+      {:transactions_exist, false} -> true
+      nil -> false
+    end
+  end
+
+  defp check_indexing_internal_transactions_threshold do
+    pbo_count = PendingBlockOperationCache.estimated_count()
+
+    if pbo_count <
+         Application.get_env(:indexer, Indexer.Fetcher.InternalTransaction)[:indexing_finished_threshold] do
+      true
+    else
+      false
     end
   end
 
@@ -2297,7 +2317,7 @@ defmodule Explorer.Chain do
     if Application.get_env(:indexer, Indexer.Supervisor)[:enabled] &&
          not Application.get_env(:indexer, Indexer.Fetcher.InternalTransaction.Supervisor)[:disabled?] do
       %{max: max_saved_block_number} = BlockNumber.get_all()
-      pbo_count = Repo.aggregate(PendingBlockOperation, :count, timeout: :infinity)
+      pbo_count = PendingBlockOperationCache.estimated_count()
 
       min_blockchain_trace_block_number = min_block_number_from_config(:trace_first_block)
 
diff --git a/apps/explorer/lib/explorer/chain/cache/pending_block_operation.ex b/apps/explorer/lib/explorer/chain/cache/pending_block_operation.ex
new file mode 100644
index 000000000000..dc0f01e59cbe
--- /dev/null
+++ b/apps/explorer/lib/explorer/chain/cache/pending_block_operation.ex
@@ -0,0 +1,73 @@
+defmodule Explorer.Chain.Cache.PendingBlockOperation do
+  @moduledoc """
+  Cache for estimated `pending_block_operations` count.
+  """
+
+  use Explorer.Chain.MapCache,
+    name: :pending_block_operations_count,
+    key: :count,
+    key: :async_task,
+    global_ttl: Application.get_env(:explorer, __MODULE__)[:global_ttl],
+    ttl_check_interval: :timer.seconds(1),
+    callback: &async_task_on_deletion(&1)
+
+  require Logger
+
+  alias Explorer.Chain.Cache.Helper
+  alias Explorer.Chain.PendingBlockOperation
+  alias Explorer.Repo
+
+  @doc """
+  Estimated count of `t:Explorer.Chain.PendingBlockOperation.t/0`.
+
+  """
+  @spec estimated_count() :: non_neg_integer()
+  def estimated_count do
+    cached_value = __MODULE__.get_count()
+
+    if is_nil(cached_value) do
+      count = Helper.estimated_count_from("pending_block_operations")
+
+      max(count, 0)
+    else
+      cached_value
+    end
+  end
+
+  defp handle_fallback(:count) do
+    # This will get the task PID if one exists and launch a new task if not
+    # See next `handle_fallback` definition
+    get_async_task()
+
+    {:return, nil}
+  end
+
+  defp handle_fallback(:async_task) do
+    # If this gets called it means an async task was requested, but none exists
+    # so a new one needs to be launched
+    {:ok, task} =
+      Task.start(fn ->
+        try do
+          result = Repo.aggregate(PendingBlockOperation, :count, timeout: :infinity)
+
+          set_count(result)
+        rescue
+          e ->
+            Logger.debug([
+              "Couldn't update pending_block_operations count: ",
+              Exception.format(:error, e, __STACKTRACE__)
+            ])
+        end
+
+        set_async_task(nil)
+      end)
+
+    {:update, task}
+  end
+
+  # By setting this as a `callback` an async task will be started each time the
+  # `count` expires (unless there is one already running)
+  defp async_task_on_deletion({:delete, _, :count}), do: get_async_task()
+
+  defp async_task_on_deletion(_data), do: nil
+end
diff --git a/apps/explorer/test/explorer/chain_test.exs b/apps/explorer/test/explorer/chain_test.exs
index 563e81d0a983..de55e1a3629a 100644
--- a/apps/explorer/test/explorer/chain_test.exs
+++ b/apps/explorer/test/explorer/chain_test.exs
@@ -30,6 +30,7 @@ defmodule Explorer.ChainTest do
   alias Explorer.{Chain, Etherscan}
   alias Explorer.Chain.Cache.Block, as: BlockCache
   alias Explorer.Chain.Cache.Transaction, as: TransactionCache
+  alias Explorer.Chain.Cache.PendingBlockOperation, as: PendingBlockOperationCache
   alias Explorer.Chain.InternalTransaction.Type
 
   alias Explorer.Chain.Supply.ProofOfAuthority
@@ -1207,6 +1208,12 @@ defmodule Explorer.ChainTest do
   end
 
   describe "finished_indexing_internal_transactions?/0" do
+    setup do
+      Supervisor.terminate_child(Explorer.Supervisor, PendingBlockOperationCache.child_id())
+      Supervisor.restart_child(Explorer.Supervisor, PendingBlockOperationCache.child_id())
+      on_exit(fn -> Supervisor.terminate_child(Explorer.Supervisor, PendingBlockOperationCache.child_id()) end)
+    end
+
     test "finished indexing" do
       block = insert(:block, number: 1)
 
@@ -1538,8 +1545,12 @@ defmodule Explorer.ChainTest do
 
   describe "indexed_ratio_internal_transactions/0" do
     setup do
+      Supervisor.terminate_child(Explorer.Supervisor, PendingBlockOperationCache.child_id())
+      Supervisor.restart_child(Explorer.Supervisor, PendingBlockOperationCache.child_id())
+
       on_exit(fn ->
         Application.put_env(:indexer, :trace_first_block, "")
+        Supervisor.terminate_child(Explorer.Supervisor, PendingBlockOperationCache.child_id())
       end)
     end
 
@@ -1552,6 +1563,8 @@ defmodule Explorer.ChainTest do
         end
       end
 
+      Chain.indexed_ratio_internal_transactions()
+
       assert Decimal.compare(Chain.indexed_ratio_internal_transactions(), Decimal.from_float(0.7)) == :eq
     end
 
diff --git a/config/runtime.exs b/config/runtime.exs
index 744a8f21d7d6..dd7e25d532a4 100644
--- a/config/runtime.exs
+++ b/config/runtime.exs
@@ -216,6 +216,9 @@ config :explorer, Explorer.Chain.Cache.Block,
 config :explorer, Explorer.Chain.Cache.Transaction,
   global_ttl: ConfigHelper.parse_time_env_var("CACHE_TXS_COUNT_PERIOD", "2h")
 
+config :explorer, Explorer.Chain.Cache.PendingBlockOperation,
+  global_ttl: ConfigHelper.parse_time_env_var("CACHE_PBO_COUNT_PERIOD", "20m")
+
 config :explorer, Explorer.Chain.Cache.GasPriceOracle,
   global_ttl: ConfigHelper.parse_time_env_var("GAS_PRICE_ORACLE_CACHE_PERIOD", "30s"),
   num_of_blocks: ConfigHelper.parse_integer_env_var("GAS_PRICE_ORACLE_NUM_OF_BLOCKS", 200),
@@ -323,6 +326,10 @@ config :explorer, Explorer.Chain.Cache.Uncles,
   ttl_check_interval: ConfigHelper.cache_ttl_check_interval(disable_indexer?),
   global_ttl: ConfigHelper.cache_global_ttl(disable_indexer?)
 
+config :explorer, Explorer.Chain.Cache.Uncles,
+  ttl_check_interval: ConfigHelper.cache_ttl_check_interval(disable_indexer?),
+  global_ttl: ConfigHelper.cache_global_ttl(disable_indexer?)
+
 config :explorer, Explorer.ThirdPartyIntegrations.Sourcify,
   server_url: System.get_env("SOURCIFY_SERVER_URL") || "https://sourcify.dev/server",
   enabled: ConfigHelper.parse_bool_env_var("SOURCIFY_INTEGRATION_ENABLED"),
@@ -494,7 +501,9 @@ config :indexer, Indexer.Fetcher.TokenInstance.Sanitize,
 
 config :indexer, Indexer.Fetcher.InternalTransaction,
   batch_size: ConfigHelper.parse_integer_env_var("INDEXER_INTERNAL_TRANSACTIONS_BATCH_SIZE", 10),
-  concurrency: ConfigHelper.parse_integer_env_var("INDEXER_INTERNAL_TRANSACTIONS_CONCURRENCY", 4)
+  concurrency: ConfigHelper.parse_integer_env_var("INDEXER_INTERNAL_TRANSACTIONS_CONCURRENCY", 4),
+  indexing_finished_threshold:
+    ConfigHelper.parse_integer_env_var("INDEXER_INTERNAL_TRANSACTIONS_INDEXING_FINISHED_THRESHOLD", 1000)
 
 config :indexer, Indexer.Fetcher.CoinBalance,
   batch_size: ConfigHelper.parse_integer_env_var("INDEXER_COIN_BALANCES_BATCH_SIZE", 500),

From f315c9e42c67cd68f8228279cc401639719eaf5c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 29 May 2023 19:03:21 +0000
Subject: [PATCH 029/909] Bump @babel/preset-env in
 /apps/block_scout_web/assets

Bumps [@babel/preset-env](https://github.com/babel/babel/tree/HEAD/packages/babel-preset-env) from 7.22.2 to 7.22.4.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/commits/v7.22.4/packages/babel-preset-env)

---
updated-dependencies:
- dependency-name: "@babel/preset-env"
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 apps/block_scout_web/assets/package-lock.json | 122 +++++++++---------
 apps/block_scout_web/assets/package.json      |   2 +-
 2 files changed, 62 insertions(+), 62 deletions(-)

diff --git a/apps/block_scout_web/assets/package-lock.json b/apps/block_scout_web/assets/package-lock.json
index 0f7fa49f1d36..c600df668f4b 100644
--- a/apps/block_scout_web/assets/package-lock.json
+++ b/apps/block_scout_web/assets/package-lock.json
@@ -72,7 +72,7 @@
       },
       "devDependencies": {
         "@babel/core": "^7.22.1",
-        "@babel/preset-env": "^7.22.2",
+        "@babel/preset-env": "^7.22.4",
         "autoprefixer": "^10.4.14",
         "babel-loader": "^9.1.2",
         "copy-webpack-plugin": "^11.0.0",
@@ -1809,17 +1809,17 @@
       }
     },
     "node_modules/@babel/preset-env": {
-      "version": "7.22.2",
-      "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.22.2.tgz",
-      "integrity": "sha512-UPNK9pgphMULvA2EMKIWHU90C47PKyuvQ8pE1MzH7l9PgFcRabdrHhlePpBuWxYZQ+TziP2nycKoI5C1Yhdm9Q==",
+      "version": "7.22.4",
+      "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.22.4.tgz",
+      "integrity": "sha512-c3lHOjbwBv0TkhYCr+XCR6wKcSZ1QbQTVdSkZUaVpLv8CVWotBMArWUi5UAJrcrQaEnleVkkvaV8F/pmc/STZQ==",
       "dev": true,
       "dependencies": {
-        "@babel/compat-data": "^7.22.0",
+        "@babel/compat-data": "^7.22.3",
         "@babel/helper-compilation-targets": "^7.22.1",
         "@babel/helper-plugin-utils": "^7.21.5",
         "@babel/helper-validator-option": "^7.21.0",
         "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": "^7.18.6",
-        "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": "^7.22.0",
+        "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": "^7.22.3",
         "@babel/plugin-proposal-private-property-in-object": "^7.21.0",
         "@babel/plugin-syntax-async-generators": "^7.8.4",
         "@babel/plugin-syntax-class-properties": "^7.12.13",
@@ -1827,7 +1827,7 @@
         "@babel/plugin-syntax-dynamic-import": "^7.8.3",
         "@babel/plugin-syntax-export-namespace-from": "^7.8.3",
         "@babel/plugin-syntax-import-assertions": "^7.20.0",
-        "@babel/plugin-syntax-import-attributes": "^7.22.0",
+        "@babel/plugin-syntax-import-attributes": "^7.22.3",
         "@babel/plugin-syntax-import-meta": "^7.10.4",
         "@babel/plugin-syntax-json-strings": "^7.8.3",
         "@babel/plugin-syntax-logical-assignment-operators": "^7.10.4",
@@ -1840,12 +1840,12 @@
         "@babel/plugin-syntax-top-level-await": "^7.14.5",
         "@babel/plugin-syntax-unicode-sets-regex": "^7.18.6",
         "@babel/plugin-transform-arrow-functions": "^7.21.5",
-        "@babel/plugin-transform-async-generator-functions": "^7.22.0",
+        "@babel/plugin-transform-async-generator-functions": "^7.22.3",
         "@babel/plugin-transform-async-to-generator": "^7.20.7",
         "@babel/plugin-transform-block-scoped-functions": "^7.18.6",
         "@babel/plugin-transform-block-scoping": "^7.21.0",
-        "@babel/plugin-transform-class-properties": "^7.22.0",
-        "@babel/plugin-transform-class-static-block": "^7.22.0",
+        "@babel/plugin-transform-class-properties": "^7.22.3",
+        "@babel/plugin-transform-class-static-block": "^7.22.3",
         "@babel/plugin-transform-classes": "^7.21.0",
         "@babel/plugin-transform-computed-properties": "^7.21.5",
         "@babel/plugin-transform-destructuring": "^7.21.3",
@@ -1853,28 +1853,28 @@
         "@babel/plugin-transform-duplicate-keys": "^7.18.9",
         "@babel/plugin-transform-dynamic-import": "^7.22.1",
         "@babel/plugin-transform-exponentiation-operator": "^7.18.6",
-        "@babel/plugin-transform-export-namespace-from": "^7.22.0",
+        "@babel/plugin-transform-export-namespace-from": "^7.22.3",
         "@babel/plugin-transform-for-of": "^7.21.5",
         "@babel/plugin-transform-function-name": "^7.18.9",
-        "@babel/plugin-transform-json-strings": "^7.22.0",
+        "@babel/plugin-transform-json-strings": "^7.22.3",
         "@babel/plugin-transform-literals": "^7.18.9",
-        "@babel/plugin-transform-logical-assignment-operators": "^7.22.0",
+        "@babel/plugin-transform-logical-assignment-operators": "^7.22.3",
         "@babel/plugin-transform-member-expression-literals": "^7.18.6",
         "@babel/plugin-transform-modules-amd": "^7.20.11",
         "@babel/plugin-transform-modules-commonjs": "^7.21.5",
-        "@babel/plugin-transform-modules-systemjs": "^7.22.0",
+        "@babel/plugin-transform-modules-systemjs": "^7.22.3",
         "@babel/plugin-transform-modules-umd": "^7.18.6",
-        "@babel/plugin-transform-named-capturing-groups-regex": "^7.22.0",
-        "@babel/plugin-transform-new-target": "^7.22.0",
-        "@babel/plugin-transform-nullish-coalescing-operator": "^7.22.0",
-        "@babel/plugin-transform-numeric-separator": "^7.22.0",
-        "@babel/plugin-transform-object-rest-spread": "^7.22.0",
+        "@babel/plugin-transform-named-capturing-groups-regex": "^7.22.3",
+        "@babel/plugin-transform-new-target": "^7.22.3",
+        "@babel/plugin-transform-nullish-coalescing-operator": "^7.22.3",
+        "@babel/plugin-transform-numeric-separator": "^7.22.3",
+        "@babel/plugin-transform-object-rest-spread": "^7.22.3",
         "@babel/plugin-transform-object-super": "^7.18.6",
-        "@babel/plugin-transform-optional-catch-binding": "^7.22.0",
-        "@babel/plugin-transform-optional-chaining": "^7.22.0",
-        "@babel/plugin-transform-parameters": "^7.22.0",
-        "@babel/plugin-transform-private-methods": "^7.22.0",
-        "@babel/plugin-transform-private-property-in-object": "^7.22.0",
+        "@babel/plugin-transform-optional-catch-binding": "^7.22.3",
+        "@babel/plugin-transform-optional-chaining": "^7.22.3",
+        "@babel/plugin-transform-parameters": "^7.22.3",
+        "@babel/plugin-transform-private-methods": "^7.22.3",
+        "@babel/plugin-transform-private-property-in-object": "^7.22.3",
         "@babel/plugin-transform-property-literals": "^7.18.6",
         "@babel/plugin-transform-regenerator": "^7.21.5",
         "@babel/plugin-transform-reserved-words": "^7.18.6",
@@ -1884,12 +1884,12 @@
         "@babel/plugin-transform-template-literals": "^7.18.9",
         "@babel/plugin-transform-typeof-symbol": "^7.18.9",
         "@babel/plugin-transform-unicode-escapes": "^7.21.5",
-        "@babel/plugin-transform-unicode-property-regex": "^7.22.0",
+        "@babel/plugin-transform-unicode-property-regex": "^7.22.3",
         "@babel/plugin-transform-unicode-regex": "^7.18.6",
-        "@babel/plugin-transform-unicode-sets-regex": "^7.22.0",
+        "@babel/plugin-transform-unicode-sets-regex": "^7.22.3",
         "@babel/preset-modules": "^0.1.5",
-        "@babel/types": "^7.22.0",
-        "babel-plugin-polyfill-corejs2": "^0.4.2",
+        "@babel/types": "^7.22.4",
+        "babel-plugin-polyfill-corejs2": "^0.4.3",
         "babel-plugin-polyfill-corejs3": "^0.8.1",
         "babel-plugin-polyfill-regenerator": "^0.5.0",
         "core-js-compat": "^3.30.2",
@@ -2012,9 +2012,9 @@
       }
     },
     "node_modules/@babel/types": {
-      "version": "7.22.3",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.22.3.tgz",
-      "integrity": "sha512-P3na3xIQHTKY4L0YOG7pM8M8uoUIB910WQaSiiMCZUC2Cy8XFEQONGABFnHWBa2gpGKODTAJcNhi5Zk0sLRrzg==",
+      "version": "7.22.4",
+      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.22.4.tgz",
+      "integrity": "sha512-Tx9x3UBHTTsMSW85WB2kphxYQVvrZ/t1FxD88IpSgIjiUJlCm9z+xWIDwyo1vffTwSqteqyznB8ZE9vYYk16zA==",
       "dependencies": {
         "@babel/helper-string-parser": "^7.21.5",
         "@babel/helper-validator-identifier": "^7.19.1",
@@ -18691,17 +18691,17 @@
       }
     },
     "@babel/preset-env": {
-      "version": "7.22.2",
-      "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.22.2.tgz",
-      "integrity": "sha512-UPNK9pgphMULvA2EMKIWHU90C47PKyuvQ8pE1MzH7l9PgFcRabdrHhlePpBuWxYZQ+TziP2nycKoI5C1Yhdm9Q==",
+      "version": "7.22.4",
+      "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.22.4.tgz",
+      "integrity": "sha512-c3lHOjbwBv0TkhYCr+XCR6wKcSZ1QbQTVdSkZUaVpLv8CVWotBMArWUi5UAJrcrQaEnleVkkvaV8F/pmc/STZQ==",
       "dev": true,
       "requires": {
-        "@babel/compat-data": "^7.22.0",
+        "@babel/compat-data": "^7.22.3",
         "@babel/helper-compilation-targets": "^7.22.1",
         "@babel/helper-plugin-utils": "^7.21.5",
         "@babel/helper-validator-option": "^7.21.0",
         "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": "^7.18.6",
-        "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": "^7.22.0",
+        "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": "^7.22.3",
         "@babel/plugin-proposal-private-property-in-object": "^7.21.0",
         "@babel/plugin-syntax-async-generators": "^7.8.4",
         "@babel/plugin-syntax-class-properties": "^7.12.13",
@@ -18709,7 +18709,7 @@
         "@babel/plugin-syntax-dynamic-import": "^7.8.3",
         "@babel/plugin-syntax-export-namespace-from": "^7.8.3",
         "@babel/plugin-syntax-import-assertions": "^7.20.0",
-        "@babel/plugin-syntax-import-attributes": "^7.22.0",
+        "@babel/plugin-syntax-import-attributes": "^7.22.3",
         "@babel/plugin-syntax-import-meta": "^7.10.4",
         "@babel/plugin-syntax-json-strings": "^7.8.3",
         "@babel/plugin-syntax-logical-assignment-operators": "^7.10.4",
@@ -18722,12 +18722,12 @@
         "@babel/plugin-syntax-top-level-await": "^7.14.5",
         "@babel/plugin-syntax-unicode-sets-regex": "^7.18.6",
         "@babel/plugin-transform-arrow-functions": "^7.21.5",
-        "@babel/plugin-transform-async-generator-functions": "^7.22.0",
+        "@babel/plugin-transform-async-generator-functions": "^7.22.3",
         "@babel/plugin-transform-async-to-generator": "^7.20.7",
         "@babel/plugin-transform-block-scoped-functions": "^7.18.6",
         "@babel/plugin-transform-block-scoping": "^7.21.0",
-        "@babel/plugin-transform-class-properties": "^7.22.0",
-        "@babel/plugin-transform-class-static-block": "^7.22.0",
+        "@babel/plugin-transform-class-properties": "^7.22.3",
+        "@babel/plugin-transform-class-static-block": "^7.22.3",
         "@babel/plugin-transform-classes": "^7.21.0",
         "@babel/plugin-transform-computed-properties": "^7.21.5",
         "@babel/plugin-transform-destructuring": "^7.21.3",
@@ -18735,28 +18735,28 @@
         "@babel/plugin-transform-duplicate-keys": "^7.18.9",
         "@babel/plugin-transform-dynamic-import": "^7.22.1",
         "@babel/plugin-transform-exponentiation-operator": "^7.18.6",
-        "@babel/plugin-transform-export-namespace-from": "^7.22.0",
+        "@babel/plugin-transform-export-namespace-from": "^7.22.3",
         "@babel/plugin-transform-for-of": "^7.21.5",
         "@babel/plugin-transform-function-name": "^7.18.9",
-        "@babel/plugin-transform-json-strings": "^7.22.0",
+        "@babel/plugin-transform-json-strings": "^7.22.3",
         "@babel/plugin-transform-literals": "^7.18.9",
-        "@babel/plugin-transform-logical-assignment-operators": "^7.22.0",
+        "@babel/plugin-transform-logical-assignment-operators": "^7.22.3",
         "@babel/plugin-transform-member-expression-literals": "^7.18.6",
         "@babel/plugin-transform-modules-amd": "^7.20.11",
         "@babel/plugin-transform-modules-commonjs": "^7.21.5",
-        "@babel/plugin-transform-modules-systemjs": "^7.22.0",
+        "@babel/plugin-transform-modules-systemjs": "^7.22.3",
         "@babel/plugin-transform-modules-umd": "^7.18.6",
-        "@babel/plugin-transform-named-capturing-groups-regex": "^7.22.0",
-        "@babel/plugin-transform-new-target": "^7.22.0",
-        "@babel/plugin-transform-nullish-coalescing-operator": "^7.22.0",
-        "@babel/plugin-transform-numeric-separator": "^7.22.0",
-        "@babel/plugin-transform-object-rest-spread": "^7.22.0",
+        "@babel/plugin-transform-named-capturing-groups-regex": "^7.22.3",
+        "@babel/plugin-transform-new-target": "^7.22.3",
+        "@babel/plugin-transform-nullish-coalescing-operator": "^7.22.3",
+        "@babel/plugin-transform-numeric-separator": "^7.22.3",
+        "@babel/plugin-transform-object-rest-spread": "^7.22.3",
         "@babel/plugin-transform-object-super": "^7.18.6",
-        "@babel/plugin-transform-optional-catch-binding": "^7.22.0",
-        "@babel/plugin-transform-optional-chaining": "^7.22.0",
-        "@babel/plugin-transform-parameters": "^7.22.0",
-        "@babel/plugin-transform-private-methods": "^7.22.0",
-        "@babel/plugin-transform-private-property-in-object": "^7.22.0",
+        "@babel/plugin-transform-optional-catch-binding": "^7.22.3",
+        "@babel/plugin-transform-optional-chaining": "^7.22.3",
+        "@babel/plugin-transform-parameters": "^7.22.3",
+        "@babel/plugin-transform-private-methods": "^7.22.3",
+        "@babel/plugin-transform-private-property-in-object": "^7.22.3",
         "@babel/plugin-transform-property-literals": "^7.18.6",
         "@babel/plugin-transform-regenerator": "^7.21.5",
         "@babel/plugin-transform-reserved-words": "^7.18.6",
@@ -18766,12 +18766,12 @@
         "@babel/plugin-transform-template-literals": "^7.18.9",
         "@babel/plugin-transform-typeof-symbol": "^7.18.9",
         "@babel/plugin-transform-unicode-escapes": "^7.21.5",
-        "@babel/plugin-transform-unicode-property-regex": "^7.22.0",
+        "@babel/plugin-transform-unicode-property-regex": "^7.22.3",
         "@babel/plugin-transform-unicode-regex": "^7.18.6",
-        "@babel/plugin-transform-unicode-sets-regex": "^7.22.0",
+        "@babel/plugin-transform-unicode-sets-regex": "^7.22.3",
         "@babel/preset-modules": "^0.1.5",
-        "@babel/types": "^7.22.0",
-        "babel-plugin-polyfill-corejs2": "^0.4.2",
+        "@babel/types": "^7.22.4",
+        "babel-plugin-polyfill-corejs2": "^0.4.3",
         "babel-plugin-polyfill-corejs3": "^0.8.1",
         "babel-plugin-polyfill-regenerator": "^0.5.0",
         "core-js-compat": "^3.30.2",
@@ -18869,9 +18869,9 @@
       }
     },
     "@babel/types": {
-      "version": "7.22.3",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.22.3.tgz",
-      "integrity": "sha512-P3na3xIQHTKY4L0YOG7pM8M8uoUIB910WQaSiiMCZUC2Cy8XFEQONGABFnHWBa2gpGKODTAJcNhi5Zk0sLRrzg==",
+      "version": "7.22.4",
+      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.22.4.tgz",
+      "integrity": "sha512-Tx9x3UBHTTsMSW85WB2kphxYQVvrZ/t1FxD88IpSgIjiUJlCm9z+xWIDwyo1vffTwSqteqyznB8ZE9vYYk16zA==",
       "requires": {
         "@babel/helper-string-parser": "^7.21.5",
         "@babel/helper-validator-identifier": "^7.19.1",
diff --git a/apps/block_scout_web/assets/package.json b/apps/block_scout_web/assets/package.json
index bb285497d4b6..ee984d9eaa61 100644
--- a/apps/block_scout_web/assets/package.json
+++ b/apps/block_scout_web/assets/package.json
@@ -84,7 +84,7 @@
   },
   "devDependencies": {
     "@babel/core": "^7.22.1",
-    "@babel/preset-env": "^7.22.2",
+    "@babel/preset-env": "^7.22.4",
     "autoprefixer": "^10.4.14",
     "babel-loader": "^9.1.2",
     "copy-webpack-plugin": "^11.0.0",

From 0f318774f376ee6187f8627ee2e16cd9e1a73613 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 29 May 2023 19:03:58 +0000
Subject: [PATCH 030/909] Bump sweetalert2 from 11.7.5 to 11.7.8 in
 /apps/block_scout_web/assets

Bumps [sweetalert2](https://github.com/sweetalert2/sweetalert2) from 11.7.5 to 11.7.8.
- [Release notes](https://github.com/sweetalert2/sweetalert2/releases)
- [Changelog](https://github.com/sweetalert2/sweetalert2/blob/main/CHANGELOG.md)
- [Commits](https://github.com/sweetalert2/sweetalert2/compare/v11.7.5...v11.7.8)

---
updated-dependencies:
- dependency-name: sweetalert2
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 apps/block_scout_web/assets/package-lock.json | 14 +++++++-------
 apps/block_scout_web/assets/package.json      |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/apps/block_scout_web/assets/package-lock.json b/apps/block_scout_web/assets/package-lock.json
index 0f7fa49f1d36..098a2b6992ed 100644
--- a/apps/block_scout_web/assets/package-lock.json
+++ b/apps/block_scout_web/assets/package-lock.json
@@ -61,7 +61,7 @@
         "redux": "^4.2.1",
         "stream-browserify": "^3.0.0",
         "stream-http": "^3.1.1",
-        "sweetalert2": "^11.7.5",
+        "sweetalert2": "^11.7.8",
         "urijs": "^1.19.11",
         "url": "^0.11.0",
         "util": "^0.12.5",
@@ -15744,9 +15744,9 @@
       }
     },
     "node_modules/sweetalert2": {
-      "version": "11.7.5",
-      "resolved": "https://registry.npmjs.org/sweetalert2/-/sweetalert2-11.7.5.tgz",
-      "integrity": "sha512-RBPKdK8Uf9/bz9r4vy7x6sGqf0MioSXt1po1lAwwcl3AwbjHVTc5S0yud4ZJKU1EhvJFVDrFoqIpHwWERwZJEA==",
+      "version": "11.7.8",
+      "resolved": "https://registry.npmjs.org/sweetalert2/-/sweetalert2-11.7.8.tgz",
+      "integrity": "sha512-s6WMsK0DogOZ2fj21tM5LjeBcQm7sPf+Z0sksxhZFs9HeIKAnLz8NMeIIOgcB/wS7/ZzP95d3jxzE6FbSau6eA==",
       "funding": {
         "type": "individual",
         "url": "https://github.com/sponsors/limonte"
@@ -29348,9 +29348,9 @@
       }
     },
     "sweetalert2": {
-      "version": "11.7.5",
-      "resolved": "https://registry.npmjs.org/sweetalert2/-/sweetalert2-11.7.5.tgz",
-      "integrity": "sha512-RBPKdK8Uf9/bz9r4vy7x6sGqf0MioSXt1po1lAwwcl3AwbjHVTc5S0yud4ZJKU1EhvJFVDrFoqIpHwWERwZJEA=="
+      "version": "11.7.8",
+      "resolved": "https://registry.npmjs.org/sweetalert2/-/sweetalert2-11.7.8.tgz",
+      "integrity": "sha512-s6WMsK0DogOZ2fj21tM5LjeBcQm7sPf+Z0sksxhZFs9HeIKAnLz8NMeIIOgcB/wS7/ZzP95d3jxzE6FbSau6eA=="
     },
     "symbol-tree": {
       "version": "3.2.4",
diff --git a/apps/block_scout_web/assets/package.json b/apps/block_scout_web/assets/package.json
index bb285497d4b6..a35014145a20 100644
--- a/apps/block_scout_web/assets/package.json
+++ b/apps/block_scout_web/assets/package.json
@@ -73,7 +73,7 @@
     "redux": "^4.2.1",
     "stream-browserify": "^3.0.0",
     "stream-http": "^3.1.1",
-    "sweetalert2": "^11.7.5",
+    "sweetalert2": "^11.7.8",
     "urijs": "^1.19.11",
     "url": "^0.11.0",
     "util": "^0.12.5",

From ede54454a6c20d83174ba359433cc1af743b0157 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 29 May 2023 19:05:04 +0000
Subject: [PATCH 031/909] Bump sass-loader from 13.3.0 to 13.3.1 in
 /apps/block_scout_web/assets

Bumps [sass-loader](https://github.com/webpack-contrib/sass-loader) from 13.3.0 to 13.3.1.
- [Release notes](https://github.com/webpack-contrib/sass-loader/releases)
- [Changelog](https://github.com/webpack-contrib/sass-loader/blob/master/CHANGELOG.md)
- [Commits](https://github.com/webpack-contrib/sass-loader/compare/v13.3.0...v13.3.1)

---
updated-dependencies:
- dependency-name: sass-loader
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 apps/block_scout_web/assets/package-lock.json | 14 +++++++-------
 apps/block_scout_web/assets/package.json      |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/apps/block_scout_web/assets/package-lock.json b/apps/block_scout_web/assets/package-lock.json
index 0f7fa49f1d36..5c191a66df7b 100644
--- a/apps/block_scout_web/assets/package-lock.json
+++ b/apps/block_scout_web/assets/package-lock.json
@@ -90,7 +90,7 @@
         "postcss": "^8.4.23",
         "postcss-loader": "^7.3.1",
         "sass": "^1.62.1",
-        "sass-loader": "^13.3.0",
+        "sass-loader": "^13.3.1",
         "style-loader": "^3.3.3",
         "webpack": "^5.84.1",
         "webpack-cli": "^5.1.1"
@@ -14906,9 +14906,9 @@
       }
     },
     "node_modules/sass-loader": {
-      "version": "13.3.0",
-      "resolved": "https://registry.npmjs.org/sass-loader/-/sass-loader-13.3.0.tgz",
-      "integrity": "sha512-LeWNswSEujsZnwdn9AuA+Q5wZEAFlU+eORQsDKp35OtGAfFxYxpfk/Ylon+TGGkazSqxi2EHDTqdr3di8r7nCg==",
+      "version": "13.3.1",
+      "resolved": "https://registry.npmjs.org/sass-loader/-/sass-loader-13.3.1.tgz",
+      "integrity": "sha512-cBTxmgyVA1nXPvIK4brjJMXOMJ2v2YrQEuHqLw3LylGb3gsR6jAvdjHMcy/+JGTmmIF9SauTrLLR7bsWDMWqgg==",
       "dev": true,
       "dependencies": {
         "klona": "^2.0.6",
@@ -28739,9 +28739,9 @@
       }
     },
     "sass-loader": {
-      "version": "13.3.0",
-      "resolved": "https://registry.npmjs.org/sass-loader/-/sass-loader-13.3.0.tgz",
-      "integrity": "sha512-LeWNswSEujsZnwdn9AuA+Q5wZEAFlU+eORQsDKp35OtGAfFxYxpfk/Ylon+TGGkazSqxi2EHDTqdr3di8r7nCg==",
+      "version": "13.3.1",
+      "resolved": "https://registry.npmjs.org/sass-loader/-/sass-loader-13.3.1.tgz",
+      "integrity": "sha512-cBTxmgyVA1nXPvIK4brjJMXOMJ2v2YrQEuHqLw3LylGb3gsR6jAvdjHMcy/+JGTmmIF9SauTrLLR7bsWDMWqgg==",
       "dev": true,
       "requires": {
         "klona": "^2.0.6",
diff --git a/apps/block_scout_web/assets/package.json b/apps/block_scout_web/assets/package.json
index bb285497d4b6..f83d7d92354e 100644
--- a/apps/block_scout_web/assets/package.json
+++ b/apps/block_scout_web/assets/package.json
@@ -102,7 +102,7 @@
     "postcss": "^8.4.23",
     "postcss-loader": "^7.3.1",
     "sass": "^1.62.1",
-    "sass-loader": "^13.3.0",
+    "sass-loader": "^13.3.1",
     "style-loader": "^3.3.3",
     "webpack": "^5.84.1",
     "webpack-cli": "^5.1.1"

From 2ab1bdfd0fcef055bfb750c1013a3b8c86f0a085 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 29 May 2023 19:05:34 +0000
Subject: [PATCH 032/909] Bump eslint-config-standard in
 /apps/block_scout_web/assets

Bumps [eslint-config-standard](https://github.com/standard/eslint-config-standard) from 17.0.0 to 17.1.0.
- [Changelog](https://github.com/standard/eslint-config-standard/blob/master/CHANGELOG.md)
- [Commits](https://github.com/standard/eslint-config-standard/compare/v17.0.0...v17.1.0)

---
updated-dependencies:
- dependency-name: eslint-config-standard
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 apps/block_scout_web/assets/package-lock.json | 19 +++++++++++--------
 apps/block_scout_web/assets/package.json      |  2 +-
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/apps/block_scout_web/assets/package-lock.json b/apps/block_scout_web/assets/package-lock.json
index 0f7fa49f1d36..8990234fff04 100644
--- a/apps/block_scout_web/assets/package-lock.json
+++ b/apps/block_scout_web/assets/package-lock.json
@@ -79,7 +79,7 @@
         "css-loader": "^5.2.7",
         "css-minimizer-webpack-plugin": "^5.0.0",
         "eslint": "^8.41.0",
-        "eslint-config-standard": "^17.0.0",
+        "eslint-config-standard": "^17.1.0",
         "eslint-plugin-import": "^2.27.5",
         "eslint-plugin-node": "^11.1.0",
         "eslint-plugin-promise": "^6.1.1",
@@ -7211,9 +7211,9 @@
       }
     },
     "node_modules/eslint-config-standard": {
-      "version": "17.0.0",
-      "resolved": "https://registry.npmjs.org/eslint-config-standard/-/eslint-config-standard-17.0.0.tgz",
-      "integrity": "sha512-/2ks1GKyqSOkH7JFvXJicu0iMpoojkwB+f5Du/1SC0PtBL+s8v30k9njRZ21pm2drKYm2342jFnGWzttxPmZVg==",
+      "version": "17.1.0",
+      "resolved": "https://registry.npmjs.org/eslint-config-standard/-/eslint-config-standard-17.1.0.tgz",
+      "integrity": "sha512-IwHwmaBNtDK4zDHQukFDW5u/aTb8+meQWZvNFWkiGmbWjD6bqyuSSBxxXKkCftCUzc1zwCH2m/baCNDLGmuO5Q==",
       "dev": true,
       "funding": [
         {
@@ -7229,10 +7229,13 @@
           "url": "https://feross.org/support"
         }
       ],
+      "engines": {
+        "node": ">=12.0.0"
+      },
       "peerDependencies": {
         "eslint": "^8.0.1",
         "eslint-plugin-import": "^2.25.2",
-        "eslint-plugin-n": "^15.0.0",
+        "eslint-plugin-n": "^15.0.0 || ^16.0.0 ",
         "eslint-plugin-promise": "^6.0.0"
       }
     },
@@ -23018,9 +23021,9 @@
       }
     },
     "eslint-config-standard": {
-      "version": "17.0.0",
-      "resolved": "https://registry.npmjs.org/eslint-config-standard/-/eslint-config-standard-17.0.0.tgz",
-      "integrity": "sha512-/2ks1GKyqSOkH7JFvXJicu0iMpoojkwB+f5Du/1SC0PtBL+s8v30k9njRZ21pm2drKYm2342jFnGWzttxPmZVg==",
+      "version": "17.1.0",
+      "resolved": "https://registry.npmjs.org/eslint-config-standard/-/eslint-config-standard-17.1.0.tgz",
+      "integrity": "sha512-IwHwmaBNtDK4zDHQukFDW5u/aTb8+meQWZvNFWkiGmbWjD6bqyuSSBxxXKkCftCUzc1zwCH2m/baCNDLGmuO5Q==",
       "dev": true,
       "requires": {}
     },
diff --git a/apps/block_scout_web/assets/package.json b/apps/block_scout_web/assets/package.json
index bb285497d4b6..06340dd2f56f 100644
--- a/apps/block_scout_web/assets/package.json
+++ b/apps/block_scout_web/assets/package.json
@@ -91,7 +91,7 @@
     "css-loader": "^5.2.7",
     "css-minimizer-webpack-plugin": "^5.0.0",
     "eslint": "^8.41.0",
-    "eslint-config-standard": "^17.0.0",
+    "eslint-config-standard": "^17.1.0",
     "eslint-plugin-import": "^2.27.5",
     "eslint-plugin-node": "^11.1.0",
     "eslint-plugin-promise": "^6.1.1",

From ea90a089a6baf8f6da4bbb77fbe4c310c0fa67b6 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 30 May 2023 07:12:38 +0000
Subject: [PATCH 033/909] Bump postcss-loader from 7.3.1 to 7.3.2 in
 /apps/block_scout_web/assets

Bumps [postcss-loader](https://github.com/webpack-contrib/postcss-loader) from 7.3.1 to 7.3.2.
- [Release notes](https://github.com/webpack-contrib/postcss-loader/releases)
- [Changelog](https://github.com/webpack-contrib/postcss-loader/blob/master/CHANGELOG.md)
- [Commits](https://github.com/webpack-contrib/postcss-loader/compare/v7.3.1...v7.3.2)

---
updated-dependencies:
- dependency-name: postcss-loader
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 apps/block_scout_web/assets/package-lock.json | 14 +++++++-------
 apps/block_scout_web/assets/package.json      |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/apps/block_scout_web/assets/package-lock.json b/apps/block_scout_web/assets/package-lock.json
index 75eafadcad50..71ea9714d30c 100644
--- a/apps/block_scout_web/assets/package-lock.json
+++ b/apps/block_scout_web/assets/package-lock.json
@@ -88,7 +88,7 @@
         "jest-environment-jsdom": "^29.5.0",
         "mini-css-extract-plugin": "^2.7.6",
         "postcss": "^8.4.23",
-        "postcss-loader": "^7.3.1",
+        "postcss-loader": "^7.3.2",
         "sass": "^1.62.1",
         "sass-loader": "^13.3.1",
         "style-loader": "^3.3.3",
@@ -13579,9 +13579,9 @@
       }
     },
     "node_modules/postcss-loader": {
-      "version": "7.3.1",
-      "resolved": "https://registry.npmjs.org/postcss-loader/-/postcss-loader-7.3.1.tgz",
-      "integrity": "sha512-uevGt8yy2gvruNvzy8jxgYSSnyqBcA7CnS6/57qoZnUMM51XgsTqxIpWZWdHyvIyo4ov0lCgnzIbhtWwVFI8lg==",
+      "version": "7.3.2",
+      "resolved": "https://registry.npmjs.org/postcss-loader/-/postcss-loader-7.3.2.tgz",
+      "integrity": "sha512-c7qDlXErX6n0VT+LUsW+nwefVtTu3ORtVvK8EXuUIDcxo+b/euYqpuHlJAvePb0Af5e8uMjR/13e0lTuYifaig==",
       "dev": true,
       "dependencies": {
         "cosmiconfig": "^8.1.3",
@@ -27787,9 +27787,9 @@
       "requires": {}
     },
     "postcss-loader": {
-      "version": "7.3.1",
-      "resolved": "https://registry.npmjs.org/postcss-loader/-/postcss-loader-7.3.1.tgz",
-      "integrity": "sha512-uevGt8yy2gvruNvzy8jxgYSSnyqBcA7CnS6/57qoZnUMM51XgsTqxIpWZWdHyvIyo4ov0lCgnzIbhtWwVFI8lg==",
+      "version": "7.3.2",
+      "resolved": "https://registry.npmjs.org/postcss-loader/-/postcss-loader-7.3.2.tgz",
+      "integrity": "sha512-c7qDlXErX6n0VT+LUsW+nwefVtTu3ORtVvK8EXuUIDcxo+b/euYqpuHlJAvePb0Af5e8uMjR/13e0lTuYifaig==",
       "dev": true,
       "requires": {
         "cosmiconfig": "^8.1.3",
diff --git a/apps/block_scout_web/assets/package.json b/apps/block_scout_web/assets/package.json
index f7cbedaf1246..211cea0c24cb 100644
--- a/apps/block_scout_web/assets/package.json
+++ b/apps/block_scout_web/assets/package.json
@@ -100,7 +100,7 @@
     "jest-environment-jsdom": "^29.5.0",
     "mini-css-extract-plugin": "^2.7.6",
     "postcss": "^8.4.23",
-    "postcss-loader": "^7.3.1",
+    "postcss-loader": "^7.3.2",
     "sass": "^1.62.1",
     "sass-loader": "^13.3.1",
     "style-loader": "^3.3.3",

From 06dcdc290df3a361f58cbe34e709bce86b233f52 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 30 May 2023 09:01:28 +0000
Subject: [PATCH 034/909] Bump postcss from 8.4.23 to 8.4.24 in
 /apps/block_scout_web/assets

Bumps [postcss](https://github.com/postcss/postcss) from 8.4.23 to 8.4.24.
- [Release notes](https://github.com/postcss/postcss/releases)
- [Changelog](https://github.com/postcss/postcss/blob/main/CHANGELOG.md)
- [Commits](https://github.com/postcss/postcss/compare/8.4.23...8.4.24)

---
updated-dependencies:
- dependency-name: postcss
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 apps/block_scout_web/assets/package-lock.json | 14 +++++++-------
 apps/block_scout_web/assets/package.json      |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/apps/block_scout_web/assets/package-lock.json b/apps/block_scout_web/assets/package-lock.json
index 71ea9714d30c..f9bf247d58c0 100644
--- a/apps/block_scout_web/assets/package-lock.json
+++ b/apps/block_scout_web/assets/package-lock.json
@@ -87,7 +87,7 @@
         "jest": "^29.5.0",
         "jest-environment-jsdom": "^29.5.0",
         "mini-css-extract-plugin": "^2.7.6",
-        "postcss": "^8.4.23",
+        "postcss": "^8.4.24",
         "postcss-loader": "^7.3.2",
         "sass": "^1.62.1",
         "sass-loader": "^13.3.1",
@@ -13456,9 +13456,9 @@
       }
     },
     "node_modules/postcss": {
-      "version": "8.4.23",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.23.tgz",
-      "integrity": "sha512-bQ3qMcpF6A/YjR55xtoTr0jGOlnPOKAIMdOWiv0EIT6HVPEaJiJB4NLljSbiHoC2RX7DN5Uvjtpbg1NPdwv1oA==",
+      "version": "8.4.24",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.24.tgz",
+      "integrity": "sha512-M0RzbcI0sO/XJNucsGjvWU9ERWxb/ytp1w6dKtxTKgixdtQDq4rmx/g8W1hnaheq9jgwL/oyEdH5Bc4WwJKMqg==",
       "dev": true,
       "funding": [
         {
@@ -27716,9 +27716,9 @@
       "integrity": "sha512-Wb4p1J4zyFTbM+u6WuO4XstYx4Ky9Cewe4DWrel7B0w6VVICvPwdOpotjzcf6eD8TsckVnIMNONQyPIUFOUbCQ=="
     },
     "postcss": {
-      "version": "8.4.23",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.23.tgz",
-      "integrity": "sha512-bQ3qMcpF6A/YjR55xtoTr0jGOlnPOKAIMdOWiv0EIT6HVPEaJiJB4NLljSbiHoC2RX7DN5Uvjtpbg1NPdwv1oA==",
+      "version": "8.4.24",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.24.tgz",
+      "integrity": "sha512-M0RzbcI0sO/XJNucsGjvWU9ERWxb/ytp1w6dKtxTKgixdtQDq4rmx/g8W1hnaheq9jgwL/oyEdH5Bc4WwJKMqg==",
       "dev": true,
       "requires": {
         "nanoid": "^3.3.6",
diff --git a/apps/block_scout_web/assets/package.json b/apps/block_scout_web/assets/package.json
index 211cea0c24cb..799065d52fa6 100644
--- a/apps/block_scout_web/assets/package.json
+++ b/apps/block_scout_web/assets/package.json
@@ -99,7 +99,7 @@
     "jest": "^29.5.0",
     "jest-environment-jsdom": "^29.5.0",
     "mini-css-extract-plugin": "^2.7.6",
-    "postcss": "^8.4.23",
+    "postcss": "^8.4.24",
     "postcss-loader": "^7.3.2",
     "sass": "^1.62.1",
     "sass-loader": "^13.3.1",

From 4645d867bae38cbcd68dd33951b85c82116ba3c1 Mon Sep 17 00:00:00 2001
From: Qwerty5Uiop <alex000010@bk.ru>
Date: Tue, 30 May 2023 15:40:28 +0400
Subject: [PATCH 035/909] Drop genesis block in internal transactions fetcher

---
 CHANGELOG.md                                   |  1 +
 .../indexer/fetcher/internal_transaction.ex    | 18 ++++++++++++++++--
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 34cab17583a7..6c5e3aaddeec 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -18,6 +18,7 @@
 - [#7546](https://github.com/blockscout/blockscout/pull/7546) - API v2: fix today coin price (use in-memory or cached in DB value)
 - [#7545](https://github.com/blockscout/blockscout/pull/7545) - API v2: Check if cached exchange rate is empty before replacing DB value in stats API
 - [#7516](https://github.com/blockscout/blockscout/pull/7516) - Fix shrinking logo in Safari
+- [#7590](https://github.com/blockscout/blockscout/pull/7590) - Drop genesis block in internal transactions fetcher
 
 ### Chore
 
diff --git a/apps/indexer/lib/indexer/fetcher/internal_transaction.ex b/apps/indexer/lib/indexer/fetcher/internal_transaction.ex
index fcb7843269e8..3c06ae6a92aa 100644
--- a/apps/indexer/lib/indexer/fetcher/internal_transaction.ex
+++ b/apps/indexer/lib/indexer/fetcher/internal_transaction.ex
@@ -96,8 +96,9 @@ defmodule Indexer.Fetcher.InternalTransaction do
       |> Chain.filter_consensus_block_numbers()
 
     filtered_unique_numbers =
-      EthereumJSONRPC.block_numbers_in_range(unique_numbers) --
-        [EthereumJSONRPC.first_block_to_fetch(:trace_first_block)]
+      unique_numbers
+      |> EthereumJSONRPC.block_numbers_in_range()
+      |> drop_genesis(json_rpc_named_arguments)
 
     filtered_unique_numbers_count = Enum.count(filtered_unique_numbers)
     Logger.metadata(count: filtered_unique_numbers_count)
@@ -153,6 +154,19 @@ defmodule Indexer.Fetcher.InternalTransaction do
     end
   end
 
+  defp drop_genesis(block_numbers, json_rpc_named_arguments) do
+    first_block = EthereumJSONRPC.first_block_to_fetch(:trace_first_block)
+
+    if first_block in block_numbers do
+      case EthereumJSONRPC.fetch_blocks_by_numbers([first_block], json_rpc_named_arguments) do
+        {:ok, %{transactions_params: [_ | _]}} -> block_numbers
+        _ -> block_numbers -- [first_block]
+      end
+    else
+      block_numbers
+    end
+  end
+
   def import_first_trace(internal_transactions_params) do
     imports =
       Chain.import(%{

From 094deefc3ff0db4dcfea8d7d68d6f9c5b2c7a356 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 30 May 2023 19:01:51 +0000
Subject: [PATCH 036/909] Bump sweetalert2 from 11.7.8 to 11.7.9 in
 /apps/block_scout_web/assets

Bumps [sweetalert2](https://github.com/sweetalert2/sweetalert2) from 11.7.8 to 11.7.9.
- [Release notes](https://github.com/sweetalert2/sweetalert2/releases)
- [Changelog](https://github.com/sweetalert2/sweetalert2/blob/main/CHANGELOG.md)
- [Commits](https://github.com/sweetalert2/sweetalert2/compare/v11.7.8...v11.7.9)

---
updated-dependencies:
- dependency-name: sweetalert2
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 apps/block_scout_web/assets/package-lock.json | 14 +++++++-------
 apps/block_scout_web/assets/package.json      |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/apps/block_scout_web/assets/package-lock.json b/apps/block_scout_web/assets/package-lock.json
index 5f6df10c1515..e1a89b7e6924 100644
--- a/apps/block_scout_web/assets/package-lock.json
+++ b/apps/block_scout_web/assets/package-lock.json
@@ -61,7 +61,7 @@
         "redux": "^4.2.1",
         "stream-browserify": "^3.0.0",
         "stream-http": "^3.1.1",
-        "sweetalert2": "^11.7.8",
+        "sweetalert2": "^11.7.9",
         "urijs": "^1.19.11",
         "url": "^0.11.0",
         "util": "^0.12.5",
@@ -15747,9 +15747,9 @@
       }
     },
     "node_modules/sweetalert2": {
-      "version": "11.7.8",
-      "resolved": "https://registry.npmjs.org/sweetalert2/-/sweetalert2-11.7.8.tgz",
-      "integrity": "sha512-s6WMsK0DogOZ2fj21tM5LjeBcQm7sPf+Z0sksxhZFs9HeIKAnLz8NMeIIOgcB/wS7/ZzP95d3jxzE6FbSau6eA==",
+      "version": "11.7.9",
+      "resolved": "https://registry.npmjs.org/sweetalert2/-/sweetalert2-11.7.9.tgz",
+      "integrity": "sha512-0WR65e1zsiD5pjecsROHHadBvwOqo3jdQ1RyO9IzFcYdAijpsSct/qOr9mdBJdJ4Fbomw6a2s6W6haq9cBIPKA==",
       "funding": {
         "type": "individual",
         "url": "https://github.com/sponsors/limonte"
@@ -29351,9 +29351,9 @@
       }
     },
     "sweetalert2": {
-      "version": "11.7.8",
-      "resolved": "https://registry.npmjs.org/sweetalert2/-/sweetalert2-11.7.8.tgz",
-      "integrity": "sha512-s6WMsK0DogOZ2fj21tM5LjeBcQm7sPf+Z0sksxhZFs9HeIKAnLz8NMeIIOgcB/wS7/ZzP95d3jxzE6FbSau6eA=="
+      "version": "11.7.9",
+      "resolved": "https://registry.npmjs.org/sweetalert2/-/sweetalert2-11.7.9.tgz",
+      "integrity": "sha512-0WR65e1zsiD5pjecsROHHadBvwOqo3jdQ1RyO9IzFcYdAijpsSct/qOr9mdBJdJ4Fbomw6a2s6W6haq9cBIPKA=="
     },
     "symbol-tree": {
       "version": "3.2.4",
diff --git a/apps/block_scout_web/assets/package.json b/apps/block_scout_web/assets/package.json
index 544e45e32c9c..f2e58f2f43d3 100644
--- a/apps/block_scout_web/assets/package.json
+++ b/apps/block_scout_web/assets/package.json
@@ -73,7 +73,7 @@
     "redux": "^4.2.1",
     "stream-browserify": "^3.0.0",
     "stream-http": "^3.1.1",
-    "sweetalert2": "^11.7.8",
+    "sweetalert2": "^11.7.9",
     "urijs": "^1.19.11",
     "url": "^0.11.0",
     "util": "^0.12.5",

From b45b6f97c16a3d972c865d23901996f9bc741df4 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 30 May 2023 19:03:41 +0000
Subject: [PATCH 037/909] Bump ex_json_schema from 0.9.2 to 0.9.3

Bumps [ex_json_schema](https://github.com/jonasschmidt/ex_json_schema) from 0.9.2 to 0.9.3.
- [Commits](https://github.com/jonasschmidt/ex_json_schema/compare/v0.9.2...v0.9.3)

---
updated-dependencies:
- dependency-name: ex_json_schema
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 mix.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mix.lock b/mix.lock
index e9c07b1cbc2d..a3f4f4b3031f 100644
--- a/mix.lock
+++ b/mix.lock
@@ -48,7 +48,7 @@
   "ex_cldr_numbers": {:hex, :ex_cldr_numbers, "2.31.1", "ad3e8a33e8cb8d048173f2c89cf6fcec9f1694d99f890a75bc745894c3868d5b", [:mix], [{:decimal, "~> 1.6 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: false]}, {:digital_token, "~> 0.3 or ~> 1.0", [hex: :digital_token, repo: "hexpm", optional: false]}, {:ex_cldr, "~> 2.37", [hex: :ex_cldr, repo: "hexpm", optional: false]}, {:ex_cldr_currencies, ">= 2.14.2", [hex: :ex_cldr_currencies, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}], "hexpm", "a94c40f4bf60f0e69c34977f33caeda483677232699ab0a6a98025ea011fabcf"},
   "ex_cldr_units": {:hex, :ex_cldr_units, "3.16.1", "04be7de0b59b37c83e60dbfaa63538c455ed532af6202e8a501e0ebe5f9cd55d", [:mix], [{:cldr_utils, "~> 2.24", [hex: :cldr_utils, repo: "hexpm", optional: false]}, {:decimal, "~> 1.6 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: false]}, {:ex_cldr_lists, "~> 2.10", [hex: :ex_cldr_lists, repo: "hexpm", optional: false]}, {:ex_cldr_numbers, "~> 2.31", [hex: :ex_cldr_numbers, repo: "hexpm", optional: false]}, {:ex_doc, "~> 0.18", [hex: :ex_doc, repo: "hexpm", optional: true]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}], "hexpm", "f358029e6f56ae19887e598062dade1ddd0ad03c06384ed397ca3dc3ac8b0584"},
   "ex_doc": {:hex, :ex_doc, "0.29.4", "6257ecbb20c7396b1fe5accd55b7b0d23f44b6aa18017b415cb4c2b91d997729", [:mix], [{:earmark_parser, "~> 1.4.31", [hex: :earmark_parser, repo: "hexpm", optional: false]}, {:makeup_elixir, "~> 0.14", [hex: :makeup_elixir, repo: "hexpm", optional: false]}, {:makeup_erlang, "~> 0.1", [hex: :makeup_erlang, repo: "hexpm", optional: false]}], "hexpm", "2c6699a737ae46cb61e4ed012af931b57b699643b24dabe2400a8168414bc4f5"},
-  "ex_json_schema": {:hex, :ex_json_schema, "0.9.2", "c9a42e04e70cd70eb11a8903a22e8ec344df16edef4cb8e6ec84ed0caffc9f0f", [:mix], [{:decimal, "~> 2.0", [hex: :decimal, repo: "hexpm", optional: false]}], "hexpm", "4854329cb352b6c01c4c4b8dbfb3be14dc5bea19ea13e0eafade4ff22ba55224"},
+  "ex_json_schema": {:hex, :ex_json_schema, "0.9.3", "fc17c50d410fd99fa6e814e1aed60122d8ff2578b869d17a9db1ce1c621382b6", [:mix], [{:decimal, "~> 2.0", [hex: :decimal, repo: "hexpm", optional: false]}], "hexpm", "b79962d09cefd33001706255187bdb483a0c2b4442d5edc6822eb7574a8df0a8"},
   "ex_keccak": {:hex, :ex_keccak, "0.7.1", "0169f4b0c5073c5df61581d6282b12f1a1b764dcfcda4eeb1c819b5194c9ced0", [:mix], [{:rustler, ">= 0.0.0", [hex: :rustler, repo: "hexpm", optional: true]}, {:rustler_precompiled, "~> 0.6.1", [hex: :rustler_precompiled, repo: "hexpm", optional: false]}], "hexpm", "c18c19f66b6545b4b46b0c71c0cc0079de84e30b26365a92961e91697e8724ed"},
   "ex_machina": {:hex, :ex_machina, "2.7.0", "b792cc3127fd0680fecdb6299235b4727a4944a09ff0fa904cc639272cd92dc7", [:mix], [{:ecto, "~> 2.2 or ~> 3.0", [hex: :ecto, repo: "hexpm", optional: true]}, {:ecto_sql, "~> 3.0", [hex: :ecto_sql, repo: "hexpm", optional: true]}], "hexpm", "419aa7a39bde11894c87a615c4ecaa52d8f107bbdd81d810465186f783245bf8"},
   "ex_rlp": {:hex, :ex_rlp, "0.6.0", "985391d2356a7cb8712a4a9a2deb93f19f2fbca0323f5c1203fcaf64d077e31e", [:mix], [], "hexpm", "7135db93b861d9e76821039b60b00a6a22d2c4e751bf8c444bffe7a042f1abaf"},

From 686716b8e272b14a1db08179cc1837236aea8cb9 Mon Sep 17 00:00:00 2001
From: Viktor Baranov <baranov.viktor.27@gmail.com>
Date: Tue, 30 May 2023 22:06:43 +0300
Subject: [PATCH 038/909] Stats service support in docker-compose config with
 new frontend

---
 CHANGELOG.md                                        | 1 +
 docker-compose/envs/common-frontend.env             | 2 +-
 docker-compose/proxy/nginx.conf                     | 6 ++++++
 docker-compose/services/docker-compose-frontend.yml | 2 +-
 4 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6c5e3aaddeec..1fd2f9a299f2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -22,6 +22,7 @@
 
 ### Chore
 
+- [#7594](https://github.com/blockscout/blockscout/pull/7594) - Stats service support in docker-compose config with new frontend
 - [#7576](https://github.com/blockscout/blockscout/pull/7576) - Check left blocks in pending block operations in order to decide, if we need to display indexing int tx banner at the top
 - [#7543](https://github.com/blockscout/blockscout/pull/7543) - Allow hyphen in DB username
 
diff --git a/docker-compose/envs/common-frontend.env b/docker-compose/envs/common-frontend.env
index 997c82a643d9..b9b2cef7db66 100644
--- a/docker-compose/envs/common-frontend.env
+++ b/docker-compose/envs/common-frontend.env
@@ -1,5 +1,5 @@
 NEXT_PUBLIC_API_HOST=localhost
-NEXT_PUBLIC_STATS_API_HOST=http://localhost:8153
+NEXT_PUBLIC_STATS_API_HOST=http://localhost
 NEXT_PUBLIC_API_PORT=80
 NEXT_PUBLIC_API_PROTOCOL=http
 NEXT_PUBLIC_NETWORK_NAME=Göerli
diff --git a/docker-compose/proxy/nginx.conf b/docker-compose/proxy/nginx.conf
index cc5a44509e95..5df8ddd1187d 100644
--- a/docker-compose/proxy/nginx.conf
+++ b/docker-compose/proxy/nginx.conf
@@ -11,4 +11,10 @@ server {
     location /api/account/v1 {
         proxy_pass          http://backend:4000/api/account/v1;
     }
+    location /api/v1/counters {
+        proxy_pass          http://stats:8050/api/v1/counters;
+    }
+    location /api/v1/lines {
+        proxy_pass          http://stats:8050/api/v1/lines;
+    }
 }
\ No newline at end of file
diff --git a/docker-compose/services/docker-compose-frontend.yml b/docker-compose/services/docker-compose-frontend.yml
index 2c1124a2482a..1076c1e3d03b 100644
--- a/docker-compose/services/docker-compose-frontend.yml
+++ b/docker-compose/services/docker-compose-frontend.yml
@@ -2,7 +2,7 @@ version: '3.8'
 
 services:
   frontend:
-    image: ghcr.io/blockscout/frontend:${FRONTEND_DOCKER_TAG:-main}
+    image: ghcr.io/blockscout/frontend:${FRONTEND_DOCKER_TAG:-latest}
     pull_policy: always
     restart: always
     container_name: 'frontend'

From a4184dbaac9c45f04b2238c6be61b47901f911de Mon Sep 17 00:00:00 2001
From: Maxim Filonov <53992153+sl1depengwyn@users.noreply.github.com>
Date: Fri, 26 May 2023 16:35:44 +0300
Subject: [PATCH 039/909] Add Polygon Edge genesis file support

---
 CHANGELOG.md                                  |   2 +-
 .../lib/explorer/chain_spec/genesis_data.ex   |   4 -
 .../lib/explorer/chain_spec/geth/importer.ex  |   4 +
 .../chain_spec/geth/importer_test.exs         | 104 ++++++++++-
 .../fixture/chain_spec/polygon_genesis.json   | 165 ++++++++++++++++++
 5 files changed, 268 insertions(+), 11 deletions(-)
 create mode 100644 apps/explorer/test/support/fixture/chain_spec/polygon_genesis.json

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1fd2f9a299f2..b6d8ae0244a5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,8 +4,8 @@
 
 ### Features
 
+- [#7565](https://github.com/blockscout/blockscout/pull/7565) - Add Polygon Edge genesis file support
 - [#7513](https://github.com/blockscout/blockscout/pull/7513) - Add Polygon Edge support
-
 - [#7532](https://github.com/blockscout/blockscout/pull/7532) - Handle empty id in json rpc responses
 - [#7544](https://github.com/blockscout/blockscout/pull/7544) - Add ERC-1155 signatures to uncataloged_token_transfer_block_numbers
 
diff --git a/apps/explorer/lib/explorer/chain_spec/genesis_data.ex b/apps/explorer/lib/explorer/chain_spec/genesis_data.ex
index 89d1db9a044f..cb8a2279b1de 100644
--- a/apps/explorer/lib/explorer/chain_spec/genesis_data.ex
+++ b/apps/explorer/lib/explorer/chain_spec/genesis_data.ex
@@ -66,10 +66,6 @@ defmodule Explorer.ChainSpec.GenesisData do
         case fetch_spec(path) do
           {:ok, chain_spec} ->
             case variant do
-              EthereumJSONRPC.Nethermind ->
-                Importer.import_emission_rewards(chain_spec)
-                {:ok, _} = Importer.import_genesis_accounts(chain_spec)
-
               EthereumJSONRPC.Geth ->
                 {:ok, _} = GethImporter.import_genesis_accounts(chain_spec)
 
diff --git a/apps/explorer/lib/explorer/chain_spec/geth/importer.ex b/apps/explorer/lib/explorer/chain_spec/geth/importer.ex
index be463750644e..5b5c4120ae71 100644
--- a/apps/explorer/lib/explorer/chain_spec/geth/importer.ex
+++ b/apps/explorer/lib/explorer/chain_spec/geth/importer.ex
@@ -50,6 +50,10 @@ defmodule Explorer.ChainSpec.Geth.Importer do
     Chain.import(params)
   end
 
+  def genesis_accounts(%{"genesis" => genesis}) do
+    genesis_accounts(genesis)
+  end
+
   def genesis_accounts(chain_spec) do
     accounts = chain_spec["alloc"]
 
diff --git a/apps/explorer/test/explorer/chain_spec/geth/importer_test.exs b/apps/explorer/test/explorer/chain_spec/geth/importer_test.exs
index 36eebf24a71d..cc658ce9929e 100644
--- a/apps/explorer/test/explorer/chain_spec/geth/importer_test.exs
+++ b/apps/explorer/test/explorer/chain_spec/geth/importer_test.exs
@@ -11,13 +11,17 @@ defmodule Explorer.ChainSpec.Geth.ImporterTest do
 
   setup :set_mox_global
 
-  @genesis "#{File.cwd!()}/test/support/fixture/chain_spec/qdai_genesis.json"
-           |> File.read!()
-           |> Jason.decode!()
+  @geth_genesis "#{File.cwd!()}/test/support/fixture/chain_spec/qdai_genesis.json"
+                |> File.read!()
+                |> Jason.decode!()
+
+  @polygon_genesis "#{File.cwd!()}/test/support/fixture/chain_spec/polygon_genesis.json"
+                   |> File.read!()
+                   |> Jason.decode!()
 
   describe "genesis_accounts/1" do
     test "parses coin balance and contract code" do
-      coin_balances = Importer.genesis_accounts(@genesis)
+      coin_balances = Importer.genesis_accounts(@geth_genesis)
 
       assert Enum.count(coin_balances) == 3
 
@@ -32,6 +36,23 @@ defmodule Explorer.ChainSpec.Geth.ImporterTest do
              } ==
                List.first(coin_balances)
     end
+
+    test "parses polygon coin balance and contract code" do
+      coin_balances = Importer.genesis_accounts(@polygon_genesis)
+
+      assert Enum.count(coin_balances) == 17
+
+      assert %{
+               address_hash: %Explorer.Chain.Hash{
+                 byte_count: 20,
+                 bytes: <<0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1>>
+               },
+               value: 0,
+               contract_code:
+                 "0x608060405234801561001057600080fd5b50600436106101b05760003560e01c806370a08231116100ef578063ce513b6f11610092578063ce513b6f14610398578063dd62ed3e146103ab578063e0563ab1146103be578063ea0fee4f146103c7578063eacdc5ff146103cf578063eeb49945146103d8578063f3f43703146103eb578063fd242c14146103fe57600080fd5b806370a08231146102e7578063947287cf146102fa57806395d89b411461030357806397e5230d1461030b578063981b24d014610315578063a457c2d714610328578063a9059cbb1461033b578063c6b61e4c1461034e57600080fd5b8063395093511161015757806339509351146102735780633b878c22146102865780633ccfd60b1461028f5780633fd50001146102975780634ee2cd7e146102aa57806351351d53146102bd57806361cc2763146102cb57806362656003146102de57600080fd5b806306fdde03146101b5578063095ea7b3146101d35780630f50287c146101f657806318160ddd1461020b57806323b872dd1461021d578063284017f5146102305780632e17de7814610251578063313ce56714610264575b600080fd5b6101bd610411565b6040516101ca91906119ba565b60405180910390f35b6101e66101e13660046119e2565b6104a3565b60405190151581526020016101ca565b610209610204366004611a0e565b6104bd565b005b6035545b6040519081526020016101ca565b6101e661022b366004611a46565b61074f565b61023961202081565b6040516001600160a01b0390911681526020016101ca565b61020961025f366004611a87565b610773565b604051601281526020016101ca565b6101e66102813660046119e2565b61078a565b61023961101081565b6102096107ac565b61020f6102a5366004611a87565b6108bd565b61020f6102b83660046119e2565b6108de565b6102396002600160a01b0381565b6102096102d9366004611b10565b6108f1565b61020f60cc5481565b61020f6102f5366004611c29565b610b1f565b61020f61520881565b6101bd610b3a565b61020f620249f081565b61020f610323366004611a87565b610b49565b6101e66103363660046119e2565b610b54565b6101e66103493660046119e2565b610bcf565b61037d61035c366004611a87565b60ce6020526000908152604090208054600182015460029092015490919083565b604080519384526020840192909252908201526060016101ca565b61020f6103a6366004611c29565b610bdd565b61020f6103b9366004611c46565b610c0b565b61023961203081565b61020f600181565b61020f60cd5481565b6102096103e6366004611c7f565b610c36565b61020f6103f9366004611c29565b610d08565b61020f61040c366004611a87565b610d2f565b60606036805461042090611d08565b80601f016020809104026020016040519081016040528092919081815260200182805461044c90611d08565b80156104995780601f1061046e57610100808354040283529160200191610499565b820191906000526020600020905b81548152906001019060200180831161047c57829003601f168201915b5050505050905090565b6000336104b1818585610d79565b60019150505b92915050565b336002600160a01b03146105065760405163973d02cb60e01b815260206004820152600a60248201526914d654d5115350d0531360b21b60448201526064015b60405180910390fd5b60cd80546000918261051783611d58565b9190505590508083146105625760405162461bcd60e51b815260206004820152601360248201527215539156141150d5115117d15413d0d217d251606a1b60448201526064016104fd565b81356020830135116105ac5760405162461bcd60e51b81526020600482015260136024820152721393d7d09313d0d2d4d7d0d3d3535255151151606a1b60448201526064016104fd565b60cc546105be83356020850135611d71565b6105c9906001611d84565b6105d39190611dad565b1561062e5760405162461bcd60e51b815260206004820152602560248201527f45504f43485f4d5553545f42455f444956495349424c455f42595f45504f43486044820152645f53495a4560d81b60648201526084016104fd565b813560ce600061063f600185611d71565b815260200190815260200160002060010154600161065d9190611d84565b146106a05760405162461bcd60e51b8152602060048201526013602482015272494e56414c49445f53544152545f424c4f434b60681b60448201526064016104fd565b600081815260ce6020526040902082906106d182828135815560208201356001820155604082013560028201555050565b505060cf80546001810182556000919091526020838101357facb8d954e2cfef495862221e91bd7523613cf8808827cb33edfe4904cc51bf299092018290556040805190850135815284359186917f0ce8712c4dee4bd5a691f0bc1c39594671591e77395f8ebf6a3fb5f63fbea66a910160405180910390a4505050565b60003361075d858285610e9e565b610768858585610f12565b506001949350505050565b61077d33826110b6565b61078733826111e1565b50565b6000336104b181858561079d8383610c0b565b6107a79190611d84565b610d79565b33600090815260d06020526040812060cd5490919081906107ce90849061125a565b808555604051828152919350915033907f7fcf532c15f0a6db0bd6d0e038bea71d30d808c7d98cb3bf7268a95bf5081b659060200160405180910390a260c95460cb54604080517f8ca9a95e41b5eece253c93f5b31eed1253aed6b145d8a6e14d913fdf8e7322936020820152338183015260608082018790528251808303909101815260808201928390526316f1983160e01b9092526001600160a01b03938416936316f198319361088693911691608401611dc1565b600060405180830381600087803b1580156108a057600080fd5b505af11580156108b4573d6000803e3d6000fd5b50505050505050565b60cf81815481106108cd57600080fd5b600091825260209091200154905081565b60006108ea83836112cc565b9392505050565b600054610100900460ff16158080156109115750600054600160ff909116105b8061092b5750303b15801561092b575060005460ff166001145b61098e5760405162461bcd60e51b815260206004820152602e60248201527f496e697469616c697a61626c653a20636f6e747261637420697320616c72656160448201526d191e481a5b9a5d1a585b1a5e995960921b60648201526084016104fd565b6000805460ff1916600117905580156109b1576000805461ff0019166101001790555b6109fb6040518060400160405280600c81526020016b15985b1a59185d1bdc94d95d60a21b815250604051806040016040528060048152602001631594d15560e21b815250611315565b60c980546001600160a01b038089166001600160a01b03199283161790925560ca805488841690831617905560cb80549287169290911691909117905560cc83905560005b8251811015610a9557610a8d838281518110610a5e57610a5e611de5565b602002602001015160000151848381518110610a7c57610a7c611de5565b60200260200101516020015161134a565b600101610a40565b5060cf80546001818101835560009283527facb8d954e2cfef495862221e91bd7523613cf8808827cb33edfe4904cc51bf299091019190915560cd558015610b17576000805461ff0019169055604051600181527f7f26b83ff96e1f2b6a682f133852f6798a09c465da95921460cefb38474024989060200160405180910390a15b505050505050565b6001600160a01b031660009081526033602052604090205490565b60606037805461042090611d08565b60006104b782611354565b60003381610b628286610c0b565b905083811015610bc25760405162461bcd60e51b815260206004820152602560248201527f45524332303a2064656372656173656420616c6c6f77616e63652062656c6f77604482015264207a65726f60d81b60648201526084016104fd565b6107688286868403610d79565b6000336104b1818585610f12565b60cd546001600160a01b038216600090815260d0602052604081209091610c04919061125a565b5092915050565b6001600160a01b03918216600090815260346020908152604080832093909416825291909152205490565b60ca546001600160a01b031633148015610c5d575060cb546001600160a01b038481169116145b610c9a5760405162461bcd60e51b815260206004820152600e60248201526d24a72b20a624a22fa9a2a72222a960911b60448201526064016104fd565b7f1bcc0f4c3fad314e585165815f94ecca9b96690a26d6417d7876448a9a867a69610cc9602060008486611dfb565b610cd291611e25565b03610d0257600080610ce78360208187611dfb565b810190610cf491906119e2565b91509150610b17828261134a565b50505050565b60cd546001600160a01b038216600090815260d06020526040812090916104b7919061137f565b600081815260ce60205260408120600101548015610d7057600083815260ce6020526040902054610d609082611d71565b610d6b906001611d84565b6108ea565b60009392505050565b6001600160a01b038316610ddb5760405162461bcd60e51b8152602060048201526024808201527f45524332303a20617070726f76652066726f6d20746865207a65726f206164646044820152637265737360e01b60648201526084016104fd565b6001600160a01b038216610e3c5760405162461bcd60e51b815260206004820152602260248201527f45524332303a20617070726f766520746f20746865207a65726f206164647265604482015261737360f01b60648201526084016104fd565b6001600160a01b0383811660008181526034602090815260408083209487168084529482529182902085905590518481527f8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b92591015b60405180910390a3505050565b6000610eaa8484610c0b565b90506000198114610d025781811015610f055760405162461bcd60e51b815260206004820152601d60248201527f45524332303a20696e73756666696369656e7420616c6c6f77616e636500000060448201526064016104fd565b610d028484848403610d79565b6001600160a01b038316610f765760405162461bcd60e51b815260206004820152602560248201527f45524332303a207472616e736665722066726f6d20746865207a65726f206164604482015264647265737360d81b60648201526084016104fd565b6001600160a01b038216610fd85760405162461bcd60e51b815260206004820152602360248201527f45524332303a207472616e7366657220746f20746865207a65726f206164647260448201526265737360e81b60648201526084016104fd565b610fe383838361141d565b6001600160a01b0383166000908152603360205260409020548181101561105b5760405162461bcd60e51b815260206004820152602660248201527f45524332303a207472616e7366657220616d6f756e7420657863656564732062604482015265616c616e636560d01b60648201526084016104fd565b6001600160a01b038085166000818152603360205260408082208686039055928616808252908390208054860190559151600080516020611fd6833981519152906110a99086815260200190565b60405180910390a3610d02565b6001600160a01b0382166111165760405162461bcd60e51b815260206004820152602160248201527f45524332303a206275726e2066726f6d20746865207a65726f206164647265736044820152607360f81b60648201526084016104fd565b6111228260008361141d565b6001600160a01b038216600090815260336020526040902054818110156111965760405162461bcd60e51b815260206004820152602260248201527f45524332303a206275726e20616d6f756e7420657863656564732062616c616e604482015261636560f01b60648201526084016104fd565b6001600160a01b0383166000818152603360209081526040808320868603905560358054879003905551858152919291600080516020611fd68339815191529101610e91565b505050565b61121381600160cd546111f49190611d84565b6001600160a01b038516600090815260d0602052604090209190611486565b816001600160a01b03167f655c1cd0236fb6dc4916f34c8ff10e3b18fcaea5b344dfc16c36fbb1bdfc5df28260405161124e91815260200190565b60405180910390a25050565b81546000905b83600101548110156112c5576000818152600285016020908152604091829020825180840190935280548352600101549082018190528410156112a357506112c5565b80516112af9084611d84565b92505080806112bd90611d58565b915050611260565b9250929050565b6001600160a01b0382166000908152606560205260408120819081906112f39085906115b1565b915091508161130a5761130585610b1f565b61130c565b805b95945050505050565b600054610100900460ff1661133c5760405162461bcd60e51b81526004016104fd90611e43565b611346828261169f565b5050565b61134682826116df565b60008060006113648460666115b1565b915091508161137557603554611377565b805b949350505050565b60018201546000908082036113985760009150506104b7565b60006113a5600183611d71565b90505b845481106114155760008181526002860160209081526040918290208251808401909352805483526001015490820181905285106113e65750611415565b80516113f29085611d84565b9350816000036114025750611415565b508061140d81611e8e565b9150506113a8565b505092915050565b6001600160a01b038316158061143a57506001600160a01b038216155b61147b5760405162461bcd60e51b81526020600482015260126024820152712a2920a729a322a92fa327a92124a22222a760711b60448201526064016104fd565b6111dc83838361179a565b8160000361149657611496611ea5565b825460018401548181036114ed576040805180820182528581526020808201868152600085815260028a0190925292812091518255915160019182015586018054916114e183611d58565b91905055505050505050565b600060028601816114ff600185611d71565b81526020019081526020016000206001015490508084101561152357611523611ea5565b83811015611572576040805180820182528681526020808201878152600086815260028b01909252928120915182559151600191820155870180549161156883611d58565b9190505550610b17565b84600287016000611584600186611d71565b815260200190815260200160002060000160008282546115a49190611d84565b9091555050505050505050565b600080600084116115fd5760405162461bcd60e51b815260206004820152601660248201527504552433230536e617073686f743a20696420697320360541b60448201526064016104fd565b60cd5484111561164f5760405162461bcd60e51b815260206004820152601d60248201527f4552433230536e617073686f743a206e6f6e6578697374656e7420696400000060448201526064016104fd565b600061165b84866117e2565b845490915081036116735760008092509250506112c5565b600184600101828154811061168a5761168a611de5565b906000526020600020015492509250506112c5565b600054610100900460ff166116c65760405162461bcd60e51b81526004016104fd90611e43565b60366116d28382611f01565b5060376111dc8282611f01565b6001600160a01b0382166117355760405162461bcd60e51b815260206004820152601f60248201527f45524332303a206d696e7420746f20746865207a65726f20616464726573730060448201526064016104fd565b6117416000838361141d565b80603560008282546117539190611d84565b90915550506001600160a01b038216600081815260336020908152604080832080548601905551848152600080516020611fd6833981519152910160405180910390a35050565b6001600160a01b0383166117b9576117b18261188f565b6111dc6118b9565b6001600160a01b0382166117d0576117b18361188f565b6117d98361188f565b6111dc8261188f565b815460009081036117f5575060006104b7565b82546000905b8082101561184257600061180f83836118c9565b6000878152602090209091508590820154111561182e5780915061183c565b611839816001611d84565b92505b506117fb565b60008211801561186e57508361186b8661185d600186611d71565b600091825260209091200190565b54145b156118875761187e600183611d71565b925050506104b7565b5090506104b7565b6001600160a01b0381166000908152606560205260409020610787906118b483610b1f565b6118e4565b6118c760666118b460355490565b565b60006118d86002848418611fc1565b6108ea90848416611d84565b60006118ef60cd5490565b9050806118fb8461192f565b10156111dc578254600180820185556000858152602080822090930193909355938401805494850181558252902090910155565b8054600090810361194257506000919050565b8154829061195290600190611d71565b8154811061196257611962611de5565b90600052602060002001549050919050565b6000815180845260005b8181101561199a5760208185018101518683018201520161197e565b506000602082860101526020601f19601f83011685010191505092915050565b6020815260006108ea6020830184611974565b6001600160a01b038116811461078757600080fd5b600080604083850312156119f557600080fd5b8235611a00816119cd565b946020939093013593505050565b6000808284036080811215611a2257600080fd5b833592506060601f1982011215611a3857600080fd5b506020830190509250929050565b600080600060608486031215611a5b57600080fd5b8335611a66816119cd565b92506020840135611a76816119cd565b929592945050506040919091013590565b600060208284031215611a9957600080fd5b5035919050565b634e487b7160e01b600052604160045260246000fd5b6040805190810167ffffffffffffffff81118282101715611ad957611ad9611aa0565b60405290565b604051601f8201601f1916810167ffffffffffffffff81118282101715611b0857611b08611aa0565b604052919050565b600080600080600060a08688031215611b2857600080fd5b8535611b33816119cd565b9450602086810135611b44816119cd565b9450604087810135611b55816119cd565b945060608801359350608088013567ffffffffffffffff80821115611b7957600080fd5b818a0191508a601f830112611b8d57600080fd5b813581811115611b9f57611b9f611aa0565b611bad858260051b01611adf565b818152858101925060069190911b83018501908c821115611bcd57600080fd5b928501925b81841015611c165784848e031215611bea5760008081fd5b611bf2611ab6565b8435611bfd816119cd565b8152848701358782015283529284019291850191611bd2565b8096505050505050509295509295909350565b600060208284031215611c3b57600080fd5b81356108ea816119cd565b60008060408385031215611c5957600080fd5b8235611c64816119cd565b91506020830135611c74816119cd565b809150509250929050565b60008060008060608587031215611c9557600080fd5b843593506020850135611ca7816119cd565b9250604085013567ffffffffffffffff80821115611cc457600080fd5b818701915087601f830112611cd857600080fd5b813581811115611ce757600080fd5b886020828501011115611cf957600080fd5b95989497505060200194505050565b600181811c90821680611d1c57607f821691505b602082108103611d3c57634e487b7160e01b600052602260045260246000fd5b50919050565b634e487b7160e01b600052601160045260246000fd5b600060018201611d6a57611d6a611d42565b5060010190565b818103818111156104b7576104b7611d42565b808201808211156104b7576104b7611d42565b634e487b7160e01b600052601260045260246000fd5b600082611dbc57611dbc611d97565b500690565b6001600160a01b038316815260406020820181905260009061137790830184611974565b634e487b7160e01b600052603260045260246000fd5b60008085851115611e0b57600080fd5b83861115611e1857600080fd5b5050820193919092039150565b803560208310156104b757600019602084900360031b1b1692915050565b6020808252602b908201527f496e697469616c697a61626c653a20636f6e7472616374206973206e6f74206960408201526a6e697469616c697a696e6760a81b606082015260800190565b600081611e9d57611e9d611d42565b506000190190565b634e487b7160e01b600052600160045260246000fd5b601f8211156111dc57600081815260208120601f850160051c81016020861015611ee25750805b601f850160051c820191505b81811015610b1757828155600101611eee565b815167ffffffffffffffff811115611f1b57611f1b611aa0565b611f2f81611f298454611d08565b84611ebb565b602080601f831160018114611f645760008415611f4c5750858301515b600019600386901b1c1916600185901b178555610b17565b600085815260208120601f198616915b82811015611f9357888601518255948401946001909101908401611f74565b5085821015611fb15787850151600019600388901b60f8161c191681555b5050505050600190811b01905550565b600082611fd057611fd0611d97565b50049056feddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3efa2646970667358221220ceae916e2fad24f9aaa4340b6994418d32d33c6ae1f266c50dd4ec5ccbdbce2764736f6c63430008130033"
+             } ==
+               List.first(coin_balances)
+    end
   end
 
   describe "import_genesis_accounts/1" do
@@ -47,7 +68,7 @@ defmodule Explorer.ChainSpec.Geth.ImporterTest do
         {:ok, [res]}
       end)
 
-      {:ok, %{address_coin_balances: address_coin_balances}} = Importer.import_genesis_accounts(@genesis)
+      {:ok, %{address_coin_balances: address_coin_balances}} = Importer.import_genesis_accounts(@geth_genesis)
 
       assert Enum.count(address_coin_balances) == 3
       assert CoinBalance |> Repo.all() |> Enum.count() == 3
@@ -98,13 +119,84 @@ defmodule Explorer.ChainSpec.Geth.ImporterTest do
         {:ok, [res]}
       end)
 
-      {:ok, %{address_coin_balances: address_coin_balances}} = Importer.import_genesis_accounts(@genesis)
+      {:ok, %{address_coin_balances: address_coin_balances}} = Importer.import_genesis_accounts(@geth_genesis)
 
       assert Enum.count(address_coin_balances) == 3
       assert CoinBalance |> Repo.all() |> Enum.count() == 3
       assert CoinBalanceDaily |> Repo.all() |> Enum.count() == 3
       assert Address |> Repo.all() |> Enum.count() == 3
     end
+
+    test "imports polygon accounts" do
+      block_quantity = integer_to_quantity(1)
+      res = eth_block_number_fake_response(block_quantity)
+
+      EthereumJSONRPC.Mox
+      |> expect(:json_rpc, fn [
+                                %{id: 0, jsonrpc: "2.0", method: "eth_getBlockByNumber", params: ["0x1", true]}
+                              ],
+                              _ ->
+        {:ok, [res]}
+      end)
+
+      {:ok, %{address_coin_balances: address_coin_balances}} = Importer.import_genesis_accounts(@polygon_genesis)
+
+      assert Enum.count(address_coin_balances) == 17
+      assert CoinBalance |> Repo.all() |> Enum.count() == 17
+      assert CoinBalanceDaily |> Repo.all() |> Enum.count() == 17
+      assert Address |> Repo.all() |> Enum.count() == 17
+    end
+
+    test "imports polygon contract code" do
+      block_quantity = integer_to_quantity(1)
+      res = eth_block_number_fake_response(block_quantity)
+
+      EthereumJSONRPC.Mox
+      |> expect(:json_rpc, fn [
+                                %{id: 0, jsonrpc: "2.0", method: "eth_getBlockByNumber", params: ["0x1", true]}
+                              ],
+                              [] ->
+        {:ok, [res]}
+      end)
+
+      code =
+        "0x608060405234801561001057600080fd5b50600436106100cf5760003560e01c806391ad27b41161008c57806398d5fdca1161006657806398d5fdca14610262578063a97e5c9314610280578063df5dd1a5146102dc578063eebd48b014610320576100cf565b806391ad27b4146101e457806391b7f5ed14610202578063955d14cd14610244576100cf565b80630aa6f2fe146100d457806320ba81ee1461011657806322a90082146101345780634c2c987c14610176578063764cbcd1146101985780637837efdc146101da575b600080fd5b610100600480360360208110156100ea57600080fd5b8101908080359060200190929190505050610353565b6040518082815260200191505060405180910390f35b61011e6103c4565b6040518082815260200191505060405180910390f35b6101606004803603602081101561014a57600080fd5b81019080803590602001909291905050506103ce565b6040518082815260200191505060405180910390f35b61017e61043f565b604051808215151515815260200191505060405180910390f35b6101c4600480360360208110156101ae57600080fd5b8101908080359060200190929190505050610456565b6040518082815260200191505060405180910390f35b6101e26104c7565b005b6101ec6104d2565b6040518082815260200191505060405180910390f35b61022e6004803603602081101561021857600080fd5b81019080803590602001909291905050506104dc565b6040518082815260200191505060405180910390f35b61024c6106a2565b6040518082815260200191505060405180910390f35b61026a6106ac565b6040518082815260200191505060405180910390f35b6102c26004803603602081101561029657600080fd5b81019080803573ffffffffffffffffffffffffffffffffffffffff1690602001909291905050506106b6565b604051808215151515815260200191505060405180910390f35b61031e600480360360208110156102f257600080fd5b81019080803573ffffffffffffffffffffffffffffffffffffffff1690602001909291905050506106d3565b005b61032861073d565b6040518085815260200184815260200183815260200182815260200194505050505060405180910390f35b600061035e336106b6565b6103b3576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401808060200182810382526030815260200180610b4f6030913960400191505060405180910390fd5b816004819055506004549050919050565b6000600454905090565b60006103d9336106b6565b61042e576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401808060200182810382526030815260200180610b4f6030913960400191505060405180910390fd5b816003819055506003549050919050565b6000600560009054906101000a900460ff16905090565b6000610461336106b6565b6104b6576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401808060200182810382526030815260200180610b4f6030913960400191505060405180910390fd5b816002819055506002549050919050565b6104d033610771565b565b6000600354905090565b60006104e7336106b6565b61053c576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401808060200182810382526030815260200180610b4f6030913960400191505060405180910390fd5b600082116105b2576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004018080602001828103825260098152602001807f7072696365203c3d30000000000000000000000000000000000000000000000081525060200191505060405180910390fd5b6105ba6104d2565b6105c26106a2565b01421015610638576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004018080602001828103825260148152602001807f54494d455f4c4f434b5f494e434f4d504c45544500000000000000000000000081525060200191505060405180910390fd5b610641826107cb565b5061064b42610456565b503373ffffffffffffffffffffffffffffffffffffffff167f95dce27040c59c8b1c445b284f81a3aaae6eecd7d08d5c7684faee64cdb514a1836040518082815260200191505060405180910390a2819050919050565b6000600254905090565b6000600154905090565b60006106cc82600061083c90919063ffffffff16565b9050919050565b6106dc336106b6565b610731576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401808060200182810382526030815260200180610b4f6030913960400191505060405180910390fd5b61073a8161091a565b50565b60008060008061074b6106ac565b6107536104d2565b61075b6103c4565b6107636106a2565b935093509350935090919293565b61078581600061097390919063ffffffff16565b8073ffffffffffffffffffffffffffffffffffffffff167f9c8e7d83025bef8a04c664b2f753f64b8814bdb7e27291d7e50935f18cc3c71260405160405180910390a250565b60006107d6336106b6565b61082b576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401808060200182810382526030815260200180610b4f6030913960400191505060405180910390fd5b816001819055506001549050919050565b60008073ffffffffffffffffffffffffffffffffffffffff168273ffffffffffffffffffffffffffffffffffffffff1614156108c3576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401808060200182810382526022815260200180610b2d6022913960400191505060405180910390fd5b8260000160008373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060009054906101000a900460ff16905092915050565b61092e816000610a3090919063ffffffff16565b8073ffffffffffffffffffffffffffffffffffffffff167e47706786c922d17b39285dc59d696bafea72c0b003d3841ae1202076f4c2e460405160405180910390a250565b61097d828261083c565b6109d2576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401808060200182810382526021815260200180610b0c6021913960400191505060405180910390fd5b60008260000160008373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060006101000a81548160ff0219169083151502179055505050565b610a3a828261083c565b15610aad576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040180806020018281038252601f8152602001807f526f6c65733a206163636f756e7420616c72656164792068617320726f6c650081525060200191505060405180910390fd5b60018260000160008373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060006101000a81548160ff021916908315150217905550505056fe526f6c65733a206163636f756e7420646f6573206e6f74206861766520726f6c65526f6c65733a206163636f756e7420697320746865207a65726f20616464726573734f7261636c65526f6c653a2063616c6c657220646f6573206e6f74206861766520746865204f7261636c6520726f6c65a265627a7a72315820df30730da57a5061c487e0b37e84e80308fa443e2e80ee9117a13fa8149caf4164736f6c634300050b0032"
+
+      chain_spec = %{
+        "alloc" => %{
+          "0xcd59f3dde77e09940befb6ee58031965cae7a336" => %{
+            "balance" => "0x21e19e0c9bab2400000",
+            "code" => code
+          }
+        }
+      }
+
+      {:ok, _} = Importer.import_genesis_accounts(chain_spec)
+
+      address = Address |> Repo.one()
+
+      assert to_string(address.contract_code) == code
+    end
+
+    test "imports polygon coin balances without 0x" do
+      block_quantity = integer_to_quantity(1)
+      res = eth_block_number_fake_response(block_quantity)
+
+      EthereumJSONRPC.Mox
+      |> expect(:json_rpc, fn [
+                                %{id: 0, jsonrpc: "2.0", method: "eth_getBlockByNumber", params: ["0x1", true]}
+                              ],
+                              [] ->
+        {:ok, [res]}
+      end)
+
+      {:ok, %{address_coin_balances: address_coin_balances}} = Importer.import_genesis_accounts(@polygon_genesis)
+
+      assert Enum.count(address_coin_balances) == 17
+      assert CoinBalance |> Repo.all() |> Enum.count() == 17
+      assert CoinBalanceDaily |> Repo.all() |> Enum.count() == 17
+      assert Address |> Repo.all() |> Enum.count() == 17
+    end
   end
 
   defp eth_block_number_fake_response(block_quantity) do
diff --git a/apps/explorer/test/support/fixture/chain_spec/polygon_genesis.json b/apps/explorer/test/support/fixture/chain_spec/polygon_genesis.json
new file mode 100644
index 000000000000..974a44394590
--- /dev/null
+++ b/apps/explorer/test/support/fixture/chain_spec/polygon_genesis.json
@@ -0,0 +1,165 @@
+{
+    "name": "polygon-edge",
+    "genesis": {
+        "nonce": "0x0000000000000000",
+        "timestamp": "0x0",
+        "extraData": "0x0000000000000000000000000000000000000000000000000000000000000000f90305f90299f90294f8a39461324166b0202db1e7502924326262274fa4358fb88006d8d9e6af67c28e85ac400b72c2e635e83234f8a380865e050a206554049a222c4792120d84977a6ca669df56ff3a1cf1cfeccddb650e7aacff4ed6c1d4e37b055858209f80117b3c0a6e7a28e456d4caf2270f430f9df2ba37221f23e9bbd313c9ef488e1849cc5c40d18284d019dde5ed86770309b9c24b70ceff6167a6ca8ad3c21bcecceda100000001f8a394fe5e166ba5ea50c04fca00b07b59966e6c2e9570b8800601da8856a6d3d3bb0f3bcbb90ea7b8c0db8271b9203e6123c6804aa3fc5f810be33287968ca1af2be11839516850a6ffef2337d99e679b7531efbbea2e3bf727a053c0cbede71da3d5f489b6ad862ccd8bb0bfb7fa379e3395d3b1142594a73020e87d63c298a3a4eba0ace65727f8659bab6389b9448b72512db72bbe937f8ad3c21bcecceda100000001f8a3949abb8441a12d4fd8d505c3fc50cddc45e0df2b1eb88017c26d9d91dddc3c1318b20a1ddb3322ea1f4e4415c27e9011d706e7407eed672837173d1909cbff6ccdfd110af3b18bdfea878e8120fdb5bae70dc7a044a2f40aa8f118b41704896f474f80fff52d9047fa8e4a464ac86f9d05a0220975d8440e20c6307d866137053cabd4baf6ba84bfa4a22f5f9297c1bfc2380c235352108ad3c21bcecceda100000001f8a394cab5aac79bebe326e0c80d72b5662e73f5d8ea56b8801d7bb7d44a2f0ebeae2f4380f88188080de34635d78a36647f0704c7b70de7291e2e3b9a1ef699a078c6cd9bb816ea2917c2c2fc699c6248f1f7812a167caf7e15361ec16df56d194768d57c79897c681c96f4321651464f7b577d08083d8b67213a1e29dc8495d8389e6cbd85fdd738c402a1801198b57b302e0e00dfaf12478ad3c21bcecceda100000001c080c0c0f8658080a00000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000",
+        "gasLimit": "0x989680",
+        "difficulty": "0x0",
+        "mixHash": "0xadce6e5230abe012342a44e4e9b6d05997d6f015387ae0e59be924afc7ec70c1",
+        "coinbase": "0x0000000000000000000000000000000000000000",
+        "alloc": {
+            "0x0000000000000000000000000000000000000101": {
+                "code": "0x608060405234801561001057600080fd5b50600436106101b05760003560e01c806370a08231116100ef578063ce513b6f11610092578063ce513b6f14610398578063dd62ed3e146103ab578063e0563ab1146103be578063ea0fee4f146103c7578063eacdc5ff146103cf578063eeb49945146103d8578063f3f43703146103eb578063fd242c14146103fe57600080fd5b806370a08231146102e7578063947287cf146102fa57806395d89b411461030357806397e5230d1461030b578063981b24d014610315578063a457c2d714610328578063a9059cbb1461033b578063c6b61e4c1461034e57600080fd5b8063395093511161015757806339509351146102735780633b878c22146102865780633ccfd60b1461028f5780633fd50001146102975780634ee2cd7e146102aa57806351351d53146102bd57806361cc2763146102cb57806362656003146102de57600080fd5b806306fdde03146101b5578063095ea7b3146101d35780630f50287c146101f657806318160ddd1461020b57806323b872dd1461021d578063284017f5146102305780632e17de7814610251578063313ce56714610264575b600080fd5b6101bd610411565b6040516101ca91906119ba565b60405180910390f35b6101e66101e13660046119e2565b6104a3565b60405190151581526020016101ca565b610209610204366004611a0e565b6104bd565b005b6035545b6040519081526020016101ca565b6101e661022b366004611a46565b61074f565b61023961202081565b6040516001600160a01b0390911681526020016101ca565b61020961025f366004611a87565b610773565b604051601281526020016101ca565b6101e66102813660046119e2565b61078a565b61023961101081565b6102096107ac565b61020f6102a5366004611a87565b6108bd565b61020f6102b83660046119e2565b6108de565b6102396002600160a01b0381565b6102096102d9366004611b10565b6108f1565b61020f60cc5481565b61020f6102f5366004611c29565b610b1f565b61020f61520881565b6101bd610b3a565b61020f620249f081565b61020f610323366004611a87565b610b49565b6101e66103363660046119e2565b610b54565b6101e66103493660046119e2565b610bcf565b61037d61035c366004611a87565b60ce6020526000908152604090208054600182015460029092015490919083565b604080519384526020840192909252908201526060016101ca565b61020f6103a6366004611c29565b610bdd565b61020f6103b9366004611c46565b610c0b565b61023961203081565b61020f600181565b61020f60cd5481565b6102096103e6366004611c7f565b610c36565b61020f6103f9366004611c29565b610d08565b61020f61040c366004611a87565b610d2f565b60606036805461042090611d08565b80601f016020809104026020016040519081016040528092919081815260200182805461044c90611d08565b80156104995780601f1061046e57610100808354040283529160200191610499565b820191906000526020600020905b81548152906001019060200180831161047c57829003601f168201915b5050505050905090565b6000336104b1818585610d79565b60019150505b92915050565b336002600160a01b03146105065760405163973d02cb60e01b815260206004820152600a60248201526914d654d5115350d0531360b21b60448201526064015b60405180910390fd5b60cd80546000918261051783611d58565b9190505590508083146105625760405162461bcd60e51b815260206004820152601360248201527215539156141150d5115117d15413d0d217d251606a1b60448201526064016104fd565b81356020830135116105ac5760405162461bcd60e51b81526020600482015260136024820152721393d7d09313d0d2d4d7d0d3d3535255151151606a1b60448201526064016104fd565b60cc546105be83356020850135611d71565b6105c9906001611d84565b6105d39190611dad565b1561062e5760405162461bcd60e51b815260206004820152602560248201527f45504f43485f4d5553545f42455f444956495349424c455f42595f45504f43486044820152645f53495a4560d81b60648201526084016104fd565b813560ce600061063f600185611d71565b815260200190815260200160002060010154600161065d9190611d84565b146106a05760405162461bcd60e51b8152602060048201526013602482015272494e56414c49445f53544152545f424c4f434b60681b60448201526064016104fd565b600081815260ce6020526040902082906106d182828135815560208201356001820155604082013560028201555050565b505060cf80546001810182556000919091526020838101357facb8d954e2cfef495862221e91bd7523613cf8808827cb33edfe4904cc51bf299092018290556040805190850135815284359186917f0ce8712c4dee4bd5a691f0bc1c39594671591e77395f8ebf6a3fb5f63fbea66a910160405180910390a4505050565b60003361075d858285610e9e565b610768858585610f12565b506001949350505050565b61077d33826110b6565b61078733826111e1565b50565b6000336104b181858561079d8383610c0b565b6107a79190611d84565b610d79565b33600090815260d06020526040812060cd5490919081906107ce90849061125a565b808555604051828152919350915033907f7fcf532c15f0a6db0bd6d0e038bea71d30d808c7d98cb3bf7268a95bf5081b659060200160405180910390a260c95460cb54604080517f8ca9a95e41b5eece253c93f5b31eed1253aed6b145d8a6e14d913fdf8e7322936020820152338183015260608082018790528251808303909101815260808201928390526316f1983160e01b9092526001600160a01b03938416936316f198319361088693911691608401611dc1565b600060405180830381600087803b1580156108a057600080fd5b505af11580156108b4573d6000803e3d6000fd5b50505050505050565b60cf81815481106108cd57600080fd5b600091825260209091200154905081565b60006108ea83836112cc565b9392505050565b600054610100900460ff16158080156109115750600054600160ff909116105b8061092b5750303b15801561092b575060005460ff166001145b61098e5760405162461bcd60e51b815260206004820152602e60248201527f496e697469616c697a61626c653a20636f6e747261637420697320616c72656160448201526d191e481a5b9a5d1a585b1a5e995960921b60648201526084016104fd565b6000805460ff1916600117905580156109b1576000805461ff0019166101001790555b6109fb6040518060400160405280600c81526020016b15985b1a59185d1bdc94d95d60a21b815250604051806040016040528060048152602001631594d15560e21b815250611315565b60c980546001600160a01b038089166001600160a01b03199283161790925560ca805488841690831617905560cb80549287169290911691909117905560cc83905560005b8251811015610a9557610a8d838281518110610a5e57610a5e611de5565b602002602001015160000151848381518110610a7c57610a7c611de5565b60200260200101516020015161134a565b600101610a40565b5060cf80546001818101835560009283527facb8d954e2cfef495862221e91bd7523613cf8808827cb33edfe4904cc51bf299091019190915560cd558015610b17576000805461ff0019169055604051600181527f7f26b83ff96e1f2b6a682f133852f6798a09c465da95921460cefb38474024989060200160405180910390a15b505050505050565b6001600160a01b031660009081526033602052604090205490565b60606037805461042090611d08565b60006104b782611354565b60003381610b628286610c0b565b905083811015610bc25760405162461bcd60e51b815260206004820152602560248201527f45524332303a2064656372656173656420616c6c6f77616e63652062656c6f77604482015264207a65726f60d81b60648201526084016104fd565b6107688286868403610d79565b6000336104b1818585610f12565b60cd546001600160a01b038216600090815260d0602052604081209091610c04919061125a565b5092915050565b6001600160a01b03918216600090815260346020908152604080832093909416825291909152205490565b60ca546001600160a01b031633148015610c5d575060cb546001600160a01b038481169116145b610c9a5760405162461bcd60e51b815260206004820152600e60248201526d24a72b20a624a22fa9a2a72222a960911b60448201526064016104fd565b7f1bcc0f4c3fad314e585165815f94ecca9b96690a26d6417d7876448a9a867a69610cc9602060008486611dfb565b610cd291611e25565b03610d0257600080610ce78360208187611dfb565b810190610cf491906119e2565b91509150610b17828261134a565b50505050565b60cd546001600160a01b038216600090815260d06020526040812090916104b7919061137f565b600081815260ce60205260408120600101548015610d7057600083815260ce6020526040902054610d609082611d71565b610d6b906001611d84565b6108ea565b60009392505050565b6001600160a01b038316610ddb5760405162461bcd60e51b8152602060048201526024808201527f45524332303a20617070726f76652066726f6d20746865207a65726f206164646044820152637265737360e01b60648201526084016104fd565b6001600160a01b038216610e3c5760405162461bcd60e51b815260206004820152602260248201527f45524332303a20617070726f766520746f20746865207a65726f206164647265604482015261737360f01b60648201526084016104fd565b6001600160a01b0383811660008181526034602090815260408083209487168084529482529182902085905590518481527f8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b92591015b60405180910390a3505050565b6000610eaa8484610c0b565b90506000198114610d025781811015610f055760405162461bcd60e51b815260206004820152601d60248201527f45524332303a20696e73756666696369656e7420616c6c6f77616e636500000060448201526064016104fd565b610d028484848403610d79565b6001600160a01b038316610f765760405162461bcd60e51b815260206004820152602560248201527f45524332303a207472616e736665722066726f6d20746865207a65726f206164604482015264647265737360d81b60648201526084016104fd565b6001600160a01b038216610fd85760405162461bcd60e51b815260206004820152602360248201527f45524332303a207472616e7366657220746f20746865207a65726f206164647260448201526265737360e81b60648201526084016104fd565b610fe383838361141d565b6001600160a01b0383166000908152603360205260409020548181101561105b5760405162461bcd60e51b815260206004820152602660248201527f45524332303a207472616e7366657220616d6f756e7420657863656564732062604482015265616c616e636560d01b60648201526084016104fd565b6001600160a01b038085166000818152603360205260408082208686039055928616808252908390208054860190559151600080516020611fd6833981519152906110a99086815260200190565b60405180910390a3610d02565b6001600160a01b0382166111165760405162461bcd60e51b815260206004820152602160248201527f45524332303a206275726e2066726f6d20746865207a65726f206164647265736044820152607360f81b60648201526084016104fd565b6111228260008361141d565b6001600160a01b038216600090815260336020526040902054818110156111965760405162461bcd60e51b815260206004820152602260248201527f45524332303a206275726e20616d6f756e7420657863656564732062616c616e604482015261636560f01b60648201526084016104fd565b6001600160a01b0383166000818152603360209081526040808320868603905560358054879003905551858152919291600080516020611fd68339815191529101610e91565b505050565b61121381600160cd546111f49190611d84565b6001600160a01b038516600090815260d0602052604090209190611486565b816001600160a01b03167f655c1cd0236fb6dc4916f34c8ff10e3b18fcaea5b344dfc16c36fbb1bdfc5df28260405161124e91815260200190565b60405180910390a25050565b81546000905b83600101548110156112c5576000818152600285016020908152604091829020825180840190935280548352600101549082018190528410156112a357506112c5565b80516112af9084611d84565b92505080806112bd90611d58565b915050611260565b9250929050565b6001600160a01b0382166000908152606560205260408120819081906112f39085906115b1565b915091508161130a5761130585610b1f565b61130c565b805b95945050505050565b600054610100900460ff1661133c5760405162461bcd60e51b81526004016104fd90611e43565b611346828261169f565b5050565b61134682826116df565b60008060006113648460666115b1565b915091508161137557603554611377565b805b949350505050565b60018201546000908082036113985760009150506104b7565b60006113a5600183611d71565b90505b845481106114155760008181526002860160209081526040918290208251808401909352805483526001015490820181905285106113e65750611415565b80516113f29085611d84565b9350816000036114025750611415565b508061140d81611e8e565b9150506113a8565b505092915050565b6001600160a01b038316158061143a57506001600160a01b038216155b61147b5760405162461bcd60e51b81526020600482015260126024820152712a2920a729a322a92fa327a92124a22222a760711b60448201526064016104fd565b6111dc83838361179a565b8160000361149657611496611ea5565b825460018401548181036114ed576040805180820182528581526020808201868152600085815260028a0190925292812091518255915160019182015586018054916114e183611d58565b91905055505050505050565b600060028601816114ff600185611d71565b81526020019081526020016000206001015490508084101561152357611523611ea5565b83811015611572576040805180820182528681526020808201878152600086815260028b01909252928120915182559151600191820155870180549161156883611d58565b9190505550610b17565b84600287016000611584600186611d71565b815260200190815260200160002060000160008282546115a49190611d84565b9091555050505050505050565b600080600084116115fd5760405162461bcd60e51b815260206004820152601660248201527504552433230536e617073686f743a20696420697320360541b60448201526064016104fd565b60cd5484111561164f5760405162461bcd60e51b815260206004820152601d60248201527f4552433230536e617073686f743a206e6f6e6578697374656e7420696400000060448201526064016104fd565b600061165b84866117e2565b845490915081036116735760008092509250506112c5565b600184600101828154811061168a5761168a611de5565b906000526020600020015492509250506112c5565b600054610100900460ff166116c65760405162461bcd60e51b81526004016104fd90611e43565b60366116d28382611f01565b5060376111dc8282611f01565b6001600160a01b0382166117355760405162461bcd60e51b815260206004820152601f60248201527f45524332303a206d696e7420746f20746865207a65726f20616464726573730060448201526064016104fd565b6117416000838361141d565b80603560008282546117539190611d84565b90915550506001600160a01b038216600081815260336020908152604080832080548601905551848152600080516020611fd6833981519152910160405180910390a35050565b6001600160a01b0383166117b9576117b18261188f565b6111dc6118b9565b6001600160a01b0382166117d0576117b18361188f565b6117d98361188f565b6111dc8261188f565b815460009081036117f5575060006104b7565b82546000905b8082101561184257600061180f83836118c9565b6000878152602090209091508590820154111561182e5780915061183c565b611839816001611d84565b92505b506117fb565b60008211801561186e57508361186b8661185d600186611d71565b600091825260209091200190565b54145b156118875761187e600183611d71565b925050506104b7565b5090506104b7565b6001600160a01b0381166000908152606560205260409020610787906118b483610b1f565b6118e4565b6118c760666118b460355490565b565b60006118d86002848418611fc1565b6108ea90848416611d84565b60006118ef60cd5490565b9050806118fb8461192f565b10156111dc578254600180820185556000858152602080822090930193909355938401805494850181558252902090910155565b8054600090810361194257506000919050565b8154829061195290600190611d71565b8154811061196257611962611de5565b90600052602060002001549050919050565b6000815180845260005b8181101561199a5760208185018101518683018201520161197e565b506000602082860101526020601f19601f83011685010191505092915050565b6020815260006108ea6020830184611974565b6001600160a01b038116811461078757600080fd5b600080604083850312156119f557600080fd5b8235611a00816119cd565b946020939093013593505050565b6000808284036080811215611a2257600080fd5b833592506060601f1982011215611a3857600080fd5b506020830190509250929050565b600080600060608486031215611a5b57600080fd5b8335611a66816119cd565b92506020840135611a76816119cd565b929592945050506040919091013590565b600060208284031215611a9957600080fd5b5035919050565b634e487b7160e01b600052604160045260246000fd5b6040805190810167ffffffffffffffff81118282101715611ad957611ad9611aa0565b60405290565b604051601f8201601f1916810167ffffffffffffffff81118282101715611b0857611b08611aa0565b604052919050565b600080600080600060a08688031215611b2857600080fd5b8535611b33816119cd565b9450602086810135611b44816119cd565b9450604087810135611b55816119cd565b945060608801359350608088013567ffffffffffffffff80821115611b7957600080fd5b818a0191508a601f830112611b8d57600080fd5b813581811115611b9f57611b9f611aa0565b611bad858260051b01611adf565b818152858101925060069190911b83018501908c821115611bcd57600080fd5b928501925b81841015611c165784848e031215611bea5760008081fd5b611bf2611ab6565b8435611bfd816119cd565b8152848701358782015283529284019291850191611bd2565b8096505050505050509295509295909350565b600060208284031215611c3b57600080fd5b81356108ea816119cd565b60008060408385031215611c5957600080fd5b8235611c64816119cd565b91506020830135611c74816119cd565b809150509250929050565b60008060008060608587031215611c9557600080fd5b843593506020850135611ca7816119cd565b9250604085013567ffffffffffffffff80821115611cc457600080fd5b818701915087601f830112611cd857600080fd5b813581811115611ce757600080fd5b886020828501011115611cf957600080fd5b95989497505060200194505050565b600181811c90821680611d1c57607f821691505b602082108103611d3c57634e487b7160e01b600052602260045260246000fd5b50919050565b634e487b7160e01b600052601160045260246000fd5b600060018201611d6a57611d6a611d42565b5060010190565b818103818111156104b7576104b7611d42565b808201808211156104b7576104b7611d42565b634e487b7160e01b600052601260045260246000fd5b600082611dbc57611dbc611d97565b500690565b6001600160a01b038316815260406020820181905260009061137790830184611974565b634e487b7160e01b600052603260045260246000fd5b60008085851115611e0b57600080fd5b83861115611e1857600080fd5b5050820193919092039150565b803560208310156104b757600019602084900360031b1b1692915050565b6020808252602b908201527f496e697469616c697a61626c653a20636f6e7472616374206973206e6f74206960408201526a6e697469616c697a696e6760a81b606082015260800190565b600081611e9d57611e9d611d42565b506000190190565b634e487b7160e01b600052600160045260246000fd5b601f8211156111dc57600081815260208120601f850160051c81016020861015611ee25750805b601f850160051c820191505b81811015610b1757828155600101611eee565b815167ffffffffffffffff811115611f1b57611f1b611aa0565b611f2f81611f298454611d08565b84611ebb565b602080601f831160018114611f645760008415611f4c5750858301515b600019600386901b1c1916600185901b178555610b17565b600085815260208120601f198616915b82811015611f9357888601518255948401946001909101908401611f74565b5085821015611fb15787850151600019600388901b60f8161c191681555b5050505050600190811b01905550565b600082611fd057611fd0611d97565b50049056feddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3efa2646970667358221220ceae916e2fad24f9aaa4340b6994418d32d33c6ae1f266c50dd4ec5ccbdbce2764736f6c63430008130033",
+                "balance": "0x0"
+            },
+            "0x0000000000000000000000000000000000000102": {
+                "code": "0x608060405234801561001057600080fd5b506004361061009e5760003560e01c806391ec2d2b1161006657806391ec2d2b1461013b578063a850a9091461015b578063d58e77331461016e578063e242cce914610181578063ebbdac911461019457600080fd5b8063115000fe146100a3578063247dd9fb146100cb5780633e5476ce146100de5780638669026f146101085780639141376314610128575b600080fd5b6100b66100b1366004612708565b6101a7565b60405190151581526020015b60405180910390f35b6100b66100d9366004612785565b61030e565b6100f16100ec366004612841565b6103b8565b6040805192151583529015156020830152016100c2565b61011b6101163660046128ce565b61079f565b6040516100c29190612957565b6100f1610136366004612988565b6108bb565b61014e6101493660046128ce565b610d5c565b6040516100c29190612a86565b61011b6101693660046128ce565b610ff8565b61011b61017c366004612aa0565b6111d4565b6100b661018f366004612785565b6115aa565b6100f16101a2366004612ab9565b611609565b600081516020830151600080516020612d63833981519152828309600080516020612d638339815191528283098182830101600080516020612d638339815191528283840108600080516020612d638339815191528682600080516020612d6383398151915203860109935050600080516020612d638339815191528483600080516020612d63833981519152038301099150600080516020612d638339815191527f2b149d40ceb8aaae81be18991be06ac3b5b4c5e559dbefa33267e6dc24a138e584089450600080516020612d638339815191527e9713b03af0fed4cd2cafadeed8fdf4a74fa084e52d1852e4a2bd0685c315d2830893506040870151925060608701519150600080516020612d638339815191528083600080516020612d63833981519152038508600080516020612d63833981519152848608099050600080516020612d63833981519152828460011b0994149290931491909116949350505050565b8051600090600080516020612d6383398151915211158061034157506020820151600080516020612d6383398151915211155b1561034e57506000919050565b60405163e242cce960e01b8152309063e242cce990610371908590600401612957565b602060405180830381865afa15801561038e573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906103b29190612b1c565b92915050565b60008083806103e25760405162461bcd60e51b81526004016103d990612b3e565b60405180910390fd5b60006103ef826001612b95565b6103fa906006612ba8565b90506000816001600160401b038111156104165761041661269a565b60405190808252806020026020018201604052801561043f578160200160208202803683370190505b50905088600060200201358160008151811061045d5761045d612b06565b602090810291909101015288600160200201358160018151811061048357610483612b06565b602002602001018181525050600080516020612d43833981519152816002815181106104b1576104b1612b06565b602002602001018181525050600080516020612d23833981519152816003815181106104df576104df612b06565b602002602001018181525050600080516020612d838339815191528160048151811061050d5761050d612b06565b602002602001018181525050600080516020612da38339815191528160058151811061053b5761053b612b06565b60200260200101818152505060005b8381101561075a57863582610560836006612ba8565b61056b906006612b95565b8151811061057b5761057b612b06565b602090810291909101015286600160200201358261059a836006612ba8565b6105a5906007612b95565b815181106105b5576105b5612b06565b6020026020010181815250508888828181106105d3576105d3612b06565b9050608002016001600481106105eb576105eb612b06565b6020020135826105fc836006612ba8565b610607906008612b95565b8151811061061757610617612b06565b60200260200101818152505088888281811061063557610635612b06565b90506080020160006004811061064d5761064d612b06565b60200201358261065e836006612ba8565b610669906009612b95565b8151811061067957610679612b06565b60200260200101818152505088888281811061069757610697612b06565b9050608002016003600481106106af576106af612b06565b6020020135826106c0836006612ba8565b6106cb90600a612b95565b815181106106db576106db612b06565b6020026020010181815250508888828181106106f9576106f9612b06565b90506080020160026004811061071157610711612b06565b602002013582610722836006612ba8565b61072d90600b612b95565b8151811061073d5761073d612b06565b60209081029190910101528061075281612bbf565b91505061054a565b50610763612640565b602081602085026020850160085afa945084610789576000809550955050505050610796565b5115159450600193505050505b94509492505050565b6107a761265e565b6040516391ec2d2b60e01b815260009030906391ec2d2b906107cf9087908790600401612bd8565b600060405180830381865afa1580156107ec573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f191682016040526108149190810190612bf9565b9050600080600080601885016001600160c01b0381511693506030860190506001600160c01b038151169450600080516020612d6383398151915285600080516020612d63833981519152600160c01b870908604887015160608801516001600160c01b0390811697501694509250600080516020612d6383398151915290508481600160c01b860908604080518082019091529283526020830152509695505050505050565b60008084806108dc5760405162461bcd60e51b81526004016103d990612b3e565b8084146109495760405162461bcd60e51b815260206004820152603560248201527f424c533a206e756d626572206f66207075626c6963206b65797320616e64206d604482015274195cdcd859d95cc81b5d5cdd08189948195c5d585b605a1b60648201526084016103d9565b6000610956826001612b95565b610961906006612ba8565b90506000816001600160401b0381111561097d5761097d61269a565b6040519080825280602002602001820160405280156109a6578160200160208202803683370190505b5090508960006020020135816000815181106109c4576109c4612b06565b60209081029190910101528960016020020135816001815181106109ea576109ea612b06565b602002602001018181525050600080516020612d4383398151915281600281518110610a1857610a18612b06565b602002602001018181525050600080516020612d2383398151915281600381518110610a4657610a46612b06565b602002602001018181525050600080516020612d8383398151915281600481518110610a7457610a74612b06565b602002602001018181525050600080516020612da383398151915281600581518110610aa257610aa2612b06565b60200260200101818152505060005b83811015610d1657878782818110610acb57610acb612b06565b905060400201600060028110610ae357610ae3612b06565b602002013582610af4836006612ba8565b610aff906006612b95565b81518110610b0f57610b0f612b06565b602002602001018181525050878782818110610b2d57610b2d612b06565b905060400201600160028110610b4557610b45612b06565b602002013582610b56836006612ba8565b610b61906007612b95565b81518110610b7157610b71612b06565b602002602001018181525050898982818110610b8f57610b8f612b06565b905060800201600160048110610ba757610ba7612b06565b602002013582610bb8836006612ba8565b610bc3906008612b95565b81518110610bd357610bd3612b06565b602002602001018181525050898982818110610bf157610bf1612b06565b905060800201600060048110610c0957610c09612b06565b602002013582610c1a836006612ba8565b610c25906009612b95565b81518110610c3557610c35612b06565b602002602001018181525050898982818110610c5357610c53612b06565b905060800201600360048110610c6b57610c6b612b06565b602002013582610c7c836006612ba8565b610c8790600a612b95565b81518110610c9757610c97612b06565b602002602001018181525050898982818110610cb557610cb5612b06565b905060800201600260048110610ccd57610ccd612b06565b602002013582610cde836006612ba8565b610ce990600b612b95565b81518110610cf957610cf9612b06565b602090810291909101015280610d0e81612bbf565b915050610ab1565b50610d1f612640565b602081602085026020850160085afa945084610d45576000809550955050505050610d52565b5115159450600193505050505b9550959350505050565b80516060906000610d6e826020612b95565b610d79906040612b95565b610d84906004612b95565b6001600160401b03811115610d9b57610d9b61269a565b6040519080825280601f01601f191660200182016040528015610dc5576020820181803683370190505b5060408051606080825260808201909252919250600091906020820181803683370190505090506060820160005b84811015610e0d5760208188018101518383015201610df3565b5083016000815360010160608153600101600081536001810187905260210160208153506000600283604051610e439190612c6f565b602060405180830381855afa158015610e60573d6000803e3d6000fd5b5050506040513d601f19601f82011682018060405250810190610e839190612c8b565b9050600060429450848452816020850152600160408501536041840188905260206061850153600284604051610eb99190612c6f565b602060405180830381855afa158015610ed6573d6000803e3d6000fd5b5050506040513d601f19601f82011682018060405250810190610ef99190612c8b565b905080602084015280821880602086015250600260408501536041840188905260206061850153600284604051610f309190612c6f565b602060405180830381855afa158015610f4d573d6000803e3d6000fd5b5050506040513d601f19601f82011682018060405250810190610f709190612c8b565b905080604084015280821880602086015250600360408501536041840188905260206061850153600284604051610fa79190612c6f565b602060405180830381855afa158015610fc4573d6000803e3d6000fd5b5050506040513d601f19601f82011682018060405250810190610fe79190612c8b565b606084015250909695505050505050565b61100061265e565b604051638669026f60e01b81526000903090638669026f906110289087908790600401612bd8565b6040805180830381865afa158015611044573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906110689190612ca4565b805160405163d58e773360e01b81526004810191909152909150600090309063d58e7733906024016040805180830381865afa1580156110ac573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906110d09190612ca4565b602083015160405163d58e773360e01b81526004810191909152909150600090309063d58e7733906024016040805180830381865afa158015611117573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061113b9190612ca4565b905061114561267c565b825181526020808401518282015282516040808401919091529083015160608301526000908460808460066107d05a03fa9050808061118057fe5b50806111c85760405162461bcd60e51b8152602060048201526017602482015276109314ce88189b881859190818d85b1b0819985a5b1959604a1b60448201526064016103d9565b50919695505050505050565b6111dc61265e565b600080516020612d6383398151915282106112455760405162461bcd60e51b815260206004820152602360248201527f6d6170546f506f696e7446543a20696e76616c6964206669656c6420656c656d604482015262195b9d60ea1b60648201526084016103d9565b81600061125182611790565b9150506000600080516020612d638339815191528061127257611272612cf9565b8384099050600080516020612d638339815191526004820890506000600080516020612d6383398151915277b3c4d79d41a91759a9e4c7e359b6b89eaec68e62effffffd850990506000600080516020612d6383398151915283830990506112d9816117b9565b9050600080516020612d638339815191528283099150600080516020612d638339815191528183099150600080516020612d638339815191528286099150600080516020612d6383398151915261133e83600080516020612d63833981519152612d0f565b7759e26bcea0d48bacd4f263f1acdb5c4f5763473177fffffe089450600080516020612d638339815191528586099150600080516020612d638339815191528583099150600080516020612d6383398151915260038308915060006113a283611790565b909350905080156113ea57846113cd576113ca83600080516020612d63833981519152612d0f565b92505b505060408051808201909152938452602084015250909392505050565b600080516020612d638339815191526001870861141590600080516020612d63833981519152612d0f565b9550600080516020612d638339815191528687099250600080516020612d638339815191528684099250600080516020612d6383398151915260038408925061145d83611790565b9093509050801561148557846113cd576113ca83600080516020612d63833981519152612d0f565b600080516020612d638339815191528485099550600080516020612d638339815191528687099550600080516020612d638339815191528287099550600080516020612d638339815191528287099550600080516020612d63833981519152600187089550600080516020612d638339815191528687099250600080516020612d638339815191528684099250600080516020612d6383398151915260038408925061153083611790565b90935090508061158d5760405162461bcd60e51b815260206004820152602260248201527f424c533a20626164206674206d617070696e6720696d706c656d656e7461746960448201526137b760f11b60648201526084016103d9565b846113cd576113ca83600080516020612d63833981519152612d0f565b600081516020830151600080516020612d63833981519152828309600080516020612d638339815191528382099050600080516020612d63833981519152600382089050600080516020612d6383398151915282830914949350505050565b60008060006040518061018001604052808760006002811061162d5761162d612b06565b602002013581526020018760016002811061164a5761164a612b06565b60200201358152602001600080516020612d438339815191528152602001600080516020612d238339815191528152602001600080516020612d838339815191528152602001600080516020612da38339815191528152602001856000600281106116b7576116b7612b06565b60200201358152602001856001600281106116d4576116d4612b06565b60200201358152602001866001600481106116f1576116f1612b06565b602002013581526020018660006004811061170e5761170e612b06565b602002013581526020018660036004811061172b5761172b612b06565b602002013581526020018660026004811061174857611748612b06565b602002013590529050611759612640565b60006020826101808560085afa90508061177c5760008094509450505050611788565b50511515925060019150505b935093915050565b60008061179c836117c4565b915082600080516020612d63833981519152838409149050915091565b60006103b282611ef9565b6000600080516020612d638339815191528083840991508083830981838209828283098385830984848309858484098684850997508684840987858409945087898a09985087898a09985087898a09985087898a09985087898a09985087878a09985087898a09985087898a09985087898a099850878a8a09985087898a09985087898a09985087898a09985087898a099850878a8a09985087898a09985087898a09985087898a09985087898a09985087898a09985087848a09985087898a09985087898a09985087898a09985087898a09985087898a09985087848a09985087898a09985087898a09985087898a099850878a8a09985087898a09985087898a09985087898a09985087898a09985087848a09985087898a09985087898a09985087898a09985087898a09985087898a099850878a8a09985087898a09985087898a09985087898a09985087898a09985087878a09985087898a09985087898a09985087898a09985087898a09985087898a09985087898a09985087898a09985087818a09985087898a09985087898a09985087898a09985087898a09985087898a09985087898a09985087898a09985087898a09985087898a09985087898a09985087868a09985087898a09985087898a09985087898a09985087898a09985087878a09985087898a09985087898a09985087898a09985087898a09985087848a09985087898a09985087898a09985087898a09985087898a09985087898a09985087898a09985087898a09985087868a09985087898a09985087898a09985087898a09985087898a09985087898a09985087898a099850878a8a09985087898a09985087898a09985087898a09985087898a09985087898a09985087898a09985087898a09985087828a09985087898a09985087898a09985087898a09985087898a09985087898a09985087818a09985087898a09985087898a09985087898a09985087868a09985087898a09985087898a09985087898a09985087898a09985087898a09985087898a09985087898a09985087898a09985087878a09985087898a09985087898a09985087898a09985087898a09985087898a09985087898a09985087898a09985087898a09985087898a09985087868a09985087898a09985087898a09985087898a09985087878a09985087898a09985087898a09985087898a09985087898a09985087898a09985087898a09985087898a09985087898a09985087828a09985087898a09985087898a09985087898a09985087898a09985087828a09985087898a09985087898a09985087898a09985087898a09985087898a09985087868a09985087898a09985087898a09985087898a09985087848a09985087898a09985087898a09985087898a09985087898a09985087898a09985087898a09985087898a09985087898a09985087898a09985087898a09985087828a09985087898a09985087898a09985087898a09985087898a09985087868a09985087898a09985087898a09985087898a09985087898a09985087898a09985087838a09985087898a09985087898a09985087898a09985087898a09985087898a09985087898a09985087898a09985087828a09985087898a09985087898a099850878a8a09985087898a09985087898a09985087898a09985087898a09985087898a09985087898a09985087898a09985087848a09985087898a09985087898a09985087898a09985087898a09985087898a09985087898a09985087848a09985087898a09985087898a09985087898a09985087898a09985087898a09985087868a09985087898a09985087898a099850878a8a09985087898a09985087898a09985087898a09985087898a09985087898a09985087898a09985087898a09985087818a09985050868889099750868889099750868889099750868889099750868889099750868889099750868489099750868889099750868889099750868889099750868889099750868889099750868989099750868889099750868889099750868889099750868889099750868889099750868889099750868989099750868889099750868889099750868889099750868889099750868889099750868689099750868889099750868889099750868889099750868889099750868889099750868889099750868889099750868889099750868889099750868189099750508587880996508587880996508587880996508585880996508587880996508587880996508587880996508585880996508587880996508587880996508587880996508587880996508587880996508587880996508587880996508587880996508583880996508587880996508587880996508587880996508587880996508581880996508587880996508587880996508587880996508587880996508583880996508587880996508587880996508587880996508584880996508587880996508587880996508587880996508587880996508587880996508581880996505050505050808283099392505050565b6000600080516020612d638339815191528083840991508083830981838209828283098385830984848309858484098684850997508684840987858409945087898a09985087898a09985087898a09985087898a09985087898a09985087878a09985087898a09985087898a09985087898a099850878a8a09985087898a09985087898a09985087898a09985087898a099850878a8a09985087898a09985087898a09985087898a09985087898a09985087898a09985087848a09985087898a09985087898a09985087898a09985087898a09985087898a09985087848a09985087898a09985087898a09985087898a099850878a8a09985087898a09985087898a09985087898a09985087898a09985087848a09985087898a09985087898a09985087898a09985087898a09985087898a099850878a8a09985087898a09985087898a09985087898a09985087898a09985087878a09985087898a09985087898a09985087898a09985087898a09985087898a09985087898a09985087898a09985087818a09985087898a09985087898a09985087898a09985087898a09985087898a09985087898a09985087898a09985087898a09985087898a09985087898a09985087868a09985087898a09985087898a09985087898a09985087898a09985087878a09985087898a09985087898a09985087898a09985087898a09985087848a09985087898a09985087898a09985087898a09985087898a09985087898a09985087898a09985087898a09985087868a09985087898a09985087898a09985087898a09985087898a09985087898a09985087898a099850878a8a09985087898a09985087898a09985087898a09985087898a09985087898a09985087898a09985087898a09985087828a09985087898a09985087898a09985087898a09985087898a09985087898a09985087818a09985087898a09985087898a09985087898a09985087868a09985087898a09985087898a09985087898a09985087898a09985087898a09985087898a09985087898a09985087898a09985087878a09985087898a09985087898a09985087898a09985087898a09985087898a09985087898a09985087898a09985087898a09985087898a09985087868a09985087898a09985087898a09985087898a09985087878a09985087898a09985087898a09985087898a09985087898a09985087898a09985087898a09985087898a09985087898a09985087828a09985087898a09985087898a09985087898a09985087898a09985087828a09985087898a09985087898a09985087898a09985087898a09985087898a09985087868a09985087898a09985087898a09985087898a09985087848a09985087898a09985087898a09985087898a09985087898a09985087898a09985087898a09985087898a09985087898a09985087898a09985087898a09985087828a09985087898a09985087898a09985087898a09985087898a09985087868a09985087898a09985087898a09985087898a09985087898a09985087898a09985087838a09985087898a09985087898a09985087898a09985087898a09985087898a09985087898a09985087898a09985087828a09985087898a09985087898a099850878a8a09985087898a09985087898a09985087898a09985087898a09985087898a09985087898a09985087898a09985087848a09985087898a09985087898a09985087898a09985087898a09985087898a09985087898a09985087848a09985087898a09985087898a09985087898a09985087898a09985087898a09985087868a09985087898a09985087898a099850878a8a09985087898a09985087898a09985087898a09985087898a09985087898a09985087898a09985087898a09985087818a09985050868889099750868889099750868889099750868889099750868889099750868889099750868489099750868889099750868889099750868889099750868889099750868889099750868989099750868889099750868889099750868889099750868889099750868889099750868889099750868989099750868889099750868889099750868889099750868889099750868889099750868689099750868889099750868889099750868889099750868889099750868889099750868889099750868889099750868889099750868889099750868189099750508587880996508587880996508587880996508585880996508587880996508587880996508587880996508585880996508587880996508587880996508587880996508587880996508587880996508587880996508587880996508587880996508583880996508587880996508587880996508587880996508587880996508581880996505050838586099450838586099450838586099450838586099450838186099450508284850993508284850993508284850993508281850993508284850993508284850993508285850993508284850993508284850993508284850993508284850993508284850993508284850993508281850995945050505050565b60405180602001604052806001906020820280368337509192915050565b60405180604001604052806002906020820280368337509192915050565b60405180608001604052806004906020820280368337509192915050565b634e487b7160e01b600052604160045260246000fd5b604080519081016001600160401b03811182821017156126d2576126d261269a565b60405290565b604051601f8201601f191681016001600160401b03811182821017156127005761270061269a565b604052919050565b60006080828403121561271a57600080fd5b82601f83011261272957600080fd5b604051608081018181106001600160401b038211171561274b5761274b61269a565b60405280608084018581111561276057600080fd5b845b8181101561277a578035835260209283019201612762565b509195945050505050565b60006040828403121561279757600080fd5b82601f8301126127a657600080fd5b6127ae6126b0565b8060408401858111156127c057600080fd5b845b818110156127da5780358452602093840193016127c2565b509095945050505050565b80604081018310156103b257600080fd5b60008083601f84011261280857600080fd5b5081356001600160401b0381111561281f57600080fd5b6020830191508360208260071b850101111561283a57600080fd5b9250929050565b60008060008060a0858703121561285757600080fd5b61286186866127e5565b935060408501356001600160401b0381111561287c57600080fd5b612888878288016127f6565b909450925061289c905086606087016127e5565b905092959194509250565b60006001600160401b038211156128c0576128c061269a565b50601f01601f191660200190565b600080604083850312156128e157600080fd5b8235915060208301356001600160401b038111156128fe57600080fd5b8301601f8101851361290f57600080fd5b803561292261291d826128a7565b6126d8565b81815286602083850101111561293757600080fd5b816020840160208301376000602083830101528093505050509250929050565b60408101818360005b600281101561297f578151835260209283019290910190600101612960565b50505092915050565b6000806000806000608086880312156129a057600080fd5b6129aa87876127e5565b945060408601356001600160401b03808211156129c657600080fd5b6129d289838a016127f6565b909650945060608801359150808211156129eb57600080fd5b818801915088601f8301126129ff57600080fd5b813581811115612a0e57600080fd5b8960208260061b8501011115612a2357600080fd5b9699959850939650602001949392505050565b60005b83811015612a51578181015183820152602001612a39565b50506000910152565b60008151808452612a72816020860160208601612a36565b601f01601f19169290920160200192915050565b602081526000612a996020830184612a5a565b9392505050565b600060208284031215612ab257600080fd5b5035919050565b60008060006101008486031215612acf57600080fd5b612ad985856127e5565b925060c0840185811115612aec57600080fd5b604085019250612afc86826127e5565b9150509250925092565b634e487b7160e01b600052603260045260246000fd5b600060208284031215612b2e57600080fd5b81518015158114612a9957600080fd5b60208082526021908201527f424c533a206e756d626572206f66207075626c6963206b6579206973207a65726040820152606f60f81b606082015260800190565b634e487b7160e01b600052601160045260246000fd5b808201808211156103b2576103b2612b7f565b80820281158282048414176103b2576103b2612b7f565b600060018201612bd157612bd1612b7f565b5060010190565b828152604060208201526000612bf16040830184612a5a565b949350505050565b600060208284031215612c0b57600080fd5b81516001600160401b03811115612c2157600080fd5b8201601f81018413612c3257600080fd5b8051612c4061291d826128a7565b818152856020838501011115612c5557600080fd5b612c66826020830160208601612a36565b95945050505050565b60008251612c81818460208701612a36565b9190910192915050565b600060208284031215612c9d57600080fd5b5051919050565b600060408284031215612cb657600080fd5b82601f830112612cc557600080fd5b612ccd6126b0565b806040840185811115612cdf57600080fd5b845b818110156127da578051845260209384019301612ce1565b634e487b7160e01b600052601260045260246000fd5b818103818111156103b2576103b2612b7f56fe1800deef121f1e76426a00665e5c4479674322d4f75edadd46debd5cd992f6ed198e9393920d483a7260bfb731fb5d25f1aa493335a9e71297e485b7aef312c230644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd47275dc4a288d1afb3cbb1ac09187524c7db36395df7be3b99e673b13a075a65ec1d9befcd05a5323e6da4d435f3b617cdb3af83285c2df711ef39c01571827f9da264697066735822122085f910855a39dd4d2f9582253d737b6f9c450d7d8e7383f636149d598d69b6ac64736f6c63430008130033",
+                "balance": "0x0"
+            },
+            "0x0000000000000000000000000000000000000103": {
+                "code": "0x73000000000000000000000000000000000000000030146080604052600080fdfea26469706673582212209ebefbbe674f8f0780cb158df4fa624dc1694693fcb1c5952691eb2a55c6f0aa64736f6c63430008130033",
+                "balance": "0x0"
+            },
+            "0x0000000000000000000000000000000000000105": {
+                "code": "0x608060405234801561001057600080fd5b50600436106100d55760003560e01c8063947287cf11610087578063947287cf14610183578063972398b61461018c57806397e5230d1461019f57806399248ea7146101a9578063b66ceef6146101c2578063c885bc58146101d5578063cf756fdf146101dd578063e0563ab1146101f057600080fd5b806307358b99146100da57806322009af61461010d578063284017f51461011657806331d7a262146101375780633b878c221461015757806351351d53146101605780638a9cd82d1461016e575b600080fd5b6100fa6100e8366004610b1d565b60366020526000908152604090205481565b6040519081526020015b60405180910390f35b6100fa60355481565b61011f61202081565b6040516001600160a01b039091168152602001610104565b6100fa610145366004610b52565b60376020526000908152604090205481565b61011f61101081565b61011f6002600160a01b0381565b61018161017c366004610b74565b6101f9565b005b6100fa61520881565b60345461011f906001600160a01b031681565b6100fa620249f081565b60325461011f906201000090046001600160a01b031681565b60335461011f906001600160a01b031681565b610181610658565b6101816101eb366004610bf3565b61068e565b61011f61203081565b336002600160a01b03146102425760405163973d02cb60e01b815260206004820152600a60248201526914d654d5115350d0531360b21b60448201526064015b60405180910390fd5b6000838152603660205260409020541561029e5760405162461bcd60e51b815260206004820152601a60248201527f5245574152445f414c52454144595f44495354524942555445440000000000006044820152606401610239565b603454604051633f490b0560e21b8152600481018590526000916001600160a01b03169063fd242c1490602401602060405180830381865afa1580156102e8573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061030c9190610c3e565b9050806000036103545760405162461bcd60e51b8152602060048201526013602482015272115413d0d217d393d517d0d3d3535255151151606a1b6044820152606401610239565b60345460408051636265600360e01b815290516000926001600160a01b03169163626560039160048083019260209291908290030181865afa15801561039e573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906103c29190610c3e565b905060006103d1826064610c6d565b836035546103df9190610c6d565b6103ea906064610c6d565b6103f49190610c8a565b603454604051630981b24d60e41b8152600481018990529192506000916001600160a01b039091169063981b24d090602401602060405180830381865afa158015610443573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906104679190610c3e565b9050846000805b828110156105f857600089898381811061048a5761048a610cac565b9050604002018036038101906104a09190610cc2565b905087816020015111156104f65760405162461bcd60e51b815260206004820152601b60248201527f5349474e45445f424c4f434b535f455843454544535f544f54414c00000000006044820152606401610239565b603454815160405163277166bf60e11b81526001600160a01b039182166004820152602481018e90526000929190911690634ee2cd7e90604401602060405180830381865afa15801561054d573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906105719190610c3e565b9050600061057f8a88610c6d565b602084015161058e848b610c6d565b6105989190610c6d565b6105a29190610c8a565b83516001600160a01b03166000908152603760205260408120805492935083929091906105d0908490610d27565b909155506105e090508186610d27565b945050505080806105f090610d3a565b91505061046e565b506000898152603660205260409020819055610613816107f1565b887feaf3d57629d9b1ce95715ccd98d6f5bf48023be1d5a06e09f64ab7f6d8be01d58260405161064591815260200190565b60405180910390a2505050505050505050565b3360008181526037602052604081208054919055603254909161068b916201000090046001600160a01b03169083610815565b50565b603254610100900460ff16158080156106ae5750603254600160ff909116105b806106c85750303b1580156106c8575060325460ff166001145b61072b5760405162461bcd60e51b815260206004820152602e60248201527f496e697469616c697a61626c653a20636f6e747261637420697320616c72656160448201526d191e481a5b9a5d1a585b1a5e995960921b6064820152608401610239565b6032805460ff19166001179055801561074e576032805461ff0019166101001790555b603280546001600160a01b03808816620100000262010000600160b01b031990921691909117909155603380548683166001600160a01b0319918216179091556034805492861692909116919091179055603582905580156107ea576032805461ff0019169055604051600181527f7f26b83ff96e1f2b6a682f133852f6798a09c465da95921460cefb38474024989060200160405180910390a15b5050505050565b60335460325461068b916001600160a01b036201000090920482169116308461087d565b6040516001600160a01b03831660248201526044810182905261087890849063a9059cbb60e01b906064015b60408051601f198184030181529190526020810180516001600160e01b03166001600160e01b0319909316929092179091526108bb565b505050565b6040516001600160a01b03808516602483015283166044820152606481018290526108b59085906323b872dd60e01b90608401610841565b50505050565b6000610910826040518060400160405280602081526020017f5361666545524332303a206c6f772d6c6576656c2063616c6c206661696c6564815250856001600160a01b031661098d9092919063ffffffff16565b805190915015610878578080602001905181019061092e9190610d53565b6108785760405162461bcd60e51b815260206004820152602a60248201527f5361666545524332303a204552433230206f7065726174696f6e20646964206e6044820152691bdd081cdd58d8d9595960b21b6064820152608401610239565b606061099c84846000856109a4565b949350505050565b606082471015610a055760405162461bcd60e51b815260206004820152602660248201527f416464726573733a20696e73756666696369656e742062616c616e636520666f6044820152651c8818d85b1b60d21b6064820152608401610239565b600080866001600160a01b03168587604051610a219190610d99565b60006040518083038185875af1925050503d8060008114610a5e576040519150601f19603f3d011682016040523d82523d6000602084013e610a63565b606091505b5091509150610a7487838387610a7f565b979650505050505050565b60608315610aee578251600003610ae7576001600160a01b0385163b610ae75760405162461bcd60e51b815260206004820152601d60248201527f416464726573733a2063616c6c20746f206e6f6e2d636f6e74726163740000006044820152606401610239565b508161099c565b61099c8383815115610b035781518083602001fd5b8060405162461bcd60e51b81526004016102399190610db5565b600060208284031215610b2f57600080fd5b5035919050565b80356001600160a01b0381168114610b4d57600080fd5b919050565b600060208284031215610b6457600080fd5b610b6d82610b36565b9392505050565b600080600060408486031215610b8957600080fd5b83359250602084013567ffffffffffffffff80821115610ba857600080fd5b818601915086601f830112610bbc57600080fd5b813581811115610bcb57600080fd5b8760208260061b8501011115610be057600080fd5b6020830194508093505050509250925092565b60008060008060808587031215610c0957600080fd5b610c1285610b36565b9350610c2060208601610b36565b9250610c2e60408601610b36565b9396929550929360600135925050565b600060208284031215610c5057600080fd5b5051919050565b634e487b7160e01b600052601160045260246000fd5b8082028115828204841417610c8457610c84610c57565b92915050565b600082610ca757634e487b7160e01b600052601260045260246000fd5b500490565b634e487b7160e01b600052603260045260246000fd5b600060408284031215610cd457600080fd5b6040516040810181811067ffffffffffffffff82111715610d0557634e487b7160e01b600052604160045260246000fd5b604052610d1183610b36565b8152602083013560208201528091505092915050565b80820180821115610c8457610c84610c57565b600060018201610d4c57610d4c610c57565b5060010190565b600060208284031215610d6557600080fd5b81518015158114610b6d57600080fd5b60005b83811015610d90578181015183820152602001610d78565b50506000910152565b60008251610dab818460208701610d75565b9190910192915050565b6020815260008251806020840152610dd4816040850160208701610d75565b601f01601f1916919091016040019291505056fea2646970667358221220c7e8b508ebaffb4eaa11ba374acb0ddc2570f6351d83600979bf1f82d7cec70564736f6c63430008130033",
+                "balance": "0x0"
+            },
+            "0x0000000000000000000000000000000000001001": {
+                "code": "0x608060405234801561001057600080fd5b50600436106100e05760003560e01c80639017c127116100875780639017c127146101de578063947287cf146101f157806397e5230d146101fa578063ad240c2a14610204578063c59a18f71461020d578063c6df461714610220578063e0563ab114610233578063eb70ef441461023c57600080fd5b8063196f1b2d146100e557806323e281cf1461010b578063284017f5146101145780633b878c221461013557806349ce89971461013e57806350d5b95b1461018857806351351d531461019d578063544c5e0f146101ab575b600080fd5b6100f86100f3366004610e88565b610271565b6040519081526020015b60405180910390f35b6100f860325481565b61011d61202081565b6040516001600160a01b039091168152602001610102565b61011d61101081565b61016d61014c366004610e88565b60356020526000908152604090208054600182015460029092015490919083565b60408051938452602084019290925290820152606001610102565b61019b610196366004610eec565b6102f0565b005b61011d6002600160a01b0381565b6101ce6101b9366004610e88565b60346020526000908152604090205460ff1681565b6040519015158152602001610102565b61019b6101ec366004610f5b565b6103b7565b6100f861520881565b6100f8620249f081565b6100f860335481565b6100f861021b366004610e88565b610557565b61019b61022e366004611007565b610578565b61011d61203081565b61024f61024a366004610e88565b61075c565b6040805182518152602080840151908201529181015190820152606001610102565b60008060358161028260368661081f565b81526020810191909152604001600020600201549050806102ea5760405162461bcd60e51b815260206004820152601d60248201527f537461746552656365697665723a204e4f5f524f4f545f464f525f494400000060448201526064015b60405180910390fd5b92915050565b60006102fc823561075c565b805190915061036c906103109084356110a5565b8251602084015161032191906110a5565b61032c9060016110b8565b83604001518787876040516020016103449190611110565b604051602081830303815290604052805190602001206108cc9095949392919063ffffffff16565b6103a85760405162461bcd60e51b815260206004820152600d60248201526c24a72b20a624a22fa82927a7a360991b60448201526064016102e1565b6103b182610a68565b50505050565b8281811461041a5760405162461bcd60e51b815260206004820152602a60248201527f537461746552656365697665723a20554e4d4154434845445f4c454e4754485f604482015269504152414d455445525360b01b60648201526084016102e1565b60005b8181101561054f57600061045485858481811061043c5761043c6111ac565b905060200281019061044e91906111c2565b3561075c565b905060006105088260000151878786818110610472576104726111ac565b905060200281019061048491906111c2565b61048f9190356110a5565b835160208501516104a091906110a5565b6104ab9060016110b8565b84604001518b8b888181106104c2576104c26111ac565b90506020028101906104d491906111e2565b8b8b8a8181106104e6576104e66111ac565b90506020028101906104f891906111c2565b6040516020016103449190611110565b90508061051957505060010161041d565b61054586868581811061052e5761052e6111ac565b905060200281019061054091906111c2565b610a68565b505060010161041d565b505050505050565b6036818154811061056757600080fd5b600091825260209091200154905081565b336002600160a01b03146105bc5760405163973d02cb60e01b815260206004820152600a60248201526914d654d5115350d0531360b21b60448201526064016102e1565b6033546105ca9060016110b8565b85351461060c5760405162461bcd60e51b815260206004820152601060248201526f1253959053125117d4d510549517d25160821b60448201526064016102e1565b8435602086013510156106525760405162461bcd60e51b815260206004820152600e60248201526d1253959053125117d1539117d25160921b60448201526064016102e1565b60408051863560208083019190915287013581830152908601356060820152610697906080016040516020818303038152906040528051906020012085858585610c83565b603280548691603591600091826106ad8361122b565b90915550815260208082019290925260409081016000208335815591830135600183015582013560028201555050603680546001810182556000919091526020868101357f4a11f94e20a93c79f6ec743a1954ec4fc2c08429ae2122118bf234b2185c81b89092018290556033829055604080519088013581528735917f11efd893530b26afc66d488ff54cb15df117cb6e0e4a08c6dcb166d766c3bf3b910160405180910390a35050505050565b604080516060810182526000808252602082018190529181018290529061078460368461081f565b60365490915081036107e45760405162461bcd60e51b815260206004820152602360248201527f537461746552656365697665723a204e4f5f434f4d4d49544d454e545f464f5260448201526217d25160ea1b60648201526084016102e1565b600090815260356020908152604091829020825160608101845281548152600182015492810192909252600201549181019190915292915050565b81546000908103610832575060006102ea565b82546000905b8082101561087f57600061084c8383610d87565b6000878152602090209091508590820154111561086b57809150610879565b6108768160016110b8565b92505b50610838565b6000821180156108ab5750836108a88661089a6001866110a5565b600091825260209091200190565b54145b156108c4576108bb6001836110a5565b925050506102ea565b509392505050565b6000816108da866001610da9565b811461091f5760405162461bcd60e51b81526020600482015260146024820152730929cac82989288bea0a49e9e8cbe988a9c8ea8960631b60448201526064016102e1565b8587106109635760405162461bcd60e51b81526020600482015260126024820152710929cac82989288be988a828cbe929c888ab60731b60448201526064016102e1565b8761099f5760405162461bcd60e51b815260206004820152600c60248201526b24a72b20a624a22fa622a0a360a11b60448201526064016102e1565b8760005b82811015610a595760008686838181106109bf576109bf6111ac565b90506020020135905060028a6109d5919061125a565b600003610a0d576040805160208101859052908101829052606001604051602081830303815290604052805190602001209250610a3a565b60408051602081018390529081018490526060016040516020818303038152906040528051906020012092505b610a4560028b61126e565b99505080610a529061122b565b90506109a3565b50909414979650505050505050565b803560009081526034602052604090205460ff1615610ad85760405162461bcd60e51b815260206004820152602660248201527f537461746552656365697665723a2053544154455f53594e435f49535f50524f60448201526510d154d4d15160d21b60648201526084016102e1565b610ae86060820160408301611282565b6001600160a01b03163b600003610b3c576040805160208082526000908201819052918335917f31c652130602f3ce96ceaf8a4c2b8b49f049166c6fcf2eb31943a75ec7c936ae910160405180910390a350565b8035600090815260346020526040808220805460ff191660011790558190610b6a9060608501908501611282565b6001600160a01b03168335610b856040860160208701611282565b610b92606087018761129d565b604051602401610ba594939291906112e3565b60408051601f198184030181529181526020820180516001600160e01b031663eeb4994560e01b17905251610bda919061133c565b6000604051808303816000865af19150503d8060008114610c17576040519150601f19603f3d011682016040523d82523d6000602084013e610c1c565b606091505b509150915081610c3f5782356000908152603460205260409020805460ff191690555b81151583600001357f31c652130602f3ce96ceaf8a4c2b8b49f049166c6fcf2eb31943a75ec7c936ae83604051610c76919061134e565b60405180910390a3505050565b6000806120306001600160a01b0316620249f08888888888604051602001610caf959493929190611381565b60408051601f1981840301815290829052610cc99161133c565b6000604051808303818686fa925050503d8060008114610d05576040519150601f19603f3d011682016040523d82523d6000602084013e610d0a565b606091505b5091509150600081806020019051810190610d2591906113ba565b9050828015610d315750805b610d7d5760405162461bcd60e51b815260206004820152601d60248201527f5349474e41545552455f564552494649434154494f4e5f4641494c454400000060448201526064016102e1565b5050505050505050565b6000610d96600284841861126e565b610da2908484166110b8565b9392505050565b600080610db584610df4565b90506001836002811115610dcb57610dcb6113dc565b148015610ddb575083816001901b105b610de6576000610de9565b60015b60ff16019392505050565b600080608083901c15610e0957608092831c92015b604083901c15610e1b57604092831c92015b602083901c15610e2d57602092831c92015b601083901c15610e3f57601092831c92015b600883901c15610e5157600892831c92015b600483901c15610e6357600492831c92015b600283901c15610e7557600292831c92015b600183901c156102ea5760010192915050565b600060208284031215610e9a57600080fd5b5035919050565b60008083601f840112610eb357600080fd5b5081356001600160401b03811115610eca57600080fd5b6020830191508360208260051b8501011115610ee557600080fd5b9250929050565b600080600060408486031215610f0157600080fd5b83356001600160401b0380821115610f1857600080fd5b610f2487838801610ea1565b90955093506020860135915080821115610f3d57600080fd5b50840160808187031215610f5057600080fd5b809150509250925092565b60008060008060408587031215610f7157600080fd5b84356001600160401b0380821115610f8857600080fd5b610f9488838901610ea1565b90965094506020870135915080821115610fad57600080fd5b50610fba87828801610ea1565b95989497509550505050565b60008083601f840112610fd857600080fd5b5081356001600160401b03811115610fef57600080fd5b602083019150836020828501011115610ee557600080fd5b600080600080600085870360a081121561102057600080fd5b606081121561102e57600080fd5b5085945060608601356001600160401b038082111561104c57600080fd5b61105889838a01610fc6565b9096509450608088013591508082111561107157600080fd5b5061107e88828901610fc6565b969995985093965092949392505050565b634e487b7160e01b600052601160045260246000fd5b818103818111156102ea576102ea61108f565b808201808211156102ea576102ea61108f565b80356001600160a01b03811681146110e257600080fd5b919050565b81835281816020850137506000828201602090810191909152601f909101601f19169091010190565b60208152813560208201526000611129602084016110cb565b60018060a01b03808216604085015280611145604087016110cb565b16606085015250506060830135601e1984360301811261116457600080fd5b83016020810190356001600160401b0381111561118057600080fd5b80360382131561118f57600080fd5b6080808501526111a360a0850182846110e7565b95945050505050565b634e487b7160e01b600052603260045260246000fd5b60008235607e198336030181126111d857600080fd5b9190910192915050565b6000808335601e198436030181126111f957600080fd5b8301803591506001600160401b0382111561121357600080fd5b6020019150600581901b3603821315610ee557600080fd5b60006001820161123d5761123d61108f565b5060010190565b634e487b7160e01b600052601260045260246000fd5b60008261126957611269611244565b500690565b60008261127d5761127d611244565b500490565b60006020828403121561129457600080fd5b610da2826110cb565b6000808335601e198436030181126112b457600080fd5b8301803591506001600160401b038211156112ce57600080fd5b602001915036819003821315610ee557600080fd5b8481526001600160a01b038416602082015260606040820181905260009061130e90830184866110e7565b9695505050505050565b60005b8381101561133357818101518382015260200161131b565b50506000910152565b600082516111d8818460208701611318565b602081526000825180602084015261136d816040850160208701611318565b601f01601f19169190910160400192915050565b85815260606020820152600061139b6060830186886110e7565b82810360408401526113ae8185876110e7565b98975050505050505050565b6000602082840312156113cc57600080fd5b81518015158114610da257600080fd5b634e487b7160e01b600052602160045260246000fdfea2646970667358221220f4843af5244f1ef6b01f5d8fdd49e8f0e76508652a929df5979a03cb0156a6e864736f6c63430008130033",
+                "balance": "0x0"
+            },
+            "0x0000000000000000000000000000000000001002": {
+                "code": "0x608060405234801561001057600080fd5b50600436106100415760003560e01c806316f198311461004657806361bc221a1461005b578063a6f9885c14610076575b600080fd5b61005961005436600461017a565b61007f565b005b61006460005481565b60405190815260200160405180910390f35b61006461080081565b6001600160a01b0383166100cd5760405162461bcd60e51b815260206004820152601060248201526f24a72b20a624a22fa922a1a2a4ab22a960811b60448201526064015b60405180910390fd5b6108008111156101145760405162461bcd60e51b815260206004820152601260248201527108ab0868a8a88a6be9a82b0be988a9c8ea8960731b60448201526064016100c4565b826001600160a01b0316336001600160a01b031660008081546101369061020b565b9190508190557fedaf3c471ebd67d60c29efe34b639ede7d6a1d92eaeb3f503e784971e67118a5858560405161016d929190610232565b60405180910390a4505050565b60008060006040848603121561018f57600080fd5b83356001600160a01b03811681146101a657600080fd5b9250602084013567ffffffffffffffff808211156101c357600080fd5b818601915086601f8301126101d757600080fd5b8135818111156101e657600080fd5b8760208285010111156101f857600080fd5b6020830194508093505050509250925092565b60006001820161022b57634e487b7160e01b600052601160045260246000fd5b5060010190565b60208152816020820152818360408301376000818301604090810191909152601f909201601f1916010191905056fea26469706673582212207637618450354edc5d98998425a0a6500ada60d0a9d2cdc5b2045e291fd737f264736f6c63430008130033",
+                "balance": "0x0"
+            },
+            "0x0000000000000000000000000000000000001003": {
+                "code": "0x608060405234801561001057600080fd5b50600436106101215760003560e01c806340c10f19116100ad578063a457c2d711610071578063a457c2d71461028b578063a9059cbb1461029e578063dd62ed3e146102b1578063e6198705146102c4578063f6d2ee86146102d557600080fd5b806340c10f191461021f57806370a082311461023257806395d89b411461025b5780639b77ef11146102635780639dc29fac1461027857600080fd5b80631f2d0065116100f45780631f2d00651461018c57806323b872dd146101b15780632d0335ab146101c4578063313ce567146101ed578063395093511461020c57600080fd5b806306fdde0314610126578063095ea7b3146101445780630c53c51c1461016757806318160ddd1461017a575b600080fd5b61012e6102e8565b60405161013b91906113b6565b60405180910390f35b6101576101523660046113ec565b61037a565b604051901515815260200161013b565b61012e610175366004611470565b61039e565b603c545b60405190815260200161013b565b606d546001600160a01b03165b6040516001600160a01b03909116815260200161013b565b6101576101bf3660046114e6565b610681565b61017e6101d2366004611522565b6001600160a01b031660009081526006602052604090205490565b606d54600160a01b900460ff1660405160ff909116815260200161013b565b61015761021a3660046113ec565b6106af565b61015761022d3660046113ec565b6106db565b61017e610240366004611522565b6001600160a01b03166000908152603a602052604090205490565b61012e61071b565b61027661027136600461153d565b61072a565b005b6101576102863660046113ec565b610751565b6101576102993660046113ec565b610788565b6101576102ac3660046113ec565b61080e565b61017e6102bf366004611556565b610826565b606c546001600160a01b0316610199565b6102766102e3366004611589565b610851565b6060603d80546102f79061160d565b80601f01602080910402602001604051908101604052809291908181526020018280546103239061160d565b80156103705780601f1061034557610100808354040283529160200191610370565b820191906000526020600020905b81548152906001019060200180831161035357829003601f168201915b5050505050905090565b600080610385610ad1565b9050610392818585610ae0565b60019150505b92915050565b606060006103e187878080601f016020809104026020016040519081016040528093929190818152602001838380828437600092019190915250610c0592505050565b90506001600160e01b031960003581169082160361046c5760405162461bcd60e51b815260206004820152603d60248201527f66756e6374696f6e5369676e61747572652063616e206e6f74206265206f662060448201527f657865637574654d6574615472616e73616374696f6e206d6574686f6400000060648201526084015b60405180910390fd5b604080516060810182526001600160a01b038a16600081815260066020908152848220548452808401929092528351601f8b0183900483028101830185528a815290938301918b908b9081908401838280828437600092019190915250505091525090506104dd8982888888610c20565b6105335760405162461bcd60e51b815260206004820152602160248201527f5369676e657220616e64207369676e617475726520646f206e6f74206d6174636044820152600d60fb1b6064820152608401610463565b600660008a6001600160a01b03166001600160a01b031681526020019081526020016000206000815460010191905081905550600080306001600160a01b03168a8a8d60405160200161058893929190611647565b60408051601f19818403018152908290526105a29161166d565b6000604051808303816000865af19150503d80600081146105df576040519150601f19603f3d011682016040523d82523d6000602084013e6105e4565b606091505b5091509150816106365760405162461bcd60e51b815260206004820152601c60248201527f46756e6374696f6e2063616c6c206e6f74207375636365737366756c000000006044820152606401610463565b7f5845892132946850460bff5a0083f71031bc5bf9aadcd40f1de79423eac9b10b8b338c8c60405161066b9493929190611689565b60405180910390a19a9950505050505050505050565b60008061068c610ad1565b9050610699858285610cfc565b6106a4858585610d76565b506001949350505050565b6000806106ba610ad1565b90506103928185856106cc8589610826565b6106d691906116d5565b610ae0565b606c546000906001600160a01b031633146107085760405162461bcd60e51b8152600401610463906116f6565b6107128383610f0f565b50600192915050565b6060603e80546102f79061160d565b33600090815260066020526040812080548392906107499084906116d5565b909155505050565b606c546000906001600160a01b0316331461077e5760405162461bcd60e51b8152600401610463906116f6565b6107128383610fbf565b600080610793610ad1565b905060006107a18286610826565b9050838110156108015760405162461bcd60e51b815260206004820152602560248201527f45524332303a2064656372656173656420616c6c6f77616e63652062656c6f77604482015264207a65726f60d81b6064820152608401610463565b6106a48286868403610ae0565b600080610819610ad1565b9050610392818585610d76565b6001600160a01b039182166000908152603b6020908152604080832093909416825291909152205490565b600754610100900460ff16158080156108715750600754600160ff909116105b8061088b5750303b15801561088b575060075460ff166001145b6108ee5760405162461bcd60e51b815260206004820152602e60248201527f496e697469616c697a61626c653a20636f6e747261637420697320616c72656160448201526d191e481a5b9a5d1a585b1a5e995960921b6064820152608401610463565b6007805460ff191660011790558015610911576007805461ff0019166101001790555b6001600160a01b0387161580159061092857508415155b801561093357508215155b61097f5760405162461bcd60e51b815260206004820152601e60248201527f4368696c6445524332303a204241445f494e495449414c495a4154494f4e00006044820152606401610463565b606d805460ff8416600160a01b026001600160a81b03199091166001600160a01b038a1617179055606c80546001600160a01b03191633179055604080516020601f8801819004810282018101909252868152610a2a91889088908190840183828082843760009201919091525050604080516020601f8a0181900481028201810190925288815292508891508790819084018382808284376000920191909152506110de92505050565b610a8286868080601f016020809104026020016040519081016040528093929190818152602001838380828437600092019190915250506040805180820190915260018152603160f81b6020820152915061110f9050565b8015610ac8576007805461ff0019169055604051600181527f7f26b83ff96e1f2b6a682f133852f6798a09c465da95921460cefb38474024989060200160405180910390a15b50505050505050565b6000610adb61117b565b905090565b6001600160a01b038316610b425760405162461bcd60e51b8152602060048201526024808201527f45524332303a20617070726f76652066726f6d20746865207a65726f206164646044820152637265737360e01b6064820152608401610463565b6001600160a01b038216610ba35760405162461bcd60e51b815260206004820152602260248201527f45524332303a20617070726f766520746f20746865207a65726f206164647265604482015261737360f01b6064820152608401610463565b6001600160a01b038381166000818152603b602090815260408083209487168084529482529182902085905590518481527f8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b92591015b60405180910390a3505050565b60008151600003610c1857506000919050565b506020015190565b6000806001610c36610c31886111d7565b611254565b6040805160008152602081018083529290925260ff861690820152606081018790526080810186905260a0016020604051602081039080840390855afa158015610c84573d6000803e3d6000fd5b5050604051601f1901519150506001600160a01b038116610cdb5760405162461bcd60e51b8152602060048201526011602482015270496e76616c6964207369676e617475726560781b6044820152606401610463565b866001600160a01b0316816001600160a01b03161491505095945050505050565b6000610d088484610826565b90506000198114610d705781811015610d635760405162461bcd60e51b815260206004820152601d60248201527f45524332303a20696e73756666696369656e7420616c6c6f77616e63650000006044820152606401610463565b610d708484848403610ae0565b50505050565b6001600160a01b038316610dda5760405162461bcd60e51b815260206004820152602560248201527f45524332303a207472616e736665722066726f6d20746865207a65726f206164604482015264647265737360d81b6064820152608401610463565b6001600160a01b038216610e3c5760405162461bcd60e51b815260206004820152602360248201527f45524332303a207472616e7366657220746f20746865207a65726f206164647260448201526265737360e81b6064820152608401610463565b6001600160a01b0383166000908152603a602052604090205481811015610eb45760405162461bcd60e51b815260206004820152602660248201527f45524332303a207472616e7366657220616d6f756e7420657863656564732062604482015265616c616e636560d01b6064820152608401610463565b6001600160a01b038085166000818152603a602052604080822086860390559286168082529083902080548601905591516000805160206118ec83398151915290610f029086815260200190565b60405180910390a3610d70565b6001600160a01b038216610f655760405162461bcd60e51b815260206004820152601f60248201527f45524332303a206d696e7420746f20746865207a65726f2061646472657373006044820152606401610463565b80603c6000828254610f7791906116d5565b90915550506001600160a01b0382166000818152603a60209081526040808320805486019055518481526000805160206118ec833981519152910160405180910390a35b5050565b6001600160a01b03821661101f5760405162461bcd60e51b815260206004820152602160248201527f45524332303a206275726e2066726f6d20746865207a65726f206164647265736044820152607360f81b6064820152608401610463565b6001600160a01b0382166000908152603a6020526040902054818110156110935760405162461bcd60e51b815260206004820152602260248201527f45524332303a206275726e20616d6f756e7420657863656564732062616c616e604482015261636560f01b6064820152608401610463565b6001600160a01b0383166000818152603a602090815260408083208686039055603c80548790039055518581529192916000805160206118ec8339815191529101610bf8565b505050565b600754610100900460ff166111055760405162461bcd60e51b815260040161046390611739565b610fbb82826112a2565b815160208084019190912082519183019190912060038290556004819055466001557f8b73c3c69bb8fe3d512ecc4cf759cc79239f7b179b0ffacaa9a75d522b39400f61115d8184846112e2565b600055600280546001600160a01b0319163017905560055550505050565b60003033036111d157600080368080601f0160208091040260200160405190810160405280939291908181526020018383808284376000920191909152505050503601516001600160a01b031691506111d49050565b50335b90565b60006040518060800160405280604381526020016118a96043913980516020918201208351848301516040808701518051908601209051611237950193845260208401929092526001600160a01b03166040830152606082015260800190565b604051602081830303815290604052805190602001209050919050565b600061039861126161132b565b8360405161190160f01b6020820152602281018390526042810182905260009060620160405160208183030381529060405280519060200120905092915050565b600754610100900460ff166112c95760405162461bcd60e51b815260040161046390611739565b603d6112d583826117e8565b50603e6110d982826117e8565b6040805160208101859052908101839052606081018290524660808201523060a082015260009060c0016040516020818303038152906040528051906020012090509392505050565b6002546000906001600160a01b031630148015611349575060015446145b15611355575060005490565b610adb6005546003546004546112e2565b60005b83811015611381578181015183820152602001611369565b50506000910152565b600081518084526113a2816020860160208601611366565b601f01601f19169290920160200192915050565b6020815260006113c9602083018461138a565b9392505050565b80356001600160a01b03811681146113e757600080fd5b919050565b600080604083850312156113ff57600080fd5b611408836113d0565b946020939093013593505050565b60008083601f84011261142857600080fd5b50813567ffffffffffffffff81111561144057600080fd5b60208301915083602082850101111561145857600080fd5b9250929050565b803560ff811681146113e757600080fd5b60008060008060008060a0878903121561148957600080fd5b611492876113d0565b9550602087013567ffffffffffffffff8111156114ae57600080fd5b6114ba89828a01611416565b90965094505060408701359250606087013591506114da6080880161145f565b90509295509295509295565b6000806000606084860312156114fb57600080fd5b611504846113d0565b9250611512602085016113d0565b9150604084013590509250925092565b60006020828403121561153457600080fd5b6113c9826113d0565b60006020828403121561154f57600080fd5b5035919050565b6000806040838503121561156957600080fd5b611572836113d0565b9150611580602084016113d0565b90509250929050565b600080600080600080608087890312156115a257600080fd5b6115ab876113d0565b9550602087013567ffffffffffffffff808211156115c857600080fd5b6115d48a838b01611416565b909750955060408901359150808211156115ed57600080fd5b506115fa89828a01611416565b90945092506114da90506060880161145f565b600181811c9082168061162157607f821691505b60208210810361164157634e487b7160e01b600052602260045260246000fd5b50919050565b8284823760609190911b6bffffffffffffffffffffffff19169101908152601401919050565b6000825161167f818460208701611366565b9190910192915050565b6001600160a01b0385811682528416602082015260606040820181905281018290526000828460808401376000608084840101526080601f19601f850116830101905095945050505050565b8082018082111561039857634e487b7160e01b600052601160045260246000fd5b60208082526023908201527f4368696c6445524332303a204f6e6c79207072656469636174652063616e2063604082015262185b1b60ea1b606082015260800190565b6020808252602b908201527f496e697469616c697a61626c653a20636f6e7472616374206973206e6f74206960408201526a6e697469616c697a696e6760a81b606082015260800190565b634e487b7160e01b600052604160045260246000fd5b601f8211156110d957600081815260208120601f850160051c810160208610156117c15750805b601f850160051c820191505b818110156117e0578281556001016117cd565b505050505050565b815167ffffffffffffffff81111561180257611802611784565b61181681611810845461160d565b8461179a565b602080601f83116001811461184b57600084156118335750858301515b600019600386901b1c1916600185901b1785556117e0565b600085815260208120601f198616915b8281101561187a5788860151825594840194600190910190840161185b565b50858210156118985787850151600019600388901b60f8161c191681555b5050505050600190811b0190555056fe4d6574615472616e73616374696f6e2875696e74323536206e6f6e63652c616464726573732066726f6d2c62797465732066756e6374696f6e5369676e617475726529ddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3efa264697066735822122061cd8aae15b13c732c17323e6cfe2f585db1ab74b2c3384cbb12626088d7caa964736f6c63430008130033",
+                "balance": "0x0"
+            },
+            "0x0000000000000000000000000000000000001004": {
+                "code": "0x608060405234801561001057600080fd5b50600436106101165760003560e01c806397e5230d116100a2578063d41f177111610071578063d41f17711461023d578063e0563ab114610264578063eeb499451461026d578063f3fef3a314610280578063f64512551461029357600080fd5b806397e5230d146101e6578063b1768065146101f0578063b68ad1e414610217578063c3b35a7e1461022a57600080fd5b80633b878c22116100e95780633b878c221461017c57806351351d531461018557806371cf93b7146101935780637efab4f5146101a6578063947287cf146101cf57600080fd5b806305dc2e8f1461011b5780631459457a1461014b5780631bc114ba14610160578063284017f514610173575b600080fd5b60345461012e906001600160a01b031681565b6040516001600160a01b0390911681526020015b60405180910390f35b61015e610159366004610f98565b6102ba565b005b60335461012e906001600160a01b031681565b61012e61202081565b61012e61101081565b61012e6002600160a01b0381565b60355461012e906001600160a01b031681565b61012e6101b4366004611009565b6037602052600090815260409020546001600160a01b031681565b6101d861520881565b604051908152602001610142565b6101d8620249f081565b6101d87f7a8dc26796a1e50e6e190b70259f58f6a4edd5b22280ceecc82b687b8e98286981565b60365461012e906001600160a01b031681565b61015e61023836600461102d565b61055a565b6101d87f87a7811f4bfedea3d341ad165680ae306b01aaeacc205d227629cf157dd9f82181565b61012e61203081565b61015e61027b36600461106e565b61056a565b61015e61028e3660046110f7565b61073e565b6101d87f2cef46a936bdc5b7e6e8c71aa04560c41cf7d88bb26901a7e7f4936ff02accad81565b336002600160a01b03146103035760405163973d02cb60e01b815260206004820152600a60248201526914d654d5115350d0531360b21b60448201526064015b60405180910390fd5b600054610100900460ff16158080156103235750600054600160ff909116105b8061033d5750303b15801561033d575060005460ff166001145b6103a05760405162461bcd60e51b815260206004820152602e60248201527f496e697469616c697a61626c653a20636f6e747261637420697320616c72656160448201526d191e481a5b9a5d1a585b1a5e995960921b60648201526084016102fa565b6000805460ff1916600117905580156103c3576000805461ff0019166101001790555b6001600160a01b038616158015906103e357506001600160a01b03851615155b80156103f757506001600160a01b03841615155b801561040b57506001600160a01b03831615155b6104675760405162461bcd60e51b815260206004820152602760248201527f4368696c6445524332305072656469636174653a204241445f494e495449414c60448201526624ad20aa24a7a760c91b60648201526084016102fa565b603380546001600160a01b03199081166001600160a01b03898116919091179092556034805482168884161790556035805482168784161790556036805490911685831617905582161561050c576001600160a01b03821660008181526037602052604080822080546001600160a01b03191661101090811790915590519092917f46bd56f98e1b14fd35691959270a6e1edf7cb8fcd489e0f9dda89e46c0d1ff0d91a35b8015610552576000805461ff0019169055604051600181527f7f26b83ff96e1f2b6a682f133852f6798a09c465da95921460cefb38474024989060200160405180910390a15b505050505050565b61056583838361074d565b505050565b6034546001600160a01b031633146105d55760405162461bcd60e51b815260206004820152602860248201527f4368696c6445524332305072656469636174653a204f4e4c595f53544154455f6044820152672922a1a2a4ab22a960c11b60648201526084016102fa565b6035546001600160a01b038481169116146106435760405162461bcd60e51b815260206004820152602860248201527f4368696c6445524332305072656469636174653a204f4e4c595f524f4f545f50604482015267524544494341544560c01b60648201526084016102fa565b7f87a7811f4bfedea3d341ad165680ae306b01aaeacc205d227629cf157dd9f821610672602060008486611123565b61067b9161114d565b0361069a576106956106908260208186611123565b610ac3565b610738565b7f2cef46a936bdc5b7e6e8c71aa04560c41cf7d88bb26901a7e7f4936ff02accad6106c9602060008486611123565b6106d29161114d565b036106e1576106958282610d6e565b60405162461bcd60e51b815260206004820152602660248201527f4368696c6445524332305072656469636174653a20494e56414c49445f5349476044820152654e415455524560d01b60648201526084016102fa565b50505050565b61074982338361074d565b5050565b826001600160a01b03163b6000036107b15760405162461bcd60e51b815260206004820152602160248201527f4368696c6445524332305072656469636174653a204e4f545f434f4e545241436044820152601560fa1b60648201526084016102fa565b6000836001600160a01b0316631f2d00656040518163ffffffff1660e01b8152600401602060405180830381865afa1580156107f1573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610815919061116b565b6001600160a01b038181166000908152603760205260409020549192508581169116146108545760405162461bcd60e51b81526004016102fa90611188565b6001600160a01b03811661086a5761086a6111cb565b306001600160a01b0316846001600160a01b031663e61987056040518163ffffffff1660e01b8152600401602060405180830381865afa1580156108b2573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906108d6919061116b565b6001600160a01b0316146108ec576108ec6111cb565b604051632770a7eb60e21b81526001600160a01b03851690639dc29fac9061091a90339086906004016111e1565b6020604051808303816000875af1158015610939573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061095d91906111fa565b6109a95760405162461bcd60e51b815260206004820181905260248201527f4368696c6445524332305072656469636174653a204255524e5f4641494c454460448201526064016102fa565b603354603554604080517f7a8dc26796a1e50e6e190b70259f58f6a4edd5b22280ceecc82b687b8e98286960208201526001600160a01b0385811682840152336060830152878116608083015260a08083018890528351808403909101815260c08301938490526316f1983160e01b909352938416936316f1983193610a349391169160c401611262565b600060405180830381600087803b158015610a4e57600080fd5b505af1158015610a62573d6000803e3d6000fd5b50505050826001600160a01b0316846001600160a01b0316826001600160a01b03167fa0923f060a16fc784558d43de424ffde7b01643de5e5d335851b9df94c76bb273386604051610ab59291906111e1565b60405180910390a450505050565b6000808080610ad48587018761128e565b6001600160a01b0380851660009081526037602052604090205494985092965090945092501680610b175760405162461bcd60e51b81526004016102fa90611188565b806001600160a01b03163b600003610b3157610b316111cb565b6000816001600160a01b0316631f2d00656040518163ffffffff1660e01b8152600401602060405180830381865afa158015610b71573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610b95919061116b565b9050856001600160a01b0316816001600160a01b031614610bb857610bb86111cb565b6001600160a01b038116610bce57610bce6111cb565b306001600160a01b0316826001600160a01b031663e61987056040518163ffffffff1660e01b8152600401602060405180830381865afa158015610c16573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610c3a919061116b565b6001600160a01b031614610c5057610c506111cb565b6040516340c10f1960e01b81526001600160a01b038316906340c10f1990610c7e90879087906004016111e1565b6020604051808303816000875af1158015610c9d573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610cc191906111fa565b610d0d5760405162461bcd60e51b815260206004820181905260248201527f4368696c6445524332305072656469636174653a204d494e545f4641494c454460448201526064016102fa565b836001600160a01b0316826001600160a01b0316876001600160a01b03167fdf34f3a3ed8bedc14a4b284ebaee5374d55b64bac6a84c270dabe8fd6b4cdafd8887604051610d5c9291906111e1565b60405180910390a45050505050505050565b6000808080610d7f85870187611382565b92975090955093509150506001600160a01b038416610da057610da06111cb565b6001600160a01b038481166000908152603760205260409020541615610dc857610dc86111cb565b6036546040516bffffffffffffffffffffffff19606087901b166020820152600091610e18916001600160a01b039091169060340160405160208183030381529060405280519060200120610ee3565b6001600160a01b038681166000908152603760205260409081902080546001600160a01b031916928416928317905551637b69774360e11b81529192509063f6d2ee8690610e7090889088908890889060040161140f565b600060405180830381600087803b158015610e8a57600080fd5b505af1158015610e9e573d6000803e3d6000fd5b50506040516001600160a01b038085169350881691507f46bd56f98e1b14fd35691959270a6e1edf7cb8fcd489e0f9dda89e46c0d1ff0d90600090a350505050505050565b6000763d602d80600a3d3981f3363d3d373d3d3d363d730000008360601b60e81c176000526e5af43d82803e903d91602b57fd5bf38360781b1760205281603760096000f590506001600160a01b038116610f7a5760405162461bcd60e51b8152602060048201526017602482015276115490cc4c4d8dce8818dc99585d194c8819985a5b1959604a1b60448201526064016102fa565b92915050565b6001600160a01b0381168114610f9557600080fd5b50565b600080600080600060a08688031215610fb057600080fd5b8535610fbb81610f80565b94506020860135610fcb81610f80565b93506040860135610fdb81610f80565b92506060860135610feb81610f80565b91506080860135610ffb81610f80565b809150509295509295909350565b60006020828403121561101b57600080fd5b813561102681610f80565b9392505050565b60008060006060848603121561104257600080fd5b833561104d81610f80565b9250602084013561105d81610f80565b929592945050506040919091013590565b6000806000806060858703121561108457600080fd5b84359350602085013561109681610f80565b9250604085013567ffffffffffffffff808211156110b357600080fd5b818701915087601f8301126110c757600080fd5b8135818111156110d657600080fd5b8860208285010111156110e857600080fd5b95989497505060200194505050565b6000806040838503121561110a57600080fd5b823561111581610f80565b946020939093013593505050565b6000808585111561113357600080fd5b8386111561114057600080fd5b5050820193919092039150565b80356020831015610f7a57600019602084900360031b1b1692915050565b60006020828403121561117d57600080fd5b815161102681610f80565b60208082526023908201527f4368696c6445524332305072656469636174653a20554e4d41505045445f544f60408201526225a2a760e91b606082015260800190565b634e487b7160e01b600052600160045260246000fd5b6001600160a01b03929092168252602082015260400190565b60006020828403121561120c57600080fd5b8151801515811461102657600080fd5b6000815180845260005b8181101561124257602081850181015186830182015201611226565b506000602082860101526020601f19601f83011685010191505092915050565b6001600160a01b03831681526040602082018190526000906112869083018461121c565b949350505050565b600080600080608085870312156112a457600080fd5b84356112af81610f80565b935060208501356112bf81610f80565b925060408501356112cf81610f80565b9396929550929360600135925050565b634e487b7160e01b600052604160045260246000fd5b600082601f83011261130657600080fd5b813567ffffffffffffffff80821115611321576113216112df565b604051601f8301601f19908116603f01168101908282118183101715611349576113496112df565b8160405283815286602085880101111561136257600080fd5b836020870160208301376000602085830101528094505050505092915050565b600080600080600060a0868803121561139a57600080fd5b8535945060208601356113ac81610f80565b9350604086013567ffffffffffffffff808211156113c957600080fd5b6113d589838a016112f5565b945060608801359150808211156113eb57600080fd5b506113f8888289016112f5565b925050608086013560ff81168114610ffb57600080fd5b6001600160a01b03851681526080602082018190526000906114339083018661121c565b8281036040840152611445818661121c565b91505060ff831660608301529594505050505056fea2646970667358221220040c22d73fe8215d2218893f5a7f6ab5ca23133aaf1f7ef7a037b72f1d8fea6d64736f6c63430008130033",
+                "balance": "0x0"
+            },
+            "0x0000000000000000000000000000000000001005": {
+                "code": "0x608060405234801561001057600080fd5b506004361061014d5760003560e01c806370a08231116100c3578063a22cb4651161007c578063a22cb465146102dd578063b2dc5dc3146102f0578063b88d4fde14610303578063c87b56dd14610316578063e619870514610329578063e985e9c51461033a57600080fd5b806370a08231146102765780637c88e3d914610289578063906571471461029c57806395d89b41146102af5780639b77ef11146102b75780639dc29fac146102ca57600080fd5b80631f2d0065116101155780631f2d0065146101e257806323b872dd146101f35780632d0335ab1461020657806340c10f191461023d57806342842e0e146102505780636352211e1461026357600080fd5b806301ffc9a71461015257806306fdde031461017a578063081812fc1461018f578063095ea7b3146101ba5780630c53c51c146101cf575b600080fd5b610165610160366004611a8c565b61034d565b60405190151581526020015b60405180910390f35b61018261039f565b6040516101719190611af9565b6101a261019d366004611b0c565b610431565b6040516001600160a01b039091168152602001610171565b6101cd6101c8366004611b41565b610458565b005b6101826101dd366004611bb3565b610584565b609f546001600160a01b03166101a2565b6101cd610201366004611c32565b610862565b61022f610214366004611c6e565b6001600160a01b031660009081526006602052604090205490565b604051908152602001610171565b61016561024b366004611b41565b61089a565b6101cd61025e366004611c32565b6108da565b6101a2610271366004611b0c565b6108f5565b61022f610284366004611c6e565b61092a565b610165610297366004611ccd565b6109b0565b6101cd6102aa366004611d38565b610a97565b610182610d05565b6101cd6102c5366004611b0c565b610d14565b6101656102d8366004611b41565b610d3b565b6101cd6102eb366004611db8565b610daa565b6101656102fe366004611df4565b610dc0565b6101cd610311366004611e5c565b610e6d565b610182610324366004611b0c565b610eac565b609e546001600160a01b03166101a2565b610165610348366004611f37565b610f20565b60006001600160e01b031982166380ac58cd60e01b148061037e57506001600160e01b03198216635b5e139f60e01b145b8061039957506301ffc9a760e01b6001600160e01b03198316145b92915050565b6060606c80546103ae90611f6a565b80601f01602080910402602001604051908101604052809291908181526020018280546103da90611f6a565b80156104275780601f106103fc57610100808354040283529160200191610427565b820191906000526020600020905b81548152906001019060200180831161040a57829003601f168201915b5050505050905090565b600061043c82610f4e565b506000908152607060205260409020546001600160a01b031690565b6000610463826108f5565b9050806001600160a01b0316836001600160a01b0316036104d55760405162461bcd60e51b815260206004820152602160248201527f4552433732313a20617070726f76616c20746f2063757272656e74206f776e656044820152603960f91b60648201526084015b60405180910390fd5b806001600160a01b03166104e7610f76565b6001600160a01b03161480610503575061050381610348610f76565b6105755760405162461bcd60e51b815260206004820152603d60248201527f4552433732313a20617070726f76652063616c6c6572206973206e6f7420746f60448201527f6b656e206f776e6572206f7220617070726f76656420666f7220616c6c00000060648201526084016104cc565b61057f8383610f85565b505050565b606060006105c787878080601f016020809104026020016040519081016040528093929190818152602001838380828437600092019190915250610ff392505050565b90506001600160e01b031960003581169082160361064d5760405162461bcd60e51b815260206004820152603d60248201527f66756e6374696f6e5369676e61747572652063616e206e6f74206265206f662060448201527f657865637574654d6574615472616e73616374696f6e206d6574686f6400000060648201526084016104cc565b604080516060810182526001600160a01b038a16600081815260066020908152848220548452808401929092528351601f8b0183900483028101830185528a815290938301918b908b9081908401838280828437600092019190915250505091525090506106be898288888861100e565b6107145760405162461bcd60e51b815260206004820152602160248201527f5369676e657220616e64207369676e617475726520646f206e6f74206d6174636044820152600d60fb1b60648201526084016104cc565b600660008a6001600160a01b03166001600160a01b031681526020019081526020016000206000815460010191905081905550600080306001600160a01b03168a8a8d60405160200161076993929190611fa4565b60408051601f198184030181529082905261078391611fca565b6000604051808303816000865af19150503d80600081146107c0576040519150601f19603f3d011682016040523d82523d6000602084013e6107c5565b606091505b5091509150816108175760405162461bcd60e51b815260206004820152601c60248201527f46756e6374696f6e2063616c6c206e6f74207375636365737366756c0000000060448201526064016104cc565b7f5845892132946850460bff5a0083f71031bc5bf9aadcd40f1de79423eac9b10b8b338c8c60405161084c9493929190611fe6565b60405180910390a19a9950505050505050505050565b61087361086d610f76565b826110ea565b61088f5760405162461bcd60e51b81526004016104cc90612032565b61057f838383611148565b609e546000906001600160a01b031633146108c75760405162461bcd60e51b81526004016104cc9061207f565b6108d1838361129a565b50600192915050565b61057f83838360405180602001604052806000815250610e6d565b6000818152606e60205260408120546001600160a01b0316806103995760405162461bcd60e51b81526004016104cc906120c3565b60006001600160a01b0382166109945760405162461bcd60e51b815260206004820152602960248201527f4552433732313a2061646472657373207a65726f206973206e6f7420612076616044820152683634b21037bbb732b960b91b60648201526084016104cc565b506001600160a01b03166000908152606f602052604090205490565b609e546000906001600160a01b031633146109dd5760405162461bcd60e51b81526004016104cc9061207f565b83828114610a2d5760405162461bcd60e51b815260206004820152601f60248201527f4368696c644552433732313a204172726179206c656e206d69736d617463680060448201526064016104cc565b60005b81811015610a8857610a80878783818110610a4d57610a4d6120f5565b9050602002016020810190610a629190611c6e565b868684818110610a7457610a746120f5565b9050602002013561129a565b600101610a30565b5060019150505b949350505050565b600754610100900460ff1615808015610ab75750600754600160ff909116105b80610ad15750303b158015610ad1575060075460ff166001145b610b345760405162461bcd60e51b815260206004820152602e60248201527f496e697469616c697a61626c653a20636f6e747261637420697320616c72656160448201526d191e481a5b9a5d1a585b1a5e995960921b60648201526084016104cc565b6007805460ff191660011790558015610b57576007805461ff0019166101001790555b6001600160a01b03861615801590610b6e57508315155b8015610b7957508115155b610bc55760405162461bcd60e51b815260206004820152601f60248201527f4368696c644552433732313a2042616420696e697469616c697a6174696f6e0060448201526064016104cc565b609f80546001600160a01b0388166001600160a01b031991821617909155609e805490911633179055604080516020601f8701819004810282018101909252858152610c5f91879087908190840183828082843760009201919091525050604080516020601f890181900481028201810190925287815292508791508690819084018382808284376000920191909152506112b492505050565b610cb785858080601f016020809104026020016040519081016040528093929190818152602001838380828437600092019190915250506040805180820190915260018152603160f81b602082015291506112e59050565b8015610cfd576007805461ff0019169055604051600181527f7f26b83ff96e1f2b6a682f133852f6798a09c465da95921460cefb38474024989060200160405180910390a15b505050505050565b6060606d80546103ae90611f6a565b3360009081526006602052604081208054839290610d3390849061210b565b909155505050565b609e546000906001600160a01b03163314610d685760405162461bcd60e51b81526004016104cc9061207f565b610d71826108f5565b6001600160a01b0316836001600160a01b031614610da15760405162461bcd60e51b81526004016104cc9061212c565b6108d182611351565b610dbc610db5610f76565b83836113d4565b5050565b609e546000906001600160a01b03163314610ded5760405162461bcd60e51b81526004016104cc9061207f565b8160005b81811015610e61576000858583818110610e0d57610e0d6120f5565b905060200201359050610e1f816108f5565b6001600160a01b0316876001600160a01b031614610e4f5760405162461bcd60e51b81526004016104cc9061212c565b610e5881611351565b50600101610df1565b50600195945050505050565b610e7e610e78610f76565b836110ea565b610e9a5760405162461bcd60e51b81526004016104cc90612032565b610ea68484848461149e565b50505050565b6060610eb782610f4e565b6000610ece60408051602081019091526000815290565b90506000815111610eee5760405180602001604052806000815250610f19565b80610ef8846114d1565b604051602001610f09929190612161565b6040516020818303038152906040525b9392505050565b6001600160a01b03918216600090815260716020908152604080832093909416825291909152205460ff1690565b610f5781611563565b610f735760405162461bcd60e51b81526004016104cc906120c3565b50565b6000610f80611580565b905090565b600081815260706020526040902080546001600160a01b0319166001600160a01b0384169081179091558190610fba826108f5565b6001600160a01b03167f8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b92560405160405180910390a45050565b6000815160000361100657506000919050565b506020015190565b600080600161102461101f886115dc565b611659565b6040805160008152602081018083529290925260ff861690820152606081018790526080810186905260a0016020604051602081039080840390855afa158015611072573d6000803e3d6000fd5b5050604051601f1901519150506001600160a01b0381166110c95760405162461bcd60e51b8152602060048201526011602482015270496e76616c6964207369676e617475726560781b60448201526064016104cc565b866001600160a01b0316816001600160a01b03161491505095945050505050565b6000806110f6836108f5565b9050806001600160a01b0316846001600160a01b0316148061111d575061111d8185610f20565b80610a8f5750836001600160a01b031661113684610431565b6001600160a01b031614949350505050565b826001600160a01b031661115b826108f5565b6001600160a01b0316146111815760405162461bcd60e51b81526004016104cc90612190565b6001600160a01b0382166111e35760405162461bcd60e51b8152602060048201526024808201527f4552433732313a207472616e7366657220746f20746865207a65726f206164646044820152637265737360e01b60648201526084016104cc565b826001600160a01b03166111f6826108f5565b6001600160a01b03161461121c5760405162461bcd60e51b81526004016104cc90612190565b600081815260706020908152604080832080546001600160a01b03199081169091556001600160a01b03878116808652606f8552838620805460001901905590871680865283862080546001019055868652606e909452828520805490921684179091559051849360008051602061244c83398151915291a4505050565b610dbc8282604051806020016040528060008152506116a7565b600754610100900460ff166112db5760405162461bcd60e51b81526004016104cc906121d5565b610dbc82826116da565b815160208084019190912082519183019190912060038290556004819055466001557f8b73c3c69bb8fe3d512ecc4cf759cc79239f7b179b0ffacaa9a75d522b39400f61133381848461171a565b600055600280546001600160a01b0319163017905560055550505050565b600061135c826108f5565b9050611367826108f5565b600083815260706020908152604080832080546001600160a01b03199081169091556001600160a01b038516808552606f84528285208054600019019055878552606e9093528184208054909116905551929350849260008051602061244c833981519152908390a45050565b816001600160a01b0316836001600160a01b0316036114315760405162461bcd60e51b815260206004820152601960248201527822a9219b99189d1030b8383937bb32903a379031b0b63632b960391b60448201526064016104cc565b6001600160a01b03838116600081815260716020908152604080832094871680845294825291829020805460ff191686151590811790915591519182527f17307eab39ab6107e8899845ad3d59bd9653f200f220920489ca2b5937696c31910160405180910390a3505050565b6114a9848484611148565b6114b584848484611763565b610ea65760405162461bcd60e51b81526004016104cc90612220565b606060006114de83611868565b60010190506000816001600160401b038111156114fd576114fd611e46565b6040519080825280601f01601f191660200182016040528015611527576020820181803683370190505b5090508181016020015b600019016f181899199a1a9b1b9c1cb0b131b232b360811b600a86061a8153600a850494508461153157509392505050565b6000908152606e60205260409020546001600160a01b0316151590565b60003033036115d657600080368080601f0160208091040260200160405190810160405280939291908181526020018383808284376000920191909152505050503601516001600160a01b031691506115d99050565b50335b90565b6000604051806080016040528060438152602001612409604391398051602091820120835184830151604080870151805190860120905161163c950193845260208401929092526001600160a01b03166040830152606082015260800190565b604051602081830303815290604052805190602001209050919050565b6000610399611666611940565b8360405161190160f01b6020820152602281018390526042810182905260009060620160405160208183030381529060405280519060200120905092915050565b6116b1838361197b565b6116be6000848484611763565b61057f5760405162461bcd60e51b81526004016104cc90612220565b600754610100900460ff166117015760405162461bcd60e51b81526004016104cc906121d5565b606c61170d83826122b8565b50606d61057f82826122b8565b6040805160208101859052908101839052606081018290524660808201523060a082015260009060c0016040516020818303038152906040528051906020012090509392505050565b60006001600160a01b0384163b1561186057836001600160a01b031663150b7a0261178c610f76565b8786866040518563ffffffff1660e01b81526004016117ae9493929190612377565b6020604051808303816000875af19250505080156117e9575060408051601f3d908101601f191682019092526117e6918101906123b4565b60015b611846573d808015611817576040519150601f19603f3d011682016040523d82523d6000602084013e61181c565b606091505b50805160000361183e5760405162461bcd60e51b81526004016104cc90612220565b805181602001fd5b6001600160e01b031916630a85bd0160e11b149050610a8f565b506001610a8f565b60008072184f03e93ff9f4daa797ed6e38ed64bf6a1f0160401b83106118a75772184f03e93ff9f4daa797ed6e38ed64bf6a1f0160401b830492506040015b6d04ee2d6d415b85acef810000000083106118d3576d04ee2d6d415b85acef8100000000830492506020015b662386f26fc1000083106118f157662386f26fc10000830492506010015b6305f5e1008310611909576305f5e100830492506008015b612710831061191d57612710830492506004015b6064831061192f576064830492506002015b600a83106103995760010192915050565b6002546000906001600160a01b03163014801561195e575060015446145b1561196a575060005490565b610f8060055460035460045461171a565b6001600160a01b0382166119d15760405162461bcd60e51b815260206004820181905260248201527f4552433732313a206d696e7420746f20746865207a65726f206164647265737360448201526064016104cc565b6119da81611563565b156119f75760405162461bcd60e51b81526004016104cc906123d1565b611a0081611563565b15611a1d5760405162461bcd60e51b81526004016104cc906123d1565b6001600160a01b0382166000818152606f6020908152604080832080546001019055848352606e90915280822080546001600160a01b03191684179055518392919060008051602061244c833981519152908290a45050565b6001600160e01b031981168114610f7357600080fd5b600060208284031215611a9e57600080fd5b8135610f1981611a76565b60005b83811015611ac4578181015183820152602001611aac565b50506000910152565b60008151808452611ae5816020860160208601611aa9565b601f01601f19169290920160200192915050565b602081526000610f196020830184611acd565b600060208284031215611b1e57600080fd5b5035919050565b80356001600160a01b0381168114611b3c57600080fd5b919050565b60008060408385031215611b5457600080fd5b611b5d83611b25565b946020939093013593505050565b60008083601f840112611b7d57600080fd5b5081356001600160401b03811115611b9457600080fd5b602083019150836020828501011115611bac57600080fd5b9250929050565b60008060008060008060a08789031215611bcc57600080fd5b611bd587611b25565b955060208701356001600160401b03811115611bf057600080fd5b611bfc89828a01611b6b565b9096509450506040870135925060608701359150608087013560ff81168114611c2457600080fd5b809150509295509295509295565b600080600060608486031215611c4757600080fd5b611c5084611b25565b9250611c5e60208501611b25565b9150604084013590509250925092565b600060208284031215611c8057600080fd5b610f1982611b25565b60008083601f840112611c9b57600080fd5b5081356001600160401b03811115611cb257600080fd5b6020830191508360208260051b8501011115611bac57600080fd5b60008060008060408587031215611ce357600080fd5b84356001600160401b0380821115611cfa57600080fd5b611d0688838901611c89565b90965094506020870135915080821115611d1f57600080fd5b50611d2c87828801611c89565b95989497509550505050565b600080600080600060608688031215611d5057600080fd5b611d5986611b25565b945060208601356001600160401b0380821115611d7557600080fd5b611d8189838a01611b6b565b90965094506040880135915080821115611d9a57600080fd5b50611da788828901611b6b565b969995985093965092949392505050565b60008060408385031215611dcb57600080fd5b611dd483611b25565b915060208301358015158114611de957600080fd5b809150509250929050565b600080600060408486031215611e0957600080fd5b611e1284611b25565b925060208401356001600160401b03811115611e2d57600080fd5b611e3986828701611c89565b9497909650939450505050565b634e487b7160e01b600052604160045260246000fd5b60008060008060808587031215611e7257600080fd5b611e7b85611b25565b9350611e8960208601611b25565b92506040850135915060608501356001600160401b0380821115611eac57600080fd5b818701915087601f830112611ec057600080fd5b813581811115611ed257611ed2611e46565b604051601f8201601f19908116603f01168101908382118183101715611efa57611efa611e46565b816040528281528a6020848701011115611f1357600080fd5b82602086016020830137600060208483010152809550505050505092959194509250565b60008060408385031215611f4a57600080fd5b611f5383611b25565b9150611f6160208401611b25565b90509250929050565b600181811c90821680611f7e57607f821691505b602082108103611f9e57634e487b7160e01b600052602260045260246000fd5b50919050565b8284823760609190911b6bffffffffffffffffffffffff19169101908152601401919050565b60008251611fdc818460208701611aa9565b9190910192915050565b6001600160a01b0385811682528416602082015260606040820181905281018290526000828460808401376000608084840101526080601f19601f850116830101905095945050505050565b6020808252602d908201527f4552433732313a2063616c6c6572206973206e6f7420746f6b656e206f776e6560408201526c1c881bdc88185c1c1c9bdd9959609a1b606082015260800190565b60208082526024908201527f4368696c644552433732313a204f6e6c79207072656469636174652063616e2060408201526318d85b1b60e21b606082015260800190565b602080825260189082015277115490cdcc8c4e881a5b9d985b1a59081d1bdad95b88125160421b604082015260600190565b634e487b7160e01b600052603260045260246000fd5b8082018082111561039957634e487b7160e01b600052601160045260246000fd5b6020808252818101527f4368696c644552433732313a204f6e6c79206f776e65722063616e206275726e604082015260600190565b60008351612173818460208801611aa9565b835190830190612187818360208801611aa9565b01949350505050565b60208082526025908201527f4552433732313a207472616e736665722066726f6d20696e636f72726563742060408201526437bbb732b960d91b606082015260800190565b6020808252602b908201527f496e697469616c697a61626c653a20636f6e7472616374206973206e6f74206960408201526a6e697469616c697a696e6760a81b606082015260800190565b60208082526032908201527f4552433732313a207472616e7366657220746f206e6f6e20455243373231526560408201527131b2b4bb32b91034b6b83632b6b2b73a32b960711b606082015260800190565b601f82111561057f57600081815260208120601f850160051c810160208610156122995750805b601f850160051c820191505b81811015610cfd578281556001016122a5565b81516001600160401b038111156122d1576122d1611e46565b6122e5816122df8454611f6a565b84612272565b602080601f83116001811461231a57600084156123025750858301515b600019600386901b1c1916600185901b178555610cfd565b600085815260208120601f198616915b828110156123495788860151825594840194600190910190840161232a565b50858210156123675787850151600019600388901b60f8161c191681555b5050505050600190811b01905550565b6001600160a01b03858116825284166020820152604081018390526080606082018190526000906123aa90830184611acd565b9695505050505050565b6000602082840312156123c657600080fd5b8151610f1981611a76565b6020808252601c908201527f4552433732313a20746f6b656e20616c7265616479206d696e7465640000000060408201526060019056fe4d6574615472616e73616374696f6e2875696e74323536206e6f6e63652c616464726573732066726f6d2c62797465732066756e6374696f6e5369676e617475726529ddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3efa2646970667358221220ea3c02b950248f82ca74449c170966a8d3ba41ec46257d49989e4be74e94e63864736f6c63430008130033",
+                "balance": "0x0"
+            },
+            "0x0000000000000000000000000000000000001006": {
+                "code": "0x608060405234801561001057600080fd5b50600436106101375760003560e01c8063b68ad1e4116100b8578063e0563ab11161007c578063e0563ab1146102c0578063eeb49945146102c9578063f3fef3a3146102dc578063f6451255146102ef578063f691325c14610316578063f8c8765e1461032957600080fd5b8063b68ad1e414610225578063c3b35a7e14610238578063c5ac2b1c1461024b578063d41f177114610272578063d7c9e3ec1461029957600080fd5b80636f33e695116100ff5780636f33e6951461019f5780637efab4f5146101b4578063947287cf146101dd57806397e5230d146101f4578063b1768065146101fe57600080fd5b806305dc2e8f1461013c5780631bc114ba1461016c578063284017f51461017f5780633b878c221461018857806351351d5314610191575b600080fd5b60345461014f906001600160a01b031681565b6040516001600160a01b0390911681526020015b60405180910390f35b60335461014f906001600160a01b031681565b61014f61202081565b61014f61101081565b61014f6002600160a01b0381565b6101b26101ad366004611617565b61033c565b005b61014f6101c2366004611699565b6037602052600090815260409020546001600160a01b031681565b6101e661520881565b604051908152602001610163565b6101e6620249f081565b6101e67f7a8dc26796a1e50e6e190b70259f58f6a4edd5b22280ceecc82b687b8e98286981565b60365461014f906001600160a01b031681565b6101b26102463660046116bd565b610350565b6101e67faf50c8eab81226bc79eee3a10e3fe25db1a2be7241130e392b0675df839b6d1881565b6101e67f87a7811f4bfedea3d341ad165680ae306b01aaeacc205d227629cf157dd9f82181565b6101e67f5fb452c5a8f2b7c7ef2984e2f1063c7ee9b80b110cdc98ccb98f6654e10b5ed281565b61014f61203081565b6101b26102d73660046116fe565b610360565b6101b26102ea366004611786565b610583565b6101e67f2cef46a936bdc5b7e6e8c71aa04560c41cf7d88bb26901a7e7f4936ff02accad81565b60355461014f906001600160a01b031681565b6101b26103373660046117b2565b610592565b61034985858585856107d1565b5050505050565b61035b838383610b35565b505050565b6034546001600160a01b031633146103d15760405162461bcd60e51b815260206004820152602960248201527f4368696c644552433732315072656469636174653a204f4e4c595f53544154456044820152682fa922a1a2a4ab22a960b91b60648201526084015b60405180910390fd5b6035546001600160a01b038481169116146104405760405162461bcd60e51b815260206004820152602960248201527f4368696c644552433732315072656469636174653a204f4e4c595f524f4f545f60448201526850524544494341544560b81b60648201526084016103c8565b7f87a7811f4bfedea3d341ad165680ae306b01aaeacc205d227629cf157dd9f82161046f60206000848661180e565b61047891611838565b036104975761049261048d826020818661180e565b610e3e565b61057d565b7faf50c8eab81226bc79eee3a10e3fe25db1a2be7241130e392b0675df839b6d186104c660206000848661180e565b6104cf91611838565b036104de5761049282826110b4565b7f2cef46a936bdc5b7e6e8c71aa04560c41cf7d88bb26901a7e7f4936ff02accad61050d60206000848661180e565b61051691611838565b0361052557610492828261131a565b60405162461bcd60e51b815260206004820152602760248201527f4368696c644552433732315072656469636174653a20494e56414c49445f5349604482015266474e415455524560c81b60648201526084016103c8565b50505050565b61058e823383610b35565b5050565b336002600160a01b03146105d65760405163973d02cb60e01b815260206004820152600a60248201526914d654d5115350d0531360b21b60448201526064016103c8565b600054610100900460ff16158080156105f65750600054600160ff909116105b806106105750303b158015610610575060005460ff166001145b6106735760405162461bcd60e51b815260206004820152602e60248201527f496e697469616c697a61626c653a20636f6e747261637420697320616c72656160448201526d191e481a5b9a5d1a585b1a5e995960921b60648201526084016103c8565b6000805460ff191660011790558015610696576000805461ff0019166101001790555b6001600160a01b038516158015906106b657506001600160a01b03841615155b80156106ca57506001600160a01b03831615155b80156106de57506001600160a01b03821615155b61073b5760405162461bcd60e51b815260206004820152602860248201527f4368696c644552433732315072656469636174653a204241445f494e495449416044820152672624ad20aa24a7a760c11b60648201526084016103c8565b603380546001600160a01b038088166001600160a01b031992831617909255603480548784169083161790556035805486841690831617905560368054928516929091169190911790558015610349576000805461ff0019169055604051600181527f7f26b83ff96e1f2b6a682f133852f6798a09c465da95921460cefb38474024989060200160405180910390a15050505050565b846107db81611488565b6107f75760405162461bcd60e51b81526004016103c890611856565b6000866001600160a01b0316631f2d00656040518163ffffffff1660e01b8152600401602060405180830381865afa158015610837573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061085b9190611898565b6001600160a01b0381811660009081526037602052604090205491925088811691161461089a5760405162461bcd60e51b81526004016103c8906118b5565b6001600160a01b0381166108b0576108b06118f9565b306001600160a01b0316876001600160a01b031663e61987056040518163ffffffff1660e01b8152600401602060405180830381865afa1580156108f8573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061091c9190611898565b6001600160a01b031614610932576109326118f9565b84831461098d5760405162461bcd60e51b8152602060048201526024808201527f4368696c644552433732315072656469636174653a20494e56414c49445f4c4560448201526309c8ea8960e31b60648201526084016103c8565b60405163b2dc5dc360e01b81526001600160a01b0388169063b2dc5dc3906109bd90339088908890600401611941565b6020604051808303816000875af11580156109dc573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610a00919061196f565b610a1c5760405162461bcd60e51b81526004016103c890611991565b6033546035546040516001600160a01b03928316926316f19831921690610a73907f5fb452c5a8f2b7c7ef2984e2f1063c7ee9b80b110cdc98ccb98f6654e10b5ed290869033908d908d908d908d90602001611a1b565b6040516020818303038152906040526040518363ffffffff1660e01b8152600401610a9f929190611ab5565b600060405180830381600087803b158015610ab957600080fd5b505af1158015610acd573d6000803e3d6000fd5b50505050336001600160a01b0316876001600160a01b0316826001600160a01b03167fa80bc76d6e1849a9088a9c00a2aeaa54eeb78f15565a18da3e8873438976f52289898989604051610b249493929190611ae1565b60405180910390a450505050505050565b82610b3f81611488565b610b5b5760405162461bcd60e51b81526004016103c890611856565b6000846001600160a01b0316631f2d00656040518163ffffffff1660e01b8152600401602060405180830381865afa158015610b9b573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610bbf9190611898565b6001600160a01b03818116600090815260376020526040902054919250868116911614610bfe5760405162461bcd60e51b81526004016103c8906118b5565b6001600160a01b038116610c1457610c146118f9565b306001600160a01b0316856001600160a01b031663e61987056040518163ffffffff1660e01b8152600401602060405180830381865afa158015610c5c573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610c809190611898565b6001600160a01b031614610c9657610c966118f9565b604051632770a7eb60e21b81526001600160a01b03861690639dc29fac90610cc49033908790600401611b13565b6020604051808303816000875af1158015610ce3573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610d07919061196f565b610d235760405162461bcd60e51b81526004016103c890611991565b603354603554604080517f7a8dc26796a1e50e6e190b70259f58f6a4edd5b22280ceecc82b687b8e98286960208201526001600160a01b0385811682840152336060830152888116608083015260a08083018990528351808403909101815260c08301938490526316f1983160e01b909352938416936316f1983193610dae9391169160c401611ab5565b600060405180830381600087803b158015610dc857600080fd5b505af1158015610ddc573d6000803e3d6000fd5b50505050836001600160a01b0316856001600160a01b0316826001600160a01b03167f1e0ef6131232b1090efc3ec1cf7b53aa17f4b7cd8a4f9e033b49ee237379b0133387604051610e2f929190611b13565b60405180910390a45050505050565b6000808080610e4f85870187611b2c565b6001600160a01b0380851660009081526037602052604090205494985092965090945092501680610e925760405162461bcd60e51b81526004016103c8906118b5565b610e9b81611488565b610ea757610ea76118f9565b6000816001600160a01b0316631f2d00656040518163ffffffff1660e01b8152600401602060405180830381865afa158015610ee7573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610f0b9190611898565b9050856001600160a01b0316816001600160a01b031614610f2e57610f2e6118f9565b6001600160a01b038116610f4457610f446118f9565b306001600160a01b0316826001600160a01b031663e61987056040518163ffffffff1660e01b8152600401602060405180830381865afa158015610f8c573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610fb09190611898565b6001600160a01b031614610fc657610fc66118f9565b6040516340c10f1960e01b81526001600160a01b038316906340c10f1990610ff49087908790600401611b13565b6020604051808303816000875af1158015611013573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190611037919061196f565b6110535760405162461bcd60e51b81526004016103c890611b7d565b836001600160a01b0316826001600160a01b0316876001600160a01b03167f37589fd8c906c19ea68eeb7e6b3e03efc06ff8aa4b1830588eba75f4375b161188876040516110a2929190611b13565b60405180910390a45050505050505050565b60008080806110c585870187611c92565b6001600160a01b0380851660009081526037602052604090205494995092975090955093501690508061110a5760405162461bcd60e51b81526004016103c8906118b5565b61111381611488565b61111f5761111f6118f9565b6000816001600160a01b0316631f2d00656040518163ffffffff1660e01b8152600401602060405180830381865afa15801561115f573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906111839190611898565b9050856001600160a01b0316816001600160a01b0316146111a6576111a66118f9565b6001600160a01b0381166111bc576111bc6118f9565b306001600160a01b0316826001600160a01b031663e61987056040518163ffffffff1660e01b8152600401602060405180830381865afa158015611204573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906112289190611898565b6001600160a01b03161461123e5761123e6118f9565b604051637c88e3d960e01b81526001600160a01b03831690637c88e3d99061126c9087908790600401611d84565b6020604051808303816000875af115801561128b573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906112af919061196f565b6112cb5760405162461bcd60e51b81526004016103c890611b7d565b846001600160a01b0316826001600160a01b0316876001600160a01b03167fc1b1a5c1b97cc8e5ac82b47496f5ebdadf9c7d119b30a116e2bdafd56f6ed47587876040516110a2929190611d84565b6000808061132a84860186611e77565b91955093509150506001600160a01b038316611348576113486118f9565b6001600160a01b038381166000908152603760205260409020541615611370576113706118f9565b6036546040516bffffffffffffffffffffffff19606086901b1660208201526000916113c0916001600160a01b03909116906034016040516020818303038152906040528051906020012061151d565b6001600160a01b038581166000908152603760205260409081902080546001600160a01b031916928416928317905551639065714760e01b81529192509063906571479061141690879087908790600401611ef6565b600060405180830381600087803b15801561143057600080fd5b505af1158015611444573d6000803e3d6000fd5b50506040516001600160a01b038085169350871691507f46bd56f98e1b14fd35691959270a6e1edf7cb8fcd489e0f9dda89e46c0d1ff0d90600090a3505050505050565b6000816001600160a01b03163b6000036114a457506000919050565b6040516301ffc9a760e01b81526380ac58cd60e01b60048201526001600160a01b038316906301ffc9a790602401602060405180830381865afa92505050801561150b575060408051601f3d908101601f191682019092526115089181019061196f565b60015b61151757506000919050565b92915050565b6000763d602d80600a3d3981f3363d3d373d3d3d363d730000008360601b60e81c176000526e5af43d82803e903d91602b57fd5bf38360781b1760205281603760096000f590506001600160a01b0381166115175760405162461bcd60e51b8152602060048201526017602482015276115490cc4c4d8dce8818dc99585d194c8819985a5b1959604a1b60448201526064016103c8565b6001600160a01b03811681146115c957600080fd5b50565b60008083601f8401126115de57600080fd5b5081356001600160401b038111156115f557600080fd5b6020830191508360208260051b850101111561161057600080fd5b9250929050565b60008060008060006060868803121561162f57600080fd5b853561163a816115b4565b945060208601356001600160401b038082111561165657600080fd5b61166289838a016115cc565b9096509450604088013591508082111561167b57600080fd5b50611688888289016115cc565b969995985093965092949392505050565b6000602082840312156116ab57600080fd5b81356116b6816115b4565b9392505050565b6000806000606084860312156116d257600080fd5b83356116dd816115b4565b925060208401356116ed816115b4565b929592945050506040919091013590565b6000806000806060858703121561171457600080fd5b843593506020850135611726816115b4565b925060408501356001600160401b038082111561174257600080fd5b818701915087601f83011261175657600080fd5b81358181111561176557600080fd5b88602082850101111561177757600080fd5b95989497505060200194505050565b6000806040838503121561179957600080fd5b82356117a4816115b4565b946020939093013593505050565b600080600080608085870312156117c857600080fd5b84356117d3816115b4565b935060208501356117e3816115b4565b925060408501356117f3816115b4565b91506060850135611803816115b4565b939692955090935050565b6000808585111561181e57600080fd5b8386111561182b57600080fd5b5050820193919092039150565b8035602083101561151757600019602084900360031b1b1692915050565b60208082526022908201527f4368696c644552433732315072656469636174653a204e4f545f434f4e54524160408201526110d560f21b606082015260800190565b6000602082840312156118aa57600080fd5b81516116b6816115b4565b60208082526024908201527f4368696c644552433732315072656469636174653a20554e4d41505045445f5460408201526327a5a2a760e11b606082015260800190565b634e487b7160e01b600052600160045260246000fd5b81835260006001600160fb1b0383111561192857600080fd5b8260051b80836020870137939093016020019392505050565b6001600160a01b0384168152604060208201819052600090611966908301848661190f565b95945050505050565b60006020828403121561198157600080fd5b815180151581146116b657600080fd5b60208082526021908201527f4368696c644552433732315072656469636174653a204255524e5f4641494c456040820152601160fa1b606082015260800190565b8183526000602080850194508260005b85811015611a105781356119f5816115b4565b6001600160a01b0316875295820195908201906001016119e2565b509495945050505050565b8781526001600160a01b0387811660208301528616604082015260a060608201819052600090611a4e90830186886119d2565b8281036080840152611a6181858761190f565b9a9950505050505050505050565b6000815180845260005b81811015611a9557602081850181015186830182015201611a79565b506000602082860101526020601f19601f83011685010191505092915050565b6001600160a01b0383168152604060208201819052600090611ad990830184611a6f565b949350505050565b604081526000611af56040830186886119d2565b8281036020840152611b0881858761190f565b979650505050505050565b6001600160a01b03929092168252602082015260400190565b60008060008060808587031215611b4257600080fd5b8435611b4d816115b4565b93506020850135611b5d816115b4565b92506040850135611b6d816115b4565b9396929550929360600135925050565b60208082526021908201527f4368696c644552433732315072656469636174653a204d494e545f4641494c456040820152601160fa1b606082015260800190565b634e487b7160e01b600052604160045260246000fd5b604051601f8201601f191681016001600160401b0381118282101715611bfc57611bfc611bbe565b604052919050565b60006001600160401b03821115611c1d57611c1d611bbe565b5060051b60200190565b600082601f830112611c3857600080fd5b81356020611c4d611c4883611c04565b611bd4565b82815260059290921b84018101918181019086841115611c6c57600080fd5b8286015b84811015611c875780358352918301918301611c70565b509695505050505050565b600080600080600060a08688031215611caa57600080fd5b85359450602080870135611cbd816115b4565b94506040870135611ccd816115b4565b935060608701356001600160401b0380821115611ce957600080fd5b818901915089601f830112611cfd57600080fd5b8135611d0b611c4882611c04565b81815260059190911b8301840190848101908c831115611d2a57600080fd5b938501935b82851015611d51578435611d42816115b4565b82529385019390850190611d2f565b965050506080890135925080831115611d6957600080fd5b5050611d7788828901611c27565b9150509295509295909350565b604080825283519082018190526000906020906060840190828701845b82811015611dc65781516001600160a01b031684529284019290840190600101611da1565b5050508381038285015284518082528583019183019060005b81811015611dfb57835183529284019291840191600101611ddf565b5090979650505050505050565b600082601f830112611e1957600080fd5b81356001600160401b03811115611e3257611e32611bbe565b611e45601f8201601f1916602001611bd4565b818152846020838601011115611e5a57600080fd5b816020850160208301376000918101602001919091529392505050565b60008060008060808587031215611e8d57600080fd5b843593506020850135611e9f816115b4565b925060408501356001600160401b0380821115611ebb57600080fd5b611ec788838901611e08565b93506060870135915080821115611edd57600080fd5b50611eea87828801611e08565b91505092959194509250565b6001600160a01b0384168152606060208201819052600090611f1a90830185611a6f565b8281036040840152611f2c8185611a6f565b969550505050505056fea26469706673582212208eba5121cb4876752d628bd2b54f4310ad4179b29208ae7a3ec4d01fd9c07df564736f6c63430008130033",
+                "balance": "0x0"
+            },
+            "0x0000000000000000000000000000000000001007": {
+                "code": "0x608060405234801561001057600080fd5b50600436106101155760003560e01c806357128683116100a2578063e619870511610071578063e619870514610278578063e985e9c514610289578063f242432a146102c5578063f399e22e146102d8578063f5298aca146102eb57600080fd5b8063571286831461022c5780636b20c4541461023f5780639b77ef1114610252578063a22cb4651461026557600080fd5b8063156e29f6116100e9578063156e29f6146101965780631f2d0065146101a95780632d0335ab146101ce5780632eb2c2d6146101f75780634e1273f41461020c57600080fd5b8062fdd58e1461011a57806301ffc9a7146101405780630c53c51c146101635780630e89341c14610183575b600080fd5b61012d610128366004611cee565b6102fe565b6040519081526020015b60405180910390f35b61015361014e366004611d2e565b610399565b6040519015158152602001610137565b610176610171366004611d93565b6103e9565b6040516101379190611e62565b610176610191366004611e75565b6106c7565b6101536101a4366004611e8e565b61075b565b609f546001600160a01b03165b6040516001600160a01b039091168152602001610137565b61012d6101dc366004611ec1565b6001600160a01b031660009081526006602052604090205490565b61020a610205366004612025565b6107ad565b005b61021f61021a3660046120ce565b61080b565b60405161013791906121d3565b61015361023a36600461222a565b610934565b61015361024d3660046122c3565b610a4f565b61020a610260366004611e75565b610af6565b61020a610273366004612343565b610b1d565b609e546001600160a01b03166101b6565b61015361029736600461237f565b6001600160a01b039182166000908152606d6020908152604080832093909416825291909152205460ff1690565b61020a6102d33660046123b2565b610b33565b61020a6102e6366004612416565b610b8a565b6101536102f9366004611e8e565b610d9e565b60006001600160a01b03831661036e5760405162461bcd60e51b815260206004820152602a60248201527f455243313135353a2061646472657373207a65726f206973206e6f742061207660448201526930b634b21037bbb732b960b11b60648201526084015b60405180910390fd5b506000818152606c602090815260408083206001600160a01b03861684529091529020545b92915050565b60006001600160e01b03198216636cdb3d1360e11b14806103ca57506001600160e01b031982166303a24d0760e21b145b8061039357506301ffc9a760e01b6001600160e01b0319831614610393565b6060600061042c87878080601f016020809104026020016040519081016040528093929190818152602001838380828437600092019190915250610dd692505050565b90506001600160e01b03196000358116908216036104b25760405162461bcd60e51b815260206004820152603d60248201527f66756e6374696f6e5369676e61747572652063616e206e6f74206265206f662060448201527f657865637574654d6574615472616e73616374696f6e206d6574686f640000006064820152608401610365565b604080516060810182526001600160a01b038a16600081815260066020908152848220548452808401929092528351601f8b0183900483028101830185528a815290938301918b908b9081908401838280828437600092019190915250505091525090506105238982888888610df1565b6105795760405162461bcd60e51b815260206004820152602160248201527f5369676e657220616e64207369676e617475726520646f206e6f74206d6174636044820152600d60fb1b6064820152608401610365565b600660008a6001600160a01b03166001600160a01b031681526020019081526020016000206000815460010191905081905550600080306001600160a01b03168a8a8d6040516020016105ce93929190612468565b60408051601f19818403018152908290526105e89161248e565b6000604051808303816000865af19150503d8060008114610625576040519150601f19603f3d011682016040523d82523d6000602084013e61062a565b606091505b50915091508161067c5760405162461bcd60e51b815260206004820152601c60248201527f46756e6374696f6e2063616c6c206e6f74207375636365737366756c000000006044820152606401610365565b7f5845892132946850460bff5a0083f71031bc5bf9aadcd40f1de79423eac9b10b8b338c8c6040516106b194939291906124aa565b60405180910390a19a9950505050505050505050565b6060606e80546106d6906124f6565b80601f0160208091040260200160405190810160405280929190818152602001828054610702906124f6565b801561074f5780601f106107245761010080835404028352916020019161074f565b820191906000526020600020905b81548152906001019060200180831161073257829003601f168201915b50505050509050919050565b609e546000906001600160a01b031633146107885760405162461bcd60e51b815260040161036590612530565b6107a384848460405180602001604052806000815250610ecd565b5060019392505050565b6107b5610fdc565b6001600160a01b0316856001600160a01b031614806107db57506107db85610297610fdc565b6107f75760405162461bcd60e51b815260040161036590612575565b6108048585858585610feb565b5050505050565b606081518351146108705760405162461bcd60e51b815260206004820152602960248201527f455243313135353a206163636f756e747320616e6420696473206c656e677468604482015268040dad2e6dac2e8c6d60bb1b6064820152608401610365565b600083516001600160401b0381111561088b5761088b611edc565b6040519080825280602002602001820160405280156108b4578160200160208202803683370190505b50905060005b845181101561092c576108ff8582815181106108d8576108d86125c3565b60200260200101518583815181106108f2576108f26125c3565b60200260200101516102fe565b828281518110610911576109116125c3565b6020908102919091010152610925816125ef565b90506108ba565b509392505050565b609e546000906001600160a01b031633146109615760405162461bcd60e51b815260040161036590612530565b85848114801561097057508083145b6109bc5760405162461bcd60e51b815260206004820181905260248201527f4368696c64455243313135353a206172726179206c656e206d69736d617463686044820152606401610365565b60005b81811015610a4057610a388989838181106109dc576109dc6125c3565b90506020020160208101906109f19190611ec1565b888884818110610a0357610a036125c3565b90506020020135878785818110610a1c57610a1c6125c3565b9050602002013560405180602001604052806000815250610ecd565b6001016109bf565b50600198975050505050505050565b609e546000906001600160a01b03163314610a7c5760405162461bcd60e51b815260040161036590612530565b610aea8686868080602002602001604051908101604052809392919081815260200183836020028082843760009201919091525050604080516020808a0282810182019093528982529093508992508891829185019084908082843760009201919091525061119592505050565b50600195945050505050565b3360009081526006602052604081208054839290610b15908490612608565b909155505050565b610b2f610b28610fdc565b838361132c565b5050565b610b3b610fdc565b6001600160a01b0316856001600160a01b03161480610b615750610b6185610297610fdc565b610b7d5760405162461bcd60e51b815260040161036590612575565b610804858585858561140c565b600754610100900460ff1615808015610baa5750600754600160ff909116105b80610bc45750303b158015610bc4575060075460ff166001145b610c275760405162461bcd60e51b815260206004820152602e60248201527f496e697469616c697a61626c653a20636f6e747261637420697320616c72656160448201526d191e481a5b9a5d1a585b1a5e995960921b6064820152608401610365565b6007805460ff191660011790558015610c4a576007805461ff0019166101001790555b6001600160a01b038416610ca05760405162461bcd60e51b815260206004820181905260248201527f4368696c64455243313135353a204241445f494e495449414c495a4154494f4e6044820152606401610365565b609f80546001600160a01b0386166001600160a01b031991821617909155609e805490911633179055604080516020601f8501819004810282018101909252838152610d0691859085908190840183828082843760009201919091525061153392505050565b610d52610d1b856001600160a01b0316611566565b604051602001610d2b919061261b565b60408051601f1981840301815282820190915260018252603160f81b60208301529061157c565b8015610d98576007805461ff0019169055604051600181527f7f26b83ff96e1f2b6a682f133852f6798a09c465da95921460cefb38474024989060200160405180910390a15b50505050565b609e546000906001600160a01b03163314610dcb5760405162461bcd60e51b815260040161036590612530565b6107a38484846115e8565b60008151600003610de957506000919050565b506020015190565b6000806001610e07610e02886116e8565b611765565b6040805160008152602081018083529290925260ff861690820152606081018790526080810186905260a0016020604051602081039080840390855afa158015610e55573d6000803e3d6000fd5b5050604051601f1901519150506001600160a01b038116610eac5760405162461bcd60e51b8152602060048201526011602482015270496e76616c6964207369676e617475726560781b6044820152606401610365565b866001600160a01b0316816001600160a01b03161491505095945050505050565b6001600160a01b038416610f2d5760405162461bcd60e51b815260206004820152602160248201527f455243313135353a206d696e7420746f20746865207a65726f206164647265736044820152607360f81b6064820152608401610365565b6000610f37610fdc565b90506000610f44856117b3565b90506000610f51856117b3565b90506000868152606c602090815260408083206001600160a01b038b16845290915281208054879290610f85908490612608565b909155505060408051878152602081018790526001600160a01b03808a169260009291871691600080516020612b0c833981519152910160405180910390a4610fd3836000898989896117fe565b50505050505050565b6000610fe6611959565b905090565b815183511461100c5760405162461bcd60e51b815260040161036590612650565b6001600160a01b0384166110325760405162461bcd60e51b815260040161036590612698565b600061103c610fdc565b905060005b845181101561112757600085828151811061105e5761105e6125c3565b60200260200101519050600085838151811061107c5761107c6125c3565b6020908102919091018101516000848152606c835260408082206001600160a01b038e1683529093529190912054909150818110156110cd5760405162461bcd60e51b8152600401610365906126dd565b6000838152606c602090815260408083206001600160a01b038e8116855292528083208585039055908b1682528120805484929061110c908490612608565b9250508190555050505080611120906125ef565b9050611041565b50846001600160a01b0316866001600160a01b0316826001600160a01b03167f4a39dc06d4c0dbc64b70af90fd698a233a518aa5d07e595d983b8c0526c8f7fb8787604051611177929190612727565b60405180910390a461118d8187878787876119b5565b505050505050565b6001600160a01b0383166111bb5760405162461bcd60e51b815260040161036590612755565b80518251146111dc5760405162461bcd60e51b815260040161036590612650565b60006111e6610fdc565b604080516020810190915260009052905060005b83518110156112bf576000848281518110611217576112176125c3565b602002602001015190506000848381518110611235576112356125c3565b6020908102919091018101516000848152606c835260408082206001600160a01b038c1683529093529190912054909150818110156112865760405162461bcd60e51b815260040161036590612798565b6000928352606c602090815260408085206001600160a01b038b16865290915290922091039055806112b7816125ef565b9150506111fa565b5060006001600160a01b0316846001600160a01b0316826001600160a01b03167f4a39dc06d4c0dbc64b70af90fd698a233a518aa5d07e595d983b8c0526c8f7fb8686604051611310929190612727565b60405180910390a4604080516020810190915260009052610d98565b816001600160a01b0316836001600160a01b03160361139f5760405162461bcd60e51b815260206004820152602960248201527f455243313135353a2073657474696e6720617070726f76616c20737461747573604482015268103337b91039b2b63360b91b6064820152608401610365565b6001600160a01b038381166000818152606d6020908152604080832094871680845294825291829020805460ff191686151590811790915591519182527f17307eab39ab6107e8899845ad3d59bd9653f200f220920489ca2b5937696c31910160405180910390a3505050565b6001600160a01b0384166114325760405162461bcd60e51b815260040161036590612698565b600061143c610fdc565b90506000611449856117b3565b90506000611456856117b3565b90506000868152606c602090815260408083206001600160a01b038c1684529091529020548581101561149b5760405162461bcd60e51b8152600401610365906126dd565b6000878152606c602090815260408083206001600160a01b038d8116855292528083208985039055908a168252812080548892906114da908490612608565b909155505060408051888152602081018890526001600160a01b03808b16928c82169291881691600080516020612b0c833981519152910160405180910390a4611528848a8a8a8a8a6117fe565b505050505050505050565b600754610100900460ff1661155a5760405162461bcd60e51b8152600401610365906127dc565b61156381611a70565b50565b60606103936001600160a01b0383166014611aa0565b815160208084019190912082519183019190912060038290556004819055466001557f8b73c3c69bb8fe3d512ecc4cf759cc79239f7b179b0ffacaa9a75d522b39400f6115ca818484611c42565b600055600280546001600160a01b0319163017905560055550505050565b6001600160a01b03831661160e5760405162461bcd60e51b815260040161036590612755565b6000611618610fdc565b90506000611625846117b3565b90506000611632846117b3565b6040805160208082018352600091829052888252606c81528282206001600160a01b038b16835290522054909150848110156116805760405162461bcd60e51b815260040161036590612798565b6000868152606c602090815260408083206001600160a01b038b81168086529184528285208a8703905582518b81529384018a9052909290881691600080516020612b0c833981519152910160405180910390a4604080516020810190915260009052610fd3565b6000604051806080016040528060438152602001612b2c6043913980516020918201208351848301516040808701518051908601209051611748950193845260208401929092526001600160a01b03166040830152606082015260800190565b604051602081830303815290604052805190602001209050919050565b6000610393611772611c8b565b8360405161190160f01b6020820152602281018390526042810182905260009060620160405160208183030381529060405280519060200120905092915050565b604080516001808252818301909252606091600091906020808301908036833701905050905082816000815181106117ed576117ed6125c3565b602090810291909101015292915050565b6001600160a01b0384163b1561118d5760405163f23a6e6160e01b81526001600160a01b0385169063f23a6e61906118429089908990889088908890600401612827565b6020604051808303816000875af192505050801561187d575060408051601f3d908101601f1916820190925261187a9181019061286c565b60015b61192957611889612889565b806308c379a0036118c2575061189d6128a4565b806118a857506118c4565b8060405162461bcd60e51b81526004016103659190611e62565b505b60405162461bcd60e51b815260206004820152603460248201527f455243313135353a207472616e7366657220746f206e6f6e2d455243313135356044820152732932b1b2b4bb32b91034b6b83632b6b2b73a32b960611b6064820152608401610365565b6001600160e01b0319811663f23a6e6160e01b14610fd35760405162461bcd60e51b81526004016103659061292d565b60003033036119af57600080368080601f0160208091040260200160405190810160405280939291908181526020018383808284376000920191909152505050503601516001600160a01b031691506119b29050565b50335b90565b6001600160a01b0384163b1561118d5760405163bc197c8160e01b81526001600160a01b0385169063bc197c81906119f99089908990889088908890600401612975565b6020604051808303816000875af1925050508015611a34575060408051601f3d908101601f19168201909252611a319181019061286c565b60015b611a4057611889612889565b6001600160e01b0319811663bc197c8160e01b14610fd35760405162461bcd60e51b81526004016103659061292d565b600754610100900460ff16611a975760405162461bcd60e51b8152600401610365906127dc565b61156381611cc6565b60606000611aaf8360026129d3565b611aba906002612608565b6001600160401b03811115611ad157611ad1611edc565b6040519080825280601f01601f191660200182016040528015611afb576020820181803683370190505b509050600360fc1b81600081518110611b1657611b166125c3565b60200101906001600160f81b031916908160001a905350600f60fb1b81600181518110611b4557611b456125c3565b60200101906001600160f81b031916908160001a9053506000611b698460026129d3565b611b74906001612608565b90505b6001811115611bec576f181899199a1a9b1b9c1cb0b131b232b360811b85600f1660108110611ba857611ba86125c3565b1a60f81b828281518110611bbe57611bbe6125c3565b60200101906001600160f81b031916908160001a90535060049490941c93611be5816129ea565b9050611b77565b508315611c3b5760405162461bcd60e51b815260206004820181905260248201527f537472696e67733a20686578206c656e67746820696e73756666696369656e746044820152606401610365565b9392505050565b6040805160208101859052908101839052606081018290524660808201523060a082015260009060c0016040516020818303038152906040528051906020012090509392505050565b6002546000906001600160a01b031630148015611ca9575060015446145b15611cb5575060005490565b610fe6600554600354600454611c42565b606e610b2f8282612a4c565b80356001600160a01b0381168114611ce957600080fd5b919050565b60008060408385031215611d0157600080fd5b611d0a83611cd2565b946020939093013593505050565b6001600160e01b03198116811461156357600080fd5b600060208284031215611d4057600080fd5b8135611c3b81611d18565b60008083601f840112611d5d57600080fd5b5081356001600160401b03811115611d7457600080fd5b602083019150836020828501011115611d8c57600080fd5b9250929050565b60008060008060008060a08789031215611dac57600080fd5b611db587611cd2565b955060208701356001600160401b03811115611dd057600080fd5b611ddc89828a01611d4b565b9096509450506040870135925060608701359150608087013560ff81168114611e0457600080fd5b809150509295509295509295565b60005b83811015611e2d578181015183820152602001611e15565b50506000910152565b60008151808452611e4e816020860160208601611e12565b601f01601f19169290920160200192915050565b602081526000611c3b6020830184611e36565b600060208284031215611e8757600080fd5b5035919050565b600080600060608486031215611ea357600080fd5b611eac84611cd2565b95602085013595506040909401359392505050565b600060208284031215611ed357600080fd5b611c3b82611cd2565b634e487b7160e01b600052604160045260246000fd5b601f8201601f191681016001600160401b0381118282101715611f1757611f17611edc565b6040525050565b60006001600160401b03821115611f3757611f37611edc565b5060051b60200190565b600082601f830112611f5257600080fd5b81356020611f5f82611f1e565b604051611f6c8282611ef2565b83815260059390931b8501820192828101915086841115611f8c57600080fd5b8286015b84811015611fa75780358352918301918301611f90565b509695505050505050565b600082601f830112611fc357600080fd5b81356001600160401b03811115611fdc57611fdc611edc565b604051611ff3601f8301601f191660200182611ef2565b81815284602083860101111561200857600080fd5b816020850160208301376000918101602001919091529392505050565b600080600080600060a0868803121561203d57600080fd5b61204686611cd2565b945061205460208701611cd2565b935060408601356001600160401b038082111561207057600080fd5b61207c89838a01611f41565b9450606088013591508082111561209257600080fd5b61209e89838a01611f41565b935060808801359150808211156120b457600080fd5b506120c188828901611fb2565b9150509295509295909350565b600080604083850312156120e157600080fd5b82356001600160401b03808211156120f857600080fd5b818501915085601f83011261210c57600080fd5b8135602061211982611f1e565b6040516121268282611ef2565b83815260059390931b850182019282810191508984111561214657600080fd5b948201945b8386101561216b5761215c86611cd2565b8252948201949082019061214b565b9650508601359250508082111561218157600080fd5b5061218e85828601611f41565b9150509250929050565b600081518084526020808501945080840160005b838110156121c8578151875295820195908201906001016121ac565b509495945050505050565b602081526000611c3b6020830184612198565b60008083601f8401126121f857600080fd5b5081356001600160401b0381111561220f57600080fd5b6020830191508360208260051b8501011115611d8c57600080fd5b6000806000806000806060878903121561224357600080fd5b86356001600160401b038082111561225a57600080fd5b6122668a838b016121e6565b9098509650602089013591508082111561227f57600080fd5b61228b8a838b016121e6565b909650945060408901359150808211156122a457600080fd5b506122b189828a016121e6565b979a9699509497509295939492505050565b6000806000806000606086880312156122db57600080fd5b6122e486611cd2565b945060208601356001600160401b038082111561230057600080fd5b61230c89838a016121e6565b9096509450604088013591508082111561232557600080fd5b50612332888289016121e6565b969995985093965092949392505050565b6000806040838503121561235657600080fd5b61235f83611cd2565b91506020830135801515811461237457600080fd5b809150509250929050565b6000806040838503121561239257600080fd5b61239b83611cd2565b91506123a960208401611cd2565b90509250929050565b600080600080600060a086880312156123ca57600080fd5b6123d386611cd2565b94506123e160208701611cd2565b9350604086013592506060860135915060808601356001600160401b0381111561240a57600080fd5b6120c188828901611fb2565b60008060006040848603121561242b57600080fd5b61243484611cd2565b925060208401356001600160401b0381111561244f57600080fd5b61245b86828701611d4b565b9497909650939450505050565b8284823760609190911b6bffffffffffffffffffffffff19169101908152601401919050565b600082516124a0818460208701611e12565b9190910192915050565b6001600160a01b0385811682528416602082015260606040820181905281018290526000828460808401376000608084840101526080601f19601f850116830101905095945050505050565b600181811c9082168061250a57607f821691505b60208210810361252a57634e487b7160e01b600052602260045260246000fd5b50919050565b60208082526025908201527f4368696c64455243313135353a204f6e6c79207072656469636174652063616e6040820152640818d85b1b60da1b606082015260800190565b6020808252602e908201527f455243313135353a2063616c6c6572206973206e6f7420746f6b656e206f776e60408201526d195c881bdc88185c1c1c9bdd995960921b606082015260800190565b634e487b7160e01b600052603260045260246000fd5b634e487b7160e01b600052601160045260246000fd5b600060018201612601576126016125d9565b5060010190565b80820180821115610393576103936125d9565b6c4368696c64455243313135352d60981b81526000825161264381600d850160208701611e12565b91909101600d0192915050565b60208082526028908201527f455243313135353a2069647320616e6420616d6f756e7473206c656e677468206040820152670dad2e6dac2e8c6d60c31b606082015260800190565b60208082526025908201527f455243313135353a207472616e7366657220746f20746865207a65726f206164604082015264647265737360d81b606082015260800190565b6020808252602a908201527f455243313135353a20696e73756666696369656e742062616c616e636520666f60408201526939103a3930b739b332b960b11b606082015260800190565b60408152600061273a6040830185612198565b828103602084015261274c8185612198565b95945050505050565b60208082526023908201527f455243313135353a206275726e2066726f6d20746865207a65726f206164647260408201526265737360e81b606082015260800190565b60208082526024908201527f455243313135353a206275726e20616d6f756e7420657863656564732062616c604082015263616e636560e01b606082015260800190565b6020808252602b908201527f496e697469616c697a61626c653a20636f6e7472616374206973206e6f74206960408201526a6e697469616c697a696e6760a81b606082015260800190565b6001600160a01b03868116825285166020820152604081018490526060810183905260a06080820181905260009061286190830184611e36565b979650505050505050565b60006020828403121561287e57600080fd5b8151611c3b81611d18565b600060033d11156119b25760046000803e5060005160e01c90565b600060443d10156128b25790565b6040516003193d81016004833e81513d6001600160401b0381602484011181841117156128e157505050505090565b82850191508151818111156128f95750505050505090565b843d87010160208285010111156129135750505050505090565b61292260208286010187611ef2565b509095945050505050565b60208082526028908201527f455243313135353a204552433131353552656365697665722072656a656374656040820152676420746f6b656e7360c01b606082015260800190565b6001600160a01b0386811682528516602082015260a0604082018190526000906129a190830186612198565b82810360608401526129b38186612198565b905082810360808401526129c78185611e36565b98975050505050505050565b8082028115828204841417610393576103936125d9565b6000816129f9576129f96125d9565b506000190190565b601f821115612a4757600081815260208120601f850160051c81016020861015612a285750805b601f850160051c820191505b8181101561118d57828155600101612a34565b505050565b81516001600160401b03811115612a6557612a65611edc565b612a7981612a7384546124f6565b84612a01565b602080601f831160018114612aae5760008415612a965750858301515b600019600386901b1c1916600185901b17855561118d565b600085815260208120601f198616915b82811015612add57888601518255948401946001909101908401612abe565b5085821015612afb5787850151600019600388901b60f8161c191681555b5050505050600190811b0190555056fec3d58168c5ae7397731d063d5bbf3d657854427343f4c083240f7aacaa2d0f624d6574615472616e73616374696f6e2875696e74323536206e6f6e63652c616464726573732066726f6d2c62797465732066756e6374696f6e5369676e617475726529a2646970667358221220cf72cc6dfec7557a549ae9a9c0f6f7dbddd3c040da94b9a82892a238de95698864736f6c63430008130033",
+                "balance": "0x0"
+            },
+            "0x0000000000000000000000000000000000001008": {
+                "code": "0x608060405234801561001057600080fd5b50600436106101375760003560e01c8063b1768065116100b8578063d41f17711161007c578063d41f177114610298578063d7c9e3ec146102bf578063e0563ab1146102e6578063eeb49945146102ef578063f645125514610302578063f8c8765e1461032957600080fd5b8063b176806514610211578063b5c5f67214610238578063b68ad1e41461024b578063b8cd3ec01461025e578063c5ac2b1c1461027157600080fd5b806351351d53116100ff57806351351d53146101a45780637efab4f5146101b257806386937eb4146101db578063947287cf146101f057806397e5230d1461020757600080fd5b8063051eb2e21461013c57806305dc2e8f1461016c5780631bc114ba1461017f578063284017f5146101925780633b878c221461019b575b600080fd5b60355461014f906001600160a01b031681565b6040516001600160a01b0390911681526020015b60405180910390f35b60345461014f906001600160a01b031681565b60335461014f906001600160a01b031681565b61014f61202081565b61014f61101081565b61014f6002600160a01b0381565b61014f6101c03660046115f0565b6037602052600090815260409020546001600160a01b031681565b6101ee6101e936600461165f565b61033c565b005b6101f961520881565b604051908152602001610163565b6101f9620249f081565b6101f97f7a8dc26796a1e50e6e190b70259f58f6a4edd5b22280ceecc82b687b8e98286981565b6101ee61024636600461170b565b610354565b60365461014f906001600160a01b031681565b6101ee61026c366004611740565b610365565b6101f97faf50c8eab81226bc79eee3a10e3fe25db1a2be7241130e392b0675df839b6d1881565b6101f97f87a7811f4bfedea3d341ad165680ae306b01aaeacc205d227629cf157dd9f82181565b6101f97f5fb452c5a8f2b7c7ef2984e2f1063c7ee9b80b110cdc98ccb98f6654e10b5ed281565b61014f61203081565b6101ee6102fd366004611786565b610377565b6101f97f2cef46a936bdc5b7e6e8c71aa04560c41cf7d88bb26901a7e7f4936ff02accad81565b6101ee61033736600461180e565b610597565b61034b878787878787876107d8565b50505050505050565b61036083338484610b57565b505050565b61037184848484610b57565b50505050565b6034546001600160a01b031633146103e95760405162461bcd60e51b815260206004820152602a60248201527f4368696c64455243313135355072656469636174653a204f4e4c595f5354415460448201526922afa922a1a2a4ab22a960b11b60648201526084015b60405180910390fd5b6035546001600160a01b038481169116146104595760405162461bcd60e51b815260206004820152602a60248201527f4368696c64455243313135355072656469636174653a204f4e4c595f524f4f546044820152695f50524544494341544560b01b60648201526084016103e0565b7f87a7811f4bfedea3d341ad165680ae306b01aaeacc205d227629cf157dd9f82161048860206000848661186a565b61049191611894565b036104b0576104ab6104a6826020818661186a565b610e6c565b610371565b7faf50c8eab81226bc79eee3a10e3fe25db1a2be7241130e392b0675df839b6d186104df60206000848661186a565b6104e891611894565b036104f7576104ab82826110d7565b7f2cef46a936bdc5b7e6e8c71aa04560c41cf7d88bb26901a7e7f4936ff02accad61052660206000848661186a565b61052f91611894565b0361053e576104ab8282611344565b60405162461bcd60e51b815260206004820152602860248201527f4368696c64455243313135355072656469636174653a20494e56414c49445f5360448201526749474e415455524560c01b60648201526084016103e0565b336002600160a01b03146105db5760405163973d02cb60e01b815260206004820152600a60248201526914d654d5115350d0531360b21b60448201526064016103e0565b600054610100900460ff16158080156105fb5750600054600160ff909116105b806106155750303b158015610615575060005460ff166001145b6106785760405162461bcd60e51b815260206004820152602e60248201527f496e697469616c697a61626c653a20636f6e747261637420697320616c72656160448201526d191e481a5b9a5d1a585b1a5e995960921b60648201526084016103e0565b6000805460ff19166001179055801561069b576000805461ff0019166101001790555b6001600160a01b038516158015906106bb57506001600160a01b03841615155b80156106cf57506001600160a01b03831615155b80156106e357506001600160a01b03821615155b6107415760405162461bcd60e51b815260206004820152602960248201527f4368696c64455243313135355072656469636174653a204241445f494e49544960448201526820a624ad20aa24a7a760b91b60648201526084016103e0565b603380546001600160a01b038088166001600160a01b0319928316179092556034805487841690831617905560358054868416908316179055603680549285169290911691909117905580156107d1576000805461ff0019169055604051600181527f7f26b83ff96e1f2b6a682f133852f6798a09c465da95921460cefb38474024989060200160405180910390a15b5050505050565b866107e2816114ac565b6107fe5760405162461bcd60e51b81526004016103e0906118b2565b6000886001600160a01b0316631f2d00656040518163ffffffff1660e01b8152600401602060405180830381865afa15801561083e573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061086291906118f5565b6001600160a01b038181166000908152603760205260409020549192508a81169116146108a15760405162461bcd60e51b81526004016103e090611912565b6001600160a01b0381166108b7576108b7611957565b306001600160a01b0316896001600160a01b031663e61987056040518163ffffffff1660e01b8152600401602060405180830381865afa1580156108ff573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061092391906118f5565b6001600160a01b03161461093957610939611957565b868514801561094757508483145b6109a15760405162461bcd60e51b815260206004820152602560248201527f4368696c64455243313135355072656469636174653a20494e56414c49445f4c60448201526408a9c8ea8960db1b60648201526084016103e0565b604051631ac8311560e21b81526001600160a01b038a1690636b20c454906109d59033908a908a908a908a9060040161199f565b6020604051808303816000875af11580156109f4573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610a1891906119e3565b610a345760405162461bcd60e51b81526004016103e090611a05565b6033546035546040516001600160a01b03928316926316f19831921690610a8f907f5fb452c5a8f2b7c7ef2984e2f1063c7ee9b80b110cdc98ccb98f6654e10b5ed290869033908f908f908f908f908f908f90602001611a90565b6040516020818303038152906040526040518363ffffffff1660e01b8152600401610abb929190611b41565b600060405180830381600087803b158015610ad557600080fd5b505af1158015610ae9573d6000803e3d6000fd5b50505050336001600160a01b0316896001600160a01b0316826001600160a01b03167f7a10660242ca367951ff3777cdb3c2a761e3ccad204bac118501e24693f3683d8b8b8b8b8b8b604051610b4496959493929190611b6d565b60405180910390a4505050505050505050565b83610b61816114ac565b610b7d5760405162461bcd60e51b81526004016103e0906118b2565b6000856001600160a01b0316631f2d00656040518163ffffffff1660e01b8152600401602060405180830381865afa158015610bbd573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610be191906118f5565b6001600160a01b03818116600090815260376020526040902054919250878116911614610c205760405162461bcd60e51b81526004016103e090611912565b6001600160a01b038116610c3657610c36611957565b306001600160a01b0316866001600160a01b031663e61987056040518163ffffffff1660e01b8152600401602060405180830381865afa158015610c7e573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610ca291906118f5565b6001600160a01b031614610cb857610cb8611957565b604051637a94c56560e11b81526001600160a01b0387169063f5298aca90610ce890339088908890600401611bb6565b6020604051808303816000875af1158015610d07573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610d2b91906119e3565b610d475760405162461bcd60e51b81526004016103e090611a05565b603354603554604080517f7a8dc26796a1e50e6e190b70259f58f6a4edd5b22280ceecc82b687b8e98286960208201526001600160a01b0385811682840152336060830152898116608083015260a0820189905260c08083018990528351808403909101815260e08301938490526316f1983160e01b909352938416936316f1983193610dd99391169160e401611b41565b600060405180830381600087803b158015610df357600080fd5b505af1158015610e07573d6000803e3d6000fd5b50505050846001600160a01b0316866001600160a01b0316826001600160a01b03167f2ca9093e8b5356801039806c6a08003e5b7013fb8ae48f720fc90fc1c1a8bec2338888604051610e5c93929190611bb6565b60405180910390a4505050505050565b600080808080610e7e86880188611bd7565b6001600160a01b03808616600090815260376020526040902054959a50939850919650945092501680610ec35760405162461bcd60e51b81526004016103e090611912565b610ecc816114ac565b610ed857610ed8611957565b6000816001600160a01b0316631f2d00656040518163ffffffff1660e01b8152600401602060405180830381865afa158015610f18573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610f3c91906118f5565b9050866001600160a01b0316816001600160a01b031614610f5f57610f5f611957565b6001600160a01b038116610f7557610f75611957565b306001600160a01b0316826001600160a01b031663e61987056040518163ffffffff1660e01b8152600401602060405180830381865afa158015610fbd573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610fe191906118f5565b6001600160a01b031614610ff757610ff7611957565b604051630ab714fb60e11b81526001600160a01b0383169063156e29f69061102790889088908890600401611bb6565b6020604051808303816000875af1158015611046573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061106a91906119e3565b6110865760405162461bcd60e51b81526004016103e090611c32565b846001600160a01b0316826001600160a01b0316886001600160a01b03167f2930d932c1cccd6add2e0e2d706ede9015db8a194405f2a3e1783703515e104f898888604051610b4493929190611bb6565b6000808080806110e986880188611d48565b6001600160a01b03808616600090815260376020526040902054959b5093995091975095509350169050806111305760405162461bcd60e51b81526004016103e090611912565b611139816114ac565b61114557611145611957565b6000816001600160a01b0316631f2d00656040518163ffffffff1660e01b8152600401602060405180830381865afa158015611185573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906111a991906118f5565b9050866001600160a01b0316816001600160a01b0316146111cc576111cc611957565b6001600160a01b0381166111e2576111e2611957565b306001600160a01b0316826001600160a01b031663e61987056040518163ffffffff1660e01b8152600401602060405180830381865afa15801561122a573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061124e91906118f5565b6001600160a01b03161461126457611264611957565b604051635712868360e01b81526001600160a01b0383169063571286839061129490889088908890600401611e8d565b6020604051808303816000875af11580156112b3573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906112d791906119e3565b6112f35760405162461bcd60e51b81526004016103e090611c32565b856001600160a01b0316826001600160a01b0316886001600160a01b03167f17304b99f8dfa5a2b8dd5695d82f9947c2abfbc9cb64bab610b9a1a0feadb9a0888888604051610b4493929190611e8d565b60008061135383850185611f02565b9093509150506001600160a01b03821661136f5761136f611957565b6001600160a01b03828116600090815260376020526040902054161561139757611397611957565b6036546040516bffffffffffffffffffffffff19606085901b1660208201526000916113e7916001600160a01b039091169060340160405160208183030381529060405280519060200120611541565b6001600160a01b038481166000908152603760205260409081902080546001600160a01b0319169284169283179055516379ccf11760e11b81529192509063f399e22e9061143b9086908690600401611b41565b600060405180830381600087803b15801561145557600080fd5b505af1158015611469573d6000803e3d6000fd5b50506040516001600160a01b038085169350861691507f46bd56f98e1b14fd35691959270a6e1edf7cb8fcd489e0f9dda89e46c0d1ff0d90600090a35050505050565b6000816001600160a01b03163b6000036114c857506000919050565b6040516301ffc9a760e01b8152636cdb3d1360e11b60048201526001600160a01b038316906301ffc9a790602401602060405180830381865afa92505050801561152f575060408051601f3d908101601f1916820190925261152c918101906119e3565b60015b61153b57506000919050565b92915050565b6000763d602d80600a3d3981f3363d3d373d3d3d363d730000008360601b60e81c176000526e5af43d82803e903d91602b57fd5bf38360781b1760205281603760096000f590506001600160a01b03811661153b5760405162461bcd60e51b8152602060048201526017602482015276115490cc4c4d8dce8818dc99585d194c8819985a5b1959604a1b60448201526064016103e0565b6001600160a01b03811681146115ed57600080fd5b50565b60006020828403121561160257600080fd5b813561160d816115d8565b9392505050565b60008083601f84011261162657600080fd5b5081356001600160401b0381111561163d57600080fd5b6020830191508360208260051b850101111561165857600080fd5b9250929050565b60008060008060008060006080888a03121561167a57600080fd5b8735611685816115d8565b965060208801356001600160401b03808211156116a157600080fd5b6116ad8b838c01611614565b909850965060408a01359150808211156116c657600080fd5b6116d28b838c01611614565b909650945060608a01359150808211156116eb57600080fd5b506116f88a828b01611614565b989b979a50959850939692959293505050565b60008060006060848603121561172057600080fd5b833561172b816115d8565b95602085013595506040909401359392505050565b6000806000806080858703121561175657600080fd5b8435611761816115d8565b93506020850135611771816115d8565b93969395505050506040820135916060013590565b6000806000806060858703121561179c57600080fd5b8435935060208501356117ae816115d8565b925060408501356001600160401b03808211156117ca57600080fd5b818701915087601f8301126117de57600080fd5b8135818111156117ed57600080fd5b8860208285010111156117ff57600080fd5b95989497505060200194505050565b6000806000806080858703121561182457600080fd5b843561182f816115d8565b9350602085013561183f816115d8565b9250604085013561184f816115d8565b9150606085013561185f816115d8565b939692955090935050565b6000808585111561187a57600080fd5b8386111561188757600080fd5b5050820193919092039150565b8035602083101561153b57600019602084900360031b1b1692915050565b60208082526023908201527f4368696c64455243313135355072656469636174653a204e4f545f434f4e54526040820152621050d560ea1b606082015260800190565b60006020828403121561190757600080fd5b815161160d816115d8565b60208082526025908201527f4368696c64455243313135355072656469636174653a20554e4d41505045445f6040820152642a27a5a2a760d91b606082015260800190565b634e487b7160e01b600052600160045260246000fd5b81835260006001600160fb1b0383111561198657600080fd5b8260051b80836020870137939093016020019392505050565b6001600160a01b03861681526060602082018190526000906119c4908301868861196d565b82810360408401526119d781858761196d565b98975050505050505050565b6000602082840312156119f557600080fd5b8151801515811461160d57600080fd5b60208082526022908201527f4368696c64455243313135355072656469636174653a204255524e5f4641494c604082015261115160f21b606082015260800190565b8183526000602080850194508260005b85811015611a85578135611a6a816115d8565b6001600160a01b031687529582019590820190600101611a57565b509495945050505050565b8981526001600160a01b0389811660208301528816604082015260c060608201819052600090611ac3908301888a611a47565b8281036080840152611ad681878961196d565b905082810360a0840152611aeb81858761196d565b9c9b505050505050505050505050565b6000815180845260005b81811015611b2157602081850181015186830182015201611b05565b506000602082860101526020601f19601f83011685010191505092915050565b6001600160a01b0383168152604060208201819052600090611b6590830184611afb565b949350505050565b606081526000611b8160608301888a611a47565b8281036020840152611b9481878961196d565b90508281036040840152611ba981858761196d565b9998505050505050505050565b6001600160a01b039390931683526020830191909152604082015260600190565b600080600080600060a08688031215611bef57600080fd5b8535611bfa816115d8565b94506020860135611c0a816115d8565b93506040860135611c1a816115d8565b94979396509394606081013594506080013592915050565b60208082526022908201527f4368696c64455243313135355072656469636174653a204d494e545f4641494c604082015261115160f21b606082015260800190565b634e487b7160e01b600052604160045260246000fd5b604051601f8201601f191681016001600160401b0381118282101715611cb257611cb2611c74565b604052919050565b60006001600160401b03821115611cd357611cd3611c74565b5060051b60200190565b600082601f830112611cee57600080fd5b81356020611d03611cfe83611cba565b611c8a565b82815260059290921b84018101918181019086841115611d2257600080fd5b8286015b84811015611d3d5780358352918301918301611d26565b509695505050505050565b60008060008060008060c08789031215611d6157600080fd5b86359550602080880135611d74816115d8565b95506040880135611d84816115d8565b945060608801356001600160401b0380821115611da057600080fd5b818a0191508a601f830112611db457600080fd5b8135611dc2611cfe82611cba565b81815260059190911b8301840190848101908d831115611de157600080fd5b938501935b82851015611e08578435611df9816115d8565b82529385019390850190611de6565b9750505060808a0135925080831115611e2057600080fd5b611e2c8b848c01611cdd565b945060a08a0135925080831115611e4257600080fd5b5050611e5089828a01611cdd565b9150509295509295509295565b600081518084526020808501945080840160005b83811015611a8557815187529582019590820190600101611e71565b606080825284519082018190526000906020906080840190828801845b82811015611ecf5781516001600160a01b031684529284019290840190600101611eaa565b50505083810382850152611ee38187611e5d565b9150508281036040840152611ef88185611e5d565b9695505050505050565b600080600060608486031215611f1757600080fd5b83359250602080850135611f2a816115d8565b925060408501356001600160401b0380821115611f4657600080fd5b818701915087601f830112611f5a57600080fd5b813581811115611f6c57611f6c611c74565b611f7e601f8201601f19168501611c8a565b91508082528884828501011115611f9457600080fd5b8084840185840137600084828401015250809350505050925092509256fea26469706673582212200c4c5c9b53a533081213342cd86f6dcc2549159a1a5ec39ac85621bb137a4c8f64736f6c63430008130033",
+                "balance": "0x0"
+            },
+            "0x0000000000000000000000000000000000001010": {
+                "code": "0x608060405234801561001057600080fd5b50600436106101425760003560e01c806370a08231116100b85780639dc29fac1161007c5780639dc29fac14610278578063a457c2d71461028b578063a9059cbb1461029e578063dd62ed3e146102b1578063e0563ab1146102c4578063e6198705146102cd57600080fd5b806370a082311461022d5780638420ce9914610248578063947287cf1461025d57806395d89b411461026657806397e5230d1461026e57600080fd5b8063284017f51161010a578063284017f5146101d2578063313ce567146101db57806339509351146101f05780633b878c221461020357806340c10f191461020c57806351351d531461021f57600080fd5b806306fdde0314610147578063095ea7b31461016557806318160ddd146101885780631f2d00651461019a57806323b872dd146101bf575b600080fd5b61014f6102de565b60405161015c9190610cfd565b60405180910390f35b610178610173366004610d4c565b610370565b604051901515815260200161015c565b6034545b60405190815260200161015c565b6036546001600160a01b03165b6040516001600160a01b03909116815260200161015c565b6101786101cd366004610d76565b61038a565b6101a761202081565b60395460405160ff909116815260200161015c565b6101786101fe366004610d4c565b6103ae565b6101a761101081565b61017861021a366004610d4c565b6103d0565b6101a76002600160a01b0381565b61018c61023b366004610db2565b6001600160a01b03163190565b61025b610256366004610e1d565b610419565b005b61018c61520881565b61014f6105c8565b61018c620249f081565b610178610286366004610d4c565b6105d7565b610178610299366004610d4c565b61060e565b6101786102ac366004610d4c565b610689565b61018c6102bf366004610ec8565b610697565b6101a761203081565b6035546001600160a01b03166101a7565b6060603780546102ed90610efb565b80601f016020809104026020016040519081016040528092919081815260200182805461031990610efb565b80156103665780601f1061033b57610100808354040283529160200191610366565b820191906000526020600020905b81548152906001019060200180831161034957829003601f168201915b5050505050905090565b60003361037e8185856106c2565b60019150505b92915050565b6000336103988582856107e6565b6103a3858585610860565b506001949350505050565b60003361037e8185856103c18383610697565b6103cb9190610f4b565b6106c2565b6035546000906001600160a01b031633146104065760405162461bcd60e51b81526004016103fd90610f5e565b60405180910390fd5b6104108383610a25565b50600192915050565b600054610100900460ff16158080156104395750600054600160ff909116105b806104535750303b158015610453575060005460ff166001145b6104b65760405162461bcd60e51b815260206004820152602e60248201527f496e697469616c697a61626c653a20636f6e747261637420697320616c72656160448201526d191e481a5b9a5d1a585b1a5e995960921b60648201526084016103fd565b6000805460ff1916600117905580156104d9576000805461ff0019166101001790555b336002600160a01b031461051d5760405163973d02cb60e01b815260206004820152600a60248201526914d654d5115350d0531360b21b60448201526064016103fd565b603580546001600160a01b03808b166001600160a01b03199283161790925560368054928a1692909116919091179055603761055a868883611007565b506038610568848683611007565b506039805460ff191660ff841617905580156105be576000805461ff0019169055604051600181527f7f26b83ff96e1f2b6a682f133852f6798a09c465da95921460cefb38474024989060200160405180910390a15b5050505050505050565b6060603880546102ed90610efb565b6035546000906001600160a01b031633146106045760405162461bcd60e51b81526004016103fd90610f5e565b6104108383610b7f565b6000338161061c8286610697565b90508381101561067c5760405162461bcd60e51b815260206004820152602560248201527f45524332303a2064656372656173656420616c6c6f77616e63652062656c6f77604482015264207a65726f60d81b60648201526084016103fd565b6103a382868684036106c2565b60003361037e818585610860565b6001600160a01b03918216600090815260336020908152604080832093909416825291909152205490565b6001600160a01b0383166107245760405162461bcd60e51b8152602060048201526024808201527f45524332303a20617070726f76652066726f6d20746865207a65726f206164646044820152637265737360e01b60648201526084016103fd565b6001600160a01b0382166107855760405162461bcd60e51b815260206004820152602260248201527f45524332303a20617070726f766520746f20746865207a65726f206164647265604482015261737360f01b60648201526084016103fd565b6001600160a01b0383811660008181526033602090815260408083209487168084529482529182902085905590518481527f8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b925910160405180910390a3505050565b60006107f28484610697565b9050600019811461085a578181101561084d5760405162461bcd60e51b815260206004820152601d60248201527f45524332303a20696e73756666696369656e7420616c6c6f77616e636500000060448201526064016103fd565b61085a84848484036106c2565b50505050565b6001600160a01b0383166108c45760405162461bcd60e51b815260206004820152602560248201527f45524332303a207472616e736665722066726f6d20746865207a65726f206164604482015264647265737360d81b60648201526084016103fd565b6001600160a01b0382166109265760405162461bcd60e51b815260206004820152602360248201527f45524332303a207472616e7366657220746f20746865207a65726f206164647260448201526265737360e81b60648201526084016103fd565b6000806120206001600160a01b031685858560405160200161094a939291906110c8565b60408051601f1981840301815290829052610964916110ec565b6000604051808303816000865af19150503d80600081146109a1576040519150601f19603f3d011682016040523d82523d6000602084013e6109a6565b606091505b50915091508180156109c75750808060200190518101906109c79190611108565b6109e35760405162461bcd60e51b81526004016103fd9061112a565b836001600160a01b0316856001600160a01b031660008051602061116e83398151915285604051610a1691815260200190565b60405180910390a35050505050565b6001600160a01b038216610a7b5760405162461bcd60e51b815260206004820152601f60248201527f45524332303a206d696e7420746f20746865207a65726f20616464726573730060448201526064016103fd565b8060346000828254610a8d9190610f4b565b9091555050604051600090819061202090610ab0908390879087906020016110c8565b60408051601f1981840301815290829052610aca916110ec565b6000604051808303816000865af19150503d8060008114610b07576040519150601f19603f3d011682016040523d82523d6000602084013e610b0c565b606091505b5091509150818015610b2d575080806020019051810190610b2d9190611108565b610b495760405162461bcd60e51b81526004016103fd9061112a565b6040518381526001600160a01b0385169060009060008051602061116e833981519152906020015b60405180910390a350505050565b6001600160a01b038216610bdf5760405162461bcd60e51b815260206004820152602160248201527f45524332303a206275726e2066726f6d20746865207a65726f206164647265736044820152607360f81b60648201526084016103fd565b8060346000828254610bf1919061115a565b9091555050604051600090819061202090610c14908690849087906020016110c8565b60408051601f1981840301815290829052610c2e916110ec565b6000604051808303816000865af19150503d8060008114610c6b576040519150601f19603f3d011682016040523d82523d6000602084013e610c70565b606091505b5091509150818015610c91575080806020019051810190610c919190611108565b610cad5760405162461bcd60e51b81526004016103fd9061112a565b6040518381526000906001600160a01b0386169060008051602061116e83398151915290602001610b71565b60005b83811015610cf4578181015183820152602001610cdc565b50506000910152565b6020815260008251806020840152610d1c816040850160208701610cd9565b601f01601f19169190910160400192915050565b80356001600160a01b0381168114610d4757600080fd5b919050565b60008060408385031215610d5f57600080fd5b610d6883610d30565b946020939093013593505050565b600080600060608486031215610d8b57600080fd5b610d9484610d30565b9250610da260208501610d30565b9150604084013590509250925092565b600060208284031215610dc457600080fd5b610dcd82610d30565b9392505050565b60008083601f840112610de657600080fd5b50813567ffffffffffffffff811115610dfe57600080fd5b602083019150836020828501011115610e1657600080fd5b9250929050565b600080600080600080600060a0888a031215610e3857600080fd5b610e4188610d30565b9650610e4f60208901610d30565b9550604088013567ffffffffffffffff80821115610e6c57600080fd5b610e788b838c01610dd4565b909750955060608a0135915080821115610e9157600080fd5b50610e9e8a828b01610dd4565b909450925050608088013560ff81168114610eb857600080fd5b8091505092959891949750929550565b60008060408385031215610edb57600080fd5b610ee483610d30565b9150610ef260208401610d30565b90509250929050565b600181811c90821680610f0f57607f821691505b602082108103610f2f57634e487b7160e01b600052602260045260246000fd5b50919050565b634e487b7160e01b600052601160045260246000fd5b8082018082111561038457610384610f35565b60208082526024908201527f4e617469766545524332303a204f6e6c79207072656469636174652063616e2060408201526318d85b1b60e21b606082015260800190565b634e487b7160e01b600052604160045260246000fd5b601f82111561100257600081815260208120601f850160051c81016020861015610fdf5750805b601f850160051c820191505b81811015610ffe57828155600101610feb565b5050505b505050565b67ffffffffffffffff83111561101f5761101f610fa2565b6110338361102d8354610efb565b83610fb8565b6000601f841160018114611067576000851561104f5750838201355b600019600387901b1c1916600186901b1783556110c1565b600083815260209020601f19861690835b828110156110985786850135825560209485019460019092019101611078565b50868210156110b55760001960f88860031b161c19848701351681555b505060018560011b0183555b5050505050565b6001600160a01b039384168152919092166020820152604081019190915260600190565b600082516110fe818460208701610cd9565b9190910192915050565b60006020828403121561111a57600080fd5b81518015158114610dcd57600080fd5b60208082526016908201527514149150d3d35412531157d0d0531317d1905253115160521b604082015260600190565b8181038181111561038457610384610f3556feddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3efa264697066735822122020d4a9c065f722d638ec115bf32ed1a8620dca26d052147ca0029d6b7b9aec9d64736f6c63430008130033",
+                "balance": "0x0"
+            },
+            "0x61324166B0202DB1E7502924326262274Fa4358F": {
+                "balance": "0xf4240"
+            },
+            "0x9aBb8441A12d4FD8D505C3fc50cDdc45E0df2b1e": {
+                "balance": "0xd3c21bcecceda1000000"
+            },
+            "0xCaB5AAC79Bebe326e0c80d72b5662E73f5D8ea56": {
+                "balance": "0xd3c21bcecceda1000000"
+            },
+            "0xFE5E166BA5EA50c04fCa00b07b59966E6C2E9570": {
+                "balance": "0xd3c21bcecceda1000000"
+            }
+        },
+        "number": "0x0",
+        "gasUsed": "0x70000",
+        "parentHash": "0x0000000000000000000000000000000000000000000000000000000000000000",
+        "baseFee": "0x0",
+        "baseFeeEM": "0x0"
+    },
+    "params": {
+        "forks": {
+            "homestead": 0,
+            "byzantium": 0,
+            "constantinople": 0,
+            "petersburg": 0,
+            "istanbul": 0,
+            "EIP150": 0,
+            "EIP158": 0,
+            "EIP155": 0
+        },
+        "chainID": 0,
+        "engine": {
+            "polybft": {
+                "initialValidatorSet": [
+                    {
+                        "address": "0x61324166B0202DB1E7502924326262274Fa4358F",
+                        "blsKey": "06d8d9e6af67c28e85ac400b72c2e635e83234f8a380865e050a206554049a222c4792120d84977a6ca669df56ff3a1cf1cfeccddb650e7aacff4ed6c1d4e37b055858209f80117b3c0a6e7a28e456d4caf2270f430f9df2ba37221f23e9bbd313c9ef488e1849cc5c40d18284d019dde5ed86770309b9c24b70ceff6167a6ca",
+                        "balance": "0xf4240",
+                        "stake": "0xd3c21bcecceda1000000",
+                        "multiAddr": "/ip4/127.0.0.1/tcp/30301/p2p/16Uiu2HAmMYyzK7c649Tnn6XdqFLP7fpPB2QWdck1Ee9vj5a7Nhg8"
+                    },
+                    {
+                        "address": "0xFE5E166BA5EA50c04fCa00b07b59966E6C2E9570",
+                        "blsKey": "0601da8856a6d3d3bb0f3bcbb90ea7b8c0db8271b9203e6123c6804aa3fc5f810be33287968ca1af2be11839516850a6ffef2337d99e679b7531efbbea2e3bf727a053c0cbede71da3d5f489b6ad862ccd8bb0bfb7fa379e3395d3b1142594a73020e87d63c298a3a4eba0ace65727f8659bab6389b9448b72512db72bbe937f",
+                        "balance": "0xd3c21bcecceda1000000",
+                        "stake": "0xd3c21bcecceda1000000",
+                        "multiAddr": "/ip4/127.0.0.1/tcp/30302/p2p/16Uiu2HAmLXVapjR2Yx3B1taCmHnckQ1ph2xrawBjW2kvSErps9CX"
+                    },
+                    {
+                        "address": "0x9aBb8441A12d4FD8D505C3fc50cDdc45E0df2b1e",
+                        "blsKey": "17c26d9d91dddc3c1318b20a1ddb3322ea1f4e4415c27e9011d706e7407eed672837173d1909cbff6ccdfd110af3b18bdfea878e8120fdb5bae70dc7a044a2f40aa8f118b41704896f474f80fff52d9047fa8e4a464ac86f9d05a0220975d8440e20c6307d866137053cabd4baf6ba84bfa4a22f5f9297c1bfc2380c23535210",
+                        "balance": "0xd3c21bcecceda1000000",
+                        "stake": "0xd3c21bcecceda1000000",
+                        "multiAddr": "/ip4/127.0.0.1/tcp/30303/p2p/16Uiu2HAmGskf5sZ514Ab4SHTPuw8RRBQudyrU211wn3P1knRz9Ed"
+                    },
+                    {
+                        "address": "0xCaB5AAC79Bebe326e0c80d72b5662E73f5D8ea56",
+                        "blsKey": "1d7bb7d44a2f0ebeae2f4380f88188080de34635d78a36647f0704c7b70de7291e2e3b9a1ef699a078c6cd9bb816ea2917c2c2fc699c6248f1f7812a167caf7e15361ec16df56d194768d57c79897c681c96f4321651464f7b577d08083d8b67213a1e29dc8495d8389e6cbd85fdd738c402a1801198b57b302e0e00dfaf1247",
+                        "balance": "0xd3c21bcecceda1000000",
+                        "stake": "0xd3c21bcecceda1000000",
+                        "multiAddr": "/ip4/127.0.0.1/tcp/30304/p2p/16Uiu2HAm42EFMhJPGcMRFHPaWWxBzoEsWRbGxJnBHMu4VFojg99U"
+                    }
+                ],
+                "bridge": null,
+                "epochSize": 10,
+                "epochReward": 1,
+                "sprintSize": 5,
+                "blockTime": "2s",
+                "governance": "0x61324166B0202DB1E7502924326262274Fa4358F",
+                "mintableNative": false,
+                "nativeTokenConfig": {
+                    "name": "Polygon",
+                    "symbol": "MATIC",
+                    "decimals": 18
+                },
+                "initialTrieRoot": "0x0000000000000000000000000000000000000000000000000000000000000000",
+                "maxValidatorSetSize": 9007199254740990,
+                "rewardConfig": {
+                    "rewardTokenAddress": "0x0000000000000000000000000000000000001010",
+                    "rewardWalletAddress": "0x61324166B0202DB1E7502924326262274Fa4358F",
+                    "rewardWalletAmount": "0xf4240"
+                }
+            }
+        },
+        "blockGasTarget": 0,
+        "transactionsAllowList": {
+            "adminAddresses": [
+                "0x061324166B0202Db1E7502924326262274fa4358"
+            ],
+            "enabledAddresses": [
+                "0x061324166B0202Db1E7502924326262274fa4358"
+            ]
+        },
+        "burnContract": null
+    },
+    "bootnodes": [
+        "/ip4/127.0.0.1/tcp/30301/p2p/16Uiu2HAmMYyzK7c649Tnn6XdqFLP7fpPB2QWdck1Ee9vj5a7Nhg8",
+        "/ip4/127.0.0.1/tcp/30302/p2p/16Uiu2HAmLXVapjR2Yx3B1taCmHnckQ1ph2xrawBjW2kvSErps9CX",
+        "/ip4/127.0.0.1/tcp/30303/p2p/16Uiu2HAmGskf5sZ514Ab4SHTPuw8RRBQudyrU211wn3P1knRz9Ed",
+        "/ip4/127.0.0.1/tcp/30304/p2p/16Uiu2HAm42EFMhJPGcMRFHPaWWxBzoEsWRbGxJnBHMu4VFojg99U"
+    ]
+}
\ No newline at end of file

From a0afbbb86bf0e612e22d73ef3b1cd9fcc71599e0 Mon Sep 17 00:00:00 2001
From: Maxim Filonov <53992153+sl1depengwyn@users.noreply.github.com>
Date: Thu, 4 May 2023 18:31:37 +0300
Subject: [PATCH 040/909] Refactor state changes

---
 .../transaction_state_controller.ex           |   1 +
 .../models/transaction_state_helper.ex        | 395 +++---------------
 .../transaction_state/_state_change.html.eex  |  14 +-
 .../transaction_state/_token_balance.html.eex |   6 +-
 .../views/api/v2/transaction_view.ex          |   5 +-
 .../views/transaction_state_view.ex           |  10 +-
 .../api/v2/transaction_controller_test.exs    |  69 +--
 .../transaction_state_controller_test.exs     |  17 +-
 apps/explorer/lib/explorer/chain.ex           |   4 +-
 .../explorer/chain/address/token_balance.ex   |  14 +-
 .../chain/transaction/state_change.ex         | 264 +++++++++++-
 apps/indexer/lib/indexer/fetcher.ex           |   3 +-
 .../lib/indexer/fetcher/token_balance.ex      |  20 +-
 13 files changed, 421 insertions(+), 401 deletions(-)

diff --git a/apps/block_scout_web/lib/block_scout_web/controllers/transaction_state_controller.ex b/apps/block_scout_web/lib/block_scout_web/controllers/transaction_state_controller.ex
index 9ebcc0751f13..1593af913b29 100644
--- a/apps/block_scout_web/lib/block_scout_web/controllers/transaction_state_controller.ex
+++ b/apps/block_scout_web/lib/block_scout_web/controllers/transaction_state_controller.ex
@@ -49,6 +49,7 @@ defmodule BlockScoutWeb.TransactionStateController do
             balance_before: state_change.balance_before,
             balance_after: state_change.balance_after,
             balance_diff: state_change.balance_diff,
+            token_id: state_change.token_id,
             conn: conn,
             miner: state_change.miner?
           )
diff --git a/apps/block_scout_web/lib/block_scout_web/models/transaction_state_helper.ex b/apps/block_scout_web/lib/block_scout_web/models/transaction_state_helper.ex
index f2255c314086..212051cc8fd8 100644
--- a/apps/block_scout_web/lib/block_scout_web/models/transaction_state_helper.ex
+++ b/apps/block_scout_web/lib/block_scout_web/models/transaction_state_helper.ex
@@ -1,19 +1,17 @@
 defmodule BlockScoutWeb.Models.TransactionStateHelper do
   @moduledoc """
-    Module includes functions needed for BlockScoutWeb.TransactionStateController
+    Transaction state changes related functions
   """
 
-  alias Explorer.{Chain, Chain.Wei, PagingOptions}
-  alias Explorer.Chain
   alias Explorer.Chain.Transaction.StateChange
+  alias Explorer.{Chain, PagingOptions}
+  alias Explorer.Chain.{Block, Transaction, Wei}
   alias Indexer.Fetcher.{CoinBalance, TokenBalance}
 
   {:ok, burn_address_hash} = Chain.string_to_address_hash("0x0000000000000000000000000000000000000000")
-
   @burn_address_hash burn_address_hash
 
-  # credo:disable-for-next-line /Complexity/
-  def state_changes(transaction) do
+  def state_changes(%Transaction{block: %Block{} = block} = transaction) do
     transaction_hash = transaction.hash
 
     full_options = [
@@ -31,375 +29,120 @@ defmodule BlockScoutWeb.Models.TransactionStateHelper do
 
     token_transfers = Chain.transaction_to_token_transfers(transaction_hash, full_options)
 
-    block = transaction.block
-
     block_txs =
       Chain.block_to_transactions(block.hash,
         necessity_by_association: %{},
         paging_options: %PagingOptions{key: nil, page_size: nil}
       )
 
-    {from_before, to_before, miner_before} = coin_balances_before(transaction, block_txs)
-
-    from_hash = transaction.from_address_hash
-    to_hash = transaction.to_address_hash
-    miner_hash = block.miner_hash
-
-    from_coin_entry =
-      if from_hash not in [to_hash, miner_hash] do
-        from = transaction.from_address
-        from_after = do_update_coin_balance_from_tx(from_hash, transaction, from_before, block)
-        balance_diff = Wei.sub(from_after, from_before)
-
-        if has_diff?(balance_diff) do
-          %StateChange{
-            coin_or_token_transfers: :coin,
-            address: from,
-            balance_before: from_before,
-            balance_after: from_after,
-            balance_diff: balance_diff,
-            miner?: false
-          }
-        end
-      end
-
-    to_coin_entry =
-      if not is_nil(to_hash) and to_hash != miner_hash do
-        to = transaction.to_address
-        to_after = do_update_coin_balance_from_tx(to_hash, transaction, to_before, block)
-        balance_diff = Wei.sub(to_after, to_before)
+    from_before_block = coin_balance(transaction.from_address_hash, block.number - 1)
+    to_before_block = coin_balance(transaction.to_address_hash, block.number - 1)
+    miner_before_block = coin_balance(block.miner_hash, block.number - 1)
 
-        if has_diff?(balance_diff) do
-          %StateChange{
-            coin_or_token_transfers: :coin,
-            address: to,
-            balance_before: to_before,
-            balance_after: to_after,
-            balance_diff: balance_diff,
-            miner?: false
-          }
-        end
-      end
+    {from_before_tx, to_before_tx, miner_before_tx} =
+      StateChange.coin_balances_before(transaction, block_txs, from_before_block, to_before_block, miner_before_block)
 
-    miner = block.miner
-    miner_after = do_update_coin_balance_from_tx(miner_hash, transaction, miner_before, block)
-    miner_diff = Wei.sub(miner_after, miner_before)
+    native_coin_entries =
+      StateChange.native_coin_entries(transaction, from_before_tx, to_before_tx, miner_before_tx)
+      |> IO.inspect(label: "native state changes")
 
-    miner_entry =
-      if has_diff?(miner_diff) do
-        %StateChange{
-          coin_or_token_transfers: :coin,
-          address: miner,
-          balance_before: miner_before,
-          balance_after: miner_after,
-          balance_diff: miner_diff,
-          miner?: true
-        }
-      end
-
-    token_balances_before = token_balances_before(token_transfers, transaction, block_txs)
-
-    token_balances_after =
-      do_update_token_balances_from_token_transfers(
-        token_transfers,
-        token_balances_before,
-        :include_transfers
-      )
-
-    items =
-      for {address, balances} <- token_balances_after,
-          {token_hash, {balance, transfers}} <- balances do
-        balance_before = token_balances_before[address][token_hash]
-        balance_diff = Decimal.sub(balance, balance_before)
-        transfer = elem(List.first(transfers), 1)
+    token_balances_before =
+      token_transfers
+      |> Enum.reduce(%{}, &token_transfers_to_balances_reducer/2)
+      |> StateChange.token_balances_before(transaction, block_txs)
 
-        if transfer.token.type != "ERC-20" or has_diff?(balance_diff) do
-          %StateChange{
-            coin_or_token_transfers: transfers,
-            address: address,
-            balance_before: balance_before,
-            balance_after: balance,
-            balance_diff: balance_diff,
-            miner?: false
-          }
-        end
-      end
+    tokens_entries =
+      StateChange.token_entries(token_transfers, token_balances_before) |> IO.inspect(label: "token state changes")
 
-    [from_coin_entry, to_coin_entry, miner_entry | items]
-    |> Enum.reject(&is_nil/1)
-    |> Enum.sort_by(fn state_change -> to_string(state_change.address && state_change.address.hash) end)
+    native_coin_entries ++ tokens_entries
   end
 
-  defp coin_balance(address_hash, block_number, retry? \\ false)
+  def state_changes(_transaction), do: []
 
-  defp coin_balance(address_hash, _block_number, _retry?) when is_nil(address_hash) do
+  defp coin_balance(address_hash, _block_number) when is_nil(address_hash) do
     %Wei{value: Decimal.new(0)}
   end
 
-  defp coin_balance(address_hash, block_number, retry?) do
+  defp coin_balance(address_hash, block_number) do
     case Chain.get_coin_balance(address_hash, block_number) do
       %{value: val} when not is_nil(val) ->
         val
 
       _ ->
-        if retry? do
-          %Wei{value: Decimal.new(0)}
-        else
-          json_rpc_named_arguments = Application.get_env(:explorer, :json_rpc_named_arguments)
-          CoinBalance.run([{address_hash.bytes, block_number}], json_rpc_named_arguments)
-          # after CoinBalance.run balance is fetched and imported, so we can call coin_balance again
-          coin_balance(address_hash, block_number, true)
-        end
+        CoinBalance.async_fetch_balances([%{address_hash: address_hash, block_number: block_number}])
+        %Wei{value: Decimal.new(0)}
     end
   end
 
-  defp coin_balances_before(tx, block_txs) do
-    block = tx.block
-
-    from_before = coin_balance(tx.from_address_hash, block.number - 1)
-    to_before = coin_balance(tx.to_address_hash, block.number - 1)
-    miner_before = coin_balance(block.miner_hash, block.number - 1)
+  defp token_balances(address_hash, token_transfer, block_number) do
+    token = token_transfer.token
 
-    block_txs
-    |> Enum.reduce_while(
-      {from_before, to_before, miner_before},
-      fn block_tx, {block_from, block_to, block_miner} = state ->
-        if block_tx.index < tx.index do
-          {:cont,
-           {do_update_coin_balance_from_tx(tx.from_address_hash, block_tx, block_from, block),
-            do_update_coin_balance_from_tx(tx.to_address_hash, block_tx, block_to, block),
-            do_update_coin_balance_from_tx(tx.block.miner_hash, block_tx, block_miner, block)}}
-        else
-          # txs ordered by index ascending, so we can halt after facing index greater or equal than index of our tx
-          {:halt, state}
-        end
+    token_ids =
+      if token.type == "ERC-1155" do
+        token_transfer.token_ids || [token_transfer.token_id]
+      else
+        [nil]
       end
-    )
-  end
-
-  defp do_update_coin_balance_from_tx(address_hash, tx, balance, block) do
-    from = tx.from_address_hash
-    to = tx.to_address_hash
-    miner = block.miner_hash
 
-    balance
-    |> (&if(address_hash == from, do: Wei.sub(&1, from_loss(tx)), else: &1)).()
-    |> (&if(address_hash == to, do: Wei.sum(&1, to_profit(tx)), else: &1)).()
-    |> (&if(address_hash == miner, do: Wei.sum(&1, miner_profit(tx, block)), else: &1)).()
+    Enum.into(token_ids, %{transfers: []}, &{&1, token_balance(address_hash, block_number, token, &1)})
   end
 
-  defp token_balance(address_hash, token_transfer, block_number, retry? \\ false)
-
-  defp token_balance(@burn_address_hash, _token_transfer, _block_number, _retry?) do
+  defp token_balance(@burn_address_hash, _block_number, _token, _token_id) do
     Decimal.new(0)
   end
 
-  defp token_balance(address_hash, token_transfer, block_number, retry?) do
-    token = token_transfer.token
-    token_contract_address_hash = token.contract_address_hash
-
-    case Chain.get_token_balance(address_hash, token_contract_address_hash, block_number) do
+  defp token_balance(address_hash, block_number, token, token_id) do
+    case Chain.get_token_balance(address_hash, token.contract_address_hash, block_number, token_id) do
       %{value: val} when not is_nil(val) ->
         val
 
-      # we haven't fetched this balance yet
       _ ->
-        if retry? do
-          Decimal.new(0)
-        else
-          json_rpc_named_arguments = Application.get_env(:explorer, :json_rpc_named_arguments)
-
-          token_id_int = parse_token_id(token_transfer)
-
-          TokenBalance.run(
-            [
-              {address_hash.bytes, token_contract_address_hash.bytes, block_number, token.type, token_id_int, 0}
-            ],
-            json_rpc_named_arguments
-          )
-
-          # after TokenBalance.run balance is fetched and imported, so we can call token_balance again
-          token_balance(address_hash, token_transfer, block_number, true)
-        end
-    end
-  end
+        TokenBalance.async_fetch([
+          %{
+            token_contract_address_hash: token.contract_address_hash,
+            address_hash: address_hash,
+            block_number: block_number,
+            token_type: token.type,
+            token_id: token_id
+          }
+        ])
 
-  defp parse_token_id(token_transfer) do
-    case token_transfer.token_id do
-      %Decimal{} -> Decimal.to_integer(token_transfer.token_id)
-      id_int when is_integer(id_int) -> id_int
-      _ -> token_transfer.token_id
+        Decimal.new(0)
     end
   end
 
-  defp token_balances_before(token_transfers, tx, block_txs) do
-    balances_before =
-      token_transfers
-      |> Enum.reduce(%{}, fn transfer, balances_map ->
-        from = transfer.from_address
-        to = transfer.to_address
-        token_hash = transfer.token_contract_address_hash
-        prev_block = transfer.block_number - 1
-
-        balances_with_from =
-          case balances_map do
-            # from address already in the map
-            %{^from => %{^token_hash => _}} ->
-              balances_map
-
-            # we need to add from address into the map
-            _ ->
-              put_in(
-                balances_map,
-                Enum.map([from, token_hash], &Access.key(&1, %{})),
-                token_balance(from.hash, transfer, prev_block)
-              )
-          end
-
-        case balances_with_from do
-          # to address already in the map
-          %{^to => %{^token_hash => _}} ->
-            balances_with_from
-
-          # we need to add to address into the map
-          _ ->
-            put_in(
-              balances_with_from,
-              Enum.map([to, token_hash], &Access.key(&1, %{})),
-              token_balance(to.hash, transfer, prev_block)
-            )
-        end
-      end)
-
-    block_txs
-    |> Enum.reduce_while(
-      balances_before,
-      fn block_tx, state ->
-        if block_tx.index < tx.index do
-          {:cont, do_update_token_balances_from_token_transfers(block_tx.token_transfers, state)}
-        else
-          # txs ordered by index ascending, so we can halt after facing index greater or equal than index of our tx
-          {:halt, state}
-        end
-      end
-    )
-  end
-
-  defp do_update_token_balances_from_token_transfers(
-         token_transfers,
-         balances_map,
-         include_transfers \\ :no
-       ) do
-    Enum.reduce(
-      token_transfers,
-      balances_map,
-      &token_transfers_balances_reducer(&1, &2, include_transfers)
-    )
-  end
-
-  defp token_transfers_balances_reducer(transfer, state_balances_map, include_transfers) do
+  defp token_transfers_to_balances_reducer(transfer, balances) do
     from = transfer.from_address
     to = transfer.to_address
-    token = transfer.token_contract_address_hash
+    token_hash = transfer.token_contract_address_hash
+    prev_block = transfer.block_number - 1
 
-    balances_map_from_included =
-      case state_balances_map do
-        # from address is needed to be updated in our map
-        %{^from => %{^token => val}} ->
-          put_in(
-            state_balances_map,
-            Enum.map([from, token], &Access.key(&1, %{})),
-            do_update_balance(val, :from, transfer, include_transfers)
-          )
+    balances
+    |> case do
+      # from address already in the map
+      %{^from => %{^token_hash => _}} = balances ->
+        balances
 
-        # we are not interested in this address
-        _ ->
-          state_balances_map
-      end
-
-    case balances_map_from_included do
-      # to address is needed to be updated in our map
-      %{^to => %{^token => val}} ->
+      # we need to add from address into the map
+      balances ->
         put_in(
-          balances_map_from_included,
-          Enum.map([to, token], &Access.key(&1, %{})),
-          do_update_balance(val, :to, transfer, include_transfers)
+          balances,
+          Enum.map([from, token_hash], &Access.key(&1, %{})),
+          token_balances(from.hash, transfer, prev_block)
         )
-
-      # we are not interested in this address
-      _ ->
-        balances_map_from_included
-    end
-  end
-
-  # point of this function is to include all transfers for frontend if option :include_transfer is passed
-  defp do_update_balance(old_val, type, transfer, include_transfers) do
-    transfer_amount = if is_nil(transfer.amount), do: 1, else: transfer.amount
-
-    case {include_transfers, old_val, type} do
-      {:include_transfers, {val, transfers}, :from} ->
-        {Decimal.sub(val, transfer_amount), [{type, transfer} | transfers]}
-
-      {:include_transfers, {val, transfers}, :to} ->
-        {Decimal.add(val, transfer_amount), [{type, transfer} | transfers]}
-
-      {:include_transfers, val, :from} ->
-        {Decimal.sub(val, transfer_amount), [{type, transfer}]}
-
-      {:include_transfers, val, :to} ->
-        {Decimal.add(val, transfer_amount), [{type, transfer}]}
-
-      {_, val, :from} ->
-        Decimal.sub(val, transfer_amount)
-
-      {_, val, :to} ->
-        Decimal.add(val, transfer_amount)
     end
-  end
-
-  def from_loss(tx) do
-    {_, fee} = Chain.fee(tx, :wei)
-
-    if error?(tx) do
-      %Wei{value: fee}
-    else
-      Wei.sum(tx.value, %Wei{value: fee})
-    end
-  end
-
-  def to_profit(tx) do
-    if error?(tx) do
-      %Wei{value: 0}
-    else
-      tx.value
-    end
-  end
-
-  defp miner_profit(tx, block) do
-    base_fee_per_gas = block.base_fee_per_gas || %Wei{value: Decimal.new(0)}
-    max_priority_fee_per_gas = tx.max_priority_fee_per_gas || tx.gas_price
-    max_fee_per_gas = tx.max_fee_per_gas || tx.gas_price
+    |> case do
+      # to address already in the map
+      %{^to => %{^token_hash => _}} = balances ->
+        balances
 
-    priority_fee_per_gas =
-      Enum.min_by([max_priority_fee_per_gas, Wei.sub(max_fee_per_gas, base_fee_per_gas)], fn x ->
-        Wei.to(x, :wei)
-      end)
-
-    Wei.mult(priority_fee_per_gas, tx.gas_used)
-  end
-
-  defp error?(tx) do
-    case Chain.transaction_to_status(tx) do
-      {:error, _} -> true
-      _ -> false
+      # we need to add to address into the map
+      balances ->
+        put_in(
+          balances,
+          Enum.map([to, token_hash], &Access.key(&1, %{})),
+          token_balances(to.hash, transfer, prev_block)
+        )
     end
   end
-
-  def has_diff?(%Wei{value: val}) do
-    not Decimal.eq?(val, Decimal.new(0))
-  end
-
-  def has_diff?(val) do
-    not Decimal.eq?(val, Decimal.new(0))
-  end
 end
diff --git a/apps/block_scout_web/lib/block_scout_web/templates/transaction_state/_state_change.html.eex b/apps/block_scout_web/lib/block_scout_web/templates/transaction_state/_state_change.html.eex
index 85f491f99e02..67a8e63ea389 100644
--- a/apps/block_scout_web/lib/block_scout_web/templates/transaction_state/_state_change.html.eex
+++ b/apps/block_scout_web/lib/block_scout_web/templates/transaction_state/_state_change.html.eex
@@ -33,10 +33,10 @@
     <% end %>
     <%= if not_negative?(@balance_before) and not_negative?(@balance_after) do %>
       <td class="stakes-td">
-        <span><%= display_value(@balance_before, coin_or_transfer) %></span>
+        <span><%= display_value(@balance_before, coin_or_transfer, @token_id) %></span>
       </td>
       <td class="stakes-td">
-        <span><%= display_value(@balance_after, coin_or_transfer) %></span>
+        <span><%= display_value(@balance_after, coin_or_transfer, @token_id) %></span>
       </td>
     <% else %>
       <td class="stakes-td"></td>
@@ -44,20 +44,20 @@
     <% end %>
   <% end %>
   <td class="stakes-td">
-    <%= if is_list(@coin_or_token_transfers) and coin_or_transfer.token.type != "ERC-20" do %>
+    <%= if is_list(@coin_or_token_transfers) and coin_or_transfer.token.type == "ERC-721" do %>
       <%= for {type, transfer} <- @coin_or_token_transfers do %>
         <%= case type do %>
           <% :from ->  %>
-          <div class="py-1 mr-4 text-danger">▼ <%= display_nft(transfer) %></div>
+          <div class="py-1 mr-4 text-danger">▼ <%= display_erc_721(transfer) %></div>
           <% :to -> %>
-          <div class="py-1 mr-4 text-success">▲ <%= display_nft(transfer) %></div>
+          <div class="py-1 mr-4 text-success">▲ <%= display_erc_721(transfer) %></div>
         <% end %>
       <% end %>
     <% else %>
       <%= if not_negative?(@balance_diff) do %>
-        <span class="mr-4 text-success">▲ <%= display_value(@balance_diff, coin_or_transfer) %></span>
+        <span class="mr-4 text-success">▲ <%= display_value(@balance_diff, coin_or_transfer, @token_id) %></span>
       <% else %>
-        <span class="mr-4 text-danger">▼ <%= display_value(absolute_value_of(@balance_diff), coin_or_transfer) %></span>
+        <span class="mr-4 text-danger">▼ <%= display_value(absolute_value_of(@balance_diff), coin_or_transfer, @token_id) %></span>
       <% end %>
     <% end %>
   </td>
diff --git a/apps/block_scout_web/lib/block_scout_web/templates/transaction_state/_token_balance.html.eex b/apps/block_scout_web/lib/block_scout_web/templates/transaction_state/_token_balance.html.eex
index 6803a22d4087..17458e27875e 100644
--- a/apps/block_scout_web/lib/block_scout_web/templates/transaction_state/_token_balance.html.eex
+++ b/apps/block_scout_web/lib/block_scout_web/templates/transaction_state/_token_balance.html.eex
@@ -1 +1,5 @@
-<%= format_according_to_decimals(@balance, @transfer.token.decimals) %><%= " " %><%= render BlockScoutWeb.TransactionView, "_link_to_token_symbol.html", transfer: @transfer %>
+<%= if @token_id do %>
+    <%= BlockScoutWeb.Cldr.Number.to_string!(@balance, format: "#,###") %> <%= render BlockScoutWeb.TransactionView, "_transfer_token_with_id.html", transfer: @transfer, token_id: @token_id %>            
+<% else %>
+    <%= format_according_to_decimals(@balance, @transfer.token.decimals) %><%= " " %><%= render BlockScoutWeb.TransactionView, "_link_to_token_symbol.html", transfer: @transfer %>
+<% end %>
diff --git a/apps/block_scout_web/lib/block_scout_web/views/api/v2/transaction_view.ex b/apps/block_scout_web/lib/block_scout_web/views/api/v2/transaction_view.ex
index ee27b02290d5..a67fdded388d 100644
--- a/apps/block_scout_web/lib/block_scout_web/views/api/v2/transaction_view.ex
+++ b/apps/block_scout_web/lib/block_scout_web/views/api/v2/transaction_view.ex
@@ -544,7 +544,8 @@ defmodule BlockScoutWeb.API.V2.TransactionView do
         Helper.address_with_info(nil, state_change.address, state_change.address && state_change.address.hash),
       "is_miner" => state_change.miner?,
       "type" => type,
-      "token" => if(type == "token", do: TokenView.render("token.json", %{token: coin_or_transfer.token}))
+      "token" => if(type == "token", do: TokenView.render("token.json", %{token: coin_or_transfer.token})),
+      "token_id" => state_change.token_id
     }
     |> append_balances(state_change.balance_before, state_change.balance_after)
     |> append_balance_change(state_change, coin_or_transfer)
@@ -569,7 +570,7 @@ defmodule BlockScoutWeb.API.V2.TransactionView do
 
   defp append_balance_change(map, state_change, coin_or_transfer) do
     change =
-      if is_list(state_change.coin_or_token_transfers) and coin_or_transfer.token.type != "ERC-20" do
+      if is_list(state_change.coin_or_token_transfers) and coin_or_transfer.token.type == "ERC-721" do
         for {direction, token_transfer} <- state_change.coin_or_token_transfers do
           %{"total" => prepare_token_transfer_total(token_transfer), "direction" => direction}
         end
diff --git a/apps/block_scout_web/lib/block_scout_web/views/transaction_state_view.ex b/apps/block_scout_web/lib/block_scout_web/views/transaction_state_view.ex
index 98b5f7e51dd1..69d6eaad9f27 100644
--- a/apps/block_scout_web/lib/block_scout_web/views/transaction_state_view.ex
+++ b/apps/block_scout_web/lib/block_scout_web/views/transaction_state_view.ex
@@ -4,7 +4,7 @@ defmodule BlockScoutWeb.TransactionStateView do
   alias Explorer.Chain
   alias Explorer.Chain.Wei
 
-  import BlockScoutWeb.Models.TransactionStateHelper, only: [from_loss: 1, has_diff?: 1, to_profit: 1]
+  import Explorer.Chain.Transaction.StateChange, only: [from_loss: 1, has_diff?: 1, to_profit: 1]
 
   def not_negative?(%Wei{value: val}) do
     not Decimal.negative?(val)
@@ -26,15 +26,15 @@ defmodule BlockScoutWeb.TransactionStateView do
     has_diff?(from_loss(tx)) or has_diff?(to_profit(tx))
   end
 
-  def display_value(balance, :coin) do
+  def display_value(balance, :coin, _token_id) do
     format_wei_value(balance, :ether)
   end
 
-  def display_value(balance, token_transfer) do
-    render("_token_balance.html", transfer: token_transfer, balance: balance)
+  def display_value(balance, token_transfer, token_id) do
+    render("_token_balance.html", transfer: token_transfer, balance: balance, token_id: token_id)
   end
 
-  def display_nft(token_transfer) do
+  def display_erc_721(token_transfer) do
     render(BlockScoutWeb.TransactionView, "_total_transfers.html", transfer: token_transfer)
   end
 end
diff --git a/apps/block_scout_web/test/block_scout_web/controllers/api/v2/transaction_controller_test.exs b/apps/block_scout_web/test/block_scout_web/controllers/api/v2/transaction_controller_test.exs
index 1e3073d798b8..7057f79937b4 100644
--- a/apps/block_scout_web/test/block_scout_web/controllers/api/v2/transaction_controller_test.exs
+++ b/apps/block_scout_web/test/block_scout_web/controllers/api/v2/transaction_controller_test.exs
@@ -896,60 +896,31 @@ defmodule BlockScoutWeb.API.V2.TransactionControllerTest do
     end
 
     test "return existing tx", %{conn: conn} do
-      EthereumJSONRPC.Mox
-      |> stub(:json_rpc, fn
-        [%{id: id, method: "eth_getBalance", params: _}], _options ->
-          {:ok, [%{id: id, result: integer_to_quantity(123)}]}
-
-        [%{id: _id, method: "eth_getBlockByNumber", params: _}], _options ->
-          {:ok,
-           [
-             %{
-               id: 0,
-               jsonrpc: "2.0",
-               result: %{
-                 "author" => "0x0000000000000000000000000000000000000000",
-                 "difficulty" => "0x20000",
-                 "extraData" => "0x",
-                 "gasLimit" => "0x663be0",
-                 "gasUsed" => "0x0",
-                 "hash" => "0x5b28c1bfd3a15230c9a46b399cd0f9a6920d432e85381cc6a140b06e8410112f",
-                 "logsBloom" =>
-                   "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                 "miner" => "0x0000000000000000000000000000000000000000",
-                 "number" => integer_to_quantity(1),
-                 "parentHash" => "0x0000000000000000000000000000000000000000000000000000000000000000",
-                 "receiptsRoot" => "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                 "sealFields" => [
-                   "0x80",
-                   "0xb8410000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"
-                 ],
-                 "sha3Uncles" => "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347",
-                 "signature" =>
-                   "0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                 "size" => "0x215",
-                 "stateRoot" => "0xfad4af258fd11939fae0c6c6eec9d340b1caac0b0196fd9a1bc3f489c5bf00b3",
-                 "step" => "0",
-                 "timestamp" => "0x0",
-                 "totalDifficulty" => "0x20000",
-                 "transactions" => [],
-                 "transactionsRoot" => "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                 "uncles" => []
-               }
-             }
-           ]}
-      end)
-
-      insert(:block)
-      insert(:block)
-      address_a = insert(:address)
-      address_b = insert(:address)
+      block_before = insert(:block)
 
       transaction =
         :transaction
-        |> insert(from_address: address_a, to_address: address_b, value: 1000)
+        |> insert()
         |> with_block(status: :ok)
 
+      insert(:address_coin_balance,
+        address: transaction.from_address,
+        address_hash: transaction.from_address_hash,
+        block_number: block_before.number
+      )
+
+      insert(:address_coin_balance,
+        address: transaction.to_address,
+        address_hash: transaction.to_address_hash,
+        block_number: block_before.number
+      )
+
+      insert(:address_coin_balance,
+        address: transaction.block.miner,
+        address_hash: transaction.block.miner_hash,
+        block_number: block_before.number
+      )
+
       request = get(conn, "/api/v2/transactions/#{to_string(transaction.hash)}/state-changes")
 
       assert response = json_response(request, 200)
diff --git a/apps/block_scout_web/test/block_scout_web/controllers/transaction_state_controller_test.exs b/apps/block_scout_web/test/block_scout_web/controllers/transaction_state_controller_test.exs
index 956c7f2b9b91..47e28cd16212 100644
--- a/apps/block_scout_web/test/block_scout_web/controllers/transaction_state_controller_test.exs
+++ b/apps/block_scout_web/test/block_scout_web/controllers/transaction_state_controller_test.exs
@@ -7,6 +7,9 @@ defmodule BlockScoutWeb.TransactionStateControllerTest do
   import BlockScoutWeb.WeiHelper, only: [format_wei_value: 2]
   import EthereumJSONRPC, only: [integer_to_quantity: 1]
   alias Explorer.Chain.Wei
+  alias Indexer.Fetcher.CoinBalance
+
+  setup :set_mox_global
 
   describe "GET index/3" do
     test "loads existing transaction", %{conn: conn} do
@@ -156,16 +159,19 @@ defmodule BlockScoutWeb.TransactionStateControllerTest do
     end
 
     test "fetch coin balances if needed", %{conn: conn} do
+      json_rpc_named_arguments = Application.fetch_env!(:indexer, :json_rpc_named_arguments)
+      CoinBalance.Supervisor.Case.start_supervised!(json_rpc_named_arguments: json_rpc_named_arguments)
+
       EthereumJSONRPC.Mox
       |> stub(:json_rpc, fn
         [%{id: id, method: "eth_getBalance", params: _}], _options ->
           {:ok, [%{id: id, result: integer_to_quantity(123)}]}
 
-        [%{id: _id, method: "eth_getBlockByNumber", params: _}], _options ->
+        [%{id: id, method: "eth_getBlockByNumber", params: _}], _options ->
           {:ok,
            [
              %{
-               id: 0,
+               id: id,
                jsonrpc: "2.0",
                result: %{
                  "author" => "0x0000000000000000000000000000000000000000",
@@ -215,6 +221,13 @@ defmodule BlockScoutWeb.TransactionStateControllerTest do
       {:ok, %{"items" => items}} = conn.resp_body |> Poison.decode()
       full_text = Enum.join(items)
 
+      assert(length(items) == 3)
+      assert(String.contains?(full_text, format_wei_value(%Wei{value: Decimal.new(0)}, :ether)))
+
+      1 |> :timer.seconds() |> :timer.sleep()
+      conn = get(conn, transaction_state_path(conn, :index, transaction), %{type: "JSON"})
+      {:ok, %{"items" => items}} = conn.resp_body |> Poison.decode()
+      full_text = Enum.join(items)
       assert(String.contains?(full_text, format_wei_value(%Wei{value: Decimal.new(123)}, :ether)))
       assert(length(items) == 3)
     end
diff --git a/apps/explorer/lib/explorer/chain.ex b/apps/explorer/lib/explorer/chain.ex
index 59ad4956052e..ec867ce9c589 100644
--- a/apps/explorer/lib/explorer/chain.ex
+++ b/apps/explorer/lib/explorer/chain.ex
@@ -5530,8 +5530,8 @@ defmodule Explorer.Chain do
     %{balance | block_timestamp: formatted_date}
   end
 
-  def get_token_balance(address_hash, token_contract_address_hash, block_number) do
-    query = TokenBalance.fetch_token_balance(address_hash, token_contract_address_hash, block_number)
+  def get_token_balance(address_hash, token_contract_address_hash, block_number, token_id \\ nil) do
+    query = TokenBalance.fetch_token_balance(address_hash, token_contract_address_hash, block_number, token_id)
 
     Repo.one(query)
   end
diff --git a/apps/explorer/lib/explorer/chain/address/token_balance.ex b/apps/explorer/lib/explorer/chain/address/token_balance.ex
index 296a646af14a..c09f7e226193 100644
--- a/apps/explorer/lib/explorer/chain/address/token_balance.ex
+++ b/apps/explorer/lib/explorer/chain/address/token_balance.ex
@@ -94,7 +94,7 @@ defmodule Explorer.Chain.Address.TokenBalance do
   @doc """
   Builds an `Ecto.Query` to fetch the token balance of the given token contract hash of the given address in the given block.
   """
-  def fetch_token_balance(address_hash, token_contract_address_hash, block_number) do
+  def fetch_token_balance(address_hash, token_contract_address_hash, block_number, nil) do
     from(
       tb in TokenBalance,
       where: tb.address_hash == ^address_hash,
@@ -104,4 +104,16 @@ defmodule Explorer.Chain.Address.TokenBalance do
       order_by: [desc: :block_number]
     )
   end
+
+  def fetch_token_balance(address_hash, token_contract_address_hash, block_number, token_id) do
+    from(
+      tb in TokenBalance,
+      where: tb.address_hash == ^address_hash,
+      where: tb.token_contract_address_hash == ^token_contract_address_hash,
+      where: tb.token_id == ^token_id,
+      where: tb.block_number <= ^block_number,
+      limit: ^1,
+      order_by: [desc: :block_number]
+    )
+  end
 end
diff --git a/apps/explorer/lib/explorer/chain/transaction/state_change.ex b/apps/explorer/lib/explorer/chain/transaction/state_change.ex
index b0382e3dd3ac..e187719c23ff 100644
--- a/apps/explorer/lib/explorer/chain/transaction/state_change.ex
+++ b/apps/explorer/lib/explorer/chain/transaction/state_change.ex
@@ -1,6 +1,266 @@
 defmodule Explorer.Chain.Transaction.StateChange do
   @moduledoc """
-    Struct for storing state changes
+    Helper functions and struct for storing state changes
   """
-  defstruct [:coin_or_token_transfers, :address, :balance_before, :balance_after, :balance_diff, :miner?]
+
+  defstruct [:coin_or_token_transfers, :address, :token_id, :balance_before, :balance_after, :balance_diff, :miner?]
+
+  alias Explorer.Chain.Transaction.StateChange
+  alias Explorer.{Chain, Chain.Wei}
+
+  def coin_balances_before(tx, block_txs, from_before, to_before, miner_before) do
+    block = tx.block
+
+    block_txs
+    |> Enum.reduce_while(
+      {from_before, to_before, miner_before},
+      fn block_tx, {block_from, block_to, block_miner} = state ->
+        if block_tx.index < tx.index do
+          {:cont,
+           {update_coin_balance_from_tx(tx.from_address_hash, block_tx, block_from, block),
+            update_coin_balance_from_tx(tx.to_address_hash, block_tx, block_to, block),
+            update_coin_balance_from_tx(tx.block.miner_hash, block_tx, block_miner, block)}}
+        else
+          # txs ordered by index ascending, so we can halt after facing index greater or equal than index of our tx
+          {:halt, state}
+        end
+      end
+    )
+  end
+
+  def update_coin_balance_from_tx(address_hash, tx, balance, block) do
+    from = tx.from_address_hash
+    to = tx.to_address_hash
+    miner = block.miner_hash
+
+    balance
+    |> (&if(address_hash == from, do: Wei.sub(&1, from_loss(tx)), else: &1)).()
+    |> (&if(address_hash == to, do: Wei.sum(&1, to_profit(tx)), else: &1)).()
+    |> (&if(address_hash == miner, do: Wei.sum(&1, miner_profit(tx, block)), else: &1)).()
+  end
+
+  def token_balances_before(balances_before, tx, block_txs) do
+    block_txs
+    |> Enum.reduce_while(
+      balances_before,
+      fn block_tx, state ->
+        if block_tx.index < tx.index do
+          {:cont, do_update_token_balances_from_token_transfers(block_tx.token_transfers, state)}
+        else
+          # txs ordered by index ascending, so we can halt after facing index greater or equal than index of our tx
+          {:halt, state}
+        end
+      end
+    )
+  end
+
+  def do_update_token_balances_from_token_transfers(
+        token_transfers,
+        balances_map,
+        include_transfers \\ :no
+      ) do
+    Enum.reduce(
+      token_transfers,
+      balances_map,
+      &token_transfers_balances_reducer(&1, &2, include_transfers)
+    )
+  end
+
+  defp token_transfers_balances_reducer(transfer, state_balances_map, include_transfers) do
+    from = transfer.from_address
+    to = transfer.to_address
+    token = transfer.token_contract_address_hash
+
+    state_balances_map
+    |> case do
+      # from address is needed to be updated in our map
+      %{^from => %{^token => values}} = balances_map ->
+        put_in(
+          balances_map,
+          Enum.map([from, token], &Access.key(&1, %{})),
+          do_update_balance(values, :from, transfer, include_transfers)
+        )
+
+      # we are not interested in this address
+      balances_map ->
+        balances_map
+    end
+    |> case do
+      # to address is needed to be updated in our map
+      %{^to => %{^token => values}} = balances_map ->
+        put_in(
+          balances_map,
+          Enum.map([to, token], &Access.key(&1, %{})),
+          do_update_balance(values, :to, transfer, include_transfers)
+        )
+
+      # we are not interested in this address
+      balances_map ->
+        balances_map
+    end
+  end
+
+  # point of this function is to include all transfers for frontend if option :include_transfer is passed
+  defp do_update_balance(old_val, type, transfer, include_transfers) do
+    # HANDLE %{ID, VAL} INSTEAD OF OLD VAL
+    token_ids = if transfer.token.type == "ERC-1155", do: transfer.token_ids || [transfer.token_id], else: [nil]
+    transfer_amounts = transfer.amounts || [transfer.amount || 1]
+
+    sub_or_add =
+      case type do
+        :from -> &Decimal.sub/2
+        :to -> &Decimal.add/2
+      end
+
+    old_val_with_transfer =
+      if include_transfers == :include_transfers do
+        Map.update(old_val, :transfers, [{type, transfer}], fn transfers -> [{type, transfer} | transfers] end)
+      else
+        old_val
+      end
+
+    token_ids
+    |> Stream.zip(transfer_amounts)
+    |> Enum.reduce(old_val_with_transfer, fn {id, amount}, ids_to_balances ->
+      case ids_to_balances do
+        %{^id => val} -> %{ids_to_balances | id => sub_or_add.(val, amount)}
+        _ -> ids_to_balances
+      end
+    end)
+  end
+
+  def from_loss(tx) do
+    {_, fee} = Chain.fee(tx, :wei)
+
+    if error?(tx) do
+      %Wei{value: fee}
+    else
+      Wei.sum(tx.value, %Wei{value: fee})
+    end
+  end
+
+  def to_profit(tx) do
+    if error?(tx) do
+      %Wei{value: 0}
+    else
+      tx.value
+    end
+  end
+
+  defp miner_profit(tx, block) do
+    base_fee_per_gas = block.base_fee_per_gas || %Wei{value: Decimal.new(0)}
+    max_priority_fee_per_gas = tx.max_priority_fee_per_gas || tx.gas_price
+    max_fee_per_gas = tx.max_fee_per_gas || tx.gas_price
+
+    priority_fee_per_gas =
+      Enum.min_by([max_priority_fee_per_gas, Wei.sub(max_fee_per_gas, base_fee_per_gas)], fn x ->
+        Wei.to(x, :wei)
+      end)
+
+    Wei.mult(priority_fee_per_gas, tx.gas_used)
+  end
+
+  defp error?(tx) do
+    case Chain.transaction_to_status(tx) do
+      {:error, _} -> true
+      _ -> false
+    end
+  end
+
+  def has_diff?(%Wei{value: val}) do
+    not Decimal.eq?(val, Decimal.new(0))
+  end
+
+  def has_diff?(val) do
+    not Decimal.eq?(val, Decimal.new(0))
+  end
+
+  def state_change(address, balance_before, balance_after, miner? \\ true) do
+    %StateChange{
+      coin_or_token_transfers: :coin,
+      address: address,
+      balance_before: balance_before,
+      balance_after: balance_after,
+      balance_diff: balance_after |> Wei.sub(balance_before),
+      miner?: miner?
+    }
+  end
+
+  def native_coin_entries(transaction, from_before_tx, to_before_tx, miner_before_tx) do
+    block = transaction.block
+
+    from_hash = transaction.from_address_hash
+    to_hash = transaction.to_address_hash
+    miner_hash = block.miner_hash
+
+    from_coin_entry =
+      if from_hash not in [to_hash, miner_hash] do
+        from = transaction.from_address
+        from_after_tx = update_coin_balance_from_tx(from_hash, transaction, from_before_tx, block)
+        coin_entry(from, from_before_tx, from_after_tx)
+      end
+
+    to_coin_entry =
+      if not is_nil(to_hash) and to_hash != miner_hash do
+        to = transaction.to_address
+        to_after = update_coin_balance_from_tx(to_hash, transaction, to_before_tx, block)
+        coin_entry(to, to_before_tx, to_after)
+      end
+
+    miner = block.miner
+    miner_after = update_coin_balance_from_tx(miner_hash, transaction, miner_before_tx, block)
+    miner_entry = coin_entry(miner, miner_before_tx, miner_after, true)
+
+    [from_coin_entry, to_coin_entry, miner_entry] |> Enum.reject(&is_nil/1)
+  end
+
+  defp coin_entry(address, balance_before, balance_after, miner? \\ false) do
+    diff = Wei.sub(balance_after, balance_before)
+
+    if has_diff?(diff) do
+      %StateChange{
+        coin_or_token_transfers: :coin,
+        address: address,
+        token_id: nil,
+        balance_before: balance_before,
+        balance_after: balance_after,
+        balance_diff: diff,
+        miner?: miner?
+      }
+    else
+      nil
+    end
+  end
+
+  def token_entries(token_transfers, token_balances_before) do
+    token_balances_after =
+      do_update_token_balances_from_token_transfers(
+        token_transfers,
+        token_balances_before,
+        :include_transfers
+      )
+
+    for {address, token_balances} <- token_balances_after,
+        {token_hash, id_balances_with_transfers} <- token_balances,
+        {%{transfers: transfers}, id_balances} = Map.split(id_balances_with_transfers, [:transfers]),
+        {id, balance} <- id_balances do
+      balance_before = token_balances_before[address][token_hash][id]
+      balance_diff = Decimal.sub(balance, balance_before)
+      transfer = elem(List.first(transfers), 1)
+
+      if transfer.token.type != "ERC-20" or has_diff?(balance_diff) do
+        %StateChange{
+          coin_or_token_transfers: transfers,
+          address: address,
+          token_id: id,
+          balance_before: balance_before,
+          balance_after: balance,
+          balance_diff: balance_diff,
+          miner?: false
+        }
+      end
+    end
+    |> Enum.reject(&is_nil/1)
+    |> Enum.sort_by(fn state_change -> to_string(state_change.address && state_change.address.hash) end)
+  end
 end
diff --git a/apps/indexer/lib/indexer/fetcher.ex b/apps/indexer/lib/indexer/fetcher.ex
index fc9851da862e..b6fb4b5d2bdf 100644
--- a/apps/indexer/lib/indexer/fetcher.ex
+++ b/apps/indexer/lib/indexer/fetcher.ex
@@ -52,7 +52,8 @@ defmodule Indexer.Fetcher do
           end
 
           def disabled? do
-            Application.get_env(:indexer, __MODULE__, [])[:disabled?] == true
+            Application.get_env(:indexer, Indexer.Supervisor, [])[:enabled] == false or
+              Application.get_env(:indexer, __MODULE__, [])[:disabled?] == true
           end
 
           @impl Supervisor
diff --git a/apps/indexer/lib/indexer/fetcher/token_balance.ex b/apps/indexer/lib/indexer/fetcher/token_balance.ex
index bd0f3e1302fc..77e5e4f571b7 100644
--- a/apps/indexer/lib/indexer/fetcher/token_balance.ex
+++ b/apps/indexer/lib/indexer/fetcher/token_balance.ex
@@ -21,6 +21,7 @@ defmodule Indexer.Fetcher.TokenBalance do
   alias Explorer.Chain
   alias Explorer.Chain.Hash
   alias Indexer.{BufferedTask, TokenBalances, Tracer}
+  alias Indexer.Fetcher.TokenBalance.Supervisor, as: TokenBalanceSupervisor
 
   @behaviour BufferedTask
 
@@ -28,10 +29,23 @@ defmodule Indexer.Fetcher.TokenBalance do
 
   @max_retries 3
 
-  @spec async_fetch([]) :: :ok
+  @spec async_fetch([
+          %{
+            token_contract_address_hash: Hash.Address.t(),
+            address_hash: Hash.Address.t(),
+            block_number: non_neg_integer(),
+            token_type: String.t(),
+            token_id: non_neg_integer()
+          }
+        ]) :: :ok
   def async_fetch(token_balances) do
-    formatted_params = Enum.map(token_balances, &entry/1)
-    BufferedTask.buffer(__MODULE__, formatted_params, :infinity)
+    if TokenBalanceSupervisor.disabled?() do
+      :ok
+    else
+      formatted_params = Enum.map(token_balances, &entry/1)
+
+      BufferedTask.buffer(__MODULE__, formatted_params, :infinity)
+    end
   end
 
   @doc false

From be7f14cbb50815b7794c9f259d0360d114f8f5eb Mon Sep 17 00:00:00 2001
From: Maxim Filonov <53992153+sl1depengwyn@users.noreply.github.com>
Date: Sun, 7 May 2023 20:59:40 +0300
Subject: [PATCH 041/909] Add caching and pagination for state changes

---
 CHANGELOG.md                                  |  1 +
 .../lib/block_scout_web/chain.ex              | 12 +++
 .../api/v2/transaction_controller.ex          | 12 ++-
 .../transaction_state_controller.ex           | 17 +++-
 .../models/transaction_state_helper.ex        | 81 +++++++++++++------
 .../transaction_state/index.html.eex          |  7 ++
 .../views/api/v2/transaction_view.ex          |  7 +-
 apps/block_scout_web/priv/gettext/default.pot | 14 ++--
 .../priv/gettext/en/LC_MESSAGES/default.po    | 14 ++--
 .../api/v2/transaction_controller_test.exs    |  2 +-
 apps/explorer/lib/explorer/application.ex     |  5 ++
 apps/explorer/lib/explorer/chain.ex           | 17 ++--
 .../explorer/chain/address/token_balance.ex   |  2 +
 .../lib/explorer/chain/cache/state_changes.ex | 32 ++++++++
 .../chain/transaction/state_change.ex         | 36 +++++----
 .../chain/address/token_balance_test.exs      |  2 +-
 16 files changed, 192 insertions(+), 69 deletions(-)
 create mode 100644 apps/explorer/lib/explorer/chain/cache/state_changes.ex

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6c5e3aaddeec..81f71aae3f52 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -36,6 +36,7 @@
 
 - [#7439](https://github.com/blockscout/blockscout/pull/7439) - Define batch size for token balance fetcher via runtime env var
 - [#7298](https://github.com/blockscout/blockscout/pull/7298) - Add changes to support force email verification
+- [#7422](https://github.com/blockscout/blockscout/pull/7422) - Refactor state changes
 - [#7416](https://github.com/blockscout/blockscout/pull/7416) - Add option to disable reCAPTCHA
 - [#6694](https://github.com/blockscout/blockscout/pull/6694) - Add withdrawals support (EIP-4895)
 - [#7355](https://github.com/blockscout/blockscout/pull/7355) - Add endpoint for token info import
diff --git a/apps/block_scout_web/lib/block_scout_web/chain.ex b/apps/block_scout_web/lib/block_scout_web/chain.ex
index cc83b040a75e..8631c62d4da1 100644
--- a/apps/block_scout_web/lib/block_scout_web/chain.ex
+++ b/apps/block_scout_web/lib/block_scout_web/chain.ex
@@ -30,6 +30,7 @@ defmodule BlockScoutWeb.Chain do
     Token.Instance,
     TokenTransfer,
     Transaction,
+    Transaction.StateChange,
     Wei,
     Withdrawal
   }
@@ -289,6 +290,13 @@ defmodule BlockScoutWeb.Chain do
     [paging_options: %{@default_paging_options | key: {id}}]
   end
 
+  def paging_options(%{"items_count" => items_count, "state_changes" => _}) do
+    case Integer.parse(items_count) do
+      {count, ""} -> [paging_options: %{@default_paging_options | key: {count}}]
+      _ -> @default_paging_options
+    end
+  end
+
   def paging_options(_params), do: [paging_options: @default_paging_options]
 
   def put_key_value_to_paging_options([paging_options: paging_options], key, value) do
@@ -469,6 +477,10 @@ defmodule BlockScoutWeb.Chain do
     %{"unique_token" => Decimal.to_integer(token_id)}
   end
 
+  defp paging_params(%StateChange{}) do
+    %{"state_changes" => nil}
+  end
+
   defp block_or_transaction_from_param(param) do
     with {:error, :not_found} <- transaction_from_param(param) do
       hash_string_to_block(param)
diff --git a/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/transaction_controller.ex b/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/transaction_controller.ex
index 6e32354622aa..73fa39dce74d 100644
--- a/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/transaction_controller.ex
+++ b/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/transaction_controller.ex
@@ -245,11 +245,19 @@ defmodule BlockScoutWeb.API.V2.TransactionController do
             )},
          {:ok, false} <- AccessHelper.restricted_access?(to_string(transaction.from_address_hash), params),
          {:ok, false} <- AccessHelper.restricted_access?(to_string(transaction.to_address_hash), params) do
-      state_changes = TransactionStateHelper.state_changes(transaction)
+      state_changes_plus_next_page =
+        transaction |> TransactionStateHelper.state_changes(params |> paging_options() |> Keyword.merge(api?: true))
+
+      {state_changes, next_page} = split_list_by_page(state_changes_plus_next_page)
+
+      next_page_params =
+        next_page
+        |> next_page_params(state_changes, params)
+        |> delete_parameters_from_next_page_params()
 
       conn
       |> put_status(200)
-      |> render(:state_changes, %{state_changes: state_changes})
+      |> render(:state_changes, %{state_changes: state_changes, next_page_params: next_page_params})
     end
   end
 
diff --git a/apps/block_scout_web/lib/block_scout_web/controllers/transaction_state_controller.ex b/apps/block_scout_web/lib/block_scout_web/controllers/transaction_state_controller.ex
index 1593af913b29..37a9a24dbf64 100644
--- a/apps/block_scout_web/lib/block_scout_web/controllers/transaction_state_controller.ex
+++ b/apps/block_scout_web/lib/block_scout_web/controllers/transaction_state_controller.ex
@@ -16,6 +16,7 @@ defmodule BlockScoutWeb.TransactionStateController do
   import BlockScoutWeb.Account.AuthController, only: [current_user: 1]
   import BlockScoutWeb.Models.GetAddressTags, only: [get_address_tags: 2]
   import BlockScoutWeb.Models.GetTransactionTags, only: [get_transaction_with_addresses_tags: 2]
+  import BlockScoutWeb.Chain, only: [paging_options: 1, next_page_params: 3, split_list_by_page: 1]
 
   {:ok, burn_address_hash} = Chain.string_to_address_hash("0x0000000000000000000000000000000000000000")
 
@@ -36,7 +37,18 @@ defmodule BlockScoutWeb.TransactionStateController do
            AccessHelper.restricted_access?(to_string(transaction.from_address_hash), params),
          {:ok, false} <-
            AccessHelper.restricted_access?(to_string(transaction.to_address_hash), params) do
-      state_changes = TransactionStateHelper.state_changes(transaction)
+      state_changes_plus_next_page = transaction |> TransactionStateHelper.state_changes(paging_options(params))
+
+      {state_changes, next_page} = split_list_by_page(state_changes_plus_next_page)
+
+      next_page_url =
+        case next_page_params(next_page, state_changes, params) do
+          nil ->
+            nil
+
+          next_page_params ->
+            transaction_state_path(conn, :index, transaction, Map.delete(next_page_params, "type"))
+        end
 
       rendered_changes =
         Enum.map(state_changes, fn state_change ->
@@ -56,7 +68,8 @@ defmodule BlockScoutWeb.TransactionStateController do
         end)
 
       json(conn, %{
-        items: rendered_changes
+        items: rendered_changes,
+        next_page_path: next_page_url
       })
     else
       {:restricted_access, _} ->
diff --git a/apps/block_scout_web/lib/block_scout_web/models/transaction_state_helper.ex b/apps/block_scout_web/lib/block_scout_web/models/transaction_state_helper.ex
index 212051cc8fd8..1fdaf922017e 100644
--- a/apps/block_scout_web/lib/block_scout_web/models/transaction_state_helper.ex
+++ b/apps/block_scout_web/lib/block_scout_web/models/transaction_state_helper.ex
@@ -3,15 +3,49 @@ defmodule BlockScoutWeb.Models.TransactionStateHelper do
     Transaction state changes related functions
   """
 
+  import BlockScoutWeb.Chain, only: [default_paging_options: 0]
   alias Explorer.Chain.Transaction.StateChange
   alias Explorer.{Chain, PagingOptions}
   alias Explorer.Chain.{Block, Transaction, Wei}
+  alias Explorer.Chain.Cache.StateChanges
   alias Indexer.Fetcher.{CoinBalance, TokenBalance}
 
   {:ok, burn_address_hash} = Chain.string_to_address_hash("0x0000000000000000000000000000000000000000")
   @burn_address_hash burn_address_hash
 
-  def state_changes(%Transaction{block: %Block{} = block} = transaction) do
+  def state_changes(transaction, options \\ [])
+
+  def state_changes(%Transaction{block: %Block{}} = transaction, options) do
+    paging_options = Keyword.get(options, :paging_options, default_paging_options())
+    {offset} = paging_options.key || {0}
+
+    offset
+    |> Kernel.==(0)
+    |> if do
+      get_and_cache_state_changes(transaction, options)
+    else
+      case StateChanges.get(transaction.hash) do
+        %StateChanges{state_changes: state_changes} -> state_changes
+        _ -> get_and_cache_state_changes(transaction, options)
+      end
+    end
+    |> Enum.drop(offset)
+  end
+
+  def state_changes(_transaction, _options), do: []
+
+  defp get_and_cache_state_changes(transaction, options) do
+    state_changes = do_state_changes(transaction, options)
+
+    StateChanges.update(%StateChanges{
+      transaction_hash: transaction.hash,
+      state_changes: state_changes
+    })
+
+    state_changes
+  end
+
+  defp do_state_changes(%Transaction{block: %Block{} = block} = transaction, options) do
     transaction_hash = transaction.hash
 
     full_options = [
@@ -24,7 +58,8 @@ defmodule BlockScoutWeb.Models.TransactionStateHelper do
         to_address: :required
       },
       # we need to consider all token transfers in block to show whole state change of transaction
-      paging_options: %PagingOptions{key: nil, page_size: nil}
+      paging_options: %PagingOptions{key: nil, page_size: nil},
+      api?: Keyword.get(options, :api?, false)
     ]
 
     token_transfers = Chain.transaction_to_token_transfers(transaction_hash, full_options)
@@ -32,39 +67,35 @@ defmodule BlockScoutWeb.Models.TransactionStateHelper do
     block_txs =
       Chain.block_to_transactions(block.hash,
         necessity_by_association: %{},
-        paging_options: %PagingOptions{key: nil, page_size: nil}
+        paging_options: %PagingOptions{key: nil, page_size: nil},
+        api?: Keyword.get(options, :api?, false)
       )
 
-    from_before_block = coin_balance(transaction.from_address_hash, block.number - 1)
-    to_before_block = coin_balance(transaction.to_address_hash, block.number - 1)
-    miner_before_block = coin_balance(block.miner_hash, block.number - 1)
+    from_before_block = coin_balance(transaction.from_address_hash, block.number - 1, options)
+    to_before_block = coin_balance(transaction.to_address_hash, block.number - 1, options)
+    miner_before_block = coin_balance(block.miner_hash, block.number - 1, options)
 
     {from_before_tx, to_before_tx, miner_before_tx} =
       StateChange.coin_balances_before(transaction, block_txs, from_before_block, to_before_block, miner_before_block)
 
-    native_coin_entries =
-      StateChange.native_coin_entries(transaction, from_before_tx, to_before_tx, miner_before_tx)
-      |> IO.inspect(label: "native state changes")
+    native_coin_entries = StateChange.native_coin_entries(transaction, from_before_tx, to_before_tx, miner_before_tx)
 
     token_balances_before =
       token_transfers
-      |> Enum.reduce(%{}, &token_transfers_to_balances_reducer/2)
+      |> Enum.reduce(%{}, &token_transfers_to_balances_reducer(&1, &2, options))
       |> StateChange.token_balances_before(transaction, block_txs)
 
-    tokens_entries =
-      StateChange.token_entries(token_transfers, token_balances_before) |> IO.inspect(label: "token state changes")
+    tokens_entries = StateChange.token_entries(token_transfers, token_balances_before)
 
     native_coin_entries ++ tokens_entries
   end
 
-  def state_changes(_transaction), do: []
-
-  defp coin_balance(address_hash, _block_number) when is_nil(address_hash) do
+  defp coin_balance(address_hash, _block_number, _options) when is_nil(address_hash) do
     %Wei{value: Decimal.new(0)}
   end
 
-  defp coin_balance(address_hash, block_number) do
-    case Chain.get_coin_balance(address_hash, block_number) do
+  defp coin_balance(address_hash, block_number, options) do
+    case Chain.get_coin_balance(address_hash, block_number, options) do
       %{value: val} when not is_nil(val) ->
         val
 
@@ -74,7 +105,7 @@ defmodule BlockScoutWeb.Models.TransactionStateHelper do
     end
   end
 
-  defp token_balances(address_hash, token_transfer, block_number) do
+  defp token_balances(address_hash, token_transfer, block_number, options) do
     token = token_transfer.token
 
     token_ids =
@@ -84,15 +115,15 @@ defmodule BlockScoutWeb.Models.TransactionStateHelper do
         [nil]
       end
 
-    Enum.into(token_ids, %{transfers: []}, &{&1, token_balance(address_hash, block_number, token, &1)})
+    Enum.into(token_ids, %{transfers: []}, &{&1, token_balance(address_hash, block_number, token, &1, options)})
   end
 
-  defp token_balance(@burn_address_hash, _block_number, _token, _token_id) do
+  defp token_balance(@burn_address_hash, _block_number, _token, _token_id, _options) do
     Decimal.new(0)
   end
 
-  defp token_balance(address_hash, block_number, token, token_id) do
-    case Chain.get_token_balance(address_hash, token.contract_address_hash, block_number, token_id) do
+  defp token_balance(address_hash, block_number, token, token_id, options) do
+    case Chain.get_token_balance(address_hash, token.contract_address_hash, block_number, token_id, options) do
       %{value: val} when not is_nil(val) ->
         val
 
@@ -111,7 +142,7 @@ defmodule BlockScoutWeb.Models.TransactionStateHelper do
     end
   end
 
-  defp token_transfers_to_balances_reducer(transfer, balances) do
+  defp token_transfers_to_balances_reducer(transfer, balances, options) do
     from = transfer.from_address
     to = transfer.to_address
     token_hash = transfer.token_contract_address_hash
@@ -128,7 +159,7 @@ defmodule BlockScoutWeb.Models.TransactionStateHelper do
         put_in(
           balances,
           Enum.map([from, token_hash], &Access.key(&1, %{})),
-          token_balances(from.hash, transfer, prev_block)
+          token_balances(from.hash, transfer, prev_block, options)
         )
     end
     |> case do
@@ -141,7 +172,7 @@ defmodule BlockScoutWeb.Models.TransactionStateHelper do
         put_in(
           balances,
           Enum.map([to, token_hash], &Access.key(&1, %{})),
-          token_balances(to.hash, transfer, prev_block)
+          token_balances(to.hash, transfer, prev_block, options)
         )
     end
   end
diff --git a/apps/block_scout_web/lib/block_scout_web/templates/transaction_state/index.html.eex b/apps/block_scout_web/lib/block_scout_web/templates/transaction_state/index.html.eex
index c62dbb18bdf5..4e846ff351b1 100644
--- a/apps/block_scout_web/lib/block_scout_web/templates/transaction_state/index.html.eex
+++ b/apps/block_scout_web/lib/block_scout_web/templates/transaction_state/index.html.eex
@@ -4,6 +4,11 @@
     <%= render BlockScoutWeb.TransactionView, "_tabs.html", assigns %>
     <div class="card-body" data-async-load data-async-listing="<%= @current_path %>">
       <h2 class="card-title list-title-description"><%= gettext "State changes" %></h2>
+      
+      <div class="list-top-pagination-container-wrapper">
+        <%= render BlockScoutWeb.CommonComponentsView, "_pagination_container.html", position: "top", show_pagination_limit: true, data_next_page_button: true, data_prev_page_button: true %>
+      </div>
+      
       <div data-error-message class="alert alert-danger col-12 text-left" style="display: none; padding: 0.75rem 0rem; cursor: pointer;">
         <span href="#" class="alert alert-danger"><%= gettext("Something went wrong, click to reload.") %></span>
       </div>
@@ -46,6 +51,8 @@
           </div>
         </div>
       <% end %>
+      
+      <%= render BlockScoutWeb.CommonComponentsView, "_pagination_container.html", position: "bottom", cur_page_number: "1", show_pagination_limit: true, data_next_page_button: true, data_prev_page_button: true %>
     </div>
   </div>
 </section>
diff --git a/apps/block_scout_web/lib/block_scout_web/views/api/v2/transaction_view.ex b/apps/block_scout_web/lib/block_scout_web/views/api/v2/transaction_view.ex
index a67fdded388d..3ab56824b0b8 100644
--- a/apps/block_scout_web/lib/block_scout_web/views/api/v2/transaction_view.ex
+++ b/apps/block_scout_web/lib/block_scout_web/views/api/v2/transaction_view.ex
@@ -109,8 +109,11 @@ defmodule BlockScoutWeb.API.V2.TransactionView do
     }
   end
 
-  def render("state_changes.json", %{state_changes: state_changes}) do
-    Enum.map(state_changes, &prepare_state_change(&1))
+  def render("state_changes.json", %{state_changes: state_changes, next_page_params: next_page_params}) do
+    %{
+      "items" => Enum.map(state_changes, &prepare_state_change(&1)),
+      "next_page_params" => next_page_params
+    }
   end
 
   def prepare_token_transfer(token_transfer, _conn) do
diff --git a/apps/block_scout_web/priv/gettext/default.pot b/apps/block_scout_web/priv/gettext/default.pot
index 3f0ed1b650bb..417c56b09c27 100644
--- a/apps/block_scout_web/priv/gettext/default.pot
+++ b/apps/block_scout_web/priv/gettext/default.pot
@@ -263,7 +263,7 @@ msgstr ""
 #: lib/block_scout_web/templates/address_contract_verification_common_fields/_library_address.html.eex:4
 #: lib/block_scout_web/templates/tokens/index.html.eex:34
 #: lib/block_scout_web/templates/transaction_log/_logs.html.eex:20
-#: lib/block_scout_web/templates/transaction_state/index.html.eex:29
+#: lib/block_scout_web/templates/transaction_state/index.html.eex:34
 #: lib/block_scout_web/templates/verified_contracts/index.html.eex:54
 #: lib/block_scout_web/views/address_view.ex:107
 #, elixir-autogen, elixir-format
@@ -429,12 +429,12 @@ msgstr ""
 msgid "Balance"
 msgstr ""
 
-#: lib/block_scout_web/templates/transaction_state/index.html.eex:35
+#: lib/block_scout_web/templates/transaction_state/index.html.eex:40
 #, elixir-autogen, elixir-format
 msgid "Balance after"
 msgstr ""
 
-#: lib/block_scout_web/templates/transaction_state/index.html.eex:32
+#: lib/block_scout_web/templates/transaction_state/index.html.eex:37
 #, elixir-autogen, elixir-format
 msgid "Balance before"
 msgstr ""
@@ -616,7 +616,7 @@ msgstr ""
 msgid "Cancel"
 msgstr ""
 
-#: lib/block_scout_web/templates/transaction_state/index.html.eex:38
+#: lib/block_scout_web/templates/transaction_state/index.html.eex:43
 #, elixir-autogen, elixir-format
 msgid "Change"
 msgstr ""
@@ -2468,7 +2468,7 @@ msgstr ""
 #: lib/block_scout_web/templates/transaction/index.html.eex:25
 #: lib/block_scout_web/templates/transaction_internal_transaction/index.html.eex:13
 #: lib/block_scout_web/templates/transaction_log/index.html.eex:15
-#: lib/block_scout_web/templates/transaction_state/index.html.eex:8
+#: lib/block_scout_web/templates/transaction_state/index.html.eex:13
 #: lib/block_scout_web/templates/transaction_token_transfer/index.html.eex:14
 #: lib/block_scout_web/templates/verified_contracts/index.html.eex:45
 #: lib/block_scout_web/templates/withdrawal/index.html.eex:14
@@ -2581,7 +2581,7 @@ msgstr ""
 msgid "The block height of a particular block is defined as the number of blocks preceding it in the blockchain."
 msgstr ""
 
-#: lib/block_scout_web/templates/transaction_state/index.html.eex:13
+#: lib/block_scout_web/templates/transaction_state/index.html.eex:18
 #, elixir-autogen, elixir-format
 msgid "The changes from this transaction have not yet happened since the transaction is still pending."
 msgstr ""
@@ -2795,7 +2795,7 @@ msgstr ""
 msgid "This page is no longer explorable! If you are lost, use the search bar to find what you are looking for."
 msgstr ""
 
-#: lib/block_scout_web/templates/transaction_state/index.html.eex:17
+#: lib/block_scout_web/templates/transaction_state/index.html.eex:22
 #, elixir-autogen, elixir-format
 msgid "This transaction hasn't changed state."
 msgstr ""
diff --git a/apps/block_scout_web/priv/gettext/en/LC_MESSAGES/default.po b/apps/block_scout_web/priv/gettext/en/LC_MESSAGES/default.po
index 740c7bd0635b..78b3505a6436 100644
--- a/apps/block_scout_web/priv/gettext/en/LC_MESSAGES/default.po
+++ b/apps/block_scout_web/priv/gettext/en/LC_MESSAGES/default.po
@@ -263,7 +263,7 @@ msgstr ""
 #: lib/block_scout_web/templates/address_contract_verification_common_fields/_library_address.html.eex:4
 #: lib/block_scout_web/templates/tokens/index.html.eex:34
 #: lib/block_scout_web/templates/transaction_log/_logs.html.eex:20
-#: lib/block_scout_web/templates/transaction_state/index.html.eex:29
+#: lib/block_scout_web/templates/transaction_state/index.html.eex:34
 #: lib/block_scout_web/templates/verified_contracts/index.html.eex:54
 #: lib/block_scout_web/views/address_view.ex:107
 #, elixir-autogen, elixir-format
@@ -429,12 +429,12 @@ msgstr ""
 msgid "Balance"
 msgstr ""
 
-#: lib/block_scout_web/templates/transaction_state/index.html.eex:35
+#: lib/block_scout_web/templates/transaction_state/index.html.eex:40
 #, elixir-autogen, elixir-format
 msgid "Balance after"
 msgstr ""
 
-#: lib/block_scout_web/templates/transaction_state/index.html.eex:32
+#: lib/block_scout_web/templates/transaction_state/index.html.eex:37
 #, elixir-autogen, elixir-format
 msgid "Balance before"
 msgstr ""
@@ -616,7 +616,7 @@ msgstr ""
 msgid "Cancel"
 msgstr ""
 
-#: lib/block_scout_web/templates/transaction_state/index.html.eex:38
+#: lib/block_scout_web/templates/transaction_state/index.html.eex:43
 #, elixir-autogen, elixir-format
 msgid "Change"
 msgstr ""
@@ -2468,7 +2468,7 @@ msgstr ""
 #: lib/block_scout_web/templates/transaction/index.html.eex:25
 #: lib/block_scout_web/templates/transaction_internal_transaction/index.html.eex:13
 #: lib/block_scout_web/templates/transaction_log/index.html.eex:15
-#: lib/block_scout_web/templates/transaction_state/index.html.eex:8
+#: lib/block_scout_web/templates/transaction_state/index.html.eex:13
 #: lib/block_scout_web/templates/transaction_token_transfer/index.html.eex:14
 #: lib/block_scout_web/templates/verified_contracts/index.html.eex:45
 #: lib/block_scout_web/templates/withdrawal/index.html.eex:14
@@ -2581,7 +2581,7 @@ msgstr ""
 msgid "The block height of a particular block is defined as the number of blocks preceding it in the blockchain."
 msgstr ""
 
-#: lib/block_scout_web/templates/transaction_state/index.html.eex:13
+#: lib/block_scout_web/templates/transaction_state/index.html.eex:18
 #, elixir-autogen, elixir-format
 msgid "The changes from this transaction have not yet happened since the transaction is still pending."
 msgstr ""
@@ -2795,7 +2795,7 @@ msgstr ""
 msgid "This page is no longer explorable! If you are lost, use the search bar to find what you are looking for."
 msgstr ""
 
-#: lib/block_scout_web/templates/transaction_state/index.html.eex:17
+#: lib/block_scout_web/templates/transaction_state/index.html.eex:22
 #, elixir-autogen, elixir-format
 msgid "This transaction hasn't changed state."
 msgstr ""
diff --git a/apps/block_scout_web/test/block_scout_web/controllers/api/v2/transaction_controller_test.exs b/apps/block_scout_web/test/block_scout_web/controllers/api/v2/transaction_controller_test.exs
index 7057f79937b4..6e3a58cf13ea 100644
--- a/apps/block_scout_web/test/block_scout_web/controllers/api/v2/transaction_controller_test.exs
+++ b/apps/block_scout_web/test/block_scout_web/controllers/api/v2/transaction_controller_test.exs
@@ -924,7 +924,7 @@ defmodule BlockScoutWeb.API.V2.TransactionControllerTest do
       request = get(conn, "/api/v2/transactions/#{to_string(transaction.hash)}/state-changes")
 
       assert response = json_response(request, 200)
-      assert Enum.count(response) == 3
+      assert Enum.count(response["items"]) == 3
     end
   end
 
diff --git a/apps/explorer/lib/explorer/application.ex b/apps/explorer/lib/explorer/application.ex
index 076ada679548..62e003b2a7c3 100644
--- a/apps/explorer/lib/explorer/application.ex
+++ b/apps/explorer/lib/explorer/application.ex
@@ -19,6 +19,7 @@ defmodule Explorer.Application do
     MinMissingBlockNumber,
     NetVersion,
     PendingBlockOperation,
+    StateChanges,
     Transaction,
     Transactions,
     TransactionsApiV2,
@@ -67,6 +68,10 @@ defmodule Explorer.Application do
       NetVersion,
       PendingBlockOperation,
       Transaction,
+      BlockNumber,
+      StateChanges,
+      con_cache_child_spec(MarketHistoryCache.cache_name()),
+      con_cache_child_spec(RSK.cache_name(), ttl_check_interval: :timer.minutes(1), global_ttl: :timer.minutes(30)),
       Transactions,
       TransactionsApiV2,
       Uncles,
diff --git a/apps/explorer/lib/explorer/chain.ex b/apps/explorer/lib/explorer/chain.ex
index ec867ce9c589..acc191fa1ac8 100644
--- a/apps/explorer/lib/explorer/chain.ex
+++ b/apps/explorer/lib/explorer/chain.ex
@@ -987,9 +987,10 @@ defmodule Explorer.Chain do
       `:key` (a tuple of the lowest/oldest `{index}`) and. Results will be the transactions older than
       the `index` that are passed.
   """
-  @spec block_to_transactions(Hash.Full.t(), [paging_options | necessity_by_association_option], true | false) :: [
-          Transaction.t()
-        ]
+  @spec block_to_transactions(Hash.Full.t(), [paging_options | necessity_by_association_option | api?()], true | false) ::
+          [
+            Transaction.t()
+          ]
   def block_to_transactions(block_hash, options \\ [], old_ui? \\ true) when is_list(options) do
     necessity_by_association = Keyword.get(options, :necessity_by_association, %{})
 
@@ -3841,7 +3842,7 @@ defmodule Explorer.Chain do
       the `index` that are passed.
 
   """
-  @spec transaction_to_token_transfers(Hash.Full.t(), [paging_options | necessity_by_association_option]) :: [
+  @spec transaction_to_token_transfers(Hash.Full.t(), [paging_options | necessity_by_association_option | api?()]) :: [
           TokenTransfer.t()
         ]
   def transaction_to_token_transfers(transaction_hash, options \\ []) when is_list(options) do
@@ -5530,16 +5531,16 @@ defmodule Explorer.Chain do
     %{balance | block_timestamp: formatted_date}
   end
 
-  def get_token_balance(address_hash, token_contract_address_hash, block_number, token_id \\ nil) do
+  def get_token_balance(address_hash, token_contract_address_hash, block_number, token_id \\ nil, options \\ []) do
     query = TokenBalance.fetch_token_balance(address_hash, token_contract_address_hash, block_number, token_id)
 
-    Repo.one(query)
+    select_repo(options).one(query)
   end
 
-  def get_coin_balance(address_hash, block_number) do
+  def get_coin_balance(address_hash, block_number, options \\ []) do
     query = CoinBalance.fetch_coin_balance(address_hash, block_number)
 
-    Repo.one(query)
+    select_repo(options).one(query)
   end
 
   @spec address_to_balances_by_day(Hash.Address.t(), [api?]) :: [balance_by_day]
diff --git a/apps/explorer/lib/explorer/chain/address/token_balance.ex b/apps/explorer/lib/explorer/chain/address/token_balance.ex
index c09f7e226193..bdf7d42293b9 100644
--- a/apps/explorer/lib/explorer/chain/address/token_balance.ex
+++ b/apps/explorer/lib/explorer/chain/address/token_balance.ex
@@ -94,6 +94,8 @@ defmodule Explorer.Chain.Address.TokenBalance do
   @doc """
   Builds an `Ecto.Query` to fetch the token balance of the given token contract hash of the given address in the given block.
   """
+  def fetch_token_balance(address_hash, token_contract_address_hash, block_number, token_id \\ nil)
+
   def fetch_token_balance(address_hash, token_contract_address_hash, block_number, nil) do
     from(
       tb in TokenBalance,
diff --git a/apps/explorer/lib/explorer/chain/cache/state_changes.ex b/apps/explorer/lib/explorer/chain/cache/state_changes.ex
new file mode 100644
index 000000000000..f11f48efedcb
--- /dev/null
+++ b/apps/explorer/lib/explorer/chain/cache/state_changes.ex
@@ -0,0 +1,32 @@
+defmodule Explorer.Chain.Cache.StateChanges do
+  @moduledoc """
+  Caches the transaction state changes for pagination
+  """
+
+  alias Explorer.Chain.{Hash, OrderedCache}
+  alias Explorer.Chain.Transaction.StateChange
+
+  defstruct [:transaction_hash, :state_changes]
+
+  @type t :: %__MODULE__{
+          transaction_hash: Hash.t(),
+          state_changes: [StateChange.t()]
+        }
+
+  use OrderedCache,
+    name: :state_changes,
+    max_size: 10
+
+  @type element :: t()
+
+  @type id :: Hash.t()
+
+  def element_to_id(%__MODULE__{transaction_hash: tx_hash}) do
+    tx_hash
+  end
+
+  # in order to always keep just requested changes
+  def prevails?(a, b) do
+    a == b
+  end
+end
diff --git a/apps/explorer/lib/explorer/chain/transaction/state_change.ex b/apps/explorer/lib/explorer/chain/transaction/state_change.ex
index e187719c23ff..3a399aa019f1 100644
--- a/apps/explorer/lib/explorer/chain/transaction/state_change.ex
+++ b/apps/explorer/lib/explorer/chain/transaction/state_change.ex
@@ -3,10 +3,21 @@ defmodule Explorer.Chain.Transaction.StateChange do
     Helper functions and struct for storing state changes
   """
 
+  alias Explorer.Chain
+  alias Explorer.Chain.{Hash, TokenTransfer, Wei}
+  alias Explorer.Chain.Transaction.StateChange
+
   defstruct [:coin_or_token_transfers, :address, :token_id, :balance_before, :balance_after, :balance_diff, :miner?]
 
-  alias Explorer.Chain.Transaction.StateChange
-  alias Explorer.{Chain, Chain.Wei}
+  @type t :: %__MODULE__{
+          coin_or_token_transfers: :coin | [TokenTransfer.t()],
+          address: Hash.Address.t(),
+          token_id: nil | non_neg_integer(),
+          balance_before: Wei.t() | Decimal.t(),
+          balance_after: Wei.t() | Decimal.t(),
+          balance_diff: Wei.t() | Decimal.t(),
+          miner?: boolean()
+        }
 
   def coin_balances_before(tx, block_txs, from_before, to_before, miner_before) do
     block = tx.block
@@ -101,8 +112,14 @@ defmodule Explorer.Chain.Transaction.StateChange do
   end
 
   # point of this function is to include all transfers for frontend if option :include_transfer is passed
-  defp do_update_balance(old_val, type, transfer, include_transfers) do
-    # HANDLE %{ID, VAL} INSTEAD OF OLD VAL
+  defp do_update_balance(old_val, type, transfer, :include_transfers) do
+    old_val_with_transfer =
+      Map.update(old_val, :transfers, [{type, transfer}], fn transfers -> [{type, transfer} | transfers] end)
+
+    do_update_balance(old_val_with_transfer, type, transfer, :no)
+  end
+
+  defp do_update_balance(old_val, type, transfer, _) do
     token_ids = if transfer.token.type == "ERC-1155", do: transfer.token_ids || [transfer.token_id], else: [nil]
     transfer_amounts = transfer.amounts || [transfer.amount || 1]
 
@@ -112,16 +129,9 @@ defmodule Explorer.Chain.Transaction.StateChange do
         :to -> &Decimal.add/2
       end
 
-    old_val_with_transfer =
-      if include_transfers == :include_transfers do
-        Map.update(old_val, :transfers, [{type, transfer}], fn transfers -> [{type, transfer} | transfers] end)
-      else
-        old_val
-      end
-
     token_ids
     |> Stream.zip(transfer_amounts)
-    |> Enum.reduce(old_val_with_transfer, fn {id, amount}, ids_to_balances ->
+    |> Enum.reduce(old_val, fn {id, amount}, ids_to_balances ->
       case ids_to_balances do
         %{^id => val} -> %{ids_to_balances | id => sub_or_add.(val, amount)}
         _ -> ids_to_balances
@@ -227,8 +237,6 @@ defmodule Explorer.Chain.Transaction.StateChange do
         balance_diff: diff,
         miner?: miner?
       }
-    else
-      nil
     end
   end
 
diff --git a/apps/explorer/test/explorer/chain/address/token_balance_test.exs b/apps/explorer/test/explorer/chain/address/token_balance_test.exs
index 717a783767a5..bab58960fd28 100644
--- a/apps/explorer/test/explorer/chain/address/token_balance_test.exs
+++ b/apps/explorer/test/explorer/chain/address/token_balance_test.exs
@@ -78,7 +78,7 @@ defmodule Explorer.Chain.Address.TokenBalanceTest do
     end
   end
 
-  describe "fetch_token_balance/3" do
+  describe "fetch_token_balance/4" do
     test "returns the token balance for the given address" do
       token_balance = insert(:token_balance)
 

From db9b564f37e634021c1129a0defe6004bb1da428 Mon Sep 17 00:00:00 2001
From: Maxim Filonov <53992153+sl1depengwyn@users.noreply.github.com>
Date: Mon, 29 May 2023 23:07:08 +0300
Subject: [PATCH 042/909] Add historic balances to on demand fetchers

---
 .../models/transaction_state_helper.ex        | 20 ++++---
 .../transaction_state_controller_test.exs     | 22 ++++++++
 apps/explorer/lib/explorer/application.ex     |  3 --
 apps/indexer/lib/indexer/fetcher.ex           |  3 +-
 .../indexer/fetcher/coin_balance_on_demand.ex | 13 ++++-
 .../fetcher/token_balance_on_demand.ex        | 51 ++++++++++++++++++
 .../fetcher/coin_balance_on_demand_test.exs   | 52 ++++++++++++++++++-
 7 files changed, 145 insertions(+), 19 deletions(-)

diff --git a/apps/block_scout_web/lib/block_scout_web/models/transaction_state_helper.ex b/apps/block_scout_web/lib/block_scout_web/models/transaction_state_helper.ex
index 1fdaf922017e..e679627e8a74 100644
--- a/apps/block_scout_web/lib/block_scout_web/models/transaction_state_helper.ex
+++ b/apps/block_scout_web/lib/block_scout_web/models/transaction_state_helper.ex
@@ -8,7 +8,7 @@ defmodule BlockScoutWeb.Models.TransactionStateHelper do
   alias Explorer.{Chain, PagingOptions}
   alias Explorer.Chain.{Block, Transaction, Wei}
   alias Explorer.Chain.Cache.StateChanges
-  alias Indexer.Fetcher.{CoinBalance, TokenBalance}
+  alias Indexer.Fetcher.{CoinBalanceOnDemand, TokenBalanceOnDemand}
 
   {:ok, burn_address_hash} = Chain.string_to_address_hash("0x0000000000000000000000000000000000000000")
   @burn_address_hash burn_address_hash
@@ -100,7 +100,7 @@ defmodule BlockScoutWeb.Models.TransactionStateHelper do
         val
 
       _ ->
-        CoinBalance.async_fetch_balances([%{address_hash: address_hash, block_number: block_number}])
+        CoinBalanceOnDemand.trigger_historic_fetch(address_hash, block_number)
         %Wei{value: Decimal.new(0)}
     end
   end
@@ -128,15 +128,13 @@ defmodule BlockScoutWeb.Models.TransactionStateHelper do
         val
 
       _ ->
-        TokenBalance.async_fetch([
-          %{
-            token_contract_address_hash: token.contract_address_hash,
-            address_hash: address_hash,
-            block_number: block_number,
-            token_type: token.type,
-            token_id: token_id
-          }
-        ])
+        TokenBalanceOnDemand.trigger_historic_fetch(
+          address_hash,
+          token.contract_address_hash,
+          token.type,
+          token_id,
+          block_number
+        )
 
         Decimal.new(0)
     end
diff --git a/apps/block_scout_web/test/block_scout_web/controllers/transaction_state_controller_test.exs b/apps/block_scout_web/test/block_scout_web/controllers/transaction_state_controller_test.exs
index 47e28cd16212..ac5898f37f37 100644
--- a/apps/block_scout_web/test/block_scout_web/controllers/transaction_state_controller_test.exs
+++ b/apps/block_scout_web/test/block_scout_web/controllers/transaction_state_controller_test.exs
@@ -8,9 +8,31 @@ defmodule BlockScoutWeb.TransactionStateControllerTest do
   import EthereumJSONRPC, only: [integer_to_quantity: 1]
   alias Explorer.Chain.Wei
   alias Indexer.Fetcher.CoinBalance
+  alias Explorer.Counters.{AddressesCounter, AverageBlockTime}
+  alias Indexer.Fetcher.CoinBalanceOnDemand
 
   setup :set_mox_global
 
+  setup :verify_on_exit!
+
+  setup do
+    mocked_json_rpc_named_arguments = [
+      transport: EthereumJSONRPC.Mox,
+      transport_options: []
+    ]
+
+    start_supervised!({Task.Supervisor, name: Indexer.TaskSupervisor})
+    start_supervised!(AverageBlockTime)
+    start_supervised!(AddressesCounter)
+    start_supervised!({CoinBalanceOnDemand, [mocked_json_rpc_named_arguments, [name: CoinBalanceOnDemand]]})
+
+    Application.put_env(:explorer, AverageBlockTime, enabled: true, cache_period: 1_800_000)
+
+    on_exit(fn ->
+      Application.put_env(:explorer, AverageBlockTime, enabled: false, cache_period: 1_800_000)
+    end)
+  end
+
   describe "GET index/3" do
     test "loads existing transaction", %{conn: conn} do
       transaction = insert(:transaction)
diff --git a/apps/explorer/lib/explorer/application.ex b/apps/explorer/lib/explorer/application.ex
index 62e003b2a7c3..2431f0eee028 100644
--- a/apps/explorer/lib/explorer/application.ex
+++ b/apps/explorer/lib/explorer/application.ex
@@ -68,10 +68,7 @@ defmodule Explorer.Application do
       NetVersion,
       PendingBlockOperation,
       Transaction,
-      BlockNumber,
       StateChanges,
-      con_cache_child_spec(MarketHistoryCache.cache_name()),
-      con_cache_child_spec(RSK.cache_name(), ttl_check_interval: :timer.minutes(1), global_ttl: :timer.minutes(30)),
       Transactions,
       TransactionsApiV2,
       Uncles,
diff --git a/apps/indexer/lib/indexer/fetcher.ex b/apps/indexer/lib/indexer/fetcher.ex
index b6fb4b5d2bdf..fc9851da862e 100644
--- a/apps/indexer/lib/indexer/fetcher.ex
+++ b/apps/indexer/lib/indexer/fetcher.ex
@@ -52,8 +52,7 @@ defmodule Indexer.Fetcher do
           end
 
           def disabled? do
-            Application.get_env(:indexer, Indexer.Supervisor, [])[:enabled] == false or
-              Application.get_env(:indexer, __MODULE__, [])[:disabled?] == true
+            Application.get_env(:indexer, __MODULE__, [])[:disabled?] == true
           end
 
           @impl Supervisor
diff --git a/apps/indexer/lib/indexer/fetcher/coin_balance_on_demand.ex b/apps/indexer/lib/indexer/fetcher/coin_balance_on_demand.ex
index f48b889631fb..a4a5f5f97d6f 100644
--- a/apps/indexer/lib/indexer/fetcher/coin_balance_on_demand.ex
+++ b/apps/indexer/lib/indexer/fetcher/coin_balance_on_demand.ex
@@ -15,7 +15,7 @@ defmodule Indexer.Fetcher.CoinBalanceOnDemand do
 
   alias EthereumJSONRPC.FetchedBalances
   alias Explorer.{Chain, Repo}
-  alias Explorer.Chain.Address
+  alias Explorer.Chain.{Address, Hash}
   alias Explorer.Chain.Address.{CoinBalance, CoinBalanceDaily}
   alias Explorer.Chain.Cache.{Accounts, BlockNumber}
   alias Explorer.Counters.AverageBlockTime
@@ -50,6 +50,11 @@ defmodule Indexer.Fetcher.CoinBalanceOnDemand do
     end
   end
 
+  @spec trigger_historic_fetch(Hash.Address.t(), non_neg_integer()) :: balance_status
+  def trigger_historic_fetch(address_hash, block_number) do
+    do_trigger_historic_fetch(address_hash, block_number)
+  end
+
   ## Callbacks
 
   def child_spec([json_rpc_named_arguments, server_opts]) do
@@ -134,6 +139,12 @@ defmodule Indexer.Fetcher.CoinBalanceOnDemand do
     do_trigger_balance_fetch_query(address, latest_block_number, stale_balance_window, latest, latest_by_day)
   end
 
+  defp do_trigger_historic_fetch(address_hash, block_number) do
+    GenServer.cast(__MODULE__, {:fetch_and_import, block_number, %{hash: address_hash}})
+
+    {:stale, 0}
+  end
+
   defp do_trigger_balance_fetch_query(
          address,
          latest_block_number,
diff --git a/apps/indexer/lib/indexer/fetcher/token_balance_on_demand.ex b/apps/indexer/lib/indexer/fetcher/token_balance_on_demand.ex
index bddfdb809bbd..433fdadfb81b 100644
--- a/apps/indexer/lib/indexer/fetcher/token_balance_on_demand.ex
+++ b/apps/indexer/lib/indexer/fetcher/token_balance_on_demand.ex
@@ -29,6 +29,20 @@ defmodule Indexer.Fetcher.TokenBalanceOnDemand do
     end
   end
 
+  @spec trigger_historic_fetch(
+          Hash.t(),
+          Hash.t(),
+          String.t(),
+          Decimal.t() | nil,
+          non_neg_integer()
+        ) :: {:ok, pid}
+
+  def trigger_historic_fetch(address_hash, contract_address_hash, token_type, token_id, block_number) do
+    Task.start(fn ->
+      do_trigger_historic_fetch(address_hash, contract_address_hash, token_type, token_id, block_number)
+    end)
+  end
+
   ## Implementation
 
   defp do_trigger_fetch(address_hash, current_token_balances, latest_block_number, stale_balance_window)
@@ -93,6 +107,43 @@ defmodule Indexer.Fetcher.TokenBalanceOnDemand do
     })
   end
 
+  defp do_trigger_historic_fetch(address_hash, contract_address_hash, token_type, token_id, block_number) do
+    request = %{
+      token_contract_address_hash: to_string(contract_address_hash),
+      address_hash: to_string(address_hash),
+      block_number: block_number,
+      token_id: token_id && Decimal.to_integer(token_id)
+    }
+
+    balance_response =
+      case token_type do
+        "ERC-1155" -> BalanceReader.get_balances_of_erc_1155([request])
+        _ -> BalanceReader.get_balances_of([request])
+      end
+
+    balance = balance_response[:ok]
+
+    if balance do
+      %{
+        address_token_balances: %{
+          params: [
+            %{
+              address_hash: address_hash,
+              token_contract_address_hash: contract_address_hash,
+              token_type: token_type,
+              token_id: token_id,
+              block_number: block_number,
+              value: Decimal.new(balance),
+              value_fetched_at: DateTime.utc_now()
+            }
+          ]
+        },
+        broadcast: :on_demand
+      }
+      |> Chain.import()
+    end
+  end
+
   defp latest_block_number do
     BlockNumber.get_max()
   end
diff --git a/apps/indexer/test/indexer/fetcher/coin_balance_on_demand_test.exs b/apps/indexer/test/indexer/fetcher/coin_balance_on_demand_test.exs
index 9ca780a58ff5..0ae13b304a08 100644
--- a/apps/indexer/test/indexer/fetcher/coin_balance_on_demand_test.exs
+++ b/apps/indexer/test/indexer/fetcher/coin_balance_on_demand_test.exs
@@ -5,7 +5,9 @@ defmodule Indexer.Fetcher.CoinBalanceOnDemandTest do
   use Explorer.DataCase
 
   import Mox
+  import EthereumJSONRPC, only: [integer_to_quantity: 1]
 
+  alias Explorer.Chain
   alias Explorer.Chain.Events.Subscriber
   alias Explorer.Chain.Wei
   alias Explorer.Counters.AverageBlockTime
@@ -82,6 +84,52 @@ defmodule Indexer.Fetcher.CoinBalanceOnDemandTest do
     end
   end
 
+  describe "trigger_historic_fetch/2" do
+    test "fetches and imports balance for any block" do
+      address = insert(:address)
+      block = insert(:block)
+      insert(:block)
+      string_address_hash = to_string(address.hash)
+      block_number = block.number
+      string_block_number = integer_to_quantity(block_number)
+      balance = 42
+      assert nil == Chain.get_coin_balance(address.hash, block_number)
+
+      EthereumJSONRPC.Mox
+      |> expect(:json_rpc, fn [
+                                %{
+                                  id: id,
+                                  method: "eth_getBalance",
+                                  params: [^string_address_hash, ^string_block_number]
+                                }
+                              ],
+                              _options ->
+        {:ok, [%{id: id, jsonrpc: "2.0", result: integer_to_quantity(balance)}]}
+      end)
+
+      EthereumJSONRPC.Mox
+      |> expect(:json_rpc, fn [
+                                %{
+                                  id: id,
+                                  jsonrpc: "2.0",
+                                  method: "eth_getBlockByNumber",
+                                  params: [^string_block_number, true]
+                                }
+                              ],
+                              _ ->
+        {:ok, [eth_block_number_fake_response(string_block_number, id)]}
+      end)
+
+      {:ok, expected_wei} = Wei.cast(balance)
+
+      CoinBalanceOnDemand.trigger_historic_fetch(address.hash, block_number)
+
+      :timer.sleep(1000)
+
+      assert %{value: expected_wei} = Chain.get_coin_balance(address.hash, block_number)
+    end
+  end
+
   describe "update behaviour" do
     setup do
       Subscriber.to(:addresses, :on_demand)
@@ -184,9 +232,9 @@ defmodule Indexer.Fetcher.CoinBalanceOnDemandTest do
     end
   end
 
-  defp eth_block_number_fake_response(block_quantity) do
+  defp eth_block_number_fake_response(block_quantity, id \\ 0) do
     %{
-      id: 0,
+      id: id,
       jsonrpc: "2.0",
       result: %{
         "author" => "0x0000000000000000000000000000000000000000",

From baec07c161728c383da217f618cf464aa2629538 Mon Sep 17 00:00:00 2001
From: Maxim Filonov <53992153+sl1depengwyn@users.noreply.github.com>
Date: Tue, 30 May 2023 18:12:48 +0300
Subject: [PATCH 043/909] Reset GA cache

---
 .github/workflows/config.yml | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/config.yml b/.github/workflows/config.yml
index dd6f455803f8..5d31ec47ee79 100644
--- a/.github/workflows/config.yml
+++ b/.github/workflows/config.yml
@@ -38,7 +38,7 @@ jobs:
           path: |
             deps
             _build
-          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_18-${{ hashFiles('mix.lock') }}
+          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_19-${{ hashFiles('mix.lock') }}
           restore-keys: |
             ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-
 
@@ -98,7 +98,7 @@ jobs:
           path: |
             deps
             _build
-          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_18-${{ hashFiles('mix.lock') }}
+          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_19-${{ hashFiles('mix.lock') }}
           restore-keys: |
             ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-"
 
@@ -122,7 +122,7 @@ jobs:
           path: |
             deps
             _build
-          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_18-${{ hashFiles('mix.lock') }}
+          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_19-${{ hashFiles('mix.lock') }}
           restore-keys: |
             ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-"
 
@@ -145,7 +145,7 @@ jobs:
           path: |
             deps
             _build
-          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_18-${{ hashFiles('mix.lock') }}
+          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_19-${{ hashFiles('mix.lock') }}
           restore-keys: |
             ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-"
 
@@ -154,7 +154,7 @@ jobs:
         id: dialyzer-cache
         with:
           path: priv/plts
-          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-dialyzer-mixlockhash_18-${{ hashFiles('mix.lock') }}
+          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-dialyzer-mixlockhash_19-${{ hashFiles('mix.lock') }}
           restore-keys: |
             ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-dialyzer-"
 
@@ -185,7 +185,7 @@ jobs:
           path: |
             deps
             _build
-          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_18-${{ hashFiles('mix.lock') }}
+          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_19-${{ hashFiles('mix.lock') }}
           restore-keys: |
             ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-"
 
@@ -211,7 +211,7 @@ jobs:
           path: |
             deps
             _build
-          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_18-${{ hashFiles('mix.lock') }}
+          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_19-${{ hashFiles('mix.lock') }}
           restore-keys: |
             ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-"
 
@@ -240,7 +240,7 @@ jobs:
           path: |
             deps
             _build
-          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_18-${{ hashFiles('mix.lock') }}
+          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_19-${{ hashFiles('mix.lock') }}
           restore-keys: |
             ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-"
 
@@ -288,7 +288,7 @@ jobs:
           path: |
             deps
             _build
-          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_18-${{ hashFiles('mix.lock') }}
+          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_19-${{ hashFiles('mix.lock') }}
           restore-keys: |
             ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-"
 
@@ -334,7 +334,7 @@ jobs:
           path: |
             deps
             _build
-          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_18-${{ hashFiles('mix.lock') }}
+          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_19-${{ hashFiles('mix.lock') }}
           restore-keys: |
             ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-"
 
@@ -391,7 +391,7 @@ jobs:
           path: |
             deps
             _build
-          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_18-${{ hashFiles('mix.lock') }}
+          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_19-${{ hashFiles('mix.lock') }}
           restore-keys: |
             ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-"
 
@@ -445,7 +445,7 @@ jobs:
           path: |
             deps
             _build
-          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_18-${{ hashFiles('mix.lock') }}
+          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_19-${{ hashFiles('mix.lock') }}
           restore-keys: |
             ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-"
 
@@ -510,7 +510,7 @@ jobs:
           path: |
             deps
             _build
-          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_18-${{ hashFiles('mix.lock') }}
+          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_19-${{ hashFiles('mix.lock') }}
           restore-keys: |
             ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-"
 
@@ -574,7 +574,7 @@ jobs:
           path: |
             deps
             _build
-          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_18-${{ hashFiles('mix.lock') }}
+          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_19-${{ hashFiles('mix.lock') }}
           restore-keys: |
             ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-"
 

From 5acd9b0b4c679649bdd5ae5f2f3510db25b6be5c Mon Sep 17 00:00:00 2001
From: Qwerty5Uiop <alex000010@bk.ru>
Date: Wed, 31 May 2023 16:56:48 +0400
Subject: [PATCH 044/909] Fix created_contract_address_hash detection

---
 CHANGELOG.md                                       |  1 +
 .../chain/import/runner/internal_transactions.ex   | 14 ++++++++++++--
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1fd2f9a299f2..97e421fdf518 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -19,6 +19,7 @@
 - [#7545](https://github.com/blockscout/blockscout/pull/7545) - API v2: Check if cached exchange rate is empty before replacing DB value in stats API
 - [#7516](https://github.com/blockscout/blockscout/pull/7516) - Fix shrinking logo in Safari
 - [#7590](https://github.com/blockscout/blockscout/pull/7590) - Drop genesis block in internal transactions fetcher
+- [#7598](https://github.com/blockscout/blockscout/pull/7598) - Fix created_contract_address_hash detection
 
 ### Chore
 
diff --git a/apps/explorer/lib/explorer/chain/import/runner/internal_transactions.ex b/apps/explorer/lib/explorer/chain/import/runner/internal_transactions.ex
index 684e563c4a89..01a0acccc515 100644
--- a/apps/explorer/lib/explorer/chain/import/runner/internal_transactions.ex
+++ b/apps/explorer/lib/explorer/chain/import/runner/internal_transactions.ex
@@ -427,18 +427,28 @@ defmodule Explorer.Chain.Import.Runner.InternalTransactions do
     if valid_internal_transactions_count == 0 do
       {:ok, nil}
     else
+      created_contract_address_hash_map =
+        valid_internal_transactions
+        |> Enum.group_by(& &1.transaction_hash)
+        |> Enum.map(fn {transaction_hash, internal_transactions} ->
+          {transaction_hash, Enum.find_value(internal_transactions, & &1[:created_contract_address_hash])}
+        end)
+        |> Enum.into(%{})
+
       params =
         valid_internal_transactions
         |> Enum.filter(fn internal_tx ->
           internal_tx[:index] == 0
         end)
         |> Enum.map(fn trace ->
+          transaction_hash = Map.get(trace, :transaction_hash)
+
           %{
             block_hash: Map.get(trace, :block_hash),
             block_number: Map.get(trace, :block_number),
             gas_used: Map.get(trace, :gas_used),
-            transaction_hash: Map.get(trace, :transaction_hash),
-            created_contract_address_hash: Map.get(trace, :created_contract_address_hash),
+            transaction_hash: transaction_hash,
+            created_contract_address_hash: created_contract_address_hash_map[transaction_hash],
             error: Map.get(trace, :error),
             status: if(is_nil(Map.get(trace, :error)), do: :ok, else: :error)
           }

From d757b208ab402b3c5ad8be5f51f9645194caea57 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 31 May 2023 19:02:13 +0000
Subject: [PATCH 045/909] Bump sweetalert2 from 11.7.9 to 11.7.10 in
 /apps/block_scout_web/assets

Bumps [sweetalert2](https://github.com/sweetalert2/sweetalert2) from 11.7.9 to 11.7.10.
- [Release notes](https://github.com/sweetalert2/sweetalert2/releases)
- [Changelog](https://github.com/sweetalert2/sweetalert2/blob/main/CHANGELOG.md)
- [Commits](https://github.com/sweetalert2/sweetalert2/compare/v11.7.9...v11.7.10)

---
updated-dependencies:
- dependency-name: sweetalert2
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 apps/block_scout_web/assets/package-lock.json | 14 +++++++-------
 apps/block_scout_web/assets/package.json      |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/apps/block_scout_web/assets/package-lock.json b/apps/block_scout_web/assets/package-lock.json
index f3fd6d7e6d64..2ad0a9d2fcb3 100644
--- a/apps/block_scout_web/assets/package-lock.json
+++ b/apps/block_scout_web/assets/package-lock.json
@@ -61,7 +61,7 @@
         "redux": "^4.2.1",
         "stream-browserify": "^3.0.0",
         "stream-http": "^3.1.1",
-        "sweetalert2": "^11.7.9",
+        "sweetalert2": "^11.7.10",
         "urijs": "^1.19.11",
         "url": "^0.11.0",
         "util": "^0.12.5",
@@ -15747,9 +15747,9 @@
       }
     },
     "node_modules/sweetalert2": {
-      "version": "11.7.9",
-      "resolved": "https://registry.npmjs.org/sweetalert2/-/sweetalert2-11.7.9.tgz",
-      "integrity": "sha512-0WR65e1zsiD5pjecsROHHadBvwOqo3jdQ1RyO9IzFcYdAijpsSct/qOr9mdBJdJ4Fbomw6a2s6W6haq9cBIPKA==",
+      "version": "11.7.10",
+      "resolved": "https://registry.npmjs.org/sweetalert2/-/sweetalert2-11.7.10.tgz",
+      "integrity": "sha512-SgnO8VF7omM78doFxIAiEyhNBEudVTpYpYXJB9/yftvKD+UlWRaAkLMGD4kvAsgiwwph4SUFlNjiAbB5cUS8/g==",
       "funding": {
         "type": "individual",
         "url": "https://github.com/sponsors/limonte"
@@ -29351,9 +29351,9 @@
       }
     },
     "sweetalert2": {
-      "version": "11.7.9",
-      "resolved": "https://registry.npmjs.org/sweetalert2/-/sweetalert2-11.7.9.tgz",
-      "integrity": "sha512-0WR65e1zsiD5pjecsROHHadBvwOqo3jdQ1RyO9IzFcYdAijpsSct/qOr9mdBJdJ4Fbomw6a2s6W6haq9cBIPKA=="
+      "version": "11.7.10",
+      "resolved": "https://registry.npmjs.org/sweetalert2/-/sweetalert2-11.7.10.tgz",
+      "integrity": "sha512-SgnO8VF7omM78doFxIAiEyhNBEudVTpYpYXJB9/yftvKD+UlWRaAkLMGD4kvAsgiwwph4SUFlNjiAbB5cUS8/g=="
     },
     "symbol-tree": {
       "version": "3.2.4",
diff --git a/apps/block_scout_web/assets/package.json b/apps/block_scout_web/assets/package.json
index 0fbea0d8b4e9..7f4ade0c1c1b 100644
--- a/apps/block_scout_web/assets/package.json
+++ b/apps/block_scout_web/assets/package.json
@@ -73,7 +73,7 @@
     "redux": "^4.2.1",
     "stream-browserify": "^3.0.0",
     "stream-http": "^3.1.1",
-    "sweetalert2": "^11.7.9",
+    "sweetalert2": "^11.7.10",
     "urijs": "^1.19.11",
     "url": "^0.11.0",
     "util": "^0.12.5",

From c76a99d44bcf8662fa8039c8f298858c2d1195ac Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 31 May 2023 19:03:25 +0000
Subject: [PATCH 046/909] Bump mime from 2.0.3 to 2.0.4

Bumps [mime](https://github.com/elixir-plug/mime) from 2.0.3 to 2.0.4.
- [Changelog](https://github.com/elixir-plug/mime/blob/master/CHANGELOG.md)
- [Commits](https://github.com/elixir-plug/mime/compare/v2.0.3...v2.0.4)

---
updated-dependencies:
- dependency-name: mime
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 mix.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mix.lock b/mix.lock
index a3f4f4b3031f..7bd27e4141cc 100644
--- a/mix.lock
+++ b/mix.lock
@@ -82,7 +82,7 @@
   "meck": {:hex, :meck, "0.9.2", "85ccbab053f1db86c7ca240e9fc718170ee5bda03810a6292b5306bf31bae5f5", [:rebar3], [], "hexpm", "81344f561357dc40a8344afa53767c32669153355b626ea9fcbc8da6b3045826"},
   "memento": {:hex, :memento, "0.3.2", "38cfc8ff9bcb1adff7cbd0f3b78a762636b86dff764729d1c82d0464c539bdd0", [:mix], [], "hexpm", "25cf691a98a0cb70262f4a7543c04bab24648cb2041d937eb64154a8d6f8012b"},
   "metrics": {:hex, :metrics, "1.0.1", "25f094dea2cda98213cecc3aeff09e940299d950904393b2a29d191c346a8486", [:rebar3], [], "hexpm", "69b09adddc4f74a40716ae54d140f93beb0fb8978d8636eaded0c31b6f099f16"},
-  "mime": {:hex, :mime, "2.0.3", "3676436d3d1f7b81b5a2d2bd8405f412c677558c81b1c92be58c00562bb59095", [:mix], [], "hexpm", "27a30bf0db44d25eecba73755acf4068cbfe26a4372f9eb3e4ea3a45956bff6b"},
+  "mime": {:hex, :mime, "2.0.4", "94b41d7cd981a5c7acefecdf9f2667df43f19067279e1518314cc01650a8370d", [:mix], [], "hexpm", "14932baeb3cde66f1f0b3cffb42b7c5bbaa92af5335e2d8848c668a654a9d8bf"},
   "mimerl": {:hex, :mimerl, "1.2.0", "67e2d3f571088d5cfd3e550c383094b47159f3eee8ffa08e64106cdf5e981be3", [:rebar3], [], "hexpm", "f278585650aa581986264638ebf698f8bb19df297f66ad91b18910dfc6e19323"},
   "mimetype_parser": {:hex, :mimetype_parser, "0.1.3", "628ac9fe56aa7edcedb534d68397dd66674ab82493c8ebe39acb9a19b666099d", [:mix], [], "hexpm", "7d8f80c567807ce78cd93c938e7f4b0a20b1aaaaab914bf286f68457d9f7a852"},
   "mix_erlang_tasks": {:hex, :mix_erlang_tasks, "0.1.0", "36819fec60b80689eb1380938675af215565a89320a9e29c72c70d97512e4649", [:mix], [], "hexpm", "95d2839c422c482a70c08a8702da8242f86b773f8ab6e8602a4eb72da8da04ed"},

From c6b61f146b276fe63f851787b4e4b3ab4770e0eb Mon Sep 17 00:00:00 2001
From: Viktor Baranov <baranov.viktor.27@gmail.com>
Date: Fri, 28 Apr 2023 21:45:57 +0300
Subject: [PATCH 047/909] CSV export filters

---
 CHANGELOG.md                                  |   1 +
 .../assets/css/components/_transaction.scss   |   4 +-
 .../assets/css/theme/_dark-theme.scss         |   2 +-
 .../custom_contracts/_circles-theme.scss      |   2 +-
 .../custom_contracts/_dark-forest-theme.scss  |   2 +-
 .../assets/js/lib/csv_download.js             |  20 +++-
 .../assets/js/pages/address/logs.js           |  14 +++
 apps/block_scout_web/assets/package-lock.json |   5 +-
 .../address_token_transfer_controller.ex      |   1 +
 .../address_transaction_controller.ex         |   7 +-
 .../controllers/csv_export_controller.ex      |  11 +-
 .../index.html.eex                            |   2 +-
 .../address_token_transfer/index.html.eex     |   2 +-
 .../address_transaction/index.html.eex        |   2 +-
 .../_csv_export_button.html.eex               |   6 +-
 .../templates/csv_export/index.html.eex       |   3 +-
 .../lib/block_scout_web/views/csv_export.ex   |   1 +
 apps/block_scout_web/priv/gettext/default.pot |   4 +-
 .../priv/gettext/en/LC_MESSAGES/default.po    |   4 +-
 .../api/v2/main_page_controller_test.exs      |   2 +-
 .../api/v2/transaction_controller_test.exs    |  33 +++--
 apps/explorer/lib/explorer/chain.ex           |   4 +-
 ...dress_internal_transaction_csv_exporter.ex |  32 ++++-
 .../csv_export/address_log_csv_exporter.ex    |  11 +-
 .../address_token_transfer_csv_exporter.ex    | 113 ++++++++++++++++--
 .../address_transaction_csv_exporter.ex       |  24 +++-
 .../lib/explorer/chain/csv_export/helper.ex   |  68 ++++++++++-
 .../explorer/chain/internal_transaction.ex    |  22 ++--
 28 files changed, 327 insertions(+), 75 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 361894e868e7..dab85f60e12c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -41,6 +41,7 @@
 - [#7422](https://github.com/blockscout/blockscout/pull/7422) - Refactor state changes
 - [#7416](https://github.com/blockscout/blockscout/pull/7416) - Add option to disable reCAPTCHA
 - [#6694](https://github.com/blockscout/blockscout/pull/6694) - Add withdrawals support (EIP-4895)
+- [#7363](https://github.com/blockscout/blockscout/pull/7363) - CSV export filters
 - [#7355](https://github.com/blockscout/blockscout/pull/7355) - Add endpoint for token info import
 - [#7393](https://github.com/blockscout/blockscout/pull/7393) - Realtime fetcher max gap
 - [#7436](https://github.com/blockscout/blockscout/pull/7436) - TokenBalanceOnDemand ERC-1155 support
diff --git a/apps/block_scout_web/assets/css/components/_transaction.scss b/apps/block_scout_web/assets/css/components/_transaction.scss
index a7c517a10847..8522b149c126 100644
--- a/apps/block_scout_web/assets/css/components/_transaction.scss
+++ b/apps/block_scout_web/assets/css/components/_transaction.scss
@@ -8,7 +8,7 @@
 	}
 }
 
-.download-all-transactions {
+.download-all-items {
 	text-align: center;
 	color: #a3a9b5;
 	font-size: 13px;
@@ -16,7 +16,7 @@
 	@media (min-width: 768px) {
 		margin-top: 30px;
 	}
-	.download-all-transactions-link {
+	.download-all-items-link {
 		display: inline-flex;
 		align-items: center;
 		text-decoration: none;
diff --git a/apps/block_scout_web/assets/css/theme/_dark-theme.scss b/apps/block_scout_web/assets/css/theme/_dark-theme.scss
index ceb33db9010c..7fe9c8d77fd5 100644
--- a/apps/block_scout_web/assets/css/theme/_dark-theme.scss
+++ b/apps/block_scout_web/assets/css/theme/_dark-theme.scss
@@ -413,7 +413,7 @@ $header-links-background-color-dark-mode: $dark-light !default;
 	}
 
 	// download csv button
-	.download-all-transactions .download-all-transactions-link svg path {
+	.download-all-items .download-all-items-link svg path {
 		fill: $dark-primary;
 	}
 
diff --git a/apps/block_scout_web/assets/css/theme/custom_contracts/_circles-theme.scss b/apps/block_scout_web/assets/css/theme/custom_contracts/_circles-theme.scss
index 3ae71f538010..19416bf05e2a 100644
--- a/apps/block_scout_web/assets/css/theme/custom_contracts/_circles-theme.scss
+++ b/apps/block_scout_web/assets/css/theme/custom_contracts/_circles-theme.scss
@@ -272,7 +272,7 @@ $c-dark-text-color: #8a8dba;
 	}
 
 	// download csv button
-	.download-all-transactions .download-all-transactions-link svg path {
+	.download-all-items .download-all-items-link svg path {
 		fill: $c-primary;
 	}
 
diff --git a/apps/block_scout_web/assets/css/theme/custom_contracts/_dark-forest-theme.scss b/apps/block_scout_web/assets/css/theme/custom_contracts/_dark-forest-theme.scss
index e008052008c8..96bc3bda8c57 100644
--- a/apps/block_scout_web/assets/css/theme/custom_contracts/_dark-forest-theme.scss
+++ b/apps/block_scout_web/assets/css/theme/custom_contracts/_dark-forest-theme.scss
@@ -424,7 +424,7 @@ $dark-primary-alternate: $dark-primary;
 	}
 
 	// download csv button
-	.download-all-transactions .download-all-transactions-link svg path {
+	.download-all-items .download-all-items-link svg path {
 		fill: $dark-primary;
 	}
 
diff --git a/apps/block_scout_web/assets/js/lib/csv_download.js b/apps/block_scout_web/assets/js/lib/csv_download.js
index b315a837a83c..7f36a773e64b 100644
--- a/apps/block_scout_web/assets/js/lib/csv_download.js
+++ b/apps/block_scout_web/assets/js/lib/csv_download.js
@@ -38,10 +38,12 @@ $button.on('click', () => {
   const addressHash = $button.data('address-hash')
   const from = $('.js-datepicker-from').val()
   const to = $('.js-datepicker-to').val()
+  const urlParams = new URLSearchParams(window.location.search)
+  const filterType = urlParams.get('filter_type')
+  const filterValue = urlParams.get('filter_value')
+  const baseURL = `${$button.data('link')}?address_id=${addressHash}&from_period=${from}&to_period=${to}&filter_type=${filterType}&filter_value=${filterValue}`
   if (reCaptchaDisabled) {
-    const url = `${$button.data('link')}?address_id=${addressHash}&from_period=${from}&to_period=${to}`
-
-    download(url)
+    download(baseURL)
   } else if (reCaptchaV3ClientKey) {
     disableBtnWithSpinner()
     // @ts-ignore
@@ -51,7 +53,7 @@ $button.on('click', () => {
       // eslint-disable-next-line
       grecaptcha.execute(reCaptchaV3ClientKey, { action: 'login' })
         .then(function (token) {
-          const url = `${$button.data('link')}?address_id=${addressHash}&from_period=${from}&to_period=${to}&recaptcha_response=${token}`
+          const url = `${baseURL}&recaptcha_response=${token}`
 
           download(url)
         })
@@ -62,7 +64,7 @@ $button.on('click', () => {
   const recaptchaResponse = grecaptcha.getResponse()
     if (recaptchaResponse) {
       disableBtnWithSpinner()
-      const url = `${$button.data('link')}?address_id=${addressHash}&from_period=${from}&to_period=${to}&recaptcha_response=${recaptchaResponse}`
+      const url = `${baseURL}&recaptcha_response=${recaptchaResponse}`
 
       download(url, true, true)
     }
@@ -88,7 +90,13 @@ $button.on('click', () => {
           const downloadUrl = URL.createObjectURL(blob)
           const a = document.createElement('a')
           a.href = downloadUrl
-          a.download = `${$button.data('type')}_for_${addressHash}_from_${from}_to_${to}.csv`
+          let fileName = `${$button.data('type')}_for_${addressHash}_from_${from}_to_${to}`
+          if (filterType && filterValue) {
+            fileName = `${fileName}_with_filter_type_${filterType}_value_${filterValue}.csv`
+          } else {
+            fileName = `${fileName}.csv`
+          }
+          a.download = fileName
           document.body.appendChild(a)
           a.click()
 
diff --git a/apps/block_scout_web/assets/js/pages/address/logs.js b/apps/block_scout_web/assets/js/pages/address/logs.js
index 2997f53f3b92..e12e37c87475 100644
--- a/apps/block_scout_web/assets/js/pages/address/logs.js
+++ b/apps/block_scout_web/assets/js/pages/address/logs.js
@@ -3,6 +3,7 @@ import omit from 'lodash.omit'
 import { connectElements } from '../../lib/redux_helpers.js'
 import { createAsyncLoadStore, loadPage } from '../../lib/async_listing_load'
 import { commonPath } from '../../lib/path_helper'
+import { escapeHtml } from '../../lib/utils'
 import '../address'
 // @ts-ignore
 import { utils } from 'web3'
@@ -76,9 +77,22 @@ if ($('[data-page="address-logs"]').length) {
     const addressHashPlain = store.getState().addressHash
     const addressHashChecksum = addressHashPlain && utils.toChecksumAddress(addressHashPlain)
     const path = `${commonPath}/search-logs?topic=${topic}&address_id=${addressHashChecksum}`
+    changeDownloadButtonHref(topic)
     loadPage(store, path)
   }
 
+  function changeDownloadButtonHref (filter) {
+    const currentHref = $('a.download-all-items-link').attr('href')
+    if (currentHref) {
+      let hrefWithTopic = currentHref
+      if (currentHref.includes('filter_type=&')) {
+        hrefWithTopic = currentHref.replace(/filter_type=.*?&/, 'filter_type=topic&')
+      }
+      const href = hrefWithTopic.replace(/filter_value=.*?&/, `filter_value=${escapeHtml(filter)}&`)
+      $('a.download-all-items-link').attr('href', href)
+    }
+  }
+
   store.dispatch({
     type: 'PAGE_LOAD',
     addressHash
diff --git a/apps/block_scout_web/assets/package-lock.json b/apps/block_scout_web/assets/package-lock.json
index f3fd6d7e6d64..2d5a6c34b103 100644
--- a/apps/block_scout_web/assets/package-lock.json
+++ b/apps/block_scout_web/assets/package-lock.json
@@ -101,10 +101,11 @@
       }
     },
     "../../../deps/phoenix": {
-      "version": "0.0.1"
+      "version": "1.5.13",
+      "license": "MIT"
     },
     "../../../deps/phoenix_html": {
-      "version": "0.0.1"
+      "version": "3.0.4"
     },
     "node_modules/@amplitude/analytics-browser": {
       "version": "1.10.3",
diff --git a/apps/block_scout_web/lib/block_scout_web/controllers/address_token_transfer_controller.ex b/apps/block_scout_web/lib/block_scout_web/controllers/address_token_transfer_controller.ex
index dff9c285419d..8bb51818f688 100644
--- a/apps/block_scout_web/lib/block_scout_web/controllers/address_token_transfer_controller.ex
+++ b/apps/block_scout_web/lib/block_scout_web/controllers/address_token_transfer_controller.ex
@@ -110,6 +110,7 @@ defmodule BlockScoutWeb.AddressTokenTransferController do
         address: address,
         coin_balance_status: CoinBalanceOnDemand.trigger_fetch(address),
         exchange_rate: Market.get_exchange_rate(Explorer.coin()) || Token.null(),
+        filter: params["filter"],
         current_path: Controller.current_full_path(conn),
         token: token,
         counters_path: address_path(conn, :address_counters, %{"id" => Address.checksum(address_hash)}),
diff --git a/apps/block_scout_web/lib/block_scout_web/controllers/address_transaction_controller.ex b/apps/block_scout_web/lib/block_scout_web/controllers/address_transaction_controller.ex
index 466c0455a962..999c619bc9db 100644
--- a/apps/block_scout_web/lib/block_scout_web/controllers/address_transaction_controller.ex
+++ b/apps/block_scout_web/lib/block_scout_web/controllers/address_transaction_controller.ex
@@ -187,15 +187,18 @@ defmodule BlockScoutWeb.AddressTransactionController do
            "from_period" => from_period,
            "to_period" => to_period,
            "recaptcha_response" => recaptcha_response
-         },
+         } = params,
          csv_export_module
        )
        when is_binary(address_hash_string) do
+    filter_type = Map.get(params, "filter_type")
+    filter_value = Map.get(params, "filter_value")
+
     with {:ok, address_hash} <- Chain.string_to_address_hash(address_hash_string),
          {:ok, address} <- Chain.hash_to_address(address_hash),
          {:recaptcha, true} <- {:recaptcha, captcha_helper().recaptcha_passed?(recaptcha_response)} do
       address
-      |> csv_export_module.export(from_period, to_period)
+      |> csv_export_module.export(from_period, to_period, filter_type, filter_value)
       |> Enum.reduce_while(put_resp_params(conn), fn chunk, conn ->
         case Conn.chunk(conn, chunk) do
           {:ok, conn} ->
diff --git a/apps/block_scout_web/lib/block_scout_web/controllers/csv_export_controller.ex b/apps/block_scout_web/lib/block_scout_web/controllers/csv_export_controller.ex
index 08f05ba937d8..1cb332b2a49e 100644
--- a/apps/block_scout_web/lib/block_scout_web/controllers/csv_export_controller.ex
+++ b/apps/block_scout_web/lib/block_scout_web/controllers/csv_export_controller.ex
@@ -8,8 +8,15 @@ defmodule BlockScoutWeb.CsvExportController do
     with {:ok, address_hash} <- Chain.string_to_address_hash(address_hash_string),
          :ok <- Chain.check_address_exists(address_hash),
          {:ok, false} <- AccessHelper.restricted_access?(address_hash_string, params),
-         true <- supported_export_type(type) do
-      render(conn, "index.html", address_hash_string: address_hash_string, type: type)
+         true <- supported_export_type(type),
+         filter_type <- Map.get(params, "filter_type"),
+         filter_value <- Map.get(params, "filter_value") do
+      render(conn, "index.html",
+        address_hash_string: address_hash_string,
+        type: type,
+        filter_type: filter_type && String.downcase(filter_type),
+        filter_value: filter_value && String.downcase(filter_value)
+      )
     else
       _ ->
         not_found(conn)
diff --git a/apps/block_scout_web/lib/block_scout_web/templates/address_internal_transaction/index.html.eex b/apps/block_scout_web/lib/block_scout_web/templates/address_internal_transaction/index.html.eex
index 1757deb2cb2b..0a5b2bcf94c9 100644
--- a/apps/block_scout_web/lib/block_scout_web/templates/address_internal_transaction/index.html.eex
+++ b/apps/block_scout_web/lib/block_scout_web/templates/address_internal_transaction/index.html.eex
@@ -60,7 +60,7 @@
         </div>
 
         <div class="transaction-bottom-panel">
-          <%= render BlockScoutWeb.CommonComponentsView, "_csv_export_button.html", address: Address.checksum(@address.hash), type: "internal-transactions", conn: @conn %>
+          <%= render BlockScoutWeb.CommonComponentsView, "_csv_export_button.html", address: Address.checksum(@address.hash), type: "internal-transactions", filter_type: :address, filter_value: @filter, conn: @conn %>
           <%= render BlockScoutWeb.CommonComponentsView, "_pagination_container.html", position: "bottom", cur_page_number: "1", show_pagination_limit: true, data_next_page_button: true, data_prev_page_button: true %>
         </div>
 
diff --git a/apps/block_scout_web/lib/block_scout_web/templates/address_token_transfer/index.html.eex b/apps/block_scout_web/lib/block_scout_web/templates/address_token_transfer/index.html.eex
index 78f0004ee53c..896ea5f8ab61 100644
--- a/apps/block_scout_web/lib/block_scout_web/templates/address_token_transfer/index.html.eex
+++ b/apps/block_scout_web/lib/block_scout_web/templates/address_token_transfer/index.html.eex
@@ -64,7 +64,7 @@
         </div>
 
         <div class="transaction-bottom-panel">
-          <%= render BlockScoutWeb.CommonComponentsView, "_csv_export_button.html", address: Address.checksum(@address.hash), type: "token-transfers", conn: @conn %>
+          <%= render BlockScoutWeb.CommonComponentsView, "_csv_export_button.html", address: Address.checksum(@address.hash), type: "token-transfers", filter_type: :address, filter_value: @filter, conn: @conn %>
           <%= render BlockScoutWeb.CommonComponentsView, "_pagination_container.html", position: "bottom", cur_page_number: "1", show_pagination_limit: true, data_next_page_button: true, data_prev_page_button: true %>
         </div>
 
diff --git a/apps/block_scout_web/lib/block_scout_web/templates/address_transaction/index.html.eex b/apps/block_scout_web/lib/block_scout_web/templates/address_transaction/index.html.eex
index 798b7153a9d1..74f122040a5c 100644
--- a/apps/block_scout_web/lib/block_scout_web/templates/address_transaction/index.html.eex
+++ b/apps/block_scout_web/lib/block_scout_web/templates/address_transaction/index.html.eex
@@ -61,7 +61,7 @@
         </div>
 
         <div class="transaction-bottom-panel">
-          <%= render BlockScoutWeb.CommonComponentsView, "_csv_export_button.html", address: Address.checksum(@address.hash), type: "transactions", conn: @conn %>
+          <%= render BlockScoutWeb.CommonComponentsView, "_csv_export_button.html", address: Address.checksum(@address.hash), type: "transactions", filter_type: :address, filter_value: @filter, conn: @conn %>
           <%= render BlockScoutWeb.CommonComponentsView, "_pagination_container.html", position: "bottom", cur_page_number: "1", show_pagination_limit: true, data_next_page_button: true, data_prev_page_button: true %>
         </div>
 
diff --git a/apps/block_scout_web/lib/block_scout_web/templates/common_components/_csv_export_button.html.eex b/apps/block_scout_web/lib/block_scout_web/templates/common_components/_csv_export_button.html.eex
index 9fd19339cfbe..5040098a7a05 100644
--- a/apps/block_scout_web/lib/block_scout_web/templates/common_components/_csv_export_button.html.eex
+++ b/apps/block_scout_web/lib/block_scout_web/templates/common_components/_csv_export_button.html.eex
@@ -1,5 +1,7 @@
-<div csv-download class="download-all-transactions">
-    Download <a class="download-all-transactions-link" href=<%= csv_export_path(@conn, :index, %{"address" => @address, "type" => @type }) %>><%= gettext("CSV") %></span>
+<% filter_type = if assigns[:filter_type], do: @filter_type, else: "" %>
+<% filter_value = if assigns[:filter_value], do: @filter_value, else: "" %>
+<div csv-download class="download-all-items">
+    Download <a class="download-all-items-link" href=<%= csv_export_path(@conn, :index, %{"address" => @address, "type" => @type, "filter_type" => filter_type, "filter_value" => filter_value }) %>><%= gettext("CSV") %></span>
         <svg xmlns="http://www.w3.org/2000/svg" width="14" height="16">
             <path fill="#333333" fill-rule="evenodd" d="M13 16H1c-.999 0-1-1-1-1V1s-.004-1 1-1h6l7 7v8s-.032 1-1 1zm-1-8c0-.99-1-1-1-1H8s-1 .001-1-1V3c0-.999-1-1-1-1H2v12h10V8z"/>
         </svg>
diff --git a/apps/block_scout_web/lib/block_scout_web/templates/csv_export/index.html.eex b/apps/block_scout_web/lib/block_scout_web/templates/csv_export/index.html.eex
index 9b9f6a88933d..4f4996a4c5fd 100644
--- a/apps/block_scout_web/lib/block_scout_web/templates/csv_export/index.html.eex
+++ b/apps/block_scout_web/lib/block_scout_web/templates/csv_export/index.html.eex
@@ -10,10 +10,11 @@
       <h1 class="card-title list-title-description"><%= gettext "Export Data" %></h1>
 
       <div>
+        <% filter_text = if Helper.is_valid_filter?(@filter_type, @filter_value, @type), do: " with applied filter by #{@filter_type} (#{@filter_value})", else: ""  %>
         <p class="card-subtitle list-title-description">Export <%= type_display_name(@type) %> for address <%= link(
               @address_hash_string,
               to: address_path(@conn, :show, @address_hash_string)
-            ) %> to CSV file</p>
+            ) %><%= filter_text %> to CSV file</p>
 	    </div>
 
       <div class="dates-container">
diff --git a/apps/block_scout_web/lib/block_scout_web/views/csv_export.ex b/apps/block_scout_web/lib/block_scout_web/views/csv_export.ex
index 083e11f53a25..34596956e45a 100644
--- a/apps/block_scout_web/lib/block_scout_web/views/csv_export.ex
+++ b/apps/block_scout_web/lib/block_scout_web/views/csv_export.ex
@@ -3,6 +3,7 @@ defmodule BlockScoutWeb.CsvExportView do
 
   alias Explorer.Chain
   alias Explorer.Chain.Address
+  alias Explorer.Chain.CSVExport.Helper
 
   defp type_display_name(type) do
     case type do
diff --git a/apps/block_scout_web/priv/gettext/default.pot b/apps/block_scout_web/priv/gettext/default.pot
index 417c56b09c27..4f9608d74fab 100644
--- a/apps/block_scout_web/priv/gettext/default.pot
+++ b/apps/block_scout_web/priv/gettext/default.pot
@@ -587,7 +587,7 @@ msgstr ""
 msgid "CRC Worth"
 msgstr ""
 
-#: lib/block_scout_web/templates/common_components/_csv_export_button.html.eex:2
+#: lib/block_scout_web/templates/common_components/_csv_export_button.html.eex:4
 #, elixir-autogen, elixir-format
 msgid "CSV"
 msgstr ""
@@ -1145,7 +1145,7 @@ msgstr ""
 msgid "Displaying the init data provided of the creating transaction."
 msgstr ""
 
-#: lib/block_scout_web/templates/csv_export/index.html.eex:32
+#: lib/block_scout_web/templates/csv_export/index.html.eex:33
 #, elixir-autogen, elixir-format
 msgid "Download"
 msgstr ""
diff --git a/apps/block_scout_web/priv/gettext/en/LC_MESSAGES/default.po b/apps/block_scout_web/priv/gettext/en/LC_MESSAGES/default.po
index 78b3505a6436..b47d96f90f24 100644
--- a/apps/block_scout_web/priv/gettext/en/LC_MESSAGES/default.po
+++ b/apps/block_scout_web/priv/gettext/en/LC_MESSAGES/default.po
@@ -587,7 +587,7 @@ msgstr ""
 msgid "CRC Worth"
 msgstr ""
 
-#: lib/block_scout_web/templates/common_components/_csv_export_button.html.eex:2
+#: lib/block_scout_web/templates/common_components/_csv_export_button.html.eex:4
 #, elixir-autogen, elixir-format
 msgid "CSV"
 msgstr ""
@@ -1145,7 +1145,7 @@ msgstr ""
 msgid "Displaying the init data provided of the creating transaction."
 msgstr ""
 
-#: lib/block_scout_web/templates/csv_export/index.html.eex:32
+#: lib/block_scout_web/templates/csv_export/index.html.eex:33
 #, elixir-autogen, elixir-format
 msgid "Download"
 msgstr ""
diff --git a/apps/block_scout_web/test/block_scout_web/controllers/api/v2/main_page_controller_test.exs b/apps/block_scout_web/test/block_scout_web/controllers/api/v2/main_page_controller_test.exs
index 6ed4d6cb960f..1ea1c334ceb2 100644
--- a/apps/block_scout_web/test/block_scout_web/controllers/api/v2/main_page_controller_test.exs
+++ b/apps/block_scout_web/test/block_scout_web/controllers/api/v2/main_page_controller_test.exs
@@ -62,7 +62,7 @@ defmodule BlockScoutWeb.API.V2.MainPageControllerTest do
     end
 
     test "get last 6 txs", %{conn: conn} do
-      txs = insert_list(10, :transaction) |> with_block()
+      insert_list(10, :transaction) |> with_block()
 
       auth = build(:auth)
       {:ok, user} = UserFromAuth.find_or_create(auth)
diff --git a/apps/block_scout_web/test/block_scout_web/controllers/api/v2/transaction_controller_test.exs b/apps/block_scout_web/test/block_scout_web/controllers/api/v2/transaction_controller_test.exs
index 6e3a58cf13ea..a55355fcfb08 100644
--- a/apps/block_scout_web/test/block_scout_web/controllers/api/v2/transaction_controller_test.exs
+++ b/apps/block_scout_web/test/block_scout_web/controllers/api/v2/transaction_controller_test.exs
@@ -109,7 +109,7 @@ defmodule BlockScoutWeb.API.V2.TransactionControllerTest do
       |> with_block()
 
       auth = build(:auth)
-      address = insert(:address)
+      insert(:address)
       {:ok, user} = UserFromAuth.find_or_create(auth)
 
       conn = Plug.Test.init_test_session(conn, current_user: user)
@@ -234,15 +234,14 @@ defmodule BlockScoutWeb.API.V2.TransactionControllerTest do
         |> insert()
         |> with_block()
 
-      tt =
-        insert(:token_transfer,
-          transaction: tx,
-          block: tx.block,
-          block_number: tx.block_number,
-          token_contract_address: token.contract_address,
-          token_ids: Enum.map(0..50, fn x -> x end),
-          amounts: Enum.map(0..50, fn x -> x end)
-        )
+      insert(:token_transfer,
+        transaction: tx,
+        block: tx.block,
+        block_number: tx.block_number,
+        token_contract_address: token.contract_address,
+        token_ids: Enum.map(0..50, fn x -> x end),
+        amounts: Enum.map(0..50, fn x -> x end)
+      )
 
       request = get(conn, "/api/v2/transactions/" <> to_string(tx.hash))
 
@@ -993,6 +992,20 @@ defmodule BlockScoutWeb.API.V2.TransactionControllerTest do
     assert check_total(Repo.preload(token_transfer, [{:token, :contract_address}]).token, json["total"], token_transfer)
   end
 
+  defp compare_item(%Transaction{} = transaction, json, wl_names) do
+    assert to_string(transaction.hash) == json["hash"]
+    assert transaction.block_number == json["block"]
+    assert to_string(transaction.value.value) == json["value"]
+    assert Address.checksum(transaction.from_address_hash) == json["from"]["hash"]
+    assert Address.checksum(transaction.to_address_hash) == json["to"]["hash"]
+
+    assert json["to"]["watchlist_names"] ==
+             if(wl_names[transaction.to_address_hash], do: [wl_names[transaction.to_address_hash]], else: [])
+
+    assert json["from"]["watchlist_names"] ==
+             if(wl_names[transaction.from_address_hash], do: [wl_names[transaction.from_address_hash]], else: [])
+  end
+
   defp check_paginated_response(first_page_resp, second_page_resp, txs) do
     assert Enum.count(first_page_resp["items"]) == 50
     assert first_page_resp["next_page_params"] != nil
diff --git a/apps/explorer/lib/explorer/chain.ex b/apps/explorer/lib/explorer/chain.ex
index acc191fa1ac8..d1209ef9a77e 100644
--- a/apps/explorer/lib/explorer/chain.ex
+++ b/apps/explorer/lib/explorer/chain.ex
@@ -260,7 +260,7 @@ defmodule Explorer.Chain do
 
     paging_options = Keyword.get(options, :paging_options, @default_paging_options)
 
-    if direction == nil do
+    if direction == nil || direction == "" do
       query_to_address_hash_wrapped =
         InternalTransaction
         |> InternalTransaction.where_nonpending_block()
@@ -750,6 +750,8 @@ defmodule Explorer.Chain do
 
   defp filter_topic(base_query, nil), do: base_query
 
+  defp filter_topic(base_query, ""), do: base_query
+
   defp filter_topic(base_query, topic) do
     from(log in base_query,
       where:
diff --git a/apps/explorer/lib/explorer/chain/csv_export/address_internal_transaction_csv_exporter.ex b/apps/explorer/lib/explorer/chain/csv_export/address_internal_transaction_csv_exporter.ex
index a3872ae8ef66..82c2c5f5d5a4 100644
--- a/apps/explorer/lib/explorer/chain/csv_export/address_internal_transaction_csv_exporter.ex
+++ b/apps/explorer/lib/explorer/chain/csv_export/address_internal_transaction_csv_exporter.ex
@@ -9,13 +9,13 @@ defmodule Explorer.Chain.CSVExport.AddressInternalTransactionCsvExporter do
 
   @paging_options %PagingOptions{page_size: Helper.page_size() + 1}
 
-  @spec export(Address.t(), String.t(), String.t()) :: Enumerable.t()
-  def export(address, from_period, to_period) do
+  @spec export(Address.t(), String.t(), String.t(), String.t() | nil, String.t() | nil) :: Enumerable.t()
+  def export(address, from_period, to_period, filter_type \\ nil, filter_value \\ nil) do
     {from_block, to_block} = Helper.block_from_period(from_period, to_period)
 
     res =
       address.hash
-      |> fetch_all_internal_transactions(from_block, to_block, @paging_options)
+      |> fetch_all_internal_transactions(from_block, to_block, filter_type, filter_value, @paging_options)
       |> Enum.sort_by(&{&1.block_number, &1.index, &1.transaction_index}, :desc)
       |> to_csv_format()
       |> Helper.dump_to_stream()
@@ -23,12 +23,25 @@ defmodule Explorer.Chain.CSVExport.AddressInternalTransactionCsvExporter do
     res
   end
 
-  defp fetch_all_internal_transactions(address_hash, from_block, to_block, paging_options, acc \\ []) do
+  # sobelow_skip ["DOS.StringToAtom"]
+  defp fetch_all_internal_transactions(
+         address_hash,
+         from_block,
+         to_block,
+         filter_type,
+         filter_value,
+         paging_options,
+         acc \\ []
+       ) do
     options =
       []
       |> Keyword.put(:paging_options, paging_options)
       |> Keyword.put(:from_block, from_block)
       |> Keyword.put(:to_block, to_block)
+      |> (&if(Helper.is_valid_filter?(filter_type, filter_value, "internal_transactions"),
+            do: &1 |> Keyword.put(:direction, String.to_atom(filter_value)),
+            else: &1
+          )).()
 
     internal_transactions = Chain.address_to_internal_transactions(address_hash, options)
 
@@ -38,7 +51,16 @@ defmodule Explorer.Chain.CSVExport.AddressInternalTransactionCsvExporter do
       {_internal_transactions,
        [%InternalTransaction{block_number: block_number, transaction_index: transaction_index, index: index}]} ->
         new_paging_options = %{@paging_options | key: {block_number, transaction_index, index}}
-        fetch_all_internal_transactions(address_hash, from_block, to_block, new_paging_options, new_acc)
+
+        fetch_all_internal_transactions(
+          address_hash,
+          from_block,
+          to_block,
+          filter_type,
+          filter_value,
+          new_paging_options,
+          new_acc
+        )
 
       {_, []} ->
         new_acc
diff --git a/apps/explorer/lib/explorer/chain/csv_export/address_log_csv_exporter.ex b/apps/explorer/lib/explorer/chain/csv_export/address_log_csv_exporter.ex
index 55b339d6cb8c..5e4e81a6acb9 100644
--- a/apps/explorer/lib/explorer/chain/csv_export/address_log_csv_exporter.ex
+++ b/apps/explorer/lib/explorer/chain/csv_export/address_log_csv_exporter.ex
@@ -9,22 +9,23 @@ defmodule Explorer.Chain.CSVExport.AddressLogCsvExporter do
 
   @paging_options %PagingOptions{page_size: Helper.page_size() + 1}
 
-  @spec export(Address.t(), String.t(), String.t()) :: Enumerable.t()
-  def export(address, from_period, to_period) do
+  @spec export(Address.t(), String.t(), String.t(), String.t() | nil, String.t() | nil) :: Enumerable.t()
+  def export(address, from_period, to_period, filter_type \\ nil, filter_value \\ nil) do
     {from_block, to_block} = Helper.block_from_period(from_period, to_period)
 
     address.hash
-    |> fetch_all_logs(from_block, to_block, @paging_options)
+    |> fetch_all_logs(from_block, to_block, filter_type, filter_value, @paging_options)
     |> to_csv_format()
     |> Helper.dump_to_stream()
   end
 
-  defp fetch_all_logs(address_hash, from_block, to_block, paging_options, acc \\ []) do
+  defp fetch_all_logs(address_hash, from_block, to_block, filter_type, filter_value, paging_options, acc \\ []) do
     options =
       []
       |> Keyword.put(:paging_options, paging_options)
       |> Keyword.put(:from_block, from_block)
       |> Keyword.put(:to_block, to_block)
+      |> Keyword.put(:topic, filter_value)
 
     logs = Chain.address_to_logs(address_hash, options)
 
@@ -33,7 +34,7 @@ defmodule Explorer.Chain.CSVExport.AddressLogCsvExporter do
     case Enum.split(logs, Helper.page_size()) do
       {_logs, [%Log{block_number: block_number, transaction: %Transaction{index: transaction_index}, index: index}]} ->
         new_paging_options = %{@paging_options | key: {block_number, transaction_index, index}}
-        fetch_all_logs(address_hash, from_block, to_block, new_paging_options, new_acc)
+        fetch_all_logs(address_hash, from_block, to_block, filter_type, filter_value, new_paging_options, new_acc)
 
       {_, []} ->
         new_acc
diff --git a/apps/explorer/lib/explorer/chain/csv_export/address_token_transfer_csv_exporter.ex b/apps/explorer/lib/explorer/chain/csv_export/address_token_transfer_csv_exporter.ex
index d2e595d701e6..f06734edd59a 100644
--- a/apps/explorer/lib/explorer/chain/csv_export/address_token_transfer_csv_exporter.ex
+++ b/apps/explorer/lib/explorer/chain/csv_export/address_token_transfer_csv_exporter.ex
@@ -3,37 +3,64 @@ defmodule Explorer.Chain.CSVExport.AddressTokenTransferCsvExporter do
   Exports token transfers to a csv file.
   """
 
-  alias Explorer.{Chain, PagingOptions}
-  alias Explorer.Chain.{Address, TokenTransfer}
+  import Ecto.Query,
+    only: [
+      limit: 2,
+      preload: 2,
+      order_by: 3,
+      where: 3
+    ]
+
+  alias Explorer.{Chain, PagingOptions, Repo}
+  alias Explorer.Chain.{Address, Hash, TokenTransfer}
   alias Explorer.Chain.CSVExport.Helper
 
   @paging_options %PagingOptions{page_size: Helper.page_size() + 1, asc_order: true}
 
-  @spec export(Address.t(), String.t(), String.t()) :: Enumerable.t()
-  def export(address, from_period, to_period) do
+  @spec export(Address.t(), String.t(), String.t(), String.t() | nil, String.t() | nil) :: Enumerable.t()
+  def export(address, from_period, to_period, filter_type \\ nil, filter_value \\ nil) do
     {from_block, to_block} = Helper.block_from_period(from_period, to_period)
 
     address.hash
-    |> fetch_all_token_transfers(from_block, to_block, @paging_options)
+    |> fetch_all_token_transfers(from_block, to_block, filter_type, filter_value, @paging_options)
     |> to_csv_format(address)
     |> Helper.dump_to_stream()
   end
 
-  def fetch_all_token_transfers(address_hash, from_block, to_block, paging_options, acc \\ []) do
+  def fetch_all_token_transfers(
+        address_hash,
+        from_block,
+        to_block,
+        filter_type,
+        filter_value,
+        paging_options,
+        acc \\ []
+      ) do
     options =
       []
       |> Keyword.put(:paging_options, paging_options)
       |> Keyword.put(:from_block, from_block)
       |> Keyword.put(:to_block, to_block)
+      |> Keyword.put(:filter_type, filter_type)
+      |> Keyword.put(:filter_value, filter_value)
 
-    token_transfers = Chain.address_hash_to_token_transfers_including_contract(address_hash, options)
+    token_transfers = address_hash_to_token_transfers_including_contract(address_hash, options)
 
     new_acc = acc ++ token_transfers
 
     case Enum.split(token_transfers, Helper.page_size()) do
       {_token_transfers, [%TokenTransfer{block_number: block_number, log_index: log_index}]} ->
         new_paging_options = %{@paging_options | key: {block_number, log_index}}
-        fetch_all_token_transfers(address_hash, from_block, to_block, new_paging_options, new_acc)
+
+        fetch_all_token_transfers(
+          address_hash,
+          from_block,
+          to_block,
+          filter_type,
+          filter_value,
+          new_paging_options,
+          new_acc
+        )
 
       {_, []} ->
         new_acc
@@ -92,4 +119,74 @@ defmodule Explorer.Chain.CSVExport.AddressTokenTransferCsvExporter do
       {:maximum, value} -> "Max of #{value}"
     end
   end
+
+  @doc """
+  address_hash_to_token_transfers_including_contract/2 function returns token transfers on address (to/from/contract).
+  It is used by CSV export of token transfers button.
+  """
+  @spec address_hash_to_token_transfers_including_contract(Hash.Address.t(), Keyword.t()) :: [TokenTransfer.t()]
+  def address_hash_to_token_transfers_including_contract(address_hash, options \\ []) do
+    paging_options = Keyword.get(options, :paging_options, Helper.default_paging_options())
+    from_block = Keyword.get(options, :from_block)
+    to_block = Keyword.get(options, :to_block)
+    filter_type = Keyword.get(options, :filter_type)
+    filter_value = Keyword.get(options, :filter_value)
+
+    query =
+      from_block
+      |> query_address_hash_to_token_transfers_including_contract(to_block, address_hash, filter_type, filter_value)
+      |> order_by([token_transfer], asc: token_transfer.block_number, asc: token_transfer.log_index)
+
+    query
+    |> handle_token_transfer_paging_options(paging_options)
+    |> preload(transaction: :block)
+    |> preload(:token)
+    |> Repo.all()
+  end
+
+  defp query_address_hash_to_token_transfers_including_contract(nil, to_block, address_hash, filter_type, filter_value)
+       when not is_nil(to_block) do
+    TokenTransfer
+    |> Helper.where_address_hash(address_hash, filter_type, filter_value)
+    |> where([token_transfer], token_transfer.block_number <= ^to_block)
+  end
+
+  defp query_address_hash_to_token_transfers_including_contract(
+         from_block,
+         nil,
+         address_hash,
+         filter_type,
+         filter_value
+       )
+       when not is_nil(from_block) do
+    TokenTransfer
+    |> Helper.where_address_hash(address_hash, filter_type, filter_value)
+    |> where([token_transfer], token_transfer.block_number >= ^from_block)
+  end
+
+  defp query_address_hash_to_token_transfers_including_contract(
+         from_block,
+         to_block,
+         address_hash,
+         filter_type,
+         filter_value
+       )
+       when not is_nil(from_block) and not is_nil(to_block) do
+    TokenTransfer
+    |> Helper.where_address_hash(address_hash, filter_type, filter_value)
+    |> where([token_transfer], token_transfer.block_number >= ^from_block and token_transfer.block_number <= ^to_block)
+  end
+
+  defp query_address_hash_to_token_transfers_including_contract(_, _, address_hash, filter_type, filter_value) do
+    TokenTransfer
+    |> Helper.where_address_hash(address_hash, filter_type, filter_value)
+  end
+
+  defp handle_token_transfer_paging_options(query, nil), do: query
+
+  defp handle_token_transfer_paging_options(query, paging_options) do
+    query
+    |> TokenTransfer.page_token_transfer(paging_options)
+    |> limit(^paging_options.page_size)
+  end
 end
diff --git a/apps/explorer/lib/explorer/chain/csv_export/address_transaction_csv_exporter.ex b/apps/explorer/lib/explorer/chain/csv_export/address_transaction_csv_exporter.ex
index c76815dc70b6..b53d1046e91c 100644
--- a/apps/explorer/lib/explorer/chain/csv_export/address_transaction_csv_exporter.ex
+++ b/apps/explorer/lib/explorer/chain/csv_export/address_transaction_csv_exporter.ex
@@ -29,23 +29,28 @@ defmodule Explorer.Chain.CSVExport.AddressTransactionCsvExporter do
 
   @paging_options %PagingOptions{page_size: Helper.page_size() + 1}
 
-  @spec export(Address.t(), String.t(), String.t()) :: Enumerable.t()
-  def export(address, from_period, to_period) do
+  @spec export(Address.t(), String.t(), String.t(), String.t() | nil, String.t() | nil) :: Enumerable.t()
+  def export(address, from_period, to_period, filter_type \\ nil, filter_value \\ nil) do
     {from_block, to_block} = Helper.block_from_period(from_period, to_period)
     exchange_rate = Market.get_exchange_rate(Explorer.coin()) || Token.null()
 
     address.hash
-    |> fetch_all_transactions(from_block, to_block, @paging_options)
+    |> fetch_all_transactions(from_block, to_block, filter_type, filter_value, @paging_options)
     |> to_csv_format(address, exchange_rate)
     |> Helper.dump_to_stream()
   end
 
-  def fetch_all_transactions(address_hash, from_block, to_block, paging_options, acc \\ []) do
+  # sobelow_skip ["DOS.StringToAtom"]
+  def fetch_all_transactions(address_hash, from_block, to_block, filter_type, filter_value, paging_options, acc \\ []) do
     options =
       @necessity_by_association
       |> Keyword.put(:paging_options, paging_options)
       |> Keyword.put(:from_block, from_block)
       |> Keyword.put(:to_block, to_block)
+      |> (&if(Helper.is_valid_filter?(filter_type, filter_value, "transactions"),
+            do: &1 |> Keyword.put(:direction, String.to_atom(filter_value)),
+            else: &1
+          )).()
 
     transactions = Chain.address_to_transactions_without_rewards(address_hash, options)
     new_acc = transactions ++ acc
@@ -53,7 +58,16 @@ defmodule Explorer.Chain.CSVExport.AddressTransactionCsvExporter do
     case Enum.split(transactions, Helper.page_size()) do
       {_transactions, [%Transaction{block_number: block_number, index: index}]} ->
         new_paging_options = %{@paging_options | key: {block_number, index}}
-        fetch_all_transactions(address_hash, from_block, to_block, new_paging_options, new_acc)
+
+        fetch_all_transactions(
+          address_hash,
+          from_block,
+          to_block,
+          filter_type,
+          filter_value,
+          new_paging_options,
+          new_acc
+        )
 
       {_, []} ->
         new_acc
diff --git a/apps/explorer/lib/explorer/chain/csv_export/helper.ex b/apps/explorer/lib/explorer/chain/csv_export/helper.ex
index eec8c85595de..cb9c11dd7c7c 100644
--- a/apps/explorer/lib/explorer/chain/csv_export/helper.ex
+++ b/apps/explorer/lib/explorer/chain/csv_export/helper.ex
@@ -3,10 +3,16 @@ defmodule Explorer.Chain.CSVExport.Helper do
   CSV export helper functions.
   """
 
-  alias Explorer.Chain
+  alias Explorer.{Chain, PagingOptions}
   alias NimbleCSV.RFC4180
 
+  import Ecto.Query,
+    only: [
+      where: 3
+    ]
+
   @page_size 150
+  @default_paging_options %PagingOptions{page_size: 50}
 
   def dump_to_stream(items) do
     res =
@@ -16,9 +22,9 @@ defmodule Explorer.Chain.CSVExport.Helper do
     res
   end
 
-  def page_size do
-    @page_size
-  end
+  def page_size, do: @page_size
+
+  def default_paging_options, do: @default_paging_options
 
   def block_from_period(from_period, to_period) do
     from_block = Chain.convert_date_to_min_block(from_period)
@@ -26,4 +32,58 @@ defmodule Explorer.Chain.CSVExport.Helper do
 
     {from_block, to_block}
   end
+
+  def where_address_hash(query, address_hash, filter_type, filter_value) do
+    if filter_type == "address" do
+      case filter_value do
+        "to" -> where_address_hash_to(query, address_hash)
+        "from" -> where_address_hash_from(query, address_hash)
+        _ -> where_address_hash_all(query, address_hash)
+      end
+    else
+      where_address_hash_all(query, address_hash)
+    end
+  end
+
+  defp where_address_hash_to(query, address_hash) do
+    query
+    |> where(
+      [item],
+      item.to_address_hash == ^address_hash
+    )
+  end
+
+  defp where_address_hash_from(query, address_hash) do
+    query
+    |> where(
+      [item],
+      item.from_address_hash == ^address_hash
+    )
+  end
+
+  defp where_address_hash_all(query, address_hash) do
+    query
+    |> where(
+      [item],
+      item.to_address_hash == ^address_hash or
+        item.from_address_hash == ^address_hash or
+        item.token_contract_address_hash == ^address_hash
+    )
+  end
+
+  @spec supported_filters(String.t()) :: [String.t()]
+  def supported_filters(type) do
+    case type do
+      "internal-transactions" -> ["address"]
+      "transactions" -> ["address"]
+      "token-transfers" -> ["address"]
+      "logs" -> ["topic"]
+      _ -> []
+    end
+  end
+
+  @spec is_valid_filter?(String.t(), String.t(), String.t()) :: boolean()
+  def is_valid_filter?(filter_type, filter_value, item_type) do
+    filter_type in supported_filters(item_type) && filter_value && filter_value !== ""
+  end
 end
diff --git a/apps/explorer/lib/explorer/chain/internal_transaction.ex b/apps/explorer/lib/explorer/chain/internal_transaction.ex
index 6d424c381f8e..b91509a3dcf9 100644
--- a/apps/explorer/lib/explorer/chain/internal_transaction.ex
+++ b/apps/explorer/lib/explorer/chain/internal_transaction.ex
@@ -542,15 +542,6 @@ defmodule Explorer.Chain.InternalTransaction do
     where(query, [t], t.from_address_hash == ^address_hash)
   end
 
-  def where_address_fields_match(query, address_hash, nil) do
-    where(
-      query,
-      [it],
-      it.to_address_hash == ^address_hash or it.from_address_hash == ^address_hash or
-        it.created_contract_address_hash == ^address_hash
-    )
-  end
-
   def where_address_fields_match(query, address_hash, :to_address_hash) do
     where(query, [it], it.to_address_hash == ^address_hash)
   end
@@ -563,6 +554,19 @@ defmodule Explorer.Chain.InternalTransaction do
     where(query, [it], it.created_contract_address_hash == ^address_hash)
   end
 
+  def where_address_fields_match(query, address_hash, _) do
+    base_address_where(query, address_hash)
+  end
+
+  defp base_address_where(query, address_hash) do
+    where(
+      query,
+      [it],
+      it.to_address_hash == ^address_hash or it.from_address_hash == ^address_hash or
+        it.created_contract_address_hash == ^address_hash
+    )
+  end
+
   def where_is_different_from_parent_transaction(query) do
     where(
       query,

From 561dfa2ea9a84f74fa75d5d8881ccf68c530b5c7 Mon Sep 17 00:00:00 2001
From: Viktor Baranov <baranov.viktor.27@gmail.com>
Date: Thu, 18 May 2023 17:48:22 +0300
Subject: [PATCH 048/909] Fix reviewer comments

---
 CHANGELOG.md                                  |  2 +-
 .../_csv_export_button.html.eex               |  2 +-
 .../templates/csv_export/index.html.eex       |  4 +-
 apps/block_scout_web/priv/gettext/default.pot | 16 ++++
 .../priv/gettext/en/LC_MESSAGES/default.po    | 16 ++++
 apps/explorer/lib/explorer/chain.ex           | 76 -------------------
 .../lib/explorer/chain/csv_export/helper.ex   |  2 +-
 7 files changed, 37 insertions(+), 81 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index dab85f60e12c..60008a228450 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,7 @@
 
 - [#7532](https://github.com/blockscout/blockscout/pull/7532) - Handle empty id in json rpc responses
 - [#7544](https://github.com/blockscout/blockscout/pull/7544) - Add ERC-1155 signatures to uncataloged_token_transfer_block_numbers
+- [#7363](https://github.com/blockscout/blockscout/pull/7363) - CSV export filters
 
 ### Fixes
 
@@ -41,7 +42,6 @@
 - [#7422](https://github.com/blockscout/blockscout/pull/7422) - Refactor state changes
 - [#7416](https://github.com/blockscout/blockscout/pull/7416) - Add option to disable reCAPTCHA
 - [#6694](https://github.com/blockscout/blockscout/pull/6694) - Add withdrawals support (EIP-4895)
-- [#7363](https://github.com/blockscout/blockscout/pull/7363) - CSV export filters
 - [#7355](https://github.com/blockscout/blockscout/pull/7355) - Add endpoint for token info import
 - [#7393](https://github.com/blockscout/blockscout/pull/7393) - Realtime fetcher max gap
 - [#7436](https://github.com/blockscout/blockscout/pull/7436) - TokenBalanceOnDemand ERC-1155 support
diff --git a/apps/block_scout_web/lib/block_scout_web/templates/common_components/_csv_export_button.html.eex b/apps/block_scout_web/lib/block_scout_web/templates/common_components/_csv_export_button.html.eex
index 5040098a7a05..b0d98d362b41 100644
--- a/apps/block_scout_web/lib/block_scout_web/templates/common_components/_csv_export_button.html.eex
+++ b/apps/block_scout_web/lib/block_scout_web/templates/common_components/_csv_export_button.html.eex
@@ -1,7 +1,7 @@
 <% filter_type = if assigns[:filter_type], do: @filter_type, else: "" %>
 <% filter_value = if assigns[:filter_value], do: @filter_value, else: "" %>
 <div csv-download class="download-all-items">
-    Download <a class="download-all-items-link" href=<%= csv_export_path(@conn, :index, %{"address" => @address, "type" => @type, "filter_type" => filter_type, "filter_value" => filter_value }) %>><%= gettext("CSV") %></span>
+    <%= gettext("Download") %> <a class="download-all-items-link" href=<%= csv_export_path(@conn, :index, %{"address" => @address, "type" => @type, "filter_type" => filter_type, "filter_value" => filter_value }) %>><%= gettext("CSV") %></span>
         <svg xmlns="http://www.w3.org/2000/svg" width="14" height="16">
             <path fill="#333333" fill-rule="evenodd" d="M13 16H1c-.999 0-1-1-1-1V1s-.004-1 1-1h6l7 7v8s-.032 1-1 1zm-1-8c0-.99-1-1-1-1H8s-1 .001-1-1V3c0-.999-1-1-1-1H2v12h10V8z"/>
         </svg>
diff --git a/apps/block_scout_web/lib/block_scout_web/templates/csv_export/index.html.eex b/apps/block_scout_web/lib/block_scout_web/templates/csv_export/index.html.eex
index 4f4996a4c5fd..f0484d83d28e 100644
--- a/apps/block_scout_web/lib/block_scout_web/templates/csv_export/index.html.eex
+++ b/apps/block_scout_web/lib/block_scout_web/templates/csv_export/index.html.eex
@@ -11,10 +11,10 @@
 
       <div>
         <% filter_text = if Helper.is_valid_filter?(@filter_type, @filter_value, @type), do: " with applied filter by #{@filter_type} (#{@filter_value})", else: ""  %>
-        <p class="card-subtitle list-title-description">Export <%= type_display_name(@type) %> for address <%= link(
+        <p class="card-subtitle list-title-description"><%= gettext("Export") %> <%= type_display_name(@type) %> <%= gettext("for address") %> <%= link(
               @address_hash_string,
               to: address_path(@conn, :show, @address_hash_string)
-            ) %><%= filter_text %> to CSV file</p>
+            ) %><%= filter_text %> <%= gettext("to CSV file") %></p>
 	    </div>
 
       <div class="dates-container">
diff --git a/apps/block_scout_web/priv/gettext/default.pot b/apps/block_scout_web/priv/gettext/default.pot
index 4f9608d74fab..4bf050f955c4 100644
--- a/apps/block_scout_web/priv/gettext/default.pot
+++ b/apps/block_scout_web/priv/gettext/default.pot
@@ -1145,6 +1145,7 @@ msgstr ""
 msgid "Displaying the init data provided of the creating transaction."
 msgstr ""
 
+#: lib/block_scout_web/templates/common_components/_csv_export_button.html.eex:4
 #: lib/block_scout_web/templates/csv_export/index.html.eex:33
 #, elixir-autogen, elixir-format
 msgid "Download"
@@ -3664,3 +3665,18 @@ msgstr ""
 #, elixir-autogen, elixir-format
 msgid "%{withdrawals_count} withdrawals processed and %{withdrawals_sum} withdrawn."
 msgstr ""
+
+#: lib/block_scout_web/templates/csv_export/index.html.eex:14
+#, elixir-autogen, elixir-format
+msgid "Export"
+msgstr ""
+
+#: lib/block_scout_web/templates/csv_export/index.html.eex:14
+#, elixir-autogen, elixir-format
+msgid "for address"
+msgstr ""
+
+#: lib/block_scout_web/templates/csv_export/index.html.eex:17
+#, elixir-autogen, elixir-format
+msgid "to CSV file"
+msgstr ""
diff --git a/apps/block_scout_web/priv/gettext/en/LC_MESSAGES/default.po b/apps/block_scout_web/priv/gettext/en/LC_MESSAGES/default.po
index b47d96f90f24..bb78e00cfa3c 100644
--- a/apps/block_scout_web/priv/gettext/en/LC_MESSAGES/default.po
+++ b/apps/block_scout_web/priv/gettext/en/LC_MESSAGES/default.po
@@ -1145,6 +1145,7 @@ msgstr ""
 msgid "Displaying the init data provided of the creating transaction."
 msgstr ""
 
+#: lib/block_scout_web/templates/common_components/_csv_export_button.html.eex:4
 #: lib/block_scout_web/templates/csv_export/index.html.eex:33
 #, elixir-autogen, elixir-format
 msgid "Download"
@@ -3664,3 +3665,18 @@ msgstr ""
 #, elixir-autogen, elixir-format, fuzzy
 msgid "%{withdrawals_count} withdrawals processed and %{withdrawals_sum} withdrawn."
 msgstr ""
+
+#: lib/block_scout_web/templates/csv_export/index.html.eex:14
+#, elixir-autogen, elixir-format, fuzzy
+msgid "Export"
+msgstr ""
+
+#: lib/block_scout_web/templates/csv_export/index.html.eex:14
+#, elixir-autogen, elixir-format, fuzzy
+msgid "for address"
+msgstr ""
+
+#: lib/block_scout_web/templates/csv_export/index.html.eex:17
+#, elixir-autogen, elixir-format
+msgid "to CSV file"
+msgstr ""
diff --git a/apps/explorer/lib/explorer/chain.ex b/apps/explorer/lib/explorer/chain.ex
index d1209ef9a77e..a8ddd2db48e9 100644
--- a/apps/explorer/lib/explorer/chain.ex
+++ b/apps/explorer/lib/explorer/chain.ex
@@ -633,74 +633,6 @@ defmodule Explorer.Chain do
     |> select_repo(options).all()
   end
 
-  @doc """
-  address_hash_to_token_transfers_including_contract/2 function returns token transfers on address (to/from/contract).
-  It is used by CSV export of token transfers button.
-  """
-  @spec address_hash_to_token_transfers_including_contract(Hash.Address.t(), Keyword.t()) :: [TokenTransfer.t()]
-  def address_hash_to_token_transfers_including_contract(address_hash, options \\ []) do
-    paging_options = Keyword.get(options, :paging_options, @default_paging_options)
-    from_block = Keyword.get(options, :from_block)
-    to_block = Keyword.get(options, :to_block)
-
-    query =
-      from_block
-      |> query_address_hash_to_token_transfers_including_contract(to_block, address_hash)
-      |> order_by([token_transfer], asc: token_transfer.block_number, asc: token_transfer.log_index)
-
-    query
-    |> handle_token_transfer_paging_options(paging_options)
-    |> preload(transaction: :block)
-    |> preload(:token)
-    |> Repo.all()
-  end
-
-  defp query_address_hash_to_token_transfers_including_contract(nil, to_block, address_hash)
-       when not is_nil(to_block) do
-    from(
-      token_transfer in TokenTransfer,
-      where:
-        (token_transfer.to_address_hash == ^address_hash or
-           token_transfer.from_address_hash == ^address_hash or
-           token_transfer.token_contract_address_hash == ^address_hash) and
-          token_transfer.block_number <= ^to_block
-    )
-  end
-
-  defp query_address_hash_to_token_transfers_including_contract(from_block, nil, address_hash)
-       when not is_nil(from_block) do
-    from(
-      token_transfer in TokenTransfer,
-      where:
-        (token_transfer.to_address_hash == ^address_hash or
-           token_transfer.from_address_hash == ^address_hash or
-           token_transfer.token_contract_address_hash == ^address_hash) and
-          token_transfer.block_number >= ^from_block
-    )
-  end
-
-  defp query_address_hash_to_token_transfers_including_contract(from_block, to_block, address_hash)
-       when not is_nil(from_block) and not is_nil(to_block) do
-    from(
-      token_transfer in TokenTransfer,
-      where:
-        (token_transfer.to_address_hash == ^address_hash or
-           token_transfer.from_address_hash == ^address_hash or
-           token_transfer.token_contract_address_hash == ^address_hash) and
-          (token_transfer.block_number >= ^from_block and token_transfer.block_number <= ^to_block)
-    )
-  end
-
-  defp query_address_hash_to_token_transfers_including_contract(_, _, address_hash) do
-    from(
-      token_transfer in TokenTransfer,
-      where:
-        token_transfer.to_address_hash == ^address_hash or
-          token_transfer.from_address_hash == ^address_hash or
-          token_transfer.token_contract_address_hash == ^address_hash
-    )
-  end
-
   @spec address_to_logs(Hash.Address.t(), Keyword.t()) :: [Log.t()]
   def address_to_logs(address_hash, options \\ []) when is_list(options) do
     paging_options = Keyword.get(options, :paging_options) || %PagingOptions{page_size: 50}
@@ -4639,14 +4571,6 @@ defmodule Explorer.Chain do
     |> limit(^paging_options.page_size)
   end
 
-  defp handle_token_transfer_paging_options(query, nil), do: query
-
-  defp handle_token_transfer_paging_options(query, paging_options) do
-    query
-    |> TokenTransfer.page_token_transfer(paging_options)
-    |> limit(^paging_options.page_size)
-  end
-
   defp handle_withdrawals_paging_options(query, nil), do: query
 
   defp handle_withdrawals_paging_options(query, paging_options) do
diff --git a/apps/explorer/lib/explorer/chain/csv_export/helper.ex b/apps/explorer/lib/explorer/chain/csv_export/helper.ex
index cb9c11dd7c7c..37ed58648bb2 100644
--- a/apps/explorer/lib/explorer/chain/csv_export/helper.ex
+++ b/apps/explorer/lib/explorer/chain/csv_export/helper.ex
@@ -12,7 +12,7 @@ defmodule Explorer.Chain.CSVExport.Helper do
     ]
 
   @page_size 150
-  @default_paging_options %PagingOptions{page_size: 50}
+  @default_paging_options %PagingOptions{page_size: @page_size}
 
   def dump_to_stream(items) do
     res =

From 715d514f7f72335b61cd620036e8b5be9bebf846 Mon Sep 17 00:00:00 2001
From: Viktor Baranov <baranov.viktor.27@gmail.com>
Date: Mon, 22 May 2023 10:48:59 +0300
Subject: [PATCH 049/909] Process reviewer comment: validate address filter
 value

---
 .../lib/explorer/chain/csv_export/helper.ex     | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/apps/explorer/lib/explorer/chain/csv_export/helper.ex b/apps/explorer/lib/explorer/chain/csv_export/helper.ex
index 37ed58648bb2..4388b8c12336 100644
--- a/apps/explorer/lib/explorer/chain/csv_export/helper.ex
+++ b/apps/explorer/lib/explorer/chain/csv_export/helper.ex
@@ -82,8 +82,25 @@ defmodule Explorer.Chain.CSVExport.Helper do
     end
   end
 
+  @spec supported_address_filter_values() :: [String.t()]
+  def supported_address_filter_values do
+    ["to", "from"]
+  end
+
   @spec is_valid_filter?(String.t(), String.t(), String.t()) :: boolean()
   def is_valid_filter?(filter_type, filter_value, item_type) do
+    is_valid_filter_type(filter_type, filter_value, item_type) && is_valid_filter_value(filter_type, filter_value)
+  end
+
+  defp is_valid_filter_type(filter_type, filter_value, item_type) do
     filter_type in supported_filters(item_type) && filter_value && filter_value !== ""
   end
+
+  defp is_valid_filter_value(filter_type, filter_value) do
+    if filter_type === "address" do
+      filter_value in supported_address_filter_values()
+    else
+      true
+    end
+  end
 end

From 83ee1bd567baf7a914a1ba10babdae77a9d524d8 Mon Sep 17 00:00:00 2001
From: Viktor Baranov <baranov.viktor.27@gmail.com>
Date: Mon, 22 May 2023 12:49:21 +0300
Subject: [PATCH 050/909] Sanitize log topic filter value

---
 .../lib/explorer/chain/csv_export/helper.ex     | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/apps/explorer/lib/explorer/chain/csv_export/helper.ex b/apps/explorer/lib/explorer/chain/csv_export/helper.ex
index 4388b8c12336..1cf905a06b91 100644
--- a/apps/explorer/lib/explorer/chain/csv_export/helper.ex
+++ b/apps/explorer/lib/explorer/chain/csv_export/helper.ex
@@ -4,6 +4,7 @@ defmodule Explorer.Chain.CSVExport.Helper do
   """
 
   alias Explorer.{Chain, PagingOptions}
+  alias Explorer.Chain.Hash.Full, as: Hash
   alias NimbleCSV.RFC4180
 
   import Ecto.Query,
@@ -97,10 +98,18 @@ defmodule Explorer.Chain.CSVExport.Helper do
   end
 
   defp is_valid_filter_value(filter_type, filter_value) do
-    if filter_type === "address" do
-      filter_value in supported_address_filter_values()
-    else
-      true
+    case filter_type do
+      "address" ->
+        filter_value in supported_address_filter_values()
+
+      "topic" ->
+        case Hash.cast(filter_value) do
+          {:ok, _} -> true
+          _ -> false
+        end
+
+      _ ->
+        true
     end
   end
 end

From ee04872655d4c247c8f782ffeba87cc11c24b6cc Mon Sep 17 00:00:00 2001
From: Maxim Filonov <53992153+sl1depengwyn@users.noreply.github.com>
Date: Wed, 31 May 2023 22:56:39 +0300
Subject: [PATCH 051/909] Add Optimism genesis file support

---
 CHANGELOG.md                                  |  2 +-
 .../runner/address/coin_balances_daily.ex     | 33 ++-----
 .../lib/explorer/chain_spec/geth/importer.ex  |  2 +
 .../chain_spec/geth/importer_test.exs         | 98 +++++++------------
 .../fixture/chain_spec/optimism_genesis.json  | 39 ++++++++
 .../fixture/chain_spec/polygon_genesis.json   | 57 -----------
 6 files changed, 85 insertions(+), 146 deletions(-)
 create mode 100644 apps/explorer/test/support/fixture/chain_spec/optimism_genesis.json

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b6d8ae0244a5..a127e5e153a6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,7 +4,7 @@
 
 ### Features
 
-- [#7565](https://github.com/blockscout/blockscout/pull/7565) - Add Polygon Edge genesis file support
+- [#7603](https://github.com/blockscout/blockscout/pull/7603) - Add Polygon Edge and optimism genesis files support
 - [#7513](https://github.com/blockscout/blockscout/pull/7513) - Add Polygon Edge support
 - [#7532](https://github.com/blockscout/blockscout/pull/7532) - Handle empty id in json rpc responses
 - [#7544](https://github.com/blockscout/blockscout/pull/7544) - Add ERC-1155 signatures to uncataloged_token_transfer_block_numbers
diff --git a/apps/explorer/lib/explorer/chain/import/runner/address/coin_balances_daily.ex b/apps/explorer/lib/explorer/chain/import/runner/address/coin_balances_daily.ex
index 2c557fbf5152..e610ed3c81d9 100644
--- a/apps/explorer/lib/explorer/chain/import/runner/address/coin_balances_daily.ex
+++ b/apps/explorer/lib/explorer/chain/import/runner/address/coin_balances_daily.ex
@@ -77,18 +77,10 @@ defmodule Explorer.Chain.Import.Runner.Address.CoinBalancesDaily do
   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)
 
-    combined_changes_list =
-      changes_list
-      |> Enum.reduce([], fn change, acc ->
-        if Enum.empty?(acc) do
-          [change | acc]
-        else
-          compose_change(acc, change)
-        end
-      end)
+    combined_changes = changes_list |> Enum.reduce(%{}, &compose_change/2)
 
     # Enforce CoinBalanceDaily ShareLocks order (see docs: sharelocks.md)
-    ordered_changes_list = Enum.sort_by(combined_changes_list, &{&1.address_hash, &1.day})
+    ordered_changes_list = combined_changes |> Map.values() |> Enum.sort_by(&{&1.address_hash, &1.day})
 
     {:ok, _} =
       Import.insert_changes_list(
@@ -104,22 +96,15 @@ defmodule Explorer.Chain.Import.Runner.Address.CoinBalancesDaily do
     {:ok, Enum.map(ordered_changes_list, &Map.take(&1, ~w(address_hash day)a))}
   end
 
-  defp compose_change(acc, change) do
-    target_item =
-      Enum.find(acc, fn item ->
-        item.day == change.day && item.address_hash == change.address_hash
-      end)
-
-    if target_item do
-      if Map.has_key?(change, :value) && Map.has_key?(target_item, :value) && change.value > target_item.value do
-        acc_updated = List.delete(acc, target_item)
-        [change | acc_updated]
+  defp compose_change(change, acc) do
+    Map.update(acc, {change.address_hash, change.day}, change, fn existing_change ->
+      if Map.has_key?(change, :value) && Map.has_key?(existing_change, :value) &&
+           change.value > existing_change.value do
+        change
       else
-        acc
+        existing_change
       end
-    else
-      [change | acc]
-    end
+    end)
   end
 
   def default_on_conflict do
diff --git a/apps/explorer/lib/explorer/chain_spec/geth/importer.ex b/apps/explorer/lib/explorer/chain_spec/geth/importer.ex
index 5b5c4120ae71..9c8083f6fc77 100644
--- a/apps/explorer/lib/explorer/chain_spec/geth/importer.ex
+++ b/apps/explorer/lib/explorer/chain_spec/geth/importer.ex
@@ -89,6 +89,8 @@ defmodule Explorer.ChainSpec.Geth.Importer do
     number
   end
 
+  defp parse_number(""), do: 0
+
   defp parse_number(string_number) do
     {number, ""} = Integer.parse(string_number, 10)
 
diff --git a/apps/explorer/test/explorer/chain_spec/geth/importer_test.exs b/apps/explorer/test/explorer/chain_spec/geth/importer_test.exs
index cc658ce9929e..a2c66455df52 100644
--- a/apps/explorer/test/explorer/chain_spec/geth/importer_test.exs
+++ b/apps/explorer/test/explorer/chain_spec/geth/importer_test.exs
@@ -19,6 +19,10 @@ defmodule Explorer.ChainSpec.Geth.ImporterTest do
                    |> File.read!()
                    |> Jason.decode!()
 
+  @optimism_genesis "#{File.cwd!()}/test/support/fixture/chain_spec/optimism_genesis.json"
+                    |> File.read!()
+                    |> Jason.decode!()
+
   describe "genesis_accounts/1" do
     test "parses coin balance and contract code" do
       coin_balances = Importer.genesis_accounts(@geth_genesis)
@@ -40,7 +44,7 @@ defmodule Explorer.ChainSpec.Geth.ImporterTest do
     test "parses polygon coin balance and contract code" do
       coin_balances = Importer.genesis_accounts(@polygon_genesis)
 
-      assert Enum.count(coin_balances) == 17
+      assert Enum.count(coin_balances) == 2
 
       assert %{
                address_hash: %Explorer.Chain.Hash{
@@ -53,6 +57,23 @@ defmodule Explorer.ChainSpec.Geth.ImporterTest do
              } ==
                List.first(coin_balances)
     end
+
+    test "parses optimism coin balance and contract code" do
+      coin_balances = Importer.genesis_accounts(@optimism_genesis)
+
+      assert Enum.count(coin_balances) == 2
+
+      assert %{
+               address_hash: %Explorer.Chain.Hash{
+                 byte_count: 20,
+                 bytes: <<116, 214, 181, 2, 131, 172, 29, 101, 31, 154, 253, 195, 53, 33, 228, 193, 227, 51, 43, 120>>
+               },
+               value: 0,
+               contract_code:
+                 "0x608060405234801561001057600080fd5b506004361061011d5760003560e01c8063245a7bfc14610122578063313ce5671461014657806350d25bcd1461016457806354fd4d501461017e57806358303b10146101865780636001ac53146101a5578063668a0f021461020f5780637284e4161461021757806379ba5097146102945780638205bf6a1461029e5780638da5cb5b146102a65780638f6b4d91146102ae57806392eefe9b146102b65780639a6fc8f5146102dc578063a928c09614610302578063b5ab58dc14610328578063b633620c14610345578063bc43cbaf14610362578063c15973041461036a578063e8c4be301461038b578063f2fde38b14610393578063f8a2abd3146103b9578063feaf968c146103df575b600080fd5b61012a6103e7565b604080516001600160a01b039092168252519081900360200190f35b61014e6103fc565b6040805160ff9092168252519081900360200190f35b61016c610480565b60408051918252519081900360200190f35b61016c610588565b61018e6105db565b6040805161ffff9092168252519081900360200190f35b6101cb600480360360208110156101bb57600080fd5b50356001600160501b03166105e5565b60405180866001600160501b03168152602001858152602001848152602001838152602001826001600160501b031681526020019550505050505060405180910390f35b61016c61074e565b61021f610850565b6040805160208082528351818301528351919283929083019185019080838360005b83811015610259578181015183820152602001610241565b50505050905090810190601f1680156102865780820380516001836020036101000a031916815260200191505b509250505060405180910390f35b61029c610993565b005b61016c610a51565b61012a610b53565b6101cb610b62565b61029c600480360360208110156102cc57600080fd5b50356001600160a01b0316610cc9565b6101cb600480360360208110156102f257600080fd5b50356001600160501b0316610cf4565b61029c6004803603602081101561031857600080fd5b50356001600160a01b0316610dff565b61016c6004803603602081101561033e57600080fd5b5035610ed7565b61016c6004803603602081101561035b57600080fd5b5035610fe1565b61012a6110e4565b61012a6004803603602081101561038057600080fd5b503561ffff166110f3565b61012a611116565b61029c600480360360208110156103a957600080fd5b50356001600160a01b0316611125565b61029c600480360360208110156103cf57600080fd5b50356001600160a01b0316611181565b6101cb6111e3565b6004546201000090046001600160a01b031690565b6000600460000160029054906101000a90046001600160a01b03166001600160a01b031663313ce5676040518163ffffffff1660e01b815260040160206040518083038186803b15801561044f57600080fd5b505afa158015610463573d6000803e3d6000fd5b505050506040513d602081101561047957600080fd5b5051905090565b6005546000906001600160a01b031680158061053d575060408051630d629b5f60e31b815233600482018181526024830193845236604484018190526001600160a01b03861694636b14daf8946000939190606401848480828437600083820152604051601f909101601f1916909201965060209550909350505081840390508186803b15801561051057600080fd5b505afa158015610524573d6000803e3d6000fd5b505050506040513d602081101561053a57600080fd5b50515b61057a576040805162461bcd60e51b81526020600482015260096024820152684e6f2061636365737360b81b604482015290519081900360640190fd5b6105826112ed565b91505090565b6000600460000160029054906101000a90046001600160a01b03166001600160a01b03166354fd4d506040518163ffffffff1660e01b815260040160206040518083038186803b15801561044f57600080fd5b60045461ffff1690565b60055460009081908190819081906001600160a01b03168015806106aa575060408051630d629b5f60e31b815233600482018181526024830193845236604484018190526001600160a01b03861694636b14daf8946000939190606401848480828437600083820152604051601f909101601f1916909201965060209550909350505081840390508186803b15801561067d57600080fd5b505afa158015610691573d6000803e3d6000fd5b505050506040513d60208110156106a757600080fd5b50515b6106e7576040805162461bcd60e51b81526020600482015260096024820152684e6f2061636365737360b81b604482015290519081900360640190fd5b6002546001600160a01b0316610732576040805162461bcd60e51b815260206004820152601e6024820152600080516020611b2c833981519152604482015290519081900360640190fd5b61073b87611340565b939b929a50909850965090945092505050565b6005546000906001600160a01b031680158061080b575060408051630d629b5f60e31b815233600482018181526024830193845236604484018190526001600160a01b03861694636b14daf8946000939190606401848480828437600083820152604051601f909101601f1916909201965060209550909350505081840390508186803b1580156107de57600080fd5b505afa1580156107f2573d6000803e3d6000fd5b505050506040513d602081101561080857600080fd5b50515b610848576040805162461bcd60e51b81526020600482015260096024820152684e6f2061636365737360b81b604482015290519081900360640190fd5b61058261143d565b6060600460000160029054906101000a90046001600160a01b03166001600160a01b0316637284e4166040518163ffffffff1660e01b815260040160006040518083038186803b1580156108a357600080fd5b505afa1580156108b7573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f1916820160405260208110156108e057600080fd5b8101908080516040519392919084600160201b8211156108ff57600080fd5b90830190602082018581111561091457600080fd5b8251600160201b81118282018810171561092d57600080fd5b82525081516020918201929091019080838360005b8381101561095a578181015183820152602001610942565b50505050905090810190601f1680156109875780820380516001836020036101000a031916815260200191505b50604052505050905090565b61099b6114ec565b6001600160a01b0316336001600160a01b0316146109f9576040805162461bcd60e51b815260206004820152601660248201527526bab9ba10313290383937b837b9b2b21037bbb732b960511b604482015290519081900360640190fd5b6000610a036114fb565b9050610a0e3361150a565b610a18600061152c565b60405133906001600160a01b038316907f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e090600090a350565b6005546000906001600160a01b0316801580610b0e575060408051630d629b5f60e31b815233600482018181526024830193845236604484018190526001600160a01b03861694636b14daf8946000939190606401848480828437600083820152604051601f909101601f1916909201965060209550909350505081840390508186803b158015610ae157600080fd5b505afa158015610af5573d6000803e3d6000fd5b505050506040513d6020811015610b0b57600080fd5b50515b610b4b576040805162461bcd60e51b81526020600482015260096024820152684e6f2061636365737360b81b604482015290519081900360640190fd5b61058261154e565b6000610b5d6114fb565b905090565b60055460009081908190819081906001600160a01b0316801580610c27575060408051630d629b5f60e31b815233600482018181526024830193845236604484018190526001600160a01b03861694636b14daf8946000939190606401848480828437600083820152604051601f909101601f1916909201965060209550909350505081840390508186803b158015610bfa57600080fd5b505afa158015610c0e573d6000803e3d6000fd5b505050506040513d6020811015610c2457600080fd5b50515b610c64576040805162461bcd60e51b81526020600482015260096024820152684e6f2061636365737360b81b604482015290519081900360640190fd5b6002546001600160a01b0316610caf576040805162461bcd60e51b815260206004820152601e6024820152600080516020611b2c833981519152604482015290519081900360640190fd5b610cb76115a1565b95509550955095509550509091929394565b610cd233611697565b600580546001600160a01b0319166001600160a01b0392909216919091179055565b60055460009081908190819081906001600160a01b0316801580610db9575060408051630d629b5f60e31b815233600482018181526024830193845236604484018190526001600160a01b03861694636b14daf8946000939190606401848480828437600083820152604051601f909101601f1916909201965060209550909350505081840390508186803b158015610d8c57600080fd5b505afa158015610da0573d6000803e3d6000fd5b505050506040513d6020811015610db657600080fd5b50515b610df6576040805162461bcd60e51b81526020600482015260096024820152684e6f2061636365737360b81b604482015290519081900360640190fd5b61073b87611700565b610e0833611697565b6002546001600160a01b03828116911614610e68576040805162461bcd60e51b815260206004820152601b60248201527a24b73b30b634b210383937b837b9b2b21030b3b3b932b3b0ba37b960291b604482015290519081900360640190fd5b600454600280546001600160a01b03191690556201000090046001600160a01b0316610e93826117f9565b816001600160a01b0316816001600160a01b03167f33745f67a407dcb785417f9c123dd3641479a102674b6e35c1f10975625b90e960405160405180910390a35050565b6005546000906001600160a01b0316801580610f94575060408051630d629b5f60e31b815233600482018181526024830193845236604484018190526001600160a01b03861694636b14daf8946000939190606401848480828437600083820152604051601f909101601f1916909201965060209550909350505081840390508186803b158015610f6757600080fd5b505afa158015610f7b573d6000803e3d6000fd5b505050506040513d6020811015610f9157600080fd5b50515b610fd1576040805162461bcd60e51b81526020600482015260096024820152684e6f2061636365737360b81b604482015290519081900360640190fd5b610fda83611868565b9392505050565b6005546000906001600160a01b031680158061109e575060408051630d629b5f60e31b815233600482018181526024830193845236604484018190526001600160a01b03861694636b14daf8946000939190606401848480828437600083820152604051601f909101601f1916909201965060209550909350505081840390508186803b15801561107157600080fd5b505afa158015611085573d6000803e3d6000fd5b505050506040513d602081101561109b57600080fd5b50515b6110db576040805162461bcd60e51b81526020600482015260096024820152684e6f2061636365737360b81b604482015290519081900360640190fd5b610fda83611942565b6005546001600160a01b031681565b61ffff81166000908152600360205260409020546001600160a01b03165b919050565b6002546001600160a01b031690565b61112e33611697565b6111378161152c565b806001600160a01b03166111496114fb565b6001600160a01b03167fed8889f560326eb138920d842192f0eb3dd22b4f139c87a2c57538e05bae127860405160405180910390a350565b61118a33611697565b600280546001600160a01b0319166001600160a01b0383811691821790925560045460405191926201000090910416907fc0f151710f03d713b71d9970cee0d5b11ddc9a7552abaa3f6ee818010f21600d90600090a350565b60055460009081908190819081906001600160a01b03168015806112a8575060408051630d629b5f60e31b815233600482018181526024830193845236604484018190526001600160a01b03861694636b14daf8946000939190606401848480828437600083820152604051601f909101601f1916909201965060209550909350505081840390508186803b15801561127b57600080fd5b505afa15801561128f573d6000803e3d6000fd5b505050506040513d60208110156112a557600080fd5b50515b6112e5576040805162461bcd60e51b81526020600482015260096024820152684e6f2061636365737360b81b604482015290519081900360640190fd5b610cb76119e7565b6000600460000160029054906101000a90046001600160a01b03166001600160a01b03166350d25bcd6040518163ffffffff1660e01b815260040160206040518083038186803b15801561044f57600080fd5b60025460009081908190819081906001600160a01b0316611396576040805162461bcd60e51b815260206004820152601e6024820152600080516020611b2c833981519152604482015290519081900360640190fd5b60025460408051639a6fc8f560e01b81526001600160501b038916600482015290516001600160a01b0390921691639a6fc8f59160248082019260a092909190829003018186803b1580156113ea57600080fd5b505afa1580156113fe573d6000803e3d6000fd5b505050506040513d60a081101561141457600080fd5b508051602082015160408301516060840151608090940151929a91995097509195509350915050565b6000611447611b14565b506040805180820182526004805461ffff8116808452620100009091046001600160a01b031660208085018290528551633345078160e11b8152955194956114dd959394929363668a0f02938281019392829003018186803b1580156114ac57600080fd5b505afa1580156114c0573d6000803e3d6000fd5b505050506040513d60208110156114d657600080fd5b5051611abc565b6001600160501b031691505090565b6001546001600160a01b031690565b6000546001600160a01b031690565b600080546001600160a01b0319166001600160a01b0392909216919091179055565b600180546001600160a01b0319166001600160a01b0392909216919091179055565b6000600460000160029054906101000a90046001600160a01b03166001600160a01b0316638205bf6a6040518163ffffffff1660e01b815260040160206040518083038186803b15801561044f57600080fd5b60025460009081908190819081906001600160a01b03166115f7576040805162461bcd60e51b815260206004820152601e6024820152600080516020611b2c833981519152604482015290519081900360640190fd5b600260009054906101000a90046001600160a01b03166001600160a01b031663feaf968c6040518163ffffffff1660e01b815260040160a06040518083038186803b15801561164557600080fd5b505afa158015611659573d6000803e3d6000fd5b505050506040513d60a081101561166f57600080fd5b5080516020820151604083015160608401516080909401519299919850965091945092509050565b61169f6114fb565b6001600160a01b0316816001600160a01b0316146116fd576040805162461bcd60e51b815260206004820152601660248201527527b7363c9031b0b63630b1363290313c9037bbb732b960511b604482015290519081900360640190fd5b50565b600080600080600080600061171d886001600160501b0316611ad6565b61ffff821660009081526003602052604090819020548151639a6fc8f560e01b81526001600160401b038416600482015291519395509193506001600160a01b0390911691639a6fc8f59160248082019260a092909190829003018186803b15801561178857600080fd5b505afa15801561179c573d6000803e3d6000fd5b505050506040513d60a08110156117b257600080fd5b508051602082015160408301516060840151608090940151929a50909850965090945092506117e5878787878787611ade565b939c929b5090995097509095509350505050565b60048054604080518082018252600161ffff80851691909101168082526001600160a01b0395909516602091820181905261ffff19909316851762010000600160b01b0319166201000084021790935560009384526003909252912080546001600160a01b0319169091179055565b60006001600160501b0382111561188157506000611111565b60008061188d84611ad6565b61ffff821660009081526003602052604090205491935091506001600160a01b0316806118c05760009350505050611111565b806001600160a01b031663b5ab58dc836040518263ffffffff1660e01b815260040180826001600160401b0316815260200191505060206040518083038186803b15801561190d57600080fd5b505afa158015611921573d6000803e3d6000fd5b505050506040513d602081101561193757600080fd5b505195945050505050565b60006001600160501b0382111561195b57506000611111565b60008061196784611ad6565b61ffff821660009081526003602052604090205491935091506001600160a01b03168061199a5760009350505050611111565b806001600160a01b031663b633620c836040518263ffffffff1660e01b815260040180826001600160401b0316815260200191505060206040518083038186803b15801561190d57600080fd5b60008060008060006119f7611b14565b506040805180820182526004805461ffff811683526201000090046001600160a01b0316602083018190528351633fabe5a360e21b815293519293909263feaf968c928281019260a0929190829003018186803b158015611a5757600080fd5b505afa158015611a6b573d6000803e3d6000fd5b505050506040513d60a0811015611a8157600080fd5b5080516020820151604083015160608401516080909401518551939a509198509650919450909250610cb79087908790879087908790611ade565b6001600160401b031660409190911b61ffff60401b161790565b604081901c91565b6000806000806000611af0868c611abc565b8a8a8a611afd8a8c611abc565b939f929e50909c509a509098509650505050505050565b60408051808201909152600080825260208201529056fe4e6f2070726f706f7365642061676772656761746f722070726573656e740000a2646970667358221220e01c79ee01ff8ee5600a342cb2ed15231329d7f3f090fbe7605e1dc18906a86964736f6c634300060c0033"
+             } ==
+               List.first(coin_balances)
+    end
   end
 
   describe "import_genesis_accounts/1" do
@@ -64,7 +85,7 @@ defmodule Explorer.ChainSpec.Geth.ImporterTest do
       |> expect(:json_rpc, fn [
                                 %{id: 0, jsonrpc: "2.0", method: "eth_getBlockByNumber", params: ["0x1", true]}
                               ],
-                              _ ->
+                              _opts ->
         {:ok, [res]}
       end)
 
@@ -107,26 +128,6 @@ defmodule Explorer.ChainSpec.Geth.ImporterTest do
       assert to_string(address.contract_code) == code
     end
 
-    test "imports coin balances without 0x" do
-      block_quantity = integer_to_quantity(1)
-      res = eth_block_number_fake_response(block_quantity)
-
-      EthereumJSONRPC.Mox
-      |> expect(:json_rpc, fn [
-                                %{id: 0, jsonrpc: "2.0", method: "eth_getBlockByNumber", params: ["0x1", true]}
-                              ],
-                              [] ->
-        {:ok, [res]}
-      end)
-
-      {:ok, %{address_coin_balances: address_coin_balances}} = Importer.import_genesis_accounts(@geth_genesis)
-
-      assert Enum.count(address_coin_balances) == 3
-      assert CoinBalance |> Repo.all() |> Enum.count() == 3
-      assert CoinBalanceDaily |> Repo.all() |> Enum.count() == 3
-      assert Address |> Repo.all() |> Enum.count() == 3
-    end
-
     test "imports polygon accounts" do
       block_quantity = integer_to_quantity(1)
       res = eth_block_number_fake_response(block_quantity)
@@ -141,13 +142,13 @@ defmodule Explorer.ChainSpec.Geth.ImporterTest do
 
       {:ok, %{address_coin_balances: address_coin_balances}} = Importer.import_genesis_accounts(@polygon_genesis)
 
-      assert Enum.count(address_coin_balances) == 17
-      assert CoinBalance |> Repo.all() |> Enum.count() == 17
-      assert CoinBalanceDaily |> Repo.all() |> Enum.count() == 17
-      assert Address |> Repo.all() |> Enum.count() == 17
+      assert Enum.count(address_coin_balances) == 2
+      assert CoinBalance |> Repo.all() |> Enum.count() == 2
+      assert CoinBalanceDaily |> Repo.all() |> Enum.count() == 2
+      assert Address |> Repo.all() |> Enum.count() == 2
     end
 
-    test "imports polygon contract code" do
+    test "imports optimism accounts" do
       block_quantity = integer_to_quantity(1)
       res = eth_block_number_fake_response(block_quantity)
 
@@ -155,47 +156,16 @@ defmodule Explorer.ChainSpec.Geth.ImporterTest do
       |> expect(:json_rpc, fn [
                                 %{id: 0, jsonrpc: "2.0", method: "eth_getBlockByNumber", params: ["0x1", true]}
                               ],
-                              [] ->
-        {:ok, [res]}
-      end)
-
-      code =
-        "0x608060405234801561001057600080fd5b50600436106100cf5760003560e01c806391ad27b41161008c57806398d5fdca1161006657806398d5fdca14610262578063a97e5c9314610280578063df5dd1a5146102dc578063eebd48b014610320576100cf565b806391ad27b4146101e457806391b7f5ed14610202578063955d14cd14610244576100cf565b80630aa6f2fe146100d457806320ba81ee1461011657806322a90082146101345780634c2c987c14610176578063764cbcd1146101985780637837efdc146101da575b600080fd5b610100600480360360208110156100ea57600080fd5b8101908080359060200190929190505050610353565b6040518082815260200191505060405180910390f35b61011e6103c4565b6040518082815260200191505060405180910390f35b6101606004803603602081101561014a57600080fd5b81019080803590602001909291905050506103ce565b6040518082815260200191505060405180910390f35b61017e61043f565b604051808215151515815260200191505060405180910390f35b6101c4600480360360208110156101ae57600080fd5b8101908080359060200190929190505050610456565b6040518082815260200191505060405180910390f35b6101e26104c7565b005b6101ec6104d2565b6040518082815260200191505060405180910390f35b61022e6004803603602081101561021857600080fd5b81019080803590602001909291905050506104dc565b6040518082815260200191505060405180910390f35b61024c6106a2565b6040518082815260200191505060405180910390f35b61026a6106ac565b6040518082815260200191505060405180910390f35b6102c26004803603602081101561029657600080fd5b81019080803573ffffffffffffffffffffffffffffffffffffffff1690602001909291905050506106b6565b604051808215151515815260200191505060405180910390f35b61031e600480360360208110156102f257600080fd5b81019080803573ffffffffffffffffffffffffffffffffffffffff1690602001909291905050506106d3565b005b61032861073d565b6040518085815260200184815260200183815260200182815260200194505050505060405180910390f35b600061035e336106b6565b6103b3576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401808060200182810382526030815260200180610b4f6030913960400191505060405180910390fd5b816004819055506004549050919050565b6000600454905090565b60006103d9336106b6565b61042e576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401808060200182810382526030815260200180610b4f6030913960400191505060405180910390fd5b816003819055506003549050919050565b6000600560009054906101000a900460ff16905090565b6000610461336106b6565b6104b6576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401808060200182810382526030815260200180610b4f6030913960400191505060405180910390fd5b816002819055506002549050919050565b6104d033610771565b565b6000600354905090565b60006104e7336106b6565b61053c576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401808060200182810382526030815260200180610b4f6030913960400191505060405180910390fd5b600082116105b2576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004018080602001828103825260098152602001807f7072696365203c3d30000000000000000000000000000000000000000000000081525060200191505060405180910390fd5b6105ba6104d2565b6105c26106a2565b01421015610638576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004018080602001828103825260148152602001807f54494d455f4c4f434b5f494e434f4d504c45544500000000000000000000000081525060200191505060405180910390fd5b610641826107cb565b5061064b42610456565b503373ffffffffffffffffffffffffffffffffffffffff167f95dce27040c59c8b1c445b284f81a3aaae6eecd7d08d5c7684faee64cdb514a1836040518082815260200191505060405180910390a2819050919050565b6000600254905090565b6000600154905090565b60006106cc82600061083c90919063ffffffff16565b9050919050565b6106dc336106b6565b610731576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401808060200182810382526030815260200180610b4f6030913960400191505060405180910390fd5b61073a8161091a565b50565b60008060008061074b6106ac565b6107536104d2565b61075b6103c4565b6107636106a2565b935093509350935090919293565b61078581600061097390919063ffffffff16565b8073ffffffffffffffffffffffffffffffffffffffff167f9c8e7d83025bef8a04c664b2f753f64b8814bdb7e27291d7e50935f18cc3c71260405160405180910390a250565b60006107d6336106b6565b61082b576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401808060200182810382526030815260200180610b4f6030913960400191505060405180910390fd5b816001819055506001549050919050565b60008073ffffffffffffffffffffffffffffffffffffffff168273ffffffffffffffffffffffffffffffffffffffff1614156108c3576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401808060200182810382526022815260200180610b2d6022913960400191505060405180910390fd5b8260000160008373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060009054906101000a900460ff16905092915050565b61092e816000610a3090919063ffffffff16565b8073ffffffffffffffffffffffffffffffffffffffff167e47706786c922d17b39285dc59d696bafea72c0b003d3841ae1202076f4c2e460405160405180910390a250565b61097d828261083c565b6109d2576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401808060200182810382526021815260200180610b0c6021913960400191505060405180910390fd5b60008260000160008373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060006101000a81548160ff0219169083151502179055505050565b610a3a828261083c565b15610aad576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040180806020018281038252601f8152602001807f526f6c65733a206163636f756e7420616c72656164792068617320726f6c650081525060200191505060405180910390fd5b60018260000160008373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060006101000a81548160ff021916908315150217905550505056fe526f6c65733a206163636f756e7420646f6573206e6f74206861766520726f6c65526f6c65733a206163636f756e7420697320746865207a65726f20616464726573734f7261636c65526f6c653a2063616c6c657220646f6573206e6f74206861766520746865204f7261636c6520726f6c65a265627a7a72315820df30730da57a5061c487e0b37e84e80308fa443e2e80ee9117a13fa8149caf4164736f6c634300050b0032"
-
-      chain_spec = %{
-        "alloc" => %{
-          "0xcd59f3dde77e09940befb6ee58031965cae7a336" => %{
-            "balance" => "0x21e19e0c9bab2400000",
-            "code" => code
-          }
-        }
-      }
-
-      {:ok, _} = Importer.import_genesis_accounts(chain_spec)
-
-      address = Address |> Repo.one()
-
-      assert to_string(address.contract_code) == code
-    end
-
-    test "imports polygon coin balances without 0x" do
-      block_quantity = integer_to_quantity(1)
-      res = eth_block_number_fake_response(block_quantity)
-
-      EthereumJSONRPC.Mox
-      |> expect(:json_rpc, fn [
-                                %{id: 0, jsonrpc: "2.0", method: "eth_getBlockByNumber", params: ["0x1", true]}
-                              ],
-                              [] ->
+                              _ ->
         {:ok, [res]}
       end)
 
-      {:ok, %{address_coin_balances: address_coin_balances}} = Importer.import_genesis_accounts(@polygon_genesis)
+      {:ok, %{address_coin_balances: address_coin_balances}} = Importer.import_genesis_accounts(@optimism_genesis)
 
-      assert Enum.count(address_coin_balances) == 17
-      assert CoinBalance |> Repo.all() |> Enum.count() == 17
-      assert CoinBalanceDaily |> Repo.all() |> Enum.count() == 17
-      assert Address |> Repo.all() |> Enum.count() == 17
+      assert Enum.count(address_coin_balances) == 2
+      assert CoinBalance |> Repo.all() |> Enum.count() == 2
+      assert CoinBalanceDaily |> Repo.all() |> Enum.count() == 2
+      assert Address |> Repo.all() |> Enum.count() == 2
     end
   end
 
diff --git a/apps/explorer/test/support/fixture/chain_spec/optimism_genesis.json b/apps/explorer/test/support/fixture/chain_spec/optimism_genesis.json
new file mode 100644
index 000000000000..43b203dda259
--- /dev/null
+++ b/apps/explorer/test/support/fixture/chain_spec/optimism_genesis.json
@@ -0,0 +1,39 @@
+{
+    "commit": "373e1edbbaa2e2b5e7575eba1d3ac3c3431f5d15",
+    "config": {
+        "chainId": 10,
+        "homesteadBlock": 0,
+        "eip150Block": 0,
+        "eip155Block": 0,
+        "eip158Block": 0,
+        "byzantiumBlock": 0,
+        "constantinopleBlock": 0,
+        "petersburgBlock": 0,
+        "istanbulBlock": 0,
+        "muirGlacierBlock": 0,
+        "berlinBlock": 3950000,
+        "clique": {
+            "period": 0,
+            "epoch": 30000
+        }
+    },
+    "difficulty": "1",
+    "gasLimit": "15000000",
+    "extradata": "0x000000000000000000000000000000000000000000000000000000000000000000000398232E2064F896018496b4b44b3D62751F0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+    "alloc": {
+        "74d6b50283ac1d651f9afdc33521e4c1e3332b78": {
+            "balance": "",
+            "nonce": "1",
+            "code": "0x608060405234801561001057600080fd5b506004361061011d5760003560e01c8063245a7bfc14610122578063313ce5671461014657806350d25bcd1461016457806354fd4d501461017e57806358303b10146101865780636001ac53146101a5578063668a0f021461020f5780637284e4161461021757806379ba5097146102945780638205bf6a1461029e5780638da5cb5b146102a65780638f6b4d91146102ae57806392eefe9b146102b65780639a6fc8f5146102dc578063a928c09614610302578063b5ab58dc14610328578063b633620c14610345578063bc43cbaf14610362578063c15973041461036a578063e8c4be301461038b578063f2fde38b14610393578063f8a2abd3146103b9578063feaf968c146103df575b600080fd5b61012a6103e7565b604080516001600160a01b039092168252519081900360200190f35b61014e6103fc565b6040805160ff9092168252519081900360200190f35b61016c610480565b60408051918252519081900360200190f35b61016c610588565b61018e6105db565b6040805161ffff9092168252519081900360200190f35b6101cb600480360360208110156101bb57600080fd5b50356001600160501b03166105e5565b60405180866001600160501b03168152602001858152602001848152602001838152602001826001600160501b031681526020019550505050505060405180910390f35b61016c61074e565b61021f610850565b6040805160208082528351818301528351919283929083019185019080838360005b83811015610259578181015183820152602001610241565b50505050905090810190601f1680156102865780820380516001836020036101000a031916815260200191505b509250505060405180910390f35b61029c610993565b005b61016c610a51565b61012a610b53565b6101cb610b62565b61029c600480360360208110156102cc57600080fd5b50356001600160a01b0316610cc9565b6101cb600480360360208110156102f257600080fd5b50356001600160501b0316610cf4565b61029c6004803603602081101561031857600080fd5b50356001600160a01b0316610dff565b61016c6004803603602081101561033e57600080fd5b5035610ed7565b61016c6004803603602081101561035b57600080fd5b5035610fe1565b61012a6110e4565b61012a6004803603602081101561038057600080fd5b503561ffff166110f3565b61012a611116565b61029c600480360360208110156103a957600080fd5b50356001600160a01b0316611125565b61029c600480360360208110156103cf57600080fd5b50356001600160a01b0316611181565b6101cb6111e3565b6004546201000090046001600160a01b031690565b6000600460000160029054906101000a90046001600160a01b03166001600160a01b031663313ce5676040518163ffffffff1660e01b815260040160206040518083038186803b15801561044f57600080fd5b505afa158015610463573d6000803e3d6000fd5b505050506040513d602081101561047957600080fd5b5051905090565b6005546000906001600160a01b031680158061053d575060408051630d629b5f60e31b815233600482018181526024830193845236604484018190526001600160a01b03861694636b14daf8946000939190606401848480828437600083820152604051601f909101601f1916909201965060209550909350505081840390508186803b15801561051057600080fd5b505afa158015610524573d6000803e3d6000fd5b505050506040513d602081101561053a57600080fd5b50515b61057a576040805162461bcd60e51b81526020600482015260096024820152684e6f2061636365737360b81b604482015290519081900360640190fd5b6105826112ed565b91505090565b6000600460000160029054906101000a90046001600160a01b03166001600160a01b03166354fd4d506040518163ffffffff1660e01b815260040160206040518083038186803b15801561044f57600080fd5b60045461ffff1690565b60055460009081908190819081906001600160a01b03168015806106aa575060408051630d629b5f60e31b815233600482018181526024830193845236604484018190526001600160a01b03861694636b14daf8946000939190606401848480828437600083820152604051601f909101601f1916909201965060209550909350505081840390508186803b15801561067d57600080fd5b505afa158015610691573d6000803e3d6000fd5b505050506040513d60208110156106a757600080fd5b50515b6106e7576040805162461bcd60e51b81526020600482015260096024820152684e6f2061636365737360b81b604482015290519081900360640190fd5b6002546001600160a01b0316610732576040805162461bcd60e51b815260206004820152601e6024820152600080516020611b2c833981519152604482015290519081900360640190fd5b61073b87611340565b939b929a50909850965090945092505050565b6005546000906001600160a01b031680158061080b575060408051630d629b5f60e31b815233600482018181526024830193845236604484018190526001600160a01b03861694636b14daf8946000939190606401848480828437600083820152604051601f909101601f1916909201965060209550909350505081840390508186803b1580156107de57600080fd5b505afa1580156107f2573d6000803e3d6000fd5b505050506040513d602081101561080857600080fd5b50515b610848576040805162461bcd60e51b81526020600482015260096024820152684e6f2061636365737360b81b604482015290519081900360640190fd5b61058261143d565b6060600460000160029054906101000a90046001600160a01b03166001600160a01b0316637284e4166040518163ffffffff1660e01b815260040160006040518083038186803b1580156108a357600080fd5b505afa1580156108b7573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f1916820160405260208110156108e057600080fd5b8101908080516040519392919084600160201b8211156108ff57600080fd5b90830190602082018581111561091457600080fd5b8251600160201b81118282018810171561092d57600080fd5b82525081516020918201929091019080838360005b8381101561095a578181015183820152602001610942565b50505050905090810190601f1680156109875780820380516001836020036101000a031916815260200191505b50604052505050905090565b61099b6114ec565b6001600160a01b0316336001600160a01b0316146109f9576040805162461bcd60e51b815260206004820152601660248201527526bab9ba10313290383937b837b9b2b21037bbb732b960511b604482015290519081900360640190fd5b6000610a036114fb565b9050610a0e3361150a565b610a18600061152c565b60405133906001600160a01b038316907f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e090600090a350565b6005546000906001600160a01b0316801580610b0e575060408051630d629b5f60e31b815233600482018181526024830193845236604484018190526001600160a01b03861694636b14daf8946000939190606401848480828437600083820152604051601f909101601f1916909201965060209550909350505081840390508186803b158015610ae157600080fd5b505afa158015610af5573d6000803e3d6000fd5b505050506040513d6020811015610b0b57600080fd5b50515b610b4b576040805162461bcd60e51b81526020600482015260096024820152684e6f2061636365737360b81b604482015290519081900360640190fd5b61058261154e565b6000610b5d6114fb565b905090565b60055460009081908190819081906001600160a01b0316801580610c27575060408051630d629b5f60e31b815233600482018181526024830193845236604484018190526001600160a01b03861694636b14daf8946000939190606401848480828437600083820152604051601f909101601f1916909201965060209550909350505081840390508186803b158015610bfa57600080fd5b505afa158015610c0e573d6000803e3d6000fd5b505050506040513d6020811015610c2457600080fd5b50515b610c64576040805162461bcd60e51b81526020600482015260096024820152684e6f2061636365737360b81b604482015290519081900360640190fd5b6002546001600160a01b0316610caf576040805162461bcd60e51b815260206004820152601e6024820152600080516020611b2c833981519152604482015290519081900360640190fd5b610cb76115a1565b95509550955095509550509091929394565b610cd233611697565b600580546001600160a01b0319166001600160a01b0392909216919091179055565b60055460009081908190819081906001600160a01b0316801580610db9575060408051630d629b5f60e31b815233600482018181526024830193845236604484018190526001600160a01b03861694636b14daf8946000939190606401848480828437600083820152604051601f909101601f1916909201965060209550909350505081840390508186803b158015610d8c57600080fd5b505afa158015610da0573d6000803e3d6000fd5b505050506040513d6020811015610db657600080fd5b50515b610df6576040805162461bcd60e51b81526020600482015260096024820152684e6f2061636365737360b81b604482015290519081900360640190fd5b61073b87611700565b610e0833611697565b6002546001600160a01b03828116911614610e68576040805162461bcd60e51b815260206004820152601b60248201527a24b73b30b634b210383937b837b9b2b21030b3b3b932b3b0ba37b960291b604482015290519081900360640190fd5b600454600280546001600160a01b03191690556201000090046001600160a01b0316610e93826117f9565b816001600160a01b0316816001600160a01b03167f33745f67a407dcb785417f9c123dd3641479a102674b6e35c1f10975625b90e960405160405180910390a35050565b6005546000906001600160a01b0316801580610f94575060408051630d629b5f60e31b815233600482018181526024830193845236604484018190526001600160a01b03861694636b14daf8946000939190606401848480828437600083820152604051601f909101601f1916909201965060209550909350505081840390508186803b158015610f6757600080fd5b505afa158015610f7b573d6000803e3d6000fd5b505050506040513d6020811015610f9157600080fd5b50515b610fd1576040805162461bcd60e51b81526020600482015260096024820152684e6f2061636365737360b81b604482015290519081900360640190fd5b610fda83611868565b9392505050565b6005546000906001600160a01b031680158061109e575060408051630d629b5f60e31b815233600482018181526024830193845236604484018190526001600160a01b03861694636b14daf8946000939190606401848480828437600083820152604051601f909101601f1916909201965060209550909350505081840390508186803b15801561107157600080fd5b505afa158015611085573d6000803e3d6000fd5b505050506040513d602081101561109b57600080fd5b50515b6110db576040805162461bcd60e51b81526020600482015260096024820152684e6f2061636365737360b81b604482015290519081900360640190fd5b610fda83611942565b6005546001600160a01b031681565b61ffff81166000908152600360205260409020546001600160a01b03165b919050565b6002546001600160a01b031690565b61112e33611697565b6111378161152c565b806001600160a01b03166111496114fb565b6001600160a01b03167fed8889f560326eb138920d842192f0eb3dd22b4f139c87a2c57538e05bae127860405160405180910390a350565b61118a33611697565b600280546001600160a01b0319166001600160a01b0383811691821790925560045460405191926201000090910416907fc0f151710f03d713b71d9970cee0d5b11ddc9a7552abaa3f6ee818010f21600d90600090a350565b60055460009081908190819081906001600160a01b03168015806112a8575060408051630d629b5f60e31b815233600482018181526024830193845236604484018190526001600160a01b03861694636b14daf8946000939190606401848480828437600083820152604051601f909101601f1916909201965060209550909350505081840390508186803b15801561127b57600080fd5b505afa15801561128f573d6000803e3d6000fd5b505050506040513d60208110156112a557600080fd5b50515b6112e5576040805162461bcd60e51b81526020600482015260096024820152684e6f2061636365737360b81b604482015290519081900360640190fd5b610cb76119e7565b6000600460000160029054906101000a90046001600160a01b03166001600160a01b03166350d25bcd6040518163ffffffff1660e01b815260040160206040518083038186803b15801561044f57600080fd5b60025460009081908190819081906001600160a01b0316611396576040805162461bcd60e51b815260206004820152601e6024820152600080516020611b2c833981519152604482015290519081900360640190fd5b60025460408051639a6fc8f560e01b81526001600160501b038916600482015290516001600160a01b0390921691639a6fc8f59160248082019260a092909190829003018186803b1580156113ea57600080fd5b505afa1580156113fe573d6000803e3d6000fd5b505050506040513d60a081101561141457600080fd5b508051602082015160408301516060840151608090940151929a91995097509195509350915050565b6000611447611b14565b506040805180820182526004805461ffff8116808452620100009091046001600160a01b031660208085018290528551633345078160e11b8152955194956114dd959394929363668a0f02938281019392829003018186803b1580156114ac57600080fd5b505afa1580156114c0573d6000803e3d6000fd5b505050506040513d60208110156114d657600080fd5b5051611abc565b6001600160501b031691505090565b6001546001600160a01b031690565b6000546001600160a01b031690565b600080546001600160a01b0319166001600160a01b0392909216919091179055565b600180546001600160a01b0319166001600160a01b0392909216919091179055565b6000600460000160029054906101000a90046001600160a01b03166001600160a01b0316638205bf6a6040518163ffffffff1660e01b815260040160206040518083038186803b15801561044f57600080fd5b60025460009081908190819081906001600160a01b03166115f7576040805162461bcd60e51b815260206004820152601e6024820152600080516020611b2c833981519152604482015290519081900360640190fd5b600260009054906101000a90046001600160a01b03166001600160a01b031663feaf968c6040518163ffffffff1660e01b815260040160a06040518083038186803b15801561164557600080fd5b505afa158015611659573d6000803e3d6000fd5b505050506040513d60a081101561166f57600080fd5b5080516020820151604083015160608401516080909401519299919850965091945092509050565b61169f6114fb565b6001600160a01b0316816001600160a01b0316146116fd576040805162461bcd60e51b815260206004820152601660248201527527b7363c9031b0b63630b1363290313c9037bbb732b960511b604482015290519081900360640190fd5b50565b600080600080600080600061171d886001600160501b0316611ad6565b61ffff821660009081526003602052604090819020548151639a6fc8f560e01b81526001600160401b038416600482015291519395509193506001600160a01b0390911691639a6fc8f59160248082019260a092909190829003018186803b15801561178857600080fd5b505afa15801561179c573d6000803e3d6000fd5b505050506040513d60a08110156117b257600080fd5b508051602082015160408301516060840151608090940151929a50909850965090945092506117e5878787878787611ade565b939c929b5090995097509095509350505050565b60048054604080518082018252600161ffff80851691909101168082526001600160a01b0395909516602091820181905261ffff19909316851762010000600160b01b0319166201000084021790935560009384526003909252912080546001600160a01b0319169091179055565b60006001600160501b0382111561188157506000611111565b60008061188d84611ad6565b61ffff821660009081526003602052604090205491935091506001600160a01b0316806118c05760009350505050611111565b806001600160a01b031663b5ab58dc836040518263ffffffff1660e01b815260040180826001600160401b0316815260200191505060206040518083038186803b15801561190d57600080fd5b505afa158015611921573d6000803e3d6000fd5b505050506040513d602081101561193757600080fd5b505195945050505050565b60006001600160501b0382111561195b57506000611111565b60008061196784611ad6565b61ffff821660009081526003602052604090205491935091506001600160a01b03168061199a5760009350505050611111565b806001600160a01b031663b633620c836040518263ffffffff1660e01b815260040180826001600160401b0316815260200191505060206040518083038186803b15801561190d57600080fd5b60008060008060006119f7611b14565b506040805180820182526004805461ffff811683526201000090046001600160a01b0316602083018190528351633fabe5a360e21b815293519293909263feaf968c928281019260a0929190829003018186803b158015611a5757600080fd5b505afa158015611a6b573d6000803e3d6000fd5b505050506040513d60a0811015611a8157600080fd5b5080516020820151604083015160608401516080909401518551939a509198509650919450909250610cb79087908790879087908790611ade565b6001600160401b031660409190911b61ffff60401b161790565b604081901c91565b6000806000806000611af0868c611abc565b8a8a8a611afd8a8c611abc565b939f929e50909c509a509098509650505050505050565b60408051808201909152600080825260208201529056fe4e6f2070726f706f7365642061676772656761746f722070726573656e740000a2646970667358221220e01c79ee01ff8ee5600a342cb2ed15231329d7f3f090fbe7605e1dc18906a86964736f6c634300060c0033",
+            "storage": {
+                "0000000000000000000000000000000000000000000000000000000000000000": "3e074f864b15132401dc85371a683a7a02e61059",
+                "0000000000000000000000000000000000000000000000000000000000000004": "8ce8c13d816fe6daf12d6fd9e4952e1fc88850af0001",
+                "a15bc60c955c405d20d9149c709e2460f1c2d9a497496a7f46004d1772c3054c": "8ce8c13d816fe6daf12d6fd9e4952e1fc88850af"
+            }
+        },
+        "fefd3451e86c275a499e4d4b9efe5424ef2ab86e": {
+            "nonce": "1",
+            "balance": "1"
+        }
+    }
+}
\ No newline at end of file
diff --git a/apps/explorer/test/support/fixture/chain_spec/polygon_genesis.json b/apps/explorer/test/support/fixture/chain_spec/polygon_genesis.json
index 974a44394590..7a338caa78bc 100644
--- a/apps/explorer/test/support/fixture/chain_spec/polygon_genesis.json
+++ b/apps/explorer/test/support/fixture/chain_spec/polygon_genesis.json
@@ -13,63 +13,6 @@
                 "code": "0x608060405234801561001057600080fd5b50600436106101b05760003560e01c806370a08231116100ef578063ce513b6f11610092578063ce513b6f14610398578063dd62ed3e146103ab578063e0563ab1146103be578063ea0fee4f146103c7578063eacdc5ff146103cf578063eeb49945146103d8578063f3f43703146103eb578063fd242c14146103fe57600080fd5b806370a08231146102e7578063947287cf146102fa57806395d89b411461030357806397e5230d1461030b578063981b24d014610315578063a457c2d714610328578063a9059cbb1461033b578063c6b61e4c1461034e57600080fd5b8063395093511161015757806339509351146102735780633b878c22146102865780633ccfd60b1461028f5780633fd50001146102975780634ee2cd7e146102aa57806351351d53146102bd57806361cc2763146102cb57806362656003146102de57600080fd5b806306fdde03146101b5578063095ea7b3146101d35780630f50287c146101f657806318160ddd1461020b57806323b872dd1461021d578063284017f5146102305780632e17de7814610251578063313ce56714610264575b600080fd5b6101bd610411565b6040516101ca91906119ba565b60405180910390f35b6101e66101e13660046119e2565b6104a3565b60405190151581526020016101ca565b610209610204366004611a0e565b6104bd565b005b6035545b6040519081526020016101ca565b6101e661022b366004611a46565b61074f565b61023961202081565b6040516001600160a01b0390911681526020016101ca565b61020961025f366004611a87565b610773565b604051601281526020016101ca565b6101e66102813660046119e2565b61078a565b61023961101081565b6102096107ac565b61020f6102a5366004611a87565b6108bd565b61020f6102b83660046119e2565b6108de565b6102396002600160a01b0381565b6102096102d9366004611b10565b6108f1565b61020f60cc5481565b61020f6102f5366004611c29565b610b1f565b61020f61520881565b6101bd610b3a565b61020f620249f081565b61020f610323366004611a87565b610b49565b6101e66103363660046119e2565b610b54565b6101e66103493660046119e2565b610bcf565b61037d61035c366004611a87565b60ce6020526000908152604090208054600182015460029092015490919083565b604080519384526020840192909252908201526060016101ca565b61020f6103a6366004611c29565b610bdd565b61020f6103b9366004611c46565b610c0b565b61023961203081565b61020f600181565b61020f60cd5481565b6102096103e6366004611c7f565b610c36565b61020f6103f9366004611c29565b610d08565b61020f61040c366004611a87565b610d2f565b60606036805461042090611d08565b80601f016020809104026020016040519081016040528092919081815260200182805461044c90611d08565b80156104995780601f1061046e57610100808354040283529160200191610499565b820191906000526020600020905b81548152906001019060200180831161047c57829003601f168201915b5050505050905090565b6000336104b1818585610d79565b60019150505b92915050565b336002600160a01b03146105065760405163973d02cb60e01b815260206004820152600a60248201526914d654d5115350d0531360b21b60448201526064015b60405180910390fd5b60cd80546000918261051783611d58565b9190505590508083146105625760405162461bcd60e51b815260206004820152601360248201527215539156141150d5115117d15413d0d217d251606a1b60448201526064016104fd565b81356020830135116105ac5760405162461bcd60e51b81526020600482015260136024820152721393d7d09313d0d2d4d7d0d3d3535255151151606a1b60448201526064016104fd565b60cc546105be83356020850135611d71565b6105c9906001611d84565b6105d39190611dad565b1561062e5760405162461bcd60e51b815260206004820152602560248201527f45504f43485f4d5553545f42455f444956495349424c455f42595f45504f43486044820152645f53495a4560d81b60648201526084016104fd565b813560ce600061063f600185611d71565b815260200190815260200160002060010154600161065d9190611d84565b146106a05760405162461bcd60e51b8152602060048201526013602482015272494e56414c49445f53544152545f424c4f434b60681b60448201526064016104fd565b600081815260ce6020526040902082906106d182828135815560208201356001820155604082013560028201555050565b505060cf80546001810182556000919091526020838101357facb8d954e2cfef495862221e91bd7523613cf8808827cb33edfe4904cc51bf299092018290556040805190850135815284359186917f0ce8712c4dee4bd5a691f0bc1c39594671591e77395f8ebf6a3fb5f63fbea66a910160405180910390a4505050565b60003361075d858285610e9e565b610768858585610f12565b506001949350505050565b61077d33826110b6565b61078733826111e1565b50565b6000336104b181858561079d8383610c0b565b6107a79190611d84565b610d79565b33600090815260d06020526040812060cd5490919081906107ce90849061125a565b808555604051828152919350915033907f7fcf532c15f0a6db0bd6d0e038bea71d30d808c7d98cb3bf7268a95bf5081b659060200160405180910390a260c95460cb54604080517f8ca9a95e41b5eece253c93f5b31eed1253aed6b145d8a6e14d913fdf8e7322936020820152338183015260608082018790528251808303909101815260808201928390526316f1983160e01b9092526001600160a01b03938416936316f198319361088693911691608401611dc1565b600060405180830381600087803b1580156108a057600080fd5b505af11580156108b4573d6000803e3d6000fd5b50505050505050565b60cf81815481106108cd57600080fd5b600091825260209091200154905081565b60006108ea83836112cc565b9392505050565b600054610100900460ff16158080156109115750600054600160ff909116105b8061092b5750303b15801561092b575060005460ff166001145b61098e5760405162461bcd60e51b815260206004820152602e60248201527f496e697469616c697a61626c653a20636f6e747261637420697320616c72656160448201526d191e481a5b9a5d1a585b1a5e995960921b60648201526084016104fd565b6000805460ff1916600117905580156109b1576000805461ff0019166101001790555b6109fb6040518060400160405280600c81526020016b15985b1a59185d1bdc94d95d60a21b815250604051806040016040528060048152602001631594d15560e21b815250611315565b60c980546001600160a01b038089166001600160a01b03199283161790925560ca805488841690831617905560cb80549287169290911691909117905560cc83905560005b8251811015610a9557610a8d838281518110610a5e57610a5e611de5565b602002602001015160000151848381518110610a7c57610a7c611de5565b60200260200101516020015161134a565b600101610a40565b5060cf80546001818101835560009283527facb8d954e2cfef495862221e91bd7523613cf8808827cb33edfe4904cc51bf299091019190915560cd558015610b17576000805461ff0019169055604051600181527f7f26b83ff96e1f2b6a682f133852f6798a09c465da95921460cefb38474024989060200160405180910390a15b505050505050565b6001600160a01b031660009081526033602052604090205490565b60606037805461042090611d08565b60006104b782611354565b60003381610b628286610c0b565b905083811015610bc25760405162461bcd60e51b815260206004820152602560248201527f45524332303a2064656372656173656420616c6c6f77616e63652062656c6f77604482015264207a65726f60d81b60648201526084016104fd565b6107688286868403610d79565b6000336104b1818585610f12565b60cd546001600160a01b038216600090815260d0602052604081209091610c04919061125a565b5092915050565b6001600160a01b03918216600090815260346020908152604080832093909416825291909152205490565b60ca546001600160a01b031633148015610c5d575060cb546001600160a01b038481169116145b610c9a5760405162461bcd60e51b815260206004820152600e60248201526d24a72b20a624a22fa9a2a72222a960911b60448201526064016104fd565b7f1bcc0f4c3fad314e585165815f94ecca9b96690a26d6417d7876448a9a867a69610cc9602060008486611dfb565b610cd291611e25565b03610d0257600080610ce78360208187611dfb565b810190610cf491906119e2565b91509150610b17828261134a565b50505050565b60cd546001600160a01b038216600090815260d06020526040812090916104b7919061137f565b600081815260ce60205260408120600101548015610d7057600083815260ce6020526040902054610d609082611d71565b610d6b906001611d84565b6108ea565b60009392505050565b6001600160a01b038316610ddb5760405162461bcd60e51b8152602060048201526024808201527f45524332303a20617070726f76652066726f6d20746865207a65726f206164646044820152637265737360e01b60648201526084016104fd565b6001600160a01b038216610e3c5760405162461bcd60e51b815260206004820152602260248201527f45524332303a20617070726f766520746f20746865207a65726f206164647265604482015261737360f01b60648201526084016104fd565b6001600160a01b0383811660008181526034602090815260408083209487168084529482529182902085905590518481527f8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b92591015b60405180910390a3505050565b6000610eaa8484610c0b565b90506000198114610d025781811015610f055760405162461bcd60e51b815260206004820152601d60248201527f45524332303a20696e73756666696369656e7420616c6c6f77616e636500000060448201526064016104fd565b610d028484848403610d79565b6001600160a01b038316610f765760405162461bcd60e51b815260206004820152602560248201527f45524332303a207472616e736665722066726f6d20746865207a65726f206164604482015264647265737360d81b60648201526084016104fd565b6001600160a01b038216610fd85760405162461bcd60e51b815260206004820152602360248201527f45524332303a207472616e7366657220746f20746865207a65726f206164647260448201526265737360e81b60648201526084016104fd565b610fe383838361141d565b6001600160a01b0383166000908152603360205260409020548181101561105b5760405162461bcd60e51b815260206004820152602660248201527f45524332303a207472616e7366657220616d6f756e7420657863656564732062604482015265616c616e636560d01b60648201526084016104fd565b6001600160a01b038085166000818152603360205260408082208686039055928616808252908390208054860190559151600080516020611fd6833981519152906110a99086815260200190565b60405180910390a3610d02565b6001600160a01b0382166111165760405162461bcd60e51b815260206004820152602160248201527f45524332303a206275726e2066726f6d20746865207a65726f206164647265736044820152607360f81b60648201526084016104fd565b6111228260008361141d565b6001600160a01b038216600090815260336020526040902054818110156111965760405162461bcd60e51b815260206004820152602260248201527f45524332303a206275726e20616d6f756e7420657863656564732062616c616e604482015261636560f01b60648201526084016104fd565b6001600160a01b0383166000818152603360209081526040808320868603905560358054879003905551858152919291600080516020611fd68339815191529101610e91565b505050565b61121381600160cd546111f49190611d84565b6001600160a01b038516600090815260d0602052604090209190611486565b816001600160a01b03167f655c1cd0236fb6dc4916f34c8ff10e3b18fcaea5b344dfc16c36fbb1bdfc5df28260405161124e91815260200190565b60405180910390a25050565b81546000905b83600101548110156112c5576000818152600285016020908152604091829020825180840190935280548352600101549082018190528410156112a357506112c5565b80516112af9084611d84565b92505080806112bd90611d58565b915050611260565b9250929050565b6001600160a01b0382166000908152606560205260408120819081906112f39085906115b1565b915091508161130a5761130585610b1f565b61130c565b805b95945050505050565b600054610100900460ff1661133c5760405162461bcd60e51b81526004016104fd90611e43565b611346828261169f565b5050565b61134682826116df565b60008060006113648460666115b1565b915091508161137557603554611377565b805b949350505050565b60018201546000908082036113985760009150506104b7565b60006113a5600183611d71565b90505b845481106114155760008181526002860160209081526040918290208251808401909352805483526001015490820181905285106113e65750611415565b80516113f29085611d84565b9350816000036114025750611415565b508061140d81611e8e565b9150506113a8565b505092915050565b6001600160a01b038316158061143a57506001600160a01b038216155b61147b5760405162461bcd60e51b81526020600482015260126024820152712a2920a729a322a92fa327a92124a22222a760711b60448201526064016104fd565b6111dc83838361179a565b8160000361149657611496611ea5565b825460018401548181036114ed576040805180820182528581526020808201868152600085815260028a0190925292812091518255915160019182015586018054916114e183611d58565b91905055505050505050565b600060028601816114ff600185611d71565b81526020019081526020016000206001015490508084101561152357611523611ea5565b83811015611572576040805180820182528681526020808201878152600086815260028b01909252928120915182559151600191820155870180549161156883611d58565b9190505550610b17565b84600287016000611584600186611d71565b815260200190815260200160002060000160008282546115a49190611d84565b9091555050505050505050565b600080600084116115fd5760405162461bcd60e51b815260206004820152601660248201527504552433230536e617073686f743a20696420697320360541b60448201526064016104fd565b60cd5484111561164f5760405162461bcd60e51b815260206004820152601d60248201527f4552433230536e617073686f743a206e6f6e6578697374656e7420696400000060448201526064016104fd565b600061165b84866117e2565b845490915081036116735760008092509250506112c5565b600184600101828154811061168a5761168a611de5565b906000526020600020015492509250506112c5565b600054610100900460ff166116c65760405162461bcd60e51b81526004016104fd90611e43565b60366116d28382611f01565b5060376111dc8282611f01565b6001600160a01b0382166117355760405162461bcd60e51b815260206004820152601f60248201527f45524332303a206d696e7420746f20746865207a65726f20616464726573730060448201526064016104fd565b6117416000838361141d565b80603560008282546117539190611d84565b90915550506001600160a01b038216600081815260336020908152604080832080548601905551848152600080516020611fd6833981519152910160405180910390a35050565b6001600160a01b0383166117b9576117b18261188f565b6111dc6118b9565b6001600160a01b0382166117d0576117b18361188f565b6117d98361188f565b6111dc8261188f565b815460009081036117f5575060006104b7565b82546000905b8082101561184257600061180f83836118c9565b6000878152602090209091508590820154111561182e5780915061183c565b611839816001611d84565b92505b506117fb565b60008211801561186e57508361186b8661185d600186611d71565b600091825260209091200190565b54145b156118875761187e600183611d71565b925050506104b7565b5090506104b7565b6001600160a01b0381166000908152606560205260409020610787906118b483610b1f565b6118e4565b6118c760666118b460355490565b565b60006118d86002848418611fc1565b6108ea90848416611d84565b60006118ef60cd5490565b9050806118fb8461192f565b10156111dc578254600180820185556000858152602080822090930193909355938401805494850181558252902090910155565b8054600090810361194257506000919050565b8154829061195290600190611d71565b8154811061196257611962611de5565b90600052602060002001549050919050565b6000815180845260005b8181101561199a5760208185018101518683018201520161197e565b506000602082860101526020601f19601f83011685010191505092915050565b6020815260006108ea6020830184611974565b6001600160a01b038116811461078757600080fd5b600080604083850312156119f557600080fd5b8235611a00816119cd565b946020939093013593505050565b6000808284036080811215611a2257600080fd5b833592506060601f1982011215611a3857600080fd5b506020830190509250929050565b600080600060608486031215611a5b57600080fd5b8335611a66816119cd565b92506020840135611a76816119cd565b929592945050506040919091013590565b600060208284031215611a9957600080fd5b5035919050565b634e487b7160e01b600052604160045260246000fd5b6040805190810167ffffffffffffffff81118282101715611ad957611ad9611aa0565b60405290565b604051601f8201601f1916810167ffffffffffffffff81118282101715611b0857611b08611aa0565b604052919050565b600080600080600060a08688031215611b2857600080fd5b8535611b33816119cd565b9450602086810135611b44816119cd565b9450604087810135611b55816119cd565b945060608801359350608088013567ffffffffffffffff80821115611b7957600080fd5b818a0191508a601f830112611b8d57600080fd5b813581811115611b9f57611b9f611aa0565b611bad858260051b01611adf565b818152858101925060069190911b83018501908c821115611bcd57600080fd5b928501925b81841015611c165784848e031215611bea5760008081fd5b611bf2611ab6565b8435611bfd816119cd565b8152848701358782015283529284019291850191611bd2565b8096505050505050509295509295909350565b600060208284031215611c3b57600080fd5b81356108ea816119cd565b60008060408385031215611c5957600080fd5b8235611c64816119cd565b91506020830135611c74816119cd565b809150509250929050565b60008060008060608587031215611c9557600080fd5b843593506020850135611ca7816119cd565b9250604085013567ffffffffffffffff80821115611cc457600080fd5b818701915087601f830112611cd857600080fd5b813581811115611ce757600080fd5b886020828501011115611cf957600080fd5b95989497505060200194505050565b600181811c90821680611d1c57607f821691505b602082108103611d3c57634e487b7160e01b600052602260045260246000fd5b50919050565b634e487b7160e01b600052601160045260246000fd5b600060018201611d6a57611d6a611d42565b5060010190565b818103818111156104b7576104b7611d42565b808201808211156104b7576104b7611d42565b634e487b7160e01b600052601260045260246000fd5b600082611dbc57611dbc611d97565b500690565b6001600160a01b038316815260406020820181905260009061137790830184611974565b634e487b7160e01b600052603260045260246000fd5b60008085851115611e0b57600080fd5b83861115611e1857600080fd5b5050820193919092039150565b803560208310156104b757600019602084900360031b1b1692915050565b6020808252602b908201527f496e697469616c697a61626c653a20636f6e7472616374206973206e6f74206960408201526a6e697469616c697a696e6760a81b606082015260800190565b600081611e9d57611e9d611d42565b506000190190565b634e487b7160e01b600052600160045260246000fd5b601f8211156111dc57600081815260208120601f850160051c81016020861015611ee25750805b601f850160051c820191505b81811015610b1757828155600101611eee565b815167ffffffffffffffff811115611f1b57611f1b611aa0565b611f2f81611f298454611d08565b84611ebb565b602080601f831160018114611f645760008415611f4c5750858301515b600019600386901b1c1916600185901b178555610b17565b600085815260208120601f198616915b82811015611f9357888601518255948401946001909101908401611f74565b5085821015611fb15787850151600019600388901b60f8161c191681555b5050505050600190811b01905550565b600082611fd057611fd0611d97565b50049056feddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3efa2646970667358221220ceae916e2fad24f9aaa4340b6994418d32d33c6ae1f266c50dd4ec5ccbdbce2764736f6c63430008130033",
                 "balance": "0x0"
             },
-            "0x0000000000000000000000000000000000000102": {
-                "code": "0x608060405234801561001057600080fd5b506004361061009e5760003560e01c806391ec2d2b1161006657806391ec2d2b1461013b578063a850a9091461015b578063d58e77331461016e578063e242cce914610181578063ebbdac911461019457600080fd5b8063115000fe146100a3578063247dd9fb146100cb5780633e5476ce146100de5780638669026f146101085780639141376314610128575b600080fd5b6100b66100b1366004612708565b6101a7565b60405190151581526020015b60405180910390f35b6100b66100d9366004612785565b61030e565b6100f16100ec366004612841565b6103b8565b6040805192151583529015156020830152016100c2565b61011b6101163660046128ce565b61079f565b6040516100c29190612957565b6100f1610136366004612988565b6108bb565b61014e6101493660046128ce565b610d5c565b6040516100c29190612a86565b61011b6101693660046128ce565b610ff8565b61011b61017c366004612aa0565b6111d4565b6100b661018f366004612785565b6115aa565b6100f16101a2366004612ab9565b611609565b600081516020830151600080516020612d63833981519152828309600080516020612d638339815191528283098182830101600080516020612d638339815191528283840108600080516020612d638339815191528682600080516020612d6383398151915203860109935050600080516020612d638339815191528483600080516020612d63833981519152038301099150600080516020612d638339815191527f2b149d40ceb8aaae81be18991be06ac3b5b4c5e559dbefa33267e6dc24a138e584089450600080516020612d638339815191527e9713b03af0fed4cd2cafadeed8fdf4a74fa084e52d1852e4a2bd0685c315d2830893506040870151925060608701519150600080516020612d638339815191528083600080516020612d63833981519152038508600080516020612d63833981519152848608099050600080516020612d63833981519152828460011b0994149290931491909116949350505050565b8051600090600080516020612d6383398151915211158061034157506020820151600080516020612d6383398151915211155b1561034e57506000919050565b60405163e242cce960e01b8152309063e242cce990610371908590600401612957565b602060405180830381865afa15801561038e573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906103b29190612b1c565b92915050565b60008083806103e25760405162461bcd60e51b81526004016103d990612b3e565b60405180910390fd5b60006103ef826001612b95565b6103fa906006612ba8565b90506000816001600160401b038111156104165761041661269a565b60405190808252806020026020018201604052801561043f578160200160208202803683370190505b50905088600060200201358160008151811061045d5761045d612b06565b602090810291909101015288600160200201358160018151811061048357610483612b06565b602002602001018181525050600080516020612d43833981519152816002815181106104b1576104b1612b06565b602002602001018181525050600080516020612d23833981519152816003815181106104df576104df612b06565b602002602001018181525050600080516020612d838339815191528160048151811061050d5761050d612b06565b602002602001018181525050600080516020612da38339815191528160058151811061053b5761053b612b06565b60200260200101818152505060005b8381101561075a57863582610560836006612ba8565b61056b906006612b95565b8151811061057b5761057b612b06565b602090810291909101015286600160200201358261059a836006612ba8565b6105a5906007612b95565b815181106105b5576105b5612b06565b6020026020010181815250508888828181106105d3576105d3612b06565b9050608002016001600481106105eb576105eb612b06565b6020020135826105fc836006612ba8565b610607906008612b95565b8151811061061757610617612b06565b60200260200101818152505088888281811061063557610635612b06565b90506080020160006004811061064d5761064d612b06565b60200201358261065e836006612ba8565b610669906009612b95565b8151811061067957610679612b06565b60200260200101818152505088888281811061069757610697612b06565b9050608002016003600481106106af576106af612b06565b6020020135826106c0836006612ba8565b6106cb90600a612b95565b815181106106db576106db612b06565b6020026020010181815250508888828181106106f9576106f9612b06565b90506080020160026004811061071157610711612b06565b602002013582610722836006612ba8565b61072d90600b612b95565b8151811061073d5761073d612b06565b60209081029190910101528061075281612bbf565b91505061054a565b50610763612640565b602081602085026020850160085afa945084610789576000809550955050505050610796565b5115159450600193505050505b94509492505050565b6107a761265e565b6040516391ec2d2b60e01b815260009030906391ec2d2b906107cf9087908790600401612bd8565b600060405180830381865afa1580156107ec573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f191682016040526108149190810190612bf9565b9050600080600080601885016001600160c01b0381511693506030860190506001600160c01b038151169450600080516020612d6383398151915285600080516020612d63833981519152600160c01b870908604887015160608801516001600160c01b0390811697501694509250600080516020612d6383398151915290508481600160c01b860908604080518082019091529283526020830152509695505050505050565b60008084806108dc5760405162461bcd60e51b81526004016103d990612b3e565b8084146109495760405162461bcd60e51b815260206004820152603560248201527f424c533a206e756d626572206f66207075626c6963206b65797320616e64206d604482015274195cdcd859d95cc81b5d5cdd08189948195c5d585b605a1b60648201526084016103d9565b6000610956826001612b95565b610961906006612ba8565b90506000816001600160401b0381111561097d5761097d61269a565b6040519080825280602002602001820160405280156109a6578160200160208202803683370190505b5090508960006020020135816000815181106109c4576109c4612b06565b60209081029190910101528960016020020135816001815181106109ea576109ea612b06565b602002602001018181525050600080516020612d4383398151915281600281518110610a1857610a18612b06565b602002602001018181525050600080516020612d2383398151915281600381518110610a4657610a46612b06565b602002602001018181525050600080516020612d8383398151915281600481518110610a7457610a74612b06565b602002602001018181525050600080516020612da383398151915281600581518110610aa257610aa2612b06565b60200260200101818152505060005b83811015610d1657878782818110610acb57610acb612b06565b905060400201600060028110610ae357610ae3612b06565b602002013582610af4836006612ba8565b610aff906006612b95565b81518110610b0f57610b0f612b06565b602002602001018181525050878782818110610b2d57610b2d612b06565b905060400201600160028110610b4557610b45612b06565b602002013582610b56836006612ba8565b610b61906007612b95565b81518110610b7157610b71612b06565b602002602001018181525050898982818110610b8f57610b8f612b06565b905060800201600160048110610ba757610ba7612b06565b602002013582610bb8836006612ba8565b610bc3906008612b95565b81518110610bd357610bd3612b06565b602002602001018181525050898982818110610bf157610bf1612b06565b905060800201600060048110610c0957610c09612b06565b602002013582610c1a836006612ba8565b610c25906009612b95565b81518110610c3557610c35612b06565b602002602001018181525050898982818110610c5357610c53612b06565b905060800201600360048110610c6b57610c6b612b06565b602002013582610c7c836006612ba8565b610c8790600a612b95565b81518110610c9757610c97612b06565b602002602001018181525050898982818110610cb557610cb5612b06565b905060800201600260048110610ccd57610ccd612b06565b602002013582610cde836006612ba8565b610ce990600b612b95565b81518110610cf957610cf9612b06565b602090810291909101015280610d0e81612bbf565b915050610ab1565b50610d1f612640565b602081602085026020850160085afa945084610d45576000809550955050505050610d52565b5115159450600193505050505b9550959350505050565b80516060906000610d6e826020612b95565b610d79906040612b95565b610d84906004612b95565b6001600160401b03811115610d9b57610d9b61269a565b6040519080825280601f01601f191660200182016040528015610dc5576020820181803683370190505b5060408051606080825260808201909252919250600091906020820181803683370190505090506060820160005b84811015610e0d5760208188018101518383015201610df3565b5083016000815360010160608153600101600081536001810187905260210160208153506000600283604051610e439190612c6f565b602060405180830381855afa158015610e60573d6000803e3d6000fd5b5050506040513d601f19601f82011682018060405250810190610e839190612c8b565b9050600060429450848452816020850152600160408501536041840188905260206061850153600284604051610eb99190612c6f565b602060405180830381855afa158015610ed6573d6000803e3d6000fd5b5050506040513d601f19601f82011682018060405250810190610ef99190612c8b565b905080602084015280821880602086015250600260408501536041840188905260206061850153600284604051610f309190612c6f565b602060405180830381855afa158015610f4d573d6000803e3d6000fd5b5050506040513d601f19601f82011682018060405250810190610f709190612c8b565b905080604084015280821880602086015250600360408501536041840188905260206061850153600284604051610fa79190612c6f565b602060405180830381855afa158015610fc4573d6000803e3d6000fd5b5050506040513d601f19601f82011682018060405250810190610fe79190612c8b565b606084015250909695505050505050565b61100061265e565b604051638669026f60e01b81526000903090638669026f906110289087908790600401612bd8565b6040805180830381865afa158015611044573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906110689190612ca4565b805160405163d58e773360e01b81526004810191909152909150600090309063d58e7733906024016040805180830381865afa1580156110ac573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906110d09190612ca4565b602083015160405163d58e773360e01b81526004810191909152909150600090309063d58e7733906024016040805180830381865afa158015611117573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061113b9190612ca4565b905061114561267c565b825181526020808401518282015282516040808401919091529083015160608301526000908460808460066107d05a03fa9050808061118057fe5b50806111c85760405162461bcd60e51b8152602060048201526017602482015276109314ce88189b881859190818d85b1b0819985a5b1959604a1b60448201526064016103d9565b50919695505050505050565b6111dc61265e565b600080516020612d6383398151915282106112455760405162461bcd60e51b815260206004820152602360248201527f6d6170546f506f696e7446543a20696e76616c6964206669656c6420656c656d604482015262195b9d60ea1b60648201526084016103d9565b81600061125182611790565b9150506000600080516020612d638339815191528061127257611272612cf9565b8384099050600080516020612d638339815191526004820890506000600080516020612d6383398151915277b3c4d79d41a91759a9e4c7e359b6b89eaec68e62effffffd850990506000600080516020612d6383398151915283830990506112d9816117b9565b9050600080516020612d638339815191528283099150600080516020612d638339815191528183099150600080516020612d638339815191528286099150600080516020612d6383398151915261133e83600080516020612d63833981519152612d0f565b7759e26bcea0d48bacd4f263f1acdb5c4f5763473177fffffe089450600080516020612d638339815191528586099150600080516020612d638339815191528583099150600080516020612d6383398151915260038308915060006113a283611790565b909350905080156113ea57846113cd576113ca83600080516020612d63833981519152612d0f565b92505b505060408051808201909152938452602084015250909392505050565b600080516020612d638339815191526001870861141590600080516020612d63833981519152612d0f565b9550600080516020612d638339815191528687099250600080516020612d638339815191528684099250600080516020612d6383398151915260038408925061145d83611790565b9093509050801561148557846113cd576113ca83600080516020612d63833981519152612d0f565b600080516020612d638339815191528485099550600080516020612d638339815191528687099550600080516020612d638339815191528287099550600080516020612d638339815191528287099550600080516020612d63833981519152600187089550600080516020612d638339815191528687099250600080516020612d638339815191528684099250600080516020612d6383398151915260038408925061153083611790565b90935090508061158d5760405162461bcd60e51b815260206004820152602260248201527f424c533a20626164206674206d617070696e6720696d706c656d656e7461746960448201526137b760f11b60648201526084016103d9565b846113cd576113ca83600080516020612d63833981519152612d0f565b600081516020830151600080516020612d63833981519152828309600080516020612d638339815191528382099050600080516020612d63833981519152600382089050600080516020612d6383398151915282830914949350505050565b60008060006040518061018001604052808760006002811061162d5761162d612b06565b602002013581526020018760016002811061164a5761164a612b06565b60200201358152602001600080516020612d438339815191528152602001600080516020612d238339815191528152602001600080516020612d838339815191528152602001600080516020612da38339815191528152602001856000600281106116b7576116b7612b06565b60200201358152602001856001600281106116d4576116d4612b06565b60200201358152602001866001600481106116f1576116f1612b06565b602002013581526020018660006004811061170e5761170e612b06565b602002013581526020018660036004811061172b5761172b612b06565b602002013581526020018660026004811061174857611748612b06565b602002013590529050611759612640565b60006020826101808560085afa90508061177c5760008094509450505050611788565b50511515925060019150505b935093915050565b60008061179c836117c4565b915082600080516020612d63833981519152838409149050915091565b60006103b282611ef9565b6000600080516020612d638339815191528083840991508083830981838209828283098385830984848309858484098684850997508684840987858409945087898a09985087898a09985087898a09985087898a09985087898a09985087878a09985087898a09985087898a09985087898a099850878a8a09985087898a09985087898a09985087898a09985087898a099850878a8a09985087898a09985087898a09985087898a09985087898a09985087898a09985087848a09985087898a09985087898a09985087898a09985087898a09985087898a09985087848a09985087898a09985087898a09985087898a099850878a8a09985087898a09985087898a09985087898a09985087898a09985087848a09985087898a09985087898a09985087898a09985087898a09985087898a099850878a8a09985087898a09985087898a09985087898a09985087898a09985087878a09985087898a09985087898a09985087898a09985087898a09985087898a09985087898a09985087898a09985087818a09985087898a09985087898a09985087898a09985087898a09985087898a09985087898a09985087898a09985087898a09985087898a09985087898a09985087868a09985087898a09985087898a09985087898a09985087898a09985087878a09985087898a09985087898a09985087898a09985087898a09985087848a09985087898a09985087898a09985087898a09985087898a09985087898a09985087898a09985087898a09985087868a09985087898a09985087898a09985087898a09985087898a09985087898a09985087898a099850878a8a09985087898a09985087898a09985087898a09985087898a09985087898a09985087898a09985087898a09985087828a09985087898a09985087898a09985087898a09985087898a09985087898a09985087818a09985087898a09985087898a09985087898a09985087868a09985087898a09985087898a09985087898a09985087898a09985087898a09985087898a09985087898a09985087898a09985087878a09985087898a09985087898a09985087898a09985087898a09985087898a09985087898a09985087898a09985087898a09985087898a09985087868a09985087898a09985087898a09985087898a09985087878a09985087898a09985087898a09985087898a09985087898a09985087898a09985087898a09985087898a09985087898a09985087828a09985087898a09985087898a09985087898a09985087898a09985087828a09985087898a09985087898a09985087898a09985087898a09985087898a09985087868a09985087898a09985087898a09985087898a09985087848a09985087898a09985087898a09985087898a09985087898a09985087898a09985087898a09985087898a09985087898a09985087898a09985087898a09985087828a09985087898a09985087898a09985087898a09985087898a09985087868a09985087898a09985087898a09985087898a09985087898a09985087898a09985087838a09985087898a09985087898a09985087898a09985087898a09985087898a09985087898a09985087898a09985087828a09985087898a09985087898a099850878a8a09985087898a09985087898a09985087898a09985087898a09985087898a09985087898a09985087898a09985087848a09985087898a09985087898a09985087898a09985087898a09985087898a09985087898a09985087848a09985087898a09985087898a09985087898a09985087898a09985087898a09985087868a09985087898a09985087898a099850878a8a09985087898a09985087898a09985087898a09985087898a09985087898a09985087898a09985087898a09985087818a09985050868889099750868889099750868889099750868889099750868889099750868889099750868489099750868889099750868889099750868889099750868889099750868889099750868989099750868889099750868889099750868889099750868889099750868889099750868889099750868989099750868889099750868889099750868889099750868889099750868889099750868689099750868889099750868889099750868889099750868889099750868889099750868889099750868889099750868889099750868889099750868189099750508587880996508587880996508587880996508585880996508587880996508587880996508587880996508585880996508587880996508587880996508587880996508587880996508587880996508587880996508587880996508587880996508583880996508587880996508587880996508587880996508587880996508581880996508587880996508587880996508587880996508587880996508583880996508587880996508587880996508587880996508584880996508587880996508587880996508587880996508587880996508587880996508581880996505050505050808283099392505050565b6000600080516020612d638339815191528083840991508083830981838209828283098385830984848309858484098684850997508684840987858409945087898a09985087898a09985087898a09985087898a09985087898a09985087878a09985087898a09985087898a09985087898a099850878a8a09985087898a09985087898a09985087898a09985087898a099850878a8a09985087898a09985087898a09985087898a09985087898a09985087898a09985087848a09985087898a09985087898a09985087898a09985087898a09985087898a09985087848a09985087898a09985087898a09985087898a099850878a8a09985087898a09985087898a09985087898a09985087898a09985087848a09985087898a09985087898a09985087898a09985087898a09985087898a099850878a8a09985087898a09985087898a09985087898a09985087898a09985087878a09985087898a09985087898a09985087898a09985087898a09985087898a09985087898a09985087898a09985087818a09985087898a09985087898a09985087898a09985087898a09985087898a09985087898a09985087898a09985087898a09985087898a09985087898a09985087868a09985087898a09985087898a09985087898a09985087898a09985087878a09985087898a09985087898a09985087898a09985087898a09985087848a09985087898a09985087898a09985087898a09985087898a09985087898a09985087898a09985087898a09985087868a09985087898a09985087898a09985087898a09985087898a09985087898a09985087898a099850878a8a09985087898a09985087898a09985087898a09985087898a09985087898a09985087898a09985087898a09985087828a09985087898a09985087898a09985087898a09985087898a09985087898a09985087818a09985087898a09985087898a09985087898a09985087868a09985087898a09985087898a09985087898a09985087898a09985087898a09985087898a09985087898a09985087898a09985087878a09985087898a09985087898a09985087898a09985087898a09985087898a09985087898a09985087898a09985087898a09985087898a09985087868a09985087898a09985087898a09985087898a09985087878a09985087898a09985087898a09985087898a09985087898a09985087898a09985087898a09985087898a09985087898a09985087828a09985087898a09985087898a09985087898a09985087898a09985087828a09985087898a09985087898a09985087898a09985087898a09985087898a09985087868a09985087898a09985087898a09985087898a09985087848a09985087898a09985087898a09985087898a09985087898a09985087898a09985087898a09985087898a09985087898a09985087898a09985087898a09985087828a09985087898a09985087898a09985087898a09985087898a09985087868a09985087898a09985087898a09985087898a09985087898a09985087898a09985087838a09985087898a09985087898a09985087898a09985087898a09985087898a09985087898a09985087898a09985087828a09985087898a09985087898a099850878a8a09985087898a09985087898a09985087898a09985087898a09985087898a09985087898a09985087898a09985087848a09985087898a09985087898a09985087898a09985087898a09985087898a09985087898a09985087848a09985087898a09985087898a09985087898a09985087898a09985087898a09985087868a09985087898a09985087898a099850878a8a09985087898a09985087898a09985087898a09985087898a09985087898a09985087898a09985087898a09985087818a09985050868889099750868889099750868889099750868889099750868889099750868889099750868489099750868889099750868889099750868889099750868889099750868889099750868989099750868889099750868889099750868889099750868889099750868889099750868889099750868989099750868889099750868889099750868889099750868889099750868889099750868689099750868889099750868889099750868889099750868889099750868889099750868889099750868889099750868889099750868889099750868189099750508587880996508587880996508587880996508585880996508587880996508587880996508587880996508585880996508587880996508587880996508587880996508587880996508587880996508587880996508587880996508587880996508583880996508587880996508587880996508587880996508587880996508581880996505050838586099450838586099450838586099450838586099450838186099450508284850993508284850993508284850993508281850993508284850993508284850993508285850993508284850993508284850993508284850993508284850993508284850993508284850993508281850995945050505050565b60405180602001604052806001906020820280368337509192915050565b60405180604001604052806002906020820280368337509192915050565b60405180608001604052806004906020820280368337509192915050565b634e487b7160e01b600052604160045260246000fd5b604080519081016001600160401b03811182821017156126d2576126d261269a565b60405290565b604051601f8201601f191681016001600160401b03811182821017156127005761270061269a565b604052919050565b60006080828403121561271a57600080fd5b82601f83011261272957600080fd5b604051608081018181106001600160401b038211171561274b5761274b61269a565b60405280608084018581111561276057600080fd5b845b8181101561277a578035835260209283019201612762565b509195945050505050565b60006040828403121561279757600080fd5b82601f8301126127a657600080fd5b6127ae6126b0565b8060408401858111156127c057600080fd5b845b818110156127da5780358452602093840193016127c2565b509095945050505050565b80604081018310156103b257600080fd5b60008083601f84011261280857600080fd5b5081356001600160401b0381111561281f57600080fd5b6020830191508360208260071b850101111561283a57600080fd5b9250929050565b60008060008060a0858703121561285757600080fd5b61286186866127e5565b935060408501356001600160401b0381111561287c57600080fd5b612888878288016127f6565b909450925061289c905086606087016127e5565b905092959194509250565b60006001600160401b038211156128c0576128c061269a565b50601f01601f191660200190565b600080604083850312156128e157600080fd5b8235915060208301356001600160401b038111156128fe57600080fd5b8301601f8101851361290f57600080fd5b803561292261291d826128a7565b6126d8565b81815286602083850101111561293757600080fd5b816020840160208301376000602083830101528093505050509250929050565b60408101818360005b600281101561297f578151835260209283019290910190600101612960565b50505092915050565b6000806000806000608086880312156129a057600080fd5b6129aa87876127e5565b945060408601356001600160401b03808211156129c657600080fd5b6129d289838a016127f6565b909650945060608801359150808211156129eb57600080fd5b818801915088601f8301126129ff57600080fd5b813581811115612a0e57600080fd5b8960208260061b8501011115612a2357600080fd5b9699959850939650602001949392505050565b60005b83811015612a51578181015183820152602001612a39565b50506000910152565b60008151808452612a72816020860160208601612a36565b601f01601f19169290920160200192915050565b602081526000612a996020830184612a5a565b9392505050565b600060208284031215612ab257600080fd5b5035919050565b60008060006101008486031215612acf57600080fd5b612ad985856127e5565b925060c0840185811115612aec57600080fd5b604085019250612afc86826127e5565b9150509250925092565b634e487b7160e01b600052603260045260246000fd5b600060208284031215612b2e57600080fd5b81518015158114612a9957600080fd5b60208082526021908201527f424c533a206e756d626572206f66207075626c6963206b6579206973207a65726040820152606f60f81b606082015260800190565b634e487b7160e01b600052601160045260246000fd5b808201808211156103b2576103b2612b7f565b80820281158282048414176103b2576103b2612b7f565b600060018201612bd157612bd1612b7f565b5060010190565b828152604060208201526000612bf16040830184612a5a565b949350505050565b600060208284031215612c0b57600080fd5b81516001600160401b03811115612c2157600080fd5b8201601f81018413612c3257600080fd5b8051612c4061291d826128a7565b818152856020838501011115612c5557600080fd5b612c66826020830160208601612a36565b95945050505050565b60008251612c81818460208701612a36565b9190910192915050565b600060208284031215612c9d57600080fd5b5051919050565b600060408284031215612cb657600080fd5b82601f830112612cc557600080fd5b612ccd6126b0565b806040840185811115612cdf57600080fd5b845b818110156127da578051845260209384019301612ce1565b634e487b7160e01b600052601260045260246000fd5b818103818111156103b2576103b2612b7f56fe1800deef121f1e76426a00665e5c4479674322d4f75edadd46debd5cd992f6ed198e9393920d483a7260bfb731fb5d25f1aa493335a9e71297e485b7aef312c230644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd47275dc4a288d1afb3cbb1ac09187524c7db36395df7be3b99e673b13a075a65ec1d9befcd05a5323e6da4d435f3b617cdb3af83285c2df711ef39c01571827f9da264697066735822122085f910855a39dd4d2f9582253d737b6f9c450d7d8e7383f636149d598d69b6ac64736f6c63430008130033",
-                "balance": "0x0"
-            },
-            "0x0000000000000000000000000000000000000103": {
-                "code": "0x73000000000000000000000000000000000000000030146080604052600080fdfea26469706673582212209ebefbbe674f8f0780cb158df4fa624dc1694693fcb1c5952691eb2a55c6f0aa64736f6c63430008130033",
-                "balance": "0x0"
-            },
-            "0x0000000000000000000000000000000000000105": {
-                "code": "0x608060405234801561001057600080fd5b50600436106100d55760003560e01c8063947287cf11610087578063947287cf14610183578063972398b61461018c57806397e5230d1461019f57806399248ea7146101a9578063b66ceef6146101c2578063c885bc58146101d5578063cf756fdf146101dd578063e0563ab1146101f057600080fd5b806307358b99146100da57806322009af61461010d578063284017f51461011657806331d7a262146101375780633b878c221461015757806351351d53146101605780638a9cd82d1461016e575b600080fd5b6100fa6100e8366004610b1d565b60366020526000908152604090205481565b6040519081526020015b60405180910390f35b6100fa60355481565b61011f61202081565b6040516001600160a01b039091168152602001610104565b6100fa610145366004610b52565b60376020526000908152604090205481565b61011f61101081565b61011f6002600160a01b0381565b61018161017c366004610b74565b6101f9565b005b6100fa61520881565b60345461011f906001600160a01b031681565b6100fa620249f081565b60325461011f906201000090046001600160a01b031681565b60335461011f906001600160a01b031681565b610181610658565b6101816101eb366004610bf3565b61068e565b61011f61203081565b336002600160a01b03146102425760405163973d02cb60e01b815260206004820152600a60248201526914d654d5115350d0531360b21b60448201526064015b60405180910390fd5b6000838152603660205260409020541561029e5760405162461bcd60e51b815260206004820152601a60248201527f5245574152445f414c52454144595f44495354524942555445440000000000006044820152606401610239565b603454604051633f490b0560e21b8152600481018590526000916001600160a01b03169063fd242c1490602401602060405180830381865afa1580156102e8573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061030c9190610c3e565b9050806000036103545760405162461bcd60e51b8152602060048201526013602482015272115413d0d217d393d517d0d3d3535255151151606a1b6044820152606401610239565b60345460408051636265600360e01b815290516000926001600160a01b03169163626560039160048083019260209291908290030181865afa15801561039e573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906103c29190610c3e565b905060006103d1826064610c6d565b836035546103df9190610c6d565b6103ea906064610c6d565b6103f49190610c8a565b603454604051630981b24d60e41b8152600481018990529192506000916001600160a01b039091169063981b24d090602401602060405180830381865afa158015610443573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906104679190610c3e565b9050846000805b828110156105f857600089898381811061048a5761048a610cac565b9050604002018036038101906104a09190610cc2565b905087816020015111156104f65760405162461bcd60e51b815260206004820152601b60248201527f5349474e45445f424c4f434b535f455843454544535f544f54414c00000000006044820152606401610239565b603454815160405163277166bf60e11b81526001600160a01b039182166004820152602481018e90526000929190911690634ee2cd7e90604401602060405180830381865afa15801561054d573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906105719190610c3e565b9050600061057f8a88610c6d565b602084015161058e848b610c6d565b6105989190610c6d565b6105a29190610c8a565b83516001600160a01b03166000908152603760205260408120805492935083929091906105d0908490610d27565b909155506105e090508186610d27565b945050505080806105f090610d3a565b91505061046e565b506000898152603660205260409020819055610613816107f1565b887feaf3d57629d9b1ce95715ccd98d6f5bf48023be1d5a06e09f64ab7f6d8be01d58260405161064591815260200190565b60405180910390a2505050505050505050565b3360008181526037602052604081208054919055603254909161068b916201000090046001600160a01b03169083610815565b50565b603254610100900460ff16158080156106ae5750603254600160ff909116105b806106c85750303b1580156106c8575060325460ff166001145b61072b5760405162461bcd60e51b815260206004820152602e60248201527f496e697469616c697a61626c653a20636f6e747261637420697320616c72656160448201526d191e481a5b9a5d1a585b1a5e995960921b6064820152608401610239565b6032805460ff19166001179055801561074e576032805461ff0019166101001790555b603280546001600160a01b03808816620100000262010000600160b01b031990921691909117909155603380548683166001600160a01b0319918216179091556034805492861692909116919091179055603582905580156107ea576032805461ff0019169055604051600181527f7f26b83ff96e1f2b6a682f133852f6798a09c465da95921460cefb38474024989060200160405180910390a15b5050505050565b60335460325461068b916001600160a01b036201000090920482169116308461087d565b6040516001600160a01b03831660248201526044810182905261087890849063a9059cbb60e01b906064015b60408051601f198184030181529190526020810180516001600160e01b03166001600160e01b0319909316929092179091526108bb565b505050565b6040516001600160a01b03808516602483015283166044820152606481018290526108b59085906323b872dd60e01b90608401610841565b50505050565b6000610910826040518060400160405280602081526020017f5361666545524332303a206c6f772d6c6576656c2063616c6c206661696c6564815250856001600160a01b031661098d9092919063ffffffff16565b805190915015610878578080602001905181019061092e9190610d53565b6108785760405162461bcd60e51b815260206004820152602a60248201527f5361666545524332303a204552433230206f7065726174696f6e20646964206e6044820152691bdd081cdd58d8d9595960b21b6064820152608401610239565b606061099c84846000856109a4565b949350505050565b606082471015610a055760405162461bcd60e51b815260206004820152602660248201527f416464726573733a20696e73756666696369656e742062616c616e636520666f6044820152651c8818d85b1b60d21b6064820152608401610239565b600080866001600160a01b03168587604051610a219190610d99565b60006040518083038185875af1925050503d8060008114610a5e576040519150601f19603f3d011682016040523d82523d6000602084013e610a63565b606091505b5091509150610a7487838387610a7f565b979650505050505050565b60608315610aee578251600003610ae7576001600160a01b0385163b610ae75760405162461bcd60e51b815260206004820152601d60248201527f416464726573733a2063616c6c20746f206e6f6e2d636f6e74726163740000006044820152606401610239565b508161099c565b61099c8383815115610b035781518083602001fd5b8060405162461bcd60e51b81526004016102399190610db5565b600060208284031215610b2f57600080fd5b5035919050565b80356001600160a01b0381168114610b4d57600080fd5b919050565b600060208284031215610b6457600080fd5b610b6d82610b36565b9392505050565b600080600060408486031215610b8957600080fd5b83359250602084013567ffffffffffffffff80821115610ba857600080fd5b818601915086601f830112610bbc57600080fd5b813581811115610bcb57600080fd5b8760208260061b8501011115610be057600080fd5b6020830194508093505050509250925092565b60008060008060808587031215610c0957600080fd5b610c1285610b36565b9350610c2060208601610b36565b9250610c2e60408601610b36565b9396929550929360600135925050565b600060208284031215610c5057600080fd5b5051919050565b634e487b7160e01b600052601160045260246000fd5b8082028115828204841417610c8457610c84610c57565b92915050565b600082610ca757634e487b7160e01b600052601260045260246000fd5b500490565b634e487b7160e01b600052603260045260246000fd5b600060408284031215610cd457600080fd5b6040516040810181811067ffffffffffffffff82111715610d0557634e487b7160e01b600052604160045260246000fd5b604052610d1183610b36565b8152602083013560208201528091505092915050565b80820180821115610c8457610c84610c57565b600060018201610d4c57610d4c610c57565b5060010190565b600060208284031215610d6557600080fd5b81518015158114610b6d57600080fd5b60005b83811015610d90578181015183820152602001610d78565b50506000910152565b60008251610dab818460208701610d75565b9190910192915050565b6020815260008251806020840152610dd4816040850160208701610d75565b601f01601f1916919091016040019291505056fea2646970667358221220c7e8b508ebaffb4eaa11ba374acb0ddc2570f6351d83600979bf1f82d7cec70564736f6c63430008130033",
-                "balance": "0x0"
-            },
-            "0x0000000000000000000000000000000000001001": {
-                "code": "0x608060405234801561001057600080fd5b50600436106100e05760003560e01c80639017c127116100875780639017c127146101de578063947287cf146101f157806397e5230d146101fa578063ad240c2a14610204578063c59a18f71461020d578063c6df461714610220578063e0563ab114610233578063eb70ef441461023c57600080fd5b8063196f1b2d146100e557806323e281cf1461010b578063284017f5146101145780633b878c221461013557806349ce89971461013e57806350d5b95b1461018857806351351d531461019d578063544c5e0f146101ab575b600080fd5b6100f86100f3366004610e88565b610271565b6040519081526020015b60405180910390f35b6100f860325481565b61011d61202081565b6040516001600160a01b039091168152602001610102565b61011d61101081565b61016d61014c366004610e88565b60356020526000908152604090208054600182015460029092015490919083565b60408051938452602084019290925290820152606001610102565b61019b610196366004610eec565b6102f0565b005b61011d6002600160a01b0381565b6101ce6101b9366004610e88565b60346020526000908152604090205460ff1681565b6040519015158152602001610102565b61019b6101ec366004610f5b565b6103b7565b6100f861520881565b6100f8620249f081565b6100f860335481565b6100f861021b366004610e88565b610557565b61019b61022e366004611007565b610578565b61011d61203081565b61024f61024a366004610e88565b61075c565b6040805182518152602080840151908201529181015190820152606001610102565b60008060358161028260368661081f565b81526020810191909152604001600020600201549050806102ea5760405162461bcd60e51b815260206004820152601d60248201527f537461746552656365697665723a204e4f5f524f4f545f464f525f494400000060448201526064015b60405180910390fd5b92915050565b60006102fc823561075c565b805190915061036c906103109084356110a5565b8251602084015161032191906110a5565b61032c9060016110b8565b83604001518787876040516020016103449190611110565b604051602081830303815290604052805190602001206108cc9095949392919063ffffffff16565b6103a85760405162461bcd60e51b815260206004820152600d60248201526c24a72b20a624a22fa82927a7a360991b60448201526064016102e1565b6103b182610a68565b50505050565b8281811461041a5760405162461bcd60e51b815260206004820152602a60248201527f537461746552656365697665723a20554e4d4154434845445f4c454e4754485f604482015269504152414d455445525360b01b60648201526084016102e1565b60005b8181101561054f57600061045485858481811061043c5761043c6111ac565b905060200281019061044e91906111c2565b3561075c565b905060006105088260000151878786818110610472576104726111ac565b905060200281019061048491906111c2565b61048f9190356110a5565b835160208501516104a091906110a5565b6104ab9060016110b8565b84604001518b8b888181106104c2576104c26111ac565b90506020028101906104d491906111e2565b8b8b8a8181106104e6576104e66111ac565b90506020028101906104f891906111c2565b6040516020016103449190611110565b90508061051957505060010161041d565b61054586868581811061052e5761052e6111ac565b905060200281019061054091906111c2565b610a68565b505060010161041d565b505050505050565b6036818154811061056757600080fd5b600091825260209091200154905081565b336002600160a01b03146105bc5760405163973d02cb60e01b815260206004820152600a60248201526914d654d5115350d0531360b21b60448201526064016102e1565b6033546105ca9060016110b8565b85351461060c5760405162461bcd60e51b815260206004820152601060248201526f1253959053125117d4d510549517d25160821b60448201526064016102e1565b8435602086013510156106525760405162461bcd60e51b815260206004820152600e60248201526d1253959053125117d1539117d25160921b60448201526064016102e1565b60408051863560208083019190915287013581830152908601356060820152610697906080016040516020818303038152906040528051906020012085858585610c83565b603280548691603591600091826106ad8361122b565b90915550815260208082019290925260409081016000208335815591830135600183015582013560028201555050603680546001810182556000919091526020868101357f4a11f94e20a93c79f6ec743a1954ec4fc2c08429ae2122118bf234b2185c81b89092018290556033829055604080519088013581528735917f11efd893530b26afc66d488ff54cb15df117cb6e0e4a08c6dcb166d766c3bf3b910160405180910390a35050505050565b604080516060810182526000808252602082018190529181018290529061078460368461081f565b60365490915081036107e45760405162461bcd60e51b815260206004820152602360248201527f537461746552656365697665723a204e4f5f434f4d4d49544d454e545f464f5260448201526217d25160ea1b60648201526084016102e1565b600090815260356020908152604091829020825160608101845281548152600182015492810192909252600201549181019190915292915050565b81546000908103610832575060006102ea565b82546000905b8082101561087f57600061084c8383610d87565b6000878152602090209091508590820154111561086b57809150610879565b6108768160016110b8565b92505b50610838565b6000821180156108ab5750836108a88661089a6001866110a5565b600091825260209091200190565b54145b156108c4576108bb6001836110a5565b925050506102ea565b509392505050565b6000816108da866001610da9565b811461091f5760405162461bcd60e51b81526020600482015260146024820152730929cac82989288bea0a49e9e8cbe988a9c8ea8960631b60448201526064016102e1565b8587106109635760405162461bcd60e51b81526020600482015260126024820152710929cac82989288be988a828cbe929c888ab60731b60448201526064016102e1565b8761099f5760405162461bcd60e51b815260206004820152600c60248201526b24a72b20a624a22fa622a0a360a11b60448201526064016102e1565b8760005b82811015610a595760008686838181106109bf576109bf6111ac565b90506020020135905060028a6109d5919061125a565b600003610a0d576040805160208101859052908101829052606001604051602081830303815290604052805190602001209250610a3a565b60408051602081018390529081018490526060016040516020818303038152906040528051906020012092505b610a4560028b61126e565b99505080610a529061122b565b90506109a3565b50909414979650505050505050565b803560009081526034602052604090205460ff1615610ad85760405162461bcd60e51b815260206004820152602660248201527f537461746552656365697665723a2053544154455f53594e435f49535f50524f60448201526510d154d4d15160d21b60648201526084016102e1565b610ae86060820160408301611282565b6001600160a01b03163b600003610b3c576040805160208082526000908201819052918335917f31c652130602f3ce96ceaf8a4c2b8b49f049166c6fcf2eb31943a75ec7c936ae910160405180910390a350565b8035600090815260346020526040808220805460ff191660011790558190610b6a9060608501908501611282565b6001600160a01b03168335610b856040860160208701611282565b610b92606087018761129d565b604051602401610ba594939291906112e3565b60408051601f198184030181529181526020820180516001600160e01b031663eeb4994560e01b17905251610bda919061133c565b6000604051808303816000865af19150503d8060008114610c17576040519150601f19603f3d011682016040523d82523d6000602084013e610c1c565b606091505b509150915081610c3f5782356000908152603460205260409020805460ff191690555b81151583600001357f31c652130602f3ce96ceaf8a4c2b8b49f049166c6fcf2eb31943a75ec7c936ae83604051610c76919061134e565b60405180910390a3505050565b6000806120306001600160a01b0316620249f08888888888604051602001610caf959493929190611381565b60408051601f1981840301815290829052610cc99161133c565b6000604051808303818686fa925050503d8060008114610d05576040519150601f19603f3d011682016040523d82523d6000602084013e610d0a565b606091505b5091509150600081806020019051810190610d2591906113ba565b9050828015610d315750805b610d7d5760405162461bcd60e51b815260206004820152601d60248201527f5349474e41545552455f564552494649434154494f4e5f4641494c454400000060448201526064016102e1565b5050505050505050565b6000610d96600284841861126e565b610da2908484166110b8565b9392505050565b600080610db584610df4565b90506001836002811115610dcb57610dcb6113dc565b148015610ddb575083816001901b105b610de6576000610de9565b60015b60ff16019392505050565b600080608083901c15610e0957608092831c92015b604083901c15610e1b57604092831c92015b602083901c15610e2d57602092831c92015b601083901c15610e3f57601092831c92015b600883901c15610e5157600892831c92015b600483901c15610e6357600492831c92015b600283901c15610e7557600292831c92015b600183901c156102ea5760010192915050565b600060208284031215610e9a57600080fd5b5035919050565b60008083601f840112610eb357600080fd5b5081356001600160401b03811115610eca57600080fd5b6020830191508360208260051b8501011115610ee557600080fd5b9250929050565b600080600060408486031215610f0157600080fd5b83356001600160401b0380821115610f1857600080fd5b610f2487838801610ea1565b90955093506020860135915080821115610f3d57600080fd5b50840160808187031215610f5057600080fd5b809150509250925092565b60008060008060408587031215610f7157600080fd5b84356001600160401b0380821115610f8857600080fd5b610f9488838901610ea1565b90965094506020870135915080821115610fad57600080fd5b50610fba87828801610ea1565b95989497509550505050565b60008083601f840112610fd857600080fd5b5081356001600160401b03811115610fef57600080fd5b602083019150836020828501011115610ee557600080fd5b600080600080600085870360a081121561102057600080fd5b606081121561102e57600080fd5b5085945060608601356001600160401b038082111561104c57600080fd5b61105889838a01610fc6565b9096509450608088013591508082111561107157600080fd5b5061107e88828901610fc6565b969995985093965092949392505050565b634e487b7160e01b600052601160045260246000fd5b818103818111156102ea576102ea61108f565b808201808211156102ea576102ea61108f565b80356001600160a01b03811681146110e257600080fd5b919050565b81835281816020850137506000828201602090810191909152601f909101601f19169091010190565b60208152813560208201526000611129602084016110cb565b60018060a01b03808216604085015280611145604087016110cb565b16606085015250506060830135601e1984360301811261116457600080fd5b83016020810190356001600160401b0381111561118057600080fd5b80360382131561118f57600080fd5b6080808501526111a360a0850182846110e7565b95945050505050565b634e487b7160e01b600052603260045260246000fd5b60008235607e198336030181126111d857600080fd5b9190910192915050565b6000808335601e198436030181126111f957600080fd5b8301803591506001600160401b0382111561121357600080fd5b6020019150600581901b3603821315610ee557600080fd5b60006001820161123d5761123d61108f565b5060010190565b634e487b7160e01b600052601260045260246000fd5b60008261126957611269611244565b500690565b60008261127d5761127d611244565b500490565b60006020828403121561129457600080fd5b610da2826110cb565b6000808335601e198436030181126112b457600080fd5b8301803591506001600160401b038211156112ce57600080fd5b602001915036819003821315610ee557600080fd5b8481526001600160a01b038416602082015260606040820181905260009061130e90830184866110e7565b9695505050505050565b60005b8381101561133357818101518382015260200161131b565b50506000910152565b600082516111d8818460208701611318565b602081526000825180602084015261136d816040850160208701611318565b601f01601f19169190910160400192915050565b85815260606020820152600061139b6060830186886110e7565b82810360408401526113ae8185876110e7565b98975050505050505050565b6000602082840312156113cc57600080fd5b81518015158114610da257600080fd5b634e487b7160e01b600052602160045260246000fdfea2646970667358221220f4843af5244f1ef6b01f5d8fdd49e8f0e76508652a929df5979a03cb0156a6e864736f6c63430008130033",
-                "balance": "0x0"
-            },
-            "0x0000000000000000000000000000000000001002": {
-                "code": "0x608060405234801561001057600080fd5b50600436106100415760003560e01c806316f198311461004657806361bc221a1461005b578063a6f9885c14610076575b600080fd5b61005961005436600461017a565b61007f565b005b61006460005481565b60405190815260200160405180910390f35b61006461080081565b6001600160a01b0383166100cd5760405162461bcd60e51b815260206004820152601060248201526f24a72b20a624a22fa922a1a2a4ab22a960811b60448201526064015b60405180910390fd5b6108008111156101145760405162461bcd60e51b815260206004820152601260248201527108ab0868a8a88a6be9a82b0be988a9c8ea8960731b60448201526064016100c4565b826001600160a01b0316336001600160a01b031660008081546101369061020b565b9190508190557fedaf3c471ebd67d60c29efe34b639ede7d6a1d92eaeb3f503e784971e67118a5858560405161016d929190610232565b60405180910390a4505050565b60008060006040848603121561018f57600080fd5b83356001600160a01b03811681146101a657600080fd5b9250602084013567ffffffffffffffff808211156101c357600080fd5b818601915086601f8301126101d757600080fd5b8135818111156101e657600080fd5b8760208285010111156101f857600080fd5b6020830194508093505050509250925092565b60006001820161022b57634e487b7160e01b600052601160045260246000fd5b5060010190565b60208152816020820152818360408301376000818301604090810191909152601f909201601f1916010191905056fea26469706673582212207637618450354edc5d98998425a0a6500ada60d0a9d2cdc5b2045e291fd737f264736f6c63430008130033",
-                "balance": "0x0"
-            },
-            "0x0000000000000000000000000000000000001003": {
-                "code": "0x608060405234801561001057600080fd5b50600436106101215760003560e01c806340c10f19116100ad578063a457c2d711610071578063a457c2d71461028b578063a9059cbb1461029e578063dd62ed3e146102b1578063e6198705146102c4578063f6d2ee86146102d557600080fd5b806340c10f191461021f57806370a082311461023257806395d89b411461025b5780639b77ef11146102635780639dc29fac1461027857600080fd5b80631f2d0065116100f45780631f2d00651461018c57806323b872dd146101b15780632d0335ab146101c4578063313ce567146101ed578063395093511461020c57600080fd5b806306fdde0314610126578063095ea7b3146101445780630c53c51c1461016757806318160ddd1461017a575b600080fd5b61012e6102e8565b60405161013b91906113b6565b60405180910390f35b6101576101523660046113ec565b61037a565b604051901515815260200161013b565b61012e610175366004611470565b61039e565b603c545b60405190815260200161013b565b606d546001600160a01b03165b6040516001600160a01b03909116815260200161013b565b6101576101bf3660046114e6565b610681565b61017e6101d2366004611522565b6001600160a01b031660009081526006602052604090205490565b606d54600160a01b900460ff1660405160ff909116815260200161013b565b61015761021a3660046113ec565b6106af565b61015761022d3660046113ec565b6106db565b61017e610240366004611522565b6001600160a01b03166000908152603a602052604090205490565b61012e61071b565b61027661027136600461153d565b61072a565b005b6101576102863660046113ec565b610751565b6101576102993660046113ec565b610788565b6101576102ac3660046113ec565b61080e565b61017e6102bf366004611556565b610826565b606c546001600160a01b0316610199565b6102766102e3366004611589565b610851565b6060603d80546102f79061160d565b80601f01602080910402602001604051908101604052809291908181526020018280546103239061160d565b80156103705780601f1061034557610100808354040283529160200191610370565b820191906000526020600020905b81548152906001019060200180831161035357829003601f168201915b5050505050905090565b600080610385610ad1565b9050610392818585610ae0565b60019150505b92915050565b606060006103e187878080601f016020809104026020016040519081016040528093929190818152602001838380828437600092019190915250610c0592505050565b90506001600160e01b031960003581169082160361046c5760405162461bcd60e51b815260206004820152603d60248201527f66756e6374696f6e5369676e61747572652063616e206e6f74206265206f662060448201527f657865637574654d6574615472616e73616374696f6e206d6574686f6400000060648201526084015b60405180910390fd5b604080516060810182526001600160a01b038a16600081815260066020908152848220548452808401929092528351601f8b0183900483028101830185528a815290938301918b908b9081908401838280828437600092019190915250505091525090506104dd8982888888610c20565b6105335760405162461bcd60e51b815260206004820152602160248201527f5369676e657220616e64207369676e617475726520646f206e6f74206d6174636044820152600d60fb1b6064820152608401610463565b600660008a6001600160a01b03166001600160a01b031681526020019081526020016000206000815460010191905081905550600080306001600160a01b03168a8a8d60405160200161058893929190611647565b60408051601f19818403018152908290526105a29161166d565b6000604051808303816000865af19150503d80600081146105df576040519150601f19603f3d011682016040523d82523d6000602084013e6105e4565b606091505b5091509150816106365760405162461bcd60e51b815260206004820152601c60248201527f46756e6374696f6e2063616c6c206e6f74207375636365737366756c000000006044820152606401610463565b7f5845892132946850460bff5a0083f71031bc5bf9aadcd40f1de79423eac9b10b8b338c8c60405161066b9493929190611689565b60405180910390a19a9950505050505050505050565b60008061068c610ad1565b9050610699858285610cfc565b6106a4858585610d76565b506001949350505050565b6000806106ba610ad1565b90506103928185856106cc8589610826565b6106d691906116d5565b610ae0565b606c546000906001600160a01b031633146107085760405162461bcd60e51b8152600401610463906116f6565b6107128383610f0f565b50600192915050565b6060603e80546102f79061160d565b33600090815260066020526040812080548392906107499084906116d5565b909155505050565b606c546000906001600160a01b0316331461077e5760405162461bcd60e51b8152600401610463906116f6565b6107128383610fbf565b600080610793610ad1565b905060006107a18286610826565b9050838110156108015760405162461bcd60e51b815260206004820152602560248201527f45524332303a2064656372656173656420616c6c6f77616e63652062656c6f77604482015264207a65726f60d81b6064820152608401610463565b6106a48286868403610ae0565b600080610819610ad1565b9050610392818585610d76565b6001600160a01b039182166000908152603b6020908152604080832093909416825291909152205490565b600754610100900460ff16158080156108715750600754600160ff909116105b8061088b5750303b15801561088b575060075460ff166001145b6108ee5760405162461bcd60e51b815260206004820152602e60248201527f496e697469616c697a61626c653a20636f6e747261637420697320616c72656160448201526d191e481a5b9a5d1a585b1a5e995960921b6064820152608401610463565b6007805460ff191660011790558015610911576007805461ff0019166101001790555b6001600160a01b0387161580159061092857508415155b801561093357508215155b61097f5760405162461bcd60e51b815260206004820152601e60248201527f4368696c6445524332303a204241445f494e495449414c495a4154494f4e00006044820152606401610463565b606d805460ff8416600160a01b026001600160a81b03199091166001600160a01b038a1617179055606c80546001600160a01b03191633179055604080516020601f8801819004810282018101909252868152610a2a91889088908190840183828082843760009201919091525050604080516020601f8a0181900481028201810190925288815292508891508790819084018382808284376000920191909152506110de92505050565b610a8286868080601f016020809104026020016040519081016040528093929190818152602001838380828437600092019190915250506040805180820190915260018152603160f81b6020820152915061110f9050565b8015610ac8576007805461ff0019169055604051600181527f7f26b83ff96e1f2b6a682f133852f6798a09c465da95921460cefb38474024989060200160405180910390a15b50505050505050565b6000610adb61117b565b905090565b6001600160a01b038316610b425760405162461bcd60e51b8152602060048201526024808201527f45524332303a20617070726f76652066726f6d20746865207a65726f206164646044820152637265737360e01b6064820152608401610463565b6001600160a01b038216610ba35760405162461bcd60e51b815260206004820152602260248201527f45524332303a20617070726f766520746f20746865207a65726f206164647265604482015261737360f01b6064820152608401610463565b6001600160a01b038381166000818152603b602090815260408083209487168084529482529182902085905590518481527f8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b92591015b60405180910390a3505050565b60008151600003610c1857506000919050565b506020015190565b6000806001610c36610c31886111d7565b611254565b6040805160008152602081018083529290925260ff861690820152606081018790526080810186905260a0016020604051602081039080840390855afa158015610c84573d6000803e3d6000fd5b5050604051601f1901519150506001600160a01b038116610cdb5760405162461bcd60e51b8152602060048201526011602482015270496e76616c6964207369676e617475726560781b6044820152606401610463565b866001600160a01b0316816001600160a01b03161491505095945050505050565b6000610d088484610826565b90506000198114610d705781811015610d635760405162461bcd60e51b815260206004820152601d60248201527f45524332303a20696e73756666696369656e7420616c6c6f77616e63650000006044820152606401610463565b610d708484848403610ae0565b50505050565b6001600160a01b038316610dda5760405162461bcd60e51b815260206004820152602560248201527f45524332303a207472616e736665722066726f6d20746865207a65726f206164604482015264647265737360d81b6064820152608401610463565b6001600160a01b038216610e3c5760405162461bcd60e51b815260206004820152602360248201527f45524332303a207472616e7366657220746f20746865207a65726f206164647260448201526265737360e81b6064820152608401610463565b6001600160a01b0383166000908152603a602052604090205481811015610eb45760405162461bcd60e51b815260206004820152602660248201527f45524332303a207472616e7366657220616d6f756e7420657863656564732062604482015265616c616e636560d01b6064820152608401610463565b6001600160a01b038085166000818152603a602052604080822086860390559286168082529083902080548601905591516000805160206118ec83398151915290610f029086815260200190565b60405180910390a3610d70565b6001600160a01b038216610f655760405162461bcd60e51b815260206004820152601f60248201527f45524332303a206d696e7420746f20746865207a65726f2061646472657373006044820152606401610463565b80603c6000828254610f7791906116d5565b90915550506001600160a01b0382166000818152603a60209081526040808320805486019055518481526000805160206118ec833981519152910160405180910390a35b5050565b6001600160a01b03821661101f5760405162461bcd60e51b815260206004820152602160248201527f45524332303a206275726e2066726f6d20746865207a65726f206164647265736044820152607360f81b6064820152608401610463565b6001600160a01b0382166000908152603a6020526040902054818110156110935760405162461bcd60e51b815260206004820152602260248201527f45524332303a206275726e20616d6f756e7420657863656564732062616c616e604482015261636560f01b6064820152608401610463565b6001600160a01b0383166000818152603a602090815260408083208686039055603c80548790039055518581529192916000805160206118ec8339815191529101610bf8565b505050565b600754610100900460ff166111055760405162461bcd60e51b815260040161046390611739565b610fbb82826112a2565b815160208084019190912082519183019190912060038290556004819055466001557f8b73c3c69bb8fe3d512ecc4cf759cc79239f7b179b0ffacaa9a75d522b39400f61115d8184846112e2565b600055600280546001600160a01b0319163017905560055550505050565b60003033036111d157600080368080601f0160208091040260200160405190810160405280939291908181526020018383808284376000920191909152505050503601516001600160a01b031691506111d49050565b50335b90565b60006040518060800160405280604381526020016118a96043913980516020918201208351848301516040808701518051908601209051611237950193845260208401929092526001600160a01b03166040830152606082015260800190565b604051602081830303815290604052805190602001209050919050565b600061039861126161132b565b8360405161190160f01b6020820152602281018390526042810182905260009060620160405160208183030381529060405280519060200120905092915050565b600754610100900460ff166112c95760405162461bcd60e51b815260040161046390611739565b603d6112d583826117e8565b50603e6110d982826117e8565b6040805160208101859052908101839052606081018290524660808201523060a082015260009060c0016040516020818303038152906040528051906020012090509392505050565b6002546000906001600160a01b031630148015611349575060015446145b15611355575060005490565b610adb6005546003546004546112e2565b60005b83811015611381578181015183820152602001611369565b50506000910152565b600081518084526113a2816020860160208601611366565b601f01601f19169290920160200192915050565b6020815260006113c9602083018461138a565b9392505050565b80356001600160a01b03811681146113e757600080fd5b919050565b600080604083850312156113ff57600080fd5b611408836113d0565b946020939093013593505050565b60008083601f84011261142857600080fd5b50813567ffffffffffffffff81111561144057600080fd5b60208301915083602082850101111561145857600080fd5b9250929050565b803560ff811681146113e757600080fd5b60008060008060008060a0878903121561148957600080fd5b611492876113d0565b9550602087013567ffffffffffffffff8111156114ae57600080fd5b6114ba89828a01611416565b90965094505060408701359250606087013591506114da6080880161145f565b90509295509295509295565b6000806000606084860312156114fb57600080fd5b611504846113d0565b9250611512602085016113d0565b9150604084013590509250925092565b60006020828403121561153457600080fd5b6113c9826113d0565b60006020828403121561154f57600080fd5b5035919050565b6000806040838503121561156957600080fd5b611572836113d0565b9150611580602084016113d0565b90509250929050565b600080600080600080608087890312156115a257600080fd5b6115ab876113d0565b9550602087013567ffffffffffffffff808211156115c857600080fd5b6115d48a838b01611416565b909750955060408901359150808211156115ed57600080fd5b506115fa89828a01611416565b90945092506114da90506060880161145f565b600181811c9082168061162157607f821691505b60208210810361164157634e487b7160e01b600052602260045260246000fd5b50919050565b8284823760609190911b6bffffffffffffffffffffffff19169101908152601401919050565b6000825161167f818460208701611366565b9190910192915050565b6001600160a01b0385811682528416602082015260606040820181905281018290526000828460808401376000608084840101526080601f19601f850116830101905095945050505050565b8082018082111561039857634e487b7160e01b600052601160045260246000fd5b60208082526023908201527f4368696c6445524332303a204f6e6c79207072656469636174652063616e2063604082015262185b1b60ea1b606082015260800190565b6020808252602b908201527f496e697469616c697a61626c653a20636f6e7472616374206973206e6f74206960408201526a6e697469616c697a696e6760a81b606082015260800190565b634e487b7160e01b600052604160045260246000fd5b601f8211156110d957600081815260208120601f850160051c810160208610156117c15750805b601f850160051c820191505b818110156117e0578281556001016117cd565b505050505050565b815167ffffffffffffffff81111561180257611802611784565b61181681611810845461160d565b8461179a565b602080601f83116001811461184b57600084156118335750858301515b600019600386901b1c1916600185901b1785556117e0565b600085815260208120601f198616915b8281101561187a5788860151825594840194600190910190840161185b565b50858210156118985787850151600019600388901b60f8161c191681555b5050505050600190811b0190555056fe4d6574615472616e73616374696f6e2875696e74323536206e6f6e63652c616464726573732066726f6d2c62797465732066756e6374696f6e5369676e617475726529ddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3efa264697066735822122061cd8aae15b13c732c17323e6cfe2f585db1ab74b2c3384cbb12626088d7caa964736f6c63430008130033",
-                "balance": "0x0"
-            },
-            "0x0000000000000000000000000000000000001004": {
-                "code": "0x608060405234801561001057600080fd5b50600436106101165760003560e01c806397e5230d116100a2578063d41f177111610071578063d41f17711461023d578063e0563ab114610264578063eeb499451461026d578063f3fef3a314610280578063f64512551461029357600080fd5b806397e5230d146101e6578063b1768065146101f0578063b68ad1e414610217578063c3b35a7e1461022a57600080fd5b80633b878c22116100e95780633b878c221461017c57806351351d531461018557806371cf93b7146101935780637efab4f5146101a6578063947287cf146101cf57600080fd5b806305dc2e8f1461011b5780631459457a1461014b5780631bc114ba14610160578063284017f514610173575b600080fd5b60345461012e906001600160a01b031681565b6040516001600160a01b0390911681526020015b60405180910390f35b61015e610159366004610f98565b6102ba565b005b60335461012e906001600160a01b031681565b61012e61202081565b61012e61101081565b61012e6002600160a01b0381565b60355461012e906001600160a01b031681565b61012e6101b4366004611009565b6037602052600090815260409020546001600160a01b031681565b6101d861520881565b604051908152602001610142565b6101d8620249f081565b6101d87f7a8dc26796a1e50e6e190b70259f58f6a4edd5b22280ceecc82b687b8e98286981565b60365461012e906001600160a01b031681565b61015e61023836600461102d565b61055a565b6101d87f87a7811f4bfedea3d341ad165680ae306b01aaeacc205d227629cf157dd9f82181565b61012e61203081565b61015e61027b36600461106e565b61056a565b61015e61028e3660046110f7565b61073e565b6101d87f2cef46a936bdc5b7e6e8c71aa04560c41cf7d88bb26901a7e7f4936ff02accad81565b336002600160a01b03146103035760405163973d02cb60e01b815260206004820152600a60248201526914d654d5115350d0531360b21b60448201526064015b60405180910390fd5b600054610100900460ff16158080156103235750600054600160ff909116105b8061033d5750303b15801561033d575060005460ff166001145b6103a05760405162461bcd60e51b815260206004820152602e60248201527f496e697469616c697a61626c653a20636f6e747261637420697320616c72656160448201526d191e481a5b9a5d1a585b1a5e995960921b60648201526084016102fa565b6000805460ff1916600117905580156103c3576000805461ff0019166101001790555b6001600160a01b038616158015906103e357506001600160a01b03851615155b80156103f757506001600160a01b03841615155b801561040b57506001600160a01b03831615155b6104675760405162461bcd60e51b815260206004820152602760248201527f4368696c6445524332305072656469636174653a204241445f494e495449414c60448201526624ad20aa24a7a760c91b60648201526084016102fa565b603380546001600160a01b03199081166001600160a01b03898116919091179092556034805482168884161790556035805482168784161790556036805490911685831617905582161561050c576001600160a01b03821660008181526037602052604080822080546001600160a01b03191661101090811790915590519092917f46bd56f98e1b14fd35691959270a6e1edf7cb8fcd489e0f9dda89e46c0d1ff0d91a35b8015610552576000805461ff0019169055604051600181527f7f26b83ff96e1f2b6a682f133852f6798a09c465da95921460cefb38474024989060200160405180910390a15b505050505050565b61056583838361074d565b505050565b6034546001600160a01b031633146105d55760405162461bcd60e51b815260206004820152602860248201527f4368696c6445524332305072656469636174653a204f4e4c595f53544154455f6044820152672922a1a2a4ab22a960c11b60648201526084016102fa565b6035546001600160a01b038481169116146106435760405162461bcd60e51b815260206004820152602860248201527f4368696c6445524332305072656469636174653a204f4e4c595f524f4f545f50604482015267524544494341544560c01b60648201526084016102fa565b7f87a7811f4bfedea3d341ad165680ae306b01aaeacc205d227629cf157dd9f821610672602060008486611123565b61067b9161114d565b0361069a576106956106908260208186611123565b610ac3565b610738565b7f2cef46a936bdc5b7e6e8c71aa04560c41cf7d88bb26901a7e7f4936ff02accad6106c9602060008486611123565b6106d29161114d565b036106e1576106958282610d6e565b60405162461bcd60e51b815260206004820152602660248201527f4368696c6445524332305072656469636174653a20494e56414c49445f5349476044820152654e415455524560d01b60648201526084016102fa565b50505050565b61074982338361074d565b5050565b826001600160a01b03163b6000036107b15760405162461bcd60e51b815260206004820152602160248201527f4368696c6445524332305072656469636174653a204e4f545f434f4e545241436044820152601560fa1b60648201526084016102fa565b6000836001600160a01b0316631f2d00656040518163ffffffff1660e01b8152600401602060405180830381865afa1580156107f1573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610815919061116b565b6001600160a01b038181166000908152603760205260409020549192508581169116146108545760405162461bcd60e51b81526004016102fa90611188565b6001600160a01b03811661086a5761086a6111cb565b306001600160a01b0316846001600160a01b031663e61987056040518163ffffffff1660e01b8152600401602060405180830381865afa1580156108b2573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906108d6919061116b565b6001600160a01b0316146108ec576108ec6111cb565b604051632770a7eb60e21b81526001600160a01b03851690639dc29fac9061091a90339086906004016111e1565b6020604051808303816000875af1158015610939573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061095d91906111fa565b6109a95760405162461bcd60e51b815260206004820181905260248201527f4368696c6445524332305072656469636174653a204255524e5f4641494c454460448201526064016102fa565b603354603554604080517f7a8dc26796a1e50e6e190b70259f58f6a4edd5b22280ceecc82b687b8e98286960208201526001600160a01b0385811682840152336060830152878116608083015260a08083018890528351808403909101815260c08301938490526316f1983160e01b909352938416936316f1983193610a349391169160c401611262565b600060405180830381600087803b158015610a4e57600080fd5b505af1158015610a62573d6000803e3d6000fd5b50505050826001600160a01b0316846001600160a01b0316826001600160a01b03167fa0923f060a16fc784558d43de424ffde7b01643de5e5d335851b9df94c76bb273386604051610ab59291906111e1565b60405180910390a450505050565b6000808080610ad48587018761128e565b6001600160a01b0380851660009081526037602052604090205494985092965090945092501680610b175760405162461bcd60e51b81526004016102fa90611188565b806001600160a01b03163b600003610b3157610b316111cb565b6000816001600160a01b0316631f2d00656040518163ffffffff1660e01b8152600401602060405180830381865afa158015610b71573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610b95919061116b565b9050856001600160a01b0316816001600160a01b031614610bb857610bb86111cb565b6001600160a01b038116610bce57610bce6111cb565b306001600160a01b0316826001600160a01b031663e61987056040518163ffffffff1660e01b8152600401602060405180830381865afa158015610c16573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610c3a919061116b565b6001600160a01b031614610c5057610c506111cb565b6040516340c10f1960e01b81526001600160a01b038316906340c10f1990610c7e90879087906004016111e1565b6020604051808303816000875af1158015610c9d573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610cc191906111fa565b610d0d5760405162461bcd60e51b815260206004820181905260248201527f4368696c6445524332305072656469636174653a204d494e545f4641494c454460448201526064016102fa565b836001600160a01b0316826001600160a01b0316876001600160a01b03167fdf34f3a3ed8bedc14a4b284ebaee5374d55b64bac6a84c270dabe8fd6b4cdafd8887604051610d5c9291906111e1565b60405180910390a45050505050505050565b6000808080610d7f85870187611382565b92975090955093509150506001600160a01b038416610da057610da06111cb565b6001600160a01b038481166000908152603760205260409020541615610dc857610dc86111cb565b6036546040516bffffffffffffffffffffffff19606087901b166020820152600091610e18916001600160a01b039091169060340160405160208183030381529060405280519060200120610ee3565b6001600160a01b038681166000908152603760205260409081902080546001600160a01b031916928416928317905551637b69774360e11b81529192509063f6d2ee8690610e7090889088908890889060040161140f565b600060405180830381600087803b158015610e8a57600080fd5b505af1158015610e9e573d6000803e3d6000fd5b50506040516001600160a01b038085169350881691507f46bd56f98e1b14fd35691959270a6e1edf7cb8fcd489e0f9dda89e46c0d1ff0d90600090a350505050505050565b6000763d602d80600a3d3981f3363d3d373d3d3d363d730000008360601b60e81c176000526e5af43d82803e903d91602b57fd5bf38360781b1760205281603760096000f590506001600160a01b038116610f7a5760405162461bcd60e51b8152602060048201526017602482015276115490cc4c4d8dce8818dc99585d194c8819985a5b1959604a1b60448201526064016102fa565b92915050565b6001600160a01b0381168114610f9557600080fd5b50565b600080600080600060a08688031215610fb057600080fd5b8535610fbb81610f80565b94506020860135610fcb81610f80565b93506040860135610fdb81610f80565b92506060860135610feb81610f80565b91506080860135610ffb81610f80565b809150509295509295909350565b60006020828403121561101b57600080fd5b813561102681610f80565b9392505050565b60008060006060848603121561104257600080fd5b833561104d81610f80565b9250602084013561105d81610f80565b929592945050506040919091013590565b6000806000806060858703121561108457600080fd5b84359350602085013561109681610f80565b9250604085013567ffffffffffffffff808211156110b357600080fd5b818701915087601f8301126110c757600080fd5b8135818111156110d657600080fd5b8860208285010111156110e857600080fd5b95989497505060200194505050565b6000806040838503121561110a57600080fd5b823561111581610f80565b946020939093013593505050565b6000808585111561113357600080fd5b8386111561114057600080fd5b5050820193919092039150565b80356020831015610f7a57600019602084900360031b1b1692915050565b60006020828403121561117d57600080fd5b815161102681610f80565b60208082526023908201527f4368696c6445524332305072656469636174653a20554e4d41505045445f544f60408201526225a2a760e91b606082015260800190565b634e487b7160e01b600052600160045260246000fd5b6001600160a01b03929092168252602082015260400190565b60006020828403121561120c57600080fd5b8151801515811461102657600080fd5b6000815180845260005b8181101561124257602081850181015186830182015201611226565b506000602082860101526020601f19601f83011685010191505092915050565b6001600160a01b03831681526040602082018190526000906112869083018461121c565b949350505050565b600080600080608085870312156112a457600080fd5b84356112af81610f80565b935060208501356112bf81610f80565b925060408501356112cf81610f80565b9396929550929360600135925050565b634e487b7160e01b600052604160045260246000fd5b600082601f83011261130657600080fd5b813567ffffffffffffffff80821115611321576113216112df565b604051601f8301601f19908116603f01168101908282118183101715611349576113496112df565b8160405283815286602085880101111561136257600080fd5b836020870160208301376000602085830101528094505050505092915050565b600080600080600060a0868803121561139a57600080fd5b8535945060208601356113ac81610f80565b9350604086013567ffffffffffffffff808211156113c957600080fd5b6113d589838a016112f5565b945060608801359150808211156113eb57600080fd5b506113f8888289016112f5565b925050608086013560ff81168114610ffb57600080fd5b6001600160a01b03851681526080602082018190526000906114339083018661121c565b8281036040840152611445818661121c565b91505060ff831660608301529594505050505056fea2646970667358221220040c22d73fe8215d2218893f5a7f6ab5ca23133aaf1f7ef7a037b72f1d8fea6d64736f6c63430008130033",
-                "balance": "0x0"
-            },
-            "0x0000000000000000000000000000000000001005": {
-                "code": "0x608060405234801561001057600080fd5b506004361061014d5760003560e01c806370a08231116100c3578063a22cb4651161007c578063a22cb465146102dd578063b2dc5dc3146102f0578063b88d4fde14610303578063c87b56dd14610316578063e619870514610329578063e985e9c51461033a57600080fd5b806370a08231146102765780637c88e3d914610289578063906571471461029c57806395d89b41146102af5780639b77ef11146102b75780639dc29fac146102ca57600080fd5b80631f2d0065116101155780631f2d0065146101e257806323b872dd146101f35780632d0335ab1461020657806340c10f191461023d57806342842e0e146102505780636352211e1461026357600080fd5b806301ffc9a71461015257806306fdde031461017a578063081812fc1461018f578063095ea7b3146101ba5780630c53c51c146101cf575b600080fd5b610165610160366004611a8c565b61034d565b60405190151581526020015b60405180910390f35b61018261039f565b6040516101719190611af9565b6101a261019d366004611b0c565b610431565b6040516001600160a01b039091168152602001610171565b6101cd6101c8366004611b41565b610458565b005b6101826101dd366004611bb3565b610584565b609f546001600160a01b03166101a2565b6101cd610201366004611c32565b610862565b61022f610214366004611c6e565b6001600160a01b031660009081526006602052604090205490565b604051908152602001610171565b61016561024b366004611b41565b61089a565b6101cd61025e366004611c32565b6108da565b6101a2610271366004611b0c565b6108f5565b61022f610284366004611c6e565b61092a565b610165610297366004611ccd565b6109b0565b6101cd6102aa366004611d38565b610a97565b610182610d05565b6101cd6102c5366004611b0c565b610d14565b6101656102d8366004611b41565b610d3b565b6101cd6102eb366004611db8565b610daa565b6101656102fe366004611df4565b610dc0565b6101cd610311366004611e5c565b610e6d565b610182610324366004611b0c565b610eac565b609e546001600160a01b03166101a2565b610165610348366004611f37565b610f20565b60006001600160e01b031982166380ac58cd60e01b148061037e57506001600160e01b03198216635b5e139f60e01b145b8061039957506301ffc9a760e01b6001600160e01b03198316145b92915050565b6060606c80546103ae90611f6a565b80601f01602080910402602001604051908101604052809291908181526020018280546103da90611f6a565b80156104275780601f106103fc57610100808354040283529160200191610427565b820191906000526020600020905b81548152906001019060200180831161040a57829003601f168201915b5050505050905090565b600061043c82610f4e565b506000908152607060205260409020546001600160a01b031690565b6000610463826108f5565b9050806001600160a01b0316836001600160a01b0316036104d55760405162461bcd60e51b815260206004820152602160248201527f4552433732313a20617070726f76616c20746f2063757272656e74206f776e656044820152603960f91b60648201526084015b60405180910390fd5b806001600160a01b03166104e7610f76565b6001600160a01b03161480610503575061050381610348610f76565b6105755760405162461bcd60e51b815260206004820152603d60248201527f4552433732313a20617070726f76652063616c6c6572206973206e6f7420746f60448201527f6b656e206f776e6572206f7220617070726f76656420666f7220616c6c00000060648201526084016104cc565b61057f8383610f85565b505050565b606060006105c787878080601f016020809104026020016040519081016040528093929190818152602001838380828437600092019190915250610ff392505050565b90506001600160e01b031960003581169082160361064d5760405162461bcd60e51b815260206004820152603d60248201527f66756e6374696f6e5369676e61747572652063616e206e6f74206265206f662060448201527f657865637574654d6574615472616e73616374696f6e206d6574686f6400000060648201526084016104cc565b604080516060810182526001600160a01b038a16600081815260066020908152848220548452808401929092528351601f8b0183900483028101830185528a815290938301918b908b9081908401838280828437600092019190915250505091525090506106be898288888861100e565b6107145760405162461bcd60e51b815260206004820152602160248201527f5369676e657220616e64207369676e617475726520646f206e6f74206d6174636044820152600d60fb1b60648201526084016104cc565b600660008a6001600160a01b03166001600160a01b031681526020019081526020016000206000815460010191905081905550600080306001600160a01b03168a8a8d60405160200161076993929190611fa4565b60408051601f198184030181529082905261078391611fca565b6000604051808303816000865af19150503d80600081146107c0576040519150601f19603f3d011682016040523d82523d6000602084013e6107c5565b606091505b5091509150816108175760405162461bcd60e51b815260206004820152601c60248201527f46756e6374696f6e2063616c6c206e6f74207375636365737366756c0000000060448201526064016104cc565b7f5845892132946850460bff5a0083f71031bc5bf9aadcd40f1de79423eac9b10b8b338c8c60405161084c9493929190611fe6565b60405180910390a19a9950505050505050505050565b61087361086d610f76565b826110ea565b61088f5760405162461bcd60e51b81526004016104cc90612032565b61057f838383611148565b609e546000906001600160a01b031633146108c75760405162461bcd60e51b81526004016104cc9061207f565b6108d1838361129a565b50600192915050565b61057f83838360405180602001604052806000815250610e6d565b6000818152606e60205260408120546001600160a01b0316806103995760405162461bcd60e51b81526004016104cc906120c3565b60006001600160a01b0382166109945760405162461bcd60e51b815260206004820152602960248201527f4552433732313a2061646472657373207a65726f206973206e6f7420612076616044820152683634b21037bbb732b960b91b60648201526084016104cc565b506001600160a01b03166000908152606f602052604090205490565b609e546000906001600160a01b031633146109dd5760405162461bcd60e51b81526004016104cc9061207f565b83828114610a2d5760405162461bcd60e51b815260206004820152601f60248201527f4368696c644552433732313a204172726179206c656e206d69736d617463680060448201526064016104cc565b60005b81811015610a8857610a80878783818110610a4d57610a4d6120f5565b9050602002016020810190610a629190611c6e565b868684818110610a7457610a746120f5565b9050602002013561129a565b600101610a30565b5060019150505b949350505050565b600754610100900460ff1615808015610ab75750600754600160ff909116105b80610ad15750303b158015610ad1575060075460ff166001145b610b345760405162461bcd60e51b815260206004820152602e60248201527f496e697469616c697a61626c653a20636f6e747261637420697320616c72656160448201526d191e481a5b9a5d1a585b1a5e995960921b60648201526084016104cc565b6007805460ff191660011790558015610b57576007805461ff0019166101001790555b6001600160a01b03861615801590610b6e57508315155b8015610b7957508115155b610bc55760405162461bcd60e51b815260206004820152601f60248201527f4368696c644552433732313a2042616420696e697469616c697a6174696f6e0060448201526064016104cc565b609f80546001600160a01b0388166001600160a01b031991821617909155609e805490911633179055604080516020601f8701819004810282018101909252858152610c5f91879087908190840183828082843760009201919091525050604080516020601f890181900481028201810190925287815292508791508690819084018382808284376000920191909152506112b492505050565b610cb785858080601f016020809104026020016040519081016040528093929190818152602001838380828437600092019190915250506040805180820190915260018152603160f81b602082015291506112e59050565b8015610cfd576007805461ff0019169055604051600181527f7f26b83ff96e1f2b6a682f133852f6798a09c465da95921460cefb38474024989060200160405180910390a15b505050505050565b6060606d80546103ae90611f6a565b3360009081526006602052604081208054839290610d3390849061210b565b909155505050565b609e546000906001600160a01b03163314610d685760405162461bcd60e51b81526004016104cc9061207f565b610d71826108f5565b6001600160a01b0316836001600160a01b031614610da15760405162461bcd60e51b81526004016104cc9061212c565b6108d182611351565b610dbc610db5610f76565b83836113d4565b5050565b609e546000906001600160a01b03163314610ded5760405162461bcd60e51b81526004016104cc9061207f565b8160005b81811015610e61576000858583818110610e0d57610e0d6120f5565b905060200201359050610e1f816108f5565b6001600160a01b0316876001600160a01b031614610e4f5760405162461bcd60e51b81526004016104cc9061212c565b610e5881611351565b50600101610df1565b50600195945050505050565b610e7e610e78610f76565b836110ea565b610e9a5760405162461bcd60e51b81526004016104cc90612032565b610ea68484848461149e565b50505050565b6060610eb782610f4e565b6000610ece60408051602081019091526000815290565b90506000815111610eee5760405180602001604052806000815250610f19565b80610ef8846114d1565b604051602001610f09929190612161565b6040516020818303038152906040525b9392505050565b6001600160a01b03918216600090815260716020908152604080832093909416825291909152205460ff1690565b610f5781611563565b610f735760405162461bcd60e51b81526004016104cc906120c3565b50565b6000610f80611580565b905090565b600081815260706020526040902080546001600160a01b0319166001600160a01b0384169081179091558190610fba826108f5565b6001600160a01b03167f8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b92560405160405180910390a45050565b6000815160000361100657506000919050565b506020015190565b600080600161102461101f886115dc565b611659565b6040805160008152602081018083529290925260ff861690820152606081018790526080810186905260a0016020604051602081039080840390855afa158015611072573d6000803e3d6000fd5b5050604051601f1901519150506001600160a01b0381166110c95760405162461bcd60e51b8152602060048201526011602482015270496e76616c6964207369676e617475726560781b60448201526064016104cc565b866001600160a01b0316816001600160a01b03161491505095945050505050565b6000806110f6836108f5565b9050806001600160a01b0316846001600160a01b0316148061111d575061111d8185610f20565b80610a8f5750836001600160a01b031661113684610431565b6001600160a01b031614949350505050565b826001600160a01b031661115b826108f5565b6001600160a01b0316146111815760405162461bcd60e51b81526004016104cc90612190565b6001600160a01b0382166111e35760405162461bcd60e51b8152602060048201526024808201527f4552433732313a207472616e7366657220746f20746865207a65726f206164646044820152637265737360e01b60648201526084016104cc565b826001600160a01b03166111f6826108f5565b6001600160a01b03161461121c5760405162461bcd60e51b81526004016104cc90612190565b600081815260706020908152604080832080546001600160a01b03199081169091556001600160a01b03878116808652606f8552838620805460001901905590871680865283862080546001019055868652606e909452828520805490921684179091559051849360008051602061244c83398151915291a4505050565b610dbc8282604051806020016040528060008152506116a7565b600754610100900460ff166112db5760405162461bcd60e51b81526004016104cc906121d5565b610dbc82826116da565b815160208084019190912082519183019190912060038290556004819055466001557f8b73c3c69bb8fe3d512ecc4cf759cc79239f7b179b0ffacaa9a75d522b39400f61133381848461171a565b600055600280546001600160a01b0319163017905560055550505050565b600061135c826108f5565b9050611367826108f5565b600083815260706020908152604080832080546001600160a01b03199081169091556001600160a01b038516808552606f84528285208054600019019055878552606e9093528184208054909116905551929350849260008051602061244c833981519152908390a45050565b816001600160a01b0316836001600160a01b0316036114315760405162461bcd60e51b815260206004820152601960248201527822a9219b99189d1030b8383937bb32903a379031b0b63632b960391b60448201526064016104cc565b6001600160a01b03838116600081815260716020908152604080832094871680845294825291829020805460ff191686151590811790915591519182527f17307eab39ab6107e8899845ad3d59bd9653f200f220920489ca2b5937696c31910160405180910390a3505050565b6114a9848484611148565b6114b584848484611763565b610ea65760405162461bcd60e51b81526004016104cc90612220565b606060006114de83611868565b60010190506000816001600160401b038111156114fd576114fd611e46565b6040519080825280601f01601f191660200182016040528015611527576020820181803683370190505b5090508181016020015b600019016f181899199a1a9b1b9c1cb0b131b232b360811b600a86061a8153600a850494508461153157509392505050565b6000908152606e60205260409020546001600160a01b0316151590565b60003033036115d657600080368080601f0160208091040260200160405190810160405280939291908181526020018383808284376000920191909152505050503601516001600160a01b031691506115d99050565b50335b90565b6000604051806080016040528060438152602001612409604391398051602091820120835184830151604080870151805190860120905161163c950193845260208401929092526001600160a01b03166040830152606082015260800190565b604051602081830303815290604052805190602001209050919050565b6000610399611666611940565b8360405161190160f01b6020820152602281018390526042810182905260009060620160405160208183030381529060405280519060200120905092915050565b6116b1838361197b565b6116be6000848484611763565b61057f5760405162461bcd60e51b81526004016104cc90612220565b600754610100900460ff166117015760405162461bcd60e51b81526004016104cc906121d5565b606c61170d83826122b8565b50606d61057f82826122b8565b6040805160208101859052908101839052606081018290524660808201523060a082015260009060c0016040516020818303038152906040528051906020012090509392505050565b60006001600160a01b0384163b1561186057836001600160a01b031663150b7a0261178c610f76565b8786866040518563ffffffff1660e01b81526004016117ae9493929190612377565b6020604051808303816000875af19250505080156117e9575060408051601f3d908101601f191682019092526117e6918101906123b4565b60015b611846573d808015611817576040519150601f19603f3d011682016040523d82523d6000602084013e61181c565b606091505b50805160000361183e5760405162461bcd60e51b81526004016104cc90612220565b805181602001fd5b6001600160e01b031916630a85bd0160e11b149050610a8f565b506001610a8f565b60008072184f03e93ff9f4daa797ed6e38ed64bf6a1f0160401b83106118a75772184f03e93ff9f4daa797ed6e38ed64bf6a1f0160401b830492506040015b6d04ee2d6d415b85acef810000000083106118d3576d04ee2d6d415b85acef8100000000830492506020015b662386f26fc1000083106118f157662386f26fc10000830492506010015b6305f5e1008310611909576305f5e100830492506008015b612710831061191d57612710830492506004015b6064831061192f576064830492506002015b600a83106103995760010192915050565b6002546000906001600160a01b03163014801561195e575060015446145b1561196a575060005490565b610f8060055460035460045461171a565b6001600160a01b0382166119d15760405162461bcd60e51b815260206004820181905260248201527f4552433732313a206d696e7420746f20746865207a65726f206164647265737360448201526064016104cc565b6119da81611563565b156119f75760405162461bcd60e51b81526004016104cc906123d1565b611a0081611563565b15611a1d5760405162461bcd60e51b81526004016104cc906123d1565b6001600160a01b0382166000818152606f6020908152604080832080546001019055848352606e90915280822080546001600160a01b03191684179055518392919060008051602061244c833981519152908290a45050565b6001600160e01b031981168114610f7357600080fd5b600060208284031215611a9e57600080fd5b8135610f1981611a76565b60005b83811015611ac4578181015183820152602001611aac565b50506000910152565b60008151808452611ae5816020860160208601611aa9565b601f01601f19169290920160200192915050565b602081526000610f196020830184611acd565b600060208284031215611b1e57600080fd5b5035919050565b80356001600160a01b0381168114611b3c57600080fd5b919050565b60008060408385031215611b5457600080fd5b611b5d83611b25565b946020939093013593505050565b60008083601f840112611b7d57600080fd5b5081356001600160401b03811115611b9457600080fd5b602083019150836020828501011115611bac57600080fd5b9250929050565b60008060008060008060a08789031215611bcc57600080fd5b611bd587611b25565b955060208701356001600160401b03811115611bf057600080fd5b611bfc89828a01611b6b565b9096509450506040870135925060608701359150608087013560ff81168114611c2457600080fd5b809150509295509295509295565b600080600060608486031215611c4757600080fd5b611c5084611b25565b9250611c5e60208501611b25565b9150604084013590509250925092565b600060208284031215611c8057600080fd5b610f1982611b25565b60008083601f840112611c9b57600080fd5b5081356001600160401b03811115611cb257600080fd5b6020830191508360208260051b8501011115611bac57600080fd5b60008060008060408587031215611ce357600080fd5b84356001600160401b0380821115611cfa57600080fd5b611d0688838901611c89565b90965094506020870135915080821115611d1f57600080fd5b50611d2c87828801611c89565b95989497509550505050565b600080600080600060608688031215611d5057600080fd5b611d5986611b25565b945060208601356001600160401b0380821115611d7557600080fd5b611d8189838a01611b6b565b90965094506040880135915080821115611d9a57600080fd5b50611da788828901611b6b565b969995985093965092949392505050565b60008060408385031215611dcb57600080fd5b611dd483611b25565b915060208301358015158114611de957600080fd5b809150509250929050565b600080600060408486031215611e0957600080fd5b611e1284611b25565b925060208401356001600160401b03811115611e2d57600080fd5b611e3986828701611c89565b9497909650939450505050565b634e487b7160e01b600052604160045260246000fd5b60008060008060808587031215611e7257600080fd5b611e7b85611b25565b9350611e8960208601611b25565b92506040850135915060608501356001600160401b0380821115611eac57600080fd5b818701915087601f830112611ec057600080fd5b813581811115611ed257611ed2611e46565b604051601f8201601f19908116603f01168101908382118183101715611efa57611efa611e46565b816040528281528a6020848701011115611f1357600080fd5b82602086016020830137600060208483010152809550505050505092959194509250565b60008060408385031215611f4a57600080fd5b611f5383611b25565b9150611f6160208401611b25565b90509250929050565b600181811c90821680611f7e57607f821691505b602082108103611f9e57634e487b7160e01b600052602260045260246000fd5b50919050565b8284823760609190911b6bffffffffffffffffffffffff19169101908152601401919050565b60008251611fdc818460208701611aa9565b9190910192915050565b6001600160a01b0385811682528416602082015260606040820181905281018290526000828460808401376000608084840101526080601f19601f850116830101905095945050505050565b6020808252602d908201527f4552433732313a2063616c6c6572206973206e6f7420746f6b656e206f776e6560408201526c1c881bdc88185c1c1c9bdd9959609a1b606082015260800190565b60208082526024908201527f4368696c644552433732313a204f6e6c79207072656469636174652063616e2060408201526318d85b1b60e21b606082015260800190565b602080825260189082015277115490cdcc8c4e881a5b9d985b1a59081d1bdad95b88125160421b604082015260600190565b634e487b7160e01b600052603260045260246000fd5b8082018082111561039957634e487b7160e01b600052601160045260246000fd5b6020808252818101527f4368696c644552433732313a204f6e6c79206f776e65722063616e206275726e604082015260600190565b60008351612173818460208801611aa9565b835190830190612187818360208801611aa9565b01949350505050565b60208082526025908201527f4552433732313a207472616e736665722066726f6d20696e636f72726563742060408201526437bbb732b960d91b606082015260800190565b6020808252602b908201527f496e697469616c697a61626c653a20636f6e7472616374206973206e6f74206960408201526a6e697469616c697a696e6760a81b606082015260800190565b60208082526032908201527f4552433732313a207472616e7366657220746f206e6f6e20455243373231526560408201527131b2b4bb32b91034b6b83632b6b2b73a32b960711b606082015260800190565b601f82111561057f57600081815260208120601f850160051c810160208610156122995750805b601f850160051c820191505b81811015610cfd578281556001016122a5565b81516001600160401b038111156122d1576122d1611e46565b6122e5816122df8454611f6a565b84612272565b602080601f83116001811461231a57600084156123025750858301515b600019600386901b1c1916600185901b178555610cfd565b600085815260208120601f198616915b828110156123495788860151825594840194600190910190840161232a565b50858210156123675787850151600019600388901b60f8161c191681555b5050505050600190811b01905550565b6001600160a01b03858116825284166020820152604081018390526080606082018190526000906123aa90830184611acd565b9695505050505050565b6000602082840312156123c657600080fd5b8151610f1981611a76565b6020808252601c908201527f4552433732313a20746f6b656e20616c7265616479206d696e7465640000000060408201526060019056fe4d6574615472616e73616374696f6e2875696e74323536206e6f6e63652c616464726573732066726f6d2c62797465732066756e6374696f6e5369676e617475726529ddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3efa2646970667358221220ea3c02b950248f82ca74449c170966a8d3ba41ec46257d49989e4be74e94e63864736f6c63430008130033",
-                "balance": "0x0"
-            },
-            "0x0000000000000000000000000000000000001006": {
-                "code": "0x608060405234801561001057600080fd5b50600436106101375760003560e01c8063b68ad1e4116100b8578063e0563ab11161007c578063e0563ab1146102c0578063eeb49945146102c9578063f3fef3a3146102dc578063f6451255146102ef578063f691325c14610316578063f8c8765e1461032957600080fd5b8063b68ad1e414610225578063c3b35a7e14610238578063c5ac2b1c1461024b578063d41f177114610272578063d7c9e3ec1461029957600080fd5b80636f33e695116100ff5780636f33e6951461019f5780637efab4f5146101b4578063947287cf146101dd57806397e5230d146101f4578063b1768065146101fe57600080fd5b806305dc2e8f1461013c5780631bc114ba1461016c578063284017f51461017f5780633b878c221461018857806351351d5314610191575b600080fd5b60345461014f906001600160a01b031681565b6040516001600160a01b0390911681526020015b60405180910390f35b60335461014f906001600160a01b031681565b61014f61202081565b61014f61101081565b61014f6002600160a01b0381565b6101b26101ad366004611617565b61033c565b005b61014f6101c2366004611699565b6037602052600090815260409020546001600160a01b031681565b6101e661520881565b604051908152602001610163565b6101e6620249f081565b6101e67f7a8dc26796a1e50e6e190b70259f58f6a4edd5b22280ceecc82b687b8e98286981565b60365461014f906001600160a01b031681565b6101b26102463660046116bd565b610350565b6101e67faf50c8eab81226bc79eee3a10e3fe25db1a2be7241130e392b0675df839b6d1881565b6101e67f87a7811f4bfedea3d341ad165680ae306b01aaeacc205d227629cf157dd9f82181565b6101e67f5fb452c5a8f2b7c7ef2984e2f1063c7ee9b80b110cdc98ccb98f6654e10b5ed281565b61014f61203081565b6101b26102d73660046116fe565b610360565b6101b26102ea366004611786565b610583565b6101e67f2cef46a936bdc5b7e6e8c71aa04560c41cf7d88bb26901a7e7f4936ff02accad81565b60355461014f906001600160a01b031681565b6101b26103373660046117b2565b610592565b61034985858585856107d1565b5050505050565b61035b838383610b35565b505050565b6034546001600160a01b031633146103d15760405162461bcd60e51b815260206004820152602960248201527f4368696c644552433732315072656469636174653a204f4e4c595f53544154456044820152682fa922a1a2a4ab22a960b91b60648201526084015b60405180910390fd5b6035546001600160a01b038481169116146104405760405162461bcd60e51b815260206004820152602960248201527f4368696c644552433732315072656469636174653a204f4e4c595f524f4f545f60448201526850524544494341544560b81b60648201526084016103c8565b7f87a7811f4bfedea3d341ad165680ae306b01aaeacc205d227629cf157dd9f82161046f60206000848661180e565b61047891611838565b036104975761049261048d826020818661180e565b610e3e565b61057d565b7faf50c8eab81226bc79eee3a10e3fe25db1a2be7241130e392b0675df839b6d186104c660206000848661180e565b6104cf91611838565b036104de5761049282826110b4565b7f2cef46a936bdc5b7e6e8c71aa04560c41cf7d88bb26901a7e7f4936ff02accad61050d60206000848661180e565b61051691611838565b0361052557610492828261131a565b60405162461bcd60e51b815260206004820152602760248201527f4368696c644552433732315072656469636174653a20494e56414c49445f5349604482015266474e415455524560c81b60648201526084016103c8565b50505050565b61058e823383610b35565b5050565b336002600160a01b03146105d65760405163973d02cb60e01b815260206004820152600a60248201526914d654d5115350d0531360b21b60448201526064016103c8565b600054610100900460ff16158080156105f65750600054600160ff909116105b806106105750303b158015610610575060005460ff166001145b6106735760405162461bcd60e51b815260206004820152602e60248201527f496e697469616c697a61626c653a20636f6e747261637420697320616c72656160448201526d191e481a5b9a5d1a585b1a5e995960921b60648201526084016103c8565b6000805460ff191660011790558015610696576000805461ff0019166101001790555b6001600160a01b038516158015906106b657506001600160a01b03841615155b80156106ca57506001600160a01b03831615155b80156106de57506001600160a01b03821615155b61073b5760405162461bcd60e51b815260206004820152602860248201527f4368696c644552433732315072656469636174653a204241445f494e495449416044820152672624ad20aa24a7a760c11b60648201526084016103c8565b603380546001600160a01b038088166001600160a01b031992831617909255603480548784169083161790556035805486841690831617905560368054928516929091169190911790558015610349576000805461ff0019169055604051600181527f7f26b83ff96e1f2b6a682f133852f6798a09c465da95921460cefb38474024989060200160405180910390a15050505050565b846107db81611488565b6107f75760405162461bcd60e51b81526004016103c890611856565b6000866001600160a01b0316631f2d00656040518163ffffffff1660e01b8152600401602060405180830381865afa158015610837573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061085b9190611898565b6001600160a01b0381811660009081526037602052604090205491925088811691161461089a5760405162461bcd60e51b81526004016103c8906118b5565b6001600160a01b0381166108b0576108b06118f9565b306001600160a01b0316876001600160a01b031663e61987056040518163ffffffff1660e01b8152600401602060405180830381865afa1580156108f8573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061091c9190611898565b6001600160a01b031614610932576109326118f9565b84831461098d5760405162461bcd60e51b8152602060048201526024808201527f4368696c644552433732315072656469636174653a20494e56414c49445f4c4560448201526309c8ea8960e31b60648201526084016103c8565b60405163b2dc5dc360e01b81526001600160a01b0388169063b2dc5dc3906109bd90339088908890600401611941565b6020604051808303816000875af11580156109dc573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610a00919061196f565b610a1c5760405162461bcd60e51b81526004016103c890611991565b6033546035546040516001600160a01b03928316926316f19831921690610a73907f5fb452c5a8f2b7c7ef2984e2f1063c7ee9b80b110cdc98ccb98f6654e10b5ed290869033908d908d908d908d90602001611a1b565b6040516020818303038152906040526040518363ffffffff1660e01b8152600401610a9f929190611ab5565b600060405180830381600087803b158015610ab957600080fd5b505af1158015610acd573d6000803e3d6000fd5b50505050336001600160a01b0316876001600160a01b0316826001600160a01b03167fa80bc76d6e1849a9088a9c00a2aeaa54eeb78f15565a18da3e8873438976f52289898989604051610b249493929190611ae1565b60405180910390a450505050505050565b82610b3f81611488565b610b5b5760405162461bcd60e51b81526004016103c890611856565b6000846001600160a01b0316631f2d00656040518163ffffffff1660e01b8152600401602060405180830381865afa158015610b9b573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610bbf9190611898565b6001600160a01b03818116600090815260376020526040902054919250868116911614610bfe5760405162461bcd60e51b81526004016103c8906118b5565b6001600160a01b038116610c1457610c146118f9565b306001600160a01b0316856001600160a01b031663e61987056040518163ffffffff1660e01b8152600401602060405180830381865afa158015610c5c573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610c809190611898565b6001600160a01b031614610c9657610c966118f9565b604051632770a7eb60e21b81526001600160a01b03861690639dc29fac90610cc49033908790600401611b13565b6020604051808303816000875af1158015610ce3573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610d07919061196f565b610d235760405162461bcd60e51b81526004016103c890611991565b603354603554604080517f7a8dc26796a1e50e6e190b70259f58f6a4edd5b22280ceecc82b687b8e98286960208201526001600160a01b0385811682840152336060830152888116608083015260a08083018990528351808403909101815260c08301938490526316f1983160e01b909352938416936316f1983193610dae9391169160c401611ab5565b600060405180830381600087803b158015610dc857600080fd5b505af1158015610ddc573d6000803e3d6000fd5b50505050836001600160a01b0316856001600160a01b0316826001600160a01b03167f1e0ef6131232b1090efc3ec1cf7b53aa17f4b7cd8a4f9e033b49ee237379b0133387604051610e2f929190611b13565b60405180910390a45050505050565b6000808080610e4f85870187611b2c565b6001600160a01b0380851660009081526037602052604090205494985092965090945092501680610e925760405162461bcd60e51b81526004016103c8906118b5565b610e9b81611488565b610ea757610ea76118f9565b6000816001600160a01b0316631f2d00656040518163ffffffff1660e01b8152600401602060405180830381865afa158015610ee7573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610f0b9190611898565b9050856001600160a01b0316816001600160a01b031614610f2e57610f2e6118f9565b6001600160a01b038116610f4457610f446118f9565b306001600160a01b0316826001600160a01b031663e61987056040518163ffffffff1660e01b8152600401602060405180830381865afa158015610f8c573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610fb09190611898565b6001600160a01b031614610fc657610fc66118f9565b6040516340c10f1960e01b81526001600160a01b038316906340c10f1990610ff49087908790600401611b13565b6020604051808303816000875af1158015611013573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190611037919061196f565b6110535760405162461bcd60e51b81526004016103c890611b7d565b836001600160a01b0316826001600160a01b0316876001600160a01b03167f37589fd8c906c19ea68eeb7e6b3e03efc06ff8aa4b1830588eba75f4375b161188876040516110a2929190611b13565b60405180910390a45050505050505050565b60008080806110c585870187611c92565b6001600160a01b0380851660009081526037602052604090205494995092975090955093501690508061110a5760405162461bcd60e51b81526004016103c8906118b5565b61111381611488565b61111f5761111f6118f9565b6000816001600160a01b0316631f2d00656040518163ffffffff1660e01b8152600401602060405180830381865afa15801561115f573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906111839190611898565b9050856001600160a01b0316816001600160a01b0316146111a6576111a66118f9565b6001600160a01b0381166111bc576111bc6118f9565b306001600160a01b0316826001600160a01b031663e61987056040518163ffffffff1660e01b8152600401602060405180830381865afa158015611204573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906112289190611898565b6001600160a01b03161461123e5761123e6118f9565b604051637c88e3d960e01b81526001600160a01b03831690637c88e3d99061126c9087908790600401611d84565b6020604051808303816000875af115801561128b573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906112af919061196f565b6112cb5760405162461bcd60e51b81526004016103c890611b7d565b846001600160a01b0316826001600160a01b0316876001600160a01b03167fc1b1a5c1b97cc8e5ac82b47496f5ebdadf9c7d119b30a116e2bdafd56f6ed47587876040516110a2929190611d84565b6000808061132a84860186611e77565b91955093509150506001600160a01b038316611348576113486118f9565b6001600160a01b038381166000908152603760205260409020541615611370576113706118f9565b6036546040516bffffffffffffffffffffffff19606086901b1660208201526000916113c0916001600160a01b03909116906034016040516020818303038152906040528051906020012061151d565b6001600160a01b038581166000908152603760205260409081902080546001600160a01b031916928416928317905551639065714760e01b81529192509063906571479061141690879087908790600401611ef6565b600060405180830381600087803b15801561143057600080fd5b505af1158015611444573d6000803e3d6000fd5b50506040516001600160a01b038085169350871691507f46bd56f98e1b14fd35691959270a6e1edf7cb8fcd489e0f9dda89e46c0d1ff0d90600090a3505050505050565b6000816001600160a01b03163b6000036114a457506000919050565b6040516301ffc9a760e01b81526380ac58cd60e01b60048201526001600160a01b038316906301ffc9a790602401602060405180830381865afa92505050801561150b575060408051601f3d908101601f191682019092526115089181019061196f565b60015b61151757506000919050565b92915050565b6000763d602d80600a3d3981f3363d3d373d3d3d363d730000008360601b60e81c176000526e5af43d82803e903d91602b57fd5bf38360781b1760205281603760096000f590506001600160a01b0381166115175760405162461bcd60e51b8152602060048201526017602482015276115490cc4c4d8dce8818dc99585d194c8819985a5b1959604a1b60448201526064016103c8565b6001600160a01b03811681146115c957600080fd5b50565b60008083601f8401126115de57600080fd5b5081356001600160401b038111156115f557600080fd5b6020830191508360208260051b850101111561161057600080fd5b9250929050565b60008060008060006060868803121561162f57600080fd5b853561163a816115b4565b945060208601356001600160401b038082111561165657600080fd5b61166289838a016115cc565b9096509450604088013591508082111561167b57600080fd5b50611688888289016115cc565b969995985093965092949392505050565b6000602082840312156116ab57600080fd5b81356116b6816115b4565b9392505050565b6000806000606084860312156116d257600080fd5b83356116dd816115b4565b925060208401356116ed816115b4565b929592945050506040919091013590565b6000806000806060858703121561171457600080fd5b843593506020850135611726816115b4565b925060408501356001600160401b038082111561174257600080fd5b818701915087601f83011261175657600080fd5b81358181111561176557600080fd5b88602082850101111561177757600080fd5b95989497505060200194505050565b6000806040838503121561179957600080fd5b82356117a4816115b4565b946020939093013593505050565b600080600080608085870312156117c857600080fd5b84356117d3816115b4565b935060208501356117e3816115b4565b925060408501356117f3816115b4565b91506060850135611803816115b4565b939692955090935050565b6000808585111561181e57600080fd5b8386111561182b57600080fd5b5050820193919092039150565b8035602083101561151757600019602084900360031b1b1692915050565b60208082526022908201527f4368696c644552433732315072656469636174653a204e4f545f434f4e54524160408201526110d560f21b606082015260800190565b6000602082840312156118aa57600080fd5b81516116b6816115b4565b60208082526024908201527f4368696c644552433732315072656469636174653a20554e4d41505045445f5460408201526327a5a2a760e11b606082015260800190565b634e487b7160e01b600052600160045260246000fd5b81835260006001600160fb1b0383111561192857600080fd5b8260051b80836020870137939093016020019392505050565b6001600160a01b0384168152604060208201819052600090611966908301848661190f565b95945050505050565b60006020828403121561198157600080fd5b815180151581146116b657600080fd5b60208082526021908201527f4368696c644552433732315072656469636174653a204255524e5f4641494c456040820152601160fa1b606082015260800190565b8183526000602080850194508260005b85811015611a105781356119f5816115b4565b6001600160a01b0316875295820195908201906001016119e2565b509495945050505050565b8781526001600160a01b0387811660208301528616604082015260a060608201819052600090611a4e90830186886119d2565b8281036080840152611a6181858761190f565b9a9950505050505050505050565b6000815180845260005b81811015611a9557602081850181015186830182015201611a79565b506000602082860101526020601f19601f83011685010191505092915050565b6001600160a01b0383168152604060208201819052600090611ad990830184611a6f565b949350505050565b604081526000611af56040830186886119d2565b8281036020840152611b0881858761190f565b979650505050505050565b6001600160a01b03929092168252602082015260400190565b60008060008060808587031215611b4257600080fd5b8435611b4d816115b4565b93506020850135611b5d816115b4565b92506040850135611b6d816115b4565b9396929550929360600135925050565b60208082526021908201527f4368696c644552433732315072656469636174653a204d494e545f4641494c456040820152601160fa1b606082015260800190565b634e487b7160e01b600052604160045260246000fd5b604051601f8201601f191681016001600160401b0381118282101715611bfc57611bfc611bbe565b604052919050565b60006001600160401b03821115611c1d57611c1d611bbe565b5060051b60200190565b600082601f830112611c3857600080fd5b81356020611c4d611c4883611c04565b611bd4565b82815260059290921b84018101918181019086841115611c6c57600080fd5b8286015b84811015611c875780358352918301918301611c70565b509695505050505050565b600080600080600060a08688031215611caa57600080fd5b85359450602080870135611cbd816115b4565b94506040870135611ccd816115b4565b935060608701356001600160401b0380821115611ce957600080fd5b818901915089601f830112611cfd57600080fd5b8135611d0b611c4882611c04565b81815260059190911b8301840190848101908c831115611d2a57600080fd5b938501935b82851015611d51578435611d42816115b4565b82529385019390850190611d2f565b965050506080890135925080831115611d6957600080fd5b5050611d7788828901611c27565b9150509295509295909350565b604080825283519082018190526000906020906060840190828701845b82811015611dc65781516001600160a01b031684529284019290840190600101611da1565b5050508381038285015284518082528583019183019060005b81811015611dfb57835183529284019291840191600101611ddf565b5090979650505050505050565b600082601f830112611e1957600080fd5b81356001600160401b03811115611e3257611e32611bbe565b611e45601f8201601f1916602001611bd4565b818152846020838601011115611e5a57600080fd5b816020850160208301376000918101602001919091529392505050565b60008060008060808587031215611e8d57600080fd5b843593506020850135611e9f816115b4565b925060408501356001600160401b0380821115611ebb57600080fd5b611ec788838901611e08565b93506060870135915080821115611edd57600080fd5b50611eea87828801611e08565b91505092959194509250565b6001600160a01b0384168152606060208201819052600090611f1a90830185611a6f565b8281036040840152611f2c8185611a6f565b969550505050505056fea26469706673582212208eba5121cb4876752d628bd2b54f4310ad4179b29208ae7a3ec4d01fd9c07df564736f6c63430008130033",
-                "balance": "0x0"
-            },
-            "0x0000000000000000000000000000000000001007": {
-                "code": "0x608060405234801561001057600080fd5b50600436106101155760003560e01c806357128683116100a2578063e619870511610071578063e619870514610278578063e985e9c514610289578063f242432a146102c5578063f399e22e146102d8578063f5298aca146102eb57600080fd5b8063571286831461022c5780636b20c4541461023f5780639b77ef1114610252578063a22cb4651461026557600080fd5b8063156e29f6116100e9578063156e29f6146101965780631f2d0065146101a95780632d0335ab146101ce5780632eb2c2d6146101f75780634e1273f41461020c57600080fd5b8062fdd58e1461011a57806301ffc9a7146101405780630c53c51c146101635780630e89341c14610183575b600080fd5b61012d610128366004611cee565b6102fe565b6040519081526020015b60405180910390f35b61015361014e366004611d2e565b610399565b6040519015158152602001610137565b610176610171366004611d93565b6103e9565b6040516101379190611e62565b610176610191366004611e75565b6106c7565b6101536101a4366004611e8e565b61075b565b609f546001600160a01b03165b6040516001600160a01b039091168152602001610137565b61012d6101dc366004611ec1565b6001600160a01b031660009081526006602052604090205490565b61020a610205366004612025565b6107ad565b005b61021f61021a3660046120ce565b61080b565b60405161013791906121d3565b61015361023a36600461222a565b610934565b61015361024d3660046122c3565b610a4f565b61020a610260366004611e75565b610af6565b61020a610273366004612343565b610b1d565b609e546001600160a01b03166101b6565b61015361029736600461237f565b6001600160a01b039182166000908152606d6020908152604080832093909416825291909152205460ff1690565b61020a6102d33660046123b2565b610b33565b61020a6102e6366004612416565b610b8a565b6101536102f9366004611e8e565b610d9e565b60006001600160a01b03831661036e5760405162461bcd60e51b815260206004820152602a60248201527f455243313135353a2061646472657373207a65726f206973206e6f742061207660448201526930b634b21037bbb732b960b11b60648201526084015b60405180910390fd5b506000818152606c602090815260408083206001600160a01b03861684529091529020545b92915050565b60006001600160e01b03198216636cdb3d1360e11b14806103ca57506001600160e01b031982166303a24d0760e21b145b8061039357506301ffc9a760e01b6001600160e01b0319831614610393565b6060600061042c87878080601f016020809104026020016040519081016040528093929190818152602001838380828437600092019190915250610dd692505050565b90506001600160e01b03196000358116908216036104b25760405162461bcd60e51b815260206004820152603d60248201527f66756e6374696f6e5369676e61747572652063616e206e6f74206265206f662060448201527f657865637574654d6574615472616e73616374696f6e206d6574686f640000006064820152608401610365565b604080516060810182526001600160a01b038a16600081815260066020908152848220548452808401929092528351601f8b0183900483028101830185528a815290938301918b908b9081908401838280828437600092019190915250505091525090506105238982888888610df1565b6105795760405162461bcd60e51b815260206004820152602160248201527f5369676e657220616e64207369676e617475726520646f206e6f74206d6174636044820152600d60fb1b6064820152608401610365565b600660008a6001600160a01b03166001600160a01b031681526020019081526020016000206000815460010191905081905550600080306001600160a01b03168a8a8d6040516020016105ce93929190612468565b60408051601f19818403018152908290526105e89161248e565b6000604051808303816000865af19150503d8060008114610625576040519150601f19603f3d011682016040523d82523d6000602084013e61062a565b606091505b50915091508161067c5760405162461bcd60e51b815260206004820152601c60248201527f46756e6374696f6e2063616c6c206e6f74207375636365737366756c000000006044820152606401610365565b7f5845892132946850460bff5a0083f71031bc5bf9aadcd40f1de79423eac9b10b8b338c8c6040516106b194939291906124aa565b60405180910390a19a9950505050505050505050565b6060606e80546106d6906124f6565b80601f0160208091040260200160405190810160405280929190818152602001828054610702906124f6565b801561074f5780601f106107245761010080835404028352916020019161074f565b820191906000526020600020905b81548152906001019060200180831161073257829003601f168201915b50505050509050919050565b609e546000906001600160a01b031633146107885760405162461bcd60e51b815260040161036590612530565b6107a384848460405180602001604052806000815250610ecd565b5060019392505050565b6107b5610fdc565b6001600160a01b0316856001600160a01b031614806107db57506107db85610297610fdc565b6107f75760405162461bcd60e51b815260040161036590612575565b6108048585858585610feb565b5050505050565b606081518351146108705760405162461bcd60e51b815260206004820152602960248201527f455243313135353a206163636f756e747320616e6420696473206c656e677468604482015268040dad2e6dac2e8c6d60bb1b6064820152608401610365565b600083516001600160401b0381111561088b5761088b611edc565b6040519080825280602002602001820160405280156108b4578160200160208202803683370190505b50905060005b845181101561092c576108ff8582815181106108d8576108d86125c3565b60200260200101518583815181106108f2576108f26125c3565b60200260200101516102fe565b828281518110610911576109116125c3565b6020908102919091010152610925816125ef565b90506108ba565b509392505050565b609e546000906001600160a01b031633146109615760405162461bcd60e51b815260040161036590612530565b85848114801561097057508083145b6109bc5760405162461bcd60e51b815260206004820181905260248201527f4368696c64455243313135353a206172726179206c656e206d69736d617463686044820152606401610365565b60005b81811015610a4057610a388989838181106109dc576109dc6125c3565b90506020020160208101906109f19190611ec1565b888884818110610a0357610a036125c3565b90506020020135878785818110610a1c57610a1c6125c3565b9050602002013560405180602001604052806000815250610ecd565b6001016109bf565b50600198975050505050505050565b609e546000906001600160a01b03163314610a7c5760405162461bcd60e51b815260040161036590612530565b610aea8686868080602002602001604051908101604052809392919081815260200183836020028082843760009201919091525050604080516020808a0282810182019093528982529093508992508891829185019084908082843760009201919091525061119592505050565b50600195945050505050565b3360009081526006602052604081208054839290610b15908490612608565b909155505050565b610b2f610b28610fdc565b838361132c565b5050565b610b3b610fdc565b6001600160a01b0316856001600160a01b03161480610b615750610b6185610297610fdc565b610b7d5760405162461bcd60e51b815260040161036590612575565b610804858585858561140c565b600754610100900460ff1615808015610baa5750600754600160ff909116105b80610bc45750303b158015610bc4575060075460ff166001145b610c275760405162461bcd60e51b815260206004820152602e60248201527f496e697469616c697a61626c653a20636f6e747261637420697320616c72656160448201526d191e481a5b9a5d1a585b1a5e995960921b6064820152608401610365565b6007805460ff191660011790558015610c4a576007805461ff0019166101001790555b6001600160a01b038416610ca05760405162461bcd60e51b815260206004820181905260248201527f4368696c64455243313135353a204241445f494e495449414c495a4154494f4e6044820152606401610365565b609f80546001600160a01b0386166001600160a01b031991821617909155609e805490911633179055604080516020601f8501819004810282018101909252838152610d0691859085908190840183828082843760009201919091525061153392505050565b610d52610d1b856001600160a01b0316611566565b604051602001610d2b919061261b565b60408051601f1981840301815282820190915260018252603160f81b60208301529061157c565b8015610d98576007805461ff0019169055604051600181527f7f26b83ff96e1f2b6a682f133852f6798a09c465da95921460cefb38474024989060200160405180910390a15b50505050565b609e546000906001600160a01b03163314610dcb5760405162461bcd60e51b815260040161036590612530565b6107a38484846115e8565b60008151600003610de957506000919050565b506020015190565b6000806001610e07610e02886116e8565b611765565b6040805160008152602081018083529290925260ff861690820152606081018790526080810186905260a0016020604051602081039080840390855afa158015610e55573d6000803e3d6000fd5b5050604051601f1901519150506001600160a01b038116610eac5760405162461bcd60e51b8152602060048201526011602482015270496e76616c6964207369676e617475726560781b6044820152606401610365565b866001600160a01b0316816001600160a01b03161491505095945050505050565b6001600160a01b038416610f2d5760405162461bcd60e51b815260206004820152602160248201527f455243313135353a206d696e7420746f20746865207a65726f206164647265736044820152607360f81b6064820152608401610365565b6000610f37610fdc565b90506000610f44856117b3565b90506000610f51856117b3565b90506000868152606c602090815260408083206001600160a01b038b16845290915281208054879290610f85908490612608565b909155505060408051878152602081018790526001600160a01b03808a169260009291871691600080516020612b0c833981519152910160405180910390a4610fd3836000898989896117fe565b50505050505050565b6000610fe6611959565b905090565b815183511461100c5760405162461bcd60e51b815260040161036590612650565b6001600160a01b0384166110325760405162461bcd60e51b815260040161036590612698565b600061103c610fdc565b905060005b845181101561112757600085828151811061105e5761105e6125c3565b60200260200101519050600085838151811061107c5761107c6125c3565b6020908102919091018101516000848152606c835260408082206001600160a01b038e1683529093529190912054909150818110156110cd5760405162461bcd60e51b8152600401610365906126dd565b6000838152606c602090815260408083206001600160a01b038e8116855292528083208585039055908b1682528120805484929061110c908490612608565b9250508190555050505080611120906125ef565b9050611041565b50846001600160a01b0316866001600160a01b0316826001600160a01b03167f4a39dc06d4c0dbc64b70af90fd698a233a518aa5d07e595d983b8c0526c8f7fb8787604051611177929190612727565b60405180910390a461118d8187878787876119b5565b505050505050565b6001600160a01b0383166111bb5760405162461bcd60e51b815260040161036590612755565b80518251146111dc5760405162461bcd60e51b815260040161036590612650565b60006111e6610fdc565b604080516020810190915260009052905060005b83518110156112bf576000848281518110611217576112176125c3565b602002602001015190506000848381518110611235576112356125c3565b6020908102919091018101516000848152606c835260408082206001600160a01b038c1683529093529190912054909150818110156112865760405162461bcd60e51b815260040161036590612798565b6000928352606c602090815260408085206001600160a01b038b16865290915290922091039055806112b7816125ef565b9150506111fa565b5060006001600160a01b0316846001600160a01b0316826001600160a01b03167f4a39dc06d4c0dbc64b70af90fd698a233a518aa5d07e595d983b8c0526c8f7fb8686604051611310929190612727565b60405180910390a4604080516020810190915260009052610d98565b816001600160a01b0316836001600160a01b03160361139f5760405162461bcd60e51b815260206004820152602960248201527f455243313135353a2073657474696e6720617070726f76616c20737461747573604482015268103337b91039b2b63360b91b6064820152608401610365565b6001600160a01b038381166000818152606d6020908152604080832094871680845294825291829020805460ff191686151590811790915591519182527f17307eab39ab6107e8899845ad3d59bd9653f200f220920489ca2b5937696c31910160405180910390a3505050565b6001600160a01b0384166114325760405162461bcd60e51b815260040161036590612698565b600061143c610fdc565b90506000611449856117b3565b90506000611456856117b3565b90506000868152606c602090815260408083206001600160a01b038c1684529091529020548581101561149b5760405162461bcd60e51b8152600401610365906126dd565b6000878152606c602090815260408083206001600160a01b038d8116855292528083208985039055908a168252812080548892906114da908490612608565b909155505060408051888152602081018890526001600160a01b03808b16928c82169291881691600080516020612b0c833981519152910160405180910390a4611528848a8a8a8a8a6117fe565b505050505050505050565b600754610100900460ff1661155a5760405162461bcd60e51b8152600401610365906127dc565b61156381611a70565b50565b60606103936001600160a01b0383166014611aa0565b815160208084019190912082519183019190912060038290556004819055466001557f8b73c3c69bb8fe3d512ecc4cf759cc79239f7b179b0ffacaa9a75d522b39400f6115ca818484611c42565b600055600280546001600160a01b0319163017905560055550505050565b6001600160a01b03831661160e5760405162461bcd60e51b815260040161036590612755565b6000611618610fdc565b90506000611625846117b3565b90506000611632846117b3565b6040805160208082018352600091829052888252606c81528282206001600160a01b038b16835290522054909150848110156116805760405162461bcd60e51b815260040161036590612798565b6000868152606c602090815260408083206001600160a01b038b81168086529184528285208a8703905582518b81529384018a9052909290881691600080516020612b0c833981519152910160405180910390a4604080516020810190915260009052610fd3565b6000604051806080016040528060438152602001612b2c6043913980516020918201208351848301516040808701518051908601209051611748950193845260208401929092526001600160a01b03166040830152606082015260800190565b604051602081830303815290604052805190602001209050919050565b6000610393611772611c8b565b8360405161190160f01b6020820152602281018390526042810182905260009060620160405160208183030381529060405280519060200120905092915050565b604080516001808252818301909252606091600091906020808301908036833701905050905082816000815181106117ed576117ed6125c3565b602090810291909101015292915050565b6001600160a01b0384163b1561118d5760405163f23a6e6160e01b81526001600160a01b0385169063f23a6e61906118429089908990889088908890600401612827565b6020604051808303816000875af192505050801561187d575060408051601f3d908101601f1916820190925261187a9181019061286c565b60015b61192957611889612889565b806308c379a0036118c2575061189d6128a4565b806118a857506118c4565b8060405162461bcd60e51b81526004016103659190611e62565b505b60405162461bcd60e51b815260206004820152603460248201527f455243313135353a207472616e7366657220746f206e6f6e2d455243313135356044820152732932b1b2b4bb32b91034b6b83632b6b2b73a32b960611b6064820152608401610365565b6001600160e01b0319811663f23a6e6160e01b14610fd35760405162461bcd60e51b81526004016103659061292d565b60003033036119af57600080368080601f0160208091040260200160405190810160405280939291908181526020018383808284376000920191909152505050503601516001600160a01b031691506119b29050565b50335b90565b6001600160a01b0384163b1561118d5760405163bc197c8160e01b81526001600160a01b0385169063bc197c81906119f99089908990889088908890600401612975565b6020604051808303816000875af1925050508015611a34575060408051601f3d908101601f19168201909252611a319181019061286c565b60015b611a4057611889612889565b6001600160e01b0319811663bc197c8160e01b14610fd35760405162461bcd60e51b81526004016103659061292d565b600754610100900460ff16611a975760405162461bcd60e51b8152600401610365906127dc565b61156381611cc6565b60606000611aaf8360026129d3565b611aba906002612608565b6001600160401b03811115611ad157611ad1611edc565b6040519080825280601f01601f191660200182016040528015611afb576020820181803683370190505b509050600360fc1b81600081518110611b1657611b166125c3565b60200101906001600160f81b031916908160001a905350600f60fb1b81600181518110611b4557611b456125c3565b60200101906001600160f81b031916908160001a9053506000611b698460026129d3565b611b74906001612608565b90505b6001811115611bec576f181899199a1a9b1b9c1cb0b131b232b360811b85600f1660108110611ba857611ba86125c3565b1a60f81b828281518110611bbe57611bbe6125c3565b60200101906001600160f81b031916908160001a90535060049490941c93611be5816129ea565b9050611b77565b508315611c3b5760405162461bcd60e51b815260206004820181905260248201527f537472696e67733a20686578206c656e67746820696e73756666696369656e746044820152606401610365565b9392505050565b6040805160208101859052908101839052606081018290524660808201523060a082015260009060c0016040516020818303038152906040528051906020012090509392505050565b6002546000906001600160a01b031630148015611ca9575060015446145b15611cb5575060005490565b610fe6600554600354600454611c42565b606e610b2f8282612a4c565b80356001600160a01b0381168114611ce957600080fd5b919050565b60008060408385031215611d0157600080fd5b611d0a83611cd2565b946020939093013593505050565b6001600160e01b03198116811461156357600080fd5b600060208284031215611d4057600080fd5b8135611c3b81611d18565b60008083601f840112611d5d57600080fd5b5081356001600160401b03811115611d7457600080fd5b602083019150836020828501011115611d8c57600080fd5b9250929050565b60008060008060008060a08789031215611dac57600080fd5b611db587611cd2565b955060208701356001600160401b03811115611dd057600080fd5b611ddc89828a01611d4b565b9096509450506040870135925060608701359150608087013560ff81168114611e0457600080fd5b809150509295509295509295565b60005b83811015611e2d578181015183820152602001611e15565b50506000910152565b60008151808452611e4e816020860160208601611e12565b601f01601f19169290920160200192915050565b602081526000611c3b6020830184611e36565b600060208284031215611e8757600080fd5b5035919050565b600080600060608486031215611ea357600080fd5b611eac84611cd2565b95602085013595506040909401359392505050565b600060208284031215611ed357600080fd5b611c3b82611cd2565b634e487b7160e01b600052604160045260246000fd5b601f8201601f191681016001600160401b0381118282101715611f1757611f17611edc565b6040525050565b60006001600160401b03821115611f3757611f37611edc565b5060051b60200190565b600082601f830112611f5257600080fd5b81356020611f5f82611f1e565b604051611f6c8282611ef2565b83815260059390931b8501820192828101915086841115611f8c57600080fd5b8286015b84811015611fa75780358352918301918301611f90565b509695505050505050565b600082601f830112611fc357600080fd5b81356001600160401b03811115611fdc57611fdc611edc565b604051611ff3601f8301601f191660200182611ef2565b81815284602083860101111561200857600080fd5b816020850160208301376000918101602001919091529392505050565b600080600080600060a0868803121561203d57600080fd5b61204686611cd2565b945061205460208701611cd2565b935060408601356001600160401b038082111561207057600080fd5b61207c89838a01611f41565b9450606088013591508082111561209257600080fd5b61209e89838a01611f41565b935060808801359150808211156120b457600080fd5b506120c188828901611fb2565b9150509295509295909350565b600080604083850312156120e157600080fd5b82356001600160401b03808211156120f857600080fd5b818501915085601f83011261210c57600080fd5b8135602061211982611f1e565b6040516121268282611ef2565b83815260059390931b850182019282810191508984111561214657600080fd5b948201945b8386101561216b5761215c86611cd2565b8252948201949082019061214b565b9650508601359250508082111561218157600080fd5b5061218e85828601611f41565b9150509250929050565b600081518084526020808501945080840160005b838110156121c8578151875295820195908201906001016121ac565b509495945050505050565b602081526000611c3b6020830184612198565b60008083601f8401126121f857600080fd5b5081356001600160401b0381111561220f57600080fd5b6020830191508360208260051b8501011115611d8c57600080fd5b6000806000806000806060878903121561224357600080fd5b86356001600160401b038082111561225a57600080fd5b6122668a838b016121e6565b9098509650602089013591508082111561227f57600080fd5b61228b8a838b016121e6565b909650945060408901359150808211156122a457600080fd5b506122b189828a016121e6565b979a9699509497509295939492505050565b6000806000806000606086880312156122db57600080fd5b6122e486611cd2565b945060208601356001600160401b038082111561230057600080fd5b61230c89838a016121e6565b9096509450604088013591508082111561232557600080fd5b50612332888289016121e6565b969995985093965092949392505050565b6000806040838503121561235657600080fd5b61235f83611cd2565b91506020830135801515811461237457600080fd5b809150509250929050565b6000806040838503121561239257600080fd5b61239b83611cd2565b91506123a960208401611cd2565b90509250929050565b600080600080600060a086880312156123ca57600080fd5b6123d386611cd2565b94506123e160208701611cd2565b9350604086013592506060860135915060808601356001600160401b0381111561240a57600080fd5b6120c188828901611fb2565b60008060006040848603121561242b57600080fd5b61243484611cd2565b925060208401356001600160401b0381111561244f57600080fd5b61245b86828701611d4b565b9497909650939450505050565b8284823760609190911b6bffffffffffffffffffffffff19169101908152601401919050565b600082516124a0818460208701611e12565b9190910192915050565b6001600160a01b0385811682528416602082015260606040820181905281018290526000828460808401376000608084840101526080601f19601f850116830101905095945050505050565b600181811c9082168061250a57607f821691505b60208210810361252a57634e487b7160e01b600052602260045260246000fd5b50919050565b60208082526025908201527f4368696c64455243313135353a204f6e6c79207072656469636174652063616e6040820152640818d85b1b60da1b606082015260800190565b6020808252602e908201527f455243313135353a2063616c6c6572206973206e6f7420746f6b656e206f776e60408201526d195c881bdc88185c1c1c9bdd995960921b606082015260800190565b634e487b7160e01b600052603260045260246000fd5b634e487b7160e01b600052601160045260246000fd5b600060018201612601576126016125d9565b5060010190565b80820180821115610393576103936125d9565b6c4368696c64455243313135352d60981b81526000825161264381600d850160208701611e12565b91909101600d0192915050565b60208082526028908201527f455243313135353a2069647320616e6420616d6f756e7473206c656e677468206040820152670dad2e6dac2e8c6d60c31b606082015260800190565b60208082526025908201527f455243313135353a207472616e7366657220746f20746865207a65726f206164604082015264647265737360d81b606082015260800190565b6020808252602a908201527f455243313135353a20696e73756666696369656e742062616c616e636520666f60408201526939103a3930b739b332b960b11b606082015260800190565b60408152600061273a6040830185612198565b828103602084015261274c8185612198565b95945050505050565b60208082526023908201527f455243313135353a206275726e2066726f6d20746865207a65726f206164647260408201526265737360e81b606082015260800190565b60208082526024908201527f455243313135353a206275726e20616d6f756e7420657863656564732062616c604082015263616e636560e01b606082015260800190565b6020808252602b908201527f496e697469616c697a61626c653a20636f6e7472616374206973206e6f74206960408201526a6e697469616c697a696e6760a81b606082015260800190565b6001600160a01b03868116825285166020820152604081018490526060810183905260a06080820181905260009061286190830184611e36565b979650505050505050565b60006020828403121561287e57600080fd5b8151611c3b81611d18565b600060033d11156119b25760046000803e5060005160e01c90565b600060443d10156128b25790565b6040516003193d81016004833e81513d6001600160401b0381602484011181841117156128e157505050505090565b82850191508151818111156128f95750505050505090565b843d87010160208285010111156129135750505050505090565b61292260208286010187611ef2565b509095945050505050565b60208082526028908201527f455243313135353a204552433131353552656365697665722072656a656374656040820152676420746f6b656e7360c01b606082015260800190565b6001600160a01b0386811682528516602082015260a0604082018190526000906129a190830186612198565b82810360608401526129b38186612198565b905082810360808401526129c78185611e36565b98975050505050505050565b8082028115828204841417610393576103936125d9565b6000816129f9576129f96125d9565b506000190190565b601f821115612a4757600081815260208120601f850160051c81016020861015612a285750805b601f850160051c820191505b8181101561118d57828155600101612a34565b505050565b81516001600160401b03811115612a6557612a65611edc565b612a7981612a7384546124f6565b84612a01565b602080601f831160018114612aae5760008415612a965750858301515b600019600386901b1c1916600185901b17855561118d565b600085815260208120601f198616915b82811015612add57888601518255948401946001909101908401612abe565b5085821015612afb5787850151600019600388901b60f8161c191681555b5050505050600190811b0190555056fec3d58168c5ae7397731d063d5bbf3d657854427343f4c083240f7aacaa2d0f624d6574615472616e73616374696f6e2875696e74323536206e6f6e63652c616464726573732066726f6d2c62797465732066756e6374696f6e5369676e617475726529a2646970667358221220cf72cc6dfec7557a549ae9a9c0f6f7dbddd3c040da94b9a82892a238de95698864736f6c63430008130033",
-                "balance": "0x0"
-            },
-            "0x0000000000000000000000000000000000001008": {
-                "code": "0x608060405234801561001057600080fd5b50600436106101375760003560e01c8063b1768065116100b8578063d41f17711161007c578063d41f177114610298578063d7c9e3ec146102bf578063e0563ab1146102e6578063eeb49945146102ef578063f645125514610302578063f8c8765e1461032957600080fd5b8063b176806514610211578063b5c5f67214610238578063b68ad1e41461024b578063b8cd3ec01461025e578063c5ac2b1c1461027157600080fd5b806351351d53116100ff57806351351d53146101a45780637efab4f5146101b257806386937eb4146101db578063947287cf146101f057806397e5230d1461020757600080fd5b8063051eb2e21461013c57806305dc2e8f1461016c5780631bc114ba1461017f578063284017f5146101925780633b878c221461019b575b600080fd5b60355461014f906001600160a01b031681565b6040516001600160a01b0390911681526020015b60405180910390f35b60345461014f906001600160a01b031681565b60335461014f906001600160a01b031681565b61014f61202081565b61014f61101081565b61014f6002600160a01b0381565b61014f6101c03660046115f0565b6037602052600090815260409020546001600160a01b031681565b6101ee6101e936600461165f565b61033c565b005b6101f961520881565b604051908152602001610163565b6101f9620249f081565b6101f97f7a8dc26796a1e50e6e190b70259f58f6a4edd5b22280ceecc82b687b8e98286981565b6101ee61024636600461170b565b610354565b60365461014f906001600160a01b031681565b6101ee61026c366004611740565b610365565b6101f97faf50c8eab81226bc79eee3a10e3fe25db1a2be7241130e392b0675df839b6d1881565b6101f97f87a7811f4bfedea3d341ad165680ae306b01aaeacc205d227629cf157dd9f82181565b6101f97f5fb452c5a8f2b7c7ef2984e2f1063c7ee9b80b110cdc98ccb98f6654e10b5ed281565b61014f61203081565b6101ee6102fd366004611786565b610377565b6101f97f2cef46a936bdc5b7e6e8c71aa04560c41cf7d88bb26901a7e7f4936ff02accad81565b6101ee61033736600461180e565b610597565b61034b878787878787876107d8565b50505050505050565b61036083338484610b57565b505050565b61037184848484610b57565b50505050565b6034546001600160a01b031633146103e95760405162461bcd60e51b815260206004820152602a60248201527f4368696c64455243313135355072656469636174653a204f4e4c595f5354415460448201526922afa922a1a2a4ab22a960b11b60648201526084015b60405180910390fd5b6035546001600160a01b038481169116146104595760405162461bcd60e51b815260206004820152602a60248201527f4368696c64455243313135355072656469636174653a204f4e4c595f524f4f546044820152695f50524544494341544560b01b60648201526084016103e0565b7f87a7811f4bfedea3d341ad165680ae306b01aaeacc205d227629cf157dd9f82161048860206000848661186a565b61049191611894565b036104b0576104ab6104a6826020818661186a565b610e6c565b610371565b7faf50c8eab81226bc79eee3a10e3fe25db1a2be7241130e392b0675df839b6d186104df60206000848661186a565b6104e891611894565b036104f7576104ab82826110d7565b7f2cef46a936bdc5b7e6e8c71aa04560c41cf7d88bb26901a7e7f4936ff02accad61052660206000848661186a565b61052f91611894565b0361053e576104ab8282611344565b60405162461bcd60e51b815260206004820152602860248201527f4368696c64455243313135355072656469636174653a20494e56414c49445f5360448201526749474e415455524560c01b60648201526084016103e0565b336002600160a01b03146105db5760405163973d02cb60e01b815260206004820152600a60248201526914d654d5115350d0531360b21b60448201526064016103e0565b600054610100900460ff16158080156105fb5750600054600160ff909116105b806106155750303b158015610615575060005460ff166001145b6106785760405162461bcd60e51b815260206004820152602e60248201527f496e697469616c697a61626c653a20636f6e747261637420697320616c72656160448201526d191e481a5b9a5d1a585b1a5e995960921b60648201526084016103e0565b6000805460ff19166001179055801561069b576000805461ff0019166101001790555b6001600160a01b038516158015906106bb57506001600160a01b03841615155b80156106cf57506001600160a01b03831615155b80156106e357506001600160a01b03821615155b6107415760405162461bcd60e51b815260206004820152602960248201527f4368696c64455243313135355072656469636174653a204241445f494e49544960448201526820a624ad20aa24a7a760b91b60648201526084016103e0565b603380546001600160a01b038088166001600160a01b0319928316179092556034805487841690831617905560358054868416908316179055603680549285169290911691909117905580156107d1576000805461ff0019169055604051600181527f7f26b83ff96e1f2b6a682f133852f6798a09c465da95921460cefb38474024989060200160405180910390a15b5050505050565b866107e2816114ac565b6107fe5760405162461bcd60e51b81526004016103e0906118b2565b6000886001600160a01b0316631f2d00656040518163ffffffff1660e01b8152600401602060405180830381865afa15801561083e573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061086291906118f5565b6001600160a01b038181166000908152603760205260409020549192508a81169116146108a15760405162461bcd60e51b81526004016103e090611912565b6001600160a01b0381166108b7576108b7611957565b306001600160a01b0316896001600160a01b031663e61987056040518163ffffffff1660e01b8152600401602060405180830381865afa1580156108ff573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061092391906118f5565b6001600160a01b03161461093957610939611957565b868514801561094757508483145b6109a15760405162461bcd60e51b815260206004820152602560248201527f4368696c64455243313135355072656469636174653a20494e56414c49445f4c60448201526408a9c8ea8960db1b60648201526084016103e0565b604051631ac8311560e21b81526001600160a01b038a1690636b20c454906109d59033908a908a908a908a9060040161199f565b6020604051808303816000875af11580156109f4573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610a1891906119e3565b610a345760405162461bcd60e51b81526004016103e090611a05565b6033546035546040516001600160a01b03928316926316f19831921690610a8f907f5fb452c5a8f2b7c7ef2984e2f1063c7ee9b80b110cdc98ccb98f6654e10b5ed290869033908f908f908f908f908f908f90602001611a90565b6040516020818303038152906040526040518363ffffffff1660e01b8152600401610abb929190611b41565b600060405180830381600087803b158015610ad557600080fd5b505af1158015610ae9573d6000803e3d6000fd5b50505050336001600160a01b0316896001600160a01b0316826001600160a01b03167f7a10660242ca367951ff3777cdb3c2a761e3ccad204bac118501e24693f3683d8b8b8b8b8b8b604051610b4496959493929190611b6d565b60405180910390a4505050505050505050565b83610b61816114ac565b610b7d5760405162461bcd60e51b81526004016103e0906118b2565b6000856001600160a01b0316631f2d00656040518163ffffffff1660e01b8152600401602060405180830381865afa158015610bbd573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610be191906118f5565b6001600160a01b03818116600090815260376020526040902054919250878116911614610c205760405162461bcd60e51b81526004016103e090611912565b6001600160a01b038116610c3657610c36611957565b306001600160a01b0316866001600160a01b031663e61987056040518163ffffffff1660e01b8152600401602060405180830381865afa158015610c7e573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610ca291906118f5565b6001600160a01b031614610cb857610cb8611957565b604051637a94c56560e11b81526001600160a01b0387169063f5298aca90610ce890339088908890600401611bb6565b6020604051808303816000875af1158015610d07573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610d2b91906119e3565b610d475760405162461bcd60e51b81526004016103e090611a05565b603354603554604080517f7a8dc26796a1e50e6e190b70259f58f6a4edd5b22280ceecc82b687b8e98286960208201526001600160a01b0385811682840152336060830152898116608083015260a0820189905260c08083018990528351808403909101815260e08301938490526316f1983160e01b909352938416936316f1983193610dd99391169160e401611b41565b600060405180830381600087803b158015610df357600080fd5b505af1158015610e07573d6000803e3d6000fd5b50505050846001600160a01b0316866001600160a01b0316826001600160a01b03167f2ca9093e8b5356801039806c6a08003e5b7013fb8ae48f720fc90fc1c1a8bec2338888604051610e5c93929190611bb6565b60405180910390a4505050505050565b600080808080610e7e86880188611bd7565b6001600160a01b03808616600090815260376020526040902054959a50939850919650945092501680610ec35760405162461bcd60e51b81526004016103e090611912565b610ecc816114ac565b610ed857610ed8611957565b6000816001600160a01b0316631f2d00656040518163ffffffff1660e01b8152600401602060405180830381865afa158015610f18573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610f3c91906118f5565b9050866001600160a01b0316816001600160a01b031614610f5f57610f5f611957565b6001600160a01b038116610f7557610f75611957565b306001600160a01b0316826001600160a01b031663e61987056040518163ffffffff1660e01b8152600401602060405180830381865afa158015610fbd573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610fe191906118f5565b6001600160a01b031614610ff757610ff7611957565b604051630ab714fb60e11b81526001600160a01b0383169063156e29f69061102790889088908890600401611bb6565b6020604051808303816000875af1158015611046573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061106a91906119e3565b6110865760405162461bcd60e51b81526004016103e090611c32565b846001600160a01b0316826001600160a01b0316886001600160a01b03167f2930d932c1cccd6add2e0e2d706ede9015db8a194405f2a3e1783703515e104f898888604051610b4493929190611bb6565b6000808080806110e986880188611d48565b6001600160a01b03808616600090815260376020526040902054959b5093995091975095509350169050806111305760405162461bcd60e51b81526004016103e090611912565b611139816114ac565b61114557611145611957565b6000816001600160a01b0316631f2d00656040518163ffffffff1660e01b8152600401602060405180830381865afa158015611185573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906111a991906118f5565b9050866001600160a01b0316816001600160a01b0316146111cc576111cc611957565b6001600160a01b0381166111e2576111e2611957565b306001600160a01b0316826001600160a01b031663e61987056040518163ffffffff1660e01b8152600401602060405180830381865afa15801561122a573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061124e91906118f5565b6001600160a01b03161461126457611264611957565b604051635712868360e01b81526001600160a01b0383169063571286839061129490889088908890600401611e8d565b6020604051808303816000875af11580156112b3573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906112d791906119e3565b6112f35760405162461bcd60e51b81526004016103e090611c32565b856001600160a01b0316826001600160a01b0316886001600160a01b03167f17304b99f8dfa5a2b8dd5695d82f9947c2abfbc9cb64bab610b9a1a0feadb9a0888888604051610b4493929190611e8d565b60008061135383850185611f02565b9093509150506001600160a01b03821661136f5761136f611957565b6001600160a01b03828116600090815260376020526040902054161561139757611397611957565b6036546040516bffffffffffffffffffffffff19606085901b1660208201526000916113e7916001600160a01b039091169060340160405160208183030381529060405280519060200120611541565b6001600160a01b038481166000908152603760205260409081902080546001600160a01b0319169284169283179055516379ccf11760e11b81529192509063f399e22e9061143b9086908690600401611b41565b600060405180830381600087803b15801561145557600080fd5b505af1158015611469573d6000803e3d6000fd5b50506040516001600160a01b038085169350861691507f46bd56f98e1b14fd35691959270a6e1edf7cb8fcd489e0f9dda89e46c0d1ff0d90600090a35050505050565b6000816001600160a01b03163b6000036114c857506000919050565b6040516301ffc9a760e01b8152636cdb3d1360e11b60048201526001600160a01b038316906301ffc9a790602401602060405180830381865afa92505050801561152f575060408051601f3d908101601f1916820190925261152c918101906119e3565b60015b61153b57506000919050565b92915050565b6000763d602d80600a3d3981f3363d3d373d3d3d363d730000008360601b60e81c176000526e5af43d82803e903d91602b57fd5bf38360781b1760205281603760096000f590506001600160a01b03811661153b5760405162461bcd60e51b8152602060048201526017602482015276115490cc4c4d8dce8818dc99585d194c8819985a5b1959604a1b60448201526064016103e0565b6001600160a01b03811681146115ed57600080fd5b50565b60006020828403121561160257600080fd5b813561160d816115d8565b9392505050565b60008083601f84011261162657600080fd5b5081356001600160401b0381111561163d57600080fd5b6020830191508360208260051b850101111561165857600080fd5b9250929050565b60008060008060008060006080888a03121561167a57600080fd5b8735611685816115d8565b965060208801356001600160401b03808211156116a157600080fd5b6116ad8b838c01611614565b909850965060408a01359150808211156116c657600080fd5b6116d28b838c01611614565b909650945060608a01359150808211156116eb57600080fd5b506116f88a828b01611614565b989b979a50959850939692959293505050565b60008060006060848603121561172057600080fd5b833561172b816115d8565b95602085013595506040909401359392505050565b6000806000806080858703121561175657600080fd5b8435611761816115d8565b93506020850135611771816115d8565b93969395505050506040820135916060013590565b6000806000806060858703121561179c57600080fd5b8435935060208501356117ae816115d8565b925060408501356001600160401b03808211156117ca57600080fd5b818701915087601f8301126117de57600080fd5b8135818111156117ed57600080fd5b8860208285010111156117ff57600080fd5b95989497505060200194505050565b6000806000806080858703121561182457600080fd5b843561182f816115d8565b9350602085013561183f816115d8565b9250604085013561184f816115d8565b9150606085013561185f816115d8565b939692955090935050565b6000808585111561187a57600080fd5b8386111561188757600080fd5b5050820193919092039150565b8035602083101561153b57600019602084900360031b1b1692915050565b60208082526023908201527f4368696c64455243313135355072656469636174653a204e4f545f434f4e54526040820152621050d560ea1b606082015260800190565b60006020828403121561190757600080fd5b815161160d816115d8565b60208082526025908201527f4368696c64455243313135355072656469636174653a20554e4d41505045445f6040820152642a27a5a2a760d91b606082015260800190565b634e487b7160e01b600052600160045260246000fd5b81835260006001600160fb1b0383111561198657600080fd5b8260051b80836020870137939093016020019392505050565b6001600160a01b03861681526060602082018190526000906119c4908301868861196d565b82810360408401526119d781858761196d565b98975050505050505050565b6000602082840312156119f557600080fd5b8151801515811461160d57600080fd5b60208082526022908201527f4368696c64455243313135355072656469636174653a204255524e5f4641494c604082015261115160f21b606082015260800190565b8183526000602080850194508260005b85811015611a85578135611a6a816115d8565b6001600160a01b031687529582019590820190600101611a57565b509495945050505050565b8981526001600160a01b0389811660208301528816604082015260c060608201819052600090611ac3908301888a611a47565b8281036080840152611ad681878961196d565b905082810360a0840152611aeb81858761196d565b9c9b505050505050505050505050565b6000815180845260005b81811015611b2157602081850181015186830182015201611b05565b506000602082860101526020601f19601f83011685010191505092915050565b6001600160a01b0383168152604060208201819052600090611b6590830184611afb565b949350505050565b606081526000611b8160608301888a611a47565b8281036020840152611b9481878961196d565b90508281036040840152611ba981858761196d565b9998505050505050505050565b6001600160a01b039390931683526020830191909152604082015260600190565b600080600080600060a08688031215611bef57600080fd5b8535611bfa816115d8565b94506020860135611c0a816115d8565b93506040860135611c1a816115d8565b94979396509394606081013594506080013592915050565b60208082526022908201527f4368696c64455243313135355072656469636174653a204d494e545f4641494c604082015261115160f21b606082015260800190565b634e487b7160e01b600052604160045260246000fd5b604051601f8201601f191681016001600160401b0381118282101715611cb257611cb2611c74565b604052919050565b60006001600160401b03821115611cd357611cd3611c74565b5060051b60200190565b600082601f830112611cee57600080fd5b81356020611d03611cfe83611cba565b611c8a565b82815260059290921b84018101918181019086841115611d2257600080fd5b8286015b84811015611d3d5780358352918301918301611d26565b509695505050505050565b60008060008060008060c08789031215611d6157600080fd5b86359550602080880135611d74816115d8565b95506040880135611d84816115d8565b945060608801356001600160401b0380821115611da057600080fd5b818a0191508a601f830112611db457600080fd5b8135611dc2611cfe82611cba565b81815260059190911b8301840190848101908d831115611de157600080fd5b938501935b82851015611e08578435611df9816115d8565b82529385019390850190611de6565b9750505060808a0135925080831115611e2057600080fd5b611e2c8b848c01611cdd565b945060a08a0135925080831115611e4257600080fd5b5050611e5089828a01611cdd565b9150509295509295509295565b600081518084526020808501945080840160005b83811015611a8557815187529582019590820190600101611e71565b606080825284519082018190526000906020906080840190828801845b82811015611ecf5781516001600160a01b031684529284019290840190600101611eaa565b50505083810382850152611ee38187611e5d565b9150508281036040840152611ef88185611e5d565b9695505050505050565b600080600060608486031215611f1757600080fd5b83359250602080850135611f2a816115d8565b925060408501356001600160401b0380821115611f4657600080fd5b818701915087601f830112611f5a57600080fd5b813581811115611f6c57611f6c611c74565b611f7e601f8201601f19168501611c8a565b91508082528884828501011115611f9457600080fd5b8084840185840137600084828401015250809350505050925092509256fea26469706673582212200c4c5c9b53a533081213342cd86f6dcc2549159a1a5ec39ac85621bb137a4c8f64736f6c63430008130033",
-                "balance": "0x0"
-            },
-            "0x0000000000000000000000000000000000001010": {
-                "code": "0x608060405234801561001057600080fd5b50600436106101425760003560e01c806370a08231116100b85780639dc29fac1161007c5780639dc29fac14610278578063a457c2d71461028b578063a9059cbb1461029e578063dd62ed3e146102b1578063e0563ab1146102c4578063e6198705146102cd57600080fd5b806370a082311461022d5780638420ce9914610248578063947287cf1461025d57806395d89b411461026657806397e5230d1461026e57600080fd5b8063284017f51161010a578063284017f5146101d2578063313ce567146101db57806339509351146101f05780633b878c221461020357806340c10f191461020c57806351351d531461021f57600080fd5b806306fdde0314610147578063095ea7b31461016557806318160ddd146101885780631f2d00651461019a57806323b872dd146101bf575b600080fd5b61014f6102de565b60405161015c9190610cfd565b60405180910390f35b610178610173366004610d4c565b610370565b604051901515815260200161015c565b6034545b60405190815260200161015c565b6036546001600160a01b03165b6040516001600160a01b03909116815260200161015c565b6101786101cd366004610d76565b61038a565b6101a761202081565b60395460405160ff909116815260200161015c565b6101786101fe366004610d4c565b6103ae565b6101a761101081565b61017861021a366004610d4c565b6103d0565b6101a76002600160a01b0381565b61018c61023b366004610db2565b6001600160a01b03163190565b61025b610256366004610e1d565b610419565b005b61018c61520881565b61014f6105c8565b61018c620249f081565b610178610286366004610d4c565b6105d7565b610178610299366004610d4c565b61060e565b6101786102ac366004610d4c565b610689565b61018c6102bf366004610ec8565b610697565b6101a761203081565b6035546001600160a01b03166101a7565b6060603780546102ed90610efb565b80601f016020809104026020016040519081016040528092919081815260200182805461031990610efb565b80156103665780601f1061033b57610100808354040283529160200191610366565b820191906000526020600020905b81548152906001019060200180831161034957829003601f168201915b5050505050905090565b60003361037e8185856106c2565b60019150505b92915050565b6000336103988582856107e6565b6103a3858585610860565b506001949350505050565b60003361037e8185856103c18383610697565b6103cb9190610f4b565b6106c2565b6035546000906001600160a01b031633146104065760405162461bcd60e51b81526004016103fd90610f5e565b60405180910390fd5b6104108383610a25565b50600192915050565b600054610100900460ff16158080156104395750600054600160ff909116105b806104535750303b158015610453575060005460ff166001145b6104b65760405162461bcd60e51b815260206004820152602e60248201527f496e697469616c697a61626c653a20636f6e747261637420697320616c72656160448201526d191e481a5b9a5d1a585b1a5e995960921b60648201526084016103fd565b6000805460ff1916600117905580156104d9576000805461ff0019166101001790555b336002600160a01b031461051d5760405163973d02cb60e01b815260206004820152600a60248201526914d654d5115350d0531360b21b60448201526064016103fd565b603580546001600160a01b03808b166001600160a01b03199283161790925560368054928a1692909116919091179055603761055a868883611007565b506038610568848683611007565b506039805460ff191660ff841617905580156105be576000805461ff0019169055604051600181527f7f26b83ff96e1f2b6a682f133852f6798a09c465da95921460cefb38474024989060200160405180910390a15b5050505050505050565b6060603880546102ed90610efb565b6035546000906001600160a01b031633146106045760405162461bcd60e51b81526004016103fd90610f5e565b6104108383610b7f565b6000338161061c8286610697565b90508381101561067c5760405162461bcd60e51b815260206004820152602560248201527f45524332303a2064656372656173656420616c6c6f77616e63652062656c6f77604482015264207a65726f60d81b60648201526084016103fd565b6103a382868684036106c2565b60003361037e818585610860565b6001600160a01b03918216600090815260336020908152604080832093909416825291909152205490565b6001600160a01b0383166107245760405162461bcd60e51b8152602060048201526024808201527f45524332303a20617070726f76652066726f6d20746865207a65726f206164646044820152637265737360e01b60648201526084016103fd565b6001600160a01b0382166107855760405162461bcd60e51b815260206004820152602260248201527f45524332303a20617070726f766520746f20746865207a65726f206164647265604482015261737360f01b60648201526084016103fd565b6001600160a01b0383811660008181526033602090815260408083209487168084529482529182902085905590518481527f8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b925910160405180910390a3505050565b60006107f28484610697565b9050600019811461085a578181101561084d5760405162461bcd60e51b815260206004820152601d60248201527f45524332303a20696e73756666696369656e7420616c6c6f77616e636500000060448201526064016103fd565b61085a84848484036106c2565b50505050565b6001600160a01b0383166108c45760405162461bcd60e51b815260206004820152602560248201527f45524332303a207472616e736665722066726f6d20746865207a65726f206164604482015264647265737360d81b60648201526084016103fd565b6001600160a01b0382166109265760405162461bcd60e51b815260206004820152602360248201527f45524332303a207472616e7366657220746f20746865207a65726f206164647260448201526265737360e81b60648201526084016103fd565b6000806120206001600160a01b031685858560405160200161094a939291906110c8565b60408051601f1981840301815290829052610964916110ec565b6000604051808303816000865af19150503d80600081146109a1576040519150601f19603f3d011682016040523d82523d6000602084013e6109a6565b606091505b50915091508180156109c75750808060200190518101906109c79190611108565b6109e35760405162461bcd60e51b81526004016103fd9061112a565b836001600160a01b0316856001600160a01b031660008051602061116e83398151915285604051610a1691815260200190565b60405180910390a35050505050565b6001600160a01b038216610a7b5760405162461bcd60e51b815260206004820152601f60248201527f45524332303a206d696e7420746f20746865207a65726f20616464726573730060448201526064016103fd565b8060346000828254610a8d9190610f4b565b9091555050604051600090819061202090610ab0908390879087906020016110c8565b60408051601f1981840301815290829052610aca916110ec565b6000604051808303816000865af19150503d8060008114610b07576040519150601f19603f3d011682016040523d82523d6000602084013e610b0c565b606091505b5091509150818015610b2d575080806020019051810190610b2d9190611108565b610b495760405162461bcd60e51b81526004016103fd9061112a565b6040518381526001600160a01b0385169060009060008051602061116e833981519152906020015b60405180910390a350505050565b6001600160a01b038216610bdf5760405162461bcd60e51b815260206004820152602160248201527f45524332303a206275726e2066726f6d20746865207a65726f206164647265736044820152607360f81b60648201526084016103fd565b8060346000828254610bf1919061115a565b9091555050604051600090819061202090610c14908690849087906020016110c8565b60408051601f1981840301815290829052610c2e916110ec565b6000604051808303816000865af19150503d8060008114610c6b576040519150601f19603f3d011682016040523d82523d6000602084013e610c70565b606091505b5091509150818015610c91575080806020019051810190610c919190611108565b610cad5760405162461bcd60e51b81526004016103fd9061112a565b6040518381526000906001600160a01b0386169060008051602061116e83398151915290602001610b71565b60005b83811015610cf4578181015183820152602001610cdc565b50506000910152565b6020815260008251806020840152610d1c816040850160208701610cd9565b601f01601f19169190910160400192915050565b80356001600160a01b0381168114610d4757600080fd5b919050565b60008060408385031215610d5f57600080fd5b610d6883610d30565b946020939093013593505050565b600080600060608486031215610d8b57600080fd5b610d9484610d30565b9250610da260208501610d30565b9150604084013590509250925092565b600060208284031215610dc457600080fd5b610dcd82610d30565b9392505050565b60008083601f840112610de657600080fd5b50813567ffffffffffffffff811115610dfe57600080fd5b602083019150836020828501011115610e1657600080fd5b9250929050565b600080600080600080600060a0888a031215610e3857600080fd5b610e4188610d30565b9650610e4f60208901610d30565b9550604088013567ffffffffffffffff80821115610e6c57600080fd5b610e788b838c01610dd4565b909750955060608a0135915080821115610e9157600080fd5b50610e9e8a828b01610dd4565b909450925050608088013560ff81168114610eb857600080fd5b8091505092959891949750929550565b60008060408385031215610edb57600080fd5b610ee483610d30565b9150610ef260208401610d30565b90509250929050565b600181811c90821680610f0f57607f821691505b602082108103610f2f57634e487b7160e01b600052602260045260246000fd5b50919050565b634e487b7160e01b600052601160045260246000fd5b8082018082111561038457610384610f35565b60208082526024908201527f4e617469766545524332303a204f6e6c79207072656469636174652063616e2060408201526318d85b1b60e21b606082015260800190565b634e487b7160e01b600052604160045260246000fd5b601f82111561100257600081815260208120601f850160051c81016020861015610fdf5750805b601f850160051c820191505b81811015610ffe57828155600101610feb565b5050505b505050565b67ffffffffffffffff83111561101f5761101f610fa2565b6110338361102d8354610efb565b83610fb8565b6000601f841160018114611067576000851561104f5750838201355b600019600387901b1c1916600186901b1783556110c1565b600083815260209020601f19861690835b828110156110985786850135825560209485019460019092019101611078565b50868210156110b55760001960f88860031b161c19848701351681555b505060018560011b0183555b5050505050565b6001600160a01b039384168152919092166020820152604081019190915260600190565b600082516110fe818460208701610cd9565b9190910192915050565b60006020828403121561111a57600080fd5b81518015158114610dcd57600080fd5b60208082526016908201527514149150d3d35412531157d0d0531317d1905253115160521b604082015260600190565b8181038181111561038457610384610f3556feddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3efa264697066735822122020d4a9c065f722d638ec115bf32ed1a8620dca26d052147ca0029d6b7b9aec9d64736f6c63430008130033",
-                "balance": "0x0"
-            },
-            "0x61324166B0202DB1E7502924326262274Fa4358F": {
-                "balance": "0xf4240"
-            },
-            "0x9aBb8441A12d4FD8D505C3fc50cDdc45E0df2b1e": {
-                "balance": "0xd3c21bcecceda1000000"
-            },
-            "0xCaB5AAC79Bebe326e0c80d72b5662E73f5D8ea56": {
-                "balance": "0xd3c21bcecceda1000000"
-            },
             "0xFE5E166BA5EA50c04fCa00b07b59966E6C2E9570": {
                 "balance": "0xd3c21bcecceda1000000"
             }

From 7c72d1b3782a9efe7a84dcfb7f3f6c1677b11858 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 1 Jun 2023 19:03:27 +0000
Subject: [PATCH 052/909] Bump webpack from 5.84.1 to 5.85.0 in
 /apps/block_scout_web/assets

Bumps [webpack](https://github.com/webpack/webpack) from 5.84.1 to 5.85.0.
- [Release notes](https://github.com/webpack/webpack/releases)
- [Commits](https://github.com/webpack/webpack/compare/v5.84.1...v5.85.0)

---
updated-dependencies:
- dependency-name: webpack
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 apps/block_scout_web/assets/package-lock.json | 19 +++++++++----------
 apps/block_scout_web/assets/package.json      |  2 +-
 2 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/apps/block_scout_web/assets/package-lock.json b/apps/block_scout_web/assets/package-lock.json
index 7a6a6846033a..461fd02bcbe7 100644
--- a/apps/block_scout_web/assets/package-lock.json
+++ b/apps/block_scout_web/assets/package-lock.json
@@ -92,7 +92,7 @@
         "sass": "^1.62.1",
         "sass-loader": "^13.3.1",
         "style-loader": "^3.3.3",
-        "webpack": "^5.84.1",
+        "webpack": "^5.85.0",
         "webpack-cli": "^5.1.1"
       },
       "engines": {
@@ -101,11 +101,10 @@
       }
     },
     "../../../deps/phoenix": {
-      "version": "1.5.13",
-      "license": "MIT"
+      "version": "0.0.1"
     },
     "../../../deps/phoenix_html": {
-      "version": "3.0.4"
+      "version": "0.0.1"
     },
     "node_modules/@amplitude/analytics-browser": {
       "version": "1.10.3",
@@ -16972,9 +16971,9 @@
       }
     },
     "node_modules/webpack": {
-      "version": "5.84.1",
-      "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.84.1.tgz",
-      "integrity": "sha512-ZP4qaZ7vVn/K8WN/p990SGATmrL1qg4heP/MrVneczYtpDGJWlrgZv55vxaV2ul885Kz+25MP2kSXkPe3LZfmg==",
+      "version": "5.85.0",
+      "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.85.0.tgz",
+      "integrity": "sha512-7gazTiYqwo5OSqwH1tigLDL2r3qDeP2dOKYgd+LlXpsUMqDTklg6tOghexqky0/+6QY38kb/R/uRPUleuL43zg==",
       "dev": true,
       "dependencies": {
         "@types/eslint-scope": "^3.7.3",
@@ -30325,9 +30324,9 @@
       "dev": true
     },
     "webpack": {
-      "version": "5.84.1",
-      "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.84.1.tgz",
-      "integrity": "sha512-ZP4qaZ7vVn/K8WN/p990SGATmrL1qg4heP/MrVneczYtpDGJWlrgZv55vxaV2ul885Kz+25MP2kSXkPe3LZfmg==",
+      "version": "5.85.0",
+      "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.85.0.tgz",
+      "integrity": "sha512-7gazTiYqwo5OSqwH1tigLDL2r3qDeP2dOKYgd+LlXpsUMqDTklg6tOghexqky0/+6QY38kb/R/uRPUleuL43zg==",
       "dev": true,
       "requires": {
         "@types/eslint-scope": "^3.7.3",
diff --git a/apps/block_scout_web/assets/package.json b/apps/block_scout_web/assets/package.json
index 7f4ade0c1c1b..7020a7d64aef 100644
--- a/apps/block_scout_web/assets/package.json
+++ b/apps/block_scout_web/assets/package.json
@@ -104,7 +104,7 @@
     "sass": "^1.62.1",
     "sass-loader": "^13.3.1",
     "style-loader": "^3.3.3",
-    "webpack": "^5.84.1",
+    "webpack": "^5.85.0",
     "webpack-cli": "^5.1.1"
   },
   "jest": {

From bed088dc8f7ed994669047c8cab1b20379c1f540 Mon Sep 17 00:00:00 2001
From: Maxim Filonov <53992153+sl1depengwyn@users.noreply.github.com>
Date: Fri, 2 Jun 2023 00:06:29 +0300
Subject: [PATCH 053/909] Fix tokens pagination

---
 CHANGELOG.md                                  |   1 +
 .../lib/block_scout_web/chain.ex              |  41 +++--
 .../views/api/v2/token_view.ex                |   3 +-
 .../api/v2/token_controller_test.exs          | 156 +++++++++++++++++-
 apps/explorer/lib/explorer/chain.ex           |  72 ++++++--
 5 files changed, 242 insertions(+), 31 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b431c7a01603..0cadde6ec3b8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,6 +12,7 @@
 
 ### Fixes
 
+- [#7611](https://github.com/blockscout/blockscout/pull/7611) - Fix tokens pagination
 - [#7566](https://github.com/blockscout/blockscout/pull/7566) - Account: check composed email beofre sending
 - [#7564](https://github.com/blockscout/blockscout/pull/7564) - Return contract type in address view
 - [#7562](https://github.com/blockscout/blockscout/pull/7562) - Remove fallback from Read methods
diff --git a/apps/block_scout_web/lib/block_scout_web/chain.ex b/apps/block_scout_web/lib/block_scout_web/chain.ex
index 8631c62d4da1..85da65cbfd47 100644
--- a/apps/block_scout_web/lib/block_scout_web/chain.ex
+++ b/apps/block_scout_web/lib/block_scout_web/chain.ex
@@ -16,6 +16,8 @@ defmodule BlockScoutWeb.Chain do
       token_contract_address_from_token_name: 1
     ]
 
+  import Explorer.Helper, only: [parse_integer: 1]
+
   alias Explorer.Chain.Block.Reward
 
   alias Explorer.Chain.{
@@ -23,6 +25,7 @@ defmodule BlockScoutWeb.Chain do
     Address.CoinBalance,
     Address.CurrentTokenBalance,
     Block,
+    Hash,
     InternalTransaction,
     Log,
     SmartContract,
@@ -141,16 +144,30 @@ defmodule BlockScoutWeb.Chain do
     ]
   end
 
-  def paging_options(%{"market_cap" => market_cap, "holder_count" => holder_count, "name" => token_name}) do
+  def paging_options(%{
+        "market_cap" => market_cap,
+        "holder_count" => holder_count_str,
+        "name" => name,
+        "contract_address_hash" => contract_address_hash_str,
+        "is_name_null" => is_name_null
+      }) do
     market_cap_decimal =
       case Decimal.parse(market_cap) do
         {decimal, ""} -> Decimal.round(decimal, 16)
         _ -> nil
       end
 
-    case Integer.parse(holder_count) do
-      {holder_count, ""} ->
-        [paging_options: %{@default_paging_options | key: {market_cap_decimal, holder_count, token_name}}]
+    holder_count = parse_integer(holder_count_str)
+    token_name = if is_name_null == "true", do: nil, else: name
+
+    case Hash.Address.cast(contract_address_hash_str) do
+      {:ok, contract_address_hash} ->
+        [
+          paging_options: %{
+            @default_paging_options
+            | key: {market_cap_decimal, holder_count, token_name, contract_address_hash}
+          }
+        ]
 
       _ ->
         [paging_options: @default_paging_options]
@@ -377,18 +394,22 @@ defmodule BlockScoutWeb.Chain do
   end
 
   defp paging_params(%Token{
+         contract_address_hash: contract_address_hash,
          circulating_market_cap: circulating_market_cap,
          holder_count: holder_count,
          name: token_name
        }) do
-    %{"market_cap" => circulating_market_cap, "holder_count" => holder_count, "name" => token_name}
+    %{
+      "market_cap" => circulating_market_cap,
+      "holder_count" => holder_count,
+      "contract_address_hash" => contract_address_hash,
+      "name" => token_name,
+      "is_name_null" => is_nil(token_name)
+    }
   end
 
-  defp paging_params([
-         %Token{circulating_market_cap: circulating_market_cap, holder_count: holder_count, name: token_name},
-         _
-       ]) do
-    %{"market_cap" => circulating_market_cap, "holder_count" => holder_count, "name" => token_name}
+  defp paging_params([%Token{} = token, _]) do
+    paging_params(token)
   end
 
   defp paging_params({%Reward{block: %{number: number}}, _}) do
diff --git a/apps/block_scout_web/lib/block_scout_web/views/api/v2/token_view.ex b/apps/block_scout_web/lib/block_scout_web/views/api/v2/token_view.ex
index f1819125c3a9..994fe78e872f 100644
--- a/apps/block_scout_web/lib/block_scout_web/views/api/v2/token_view.ex
+++ b/apps/block_scout_web/lib/block_scout_web/views/api/v2/token_view.ex
@@ -16,7 +16,8 @@ defmodule BlockScoutWeb.API.V2.TokenView do
       "holders" => token.holder_count && to_string(token.holder_count),
       "exchange_rate" => exchange_rate(token),
       "total_supply" => token.total_supply,
-      "icon_url" => token.icon_url
+      "icon_url" => token.icon_url,
+      "circulating_market_cap" => token.circulating_market_cap
     }
   end
 
diff --git a/apps/block_scout_web/test/block_scout_web/controllers/api/v2/token_controller_test.exs b/apps/block_scout_web/test/block_scout_web/controllers/api/v2/token_controller_test.exs
index ddb250733a3c..185c643b1c01 100644
--- a/apps/block_scout_web/test/block_scout_web/controllers/api/v2/token_controller_test.exs
+++ b/apps/block_scout_web/test/block_scout_web/controllers/api/v2/token_controller_test.exs
@@ -393,26 +393,170 @@ defmodule BlockScoutWeb.API.V2.TokenControllerTest do
   end
 
   describe "/tokens" do
+    defp check_tokens_pagination(tokens, conn) do
+      request = get(conn, "/api/v2/tokens")
+      assert response = json_response(request, 200)
+      request_2nd_page = get(conn, "/api/v2/tokens", response["next_page_params"])
+      assert response_2nd_page = json_response(request_2nd_page, 200)
+      check_paginated_response(response, response_2nd_page, tokens)
+    end
+
     test "get empty list", %{conn: conn} do
       request = get(conn, "/api/v2/tokens")
 
       assert %{"items" => [], "next_page_params" => nil} = json_response(request, 200)
     end
 
-    test "check pagination", %{conn: conn} do
+    # these tests that tokens paginates by each parameter separately and by any combination of them
+    test "pagination by address", %{conn: conn} do
       tokens =
         for i <- 0..50 do
+          insert(:token, name: nil)
+        end
+        |> Enum.reverse()
+
+      check_tokens_pagination(tokens, conn)
+    end
+
+    test "pagination by name", %{conn: conn} do
+      tokens =
+        for i <- 0..48 do
           insert(:token, holder_count: i)
         end
 
-      request = get(conn, "/api/v2/tokens")
-      assert response = json_response(request, 200)
+      empty_named_token = insert(:token, name: "")
+      named_token = insert(:token)
 
-      request_2nd_page = get(conn, "/api/v2/tokens", response["next_page_params"])
+      tokens = [named_token, empty_named_token | tokens]
 
-      assert response_2nd_page = json_response(request_2nd_page, 200)
+      check_tokens_pagination(tokens, conn)
+    end
 
-      check_paginated_response(response, response_2nd_page, tokens)
+    test "pagination by holders", %{conn: conn} do
+      tokens =
+        for i <- 0..50 do
+          insert(:token, holder_count: i, name: nil)
+        end
+
+      check_tokens_pagination(tokens, conn)
+    end
+
+    test "pagination by circulating_market_cap", %{conn: conn} do
+      tokens =
+        for i <- 0..50 do
+          insert(:token, circulating_market_cap: i, name: nil)
+        end
+
+      check_tokens_pagination(tokens, conn)
+    end
+
+    test "pagination by name and address", %{conn: conn} do
+      tokens =
+        for i <- 0..50 do
+          insert(:token)
+        end
+        |> Enum.reverse()
+
+      check_tokens_pagination(tokens, conn)
+    end
+
+    test "pagination by holders and address", %{conn: conn} do
+      tokens =
+        for i <- 0..50 do
+          insert(:token, holder_count: 1, name: nil)
+        end
+        |> Enum.reverse()
+
+      check_tokens_pagination(tokens, conn)
+    end
+
+    test "pagination by circulating_market_cap and address", %{conn: conn} do
+      tokens =
+        for i <- 0..50 do
+          insert(:token, circulating_market_cap: 1, name: nil)
+        end
+        |> Enum.reverse()
+
+      check_tokens_pagination(tokens, conn)
+    end
+
+    test "pagination by holders and name", %{conn: conn} do
+      tokens =
+        for i <- 1..51 do
+          insert(:token, holder_count: 1, name: List.to_string([i]))
+        end
+        |> Enum.reverse()
+
+      check_tokens_pagination(tokens, conn)
+    end
+
+    test "pagination by circulating_market_cap and name", %{conn: conn} do
+      tokens =
+        for i <- 1..51 do
+          insert(:token, circulating_market_cap: 1, name: List.to_string([i]))
+        end
+        |> Enum.reverse()
+
+      check_tokens_pagination(tokens, conn)
+    end
+
+    test "pagination by circulating_market_cap and holders", %{conn: conn} do
+      tokens =
+        for i <- 0..50 do
+          insert(:token, circulating_market_cap: 1, holder_count: i, name: nil)
+        end
+
+      check_tokens_pagination(tokens, conn)
+    end
+
+    test "pagination by holders, name and address", %{conn: conn} do
+      tokens =
+        for i <- 0..50 do
+          insert(:token, holder_count: 1)
+        end
+        |> Enum.reverse()
+
+      check_tokens_pagination(tokens, conn)
+    end
+
+    test "pagination by circulating_market_cap, name and address", %{conn: conn} do
+      tokens =
+        for i <- 0..50 do
+          insert(:token, circulating_market_cap: 1)
+        end
+        |> Enum.reverse()
+
+      check_tokens_pagination(tokens, conn)
+    end
+
+    test "pagination by circulating_market_cap, holders and address", %{conn: conn} do
+      tokens =
+        for i <- 0..50 do
+          insert(:token, circulating_market_cap: 1, holder_count: 1, name: nil)
+        end
+        |> Enum.reverse()
+
+      check_tokens_pagination(tokens, conn)
+    end
+
+    test "pagination by circulating_market_cap, holders and name", %{conn: conn} do
+      tokens =
+        for i <- 1..51 do
+          insert(:token, circulating_market_cap: 1, holder_count: 1, name: List.to_string([i]))
+        end
+        |> Enum.reverse()
+
+      check_tokens_pagination(tokens, conn)
+    end
+
+    test "pagination by circulating_market_cap, holders, name and address", %{conn: conn} do
+      tokens =
+        for i <- 0..50 do
+          insert(:token, holder_count: 1, circulating_market_cap: 1)
+        end
+        |> Enum.reverse()
+
+      check_tokens_pagination(tokens, conn)
     end
 
     test "check nil", %{conn: conn} do
diff --git a/apps/explorer/lib/explorer/chain.ex b/apps/explorer/lib/explorer/chain.ex
index a8ddd2db48e9..cbf78ee9915f 100644
--- a/apps/explorer/lib/explorer/chain.ex
+++ b/apps/explorer/lib/explorer/chain.ex
@@ -2556,7 +2556,12 @@ defmodule Explorer.Chain do
 
   defp base_token_query(empty_type) when empty_type in [nil, []] do
     from(t in Token,
-      order_by: [desc_nulls_last: t.circulating_market_cap, desc_nulls_last: t.holder_count, asc: t.name],
+      order_by: [
+        desc_nulls_last: t.circulating_market_cap,
+        desc_nulls_last: t.holder_count,
+        asc: t.name,
+        asc: t.contract_address_hash
+      ],
       preload: [:contract_address]
     )
   end
@@ -2564,7 +2569,12 @@ defmodule Explorer.Chain do
   defp base_token_query(token_types) when is_list(token_types) do
     from(t in Token,
       where: t.type in ^token_types,
-      order_by: [desc_nulls_last: t.circulating_market_cap, desc_nulls_last: t.holder_count, asc: t.name],
+      order_by: [
+        desc_nulls_last: t.circulating_market_cap,
+        desc_nulls_last: t.holder_count,
+        asc: t.name,
+        asc: t.contract_address_hash
+      ],
       preload: [:contract_address]
     )
   end
@@ -4673,25 +4683,59 @@ defmodule Explorer.Chain do
 
   defp page_tokens(query, %PagingOptions{key: nil}), do: query
 
-  defp page_tokens(query, %PagingOptions{key: {nil, holder_count, name}}) do
+  defp page_tokens(query, %PagingOptions{key: {circulating_market_cap, holder_count, name, contract_address_hash}}) do
     from(token in query,
-      where:
-        is_nil(token.circulating_market_cap) and
-          (token.holder_count < ^holder_count or (token.holder_count == ^holder_count and token.name > ^name))
+      where: ^page_tokens_circulating_market_cap(circulating_market_cap, holder_count, name, contract_address_hash)
     )
   end
 
-  defp page_tokens(query, %PagingOptions{key: {circulating_market_cap, holder_count, name}}) do
-    from(token in query,
-      where:
-        is_nil(token.circulating_market_cap) or
-          (token.circulating_market_cap < ^circulating_market_cap or
-             (token.circulating_market_cap == ^circulating_market_cap and token.holder_count < ^holder_count) or
-             (token.circulating_market_cap == ^circulating_market_cap and token.holder_count == ^holder_count and
-                token.name > ^name))
+  defp page_tokens_circulating_market_cap(nil, holder_count, name, contract_address_hash) do
+    dynamic(
+      [t],
+      is_nil(t.circulating_market_cap) and ^page_tokens_holder_count(holder_count, name, contract_address_hash)
+    )
+  end
+
+  defp page_tokens_circulating_market_cap(circulating_market_cap, holder_count, name, contract_address_hash) do
+    dynamic(
+      [t],
+      is_nil(t.circulating_market_cap) or t.circulating_market_cap < ^circulating_market_cap or
+        (t.circulating_market_cap == ^circulating_market_cap and
+           ^page_tokens_holder_count(holder_count, name, contract_address_hash))
+    )
+  end
+
+  defp page_tokens_holder_count(nil, name, contract_address_hash) do
+    dynamic(
+      [t],
+      is_nil(t.holder_count) and ^page_tokens_name(name, contract_address_hash)
     )
   end
 
+  defp page_tokens_holder_count(holder_count, name, contract_address_hash) do
+    dynamic(
+      [t],
+      is_nil(t.holder_count) or t.holder_count < ^holder_count or
+        (t.holder_count == ^holder_count and ^page_tokens_name(name, contract_address_hash))
+    )
+  end
+
+  defp page_tokens_name(nil, contract_address_hash) do
+    dynamic([t], is_nil(t.name) and ^page_tokens_contract_address_hash(contract_address_hash))
+  end
+
+  defp page_tokens_name(name, contract_address_hash) do
+    dynamic(
+      [t],
+      is_nil(t.name) or
+        (t.name > ^name or (t.name == ^name and ^page_tokens_contract_address_hash(contract_address_hash)))
+    )
+  end
+
+  defp page_tokens_contract_address_hash(contract_address_hash) do
+    dynamic([t], t.contract_address_hash > ^contract_address_hash)
+  end
+
   defp page_blocks(query, %PagingOptions{key: nil}), do: query
 
   defp page_blocks(query, %PagingOptions{key: {block_number}}) do

From 2f9e089990099746c2b1cb7e1a53221c22532829 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 2 Jun 2023 19:01:38 +0000
Subject: [PATCH 054/909] Bump @amplitude/analytics-browser in
 /apps/block_scout_web/assets

Bumps [@amplitude/analytics-browser](https://github.com/amplitude/Amplitude-TypeScript) from 1.10.3 to 1.10.4.
- [Release notes](https://github.com/amplitude/Amplitude-TypeScript/releases)
- [Commits](https://github.com/amplitude/Amplitude-TypeScript/compare/@amplitude/analytics-browser@1.10.3...@amplitude/analytics-browser@1.10.4)

---
updated-dependencies:
- dependency-name: "@amplitude/analytics-browser"
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 apps/block_scout_web/assets/package-lock.json | 47 +++++++++----------
 apps/block_scout_web/assets/package.json      |  2 +-
 2 files changed, 24 insertions(+), 25 deletions(-)

diff --git a/apps/block_scout_web/assets/package-lock.json b/apps/block_scout_web/assets/package-lock.json
index 7a6a6846033a..56de9184f783 100644
--- a/apps/block_scout_web/assets/package-lock.json
+++ b/apps/block_scout_web/assets/package-lock.json
@@ -7,7 +7,7 @@
       "name": "blockscout",
       "license": "GPL-3.0",
       "dependencies": {
-        "@amplitude/analytics-browser": "^1.10.3",
+        "@amplitude/analytics-browser": "^1.10.4",
         "@fortawesome/fontawesome-free": "^6.4.0",
         "@tarekraafat/autocomplete.js": "^10.2.7",
         "@walletconnect/web3-provider": "^1.8.0",
@@ -101,21 +101,20 @@
       }
     },
     "../../../deps/phoenix": {
-      "version": "1.5.13",
-      "license": "MIT"
+      "version": "0.0.1"
     },
     "../../../deps/phoenix_html": {
-      "version": "3.0.4"
+      "version": "0.0.1"
     },
     "node_modules/@amplitude/analytics-browser": {
-      "version": "1.10.3",
-      "resolved": "https://registry.npmjs.org/@amplitude/analytics-browser/-/analytics-browser-1.10.3.tgz",
-      "integrity": "sha512-u9xnHVLMtoWawZssZDC1wYR7GjuXF9DWL09fCdxf5j0Gp9CtRurzt+kUx9KC8IzrBmNSYZ7jG8xhwUWCbIFodg==",
+      "version": "1.10.4",
+      "resolved": "https://registry.npmjs.org/@amplitude/analytics-browser/-/analytics-browser-1.10.4.tgz",
+      "integrity": "sha512-8Wx9dvCVyGnpzWJZESLiC7ICeYTRqh/I8eKArGTMJVe+vYwwsa4YaRA+DOclCCUnjgA7HfQKDbXw5iLEbcGzpA==",
       "dependencies": {
         "@amplitude/analytics-client-common": "^0.7.0",
         "@amplitude/analytics-core": "^0.13.3",
         "@amplitude/analytics-types": "^0.20.0",
-        "@amplitude/plugin-page-view-tracking-browser": "^0.8.0",
+        "@amplitude/plugin-page-view-tracking-browser": "^0.8.1",
         "@amplitude/plugin-web-attribution-browser": "^0.7.0",
         "@amplitude/ua-parser-js": "^0.7.31",
         "tslib": "^2.4.1"
@@ -170,9 +169,9 @@
       "integrity": "sha512-OYoUrf7QUl5sL4mqcQJBu+0GuSar7ga5prJv0HDtPT4LGu7Adv8S3AWljGiEJuTS/YaOMzvTe2qyKZbwyiNrMw=="
     },
     "node_modules/@amplitude/plugin-page-view-tracking-browser": {
-      "version": "0.8.0",
-      "resolved": "https://registry.npmjs.org/@amplitude/plugin-page-view-tracking-browser/-/plugin-page-view-tracking-browser-0.8.0.tgz",
-      "integrity": "sha512-Bun7aGo7woxsnupDEY1YugLQyAXDRtFhQsXnJKKCIkyeeRCq4qsuaAz0wI8w1QV+3IhaAf0lBuSqSuBIhPFDLQ==",
+      "version": "0.8.1",
+      "resolved": "https://registry.npmjs.org/@amplitude/plugin-page-view-tracking-browser/-/plugin-page-view-tracking-browser-0.8.1.tgz",
+      "integrity": "sha512-R1EyeckxikgJjH/YIoUn3nVyvB6PA8vcRMbk2T5Uzpe4SEv3IoPJ4z5tKfPUzBfKaibF7ectkzpfEHhC3hTJ3w==",
       "dependencies": {
         "@amplitude/analytics-client-common": "^0.7.0",
         "@amplitude/analytics-types": "^0.20.0",
@@ -180,9 +179,9 @@
       }
     },
     "node_modules/@amplitude/plugin-page-view-tracking-browser/node_modules/tslib": {
-      "version": "2.5.0",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.5.0.tgz",
-      "integrity": "sha512-336iVw3rtn2BUK7ORdIAHTyxHGRIHVReokCR3XjbckJMK7ms8FysBfhLR8IXnAgy7T0PTPNBWKiH514FOW/WSg=="
+      "version": "2.5.2",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.5.2.tgz",
+      "integrity": "sha512-5svOrSA2w3iGFDs1HibEVBGbDrAY82bFQ3HZ3ixB+88nsbsWQoKqDRb5UBYAUPEzbBn6dAp5gRNXglySbx1MlA=="
     },
     "node_modules/@amplitude/plugin-web-attribution-browser": {
       "version": "0.7.0",
@@ -17516,14 +17515,14 @@
   },
   "dependencies": {
     "@amplitude/analytics-browser": {
-      "version": "1.10.3",
-      "resolved": "https://registry.npmjs.org/@amplitude/analytics-browser/-/analytics-browser-1.10.3.tgz",
-      "integrity": "sha512-u9xnHVLMtoWawZssZDC1wYR7GjuXF9DWL09fCdxf5j0Gp9CtRurzt+kUx9KC8IzrBmNSYZ7jG8xhwUWCbIFodg==",
+      "version": "1.10.4",
+      "resolved": "https://registry.npmjs.org/@amplitude/analytics-browser/-/analytics-browser-1.10.4.tgz",
+      "integrity": "sha512-8Wx9dvCVyGnpzWJZESLiC7ICeYTRqh/I8eKArGTMJVe+vYwwsa4YaRA+DOclCCUnjgA7HfQKDbXw5iLEbcGzpA==",
       "requires": {
         "@amplitude/analytics-client-common": "^0.7.0",
         "@amplitude/analytics-core": "^0.13.3",
         "@amplitude/analytics-types": "^0.20.0",
-        "@amplitude/plugin-page-view-tracking-browser": "^0.8.0",
+        "@amplitude/plugin-page-view-tracking-browser": "^0.8.1",
         "@amplitude/plugin-web-attribution-browser": "^0.7.0",
         "@amplitude/ua-parser-js": "^0.7.31",
         "tslib": "^2.4.1"
@@ -17584,9 +17583,9 @@
       "integrity": "sha512-OYoUrf7QUl5sL4mqcQJBu+0GuSar7ga5prJv0HDtPT4LGu7Adv8S3AWljGiEJuTS/YaOMzvTe2qyKZbwyiNrMw=="
     },
     "@amplitude/plugin-page-view-tracking-browser": {
-      "version": "0.8.0",
-      "resolved": "https://registry.npmjs.org/@amplitude/plugin-page-view-tracking-browser/-/plugin-page-view-tracking-browser-0.8.0.tgz",
-      "integrity": "sha512-Bun7aGo7woxsnupDEY1YugLQyAXDRtFhQsXnJKKCIkyeeRCq4qsuaAz0wI8w1QV+3IhaAf0lBuSqSuBIhPFDLQ==",
+      "version": "0.8.1",
+      "resolved": "https://registry.npmjs.org/@amplitude/plugin-page-view-tracking-browser/-/plugin-page-view-tracking-browser-0.8.1.tgz",
+      "integrity": "sha512-R1EyeckxikgJjH/YIoUn3nVyvB6PA8vcRMbk2T5Uzpe4SEv3IoPJ4z5tKfPUzBfKaibF7ectkzpfEHhC3hTJ3w==",
       "requires": {
         "@amplitude/analytics-client-common": "^0.7.0",
         "@amplitude/analytics-types": "^0.20.0",
@@ -17594,9 +17593,9 @@
       },
       "dependencies": {
         "tslib": {
-          "version": "2.5.0",
-          "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.5.0.tgz",
-          "integrity": "sha512-336iVw3rtn2BUK7ORdIAHTyxHGRIHVReokCR3XjbckJMK7ms8FysBfhLR8IXnAgy7T0PTPNBWKiH514FOW/WSg=="
+          "version": "2.5.2",
+          "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.5.2.tgz",
+          "integrity": "sha512-5svOrSA2w3iGFDs1HibEVBGbDrAY82bFQ3HZ3ixB+88nsbsWQoKqDRb5UBYAUPEzbBn6dAp5gRNXglySbx1MlA=="
         }
       }
     },
diff --git a/apps/block_scout_web/assets/package.json b/apps/block_scout_web/assets/package.json
index 7f4ade0c1c1b..f38a4231f859 100644
--- a/apps/block_scout_web/assets/package.json
+++ b/apps/block_scout_web/assets/package.json
@@ -20,7 +20,7 @@
   },
   "dependencies": {
     "@fortawesome/fontawesome-free": "^6.4.0",
-    "@amplitude/analytics-browser": "^1.10.3",
+    "@amplitude/analytics-browser": "^1.10.4",
     "@tarekraafat/autocomplete.js": "^10.2.7",
     "@walletconnect/web3-provider": "^1.8.0",
     "assert": "^2.0.0",

From d2fab8366227e813a604be17ebabdd0c468f1c04 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 2 Jun 2023 19:04:19 +0000
Subject: [PATCH 055/909] Bump gettext from 0.22.1 to 0.22.2

Bumps [gettext](https://github.com/elixir-gettext/gettext) from 0.22.1 to 0.22.2.
- [Changelog](https://github.com/elixir-gettext/gettext/blob/main/CHANGELOG.md)
- [Commits](https://github.com/elixir-gettext/gettext/compare/v0.22.1...v0.22.2)

---
updated-dependencies:
- dependency-name: gettext
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 mix.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mix.lock b/mix.lock
index 7bd27e4141cc..e5d1142a25f9 100644
--- a/mix.lock
+++ b/mix.lock
@@ -62,7 +62,7 @@
   "floki": {:hex, :floki, "0.34.2", "5fad07ef153b3b8ec110b6b155ec3780c4b2c4906297d0b4be1a7162d04a7e02", [:mix], [], "hexpm", "26b9d50f0f01796bc6be611ca815c5e0de034d2128e39cc9702eee6b66a4d1c8"},
   "flow": {:hex, :flow, "1.2.4", "1dd58918287eb286656008777cb32714b5123d3855956f29aa141ebae456922d", [:mix], [{:gen_stage, "~> 1.0", [hex: :gen_stage, repo: "hexpm", optional: false]}], "hexpm", "874adde96368e71870f3510b91e35bc31652291858c86c0e75359cbdd35eb211"},
   "gen_stage": {:hex, :gen_stage, "1.2.1", "19d8b5e9a5996d813b8245338a28246307fd8b9c99d1237de199d21efc4c76a1", [:mix], [], "hexpm", "83e8be657fa05b992ffa6ac1e3af6d57aa50aace8f691fcf696ff02f8335b001"},
-  "gettext": {:hex, :gettext, "0.22.1", "e7942988383c3d9eed4bdc22fc63e712b655ae94a672a27e4900e3d4a2c43581", [:mix], [{:expo, "~> 0.4.0", [hex: :expo, repo: "hexpm", optional: false]}], "hexpm", "ad105b8dab668ee3f90c0d3d94ba75e9aead27a62495c101d94f2657a190ac5d"},
+  "gettext": {:hex, :gettext, "0.22.2", "6bfca374de34ecc913a28ba391ca184d88d77810a3e427afa8454a71a51341ac", [:mix], [{:expo, "~> 0.4.0", [hex: :expo, repo: "hexpm", optional: false]}], "hexpm", "8a2d389673aea82d7eae387e6a2ccc12660610080ae7beb19452cfdc1ec30f60"},
   "hackney": {:hex, :hackney, "1.18.1", "f48bf88f521f2a229fc7bae88cf4f85adc9cd9bcf23b5dc8eb6a1788c662c4f6", [:rebar3], [{:certifi, "~>2.9.0", [hex: :certifi, repo: "hexpm", optional: false]}, {:idna, "~>6.1.0", [hex: :idna, repo: "hexpm", optional: false]}, {:metrics, "~>1.0.0", [hex: :metrics, repo: "hexpm", optional: false]}, {:mimerl, "~>1.1", [hex: :mimerl, repo: "hexpm", optional: false]}, {:parse_trans, "3.3.1", [hex: :parse_trans, repo: "hexpm", optional: false]}, {:ssl_verify_fun, "~>1.1.0", [hex: :ssl_verify_fun, repo: "hexpm", optional: false]}, {:unicode_util_compat, "~>0.7.0", [hex: :unicode_util_compat, repo: "hexpm", optional: false]}], "hexpm", "a4ecdaff44297e9b5894ae499e9a070ea1888c84afdd1fd9b7b2bc384950128e"},
   "hammer": {:hex, :hammer, "6.1.0", "f263e3c3e9946bd410ea0336b2abe0cb6260af4afb3a221e1027540706e76c55", [:make, :mix], [{:poolboy, "~> 1.5", [hex: :poolboy, repo: "hexpm", optional: false]}], "hexpm", "b47e415a562a6d072392deabcd58090d8a41182cf9044cdd6b0d0faaaf68ba57"},
   "hammer_backend_redis": {:hex, :hammer_backend_redis, "6.1.2", "eb296bb4924928e24135308b2afc189201fd09411c870c6bbadea444a49b2f2c", [:mix], [{:hammer, "~> 6.0", [hex: :hammer, repo: "hexpm", optional: false]}, {:redix, "~> 1.1", [hex: :redix, repo: "hexpm", optional: false]}], "hexpm", "217ea066278910543a5e9b577d5bf2425419446b94fe76bdd9f255f39feec9fa"},

From 7ebbdf4e0f9a868c9b726e6fcb9b58f443c04aa1 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 2 Jun 2023 19:22:56 +0000
Subject: [PATCH 056/909] Bump mime from 2.0.4 to 2.0.5

Bumps [mime](https://github.com/elixir-plug/mime) from 2.0.4 to 2.0.5.
- [Changelog](https://github.com/elixir-plug/mime/blob/master/CHANGELOG.md)
- [Commits](https://github.com/elixir-plug/mime/compare/v2.0.4...v2.0.5)

---
updated-dependencies:
- dependency-name: mime
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 mix.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mix.lock b/mix.lock
index e5d1142a25f9..87de7791e8ec 100644
--- a/mix.lock
+++ b/mix.lock
@@ -82,7 +82,7 @@
   "meck": {:hex, :meck, "0.9.2", "85ccbab053f1db86c7ca240e9fc718170ee5bda03810a6292b5306bf31bae5f5", [:rebar3], [], "hexpm", "81344f561357dc40a8344afa53767c32669153355b626ea9fcbc8da6b3045826"},
   "memento": {:hex, :memento, "0.3.2", "38cfc8ff9bcb1adff7cbd0f3b78a762636b86dff764729d1c82d0464c539bdd0", [:mix], [], "hexpm", "25cf691a98a0cb70262f4a7543c04bab24648cb2041d937eb64154a8d6f8012b"},
   "metrics": {:hex, :metrics, "1.0.1", "25f094dea2cda98213cecc3aeff09e940299d950904393b2a29d191c346a8486", [:rebar3], [], "hexpm", "69b09adddc4f74a40716ae54d140f93beb0fb8978d8636eaded0c31b6f099f16"},
-  "mime": {:hex, :mime, "2.0.4", "94b41d7cd981a5c7acefecdf9f2667df43f19067279e1518314cc01650a8370d", [:mix], [], "hexpm", "14932baeb3cde66f1f0b3cffb42b7c5bbaa92af5335e2d8848c668a654a9d8bf"},
+  "mime": {:hex, :mime, "2.0.5", "dc34c8efd439abe6ae0343edbb8556f4d63f178594894720607772a041b04b02", [:mix], [], "hexpm", "da0d64a365c45bc9935cc5c8a7fc5e49a0e0f9932a761c55d6c52b142780a05c"},
   "mimerl": {:hex, :mimerl, "1.2.0", "67e2d3f571088d5cfd3e550c383094b47159f3eee8ffa08e64106cdf5e981be3", [:rebar3], [], "hexpm", "f278585650aa581986264638ebf698f8bb19df297f66ad91b18910dfc6e19323"},
   "mimetype_parser": {:hex, :mimetype_parser, "0.1.3", "628ac9fe56aa7edcedb534d68397dd66674ab82493c8ebe39acb9a19b666099d", [:mix], [], "hexpm", "7d8f80c567807ce78cd93c938e7f4b0a20b1aaaaab914bf286f68457d9f7a852"},
   "mix_erlang_tasks": {:hex, :mix_erlang_tasks, "0.1.0", "36819fec60b80689eb1380938675af215565a89320a9e29c72c70d97512e4649", [:mix], [], "hexpm", "95d2839c422c482a70c08a8702da8242f86b773f8ab6e8602a4eb72da8da04ed"},

From 56b88b321539c4c9aed17f3c7aa1092a84a77808 Mon Sep 17 00:00:00 2001
From: Viktor Baranov <baranov.viktor.27@gmail.com>
Date: Mon, 5 Jun 2023 19:22:10 +0300
Subject: [PATCH 057/909] Include staging, production branches in GA CI

---
 .github/workflows/config.yml | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/.github/workflows/config.yml b/.github/workflows/config.yml
index 5d31ec47ee79..d1950c325dc5 100644
--- a/.github/workflows/config.yml
+++ b/.github/workflows/config.yml
@@ -4,9 +4,22 @@ on:
   push:
     branches:
       - master
+      - va-bedrock-optimism
+      - production-optimism-stg
+      - production-eth-stg-experimental
+      - production-base-goerli-stg
+      - production-xdai-stg
+      - production-gc-chiado-stg
+      - production-polygon-supernets-stg
+      - production-core-stg
+      - production-sokol-stg
+      - production-rsk-stg
+      - production-lukso-stg
+      - staging-l2
   pull_request:
     branches:
       - master
+      - va-bedrock-optimism
 
 env:
   MIX_ENV: test

From a5bcbf0cfeb89e8ad3b9f96ad49b0779ebef7ebc Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 5 Jun 2023 19:03:35 +0000
Subject: [PATCH 058/909] Bump webpack-cli from 5.1.1 to 5.1.3 in
 /apps/block_scout_web/assets

Bumps [webpack-cli](https://github.com/webpack/webpack-cli) from 5.1.1 to 5.1.3.
- [Release notes](https://github.com/webpack/webpack-cli/releases)
- [Changelog](https://github.com/webpack/webpack-cli/blob/master/CHANGELOG.md)
- [Commits](https://github.com/webpack/webpack-cli/compare/webpack-cli@5.1.1...webpack-cli@5.1.3)

---
updated-dependencies:
- dependency-name: webpack-cli
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 apps/block_scout_web/assets/package-lock.json | 62 +++++++++----------
 apps/block_scout_web/assets/package.json      |  2 +-
 2 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/apps/block_scout_web/assets/package-lock.json b/apps/block_scout_web/assets/package-lock.json
index 0dd4aee6fd34..4000613dd7b1 100644
--- a/apps/block_scout_web/assets/package-lock.json
+++ b/apps/block_scout_web/assets/package-lock.json
@@ -93,7 +93,7 @@
         "sass-loader": "^13.3.1",
         "style-loader": "^3.3.3",
         "webpack": "^5.85.0",
-        "webpack-cli": "^5.1.1"
+        "webpack-cli": "^5.1.3"
       },
       "engines": {
         "node": ">=16.0.0",
@@ -4134,9 +4134,9 @@
       }
     },
     "node_modules/@webpack-cli/configtest": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/@webpack-cli/configtest/-/configtest-2.1.0.tgz",
-      "integrity": "sha512-K/vuv72vpfSEZoo5KIU0a2FsEoYdW0DUMtMpB5X3LlUwshetMZRZRxB7sCsVji/lFaSxtQQ3aM9O4eMolXkU9w==",
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/@webpack-cli/configtest/-/configtest-2.1.1.tgz",
+      "integrity": "sha512-wy0mglZpDSiSS0XHrVR+BAdId2+yxPSoJW8fsna3ZpYSlufjvxnP4YbKTCBZnNIcGN4r6ZPXV55X4mYExOfLmw==",
       "dev": true,
       "engines": {
         "node": ">=14.15.0"
@@ -4147,9 +4147,9 @@
       }
     },
     "node_modules/@webpack-cli/info": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/@webpack-cli/info/-/info-2.0.1.tgz",
-      "integrity": "sha512-fE1UEWTwsAxRhrJNikE7v4EotYflkEhBL7EbajfkPlf6E37/2QshOy/D48Mw8G5XMFlQtS6YV42vtbG9zBpIQA==",
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/@webpack-cli/info/-/info-2.0.2.tgz",
+      "integrity": "sha512-zLHQdI/Qs1UyT5UBdWNqsARasIA+AaF8t+4u2aS2nEpBQh2mWIVb8qAklq0eUENnC5mOItrIB4LiS9xMtph18A==",
       "dev": true,
       "engines": {
         "node": ">=14.15.0"
@@ -4160,9 +4160,9 @@
       }
     },
     "node_modules/@webpack-cli/serve": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/@webpack-cli/serve/-/serve-2.0.4.tgz",
-      "integrity": "sha512-0xRgjgDLdz6G7+vvDLlaRpFatJaJ69uTalZLRSMX5B3VUrDmXcrVA3+6fXXQgmYz7bY9AAgs348XQdmtLsK41A==",
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/@webpack-cli/serve/-/serve-2.0.5.tgz",
+      "integrity": "sha512-lqaoKnRYBdo1UgDX8uF24AfGMifWK19TxPmM5FHc2vAGxrJ/qtyUyFBWoY1tISZdelsQ5fBcOusifo5o5wSJxQ==",
       "dev": true,
       "engines": {
         "node": ">=14.15.0"
@@ -17018,15 +17018,15 @@
       }
     },
     "node_modules/webpack-cli": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/webpack-cli/-/webpack-cli-5.1.1.tgz",
-      "integrity": "sha512-OLJwVMoXnXYH2ncNGU8gxVpUtm3ybvdioiTvHgUyBuyMLKiVvWy+QObzBsMtp5pH7qQoEuWgeEUQ/sU3ZJFzAw==",
+      "version": "5.1.3",
+      "resolved": "https://registry.npmjs.org/webpack-cli/-/webpack-cli-5.1.3.tgz",
+      "integrity": "sha512-MTuk7NUMvEHQUSXCpvUrF1q2p0FJS40dPFfqQvG3jTWcgv/8plBNz2Kv2HXZiLGPnfmSAA5uCtCILO1JBmmkfw==",
       "dev": true,
       "dependencies": {
         "@discoveryjs/json-ext": "^0.5.0",
-        "@webpack-cli/configtest": "^2.1.0",
-        "@webpack-cli/info": "^2.0.1",
-        "@webpack-cli/serve": "^2.0.4",
+        "@webpack-cli/configtest": "^2.1.1",
+        "@webpack-cli/info": "^2.0.2",
+        "@webpack-cli/serve": "^2.0.5",
         "colorette": "^2.0.14",
         "commander": "^10.0.1",
         "cross-spawn": "^7.0.3",
@@ -20535,23 +20535,23 @@
       }
     },
     "@webpack-cli/configtest": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/@webpack-cli/configtest/-/configtest-2.1.0.tgz",
-      "integrity": "sha512-K/vuv72vpfSEZoo5KIU0a2FsEoYdW0DUMtMpB5X3LlUwshetMZRZRxB7sCsVji/lFaSxtQQ3aM9O4eMolXkU9w==",
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/@webpack-cli/configtest/-/configtest-2.1.1.tgz",
+      "integrity": "sha512-wy0mglZpDSiSS0XHrVR+BAdId2+yxPSoJW8fsna3ZpYSlufjvxnP4YbKTCBZnNIcGN4r6ZPXV55X4mYExOfLmw==",
       "dev": true,
       "requires": {}
     },
     "@webpack-cli/info": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/@webpack-cli/info/-/info-2.0.1.tgz",
-      "integrity": "sha512-fE1UEWTwsAxRhrJNikE7v4EotYflkEhBL7EbajfkPlf6E37/2QshOy/D48Mw8G5XMFlQtS6YV42vtbG9zBpIQA==",
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/@webpack-cli/info/-/info-2.0.2.tgz",
+      "integrity": "sha512-zLHQdI/Qs1UyT5UBdWNqsARasIA+AaF8t+4u2aS2nEpBQh2mWIVb8qAklq0eUENnC5mOItrIB4LiS9xMtph18A==",
       "dev": true,
       "requires": {}
     },
     "@webpack-cli/serve": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/@webpack-cli/serve/-/serve-2.0.4.tgz",
-      "integrity": "sha512-0xRgjgDLdz6G7+vvDLlaRpFatJaJ69uTalZLRSMX5B3VUrDmXcrVA3+6fXXQgmYz7bY9AAgs348XQdmtLsK41A==",
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/@webpack-cli/serve/-/serve-2.0.5.tgz",
+      "integrity": "sha512-lqaoKnRYBdo1UgDX8uF24AfGMifWK19TxPmM5FHc2vAGxrJ/qtyUyFBWoY1tISZdelsQ5fBcOusifo5o5wSJxQ==",
       "dev": true,
       "requires": {}
     },
@@ -30375,15 +30375,15 @@
       }
     },
     "webpack-cli": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/webpack-cli/-/webpack-cli-5.1.1.tgz",
-      "integrity": "sha512-OLJwVMoXnXYH2ncNGU8gxVpUtm3ybvdioiTvHgUyBuyMLKiVvWy+QObzBsMtp5pH7qQoEuWgeEUQ/sU3ZJFzAw==",
+      "version": "5.1.3",
+      "resolved": "https://registry.npmjs.org/webpack-cli/-/webpack-cli-5.1.3.tgz",
+      "integrity": "sha512-MTuk7NUMvEHQUSXCpvUrF1q2p0FJS40dPFfqQvG3jTWcgv/8plBNz2Kv2HXZiLGPnfmSAA5uCtCILO1JBmmkfw==",
       "dev": true,
       "requires": {
         "@discoveryjs/json-ext": "^0.5.0",
-        "@webpack-cli/configtest": "^2.1.0",
-        "@webpack-cli/info": "^2.0.1",
-        "@webpack-cli/serve": "^2.0.4",
+        "@webpack-cli/configtest": "^2.1.1",
+        "@webpack-cli/info": "^2.0.2",
+        "@webpack-cli/serve": "^2.0.5",
         "colorette": "^2.0.14",
         "commander": "^10.0.1",
         "cross-spawn": "^7.0.3",
diff --git a/apps/block_scout_web/assets/package.json b/apps/block_scout_web/assets/package.json
index 2dc96f9a6d25..1561e23130f6 100644
--- a/apps/block_scout_web/assets/package.json
+++ b/apps/block_scout_web/assets/package.json
@@ -105,7 +105,7 @@
     "sass-loader": "^13.3.1",
     "style-loader": "^3.3.3",
     "webpack": "^5.85.0",
-    "webpack-cli": "^5.1.1"
+    "webpack-cli": "^5.1.3"
   },
   "jest": {
     "moduleNameMapper": {

From 2362453fd1af0df333192f04857445ead74d4652 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 5 Jun 2023 19:03:57 +0000
Subject: [PATCH 059/909] Bump phoenix_ecto from 4.4.1 to 4.4.2

Bumps [phoenix_ecto](https://github.com/phoenixframework/phoenix_ecto) from 4.4.1 to 4.4.2.
- [Changelog](https://github.com/phoenixframework/phoenix_ecto/blob/main/CHANGELOG.md)
- [Commits](https://github.com/phoenixframework/phoenix_ecto/compare/v4.4.1...v4.4.2)

---
updated-dependencies:
- dependency-name: phoenix_ecto
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 mix.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mix.lock b/mix.lock
index 87de7791e8ec..efff15d5c8a6 100644
--- a/mix.lock
+++ b/mix.lock
@@ -99,7 +99,7 @@
   "parallel_stream": {:hex, :parallel_stream, "1.1.0", "f52f73eb344bc22de335992377413138405796e0d0ad99d995d9977ac29f1ca9", [:mix], [], "hexpm", "684fd19191aedfaf387bbabbeb8ff3c752f0220c8112eb907d797f4592d6e871"},
   "parse_trans": {:hex, :parse_trans, "3.3.1", "16328ab840cc09919bd10dab29e431da3af9e9e7e7e6f0089dd5a2d2820011d8", [:rebar3], [], "hexpm", "07cd9577885f56362d414e8c4c4e6bdf10d43a8767abb92d24cbe8b24c54888b"},
   "phoenix": {:hex, :phoenix, "1.5.13", "d4e0805ec0973bed80d67302631130fb47d75b1a0b7335a0b23c4432b6ce55ee", [:mix], [{:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}, {:phoenix_html, "~> 2.13 or ~> 3.0", [hex: :phoenix_html, repo: "hexpm", optional: true]}, {:phoenix_pubsub, "~> 2.0", [hex: :phoenix_pubsub, repo: "hexpm", optional: false]}, {:plug, "~> 1.10", [hex: :plug, repo: "hexpm", optional: false]}, {:plug_cowboy, "~> 1.0 or ~> 2.2", [hex: :plug_cowboy, repo: "hexpm", optional: true]}, {:plug_crypto, "~> 1.1.2 or ~> 1.2", [hex: :plug_crypto, repo: "hexpm", optional: false]}, {:telemetry, "~> 0.4 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "1a7c4f1900e6e60bb60ae6680e48418e3f7c360d58bcb9f812487b6d0d281a0f"},
-  "phoenix_ecto": {:hex, :phoenix_ecto, "4.4.1", "fe7a02387a7d26002a46b97e9879591efee7ebffe5f5e114fd196632e6e4a08d", [:mix], [{:ecto, "~> 3.5", [hex: :ecto, repo: "hexpm", optional: false]}, {:phoenix_html, "~> 2.14.2 or ~> 3.0", [hex: :phoenix_html, repo: "hexpm", optional: true]}, {:plug, "~> 1.9", [hex: :plug, repo: "hexpm", optional: false]}], "hexpm", "ddccf8b4966180afe7630b105edb3402b1ca485e7468109540d262e842048ba4"},
+  "phoenix_ecto": {:hex, :phoenix_ecto, "4.4.2", "b21bd01fdeffcfe2fab49e4942aa938b6d3e89e93a480d4aee58085560a0bc0d", [:mix], [{:ecto, "~> 3.5", [hex: :ecto, repo: "hexpm", optional: false]}, {:phoenix_html, "~> 2.14.2 or ~> 3.0", [hex: :phoenix_html, repo: "hexpm", optional: true]}, {:plug, "~> 1.9", [hex: :plug, repo: "hexpm", optional: false]}], "hexpm", "70242edd4601d50b69273b057ecf7b684644c19ee750989fd555625ae4ce8f5d"},
   "phoenix_html": {:hex, :phoenix_html, "3.0.4", "232d41884fe6a9c42d09f48397c175cd6f0d443aaa34c7424da47604201df2e1", [:mix], [{:plug, "~> 1.5", [hex: :plug, repo: "hexpm", optional: true]}], "hexpm", "ce17fd3cf815b2ed874114073e743507704b1f5288bb03c304a77458485efc8b"},
   "phoenix_live_reload": {:hex, :phoenix_live_reload, "1.3.3", "3a53772a6118d5679bf50fc1670505a290e32a1d195df9e069d8c53ab040c054", [:mix], [{:file_system, "~> 0.2.1 or ~> 0.3", [hex: :file_system, repo: "hexpm", optional: false]}, {:phoenix, "~> 1.4", [hex: :phoenix, repo: "hexpm", optional: false]}], "hexpm", "766796676e5f558dbae5d1bdb066849673e956005e3730dfd5affd7a6da4abac"},
   "phoenix_pubsub": {:hex, :phoenix_pubsub, "2.1.2", "a4950b63ace57720b0fc1c6da083c53346b36f99021de89595cc4f026288ff51", [:mix], [], "hexpm", "45741676a94c71f9afdfed9d22d49b6856c026ff504db04e3dc03a1d86f8201c"},

From 095cad2a235a7fb28fc2643bb5c2d46401ee7c4b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 5 Jun 2023 19:04:57 +0000
Subject: [PATCH 060/909] Bump floki from 0.34.2 to 0.34.3

Bumps [floki](https://github.com/philss/floki) from 0.34.2 to 0.34.3.
- [Release notes](https://github.com/philss/floki/releases)
- [Changelog](https://github.com/philss/floki/blob/main/CHANGELOG.md)
- [Commits](https://github.com/philss/floki/compare/v0.34.2...v0.34.3)

---
updated-dependencies:
- dependency-name: floki
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 mix.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mix.lock b/mix.lock
index 87de7791e8ec..69c96daa8a48 100644
--- a/mix.lock
+++ b/mix.lock
@@ -59,7 +59,7 @@
   "exvcr": {:hex, :exvcr, "0.14.1", "d9aacec631ed379e366bce5b3c68f6ec5b92b89142f9379425854e80a28c1107", [:mix], [{:exactor, "~> 2.2", [hex: :exactor, repo: "hexpm", optional: false]}, {:exjsx, "~> 4.0", [hex: :exjsx, repo: "hexpm", optional: false]}, {:finch, "~> 0.16", [hex: :finch, repo: "hexpm", optional: true]}, {:httpoison, "~> 1.0 or ~> 2.0", [hex: :httpoison, repo: "hexpm", optional: true]}, {:httpotion, "~> 3.1", [hex: :httpotion, repo: "hexpm", optional: true]}, {:ibrowse, "4.4.0", [hex: :ibrowse, repo: "hexpm", optional: true]}, {:meck, "~> 0.8", [hex: :meck, repo: "hexpm", optional: false]}], "hexpm", "5f1e0854fbad0c4bb64ae8cdd289eeace90b8a0a209788c2f840d70f86a2d63c"},
   "file_info": {:hex, :file_info, "0.0.4", "2e0e77f211e833f38ead22cb29ce53761d457d80b3ffe0ffe0eb93880b0963b2", [:mix], [{:mimetype_parser, "~> 0.1.2", [hex: :mimetype_parser, repo: "hexpm", optional: false]}], "hexpm", "50e7ad01c2c8b9339010675fe4dc4a113b8d6ca7eddce24d1d74fd0e762781a5"},
   "file_system": {:hex, :file_system, "0.2.10", "fb082005a9cd1711c05b5248710f8826b02d7d1784e7c3451f9c1231d4fc162d", [:mix], [], "hexpm", "41195edbfb562a593726eda3b3e8b103a309b733ad25f3d642ba49696bf715dc"},
-  "floki": {:hex, :floki, "0.34.2", "5fad07ef153b3b8ec110b6b155ec3780c4b2c4906297d0b4be1a7162d04a7e02", [:mix], [], "hexpm", "26b9d50f0f01796bc6be611ca815c5e0de034d2128e39cc9702eee6b66a4d1c8"},
+  "floki": {:hex, :floki, "0.34.3", "5e2dcaec5d7c228ce5b1d3501502e308b2d79eb655e4191751a1fe491c37feac", [:mix], [], "hexpm", "9577440eea5b97924b4bf3c7ea55f7b8b6dce589f9b28b096cc294a8dc342341"},
   "flow": {:hex, :flow, "1.2.4", "1dd58918287eb286656008777cb32714b5123d3855956f29aa141ebae456922d", [:mix], [{:gen_stage, "~> 1.0", [hex: :gen_stage, repo: "hexpm", optional: false]}], "hexpm", "874adde96368e71870f3510b91e35bc31652291858c86c0e75359cbdd35eb211"},
   "gen_stage": {:hex, :gen_stage, "1.2.1", "19d8b5e9a5996d813b8245338a28246307fd8b9c99d1237de199d21efc4c76a1", [:mix], [], "hexpm", "83e8be657fa05b992ffa6ac1e3af6d57aa50aace8f691fcf696ff02f8335b001"},
   "gettext": {:hex, :gettext, "0.22.2", "6bfca374de34ecc913a28ba391ca184d88d77810a3e427afa8454a71a51341ac", [:mix], [{:expo, "~> 0.4.0", [hex: :expo, repo: "hexpm", optional: false]}], "hexpm", "8a2d389673aea82d7eae387e6a2ccc12660610080ae7beb19452cfdc1ec30f60"},

From 5478305949a8dd78b2565c6753c5535ef0e577f5 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 5 Jun 2023 19:05:51 +0000
Subject: [PATCH 061/909] Bump eslint from 8.41.0 to 8.42.0 in
 /apps/block_scout_web/assets

Bumps [eslint](https://github.com/eslint/eslint) from 8.41.0 to 8.42.0.
- [Release notes](https://github.com/eslint/eslint/releases)
- [Changelog](https://github.com/eslint/eslint/blob/main/CHANGELOG.md)
- [Commits](https://github.com/eslint/eslint/compare/v8.41.0...v8.42.0)

---
updated-dependencies:
- dependency-name: eslint
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 apps/block_scout_web/assets/package-lock.json | 46 +++++++++----------
 apps/block_scout_web/assets/package.json      |  2 +-
 2 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/apps/block_scout_web/assets/package-lock.json b/apps/block_scout_web/assets/package-lock.json
index 0dd4aee6fd34..e0e422c85700 100644
--- a/apps/block_scout_web/assets/package-lock.json
+++ b/apps/block_scout_web/assets/package-lock.json
@@ -78,7 +78,7 @@
         "copy-webpack-plugin": "^11.0.0",
         "css-loader": "^5.2.7",
         "css-minimizer-webpack-plugin": "^5.0.0",
-        "eslint": "^8.41.0",
+        "eslint": "^8.42.0",
         "eslint-config-standard": "^17.1.0",
         "eslint-plugin-import": "^2.27.5",
         "eslint-plugin-node": "^11.1.0",
@@ -2181,9 +2181,9 @@
       }
     },
     "node_modules/@eslint/js": {
-      "version": "8.41.0",
-      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.41.0.tgz",
-      "integrity": "sha512-LxcyMGxwmTh2lY9FwHPGWOHmYFCZvbrFCBZL4FzSSsxsRPuhrYUg/49/0KDfW8tnIEaEHtfmn6+NPN+1DqaNmA==",
+      "version": "8.42.0",
+      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.42.0.tgz",
+      "integrity": "sha512-6SWlXpWU5AvId8Ac7zjzmIOqMOba/JWY8XZ4A7q7Gn1Vlfg/SFFIlrtHXt9nPn4op9ZPAkl91Jao+QQv3r/ukw==",
       "dev": true,
       "engines": {
         "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
@@ -2591,9 +2591,9 @@
       }
     },
     "node_modules/@humanwhocodes/config-array": {
-      "version": "0.11.8",
-      "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.8.tgz",
-      "integrity": "sha512-UybHIJzJnR5Qc/MsD9Kr+RpO2h+/P1GhOwdiLPXK5TWk5sgTdu88bTD9UP+CKbPPh5Rni1u0GjAdYQLemG8g+g==",
+      "version": "0.11.10",
+      "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.10.tgz",
+      "integrity": "sha512-KVVjQmNUepDVGXNuoRRdmmEjruj0KfiGSbS8LVc12LMsWDQzRXJ0qdhN8L8uUigKpfEHRhlaQFY0ib1tnUbNeQ==",
       "dev": true,
       "dependencies": {
         "@humanwhocodes/object-schema": "^1.2.1",
@@ -7155,16 +7155,16 @@
       }
     },
     "node_modules/eslint": {
-      "version": "8.41.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.41.0.tgz",
-      "integrity": "sha512-WQDQpzGBOP5IrXPo4Hc0814r4/v2rrIsB0rhT7jtunIalgg6gYXWhRMOejVO8yH21T/FGaxjmFjBMNqcIlmH1Q==",
+      "version": "8.42.0",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.42.0.tgz",
+      "integrity": "sha512-ulg9Ms6E1WPf67PHaEY4/6E2tEn5/f7FXGzr3t9cBMugOmf1INYvuUwwh1aXQN4MfJ6a5K2iNwP3w4AColvI9A==",
       "dev": true,
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.2.0",
         "@eslint-community/regexpp": "^4.4.0",
         "@eslint/eslintrc": "^2.0.3",
-        "@eslint/js": "8.41.0",
-        "@humanwhocodes/config-array": "^0.11.8",
+        "@eslint/js": "8.42.0",
+        "@humanwhocodes/config-array": "^0.11.10",
         "@humanwhocodes/module-importer": "^1.0.1",
         "@nodelib/fs.walk": "^1.2.8",
         "ajv": "^6.10.0",
@@ -19006,9 +19006,9 @@
       }
     },
     "@eslint/js": {
-      "version": "8.41.0",
-      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.41.0.tgz",
-      "integrity": "sha512-LxcyMGxwmTh2lY9FwHPGWOHmYFCZvbrFCBZL4FzSSsxsRPuhrYUg/49/0KDfW8tnIEaEHtfmn6+NPN+1DqaNmA==",
+      "version": "8.42.0",
+      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.42.0.tgz",
+      "integrity": "sha512-6SWlXpWU5AvId8Ac7zjzmIOqMOba/JWY8XZ4A7q7Gn1Vlfg/SFFIlrtHXt9nPn4op9ZPAkl91Jao+QQv3r/ukw==",
       "dev": true
     },
     "@ethereumjs/common": {
@@ -19229,9 +19229,9 @@
       "integrity": "sha512-0NyytTlPJwB/BF5LtRV8rrABDbe3TdTXqNB3PdZ+UUUZAEIrdOJdmABqKjt4AXwIoJNaRVVZEXxpNrqvE1GAYQ=="
     },
     "@humanwhocodes/config-array": {
-      "version": "0.11.8",
-      "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.8.tgz",
-      "integrity": "sha512-UybHIJzJnR5Qc/MsD9Kr+RpO2h+/P1GhOwdiLPXK5TWk5sgTdu88bTD9UP+CKbPPh5Rni1u0GjAdYQLemG8g+g==",
+      "version": "0.11.10",
+      "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.10.tgz",
+      "integrity": "sha512-KVVjQmNUepDVGXNuoRRdmmEjruj0KfiGSbS8LVc12LMsWDQzRXJ0qdhN8L8uUigKpfEHRhlaQFY0ib1tnUbNeQ==",
       "dev": true,
       "requires": {
         "@humanwhocodes/object-schema": "^1.2.1",
@@ -22837,16 +22837,16 @@
       }
     },
     "eslint": {
-      "version": "8.41.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.41.0.tgz",
-      "integrity": "sha512-WQDQpzGBOP5IrXPo4Hc0814r4/v2rrIsB0rhT7jtunIalgg6gYXWhRMOejVO8yH21T/FGaxjmFjBMNqcIlmH1Q==",
+      "version": "8.42.0",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.42.0.tgz",
+      "integrity": "sha512-ulg9Ms6E1WPf67PHaEY4/6E2tEn5/f7FXGzr3t9cBMugOmf1INYvuUwwh1aXQN4MfJ6a5K2iNwP3w4AColvI9A==",
       "dev": true,
       "requires": {
         "@eslint-community/eslint-utils": "^4.2.0",
         "@eslint-community/regexpp": "^4.4.0",
         "@eslint/eslintrc": "^2.0.3",
-        "@eslint/js": "8.41.0",
-        "@humanwhocodes/config-array": "^0.11.8",
+        "@eslint/js": "8.42.0",
+        "@humanwhocodes/config-array": "^0.11.10",
         "@humanwhocodes/module-importer": "^1.0.1",
         "@nodelib/fs.walk": "^1.2.8",
         "ajv": "^6.10.0",
diff --git a/apps/block_scout_web/assets/package.json b/apps/block_scout_web/assets/package.json
index 2dc96f9a6d25..2c9c6d1804be 100644
--- a/apps/block_scout_web/assets/package.json
+++ b/apps/block_scout_web/assets/package.json
@@ -90,7 +90,7 @@
     "copy-webpack-plugin": "^11.0.0",
     "css-loader": "^5.2.7",
     "css-minimizer-webpack-plugin": "^5.0.0",
-    "eslint": "^8.41.0",
+    "eslint": "^8.42.0",
     "eslint-config-standard": "^17.1.0",
     "eslint-plugin-import": "^2.27.5",
     "eslint-plugin-node": "^11.1.0",

From 5b8dfd40a7ad1c28c0818f380dfe70042933d8ec Mon Sep 17 00:00:00 2001
From: Nikita Pozdniakov <nikitosing4@mail.ru>
Date: Mon, 5 Jun 2023 22:10:27 +0300
Subject: [PATCH 062/909] Fix single 1155 transfer displaying

---
 .../views/api/v2/transaction_view.ex          |  4 +-
 .../channels/websocket_v2_test.exs            | 10 ++---
 .../api/v2/address_controller_test.exs        | 10 ++---
 .../api/v2/token_controller_test.exs          | 10 ++---
 .../api/v2/transaction_controller_test.exs    | 39 ++++++++++++++++---
 5 files changed, 50 insertions(+), 23 deletions(-)

diff --git a/apps/block_scout_web/lib/block_scout_web/views/api/v2/transaction_view.ex b/apps/block_scout_web/lib/block_scout_web/views/api/v2/transaction_view.ex
index 3ab56824b0b8..f12f320dc4bc 100644
--- a/apps/block_scout_web/lib/block_scout_web/views/api/v2/transaction_view.ex
+++ b/apps/block_scout_web/lib/block_scout_web/views/api/v2/transaction_view.ex
@@ -155,9 +155,7 @@ defmodule BlockScoutWeb.API.V2.TransactionView do
         %{"token_id" => List.first(token_transfer.token_ids), "value" => value, "decimals" => decimals}
 
       {:ok, :erc1155_instance, values, token_ids, decimals} ->
-        Enum.map(Enum.zip(values, token_ids), fn {value, token_id} ->
-          %{"value" => value, "token_id" => token_id, "decimals" => decimals}
-        end)
+        %{"token_id" => List.first(token_ids), "value" => List.first(values), "decimals" => decimals}
 
       {:ok, value, decimals} ->
         %{"value" => value, "decimals" => decimals}
diff --git a/apps/block_scout_web/test/block_scout_web/channels/websocket_v2_test.exs b/apps/block_scout_web/test/block_scout_web/channels/websocket_v2_test.exs
index 059fb4fa3855..5dc25c183ca8 100644
--- a/apps/block_scout_web/test/block_scout_web/channels/websocket_v2_test.exs
+++ b/apps/block_scout_web/test/block_scout_web/channels/websocket_v2_test.exs
@@ -375,6 +375,11 @@ defmodule BlockScoutWeb.WebsocketV2Test do
     assert Address.checksum(transaction.to_address_hash) == json["to"]["hash"]
   end
 
+  # with the current implementation no transfers should come with list in totals
+  defp check_total(%Token{type: nft}, json, _token_transfer) when nft in ["ERC-721", "ERC-1155"] and is_list(json) do
+    false
+  end
+
   defp check_total(%Token{type: nft}, json, token_transfer) when nft in ["ERC-1155"] do
     json["token_id"] in Enum.map(token_transfer.token_ids, fn x -> to_string(x) end) and
       json["value"] == to_string(token_transfer.amount)
@@ -384,10 +389,5 @@ defmodule BlockScoutWeb.WebsocketV2Test do
     json["token_id"] in Enum.map(token_transfer.token_ids, fn x -> to_string(x) end)
   end
 
-  # with the current implementation no transfers should come with list in totals
-  defp check_total(%Token{type: nft}, json, _token_transfer) when nft in ["ERC-721", "ERC-1155"] and is_list(json) do
-    false
-  end
-
   defp check_total(_, _, _), do: true
 end
diff --git a/apps/block_scout_web/test/block_scout_web/controllers/api/v2/address_controller_test.exs b/apps/block_scout_web/test/block_scout_web/controllers/api/v2/address_controller_test.exs
index 0902bf47eb8f..a0af15b944d2 100644
--- a/apps/block_scout_web/test/block_scout_web/controllers/api/v2/address_controller_test.exs
+++ b/apps/block_scout_web/test/block_scout_web/controllers/api/v2/address_controller_test.exs
@@ -1746,6 +1746,11 @@ defmodule BlockScoutWeb.API.V2.AddressControllerTest do
     compare_item(Enum.at(list, 0), Enum.at(second_page_resp["items"], 0))
   end
 
+  # with the current implementation no transfers should come with list in totals
+  def check_total(%Token{type: nft}, json, _token_transfer) when nft in ["ERC-721", "ERC-1155"] and is_list(json) do
+    false
+  end
+
   def check_total(%Token{type: nft}, json, token_transfer) when nft in ["ERC-1155"] do
     json["token_id"] in Enum.map(token_transfer.token_ids, fn x -> to_string(x) end) and
       json["value"] == to_string(token_transfer.amount)
@@ -1755,10 +1760,5 @@ defmodule BlockScoutWeb.API.V2.AddressControllerTest do
     json["token_id"] in Enum.map(token_transfer.token_ids, fn x -> to_string(x) end)
   end
 
-  # with the current implementation no transfers should come with list in totals
-  def check_total(%Token{type: nft}, json, _token_transfer) when nft in ["ERC-721", "ERC-1155"] and is_list(json) do
-    false
-  end
-
   def check_total(_, _, _), do: true
 end
diff --git a/apps/block_scout_web/test/block_scout_web/controllers/api/v2/token_controller_test.exs b/apps/block_scout_web/test/block_scout_web/controllers/api/v2/token_controller_test.exs
index 185c643b1c01..de65f335d686 100644
--- a/apps/block_scout_web/test/block_scout_web/controllers/api/v2/token_controller_test.exs
+++ b/apps/block_scout_web/test/block_scout_web/controllers/api/v2/token_controller_test.exs
@@ -997,6 +997,11 @@ defmodule BlockScoutWeb.API.V2.TokenControllerTest do
     compare_item(Repo.preload(instance, [{:token, :contract_address}]).token, json["token"])
   end
 
+  # with the current implementation no transfers should come with list in totals
+  def check_total(%Token{type: nft}, json, _token_transfer) when nft in ["ERC-721", "ERC-1155"] and is_list(json) do
+    false
+  end
+
   def check_total(%Token{type: nft}, json, token_transfer) when nft in ["ERC-1155"] do
     json["token_id"] in Enum.map(token_transfer.token_ids, fn x -> to_string(x) end) and
       json["value"] == to_string(token_transfer.amount)
@@ -1006,11 +1011,6 @@ defmodule BlockScoutWeb.API.V2.TokenControllerTest do
     json["token_id"] in Enum.map(token_transfer.token_ids, fn x -> to_string(x) end)
   end
 
-  # with the current implementation no transfers should come with list in totals
-  def check_total(%Token{type: nft}, json, _token_transfer) when nft in ["ERC-721", "ERC-1155"] and is_list(json) do
-    false
-  end
-
   def check_total(_, _, _), do: true
 
   defp check_paginated_response(first_page_resp, second_page_resp, list) do
diff --git a/apps/block_scout_web/test/block_scout_web/controllers/api/v2/transaction_controller_test.exs b/apps/block_scout_web/test/block_scout_web/controllers/api/v2/transaction_controller_test.exs
index a55355fcfb08..14429b489b4f 100644
--- a/apps/block_scout_web/test/block_scout_web/controllers/api/v2/transaction_controller_test.exs
+++ b/apps/block_scout_web/test/block_scout_web/controllers/api/v2/transaction_controller_test.exs
@@ -250,6 +250,35 @@ defmodule BlockScoutWeb.API.V2.TransactionControllerTest do
 
       assert Enum.count(response["token_transfers"]) == 10
     end
+
+    test "single 1155 flattened", %{conn: conn} do
+      token = insert(:token, type: "ERC-1155")
+
+      tx =
+        :transaction
+        |> insert()
+        |> with_block()
+
+      tt =
+        insert(:token_transfer,
+          transaction: tx,
+          block: tx.block,
+          block_number: tx.block_number,
+          token_contract_address: token.contract_address,
+          token_ids: [1],
+          amounts: [2],
+          amount: nil
+        )
+
+      request = get(conn, "/api/v2/transactions/" <> to_string(tx.hash))
+
+      assert response = json_response(request, 200)
+      compare_item(tx, response)
+
+      assert Enum.count(response["token_transfers"]) == 1
+      assert is_map(Enum.at(response["token_transfers"], 0)["total"])
+      assert compare_item(%TokenTransfer{tt | amount: 2}, Enum.at(response["token_transfers"], 0))
+    end
   end
 
   describe "/transactions/{tx_hash}/internal-transactions" do
@@ -1028,6 +1057,11 @@ defmodule BlockScoutWeb.API.V2.TransactionControllerTest do
     compare_item(Enum.at(txs, 0), Enum.at(second_page_resp["items"], 0), wl_names)
   end
 
+  # with the current implementation no transfers should come with list in totals
+  defp check_total(%Token{type: nft}, json, _token_transfer) when nft in ["ERC-721", "ERC-1155"] and is_list(json) do
+    false
+  end
+
   defp check_total(%Token{type: nft}, json, token_transfer) when nft in ["ERC-1155"] do
     json["token_id"] in Enum.map(token_transfer.token_ids, fn x -> to_string(x) end) and
       json["value"] == to_string(token_transfer.amount)
@@ -1037,10 +1071,5 @@ defmodule BlockScoutWeb.API.V2.TransactionControllerTest do
     json["token_id"] in Enum.map(token_transfer.token_ids, fn x -> to_string(x) end)
   end
 
-  # with the current implementation no transfers should come with list in totals
-  defp check_total(%Token{type: nft}, json, _token_transfer) when nft in ["ERC-721", "ERC-1155"] and is_list(json) do
-    false
-  end
-
   defp check_total(_, _, _), do: true
 end

From b5f6c3a3fa5355e0b3b493cc5461c95b500a5c61 Mon Sep 17 00:00:00 2001
From: Nikita Pozdniakov <nikitosing4@mail.ru>
Date: Mon, 5 Jun 2023 22:15:19 +0300
Subject: [PATCH 063/909] Changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0cadde6ec3b8..77060503680d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,6 +12,7 @@
 
 ### Fixes
 
+- [#7635](https://github.com/blockscout/blockscout/pull/7635) - Fix single 1155 transfer displaying
 - [#7611](https://github.com/blockscout/blockscout/pull/7611) - Fix tokens pagination
 - [#7566](https://github.com/blockscout/blockscout/pull/7566) - Account: check composed email beofre sending
 - [#7564](https://github.com/blockscout/blockscout/pull/7564) - Return contract type in address view

From 2ec6268b8e237212b0caa6531f93c5ca422263cb Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 5 Jun 2023 19:33:41 +0000
Subject: [PATCH 064/909] Bump webpack from 5.85.0 to 5.85.1 in
 /apps/block_scout_web/assets

Bumps [webpack](https://github.com/webpack/webpack) from 5.85.0 to 5.85.1.
- [Release notes](https://github.com/webpack/webpack/releases)
- [Commits](https://github.com/webpack/webpack/compare/v5.85.0...v5.85.1)

---
updated-dependencies:
- dependency-name: webpack
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 apps/block_scout_web/assets/package-lock.json | 14 +++++++-------
 apps/block_scout_web/assets/package.json      |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/apps/block_scout_web/assets/package-lock.json b/apps/block_scout_web/assets/package-lock.json
index 1a9324732324..26d421d4f5a7 100644
--- a/apps/block_scout_web/assets/package-lock.json
+++ b/apps/block_scout_web/assets/package-lock.json
@@ -92,7 +92,7 @@
         "sass": "^1.62.1",
         "sass-loader": "^13.3.1",
         "style-loader": "^3.3.3",
-        "webpack": "^5.85.0",
+        "webpack": "^5.85.1",
         "webpack-cli": "^5.1.3"
       },
       "engines": {
@@ -16971,9 +16971,9 @@
       }
     },
     "node_modules/webpack": {
-      "version": "5.85.0",
-      "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.85.0.tgz",
-      "integrity": "sha512-7gazTiYqwo5OSqwH1tigLDL2r3qDeP2dOKYgd+LlXpsUMqDTklg6tOghexqky0/+6QY38kb/R/uRPUleuL43zg==",
+      "version": "5.85.1",
+      "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.85.1.tgz",
+      "integrity": "sha512-xTb7MRf4LY8Z5rzn7aIx4TDrwYJrjcHnIfU1TqtyZOoObyuGSpAUwIvVuqq5wPnv7WEgQr8UvO1q/dgoGG4HjA==",
       "dev": true,
       "dependencies": {
         "@types/eslint-scope": "^3.7.3",
@@ -30324,9 +30324,9 @@
       "dev": true
     },
     "webpack": {
-      "version": "5.85.0",
-      "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.85.0.tgz",
-      "integrity": "sha512-7gazTiYqwo5OSqwH1tigLDL2r3qDeP2dOKYgd+LlXpsUMqDTklg6tOghexqky0/+6QY38kb/R/uRPUleuL43zg==",
+      "version": "5.85.1",
+      "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.85.1.tgz",
+      "integrity": "sha512-xTb7MRf4LY8Z5rzn7aIx4TDrwYJrjcHnIfU1TqtyZOoObyuGSpAUwIvVuqq5wPnv7WEgQr8UvO1q/dgoGG4HjA==",
       "dev": true,
       "requires": {
         "@types/eslint-scope": "^3.7.3",
diff --git a/apps/block_scout_web/assets/package.json b/apps/block_scout_web/assets/package.json
index b4ffffd2f0b6..87abcb63f59f 100644
--- a/apps/block_scout_web/assets/package.json
+++ b/apps/block_scout_web/assets/package.json
@@ -104,7 +104,7 @@
     "sass": "^1.62.1",
     "sass-loader": "^13.3.1",
     "style-loader": "^3.3.3",
-    "webpack": "^5.85.0",
+    "webpack": "^5.85.1",
     "webpack-cli": "^5.1.3"
   },
   "jest": {

From afb380177561302bfe1078616e94f8c83eee13b0 Mon Sep 17 00:00:00 2001
From: nikitosing <32202610+nikitosing@users.noreply.github.com>
Date: Mon, 5 Jun 2023 22:36:18 +0300
Subject: [PATCH 065/909] Add new ipfs clause; Decrease timeout for NFT
 metadata fetch (#7629)

* Add new ipfs clause; Decrease timeout for NFT metadata fetch

* Changelog
---
 CHANGELOG.md                                  |  1 +
 .../token/instance_metadata_retriever.ex      |  9 ++--
 .../instance_metadata_retriever_test.exs      | 47 +++++++++++++++++++
 3 files changed, 54 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 77060503680d..29ca633f8716 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,6 +13,7 @@
 ### Fixes
 
 - [#7635](https://github.com/blockscout/blockscout/pull/7635) - Fix single 1155 transfer displaying
+- [#7629](https://github.com/blockscout/blockscout/pull/7629) - Fix NFT fetcher
 - [#7611](https://github.com/blockscout/blockscout/pull/7611) - Fix tokens pagination
 - [#7566](https://github.com/blockscout/blockscout/pull/7566) - Account: check composed email beofre sending
 - [#7564](https://github.com/blockscout/blockscout/pull/7564) - Return contract type in address view
diff --git a/apps/explorer/lib/explorer/token/instance_metadata_retriever.ex b/apps/explorer/lib/explorer/token/instance_metadata_retriever.ex
index 0594e401b564..6967a756aed3 100644
--- a/apps/explorer/lib/explorer/token/instance_metadata_retriever.ex
+++ b/apps/explorer/lib/explorer/token/instance_metadata_retriever.ex
@@ -187,6 +187,10 @@ defmodule Explorer.Token.InstanceMetadataRetriever do
     fetch_from_ipfs(right, hex_token_id)
   end
 
+  defp fetch_json_from_uri({:ok, ["ipfs/" <> right]}, hex_token_id) do
+    fetch_from_ipfs(right, hex_token_id)
+  end
+
   defp fetch_json_from_uri({:ok, [@ipfs_protocol <> right]}, hex_token_id) do
     fetch_from_ipfs(right, hex_token_id)
   end
@@ -240,8 +244,7 @@ defmodule Explorer.Token.InstanceMetadataRetriever do
 
   def fetch_metadata_from_uri_inner(uri, hex_token_id) do
     case Application.get_env(:explorer, :http_adapter).get(uri, [],
-           timeout: 60_000,
-           recv_timeout: 60_000,
+           recv_timeout: 30_000,
            follow_redirect: true
          ) do
       {:ok, %Response{body: body, status_code: 200, headers: headers}} ->
@@ -263,7 +266,7 @@ defmodule Explorer.Token.InstanceMetadataRetriever do
           fetcher: :token_instances
         )
 
-        {:error, reason |> inspect(reason) |> truncate_error()}
+        {:error, reason |> inspect() |> truncate_error()}
     end
   rescue
     e ->
diff --git a/apps/explorer/test/explorer/token/instance_metadata_retriever_test.exs b/apps/explorer/test/explorer/token/instance_metadata_retriever_test.exs
index d6a5fb288051..e9ef52dc583e 100644
--- a/apps/explorer/test/explorer/token/instance_metadata_retriever_test.exs
+++ b/apps/explorer/test/explorer/token/instance_metadata_retriever_test.exs
@@ -555,5 +555,52 @@ defmodule Explorer.Token.InstanceMetadataRetrieverTest do
               }} ==
                InstanceMetadataRetriever.fetch_json(%{"0e89341c" => {:ok, ["http://localhost:#{bypass.port}#{path}"]}})
     end
+
+    test "fetch ipfs of ipfs/{id} format" do
+      EthereumJSONRPC.Mox
+      |> expect(:json_rpc, fn [
+                                %{
+                                  id: 0,
+                                  jsonrpc: "2.0",
+                                  method: "eth_call",
+                                  params: [
+                                    %{
+                                      data:
+                                        "0xc87b56dd0000000000000000000000000000000000000000000000000000000000000000",
+                                      to: "0x7e01CC81fCfdf6a71323900288A69e234C464f63"
+                                    },
+                                    "latest"
+                                  ]
+                                }
+                              ],
+                              _options ->
+        {:ok,
+         [
+           %{
+             id: 0,
+             jsonrpc: "2.0",
+             result:
+               "0x00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000033697066732f516d6439707654684577676a544262456b4e6d6d47466263704a4b773137666e524241543454643472636f67323200000000000000000000000000"
+           }
+         ]}
+      end)
+
+      Application.put_env(:explorer, :http_adapter, Explorer.Mox.HTTPoison)
+
+      Explorer.Mox.HTTPoison
+      |> expect(:get, fn "https://ipfs.io/ipfs/Qmd9pvThEwgjTBbEkNmmGFbcpJKw17fnRBAT4Td4rcog22", _headers, _options ->
+        {:ok, %HTTPoison.Response{status_code: 200, body: "123", headers: [{"Content-Type", "image/jpg"}]}}
+      end)
+
+      assert {:ok,
+              %{
+                metadata: %{
+                  "image" => "https://ipfs.io/ipfs/Qmd9pvThEwgjTBbEkNmmGFbcpJKw17fnRBAT4Td4rcog22"
+                }
+              }} ==
+               InstanceMetadataRetriever.fetch_metadata("0x7e01CC81fCfdf6a71323900288A69e234C464f63", 0)
+
+      Application.put_env(:explorer, :http_adapter, HTTPoison)
+    end
   end
 end

From e81f2ee75a917a1dedc8881c8f51da0d743950b2 Mon Sep 17 00:00:00 2001
From: nikitosing <32202610+nikitosing@users.noreply.github.com>
Date: Mon, 5 Jun 2023 23:30:51 +0300
Subject: [PATCH 066/909] API and smart-contracts fixes (#7614)

* Add icon url to search results

* Move vyper evm versions to envs

* Fix smart contracts reading

* Fix review comments
---
 CHANGELOG.md                                  |   3 +-
 ...ddress_contract_verification_controller.ex |   2 +-
 ...ification_via_flattened_code_controller.ex |   2 +-
 ...ication_via_multi_part_files_controller.ex |   2 +-
 .../api/v2/smart_contract_controller.ex       |   1 +
 .../api/v2/verification_controller.ex         |   5 +-
 .../controllers/smart_contract_controller.ex  |   3 +-
 .../lib/block_scout_web/notifier.ex           |   2 +-
 .../smart_contract/_functions.html.eex        |   2 +-
 .../views/api/v2/search_view.ex               |   3 +-
 .../views/api/v2/smart_contract_view.ex       |  38 ++-
 .../views/smart_contract_view.ex              |  46 +--
 .../api/v2/smart_contract_controller_test.exs | 284 +++++++++++++++++-
 apps/explorer/lib/explorer/chain.ex           |  18 +-
 .../lib/explorer/smart_contract/helper.ex     |   3 +-
 .../lib/explorer/smart_contract/reader.ex     |  49 ++-
 .../smart_contract/solidity/code_compiler.ex  |  18 +-
 .../smart_contract/solidity/verifier.ex       |  10 +-
 .../explorer/smart_contract/reader_test.exs   |   8 +-
 .../solidity/code_compiler_test.exs           |  14 +-
 config/runtime.exs                            |   9 +-
 docker-compose/envs/common-blockscout.env     |   3 +-
 docker/Makefile                               |   7 +-
 23 files changed, 446 insertions(+), 86 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 29ca633f8716..4db918c76057 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -14,8 +14,9 @@
 
 - [#7635](https://github.com/blockscout/blockscout/pull/7635) - Fix single 1155 transfer displaying
 - [#7629](https://github.com/blockscout/blockscout/pull/7629) - Fix NFT fetcher
+- [#7614](https://github.com/blockscout/blockscout/pull/7614) - API and smart-contracts fixes and improvements
 - [#7611](https://github.com/blockscout/blockscout/pull/7611) - Fix tokens pagination
-- [#7566](https://github.com/blockscout/blockscout/pull/7566) - Account: check composed email beofre sending
+- [#7566](https://github.com/blockscout/blockscout/pull/7566) - Account: check composed email before sending
 - [#7564](https://github.com/blockscout/blockscout/pull/7564) - Return contract type in address view
 - [#7562](https://github.com/blockscout/blockscout/pull/7562) - Remove fallback from Read methods
 - [#7537](https://github.com/blockscout/blockscout/pull/7537), [#7553](https://github.com/blockscout/blockscout/pull/7553) - Withdrawals fixes and improvements
diff --git a/apps/block_scout_web/lib/block_scout_web/controllers/address_contract_verification_controller.ex b/apps/block_scout_web/lib/block_scout_web/controllers/address_contract_verification_controller.ex
index 9f2d689093fc..5a00556fac09 100644
--- a/apps/block_scout_web/lib/block_scout_web/controllers/address_contract_verification_controller.ex
+++ b/apps/block_scout_web/lib/block_scout_web/controllers/address_contract_verification_controller.ex
@@ -38,7 +38,7 @@ defmodule BlockScoutWeb.AddressContractVerificationController do
       render(conn, "new.html",
         changeset: changeset,
         compiler_versions: compiler_versions,
-        evm_versions: CodeCompiler.allowed_evm_versions(),
+        evm_versions: CodeCompiler.evm_versions(:solidity),
         address_hash: address_hash_string
       )
     end
diff --git a/apps/block_scout_web/lib/block_scout_web/controllers/address_contract_verification_via_flattened_code_controller.ex b/apps/block_scout_web/lib/block_scout_web/controllers/address_contract_verification_via_flattened_code_controller.ex
index 99017a86eebd..fab2192cfae0 100644
--- a/apps/block_scout_web/lib/block_scout_web/controllers/address_contract_verification_via_flattened_code_controller.ex
+++ b/apps/block_scout_web/lib/block_scout_web/controllers/address_contract_verification_via_flattened_code_controller.ex
@@ -33,7 +33,7 @@ defmodule BlockScoutWeb.AddressContractVerificationViaFlattenedCodeController do
       render(conn, "new.html",
         changeset: changeset,
         compiler_versions: compiler_versions,
-        evm_versions: CodeCompiler.allowed_evm_versions(),
+        evm_versions: CodeCompiler.evm_versions(:solidity),
         address_hash: address_hash_string
       )
     end
diff --git a/apps/block_scout_web/lib/block_scout_web/controllers/address_contract_verification_via_multi_part_files_controller.ex b/apps/block_scout_web/lib/block_scout_web/controllers/address_contract_verification_via_multi_part_files_controller.ex
index cdc6d44b32be..7d0f819e96e2 100644
--- a/apps/block_scout_web/lib/block_scout_web/controllers/address_contract_verification_via_multi_part_files_controller.ex
+++ b/apps/block_scout_web/lib/block_scout_web/controllers/address_contract_verification_via_multi_part_files_controller.ex
@@ -33,7 +33,7 @@ defmodule BlockScoutWeb.AddressContractVerificationViaMultiPartFilesController d
       render(conn, "new.html",
         changeset: changeset,
         address_hash: address_hash_string,
-        evm_versions: CodeCompiler.allowed_evm_versions(),
+        evm_versions: CodeCompiler.evm_versions(:solidity),
         compiler_versions: compiler_versions
       )
     end
diff --git a/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/smart_contract_controller.ex b/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/smart_contract_controller.ex
index dc294bed7386..8d016c404714 100644
--- a/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/smart_contract_controller.ex
+++ b/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/smart_contract_controller.ex
@@ -176,6 +176,7 @@ defmodule BlockScoutWeb.API.V2.SmartContractController do
             contract_type,
             params["from"],
             address.smart_contract.abi,
+            true,
             @api_true
           )
         end
diff --git a/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/verification_controller.ex b/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/verification_controller.ex
index 60ee9fbc13f0..2463d5792d82 100644
--- a/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/verification_controller.ex
+++ b/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/verification_controller.ex
@@ -16,7 +16,6 @@ defmodule BlockScoutWeb.API.V2.VerificationController do
   @api_true [api?: true]
 
   def config(conn, _params) do
-    evm_versions = CodeCompiler.allowed_evm_versions()
     solidity_compiler_versions = CompilerVersion.fetch_version_list(:solc)
     vyper_compiler_versions = CompilerVersion.fetch_version_list(:vyper)
 
@@ -31,11 +30,11 @@ defmodule BlockScoutWeb.API.V2.VerificationController do
 
     conn
     |> json(%{
-      solidity_evm_versions: evm_versions,
+      solidity_evm_versions: CodeCompiler.evm_versions(:solidity),
       solidity_compiler_versions: solidity_compiler_versions,
       vyper_compiler_versions: vyper_compiler_versions,
       verification_options: verification_options,
-      vyper_evm_versions: ["byzantium", "constantinople", "petersburg", "istanbul"],
+      vyper_evm_versions: CodeCompiler.evm_versions(:vyper),
       is_rust_verifier_microservice_enabled: RustVerifierInterface.enabled?()
     })
   end
diff --git a/apps/block_scout_web/lib/block_scout_web/controllers/smart_contract_controller.ex b/apps/block_scout_web/lib/block_scout_web/controllers/smart_contract_controller.ex
index 0ba2f294ad38..b403e0e7d592 100644
--- a/apps/block_scout_web/lib/block_scout_web/controllers/smart_contract_controller.ex
+++ b/apps/block_scout_web/lib/block_scout_web/controllers/smart_contract_controller.ex
@@ -196,7 +196,8 @@ defmodule BlockScoutWeb.SmartContractController do
             %{method_id: params["method_id"], args: args},
             contract_type,
             params["from"],
-            address.smart_contract && address.smart_contract.abi
+            address.smart_contract && address.smart_contract.abi,
+            true
           )
         end
 
diff --git a/apps/block_scout_web/lib/block_scout_web/notifier.ex b/apps/block_scout_web/lib/block_scout_web/notifier.ex
index e70ff4202910..7ca4a892a880 100644
--- a/apps/block_scout_web/lib/block_scout_web/notifier.ex
+++ b/apps/block_scout_web/lib/block_scout_web/notifier.ex
@@ -80,7 +80,7 @@ defmodule BlockScoutWeb.Notifier do
             |> View.render_to_string("new.html",
               changeset: changeset,
               compiler_versions: compiler_versions,
-              evm_versions: CodeCompiler.allowed_evm_versions(),
+              evm_versions: CodeCompiler.evm_versions(:solidity),
               address_hash: address_hash,
               conn: conn,
               retrying: true
diff --git a/apps/block_scout_web/lib/block_scout_web/templates/smart_contract/_functions.html.eex b/apps/block_scout_web/lib/block_scout_web/templates/smart_contract/_functions.html.eex
index ced64b2c0672..af6885a21160 100644
--- a/apps/block_scout_web/lib/block_scout_web/templates/smart_contract/_functions.html.eex
+++ b/apps/block_scout_web/lib/block_scout_web/templates/smart_contract/_functions.html.eex
@@ -145,7 +145,7 @@
                     </div>
                   </div> 
                 <% else %>
-                  <div class="align-self-center function-output word-break-all <%= if not_last_element?(length, index), do: "mb-1" %>"><%= raw(values_with_type(output["value"], output["type"], [output["name"]], 0, output["components"])) %></div>
+                  <div class="align-self-center function-output word-break-all <%= if not_last_element?(length, index), do: "mb-1" %>"><%= raw(values_with_type(output["value"], output["type"], fetch_name(function["names"], index), 0)) %></div>
                 <% end %>
               <% end %>
             <% end %>
diff --git a/apps/block_scout_web/lib/block_scout_web/views/api/v2/search_view.ex b/apps/block_scout_web/lib/block_scout_web/views/api/v2/search_view.ex
index bddd3b60d9ef..a8ac5cc64429 100644
--- a/apps/block_scout_web/lib/block_scout_web/views/api/v2/search_view.ex
+++ b/apps/block_scout_web/lib/block_scout_web/views/api/v2/search_view.ex
@@ -23,7 +23,8 @@ defmodule BlockScoutWeb.API.V2.SearchView do
       "symbol" => search_result.symbol,
       "address" => search_result.address_hash,
       "token_url" => token_path(Endpoint, :show, search_result.address_hash),
-      "address_url" => address_path(Endpoint, :show, search_result.address_hash)
+      "address_url" => address_path(Endpoint, :show, search_result.address_hash),
+      "icon_url" => search_result.icon_url
     }
   end
 
diff --git a/apps/block_scout_web/lib/block_scout_web/views/api/v2/smart_contract_view.ex b/apps/block_scout_web/lib/block_scout_web/views/api/v2/smart_contract_view.ex
index bfe8f1d09d1d..4fc3b779948e 100644
--- a/apps/block_scout_web/lib/block_scout_web/views/api/v2/smart_contract_view.ex
+++ b/apps/block_scout_web/lib/block_scout_web/views/api/v2/smart_contract_view.ex
@@ -98,7 +98,7 @@ defmodule BlockScoutWeb.API.V2.SmartContractView do
         %{result: %{error: error}, is_error: true}
 
       _ ->
-        %{result: %{output: outputs, names: names}, is_error: false}
+        %{result: %{output: Enum.map(outputs, &render_json/1), names: names}, is_error: false}
     end
   end
 
@@ -118,13 +118,13 @@ defmodule BlockScoutWeb.API.V2.SmartContractView do
           function
           |> Map.drop(["abi_outputs"])
 
-        outputs = Enum.map(result["outputs"], &prepare_output/1)
+        outputs = result["outputs"] |> Enum.map(&prepare_output/1)
         Map.replace(result, "outputs", outputs)
     end
   end
 
   defp prepare_output(%{"type" => type, "value" => value} = output) do
-    Map.replace(output, "value", ABIEncodedValueView.value_json(type, value))
+    Map.replace(output, "value", render_json(value, type))
   end
 
   defp prepare_output(output), do: output
@@ -277,4 +277,36 @@ defmodule BlockScoutWeb.API.V2.SmartContractView do
         "solidity"
     end
   end
+
+  def render_json(%{"type" => type, "value" => value}) do
+    %{"type" => type, "value" => render_json(value, type)}
+  end
+
+  def render_json(value, type) when type in [:address, "address", "address payable"] do
+    SmartContractView.cast_address(value)
+  end
+
+  def render_json(value, type) when type in [:string, "string"] do
+    to_string(value)
+  end
+
+  def render_json(value, type) when is_tuple(value) do
+    value
+    |> SmartContractView.zip_tuple_values_with_types(type)
+    |> Enum.map(fn {type, value} ->
+      render_json(value, type)
+    end)
+  end
+
+  def render_json(value, type) when is_list(value) do
+    value |> Enum.map(&render_json(&1, type))
+  end
+
+  def render_json(value, _type) when is_binary(value) do
+    SmartContractView.binary_to_utf_string(value)
+  end
+
+  def render_json(value, _type) do
+    value
+  end
 end
diff --git a/apps/block_scout_web/lib/block_scout_web/views/smart_contract_view.ex b/apps/block_scout_web/lib/block_scout_web/views/smart_contract_view.ex
index 39297f295694..4a96a93adb6c 100644
--- a/apps/block_scout_web/lib/block_scout_web/views/smart_contract_view.ex
+++ b/apps/block_scout_web/lib/block_scout_web/views/smart_contract_view.ex
@@ -6,6 +6,8 @@ defmodule BlockScoutWeb.SmartContractView do
   alias Explorer.Chain.Hash.Address, as: HashAddress
   alias Explorer.SmartContract.Helper
 
+  require Logger
+
   def queryable?(inputs) when not is_nil(inputs), do: Enum.any?(inputs)
 
   def queryable?(inputs) when is_nil(inputs), do: false
@@ -63,7 +65,7 @@ defmodule BlockScoutWeb.SmartContractView do
       String.starts_with?(type, "address") ->
         values =
           value
-          |> Enum.map_join(", ", &binary_to_utf_string(&1))
+          |> Enum.map_join(", ", &cast_address(&1))
 
         render_array_type_value(type, values, fetch_name(names, index))
 
@@ -117,6 +119,17 @@ defmodule BlockScoutWeb.SmartContractView do
   def values_with_type(value, :error, _components),
     do: render_type_value("error", Helper.sanitize_input(value), "error")
 
+  def cast_address(value) do
+    case HashAddress.cast(value) do
+      {:ok, address} ->
+        to_string(address)
+
+      _ ->
+        Logger.warn(fn -> ["Error decoding address value: #{inspect(value)}"] end)
+        "(decoding error)"
+    end
+  end
+
   defp fetch_name(nil, _index), do: nil
 
   defp fetch_name([], _index), do: nil
@@ -137,6 +150,15 @@ defmodule BlockScoutWeb.SmartContractView do
   end
 
   defp tuple_to_array(value, type, names) do
+    value
+    |> zip_tuple_values_with_types(type)
+    |> Enum.with_index()
+    |> Enum.map(fn {{type, value}, index} ->
+      values_with_type(value, type, fetch_name(names, index), 0)
+    end)
+  end
+
+  def zip_tuple_values_with_types(value, type) do
     types_string =
       type
       |> String.slice(6..-2)
@@ -165,16 +187,10 @@ defmodule BlockScoutWeb.SmartContractView do
       value
       |> Tuple.to_list()
 
-    values_types_list = Enum.zip(tuple_types, values_list)
-
-    values_types_list
-    |> Enum.with_index()
-    |> Enum.map(fn {{type, value}, index} ->
-      values_with_type(value, type, fetch_name(names, index), 0)
-    end)
+    Enum.zip(tuple_types, values_list)
   end
 
-  defp compose_array_if_to_merge(arr, val, to_merge) do
+  def compose_array_if_to_merge(arr, val, to_merge) do
     if count_string_symbols(val)["]"] > count_string_symbols(val)["["] do
       updated_arr = update_last_list_item(arr, val)
       {updated_arr, !to_merge}
@@ -184,7 +200,7 @@ defmodule BlockScoutWeb.SmartContractView do
     end
   end
 
-  defp compose_array_else(arr, val, to_merge) do
+  def compose_array_else(arr, val, to_merge) do
     if count_string_symbols(val)["["] > count_string_symbols(val)["]"] do
       # credo:disable-for-next-line
       {arr ++ [val], !to_merge}
@@ -214,7 +230,7 @@ defmodule BlockScoutWeb.SmartContractView do
     end)
   end
 
-  defp binary_to_utf_string(item) do
+  def binary_to_utf_string(item) do
     case Integer.parse(to_string(item)) do
       {item_integer, ""} ->
         to_string(item_integer)
@@ -229,11 +245,7 @@ defmodule BlockScoutWeb.SmartContractView do
   end
 
   defp add_0x(item) do
-    if String.starts_with?(item, "0x") do
-      item
-    else
-      "0x" <> Base.encode16(item, case: :lower)
-    end
+    "0x" <> Base.encode16(item, case: :lower)
   end
 
   defp render_type_value(type, value, type) do
@@ -250,7 +262,7 @@ defmodule BlockScoutWeb.SmartContractView do
     render_type_value(type, value_to_display, name)
   end
 
-  defp supplement_type_with_components(type, components) do
+  def supplement_type_with_components(type, components) do
     if type == "tuple" && components do
       types =
         components
diff --git a/apps/block_scout_web/test/block_scout_web/controllers/api/v2/smart_contract_controller_test.exs b/apps/block_scout_web/test/block_scout_web/controllers/api/v2/smart_contract_controller_test.exs
index 7525beafd303..d404d3655c81 100644
--- a/apps/block_scout_web/test/block_scout_web/controllers/api/v2/smart_contract_controller_test.exs
+++ b/apps/block_scout_web/test/block_scout_web/controllers/api/v2/smart_contract_controller_test.exs
@@ -462,24 +462,83 @@ defmodule BlockScoutWeb.API.V2.SmartContractControllerTest do
           "name" => "disableWhitelist",
           "inputs" => [%{"type" => "bool", "name" => "disable", "internalType" => "bool"}]
         },
-        %{"type" => "fallback"}
+        %{"type" => "fallback"},
+        %{
+          "type" => "function",
+          "stateMutability" => "view",
+          "outputs" => [
+            %{
+              "type" => "tuple",
+              "name" => "",
+              "internalType" => "struct Storage.TransactionReceipt",
+              "components" => [
+                %{"type" => "bytes32", "name" => "txHash", "internalType" => "bytes32"},
+                %{"type" => "uint256", "name" => "blockNumber", "internalType" => "uint256"},
+                %{"type" => "bytes32", "name" => "blockHash", "internalType" => "bytes32"},
+                %{"type" => "uint256", "name" => "transactionIndex", "internalType" => "uint256"},
+                %{"type" => "address", "name" => "from", "internalType" => "address"},
+                %{"type" => "address", "name" => "to", "internalType" => "address"},
+                %{"type" => "uint256", "name" => "gasUsed", "internalType" => "uint256"},
+                %{"type" => "bool", "name" => "status", "internalType" => "bool"},
+                %{
+                  "type" => "tuple[]",
+                  "name" => "logs",
+                  "internalType" => "struct Storage.Log[]",
+                  "components" => [
+                    %{"type" => "address", "name" => "from", "internalType" => "address"},
+                    %{"type" => "bytes32[]", "name" => "topics", "internalType" => "bytes32[]"},
+                    %{"type" => "bytes", "name" => "data", "internalType" => "bytes"}
+                  ]
+                }
+              ]
+            }
+          ],
+          "name" => "retrieve",
+          "inputs" => []
+        }
       ]
 
       target_contract = insert(:smart_contract, abi: abi)
 
       blockchain_eth_call_mock()
 
-      request = get(conn, "/api/v2/smart-contracts/#{target_contract.address_hash}/methods-read")
+      expect(
+        EthereumJSONRPC.Mox,
+        :json_rpc,
+        fn [
+             %{
+               id: id,
+               method: "eth_call",
+               params: [%{to: _address_hash, from: "0xBb36c792B9B45Aaf8b848A1392B0d6559202729E"}, _]
+             }
+           ],
+           _opts ->
+          {:ok,
+           [
+             %{
+               id: id,
+               jsonrpc: "2.0",
+               result:
+                 "0x0000000000000000000000000000000000000000000000000000000000000020fe6a43fa23a0269092cbf97cb908e1d5a49a18fd6942baf2467fb5b221e39ab200000000000000000000000000000000000000000000000000000000000003e8fe6a43fa23a0269092cbf97cb908e1d5a49a18fd6942baf2467fb5b221e39ab2000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000bb36c792b9b45aaf8b848a1392b0d6559202729e000000000000000000000000bb36c792b9b45aaf8b848a1392b0d6559202729e000000000000000000000000000000000000000000000000000000000001e0f30000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000012000000000000000000000000000000000000000000000000000000000000000030000000000000000000000000000000000000000000000000000000000000060000000000000000000000000000000000000000000000000000000000000018000000000000000000000000000000000000000000000000000000000000002a0000000000000000000000000bb36c792b9b45aaf8b848a1392b0d6559202729e000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000e00000000000000000000000000000000000000000000000000000000000000003307830000000000000000000000000000000000000000000000000000000000030783030313132323333000000000000000000000000000000000000000000003078303031313232333331323300000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000c3078303030303132333132330000000000000000000000000000000000000000000000000000000000000000bb36c792b9b45aaf8b848a1392b0d6559202729e000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000e00000000000000000000000000000000000000000000000000000000000000003307830000000000000000000000000000000000000000000000000000000000030783030313132323333000000000000000000000000000000000000000000003078303031313232333331323300000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000c3078303030303132333132330000000000000000000000000000000000000000000000000000000000000000bb36c792b9b45aaf8b848a1392b0d6559202729e000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000e00000000000000000000000000000000000000000000000000000000000000003307830000000000000000000000000000000000000000000000000000000000030783030313132323333000000000000000000000000000000000000000000003078303031313232333331323300000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000c3078303030303132333132330000000000000000000000000000000000000000"
+             }
+           ]}
+        end
+      )
+
+      request =
+        get(conn, "/api/v2/smart-contracts/#{target_contract.address_hash}/methods-read", %{
+          "from" => "0xBb36c792B9B45Aaf8b848A1392B0d6559202729E"
+        })
+
       assert response = json_response(request, 200)
 
       assert %{
                "type" => "function",
                "stateMutability" => "view",
+               "names" => ["address"],
                "outputs" => [
                  %{
                    "type" => "address",
-                   "name" => "",
-                   "internalType" => "address",
                    "value" => "0xfffffffffffffffffffffffffffffffffffffffe"
                  }
                ],
@@ -497,6 +556,75 @@ defmodule BlockScoutWeb.API.V2.SmartContractControllerTest do
                "method_id" => "c683630d"
              } in response
 
+      assert %{
+               "inputs" => [],
+               "method_id" => "2e64cec1",
+               "name" => "retrieve",
+               "names" => [
+                 [
+                   "struct Storage.TransactionReceipt",
+                   [
+                     "txHash",
+                     "blockNumber",
+                     "blockHash",
+                     "transactionIndex",
+                     "from",
+                     "to",
+                     "gasUsed",
+                     "status",
+                     ["logs", ["from", "topics", "data"]]
+                   ]
+                 ]
+               ],
+               "outputs" => [
+                 %{
+                   "type" =>
+                     "tuple[bytes32,uint256,bytes32,uint256,address,address,uint256,bool,tuple[address,bytes32[],bytes][]]",
+                   "value" => [
+                     "0xfe6a43fa23a0269092cbf97cb908e1d5a49a18fd6942baf2467fb5b221e39ab2",
+                     1000,
+                     "0xfe6a43fa23a0269092cbf97cb908e1d5a49a18fd6942baf2467fb5b221e39ab2",
+                     10,
+                     "0xbb36c792b9b45aaf8b848a1392b0d6559202729e",
+                     "0xbb36c792b9b45aaf8b848a1392b0d6559202729e",
+                     123_123,
+                     true,
+                     [
+                       [
+                         "0xbb36c792b9b45aaf8b848a1392b0d6559202729e",
+                         [
+                           "0x3078300000000000000000000000000000000000000000000000000000000000",
+                           "0x3078303031313232333300000000000000000000000000000000000000000000",
+                           "0x3078303031313232333331323300000000000000000000000000000000000000"
+                         ],
+                         "0x307830303030313233313233"
+                       ],
+                       [
+                         "0xbb36c792b9b45aaf8b848a1392b0d6559202729e",
+                         [
+                           "0x3078300000000000000000000000000000000000000000000000000000000000",
+                           "0x3078303031313232333300000000000000000000000000000000000000000000",
+                           "0x3078303031313232333331323300000000000000000000000000000000000000"
+                         ],
+                         "0x307830303030313233313233"
+                       ],
+                       [
+                         "0xbb36c792b9b45aaf8b848a1392b0d6559202729e",
+                         [
+                           "0x3078300000000000000000000000000000000000000000000000000000000000",
+                           "0x3078303031313232333300000000000000000000000000000000000000000000",
+                           "0x3078303031313232333331323300000000000000000000000000000000000000"
+                         ],
+                         "0x307830303030313233313233"
+                       ]
+                     ]
+                   ]
+                 }
+               ],
+               "stateMutability" => "view",
+               "type" => "function"
+             } in response
+
       refute %{"type" => "fallback"} in response
     end
 
@@ -544,10 +672,10 @@ defmodule BlockScoutWeb.API.V2.SmartContractControllerTest do
                "type" => "function",
                "stateMutability" => "view",
                "payable" => false,
+               "names" => [nil],
                "outputs" => [
                  %{
                    "type" => "address[]",
-                   "name" => "",
                    "value" => [
                      "0x64631b5d259ead889e8b06d12c8b74742804e5f1",
                      "0x234fe7224ce480ca97d01897311b8c3d35162f86",
@@ -666,6 +794,146 @@ defmodule BlockScoutWeb.API.V2.SmartContractControllerTest do
              } == response
     end
 
+    test "query complex response", %{conn: conn} do
+      abi = [
+        %{
+          "type" => "function",
+          "stateMutability" => "view",
+          "outputs" => [
+            %{
+              "type" => "tuple",
+              "name" => "",
+              "internalType" => "struct Storage.TransactionReceipt",
+              "components" => [
+                %{"type" => "bytes32", "name" => "txHash", "internalType" => "bytes32"},
+                %{"type" => "uint256", "name" => "blockNumber", "internalType" => "uint256"},
+                %{"type" => "bytes32", "name" => "blockHash", "internalType" => "bytes32"},
+                %{"type" => "uint256", "name" => "transactionIndex", "internalType" => "uint256"},
+                %{"type" => "address", "name" => "from", "internalType" => "address"},
+                %{"type" => "address", "name" => "to", "internalType" => "address"},
+                %{"type" => "uint256", "name" => "gasUsed", "internalType" => "uint256"},
+                %{"type" => "bool", "name" => "status", "internalType" => "bool"},
+                %{
+                  "type" => "tuple[]",
+                  "name" => "logs",
+                  "internalType" => "struct Storage.Log[]",
+                  "components" => [
+                    %{"type" => "address", "name" => "from", "internalType" => "address"},
+                    %{"type" => "bytes32[]", "name" => "topics", "internalType" => "bytes32[]"},
+                    %{"type" => "bytes", "name" => "data", "internalType" => "bytes"}
+                  ]
+                }
+              ]
+            }
+          ],
+          "name" => "retrieve",
+          "inputs" => []
+        }
+      ]
+
+      target_contract = insert(:smart_contract, abi: abi)
+
+      expect(
+        EthereumJSONRPC.Mox,
+        :json_rpc,
+        fn [
+             %{
+               id: id,
+               method: "eth_call",
+               params: [%{to: _address_hash, from: "0xBb36c792B9B45Aaf8b848A1392B0d6559202729E"}, _]
+             }
+           ],
+           _opts ->
+          {:ok,
+           [
+             %{
+               id: id,
+               jsonrpc: "2.0",
+               result:
+                 "0x0000000000000000000000000000000000000000000000000000000000000020fe6a43fa23a0269092cbf97cb908e1d5a49a18fd6942baf2467fb5b221e39ab200000000000000000000000000000000000000000000000000000000000003e8fe6a43fa23a0269092cbf97cb908e1d5a49a18fd6942baf2467fb5b221e39ab2000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000bb36c792b9b45aaf8b848a1392b0d6559202729e000000000000000000000000bb36c792b9b45aaf8b848a1392b0d6559202729e000000000000000000000000000000000000000000000000000000000001e0f30000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000012000000000000000000000000000000000000000000000000000000000000000030000000000000000000000000000000000000000000000000000000000000060000000000000000000000000000000000000000000000000000000000000018000000000000000000000000000000000000000000000000000000000000002a0000000000000000000000000bb36c792b9b45aaf8b848a1392b0d6559202729e000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000e00000000000000000000000000000000000000000000000000000000000000003307830000000000000000000000000000000000000000000000000000000000030783030313132323333000000000000000000000000000000000000000000003078303031313232333331323300000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000c3078303030303132333132330000000000000000000000000000000000000000000000000000000000000000bb36c792b9b45aaf8b848a1392b0d6559202729e000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000e00000000000000000000000000000000000000000000000000000000000000003307830000000000000000000000000000000000000000000000000000000000030783030313132323333000000000000000000000000000000000000000000003078303031313232333331323300000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000c3078303030303132333132330000000000000000000000000000000000000000000000000000000000000000bb36c792b9b45aaf8b848a1392b0d6559202729e000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000e00000000000000000000000000000000000000000000000000000000000000003307830000000000000000000000000000000000000000000000000000000000030783030313132323333000000000000000000000000000000000000000000003078303031313232333331323300000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000c3078303030303132333132330000000000000000000000000000000000000000"
+             }
+           ]}
+        end
+      )
+
+      request =
+        post(conn, "/api/v2/smart-contracts/#{target_contract.address_hash}/query-read-method", %{
+          "contract_type" => "regular",
+          "args" => [],
+          "method_id" => "2e64cec1",
+          "from" => "0xBb36c792B9B45Aaf8b848A1392B0d6559202729E"
+        })
+
+      assert response = json_response(request, 200)
+
+      assert %{
+               "is_error" => false,
+               "result" => %{
+                 "names" => [
+                   [
+                     "struct Storage.TransactionReceipt",
+                     [
+                       "txHash",
+                       "blockNumber",
+                       "blockHash",
+                       "transactionIndex",
+                       "from",
+                       "to",
+                       "gasUsed",
+                       "status",
+                       ["logs", ["from", "topics", "data"]]
+                     ]
+                   ]
+                 ],
+                 "output" => [
+                   %{
+                     "type" =>
+                       "tuple[bytes32,uint256,bytes32,uint256,address,address,uint256,bool,tuple[address,bytes32[],bytes][]]",
+                     "value" => [
+                       "0xfe6a43fa23a0269092cbf97cb908e1d5a49a18fd6942baf2467fb5b221e39ab2",
+                       1000,
+                       "0xfe6a43fa23a0269092cbf97cb908e1d5a49a18fd6942baf2467fb5b221e39ab2",
+                       10,
+                       "0xbb36c792b9b45aaf8b848a1392b0d6559202729e",
+                       "0xbb36c792b9b45aaf8b848a1392b0d6559202729e",
+                       123_123,
+                       true,
+                       [
+                         [
+                           "0xbb36c792b9b45aaf8b848a1392b0d6559202729e",
+                           [
+                             "0x3078300000000000000000000000000000000000000000000000000000000000",
+                             "0x3078303031313232333300000000000000000000000000000000000000000000",
+                             "0x3078303031313232333331323300000000000000000000000000000000000000"
+                           ],
+                           "0x307830303030313233313233"
+                         ],
+                         [
+                           "0xbb36c792b9b45aaf8b848a1392b0d6559202729e",
+                           [
+                             "0x3078300000000000000000000000000000000000000000000000000000000000",
+                             "0x3078303031313232333300000000000000000000000000000000000000000000",
+                             "0x3078303031313232333331323300000000000000000000000000000000000000"
+                           ],
+                           "0x307830303030313233313233"
+                         ],
+                         [
+                           "0xbb36c792b9b45aaf8b848a1392b0d6559202729e",
+                           [
+                             "0x3078300000000000000000000000000000000000000000000000000000000000",
+                             "0x3078303031313232333300000000000000000000000000000000000000000000",
+                             "0x3078303031313232333331323300000000000000000000000000000000000000"
+                           ],
+                           "0x307830303030313233313233"
+                         ]
+                       ]
+                     ]
+                   }
+                 ]
+               }
+             } == response
+    end
+
     test "query-read-method with nonexistent method_id", %{conn: conn} do
       abi = [
         %{
@@ -1041,11 +1309,10 @@ defmodule BlockScoutWeb.API.V2.SmartContractControllerTest do
       assert %{
                "type" => "function",
                "stateMutability" => "view",
+               "names" => ["address"],
                "outputs" => [
                  %{
                    "type" => "address",
-                   "name" => "",
-                   "internalType" => "address",
                    "value" => "0xfffffffffffffffffffffffffffffffffffffffe"
                  }
                ],
@@ -1220,11 +1487,10 @@ defmodule BlockScoutWeb.API.V2.SmartContractControllerTest do
       assert %{
                "type" => "function",
                "stateMutability" => "view",
+               "names" => ["address"],
                "outputs" => [
                  %{
                    "type" => "address",
-                   "name" => "",
-                   "internalType" => "address",
                    "value" => "0xfffffffffffffffffffffffffffffffffffffffe"
                  }
                ],
diff --git a/apps/explorer/lib/explorer/chain.ex b/apps/explorer/lib/explorer/chain.ex
index cbf78ee9915f..b43d383ce43d 100644
--- a/apps/explorer/lib/explorer/chain.ex
+++ b/apps/explorer/lib/explorer/chain.ex
@@ -1512,7 +1512,8 @@ defmodule Explorer.Chain do
         symbol: token.symbol,
         holder_count: token.holder_count,
         inserted_at: token.inserted_at,
-        block_number: 0
+        block_number: 0,
+        icon_url: token.icon_url
       }
     )
   end
@@ -1531,7 +1532,8 @@ defmodule Explorer.Chain do
         symbol: ^nil,
         holder_count: ^nil,
         inserted_at: address.inserted_at,
-        block_number: 0
+        block_number: 0,
+        icon_url: nil
       }
     )
   end
@@ -1559,7 +1561,8 @@ defmodule Explorer.Chain do
             symbol: ^nil,
             holder_count: ^nil,
             inserted_at: address.inserted_at,
-            block_number: 0
+            block_number: 0,
+            icon_url: nil
           }
         )
 
@@ -1582,7 +1585,8 @@ defmodule Explorer.Chain do
             symbol: ^nil,
             holder_count: ^nil,
             inserted_at: transaction.inserted_at,
-            block_number: 0
+            block_number: 0,
+            icon_url: nil
           }
         )
 
@@ -1605,7 +1609,8 @@ defmodule Explorer.Chain do
             symbol: ^nil,
             holder_count: ^nil,
             inserted_at: block.inserted_at,
-            block_number: block.number
+            block_number: block.number,
+            icon_url: nil
           }
         )
 
@@ -1623,7 +1628,8 @@ defmodule Explorer.Chain do
                 symbol: ^nil,
                 holder_count: ^nil,
                 inserted_at: block.inserted_at,
-                block_number: block.number
+                block_number: block.number,
+                icon_url: nil
               }
             )
 
diff --git a/apps/explorer/lib/explorer/smart_contract/helper.ex b/apps/explorer/lib/explorer/smart_contract/helper.ex
index c2476ee713d6..cffc145b3565 100644
--- a/apps/explorer/lib/explorer/smart_contract/helper.ex
+++ b/apps/explorer/lib/explorer/smart_contract/helper.ex
@@ -24,7 +24,8 @@ defmodule Explorer.SmartContract.Helper do
   @spec read_with_wallet_method?(%{}) :: true | false
   def read_with_wallet_method?(function),
     do:
-      !error?(function) && !event?(function) && !constructor?(function) && !fallback?(function) && nonpayable?(function) &&
+      !error?(function) && !event?(function) && !constructor?(function) && !fallback?(function) &&
+        nonpayable?(function) &&
         !empty_outputs?(function)
 
   def empty_inputs?(function), do: function["inputs"] == []
diff --git a/apps/explorer/lib/explorer/smart_contract/reader.ex b/apps/explorer/lib/explorer/smart_contract/reader.ex
index 6f0d3fa93812..4fa3e8dadf86 100644
--- a/apps/explorer/lib/explorer/smart_contract/reader.ex
+++ b/apps/explorer/lib/explorer/smart_contract/reader.ex
@@ -270,7 +270,7 @@ defmodule Explorer.SmartContract.Reader do
 
     abi_with_method_id
     |> Enum.filter(&Helper.queriable_method?(&1))
-    |> Enum.map(&fetch_current_value_from_blockchain(&1, abi_with_method_id, contract_address_hash, false, from))
+    |> Enum.map(&fetch_current_value_from_blockchain(&1, abi_with_method_id, contract_address_hash, false, [], from))
   end
 
   def read_only_functions_from_abi_with_sender(_, _, _), do: []
@@ -332,21 +332,34 @@ defmodule Explorer.SmartContract.Reader do
     "tuple[#{tuple_types}]"
   end
 
-  def fetch_current_value_from_blockchain(function, abi, contract_address_hash, leave_error_as_map, from \\ nil) do
+  def fetch_current_value_from_blockchain(
+        function,
+        abi,
+        contract_address_hash,
+        leave_error_as_map,
+        options,
+        from \\ nil
+      ) do
     case function do
       %{"inputs" => []} ->
         method_id = function["method_id"]
         args = function["inputs"]
-        outputs = function["outputs"]
 
-        values =
-          contract_address_hash
-          |> query_verified_contract(%{method_id => normalize_args(args)}, from, leave_error_as_map, abi)
-          |> link_outputs_and_values(outputs, method_id)
+        %{output: outputs, names: names} =
+          query_function_with_names(
+            contract_address_hash,
+            %{method_id: method_id, args: args},
+            :regular,
+            from,
+            abi,
+            leave_error_as_map,
+            options
+          )
 
         function
-        |> Map.replace!("outputs", values)
+        |> Map.replace!("outputs", outputs)
         |> Map.put("abi_outputs", Map.get(function, "outputs", []))
+        |> Map.put("names", names)
 
       _ ->
         function
@@ -364,9 +377,10 @@ defmodule Explorer.SmartContract.Reader do
           %{method_id: String.t(), args: [term()] | nil},
           :regular | :proxy,
           String.t() | nil,
-          [api?]
+          [],
+          boolean()
         ) :: %{:names => [any()], :output => [%{}]}
-  def query_function_with_names(contract_address_hash, params, type, from, abi, options \\ [])
+  def query_function_with_names(contract_address_hash, params, type, from, abi, leave_error_as_map, options \\ [])
 
   def query_function_with_names(
         contract_address_hash,
@@ -374,6 +388,7 @@ defmodule Explorer.SmartContract.Reader do
         :regular,
         from,
         abi,
+        leave_error_as_map,
         _options
       ) do
     outputs =
@@ -382,7 +397,7 @@ defmodule Explorer.SmartContract.Reader do
         method_id,
         args || [],
         from,
-        true,
+        leave_error_as_map,
         abi
       )
 
@@ -390,7 +405,15 @@ defmodule Explorer.SmartContract.Reader do
     %{output: outputs, names: names}
   end
 
-  def query_function_with_names(contract_address_hash, %{method_id: method_id, args: args}, :proxy, from, _abi, options) do
+  def query_function_with_names(
+        contract_address_hash,
+        %{method_id: method_id, args: args},
+        :proxy,
+        from,
+        _abi,
+        leave_error_as_map,
+        options
+      ) do
     abi = get_abi(contract_address_hash, :proxy, options)
 
     outputs =
@@ -399,7 +422,7 @@ defmodule Explorer.SmartContract.Reader do
         method_id,
         args || [],
         from,
-        true,
+        leave_error_as_map,
         abi
       )
 
diff --git a/apps/explorer/lib/explorer/smart_contract/solidity/code_compiler.ex b/apps/explorer/lib/explorer/smart_contract/solidity/code_compiler.ex
index b08e64c9704f..b63d01c57e62 100644
--- a/apps/explorer/lib/explorer/smart_contract/solidity/code_compiler.ex
+++ b/apps/explorer/lib/explorer/smart_contract/solidity/code_compiler.ex
@@ -76,14 +76,14 @@ defmodule Explorer.SmartContract.Solidity.CodeCompiler do
     code = Keyword.fetch!(params, :code)
     optimize = Keyword.fetch!(params, :optimize)
     optimization_runs = optimization_runs(params)
-    evm_version = Keyword.get(params, :evm_version, List.last(allowed_evm_versions()))
+    evm_version = Keyword.get(params, :evm_version, List.last(evm_versions(:solidity)))
     bytecode_hash = Keyword.get(params, :bytecode_hash, "default")
     external_libs = Keyword.get(params, :external_libs, %{})
 
     external_libs_string = Jason.encode!(external_libs)
 
     checked_evm_version =
-      if evm_version in allowed_evm_versions() do
+      if evm_version in evm_versions(:solidity) do
         evm_version
       else
         "byzantium"
@@ -262,9 +262,19 @@ defmodule Explorer.SmartContract.Solidity.CodeCompiler do
     end
   end
 
-  def allowed_evm_versions do
+  def evm_versions(compiler_type) do
+    case compiler_type do
+      :vyper ->
+        allowed_evm_versions(:allowed_vyper_evm_versions)
+
+      :solidity ->
+        allowed_evm_versions(:allowed_solidity_evm_versions)
+    end
+  end
+
+  defp allowed_evm_versions(env_name) do
     :explorer
-    |> Application.get_env(:allowed_evm_versions)
+    |> Application.get_env(env_name)
     |> String.split(",")
     |> Enum.map(fn version -> String.trim(version) end)
   end
diff --git a/apps/explorer/lib/explorer/smart_contract/solidity/verifier.ex b/apps/explorer/lib/explorer/smart_contract/solidity/verifier.ex
index a41847ad3c82..57c11709abd5 100644
--- a/apps/explorer/lib/explorer/smart_contract/solidity/verifier.ex
+++ b/apps/explorer/lib/explorer/smart_contract/solidity/verifier.ex
@@ -59,7 +59,7 @@ defmodule Explorer.SmartContract.Solidity.Verifier do
     if is_nil(params["name"]) or params["name"] == "" do
       {:error, :name}
     else
-      latest_evm_version = List.last(CodeCompiler.allowed_evm_versions())
+      latest_evm_version = List.last(CodeCompiler.evm_versions(:solidity))
       evm_version = Map.get(params, "evm_version", latest_evm_version)
 
       all_versions = [evm_version | previous_evm_versions(evm_version)]
@@ -505,19 +505,19 @@ defmodule Explorer.SmartContract.Solidity.Verifier do
   end
 
   def previous_evm_versions(current_evm_version) do
-    index = Enum.find_index(CodeCompiler.allowed_evm_versions(), fn el -> el == current_evm_version end)
+    index = Enum.find_index(CodeCompiler.evm_versions(:solidity), fn el -> el == current_evm_version end)
 
     cond do
       index == 0 ->
         []
 
       index == 1 ->
-        [List.first(CodeCompiler.allowed_evm_versions())]
+        [List.first(CodeCompiler.evm_versions(:solidity))]
 
       true ->
         [
-          Enum.at(CodeCompiler.allowed_evm_versions(), index - 1),
-          Enum.at(CodeCompiler.allowed_evm_versions(), index - 2)
+          Enum.at(CodeCompiler.evm_versions(:solidity), index - 1),
+          Enum.at(CodeCompiler.evm_versions(:solidity), index - 2)
         ]
     end
   end
diff --git a/apps/explorer/test/explorer/smart_contract/reader_test.exs b/apps/explorer/test/explorer/smart_contract/reader_test.exs
index df6ed4727b3b..8eb6e1a2ec6c 100644
--- a/apps/explorer/test/explorer/smart_contract/reader_test.exs
+++ b/apps/explorer/test/explorer/smart_contract/reader_test.exs
@@ -153,7 +153,7 @@ defmodule Explorer.SmartContract.ReaderTest do
                  "constant" => true,
                  "inputs" => [],
                  "name" => "get",
-                 "outputs" => [%{"name" => "", "type" => "uint256", "value" => 0}],
+                 "outputs" => [%{"type" => "uint256", "value" => 0}],
                  "payable" => _,
                  "stateMutability" => _,
                  "type" => _
@@ -162,7 +162,7 @@ defmodule Explorer.SmartContract.ReaderTest do
                  "constant" => true,
                  "inputs" => [%{"name" => "x", "type" => "uint256"}],
                  "name" => "with_arguments",
-                 "outputs" => [%{"name" => "", "type" => "bool"}],
+                 "outputs" => [%{"type" => "bool"}],
                  "payable" => _,
                  "stateMutability" => _,
                  "type" => _
@@ -238,7 +238,7 @@ defmodule Explorer.SmartContract.ReaderTest do
                  "constant" => true,
                  "inputs" => [],
                  "name" => "get",
-                 "outputs" => [%{"name" => "", "type" => "uint256", "value" => 0}],
+                 "outputs" => [%{"type" => "uint256", "value" => 0}],
                  "payable" => _,
                  "stateMutability" => _,
                  "type" => _
@@ -247,7 +247,7 @@ defmodule Explorer.SmartContract.ReaderTest do
                  "constant" => true,
                  "inputs" => [%{"name" => "x", "type" => "uint256"}],
                  "name" => "with_arguments",
-                 "outputs" => [%{"name" => "", "type" => "bool"}],
+                 "outputs" => [%{"type" => "bool"}],
                  "payable" => _,
                  "stateMutability" => _,
                  "type" => _
diff --git a/apps/explorer/test/explorer/smart_contract/solidity/code_compiler_test.exs b/apps/explorer/test/explorer/smart_contract/solidity/code_compiler_test.exs
index 952c320ebf7e..ed80cb12191d 100644
--- a/apps/explorer/test/explorer/smart_contract/solidity/code_compiler_test.exs
+++ b/apps/explorer/test/explorer/smart_contract/solidity/code_compiler_test.exs
@@ -353,17 +353,17 @@ defmodule Explorer.SmartContract.Solidity.CodeCompilerTest do
     end
   end
 
-  # describe "allowed_evm_versions/0" do
+  # describe "allowed_solidity_evm_versions/0" do
   #   test "returns allowed evm versions defined by ALLOWED_EVM_VERSIONS env var" do
-  #     Application.put_env(:explorer, :allowed_evm_versions, "CustomEVM1,CustomEVM2,CustomEVM3")
-  #     response = CodeCompiler.allowed_evm_versions()
+  #     Application.put_env(:explorer, :allowed_solidity_evm_versions, "CustomEVM1,CustomEVM2,CustomEVM3")
+  #     response = CodeCompiler.evm_versions(:solidity)
 
   #     assert ["CustomEVM1", "CustomEVM2", "CustomEVM3"] = response
   #   end
 
   #   test "returns allowed evm versions defined by not trimmed ALLOWED_EVM_VERSIONS env var" do
-  #     Application.put_env(:explorer, :allowed_evm_versions, "CustomEVM1,  CustomEVM2, CustomEVM3")
-  #     response = CodeCompiler.allowed_evm_versions()
+  #     Application.put_env(:explorer, :allowed_solidity_evm_versions, "CustomEVM1,  CustomEVM2, CustomEVM3")
+  #     response = CodeCompiler.evm_versions(:solidity)
 
   #     assert ["CustomEVM1", "CustomEVM2", "CustomEVM3"] = response
   #   end
@@ -371,11 +371,11 @@ defmodule Explorer.SmartContract.Solidity.CodeCompilerTest do
   #   test "returns default_allowed_evm_versions" do
   #     Application.put_env(
   #       :explorer,
-  #       :allowed_evm_versions,
+  #       :allowed_solidity_evm_versions,
   #       "homestead,tangerineWhistle,spuriousDragon,byzantium,constantinople,petersburg"
   #     )
 
-  #     response = CodeCompiler.allowed_evm_versions()
+  #     response = CodeCompiler.evm_versions(:solidity)
 
   #     assert ["homestead", "tangerineWhistle", "spuriousDragon", "byzantium", "constantinople", "petersburg"] = response
   #   end
diff --git a/config/runtime.exs b/config/runtime.exs
index dd7e25d532a4..5f5de06c14c3 100644
--- a/config/runtime.exs
+++ b/config/runtime.exs
@@ -170,9 +170,12 @@ exchange_rates_coin = System.get_env("EXCHANGE_RATES_COIN")
 config :explorer,
   coin: System.get_env("COIN") || exchange_rates_coin || "ETH",
   coin_name: System.get_env("COIN_NAME") || exchange_rates_coin || "ETH",
-  allowed_evm_versions:
-    System.get_env("CONTRACT_VERIFICATION_ALLOWED_EVM_VERSIONS") ||
-      "homestead,tangerineWhistle,spuriousDragon,byzantium,constantinople,petersburg,istanbul,berlin,london,paris,default",
+  allowed_solidity_evm_versions:
+    System.get_env("CONTRACT_VERIFICATION_ALLOWED_SOLIDITY_EVM_VERSIONS") ||
+      "homestead,tangerineWhistle,spuriousDragon,byzantium,constantinople,petersburg,istanbul,berlin,london,paris,shanghai,default",
+  allowed_vyper_evm_versions:
+    System.get_env("CONTRACT_VERIFICATION_ALLOWED_VYPER_EVM_VERSIONS") ||
+      "byzantium,constantinople,petersburg,istanbul,berlin,paris,shanghai,default",
   include_uncles_in_average_block_time: ConfigHelper.parse_bool_env_var("UNCLES_IN_AVERAGE_BLOCK_TIME"),
   healthy_blocks_period: ConfigHelper.parse_time_env_var("HEALTHY_BLOCKS_PERIOD", "5m"),
   realtime_events_sender:
diff --git a/docker-compose/envs/common-blockscout.env b/docker-compose/envs/common-blockscout.env
index 5f67ecace98f..b5717e3b73ef 100644
--- a/docker-compose/envs/common-blockscout.env
+++ b/docker-compose/envs/common-blockscout.env
@@ -81,7 +81,8 @@ CACHE_ADDRESS_TRANSACTIONS_COUNTER_PERIOD=1800
 CACHE_ADDRESS_TOKENS_USD_SUM_PERIOD=3600
 CACHE_ADDRESS_TOKEN_TRANSFERS_COUNTER_PERIOD=1800
 TOKEN_METADATA_UPDATE_INTERVAL=172800
-CONTRACT_VERIFICATION_ALLOWED_EVM_VERSIONS=homestead,tangerineWhistle,spuriousDragon,byzantium,constantinople,petersburg,istanbul,berlin,london,paris,default
+CONTRACT_VERIFICATION_ALLOWED_SOLIDITY_EVM_VERSIONS=homestead,tangerineWhistle,spuriousDragon,byzantium,constantinople,petersburg,istanbul,berlin,london,paris,shanghai,default
+CONTRACT_VERIFICATION_ALLOWED_VYPER_EVM_VERSIONS=byzantium,constantinople,petersburg,istanbul,berlin,paris,shanghai,default
 # CONTRACT_VERIFICATION_MAX_LIBRARIES=10
 CONTRACT_MAX_STRING_LENGTH_WITHOUT_TRIMMING=2040
 # CONTRACT_DISABLE_INTERACTION=
diff --git a/docker/Makefile b/docker/Makefile
index fff407f21214..ce4806af8c48 100644
--- a/docker/Makefile
+++ b/docker/Makefile
@@ -690,8 +690,11 @@ endif
 ifdef DECODE_NOT_A_CONTRACT_CALLS
 	BLOCKSCOUT_CONTAINER_PARAMS += -e 'DECODE_NOT_A_CONTRACT_CALLS=$(DECODE_NOT_A_CONTRACT_CALLS)'
 endif
-ifdef CONTRACT_VERIFICATION_ALLOWED_EVM_VERSIONS
-	BLOCKSCOUT_CONTAINER_PARAMS += -e 'CONTRACT_VERIFICATION_ALLOWED_EVM_VERSIONS=$(CONTRACT_VERIFICATION_ALLOWED_EVM_VERSIONS)'
+ifdef CONTRACT_VERIFICATION_ALLOWED_SOLIDITY_EVM_VERSIONS
+	BLOCKSCOUT_CONTAINER_PARAMS += -e 'CONTRACT_VERIFICATION_ALLOWED_SOLIDITY_EVM_VERSIONS=$(CONTRACT_VERIFICATION_ALLOWED_SOLIDITY_EVM_VERSIONS)'
+endif
+ifdef CONTRACT_VERIFICATION_ALLOWED_VYPER_EVM_VERSIONS
+	BLOCKSCOUT_CONTAINER_PARAMS += -e 'CONTRACT_VERIFICATION_ALLOWED_VYPER_EVM_VERSIONS=$(CONTRACT_VERIFICATION_ALLOWED_VYPER_EVM_VERSIONS)'
 endif
 ifdef CONTRACT_VERIFICATION_MAX_LIBRARIES
 	BLOCKSCOUT_CONTAINER_PARAMS += -e 'CONTRACT_VERIFICATION_MAX_LIBRARIES=$(CONTRACT_VERIFICATION_MAX_LIBRARIES)'

From 566a670f14c1f6fa37b1fe950085164f5897a595 Mon Sep 17 00:00:00 2001
From: nikitosing <32202610+nikitosing@users.noreply.github.com>
Date: Tue, 6 Jun 2023 00:01:03 +0300
Subject: [PATCH 067/909] Fix ABI read functions filter (#7636)

* Fix ABI read functions filter

* Changelog

* Drop empty_inputs?/1
---
 CHANGELOG.md                                             | 1 +
 .../api/v2/smart_contract_controller_test.exs            | 2 ++
 apps/explorer/lib/explorer/smart_contract/helper.ex      | 9 ++-------
 3 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4db918c76057..fdb8a5821a58 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,6 +12,7 @@
 
 ### Fixes
 
+- [#7636](https://github.com/blockscout/blockscout/pull/7636) - Remove receive from read methods
 - [#7635](https://github.com/blockscout/blockscout/pull/7635) - Fix single 1155 transfer displaying
 - [#7629](https://github.com/blockscout/blockscout/pull/7629) - Fix NFT fetcher
 - [#7614](https://github.com/blockscout/blockscout/pull/7614) - API and smart-contracts fixes and improvements
diff --git a/apps/block_scout_web/test/block_scout_web/controllers/api/v2/smart_contract_controller_test.exs b/apps/block_scout_web/test/block_scout_web/controllers/api/v2/smart_contract_controller_test.exs
index d404d3655c81..f30776f4e783 100644
--- a/apps/block_scout_web/test/block_scout_web/controllers/api/v2/smart_contract_controller_test.exs
+++ b/apps/block_scout_web/test/block_scout_web/controllers/api/v2/smart_contract_controller_test.exs
@@ -463,6 +463,7 @@ defmodule BlockScoutWeb.API.V2.SmartContractControllerTest do
           "inputs" => [%{"type" => "bool", "name" => "disable", "internalType" => "bool"}]
         },
         %{"type" => "fallback"},
+        %{"type" => "receive"},
         %{
           "type" => "function",
           "stateMutability" => "view",
@@ -626,6 +627,7 @@ defmodule BlockScoutWeb.API.V2.SmartContractControllerTest do
              } in response
 
       refute %{"type" => "fallback"} in response
+      refute %{"type" => "receive"} in response
     end
 
     test "get array of addresses within read-methods", %{conn: conn} do
diff --git a/apps/explorer/lib/explorer/smart_contract/helper.ex b/apps/explorer/lib/explorer/smart_contract/helper.ex
index cffc145b3565..047f80a3e7bd 100644
--- a/apps/explorer/lib/explorer/smart_contract/helper.ex
+++ b/apps/explorer/lib/explorer/smart_contract/helper.ex
@@ -12,8 +12,6 @@ defmodule Explorer.SmartContract.Helper do
 
   def constructor?(function), do: function["type"] == "constructor"
 
-  def fallback?(function), do: function["type"] == "fallback"
-
   def event?(function), do: function["type"] == "event"
 
   def error?(function), do: function["type"] == "error"
@@ -24,13 +22,10 @@ defmodule Explorer.SmartContract.Helper do
   @spec read_with_wallet_method?(%{}) :: true | false
   def read_with_wallet_method?(function),
     do:
-      !error?(function) && !event?(function) && !constructor?(function) && !fallback?(function) &&
-        nonpayable?(function) &&
+      !error?(function) && !event?(function) && !constructor?(function) && nonpayable?(function) &&
         !empty_outputs?(function)
 
-  def empty_inputs?(function), do: function["inputs"] == []
-
-  def empty_outputs?(function), do: function["outputs"] == []
+  def empty_outputs?(function), do: is_nil(function["outputs"]) || function["outputs"] == []
 
   def payable?(function), do: function["stateMutability"] == "payable" || function["payable"]
 

From af611b1df40e0d7fd87858ce5fd8fdbc00b98966 Mon Sep 17 00:00:00 2001
From: nikitosing <32202610+nikitosing@users.noreply.github.com>
Date: Tue, 6 Jun 2023 00:20:33 +0300
Subject: [PATCH 068/909] eth-bytecode-db integration improvements (#7628)

* Add is_verified_via_eth_bytecode_db and fetch partially_verified field from rust MS

* Changelog
---
 CHANGELOG.md                                      |  1 +
 .../views/api/v2/smart_contract_view.ex           |  1 +
 .../api/v2/smart_contract_controller_test.exs     | 15 +++++++++++----
 .../look_up_smart_contract_sources_on_demand.ex   |  6 +++---
 .../explorer/lib/explorer/chain/smart_contract.ex | 11 ++++++++---
 .../explorer/smart_contract/solidity/publisher.ex | 15 ++++++++++-----
 .../explorer/smart_contract/vyper/publisher.ex    | 13 +++++++++----
 ...605080138_add_verified_via_eth_bytecode_db.exs |  9 +++++++++
 apps/explorer/test/support/factory.ex             |  3 ++-
 9 files changed, 54 insertions(+), 20 deletions(-)
 create mode 100644 apps/explorer/priv/repo/migrations/20230605080138_add_verified_via_eth_bytecode_db.exs

diff --git a/CHANGELOG.md b/CHANGELOG.md
index fdb8a5821a58..f0b7eb08dd2d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,7 @@
 
 ### Features
 
+- [#7628](https://github.com/blockscout/blockscout/pull/7628) - Support partially verified property from verifier MS; Add property to track contracts automatically verified via eth-bytecode-db
 - [#7603](https://github.com/blockscout/blockscout/pull/7603) - Add Polygon Edge and optimism genesis files support
 - [#7513](https://github.com/blockscout/blockscout/pull/7513) - Add Polygon Edge support
 - [#7532](https://github.com/blockscout/blockscout/pull/7532) - Handle empty id in json rpc responses
diff --git a/apps/block_scout_web/lib/block_scout_web/views/api/v2/smart_contract_view.ex b/apps/block_scout_web/lib/block_scout_web/views/api/v2/smart_contract_view.ex
index 4fc3b779948e..56959612079a 100644
--- a/apps/block_scout_web/lib/block_scout_web/views/api/v2/smart_contract_view.ex
+++ b/apps/block_scout_web/lib/block_scout_web/views/api/v2/smart_contract_view.ex
@@ -152,6 +152,7 @@ defmodule BlockScoutWeb.API.V2.SmartContractView do
       "is_partially_verified" => address.smart_contract.partially_verified && smart_contract_verified,
       "is_fully_verified" => fully_verified,
       "is_verified_via_sourcify" => address.smart_contract.verified_via_sourcify && smart_contract_verified,
+      "is_verified_via_eth_bytecode_db" => address.smart_contract.verified_via_eth_bytecode_db,
       "is_vyper_contract" => target_contract.is_vyper_contract,
       "minimal_proxy_address_hash" =>
         minimal_proxy_template && Address.checksum(metadata_for_verification.address_hash),
diff --git a/apps/block_scout_web/test/block_scout_web/controllers/api/v2/smart_contract_controller_test.exs b/apps/block_scout_web/test/block_scout_web/controllers/api/v2/smart_contract_controller_test.exs
index f30776f4e783..a72f7744ceb1 100644
--- a/apps/block_scout_web/test/block_scout_web/controllers/api/v2/smart_contract_controller_test.exs
+++ b/apps/block_scout_web/test/block_scout_web/controllers/api/v2/smart_contract_controller_test.exs
@@ -108,7 +108,8 @@ defmodule BlockScoutWeb.API.V2.SmartContractControllerTest do
           "0x6080604052600436106049576000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff16806360fe47b114604e5780636d4ce63c146078575b600080fd5b348015605957600080fd5b5060766004803603810190808035906020019092919050505060a0565b005b348015608357600080fd5b50608a60aa565b6040518082815260200191505060405180910390f35b8060008190555050565b600080549050905600a165627a7a7230582061b7676067d537e410bb704932a9984739a959416170ea17bda192ac1218d2790029",
         "creation_bytecode" =>
           "0x608060405234801561001057600080fd5b5060df8061001f6000396000f3006080604052600436106049576000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff16806360fe47b114604e5780636d4ce63c146078575b600080fd5b348015605957600080fd5b5060766004803603810190808035906020019092919050505060a0565b005b348015608357600080fd5b50608a60aa565b6040518082815260200191505060405180910390f35b8060008190555050565b600080549050905600a165627a7a7230582061b7676067d537e410bb704932a9984739a959416170ea17bda192ac1218d2790029",
-        "abi" => target_contract.abi
+        "abi" => target_contract.abi,
+        "is_verified_via_eth_bytecode_db" => target_contract.verified_via_eth_bytecode_db
       }
 
       request = get(conn, "/api/v2/smart-contracts/#{Address.checksum(target_contract.address_hash)}")
@@ -197,7 +198,8 @@ defmodule BlockScoutWeb.API.V2.SmartContractControllerTest do
           "0x6080604052600436106049576000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff16806360fe47b114604e5780636d4ce63c146078575b600080fd5b348015605957600080fd5b5060766004803603810190808035906020019092919050505060a0565b005b348015608357600080fd5b50608a60aa565b6040518082815260200191505060405180910390f35b8060008190555050565b600080549050905600a165627a7a7230582061b7676067d537e410bb704932a9984739a959416170ea17bda192ac1218d2790029",
         "creation_bytecode" =>
           "0x608060405234801561001057600080fd5b5060df8061001f6000396000f3006080604052600436106049576000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff16806360fe47b114604e5780636d4ce63c146078575b600080fd5b348015605957600080fd5b5060766004803603810190808035906020019092919050505060a0565b005b348015608357600080fd5b50608a60aa565b6040518082815260200191505060405180910390f35b8060008190555050565b600080549050905600a165627a7a7230582061b7676067d537e410bb704932a9984739a959416170ea17bda192ac1218d2790029",
-        "abi" => target_contract.abi
+        "abi" => target_contract.abi,
+        "is_verified_via_eth_bytecode_db" => target_contract.verified_via_eth_bytecode_db
       }
 
       request = get(conn, "/api/v2/smart-contracts/#{Address.checksum(target_contract.address_hash)}")
@@ -289,7 +291,8 @@ defmodule BlockScoutWeb.API.V2.SmartContractControllerTest do
           "0x6080604052600436106049576000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff16806360fe47b114604e5780636d4ce63c146078575b600080fd5b348015605957600080fd5b5060766004803603810190808035906020019092919050505060a0565b005b348015608357600080fd5b50608a60aa565b6040518082815260200191505060405180910390f35b8060008190555050565b600080549050905600a165627a7a7230582061b7676067d537e410bb704932a9984739a959416170ea17bda192ac1218d2790029",
         "creation_bytecode" =>
           "0x608060405234801561001057600080fd5b5060df8061001f6000396000f3006080604052600436106049576000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff16806360fe47b114604e5780636d4ce63c146078575b600080fd5b348015605957600080fd5b5060766004803603810190808035906020019092919050505060a0565b005b348015608357600080fd5b50608a60aa565b6040518082815260200191505060405180910390f35b8060008190555050565b600080549050905600a165627a7a7230582061b7676067d537e410bb704932a9984739a959416170ea17bda192ac1218d2790029",
-        "abi" => target_contract.abi
+        "abi" => target_contract.abi,
+        "is_verified_via_eth_bytecode_db" => target_contract.verified_via_eth_bytecode_db
       }
 
       request = get(conn, "/api/v2/smart-contracts/#{Address.checksum(address.hash)}")
@@ -351,7 +354,11 @@ defmodule BlockScoutWeb.API.V2.SmartContractControllerTest do
                }
 
       request = get(conn, "/api/v2/smart-contracts/#{Address.checksum(address.hash)}")
-      assert %{"is_verified" => true} = json_response(request, 200)
+      assert response = json_response(request, 200)
+      assert %{"is_verified" => true} = response
+      assert %{"is_verified_via_eth_bytecode_db" => true} = response
+      assert %{"is_partially_verified" => true} = response
+      assert %{"is_fully_verified" => false} = response
 
       Application.put_env(:explorer, Explorer.SmartContract.RustVerifierInterfaceBehaviour, old_env)
       Bypass.down(bypass)
diff --git a/apps/explorer/lib/explorer/chain/fetcher/look_up_smart_contract_sources_on_demand.ex b/apps/explorer/lib/explorer/chain/fetcher/look_up_smart_contract_sources_on_demand.ex
index cc8b90c3cf0d..32bf7bde6241 100644
--- a/apps/explorer/lib/explorer/chain/fetcher/look_up_smart_contract_sources_on_demand.ex
+++ b/apps/explorer/lib/explorer/chain/fetcher/look_up_smart_contract_sources_on_demand.ex
@@ -97,15 +97,15 @@ defmodule Explorer.Chain.Fetcher.LookUpSmartContractSourcesOnDemand do
   end
 
   def process_contract_source("SOLIDITY", source, address_hash) do
-    SolidityPublisher.process_rust_verifier_response(source, address_hash, true, true)
+    SolidityPublisher.process_rust_verifier_response(source, address_hash, true, true, true)
   end
 
   def process_contract_source("VYPER", source, address_hash) do
-    VyperPublisher.process_rust_verifier_response(source, address_hash, true)
+    VyperPublisher.process_rust_verifier_response(source, address_hash, true, true)
   end
 
   def process_contract_source("YUL", source, address_hash) do
-    SolidityPublisher.process_rust_verifier_response(source, address_hash, true, true)
+    SolidityPublisher.process_rust_verifier_response(source, address_hash, true, true, true)
   end
 
   def process_contract_source(_, _source, _address_hash), do: false
diff --git a/apps/explorer/lib/explorer/chain/smart_contract.ex b/apps/explorer/lib/explorer/chain/smart_contract.ex
index 2da242e39a62..8622c9adb848 100644
--- a/apps/explorer/lib/explorer/chain/smart_contract.ex
+++ b/apps/explorer/lib/explorer/chain/smart_contract.ex
@@ -215,6 +215,7 @@ defmodule Explorer.Chain.SmartContract do
   * `implementation_address_hash` - address hash of the proxy's implementation if any
   * `autodetect_constructor_args` - field was added for storing user's choice
   * `is_yul` - field was added for storing user's choice
+  * `verified_via_eth_bytecode_db` - whether contract automatically verified via eth-bytecode-db or not.
   """
 
   @type t :: %Explorer.Chain.SmartContract{
@@ -238,7 +239,8 @@ defmodule Explorer.Chain.SmartContract do
           implementation_fetched_at: DateTime.t(),
           implementation_address_hash: Hash.Address.t(),
           autodetect_constructor_args: boolean | nil,
-          is_yul: boolean | nil
+          is_yul: boolean | nil,
+          verified_via_eth_bytecode_db: boolean | nil
         }
 
   schema "smart_contracts" do
@@ -265,6 +267,7 @@ defmodule Explorer.Chain.SmartContract do
     field(:autodetect_constructor_args, :boolean, virtual: true)
     field(:is_yul, :boolean, virtual: true)
     field(:metadata_from_verified_twin, :boolean, virtual: true)
+    field(:verified_via_eth_bytecode_db, :boolean)
 
     has_many(
       :decompiled_smart_contracts,
@@ -309,7 +312,8 @@ defmodule Explorer.Chain.SmartContract do
       :implementation_name,
       :compiler_settings,
       :implementation_address_hash,
-      :implementation_fetched_at
+      :implementation_fetched_at,
+      :verified_via_eth_bytecode_db
     ])
     |> validate_required([
       :name,
@@ -349,7 +353,8 @@ defmodule Explorer.Chain.SmartContract do
         :bytecode_checked_at,
         :contract_code_md5,
         :implementation_name,
-        :autodetect_constructor_args
+        :autodetect_constructor_args,
+        :verified_via_eth_bytecode_db
       ])
       |> (&if(json_verification,
             do: &1,
diff --git a/apps/explorer/lib/explorer/smart_contract/solidity/publisher.ex b/apps/explorer/lib/explorer/smart_contract/solidity/publisher.ex
index 88381a7d3f66..0c7ba9c4c5df 100644
--- a/apps/explorer/lib/explorer/smart_contract/solidity/publisher.ex
+++ b/apps/explorer/lib/explorer/smart_contract/solidity/publisher.ex
@@ -133,11 +133,13 @@ defmodule Explorer.SmartContract.Solidity.Publisher do
           "contractName" => contract_name,
           "fileName" => file_name,
           "sourceFiles" => sources,
-          "compilerSettings" => compiler_settings_string
+          "compilerSettings" => compiler_settings_string,
+          "matchType" => match_type
         },
         address_hash,
         is_standard_json?,
-        save_file_path?
+        save_file_path?,
+        automatically_verified? \\ false
       ) do
     secondary_sources =
       for {file, source} <- sources,
@@ -163,6 +165,8 @@ defmodule Explorer.SmartContract.Solidity.Publisher do
       |> Map.put("file_path", if(save_file_path?, do: file_name))
       |> Map.put("secondary_sources", secondary_sources)
       |> Map.put("compiler_settings", if(is_standard_json?, do: compiler_settings))
+      |> Map.put("partially_verified", match_type == "PARTIAL")
+      |> Map.put("verified_via_eth_bytecode_db", automatically_verified?)
 
     publish_smart_contract(address_hash, prepared_params, Jason.decode!(abi_string || "null"))
   end
@@ -247,12 +251,13 @@ defmodule Explorer.SmartContract.Solidity.Publisher do
       external_libraries: prepared_external_libraries,
       secondary_sources: params["secondary_sources"],
       abi: abi,
-      verified_via_sourcify: params["verified_via_sourcify"],
-      partially_verified: params["partially_verified"],
+      verified_via_sourcify: params["verified_via_sourcify"] || false,
+      partially_verified: params["partially_verified"] || false,
       is_vyper_contract: false,
       autodetect_constructor_args: params["autodetect_constructor_args"],
       is_yul: params["is_yul"] || false,
-      compiler_settings: clean_compiler_settings
+      compiler_settings: clean_compiler_settings,
+      verified_via_eth_bytecode_db: params["verified_via_eth_bytecode_db"] || false
     }
   end
 
diff --git a/apps/explorer/lib/explorer/smart_contract/vyper/publisher.ex b/apps/explorer/lib/explorer/smart_contract/vyper/publisher.ex
index 22613046682a..4efb0798b888 100644
--- a/apps/explorer/lib/explorer/smart_contract/vyper/publisher.ex
+++ b/apps/explorer/lib/explorer/smart_contract/vyper/publisher.ex
@@ -72,10 +72,12 @@ defmodule Explorer.SmartContract.Vyper.Publisher do
           "contractName" => contract_name,
           "fileName" => file_name,
           "sourceFiles" => sources,
-          "compilerSettings" => compiler_settings_string
+          "compilerSettings" => compiler_settings_string,
+          "matchType" => match_type
         },
         address_hash,
-        save_file_path?
+        save_file_path?,
+        automatically_verified? \\ false
       ) do
     secondary_sources =
       for {file, source} <- sources,
@@ -96,6 +98,8 @@ defmodule Explorer.SmartContract.Vyper.Publisher do
       |> Map.put("file_path", if(save_file_path?, do: file_name))
       |> Map.put("secondary_sources", secondary_sources)
       |> Map.put("evm_version", compiler_settings["evmVersion"] || "istanbul")
+      |> Map.put("partially_verified", match_type == "PARTIAL")
+      |> Map.put("verified_via_eth_bytecode_db", automatically_verified?)
 
     publish_smart_contract(address_hash, prepared_params, Jason.decode!(abi_string))
   end
@@ -145,9 +149,10 @@ defmodule Explorer.SmartContract.Vyper.Publisher do
       secondary_sources: [],
       abi: abi,
       verified_via_sourcify: false,
-      partially_verified: false,
+      partially_verified: params["partially_verified"] || false,
       is_vyper_contract: true,
-      file_path: params["file_path"]
+      file_path: params["file_path"],
+      verified_via_eth_bytecode_db: params["verified_via_eth_bytecode_db"] || false
     }
   end
 end
diff --git a/apps/explorer/priv/repo/migrations/20230605080138_add_verified_via_eth_bytecode_db.exs b/apps/explorer/priv/repo/migrations/20230605080138_add_verified_via_eth_bytecode_db.exs
new file mode 100644
index 000000000000..9cef42d46938
--- /dev/null
+++ b/apps/explorer/priv/repo/migrations/20230605080138_add_verified_via_eth_bytecode_db.exs
@@ -0,0 +1,9 @@
+defmodule Explorer.Repo.Migrations.AddVerifiedViaEthBytecodeDb do
+  use Ecto.Migration
+
+  def change do
+    alter table(:smart_contracts) do
+      add(:verified_via_eth_bytecode_db, :boolean, null: true)
+    end
+  end
+end
diff --git a/apps/explorer/test/support/factory.ex b/apps/explorer/test/support/factory.ex
index 89799b759e0e..0c2004ba7aa8 100644
--- a/apps/explorer/test/support/factory.ex
+++ b/apps/explorer/test/support/factory.ex
@@ -818,7 +818,8 @@ defmodule Explorer.Factory do
       abi: contract_code_info.abi,
       contract_code_md5: bytecode_md5,
       verified_via_sourcify: Enum.random([true, false]),
-      is_vyper_contract: Enum.random([true, false])
+      is_vyper_contract: Enum.random([true, false]),
+      verified_via_eth_bytecode_db: Enum.random([true, false])
     }
   end
 

From c0f9ead05871d7c75743ef52fdaafe9f189c0be2 Mon Sep 17 00:00:00 2001
From: Victor Baranov <baranov.viktor.27@gmail.com>
Date: Tue, 6 Jun 2023 12:06:26 +0300
Subject: [PATCH 069/909] Revert "Fix created_contract_address_hash detection"

---
 CHANGELOG.md                                       |  1 -
 .../chain/import/runner/internal_transactions.ex   | 14 ++------------
 2 files changed, 2 insertions(+), 13 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f0b7eb08dd2d..26514e874fc6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -26,7 +26,6 @@
 - [#7545](https://github.com/blockscout/blockscout/pull/7545) - API v2: Check if cached exchange rate is empty before replacing DB value in stats API
 - [#7516](https://github.com/blockscout/blockscout/pull/7516) - Fix shrinking logo in Safari
 - [#7590](https://github.com/blockscout/blockscout/pull/7590) - Drop genesis block in internal transactions fetcher
-- [#7598](https://github.com/blockscout/blockscout/pull/7598) - Fix created_contract_address_hash detection
 
 ### Chore
 
diff --git a/apps/explorer/lib/explorer/chain/import/runner/internal_transactions.ex b/apps/explorer/lib/explorer/chain/import/runner/internal_transactions.ex
index 01a0acccc515..684e563c4a89 100644
--- a/apps/explorer/lib/explorer/chain/import/runner/internal_transactions.ex
+++ b/apps/explorer/lib/explorer/chain/import/runner/internal_transactions.ex
@@ -427,28 +427,18 @@ defmodule Explorer.Chain.Import.Runner.InternalTransactions do
     if valid_internal_transactions_count == 0 do
       {:ok, nil}
     else
-      created_contract_address_hash_map =
-        valid_internal_transactions
-        |> Enum.group_by(& &1.transaction_hash)
-        |> Enum.map(fn {transaction_hash, internal_transactions} ->
-          {transaction_hash, Enum.find_value(internal_transactions, & &1[:created_contract_address_hash])}
-        end)
-        |> Enum.into(%{})
-
       params =
         valid_internal_transactions
         |> Enum.filter(fn internal_tx ->
           internal_tx[:index] == 0
         end)
         |> Enum.map(fn trace ->
-          transaction_hash = Map.get(trace, :transaction_hash)
-
           %{
             block_hash: Map.get(trace, :block_hash),
             block_number: Map.get(trace, :block_number),
             gas_used: Map.get(trace, :gas_used),
-            transaction_hash: transaction_hash,
-            created_contract_address_hash: created_contract_address_hash_map[transaction_hash],
+            transaction_hash: Map.get(trace, :transaction_hash),
+            created_contract_address_hash: Map.get(trace, :created_contract_address_hash),
             error: Map.get(trace, :error),
             status: if(is_nil(Map.get(trace, :error)), do: :ok, else: :error)
           }

From 2cd44a22f0dc055b582ddd69739b4044e876fbbc Mon Sep 17 00:00:00 2001
From: Qwerty5Uiop <alex000010@bk.ru>
Date: Tue, 6 Jun 2023 13:26:46 +0400
Subject: [PATCH 070/909] Fix contract creation transactions

---
 CHANGELOG.md                                          |  1 +
 ...30606091935_fix_contract_creation_transactions.exs | 11 +++++++++++
 2 files changed, 12 insertions(+)
 create mode 100644 apps/explorer/priv/repo/migrations/20230606091935_fix_contract_creation_transactions.exs

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 26514e874fc6..a4f0f4ee758b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -26,6 +26,7 @@
 - [#7545](https://github.com/blockscout/blockscout/pull/7545) - API v2: Check if cached exchange rate is empty before replacing DB value in stats API
 - [#7516](https://github.com/blockscout/blockscout/pull/7516) - Fix shrinking logo in Safari
 - [#7590](https://github.com/blockscout/blockscout/pull/7590) - Drop genesis block in internal transactions fetcher
+- [#7639](https://github.com/blockscout/blockscout/pull/7639) - Fix contract creation transactions
 
 ### Chore
 
diff --git a/apps/explorer/priv/repo/migrations/20230606091935_fix_contract_creation_transactions.exs b/apps/explorer/priv/repo/migrations/20230606091935_fix_contract_creation_transactions.exs
new file mode 100644
index 000000000000..89d372eea6b4
--- /dev/null
+++ b/apps/explorer/priv/repo/migrations/20230606091935_fix_contract_creation_transactions.exs
@@ -0,0 +1,11 @@
+defmodule Explorer.Repo.Migrations.FixContractCreationTransactions do
+  use Ecto.Migration
+
+  def change do
+    execute("""
+      UPDATE transactions
+      SET created_contract_address_hash = NULL
+      WHERE created_contract_address_hash IS NOT NULL AND to_address_hash IS NOT NULL;
+    """)
+  end
+end

From 4c75167fa026164b021b785751e5b2edeae3cca0 Mon Sep 17 00:00:00 2001
From: Qwerty5Uiop <alex000010@bk.ru>
Date: Tue, 6 Jun 2023 15:50:43 +0400
Subject: [PATCH 071/909] Add addresses contract code clear to
 FixContractCreationTransactions migration

---
 .../20230606091935_fix_contract_creation_transactions.exs  | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/apps/explorer/priv/repo/migrations/20230606091935_fix_contract_creation_transactions.exs b/apps/explorer/priv/repo/migrations/20230606091935_fix_contract_creation_transactions.exs
index 89d372eea6b4..86a088ae50b7 100644
--- a/apps/explorer/priv/repo/migrations/20230606091935_fix_contract_creation_transactions.exs
+++ b/apps/explorer/priv/repo/migrations/20230606091935_fix_contract_creation_transactions.exs
@@ -2,6 +2,13 @@ defmodule Explorer.Repo.Migrations.FixContractCreationTransactions do
   use Ecto.Migration
 
   def change do
+    execute("""
+      UPDATE addresses a
+      SET contract_code = NULL
+      FROM transactions t
+      WHERE t.created_contract_address_hash IS NOT NULL AND t.created_contract_address_hash = a.hash AND t.to_address_hash IS NOT NULL;
+    """)
+
     execute("""
       UPDATE transactions
       SET created_contract_address_hash = NULL

From 94c64a67b51dbc5c3bef5b2f4d1cfd69c094efd8 Mon Sep 17 00:00:00 2001
From: Viktor Baranov <baranov.viktor.27@gmail.com>
Date: Tue, 6 Jun 2023 19:52:43 +0300
Subject: [PATCH 072/909] prerelease -> postrelease

---
 .github/workflows/publish-docker-image-every-push.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/publish-docker-image-every-push.yml b/.github/workflows/publish-docker-image-every-push.yml
index 46a0cffc1c4d..825360099533 100644
--- a/.github/workflows/publish-docker-image-every-push.yml
+++ b/.github/workflows/publish-docker-image-every-push.yml
@@ -95,7 +95,7 @@ jobs:
   #   needs: push_to_registry
   #   uses: blockscout/blockscout-ci-cd/.github/workflows/e2e_new.yaml@master
   #   with:
-  #     blockscoutImage: blockscout/blockscout:${{ needs.push_to_registry.outputs.release-version }}-prerelease-${{ needs.push_to_registry.outputs.short-sha }}
+  #     blockscoutImage: blockscout/blockscout:${{ needs.push_to_registry.outputs.release-version }}-postrelease-${{ needs.push_to_registry.outputs.short-sha }}
   #     blockscoutIngressHost: e2e-blockscout-$GITHUB_SHA_SHORT
   #     frontendIngressHost: e2e-blockscout-$GITHUB_SHA_SHORT
   #     gethIngressHost: e2e-geth-$GITHUB_SHA_SHORT

From 1fc22314e6b8a88218a4cf12bc8140d416ec498d Mon Sep 17 00:00:00 2001
From: Viktor Baranov <baranov.viktor.27@gmail.com>
Date: Tue, 6 Jun 2023 20:06:39 +0300
Subject: [PATCH 073/909] Publish docker images CI for prod/staging branches

---
 .../publish-docker-image-for-base.yml         | 54 +++++++++++++++
 .../publish-docker-image-for-core.yml         | 54 +++++++++++++++
 .../publish-docker-image-for-eth.yml          | 54 +++++++++++++++
 .../publish-docker-image-for-gc-chiado.yml    | 64 ++++++++++++++++++
 .../publish-docker-image-for-l2-staging.yml   | 54 +++++++++++++++
 .../publish-docker-image-for-lukso.yml        | 54 +++++++++++++++
 .../publish-docker-image-for-optimism.yml     | 54 +++++++++++++++
 ...ish-docker-image-for-polygon-supernets.yml | 64 ++++++++++++++++++
 .../publish-docker-image-for-xdai.yml         | 66 +++++++++++++++++++
 CHANGELOG.md                                  |  1 +
 10 files changed, 519 insertions(+)
 create mode 100644 .github/workflows/publish-docker-image-for-base.yml
 create mode 100644 .github/workflows/publish-docker-image-for-core.yml
 create mode 100644 .github/workflows/publish-docker-image-for-eth.yml
 create mode 100644 .github/workflows/publish-docker-image-for-gc-chiado.yml
 create mode 100644 .github/workflows/publish-docker-image-for-l2-staging.yml
 create mode 100644 .github/workflows/publish-docker-image-for-lukso.yml
 create mode 100644 .github/workflows/publish-docker-image-for-optimism.yml
 create mode 100644 .github/workflows/publish-docker-image-for-polygon-supernets.yml
 create mode 100644 .github/workflows/publish-docker-image-for-xdai.yml

diff --git a/.github/workflows/publish-docker-image-for-base.yml b/.github/workflows/publish-docker-image-for-base.yml
new file mode 100644
index 000000000000..46f1674d26e1
--- /dev/null
+++ b/.github/workflows/publish-docker-image-for-base.yml
@@ -0,0 +1,54 @@
+# This workflow uses actions that are not certified by GitHub.
+# They are provided by a third-party and are governed by
+# separate terms of service, privacy policy, and support
+# documentation.
+
+name: Publish Docker image for specific chain branches
+
+on:
+  push:
+    branches:
+      - production-base-goerli-stg
+jobs:
+  push_to_registry:
+    name: Push Docker image to Docker Hub
+    runs-on: ubuntu-latest
+    env:
+      RELEASE_VERSION: 5.1.5
+      DOCKER_CHAIN_NAME: base-goerli
+    steps:
+      - name: Check out the repo
+        uses: actions/checkout@v3
+      
+      - name: Log in to Docker Hub
+        uses: docker/login-action@v2
+        with:
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
+      
+      - name: Extract metadata (tags, labels) for Docker
+        id: meta
+        uses: docker/metadata-action@v4
+        with:
+          images: blockscout/blockscout
+
+      - name: Add SHORT_SHA env property with commit short sha
+        run: echo "SHORT_SHA=`echo ${GITHUB_SHA} | cut -c1-8`" >> $GITHUB_ENV
+      
+      - name: Build and push Docker image
+        uses: docker/build-push-action@v3
+        with:
+          context: .
+          file: ./docker/Dockerfile
+          push: true
+          tags: blockscout/blockscout-${{ env.DOCKER_CHAIN_NAME }}:latest, blockscout/blockscout-${{ env.DOCKER_CHAIN_NAME }}:${{ env.RELEASE_VERSION }}-prerelease-${{ env.SHORT_SHA }}
+          build-args: |
+            CACHE_EXCHANGE_RATES_PERIOD=
+            DISABLE_READ_API=false
+            DISABLE_WEBAPP=false
+            DISABLE_WRITE_API=false
+            CACHE_TOTAL_GAS_USAGE_COUNTER_ENABLED=
+            ADMIN_PANEL_ENABLED=false
+            CACHE_ADDRESS_WITH_BALANCES_UPDATE_INTERVAL=
+            BLOCKSCOUT_VERSION=v${{ env.RELEASE_VERSION }}-beta.+commit.${{ env.SHORT_SHA }}
+            RELEASE_VERSION=${{ env.RELEASE_VERSION }}
\ No newline at end of file
diff --git a/.github/workflows/publish-docker-image-for-core.yml b/.github/workflows/publish-docker-image-for-core.yml
new file mode 100644
index 000000000000..8872e9186b42
--- /dev/null
+++ b/.github/workflows/publish-docker-image-for-core.yml
@@ -0,0 +1,54 @@
+# This workflow uses actions that are not certified by GitHub.
+# They are provided by a third-party and are governed by
+# separate terms of service, privacy policy, and support
+# documentation.
+
+name: Publish Docker image for specific chain branches
+
+on:
+  push:
+    branches:
+      - production-core-stg
+jobs:
+  push_to_registry:
+    name: Push Docker image to Docker Hub
+    runs-on: ubuntu-latest
+    env:
+      RELEASE_VERSION: 5.1.5
+      DOCKER_CHAIN_NAME: poa
+    steps:
+      - name: Check out the repo
+        uses: actions/checkout@v3
+      
+      - name: Log in to Docker Hub
+        uses: docker/login-action@v2
+        with:
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
+      
+      - name: Extract metadata (tags, labels) for Docker
+        id: meta
+        uses: docker/metadata-action@v4
+        with:
+          images: blockscout/blockscout
+
+      - name: Add SHORT_SHA env property with commit short sha
+        run: echo "SHORT_SHA=`echo ${GITHUB_SHA} | cut -c1-8`" >> $GITHUB_ENV
+      
+      - name: Build and push Docker image
+        uses: docker/build-push-action@v3
+        with:
+          context: .
+          file: ./docker/Dockerfile
+          push: true
+          tags: blockscout/blockscout-${{ env.DOCKER_CHAIN_NAME }}:latest, blockscout/blockscout-${{ env.DOCKER_CHAIN_NAME }}:${{ env.RELEASE_VERSION }}-prerelease-${{ env.SHORT_SHA }}
+          build-args: |
+            CACHE_EXCHANGE_RATES_PERIOD=
+            DISABLE_READ_API=false
+            DISABLE_WEBAPP=false
+            DISABLE_WRITE_API=false
+            CACHE_TOTAL_GAS_USAGE_COUNTER_ENABLED=
+            ADMIN_PANEL_ENABLED=false
+            CACHE_ADDRESS_WITH_BALANCES_UPDATE_INTERVAL=
+            BLOCKSCOUT_VERSION=v${{ env.RELEASE_VERSION }}-beta.+commit.${{ env.SHORT_SHA }}
+            RELEASE_VERSION=${{ env.RELEASE_VERSION }}
\ No newline at end of file
diff --git a/.github/workflows/publish-docker-image-for-eth.yml b/.github/workflows/publish-docker-image-for-eth.yml
new file mode 100644
index 000000000000..2a2be62293f0
--- /dev/null
+++ b/.github/workflows/publish-docker-image-for-eth.yml
@@ -0,0 +1,54 @@
+# This workflow uses actions that are not certified by GitHub.
+# They are provided by a third-party and are governed by
+# separate terms of service, privacy policy, and support
+# documentation.
+
+name: Publish Docker image for specific chain branches
+
+on:
+  push:
+    branches:
+      - production-eth-stg-experimental
+jobs:
+  push_to_registry:
+    name: Push Docker image to Docker Hub
+    runs-on: ubuntu-latest
+    env:
+      RELEASE_VERSION: 5.1.5
+      DOCKER_CHAIN_NAME: mainnet
+    steps:
+      - name: Check out the repo
+        uses: actions/checkout@v3
+      
+      - name: Log in to Docker Hub
+        uses: docker/login-action@v2
+        with:
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
+      
+      - name: Extract metadata (tags, labels) for Docker
+        id: meta
+        uses: docker/metadata-action@v4
+        with:
+          images: blockscout/blockscout
+
+      - name: Add SHORT_SHA env property with commit short sha
+        run: echo "SHORT_SHA=`echo ${GITHUB_SHA} | cut -c1-8`" >> $GITHUB_ENV
+      
+      - name: Build and push Docker image
+        uses: docker/build-push-action@v3
+        with:
+          context: .
+          file: ./docker/Dockerfile
+          push: true
+          tags:  blockscout/blockscout-${{ env.DOCKER_CHAIN_NAME }}:${{ env.RELEASE_VERSION }}-prerelease-${{ env.SHORT_SHA }}-experimental
+          build-args: |
+            CACHE_EXCHANGE_RATES_PERIOD=
+            DISABLE_READ_API=false
+            DISABLE_WEBAPP=false
+            DISABLE_WRITE_API=false
+            CACHE_TOTAL_GAS_USAGE_COUNTER_ENABLED=false
+            ADMIN_PANEL_ENABLED=false
+            CACHE_ADDRESS_WITH_BALANCES_UPDATE_INTERVAL=
+            BLOCKSCOUT_VERSION=v${{ env.RELEASE_VERSION }}-beta.+commit.${{ env.SHORT_SHA }}
+            RELEASE_VERSION=${{ env.RELEASE_VERSION }}
\ No newline at end of file
diff --git a/.github/workflows/publish-docker-image-for-gc-chiado.yml b/.github/workflows/publish-docker-image-for-gc-chiado.yml
new file mode 100644
index 000000000000..dfd209bca4c1
--- /dev/null
+++ b/.github/workflows/publish-docker-image-for-gc-chiado.yml
@@ -0,0 +1,64 @@
+# This workflow uses actions that are not certified by GitHub.
+# They are provided by a third-party and are governed by
+# separate terms of service, privacy policy, and support
+# documentation.
+
+name: Publish Docker image for specific chain branches
+
+on:
+  push:
+    branches:
+      - production-gc-chiado-stg
+env:
+  OTP_VERSION: '24.3.4.1'
+  ELIXIR_VERSION: '1.13.4'
+jobs:
+  push_to_registry:
+    name: Push Docker image to Docker Hub
+    runs-on: ubuntu-latest
+    env:
+      RELEASE_VERSION: 5.1.5
+      DOCKER_CHAIN_NAME: xdai-chiado
+    steps:
+      - name: Check out the repo
+        uses: actions/checkout@v3
+
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v2
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2
+      
+      - name: Log in to Docker Hub
+        uses: docker/login-action@v2
+        with:
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
+      
+      - name: Extract metadata (tags, labels) for Docker
+        id: meta
+        uses: docker/metadata-action@v4
+        with:
+          images: blockscout/blockscout
+
+      - name: Add SHORT_SHA env property with commit short sha
+        run: echo "SHORT_SHA=`echo ${GITHUB_SHA} | cut -c1-8`" >> $GITHUB_ENV
+      
+      - name: Build and push Docker image
+        uses: docker/build-push-action@v3
+        with:
+          context: .
+          file: ./docker/Dockerfile
+          push: true
+          tags: blockscout/blockscout-${{ env.DOCKER_CHAIN_NAME }}:latest, blockscout/blockscout-${{ env.DOCKER_CHAIN_NAME }}:${{ env.RELEASE_VERSION }}-prerelease-${{ env.SHORT_SHA }}
+          build-args: |
+            CACHE_EXCHANGE_RATES_PERIOD=
+            DISABLE_READ_API=false
+            DISABLE_WEBAPP=false
+            DISABLE_WRITE_API=false
+            CACHE_TOTAL_GAS_USAGE_COUNTER_ENABLED=
+            ADMIN_PANEL_ENABLED=false
+            CACHE_ADDRESS_WITH_BALANCES_UPDATE_INTERVAL=
+            SENTRY_DSN_CLIENT_GNOSIS=${{ secrets.SENTRY_DSN_CLIENT_GNOSIS }}
+            BLOCKSCOUT_VERSION=v${{ env.RELEASE_VERSION }}-beta.+commit.${{ env.SHORT_SHA }}
+            RELEASE_VERSION=${{ env.RELEASE_VERSION }}
\ No newline at end of file
diff --git a/.github/workflows/publish-docker-image-for-l2-staging.yml b/.github/workflows/publish-docker-image-for-l2-staging.yml
new file mode 100644
index 000000000000..fd5e82bfeba1
--- /dev/null
+++ b/.github/workflows/publish-docker-image-for-l2-staging.yml
@@ -0,0 +1,54 @@
+# This workflow uses actions that are not certified by GitHub.
+# They are provided by a third-party and are governed by
+# separate terms of service, privacy policy, and support
+# documentation.
+
+name: Publish Docker image for specific chain branches
+
+on:
+  push:
+    branches:
+      - staging-l2
+jobs:
+  push_to_registry:
+    name: Push Docker image to Docker Hub
+    runs-on: ubuntu-latest
+    env:
+      RELEASE_VERSION: 5.1.5
+      DOCKER_CHAIN_NAME: optimism-l2-advanced
+    steps:
+      - name: Check out the repo
+        uses: actions/checkout@v3
+      
+      - name: Log in to Docker Hub
+        uses: docker/login-action@v2
+        with:
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
+      
+      - name: Extract metadata (tags, labels) for Docker
+        id: meta
+        uses: docker/metadata-action@v4
+        with:
+          images: blockscout/blockscout
+
+      - name: Add SHORT_SHA env property with commit short sha
+        run: echo "SHORT_SHA=`echo ${GITHUB_SHA} | cut -c1-8`" >> $GITHUB_ENV
+      
+      - name: Build and push Docker image
+        uses: docker/build-push-action@v3
+        with:
+          context: .
+          file: ./docker/Dockerfile
+          push: true
+          tags: blockscout/blockscout-${{ env.DOCKER_CHAIN_NAME }}:latest, blockscout/blockscout-${{ env.DOCKER_CHAIN_NAME }}:${{ env.RELEASE_VERSION }}-prerelease-${{ env.SHORT_SHA }}
+          build-args: |
+            CACHE_EXCHANGE_RATES_PERIOD=
+            DISABLE_READ_API=false
+            DISABLE_WEBAPP=false
+            DISABLE_WRITE_API=false
+            CACHE_TOTAL_GAS_USAGE_COUNTER_ENABLED=
+            ADMIN_PANEL_ENABLED=false
+            CACHE_ADDRESS_WITH_BALANCES_UPDATE_INTERVAL=
+            BLOCKSCOUT_VERSION=v${{ env.RELEASE_VERSION }}-beta.+commit.${{ env.SHORT_SHA }}
+            RELEASE_VERSION=${{ env.RELEASE_VERSION }}
\ No newline at end of file
diff --git a/.github/workflows/publish-docker-image-for-lukso.yml b/.github/workflows/publish-docker-image-for-lukso.yml
new file mode 100644
index 000000000000..a94bed49a458
--- /dev/null
+++ b/.github/workflows/publish-docker-image-for-lukso.yml
@@ -0,0 +1,54 @@
+# This workflow uses actions that are not certified by GitHub.
+# They are provided by a third-party and are governed by
+# separate terms of service, privacy policy, and support
+# documentation.
+
+name: Publish Docker image for specific chain branches
+
+on:
+  push:
+    branches:
+      - production-lukso-stg
+jobs:
+  push_to_registry:
+    name: Push Docker image to Docker Hub
+    runs-on: ubuntu-latest
+    env:
+      RELEASE_VERSION: 5.1.5
+      DOCKER_CHAIN_NAME: lukso
+    steps:
+      - name: Check out the repo
+        uses: actions/checkout@v3
+      
+      - name: Log in to Docker Hub
+        uses: docker/login-action@v2
+        with:
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
+      
+      - name: Extract metadata (tags, labels) for Docker
+        id: meta
+        uses: docker/metadata-action@v4
+        with:
+          images: blockscout/blockscout
+
+      - name: Add SHORT_SHA env property with commit short sha
+        run: echo "SHORT_SHA=`echo ${GITHUB_SHA} | cut -c1-8`" >> $GITHUB_ENV
+      
+      - name: Build and push Docker image
+        uses: docker/build-push-action@v3
+        with:
+          context: .
+          file: ./docker/Dockerfile
+          push: true
+          tags: blockscout/blockscout-${{ env.DOCKER_CHAIN_NAME }}:latest, blockscout/blockscout-${{ env.DOCKER_CHAIN_NAME }}:${{ env.RELEASE_VERSION }}-prerelease-${{ env.SHORT_SHA }}
+          build-args: |
+            CACHE_EXCHANGE_RATES_PERIOD=
+            DISABLE_READ_API=false
+            DISABLE_WEBAPP=false
+            DISABLE_WRITE_API=false
+            CACHE_TOTAL_GAS_USAGE_COUNTER_ENABLED=
+            ADMIN_PANEL_ENABLED=false
+            CACHE_ADDRESS_WITH_BALANCES_UPDATE_INTERVAL=
+            BLOCKSCOUT_VERSION=v${{ env.RELEASE_VERSION }}-beta.+commit.${{ env.SHORT_SHA }}
+            RELEASE_VERSION=${{ env.RELEASE_VERSION }}
\ No newline at end of file
diff --git a/.github/workflows/publish-docker-image-for-optimism.yml b/.github/workflows/publish-docker-image-for-optimism.yml
new file mode 100644
index 000000000000..570df2aeaab2
--- /dev/null
+++ b/.github/workflows/publish-docker-image-for-optimism.yml
@@ -0,0 +1,54 @@
+# This workflow uses actions that are not certified by GitHub.
+# They are provided by a third-party and are governed by
+# separate terms of service, privacy policy, and support
+# documentation.
+
+name: Publish Docker image for specific chain branches
+
+on:
+  push:
+    branches:
+      - production-optimism-stg
+jobs:
+  push_to_registry:
+    name: Push Docker image to Docker Hub
+    runs-on: ubuntu-latest
+    env:
+      RELEASE_VERSION: 5.1.5
+      DOCKER_CHAIN_NAME: optimism
+    steps:
+      - name: Check out the repo
+        uses: actions/checkout@v3
+      
+      - name: Log in to Docker Hub
+        uses: docker/login-action@v2
+        with:
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
+      
+      - name: Extract metadata (tags, labels) for Docker
+        id: meta
+        uses: docker/metadata-action@v4
+        with:
+          images: blockscout/blockscout
+
+      - name: Add SHORT_SHA env property with commit short sha
+        run: echo "SHORT_SHA=`echo ${GITHUB_SHA} | cut -c1-8`" >> $GITHUB_ENV
+      
+      - name: Build and push Docker image
+        uses: docker/build-push-action@v3
+        with:
+          context: .
+          file: ./docker/Dockerfile
+          push: true
+          tags: blockscout/blockscout-${{ env.DOCKER_CHAIN_NAME }}:latest, blockscout/blockscout-${{ env.DOCKER_CHAIN_NAME }}:${{ env.RELEASE_VERSION }}-postrelease-${{ env.SHORT_SHA }}
+          build-args: |
+            CACHE_EXCHANGE_RATES_PERIOD=
+            DISABLE_READ_API=false
+            DISABLE_WEBAPP=false
+            DISABLE_WRITE_API=false
+            CACHE_TOTAL_GAS_USAGE_COUNTER_ENABLED=
+            ADMIN_PANEL_ENABLED=false
+            CACHE_ADDRESS_WITH_BALANCES_UPDATE_INTERVAL=
+            BLOCKSCOUT_VERSION=v${{ env.RELEASE_VERSION }}-beta.+commit.${{ env.SHORT_SHA }}
+            RELEASE_VERSION=${{ env.RELEASE_VERSION }}
\ No newline at end of file
diff --git a/.github/workflows/publish-docker-image-for-polygon-supernets.yml b/.github/workflows/publish-docker-image-for-polygon-supernets.yml
new file mode 100644
index 000000000000..b21b5cb8eb82
--- /dev/null
+++ b/.github/workflows/publish-docker-image-for-polygon-supernets.yml
@@ -0,0 +1,64 @@
+# This workflow uses actions that are not certified by GitHub.
+# They are provided by a third-party and are governed by
+# separate terms of service, privacy policy, and support
+# documentation.
+
+name: Publish Docker image for specific chain branches
+
+on:
+  push:
+    branches:
+      - production-polygon-supernets-stg
+env:
+  OTP_VERSION: '24.3.4.1'
+  ELIXIR_VERSION: '1.13.4'
+jobs:
+  push_to_registry:
+    name: Push Docker image to Docker Hub
+    runs-on: ubuntu-latest
+    env:
+      RELEASE_VERSION: 5.1.5
+      DOCKER_CHAIN_NAME: polygon-supernets
+    steps:
+      - name: Check out the repo
+        uses: actions/checkout@v3
+
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v2
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2
+      
+      - name: Log in to Docker Hub
+        uses: docker/login-action@v2
+        with:
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
+      
+      - name: Extract metadata (tags, labels) for Docker
+        id: meta
+        uses: docker/metadata-action@v4
+        with:
+          images: blockscout/blockscout
+
+      - name: Add SHORT_SHA env property with commit short sha
+        run: echo "SHORT_SHA=`echo ${GITHUB_SHA} | cut -c1-8`" >> $GITHUB_ENV
+      
+      - name: Build and push Docker image
+        uses: docker/build-push-action@v3
+        with:
+          context: .
+          file: ./docker/Dockerfile
+          push: true
+          tags: blockscout/blockscout-${{ env.DOCKER_CHAIN_NAME }}:latest, blockscout/blockscout-${{ env.DOCKER_CHAIN_NAME }}:${{ env.RELEASE_VERSION }}-prerelease-${{ env.SHORT_SHA }}
+          build-args: |
+            CACHE_EXCHANGE_RATES_PERIOD=
+            API_V1_READ_METHODS_DISABLED=true
+            DISABLE_WEBAPP=false
+            API_V1_WRITE_METHODS_DISABLED=true
+            CACHE_TOTAL_GAS_USAGE_COUNTER_ENABLED=
+            ADMIN_PANEL_ENABLED=false
+            CACHE_ADDRESS_WITH_BALANCES_UPDATE_INTERVAL=
+            SENTRY_DSN_CLIENT_GNOSIS=${{ secrets.SENTRY_DSN_CLIENT_GNOSIS }}
+            BLOCKSCOUT_VERSION=v${{ env.RELEASE_VERSION }}-beta.+commit.${{ env.SHORT_SHA }}
+            RELEASE_VERSION=${{ env.RELEASE_VERSION }}
\ No newline at end of file
diff --git a/.github/workflows/publish-docker-image-for-xdai.yml b/.github/workflows/publish-docker-image-for-xdai.yml
new file mode 100644
index 000000000000..0247e8d4155e
--- /dev/null
+++ b/.github/workflows/publish-docker-image-for-xdai.yml
@@ -0,0 +1,66 @@
+# This workflow uses actions that are not certified by GitHub.
+# They are provided by a third-party and are governed by
+# separate terms of service, privacy policy, and support
+# documentation.
+
+name: Publish Docker image for specific chain branches
+
+on:
+  push:
+    branches:
+      - production-xdai-stg
+env:
+  OTP_VERSION: '24.3.4.1'
+  ELIXIR_VERSION: '1.13.4'
+jobs:
+  push_to_registry:
+    name: Push Docker image to Docker Hub
+    runs-on: ubuntu-latest
+    env:
+      RELEASE_VERSION: 5.1.5
+      DOCKER_CHAIN_NAME: xdai
+    steps:
+      - name: Check out the repo
+        uses: actions/checkout@v3
+
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v2
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2
+      
+      - name: Log in to Docker Hub
+        uses: docker/login-action@v2
+        with:
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
+      
+      - name: Extract metadata (tags, labels) for Docker
+        id: meta
+        uses: docker/metadata-action@v4
+        with:
+          images: blockscout/blockscout
+
+      - name: Add SHORT_SHA env property with commit short sha
+        run: echo "SHORT_SHA=`echo ${GITHUB_SHA} | cut -c1-8`" >> $GITHUB_ENV
+      
+      - name: Build and push Docker image
+        uses: docker/build-push-action@v3
+        with:
+          context: .
+          file: ./docker/Dockerfile
+          push: true
+          tags: blockscout/blockscout-${{ env.DOCKER_CHAIN_NAME }}:latest, blockscout/blockscout-${{ env.DOCKER_CHAIN_NAME }}:${{ env.RELEASE_VERSION }}-prerelease-${{ env.SHORT_SHA }}
+          build-args: |
+            CACHE_EXCHANGE_RATES_PERIOD=
+            DISABLE_READ_API=false
+            DISABLE_WEBAPP=false
+            DISABLE_WRITE_API=false
+            CACHE_TOTAL_GAS_USAGE_COUNTER_ENABLED=
+            ADMIN_PANEL_ENABLED=false
+            CACHE_ADDRESS_WITH_BALANCES_UPDATE_INTERVAL=
+            DISABLE_BRIDGE_MARKET_CAP_UPDATER=false
+            CACHE_BRIDGE_MARKET_CAP_UPDATE_INTERVAL=
+            SENTRY_DSN_CLIENT_GNOSIS=${{ secrets.SENTRY_DSN_CLIENT_GNOSIS }}
+            BLOCKSCOUT_VERSION=v${{ env.RELEASE_VERSION }}-beta.+commit.${{ env.SHORT_SHA }}
+            RELEASE_VERSION=${{ env.RELEASE_VERSION }}
\ No newline at end of file
diff --git a/CHANGELOG.md b/CHANGELOG.md
index a4f0f4ee758b..0c4edb695f10 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -30,6 +30,7 @@
 
 ### Chore
 
+- [#7644](https://github.com/blockscout/blockscout/pull/7644) - Publish docker images CI for prod/staging branches
 - [#7594](https://github.com/blockscout/blockscout/pull/7594) - Stats service support in docker-compose config with new frontend
 - [#7576](https://github.com/blockscout/blockscout/pull/7576) - Check left blocks in pending block operations in order to decide, if we need to display indexing int tx banner at the top
 - [#7543](https://github.com/blockscout/blockscout/pull/7543) - Allow hyphen in DB username

From 5b4f3436fdef295674ccad2ae490ef742a71c7ce Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 6 Jun 2023 19:00:41 +0000
Subject: [PATCH 074/909] Bump sweetalert2 from 11.7.10 to 11.7.11 in
 /apps/block_scout_web/assets

Bumps [sweetalert2](https://github.com/sweetalert2/sweetalert2) from 11.7.10 to 11.7.11.
- [Release notes](https://github.com/sweetalert2/sweetalert2/releases)
- [Changelog](https://github.com/sweetalert2/sweetalert2/blob/main/CHANGELOG.md)
- [Commits](https://github.com/sweetalert2/sweetalert2/compare/v11.7.10...v11.7.11)

---
updated-dependencies:
- dependency-name: sweetalert2
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 apps/block_scout_web/assets/package-lock.json | 14 +++++++-------
 apps/block_scout_web/assets/package.json      |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/apps/block_scout_web/assets/package-lock.json b/apps/block_scout_web/assets/package-lock.json
index 26d421d4f5a7..54a69d5d6230 100644
--- a/apps/block_scout_web/assets/package-lock.json
+++ b/apps/block_scout_web/assets/package-lock.json
@@ -61,7 +61,7 @@
         "redux": "^4.2.1",
         "stream-browserify": "^3.0.0",
         "stream-http": "^3.1.1",
-        "sweetalert2": "^11.7.10",
+        "sweetalert2": "^11.7.11",
         "urijs": "^1.19.11",
         "url": "^0.11.0",
         "util": "^0.12.5",
@@ -15747,9 +15747,9 @@
       }
     },
     "node_modules/sweetalert2": {
-      "version": "11.7.10",
-      "resolved": "https://registry.npmjs.org/sweetalert2/-/sweetalert2-11.7.10.tgz",
-      "integrity": "sha512-SgnO8VF7omM78doFxIAiEyhNBEudVTpYpYXJB9/yftvKD+UlWRaAkLMGD4kvAsgiwwph4SUFlNjiAbB5cUS8/g==",
+      "version": "11.7.11",
+      "resolved": "https://registry.npmjs.org/sweetalert2/-/sweetalert2-11.7.11.tgz",
+      "integrity": "sha512-kQ2wxdHq9OBCdVT7Ku8YYuNGKq2qwYMIBSfY13j/dsqVFh6th37SE0/hCLcrZ8LS/kIouiVKgWqYa9/UJ3RZTQ==",
       "funding": {
         "type": "individual",
         "url": "https://github.com/sponsors/limonte"
@@ -29351,9 +29351,9 @@
       }
     },
     "sweetalert2": {
-      "version": "11.7.10",
-      "resolved": "https://registry.npmjs.org/sweetalert2/-/sweetalert2-11.7.10.tgz",
-      "integrity": "sha512-SgnO8VF7omM78doFxIAiEyhNBEudVTpYpYXJB9/yftvKD+UlWRaAkLMGD4kvAsgiwwph4SUFlNjiAbB5cUS8/g=="
+      "version": "11.7.11",
+      "resolved": "https://registry.npmjs.org/sweetalert2/-/sweetalert2-11.7.11.tgz",
+      "integrity": "sha512-kQ2wxdHq9OBCdVT7Ku8YYuNGKq2qwYMIBSfY13j/dsqVFh6th37SE0/hCLcrZ8LS/kIouiVKgWqYa9/UJ3RZTQ=="
     },
     "symbol-tree": {
       "version": "3.2.4",
diff --git a/apps/block_scout_web/assets/package.json b/apps/block_scout_web/assets/package.json
index 87abcb63f59f..50102e9fcdbe 100644
--- a/apps/block_scout_web/assets/package.json
+++ b/apps/block_scout_web/assets/package.json
@@ -73,7 +73,7 @@
     "redux": "^4.2.1",
     "stream-browserify": "^3.0.0",
     "stream-http": "^3.1.1",
-    "sweetalert2": "^11.7.10",
+    "sweetalert2": "^11.7.11",
     "urijs": "^1.19.11",
     "url": "^0.11.0",
     "util": "^0.12.5",

From 96f12ae54566e4e1b75fac1571fa90b22e980fc7 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 6 Jun 2023 19:01:05 +0000
Subject: [PATCH 075/909] Bump @amplitude/analytics-browser in
 /apps/block_scout_web/assets

Bumps [@amplitude/analytics-browser](https://github.com/amplitude/Amplitude-TypeScript) from 1.10.4 to 1.10.6.
- [Release notes](https://github.com/amplitude/Amplitude-TypeScript/releases)
- [Commits](https://github.com/amplitude/Amplitude-TypeScript/compare/@amplitude/analytics-browser@1.10.4...@amplitude/analytics-browser@1.10.6)

---
updated-dependencies:
- dependency-name: "@amplitude/analytics-browser"
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 apps/block_scout_web/assets/package-lock.json | 192 +++++++++---------
 apps/block_scout_web/assets/package.json      |   2 +-
 2 files changed, 94 insertions(+), 100 deletions(-)

diff --git a/apps/block_scout_web/assets/package-lock.json b/apps/block_scout_web/assets/package-lock.json
index 26d421d4f5a7..505fe26fe155 100644
--- a/apps/block_scout_web/assets/package-lock.json
+++ b/apps/block_scout_web/assets/package-lock.json
@@ -7,7 +7,7 @@
       "name": "blockscout",
       "license": "GPL-3.0",
       "dependencies": {
-        "@amplitude/analytics-browser": "^1.10.4",
+        "@amplitude/analytics-browser": "^1.10.6",
         "@fortawesome/fontawesome-free": "^6.4.0",
         "@tarekraafat/autocomplete.js": "^10.2.7",
         "@walletconnect/web3-provider": "^1.8.0",
@@ -107,15 +107,15 @@
       "version": "0.0.1"
     },
     "node_modules/@amplitude/analytics-browser": {
-      "version": "1.10.4",
-      "resolved": "https://registry.npmjs.org/@amplitude/analytics-browser/-/analytics-browser-1.10.4.tgz",
-      "integrity": "sha512-8Wx9dvCVyGnpzWJZESLiC7ICeYTRqh/I8eKArGTMJVe+vYwwsa4YaRA+DOclCCUnjgA7HfQKDbXw5iLEbcGzpA==",
-      "dependencies": {
-        "@amplitude/analytics-client-common": "^0.7.0",
-        "@amplitude/analytics-core": "^0.13.3",
-        "@amplitude/analytics-types": "^0.20.0",
-        "@amplitude/plugin-page-view-tracking-browser": "^0.8.1",
-        "@amplitude/plugin-web-attribution-browser": "^0.7.0",
+      "version": "1.10.6",
+      "resolved": "https://registry.npmjs.org/@amplitude/analytics-browser/-/analytics-browser-1.10.6.tgz",
+      "integrity": "sha512-UQ2k77bWpDN0sMoKFCXVSOLGs26X37wjUqPKPgUrq5hcAuE+qa/6CSfY0ftXFDHnKDGbX7z1Qo0Kl4TgUa0BIQ==",
+      "dependencies": {
+        "@amplitude/analytics-client-common": "^1.0.0",
+        "@amplitude/analytics-core": "^1.0.0",
+        "@amplitude/analytics-types": "^1.0.0",
+        "@amplitude/plugin-page-view-tracking-browser": "^1.0.0",
+        "@amplitude/plugin-web-attribution-browser": "^1.0.0",
         "@amplitude/ua-parser-js": "^0.7.31",
         "tslib": "^2.4.1"
       }
@@ -126,77 +126,74 @@
       "integrity": "sha512-tGyy4dAjRIEwI7BzsB0lynWgOpfqjUdq91XXAlIWD2OwKBH7oCl/GZG/HT4BOHrTlPMOASlMQ7veyTqpmRcrNA=="
     },
     "node_modules/@amplitude/analytics-client-common": {
-      "version": "0.7.0",
-      "resolved": "https://registry.npmjs.org/@amplitude/analytics-client-common/-/analytics-client-common-0.7.0.tgz",
-      "integrity": "sha512-fKBR5DSo6qTqFcCFnLopRdWv6Zieox3YnzyXG2Zg1hR9MDeX96GoMEwwT2VB5MPzGxE1wYW6kQPvU2C/xpn5ww==",
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/@amplitude/analytics-client-common/-/analytics-client-common-1.0.0.tgz",
+      "integrity": "sha512-nHDGTjGBFTZiaPdleRhQDBBsxJj3HJJTGV4PsI0HASaCp/fV0PM/BBal0jFZD9VI/WcfeCDvHkXD5KV2+ErH1g==",
       "dependencies": {
         "@amplitude/analytics-connector": "^1.4.5",
-        "@amplitude/analytics-core": "^0.13.3",
-        "@amplitude/analytics-types": "^0.20.0",
+        "@amplitude/analytics-core": "^1.0.0",
+        "@amplitude/analytics-types": "^1.0.0",
         "tslib": "^2.4.1"
       }
     },
     "node_modules/@amplitude/analytics-client-common/node_modules/tslib": {
-      "version": "2.5.0",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.5.0.tgz",
-      "integrity": "sha512-336iVw3rtn2BUK7ORdIAHTyxHGRIHVReokCR3XjbckJMK7ms8FysBfhLR8IXnAgy7T0PTPNBWKiH514FOW/WSg=="
+      "version": "2.5.3",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.5.3.tgz",
+      "integrity": "sha512-mSxlJJwl3BMEQCUNnxXBU9jP4JBktcEGhURcPR6VQVlnP0FdDEsIaz0C35dXNGLyRfrATNofF0F5p2KPxQgB+w=="
     },
     "node_modules/@amplitude/analytics-connector": {
-      "version": "1.4.7",
-      "resolved": "https://registry.npmjs.org/@amplitude/analytics-connector/-/analytics-connector-1.4.7.tgz",
-      "integrity": "sha512-XjkFmVnJuPcRAQyPDs3LR3uam0jjDzBsT8ZABlWoV3iypRY7d+gs3ijDn2c4UU5XIjsR9GqzHCbZG3w7T+t6tQ==",
-      "dependencies": {
-        "@amplitude/ua-parser-js": "^0.7.31"
-      }
+      "version": "1.4.8",
+      "resolved": "https://registry.npmjs.org/@amplitude/analytics-connector/-/analytics-connector-1.4.8.tgz",
+      "integrity": "sha512-dFW7c7Wb6Ng7vbmzwbaXZSpqfBx37ukamJV9ErFYYS8vGZK/Hkbt3M7fZHBI4WFU6CCwakr2ZXPme11uGPYWkQ=="
     },
     "node_modules/@amplitude/analytics-core": {
-      "version": "0.13.3",
-      "resolved": "https://registry.npmjs.org/@amplitude/analytics-core/-/analytics-core-0.13.3.tgz",
-      "integrity": "sha512-lLLmUwi78iqGsCPgd15yH488K+3FPYQ19fCdA3OemoEK9959xCzMZe/KYafQKkgZmI4ZiZLOp3pjamKWc6mcdQ==",
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/@amplitude/analytics-core/-/analytics-core-1.0.0.tgz",
+      "integrity": "sha512-ZOxaySYqjcG08QaIbV/vsM6I2CBHWyYCaQLiZp+M3LYud7J9WtoZevEvwQeBPEWixg7Q32ddws2+iAnEsDOXbw==",
       "dependencies": {
-        "@amplitude/analytics-types": "^0.20.0",
+        "@amplitude/analytics-types": "^1.0.0",
         "tslib": "^2.4.1"
       }
     },
     "node_modules/@amplitude/analytics-core/node_modules/tslib": {
-      "version": "2.5.0",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.5.0.tgz",
-      "integrity": "sha512-336iVw3rtn2BUK7ORdIAHTyxHGRIHVReokCR3XjbckJMK7ms8FysBfhLR8IXnAgy7T0PTPNBWKiH514FOW/WSg=="
+      "version": "2.5.3",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.5.3.tgz",
+      "integrity": "sha512-mSxlJJwl3BMEQCUNnxXBU9jP4JBktcEGhURcPR6VQVlnP0FdDEsIaz0C35dXNGLyRfrATNofF0F5p2KPxQgB+w=="
     },
     "node_modules/@amplitude/analytics-types": {
-      "version": "0.20.0",
-      "resolved": "https://registry.npmjs.org/@amplitude/analytics-types/-/analytics-types-0.20.0.tgz",
-      "integrity": "sha512-OYoUrf7QUl5sL4mqcQJBu+0GuSar7ga5prJv0HDtPT4LGu7Adv8S3AWljGiEJuTS/YaOMzvTe2qyKZbwyiNrMw=="
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/@amplitude/analytics-types/-/analytics-types-1.0.0.tgz",
+      "integrity": "sha512-mKqa7Ui5Hfa8otLVCC9GU9eE5l7ZtnUPZcGkL6tM51nFtUnMuCpDVlBwlTYukRc12U2E0MXIba4Q2mVmg8Mj8A=="
     },
     "node_modules/@amplitude/plugin-page-view-tracking-browser": {
-      "version": "0.8.1",
-      "resolved": "https://registry.npmjs.org/@amplitude/plugin-page-view-tracking-browser/-/plugin-page-view-tracking-browser-0.8.1.tgz",
-      "integrity": "sha512-R1EyeckxikgJjH/YIoUn3nVyvB6PA8vcRMbk2T5Uzpe4SEv3IoPJ4z5tKfPUzBfKaibF7ectkzpfEHhC3hTJ3w==",
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/@amplitude/plugin-page-view-tracking-browser/-/plugin-page-view-tracking-browser-1.0.0.tgz",
+      "integrity": "sha512-oRvdM6XVwlbXiJtVS/IHE1uGuzQ5hx6iwKkVZ8R8HwAWw/H6/tEKJAH9JP32aBBYIxWVY/2lvvfstHYOhi0YcQ==",
       "dependencies": {
-        "@amplitude/analytics-client-common": "^0.7.0",
-        "@amplitude/analytics-types": "^0.20.0",
+        "@amplitude/analytics-client-common": "^1.0.0",
+        "@amplitude/analytics-types": "^1.0.0",
         "tslib": "^2.4.1"
       }
     },
     "node_modules/@amplitude/plugin-page-view-tracking-browser/node_modules/tslib": {
-      "version": "2.5.2",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.5.2.tgz",
-      "integrity": "sha512-5svOrSA2w3iGFDs1HibEVBGbDrAY82bFQ3HZ3ixB+88nsbsWQoKqDRb5UBYAUPEzbBn6dAp5gRNXglySbx1MlA=="
+      "version": "2.5.3",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.5.3.tgz",
+      "integrity": "sha512-mSxlJJwl3BMEQCUNnxXBU9jP4JBktcEGhURcPR6VQVlnP0FdDEsIaz0C35dXNGLyRfrATNofF0F5p2KPxQgB+w=="
     },
     "node_modules/@amplitude/plugin-web-attribution-browser": {
-      "version": "0.7.0",
-      "resolved": "https://registry.npmjs.org/@amplitude/plugin-web-attribution-browser/-/plugin-web-attribution-browser-0.7.0.tgz",
-      "integrity": "sha512-PKC6SHIVGXvxhxO4CZQOYidoo+aKApLRFGBbRfDEVdSxEDY1b1wTHtqTJomxodqvw4pLocSDiuwC1s7B0p4zAQ==",
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/@amplitude/plugin-web-attribution-browser/-/plugin-web-attribution-browser-1.0.0.tgz",
+      "integrity": "sha512-dj+bITBMHMIe79s2V1gwcrVeS5TOwxBZ572UN8a8uqgApWh9redRu+HeMttK7oUETSFCwGegcXALNDG9X4IPxA==",
       "dependencies": {
-        "@amplitude/analytics-client-common": "^0.7.0",
-        "@amplitude/analytics-types": "^0.20.0",
+        "@amplitude/analytics-client-common": "^1.0.0",
+        "@amplitude/analytics-types": "^1.0.0",
         "tslib": "^2.4.1"
       }
     },
     "node_modules/@amplitude/plugin-web-attribution-browser/node_modules/tslib": {
-      "version": "2.5.0",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.5.0.tgz",
-      "integrity": "sha512-336iVw3rtn2BUK7ORdIAHTyxHGRIHVReokCR3XjbckJMK7ms8FysBfhLR8IXnAgy7T0PTPNBWKiH514FOW/WSg=="
+      "version": "2.5.3",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.5.3.tgz",
+      "integrity": "sha512-mSxlJJwl3BMEQCUNnxXBU9jP4JBktcEGhURcPR6VQVlnP0FdDEsIaz0C35dXNGLyRfrATNofF0F5p2KPxQgB+w=="
     },
     "node_modules/@amplitude/ua-parser-js": {
       "version": "0.7.33",
@@ -17515,15 +17512,15 @@
   },
   "dependencies": {
     "@amplitude/analytics-browser": {
-      "version": "1.10.4",
-      "resolved": "https://registry.npmjs.org/@amplitude/analytics-browser/-/analytics-browser-1.10.4.tgz",
-      "integrity": "sha512-8Wx9dvCVyGnpzWJZESLiC7ICeYTRqh/I8eKArGTMJVe+vYwwsa4YaRA+DOclCCUnjgA7HfQKDbXw5iLEbcGzpA==",
-      "requires": {
-        "@amplitude/analytics-client-common": "^0.7.0",
-        "@amplitude/analytics-core": "^0.13.3",
-        "@amplitude/analytics-types": "^0.20.0",
-        "@amplitude/plugin-page-view-tracking-browser": "^0.8.1",
-        "@amplitude/plugin-web-attribution-browser": "^0.7.0",
+      "version": "1.10.6",
+      "resolved": "https://registry.npmjs.org/@amplitude/analytics-browser/-/analytics-browser-1.10.6.tgz",
+      "integrity": "sha512-UQ2k77bWpDN0sMoKFCXVSOLGs26X37wjUqPKPgUrq5hcAuE+qa/6CSfY0ftXFDHnKDGbX7z1Qo0Kl4TgUa0BIQ==",
+      "requires": {
+        "@amplitude/analytics-client-common": "^1.0.0",
+        "@amplitude/analytics-core": "^1.0.0",
+        "@amplitude/analytics-types": "^1.0.0",
+        "@amplitude/plugin-page-view-tracking-browser": "^1.0.0",
+        "@amplitude/plugin-web-attribution-browser": "^1.0.0",
         "@amplitude/ua-parser-js": "^0.7.31",
         "tslib": "^2.4.1"
       },
@@ -17536,83 +17533,80 @@
       }
     },
     "@amplitude/analytics-client-common": {
-      "version": "0.7.0",
-      "resolved": "https://registry.npmjs.org/@amplitude/analytics-client-common/-/analytics-client-common-0.7.0.tgz",
-      "integrity": "sha512-fKBR5DSo6qTqFcCFnLopRdWv6Zieox3YnzyXG2Zg1hR9MDeX96GoMEwwT2VB5MPzGxE1wYW6kQPvU2C/xpn5ww==",
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/@amplitude/analytics-client-common/-/analytics-client-common-1.0.0.tgz",
+      "integrity": "sha512-nHDGTjGBFTZiaPdleRhQDBBsxJj3HJJTGV4PsI0HASaCp/fV0PM/BBal0jFZD9VI/WcfeCDvHkXD5KV2+ErH1g==",
       "requires": {
         "@amplitude/analytics-connector": "^1.4.5",
-        "@amplitude/analytics-core": "^0.13.3",
-        "@amplitude/analytics-types": "^0.20.0",
+        "@amplitude/analytics-core": "^1.0.0",
+        "@amplitude/analytics-types": "^1.0.0",
         "tslib": "^2.4.1"
       },
       "dependencies": {
         "tslib": {
-          "version": "2.5.0",
-          "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.5.0.tgz",
-          "integrity": "sha512-336iVw3rtn2BUK7ORdIAHTyxHGRIHVReokCR3XjbckJMK7ms8FysBfhLR8IXnAgy7T0PTPNBWKiH514FOW/WSg=="
+          "version": "2.5.3",
+          "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.5.3.tgz",
+          "integrity": "sha512-mSxlJJwl3BMEQCUNnxXBU9jP4JBktcEGhURcPR6VQVlnP0FdDEsIaz0C35dXNGLyRfrATNofF0F5p2KPxQgB+w=="
         }
       }
     },
     "@amplitude/analytics-connector": {
-      "version": "1.4.7",
-      "resolved": "https://registry.npmjs.org/@amplitude/analytics-connector/-/analytics-connector-1.4.7.tgz",
-      "integrity": "sha512-XjkFmVnJuPcRAQyPDs3LR3uam0jjDzBsT8ZABlWoV3iypRY7d+gs3ijDn2c4UU5XIjsR9GqzHCbZG3w7T+t6tQ==",
-      "requires": {
-        "@amplitude/ua-parser-js": "^0.7.31"
-      }
+      "version": "1.4.8",
+      "resolved": "https://registry.npmjs.org/@amplitude/analytics-connector/-/analytics-connector-1.4.8.tgz",
+      "integrity": "sha512-dFW7c7Wb6Ng7vbmzwbaXZSpqfBx37ukamJV9ErFYYS8vGZK/Hkbt3M7fZHBI4WFU6CCwakr2ZXPme11uGPYWkQ=="
     },
     "@amplitude/analytics-core": {
-      "version": "0.13.3",
-      "resolved": "https://registry.npmjs.org/@amplitude/analytics-core/-/analytics-core-0.13.3.tgz",
-      "integrity": "sha512-lLLmUwi78iqGsCPgd15yH488K+3FPYQ19fCdA3OemoEK9959xCzMZe/KYafQKkgZmI4ZiZLOp3pjamKWc6mcdQ==",
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/@amplitude/analytics-core/-/analytics-core-1.0.0.tgz",
+      "integrity": "sha512-ZOxaySYqjcG08QaIbV/vsM6I2CBHWyYCaQLiZp+M3LYud7J9WtoZevEvwQeBPEWixg7Q32ddws2+iAnEsDOXbw==",
       "requires": {
-        "@amplitude/analytics-types": "^0.20.0",
+        "@amplitude/analytics-types": "^1.0.0",
         "tslib": "^2.4.1"
       },
       "dependencies": {
         "tslib": {
-          "version": "2.5.0",
-          "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.5.0.tgz",
-          "integrity": "sha512-336iVw3rtn2BUK7ORdIAHTyxHGRIHVReokCR3XjbckJMK7ms8FysBfhLR8IXnAgy7T0PTPNBWKiH514FOW/WSg=="
+          "version": "2.5.3",
+          "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.5.3.tgz",
+          "integrity": "sha512-mSxlJJwl3BMEQCUNnxXBU9jP4JBktcEGhURcPR6VQVlnP0FdDEsIaz0C35dXNGLyRfrATNofF0F5p2KPxQgB+w=="
         }
       }
     },
     "@amplitude/analytics-types": {
-      "version": "0.20.0",
-      "resolved": "https://registry.npmjs.org/@amplitude/analytics-types/-/analytics-types-0.20.0.tgz",
-      "integrity": "sha512-OYoUrf7QUl5sL4mqcQJBu+0GuSar7ga5prJv0HDtPT4LGu7Adv8S3AWljGiEJuTS/YaOMzvTe2qyKZbwyiNrMw=="
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/@amplitude/analytics-types/-/analytics-types-1.0.0.tgz",
+      "integrity": "sha512-mKqa7Ui5Hfa8otLVCC9GU9eE5l7ZtnUPZcGkL6tM51nFtUnMuCpDVlBwlTYukRc12U2E0MXIba4Q2mVmg8Mj8A=="
     },
     "@amplitude/plugin-page-view-tracking-browser": {
-      "version": "0.8.1",
-      "resolved": "https://registry.npmjs.org/@amplitude/plugin-page-view-tracking-browser/-/plugin-page-view-tracking-browser-0.8.1.tgz",
-      "integrity": "sha512-R1EyeckxikgJjH/YIoUn3nVyvB6PA8vcRMbk2T5Uzpe4SEv3IoPJ4z5tKfPUzBfKaibF7ectkzpfEHhC3hTJ3w==",
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/@amplitude/plugin-page-view-tracking-browser/-/plugin-page-view-tracking-browser-1.0.0.tgz",
+      "integrity": "sha512-oRvdM6XVwlbXiJtVS/IHE1uGuzQ5hx6iwKkVZ8R8HwAWw/H6/tEKJAH9JP32aBBYIxWVY/2lvvfstHYOhi0YcQ==",
       "requires": {
-        "@amplitude/analytics-client-common": "^0.7.0",
-        "@amplitude/analytics-types": "^0.20.0",
+        "@amplitude/analytics-client-common": "^1.0.0",
+        "@amplitude/analytics-types": "^1.0.0",
         "tslib": "^2.4.1"
       },
       "dependencies": {
         "tslib": {
-          "version": "2.5.2",
-          "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.5.2.tgz",
-          "integrity": "sha512-5svOrSA2w3iGFDs1HibEVBGbDrAY82bFQ3HZ3ixB+88nsbsWQoKqDRb5UBYAUPEzbBn6dAp5gRNXglySbx1MlA=="
+          "version": "2.5.3",
+          "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.5.3.tgz",
+          "integrity": "sha512-mSxlJJwl3BMEQCUNnxXBU9jP4JBktcEGhURcPR6VQVlnP0FdDEsIaz0C35dXNGLyRfrATNofF0F5p2KPxQgB+w=="
         }
       }
     },
     "@amplitude/plugin-web-attribution-browser": {
-      "version": "0.7.0",
-      "resolved": "https://registry.npmjs.org/@amplitude/plugin-web-attribution-browser/-/plugin-web-attribution-browser-0.7.0.tgz",
-      "integrity": "sha512-PKC6SHIVGXvxhxO4CZQOYidoo+aKApLRFGBbRfDEVdSxEDY1b1wTHtqTJomxodqvw4pLocSDiuwC1s7B0p4zAQ==",
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/@amplitude/plugin-web-attribution-browser/-/plugin-web-attribution-browser-1.0.0.tgz",
+      "integrity": "sha512-dj+bITBMHMIe79s2V1gwcrVeS5TOwxBZ572UN8a8uqgApWh9redRu+HeMttK7oUETSFCwGegcXALNDG9X4IPxA==",
       "requires": {
-        "@amplitude/analytics-client-common": "^0.7.0",
-        "@amplitude/analytics-types": "^0.20.0",
+        "@amplitude/analytics-client-common": "^1.0.0",
+        "@amplitude/analytics-types": "^1.0.0",
         "tslib": "^2.4.1"
       },
       "dependencies": {
         "tslib": {
-          "version": "2.5.0",
-          "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.5.0.tgz",
-          "integrity": "sha512-336iVw3rtn2BUK7ORdIAHTyxHGRIHVReokCR3XjbckJMK7ms8FysBfhLR8IXnAgy7T0PTPNBWKiH514FOW/WSg=="
+          "version": "2.5.3",
+          "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.5.3.tgz",
+          "integrity": "sha512-mSxlJJwl3BMEQCUNnxXBU9jP4JBktcEGhURcPR6VQVlnP0FdDEsIaz0C35dXNGLyRfrATNofF0F5p2KPxQgB+w=="
         }
       }
     },
diff --git a/apps/block_scout_web/assets/package.json b/apps/block_scout_web/assets/package.json
index 87abcb63f59f..af6ae7d2bff8 100644
--- a/apps/block_scout_web/assets/package.json
+++ b/apps/block_scout_web/assets/package.json
@@ -20,7 +20,7 @@
   },
   "dependencies": {
     "@fortawesome/fontawesome-free": "^6.4.0",
-    "@amplitude/analytics-browser": "^1.10.4",
+    "@amplitude/analytics-browser": "^1.10.6",
     "@tarekraafat/autocomplete.js": "^10.2.7",
     "@walletconnect/web3-provider": "^1.8.0",
     "assert": "^2.0.0",

From 03fa6d81ae1d8645bf7448e962605d85c7ec4ce9 Mon Sep 17 00:00:00 2001
From: Maxim Filonov <53992153+sl1depengwyn@users.noreply.github.com>
Date: Wed, 7 Jun 2023 11:59:50 +0300
Subject: [PATCH 076/909] Optimize exchange rates requests rate

---
 .dialyzer-ignore                              |   4 +-
 CHANGELOG.md                                  |   1 +
 apps/explorer/lib/explorer/chain/token.ex     |  21 +--
 .../lib/explorer/exchange_rates/source.ex     |  18 +-
 .../exchange_rates/source/coin_gecko.ex       |  22 +++
 .../exchange_rates/token_exchange_rates.ex    |  62 +++++--
 .../token_exchange_rates_test.exs             | 172 ++++++++++++++----
 7 files changed, 229 insertions(+), 71 deletions(-)

diff --git a/.dialyzer-ignore b/.dialyzer-ignore
index 326c4a9a0835..2292e39d131a 100644
--- a/.dialyzer-ignore
+++ b/.dialyzer-ignore
@@ -13,5 +13,5 @@ lib/block_scout_web/schema/types.ex:31
 lib/phoenix/router.ex:324
 lib/phoenix/router.ex:402
 lib/explorer/smart_contract/reader.ex:435
-lib/explorer/exchange_rates/source.ex:123
-lib/explorer/exchange_rates/source.ex:126
+lib/explorer/exchange_rates/source.ex:139
+lib/explorer/exchange_rates/source.ex:142
diff --git a/CHANGELOG.md b/CHANGELOG.md
index a4f0f4ee758b..5b019555f496 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,6 +13,7 @@
 
 ### Fixes
 
+- [#7654](https://github.com/blockscout/blockscout/pull/7654) - Optimize exchange rates requests rate
 - [#7636](https://github.com/blockscout/blockscout/pull/7636) - Remove receive from read methods
 - [#7635](https://github.com/blockscout/blockscout/pull/7635) - Fix single 1155 transfer displaying
 - [#7629](https://github.com/blockscout/blockscout/pull/7629) - Fix NFT fetcher
diff --git a/apps/explorer/lib/explorer/chain/token.ex b/apps/explorer/lib/explorer/chain/token.ex
index a2c891a9d85d..4701f109c249 100644
--- a/apps/explorer/lib/explorer/chain/token.ex
+++ b/apps/explorer/lib/explorer/chain/token.ex
@@ -153,24 +153,7 @@ defmodule Explorer.Chain.Token do
     )
   end
 
-  @doc """
-  Builds an `Ecto.Query` to fetch a `batch_size` number of the tokens,
-  possibly starting from `last_updated_address_hash` ordered by `contract_address_hash`.
-  """
-  def tokens_to_update_fiat_value(nil, batch_size) do
-    from(
-      token in __MODULE__,
-      order_by: token.contract_address_hash,
-      limit: ^batch_size
-    )
-  end
-
-  def tokens_to_update_fiat_value(last_updated_address_hash, batch_size) do
-    from(
-      token in __MODULE__,
-      order_by: token.contract_address_hash,
-      where: token.contract_address_hash > ^last_updated_address_hash,
-      limit: ^batch_size
-    )
+  def tokens_by_contract_address_hashes(contract_address_hashes) do
+    from(token in __MODULE__, where: token.contract_address_hash in ^contract_address_hashes)
   end
 end
diff --git a/apps/explorer/lib/explorer/exchange_rates/source.ex b/apps/explorer/lib/explorer/exchange_rates/source.ex
index 34d68c5154c4..befa6560d068 100644
--- a/apps/explorer/lib/explorer/exchange_rates/source.ex
+++ b/apps/explorer/lib/explorer/exchange_rates/source.ex
@@ -40,6 +40,22 @@ defmodule Explorer.ExchangeRates.Source do
     fetch_exchange_rates_request(CoinGecko, source_url, headers)
   end
 
+  @spec fetch_token_hashes_with_market_data :: {:ok, [String.t()]} | {:error, any}
+  def fetch_token_hashes_with_market_data do
+    source_url = CoinGecko.source_url(:coins_list)
+    headers = CoinGecko.headers()
+
+    case http_request(source_url, headers) do
+      {:ok, result} ->
+        {:ok,
+         result
+         |> CoinGecko.format_data()}
+
+      resp ->
+        resp
+    end
+  end
+
   defp fetch_exchange_rates_request(_source, source_url, _headers) when is_nil(source_url),
     do: {:error, "Source URL is nil"}
 
@@ -60,7 +76,7 @@ defmodule Explorer.ExchangeRates.Source do
   @doc """
   Callback for api's to format the data returned by their query.
   """
-  @callback format_data(map()) :: [any]
+  @callback format_data(map() | list()) :: [any]
 
   @doc """
   Url for the api to query to get the market info.
diff --git a/apps/explorer/lib/explorer/exchange_rates/source/coin_gecko.ex b/apps/explorer/lib/explorer/exchange_rates/source/coin_gecko.ex
index 2157e3328e44..4c726ccc5106 100644
--- a/apps/explorer/lib/explorer/exchange_rates/source/coin_gecko.ex
+++ b/apps/explorer/lib/explorer/exchange_rates/source/coin_gecko.ex
@@ -68,6 +68,23 @@ defmodule Explorer.ExchangeRates.Source.CoinGecko do
     end)
   end
 
+  @impl Source
+  def format_data(supported_coins) when is_list(supported_coins) do
+    platform = platform()
+
+    supported_coins
+    |> Enum.reduce([], fn
+      %{"platforms" => %{^platform => token_contract_hash_str}}, acc ->
+        case Chain.Hash.Address.cast(token_contract_hash_str) do
+          {:ok, token_contract_hash} -> [token_contract_hash | acc]
+          _ -> acc
+        end
+
+      _, acc ->
+        acc
+    end)
+  end
+
   @impl Source
   def format_data(_), do: []
 
@@ -91,6 +108,11 @@ defmodule Explorer.ExchangeRates.Source.CoinGecko do
     if id, do: "#{base_url()}/coins/#{id}", else: nil
   end
 
+  @impl Source
+  def source_url(:coins_list) do
+    "#{base_url()}/coins/list?include_platform=true"
+  end
+
   @impl Source
   def source_url(token_addresses) when is_list(token_addresses) do
     joined_addresses = token_addresses |> Enum.map_join(",", &to_string/1)
diff --git a/apps/explorer/lib/explorer/exchange_rates/token_exchange_rates.ex b/apps/explorer/lib/explorer/exchange_rates/token_exchange_rates.ex
index b1233d316ad0..2d3b9cc86db2 100644
--- a/apps/explorer/lib/explorer/exchange_rates/token_exchange_rates.ex
+++ b/apps/explorer/lib/explorer/exchange_rates/token_exchange_rates.ex
@@ -8,7 +8,6 @@ defmodule Explorer.ExchangeRates.TokenExchangeRates do
 
   alias Explorer.ExchangeRates.Source
   alias Explorer.{Chain.Token, Repo}
-
   @batch_size 150
   @interval :timer.seconds(5)
   @refetch_interval :timer.hours(1)
@@ -16,7 +15,7 @@ defmodule Explorer.ExchangeRates.TokenExchangeRates do
   defstruct max_batch_size: @batch_size,
             interval: @interval,
             refetch_interval: @refetch_interval,
-            last_fetched_token_contract_address: nil
+            tokens_to_fetch: nil
 
   @spec start_link(term()) :: GenServer.on_start()
   def start_link(_) do
@@ -44,34 +43,61 @@ defmodule Explorer.ExchangeRates.TokenExchangeRates do
   def handle_info(
         :fetch,
         %__MODULE__{
-          max_batch_size: batch_size,
           interval: interval,
           refetch_interval: refetch_interval,
-          last_fetched_token_contract_address: last_fetched
+          tokens_to_fetch: nil
         } = state
       ) do
-    tokens_to_update = last_fetched |> Token.tokens_to_update_fiat_value(batch_size) |> Repo.all()
+    case Source.fetch_token_hashes_with_market_data() do
+      {:ok, contract_address_hashes} ->
+        tokens = contract_address_hashes |> Token.tokens_by_contract_address_hashes() |> Repo.all()
+        Process.send_after(self(), :fetch, interval)
+        {:noreply, %{state | tokens_to_fetch: tokens}}
 
-    case tokens_to_update |> Enum.map(& &1.contract_address_hash) |> Source.fetch_market_data_for_token_addresses() do
-      {:ok, fiat_values} ->
-        tokens_to_update
-        |> Enum.each(&update_tokens(&1, fiat_values))
+      {:error, err} ->
+        Logger.error("Error while fetching tokens with market data (/coins/list): #{inspect(err)}")
+        Process.send_after(self(), :fetch, refetch_interval)
+        {:noreply, state}
+    end
+  end
+
+  @impl GenServer
+  def handle_info(
+        :fetch,
+        %__MODULE__{
+          refetch_interval: refetch_interval,
+          tokens_to_fetch: []
+        } = state
+      ) do
+    Process.send_after(self(), :fetch, refetch_interval)
+    {:noreply, %{state | tokens_to_fetch: nil}}
+  end
+
+  @impl GenServer
+  def handle_info(
+        :fetch,
+        %__MODULE__{
+          max_batch_size: batch_size,
+          interval: interval,
+          tokens_to_fetch: tokens_to_fetch
+        } = state
+      ) do
+    {fetch_now, fetch_later} = Enum.split(tokens_to_fetch, batch_size)
+
+    case fetch_now |> Enum.map(& &1.contract_address_hash) |> Source.fetch_market_data_for_token_addresses() do
+      {:ok, token_to_market_data} ->
+        fetch_now |> Enum.each(&update_token(&1, token_to_market_data))
 
       err ->
         Logger.error("Error while fetching fiat values for tokens: #{inspect(err)}")
     end
 
-    if length(tokens_to_update) < batch_size do
-      Process.send_after(self(), :fetch, refetch_interval)
-      {:noreply, %{state | last_fetched_token_contract_address: nil}}
-    else
-      Process.send_after(self(), :fetch, interval)
-      {:noreply, %{state | last_fetched_token_contract_address: List.last(tokens_to_update).contract_address_hash}}
-    end
+    Process.send_after(self(), :fetch, interval)
+    {:noreply, %{state | tokens_to_fetch: fetch_later}}
   end
 
-  defp update_tokens(%{contract_address_hash: contract_address_hash} = token, fiat_values) do
-    case Map.get(fiat_values, contract_address_hash) do
+  defp update_token(%{contract_address_hash: contract_address_hash} = token, token_to_market_data) do
+    case Map.get(token_to_market_data, contract_address_hash) do
       %{} = market_data ->
         token
         |> Token.changeset(market_data)
diff --git a/apps/explorer/test/explorer/exchange_rates/token_exchange_rates_test.exs b/apps/explorer/test/explorer/exchange_rates/token_exchange_rates_test.exs
index cda4f83eaecb..83dde6424a73 100644
--- a/apps/explorer/test/explorer/exchange_rates/token_exchange_rates_test.exs
+++ b/apps/explorer/test/explorer/exchange_rates/token_exchange_rates_test.exs
@@ -35,11 +35,32 @@ defmodule Explorer.TokenExchangeRatesTest do
         base_url: "http://localhost:#{bypass.port}"
       )
 
-      tokens =
+      [_token_with_no_exchange_rate | tokens] =
         for _ <- 0..4 do
           insert(:token)
         end
 
+      coins_list =
+        tokens
+        |> Enum.map(fn %{contract_address_hash: contract_address_hash} ->
+          contract_address_hash_str = to_string(contract_address_hash)
+
+          %{
+            "id" => "#{contract_address_hash_str}_id",
+            "symbol" => "#{contract_address_hash_str}_symbol",
+            "name" => "#{contract_address_hash_str}_name",
+            "platforms" => %{
+              "some_other_chain" => "we do not want this to appear in the /simple/token_price/ request",
+              "ethereum" => contract_address_hash_str
+            }
+          }
+        end)
+
+      Bypass.expect_once(bypass, "GET", "/coins/list", fn conn ->
+        assert conn.query_string == "include_platform=true"
+        Conn.resp(conn, 200, Jason.encode!(coins_list))
+      end)
+
       token_exchange_rates =
         tokens
         |> Enum.reduce(%{}, fn %{contract_address_hash: contract_address_hash}, acc ->
@@ -52,19 +73,18 @@ defmodule Explorer.TokenExchangeRatesTest do
         tokens
         |> Enum.map_join(",", fn %{contract_address_hash: contract_address_hash} -> to_string(contract_address_hash) end)
 
-      Bypass.expect_once(bypass, fn conn ->
-        assert conn.method == "GET"
-
-        assert "#{conn.request_path}?#{conn.query_string}" ==
-                 "/simple/token_price/ethereum?vs_currencies=usd&include_market_cap=true&contract_addresses=#{joined_addresses}"
-
-        Conn.resp(conn, 200, Jason.encode!(token_exchange_rates))
-      end)
+      Bypass.expect_once(
+        bypass,
+        "GET",
+        "/simple/token_price/ethereum",
+        fn conn ->
+          assert conn.query_string == "vs_currencies=usd&include_market_cap=true&contract_addresses=#{joined_addresses}"
+          Conn.resp(conn, 200, Jason.encode!(token_exchange_rates))
+        end
+      )
 
       GenServer.start_link(TokenExchangeRates, [])
 
-      set_mox_global()
-
       :timer.sleep(100)
 
       Repo.all(Token)
@@ -73,6 +93,31 @@ defmodule Explorer.TokenExchangeRatesTest do
       end)
     end
 
+    test "empty body in /coins/list response" do
+      bypass = Bypass.open()
+
+      Application.put_env(:explorer, Explorer.ExchangeRates.Source.CoinGecko,
+        base_url: "http://localhost:#{bypass.port}"
+      )
+
+      [_token_with_no_exchange_rate | tokens] =
+        for _ <- 0..4 do
+          insert(:token)
+        end
+
+      Bypass.expect_once(bypass, "GET", "/coins/list", fn conn ->
+        assert conn.query_string == "include_platform=true"
+        Conn.resp(conn, 200, "[]")
+      end)
+
+      GenServer.start_link(TokenExchangeRates, [])
+
+      :timer.sleep(100)
+
+      Repo.all(Token)
+      |> Enum.each(fn %{fiat_value: fiat_value} -> assert is_nil(fiat_value) end)
+    end
+
     test "empty body in fetch response" do
       bypass = Bypass.open()
 
@@ -80,63 +125,128 @@ defmodule Explorer.TokenExchangeRatesTest do
         base_url: "http://localhost:#{bypass.port}"
       )
 
-      tokens =
+      [_token_with_no_exchange_rate | tokens] =
         for _ <- 0..4 do
           insert(:token)
         end
 
+      coins_list =
+        tokens
+        |> Enum.map(fn %{contract_address_hash: contract_address_hash} ->
+          contract_address_hash_str = to_string(contract_address_hash)
+
+          %{
+            "id" => "#{contract_address_hash_str}_id",
+            "symbol" => "#{contract_address_hash_str}_symbol",
+            "name" => "#{contract_address_hash_str}_name",
+            "platforms" => %{
+              "some_other_chain" => "we do not want this to appear in the /simple/token_price/ request",
+              "ethereum" => contract_address_hash_str
+            }
+          }
+        end)
+
+      Bypass.expect_once(bypass, "GET", "/coins/list", fn conn ->
+        assert conn.query_string == "include_platform=true"
+        Conn.resp(conn, 200, Jason.encode!(coins_list))
+      end)
+
       joined_addresses =
         tokens
         |> Enum.map_join(",", fn %{contract_address_hash: contract_address_hash} -> to_string(contract_address_hash) end)
 
-      Bypass.expect_once(bypass, fn conn ->
-        assert conn.method == "GET"
+      Bypass.expect_once(
+        bypass,
+        "GET",
+        "/simple/token_price/ethereum",
+        fn conn ->
+          assert conn.query_string == "vs_currencies=usd&include_market_cap=true&contract_addresses=#{joined_addresses}"
+          Conn.resp(conn, 200, "{}")
+        end
+      )
 
-        assert "#{conn.request_path}?#{conn.query_string}" ==
-                 "/simple/token_price/ethereum?vs_currencies=usd&include_market_cap=true&contract_addresses=#{joined_addresses}"
+      GenServer.start_link(TokenExchangeRates, [])
+
+      :timer.sleep(100)
+
+      Repo.all(Token)
+      |> Enum.each(fn %{fiat_value: fiat_value} -> assert is_nil(fiat_value) end)
+    end
+
+    test "error in /coins/list response" do
+      bypass = Bypass.open()
+
+      Application.put_env(:explorer, Explorer.ExchangeRates.Source.CoinGecko,
+        base_url: "http://localhost:#{bypass.port}"
+      )
 
-        Conn.resp(conn, 200, "{}")
+      [_token_with_no_exchange_rate | tokens] =
+        for _ <- 0..4 do
+          insert(:token)
+        end
+
+      Bypass.expect_once(bypass, "GET", "/coins/list", fn conn ->
+        assert conn.query_string == "include_platform=true"
+        Conn.resp(conn, 429, "Too many requests")
       end)
 
       GenServer.start_link(TokenExchangeRates, [])
 
-      set_mox_global()
-
       :timer.sleep(100)
 
       Repo.all(Token)
       |> Enum.each(fn %{fiat_value: fiat_value} -> assert is_nil(fiat_value) end)
     end
 
-    test "error in retch response" do
+    test "error in fetch response" do
       bypass = Bypass.open()
 
       Application.put_env(:explorer, Explorer.ExchangeRates.Source.CoinGecko,
         base_url: "http://localhost:#{bypass.port}"
       )
 
-      tokens =
+      [_token_with_no_exchange_rate | tokens] =
         for _ <- 0..4 do
           insert(:token)
         end
 
-      joined_addresses =
+      coins_list =
         tokens
-        |> Enum.map_join(",", fn %{contract_address_hash: contract_address_hash} -> to_string(contract_address_hash) end)
+        |> Enum.map(fn %{contract_address_hash: contract_address_hash} ->
+          contract_address_hash_str = to_string(contract_address_hash)
+
+          %{
+            "id" => "#{contract_address_hash_str}_id",
+            "symbol" => "#{contract_address_hash_str}_symbol",
+            "name" => "#{contract_address_hash_str}_name",
+            "platforms" => %{
+              "some_other_chain" => "we do not want this to appear in the /simple/token_price/ request",
+              "ethereum" => contract_address_hash_str
+            }
+          }
+        end)
 
-      Bypass.expect_once(bypass, fn conn ->
-        assert conn.method == "GET"
+      Bypass.expect_once(bypass, "GET", "/coins/list", fn conn ->
+        assert conn.query_string == "include_platform=true"
+        Conn.resp(conn, 200, Jason.encode!(coins_list))
+      end)
 
-        assert "#{conn.request_path}?#{conn.query_string}" ==
-                 "/simple/token_price/ethereum?vs_currencies=usd&include_market_cap=true&contract_addresses=#{joined_addresses}"
+      joined_addresses =
+        tokens
+        |> Enum.map_join(",", fn %{contract_address_hash: contract_address_hash} -> to_string(contract_address_hash) end)
 
-        Conn.resp(conn, 429, "Too Many Requests")
-      end)
+      Bypass.expect_once(
+        bypass,
+        "GET",
+        "/simple/token_price/ethereum",
+        fn conn ->
+          assert conn.query_string == "vs_currencies=usd&include_market_cap=true&contract_addresses=#{joined_addresses}"
+          Conn.resp(conn, 429, "Too many requests")
+        end
+      )
 
       GenServer.start_link(TokenExchangeRates, [])
 
-      set_mox_global()
-
       :timer.sleep(100)
 
       Repo.all(Token)

From 7453a47c80aeed22d8bc1c7f544b303b6e95cbf0 Mon Sep 17 00:00:00 2001
From: Mayank Mittal <msquare.pvt21@gmail.com>
Date: Wed, 7 Jun 2023 13:50:14 +0530
Subject: [PATCH 077/909] [FEAT] Add support for DEPOSIT and WITHDRAW token
 transfer event in older contracts

---
 CHANGELOG.md                                  |  1 +
 .../lib/explorer/chain/token_transfer.ex      |  6 ++
 .../lib/indexer/transform/token_transfers.ex  | 50 ++++++++++++++++-
 .../transform/token_transfers_test.exs        | 56 ++++++++++++++++++-
 4 files changed, 110 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0c4edb695f10..ff84e07795e4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,7 @@
 
 ### Features
 
+- [#7653](https://github.com/blockscout/blockscout/pull/7653) - Add support for DEPOSIT and WITHDRAW token transfer event in older contracts
 - [#7628](https://github.com/blockscout/blockscout/pull/7628) - Support partially verified property from verifier MS; Add property to track contracts automatically verified via eth-bytecode-db
 - [#7603](https://github.com/blockscout/blockscout/pull/7603) - Add Polygon Edge and optimism genesis files support
 - [#7513](https://github.com/blockscout/blockscout/pull/7513) - Add Polygon Edge support
diff --git a/apps/explorer/lib/explorer/chain/token_transfer.ex b/apps/explorer/lib/explorer/chain/token_transfer.ex
index b70f5623a921..d1abd9971e74 100644
--- a/apps/explorer/lib/explorer/chain/token_transfer.ex
+++ b/apps/explorer/lib/explorer/chain/token_transfer.ex
@@ -74,6 +74,8 @@ defmodule Explorer.Chain.TokenTransfer do
   @typep api? :: {:api?, true | false}
 
   @constant "0xddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef"
+  @weth_deposit_signature "0xe1fffcc4923d04b559f4d29a8bfc6cda04eb5b0d3c460751c2402c5c5cc9109c"
+  @weth_withdrawal_signature "0x7fcf532c15f0a6db0bd6d0e038bea71d30d808c7d98cb3bf7268a95bf5081b65"
   @erc1155_single_transfer_signature "0xc3d58168c5ae7397731d063d5bbf3d657854427343f4c083240f7aacaa2d0f62"
   @erc1155_batch_transfer_signature "0x4a39dc06d4c0dbc64b70af90fd698a233a518aa5d07e595d983b8c0526c8f7fb"
 
@@ -146,6 +148,10 @@ defmodule Explorer.Chain.TokenTransfer do
   """
   def constant, do: @constant
 
+  def weth_deposit_signature, do: @weth_deposit_signature
+
+  def weth_withdrawal_signature, do: @weth_withdrawal_signature
+
   def erc1155_single_transfer_signature, do: @erc1155_single_transfer_signature
 
   def erc1155_batch_transfer_signature, do: @erc1155_batch_transfer_signature
diff --git a/apps/indexer/lib/indexer/transform/token_transfers.ex b/apps/indexer/lib/indexer/transform/token_transfers.ex
index 27e4291b0648..6ea41b65000a 100644
--- a/apps/indexer/lib/indexer/transform/token_transfers.ex
+++ b/apps/indexer/lib/indexer/transform/token_transfers.ex
@@ -23,6 +23,14 @@ defmodule Indexer.Transform.TokenTransfers do
       |> Enum.filter(&(&1.first_topic == unquote(TokenTransfer.constant())))
       |> Enum.reduce(initial_acc, &do_parse/2)
 
+    weth_transfers =
+      logs
+      |> Enum.filter(fn log ->
+        log.first_topic == TokenTransfer.weth_deposit_signature() ||
+          log.first_topic == TokenTransfer.weth_withdrawal_signature()
+      end)
+      |> Enum.reduce(initial_acc, &do_parse/2)
+
     erc1155_token_transfers =
       logs
       |> Enum.filter(fn log ->
@@ -31,8 +39,13 @@ defmodule Indexer.Transform.TokenTransfers do
       end)
       |> Enum.reduce(initial_acc, &do_parse(&1, &2, :erc1155))
 
-    rough_tokens = erc1155_token_transfers.tokens ++ erc20_and_erc721_token_transfers.tokens
-    rough_token_transfers = erc1155_token_transfers.token_transfers ++ erc20_and_erc721_token_transfers.token_transfers
+    rough_tokens =
+      erc1155_token_transfers.tokens ++
+        erc20_and_erc721_token_transfers.tokens ++ weth_transfers.tokens
+
+    rough_token_transfers =
+      erc1155_token_transfers.token_transfers ++
+        erc20_and_erc721_token_transfers.token_transfers ++ weth_transfers.token_transfers
 
     {tokens, token_transfers} = sanitize_token_types(rough_tokens, rough_token_transfers)
 
@@ -157,6 +170,39 @@ defmodule Indexer.Transform.TokenTransfers do
     {token, token_transfer}
   end
 
+  # ERC-20 token transfer for WETH
+  defp parse_params(%{second_topic: second_topic, third_topic: nil, fourth_topic: nil} = log)
+       when not is_nil(second_topic) do
+    [amount] = decode_data(log.data, [{:uint, 256}])
+
+    {from_address_hash, to_address_hash} =
+      if log.first_topic == TokenTransfer.weth_deposit_signature() do
+        {@burn_address, truncate_address_hash(log.second_topic)}
+      else
+        {truncate_address_hash(log.second_topic), @burn_address}
+      end
+
+    token_transfer = %{
+      amount: Decimal.new(amount || 0),
+      block_number: log.block_number,
+      block_hash: log.block_hash,
+      log_index: log.index,
+      from_address_hash: from_address_hash,
+      to_address_hash: to_address_hash,
+      token_contract_address_hash: log.address_hash,
+      transaction_hash: log.transaction_hash,
+      token_ids: nil,
+      token_type: "ERC-20"
+    }
+
+    token = %{
+      contract_address_hash: log.address_hash,
+      type: "ERC-20"
+    }
+
+    {token, token_transfer}
+  end
+
   # ERC-721 token transfer with topics as addresses
   defp parse_params(%{second_topic: second_topic, third_topic: third_topic, fourth_topic: fourth_topic} = log)
        when not is_nil(second_topic) and not is_nil(third_topic) and not is_nil(fourth_topic) do
diff --git a/apps/indexer/test/indexer/transform/token_transfers_test.exs b/apps/indexer/test/indexer/transform/token_transfers_test.exs
index 731c27752063..f416733ea13b 100644
--- a/apps/indexer/test/indexer/transform/token_transfers_test.exs
+++ b/apps/indexer/test/indexer/transform/token_transfers_test.exs
@@ -7,7 +7,7 @@ defmodule Indexer.Transform.TokenTransfersTest do
 
   describe "parse/1" do
     test "parse/1 parses logs for tokens and token transfers" do
-      [log_1, _log_2, log_3] =
+      [log_1, _log_2, log_3, weth_deposit_log, weth_withdrawal_log] =
         logs = [
           %{
             address_hash: "0xf2eec76e45b328df99a34fa696320a262cb92154",
@@ -47,6 +47,32 @@ defmodule Indexer.Transform.TokenTransfersTest do
             third_topic: "0x000000000000000000000000dccb72afee70e60b0c1226288fe86c01b953e8ac",
             transaction_hash: "0x4011d9a930a3da620321589a54dc0ca3b88216b4886c7a7c3aaad1fb17702d35",
             type: "mined"
+          },
+          %{
+            address_hash: "0x0BE9e53fd7EDaC9F859882AfdDa116645287C629",
+            block_number: 23_704_638,
+            block_hash: "0x8f61c99b0dd1196714ffda5bf979a282e6a62fdd3cff25c291284e6b57de2106",
+            data: "0x00000000000000000000000000000000000000000000002be19edfcf6b480000",
+            first_topic: "0xe1fffcc4923d04b559f4d29a8bfc6cda04eb5b0d3c460751c2402c5c5cc9109c",
+            second_topic: "0x000000000000000000000000fb76e9e7d88e308ab530330ed90e84a952570319",
+            third_topic: nil,
+            fourth_topic: nil,
+            index: 1,
+            transaction_hash: "0x185889bc91372106ecf114a4e23f4ee615e131ae3e698078bd5d2ed7e3f55a49",
+            type: "mined"
+          },
+          %{
+            address_hash: "0x0BE9e53fd7EDaC9F859882AfdDa116645287C629",
+            block_number: 23_704_608,
+            block_hash: "0x5a5e69984f78d65fc6d92e18058d21a9b114f1d56d06ca7aa017b3d87bf0491a",
+            data: "0x00000000000000000000000000000000000000000000000000e1315e1ebd28e8",
+            first_topic: "0x7fcf532c15f0a6db0bd6d0e038bea71d30d808c7d98cb3bf7268a95bf5081b65",
+            second_topic: "0x000000000000000000000000e3f85aad0c8dd7337427b9df5d0fb741d65eeeb5",
+            third_topic: nil,
+            fourth_topic: nil,
+            index: 1,
+            transaction_hash: "0x07510dbfddbac9064f7d607c2d9a14aa26fa19cdfcd578c0b585ff2395df543f",
+            type: "mined"
           }
         ]
 
@@ -59,6 +85,10 @@ defmodule Indexer.Transform.TokenTransfersTest do
           %{
             contract_address_hash: log_1.address_hash,
             type: "ERC-20"
+          },
+          %{
+            contract_address_hash: weth_withdrawal_log.address_hash,
+            type: "ERC-20"
           }
         ],
         token_transfers: [
@@ -84,6 +114,30 @@ defmodule Indexer.Transform.TokenTransfersTest do
             transaction_hash: log_1.transaction_hash,
             token_type: "ERC-20",
             block_hash: log_1.block_hash
+          },
+          %{
+            amount: Decimal.new("63386150072297704"),
+            block_hash: weth_withdrawal_log.block_hash,
+            block_number: weth_withdrawal_log.block_number,
+            from_address_hash: truncated_hash(weth_withdrawal_log.second_topic),
+            log_index: 1,
+            to_address_hash: "0x0000000000000000000000000000000000000000",
+            token_contract_address_hash: weth_withdrawal_log.address_hash,
+            token_ids: nil,
+            token_type: "ERC-20",
+            transaction_hash: weth_withdrawal_log.transaction_hash
+          },
+          %{
+            amount: Decimal.new("809467672956315893760"),
+            block_hash: weth_deposit_log.block_hash,
+            block_number: weth_deposit_log.block_number,
+            from_address_hash: "0x0000000000000000000000000000000000000000",
+            log_index: 1,
+            to_address_hash: truncated_hash(weth_deposit_log.second_topic),
+            token_contract_address_hash: weth_deposit_log.address_hash,
+            token_ids: nil,
+            token_type: "ERC-20",
+            transaction_hash: weth_deposit_log.transaction_hash
           }
         ]
       }

From 739d1c53ac9d5f9d21b01d3ba5b6efedd422a8f2 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 7 Jun 2023 19:02:32 +0000
Subject: [PATCH 078/909] Bump @amplitude/analytics-browser in
 /apps/block_scout_web/assets

Bumps [@amplitude/analytics-browser](https://github.com/amplitude/Amplitude-TypeScript) from 1.10.6 to 1.10.7.
- [Release notes](https://github.com/amplitude/Amplitude-TypeScript/releases)
- [Commits](https://github.com/amplitude/Amplitude-TypeScript/compare/@amplitude/analytics-browser@1.10.6...@amplitude/analytics-browser@1.10.7)

---
updated-dependencies:
- dependency-name: "@amplitude/analytics-browser"
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 apps/block_scout_web/assets/package-lock.json | 46 +++++++++----------
 apps/block_scout_web/assets/package.json      |  2 +-
 2 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/apps/block_scout_web/assets/package-lock.json b/apps/block_scout_web/assets/package-lock.json
index 0c2763f8682d..5877a4c4cec7 100644
--- a/apps/block_scout_web/assets/package-lock.json
+++ b/apps/block_scout_web/assets/package-lock.json
@@ -7,7 +7,7 @@
       "name": "blockscout",
       "license": "GPL-3.0",
       "dependencies": {
-        "@amplitude/analytics-browser": "^1.10.6",
+        "@amplitude/analytics-browser": "^1.10.7",
         "@fortawesome/fontawesome-free": "^6.4.0",
         "@tarekraafat/autocomplete.js": "^10.2.7",
         "@walletconnect/web3-provider": "^1.8.0",
@@ -107,15 +107,15 @@
       "version": "0.0.1"
     },
     "node_modules/@amplitude/analytics-browser": {
-      "version": "1.10.6",
-      "resolved": "https://registry.npmjs.org/@amplitude/analytics-browser/-/analytics-browser-1.10.6.tgz",
-      "integrity": "sha512-UQ2k77bWpDN0sMoKFCXVSOLGs26X37wjUqPKPgUrq5hcAuE+qa/6CSfY0ftXFDHnKDGbX7z1Qo0Kl4TgUa0BIQ==",
+      "version": "1.10.7",
+      "resolved": "https://registry.npmjs.org/@amplitude/analytics-browser/-/analytics-browser-1.10.7.tgz",
+      "integrity": "sha512-gN1DMJHEZSc5ApF0xtkN4jBNl/69v9djREYYKsJMYRPkgKE8jn7oCB5H9tuRu99zeKdMMeAF7g3QzTBxOT+owA==",
       "dependencies": {
         "@amplitude/analytics-client-common": "^1.0.0",
         "@amplitude/analytics-core": "^1.0.0",
         "@amplitude/analytics-types": "^1.0.0",
-        "@amplitude/plugin-page-view-tracking-browser": "^1.0.0",
-        "@amplitude/plugin-web-attribution-browser": "^1.0.0",
+        "@amplitude/plugin-page-view-tracking-browser": "^1.0.1",
+        "@amplitude/plugin-web-attribution-browser": "^1.0.1",
         "@amplitude/ua-parser-js": "^0.7.31",
         "tslib": "^2.4.1"
       }
@@ -166,9 +166,9 @@
       "integrity": "sha512-mKqa7Ui5Hfa8otLVCC9GU9eE5l7ZtnUPZcGkL6tM51nFtUnMuCpDVlBwlTYukRc12U2E0MXIba4Q2mVmg8Mj8A=="
     },
     "node_modules/@amplitude/plugin-page-view-tracking-browser": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/@amplitude/plugin-page-view-tracking-browser/-/plugin-page-view-tracking-browser-1.0.0.tgz",
-      "integrity": "sha512-oRvdM6XVwlbXiJtVS/IHE1uGuzQ5hx6iwKkVZ8R8HwAWw/H6/tEKJAH9JP32aBBYIxWVY/2lvvfstHYOhi0YcQ==",
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/@amplitude/plugin-page-view-tracking-browser/-/plugin-page-view-tracking-browser-1.0.1.tgz",
+      "integrity": "sha512-5dB8Vo0BFm/K77YcG6MKMYrUlTK4A/K25nCx8K5KEndWqeskKANUWjlG/9NAGKx4WPH8vs3mYffDwXfXTOeY1A==",
       "dependencies": {
         "@amplitude/analytics-client-common": "^1.0.0",
         "@amplitude/analytics-types": "^1.0.0",
@@ -181,9 +181,9 @@
       "integrity": "sha512-mSxlJJwl3BMEQCUNnxXBU9jP4JBktcEGhURcPR6VQVlnP0FdDEsIaz0C35dXNGLyRfrATNofF0F5p2KPxQgB+w=="
     },
     "node_modules/@amplitude/plugin-web-attribution-browser": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/@amplitude/plugin-web-attribution-browser/-/plugin-web-attribution-browser-1.0.0.tgz",
-      "integrity": "sha512-dj+bITBMHMIe79s2V1gwcrVeS5TOwxBZ572UN8a8uqgApWh9redRu+HeMttK7oUETSFCwGegcXALNDG9X4IPxA==",
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/@amplitude/plugin-web-attribution-browser/-/plugin-web-attribution-browser-1.0.1.tgz",
+      "integrity": "sha512-5pwCTEw1zEC2h2YtVfYvaLGm8lAzyZAQZc3qEYGuQPgklewQMX3T9Zgv7UcHvLXQqBuQjAYYXeI5FKqrUYwTVw==",
       "dependencies": {
         "@amplitude/analytics-client-common": "^1.0.0",
         "@amplitude/analytics-types": "^1.0.0",
@@ -17512,15 +17512,15 @@
   },
   "dependencies": {
     "@amplitude/analytics-browser": {
-      "version": "1.10.6",
-      "resolved": "https://registry.npmjs.org/@amplitude/analytics-browser/-/analytics-browser-1.10.6.tgz",
-      "integrity": "sha512-UQ2k77bWpDN0sMoKFCXVSOLGs26X37wjUqPKPgUrq5hcAuE+qa/6CSfY0ftXFDHnKDGbX7z1Qo0Kl4TgUa0BIQ==",
+      "version": "1.10.7",
+      "resolved": "https://registry.npmjs.org/@amplitude/analytics-browser/-/analytics-browser-1.10.7.tgz",
+      "integrity": "sha512-gN1DMJHEZSc5ApF0xtkN4jBNl/69v9djREYYKsJMYRPkgKE8jn7oCB5H9tuRu99zeKdMMeAF7g3QzTBxOT+owA==",
       "requires": {
         "@amplitude/analytics-client-common": "^1.0.0",
         "@amplitude/analytics-core": "^1.0.0",
         "@amplitude/analytics-types": "^1.0.0",
-        "@amplitude/plugin-page-view-tracking-browser": "^1.0.0",
-        "@amplitude/plugin-web-attribution-browser": "^1.0.0",
+        "@amplitude/plugin-page-view-tracking-browser": "^1.0.1",
+        "@amplitude/plugin-web-attribution-browser": "^1.0.1",
         "@amplitude/ua-parser-js": "^0.7.31",
         "tslib": "^2.4.1"
       },
@@ -17577,9 +17577,9 @@
       "integrity": "sha512-mKqa7Ui5Hfa8otLVCC9GU9eE5l7ZtnUPZcGkL6tM51nFtUnMuCpDVlBwlTYukRc12U2E0MXIba4Q2mVmg8Mj8A=="
     },
     "@amplitude/plugin-page-view-tracking-browser": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/@amplitude/plugin-page-view-tracking-browser/-/plugin-page-view-tracking-browser-1.0.0.tgz",
-      "integrity": "sha512-oRvdM6XVwlbXiJtVS/IHE1uGuzQ5hx6iwKkVZ8R8HwAWw/H6/tEKJAH9JP32aBBYIxWVY/2lvvfstHYOhi0YcQ==",
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/@amplitude/plugin-page-view-tracking-browser/-/plugin-page-view-tracking-browser-1.0.1.tgz",
+      "integrity": "sha512-5dB8Vo0BFm/K77YcG6MKMYrUlTK4A/K25nCx8K5KEndWqeskKANUWjlG/9NAGKx4WPH8vs3mYffDwXfXTOeY1A==",
       "requires": {
         "@amplitude/analytics-client-common": "^1.0.0",
         "@amplitude/analytics-types": "^1.0.0",
@@ -17594,9 +17594,9 @@
       }
     },
     "@amplitude/plugin-web-attribution-browser": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/@amplitude/plugin-web-attribution-browser/-/plugin-web-attribution-browser-1.0.0.tgz",
-      "integrity": "sha512-dj+bITBMHMIe79s2V1gwcrVeS5TOwxBZ572UN8a8uqgApWh9redRu+HeMttK7oUETSFCwGegcXALNDG9X4IPxA==",
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/@amplitude/plugin-web-attribution-browser/-/plugin-web-attribution-browser-1.0.1.tgz",
+      "integrity": "sha512-5pwCTEw1zEC2h2YtVfYvaLGm8lAzyZAQZc3qEYGuQPgklewQMX3T9Zgv7UcHvLXQqBuQjAYYXeI5FKqrUYwTVw==",
       "requires": {
         "@amplitude/analytics-client-common": "^1.0.0",
         "@amplitude/analytics-types": "^1.0.0",
diff --git a/apps/block_scout_web/assets/package.json b/apps/block_scout_web/assets/package.json
index 6bb625420bff..69e9f7a8c987 100644
--- a/apps/block_scout_web/assets/package.json
+++ b/apps/block_scout_web/assets/package.json
@@ -20,7 +20,7 @@
   },
   "dependencies": {
     "@fortawesome/fontawesome-free": "^6.4.0",
-    "@amplitude/analytics-browser": "^1.10.6",
+    "@amplitude/analytics-browser": "^1.10.7",
     "@tarekraafat/autocomplete.js": "^10.2.7",
     "@walletconnect/web3-provider": "^1.8.0",
     "assert": "^2.0.0",

From 38994ec0ec6e3ce044013cf8c4510b336f4a7a25 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 7 Jun 2023 19:03:22 +0000
Subject: [PATCH 079/909] Bump webpack-cli from 5.1.3 to 5.1.4 in
 /apps/block_scout_web/assets

Bumps [webpack-cli](https://github.com/webpack/webpack-cli) from 5.1.3 to 5.1.4.
- [Release notes](https://github.com/webpack/webpack-cli/releases)
- [Changelog](https://github.com/webpack/webpack-cli/blob/master/CHANGELOG.md)
- [Commits](https://github.com/webpack/webpack-cli/compare/webpack-cli@5.1.3...webpack-cli@5.1.4)

---
updated-dependencies:
- dependency-name: webpack-cli
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 apps/block_scout_web/assets/package-lock.json | 14 +++++++-------
 apps/block_scout_web/assets/package.json      |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/apps/block_scout_web/assets/package-lock.json b/apps/block_scout_web/assets/package-lock.json
index 0c2763f8682d..13bd25590c39 100644
--- a/apps/block_scout_web/assets/package-lock.json
+++ b/apps/block_scout_web/assets/package-lock.json
@@ -93,7 +93,7 @@
         "sass-loader": "^13.3.1",
         "style-loader": "^3.3.3",
         "webpack": "^5.85.1",
-        "webpack-cli": "^5.1.3"
+        "webpack-cli": "^5.1.4"
       },
       "engines": {
         "node": ">=16.0.0",
@@ -17015,9 +17015,9 @@
       }
     },
     "node_modules/webpack-cli": {
-      "version": "5.1.3",
-      "resolved": "https://registry.npmjs.org/webpack-cli/-/webpack-cli-5.1.3.tgz",
-      "integrity": "sha512-MTuk7NUMvEHQUSXCpvUrF1q2p0FJS40dPFfqQvG3jTWcgv/8plBNz2Kv2HXZiLGPnfmSAA5uCtCILO1JBmmkfw==",
+      "version": "5.1.4",
+      "resolved": "https://registry.npmjs.org/webpack-cli/-/webpack-cli-5.1.4.tgz",
+      "integrity": "sha512-pIDJHIEI9LR0yxHXQ+Qh95k2EvXpWzZ5l+d+jIo+RdSm9MiHfzazIxwwni/p7+x4eJZuvG1AJwgC4TNQ7NRgsg==",
       "dev": true,
       "dependencies": {
         "@discoveryjs/json-ext": "^0.5.0",
@@ -30369,9 +30369,9 @@
       }
     },
     "webpack-cli": {
-      "version": "5.1.3",
-      "resolved": "https://registry.npmjs.org/webpack-cli/-/webpack-cli-5.1.3.tgz",
-      "integrity": "sha512-MTuk7NUMvEHQUSXCpvUrF1q2p0FJS40dPFfqQvG3jTWcgv/8plBNz2Kv2HXZiLGPnfmSAA5uCtCILO1JBmmkfw==",
+      "version": "5.1.4",
+      "resolved": "https://registry.npmjs.org/webpack-cli/-/webpack-cli-5.1.4.tgz",
+      "integrity": "sha512-pIDJHIEI9LR0yxHXQ+Qh95k2EvXpWzZ5l+d+jIo+RdSm9MiHfzazIxwwni/p7+x4eJZuvG1AJwgC4TNQ7NRgsg==",
       "dev": true,
       "requires": {
         "@discoveryjs/json-ext": "^0.5.0",
diff --git a/apps/block_scout_web/assets/package.json b/apps/block_scout_web/assets/package.json
index 6bb625420bff..5490a786cf83 100644
--- a/apps/block_scout_web/assets/package.json
+++ b/apps/block_scout_web/assets/package.json
@@ -105,7 +105,7 @@
     "sass-loader": "^13.3.1",
     "style-loader": "^3.3.3",
     "webpack": "^5.85.1",
-    "webpack-cli": "^5.1.3"
+    "webpack-cli": "^5.1.4"
   },
   "jest": {
     "moduleNameMapper": {

From cc53b93bcaaaa398550976a277f5178073a0dda3 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 8 Jun 2023 07:59:13 +0000
Subject: [PATCH 080/909] Bump webpack from 5.85.1 to 5.86.0 in
 /apps/block_scout_web/assets

Bumps [webpack](https://github.com/webpack/webpack) from 5.85.1 to 5.86.0.
- [Release notes](https://github.com/webpack/webpack/releases)
- [Commits](https://github.com/webpack/webpack/compare/v5.85.1...v5.86.0)

---
updated-dependencies:
- dependency-name: webpack
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 apps/block_scout_web/assets/package-lock.json | 14 +++++++-------
 apps/block_scout_web/assets/package.json      |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/apps/block_scout_web/assets/package-lock.json b/apps/block_scout_web/assets/package-lock.json
index d5c51d96accc..236899bcda80 100644
--- a/apps/block_scout_web/assets/package-lock.json
+++ b/apps/block_scout_web/assets/package-lock.json
@@ -92,7 +92,7 @@
         "sass": "^1.62.1",
         "sass-loader": "^13.3.1",
         "style-loader": "^3.3.3",
-        "webpack": "^5.85.1",
+        "webpack": "^5.86.0",
         "webpack-cli": "^5.1.4"
       },
       "engines": {
@@ -16968,9 +16968,9 @@
       }
     },
     "node_modules/webpack": {
-      "version": "5.85.1",
-      "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.85.1.tgz",
-      "integrity": "sha512-xTb7MRf4LY8Z5rzn7aIx4TDrwYJrjcHnIfU1TqtyZOoObyuGSpAUwIvVuqq5wPnv7WEgQr8UvO1q/dgoGG4HjA==",
+      "version": "5.86.0",
+      "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.86.0.tgz",
+      "integrity": "sha512-3BOvworZ8SO/D4GVP+GoRC3fVeg5MO4vzmq8TJJEkdmopxyazGDxN8ClqN12uzrZW9Tv8EED8v5VSb6Sqyi0pg==",
       "dev": true,
       "dependencies": {
         "@types/eslint-scope": "^3.7.3",
@@ -30318,9 +30318,9 @@
       "dev": true
     },
     "webpack": {
-      "version": "5.85.1",
-      "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.85.1.tgz",
-      "integrity": "sha512-xTb7MRf4LY8Z5rzn7aIx4TDrwYJrjcHnIfU1TqtyZOoObyuGSpAUwIvVuqq5wPnv7WEgQr8UvO1q/dgoGG4HjA==",
+      "version": "5.86.0",
+      "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.86.0.tgz",
+      "integrity": "sha512-3BOvworZ8SO/D4GVP+GoRC3fVeg5MO4vzmq8TJJEkdmopxyazGDxN8ClqN12uzrZW9Tv8EED8v5VSb6Sqyi0pg==",
       "dev": true,
       "requires": {
         "@types/eslint-scope": "^3.7.3",
diff --git a/apps/block_scout_web/assets/package.json b/apps/block_scout_web/assets/package.json
index b2283502367b..2a53be17b2d5 100644
--- a/apps/block_scout_web/assets/package.json
+++ b/apps/block_scout_web/assets/package.json
@@ -104,7 +104,7 @@
     "sass": "^1.62.1",
     "sass-loader": "^13.3.1",
     "style-loader": "^3.3.3",
-    "webpack": "^5.85.1",
+    "webpack": "^5.86.0",
     "webpack-cli": "^5.1.4"
   },
   "jest": {

From 83ec9575fbd435212fd1fe85cb0ce16c9423f0b7 Mon Sep 17 00:00:00 2001
From: Viktor Baranov <baranov.viktor.27@gmail.com>
Date: Thu, 8 Jun 2023 15:58:36 +0300
Subject: [PATCH 081/909] Search label query

---
 CHANGELOG.md                        |  1 +
 apps/explorer/lib/explorer/chain.ex | 30 ++++++++++++++++++++++++++++-
 2 files changed, 30 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 79e6c3c19e06..d2706781162a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -32,6 +32,7 @@
 
 ### Chore
 
+- [#7666](https://github.com/blockscout/blockscout/pull/7666) - Search label query
 - [#7644](https://github.com/blockscout/blockscout/pull/7644) - Publish docker images CI for prod/staging branches
 - [#7594](https://github.com/blockscout/blockscout/pull/7594) - Stats service support in docker-compose config with new frontend
 - [#7576](https://github.com/blockscout/blockscout/pull/7576) - Check left blocks in pending block operations in order to decide, if we need to display indexing int tx banner at the top
diff --git a/apps/explorer/lib/explorer/chain.ex b/apps/explorer/lib/explorer/chain.ex
index b43d383ce43d..281ea0390d9e 100644
--- a/apps/explorer/lib/explorer/chain.ex
+++ b/apps/explorer/lib/explorer/chain.ex
@@ -98,6 +98,7 @@ defmodule Explorer.Chain do
   alias Explorer.Market.MarketHistoryCache
   alias Explorer.{PagingOptions, Repo}
   alias Explorer.SmartContract.Helper
+  alias Explorer.Tags.{AddressTag, AddressToTag}
 
   alias Dataloader.Ecto, as: DataloaderEcto
 
@@ -1500,6 +1501,31 @@ defmodule Explorer.Chain do
     end
   end
 
+  def search_label_query(term) do
+    inner_query =
+      from(tag in AddressTag,
+        where: fragment("to_tsvector('english', display_name ) @@ to_tsquery(?)", ^term),
+        select: tag
+      )
+
+    from(att in AddressToTag,
+      inner_join: at in subquery(inner_query),
+      on: att.tag_id == at.id,
+      select: %{
+        address_hash: att.address_hash,
+        tx_hash: fragment("CAST(NULL AS bytea)"),
+        block_hash: fragment("CAST(NULL AS bytea)"),
+        type: "label",
+        name: at.display_name,
+        symbol: ^nil,
+        holder_count: ^nil,
+        inserted_at: att.inserted_at,
+        block_number: 0,
+        icon_url: nil
+      }
+    )
+  end
+
   defp search_token_query(term) do
     from(token in Token,
       where: fragment("to_tsvector(symbol || ' ' || name ) @@ to_tsquery(?)", ^term),
@@ -1646,6 +1672,7 @@ defmodule Explorer.Chain do
       {:some, term} ->
         tokens_query = search_token_query(term)
         contracts_query = search_contract_query(term)
+        labels_query = search_label_query(term)
         tx_query = search_tx_query(string)
         address_query = search_address_query(string)
         block_query = search_block_query(string)
@@ -1653,7 +1680,8 @@ defmodule Explorer.Chain do
         basic_query =
           from(
             tokens in subquery(tokens_query),
-            union: ^contracts_query
+            union: ^contracts_query,
+            union: ^labels_query
           )
 
         query =

From 7e15e21732a28c82bda1e336dad7b71ad8bb7921 Mon Sep 17 00:00:00 2001
From: Nick Zenchik <n.zenchik@gmail.com>
Date: Thu, 8 Jun 2023 17:56:32 +0300
Subject: [PATCH 082/909] Fixing E2E tests

---
 .github/workflows/e2e-tests.yml               | 90 -------------------
 .../publish-docker-image-every-push.yml       | 41 ++++++---
 2 files changed, 31 insertions(+), 100 deletions(-)
 delete mode 100644 .github/workflows/e2e-tests.yml

diff --git a/.github/workflows/e2e-tests.yml b/.github/workflows/e2e-tests.yml
deleted file mode 100644
index b3f0cc07d367..000000000000
--- a/.github/workflows/e2e-tests.yml
+++ /dev/null
@@ -1,90 +0,0 @@
-name: Run E2E tests k8s
-
-on:
-  pull_request_review:
-    types: [submitted]
-  workflow_dispatch:
-
-env:
-  K8S_LOCAL_PORT: ${{ secrets.K8S_LOCAL_PORT }}
-  K8S_HOST: ${{ secrets.K8S_HOST }}
-  BASTION_HOST: ${{ secrets.BASTION_HOST }}
-  K8S_PORT: ${{ secrets.K8S_PORT }}
-  USERNAME: ${{ secrets.USERNAME }}
-  BASTION_SSH_KEY: ${{secrets.BASTION_SSH_KEY}}
-  RELEASE_VERSION: 5.1.5
-
-jobs:
-  push_to_registry:
-    if: github.event.review.state == 'approved'
-    name: Push Docker image to Docker Hub
-    runs-on: ubuntu-latest
-    outputs:
-      release-version: ${{ steps.output-step.outputs.release-version }}
-      short-sha: ${{ steps.output-step.outputs.short-sha }}
-    steps:
-      - name: Check out the repo
-        uses: actions/checkout@v3
-
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v2
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
-
-      - name: Log in to Docker Hub
-        uses: docker/login-action@v2
-        with:
-          username: ${{ secrets.DOCKER_USERNAME }}
-          password: ${{ secrets.DOCKER_PASSWORD }}
-
-      - name: Extract metadata (tags, labels) for Docker
-        id: meta
-        uses: docker/metadata-action@v4
-        with:
-          images: blockscout/blockscout
-
-      - name: Add SHORT_SHA env property with commit short sha
-        run: echo "SHORT_SHA=`echo ${GITHUB_SHA} | cut -c1-8`" >> $GITHUB_ENV
-
-      - name: Add outputs
-        run: |
-          echo "::set-output name=short-sha::${{ env.SHORT_SHA }}"
-        id: output-step
-
-      - name: Build and push Docker image
-        uses: docker/build-push-action@v3
-        with:
-          context: .
-          file: ./docker/Dockerfile
-          push: true
-          cache-from: type=registry,ref=blockscout/blockscout:pr-buildcache
-          cache-to: type=registry,ref=blockscout/blockscout:pr-buildcache,mode=max
-          tags: blockscout/blockscout:pr-${{ env.SHORT_SHA }}
-          build-args: |
-            CACHE_EXCHANGE_RATES_PERIOD=
-            API_V1_READ_METHODS_DISABLED=false
-            DISABLE_WEBAPP=false
-            API_V1_WRITE_METHODS_DISABLED=false
-            CACHE_TOTAL_GAS_USAGE_COUNTER_ENABLED=
-            ADMIN_PANEL_ENABLED=false
-            DECODE_NOT_A_CONTRACT_CALLS=false
-            MIXPANEL_URL=
-            MIXPANEL_TOKEN=
-            AMPLITUDE_URL=
-            AMPLITUDE_API_KEY=
-            CACHE_ADDRESS_WITH_BALANCES_UPDATE_INTERVAL=
-            BLOCKSCOUT_VERSION=v${{ env.RELEASE_VERSION }}-beta.+commit.${{ env.SHORT_SHA }}
-            RELEASE_VERSION=${{ env.RELEASE_VERSION }}
-
-  deploy_and_tests:
-    needs: push_to_registry
-    if: github.event.review.state == 'approved'
-    uses: blockscout/blockscout-ci-cd/.github/workflows/e2e_new.yaml@master
-    with:
-      blockscoutImage: blockscout/blockscout:pr-${{ needs.push_to_registry.outputs.short-sha }}
-      blockscoutIngressHost: e2e-blockscout-$GITHUB_SHA_SHORT
-      frontendIngressHost: e2e-blockscout-$GITHUB_SHA_SHORT
-      gethIngressHost: e2e-geth-$GITHUB_SHA_SHORT
-      scVerifierIngressHost: e2e-sc-verifier-$GITHUB_SHA_SHORT
-    secrets: inherit
diff --git a/.github/workflows/publish-docker-image-every-push.yml b/.github/workflows/publish-docker-image-every-push.yml
index 825360099533..c9ed2871fc9c 100644
--- a/.github/workflows/publish-docker-image-every-push.yml
+++ b/.github/workflows/publish-docker-image-every-push.yml
@@ -91,13 +91,34 @@ jobs:
             SESSION_COOKIE_DOMAIN=k8s-dev.blockscout.com
             BLOCKSCOUT_VERSION=v${{ env.RELEASE_VERSION }}-beta.+commit.${{ env.SHORT_SHA }}
             RELEASE_VERSION=${{ env.RELEASE_VERSION }}
-  # tests:
-  #   needs: push_to_registry
-  #   uses: blockscout/blockscout-ci-cd/.github/workflows/e2e_new.yaml@master
-  #   with:
-  #     blockscoutImage: blockscout/blockscout:${{ needs.push_to_registry.outputs.release-version }}-postrelease-${{ needs.push_to_registry.outputs.short-sha }}
-  #     blockscoutIngressHost: e2e-blockscout-$GITHUB_SHA_SHORT
-  #     frontendIngressHost: e2e-blockscout-$GITHUB_SHA_SHORT
-  #     gethIngressHost: e2e-geth-$GITHUB_SHA_SHORT
-  #     scVerifierIngressHost: e2e-sc-verifier-$GITHUB_SHA_SHORT
-  #   secrets: inherit
+  deploy_e2e:
+    needs: push_to_registry
+    runs-on: ubuntu-latest
+    permissions: write-all
+    steps:
+      - name: Get Vault credentials
+        id: retrieve-vault-secrets
+        uses: hashicorp/vault-action@v2.4.1
+        with:
+          url: https://vault.k8s.blockscout.com
+          role: ci-dev
+          path: github-jwt
+          method: jwt
+          tlsSkipVerify: false
+          exportToken: true
+          secrets: |
+            ci/data/dev/github token | WORKFLOW_TRIGGER_TOKEN ;
+      - name: Trigger deploy
+        uses: convictional/trigger-workflow-and-wait@v1.6.1
+        with:
+          owner: blockscout
+          repo: deployment-values
+          github_token: ${{env.WORKFLOW_TRIGGER_TOKEN}}
+          workflow_file_name: deploy_blockscout.yaml
+          ref: main
+          wait_interval: 30
+          client_payload: '{ "instance": "dev", "globalEnv": "e2e"}'
+  test:
+    needs: deploy_e2e
+    uses: blockscout/blockscout-ci-cd/.github/workflows/e2e_new.yaml@master
+    secrets: inherit

From f18b9298af688e7f8ea6c518cc41817059e8559d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 8 Jun 2023 19:01:55 +0000
Subject: [PATCH 083/909] Bump sass from 1.62.1 to 1.63.2 in
 /apps/block_scout_web/assets

Bumps [sass](https://github.com/sass/dart-sass) from 1.62.1 to 1.63.2.
- [Release notes](https://github.com/sass/dart-sass/releases)
- [Changelog](https://github.com/sass/dart-sass/blob/main/CHANGELOG.md)
- [Commits](https://github.com/sass/dart-sass/compare/1.62.1...1.63.2)

---
updated-dependencies:
- dependency-name: sass
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 apps/block_scout_web/assets/package-lock.json | 14 +++++++-------
 apps/block_scout_web/assets/package.json      |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/apps/block_scout_web/assets/package-lock.json b/apps/block_scout_web/assets/package-lock.json
index 236899bcda80..47dc90860fab 100644
--- a/apps/block_scout_web/assets/package-lock.json
+++ b/apps/block_scout_web/assets/package-lock.json
@@ -89,7 +89,7 @@
         "mini-css-extract-plugin": "^2.7.6",
         "postcss": "^8.4.24",
         "postcss-loader": "^7.3.2",
-        "sass": "^1.62.1",
+        "sass": "^1.63.2",
         "sass-loader": "^13.3.1",
         "style-loader": "^3.3.3",
         "webpack": "^5.86.0",
@@ -14889,9 +14889,9 @@
       "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
     },
     "node_modules/sass": {
-      "version": "1.62.1",
-      "resolved": "https://registry.npmjs.org/sass/-/sass-1.62.1.tgz",
-      "integrity": "sha512-NHpxIzN29MXvWiuswfc1W3I0N8SXBd8UR26WntmDlRYf0bSADnwnOjsyMZ3lMezSlArD33Vs3YFhp7dWvL770A==",
+      "version": "1.63.2",
+      "resolved": "https://registry.npmjs.org/sass/-/sass-1.63.2.tgz",
+      "integrity": "sha512-u56TU0AIFqMtauKl/OJ1AeFsXqRHkgO7nCWmHaDwfxDo9GUMSqBA4NEh6GMuh1CYVM7zuROYtZrHzPc2ixK+ww==",
       "dev": true,
       "dependencies": {
         "chokidar": ">=3.0.0 <4.0.0",
@@ -28725,9 +28725,9 @@
       "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
     },
     "sass": {
-      "version": "1.62.1",
-      "resolved": "https://registry.npmjs.org/sass/-/sass-1.62.1.tgz",
-      "integrity": "sha512-NHpxIzN29MXvWiuswfc1W3I0N8SXBd8UR26WntmDlRYf0bSADnwnOjsyMZ3lMezSlArD33Vs3YFhp7dWvL770A==",
+      "version": "1.63.2",
+      "resolved": "https://registry.npmjs.org/sass/-/sass-1.63.2.tgz",
+      "integrity": "sha512-u56TU0AIFqMtauKl/OJ1AeFsXqRHkgO7nCWmHaDwfxDo9GUMSqBA4NEh6GMuh1CYVM7zuROYtZrHzPc2ixK+ww==",
       "dev": true,
       "requires": {
         "chokidar": ">=3.0.0 <4.0.0",
diff --git a/apps/block_scout_web/assets/package.json b/apps/block_scout_web/assets/package.json
index 2a53be17b2d5..bdb269faece2 100644
--- a/apps/block_scout_web/assets/package.json
+++ b/apps/block_scout_web/assets/package.json
@@ -101,7 +101,7 @@
     "mini-css-extract-plugin": "^2.7.6",
     "postcss": "^8.4.24",
     "postcss-loader": "^7.3.2",
-    "sass": "^1.62.1",
+    "sass": "^1.63.2",
     "sass-loader": "^13.3.1",
     "style-loader": "^3.3.3",
     "webpack": "^5.86.0",

From 30efb4932da691667732f7b00c33ba90e014a6f4 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 8 Jun 2023 19:02:53 +0000
Subject: [PATCH 084/909] Bump @babel/preset-env in
 /apps/block_scout_web/assets

Bumps [@babel/preset-env](https://github.com/babel/babel/tree/HEAD/packages/babel-preset-env) from 7.22.4 to 7.22.5.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/commits/v7.22.5/packages/babel-preset-env)

---
updated-dependencies:
- dependency-name: "@babel/preset-env"
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 apps/block_scout_web/assets/package-lock.json | 1918 ++++++++---------
 apps/block_scout_web/assets/package.json      |    2 +-
 2 files changed, 943 insertions(+), 977 deletions(-)

diff --git a/apps/block_scout_web/assets/package-lock.json b/apps/block_scout_web/assets/package-lock.json
index 236899bcda80..ba8c2a069646 100644
--- a/apps/block_scout_web/assets/package-lock.json
+++ b/apps/block_scout_web/assets/package-lock.json
@@ -72,7 +72,7 @@
       },
       "devDependencies": {
         "@babel/core": "^7.22.1",
-        "@babel/preset-env": "^7.22.4",
+        "@babel/preset-env": "^7.22.5",
         "autoprefixer": "^10.4.14",
         "babel-loader": "^9.1.2",
         "copy-webpack-plugin": "^11.0.0",
@@ -238,20 +238,20 @@
       }
     },
     "node_modules/@babel/code-frame": {
-      "version": "7.21.4",
-      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.21.4.tgz",
-      "integrity": "sha512-LYvhNKfwWSPpocw8GI7gpK2nq3HSDuEPC/uSYaALSJu9xjsalaaYFOq0Pwt5KmVqwEbZlDu81aLXwBOmD/Fv9g==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.22.5.tgz",
+      "integrity": "sha512-Xmwn266vad+6DAqEB2A6V/CcZVp62BbwVmcOJc2RPuwih1kw02TjQvWVWlcKGbBPd+8/0V5DEkOcizRGYsspYQ==",
       "dependencies": {
-        "@babel/highlight": "^7.18.6"
+        "@babel/highlight": "^7.22.5"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/compat-data": {
-      "version": "7.22.3",
-      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.22.3.tgz",
-      "integrity": "sha512-aNtko9OPOwVESUFp3MZfD8Uzxl7JzSeJpd7npIoxCasU37PFbAQRpKglkaKwlHOyeJdrREpo8TW8ldrkYWwvIQ==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.22.5.tgz",
+      "integrity": "sha512-4Jc/YuIaYqKnDDz892kPIledykKg12Aw1PYX5i/TY28anJtacvM1Rrr8wbieB9GfEJwlzqT0hUEao0CxEebiDA==",
       "engines": {
         "node": ">=6.9.0"
       }
@@ -286,11 +286,11 @@
       }
     },
     "node_modules/@babel/generator": {
-      "version": "7.22.0",
-      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.22.0.tgz",
-      "integrity": "sha512-tyzR0OsH88AelgukhL2rbEUCLKBGmy2G9Th/5vpyOt0zf44Be61kvIQXjCwTSX8t+qJ/vMwZfhK6mPdrMLZXRg==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.22.5.tgz",
+      "integrity": "sha512-+lcUbnTRhd0jOewtFSedLyiPsD5tswKkbgcezOqqWFUVNEwoUTlpPOBmvhG7OXWLR4jMdv0czPGH5XbflnD1EA==",
       "dependencies": {
-        "@babel/types": "^7.22.0",
+        "@babel/types": "^7.22.5",
         "@jridgewell/gen-mapping": "^0.3.2",
         "@jridgewell/trace-mapping": "^0.3.17",
         "jsesc": "^2.5.1"
@@ -300,36 +300,35 @@
       }
     },
     "node_modules/@babel/helper-annotate-as-pure": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.18.6.tgz",
-      "integrity": "sha512-duORpUiYrEpzKIop6iNbjnwKLAKnJ47csTyRACyEmWj0QdUrm5aqNJGHSSEQSUAvNW0ojX0dOmK9dZduvkfeXA==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.22.5.tgz",
+      "integrity": "sha512-LvBTxu8bQSQkcyKOU+a1btnNFQ1dMAd0R6PyW3arXes06F6QLWLIrd681bxRPIXlrMGR3XYnW9JyML7dP3qgxg==",
       "dependencies": {
-        "@babel/types": "^7.18.6"
+        "@babel/types": "^7.22.5"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-builder-binary-assignment-operator-visitor": {
-      "version": "7.18.9",
-      "resolved": "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.18.9.tgz",
-      "integrity": "sha512-yFQ0YCHoIqarl8BCRwBL8ulYUaZpz3bNsA7oFepAzee+8/+ImtADXNOmO5vJvsPff3qi+hvpkY/NYBTrBQgdNw==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.22.5.tgz",
+      "integrity": "sha512-m1EP3lVOPptR+2DwD125gziZNcmoNSHGmJROKoy87loWUQyJaVXDgpmruWqDARZSmtYQ+Dl25okU8+qhVzuykw==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-explode-assignable-expression": "^7.18.6",
-        "@babel/types": "^7.18.9"
+        "@babel/types": "^7.22.5"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-compilation-targets": {
-      "version": "7.22.1",
-      "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.22.1.tgz",
-      "integrity": "sha512-Rqx13UM3yVB5q0D/KwQ8+SPfX/+Rnsy1Lw1k/UwOC4KC6qrzIQoY3lYnBu5EHKBlEHHcj0M0W8ltPSkD8rqfsQ==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.22.5.tgz",
+      "integrity": "sha512-Ji+ywpHeuqxB8WDxraCiqR0xfhYjiDE/e6k7FuIaANnoOFxAHskHChz4vA1mJC9Lbm01s1PVAGhQY4FUKSkGZw==",
       "dependencies": {
-        "@babel/compat-data": "^7.22.0",
-        "@babel/helper-validator-option": "^7.21.0",
+        "@babel/compat-data": "^7.22.5",
+        "@babel/helper-validator-option": "^7.22.5",
         "browserslist": "^4.21.3",
         "lru-cache": "^5.1.1",
         "semver": "^6.3.0"
@@ -355,19 +354,19 @@
       "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g=="
     },
     "node_modules/@babel/helper-create-class-features-plugin": {
-      "version": "7.22.1",
-      "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.22.1.tgz",
-      "integrity": "sha512-SowrZ9BWzYFgzUMwUmowbPSGu6CXL5MSuuCkG3bejahSpSymioPmuLdhPxNOc9MjuNGjy7M/HaXvJ8G82Lywlw==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-annotate-as-pure": "^7.18.6",
-        "@babel/helper-environment-visitor": "^7.22.1",
-        "@babel/helper-function-name": "^7.21.0",
-        "@babel/helper-member-expression-to-functions": "^7.22.0",
-        "@babel/helper-optimise-call-expression": "^7.18.6",
-        "@babel/helper-replace-supers": "^7.22.1",
-        "@babel/helper-skip-transparent-expression-wrappers": "^7.20.0",
-        "@babel/helper-split-export-declaration": "^7.18.6",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.22.5.tgz",
+      "integrity": "sha512-xkb58MyOYIslxu3gKmVXmjTtUPvBU4odYzbiIQbWwLKIHCsx6UGZGX6F1IznMFVnDdirseUZopzN+ZRt8Xb33Q==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-annotate-as-pure": "^7.22.5",
+        "@babel/helper-environment-visitor": "^7.22.5",
+        "@babel/helper-function-name": "^7.22.5",
+        "@babel/helper-member-expression-to-functions": "^7.22.5",
+        "@babel/helper-optimise-call-expression": "^7.22.5",
+        "@babel/helper-replace-supers": "^7.22.5",
+        "@babel/helper-skip-transparent-expression-wrappers": "^7.22.5",
+        "@babel/helper-split-export-declaration": "^7.22.5",
         "semver": "^6.3.0"
       },
       "engines": {
@@ -378,12 +377,12 @@
       }
     },
     "node_modules/@babel/helper-create-regexp-features-plugin": {
-      "version": "7.22.1",
-      "resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.22.1.tgz",
-      "integrity": "sha512-WWjdnfR3LPIe+0EY8td7WmjhytxXtjKAEpnAxun/hkNiyOaPlvGK+NZaBFIdi9ndYV3Gav7BpFvtUwnaJlwi1w==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.22.5.tgz",
+      "integrity": "sha512-1VpEFOIbMRaXyDeUwUfmTIxExLwQ+zkW+Bh5zXpApA3oQedBx9v/updixWxnx/bZpKw7u8VxWjb/qWpIcmPq8A==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-annotate-as-pure": "^7.18.6",
+        "@babel/helper-annotate-as-pure": "^7.22.5",
         "regexpu-core": "^5.3.1",
         "semver": "^6.3.0"
       },
@@ -411,119 +410,107 @@
       }
     },
     "node_modules/@babel/helper-environment-visitor": {
-      "version": "7.22.1",
-      "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.22.1.tgz",
-      "integrity": "sha512-Z2tgopurB/kTbidvzeBrc2To3PUP/9i5MUe+fU6QJCQDyPwSH2oRapkLw3KGECDYSjhQZCNxEvNvZlLw8JjGwA==",
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/helper-explode-assignable-expression": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.18.6.tgz",
-      "integrity": "sha512-eyAYAsQmB80jNfg4baAtLeWAQHfHFiR483rzFK+BhETlGZaQC9bsfrugfXDCbRHLQbIA7U5NxhhOxN7p/dWIcg==",
-      "dev": true,
-      "dependencies": {
-        "@babel/types": "^7.18.6"
-      },
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.22.5.tgz",
+      "integrity": "sha512-XGmhECfVA/5sAt+H+xpSg0mfrHq6FzNr9Oxh7PSEBBRUb/mL7Kz3NICXb194rCqAEdxkhPT1a88teizAFyvk8Q==",
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-function-name": {
-      "version": "7.21.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.21.0.tgz",
-      "integrity": "sha512-HfK1aMRanKHpxemaY2gqBmL04iAPOPRj7DxtNbiDOrJK+gdwkiNRVpCpUJYbUT+aZyemKN8brqTOxzCaG6ExRg==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.22.5.tgz",
+      "integrity": "sha512-wtHSq6jMRE3uF2otvfuD3DIvVhOsSNshQl0Qrd7qC9oQJzHvOL4qQXlQn2916+CXGywIjpGuIkoyZRRxHPiNQQ==",
       "dependencies": {
-        "@babel/template": "^7.20.7",
-        "@babel/types": "^7.21.0"
+        "@babel/template": "^7.22.5",
+        "@babel/types": "^7.22.5"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-hoist-variables": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.18.6.tgz",
-      "integrity": "sha512-UlJQPkFqFULIcyW5sbzgbkxn2FKRgwWiRexcuaR8RNJRy8+LLveqPjwZV/bwrLZCN0eUHD/x8D0heK1ozuoo6Q==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.22.5.tgz",
+      "integrity": "sha512-wGjk9QZVzvknA6yKIUURb8zY3grXCcOZt+/7Wcy8O2uctxhplmUPkOdlgoNhmdVee2c92JXbf1xpMtVNbfoxRw==",
       "dependencies": {
-        "@babel/types": "^7.18.6"
+        "@babel/types": "^7.22.5"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-member-expression-to-functions": {
-      "version": "7.22.3",
-      "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.22.3.tgz",
-      "integrity": "sha512-Gl7sK04b/2WOb6OPVeNy9eFKeD3L6++CzL3ykPOWqTn08xgYYK0wz4TUh2feIImDXxcVW3/9WQ1NMKY66/jfZA==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.22.5.tgz",
+      "integrity": "sha512-aBiH1NKMG0H2cGZqspNvsaBe6wNGjbJjuLy29aU+eDZjSbbN53BaxlpB02xm9v34pLTZ1nIQPFYn2qMZoa5BQQ==",
       "dev": true,
       "dependencies": {
-        "@babel/types": "^7.22.3"
+        "@babel/types": "^7.22.5"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-module-imports": {
-      "version": "7.21.4",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.21.4.tgz",
-      "integrity": "sha512-orajc5T2PsRYUN3ZryCEFeMDYwyw09c/pZeaQEZPH0MpKzSvn3e0uXsDBu3k03VI+9DBiRo+l22BfKTpKwa/Wg==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.22.5.tgz",
+      "integrity": "sha512-8Dl6+HD/cKifutF5qGd/8ZJi84QeAKh+CEe1sBzz8UayBBGg1dAIJrdHOcOM5b2MpzWL2yuotJTtGjETq0qjXg==",
       "dependencies": {
-        "@babel/types": "^7.21.4"
+        "@babel/types": "^7.22.5"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-module-transforms": {
-      "version": "7.22.1",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.22.1.tgz",
-      "integrity": "sha512-dxAe9E7ySDGbQdCVOY/4+UcD8M9ZFqZcZhSPsPacvCG4M+9lwtDDQfI2EoaSvmf7W/8yCBkGU0m7Pvt1ru3UZw==",
-      "dependencies": {
-        "@babel/helper-environment-visitor": "^7.22.1",
-        "@babel/helper-module-imports": "^7.21.4",
-        "@babel/helper-simple-access": "^7.21.5",
-        "@babel/helper-split-export-declaration": "^7.18.6",
-        "@babel/helper-validator-identifier": "^7.19.1",
-        "@babel/template": "^7.21.9",
-        "@babel/traverse": "^7.22.1",
-        "@babel/types": "^7.22.0"
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.22.5.tgz",
+      "integrity": "sha512-+hGKDt/Ze8GFExiVHno/2dvG5IdstpzCq0y4Qc9OJ25D4q3pKfiIP/4Vp3/JvhDkLKsDK2api3q3fpIgiIF5bw==",
+      "dependencies": {
+        "@babel/helper-environment-visitor": "^7.22.5",
+        "@babel/helper-module-imports": "^7.22.5",
+        "@babel/helper-simple-access": "^7.22.5",
+        "@babel/helper-split-export-declaration": "^7.22.5",
+        "@babel/helper-validator-identifier": "^7.22.5",
+        "@babel/template": "^7.22.5",
+        "@babel/traverse": "^7.22.5",
+        "@babel/types": "^7.22.5"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-optimise-call-expression": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.18.6.tgz",
-      "integrity": "sha512-HP59oD9/fEHQkdcbgFCnbmgH5vIQTJbxh2yf+CdM89/glUNnuzr87Q8GIjGEnOktTROemO0Pe0iPAYbqZuOUiA==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.22.5.tgz",
+      "integrity": "sha512-HBwaojN0xFRx4yIvpwGqxiV2tUfl7401jlok564NgB9EHS1y6QT17FmKWm4ztqjeVdXLuC4fSvHc5ePpQjoTbw==",
       "dev": true,
       "dependencies": {
-        "@babel/types": "^7.18.6"
+        "@babel/types": "^7.22.5"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-plugin-utils": {
-      "version": "7.21.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.21.5.tgz",
-      "integrity": "sha512-0WDaIlXKOX/3KfBK/dwP1oQGiPh6rjMkT7HIRv7i5RR2VUMwrx5ZL0dwBkKx7+SW1zwNdgjHd34IMk5ZjTeHVg==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.22.5.tgz",
+      "integrity": "sha512-uLls06UVKgFG9QD4OeFYLEGteMIAa5kpTPcFL28yuCIIzsf6ZyKZMllKVOCZFhiZ5ptnwX4mtKdWCBE/uT4amg==",
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-remap-async-to-generator": {
-      "version": "7.18.9",
-      "resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.18.9.tgz",
-      "integrity": "sha512-dI7q50YKd8BAv3VEfgg7PS7yD3Rtbi2J1XMXaalXO0W0164hYLnh8zpjRS0mte9MfVp/tltvr/cfdXPvJr1opA==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.22.5.tgz",
+      "integrity": "sha512-cU0Sq1Rf4Z55fgz7haOakIyM7+x/uCFwXpLPaeRzfoUtAEAuUZjZvFPjL/rk5rW693dIgn2hng1W7xbT7lWT4g==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-annotate-as-pure": "^7.18.6",
-        "@babel/helper-environment-visitor": "^7.18.9",
-        "@babel/helper-wrap-function": "^7.18.9",
-        "@babel/types": "^7.18.9"
+        "@babel/helper-annotate-as-pure": "^7.22.5",
+        "@babel/helper-environment-visitor": "^7.22.5",
+        "@babel/helper-wrap-function": "^7.22.5",
+        "@babel/types": "^7.22.5"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -533,90 +520,90 @@
       }
     },
     "node_modules/@babel/helper-replace-supers": {
-      "version": "7.22.1",
-      "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.22.1.tgz",
-      "integrity": "sha512-ut4qrkE4AuSfrwHSps51ekR1ZY/ygrP1tp0WFm8oVq6nzc/hvfV/22JylndIbsf2U2M9LOMwiSddr6y+78j+OQ==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.22.5.tgz",
+      "integrity": "sha512-aLdNM5I3kdI/V9xGNyKSF3X/gTyMUBohTZ+/3QdQKAA9vxIiy12E+8E2HoOP1/DjeqU+g6as35QHJNMDDYpuCg==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-environment-visitor": "^7.22.1",
-        "@babel/helper-member-expression-to-functions": "^7.22.0",
-        "@babel/helper-optimise-call-expression": "^7.18.6",
-        "@babel/template": "^7.21.9",
-        "@babel/traverse": "^7.22.1",
-        "@babel/types": "^7.22.0"
+        "@babel/helper-environment-visitor": "^7.22.5",
+        "@babel/helper-member-expression-to-functions": "^7.22.5",
+        "@babel/helper-optimise-call-expression": "^7.22.5",
+        "@babel/template": "^7.22.5",
+        "@babel/traverse": "^7.22.5",
+        "@babel/types": "^7.22.5"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-simple-access": {
-      "version": "7.21.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.21.5.tgz",
-      "integrity": "sha512-ENPDAMC1wAjR0uaCUwliBdiSl1KBJAVnMTzXqi64c2MG8MPR6ii4qf7bSXDqSFbr4W6W028/rf5ivoHop5/mkg==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.22.5.tgz",
+      "integrity": "sha512-n0H99E/K+Bika3++WNL17POvo4rKWZ7lZEp1Q+fStVbUi8nxPQEBOlTmCOxW/0JsS56SKKQ+ojAe2pHKJHN35w==",
       "dependencies": {
-        "@babel/types": "^7.21.5"
+        "@babel/types": "^7.22.5"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-skip-transparent-expression-wrappers": {
-      "version": "7.20.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.20.0.tgz",
-      "integrity": "sha512-5y1JYeNKfvnT8sZcK9DVRtpTbGiomYIHviSP3OQWmDPU3DeH4a1ZlT/N2lyQ5P8egjcRaT/Y9aNqUxK0WsnIIg==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.22.5.tgz",
+      "integrity": "sha512-tK14r66JZKiC43p8Ki33yLBVJKlQDFoA8GYN67lWCDCqoL6EMMSuM9b+Iff2jHaM/RRFYl7K+iiru7hbRqNx8Q==",
       "dev": true,
       "dependencies": {
-        "@babel/types": "^7.20.0"
+        "@babel/types": "^7.22.5"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-split-export-declaration": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.18.6.tgz",
-      "integrity": "sha512-bde1etTx6ZyTmobl9LLMMQsaizFVZrquTEHOqKeQESMKo4PlObf+8+JA25ZsIpZhT/WEd39+vOdLXAFG/nELpA==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.22.5.tgz",
+      "integrity": "sha512-thqK5QFghPKWLhAV321lxF95yCg2K3Ob5yw+M3VHWfdia0IkPXUtoLH8x/6Fh486QUvzhb8YOWHChTVen2/PoQ==",
       "dependencies": {
-        "@babel/types": "^7.18.6"
+        "@babel/types": "^7.22.5"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-string-parser": {
-      "version": "7.21.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.21.5.tgz",
-      "integrity": "sha512-5pTUx3hAJaZIdW99sJ6ZUUgWq/Y+Hja7TowEnLNMm1VivRgZQL3vpBY3qUACVsvw+yQU6+YgfBVmcbLaZtrA1w==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.22.5.tgz",
+      "integrity": "sha512-mM4COjgZox8U+JcXQwPijIZLElkgEpO5rsERVDJTc2qfCDfERyob6k5WegS14SX18IIjv+XD+GrqNumY5JRCDw==",
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-validator-identifier": {
-      "version": "7.19.1",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.19.1.tgz",
-      "integrity": "sha512-awrNfaMtnHUr653GgGEs++LlAvW6w+DcPrOliSMXWCKo597CwL5Acf/wWdNkf/tfEQE3mjkeD1YOVZOUV/od1w==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.5.tgz",
+      "integrity": "sha512-aJXu+6lErq8ltp+JhkJUfk1MTGyuA4v7f3pA+BJ5HLfNC6nAQ0Cpi9uOquUj8Hehg0aUiHzWQbOVJGao6ztBAQ==",
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-validator-option": {
-      "version": "7.21.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.21.0.tgz",
-      "integrity": "sha512-rmL/B8/f0mKS2baE9ZpyTcTavvEuWhTTW8amjzXNvYG4AwBsqTLikfXsEofsJEfKHf+HQVQbFOHy6o+4cnC/fQ==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.22.5.tgz",
+      "integrity": "sha512-R3oB6xlIVKUnxNUxbmgq7pKjxpru24zlimpE8WK47fACIlM0II/Hm1RS8IaOI7NgCr6LNS+jl5l75m20npAziw==",
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-wrap-function": {
-      "version": "7.20.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.20.5.tgz",
-      "integrity": "sha512-bYMxIWK5mh+TgXGVqAtnu5Yn1un+v8DDZtqyzKRLUzrh70Eal2O3aZ7aPYiMADO4uKlkzOiRiZ6GX5q3qxvW9Q==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.22.5.tgz",
+      "integrity": "sha512-bYqLIBSEshYcYQyfks8ewYA8S30yaGSeRslcvKMvoUk6HHPySbxHq9YRi6ghhzEU+yhQv9bP/jXnygkStOcqZw==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-function-name": "^7.19.0",
-        "@babel/template": "^7.18.10",
-        "@babel/traverse": "^7.20.5",
-        "@babel/types": "^7.20.5"
+        "@babel/helper-function-name": "^7.22.5",
+        "@babel/template": "^7.22.5",
+        "@babel/traverse": "^7.22.5",
+        "@babel/types": "^7.22.5"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -636,11 +623,11 @@
       }
     },
     "node_modules/@babel/highlight": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.18.6.tgz",
-      "integrity": "sha512-u7stbOuYjaPezCuLj29hNW1v64M2Md2qupEKP1fHc7WdOA3DgLh37suiSrZYY7haUB7iBeQZ9P1uiRF359do3g==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.22.5.tgz",
+      "integrity": "sha512-BSKlD1hgnedS5XRnGOljZawtag7H1yPfQp0tdNJCHoH6AZ+Pcm9VvkrK59/Yy593Ypg0zMxH2BxD1VPYUQ7UIw==",
       "dependencies": {
-        "@babel/helper-validator-identifier": "^7.18.6",
+        "@babel/helper-validator-identifier": "^7.22.5",
         "chalk": "^2.0.0",
         "js-tokens": "^4.0.0"
       },
@@ -649,9 +636,9 @@
       }
     },
     "node_modules/@babel/parser": {
-      "version": "7.22.0",
-      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.22.0.tgz",
-      "integrity": "sha512-DA65VCJRetcFmJnt9/hEmRvXNCwk0V86dxG6p6N13hzDazaLRjGdTGPGgjxZOtLuFgWzOSRX4grybmRXwQ9bSg==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.22.5.tgz",
+      "integrity": "sha512-DFZMC9LJUG9PLOclRC32G63UXwzqS2koQC8dkx+PLdmt1xSePYpbT/NbsrJy8Q/muXz7o/h/d4A7Fuyixm559Q==",
       "bin": {
         "parser": "bin/babel-parser.js"
       },
@@ -660,12 +647,12 @@
       }
     },
     "node_modules/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.18.6.tgz",
-      "integrity": "sha512-Dgxsyg54Fx1d4Nge8UnvTrED63vrwOdPmyvPzlNN/boaliRP54pm3pGzZD1SJUwrBA+Cs/xdG8kXX6Mn/RfISQ==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.22.5.tgz",
+      "integrity": "sha512-NP1M5Rf+u2Gw9qfSO4ihjcTGW5zXTi36ITLd4/EoAcEhIZ0yjMqmftDNl3QC19CX7olhrjpyU454g/2W7X0jvQ==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.18.6"
+        "@babel/helper-plugin-utils": "^7.22.5"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -675,14 +662,14 @@
       }
     },
     "node_modules/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": {
-      "version": "7.22.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.22.3.tgz",
-      "integrity": "sha512-6r4yRwEnorYByILoDRnEqxtojYKuiIv9FojW2E8GUKo9eWBwbKcd9IiZOZpdyXc64RmyGGyPu3/uAcrz/dq2kQ==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.22.5.tgz",
+      "integrity": "sha512-31Bb65aZaUwqCbWMnZPduIZxCBngHFlzyN6Dq6KAJjtx+lx6ohKHubc61OomYi7XwVD4Ol0XCVz4h+pYFR048g==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.21.5",
-        "@babel/helper-skip-transparent-expression-wrappers": "^7.20.0",
-        "@babel/plugin-transform-optional-chaining": "^7.22.3"
+        "@babel/helper-plugin-utils": "^7.22.5",
+        "@babel/helper-skip-transparent-expression-wrappers": "^7.22.5",
+        "@babel/plugin-transform-optional-chaining": "^7.22.5"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -692,16 +679,10 @@
       }
     },
     "node_modules/@babel/plugin-proposal-private-property-in-object": {
-      "version": "7.21.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.21.0.tgz",
-      "integrity": "sha512-ha4zfehbJjc5MmXBlHec1igel5TJXXLDDRbuJ4+XT2TJcyD9/V1919BA8gMvsdHcNMBy4WBUBiRb3nw/EQUtBw==",
+      "version": "7.21.0-placeholder-for-preset-env.2",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.21.0-placeholder-for-preset-env.2.tgz",
+      "integrity": "sha512-SOSkfJDddaM7mak6cPEpswyTRnuRltl429hMraQEglW+OkovnCzsiszTmsrlY//qLFjCpQDFRvjdm2wA5pPm9w==",
       "dev": true,
-      "dependencies": {
-        "@babel/helper-annotate-as-pure": "^7.18.6",
-        "@babel/helper-create-class-features-plugin": "^7.21.0",
-        "@babel/helper-plugin-utils": "^7.20.2",
-        "@babel/plugin-syntax-private-property-in-object": "^7.14.5"
-      },
       "engines": {
         "node": ">=6.9.0"
       },
@@ -801,12 +782,12 @@
       }
     },
     "node_modules/@babel/plugin-syntax-import-assertions": {
-      "version": "7.20.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.20.0.tgz",
-      "integrity": "sha512-IUh1vakzNoWalR8ch/areW7qFopR2AEw03JlG7BbrDqmQ4X3q9uuipQwSGrUn7oGiemKjtSLDhNtQHzMHr1JdQ==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.22.5.tgz",
+      "integrity": "sha512-rdV97N7KqsRzeNGoWUOK6yUsWarLjE5Su/Snk9IYPU9CwkWHs4t+rTGOvffTR8XGkJMTAdLfO0xVnXm8wugIJg==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.19.0"
+        "@babel/helper-plugin-utils": "^7.22.5"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -816,12 +797,12 @@
       }
     },
     "node_modules/@babel/plugin-syntax-import-attributes": {
-      "version": "7.22.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-attributes/-/plugin-syntax-import-attributes-7.22.3.tgz",
-      "integrity": "sha512-i35jZJv6aO7hxEbIWQ41adVfOzjm9dcYDNeWlBMd8p0ZQRtNUCBrmGwZt+H5lb+oOC9a3svp956KP0oWGA1YsA==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-attributes/-/plugin-syntax-import-attributes-7.22.5.tgz",
+      "integrity": "sha512-KwvoWDeNKPETmozyFE0P2rOLqh39EoQHNjqizrI5B8Vt0ZNS7M56s7dAiAqbYfiAYOuIzIh96z3iR2ktgu3tEg==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.21.5"
+        "@babel/helper-plugin-utils": "^7.22.5"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1003,12 +984,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-arrow-functions": {
-      "version": "7.21.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.21.5.tgz",
-      "integrity": "sha512-wb1mhwGOCaXHDTcsRYMKF9e5bbMgqwxtqa2Y1ifH96dXJPwbuLX9qHy3clhrxVqgMz7nyNXs8VkxdH8UBcjKqA==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.22.5.tgz",
+      "integrity": "sha512-26lTNXoVRdAnsaDXPpvCNUq+OVWEVC6bx7Vvz9rC53F2bagUWW4u4ii2+h8Fejfh7RYqPxn+libeFBBck9muEw==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.21.5"
+        "@babel/helper-plugin-utils": "^7.22.5"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1018,14 +999,14 @@
       }
     },
     "node_modules/@babel/plugin-transform-async-generator-functions": {
-      "version": "7.22.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-generator-functions/-/plugin-transform-async-generator-functions-7.22.3.tgz",
-      "integrity": "sha512-36A4Aq48t66btydbZd5Fk0/xJqbpg/v4QWI4AH4cYHBXy9Mu42UOupZpebKFiCFNT9S9rJFcsld0gsv0ayLjtA==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-generator-functions/-/plugin-transform-async-generator-functions-7.22.5.tgz",
+      "integrity": "sha512-gGOEvFzm3fWoyD5uZq7vVTD57pPJ3PczPUD/xCFGjzBpUosnklmXyKnGQbbbGs1NPNPskFex0j93yKbHt0cHyg==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-environment-visitor": "^7.22.1",
-        "@babel/helper-plugin-utils": "^7.21.5",
-        "@babel/helper-remap-async-to-generator": "^7.18.9",
+        "@babel/helper-environment-visitor": "^7.22.5",
+        "@babel/helper-plugin-utils": "^7.22.5",
+        "@babel/helper-remap-async-to-generator": "^7.22.5",
         "@babel/plugin-syntax-async-generators": "^7.8.4"
       },
       "engines": {
@@ -1036,14 +1017,14 @@
       }
     },
     "node_modules/@babel/plugin-transform-async-to-generator": {
-      "version": "7.20.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.20.7.tgz",
-      "integrity": "sha512-Uo5gwHPT9vgnSXQxqGtpdufUiWp96gk7yiP4Mp5bm1QMkEmLXBO7PAGYbKoJ6DhAwiNkcHFBol/x5zZZkL/t0Q==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.22.5.tgz",
+      "integrity": "sha512-b1A8D8ZzE/VhNDoV1MSJTnpKkCG5bJo+19R4o4oy03zM7ws8yEMK755j61Dc3EyvdysbqH5BOOTquJ7ZX9C6vQ==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-module-imports": "^7.18.6",
-        "@babel/helper-plugin-utils": "^7.20.2",
-        "@babel/helper-remap-async-to-generator": "^7.18.9"
+        "@babel/helper-module-imports": "^7.22.5",
+        "@babel/helper-plugin-utils": "^7.22.5",
+        "@babel/helper-remap-async-to-generator": "^7.22.5"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1053,12 +1034,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-block-scoped-functions": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.18.6.tgz",
-      "integrity": "sha512-ExUcOqpPWnliRcPqves5HJcJOvHvIIWfuS4sroBUenPuMdmW+SMHDakmtS7qOo13sVppmUijqeTv7qqGsvURpQ==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.22.5.tgz",
+      "integrity": "sha512-tdXZ2UdknEKQWKJP1KMNmuF5Lx3MymtMN/pvA+p/VEkhK8jVcQ1fzSy8KM9qRYhAf2/lV33hoMPKI/xaI9sADA==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.18.6"
+        "@babel/helper-plugin-utils": "^7.22.5"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1068,12 +1049,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-block-scoping": {
-      "version": "7.21.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.21.0.tgz",
-      "integrity": "sha512-Mdrbunoh9SxwFZapeHVrwFmri16+oYotcZysSzhNIVDwIAb1UV+kvnxULSYq9J3/q5MDG+4X6w8QVgD1zhBXNQ==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.22.5.tgz",
+      "integrity": "sha512-EcACl1i5fSQ6bt+YGuU/XGCeZKStLmyVGytWkpyhCLeQVA0eu6Wtiw92V+I1T/hnezUv7j74dA/Ro69gWcU+hg==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.20.2"
+        "@babel/helper-plugin-utils": "^7.22.5"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1083,13 +1064,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-class-properties": {
-      "version": "7.22.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-class-properties/-/plugin-transform-class-properties-7.22.3.tgz",
-      "integrity": "sha512-mASLsd6rhOrLZ5F3WbCxkzl67mmOnqik0zrg5W6D/X0QMW7HtvnoL1dRARLKIbMP3vXwkwziuLesPqWVGIl6Bw==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-class-properties/-/plugin-transform-class-properties-7.22.5.tgz",
+      "integrity": "sha512-nDkQ0NfkOhPTq8YCLiWNxp1+f9fCobEjCb0n8WdbNUBc4IB5V7P1QnX9IjpSoquKrXF5SKojHleVNs2vGeHCHQ==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-create-class-features-plugin": "^7.22.1",
-        "@babel/helper-plugin-utils": "^7.21.5"
+        "@babel/helper-create-class-features-plugin": "^7.22.5",
+        "@babel/helper-plugin-utils": "^7.22.5"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1099,13 +1080,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-class-static-block": {
-      "version": "7.22.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-class-static-block/-/plugin-transform-class-static-block-7.22.3.tgz",
-      "integrity": "sha512-5BirgNWNOx7cwbTJCOmKFJ1pZjwk5MUfMIwiBBvsirCJMZeQgs5pk6i1OlkVg+1Vef5LfBahFOrdCnAWvkVKMw==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-class-static-block/-/plugin-transform-class-static-block-7.22.5.tgz",
+      "integrity": "sha512-SPToJ5eYZLxlnp1UzdARpOGeC2GbHvr9d/UV0EukuVx8atktg194oe+C5BqQ8jRTkgLRVOPYeXRSBg1IlMoVRA==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-create-class-features-plugin": "^7.22.1",
-        "@babel/helper-plugin-utils": "^7.21.5",
+        "@babel/helper-create-class-features-plugin": "^7.22.5",
+        "@babel/helper-plugin-utils": "^7.22.5",
         "@babel/plugin-syntax-class-static-block": "^7.14.5"
       },
       "engines": {
@@ -1116,19 +1097,19 @@
       }
     },
     "node_modules/@babel/plugin-transform-classes": {
-      "version": "7.21.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.21.0.tgz",
-      "integrity": "sha512-RZhbYTCEUAe6ntPehC4hlslPWosNHDox+vAs4On/mCLRLfoDVHf6hVEd7kuxr1RnHwJmxFfUM3cZiZRmPxJPXQ==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-annotate-as-pure": "^7.18.6",
-        "@babel/helper-compilation-targets": "^7.20.7",
-        "@babel/helper-environment-visitor": "^7.18.9",
-        "@babel/helper-function-name": "^7.21.0",
-        "@babel/helper-optimise-call-expression": "^7.18.6",
-        "@babel/helper-plugin-utils": "^7.20.2",
-        "@babel/helper-replace-supers": "^7.20.7",
-        "@babel/helper-split-export-declaration": "^7.18.6",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.22.5.tgz",
+      "integrity": "sha512-2edQhLfibpWpsVBx2n/GKOz6JdGQvLruZQfGr9l1qes2KQaWswjBzhQF7UDUZMNaMMQeYnQzxwOMPsbYF7wqPQ==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-annotate-as-pure": "^7.22.5",
+        "@babel/helper-compilation-targets": "^7.22.5",
+        "@babel/helper-environment-visitor": "^7.22.5",
+        "@babel/helper-function-name": "^7.22.5",
+        "@babel/helper-optimise-call-expression": "^7.22.5",
+        "@babel/helper-plugin-utils": "^7.22.5",
+        "@babel/helper-replace-supers": "^7.22.5",
+        "@babel/helper-split-export-declaration": "^7.22.5",
         "globals": "^11.1.0"
       },
       "engines": {
@@ -1139,13 +1120,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-computed-properties": {
-      "version": "7.21.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.21.5.tgz",
-      "integrity": "sha512-TR653Ki3pAwxBxUe8srfF3e4Pe3FTA46uaNHYyQwIoM4oWKSoOZiDNyHJ0oIoDIUPSRQbQG7jzgVBX3FPVne1Q==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.22.5.tgz",
+      "integrity": "sha512-4GHWBgRf0krxPX+AaPtgBAlTgTeZmqDynokHOX7aqqAB4tHs3U2Y02zH6ETFdLZGcg9UQSD1WCmkVrE9ErHeOg==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.21.5",
-        "@babel/template": "^7.20.7"
+        "@babel/helper-plugin-utils": "^7.22.5",
+        "@babel/template": "^7.22.5"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1155,12 +1136,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-destructuring": {
-      "version": "7.21.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.21.3.tgz",
-      "integrity": "sha512-bp6hwMFzuiE4HqYEyoGJ/V2LeIWn+hLVKc4pnj++E5XQptwhtcGmSayM029d/j2X1bPKGTlsyPwAubuU22KhMA==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.22.5.tgz",
+      "integrity": "sha512-GfqcFuGW8vnEqTUBM7UtPd5A4q797LTvvwKxXTgRsFjoqaJiEg9deBG6kWeQYkVEL569NpnmpC0Pkr/8BLKGnQ==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.20.2"
+        "@babel/helper-plugin-utils": "^7.22.5"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1170,13 +1151,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-dotall-regex": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.18.6.tgz",
-      "integrity": "sha512-6S3jpun1eEbAxq7TdjLotAsl4WpQI9DxfkycRcKrjhQYzU87qpXdknpBg/e+TdcMehqGnLFi7tnFUBR02Vq6wg==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.22.5.tgz",
+      "integrity": "sha512-5/Yk9QxCQCl+sOIB1WelKnVRxTJDSAIxtJLL2/pqL14ZVlbH0fUQUZa/T5/UnQtBNgghR7mfB8ERBKyKPCi7Vw==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-create-regexp-features-plugin": "^7.18.6",
-        "@babel/helper-plugin-utils": "^7.18.6"
+        "@babel/helper-create-regexp-features-plugin": "^7.22.5",
+        "@babel/helper-plugin-utils": "^7.22.5"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1186,12 +1167,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-duplicate-keys": {
-      "version": "7.18.9",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.18.9.tgz",
-      "integrity": "sha512-d2bmXCtZXYc59/0SanQKbiWINadaJXqtvIQIzd4+hNwkWBgyCd5F/2t1kXoUdvPMrxzPvhK6EMQRROxsue+mfw==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.22.5.tgz",
+      "integrity": "sha512-dEnYD+9BBgld5VBXHnF/DbYGp3fqGMsyxKbtD1mDyIA7AkTSpKXFhCVuj/oQVOoALfBs77DudA0BE4d5mcpmqw==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.18.9"
+        "@babel/helper-plugin-utils": "^7.22.5"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1201,12 +1182,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-dynamic-import": {
-      "version": "7.22.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dynamic-import/-/plugin-transform-dynamic-import-7.22.1.tgz",
-      "integrity": "sha512-rlhWtONnVBPdmt+jeewS0qSnMz/3yLFrqAP8hHC6EDcrYRSyuz9f9yQhHvVn2Ad6+yO9fHXac5piudeYrInxwQ==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dynamic-import/-/plugin-transform-dynamic-import-7.22.5.tgz",
+      "integrity": "sha512-0MC3ppTB1AMxd8fXjSrbPa7LT9hrImt+/fcj+Pg5YMD7UQyWp/02+JWpdnCymmsXwIx5Z+sYn1bwCn4ZJNvhqQ==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.21.5",
+        "@babel/helper-plugin-utils": "^7.22.5",
         "@babel/plugin-syntax-dynamic-import": "^7.8.3"
       },
       "engines": {
@@ -1217,13 +1198,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-exponentiation-operator": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.18.6.tgz",
-      "integrity": "sha512-wzEtc0+2c88FVR34aQmiz56dxEkxr2g8DQb/KfaFa1JYXOFVsbhvAonFN6PwVWj++fKmku8NP80plJ5Et4wqHw==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.22.5.tgz",
+      "integrity": "sha512-vIpJFNM/FjZ4rh1myqIya9jXwrwwgFRHPjT3DkUA9ZLHuzox8jiXkOLvwm1H+PQIP3CqfC++WPKeuDi0Sjdj1g==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-builder-binary-assignment-operator-visitor": "^7.18.6",
-        "@babel/helper-plugin-utils": "^7.18.6"
+        "@babel/helper-builder-binary-assignment-operator-visitor": "^7.22.5",
+        "@babel/helper-plugin-utils": "^7.22.5"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1233,12 +1214,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-export-namespace-from": {
-      "version": "7.22.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-export-namespace-from/-/plugin-transform-export-namespace-from-7.22.3.tgz",
-      "integrity": "sha512-5Ti1cHLTDnt3vX61P9KZ5IG09bFXp4cDVFJIAeCZuxu9OXXJJZp5iP0n/rzM2+iAutJY+KWEyyHcRaHlpQ/P5g==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-export-namespace-from/-/plugin-transform-export-namespace-from-7.22.5.tgz",
+      "integrity": "sha512-X4hhm7FRnPgd4nDA4b/5V280xCx6oL7Oob5+9qVS5C13Zq4bh1qq7LU0GgRU6b5dBWBvhGaXYVB4AcN6+ol6vg==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.21.5",
+        "@babel/helper-plugin-utils": "^7.22.5",
         "@babel/plugin-syntax-export-namespace-from": "^7.8.3"
       },
       "engines": {
@@ -1249,12 +1230,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-for-of": {
-      "version": "7.21.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.21.5.tgz",
-      "integrity": "sha512-nYWpjKW/7j/I/mZkGVgHJXh4bA1sfdFnJoOXwJuj4m3Q2EraO/8ZyrkCau9P5tbHQk01RMSt6KYLCsW7730SXQ==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.22.5.tgz",
+      "integrity": "sha512-3kxQjX1dU9uudwSshyLeEipvrLjBCVthCgeTp6CzE/9JYrlAIaeekVxRpCWsDDfYTfRZRoCeZatCQvwo+wvK8A==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.21.5"
+        "@babel/helper-plugin-utils": "^7.22.5"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1264,14 +1245,14 @@
       }
     },
     "node_modules/@babel/plugin-transform-function-name": {
-      "version": "7.18.9",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.18.9.tgz",
-      "integrity": "sha512-WvIBoRPaJQ5yVHzcnJFor7oS5Ls0PYixlTYE63lCj2RtdQEl15M68FXQlxnG6wdraJIXRdR7KI+hQ7q/9QjrCQ==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.22.5.tgz",
+      "integrity": "sha512-UIzQNMS0p0HHiQm3oelztj+ECwFnj+ZRV4KnguvlsD2of1whUeM6o7wGNj6oLwcDoAXQ8gEqfgC24D+VdIcevg==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-compilation-targets": "^7.18.9",
-        "@babel/helper-function-name": "^7.18.9",
-        "@babel/helper-plugin-utils": "^7.18.9"
+        "@babel/helper-compilation-targets": "^7.22.5",
+        "@babel/helper-function-name": "^7.22.5",
+        "@babel/helper-plugin-utils": "^7.22.5"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1281,12 +1262,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-json-strings": {
-      "version": "7.22.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-json-strings/-/plugin-transform-json-strings-7.22.3.tgz",
-      "integrity": "sha512-IuvOMdeOOY2X4hRNAT6kwbePtK21BUyrAEgLKviL8pL6AEEVUVcqtRdN/HJXBLGIbt9T3ETmXRnFedRRmQNTYw==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-json-strings/-/plugin-transform-json-strings-7.22.5.tgz",
+      "integrity": "sha512-DuCRB7fu8MyTLbEQd1ew3R85nx/88yMoqo2uPSjevMj3yoN7CDM8jkgrY0wmVxfJZyJ/B9fE1iq7EQppWQmR5A==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.21.5",
+        "@babel/helper-plugin-utils": "^7.22.5",
         "@babel/plugin-syntax-json-strings": "^7.8.3"
       },
       "engines": {
@@ -1297,12 +1278,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-literals": {
-      "version": "7.18.9",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.18.9.tgz",
-      "integrity": "sha512-IFQDSRoTPnrAIrI5zoZv73IFeZu2dhu6irxQjY9rNjTT53VmKg9fenjvoiOWOkJ6mm4jKVPtdMzBY98Fp4Z4cg==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.22.5.tgz",
+      "integrity": "sha512-fTLj4D79M+mepcw3dgFBTIDYpbcB9Sm0bpm4ppXPaO+U+PKFFyV9MGRvS0gvGw62sd10kT5lRMKXAADb9pWy8g==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.18.9"
+        "@babel/helper-plugin-utils": "^7.22.5"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1312,12 +1293,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-logical-assignment-operators": {
-      "version": "7.22.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-logical-assignment-operators/-/plugin-transform-logical-assignment-operators-7.22.3.tgz",
-      "integrity": "sha512-CbayIfOw4av2v/HYZEsH+Klks3NC2/MFIR3QR8gnpGNNPEaq2fdlVCRYG/paKs7/5hvBLQ+H70pGWOHtlNEWNA==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-logical-assignment-operators/-/plugin-transform-logical-assignment-operators-7.22.5.tgz",
+      "integrity": "sha512-MQQOUW1KL8X0cDWfbwYP+TbVbZm16QmQXJQ+vndPtH/BoO0lOKpVoEDMI7+PskYxH+IiE0tS8xZye0qr1lGzSA==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.21.5",
+        "@babel/helper-plugin-utils": "^7.22.5",
         "@babel/plugin-syntax-logical-assignment-operators": "^7.10.4"
       },
       "engines": {
@@ -1328,12 +1309,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-member-expression-literals": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.18.6.tgz",
-      "integrity": "sha512-qSF1ihLGO3q+/g48k85tUjD033C29TNTVB2paCwZPVmOsjn9pClvYYrM2VeJpBY2bcNkuny0YUyTNRyRxJ54KA==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.22.5.tgz",
+      "integrity": "sha512-RZEdkNtzzYCFl9SE9ATaUMTj2hqMb4StarOJLrZRbqqU4HSBE7UlBw9WBWQiDzrJZJdUWiMTVDI6Gv/8DPvfew==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.18.6"
+        "@babel/helper-plugin-utils": "^7.22.5"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1343,13 +1324,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-modules-amd": {
-      "version": "7.20.11",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.20.11.tgz",
-      "integrity": "sha512-NuzCt5IIYOW0O30UvqktzHYR2ud5bOWbY0yaxWZ6G+aFzOMJvrs5YHNikrbdaT15+KNO31nPOy5Fim3ku6Zb5g==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.22.5.tgz",
+      "integrity": "sha512-R+PTfLTcYEmb1+kK7FNkhQ1gP4KgjpSO6HfH9+f8/yfp2Nt3ggBjiVpRwmwTlfqZLafYKJACy36yDXlEmI9HjQ==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-module-transforms": "^7.20.11",
-        "@babel/helper-plugin-utils": "^7.20.2"
+        "@babel/helper-module-transforms": "^7.22.5",
+        "@babel/helper-plugin-utils": "^7.22.5"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1359,14 +1340,14 @@
       }
     },
     "node_modules/@babel/plugin-transform-modules-commonjs": {
-      "version": "7.21.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.21.5.tgz",
-      "integrity": "sha512-OVryBEgKUbtqMoB7eG2rs6UFexJi6Zj6FDXx+esBLPTCxCNxAY9o+8Di7IsUGJ+AVhp5ncK0fxWUBd0/1gPhrQ==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.22.5.tgz",
+      "integrity": "sha512-B4pzOXj+ONRmuaQTg05b3y/4DuFz3WcCNAXPLb2Q0GT0TrGKGxNKV4jwsXts+StaM0LQczZbOpj8o1DLPDJIiA==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-module-transforms": "^7.21.5",
-        "@babel/helper-plugin-utils": "^7.21.5",
-        "@babel/helper-simple-access": "^7.21.5"
+        "@babel/helper-module-transforms": "^7.22.5",
+        "@babel/helper-plugin-utils": "^7.22.5",
+        "@babel/helper-simple-access": "^7.22.5"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1376,15 +1357,15 @@
       }
     },
     "node_modules/@babel/plugin-transform-modules-systemjs": {
-      "version": "7.22.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.22.3.tgz",
-      "integrity": "sha512-V21W3bKLxO3ZjcBJZ8biSvo5gQ85uIXW2vJfh7JSWf/4SLUSr1tOoHX3ruN4+Oqa2m+BKfsxTR1I+PsvkIWvNw==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.22.5.tgz",
+      "integrity": "sha512-emtEpoaTMsOs6Tzz+nbmcePl6AKVtS1yC4YNAeMun9U8YCsgadPNxnOPQ8GhHFB2qdx+LZu9LgoC0Lthuu05DQ==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-hoist-variables": "^7.18.6",
-        "@babel/helper-module-transforms": "^7.22.1",
-        "@babel/helper-plugin-utils": "^7.21.5",
-        "@babel/helper-validator-identifier": "^7.19.1"
+        "@babel/helper-hoist-variables": "^7.22.5",
+        "@babel/helper-module-transforms": "^7.22.5",
+        "@babel/helper-plugin-utils": "^7.22.5",
+        "@babel/helper-validator-identifier": "^7.22.5"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1394,13 +1375,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-modules-umd": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.18.6.tgz",
-      "integrity": "sha512-dcegErExVeXcRqNtkRU/z8WlBLnvD4MRnHgNs3MytRO1Mn1sHRyhbcpYbVMGclAqOjdW+9cfkdZno9dFdfKLfQ==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.22.5.tgz",
+      "integrity": "sha512-+S6kzefN/E1vkSsKx8kmQuqeQsvCKCd1fraCM7zXm4SFoggI099Tr4G8U81+5gtMdUeMQ4ipdQffbKLX0/7dBQ==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-module-transforms": "^7.18.6",
-        "@babel/helper-plugin-utils": "^7.18.6"
+        "@babel/helper-module-transforms": "^7.22.5",
+        "@babel/helper-plugin-utils": "^7.22.5"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1410,13 +1391,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-named-capturing-groups-regex": {
-      "version": "7.22.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.22.3.tgz",
-      "integrity": "sha512-c6HrD/LpUdNNJsISQZpds3TXvfYIAbo+efE9aWmY/PmSRD0agrJ9cPMt4BmArwUQ7ZymEWTFjTyp+yReLJZh0Q==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.22.5.tgz",
+      "integrity": "sha512-YgLLKmS3aUBhHaxp5hi1WJTgOUb/NCuDHzGT9z9WTt3YG+CPRhJs6nprbStx6DnWM4dh6gt7SU3sZodbZ08adQ==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-create-regexp-features-plugin": "^7.22.1",
-        "@babel/helper-plugin-utils": "^7.21.5"
+        "@babel/helper-create-regexp-features-plugin": "^7.22.5",
+        "@babel/helper-plugin-utils": "^7.22.5"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1426,12 +1407,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-new-target": {
-      "version": "7.22.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.22.3.tgz",
-      "integrity": "sha512-5RuJdSo89wKdkRTqtM9RVVJzHum9c2s0te9rB7vZC1zKKxcioWIy+xcu4OoIAjyFZhb/bp5KkunuLin1q7Ct+w==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.22.5.tgz",
+      "integrity": "sha512-AsF7K0Fx/cNKVyk3a+DW0JLo+Ua598/NxMRvxDnkpCIGFh43+h/v2xyhRUYf6oD8gE4QtL83C7zZVghMjHd+iw==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.21.5"
+        "@babel/helper-plugin-utils": "^7.22.5"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1441,12 +1422,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-nullish-coalescing-operator": {
-      "version": "7.22.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-nullish-coalescing-operator/-/plugin-transform-nullish-coalescing-operator-7.22.3.tgz",
-      "integrity": "sha512-CpaoNp16nX7ROtLONNuCyenYdY/l7ZsR6aoVa7rW7nMWisoNoQNIH5Iay/4LDyRjKMuElMqXiBoOQCDLTMGZiw==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-nullish-coalescing-operator/-/plugin-transform-nullish-coalescing-operator-7.22.5.tgz",
+      "integrity": "sha512-6CF8g6z1dNYZ/VXok5uYkkBBICHZPiGEl7oDnAx2Mt1hlHVHOSIKWJaXHjQJA5VB43KZnXZDIexMchY4y2PGdA==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.21.5",
+        "@babel/helper-plugin-utils": "^7.22.5",
         "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3"
       },
       "engines": {
@@ -1457,12 +1438,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-numeric-separator": {
-      "version": "7.22.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-numeric-separator/-/plugin-transform-numeric-separator-7.22.3.tgz",
-      "integrity": "sha512-+AF88fPDJrnseMh5vD9+SH6wq4ZMvpiTMHh58uLs+giMEyASFVhcT3NkoyO+NebFCNnpHJEq5AXO2txV4AGPDQ==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-numeric-separator/-/plugin-transform-numeric-separator-7.22.5.tgz",
+      "integrity": "sha512-NbslED1/6M+sXiwwtcAB/nieypGw02Ejf4KtDeMkCEpP6gWFMX1wI9WKYua+4oBneCCEmulOkRpwywypVZzs/g==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.21.5",
+        "@babel/helper-plugin-utils": "^7.22.5",
         "@babel/plugin-syntax-numeric-separator": "^7.10.4"
       },
       "engines": {
@@ -1473,16 +1454,16 @@
       }
     },
     "node_modules/@babel/plugin-transform-object-rest-spread": {
-      "version": "7.22.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-rest-spread/-/plugin-transform-object-rest-spread-7.22.3.tgz",
-      "integrity": "sha512-38bzTsqMMCI46/TQnJwPPpy33EjLCc1Gsm2hRTF6zTMWnKsN61vdrpuzIEGQyKEhDSYDKyZHrrd5FMj4gcUHhw==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-rest-spread/-/plugin-transform-object-rest-spread-7.22.5.tgz",
+      "integrity": "sha512-Kk3lyDmEslH9DnvCDA1s1kkd3YWQITiBOHngOtDL9Pt6BZjzqb6hiOlb8VfjiiQJ2unmegBqZu0rx5RxJb5vmQ==",
       "dev": true,
       "dependencies": {
-        "@babel/compat-data": "^7.22.3",
-        "@babel/helper-compilation-targets": "^7.22.1",
-        "@babel/helper-plugin-utils": "^7.21.5",
+        "@babel/compat-data": "^7.22.5",
+        "@babel/helper-compilation-targets": "^7.22.5",
+        "@babel/helper-plugin-utils": "^7.22.5",
         "@babel/plugin-syntax-object-rest-spread": "^7.8.3",
-        "@babel/plugin-transform-parameters": "^7.22.3"
+        "@babel/plugin-transform-parameters": "^7.22.5"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1492,13 +1473,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-object-super": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.18.6.tgz",
-      "integrity": "sha512-uvGz6zk+pZoS1aTZrOvrbj6Pp/kK2mp45t2B+bTDre2UgsZZ8EZLSJtUg7m/no0zOJUWgFONpB7Zv9W2tSaFlA==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.22.5.tgz",
+      "integrity": "sha512-klXqyaT9trSjIUrcsYIfETAzmOEZL3cBYqOYLJxBHfMFFggmXOv+NYSX/Jbs9mzMVESw/WycLFPRx8ba/b2Ipw==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.18.6",
-        "@babel/helper-replace-supers": "^7.18.6"
+        "@babel/helper-plugin-utils": "^7.22.5",
+        "@babel/helper-replace-supers": "^7.22.5"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1508,12 +1489,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-optional-catch-binding": {
-      "version": "7.22.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-optional-catch-binding/-/plugin-transform-optional-catch-binding-7.22.3.tgz",
-      "integrity": "sha512-bnDFWXFzWY0BsOyqaoSXvMQ2F35zutQipugog/rqotL2S4ciFOKlRYUu9djt4iq09oh2/34hqfRR2k1dIvuu4g==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-optional-catch-binding/-/plugin-transform-optional-catch-binding-7.22.5.tgz",
+      "integrity": "sha512-pH8orJahy+hzZje5b8e2QIlBWQvGpelS76C63Z+jhZKsmzfNaPQ+LaW6dcJ9bxTpo1mtXbgHwy765Ro3jftmUg==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.21.5",
+        "@babel/helper-plugin-utils": "^7.22.5",
         "@babel/plugin-syntax-optional-catch-binding": "^7.8.3"
       },
       "engines": {
@@ -1524,13 +1505,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-optional-chaining": {
-      "version": "7.22.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-optional-chaining/-/plugin-transform-optional-chaining-7.22.3.tgz",
-      "integrity": "sha512-63v3/UFFxhPKT8j8u1jTTGVyITxl7/7AfOqK8C5gz1rHURPUGe3y5mvIf68eYKGoBNahtJnTxBKug4BQOnzeJg==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-optional-chaining/-/plugin-transform-optional-chaining-7.22.5.tgz",
+      "integrity": "sha512-AconbMKOMkyG+xCng2JogMCDcqW8wedQAqpVIL4cOSescZ7+iW8utC6YDZLMCSUIReEA733gzRSaOSXMAt/4WQ==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.21.5",
-        "@babel/helper-skip-transparent-expression-wrappers": "^7.20.0",
+        "@babel/helper-plugin-utils": "^7.22.5",
+        "@babel/helper-skip-transparent-expression-wrappers": "^7.22.5",
         "@babel/plugin-syntax-optional-chaining": "^7.8.3"
       },
       "engines": {
@@ -1541,12 +1522,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-parameters": {
-      "version": "7.22.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.22.3.tgz",
-      "integrity": "sha512-x7QHQJHPuD9VmfpzboyGJ5aHEr9r7DsAsdxdhJiTB3J3j8dyl+NFZ+rX5Q2RWFDCs61c06qBfS4ys2QYn8UkMw==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.22.5.tgz",
+      "integrity": "sha512-AVkFUBurORBREOmHRKo06FjHYgjrabpdqRSwq6+C7R5iTCZOsM4QbcB27St0a4U6fffyAOqh3s/qEfybAhfivg==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.21.5"
+        "@babel/helper-plugin-utils": "^7.22.5"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1556,13 +1537,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-private-methods": {
-      "version": "7.22.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-private-methods/-/plugin-transform-private-methods-7.22.3.tgz",
-      "integrity": "sha512-fC7jtjBPFqhqpPAE+O4LKwnLq7gGkD3ZmC2E3i4qWH34mH3gOg2Xrq5YMHUq6DM30xhqM1DNftiRaSqVjEG+ug==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-private-methods/-/plugin-transform-private-methods-7.22.5.tgz",
+      "integrity": "sha512-PPjh4gyrQnGe97JTalgRGMuU4icsZFnWkzicB/fUtzlKUqvsWBKEpPPfr5a2JiyirZkHxnAqkQMO5Z5B2kK3fA==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-create-class-features-plugin": "^7.22.1",
-        "@babel/helper-plugin-utils": "^7.21.5"
+        "@babel/helper-create-class-features-plugin": "^7.22.5",
+        "@babel/helper-plugin-utils": "^7.22.5"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1572,14 +1553,14 @@
       }
     },
     "node_modules/@babel/plugin-transform-private-property-in-object": {
-      "version": "7.22.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-private-property-in-object/-/plugin-transform-private-property-in-object-7.22.3.tgz",
-      "integrity": "sha512-C7MMl4qWLpgVCbXfj3UW8rR1xeCnisQ0cU7YJHV//8oNBS0aCIVg1vFnZXxOckHhEpQyqNNkWmvSEWnMLlc+Vw==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-private-property-in-object/-/plugin-transform-private-property-in-object-7.22.5.tgz",
+      "integrity": "sha512-/9xnaTTJcVoBtSSmrVyhtSvO3kbqS2ODoh2juEU72c3aYonNF0OMGiaz2gjukyKM2wBBYJP38S4JiE0Wfb5VMQ==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-annotate-as-pure": "^7.18.6",
-        "@babel/helper-create-class-features-plugin": "^7.22.1",
-        "@babel/helper-plugin-utils": "^7.21.5",
+        "@babel/helper-annotate-as-pure": "^7.22.5",
+        "@babel/helper-create-class-features-plugin": "^7.22.5",
+        "@babel/helper-plugin-utils": "^7.22.5",
         "@babel/plugin-syntax-private-property-in-object": "^7.14.5"
       },
       "engines": {
@@ -1590,12 +1571,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-property-literals": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.18.6.tgz",
-      "integrity": "sha512-cYcs6qlgafTud3PAzrrRNbQtfpQ8+y/+M5tKmksS9+M1ckbH6kzY8MrexEM9mcA6JDsukE19iIRvAyYl463sMg==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.22.5.tgz",
+      "integrity": "sha512-TiOArgddK3mK/x1Qwf5hay2pxI6wCZnvQqrFSqbtg1GLl2JcNMitVH/YnqjP+M31pLUeTfzY1HAXFDnUBV30rQ==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.18.6"
+        "@babel/helper-plugin-utils": "^7.22.5"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1605,12 +1586,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-regenerator": {
-      "version": "7.21.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.21.5.tgz",
-      "integrity": "sha512-ZoYBKDb6LyMi5yCsByQ5jmXsHAQDDYeexT1Szvlmui+lADvfSecr5Dxd/PkrTC3pAD182Fcju1VQkB4oCp9M+w==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.22.5.tgz",
+      "integrity": "sha512-rR7KePOE7gfEtNTh9Qw+iO3Q/e4DEsoQ+hdvM6QUDH7JRJ5qxq5AA52ZzBWbI5i9lfNuvySgOGP8ZN7LAmaiPw==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.21.5",
+        "@babel/helper-plugin-utils": "^7.22.5",
         "regenerator-transform": "^0.15.1"
       },
       "engines": {
@@ -1621,12 +1602,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-reserved-words": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.18.6.tgz",
-      "integrity": "sha512-oX/4MyMoypzHjFrT1CdivfKZ+XvIPMFXwwxHp/r0Ddy2Vuomt4HDFGmft1TAY2yiTKiNSsh3kjBAzcM8kSdsjA==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.22.5.tgz",
+      "integrity": "sha512-DTtGKFRQUDm8svigJzZHzb/2xatPc6TzNvAIJ5GqOKDsGFYgAskjRulbR/vGsPKq3OPqtexnz327qYpP57RFyA==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.18.6"
+        "@babel/helper-plugin-utils": "^7.22.5"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1667,12 +1648,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-shorthand-properties": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.18.6.tgz",
-      "integrity": "sha512-eCLXXJqv8okzg86ywZJbRn19YJHU4XUa55oz2wbHhaQVn/MM+XhukiT7SYqp/7o00dg52Rj51Ny+Ecw4oyoygw==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.22.5.tgz",
+      "integrity": "sha512-vM4fq9IXHscXVKzDv5itkO1X52SmdFBFcMIBZ2FRn2nqVYqw6dBexUgMvAjHW+KXpPPViD/Yo3GrDEBaRC0QYA==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.18.6"
+        "@babel/helper-plugin-utils": "^7.22.5"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1682,13 +1663,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-spread": {
-      "version": "7.20.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.20.7.tgz",
-      "integrity": "sha512-ewBbHQ+1U/VnH1fxltbJqDeWBU1oNLG8Dj11uIv3xVf7nrQu0bPGe5Rf716r7K5Qz+SqtAOVswoVunoiBtGhxw==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.22.5.tgz",
+      "integrity": "sha512-5ZzDQIGyvN4w8+dMmpohL6MBo+l2G7tfC/O2Dg7/hjpgeWvUx8FzfeOKxGog9IimPa4YekaQ9PlDqTLOljkcxg==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.20.2",
-        "@babel/helper-skip-transparent-expression-wrappers": "^7.20.0"
+        "@babel/helper-plugin-utils": "^7.22.5",
+        "@babel/helper-skip-transparent-expression-wrappers": "^7.22.5"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1698,12 +1679,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-sticky-regex": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.18.6.tgz",
-      "integrity": "sha512-kfiDrDQ+PBsQDO85yj1icueWMfGfJFKN1KCkndygtu/C9+XUfydLC8Iv5UYJqRwy4zk8EcplRxEOeLyjq1gm6Q==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.22.5.tgz",
+      "integrity": "sha512-zf7LuNpHG0iEeiyCNwX4j3gDg1jgt1k3ZdXBKbZSoA3BbGQGvMiSvfbZRR3Dr3aeJe3ooWFZxOOG3IRStYp2Bw==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.18.6"
+        "@babel/helper-plugin-utils": "^7.22.5"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1713,12 +1694,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-template-literals": {
-      "version": "7.18.9",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.18.9.tgz",
-      "integrity": "sha512-S8cOWfT82gTezpYOiVaGHrCbhlHgKhQt8XH5ES46P2XWmX92yisoZywf5km75wv5sYcXDUCLMmMxOLCtthDgMA==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.22.5.tgz",
+      "integrity": "sha512-5ciOehRNf+EyUeewo8NkbQiUs4d6ZxiHo6BcBcnFlgiJfu16q0bQUw9Jvo0b0gBKFG1SMhDSjeKXSYuJLeFSMA==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.18.9"
+        "@babel/helper-plugin-utils": "^7.22.5"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1728,12 +1709,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-typeof-symbol": {
-      "version": "7.18.9",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.18.9.tgz",
-      "integrity": "sha512-SRfwTtF11G2aemAZWivL7PD+C9z52v9EvMqH9BuYbabyPuKUvSWks3oCg6041pT925L4zVFqaVBeECwsmlguEw==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.22.5.tgz",
+      "integrity": "sha512-bYkI5lMzL4kPii4HHEEChkD0rkc+nvnlR6+o/qdqR6zrm0Sv/nodmyLhlq2DO0YKLUNd2VePmPRjJXSBh9OIdA==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.18.9"
+        "@babel/helper-plugin-utils": "^7.22.5"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1743,12 +1724,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-unicode-escapes": {
-      "version": "7.21.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.21.5.tgz",
-      "integrity": "sha512-LYm/gTOwZqsYohlvFUe/8Tujz75LqqVC2w+2qPHLR+WyWHGCZPN1KBpJCJn+4Bk4gOkQy/IXKIge6az5MqwlOg==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.22.5.tgz",
+      "integrity": "sha512-biEmVg1IYB/raUO5wT1tgfacCef15Fbzhkx493D3urBI++6hpJ+RFG4SrWMn0NEZLfvilqKf3QDrRVZHo08FYg==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.21.5"
+        "@babel/helper-plugin-utils": "^7.22.5"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1758,13 +1739,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-unicode-property-regex": {
-      "version": "7.22.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-property-regex/-/plugin-transform-unicode-property-regex-7.22.3.tgz",
-      "integrity": "sha512-5ScJ+OmdX+O6HRuMGW4kv7RL9vIKdtdAj9wuWUKy1wbHY3jaM/UlyIiC1G7J6UJiiyMukjjK0QwL3P0vBd0yYg==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-property-regex/-/plugin-transform-unicode-property-regex-7.22.5.tgz",
+      "integrity": "sha512-HCCIb+CbJIAE6sXn5CjFQXMwkCClcOfPCzTlilJ8cUatfzwHlWQkbtV0zD338u9dZskwvuOYTuuaMaA8J5EI5A==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-create-regexp-features-plugin": "^7.22.1",
-        "@babel/helper-plugin-utils": "^7.21.5"
+        "@babel/helper-create-regexp-features-plugin": "^7.22.5",
+        "@babel/helper-plugin-utils": "^7.22.5"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1774,13 +1755,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-unicode-regex": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.18.6.tgz",
-      "integrity": "sha512-gE7A6Lt7YLnNOL3Pb9BNeZvi+d8l7tcRrG4+pwJjK9hD2xX4mEvjlQW60G9EEmfXVYRPv9VRQcyegIVHCql/AA==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.22.5.tgz",
+      "integrity": "sha512-028laaOKptN5vHJf9/Arr/HiJekMd41hOEZYvNsrsXqJ7YPYuX2bQxh31fkZzGmq3YqHRJzYFFAVYvKfMPKqyg==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-create-regexp-features-plugin": "^7.18.6",
-        "@babel/helper-plugin-utils": "^7.18.6"
+        "@babel/helper-create-regexp-features-plugin": "^7.22.5",
+        "@babel/helper-plugin-utils": "^7.22.5"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1790,13 +1771,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-unicode-sets-regex": {
-      "version": "7.22.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-sets-regex/-/plugin-transform-unicode-sets-regex-7.22.3.tgz",
-      "integrity": "sha512-hNufLdkF8vqywRp+P55j4FHXqAX2LRUccoZHH7AFn1pq5ZOO2ISKW9w13bFZVjBoTqeve2HOgoJCcaziJVhGNw==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-sets-regex/-/plugin-transform-unicode-sets-regex-7.22.5.tgz",
+      "integrity": "sha512-lhMfi4FC15j13eKrh3DnYHjpGj6UKQHtNKTbtc1igvAhRy4+kLhV07OpLcsN0VgDEw/MjAvJO4BdMJsHwMhzCg==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-create-regexp-features-plugin": "^7.22.1",
-        "@babel/helper-plugin-utils": "^7.21.5"
+        "@babel/helper-create-regexp-features-plugin": "^7.22.5",
+        "@babel/helper-plugin-utils": "^7.22.5"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1806,25 +1787,25 @@
       }
     },
     "node_modules/@babel/preset-env": {
-      "version": "7.22.4",
-      "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.22.4.tgz",
-      "integrity": "sha512-c3lHOjbwBv0TkhYCr+XCR6wKcSZ1QbQTVdSkZUaVpLv8CVWotBMArWUi5UAJrcrQaEnleVkkvaV8F/pmc/STZQ==",
-      "dev": true,
-      "dependencies": {
-        "@babel/compat-data": "^7.22.3",
-        "@babel/helper-compilation-targets": "^7.22.1",
-        "@babel/helper-plugin-utils": "^7.21.5",
-        "@babel/helper-validator-option": "^7.21.0",
-        "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": "^7.18.6",
-        "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": "^7.22.3",
-        "@babel/plugin-proposal-private-property-in-object": "^7.21.0",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.22.5.tgz",
+      "integrity": "sha512-fj06hw89dpiZzGZtxn+QybifF07nNiZjZ7sazs2aVDcysAZVGjW7+7iFYxg6GLNM47R/thYfLdrXc+2f11Vi9A==",
+      "dev": true,
+      "dependencies": {
+        "@babel/compat-data": "^7.22.5",
+        "@babel/helper-compilation-targets": "^7.22.5",
+        "@babel/helper-plugin-utils": "^7.22.5",
+        "@babel/helper-validator-option": "^7.22.5",
+        "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": "^7.22.5",
+        "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": "^7.22.5",
+        "@babel/plugin-proposal-private-property-in-object": "7.21.0-placeholder-for-preset-env.2",
         "@babel/plugin-syntax-async-generators": "^7.8.4",
         "@babel/plugin-syntax-class-properties": "^7.12.13",
         "@babel/plugin-syntax-class-static-block": "^7.14.5",
         "@babel/plugin-syntax-dynamic-import": "^7.8.3",
         "@babel/plugin-syntax-export-namespace-from": "^7.8.3",
-        "@babel/plugin-syntax-import-assertions": "^7.20.0",
-        "@babel/plugin-syntax-import-attributes": "^7.22.3",
+        "@babel/plugin-syntax-import-assertions": "^7.22.5",
+        "@babel/plugin-syntax-import-attributes": "^7.22.5",
         "@babel/plugin-syntax-import-meta": "^7.10.4",
         "@babel/plugin-syntax-json-strings": "^7.8.3",
         "@babel/plugin-syntax-logical-assignment-operators": "^7.10.4",
@@ -1836,56 +1817,56 @@
         "@babel/plugin-syntax-private-property-in-object": "^7.14.5",
         "@babel/plugin-syntax-top-level-await": "^7.14.5",
         "@babel/plugin-syntax-unicode-sets-regex": "^7.18.6",
-        "@babel/plugin-transform-arrow-functions": "^7.21.5",
-        "@babel/plugin-transform-async-generator-functions": "^7.22.3",
-        "@babel/plugin-transform-async-to-generator": "^7.20.7",
-        "@babel/plugin-transform-block-scoped-functions": "^7.18.6",
-        "@babel/plugin-transform-block-scoping": "^7.21.0",
-        "@babel/plugin-transform-class-properties": "^7.22.3",
-        "@babel/plugin-transform-class-static-block": "^7.22.3",
-        "@babel/plugin-transform-classes": "^7.21.0",
-        "@babel/plugin-transform-computed-properties": "^7.21.5",
-        "@babel/plugin-transform-destructuring": "^7.21.3",
-        "@babel/plugin-transform-dotall-regex": "^7.18.6",
-        "@babel/plugin-transform-duplicate-keys": "^7.18.9",
-        "@babel/plugin-transform-dynamic-import": "^7.22.1",
-        "@babel/plugin-transform-exponentiation-operator": "^7.18.6",
-        "@babel/plugin-transform-export-namespace-from": "^7.22.3",
-        "@babel/plugin-transform-for-of": "^7.21.5",
-        "@babel/plugin-transform-function-name": "^7.18.9",
-        "@babel/plugin-transform-json-strings": "^7.22.3",
-        "@babel/plugin-transform-literals": "^7.18.9",
-        "@babel/plugin-transform-logical-assignment-operators": "^7.22.3",
-        "@babel/plugin-transform-member-expression-literals": "^7.18.6",
-        "@babel/plugin-transform-modules-amd": "^7.20.11",
-        "@babel/plugin-transform-modules-commonjs": "^7.21.5",
-        "@babel/plugin-transform-modules-systemjs": "^7.22.3",
-        "@babel/plugin-transform-modules-umd": "^7.18.6",
-        "@babel/plugin-transform-named-capturing-groups-regex": "^7.22.3",
-        "@babel/plugin-transform-new-target": "^7.22.3",
-        "@babel/plugin-transform-nullish-coalescing-operator": "^7.22.3",
-        "@babel/plugin-transform-numeric-separator": "^7.22.3",
-        "@babel/plugin-transform-object-rest-spread": "^7.22.3",
-        "@babel/plugin-transform-object-super": "^7.18.6",
-        "@babel/plugin-transform-optional-catch-binding": "^7.22.3",
-        "@babel/plugin-transform-optional-chaining": "^7.22.3",
-        "@babel/plugin-transform-parameters": "^7.22.3",
-        "@babel/plugin-transform-private-methods": "^7.22.3",
-        "@babel/plugin-transform-private-property-in-object": "^7.22.3",
-        "@babel/plugin-transform-property-literals": "^7.18.6",
-        "@babel/plugin-transform-regenerator": "^7.21.5",
-        "@babel/plugin-transform-reserved-words": "^7.18.6",
-        "@babel/plugin-transform-shorthand-properties": "^7.18.6",
-        "@babel/plugin-transform-spread": "^7.20.7",
-        "@babel/plugin-transform-sticky-regex": "^7.18.6",
-        "@babel/plugin-transform-template-literals": "^7.18.9",
-        "@babel/plugin-transform-typeof-symbol": "^7.18.9",
-        "@babel/plugin-transform-unicode-escapes": "^7.21.5",
-        "@babel/plugin-transform-unicode-property-regex": "^7.22.3",
-        "@babel/plugin-transform-unicode-regex": "^7.18.6",
-        "@babel/plugin-transform-unicode-sets-regex": "^7.22.3",
+        "@babel/plugin-transform-arrow-functions": "^7.22.5",
+        "@babel/plugin-transform-async-generator-functions": "^7.22.5",
+        "@babel/plugin-transform-async-to-generator": "^7.22.5",
+        "@babel/plugin-transform-block-scoped-functions": "^7.22.5",
+        "@babel/plugin-transform-block-scoping": "^7.22.5",
+        "@babel/plugin-transform-class-properties": "^7.22.5",
+        "@babel/plugin-transform-class-static-block": "^7.22.5",
+        "@babel/plugin-transform-classes": "^7.22.5",
+        "@babel/plugin-transform-computed-properties": "^7.22.5",
+        "@babel/plugin-transform-destructuring": "^7.22.5",
+        "@babel/plugin-transform-dotall-regex": "^7.22.5",
+        "@babel/plugin-transform-duplicate-keys": "^7.22.5",
+        "@babel/plugin-transform-dynamic-import": "^7.22.5",
+        "@babel/plugin-transform-exponentiation-operator": "^7.22.5",
+        "@babel/plugin-transform-export-namespace-from": "^7.22.5",
+        "@babel/plugin-transform-for-of": "^7.22.5",
+        "@babel/plugin-transform-function-name": "^7.22.5",
+        "@babel/plugin-transform-json-strings": "^7.22.5",
+        "@babel/plugin-transform-literals": "^7.22.5",
+        "@babel/plugin-transform-logical-assignment-operators": "^7.22.5",
+        "@babel/plugin-transform-member-expression-literals": "^7.22.5",
+        "@babel/plugin-transform-modules-amd": "^7.22.5",
+        "@babel/plugin-transform-modules-commonjs": "^7.22.5",
+        "@babel/plugin-transform-modules-systemjs": "^7.22.5",
+        "@babel/plugin-transform-modules-umd": "^7.22.5",
+        "@babel/plugin-transform-named-capturing-groups-regex": "^7.22.5",
+        "@babel/plugin-transform-new-target": "^7.22.5",
+        "@babel/plugin-transform-nullish-coalescing-operator": "^7.22.5",
+        "@babel/plugin-transform-numeric-separator": "^7.22.5",
+        "@babel/plugin-transform-object-rest-spread": "^7.22.5",
+        "@babel/plugin-transform-object-super": "^7.22.5",
+        "@babel/plugin-transform-optional-catch-binding": "^7.22.5",
+        "@babel/plugin-transform-optional-chaining": "^7.22.5",
+        "@babel/plugin-transform-parameters": "^7.22.5",
+        "@babel/plugin-transform-private-methods": "^7.22.5",
+        "@babel/plugin-transform-private-property-in-object": "^7.22.5",
+        "@babel/plugin-transform-property-literals": "^7.22.5",
+        "@babel/plugin-transform-regenerator": "^7.22.5",
+        "@babel/plugin-transform-reserved-words": "^7.22.5",
+        "@babel/plugin-transform-shorthand-properties": "^7.22.5",
+        "@babel/plugin-transform-spread": "^7.22.5",
+        "@babel/plugin-transform-sticky-regex": "^7.22.5",
+        "@babel/plugin-transform-template-literals": "^7.22.5",
+        "@babel/plugin-transform-typeof-symbol": "^7.22.5",
+        "@babel/plugin-transform-unicode-escapes": "^7.22.5",
+        "@babel/plugin-transform-unicode-property-regex": "^7.22.5",
+        "@babel/plugin-transform-unicode-regex": "^7.22.5",
+        "@babel/plugin-transform-unicode-sets-regex": "^7.22.5",
         "@babel/preset-modules": "^0.1.5",
-        "@babel/types": "^7.22.4",
+        "@babel/types": "^7.22.5",
         "babel-plugin-polyfill-corejs2": "^0.4.3",
         "babel-plugin-polyfill-corejs3": "^0.8.1",
         "babel-plugin-polyfill-regenerator": "^0.5.0",
@@ -1976,31 +1957,31 @@
       }
     },
     "node_modules/@babel/template": {
-      "version": "7.21.9",
-      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.21.9.tgz",
-      "integrity": "sha512-MK0X5k8NKOuWRamiEfc3KEJiHMTkGZNUjzMipqCGDDc6ijRl/B7RGSKVGncu4Ro/HdyzzY6cmoXuKI2Gffk7vQ==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.22.5.tgz",
+      "integrity": "sha512-X7yV7eiwAxdj9k94NEylvbVHLiVG1nvzCV2EAowhxLTwODV1jl9UzZ48leOC0sH7OnuHrIkllaBgneUykIcZaw==",
       "dependencies": {
-        "@babel/code-frame": "^7.21.4",
-        "@babel/parser": "^7.21.9",
-        "@babel/types": "^7.21.5"
+        "@babel/code-frame": "^7.22.5",
+        "@babel/parser": "^7.22.5",
+        "@babel/types": "^7.22.5"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/traverse": {
-      "version": "7.22.1",
-      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.22.1.tgz",
-      "integrity": "sha512-lAWkdCoUFnmwLBhIRLciFntGYsIIoC6vIbN8zrLPqBnJmPu7Z6nzqnKd7FsxQUNAvZfVZ0x6KdNvNp8zWIOHSQ==",
-      "dependencies": {
-        "@babel/code-frame": "^7.21.4",
-        "@babel/generator": "^7.22.0",
-        "@babel/helper-environment-visitor": "^7.22.1",
-        "@babel/helper-function-name": "^7.21.0",
-        "@babel/helper-hoist-variables": "^7.18.6",
-        "@babel/helper-split-export-declaration": "^7.18.6",
-        "@babel/parser": "^7.22.0",
-        "@babel/types": "^7.22.0",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.22.5.tgz",
+      "integrity": "sha512-7DuIjPgERaNo6r+PZwItpjCZEa5vyw4eJGufeLxrPdBXBoLcCJCIasvK6pK/9DVNrLZTLFhUGqaC6X/PA007TQ==",
+      "dependencies": {
+        "@babel/code-frame": "^7.22.5",
+        "@babel/generator": "^7.22.5",
+        "@babel/helper-environment-visitor": "^7.22.5",
+        "@babel/helper-function-name": "^7.22.5",
+        "@babel/helper-hoist-variables": "^7.22.5",
+        "@babel/helper-split-export-declaration": "^7.22.5",
+        "@babel/parser": "^7.22.5",
+        "@babel/types": "^7.22.5",
         "debug": "^4.1.0",
         "globals": "^11.1.0"
       },
@@ -2009,12 +1990,12 @@
       }
     },
     "node_modules/@babel/types": {
-      "version": "7.22.4",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.22.4.tgz",
-      "integrity": "sha512-Tx9x3UBHTTsMSW85WB2kphxYQVvrZ/t1FxD88IpSgIjiUJlCm9z+xWIDwyo1vffTwSqteqyznB8ZE9vYYk16zA==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.22.5.tgz",
+      "integrity": "sha512-zo3MIHGOkPOfoRXitsgHLjEXmlDaD/5KU1Uzuc9GNiZPhSqVxVRtxuPaSBZDsYZ9qV88AjtMtWW7ww98loJ9KA==",
       "dependencies": {
-        "@babel/helper-string-parser": "^7.21.5",
-        "@babel/helper-validator-identifier": "^7.19.1",
+        "@babel/helper-string-parser": "^7.22.5",
+        "@babel/helper-validator-identifier": "^7.22.5",
         "to-fast-properties": "^2.0.0"
       },
       "engines": {
@@ -17636,17 +17617,17 @@
       }
     },
     "@babel/code-frame": {
-      "version": "7.21.4",
-      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.21.4.tgz",
-      "integrity": "sha512-LYvhNKfwWSPpocw8GI7gpK2nq3HSDuEPC/uSYaALSJu9xjsalaaYFOq0Pwt5KmVqwEbZlDu81aLXwBOmD/Fv9g==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.22.5.tgz",
+      "integrity": "sha512-Xmwn266vad+6DAqEB2A6V/CcZVp62BbwVmcOJc2RPuwih1kw02TjQvWVWlcKGbBPd+8/0V5DEkOcizRGYsspYQ==",
       "requires": {
-        "@babel/highlight": "^7.18.6"
+        "@babel/highlight": "^7.22.5"
       }
     },
     "@babel/compat-data": {
-      "version": "7.22.3",
-      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.22.3.tgz",
-      "integrity": "sha512-aNtko9OPOwVESUFp3MZfD8Uzxl7JzSeJpd7npIoxCasU37PFbAQRpKglkaKwlHOyeJdrREpo8TW8ldrkYWwvIQ=="
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.22.5.tgz",
+      "integrity": "sha512-4Jc/YuIaYqKnDDz892kPIledykKg12Aw1PYX5i/TY28anJtacvM1Rrr8wbieB9GfEJwlzqT0hUEao0CxEebiDA=="
     },
     "@babel/core": {
       "version": "7.22.1",
@@ -17671,41 +17652,40 @@
       }
     },
     "@babel/generator": {
-      "version": "7.22.0",
-      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.22.0.tgz",
-      "integrity": "sha512-tyzR0OsH88AelgukhL2rbEUCLKBGmy2G9Th/5vpyOt0zf44Be61kvIQXjCwTSX8t+qJ/vMwZfhK6mPdrMLZXRg==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.22.5.tgz",
+      "integrity": "sha512-+lcUbnTRhd0jOewtFSedLyiPsD5tswKkbgcezOqqWFUVNEwoUTlpPOBmvhG7OXWLR4jMdv0czPGH5XbflnD1EA==",
       "requires": {
-        "@babel/types": "^7.22.0",
+        "@babel/types": "^7.22.5",
         "@jridgewell/gen-mapping": "^0.3.2",
         "@jridgewell/trace-mapping": "^0.3.17",
         "jsesc": "^2.5.1"
       }
     },
     "@babel/helper-annotate-as-pure": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.18.6.tgz",
-      "integrity": "sha512-duORpUiYrEpzKIop6iNbjnwKLAKnJ47csTyRACyEmWj0QdUrm5aqNJGHSSEQSUAvNW0ojX0dOmK9dZduvkfeXA==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.22.5.tgz",
+      "integrity": "sha512-LvBTxu8bQSQkcyKOU+a1btnNFQ1dMAd0R6PyW3arXes06F6QLWLIrd681bxRPIXlrMGR3XYnW9JyML7dP3qgxg==",
       "requires": {
-        "@babel/types": "^7.18.6"
+        "@babel/types": "^7.22.5"
       }
     },
     "@babel/helper-builder-binary-assignment-operator-visitor": {
-      "version": "7.18.9",
-      "resolved": "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.18.9.tgz",
-      "integrity": "sha512-yFQ0YCHoIqarl8BCRwBL8ulYUaZpz3bNsA7oFepAzee+8/+ImtADXNOmO5vJvsPff3qi+hvpkY/NYBTrBQgdNw==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.22.5.tgz",
+      "integrity": "sha512-m1EP3lVOPptR+2DwD125gziZNcmoNSHGmJROKoy87loWUQyJaVXDgpmruWqDARZSmtYQ+Dl25okU8+qhVzuykw==",
       "dev": true,
       "requires": {
-        "@babel/helper-explode-assignable-expression": "^7.18.6",
-        "@babel/types": "^7.18.9"
+        "@babel/types": "^7.22.5"
       }
     },
     "@babel/helper-compilation-targets": {
-      "version": "7.22.1",
-      "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.22.1.tgz",
-      "integrity": "sha512-Rqx13UM3yVB5q0D/KwQ8+SPfX/+Rnsy1Lw1k/UwOC4KC6qrzIQoY3lYnBu5EHKBlEHHcj0M0W8ltPSkD8rqfsQ==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.22.5.tgz",
+      "integrity": "sha512-Ji+ywpHeuqxB8WDxraCiqR0xfhYjiDE/e6k7FuIaANnoOFxAHskHChz4vA1mJC9Lbm01s1PVAGhQY4FUKSkGZw==",
       "requires": {
-        "@babel/compat-data": "^7.22.0",
-        "@babel/helper-validator-option": "^7.21.0",
+        "@babel/compat-data": "^7.22.5",
+        "@babel/helper-validator-option": "^7.22.5",
         "browserslist": "^4.21.3",
         "lru-cache": "^5.1.1",
         "semver": "^6.3.0"
@@ -17727,29 +17707,29 @@
       }
     },
     "@babel/helper-create-class-features-plugin": {
-      "version": "7.22.1",
-      "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.22.1.tgz",
-      "integrity": "sha512-SowrZ9BWzYFgzUMwUmowbPSGu6CXL5MSuuCkG3bejahSpSymioPmuLdhPxNOc9MjuNGjy7M/HaXvJ8G82Lywlw==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-annotate-as-pure": "^7.18.6",
-        "@babel/helper-environment-visitor": "^7.22.1",
-        "@babel/helper-function-name": "^7.21.0",
-        "@babel/helper-member-expression-to-functions": "^7.22.0",
-        "@babel/helper-optimise-call-expression": "^7.18.6",
-        "@babel/helper-replace-supers": "^7.22.1",
-        "@babel/helper-skip-transparent-expression-wrappers": "^7.20.0",
-        "@babel/helper-split-export-declaration": "^7.18.6",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.22.5.tgz",
+      "integrity": "sha512-xkb58MyOYIslxu3gKmVXmjTtUPvBU4odYzbiIQbWwLKIHCsx6UGZGX6F1IznMFVnDdirseUZopzN+ZRt8Xb33Q==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-annotate-as-pure": "^7.22.5",
+        "@babel/helper-environment-visitor": "^7.22.5",
+        "@babel/helper-function-name": "^7.22.5",
+        "@babel/helper-member-expression-to-functions": "^7.22.5",
+        "@babel/helper-optimise-call-expression": "^7.22.5",
+        "@babel/helper-replace-supers": "^7.22.5",
+        "@babel/helper-skip-transparent-expression-wrappers": "^7.22.5",
+        "@babel/helper-split-export-declaration": "^7.22.5",
         "semver": "^6.3.0"
       }
     },
     "@babel/helper-create-regexp-features-plugin": {
-      "version": "7.22.1",
-      "resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.22.1.tgz",
-      "integrity": "sha512-WWjdnfR3LPIe+0EY8td7WmjhytxXtjKAEpnAxun/hkNiyOaPlvGK+NZaBFIdi9ndYV3Gav7BpFvtUwnaJlwi1w==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.22.5.tgz",
+      "integrity": "sha512-1VpEFOIbMRaXyDeUwUfmTIxExLwQ+zkW+Bh5zXpApA3oQedBx9v/updixWxnx/bZpKw7u8VxWjb/qWpIcmPq8A==",
       "dev": true,
       "requires": {
-        "@babel/helper-annotate-as-pure": "^7.18.6",
+        "@babel/helper-annotate-as-pure": "^7.22.5",
         "regexpu-core": "^5.3.1",
         "semver": "^6.3.0"
       }
@@ -17768,158 +17748,149 @@
       }
     },
     "@babel/helper-environment-visitor": {
-      "version": "7.22.1",
-      "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.22.1.tgz",
-      "integrity": "sha512-Z2tgopurB/kTbidvzeBrc2To3PUP/9i5MUe+fU6QJCQDyPwSH2oRapkLw3KGECDYSjhQZCNxEvNvZlLw8JjGwA=="
-    },
-    "@babel/helper-explode-assignable-expression": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.18.6.tgz",
-      "integrity": "sha512-eyAYAsQmB80jNfg4baAtLeWAQHfHFiR483rzFK+BhETlGZaQC9bsfrugfXDCbRHLQbIA7U5NxhhOxN7p/dWIcg==",
-      "dev": true,
-      "requires": {
-        "@babel/types": "^7.18.6"
-      }
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.22.5.tgz",
+      "integrity": "sha512-XGmhECfVA/5sAt+H+xpSg0mfrHq6FzNr9Oxh7PSEBBRUb/mL7Kz3NICXb194rCqAEdxkhPT1a88teizAFyvk8Q=="
     },
     "@babel/helper-function-name": {
-      "version": "7.21.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.21.0.tgz",
-      "integrity": "sha512-HfK1aMRanKHpxemaY2gqBmL04iAPOPRj7DxtNbiDOrJK+gdwkiNRVpCpUJYbUT+aZyemKN8brqTOxzCaG6ExRg==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.22.5.tgz",
+      "integrity": "sha512-wtHSq6jMRE3uF2otvfuD3DIvVhOsSNshQl0Qrd7qC9oQJzHvOL4qQXlQn2916+CXGywIjpGuIkoyZRRxHPiNQQ==",
       "requires": {
-        "@babel/template": "^7.20.7",
-        "@babel/types": "^7.21.0"
+        "@babel/template": "^7.22.5",
+        "@babel/types": "^7.22.5"
       }
     },
     "@babel/helper-hoist-variables": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.18.6.tgz",
-      "integrity": "sha512-UlJQPkFqFULIcyW5sbzgbkxn2FKRgwWiRexcuaR8RNJRy8+LLveqPjwZV/bwrLZCN0eUHD/x8D0heK1ozuoo6Q==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.22.5.tgz",
+      "integrity": "sha512-wGjk9QZVzvknA6yKIUURb8zY3grXCcOZt+/7Wcy8O2uctxhplmUPkOdlgoNhmdVee2c92JXbf1xpMtVNbfoxRw==",
       "requires": {
-        "@babel/types": "^7.18.6"
+        "@babel/types": "^7.22.5"
       }
     },
     "@babel/helper-member-expression-to-functions": {
-      "version": "7.22.3",
-      "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.22.3.tgz",
-      "integrity": "sha512-Gl7sK04b/2WOb6OPVeNy9eFKeD3L6++CzL3ykPOWqTn08xgYYK0wz4TUh2feIImDXxcVW3/9WQ1NMKY66/jfZA==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.22.5.tgz",
+      "integrity": "sha512-aBiH1NKMG0H2cGZqspNvsaBe6wNGjbJjuLy29aU+eDZjSbbN53BaxlpB02xm9v34pLTZ1nIQPFYn2qMZoa5BQQ==",
       "dev": true,
       "requires": {
-        "@babel/types": "^7.22.3"
+        "@babel/types": "^7.22.5"
       }
     },
     "@babel/helper-module-imports": {
-      "version": "7.21.4",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.21.4.tgz",
-      "integrity": "sha512-orajc5T2PsRYUN3ZryCEFeMDYwyw09c/pZeaQEZPH0MpKzSvn3e0uXsDBu3k03VI+9DBiRo+l22BfKTpKwa/Wg==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.22.5.tgz",
+      "integrity": "sha512-8Dl6+HD/cKifutF5qGd/8ZJi84QeAKh+CEe1sBzz8UayBBGg1dAIJrdHOcOM5b2MpzWL2yuotJTtGjETq0qjXg==",
       "requires": {
-        "@babel/types": "^7.21.4"
+        "@babel/types": "^7.22.5"
       }
     },
     "@babel/helper-module-transforms": {
-      "version": "7.22.1",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.22.1.tgz",
-      "integrity": "sha512-dxAe9E7ySDGbQdCVOY/4+UcD8M9ZFqZcZhSPsPacvCG4M+9lwtDDQfI2EoaSvmf7W/8yCBkGU0m7Pvt1ru3UZw==",
-      "requires": {
-        "@babel/helper-environment-visitor": "^7.22.1",
-        "@babel/helper-module-imports": "^7.21.4",
-        "@babel/helper-simple-access": "^7.21.5",
-        "@babel/helper-split-export-declaration": "^7.18.6",
-        "@babel/helper-validator-identifier": "^7.19.1",
-        "@babel/template": "^7.21.9",
-        "@babel/traverse": "^7.22.1",
-        "@babel/types": "^7.22.0"
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.22.5.tgz",
+      "integrity": "sha512-+hGKDt/Ze8GFExiVHno/2dvG5IdstpzCq0y4Qc9OJ25D4q3pKfiIP/4Vp3/JvhDkLKsDK2api3q3fpIgiIF5bw==",
+      "requires": {
+        "@babel/helper-environment-visitor": "^7.22.5",
+        "@babel/helper-module-imports": "^7.22.5",
+        "@babel/helper-simple-access": "^7.22.5",
+        "@babel/helper-split-export-declaration": "^7.22.5",
+        "@babel/helper-validator-identifier": "^7.22.5",
+        "@babel/template": "^7.22.5",
+        "@babel/traverse": "^7.22.5",
+        "@babel/types": "^7.22.5"
       }
     },
     "@babel/helper-optimise-call-expression": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.18.6.tgz",
-      "integrity": "sha512-HP59oD9/fEHQkdcbgFCnbmgH5vIQTJbxh2yf+CdM89/glUNnuzr87Q8GIjGEnOktTROemO0Pe0iPAYbqZuOUiA==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.22.5.tgz",
+      "integrity": "sha512-HBwaojN0xFRx4yIvpwGqxiV2tUfl7401jlok564NgB9EHS1y6QT17FmKWm4ztqjeVdXLuC4fSvHc5ePpQjoTbw==",
       "dev": true,
       "requires": {
-        "@babel/types": "^7.18.6"
+        "@babel/types": "^7.22.5"
       }
     },
     "@babel/helper-plugin-utils": {
-      "version": "7.21.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.21.5.tgz",
-      "integrity": "sha512-0WDaIlXKOX/3KfBK/dwP1oQGiPh6rjMkT7HIRv7i5RR2VUMwrx5ZL0dwBkKx7+SW1zwNdgjHd34IMk5ZjTeHVg=="
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.22.5.tgz",
+      "integrity": "sha512-uLls06UVKgFG9QD4OeFYLEGteMIAa5kpTPcFL28yuCIIzsf6ZyKZMllKVOCZFhiZ5ptnwX4mtKdWCBE/uT4amg=="
     },
     "@babel/helper-remap-async-to-generator": {
-      "version": "7.18.9",
-      "resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.18.9.tgz",
-      "integrity": "sha512-dI7q50YKd8BAv3VEfgg7PS7yD3Rtbi2J1XMXaalXO0W0164hYLnh8zpjRS0mte9MfVp/tltvr/cfdXPvJr1opA==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.22.5.tgz",
+      "integrity": "sha512-cU0Sq1Rf4Z55fgz7haOakIyM7+x/uCFwXpLPaeRzfoUtAEAuUZjZvFPjL/rk5rW693dIgn2hng1W7xbT7lWT4g==",
       "dev": true,
       "requires": {
-        "@babel/helper-annotate-as-pure": "^7.18.6",
-        "@babel/helper-environment-visitor": "^7.18.9",
-        "@babel/helper-wrap-function": "^7.18.9",
-        "@babel/types": "^7.18.9"
+        "@babel/helper-annotate-as-pure": "^7.22.5",
+        "@babel/helper-environment-visitor": "^7.22.5",
+        "@babel/helper-wrap-function": "^7.22.5",
+        "@babel/types": "^7.22.5"
       }
     },
     "@babel/helper-replace-supers": {
-      "version": "7.22.1",
-      "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.22.1.tgz",
-      "integrity": "sha512-ut4qrkE4AuSfrwHSps51ekR1ZY/ygrP1tp0WFm8oVq6nzc/hvfV/22JylndIbsf2U2M9LOMwiSddr6y+78j+OQ==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.22.5.tgz",
+      "integrity": "sha512-aLdNM5I3kdI/V9xGNyKSF3X/gTyMUBohTZ+/3QdQKAA9vxIiy12E+8E2HoOP1/DjeqU+g6as35QHJNMDDYpuCg==",
       "dev": true,
       "requires": {
-        "@babel/helper-environment-visitor": "^7.22.1",
-        "@babel/helper-member-expression-to-functions": "^7.22.0",
-        "@babel/helper-optimise-call-expression": "^7.18.6",
-        "@babel/template": "^7.21.9",
-        "@babel/traverse": "^7.22.1",
-        "@babel/types": "^7.22.0"
+        "@babel/helper-environment-visitor": "^7.22.5",
+        "@babel/helper-member-expression-to-functions": "^7.22.5",
+        "@babel/helper-optimise-call-expression": "^7.22.5",
+        "@babel/template": "^7.22.5",
+        "@babel/traverse": "^7.22.5",
+        "@babel/types": "^7.22.5"
       }
     },
     "@babel/helper-simple-access": {
-      "version": "7.21.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.21.5.tgz",
-      "integrity": "sha512-ENPDAMC1wAjR0uaCUwliBdiSl1KBJAVnMTzXqi64c2MG8MPR6ii4qf7bSXDqSFbr4W6W028/rf5ivoHop5/mkg==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.22.5.tgz",
+      "integrity": "sha512-n0H99E/K+Bika3++WNL17POvo4rKWZ7lZEp1Q+fStVbUi8nxPQEBOlTmCOxW/0JsS56SKKQ+ojAe2pHKJHN35w==",
       "requires": {
-        "@babel/types": "^7.21.5"
+        "@babel/types": "^7.22.5"
       }
     },
     "@babel/helper-skip-transparent-expression-wrappers": {
-      "version": "7.20.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.20.0.tgz",
-      "integrity": "sha512-5y1JYeNKfvnT8sZcK9DVRtpTbGiomYIHviSP3OQWmDPU3DeH4a1ZlT/N2lyQ5P8egjcRaT/Y9aNqUxK0WsnIIg==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.22.5.tgz",
+      "integrity": "sha512-tK14r66JZKiC43p8Ki33yLBVJKlQDFoA8GYN67lWCDCqoL6EMMSuM9b+Iff2jHaM/RRFYl7K+iiru7hbRqNx8Q==",
       "dev": true,
       "requires": {
-        "@babel/types": "^7.20.0"
+        "@babel/types": "^7.22.5"
       }
     },
     "@babel/helper-split-export-declaration": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.18.6.tgz",
-      "integrity": "sha512-bde1etTx6ZyTmobl9LLMMQsaizFVZrquTEHOqKeQESMKo4PlObf+8+JA25ZsIpZhT/WEd39+vOdLXAFG/nELpA==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.22.5.tgz",
+      "integrity": "sha512-thqK5QFghPKWLhAV321lxF95yCg2K3Ob5yw+M3VHWfdia0IkPXUtoLH8x/6Fh486QUvzhb8YOWHChTVen2/PoQ==",
       "requires": {
-        "@babel/types": "^7.18.6"
+        "@babel/types": "^7.22.5"
       }
     },
     "@babel/helper-string-parser": {
-      "version": "7.21.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.21.5.tgz",
-      "integrity": "sha512-5pTUx3hAJaZIdW99sJ6ZUUgWq/Y+Hja7TowEnLNMm1VivRgZQL3vpBY3qUACVsvw+yQU6+YgfBVmcbLaZtrA1w=="
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.22.5.tgz",
+      "integrity": "sha512-mM4COjgZox8U+JcXQwPijIZLElkgEpO5rsERVDJTc2qfCDfERyob6k5WegS14SX18IIjv+XD+GrqNumY5JRCDw=="
     },
     "@babel/helper-validator-identifier": {
-      "version": "7.19.1",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.19.1.tgz",
-      "integrity": "sha512-awrNfaMtnHUr653GgGEs++LlAvW6w+DcPrOliSMXWCKo597CwL5Acf/wWdNkf/tfEQE3mjkeD1YOVZOUV/od1w=="
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.5.tgz",
+      "integrity": "sha512-aJXu+6lErq8ltp+JhkJUfk1MTGyuA4v7f3pA+BJ5HLfNC6nAQ0Cpi9uOquUj8Hehg0aUiHzWQbOVJGao6ztBAQ=="
     },
     "@babel/helper-validator-option": {
-      "version": "7.21.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.21.0.tgz",
-      "integrity": "sha512-rmL/B8/f0mKS2baE9ZpyTcTavvEuWhTTW8amjzXNvYG4AwBsqTLikfXsEofsJEfKHf+HQVQbFOHy6o+4cnC/fQ=="
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.22.5.tgz",
+      "integrity": "sha512-R3oB6xlIVKUnxNUxbmgq7pKjxpru24zlimpE8WK47fACIlM0II/Hm1RS8IaOI7NgCr6LNS+jl5l75m20npAziw=="
     },
     "@babel/helper-wrap-function": {
-      "version": "7.20.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.20.5.tgz",
-      "integrity": "sha512-bYMxIWK5mh+TgXGVqAtnu5Yn1un+v8DDZtqyzKRLUzrh70Eal2O3aZ7aPYiMADO4uKlkzOiRiZ6GX5q3qxvW9Q==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.22.5.tgz",
+      "integrity": "sha512-bYqLIBSEshYcYQyfks8ewYA8S30yaGSeRslcvKMvoUk6HHPySbxHq9YRi6ghhzEU+yhQv9bP/jXnygkStOcqZw==",
       "dev": true,
       "requires": {
-        "@babel/helper-function-name": "^7.19.0",
-        "@babel/template": "^7.18.10",
-        "@babel/traverse": "^7.20.5",
-        "@babel/types": "^7.20.5"
+        "@babel/helper-function-name": "^7.22.5",
+        "@babel/template": "^7.22.5",
+        "@babel/traverse": "^7.22.5",
+        "@babel/types": "^7.22.5"
       }
     },
     "@babel/helpers": {
@@ -17933,51 +17904,46 @@
       }
     },
     "@babel/highlight": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.18.6.tgz",
-      "integrity": "sha512-u7stbOuYjaPezCuLj29hNW1v64M2Md2qupEKP1fHc7WdOA3DgLh37suiSrZYY7haUB7iBeQZ9P1uiRF359do3g==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.22.5.tgz",
+      "integrity": "sha512-BSKlD1hgnedS5XRnGOljZawtag7H1yPfQp0tdNJCHoH6AZ+Pcm9VvkrK59/Yy593Ypg0zMxH2BxD1VPYUQ7UIw==",
       "requires": {
-        "@babel/helper-validator-identifier": "^7.18.6",
+        "@babel/helper-validator-identifier": "^7.22.5",
         "chalk": "^2.0.0",
         "js-tokens": "^4.0.0"
       }
     },
     "@babel/parser": {
-      "version": "7.22.0",
-      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.22.0.tgz",
-      "integrity": "sha512-DA65VCJRetcFmJnt9/hEmRvXNCwk0V86dxG6p6N13hzDazaLRjGdTGPGgjxZOtLuFgWzOSRX4grybmRXwQ9bSg=="
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.22.5.tgz",
+      "integrity": "sha512-DFZMC9LJUG9PLOclRC32G63UXwzqS2koQC8dkx+PLdmt1xSePYpbT/NbsrJy8Q/muXz7o/h/d4A7Fuyixm559Q=="
     },
     "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.18.6.tgz",
-      "integrity": "sha512-Dgxsyg54Fx1d4Nge8UnvTrED63vrwOdPmyvPzlNN/boaliRP54pm3pGzZD1SJUwrBA+Cs/xdG8kXX6Mn/RfISQ==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.22.5.tgz",
+      "integrity": "sha512-NP1M5Rf+u2Gw9qfSO4ihjcTGW5zXTi36ITLd4/EoAcEhIZ0yjMqmftDNl3QC19CX7olhrjpyU454g/2W7X0jvQ==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.18.6"
+        "@babel/helper-plugin-utils": "^7.22.5"
       }
     },
     "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": {
-      "version": "7.22.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.22.3.tgz",
-      "integrity": "sha512-6r4yRwEnorYByILoDRnEqxtojYKuiIv9FojW2E8GUKo9eWBwbKcd9IiZOZpdyXc64RmyGGyPu3/uAcrz/dq2kQ==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.22.5.tgz",
+      "integrity": "sha512-31Bb65aZaUwqCbWMnZPduIZxCBngHFlzyN6Dq6KAJjtx+lx6ohKHubc61OomYi7XwVD4Ol0XCVz4h+pYFR048g==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.21.5",
-        "@babel/helper-skip-transparent-expression-wrappers": "^7.20.0",
-        "@babel/plugin-transform-optional-chaining": "^7.22.3"
+        "@babel/helper-plugin-utils": "^7.22.5",
+        "@babel/helper-skip-transparent-expression-wrappers": "^7.22.5",
+        "@babel/plugin-transform-optional-chaining": "^7.22.5"
       }
     },
     "@babel/plugin-proposal-private-property-in-object": {
-      "version": "7.21.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.21.0.tgz",
-      "integrity": "sha512-ha4zfehbJjc5MmXBlHec1igel5TJXXLDDRbuJ4+XT2TJcyD9/V1919BA8gMvsdHcNMBy4WBUBiRb3nw/EQUtBw==",
+      "version": "7.21.0-placeholder-for-preset-env.2",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.21.0-placeholder-for-preset-env.2.tgz",
+      "integrity": "sha512-SOSkfJDddaM7mak6cPEpswyTRnuRltl429hMraQEglW+OkovnCzsiszTmsrlY//qLFjCpQDFRvjdm2wA5pPm9w==",
       "dev": true,
-      "requires": {
-        "@babel/helper-annotate-as-pure": "^7.18.6",
-        "@babel/helper-create-class-features-plugin": "^7.21.0",
-        "@babel/helper-plugin-utils": "^7.20.2",
-        "@babel/plugin-syntax-private-property-in-object": "^7.14.5"
-      }
+      "requires": {}
     },
     "@babel/plugin-proposal-unicode-property-regex": {
       "version": "7.18.6",
@@ -18044,21 +18010,21 @@
       }
     },
     "@babel/plugin-syntax-import-assertions": {
-      "version": "7.20.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.20.0.tgz",
-      "integrity": "sha512-IUh1vakzNoWalR8ch/areW7qFopR2AEw03JlG7BbrDqmQ4X3q9uuipQwSGrUn7oGiemKjtSLDhNtQHzMHr1JdQ==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.22.5.tgz",
+      "integrity": "sha512-rdV97N7KqsRzeNGoWUOK6yUsWarLjE5Su/Snk9IYPU9CwkWHs4t+rTGOvffTR8XGkJMTAdLfO0xVnXm8wugIJg==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.19.0"
+        "@babel/helper-plugin-utils": "^7.22.5"
       }
     },
     "@babel/plugin-syntax-import-attributes": {
-      "version": "7.22.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-attributes/-/plugin-syntax-import-attributes-7.22.3.tgz",
-      "integrity": "sha512-i35jZJv6aO7hxEbIWQ41adVfOzjm9dcYDNeWlBMd8p0ZQRtNUCBrmGwZt+H5lb+oOC9a3svp956KP0oWGA1YsA==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-attributes/-/plugin-syntax-import-attributes-7.22.5.tgz",
+      "integrity": "sha512-KwvoWDeNKPETmozyFE0P2rOLqh39EoQHNjqizrI5B8Vt0ZNS7M56s7dAiAqbYfiAYOuIzIh96z3iR2ktgu3tEg==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.21.5"
+        "@babel/helper-plugin-utils": "^7.22.5"
       }
     },
     "@babel/plugin-syntax-import-meta": {
@@ -18180,402 +18146,402 @@
       }
     },
     "@babel/plugin-transform-arrow-functions": {
-      "version": "7.21.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.21.5.tgz",
-      "integrity": "sha512-wb1mhwGOCaXHDTcsRYMKF9e5bbMgqwxtqa2Y1ifH96dXJPwbuLX9qHy3clhrxVqgMz7nyNXs8VkxdH8UBcjKqA==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.22.5.tgz",
+      "integrity": "sha512-26lTNXoVRdAnsaDXPpvCNUq+OVWEVC6bx7Vvz9rC53F2bagUWW4u4ii2+h8Fejfh7RYqPxn+libeFBBck9muEw==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.21.5"
+        "@babel/helper-plugin-utils": "^7.22.5"
       }
     },
     "@babel/plugin-transform-async-generator-functions": {
-      "version": "7.22.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-generator-functions/-/plugin-transform-async-generator-functions-7.22.3.tgz",
-      "integrity": "sha512-36A4Aq48t66btydbZd5Fk0/xJqbpg/v4QWI4AH4cYHBXy9Mu42UOupZpebKFiCFNT9S9rJFcsld0gsv0ayLjtA==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-generator-functions/-/plugin-transform-async-generator-functions-7.22.5.tgz",
+      "integrity": "sha512-gGOEvFzm3fWoyD5uZq7vVTD57pPJ3PczPUD/xCFGjzBpUosnklmXyKnGQbbbGs1NPNPskFex0j93yKbHt0cHyg==",
       "dev": true,
       "requires": {
-        "@babel/helper-environment-visitor": "^7.22.1",
-        "@babel/helper-plugin-utils": "^7.21.5",
-        "@babel/helper-remap-async-to-generator": "^7.18.9",
+        "@babel/helper-environment-visitor": "^7.22.5",
+        "@babel/helper-plugin-utils": "^7.22.5",
+        "@babel/helper-remap-async-to-generator": "^7.22.5",
         "@babel/plugin-syntax-async-generators": "^7.8.4"
       }
     },
     "@babel/plugin-transform-async-to-generator": {
-      "version": "7.20.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.20.7.tgz",
-      "integrity": "sha512-Uo5gwHPT9vgnSXQxqGtpdufUiWp96gk7yiP4Mp5bm1QMkEmLXBO7PAGYbKoJ6DhAwiNkcHFBol/x5zZZkL/t0Q==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.22.5.tgz",
+      "integrity": "sha512-b1A8D8ZzE/VhNDoV1MSJTnpKkCG5bJo+19R4o4oy03zM7ws8yEMK755j61Dc3EyvdysbqH5BOOTquJ7ZX9C6vQ==",
       "dev": true,
       "requires": {
-        "@babel/helper-module-imports": "^7.18.6",
-        "@babel/helper-plugin-utils": "^7.20.2",
-        "@babel/helper-remap-async-to-generator": "^7.18.9"
+        "@babel/helper-module-imports": "^7.22.5",
+        "@babel/helper-plugin-utils": "^7.22.5",
+        "@babel/helper-remap-async-to-generator": "^7.22.5"
       }
     },
     "@babel/plugin-transform-block-scoped-functions": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.18.6.tgz",
-      "integrity": "sha512-ExUcOqpPWnliRcPqves5HJcJOvHvIIWfuS4sroBUenPuMdmW+SMHDakmtS7qOo13sVppmUijqeTv7qqGsvURpQ==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.22.5.tgz",
+      "integrity": "sha512-tdXZ2UdknEKQWKJP1KMNmuF5Lx3MymtMN/pvA+p/VEkhK8jVcQ1fzSy8KM9qRYhAf2/lV33hoMPKI/xaI9sADA==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.18.6"
+        "@babel/helper-plugin-utils": "^7.22.5"
       }
     },
     "@babel/plugin-transform-block-scoping": {
-      "version": "7.21.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.21.0.tgz",
-      "integrity": "sha512-Mdrbunoh9SxwFZapeHVrwFmri16+oYotcZysSzhNIVDwIAb1UV+kvnxULSYq9J3/q5MDG+4X6w8QVgD1zhBXNQ==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.22.5.tgz",
+      "integrity": "sha512-EcACl1i5fSQ6bt+YGuU/XGCeZKStLmyVGytWkpyhCLeQVA0eu6Wtiw92V+I1T/hnezUv7j74dA/Ro69gWcU+hg==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.20.2"
+        "@babel/helper-plugin-utils": "^7.22.5"
       }
     },
     "@babel/plugin-transform-class-properties": {
-      "version": "7.22.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-class-properties/-/plugin-transform-class-properties-7.22.3.tgz",
-      "integrity": "sha512-mASLsd6rhOrLZ5F3WbCxkzl67mmOnqik0zrg5W6D/X0QMW7HtvnoL1dRARLKIbMP3vXwkwziuLesPqWVGIl6Bw==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-class-properties/-/plugin-transform-class-properties-7.22.5.tgz",
+      "integrity": "sha512-nDkQ0NfkOhPTq8YCLiWNxp1+f9fCobEjCb0n8WdbNUBc4IB5V7P1QnX9IjpSoquKrXF5SKojHleVNs2vGeHCHQ==",
       "dev": true,
       "requires": {
-        "@babel/helper-create-class-features-plugin": "^7.22.1",
-        "@babel/helper-plugin-utils": "^7.21.5"
+        "@babel/helper-create-class-features-plugin": "^7.22.5",
+        "@babel/helper-plugin-utils": "^7.22.5"
       }
     },
     "@babel/plugin-transform-class-static-block": {
-      "version": "7.22.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-class-static-block/-/plugin-transform-class-static-block-7.22.3.tgz",
-      "integrity": "sha512-5BirgNWNOx7cwbTJCOmKFJ1pZjwk5MUfMIwiBBvsirCJMZeQgs5pk6i1OlkVg+1Vef5LfBahFOrdCnAWvkVKMw==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-class-static-block/-/plugin-transform-class-static-block-7.22.5.tgz",
+      "integrity": "sha512-SPToJ5eYZLxlnp1UzdARpOGeC2GbHvr9d/UV0EukuVx8atktg194oe+C5BqQ8jRTkgLRVOPYeXRSBg1IlMoVRA==",
       "dev": true,
       "requires": {
-        "@babel/helper-create-class-features-plugin": "^7.22.1",
-        "@babel/helper-plugin-utils": "^7.21.5",
+        "@babel/helper-create-class-features-plugin": "^7.22.5",
+        "@babel/helper-plugin-utils": "^7.22.5",
         "@babel/plugin-syntax-class-static-block": "^7.14.5"
       }
     },
     "@babel/plugin-transform-classes": {
-      "version": "7.21.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.21.0.tgz",
-      "integrity": "sha512-RZhbYTCEUAe6ntPehC4hlslPWosNHDox+vAs4On/mCLRLfoDVHf6hVEd7kuxr1RnHwJmxFfUM3cZiZRmPxJPXQ==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-annotate-as-pure": "^7.18.6",
-        "@babel/helper-compilation-targets": "^7.20.7",
-        "@babel/helper-environment-visitor": "^7.18.9",
-        "@babel/helper-function-name": "^7.21.0",
-        "@babel/helper-optimise-call-expression": "^7.18.6",
-        "@babel/helper-plugin-utils": "^7.20.2",
-        "@babel/helper-replace-supers": "^7.20.7",
-        "@babel/helper-split-export-declaration": "^7.18.6",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.22.5.tgz",
+      "integrity": "sha512-2edQhLfibpWpsVBx2n/GKOz6JdGQvLruZQfGr9l1qes2KQaWswjBzhQF7UDUZMNaMMQeYnQzxwOMPsbYF7wqPQ==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-annotate-as-pure": "^7.22.5",
+        "@babel/helper-compilation-targets": "^7.22.5",
+        "@babel/helper-environment-visitor": "^7.22.5",
+        "@babel/helper-function-name": "^7.22.5",
+        "@babel/helper-optimise-call-expression": "^7.22.5",
+        "@babel/helper-plugin-utils": "^7.22.5",
+        "@babel/helper-replace-supers": "^7.22.5",
+        "@babel/helper-split-export-declaration": "^7.22.5",
         "globals": "^11.1.0"
       }
     },
     "@babel/plugin-transform-computed-properties": {
-      "version": "7.21.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.21.5.tgz",
-      "integrity": "sha512-TR653Ki3pAwxBxUe8srfF3e4Pe3FTA46uaNHYyQwIoM4oWKSoOZiDNyHJ0oIoDIUPSRQbQG7jzgVBX3FPVne1Q==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.22.5.tgz",
+      "integrity": "sha512-4GHWBgRf0krxPX+AaPtgBAlTgTeZmqDynokHOX7aqqAB4tHs3U2Y02zH6ETFdLZGcg9UQSD1WCmkVrE9ErHeOg==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.21.5",
-        "@babel/template": "^7.20.7"
+        "@babel/helper-plugin-utils": "^7.22.5",
+        "@babel/template": "^7.22.5"
       }
     },
     "@babel/plugin-transform-destructuring": {
-      "version": "7.21.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.21.3.tgz",
-      "integrity": "sha512-bp6hwMFzuiE4HqYEyoGJ/V2LeIWn+hLVKc4pnj++E5XQptwhtcGmSayM029d/j2X1bPKGTlsyPwAubuU22KhMA==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.22.5.tgz",
+      "integrity": "sha512-GfqcFuGW8vnEqTUBM7UtPd5A4q797LTvvwKxXTgRsFjoqaJiEg9deBG6kWeQYkVEL569NpnmpC0Pkr/8BLKGnQ==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.20.2"
+        "@babel/helper-plugin-utils": "^7.22.5"
       }
     },
     "@babel/plugin-transform-dotall-regex": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.18.6.tgz",
-      "integrity": "sha512-6S3jpun1eEbAxq7TdjLotAsl4WpQI9DxfkycRcKrjhQYzU87qpXdknpBg/e+TdcMehqGnLFi7tnFUBR02Vq6wg==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.22.5.tgz",
+      "integrity": "sha512-5/Yk9QxCQCl+sOIB1WelKnVRxTJDSAIxtJLL2/pqL14ZVlbH0fUQUZa/T5/UnQtBNgghR7mfB8ERBKyKPCi7Vw==",
       "dev": true,
       "requires": {
-        "@babel/helper-create-regexp-features-plugin": "^7.18.6",
-        "@babel/helper-plugin-utils": "^7.18.6"
+        "@babel/helper-create-regexp-features-plugin": "^7.22.5",
+        "@babel/helper-plugin-utils": "^7.22.5"
       }
     },
     "@babel/plugin-transform-duplicate-keys": {
-      "version": "7.18.9",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.18.9.tgz",
-      "integrity": "sha512-d2bmXCtZXYc59/0SanQKbiWINadaJXqtvIQIzd4+hNwkWBgyCd5F/2t1kXoUdvPMrxzPvhK6EMQRROxsue+mfw==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.22.5.tgz",
+      "integrity": "sha512-dEnYD+9BBgld5VBXHnF/DbYGp3fqGMsyxKbtD1mDyIA7AkTSpKXFhCVuj/oQVOoALfBs77DudA0BE4d5mcpmqw==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.18.9"
+        "@babel/helper-plugin-utils": "^7.22.5"
       }
     },
     "@babel/plugin-transform-dynamic-import": {
-      "version": "7.22.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dynamic-import/-/plugin-transform-dynamic-import-7.22.1.tgz",
-      "integrity": "sha512-rlhWtONnVBPdmt+jeewS0qSnMz/3yLFrqAP8hHC6EDcrYRSyuz9f9yQhHvVn2Ad6+yO9fHXac5piudeYrInxwQ==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dynamic-import/-/plugin-transform-dynamic-import-7.22.5.tgz",
+      "integrity": "sha512-0MC3ppTB1AMxd8fXjSrbPa7LT9hrImt+/fcj+Pg5YMD7UQyWp/02+JWpdnCymmsXwIx5Z+sYn1bwCn4ZJNvhqQ==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.21.5",
+        "@babel/helper-plugin-utils": "^7.22.5",
         "@babel/plugin-syntax-dynamic-import": "^7.8.3"
       }
     },
     "@babel/plugin-transform-exponentiation-operator": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.18.6.tgz",
-      "integrity": "sha512-wzEtc0+2c88FVR34aQmiz56dxEkxr2g8DQb/KfaFa1JYXOFVsbhvAonFN6PwVWj++fKmku8NP80plJ5Et4wqHw==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.22.5.tgz",
+      "integrity": "sha512-vIpJFNM/FjZ4rh1myqIya9jXwrwwgFRHPjT3DkUA9ZLHuzox8jiXkOLvwm1H+PQIP3CqfC++WPKeuDi0Sjdj1g==",
       "dev": true,
       "requires": {
-        "@babel/helper-builder-binary-assignment-operator-visitor": "^7.18.6",
-        "@babel/helper-plugin-utils": "^7.18.6"
+        "@babel/helper-builder-binary-assignment-operator-visitor": "^7.22.5",
+        "@babel/helper-plugin-utils": "^7.22.5"
       }
     },
     "@babel/plugin-transform-export-namespace-from": {
-      "version": "7.22.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-export-namespace-from/-/plugin-transform-export-namespace-from-7.22.3.tgz",
-      "integrity": "sha512-5Ti1cHLTDnt3vX61P9KZ5IG09bFXp4cDVFJIAeCZuxu9OXXJJZp5iP0n/rzM2+iAutJY+KWEyyHcRaHlpQ/P5g==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-export-namespace-from/-/plugin-transform-export-namespace-from-7.22.5.tgz",
+      "integrity": "sha512-X4hhm7FRnPgd4nDA4b/5V280xCx6oL7Oob5+9qVS5C13Zq4bh1qq7LU0GgRU6b5dBWBvhGaXYVB4AcN6+ol6vg==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.21.5",
+        "@babel/helper-plugin-utils": "^7.22.5",
         "@babel/plugin-syntax-export-namespace-from": "^7.8.3"
       }
     },
     "@babel/plugin-transform-for-of": {
-      "version": "7.21.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.21.5.tgz",
-      "integrity": "sha512-nYWpjKW/7j/I/mZkGVgHJXh4bA1sfdFnJoOXwJuj4m3Q2EraO/8ZyrkCau9P5tbHQk01RMSt6KYLCsW7730SXQ==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.22.5.tgz",
+      "integrity": "sha512-3kxQjX1dU9uudwSshyLeEipvrLjBCVthCgeTp6CzE/9JYrlAIaeekVxRpCWsDDfYTfRZRoCeZatCQvwo+wvK8A==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.21.5"
+        "@babel/helper-plugin-utils": "^7.22.5"
       }
     },
     "@babel/plugin-transform-function-name": {
-      "version": "7.18.9",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.18.9.tgz",
-      "integrity": "sha512-WvIBoRPaJQ5yVHzcnJFor7oS5Ls0PYixlTYE63lCj2RtdQEl15M68FXQlxnG6wdraJIXRdR7KI+hQ7q/9QjrCQ==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.22.5.tgz",
+      "integrity": "sha512-UIzQNMS0p0HHiQm3oelztj+ECwFnj+ZRV4KnguvlsD2of1whUeM6o7wGNj6oLwcDoAXQ8gEqfgC24D+VdIcevg==",
       "dev": true,
       "requires": {
-        "@babel/helper-compilation-targets": "^7.18.9",
-        "@babel/helper-function-name": "^7.18.9",
-        "@babel/helper-plugin-utils": "^7.18.9"
+        "@babel/helper-compilation-targets": "^7.22.5",
+        "@babel/helper-function-name": "^7.22.5",
+        "@babel/helper-plugin-utils": "^7.22.5"
       }
     },
     "@babel/plugin-transform-json-strings": {
-      "version": "7.22.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-json-strings/-/plugin-transform-json-strings-7.22.3.tgz",
-      "integrity": "sha512-IuvOMdeOOY2X4hRNAT6kwbePtK21BUyrAEgLKviL8pL6AEEVUVcqtRdN/HJXBLGIbt9T3ETmXRnFedRRmQNTYw==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-json-strings/-/plugin-transform-json-strings-7.22.5.tgz",
+      "integrity": "sha512-DuCRB7fu8MyTLbEQd1ew3R85nx/88yMoqo2uPSjevMj3yoN7CDM8jkgrY0wmVxfJZyJ/B9fE1iq7EQppWQmR5A==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.21.5",
+        "@babel/helper-plugin-utils": "^7.22.5",
         "@babel/plugin-syntax-json-strings": "^7.8.3"
       }
     },
     "@babel/plugin-transform-literals": {
-      "version": "7.18.9",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.18.9.tgz",
-      "integrity": "sha512-IFQDSRoTPnrAIrI5zoZv73IFeZu2dhu6irxQjY9rNjTT53VmKg9fenjvoiOWOkJ6mm4jKVPtdMzBY98Fp4Z4cg==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.22.5.tgz",
+      "integrity": "sha512-fTLj4D79M+mepcw3dgFBTIDYpbcB9Sm0bpm4ppXPaO+U+PKFFyV9MGRvS0gvGw62sd10kT5lRMKXAADb9pWy8g==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.18.9"
+        "@babel/helper-plugin-utils": "^7.22.5"
       }
     },
     "@babel/plugin-transform-logical-assignment-operators": {
-      "version": "7.22.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-logical-assignment-operators/-/plugin-transform-logical-assignment-operators-7.22.3.tgz",
-      "integrity": "sha512-CbayIfOw4av2v/HYZEsH+Klks3NC2/MFIR3QR8gnpGNNPEaq2fdlVCRYG/paKs7/5hvBLQ+H70pGWOHtlNEWNA==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-logical-assignment-operators/-/plugin-transform-logical-assignment-operators-7.22.5.tgz",
+      "integrity": "sha512-MQQOUW1KL8X0cDWfbwYP+TbVbZm16QmQXJQ+vndPtH/BoO0lOKpVoEDMI7+PskYxH+IiE0tS8xZye0qr1lGzSA==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.21.5",
+        "@babel/helper-plugin-utils": "^7.22.5",
         "@babel/plugin-syntax-logical-assignment-operators": "^7.10.4"
       }
     },
     "@babel/plugin-transform-member-expression-literals": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.18.6.tgz",
-      "integrity": "sha512-qSF1ihLGO3q+/g48k85tUjD033C29TNTVB2paCwZPVmOsjn9pClvYYrM2VeJpBY2bcNkuny0YUyTNRyRxJ54KA==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.22.5.tgz",
+      "integrity": "sha512-RZEdkNtzzYCFl9SE9ATaUMTj2hqMb4StarOJLrZRbqqU4HSBE7UlBw9WBWQiDzrJZJdUWiMTVDI6Gv/8DPvfew==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.18.6"
+        "@babel/helper-plugin-utils": "^7.22.5"
       }
     },
     "@babel/plugin-transform-modules-amd": {
-      "version": "7.20.11",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.20.11.tgz",
-      "integrity": "sha512-NuzCt5IIYOW0O30UvqktzHYR2ud5bOWbY0yaxWZ6G+aFzOMJvrs5YHNikrbdaT15+KNO31nPOy5Fim3ku6Zb5g==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.22.5.tgz",
+      "integrity": "sha512-R+PTfLTcYEmb1+kK7FNkhQ1gP4KgjpSO6HfH9+f8/yfp2Nt3ggBjiVpRwmwTlfqZLafYKJACy36yDXlEmI9HjQ==",
       "dev": true,
       "requires": {
-        "@babel/helper-module-transforms": "^7.20.11",
-        "@babel/helper-plugin-utils": "^7.20.2"
+        "@babel/helper-module-transforms": "^7.22.5",
+        "@babel/helper-plugin-utils": "^7.22.5"
       }
     },
     "@babel/plugin-transform-modules-commonjs": {
-      "version": "7.21.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.21.5.tgz",
-      "integrity": "sha512-OVryBEgKUbtqMoB7eG2rs6UFexJi6Zj6FDXx+esBLPTCxCNxAY9o+8Di7IsUGJ+AVhp5ncK0fxWUBd0/1gPhrQ==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.22.5.tgz",
+      "integrity": "sha512-B4pzOXj+ONRmuaQTg05b3y/4DuFz3WcCNAXPLb2Q0GT0TrGKGxNKV4jwsXts+StaM0LQczZbOpj8o1DLPDJIiA==",
       "dev": true,
       "requires": {
-        "@babel/helper-module-transforms": "^7.21.5",
-        "@babel/helper-plugin-utils": "^7.21.5",
-        "@babel/helper-simple-access": "^7.21.5"
+        "@babel/helper-module-transforms": "^7.22.5",
+        "@babel/helper-plugin-utils": "^7.22.5",
+        "@babel/helper-simple-access": "^7.22.5"
       }
     },
     "@babel/plugin-transform-modules-systemjs": {
-      "version": "7.22.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.22.3.tgz",
-      "integrity": "sha512-V21W3bKLxO3ZjcBJZ8biSvo5gQ85uIXW2vJfh7JSWf/4SLUSr1tOoHX3ruN4+Oqa2m+BKfsxTR1I+PsvkIWvNw==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.22.5.tgz",
+      "integrity": "sha512-emtEpoaTMsOs6Tzz+nbmcePl6AKVtS1yC4YNAeMun9U8YCsgadPNxnOPQ8GhHFB2qdx+LZu9LgoC0Lthuu05DQ==",
       "dev": true,
       "requires": {
-        "@babel/helper-hoist-variables": "^7.18.6",
-        "@babel/helper-module-transforms": "^7.22.1",
-        "@babel/helper-plugin-utils": "^7.21.5",
-        "@babel/helper-validator-identifier": "^7.19.1"
+        "@babel/helper-hoist-variables": "^7.22.5",
+        "@babel/helper-module-transforms": "^7.22.5",
+        "@babel/helper-plugin-utils": "^7.22.5",
+        "@babel/helper-validator-identifier": "^7.22.5"
       }
     },
     "@babel/plugin-transform-modules-umd": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.18.6.tgz",
-      "integrity": "sha512-dcegErExVeXcRqNtkRU/z8WlBLnvD4MRnHgNs3MytRO1Mn1sHRyhbcpYbVMGclAqOjdW+9cfkdZno9dFdfKLfQ==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.22.5.tgz",
+      "integrity": "sha512-+S6kzefN/E1vkSsKx8kmQuqeQsvCKCd1fraCM7zXm4SFoggI099Tr4G8U81+5gtMdUeMQ4ipdQffbKLX0/7dBQ==",
       "dev": true,
       "requires": {
-        "@babel/helper-module-transforms": "^7.18.6",
-        "@babel/helper-plugin-utils": "^7.18.6"
+        "@babel/helper-module-transforms": "^7.22.5",
+        "@babel/helper-plugin-utils": "^7.22.5"
       }
     },
     "@babel/plugin-transform-named-capturing-groups-regex": {
-      "version": "7.22.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.22.3.tgz",
-      "integrity": "sha512-c6HrD/LpUdNNJsISQZpds3TXvfYIAbo+efE9aWmY/PmSRD0agrJ9cPMt4BmArwUQ7ZymEWTFjTyp+yReLJZh0Q==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.22.5.tgz",
+      "integrity": "sha512-YgLLKmS3aUBhHaxp5hi1WJTgOUb/NCuDHzGT9z9WTt3YG+CPRhJs6nprbStx6DnWM4dh6gt7SU3sZodbZ08adQ==",
       "dev": true,
       "requires": {
-        "@babel/helper-create-regexp-features-plugin": "^7.22.1",
-        "@babel/helper-plugin-utils": "^7.21.5"
+        "@babel/helper-create-regexp-features-plugin": "^7.22.5",
+        "@babel/helper-plugin-utils": "^7.22.5"
       }
     },
     "@babel/plugin-transform-new-target": {
-      "version": "7.22.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.22.3.tgz",
-      "integrity": "sha512-5RuJdSo89wKdkRTqtM9RVVJzHum9c2s0te9rB7vZC1zKKxcioWIy+xcu4OoIAjyFZhb/bp5KkunuLin1q7Ct+w==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.22.5.tgz",
+      "integrity": "sha512-AsF7K0Fx/cNKVyk3a+DW0JLo+Ua598/NxMRvxDnkpCIGFh43+h/v2xyhRUYf6oD8gE4QtL83C7zZVghMjHd+iw==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.21.5"
+        "@babel/helper-plugin-utils": "^7.22.5"
       }
     },
     "@babel/plugin-transform-nullish-coalescing-operator": {
-      "version": "7.22.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-nullish-coalescing-operator/-/plugin-transform-nullish-coalescing-operator-7.22.3.tgz",
-      "integrity": "sha512-CpaoNp16nX7ROtLONNuCyenYdY/l7ZsR6aoVa7rW7nMWisoNoQNIH5Iay/4LDyRjKMuElMqXiBoOQCDLTMGZiw==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-nullish-coalescing-operator/-/plugin-transform-nullish-coalescing-operator-7.22.5.tgz",
+      "integrity": "sha512-6CF8g6z1dNYZ/VXok5uYkkBBICHZPiGEl7oDnAx2Mt1hlHVHOSIKWJaXHjQJA5VB43KZnXZDIexMchY4y2PGdA==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.21.5",
+        "@babel/helper-plugin-utils": "^7.22.5",
         "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3"
       }
     },
     "@babel/plugin-transform-numeric-separator": {
-      "version": "7.22.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-numeric-separator/-/plugin-transform-numeric-separator-7.22.3.tgz",
-      "integrity": "sha512-+AF88fPDJrnseMh5vD9+SH6wq4ZMvpiTMHh58uLs+giMEyASFVhcT3NkoyO+NebFCNnpHJEq5AXO2txV4AGPDQ==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-numeric-separator/-/plugin-transform-numeric-separator-7.22.5.tgz",
+      "integrity": "sha512-NbslED1/6M+sXiwwtcAB/nieypGw02Ejf4KtDeMkCEpP6gWFMX1wI9WKYua+4oBneCCEmulOkRpwywypVZzs/g==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.21.5",
+        "@babel/helper-plugin-utils": "^7.22.5",
         "@babel/plugin-syntax-numeric-separator": "^7.10.4"
       }
     },
     "@babel/plugin-transform-object-rest-spread": {
-      "version": "7.22.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-rest-spread/-/plugin-transform-object-rest-spread-7.22.3.tgz",
-      "integrity": "sha512-38bzTsqMMCI46/TQnJwPPpy33EjLCc1Gsm2hRTF6zTMWnKsN61vdrpuzIEGQyKEhDSYDKyZHrrd5FMj4gcUHhw==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-rest-spread/-/plugin-transform-object-rest-spread-7.22.5.tgz",
+      "integrity": "sha512-Kk3lyDmEslH9DnvCDA1s1kkd3YWQITiBOHngOtDL9Pt6BZjzqb6hiOlb8VfjiiQJ2unmegBqZu0rx5RxJb5vmQ==",
       "dev": true,
       "requires": {
-        "@babel/compat-data": "^7.22.3",
-        "@babel/helper-compilation-targets": "^7.22.1",
-        "@babel/helper-plugin-utils": "^7.21.5",
+        "@babel/compat-data": "^7.22.5",
+        "@babel/helper-compilation-targets": "^7.22.5",
+        "@babel/helper-plugin-utils": "^7.22.5",
         "@babel/plugin-syntax-object-rest-spread": "^7.8.3",
-        "@babel/plugin-transform-parameters": "^7.22.3"
+        "@babel/plugin-transform-parameters": "^7.22.5"
       }
     },
     "@babel/plugin-transform-object-super": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.18.6.tgz",
-      "integrity": "sha512-uvGz6zk+pZoS1aTZrOvrbj6Pp/kK2mp45t2B+bTDre2UgsZZ8EZLSJtUg7m/no0zOJUWgFONpB7Zv9W2tSaFlA==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.22.5.tgz",
+      "integrity": "sha512-klXqyaT9trSjIUrcsYIfETAzmOEZL3cBYqOYLJxBHfMFFggmXOv+NYSX/Jbs9mzMVESw/WycLFPRx8ba/b2Ipw==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.18.6",
-        "@babel/helper-replace-supers": "^7.18.6"
+        "@babel/helper-plugin-utils": "^7.22.5",
+        "@babel/helper-replace-supers": "^7.22.5"
       }
     },
     "@babel/plugin-transform-optional-catch-binding": {
-      "version": "7.22.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-optional-catch-binding/-/plugin-transform-optional-catch-binding-7.22.3.tgz",
-      "integrity": "sha512-bnDFWXFzWY0BsOyqaoSXvMQ2F35zutQipugog/rqotL2S4ciFOKlRYUu9djt4iq09oh2/34hqfRR2k1dIvuu4g==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-optional-catch-binding/-/plugin-transform-optional-catch-binding-7.22.5.tgz",
+      "integrity": "sha512-pH8orJahy+hzZje5b8e2QIlBWQvGpelS76C63Z+jhZKsmzfNaPQ+LaW6dcJ9bxTpo1mtXbgHwy765Ro3jftmUg==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.21.5",
+        "@babel/helper-plugin-utils": "^7.22.5",
         "@babel/plugin-syntax-optional-catch-binding": "^7.8.3"
       }
     },
     "@babel/plugin-transform-optional-chaining": {
-      "version": "7.22.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-optional-chaining/-/plugin-transform-optional-chaining-7.22.3.tgz",
-      "integrity": "sha512-63v3/UFFxhPKT8j8u1jTTGVyITxl7/7AfOqK8C5gz1rHURPUGe3y5mvIf68eYKGoBNahtJnTxBKug4BQOnzeJg==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-optional-chaining/-/plugin-transform-optional-chaining-7.22.5.tgz",
+      "integrity": "sha512-AconbMKOMkyG+xCng2JogMCDcqW8wedQAqpVIL4cOSescZ7+iW8utC6YDZLMCSUIReEA733gzRSaOSXMAt/4WQ==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.21.5",
-        "@babel/helper-skip-transparent-expression-wrappers": "^7.20.0",
+        "@babel/helper-plugin-utils": "^7.22.5",
+        "@babel/helper-skip-transparent-expression-wrappers": "^7.22.5",
         "@babel/plugin-syntax-optional-chaining": "^7.8.3"
       }
     },
     "@babel/plugin-transform-parameters": {
-      "version": "7.22.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.22.3.tgz",
-      "integrity": "sha512-x7QHQJHPuD9VmfpzboyGJ5aHEr9r7DsAsdxdhJiTB3J3j8dyl+NFZ+rX5Q2RWFDCs61c06qBfS4ys2QYn8UkMw==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.22.5.tgz",
+      "integrity": "sha512-AVkFUBurORBREOmHRKo06FjHYgjrabpdqRSwq6+C7R5iTCZOsM4QbcB27St0a4U6fffyAOqh3s/qEfybAhfivg==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.21.5"
+        "@babel/helper-plugin-utils": "^7.22.5"
       }
     },
     "@babel/plugin-transform-private-methods": {
-      "version": "7.22.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-private-methods/-/plugin-transform-private-methods-7.22.3.tgz",
-      "integrity": "sha512-fC7jtjBPFqhqpPAE+O4LKwnLq7gGkD3ZmC2E3i4qWH34mH3gOg2Xrq5YMHUq6DM30xhqM1DNftiRaSqVjEG+ug==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-private-methods/-/plugin-transform-private-methods-7.22.5.tgz",
+      "integrity": "sha512-PPjh4gyrQnGe97JTalgRGMuU4icsZFnWkzicB/fUtzlKUqvsWBKEpPPfr5a2JiyirZkHxnAqkQMO5Z5B2kK3fA==",
       "dev": true,
       "requires": {
-        "@babel/helper-create-class-features-plugin": "^7.22.1",
-        "@babel/helper-plugin-utils": "^7.21.5"
+        "@babel/helper-create-class-features-plugin": "^7.22.5",
+        "@babel/helper-plugin-utils": "^7.22.5"
       }
     },
     "@babel/plugin-transform-private-property-in-object": {
-      "version": "7.22.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-private-property-in-object/-/plugin-transform-private-property-in-object-7.22.3.tgz",
-      "integrity": "sha512-C7MMl4qWLpgVCbXfj3UW8rR1xeCnisQ0cU7YJHV//8oNBS0aCIVg1vFnZXxOckHhEpQyqNNkWmvSEWnMLlc+Vw==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-private-property-in-object/-/plugin-transform-private-property-in-object-7.22.5.tgz",
+      "integrity": "sha512-/9xnaTTJcVoBtSSmrVyhtSvO3kbqS2ODoh2juEU72c3aYonNF0OMGiaz2gjukyKM2wBBYJP38S4JiE0Wfb5VMQ==",
       "dev": true,
       "requires": {
-        "@babel/helper-annotate-as-pure": "^7.18.6",
-        "@babel/helper-create-class-features-plugin": "^7.22.1",
-        "@babel/helper-plugin-utils": "^7.21.5",
+        "@babel/helper-annotate-as-pure": "^7.22.5",
+        "@babel/helper-create-class-features-plugin": "^7.22.5",
+        "@babel/helper-plugin-utils": "^7.22.5",
         "@babel/plugin-syntax-private-property-in-object": "^7.14.5"
       }
     },
     "@babel/plugin-transform-property-literals": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.18.6.tgz",
-      "integrity": "sha512-cYcs6qlgafTud3PAzrrRNbQtfpQ8+y/+M5tKmksS9+M1ckbH6kzY8MrexEM9mcA6JDsukE19iIRvAyYl463sMg==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.22.5.tgz",
+      "integrity": "sha512-TiOArgddK3mK/x1Qwf5hay2pxI6wCZnvQqrFSqbtg1GLl2JcNMitVH/YnqjP+M31pLUeTfzY1HAXFDnUBV30rQ==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.18.6"
+        "@babel/helper-plugin-utils": "^7.22.5"
       }
     },
     "@babel/plugin-transform-regenerator": {
-      "version": "7.21.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.21.5.tgz",
-      "integrity": "sha512-ZoYBKDb6LyMi5yCsByQ5jmXsHAQDDYeexT1Szvlmui+lADvfSecr5Dxd/PkrTC3pAD182Fcju1VQkB4oCp9M+w==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.22.5.tgz",
+      "integrity": "sha512-rR7KePOE7gfEtNTh9Qw+iO3Q/e4DEsoQ+hdvM6QUDH7JRJ5qxq5AA52ZzBWbI5i9lfNuvySgOGP8ZN7LAmaiPw==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.21.5",
+        "@babel/helper-plugin-utils": "^7.22.5",
         "regenerator-transform": "^0.15.1"
       }
     },
     "@babel/plugin-transform-reserved-words": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.18.6.tgz",
-      "integrity": "sha512-oX/4MyMoypzHjFrT1CdivfKZ+XvIPMFXwwxHp/r0Ddy2Vuomt4HDFGmft1TAY2yiTKiNSsh3kjBAzcM8kSdsjA==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.22.5.tgz",
+      "integrity": "sha512-DTtGKFRQUDm8svigJzZHzb/2xatPc6TzNvAIJ5GqOKDsGFYgAskjRulbR/vGsPKq3OPqtexnz327qYpP57RFyA==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.18.6"
+        "@babel/helper-plugin-utils": "^7.22.5"
       }
     },
     "@babel/plugin-transform-runtime": {
@@ -18603,110 +18569,110 @@
       }
     },
     "@babel/plugin-transform-shorthand-properties": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.18.6.tgz",
-      "integrity": "sha512-eCLXXJqv8okzg86ywZJbRn19YJHU4XUa55oz2wbHhaQVn/MM+XhukiT7SYqp/7o00dg52Rj51Ny+Ecw4oyoygw==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.22.5.tgz",
+      "integrity": "sha512-vM4fq9IXHscXVKzDv5itkO1X52SmdFBFcMIBZ2FRn2nqVYqw6dBexUgMvAjHW+KXpPPViD/Yo3GrDEBaRC0QYA==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.18.6"
+        "@babel/helper-plugin-utils": "^7.22.5"
       }
     },
     "@babel/plugin-transform-spread": {
-      "version": "7.20.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.20.7.tgz",
-      "integrity": "sha512-ewBbHQ+1U/VnH1fxltbJqDeWBU1oNLG8Dj11uIv3xVf7nrQu0bPGe5Rf716r7K5Qz+SqtAOVswoVunoiBtGhxw==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.22.5.tgz",
+      "integrity": "sha512-5ZzDQIGyvN4w8+dMmpohL6MBo+l2G7tfC/O2Dg7/hjpgeWvUx8FzfeOKxGog9IimPa4YekaQ9PlDqTLOljkcxg==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.20.2",
-        "@babel/helper-skip-transparent-expression-wrappers": "^7.20.0"
+        "@babel/helper-plugin-utils": "^7.22.5",
+        "@babel/helper-skip-transparent-expression-wrappers": "^7.22.5"
       }
     },
     "@babel/plugin-transform-sticky-regex": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.18.6.tgz",
-      "integrity": "sha512-kfiDrDQ+PBsQDO85yj1icueWMfGfJFKN1KCkndygtu/C9+XUfydLC8Iv5UYJqRwy4zk8EcplRxEOeLyjq1gm6Q==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.22.5.tgz",
+      "integrity": "sha512-zf7LuNpHG0iEeiyCNwX4j3gDg1jgt1k3ZdXBKbZSoA3BbGQGvMiSvfbZRR3Dr3aeJe3ooWFZxOOG3IRStYp2Bw==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.18.6"
+        "@babel/helper-plugin-utils": "^7.22.5"
       }
     },
     "@babel/plugin-transform-template-literals": {
-      "version": "7.18.9",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.18.9.tgz",
-      "integrity": "sha512-S8cOWfT82gTezpYOiVaGHrCbhlHgKhQt8XH5ES46P2XWmX92yisoZywf5km75wv5sYcXDUCLMmMxOLCtthDgMA==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.22.5.tgz",
+      "integrity": "sha512-5ciOehRNf+EyUeewo8NkbQiUs4d6ZxiHo6BcBcnFlgiJfu16q0bQUw9Jvo0b0gBKFG1SMhDSjeKXSYuJLeFSMA==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.18.9"
+        "@babel/helper-plugin-utils": "^7.22.5"
       }
     },
     "@babel/plugin-transform-typeof-symbol": {
-      "version": "7.18.9",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.18.9.tgz",
-      "integrity": "sha512-SRfwTtF11G2aemAZWivL7PD+C9z52v9EvMqH9BuYbabyPuKUvSWks3oCg6041pT925L4zVFqaVBeECwsmlguEw==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.22.5.tgz",
+      "integrity": "sha512-bYkI5lMzL4kPii4HHEEChkD0rkc+nvnlR6+o/qdqR6zrm0Sv/nodmyLhlq2DO0YKLUNd2VePmPRjJXSBh9OIdA==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.18.9"
+        "@babel/helper-plugin-utils": "^7.22.5"
       }
     },
     "@babel/plugin-transform-unicode-escapes": {
-      "version": "7.21.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.21.5.tgz",
-      "integrity": "sha512-LYm/gTOwZqsYohlvFUe/8Tujz75LqqVC2w+2qPHLR+WyWHGCZPN1KBpJCJn+4Bk4gOkQy/IXKIge6az5MqwlOg==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.22.5.tgz",
+      "integrity": "sha512-biEmVg1IYB/raUO5wT1tgfacCef15Fbzhkx493D3urBI++6hpJ+RFG4SrWMn0NEZLfvilqKf3QDrRVZHo08FYg==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.21.5"
+        "@babel/helper-plugin-utils": "^7.22.5"
       }
     },
     "@babel/plugin-transform-unicode-property-regex": {
-      "version": "7.22.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-property-regex/-/plugin-transform-unicode-property-regex-7.22.3.tgz",
-      "integrity": "sha512-5ScJ+OmdX+O6HRuMGW4kv7RL9vIKdtdAj9wuWUKy1wbHY3jaM/UlyIiC1G7J6UJiiyMukjjK0QwL3P0vBd0yYg==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-property-regex/-/plugin-transform-unicode-property-regex-7.22.5.tgz",
+      "integrity": "sha512-HCCIb+CbJIAE6sXn5CjFQXMwkCClcOfPCzTlilJ8cUatfzwHlWQkbtV0zD338u9dZskwvuOYTuuaMaA8J5EI5A==",
       "dev": true,
       "requires": {
-        "@babel/helper-create-regexp-features-plugin": "^7.22.1",
-        "@babel/helper-plugin-utils": "^7.21.5"
+        "@babel/helper-create-regexp-features-plugin": "^7.22.5",
+        "@babel/helper-plugin-utils": "^7.22.5"
       }
     },
     "@babel/plugin-transform-unicode-regex": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.18.6.tgz",
-      "integrity": "sha512-gE7A6Lt7YLnNOL3Pb9BNeZvi+d8l7tcRrG4+pwJjK9hD2xX4mEvjlQW60G9EEmfXVYRPv9VRQcyegIVHCql/AA==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.22.5.tgz",
+      "integrity": "sha512-028laaOKptN5vHJf9/Arr/HiJekMd41hOEZYvNsrsXqJ7YPYuX2bQxh31fkZzGmq3YqHRJzYFFAVYvKfMPKqyg==",
       "dev": true,
       "requires": {
-        "@babel/helper-create-regexp-features-plugin": "^7.18.6",
-        "@babel/helper-plugin-utils": "^7.18.6"
+        "@babel/helper-create-regexp-features-plugin": "^7.22.5",
+        "@babel/helper-plugin-utils": "^7.22.5"
       }
     },
     "@babel/plugin-transform-unicode-sets-regex": {
-      "version": "7.22.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-sets-regex/-/plugin-transform-unicode-sets-regex-7.22.3.tgz",
-      "integrity": "sha512-hNufLdkF8vqywRp+P55j4FHXqAX2LRUccoZHH7AFn1pq5ZOO2ISKW9w13bFZVjBoTqeve2HOgoJCcaziJVhGNw==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-sets-regex/-/plugin-transform-unicode-sets-regex-7.22.5.tgz",
+      "integrity": "sha512-lhMfi4FC15j13eKrh3DnYHjpGj6UKQHtNKTbtc1igvAhRy4+kLhV07OpLcsN0VgDEw/MjAvJO4BdMJsHwMhzCg==",
       "dev": true,
       "requires": {
-        "@babel/helper-create-regexp-features-plugin": "^7.22.1",
-        "@babel/helper-plugin-utils": "^7.21.5"
+        "@babel/helper-create-regexp-features-plugin": "^7.22.5",
+        "@babel/helper-plugin-utils": "^7.22.5"
       }
     },
     "@babel/preset-env": {
-      "version": "7.22.4",
-      "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.22.4.tgz",
-      "integrity": "sha512-c3lHOjbwBv0TkhYCr+XCR6wKcSZ1QbQTVdSkZUaVpLv8CVWotBMArWUi5UAJrcrQaEnleVkkvaV8F/pmc/STZQ==",
-      "dev": true,
-      "requires": {
-        "@babel/compat-data": "^7.22.3",
-        "@babel/helper-compilation-targets": "^7.22.1",
-        "@babel/helper-plugin-utils": "^7.21.5",
-        "@babel/helper-validator-option": "^7.21.0",
-        "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": "^7.18.6",
-        "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": "^7.22.3",
-        "@babel/plugin-proposal-private-property-in-object": "^7.21.0",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.22.5.tgz",
+      "integrity": "sha512-fj06hw89dpiZzGZtxn+QybifF07nNiZjZ7sazs2aVDcysAZVGjW7+7iFYxg6GLNM47R/thYfLdrXc+2f11Vi9A==",
+      "dev": true,
+      "requires": {
+        "@babel/compat-data": "^7.22.5",
+        "@babel/helper-compilation-targets": "^7.22.5",
+        "@babel/helper-plugin-utils": "^7.22.5",
+        "@babel/helper-validator-option": "^7.22.5",
+        "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": "^7.22.5",
+        "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": "^7.22.5",
+        "@babel/plugin-proposal-private-property-in-object": "7.21.0-placeholder-for-preset-env.2",
         "@babel/plugin-syntax-async-generators": "^7.8.4",
         "@babel/plugin-syntax-class-properties": "^7.12.13",
         "@babel/plugin-syntax-class-static-block": "^7.14.5",
         "@babel/plugin-syntax-dynamic-import": "^7.8.3",
         "@babel/plugin-syntax-export-namespace-from": "^7.8.3",
-        "@babel/plugin-syntax-import-assertions": "^7.20.0",
-        "@babel/plugin-syntax-import-attributes": "^7.22.3",
+        "@babel/plugin-syntax-import-assertions": "^7.22.5",
+        "@babel/plugin-syntax-import-attributes": "^7.22.5",
         "@babel/plugin-syntax-import-meta": "^7.10.4",
         "@babel/plugin-syntax-json-strings": "^7.8.3",
         "@babel/plugin-syntax-logical-assignment-operators": "^7.10.4",
@@ -18718,56 +18684,56 @@
         "@babel/plugin-syntax-private-property-in-object": "^7.14.5",
         "@babel/plugin-syntax-top-level-await": "^7.14.5",
         "@babel/plugin-syntax-unicode-sets-regex": "^7.18.6",
-        "@babel/plugin-transform-arrow-functions": "^7.21.5",
-        "@babel/plugin-transform-async-generator-functions": "^7.22.3",
-        "@babel/plugin-transform-async-to-generator": "^7.20.7",
-        "@babel/plugin-transform-block-scoped-functions": "^7.18.6",
-        "@babel/plugin-transform-block-scoping": "^7.21.0",
-        "@babel/plugin-transform-class-properties": "^7.22.3",
-        "@babel/plugin-transform-class-static-block": "^7.22.3",
-        "@babel/plugin-transform-classes": "^7.21.0",
-        "@babel/plugin-transform-computed-properties": "^7.21.5",
-        "@babel/plugin-transform-destructuring": "^7.21.3",
-        "@babel/plugin-transform-dotall-regex": "^7.18.6",
-        "@babel/plugin-transform-duplicate-keys": "^7.18.9",
-        "@babel/plugin-transform-dynamic-import": "^7.22.1",
-        "@babel/plugin-transform-exponentiation-operator": "^7.18.6",
-        "@babel/plugin-transform-export-namespace-from": "^7.22.3",
-        "@babel/plugin-transform-for-of": "^7.21.5",
-        "@babel/plugin-transform-function-name": "^7.18.9",
-        "@babel/plugin-transform-json-strings": "^7.22.3",
-        "@babel/plugin-transform-literals": "^7.18.9",
-        "@babel/plugin-transform-logical-assignment-operators": "^7.22.3",
-        "@babel/plugin-transform-member-expression-literals": "^7.18.6",
-        "@babel/plugin-transform-modules-amd": "^7.20.11",
-        "@babel/plugin-transform-modules-commonjs": "^7.21.5",
-        "@babel/plugin-transform-modules-systemjs": "^7.22.3",
-        "@babel/plugin-transform-modules-umd": "^7.18.6",
-        "@babel/plugin-transform-named-capturing-groups-regex": "^7.22.3",
-        "@babel/plugin-transform-new-target": "^7.22.3",
-        "@babel/plugin-transform-nullish-coalescing-operator": "^7.22.3",
-        "@babel/plugin-transform-numeric-separator": "^7.22.3",
-        "@babel/plugin-transform-object-rest-spread": "^7.22.3",
-        "@babel/plugin-transform-object-super": "^7.18.6",
-        "@babel/plugin-transform-optional-catch-binding": "^7.22.3",
-        "@babel/plugin-transform-optional-chaining": "^7.22.3",
-        "@babel/plugin-transform-parameters": "^7.22.3",
-        "@babel/plugin-transform-private-methods": "^7.22.3",
-        "@babel/plugin-transform-private-property-in-object": "^7.22.3",
-        "@babel/plugin-transform-property-literals": "^7.18.6",
-        "@babel/plugin-transform-regenerator": "^7.21.5",
-        "@babel/plugin-transform-reserved-words": "^7.18.6",
-        "@babel/plugin-transform-shorthand-properties": "^7.18.6",
-        "@babel/plugin-transform-spread": "^7.20.7",
-        "@babel/plugin-transform-sticky-regex": "^7.18.6",
-        "@babel/plugin-transform-template-literals": "^7.18.9",
-        "@babel/plugin-transform-typeof-symbol": "^7.18.9",
-        "@babel/plugin-transform-unicode-escapes": "^7.21.5",
-        "@babel/plugin-transform-unicode-property-regex": "^7.22.3",
-        "@babel/plugin-transform-unicode-regex": "^7.18.6",
-        "@babel/plugin-transform-unicode-sets-regex": "^7.22.3",
+        "@babel/plugin-transform-arrow-functions": "^7.22.5",
+        "@babel/plugin-transform-async-generator-functions": "^7.22.5",
+        "@babel/plugin-transform-async-to-generator": "^7.22.5",
+        "@babel/plugin-transform-block-scoped-functions": "^7.22.5",
+        "@babel/plugin-transform-block-scoping": "^7.22.5",
+        "@babel/plugin-transform-class-properties": "^7.22.5",
+        "@babel/plugin-transform-class-static-block": "^7.22.5",
+        "@babel/plugin-transform-classes": "^7.22.5",
+        "@babel/plugin-transform-computed-properties": "^7.22.5",
+        "@babel/plugin-transform-destructuring": "^7.22.5",
+        "@babel/plugin-transform-dotall-regex": "^7.22.5",
+        "@babel/plugin-transform-duplicate-keys": "^7.22.5",
+        "@babel/plugin-transform-dynamic-import": "^7.22.5",
+        "@babel/plugin-transform-exponentiation-operator": "^7.22.5",
+        "@babel/plugin-transform-export-namespace-from": "^7.22.5",
+        "@babel/plugin-transform-for-of": "^7.22.5",
+        "@babel/plugin-transform-function-name": "^7.22.5",
+        "@babel/plugin-transform-json-strings": "^7.22.5",
+        "@babel/plugin-transform-literals": "^7.22.5",
+        "@babel/plugin-transform-logical-assignment-operators": "^7.22.5",
+        "@babel/plugin-transform-member-expression-literals": "^7.22.5",
+        "@babel/plugin-transform-modules-amd": "^7.22.5",
+        "@babel/plugin-transform-modules-commonjs": "^7.22.5",
+        "@babel/plugin-transform-modules-systemjs": "^7.22.5",
+        "@babel/plugin-transform-modules-umd": "^7.22.5",
+        "@babel/plugin-transform-named-capturing-groups-regex": "^7.22.5",
+        "@babel/plugin-transform-new-target": "^7.22.5",
+        "@babel/plugin-transform-nullish-coalescing-operator": "^7.22.5",
+        "@babel/plugin-transform-numeric-separator": "^7.22.5",
+        "@babel/plugin-transform-object-rest-spread": "^7.22.5",
+        "@babel/plugin-transform-object-super": "^7.22.5",
+        "@babel/plugin-transform-optional-catch-binding": "^7.22.5",
+        "@babel/plugin-transform-optional-chaining": "^7.22.5",
+        "@babel/plugin-transform-parameters": "^7.22.5",
+        "@babel/plugin-transform-private-methods": "^7.22.5",
+        "@babel/plugin-transform-private-property-in-object": "^7.22.5",
+        "@babel/plugin-transform-property-literals": "^7.22.5",
+        "@babel/plugin-transform-regenerator": "^7.22.5",
+        "@babel/plugin-transform-reserved-words": "^7.22.5",
+        "@babel/plugin-transform-shorthand-properties": "^7.22.5",
+        "@babel/plugin-transform-spread": "^7.22.5",
+        "@babel/plugin-transform-sticky-regex": "^7.22.5",
+        "@babel/plugin-transform-template-literals": "^7.22.5",
+        "@babel/plugin-transform-typeof-symbol": "^7.22.5",
+        "@babel/plugin-transform-unicode-escapes": "^7.22.5",
+        "@babel/plugin-transform-unicode-property-regex": "^7.22.5",
+        "@babel/plugin-transform-unicode-regex": "^7.22.5",
+        "@babel/plugin-transform-unicode-sets-regex": "^7.22.5",
         "@babel/preset-modules": "^0.1.5",
-        "@babel/types": "^7.22.4",
+        "@babel/types": "^7.22.5",
         "babel-plugin-polyfill-corejs2": "^0.4.3",
         "babel-plugin-polyfill-corejs3": "^0.8.1",
         "babel-plugin-polyfill-regenerator": "^0.5.0",
@@ -18839,39 +18805,39 @@
       }
     },
     "@babel/template": {
-      "version": "7.21.9",
-      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.21.9.tgz",
-      "integrity": "sha512-MK0X5k8NKOuWRamiEfc3KEJiHMTkGZNUjzMipqCGDDc6ijRl/B7RGSKVGncu4Ro/HdyzzY6cmoXuKI2Gffk7vQ==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.22.5.tgz",
+      "integrity": "sha512-X7yV7eiwAxdj9k94NEylvbVHLiVG1nvzCV2EAowhxLTwODV1jl9UzZ48leOC0sH7OnuHrIkllaBgneUykIcZaw==",
       "requires": {
-        "@babel/code-frame": "^7.21.4",
-        "@babel/parser": "^7.21.9",
-        "@babel/types": "^7.21.5"
+        "@babel/code-frame": "^7.22.5",
+        "@babel/parser": "^7.22.5",
+        "@babel/types": "^7.22.5"
       }
     },
     "@babel/traverse": {
-      "version": "7.22.1",
-      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.22.1.tgz",
-      "integrity": "sha512-lAWkdCoUFnmwLBhIRLciFntGYsIIoC6vIbN8zrLPqBnJmPu7Z6nzqnKd7FsxQUNAvZfVZ0x6KdNvNp8zWIOHSQ==",
-      "requires": {
-        "@babel/code-frame": "^7.21.4",
-        "@babel/generator": "^7.22.0",
-        "@babel/helper-environment-visitor": "^7.22.1",
-        "@babel/helper-function-name": "^7.21.0",
-        "@babel/helper-hoist-variables": "^7.18.6",
-        "@babel/helper-split-export-declaration": "^7.18.6",
-        "@babel/parser": "^7.22.0",
-        "@babel/types": "^7.22.0",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.22.5.tgz",
+      "integrity": "sha512-7DuIjPgERaNo6r+PZwItpjCZEa5vyw4eJGufeLxrPdBXBoLcCJCIasvK6pK/9DVNrLZTLFhUGqaC6X/PA007TQ==",
+      "requires": {
+        "@babel/code-frame": "^7.22.5",
+        "@babel/generator": "^7.22.5",
+        "@babel/helper-environment-visitor": "^7.22.5",
+        "@babel/helper-function-name": "^7.22.5",
+        "@babel/helper-hoist-variables": "^7.22.5",
+        "@babel/helper-split-export-declaration": "^7.22.5",
+        "@babel/parser": "^7.22.5",
+        "@babel/types": "^7.22.5",
         "debug": "^4.1.0",
         "globals": "^11.1.0"
       }
     },
     "@babel/types": {
-      "version": "7.22.4",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.22.4.tgz",
-      "integrity": "sha512-Tx9x3UBHTTsMSW85WB2kphxYQVvrZ/t1FxD88IpSgIjiUJlCm9z+xWIDwyo1vffTwSqteqyznB8ZE9vYYk16zA==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.22.5.tgz",
+      "integrity": "sha512-zo3MIHGOkPOfoRXitsgHLjEXmlDaD/5KU1Uzuc9GNiZPhSqVxVRtxuPaSBZDsYZ9qV88AjtMtWW7ww98loJ9KA==",
       "requires": {
-        "@babel/helper-string-parser": "^7.21.5",
-        "@babel/helper-validator-identifier": "^7.19.1",
+        "@babel/helper-string-parser": "^7.22.5",
+        "@babel/helper-validator-identifier": "^7.22.5",
         "to-fast-properties": "^2.0.0"
       }
     },
diff --git a/apps/block_scout_web/assets/package.json b/apps/block_scout_web/assets/package.json
index 2a53be17b2d5..3884176cdbd9 100644
--- a/apps/block_scout_web/assets/package.json
+++ b/apps/block_scout_web/assets/package.json
@@ -84,7 +84,7 @@
   },
   "devDependencies": {
     "@babel/core": "^7.22.1",
-    "@babel/preset-env": "^7.22.4",
+    "@babel/preset-env": "^7.22.5",
     "autoprefixer": "^10.4.14",
     "babel-loader": "^9.1.2",
     "copy-webpack-plugin": "^11.0.0",

From ec69d53edfe89fff0331272835c4fb6c01e75c6d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 8 Jun 2023 19:05:06 +0000
Subject: [PATCH 085/909] Bump ecto from 3.10.1 to 3.10.2

Bumps [ecto](https://github.com/elixir-ecto/ecto) from 3.10.1 to 3.10.2.
- [Release notes](https://github.com/elixir-ecto/ecto/releases)
- [Changelog](https://github.com/elixir-ecto/ecto/blob/master/CHANGELOG.md)
- [Commits](https://github.com/elixir-ecto/ecto/compare/v3.10.1...v3.10.2)

---
updated-dependencies:
- dependency-name: ecto
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 mix.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mix.lock b/mix.lock
index 27ca7b0748e3..ebe31ddcb302 100644
--- a/mix.lock
+++ b/mix.lock
@@ -37,7 +37,7 @@
   "dialyxir": {:hex, :dialyxir, "1.3.0", "fd1672f0922b7648ff9ce7b1b26fcf0ef56dda964a459892ad15f6b4410b5284", [:mix], [{:erlex, ">= 0.2.6", [hex: :erlex, repo: "hexpm", optional: false]}], "hexpm", "00b2a4bcd6aa8db9dcb0b38c1225b7277dca9bc370b6438715667071a304696f"},
   "digital_token": {:hex, :digital_token, "0.4.0", "2ad6894d4a40be8b2890aad286ecd5745fa473fa5699d80361a8c94428edcd1f", [:mix], [{:cldr_utils, "~> 2.17", [hex: :cldr_utils, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: false]}], "hexpm", "a178edf61d1fee5bb3c34e14b0f4ee21809ee87cade8738f87337e59e5e66e26"},
   "earmark_parser": {:hex, :earmark_parser, "1.4.32", "fa739a0ecfa34493de19426681b23f6814573faee95dfd4b4aafe15a7b5b32c6", [:mix], [], "hexpm", "b8b0dd77d60373e77a3d7e8afa598f325e49e8663a51bcc2b88ef41838cca755"},
-  "ecto": {:hex, :ecto, "3.10.1", "c6757101880e90acc6125b095853176a02da8f1afe056f91f1f90b80c9389822", [:mix], [{:decimal, "~> 1.6 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}, {:telemetry, "~> 0.4 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "d2ac4255f1601bdf7ac74c0ed971102c6829dc158719b94bd30041bbad77f87a"},
+  "ecto": {:hex, :ecto, "3.10.2", "6b887160281a61aa16843e47735b8a266caa437f80588c3ab80a8a960e6abe37", [:mix], [{:decimal, "~> 1.6 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}, {:telemetry, "~> 0.4 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "6a895778f0d7648a4b34b486af59a1c8009041fbdf2b17f1ac215eb829c60235"},
   "ecto_sql": {:hex, :ecto_sql, "3.10.1", "6ea6b3036a0b0ca94c2a02613fd9f742614b5cfe494c41af2e6571bb034dd94c", [:mix], [{:db_connection, "~> 2.5 or ~> 2.4.1", [hex: :db_connection, repo: "hexpm", optional: false]}, {:ecto, "~> 3.10.0", [hex: :ecto, repo: "hexpm", optional: false]}, {:myxql, "~> 0.6.0", [hex: :myxql, repo: "hexpm", optional: true]}, {:postgrex, "~> 0.16.0 or ~> 0.17.0 or ~> 1.0", [hex: :postgrex, repo: "hexpm", optional: true]}, {:tds, "~> 2.1.1 or ~> 2.2", [hex: :tds, repo: "hexpm", optional: true]}, {:telemetry, "~> 0.4.0 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "f6a25bdbbd695f12c8171eaff0851fa4c8e72eec1e98c7364402dda9ce11c56b"},
   "elixir_make": {:hex, :elixir_make, "0.6.3", "bc07d53221216838d79e03a8019d0839786703129599e9619f4ab74c8c096eac", [:mix], [], "hexpm", "f5cbd651c5678bcaabdbb7857658ee106b12509cd976c2c2fca99688e1daf716"},
   "erlex": {:hex, :erlex, "0.2.6", "c7987d15e899c7a2f34f5420d2a2ea0d659682c06ac607572df55a43753aa12e", [:mix], [], "hexpm", "2ed2e25711feb44d52b17d2780eabf998452f6efda104877a3881c2f8c0c0c75"},

From e5dbe613e8dcf8ebc470ec899eee63fb71b09d31 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 9 Jun 2023 08:32:59 +0000
Subject: [PATCH 086/909] Bump @babel/core from 7.22.1 to 7.22.5 in
 /apps/block_scout_web/assets

Bumps [@babel/core](https://github.com/babel/babel/tree/HEAD/packages/babel-core) from 7.22.1 to 7.22.5.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/commits/v7.22.5/packages/babel-core)

---
updated-dependencies:
- dependency-name: "@babel/core"
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 apps/block_scout_web/assets/package-lock.json | 74 +++++++++----------
 apps/block_scout_web/assets/package.json      |  2 +-
 2 files changed, 38 insertions(+), 38 deletions(-)

diff --git a/apps/block_scout_web/assets/package-lock.json b/apps/block_scout_web/assets/package-lock.json
index ba8c2a069646..2d85397f4da2 100644
--- a/apps/block_scout_web/assets/package-lock.json
+++ b/apps/block_scout_web/assets/package-lock.json
@@ -71,7 +71,7 @@
         "xss": "^1.0.14"
       },
       "devDependencies": {
-        "@babel/core": "^7.22.1",
+        "@babel/core": "^7.22.5",
         "@babel/preset-env": "^7.22.5",
         "autoprefixer": "^10.4.14",
         "babel-loader": "^9.1.2",
@@ -257,20 +257,20 @@
       }
     },
     "node_modules/@babel/core": {
-      "version": "7.22.1",
-      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.22.1.tgz",
-      "integrity": "sha512-Hkqu7J4ynysSXxmAahpN1jjRwVJ+NdpraFLIWflgjpVob3KNyK3/tIUc7Q7szed8WMp0JNa7Qtd1E9Oo22F9gA==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.22.5.tgz",
+      "integrity": "sha512-SBuTAjg91A3eKOvD+bPEz3LlhHZRNu1nFOVts9lzDJTXshHTjII0BAtDS3Y2DAkdZdDKWVZGVwkDfc4Clxn1dg==",
       "dependencies": {
         "@ampproject/remapping": "^2.2.0",
-        "@babel/code-frame": "^7.21.4",
-        "@babel/generator": "^7.22.0",
-        "@babel/helper-compilation-targets": "^7.22.1",
-        "@babel/helper-module-transforms": "^7.22.1",
-        "@babel/helpers": "^7.22.0",
-        "@babel/parser": "^7.22.0",
-        "@babel/template": "^7.21.9",
-        "@babel/traverse": "^7.22.1",
-        "@babel/types": "^7.22.0",
+        "@babel/code-frame": "^7.22.5",
+        "@babel/generator": "^7.22.5",
+        "@babel/helper-compilation-targets": "^7.22.5",
+        "@babel/helper-module-transforms": "^7.22.5",
+        "@babel/helpers": "^7.22.5",
+        "@babel/parser": "^7.22.5",
+        "@babel/template": "^7.22.5",
+        "@babel/traverse": "^7.22.5",
+        "@babel/types": "^7.22.5",
         "convert-source-map": "^1.7.0",
         "debug": "^4.1.0",
         "gensync": "^1.0.0-beta.2",
@@ -610,13 +610,13 @@
       }
     },
     "node_modules/@babel/helpers": {
-      "version": "7.22.0",
-      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.22.0.tgz",
-      "integrity": "sha512-I/hZCYErxdjuUnJpJxHmCESB3AdcOAFjj+K6+of9JyWBeAhggR9NQoUHI481pRNH87cx77mbpx0cygzXlvGayA==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.22.5.tgz",
+      "integrity": "sha512-pSXRmfE1vzcUIDFQcSGA5Mr+GxBV9oiRKDuDxXvWQQBCh8HoIjs/2DlDB7H8smac1IVrB9/xdXj2N3Wol9Cr+Q==",
       "dependencies": {
-        "@babel/template": "^7.21.9",
-        "@babel/traverse": "^7.22.0",
-        "@babel/types": "^7.22.0"
+        "@babel/template": "^7.22.5",
+        "@babel/traverse": "^7.22.5",
+        "@babel/types": "^7.22.5"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -17630,20 +17630,20 @@
       "integrity": "sha512-4Jc/YuIaYqKnDDz892kPIledykKg12Aw1PYX5i/TY28anJtacvM1Rrr8wbieB9GfEJwlzqT0hUEao0CxEebiDA=="
     },
     "@babel/core": {
-      "version": "7.22.1",
-      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.22.1.tgz",
-      "integrity": "sha512-Hkqu7J4ynysSXxmAahpN1jjRwVJ+NdpraFLIWflgjpVob3KNyK3/tIUc7Q7szed8WMp0JNa7Qtd1E9Oo22F9gA==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.22.5.tgz",
+      "integrity": "sha512-SBuTAjg91A3eKOvD+bPEz3LlhHZRNu1nFOVts9lzDJTXshHTjII0BAtDS3Y2DAkdZdDKWVZGVwkDfc4Clxn1dg==",
       "requires": {
         "@ampproject/remapping": "^2.2.0",
-        "@babel/code-frame": "^7.21.4",
-        "@babel/generator": "^7.22.0",
-        "@babel/helper-compilation-targets": "^7.22.1",
-        "@babel/helper-module-transforms": "^7.22.1",
-        "@babel/helpers": "^7.22.0",
-        "@babel/parser": "^7.22.0",
-        "@babel/template": "^7.21.9",
-        "@babel/traverse": "^7.22.1",
-        "@babel/types": "^7.22.0",
+        "@babel/code-frame": "^7.22.5",
+        "@babel/generator": "^7.22.5",
+        "@babel/helper-compilation-targets": "^7.22.5",
+        "@babel/helper-module-transforms": "^7.22.5",
+        "@babel/helpers": "^7.22.5",
+        "@babel/parser": "^7.22.5",
+        "@babel/template": "^7.22.5",
+        "@babel/traverse": "^7.22.5",
+        "@babel/types": "^7.22.5",
         "convert-source-map": "^1.7.0",
         "debug": "^4.1.0",
         "gensync": "^1.0.0-beta.2",
@@ -17894,13 +17894,13 @@
       }
     },
     "@babel/helpers": {
-      "version": "7.22.0",
-      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.22.0.tgz",
-      "integrity": "sha512-I/hZCYErxdjuUnJpJxHmCESB3AdcOAFjj+K6+of9JyWBeAhggR9NQoUHI481pRNH87cx77mbpx0cygzXlvGayA==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.22.5.tgz",
+      "integrity": "sha512-pSXRmfE1vzcUIDFQcSGA5Mr+GxBV9oiRKDuDxXvWQQBCh8HoIjs/2DlDB7H8smac1IVrB9/xdXj2N3Wol9Cr+Q==",
       "requires": {
-        "@babel/template": "^7.21.9",
-        "@babel/traverse": "^7.22.0",
-        "@babel/types": "^7.22.0"
+        "@babel/template": "^7.22.5",
+        "@babel/traverse": "^7.22.5",
+        "@babel/types": "^7.22.5"
       }
     },
     "@babel/highlight": {
diff --git a/apps/block_scout_web/assets/package.json b/apps/block_scout_web/assets/package.json
index 3884176cdbd9..52daeae8831c 100644
--- a/apps/block_scout_web/assets/package.json
+++ b/apps/block_scout_web/assets/package.json
@@ -83,7 +83,7 @@
     "xss": "^1.0.14"
   },
   "devDependencies": {
-    "@babel/core": "^7.22.1",
+    "@babel/core": "^7.22.5",
     "@babel/preset-env": "^7.22.5",
     "autoprefixer": "^10.4.14",
     "babel-loader": "^9.1.2",

From b704c8da9da189763593bd846d1956c8ea08d4cf Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 9 Jun 2023 19:00:33 +0000
Subject: [PATCH 087/909] Bump @amplitude/analytics-browser in
 /apps/block_scout_web/assets

Bumps [@amplitude/analytics-browser](https://github.com/amplitude/Amplitude-TypeScript) from 1.10.7 to 1.10.8.
- [Release notes](https://github.com/amplitude/Amplitude-TypeScript/releases)
- [Commits](https://github.com/amplitude/Amplitude-TypeScript/compare/@amplitude/analytics-browser@1.10.7...@amplitude/analytics-browser@1.10.8)

---
updated-dependencies:
- dependency-name: "@amplitude/analytics-browser"
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 apps/block_scout_web/assets/package-lock.json | 126 +++++++++---------
 apps/block_scout_web/assets/package.json      |   2 +-
 2 files changed, 64 insertions(+), 64 deletions(-)

diff --git a/apps/block_scout_web/assets/package-lock.json b/apps/block_scout_web/assets/package-lock.json
index 0b00f1149192..861d90dc3e18 100644
--- a/apps/block_scout_web/assets/package-lock.json
+++ b/apps/block_scout_web/assets/package-lock.json
@@ -7,7 +7,7 @@
       "name": "blockscout",
       "license": "GPL-3.0",
       "dependencies": {
-        "@amplitude/analytics-browser": "^1.10.7",
+        "@amplitude/analytics-browser": "^1.10.8",
         "@fortawesome/fontawesome-free": "^6.4.0",
         "@tarekraafat/autocomplete.js": "^10.2.7",
         "@walletconnect/web3-provider": "^1.8.0",
@@ -107,15 +107,15 @@
       "version": "0.0.1"
     },
     "node_modules/@amplitude/analytics-browser": {
-      "version": "1.10.7",
-      "resolved": "https://registry.npmjs.org/@amplitude/analytics-browser/-/analytics-browser-1.10.7.tgz",
-      "integrity": "sha512-gN1DMJHEZSc5ApF0xtkN4jBNl/69v9djREYYKsJMYRPkgKE8jn7oCB5H9tuRu99zeKdMMeAF7g3QzTBxOT+owA==",
-      "dependencies": {
-        "@amplitude/analytics-client-common": "^1.0.0",
-        "@amplitude/analytics-core": "^1.0.0",
-        "@amplitude/analytics-types": "^1.0.0",
-        "@amplitude/plugin-page-view-tracking-browser": "^1.0.1",
-        "@amplitude/plugin-web-attribution-browser": "^1.0.1",
+      "version": "1.10.8",
+      "resolved": "https://registry.npmjs.org/@amplitude/analytics-browser/-/analytics-browser-1.10.8.tgz",
+      "integrity": "sha512-8rsOvU7fqBbkHaVSi/3WQ2bRvxR45n3Bqojk3UBxpypKAdqt2xcbngAuGD6/JdKBOJ4iJMwRAKojZgr1kzN3WQ==",
+      "dependencies": {
+        "@amplitude/analytics-client-common": "^1.0.1",
+        "@amplitude/analytics-core": "^1.1.0",
+        "@amplitude/analytics-types": "^1.1.0",
+        "@amplitude/plugin-page-view-tracking-browser": "^1.0.2",
+        "@amplitude/plugin-web-attribution-browser": "^1.0.2",
         "@amplitude/ua-parser-js": "^0.7.31",
         "tslib": "^2.4.1"
       }
@@ -126,13 +126,13 @@
       "integrity": "sha512-tGyy4dAjRIEwI7BzsB0lynWgOpfqjUdq91XXAlIWD2OwKBH7oCl/GZG/HT4BOHrTlPMOASlMQ7veyTqpmRcrNA=="
     },
     "node_modules/@amplitude/analytics-client-common": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/@amplitude/analytics-client-common/-/analytics-client-common-1.0.0.tgz",
-      "integrity": "sha512-nHDGTjGBFTZiaPdleRhQDBBsxJj3HJJTGV4PsI0HASaCp/fV0PM/BBal0jFZD9VI/WcfeCDvHkXD5KV2+ErH1g==",
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/@amplitude/analytics-client-common/-/analytics-client-common-1.0.1.tgz",
+      "integrity": "sha512-PEZrZzrAyVQKb+vYEc6cPBamFNH0XQ+LUIlROZWC78PmwcEfpZD/3/PQMqRQidyTsklpAx8vJgqJImyA/Hafng==",
       "dependencies": {
         "@amplitude/analytics-connector": "^1.4.5",
-        "@amplitude/analytics-core": "^1.0.0",
-        "@amplitude/analytics-types": "^1.0.0",
+        "@amplitude/analytics-core": "^1.1.0",
+        "@amplitude/analytics-types": "^1.1.0",
         "tslib": "^2.4.1"
       }
     },
@@ -147,11 +147,11 @@
       "integrity": "sha512-dFW7c7Wb6Ng7vbmzwbaXZSpqfBx37ukamJV9ErFYYS8vGZK/Hkbt3M7fZHBI4WFU6CCwakr2ZXPme11uGPYWkQ=="
     },
     "node_modules/@amplitude/analytics-core": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/@amplitude/analytics-core/-/analytics-core-1.0.0.tgz",
-      "integrity": "sha512-ZOxaySYqjcG08QaIbV/vsM6I2CBHWyYCaQLiZp+M3LYud7J9WtoZevEvwQeBPEWixg7Q32ddws2+iAnEsDOXbw==",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/@amplitude/analytics-core/-/analytics-core-1.1.0.tgz",
+      "integrity": "sha512-mWp753c9tAP54+9z+WFnZaUnWbhI4o3WQtRQIA954UEnqgKTuUIkKLyb8zrh8zKVf1MUuZDuEE+zI5Gs05mk7A==",
       "dependencies": {
-        "@amplitude/analytics-types": "^1.0.0",
+        "@amplitude/analytics-types": "^1.1.0",
         "tslib": "^2.4.1"
       }
     },
@@ -161,17 +161,17 @@
       "integrity": "sha512-mSxlJJwl3BMEQCUNnxXBU9jP4JBktcEGhURcPR6VQVlnP0FdDEsIaz0C35dXNGLyRfrATNofF0F5p2KPxQgB+w=="
     },
     "node_modules/@amplitude/analytics-types": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/@amplitude/analytics-types/-/analytics-types-1.0.0.tgz",
-      "integrity": "sha512-mKqa7Ui5Hfa8otLVCC9GU9eE5l7ZtnUPZcGkL6tM51nFtUnMuCpDVlBwlTYukRc12U2E0MXIba4Q2mVmg8Mj8A=="
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/@amplitude/analytics-types/-/analytics-types-1.1.0.tgz",
+      "integrity": "sha512-FAJMewKuiDbcnG5aGSpxwXPy31clqyK0tIGi27AVL2Dnf+7jUbphMB6s1AijXfB5+OdMY51N+jzapD5C+pR0Wg=="
     },
     "node_modules/@amplitude/plugin-page-view-tracking-browser": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/@amplitude/plugin-page-view-tracking-browser/-/plugin-page-view-tracking-browser-1.0.1.tgz",
-      "integrity": "sha512-5dB8Vo0BFm/K77YcG6MKMYrUlTK4A/K25nCx8K5KEndWqeskKANUWjlG/9NAGKx4WPH8vs3mYffDwXfXTOeY1A==",
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/@amplitude/plugin-page-view-tracking-browser/-/plugin-page-view-tracking-browser-1.0.2.tgz",
+      "integrity": "sha512-jBReKXkn6Qq5fgAb7kR6YkPbdRi1idcH6u5iIPAGfuciAb9qKcNj7lAcAcIT9nS1DGsvRo1qsn1/UH548b/Tew==",
       "dependencies": {
-        "@amplitude/analytics-client-common": "^1.0.0",
-        "@amplitude/analytics-types": "^1.0.0",
+        "@amplitude/analytics-client-common": "^1.0.1",
+        "@amplitude/analytics-types": "^1.1.0",
         "tslib": "^2.4.1"
       }
     },
@@ -181,12 +181,12 @@
       "integrity": "sha512-mSxlJJwl3BMEQCUNnxXBU9jP4JBktcEGhURcPR6VQVlnP0FdDEsIaz0C35dXNGLyRfrATNofF0F5p2KPxQgB+w=="
     },
     "node_modules/@amplitude/plugin-web-attribution-browser": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/@amplitude/plugin-web-attribution-browser/-/plugin-web-attribution-browser-1.0.1.tgz",
-      "integrity": "sha512-5pwCTEw1zEC2h2YtVfYvaLGm8lAzyZAQZc3qEYGuQPgklewQMX3T9Zgv7UcHvLXQqBuQjAYYXeI5FKqrUYwTVw==",
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/@amplitude/plugin-web-attribution-browser/-/plugin-web-attribution-browser-1.0.2.tgz",
+      "integrity": "sha512-80M4ZjZjlg7nmslIdWBOUBMVMZMa4OXoWmTviu38jFMjbO7JsZil/V1rwb3d/tpyceHt/yNQes4yknQWeiZAQw==",
       "dependencies": {
-        "@amplitude/analytics-client-common": "^1.0.0",
-        "@amplitude/analytics-types": "^1.0.0",
+        "@amplitude/analytics-client-common": "^1.0.1",
+        "@amplitude/analytics-types": "^1.1.0",
         "tslib": "^2.4.1"
       }
     },
@@ -17493,15 +17493,15 @@
   },
   "dependencies": {
     "@amplitude/analytics-browser": {
-      "version": "1.10.7",
-      "resolved": "https://registry.npmjs.org/@amplitude/analytics-browser/-/analytics-browser-1.10.7.tgz",
-      "integrity": "sha512-gN1DMJHEZSc5ApF0xtkN4jBNl/69v9djREYYKsJMYRPkgKE8jn7oCB5H9tuRu99zeKdMMeAF7g3QzTBxOT+owA==",
-      "requires": {
-        "@amplitude/analytics-client-common": "^1.0.0",
-        "@amplitude/analytics-core": "^1.0.0",
-        "@amplitude/analytics-types": "^1.0.0",
-        "@amplitude/plugin-page-view-tracking-browser": "^1.0.1",
-        "@amplitude/plugin-web-attribution-browser": "^1.0.1",
+      "version": "1.10.8",
+      "resolved": "https://registry.npmjs.org/@amplitude/analytics-browser/-/analytics-browser-1.10.8.tgz",
+      "integrity": "sha512-8rsOvU7fqBbkHaVSi/3WQ2bRvxR45n3Bqojk3UBxpypKAdqt2xcbngAuGD6/JdKBOJ4iJMwRAKojZgr1kzN3WQ==",
+      "requires": {
+        "@amplitude/analytics-client-common": "^1.0.1",
+        "@amplitude/analytics-core": "^1.1.0",
+        "@amplitude/analytics-types": "^1.1.0",
+        "@amplitude/plugin-page-view-tracking-browser": "^1.0.2",
+        "@amplitude/plugin-web-attribution-browser": "^1.0.2",
         "@amplitude/ua-parser-js": "^0.7.31",
         "tslib": "^2.4.1"
       },
@@ -17514,13 +17514,13 @@
       }
     },
     "@amplitude/analytics-client-common": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/@amplitude/analytics-client-common/-/analytics-client-common-1.0.0.tgz",
-      "integrity": "sha512-nHDGTjGBFTZiaPdleRhQDBBsxJj3HJJTGV4PsI0HASaCp/fV0PM/BBal0jFZD9VI/WcfeCDvHkXD5KV2+ErH1g==",
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/@amplitude/analytics-client-common/-/analytics-client-common-1.0.1.tgz",
+      "integrity": "sha512-PEZrZzrAyVQKb+vYEc6cPBamFNH0XQ+LUIlROZWC78PmwcEfpZD/3/PQMqRQidyTsklpAx8vJgqJImyA/Hafng==",
       "requires": {
         "@amplitude/analytics-connector": "^1.4.5",
-        "@amplitude/analytics-core": "^1.0.0",
-        "@amplitude/analytics-types": "^1.0.0",
+        "@amplitude/analytics-core": "^1.1.0",
+        "@amplitude/analytics-types": "^1.1.0",
         "tslib": "^2.4.1"
       },
       "dependencies": {
@@ -17537,11 +17537,11 @@
       "integrity": "sha512-dFW7c7Wb6Ng7vbmzwbaXZSpqfBx37ukamJV9ErFYYS8vGZK/Hkbt3M7fZHBI4WFU6CCwakr2ZXPme11uGPYWkQ=="
     },
     "@amplitude/analytics-core": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/@amplitude/analytics-core/-/analytics-core-1.0.0.tgz",
-      "integrity": "sha512-ZOxaySYqjcG08QaIbV/vsM6I2CBHWyYCaQLiZp+M3LYud7J9WtoZevEvwQeBPEWixg7Q32ddws2+iAnEsDOXbw==",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/@amplitude/analytics-core/-/analytics-core-1.1.0.tgz",
+      "integrity": "sha512-mWp753c9tAP54+9z+WFnZaUnWbhI4o3WQtRQIA954UEnqgKTuUIkKLyb8zrh8zKVf1MUuZDuEE+zI5Gs05mk7A==",
       "requires": {
-        "@amplitude/analytics-types": "^1.0.0",
+        "@amplitude/analytics-types": "^1.1.0",
         "tslib": "^2.4.1"
       },
       "dependencies": {
@@ -17553,17 +17553,17 @@
       }
     },
     "@amplitude/analytics-types": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/@amplitude/analytics-types/-/analytics-types-1.0.0.tgz",
-      "integrity": "sha512-mKqa7Ui5Hfa8otLVCC9GU9eE5l7ZtnUPZcGkL6tM51nFtUnMuCpDVlBwlTYukRc12U2E0MXIba4Q2mVmg8Mj8A=="
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/@amplitude/analytics-types/-/analytics-types-1.1.0.tgz",
+      "integrity": "sha512-FAJMewKuiDbcnG5aGSpxwXPy31clqyK0tIGi27AVL2Dnf+7jUbphMB6s1AijXfB5+OdMY51N+jzapD5C+pR0Wg=="
     },
     "@amplitude/plugin-page-view-tracking-browser": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/@amplitude/plugin-page-view-tracking-browser/-/plugin-page-view-tracking-browser-1.0.1.tgz",
-      "integrity": "sha512-5dB8Vo0BFm/K77YcG6MKMYrUlTK4A/K25nCx8K5KEndWqeskKANUWjlG/9NAGKx4WPH8vs3mYffDwXfXTOeY1A==",
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/@amplitude/plugin-page-view-tracking-browser/-/plugin-page-view-tracking-browser-1.0.2.tgz",
+      "integrity": "sha512-jBReKXkn6Qq5fgAb7kR6YkPbdRi1idcH6u5iIPAGfuciAb9qKcNj7lAcAcIT9nS1DGsvRo1qsn1/UH548b/Tew==",
       "requires": {
-        "@amplitude/analytics-client-common": "^1.0.0",
-        "@amplitude/analytics-types": "^1.0.0",
+        "@amplitude/analytics-client-common": "^1.0.1",
+        "@amplitude/analytics-types": "^1.1.0",
         "tslib": "^2.4.1"
       },
       "dependencies": {
@@ -17575,12 +17575,12 @@
       }
     },
     "@amplitude/plugin-web-attribution-browser": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/@amplitude/plugin-web-attribution-browser/-/plugin-web-attribution-browser-1.0.1.tgz",
-      "integrity": "sha512-5pwCTEw1zEC2h2YtVfYvaLGm8lAzyZAQZc3qEYGuQPgklewQMX3T9Zgv7UcHvLXQqBuQjAYYXeI5FKqrUYwTVw==",
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/@amplitude/plugin-web-attribution-browser/-/plugin-web-attribution-browser-1.0.2.tgz",
+      "integrity": "sha512-80M4ZjZjlg7nmslIdWBOUBMVMZMa4OXoWmTviu38jFMjbO7JsZil/V1rwb3d/tpyceHt/yNQes4yknQWeiZAQw==",
       "requires": {
-        "@amplitude/analytics-client-common": "^1.0.0",
-        "@amplitude/analytics-types": "^1.0.0",
+        "@amplitude/analytics-client-common": "^1.0.1",
+        "@amplitude/analytics-types": "^1.1.0",
         "tslib": "^2.4.1"
       },
       "dependencies": {
diff --git a/apps/block_scout_web/assets/package.json b/apps/block_scout_web/assets/package.json
index 5884fb8be221..c2000a669428 100644
--- a/apps/block_scout_web/assets/package.json
+++ b/apps/block_scout_web/assets/package.json
@@ -20,7 +20,7 @@
   },
   "dependencies": {
     "@fortawesome/fontawesome-free": "^6.4.0",
-    "@amplitude/analytics-browser": "^1.10.7",
+    "@amplitude/analytics-browser": "^1.10.8",
     "@tarekraafat/autocomplete.js": "^10.2.7",
     "@walletconnect/web3-provider": "^1.8.0",
     "assert": "^2.0.0",

From 8ae5c8276d3e16be8fd3bbff2976b66ad8ab27d5 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 9 Jun 2023 19:00:46 +0000
Subject: [PATCH 088/909] Bump sass from 1.63.2 to 1.63.3 in
 /apps/block_scout_web/assets

Bumps [sass](https://github.com/sass/dart-sass) from 1.63.2 to 1.63.3.
- [Release notes](https://github.com/sass/dart-sass/releases)
- [Changelog](https://github.com/sass/dart-sass/blob/main/CHANGELOG.md)
- [Commits](https://github.com/sass/dart-sass/compare/1.63.2...1.63.3)

---
updated-dependencies:
- dependency-name: sass
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 apps/block_scout_web/assets/package-lock.json | 14 +++++++-------
 apps/block_scout_web/assets/package.json      |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/apps/block_scout_web/assets/package-lock.json b/apps/block_scout_web/assets/package-lock.json
index 0b00f1149192..e38bd70fb03e 100644
--- a/apps/block_scout_web/assets/package-lock.json
+++ b/apps/block_scout_web/assets/package-lock.json
@@ -89,7 +89,7 @@
         "mini-css-extract-plugin": "^2.7.6",
         "postcss": "^8.4.24",
         "postcss-loader": "^7.3.2",
-        "sass": "^1.63.2",
+        "sass": "^1.63.3",
         "sass-loader": "^13.3.1",
         "style-loader": "^3.3.3",
         "webpack": "^5.86.0",
@@ -14870,9 +14870,9 @@
       "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
     },
     "node_modules/sass": {
-      "version": "1.63.2",
-      "resolved": "https://registry.npmjs.org/sass/-/sass-1.63.2.tgz",
-      "integrity": "sha512-u56TU0AIFqMtauKl/OJ1AeFsXqRHkgO7nCWmHaDwfxDo9GUMSqBA4NEh6GMuh1CYVM7zuROYtZrHzPc2ixK+ww==",
+      "version": "1.63.3",
+      "resolved": "https://registry.npmjs.org/sass/-/sass-1.63.3.tgz",
+      "integrity": "sha512-ySdXN+DVpfwq49jG1+hmtDslYqpS7SkOR5GpF6o2bmb1RL/xS+wvPmegMvMywyfsmAV6p7TgwXYGrCZIFFbAHg==",
       "dev": true,
       "dependencies": {
         "chokidar": ">=3.0.0 <4.0.0",
@@ -28691,9 +28691,9 @@
       "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
     },
     "sass": {
-      "version": "1.63.2",
-      "resolved": "https://registry.npmjs.org/sass/-/sass-1.63.2.tgz",
-      "integrity": "sha512-u56TU0AIFqMtauKl/OJ1AeFsXqRHkgO7nCWmHaDwfxDo9GUMSqBA4NEh6GMuh1CYVM7zuROYtZrHzPc2ixK+ww==",
+      "version": "1.63.3",
+      "resolved": "https://registry.npmjs.org/sass/-/sass-1.63.3.tgz",
+      "integrity": "sha512-ySdXN+DVpfwq49jG1+hmtDslYqpS7SkOR5GpF6o2bmb1RL/xS+wvPmegMvMywyfsmAV6p7TgwXYGrCZIFFbAHg==",
       "dev": true,
       "requires": {
         "chokidar": ">=3.0.0 <4.0.0",
diff --git a/apps/block_scout_web/assets/package.json b/apps/block_scout_web/assets/package.json
index 5884fb8be221..e52894acf3f0 100644
--- a/apps/block_scout_web/assets/package.json
+++ b/apps/block_scout_web/assets/package.json
@@ -101,7 +101,7 @@
     "mini-css-extract-plugin": "^2.7.6",
     "postcss": "^8.4.24",
     "postcss-loader": "^7.3.2",
-    "sass": "^1.63.2",
+    "sass": "^1.63.3",
     "sass-loader": "^13.3.1",
     "style-loader": "^3.3.3",
     "webpack": "^5.86.0",

From 5890f24b0b18e3e94371574dd630995be3509c9b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 9 Jun 2023 19:01:14 +0000
Subject: [PATCH 089/909] Bump sweetalert2 from 11.7.11 to 11.7.12 in
 /apps/block_scout_web/assets

Bumps [sweetalert2](https://github.com/sweetalert2/sweetalert2) from 11.7.11 to 11.7.12.
- [Release notes](https://github.com/sweetalert2/sweetalert2/releases)
- [Changelog](https://github.com/sweetalert2/sweetalert2/blob/main/CHANGELOG.md)
- [Commits](https://github.com/sweetalert2/sweetalert2/compare/v11.7.11...v11.7.12)

---
updated-dependencies:
- dependency-name: sweetalert2
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 apps/block_scout_web/assets/package-lock.json | 14 +++++++-------
 apps/block_scout_web/assets/package.json      |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/apps/block_scout_web/assets/package-lock.json b/apps/block_scout_web/assets/package-lock.json
index 0b00f1149192..6d145b96f909 100644
--- a/apps/block_scout_web/assets/package-lock.json
+++ b/apps/block_scout_web/assets/package-lock.json
@@ -61,7 +61,7 @@
         "redux": "^4.2.1",
         "stream-browserify": "^3.0.0",
         "stream-http": "^3.1.1",
-        "sweetalert2": "^11.7.11",
+        "sweetalert2": "^11.7.12",
         "urijs": "^1.19.11",
         "url": "^0.11.0",
         "util": "^0.12.5",
@@ -15725,9 +15725,9 @@
       }
     },
     "node_modules/sweetalert2": {
-      "version": "11.7.11",
-      "resolved": "https://registry.npmjs.org/sweetalert2/-/sweetalert2-11.7.11.tgz",
-      "integrity": "sha512-kQ2wxdHq9OBCdVT7Ku8YYuNGKq2qwYMIBSfY13j/dsqVFh6th37SE0/hCLcrZ8LS/kIouiVKgWqYa9/UJ3RZTQ==",
+      "version": "11.7.12",
+      "resolved": "https://registry.npmjs.org/sweetalert2/-/sweetalert2-11.7.12.tgz",
+      "integrity": "sha512-TQJy8mQymJLzqWPQOMQErd81Zd/rSYr0UL4pEc7bqEihtjS+zt7LWJXLhfPp93e+Hf3Z2FHMB6QGNskAMCsdTg==",
       "funding": {
         "type": "individual",
         "url": "https://github.com/sponsors/limonte"
@@ -29311,9 +29311,9 @@
       }
     },
     "sweetalert2": {
-      "version": "11.7.11",
-      "resolved": "https://registry.npmjs.org/sweetalert2/-/sweetalert2-11.7.11.tgz",
-      "integrity": "sha512-kQ2wxdHq9OBCdVT7Ku8YYuNGKq2qwYMIBSfY13j/dsqVFh6th37SE0/hCLcrZ8LS/kIouiVKgWqYa9/UJ3RZTQ=="
+      "version": "11.7.12",
+      "resolved": "https://registry.npmjs.org/sweetalert2/-/sweetalert2-11.7.12.tgz",
+      "integrity": "sha512-TQJy8mQymJLzqWPQOMQErd81Zd/rSYr0UL4pEc7bqEihtjS+zt7LWJXLhfPp93e+Hf3Z2FHMB6QGNskAMCsdTg=="
     },
     "symbol-tree": {
       "version": "3.2.4",
diff --git a/apps/block_scout_web/assets/package.json b/apps/block_scout_web/assets/package.json
index 5884fb8be221..b60674ea2994 100644
--- a/apps/block_scout_web/assets/package.json
+++ b/apps/block_scout_web/assets/package.json
@@ -73,7 +73,7 @@
     "redux": "^4.2.1",
     "stream-browserify": "^3.0.0",
     "stream-http": "^3.1.1",
-    "sweetalert2": "^11.7.11",
+    "sweetalert2": "^11.7.12",
     "urijs": "^1.19.11",
     "url": "^0.11.0",
     "util": "^0.12.5",

From f772a868e301a169a2b35749e29e342aa7992a0c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 12 Jun 2023 19:03:09 +0000
Subject: [PATCH 090/909] Bump core-js from 3.30.2 to 3.31.0 in
 /apps/block_scout_web/assets

Bumps [core-js](https://github.com/zloirock/core-js/tree/HEAD/packages/core-js) from 3.30.2 to 3.31.0.
- [Release notes](https://github.com/zloirock/core-js/releases)
- [Changelog](https://github.com/zloirock/core-js/blob/master/CHANGELOG.md)
- [Commits](https://github.com/zloirock/core-js/commits/v3.31.0/packages/core-js)

---
updated-dependencies:
- dependency-name: core-js
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 apps/block_scout_web/assets/package-lock.json | 14 +++++++-------
 apps/block_scout_web/assets/package.json      |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/apps/block_scout_web/assets/package-lock.json b/apps/block_scout_web/assets/package-lock.json
index 572bdf4cf43e..dd7636c0e51a 100644
--- a/apps/block_scout_web/assets/package-lock.json
+++ b/apps/block_scout_web/assets/package-lock.json
@@ -17,7 +17,7 @@
         "chart.js": "^4.3.0",
         "chartjs-adapter-luxon": "^1.3.1",
         "clipboard": "^2.0.11",
-        "core-js": "^3.30.2",
+        "core-js": "^3.31.0",
         "crypto-browserify": "^3.12.0",
         "dropzone": "^5.9.3",
         "eth-net-props": "^1.0.41",
@@ -5838,9 +5838,9 @@
       }
     },
     "node_modules/core-js": {
-      "version": "3.30.2",
-      "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.30.2.tgz",
-      "integrity": "sha512-uBJiDmwqsbJCWHAwjrx3cvjbMXP7xD72Dmsn5LOJpiRmE3WbBbN5rCqQ2Qh6Ek6/eOrjlWngEynBWo4VxerQhg==",
+      "version": "3.31.0",
+      "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.31.0.tgz",
+      "integrity": "sha512-NIp2TQSGfR6ba5aalZD+ZQ1fSxGhDo/s1w0nx3RYzf2pnJxt7YynxFlFScP6eV7+GZsKO95NSjGxyJsU3DZgeQ==",
       "hasInstallScript": true,
       "funding": {
         "type": "opencollective",
@@ -21811,9 +21811,9 @@
       }
     },
     "core-js": {
-      "version": "3.30.2",
-      "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.30.2.tgz",
-      "integrity": "sha512-uBJiDmwqsbJCWHAwjrx3cvjbMXP7xD72Dmsn5LOJpiRmE3WbBbN5rCqQ2Qh6Ek6/eOrjlWngEynBWo4VxerQhg=="
+      "version": "3.31.0",
+      "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.31.0.tgz",
+      "integrity": "sha512-NIp2TQSGfR6ba5aalZD+ZQ1fSxGhDo/s1w0nx3RYzf2pnJxt7YynxFlFScP6eV7+GZsKO95NSjGxyJsU3DZgeQ=="
     },
     "core-js-compat": {
       "version": "3.30.2",
diff --git a/apps/block_scout_web/assets/package.json b/apps/block_scout_web/assets/package.json
index e897a89df88e..38eaede3c9ec 100644
--- a/apps/block_scout_web/assets/package.json
+++ b/apps/block_scout_web/assets/package.json
@@ -29,7 +29,7 @@
     "chart.js": "^4.3.0",
     "chartjs-adapter-luxon": "^1.3.1",
     "clipboard": "^2.0.11",
-    "core-js": "^3.30.2",
+    "core-js": "^3.31.0",
     "crypto-browserify": "^3.12.0",
     "dropzone": "^5.9.3",
     "eth-net-props": "^1.0.41",

From 0e91100c0e9a720c1f54fc83b1d323ec28d16103 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 12 Jun 2023 19:04:00 +0000
Subject: [PATCH 091/909] Bump url from 0.11.0 to 0.11.1 in
 /apps/block_scout_web/assets

Bumps [url](https://github.com/defunctzombie/node-url) from 0.11.0 to 0.11.1.
- [Commits](https://github.com/defunctzombie/node-url/compare/v0.11.0...v0.11.1)

---
updated-dependencies:
- dependency-name: url
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 apps/block_scout_web/assets/package-lock.json | 70 +++++++++++--------
 apps/block_scout_web/assets/package.json      |  2 +-
 2 files changed, 40 insertions(+), 32 deletions(-)

diff --git a/apps/block_scout_web/assets/package-lock.json b/apps/block_scout_web/assets/package-lock.json
index 572bdf4cf43e..9f9fee4024b6 100644
--- a/apps/block_scout_web/assets/package-lock.json
+++ b/apps/block_scout_web/assets/package-lock.json
@@ -63,7 +63,7 @@
         "stream-http": "^3.1.1",
         "sweetalert2": "^11.7.12",
         "urijs": "^1.19.11",
-        "url": "^0.11.0",
+        "url": "^0.11.1",
         "util": "^0.12.5",
         "viewerjs": "^1.11.3",
         "web3": "^1.10.0",
@@ -14347,15 +14347,6 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/querystring": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/querystring/-/querystring-0.2.0.tgz",
-      "integrity": "sha1-sgmEkgO7Jd+CDadW50cAWHhSFiA=",
-      "deprecated": "The querystring API is considered Legacy. new code should use the URLSearchParams API instead.",
-      "engines": {
-        "node": ">=0.4.x"
-      }
-    },
     "node_modules/querystringify": {
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/querystringify/-/querystringify-2.2.0.tgz",
@@ -16295,12 +16286,12 @@
       "integrity": "sha512-HXgFDgDommxn5/bIv0cnQZsPhHDA90NPHD6+c/v21U5+Sx5hoP8+dP9IZXBU1gIfvdRfhG8cel9QNPeionfcCQ=="
     },
     "node_modules/url": {
-      "version": "0.11.0",
-      "resolved": "https://registry.npmjs.org/url/-/url-0.11.0.tgz",
-      "integrity": "sha1-ODjpfPxgUh63PFJajlW/3Z4uKPE=",
+      "version": "0.11.1",
+      "resolved": "https://registry.npmjs.org/url/-/url-0.11.1.tgz",
+      "integrity": "sha512-rWS3H04/+mzzJkv0eZ7vEDGiQbgquI1fGfOad6zKvgYQi1SzMmhl7c/DdRGxhaWrVH6z0qWITo8rpnxK/RfEhA==",
       "dependencies": {
-        "punycode": "1.3.2",
-        "querystring": "0.2.0"
+        "punycode": "^1.4.1",
+        "qs": "^6.11.0"
       }
     },
     "node_modules/url-parse": {
@@ -16319,9 +16310,23 @@
       "integrity": "sha512-3AChu4NiXquPfeckE5R5cGdiHCMWJx1dwCWOmWIL4KHAziJNOFIYJlpGFeKDvwLPHovZRCxK3cYlwzqI9Vp+Gg=="
     },
     "node_modules/url/node_modules/punycode": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz",
-      "integrity": "sha1-llOgNvt8HuQjQvIyXM7v6jkmxI0="
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz",
+      "integrity": "sha512-jmYNElW7yvO7TV33CjSmvSiE2yco3bV2czu/OzDKdMNVZQWfxCblURLhf+47syQRBntjfLdd/H0egrzIG+oaFQ=="
+    },
+    "node_modules/url/node_modules/qs": {
+      "version": "6.11.2",
+      "resolved": "https://registry.npmjs.org/qs/-/qs-6.11.2.tgz",
+      "integrity": "sha512-tDNIz22aBzCDxLtVH++VnTfzxlfeK5CbqohpSqpJgj1Wg/cQbStNAz3NuqCs5vV+pjBsK4x4pN9HlVh7rcYRiA==",
+      "dependencies": {
+        "side-channel": "^1.0.4"
+      },
+      "engines": {
+        "node": ">=0.6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
     },
     "node_modules/utf-8-validate": {
       "version": "5.0.7",
@@ -28297,11 +28302,6 @@
         "strict-uri-encode": "^1.0.0"
       }
     },
-    "querystring": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/querystring/-/querystring-0.2.0.tgz",
-      "integrity": "sha1-sgmEkgO7Jd+CDadW50cAWHhSFiA="
-    },
     "querystringify": {
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/querystringify/-/querystringify-2.2.0.tgz",
@@ -29712,18 +29712,26 @@
       "integrity": "sha512-HXgFDgDommxn5/bIv0cnQZsPhHDA90NPHD6+c/v21U5+Sx5hoP8+dP9IZXBU1gIfvdRfhG8cel9QNPeionfcCQ=="
     },
     "url": {
-      "version": "0.11.0",
-      "resolved": "https://registry.npmjs.org/url/-/url-0.11.0.tgz",
-      "integrity": "sha1-ODjpfPxgUh63PFJajlW/3Z4uKPE=",
+      "version": "0.11.1",
+      "resolved": "https://registry.npmjs.org/url/-/url-0.11.1.tgz",
+      "integrity": "sha512-rWS3H04/+mzzJkv0eZ7vEDGiQbgquI1fGfOad6zKvgYQi1SzMmhl7c/DdRGxhaWrVH6z0qWITo8rpnxK/RfEhA==",
       "requires": {
-        "punycode": "1.3.2",
-        "querystring": "0.2.0"
+        "punycode": "^1.4.1",
+        "qs": "^6.11.0"
       },
       "dependencies": {
         "punycode": {
-          "version": "1.3.2",
-          "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz",
-          "integrity": "sha1-llOgNvt8HuQjQvIyXM7v6jkmxI0="
+          "version": "1.4.1",
+          "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz",
+          "integrity": "sha512-jmYNElW7yvO7TV33CjSmvSiE2yco3bV2czu/OzDKdMNVZQWfxCblURLhf+47syQRBntjfLdd/H0egrzIG+oaFQ=="
+        },
+        "qs": {
+          "version": "6.11.2",
+          "resolved": "https://registry.npmjs.org/qs/-/qs-6.11.2.tgz",
+          "integrity": "sha512-tDNIz22aBzCDxLtVH++VnTfzxlfeK5CbqohpSqpJgj1Wg/cQbStNAz3NuqCs5vV+pjBsK4x4pN9HlVh7rcYRiA==",
+          "requires": {
+            "side-channel": "^1.0.4"
+          }
         }
       }
     },
diff --git a/apps/block_scout_web/assets/package.json b/apps/block_scout_web/assets/package.json
index e897a89df88e..a567cf5fc9ac 100644
--- a/apps/block_scout_web/assets/package.json
+++ b/apps/block_scout_web/assets/package.json
@@ -75,7 +75,7 @@
     "stream-http": "^3.1.1",
     "sweetalert2": "^11.7.12",
     "urijs": "^1.19.11",
-    "url": "^0.11.0",
+    "url": "^0.11.1",
     "util": "^0.12.5",
     "viewerjs": "^1.11.3",
     "web3": "^1.10.0",

From 8f47c83795d9912edf40938df94087e99a930673 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 12 Jun 2023 19:04:15 +0000
Subject: [PATCH 092/909] Bump postcss-loader from 7.3.2 to 7.3.3 in
 /apps/block_scout_web/assets

Bumps [postcss-loader](https://github.com/webpack-contrib/postcss-loader) from 7.3.2 to 7.3.3.
- [Release notes](https://github.com/webpack-contrib/postcss-loader/releases)
- [Changelog](https://github.com/webpack-contrib/postcss-loader/blob/master/CHANGELOG.md)
- [Commits](https://github.com/webpack-contrib/postcss-loader/compare/v7.3.2...v7.3.3)

---
updated-dependencies:
- dependency-name: postcss-loader
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 apps/block_scout_web/assets/package-lock.json | 32 +++++++++----------
 apps/block_scout_web/assets/package.json      |  2 +-
 2 files changed, 16 insertions(+), 18 deletions(-)

diff --git a/apps/block_scout_web/assets/package-lock.json b/apps/block_scout_web/assets/package-lock.json
index 572bdf4cf43e..9d16d271cb67 100644
--- a/apps/block_scout_web/assets/package-lock.json
+++ b/apps/block_scout_web/assets/package-lock.json
@@ -88,7 +88,7 @@
         "jest-environment-jsdom": "^29.5.0",
         "mini-css-extract-plugin": "^2.7.6",
         "postcss": "^8.4.24",
-        "postcss-loader": "^7.3.2",
+        "postcss-loader": "^7.3.3",
         "sass": "^1.63.3",
         "sass-loader": "^13.3.1",
         "style-loader": "^3.3.3",
@@ -5877,9 +5877,9 @@
       }
     },
     "node_modules/cosmiconfig": {
-      "version": "8.1.3",
-      "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-8.1.3.tgz",
-      "integrity": "sha512-/UkO2JKI18b5jVMJUp0lvKFMpa/Gye+ZgZjKD+DGEN9y7NRcf/nK1A0sp67ONmKtnDCNMS44E6jrk0Yc3bDuUw==",
+      "version": "8.2.0",
+      "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-8.2.0.tgz",
+      "integrity": "sha512-3rTMnFJA1tCOPwRxtgF4wd7Ab2qvDbL8jX+3smjIbS4HlZBagTlpERbdN7iAbWlrfxE3M8c27kTwTawQ7st+OQ==",
       "dev": true,
       "dependencies": {
         "import-fresh": "^3.2.1",
@@ -13557,14 +13557,13 @@
       }
     },
     "node_modules/postcss-loader": {
-      "version": "7.3.2",
-      "resolved": "https://registry.npmjs.org/postcss-loader/-/postcss-loader-7.3.2.tgz",
-      "integrity": "sha512-c7qDlXErX6n0VT+LUsW+nwefVtTu3ORtVvK8EXuUIDcxo+b/euYqpuHlJAvePb0Af5e8uMjR/13e0lTuYifaig==",
+      "version": "7.3.3",
+      "resolved": "https://registry.npmjs.org/postcss-loader/-/postcss-loader-7.3.3.tgz",
+      "integrity": "sha512-YgO/yhtevGO/vJePCQmTxiaEwER94LABZN0ZMT4A0vsak9TpO+RvKRs7EmJ8peIlB9xfXCsS7M8LjqncsUZ5HA==",
       "dev": true,
       "dependencies": {
-        "cosmiconfig": "^8.1.3",
+        "cosmiconfig": "^8.2.0",
         "jiti": "^1.18.2",
-        "klona": "^2.0.6",
         "semver": "^7.3.8"
       },
       "engines": {
@@ -21838,9 +21837,9 @@
       }
     },
     "cosmiconfig": {
-      "version": "8.1.3",
-      "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-8.1.3.tgz",
-      "integrity": "sha512-/UkO2JKI18b5jVMJUp0lvKFMpa/Gye+ZgZjKD+DGEN9y7NRcf/nK1A0sp67ONmKtnDCNMS44E6jrk0Yc3bDuUw==",
+      "version": "8.2.0",
+      "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-8.2.0.tgz",
+      "integrity": "sha512-3rTMnFJA1tCOPwRxtgF4wd7Ab2qvDbL8jX+3smjIbS4HlZBagTlpERbdN7iAbWlrfxE3M8c27kTwTawQ7st+OQ==",
       "dev": true,
       "requires": {
         "import-fresh": "^3.2.1",
@@ -27747,14 +27746,13 @@
       "requires": {}
     },
     "postcss-loader": {
-      "version": "7.3.2",
-      "resolved": "https://registry.npmjs.org/postcss-loader/-/postcss-loader-7.3.2.tgz",
-      "integrity": "sha512-c7qDlXErX6n0VT+LUsW+nwefVtTu3ORtVvK8EXuUIDcxo+b/euYqpuHlJAvePb0Af5e8uMjR/13e0lTuYifaig==",
+      "version": "7.3.3",
+      "resolved": "https://registry.npmjs.org/postcss-loader/-/postcss-loader-7.3.3.tgz",
+      "integrity": "sha512-YgO/yhtevGO/vJePCQmTxiaEwER94LABZN0ZMT4A0vsak9TpO+RvKRs7EmJ8peIlB9xfXCsS7M8LjqncsUZ5HA==",
       "dev": true,
       "requires": {
-        "cosmiconfig": "^8.1.3",
+        "cosmiconfig": "^8.2.0",
         "jiti": "^1.18.2",
-        "klona": "^2.0.6",
         "semver": "^7.3.8"
       },
       "dependencies": {
diff --git a/apps/block_scout_web/assets/package.json b/apps/block_scout_web/assets/package.json
index e897a89df88e..b9ad3cf071ab 100644
--- a/apps/block_scout_web/assets/package.json
+++ b/apps/block_scout_web/assets/package.json
@@ -100,7 +100,7 @@
     "jest-environment-jsdom": "^29.5.0",
     "mini-css-extract-plugin": "^2.7.6",
     "postcss": "^8.4.24",
-    "postcss-loader": "^7.3.2",
+    "postcss-loader": "^7.3.3",
     "sass": "^1.63.3",
     "sass-loader": "^13.3.1",
     "style-loader": "^3.3.3",

From 8ea1e1146f58db2b370fb1e08eb5eae4f5f6c90e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 12 Jun 2023 19:05:07 +0000
Subject: [PATCH 093/909] Bump sass-loader from 13.3.1 to 13.3.2 in
 /apps/block_scout_web/assets

Bumps [sass-loader](https://github.com/webpack-contrib/sass-loader) from 13.3.1 to 13.3.2.
- [Release notes](https://github.com/webpack-contrib/sass-loader/releases)
- [Changelog](https://github.com/webpack-contrib/sass-loader/blob/master/CHANGELOG.md)
- [Commits](https://github.com/webpack-contrib/sass-loader/compare/v13.3.1...v13.3.2)

---
updated-dependencies:
- dependency-name: sass-loader
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 apps/block_scout_web/assets/package-lock.json | 16 +++++++---------
 apps/block_scout_web/assets/package.json      |  2 +-
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/apps/block_scout_web/assets/package-lock.json b/apps/block_scout_web/assets/package-lock.json
index 572bdf4cf43e..6ce3b0659150 100644
--- a/apps/block_scout_web/assets/package-lock.json
+++ b/apps/block_scout_web/assets/package-lock.json
@@ -90,7 +90,7 @@
         "postcss": "^8.4.24",
         "postcss-loader": "^7.3.2",
         "sass": "^1.63.3",
-        "sass-loader": "^13.3.1",
+        "sass-loader": "^13.3.2",
         "style-loader": "^3.3.3",
         "webpack": "^5.86.0",
         "webpack-cli": "^5.1.4"
@@ -14887,12 +14887,11 @@
       }
     },
     "node_modules/sass-loader": {
-      "version": "13.3.1",
-      "resolved": "https://registry.npmjs.org/sass-loader/-/sass-loader-13.3.1.tgz",
-      "integrity": "sha512-cBTxmgyVA1nXPvIK4brjJMXOMJ2v2YrQEuHqLw3LylGb3gsR6jAvdjHMcy/+JGTmmIF9SauTrLLR7bsWDMWqgg==",
+      "version": "13.3.2",
+      "resolved": "https://registry.npmjs.org/sass-loader/-/sass-loader-13.3.2.tgz",
+      "integrity": "sha512-CQbKl57kdEv+KDLquhC+gE3pXt74LEAzm+tzywcA0/aHZuub8wTErbjAoNI57rPUWRYRNC5WUnNl8eGJNbDdwg==",
       "dev": true,
       "dependencies": {
-        "klona": "^2.0.6",
         "neo-async": "^2.6.2"
       },
       "engines": {
@@ -28702,12 +28701,11 @@
       }
     },
     "sass-loader": {
-      "version": "13.3.1",
-      "resolved": "https://registry.npmjs.org/sass-loader/-/sass-loader-13.3.1.tgz",
-      "integrity": "sha512-cBTxmgyVA1nXPvIK4brjJMXOMJ2v2YrQEuHqLw3LylGb3gsR6jAvdjHMcy/+JGTmmIF9SauTrLLR7bsWDMWqgg==",
+      "version": "13.3.2",
+      "resolved": "https://registry.npmjs.org/sass-loader/-/sass-loader-13.3.2.tgz",
+      "integrity": "sha512-CQbKl57kdEv+KDLquhC+gE3pXt74LEAzm+tzywcA0/aHZuub8wTErbjAoNI57rPUWRYRNC5WUnNl8eGJNbDdwg==",
       "dev": true,
       "requires": {
-        "klona": "^2.0.6",
         "neo-async": "^2.6.2"
       }
     },
diff --git a/apps/block_scout_web/assets/package.json b/apps/block_scout_web/assets/package.json
index e897a89df88e..d791ff8a2a6f 100644
--- a/apps/block_scout_web/assets/package.json
+++ b/apps/block_scout_web/assets/package.json
@@ -102,7 +102,7 @@
     "postcss": "^8.4.24",
     "postcss-loader": "^7.3.2",
     "sass": "^1.63.3",
-    "sass-loader": "^13.3.1",
+    "sass-loader": "^13.3.2",
     "style-loader": "^3.3.3",
     "webpack": "^5.86.0",
     "webpack-cli": "^5.1.4"

From 93cf653adb76d1c89d2e5234de8b9c4b24dc7b43 Mon Sep 17 00:00:00 2001
From: sl1depengwyn <max.pengwyn@gmail.com>
Date: Sun, 22 Jan 2023 14:18:59 +0500
Subject: [PATCH 094/909] Add yul filter

---
 .../lib/block_scout_web/paging_helper.ex      |  4 +++
 .../verified_contracts/index.html.eex         |  6 ++++
 .../views/verified_contracts_view.ex          |  1 +
 apps/block_scout_web/priv/gettext/default.pot | 32 +++++++++++--------
 .../priv/gettext/en/LC_MESSAGES/default.po    | 32 +++++++++++--------
 .../verified_contracts_controller_test.exs    | 17 ++++++++++
 apps/explorer/lib/explorer/chain.ex           |  4 +++
 7 files changed, 70 insertions(+), 26 deletions(-)

diff --git a/apps/block_scout_web/lib/block_scout_web/paging_helper.ex b/apps/block_scout_web/lib/block_scout_web/paging_helper.ex
index a4437206a83b..98fd11f72d18 100644
--- a/apps/block_scout_web/lib/block_scout_web/paging_helper.ex
+++ b/apps/block_scout_web/lib/block_scout_web/paging_helper.ex
@@ -147,6 +147,10 @@ defmodule BlockScoutWeb.PagingHelper do
     [filter: :vyper]
   end
 
+  def current_filter(%{"filter" => "yul"}) do
+    [filter: :yul]
+  end
+
   def current_filter(_), do: []
 
   def search_query(%{"search" => ""}), do: []
diff --git a/apps/block_scout_web/lib/block_scout_web/templates/verified_contracts/index.html.eex b/apps/block_scout_web/lib/block_scout_web/templates/verified_contracts/index.html.eex
index b8f801b6993b..1149eeab1f3c 100644
--- a/apps/block_scout_web/lib/block_scout_web/templates/verified_contracts/index.html.eex
+++ b/apps/block_scout_web/lib/block_scout_web/templates/verified_contracts/index.html.eex
@@ -31,6 +31,12 @@
           <%= link(
             gettext("Vyper"),
             to: Helpers.verified_contracts_path(@conn, :index, filter: "vyper"),
+            class: "address__link address__link--active dropdown-item border-bottom",
+            "data-test": "filter_option"
+          ) %>
+          <%= link(
+            gettext("Yul"),
+            to: Helpers.verified_contracts_path(@conn, :index, filter: "yul"),
             class: "address__link address__link--active dropdown-item",
             "data-test": "filter_option"
           ) %>
diff --git a/apps/block_scout_web/lib/block_scout_web/views/verified_contracts_view.ex b/apps/block_scout_web/lib/block_scout_web/views/verified_contracts_view.ex
index 90e1c621a41b..8a6e837d0ad4 100644
--- a/apps/block_scout_web/lib/block_scout_web/views/verified_contracts_view.ex
+++ b/apps/block_scout_web/lib/block_scout_web/views/verified_contracts_view.ex
@@ -9,6 +9,7 @@ defmodule BlockScoutWeb.VerifiedContractsView do
     case filter do
       "solidity" -> gettext("Solidity")
       "vyper" -> gettext("Vyper")
+      "yul" -> gettext("Yul")
       _ -> gettext("All")
     end
   end
diff --git a/apps/block_scout_web/priv/gettext/default.pot b/apps/block_scout_web/priv/gettext/default.pot
index 4bf050f955c4..b0c5fa3bd64c 100644
--- a/apps/block_scout_web/priv/gettext/default.pot
+++ b/apps/block_scout_web/priv/gettext/default.pot
@@ -264,7 +264,7 @@ msgstr ""
 #: lib/block_scout_web/templates/tokens/index.html.eex:34
 #: lib/block_scout_web/templates/transaction_log/_logs.html.eex:20
 #: lib/block_scout_web/templates/transaction_state/index.html.eex:34
-#: lib/block_scout_web/templates/verified_contracts/index.html.eex:54
+#: lib/block_scout_web/templates/verified_contracts/index.html.eex:60
 #: lib/block_scout_web/views/address_view.ex:107
 #, elixir-autogen, elixir-format
 msgid "Address"
@@ -326,7 +326,7 @@ msgstr ""
 #: lib/block_scout_web/views/address_internal_transaction_view.ex:11
 #: lib/block_scout_web/views/address_token_transfer_view.ex:11
 #: lib/block_scout_web/views/address_transaction_view.ex:11
-#: lib/block_scout_web/views/verified_contracts_view.ex:12
+#: lib/block_scout_web/views/verified_contracts_view.ex:13
 #, elixir-autogen, elixir-format
 msgid "All"
 msgstr ""
@@ -424,7 +424,7 @@ msgstr ""
 #: lib/block_scout_web/templates/account/watchlist/show.html.eex:24
 #: lib/block_scout_web/templates/address/overview.html.eex:150
 #: lib/block_scout_web/templates/address_token/overview.html.eex:51
-#: lib/block_scout_web/templates/verified_contracts/index.html.eex:57
+#: lib/block_scout_web/templates/verified_contracts/index.html.eex:63
 #, elixir-autogen, elixir-format
 msgid "Balance"
 msgstr ""
@@ -683,7 +683,7 @@ msgid "Company website"
 msgstr ""
 
 #: lib/block_scout_web/templates/address_contract_verification_common_fields/_compiler_field.html.eex:3
-#: lib/block_scout_web/templates/verified_contracts/index.html.eex:63
+#: lib/block_scout_web/templates/verified_contracts/index.html.eex:69
 #, elixir-autogen, elixir-format
 msgid "Compiler"
 msgstr ""
@@ -752,7 +752,7 @@ msgstr ""
 msgid "Constructor Arguments"
 msgstr ""
 
-#: lib/block_scout_web/templates/verified_contracts/index.html.eex:72
+#: lib/block_scout_web/templates/verified_contracts/index.html.eex:78
 #, elixir-autogen, elixir-format
 msgid "Constructor args"
 msgstr ""
@@ -817,7 +817,7 @@ msgstr ""
 msgid "Contract is not verified. However, we found a verified contract with the same bytecode in Blockscout DB"
 msgstr ""
 
-#: lib/block_scout_web/templates/verified_contracts/index.html.eex:41
+#: lib/block_scout_web/templates/verified_contracts/index.html.eex:47
 #, elixir-autogen, elixir-format
 msgid "Contract name or address"
 msgstr ""
@@ -1737,7 +1737,7 @@ msgstr ""
 msgid "Market Cap"
 msgstr ""
 
-#: lib/block_scout_web/templates/verified_contracts/index.html.eex:78
+#: lib/block_scout_web/templates/verified_contracts/index.html.eex:84
 #, elixir-autogen, elixir-format
 msgid "Market cap"
 msgstr ""
@@ -1997,7 +1997,7 @@ msgstr ""
 
 #: lib/block_scout_web/templates/address_contract_verification_via_flattened_code/new.html.eex:40
 #: lib/block_scout_web/templates/address_contract_verification_via_multi_part_files/new.html.eex:32
-#: lib/block_scout_web/templates/verified_contracts/index.html.eex:69
+#: lib/block_scout_web/templates/verified_contracts/index.html.eex:75
 #, elixir-autogen, elixir-format
 msgid "Optimization"
 msgstr ""
@@ -2471,7 +2471,7 @@ msgstr ""
 #: lib/block_scout_web/templates/transaction_log/index.html.eex:15
 #: lib/block_scout_web/templates/transaction_state/index.html.eex:13
 #: lib/block_scout_web/templates/transaction_token_transfer/index.html.eex:14
-#: lib/block_scout_web/templates/verified_contracts/index.html.eex:45
+#: lib/block_scout_web/templates/verified_contracts/index.html.eex:51
 #: lib/block_scout_web/templates/withdrawal/index.html.eex:14
 #, elixir-autogen, elixir-format
 msgid "Something went wrong, click to reload."
@@ -2725,7 +2725,7 @@ msgstr ""
 msgid "There are no transfers for this Token."
 msgstr ""
 
-#: lib/block_scout_web/templates/verified_contracts/index.html.eex:93
+#: lib/block_scout_web/templates/verified_contracts/index.html.eex:99
 #, elixir-autogen, elixir-format
 msgid "There are no verified contracts."
 msgstr ""
@@ -3144,7 +3144,7 @@ msgstr ""
 msgid "Tx/day"
 msgstr ""
 
-#: lib/block_scout_web/templates/verified_contracts/index.html.eex:60
+#: lib/block_scout_web/templates/verified_contracts/index.html.eex:66
 #, elixir-autogen, elixir-format
 msgid "Txns"
 msgstr ""
@@ -3261,7 +3261,7 @@ msgstr ""
 
 #: lib/block_scout_web/templates/address_read_contract/index.html.eex:17
 #: lib/block_scout_web/templates/address_write_contract/index.html.eex:15
-#: lib/block_scout_web/templates/verified_contracts/index.html.eex:75
+#: lib/block_scout_web/templates/verified_contracts/index.html.eex:81
 #, elixir-autogen, elixir-format
 msgid "Verified"
 msgstr ""
@@ -3318,7 +3318,7 @@ msgid "Verify the contract "
 msgstr ""
 
 #: lib/block_scout_web/templates/layout/_footer.html.eex:93
-#: lib/block_scout_web/templates/verified_contracts/index.html.eex:66
+#: lib/block_scout_web/templates/verified_contracts/index.html.eex:72
 #, elixir-autogen, elixir-format
 msgid "Version"
 msgstr ""
@@ -3680,3 +3680,9 @@ msgstr ""
 #, elixir-autogen, elixir-format
 msgid "to CSV file"
 msgstr ""
+
+#: lib/block_scout_web/templates/verified_contracts/index.html.eex:38
+#: lib/block_scout_web/views/verified_contracts_view.ex:12
+#, elixir-autogen, elixir-format
+msgid "Yul"
+msgstr ""
diff --git a/apps/block_scout_web/priv/gettext/en/LC_MESSAGES/default.po b/apps/block_scout_web/priv/gettext/en/LC_MESSAGES/default.po
index bb78e00cfa3c..5522a1122d0f 100644
--- a/apps/block_scout_web/priv/gettext/en/LC_MESSAGES/default.po
+++ b/apps/block_scout_web/priv/gettext/en/LC_MESSAGES/default.po
@@ -264,7 +264,7 @@ msgstr ""
 #: lib/block_scout_web/templates/tokens/index.html.eex:34
 #: lib/block_scout_web/templates/transaction_log/_logs.html.eex:20
 #: lib/block_scout_web/templates/transaction_state/index.html.eex:34
-#: lib/block_scout_web/templates/verified_contracts/index.html.eex:54
+#: lib/block_scout_web/templates/verified_contracts/index.html.eex:60
 #: lib/block_scout_web/views/address_view.ex:107
 #, elixir-autogen, elixir-format
 msgid "Address"
@@ -326,7 +326,7 @@ msgstr ""
 #: lib/block_scout_web/views/address_internal_transaction_view.ex:11
 #: lib/block_scout_web/views/address_token_transfer_view.ex:11
 #: lib/block_scout_web/views/address_transaction_view.ex:11
-#: lib/block_scout_web/views/verified_contracts_view.ex:12
+#: lib/block_scout_web/views/verified_contracts_view.ex:13
 #, elixir-autogen, elixir-format
 msgid "All"
 msgstr ""
@@ -424,7 +424,7 @@ msgstr ""
 #: lib/block_scout_web/templates/account/watchlist/show.html.eex:24
 #: lib/block_scout_web/templates/address/overview.html.eex:150
 #: lib/block_scout_web/templates/address_token/overview.html.eex:51
-#: lib/block_scout_web/templates/verified_contracts/index.html.eex:57
+#: lib/block_scout_web/templates/verified_contracts/index.html.eex:63
 #, elixir-autogen, elixir-format
 msgid "Balance"
 msgstr ""
@@ -683,7 +683,7 @@ msgid "Company website"
 msgstr ""
 
 #: lib/block_scout_web/templates/address_contract_verification_common_fields/_compiler_field.html.eex:3
-#: lib/block_scout_web/templates/verified_contracts/index.html.eex:63
+#: lib/block_scout_web/templates/verified_contracts/index.html.eex:69
 #, elixir-autogen, elixir-format
 msgid "Compiler"
 msgstr ""
@@ -752,7 +752,7 @@ msgstr ""
 msgid "Constructor Arguments"
 msgstr ""
 
-#: lib/block_scout_web/templates/verified_contracts/index.html.eex:72
+#: lib/block_scout_web/templates/verified_contracts/index.html.eex:78
 #, elixir-autogen, elixir-format
 msgid "Constructor args"
 msgstr ""
@@ -817,7 +817,7 @@ msgstr ""
 msgid "Contract is not verified. However, we found a verified contract with the same bytecode in Blockscout DB"
 msgstr ""
 
-#: lib/block_scout_web/templates/verified_contracts/index.html.eex:41
+#: lib/block_scout_web/templates/verified_contracts/index.html.eex:47
 #, elixir-autogen, elixir-format
 msgid "Contract name or address"
 msgstr ""
@@ -1737,7 +1737,7 @@ msgstr ""
 msgid "Market Cap"
 msgstr ""
 
-#: lib/block_scout_web/templates/verified_contracts/index.html.eex:78
+#: lib/block_scout_web/templates/verified_contracts/index.html.eex:84
 #, elixir-autogen, elixir-format
 msgid "Market cap"
 msgstr ""
@@ -1997,7 +1997,7 @@ msgstr ""
 
 #: lib/block_scout_web/templates/address_contract_verification_via_flattened_code/new.html.eex:40
 #: lib/block_scout_web/templates/address_contract_verification_via_multi_part_files/new.html.eex:32
-#: lib/block_scout_web/templates/verified_contracts/index.html.eex:69
+#: lib/block_scout_web/templates/verified_contracts/index.html.eex:75
 #, elixir-autogen, elixir-format
 msgid "Optimization"
 msgstr ""
@@ -2471,7 +2471,7 @@ msgstr ""
 #: lib/block_scout_web/templates/transaction_log/index.html.eex:15
 #: lib/block_scout_web/templates/transaction_state/index.html.eex:13
 #: lib/block_scout_web/templates/transaction_token_transfer/index.html.eex:14
-#: lib/block_scout_web/templates/verified_contracts/index.html.eex:45
+#: lib/block_scout_web/templates/verified_contracts/index.html.eex:51
 #: lib/block_scout_web/templates/withdrawal/index.html.eex:14
 #, elixir-autogen, elixir-format
 msgid "Something went wrong, click to reload."
@@ -2725,7 +2725,7 @@ msgstr ""
 msgid "There are no transfers for this Token."
 msgstr ""
 
-#: lib/block_scout_web/templates/verified_contracts/index.html.eex:93
+#: lib/block_scout_web/templates/verified_contracts/index.html.eex:99
 #, elixir-autogen, elixir-format
 msgid "There are no verified contracts."
 msgstr ""
@@ -3144,7 +3144,7 @@ msgstr ""
 msgid "Tx/day"
 msgstr ""
 
-#: lib/block_scout_web/templates/verified_contracts/index.html.eex:60
+#: lib/block_scout_web/templates/verified_contracts/index.html.eex:66
 #, elixir-autogen, elixir-format
 msgid "Txns"
 msgstr ""
@@ -3261,7 +3261,7 @@ msgstr ""
 
 #: lib/block_scout_web/templates/address_read_contract/index.html.eex:17
 #: lib/block_scout_web/templates/address_write_contract/index.html.eex:15
-#: lib/block_scout_web/templates/verified_contracts/index.html.eex:75
+#: lib/block_scout_web/templates/verified_contracts/index.html.eex:81
 #, elixir-autogen, elixir-format
 msgid "Verified"
 msgstr ""
@@ -3318,7 +3318,7 @@ msgid "Verify the contract "
 msgstr ""
 
 #: lib/block_scout_web/templates/layout/_footer.html.eex:93
-#: lib/block_scout_web/templates/verified_contracts/index.html.eex:66
+#: lib/block_scout_web/templates/verified_contracts/index.html.eex:72
 #, elixir-autogen, elixir-format
 msgid "Version"
 msgstr ""
@@ -3680,3 +3680,9 @@ msgstr ""
 #, elixir-autogen, elixir-format
 msgid "to CSV file"
 msgstr ""
+
+#: lib/block_scout_web/templates/verified_contracts/index.html.eex:38
+#: lib/block_scout_web/views/verified_contracts_view.ex:12
+#, elixir-autogen, elixir-format
+msgid "Yul"
+msgstr ""
diff --git a/apps/block_scout_web/test/block_scout_web/controllers/verified_contracts_controller_test.exs b/apps/block_scout_web/test/block_scout_web/controllers/verified_contracts_controller_test.exs
index dd5327ca7cca..0a68febfa183 100644
--- a/apps/block_scout_web/test/block_scout_web/controllers/verified_contracts_controller_test.exs
+++ b/apps/block_scout_web/test/block_scout_web/controllers/verified_contracts_controller_test.exs
@@ -113,6 +113,23 @@ defmodule BlockScoutWeb.VerifiedContractsControllerTest do
       assert String.contains?(smart_contracts_tile, "data-identifier-hash=\"#{to_string(vyper_hash)}\"")
     end
 
+    test "returns yul contract", %{conn: conn} do
+      %SmartContract{address_hash: yul_hash} = insert(:smart_contract, abi: nil)
+      insert(:smart_contract)
+
+      path =
+        verified_contracts_path(conn, :index, %{
+          "filter" => "yul",
+          "type" => "JSON"
+        })
+
+      conn = get(conn, path)
+
+      [smart_contracts_tile] = json_response(conn, 200)["items"]
+
+      assert String.contains?(smart_contracts_tile, "data-identifier-hash=\"#{to_string(yul_hash)}\"")
+    end
+
     test "returns search results by name", %{conn: conn} do
       insert(:smart_contract)
       insert(:smart_contract)
diff --git a/apps/explorer/lib/explorer/chain.ex b/apps/explorer/lib/explorer/chain.ex
index 281ea0390d9e..3aa7ecbbc5ce 100644
--- a/apps/explorer/lib/explorer/chain.ex
+++ b/apps/explorer/lib/explorer/chain.ex
@@ -6637,6 +6637,10 @@ defmodule Explorer.Chain do
     |> where(is_vyper_contract: ^true)
   end
 
+  defp filter_contracts(basic_query, :yul) do
+    from(query in basic_query, where: is_nil(query.abi))
+  end
+
   defp filter_contracts(basic_query, _), do: basic_query
 
   def count_verified_contracts do

From ebaf82abfe03d9e305233562a515dab5d79440fc Mon Sep 17 00:00:00 2001
From: Maxim Filonov <53992153+sl1depengwyn@users.noreply.github.com>
Date: Sun, 11 Jun 2023 08:03:52 +0300
Subject: [PATCH 095/909] Add "language" field to smart contract structure

---
 CHANGELOG.md                                  |  1 +
 .../views/api/v2/address_view.ex              | 18 +--------------
 .../views/api/v2/smart_contract_view.ex       |  5 +++--
 .../api/v2/address_controller_test.exs        |  3 +--
 .../api/v2/smart_contract_controller_test.exs | 22 ++++++++++++++++---
 5 files changed, 25 insertions(+), 24 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d2706781162a..d64a6012dc94 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,7 @@
 
 ### Features
 
+- [#7685](https://github.com/blockscout/blockscout/pull/7685) - Add yul filter and "language" field for smart contracts
 - [#7653](https://github.com/blockscout/blockscout/pull/7653) - Add support for DEPOSIT and WITHDRAW token transfer event in older contracts
 - [#7628](https://github.com/blockscout/blockscout/pull/7628) - Support partially verified property from verifier MS; Add property to track contracts automatically verified via eth-bytecode-db
 - [#7603](https://github.com/blockscout/blockscout/pull/7603) - Add Polygon Edge and optimism genesis files support
diff --git a/apps/block_scout_web/lib/block_scout_web/views/api/v2/address_view.ex b/apps/block_scout_web/lib/block_scout_web/views/api/v2/address_view.ex
index 90d85355e287..e044cf7ffb6e 100644
--- a/apps/block_scout_web/lib/block_scout_web/views/api/v2/address_view.ex
+++ b/apps/block_scout_web/lib/block_scout_web/views/api/v2/address_view.ex
@@ -108,8 +108,7 @@ defmodule BlockScoutWeb.API.V2.AddressView do
       "has_tokens" => Chain.check_if_tokens_at_address(address.hash, @api_true),
       "has_token_transfers" => Chain.check_if_token_transfers_at_address(address.hash, @api_true),
       "watchlist_address_id" => Chain.select_watchlist_address_id(get_watchlist_id(conn), address.hash),
-      "has_beacon_chain_withdrawals" => Chain.check_if_withdrawals_at_address(address.hash, @api_true),
-      "contract_type" => contract_type(address)
+      "has_beacon_chain_withdrawals" => Chain.check_if_withdrawals_at_address(address.hash, @api_true)
     })
   end
 
@@ -171,19 +170,4 @@ defmodule BlockScoutWeb.API.V2.AddressView do
 
     TokenView.render("token_instance.json", %{token_instance: token_instance, token: token})
   end
-
-  @spec contract_type(term) :: nil | :solidity | :vyper | :yul
-  def contract_type(%Address{smart_contract: nil}), do: nil
-
-  def contract_type(%Address{smart_contract: %SmartContract{}} = address) do
-    if address.smart_contract.is_vyper_contract do
-      :vyper
-    else
-      if address.smart_contract.abi do
-        :solidity
-      else
-        :yul
-      end
-    end
-  end
 end
diff --git a/apps/block_scout_web/lib/block_scout_web/views/api/v2/smart_contract_view.ex b/apps/block_scout_web/lib/block_scout_web/views/api/v2/smart_contract_view.ex
index 56959612079a..367b114e3d30 100644
--- a/apps/block_scout_web/lib/block_scout_web/views/api/v2/smart_contract_view.ex
+++ b/apps/block_scout_web/lib/block_scout_web/views/api/v2/smart_contract_view.ex
@@ -130,7 +130,7 @@ defmodule BlockScoutWeb.API.V2.SmartContractView do
   defp prepare_output(output), do: output
 
   # credo:disable-for-next-line
-  def prepare_smart_contract(%Address{smart_contract: %SmartContract{}} = address) do
+  def prepare_smart_contract(%Address{smart_contract: %SmartContract{} = smart_contract} = address) do
     minimal_proxy_template = Chain.get_minimal_proxy_template(address.hash, @api_true)
     twin = Chain.get_address_verified_twin_contract(address.hash, @api_true)
     metadata_for_verification = minimal_proxy_template || twin.verified_contract
@@ -178,7 +178,8 @@ defmodule BlockScoutWeb.API.V2.SmartContractView do
       "decoded_constructor_args" =>
         if(smart_contract_verified,
           do: format_constructor_arguments(target_contract.abi, target_contract.constructor_arguments)
-        )
+        ),
+      "language" => smart_contract_language(smart_contract)
     }
     |> Map.merge(bytecode_info(address))
   end
diff --git a/apps/block_scout_web/test/block_scout_web/controllers/api/v2/address_controller_test.exs b/apps/block_scout_web/test/block_scout_web/controllers/api/v2/address_controller_test.exs
index a0af15b944d2..0515ce2449dd 100644
--- a/apps/block_scout_web/test/block_scout_web/controllers/api/v2/address_controller_test.exs
+++ b/apps/block_scout_web/test/block_scout_web/controllers/api/v2/address_controller_test.exs
@@ -67,8 +67,7 @@ defmodule BlockScoutWeb.API.V2.AddressControllerTest do
         "has_tokens" => false,
         "has_token_transfers" => false,
         "watchlist_address_id" => nil,
-        "has_beacon_chain_withdrawals" => false,
-        "contract_type" => nil
+        "has_beacon_chain_withdrawals" => false
       }
 
       request = get(conn, "/api/v2/addresses/#{Address.checksum(address.hash)}")
diff --git a/apps/block_scout_web/test/block_scout_web/controllers/api/v2/smart_contract_controller_test.exs b/apps/block_scout_web/test/block_scout_web/controllers/api/v2/smart_contract_controller_test.exs
index a72f7744ceb1..218e60156bc1 100644
--- a/apps/block_scout_web/test/block_scout_web/controllers/api/v2/smart_contract_controller_test.exs
+++ b/apps/block_scout_web/test/block_scout_web/controllers/api/v2/smart_contract_controller_test.exs
@@ -109,7 +109,8 @@ defmodule BlockScoutWeb.API.V2.SmartContractControllerTest do
         "creation_bytecode" =>
           "0x608060405234801561001057600080fd5b5060df8061001f6000396000f3006080604052600436106049576000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff16806360fe47b114604e5780636d4ce63c146078575b600080fd5b348015605957600080fd5b5060766004803603810190808035906020019092919050505060a0565b005b348015608357600080fd5b50608a60aa565b6040518082815260200191505060405180910390f35b8060008190555050565b600080549050905600a165627a7a7230582061b7676067d537e410bb704932a9984739a959416170ea17bda192ac1218d2790029",
         "abi" => target_contract.abi,
-        "is_verified_via_eth_bytecode_db" => target_contract.verified_via_eth_bytecode_db
+        "is_verified_via_eth_bytecode_db" => target_contract.verified_via_eth_bytecode_db,
+        "language" => smart_contract_language(target_contract)
       }
 
       request = get(conn, "/api/v2/smart-contracts/#{Address.checksum(target_contract.address_hash)}")
@@ -199,7 +200,8 @@ defmodule BlockScoutWeb.API.V2.SmartContractControllerTest do
         "creation_bytecode" =>
           "0x608060405234801561001057600080fd5b5060df8061001f6000396000f3006080604052600436106049576000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff16806360fe47b114604e5780636d4ce63c146078575b600080fd5b348015605957600080fd5b5060766004803603810190808035906020019092919050505060a0565b005b348015608357600080fd5b50608a60aa565b6040518082815260200191505060405180910390f35b8060008190555050565b600080549050905600a165627a7a7230582061b7676067d537e410bb704932a9984739a959416170ea17bda192ac1218d2790029",
         "abi" => target_contract.abi,
-        "is_verified_via_eth_bytecode_db" => target_contract.verified_via_eth_bytecode_db
+        "is_verified_via_eth_bytecode_db" => target_contract.verified_via_eth_bytecode_db,
+        "language" => smart_contract_language(target_contract)
       }
 
       request = get(conn, "/api/v2/smart-contracts/#{Address.checksum(target_contract.address_hash)}")
@@ -292,7 +294,8 @@ defmodule BlockScoutWeb.API.V2.SmartContractControllerTest do
         "creation_bytecode" =>
           "0x608060405234801561001057600080fd5b5060df8061001f6000396000f3006080604052600436106049576000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff16806360fe47b114604e5780636d4ce63c146078575b600080fd5b348015605957600080fd5b5060766004803603810190808035906020019092919050505060a0565b005b348015608357600080fd5b50608a60aa565b6040518082815260200191505060405180910390f35b8060008190555050565b600080549050905600a165627a7a7230582061b7676067d537e410bb704932a9984739a959416170ea17bda192ac1218d2790029",
         "abi" => target_contract.abi,
-        "is_verified_via_eth_bytecode_db" => target_contract.verified_via_eth_bytecode_db
+        "is_verified_via_eth_bytecode_db" => target_contract.verified_via_eth_bytecode_db,
+        "language" => smart_contract_language(target_contract)
       }
 
       request = get(conn, "/api/v2/smart-contracts/#{Address.checksum(address.hash)}")
@@ -1999,4 +2002,17 @@ defmodule BlockScoutWeb.API.V2.SmartContractControllerTest do
       end
     )
   end
+
+  defp smart_contract_language(smart_contract) do
+    cond do
+      smart_contract.is_vyper_contract ->
+        "vyper"
+
+      is_nil(smart_contract.abi) ->
+        "yul"
+
+      true ->
+        "solidity"
+    end
+  end
 end

From a36ba5b0cef02cc467afe34bd99062c3542d6b29 Mon Sep 17 00:00:00 2001
From: Viktor Baranov <baranov.viktor.27@gmail.com>
Date: Tue, 13 Jun 2023 21:18:32 +0300
Subject: [PATCH 096/909] add block_number indexfor address_coin_balances table

---
 CHANGELOG.md                                          |  1 +
 ...81244_address_coin_balances_block_number_index.exs | 11 +++++++++++
 2 files changed, 12 insertions(+)
 create mode 100644 apps/explorer/priv/repo/migrations/20230613181244_address_coin_balances_block_number_index.exs

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d2706781162a..722f95f7a042 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -32,6 +32,7 @@
 
 ### Chore
 
+- [#7699](https://github.com/blockscout/blockscout/pull/7699) - Add block_number index for address_coin_balances table
 - [#7666](https://github.com/blockscout/blockscout/pull/7666) - Search label query
 - [#7644](https://github.com/blockscout/blockscout/pull/7644) - Publish docker images CI for prod/staging branches
 - [#7594](https://github.com/blockscout/blockscout/pull/7594) - Stats service support in docker-compose config with new frontend
diff --git a/apps/explorer/priv/repo/migrations/20230613181244_address_coin_balances_block_number_index.exs b/apps/explorer/priv/repo/migrations/20230613181244_address_coin_balances_block_number_index.exs
new file mode 100644
index 000000000000..f50a577455a3
--- /dev/null
+++ b/apps/explorer/priv/repo/migrations/20230613181244_address_coin_balances_block_number_index.exs
@@ -0,0 +1,11 @@
+defmodule Explorer.Repo.Migrations.AddressCoinBalancesBlockNumberIndex do
+  use Ecto.Migration
+
+  def up do
+    create(index(:address_coin_balances, [:block_number]))
+  end
+
+  def down do
+    drop(index(:address_coin_balances, [:block_number]))
+  end
+end

From 8f0a1ffe5ca5d84bace3c96a03dc84ff63d154a6 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 13 Jun 2023 19:01:23 +0000
Subject: [PATCH 097/909] Bump css-minimizer-webpack-plugin in
 /apps/block_scout_web/assets

Bumps [css-minimizer-webpack-plugin](https://github.com/webpack-contrib/css-minimizer-webpack-plugin) from 5.0.0 to 5.0.1.
- [Release notes](https://github.com/webpack-contrib/css-minimizer-webpack-plugin/releases)
- [Changelog](https://github.com/webpack-contrib/css-minimizer-webpack-plugin/blob/master/CHANGELOG.md)
- [Commits](https://github.com/webpack-contrib/css-minimizer-webpack-plugin/compare/v5.0.0...v5.0.1)

---
updated-dependencies:
- dependency-name: css-minimizer-webpack-plugin
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 apps/block_scout_web/assets/package-lock.json | 176 ++++++++----------
 apps/block_scout_web/assets/package.json      |   2 +-
 2 files changed, 83 insertions(+), 95 deletions(-)

diff --git a/apps/block_scout_web/assets/package-lock.json b/apps/block_scout_web/assets/package-lock.json
index 29194f4ad77f..ab10eb3574ae 100644
--- a/apps/block_scout_web/assets/package-lock.json
+++ b/apps/block_scout_web/assets/package-lock.json
@@ -77,7 +77,7 @@
         "babel-loader": "^9.1.2",
         "copy-webpack-plugin": "^11.0.0",
         "css-loader": "^5.2.7",
-        "css-minimizer-webpack-plugin": "^5.0.0",
+        "css-minimizer-webpack-plugin": "^5.0.1",
         "eslint": "^8.42.0",
         "eslint-config-standard": "^17.1.0",
         "eslint-plugin-import": "^2.27.5",
@@ -3344,9 +3344,9 @@
       "integrity": "sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw=="
     },
     "node_modules/@jridgewell/trace-mapping": {
-      "version": "0.3.17",
-      "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.17.tgz",
-      "integrity": "sha512-MCNzAp77qzKca9+W/+I0+sEpaUnZoeasnghNeVc41VZCEKaCH73Vq3BZZ/SzWIgrqE4H4ceI+p+b6C0mHf9T4g==",
+      "version": "0.3.18",
+      "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.18.tgz",
+      "integrity": "sha512-w+niJYzMHdd7USdiH2U6869nqhD2nbfZXND5Yp93qIbEmnDNk7PD48o+YchRVpzMU7M6jVCbenTR7PA1FLQ9pA==",
       "dependencies": {
         "@jridgewell/resolve-uri": "3.1.0",
         "@jridgewell/sourcemap-codec": "1.4.14"
@@ -6096,17 +6096,17 @@
       }
     },
     "node_modules/css-minimizer-webpack-plugin": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/css-minimizer-webpack-plugin/-/css-minimizer-webpack-plugin-5.0.0.tgz",
-      "integrity": "sha512-1wZ/PYvg+ZKwi5FX6YrvbB31jMAdurS+CmRQLwWCVSlfzJC85l/a6RVICqUHFa+jXyhilfnCyjafzJGbmz5tcA==",
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/css-minimizer-webpack-plugin/-/css-minimizer-webpack-plugin-5.0.1.tgz",
+      "integrity": "sha512-3caImjKFQkS+ws1TGcFn0V1HyDJFq1Euy589JlD6/3rV2kj+w7r5G9WDMgSHvpvXHNZ2calVypZWuEDQd9wfLg==",
       "dev": true,
       "dependencies": {
-        "cssnano": "^6.0.0",
+        "@jridgewell/trace-mapping": "^0.3.18",
+        "cssnano": "^6.0.1",
         "jest-worker": "^29.4.3",
-        "postcss": "^8.4.21",
-        "schema-utils": "^4.0.0",
-        "serialize-javascript": "^6.0.1",
-        "source-map": "^0.6.1"
+        "postcss": "^8.4.24",
+        "schema-utils": "^4.0.1",
+        "serialize-javascript": "^6.0.1"
       },
       "engines": {
         "node": ">= 14.15.0"
@@ -6247,12 +6247,12 @@
       "integrity": "sha1-xtJnJjKi5cg+AT5oZKQs6N79IK4="
     },
     "node_modules/cssnano": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/cssnano/-/cssnano-6.0.0.tgz",
-      "integrity": "sha512-RGlcbzGhzEBCHuQe3k+Udyj5M00z0pm9S+VurHXFEOXxH+y0sVrJH2sMzoyz2d8N1EScazg+DVvmgyx0lurwwA==",
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/cssnano/-/cssnano-6.0.1.tgz",
+      "integrity": "sha512-fVO1JdJ0LSdIGJq68eIxOqFpIJrZqXUsBt8fkrBcztCQqAjQD51OhZp7tc0ImcbwXD4k7ny84QTV90nZhmqbkg==",
       "dev": true,
       "dependencies": {
-        "cssnano-preset-default": "^6.0.0",
+        "cssnano-preset-default": "^6.0.1",
         "lilconfig": "^2.1.0"
       },
       "engines": {
@@ -6267,14 +6267,14 @@
       }
     },
     "node_modules/cssnano-preset-default": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/cssnano-preset-default/-/cssnano-preset-default-6.0.0.tgz",
-      "integrity": "sha512-BDxlaFzObRDXUiCCBQUNQcI+f1/aX2mgoNtXGjV6PG64POcHoDUoX+LgMWw+Q4609QhxwkcSnS65YFs42RA6qQ==",
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/cssnano-preset-default/-/cssnano-preset-default-6.0.1.tgz",
+      "integrity": "sha512-7VzyFZ5zEB1+l1nToKyrRkuaJIx0zi/1npjvZfbBwbtNTzhLtlvYraK/7/uqmX2Wb2aQtd983uuGw79jAjLSuQ==",
       "dev": true,
       "dependencies": {
         "css-declaration-sorter": "^6.3.1",
         "cssnano-utils": "^4.0.0",
-        "postcss-calc": "^8.2.3",
+        "postcss-calc": "^9.0.0",
         "postcss-colormin": "^6.0.0",
         "postcss-convert-values": "^6.0.0",
         "postcss-discard-comments": "^6.0.0",
@@ -6282,7 +6282,7 @@
         "postcss-discard-empty": "^6.0.0",
         "postcss-discard-overridden": "^6.0.0",
         "postcss-merge-longhand": "^6.0.0",
-        "postcss-merge-rules": "^6.0.0",
+        "postcss-merge-rules": "^6.0.1",
         "postcss-minify-font-values": "^6.0.0",
         "postcss-minify-gradients": "^6.0.0",
         "postcss-minify-params": "^6.0.0",
@@ -6714,14 +6714,14 @@
       }
     },
     "node_modules/domutils": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/domutils/-/domutils-3.0.1.tgz",
-      "integrity": "sha512-z08c1l761iKhDFtfXO04C7kTdPBLi41zwOZl00WS8b5eiaebNpY00HKbztwBq+e3vyqWNwWF3mP9YLUeqIrF+Q==",
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/domutils/-/domutils-3.1.0.tgz",
+      "integrity": "sha512-H78uMmQtI2AhgDJjWeQmHwJJ2bLPD3GMmO7Zja/ZZh84wkm+4ut+IUnUdRa8uCGX88DiVx1j6FRe1XfxEgjEZA==",
       "dev": true,
       "dependencies": {
         "dom-serializer": "^2.0.0",
         "domelementtype": "^2.3.0",
-        "domhandler": "^5.0.1"
+        "domhandler": "^5.0.3"
       },
       "funding": {
         "url": "https://github.com/fb55/domutils?sponsor=1"
@@ -12034,15 +12034,6 @@
         "node": ">=6"
       }
     },
-    "node_modules/klona": {
-      "version": "2.0.6",
-      "resolved": "https://registry.npmjs.org/klona/-/klona-2.0.6.tgz",
-      "integrity": "sha512-dhG34DXATL5hSxJbIexCft8FChFXtmskoZYnoPWjXQuebWYCNkVeV3KkGegCK9CP1oswI/vQibS2GY7Em/sJJA==",
-      "dev": true,
-      "engines": {
-        "node": ">= 8"
-      }
-    },
     "node_modules/level-codec": {
       "version": "7.0.1",
       "resolved": "https://registry.npmjs.org/level-codec/-/level-codec-7.0.1.tgz",
@@ -13462,14 +13453,17 @@
       }
     },
     "node_modules/postcss-calc": {
-      "version": "8.2.4",
-      "resolved": "https://registry.npmjs.org/postcss-calc/-/postcss-calc-8.2.4.tgz",
-      "integrity": "sha512-SmWMSJmB8MRnnULldx0lQIyhSNvuDl9HfrZkaqqE/WHAhToYsAvDq+yAsA/kIyINDszOp3Rh0GFoNuH5Ypsm3Q==",
+      "version": "9.0.1",
+      "resolved": "https://registry.npmjs.org/postcss-calc/-/postcss-calc-9.0.1.tgz",
+      "integrity": "sha512-TipgjGyzP5QzEhsOZUaIkeO5mKeMFpebWzRogWG/ysonUlnHcq5aJe0jOjpfzUU8PeSaBQnrE8ehR0QA5vs8PQ==",
       "dev": true,
       "dependencies": {
-        "postcss-selector-parser": "^6.0.9",
+        "postcss-selector-parser": "^6.0.11",
         "postcss-value-parser": "^4.2.0"
       },
+      "engines": {
+        "node": "^14 || ^16 || >=18.0"
+      },
       "peerDependencies": {
         "postcss": "^8.2.2"
       }
@@ -13610,9 +13604,9 @@
       }
     },
     "node_modules/postcss-merge-rules": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-merge-rules/-/postcss-merge-rules-6.0.0.tgz",
-      "integrity": "sha512-rCXkklftzEkniyv3f4mRCQzxD6oE4Quyh61uyWTUbCJ26Pv2hoz+fivJSsSBWxDBeScR4fKCfF3HHTcD7Ybqnw==",
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/postcss-merge-rules/-/postcss-merge-rules-6.0.1.tgz",
+      "integrity": "sha512-a4tlmJIQo9SCjcfiCcCMg/ZCEe0XTkl/xK0XHBs955GWg9xDX3NwP9pwZ78QUOWB8/0XCjZeJn98Dae0zg6AAw==",
       "dev": true,
       "dependencies": {
         "browserslist": "^4.21.4",
@@ -13931,9 +13925,9 @@
       }
     },
     "node_modules/postcss-selector-parser": {
-      "version": "6.0.10",
-      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.10.tgz",
-      "integrity": "sha512-IQ7TZdoaqbT+LCpShg46jnZVlhWD2w6iQYAcYXfHARZ7X1t/UGhhceQDs5X0cGqKvYlHNOuv7Oa1xmb0oQuA3w==",
+      "version": "6.0.13",
+      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.13.tgz",
+      "integrity": "sha512-EaV1Gl4mUEV4ddhDnv/xtj7sxwrwxdetHdWUGnT4VJQf+4d05v6lHYZr8N573k5Z0BViss7BDhfWtKS3+sfAqQ==",
       "dev": true,
       "dependencies": {
         "cssesc": "^3.0.0",
@@ -14935,15 +14929,15 @@
       }
     },
     "node_modules/schema-utils": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.0.0.tgz",
-      "integrity": "sha512-1edyXKgh6XnJsJSQ8mKWXnN/BVaIbFMLpouRUrXgVq7WYne5kw3MW7UPhO44uRXQSIpTSXoJbmrR2X0w9kUTyg==",
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.1.0.tgz",
+      "integrity": "sha512-Jw+GZVbP5IggB2WAn6UHI02LBwGmsIeYN/lNbSMZyDziQ7jmtAUrqKqDja+W89YHVs+KL/3IkIMltAklqB1vAw==",
       "dev": true,
       "dependencies": {
         "@types/json-schema": "^7.0.9",
-        "ajv": "^8.8.0",
+        "ajv": "^8.9.0",
         "ajv-formats": "^2.1.1",
-        "ajv-keywords": "^5.0.0"
+        "ajv-keywords": "^5.1.0"
       },
       "engines": {
         "node": ">= 12.13.0"
@@ -19781,9 +19775,9 @@
       "integrity": "sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw=="
     },
     "@jridgewell/trace-mapping": {
-      "version": "0.3.17",
-      "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.17.tgz",
-      "integrity": "sha512-MCNzAp77qzKca9+W/+I0+sEpaUnZoeasnghNeVc41VZCEKaCH73Vq3BZZ/SzWIgrqE4H4ceI+p+b6C0mHf9T4g==",
+      "version": "0.3.18",
+      "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.18.tgz",
+      "integrity": "sha512-w+niJYzMHdd7USdiH2U6869nqhD2nbfZXND5Yp93qIbEmnDNk7PD48o+YchRVpzMU7M6jVCbenTR7PA1FLQ9pA==",
       "requires": {
         "@jridgewell/resolve-uri": "3.1.0",
         "@jridgewell/sourcemap-codec": "1.4.14"
@@ -22014,17 +22008,17 @@
       }
     },
     "css-minimizer-webpack-plugin": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/css-minimizer-webpack-plugin/-/css-minimizer-webpack-plugin-5.0.0.tgz",
-      "integrity": "sha512-1wZ/PYvg+ZKwi5FX6YrvbB31jMAdurS+CmRQLwWCVSlfzJC85l/a6RVICqUHFa+jXyhilfnCyjafzJGbmz5tcA==",
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/css-minimizer-webpack-plugin/-/css-minimizer-webpack-plugin-5.0.1.tgz",
+      "integrity": "sha512-3caImjKFQkS+ws1TGcFn0V1HyDJFq1Euy589JlD6/3rV2kj+w7r5G9WDMgSHvpvXHNZ2calVypZWuEDQd9wfLg==",
       "dev": true,
       "requires": {
-        "cssnano": "^6.0.0",
+        "@jridgewell/trace-mapping": "^0.3.18",
+        "cssnano": "^6.0.1",
         "jest-worker": "^29.4.3",
-        "postcss": "^8.4.21",
-        "schema-utils": "^4.0.0",
-        "serialize-javascript": "^6.0.1",
-        "source-map": "^0.6.1"
+        "postcss": "^8.4.24",
+        "schema-utils": "^4.0.1",
+        "serialize-javascript": "^6.0.1"
       },
       "dependencies": {
         "has-flag": {
@@ -22107,24 +22101,24 @@
       "integrity": "sha1-xtJnJjKi5cg+AT5oZKQs6N79IK4="
     },
     "cssnano": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/cssnano/-/cssnano-6.0.0.tgz",
-      "integrity": "sha512-RGlcbzGhzEBCHuQe3k+Udyj5M00z0pm9S+VurHXFEOXxH+y0sVrJH2sMzoyz2d8N1EScazg+DVvmgyx0lurwwA==",
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/cssnano/-/cssnano-6.0.1.tgz",
+      "integrity": "sha512-fVO1JdJ0LSdIGJq68eIxOqFpIJrZqXUsBt8fkrBcztCQqAjQD51OhZp7tc0ImcbwXD4k7ny84QTV90nZhmqbkg==",
       "dev": true,
       "requires": {
-        "cssnano-preset-default": "^6.0.0",
+        "cssnano-preset-default": "^6.0.1",
         "lilconfig": "^2.1.0"
       }
     },
     "cssnano-preset-default": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/cssnano-preset-default/-/cssnano-preset-default-6.0.0.tgz",
-      "integrity": "sha512-BDxlaFzObRDXUiCCBQUNQcI+f1/aX2mgoNtXGjV6PG64POcHoDUoX+LgMWw+Q4609QhxwkcSnS65YFs42RA6qQ==",
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/cssnano-preset-default/-/cssnano-preset-default-6.0.1.tgz",
+      "integrity": "sha512-7VzyFZ5zEB1+l1nToKyrRkuaJIx0zi/1npjvZfbBwbtNTzhLtlvYraK/7/uqmX2Wb2aQtd983uuGw79jAjLSuQ==",
       "dev": true,
       "requires": {
         "css-declaration-sorter": "^6.3.1",
         "cssnano-utils": "^4.0.0",
-        "postcss-calc": "^8.2.3",
+        "postcss-calc": "^9.0.0",
         "postcss-colormin": "^6.0.0",
         "postcss-convert-values": "^6.0.0",
         "postcss-discard-comments": "^6.0.0",
@@ -22132,7 +22126,7 @@
         "postcss-discard-empty": "^6.0.0",
         "postcss-discard-overridden": "^6.0.0",
         "postcss-merge-longhand": "^6.0.0",
-        "postcss-merge-rules": "^6.0.0",
+        "postcss-merge-rules": "^6.0.1",
         "postcss-minify-font-values": "^6.0.0",
         "postcss-minify-gradients": "^6.0.0",
         "postcss-minify-params": "^6.0.0",
@@ -22460,14 +22454,14 @@
       }
     },
     "domutils": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/domutils/-/domutils-3.0.1.tgz",
-      "integrity": "sha512-z08c1l761iKhDFtfXO04C7kTdPBLi41zwOZl00WS8b5eiaebNpY00HKbztwBq+e3vyqWNwWF3mP9YLUeqIrF+Q==",
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/domutils/-/domutils-3.1.0.tgz",
+      "integrity": "sha512-H78uMmQtI2AhgDJjWeQmHwJJ2bLPD3GMmO7Zja/ZZh84wkm+4ut+IUnUdRa8uCGX88DiVx1j6FRe1XfxEgjEZA==",
       "dev": true,
       "requires": {
         "dom-serializer": "^2.0.0",
         "domelementtype": "^2.3.0",
-        "domhandler": "^5.0.1"
+        "domhandler": "^5.0.3"
       }
     },
     "dropzone": {
@@ -26547,12 +26541,6 @@
       "integrity": "sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w==",
       "dev": true
     },
-    "klona": {
-      "version": "2.0.6",
-      "resolved": "https://registry.npmjs.org/klona/-/klona-2.0.6.tgz",
-      "integrity": "sha512-dhG34DXATL5hSxJbIexCft8FChFXtmskoZYnoPWjXQuebWYCNkVeV3KkGegCK9CP1oswI/vQibS2GY7Em/sJJA==",
-      "dev": true
-    },
     "level-codec": {
       "version": "7.0.1",
       "resolved": "https://registry.npmjs.org/level-codec/-/level-codec-7.0.1.tgz",
@@ -27690,12 +27678,12 @@
       }
     },
     "postcss-calc": {
-      "version": "8.2.4",
-      "resolved": "https://registry.npmjs.org/postcss-calc/-/postcss-calc-8.2.4.tgz",
-      "integrity": "sha512-SmWMSJmB8MRnnULldx0lQIyhSNvuDl9HfrZkaqqE/WHAhToYsAvDq+yAsA/kIyINDszOp3Rh0GFoNuH5Ypsm3Q==",
+      "version": "9.0.1",
+      "resolved": "https://registry.npmjs.org/postcss-calc/-/postcss-calc-9.0.1.tgz",
+      "integrity": "sha512-TipgjGyzP5QzEhsOZUaIkeO5mKeMFpebWzRogWG/ysonUlnHcq5aJe0jOjpfzUU8PeSaBQnrE8ehR0QA5vs8PQ==",
       "dev": true,
       "requires": {
-        "postcss-selector-parser": "^6.0.9",
+        "postcss-selector-parser": "^6.0.11",
         "postcss-value-parser": "^4.2.0"
       }
     },
@@ -27782,9 +27770,9 @@
       }
     },
     "postcss-merge-rules": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-merge-rules/-/postcss-merge-rules-6.0.0.tgz",
-      "integrity": "sha512-rCXkklftzEkniyv3f4mRCQzxD6oE4Quyh61uyWTUbCJ26Pv2hoz+fivJSsSBWxDBeScR4fKCfF3HHTcD7Ybqnw==",
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/postcss-merge-rules/-/postcss-merge-rules-6.0.1.tgz",
+      "integrity": "sha512-a4tlmJIQo9SCjcfiCcCMg/ZCEe0XTkl/xK0XHBs955GWg9xDX3NwP9pwZ78QUOWB8/0XCjZeJn98Dae0zg6AAw==",
       "dev": true,
       "requires": {
         "browserslist": "^4.21.4",
@@ -27979,9 +27967,9 @@
       }
     },
     "postcss-selector-parser": {
-      "version": "6.0.10",
-      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.10.tgz",
-      "integrity": "sha512-IQ7TZdoaqbT+LCpShg46jnZVlhWD2w6iQYAcYXfHARZ7X1t/UGhhceQDs5X0cGqKvYlHNOuv7Oa1xmb0oQuA3w==",
+      "version": "6.0.13",
+      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.13.tgz",
+      "integrity": "sha512-EaV1Gl4mUEV4ddhDnv/xtj7sxwrwxdetHdWUGnT4VJQf+4d05v6lHYZr8N573k5Z0BViss7BDhfWtKS3+sfAqQ==",
       "dev": true,
       "requires": {
         "cssesc": "^3.0.0",
@@ -28726,15 +28714,15 @@
       }
     },
     "schema-utils": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.0.0.tgz",
-      "integrity": "sha512-1edyXKgh6XnJsJSQ8mKWXnN/BVaIbFMLpouRUrXgVq7WYne5kw3MW7UPhO44uRXQSIpTSXoJbmrR2X0w9kUTyg==",
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.1.0.tgz",
+      "integrity": "sha512-Jw+GZVbP5IggB2WAn6UHI02LBwGmsIeYN/lNbSMZyDziQ7jmtAUrqKqDja+W89YHVs+KL/3IkIMltAklqB1vAw==",
       "dev": true,
       "requires": {
         "@types/json-schema": "^7.0.9",
-        "ajv": "^8.8.0",
+        "ajv": "^8.9.0",
         "ajv-formats": "^2.1.1",
-        "ajv-keywords": "^5.0.0"
+        "ajv-keywords": "^5.1.0"
       },
       "dependencies": {
         "ajv": {
diff --git a/apps/block_scout_web/assets/package.json b/apps/block_scout_web/assets/package.json
index ff173fa03c7d..90b3430f2772 100644
--- a/apps/block_scout_web/assets/package.json
+++ b/apps/block_scout_web/assets/package.json
@@ -89,7 +89,7 @@
     "babel-loader": "^9.1.2",
     "copy-webpack-plugin": "^11.0.0",
     "css-loader": "^5.2.7",
-    "css-minimizer-webpack-plugin": "^5.0.0",
+    "css-minimizer-webpack-plugin": "^5.0.1",
     "eslint": "^8.42.0",
     "eslint-config-standard": "^17.1.0",
     "eslint-plugin-import": "^2.27.5",

From 8486a0f88a406e49da8efb042e782fa1a52bc378 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 13 Jun 2023 19:02:40 +0000
Subject: [PATCH 098/909] Bump @amplitude/analytics-browser in
 /apps/block_scout_web/assets

Bumps [@amplitude/analytics-browser](https://github.com/amplitude/Amplitude-TypeScript) from 1.10.8 to 1.11.0.
- [Release notes](https://github.com/amplitude/Amplitude-TypeScript/releases)
- [Commits](https://github.com/amplitude/Amplitude-TypeScript/compare/@amplitude/analytics-browser@1.10.8...@amplitude/analytics-browser@1.11.0)

---
updated-dependencies:
- dependency-name: "@amplitude/analytics-browser"
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 apps/block_scout_web/assets/package-lock.json | 141 ++++++++----------
 apps/block_scout_web/assets/package.json      |   2 +-
 2 files changed, 64 insertions(+), 79 deletions(-)

diff --git a/apps/block_scout_web/assets/package-lock.json b/apps/block_scout_web/assets/package-lock.json
index 29194f4ad77f..174387209212 100644
--- a/apps/block_scout_web/assets/package-lock.json
+++ b/apps/block_scout_web/assets/package-lock.json
@@ -7,7 +7,7 @@
       "name": "blockscout",
       "license": "GPL-3.0",
       "dependencies": {
-        "@amplitude/analytics-browser": "^1.10.8",
+        "@amplitude/analytics-browser": "^1.11.0",
         "@fortawesome/fontawesome-free": "^6.4.0",
         "@tarekraafat/autocomplete.js": "^10.2.7",
         "@walletconnect/web3-provider": "^1.8.0",
@@ -107,15 +107,15 @@
       "version": "0.0.1"
     },
     "node_modules/@amplitude/analytics-browser": {
-      "version": "1.10.8",
-      "resolved": "https://registry.npmjs.org/@amplitude/analytics-browser/-/analytics-browser-1.10.8.tgz",
-      "integrity": "sha512-8rsOvU7fqBbkHaVSi/3WQ2bRvxR45n3Bqojk3UBxpypKAdqt2xcbngAuGD6/JdKBOJ4iJMwRAKojZgr1kzN3WQ==",
-      "dependencies": {
-        "@amplitude/analytics-client-common": "^1.0.1",
-        "@amplitude/analytics-core": "^1.1.0",
-        "@amplitude/analytics-types": "^1.1.0",
-        "@amplitude/plugin-page-view-tracking-browser": "^1.0.2",
-        "@amplitude/plugin-web-attribution-browser": "^1.0.2",
+      "version": "1.11.0",
+      "resolved": "https://registry.npmjs.org/@amplitude/analytics-browser/-/analytics-browser-1.11.0.tgz",
+      "integrity": "sha512-UaZRJrsL0nvbyG4+ZsD8njbsbUiiNQg+guT+Ys+4YKKjYgAlImze++3OA2TVHdX1BxT6bLjmltQrqpHVryoIkg==",
+      "dependencies": {
+        "@amplitude/analytics-client-common": "^1.0.2",
+        "@amplitude/analytics-core": "^1.1.1",
+        "@amplitude/analytics-types": "^1.2.0",
+        "@amplitude/plugin-page-view-tracking-browser": "^1.0.3",
+        "@amplitude/plugin-web-attribution-browser": "^1.0.3",
         "@amplitude/ua-parser-js": "^0.7.31",
         "tslib": "^2.4.1"
       }
@@ -126,13 +126,13 @@
       "integrity": "sha512-tGyy4dAjRIEwI7BzsB0lynWgOpfqjUdq91XXAlIWD2OwKBH7oCl/GZG/HT4BOHrTlPMOASlMQ7veyTqpmRcrNA=="
     },
     "node_modules/@amplitude/analytics-client-common": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/@amplitude/analytics-client-common/-/analytics-client-common-1.0.1.tgz",
-      "integrity": "sha512-PEZrZzrAyVQKb+vYEc6cPBamFNH0XQ+LUIlROZWC78PmwcEfpZD/3/PQMqRQidyTsklpAx8vJgqJImyA/Hafng==",
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/@amplitude/analytics-client-common/-/analytics-client-common-1.0.2.tgz",
+      "integrity": "sha512-kgIVXCWsUpaFhZZkcOvSckt2Rmg9m96hF1rxYj2ESccS3NeBPSUg1v1brNO2TOnA9A4pHApC2vruJvhnh2qN+w==",
       "dependencies": {
         "@amplitude/analytics-connector": "^1.4.5",
-        "@amplitude/analytics-core": "^1.1.0",
-        "@amplitude/analytics-types": "^1.1.0",
+        "@amplitude/analytics-core": "^1.1.1",
+        "@amplitude/analytics-types": "^1.2.0",
         "tslib": "^2.4.1"
       }
     },
@@ -147,11 +147,11 @@
       "integrity": "sha512-dFW7c7Wb6Ng7vbmzwbaXZSpqfBx37ukamJV9ErFYYS8vGZK/Hkbt3M7fZHBI4WFU6CCwakr2ZXPme11uGPYWkQ=="
     },
     "node_modules/@amplitude/analytics-core": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/@amplitude/analytics-core/-/analytics-core-1.1.0.tgz",
-      "integrity": "sha512-mWp753c9tAP54+9z+WFnZaUnWbhI4o3WQtRQIA954UEnqgKTuUIkKLyb8zrh8zKVf1MUuZDuEE+zI5Gs05mk7A==",
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/@amplitude/analytics-core/-/analytics-core-1.1.1.tgz",
+      "integrity": "sha512-I/ymHQbC5wXuhArD+Nueuh8Xug46OiaiVjsOhAXw4xhydf12KTzGxwtEYOLHDPmsZXk7Pjg4SCxuw5UCkQWNPA==",
       "dependencies": {
-        "@amplitude/analytics-types": "^1.1.0",
+        "@amplitude/analytics-types": "^1.2.0",
         "tslib": "^2.4.1"
       }
     },
@@ -161,17 +161,17 @@
       "integrity": "sha512-mSxlJJwl3BMEQCUNnxXBU9jP4JBktcEGhURcPR6VQVlnP0FdDEsIaz0C35dXNGLyRfrATNofF0F5p2KPxQgB+w=="
     },
     "node_modules/@amplitude/analytics-types": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/@amplitude/analytics-types/-/analytics-types-1.1.0.tgz",
-      "integrity": "sha512-FAJMewKuiDbcnG5aGSpxwXPy31clqyK0tIGi27AVL2Dnf+7jUbphMB6s1AijXfB5+OdMY51N+jzapD5C+pR0Wg=="
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/@amplitude/analytics-types/-/analytics-types-1.2.0.tgz",
+      "integrity": "sha512-g2y4eSO6smGa8zIu4qjdLmSC5CY70aJw2oLNGOhgcnER5TFgw1ywlGAWBFbtFZCpkomR+9UWRsgJiAG6Ub34LQ=="
     },
     "node_modules/@amplitude/plugin-page-view-tracking-browser": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/@amplitude/plugin-page-view-tracking-browser/-/plugin-page-view-tracking-browser-1.0.2.tgz",
-      "integrity": "sha512-jBReKXkn6Qq5fgAb7kR6YkPbdRi1idcH6u5iIPAGfuciAb9qKcNj7lAcAcIT9nS1DGsvRo1qsn1/UH548b/Tew==",
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/@amplitude/plugin-page-view-tracking-browser/-/plugin-page-view-tracking-browser-1.0.3.tgz",
+      "integrity": "sha512-J1T2Nak6YoExjiEOJe1ppo1Q7yXrsAwG1bnKMAvCIAdC4PpKiZilCYtpqB81E41vPYT0ogBSQycLLE/NM+U/SQ==",
       "dependencies": {
-        "@amplitude/analytics-client-common": "^1.0.1",
-        "@amplitude/analytics-types": "^1.1.0",
+        "@amplitude/analytics-client-common": "^1.0.2",
+        "@amplitude/analytics-types": "^1.2.0",
         "tslib": "^2.4.1"
       }
     },
@@ -181,12 +181,12 @@
       "integrity": "sha512-mSxlJJwl3BMEQCUNnxXBU9jP4JBktcEGhURcPR6VQVlnP0FdDEsIaz0C35dXNGLyRfrATNofF0F5p2KPxQgB+w=="
     },
     "node_modules/@amplitude/plugin-web-attribution-browser": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/@amplitude/plugin-web-attribution-browser/-/plugin-web-attribution-browser-1.0.2.tgz",
-      "integrity": "sha512-80M4ZjZjlg7nmslIdWBOUBMVMZMa4OXoWmTviu38jFMjbO7JsZil/V1rwb3d/tpyceHt/yNQes4yknQWeiZAQw==",
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/@amplitude/plugin-web-attribution-browser/-/plugin-web-attribution-browser-1.0.3.tgz",
+      "integrity": "sha512-ddfG7oeLD7QdNF/vVDCgw1BX3k25pK2ywRAWmP1ttaNXZDiCXvI8JMnNx3jmrxavPhRmJtF2Ed0uJmVJ12d8Nw==",
       "dependencies": {
-        "@amplitude/analytics-client-common": "^1.0.1",
-        "@amplitude/analytics-types": "^1.1.0",
+        "@amplitude/analytics-client-common": "^1.0.2",
+        "@amplitude/analytics-types": "^1.2.0",
         "tslib": "^2.4.1"
       }
     },
@@ -12034,15 +12034,6 @@
         "node": ">=6"
       }
     },
-    "node_modules/klona": {
-      "version": "2.0.6",
-      "resolved": "https://registry.npmjs.org/klona/-/klona-2.0.6.tgz",
-      "integrity": "sha512-dhG34DXATL5hSxJbIexCft8FChFXtmskoZYnoPWjXQuebWYCNkVeV3KkGegCK9CP1oswI/vQibS2GY7Em/sJJA==",
-      "dev": true,
-      "engines": {
-        "node": ">= 8"
-      }
-    },
     "node_modules/level-codec": {
       "version": "7.0.1",
       "resolved": "https://registry.npmjs.org/level-codec/-/level-codec-7.0.1.tgz",
@@ -17496,15 +17487,15 @@
   },
   "dependencies": {
     "@amplitude/analytics-browser": {
-      "version": "1.10.8",
-      "resolved": "https://registry.npmjs.org/@amplitude/analytics-browser/-/analytics-browser-1.10.8.tgz",
-      "integrity": "sha512-8rsOvU7fqBbkHaVSi/3WQ2bRvxR45n3Bqojk3UBxpypKAdqt2xcbngAuGD6/JdKBOJ4iJMwRAKojZgr1kzN3WQ==",
-      "requires": {
-        "@amplitude/analytics-client-common": "^1.0.1",
-        "@amplitude/analytics-core": "^1.1.0",
-        "@amplitude/analytics-types": "^1.1.0",
-        "@amplitude/plugin-page-view-tracking-browser": "^1.0.2",
-        "@amplitude/plugin-web-attribution-browser": "^1.0.2",
+      "version": "1.11.0",
+      "resolved": "https://registry.npmjs.org/@amplitude/analytics-browser/-/analytics-browser-1.11.0.tgz",
+      "integrity": "sha512-UaZRJrsL0nvbyG4+ZsD8njbsbUiiNQg+guT+Ys+4YKKjYgAlImze++3OA2TVHdX1BxT6bLjmltQrqpHVryoIkg==",
+      "requires": {
+        "@amplitude/analytics-client-common": "^1.0.2",
+        "@amplitude/analytics-core": "^1.1.1",
+        "@amplitude/analytics-types": "^1.2.0",
+        "@amplitude/plugin-page-view-tracking-browser": "^1.0.3",
+        "@amplitude/plugin-web-attribution-browser": "^1.0.3",
         "@amplitude/ua-parser-js": "^0.7.31",
         "tslib": "^2.4.1"
       },
@@ -17517,13 +17508,13 @@
       }
     },
     "@amplitude/analytics-client-common": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/@amplitude/analytics-client-common/-/analytics-client-common-1.0.1.tgz",
-      "integrity": "sha512-PEZrZzrAyVQKb+vYEc6cPBamFNH0XQ+LUIlROZWC78PmwcEfpZD/3/PQMqRQidyTsklpAx8vJgqJImyA/Hafng==",
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/@amplitude/analytics-client-common/-/analytics-client-common-1.0.2.tgz",
+      "integrity": "sha512-kgIVXCWsUpaFhZZkcOvSckt2Rmg9m96hF1rxYj2ESccS3NeBPSUg1v1brNO2TOnA9A4pHApC2vruJvhnh2qN+w==",
       "requires": {
         "@amplitude/analytics-connector": "^1.4.5",
-        "@amplitude/analytics-core": "^1.1.0",
-        "@amplitude/analytics-types": "^1.1.0",
+        "@amplitude/analytics-core": "^1.1.1",
+        "@amplitude/analytics-types": "^1.2.0",
         "tslib": "^2.4.1"
       },
       "dependencies": {
@@ -17540,11 +17531,11 @@
       "integrity": "sha512-dFW7c7Wb6Ng7vbmzwbaXZSpqfBx37ukamJV9ErFYYS8vGZK/Hkbt3M7fZHBI4WFU6CCwakr2ZXPme11uGPYWkQ=="
     },
     "@amplitude/analytics-core": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/@amplitude/analytics-core/-/analytics-core-1.1.0.tgz",
-      "integrity": "sha512-mWp753c9tAP54+9z+WFnZaUnWbhI4o3WQtRQIA954UEnqgKTuUIkKLyb8zrh8zKVf1MUuZDuEE+zI5Gs05mk7A==",
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/@amplitude/analytics-core/-/analytics-core-1.1.1.tgz",
+      "integrity": "sha512-I/ymHQbC5wXuhArD+Nueuh8Xug46OiaiVjsOhAXw4xhydf12KTzGxwtEYOLHDPmsZXk7Pjg4SCxuw5UCkQWNPA==",
       "requires": {
-        "@amplitude/analytics-types": "^1.1.0",
+        "@amplitude/analytics-types": "^1.2.0",
         "tslib": "^2.4.1"
       },
       "dependencies": {
@@ -17556,17 +17547,17 @@
       }
     },
     "@amplitude/analytics-types": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/@amplitude/analytics-types/-/analytics-types-1.1.0.tgz",
-      "integrity": "sha512-FAJMewKuiDbcnG5aGSpxwXPy31clqyK0tIGi27AVL2Dnf+7jUbphMB6s1AijXfB5+OdMY51N+jzapD5C+pR0Wg=="
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/@amplitude/analytics-types/-/analytics-types-1.2.0.tgz",
+      "integrity": "sha512-g2y4eSO6smGa8zIu4qjdLmSC5CY70aJw2oLNGOhgcnER5TFgw1ywlGAWBFbtFZCpkomR+9UWRsgJiAG6Ub34LQ=="
     },
     "@amplitude/plugin-page-view-tracking-browser": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/@amplitude/plugin-page-view-tracking-browser/-/plugin-page-view-tracking-browser-1.0.2.tgz",
-      "integrity": "sha512-jBReKXkn6Qq5fgAb7kR6YkPbdRi1idcH6u5iIPAGfuciAb9qKcNj7lAcAcIT9nS1DGsvRo1qsn1/UH548b/Tew==",
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/@amplitude/plugin-page-view-tracking-browser/-/plugin-page-view-tracking-browser-1.0.3.tgz",
+      "integrity": "sha512-J1T2Nak6YoExjiEOJe1ppo1Q7yXrsAwG1bnKMAvCIAdC4PpKiZilCYtpqB81E41vPYT0ogBSQycLLE/NM+U/SQ==",
       "requires": {
-        "@amplitude/analytics-client-common": "^1.0.1",
-        "@amplitude/analytics-types": "^1.1.0",
+        "@amplitude/analytics-client-common": "^1.0.2",
+        "@amplitude/analytics-types": "^1.2.0",
         "tslib": "^2.4.1"
       },
       "dependencies": {
@@ -17578,12 +17569,12 @@
       }
     },
     "@amplitude/plugin-web-attribution-browser": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/@amplitude/plugin-web-attribution-browser/-/plugin-web-attribution-browser-1.0.2.tgz",
-      "integrity": "sha512-80M4ZjZjlg7nmslIdWBOUBMVMZMa4OXoWmTviu38jFMjbO7JsZil/V1rwb3d/tpyceHt/yNQes4yknQWeiZAQw==",
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/@amplitude/plugin-web-attribution-browser/-/plugin-web-attribution-browser-1.0.3.tgz",
+      "integrity": "sha512-ddfG7oeLD7QdNF/vVDCgw1BX3k25pK2ywRAWmP1ttaNXZDiCXvI8JMnNx3jmrxavPhRmJtF2Ed0uJmVJ12d8Nw==",
       "requires": {
-        "@amplitude/analytics-client-common": "^1.0.1",
-        "@amplitude/analytics-types": "^1.1.0",
+        "@amplitude/analytics-client-common": "^1.0.2",
+        "@amplitude/analytics-types": "^1.2.0",
         "tslib": "^2.4.1"
       },
       "dependencies": {
@@ -26547,12 +26538,6 @@
       "integrity": "sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w==",
       "dev": true
     },
-    "klona": {
-      "version": "2.0.6",
-      "resolved": "https://registry.npmjs.org/klona/-/klona-2.0.6.tgz",
-      "integrity": "sha512-dhG34DXATL5hSxJbIexCft8FChFXtmskoZYnoPWjXQuebWYCNkVeV3KkGegCK9CP1oswI/vQibS2GY7Em/sJJA==",
-      "dev": true
-    },
     "level-codec": {
       "version": "7.0.1",
       "resolved": "https://registry.npmjs.org/level-codec/-/level-codec-7.0.1.tgz",
diff --git a/apps/block_scout_web/assets/package.json b/apps/block_scout_web/assets/package.json
index ff173fa03c7d..c708a534d527 100644
--- a/apps/block_scout_web/assets/package.json
+++ b/apps/block_scout_web/assets/package.json
@@ -20,7 +20,7 @@
   },
   "dependencies": {
     "@fortawesome/fontawesome-free": "^6.4.0",
-    "@amplitude/analytics-browser": "^1.10.8",
+    "@amplitude/analytics-browser": "^1.11.0",
     "@tarekraafat/autocomplete.js": "^10.2.7",
     "@walletconnect/web3-provider": "^1.8.0",
     "assert": "^2.0.0",

From e6216f7dab9f1932ac47d6ca7ea487422717e09e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 14 Jun 2023 19:01:09 +0000
Subject: [PATCH 099/909] Bump sass from 1.63.3 to 1.63.4 in
 /apps/block_scout_web/assets

Bumps [sass](https://github.com/sass/dart-sass) from 1.63.3 to 1.63.4.
- [Release notes](https://github.com/sass/dart-sass/releases)
- [Changelog](https://github.com/sass/dart-sass/blob/main/CHANGELOG.md)
- [Commits](https://github.com/sass/dart-sass/compare/1.63.3...1.63.4)

---
updated-dependencies:
- dependency-name: sass
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 apps/block_scout_web/assets/package-lock.json | 14 +++++++-------
 apps/block_scout_web/assets/package.json      |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/apps/block_scout_web/assets/package-lock.json b/apps/block_scout_web/assets/package-lock.json
index df01353f1886..1e31dfa57d32 100644
--- a/apps/block_scout_web/assets/package-lock.json
+++ b/apps/block_scout_web/assets/package-lock.json
@@ -89,7 +89,7 @@
         "mini-css-extract-plugin": "^2.7.6",
         "postcss": "^8.4.24",
         "postcss-loader": "^7.3.3",
-        "sass": "^1.63.3",
+        "sass": "^1.63.4",
         "sass-loader": "^13.3.2",
         "style-loader": "^3.3.3",
         "webpack": "^5.86.0",
@@ -14854,9 +14854,9 @@
       "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
     },
     "node_modules/sass": {
-      "version": "1.63.3",
-      "resolved": "https://registry.npmjs.org/sass/-/sass-1.63.3.tgz",
-      "integrity": "sha512-ySdXN+DVpfwq49jG1+hmtDslYqpS7SkOR5GpF6o2bmb1RL/xS+wvPmegMvMywyfsmAV6p7TgwXYGrCZIFFbAHg==",
+      "version": "1.63.4",
+      "resolved": "https://registry.npmjs.org/sass/-/sass-1.63.4.tgz",
+      "integrity": "sha512-Sx/+weUmK+oiIlI+9sdD0wZHsqpbgQg8wSwSnGBjwb5GwqFhYNwwnI+UWZtLjKvKyFlKkatRK235qQ3mokyPoQ==",
       "dev": true,
       "dependencies": {
         "chokidar": ">=3.0.0 <4.0.0",
@@ -28676,9 +28676,9 @@
       "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
     },
     "sass": {
-      "version": "1.63.3",
-      "resolved": "https://registry.npmjs.org/sass/-/sass-1.63.3.tgz",
-      "integrity": "sha512-ySdXN+DVpfwq49jG1+hmtDslYqpS7SkOR5GpF6o2bmb1RL/xS+wvPmegMvMywyfsmAV6p7TgwXYGrCZIFFbAHg==",
+      "version": "1.63.4",
+      "resolved": "https://registry.npmjs.org/sass/-/sass-1.63.4.tgz",
+      "integrity": "sha512-Sx/+weUmK+oiIlI+9sdD0wZHsqpbgQg8wSwSnGBjwb5GwqFhYNwwnI+UWZtLjKvKyFlKkatRK235qQ3mokyPoQ==",
       "dev": true,
       "requires": {
         "chokidar": ">=3.0.0 <4.0.0",
diff --git a/apps/block_scout_web/assets/package.json b/apps/block_scout_web/assets/package.json
index 1740cebbb446..dc46ff22ce87 100644
--- a/apps/block_scout_web/assets/package.json
+++ b/apps/block_scout_web/assets/package.json
@@ -101,7 +101,7 @@
     "mini-css-extract-plugin": "^2.7.6",
     "postcss": "^8.4.24",
     "postcss-loader": "^7.3.3",
-    "sass": "^1.63.3",
+    "sass": "^1.63.4",
     "sass-loader": "^13.3.2",
     "style-loader": "^3.3.3",
     "webpack": "^5.86.0",

From 5c8a0cce04d482454c8cd7abadad6c9c722d615d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 14 Jun 2023 19:01:55 +0000
Subject: [PATCH 100/909] Bump webpack from 5.86.0 to 5.87.0 in
 /apps/block_scout_web/assets

Bumps [webpack](https://github.com/webpack/webpack) from 5.86.0 to 5.87.0.
- [Release notes](https://github.com/webpack/webpack/releases)
- [Commits](https://github.com/webpack/webpack/compare/v5.86.0...v5.87.0)

---
updated-dependencies:
- dependency-name: webpack
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 apps/block_scout_web/assets/package-lock.json | 46 +++++++++----------
 apps/block_scout_web/assets/package.json      |  2 +-
 2 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/apps/block_scout_web/assets/package-lock.json b/apps/block_scout_web/assets/package-lock.json
index df01353f1886..822489f9ff8a 100644
--- a/apps/block_scout_web/assets/package-lock.json
+++ b/apps/block_scout_web/assets/package-lock.json
@@ -92,7 +92,7 @@
         "sass": "^1.63.3",
         "sass-loader": "^13.3.2",
         "style-loader": "^3.3.3",
-        "webpack": "^5.86.0",
+        "webpack": "^5.87.0",
         "webpack-cli": "^5.1.4"
       },
       "engines": {
@@ -6837,9 +6837,9 @@
       }
     },
     "node_modules/enhanced-resolve": {
-      "version": "5.14.1",
-      "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.14.1.tgz",
-      "integrity": "sha512-Vklwq2vDKtl0y/vtwjSesgJ5MYS7Etuk5txS8VdKL4AOS1aUlD96zqIfsOSLQsdv3xgMRbtkWM8eG9XDfKUPow==",
+      "version": "5.15.0",
+      "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.15.0.tgz",
+      "integrity": "sha512-LXYT42KJ7lpIKECr2mAXIaMldcNCh/7E0KBKOu4KSfkHmP+mZmSs+8V5gBAqisWBy0OO4W5Oyys0GO1Y8KtdKg==",
       "dev": true,
       "dependencies": {
         "graceful-fs": "^4.2.4",
@@ -16946,9 +16946,9 @@
       }
     },
     "node_modules/webpack": {
-      "version": "5.86.0",
-      "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.86.0.tgz",
-      "integrity": "sha512-3BOvworZ8SO/D4GVP+GoRC3fVeg5MO4vzmq8TJJEkdmopxyazGDxN8ClqN12uzrZW9Tv8EED8v5VSb6Sqyi0pg==",
+      "version": "5.87.0",
+      "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.87.0.tgz",
+      "integrity": "sha512-GOu1tNbQ7p1bDEoFRs2YPcfyGs8xq52yyPBZ3m2VGnXGtV9MxjrkABHm4V9Ia280OefsSLzvbVoXcfLxjKY/Iw==",
       "dev": true,
       "dependencies": {
         "@types/eslint-scope": "^3.7.3",
@@ -16960,7 +16960,7 @@
         "acorn-import-assertions": "^1.9.0",
         "browserslist": "^4.14.5",
         "chrome-trace-event": "^1.0.2",
-        "enhanced-resolve": "^5.14.1",
+        "enhanced-resolve": "^5.15.0",
         "es-module-lexer": "^1.2.1",
         "eslint-scope": "5.1.1",
         "events": "^3.2.0",
@@ -16970,7 +16970,7 @@
         "loader-runner": "^4.2.0",
         "mime-types": "^2.1.27",
         "neo-async": "^2.6.2",
-        "schema-utils": "^3.1.2",
+        "schema-utils": "^3.2.0",
         "tapable": "^2.1.1",
         "terser-webpack-plugin": "^5.3.7",
         "watchpack": "^2.4.0",
@@ -17060,9 +17060,9 @@
       }
     },
     "node_modules/webpack/node_modules/schema-utils": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.2.tgz",
-      "integrity": "sha512-pvjEHOgWc9OWA/f/DE3ohBWTD6EleVLf7iFUkoSwAxttdBhB9QUebQgxER2kWueOvRJXPHNnyrvvh9eZINB8Eg==",
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.3.0.tgz",
+      "integrity": "sha512-pN/yOAvcC+5rQ5nERGuwrjLlYvLTbCibnZ1I7B1LaiAz9BRBlE9GMgE/eqV30P7aJQUf7Ddimy/RsbYO/GrVGg==",
       "dev": true,
       "dependencies": {
         "@types/json-schema": "^7.0.8",
@@ -22563,9 +22563,9 @@
       }
     },
     "enhanced-resolve": {
-      "version": "5.14.1",
-      "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.14.1.tgz",
-      "integrity": "sha512-Vklwq2vDKtl0y/vtwjSesgJ5MYS7Etuk5txS8VdKL4AOS1aUlD96zqIfsOSLQsdv3xgMRbtkWM8eG9XDfKUPow==",
+      "version": "5.15.0",
+      "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.15.0.tgz",
+      "integrity": "sha512-LXYT42KJ7lpIKECr2mAXIaMldcNCh/7E0KBKOu4KSfkHmP+mZmSs+8V5gBAqisWBy0OO4W5Oyys0GO1Y8KtdKg==",
       "dev": true,
       "requires": {
         "graceful-fs": "^4.2.4",
@@ -30276,9 +30276,9 @@
       "dev": true
     },
     "webpack": {
-      "version": "5.86.0",
-      "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.86.0.tgz",
-      "integrity": "sha512-3BOvworZ8SO/D4GVP+GoRC3fVeg5MO4vzmq8TJJEkdmopxyazGDxN8ClqN12uzrZW9Tv8EED8v5VSb6Sqyi0pg==",
+      "version": "5.87.0",
+      "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.87.0.tgz",
+      "integrity": "sha512-GOu1tNbQ7p1bDEoFRs2YPcfyGs8xq52yyPBZ3m2VGnXGtV9MxjrkABHm4V9Ia280OefsSLzvbVoXcfLxjKY/Iw==",
       "dev": true,
       "requires": {
         "@types/eslint-scope": "^3.7.3",
@@ -30290,7 +30290,7 @@
         "acorn-import-assertions": "^1.9.0",
         "browserslist": "^4.14.5",
         "chrome-trace-event": "^1.0.2",
-        "enhanced-resolve": "^5.14.1",
+        "enhanced-resolve": "^5.15.0",
         "es-module-lexer": "^1.2.1",
         "eslint-scope": "5.1.1",
         "events": "^3.2.0",
@@ -30300,7 +30300,7 @@
         "loader-runner": "^4.2.0",
         "mime-types": "^2.1.27",
         "neo-async": "^2.6.2",
-        "schema-utils": "^3.1.2",
+        "schema-utils": "^3.2.0",
         "tapable": "^2.1.1",
         "terser-webpack-plugin": "^5.3.7",
         "watchpack": "^2.4.0",
@@ -30308,9 +30308,9 @@
       },
       "dependencies": {
         "schema-utils": {
-          "version": "3.1.2",
-          "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.2.tgz",
-          "integrity": "sha512-pvjEHOgWc9OWA/f/DE3ohBWTD6EleVLf7iFUkoSwAxttdBhB9QUebQgxER2kWueOvRJXPHNnyrvvh9eZINB8Eg==",
+          "version": "3.3.0",
+          "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.3.0.tgz",
+          "integrity": "sha512-pN/yOAvcC+5rQ5nERGuwrjLlYvLTbCibnZ1I7B1LaiAz9BRBlE9GMgE/eqV30P7aJQUf7Ddimy/RsbYO/GrVGg==",
           "dev": true,
           "requires": {
             "@types/json-schema": "^7.0.8",
diff --git a/apps/block_scout_web/assets/package.json b/apps/block_scout_web/assets/package.json
index 1740cebbb446..a7c213287fa7 100644
--- a/apps/block_scout_web/assets/package.json
+++ b/apps/block_scout_web/assets/package.json
@@ -104,7 +104,7 @@
     "sass": "^1.63.3",
     "sass-loader": "^13.3.2",
     "style-loader": "^3.3.3",
-    "webpack": "^5.86.0",
+    "webpack": "^5.87.0",
     "webpack-cli": "^5.1.4"
   },
   "jest": {

From 92f07831c8eea8e7f25a3a31f0b0189845fc3a8a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 14 Jun 2023 19:02:30 +0000
Subject: [PATCH 101/909] Bump @amplitude/analytics-browser in
 /apps/block_scout_web/assets

Bumps [@amplitude/analytics-browser](https://github.com/amplitude/Amplitude-TypeScript) from 1.11.0 to 2.0.0.
- [Release notes](https://github.com/amplitude/Amplitude-TypeScript/releases)
- [Commits](https://github.com/amplitude/Amplitude-TypeScript/compare/@amplitude/analytics-browser@1.11.0...@amplitude/analytics-browser@2.0.0)

---
updated-dependencies:
- dependency-name: "@amplitude/analytics-browser"
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 apps/block_scout_web/assets/package-lock.json | 155 ++++++++----------
 apps/block_scout_web/assets/package.json      |   2 +-
 2 files changed, 66 insertions(+), 91 deletions(-)

diff --git a/apps/block_scout_web/assets/package-lock.json b/apps/block_scout_web/assets/package-lock.json
index df01353f1886..1d9835a40b32 100644
--- a/apps/block_scout_web/assets/package-lock.json
+++ b/apps/block_scout_web/assets/package-lock.json
@@ -7,7 +7,7 @@
       "name": "blockscout",
       "license": "GPL-3.0",
       "dependencies": {
-        "@amplitude/analytics-browser": "^1.11.0",
+        "@amplitude/analytics-browser": "^2.0.0",
         "@fortawesome/fontawesome-free": "^6.4.0",
         "@tarekraafat/autocomplete.js": "^10.2.7",
         "@walletconnect/web3-provider": "^1.8.0",
@@ -107,16 +107,15 @@
       "version": "0.0.1"
     },
     "node_modules/@amplitude/analytics-browser": {
-      "version": "1.11.0",
-      "resolved": "https://registry.npmjs.org/@amplitude/analytics-browser/-/analytics-browser-1.11.0.tgz",
-      "integrity": "sha512-UaZRJrsL0nvbyG4+ZsD8njbsbUiiNQg+guT+Ys+4YKKjYgAlImze++3OA2TVHdX1BxT6bLjmltQrqpHVryoIkg==",
-      "dependencies": {
-        "@amplitude/analytics-client-common": "^1.0.2",
-        "@amplitude/analytics-core": "^1.1.1",
-        "@amplitude/analytics-types": "^1.2.0",
-        "@amplitude/plugin-page-view-tracking-browser": "^1.0.3",
-        "@amplitude/plugin-web-attribution-browser": "^1.0.3",
-        "@amplitude/ua-parser-js": "^0.7.31",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/@amplitude/analytics-browser/-/analytics-browser-2.0.0.tgz",
+      "integrity": "sha512-SIOxjSdefm7RVuwzkuTW7uMge4AKLOqcE1oJYQFF25jkmAiFfXnbrqlGgBflgqLRvAKudrwXn+NFfKqBfXfozw==",
+      "dependencies": {
+        "@amplitude/analytics-client-common": "^2.0.0",
+        "@amplitude/analytics-core": "^2.0.0",
+        "@amplitude/analytics-types": "^2.0.0",
+        "@amplitude/plugin-page-view-tracking-browser": "^2.0.0",
+        "@amplitude/plugin-web-attribution-browser": "^2.0.0",
         "tslib": "^2.4.1"
       }
     },
@@ -126,13 +125,13 @@
       "integrity": "sha512-tGyy4dAjRIEwI7BzsB0lynWgOpfqjUdq91XXAlIWD2OwKBH7oCl/GZG/HT4BOHrTlPMOASlMQ7veyTqpmRcrNA=="
     },
     "node_modules/@amplitude/analytics-client-common": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/@amplitude/analytics-client-common/-/analytics-client-common-1.0.2.tgz",
-      "integrity": "sha512-kgIVXCWsUpaFhZZkcOvSckt2Rmg9m96hF1rxYj2ESccS3NeBPSUg1v1brNO2TOnA9A4pHApC2vruJvhnh2qN+w==",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/@amplitude/analytics-client-common/-/analytics-client-common-2.0.0.tgz",
+      "integrity": "sha512-4+fSeElUzOJK0TjWYem/jWnKCQVBuACUaz/maaXnzQBSeeqXDLO8PsqdAZYr4mQ/zbAxtt2hJpaewXQBviNoJA==",
       "dependencies": {
-        "@amplitude/analytics-connector": "^1.4.5",
-        "@amplitude/analytics-core": "^1.1.1",
-        "@amplitude/analytics-types": "^1.2.0",
+        "@amplitude/analytics-connector": "^1.4.8",
+        "@amplitude/analytics-core": "^2.0.0",
+        "@amplitude/analytics-types": "^2.0.0",
         "tslib": "^2.4.1"
       }
     },
@@ -147,11 +146,11 @@
       "integrity": "sha512-dFW7c7Wb6Ng7vbmzwbaXZSpqfBx37ukamJV9ErFYYS8vGZK/Hkbt3M7fZHBI4WFU6CCwakr2ZXPme11uGPYWkQ=="
     },
     "node_modules/@amplitude/analytics-core": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/@amplitude/analytics-core/-/analytics-core-1.1.1.tgz",
-      "integrity": "sha512-I/ymHQbC5wXuhArD+Nueuh8Xug46OiaiVjsOhAXw4xhydf12KTzGxwtEYOLHDPmsZXk7Pjg4SCxuw5UCkQWNPA==",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/@amplitude/analytics-core/-/analytics-core-2.0.0.tgz",
+      "integrity": "sha512-aEssg0ZUU+Xe0g17mz1q24S+Ec3Q8I+RHIhQcTB/Quko4iKAspTrtI+lSCYh1SvTgSSfNTR3TuRR/QYwGjmdCQ==",
       "dependencies": {
-        "@amplitude/analytics-types": "^1.2.0",
+        "@amplitude/analytics-types": "^2.0.0",
         "tslib": "^2.4.1"
       }
     },
@@ -161,17 +160,17 @@
       "integrity": "sha512-mSxlJJwl3BMEQCUNnxXBU9jP4JBktcEGhURcPR6VQVlnP0FdDEsIaz0C35dXNGLyRfrATNofF0F5p2KPxQgB+w=="
     },
     "node_modules/@amplitude/analytics-types": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/@amplitude/analytics-types/-/analytics-types-1.2.0.tgz",
-      "integrity": "sha512-g2y4eSO6smGa8zIu4qjdLmSC5CY70aJw2oLNGOhgcnER5TFgw1ywlGAWBFbtFZCpkomR+9UWRsgJiAG6Ub34LQ=="
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/@amplitude/analytics-types/-/analytics-types-2.0.0.tgz",
+      "integrity": "sha512-YHFAHDGCoS+exBqdlhivfdomzL88msj++krObsVsBkLqlzXR+3x3lXVKQeCEEWG5GX7doB9KZPf70i8y/eyERQ=="
     },
     "node_modules/@amplitude/plugin-page-view-tracking-browser": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/@amplitude/plugin-page-view-tracking-browser/-/plugin-page-view-tracking-browser-1.0.3.tgz",
-      "integrity": "sha512-J1T2Nak6YoExjiEOJe1ppo1Q7yXrsAwG1bnKMAvCIAdC4PpKiZilCYtpqB81E41vPYT0ogBSQycLLE/NM+U/SQ==",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/@amplitude/plugin-page-view-tracking-browser/-/plugin-page-view-tracking-browser-2.0.0.tgz",
+      "integrity": "sha512-G2bAiavBvNbFjUDViGJyagpyCwSzir/TXDA3LsJbOLOkqEeO95ZIZGU7mM7eqOAB7Nuir5WsayuA0+Oau8DzMQ==",
       "dependencies": {
-        "@amplitude/analytics-client-common": "^1.0.2",
-        "@amplitude/analytics-types": "^1.2.0",
+        "@amplitude/analytics-client-common": "^2.0.0",
+        "@amplitude/analytics-types": "^2.0.0",
         "tslib": "^2.4.1"
       }
     },
@@ -181,12 +180,12 @@
       "integrity": "sha512-mSxlJJwl3BMEQCUNnxXBU9jP4JBktcEGhURcPR6VQVlnP0FdDEsIaz0C35dXNGLyRfrATNofF0F5p2KPxQgB+w=="
     },
     "node_modules/@amplitude/plugin-web-attribution-browser": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/@amplitude/plugin-web-attribution-browser/-/plugin-web-attribution-browser-1.0.3.tgz",
-      "integrity": "sha512-ddfG7oeLD7QdNF/vVDCgw1BX3k25pK2ywRAWmP1ttaNXZDiCXvI8JMnNx3jmrxavPhRmJtF2Ed0uJmVJ12d8Nw==",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/@amplitude/plugin-web-attribution-browser/-/plugin-web-attribution-browser-2.0.0.tgz",
+      "integrity": "sha512-Y+zo2aTF2RSC+ATBdRff5zlgScJ5MWzqL0rzi696EP5zb4b7YIlEkG2V9XZlOGLQBYskF6NoBKMsoP0W2cROQw==",
       "dependencies": {
-        "@amplitude/analytics-client-common": "^1.0.2",
-        "@amplitude/analytics-types": "^1.2.0",
+        "@amplitude/analytics-client-common": "^2.0.0",
+        "@amplitude/analytics-types": "^2.0.0",
         "tslib": "^2.4.1"
       }
     },
@@ -195,24 +194,6 @@
       "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.5.3.tgz",
       "integrity": "sha512-mSxlJJwl3BMEQCUNnxXBU9jP4JBktcEGhURcPR6VQVlnP0FdDEsIaz0C35dXNGLyRfrATNofF0F5p2KPxQgB+w=="
     },
-    "node_modules/@amplitude/ua-parser-js": {
-      "version": "0.7.33",
-      "resolved": "https://registry.npmjs.org/@amplitude/ua-parser-js/-/ua-parser-js-0.7.33.tgz",
-      "integrity": "sha512-wKEtVR4vXuPT9cVEIJkYWnlF++Gx3BdLatPBM+SZ1ztVIvnhdGBZR/mn9x/PzyrMcRlZmyi6L56I2J3doVBnjA==",
-      "funding": [
-        {
-          "type": "opencollective",
-          "url": "https://opencollective.com/ua-parser-js"
-        },
-        {
-          "type": "paypal",
-          "url": "https://paypal.me/faisalman"
-        }
-      ],
-      "engines": {
-        "node": "*"
-      }
-    },
     "node_modules/@ampproject/remapping": {
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.2.0.tgz",
@@ -17490,16 +17471,15 @@
   },
   "dependencies": {
     "@amplitude/analytics-browser": {
-      "version": "1.11.0",
-      "resolved": "https://registry.npmjs.org/@amplitude/analytics-browser/-/analytics-browser-1.11.0.tgz",
-      "integrity": "sha512-UaZRJrsL0nvbyG4+ZsD8njbsbUiiNQg+guT+Ys+4YKKjYgAlImze++3OA2TVHdX1BxT6bLjmltQrqpHVryoIkg==",
-      "requires": {
-        "@amplitude/analytics-client-common": "^1.0.2",
-        "@amplitude/analytics-core": "^1.1.1",
-        "@amplitude/analytics-types": "^1.2.0",
-        "@amplitude/plugin-page-view-tracking-browser": "^1.0.3",
-        "@amplitude/plugin-web-attribution-browser": "^1.0.3",
-        "@amplitude/ua-parser-js": "^0.7.31",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/@amplitude/analytics-browser/-/analytics-browser-2.0.0.tgz",
+      "integrity": "sha512-SIOxjSdefm7RVuwzkuTW7uMge4AKLOqcE1oJYQFF25jkmAiFfXnbrqlGgBflgqLRvAKudrwXn+NFfKqBfXfozw==",
+      "requires": {
+        "@amplitude/analytics-client-common": "^2.0.0",
+        "@amplitude/analytics-core": "^2.0.0",
+        "@amplitude/analytics-types": "^2.0.0",
+        "@amplitude/plugin-page-view-tracking-browser": "^2.0.0",
+        "@amplitude/plugin-web-attribution-browser": "^2.0.0",
         "tslib": "^2.4.1"
       },
       "dependencies": {
@@ -17511,13 +17491,13 @@
       }
     },
     "@amplitude/analytics-client-common": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/@amplitude/analytics-client-common/-/analytics-client-common-1.0.2.tgz",
-      "integrity": "sha512-kgIVXCWsUpaFhZZkcOvSckt2Rmg9m96hF1rxYj2ESccS3NeBPSUg1v1brNO2TOnA9A4pHApC2vruJvhnh2qN+w==",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/@amplitude/analytics-client-common/-/analytics-client-common-2.0.0.tgz",
+      "integrity": "sha512-4+fSeElUzOJK0TjWYem/jWnKCQVBuACUaz/maaXnzQBSeeqXDLO8PsqdAZYr4mQ/zbAxtt2hJpaewXQBviNoJA==",
       "requires": {
-        "@amplitude/analytics-connector": "^1.4.5",
-        "@amplitude/analytics-core": "^1.1.1",
-        "@amplitude/analytics-types": "^1.2.0",
+        "@amplitude/analytics-connector": "^1.4.8",
+        "@amplitude/analytics-core": "^2.0.0",
+        "@amplitude/analytics-types": "^2.0.0",
         "tslib": "^2.4.1"
       },
       "dependencies": {
@@ -17534,11 +17514,11 @@
       "integrity": "sha512-dFW7c7Wb6Ng7vbmzwbaXZSpqfBx37ukamJV9ErFYYS8vGZK/Hkbt3M7fZHBI4WFU6CCwakr2ZXPme11uGPYWkQ=="
     },
     "@amplitude/analytics-core": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/@amplitude/analytics-core/-/analytics-core-1.1.1.tgz",
-      "integrity": "sha512-I/ymHQbC5wXuhArD+Nueuh8Xug46OiaiVjsOhAXw4xhydf12KTzGxwtEYOLHDPmsZXk7Pjg4SCxuw5UCkQWNPA==",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/@amplitude/analytics-core/-/analytics-core-2.0.0.tgz",
+      "integrity": "sha512-aEssg0ZUU+Xe0g17mz1q24S+Ec3Q8I+RHIhQcTB/Quko4iKAspTrtI+lSCYh1SvTgSSfNTR3TuRR/QYwGjmdCQ==",
       "requires": {
-        "@amplitude/analytics-types": "^1.2.0",
+        "@amplitude/analytics-types": "^2.0.0",
         "tslib": "^2.4.1"
       },
       "dependencies": {
@@ -17550,17 +17530,17 @@
       }
     },
     "@amplitude/analytics-types": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/@amplitude/analytics-types/-/analytics-types-1.2.0.tgz",
-      "integrity": "sha512-g2y4eSO6smGa8zIu4qjdLmSC5CY70aJw2oLNGOhgcnER5TFgw1ywlGAWBFbtFZCpkomR+9UWRsgJiAG6Ub34LQ=="
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/@amplitude/analytics-types/-/analytics-types-2.0.0.tgz",
+      "integrity": "sha512-YHFAHDGCoS+exBqdlhivfdomzL88msj++krObsVsBkLqlzXR+3x3lXVKQeCEEWG5GX7doB9KZPf70i8y/eyERQ=="
     },
     "@amplitude/plugin-page-view-tracking-browser": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/@amplitude/plugin-page-view-tracking-browser/-/plugin-page-view-tracking-browser-1.0.3.tgz",
-      "integrity": "sha512-J1T2Nak6YoExjiEOJe1ppo1Q7yXrsAwG1bnKMAvCIAdC4PpKiZilCYtpqB81E41vPYT0ogBSQycLLE/NM+U/SQ==",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/@amplitude/plugin-page-view-tracking-browser/-/plugin-page-view-tracking-browser-2.0.0.tgz",
+      "integrity": "sha512-G2bAiavBvNbFjUDViGJyagpyCwSzir/TXDA3LsJbOLOkqEeO95ZIZGU7mM7eqOAB7Nuir5WsayuA0+Oau8DzMQ==",
       "requires": {
-        "@amplitude/analytics-client-common": "^1.0.2",
-        "@amplitude/analytics-types": "^1.2.0",
+        "@amplitude/analytics-client-common": "^2.0.0",
+        "@amplitude/analytics-types": "^2.0.0",
         "tslib": "^2.4.1"
       },
       "dependencies": {
@@ -17572,12 +17552,12 @@
       }
     },
     "@amplitude/plugin-web-attribution-browser": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/@amplitude/plugin-web-attribution-browser/-/plugin-web-attribution-browser-1.0.3.tgz",
-      "integrity": "sha512-ddfG7oeLD7QdNF/vVDCgw1BX3k25pK2ywRAWmP1ttaNXZDiCXvI8JMnNx3jmrxavPhRmJtF2Ed0uJmVJ12d8Nw==",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/@amplitude/plugin-web-attribution-browser/-/plugin-web-attribution-browser-2.0.0.tgz",
+      "integrity": "sha512-Y+zo2aTF2RSC+ATBdRff5zlgScJ5MWzqL0rzi696EP5zb4b7YIlEkG2V9XZlOGLQBYskF6NoBKMsoP0W2cROQw==",
       "requires": {
-        "@amplitude/analytics-client-common": "^1.0.2",
-        "@amplitude/analytics-types": "^1.2.0",
+        "@amplitude/analytics-client-common": "^2.0.0",
+        "@amplitude/analytics-types": "^2.0.0",
         "tslib": "^2.4.1"
       },
       "dependencies": {
@@ -17588,11 +17568,6 @@
         }
       }
     },
-    "@amplitude/ua-parser-js": {
-      "version": "0.7.33",
-      "resolved": "https://registry.npmjs.org/@amplitude/ua-parser-js/-/ua-parser-js-0.7.33.tgz",
-      "integrity": "sha512-wKEtVR4vXuPT9cVEIJkYWnlF++Gx3BdLatPBM+SZ1ztVIvnhdGBZR/mn9x/PzyrMcRlZmyi6L56I2J3doVBnjA=="
-    },
     "@ampproject/remapping": {
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.2.0.tgz",
diff --git a/apps/block_scout_web/assets/package.json b/apps/block_scout_web/assets/package.json
index 1740cebbb446..ada85a777940 100644
--- a/apps/block_scout_web/assets/package.json
+++ b/apps/block_scout_web/assets/package.json
@@ -20,7 +20,7 @@
   },
   "dependencies": {
     "@fortawesome/fontawesome-free": "^6.4.0",
-    "@amplitude/analytics-browser": "^1.11.0",
+    "@amplitude/analytics-browser": "^2.0.0",
     "@tarekraafat/autocomplete.js": "^10.2.7",
     "@walletconnect/web3-provider": "^1.8.0",
     "assert": "^2.0.0",

From daa23eee7383ebd9f5d16dde66cd0694c69835c3 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 14 Jun 2023 19:03:31 +0000
Subject: [PATCH 102/909] Bump phoenix_pubsub from 2.1.2 to 2.1.3

Bumps [phoenix_pubsub](https://github.com/phoenixframework/phoenix_pubsub) from 2.1.2 to 2.1.3.
- [Changelog](https://github.com/phoenixframework/phoenix_pubsub/blob/main/CHANGELOG.md)
- [Commits](https://github.com/phoenixframework/phoenix_pubsub/compare/v2.1.2...v2.1.3)

---
updated-dependencies:
- dependency-name: phoenix_pubsub
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 mix.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mix.lock b/mix.lock
index ebe31ddcb302..7330c4015401 100644
--- a/mix.lock
+++ b/mix.lock
@@ -102,7 +102,7 @@
   "phoenix_ecto": {:hex, :phoenix_ecto, "4.4.2", "b21bd01fdeffcfe2fab49e4942aa938b6d3e89e93a480d4aee58085560a0bc0d", [:mix], [{:ecto, "~> 3.5", [hex: :ecto, repo: "hexpm", optional: false]}, {:phoenix_html, "~> 2.14.2 or ~> 3.0", [hex: :phoenix_html, repo: "hexpm", optional: true]}, {:plug, "~> 1.9", [hex: :plug, repo: "hexpm", optional: false]}], "hexpm", "70242edd4601d50b69273b057ecf7b684644c19ee750989fd555625ae4ce8f5d"},
   "phoenix_html": {:hex, :phoenix_html, "3.0.4", "232d41884fe6a9c42d09f48397c175cd6f0d443aaa34c7424da47604201df2e1", [:mix], [{:plug, "~> 1.5", [hex: :plug, repo: "hexpm", optional: true]}], "hexpm", "ce17fd3cf815b2ed874114073e743507704b1f5288bb03c304a77458485efc8b"},
   "phoenix_live_reload": {:hex, :phoenix_live_reload, "1.3.3", "3a53772a6118d5679bf50fc1670505a290e32a1d195df9e069d8c53ab040c054", [:mix], [{:file_system, "~> 0.2.1 or ~> 0.3", [hex: :file_system, repo: "hexpm", optional: false]}, {:phoenix, "~> 1.4", [hex: :phoenix, repo: "hexpm", optional: false]}], "hexpm", "766796676e5f558dbae5d1bdb066849673e956005e3730dfd5affd7a6da4abac"},
-  "phoenix_pubsub": {:hex, :phoenix_pubsub, "2.1.2", "a4950b63ace57720b0fc1c6da083c53346b36f99021de89595cc4f026288ff51", [:mix], [], "hexpm", "45741676a94c71f9afdfed9d22d49b6856c026ff504db04e3dc03a1d86f8201c"},
+  "phoenix_pubsub": {:hex, :phoenix_pubsub, "2.1.3", "3168d78ba41835aecad272d5e8cd51aa87a7ac9eb836eabc42f6e57538e3731d", [:mix], [], "hexpm", "bba06bc1dcfd8cb086759f0edc94a8ba2bc8896d5331a1e2c2902bf8e36ee502"},
   "plug": {:hex, :plug, "1.14.2", "cff7d4ec45b4ae176a227acd94a7ab536d9b37b942c8e8fa6dfc0fff98ff4d80", [:mix], [{:mime, "~> 1.0 or ~> 2.0", [hex: :mime, repo: "hexpm", optional: false]}, {:plug_crypto, "~> 1.1.1 or ~> 1.2", [hex: :plug_crypto, repo: "hexpm", optional: false]}, {:telemetry, "~> 0.4.3 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "842fc50187e13cf4ac3b253d47d9474ed6c296a8732752835ce4a86acdf68d13"},
   "plug_cowboy": {:hex, :plug_cowboy, "2.6.1", "9a3bbfceeb65eff5f39dab529e5cd79137ac36e913c02067dba3963a26efe9b2", [:mix], [{:cowboy, "~> 2.7", [hex: :cowboy, repo: "hexpm", optional: false]}, {:cowboy_telemetry, "~> 0.3", [hex: :cowboy_telemetry, repo: "hexpm", optional: false]}, {:plug, "~> 1.14", [hex: :plug, repo: "hexpm", optional: false]}], "hexpm", "de36e1a21f451a18b790f37765db198075c25875c64834bcc82d90b309eb6613"},
   "plug_crypto": {:hex, :plug_crypto, "1.2.5", "918772575e48e81e455818229bf719d4ab4181fcbf7f85b68a35620f78d89ced", [:mix], [], "hexpm", "26549a1d6345e2172eb1c233866756ae44a9609bd33ee6f99147ab3fd87fd842"},

From b0031413de90b79e842742300c0f055c2051f690 Mon Sep 17 00:00:00 2001
From: Maxim Filonov <53992153+sl1depengwyn@users.noreply.github.com>
Date: Thu, 15 Jun 2023 11:00:42 +0300
Subject: [PATCH 103/909] Fix contract args displaying bug

---
 CHANGELOG.md                                       |  1 +
 .../templates/address_contract/index.html.eex      |  4 ++--
 .../block_scout_web/views/address_contract_view.ex | 14 +++++++++-----
 apps/block_scout_web/priv/gettext/default.pot      |  4 ++--
 .../priv/gettext/en/LC_MESSAGES/default.po         |  4 ++--
 5 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d2706781162a..d4f82eb2b893 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -14,6 +14,7 @@
 
 ### Fixes
 
+- [#7709](https://github.com/blockscout/blockscout/pull/7709) - Contract args displaying bug
 - [#7654](https://github.com/blockscout/blockscout/pull/7654) - Optimize exchange rates requests rate
 - [#7636](https://github.com/blockscout/blockscout/pull/7636) - Remove receive from read methods
 - [#7635](https://github.com/blockscout/blockscout/pull/7635) - Fix single 1155 transfer displaying
diff --git a/apps/block_scout_web/lib/block_scout_web/templates/address_contract/index.html.eex b/apps/block_scout_web/lib/block_scout_web/templates/address_contract/index.html.eex
index 6bd149313fc1..c8daa4c5af23 100644
--- a/apps/block_scout_web/lib/block_scout_web/templates/address_contract/index.html.eex
+++ b/apps/block_scout_web/lib/block_scout_web/templates/address_contract/index.html.eex
@@ -97,7 +97,7 @@
               <h3><%= gettext "Constructor Arguments" %></h3>
             </div>
             <div class="tile tile-muted mb-4">
-              <pre class="pre-wrap pre-scrollable"><code class="nohighlight"><%= raw(format_constructor_arguments(target_contract, @conn)) %></code>
+              <pre class="pre-wrap pre-scrollable"><code class="nohighlight"><%= format_constructor_arguments(target_contract, @conn) %></code>
               </pre>
             </div>
           </section>
@@ -249,7 +249,7 @@
               <h3><%= gettext "External libraries" %></h3>
             </div>
             <div class="tile tile-muted mb-4">
-              <pre class="pre-wrap pre-scrollable"><code class="nohighlight"><%= raw(format_external_libraries(target_contract.external_libraries, @conn)) %></code>
+              <pre class="pre-wrap pre-scrollable"><code class="nohighlight"><%= format_external_libraries(target_contract.external_libraries, @conn) %></code>
               </pre>
             </div>
           </section>
diff --git a/apps/block_scout_web/lib/block_scout_web/views/address_contract_view.ex b/apps/block_scout_web/lib/block_scout_web/views/address_contract_view.ex
index 9780d2a023a0..44991dd85f01 100644
--- a/apps/block_scout_web/lib/block_scout_web/views/address_contract_view.ex
+++ b/apps/block_scout_web/lib/block_scout_web/views/address_contract_view.ex
@@ -4,7 +4,6 @@ defmodule BlockScoutWeb.AddressContractView do
   alias ABI.{FunctionSelector, TypeDecoder}
   alias Explorer.Chain
   alias Explorer.Chain.{Address, Data, InternalTransaction, Transaction}
-  alias Explorer.SmartContract.Helper
 
   def render("scripts.html", %{conn: conn}) do
     render_scripts(conn, "address_contract/code_highlighting.js")
@@ -34,9 +33,12 @@ defmodule BlockScoutWeb.AddressContractView do
       |> decode_data(input_types)
       |> Enum.zip(constructor_abi["inputs"])
       |> Enum.reduce({0, "#{contract.constructor_arguments}\n\n"}, fn {val, %{"type" => type}}, {count, acc} ->
-        formatted_val = Helper.sanitize_input(val_to_string(val, type, conn))
+        formatted_val = val_to_string(val, type, conn)
 
-        {count + 1, "#{acc}Arg [#{count}] (<b>#{Helper.sanitize_input(type)}</b>) : #{formatted_val}\n"}
+        {count + 1,
+         ~E"""
+         <%= acc %>Arg [<%= count %>] (<b><%= type %></b>) : <%= formatted_val %>
+         """}
       end)
 
     result
@@ -82,7 +84,7 @@ defmodule BlockScoutWeb.AddressContractView do
 
   defp get_formatted_address_data(address, address_hash, conn) do
     if address != nil do
-      "<a href=" <> address_path(conn, :show, address) <> ">" <> address_hash <> "</a>"
+      ~E"<a href=<%= address_path(conn, :show, address) %>><%= address_hash %></a>"
     else
       address_hash
     end
@@ -102,7 +104,9 @@ defmodule BlockScoutWeb.AddressContractView do
     Enum.reduce(libraries, "", fn %{name: name, address_hash: address_hash}, acc ->
       address = get_address(address_hash)
 
-      "#{acc}<span class=\"hljs-title\">#{Helper.sanitize_input(name)}</span> : #{get_formatted_address_data(address, address_hash, conn)}  \n"
+      ~E"""
+      <%= acc %><span class="hljs-title"><%= name %></span> : <%= get_formatted_address_data(address, address_hash, conn) %>
+      """
     end)
   end
 
diff --git a/apps/block_scout_web/priv/gettext/default.pot b/apps/block_scout_web/priv/gettext/default.pot
index 4bf050f955c4..086a15b65661 100644
--- a/apps/block_scout_web/priv/gettext/default.pot
+++ b/apps/block_scout_web/priv/gettext/default.pot
@@ -3585,7 +3585,7 @@ msgstr ""
 msgid "fallback"
 msgstr ""
 
-#: lib/block_scout_web/views/address_contract_view.ex:25
+#: lib/block_scout_web/views/address_contract_view.ex:24
 #, elixir-autogen, elixir-format
 msgid "false"
 msgstr ""
@@ -3641,7 +3641,7 @@ msgstr ""
 msgid "string"
 msgstr ""
 
-#: lib/block_scout_web/views/address_contract_view.ex:24
+#: lib/block_scout_web/views/address_contract_view.ex:23
 #, elixir-autogen, elixir-format
 msgid "true"
 msgstr ""
diff --git a/apps/block_scout_web/priv/gettext/en/LC_MESSAGES/default.po b/apps/block_scout_web/priv/gettext/en/LC_MESSAGES/default.po
index bb78e00cfa3c..da37d219c319 100644
--- a/apps/block_scout_web/priv/gettext/en/LC_MESSAGES/default.po
+++ b/apps/block_scout_web/priv/gettext/en/LC_MESSAGES/default.po
@@ -3585,7 +3585,7 @@ msgstr ""
 msgid "fallback"
 msgstr ""
 
-#: lib/block_scout_web/views/address_contract_view.ex:25
+#: lib/block_scout_web/views/address_contract_view.ex:24
 #, elixir-autogen, elixir-format
 msgid "false"
 msgstr ""
@@ -3641,7 +3641,7 @@ msgstr ""
 msgid "string"
 msgstr ""
 
-#: lib/block_scout_web/views/address_contract_view.ex:24
+#: lib/block_scout_web/views/address_contract_view.ex:23
 #, elixir-autogen, elixir-format
 msgid "true"
 msgstr ""

From fd78aaf3ea4a55610c2535a10c5dbf2a961f2b3d Mon Sep 17 00:00:00 2001
From: Qwerty5Uiop <alex000010@bk.ru>
Date: Tue, 13 Jun 2023 14:55:53 +0400
Subject: [PATCH 104/909] Limit fetchers init tasks

---
 CHANGELOG.md                                  |  1 +
 apps/explorer/lib/explorer/chain.ex           | 83 +++++++++++++------
 apps/indexer/lib/indexer/buffered_task.ex     | 21 +----
 .../lib/indexer/fetcher/block_reward.ex       | 10 ++-
 .../lib/indexer/fetcher/coin_balance.ex       | 14 ++--
 .../lib/indexer/fetcher/contract_code.ex      |  3 +-
 .../indexer/fetcher/internal_transaction.ex   | 11 ++-
 .../indexer/fetcher/replaced_transaction.ex   |  3 +-
 apps/indexer/lib/indexer/fetcher/token.ex     | 10 ++-
 .../lib/indexer/fetcher/token_balance.ex      | 14 ++--
 .../indexer/fetcher/token_instance/retry.ex   | 11 ++-
 .../lib/indexer/fetcher/token_updater.ex      |  2 +-
 .../lib/indexer/fetcher/uncle_block.ex        | 14 ++--
 .../temporary/blocks_transactions_mismatch.ex |  7 +-
 .../indexer/temporary/uncles_without_index.ex |  4 +-
 .../test/indexer/buffered_task_test.exs       |  3 +-
 .../fetcher/block_reward_supervisor_case.ex   |  3 +-
 config/runtime.exs                            |  3 +-
 docker-compose/envs/common-blockscout.env     |  1 +
 docker/Makefile                               |  3 +
 20 files changed, 142 insertions(+), 79 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d2706781162a..c055c0d0c04b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,6 +11,7 @@
 - [#7532](https://github.com/blockscout/blockscout/pull/7532) - Handle empty id in json rpc responses
 - [#7544](https://github.com/blockscout/blockscout/pull/7544) - Add ERC-1155 signatures to uncataloged_token_transfer_block_numbers
 - [#7363](https://github.com/blockscout/blockscout/pull/7363) - CSV export filters
+- [#7697](https://github.com/blockscout/blockscout/pull/7697) - Limit fetchers init tasks
 
 ### Fixes
 
diff --git a/apps/explorer/lib/explorer/chain.ex b/apps/explorer/lib/explorer/chain.ex
index 281ea0390d9e..b7a4399790f8 100644
--- a/apps/explorer/lib/explorer/chain.ex
+++ b/apps/explorer/lib/explorer/chain.ex
@@ -2616,8 +2616,9 @@ defmodule Explorer.Chain do
   @doc """
   Calls `reducer` on a stream of `t:Explorer.Chain.Block.t/0` without `t:Explorer.Chain.Block.Reward.t/0`.
   """
-  def stream_blocks_without_rewards(initial, reducer) when is_function(reducer, 2) do
+  def stream_blocks_without_rewards(initial, reducer, limited? \\ false) when is_function(reducer, 2) do
     Block.blocks_without_reward_query()
+    |> add_fetcher_limit(limited?)
     |> Repo.stream_reduce(initial, reducer)
   end
 
@@ -2827,10 +2828,11 @@ defmodule Explorer.Chain do
   @spec stream_unfetched_balances(
           initial :: accumulator,
           reducer ::
-            (entry :: %{address_hash: Hash.Address.t(), block_number: Block.block_number()}, accumulator -> accumulator)
+            (entry :: %{address_hash: Hash.Address.t(), block_number: Block.block_number()}, accumulator -> accumulator),
+          limited? :: boolean()
         ) :: {:ok, accumulator}
         when accumulator: term()
-  def stream_unfetched_balances(initial, reducer) when is_function(reducer, 2) do
+  def stream_unfetched_balances(initial, reducer, limited? \\ false) when is_function(reducer, 2) do
     query =
       from(
         balance in CoinBalance,
@@ -2838,7 +2840,9 @@ defmodule Explorer.Chain do
         select: %{address_hash: balance.address_hash, block_number: balance.block_number}
       )
 
-    Repo.stream_reduce(query, initial, reducer)
+    query
+    |> add_fetcher_limit(limited?)
+    |> Repo.stream_reduce(initial, reducer)
   end
 
   @doc """
@@ -2846,11 +2850,13 @@ defmodule Explorer.Chain do
   """
   @spec stream_unfetched_token_balances(
           initial :: accumulator,
-          reducer :: (entry :: TokenBalance.t(), accumulator -> accumulator)
+          reducer :: (entry :: TokenBalance.t(), accumulator -> accumulator),
+          limited? :: boolean()
         ) :: {:ok, accumulator}
         when accumulator: term()
-  def stream_unfetched_token_balances(initial, reducer) when is_function(reducer, 2) do
+  def stream_unfetched_token_balances(initial, reducer, limited? \\ false) when is_function(reducer, 2) do
     TokenBalance.unfetched_token_balances()
+    |> add_fetcher_limit(limited?)
     |> Repo.stream_reduce(initial, reducer)
   end
 
@@ -2872,10 +2878,12 @@ defmodule Explorer.Chain do
   """
   @spec stream_blocks_with_unfetched_internal_transactions(
           initial :: accumulator,
-          reducer :: (entry :: term(), accumulator -> accumulator)
+          reducer :: (entry :: term(), accumulator -> accumulator),
+          limited? :: boolean()
         ) :: {:ok, accumulator}
         when accumulator: term()
-  def stream_blocks_with_unfetched_internal_transactions(initial, reducer) when is_function(reducer, 2) do
+  def stream_blocks_with_unfetched_internal_transactions(initial, reducer, limited? \\ false)
+      when is_function(reducer, 2) do
     query =
       from(
         po in PendingBlockOperation,
@@ -2883,7 +2891,9 @@ defmodule Explorer.Chain do
         select: po.block_number
       )
 
-    Repo.stream_reduce(query, initial, reducer)
+    query
+    |> add_fetcher_limit(limited?)
+    |> Repo.stream_reduce(initial, reducer)
   end
 
   def remove_nonconsensus_blocks_from_pending_ops(block_hashes) do
@@ -2930,10 +2940,11 @@ defmodule Explorer.Chain do
             | :value
           ],
           initial :: accumulator,
-          reducer :: (entry :: term(), accumulator -> accumulator)
+          reducer :: (entry :: term(), accumulator -> accumulator),
+          limited? :: boolean()
         ) :: {:ok, accumulator}
         when accumulator: term()
-  def stream_transactions_with_unfetched_created_contract_codes(fields, initial, reducer)
+  def stream_transactions_with_unfetched_created_contract_codes(fields, initial, reducer, limited? \\ false)
       when is_function(reducer, 2) do
     query =
       from(t in Transaction,
@@ -2943,7 +2954,9 @@ defmodule Explorer.Chain do
         select: ^fields
       )
 
-    Repo.stream_reduce(query, initial, reducer)
+    query
+    |> add_fetcher_limit(limited?)
+    |> Repo.stream_reduce(initial, reducer)
   end
 
   @spec stream_mined_transactions(
@@ -2995,14 +3008,16 @@ defmodule Explorer.Chain do
             | :value
           ],
           initial :: accumulator,
-          reducer :: (entry :: term(), accumulator -> accumulator)
+          reducer :: (entry :: term(), accumulator -> accumulator),
+          limited? :: boolean()
         ) :: {:ok, accumulator}
         when accumulator: term()
-  def stream_pending_transactions(fields, initial, reducer) when is_function(reducer, 2) do
+  def stream_pending_transactions(fields, initial, reducer, limited? \\ false) when is_function(reducer, 2) do
     query =
       Transaction
       |> pending_transactions_query()
       |> select(^fields)
+      |> add_fetcher_limit(limited?)
 
     Repo.stream_reduce(query, initial, reducer)
   end
@@ -3017,17 +3032,20 @@ defmodule Explorer.Chain do
   """
   @spec stream_unfetched_uncles(
           initial :: accumulator,
-          reducer :: (entry :: term(), accumulator -> accumulator)
+          reducer :: (entry :: term(), accumulator -> accumulator),
+          limited? :: boolean()
         ) :: {:ok, accumulator}
         when accumulator: term()
-  def stream_unfetched_uncles(initial, reducer) when is_function(reducer, 2) do
+  def stream_unfetched_uncles(initial, reducer, limited? \\ false) when is_function(reducer, 2) do
     query =
       from(bsdr in Block.SecondDegreeRelation,
         where: is_nil(bsdr.uncle_fetched_at) and not is_nil(bsdr.index),
         select: [:nephew_hash, :index]
       )
 
-    Repo.stream_reduce(query, initial, reducer)
+    query
+    |> add_fetcher_limit(limited?)
+    |> Repo.stream_reduce(initial, reducer)
   end
 
   @doc """
@@ -5017,10 +5035,12 @@ defmodule Explorer.Chain do
   """
   @spec stream_uncataloged_token_contract_address_hashes(
           initial :: accumulator,
-          reducer :: (entry :: Hash.Address.t(), accumulator -> accumulator)
+          reducer :: (entry :: Hash.Address.t(), accumulator -> accumulator),
+          limited? :: boolean()
         ) :: {:ok, accumulator}
         when accumulator: term()
-  def stream_uncataloged_token_contract_address_hashes(initial, reducer) when is_function(reducer, 2) do
+  def stream_uncataloged_token_contract_address_hashes(initial, reducer, limited? \\ false)
+      when is_function(reducer, 2) do
     query =
       from(
         token in Token,
@@ -5028,7 +5048,9 @@ defmodule Explorer.Chain do
         select: token.contract_address_hash
       )
 
-    Repo.stream_reduce(query, initial, reducer)
+    query
+    |> add_fetcher_limit(limited?)
+    |> Repo.stream_reduce(initial, reducer)
   end
 
   @spec stream_unfetched_token_instances(
@@ -5080,10 +5102,11 @@ defmodule Explorer.Chain do
 
   @spec stream_token_instances_with_error(
           initial :: accumulator,
-          reducer :: (entry :: map(), accumulator -> accumulator)
+          reducer :: (entry :: map(), accumulator -> accumulator),
+          limited? :: boolean()
         ) :: {:ok, accumulator}
         when accumulator: term()
-  def stream_token_instances_with_error(initial, reducer) when is_function(reducer, 2) do
+  def stream_token_instances_with_error(initial, reducer, limited? \\ false) when is_function(reducer, 2) do
     Instance
     |> where([instance], not is_nil(instance.error))
     |> select([instance], %{
@@ -5091,6 +5114,7 @@ defmodule Explorer.Chain do
       token_id: instance.token_id,
       updated_at: instance.updated_at
     })
+    |> add_fetcher_limit(limited?)
     |> Repo.stream_reduce(initial, reducer)
   end
 
@@ -5099,13 +5123,16 @@ defmodule Explorer.Chain do
   """
   @spec stream_cataloged_token_contract_address_hashes(
           initial :: accumulator,
-          reducer :: (entry :: Hash.Address.t(), accumulator -> accumulator)
+          reducer :: (entry :: Hash.Address.t(), accumulator -> accumulator),
+          some_time_ago_updated :: integer(),
+          limited? :: boolean()
         ) :: {:ok, accumulator}
         when accumulator: term()
-  def stream_cataloged_token_contract_address_hashes(initial, reducer, some_time_ago_updated \\ 2880)
+  def stream_cataloged_token_contract_address_hashes(initial, reducer, some_time_ago_updated \\ 2880, limited? \\ false)
       when is_function(reducer, 2) do
     some_time_ago_updated
     |> Token.cataloged_tokens()
+    |> add_fetcher_limit(limited?)
     |> order_by(asc: :updated_at)
     |> Repo.stream_reduce(initial, reducer)
   end
@@ -6913,4 +6940,12 @@ defmodule Explorer.Chain do
   def count_withdrawals_from_cache(options \\ []) do
     "withdrawals_count" |> get_last_fetched_counter(options) |> Decimal.add(1)
   end
+
+  def add_fetcher_limit(query, false), do: query
+
+  def add_fetcher_limit(query, true) do
+    fetcher_limit = Application.get_env(:indexer, :fetcher_init_limit)
+
+    limit(query, ^fetcher_limit)
+  end
 end
diff --git a/apps/indexer/lib/indexer/buffered_task.ex b/apps/indexer/lib/indexer/buffered_task.ex
index 7f2565ffe20a..2ef7059f20b2 100644
--- a/apps/indexer/lib/indexer/buffered_task.ex
+++ b/apps/indexer/lib/indexer/buffered_task.ex
@@ -71,7 +71,7 @@ defmodule Indexer.BufferedTask do
             flush_interval: nil,
             max_batch_size: nil,
             max_concurrency: nil,
-            poll: false,
+            poll: true,
             metadata: [],
             current_buffer: [],
             bound_queue: %BoundQueue{},
@@ -231,7 +231,7 @@ defmodule Indexer.BufferedTask do
     state = %BufferedTask{
       callback_module: callback_module,
       callback_module_state: Keyword.fetch!(opts, :state),
-      poll: Keyword.get(opts, :poll, false),
+      poll: Keyword.get(opts, :poll, true),
       task_supervisor: Keyword.fetch!(opts, :task_supervisor),
       flush_interval: Keyword.fetch!(opts, :flush_interval),
       max_batch_size: Keyword.fetch!(opts, :max_batch_size),
@@ -442,21 +442,8 @@ defmodule Indexer.BufferedTask do
   end
 
   # get more work from `init/2`
-  defp schedule_next(%BufferedTask{poll: true, bound_queue: %BoundQueue{size: 0}} = state) do
-    do_initial_stream(state)
-  end
-
-  # was shrunk and was out of work, get more work from `init/2`
-  defp schedule_next(%BufferedTask{bound_queue: %BoundQueue{size: 0, maximum_size: maximum_size}} = state)
-       when maximum_size != nil do
-    Logger.info(fn ->
-      [
-        "BufferedTask ",
-        process(self()),
-        " ran out of work, but work queue was shrunk to save memory, so restoring lost work from `c:init/2`."
-      ]
-    end)
-
+  defp schedule_next(%BufferedTask{poll: true, bound_queue: %BoundQueue{size: 0}, task_ref_to_batch: tasks} = state)
+       when tasks == %{} do
     do_initial_stream(state)
   end
 
diff --git a/apps/indexer/lib/indexer/fetcher/block_reward.ex b/apps/indexer/lib/indexer/fetcher/block_reward.ex
index a4be4c832b3a..5716f80c7c6b 100644
--- a/apps/indexer/lib/indexer/fetcher/block_reward.ex
+++ b/apps/indexer/lib/indexer/fetcher/block_reward.ex
@@ -62,9 +62,13 @@ defmodule Indexer.Fetcher.BlockReward do
   @impl BufferedTask
   def init(initial, reducer, _) do
     {:ok, final} =
-      Chain.stream_blocks_without_rewards(initial, fn %{number: number}, acc ->
-        reducer.(number, acc)
-      end)
+      Chain.stream_blocks_without_rewards(
+        initial,
+        fn %{number: number}, acc ->
+          reducer.(number, acc)
+        end,
+        true
+      )
 
     final
   end
diff --git a/apps/indexer/lib/indexer/fetcher/coin_balance.ex b/apps/indexer/lib/indexer/fetcher/coin_balance.ex
index de0e03e1f6d7..56e1ff29eb1a 100644
--- a/apps/indexer/lib/indexer/fetcher/coin_balance.ex
+++ b/apps/indexer/lib/indexer/fetcher/coin_balance.ex
@@ -61,11 +61,15 @@ defmodule Indexer.Fetcher.CoinBalance do
   @impl BufferedTask
   def init(initial, reducer, _) do
     {:ok, final} =
-      Chain.stream_unfetched_balances(initial, fn address_fields, acc ->
-        address_fields
-        |> entry()
-        |> reducer.(acc)
-      end)
+      Chain.stream_unfetched_balances(
+        initial,
+        fn address_fields, acc ->
+          address_fields
+          |> entry()
+          |> reducer.(acc)
+        end,
+        true
+      )
 
     final
   end
diff --git a/apps/indexer/lib/indexer/fetcher/contract_code.ex b/apps/indexer/lib/indexer/fetcher/contract_code.ex
index 908865287bf6..c9f8f0f7b6e8 100644
--- a/apps/indexer/lib/indexer/fetcher/contract_code.ex
+++ b/apps/indexer/lib/indexer/fetcher/contract_code.ex
@@ -64,7 +64,8 @@ defmodule Indexer.Fetcher.ContractCode do
           transaction_fields
           |> entry()
           |> reducer.(acc)
-        end
+        end,
+        true
       )
 
     final
diff --git a/apps/indexer/lib/indexer/fetcher/internal_transaction.ex b/apps/indexer/lib/indexer/fetcher/internal_transaction.ex
index 3c06ae6a92aa..6b2083d420b2 100644
--- a/apps/indexer/lib/indexer/fetcher/internal_transaction.ex
+++ b/apps/indexer/lib/indexer/fetcher/internal_transaction.ex
@@ -71,9 +71,13 @@ defmodule Indexer.Fetcher.InternalTransaction do
   @impl BufferedTask
   def init(initial, reducer, _json_rpc_named_arguments) do
     {:ok, final} =
-      Chain.stream_blocks_with_unfetched_internal_transactions(initial, fn block_number, acc ->
-        reducer.(block_number, acc)
-      end)
+      Chain.stream_blocks_with_unfetched_internal_transactions(
+        initial,
+        fn block_number, acc ->
+          reducer.(block_number, acc)
+        end,
+        true
+      )
 
     final
   end
@@ -349,7 +353,6 @@ defmodule Indexer.Fetcher.InternalTransaction do
       flush_interval: :timer.seconds(3),
       max_concurrency: Application.get_env(:indexer, __MODULE__)[:concurrency] || @default_max_concurrency,
       max_batch_size: Application.get_env(:indexer, __MODULE__)[:batch_size] || @default_max_batch_size,
-      poll: true,
       task_supervisor: Indexer.Fetcher.InternalTransaction.TaskSupervisor,
       metadata: [fetcher: :internal_transaction]
     ]
diff --git a/apps/indexer/lib/indexer/fetcher/replaced_transaction.ex b/apps/indexer/lib/indexer/fetcher/replaced_transaction.ex
index af64d8ba1258..88eba340c7c5 100644
--- a/apps/indexer/lib/indexer/fetcher/replaced_transaction.ex
+++ b/apps/indexer/lib/indexer/fetcher/replaced_transaction.ex
@@ -61,7 +61,8 @@ defmodule Indexer.Fetcher.ReplacedTransaction do
           transaction_fields
           |> pending_entry()
           |> reducer.(acc)
-        end
+        end,
+        true
       )
 
     final
diff --git a/apps/indexer/lib/indexer/fetcher/token.ex b/apps/indexer/lib/indexer/fetcher/token.ex
index c04c20055aea..57b815a03e54 100644
--- a/apps/indexer/lib/indexer/fetcher/token.ex
+++ b/apps/indexer/lib/indexer/fetcher/token.ex
@@ -42,9 +42,13 @@ defmodule Indexer.Fetcher.Token do
   @impl BufferedTask
   def init(initial_acc, reducer, _) do
     {:ok, acc} =
-      Chain.stream_uncataloged_token_contract_address_hashes(initial_acc, fn address, acc ->
-        reducer.(address, acc)
-      end)
+      Chain.stream_uncataloged_token_contract_address_hashes(
+        initial_acc,
+        fn address, acc ->
+          reducer.(address, acc)
+        end,
+        true
+      )
 
     acc
   end
diff --git a/apps/indexer/lib/indexer/fetcher/token_balance.ex b/apps/indexer/lib/indexer/fetcher/token_balance.ex
index 77e5e4f571b7..9a40d88e6f0b 100644
--- a/apps/indexer/lib/indexer/fetcher/token_balance.ex
+++ b/apps/indexer/lib/indexer/fetcher/token_balance.ex
@@ -69,11 +69,15 @@ defmodule Indexer.Fetcher.TokenBalance do
   @impl BufferedTask
   def init(initial, reducer, _) do
     {:ok, final} =
-      Chain.stream_unfetched_token_balances(initial, fn token_balance, acc ->
-        token_balance
-        |> entry()
-        |> reducer.(acc)
-      end)
+      Chain.stream_unfetched_token_balances(
+        initial,
+        fn token_balance, acc ->
+          token_balance
+          |> entry()
+          |> reducer.(acc)
+        end,
+        true
+      )
 
     final
   end
diff --git a/apps/indexer/lib/indexer/fetcher/token_instance/retry.ex b/apps/indexer/lib/indexer/fetcher/token_instance/retry.ex
index 0ea6562cbd40..0c50e1ae19a3 100644
--- a/apps/indexer/lib/indexer/fetcher/token_instance/retry.ex
+++ b/apps/indexer/lib/indexer/fetcher/token_instance/retry.ex
@@ -29,9 +29,13 @@ defmodule Indexer.Fetcher.TokenInstance.Retry do
   @impl BufferedTask
   def init(initial_acc, reducer, _) do
     {:ok, acc} =
-      Chain.stream_token_instances_with_error(initial_acc, fn data, acc ->
-        reducer.(data, acc)
-      end)
+      Chain.stream_token_instances_with_error(
+        initial_acc,
+        fn data, acc ->
+          reducer.(data, acc)
+        end,
+        true
+      )
 
     acc
   end
@@ -54,7 +58,6 @@ defmodule Indexer.Fetcher.TokenInstance.Retry do
       flush_interval: :timer.minutes(10),
       max_concurrency: Application.get_env(:indexer, __MODULE__)[:concurrency] || @default_max_concurrency,
       max_batch_size: @default_max_batch_size,
-      poll: true,
       task_supervisor: __MODULE__.TaskSupervisor
     ]
   end
diff --git a/apps/indexer/lib/indexer/fetcher/token_updater.ex b/apps/indexer/lib/indexer/fetcher/token_updater.ex
index 098bf8d2d77e..58c35c6246f0 100644
--- a/apps/indexer/lib/indexer/fetcher/token_updater.ex
+++ b/apps/indexer/lib/indexer/fetcher/token_updater.ex
@@ -52,7 +52,7 @@ defmodule Indexer.Fetcher.TokenUpdater do
       |> Duration.to_minutes()
       |> trunc()
 
-    {:ok, tokens} = Chain.stream_cataloged_token_contract_address_hashes(initial, reducer, interval_in_minutes)
+    {:ok, tokens} = Chain.stream_cataloged_token_contract_address_hashes(initial, reducer, interval_in_minutes, true)
 
     tokens
   end
diff --git a/apps/indexer/lib/indexer/fetcher/uncle_block.ex b/apps/indexer/lib/indexer/fetcher/uncle_block.ex
index eea56f5445a4..564d428f7519 100644
--- a/apps/indexer/lib/indexer/fetcher/uncle_block.ex
+++ b/apps/indexer/lib/indexer/fetcher/uncle_block.ex
@@ -65,11 +65,15 @@ defmodule Indexer.Fetcher.UncleBlock do
   @impl BufferedTask
   def init(initial, reducer, _) do
     {:ok, final} =
-      Chain.stream_unfetched_uncles(initial, fn uncle, acc ->
-        uncle
-        |> entry()
-        |> reducer.(acc)
-      end)
+      Chain.stream_unfetched_uncles(
+        initial,
+        fn uncle, acc ->
+          uncle
+          |> entry()
+          |> reducer.(acc)
+        end,
+        true
+      )
 
     final
   end
diff --git a/apps/indexer/lib/indexer/temporary/blocks_transactions_mismatch.ex b/apps/indexer/lib/indexer/temporary/blocks_transactions_mismatch.ex
index 1be13f7776a4..922fcb3e8086 100644
--- a/apps/indexer/lib/indexer/temporary/blocks_transactions_mismatch.ex
+++ b/apps/indexer/lib/indexer/temporary/blocks_transactions_mismatch.ex
@@ -14,8 +14,8 @@ defmodule Indexer.Temporary.BlocksTransactionsMismatch do
   import Ecto.Query
 
   alias EthereumJSONRPC.Blocks
+  alias Explorer.{Chain, Repo}
   alias Explorer.Chain.Block
-  alias Explorer.Repo
   alias Explorer.Utility.MissingRangesManipulator
   alias Indexer.BufferedTask
 
@@ -58,7 +58,10 @@ defmodule Indexer.Temporary.BlocksTransactionsMismatch do
         select: {block.hash, count(transactions.hash)}
       )
 
-    {:ok, final} = Repo.stream_reduce(query, initial, &reducer.(&1, &2))
+    {:ok, final} =
+      query
+      |> Chain.add_fetcher_limit(true)
+      |> Repo.stream_reduce(initial, &reducer.(&1, &2))
 
     final
   end
diff --git a/apps/indexer/lib/indexer/temporary/uncles_without_index.ex b/apps/indexer/lib/indexer/temporary/uncles_without_index.ex
index 238778e5b91e..814103e4f9b3 100644
--- a/apps/indexer/lib/indexer/temporary/uncles_without_index.ex
+++ b/apps/indexer/lib/indexer/temporary/uncles_without_index.ex
@@ -58,7 +58,9 @@ defmodule Indexer.Temporary.UnclesWithoutIndex do
       )
 
     {:ok, final} =
-      Repo.stream_reduce(query, initial, fn nephew_hash, acc ->
+      query
+      |> Chain.add_fetcher_limit(true)
+      |> Repo.stream_reduce(initial, fn nephew_hash, acc ->
         nephew_hash
         |> to_string()
         |> reducer.(acc)
diff --git a/apps/indexer/test/indexer/buffered_task_test.exs b/apps/indexer/test/indexer/buffered_task_test.exs
index 7e30c484d849..2d41b5d7a070 100644
--- a/apps/indexer/test/indexer/buffered_task_test.exs
+++ b/apps/indexer/test/indexer/buffered_task_test.exs
@@ -28,7 +28,8 @@ defmodule Indexer.BufferedTaskTest do
           task_supervisor: BufferedTaskSup,
           flush_interval: @flush_interval,
           max_batch_size: max_batch_size,
-          max_concurrency: 2}
+          max_concurrency: 2,
+          poll: false}
        ]}
     )
   end
diff --git a/apps/indexer/test/support/indexer/fetcher/block_reward_supervisor_case.ex b/apps/indexer/test/support/indexer/fetcher/block_reward_supervisor_case.ex
index 95ac8836072f..f6678cc715c7 100644
--- a/apps/indexer/test/support/indexer/fetcher/block_reward_supervisor_case.ex
+++ b/apps/indexer/test/support/indexer/fetcher/block_reward_supervisor_case.ex
@@ -7,7 +7,8 @@ defmodule Indexer.Fetcher.BlockReward.Supervisor.Case do
         fetcher_arguments,
         flush_interval: 50,
         max_batch_size: 1,
-        max_concurrency: 1
+        max_concurrency: 1,
+        poll: false
       )
 
     [merged_fetcher_arguments]
diff --git a/config/runtime.exs b/config/runtime.exs
index 5f5de06c14c3..e6328f5319c4 100644
--- a/config/runtime.exs
+++ b/config/runtime.exs
@@ -409,7 +409,8 @@ config :indexer,
   memory_limit: ConfigHelper.indexer_memory_limit(),
   receipts_batch_size: ConfigHelper.parse_integer_env_var("INDEXER_RECEIPTS_BATCH_SIZE", 250),
   receipts_concurrency: ConfigHelper.parse_integer_env_var("INDEXER_RECEIPTS_CONCURRENCY", 10),
-  hide_indexing_progress_alert: ConfigHelper.parse_bool_env_var("INDEXER_HIDE_INDEXING_PROGRESS_ALERT")
+  hide_indexing_progress_alert: ConfigHelper.parse_bool_env_var("INDEXER_HIDE_INDEXING_PROGRESS_ALERT"),
+  fetcher_init_limit: ConfigHelper.parse_integer_env_var("INDEXER_FETCHER_INIT_QUERY_LIMIT", 100)
 
 config :indexer, Indexer.Supervisor, enabled: !ConfigHelper.parse_bool_env_var("DISABLE_INDEXER")
 
diff --git a/docker-compose/envs/common-blockscout.env b/docker-compose/envs/common-blockscout.env
index b5717e3b73ef..37afc533b520 100644
--- a/docker-compose/envs/common-blockscout.env
+++ b/docker-compose/envs/common-blockscout.env
@@ -120,6 +120,7 @@ INDEXER_DISABLE_INTERNAL_TRANSACTIONS_FETCHER=false
 # INDEXER_TX_ACTIONS_REINDEX_PROTOCOLS=
 # INDEXER_TX_ACTIONS_AAVE_V3_POOL_CONTRACT=
 # INDEXER_REALTIME_FETCHER_MAX_GAP=
+# INDEXER_FETCHER_INIT_QUERY_LIMIT=
 # INDEXER_DISABLE_WITHDRAWALS_FETCHER=
 # WITHDRAWALS_FIRST_BLOCK=
 # TOKEN_ID_MIGRATION_FIRST_BLOCK=
diff --git a/docker/Makefile b/docker/Makefile
index ce4806af8c48..e5de674c240b 100644
--- a/docker/Makefile
+++ b/docker/Makefile
@@ -561,6 +561,9 @@ endif
 ifdef INDEXER_REALTIME_FETCHER_MAX_GAP
     BLOCKSCOUT_CONTAINER_PARAMS += -e 'INDEXER_REALTIME_FETCHER_MAX_GAP=$(INDEXER_REALTIME_FETCHER_MAX_GAP)'
 endif
+ifdef INDEXER_FETCHER_INIT_QUERY_LIMIT
+    BLOCKSCOUT_CONTAINER_PARAMS += -e 'INDEXER_FETCHER_INIT_QUERY_LIMIT=$(INDEXER_FETCHER_INIT_QUERY_LIMIT)'
+endif
 ifdef INDEXER_INTERNAL_TRANSACTIONS_TRACER_TYPE
     BLOCKSCOUT_CONTAINER_PARAMS += -e 'INDEXER_INTERNAL_TRANSACTIONS_TRACER_TYPE=$(INDEXER_INTERNAL_TRANSACTIONS_TRACER_TYPE)'
 endif

From a35e7dffe6640dc91b195ac9f68c86971e6dd9ca Mon Sep 17 00:00:00 2001
From: POA <33550681+poa@users.noreply.github.com>
Date: Thu, 1 Jun 2023 11:14:30 +0300
Subject: [PATCH 105/909] Ignore logs of non-consensus blocks in
 Indexer.Fetcher.TransactionAction

---
 .../lib/indexer/fetcher/transaction_action.ex | 83 +++++++++++--------
 1 file changed, 48 insertions(+), 35 deletions(-)

diff --git a/apps/indexer/lib/indexer/fetcher/transaction_action.ex b/apps/indexer/lib/indexer/fetcher/transaction_action.ex
index d12dc3dee164..6fddbf52a736 100644
--- a/apps/indexer/lib/indexer/fetcher/transaction_action.ex
+++ b/apps/indexer/lib/indexer/fetcher/transaction_action.ex
@@ -15,7 +15,7 @@ defmodule Indexer.Fetcher.TransactionAction do
 
   alias Explorer.{Chain, Repo}
   alias Explorer.Helper, as: ExplorerHelper
-  alias Explorer.Chain.{Log, TransactionAction}
+  alias Explorer.Chain.{Block, Log, TransactionAction}
   alias Indexer.Transform.{Addresses, TransactionActions}
 
   @stage_first_block "tx_action_first_block"
@@ -87,8 +87,10 @@ defmodule Indexer.Fetcher.TransactionAction do
     if reason === :normal do
       {:noreply, %__MODULE__{state | task: nil}}
     else
+      logger_metadata = Logger.metadata()
       Logger.metadata(fetcher: :transaction_action)
       Logger.error(fn -> "Transaction action fetcher task exited due to #{inspect(reason)}. Rerunning..." end)
+      Logger.reset_metadata(logger_metadata)
       {:noreply, run_fetch(%__MODULE__{state | next_block: get_stage_block(@stage_next_block)})}
     end
   end
@@ -108,6 +110,7 @@ defmodule Indexer.Fetcher.TransactionAction do
            pid: pid
          } = _state
        ) do
+    logger_metadata = Logger.metadata()
     Logger.metadata(fetcher: :transaction_action)
 
     block_range = Range.new(next_block, first_block, -1)
@@ -117,6 +120,8 @@ defmodule Indexer.Fetcher.TransactionAction do
       query =
         from(
           log in Log,
+          inner_join: b in Block,
+          on: b.hash == log.block_hash and b.consensus == true,
           where: log.block_number == ^block_number,
           select: log
         )
@@ -183,51 +188,59 @@ defmodule Indexer.Fetcher.TransactionAction do
 
     Process.send(pid, :stop_server, [])
 
+    Logger.reset_metadata(logger_metadata)
+
     :ok
   end
 
   defp init_fetching(opts, first_block, last_block) do
+    logger_metadata = Logger.metadata()
     Logger.metadata(fetcher: :transaction_action)
 
     first_block = ExplorerHelper.parse_integer(first_block)
     last_block = ExplorerHelper.parse_integer(last_block)
 
-    if is_nil(first_block) or is_nil(last_block) or first_block <= 0 or last_block <= 0 or first_block > last_block do
-      {:stop, "Correct block range must be provided to #{__MODULE__}."}
-    else
-      max_block_number = Chain.fetch_max_block_number()
-
-      if last_block > max_block_number do
-        Logger.warning(
-          "Note, that the last block number (#{last_block}) provided to #{__MODULE__} exceeds max block number available in DB (#{max_block_number})."
-        )
+    return =
+      if is_nil(first_block) or is_nil(last_block) or first_block <= 0 or last_block <= 0 or first_block > last_block do
+        {:stop, "Correct block range must be provided to #{__MODULE__}."}
+      else
+        max_block_number = Chain.fetch_max_block_number()
+
+        if last_block > max_block_number do
+          Logger.warning(
+            "Note, that the last block number (#{last_block}) provided to #{__MODULE__} exceeds max block number available in DB (#{max_block_number})."
+          )
+        end
+
+        supported_protocols =
+          TransactionAction.supported_protocols()
+          |> Enum.map(&Atom.to_string(&1))
+
+        protocols =
+          opts
+          |> Keyword.get(:reindex_protocols, "")
+          |> String.trim()
+          |> String.split(",")
+          |> Enum.map(&String.trim(&1))
+          |> Enum.filter(&Enum.member?(supported_protocols, &1))
+
+        next_block = get_next_block(first_block, last_block, protocols)
+
+        state =
+          %__MODULE__{
+            first_block: first_block,
+            next_block: next_block,
+            last_block: last_block,
+            protocols: protocols
+          }
+          |> run_fetch()
+
+        {:ok, state}
       end
 
-      supported_protocols =
-        TransactionAction.supported_protocols()
-        |> Enum.map(&Atom.to_string(&1))
-
-      protocols =
-        opts
-        |> Keyword.get(:reindex_protocols, "")
-        |> String.trim()
-        |> String.split(",")
-        |> Enum.map(&String.trim(&1))
-        |> Enum.filter(&Enum.member?(supported_protocols, &1))
-
-      next_block = get_next_block(first_block, last_block, protocols)
-
-      state =
-        %__MODULE__{
-          first_block: first_block,
-          next_block: next_block,
-          last_block: last_block,
-          protocols: protocols
-        }
-        |> run_fetch()
-
-      {:ok, state}
-    end
+    Logger.reset_metadata(logger_metadata)
+
+    return
   end
 
   defp get_next_block(first_block, last_block, protocols) do

From 1cb43b291d42b23e699d768f9559d4050f2456ee Mon Sep 17 00:00:00 2001
From: POA <33550681+poa@users.noreply.github.com>
Date: Thu, 15 Jun 2023 17:07:12 +0300
Subject: [PATCH 106/909] Fix import of tx actions

---
 apps/indexer/lib/indexer/block/fetcher.ex | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/apps/indexer/lib/indexer/block/fetcher.ex b/apps/indexer/lib/indexer/block/fetcher.ex
index 7f5758fbbe40..b4aa4e73b102 100644
--- a/apps/indexer/lib/indexer/block/fetcher.ex
+++ b/apps/indexer/lib/indexer/block/fetcher.ex
@@ -189,10 +189,15 @@ defmodule Indexer.Block.Fetcher do
                token_transfers: %{params: token_transfers},
                tokens: %{on_conflict: :nothing, params: tokens},
                transactions: %{params: transactions_with_receipts},
-               transaction_actions: %{params: transaction_actions},
                withdrawals: %{params: withdrawals_params}
              }
-           ) do
+           ),
+         {:ok, inserted_tx_actions} <-
+           Chain.import(%{
+             transaction_actions: %{params: transaction_actions},
+             timeout: :infinity
+           }) do
+      inserted = Map.merge(inserted, inserted_tx_actions)
       Prometheus.Instrumenter.block_batch_fetch(fetch_time, callback_module)
       result = {:ok, %{inserted: inserted, errors: blocks_errors}}
       update_block_cache(inserted[:blocks])

From c76695490ab9caeabda301dad919dc5e5eab27cf Mon Sep 17 00:00:00 2001
From: POA <33550681+poa@users.noreply.github.com>
Date: Thu, 15 Jun 2023 17:10:46 +0300
Subject: [PATCH 107/909] Update changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f229af320a35..b1eec6f7f647 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -14,6 +14,7 @@
 
 ### Fixes
 
+- [#7712](https://github.com/blockscout/blockscout/pull/7712) - Transaction actions import fix
 - [#7709](https://github.com/blockscout/blockscout/pull/7709) - Contract args displaying bug
 - [#7654](https://github.com/blockscout/blockscout/pull/7654) - Optimize exchange rates requests rate
 - [#7636](https://github.com/blockscout/blockscout/pull/7636) - Remove receive from read methods

From 97d6e81f432d6c0aae95b5ad9d9cd29dcd8b0faf Mon Sep 17 00:00:00 2001
From: POA <33550681+poa@users.noreply.github.com>
Date: Thu, 15 Jun 2023 17:41:36 +0300
Subject: [PATCH 108/909] Fix for dialyzer

---
 apps/indexer/lib/indexer/block/fetcher.ex | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/apps/indexer/lib/indexer/block/fetcher.ex b/apps/indexer/lib/indexer/block/fetcher.ex
index b4aa4e73b102..d7b9be8d31e7 100644
--- a/apps/indexer/lib/indexer/block/fetcher.ex
+++ b/apps/indexer/lib/indexer/block/fetcher.ex
@@ -192,11 +192,12 @@ defmodule Indexer.Block.Fetcher do
                withdrawals: %{params: withdrawals_params}
              }
            ),
-         {:ok, inserted_tx_actions} <-
-           Chain.import(%{
-             transaction_actions: %{params: transaction_actions},
-             timeout: :infinity
-           }) do
+         {:tx_actions, {:ok, inserted_tx_actions}} <-
+           {:tx_actions,
+            Chain.import(%{
+              transaction_actions: %{params: transaction_actions},
+              timeout: :infinity
+            })} do
       inserted = Map.merge(inserted, inserted_tx_actions)
       Prometheus.Instrumenter.block_batch_fetch(fetch_time, callback_module)
       result = {:ok, %{inserted: inserted, errors: blocks_errors}}

From 8c8795c74cdcc009904050503c28326ddeafb0b3 Mon Sep 17 00:00:00 2001
From: Viktor Baranov <baranov.viktor.27@gmail.com>
Date: Thu, 15 Jun 2023 19:33:29 +0300
Subject: [PATCH 109/909] Publish docker image CI for RSK chain

---
 .../publish-docker-image-for-rsk.yml          | 54 +++++++++++++++++++
 1 file changed, 54 insertions(+)
 create mode 100644 .github/workflows/publish-docker-image-for-rsk.yml

diff --git a/.github/workflows/publish-docker-image-for-rsk.yml b/.github/workflows/publish-docker-image-for-rsk.yml
new file mode 100644
index 000000000000..fddbd5769eea
--- /dev/null
+++ b/.github/workflows/publish-docker-image-for-rsk.yml
@@ -0,0 +1,54 @@
+# This workflow uses actions that are not certified by GitHub.
+# They are provided by a third-party and are governed by
+# separate terms of service, privacy policy, and support
+# documentation.
+
+name: Publish Docker image for specific chain branches
+
+on:
+  push:
+    branches:
+      - production-rsk-stg
+jobs:
+  push_to_registry:
+    name: Push Docker image to Docker Hub
+    runs-on: ubuntu-latest
+    env:
+      RELEASE_VERSION: 5.1.5
+      DOCKER_CHAIN_NAME: rsk
+    steps:
+      - name: Check out the repo
+        uses: actions/checkout@v3
+      
+      - name: Log in to Docker Hub
+        uses: docker/login-action@v2
+        with:
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
+      
+      - name: Extract metadata (tags, labels) for Docker
+        id: meta
+        uses: docker/metadata-action@v4
+        with:
+          images: blockscout/blockscout
+
+      - name: Add SHORT_SHA env property with commit short sha
+        run: echo "SHORT_SHA=`echo ${GITHUB_SHA} | cut -c1-8`" >> $GITHUB_ENV
+      
+      - name: Build and push Docker image
+        uses: docker/build-push-action@ad44023a93711e3deb337508980b4b5e9bcdc5dc
+        with:
+          context: .
+          file: ./docker/Dockerfile
+          push: true
+          tags: blockscout/blockscout-${{ env.DOCKER_CHAIN_NAME }}:latest, blockscout/blockscout-${{ env.DOCKER_CHAIN_NAME }}:${{ env.RELEASE_VERSION }}-prerelease-${{ env.SHORT_SHA }}
+          build-args: |
+            CACHE_EXCHANGE_RATES_PERIOD=
+            DISABLE_READ_API=false
+            DISABLE_WEBAPP=false
+            DISABLE_WRITE_API=false
+            CACHE_TOTAL_GAS_USAGE_COUNTER_ENABLED=
+            ADMIN_PANEL_ENABLED=false
+            CACHE_ADDRESS_WITH_BALANCES_UPDATE_INTERVAL=
+            BLOCKSCOUT_VERSION=v${{ env.RELEASE_VERSION }}-beta.+commit.${{ env.SHORT_SHA }}
+            RELEASE_VERSION=${{ env.RELEASE_VERSION }}
\ No newline at end of file

From 24f2ff7fd083ec914865aa4ddbbc0990053e6f57 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 15 Jun 2023 19:06:31 +0000
Subject: [PATCH 110/909] Bump ex_cldr_units from 3.16.1 to 3.16.2

Bumps [ex_cldr_units](https://github.com/elixir-cldr/cldr_units) from 3.16.1 to 3.16.2.
- [Release notes](https://github.com/elixir-cldr/cldr_units/releases)
- [Changelog](https://github.com/elixir-cldr/cldr_units/blob/main/CHANGELOG.md)
- [Commits](https://github.com/elixir-cldr/cldr_units/commits)

---
updated-dependencies:
- dependency-name: ex_cldr_units
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 mix.lock | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/mix.lock b/mix.lock
index 7330c4015401..73a0172e54b4 100644
--- a/mix.lock
+++ b/mix.lock
@@ -12,7 +12,7 @@
   "bunt": {:hex, :bunt, "0.2.1", "e2d4792f7bc0ced7583ab54922808919518d0e57ee162901a16a1b6664ef3b14", [:mix], [], "hexpm", "a330bfb4245239787b15005e66ae6845c9cd524a288f0d141c148b02603777a5"},
   "bureaucrat": {:hex, :bureaucrat, "0.2.9", "d98e4d2b9bdbf22e4a45c2113ce8b38b5b63278506c6ff918e3b943a4355d85b", [:mix], [{:inflex, ">= 1.10.0", [hex: :inflex, repo: "hexpm", optional: false]}, {:phoenix, ">= 1.2.0", [hex: :phoenix, repo: "hexpm", optional: true]}, {:plug, ">= 1.0.0", [hex: :plug, repo: "hexpm", optional: false]}, {:poison, "~> 1.5 or ~> 2.0 or ~> 3.0 or ~> 4.0", [hex: :poison, repo: "hexpm", optional: true]}], "hexpm", "111c8dd84382a62e1026ae011d592ceee918553e5203fe8448d9ba6ccbdfff7d"},
   "bypass": {:hex, :bypass, "2.1.0", "909782781bf8e20ee86a9cabde36b259d44af8b9f38756173e8f5e2e1fabb9b1", [:mix], [{:plug, "~> 1.7", [hex: :plug, repo: "hexpm", optional: false]}, {:plug_cowboy, "~> 2.0", [hex: :plug_cowboy, repo: "hexpm", optional: false]}, {:ranch, "~> 1.3", [hex: :ranch, repo: "hexpm", optional: false]}], "hexpm", "d9b5df8fa5b7a6efa08384e9bbecfe4ce61c77d28a4282f79e02f1ef78d96b80"},
-  "castore": {:hex, :castore, "1.0.2", "0c6292ecf3e3f20b7c88408f00096337c4bfd99bd46cc2fe63413ddbe45b3573", [:mix], [], "hexpm", "40b2dd2836199203df8500e4a270f10fc006cc95adc8a319e148dc3077391d96"},
+  "castore": {:hex, :castore, "1.0.3", "7130ba6d24c8424014194676d608cb989f62ef8039efd50ff4b3f33286d06db8", [:mix], [], "hexpm", "680ab01ef5d15b161ed6a95449fac5c6b8f60055677a8e79acf01b27baa4390b"},
   "cbor": {:hex, :cbor, "1.0.1", "39511158e8ea5a57c1fcb9639aaa7efde67129678fee49ebbda780f6f24959b0", [:mix], [], "hexpm", "5431acbe7a7908f17f6a9cd43311002836a34a8ab01876918d8cfb709cd8b6a2"},
   "certifi": {:hex, :certifi, "2.9.0", "6f2a475689dd47f19fb74334859d460a2dc4e3252a3324bd2111b8f0429e7e21", [:rebar3], [], "hexpm", "266da46bdb06d6c6d35fde799bcb28d36d985d424ad7c08b5bb48f5b5cdd4641"},
   "cldr_utils": {:hex, :cldr_utils, "2.24.0", "5b356769f2baf9dd25b166e9f1b2a5ce955d5b556bc07f56c959cfff1ec9543e", [:mix], [{:castore, "~> 0.1 or ~> 1.0", [hex: :castore, repo: "hexpm", optional: true]}, {:certifi, "~> 2.5", [hex: :certifi, repo: "hexpm", optional: true]}, {:decimal, "~> 1.9 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: false]}], "hexpm", "3fde251e0bbbe473230561019dd6c2958d82a10c134bb5b8b4e21a694196cf85"},
@@ -46,7 +46,7 @@
   "ex_cldr_currencies": {:hex, :ex_cldr_currencies, "2.15.0", "aadd34e91cfac7ef6b03fe8f47f8c6fa8c5daf3f89b5d9fee64ec545ded839cf", [:mix], [{:ex_cldr, "~> 2.34", [hex: :ex_cldr, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}], "hexpm", "0521316396c66877a2d636219767560bb2397c583341fcb154ecf9f3000e6ff8"},
   "ex_cldr_lists": {:hex, :ex_cldr_lists, "2.10.0", "4d4c9877da2d0417fd832907d69974e8328969f75fafc79b05ccf85f549f6281", [:mix], [{:ex_cldr_numbers, "~> 2.25", [hex: :ex_cldr_numbers, repo: "hexpm", optional: false]}, {:ex_doc, "~> 0.18", [hex: :ex_doc, repo: "hexpm", optional: true]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}], "hexpm", "adc040cde7b97f7fd7c0b35dd69ddb6fcf607303ae6355bb1851deae1f8b0652"},
   "ex_cldr_numbers": {:hex, :ex_cldr_numbers, "2.31.1", "ad3e8a33e8cb8d048173f2c89cf6fcec9f1694d99f890a75bc745894c3868d5b", [:mix], [{:decimal, "~> 1.6 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: false]}, {:digital_token, "~> 0.3 or ~> 1.0", [hex: :digital_token, repo: "hexpm", optional: false]}, {:ex_cldr, "~> 2.37", [hex: :ex_cldr, repo: "hexpm", optional: false]}, {:ex_cldr_currencies, ">= 2.14.2", [hex: :ex_cldr_currencies, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}], "hexpm", "a94c40f4bf60f0e69c34977f33caeda483677232699ab0a6a98025ea011fabcf"},
-  "ex_cldr_units": {:hex, :ex_cldr_units, "3.16.1", "04be7de0b59b37c83e60dbfaa63538c455ed532af6202e8a501e0ebe5f9cd55d", [:mix], [{:cldr_utils, "~> 2.24", [hex: :cldr_utils, repo: "hexpm", optional: false]}, {:decimal, "~> 1.6 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: false]}, {:ex_cldr_lists, "~> 2.10", [hex: :ex_cldr_lists, repo: "hexpm", optional: false]}, {:ex_cldr_numbers, "~> 2.31", [hex: :ex_cldr_numbers, repo: "hexpm", optional: false]}, {:ex_doc, "~> 0.18", [hex: :ex_doc, repo: "hexpm", optional: true]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}], "hexpm", "f358029e6f56ae19887e598062dade1ddd0ad03c06384ed397ca3dc3ac8b0584"},
+  "ex_cldr_units": {:hex, :ex_cldr_units, "3.16.2", "dbad303fba819981c578234e2aaf19d72efca16ea8b1c6ee46b26232cb45e232", [:mix], [{:cldr_utils, "~> 2.24", [hex: :cldr_utils, repo: "hexpm", optional: false]}, {:decimal, "~> 1.6 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: false]}, {:ex_cldr_lists, "~> 2.10", [hex: :ex_cldr_lists, repo: "hexpm", optional: false]}, {:ex_cldr_numbers, "~> 2.31", [hex: :ex_cldr_numbers, repo: "hexpm", optional: false]}, {:ex_doc, "~> 0.18", [hex: :ex_doc, repo: "hexpm", optional: true]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}], "hexpm", "851095319fb3205c1549619da742cd53a2804c1d9c204cf84014021e2a6ea7e5"},
   "ex_doc": {:hex, :ex_doc, "0.29.4", "6257ecbb20c7396b1fe5accd55b7b0d23f44b6aa18017b415cb4c2b91d997729", [:mix], [{:earmark_parser, "~> 1.4.31", [hex: :earmark_parser, repo: "hexpm", optional: false]}, {:makeup_elixir, "~> 0.14", [hex: :makeup_elixir, repo: "hexpm", optional: false]}, {:makeup_erlang, "~> 0.1", [hex: :makeup_erlang, repo: "hexpm", optional: false]}], "hexpm", "2c6699a737ae46cb61e4ed012af931b57b699643b24dabe2400a8168414bc4f5"},
   "ex_json_schema": {:hex, :ex_json_schema, "0.9.3", "fc17c50d410fd99fa6e814e1aed60122d8ff2578b869d17a9db1ce1c621382b6", [:mix], [{:decimal, "~> 2.0", [hex: :decimal, repo: "hexpm", optional: false]}], "hexpm", "b79962d09cefd33001706255187bdb483a0c2b4442d5edc6822eb7574a8df0a8"},
   "ex_keccak": {:hex, :ex_keccak, "0.7.1", "0169f4b0c5073c5df61581d6282b12f1a1b764dcfcda4eeb1c819b5194c9ced0", [:mix], [{:rustler, ">= 0.0.0", [hex: :rustler, repo: "hexpm", optional: true]}, {:rustler_precompiled, "~> 0.6.1", [hex: :rustler_precompiled, repo: "hexpm", optional: false]}], "hexpm", "c18c19f66b6545b4b46b0c71c0cc0079de84e30b26365a92961e91697e8724ed"},

From 6f564f991833d2a72734b8ef4ae6e81bb093689f Mon Sep 17 00:00:00 2001
From: Qwerty5Uiop <alex000010@bk.ru>
Date: Fri, 16 Jun 2023 17:03:32 +0400
Subject: [PATCH 111/909] Move MissingRangesCollector init logic to
 handle_continue

---
 CHANGELOG.md                                               | 1 +
 .../lib/indexer/block/catchup/missing_ranges_collector.ex  | 7 ++++++-
 .../block/catchup/bound_interval_supervisor_test.exs       | 3 ++-
 apps/indexer/test/indexer/block/catchup/fetcher_test.exs   | 6 ++++++
 4 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4aa7190d77be..a94c786cf9b7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -32,6 +32,7 @@
 - [#7516](https://github.com/blockscout/blockscout/pull/7516) - Fix shrinking logo in Safari
 - [#7590](https://github.com/blockscout/blockscout/pull/7590) - Drop genesis block in internal transactions fetcher
 - [#7639](https://github.com/blockscout/blockscout/pull/7639) - Fix contract creation transactions
+- [#7724](https://github.com/blockscout/blockscout/pull/7724) - Move MissingRangesCollector init logic to handle_continue
 
 ### Chore
 
diff --git a/apps/indexer/lib/indexer/block/catchup/missing_ranges_collector.ex b/apps/indexer/lib/indexer/block/catchup/missing_ranges_collector.ex
index 0d4c6bfaeacc..1fc3788404f0 100644
--- a/apps/indexer/lib/indexer/block/catchup/missing_ranges_collector.ex
+++ b/apps/indexer/lib/indexer/block/catchup/missing_ranges_collector.ex
@@ -22,7 +22,12 @@ defmodule Indexer.Block.Catchup.MissingRangesCollector do
 
   @impl true
   def init(_) do
-    {:ok, define_init()}
+    {:ok, %{min_fetched_block_number: nil, max_fetched_block_number: nil}, {:continue, :ok}}
+  end
+
+  @impl true
+  def handle_continue(:ok, _state) do
+    {:noreply, define_init()}
   end
 
   defp define_init do
diff --git a/apps/indexer/test/indexer/block/catchup/bound_interval_supervisor_test.exs b/apps/indexer/test/indexer/block/catchup/bound_interval_supervisor_test.exs
index e485b45c5321..77f7a63512dc 100644
--- a/apps/indexer/test/indexer/block/catchup/bound_interval_supervisor_test.exs
+++ b/apps/indexer/test/indexer/block/catchup/bound_interval_supervisor_test.exs
@@ -8,7 +8,6 @@ defmodule Indexer.Block.Catchup.BoundIntervalSupervisorTest do
 
   alias Explorer.Chain.Block
   alias Explorer.Repo
-  alias Explorer.Utility.MissingRangesManipulator
   alias Indexer.BoundInterval
   alias Indexer.Block.Catchup
   alias Indexer.Block.Catchup.MissingRangesCollector
@@ -533,6 +532,8 @@ defmodule Indexer.Block.Catchup.BoundIntervalSupervisorTest do
       # from `setup :state`
       assert_received :catchup_index
 
+      Process.sleep(50)
+
       assert {:noreply,
               %Catchup.BoundIntervalSupervisor{fetcher: %Catchup.Fetcher{}, task: %Task{pid: pid, ref: ref}} =
                 catchup_index_state} = Catchup.BoundIntervalSupervisor.handle_info(:catchup_index, state)
diff --git a/apps/indexer/test/indexer/block/catchup/fetcher_test.exs b/apps/indexer/test/indexer/block/catchup/fetcher_test.exs
index c667429ef0ee..3df0179f95ff 100644
--- a/apps/indexer/test/indexer/block/catchup/fetcher_test.exs
+++ b/apps/indexer/test/indexer/block/catchup/fetcher_test.exs
@@ -285,6 +285,8 @@ defmodule Indexer.Block.Catchup.FetcherTest do
 
       assert count(Chain.Block) == 0
 
+      Process.sleep(50)
+
       assert %{first_block_number: ^block_number, last_block_number: 0, missing_block_count: 2, shrunk: false} =
                Fetcher.task(%Fetcher{
                  block_fetcher: %Block.Fetcher{
@@ -438,6 +440,8 @@ defmodule Indexer.Block.Catchup.FetcherTest do
 
       Process.register(pid, BlockReward)
 
+      Process.sleep(50)
+
       assert %{first_block_number: ^block_number, last_block_number: 0, missing_block_count: 2, shrunk: false} =
                Fetcher.task(%Fetcher{
                  block_fetcher: %Block.Fetcher{
@@ -586,6 +590,8 @@ defmodule Indexer.Block.Catchup.FetcherTest do
 
       Process.register(pid, BlockReward)
 
+      Process.sleep(50)
+
       assert %{first_block_number: ^block_number, last_block_number: 0, missing_block_count: 2, shrunk: false} =
                Fetcher.task(%Fetcher{
                  block_fetcher: %Block.Fetcher{

From 900e9d83dd21c15fe86f7c889b23999ae57194d8 Mon Sep 17 00:00:00 2001
From: Nikita Pozdniakov <nikitosing4@mail.ru>
Date: Mon, 19 Jun 2023 15:20:03 +0300
Subject: [PATCH 112/909] Add search by public tag support to API v2 SearchView

---
 .../lib/block_scout_web/views/api/v2/search_view.ex      | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/apps/block_scout_web/lib/block_scout_web/views/api/v2/search_view.ex b/apps/block_scout_web/lib/block_scout_web/views/api/v2/search_view.ex
index a8ac5cc64429..4c69e3e15cc4 100644
--- a/apps/block_scout_web/lib/block_scout_web/views/api/v2/search_view.ex
+++ b/apps/block_scout_web/lib/block_scout_web/views/api/v2/search_view.ex
@@ -59,6 +59,15 @@ defmodule BlockScoutWeb.API.V2.SearchView do
     }
   end
 
+  def prepare_search_result(%{type: "label"} = search_result) do
+    %{
+      "type" => search_result.type,
+      "address" => search_result.address_hash,
+      "name" => search_result.name,
+      "url" => address_path(Endpoint, :show, search_result.address_hash)
+    }
+  end
+
   defp hash_to_string(hash), do: "0x" <> Base.encode16(hash, case: :lower)
 
   defp redirect_search_results(%Address{} = item) do

From 9b557006b22bc800a9067fb176d42a4eb7d45649 Mon Sep 17 00:00:00 2001
From: Nikita Pozdniakov <nikitosing4@mail.ru>
Date: Mon, 19 Jun 2023 15:22:01 +0300
Subject: [PATCH 113/909] Changelog

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a94c786cf9b7..a513f81aaf76 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -37,7 +37,7 @@
 ### Chore
 
 - [#7699](https://github.com/blockscout/blockscout/pull/7699) - Add block_number index for address_coin_balances table
-- [#7666](https://github.com/blockscout/blockscout/pull/7666) - Search label query
+- [#7666](https://github.com/blockscout/blockscout/pull/7666), [#7740](https://github.com/blockscout/blockscout/pull/7740) - Search label query
 - [#7644](https://github.com/blockscout/blockscout/pull/7644) - Publish docker images CI for prod/staging branches
 - [#7594](https://github.com/blockscout/blockscout/pull/7594) - Stats service support in docker-compose config with new frontend
 - [#7576](https://github.com/blockscout/blockscout/pull/7576) - Check left blocks in pending block operations in order to decide, if we need to display indexing int tx banner at the top

From 3918862f5abe02ffa02311165340ac01d40aa640 Mon Sep 17 00:00:00 2001
From: nikitosing <32202610+nikitosing@users.noreply.github.com>
Date: Mon, 19 Jun 2023 16:54:04 +0300
Subject: [PATCH 114/909] =?UTF-8?q?Add=20interfaces=20field=20to=20vyper-m?=
 =?UTF-8?q?ultipart;=20Add=20/vyper-standard-input=20ve=E2=80=A6=20(#7665)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Add interfaces field to vyper-multipart; Add /vyper-standard-input verification

* Changelog

* Decode interfaces field

* Fix error field for vyper

* Parse compiler settings

* Fix compile error

* Complete PR

* Fix test

* Fix review

* VerificationController refactoring

* Fix tests
---
 CHANGELOG.md                                  |   1 +
 .../api/v2/verification_controller.ex         | 129 ++++++++++++------
 .../smart_contracts_api_v2_router.ex          |   1 +
 .../templates/address_contract/index.html.eex |   2 +-
 .../views/api/v2/smart_contract_view.ex       |   4 +-
 .../api/v2/smart_contract_controller_test.exs |   9 +-
 .../lib/explorer/chain/smart_contract.ex      |   6 +-
 .../rust_verifier_interface_behaviour.ex      |  25 +++-
 .../smart_contract/solidity/publish_helper.ex |   6 +-
 .../smart_contract/solidity/publisher.ex      |   4 +-
 .../smart_contract/vyper/publisher.ex         |  44 ++++--
 .../smart_contract/vyper/publisher_worker.ex  |  20 +--
 .../explorer/smart_contract/vyper/verifier.ex |  51 +++++--
 13 files changed, 209 insertions(+), 93 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b744f9c1196c..d65bd7343e5f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,7 @@
 
 ### Features
 
+- [#7665](https://github.com/blockscout/blockscout/pull/7665) - Add standard-json vyper verification
 - [#7685](https://github.com/blockscout/blockscout/pull/7685) - Add yul filter and "language" field for smart contracts
 - [#7653](https://github.com/blockscout/blockscout/pull/7653) - Add support for DEPOSIT and WITHDRAW token transfer event in older contracts
 - [#7628](https://github.com/blockscout/blockscout/pull/7628) - Support partially verified property from verifier MS; Add property to track contracts automatically verified via eth-bytecode-db
diff --git a/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/verification_controller.ex b/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/verification_controller.ex
index 2463d5792d82..49c98c5153ee 100644
--- a/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/verification_controller.ex
+++ b/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/verification_controller.ex
@@ -25,8 +25,10 @@ defmodule BlockScoutWeb.API.V2.VerificationController do
             do: ["sourcify" | &1],
             else: &1
           )).()
-      |> (&if(RustVerifierInterface.enabled?(), do: ["multi-part" | &1], else: &1)).()
-      |> (&if(RustVerifierInterface.enabled?(), do: ["vyper-multi-part" | &1], else: &1)).()
+      |> (&if(RustVerifierInterface.enabled?(),
+            do: ["multi-part", "vyper-multi-part", "vyper-standard-input"] ++ &1,
+            else: &1
+          )).()
 
     conn
     |> json(%{
@@ -44,10 +46,7 @@ defmodule BlockScoutWeb.API.V2.VerificationController do
         %{"address_hash" => address_hash_string, "compiler_version" => compiler_version, "source_code" => source_code} =
           params
       ) do
-    with {:format, {:ok, address_hash}} <- {:format, Chain.string_to_address_hash(address_hash_string)},
-         {:ok, false} <- AccessHelper.restricted_access?(address_hash_string, params),
-         {:already_verified, false} <-
-           {:already_verified, Chain.smart_contract_fully_verified?(address_hash, @api_true)} do
+    with :validated <- validate_address(params) do
       verification_params =
         %{
           "address_hash" => String.downcase(address_hash_string),
@@ -74,19 +73,11 @@ defmodule BlockScoutWeb.API.V2.VerificationController do
     end
   end
 
-  # sobelow_skip ["Traversal.FileModule"]
   def verification_via_standard_input(
         conn,
-        %{"address_hash" => address_hash_string, "files" => files, "compiler_version" => compiler_version} = params
+        %{"address_hash" => address_hash_string, "files" => _files, "compiler_version" => compiler_version} = params
       ) do
-    with {:format, {:ok, address_hash}} <- {:format, Chain.string_to_address_hash(address_hash_string)},
-         {:ok, false} <- AccessHelper.restricted_access?(address_hash_string, params),
-         {:already_verified, false} <-
-           {:already_verified, Chain.smart_contract_fully_verified?(address_hash, @api_true)},
-         files_array <- PublishHelper.prepare_files_array(files),
-         {:no_json_file, %Plug.Upload{path: path}} <-
-           {:no_json_file, PublishHelper.get_one_json(files_array)},
-         {:file_error, {:ok, json_input}} <- {:file_error, File.read(path)} do
+    with {:json_input, json_input} <- validate_params_standard_json_input(params) do
       verification_params =
         %{
           "address_hash" => String.downcase(address_hash_string),
@@ -107,10 +98,7 @@ defmodule BlockScoutWeb.API.V2.VerificationController do
   def verification_via_sourcify(conn, %{"address_hash" => address_hash_string, "files" => files} = params) do
     with {:not_found, true} <-
            {:not_found, Application.get_env(:explorer, Explorer.ThirdPartyIntegrations.Sourcify)[:enabled]},
-         {:format, {:ok, address_hash}} <- {:format, Chain.string_to_address_hash(address_hash_string)},
-         {:ok, false} <- AccessHelper.restricted_access?(address_hash_string, params),
-         {:already_verified, false} <-
-           {:already_verified, Chain.smart_contract_fully_verified?(address_hash, @api_true)},
+         :validated <- validate_address(params),
          files_array <- PublishHelper.prepare_files_array(files),
          {:no_json_file, %Plug.Upload{path: _path}} <-
            {:no_json_file, PublishHelper.get_one_json(files_array)},
@@ -132,11 +120,8 @@ defmodule BlockScoutWeb.API.V2.VerificationController do
         conn,
         %{"address_hash" => address_hash_string, "compiler_version" => compiler_version, "files" => files} = params
       ) do
-    with {:not_found, true} <- {:not_found, RustVerifierInterface.enabled?()},
-         {:format, {:ok, address_hash}} <- {:format, Chain.string_to_address_hash(address_hash_string)},
-         {:ok, false} <- AccessHelper.restricted_access?(address_hash_string, params),
-         {:already_verified, false} <-
-           {:already_verified, Chain.smart_contract_fully_verified?(address_hash, @api_true)},
+    with :verifier_enabled <- check_microservice(),
+         :validated <- validate_address(params),
          libraries <- Map.get(params, "libraries", "{}"),
          {:libs_format, {:ok, json}} <- {:libs_format, Jason.decode(libraries)} do
       verification_params =
@@ -154,7 +139,7 @@ defmodule BlockScoutWeb.API.V2.VerificationController do
 
       files_array =
         files
-        |> Map.values()
+        |> PublishHelper.prepare_files_array()
         |> PublishHelper.read_files()
 
       Que.add(SolidityPublisherWorker, {"multipart_api_v2", verification_params, files_array})
@@ -170,10 +155,7 @@ defmodule BlockScoutWeb.API.V2.VerificationController do
         %{"address_hash" => address_hash_string, "compiler_version" => compiler_version, "source_code" => source_code} =
           params
       ) do
-    with {:format, {:ok, address_hash}} <- {:format, Chain.string_to_address_hash(address_hash_string)},
-         {:ok, false} <- AccessHelper.restricted_access?(address_hash_string, params),
-         {:already_verified, false} <-
-           {:already_verified, Chain.smart_contract_fully_verified?(address_hash, @api_true)} do
+    with :validated <- validate_address(params) do
       verification_params =
         %{
           "address_hash" => String.downcase(address_hash_string),
@@ -182,9 +164,9 @@ defmodule BlockScoutWeb.API.V2.VerificationController do
         }
         |> Map.put("constructor_arguments", Map.get(params, "constructor_args", "") || "")
         |> Map.put("name", Map.get(params, "contract_name", "Vyper_contract"))
-        |> Map.put("evm_version", Map.get(params, "evm_version", "istanbul"))
+        |> Map.put("evm_version", Map.get(params, "evm_version"))
 
-      Que.add(VyperPublisherWorker, {address_hash_string, verification_params})
+      Que.add(VyperPublisherWorker, {"vyper_flattened", verification_params})
 
       conn
       |> put_view(ApiView)
@@ -196,28 +178,95 @@ defmodule BlockScoutWeb.API.V2.VerificationController do
         conn,
         %{"address_hash" => address_hash_string, "compiler_version" => compiler_version, "files" => files} = params
       ) do
-    with {:not_found, true} <- {:not_found, RustVerifierInterface.enabled?()},
-         {:format, {:ok, address_hash}} <- {:format, Chain.string_to_address_hash(address_hash_string)},
-         {:ok, false} <- AccessHelper.restricted_access?(address_hash_string, params),
-         {:already_verified, false} <-
-           {:already_verified, Chain.smart_contract_fully_verified?(address_hash, @api_true)} do
+    with :verifier_enabled <- check_microservice(),
+         :validated <- validate_address(params) do
+      interfaces = parse_interfaces(params["interfaces"])
+
       verification_params =
         %{
           "address_hash" => String.downcase(address_hash_string),
           "compiler_version" => compiler_version
         }
-        |> Map.put("evm_version", Map.get(params, "evm_version", "istanbul"))
+        |> Map.put("evm_version", Map.get(params, "evm_version"))
+        |> Map.put("interfaces", interfaces)
 
       files_array =
         files
-        |> Map.values()
+        |> PublishHelper.prepare_files_array()
         |> PublishHelper.read_files()
 
-      Que.add(VyperPublisherWorker, {address_hash_string, verification_params, files_array})
+      Que.add(VyperPublisherWorker, {"vyper_multipart", verification_params, files_array})
 
       conn
       |> put_view(ApiView)
       |> render(:message, %{message: "Verification started"})
     end
   end
+
+  def verification_via_vyper_standard_input(
+        conn,
+        %{"address_hash" => address_hash_string, "files" => _files, "compiler_version" => compiler_version} = params
+      ) do
+    with :verifier_enabled <- check_microservice(),
+         {:json_input, json_input} <- validate_params_standard_json_input(params) do
+      verification_params = %{
+        "address_hash" => String.downcase(address_hash_string),
+        "compiler_version" => compiler_version,
+        "input" => json_input
+      }
+
+      Que.add(VyperPublisherWorker, {"vyper_standard_json", verification_params})
+
+      conn
+      |> put_view(ApiView)
+      |> render(:message, %{message: "Verification started"})
+    end
+  end
+
+  defp parse_interfaces(interfaces) do
+    cond do
+      is_binary(interfaces) ->
+        case Jason.decode(interfaces) do
+          {:ok, map} ->
+            map
+
+          _ ->
+            nil
+        end
+
+      is_map(interfaces) ->
+        interfaces
+        |> PublishHelper.prepare_files_array()
+        |> PublishHelper.read_files()
+
+      true ->
+        nil
+    end
+  end
+
+  # sobelow_skip ["Traversal.FileModule"]
+  defp validate_params_standard_json_input(%{"files" => files} = params) do
+    with :validated <- validate_address(params),
+         files_array <- PublishHelper.prepare_files_array(files),
+         {:no_json_file, %Plug.Upload{path: path}} <-
+           {:no_json_file, PublishHelper.get_one_json(files_array)},
+         {:file_error, {:ok, json_input}} <- {:file_error, File.read(path)} do
+      {:json_input, json_input}
+    end
+  end
+
+  defp validate_address(%{"address_hash" => address_hash_string} = params) do
+    with {:format, {:ok, address_hash}} <- {:format, Chain.string_to_address_hash(address_hash_string)},
+         {:ok, false} <- AccessHelper.restricted_access?(address_hash_string, params),
+         {:already_verified, false} <-
+           {:already_verified, Chain.smart_contract_fully_verified?(address_hash, @api_true)} do
+      :validated
+    end
+  end
+
+  defp check_microservice do
+    with {:not_found, true} <- {:not_found, RustVerifierInterface.enabled?()} do
+      :verifier_enabled
+    end
+  end
 end
diff --git a/apps/block_scout_web/lib/block_scout_web/smart_contracts_api_v2_router.ex b/apps/block_scout_web/lib/block_scout_web/smart_contracts_api_v2_router.ex
index a9d698b234d2..d3f1d5e162f7 100644
--- a/apps/block_scout_web/lib/block_scout_web/smart_contracts_api_v2_router.ex
+++ b/apps/block_scout_web/lib/block_scout_web/smart_contracts_api_v2_router.ex
@@ -37,6 +37,7 @@ defmodule BlockScoutWeb.SmartContractsApiV2Router do
       post("/multi-part", V2.VerificationController, :verification_via_multi_part)
       post("/vyper-code", V2.VerificationController, :verification_via_vyper_code)
       post("/vyper-multi-part", V2.VerificationController, :verification_via_vyper_multipart)
+      post("/vyper-standard-input", V2.VerificationController, :verification_via_vyper_standard_input)
     end
   end
 end
diff --git a/apps/block_scout_web/lib/block_scout_web/templates/address_contract/index.html.eex b/apps/block_scout_web/lib/block_scout_web/templates/address_contract/index.html.eex
index c8daa4c5af23..658acfd417b4 100644
--- a/apps/block_scout_web/lib/block_scout_web/templates/address_contract/index.html.eex
+++ b/apps/block_scout_web/lib/block_scout_web/templates/address_contract/index.html.eex
@@ -66,7 +66,7 @@
             <div class="d-none d-sm-block d-md-none"></br></br></div>
             <div class="d-block d-sm-none"></br></br></div>
             <dt class="col-md-2 text-muted"><%= gettext "Optimization enabled" %></dt>
-            <dd class="col-md-4"><%= if target_contract.is_vyper_contract, do: "N/A", else: format_optimization_text(target_contract.optimization) %></dd>
+            <dd class="col-md-4"><%= format_optimization_text(target_contract.optimization) %></dd>
           </dl>
           <dl class="row">
             <dt class="col-md-2 text-muted"><%= gettext "Compiler version" %></dt>
diff --git a/apps/block_scout_web/lib/block_scout_web/views/api/v2/smart_contract_view.ex b/apps/block_scout_web/lib/block_scout_web/views/api/v2/smart_contract_view.ex
index 367b114e3d30..10bdfd12a871 100644
--- a/apps/block_scout_web/lib/block_scout_web/views/api/v2/smart_contract_view.ex
+++ b/apps/block_scout_web/lib/block_scout_web/views/api/v2/smart_contract_view.ex
@@ -164,7 +164,7 @@ defmodule BlockScoutWeb.API.V2.SmartContractView do
         visualize_sol2uml_enabled && !target_contract.is_vyper_contract && !is_nil(target_contract.abi),
       "name" => target_contract && target_contract.name,
       "compiler_version" => target_contract.compiler_version,
-      "optimization_enabled" => if(target_contract.is_vyper_contract, do: nil, else: target_contract.optimization),
+      "optimization_enabled" => target_contract.optimization,
       "optimization_runs" => target_contract.optimization_runs,
       "evm_version" => target_contract.evm_version,
       "verified_at" => target_contract.inserted_at,
@@ -256,7 +256,7 @@ defmodule BlockScoutWeb.API.V2.SmartContractView do
     %{
       "address" => Helper.address_with_info(nil, smart_contract.address, smart_contract.address.hash),
       "compiler_version" => smart_contract.compiler_version,
-      "optimization_enabled" => if(smart_contract.is_vyper_contract, do: nil, else: smart_contract.optimization),
+      "optimization_enabled" => smart_contract.optimization,
       "tx_count" => smart_contract.address.transactions_count,
       "language" => smart_contract_language(smart_contract),
       "verified_at" => smart_contract.inserted_at,
diff --git a/apps/block_scout_web/test/block_scout_web/controllers/api/v2/smart_contract_controller_test.exs b/apps/block_scout_web/test/block_scout_web/controllers/api/v2/smart_contract_controller_test.exs
index 218e60156bc1..12dd8c8c5f4b 100644
--- a/apps/block_scout_web/test/block_scout_web/controllers/api/v2/smart_contract_controller_test.exs
+++ b/apps/block_scout_web/test/block_scout_web/controllers/api/v2/smart_contract_controller_test.exs
@@ -92,7 +92,7 @@ defmodule BlockScoutWeb.API.V2.SmartContractControllerTest do
         "can_be_visualized_via_sol2uml" => false,
         "name" => target_contract && target_contract.name,
         "compiler_version" => target_contract.compiler_version,
-        "optimization_enabled" => if(target_contract.is_vyper_contract, do: nil, else: target_contract.optimization),
+        "optimization_enabled" => target_contract.optimization,
         "optimization_runs" => target_contract.optimization_runs,
         "evm_version" => target_contract.evm_version,
         "verified_at" => target_contract.inserted_at |> to_string() |> String.replace(" ", "T"),
@@ -180,7 +180,7 @@ defmodule BlockScoutWeb.API.V2.SmartContractControllerTest do
         "can_be_visualized_via_sol2uml" => false,
         "name" => target_contract && target_contract.name,
         "compiler_version" => target_contract.compiler_version,
-        "optimization_enabled" => if(target_contract.is_vyper_contract, do: nil, else: target_contract.optimization),
+        "optimization_enabled" => target_contract.optimization,
         "optimization_runs" => target_contract.optimization_runs,
         "evm_version" => target_contract.evm_version,
         "verified_at" => target_contract.inserted_at |> to_string() |> String.replace(" ", "T"),
@@ -277,7 +277,7 @@ defmodule BlockScoutWeb.API.V2.SmartContractControllerTest do
         "can_be_visualized_via_sol2uml" => false,
         "name" => target_contract && target_contract.name,
         "compiler_version" => target_contract.compiler_version,
-        "optimization_enabled" => if(target_contract.is_vyper_contract, do: nil, else: target_contract.optimization),
+        "optimization_enabled" => target_contract.optimization,
         "optimization_runs" => target_contract.optimization_runs,
         "evm_version" => target_contract.evm_version,
         "verified_at" => target_contract.inserted_at |> to_string() |> String.replace(" ", "T"),
@@ -1966,8 +1966,7 @@ defmodule BlockScoutWeb.API.V2.SmartContractControllerTest do
   defp compare_item(%SmartContract{} = smart_contract, json) do
     assert smart_contract.compiler_version == json["compiler_version"]
 
-    assert if(smart_contract.is_vyper_contract, do: nil, else: smart_contract.optimization) ==
-             json["optimization_enabled"]
+    assert smart_contract.optimization == json["optimization_enabled"]
 
     assert json["language"] == if(smart_contract.is_vyper_contract, do: "vyper", else: "solidity")
     assert json["verified_at"]
diff --git a/apps/explorer/lib/explorer/chain/smart_contract.ex b/apps/explorer/lib/explorer/chain/smart_contract.ex
index 8622c9adb848..d2440d666327 100644
--- a/apps/explorer/lib/explorer/chain/smart_contract.ex
+++ b/apps/explorer/lib/explorer/chain/smart_contract.ex
@@ -332,7 +332,7 @@ defmodule Explorer.Chain.SmartContract do
         attrs,
         error,
         error_message,
-        json_verification \\ false
+        verification_with_files? \\ false
       ) do
     validated =
       smart_contract
@@ -356,12 +356,12 @@ defmodule Explorer.Chain.SmartContract do
         :autodetect_constructor_args,
         :verified_via_eth_bytecode_db
       ])
-      |> (&if(json_verification,
+      |> (&if(verification_with_files?,
             do: &1,
             else: validate_required(&1, [:compiler_version, :optimization, :address_hash, :contract_code_md5])
           )).()
 
-    field_to_put_message = if json_verification, do: :files, else: select_error_field(error)
+    field_to_put_message = if verification_with_files?, do: :files, else: select_error_field(error)
 
     if error_message do
       add_error(validated, field_to_put_message, error_message(error, error_message))
diff --git a/apps/explorer/lib/explorer/smart_contract/rust_verifier_interface_behaviour.ex b/apps/explorer/lib/explorer/smart_contract/rust_verifier_interface_behaviour.ex
index 4665de0d1cdb..b96f7eca3425 100644
--- a/apps/explorer/lib/explorer/smart_contract/rust_verifier_interface_behaviour.ex
+++ b/apps/explorer/lib/explorer/smart_contract/rust_verifier_interface_behaviour.ex
@@ -3,6 +3,7 @@ defmodule Explorer.SmartContract.RustVerifierInterfaceBehaviour do
     This behaviour module was created in order to add possibility to extend the functionality of RustVerifierInterface
   """
   defmacro __using__(_) do
+    # credo:disable-for-next-line
     quote([]) do
       alias Explorer.Utility.RustService
       alias HTTPoison.Response
@@ -23,7 +24,7 @@ defmodule Explorer.SmartContract.RustVerifierInterfaceBehaviour do
             } = body,
             address_hash
           ) do
-        http_post_request(multiple_files_verification_url(), append_metadata(body, address_hash))
+        http_post_request(solidity_multiple_files_verification_url(), append_metadata(body, address_hash))
       end
 
       def verify_standard_json_input(
@@ -35,7 +36,7 @@ defmodule Explorer.SmartContract.RustVerifierInterfaceBehaviour do
             } = body,
             address_hash
           ) do
-        http_post_request(standard_json_input_verification_url(), append_metadata(body, address_hash))
+        http_post_request(solidity_standard_json_verification_url(), append_metadata(body, address_hash))
       end
 
       def vyper_verify_multipart(
@@ -50,6 +51,18 @@ defmodule Explorer.SmartContract.RustVerifierInterfaceBehaviour do
         http_post_request(vyper_multiple_files_verification_url(), append_metadata(body, address_hash))
       end
 
+      def vyper_verify_standard_json(
+            %{
+              "bytecode" => _,
+              "bytecodeType" => _,
+              "compilerVersion" => _,
+              "input" => _
+            } = body,
+            address_hash
+          ) do
+        http_post_request(vyper_standard_json_verification_url(), append_metadata(body, address_hash))
+      end
+
       def http_post_request(url, body) do
         headers = [{"Content-Type", "application/json"}]
 
@@ -127,11 +140,15 @@ defmodule Explorer.SmartContract.RustVerifierInterfaceBehaviour do
 
       def process_verifier_response(other), do: {:error, other}
 
-      def multiple_files_verification_url, do: "#{base_api_url()}" <> "/verifier/solidity/sources:verify-multi-part"
+      def solidity_multiple_files_verification_url,
+        do: "#{base_api_url()}" <> "/verifier/solidity/sources:verify-multi-part"
 
       def vyper_multiple_files_verification_url, do: "#{base_api_url()}" <> "/verifier/vyper/sources:verify-multi-part"
 
-      def standard_json_input_verification_url,
+      def vyper_standard_json_verification_url,
+        do: "#{base_api_url()}" <> "/verifier/vyper/sources:verify-standard-json"
+
+      def solidity_standard_json_verification_url,
         do: "#{base_api_url()}" <> "/verifier/solidity/sources:verify-standard-json"
 
       def versions_list_url, do: "#{base_api_url()}" <> "/verifier/solidity/versions"
diff --git a/apps/explorer/lib/explorer/smart_contract/solidity/publish_helper.ex b/apps/explorer/lib/explorer/smart_contract/solidity/publish_helper.ex
index 54a996ee8285..dfa4dfb120d5 100644
--- a/apps/explorer/lib/explorer/smart_contract/solidity/publish_helper.ex
+++ b/apps/explorer/lib/explorer/smart_contract/solidity/publish_helper.ex
@@ -88,9 +88,9 @@ defmodule Explorer.SmartContract.Solidity.PublishHelper do
     )
   end
 
-  def prepare_files_array(files) do
-    if is_map(files), do: Enum.map(files, fn {_, file} -> file end), else: []
-  end
+  def prepare_files_array(files) when is_map(files), do: Map.values(files)
+
+  def prepare_files_array(_), do: []
 
   def get_one_json(files_array) do
     files_array
diff --git a/apps/explorer/lib/explorer/smart_contract/solidity/publisher.ex b/apps/explorer/lib/explorer/smart_contract/solidity/publisher.ex
index 0c7ba9c4c5df..96455e7c327c 100644
--- a/apps/explorer/lib/explorer/smart_contract/solidity/publisher.ex
+++ b/apps/explorer/lib/explorer/smart_contract/solidity/publisher.ex
@@ -194,7 +194,7 @@ defmodule Explorer.SmartContract.Solidity.Publisher do
     end
   end
 
-  defp unverified_smart_contract(address_hash, params, error, error_message, json_verification \\ false) do
+  defp unverified_smart_contract(address_hash, params, error, error_message, verification_with_files? \\ false) do
     attrs =
       address_hash
       |> attributes(params)
@@ -206,7 +206,7 @@ defmodule Explorer.SmartContract.Solidity.Publisher do
         attrs,
         error,
         error_message,
-        json_verification
+        verification_with_files?
       )
 
     %{changeset | action: :insert}
diff --git a/apps/explorer/lib/explorer/smart_contract/vyper/publisher.ex b/apps/explorer/lib/explorer/smart_contract/vyper/publisher.ex
index 4efb0798b888..4630a3ad8ac3 100644
--- a/apps/explorer/lib/explorer/smart_contract/vyper/publisher.ex
+++ b/apps/explorer/lib/explorer/smart_contract/vyper/publisher.ex
@@ -24,7 +24,7 @@ defmodule Explorer.SmartContract.Vyper.Publisher do
           "compilerSettings" => _compiler_settings_string
         } = source
       } ->
-        process_rust_verifier_response(source, address_hash, false)
+        process_rust_verifier_response(source, address_hash, false, false)
 
       {:ok, %{abi: abi}} ->
         publish_smart_contract(address_hash, params, abi)
@@ -38,7 +38,15 @@ defmodule Explorer.SmartContract.Vyper.Publisher do
   end
 
   def publish(address_hash, params, files) do
-    case Verifier.evaluate_authenticity(address_hash, params, files) do
+    publish_inner(:evaluate_authenticity, [address_hash, params, files], address_hash, params, false)
+  end
+
+  def publish_standard_json(%{"address_hash" => address_hash} = params) do
+    publish_inner(:evaluate_authenticity_standard_json, [params], address_hash, params, true)
+  end
+
+  defp publish_inner(fun, args, address_hash, params, standard_json?) do
+    case apply(Verifier, fun, args) do
       {
         :ok,
         %{
@@ -51,16 +59,16 @@ defmodule Explorer.SmartContract.Vyper.Publisher do
           "compilerSettings" => _compiler_settings_string
         } = source
       } ->
-        process_rust_verifier_response(source, address_hash, true)
+        process_rust_verifier_response(source, address_hash, true, standard_json?)
 
       {:ok, %{abi: abi}} ->
         publish_smart_contract(address_hash, params, abi)
 
       {:error, error} ->
-        {:error, unverified_smart_contract(address_hash, params, error, nil)}
+        {:error, unverified_smart_contract(address_hash, params, error, nil, true)}
 
       _ ->
-        {:error, unverified_smart_contract(address_hash, params, "Unexpected error", nil)}
+        {:error, unverified_smart_contract(address_hash, params, "Unexpected error", nil, true)}
     end
   end
 
@@ -77,6 +85,7 @@ defmodule Explorer.SmartContract.Vyper.Publisher do
         },
         address_hash,
         save_file_path?,
+        standard_json?,
         automatically_verified? \\ false
       ) do
     secondary_sources =
@@ -97,9 +106,14 @@ defmodule Explorer.SmartContract.Vyper.Publisher do
       |> Map.put("name", contract_name)
       |> Map.put("file_path", if(save_file_path?, do: file_name))
       |> Map.put("secondary_sources", secondary_sources)
-      |> Map.put("evm_version", compiler_settings["evmVersion"] || "istanbul")
+      |> Map.put("evm_version", compiler_settings["evmVersion"])
       |> Map.put("partially_verified", match_type == "PARTIAL")
       |> Map.put("verified_via_eth_bytecode_db", automatically_verified?)
+      |> Map.put(
+        "optimization",
+        if(is_nil(compiler_settings["optimize"]), do: true, else: compiler_settings["optimize"])
+      )
+      |> Map.put("compiler_settings", if(standard_json?, do: compiler_settings))
 
     publish_smart_contract(address_hash, prepared_params, Jason.decode!(abi_string))
   end
@@ -110,7 +124,7 @@ defmodule Explorer.SmartContract.Vyper.Publisher do
     Chain.create_smart_contract(attrs, attrs.external_libraries, attrs.secondary_sources)
   end
 
-  defp unverified_smart_contract(address_hash, params, error, error_message) do
+  defp unverified_smart_contract(address_hash, params, error, error_message, verification_with_files? \\ false) do
     attrs = attributes(address_hash, params)
 
     changeset =
@@ -118,7 +132,8 @@ defmodule Explorer.SmartContract.Vyper.Publisher do
         %SmartContract{address_hash: address_hash},
         attrs,
         error,
-        error_message
+        error_message,
+        verification_with_files?
       )
 
     %{changeset | action: :insert}
@@ -126,6 +141,7 @@ defmodule Explorer.SmartContract.Vyper.Publisher do
 
   defp attributes(address_hash, params, abi \\ %{}) do
     constructor_arguments = params["constructor_arguments"]
+    compiler_settings = params["compiler_settings"]
 
     clean_constructor_arguments =
       if constructor_arguments != nil && constructor_arguments != "" do
@@ -134,6 +150,13 @@ defmodule Explorer.SmartContract.Vyper.Publisher do
         nil
       end
 
+    clean_compiler_settings =
+      if compiler_settings in ["", nil, %{}] do
+        nil
+      else
+        compiler_settings
+      end
+
     compiler_version = CompilerVersion.get_strict_compiler_version(:vyper, params["compiler_version"])
 
     %{
@@ -142,7 +165,7 @@ defmodule Explorer.SmartContract.Vyper.Publisher do
       compiler_version: compiler_version,
       evm_version: params["evm_version"],
       optimization_runs: nil,
-      optimization: false,
+      optimization: params["optimization"] || false,
       contract_source_code: params["contract_source_code"],
       constructor_arguments: clean_constructor_arguments,
       external_libraries: [],
@@ -152,7 +175,8 @@ defmodule Explorer.SmartContract.Vyper.Publisher do
       partially_verified: params["partially_verified"] || false,
       is_vyper_contract: true,
       file_path: params["file_path"],
-      verified_via_eth_bytecode_db: params["verified_via_eth_bytecode_db"] || false
+      verified_via_eth_bytecode_db: params["verified_via_eth_bytecode_db"] || false,
+      compiler_settings: clean_compiler_settings
     }
   end
 end
diff --git a/apps/explorer/lib/explorer/smart_contract/vyper/publisher_worker.ex b/apps/explorer/lib/explorer/smart_contract/vyper/publisher_worker.ex
index fe77a8e246db..45b8feccffa9 100644
--- a/apps/explorer/lib/explorer/smart_contract/vyper/publisher_worker.ex
+++ b/apps/explorer/lib/explorer/smart_contract/vyper/publisher_worker.ex
@@ -8,21 +8,25 @@ defmodule Explorer.SmartContract.Vyper.PublisherWorker do
   alias Explorer.Chain.Events.Publisher, as: EventsPublisher
   alias Explorer.SmartContract.Vyper.Publisher
 
-  def perform({address_hash, params, %Plug.Conn{} = conn}) do
-    broadcast(address_hash, [address_hash, params], conn)
+  def perform({"vyper_standard_json", params}) do
+    broadcast(params["address_hash"], [params], :publish_standard_json)
+  end
+
+  def perform({"vyper_multipart", params, files}) do
+    broadcast(params["address_hash"], [params["address_hash"], params, files], :publish)
   end
 
-  def perform({address_hash, params, files}) do
-    broadcast(address_hash, [address_hash, params, files])
+  def perform({"vyper_flattened", params}) do
+    broadcast(params["address_hash"], [params["address_hash"], params], :publish)
   end
 
-  def perform({address_hash, params}) do
-    broadcast(address_hash, [address_hash, params])
+  def perform({address_hash, params, %Plug.Conn{} = conn}) do
+    broadcast(address_hash, [address_hash, params], :publish, conn)
   end
 
-  defp broadcast(address_hash, args, conn \\ nil) do
+  defp broadcast(address_hash, args, function, conn \\ nil) do
     result =
-      case apply(Publisher, :publish, args) do
+      case apply(Publisher, function, args) do
         {:ok, _contract} = result ->
           result
 
diff --git a/apps/explorer/lib/explorer/smart_contract/vyper/verifier.ex b/apps/explorer/lib/explorer/smart_contract/vyper/verifier.ex
index 3042d0e5eeef..162e83a6e6cf 100644
--- a/apps/explorer/lib/explorer/smart_contract/vyper/verifier.ex
+++ b/apps/explorer/lib/explorer/smart_contract/vyper/verifier.ex
@@ -34,11 +34,7 @@ defmodule Explorer.SmartContract.Vyper.Verifier do
   def evaluate_authenticity(address_hash, params, files) do
     try do
       if RustVerifierInterface.enabled?() do
-        deployed_bytecode = Chain.smart_contract_bytecode(address_hash)
-
-        creation_tx_input = contract_creation_input(address_hash)
-
-        vyper_verify_multipart(params, creation_tx_input, deployed_bytecode, params["evm_version"], files, address_hash)
+        vyper_verify_multipart(params, fetch_bytecode(address_hash), params["evm_version"], files, address_hash)
       end
     rescue
       exception ->
@@ -51,15 +47,26 @@ defmodule Explorer.SmartContract.Vyper.Verifier do
     end
   end
 
-  defp evaluate_authenticity_inner(true, address_hash, params) do
-    deployed_bytecode = Chain.smart_contract_bytecode(address_hash)
-
-    creation_tx_input = contract_creation_input(address_hash)
+  def evaluate_authenticity_standard_json(%{"address_hash" => address_hash} = params) do
+    try do
+      if RustVerifierInterface.enabled?() do
+        vyper_verify_standard_json(params, fetch_bytecode(address_hash), address_hash)
+      end
+    rescue
+      exception ->
+        Logger.error(fn ->
+          [
+            "Error while verifying standard-json vyper smart-contract address: #{address_hash}, params: #{inspect(params, limit: :infinity, printable_limit: :infinity)}: ",
+            Exception.format(:error, exception)
+          ]
+        end)
+    end
+  end
 
+  defp evaluate_authenticity_inner(true, address_hash, params) do
     vyper_verify_multipart(
       params,
-      creation_tx_input,
-      deployed_bytecode,
+      fetch_bytecode(address_hash),
       params["evm_version"],
       %{
         "#{params["name"]}.vy" => params["contract_source_code"]
@@ -72,6 +79,13 @@ defmodule Explorer.SmartContract.Vyper.Verifier do
     verify(address_hash, params)
   end
 
+  def fetch_bytecode(address_hash) do
+    deployed_bytecode = Chain.smart_contract_bytecode(address_hash)
+    creation_tx_input = contract_creation_input(address_hash)
+
+    prepare_bytecode_for_microservice(%{}, creation_tx_input, deployed_bytecode)
+  end
+
   defp verify(address_hash, params) do
     contract_source_code = Map.fetch!(params, "contract_source_code")
     compiler_version = Map.fetch!(params, "compiler_version")
@@ -109,12 +123,19 @@ defmodule Explorer.SmartContract.Vyper.Verifier do
     end
   end
 
-  defp vyper_verify_multipart(params, creation_tx_input, deployed_bytecode, evm_version, files, address_hash) do
-    %{}
-    |> prepare_bytecode_for_microservice(creation_tx_input, deployed_bytecode)
-    |> Map.put("evmVersion", evm_version || "istanbul")
+  defp vyper_verify_multipart(params, bytecode_map, evm_version, files, address_hash) do
+    bytecode_map
+    |> Map.put("evmVersion", evm_version)
     |> Map.put("sourceFiles", files)
     |> Map.put("compilerVersion", params["compiler_version"])
+    |> Map.put("interfaces", params["interfaces"])
     |> RustVerifierInterface.vyper_verify_multipart(address_hash)
   end
+
+  defp vyper_verify_standard_json(params, bytecode_map, address_hash) do
+    bytecode_map
+    |> Map.put("compilerVersion", params["compiler_version"])
+    |> Map.put("input", params["input"])
+    |> RustVerifierInterface.vyper_verify_standard_json(address_hash)
+  end
 end

From 663d6ab644a3dbdeaf4b57e6d67355259bc6a83d Mon Sep 17 00:00:00 2001
From: nikitosing <32202610+nikitosing@users.noreply.github.com>
Date: Mon, 19 Jun 2023 17:12:35 +0300
Subject: [PATCH 115/909] Add test for label search (#7741)

* Add test for label search

* Changelog
---
 CHANGELOG.md                                    |  2 +-
 .../api/v2/search_controller_test.exs           | 17 +++++++++++++++++
 apps/explorer/lib/explorer/tags/address_tag.ex  |  4 +---
 apps/explorer/test/support/factory.ex           | 12 +++++++++++-
 4 files changed, 30 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d65bd7343e5f..96fd28fc085e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -39,7 +39,7 @@
 ### Chore
 
 - [#7699](https://github.com/blockscout/blockscout/pull/7699) - Add block_number index for address_coin_balances table
-- [#7666](https://github.com/blockscout/blockscout/pull/7666), [#7740](https://github.com/blockscout/blockscout/pull/7740) - Search label query
+- [#7666](https://github.com/blockscout/blockscout/pull/7666), [#7740](https://github.com/blockscout/blockscout/pull/7740), [#7741](https://github.com/blockscout/blockscout/pull/7741) - Search label query
 - [#7644](https://github.com/blockscout/blockscout/pull/7644) - Publish docker images CI for prod/staging branches
 - [#7594](https://github.com/blockscout/blockscout/pull/7594) - Stats service support in docker-compose config with new frontend
 - [#7576](https://github.com/blockscout/blockscout/pull/7576) - Check left blocks in pending block operations in order to decide, if we need to display indexing int tx banner at the top
diff --git a/apps/block_scout_web/test/block_scout_web/controllers/api/v2/search_controller_test.exs b/apps/block_scout_web/test/block_scout_web/controllers/api/v2/search_controller_test.exs
index 82d9e08f8481..0f483454a45b 100644
--- a/apps/block_scout_web/test/block_scout_web/controllers/api/v2/search_controller_test.exs
+++ b/apps/block_scout_web/test/block_scout_web/controllers/api/v2/search_controller_test.exs
@@ -143,6 +143,23 @@ defmodule BlockScoutWeb.API.V2.SearchControllerTest do
       assert item["tx_hash"] == to_string(tx.hash)
       assert item["url"] =~ to_string(tx.hash)
     end
+
+    test "search tags", %{conn: conn} do
+      tag = insert(:address_to_tag)
+
+      request = get(conn, "/api/v2/search?q=#{tag.tag.display_name}")
+      assert response = json_response(request, 200)
+
+      assert Enum.count(response["items"]) == 1
+      assert response["next_page_params"] == nil
+
+      item = Enum.at(response["items"], 0)
+
+      assert item["type"] == "label"
+      assert item["address"] == Address.checksum(tag.address.hash)
+      assert item["name"] == tag.tag.display_name
+      assert item["url"] =~ Address.checksum(tag.address.hash)
+    end
   end
 
   describe "/search/check-redirect" do
diff --git a/apps/explorer/lib/explorer/tags/address_tag.ex b/apps/explorer/lib/explorer/tags/address_tag.ex
index 617423560881..cfb61d3324b7 100644
--- a/apps/explorer/lib/explorer/tags/address_tag.ex
+++ b/apps/explorer/lib/explorer/tags/address_tag.ex
@@ -12,14 +12,13 @@ defmodule Explorer.Tags.AddressTag do
       from: 2
     ]
 
-  alias Explorer.Chain.Address
   alias Explorer.Repo
   alias Explorer.Tags.{AddressTag, AddressToTag}
 
   @typedoc """
   * `:id` - id of Tag
   * `:label` - Tag's label
-  * `:label` - Label's display name
+  * `:display_name` - Label's display name
   """
   @type t :: %AddressTag{
           label: String.t()
@@ -28,7 +27,6 @@ defmodule Explorer.Tags.AddressTag do
   schema "address_tags" do
     field(:label, :string)
     field(:display_name, :string)
-    has_many(:addresses, Address, foreign_key: :hash)
     has_many(:tag_id, AddressToTag, foreign_key: :id)
 
     timestamps()
diff --git a/apps/explorer/test/support/factory.ex b/apps/explorer/test/support/factory.ex
index 0c2004ba7aa8..c05d0f7077ea 100644
--- a/apps/explorer/test/support/factory.ex
+++ b/apps/explorer/test/support/factory.ex
@@ -44,7 +44,7 @@ defmodule Explorer.Factory do
   }
 
   alias Explorer.SmartContract.Helper
-
+  alias Explorer.Tags.{AddressTag, AddressToTag}
   alias Explorer.Market.MarketHistory
   alias Explorer.Repo
 
@@ -140,6 +140,16 @@ defmodule Explorer.Factory do
     %{"name" => sequence("name"), "transaction_hash" => to_string(insert(:transaction).hash)}
   end
 
+  def address_to_tag_factory do
+    %AddressToTag{
+      tag: %AddressTag{
+        label: sequence("label"),
+        display_name: sequence("display_name")
+      },
+      address: build(:address)
+    }
+  end
+
   def account_watchlist_address_factory do
     hash = build(:address).hash
 

From 3ede929f4ee41055c461d5fb7b77828f4dceb009 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 19 Jun 2023 19:13:37 +0000
Subject: [PATCH 116/909] Bump eslint from 8.42.0 to 8.43.0 in
 /apps/block_scout_web/assets

Bumps [eslint](https://github.com/eslint/eslint) from 8.42.0 to 8.43.0.
- [Release notes](https://github.com/eslint/eslint/releases)
- [Changelog](https://github.com/eslint/eslint/blob/main/CHANGELOG.md)
- [Commits](https://github.com/eslint/eslint/compare/v8.42.0...v8.43.0)

---
updated-dependencies:
- dependency-name: eslint
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 apps/block_scout_web/assets/package-lock.json | 30 +++++++++----------
 apps/block_scout_web/assets/package.json      |  2 +-
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/apps/block_scout_web/assets/package-lock.json b/apps/block_scout_web/assets/package-lock.json
index 34daccd80b7b..6355d389938d 100644
--- a/apps/block_scout_web/assets/package-lock.json
+++ b/apps/block_scout_web/assets/package-lock.json
@@ -78,7 +78,7 @@
         "copy-webpack-plugin": "^11.0.0",
         "css-loader": "^5.2.7",
         "css-minimizer-webpack-plugin": "^5.0.1",
-        "eslint": "^8.42.0",
+        "eslint": "^8.43.0",
         "eslint-config-standard": "^17.1.0",
         "eslint-plugin-import": "^2.27.5",
         "eslint-plugin-node": "^11.1.0",
@@ -2140,9 +2140,9 @@
       }
     },
     "node_modules/@eslint/js": {
-      "version": "8.42.0",
-      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.42.0.tgz",
-      "integrity": "sha512-6SWlXpWU5AvId8Ac7zjzmIOqMOba/JWY8XZ4A7q7Gn1Vlfg/SFFIlrtHXt9nPn4op9ZPAkl91Jao+QQv3r/ukw==",
+      "version": "8.43.0",
+      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.43.0.tgz",
+      "integrity": "sha512-s2UHCoiXfxMvmfzqoN+vrQ84ahUSYde9qNO1MdxmoEhyHWsfmwOpFlwYV+ePJEVc7gFnATGUi376WowX1N7tFg==",
       "dev": true,
       "engines": {
         "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
@@ -7114,15 +7114,15 @@
       }
     },
     "node_modules/eslint": {
-      "version": "8.42.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.42.0.tgz",
-      "integrity": "sha512-ulg9Ms6E1WPf67PHaEY4/6E2tEn5/f7FXGzr3t9cBMugOmf1INYvuUwwh1aXQN4MfJ6a5K2iNwP3w4AColvI9A==",
+      "version": "8.43.0",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.43.0.tgz",
+      "integrity": "sha512-aaCpf2JqqKesMFGgmRPessmVKjcGXqdlAYLLC3THM8t5nBRZRQ+st5WM/hoJXkdioEXLLbXgclUpM0TXo5HX5Q==",
       "dev": true,
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.2.0",
         "@eslint-community/regexpp": "^4.4.0",
         "@eslint/eslintrc": "^2.0.3",
-        "@eslint/js": "8.42.0",
+        "@eslint/js": "8.43.0",
         "@humanwhocodes/config-array": "^0.11.10",
         "@humanwhocodes/module-importer": "^1.0.1",
         "@nodelib/fs.walk": "^1.2.8",
@@ -18938,9 +18938,9 @@
       }
     },
     "@eslint/js": {
-      "version": "8.42.0",
-      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.42.0.tgz",
-      "integrity": "sha512-6SWlXpWU5AvId8Ac7zjzmIOqMOba/JWY8XZ4A7q7Gn1Vlfg/SFFIlrtHXt9nPn4op9ZPAkl91Jao+QQv3r/ukw==",
+      "version": "8.43.0",
+      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.43.0.tgz",
+      "integrity": "sha512-s2UHCoiXfxMvmfzqoN+vrQ84ahUSYde9qNO1MdxmoEhyHWsfmwOpFlwYV+ePJEVc7gFnATGUi376WowX1N7tFg==",
       "dev": true
     },
     "@ethereumjs/common": {
@@ -22769,15 +22769,15 @@
       }
     },
     "eslint": {
-      "version": "8.42.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.42.0.tgz",
-      "integrity": "sha512-ulg9Ms6E1WPf67PHaEY4/6E2tEn5/f7FXGzr3t9cBMugOmf1INYvuUwwh1aXQN4MfJ6a5K2iNwP3w4AColvI9A==",
+      "version": "8.43.0",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.43.0.tgz",
+      "integrity": "sha512-aaCpf2JqqKesMFGgmRPessmVKjcGXqdlAYLLC3THM8t5nBRZRQ+st5WM/hoJXkdioEXLLbXgclUpM0TXo5HX5Q==",
       "dev": true,
       "requires": {
         "@eslint-community/eslint-utils": "^4.2.0",
         "@eslint-community/regexpp": "^4.4.0",
         "@eslint/eslintrc": "^2.0.3",
-        "@eslint/js": "8.42.0",
+        "@eslint/js": "8.43.0",
         "@humanwhocodes/config-array": "^0.11.10",
         "@humanwhocodes/module-importer": "^1.0.1",
         "@nodelib/fs.walk": "^1.2.8",
diff --git a/apps/block_scout_web/assets/package.json b/apps/block_scout_web/assets/package.json
index 126bc3fd3ce4..d41ed2f75506 100644
--- a/apps/block_scout_web/assets/package.json
+++ b/apps/block_scout_web/assets/package.json
@@ -90,7 +90,7 @@
     "copy-webpack-plugin": "^11.0.0",
     "css-loader": "^5.2.7",
     "css-minimizer-webpack-plugin": "^5.0.1",
-    "eslint": "^8.42.0",
+    "eslint": "^8.43.0",
     "eslint-config-standard": "^17.1.0",
     "eslint-plugin-import": "^2.27.5",
     "eslint-plugin-node": "^11.1.0",

From 095a0408894543ab3539f2118f672b7f76a095ee Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 19 Jun 2023 19:16:10 +0000
Subject: [PATCH 117/909] Bump cldr_utils from 2.24.0 to 2.24.1

Bumps [cldr_utils](https://github.com/elixir-cldr/cldr_utils) from 2.24.0 to 2.24.1.
- [Release notes](https://github.com/elixir-cldr/cldr_utils/releases)
- [Changelog](https://github.com/elixir-cldr/cldr_utils/blob/master/CHANGELOG.md)
- [Commits](https://github.com/elixir-cldr/cldr_utils/compare/v2.24.0...v2.24.1)

---
updated-dependencies:
- dependency-name: cldr_utils
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 mix.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mix.lock b/mix.lock
index 73a0172e54b4..6094ca8b3824 100644
--- a/mix.lock
+++ b/mix.lock
@@ -15,7 +15,7 @@
   "castore": {:hex, :castore, "1.0.3", "7130ba6d24c8424014194676d608cb989f62ef8039efd50ff4b3f33286d06db8", [:mix], [], "hexpm", "680ab01ef5d15b161ed6a95449fac5c6b8f60055677a8e79acf01b27baa4390b"},
   "cbor": {:hex, :cbor, "1.0.1", "39511158e8ea5a57c1fcb9639aaa7efde67129678fee49ebbda780f6f24959b0", [:mix], [], "hexpm", "5431acbe7a7908f17f6a9cd43311002836a34a8ab01876918d8cfb709cd8b6a2"},
   "certifi": {:hex, :certifi, "2.9.0", "6f2a475689dd47f19fb74334859d460a2dc4e3252a3324bd2111b8f0429e7e21", [:rebar3], [], "hexpm", "266da46bdb06d6c6d35fde799bcb28d36d985d424ad7c08b5bb48f5b5cdd4641"},
-  "cldr_utils": {:hex, :cldr_utils, "2.24.0", "5b356769f2baf9dd25b166e9f1b2a5ce955d5b556bc07f56c959cfff1ec9543e", [:mix], [{:castore, "~> 0.1 or ~> 1.0", [hex: :castore, repo: "hexpm", optional: true]}, {:certifi, "~> 2.5", [hex: :certifi, repo: "hexpm", optional: true]}, {:decimal, "~> 1.9 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: false]}], "hexpm", "3fde251e0bbbe473230561019dd6c2958d82a10c134bb5b8b4e21a694196cf85"},
+  "cldr_utils": {:hex, :cldr_utils, "2.24.1", "5ff8c8c55f96666228827bcf85a23d632022def200566346545d01d15e4c30dc", [:mix], [{:castore, "~> 0.1 or ~> 1.0", [hex: :castore, repo: "hexpm", optional: true]}, {:certifi, "~> 2.5", [hex: :certifi, repo: "hexpm", optional: true]}, {:decimal, "~> 1.9 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: false]}], "hexpm", "1820300531b5b849d0bc468e5a87cd64f8f2c5191916f548cbe69b2efc203780"},
   "cloak": {:hex, :cloak, "1.1.2", "7e0006c2b0b98d976d4f559080fabefd81f0e0a50a3c4b621f85ceeb563e80bb", [:mix], [{:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}], "hexpm", "940d5ac4fcd51b252930fd112e319ea5ae6ab540b722f3ca60a85666759b9585"},
   "cloak_ecto": {:hex, :cloak_ecto, "1.2.0", "e86a3df3bf0dc8980f70406bcb0af2858bac247d55494d40bc58a152590bd402", [:mix], [{:cloak, "~> 1.1.1", [hex: :cloak, repo: "hexpm", optional: false]}, {:ecto, "~> 3.0", [hex: :ecto, repo: "hexpm", optional: false]}], "hexpm", "8bcc677185c813fe64b786618bd6689b1707b35cd95acaae0834557b15a0c62f"},
   "coerce": {:hex, :coerce, "1.0.1", "211c27386315dc2894ac11bc1f413a0e38505d808153367bd5c6e75a4003d096", [:mix], [], "hexpm", "b44a691700f7a1a15b4b7e2ff1fa30bebd669929ac8aa43cffe9e2f8bf051cf1"},

From b46aabe0e31bb889c05976f484a97469f4fc1098 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 19 Jun 2023 19:18:20 +0000
Subject: [PATCH 118/909] Bump mock from 0.3.7 to 0.3.8

Bumps [mock](https://github.com/jjh42/mock) from 0.3.7 to 0.3.8.
- [Release notes](https://github.com/jjh42/mock/releases)
- [Changelog](https://github.com/jjh42/mock/blob/master/Changelog.md)
- [Commits](https://github.com/jjh42/mock/compare/v0.3.7...v0.3.8)

---
updated-dependencies:
- dependency-name: mock
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 mix.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mix.lock b/mix.lock
index 73a0172e54b4..8b94ed010cda 100644
--- a/mix.lock
+++ b/mix.lock
@@ -86,7 +86,7 @@
   "mimerl": {:hex, :mimerl, "1.2.0", "67e2d3f571088d5cfd3e550c383094b47159f3eee8ffa08e64106cdf5e981be3", [:rebar3], [], "hexpm", "f278585650aa581986264638ebf698f8bb19df297f66ad91b18910dfc6e19323"},
   "mimetype_parser": {:hex, :mimetype_parser, "0.1.3", "628ac9fe56aa7edcedb534d68397dd66674ab82493c8ebe39acb9a19b666099d", [:mix], [], "hexpm", "7d8f80c567807ce78cd93c938e7f4b0a20b1aaaaab914bf286f68457d9f7a852"},
   "mix_erlang_tasks": {:hex, :mix_erlang_tasks, "0.1.0", "36819fec60b80689eb1380938675af215565a89320a9e29c72c70d97512e4649", [:mix], [], "hexpm", "95d2839c422c482a70c08a8702da8242f86b773f8ab6e8602a4eb72da8da04ed"},
-  "mock": {:hex, :mock, "0.3.7", "75b3bbf1466d7e486ea2052a73c6e062c6256fb429d6797999ab02fa32f29e03", [:mix], [{:meck, "~> 0.9.2", [hex: :meck, repo: "hexpm", optional: false]}], "hexpm", "4da49a4609e41fd99b7836945c26f373623ea968cfb6282742bcb94440cf7e5c"},
+  "mock": {:hex, :mock, "0.3.8", "7046a306b71db2488ef54395eeb74df0a7f335a7caca4a3d3875d1fc81c884dd", [:mix], [{:meck, "~> 0.9.2", [hex: :meck, repo: "hexpm", optional: false]}], "hexpm", "7fa82364c97617d79bb7d15571193fc0c4fe5afd0c932cef09426b3ee6fe2022"},
   "mox": {:hex, :mox, "1.0.2", "dc2057289ac478b35760ba74165b4b3f402f68803dd5aecd3bfd19c183815d64", [:mix], [], "hexpm", "f9864921b3aaf763c8741b5b8e6f908f44566f1e427b2630e89e9a73b981fef2"},
   "msgpax": {:hex, :msgpax, "2.3.1", "28e17c4abb4c57da742e75de62abd9d01c76f1da0b103334de3fb1199610b3d9", [:mix], [{:plug, "~> 1.0", [hex: :plug, repo: "hexpm", optional: true]}], "hexpm", "17c8bf2fc2327b74e4bc6633dd520ffa10ea07b0a2f8ab1932db99044e116df5"},
   "nimble_csv": {:hex, :nimble_csv, "1.2.0", "4e26385d260c61eba9d4412c71cea34421f296d5353f914afe3f2e71cce97722", [:mix], [], "hexpm", "d0628117fcc2148178b034044c55359b26966c6eaa8e2ce15777be3bbc91b12a"},

From daf37e957fb3729cbb3aae466dd1b7d214c8a13d Mon Sep 17 00:00:00 2001
From: Qwerty5Uiop <alex000010@bk.ru>
Date: Tue, 20 Jun 2023 12:21:49 +0400
Subject: [PATCH 119/909] Add missing method_to_url params for trace
 transactions

---
 CHANGELOG.md                            | 1 +
 apps/indexer/config/dev/besu.exs        | 3 ++-
 apps/indexer/config/dev/erigon.exs      | 3 ++-
 apps/indexer/config/dev/nethermind.exs  | 3 ++-
 apps/indexer/config/dev/rsk.exs         | 3 ++-
 apps/indexer/config/prod/besu.exs       | 1 +
 apps/indexer/config/prod/erigon.exs     | 1 +
 apps/indexer/config/prod/nethermind.exs | 1 +
 apps/indexer/config/prod/rsk.exs        | 1 +
 9 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 96fd28fc085e..ac196e7e1d08 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -35,6 +35,7 @@
 - [#7590](https://github.com/blockscout/blockscout/pull/7590) - Drop genesis block in internal transactions fetcher
 - [#7639](https://github.com/blockscout/blockscout/pull/7639) - Fix contract creation transactions
 - [#7724](https://github.com/blockscout/blockscout/pull/7724) - Move MissingRangesCollector init logic to handle_continue
+- [#7751](https://github.com/blockscout/blockscout/pull/7751) - Add missing method_to_url params for trace transactions
 
 ### Chore
 
diff --git a/apps/indexer/config/dev/besu.exs b/apps/indexer/config/dev/besu.exs
index 9e615bd8ec8f..c6d8d4a1aa00 100644
--- a/apps/indexer/config/dev/besu.exs
+++ b/apps/indexer/config/dev/besu.exs
@@ -24,7 +24,8 @@ config :indexer,
       method_to_url: [
         eth_getBalance: System.get_env("ETHEREUM_JSONRPC_TRACE_URL") || "http://localhost:8545",
         trace_block: System.get_env("ETHEREUM_JSONRPC_TRACE_URL") || "http://localhost:8545",
-        trace_replayBlockTransactions: System.get_env("ETHEREUM_JSONRPC_TRACE_URL") || "http://localhost:8545"
+        trace_replayBlockTransactions: System.get_env("ETHEREUM_JSONRPC_TRACE_URL") || "http://localhost:8545",
+        trace_replayTransaction: System.get_env("ETHEREUM_JSONRPC_TRACE_URL") || "http://localhost:8545"
       ],
       http_options: [recv_timeout: timeout, timeout: timeout, hackney: hackney_opts]
     ],
diff --git a/apps/indexer/config/dev/erigon.exs b/apps/indexer/config/dev/erigon.exs
index e764ad6666f5..912b64dde2ec 100644
--- a/apps/indexer/config/dev/erigon.exs
+++ b/apps/indexer/config/dev/erigon.exs
@@ -24,7 +24,8 @@ config :indexer,
       method_to_url: [
         eth_getBalance: System.get_env("ETHEREUM_JSONRPC_TRACE_URL") || "http://localhost:8545",
         trace_block: System.get_env("ETHEREUM_JSONRPC_TRACE_URL") || "http://localhost:8545",
-        trace_replayBlockTransactions: System.get_env("ETHEREUM_JSONRPC_TRACE_URL") || "http://localhost:8545"
+        trace_replayBlockTransactions: System.get_env("ETHEREUM_JSONRPC_TRACE_URL") || "http://localhost:8545",
+        trace_replayTransaction: System.get_env("ETHEREUM_JSONRPC_TRACE_URL") || "http://localhost:8545"
       ],
       http_options: [recv_timeout: timeout, timeout: timeout, hackney: hackney_opts]
     ],
diff --git a/apps/indexer/config/dev/nethermind.exs b/apps/indexer/config/dev/nethermind.exs
index aae43f57d827..a00a7acd1781 100644
--- a/apps/indexer/config/dev/nethermind.exs
+++ b/apps/indexer/config/dev/nethermind.exs
@@ -24,7 +24,8 @@ config :indexer,
       method_to_url: [
         eth_getBalance: System.get_env("ETHEREUM_JSONRPC_TRACE_URL") || "http://localhost:8545",
         trace_block: System.get_env("ETHEREUM_JSONRPC_TRACE_URL") || "http://localhost:8545",
-        trace_replayBlockTransactions: System.get_env("ETHEREUM_JSONRPC_TRACE_URL") || "http://localhost:8545"
+        trace_replayBlockTransactions: System.get_env("ETHEREUM_JSONRPC_TRACE_URL") || "http://localhost:8545",
+        trace_replayTransaction: System.get_env("ETHEREUM_JSONRPC_TRACE_URL") || "http://localhost:8545"
       ],
       http_options: [recv_timeout: timeout, timeout: timeout, hackney: hackney_opts]
     ],
diff --git a/apps/indexer/config/dev/rsk.exs b/apps/indexer/config/dev/rsk.exs
index 6e9697be055b..5168fdbbff10 100644
--- a/apps/indexer/config/dev/rsk.exs
+++ b/apps/indexer/config/dev/rsk.exs
@@ -25,7 +25,8 @@ config :indexer,
       method_to_url: [
         eth_getBalance: System.get_env("ETHEREUM_JSONRPC_TRACE_URL") || "http://localhost:8545",
         trace_block: System.get_env("ETHEREUM_JSONRPC_TRACE_URL") || "http://localhost:8545",
-        trace_replayBlockTransactions: System.get_env("ETHEREUM_JSONRPC_TRACE_URL") || "http://localhost:8545"
+        trace_replayBlockTransactions: System.get_env("ETHEREUM_JSONRPC_TRACE_URL") || "http://localhost:8545",
+        trace_replayTransaction: System.get_env("ETHEREUM_JSONRPC_TRACE_URL") || "http://localhost:8545"
       ],
       http_options: [recv_timeout: timeout, timeout: timeout, hackney: hackney_opts]
     ],
diff --git a/apps/indexer/config/prod/besu.exs b/apps/indexer/config/prod/besu.exs
index 184f80b408c0..7970b1207799 100644
--- a/apps/indexer/config/prod/besu.exs
+++ b/apps/indexer/config/prod/besu.exs
@@ -23,6 +23,7 @@ config :indexer,
       method_to_url: [
         eth_getBalance: System.get_env("ETHEREUM_JSONRPC_TRACE_URL"),
         trace_block: System.get_env("ETHEREUM_JSONRPC_TRACE_URL"),
+        trace_replayBlockTransactions: System.get_env("ETHEREUM_JSONRPC_TRACE_URL"),
         trace_replayTransaction: System.get_env("ETHEREUM_JSONRPC_TRACE_URL")
       ],
       http_options: [recv_timeout: timeout, timeout: timeout, hackney: hackney_opts]
diff --git a/apps/indexer/config/prod/erigon.exs b/apps/indexer/config/prod/erigon.exs
index b608c36cd1f7..27b2c410a96c 100644
--- a/apps/indexer/config/prod/erigon.exs
+++ b/apps/indexer/config/prod/erigon.exs
@@ -23,6 +23,7 @@ config :indexer,
       method_to_url: [
         eth_getBalance: System.get_env("ETHEREUM_JSONRPC_TRACE_URL"),
         trace_block: System.get_env("ETHEREUM_JSONRPC_TRACE_URL"),
+        trace_replayBlockTransactions: System.get_env("ETHEREUM_JSONRPC_TRACE_URL"),
         trace_replayTransaction: System.get_env("ETHEREUM_JSONRPC_TRACE_URL")
       ],
       http_options: [recv_timeout: timeout, timeout: timeout, hackney: hackney_opts]
diff --git a/apps/indexer/config/prod/nethermind.exs b/apps/indexer/config/prod/nethermind.exs
index 04ff07c88d72..baed67a6913d 100644
--- a/apps/indexer/config/prod/nethermind.exs
+++ b/apps/indexer/config/prod/nethermind.exs
@@ -23,6 +23,7 @@ config :indexer,
       method_to_url: [
         eth_getBalance: System.get_env("ETHEREUM_JSONRPC_TRACE_URL"),
         trace_block: System.get_env("ETHEREUM_JSONRPC_TRACE_URL"),
+        trace_replayBlockTransactions: System.get_env("ETHEREUM_JSONRPC_TRACE_URL"),
         trace_replayTransaction: System.get_env("ETHEREUM_JSONRPC_TRACE_URL")
       ],
       http_options: [recv_timeout: timeout, timeout: timeout, hackney: hackney_opts]
diff --git a/apps/indexer/config/prod/rsk.exs b/apps/indexer/config/prod/rsk.exs
index 4b0a388ddbe9..f9090ddd3760 100644
--- a/apps/indexer/config/prod/rsk.exs
+++ b/apps/indexer/config/prod/rsk.exs
@@ -25,6 +25,7 @@ config :indexer,
       method_to_url: [
         eth_getBalance: System.get_env("ETHEREUM_JSONRPC_TRACE_URL"),
         trace_block: System.get_env("ETHEREUM_JSONRPC_TRACE_URL"),
+        trace_replayBlockTransactions: System.get_env("ETHEREUM_JSONRPC_TRACE_URL"),
         trace_replayTransaction: System.get_env("ETHEREUM_JSONRPC_TRACE_URL")
       ],
       http_options: [recv_timeout: timeout, timeout: timeout, hackney: hackney_opts]

From ed4553daf96eea4876f873318807304b5452a137 Mon Sep 17 00:00:00 2001
From: nikitosing <32202610+nikitosing@users.noreply.github.com>
Date: Tue, 20 Jun 2023 12:28:37 +0300
Subject: [PATCH 120/909] Speed up API v2 (#7502)

* Speed up /api/v2/transactions

* Add new address_current_token_balances index

* Speed up address to logs query

* Optimize coin_balance_history

* Optimize logs decoding for API v2

* Optimize token existance check in some cases

* Force search query to use index

* Speed up coin-balance-history

* Add TokenBalanceOnDemand.trigger_fetch call to addresses/{address_hash}/tokens endpoint

* Optimize txs decoding for API v2; Speed up has_token_transfer check for txs; Simplify block txs query

* Fix tests

* Fix review comments

* Add changelog

* Cut heavy migrations
---
 CHANGELOG.md                                  |   1 +
 .../lib/block_scout_web/chain.ex              |   8 +-
 .../address_coin_balance_controller.ex        |   6 +-
 .../controllers/api/v2/address_controller.ex  |  12 +-
 .../controllers/api/v2/token_controller.ex    |   4 +-
 .../api/v2/transaction_controller.ex          |   7 +-
 .../views/account/api/v1/user_view.ex         |   8 +-
 .../views/address_logs_view.ex                |   6 +-
 .../lib/block_scout_web/views/address_view.ex |   7 +-
 .../views/api/v2/address_view.ex              |   4 +-
 .../views/api/v2/block_view.ex                |   2 +-
 .../block_scout_web/views/api/v2/helper.ex    |  24 +-
 .../views/api/v2/smart_contract_view.ex       |   2 +-
 .../views/api/v2/token_view.ex                |   4 +-
 .../views/api/v2/transaction_view.ex          | 169 +++++++---
 .../views/api/v2/withdrawal_view.ex           |   4 +-
 .../views/transaction_log_view.ex             |   7 +-
 .../block_scout_web/views/transaction_view.ex |   3 +-
 apps/block_scout_web/priv/gettext/default.pot |  26 +-
 .../priv/gettext/en/LC_MESSAGES/default.po    |  26 +-
 apps/explorer/lib/explorer/chain.ex           | 288 ++++++++++--------
 .../explorer/chain/address/coin_balance.ex    |  37 +--
 .../csv_export/address_log_csv_exporter.ex    |   4 +-
 apps/explorer/lib/explorer/chain/log.ex       |  79 +++--
 .../lib/explorer/chain/transaction.ex         | 163 ++++++----
 .../explorer/test/explorer/chain/log_test.exs |  46 ++-
 .../test/explorer/chain/transaction_test.exs  |  12 +-
 apps/explorer/test/explorer/chain_test.exs    |  41 +--
 28 files changed, 568 insertions(+), 432 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ac196e7e1d08..93c936cb11ab 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,7 @@
 
 ### Features
 
+- [#7502](https://github.com/blockscout/blockscout/pull/7502) - Improve performance of some methods, endpoints and SQL queries
 - [#7665](https://github.com/blockscout/blockscout/pull/7665) - Add standard-json vyper verification
 - [#7685](https://github.com/blockscout/blockscout/pull/7685) - Add yul filter and "language" field for smart contracts
 - [#7653](https://github.com/blockscout/blockscout/pull/7653) - Add support for DEPOSIT and WITHDRAW token transfer event in older contracts
diff --git a/apps/block_scout_web/lib/block_scout_web/chain.ex b/apps/block_scout_web/lib/block_scout_web/chain.ex
index 85da65cbfd47..55dd868125d6 100644
--- a/apps/block_scout_web/lib/block_scout_web/chain.ex
+++ b/apps/block_scout_web/lib/block_scout_web/chain.ex
@@ -425,12 +425,8 @@ defmodule BlockScoutWeb.Chain do
     %{"block_number" => block_number, "transaction_index" => transaction_index, "index" => index}
   end
 
-  defp paging_params(%Log{index: index} = log) do
-    if Ecto.assoc_loaded?(log.transaction) do
-      %{"block_number" => log.transaction.block_number, "transaction_index" => log.transaction.index, "index" => index}
-    else
-      %{"index" => index}
-    end
+  defp paging_params(%Log{index: index, block_number: block_number}) do
+    %{"block_number" => block_number, "index" => index}
   end
 
   defp paging_params(%Transaction{block_number: nil, inserted_at: inserted_at, hash: hash}) do
diff --git a/apps/block_scout_web/lib/block_scout_web/controllers/address_coin_balance_controller.ex b/apps/block_scout_web/lib/block_scout_web/controllers/address_coin_balance_controller.ex
index cd85a4c71626..36c4eed10642 100644
--- a/apps/block_scout_web/lib/block_scout_web/controllers/address_coin_balance_controller.ex
+++ b/apps/block_scout_web/lib/block_scout_web/controllers/address_coin_balance_controller.ex
@@ -18,11 +18,11 @@ defmodule BlockScoutWeb.AddressCoinBalanceController do
 
   def index(conn, %{"address_id" => address_hash_string, "type" => "JSON"} = params) do
     with {:ok, address_hash} <- Chain.string_to_address_hash(address_hash_string),
-         :ok <- Chain.check_address_exists(address_hash),
+         {:ok, address} <- Chain.hash_to_address(address_hash, [], false),
          {:ok, false} <- AccessHelper.restricted_access?(address_hash_string, params) do
       full_options = paging_options(params)
 
-      coin_balances_plus_one = Chain.address_to_coin_balances(address_hash, full_options)
+      coin_balances_plus_one = Chain.address_to_coin_balances(address, full_options)
 
       {coin_balances, next_page} = split_list_by_page(coin_balances_plus_one)
 
@@ -55,7 +55,7 @@ defmodule BlockScoutWeb.AddressCoinBalanceController do
       {:restricted_access, _} ->
         not_found(conn)
 
-      :not_found ->
+      {:error, :not_found} ->
         case Chain.Hash.Address.validate(address_hash_string) do
           {:ok, _} ->
             json(conn, %{items: [], next_page_path: ""})
diff --git a/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/address_controller.ex b/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/address_controller.ex
index 9b999f923476..d396d27e02bd 100644
--- a/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/address_controller.ex
+++ b/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/address_controller.ex
@@ -115,7 +115,7 @@ defmodule BlockScoutWeb.API.V2.AddressController do
         |> Keyword.merge(paging_options(params))
         |> Keyword.merge(current_filter(params))
 
-      results_plus_one = Chain.address_to_transactions_with_rewards(address_hash, options)
+      results_plus_one = Chain.address_to_transactions_without_rewards(address_hash, options, false)
       {transactions, next_page} = split_list_by_page(results_plus_one)
 
       next_page_params =
@@ -251,7 +251,7 @@ defmodule BlockScoutWeb.API.V2.AddressController do
 
       formatted_topic = if String.starts_with?(prepared_topic, "0x"), do: prepared_topic, else: "0x" <> prepared_topic
 
-      options = Keyword.merge([topic: formatted_topic], @api_true)
+      options = params |> paging_options() |> Keyword.merge(topic: formatted_topic) |> Keyword.merge(@api_true)
 
       results_plus_one = Chain.address_to_logs(address_hash, options)
 
@@ -316,10 +316,10 @@ defmodule BlockScoutWeb.API.V2.AddressController do
   def coin_balance_history(conn, %{"address_hash" => address_hash_string} = params) do
     with {:format, {:ok, address_hash}} <- {:format, Chain.string_to_address_hash(address_hash_string)},
          {:ok, false} <- AccessHelper.restricted_access?(address_hash_string, params),
-         {:not_found, {:ok, _address}} <- {:not_found, Chain.hash_to_address(address_hash, @api_true, false)} do
+         {:not_found, {:ok, address}} <- {:not_found, Chain.hash_to_address(address_hash, @api_true, false)} do
       full_options = params |> paging_options() |> Keyword.merge(@api_true)
 
-      results_plus_one = Chain.address_to_coin_balances(address_hash, full_options)
+      results_plus_one = Chain.address_to_coin_balances(address, full_options)
 
       {coin_balances, next_page} = split_list_by_page(results_plus_one)
 
@@ -360,6 +360,10 @@ defmodule BlockScoutWeb.API.V2.AddressController do
           |> Keyword.merge(@api_true)
         )
 
+      Task.start_link(fn ->
+        TokenBalanceOnDemand.trigger_fetch(address_hash, results_plus_one)
+      end)
+
       {tokens, next_page} = split_list_by_page(results_plus_one)
 
       next_page_params = next_page |> next_page_params(tokens, params) |> delete_parameters_from_next_page_params()
diff --git a/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/token_controller.ex b/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/token_controller.ex
index 6655b0d40cb4..fdde35d0bd6b 100644
--- a/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/token_controller.ex
+++ b/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/token_controller.ex
@@ -38,7 +38,7 @@ defmodule BlockScoutWeb.API.V2.TokenController do
   def counters(conn, %{"address_hash" => address_hash_string} = params) do
     with {:format, {:ok, address_hash}} <- {:format, Chain.string_to_address_hash(address_hash_string)},
          {:ok, false} <- AccessHelper.restricted_access?(address_hash_string, params),
-         {:not_found, {:ok, _}} <- {:not_found, Chain.token_from_address_hash(address_hash, @api_true)} do
+         {:not_found, true} <- {:not_found, Chain.token_from_address_hash_exists?(address_hash, @api_true)} do
       {transfer_count, token_holder_count} = Chain.fetch_token_counters(address_hash, 30_000)
 
       json(conn, %{transfers_count: to_string(transfer_count), token_holders_count: to_string(token_holder_count)})
@@ -48,7 +48,7 @@ defmodule BlockScoutWeb.API.V2.TokenController do
   def transfers(conn, %{"address_hash" => address_hash_string} = params) do
     with {:format, {:ok, address_hash}} <- {:format, Chain.string_to_address_hash(address_hash_string)},
          {:ok, false} <- AccessHelper.restricted_access?(address_hash_string, params),
-         {:not_found, {:ok, _}} <- {:not_found, Chain.token_from_address_hash(address_hash, @api_true)} do
+         {:not_found, true} <- {:not_found, Chain.token_from_address_hash_exists?(address_hash, @api_true)} do
       paging_options = paging_options(params)
 
       results =
diff --git a/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/transaction_controller.ex b/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/transaction_controller.ex
index 73fa39dce74d..94d060f918ad 100644
--- a/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/transaction_controller.ex
+++ b/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/transaction_controller.ex
@@ -29,6 +29,7 @@ defmodule BlockScoutWeb.API.V2.TransactionController do
     [created_contract_address: :token] => :optional,
     [from_address: :names] => :optional,
     [to_address: :names] => :optional,
+    # as far as I remember this needed for substituting implementation name in `to` address instead of is's real name (in transactions)
     [to_address: :smart_contract] => :optional
   }
 
@@ -36,9 +37,7 @@ defmodule BlockScoutWeb.API.V2.TransactionController do
     [from_address: :smart_contract] => :optional,
     [to_address: :smart_contract] => :optional,
     [from_address: :names] => :optional,
-    [to_address: :names] => :optional,
-    from_address: :required,
-    to_address: :required
+    [to_address: :names] => :optional
   }
 
   @token_transfers_in_tx_necessity_by_association %{
@@ -46,8 +45,6 @@ defmodule BlockScoutWeb.API.V2.TransactionController do
     [to_address: :smart_contract] => :optional,
     [from_address: :names] => :optional,
     [to_address: :names] => :optional,
-    from_address: :required,
-    to_address: :required,
     token: :required
   }
 
diff --git a/apps/block_scout_web/lib/block_scout_web/views/account/api/v1/user_view.ex b/apps/block_scout_web/lib/block_scout_web/views/account/api/v1/user_view.ex
index b2761714ae90..415b1dbf413d 100644
--- a/apps/block_scout_web/lib/block_scout_web/views/account/api/v1/user_view.ex
+++ b/apps/block_scout_web/lib/block_scout_web/views/account/api/v1/user_view.ex
@@ -76,7 +76,7 @@ defmodule BlockScoutWeb.Account.Api.V1.UserView do
 
     %{
       "id" => watchlist.id,
-      "address" => Helper.address_with_info(nil, address, watchlist.address_hash),
+      "address" => Helper.address_with_info(nil, address, watchlist.address_hash, false),
       "address_hash" => watchlist.address_hash,
       "name" => watchlist.name,
       "address_balance" => if(address && address.fetched_coin_balance, do: address.fetched_coin_balance.value),
@@ -112,7 +112,7 @@ defmodule BlockScoutWeb.Account.Api.V1.UserView do
     %{
       "id" => custom_abi.id,
       "contract_address_hash" => custom_abi.address_hash,
-      "contract_address" => Helper.address_with_info(nil, address, custom_abi.address_hash),
+      "contract_address" => Helper.address_with_info(nil, address, custom_abi.address_hash, false),
       "name" => custom_abi.name,
       "abi" => custom_abi.abi
     }
@@ -128,7 +128,7 @@ defmodule BlockScoutWeb.Account.Api.V1.UserView do
     %{
       "id" => address_tag.id,
       "address_hash" => address_tag.address_hash,
-      "address" => Helper.address_with_info(nil, address, address_tag.address_hash),
+      "address" => Helper.address_with_info(nil, address, address_tag.address_hash, false),
       "name" => address_tag.name
     }
   end
@@ -142,7 +142,7 @@ defmodule BlockScoutWeb.Account.Api.V1.UserView do
   def prepare_public_tags_request(public_tags_request) do
     addresses =
       Enum.map(public_tags_request.addresses, fn address_hash ->
-        Helper.address_with_info(nil, get_address(address_hash), address_hash)
+        Helper.address_with_info(nil, get_address(address_hash), address_hash, false)
       end)
 
     %{
diff --git a/apps/block_scout_web/lib/block_scout_web/views/address_logs_view.ex b/apps/block_scout_web/lib/block_scout_web/views/address_logs_view.ex
index 577661ab8161..0c4daa067d93 100644
--- a/apps/block_scout_web/lib/block_scout_web/views/address_logs_view.ex
+++ b/apps/block_scout_web/lib/block_scout_web/views/address_logs_view.ex
@@ -1,9 +1,7 @@
 defmodule BlockScoutWeb.AddressLogsView do
   use BlockScoutWeb, :view
 
-  alias Explorer.Chain.{Address, Log}
+  alias Explorer.Chain.Address
 
-  def decode(log, transaction) do
-    Log.decode(log, transaction)
-  end
+  import BlockScoutWeb.AddressView, only: [decode: 2]
 end
diff --git a/apps/block_scout_web/lib/block_scout_web/views/address_view.ex b/apps/block_scout_web/lib/block_scout_web/views/address_view.ex
index f521d4d9032c..3f60d4c7eadc 100644
--- a/apps/block_scout_web/lib/block_scout_web/views/address_view.ex
+++ b/apps/block_scout_web/lib/block_scout_web/views/address_view.ex
@@ -6,7 +6,7 @@ defmodule BlockScoutWeb.AddressView do
   alias BlockScoutWeb.{AccessHelper, LayoutView}
   alias Explorer.Account.CustomABI
   alias Explorer.{Chain, CustomContractsHelper, Repo}
-  alias Explorer.Chain.{Address, Hash, InternalTransaction, SmartContract, Token, TokenTransfer, Transaction, Wei}
+  alias Explorer.Chain.{Address, Hash, InternalTransaction, Log, SmartContract, Token, TokenTransfer, Transaction, Wei}
   alias Explorer.Chain.Block.Reward
   alias Explorer.ExchangeRates.Token, as: TokenExchangeRate
   alias Explorer.SmartContract.{Helper, Writer}
@@ -494,4 +494,9 @@ defmodule BlockScoutWeb.AddressView do
     do: !is_nil(custom_abi) && Enum.any?(custom_abi.abi, &Writer.write_function?(&1))
 
   def contract_interaction_disabled?, do: Application.get_env(:block_scout_web, :contract)[:disable_interaction]
+
+  def decode(log, transaction) do
+    {result, _contracts_acc, _events_acc} = Log.decode(log, transaction, [], true)
+    result
+  end
 end
diff --git a/apps/block_scout_web/lib/block_scout_web/views/api/v2/address_view.ex b/apps/block_scout_web/lib/block_scout_web/views/api/v2/address_view.ex
index e044cf7ffb6e..7abccd065035 100644
--- a/apps/block_scout_web/lib/block_scout_web/views/api/v2/address_view.ex
+++ b/apps/block_scout_web/lib/block_scout_web/views/api/v2/address_view.ex
@@ -56,13 +56,13 @@ defmodule BlockScoutWeb.API.V2.AddressView do
 
   def prepare_address({address, nonce}) do
     nil
-    |> Helper.address_with_info(address, address.hash)
+    |> Helper.address_with_info(address, address.hash, true)
     |> Map.put(:tx_count, to_string(nonce))
     |> Map.put(:coin_balance, if(address.fetched_coin_balance, do: address.fetched_coin_balance.value))
   end
 
   def prepare_address(address, conn \\ nil) do
-    base_info = Helper.address_with_info(conn, address, address.hash)
+    base_info = Helper.address_with_info(conn, address, address.hash, true)
     is_proxy = AddressView.smart_contract_is_proxy?(address, @api_true)
 
     {implementation_address, implementation_name} =
diff --git a/apps/block_scout_web/lib/block_scout_web/views/api/v2/block_view.ex b/apps/block_scout_web/lib/block_scout_web/views/api/v2/block_view.ex
index fd0c1cc897da..9c022d364e52 100644
--- a/apps/block_scout_web/lib/block_scout_web/views/api/v2/block_view.ex
+++ b/apps/block_scout_web/lib/block_scout_web/views/api/v2/block_view.ex
@@ -38,7 +38,7 @@ defmodule BlockScoutWeb.API.V2.BlockView do
       "height" => block.number,
       "timestamp" => block.timestamp,
       "tx_count" => count_transactions(block),
-      "miner" => Helper.address_with_info(block.miner, block.miner_hash),
+      "miner" => Helper.address_with_info(nil, block.miner, block.miner_hash, false),
       "size" => block.size,
       "hash" => block.hash,
       "parent_hash" => block.parent_hash,
diff --git a/apps/block_scout_web/lib/block_scout_web/views/api/v2/helper.ex b/apps/block_scout_web/lib/block_scout_web/views/api/v2/helper.ex
index 1c427c921865..b0e25f978d02 100644
--- a/apps/block_scout_web/lib/block_scout_web/views/api/v2/helper.ex
+++ b/apps/block_scout_web/lib/block_scout_web/views/api/v2/helper.ex
@@ -10,13 +10,13 @@ defmodule BlockScoutWeb.API.V2.Helper do
   import BlockScoutWeb.Account.AuthController, only: [current_user: 1]
   import BlockScoutWeb.Models.GetAddressTags, only: [get_address_tags: 3]
 
-  def address_with_info(conn, address, address_hash, watchlist_names_cached \\ nil)
+  def address_with_info(conn, address, address_hash, tags_needed?, watchlist_names_cached \\ nil)
 
-  def address_with_info(_, _, nil, _) do
+  def address_with_info(_, _, nil, _, _) do
     nil
   end
 
-  def address_with_info(conn, address, address_hash, nil) do
+  def address_with_info(conn, address, address_hash, true, nil) do
     %{
       common_tags: public_tags,
       personal_tags: private_tags,
@@ -30,7 +30,15 @@ defmodule BlockScoutWeb.API.V2.Helper do
     })
   end
 
-  def address_with_info(_conn, address, address_hash, watchlist_names_cached) do
+  def address_with_info(_conn, address, address_hash, false, nil) do
+    Map.merge(address_with_info(address, address_hash), %{
+      "private_tags" => [],
+      "watchlist_names" => [],
+      "public_tags" => []
+    })
+  end
+
+  def address_with_info(_conn, address, address_hash, _, watchlist_names_cached) do
     watchlist_name = watchlist_names_cached[address_hash]
 
     Map.merge(address_with_info(address, address_hash), %{
@@ -40,7 +48,7 @@ defmodule BlockScoutWeb.API.V2.Helper do
     })
   end
 
-  def address_with_info(%Address{} = address, _address_hash) do
+  defp address_with_info(%Address{} = address, _address_hash) do
     %{
       "hash" => Address.checksum(address),
       "is_contract" => is_smart_contract(address),
@@ -50,15 +58,15 @@ defmodule BlockScoutWeb.API.V2.Helper do
     }
   end
 
-  def address_with_info(%NotLoaded{}, address_hash) do
+  defp address_with_info(%NotLoaded{}, address_hash) do
     address_with_info(nil, address_hash)
   end
 
-  def address_with_info(nil, nil) do
+  defp address_with_info(nil, nil) do
     nil
   end
 
-  def address_with_info(_, address_hash) do
+  defp address_with_info(_, address_hash) do
     %{
       "hash" => Address.checksum(address_hash),
       "is_contract" => false,
diff --git a/apps/block_scout_web/lib/block_scout_web/views/api/v2/smart_contract_view.ex b/apps/block_scout_web/lib/block_scout_web/views/api/v2/smart_contract_view.ex
index 10bdfd12a871..6a35a0c6fbd3 100644
--- a/apps/block_scout_web/lib/block_scout_web/views/api/v2/smart_contract_view.ex
+++ b/apps/block_scout_web/lib/block_scout_web/views/api/v2/smart_contract_view.ex
@@ -254,7 +254,7 @@ defmodule BlockScoutWeb.API.V2.SmartContractView do
     token = smart_contract.address.token
 
     %{
-      "address" => Helper.address_with_info(nil, smart_contract.address, smart_contract.address.hash),
+      "address" => Helper.address_with_info(nil, smart_contract.address, smart_contract.address.hash, false),
       "compiler_version" => smart_contract.compiler_version,
       "optimization_enabled" => smart_contract.optimization,
       "tx_count" => smart_contract.address.transactions_count,
diff --git a/apps/block_scout_web/lib/block_scout_web/views/api/v2/token_view.ex b/apps/block_scout_web/lib/block_scout_web/views/api/v2/token_view.ex
index 994fe78e872f..fe60782eb14b 100644
--- a/apps/block_scout_web/lib/block_scout_web/views/api/v2/token_view.ex
+++ b/apps/block_scout_web/lib/block_scout_web/views/api/v2/token_view.ex
@@ -56,7 +56,7 @@ defmodule BlockScoutWeb.API.V2.TokenView do
 
   def prepare_token_balance(token_balance, token) do
     %{
-      "address" => Helper.address_with_info(nil, token_balance.address, token_balance.address_hash),
+      "address" => Helper.address_with_info(nil, token_balance.address, token_balance.address_hash, false),
       "value" => token_balance.value,
       "token_id" => token_balance.token_id,
       "token" => render("token.json", %{token: token})
@@ -72,7 +72,7 @@ defmodule BlockScoutWeb.API.V2.TokenView do
       "id" => instance.token_id,
       "metadata" => instance.metadata,
       "owner" =>
-        if(is_unique, do: instance.owner && Helper.address_with_info(nil, instance.owner, instance.owner.hash)),
+        if(is_unique, do: instance.owner && Helper.address_with_info(nil, instance.owner, instance.owner.hash, false)),
       "token" => render("token.json", %{token: token}),
       "external_app_url" => NFTHelper.external_url(instance),
       "animation_url" => instance.metadata && NFTHelper.retrieve_image(instance.metadata["animation_url"]),
diff --git a/apps/block_scout_web/lib/block_scout_web/views/api/v2/transaction_view.ex b/apps/block_scout_web/lib/block_scout_web/views/api/v2/transaction_view.ex
index f12f320dc4bc..8368ab1cf56d 100644
--- a/apps/block_scout_web/lib/block_scout_web/views/api/v2/transaction_view.ex
+++ b/apps/block_scout_web/lib/block_scout_web/views/api/v2/transaction_view.ex
@@ -29,8 +29,16 @@ defmodule BlockScoutWeb.API.V2.TransactionView do
         conn: conn,
         watchlist_names: watchlist_names
       }) do
+    block_height = Chain.block_height(@api_true)
+    {decoded_transactions, _, _} = decode_transactions(transactions, true)
+
     %{
-      "items" => Enum.map(transactions, &prepare_transaction(&1, conn, false, watchlist_names)),
+      "items" =>
+        transactions
+        |> Enum.zip(decoded_transactions)
+        |> Enum.map(fn {tx, decoded_input} ->
+          prepare_transaction(tx, conn, false, block_height, watchlist_names, decoded_input)
+        end),
       "next_page_params" => next_page_params
     }
   end
@@ -40,19 +48,42 @@ defmodule BlockScoutWeb.API.V2.TransactionView do
         conn: conn,
         watchlist_names: watchlist_names
       }) do
-    Enum.map(transactions, &prepare_transaction(&1, conn, false, watchlist_names))
+    block_height = Chain.block_height(@api_true)
+    {decoded_transactions, _, _} = decode_transactions(transactions, true)
+
+    transactions
+    |> Enum.zip(decoded_transactions)
+    |> Enum.map(fn {tx, decoded_input} ->
+      prepare_transaction(tx, conn, false, block_height, watchlist_names, decoded_input)
+    end)
   end
 
   def render("transactions.json", %{transactions: transactions, next_page_params: next_page_params, conn: conn}) do
-    %{"items" => Enum.map(transactions, &prepare_transaction(&1, conn, false)), "next_page_params" => next_page_params}
+    block_height = Chain.block_height(@api_true)
+    {decoded_transactions, _, _} = decode_transactions(transactions, true)
+
+    %{
+      "items" =>
+        transactions
+        |> Enum.zip(decoded_transactions)
+        |> Enum.map(fn {tx, decoded_input} -> prepare_transaction(tx, conn, false, block_height, decoded_input) end),
+      "next_page_params" => next_page_params
+    }
   end
 
   def render("transactions.json", %{transactions: transactions, conn: conn}) do
-    Enum.map(transactions, &prepare_transaction(&1, conn, false))
+    block_height = Chain.block_height(@api_true)
+    {decoded_transactions, _, _} = decode_transactions(transactions, true)
+
+    transactions
+    |> Enum.zip(decoded_transactions)
+    |> Enum.map(fn {tx, decoded_input} -> prepare_transaction(tx, conn, false, block_height, decoded_input) end)
   end
 
   def render("transaction.json", %{transaction: transaction, conn: conn}) do
-    prepare_transaction(transaction, conn, true)
+    block_height = Chain.block_height(@api_true)
+    {[decoded_input], _, _} = decode_transactions([transaction], false)
+    prepare_transaction(transaction, conn, true, block_height, decoded_input)
   end
 
   def render("raw_trace.json", %{internal_transactions: internal_transactions}) do
@@ -72,15 +103,28 @@ defmodule BlockScoutWeb.API.V2.TransactionView do
   end
 
   def render("token_transfers.json", %{token_transfers: token_transfers, next_page_params: next_page_params, conn: conn}) do
-    %{"items" => Enum.map(token_transfers, &prepare_token_transfer(&1, conn)), "next_page_params" => next_page_params}
+    {decoded_transactions, _, _} = decode_transactions(Enum.map(token_transfers, fn tt -> tt.transaction end), true)
+
+    %{
+      "items" =>
+        token_transfers
+        |> Enum.zip(decoded_transactions)
+        |> Enum.map(fn {tt, decoded_input} -> prepare_token_transfer(tt, conn, decoded_input) end),
+      "next_page_params" => next_page_params
+    }
   end
 
   def render("token_transfers.json", %{token_transfers: token_transfers, conn: conn}) do
-    Enum.map(token_transfers, &prepare_token_transfer(&1, conn))
+    {decoded_transactions, _, _} = decode_transactions(Enum.map(token_transfers, fn tt -> tt.transaction end), true)
+
+    token_transfers
+    |> Enum.zip(decoded_transactions)
+    |> Enum.map(fn {tt, decoded_input} -> prepare_token_transfer(tt, conn, decoded_input) end)
   end
 
   def render("token_transfer.json", %{token_transfer: token_transfer, conn: conn}) do
-    prepare_token_transfer(token_transfer, conn)
+    {[decoded_transaction], _, _} = decode_transactions([token_transfer.transaction], true)
+    prepare_token_transfer(token_transfer, conn, decoded_transaction)
   end
 
   def render("transaction_actions.json", %{actions: actions}) do
@@ -99,12 +143,23 @@ defmodule BlockScoutWeb.API.V2.TransactionView do
   end
 
   def render("logs.json", %{logs: logs, next_page_params: next_page_params, tx_hash: tx_hash}) do
-    %{"items" => Enum.map(logs, fn log -> prepare_log(log, tx_hash, false) end), "next_page_params" => next_page_params}
+    decoded_logs = decode_logs(logs, false)
+
+    %{
+      "items" =>
+        logs |> Enum.zip(decoded_logs) |> Enum.map(fn {log, decoded_log} -> prepare_log(log, tx_hash, decoded_log) end),
+      "next_page_params" => next_page_params
+    }
   end
 
   def render("logs.json", %{logs: logs, next_page_params: next_page_params}) do
+    decoded_logs = decode_logs(logs, false)
+
     %{
-      "items" => Enum.map(logs, fn log -> prepare_log(log, log.transaction, true) end),
+      "items" =>
+        logs
+        |> Enum.zip(decoded_logs)
+        |> Enum.map(fn {log, decoded_log} -> prepare_log(log, log.transaction, decoded_log) end),
       "next_page_params" => next_page_params
     }
   end
@@ -116,14 +171,39 @@ defmodule BlockScoutWeb.API.V2.TransactionView do
     }
   end
 
-  def prepare_token_transfer(token_transfer, _conn) do
-    decoded_input =
-      token_transfer.transaction |> Transaction.decoded_input_data(true, @api_true) |> format_decoded_input()
+  def decode_logs(logs, skip_sig_provider?) do
+    {result, _, _} =
+      Enum.reduce(logs, {[], %{}, %{}}, fn log, {results, contracts_acc, events_acc} ->
+        {result, contracts_acc, events_acc} =
+          Log.decode(
+            log,
+            %Transaction{hash: log.transaction_hash},
+            @api_true,
+            skip_sig_provider?,
+            contracts_acc,
+            events_acc
+          )
+
+        {[format_decoded_log_input(result) | results], contracts_acc, events_acc}
+      end)
+
+    Enum.reverse(result)
+  end
+
+  def decode_transactions(transactions, skip_sig_provider?) do
+    Enum.reduce(transactions, {[], %{}, %{}}, fn transaction, {results, abi_acc, methods_acc} ->
+      {result, abi_acc, methods_acc} =
+        Transaction.decoded_input_data(transaction, skip_sig_provider?, @api_true, abi_acc, methods_acc)
+
+      {Enum.reverse([format_decoded_input(result) | Enum.reverse(results)]), abi_acc, methods_acc}
+    end)
+  end
 
+  def prepare_token_transfer(token_transfer, _conn, decoded_input) do
     %{
       "tx_hash" => token_transfer.transaction_hash,
-      "from" => Helper.address_with_info(nil, token_transfer.from_address, token_transfer.from_address_hash),
-      "to" => Helper.address_with_info(nil, token_transfer.to_address, token_transfer.to_address_hash),
+      "from" => Helper.address_with_info(nil, token_transfer.from_address, token_transfer.from_address_hash, false),
+      "to" => Helper.address_with_info(nil, token_transfer.to_address, token_transfer.to_address_hash, false),
       "total" => prepare_token_transfer_total(token_transfer),
       "token" => TokenView.render("token.json", %{token: token_transfer.token}),
       "type" => Chain.get_token_transfer_type(token_transfer),
@@ -172,13 +252,15 @@ defmodule BlockScoutWeb.API.V2.TransactionView do
       "type" => internal_transaction.call_type || internal_transaction.type,
       "transaction_hash" => internal_transaction.transaction_hash,
       "from" =>
-        Helper.address_with_info(nil, internal_transaction.from_address, internal_transaction.from_address_hash),
-      "to" => Helper.address_with_info(nil, internal_transaction.to_address, internal_transaction.to_address_hash),
+        Helper.address_with_info(nil, internal_transaction.from_address, internal_transaction.from_address_hash, false),
+      "to" =>
+        Helper.address_with_info(nil, internal_transaction.to_address, internal_transaction.to_address_hash, false),
       "created_contract" =>
         Helper.address_with_info(
           nil,
           internal_transaction.created_contract_address,
-          internal_transaction.created_contract_address_hash
+          internal_transaction.created_contract_address_hash,
+          false
         ),
       "value" => internal_transaction.value,
       "block" => internal_transaction.block_number,
@@ -188,12 +270,12 @@ defmodule BlockScoutWeb.API.V2.TransactionView do
     }
   end
 
-  def prepare_log(log, transaction_or_hash, skip_sig_provider?) do
-    decoded = decode_log(log, transaction_or_hash, skip_sig_provider?)
+  def prepare_log(log, transaction_or_hash, decoded_log) do
+    decoded = process_decoded_log(decoded_log)
 
     %{
       "tx_hash" => get_tx_hash(transaction_or_hash),
-      "address" => Helper.address_with_info(log.address, log.address_hash),
+      "address" => Helper.address_with_info(nil, log.address, log.address_hash, false),
       "topics" => [
         log.first_topic,
         log.second_topic,
@@ -210,11 +292,13 @@ defmodule BlockScoutWeb.API.V2.TransactionView do
   defp get_tx_hash(%Transaction{} = tx), do: to_string(tx.hash)
   defp get_tx_hash(hash), do: to_string(hash)
 
-  defp smart_contract_info(%Transaction{} = tx), do: Helper.address_with_info(tx.to_address, tx.to_address_hash)
+  defp smart_contract_info(%Transaction{} = tx),
+    do: Helper.address_with_info(nil, tx.to_address, tx.to_address_hash, false)
+
   defp smart_contract_info(_), do: nil
 
-  defp decode_log(log, %Transaction{} = tx, skip_sig_provider?) do
-    case log |> Log.decode(tx, @api_true, skip_sig_provider?) |> format_decoded_log_input() do
+  defp process_decoded_log(decoded_log) do
+    case decoded_log do
       {:ok, method_id, text, mapping} ->
         render(__MODULE__, "decoded_log_input.json", method_id: method_id, text: text, mapping: mapping)
 
@@ -223,20 +307,33 @@ defmodule BlockScoutWeb.API.V2.TransactionView do
     end
   end
 
-  defp decode_log(log, transaction_hash, skip_sig_provider?),
-    do: decode_log(log, %Transaction{hash: transaction_hash}, skip_sig_provider?)
+  defp prepare_transaction(tx, conn, single_tx?, block_height, watchlist_names \\ nil, decoded_input)
 
-  defp prepare_transaction({%Reward{} = emission_reward, %Reward{} = validator_reward}, conn, single_tx?) do
+  defp prepare_transaction(
+         {%Reward{} = emission_reward, %Reward{} = validator_reward},
+         conn,
+         single_tx?,
+         _block_height,
+         _watchlist_names,
+         _decoded_input
+       ) do
     %{
       "emission_reward" => emission_reward.reward,
       "block_hash" => validator_reward.block_hash,
-      "from" => Helper.address_with_info(single_tx? && conn, emission_reward.address, emission_reward.address_hash),
-      "to" => Helper.address_with_info(single_tx? && conn, validator_reward.address, validator_reward.address_hash),
+      "from" =>
+        Helper.address_with_info(single_tx? && conn, emission_reward.address, emission_reward.address_hash, single_tx?),
+      "to" =>
+        Helper.address_with_info(
+          single_tx? && conn,
+          validator_reward.address,
+          validator_reward.address_hash,
+          single_tx?
+        ),
       "types" => [:reward]
     }
   end
 
-  defp prepare_transaction(%Transaction{} = transaction, conn, single_tx?, watchlist_names \\ nil) do
+  defp prepare_transaction(%Transaction{} = transaction, conn, single_tx?, block_height, watchlist_names, decoded_input) do
     base_fee_per_gas = transaction.block && transaction.block.base_fee_per_gas
     max_priority_fee_per_gas = transaction.max_priority_fee_per_gas
     max_fee_per_gas = transaction.max_fee_per_gas
@@ -249,7 +346,6 @@ defmodule BlockScoutWeb.API.V2.TransactionView do
 
     revert_reason = revert_reason(status, transaction)
 
-    decoded_input = transaction |> Transaction.decoded_input_data(!single_tx?, @api_true) |> format_decoded_input()
     decoded_input_data = decoded_input(decoded_input)
 
     %{
@@ -263,6 +359,7 @@ defmodule BlockScoutWeb.API.V2.TransactionView do
           single_tx? && conn,
           transaction.from_address,
           transaction.from_address_hash,
+          single_tx?,
           watchlist_names
         ),
       "to" =>
@@ -270,6 +367,7 @@ defmodule BlockScoutWeb.API.V2.TransactionView do
           single_tx? && conn,
           transaction.to_address,
           transaction.to_address_hash,
+          single_tx?,
           watchlist_names
         ),
       "created_contract" =>
@@ -277,10 +375,10 @@ defmodule BlockScoutWeb.API.V2.TransactionView do
           single_tx? && conn,
           transaction.created_contract_address,
           transaction.created_contract_address_hash,
+          single_tx?,
           watchlist_names
         ),
-      "confirmations" =>
-        transaction.block |> Chain.confirmations(block_height: Chain.block_height(@api_true)) |> format_confirmations(),
+      "confirmations" => transaction.block |> Chain.confirmations(block_height: block_height) |> format_confirmations(),
       "confirmation_duration" => processing_time_duration(transaction),
       "value" => transaction.value,
       "fee" => transaction |> Chain.fee(:wei) |> format_fee(),
@@ -474,7 +572,8 @@ defmodule BlockScoutWeb.API.V2.TransactionView do
 
   defp tx_types(%Transaction{token_transfers: token_transfers} = tx, types, :token_transfer) do
     types =
-      if !is_nil(token_transfers) && token_transfers != [] && !match?(%NotLoaded{}, token_transfers) do
+      if (!is_nil(token_transfers) && token_transfers != [] && !match?(%NotLoaded{}, token_transfers)) ||
+           tx.has_token_transfers do
         [:token_transfer | types]
       else
         types
@@ -542,7 +641,7 @@ defmodule BlockScoutWeb.API.V2.TransactionView do
 
     %{
       "address" =>
-        Helper.address_with_info(nil, state_change.address, state_change.address && state_change.address.hash),
+        Helper.address_with_info(nil, state_change.address, state_change.address && state_change.address.hash, false),
       "is_miner" => state_change.miner?,
       "type" => type,
       "token" => if(type == "token", do: TokenView.render("token.json", %{token: coin_or_transfer.token})),
diff --git a/apps/block_scout_web/lib/block_scout_web/views/api/v2/withdrawal_view.ex b/apps/block_scout_web/lib/block_scout_web/views/api/v2/withdrawal_view.ex
index 299d4629721e..252a36f784e8 100644
--- a/apps/block_scout_web/lib/block_scout_web/views/api/v2/withdrawal_view.ex
+++ b/apps/block_scout_web/lib/block_scout_web/views/api/v2/withdrawal_view.ex
@@ -13,7 +13,7 @@ defmodule BlockScoutWeb.API.V2.WithdrawalView do
     %{
       "index" => withdrawal.index,
       "validator_index" => withdrawal.validator_index,
-      "receiver" => Helper.address_with_info(withdrawal.address, withdrawal.address_hash),
+      "receiver" => Helper.address_with_info(nil, withdrawal.address, withdrawal.address_hash, false),
       "amount" => withdrawal.amount
     }
   end
@@ -33,7 +33,7 @@ defmodule BlockScoutWeb.API.V2.WithdrawalView do
       "index" => withdrawal.index,
       "validator_index" => withdrawal.validator_index,
       "block_number" => withdrawal.block.number,
-      "receiver" => Helper.address_with_info(withdrawal.address, withdrawal.address_hash),
+      "receiver" => Helper.address_with_info(nil, withdrawal.address, withdrawal.address_hash, false),
       "amount" => withdrawal.amount,
       "timestamp" => withdrawal.block.timestamp
     }
diff --git a/apps/block_scout_web/lib/block_scout_web/views/transaction_log_view.ex b/apps/block_scout_web/lib/block_scout_web/views/transaction_log_view.ex
index e494bbd88934..625ffb07a621 100644
--- a/apps/block_scout_web/lib/block_scout_web/views/transaction_log_view.ex
+++ b/apps/block_scout_web/lib/block_scout_web/views/transaction_log_view.ex
@@ -2,10 +2,5 @@ defmodule BlockScoutWeb.TransactionLogView do
   use BlockScoutWeb, :view
   @dialyzer :no_match
 
-  alias Explorer.Chain.Log
-  import BlockScoutWeb.AddressView, only: [implementation_name: 1, primary_name: 1]
-
-  def decode(log, transaction) do
-    Log.decode(log, transaction)
-  end
+  import BlockScoutWeb.AddressView, only: [decode: 2, implementation_name: 1, primary_name: 1]
 end
diff --git a/apps/block_scout_web/lib/block_scout_web/views/transaction_view.ex b/apps/block_scout_web/lib/block_scout_web/views/transaction_view.ex
index 894e5448b6a7..548903cdd583 100644
--- a/apps/block_scout_web/lib/block_scout_web/views/transaction_view.ex
+++ b/apps/block_scout_web/lib/block_scout_web/views/transaction_view.ex
@@ -389,7 +389,8 @@ defmodule BlockScoutWeb.TransactionView do
   end
 
   def decoded_input_data(transaction) do
-    Transaction.decoded_input_data(transaction, [])
+    {result, _, _} = Transaction.decoded_input_data(transaction, [])
+    result
   end
 
   def decoded_revert_reason(revert_reason, transaction, options) do
diff --git a/apps/block_scout_web/priv/gettext/default.pot b/apps/block_scout_web/priv/gettext/default.pot
index 3eabb791db78..9e448f7f82a7 100644
--- a/apps/block_scout_web/priv/gettext/default.pot
+++ b/apps/block_scout_web/priv/gettext/default.pot
@@ -783,12 +783,12 @@ msgstr ""
 msgid "Contract Address Pending"
 msgstr ""
 
-#: lib/block_scout_web/views/transaction_view.ex:477
+#: lib/block_scout_web/views/transaction_view.ex:478
 #, elixir-autogen, elixir-format
 msgid "Contract Call"
 msgstr ""
 
-#: lib/block_scout_web/views/transaction_view.ex:474
+#: lib/block_scout_web/views/transaction_view.ex:475
 #, elixir-autogen, elixir-format
 msgid "Contract Creation"
 msgstr ""
@@ -1602,7 +1602,7 @@ msgstr ""
 #: lib/block_scout_web/templates/transaction/_tabs.html.eex:11
 #: lib/block_scout_web/templates/transaction_internal_transaction/index.html.eex:6
 #: lib/block_scout_web/views/address_view.ex:374
-#: lib/block_scout_web/views/transaction_view.ex:532
+#: lib/block_scout_web/views/transaction_view.ex:533
 #, elixir-autogen, elixir-format
 msgid "Internal Transactions"
 msgstr ""
@@ -1719,7 +1719,7 @@ msgstr ""
 #: lib/block_scout_web/templates/transaction/_tabs.html.eex:17
 #: lib/block_scout_web/templates/transaction_log/index.html.eex:8
 #: lib/block_scout_web/views/address_view.ex:385
-#: lib/block_scout_web/views/transaction_view.ex:533
+#: lib/block_scout_web/views/transaction_view.ex:534
 #, elixir-autogen, elixir-format
 msgid "Logs"
 msgstr ""
@@ -2065,7 +2065,7 @@ msgstr ""
 
 #: lib/block_scout_web/templates/layout/_topnav.html.eex:63
 #: lib/block_scout_web/views/transaction_view.ex:368
-#: lib/block_scout_web/views/transaction_view.ex:406
+#: lib/block_scout_web/views/transaction_view.ex:407
 #, elixir-autogen, elixir-format
 msgid "Pending"
 msgstr ""
@@ -2201,7 +2201,7 @@ msgstr ""
 
 #: lib/block_scout_web/templates/transaction/_tabs.html.eex:24
 #: lib/block_scout_web/templates/transaction_raw_trace/_card_body.html.eex:1
-#: lib/block_scout_web/views/transaction_view.ex:534
+#: lib/block_scout_web/views/transaction_view.ex:535
 #, elixir-autogen, elixir-format
 msgid "Raw Trace"
 msgstr ""
@@ -2514,7 +2514,7 @@ msgstr ""
 
 #: lib/block_scout_web/templates/transaction/_tabs.html.eex:29
 #: lib/block_scout_web/templates/transaction_state/index.html.eex:6
-#: lib/block_scout_web/views/transaction_view.ex:535
+#: lib/block_scout_web/views/transaction_view.ex:536
 #, elixir-autogen, elixir-format
 msgid "State changes"
 msgstr ""
@@ -2849,13 +2849,13 @@ msgid "Token"
 msgstr ""
 
 #: lib/block_scout_web/templates/common_components/_token_transfer_type_display_name.html.eex:3
-#: lib/block_scout_web/views/transaction_view.ex:468
+#: lib/block_scout_web/views/transaction_view.ex:469
 #, elixir-autogen, elixir-format
 msgid "Token Burning"
 msgstr ""
 
 #: lib/block_scout_web/templates/common_components/_token_transfer_type_display_name.html.eex:7
-#: lib/block_scout_web/views/transaction_view.ex:469
+#: lib/block_scout_web/views/transaction_view.ex:470
 #, elixir-autogen, elixir-format
 msgid "Token Creation"
 msgstr ""
@@ -2883,14 +2883,14 @@ msgid "Token ID"
 msgstr ""
 
 #: lib/block_scout_web/templates/common_components/_token_transfer_type_display_name.html.eex:5
-#: lib/block_scout_web/views/transaction_view.ex:467
+#: lib/block_scout_web/views/transaction_view.ex:468
 #, elixir-autogen, elixir-format
 msgid "Token Minting"
 msgstr ""
 
 #: lib/block_scout_web/templates/common_components/_token_transfer_type_display_name.html.eex:9
 #: lib/block_scout_web/templates/common_components/_token_transfer_type_display_name.html.eex:11
-#: lib/block_scout_web/views/transaction_view.ex:470
+#: lib/block_scout_web/views/transaction_view.ex:471
 #, elixir-autogen, elixir-format
 msgid "Token Transfer"
 msgstr ""
@@ -2906,7 +2906,7 @@ msgstr ""
 #: lib/block_scout_web/views/address_view.ex:376
 #: lib/block_scout_web/views/tokens/instance/overview_view.ex:114
 #: lib/block_scout_web/views/tokens/overview_view.ex:39
-#: lib/block_scout_web/views/transaction_view.ex:531
+#: lib/block_scout_web/views/transaction_view.ex:532
 #, elixir-autogen, elixir-format
 msgid "Token Transfers"
 msgstr ""
@@ -3022,7 +3022,7 @@ msgstr ""
 #: lib/block_scout_web/templates/account/tag_transaction/form.html.eex:11
 #: lib/block_scout_web/templates/account/tag_transaction/index.html.eex:23
 #: lib/block_scout_web/templates/address_logs/_logs.html.eex:19
-#: lib/block_scout_web/views/transaction_view.ex:480
+#: lib/block_scout_web/views/transaction_view.ex:481
 #, elixir-autogen, elixir-format
 msgid "Transaction"
 msgstr ""
diff --git a/apps/block_scout_web/priv/gettext/en/LC_MESSAGES/default.po b/apps/block_scout_web/priv/gettext/en/LC_MESSAGES/default.po
index 1b905b4dfed2..d84b5aca859a 100644
--- a/apps/block_scout_web/priv/gettext/en/LC_MESSAGES/default.po
+++ b/apps/block_scout_web/priv/gettext/en/LC_MESSAGES/default.po
@@ -783,12 +783,12 @@ msgstr ""
 msgid "Contract Address Pending"
 msgstr ""
 
-#: lib/block_scout_web/views/transaction_view.ex:477
+#: lib/block_scout_web/views/transaction_view.ex:478
 #, elixir-autogen, elixir-format
 msgid "Contract Call"
 msgstr ""
 
-#: lib/block_scout_web/views/transaction_view.ex:474
+#: lib/block_scout_web/views/transaction_view.ex:475
 #, elixir-autogen, elixir-format
 msgid "Contract Creation"
 msgstr ""
@@ -1602,7 +1602,7 @@ msgstr ""
 #: lib/block_scout_web/templates/transaction/_tabs.html.eex:11
 #: lib/block_scout_web/templates/transaction_internal_transaction/index.html.eex:6
 #: lib/block_scout_web/views/address_view.ex:374
-#: lib/block_scout_web/views/transaction_view.ex:532
+#: lib/block_scout_web/views/transaction_view.ex:533
 #, elixir-autogen, elixir-format
 msgid "Internal Transactions"
 msgstr ""
@@ -1719,7 +1719,7 @@ msgstr ""
 #: lib/block_scout_web/templates/transaction/_tabs.html.eex:17
 #: lib/block_scout_web/templates/transaction_log/index.html.eex:8
 #: lib/block_scout_web/views/address_view.ex:385
-#: lib/block_scout_web/views/transaction_view.ex:533
+#: lib/block_scout_web/views/transaction_view.ex:534
 #, elixir-autogen, elixir-format
 msgid "Logs"
 msgstr ""
@@ -2065,7 +2065,7 @@ msgstr ""
 
 #: lib/block_scout_web/templates/layout/_topnav.html.eex:63
 #: lib/block_scout_web/views/transaction_view.ex:368
-#: lib/block_scout_web/views/transaction_view.ex:406
+#: lib/block_scout_web/views/transaction_view.ex:407
 #, elixir-autogen, elixir-format
 msgid "Pending"
 msgstr ""
@@ -2201,7 +2201,7 @@ msgstr ""
 
 #: lib/block_scout_web/templates/transaction/_tabs.html.eex:24
 #: lib/block_scout_web/templates/transaction_raw_trace/_card_body.html.eex:1
-#: lib/block_scout_web/views/transaction_view.ex:534
+#: lib/block_scout_web/views/transaction_view.ex:535
 #, elixir-autogen, elixir-format
 msgid "Raw Trace"
 msgstr ""
@@ -2514,7 +2514,7 @@ msgstr ""
 
 #: lib/block_scout_web/templates/transaction/_tabs.html.eex:29
 #: lib/block_scout_web/templates/transaction_state/index.html.eex:6
-#: lib/block_scout_web/views/transaction_view.ex:535
+#: lib/block_scout_web/views/transaction_view.ex:536
 #, elixir-autogen, elixir-format
 msgid "State changes"
 msgstr ""
@@ -2849,13 +2849,13 @@ msgid "Token"
 msgstr ""
 
 #: lib/block_scout_web/templates/common_components/_token_transfer_type_display_name.html.eex:3
-#: lib/block_scout_web/views/transaction_view.ex:468
+#: lib/block_scout_web/views/transaction_view.ex:469
 #, elixir-autogen, elixir-format
 msgid "Token Burning"
 msgstr ""
 
 #: lib/block_scout_web/templates/common_components/_token_transfer_type_display_name.html.eex:7
-#: lib/block_scout_web/views/transaction_view.ex:469
+#: lib/block_scout_web/views/transaction_view.ex:470
 #, elixir-autogen, elixir-format
 msgid "Token Creation"
 msgstr ""
@@ -2883,14 +2883,14 @@ msgid "Token ID"
 msgstr ""
 
 #: lib/block_scout_web/templates/common_components/_token_transfer_type_display_name.html.eex:5
-#: lib/block_scout_web/views/transaction_view.ex:467
+#: lib/block_scout_web/views/transaction_view.ex:468
 #, elixir-autogen, elixir-format
 msgid "Token Minting"
 msgstr ""
 
 #: lib/block_scout_web/templates/common_components/_token_transfer_type_display_name.html.eex:9
 #: lib/block_scout_web/templates/common_components/_token_transfer_type_display_name.html.eex:11
-#: lib/block_scout_web/views/transaction_view.ex:470
+#: lib/block_scout_web/views/transaction_view.ex:471
 #, elixir-autogen, elixir-format
 msgid "Token Transfer"
 msgstr ""
@@ -2906,7 +2906,7 @@ msgstr ""
 #: lib/block_scout_web/views/address_view.ex:376
 #: lib/block_scout_web/views/tokens/instance/overview_view.ex:114
 #: lib/block_scout_web/views/tokens/overview_view.ex:39
-#: lib/block_scout_web/views/transaction_view.ex:531
+#: lib/block_scout_web/views/transaction_view.ex:532
 #, elixir-autogen, elixir-format
 msgid "Token Transfers"
 msgstr ""
@@ -3022,7 +3022,7 @@ msgstr ""
 #: lib/block_scout_web/templates/account/tag_transaction/form.html.eex:11
 #: lib/block_scout_web/templates/account/tag_transaction/index.html.eex:23
 #: lib/block_scout_web/templates/address_logs/_logs.html.eex:19
-#: lib/block_scout_web/views/transaction_view.ex:480
+#: lib/block_scout_web/views/transaction_view.ex:481
 #, elixir-autogen, elixir-format
 msgid "Transaction"
 msgstr ""
diff --git a/apps/explorer/lib/explorer/chain.ex b/apps/explorer/lib/explorer/chain.ex
index 881f8d7796b8..f3a8cc6e834a 100644
--- a/apps/explorer/lib/explorer/chain.ex
+++ b/apps/explorer/lib/explorer/chain.ex
@@ -110,7 +110,7 @@ defmodule Explorer.Chain do
     [to_address: :smart_contract] => :optional,
     [from_address: :names] => :optional,
     [to_address: :names] => :optional,
-    token: :required
+    token: :optional
   }
 
   @method_name_to_id_map %{
@@ -410,7 +410,7 @@ defmodule Explorer.Chain do
     rewards_task =
       Task.async(fn -> Reward.fetch_emission_rewards_tuples(address_hash, paging_options, blocks_range, options) end)
 
-    [rewards_task | address_to_transactions_tasks(address_hash, options)]
+    [rewards_task | address_to_transactions_tasks(address_hash, options, true)]
     |> wait_for_address_transactions()
     |> Enum.sort_by(fn item ->
       case item do
@@ -439,11 +439,11 @@ defmodule Explorer.Chain do
     {block_number, index}
   end
 
-  def address_to_transactions_without_rewards(address_hash, options) do
+  def address_to_transactions_without_rewards(address_hash, options, old_ui? \\ true) do
     paging_options = Keyword.get(options, :paging_options, @default_paging_options)
 
     address_hash
-    |> address_to_transactions_tasks(options)
+    |> address_to_transactions_tasks(options, old_ui?)
     |> wait_for_address_transactions()
     |> Enum.sort_by(&{&1.block_number, &1.index}, &>=/2)
     |> Enum.dedup_by(& &1.hash)
@@ -480,7 +480,7 @@ defmodule Explorer.Chain do
     |> Transaction.matching_address_queries_list(direction, address_hash)
   end
 
-  defp address_to_transactions_tasks(address_hash, options) do
+  defp address_to_transactions_tasks(address_hash, options, old_ui?) do
     direction = Keyword.get(options, :direction)
     necessity_by_association = Keyword.get(options, :necessity_by_association, %{})
 
@@ -492,6 +492,7 @@ defmodule Explorer.Chain do
     |> Transaction.not_dropped_or_replaced_transactions()
     |> where_block_number_in_period(from_block, to_block)
     |> join_associations(necessity_by_association)
+    |> put_has_token_transfers_to_tx(old_ui?)
     |> Transaction.matching_address_queries_list(direction, address_hash)
     |> Enum.map(fn query -> Task.async(fn -> select_repo(options).all(query) end) end)
   end
@@ -641,41 +642,21 @@ defmodule Explorer.Chain do
     from_block = from_block(options)
     to_block = to_block(options)
 
-    {block_number, transaction_index, log_index} = paging_options.key || {BlockNumber.get_max(), 0, 0}
-
     base =
       from(log in Log,
-        inner_join: transaction in Transaction,
-        on: transaction.hash == log.transaction_hash,
         order_by: [desc: log.block_number, desc: log.index],
-        where: transaction.block_number < ^block_number,
-        or_where: transaction.block_number == ^block_number and transaction.index > ^transaction_index,
-        or_where:
-          transaction.block_number == ^block_number and transaction.index == ^transaction_index and
-            log.index > ^log_index,
         where: log.address_hash == ^address_hash,
         limit: ^paging_options.page_size,
-        select: log
-      )
-
-    base_query =
-      base
-      |> filter_topic(Keyword.get(options, :topic))
-
-    wrapped_query =
-      from(
-        log in subquery(base_query),
-        inner_join: transaction in Transaction,
-        on: transaction.hash == log.transaction_hash,
-        preload: [:transaction, transaction: [to_address: :smart_contract]],
-        where:
-          log.block_hash == transaction.block_hash and
-            log.block_number == transaction.block_number and
-            log.transaction_hash == transaction.hash,
-        select: log
+        select: log,
+        preload: [transaction: [to_address: :smart_contract]],
+        inner_join: block in Block,
+        on: block.hash == log.block_hash,
+        where: block.consensus
       )
 
-    wrapped_query
+    base
+    |> page_logs(paging_options)
+    |> filter_topic(Keyword.get(options, :topic))
     |> where_block_number_in_period(from_block, to_block)
     |> select_repo(options).all()
     |> Enum.take(paging_options.page_size)
@@ -935,6 +916,7 @@ defmodule Explorer.Chain do
     |> join(:inner, [transaction], block in assoc(transaction, :block))
     |> where([_, block], block.hash == ^block_hash)
     |> join_associations(necessity_by_association)
+    |> put_has_token_transfers_to_tx(old_ui?)
     |> (&if(old_ui?, do: preload(&1, [{:token_transfers, [:token, :from_address, :to_address]}]), else: &1)).()
     |> select_repo(options).all()
     |> (&if(old_ui?,
@@ -1528,7 +1510,7 @@ defmodule Explorer.Chain do
 
   defp search_token_query(term) do
     from(token in Token,
-      where: fragment("to_tsvector(symbol || ' ' || name ) @@ to_tsquery(?)", ^term),
+      where: fragment("to_tsvector('english', symbol || ' ' || name ) @@ to_tsquery(?)", ^term),
       select: %{
         address_hash: token.contract_address_hash,
         tx_hash: fragment("CAST(NULL AS bytea)"),
@@ -1548,7 +1530,7 @@ defmodule Explorer.Chain do
     from(smart_contract in SmartContract,
       left_join: address in Address,
       on: smart_contract.address_hash == address.hash,
-      where: fragment("to_tsvector(name ) @@ to_tsquery(?)", ^term),
+      where: fragment("to_tsvector('english', name) @@ to_tsquery(?)", ^term),
       select: %{
         address_hash: smart_contract.address_hash,
         tx_hash: fragment("CAST(NULL AS bytea)"),
@@ -1735,55 +1717,6 @@ defmodule Explorer.Chain do
     end
   end
 
-  @spec search_token(String.t()) :: [Token.t()]
-  def search_token(string) do
-    case prepare_search_term(string) do
-      {:some, term} ->
-        query =
-          from(token in Token,
-            where: fragment("to_tsvector(symbol || ' ' || name ) @@ to_tsquery(?)", ^term),
-            select: %{
-              link: token.contract_address_hash,
-              symbol: token.symbol,
-              name: token.name,
-              holder_count: token.holder_count,
-              type: "token"
-            },
-            order_by: [desc: token.holder_count]
-          )
-
-        Repo.all(query)
-
-      _ ->
-        []
-    end
-  end
-
-  @spec search_contract(String.t()) :: [SmartContract.t()]
-  def search_contract(string) do
-    case prepare_search_term(string) do
-      {:some, term} ->
-        query =
-          from(smart_contract in SmartContract,
-            left_join: address in Address,
-            on: smart_contract.address_hash == address.hash,
-            where: fragment("to_tsvector(name ) @@ to_tsquery(?)", ^term),
-            select: %{
-              link: smart_contract.address_hash,
-              name: smart_contract.name,
-              inserted_at: address.inserted_at,
-              type: "contract"
-            },
-            order_by: [desc: smart_contract.inserted_at]
-          )
-
-        Repo.all(query)
-
-      _ ->
-        []
-    end
-  end
-
   def search_tx(term) do
     case Chain.string_to_transaction_hash(term) do
       {:ok, tx_hash} ->
@@ -2171,27 +2104,31 @@ defmodule Explorer.Chain do
         options,
         preload_to_detect_tt? \\ true
       ) do
-    limit = if(preload_to_detect_tt?, do: 1, else: @token_transfers_per_transaction_preview + 1)
-
-    token_transfers =
-      TokenTransfer
-      |> (&if(is_nil(block_hash),
-            do: where(&1, [token_transfer], token_transfer.transaction_hash == ^tx_hash),
-            else:
-              where(
-                &1,
-                [token_transfer],
-                token_transfer.transaction_hash == ^tx_hash and token_transfer.block_hash == ^block_hash
-              )
-          )).()
-      |> limit(^limit)
-      |> order_by([token_transfer], asc: token_transfer.log_index)
-      |> join_associations(necessity_by_association)
-      |> select_repo(options).all()
-      |> flat_1155_batch_token_transfers()
-      |> Enum.take(limit)
-
-    %Transaction{transaction | token_transfers: token_transfers}
+    if preload_to_detect_tt? do
+      transaction
+    else
+      limit = if(preload_to_detect_tt?, do: 1, else: @token_transfers_per_transaction_preview + 1)
+
+      token_transfers =
+        TokenTransfer
+        |> (&if(is_nil(block_hash),
+              do: where(&1, [token_transfer], token_transfer.transaction_hash == ^tx_hash),
+              else:
+                where(
+                  &1,
+                  [token_transfer],
+                  token_transfer.transaction_hash == ^tx_hash and token_transfer.block_hash == ^block_hash
+                )
+            )).()
+        |> limit(^limit)
+        |> order_by([token_transfer], asc: token_transfer.log_index)
+        |> (&if(preload_to_detect_tt?, do: &1, else: join_associations(&1, necessity_by_association))).()
+        |> select_repo(options).all()
+        |> flat_1155_batch_token_transfers()
+        |> Enum.take(limit)
+
+      %Transaction{transaction | token_transfers: token_transfers}
+    end
   end
 
   def get_token_transfers_per_transaction_preview_count, do: @token_transfers_per_transaction_preview
@@ -2575,7 +2512,7 @@ defmodule Explorer.Chain do
         case prepare_search_term(filter) do
           {:some, filter_term} ->
             base_query_with_paging
-            |> where(fragment("to_tsvector('english', symbol || ' ' || name ) @@ to_tsquery(?)", ^filter_term))
+            |> where(fragment("to_tsvector('english', symbol || ' ' || name) @@ to_tsquery(?)", ^filter_term))
 
           _ ->
             base_query_with_paging
@@ -3563,6 +3500,7 @@ defmodule Explorer.Chain do
     |> apply_filter_by_method_id_to_transactions(method_id_filter)
     |> apply_filter_by_tx_type_to_transactions(type_filter)
     |> join_associations(necessity_by_association)
+    |> put_has_token_transfers_to_tx(old_ui?)
     |> (&if(old_ui?, do: preload(&1, [{:token_transfers, [:token, :from_address, :to_address]}]), else: &1)).()
     |> select_repo(options).all()
     |> (&if(old_ui?,
@@ -3616,11 +3554,6 @@ defmodule Explorer.Chain do
     |> join_associations(necessity_by_association)
     |> (&if(old_ui?, do: preload(&1, [{:token_transfers, [:token, :from_address, :to_address]}]), else: &1)).()
     |> select_repo(options).all()
-    |> (&if(old_ui?,
-          do: &1,
-          else:
-            Enum.map(&1, fn tx -> preload_token_transfers(tx, @token_transfers_necessity_by_association, options) end)
-        )).()
   end
 
   def pending_transactions_query(query) do
@@ -3816,7 +3749,7 @@ defmodule Explorer.Chain do
     query =
       log_with_transactions
       |> where([_, transaction], transaction.hash == ^transaction_hash)
-      |> page_logs(paging_options)
+      |> page_transaction_logs(paging_options)
       |> limit(^paging_options.page_size)
       |> order_by([log], asc: log.index)
       |> join_associations(necessity_by_association)
@@ -4603,8 +4536,8 @@ defmodule Explorer.Chain do
 
   defp fetch_transactions_in_ascending_order_by_index(paging_options) do
     Transaction
-    |> order_by([transaction], desc: transaction.block_number, asc: transaction.index)
-    |> handle_paging_options(paging_options)
+    |> order_by([transaction], asc: transaction.index)
+    |> handle_block_paging_options(paging_options)
   end
 
   defp for_parent_transaction(query, %Hash{byte_count: unquote(Hash.Full.byte_count())} = hash) do
@@ -4615,6 +4548,16 @@ defmodule Explorer.Chain do
     )
   end
 
+  defp handle_block_paging_options(query, nil), do: query
+
+  defp handle_block_paging_options(query, %PagingOptions{key: nil, page_size: nil}), do: query
+
+  defp handle_block_paging_options(query, paging_options) do
+    query
+    |> page_block_transactions(paging_options)
+    |> limit(^paging_options.page_size)
+  end
+
   defp handle_paging_options(query, nil), do: query
 
   defp handle_paging_options(query, %PagingOptions{key: nil, page_size: nil}), do: query
@@ -4848,6 +4791,24 @@ defmodule Explorer.Chain do
     where(query, [log], log.index > ^index)
   end
 
+  defp page_logs(query, %PagingOptions{key: {block_number, log_index}}) do
+    where(
+      query,
+      [log],
+      log.block_number < ^block_number or (log.block_number == ^block_number and log.index < ^log_index)
+    )
+  end
+
+  defp page_transaction_logs(query, %PagingOptions{key: nil}), do: query
+
+  defp page_transaction_logs(query, %PagingOptions{key: {index}}) do
+    where(query, [log], log.index > ^index)
+  end
+
+  defp page_transaction_logs(query, %PagingOptions{key: {_block_number, index}}) do
+    where(query, [log], log.index > ^index)
+  end
+
   defp page_pending_transaction(query, %PagingOptions{key: nil}), do: query
 
   defp page_pending_transaction(query, %PagingOptions{key: {inserted_at, hash}}) do
@@ -4888,6 +4849,16 @@ defmodule Explorer.Chain do
     where(query, [transaction], transaction.index < ^index)
   end
 
+  defp page_block_transactions(query, %PagingOptions{key: nil}), do: query
+
+  defp page_block_transactions(query, %PagingOptions{key: {_block_number, index}, is_index_in_asc_order: true}) do
+    where(query, [transaction], transaction.index > ^index)
+  end
+
+  defp page_block_transactions(query, %PagingOptions{key: {_block_number, index}}) do
+    where(query, [transaction], transaction.index < ^index)
+  end
+
   defp page_search_results(query, %PagingOptions{key: nil}), do: query
 
   defp page_search_results(query, %PagingOptions{
@@ -5218,12 +5189,21 @@ defmodule Explorer.Chain do
 
       %Token{} = token ->
         {:ok, token}
-
-      [%Token{} = token, nil] ->
-        {:ok, token}
     end
   end
 
+  @spec token_from_address_hash_exists?(Hash.Address.t(), [api?]) :: boolean()
+  def token_from_address_hash_exists?(%Hash{byte_count: unquote(Hash.Address.byte_count())} = hash, options) do
+    query =
+      from(
+        t in Token,
+        where: t.contract_address_hash == ^hash,
+        select: t
+      )
+
+    select_repo(options).exists?(query)
+  end
+
   @spec fetch_token_transfers_from_token_hash(Hash.t(), [paging_options]) :: []
   def fetch_token_transfers_from_token_hash(token_address_hash, options \\ []) do
     TokenTransfer.fetch_token_transfers_from_token_hash(token_address_hash, options)
@@ -5438,16 +5418,9 @@ defmodule Explorer.Chain do
     select_repo(options).exists?(query)
   end
 
-  defp fetch_coin_balances(address_hash, paging_options) do
-    address = Repo.get_by(Address, hash: address_hash)
-
-    if contract?(address) do
-      address_hash
-      |> CoinBalance.fetch_coin_balances(paging_options)
-    else
-      address_hash
-      |> CoinBalance.fetch_coin_balances_with_txs(paging_options)
-    end
+  defp fetch_coin_balances(address, paging_options) do
+    address.hash
+    |> CoinBalance.fetch_coin_balances(paging_options)
   end
 
   @spec fetch_last_token_balance(Hash.Address.t(), Hash.Address.t()) :: Decimal.t()
@@ -5470,15 +5443,16 @@ defmodule Explorer.Chain do
     end
   end
 
-  @spec address_to_coin_balances(Hash.Address.t(), [paging_options | api?]) :: []
-  def address_to_coin_balances(address_hash, options) do
+  @spec address_to_coin_balances(Address.t(), [paging_options | api?]) :: []
+  def address_to_coin_balances(address, options) do
     paging_options = Keyword.get(options, :paging_options, @default_paging_options)
 
     balances_raw =
-      address_hash
+      address
       |> fetch_coin_balances(paging_options)
       |> page_coin_balances(paging_options)
       |> select_repo(options).all()
+      |> preload_transactions(options)
 
     if Enum.empty?(balances_raw) do
       balances_raw
@@ -5528,6 +5502,44 @@ defmodule Explorer.Chain do
     end
   end
 
+  # Here we fetch from DB one tx per one coin balance. It's much more faster than LEFT OUTER JOIN which was before.
+  defp preload_transactions(balances, options) do
+    tasks =
+      Enum.map(balances, fn balance ->
+        Task.async(fn ->
+          Transaction
+          |> where(
+            [tx],
+            tx.block_number == ^balance.block_number and tx.value > ^0 and
+              (tx.to_address_hash == ^balance.address_hash or tx.from_address_hash == ^balance.address_hash)
+          )
+          |> select([tx], tx.hash)
+          |> limit(1)
+          |> select_repo(options).one()
+        end)
+      end)
+
+    tasks
+    |> Task.yield_many(120_000)
+    |> Enum.zip(balances)
+    |> Enum.map(fn {{task, res}, balance} ->
+      case res do
+        {:ok, hash} ->
+          put_tx_hash(hash, balance)
+
+        {:exit, _reason} ->
+          balance
+
+        nil ->
+          Task.shutdown(task, :brutal_kill)
+          balance
+      end
+    end)
+  end
+
+  defp put_tx_hash(hash, coin_balance),
+    do: if(hash, do: %CoinBalance{coin_balance | transaction_hash: hash}, else: coin_balance)
+
   defp add_block_timestamp_to_balances(
          balances_raw_filtered,
          min_block_number,
@@ -6619,7 +6631,7 @@ defmodule Explorer.Chain do
   end
 
   def filter_token_creation_dynamic(dynamic) do
-    dynamic([tx, created_token: created_token], ^dynamic or (is_nil(tx.to_address_hash) and not is_nil(created_token)))
+    dynamic([tx, created_token: created_token], ^dynamic or not is_nil(created_token))
   end
 
   @spec verified_contracts([
@@ -6952,4 +6964,18 @@ defmodule Explorer.Chain do
 
     limit(query, ^fetcher_limit)
   end
+
+  def put_has_token_transfers_to_tx(query, true), do: query
+
+  def put_has_token_transfers_to_tx(query, false) do
+    from(tx in query,
+      select_merge: %{
+        has_token_transfers:
+          fragment(
+            "(SELECT transaction_hash FROM token_transfers WHERE transaction_hash = ? LIMIT 1) IS NOT NULL",
+            tx.hash
+          )
+      }
+    )
+  end
 end
diff --git a/apps/explorer/lib/explorer/chain/address/coin_balance.ex b/apps/explorer/lib/explorer/chain/address/coin_balance.ex
index 037113c28dcd..97e04759585f 100644
--- a/apps/explorer/lib/explorer/chain/address/coin_balance.ex
+++ b/apps/explorer/lib/explorer/chain/address/coin_balance.ex
@@ -7,7 +7,7 @@ defmodule Explorer.Chain.Address.CoinBalance do
   use Explorer.Schema
 
   alias Explorer.PagingOptions
-  alias Explorer.Chain.{Address, Block, Hash, Transaction, Wei}
+  alias Explorer.Chain.{Address, Block, Hash, Wei}
   alias Explorer.Chain.Address.CoinBalance
 
   @optional_fields ~w(value value_fetched_at)a
@@ -43,7 +43,6 @@ defmodule Explorer.Chain.Address.CoinBalance do
     field(:value_fetched_at, :utc_datetime_usec)
     field(:delta, Wei, virtual: true)
     field(:transaction_hash, Hash.Full, virtual: true)
-    field(:transaction_value, Wei, virtual: true)
     field(:block_timestamp, :utc_datetime_usec, virtual: true)
 
     timestamps()
@@ -75,35 +74,6 @@ defmodule Explorer.Chain.Address.CoinBalance do
     )
   end
 
-  @doc """
-  Builds an `Ecto.Query` to fetch the last coin balances that have value greater than 0.
-
-  The last coin balance from an Address is the last block indexed.
-  """
-  def fetch_coin_balances_with_txs(address_hash, %PagingOptions{page_size: page_size}) do
-    query =
-      from(
-        cb in CoinBalance,
-        left_join: tx in Transaction,
-        on:
-          cb.block_number == tx.block_number and tx.value > ^0 and
-            (cb.address_hash == tx.to_address_hash or cb.address_hash == tx.from_address_hash),
-        where: cb.address_hash == ^address_hash,
-        where: not is_nil(cb.value),
-        order_by: [desc: :block_number],
-        select_merge: %{
-          delta: fragment("sa0.value - coalesce(lead(sa0.value, 1) over (order by sa0.block_number desc), 0)"),
-          transaction_hash: tx.hash,
-          transaction_value: tx.value
-        }
-      )
-
-    from(balance in subquery(query),
-      where: balance.delta != 0,
-      limit: ^page_size
-    )
-  end
-
   def fetch_coin_balances(address_hash, %PagingOptions{page_size: page_size}) do
     query =
       from(
@@ -112,7 +82,7 @@ defmodule Explorer.Chain.Address.CoinBalance do
         where: not is_nil(cb.value),
         order_by: [desc: :block_number],
         select_merge: %{
-          delta: fragment("sa0.value - coalesce(lead(sa0.value, 1) over (order by sa0.block_number desc), 0)")
+          delta: fragment("? - coalesce(lead(?, 1) over (order by ? desc), 0)", cb.value, cb.value, cb.block_number)
         }
       )
 
@@ -120,8 +90,7 @@ defmodule Explorer.Chain.Address.CoinBalance do
       where: balance.delta != 0,
       limit: ^page_size,
       select_merge: %{
-        transaction_hash: nil,
-        transaction_value: nil
+        transaction_hash: nil
       }
     )
   end
diff --git a/apps/explorer/lib/explorer/chain/csv_export/address_log_csv_exporter.ex b/apps/explorer/lib/explorer/chain/csv_export/address_log_csv_exporter.ex
index 5e4e81a6acb9..0281bb6e4745 100644
--- a/apps/explorer/lib/explorer/chain/csv_export/address_log_csv_exporter.ex
+++ b/apps/explorer/lib/explorer/chain/csv_export/address_log_csv_exporter.ex
@@ -32,8 +32,8 @@ defmodule Explorer.Chain.CSVExport.AddressLogCsvExporter do
     new_acc = logs ++ acc
 
     case Enum.split(logs, Helper.page_size()) do
-      {_logs, [%Log{block_number: block_number, transaction: %Transaction{index: transaction_index}, index: index}]} ->
-        new_paging_options = %{@paging_options | key: {block_number, transaction_index, index}}
+      {_logs, [%Log{block_number: block_number, transaction: %Transaction{index: _transaction_index}, index: index}]} ->
+        new_paging_options = %{@paging_options | key: {block_number, index}}
         fetch_all_logs(address_hash, from_block, to_block, filter_type, filter_value, new_paging_options, new_acc)
 
       {_, []} ->
diff --git a/apps/explorer/lib/explorer/chain/log.ex b/apps/explorer/lib/explorer/chain/log.ex
index 8524d7c89a4b..71b109cfbce1 100644
--- a/apps/explorer/lib/explorer/chain/log.ex
+++ b/apps/explorer/lib/explorer/chain/log.ex
@@ -121,59 +121,73 @@ defmodule Explorer.Chain.Log do
   Decode transaction log data.
   """
 
-  def decode(log, transaction, options \\ [], skip_sig_provider? \\ false) do
-    address_options =
-      [
-        necessity_by_association: %{
-          :smart_contract => :optional
-        }
-      ]
-      |> Keyword.merge(options)
-
-    case Chain.find_contract_address(log.address_hash, address_options, true) do
-      {:ok, %{smart_contract: smart_contract}} ->
-        full_abi = Chain.combine_proxy_implementation_abi(smart_contract, options)
+  def decode(log, transaction, options, skip_sig_provider?, contracts_acc \\ %{}, events_acc \\ %{}) do
+    case check_cache(contracts_acc, log.address_hash, options) do
+      {nil, contracts_acc} ->
+        {result, events_acc} = find_candidates(log, transaction, options, events_acc)
+        {result, contracts_acc, events_acc}
 
+      {full_abi, contracts_acc} ->
         with {:ok, selector, mapping} <- find_and_decode(full_abi, log, transaction),
              identifier <- Base.encode16(selector.method_id, case: :lower),
              text <- function_call(selector.function, mapping) do
-          {:ok, identifier, text, mapping}
+          {{:ok, identifier, text, mapping}, contracts_acc, events_acc}
         else
           {:error, :could_not_decode} ->
-            case find_candidates(log, transaction, options) do
-              {:error, :contract_not_verified, []} ->
-                decode_event_via_sig_provider(log, transaction, false, skip_sig_provider?)
+            case find_candidates(log, transaction, options, events_acc) do
+              {{:error, :contract_not_verified, []}, events_acc} ->
+                {decode_event_via_sig_provider(log, transaction, false, skip_sig_provider?), contracts_acc, events_acc}
 
-              {:error, :contract_not_verified, candidates} ->
-                {:error, :contract_verified, candidates}
+              {{:error, :contract_not_verified, candidates}, events_acc} ->
+                {{:error, :contract_verified, candidates}, contracts_acc, events_acc}
 
-              _ ->
-                decode_event_via_sig_provider(log, transaction, false, skip_sig_provider?)
+              {_, events_acc} ->
+                {decode_event_via_sig_provider(log, transaction, false, skip_sig_provider?), contracts_acc, events_acc}
             end
 
-          output ->
-            output
+          {:error, reason} ->
+            {{:error, reason}, contracts_acc, events_acc}
         end
+    end
+  end
 
-      _ ->
-        find_candidates(log, transaction, options)
+  defp check_cache(acc, address_hash, options) do
+    address_options =
+      [
+        necessity_by_association: %{
+          :smart_contract => :optional
+        }
+      ]
+      |> Keyword.merge(options)
+
+    if !is_nil(address_hash) && Map.has_key?(acc, address_hash) do
+      {acc[address_hash], acc}
+    else
+      case Chain.find_contract_address(address_hash, address_options, false) do
+        {:ok, %{smart_contract: smart_contract}} ->
+          full_abi = Chain.combine_proxy_implementation_abi(smart_contract, options)
+          {full_abi, Map.put(acc, address_hash, full_abi)}
+
+        _ ->
+          {nil, Map.put(acc, address_hash, nil)}
+      end
     end
   end
 
-  defp find_candidates(log, transaction, options) do
+  defp find_candidates(log, transaction, options, events_acc) do
     case log.first_topic do
       "0x" <> hex_part ->
         case Integer.parse(hex_part, 16) do
           {number, ""} ->
             <<method_id::binary-size(4), _rest::binary>> = :binary.encode_unsigned(number)
-            find_candidates_query(method_id, log, transaction, options)
+            check_events_cache(events_acc, method_id, log, transaction, options)
 
           _ ->
-            {:error, :could_not_decode}
+            {{:error, :could_not_decode}, events_acc}
         end
 
       _ ->
-        {:error, :could_not_decode}
+        {{:error, :could_not_decode}, events_acc}
     end
   end
 
@@ -206,6 +220,15 @@ defmodule Explorer.Chain.Log do
      if(candidates == [], do: decode_event_via_sig_provider(log, transaction, true), else: candidates)}
   end
 
+  defp check_events_cache(events_acc, method_id, log, transaction, options) do
+    if Map.has_key?(events_acc, method_id) do
+      {events_acc[method_id], events_acc}
+    else
+      result = find_candidates_query(method_id, log, transaction, options)
+      {result, Map.put(events_acc, method_id, result)}
+    end
+  end
+
   defp find_and_decode(abi, log, transaction) do
     with {%FunctionSelector{} = selector, mapping} <-
            abi
diff --git a/apps/explorer/lib/explorer/chain/transaction.ex b/apps/explorer/lib/explorer/chain/transaction.ex
index f088e82aedf0..c6c8e3009aa6 100644
--- a/apps/explorer/lib/explorer/chain/transaction.ex
+++ b/apps/explorer/lib/explorer/chain/transaction.ex
@@ -240,6 +240,7 @@ defmodule Explorer.Chain.Transaction do
     field(:max_fee_per_gas, Wei)
     field(:type, :integer)
     field(:has_error_in_internal_txs, :boolean)
+    field(:has_token_transfers, :boolean, virtual: true)
 
     # A transient field for deriving old block hash during transaction upserts.
     # Used to force refetch of a block in case a transaction is re-collated
@@ -461,14 +462,17 @@ defmodule Explorer.Chain.Transaction do
       {number, ""} ->
         binary_revert_reason = :binary.encode_unsigned(number)
 
-        decoded_input_data(
-          %Transaction{
-            to_address: smart_contract,
-            hash: hash,
-            input: %Data{bytes: binary_revert_reason}
-          },
-          options
-        )
+        {result, _, _} =
+          decoded_input_data(
+            %Transaction{
+              to_address: smart_contract,
+              hash: hash,
+              input: %Data{bytes: binary_revert_reason}
+            },
+            options
+          )
+
+        result
 
       _ ->
         hex_revert_reason
@@ -476,16 +480,21 @@ defmodule Explorer.Chain.Transaction do
   end
 
   # Because there is no contract association, we know the contract was not verified
-  def decoded_input_data(tx, skip_sig_provider? \\ false, options)
+  def decoded_input_data(tx, skip_sig_provider? \\ false, options, full_abi_acc \\ %{}, methods_acc \\ %{})
+
+  def decoded_input_data(%__MODULE__{to_address: nil}, _, _, full_abi_acc, methods_acc),
+    do: {{:error, :no_to_address}, full_abi_acc, methods_acc}
 
-  def decoded_input_data(%__MODULE__{to_address: nil}, _, _), do: {:error, :no_to_address}
-  def decoded_input_data(%NotLoaded{}, _, _), do: {:error, :not_loaded}
+  def decoded_input_data(%NotLoaded{}, _, _, full_abi_acc, methods_acc),
+    do: {{:error, :not_loaded}, full_abi_acc, methods_acc}
 
-  def decoded_input_data(%__MODULE__{input: %{bytes: bytes}}, _, _) when bytes in [nil, <<>>],
-    do: {:error, :no_input_data}
+  def decoded_input_data(%__MODULE__{input: %{bytes: bytes}}, _, _, full_abi_acc, methods_acc)
+      when bytes in [nil, <<>>],
+      do: {{:error, :no_input_data}, full_abi_acc, methods_acc}
 
   if not Application.compile_env(:explorer, :decode_not_a_contract_calls) do
-    def decoded_input_data(%__MODULE__{to_address: %{contract_code: nil}}, _, _), do: {:error, :not_a_contract_call}
+    def decoded_input_data(%__MODULE__{to_address: %{contract_code: nil}}, _, _, full_abi_acc, methods_acc),
+      do: {{:error, :not_a_contract_call}, full_abi_acc, methods_acc}
   end
 
   def decoded_input_data(
@@ -495,7 +504,9 @@ defmodule Explorer.Chain.Transaction do
           hash: hash
         },
         skip_sig_provider?,
-        options
+        options,
+        full_abi_acc,
+        methods_acc
       ) do
     decoded_input_data(
       %__MODULE__{
@@ -504,7 +515,9 @@ defmodule Explorer.Chain.Transaction do
         hash: hash
       },
       skip_sig_provider?,
-      options
+      options,
+      full_abi_acc,
+      methods_acc
     )
   end
 
@@ -515,7 +528,9 @@ defmodule Explorer.Chain.Transaction do
           hash: hash
         },
         skip_sig_provider?,
-        options
+        options,
+        full_abi_acc,
+        methods_acc
       ) do
     decoded_input_data(
       %__MODULE__{
@@ -524,7 +539,9 @@ defmodule Explorer.Chain.Transaction do
         hash: hash
       },
       skip_sig_provider?,
-      options
+      options,
+      full_abi_acc,
+      methods_acc
     )
   end
 
@@ -535,31 +552,30 @@ defmodule Explorer.Chain.Transaction do
           hash: hash
         },
         skip_sig_provider?,
-        options
+        options,
+        full_abi_acc,
+        methods_acc
       ) do
-    candidates_query =
-      from(
-        contract_method in ContractMethod,
-        where: contract_method.identifier == ^method_id,
-        limit: 1
-      )
+    {methods, methods_acc} =
+      method_id
+      |> check_methods_cache(methods_acc, options)
 
     candidates =
-      candidates_query
-      |> Chain.select_repo(options).all()
+      methods
       |> Enum.flat_map(fn candidate ->
-        case do_decoded_input_data(data, %SmartContract{abi: [candidate.abi], address_hash: nil}, hash, options) do
-          {:ok, _, _, _} = decoded -> [decoded]
+        case do_decoded_input_data(data, %SmartContract{abi: [candidate.abi], address_hash: nil}, hash, options, %{}) do
+          {{:ok, _, _, _} = decoded, _} -> [decoded]
           _ -> []
         end
       end)
 
-    {:error, :contract_not_verified,
-     if(candidates == [], do: decode_function_call_via_sig_provider(input, hash, skip_sig_provider?), else: candidates)}
+    {{:error, :contract_not_verified,
+      if(candidates == [], do: decode_function_call_via_sig_provider(input, hash, skip_sig_provider?), else: candidates)},
+     full_abi_acc, methods_acc}
   end
 
-  def decoded_input_data(%__MODULE__{to_address: %{smart_contract: nil}}, _, _) do
-    {:error, :contract_not_verified, []}
+  def decoded_input_data(%__MODULE__{to_address: %{smart_contract: nil}}, _, _, full_abi_acc, methods_acc) do
+    {{:error, :contract_not_verified, []}, full_abi_acc, methods_acc}
   end
 
   def decoded_input_data(
@@ -569,11 +585,13 @@ defmodule Explorer.Chain.Transaction do
           hash: hash
         },
         skip_sig_provider?,
-        options
+        options,
+        full_abi_acc,
+        methods_acc
       ) do
-    case do_decoded_input_data(data, smart_contract, hash, options) do
+    case do_decoded_input_data(data, smart_contract, hash, options, full_abi_acc) do
       # In some cases transactions use methods of some unpredictable contracts, so we can try to look up for method in a whole DB
-      {:error, :could_not_decode} ->
+      {{:error, :could_not_decode}, full_abi_acc} ->
         case decoded_input_data(
                %__MODULE__{
                  to_address: %{smart_contract: nil},
@@ -581,20 +599,22 @@ defmodule Explorer.Chain.Transaction do
                  hash: hash
                },
                skip_sig_provider?,
-               options
+               options,
+               full_abi_acc,
+               methods_acc
              ) do
-          {:error, :contract_not_verified, []} ->
-            decode_function_call_via_sig_provider_wrapper(input, hash, skip_sig_provider?)
+          {{:error, :contract_not_verified, []}, full_abi_acc, methods_acc} ->
+            {decode_function_call_via_sig_provider_wrapper(input, hash, skip_sig_provider?), full_abi_acc, methods_acc}
 
-          {:error, :contract_not_verified, candidates} ->
-            {:error, :contract_verified, candidates}
+          {{:error, :contract_not_verified, candidates}, full_abi_acc, methods_acc} ->
+            {{:error, :contract_verified, candidates}, full_abi_acc, methods_acc}
 
-          _ ->
-            {:error, :could_not_decode}
+          {_, full_abi_acc, methods_acc} ->
+            {{:error, :could_not_decode}, full_abi_acc, methods_acc}
         end
 
-      output ->
-        output
+      {output, full_abi_acc} ->
+        {output, full_abi_acc, methods_acc}
     end
   end
 
@@ -608,14 +628,16 @@ defmodule Explorer.Chain.Transaction do
     end
   end
 
-  defp do_decoded_input_data(data, smart_contract, hash, options) do
-    full_abi = Chain.combine_proxy_implementation_abi(smart_contract, options)
+  defp do_decoded_input_data(data, smart_contract, hash, options, full_abi_acc) do
+    {full_abi, full_abi_acc} = check_full_abi_cache(smart_contract, full_abi_acc, options)
 
-    with {:ok, {selector, values}} <- find_and_decode(full_abi, data, hash),
-         {:ok, mapping} <- selector_mapping(selector, values, hash),
-         identifier <- Base.encode16(selector.method_id, case: :lower),
-         text <- function_call(selector.function, mapping),
-         do: {:ok, identifier, text, mapping}
+    {with(
+       {:ok, {selector, values}} <- find_and_decode(full_abi, data, hash),
+       {:ok, mapping} <- selector_mapping(selector, values, hash),
+       identifier <- Base.encode16(selector.method_id, case: :lower),
+       text <- function_call(selector.function, mapping),
+       do: {:ok, identifier, text, mapping}
+     ), full_abi_acc}
   end
 
   defp decode_function_call_via_sig_provider(%{bytes: data} = input, hash, skip_sig_provider?) do
@@ -625,8 +647,8 @@ defmodule Explorer.Chain.Transaction do
          true <- is_list(result),
          false <- Enum.empty?(result),
          abi <- [result |> List.first() |> Map.put("outputs", []) |> Map.put("type", "function")],
-         {:ok, _, _, _} = candidate <-
-           do_decoded_input_data(data, %SmartContract{abi: abi, address_hash: nil}, hash, []) do
+         {{:ok, _, _, _} = candidate, _} <-
+           do_decoded_input_data(data, %SmartContract{abi: abi, address_hash: nil}, hash, [], %{}) do
       [candidate]
     else
       _ ->
@@ -634,6 +656,35 @@ defmodule Explorer.Chain.Transaction do
     end
   end
 
+  defp check_methods_cache(method_id, methods_acc, options) do
+    if Map.has_key?(methods_acc, method_id) do
+      {methods_acc[method_id], methods_acc}
+    else
+      candidates_query =
+        from(
+          contract_method in ContractMethod,
+          where: contract_method.identifier == ^method_id,
+          limit: 1
+        )
+
+      result =
+        candidates_query
+        |> Chain.select_repo(options).all()
+
+      {result, Map.put(methods_acc, method_id, result)}
+    end
+  end
+
+  defp check_full_abi_cache(%{address_hash: address_hash} = smart_contract, full_abi_acc, options) do
+    if !is_nil(address_hash) && Map.has_key?(full_abi_acc, address_hash) do
+      {full_abi_acc[address_hash], full_abi_acc}
+    else
+      full_abi = Chain.combine_proxy_implementation_abi(smart_contract, options)
+
+      {full_abi, Map.put(full_abi_acc, address_hash, full_abi)}
+    end
+  end
+
   def get_method_name(
         %__MODULE__{
           input: %{bytes: <<method_id::binary-size(4), _::binary>>}
@@ -651,10 +702,10 @@ defmodule Explorer.Chain.Transaction do
              true,
              []
            ) do
-        {:error, :contract_not_verified, [{:ok, _method_id, decoded_func, _}]} ->
+        {{:error, :contract_not_verified, [{:ok, _method_id, decoded_func, _}]}, _, _} ->
           parse_method_name(decoded_func)
 
-        {:error, :contract_not_verified, []} ->
+        {{:error, :contract_not_verified, []}, _, _} ->
           "0x" <> Base.encode16(method_id, case: :lower)
 
         _ ->
diff --git a/apps/explorer/test/explorer/chain/log_test.exs b/apps/explorer/test/explorer/chain/log_test.exs
index 3da55a86c14a..1b5df9388e9c 100644
--- a/apps/explorer/test/explorer/chain/log_test.exs
+++ b/apps/explorer/test/explorer/chain/log_test.exs
@@ -58,7 +58,7 @@ defmodule Explorer.Chain.LogTest do
 
       log = insert(:log, transaction: transaction)
 
-      assert Log.decode(log, transaction) == {:error, :could_not_decode}
+      assert {{:error, :could_not_decode}, _, _} = Log.decode(log, transaction, [], false)
     end
 
     test "that a contract call transaction that has a verified contract returns the decoded input data" do
@@ -106,16 +106,15 @@ defmodule Explorer.Chain.LogTest do
 
       get_eip1967_implementation()
 
-      assert Log.decode(log, transaction) ==
-               {:ok, "eb9b3c4c", "WantsPets(string indexed _from_human, uint256 _number, bool indexed _belly)",
-                [
-                  {"_from_human", "string", true,
-                   {:dynamic,
-                    <<56, 228, 122, 123, 113, 157, 206, 99, 102, 42, 234, 244, 52, 64, 50, 111, 85, 27, 138, 126, 225,
-                      152, 206, 227, 92, 181, 213, 23, 242, 210, 150, 162>>}},
-                  {"_number", "uint256", false, 0},
-                  {"_belly", "bool", true, true}
-                ]}
+      assert {{:ok, "eb9b3c4c", "WantsPets(string indexed _from_human, uint256 _number, bool indexed _belly)",
+               [
+                 {"_from_human", "string", true,
+                  {:dynamic,
+                   <<56, 228, 122, 123, 113, 157, 206, 99, 102, 42, 234, 244, 52, 64, 50, 111, 85, 27, 138, 126, 225,
+                     152, 206, 227, 92, 181, 213, 23, 242, 210, 150, 162>>}},
+                 {"_number", "uint256", false, 0},
+                 {"_belly", "bool", true, true}
+               ]}, _, _} = Log.decode(log, transaction, [], false)
     end
 
     test "finds decoding candidates" do
@@ -159,19 +158,18 @@ defmodule Explorer.Chain.LogTest do
           data: data
         )
 
-      assert Log.decode(log, transaction) ==
-               {:error, :contract_not_verified,
-                [
-                  {:ok, "eb9b3c4c", "WantsPets(string indexed _from_human, uint256 _number, bool indexed _belly)",
-                   [
-                     {"_from_human", "string", true,
-                      {:dynamic,
-                       <<56, 228, 122, 123, 113, 157, 206, 99, 102, 42, 234, 244, 52, 64, 50, 111, 85, 27, 138, 126,
-                         225, 152, 206, 227, 92, 181, 213, 23, 242, 210, 150, 162>>}},
-                     {"_number", "uint256", false, 0},
-                     {"_belly", "bool", true, true}
-                   ]}
-                ]}
+      assert {{:error, :contract_not_verified,
+               [
+                 {:ok, "eb9b3c4c", "WantsPets(string indexed _from_human, uint256 _number, bool indexed _belly)",
+                  [
+                    {"_from_human", "string", true,
+                     {:dynamic,
+                      <<56, 228, 122, 123, 113, 157, 206, 99, 102, 42, 234, 244, 52, 64, 50, 111, 85, 27, 138, 126, 225,
+                        152, 206, 227, 92, 181, 213, 23, 242, 210, 150, 162>>}},
+                    {"_number", "uint256", false, 0},
+                    {"_belly", "bool", true, true}
+                  ]}
+               ]}, _, _} = Log.decode(log, transaction, [], false)
     end
   end
 
diff --git a/apps/explorer/test/explorer/chain/transaction_test.exs b/apps/explorer/test/explorer/chain/transaction_test.exs
index 54fdead2cd40..a517ac27d99e 100644
--- a/apps/explorer/test/explorer/chain/transaction_test.exs
+++ b/apps/explorer/test/explorer/chain/transaction_test.exs
@@ -247,7 +247,7 @@ defmodule Explorer.Chain.TransactionTest do
     test "that a transaction that is not a contract call returns a commensurate error" do
       transaction = insert(:transaction)
 
-      assert Transaction.decoded_input_data(transaction, []) == {:error, :not_a_contract_call}
+      assert {{:error, :not_a_contract_call}, _, _} = Transaction.decoded_input_data(transaction, [])
     end
 
     test "that a contract call transaction that has no verified contract returns a commensurate error" do
@@ -256,7 +256,7 @@ defmodule Explorer.Chain.TransactionTest do
         |> insert(to_address: insert(:contract_address))
         |> Repo.preload(to_address: :smart_contract)
 
-      assert Transaction.decoded_input_data(transaction, []) == {:error, :contract_not_verified, []}
+      assert {{:error, :contract_not_verified, []}, _, _} = Transaction.decoded_input_data(transaction, [])
     end
 
     test "that a contract call transaction that has a verified contract returns the decoded input data" do
@@ -267,8 +267,8 @@ defmodule Explorer.Chain.TransactionTest do
 
       get_eip1967_implementation()
 
-      assert Transaction.decoded_input_data(transaction, []) ==
-               {:ok, "60fe47b1", "set(uint256 x)", [{"x", "uint256", 50}]}
+      assert {{:ok, "60fe47b1", "set(uint256 x)", [{"x", "uint256", 50}]}, _, _} =
+               Transaction.decoded_input_data(transaction, [])
     end
 
     test "that a contract call will look up a match in contract_methods table" do
@@ -290,8 +290,8 @@ defmodule Explorer.Chain.TransactionTest do
 
       get_eip1967_implementation()
 
-      assert Transaction.decoded_input_data(transaction, []) ==
-               {:ok, "60fe47b1", "set(uint256 x)", [{"x", "uint256", 10}]}
+      assert {{:ok, "60fe47b1", "set(uint256 x)", [{"x", "uint256", 10}]}, _, _} =
+               Transaction.decoded_input_data(transaction, [])
     end
   end
 
diff --git a/apps/explorer/test/explorer/chain_test.exs b/apps/explorer/test/explorer/chain_test.exs
index de55e1a3629a..5e284529a8c6 100644
--- a/apps/explorer/test/explorer/chain_test.exs
+++ b/apps/explorer/test/explorer/chain_test.exs
@@ -299,7 +299,7 @@ defmodule Explorer.ChainTest do
         |> insert(to_address: address)
         |> with_block()
 
-      log1 = insert(:log, transaction: transaction, index: 1, address: address, block_number: transaction.block_number)
+      _log1 = insert(:log, transaction: transaction, index: 1, address: address, block_number: transaction.block_number)
 
       2..51
       |> Enum.map(fn index ->
@@ -317,7 +317,7 @@ defmodule Explorer.ChainTest do
 
       [_log] = Chain.address_to_logs(address_hash, paging_options: paging_options1)
 
-      paging_options2 = %PagingOptions{page_size: 60, key: {transaction.block_number, transaction.index, log1.index}}
+      paging_options2 = %PagingOptions{page_size: 60, key: {transaction.block_number, 51}}
 
       assert Enum.count(Chain.address_to_logs(address_hash, paging_options: paging_options2)) == 50
     end
@@ -942,7 +942,7 @@ defmodule Explorer.ChainTest do
 
       assert second_page_hashes ==
                block.hash
-               |> Chain.block_to_transactions(paging_options: %PagingOptions{key: {index}, page_size: 50})
+               |> Chain.block_to_transactions(paging_options: %PagingOptions{key: {block.number, index}, page_size: 50})
                |> Enum.map(& &1.hash)
     end
 
@@ -4979,41 +4979,6 @@ defmodule Explorer.ChainTest do
     end
   end
 
-  describe "search_token/1" do
-    test "finds by part of the name" do
-      token = insert(:token, name: "magic token", symbol: "MAGIC")
-
-      [result] = Chain.search_token("magic")
-
-      assert result.link == token.contract_address_hash
-    end
-
-    test "finds multiple results in different columns" do
-      insert(:token, name: "magic token", symbol: "TOKEN")
-      insert(:token, name: "token", symbol: "MAGIC")
-
-      result = Chain.search_token("magic")
-
-      assert Enum.count(result) == 2
-    end
-
-    test "do not returns wrong tokens" do
-      insert(:token, name: "token", symbol: "TOKEN")
-
-      result = Chain.search_token("magic")
-
-      assert Enum.empty?(result)
-    end
-
-    test "finds record by the term in the second word" do
-      insert(:token, name: "token magic", symbol: "TOKEN")
-
-      result = Chain.search_token("magic")
-
-      assert Enum.count(result) == 1
-    end
-  end
-
   describe "transaction_has_token_transfers?/1" do
     test "returns true if transaction has token transfers" do
       transaction = insert(:transaction)

From 171a81a45b6cb1408d0520fa1a2e660fabbebc34 Mon Sep 17 00:00:00 2001
From: Victor Baranov <baranov.viktor.27@gmail.com>
Date: Tue, 20 Jun 2023 16:27:48 +0300
Subject: [PATCH 121/909] Store and display native coin market cap from the DB
 (#7585)

* Store and display market cap from the DB

* Fix reviwer comments

* Fix reviewer comment

* Fix reviewer comments

* Process reviwer comments

* Fix failing incompatible test

* Fix test

* Fix history_chart.js

Return available_supply for backward compatibility
---
 CHANGELOG.md                                  |   1 +
 .../assets/js/lib/history_chart.js            |  31 ++---
 .../channels/address_channel.ex               |   7 +-
 .../account/api/v1/user_controller.ex         |   7 +-
 .../address_coin_balance_controller.ex        |   5 +-
 .../address_contract_controller.ex            |   3 +-
 .../controllers/address_controller.ex         |   7 +-
 .../address_decompiled_contract_controller.ex |   3 +-
 ...address_internal_transaction_controller.ex |   5 +-
 .../controllers/address_logs_controller.ex    |   3 +-
 .../address_read_contract_controller.ex       |   3 +-
 .../address_read_proxy_controller.ex          |   3 +-
 .../controllers/address_token_controller.ex   |   3 +-
 .../address_token_transfer_controller.ex      |   5 +-
 .../address_transaction_controller.ex         |   5 +-
 .../address_validation_controller.ex          |   3 +-
 .../address_withdrawal_controller.ex          |   5 +-
 .../address_write_contract_controller.ex      |   3 +-
 .../address_write_proxy_controller.ex         |   3 +-
 .../controllers/api/rpc/stats_controller.ex   |   6 +-
 .../controllers/api/v2/address_controller.ex  |   3 +-
 .../controllers/api/v2/stats_controller.ex    |  21 +--
 .../chain/market_history_chart_controller.ex  |  31 +++--
 .../controllers/chain_controller.ex           |   3 +-
 .../controllers/transaction_controller.ex     |   5 +-
 ...saction_internal_transaction_controller.ex |   3 +-
 .../controllers/transaction_log_controller.ex |   3 +-
 .../transaction_raw_trace_controller.ex       |   3 +-
 .../transaction_state_controller.ex           |   3 +-
 .../transaction_token_transfer_controller.ex  |   3 +-
 .../lib/block_scout_web/notifier.ex           |   5 +-
 .../views/account/watchlist_view.ex           |   3 +-
 .../views/api/v2/address_view.ex              |   3 +-
 .../views/api/v2/transaction_view.ex          |   3 +-
 .../api/v2/stats_controller_test.exs          |   1 -
 .../address_transaction_csv_exporter.ex       |   3 +-
 .../explorer/chain/supply/exchange_rate.ex    |   3 +-
 .../lib/explorer/exchange_rates/token.ex      |  20 +--
 .../lib/explorer/market/history/cataloger.ex  | 120 +++++++++++++++---
 .../market/history/source/market_cap.ex       |  18 +++
 .../history/source/market_cap/coin_gecko.ex   |  60 +++++++++
 .../history/{source.ex => source/price.ex}    |   6 +-
 .../source/{ => price}/crypto_compare.ex      |  12 +-
 apps/explorer/lib/explorer/market/market.ex   |  42 ++++--
 .../lib/explorer/market/market_history.ex     |   5 +-
 ...30074105_market_history_add_market_cap.exs |   9 ++
 .../market/history/cataloger_test.exs         |  55 ++++++--
 .../{ => price}/crypto_compare_test.exs       |  12 +-
 apps/explorer/test/test_helper.exs            |   2 +-
 49 files changed, 384 insertions(+), 187 deletions(-)
 create mode 100644 apps/explorer/lib/explorer/market/history/source/market_cap.ex
 create mode 100644 apps/explorer/lib/explorer/market/history/source/market_cap/coin_gecko.ex
 rename apps/explorer/lib/explorer/market/history/{source.ex => source/price.ex} (58%)
 rename apps/explorer/lib/explorer/market/history/source/{ => price}/crypto_compare.ex (86%)
 create mode 100644 apps/explorer/priv/repo/migrations/20230530074105_market_history_add_market_cap.exs
 rename apps/explorer/test/explorer/market/history/source/{ => price}/crypto_compare_test.exs (90%)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 93c936cb11ab..84d19f6ba806 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,6 +10,7 @@
 - [#7653](https://github.com/blockscout/blockscout/pull/7653) - Add support for DEPOSIT and WITHDRAW token transfer event in older contracts
 - [#7628](https://github.com/blockscout/blockscout/pull/7628) - Support partially verified property from verifier MS; Add property to track contracts automatically verified via eth-bytecode-db
 - [#7603](https://github.com/blockscout/blockscout/pull/7603) - Add Polygon Edge and optimism genesis files support
+- [#7585](https://github.com/blockscout/blockscout/pull/7585) - Store and display native coin market cap from the DB
 - [#7513](https://github.com/blockscout/blockscout/pull/7513) - Add Polygon Edge support
 - [#7532](https://github.com/blockscout/blockscout/pull/7532) - Handle empty id in json rpc responses
 - [#7544](https://github.com/blockscout/blockscout/pull/7544) - Add ERC-1155 signatures to uncataloged_token_transfer_block_numbers
diff --git a/apps/block_scout_web/assets/js/lib/history_chart.js b/apps/block_scout_web/assets/js/lib/history_chart.js
index b8f451d72cba..d861602128aa 100644
--- a/apps/block_scout_web/assets/js/lib/history_chart.js
+++ b/apps/block_scout_web/assets/js/lib/history_chart.js
@@ -14,6 +14,7 @@ Chart.register(LineController, LineElement, PointElement, LinearScale, TimeScale
 
 // @ts-ignore
 const coinName = document.getElementById('js-coin-name').value
+// @ts-ignore
 const chainId = document.getElementById('js-chain-id').value
 const priceDataKey = `priceData${coinName}`
 const txHistoryDataKey = `txHistoryData${coinName}${chainId}`
@@ -188,15 +189,12 @@ function getTxHistoryData (transactionHistory) {
   return data
 }
 
-function getMarketCapData (marketHistoryData, availableSupply) {
+function getMarketCapData (marketHistoryData) {
   if (marketHistoryData.length === 0) {
     return getDataFromLocalStorage(marketCapDataKey)
   }
-  const data = marketHistoryData.map(({ date, closingPrice }) => {
-    const supply = (availableSupply !== null && typeof availableSupply === 'object')
-      ? availableSupply[date]
-      : availableSupply
-    return { x: date, y: closingPrice * supply }
+  const data = marketHistoryData.map(({ date, marketCap }) => {
+    return { x: date, y: marketCap }
   })
   setDataToLocalStorage(marketCapDataKey, data)
   return data
@@ -207,7 +205,7 @@ const priceLineColor = getPriceChartColor()
 const mcapLineColor = getMarketCapChartColor()
 
 class MarketHistoryChart {
-  constructor (el, availableSupply, _marketHistoryData, dataConfig) {
+  constructor (el, _marketHistoryData, dataConfig) {
     const axes = config.options.scales
 
     let priceActivated = true
@@ -271,8 +269,6 @@ class MarketHistoryChart {
       axes.numTransactions.position = 'left'
     }
 
-    this.availableSupply = availableSupply
-
     const txChartTitle = 'Daily transactions'
     const marketChartTitle = 'Daily price and market cap'
     let chartTitle = ''
@@ -297,15 +293,9 @@ class MarketHistoryChart {
     this.chart = new Chart(el, config)
   }
 
-  updateMarketHistory (availableSupply, marketHistoryData) {
+  updateMarketHistory (marketHistoryData) {
     this.price.data = getPriceData(marketHistoryData)
-    if (this.availableSupply !== null && typeof this.availableSupply === 'object') {
-      const today = new Date().toJSON().slice(0, 10)
-      this.availableSupply[today] = availableSupply
-      this.marketCap.data = getMarketCapData(marketHistoryData, this.availableSupply)
-    } else {
-      this.marketCap.data = getMarketCapData(marketHistoryData, availableSupply)
-    }
+    this.marketCap.data = getMarketCapData(marketHistoryData)
     this.chart.update()
   }
 
@@ -320,17 +310,16 @@ export function createMarketHistoryChart (el) {
   const dataConfig = $(el).data('history_chart_config')
 
   const $chartError = $('[data-chart-error-message]')
-  const chart = new MarketHistoryChart(el, 0, [], dataConfig)
+  const chart = new MarketHistoryChart(el, [], dataConfig)
   Object.keys(dataPaths).forEach(function (historySource) {
     $.getJSON(dataPaths[historySource], { type: 'JSON' })
       .done(data => {
         switch (historySource) {
           case 'market': {
-            const availableSupply = JSON.parse(data.supply_data)
-            const marketHistoryData = humps.camelizeKeys(JSON.parse(data.history_data))
+            const marketHistoryData = humps.camelizeKeys(data.history_data)
 
             $(el).show()
-            chart.updateMarketHistory(availableSupply, marketHistoryData)
+            chart.updateMarketHistory(marketHistoryData)
             break
           }
           case 'transaction': {
diff --git a/apps/block_scout_web/lib/block_scout_web/channels/address_channel.ex b/apps/block_scout_web/lib/block_scout_web/channels/address_channel.ex
index 6072545f34c4..ba808cc16f2b 100644
--- a/apps/block_scout_web/lib/block_scout_web/channels/address_channel.ex
+++ b/apps/block_scout_web/lib/block_scout_web/channels/address_channel.ex
@@ -18,7 +18,6 @@ defmodule BlockScoutWeb.AddressChannel do
   alias Explorer.{Chain, Market, Repo}
   alias Explorer.Chain.{Hash, Transaction, Wei}
   alias Explorer.Chain.Hash.Address, as: AddressHash
-  alias Explorer.ExchangeRates.Token
   alias Phoenix.View
 
   intercept([
@@ -43,7 +42,7 @@ defmodule BlockScoutWeb.AddressChannel do
     with {:ok, casted_address_hash} <- AddressHash.cast(socket.assigns.address_hash),
          {:ok, address = %{fetched_coin_balance: balance}} when not is_nil(balance) <-
            Chain.hash_to_address(casted_address_hash),
-         exchange_rate <- Market.get_exchange_rate(Explorer.coin()) || Token.null(),
+         exchange_rate <- Market.get_coin_exchange_rate(),
          {:ok, rendered} <- render_balance_card(address, exchange_rate, socket) do
       reply =
         {:ok,
@@ -233,7 +232,7 @@ defmodule BlockScoutWeb.AddressChannel do
       ) do
     push(socket, "current_coin_balance", %{
       coin_balance: (coin_balance && coin_balance.value) || %Wei{value: Decimal.new(0)},
-      exchange_rate: (Market.get_exchange_rate(Explorer.coin()) || Token.null()).usd_value,
+      exchange_rate: Market.get_coin_exchange_rate().usd_value,
       block_number: block_number
     })
   end
@@ -248,7 +247,7 @@ defmodule BlockScoutWeb.AddressChannel do
         conn: socket,
         address: Chain.hash_to_address(hash),
         coin_balance: (coin_balance && coin_balance.value) || %Wei{value: Decimal.new(0)},
-        exchange_rate: Market.get_exchange_rate(Explorer.coin()) || Token.null()
+        exchange_rate: Market.get_coin_exchange_rate()
       )
 
     rendered_link =
diff --git a/apps/block_scout_web/lib/block_scout_web/controllers/account/api/v1/user_controller.ex b/apps/block_scout_web/lib/block_scout_web/controllers/account/api/v1/user_controller.ex
index 42b67c7c1759..6c7f54e867f8 100644
--- a/apps/block_scout_web/lib/block_scout_web/controllers/account/api/v1/user_controller.ex
+++ b/apps/block_scout_web/lib/block_scout_web/controllers/account/api/v1/user_controller.ex
@@ -8,7 +8,6 @@ defmodule BlockScoutWeb.Account.Api.V1.UserController do
   alias Explorer.Account.Api.Key, as: ApiKey
   alias Explorer.Account.CustomABI
   alias Explorer.Account.{Identity, PublicTagsRequest, TagAddress, TagTransaction, WatchlistAddress}
-  alias Explorer.ExchangeRates.Token
   alias Explorer.{Market, Repo}
   alias Plug.CSRFProtection
 
@@ -34,7 +33,7 @@ defmodule BlockScoutWeb.Account.Api.V1.UserController do
       conn
       |> put_status(200)
       |> render(:watchlist_addresses, %{
-        exchange_rate: Market.get_exchange_rate(Explorer.coin()) || Token.null(),
+        exchange_rate: Market.get_coin_exchange_rate(),
         watchlist_addresses: watchlist_with_addresses.watchlist_addresses
       })
     end
@@ -103,7 +102,7 @@ defmodule BlockScoutWeb.Account.Api.V1.UserController do
       |> put_status(200)
       |> render(:watchlist_address, %{
         watchlist_address: watchlist_address,
-        exchange_rate: Market.get_exchange_rate(Explorer.coin()) || Token.null()
+        exchange_rate: Market.get_coin_exchange_rate()
       })
     end
   end
@@ -160,7 +159,7 @@ defmodule BlockScoutWeb.Account.Api.V1.UserController do
       |> put_status(200)
       |> render(:watchlist_address, %{
         watchlist_address: watchlist_address,
-        exchange_rate: Market.get_exchange_rate(Explorer.coin()) || Token.null()
+        exchange_rate: Market.get_coin_exchange_rate()
       })
     end
   end
diff --git a/apps/block_scout_web/lib/block_scout_web/controllers/address_coin_balance_controller.ex b/apps/block_scout_web/lib/block_scout_web/controllers/address_coin_balance_controller.ex
index 36c4eed10642..c0bbf0097584 100644
--- a/apps/block_scout_web/lib/block_scout_web/controllers/address_coin_balance_controller.ex
+++ b/apps/block_scout_web/lib/block_scout_web/controllers/address_coin_balance_controller.ex
@@ -12,7 +12,6 @@ defmodule BlockScoutWeb.AddressCoinBalanceController do
   alias BlockScoutWeb.{AccessHelper, AddressCoinBalanceView, Controller}
   alias Explorer.{Chain, Market}
   alias Explorer.Chain.{Address, Wei}
-  alias Explorer.ExchangeRates.Token
   alias Indexer.Fetcher.CoinBalanceOnDemand
   alias Phoenix.View
 
@@ -76,7 +75,7 @@ defmodule BlockScoutWeb.AddressCoinBalanceController do
       render(conn, "index.html",
         address: address,
         coin_balance_status: CoinBalanceOnDemand.trigger_fetch(address),
-        exchange_rate: Market.get_exchange_rate(Explorer.coin()) || Token.null(),
+        exchange_rate: Market.get_coin_exchange_rate(),
         current_path: Controller.current_full_path(conn),
         counters_path: address_path(conn, :address_counters, %{"id" => Address.checksum(address_hash)}),
         tags: get_address_tags(address_hash, current_user(conn))
@@ -102,7 +101,7 @@ defmodule BlockScoutWeb.AddressCoinBalanceController do
               "index.html",
               address: address,
               coin_balance_status: nil,
-              exchange_rate: Market.get_exchange_rate(Explorer.coin()) || Token.null(),
+              exchange_rate: Market.get_coin_exchange_rate(),
               counters_path: address_path(conn, :address_counters, %{"id" => Address.checksum(address_hash)}),
               current_path: Controller.current_full_path(conn),
               tags: get_address_tags(address_hash, current_user(conn))
diff --git a/apps/block_scout_web/lib/block_scout_web/controllers/address_contract_controller.ex b/apps/block_scout_web/lib/block_scout_web/controllers/address_contract_controller.ex
index da6e864e6937..d049ce1511ed 100644
--- a/apps/block_scout_web/lib/block_scout_web/controllers/address_contract_controller.ex
+++ b/apps/block_scout_web/lib/block_scout_web/controllers/address_contract_controller.ex
@@ -7,7 +7,6 @@ defmodule BlockScoutWeb.AddressContractController do
 
   alias BlockScoutWeb.AccessHelper
   alias Explorer.{Chain, Market}
-  alias Explorer.ExchangeRates.Token
   alias Explorer.SmartContract.Solidity.PublishHelper
   alias Indexer.Fetcher.CoinBalanceOnDemand
 
@@ -31,7 +30,7 @@ defmodule BlockScoutWeb.AddressContractController do
         "index.html",
         address: address,
         coin_balance_status: CoinBalanceOnDemand.trigger_fetch(address),
-        exchange_rate: Market.get_exchange_rate(Explorer.coin()) || Token.null(),
+        exchange_rate: Market.get_coin_exchange_rate(),
         counters_path: address_path(conn, :address_counters, %{"id" => address_hash_string}),
         tags: get_address_tags(address_hash, current_user(conn))
       )
diff --git a/apps/block_scout_web/lib/block_scout_web/controllers/address_controller.ex b/apps/block_scout_web/lib/block_scout_web/controllers/address_controller.ex
index 4331bdf6befe..9e37382e12a7 100644
--- a/apps/block_scout_web/lib/block_scout_web/controllers/address_controller.ex
+++ b/apps/block_scout_web/lib/block_scout_web/controllers/address_controller.ex
@@ -16,7 +16,6 @@ defmodule BlockScoutWeb.AddressController do
 
   alias Explorer.{Chain, Market}
   alias Explorer.Chain.Wei
-  alias Explorer.ExchangeRates.Token
   alias Indexer.Fetcher.CoinBalanceOnDemand
   alias Phoenix.View
 
@@ -41,7 +40,7 @@ defmodule BlockScoutWeb.AddressController do
           )
       end
 
-    exchange_rate = Market.get_exchange_rate(Explorer.coin()) || Token.null()
+    exchange_rate = Market.get_coin_exchange_rate()
     total_supply = Chain.total_supply()
 
     items_count_str = Map.get(params, "items_count")
@@ -101,7 +100,7 @@ defmodule BlockScoutWeb.AddressController do
         "_show_address_transactions.html",
         address: address,
         coin_balance_status: CoinBalanceOnDemand.trigger_fetch(address),
-        exchange_rate: Market.get_exchange_rate(Explorer.coin()) || Token.null(),
+        exchange_rate: Market.get_coin_exchange_rate(),
         filter: params["filter"],
         counters_path: address_path(conn, :address_counters, %{"id" => address_hash_string}),
         current_path: Controller.current_full_path(conn),
@@ -131,7 +130,7 @@ defmodule BlockScoutWeb.AddressController do
               "_show_address_transactions.html",
               address: address,
               coin_balance_status: nil,
-              exchange_rate: Market.get_exchange_rate(Explorer.coin()) || Token.null(),
+              exchange_rate: Market.get_coin_exchange_rate(),
               filter: params["filter"],
               counters_path: address_path(conn, :address_counters, %{"id" => address_hash_string}),
               current_path: Controller.current_full_path(conn),
diff --git a/apps/block_scout_web/lib/block_scout_web/controllers/address_decompiled_contract_controller.ex b/apps/block_scout_web/lib/block_scout_web/controllers/address_decompiled_contract_controller.ex
index 292ea0f929c9..69c2d7dc0f6f 100644
--- a/apps/block_scout_web/lib/block_scout_web/controllers/address_decompiled_contract_controller.ex
+++ b/apps/block_scout_web/lib/block_scout_web/controllers/address_decompiled_contract_controller.ex
@@ -6,7 +6,6 @@ defmodule BlockScoutWeb.AddressDecompiledContractController do
 
   alias BlockScoutWeb.AccessHelper
   alias Explorer.{Chain, Market}
-  alias Explorer.ExchangeRates.Token
   alias Indexer.Fetcher.CoinBalanceOnDemand
 
   def index(conn, %{"address_id" => address_hash_string} = params) do
@@ -18,7 +17,7 @@ defmodule BlockScoutWeb.AddressDecompiledContractController do
         "index.html",
         address: address,
         coin_balance_status: CoinBalanceOnDemand.trigger_fetch(address),
-        exchange_rate: Market.get_exchange_rate(Explorer.coin()) || Token.null(),
+        exchange_rate: Market.get_coin_exchange_rate(),
         counters_path: address_path(conn, :address_counters, %{"id" => address_hash_string}),
         tags: get_address_tags(address_hash, current_user(conn))
       )
diff --git a/apps/block_scout_web/lib/block_scout_web/controllers/address_internal_transaction_controller.ex b/apps/block_scout_web/lib/block_scout_web/controllers/address_internal_transaction_controller.ex
index daca356e1ff0..92fbe1712b44 100644
--- a/apps/block_scout_web/lib/block_scout_web/controllers/address_internal_transaction_controller.ex
+++ b/apps/block_scout_web/lib/block_scout_web/controllers/address_internal_transaction_controller.ex
@@ -12,7 +12,6 @@ defmodule BlockScoutWeb.AddressInternalTransactionController do
   alias BlockScoutWeb.{AccessHelper, Controller, InternalTransactionView}
   alias Explorer.{Chain, Market}
   alias Explorer.Chain.{Address, Wei}
-  alias Explorer.ExchangeRates.Token
   alias Indexer.Fetcher.CoinBalanceOnDemand
   alias Phoenix.View
 
@@ -86,7 +85,7 @@ defmodule BlockScoutWeb.AddressInternalTransactionController do
         address: address,
         coin_balance_status: CoinBalanceOnDemand.trigger_fetch(address),
         current_path: Controller.current_full_path(conn),
-        exchange_rate: Market.get_exchange_rate(Explorer.coin()) || Token.null(),
+        exchange_rate: Market.get_coin_exchange_rate(),
         filter: params["filter"],
         counters_path: address_path(conn, :address_counters, %{"id" => address_hash_string}),
         tags: get_address_tags(address_hash, current_user(conn))
@@ -113,7 +112,7 @@ defmodule BlockScoutWeb.AddressInternalTransactionController do
               address: address,
               filter: params["filter"],
               coin_balance_status: nil,
-              exchange_rate: Market.get_exchange_rate(Explorer.coin()) || Token.null(),
+              exchange_rate: Market.get_coin_exchange_rate(),
               counters_path: address_path(conn, :address_counters, %{"id" => Address.checksum(address_hash)}),
               current_path: Controller.current_full_path(conn),
               tags: get_address_tags(address_hash, current_user(conn))
diff --git a/apps/block_scout_web/lib/block_scout_web/controllers/address_logs_controller.ex b/apps/block_scout_web/lib/block_scout_web/controllers/address_logs_controller.ex
index 67bbfc5958d9..ea6c656bac0f 100644
--- a/apps/block_scout_web/lib/block_scout_web/controllers/address_logs_controller.ex
+++ b/apps/block_scout_web/lib/block_scout_web/controllers/address_logs_controller.ex
@@ -11,7 +11,6 @@ defmodule BlockScoutWeb.AddressLogsController do
 
   alias BlockScoutWeb.{AccessHelper, AddressLogsView, Controller}
   alias Explorer.{Chain, Market}
-  alias Explorer.ExchangeRates.Token
   alias Indexer.Fetcher.CoinBalanceOnDemand
   alias Phoenix.View
 
@@ -67,7 +66,7 @@ defmodule BlockScoutWeb.AddressLogsController do
         address: address,
         current_path: Controller.current_full_path(conn),
         coin_balance_status: CoinBalanceOnDemand.trigger_fetch(address),
-        exchange_rate: Market.get_exchange_rate(Explorer.coin()) || Token.null(),
+        exchange_rate: Market.get_coin_exchange_rate(),
         counters_path: address_path(conn, :address_counters, %{"id" => address_hash_string}),
         tags: get_address_tags(address_hash, current_user(conn))
       )
diff --git a/apps/block_scout_web/lib/block_scout_web/controllers/address_read_contract_controller.ex b/apps/block_scout_web/lib/block_scout_web/controllers/address_read_contract_controller.ex
index b963cfa3e46c..ae534280cc74 100644
--- a/apps/block_scout_web/lib/block_scout_web/controllers/address_read_contract_controller.ex
+++ b/apps/block_scout_web/lib/block_scout_web/controllers/address_read_contract_controller.ex
@@ -15,7 +15,6 @@ defmodule BlockScoutWeb.AddressReadContractController do
   alias BlockScoutWeb.AddressView
   alias Explorer.{Chain, Market}
   alias Explorer.Chain.Address
-  alias Explorer.ExchangeRates.Token
   alias Explorer.SmartContract.Reader
   alias Indexer.Fetcher.CoinBalanceOnDemand
 
@@ -40,7 +39,7 @@ defmodule BlockScoutWeb.AddressReadContractController do
       type: :regular,
       action: :read,
       custom_abi: custom_abi?,
-      exchange_rate: Market.get_exchange_rate(Explorer.coin()) || Token.null()
+      exchange_rate: Market.get_coin_exchange_rate()
     ]
 
     with {:ok, address_hash} <- Chain.string_to_address_hash(address_hash_string),
diff --git a/apps/block_scout_web/lib/block_scout_web/controllers/address_read_proxy_controller.ex b/apps/block_scout_web/lib/block_scout_web/controllers/address_read_proxy_controller.ex
index 6e4534af7ce9..5a4d9c981d04 100644
--- a/apps/block_scout_web/lib/block_scout_web/controllers/address_read_proxy_controller.ex
+++ b/apps/block_scout_web/lib/block_scout_web/controllers/address_read_proxy_controller.ex
@@ -8,7 +8,6 @@ defmodule BlockScoutWeb.AddressReadProxyController do
   alias BlockScoutWeb.AccessHelper
   alias Explorer.{Chain, Market}
   alias Explorer.Chain.Address
-  alias Explorer.ExchangeRates.Token
   alias Indexer.Fetcher.CoinBalanceOnDemand
 
   def index(conn, %{"address_id" => address_hash_string} = params) do
@@ -33,7 +32,7 @@ defmodule BlockScoutWeb.AddressReadProxyController do
         type: :proxy,
         action: :read,
         coin_balance_status: CoinBalanceOnDemand.trigger_fetch(address),
-        exchange_rate: Market.get_exchange_rate(Explorer.coin()) || Token.null(),
+        exchange_rate: Market.get_coin_exchange_rate(),
         counters_path: address_path(conn, :address_counters, %{"id" => Address.checksum(address_hash)}),
         tags: get_address_tags(address_hash, current_user(conn))
       )
diff --git a/apps/block_scout_web/lib/block_scout_web/controllers/address_token_controller.ex b/apps/block_scout_web/lib/block_scout_web/controllers/address_token_controller.ex
index f896e75e3fd2..8762432af79a 100644
--- a/apps/block_scout_web/lib/block_scout_web/controllers/address_token_controller.ex
+++ b/apps/block_scout_web/lib/block_scout_web/controllers/address_token_controller.ex
@@ -8,7 +8,6 @@ defmodule BlockScoutWeb.AddressTokenController do
   alias BlockScoutWeb.{AccessHelper, AddressTokenView, Controller}
   alias Explorer.{Chain, Market}
   alias Explorer.Chain.Address
-  alias Explorer.ExchangeRates.Token
   alias Indexer.Fetcher.CoinBalanceOnDemand
   alias Phoenix.View
 
@@ -73,7 +72,7 @@ defmodule BlockScoutWeb.AddressTokenController do
         address: address,
         current_path: Controller.current_full_path(conn),
         coin_balance_status: CoinBalanceOnDemand.trigger_fetch(address),
-        exchange_rate: Market.get_exchange_rate(Explorer.coin()) || Token.null(),
+        exchange_rate: Market.get_coin_exchange_rate(),
         counters_path: address_path(conn, :address_counters, %{"id" => Address.checksum(address_hash)}),
         tags: get_address_tags(address_hash, current_user(conn))
       )
diff --git a/apps/block_scout_web/lib/block_scout_web/controllers/address_token_transfer_controller.ex b/apps/block_scout_web/lib/block_scout_web/controllers/address_token_transfer_controller.ex
index 8bb51818f688..e8d21d0d2c97 100644
--- a/apps/block_scout_web/lib/block_scout_web/controllers/address_token_transfer_controller.ex
+++ b/apps/block_scout_web/lib/block_scout_web/controllers/address_token_transfer_controller.ex
@@ -5,7 +5,6 @@ defmodule BlockScoutWeb.AddressTokenTransferController do
   import BlockScoutWeb.Models.GetAddressTags, only: [get_address_tags: 2]
 
   alias BlockScoutWeb.{AccessHelper, Controller, TransactionView}
-  alias Explorer.ExchangeRates.Token
   alias Explorer.{Chain, Market}
   alias Explorer.Chain.Address
   alias Indexer.Fetcher.CoinBalanceOnDemand
@@ -109,7 +108,7 @@ defmodule BlockScoutWeb.AddressTokenTransferController do
         "index.html",
         address: address,
         coin_balance_status: CoinBalanceOnDemand.trigger_fetch(address),
-        exchange_rate: Market.get_exchange_rate(Explorer.coin()) || Token.null(),
+        exchange_rate: Market.get_coin_exchange_rate(),
         filter: params["filter"],
         current_path: Controller.current_full_path(conn),
         token: token,
@@ -202,7 +201,7 @@ defmodule BlockScoutWeb.AddressTokenTransferController do
         "index.html",
         address: address,
         coin_balance_status: CoinBalanceOnDemand.trigger_fetch(address),
-        exchange_rate: Market.get_exchange_rate(Explorer.coin()) || Token.null(),
+        exchange_rate: Market.get_coin_exchange_rate(),
         filter: params["filter"],
         current_path: Controller.current_full_path(conn),
         counters_path: address_path(conn, :address_counters, %{"id" => Address.checksum(address_hash)}),
diff --git a/apps/block_scout_web/lib/block_scout_web/controllers/address_transaction_controller.ex b/apps/block_scout_web/lib/block_scout_web/controllers/address_transaction_controller.ex
index 999c619bc9db..fc9aad5e2035 100644
--- a/apps/block_scout_web/lib/block_scout_web/controllers/address_transaction_controller.ex
+++ b/apps/block_scout_web/lib/block_scout_web/controllers/address_transaction_controller.ex
@@ -23,7 +23,6 @@ defmodule BlockScoutWeb.AddressTransactionController do
 
   alias Explorer.Chain.Wei
 
-  alias Explorer.ExchangeRates.Token
   alias Indexer.Fetcher.CoinBalanceOnDemand
   alias Phoenix.View
 
@@ -124,7 +123,7 @@ defmodule BlockScoutWeb.AddressTransactionController do
         "index.html",
         address: address,
         coin_balance_status: CoinBalanceOnDemand.trigger_fetch(address),
-        exchange_rate: Market.get_exchange_rate(Explorer.coin()) || Token.null(),
+        exchange_rate: Market.get_coin_exchange_rate(),
         filter: params["filter"],
         counters_path: address_path(conn, :address_counters, %{"id" => address_hash_string}),
         current_path: Controller.current_full_path(conn),
@@ -154,7 +153,7 @@ defmodule BlockScoutWeb.AddressTransactionController do
               "index.html",
               address: address,
               coin_balance_status: nil,
-              exchange_rate: Market.get_exchange_rate(Explorer.coin()) || Token.null(),
+              exchange_rate: Market.get_coin_exchange_rate(),
               filter: params["filter"],
               counters_path: address_path(conn, :address_counters, %{"id" => address_hash_string}),
               current_path: Controller.current_full_path(conn),
diff --git a/apps/block_scout_web/lib/block_scout_web/controllers/address_validation_controller.ex b/apps/block_scout_web/lib/block_scout_web/controllers/address_validation_controller.ex
index a4893bf3cece..244deb3af04d 100644
--- a/apps/block_scout_web/lib/block_scout_web/controllers/address_validation_controller.ex
+++ b/apps/block_scout_web/lib/block_scout_web/controllers/address_validation_controller.ex
@@ -12,7 +12,6 @@ defmodule BlockScoutWeb.AddressValidationController do
   import BlockScoutWeb.Models.GetAddressTags, only: [get_address_tags: 2]
 
   alias BlockScoutWeb.{AccessHelper, BlockView, Controller}
-  alias Explorer.ExchangeRates.Token
   alias Explorer.{Chain, Market}
   alias Indexer.Fetcher.CoinBalanceOnDemand
   alias Phoenix.View
@@ -83,7 +82,7 @@ defmodule BlockScoutWeb.AddressValidationController do
         coin_balance_status: CoinBalanceOnDemand.trigger_fetch(address),
         current_path: Controller.current_full_path(conn),
         counters_path: address_path(conn, :address_counters, %{"id" => address_hash_string}),
-        exchange_rate: Market.get_exchange_rate(Explorer.coin()) || Token.null(),
+        exchange_rate: Market.get_coin_exchange_rate(),
         tags: get_address_tags(address_hash, current_user(conn))
       )
     else
diff --git a/apps/block_scout_web/lib/block_scout_web/controllers/address_withdrawal_controller.ex b/apps/block_scout_web/lib/block_scout_web/controllers/address_withdrawal_controller.ex
index 7fcb05d5b40b..937899617445 100644
--- a/apps/block_scout_web/lib/block_scout_web/controllers/address_withdrawal_controller.ex
+++ b/apps/block_scout_web/lib/block_scout_web/controllers/address_withdrawal_controller.ex
@@ -16,7 +16,6 @@ defmodule BlockScoutWeb.AddressWithdrawalController do
 
   alias Explorer.Chain.Wei
 
-  alias Explorer.ExchangeRates.Token
   alias Indexer.Fetcher.CoinBalanceOnDemand
   alias Phoenix.View
 
@@ -78,7 +77,7 @@ defmodule BlockScoutWeb.AddressWithdrawalController do
         "index.html",
         address: address,
         coin_balance_status: CoinBalanceOnDemand.trigger_fetch(address),
-        exchange_rate: Market.get_exchange_rate(Explorer.coin()) || Token.null(),
+        exchange_rate: Market.get_coin_exchange_rate(),
         counters_path: address_path(conn, :address_counters, %{"id" => address_hash_string}),
         current_path: Controller.current_full_path(conn),
         tags: get_address_tags(address_hash, current_user(conn))
@@ -107,7 +106,7 @@ defmodule BlockScoutWeb.AddressWithdrawalController do
               "index.html",
               address: address,
               coin_balance_status: nil,
-              exchange_rate: Market.get_exchange_rate(Explorer.coin()) || Token.null(),
+              exchange_rate: Market.get_coin_exchange_rate(),
               counters_path: address_path(conn, :address_counters, %{"id" => address_hash_string}),
               current_path: Controller.current_full_path(conn),
               tags: get_address_tags(address_hash, current_user(conn))
diff --git a/apps/block_scout_web/lib/block_scout_web/controllers/address_write_contract_controller.ex b/apps/block_scout_web/lib/block_scout_web/controllers/address_write_contract_controller.ex
index cd88e97a0bf9..32fc477ed283 100644
--- a/apps/block_scout_web/lib/block_scout_web/controllers/address_write_contract_controller.ex
+++ b/apps/block_scout_web/lib/block_scout_web/controllers/address_write_contract_controller.ex
@@ -15,7 +15,6 @@ defmodule BlockScoutWeb.AddressWriteContractController do
   alias BlockScoutWeb.AddressView
   alias Explorer.{Chain, Market}
   alias Explorer.Chain.Address
-  alias Explorer.ExchangeRates.Token
   alias Indexer.Fetcher.CoinBalanceOnDemand
 
   def index(conn, %{"address_id" => address_hash_string} = params) do
@@ -35,7 +34,7 @@ defmodule BlockScoutWeb.AddressWriteContractController do
       type: :regular,
       action: :write,
       custom_abi: custom_abi?,
-      exchange_rate: Market.get_exchange_rate(Explorer.coin()) || Token.null()
+      exchange_rate: Market.get_coin_exchange_rate()
     ]
 
     with false <- AddressView.contract_interaction_disabled?(),
diff --git a/apps/block_scout_web/lib/block_scout_web/controllers/address_write_proxy_controller.ex b/apps/block_scout_web/lib/block_scout_web/controllers/address_write_proxy_controller.ex
index 844c5d3ddcf4..68903261d6e3 100644
--- a/apps/block_scout_web/lib/block_scout_web/controllers/address_write_proxy_controller.ex
+++ b/apps/block_scout_web/lib/block_scout_web/controllers/address_write_proxy_controller.ex
@@ -8,7 +8,6 @@ defmodule BlockScoutWeb.AddressWriteProxyController do
   alias BlockScoutWeb.{AccessHelper, AddressView}
   alias Explorer.{Chain, Market}
   alias Explorer.Chain.Address
-  alias Explorer.ExchangeRates.Token
   alias Indexer.Fetcher.CoinBalanceOnDemand
 
   def index(conn, %{"address_id" => address_hash_string} = params) do
@@ -34,7 +33,7 @@ defmodule BlockScoutWeb.AddressWriteProxyController do
         type: :proxy,
         action: :write,
         coin_balance_status: CoinBalanceOnDemand.trigger_fetch(address),
-        exchange_rate: Market.get_exchange_rate(Explorer.coin()) || Token.null(),
+        exchange_rate: Market.get_coin_exchange_rate(),
         counters_path: address_path(conn, :address_counters, %{"id" => Address.checksum(address_hash)}),
         tags: get_address_tags(address_hash, current_user(conn))
       )
diff --git a/apps/block_scout_web/lib/block_scout_web/controllers/api/rpc/stats_controller.ex b/apps/block_scout_web/lib/block_scout_web/controllers/api/rpc/stats_controller.ex
index e8f829bbec14..19fcf8768c64 100644
--- a/apps/block_scout_web/lib/block_scout_web/controllers/api/rpc/stats_controller.ex
+++ b/apps/block_scout_web/lib/block_scout_web/controllers/api/rpc/stats_controller.ex
@@ -3,8 +3,7 @@ defmodule BlockScoutWeb.API.RPC.StatsController do
 
   use Explorer.Schema
 
-  alias Explorer
-  alias Explorer.{Chain, Etherscan, ExchangeRates}
+  alias Explorer.{Chain, Etherscan, Market}
   alias Explorer.Chain.Cache.{AddressSum, AddressSumMinusBurnt}
   alias Explorer.Chain.Wei
 
@@ -61,8 +60,7 @@ defmodule BlockScoutWeb.API.RPC.StatsController do
   end
 
   def coinprice(conn, _params) do
-    symbol = Explorer.coin()
-    rates = ExchangeRates.lookup(symbol)
+    rates = Market.get_coin_exchange_rate()
 
     render(conn, "coinprice.json", rates: rates)
   end
diff --git a/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/address_controller.ex b/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/address_controller.ex
index d396d27e02bd..a2695b155e13 100644
--- a/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/address_controller.ex
+++ b/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/address_controller.ex
@@ -15,7 +15,6 @@ defmodule BlockScoutWeb.API.V2.AddressController do
 
   alias BlockScoutWeb.AccessHelper
   alias BlockScoutWeb.API.V2.{BlockView, TransactionView, WithdrawalView}
-  alias Explorer.ExchangeRates.Token
   alias Explorer.{Chain, Market}
   alias Indexer.Fetcher.{CoinBalanceOnDemand, TokenBalanceOnDemand}
 
@@ -401,7 +400,7 @@ defmodule BlockScoutWeb.API.V2.AddressController do
 
     next_page_params = next_page_params(next_page, addresses, params)
 
-    exchange_rate = Market.get_exchange_rate(Explorer.coin()) || Token.null()
+    exchange_rate = Market.get_coin_exchange_rate()
     total_supply = Chain.total_supply()
 
     conn
diff --git a/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/stats_controller.ex b/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/stats_controller.ex
index d6974c090caf..6ffbd0c6bbfe 100644
--- a/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/stats_controller.ex
+++ b/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/stats_controller.ex
@@ -2,6 +2,7 @@ defmodule BlockScoutWeb.API.V2.StatsController do
   use Phoenix.Controller
 
   alias BlockScoutWeb.API.V2.Helper
+  alias BlockScoutWeb.Chain.MarketHistoryChartController
   alias Explorer.{Chain, Market}
   alias Explorer.Chain.Cache.Block, as: BlockCache
   alias Explorer.Chain.Cache.{GasPriceOracle, GasUsage}
@@ -9,7 +10,6 @@ defmodule BlockScoutWeb.API.V2.StatsController do
   alias Explorer.Chain.Supply.RSK
   alias Explorer.Chain.Transaction.History.TransactionStats
   alias Explorer.Counters.AverageBlockTime
-  alias Explorer.ExchangeRates.Token
   alias Timex.Duration
 
   @api_true [api?: true]
@@ -24,7 +24,7 @@ defmodule BlockScoutWeb.API.V2.StatsController do
           :standard
       end
 
-    exchange_rate = Market.get_exchange_rate(Explorer.coin()) || Token.null()
+    exchange_rate = Market.get_coin_exchange_rate()
 
     transaction_stats = Helper.get_transaction_stats()
 
@@ -46,7 +46,7 @@ defmodule BlockScoutWeb.API.V2.StatsController do
         "total_addresses" => @api_true |> Chain.address_estimated_count() |> to_string(),
         "total_transactions" => TransactionCache.estimated_count() |> to_string(),
         "average_block_time" => AverageBlockTime.average_block_time() |> Duration.to_milliseconds(),
-        "coin_price" => exchange_rate.usd_value || Market.get_native_coin_exchange_rate_from_db(),
+        "coin_price" => exchange_rate.usd_value,
         "total_gas_used" => GasUsage.total() |> to_string(),
         "transactions_today" => Enum.at(transaction_stats, 0).number_of_transactions |> to_string(),
         "gas_used_today" => Enum.at(transaction_stats, 0).gas_used,
@@ -91,18 +91,19 @@ defmodule BlockScoutWeb.API.V2.StatsController do
   end
 
   def market_chart(conn, _params) do
-    exchange_rate = Market.get_exchange_rate(Explorer.coin()) || Token.null()
+    exchange_rate = Market.get_coin_exchange_rate()
 
     recent_market_history = Market.fetch_recent_history()
+    current_total_supply = available_supply(Chain.supply_for_days(), exchange_rate)
 
-    market_history_data =
+    price_history_data =
       recent_market_history
       |> case do
         [today | the_rest] ->
           [
             %{
               today
-              | closing_price: if(exchange_rate.usd_value, do: exchange_rate.usd_value, else: today.closing_price)
+              | closing_price: exchange_rate.usd_value
             }
             | the_rest
           ]
@@ -110,11 +111,15 @@ defmodule BlockScoutWeb.API.V2.StatsController do
         data ->
           data
       end
-      |> Enum.map(fn day -> Map.take(day, [:closing_price, :date]) end)
+      |> Enum.map(fn day -> Map.take(day, [:closing_price, :market_cap, :date]) end)
+
+    market_history_data =
+      MarketHistoryChartController.encode_market_history_data(price_history_data, current_total_supply)
 
     json(conn, %{
       chart_data: market_history_data,
-      available_supply: available_supply(Chain.supply_for_days(), exchange_rate)
+      # todo: remove when new frontend is ready to use data from chart_data property only
+      available_supply: current_total_supply
     })
   end
 
diff --git a/apps/block_scout_web/lib/block_scout_web/controllers/chain/market_history_chart_controller.ex b/apps/block_scout_web/lib/block_scout_web/controllers/chain/market_history_chart_controller.ex
index 238f858769f7..5ab997f4a91e 100644
--- a/apps/block_scout_web/lib/block_scout_web/controllers/chain/market_history_chart_controller.ex
+++ b/apps/block_scout_web/lib/block_scout_web/controllers/chain/market_history_chart_controller.ex
@@ -2,26 +2,27 @@ defmodule BlockScoutWeb.Chain.MarketHistoryChartController do
   use BlockScoutWeb, :controller
 
   alias Explorer.{Chain, Market}
-  alias Explorer.ExchangeRates.Token
 
   def show(conn, _params) do
     if ajax?(conn) do
-      exchange_rate = Market.get_exchange_rate(Explorer.coin()) || Token.null()
+      exchange_rate = Market.get_coin_exchange_rate()
 
       recent_market_history = Market.fetch_recent_history()
+      current_total_supply = available_supply(Chain.supply_for_days(), exchange_rate)
 
-      market_history_data =
+      price_history_data =
         case recent_market_history do
           [today | the_rest] ->
-            encode_market_history_data([%{today | closing_price: exchange_rate.usd_value} | the_rest])
+            [%{today | closing_price: exchange_rate.usd_value} | the_rest]
 
           data ->
-            encode_market_history_data(data)
+            data
         end
 
+      market_history_data = encode_market_history_data(price_history_data, current_total_supply)
+
       json(conn, %{
-        history_data: market_history_data,
-        supply_data: available_supply(Chain.supply_for_days(), exchange_rate)
+        history_data: market_history_data
       })
     else
       unprocessable_entity(conn)
@@ -41,12 +42,22 @@ defmodule BlockScoutWeb.Chain.MarketHistoryChartController do
     end
   end
 
-  defp encode_market_history_data(market_history_data) do
+  def encode_market_history_data(market_history_data, current_total_supply) when is_binary(current_total_supply) do
+    encode_market_history_data(market_history_data, Decimal.new(current_total_supply))
+  end
+
+  def encode_market_history_data(market_history_data, current_total_supply) do
     market_history_data
-    |> Enum.map(fn day -> Map.take(day, [:closing_price, :date]) end)
+    |> Enum.map(fn day ->
+      market_cap = if day.market_cap, do: day.market_cap, else: Decimal.mult(current_total_supply, day.closing_price)
+
+      day
+      |> Map.put(:market_cap, market_cap)
+      |> Map.take([:closing_price, :market_cap, :date])
+    end)
     |> Jason.encode()
     |> case do
-      {:ok, data} -> data
+      {:ok, data} -> Jason.decode!(data)
       _ -> []
     end
   end
diff --git a/apps/block_scout_web/lib/block_scout_web/controllers/chain_controller.ex b/apps/block_scout_web/lib/block_scout_web/controllers/chain_controller.ex
index 95cd87fcf7e5..afa8143329b3 100644
--- a/apps/block_scout_web/lib/block_scout_web/controllers/chain_controller.ex
+++ b/apps/block_scout_web/lib/block_scout_web/controllers/chain_controller.ex
@@ -12,7 +12,6 @@ defmodule BlockScoutWeb.ChainController do
   alias Explorer.Chain.Cache.Transaction, as: TransactionCache
   alias Explorer.Chain.Supply.RSK
   alias Explorer.Counters.AverageBlockTime
-  alias Explorer.ExchangeRates.Token
   alias Explorer.Market
   alias Phoenix.View
 
@@ -31,7 +30,7 @@ defmodule BlockScoutWeb.ChainController do
           :standard
       end
 
-    exchange_rate = Market.get_exchange_rate(Explorer.coin()) || Token.null()
+    exchange_rate = Market.get_coin_exchange_rate()
 
     transaction_stats = Helper.get_transaction_stats()
 
diff --git a/apps/block_scout_web/lib/block_scout_web/controllers/transaction_controller.ex b/apps/block_scout_web/lib/block_scout_web/controllers/transaction_controller.ex
index 9158d1ca852f..5983ab8920cd 100644
--- a/apps/block_scout_web/lib/block_scout_web/controllers/transaction_controller.ex
+++ b/apps/block_scout_web/lib/block_scout_web/controllers/transaction_controller.ex
@@ -25,7 +25,6 @@ defmodule BlockScoutWeb.TransactionController do
 
   alias Explorer.{Chain, Market}
   alias Explorer.Chain.Cache.Transaction, as: TransactionCache
-  alias Explorer.ExchangeRates.Token
   alias Phoenix.View
 
   @necessity_by_association %{
@@ -161,7 +160,7 @@ defmodule BlockScoutWeb.TransactionController do
           render(
             conn,
             "show_token_transfers.html",
-            exchange_rate: Market.get_exchange_rate(Explorer.coin()) || Token.null(),
+            exchange_rate: Market.get_coin_exchange_rate(),
             block_height: Chain.block_height(),
             current_path: Controller.current_full_path(conn),
             current_user: current_user(conn),
@@ -199,7 +198,7 @@ defmodule BlockScoutWeb.TransactionController do
           render(
             conn,
             "show_internal_transactions.html",
-            exchange_rate: Market.get_exchange_rate(Explorer.coin()) || Token.null(),
+            exchange_rate: Market.get_coin_exchange_rate(),
             current_path: Controller.current_full_path(conn),
             current_user: current_user(conn),
             block_height: Chain.block_height(),
diff --git a/apps/block_scout_web/lib/block_scout_web/controllers/transaction_internal_transaction_controller.ex b/apps/block_scout_web/lib/block_scout_web/controllers/transaction_internal_transaction_controller.ex
index 9f2b6c8fac98..4c6a017e776d 100644
--- a/apps/block_scout_web/lib/block_scout_web/controllers/transaction_internal_transaction_controller.ex
+++ b/apps/block_scout_web/lib/block_scout_web/controllers/transaction_internal_transaction_controller.ex
@@ -8,7 +8,6 @@ defmodule BlockScoutWeb.TransactionInternalTransactionController do
 
   alias BlockScoutWeb.{AccessHelper, Controller, InternalTransactionView, TransactionController}
   alias Explorer.{Chain, Market}
-  alias Explorer.ExchangeRates.Token
   alias Phoenix.View
 
   def index(conn, %{"transaction_id" => transaction_hash_string, "type" => "JSON"} = params) do
@@ -102,7 +101,7 @@ defmodule BlockScoutWeb.TransactionInternalTransactionController do
       render(
         conn,
         "index.html",
-        exchange_rate: Market.get_exchange_rate(Explorer.coin()) || Token.null(),
+        exchange_rate: Market.get_coin_exchange_rate(),
         current_path: Controller.current_full_path(conn),
         current_user: current_user(conn),
         block_height: Chain.block_height(),
diff --git a/apps/block_scout_web/lib/block_scout_web/controllers/transaction_log_controller.ex b/apps/block_scout_web/lib/block_scout_web/controllers/transaction_log_controller.ex
index 70cb686badfc..53ba82ed3571 100644
--- a/apps/block_scout_web/lib/block_scout_web/controllers/transaction_log_controller.ex
+++ b/apps/block_scout_web/lib/block_scout_web/controllers/transaction_log_controller.ex
@@ -8,7 +8,6 @@ defmodule BlockScoutWeb.TransactionLogController do
 
   alias BlockScoutWeb.{AccessHelper, Controller, TransactionController, TransactionLogView}
   alias Explorer.{Chain, Market}
-  alias Explorer.ExchangeRates.Token
   alias Phoenix.View
 
   def index(conn, %{"transaction_id" => transaction_hash_string, "type" => "JSON"} = params) do
@@ -99,7 +98,7 @@ defmodule BlockScoutWeb.TransactionLogController do
         current_path: Controller.current_full_path(conn),
         current_user: current_user(conn),
         transaction: transaction,
-        exchange_rate: Market.get_exchange_rate(Explorer.coin()) || Token.null(),
+        exchange_rate: Market.get_coin_exchange_rate(),
         from_tags: get_address_tags(transaction.from_address_hash, current_user(conn)),
         to_tags: get_address_tags(transaction.to_address_hash, current_user(conn)),
         tx_tags:
diff --git a/apps/block_scout_web/lib/block_scout_web/controllers/transaction_raw_trace_controller.ex b/apps/block_scout_web/lib/block_scout_web/controllers/transaction_raw_trace_controller.ex
index 0fa47a09f2b9..93002d434822 100644
--- a/apps/block_scout_web/lib/block_scout_web/controllers/transaction_raw_trace_controller.ex
+++ b/apps/block_scout_web/lib/block_scout_web/controllers/transaction_raw_trace_controller.ex
@@ -8,7 +8,6 @@ defmodule BlockScoutWeb.TransactionRawTraceController do
   alias BlockScoutWeb.{AccessHelper, TransactionController}
   alias EthereumJSONRPC
   alias Explorer.{Chain, Market}
-  alias Explorer.ExchangeRates.Token
   alias Indexer.Fetcher.FirstTraceOnDemand
 
   def index(conn, %{"transaction_id" => hash_string} = params) do
@@ -59,7 +58,7 @@ defmodule BlockScoutWeb.TransactionRawTraceController do
     render(
       conn,
       "index.html",
-      exchange_rate: Market.get_exchange_rate(Explorer.coin()) || Token.null(),
+      exchange_rate: Market.get_coin_exchange_rate(),
       internal_transactions: internal_transactions,
       block_height: Chain.block_height(),
       current_user: current_user(conn),
diff --git a/apps/block_scout_web/lib/block_scout_web/controllers/transaction_state_controller.ex b/apps/block_scout_web/lib/block_scout_web/controllers/transaction_state_controller.ex
index 37a9a24dbf64..e2020a47bcca 100644
--- a/apps/block_scout_web/lib/block_scout_web/controllers/transaction_state_controller.ex
+++ b/apps/block_scout_web/lib/block_scout_web/controllers/transaction_state_controller.ex
@@ -10,7 +10,6 @@ defmodule BlockScoutWeb.TransactionStateController do
   }
 
   alias Explorer.{Chain, Market}
-  alias Explorer.ExchangeRates.Token
   alias Phoenix.View
 
   import BlockScoutWeb.Account.AuthController, only: [current_user: 1]
@@ -107,7 +106,7 @@ defmodule BlockScoutWeb.TransactionStateController do
       render(
         conn,
         "index.html",
-        exchange_rate: Market.get_exchange_rate(Explorer.coin()) || Token.null(),
+        exchange_rate: Market.get_coin_exchange_rate(),
         block_height: Chain.block_height(),
         current_path: Controller.current_full_path(conn),
         show_token_transfers: Chain.transaction_has_token_transfers?(transaction_hash),
diff --git a/apps/block_scout_web/lib/block_scout_web/controllers/transaction_token_transfer_controller.ex b/apps/block_scout_web/lib/block_scout_web/controllers/transaction_token_transfer_controller.ex
index e2fdffb4ed8d..d0f7fed1584f 100644
--- a/apps/block_scout_web/lib/block_scout_web/controllers/transaction_token_transfer_controller.ex
+++ b/apps/block_scout_web/lib/block_scout_web/controllers/transaction_token_transfer_controller.ex
@@ -8,7 +8,6 @@ defmodule BlockScoutWeb.TransactionTokenTransferController do
 
   alias BlockScoutWeb.{AccessHelper, Controller, TransactionController, TransactionTokenTransferView}
   alias Explorer.{Chain, Market}
-  alias Explorer.ExchangeRates.Token
   alias Phoenix.View
 
   {:ok, burn_address_hash} = Chain.string_to_address_hash("0x0000000000000000000000000000000000000000")
@@ -105,7 +104,7 @@ defmodule BlockScoutWeb.TransactionTokenTransferController do
       render(
         conn,
         "index.html",
-        exchange_rate: Market.get_exchange_rate(Explorer.coin()) || Token.null(),
+        exchange_rate: Market.get_coin_exchange_rate(),
         block_height: Chain.block_height(),
         current_path: Controller.current_full_path(conn),
         current_user: current_user(conn),
diff --git a/apps/block_scout_web/lib/block_scout_web/notifier.ex b/apps/block_scout_web/lib/block_scout_web/notifier.ex
index 7ca4a892a880..be32348540c7 100644
--- a/apps/block_scout_web/lib/block_scout_web/notifier.ex
+++ b/apps/block_scout_web/lib/block_scout_web/notifier.ex
@@ -21,7 +21,6 @@ defmodule BlockScoutWeb.Notifier do
   alias Explorer.Chain.Supply.RSK
   alias Explorer.Chain.Transaction.History.TransactionStats
   alias Explorer.Counters.{AverageBlockTime, Helper}
-  alias Explorer.ExchangeRates.Token
   alias Explorer.SmartContract.{CompilerVersion, Solidity.CodeCompiler}
   alias Phoenix.View
 
@@ -115,7 +114,7 @@ defmodule BlockScoutWeb.Notifier do
   end
 
   def handle_event({:chain_event, :exchange_rate}) do
-    exchange_rate = Market.get_exchange_rate(Explorer.coin()) || Token.null()
+    exchange_rate = Market.get_coin_exchange_rate()
 
     market_history_data =
       case Market.fetch_recent_history() do
@@ -323,7 +322,7 @@ defmodule BlockScoutWeb.Notifier do
       "balance_update",
       %{
         address: address,
-        exchange_rate: Market.get_exchange_rate(Explorer.coin()) || Token.null()
+        exchange_rate: Market.get_coin_exchange_rate()
       }
     )
   end
diff --git a/apps/block_scout_web/lib/block_scout_web/views/account/watchlist_view.ex b/apps/block_scout_web/lib/block_scout_web/views/account/watchlist_view.ex
index fa3966323606..c6d513a2bff1 100644
--- a/apps/block_scout_web/lib/block_scout_web/views/account/watchlist_view.ex
+++ b/apps/block_scout_web/lib/block_scout_web/views/account/watchlist_view.ex
@@ -3,7 +3,6 @@ defmodule BlockScoutWeb.Account.WatchlistView do
 
   alias BlockScoutWeb.Account.WatchlistAddressView
   alias Explorer.Account.WatchlistAddress
-  alias Explorer.ExchangeRates.Token
   alias Explorer.Market
   alias Indexer.Fetcher.CoinBalanceOnDemand
 
@@ -12,6 +11,6 @@ defmodule BlockScoutWeb.Account.WatchlistView do
   end
 
   def exchange_rate do
-    Market.get_exchange_rate(Explorer.coin()) || Token.null()
+    Market.get_coin_exchange_rate()
   end
 end
diff --git a/apps/block_scout_web/lib/block_scout_web/views/api/v2/address_view.ex b/apps/block_scout_web/lib/block_scout_web/views/api/v2/address_view.ex
index 7abccd065035..379959a256cb 100644
--- a/apps/block_scout_web/lib/block_scout_web/views/api/v2/address_view.ex
+++ b/apps/block_scout_web/lib/block_scout_web/views/api/v2/address_view.ex
@@ -8,7 +8,6 @@ defmodule BlockScoutWeb.API.V2.AddressView do
   alias BlockScoutWeb.API.V2.Helper
   alias Explorer.{Chain, Market}
   alias Explorer.Chain.{Address, SmartContract}
-  alias Explorer.ExchangeRates.Token
 
   @api_true [api?: true]
 
@@ -78,7 +77,7 @@ defmodule BlockScoutWeb.API.V2.AddressView do
       end
 
     balance = address.fetched_coin_balance && address.fetched_coin_balance.value
-    exchange_rate = (Market.get_exchange_rate(Explorer.coin()) || Token.null()).usd_value
+    exchange_rate = Market.get_coin_exchange_rate().usd_value
 
     creator_hash = AddressView.from_address_hash(address)
     creation_tx = creator_hash && AddressView.transaction_hash(address)
diff --git a/apps/block_scout_web/lib/block_scout_web/views/api/v2/transaction_view.ex b/apps/block_scout_web/lib/block_scout_web/views/api/v2/transaction_view.ex
index 8368ab1cf56d..9c1eee2bc041 100644
--- a/apps/block_scout_web/lib/block_scout_web/views/api/v2/transaction_view.ex
+++ b/apps/block_scout_web/lib/block_scout_web/views/api/v2/transaction_view.ex
@@ -7,7 +7,6 @@ defmodule BlockScoutWeb.API.V2.TransactionView do
   alias BlockScoutWeb.Tokens.Helper, as: TokensHelper
   alias BlockScoutWeb.TransactionStateView
   alias Ecto.Association.NotLoaded
-  alias Explorer.ExchangeRates.Token, as: TokenRate
   alias Explorer.{Chain, Market}
   alias Explorer.Chain.{Address, Block, InternalTransaction, Log, Token, Transaction, Wei}
   alias Explorer.Chain.Block.Reward
@@ -399,7 +398,7 @@ defmodule BlockScoutWeb.API.V2.TransactionView do
       "token_transfers" => token_transfers(transaction.token_transfers, conn, single_tx?),
       "token_transfers_overflow" => token_transfers_overflow(transaction.token_transfers, single_tx?),
       "actions" => transaction_actions(transaction.transaction_actions),
-      "exchange_rate" => (Market.get_exchange_rate(Explorer.coin()) || TokenRate.null()).usd_value,
+      "exchange_rate" => Market.get_coin_exchange_rate().usd_value,
       "method" => method_name(transaction, decoded_input),
       "tx_types" => tx_types(transaction),
       "tx_tag" => GetTransactionTags.get_transaction_tags(transaction.hash, current_user(single_tx? && conn)),
diff --git a/apps/block_scout_web/test/block_scout_web/controllers/api/v2/stats_controller_test.exs b/apps/block_scout_web/test/block_scout_web/controllers/api/v2/stats_controller_test.exs
index 1c1659791fd5..85ac41e1d14d 100644
--- a/apps/block_scout_web/test/block_scout_web/controllers/api/v2/stats_controller_test.exs
+++ b/apps/block_scout_web/test/block_scout_web/controllers/api/v2/stats_controller_test.exs
@@ -42,7 +42,6 @@ defmodule BlockScoutWeb.API.V2.StatsControllerTest do
       assert response = json_response(request, 200)
 
       assert response["chart_data"] == []
-      assert response["available_supply"] == 0
     end
   end
 
diff --git a/apps/explorer/lib/explorer/chain/csv_export/address_transaction_csv_exporter.ex b/apps/explorer/lib/explorer/chain/csv_export/address_transaction_csv_exporter.ex
index b53d1046e91c..ae47768cff0b 100644
--- a/apps/explorer/lib/explorer/chain/csv_export/address_transaction_csv_exporter.ex
+++ b/apps/explorer/lib/explorer/chain/csv_export/address_transaction_csv_exporter.ex
@@ -12,7 +12,6 @@ defmodule Explorer.Chain.CSVExport.AddressTransactionCsvExporter do
   alias Explorer.Market.MarketHistory
   alias Explorer.Chain.{Address, Transaction, Wei}
   alias Explorer.Chain.CSVExport.Helper
-  alias Explorer.ExchangeRates.Token
 
   @necessity_by_association [
     necessity_by_association: %{
@@ -32,7 +31,7 @@ defmodule Explorer.Chain.CSVExport.AddressTransactionCsvExporter do
   @spec export(Address.t(), String.t(), String.t(), String.t() | nil, String.t() | nil) :: Enumerable.t()
   def export(address, from_period, to_period, filter_type \\ nil, filter_value \\ nil) do
     {from_block, to_block} = Helper.block_from_period(from_period, to_period)
-    exchange_rate = Market.get_exchange_rate(Explorer.coin()) || Token.null()
+    exchange_rate = Market.get_coin_exchange_rate()
 
     address.hash
     |> fetch_all_transactions(from_block, to_block, filter_type, filter_value, @paging_options)
diff --git a/apps/explorer/lib/explorer/chain/supply/exchange_rate.ex b/apps/explorer/lib/explorer/chain/supply/exchange_rate.ex
index d45a8edc02e4..1ef83b1a90c2 100644
--- a/apps/explorer/lib/explorer/chain/supply/exchange_rate.ex
+++ b/apps/explorer/lib/explorer/chain/supply/exchange_rate.ex
@@ -5,7 +5,6 @@ defmodule Explorer.Chain.Supply.ExchangeRate do
 
   use Explorer.Chain.Supply
 
-  alias Explorer.ExchangeRates.Token
   alias Explorer.Market
 
   def circulating do
@@ -17,6 +16,6 @@ defmodule Explorer.Chain.Supply.ExchangeRate do
   end
 
   def exchange_rate do
-    Market.get_exchange_rate(Explorer.coin()) || Token.null()
+    Market.get_coin_exchange_rate()
   end
 end
diff --git a/apps/explorer/lib/explorer/exchange_rates/token.ex b/apps/explorer/lib/explorer/exchange_rates/token.ex
index 8aa6d3b721aa..1e26d3267e8a 100644
--- a/apps/explorer/lib/explorer/exchange_rates/token.ex
+++ b/apps/explorer/lib/explorer/exchange_rates/token.ex
@@ -18,16 +18,16 @@ defmodule Explorer.ExchangeRates.Token do
    * `:volume_24h_usd` - The volume from the last 24 hours in USD
   """
   @type t :: %__MODULE__{
-          available_supply: Decimal.t(),
-          total_supply: Decimal.t(),
-          btc_value: Decimal.t(),
-          id: String.t(),
-          last_updated: DateTime.t(),
-          market_cap_usd: Decimal.t(),
-          name: String.t(),
-          symbol: String.t(),
-          usd_value: Decimal.t(),
-          volume_24h_usd: Decimal.t()
+          available_supply: Decimal.t() | nil,
+          total_supply: Decimal.t() | nil,
+          btc_value: Decimal.t() | nil,
+          id: String.t() | nil,
+          last_updated: DateTime.t() | nil,
+          market_cap_usd: Decimal.t() | nil,
+          name: String.t() | nil,
+          symbol: String.t() | nil,
+          usd_value: Decimal.t() | nil,
+          volume_24h_usd: Decimal.t() | nil
         }
 
   @derive Jason.Encoder
diff --git a/apps/explorer/lib/explorer/market/history/cataloger.ex b/apps/explorer/lib/explorer/market/history/cataloger.ex
index 8545ffa159ba..0672412d3311 100644
--- a/apps/explorer/lib/explorer/market/history/cataloger.ex
+++ b/apps/explorer/lib/explorer/market/history/cataloger.ex
@@ -28,38 +28,68 @@ defmodule Explorer.Market.History.Cataloger do
 
   @typep milliseconds :: non_neg_integer()
 
+  @price_failed_attempts 10
+  @market_cap_failed_attempts 3
+
   @impl GenServer
   def init(:ok) do
-    send(self(), {:fetch_history, 365})
+    send(self(), {:fetch_price_history, 365})
 
     {:ok, %{}}
   end
 
   @impl GenServer
-  def handle_info({:fetch_history, day_count}, state) do
-    fetch_history(day_count)
+  def handle_info({:fetch_price_history, day_count}, state) do
+    fetch_price_history(day_count)
+
+    {:noreply, state}
+  end
+
+  @impl GenServer
+  def handle_info(:fetch_market_cap_history, state) do
+    fetch_market_cap_history()
 
     {:noreply, state}
   end
 
   @impl GenServer
   # Record fetch successful.
-  def handle_info({_ref, {_, _, {:ok, records}}}, state) do
-    Market.bulk_insert_history(records)
+  def handle_info({_ref, {:price_history, {_, _, {:ok, records}}}}, state) do
+    Process.send(self(), :fetch_market_cap_history, [])
+    state = state |> Map.put_new(:price_records, records)
 
-    # Schedule next check for history
-    fetch_after = config_or_default(:history_fetch_interval, :timer.minutes(60))
-    Process.send_after(self(), {:fetch_history, 1}, fetch_after)
+    {:noreply, state |> Map.put_new(:price_records, state)}
+  end
+
+  @impl GenServer
+  # Record fetch successful.
+  def handle_info({_ref, {:market_cap_history, {_, {:ok, nil}}}}, state) do
+    market_cap_history(state.price_records, state)
+  end
+
+  @impl GenServer
+  # Record fetch successful.
+  def handle_info({_ref, {:market_cap_history, {_, {:ok, market_cap_record}}}}, state) do
+    records = compile_records(state.price_records, market_cap_record)
+    market_cap_history(records, state)
+  end
+
+  # Failed to get records. Try again.
+  @impl GenServer
+  def handle_info({_ref, {:price_history, {day_count, failed_attempts, :error}}}, state) do
+    Logger.warn(fn -> "Failed to fetch price history. Trying again." end)
+
+    fetch_price_history(day_count, failed_attempts + 1)
 
     {:noreply, state}
   end
 
   # Failed to get records. Try again.
   @impl GenServer
-  def handle_info({_ref, {day_count, failed_attempts, :error}}, state) do
-    Logger.warn(fn -> "Failed to fetch market history. Trying again." end)
+  def handle_info({_ref, {:market_cap_history, {failed_attempts, :error}}}, state) do
+    Logger.warn(fn -> "Failed to fetch market cap history. Trying again." end)
 
-    fetch_history(day_count, failed_attempts + 1)
+    fetch_market_cap_history(failed_attempts + 1)
 
     {:noreply, state}
   end
@@ -78,6 +108,16 @@ defmodule Explorer.Market.History.Cataloger do
     GenServer.start_link(__MODULE__, :ok, name: __MODULE__)
   end
 
+  defp market_cap_history(records, state) do
+    Market.bulk_insert_history(records)
+
+    # Schedule next check for history
+    fetch_after = config_or_default(:history_fetch_interval, :timer.minutes(60))
+    Process.send_after(self(), {:fetch_price_history, 1}, fetch_after)
+
+    {:noreply, state}
+  end
+
   @spec base_backoff :: milliseconds()
   defp base_backoff do
     config_or_default(:base_backoff, 100)
@@ -88,19 +128,65 @@ defmodule Explorer.Market.History.Cataloger do
     Application.get_env(:explorer, __MODULE__, [])[key] || default
   end
 
-  @spec source() :: module()
-  defp source do
-    config_or_default(:source, Explorer.Market.History.Source.CryptoCompare)
+  @spec source_price() :: module()
+  defp source_price do
+    config_or_default(:source, Explorer.Market.History.Source.Price.CryptoCompare)
+  end
+
+  @spec source_market_cap() :: module()
+  defp source_market_cap do
+    config_or_default(:source_market_cap, Explorer.Market.History.Source.MarketCap.CoinGecko)
+  end
+
+  @spec fetch_price_history(non_neg_integer(), non_neg_integer()) :: Task.t()
+  defp fetch_price_history(day_count, failed_attempts \\ 0) do
+    Task.Supervisor.async_nolink(Explorer.MarketTaskSupervisor, fn ->
+      Process.sleep(delay(failed_attempts))
+
+      if failed_attempts < @price_failed_attempts do
+        {:price_history, {day_count, failed_attempts, source_price().fetch_price_history(day_count)}}
+      else
+        {:price_history, {day_count, failed_attempts, {:ok, []}}}
+      end
+    end)
   end
 
-  @spec fetch_history(non_neg_integer(), non_neg_integer()) :: Task.t()
-  defp fetch_history(day_count, failed_attempts \\ 0) do
+  @spec fetch_market_cap_history(non_neg_integer()) :: Task.t()
+  defp fetch_market_cap_history(failed_attempts \\ 0) do
     Task.Supervisor.async_nolink(Explorer.MarketTaskSupervisor, fn ->
       Process.sleep(delay(failed_attempts))
-      {day_count, failed_attempts, source().fetch_history(day_count)}
+
+      if failed_attempts < @market_cap_failed_attempts do
+        {:market_cap_history, {failed_attempts, source_market_cap().fetch_market_cap()}}
+      else
+        {:market_cap_history, {failed_attempts, {:ok, nil}}}
+      end
     end)
   end
 
+  defp compile_records(price_records, market_cap_record) do
+    if market_cap_record do
+      if Enum.empty?(price_records) do
+        [market_cap_record]
+      else
+        today_index =
+          Enum.find_index(price_records, fn price ->
+            price.date == market_cap_record.date
+          end)
+
+        today =
+          price_records
+          |> Enum.at(today_index)
+          |> Map.put(:market_cap, market_cap_record.market_cap)
+
+        price_records
+        |> List.replace_at(today_index, today)
+      end
+    else
+      price_records
+    end
+  end
+
   @spec delay(non_neg_integer()) :: milliseconds()
   defp delay(0), do: 0
   defp delay(1), do: base_backoff()
diff --git a/apps/explorer/lib/explorer/market/history/source/market_cap.ex b/apps/explorer/lib/explorer/market/history/source/market_cap.ex
new file mode 100644
index 000000000000..f79e2d12c035
--- /dev/null
+++ b/apps/explorer/lib/explorer/market/history/source/market_cap.ex
@@ -0,0 +1,18 @@
+defmodule Explorer.Market.History.Source.MarketCap do
+  @moduledoc """
+  Interface for a source that allows for fetching of market cap history.
+  """
+
+  @typedoc """
+  Record of market values for a specific date.
+  """
+  @type record :: %{
+          date: Date.t(),
+          market_cap: Decimal.t()
+        }
+
+  @doc """
+  Fetch history for a specified amount of days in the past.
+  """
+  @callback fetch_market_cap() :: {:ok, [record()]} | :error
+end
diff --git a/apps/explorer/lib/explorer/market/history/source/market_cap/coin_gecko.ex b/apps/explorer/lib/explorer/market/history/source/market_cap/coin_gecko.ex
new file mode 100644
index 000000000000..9875f0d0a663
--- /dev/null
+++ b/apps/explorer/lib/explorer/market/history/source/market_cap/coin_gecko.ex
@@ -0,0 +1,60 @@
+defmodule Explorer.Market.History.Source.MarketCap.CoinGecko do
+  @moduledoc """
+  Adapter for fetching current market from CoinGecko.
+
+  The current market is fetched for the configured coin. You can specify a
+  different coin by changing the targeted coin.
+
+      # In config.exs
+      config :explorer, coin: "POA"
+
+  """
+
+  alias Explorer.ExchangeRates.Source
+  alias Explorer.ExchangeRates.Source.CoinGecko, as: ExchangeRatesSourceCoinGecko
+  alias Explorer.Market.History.Source.MarketCap, as: SourceMarketCap
+
+  @behaviour SourceMarketCap
+
+  @impl SourceMarketCap
+  def fetch_market_cap do
+    url = ExchangeRatesSourceCoinGecko.source_url()
+
+    if url do
+      case Source.http_request(url, ExchangeRatesSourceCoinGecko.headers()) do
+        {:ok, data} ->
+          result =
+            data
+            |> format_data()
+
+          {:ok, result}
+
+        _ ->
+          :error
+      end
+    else
+      :error
+    end
+  end
+
+  @spec date(String.t()) :: Date.t()
+  defp date(date_time_string) do
+    with {:ok, datetime, _} <- DateTime.from_iso8601(date_time_string) do
+      datetime
+      |> DateTime.to_date()
+    end
+  end
+
+  @spec format_data(term()) :: SourceMarketCap.record() | nil
+  defp format_data(nil), do: nil
+
+  defp format_data(data) do
+    market_data = data["market_data"]
+    market_cap = market_data["market_cap"]
+
+    %{
+      market_cap: Decimal.new(to_string(market_cap["usd"])),
+      date: date(data["last_updated"])
+    }
+  end
+end
diff --git a/apps/explorer/lib/explorer/market/history/source.ex b/apps/explorer/lib/explorer/market/history/source/price.ex
similarity index 58%
rename from apps/explorer/lib/explorer/market/history/source.ex
rename to apps/explorer/lib/explorer/market/history/source/price.ex
index af1c96e4bada..07924c1fca3a 100644
--- a/apps/explorer/lib/explorer/market/history/source.ex
+++ b/apps/explorer/lib/explorer/market/history/source/price.ex
@@ -1,6 +1,6 @@
-defmodule Explorer.Market.History.Source do
+defmodule Explorer.Market.History.Source.Price do
   @moduledoc """
-  Interface for a source that allows for fetching of market history.
+  Interface for a source that allows for fetching of coin price.
   """
 
   @typedoc """
@@ -15,5 +15,5 @@ defmodule Explorer.Market.History.Source do
   @doc """
   Fetch history for a specified amount of days in the past.
   """
-  @callback fetch_history(previous_days :: non_neg_integer()) :: {:ok, [record()]} | :error
+  @callback fetch_price_history(previous_days :: non_neg_integer()) :: {:ok, [record()]} | :error
 end
diff --git a/apps/explorer/lib/explorer/market/history/source/crypto_compare.ex b/apps/explorer/lib/explorer/market/history/source/price/crypto_compare.ex
similarity index 86%
rename from apps/explorer/lib/explorer/market/history/source/crypto_compare.ex
rename to apps/explorer/lib/explorer/market/history/source/price/crypto_compare.ex
index 6888d83b2b67..76693d37063d 100644
--- a/apps/explorer/lib/explorer/market/history/source/crypto_compare.ex
+++ b/apps/explorer/lib/explorer/market/history/source/price/crypto_compare.ex
@@ -1,4 +1,4 @@
-defmodule Explorer.Market.History.Source.CryptoCompare do
+defmodule Explorer.Market.History.Source.Price.CryptoCompare do
   @moduledoc """
   Adapter for fetching market history from https://cryptocompare.com.
 
@@ -10,15 +10,15 @@ defmodule Explorer.Market.History.Source.CryptoCompare do
 
   """
 
-  alias Explorer.Market.History.Source
+  alias Explorer.Market.History.Source.Price, as: SourcePrice
   alias HTTPoison.Response
 
-  @behaviour Source
+  @behaviour SourcePrice
 
   @typep unix_timestamp :: non_neg_integer()
 
-  @impl Source
-  def fetch_history(previous_days) do
+  @impl SourcePrice
+  def fetch_price_history(previous_days) do
     url = history_url(previous_days)
     headers = [{"Content-Type", "application/json"}]
 
@@ -49,7 +49,7 @@ defmodule Explorer.Market.History.Source.CryptoCompare do
     |> DateTime.to_date()
   end
 
-  @spec format_data(String.t()) :: [Source.record()]
+  @spec format_data(String.t()) :: [SourcePrice.record()]
   defp format_data(data) do
     json = Jason.decode!(data)
 
diff --git a/apps/explorer/lib/explorer/market/market.ex b/apps/explorer/lib/explorer/market/market.ex
index 466c6c56170f..083f39403c94 100644
--- a/apps/explorer/lib/explorer/market/market.ex
+++ b/apps/explorer/lib/explorer/market/market.ex
@@ -7,14 +7,6 @@ defmodule Explorer.Market do
   alias Explorer.Market.{MarketHistory, MarketHistoryCache}
   alias Explorer.{ExchangeRates, Repo}
 
-  @doc """
-  Get most recent exchange rate for the given symbol.
-  """
-  @spec get_exchange_rate(String.t()) :: Token.t() | nil
-  def get_exchange_rate(symbol) do
-    ExchangeRates.lookup(symbol)
-  end
-
   @doc """
   Retrieves the history for the recent specified amount of days.
 
@@ -28,7 +20,7 @@ defmodule Explorer.Market do
   @doc """
   Retrieves today's native coin exchange rate from the database.
   """
-  @spec get_native_coin_exchange_rate_from_db() :: Token.t() | nil
+  @spec get_native_coin_exchange_rate_from_db() :: Token.t()
   def get_native_coin_exchange_rate_from_db do
     today =
       case fetch_recent_history() do
@@ -37,22 +29,48 @@ defmodule Explorer.Market do
       end
 
     if today do
-      Map.get(today, :closing_price)
+      %Token{
+        usd_value: Map.get(today, :closing_price),
+        market_cap_usd: Map.get(today, :market_cap),
+        available_supply: nil,
+        total_supply: nil,
+        btc_value: nil,
+        id: nil,
+        last_updated: nil,
+        name: nil,
+        symbol: nil,
+        volume_24h_usd: nil
+      }
     else
-      nil
+      Token.null()
     end
   end
 
+  @doc """
+  Get most recent exchange rate for the native coin from ETS or from DB.
+  """
+  @spec get_coin_exchange_rate() :: Token.t() | nil
+  def get_coin_exchange_rate do
+    get_exchange_rate(Explorer.coin()) || get_native_coin_exchange_rate_from_db() || Token.null()
+  end
+
   @doc false
   def bulk_insert_history(records) do
     records_without_zeroes =
       records
       |> Enum.reject(fn item ->
-        Decimal.equal?(item.closing_price, 0) && Decimal.equal?(item.opening_price, 0)
+        Map.has_key?(item, :opening_price) && Map.has_key?(item, :closing_price) &&
+          Decimal.equal?(item.closing_price, 0) &&
+          Decimal.equal?(item.opening_price, 0)
       end)
       # Enforce MarketHistory ShareLocks order (see docs: sharelocks.md)
       |> Enum.sort_by(& &1.date)
 
     Repo.insert_all(MarketHistory, records_without_zeroes, on_conflict: :nothing, conflict_target: [:date])
   end
+
+  @spec get_exchange_rate(String.t()) :: Token.t() | nil
+  defp get_exchange_rate(symbol) do
+    ExchangeRates.lookup(symbol)
+  end
 end
diff --git a/apps/explorer/lib/explorer/market/market_history.ex b/apps/explorer/lib/explorer/market/market_history.ex
index 10850177b7c5..aca309062540 100644
--- a/apps/explorer/lib/explorer/market/market_history.ex
+++ b/apps/explorer/lib/explorer/market/market_history.ex
@@ -9,6 +9,7 @@ defmodule Explorer.Market.MarketHistory do
     field(:closing_price, :decimal)
     field(:date, :date)
     field(:opening_price, :decimal)
+    field(:market_cap, :decimal)
   end
 
   @typedoc """
@@ -17,10 +18,12 @@ defmodule Explorer.Market.MarketHistory do
    * `:closing_price` - Closing price in USD.
    * `:date` - The date in UTC.
    * `:opening_price` - Opening price in USD.
+   * `:market_cap` - Market cap in USD.
   """
   @type t :: %__MODULE__{
           closing_price: Decimal.t(),
           date: Date.t(),
-          opening_price: Decimal.t()
+          opening_price: Decimal.t(),
+          market_cap: Decimal.t()
         }
 end
diff --git a/apps/explorer/priv/repo/migrations/20230530074105_market_history_add_market_cap.exs b/apps/explorer/priv/repo/migrations/20230530074105_market_history_add_market_cap.exs
new file mode 100644
index 000000000000..b0ddaca92c21
--- /dev/null
+++ b/apps/explorer/priv/repo/migrations/20230530074105_market_history_add_market_cap.exs
@@ -0,0 +1,9 @@
+defmodule Explorer.Repo.Migrations.MarketHistoryAddMarketCap do
+  use Ecto.Migration
+
+  def change do
+    alter table(:market_history) do
+      add(:market_cap, :decimal)
+    end
+  end
+end
diff --git a/apps/explorer/test/explorer/market/history/cataloger_test.exs b/apps/explorer/test/explorer/market/history/cataloger_test.exs
index 433ad0fc1e5c..0acc04a7f24b 100644
--- a/apps/explorer/test/explorer/market/history/cataloger_test.exs
+++ b/apps/explorer/test/explorer/market/history/cataloger_test.exs
@@ -5,7 +5,7 @@ defmodule Explorer.Market.History.CatalogerTest do
 
   alias Explorer.Market.MarketHistory
   alias Explorer.Market.History.Cataloger
-  alias Explorer.Market.History.Source.TestSource
+  alias Explorer.Market.History.Source.Price.TestSource
   alias Explorer.Repo
 
   setup do
@@ -15,27 +15,58 @@ defmodule Explorer.Market.History.CatalogerTest do
 
   test "init" do
     assert {:ok, %{}} == Cataloger.init(:ok)
-    assert_received {:fetch_history, 365}
+    assert_received {:fetch_price_history, 365}
   end
 
-  test "handle_info with `{:fetch_history, days}`" do
+  test "handle_info with `{:fetch_price_history, days}`" do
     records = [%{date: ~D[2018-04-01], closing_price: Decimal.new(10), opening_price: Decimal.new(5)}]
-    expect(TestSource, :fetch_history, fn 1 -> {:ok, records} end)
+    expect(TestSource, :fetch_price_history, fn 1 -> {:ok, records} end)
     set_mox_global()
     state = %{}
 
-    assert {:noreply, state} == Cataloger.handle_info({:fetch_history, 1}, state)
-    assert_receive {_ref, {1, 0, {:ok, ^records}}}
+    assert {:noreply, state} == Cataloger.handle_info({:fetch_price_history, 1}, state)
+    assert_receive {_ref, {:price_history, {1, 0, {:ok, ^records}}}}
   end
 
-  test "handle_info with successful task" do
+  test "handle_info with successful tasks (price and market cap)" do
     Application.put_env(:explorer, Cataloger, history_fetch_interval: 1)
-    record = %{date: ~D[2018-04-01], closing_price: Decimal.new(10), opening_price: Decimal.new(5)}
-    state = %{}
+    record_price = %{date: ~D[2018-04-01], closing_price: Decimal.new(10), opening_price: Decimal.new(5)}
+    record_market_cap = %{date: ~D[2018-04-01], market_cap: Decimal.new(100_500)}
+
+    state = %{
+      price_records: [
+        record_price
+      ]
+    }
+
+    assert {:noreply, state} == Cataloger.handle_info({nil, {:price_history, {1, 0, {:ok, [record_price]}}}}, state)
+    assert_receive :fetch_market_cap_history
+
+    assert {:noreply, state} ==
+             Cataloger.handle_info({nil, {:market_cap_history, {0, {:ok, record_market_cap}}}}, state)
+
+    assert Repo.get_by(MarketHistory, date: record_price.date)
+  end
+
+  test "handle_info with successful price task" do
+    Application.put_env(:explorer, Cataloger, history_fetch_interval: 1)
+    record_price = %{date: ~D[2018-04-01], closing_price: Decimal.new(10), opening_price: Decimal.new(5)}
+    record_market_cap = nil
+
+    state = %{
+      price_records: [
+        record_price
+      ]
+    }
+
+    assert {:noreply, state} == Cataloger.handle_info({nil, {:price_history, {1, 0, {:ok, [record_price]}}}}, state)
+    assert_receive :fetch_market_cap_history
+
+    assert {:noreply, state} ==
+             Cataloger.handle_info({nil, {:market_cap_history, {0, {:ok, record_market_cap}}}}, state)
 
-    assert {:noreply, state} == Cataloger.handle_info({nil, {1, 0, {:ok, [record]}}}, state)
-    assert_receive {:fetch_history, 1}
-    assert Repo.get_by(MarketHistory, date: record.date)
+    assert record = Repo.get_by(MarketHistory, date: record_price.date)
+    assert record.market_cap == nil
   end
 
   test "handle info for DOWN message" do
diff --git a/apps/explorer/test/explorer/market/history/source/crypto_compare_test.exs b/apps/explorer/test/explorer/market/history/source/price/crypto_compare_test.exs
similarity index 90%
rename from apps/explorer/test/explorer/market/history/source/crypto_compare_test.exs
rename to apps/explorer/test/explorer/market/history/source/price/crypto_compare_test.exs
index 1fc4223f7262..2d8311b0ae1f 100644
--- a/apps/explorer/test/explorer/market/history/source/crypto_compare_test.exs
+++ b/apps/explorer/test/explorer/market/history/source/price/crypto_compare_test.exs
@@ -1,7 +1,7 @@
-defmodule Explorer.Market.History.Source.CryptoCompareTest do
+defmodule Explorer.Market.History.Source.Price.CryptoCompareTest do
   use ExUnit.Case, async: false
 
-  alias Explorer.Market.History.Source.CryptoCompare
+  alias Explorer.Market.History.Source.Price.CryptoCompare
   alias Plug.Conn
 
   @json """
@@ -48,7 +48,7 @@ defmodule Explorer.Market.History.Source.CryptoCompareTest do
   }
   """
 
-  describe "fetch_history/1" do
+  describe "fetch_price_history/1" do
     setup do
       bypass = Bypass.open()
       Application.put_env(:explorer, CryptoCompare, base_url: "http://localhost:#{bypass.port}")
@@ -77,14 +77,14 @@ defmodule Explorer.Market.History.Source.CryptoCompareTest do
         }
       ]
 
-      assert {:ok, expected} == CryptoCompare.fetch_history(3)
+      assert {:ok, expected} == CryptoCompare.fetch_price_history(3)
     end
 
     test "with errored request", %{bypass: bypass} do
       error_text = ~S({"error": "server error"})
       Bypass.expect(bypass, fn conn -> Conn.resp(conn, 500, error_text) end)
 
-      assert :error == CryptoCompare.fetch_history(3)
+      assert :error == CryptoCompare.fetch_price_history(3)
     end
 
     test "rejects empty prices", %{bypass: bypass} do
@@ -138,7 +138,7 @@ defmodule Explorer.Market.History.Source.CryptoCompareTest do
         %{closing_price: Decimal.from_float(8804.32), date: ~D[2018-04-26], opening_price: Decimal.from_float(8873.57)}
       ]
 
-      assert {:ok, expected} == CryptoCompare.fetch_history(3)
+      assert {:ok, expected} == CryptoCompare.fetch_price_history(3)
     end
   end
 end
diff --git a/apps/explorer/test/test_helper.exs b/apps/explorer/test/test_helper.exs
index 849fa0b6ae12..5f07fdcc59e0 100644
--- a/apps/explorer/test/test_helper.exs
+++ b/apps/explorer/test/test_helper.exs
@@ -15,7 +15,7 @@ Ecto.Adapters.SQL.Sandbox.mode(Explorer.Repo, :auto)
 Ecto.Adapters.SQL.Sandbox.mode(Explorer.Repo.Account, :auto)
 
 Mox.defmock(Explorer.ExchangeRates.Source.TestSource, for: Explorer.ExchangeRates.Source)
-Mox.defmock(Explorer.Market.History.Source.TestSource, for: Explorer.Market.History.Source)
+Mox.defmock(Explorer.Market.History.Source.Price.TestSource, for: Explorer.Market.History.Source.Price)
 Mox.defmock(Explorer.History.TestHistorian, for: Explorer.History.Historian)
 
 Mox.defmock(EthereumJSONRPC.Mox, for: EthereumJSONRPC.Transport)

From 284855947a343dfae60b32cc7d6073edce722d23 Mon Sep 17 00:00:00 2001
From: Qwerty5Uiop <alex000010@bk.ru>
Date: Tue, 20 Jun 2023 18:45:54 +0400
Subject: [PATCH 122/909] Increase waiting interval

---
 CHANGELOG.md                                                    | 2 +-
 .../indexer/block/catchup/missing_ranges_collector_test.exs     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 84d19f6ba806..6500da9e8f9b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -36,7 +36,7 @@
 - [#7516](https://github.com/blockscout/blockscout/pull/7516) - Fix shrinking logo in Safari
 - [#7590](https://github.com/blockscout/blockscout/pull/7590) - Drop genesis block in internal transactions fetcher
 - [#7639](https://github.com/blockscout/blockscout/pull/7639) - Fix contract creation transactions
-- [#7724](https://github.com/blockscout/blockscout/pull/7724) - Move MissingRangesCollector init logic to handle_continue
+- [#7724](https://github.com/blockscout/blockscout/pull/7724), [#7753](https://github.com/blockscout/blockscout/pull/7753) - Move MissingRangesCollector init logic to handle_continue
 - [#7751](https://github.com/blockscout/blockscout/pull/7751) - Add missing method_to_url params for trace transactions
 
 ### Chore
diff --git a/apps/indexer/test/indexer/block/catchup/missing_ranges_collector_test.exs b/apps/indexer/test/indexer/block/catchup/missing_ranges_collector_test.exs
index 72436eb04132..d099be7063fc 100644
--- a/apps/indexer/test/indexer/block/catchup/missing_ranges_collector_test.exs
+++ b/apps/indexer/test/indexer/block/catchup/missing_ranges_collector_test.exs
@@ -14,7 +14,7 @@ defmodule Indexer.Block.Catchup.MissingRangesCollectorTest do
       insert(:block, number: 1_000_000)
       insert(:block, number: 500_123)
       MissingRangesCollector.start_link([])
-      Process.sleep(500)
+      Process.sleep(1000)
 
       assert [999_999..900_000//-1] = batch = MissingBlockRange.get_latest_batch(1)
       MissingBlockRange.clear_batch(batch)

From 21818387272ed4fda8b7bf636fe020727ca484eb Mon Sep 17 00:00:00 2001
From: Viktor Baranov <baranov.viktor.27@gmail.com>
Date: Tue, 20 Jun 2023 22:08:36 +0300
Subject: [PATCH 123/909] Blockscout 5.2.0

---
 .../publish-docker-image-every-push.yml       |  2 +-
 .../publish-docker-image-for-base.yml         |  2 +-
 .../publish-docker-image-for-core.yml         |  2 +-
 .../publish-docker-image-for-eth.yml          |  2 +-
 .../publish-docker-image-for-gc-chiado.yml    |  2 +-
 .../publish-docker-image-for-l2-staging.yml   |  2 +-
 .../publish-docker-image-for-lukso.yml        |  2 +-
 .../publish-docker-image-for-optimism.yml     |  2 +-
 ...ish-docker-image-for-polygon-supernets.yml |  2 +-
 .../publish-docker-image-for-rsk.yml          |  2 +-
 .../publish-docker-image-for-xdai.yml         |  2 +-
 .../publish-docker-image-release.yml          |  2 +-
 CHANGELOG.md                                  | 73 +++++++++++++++++++
 apps/block_scout_web/mix.exs                  |  2 +-
 apps/ethereum_jsonrpc/mix.exs                 |  2 +-
 apps/explorer/mix.exs                         |  2 +-
 apps/indexer/mix.exs                          |  2 +-
 deploy/testing/eth-goerli/values.yaml         |  2 -
 .../docker-compose-no-rust-services.yml       |  2 +-
 docker-compose/docker-compose.yml             |  2 +-
 docker-compose/envs/common-frontend.env       |  1 -
 docker/Makefile                               |  2 +-
 mix.exs                                       |  2 +-
 rel/config.exs                                |  2 +-
 24 files changed, 94 insertions(+), 24 deletions(-)

diff --git a/.github/workflows/publish-docker-image-every-push.yml b/.github/workflows/publish-docker-image-every-push.yml
index c9ed2871fc9c..b54cdf5266da 100644
--- a/.github/workflows/publish-docker-image-every-push.yml
+++ b/.github/workflows/publish-docker-image-every-push.yml
@@ -7,7 +7,7 @@ on:
 env:
   OTP_VERSION: '25.2.1'
   ELIXIR_VERSION: '1.14.3'
-  RELEASE_VERSION: 5.1.5
+  RELEASE_VERSION: 5.2.0
 
 jobs:
   push_to_registry:
diff --git a/.github/workflows/publish-docker-image-for-base.yml b/.github/workflows/publish-docker-image-for-base.yml
index 46f1674d26e1..513cce03c92a 100644
--- a/.github/workflows/publish-docker-image-for-base.yml
+++ b/.github/workflows/publish-docker-image-for-base.yml
@@ -14,7 +14,7 @@ jobs:
     name: Push Docker image to Docker Hub
     runs-on: ubuntu-latest
     env:
-      RELEASE_VERSION: 5.1.5
+      RELEASE_VERSION: 5.2.0
       DOCKER_CHAIN_NAME: base-goerli
     steps:
       - name: Check out the repo
diff --git a/.github/workflows/publish-docker-image-for-core.yml b/.github/workflows/publish-docker-image-for-core.yml
index 8872e9186b42..a6cc28f4dd14 100644
--- a/.github/workflows/publish-docker-image-for-core.yml
+++ b/.github/workflows/publish-docker-image-for-core.yml
@@ -14,7 +14,7 @@ jobs:
     name: Push Docker image to Docker Hub
     runs-on: ubuntu-latest
     env:
-      RELEASE_VERSION: 5.1.5
+      RELEASE_VERSION: 5.2.0
       DOCKER_CHAIN_NAME: poa
     steps:
       - name: Check out the repo
diff --git a/.github/workflows/publish-docker-image-for-eth.yml b/.github/workflows/publish-docker-image-for-eth.yml
index 2a2be62293f0..10f38f7c9f28 100644
--- a/.github/workflows/publish-docker-image-for-eth.yml
+++ b/.github/workflows/publish-docker-image-for-eth.yml
@@ -14,7 +14,7 @@ jobs:
     name: Push Docker image to Docker Hub
     runs-on: ubuntu-latest
     env:
-      RELEASE_VERSION: 5.1.5
+      RELEASE_VERSION: 5.2.0
       DOCKER_CHAIN_NAME: mainnet
     steps:
       - name: Check out the repo
diff --git a/.github/workflows/publish-docker-image-for-gc-chiado.yml b/.github/workflows/publish-docker-image-for-gc-chiado.yml
index dfd209bca4c1..a51f986068e5 100644
--- a/.github/workflows/publish-docker-image-for-gc-chiado.yml
+++ b/.github/workflows/publish-docker-image-for-gc-chiado.yml
@@ -17,7 +17,7 @@ jobs:
     name: Push Docker image to Docker Hub
     runs-on: ubuntu-latest
     env:
-      RELEASE_VERSION: 5.1.5
+      RELEASE_VERSION: 5.2.0
       DOCKER_CHAIN_NAME: xdai-chiado
     steps:
       - name: Check out the repo
diff --git a/.github/workflows/publish-docker-image-for-l2-staging.yml b/.github/workflows/publish-docker-image-for-l2-staging.yml
index fd5e82bfeba1..87cfa8c7f4ce 100644
--- a/.github/workflows/publish-docker-image-for-l2-staging.yml
+++ b/.github/workflows/publish-docker-image-for-l2-staging.yml
@@ -14,7 +14,7 @@ jobs:
     name: Push Docker image to Docker Hub
     runs-on: ubuntu-latest
     env:
-      RELEASE_VERSION: 5.1.5
+      RELEASE_VERSION: 5.2.0
       DOCKER_CHAIN_NAME: optimism-l2-advanced
     steps:
       - name: Check out the repo
diff --git a/.github/workflows/publish-docker-image-for-lukso.yml b/.github/workflows/publish-docker-image-for-lukso.yml
index a94bed49a458..361865b97c75 100644
--- a/.github/workflows/publish-docker-image-for-lukso.yml
+++ b/.github/workflows/publish-docker-image-for-lukso.yml
@@ -14,7 +14,7 @@ jobs:
     name: Push Docker image to Docker Hub
     runs-on: ubuntu-latest
     env:
-      RELEASE_VERSION: 5.1.5
+      RELEASE_VERSION: 5.2.0
       DOCKER_CHAIN_NAME: lukso
     steps:
       - name: Check out the repo
diff --git a/.github/workflows/publish-docker-image-for-optimism.yml b/.github/workflows/publish-docker-image-for-optimism.yml
index 570df2aeaab2..4e82af2ee050 100644
--- a/.github/workflows/publish-docker-image-for-optimism.yml
+++ b/.github/workflows/publish-docker-image-for-optimism.yml
@@ -14,7 +14,7 @@ jobs:
     name: Push Docker image to Docker Hub
     runs-on: ubuntu-latest
     env:
-      RELEASE_VERSION: 5.1.5
+      RELEASE_VERSION: 5.2.0
       DOCKER_CHAIN_NAME: optimism
     steps:
       - name: Check out the repo
diff --git a/.github/workflows/publish-docker-image-for-polygon-supernets.yml b/.github/workflows/publish-docker-image-for-polygon-supernets.yml
index b21b5cb8eb82..f8175de708ea 100644
--- a/.github/workflows/publish-docker-image-for-polygon-supernets.yml
+++ b/.github/workflows/publish-docker-image-for-polygon-supernets.yml
@@ -17,7 +17,7 @@ jobs:
     name: Push Docker image to Docker Hub
     runs-on: ubuntu-latest
     env:
-      RELEASE_VERSION: 5.1.5
+      RELEASE_VERSION: 5.2.0
       DOCKER_CHAIN_NAME: polygon-supernets
     steps:
       - name: Check out the repo
diff --git a/.github/workflows/publish-docker-image-for-rsk.yml b/.github/workflows/publish-docker-image-for-rsk.yml
index fddbd5769eea..49c787aa53f6 100644
--- a/.github/workflows/publish-docker-image-for-rsk.yml
+++ b/.github/workflows/publish-docker-image-for-rsk.yml
@@ -14,7 +14,7 @@ jobs:
     name: Push Docker image to Docker Hub
     runs-on: ubuntu-latest
     env:
-      RELEASE_VERSION: 5.1.5
+      RELEASE_VERSION: 5.2.0
       DOCKER_CHAIN_NAME: rsk
     steps:
       - name: Check out the repo
diff --git a/.github/workflows/publish-docker-image-for-xdai.yml b/.github/workflows/publish-docker-image-for-xdai.yml
index 0247e8d4155e..718be2aa288d 100644
--- a/.github/workflows/publish-docker-image-for-xdai.yml
+++ b/.github/workflows/publish-docker-image-for-xdai.yml
@@ -17,7 +17,7 @@ jobs:
     name: Push Docker image to Docker Hub
     runs-on: ubuntu-latest
     env:
-      RELEASE_VERSION: 5.1.5
+      RELEASE_VERSION: 5.2.0
       DOCKER_CHAIN_NAME: xdai
     steps:
       - name: Check out the repo
diff --git a/.github/workflows/publish-docker-image-release.yml b/.github/workflows/publish-docker-image-release.yml
index 031b197627e1..b1a5b666239b 100644
--- a/.github/workflows/publish-docker-image-release.yml
+++ b/.github/workflows/publish-docker-image-release.yml
@@ -18,7 +18,7 @@ jobs:
     name: Push Docker image to Docker Hub
     runs-on: ubuntu-latest
     env:
-      RELEASE_VERSION: 5.1.5
+      RELEASE_VERSION: 5.2.0
     steps:
       - name: Check out the repo
         uses: actions/checkout@v3
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6500da9e8f9b..d7c73c270826 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,19 @@
 
 ### Features
 
+### Fixes
+
+### Chore
+
+<details>
+  <summary>Dependencies version bumps</summary>
+
+</details>
+
+## 5.2.0-beta
+
+### Features
+
 - [#7502](https://github.com/blockscout/blockscout/pull/7502) - Improve performance of some methods, endpoints and SQL queries
 - [#7665](https://github.com/blockscout/blockscout/pull/7665) - Add standard-json vyper verification
 - [#7685](https://github.com/blockscout/blockscout/pull/7685) - Add yul filter and "language" field for smart contracts
@@ -51,6 +64,66 @@
 <details>
   <summary>Dependencies version bumps</summary>
 
+- [#7518](https://github.com/blockscout/blockscout/pull/7518) - Bump mini-css-extract-plugin from 2.7.5 to 2.7.6 in /apps/block_scout_web/assets
+- [#7519](https://github.com/blockscout/blockscout/pull/7519) - Bump style-loader from 3.3.2 to 3.3.3 in /apps/block_scout_web/assets
+- [#7505](https://github.com/blockscout/blockscout/pull/7505) - Bump webpack from 5.83.0 to 5.83.1 in /apps/block_scout_web/assets
+- [#7533](https://github.com/blockscout/blockscout/pull/7533) - Bump sass-loader from 13.2.2 to 13.3.0 in /apps/block_scout_web/assets
+- [#7534](https://github.com/blockscout/blockscout/pull/7534) - Bump eslint from 8.40.0 to 8.41.0 in /apps/block_scout_web/assets
+- [#7541](https://github.com/blockscout/blockscout/pull/7541) - Bump cldr_utils from 2.23.1 to 2.24.0
+- [#7542](https://github.com/blockscout/blockscout/pull/7542) - Bump ex_cldr_units from 3.16.0 to 3.16.1
+- [#7548](https://github.com/blockscout/blockscout/pull/7548) - Bump briefly from 20d1318 to 678a376
+- [#7547](https://github.com/blockscout/blockscout/pull/7547) - Bump webpack from 5.83.1 to 5.84.0 in /apps/block_scout_web/assets
+- [#7554](https://github.com/blockscout/blockscout/pull/7554) - Bump webpack from 5.84.0 to 5.84.1 in /apps/block_scout_web/assets
+- [#7568](https://github.com/blockscout/blockscout/pull/7568) - Bump @babel/core from 7.21.8 to 7.22.1 in /apps/block_scout_web/assets
+- [#7569](https://github.com/blockscout/blockscout/pull/7569) - Bump postcss-loader from 7.3.0 to 7.3.1 in /apps/block_scout_web/assets
+- [#7570](https://github.com/blockscout/blockscout/pull/7570) - Bump number from 1.0.3 to 1.0.4
+- [#7567](https://github.com/blockscout/blockscout/pull/7567) - Bump @babel/preset-env from 7.21.5 to 7.22.2 in /apps/block_scout_web/assets
+- [#7582](https://github.com/blockscout/blockscout/pull/7582) - Bump eslint-config-standard from 17.0.0 to 17.1.0 in /apps/block_scout_web/assets
+- [#7581](https://github.com/blockscout/blockscout/pull/7581) - Bump sass-loader from 13.3.0 to 13.3.1 in /apps/block_scout_web/assets
+- [#7578](https://github.com/blockscout/blockscout/pull/7578) - Bump @babel/preset-env from 7.22.2 to 7.22.4 in /apps/block_scout_web/assets
+- [#7577](https://github.com/blockscout/blockscout/pull/7577) - Bump postcss-loader from 7.3.1 to 7.3.2 in /apps/block_scout_web/assets
+- [#7579](https://github.com/blockscout/blockscout/pull/7579) - Bump sweetalert2 from 11.7.5 to 11.7.8 in /apps/block_scout_web/assets
+- [#7591](https://github.com/blockscout/blockscout/pull/7591) - Bump sweetalert2 from 11.7.8 to 11.7.9 in /apps/block_scout_web/assets
+- [#7593](https://github.com/blockscout/blockscout/pull/7593) - Bump ex_json_schema from 0.9.2 to 0.9.3
+- [#7580](https://github.com/blockscout/blockscout/pull/7580) - Bump postcss from 8.4.23 to 8.4.24 in /apps/block_scout_web/assets
+- [#7601](https://github.com/blockscout/blockscout/pull/7601) - Bump sweetalert2 from 11.7.9 to 11.7.10 in /apps/block_scout_web/assets
+- [#7602](https://github.com/blockscout/blockscout/pull/7602) - Bump mime from 2.0.3 to 2.0.4
+- [#7618](https://github.com/blockscout/blockscout/pull/7618) - Bump gettext from 0.22.1 to 0.22.2
+- [#7617](https://github.com/blockscout/blockscout/pull/7617) - Bump @amplitude/analytics-browser from 1.10.3 to 1.10.4 in /apps/block_scout_web/assets
+- [#7609](https://github.com/blockscout/blockscout/pull/7609) - Bump webpack from 5.84.1 to 5.85.0 in /apps/block_scout_web/assets
+- [#7610](https://github.com/blockscout/blockscout/pull/7610) - Bump mime from 2.0.4 to 2.0.5
+- [#7634](https://github.com/blockscout/blockscout/pull/7634) - Bump eslint from 8.41.0 to 8.42.0 in /apps/block_scout_web/assets
+- [#7633](https://github.com/blockscout/blockscout/pull/7633) - Bump floki from 0.34.2 to 0.34.3
+- [#7631](https://github.com/blockscout/blockscout/pull/7631) - Bump phoenix_ecto from 4.4.1 to 4.4.2
+- [#7630](https://github.com/blockscout/blockscout/pull/7630) - Bump webpack-cli from 5.1.1 to 5.1.3 in /apps/block_scout_web/assets
+- [#7632](https://github.com/blockscout/blockscout/pull/7632) - Bump webpack from 5.85.0 to 5.85.1 in /apps/block_scout_web/assets
+- [#7646](https://github.com/blockscout/blockscout/pull/7646) - Bump sweetalert2 from 11.7.10 to 11.7.11 in /apps/block_scout_web/assets
+- [#7647](https://github.com/blockscout/blockscout/pull/7647) - Bump @amplitude/analytics-browser from 1.10.4 to 1.10.6 in /apps/block_scout_web/assets
+- [#7659](https://github.com/blockscout/blockscout/pull/7659) - Bump webpack-cli from 5.1.3 to 5.1.4 in /apps/block_scout_web/assets
+- [#7658](https://github.com/blockscout/blockscout/pull/7658) - Bump @amplitude/analytics-browser from 1.10.6 to 1.10.7 in /apps/block_scout_web/assets
+- [#7657](https://github.com/blockscout/blockscout/pull/7657) - Bump webpack from 5.85.1 to 5.86.0 in /apps/block_scout_web/assets
+- [#7672](https://github.com/blockscout/blockscout/pull/7672) - Bump @babel/preset-env from 7.22.4 to 7.22.5 in /apps/block_scout_web/assets
+- [#7674](https://github.com/blockscout/blockscout/pull/7674) - Bump ecto from 3.10.1 to 3.10.2
+- [#7673](https://github.com/blockscout/blockscout/pull/7673) - Bump @babel/core from 7.22.1 to 7.22.5 in /apps/block_scout_web/assets
+- [#7671](https://github.com/blockscout/blockscout/pull/7671) - Bump sass from 1.62.1 to 1.63.2 in /apps/block_scout_web/assets
+- [#7681](https://github.com/blockscout/blockscout/pull/7681) - Bump sweetalert2 from 11.7.11 to 11.7.12 in /apps/block_scout_web/assets
+- [#7679](https://github.com/blockscout/blockscout/pull/7679) - Bump @amplitude/analytics-browser from 1.10.7 to 1.10.8 in /apps/block_scout_web/assets
+- [#7680](https://github.com/blockscout/blockscout/pull/7680) - Bump sass from 1.63.2 to 1.63.3 in /apps/block_scout_web/assets
+- [#7693](https://github.com/blockscout/blockscout/pull/7693) - Bump sass-loader from 13.3.1 to 13.3.2 in /apps/block_scout_web/assets
+- [#7692](https://github.com/blockscout/blockscout/pull/7692) - Bump postcss-loader from 7.3.2 to 7.3.3 in /apps/block_scout_web/assets
+- [#7691](https://github.com/blockscout/blockscout/pull/7691) - Bump url from 0.11.0 to 0.11.1 in /apps/block_scout_web/assets
+- [#7690](https://github.com/blockscout/blockscout/pull/7690) - Bump core-js from 3.30.2 to 3.31.0 in /apps/block_scout_web/assets
+- [#7701](https://github.com/blockscout/blockscout/pull/7701) - Bump css-minimizer-webpack-plugin from 5.0.0 to 5.0.1 in /apps/block_scout_web/assets
+- [#7702](https://github.com/blockscout/blockscout/pull/7702) - Bump @amplitude/analytics-browser from 1.10.8 to 1.11.0 in /apps/block_scout_web/assets
+- [#7708](https://github.com/blockscout/blockscout/pull/7708) - Bump phoenix_pubsub from 2.1.2 to 2.1.3
+- [#7707](https://github.com/blockscout/blockscout/pull/7707) - Bump @amplitude/analytics-browser from 1.11.0 to 2.0.0 in /apps/block_scout_web/assets
+- [#7706](https://github.com/blockscout/blockscout/pull/7706) - Bump webpack from 5.86.0 to 5.87.0 in /apps/block_scout_web/assets 
+- [#7705](https://github.com/blockscout/blockscout/pull/7705) - Bump sass from 1.63.3 to 1.63.4 in /apps/block_scout_web/assets
+- [#7714](https://github.com/blockscout/blockscout/pull/7714) - Bump ex_cldr_units from 3.16.1 to 3.16.2
+- [#7748](https://github.com/blockscout/blockscout/pull/7748) - Bump mock from 0.3.7 to 0.3.8
+- [#7746](https://github.com/blockscout/blockscout/pull/7746) - Bump eslint from 8.42.0 to 8.43.0 in /apps/block_scout_web/assets
+- [#7747](https://github.com/blockscout/blockscout/pull/7747) - Bump cldr_utils from 2.24.0 to 2.24.1
+
 </details>
 
 ## 5.1.5-beta
diff --git a/apps/block_scout_web/mix.exs b/apps/block_scout_web/mix.exs
index 18d2e6ee58a2..b11b75b2efbc 100644
--- a/apps/block_scout_web/mix.exs
+++ b/apps/block_scout_web/mix.exs
@@ -23,7 +23,7 @@ defmodule BlockScoutWeb.Mixfile do
         dialyzer: :test
       ],
       start_permanent: Mix.env() == :prod,
-      version: "5.1.5"
+      version: "5.2.0"
     ]
   end
 
diff --git a/apps/ethereum_jsonrpc/mix.exs b/apps/ethereum_jsonrpc/mix.exs
index 8e5cf139a199..4918340873de 100644
--- a/apps/ethereum_jsonrpc/mix.exs
+++ b/apps/ethereum_jsonrpc/mix.exs
@@ -23,7 +23,7 @@ defmodule EthereumJsonrpc.MixProject do
         dialyzer: :test
       ],
       start_permanent: Mix.env() == :prod,
-      version: "5.1.5"
+      version: "5.2.0"
     ]
   end
 
diff --git a/apps/explorer/mix.exs b/apps/explorer/mix.exs
index 5e7b639da343..546b0393def1 100644
--- a/apps/explorer/mix.exs
+++ b/apps/explorer/mix.exs
@@ -24,7 +24,7 @@ defmodule Explorer.Mixfile do
         dialyzer: :test
       ],
       start_permanent: Mix.env() == :prod,
-      version: "5.1.5",
+      version: "5.2.0",
       xref: [exclude: [BlockScoutWeb.WebRouter.Helpers]]
     ]
   end
diff --git a/apps/indexer/mix.exs b/apps/indexer/mix.exs
index ae700e1ecf30..fc805d5a9817 100644
--- a/apps/indexer/mix.exs
+++ b/apps/indexer/mix.exs
@@ -14,7 +14,7 @@ defmodule Indexer.MixProject do
       elixirc_paths: elixirc_paths(Mix.env()),
       lockfile: "../../mix.lock",
       start_permanent: Mix.env() == :prod,
-      version: "5.1.5"
+      version: "5.2.0"
     ]
   end
 
diff --git a/deploy/testing/eth-goerli/values.yaml b/deploy/testing/eth-goerli/values.yaml
index 1788be022d2d..97391887a270 100644
--- a/deploy/testing/eth-goerli/values.yaml
+++ b/deploy/testing/eth-goerli/values.yaml
@@ -198,8 +198,6 @@ frontend:
     # api config
     NEXT_PUBLIC_API_BASE_PATH:
       _default: /
-    NEXT_PUBLIC_BLOCKSCOUT_VERSION:
-      _default: v5.1.5-beta
     NEXT_PUBLIC_FOOTER_GITHUB_LINK:
       _default: https://github.com/blockscout/blockscout
     NEXT_PUBLIC_FOOTER_TWITTER_LINK:
diff --git a/docker-compose/docker-compose-no-rust-services.yml b/docker-compose/docker-compose-no-rust-services.yml
index c12212bcddb8..ef1682dc2a92 100644
--- a/docker-compose/docker-compose-no-rust-services.yml
+++ b/docker-compose/docker-compose-no-rust-services.yml
@@ -27,7 +27,7 @@ services:
         CACHE_TOTAL_GAS_USAGE_COUNTER_ENABLED: ""
         CACHE_ADDRESS_WITH_BALANCES_UPDATE_INTERVAL: ""
         ADMIN_PANEL_ENABLED: ""
-        RELEASE_VERSION: 5.1.5
+        RELEASE_VERSION: 5.2.0
     restart: always
     stop_grace_period: 5m
     container_name: 'blockscout'
diff --git a/docker-compose/docker-compose.yml b/docker-compose/docker-compose.yml
index fbd08f431f4e..3af6e1bd0915 100644
--- a/docker-compose/docker-compose.yml
+++ b/docker-compose/docker-compose.yml
@@ -28,7 +28,7 @@ services:
         CACHE_TOTAL_GAS_USAGE_COUNTER_ENABLED: ""
         CACHE_ADDRESS_WITH_BALANCES_UPDATE_INTERVAL: ""
         ADMIN_PANEL_ENABLED: ""
-        RELEASE_VERSION: 5.1.5
+        RELEASE_VERSION: 5.2.0
     restart: always
     stop_grace_period: 5m
     container_name: 'blockscout'
diff --git a/docker-compose/envs/common-frontend.env b/docker-compose/envs/common-frontend.env
index b9b2cef7db66..9f75a9c50e12 100644
--- a/docker-compose/envs/common-frontend.env
+++ b/docker-compose/envs/common-frontend.env
@@ -10,7 +10,6 @@ NEXT_PUBLIC_NETWORK_CURRENCY_NAME=Ether
 NEXT_PUBLIC_NETWORK_CURRENCY_SYMBOL=ETH
 NEXT_PUBLIC_NETWORK_CURRENCY_DECIMALS=18
 NEXT_PUBLIC_API_BASE_PATH=/
-NEXT_PUBLIC_BLOCKSCOUT_VERSION=v5.1.5-beta
 NEXT_PUBLIC_FEATURED_NETWORKS=https://raw.githubusercontent.com/blockscout/frontend-configs/main/configs/featured-networks/eth-goerli.json
 NEXT_PUBLIC_FOOTER_GITHUB_LINK=https://github.com/blockscout/blockscout
 NEXT_PUBLIC_FOOTER_TWITTER_LINK=https://www.twitter.com/blockscoutcom
diff --git a/docker/Makefile b/docker/Makefile
index e5de674c240b..6076047bd361 100644
--- a/docker/Makefile
+++ b/docker/Makefile
@@ -7,7 +7,7 @@ BS_CONTAINER_NAME := blockscout
 PG_CONTAINER_IMAGE := postgres:14
 PG_CONTAINER_NAME := db
 THIS_FILE = $(lastword $(MAKEFILE_LIST))
-RELEASE_VERSION ?= '5.1.5'
+RELEASE_VERSION ?= '5.2.0'
 PORT ?= '4000'
 TAG := $(RELEASE_VERSION)-commit-$(shell git log -1 --pretty=format:"%h")
 STABLE_TAG := $(RELEASE_VERSION)
diff --git a/mix.exs b/mix.exs
index f4ac8ae324c2..f7eb85c3aefc 100644
--- a/mix.exs
+++ b/mix.exs
@@ -7,7 +7,7 @@ defmodule BlockScout.Mixfile do
     [
       # app: :block_scout,
       # aliases: aliases(config_env()),
-      version: "5.1.5",
+      version: "5.2.0",
       apps_path: "apps",
       deps: deps(),
       dialyzer: dialyzer(),
diff --git a/rel/config.exs b/rel/config.exs
index d5bfc0099af6..fbaccc02ed5b 100644
--- a/rel/config.exs
+++ b/rel/config.exs
@@ -71,7 +71,7 @@ end
 # will be used by default
 
 release :blockscout do
-  set version: "5.1.5-beta"
+  set version: "5.2.0-beta"
   set applications: [
     :runtime_tools,
     block_scout_web: :permanent,

From 61f40c1300ba5581bd3a7e7dd85530d47dce15a8 Mon Sep 17 00:00:00 2001
From: Viktor Baranov <baranov.viktor.27@gmail.com>
Date: Wed, 21 Jun 2023 13:11:20 +0300
Subject: [PATCH 124/909] Remove deprecated branches from release CI

---
 .github/workflows/publish-docker-image-release.yml | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/.github/workflows/publish-docker-image-release.yml b/.github/workflows/publish-docker-image-release.yml
index b1a5b666239b..c99dfff37ea5 100644
--- a/.github/workflows/publish-docker-image-release.yml
+++ b/.github/workflows/publish-docker-image-release.yml
@@ -79,15 +79,10 @@ jobs:
         production-eth-stg-experimental
         production-eth-goerli-stg
         production-lukso-stg
-        production-optimism-goerli-stg
-        production-optimism-mainnet-stg
-        production-optimism-opcraft-stg
         production-xdai-stg
         production-gc-chiado-stg
         production-polygon-supernets-stg
-        production-base-goerli-stg
         production-rsk-stg
-        production-neon-stg
     steps:
     - uses: actions/checkout@v2
     - name: Set Git config

From 9cb2399e12786ea697827b8f8520a4e08b0be895 Mon Sep 17 00:00:00 2001
From: Qwerty5Uiop <alex000010@bk.ru>
Date: Wed, 21 Jun 2023 17:33:18 +0400
Subject: [PATCH 125/909] Remove limit for configurable fetchers

---
 CHANGELOG.md                                             | 2 ++
 apps/indexer/lib/indexer/fetcher/block_reward.ex         | 3 +--
 apps/indexer/lib/indexer/fetcher/coin_balance.ex         | 3 +--
 apps/indexer/lib/indexer/fetcher/internal_transaction.ex | 3 +--
 apps/indexer/lib/indexer/fetcher/token_instance/retry.ex | 3 +--
 5 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d7c73c270826..1a475f76c189 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,8 @@
 
 ### Fixes
 
+- [#7758](https://github.com/blockscout/blockscout/pull/7758) - Remove limit for configurable fetchers
+
 ### Chore
 
 <details>
diff --git a/apps/indexer/lib/indexer/fetcher/block_reward.ex b/apps/indexer/lib/indexer/fetcher/block_reward.ex
index 5716f80c7c6b..43ceac52682a 100644
--- a/apps/indexer/lib/indexer/fetcher/block_reward.ex
+++ b/apps/indexer/lib/indexer/fetcher/block_reward.ex
@@ -66,8 +66,7 @@ defmodule Indexer.Fetcher.BlockReward do
         initial,
         fn %{number: number}, acc ->
           reducer.(number, acc)
-        end,
-        true
+        end
       )
 
     final
diff --git a/apps/indexer/lib/indexer/fetcher/coin_balance.ex b/apps/indexer/lib/indexer/fetcher/coin_balance.ex
index 56e1ff29eb1a..08a301a68a05 100644
--- a/apps/indexer/lib/indexer/fetcher/coin_balance.ex
+++ b/apps/indexer/lib/indexer/fetcher/coin_balance.ex
@@ -67,8 +67,7 @@ defmodule Indexer.Fetcher.CoinBalance do
           address_fields
           |> entry()
           |> reducer.(acc)
-        end,
-        true
+        end
       )
 
     final
diff --git a/apps/indexer/lib/indexer/fetcher/internal_transaction.ex b/apps/indexer/lib/indexer/fetcher/internal_transaction.ex
index 6b2083d420b2..bf58da21fbe8 100644
--- a/apps/indexer/lib/indexer/fetcher/internal_transaction.ex
+++ b/apps/indexer/lib/indexer/fetcher/internal_transaction.ex
@@ -75,8 +75,7 @@ defmodule Indexer.Fetcher.InternalTransaction do
         initial,
         fn block_number, acc ->
           reducer.(block_number, acc)
-        end,
-        true
+        end
       )
 
     final
diff --git a/apps/indexer/lib/indexer/fetcher/token_instance/retry.ex b/apps/indexer/lib/indexer/fetcher/token_instance/retry.ex
index 0c50e1ae19a3..24b2df433f81 100644
--- a/apps/indexer/lib/indexer/fetcher/token_instance/retry.ex
+++ b/apps/indexer/lib/indexer/fetcher/token_instance/retry.ex
@@ -33,8 +33,7 @@ defmodule Indexer.Fetcher.TokenInstance.Retry do
         initial_acc,
         fn data, acc ->
           reducer.(data, acc)
-        end,
-        true
+        end
       )
 
     acc

From bb1bb9f39fd8ea80c541d7610274bab0c172663f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 21 Jun 2023 18:08:58 +0000
Subject: [PATCH 126/909] Bump sass from 1.63.4 to 1.63.5 in
 /apps/block_scout_web/assets

Bumps [sass](https://github.com/sass/dart-sass) from 1.63.4 to 1.63.5.
- [Release notes](https://github.com/sass/dart-sass/releases)
- [Changelog](https://github.com/sass/dart-sass/blob/main/CHANGELOG.md)
- [Commits](https://github.com/sass/dart-sass/compare/1.63.4...1.63.5)

---
updated-dependencies:
- dependency-name: sass
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 apps/block_scout_web/assets/package-lock.json | 14 +++++++-------
 apps/block_scout_web/assets/package.json      |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/apps/block_scout_web/assets/package-lock.json b/apps/block_scout_web/assets/package-lock.json
index 6355d389938d..d607e92044ce 100644
--- a/apps/block_scout_web/assets/package-lock.json
+++ b/apps/block_scout_web/assets/package-lock.json
@@ -89,7 +89,7 @@
         "mini-css-extract-plugin": "^2.7.6",
         "postcss": "^8.4.24",
         "postcss-loader": "^7.3.3",
-        "sass": "^1.63.4",
+        "sass": "^1.63.5",
         "sass-loader": "^13.3.2",
         "style-loader": "^3.3.3",
         "webpack": "^5.87.0",
@@ -14835,9 +14835,9 @@
       "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
     },
     "node_modules/sass": {
-      "version": "1.63.4",
-      "resolved": "https://registry.npmjs.org/sass/-/sass-1.63.4.tgz",
-      "integrity": "sha512-Sx/+weUmK+oiIlI+9sdD0wZHsqpbgQg8wSwSnGBjwb5GwqFhYNwwnI+UWZtLjKvKyFlKkatRK235qQ3mokyPoQ==",
+      "version": "1.63.5",
+      "resolved": "https://registry.npmjs.org/sass/-/sass-1.63.5.tgz",
+      "integrity": "sha512-Q6c5gs482oezdAp+0fWF9cRisvpy7yfYb64knID0OE8AnMgtkluRPfpGMFjeD4/+M4+6QpJZCU6JRSxbjiktkg==",
       "dev": true,
       "dependencies": {
         "chokidar": ">=3.0.0 <4.0.0",
@@ -28651,9 +28651,9 @@
       "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
     },
     "sass": {
-      "version": "1.63.4",
-      "resolved": "https://registry.npmjs.org/sass/-/sass-1.63.4.tgz",
-      "integrity": "sha512-Sx/+weUmK+oiIlI+9sdD0wZHsqpbgQg8wSwSnGBjwb5GwqFhYNwwnI+UWZtLjKvKyFlKkatRK235qQ3mokyPoQ==",
+      "version": "1.63.5",
+      "resolved": "https://registry.npmjs.org/sass/-/sass-1.63.5.tgz",
+      "integrity": "sha512-Q6c5gs482oezdAp+0fWF9cRisvpy7yfYb64knID0OE8AnMgtkluRPfpGMFjeD4/+M4+6QpJZCU6JRSxbjiktkg==",
       "dev": true,
       "requires": {
         "chokidar": ">=3.0.0 <4.0.0",
diff --git a/apps/block_scout_web/assets/package.json b/apps/block_scout_web/assets/package.json
index d41ed2f75506..ab1b0b6cff73 100644
--- a/apps/block_scout_web/assets/package.json
+++ b/apps/block_scout_web/assets/package.json
@@ -101,7 +101,7 @@
     "mini-css-extract-plugin": "^2.7.6",
     "postcss": "^8.4.24",
     "postcss-loader": "^7.3.3",
-    "sass": "^1.63.4",
+    "sass": "^1.63.5",
     "sass-loader": "^13.3.2",
     "style-loader": "^3.3.3",
     "webpack": "^5.87.0",

From f9d75b75ba4b0dc734b2294f33d0f0fa2db3631f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 21 Jun 2023 18:09:50 +0000
Subject: [PATCH 127/909] Bump @amplitude/analytics-browser in
 /apps/block_scout_web/assets

Bumps [@amplitude/analytics-browser](https://github.com/amplitude/Amplitude-TypeScript) from 2.0.0 to 2.0.1.
- [Release notes](https://github.com/amplitude/Amplitude-TypeScript/releases)
- [Commits](https://github.com/amplitude/Amplitude-TypeScript/compare/@amplitude/analytics-browser@2.0.0...@amplitude/analytics-browser@2.0.1)

---
updated-dependencies:
- dependency-name: "@amplitude/analytics-browser"
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 apps/block_scout_web/assets/package-lock.json | 126 +++++++++---------
 apps/block_scout_web/assets/package.json      |   2 +-
 2 files changed, 64 insertions(+), 64 deletions(-)

diff --git a/apps/block_scout_web/assets/package-lock.json b/apps/block_scout_web/assets/package-lock.json
index 6355d389938d..877f7c032987 100644
--- a/apps/block_scout_web/assets/package-lock.json
+++ b/apps/block_scout_web/assets/package-lock.json
@@ -7,7 +7,7 @@
       "name": "blockscout",
       "license": "GPL-3.0",
       "dependencies": {
-        "@amplitude/analytics-browser": "^2.0.0",
+        "@amplitude/analytics-browser": "^2.0.1",
         "@fortawesome/fontawesome-free": "^6.4.0",
         "@tarekraafat/autocomplete.js": "^10.2.7",
         "@walletconnect/web3-provider": "^1.8.0",
@@ -107,15 +107,15 @@
       "version": "0.0.1"
     },
     "node_modules/@amplitude/analytics-browser": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/@amplitude/analytics-browser/-/analytics-browser-2.0.0.tgz",
-      "integrity": "sha512-SIOxjSdefm7RVuwzkuTW7uMge4AKLOqcE1oJYQFF25jkmAiFfXnbrqlGgBflgqLRvAKudrwXn+NFfKqBfXfozw==",
-      "dependencies": {
-        "@amplitude/analytics-client-common": "^2.0.0",
-        "@amplitude/analytics-core": "^2.0.0",
-        "@amplitude/analytics-types": "^2.0.0",
-        "@amplitude/plugin-page-view-tracking-browser": "^2.0.0",
-        "@amplitude/plugin-web-attribution-browser": "^2.0.0",
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/@amplitude/analytics-browser/-/analytics-browser-2.0.1.tgz",
+      "integrity": "sha512-nejbH4nG0YI7kBLtTXBR+c0CGeMOp5i49WHQN6hKe6KLCOu5bT1qANyTxuM/72ESlWwbO4IEaXrxA3+NFj6nbA==",
+      "dependencies": {
+        "@amplitude/analytics-client-common": "^2.0.1",
+        "@amplitude/analytics-core": "^2.0.1",
+        "@amplitude/analytics-types": "^2.0.1",
+        "@amplitude/plugin-page-view-tracking-browser": "^2.0.1",
+        "@amplitude/plugin-web-attribution-browser": "^2.0.1",
         "tslib": "^2.4.1"
       }
     },
@@ -125,13 +125,13 @@
       "integrity": "sha512-tGyy4dAjRIEwI7BzsB0lynWgOpfqjUdq91XXAlIWD2OwKBH7oCl/GZG/HT4BOHrTlPMOASlMQ7veyTqpmRcrNA=="
     },
     "node_modules/@amplitude/analytics-client-common": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/@amplitude/analytics-client-common/-/analytics-client-common-2.0.0.tgz",
-      "integrity": "sha512-4+fSeElUzOJK0TjWYem/jWnKCQVBuACUaz/maaXnzQBSeeqXDLO8PsqdAZYr4mQ/zbAxtt2hJpaewXQBviNoJA==",
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/@amplitude/analytics-client-common/-/analytics-client-common-2.0.1.tgz",
+      "integrity": "sha512-ueRF5vz/Lvzx7nctF5caivo8/xCzWDEdC8SYbAldYhGQTrqbo9ov0ff6h5xGRqFfAwVYgIFUykCEFRphxiHDbg==",
       "dependencies": {
         "@amplitude/analytics-connector": "^1.4.8",
-        "@amplitude/analytics-core": "^2.0.0",
-        "@amplitude/analytics-types": "^2.0.0",
+        "@amplitude/analytics-core": "^2.0.1",
+        "@amplitude/analytics-types": "^2.0.1",
         "tslib": "^2.4.1"
       }
     },
@@ -146,11 +146,11 @@
       "integrity": "sha512-dFW7c7Wb6Ng7vbmzwbaXZSpqfBx37ukamJV9ErFYYS8vGZK/Hkbt3M7fZHBI4WFU6CCwakr2ZXPme11uGPYWkQ=="
     },
     "node_modules/@amplitude/analytics-core": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/@amplitude/analytics-core/-/analytics-core-2.0.0.tgz",
-      "integrity": "sha512-aEssg0ZUU+Xe0g17mz1q24S+Ec3Q8I+RHIhQcTB/Quko4iKAspTrtI+lSCYh1SvTgSSfNTR3TuRR/QYwGjmdCQ==",
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/@amplitude/analytics-core/-/analytics-core-2.0.1.tgz",
+      "integrity": "sha512-cWEx0o4iD4HukPbySZJ71o75op8u+xqXknoN9nZPFK304X6ypV/pGcEsdEdo2Ob+bGPkUCVibTmPp3ZRlU0ogg==",
       "dependencies": {
-        "@amplitude/analytics-types": "^2.0.0",
+        "@amplitude/analytics-types": "^2.0.1",
         "tslib": "^2.4.1"
       }
     },
@@ -160,17 +160,17 @@
       "integrity": "sha512-mSxlJJwl3BMEQCUNnxXBU9jP4JBktcEGhURcPR6VQVlnP0FdDEsIaz0C35dXNGLyRfrATNofF0F5p2KPxQgB+w=="
     },
     "node_modules/@amplitude/analytics-types": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/@amplitude/analytics-types/-/analytics-types-2.0.0.tgz",
-      "integrity": "sha512-YHFAHDGCoS+exBqdlhivfdomzL88msj++krObsVsBkLqlzXR+3x3lXVKQeCEEWG5GX7doB9KZPf70i8y/eyERQ=="
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/@amplitude/analytics-types/-/analytics-types-2.0.1.tgz",
+      "integrity": "sha512-mMR3So5ebJ+xWsoWda5xvDlAa7xobc/rf+CiTjBfaGYL9zxJMDXnrLGxXiQUeA+yFpLJUrlAIK8TMRXKH4MCyQ=="
     },
     "node_modules/@amplitude/plugin-page-view-tracking-browser": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/@amplitude/plugin-page-view-tracking-browser/-/plugin-page-view-tracking-browser-2.0.0.tgz",
-      "integrity": "sha512-G2bAiavBvNbFjUDViGJyagpyCwSzir/TXDA3LsJbOLOkqEeO95ZIZGU7mM7eqOAB7Nuir5WsayuA0+Oau8DzMQ==",
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/@amplitude/plugin-page-view-tracking-browser/-/plugin-page-view-tracking-browser-2.0.1.tgz",
+      "integrity": "sha512-llXYUAsQtv5MrAkbQYZpUGEUd7xzmXT09upAu6QQVQikSr+LwRgvBQNWjQfUcJEJrLH6C1LqP+zohA94ibKoMQ==",
       "dependencies": {
-        "@amplitude/analytics-client-common": "^2.0.0",
-        "@amplitude/analytics-types": "^2.0.0",
+        "@amplitude/analytics-client-common": "^2.0.1",
+        "@amplitude/analytics-types": "^2.0.1",
         "tslib": "^2.4.1"
       }
     },
@@ -180,12 +180,12 @@
       "integrity": "sha512-mSxlJJwl3BMEQCUNnxXBU9jP4JBktcEGhURcPR6VQVlnP0FdDEsIaz0C35dXNGLyRfrATNofF0F5p2KPxQgB+w=="
     },
     "node_modules/@amplitude/plugin-web-attribution-browser": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/@amplitude/plugin-web-attribution-browser/-/plugin-web-attribution-browser-2.0.0.tgz",
-      "integrity": "sha512-Y+zo2aTF2RSC+ATBdRff5zlgScJ5MWzqL0rzi696EP5zb4b7YIlEkG2V9XZlOGLQBYskF6NoBKMsoP0W2cROQw==",
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/@amplitude/plugin-web-attribution-browser/-/plugin-web-attribution-browser-2.0.1.tgz",
+      "integrity": "sha512-jCBME4Yld8jF9k12vH9apVTh9a/rxEiZOemiP1t1IBSfxb7zescnIru6Q6fqotb2FN1aHK9MX0M+dpBiYHowOA==",
       "dependencies": {
-        "@amplitude/analytics-client-common": "^2.0.0",
-        "@amplitude/analytics-types": "^2.0.0",
+        "@amplitude/analytics-client-common": "^2.0.1",
+        "@amplitude/analytics-types": "^2.0.1",
         "tslib": "^2.4.1"
       }
     },
@@ -17471,15 +17471,15 @@
   },
   "dependencies": {
     "@amplitude/analytics-browser": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/@amplitude/analytics-browser/-/analytics-browser-2.0.0.tgz",
-      "integrity": "sha512-SIOxjSdefm7RVuwzkuTW7uMge4AKLOqcE1oJYQFF25jkmAiFfXnbrqlGgBflgqLRvAKudrwXn+NFfKqBfXfozw==",
-      "requires": {
-        "@amplitude/analytics-client-common": "^2.0.0",
-        "@amplitude/analytics-core": "^2.0.0",
-        "@amplitude/analytics-types": "^2.0.0",
-        "@amplitude/plugin-page-view-tracking-browser": "^2.0.0",
-        "@amplitude/plugin-web-attribution-browser": "^2.0.0",
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/@amplitude/analytics-browser/-/analytics-browser-2.0.1.tgz",
+      "integrity": "sha512-nejbH4nG0YI7kBLtTXBR+c0CGeMOp5i49WHQN6hKe6KLCOu5bT1qANyTxuM/72ESlWwbO4IEaXrxA3+NFj6nbA==",
+      "requires": {
+        "@amplitude/analytics-client-common": "^2.0.1",
+        "@amplitude/analytics-core": "^2.0.1",
+        "@amplitude/analytics-types": "^2.0.1",
+        "@amplitude/plugin-page-view-tracking-browser": "^2.0.1",
+        "@amplitude/plugin-web-attribution-browser": "^2.0.1",
         "tslib": "^2.4.1"
       },
       "dependencies": {
@@ -17491,13 +17491,13 @@
       }
     },
     "@amplitude/analytics-client-common": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/@amplitude/analytics-client-common/-/analytics-client-common-2.0.0.tgz",
-      "integrity": "sha512-4+fSeElUzOJK0TjWYem/jWnKCQVBuACUaz/maaXnzQBSeeqXDLO8PsqdAZYr4mQ/zbAxtt2hJpaewXQBviNoJA==",
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/@amplitude/analytics-client-common/-/analytics-client-common-2.0.1.tgz",
+      "integrity": "sha512-ueRF5vz/Lvzx7nctF5caivo8/xCzWDEdC8SYbAldYhGQTrqbo9ov0ff6h5xGRqFfAwVYgIFUykCEFRphxiHDbg==",
       "requires": {
         "@amplitude/analytics-connector": "^1.4.8",
-        "@amplitude/analytics-core": "^2.0.0",
-        "@amplitude/analytics-types": "^2.0.0",
+        "@amplitude/analytics-core": "^2.0.1",
+        "@amplitude/analytics-types": "^2.0.1",
         "tslib": "^2.4.1"
       },
       "dependencies": {
@@ -17514,11 +17514,11 @@
       "integrity": "sha512-dFW7c7Wb6Ng7vbmzwbaXZSpqfBx37ukamJV9ErFYYS8vGZK/Hkbt3M7fZHBI4WFU6CCwakr2ZXPme11uGPYWkQ=="
     },
     "@amplitude/analytics-core": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/@amplitude/analytics-core/-/analytics-core-2.0.0.tgz",
-      "integrity": "sha512-aEssg0ZUU+Xe0g17mz1q24S+Ec3Q8I+RHIhQcTB/Quko4iKAspTrtI+lSCYh1SvTgSSfNTR3TuRR/QYwGjmdCQ==",
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/@amplitude/analytics-core/-/analytics-core-2.0.1.tgz",
+      "integrity": "sha512-cWEx0o4iD4HukPbySZJ71o75op8u+xqXknoN9nZPFK304X6ypV/pGcEsdEdo2Ob+bGPkUCVibTmPp3ZRlU0ogg==",
       "requires": {
-        "@amplitude/analytics-types": "^2.0.0",
+        "@amplitude/analytics-types": "^2.0.1",
         "tslib": "^2.4.1"
       },
       "dependencies": {
@@ -17530,17 +17530,17 @@
       }
     },
     "@amplitude/analytics-types": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/@amplitude/analytics-types/-/analytics-types-2.0.0.tgz",
-      "integrity": "sha512-YHFAHDGCoS+exBqdlhivfdomzL88msj++krObsVsBkLqlzXR+3x3lXVKQeCEEWG5GX7doB9KZPf70i8y/eyERQ=="
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/@amplitude/analytics-types/-/analytics-types-2.0.1.tgz",
+      "integrity": "sha512-mMR3So5ebJ+xWsoWda5xvDlAa7xobc/rf+CiTjBfaGYL9zxJMDXnrLGxXiQUeA+yFpLJUrlAIK8TMRXKH4MCyQ=="
     },
     "@amplitude/plugin-page-view-tracking-browser": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/@amplitude/plugin-page-view-tracking-browser/-/plugin-page-view-tracking-browser-2.0.0.tgz",
-      "integrity": "sha512-G2bAiavBvNbFjUDViGJyagpyCwSzir/TXDA3LsJbOLOkqEeO95ZIZGU7mM7eqOAB7Nuir5WsayuA0+Oau8DzMQ==",
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/@amplitude/plugin-page-view-tracking-browser/-/plugin-page-view-tracking-browser-2.0.1.tgz",
+      "integrity": "sha512-llXYUAsQtv5MrAkbQYZpUGEUd7xzmXT09upAu6QQVQikSr+LwRgvBQNWjQfUcJEJrLH6C1LqP+zohA94ibKoMQ==",
       "requires": {
-        "@amplitude/analytics-client-common": "^2.0.0",
-        "@amplitude/analytics-types": "^2.0.0",
+        "@amplitude/analytics-client-common": "^2.0.1",
+        "@amplitude/analytics-types": "^2.0.1",
         "tslib": "^2.4.1"
       },
       "dependencies": {
@@ -17552,12 +17552,12 @@
       }
     },
     "@amplitude/plugin-web-attribution-browser": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/@amplitude/plugin-web-attribution-browser/-/plugin-web-attribution-browser-2.0.0.tgz",
-      "integrity": "sha512-Y+zo2aTF2RSC+ATBdRff5zlgScJ5MWzqL0rzi696EP5zb4b7YIlEkG2V9XZlOGLQBYskF6NoBKMsoP0W2cROQw==",
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/@amplitude/plugin-web-attribution-browser/-/plugin-web-attribution-browser-2.0.1.tgz",
+      "integrity": "sha512-jCBME4Yld8jF9k12vH9apVTh9a/rxEiZOemiP1t1IBSfxb7zescnIru6Q6fqotb2FN1aHK9MX0M+dpBiYHowOA==",
       "requires": {
-        "@amplitude/analytics-client-common": "^2.0.0",
-        "@amplitude/analytics-types": "^2.0.0",
+        "@amplitude/analytics-client-common": "^2.0.1",
+        "@amplitude/analytics-types": "^2.0.1",
         "tslib": "^2.4.1"
       },
       "dependencies": {
diff --git a/apps/block_scout_web/assets/package.json b/apps/block_scout_web/assets/package.json
index d41ed2f75506..2d062a7d4f4c 100644
--- a/apps/block_scout_web/assets/package.json
+++ b/apps/block_scout_web/assets/package.json
@@ -20,7 +20,7 @@
   },
   "dependencies": {
     "@fortawesome/fontawesome-free": "^6.4.0",
-    "@amplitude/analytics-browser": "^2.0.0",
+    "@amplitude/analytics-browser": "^2.0.1",
     "@tarekraafat/autocomplete.js": "^10.2.7",
     "@walletconnect/web3-provider": "^1.8.0",
     "assert": "^2.0.0",

From 85c906847a01d7ee1ece8643a96653e9a605f9ba Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 21 Jun 2023 19:00:23 +0000
Subject: [PATCH 128/909] Bump webpack from 5.87.0 to 5.88.0 in
 /apps/block_scout_web/assets

Bumps [webpack](https://github.com/webpack/webpack) from 5.87.0 to 5.88.0.
- [Release notes](https://github.com/webpack/webpack/releases)
- [Commits](https://github.com/webpack/webpack/compare/v5.87.0...v5.88.0)

---
updated-dependencies:
- dependency-name: webpack
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 apps/block_scout_web/assets/package-lock.json | 14 +++++++-------
 apps/block_scout_web/assets/package.json      |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/apps/block_scout_web/assets/package-lock.json b/apps/block_scout_web/assets/package-lock.json
index d607e92044ce..b23ebcf983a6 100644
--- a/apps/block_scout_web/assets/package-lock.json
+++ b/apps/block_scout_web/assets/package-lock.json
@@ -92,7 +92,7 @@
         "sass": "^1.63.5",
         "sass-loader": "^13.3.2",
         "style-loader": "^3.3.3",
-        "webpack": "^5.87.0",
+        "webpack": "^5.88.0",
         "webpack-cli": "^5.1.4"
       },
       "engines": {
@@ -16927,9 +16927,9 @@
       }
     },
     "node_modules/webpack": {
-      "version": "5.87.0",
-      "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.87.0.tgz",
-      "integrity": "sha512-GOu1tNbQ7p1bDEoFRs2YPcfyGs8xq52yyPBZ3m2VGnXGtV9MxjrkABHm4V9Ia280OefsSLzvbVoXcfLxjKY/Iw==",
+      "version": "5.88.0",
+      "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.88.0.tgz",
+      "integrity": "sha512-O3jDhG5e44qIBSi/P6KpcCcH7HD+nYIHVBhdWFxcLOcIGN8zGo5nqF3BjyNCxIh4p1vFdNnreZv2h2KkoAw3lw==",
       "dev": true,
       "dependencies": {
         "@types/eslint-scope": "^3.7.3",
@@ -30251,9 +30251,9 @@
       "dev": true
     },
     "webpack": {
-      "version": "5.87.0",
-      "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.87.0.tgz",
-      "integrity": "sha512-GOu1tNbQ7p1bDEoFRs2YPcfyGs8xq52yyPBZ3m2VGnXGtV9MxjrkABHm4V9Ia280OefsSLzvbVoXcfLxjKY/Iw==",
+      "version": "5.88.0",
+      "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.88.0.tgz",
+      "integrity": "sha512-O3jDhG5e44qIBSi/P6KpcCcH7HD+nYIHVBhdWFxcLOcIGN8zGo5nqF3BjyNCxIh4p1vFdNnreZv2h2KkoAw3lw==",
       "dev": true,
       "requires": {
         "@types/eslint-scope": "^3.7.3",
diff --git a/apps/block_scout_web/assets/package.json b/apps/block_scout_web/assets/package.json
index ab1b0b6cff73..2c2d7784a278 100644
--- a/apps/block_scout_web/assets/package.json
+++ b/apps/block_scout_web/assets/package.json
@@ -104,7 +104,7 @@
     "sass": "^1.63.5",
     "sass-loader": "^13.3.2",
     "style-loader": "^3.3.3",
-    "webpack": "^5.87.0",
+    "webpack": "^5.88.0",
     "webpack-cli": "^5.1.4"
   },
   "jest": {

From 787852d603da59c1a5ea963edde6e502647f14b8 Mon Sep 17 00:00:00 2001
From: Qwerty5Uiop <alex000010@bk.ru>
Date: Thu, 22 Jun 2023 14:55:51 +0400
Subject: [PATCH 129/909] Fix missing ranges insertion and deletion logic

---
 .github/workflows/config.yml                  | 28 +++++++++----------
 CHANGELOG.md                                  |  1 +
 .../explorer/utility/missing_block_range.ex   |  4 +--
 3 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/.github/workflows/config.yml b/.github/workflows/config.yml
index d1950c325dc5..d59774b73c47 100644
--- a/.github/workflows/config.yml
+++ b/.github/workflows/config.yml
@@ -51,7 +51,7 @@ jobs:
           path: |
             deps
             _build
-          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_19-${{ hashFiles('mix.lock') }}
+          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_20-${{ hashFiles('mix.lock') }}
           restore-keys: |
             ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-
 
@@ -111,7 +111,7 @@ jobs:
           path: |
             deps
             _build
-          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_19-${{ hashFiles('mix.lock') }}
+          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_20-${{ hashFiles('mix.lock') }}
           restore-keys: |
             ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-"
 
@@ -135,7 +135,7 @@ jobs:
           path: |
             deps
             _build
-          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_19-${{ hashFiles('mix.lock') }}
+          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_20-${{ hashFiles('mix.lock') }}
           restore-keys: |
             ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-"
 
@@ -158,7 +158,7 @@ jobs:
           path: |
             deps
             _build
-          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_19-${{ hashFiles('mix.lock') }}
+          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_20-${{ hashFiles('mix.lock') }}
           restore-keys: |
             ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-"
 
@@ -167,7 +167,7 @@ jobs:
         id: dialyzer-cache
         with:
           path: priv/plts
-          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-dialyzer-mixlockhash_19-${{ hashFiles('mix.lock') }}
+          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-dialyzer-mixlockhash_20-${{ hashFiles('mix.lock') }}
           restore-keys: |
             ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-dialyzer-"
 
@@ -198,7 +198,7 @@ jobs:
           path: |
             deps
             _build
-          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_19-${{ hashFiles('mix.lock') }}
+          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_20-${{ hashFiles('mix.lock') }}
           restore-keys: |
             ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-"
 
@@ -224,7 +224,7 @@ jobs:
           path: |
             deps
             _build
-          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_19-${{ hashFiles('mix.lock') }}
+          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_20-${{ hashFiles('mix.lock') }}
           restore-keys: |
             ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-"
 
@@ -253,7 +253,7 @@ jobs:
           path: |
             deps
             _build
-          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_19-${{ hashFiles('mix.lock') }}
+          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_20-${{ hashFiles('mix.lock') }}
           restore-keys: |
             ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-"
 
@@ -301,7 +301,7 @@ jobs:
           path: |
             deps
             _build
-          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_19-${{ hashFiles('mix.lock') }}
+          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_20-${{ hashFiles('mix.lock') }}
           restore-keys: |
             ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-"
 
@@ -347,7 +347,7 @@ jobs:
           path: |
             deps
             _build
-          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_19-${{ hashFiles('mix.lock') }}
+          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_20-${{ hashFiles('mix.lock') }}
           restore-keys: |
             ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-"
 
@@ -404,7 +404,7 @@ jobs:
           path: |
             deps
             _build
-          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_19-${{ hashFiles('mix.lock') }}
+          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_20-${{ hashFiles('mix.lock') }}
           restore-keys: |
             ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-"
 
@@ -458,7 +458,7 @@ jobs:
           path: |
             deps
             _build
-          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_19-${{ hashFiles('mix.lock') }}
+          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_20-${{ hashFiles('mix.lock') }}
           restore-keys: |
             ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-"
 
@@ -523,7 +523,7 @@ jobs:
           path: |
             deps
             _build
-          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_19-${{ hashFiles('mix.lock') }}
+          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_20-${{ hashFiles('mix.lock') }}
           restore-keys: |
             ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-"
 
@@ -587,7 +587,7 @@ jobs:
           path: |
             deps
             _build
-          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_19-${{ hashFiles('mix.lock') }}
+          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_20-${{ hashFiles('mix.lock') }}
           restore-keys: |
             ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-"
 
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1a475f76c189..943b52861509 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,7 @@
 ### Fixes
 
 - [#7758](https://github.com/blockscout/blockscout/pull/7758) - Remove limit for configurable fetchers
+- [#7764](https://github.com/blockscout/blockscout/pull/7764) - Fix missing ranges insertion and deletion logic
 
 ### Chore
 
diff --git a/apps/explorer/lib/explorer/utility/missing_block_range.ex b/apps/explorer/lib/explorer/utility/missing_block_range.ex
index 0d5d8bd3fca2..b9355d0c6192 100644
--- a/apps/explorer/lib/explorer/utility/missing_block_range.ex
+++ b/apps/explorer/lib/explorer/utility/missing_block_range.ex
@@ -57,7 +57,7 @@ defmodule Explorer.Utility.MissingBlockRange do
         update_range(range, %{to_number: min_number})
 
       {%__MODULE__{} = range_1, %__MODULE__{} = range_2} ->
-        delete_ranges_between(range_2.from_number, range_1.from_number)
+        delete_ranges_between(range_2.from_number + 1, range_1.from_number)
         update_range(range_1, %{from_number: range_2.from_number})
 
       _ ->
@@ -92,7 +92,7 @@ defmodule Explorer.Utility.MissingBlockRange do
         update_to_number_or_delete_range(range_2, max_number + 1)
 
       _ ->
-        :ok
+        delete_ranges_between(max_number, min_number)
     end
   end
 

From 1e435d435f20b7ca0664eac3b308d1ca25f95385 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 22 Jun 2023 19:00:44 +0000
Subject: [PATCH 130/909] Bump sass from 1.63.5 to 1.63.6 in
 /apps/block_scout_web/assets

Bumps [sass](https://github.com/sass/dart-sass) from 1.63.5 to 1.63.6.
- [Release notes](https://github.com/sass/dart-sass/releases)
- [Changelog](https://github.com/sass/dart-sass/blob/main/CHANGELOG.md)
- [Commits](https://github.com/sass/dart-sass/compare/1.63.5...1.63.6)

---
updated-dependencies:
- dependency-name: sass
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 apps/block_scout_web/assets/package-lock.json | 14 +++++++-------
 apps/block_scout_web/assets/package.json      |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/apps/block_scout_web/assets/package-lock.json b/apps/block_scout_web/assets/package-lock.json
index 5e2a7918aa2b..9f2b393e1b5e 100644
--- a/apps/block_scout_web/assets/package-lock.json
+++ b/apps/block_scout_web/assets/package-lock.json
@@ -89,7 +89,7 @@
         "mini-css-extract-plugin": "^2.7.6",
         "postcss": "^8.4.24",
         "postcss-loader": "^7.3.3",
-        "sass": "^1.63.5",
+        "sass": "^1.63.6",
         "sass-loader": "^13.3.2",
         "style-loader": "^3.3.3",
         "webpack": "^5.88.0",
@@ -14835,9 +14835,9 @@
       "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
     },
     "node_modules/sass": {
-      "version": "1.63.5",
-      "resolved": "https://registry.npmjs.org/sass/-/sass-1.63.5.tgz",
-      "integrity": "sha512-Q6c5gs482oezdAp+0fWF9cRisvpy7yfYb64knID0OE8AnMgtkluRPfpGMFjeD4/+M4+6QpJZCU6JRSxbjiktkg==",
+      "version": "1.63.6",
+      "resolved": "https://registry.npmjs.org/sass/-/sass-1.63.6.tgz",
+      "integrity": "sha512-MJuxGMHzaOW7ipp+1KdELtqKbfAWbH7OLIdoSMnVe3EXPMTmxTmlaZDCTsgIpPCs3w99lLo9/zDKkOrJuT5byw==",
       "dev": true,
       "dependencies": {
         "chokidar": ">=3.0.0 <4.0.0",
@@ -28651,9 +28651,9 @@
       "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
     },
     "sass": {
-      "version": "1.63.5",
-      "resolved": "https://registry.npmjs.org/sass/-/sass-1.63.5.tgz",
-      "integrity": "sha512-Q6c5gs482oezdAp+0fWF9cRisvpy7yfYb64knID0OE8AnMgtkluRPfpGMFjeD4/+M4+6QpJZCU6JRSxbjiktkg==",
+      "version": "1.63.6",
+      "resolved": "https://registry.npmjs.org/sass/-/sass-1.63.6.tgz",
+      "integrity": "sha512-MJuxGMHzaOW7ipp+1KdELtqKbfAWbH7OLIdoSMnVe3EXPMTmxTmlaZDCTsgIpPCs3w99lLo9/zDKkOrJuT5byw==",
       "dev": true,
       "requires": {
         "chokidar": ">=3.0.0 <4.0.0",
diff --git a/apps/block_scout_web/assets/package.json b/apps/block_scout_web/assets/package.json
index 03a523ca7548..e21846c4e12e 100644
--- a/apps/block_scout_web/assets/package.json
+++ b/apps/block_scout_web/assets/package.json
@@ -101,7 +101,7 @@
     "mini-css-extract-plugin": "^2.7.6",
     "postcss": "^8.4.24",
     "postcss-loader": "^7.3.3",
-    "sass": "^1.63.5",
+    "sass": "^1.63.6",
     "sass-loader": "^13.3.2",
     "style-loader": "^3.3.3",
     "webpack": "^5.88.0",

From 441f3aa03f4f1dcd6b1e92ee9cbffdabcb8e20ad Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 22 Jun 2023 19:01:25 +0000
Subject: [PATCH 131/909] Bump @amplitude/analytics-browser in
 /apps/block_scout_web/assets

Bumps [@amplitude/analytics-browser](https://github.com/amplitude/Amplitude-TypeScript) from 2.0.1 to 2.1.0.
- [Release notes](https://github.com/amplitude/Amplitude-TypeScript/releases)
- [Commits](https://github.com/amplitude/Amplitude-TypeScript/compare/@amplitude/analytics-browser@2.0.1...@amplitude/analytics-browser@2.1.0)

---
updated-dependencies:
- dependency-name: "@amplitude/analytics-browser"
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 apps/block_scout_web/assets/package-lock.json | 126 +++++++++---------
 apps/block_scout_web/assets/package.json      |   2 +-
 2 files changed, 64 insertions(+), 64 deletions(-)

diff --git a/apps/block_scout_web/assets/package-lock.json b/apps/block_scout_web/assets/package-lock.json
index 5e2a7918aa2b..279636adc20f 100644
--- a/apps/block_scout_web/assets/package-lock.json
+++ b/apps/block_scout_web/assets/package-lock.json
@@ -7,7 +7,7 @@
       "name": "blockscout",
       "license": "GPL-3.0",
       "dependencies": {
-        "@amplitude/analytics-browser": "^2.0.1",
+        "@amplitude/analytics-browser": "^2.1.0",
         "@fortawesome/fontawesome-free": "^6.4.0",
         "@tarekraafat/autocomplete.js": "^10.2.7",
         "@walletconnect/web3-provider": "^1.8.0",
@@ -107,15 +107,15 @@
       "version": "0.0.1"
     },
     "node_modules/@amplitude/analytics-browser": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/@amplitude/analytics-browser/-/analytics-browser-2.0.1.tgz",
-      "integrity": "sha512-nejbH4nG0YI7kBLtTXBR+c0CGeMOp5i49WHQN6hKe6KLCOu5bT1qANyTxuM/72ESlWwbO4IEaXrxA3+NFj6nbA==",
-      "dependencies": {
-        "@amplitude/analytics-client-common": "^2.0.1",
-        "@amplitude/analytics-core": "^2.0.1",
-        "@amplitude/analytics-types": "^2.0.1",
-        "@amplitude/plugin-page-view-tracking-browser": "^2.0.1",
-        "@amplitude/plugin-web-attribution-browser": "^2.0.1",
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/@amplitude/analytics-browser/-/analytics-browser-2.1.0.tgz",
+      "integrity": "sha512-9ejvQUR1mrD3Lc8eR03fMDlrfoBZmaiphmw8CZ/qJaKNJ/bu/rh3tBlmvCn1lG/ibxT24Ggtkqz93Xc/n3x0Yg==",
+      "dependencies": {
+        "@amplitude/analytics-client-common": "^2.0.2",
+        "@amplitude/analytics-core": "^2.0.2",
+        "@amplitude/analytics-types": "^2.1.0",
+        "@amplitude/plugin-page-view-tracking-browser": "^2.0.2",
+        "@amplitude/plugin-web-attribution-browser": "^2.0.2",
         "tslib": "^2.4.1"
       }
     },
@@ -125,13 +125,13 @@
       "integrity": "sha512-tGyy4dAjRIEwI7BzsB0lynWgOpfqjUdq91XXAlIWD2OwKBH7oCl/GZG/HT4BOHrTlPMOASlMQ7veyTqpmRcrNA=="
     },
     "node_modules/@amplitude/analytics-client-common": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/@amplitude/analytics-client-common/-/analytics-client-common-2.0.1.tgz",
-      "integrity": "sha512-ueRF5vz/Lvzx7nctF5caivo8/xCzWDEdC8SYbAldYhGQTrqbo9ov0ff6h5xGRqFfAwVYgIFUykCEFRphxiHDbg==",
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/@amplitude/analytics-client-common/-/analytics-client-common-2.0.2.tgz",
+      "integrity": "sha512-Dqe9saZ5ag/ZknHlCYiu6oBOVjIU22Ta5EFtqI/lUm0XqaEdYBGduvlw5hwd8x7nmS6+5r4ip/nW1UoaciucDQ==",
       "dependencies": {
         "@amplitude/analytics-connector": "^1.4.8",
-        "@amplitude/analytics-core": "^2.0.1",
-        "@amplitude/analytics-types": "^2.0.1",
+        "@amplitude/analytics-core": "^2.0.2",
+        "@amplitude/analytics-types": "^2.1.0",
         "tslib": "^2.4.1"
       }
     },
@@ -146,11 +146,11 @@
       "integrity": "sha512-dFW7c7Wb6Ng7vbmzwbaXZSpqfBx37ukamJV9ErFYYS8vGZK/Hkbt3M7fZHBI4WFU6CCwakr2ZXPme11uGPYWkQ=="
     },
     "node_modules/@amplitude/analytics-core": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/@amplitude/analytics-core/-/analytics-core-2.0.1.tgz",
-      "integrity": "sha512-cWEx0o4iD4HukPbySZJ71o75op8u+xqXknoN9nZPFK304X6ypV/pGcEsdEdo2Ob+bGPkUCVibTmPp3ZRlU0ogg==",
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/@amplitude/analytics-core/-/analytics-core-2.0.2.tgz",
+      "integrity": "sha512-9FHRRrSiVlg77jytV3ZKMMa/VMIUcR7QJejJDcwLTEbZLU9sWUH+y+msLyWpNu2h1bLJBNw1skcD1SvCGm3fnQ==",
       "dependencies": {
-        "@amplitude/analytics-types": "^2.0.1",
+        "@amplitude/analytics-types": "^2.1.0",
         "tslib": "^2.4.1"
       }
     },
@@ -160,17 +160,17 @@
       "integrity": "sha512-mSxlJJwl3BMEQCUNnxXBU9jP4JBktcEGhURcPR6VQVlnP0FdDEsIaz0C35dXNGLyRfrATNofF0F5p2KPxQgB+w=="
     },
     "node_modules/@amplitude/analytics-types": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/@amplitude/analytics-types/-/analytics-types-2.0.1.tgz",
-      "integrity": "sha512-mMR3So5ebJ+xWsoWda5xvDlAa7xobc/rf+CiTjBfaGYL9zxJMDXnrLGxXiQUeA+yFpLJUrlAIK8TMRXKH4MCyQ=="
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/@amplitude/analytics-types/-/analytics-types-2.1.0.tgz",
+      "integrity": "sha512-HG6q+IfEjUg9K+em01+2uccebZVs4tiyMIGpBJ0U7G3swx3lEL7DtFn3uzDzSsp3QOc9rRfJglYy2tNkJRUo7g=="
     },
     "node_modules/@amplitude/plugin-page-view-tracking-browser": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/@amplitude/plugin-page-view-tracking-browser/-/plugin-page-view-tracking-browser-2.0.1.tgz",
-      "integrity": "sha512-llXYUAsQtv5MrAkbQYZpUGEUd7xzmXT09upAu6QQVQikSr+LwRgvBQNWjQfUcJEJrLH6C1LqP+zohA94ibKoMQ==",
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/@amplitude/plugin-page-view-tracking-browser/-/plugin-page-view-tracking-browser-2.0.2.tgz",
+      "integrity": "sha512-tYrQ5wwf3qeEhM173lKHXjdl2pOBd6HsjDpelfvzZRLuirGpiGDQZr52WQgKFP4iIZGIkiKtG//wNdswSJ926w==",
       "dependencies": {
-        "@amplitude/analytics-client-common": "^2.0.1",
-        "@amplitude/analytics-types": "^2.0.1",
+        "@amplitude/analytics-client-common": "^2.0.2",
+        "@amplitude/analytics-types": "^2.1.0",
         "tslib": "^2.4.1"
       }
     },
@@ -180,12 +180,12 @@
       "integrity": "sha512-mSxlJJwl3BMEQCUNnxXBU9jP4JBktcEGhURcPR6VQVlnP0FdDEsIaz0C35dXNGLyRfrATNofF0F5p2KPxQgB+w=="
     },
     "node_modules/@amplitude/plugin-web-attribution-browser": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/@amplitude/plugin-web-attribution-browser/-/plugin-web-attribution-browser-2.0.1.tgz",
-      "integrity": "sha512-jCBME4Yld8jF9k12vH9apVTh9a/rxEiZOemiP1t1IBSfxb7zescnIru6Q6fqotb2FN1aHK9MX0M+dpBiYHowOA==",
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/@amplitude/plugin-web-attribution-browser/-/plugin-web-attribution-browser-2.0.2.tgz",
+      "integrity": "sha512-5hCYyH4zVisuQXDpUoj3E8QR3HQt6iggXxB/JYGJac4a9h8aun6iKJHHHCfpEC4V46xVTusDJ/KKINKhcypRSg==",
       "dependencies": {
-        "@amplitude/analytics-client-common": "^2.0.1",
-        "@amplitude/analytics-types": "^2.0.1",
+        "@amplitude/analytics-client-common": "^2.0.2",
+        "@amplitude/analytics-types": "^2.1.0",
         "tslib": "^2.4.1"
       }
     },
@@ -17471,15 +17471,15 @@
   },
   "dependencies": {
     "@amplitude/analytics-browser": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/@amplitude/analytics-browser/-/analytics-browser-2.0.1.tgz",
-      "integrity": "sha512-nejbH4nG0YI7kBLtTXBR+c0CGeMOp5i49WHQN6hKe6KLCOu5bT1qANyTxuM/72ESlWwbO4IEaXrxA3+NFj6nbA==",
-      "requires": {
-        "@amplitude/analytics-client-common": "^2.0.1",
-        "@amplitude/analytics-core": "^2.0.1",
-        "@amplitude/analytics-types": "^2.0.1",
-        "@amplitude/plugin-page-view-tracking-browser": "^2.0.1",
-        "@amplitude/plugin-web-attribution-browser": "^2.0.1",
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/@amplitude/analytics-browser/-/analytics-browser-2.1.0.tgz",
+      "integrity": "sha512-9ejvQUR1mrD3Lc8eR03fMDlrfoBZmaiphmw8CZ/qJaKNJ/bu/rh3tBlmvCn1lG/ibxT24Ggtkqz93Xc/n3x0Yg==",
+      "requires": {
+        "@amplitude/analytics-client-common": "^2.0.2",
+        "@amplitude/analytics-core": "^2.0.2",
+        "@amplitude/analytics-types": "^2.1.0",
+        "@amplitude/plugin-page-view-tracking-browser": "^2.0.2",
+        "@amplitude/plugin-web-attribution-browser": "^2.0.2",
         "tslib": "^2.4.1"
       },
       "dependencies": {
@@ -17491,13 +17491,13 @@
       }
     },
     "@amplitude/analytics-client-common": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/@amplitude/analytics-client-common/-/analytics-client-common-2.0.1.tgz",
-      "integrity": "sha512-ueRF5vz/Lvzx7nctF5caivo8/xCzWDEdC8SYbAldYhGQTrqbo9ov0ff6h5xGRqFfAwVYgIFUykCEFRphxiHDbg==",
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/@amplitude/analytics-client-common/-/analytics-client-common-2.0.2.tgz",
+      "integrity": "sha512-Dqe9saZ5ag/ZknHlCYiu6oBOVjIU22Ta5EFtqI/lUm0XqaEdYBGduvlw5hwd8x7nmS6+5r4ip/nW1UoaciucDQ==",
       "requires": {
         "@amplitude/analytics-connector": "^1.4.8",
-        "@amplitude/analytics-core": "^2.0.1",
-        "@amplitude/analytics-types": "^2.0.1",
+        "@amplitude/analytics-core": "^2.0.2",
+        "@amplitude/analytics-types": "^2.1.0",
         "tslib": "^2.4.1"
       },
       "dependencies": {
@@ -17514,11 +17514,11 @@
       "integrity": "sha512-dFW7c7Wb6Ng7vbmzwbaXZSpqfBx37ukamJV9ErFYYS8vGZK/Hkbt3M7fZHBI4WFU6CCwakr2ZXPme11uGPYWkQ=="
     },
     "@amplitude/analytics-core": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/@amplitude/analytics-core/-/analytics-core-2.0.1.tgz",
-      "integrity": "sha512-cWEx0o4iD4HukPbySZJ71o75op8u+xqXknoN9nZPFK304X6ypV/pGcEsdEdo2Ob+bGPkUCVibTmPp3ZRlU0ogg==",
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/@amplitude/analytics-core/-/analytics-core-2.0.2.tgz",
+      "integrity": "sha512-9FHRRrSiVlg77jytV3ZKMMa/VMIUcR7QJejJDcwLTEbZLU9sWUH+y+msLyWpNu2h1bLJBNw1skcD1SvCGm3fnQ==",
       "requires": {
-        "@amplitude/analytics-types": "^2.0.1",
+        "@amplitude/analytics-types": "^2.1.0",
         "tslib": "^2.4.1"
       },
       "dependencies": {
@@ -17530,17 +17530,17 @@
       }
     },
     "@amplitude/analytics-types": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/@amplitude/analytics-types/-/analytics-types-2.0.1.tgz",
-      "integrity": "sha512-mMR3So5ebJ+xWsoWda5xvDlAa7xobc/rf+CiTjBfaGYL9zxJMDXnrLGxXiQUeA+yFpLJUrlAIK8TMRXKH4MCyQ=="
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/@amplitude/analytics-types/-/analytics-types-2.1.0.tgz",
+      "integrity": "sha512-HG6q+IfEjUg9K+em01+2uccebZVs4tiyMIGpBJ0U7G3swx3lEL7DtFn3uzDzSsp3QOc9rRfJglYy2tNkJRUo7g=="
     },
     "@amplitude/plugin-page-view-tracking-browser": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/@amplitude/plugin-page-view-tracking-browser/-/plugin-page-view-tracking-browser-2.0.1.tgz",
-      "integrity": "sha512-llXYUAsQtv5MrAkbQYZpUGEUd7xzmXT09upAu6QQVQikSr+LwRgvBQNWjQfUcJEJrLH6C1LqP+zohA94ibKoMQ==",
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/@amplitude/plugin-page-view-tracking-browser/-/plugin-page-view-tracking-browser-2.0.2.tgz",
+      "integrity": "sha512-tYrQ5wwf3qeEhM173lKHXjdl2pOBd6HsjDpelfvzZRLuirGpiGDQZr52WQgKFP4iIZGIkiKtG//wNdswSJ926w==",
       "requires": {
-        "@amplitude/analytics-client-common": "^2.0.1",
-        "@amplitude/analytics-types": "^2.0.1",
+        "@amplitude/analytics-client-common": "^2.0.2",
+        "@amplitude/analytics-types": "^2.1.0",
         "tslib": "^2.4.1"
       },
       "dependencies": {
@@ -17552,12 +17552,12 @@
       }
     },
     "@amplitude/plugin-web-attribution-browser": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/@amplitude/plugin-web-attribution-browser/-/plugin-web-attribution-browser-2.0.1.tgz",
-      "integrity": "sha512-jCBME4Yld8jF9k12vH9apVTh9a/rxEiZOemiP1t1IBSfxb7zescnIru6Q6fqotb2FN1aHK9MX0M+dpBiYHowOA==",
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/@amplitude/plugin-web-attribution-browser/-/plugin-web-attribution-browser-2.0.2.tgz",
+      "integrity": "sha512-5hCYyH4zVisuQXDpUoj3E8QR3HQt6iggXxB/JYGJac4a9h8aun6iKJHHHCfpEC4V46xVTusDJ/KKINKhcypRSg==",
       "requires": {
-        "@amplitude/analytics-client-common": "^2.0.1",
-        "@amplitude/analytics-types": "^2.0.1",
+        "@amplitude/analytics-client-common": "^2.0.2",
+        "@amplitude/analytics-types": "^2.1.0",
         "tslib": "^2.4.1"
       },
       "dependencies": {
diff --git a/apps/block_scout_web/assets/package.json b/apps/block_scout_web/assets/package.json
index 03a523ca7548..26ad5649ddee 100644
--- a/apps/block_scout_web/assets/package.json
+++ b/apps/block_scout_web/assets/package.json
@@ -20,7 +20,7 @@
   },
   "dependencies": {
     "@fortawesome/fontawesome-free": "^6.4.0",
-    "@amplitude/analytics-browser": "^2.0.1",
+    "@amplitude/analytics-browser": "^2.1.0",
     "@tarekraafat/autocomplete.js": "^10.2.7",
     "@walletconnect/web3-provider": "^1.8.0",
     "assert": "^2.0.0",

From a98a8805c89e6b41a99ec8153285b2c49cdc0385 Mon Sep 17 00:00:00 2001
From: Nikita Pozdniakov <nikitosing4@mail.ru>
Date: Sat, 24 Jun 2023 21:17:45 +0300
Subject: [PATCH 132/909] Add /api/v1/health/liveness and
 /api/v1/health/readiness

---
 .../lib/block_scout_web/api_router.ex                |  8 +++++++-
 .../controllers/api/v1/health_controller.ex          | 12 ++++++++++++
 2 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/apps/block_scout_web/lib/block_scout_web/api_router.ex b/apps/block_scout_web/lib/block_scout_web/api_router.ex
index fe8ad4b7e505..ee5c4ffe5dd6 100644
--- a/apps/block_scout_web/lib/block_scout_web/api_router.ex
+++ b/apps/block_scout_web/lib/block_scout_web/api_router.ex
@@ -208,7 +208,13 @@ defmodule BlockScoutWeb.ApiRouter do
 
     # leave the same endpoint in v1 in order to keep backward compatibility
     get("/search", SearchController, :search)
-    get("/health", HealthController, :health)
+
+    scope "/health" do
+      get("/", HealthController, :health)
+      get("/liveness", HealthController, :liveness)
+      get("/readiness", HealthController, :readiness)
+    end
+
     get("/gas-price-oracle", V1.GasPriceOracleController, :gas_price_oracle)
 
     if Application.compile_env(:block_scout_web, __MODULE__)[:reading_enabled] do
diff --git a/apps/block_scout_web/lib/block_scout_web/controllers/api/v1/health_controller.ex b/apps/block_scout_web/lib/block_scout_web/controllers/api/v1/health_controller.ex
index 923153b87fa4..f65bfcd3b5d9 100644
--- a/apps/block_scout_web/lib/block_scout_web/controllers/api/v1/health_controller.ex
+++ b/apps/block_scout_web/lib/block_scout_web/controllers/api/v1/health_controller.ex
@@ -4,6 +4,8 @@ defmodule BlockScoutWeb.API.V1.HealthController do
   alias Explorer.Chain
   alias Timex.Duration
 
+  @ok_message "OK"
+
   def health(conn, _) do
     with {:ok, number, timestamp} <- Chain.last_db_block_status(),
          {:ok, cache_number, cache_timestamp} <- Chain.last_cache_block_status() do
@@ -13,6 +15,16 @@ defmodule BlockScoutWeb.API.V1.HealthController do
     end
   end
 
+  def liveness(conn, _) do
+    send_resp(conn, :ok, @ok_message)
+  end
+
+  def readiness(conn, _) do
+    Chain.last_db_block_status()
+
+    send_resp(conn, :ok, @ok_message)
+  end
+
   def result(number, timestamp, cache_number, cache_timestamp) do
     %{
       "healthy" => true,

From a27788f88df5e93aea9af224a9dd3e356e49ebee Mon Sep 17 00:00:00 2001
From: Nikita Pozdniakov <nikitosing4@mail.ru>
Date: Sat, 24 Jun 2023 21:22:12 +0300
Subject: [PATCH 133/909] Changelog

---
 CHANGELOG.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 943b52861509..96cfa3fdf643 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,6 +11,8 @@
 
 ### Chore
 
+- [#7781](https://github.com/blockscout/blockscout/pull/7781) - Add `/api/v1/health/liveness` and `/api/v1/health/readiness`
+
 <details>
   <summary>Dependencies version bumps</summary>
 

From 0acc4257b8cb0e1b4a9c4d67253715b01d31cb75 Mon Sep 17 00:00:00 2001
From: Levi Schoen <levismschoen@gmail.com>
Date: Thu, 22 Jun 2023 16:12:44 -0700
Subject: [PATCH 134/909] Fix parsing of database password period(s)

---
 CHANGELOG.md                                            | 1 +
 apps/explorer/lib/explorer/repo/config_helper.ex        | 2 +-
 apps/explorer/test/explorer/repo/config_helper_test.exs | 4 ++--
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 943b52861509..8e076df5643e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,7 @@
 
 ### Fixes
 
+- [#7772](https://github.com/blockscout/blockscout/pull/7772) - Fix parsing of database password period(s)
 - [#7758](https://github.com/blockscout/blockscout/pull/7758) - Remove limit for configurable fetchers
 - [#7764](https://github.com/blockscout/blockscout/pull/7764) - Fix missing ranges insertion and deletion logic
 
diff --git a/apps/explorer/lib/explorer/repo/config_helper.ex b/apps/explorer/lib/explorer/repo/config_helper.ex
index edf73d4dbdc9..d8ccf1800814 100644
--- a/apps/explorer/lib/explorer/repo/config_helper.ex
+++ b/apps/explorer/lib/explorer/repo/config_helper.ex
@@ -36,7 +36,7 @@ defmodule Explorer.Repo.ConfigHelper do
 
   # sobelow_skip ["DOS.StringToAtom"]
   defp extract_parameters(database_url) do
-    ~r/\w*:\/\/(?<username>[a-zA-Z0-9_-]*):(?<password>[a-zA-Z0-9-*#!%^&$_]*)?@(?<hostname>(([a-zA-Z0-9]|[a-zA-Z0-9][a-zA-Z0-9\-]*[a-zA-Z0-9])\.)*([A-Za-z0-9]|[A-Za-z0-9][A-Za-z0-9\-]*[A-Za-z0-9])):(?<port>\d+)\/(?<database>[a-zA-Z0-9_-]*)/
+    ~r/\w*:\/\/(?<username>[a-zA-Z0-9_-]*):(?<password>[a-zA-Z0-9-*#!%^&$_.]*)?@(?<hostname>(([a-zA-Z0-9]|[a-zA-Z0-9][a-zA-Z0-9\-]*[a-zA-Z0-9])\.)*([A-Za-z0-9]|[A-Za-z0-9][A-Za-z0-9\-]*[A-Za-z0-9])):(?<port>\d+)\/(?<database>[a-zA-Z0-9_-]*)/
     |> Regex.named_captures(database_url)
     |> Keyword.new(fn {k, v} -> {String.to_atom(k), v} end)
     |> Keyword.put(:url, database_url)
diff --git a/apps/explorer/test/explorer/repo/config_helper_test.exs b/apps/explorer/test/explorer/repo/config_helper_test.exs
index 06ba3a03dbc8..71bb85077e31 100644
--- a/apps/explorer/test/explorer/repo/config_helper_test.exs
+++ b/apps/explorer/test/explorer/repo/config_helper_test.exs
@@ -53,12 +53,12 @@ defmodule Explorer.Repo.ConfigHelperTest do
     end
 
     test "parse params from database url with special characters in password" do
-      database_url = "postgresql://test_username:awN!l#W*g$P%t-l^q&d@hostname.test.com:7777/test_database"
+      database_url = "postgresql://test_username:awN!l#W*g$P%t-l^.q&d@hostname.test.com:7777/test_database"
 
       result = ConfigHelper.get_db_config(%{url: database_url, env_func: fn _ -> nil end})
 
       assert result[:username] == "test_username"
-      assert result[:password] == "awN!l#W*g$P%t-l^q&d"
+      assert result[:password] == "awN!l#W*g$P%t-l^.q&d"
       assert result[:hostname] == "hostname.test.com"
       assert result[:port] == "7777"
       assert result[:database] == "test_database"

From 520275e02f8bda8611511042efa97f7275a50195 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 27 Jun 2023 19:11:52 +0000
Subject: [PATCH 135/909] Bump ssl_verify_fun from 1.1.6 to 1.1.7

Bumps [ssl_verify_fun](https://github.com/deadtrickster/ssl_verify_fun.erl) from 1.1.6 to 1.1.7.
- [Release notes](https://github.com/deadtrickster/ssl_verify_fun.erl/releases)
- [Commits](https://github.com/deadtrickster/ssl_verify_fun.erl/compare/1.1.6...1.1.7)

---
updated-dependencies:
- dependency-name: ssl_verify_fun
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 mix.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mix.lock b/mix.lock
index f24d02309c93..b3bd8732e3f5 100644
--- a/mix.lock
+++ b/mix.lock
@@ -128,7 +128,7 @@
   "spandex_datadog": {:hex, :spandex_datadog, "1.3.0", "cabe82980f55612a8befa6c12904b1a429bf17faf7271a94b9aae278af6362cf", [:mix], [{:msgpax, "~> 2.2.1 or ~> 2.3", [hex: :msgpax, repo: "hexpm", optional: false]}, {:spandex, "~> 3.0", [hex: :spandex, repo: "hexpm", optional: false]}, {:telemetry, "~> 0.4.2 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "c826e4e29d1612e866b2c7bae2df3beeee84fc57351968c2772672afe59b789c"},
   "spandex_ecto": {:hex, :spandex_ecto, "0.7.0", "259ad2feb7c834e774ec623f99c0fbacca8d60a73be212f92b75e37f853c81be", [:mix], [{:spandex, "~> 2.2 or ~> 3.0", [hex: :spandex, repo: "hexpm", optional: false]}], "hexpm", "c64784be79d95538013b7c60828830411c5c7aff1f4e8d66dfe564b3c83b500e"},
   "spandex_phoenix": {:hex, :spandex_phoenix, "1.1.0", "9cff829d05258dd49a227c56711b19b69a8fd5d4873d8e9a92a4f4097e7322ab", [:mix], [{:phoenix, "~> 1.0", [hex: :phoenix, repo: "hexpm", optional: true]}, {:plug, "~> 1.3", [hex: :plug, repo: "hexpm", optional: false]}, {:spandex, "~> 2.2 or ~> 3.0", [hex: :spandex, repo: "hexpm", optional: false]}, {:telemetry, "~> 0.4 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: true]}], "hexpm", "265fe05c1736485fbb75d66ef7576682ebf6428c391dd54d22217f612fd4ddad"},
-  "ssl_verify_fun": {:hex, :ssl_verify_fun, "1.1.6", "cf344f5692c82d2cd7554f5ec8fd961548d4fd09e7d22f5b62482e5aeaebd4b0", [:make, :mix, :rebar3], [], "hexpm", "bdb0d2471f453c88ff3908e7686f86f9be327d065cc1ec16fa4540197ea04680"},
+  "ssl_verify_fun": {:hex, :ssl_verify_fun, "1.1.7", "354c321cf377240c7b8716899e182ce4890c5938111a1296add3ec74cf1715df", [:make, :mix, :rebar3], [], "hexpm", "fe4c190e8f37401d30167c8c405eda19469f34577987c76dde613e838bbc67f8"},
   "statistex": {:hex, :statistex, "1.0.0", "f3dc93f3c0c6c92e5f291704cf62b99b553253d7969e9a5fa713e5481cd858a5", [:mix], [], "hexpm", "ff9d8bee7035028ab4742ff52fc80a2aa35cece833cf5319009b52f1b5a86c27"},
   "telemetry": {:hex, :telemetry, "0.4.3", "a06428a514bdbc63293cd9a6263aad00ddeb66f608163bdec7c8995784080818", [:rebar3], [], "hexpm", "eb72b8365ffda5bed68a620d1da88525e326cb82a75ee61354fc24b844768041"},
   "tesla": {:hex, :tesla, "1.7.0", "a62dda2f80d4f8a925eb7b8c5b78c461e0eb996672719fe1a63b26321a5f8b4e", [:mix], [{:castore, "~> 0.1 or ~> 1.0", [hex: :castore, repo: "hexpm", optional: true]}, {:exjsx, ">= 3.0.0", [hex: :exjsx, repo: "hexpm", optional: true]}, {:finch, "~> 0.13", [hex: :finch, repo: "hexpm", optional: true]}, {:fuse, "~> 2.4", [hex: :fuse, repo: "hexpm", optional: true]}, {:gun, "~> 1.3", [hex: :gun, repo: "hexpm", optional: true]}, {:hackney, "~> 1.6", [hex: :hackney, repo: "hexpm", optional: true]}, {:ibrowse, "4.4.0", [hex: :ibrowse, repo: "hexpm", optional: true]}, {:jason, ">= 1.0.0", [hex: :jason, repo: "hexpm", optional: true]}, {:mime, "~> 1.0 or ~> 2.0", [hex: :mime, repo: "hexpm", optional: false]}, {:mint, "~> 1.0", [hex: :mint, repo: "hexpm", optional: true]}, {:msgpax, "~> 2.3", [hex: :msgpax, repo: "hexpm", optional: true]}, {:poison, ">= 1.0.0", [hex: :poison, repo: "hexpm", optional: true]}, {:telemetry, "~> 0.4 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: true]}], "hexpm", "2e64f01ebfdb026209b47bc651a0e65203fcff4ae79c11efb73c4852b00dc313"},

From dff53173cd35af5792df7c38cfb3b487f408c84f Mon Sep 17 00:00:00 2001
From: Maxim Filonov <53992153+sl1depengwyn@users.noreply.github.com>
Date: Tue, 27 Jun 2023 19:29:57 +0300
Subject: [PATCH 136/909] Fix additional sources and interfaces, save names

---
 CHANGELOG.md                                              | 1 +
 .../lib/explorer/smart_contract/vyper/publisher.ex        | 8 +++++---
 .../lib/explorer/smart_contract/vyper/verifier.ex         | 2 +-
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 96cfa3fdf643..249a61b1b420 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,7 @@
 
 ### Fixes
 
+- [#7803](https://github.com/blockscout/blockscout/pull/7803) - Fix additional sources and interfaces, save names for vyper contracts
 - [#7758](https://github.com/blockscout/blockscout/pull/7758) - Remove limit for configurable fetchers
 - [#7764](https://github.com/blockscout/blockscout/pull/7764) - Fix missing ranges insertion and deletion logic
 
diff --git a/apps/explorer/lib/explorer/smart_contract/vyper/publisher.ex b/apps/explorer/lib/explorer/smart_contract/vyper/publisher.ex
index 4630a3ad8ac3..64f91345f787 100644
--- a/apps/explorer/lib/explorer/smart_contract/vyper/publisher.ex
+++ b/apps/explorer/lib/explorer/smart_contract/vyper/publisher.ex
@@ -159,17 +159,19 @@ defmodule Explorer.SmartContract.Vyper.Publisher do
 
     compiler_version = CompilerVersion.get_strict_compiler_version(:vyper, params["compiler_version"])
 
+    optimization = if is_nil(params["optimization"]), do: true, else: params["optimization"]
+
     %{
       address_hash: address_hash,
-      name: "Vyper_contract",
+      name: params["name"],
       compiler_version: compiler_version,
       evm_version: params["evm_version"],
       optimization_runs: nil,
-      optimization: params["optimization"] || false,
+      optimization: optimization,
       contract_source_code: params["contract_source_code"],
       constructor_arguments: clean_constructor_arguments,
       external_libraries: [],
-      secondary_sources: [],
+      secondary_sources: params["secondary_sources"],
       abi: abi,
       verified_via_sourcify: false,
       partially_verified: params["partially_verified"] || false,
diff --git a/apps/explorer/lib/explorer/smart_contract/vyper/verifier.ex b/apps/explorer/lib/explorer/smart_contract/vyper/verifier.ex
index 162e83a6e6cf..3d66e1539a01 100644
--- a/apps/explorer/lib/explorer/smart_contract/vyper/verifier.ex
+++ b/apps/explorer/lib/explorer/smart_contract/vyper/verifier.ex
@@ -128,7 +128,7 @@ defmodule Explorer.SmartContract.Vyper.Verifier do
     |> Map.put("evmVersion", evm_version)
     |> Map.put("sourceFiles", files)
     |> Map.put("compilerVersion", params["compiler_version"])
-    |> Map.put("interfaces", params["interfaces"])
+    |> Map.put("interfaces", params["interfaces"] || %{})
     |> RustVerifierInterface.vyper_verify_multipart(address_hash)
   end
 

From bb82e6a182646058cde6077f7f96894777080f57 Mon Sep 17 00:00:00 2001
From: Nikita Pozdniakov <nikitosing4@mail.ru>
Date: Thu, 29 Jun 2023 16:14:37 +0300
Subject: [PATCH 137/909] Add logging for unknown error verification result

---
 CHANGELOG.md                                       | 1 +
 apps/explorer/lib/explorer/chain/smart_contract.ex | 5 ++++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 249a61b1b420..83d4caf9ac81 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,6 +12,7 @@
 
 ### Chore
 
+- [#7819](https://github.com/blockscout/blockscout/pull/7819) - Add logging for unknown error verification result
 - [#7781](https://github.com/blockscout/blockscout/pull/7781) - Add `/api/v1/health/liveness` and `/api/v1/health/readiness`
 
 <details>
diff --git a/apps/explorer/lib/explorer/chain/smart_contract.ex b/apps/explorer/lib/explorer/chain/smart_contract.ex
index d2440d666327..c1cb17f1022e 100644
--- a/apps/explorer/lib/explorer/chain/smart_contract.ex
+++ b/apps/explorer/lib/explorer/chain/smart_contract.ex
@@ -442,7 +442,10 @@ defmodule Explorer.Chain.SmartContract do
 
   defp error_message(string) when is_binary(string), do: string
 
-  defp error_message(_), do: "There was an error validating your contract, please try again."
+  defp error_message(error) do
+    Logger.warn(fn -> ["Unknown verifier error: ", inspect(error)] end)
+    "There was an error validating your contract, please try again."
+  end
 
   defp error_message(:compilation, error_message), do: "There was an error compiling your contract: #{error_message}"
 

From 986762584be3d04c5a5d4d1ed2d6b5c24eb6ad50 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 30 Jun 2023 08:56:57 +0000
Subject: [PATCH 138/909] Bump webpack from 5.88.0 to 5.88.1 in
 /apps/block_scout_web/assets

Bumps [webpack](https://github.com/webpack/webpack) from 5.88.0 to 5.88.1.
- [Release notes](https://github.com/webpack/webpack/releases)
- [Commits](https://github.com/webpack/webpack/compare/v5.88.0...v5.88.1)

---
updated-dependencies:
- dependency-name: webpack
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 apps/block_scout_web/assets/package-lock.json | 14 +++++++-------
 apps/block_scout_web/assets/package.json      |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/apps/block_scout_web/assets/package-lock.json b/apps/block_scout_web/assets/package-lock.json
index 9f2b393e1b5e..4b01e9a8acfe 100644
--- a/apps/block_scout_web/assets/package-lock.json
+++ b/apps/block_scout_web/assets/package-lock.json
@@ -92,7 +92,7 @@
         "sass": "^1.63.6",
         "sass-loader": "^13.3.2",
         "style-loader": "^3.3.3",
-        "webpack": "^5.88.0",
+        "webpack": "^5.88.1",
         "webpack-cli": "^5.1.4"
       },
       "engines": {
@@ -16927,9 +16927,9 @@
       }
     },
     "node_modules/webpack": {
-      "version": "5.88.0",
-      "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.88.0.tgz",
-      "integrity": "sha512-O3jDhG5e44qIBSi/P6KpcCcH7HD+nYIHVBhdWFxcLOcIGN8zGo5nqF3BjyNCxIh4p1vFdNnreZv2h2KkoAw3lw==",
+      "version": "5.88.1",
+      "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.88.1.tgz",
+      "integrity": "sha512-FROX3TxQnC/ox4N+3xQoWZzvGXSuscxR32rbzjpXgEzWudJFEJBpdlkkob2ylrv5yzzufD1zph1OoFsLtm6stQ==",
       "dev": true,
       "dependencies": {
         "@types/eslint-scope": "^3.7.3",
@@ -30251,9 +30251,9 @@
       "dev": true
     },
     "webpack": {
-      "version": "5.88.0",
-      "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.88.0.tgz",
-      "integrity": "sha512-O3jDhG5e44qIBSi/P6KpcCcH7HD+nYIHVBhdWFxcLOcIGN8zGo5nqF3BjyNCxIh4p1vFdNnreZv2h2KkoAw3lw==",
+      "version": "5.88.1",
+      "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.88.1.tgz",
+      "integrity": "sha512-FROX3TxQnC/ox4N+3xQoWZzvGXSuscxR32rbzjpXgEzWudJFEJBpdlkkob2ylrv5yzzufD1zph1OoFsLtm6stQ==",
       "dev": true,
       "requires": {
         "@types/eslint-scope": "^3.7.3",
diff --git a/apps/block_scout_web/assets/package.json b/apps/block_scout_web/assets/package.json
index e21846c4e12e..26aa5cff5525 100644
--- a/apps/block_scout_web/assets/package.json
+++ b/apps/block_scout_web/assets/package.json
@@ -104,7 +104,7 @@
     "sass": "^1.63.6",
     "sass-loader": "^13.3.2",
     "style-loader": "^3.3.3",
-    "webpack": "^5.88.0",
+    "webpack": "^5.88.1",
     "webpack-cli": "^5.1.4"
   },
   "jest": {

From 9a4643fff13d34b25deb85ec5a4b580e88268bc5 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 30 Jun 2023 09:21:03 +0000
Subject: [PATCH 139/909] Bump absinthe from 1.7.1 to 1.7.3

Bumps [absinthe](https://github.com/absinthe-graphql/absinthe) from 1.7.1 to 1.7.3.
- [Release notes](https://github.com/absinthe-graphql/absinthe/releases)
- [Changelog](https://github.com/absinthe-graphql/absinthe/blob/master/CHANGELOG.md)
- [Commits](https://github.com/absinthe-graphql/absinthe/compare/v1.7.1...v1.7.3)

---
updated-dependencies:
- dependency-name: absinthe
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 mix.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mix.lock b/mix.lock
index b3bd8732e3f5..b058a11b1e9f 100644
--- a/mix.lock
+++ b/mix.lock
@@ -1,5 +1,5 @@
 %{
-  "absinthe": {:hex, :absinthe, "1.7.1", "aca6f64994f0914628429ddbdfbf24212747b51780dae189dd98909da911757b", [:mix], [{:dataloader, "~> 1.0.0", [hex: :dataloader, repo: "hexpm", optional: true]}, {:decimal, "~> 1.0 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: true]}, {:nimble_parsec, "~> 1.2.2 or ~> 1.3.0", [hex: :nimble_parsec, repo: "hexpm", optional: false]}, {:telemetry, "~> 1.0 or ~> 0.4", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "c0c4dbd93881fa3bfbad255608234b104b877c2a901850c1fe8c53b408a72a57"},
+  "absinthe": {:hex, :absinthe, "1.7.3", "128f9de8d8feab761a50483011c2652074de0a670316d0e24a4979daeb460c8f", [:mix], [{:dataloader, "~> 1.0.0", [hex: :dataloader, repo: "hexpm", optional: true]}, {:decimal, "~> 1.0 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: true]}, {:nimble_parsec, "~> 1.2.2 or ~> 1.3.0", [hex: :nimble_parsec, repo: "hexpm", optional: false]}, {:opentelemetry_process_propagator, "~> 0.2.1", [hex: :opentelemetry_process_propagator, repo: "hexpm", optional: true]}, {:telemetry, "~> 1.0 or ~> 0.4", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "6def91514f023832dbb3433baa166366881648932211f2e8146f9792b08b7bb3"},
   "absinthe_phoenix": {:hex, :absinthe_phoenix, "2.0.2", "e607b438db900049b9b3760f8ecd0591017a46122fffed7057bf6989020992b5", [:mix], [{:absinthe, "~> 1.5", [hex: :absinthe, repo: "hexpm", optional: false]}, {:absinthe_plug, "~> 1.5", [hex: :absinthe_plug, repo: "hexpm", optional: false]}, {:decimal, "~> 1.0 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: false]}, {:phoenix, "~> 1.5", [hex: :phoenix, repo: "hexpm", optional: false]}, {:phoenix_html, "~> 2.13 or ~> 3.0", [hex: :phoenix_html, repo: "hexpm", optional: true]}, {:phoenix_pubsub, "~> 2.0", [hex: :phoenix_pubsub, repo: "hexpm", optional: false]}], "hexpm", "d36918925c380dc7d2ed7d039c9a3b4182ec36723f7417a68745ade5aab22f8d"},
   "absinthe_plug": {:git, "https://github.com/blockscout/absinthe_plug.git", "c435d43f316769e1beee1dbe500b623124c96785", [tag: "1.5.3"]},
   "absinthe_relay": {:hex, :absinthe_relay, "1.5.2", "cfb8aed70f4e4c7718d3f1c212332d2ea728f17c7fc0f68f1e461f0f5f0c4b9a", [:mix], [{:absinthe, "~> 1.5.0 or ~> 1.6.0 or ~> 1.7.0", [hex: :absinthe, repo: "hexpm", optional: false]}, {:ecto, "~> 2.0 or ~> 3.0", [hex: :ecto, repo: "hexpm", optional: true]}], "hexpm", "0587ee913afa31512e1457a5064ee88427f8fe7bcfbeeecd41c71d9cff0b62b6"},

From e1fad116848b92f68b3564f2f1ab1050649d0bee Mon Sep 17 00:00:00 2001
From: Nikita Pozdniakov <nikitosing4@mail.ru>
Date: Tue, 27 Jun 2023 13:27:47 +0300
Subject: [PATCH 140/909] Fix tests warning; Fix env name

---
 CHANGELOG.md                                  |  1 +
 .../channels/transaction_channel_test.exs     |  2 +-
 .../channels/websocket_v2_test.exs            |  2 +-
 .../address_withdrawal_controller_test.exs    |  2 +-
 .../api/v2/token_controller_test.exs          | 16 +++---
 .../api/v2/transaction_controller_test.exs    | 52 +++++++------------
 .../api/v2/withdrawal_controller_test.exs     |  2 +-
 .../explorer/account/notify/email_test.exs    |  4 --
 .../chain/address/token_balance_test.exs      |  1 -
 .../chain/cache/gas_price_oracle_test.exs     |  1 -
 .../runner/address/token_balances_test.exs    |  2 +-
 .../chain/import/runner/blocks_test.exs       |  7 ++-
 .../explorer/chain/token_transfer_test.exs    |  2 +-
 .../test/explorer/chain/withdrawal_test.exs   |  1 -
 .../token_exchange_rates_test.exs             |  5 +-
 .../fetcher/coin_balance_on_demand_test.exs   |  2 +-
 ...nding_block_operations_sanitizer_test.exs} |  0
 .../test/indexer/fetcher/withdrawal_test.exs  |  1 -
 config/runtime.exs                            |  3 +-
 19 files changed, 40 insertions(+), 66 deletions(-)
 rename apps/indexer/test/indexer/fetcher/{pending_block_operations_sanitizer_test.ex => pending_block_operations_sanitizer_test.exs} (100%)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 83d4caf9ac81..6b059f232ebf 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,6 +12,7 @@
 
 ### Chore
 
+- [#7789](https://github.com/blockscout/blockscout/pull/7789) - Fix test warnings; Fix name of `MICROSERVICE_ETH_BYTECODE_DB_INTERVAL_BETWEEN_LOOKUPS` env variable
 - [#7819](https://github.com/blockscout/blockscout/pull/7819) - Add logging for unknown error verification result
 - [#7781](https://github.com/blockscout/blockscout/pull/7781) - Add `/api/v1/health/liveness` and `/api/v1/health/readiness`
 
diff --git a/apps/block_scout_web/test/block_scout_web/channels/transaction_channel_test.exs b/apps/block_scout_web/test/block_scout_web/channels/transaction_channel_test.exs
index 75005600280c..ea47cc9f7f02 100644
--- a/apps/block_scout_web/test/block_scout_web/channels/transaction_channel_test.exs
+++ b/apps/block_scout_web/test/block_scout_web/channels/transaction_channel_test.exs
@@ -1,7 +1,7 @@
 defmodule BlockScoutWeb.TransactionChannelTest do
   use BlockScoutWeb.ChannelCase
 
-  alias Explorer.Chain.{Hash, Import, Transaction}
+  alias Explorer.Chain.Hash
   alias BlockScoutWeb.Notifier
 
   test "subscribed user is notified of new_transaction topic" do
diff --git a/apps/block_scout_web/test/block_scout_web/channels/websocket_v2_test.exs b/apps/block_scout_web/test/block_scout_web/channels/websocket_v2_test.exs
index 5dc25c183ca8..918b636cb3e8 100644
--- a/apps/block_scout_web/test/block_scout_web/channels/websocket_v2_test.exs
+++ b/apps/block_scout_web/test/block_scout_web/channels/websocket_v2_test.exs
@@ -3,7 +3,7 @@ defmodule BlockScoutWeb.WebsocketV2Test do
 
   alias BlockScoutWeb.Notifier
   alias Explorer.Chain.Events.Subscriber
-  alias Explorer.Chain.{Address, Import, InternalTransaction, Log, Token, TokenTransfer, Transaction}
+  alias Explorer.Chain.{Address, Import, Token, TokenTransfer, Transaction}
   alias Explorer.Repo
 
   describe "websocket v2" do
diff --git a/apps/block_scout_web/test/block_scout_web/controllers/address_withdrawal_controller_test.exs b/apps/block_scout_web/test/block_scout_web/controllers/address_withdrawal_controller_test.exs
index a6df1165ae8c..557c906ac116 100644
--- a/apps/block_scout_web/test/block_scout_web/controllers/address_withdrawal_controller_test.exs
+++ b/apps/block_scout_web/test/block_scout_web/controllers/address_withdrawal_controller_test.exs
@@ -6,7 +6,7 @@ defmodule BlockScoutWeb.AddressWithdrawalControllerTest do
   import BlockScoutWeb.WeiHelper, only: [format_wei_value: 2]
   import Mox
 
-  alias Explorer.Chain.{Address, Transaction}
+  alias Explorer.Chain.Address
   alias Explorer.ExchangeRates.Token
 
   setup :verify_on_exit!
diff --git a/apps/block_scout_web/test/block_scout_web/controllers/api/v2/token_controller_test.exs b/apps/block_scout_web/test/block_scout_web/controllers/api/v2/token_controller_test.exs
index de65f335d686..f46da387f796 100644
--- a/apps/block_scout_web/test/block_scout_web/controllers/api/v2/token_controller_test.exs
+++ b/apps/block_scout_web/test/block_scout_web/controllers/api/v2/token_controller_test.exs
@@ -410,7 +410,7 @@ defmodule BlockScoutWeb.API.V2.TokenControllerTest do
     # these tests that tokens paginates by each parameter separately and by any combination of them
     test "pagination by address", %{conn: conn} do
       tokens =
-        for i <- 0..50 do
+        for _i <- 0..50 do
           insert(:token, name: nil)
         end
         |> Enum.reverse()
@@ -452,7 +452,7 @@ defmodule BlockScoutWeb.API.V2.TokenControllerTest do
 
     test "pagination by name and address", %{conn: conn} do
       tokens =
-        for i <- 0..50 do
+        for _i <- 0..50 do
           insert(:token)
         end
         |> Enum.reverse()
@@ -462,7 +462,7 @@ defmodule BlockScoutWeb.API.V2.TokenControllerTest do
 
     test "pagination by holders and address", %{conn: conn} do
       tokens =
-        for i <- 0..50 do
+        for _i <- 0..50 do
           insert(:token, holder_count: 1, name: nil)
         end
         |> Enum.reverse()
@@ -472,7 +472,7 @@ defmodule BlockScoutWeb.API.V2.TokenControllerTest do
 
     test "pagination by circulating_market_cap and address", %{conn: conn} do
       tokens =
-        for i <- 0..50 do
+        for _i <- 0..50 do
           insert(:token, circulating_market_cap: 1, name: nil)
         end
         |> Enum.reverse()
@@ -511,7 +511,7 @@ defmodule BlockScoutWeb.API.V2.TokenControllerTest do
 
     test "pagination by holders, name and address", %{conn: conn} do
       tokens =
-        for i <- 0..50 do
+        for _i <- 0..50 do
           insert(:token, holder_count: 1)
         end
         |> Enum.reverse()
@@ -521,7 +521,7 @@ defmodule BlockScoutWeb.API.V2.TokenControllerTest do
 
     test "pagination by circulating_market_cap, name and address", %{conn: conn} do
       tokens =
-        for i <- 0..50 do
+        for _i <- 0..50 do
           insert(:token, circulating_market_cap: 1)
         end
         |> Enum.reverse()
@@ -531,7 +531,7 @@ defmodule BlockScoutWeb.API.V2.TokenControllerTest do
 
     test "pagination by circulating_market_cap, holders and address", %{conn: conn} do
       tokens =
-        for i <- 0..50 do
+        for _i <- 0..50 do
           insert(:token, circulating_market_cap: 1, holder_count: 1, name: nil)
         end
         |> Enum.reverse()
@@ -551,7 +551,7 @@ defmodule BlockScoutWeb.API.V2.TokenControllerTest do
 
     test "pagination by circulating_market_cap, holders, name and address", %{conn: conn} do
       tokens =
-        for i <- 0..50 do
+        for _i <- 0..50 do
           insert(:token, holder_count: 1, circulating_market_cap: 1)
         end
         |> Enum.reverse()
diff --git a/apps/block_scout_web/test/block_scout_web/controllers/api/v2/transaction_controller_test.exs b/apps/block_scout_web/test/block_scout_web/controllers/api/v2/transaction_controller_test.exs
index 14429b489b4f..944ee6c28326 100644
--- a/apps/block_scout_web/test/block_scout_web/controllers/api/v2/transaction_controller_test.exs
+++ b/apps/block_scout_web/test/block_scout_web/controllers/api/v2/transaction_controller_test.exs
@@ -1,9 +1,7 @@
 defmodule BlockScoutWeb.API.V2.TransactionControllerTest do
   use BlockScoutWeb.ConnCase
 
-  import EthereumJSONRPC, only: [integer_to_quantity: 1]
   import Explorer.Chain, only: [hash_to_lower_case_string: 1]
-  import Mox
 
   alias BlockScoutWeb.Models.UserFromAuth
   alias Explorer.Account.WatchlistAddress
@@ -964,36 +962,6 @@ defmodule BlockScoutWeb.API.V2.TransactionControllerTest do
     assert Address.checksum(transaction.to_address_hash) == json["to"]["hash"]
   end
 
-  defp compare_item(%Transaction{} = transaction, json, wl_names) do
-    assert to_string(transaction.hash) == json["hash"]
-    assert transaction.block_number == json["block"]
-    assert to_string(transaction.value.value) == json["value"]
-    assert Address.checksum(transaction.from_address_hash) == json["from"]["hash"]
-    assert Address.checksum(transaction.to_address_hash) == json["to"]["hash"]
-
-    assert json["to"]["watchlist_names"] ==
-             if(wl_names[transaction.to_address_hash],
-               do: [
-                 %{
-                   "display_name" => wl_names[transaction.to_address_hash],
-                   "label" => wl_names[transaction.to_address_hash]
-                 }
-               ],
-               else: []
-             )
-
-    assert json["from"]["watchlist_names"] ==
-             if(wl_names[transaction.from_address_hash],
-               do: [
-                 %{
-                   "display_name" => wl_names[transaction.from_address_hash],
-                   "label" => wl_names[transaction.from_address_hash]
-                 }
-               ],
-               else: []
-             )
-  end
-
   defp compare_item(%InternalTransaction{} = internal_tx, json) do
     assert internal_tx.block_number == json["block"]
     assert to_string(internal_tx.gas) == json["gas_limit"]
@@ -1029,10 +997,26 @@ defmodule BlockScoutWeb.API.V2.TransactionControllerTest do
     assert Address.checksum(transaction.to_address_hash) == json["to"]["hash"]
 
     assert json["to"]["watchlist_names"] ==
-             if(wl_names[transaction.to_address_hash], do: [wl_names[transaction.to_address_hash]], else: [])
+             if(wl_names[transaction.to_address_hash],
+               do: [
+                 %{
+                   "display_name" => wl_names[transaction.to_address_hash],
+                   "label" => wl_names[transaction.to_address_hash]
+                 }
+               ],
+               else: []
+             )
 
     assert json["from"]["watchlist_names"] ==
-             if(wl_names[transaction.from_address_hash], do: [wl_names[transaction.from_address_hash]], else: [])
+             if(wl_names[transaction.from_address_hash],
+               do: [
+                 %{
+                   "display_name" => wl_names[transaction.from_address_hash],
+                   "label" => wl_names[transaction.from_address_hash]
+                 }
+               ],
+               else: []
+             )
   end
 
   defp check_paginated_response(first_page_resp, second_page_resp, txs) do
diff --git a/apps/block_scout_web/test/block_scout_web/controllers/api/v2/withdrawal_controller_test.exs b/apps/block_scout_web/test/block_scout_web/controllers/api/v2/withdrawal_controller_test.exs
index 4645958e9263..88320ec50b5b 100644
--- a/apps/block_scout_web/test/block_scout_web/controllers/api/v2/withdrawal_controller_test.exs
+++ b/apps/block_scout_web/test/block_scout_web/controllers/api/v2/withdrawal_controller_test.exs
@@ -5,7 +5,7 @@ defmodule BlockScoutWeb.API.V2.WithdrawalControllerTest do
 
   describe "/withdrawals" do
     test "empty lists", %{conn: conn} do
-      request = get(conn, "/api/v2/blocks")
+      request = get(conn, "/api/v2/withdrawals")
       assert response = json_response(request, 200)
       assert response["items"] == []
       assert response["next_page_params"] == nil
diff --git a/apps/explorer/test/explorer/account/notify/email_test.exs b/apps/explorer/test/explorer/account/notify/email_test.exs
index 34e5a57ad6d9..1163d9e32f7c 100644
--- a/apps/explorer/test/explorer/account/notify/email_test.exs
+++ b/apps/explorer/test/explorer/account/notify/email_test.exs
@@ -1,9 +1,6 @@
 defmodule Explorer.Account.Notify.EmailTest do
   use ExUnit.Case
 
-  alias Explorer.Chain.Address
-  alias Explorer.Chain.Transaction
-
   alias Explorer.Account.{
     Identity,
     Watchlist,
@@ -47,7 +44,6 @@ defmodule Explorer.Account.Notify.EmailTest do
       {:ok, from_hash} = string_to_address_hash("0x092D537737E767Dae48c28aE509f34094496f030")
 
       {:ok, to_hash} = string_to_address_hash("0xE1F4dd38f00B0D8D4d2b4B5010bE53F2A0b934E5")
-      to_address = %Address{hash: to_hash}
 
       identity = %Identity{
         uid: "foo|bar",
diff --git a/apps/explorer/test/explorer/chain/address/token_balance_test.exs b/apps/explorer/test/explorer/chain/address/token_balance_test.exs
index bab58960fd28..9a72837f6a5f 100644
--- a/apps/explorer/test/explorer/chain/address/token_balance_test.exs
+++ b/apps/explorer/test/explorer/chain/address/token_balance_test.exs
@@ -3,7 +3,6 @@ defmodule Explorer.Chain.Address.TokenBalanceTest do
 
   alias Explorer.Repo
   alias Explorer.Chain.Address.TokenBalance
-  alias Explorer.Chain
 
   describe "unfetched_token_balances/0" do
     test "returns only the token balances that have value_fetched_at nil" do
diff --git a/apps/explorer/test/explorer/chain/cache/gas_price_oracle_test.exs b/apps/explorer/test/explorer/chain/cache/gas_price_oracle_test.exs
index 148b8e8872e3..630301488aad 100644
--- a/apps/explorer/test/explorer/chain/cache/gas_price_oracle_test.exs
+++ b/apps/explorer/test/explorer/chain/cache/gas_price_oracle_test.exs
@@ -2,7 +2,6 @@ defmodule Explorer.Chain.Cache.GasPriceOracleTest do
   use Explorer.DataCase
 
   alias Explorer.Chain.Cache.GasPriceOracle
-  alias Explorer.Repo
 
   describe "get_average_gas_price/4" do
     test "returns nil percentile values if no blocks in the DB" do
diff --git a/apps/explorer/test/explorer/chain/import/runner/address/token_balances_test.exs b/apps/explorer/test/explorer/chain/import/runner/address/token_balances_test.exs
index 15725869bd85..40034eb84148 100644
--- a/apps/explorer/test/explorer/chain/import/runner/address/token_balances_test.exs
+++ b/apps/explorer/test/explorer/chain/import/runner/address/token_balances_test.exs
@@ -208,7 +208,7 @@ defmodule Explorer.Chain.Import.Runner.Address.TokenBalancesTest do
             %{
               address_token_balances: [
                 %TokenBalance{
-                  address_hash: address_hash,
+                  address_hash: ^address_hash,
                   block_number: ^block_number,
                   token_contract_address_hash: ^token_contract_address_hash,
                   token_id: nil,
diff --git a/apps/explorer/test/explorer/chain/import/runner/blocks_test.exs b/apps/explorer/test/explorer/chain/import/runner/blocks_test.exs
index ba012aba47bd..5a06a1a6a1f2 100644
--- a/apps/explorer/test/explorer/chain/import/runner/blocks_test.exs
+++ b/apps/explorer/test/explorer/chain/import/runner/blocks_test.exs
@@ -354,10 +354,9 @@ defmodule Explorer.Chain.Import.Runner.BlocksTest do
       %Ecto.Changeset{valid?: true, changes: block_changes} = Block.changeset(%Block{}, new_block)
       %Ecto.Changeset{valid?: true, changes: block_changes1} = Block.changeset(%Block{}, new_block1)
 
-      result =
-        Multi.new()
-        |> Blocks.run([block_changes, block_changes1], options)
-        |> Repo.transaction()
+      Multi.new()
+      |> Blocks.run([block_changes, block_changes1], options)
+      |> Repo.transaction()
 
       assert %{block_number: ^number, block_hash: ^hash} = Repo.one(PendingBlockOperation)
     end
diff --git a/apps/explorer/test/explorer/chain/token_transfer_test.exs b/apps/explorer/test/explorer/chain/token_transfer_test.exs
index da4720281a70..29165457b773 100644
--- a/apps/explorer/test/explorer/chain/token_transfer_test.exs
+++ b/apps/explorer/test/explorer/chain/token_transfer_test.exs
@@ -3,7 +3,7 @@ defmodule Explorer.Chain.TokenTransferTest do
 
   import Explorer.Factory
 
-  alias Explorer.{PagingOptions, Repo}
+  alias Explorer.PagingOptions
   alias Explorer.Chain.TokenTransfer
 
   doctest Explorer.Chain.TokenTransfer
diff --git a/apps/explorer/test/explorer/chain/withdrawal_test.exs b/apps/explorer/test/explorer/chain/withdrawal_test.exs
index ebf88f3499aa..ab797f617219 100644
--- a/apps/explorer/test/explorer/chain/withdrawal_test.exs
+++ b/apps/explorer/test/explorer/chain/withdrawal_test.exs
@@ -3,7 +3,6 @@ defmodule Explorer.Chain.WithdrawalTest do
 
   alias Ecto.Changeset
   alias Explorer.Chain.Withdrawal
-  alias Explorer.Chain
 
   describe "changeset/2" do
     test "with valid attributes" do
diff --git a/apps/explorer/test/explorer/exchange_rates/token_exchange_rates_test.exs b/apps/explorer/test/explorer/exchange_rates/token_exchange_rates_test.exs
index 83dde6424a73..9eb6b5189c76 100644
--- a/apps/explorer/test/explorer/exchange_rates/token_exchange_rates_test.exs
+++ b/apps/explorer/test/explorer/exchange_rates/token_exchange_rates_test.exs
@@ -5,7 +5,6 @@ defmodule Explorer.TokenExchangeRatesTest do
 
   alias Plug.Conn
   alias Explorer.Chain.Token
-  alias Explorer.ExchangeRates
   alias Explorer.ExchangeRates.TokenExchangeRates
 
   @moduletag :capture_log
@@ -100,7 +99,7 @@ defmodule Explorer.TokenExchangeRatesTest do
         base_url: "http://localhost:#{bypass.port}"
       )
 
-      [_token_with_no_exchange_rate | tokens] =
+      [_token_with_no_exchange_rate | _tokens] =
         for _ <- 0..4 do
           insert(:token)
         end
@@ -180,7 +179,7 @@ defmodule Explorer.TokenExchangeRatesTest do
         base_url: "http://localhost:#{bypass.port}"
       )
 
-      [_token_with_no_exchange_rate | tokens] =
+      [_token_with_no_exchange_rate | _tokens] =
         for _ <- 0..4 do
           insert(:token)
         end
diff --git a/apps/indexer/test/indexer/fetcher/coin_balance_on_demand_test.exs b/apps/indexer/test/indexer/fetcher/coin_balance_on_demand_test.exs
index 0ae13b304a08..d345ecee0827 100644
--- a/apps/indexer/test/indexer/fetcher/coin_balance_on_demand_test.exs
+++ b/apps/indexer/test/indexer/fetcher/coin_balance_on_demand_test.exs
@@ -126,7 +126,7 @@ defmodule Indexer.Fetcher.CoinBalanceOnDemandTest do
 
       :timer.sleep(1000)
 
-      assert %{value: expected_wei} = Chain.get_coin_balance(address.hash, block_number)
+      assert %{value: ^expected_wei} = Chain.get_coin_balance(address.hash, block_number)
     end
   end
 
diff --git a/apps/indexer/test/indexer/fetcher/pending_block_operations_sanitizer_test.ex b/apps/indexer/test/indexer/fetcher/pending_block_operations_sanitizer_test.exs
similarity index 100%
rename from apps/indexer/test/indexer/fetcher/pending_block_operations_sanitizer_test.ex
rename to apps/indexer/test/indexer/fetcher/pending_block_operations_sanitizer_test.exs
diff --git a/apps/indexer/test/indexer/fetcher/withdrawal_test.exs b/apps/indexer/test/indexer/fetcher/withdrawal_test.exs
index cfe60e9e4afb..f3b13f783af8 100644
--- a/apps/indexer/test/indexer/fetcher/withdrawal_test.exs
+++ b/apps/indexer/test/indexer/fetcher/withdrawal_test.exs
@@ -5,7 +5,6 @@ defmodule Indexer.Fetcher.WithdrawalTest do
   import Mox
   import EthereumJSONRPC, only: [integer_to_quantity: 1]
 
-  alias Explorer.Chain
   alias Indexer.Fetcher.Withdrawal
 
   setup :verify_on_exit!
diff --git a/config/runtime.exs b/config/runtime.exs
index e6328f5319c4..0c28db61800f 100644
--- a/config/runtime.exs
+++ b/config/runtime.exs
@@ -387,8 +387,7 @@ config :explorer, Explorer.Chain.Cache.TransactionActionTokensData,
   max_cache_size: ConfigHelper.parse_integer_env_var("INDEXER_TX_ACTIONS_MAX_TOKEN_CACHE_SIZE", 100_000)
 
 config :explorer, Explorer.Chain.Fetcher.LookUpSmartContractSourcesOnDemand,
-  fetch_interval:
-    ConfigHelper.parse_time_env_var("MICROSERVICE_MICROSERVICE_ETH_BYTECODE_DB_INTERVAL_BETWEEN_LOOKUPS", "10m")
+  fetch_interval: ConfigHelper.parse_time_env_var("MICROSERVICE_ETH_BYTECODE_DB_INTERVAL_BETWEEN_LOOKUPS", "10m")
 
 config :explorer, Explorer.Chain.Cache.MinMissingBlockNumber,
   enabled: !ConfigHelper.parse_bool_env_var("DISABLE_INDEXER")

From 928007eee862ad6d4e0c03036c697312b04605bd Mon Sep 17 00:00:00 2001
From: Qwerty5Uiop <alex000010@bk.ru>
Date: Wed, 28 Jun 2023 20:45:07 +0400
Subject: [PATCH 141/909] Filter addresses before insertion

---
 CHANGELOG.md                                  |  2 +
 .../explorer/chain/import/runner/addresses.ex | 81 ++++++++++++++-----
 2 files changed, 65 insertions(+), 18 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 96cfa3fdf643..d936e91f376c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,8 @@
 
 ### Features
 
+- [#7811](https://github.com/blockscout/blockscout/pull/7811) - Filter addresses before insertion
+
 ### Fixes
 
 - [#7758](https://github.com/blockscout/blockscout/pull/7758) - Remove limit for configurable fetchers
diff --git a/apps/explorer/lib/explorer/chain/import/runner/addresses.ex b/apps/explorer/lib/explorer/chain/import/runner/addresses.ex
index 2b703a0100fd..70d5c85bfe19 100644
--- a/apps/explorer/lib/explorer/chain/import/runner/addresses.ex
+++ b/apps/explorer/lib/explorer/chain/import/runner/addresses.ex
@@ -58,10 +58,28 @@ defmodule Explorer.Chain.Import.Runner.Addresses do
         end)
       end)
 
+    ordered_changes_list =
+      changes_list_with_defaults
+      |> Enum.group_by(& &1.hash)
+      |> Enum.map(fn {_, grouped_addresses} ->
+        Enum.max_by(grouped_addresses, fn address ->
+          address_max_by(address)
+        end)
+      end)
+      |> Enum.sort_by(& &1.hash)
+
     multi
-    |> Multi.run(:addresses, fn repo, _ ->
+    |> Multi.run(:filter_addresses, fn repo, _ ->
+      Instrumenter.block_import_stage_runner(
+        fn -> filter_addresses(repo, ordered_changes_list) end,
+        :addresses,
+        :addresses,
+        :filter_addresses
+      )
+    end)
+    |> Multi.run(:addresses, fn repo, %{filter_addresses: addresses} ->
       Instrumenter.block_import_stage_runner(
-        fn -> insert(repo, changes_list_with_defaults, insert_options) end,
+        fn -> insert(repo, addresses, insert_options) end,
         :addresses,
         :addresses,
         :addresses
@@ -83,29 +101,56 @@ defmodule Explorer.Chain.Import.Runner.Addresses do
 
   ## Private Functions
 
+  @spec filter_addresses(Repo.t(), [map()]) :: {:ok, [map()]}
+  defp filter_addresses(repo, changes_list) do
+    hashes = Enum.map(changes_list, & &1.hash)
+
+    existing_addresses_query =
+      from(a in Address,
+        where: a.hash in ^hashes,
+        select: [:hash, :contract_code, :fetched_coin_balance_block_number, :nonce]
+      )
+
+    existing_addresses_map =
+      existing_addresses_query
+      |> repo.all()
+      |> Map.new(&{&1.hash, &1})
+
+    filtered_addresses =
+      changes_list
+      |> Enum.reduce([], fn address, acc ->
+        existing_address = existing_addresses_map[address.hash]
+
+        if should_update?(address, existing_address) do
+          [address | acc]
+        else
+          acc
+        end
+      end)
+      |> Enum.reverse()
+
+    {:ok, filtered_addresses}
+  end
+
+  defp should_update?(new_address, existing_address) do
+    is_nil(existing_address) or
+      (not is_nil(new_address[:contract_code]) and new_address[:contract_code] != existing_address.contract_code) or
+      (not is_nil(new_address[:fetched_coin_balance_block_number]) and
+         (is_nil(existing_address.fetched_coin_balance_block_number) or
+            new_address[:fetched_coin_balance_block_number] >= existing_address.fetched_coin_balance_block_number)) or
+      (not is_nil(new_address[:nonce]) and
+         (is_nil(existing_address.nonce) or new_address[:nonce] > existing_address.nonce))
+  end
+
   @spec insert(Repo.t(), [%{hash: Hash.Address.t()}], %{
           optional(:on_conflict) => Import.Runner.on_conflict(),
           required(:timeout) => timeout,
           required(:timestamps) => Import.timestamps()
         }) :: {:ok, [Address.t()]}
-  defp insert(repo, changes_list, %{timeout: timeout, timestamps: timestamps} = options) when is_list(changes_list) do
+  defp insert(repo, ordered_changes_list, %{timeout: timeout, timestamps: timestamps} = options)
+       when is_list(ordered_changes_list) do
     on_conflict = Map.get_lazy(options, :on_conflict, &default_on_conflict/0)
 
-    # Enforce Address ShareLocks order (see docs: sharelocks.md)
-    ordered_changes_list =
-      changes_list
-      |> Enum.group_by(fn %{
-                            hash: hash
-                          } ->
-        {hash}
-      end)
-      |> Enum.map(fn {_, grouped_addresses} ->
-        Enum.max_by(grouped_addresses, fn address ->
-          address_max_by(address)
-        end)
-      end)
-      |> Enum.sort_by(& &1.hash)
-
     Import.insert_changes_list(
       repo,
       ordered_changes_list,

From ac1a8a715c12cacaf34bcbec813bceadc3b304a7 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 30 Jun 2023 18:15:12 +0000
Subject: [PATCH 142/909] Bump @amplitude/analytics-browser in
 /apps/block_scout_web/assets

Bumps [@amplitude/analytics-browser](https://github.com/amplitude/Amplitude-TypeScript) from 2.1.0 to 2.1.1.
- [Release notes](https://github.com/amplitude/Amplitude-TypeScript/releases)
- [Commits](https://github.com/amplitude/Amplitude-TypeScript/compare/@amplitude/analytics-browser@2.1.0...@amplitude/analytics-browser@2.1.1)

---
updated-dependencies:
- dependency-name: "@amplitude/analytics-browser"
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 apps/block_scout_web/assets/package-lock.json | 176 +++++++++---------
 apps/block_scout_web/assets/package.json      |   2 +-
 2 files changed, 90 insertions(+), 88 deletions(-)

diff --git a/apps/block_scout_web/assets/package-lock.json b/apps/block_scout_web/assets/package-lock.json
index 1f40ad8faab3..af3019fa9551 100644
--- a/apps/block_scout_web/assets/package-lock.json
+++ b/apps/block_scout_web/assets/package-lock.json
@@ -7,7 +7,7 @@
       "name": "blockscout",
       "license": "GPL-3.0",
       "dependencies": {
-        "@amplitude/analytics-browser": "^2.1.0",
+        "@amplitude/analytics-browser": "^2.1.1",
         "@fortawesome/fontawesome-free": "^6.4.0",
         "@tarekraafat/autocomplete.js": "^10.2.7",
         "@walletconnect/web3-provider": "^1.8.0",
@@ -107,15 +107,15 @@
       "version": "0.0.1"
     },
     "node_modules/@amplitude/analytics-browser": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/@amplitude/analytics-browser/-/analytics-browser-2.1.0.tgz",
-      "integrity": "sha512-9ejvQUR1mrD3Lc8eR03fMDlrfoBZmaiphmw8CZ/qJaKNJ/bu/rh3tBlmvCn1lG/ibxT24Ggtkqz93Xc/n3x0Yg==",
-      "dependencies": {
-        "@amplitude/analytics-client-common": "^2.0.2",
-        "@amplitude/analytics-core": "^2.0.2",
-        "@amplitude/analytics-types": "^2.1.0",
-        "@amplitude/plugin-page-view-tracking-browser": "^2.0.2",
-        "@amplitude/plugin-web-attribution-browser": "^2.0.2",
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/@amplitude/analytics-browser/-/analytics-browser-2.1.1.tgz",
+      "integrity": "sha512-fQbbPcIgfqqLZbQB9xUm4XXnxAJ+FJjvdH/TsKrT5/NPOOP6+t/quI4euYdj+3kZQI60KVhF6Z+PehwXlyfBEw==",
+      "dependencies": {
+        "@amplitude/analytics-client-common": "^2.0.3",
+        "@amplitude/analytics-core": "^2.0.3",
+        "@amplitude/analytics-types": "^2.1.1",
+        "@amplitude/plugin-page-view-tracking-browser": "^2.0.3",
+        "@amplitude/plugin-web-attribution-browser": "^2.0.3",
         "tslib": "^2.4.1"
       }
     },
@@ -125,20 +125,20 @@
       "integrity": "sha512-tGyy4dAjRIEwI7BzsB0lynWgOpfqjUdq91XXAlIWD2OwKBH7oCl/GZG/HT4BOHrTlPMOASlMQ7veyTqpmRcrNA=="
     },
     "node_modules/@amplitude/analytics-client-common": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/@amplitude/analytics-client-common/-/analytics-client-common-2.0.2.tgz",
-      "integrity": "sha512-Dqe9saZ5ag/ZknHlCYiu6oBOVjIU22Ta5EFtqI/lUm0XqaEdYBGduvlw5hwd8x7nmS6+5r4ip/nW1UoaciucDQ==",
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/@amplitude/analytics-client-common/-/analytics-client-common-2.0.3.tgz",
+      "integrity": "sha512-Sb5c3oHVnXosIgvgbBbSZJzvUt6vNgDZc4cNijR2QEWmRWbbUZcM1s5dwuV/0d4lIJA6n7Ewv60cGw1twn5zXw==",
       "dependencies": {
         "@amplitude/analytics-connector": "^1.4.8",
-        "@amplitude/analytics-core": "^2.0.2",
-        "@amplitude/analytics-types": "^2.1.0",
+        "@amplitude/analytics-core": "^2.0.3",
+        "@amplitude/analytics-types": "^2.1.1",
         "tslib": "^2.4.1"
       }
     },
     "node_modules/@amplitude/analytics-client-common/node_modules/tslib": {
-      "version": "2.5.3",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.5.3.tgz",
-      "integrity": "sha512-mSxlJJwl3BMEQCUNnxXBU9jP4JBktcEGhURcPR6VQVlnP0FdDEsIaz0C35dXNGLyRfrATNofF0F5p2KPxQgB+w=="
+      "version": "2.6.0",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.0.tgz",
+      "integrity": "sha512-7At1WUettjcSRHXCyYtTselblcHl9PJFFVKiCAy/bY97+BPZXSQ2wbq0P9s8tK2G7dFQfNnlJnPAiArVBVBsfA=="
     },
     "node_modules/@amplitude/analytics-connector": {
       "version": "1.4.8",
@@ -146,53 +146,54 @@
       "integrity": "sha512-dFW7c7Wb6Ng7vbmzwbaXZSpqfBx37ukamJV9ErFYYS8vGZK/Hkbt3M7fZHBI4WFU6CCwakr2ZXPme11uGPYWkQ=="
     },
     "node_modules/@amplitude/analytics-core": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/@amplitude/analytics-core/-/analytics-core-2.0.2.tgz",
-      "integrity": "sha512-9FHRRrSiVlg77jytV3ZKMMa/VMIUcR7QJejJDcwLTEbZLU9sWUH+y+msLyWpNu2h1bLJBNw1skcD1SvCGm3fnQ==",
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/@amplitude/analytics-core/-/analytics-core-2.0.3.tgz",
+      "integrity": "sha512-tpD1gCmPpzPNPumQT1ecOJtuan5OsQdKp9AX8YKc7t1/K3xHzGo3FH3JvdaAJVYYWeZV40bp/JL6wJiYIzyZjA==",
       "dependencies": {
-        "@amplitude/analytics-types": "^2.1.0",
+        "@amplitude/analytics-types": "^2.1.1",
         "tslib": "^2.4.1"
       }
     },
     "node_modules/@amplitude/analytics-core/node_modules/tslib": {
-      "version": "2.5.3",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.5.3.tgz",
-      "integrity": "sha512-mSxlJJwl3BMEQCUNnxXBU9jP4JBktcEGhURcPR6VQVlnP0FdDEsIaz0C35dXNGLyRfrATNofF0F5p2KPxQgB+w=="
+      "version": "2.6.0",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.0.tgz",
+      "integrity": "sha512-7At1WUettjcSRHXCyYtTselblcHl9PJFFVKiCAy/bY97+BPZXSQ2wbq0P9s8tK2G7dFQfNnlJnPAiArVBVBsfA=="
     },
     "node_modules/@amplitude/analytics-types": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/@amplitude/analytics-types/-/analytics-types-2.1.0.tgz",
-      "integrity": "sha512-HG6q+IfEjUg9K+em01+2uccebZVs4tiyMIGpBJ0U7G3swx3lEL7DtFn3uzDzSsp3QOc9rRfJglYy2tNkJRUo7g=="
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/@amplitude/analytics-types/-/analytics-types-2.1.1.tgz",
+      "integrity": "sha512-H3vebPR9onRdp0WzAZmI/4qmAE903uLOd2ZfMeHsVc1zaFTTCk46SoCuV4IrlF+VILrDw9Fy6gC9yl5N2PZcJQ=="
     },
     "node_modules/@amplitude/plugin-page-view-tracking-browser": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/@amplitude/plugin-page-view-tracking-browser/-/plugin-page-view-tracking-browser-2.0.2.tgz",
-      "integrity": "sha512-tYrQ5wwf3qeEhM173lKHXjdl2pOBd6HsjDpelfvzZRLuirGpiGDQZr52WQgKFP4iIZGIkiKtG//wNdswSJ926w==",
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/@amplitude/plugin-page-view-tracking-browser/-/plugin-page-view-tracking-browser-2.0.3.tgz",
+      "integrity": "sha512-Rqy/x2OOCipRV+YEp0TRB0Dig/9Wsu3I9X3/kMD015B8a17p44Rgob6gVJKXl4JgMtZb2ZMgq52gqgGwolqhMQ==",
       "dependencies": {
-        "@amplitude/analytics-client-common": "^2.0.2",
-        "@amplitude/analytics-types": "^2.1.0",
+        "@amplitude/analytics-client-common": "^2.0.3",
+        "@amplitude/analytics-types": "^2.1.1",
         "tslib": "^2.4.1"
       }
     },
     "node_modules/@amplitude/plugin-page-view-tracking-browser/node_modules/tslib": {
-      "version": "2.5.3",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.5.3.tgz",
-      "integrity": "sha512-mSxlJJwl3BMEQCUNnxXBU9jP4JBktcEGhURcPR6VQVlnP0FdDEsIaz0C35dXNGLyRfrATNofF0F5p2KPxQgB+w=="
+      "version": "2.6.0",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.0.tgz",
+      "integrity": "sha512-7At1WUettjcSRHXCyYtTselblcHl9PJFFVKiCAy/bY97+BPZXSQ2wbq0P9s8tK2G7dFQfNnlJnPAiArVBVBsfA=="
     },
     "node_modules/@amplitude/plugin-web-attribution-browser": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/@amplitude/plugin-web-attribution-browser/-/plugin-web-attribution-browser-2.0.2.tgz",
-      "integrity": "sha512-5hCYyH4zVisuQXDpUoj3E8QR3HQt6iggXxB/JYGJac4a9h8aun6iKJHHHCfpEC4V46xVTusDJ/KKINKhcypRSg==",
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/@amplitude/plugin-web-attribution-browser/-/plugin-web-attribution-browser-2.0.3.tgz",
+      "integrity": "sha512-WojjFTZ5fPCgwyY9lBYN9KXfm+5b6DlezAfEUe9IURRyyfGgCVJOL+BKAiMwP49wQiwwVNtP2SqcVSOQ+9tYjw==",
       "dependencies": {
-        "@amplitude/analytics-client-common": "^2.0.2",
-        "@amplitude/analytics-types": "^2.1.0",
+        "@amplitude/analytics-client-common": "^2.0.3",
+        "@amplitude/analytics-core": "^2.0.3",
+        "@amplitude/analytics-types": "^2.1.1",
         "tslib": "^2.4.1"
       }
     },
     "node_modules/@amplitude/plugin-web-attribution-browser/node_modules/tslib": {
-      "version": "2.5.3",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.5.3.tgz",
-      "integrity": "sha512-mSxlJJwl3BMEQCUNnxXBU9jP4JBktcEGhURcPR6VQVlnP0FdDEsIaz0C35dXNGLyRfrATNofF0F5p2KPxQgB+w=="
+      "version": "2.6.0",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.0.tgz",
+      "integrity": "sha512-7At1WUettjcSRHXCyYtTselblcHl9PJFFVKiCAy/bY97+BPZXSQ2wbq0P9s8tK2G7dFQfNnlJnPAiArVBVBsfA=="
     },
     "node_modules/@ampproject/remapping": {
       "version": "2.2.0",
@@ -17471,15 +17472,15 @@
   },
   "dependencies": {
     "@amplitude/analytics-browser": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/@amplitude/analytics-browser/-/analytics-browser-2.1.0.tgz",
-      "integrity": "sha512-9ejvQUR1mrD3Lc8eR03fMDlrfoBZmaiphmw8CZ/qJaKNJ/bu/rh3tBlmvCn1lG/ibxT24Ggtkqz93Xc/n3x0Yg==",
-      "requires": {
-        "@amplitude/analytics-client-common": "^2.0.2",
-        "@amplitude/analytics-core": "^2.0.2",
-        "@amplitude/analytics-types": "^2.1.0",
-        "@amplitude/plugin-page-view-tracking-browser": "^2.0.2",
-        "@amplitude/plugin-web-attribution-browser": "^2.0.2",
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/@amplitude/analytics-browser/-/analytics-browser-2.1.1.tgz",
+      "integrity": "sha512-fQbbPcIgfqqLZbQB9xUm4XXnxAJ+FJjvdH/TsKrT5/NPOOP6+t/quI4euYdj+3kZQI60KVhF6Z+PehwXlyfBEw==",
+      "requires": {
+        "@amplitude/analytics-client-common": "^2.0.3",
+        "@amplitude/analytics-core": "^2.0.3",
+        "@amplitude/analytics-types": "^2.1.1",
+        "@amplitude/plugin-page-view-tracking-browser": "^2.0.3",
+        "@amplitude/plugin-web-attribution-browser": "^2.0.3",
         "tslib": "^2.4.1"
       },
       "dependencies": {
@@ -17491,20 +17492,20 @@
       }
     },
     "@amplitude/analytics-client-common": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/@amplitude/analytics-client-common/-/analytics-client-common-2.0.2.tgz",
-      "integrity": "sha512-Dqe9saZ5ag/ZknHlCYiu6oBOVjIU22Ta5EFtqI/lUm0XqaEdYBGduvlw5hwd8x7nmS6+5r4ip/nW1UoaciucDQ==",
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/@amplitude/analytics-client-common/-/analytics-client-common-2.0.3.tgz",
+      "integrity": "sha512-Sb5c3oHVnXosIgvgbBbSZJzvUt6vNgDZc4cNijR2QEWmRWbbUZcM1s5dwuV/0d4lIJA6n7Ewv60cGw1twn5zXw==",
       "requires": {
         "@amplitude/analytics-connector": "^1.4.8",
-        "@amplitude/analytics-core": "^2.0.2",
-        "@amplitude/analytics-types": "^2.1.0",
+        "@amplitude/analytics-core": "^2.0.3",
+        "@amplitude/analytics-types": "^2.1.1",
         "tslib": "^2.4.1"
       },
       "dependencies": {
         "tslib": {
-          "version": "2.5.3",
-          "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.5.3.tgz",
-          "integrity": "sha512-mSxlJJwl3BMEQCUNnxXBU9jP4JBktcEGhURcPR6VQVlnP0FdDEsIaz0C35dXNGLyRfrATNofF0F5p2KPxQgB+w=="
+          "version": "2.6.0",
+          "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.0.tgz",
+          "integrity": "sha512-7At1WUettjcSRHXCyYtTselblcHl9PJFFVKiCAy/bY97+BPZXSQ2wbq0P9s8tK2G7dFQfNnlJnPAiArVBVBsfA=="
         }
       }
     },
@@ -17514,57 +17515,58 @@
       "integrity": "sha512-dFW7c7Wb6Ng7vbmzwbaXZSpqfBx37ukamJV9ErFYYS8vGZK/Hkbt3M7fZHBI4WFU6CCwakr2ZXPme11uGPYWkQ=="
     },
     "@amplitude/analytics-core": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/@amplitude/analytics-core/-/analytics-core-2.0.2.tgz",
-      "integrity": "sha512-9FHRRrSiVlg77jytV3ZKMMa/VMIUcR7QJejJDcwLTEbZLU9sWUH+y+msLyWpNu2h1bLJBNw1skcD1SvCGm3fnQ==",
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/@amplitude/analytics-core/-/analytics-core-2.0.3.tgz",
+      "integrity": "sha512-tpD1gCmPpzPNPumQT1ecOJtuan5OsQdKp9AX8YKc7t1/K3xHzGo3FH3JvdaAJVYYWeZV40bp/JL6wJiYIzyZjA==",
       "requires": {
-        "@amplitude/analytics-types": "^2.1.0",
+        "@amplitude/analytics-types": "^2.1.1",
         "tslib": "^2.4.1"
       },
       "dependencies": {
         "tslib": {
-          "version": "2.5.3",
-          "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.5.3.tgz",
-          "integrity": "sha512-mSxlJJwl3BMEQCUNnxXBU9jP4JBktcEGhURcPR6VQVlnP0FdDEsIaz0C35dXNGLyRfrATNofF0F5p2KPxQgB+w=="
+          "version": "2.6.0",
+          "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.0.tgz",
+          "integrity": "sha512-7At1WUettjcSRHXCyYtTselblcHl9PJFFVKiCAy/bY97+BPZXSQ2wbq0P9s8tK2G7dFQfNnlJnPAiArVBVBsfA=="
         }
       }
     },
     "@amplitude/analytics-types": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/@amplitude/analytics-types/-/analytics-types-2.1.0.tgz",
-      "integrity": "sha512-HG6q+IfEjUg9K+em01+2uccebZVs4tiyMIGpBJ0U7G3swx3lEL7DtFn3uzDzSsp3QOc9rRfJglYy2tNkJRUo7g=="
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/@amplitude/analytics-types/-/analytics-types-2.1.1.tgz",
+      "integrity": "sha512-H3vebPR9onRdp0WzAZmI/4qmAE903uLOd2ZfMeHsVc1zaFTTCk46SoCuV4IrlF+VILrDw9Fy6gC9yl5N2PZcJQ=="
     },
     "@amplitude/plugin-page-view-tracking-browser": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/@amplitude/plugin-page-view-tracking-browser/-/plugin-page-view-tracking-browser-2.0.2.tgz",
-      "integrity": "sha512-tYrQ5wwf3qeEhM173lKHXjdl2pOBd6HsjDpelfvzZRLuirGpiGDQZr52WQgKFP4iIZGIkiKtG//wNdswSJ926w==",
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/@amplitude/plugin-page-view-tracking-browser/-/plugin-page-view-tracking-browser-2.0.3.tgz",
+      "integrity": "sha512-Rqy/x2OOCipRV+YEp0TRB0Dig/9Wsu3I9X3/kMD015B8a17p44Rgob6gVJKXl4JgMtZb2ZMgq52gqgGwolqhMQ==",
       "requires": {
-        "@amplitude/analytics-client-common": "^2.0.2",
-        "@amplitude/analytics-types": "^2.1.0",
+        "@amplitude/analytics-client-common": "^2.0.3",
+        "@amplitude/analytics-types": "^2.1.1",
         "tslib": "^2.4.1"
       },
       "dependencies": {
         "tslib": {
-          "version": "2.5.3",
-          "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.5.3.tgz",
-          "integrity": "sha512-mSxlJJwl3BMEQCUNnxXBU9jP4JBktcEGhURcPR6VQVlnP0FdDEsIaz0C35dXNGLyRfrATNofF0F5p2KPxQgB+w=="
+          "version": "2.6.0",
+          "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.0.tgz",
+          "integrity": "sha512-7At1WUettjcSRHXCyYtTselblcHl9PJFFVKiCAy/bY97+BPZXSQ2wbq0P9s8tK2G7dFQfNnlJnPAiArVBVBsfA=="
         }
       }
     },
     "@amplitude/plugin-web-attribution-browser": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/@amplitude/plugin-web-attribution-browser/-/plugin-web-attribution-browser-2.0.2.tgz",
-      "integrity": "sha512-5hCYyH4zVisuQXDpUoj3E8QR3HQt6iggXxB/JYGJac4a9h8aun6iKJHHHCfpEC4V46xVTusDJ/KKINKhcypRSg==",
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/@amplitude/plugin-web-attribution-browser/-/plugin-web-attribution-browser-2.0.3.tgz",
+      "integrity": "sha512-WojjFTZ5fPCgwyY9lBYN9KXfm+5b6DlezAfEUe9IURRyyfGgCVJOL+BKAiMwP49wQiwwVNtP2SqcVSOQ+9tYjw==",
       "requires": {
-        "@amplitude/analytics-client-common": "^2.0.2",
-        "@amplitude/analytics-types": "^2.1.0",
+        "@amplitude/analytics-client-common": "^2.0.3",
+        "@amplitude/analytics-core": "^2.0.3",
+        "@amplitude/analytics-types": "^2.1.1",
         "tslib": "^2.4.1"
       },
       "dependencies": {
         "tslib": {
-          "version": "2.5.3",
-          "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.5.3.tgz",
-          "integrity": "sha512-mSxlJJwl3BMEQCUNnxXBU9jP4JBktcEGhURcPR6VQVlnP0FdDEsIaz0C35dXNGLyRfrATNofF0F5p2KPxQgB+w=="
+          "version": "2.6.0",
+          "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.0.tgz",
+          "integrity": "sha512-7At1WUettjcSRHXCyYtTselblcHl9PJFFVKiCAy/bY97+BPZXSQ2wbq0P9s8tK2G7dFQfNnlJnPAiArVBVBsfA=="
         }
       }
     },
diff --git a/apps/block_scout_web/assets/package.json b/apps/block_scout_web/assets/package.json
index 3c6542050219..ab61871fd8a3 100644
--- a/apps/block_scout_web/assets/package.json
+++ b/apps/block_scout_web/assets/package.json
@@ -20,7 +20,7 @@
   },
   "dependencies": {
     "@fortawesome/fontawesome-free": "^6.4.0",
-    "@amplitude/analytics-browser": "^2.1.0",
+    "@amplitude/analytics-browser": "^2.1.1",
     "@tarekraafat/autocomplete.js": "^10.2.7",
     "@walletconnect/web3-provider": "^1.8.0",
     "assert": "^2.0.0",

From 87179bdcc290f5745bc6497f2f7a33c1db887990 Mon Sep 17 00:00:00 2001
From: Nikita Pozdniakov <nikitosing4@mail.ru>
Date: Sun, 2 Jul 2023 12:25:31 +0300
Subject: [PATCH 143/909] API v2: Add block_number to logs

---
 .../lib/block_scout_web/views/api/v2/transaction_view.ex       | 3 ++-
 .../controllers/api/v2/address_controller_test.exs             | 1 +
 .../controllers/api/v2/transaction_controller_test.exs         | 1 +
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/apps/block_scout_web/lib/block_scout_web/views/api/v2/transaction_view.ex b/apps/block_scout_web/lib/block_scout_web/views/api/v2/transaction_view.ex
index 9c1eee2bc041..11cf2d03d363 100644
--- a/apps/block_scout_web/lib/block_scout_web/views/api/v2/transaction_view.ex
+++ b/apps/block_scout_web/lib/block_scout_web/views/api/v2/transaction_view.ex
@@ -284,7 +284,8 @@ defmodule BlockScoutWeb.API.V2.TransactionView do
       "data" => log.data,
       "index" => log.index,
       "decoded" => decoded,
-      "smart_contract" => smart_contract_info(transaction_or_hash)
+      "smart_contract" => smart_contract_info(transaction_or_hash),
+      "block_number" => log.block_number
     }
   end
 
diff --git a/apps/block_scout_web/test/block_scout_web/controllers/api/v2/address_controller_test.exs b/apps/block_scout_web/test/block_scout_web/controllers/api/v2/address_controller_test.exs
index 0515ce2449dd..1896b9149ad0 100644
--- a/apps/block_scout_web/test/block_scout_web/controllers/api/v2/address_controller_test.exs
+++ b/apps/block_scout_web/test/block_scout_web/controllers/api/v2/address_controller_test.exs
@@ -1728,6 +1728,7 @@ defmodule BlockScoutWeb.API.V2.AddressControllerTest do
     assert to_string(log.data) == json["data"]
     assert Address.checksum(log.address_hash) == json["address"]["hash"]
     assert to_string(log.transaction_hash) == json["tx_hash"]
+    assert json["block_number"] == log.block_number
   end
 
   defp compare_item(%Withdrawal{} = withdrawal, json) do
diff --git a/apps/block_scout_web/test/block_scout_web/controllers/api/v2/transaction_controller_test.exs b/apps/block_scout_web/test/block_scout_web/controllers/api/v2/transaction_controller_test.exs
index 944ee6c28326..eb110bf87dd2 100644
--- a/apps/block_scout_web/test/block_scout_web/controllers/api/v2/transaction_controller_test.exs
+++ b/apps/block_scout_web/test/block_scout_web/controllers/api/v2/transaction_controller_test.exs
@@ -976,6 +976,7 @@ defmodule BlockScoutWeb.API.V2.TransactionControllerTest do
     assert log.index == json["index"]
     assert Address.checksum(log.address_hash) == json["address"]["hash"]
     assert to_string(log.transaction_hash) == json["tx_hash"]
+    assert json["block_number"] == log.block_number
   end
 
   defp compare_item(%TokenTransfer{} = token_transfer, json) do

From 745c7d43543f8a6505c4dcf65b04fd4be2cfecdc Mon Sep 17 00:00:00 2001
From: Nikita Pozdniakov <nikitosing4@mail.ru>
Date: Sun, 2 Jul 2023 12:27:56 +0300
Subject: [PATCH 144/909] Changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f0add7eb8b36..a4e527694fdb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,6 +13,7 @@
 
 ### Chore
 
+- [#7832](https://github.com/blockscout/blockscout/pull/7832) - API v2: Add block_number to logs
 - [#7789](https://github.com/blockscout/blockscout/pull/7789) - Fix test warnings; Fix name of `MICROSERVICE_ETH_BYTECODE_DB_INTERVAL_BETWEEN_LOOKUPS` env variable
 - [#7819](https://github.com/blockscout/blockscout/pull/7819) - Add logging for unknown error verification result
 - [#7781](https://github.com/blockscout/blockscout/pull/7781) - Add `/api/v1/health/liveness` and `/api/v1/health/readiness`

From c7c01eab25752c80d21544d808626f45bdb0b607 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 3 Jul 2023 18:09:24 +0000
Subject: [PATCH 145/909] Bump gettext from 0.22.2 to 0.22.3

Bumps [gettext](https://github.com/elixir-gettext/gettext) from 0.22.2 to 0.22.3.
- [Changelog](https://github.com/elixir-gettext/gettext/blob/main/CHANGELOG.md)
- [Commits](https://github.com/elixir-gettext/gettext/compare/v0.22.2...v0.22.3)

---
updated-dependencies:
- dependency-name: gettext
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 mix.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mix.lock b/mix.lock
index b058a11b1e9f..3230fec905c5 100644
--- a/mix.lock
+++ b/mix.lock
@@ -62,7 +62,7 @@
   "floki": {:hex, :floki, "0.34.3", "5e2dcaec5d7c228ce5b1d3501502e308b2d79eb655e4191751a1fe491c37feac", [:mix], [], "hexpm", "9577440eea5b97924b4bf3c7ea55f7b8b6dce589f9b28b096cc294a8dc342341"},
   "flow": {:hex, :flow, "1.2.4", "1dd58918287eb286656008777cb32714b5123d3855956f29aa141ebae456922d", [:mix], [{:gen_stage, "~> 1.0", [hex: :gen_stage, repo: "hexpm", optional: false]}], "hexpm", "874adde96368e71870f3510b91e35bc31652291858c86c0e75359cbdd35eb211"},
   "gen_stage": {:hex, :gen_stage, "1.2.1", "19d8b5e9a5996d813b8245338a28246307fd8b9c99d1237de199d21efc4c76a1", [:mix], [], "hexpm", "83e8be657fa05b992ffa6ac1e3af6d57aa50aace8f691fcf696ff02f8335b001"},
-  "gettext": {:hex, :gettext, "0.22.2", "6bfca374de34ecc913a28ba391ca184d88d77810a3e427afa8454a71a51341ac", [:mix], [{:expo, "~> 0.4.0", [hex: :expo, repo: "hexpm", optional: false]}], "hexpm", "8a2d389673aea82d7eae387e6a2ccc12660610080ae7beb19452cfdc1ec30f60"},
+  "gettext": {:hex, :gettext, "0.22.3", "c8273e78db4a0bb6fba7e9f0fd881112f349a3117f7f7c598fa18c66c888e524", [:mix], [{:expo, "~> 0.4.0", [hex: :expo, repo: "hexpm", optional: false]}], "hexpm", "935f23447713954a6866f1bb28c3a878c4c011e802bcd68a726f5e558e4b64bd"},
   "hackney": {:hex, :hackney, "1.18.1", "f48bf88f521f2a229fc7bae88cf4f85adc9cd9bcf23b5dc8eb6a1788c662c4f6", [:rebar3], [{:certifi, "~>2.9.0", [hex: :certifi, repo: "hexpm", optional: false]}, {:idna, "~>6.1.0", [hex: :idna, repo: "hexpm", optional: false]}, {:metrics, "~>1.0.0", [hex: :metrics, repo: "hexpm", optional: false]}, {:mimerl, "~>1.1", [hex: :mimerl, repo: "hexpm", optional: false]}, {:parse_trans, "3.3.1", [hex: :parse_trans, repo: "hexpm", optional: false]}, {:ssl_verify_fun, "~>1.1.0", [hex: :ssl_verify_fun, repo: "hexpm", optional: false]}, {:unicode_util_compat, "~>0.7.0", [hex: :unicode_util_compat, repo: "hexpm", optional: false]}], "hexpm", "a4ecdaff44297e9b5894ae499e9a070ea1888c84afdd1fd9b7b2bc384950128e"},
   "hammer": {:hex, :hammer, "6.1.0", "f263e3c3e9946bd410ea0336b2abe0cb6260af4afb3a221e1027540706e76c55", [:make, :mix], [{:poolboy, "~> 1.5", [hex: :poolboy, repo: "hexpm", optional: false]}], "hexpm", "b47e415a562a6d072392deabcd58090d8a41182cf9044cdd6b0d0faaaf68ba57"},
   "hammer_backend_redis": {:hex, :hammer_backend_redis, "6.1.2", "eb296bb4924928e24135308b2afc189201fd09411c870c6bbadea444a49b2f2c", [:mix], [{:hammer, "~> 6.0", [hex: :hammer, repo: "hexpm", optional: false]}, {:redix, "~> 1.1", [hex: :redix, repo: "hexpm", optional: false]}], "hexpm", "217ea066278910543a5e9b577d5bf2425419446b94fe76bdd9f255f39feec9fa"},

From c366b2069f97c3623b2540b84f521bd69808157d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 3 Jul 2023 18:46:58 +0000
Subject: [PATCH 146/909] Bump photoswipe from 5.3.7 to 5.3.8 in
 /apps/block_scout_web/assets

Bumps [photoswipe](https://github.com/dimsemenov/Photoswipe) from 5.3.7 to 5.3.8.
- [Release notes](https://github.com/dimsemenov/Photoswipe/releases)
- [Commits](https://github.com/dimsemenov/Photoswipe/compare/v5.3.7...v5.3.8)

---
updated-dependencies:
- dependency-name: photoswipe
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 apps/block_scout_web/assets/package-lock.json | 14 +++++++-------
 apps/block_scout_web/assets/package.json      |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/apps/block_scout_web/assets/package-lock.json b/apps/block_scout_web/assets/package-lock.json
index af3019fa9551..c0fcc41202ae 100644
--- a/apps/block_scout_web/assets/package-lock.json
+++ b/apps/block_scout_web/assets/package-lock.json
@@ -54,7 +54,7 @@
         "path-parser": "^6.1.0",
         "phoenix": "file:../../../deps/phoenix",
         "phoenix_html": "file:../../../deps/phoenix_html",
-        "photoswipe": "^5.3.7",
+        "photoswipe": "^5.3.8",
         "pikaday": "^1.8.2",
         "popper.js": "^1.14.7",
         "reduce-reducers": "^1.0.4",
@@ -13342,9 +13342,9 @@
       "link": true
     },
     "node_modules/photoswipe": {
-      "version": "5.3.7",
-      "resolved": "https://registry.npmjs.org/photoswipe/-/photoswipe-5.3.7.tgz",
-      "integrity": "sha512-zsyLsTTLFrj0XR1m4/hO7qNooboFKUrDy+Zt5i2d6qjFPAtBjzaj/Xtydso4uxzcXpcqbTmyxDibb3BcSISseg==",
+      "version": "5.3.8",
+      "resolved": "https://registry.npmjs.org/photoswipe/-/photoswipe-5.3.8.tgz",
+      "integrity": "sha512-4vTzOQt8GP4Chsm0s+8j2xDtVHAEN252PxrU12A1zXauNn0zD5HRHgjALKO2GKTyBnTnOrJUOxbV8LTrFIMrYw==",
       "engines": {
         "node": ">= 0.12.0"
       }
@@ -27602,9 +27602,9 @@
       "version": "file:../../../deps/phoenix_html"
     },
     "photoswipe": {
-      "version": "5.3.7",
-      "resolved": "https://registry.npmjs.org/photoswipe/-/photoswipe-5.3.7.tgz",
-      "integrity": "sha512-zsyLsTTLFrj0XR1m4/hO7qNooboFKUrDy+Zt5i2d6qjFPAtBjzaj/Xtydso4uxzcXpcqbTmyxDibb3BcSISseg=="
+      "version": "5.3.8",
+      "resolved": "https://registry.npmjs.org/photoswipe/-/photoswipe-5.3.8.tgz",
+      "integrity": "sha512-4vTzOQt8GP4Chsm0s+8j2xDtVHAEN252PxrU12A1zXauNn0zD5HRHgjALKO2GKTyBnTnOrJUOxbV8LTrFIMrYw=="
     },
     "picocolors": {
       "version": "1.0.0",
diff --git a/apps/block_scout_web/assets/package.json b/apps/block_scout_web/assets/package.json
index ab61871fd8a3..9f0fc6dedc5d 100644
--- a/apps/block_scout_web/assets/package.json
+++ b/apps/block_scout_web/assets/package.json
@@ -66,7 +66,7 @@
     "path-parser": "^6.1.0",
     "phoenix": "file:../../../deps/phoenix",
     "phoenix_html": "file:../../../deps/phoenix_html",
-    "photoswipe": "^5.3.7",
+    "photoswipe": "^5.3.8",
     "pikaday": "^1.8.2",
     "popper.js": "^1.14.7",
     "reduce-reducers": "^1.0.4",

From c2cdaf8c5ce844fe85c1983ae20ef9c35e9511fe Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 3 Jul 2023 18:47:17 +0000
Subject: [PATCH 147/909] Bump eslint from 8.43.0 to 8.44.0 in
 /apps/block_scout_web/assets

Bumps [eslint](https://github.com/eslint/eslint) from 8.43.0 to 8.44.0.
- [Release notes](https://github.com/eslint/eslint/releases)
- [Changelog](https://github.com/eslint/eslint/blob/main/CHANGELOG.md)
- [Commits](https://github.com/eslint/eslint/compare/v8.43.0...v8.44.0)

---
updated-dependencies:
- dependency-name: eslint
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 apps/block_scout_web/assets/package-lock.json | 121 ++++++++++--------
 apps/block_scout_web/assets/package.json      |   2 +-
 2 files changed, 69 insertions(+), 54 deletions(-)

diff --git a/apps/block_scout_web/assets/package-lock.json b/apps/block_scout_web/assets/package-lock.json
index af3019fa9551..1d019ede8af3 100644
--- a/apps/block_scout_web/assets/package-lock.json
+++ b/apps/block_scout_web/assets/package-lock.json
@@ -78,7 +78,7 @@
         "copy-webpack-plugin": "^11.0.0",
         "css-loader": "^5.2.7",
         "css-minimizer-webpack-plugin": "^5.0.1",
-        "eslint": "^8.43.0",
+        "eslint": "^8.44.0",
         "eslint-config-standard": "^17.1.0",
         "eslint-plugin-import": "^2.27.5",
         "eslint-plugin-node": "^11.1.0",
@@ -106,6 +106,15 @@
     "../../../deps/phoenix_html": {
       "version": "0.0.1"
     },
+    "node_modules/@aashutoshrathi/word-wrap": {
+      "version": "1.2.6",
+      "resolved": "https://registry.npmjs.org/@aashutoshrathi/word-wrap/-/word-wrap-1.2.6.tgz",
+      "integrity": "sha512-1Yjs2SvM8TflER/OD3cOjhWWOZb58A2t7wpE2S9XfBYTiIl+XFhQG2bjy4Pu1I+EAlCNUzRDYDdFwFYUKvXcIA==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/@amplitude/analytics-browser": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/@amplitude/analytics-browser/-/analytics-browser-2.1.1.tgz",
@@ -2073,14 +2082,14 @@
       }
     },
     "node_modules/@eslint/eslintrc": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.0.3.tgz",
-      "integrity": "sha512-+5gy6OQfk+xx3q0d6jGZZC3f3KzAkXc/IanVxd1is/VIIziRqqt3ongQz0FiTUXqTk0c7aDB3OaFuKnuSoJicQ==",
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.1.0.tgz",
+      "integrity": "sha512-Lj7DECXqIVCqnqjjHMPna4vn6GJcMgul/wuS0je9OZ9gsL0zzDpKPVtcG1HaDVc+9y+qgXneTeUMbCqXJNpH1A==",
       "dev": true,
       "dependencies": {
         "ajv": "^6.12.4",
         "debug": "^4.3.2",
-        "espree": "^9.5.2",
+        "espree": "^9.6.0",
         "globals": "^13.19.0",
         "ignore": "^5.2.0",
         "import-fresh": "^3.2.1",
@@ -2141,9 +2150,9 @@
       }
     },
     "node_modules/@eslint/js": {
-      "version": "8.43.0",
-      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.43.0.tgz",
-      "integrity": "sha512-s2UHCoiXfxMvmfzqoN+vrQ84ahUSYde9qNO1MdxmoEhyHWsfmwOpFlwYV+ePJEVc7gFnATGUi376WowX1N7tFg==",
+      "version": "8.44.0",
+      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.44.0.tgz",
+      "integrity": "sha512-Ag+9YM4ocKQx9AarydN0KY2j0ErMHNIocPDrVo8zAE44xLTjEtz81OdR68/cydGtk6m6jDb5Za3r2useMzYmSw==",
       "dev": true,
       "engines": {
         "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
@@ -4181,9 +4190,9 @@
       }
     },
     "node_modules/acorn": {
-      "version": "8.8.0",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.8.0.tgz",
-      "integrity": "sha512-QOxyigPVrpZ2GXT+PFyZTl6TtOFc5egxHIP9IlQ+RbupQuX4RkT/Bee4/kQuC02Xkzg84JcT7oLYtDIQxp+v7w==",
+      "version": "8.9.0",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.9.0.tgz",
+      "integrity": "sha512-jaVNAFBHNLXspO543WnNNPZFRtavh3skAkITqD0/2aeMkKZTN+254PyhwxFYrk3vQ1xfY+2wbesJMs/JC8/PwQ==",
       "dev": true,
       "bin": {
         "acorn": "bin/acorn"
@@ -7115,15 +7124,15 @@
       }
     },
     "node_modules/eslint": {
-      "version": "8.43.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.43.0.tgz",
-      "integrity": "sha512-aaCpf2JqqKesMFGgmRPessmVKjcGXqdlAYLLC3THM8t5nBRZRQ+st5WM/hoJXkdioEXLLbXgclUpM0TXo5HX5Q==",
+      "version": "8.44.0",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.44.0.tgz",
+      "integrity": "sha512-0wpHoUbDUHgNCyvFB5aXLiQVfK9B0at6gUvzy83k4kAsQ/u769TQDX6iKC+aO4upIHO9WSaA3QoXYQDHbNwf1A==",
       "dev": true,
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.2.0",
         "@eslint-community/regexpp": "^4.4.0",
-        "@eslint/eslintrc": "^2.0.3",
-        "@eslint/js": "8.43.0",
+        "@eslint/eslintrc": "^2.1.0",
+        "@eslint/js": "8.44.0",
         "@humanwhocodes/config-array": "^0.11.10",
         "@humanwhocodes/module-importer": "^1.0.1",
         "@nodelib/fs.walk": "^1.2.8",
@@ -7135,7 +7144,7 @@
         "escape-string-regexp": "^4.0.0",
         "eslint-scope": "^7.2.0",
         "eslint-visitor-keys": "^3.4.1",
-        "espree": "^9.5.2",
+        "espree": "^9.6.0",
         "esquery": "^1.4.2",
         "esutils": "^2.0.2",
         "fast-deep-equal": "^3.1.3",
@@ -7155,7 +7164,7 @@
         "lodash.merge": "^4.6.2",
         "minimatch": "^3.1.2",
         "natural-compare": "^1.4.0",
-        "optionator": "^0.9.1",
+        "optionator": "^0.9.3",
         "strip-ansi": "^6.0.1",
         "strip-json-comments": "^3.1.0",
         "text-table": "^0.2.0"
@@ -7694,12 +7703,12 @@
       }
     },
     "node_modules/espree": {
-      "version": "9.5.2",
-      "resolved": "https://registry.npmjs.org/espree/-/espree-9.5.2.tgz",
-      "integrity": "sha512-7OASN1Wma5fum5SrNhFMAMJxOUAbhyfQ8dQ//PJaJbNw0URTPWqIghHWt1MmAANKhHZIYOHruW4Kw4ruUWOdGw==",
+      "version": "9.6.0",
+      "resolved": "https://registry.npmjs.org/espree/-/espree-9.6.0.tgz",
+      "integrity": "sha512-1FH/IiruXZ84tpUlm0aCUEwMl2Ho5ilqVh0VvQXw+byAz/4SAciyHLlfmL5WYqsvD38oymdUwBss0LtK8m4s/A==",
       "dev": true,
       "dependencies": {
-        "acorn": "^8.8.0",
+        "acorn": "^8.9.0",
         "acorn-jsx": "^5.3.2",
         "eslint-visitor-keys": "^3.4.1"
       },
@@ -13105,17 +13114,17 @@
       }
     },
     "node_modules/optionator": {
-      "version": "0.9.1",
-      "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.1.tgz",
-      "integrity": "sha512-74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw==",
+      "version": "0.9.3",
+      "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.3.tgz",
+      "integrity": "sha512-JjCoypp+jKn1ttEFExxhetCKeJt9zhAgAve5FXHixTvFDW/5aEktX9bufBKLRRMdU7bNtpLfcGu94B3cdEJgjg==",
       "dev": true,
       "dependencies": {
+        "@aashutoshrathi/word-wrap": "^1.2.3",
         "deep-is": "^0.1.3",
         "fast-levenshtein": "^2.0.6",
         "levn": "^0.4.1",
         "prelude-ls": "^1.2.1",
-        "type-check": "^0.4.0",
-        "word-wrap": "^1.2.3"
+        "type-check": "^0.4.0"
       },
       "engines": {
         "node": ">= 0.8.0"
@@ -17471,6 +17480,12 @@
     }
   },
   "dependencies": {
+    "@aashutoshrathi/word-wrap": {
+      "version": "1.2.6",
+      "resolved": "https://registry.npmjs.org/@aashutoshrathi/word-wrap/-/word-wrap-1.2.6.tgz",
+      "integrity": "sha512-1Yjs2SvM8TflER/OD3cOjhWWOZb58A2t7wpE2S9XfBYTiIl+XFhQG2bjy4Pu1I+EAlCNUzRDYDdFwFYUKvXcIA==",
+      "dev": true
+    },
     "@amplitude/analytics-browser": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/@amplitude/analytics-browser/-/analytics-browser-2.1.1.tgz",
@@ -18891,14 +18906,14 @@
       "dev": true
     },
     "@eslint/eslintrc": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.0.3.tgz",
-      "integrity": "sha512-+5gy6OQfk+xx3q0d6jGZZC3f3KzAkXc/IanVxd1is/VIIziRqqt3ongQz0FiTUXqTk0c7aDB3OaFuKnuSoJicQ==",
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.1.0.tgz",
+      "integrity": "sha512-Lj7DECXqIVCqnqjjHMPna4vn6GJcMgul/wuS0je9OZ9gsL0zzDpKPVtcG1HaDVc+9y+qgXneTeUMbCqXJNpH1A==",
       "dev": true,
       "requires": {
         "ajv": "^6.12.4",
         "debug": "^4.3.2",
-        "espree": "^9.5.2",
+        "espree": "^9.6.0",
         "globals": "^13.19.0",
         "ignore": "^5.2.0",
         "import-fresh": "^3.2.1",
@@ -18940,9 +18955,9 @@
       }
     },
     "@eslint/js": {
-      "version": "8.43.0",
-      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.43.0.tgz",
-      "integrity": "sha512-s2UHCoiXfxMvmfzqoN+vrQ84ahUSYde9qNO1MdxmoEhyHWsfmwOpFlwYV+ePJEVc7gFnATGUi376WowX1N7tFg==",
+      "version": "8.44.0",
+      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.44.0.tgz",
+      "integrity": "sha512-Ag+9YM4ocKQx9AarydN0KY2j0ErMHNIocPDrVo8zAE44xLTjEtz81OdR68/cydGtk6m6jDb5Za3r2useMzYmSw==",
       "dev": true
     },
     "@ethereumjs/common": {
@@ -20530,9 +20545,9 @@
       }
     },
     "acorn": {
-      "version": "8.8.0",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.8.0.tgz",
-      "integrity": "sha512-QOxyigPVrpZ2GXT+PFyZTl6TtOFc5egxHIP9IlQ+RbupQuX4RkT/Bee4/kQuC02Xkzg84JcT7oLYtDIQxp+v7w==",
+      "version": "8.9.0",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.9.0.tgz",
+      "integrity": "sha512-jaVNAFBHNLXspO543WnNNPZFRtavh3skAkITqD0/2aeMkKZTN+254PyhwxFYrk3vQ1xfY+2wbesJMs/JC8/PwQ==",
       "dev": true
     },
     "acorn-globals": {
@@ -22771,15 +22786,15 @@
       }
     },
     "eslint": {
-      "version": "8.43.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.43.0.tgz",
-      "integrity": "sha512-aaCpf2JqqKesMFGgmRPessmVKjcGXqdlAYLLC3THM8t5nBRZRQ+st5WM/hoJXkdioEXLLbXgclUpM0TXo5HX5Q==",
+      "version": "8.44.0",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.44.0.tgz",
+      "integrity": "sha512-0wpHoUbDUHgNCyvFB5aXLiQVfK9B0at6gUvzy83k4kAsQ/u769TQDX6iKC+aO4upIHO9WSaA3QoXYQDHbNwf1A==",
       "dev": true,
       "requires": {
         "@eslint-community/eslint-utils": "^4.2.0",
         "@eslint-community/regexpp": "^4.4.0",
-        "@eslint/eslintrc": "^2.0.3",
-        "@eslint/js": "8.43.0",
+        "@eslint/eslintrc": "^2.1.0",
+        "@eslint/js": "8.44.0",
         "@humanwhocodes/config-array": "^0.11.10",
         "@humanwhocodes/module-importer": "^1.0.1",
         "@nodelib/fs.walk": "^1.2.8",
@@ -22791,7 +22806,7 @@
         "escape-string-regexp": "^4.0.0",
         "eslint-scope": "^7.2.0",
         "eslint-visitor-keys": "^3.4.1",
-        "espree": "^9.5.2",
+        "espree": "^9.6.0",
         "esquery": "^1.4.2",
         "esutils": "^2.0.2",
         "fast-deep-equal": "^3.1.3",
@@ -22811,7 +22826,7 @@
         "lodash.merge": "^4.6.2",
         "minimatch": "^3.1.2",
         "natural-compare": "^1.4.0",
-        "optionator": "^0.9.1",
+        "optionator": "^0.9.3",
         "strip-ansi": "^6.0.1",
         "strip-json-comments": "^3.1.0",
         "text-table": "^0.2.0"
@@ -23170,12 +23185,12 @@
       "dev": true
     },
     "espree": {
-      "version": "9.5.2",
-      "resolved": "https://registry.npmjs.org/espree/-/espree-9.5.2.tgz",
-      "integrity": "sha512-7OASN1Wma5fum5SrNhFMAMJxOUAbhyfQ8dQ//PJaJbNw0URTPWqIghHWt1MmAANKhHZIYOHruW4Kw4ruUWOdGw==",
+      "version": "9.6.0",
+      "resolved": "https://registry.npmjs.org/espree/-/espree-9.6.0.tgz",
+      "integrity": "sha512-1FH/IiruXZ84tpUlm0aCUEwMl2Ho5ilqVh0VvQXw+byAz/4SAciyHLlfmL5WYqsvD38oymdUwBss0LtK8m4s/A==",
       "dev": true,
       "requires": {
-        "acorn": "^8.8.0",
+        "acorn": "^8.9.0",
         "acorn-jsx": "^5.3.2",
         "eslint-visitor-keys": "^3.4.1"
       }
@@ -27422,17 +27437,17 @@
       }
     },
     "optionator": {
-      "version": "0.9.1",
-      "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.1.tgz",
-      "integrity": "sha512-74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw==",
+      "version": "0.9.3",
+      "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.3.tgz",
+      "integrity": "sha512-JjCoypp+jKn1ttEFExxhetCKeJt9zhAgAve5FXHixTvFDW/5aEktX9bufBKLRRMdU7bNtpLfcGu94B3cdEJgjg==",
       "dev": true,
       "requires": {
+        "@aashutoshrathi/word-wrap": "^1.2.3",
         "deep-is": "^0.1.3",
         "fast-levenshtein": "^2.0.6",
         "levn": "^0.4.1",
         "prelude-ls": "^1.2.1",
-        "type-check": "^0.4.0",
-        "word-wrap": "^1.2.3"
+        "type-check": "^0.4.0"
       }
     },
     "os-browserify": {
diff --git a/apps/block_scout_web/assets/package.json b/apps/block_scout_web/assets/package.json
index ab61871fd8a3..10450a24f1da 100644
--- a/apps/block_scout_web/assets/package.json
+++ b/apps/block_scout_web/assets/package.json
@@ -90,7 +90,7 @@
     "copy-webpack-plugin": "^11.0.0",
     "css-loader": "^5.2.7",
     "css-minimizer-webpack-plugin": "^5.0.1",
-    "eslint": "^8.43.0",
+    "eslint": "^8.44.0",
     "eslint-config-standard": "^17.1.0",
     "eslint-plugin-import": "^2.27.5",
     "eslint-plugin-node": "^11.1.0",

From be743ff08947f4e44e9628ceb9863493ad87bafb Mon Sep 17 00:00:00 2001
From: Chris Ciszak <chris.ciszak@gmail.com>
Date: Tue, 4 Jul 2023 09:03:56 +0100
Subject: [PATCH 148/909] fix nginx config for UI 2.0 websocket (#7825)

* fix nginx config for UI 2.0 websocket

* update change log
---
 CHANGELOG.md                    | 2 +-
 docker-compose/proxy/nginx.conf | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index fe99560d8dc0..73378e7d954f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,7 +7,7 @@
 - [#7811](https://github.com/blockscout/blockscout/pull/7811) - Filter addresses before insertion
 
 ### Fixes
-
+- [#7825](https://github.com/blockscout/blockscout/pull/7825) - Fix nginx config for the new frontend websockets
 - [#7772](https://github.com/blockscout/blockscout/pull/7772) - Fix parsing of database password period(s)
 - [#7803](https://github.com/blockscout/blockscout/pull/7803) - Fix additional sources and interfaces, save names for vyper contracts
 - [#7758](https://github.com/blockscout/blockscout/pull/7758) - Remove limit for configurable fetchers
diff --git a/docker-compose/proxy/nginx.conf b/docker-compose/proxy/nginx.conf
index 5df8ddd1187d..1b88890635db 100644
--- a/docker-compose/proxy/nginx.conf
+++ b/docker-compose/proxy/nginx.conf
@@ -17,4 +17,11 @@ server {
     location /api/v1/lines {
         proxy_pass          http://stats:8050/api/v1/lines;
     }
+    location /socket/v2 {
+        proxy_pass http://backend:4000;
+        proxy_http_version 1.1;
+        proxy_set_header Upgrade $http_upgrade;
+        proxy_set_header Connection "Upgrade";
+        proxy_set_header Host $host;
+    }
 }
\ No newline at end of file

From e24116988c35a34706687205634f9711c164f813 Mon Sep 17 00:00:00 2001
From: Victor Baranov <baranov.viktor.27@gmail.com>
Date: Tue, 4 Jul 2023 11:21:18 +0300
Subject: [PATCH 149/909] CORS setup for docker-compose config with new
 frontend (#7841)

* CORS setup for docker-compose with new frontend

* Add NEXT_PUBLIC_API_WEBSOCKET_PROTOCOL=ws for docker compose with new frontend
---
 CHANGELOG.md                                  |  1 +
 docker-compose/envs/common-frontend.env       |  5 +-
 docker-compose/proxy/nginx.conf               | 51 ++++++++++++++++---
 .../services/docker-compose-nginx.yml         |  4 +-
 4 files changed, 50 insertions(+), 11 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 73378e7d954f..6e28bf394b2c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -15,6 +15,7 @@
 
 ### Chore
 
+- [#7841](https://github.com/blockscout/blockscout/pull/7841) - CORS setup for docker-compose config with new frontend
 - [#7832](https://github.com/blockscout/blockscout/pull/7832) - API v2: Add block_number to logs
 - [#7789](https://github.com/blockscout/blockscout/pull/7789) - Fix test warnings; Fix name of `MICROSERVICE_ETH_BYTECODE_DB_INTERVAL_BETWEEN_LOOKUPS` env variable
 - [#7819](https://github.com/blockscout/blockscout/pull/7819) - Add logging for unknown error verification result
diff --git a/docker-compose/envs/common-frontend.env b/docker-compose/envs/common-frontend.env
index 9f75a9c50e12..84da58952bc6 100644
--- a/docker-compose/envs/common-frontend.env
+++ b/docker-compose/envs/common-frontend.env
@@ -1,7 +1,7 @@
 NEXT_PUBLIC_API_HOST=localhost
-NEXT_PUBLIC_STATS_API_HOST=http://localhost
-NEXT_PUBLIC_API_PORT=80
+NEXT_PUBLIC_API_PORT=81
 NEXT_PUBLIC_API_PROTOCOL=http
+NEXT_PUBLIC_STATS_API_HOST=http://localhost:82
 NEXT_PUBLIC_NETWORK_NAME=Göerli
 NEXT_PUBLIC_NETWORK_SHORT_NAME=Göerli
 NEXT_PUBLIC_NETWORK_ASSETS_PATHNAME=ethereum
@@ -23,3 +23,4 @@ NEXT_PUBLIC_NETWORK_LOGO=https://raw.githubusercontent.com/blockscout/frontend-c
 NEXT_PUBLIC_NETWORK_ICON=https://raw.githubusercontent.com/blockscout/frontend-configs/main/configs/network-icons/goerli.svg
 NEXT_PUBLIC_HOMEPAGE_PLATE_GRADIENT="radial-gradient(103.03% 103.03% at 0% 0%, rgba(183, 148, 244, 0.8) 0%, rgba(0, 163, 196, 0.8) 100%)"
 NEXT_PUBLIC_HOMEPAGE_PLATE_TEXT_COLOR="rgb(255, 255, 255)"
+NEXT_PUBLIC_API_WEBSOCKET_PROTOCOL='ws'
diff --git a/docker-compose/proxy/nginx.conf b/docker-compose/proxy/nginx.conf
index 1b88890635db..d20a44c819eb 100644
--- a/docker-compose/proxy/nginx.conf
+++ b/docker-compose/proxy/nginx.conf
@@ -5,17 +5,52 @@ server {
     location / {
         proxy_pass          http://frontend:3000;
     }
-    location /api/v2 {
-        proxy_pass          http://backend:4000/api/v2;
+    location /socket/v2 {
+        proxy_pass http://backend:4000;
+        proxy_http_version 1.1;
+        proxy_set_header Upgrade $http_upgrade;
+        proxy_set_header Connection "Upgrade";
+        proxy_set_header Host $host;
+    }
+    location /api/ {
+        proxy_pass          http://backend:4000/api;
     }
-    location /api/account/v1 {
-        proxy_pass          http://backend:4000/api/account/v1;
+}
+
+server {
+    listen       81;
+    server_name  localhost;
+    proxy_http_version 1.1;
+    proxy_hide_header Access-Control-Allow-Origin;
+    proxy_hide_header Access-Control-Allow-Methods;
+    add_header 'Access-Control-Allow-Origin' 'http://localhost' always;
+    add_header 'Access-Control-Allow-Methods' 'PUT, GET, POST, OPTIONS, DELETE, PATCH' always;
+
+    location / {
+        proxy_pass          http://backend:4000;
     }
-    location /api/v1/counters {
-        proxy_pass          http://stats:8050/api/v1/counters;
+
+    location /socket {
+        proxy_pass http://backend:4000;
+        proxy_http_version 1.1;
+        proxy_set_header Upgrade $http_upgrade;
+        proxy_set_header Connection "Upgrade";
+        proxy_set_header Host $host;
     }
-    location /api/v1/lines {
-        proxy_pass          http://stats:8050/api/v1/lines;
+}
+
+server {
+    listen       82;
+    server_name  localhost;
+    proxy_http_version 1.1;
+    proxy_hide_header Access-Control-Allow-Origin;
+    proxy_hide_header Access-Control-Allow-Methods;
+    add_header 'Access-Control-Allow-Origin' 'http://localhost' always;
+    add_header 'Access-Control-Allow-Credentials' 'true' always;
+    add_header 'Access-Control-Allow-Methods' 'PUT, GET, POST, OPTIONS, DELETE, PATCH' always;
+
+    location / {
+        proxy_pass          http://stats:8050;
     }
     location /socket/v2 {
         proxy_pass http://backend:4000;
diff --git a/docker-compose/services/docker-compose-nginx.yml b/docker-compose/services/docker-compose-nginx.yml
index 79ede9d9626e..2d2bd87dc127 100644
--- a/docker-compose/services/docker-compose-nginx.yml
+++ b/docker-compose/services/docker-compose-nginx.yml
@@ -9,4 +9,6 @@ services:
         target: /etc/nginx/conf.d/default.conf
         read_only: true
     ports:
-      - 80:80
\ No newline at end of file
+      - 80:80
+      - 81:81
+      - 82:82
\ No newline at end of file

From ae8bad1f57cb917e8136c4f915ce563372f67785 Mon Sep 17 00:00:00 2001
From: Viktor Baranov <baranov.viktor.27@gmail.com>
Date: Tue, 4 Jul 2023 12:42:42 +0300
Subject: [PATCH 150/909] Update .tool-versions

---
 .tool-versions | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.tool-versions b/.tool-versions
index 44d2a271304f..45a68c2a12b2 100644
--- a/.tool-versions
+++ b/.tool-versions
@@ -1,3 +1,3 @@
 elixir 1.14.5-otp-25
-erlang 25.3
-nodejs 18.13.0
+erlang 25.3.2.3
+nodejs 18.16.1

From cbe6bdcc553da9d2ffc4b03d851318d4b11f6acd Mon Sep 17 00:00:00 2001
From: Qwerty5Uiop <alex000010@bk.ru>
Date: Tue, 4 Jul 2023 13:46:34 +0400
Subject: [PATCH 151/909] Fix created_contract_code_indexed_at updating

---
 CHANGELOG.md                                  |  1 +
 .../explorer/chain/import/runner/addresses.ex | 22 +++++++++++++------
 2 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6e28bf394b2c..9f5e16b95891 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,6 +12,7 @@
 - [#7803](https://github.com/blockscout/blockscout/pull/7803) - Fix additional sources and interfaces, save names for vyper contracts
 - [#7758](https://github.com/blockscout/blockscout/pull/7758) - Remove limit for configurable fetchers
 - [#7764](https://github.com/blockscout/blockscout/pull/7764) - Fix missing ranges insertion and deletion logic
+- [#7843](https://github.com/blockscout/blockscout/pull/7843) - Fix created_contract_code_indexed_at updating
 
 ### Chore
 
diff --git a/apps/explorer/lib/explorer/chain/import/runner/addresses.ex b/apps/explorer/lib/explorer/chain/import/runner/addresses.ex
index 70d5c85bfe19..877f8cbe4a50 100644
--- a/apps/explorer/lib/explorer/chain/import/runner/addresses.ex
+++ b/apps/explorer/lib/explorer/chain/import/runner/addresses.ex
@@ -77,7 +77,7 @@ defmodule Explorer.Chain.Import.Runner.Addresses do
         :filter_addresses
       )
     end)
-    |> Multi.run(:addresses, fn repo, %{filter_addresses: addresses} ->
+    |> Multi.run(:addresses, fn repo, %{filter_addresses: {addresses, _existing_addresses}} ->
       Instrumenter.block_import_stage_runner(
         fn -> insert(repo, addresses, insert_options) end,
         :addresses,
@@ -85,10 +85,14 @@ defmodule Explorer.Chain.Import.Runner.Addresses do
         :addresses
       )
     end)
-    |> Multi.run(:created_address_code_indexed_at_transactions, fn repo, %{addresses: addresses}
+    |> Multi.run(:created_address_code_indexed_at_transactions, fn repo,
+                                                                   %{
+                                                                     addresses: addresses,
+                                                                     filter_addresses: {_, existing_addresses_map}
+                                                                   }
                                                                    when is_list(addresses) ->
       Instrumenter.block_import_stage_runner(
-        fn -> update_transactions(repo, addresses, update_transactions_options) end,
+        fn -> update_transactions(repo, addresses, existing_addresses_map, update_transactions_options) end,
         :addresses,
         :addresses,
         :created_address_code_indexed_at_transactions
@@ -101,7 +105,7 @@ defmodule Explorer.Chain.Import.Runner.Addresses do
 
   ## Private Functions
 
-  @spec filter_addresses(Repo.t(), [map()]) :: {:ok, [map()]}
+  @spec filter_addresses(Repo.t(), [map()]) :: {:ok, {[map()], map()}}
   defp filter_addresses(repo, changes_list) do
     hashes = Enum.map(changes_list, & &1.hash)
 
@@ -129,7 +133,7 @@ defmodule Explorer.Chain.Import.Runner.Addresses do
       end)
       |> Enum.reverse()
 
-    {:ok, filtered_addresses}
+    {:ok, {filtered_addresses, existing_addresses_map}}
   end
 
   defp should_update?(new_address, existing_address) do
@@ -220,10 +224,14 @@ defmodule Explorer.Chain.Import.Runner.Addresses do
     )
   end
 
-  defp update_transactions(repo, addresses, %{timeout: timeout, timestamps: timestamps}) do
+  defp update_transactions(repo, addresses, existing_addresses_map, %{timeout: timeout, timestamps: timestamps}) do
     ordered_created_contract_hashes =
       addresses
-      |> Enum.filter(& &1.contract_code)
+      |> Enum.filter(fn address ->
+        existing_address = existing_addresses_map[address.hash]
+
+        not is_nil(address.contract_code) and (is_nil(existing_address) or is_nil(existing_address.contract_code))
+      end)
       |> MapSet.new(& &1.hash)
       |> Enum.sort()
 

From dd7b689ed2a567d3735cf399493ce586ef559ea0 Mon Sep 17 00:00:00 2001
From: nikitosing <32202610+nikitosing@users.noreply.github.com>
Date: Tue, 4 Jul 2023 13:49:20 +0300
Subject: [PATCH 152/909] Search improvements: Add new fields, light
 refactoring (#7784)

* Search improvements: Add new fields, light refactoring

* Fix tests
---
 CHANGELOG.md                                  |   1 +
 .../lib/block_scout_web/chain.ex              |   2 +-
 .../views/api/v2/search_view.ex               |  28 ++--
 .../api/v2/import_controller_test.exs         |   2 +-
 .../api/v2/search_controller_test.exs         |  28 ++++
 apps/explorer/lib/explorer/chain.ex           | 146 ++++++++----------
 .../token_exchange_rates_test.exs             |  10 +-
 apps/explorer/test/support/factory.ex         |   4 +-
 8 files changed, 113 insertions(+), 108 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6e28bf394b2c..bb73830fd8e9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,7 @@
 
 ### Features
 
+- [#7784](https://github.com/blockscout/blockscout/pull/7784) - Search improvements: Add new fields, light refactoring
 - [#7811](https://github.com/blockscout/blockscout/pull/7811) - Filter addresses before insertion
 
 ### Fixes
diff --git a/apps/block_scout_web/lib/block_scout_web/chain.ex b/apps/block_scout_web/lib/block_scout_web/chain.ex
index 55dd868125d6..3d7414b067ab 100644
--- a/apps/block_scout_web/lib/block_scout_web/chain.ex
+++ b/apps/block_scout_web/lib/block_scout_web/chain.ex
@@ -293,7 +293,7 @@ defmodule BlockScoutWeb.Chain do
     with {id, ""} <- Integer.parse(id_string),
          {value, ""} <- Decimal.parse(value),
          {_id, _value, {fiat_value, ""}} <- {id, value, Decimal.parse(fiat_value_string)} do
-      [paging_options: %{@default_paging_options | key: {Decimal.round(fiat_value, 16), value, id}}]
+      [paging_options: %{@default_paging_options | key: {fiat_value, value, id}}]
     else
       {id, value, :error} ->
         [paging_options: %{@default_paging_options | key: {nil, value, id}}]
diff --git a/apps/block_scout_web/lib/block_scout_web/views/api/v2/search_view.ex b/apps/block_scout_web/lib/block_scout_web/views/api/v2/search_view.ex
index 4c69e3e15cc4..edef93f8b424 100644
--- a/apps/block_scout_web/lib/block_scout_web/views/api/v2/search_view.ex
+++ b/apps/block_scout_web/lib/block_scout_web/views/api/v2/search_view.ex
@@ -24,17 +24,22 @@ defmodule BlockScoutWeb.API.V2.SearchView do
       "address" => search_result.address_hash,
       "token_url" => token_path(Endpoint, :show, search_result.address_hash),
       "address_url" => address_path(Endpoint, :show, search_result.address_hash),
-      "icon_url" => search_result.icon_url
+      "icon_url" => search_result.icon_url,
+      "token_type" => search_result.token_type,
+      "is_smart_contract_verified" => search_result.verified,
+      "exchange_rate" => search_result.exchange_rate && to_string(search_result.exchange_rate),
+      "total_supply" => search_result.total_supply
     }
   end
 
-  def prepare_search_result(%{type: address_or_contract} = search_result)
-      when address_or_contract in ["address", "contract"] do
+  def prepare_search_result(%{type: address_or_contract_or_label} = search_result)
+      when address_or_contract_or_label in ["address", "contract", "label"] do
     %{
       "type" => search_result.type,
       "name" => search_result.name,
       "address" => search_result.address_hash,
-      "url" => address_path(Endpoint, :show, search_result.address_hash)
+      "url" => address_path(Endpoint, :show, search_result.address_hash),
+      "is_smart_contract_verified" => search_result.verified
     }
   end
 
@@ -45,7 +50,8 @@ defmodule BlockScoutWeb.API.V2.SearchView do
       "type" => search_result.type,
       "block_number" => search_result.block_number,
       "block_hash" => block_hash,
-      "url" => block_path(Endpoint, :show, block_hash)
+      "url" => block_path(Endpoint, :show, block_hash),
+      "timestamp" => search_result.timestamp
     }
   end
 
@@ -55,16 +61,8 @@ defmodule BlockScoutWeb.API.V2.SearchView do
     %{
       "type" => search_result.type,
       "tx_hash" => tx_hash,
-      "url" => transaction_path(Endpoint, :show, tx_hash)
-    }
-  end
-
-  def prepare_search_result(%{type: "label"} = search_result) do
-    %{
-      "type" => search_result.type,
-      "address" => search_result.address_hash,
-      "name" => search_result.name,
-      "url" => address_path(Endpoint, :show, search_result.address_hash)
+      "url" => transaction_path(Endpoint, :show, tx_hash),
+      "timestamp" => search_result.timestamp
     }
   end
 
diff --git a/apps/block_scout_web/test/block_scout_web/controllers/api/v2/import_controller_test.exs b/apps/block_scout_web/test/block_scout_web/controllers/api/v2/import_controller_test.exs
index 8673958f4f9a..db3b99b5dafa 100644
--- a/apps/block_scout_web/test/block_scout_web/controllers/api/v2/import_controller_test.exs
+++ b/apps/block_scout_web/test/block_scout_web/controllers/api/v2/import_controller_test.exs
@@ -24,7 +24,7 @@ defmodule BlockScoutWeb.API.V2.ImportControllerTest do
 
       Application.put_env(:block_scout_web, :sensitive_endpoints_api_key, api_key)
 
-      token_address = to_string(insert(:token).contract_address_hash)
+      token_address = to_string(insert(:token, icon_url: nil).contract_address_hash)
 
       body = %{"iconUrl" => icon_url, "tokenAddress" => token_address}
 
diff --git a/apps/block_scout_web/test/block_scout_web/controllers/api/v2/search_controller_test.exs b/apps/block_scout_web/test/block_scout_web/controllers/api/v2/search_controller_test.exs
index 0f483454a45b..e9dda32b848e 100644
--- a/apps/block_scout_web/test/block_scout_web/controllers/api/v2/search_controller_test.exs
+++ b/apps/block_scout_web/test/block_scout_web/controllers/api/v2/search_controller_test.exs
@@ -2,6 +2,7 @@ defmodule BlockScoutWeb.API.V2.SearchControllerTest do
   use BlockScoutWeb.ConnCase
 
   alias Explorer.Chain.{Address, Block}
+  alias Explorer.Repo
 
   setup do
     insert(:block)
@@ -43,6 +44,7 @@ defmodule BlockScoutWeb.API.V2.SearchControllerTest do
       assert item["block_number"] == block.number
       assert item["block_hash"] == to_string(block.hash)
       assert item["url"] =~ to_string(block.hash)
+      assert item["timestamp"] == block.timestamp |> to_string() |> String.replace(" ", "T")
     end
 
     test "search address", %{conn: conn} do
@@ -61,6 +63,7 @@ defmodule BlockScoutWeb.API.V2.SearchControllerTest do
       assert item["name"] == name.name
       assert item["address"] == Address.checksum(address.hash)
       assert item["url"] =~ Address.checksum(address.hash)
+      assert item["is_smart_contract_verified"] == address.verified
     end
 
     test "search contract", %{conn: conn} do
@@ -78,6 +81,7 @@ defmodule BlockScoutWeb.API.V2.SearchControllerTest do
       assert item["name"] == contract.name
       assert item["address"] == Address.checksum(contract.address_hash)
       assert item["url"] =~ Address.checksum(contract.address_hash)
+      assert item["is_smart_contract_verified"] == true
     end
 
     test "check pagination", %{conn: conn} do
@@ -126,6 +130,11 @@ defmodule BlockScoutWeb.API.V2.SearchControllerTest do
       assert item["address"] == Address.checksum(token.contract_address_hash)
       assert item["token_url"] =~ Address.checksum(token.contract_address_hash)
       assert item["address_url"] =~ Address.checksum(token.contract_address_hash)
+      assert item["token_type"] == token.type
+      assert item["is_smart_contract_verified"] == token.contract_address.verified
+      assert item["exchange_rate"] == (token.fiat_value && to_string(token.fiat_value))
+      assert item["total_supply"] == to_string(token.total_supply)
+      assert item["icon_url"] == token.icon_url
     end
 
     test "search transaction", %{conn: conn} do
@@ -142,6 +151,24 @@ defmodule BlockScoutWeb.API.V2.SearchControllerTest do
       assert item["type"] == "transaction"
       assert item["tx_hash"] == to_string(tx.hash)
       assert item["url"] =~ to_string(tx.hash)
+      assert item["timestamp"] == nil
+    end
+
+    test "search transaction with timestamp", %{conn: conn} do
+      tx = :transaction |> insert() |> with_block()
+
+      request = get(conn, "/api/v2/search?q=#{tx.hash}")
+      assert response = json_response(request, 200)
+
+      assert Enum.count(response["items"]) == 1
+      assert response["next_page_params"] == nil
+
+      item = Enum.at(response["items"], 0)
+
+      assert item["type"] == "transaction"
+      assert item["tx_hash"] == to_string(tx.hash)
+      assert item["url"] =~ to_string(tx.hash)
+      assert item["timestamp"] == Repo.preload(tx, [:block]).block.timestamp |> to_string() |> String.replace(" ", "T")
     end
 
     test "search tags", %{conn: conn} do
@@ -159,6 +186,7 @@ defmodule BlockScoutWeb.API.V2.SearchControllerTest do
       assert item["address"] == Address.checksum(tag.address.hash)
       assert item["name"] == tag.tag.display_name
       assert item["url"] =~ Address.checksum(tag.address.hash)
+      assert item["is_smart_contract_verified"] == tag.address.verified
     end
   end
 
diff --git a/apps/explorer/lib/explorer/chain.ex b/apps/explorer/lib/explorer/chain.ex
index f3a8cc6e834a..e9029a21175f 100644
--- a/apps/explorer/lib/explorer/chain.ex
+++ b/apps/explorer/lib/explorer/chain.ex
@@ -1486,13 +1486,15 @@ defmodule Explorer.Chain do
   def search_label_query(term) do
     inner_query =
       from(tag in AddressTag,
-        where: fragment("to_tsvector('english', display_name ) @@ to_tsquery(?)", ^term),
+        where: fragment("to_tsvector('english', ?) @@ to_tsquery(?)", tag.display_name, ^term),
         select: tag
       )
 
     from(att in AddressToTag,
       inner_join: at in subquery(inner_query),
       on: att.tag_id == at.id,
+      left_join: smart_contract in SmartContract,
+      on: att.address_hash == smart_contract.address_hash,
       select: %{
         address_hash: att.address_hash,
         tx_hash: fragment("CAST(NULL AS bytea)"),
@@ -1503,14 +1505,21 @@ defmodule Explorer.Chain do
         holder_count: ^nil,
         inserted_at: att.inserted_at,
         block_number: 0,
-        icon_url: nil
+        icon_url: nil,
+        token_type: nil,
+        timestamp: fragment("NULL::timestamp without time zone"),
+        verified: not is_nil(smart_contract),
+        exchange_rate: nil,
+        total_supply: nil
       }
     )
   end
 
   defp search_token_query(term) do
     from(token in Token,
-      where: fragment("to_tsvector('english', symbol || ' ' || name ) @@ to_tsquery(?)", ^term),
+      left_join: smart_contract in SmartContract,
+      on: token.contract_address_hash == smart_contract.address_hash,
+      where: fragment("to_tsvector('english', ? || ' ' || ?) @@ to_tsquery(?)", token.symbol, token.name, ^term),
       select: %{
         address_hash: token.contract_address_hash,
         tx_hash: fragment("CAST(NULL AS bytea)"),
@@ -1521,7 +1530,12 @@ defmodule Explorer.Chain do
         holder_count: token.holder_count,
         inserted_at: token.inserted_at,
         block_number: 0,
-        icon_url: token.icon_url
+        icon_url: token.icon_url,
+        token_type: token.type,
+        timestamp: fragment("NULL::timestamp without time zone"),
+        verified: not is_nil(smart_contract),
+        exchange_rate: token.fiat_value,
+        total_supply: token.total_supply
       }
     )
   end
@@ -1530,7 +1544,7 @@ defmodule Explorer.Chain do
     from(smart_contract in SmartContract,
       left_join: address in Address,
       on: smart_contract.address_hash == address.hash,
-      where: fragment("to_tsvector('english', name) @@ to_tsquery(?)", ^term),
+      where: fragment("to_tsvector('english', ?) @@ to_tsquery(?)", smart_contract.name, ^term),
       select: %{
         address_hash: smart_contract.address_hash,
         tx_hash: fragment("CAST(NULL AS bytea)"),
@@ -1541,7 +1555,12 @@ defmodule Explorer.Chain do
         holder_count: ^nil,
         inserted_at: address.inserted_at,
         block_number: 0,
-        icon_url: nil
+        icon_url: nil,
+        token_type: nil,
+        timestamp: fragment("NULL::timestamp without time zone"),
+        verified: true,
+        exchange_rate: nil,
+        total_supply: nil
       }
     )
   end
@@ -1570,7 +1589,12 @@ defmodule Explorer.Chain do
             holder_count: ^nil,
             inserted_at: address.inserted_at,
             block_number: 0,
-            icon_url: nil
+            icon_url: nil,
+            token_type: nil,
+            timestamp: fragment("NULL::timestamp without time zone"),
+            verified: address.verified,
+            exchange_rate: nil,
+            total_supply: nil
           }
         )
 
@@ -1583,6 +1607,8 @@ defmodule Explorer.Chain do
     case Chain.string_to_transaction_hash(term) do
       {:ok, tx_hash} ->
         from(transaction in Transaction,
+          left_join: block in Block,
+          on: transaction.block_hash == block.hash,
           where: transaction.hash == ^tx_hash,
           select: %{
             address_hash: fragment("CAST(NULL AS bytea)"),
@@ -1594,7 +1620,12 @@ defmodule Explorer.Chain do
             holder_count: ^nil,
             inserted_at: transaction.inserted_at,
             block_number: 0,
-            icon_url: nil
+            icon_url: nil,
+            token_type: nil,
+            timestamp: block.timestamp,
+            verified: nil,
+            exchange_rate: nil,
+            total_supply: nil
           }
         )
 
@@ -1618,7 +1649,12 @@ defmodule Explorer.Chain do
             holder_count: ^nil,
             inserted_at: block.inserted_at,
             block_number: block.number,
-            icon_url: nil
+            icon_url: nil,
+            token_type: nil,
+            timestamp: block.timestamp,
+            verified: nil,
+            exchange_rate: nil,
+            total_supply: nil
           }
         )
 
@@ -1637,7 +1673,12 @@ defmodule Explorer.Chain do
                 holder_count: ^nil,
                 inserted_at: block.inserted_at,
                 block_number: block.number,
-                icon_url: nil
+                icon_url: nil,
+                token_type: nil,
+                timestamp: block.timestamp,
+                verified: nil,
+                exchange_rate: nil,
+                total_supply: nil
               }
             )
 
@@ -1700,7 +1741,9 @@ defmodule Explorer.Chain do
 
         search_results
         |> Enum.map(fn result ->
-          compose_result_checksummed_address_hash(result)
+          result
+          |> compose_result_checksummed_address_hash()
+          |> format_timestamp()
         end)
 
       _ ->
@@ -1717,80 +1760,13 @@ defmodule Explorer.Chain do
     end
   end
 
-  def search_tx(term) do
-    case Chain.string_to_transaction_hash(term) do
-      {:ok, tx_hash} ->
-        query =
-          from(transaction in Transaction,
-            where: transaction.hash == ^tx_hash,
-            select: %{
-              link: transaction.hash,
-              type: "transaction"
-            }
-          )
-
-        Repo.all(query)
-
-      _ ->
-        []
-    end
-  end
-
-  def search_address(term) do
-    case Chain.string_to_address_hash(term) do
-      {:ok, address_hash} ->
-        query =
-          from(address in Address,
-            left_join: address_name in Address.Name,
-            on: address.hash == address_name.address_hash,
-            where: address.hash == ^address_hash,
-            select: %{
-              name: address_name.name,
-              link: address.hash,
-              type: "address"
-            }
-          )
-
-        Repo.all(query)
-
-      _ ->
-        []
-    end
-  end
-
-  def search_block(term) do
-    case Chain.string_to_block_hash(term) do
-      {:ok, block_hash} ->
-        query =
-          from(block in Block,
-            where: block.hash == ^block_hash,
-            select: %{
-              link: block.hash,
-              block_number: block.number,
-              type: "block"
-            }
-          )
-
-        Repo.all(query)
-
-      _ ->
-        case Integer.parse(term) do
-          {block_number, _} ->
-            query =
-              from(block in Block,
-                where: block.number == ^block_number,
-                select: %{
-                  link: block.hash,
-                  block_number: block.number,
-                  type: "block"
-                }
-              )
-
-            Repo.all(query)
-
-          _ ->
-            []
-        end
+  # For some reasons timestamp for blocks and txs returns as ~N[2023-06-25 19:39:47.339493]
+  defp format_timestamp(result) do
+    if result.timestamp do
+      result
+      |> Map.put(:timestamp, DateTime.from_naive!(result.timestamp, "Etc/UTC"))
+    else
+      result
     end
   end
 
diff --git a/apps/explorer/test/explorer/exchange_rates/token_exchange_rates_test.exs b/apps/explorer/test/explorer/exchange_rates/token_exchange_rates_test.exs
index 9eb6b5189c76..2e5f9ee1a6c6 100644
--- a/apps/explorer/test/explorer/exchange_rates/token_exchange_rates_test.exs
+++ b/apps/explorer/test/explorer/exchange_rates/token_exchange_rates_test.exs
@@ -36,7 +36,7 @@ defmodule Explorer.TokenExchangeRatesTest do
 
       [_token_with_no_exchange_rate | tokens] =
         for _ <- 0..4 do
-          insert(:token)
+          insert(:token, fiat_value: nil)
         end
 
       coins_list =
@@ -101,7 +101,7 @@ defmodule Explorer.TokenExchangeRatesTest do
 
       [_token_with_no_exchange_rate | _tokens] =
         for _ <- 0..4 do
-          insert(:token)
+          insert(:token, fiat_value: nil)
         end
 
       Bypass.expect_once(bypass, "GET", "/coins/list", fn conn ->
@@ -126,7 +126,7 @@ defmodule Explorer.TokenExchangeRatesTest do
 
       [_token_with_no_exchange_rate | tokens] =
         for _ <- 0..4 do
-          insert(:token)
+          insert(:token, fiat_value: nil)
         end
 
       coins_list =
@@ -181,7 +181,7 @@ defmodule Explorer.TokenExchangeRatesTest do
 
       [_token_with_no_exchange_rate | _tokens] =
         for _ <- 0..4 do
-          insert(:token)
+          insert(:token, fiat_value: nil)
         end
 
       Bypass.expect_once(bypass, "GET", "/coins/list", fn conn ->
@@ -206,7 +206,7 @@ defmodule Explorer.TokenExchangeRatesTest do
 
       [_token_with_no_exchange_rate | tokens] =
         for _ <- 0..4 do
-          insert(:token)
+          insert(:token, fiat_value: nil)
         end
 
       coins_list =
diff --git a/apps/explorer/test/support/factory.ex b/apps/explorer/test/support/factory.ex
index c05d0f7077ea..d071430c9c56 100644
--- a/apps/explorer/test/support/factory.ex
+++ b/apps/explorer/test/support/factory.ex
@@ -654,7 +654,9 @@ defmodule Explorer.Factory do
       decimals: 18,
       contract_address: build(:address),
       type: "ERC-20",
-      cataloged: true
+      cataloged: true,
+      icon_url: sequence("https://example.com/icon"),
+      fiat_value: 10.1
     }
   end
 

From ffa01e7c159430718fb64287ad3022a8887d1987 Mon Sep 17 00:00:00 2001
From: Nikita Pozdniakov <nikitosing4@mail.ru>
Date: Mon, 3 Jul 2023 19:21:14 +0300
Subject: [PATCH 153/909] Add new invalid_session cookie for users with
 unverified email

---
 CHANGELOG.md                                               | 1 +
 apps/block_scout_web/config/config.exs                     | 5 ++++-
 .../controllers/account/api/v1/email_controller.ex         | 6 +++++-
 .../block_scout_web/controllers/account/auth_controller.ex | 7 +++++++
 4 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index bb73830fd8e9..b766a728680a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,7 @@
 
 ### Features
 
+- [#7836](https://github.com/blockscout/blockscout/pull/7836) - Improve unverified email flow
 - [#7784](https://github.com/blockscout/blockscout/pull/7784) - Search improvements: Add new fields, light refactoring
 - [#7811](https://github.com/blockscout/blockscout/pull/7811) - Filter addresses before insertion
 
diff --git a/apps/block_scout_web/config/config.exs b/apps/block_scout_web/config/config.exs
index a8f34240d0f7..bb5f87a1dcda 100644
--- a/apps/block_scout_web/config/config.exs
+++ b/apps/block_scout_web/config/config.exs
@@ -9,7 +9,10 @@ import Config
 config :block_scout_web,
   namespace: BlockScoutWeb,
   ecto_repos: [Explorer.Repo, Explorer.Repo.Account],
-  cookie_domain: System.get_env("SESSION_COOKIE_DOMAIN")
+  cookie_domain: System.get_env("SESSION_COOKIE_DOMAIN"),
+  # 604800 seconds, 1 week
+  session_cookie_ttl: 60 * 60 * 24 * 7,
+  invalid_session_key: "invalid_session"
 
 config :block_scout_web,
   admin_panel_enabled: System.get_env("ADMIN_PANEL_ENABLED", "") == "true"
diff --git a/apps/block_scout_web/lib/block_scout_web/controllers/account/api/v1/email_controller.ex b/apps/block_scout_web/lib/block_scout_web/controllers/account/api/v1/email_controller.ex
index b8f2ce763166..9e79c2d33645 100644
--- a/apps/block_scout_web/lib/block_scout_web/controllers/account/api/v1/email_controller.ex
+++ b/apps/block_scout_web/lib/block_scout_web/controllers/account/api/v1/email_controller.ex
@@ -8,10 +8,14 @@ defmodule BlockScoutWeb.Account.Api.V1.EmailController do
 
   require Logger
 
+  @invalid_session_key Application.compile_env(:block_scout_web, :invalid_session_key)
+
   action_fallback(BlockScoutWeb.Account.Api.V1.FallbackController)
 
+  plug(:fetch_cookies, signed: [@invalid_session_key])
+
   def resend_email(conn, _params) do
-    with user <- get_session(conn, :current_user),
+    with user <- conn.cookies[@invalid_session_key],
          {:auth, false} <- {:auth, is_nil(user)},
          {:email_verified, false} <- {:email_verified, user[:email_verified]},
          {:identity, %Identity{} = identity} <- {:identity, UserFromAuth.find_identity(user[:id])},
diff --git a/apps/block_scout_web/lib/block_scout_web/controllers/account/auth_controller.ex b/apps/block_scout_web/lib/block_scout_web/controllers/account/auth_controller.ex
index 6d6c926c2c58..65f29163179b 100644
--- a/apps/block_scout_web/lib/block_scout_web/controllers/account/auth_controller.ex
+++ b/apps/block_scout_web/lib/block_scout_web/controllers/account/auth_controller.ex
@@ -38,6 +38,12 @@ defmodule BlockScoutWeb.Account.AuthController do
       {:ok, %{email_verified: false} = user} ->
         conn
         |> put_session(:current_user, user)
+        |> put_resp_cookie(Application.get_env(:block_scout_web, :invalid_session_key), user,
+          max_age: Application.get_env(:block_scout_web, :session_cookie_ttl),
+          sign: true,
+          same_site: "Lax",
+          domain: Application.get_env(:block_scout_web, :cookie_domain)
+        )
         |> redirect(to: root())
 
       {:ok, user} ->
@@ -45,6 +51,7 @@ defmodule BlockScoutWeb.Account.AuthController do
 
         conn
         |> put_session(:current_user, user)
+        |> delete_resp_cookie(Application.get_env(:block_scout_web, :invalid_session_key))
         |> redirect(to: redirect_path(params["path"]))
 
       {:error, reason} ->

From 9d8523197e9296db1d664b3d5bdbbddc6a83b844 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 4 Jul 2023 18:19:39 +0000
Subject: [PATCH 154/909] Bump @babel/core from 7.22.5 to 7.22.6 in
 /apps/block_scout_web/assets

Bumps [@babel/core](https://github.com/babel/babel/tree/HEAD/packages/babel-core) from 7.22.5 to 7.22.6.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/commits/v7.22.6/packages/babel-core)

---
updated-dependencies:
- dependency-name: "@babel/core"
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 apps/block_scout_web/assets/package-lock.json | 241 ++++++++++--------
 apps/block_scout_web/assets/package.json      |   2 +-
 2 files changed, 134 insertions(+), 109 deletions(-)

diff --git a/apps/block_scout_web/assets/package-lock.json b/apps/block_scout_web/assets/package-lock.json
index 3aac88142b4b..a1698df9e955 100644
--- a/apps/block_scout_web/assets/package-lock.json
+++ b/apps/block_scout_web/assets/package-lock.json
@@ -71,7 +71,7 @@
         "xss": "^1.0.14"
       },
       "devDependencies": {
-        "@babel/core": "^7.22.5",
+        "@babel/core": "^7.22.6",
         "@babel/preset-env": "^7.22.5",
         "autoprefixer": "^10.4.14",
         "babel-loader": "^9.1.2",
@@ -240,33 +240,33 @@
       }
     },
     "node_modules/@babel/compat-data": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.22.5.tgz",
-      "integrity": "sha512-4Jc/YuIaYqKnDDz892kPIledykKg12Aw1PYX5i/TY28anJtacvM1Rrr8wbieB9GfEJwlzqT0hUEao0CxEebiDA==",
+      "version": "7.22.6",
+      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.22.6.tgz",
+      "integrity": "sha512-29tfsWTq2Ftu7MXmimyC0C5FDZv5DYxOZkh3XD3+QW4V/BYuv/LyEsjj3c0hqedEaDt6DBfDvexMKU8YevdqFg==",
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/core": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.22.5.tgz",
-      "integrity": "sha512-SBuTAjg91A3eKOvD+bPEz3LlhHZRNu1nFOVts9lzDJTXshHTjII0BAtDS3Y2DAkdZdDKWVZGVwkDfc4Clxn1dg==",
+      "version": "7.22.6",
+      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.22.6.tgz",
+      "integrity": "sha512-HPIyDa6n+HKw5dEuway3vVAhBboYCtREBMp+IWeseZy6TFtzn6MHkCH2KKYUOC/vKKwgSMHQW4htBOrmuRPXfw==",
       "dependencies": {
         "@ampproject/remapping": "^2.2.0",
         "@babel/code-frame": "^7.22.5",
         "@babel/generator": "^7.22.5",
-        "@babel/helper-compilation-targets": "^7.22.5",
+        "@babel/helper-compilation-targets": "^7.22.6",
         "@babel/helper-module-transforms": "^7.22.5",
-        "@babel/helpers": "^7.22.5",
-        "@babel/parser": "^7.22.5",
+        "@babel/helpers": "^7.22.6",
+        "@babel/parser": "^7.22.6",
         "@babel/template": "^7.22.5",
-        "@babel/traverse": "^7.22.5",
+        "@babel/traverse": "^7.22.6",
         "@babel/types": "^7.22.5",
+        "@nicolo-ribaudo/semver-v6": "^6.3.3",
         "convert-source-map": "^1.7.0",
         "debug": "^4.1.0",
         "gensync": "^1.0.0-beta.2",
-        "json5": "^2.2.2",
-        "semver": "^6.3.0"
+        "json5": "^2.2.2"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -314,15 +314,15 @@
       }
     },
     "node_modules/@babel/helper-compilation-targets": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.22.5.tgz",
-      "integrity": "sha512-Ji+ywpHeuqxB8WDxraCiqR0xfhYjiDE/e6k7FuIaANnoOFxAHskHChz4vA1mJC9Lbm01s1PVAGhQY4FUKSkGZw==",
+      "version": "7.22.6",
+      "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.22.6.tgz",
+      "integrity": "sha512-534sYEqWD9VfUm3IPn2SLcH4Q3P86XL+QvqdC7ZsFrzyyPF3T4XGiVghF6PTYNdWg6pXuoqXxNQAhbYeEInTzA==",
       "dependencies": {
-        "@babel/compat-data": "^7.22.5",
+        "@babel/compat-data": "^7.22.6",
         "@babel/helper-validator-option": "^7.22.5",
-        "browserslist": "^4.21.3",
-        "lru-cache": "^5.1.1",
-        "semver": "^6.3.0"
+        "@nicolo-ribaudo/semver-v6": "^6.3.3",
+        "browserslist": "^4.21.9",
+        "lru-cache": "^5.1.1"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -551,9 +551,9 @@
       }
     },
     "node_modules/@babel/helper-split-export-declaration": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.22.5.tgz",
-      "integrity": "sha512-thqK5QFghPKWLhAV321lxF95yCg2K3Ob5yw+M3VHWfdia0IkPXUtoLH8x/6Fh486QUvzhb8YOWHChTVen2/PoQ==",
+      "version": "7.22.6",
+      "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.22.6.tgz",
+      "integrity": "sha512-AsUnxuLhRYsisFiaJwvp1QF+I3KjD5FOxut14q/GzovUe6orHLesW2C7d754kRm53h5gqrz6sFl6sxc4BVtE/g==",
       "dependencies": {
         "@babel/types": "^7.22.5"
       },
@@ -601,12 +601,12 @@
       }
     },
     "node_modules/@babel/helpers": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.22.5.tgz",
-      "integrity": "sha512-pSXRmfE1vzcUIDFQcSGA5Mr+GxBV9oiRKDuDxXvWQQBCh8HoIjs/2DlDB7H8smac1IVrB9/xdXj2N3Wol9Cr+Q==",
+      "version": "7.22.6",
+      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.22.6.tgz",
+      "integrity": "sha512-YjDs6y/fVOYFV8hAf1rxd1QvR9wJe1pDBZ2AREKq/SDayfPzgk0PBnVuTCE5X1acEpMMNOVUqoe+OwiZGJ+OaA==",
       "dependencies": {
         "@babel/template": "^7.22.5",
-        "@babel/traverse": "^7.22.5",
+        "@babel/traverse": "^7.22.6",
         "@babel/types": "^7.22.5"
       },
       "engines": {
@@ -627,9 +627,9 @@
       }
     },
     "node_modules/@babel/parser": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.22.5.tgz",
-      "integrity": "sha512-DFZMC9LJUG9PLOclRC32G63UXwzqS2koQC8dkx+PLdmt1xSePYpbT/NbsrJy8Q/muXz7o/h/d4A7Fuyixm559Q==",
+      "version": "7.22.6",
+      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.22.6.tgz",
+      "integrity": "sha512-EIQu22vNkceq3LbjAq7knDf/UmtI2qbcNI8GRBlijez6TpQLvSodJPYfydQmNA5buwkxxxa/PVI44jjYZ+/cLw==",
       "bin": {
         "parser": "bin/babel-parser.js"
       },
@@ -1961,17 +1961,17 @@
       }
     },
     "node_modules/@babel/traverse": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.22.5.tgz",
-      "integrity": "sha512-7DuIjPgERaNo6r+PZwItpjCZEa5vyw4eJGufeLxrPdBXBoLcCJCIasvK6pK/9DVNrLZTLFhUGqaC6X/PA007TQ==",
+      "version": "7.22.6",
+      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.22.6.tgz",
+      "integrity": "sha512-53CijMvKlLIDlOTrdWiHileRddlIiwUIyCKqYa7lYnnPldXCG5dUSN38uT0cA6i7rHWNKJLH0VU/Kxdr1GzB3w==",
       "dependencies": {
         "@babel/code-frame": "^7.22.5",
         "@babel/generator": "^7.22.5",
         "@babel/helper-environment-visitor": "^7.22.5",
         "@babel/helper-function-name": "^7.22.5",
         "@babel/helper-hoist-variables": "^7.22.5",
-        "@babel/helper-split-export-declaration": "^7.22.5",
-        "@babel/parser": "^7.22.5",
+        "@babel/helper-split-export-declaration": "^7.22.6",
+        "@babel/parser": "^7.22.6",
         "@babel/types": "^7.22.5",
         "debug": "^4.1.0",
         "globals": "^11.1.0"
@@ -3353,6 +3353,14 @@
       "resolved": "https://registry.npmjs.org/@metamask/safe-event-emitter/-/safe-event-emitter-2.0.0.tgz",
       "integrity": "sha512-/kSXhY692qiV1MXu6EeOZvg5nECLclxNXcKCxJ3cXQgYuRymRHpdx/t7JXfsK+JLjwA1e1c1/SBrlQYpusC29Q=="
     },
+    "node_modules/@nicolo-ribaudo/semver-v6": {
+      "version": "6.3.3",
+      "resolved": "https://registry.npmjs.org/@nicolo-ribaudo/semver-v6/-/semver-v6-6.3.3.tgz",
+      "integrity": "sha512-3Yc1fUTs69MG/uZbJlLSI3JISMn2UV2rg+1D/vROUqZyh3l6iYHCs7GMp+M40ZD7yOdDbYjJcU1oTJhrc+dGKg==",
+      "bin": {
+        "semver": "bin/semver.js"
+      }
+    },
     "node_modules/@nodelib/fs.scandir": {
       "version": "2.1.5",
       "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
@@ -5127,9 +5135,9 @@
       ]
     },
     "node_modules/browserslist": {
-      "version": "4.21.5",
-      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.21.5.tgz",
-      "integrity": "sha512-tUkiguQGW7S3IhB7N+c2MV/HZPSCPAAiYBZXLsBhFB/PCy6ZKKsZrmBayHV9fdGV/ARIfJ14NkxKzRDjvp7L6w==",
+      "version": "4.21.9",
+      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.21.9.tgz",
+      "integrity": "sha512-M0MFoZzbUrRU4KNfCrDLnvyE7gub+peetoTid3TBIqtunaDJyXlwhakT+/VkvSXcfIzFfK/nkCs4nmyTmxdNSg==",
       "funding": [
         {
           "type": "opencollective",
@@ -5138,13 +5146,17 @@
         {
           "type": "tidelift",
           "url": "https://tidelift.com/funding/github/npm/browserslist"
+        },
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/ai"
         }
       ],
       "dependencies": {
-        "caniuse-lite": "^1.0.30001449",
-        "electron-to-chromium": "^1.4.284",
-        "node-releases": "^2.0.8",
-        "update-browserslist-db": "^1.0.10"
+        "caniuse-lite": "^1.0.30001503",
+        "electron-to-chromium": "^1.4.431",
+        "node-releases": "^2.0.12",
+        "update-browserslist-db": "^1.0.11"
       },
       "bin": {
         "browserslist": "cli.js"
@@ -5393,9 +5405,9 @@
       }
     },
     "node_modules/caniuse-lite": {
-      "version": "1.0.30001464",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001464.tgz",
-      "integrity": "sha512-oww27MtUmusatpRpCGSOneQk2/l5czXANDSFvsc7VuOQ86s3ANhZetpwXNf1zY/zdfP63Xvjz325DAdAoES13g==",
+      "version": "1.0.30001512",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001512.tgz",
+      "integrity": "sha512-2S9nK0G/mE+jasCUsMPlARhRCts1ebcp2Ji8Y8PWi4NDE1iRdLCnEPHkEfeBrGC45L4isBx5ur3IQ6yTE2mRZw==",
       "funding": [
         {
           "type": "opencollective",
@@ -5404,6 +5416,10 @@
         {
           "type": "tidelift",
           "url": "https://tidelift.com/funding/github/npm/caniuse-lite"
+        },
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/ai"
         }
       ]
     },
@@ -6738,9 +6754,9 @@
       "integrity": "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow=="
     },
     "node_modules/electron-to-chromium": {
-      "version": "1.4.327",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.327.tgz",
-      "integrity": "sha512-DIk2H4g/3ZhjgiABJjVdQvUdMlSABOsjeCm6gmUzIdKxAuFrGiJ8QXMm3i09grZdDBMC/d8MELMrdwYRC0+YHg=="
+      "version": "1.4.450",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.450.tgz",
+      "integrity": "sha512-BLG5HxSELlrMx7dJ2s+8SFlsCtJp37Zpk2VAxyC6CZtbc+9AJeZHfYHbrlSgdXp6saQ8StMqOTEDaBKgA7u1sw=="
     },
     "node_modules/elliptic": {
       "version": "6.5.4",
@@ -12900,9 +12916,9 @@
       "dev": true
     },
     "node_modules/node-releases": {
-      "version": "2.0.10",
-      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.10.tgz",
-      "integrity": "sha512-5GFldHPXVG/YZmFzJvKK2zDSzPKhEp0+ZR5SVaoSag9fsL5YgHbUHDfnG5494ISANDcK4KwPXAx2xqVEydmd7w=="
+      "version": "2.0.12",
+      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.12.tgz",
+      "integrity": "sha512-QzsYKWhXTWx8h1kIvqfnC++o0pEmpRQA/aenALsL2F4pqNVr7YzcdMlDij5WBnwftRbJCNJL/O7zdKaxKPHqgQ=="
     },
     "node_modules/normalize-path": {
       "version": "3.0.0",
@@ -16231,9 +16247,9 @@
       }
     },
     "node_modules/update-browserslist-db": {
-      "version": "1.0.10",
-      "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.10.tgz",
-      "integrity": "sha512-OztqDenkfFkbSG+tRxBeAnCVPckDBcvibKd35yDONx6OU8N7sqgwc7rCbkJ/WcYtVRZ4ba68d6byhC21GFh7sQ==",
+      "version": "1.0.11",
+      "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.11.tgz",
+      "integrity": "sha512-dCwEFf0/oT85M1fHBg4F0jtLwJrutGoHSQXCh7u4o2t1drG+c0a9Flnqww6XUKSfQMPpJBRjU8d4RXB09qtvaA==",
       "funding": [
         {
           "type": "opencollective",
@@ -16242,6 +16258,10 @@
         {
           "type": "tidelift",
           "url": "https://tidelift.com/funding/github/npm/browserslist"
+        },
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/ai"
         }
       ],
       "dependencies": {
@@ -16249,7 +16269,7 @@
         "picocolors": "^1.0.0"
       },
       "bin": {
-        "browserslist-lint": "cli.js"
+        "update-browserslist-db": "cli.js"
       },
       "peerDependencies": {
         "browserslist": ">= 4.21.0"
@@ -17614,30 +17634,30 @@
       }
     },
     "@babel/compat-data": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.22.5.tgz",
-      "integrity": "sha512-4Jc/YuIaYqKnDDz892kPIledykKg12Aw1PYX5i/TY28anJtacvM1Rrr8wbieB9GfEJwlzqT0hUEao0CxEebiDA=="
+      "version": "7.22.6",
+      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.22.6.tgz",
+      "integrity": "sha512-29tfsWTq2Ftu7MXmimyC0C5FDZv5DYxOZkh3XD3+QW4V/BYuv/LyEsjj3c0hqedEaDt6DBfDvexMKU8YevdqFg=="
     },
     "@babel/core": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.22.5.tgz",
-      "integrity": "sha512-SBuTAjg91A3eKOvD+bPEz3LlhHZRNu1nFOVts9lzDJTXshHTjII0BAtDS3Y2DAkdZdDKWVZGVwkDfc4Clxn1dg==",
+      "version": "7.22.6",
+      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.22.6.tgz",
+      "integrity": "sha512-HPIyDa6n+HKw5dEuway3vVAhBboYCtREBMp+IWeseZy6TFtzn6MHkCH2KKYUOC/vKKwgSMHQW4htBOrmuRPXfw==",
       "requires": {
         "@ampproject/remapping": "^2.2.0",
         "@babel/code-frame": "^7.22.5",
         "@babel/generator": "^7.22.5",
-        "@babel/helper-compilation-targets": "^7.22.5",
+        "@babel/helper-compilation-targets": "^7.22.6",
         "@babel/helper-module-transforms": "^7.22.5",
-        "@babel/helpers": "^7.22.5",
-        "@babel/parser": "^7.22.5",
+        "@babel/helpers": "^7.22.6",
+        "@babel/parser": "^7.22.6",
         "@babel/template": "^7.22.5",
-        "@babel/traverse": "^7.22.5",
+        "@babel/traverse": "^7.22.6",
         "@babel/types": "^7.22.5",
+        "@nicolo-ribaudo/semver-v6": "^6.3.3",
         "convert-source-map": "^1.7.0",
         "debug": "^4.1.0",
         "gensync": "^1.0.0-beta.2",
-        "json5": "^2.2.2",
-        "semver": "^6.3.0"
+        "json5": "^2.2.2"
       }
     },
     "@babel/generator": {
@@ -17669,15 +17689,15 @@
       }
     },
     "@babel/helper-compilation-targets": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.22.5.tgz",
-      "integrity": "sha512-Ji+ywpHeuqxB8WDxraCiqR0xfhYjiDE/e6k7FuIaANnoOFxAHskHChz4vA1mJC9Lbm01s1PVAGhQY4FUKSkGZw==",
+      "version": "7.22.6",
+      "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.22.6.tgz",
+      "integrity": "sha512-534sYEqWD9VfUm3IPn2SLcH4Q3P86XL+QvqdC7ZsFrzyyPF3T4XGiVghF6PTYNdWg6pXuoqXxNQAhbYeEInTzA==",
       "requires": {
-        "@babel/compat-data": "^7.22.5",
+        "@babel/compat-data": "^7.22.6",
         "@babel/helper-validator-option": "^7.22.5",
-        "browserslist": "^4.21.3",
-        "lru-cache": "^5.1.1",
-        "semver": "^6.3.0"
+        "@nicolo-ribaudo/semver-v6": "^6.3.3",
+        "browserslist": "^4.21.9",
+        "lru-cache": "^5.1.1"
       },
       "dependencies": {
         "lru-cache": {
@@ -17848,9 +17868,9 @@
       }
     },
     "@babel/helper-split-export-declaration": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.22.5.tgz",
-      "integrity": "sha512-thqK5QFghPKWLhAV321lxF95yCg2K3Ob5yw+M3VHWfdia0IkPXUtoLH8x/6Fh486QUvzhb8YOWHChTVen2/PoQ==",
+      "version": "7.22.6",
+      "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.22.6.tgz",
+      "integrity": "sha512-AsUnxuLhRYsisFiaJwvp1QF+I3KjD5FOxut14q/GzovUe6orHLesW2C7d754kRm53h5gqrz6sFl6sxc4BVtE/g==",
       "requires": {
         "@babel/types": "^7.22.5"
       }
@@ -17883,12 +17903,12 @@
       }
     },
     "@babel/helpers": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.22.5.tgz",
-      "integrity": "sha512-pSXRmfE1vzcUIDFQcSGA5Mr+GxBV9oiRKDuDxXvWQQBCh8HoIjs/2DlDB7H8smac1IVrB9/xdXj2N3Wol9Cr+Q==",
+      "version": "7.22.6",
+      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.22.6.tgz",
+      "integrity": "sha512-YjDs6y/fVOYFV8hAf1rxd1QvR9wJe1pDBZ2AREKq/SDayfPzgk0PBnVuTCE5X1acEpMMNOVUqoe+OwiZGJ+OaA==",
       "requires": {
         "@babel/template": "^7.22.5",
-        "@babel/traverse": "^7.22.5",
+        "@babel/traverse": "^7.22.6",
         "@babel/types": "^7.22.5"
       }
     },
@@ -17903,9 +17923,9 @@
       }
     },
     "@babel/parser": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.22.5.tgz",
-      "integrity": "sha512-DFZMC9LJUG9PLOclRC32G63UXwzqS2koQC8dkx+PLdmt1xSePYpbT/NbsrJy8Q/muXz7o/h/d4A7Fuyixm559Q=="
+      "version": "7.22.6",
+      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.22.6.tgz",
+      "integrity": "sha512-EIQu22vNkceq3LbjAq7knDf/UmtI2qbcNI8GRBlijez6TpQLvSodJPYfydQmNA5buwkxxxa/PVI44jjYZ+/cLw=="
     },
     "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": {
       "version": "7.22.5",
@@ -18804,17 +18824,17 @@
       }
     },
     "@babel/traverse": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.22.5.tgz",
-      "integrity": "sha512-7DuIjPgERaNo6r+PZwItpjCZEa5vyw4eJGufeLxrPdBXBoLcCJCIasvK6pK/9DVNrLZTLFhUGqaC6X/PA007TQ==",
+      "version": "7.22.6",
+      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.22.6.tgz",
+      "integrity": "sha512-53CijMvKlLIDlOTrdWiHileRddlIiwUIyCKqYa7lYnnPldXCG5dUSN38uT0cA6i7rHWNKJLH0VU/Kxdr1GzB3w==",
       "requires": {
         "@babel/code-frame": "^7.22.5",
         "@babel/generator": "^7.22.5",
         "@babel/helper-environment-visitor": "^7.22.5",
         "@babel/helper-function-name": "^7.22.5",
         "@babel/helper-hoist-variables": "^7.22.5",
-        "@babel/helper-split-export-declaration": "^7.22.5",
-        "@babel/parser": "^7.22.5",
+        "@babel/helper-split-export-declaration": "^7.22.6",
+        "@babel/parser": "^7.22.6",
         "@babel/types": "^7.22.5",
         "debug": "^4.1.0",
         "globals": "^11.1.0"
@@ -19785,6 +19805,11 @@
       "resolved": "https://registry.npmjs.org/@metamask/safe-event-emitter/-/safe-event-emitter-2.0.0.tgz",
       "integrity": "sha512-/kSXhY692qiV1MXu6EeOZvg5nECLclxNXcKCxJ3cXQgYuRymRHpdx/t7JXfsK+JLjwA1e1c1/SBrlQYpusC29Q=="
     },
+    "@nicolo-ribaudo/semver-v6": {
+      "version": "6.3.3",
+      "resolved": "https://registry.npmjs.org/@nicolo-ribaudo/semver-v6/-/semver-v6-6.3.3.tgz",
+      "integrity": "sha512-3Yc1fUTs69MG/uZbJlLSI3JISMn2UV2rg+1D/vROUqZyh3l6iYHCs7GMp+M40ZD7yOdDbYjJcU1oTJhrc+dGKg=="
+    },
     "@nodelib/fs.scandir": {
       "version": "2.1.5",
       "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
@@ -21267,14 +21292,14 @@
       }
     },
     "browserslist": {
-      "version": "4.21.5",
-      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.21.5.tgz",
-      "integrity": "sha512-tUkiguQGW7S3IhB7N+c2MV/HZPSCPAAiYBZXLsBhFB/PCy6ZKKsZrmBayHV9fdGV/ARIfJ14NkxKzRDjvp7L6w==",
+      "version": "4.21.9",
+      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.21.9.tgz",
+      "integrity": "sha512-M0MFoZzbUrRU4KNfCrDLnvyE7gub+peetoTid3TBIqtunaDJyXlwhakT+/VkvSXcfIzFfK/nkCs4nmyTmxdNSg==",
       "requires": {
-        "caniuse-lite": "^1.0.30001449",
-        "electron-to-chromium": "^1.4.284",
-        "node-releases": "^2.0.8",
-        "update-browserslist-db": "^1.0.10"
+        "caniuse-lite": "^1.0.30001503",
+        "electron-to-chromium": "^1.4.431",
+        "node-releases": "^2.0.12",
+        "update-browserslist-db": "^1.0.11"
       }
     },
     "bs58": {
@@ -21464,9 +21489,9 @@
       }
     },
     "caniuse-lite": {
-      "version": "1.0.30001464",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001464.tgz",
-      "integrity": "sha512-oww27MtUmusatpRpCGSOneQk2/l5czXANDSFvsc7VuOQ86s3ANhZetpwXNf1zY/zdfP63Xvjz325DAdAoES13g=="
+      "version": "1.0.30001512",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001512.tgz",
+      "integrity": "sha512-2S9nK0G/mE+jasCUsMPlARhRCts1ebcp2Ji8Y8PWi4NDE1iRdLCnEPHkEfeBrGC45L4isBx5ur3IQ6yTE2mRZw=="
     },
     "caseless": {
       "version": "0.12.0",
@@ -22476,9 +22501,9 @@
       "integrity": "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow=="
     },
     "electron-to-chromium": {
-      "version": "1.4.327",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.327.tgz",
-      "integrity": "sha512-DIk2H4g/3ZhjgiABJjVdQvUdMlSABOsjeCm6gmUzIdKxAuFrGiJ8QXMm3i09grZdDBMC/d8MELMrdwYRC0+YHg=="
+      "version": "1.4.450",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.450.tgz",
+      "integrity": "sha512-BLG5HxSELlrMx7dJ2s+8SFlsCtJp37Zpk2VAxyC6CZtbc+9AJeZHfYHbrlSgdXp6saQ8StMqOTEDaBKgA7u1sw=="
     },
     "elliptic": {
       "version": "6.5.4",
@@ -27285,9 +27310,9 @@
       "dev": true
     },
     "node-releases": {
-      "version": "2.0.10",
-      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.10.tgz",
-      "integrity": "sha512-5GFldHPXVG/YZmFzJvKK2zDSzPKhEp0+ZR5SVaoSag9fsL5YgHbUHDfnG5494ISANDcK4KwPXAx2xqVEydmd7w=="
+      "version": "2.0.12",
+      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.12.tgz",
+      "integrity": "sha512-QzsYKWhXTWx8h1kIvqfnC++o0pEmpRQA/aenALsL2F4pqNVr7YzcdMlDij5WBnwftRbJCNJL/O7zdKaxKPHqgQ=="
     },
     "normalize-path": {
       "version": "3.0.0",
@@ -29666,9 +29691,9 @@
       "integrity": "sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ=="
     },
     "update-browserslist-db": {
-      "version": "1.0.10",
-      "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.10.tgz",
-      "integrity": "sha512-OztqDenkfFkbSG+tRxBeAnCVPckDBcvibKd35yDONx6OU8N7sqgwc7rCbkJ/WcYtVRZ4ba68d6byhC21GFh7sQ==",
+      "version": "1.0.11",
+      "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.11.tgz",
+      "integrity": "sha512-dCwEFf0/oT85M1fHBg4F0jtLwJrutGoHSQXCh7u4o2t1drG+c0a9Flnqww6XUKSfQMPpJBRjU8d4RXB09qtvaA==",
       "requires": {
         "escalade": "^3.1.1",
         "picocolors": "^1.0.0"
diff --git a/apps/block_scout_web/assets/package.json b/apps/block_scout_web/assets/package.json
index 2d25539c8940..8f565b6e1d3f 100644
--- a/apps/block_scout_web/assets/package.json
+++ b/apps/block_scout_web/assets/package.json
@@ -83,7 +83,7 @@
     "xss": "^1.0.14"
   },
   "devDependencies": {
-    "@babel/core": "^7.22.5",
+    "@babel/core": "^7.22.6",
     "@babel/preset-env": "^7.22.5",
     "autoprefixer": "^10.4.14",
     "babel-loader": "^9.1.2",

From 50810966c7df21c35f71fc781e15bfd23458aa65 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 4 Jul 2023 18:19:59 +0000
Subject: [PATCH 155/909] Bump @amplitude/analytics-browser in
 /apps/block_scout_web/assets

Bumps [@amplitude/analytics-browser](https://github.com/amplitude/Amplitude-TypeScript) from 2.1.1 to 2.1.2.
- [Release notes](https://github.com/amplitude/Amplitude-TypeScript/releases)
- [Commits](https://github.com/amplitude/Amplitude-TypeScript/compare/@amplitude/analytics-browser@2.1.1...@amplitude/analytics-browser@2.1.2)

---
updated-dependencies:
- dependency-name: "@amplitude/analytics-browser"
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 apps/block_scout_web/assets/package-lock.json | 70 +++++++++----------
 apps/block_scout_web/assets/package.json      |  2 +-
 2 files changed, 36 insertions(+), 36 deletions(-)

diff --git a/apps/block_scout_web/assets/package-lock.json b/apps/block_scout_web/assets/package-lock.json
index 3aac88142b4b..399062d61135 100644
--- a/apps/block_scout_web/assets/package-lock.json
+++ b/apps/block_scout_web/assets/package-lock.json
@@ -7,7 +7,7 @@
       "name": "blockscout",
       "license": "GPL-3.0",
       "dependencies": {
-        "@amplitude/analytics-browser": "^2.1.1",
+        "@amplitude/analytics-browser": "^2.1.2",
         "@fortawesome/fontawesome-free": "^6.4.0",
         "@tarekraafat/autocomplete.js": "^10.2.7",
         "@walletconnect/web3-provider": "^1.8.0",
@@ -116,15 +116,15 @@
       }
     },
     "node_modules/@amplitude/analytics-browser": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/@amplitude/analytics-browser/-/analytics-browser-2.1.1.tgz",
-      "integrity": "sha512-fQbbPcIgfqqLZbQB9xUm4XXnxAJ+FJjvdH/TsKrT5/NPOOP6+t/quI4euYdj+3kZQI60KVhF6Z+PehwXlyfBEw==",
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/@amplitude/analytics-browser/-/analytics-browser-2.1.2.tgz",
+      "integrity": "sha512-1XoWJmLgGrszxupz61yCjen53bq7+kJN2gedu+kSrq/Ze9ow5R5QI0YfLyuzi1FHchzmSVWd2PheXOVYC4K/Cw==",
       "dependencies": {
-        "@amplitude/analytics-client-common": "^2.0.3",
+        "@amplitude/analytics-client-common": "^2.0.4",
         "@amplitude/analytics-core": "^2.0.3",
         "@amplitude/analytics-types": "^2.1.1",
-        "@amplitude/plugin-page-view-tracking-browser": "^2.0.3",
-        "@amplitude/plugin-web-attribution-browser": "^2.0.3",
+        "@amplitude/plugin-page-view-tracking-browser": "^2.0.4",
+        "@amplitude/plugin-web-attribution-browser": "^2.0.4",
         "tslib": "^2.4.1"
       }
     },
@@ -134,9 +134,9 @@
       "integrity": "sha512-tGyy4dAjRIEwI7BzsB0lynWgOpfqjUdq91XXAlIWD2OwKBH7oCl/GZG/HT4BOHrTlPMOASlMQ7veyTqpmRcrNA=="
     },
     "node_modules/@amplitude/analytics-client-common": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/@amplitude/analytics-client-common/-/analytics-client-common-2.0.3.tgz",
-      "integrity": "sha512-Sb5c3oHVnXosIgvgbBbSZJzvUt6vNgDZc4cNijR2QEWmRWbbUZcM1s5dwuV/0d4lIJA6n7Ewv60cGw1twn5zXw==",
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/@amplitude/analytics-client-common/-/analytics-client-common-2.0.4.tgz",
+      "integrity": "sha512-X0+zE8sODcQ2ioj9ZB98Gr/9FCRDiJuSixefaLrfng/4x5VwHK0if8biCqqBHXu6HlMpeMFrCyiABUTDT87QVA==",
       "dependencies": {
         "@amplitude/analytics-connector": "^1.4.8",
         "@amplitude/analytics-core": "^2.0.3",
@@ -174,11 +174,11 @@
       "integrity": "sha512-H3vebPR9onRdp0WzAZmI/4qmAE903uLOd2ZfMeHsVc1zaFTTCk46SoCuV4IrlF+VILrDw9Fy6gC9yl5N2PZcJQ=="
     },
     "node_modules/@amplitude/plugin-page-view-tracking-browser": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/@amplitude/plugin-page-view-tracking-browser/-/plugin-page-view-tracking-browser-2.0.3.tgz",
-      "integrity": "sha512-Rqy/x2OOCipRV+YEp0TRB0Dig/9Wsu3I9X3/kMD015B8a17p44Rgob6gVJKXl4JgMtZb2ZMgq52gqgGwolqhMQ==",
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/@amplitude/plugin-page-view-tracking-browser/-/plugin-page-view-tracking-browser-2.0.4.tgz",
+      "integrity": "sha512-XQlgydCmfUb+mkXjD8NoOU80eO/578m2AupRcV0dPKwk+VN5D7D1s+xXYM6Bg7l1HSJx2mt0Qwa5xsdSCFzF2g==",
       "dependencies": {
-        "@amplitude/analytics-client-common": "^2.0.3",
+        "@amplitude/analytics-client-common": "^2.0.4",
         "@amplitude/analytics-types": "^2.1.1",
         "tslib": "^2.4.1"
       }
@@ -189,11 +189,11 @@
       "integrity": "sha512-7At1WUettjcSRHXCyYtTselblcHl9PJFFVKiCAy/bY97+BPZXSQ2wbq0P9s8tK2G7dFQfNnlJnPAiArVBVBsfA=="
     },
     "node_modules/@amplitude/plugin-web-attribution-browser": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/@amplitude/plugin-web-attribution-browser/-/plugin-web-attribution-browser-2.0.3.tgz",
-      "integrity": "sha512-WojjFTZ5fPCgwyY9lBYN9KXfm+5b6DlezAfEUe9IURRyyfGgCVJOL+BKAiMwP49wQiwwVNtP2SqcVSOQ+9tYjw==",
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/@amplitude/plugin-web-attribution-browser/-/plugin-web-attribution-browser-2.0.4.tgz",
+      "integrity": "sha512-y/VQjDH7tnevRlKO9IWzELF9L87MwiR+y7WCRxR5/wRGKDxKS5Ol33vHYWe1RaOzkC/7wO0px7pZGRZkj/X+1Q==",
       "dependencies": {
-        "@amplitude/analytics-client-common": "^2.0.3",
+        "@amplitude/analytics-client-common": "^2.0.4",
         "@amplitude/analytics-core": "^2.0.3",
         "@amplitude/analytics-types": "^2.1.1",
         "tslib": "^2.4.1"
@@ -17487,15 +17487,15 @@
       "dev": true
     },
     "@amplitude/analytics-browser": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/@amplitude/analytics-browser/-/analytics-browser-2.1.1.tgz",
-      "integrity": "sha512-fQbbPcIgfqqLZbQB9xUm4XXnxAJ+FJjvdH/TsKrT5/NPOOP6+t/quI4euYdj+3kZQI60KVhF6Z+PehwXlyfBEw==",
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/@amplitude/analytics-browser/-/analytics-browser-2.1.2.tgz",
+      "integrity": "sha512-1XoWJmLgGrszxupz61yCjen53bq7+kJN2gedu+kSrq/Ze9ow5R5QI0YfLyuzi1FHchzmSVWd2PheXOVYC4K/Cw==",
       "requires": {
-        "@amplitude/analytics-client-common": "^2.0.3",
+        "@amplitude/analytics-client-common": "^2.0.4",
         "@amplitude/analytics-core": "^2.0.3",
         "@amplitude/analytics-types": "^2.1.1",
-        "@amplitude/plugin-page-view-tracking-browser": "^2.0.3",
-        "@amplitude/plugin-web-attribution-browser": "^2.0.3",
+        "@amplitude/plugin-page-view-tracking-browser": "^2.0.4",
+        "@amplitude/plugin-web-attribution-browser": "^2.0.4",
         "tslib": "^2.4.1"
       },
       "dependencies": {
@@ -17507,9 +17507,9 @@
       }
     },
     "@amplitude/analytics-client-common": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/@amplitude/analytics-client-common/-/analytics-client-common-2.0.3.tgz",
-      "integrity": "sha512-Sb5c3oHVnXosIgvgbBbSZJzvUt6vNgDZc4cNijR2QEWmRWbbUZcM1s5dwuV/0d4lIJA6n7Ewv60cGw1twn5zXw==",
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/@amplitude/analytics-client-common/-/analytics-client-common-2.0.4.tgz",
+      "integrity": "sha512-X0+zE8sODcQ2ioj9ZB98Gr/9FCRDiJuSixefaLrfng/4x5VwHK0if8biCqqBHXu6HlMpeMFrCyiABUTDT87QVA==",
       "requires": {
         "@amplitude/analytics-connector": "^1.4.8",
         "@amplitude/analytics-core": "^2.0.3",
@@ -17551,11 +17551,11 @@
       "integrity": "sha512-H3vebPR9onRdp0WzAZmI/4qmAE903uLOd2ZfMeHsVc1zaFTTCk46SoCuV4IrlF+VILrDw9Fy6gC9yl5N2PZcJQ=="
     },
     "@amplitude/plugin-page-view-tracking-browser": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/@amplitude/plugin-page-view-tracking-browser/-/plugin-page-view-tracking-browser-2.0.3.tgz",
-      "integrity": "sha512-Rqy/x2OOCipRV+YEp0TRB0Dig/9Wsu3I9X3/kMD015B8a17p44Rgob6gVJKXl4JgMtZb2ZMgq52gqgGwolqhMQ==",
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/@amplitude/plugin-page-view-tracking-browser/-/plugin-page-view-tracking-browser-2.0.4.tgz",
+      "integrity": "sha512-XQlgydCmfUb+mkXjD8NoOU80eO/578m2AupRcV0dPKwk+VN5D7D1s+xXYM6Bg7l1HSJx2mt0Qwa5xsdSCFzF2g==",
       "requires": {
-        "@amplitude/analytics-client-common": "^2.0.3",
+        "@amplitude/analytics-client-common": "^2.0.4",
         "@amplitude/analytics-types": "^2.1.1",
         "tslib": "^2.4.1"
       },
@@ -17568,11 +17568,11 @@
       }
     },
     "@amplitude/plugin-web-attribution-browser": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/@amplitude/plugin-web-attribution-browser/-/plugin-web-attribution-browser-2.0.3.tgz",
-      "integrity": "sha512-WojjFTZ5fPCgwyY9lBYN9KXfm+5b6DlezAfEUe9IURRyyfGgCVJOL+BKAiMwP49wQiwwVNtP2SqcVSOQ+9tYjw==",
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/@amplitude/plugin-web-attribution-browser/-/plugin-web-attribution-browser-2.0.4.tgz",
+      "integrity": "sha512-y/VQjDH7tnevRlKO9IWzELF9L87MwiR+y7WCRxR5/wRGKDxKS5Ol33vHYWe1RaOzkC/7wO0px7pZGRZkj/X+1Q==",
       "requires": {
-        "@amplitude/analytics-client-common": "^2.0.3",
+        "@amplitude/analytics-client-common": "^2.0.4",
         "@amplitude/analytics-core": "^2.0.3",
         "@amplitude/analytics-types": "^2.1.1",
         "tslib": "^2.4.1"
diff --git a/apps/block_scout_web/assets/package.json b/apps/block_scout_web/assets/package.json
index 2d25539c8940..7c55801d15c9 100644
--- a/apps/block_scout_web/assets/package.json
+++ b/apps/block_scout_web/assets/package.json
@@ -20,7 +20,7 @@
   },
   "dependencies": {
     "@fortawesome/fontawesome-free": "^6.4.0",
-    "@amplitude/analytics-browser": "^2.1.1",
+    "@amplitude/analytics-browser": "^2.1.2",
     "@tarekraafat/autocomplete.js": "^10.2.7",
     "@walletconnect/web3-provider": "^1.8.0",
     "assert": "^2.0.0",

From 8027a57db82ef4e1316833b6f399f95ee9b42901 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 4 Jul 2023 18:20:44 +0000
Subject: [PATCH 156/909] Bump jest-environment-jsdom in
 /apps/block_scout_web/assets

Bumps [jest-environment-jsdom](https://github.com/facebook/jest/tree/HEAD/packages/jest-environment-jsdom) from 29.5.0 to 29.6.0.
- [Release notes](https://github.com/facebook/jest/releases)
- [Changelog](https://github.com/jestjs/jest/blob/main/CHANGELOG.md)
- [Commits](https://github.com/facebook/jest/commits/v29.6.0/packages/jest-environment-jsdom)

---
updated-dependencies:
- dependency-name: jest-environment-jsdom
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 apps/block_scout_web/assets/package-lock.json | 202 +++++++++---------
 apps/block_scout_web/assets/package.json      |   2 +-
 2 files changed, 102 insertions(+), 102 deletions(-)

diff --git a/apps/block_scout_web/assets/package-lock.json b/apps/block_scout_web/assets/package-lock.json
index 3aac88142b4b..4393861b1cc6 100644
--- a/apps/block_scout_web/assets/package-lock.json
+++ b/apps/block_scout_web/assets/package-lock.json
@@ -85,7 +85,7 @@
         "eslint-plugin-promise": "^6.1.1",
         "file-loader": "^6.2.0",
         "jest": "^29.5.0",
-        "jest-environment-jsdom": "^29.5.0",
+        "jest-environment-jsdom": "^29.6.0",
         "mini-css-extract-plugin": "^2.7.6",
         "postcss": "^8.4.24",
         "postcss-loader": "^7.3.3",
@@ -2831,15 +2831,15 @@
       }
     },
     "node_modules/@jest/environment": {
-      "version": "29.5.0",
-      "resolved": "https://registry.npmjs.org/@jest/environment/-/environment-29.5.0.tgz",
-      "integrity": "sha512-5FXw2+wD29YU1d4I2htpRX7jYnAyTRjP2CsXQdo9SAM8g3ifxWPSV0HnClSn71xwctr0U3oZIIH+dtbfmnbXVQ==",
+      "version": "29.6.0",
+      "resolved": "https://registry.npmjs.org/@jest/environment/-/environment-29.6.0.tgz",
+      "integrity": "sha512-bUZLYUxYlUIsslBbxII0fq0kr1+friI3Gty+cRLmocGB1jdcAHs7FS8QdCDqedE8q4DZE1g/AJHH6OJZBLGGsg==",
       "dev": true,
       "dependencies": {
-        "@jest/fake-timers": "^29.5.0",
-        "@jest/types": "^29.5.0",
+        "@jest/fake-timers": "^29.6.0",
+        "@jest/types": "^29.6.0",
         "@types/node": "*",
-        "jest-mock": "^29.5.0"
+        "jest-mock": "^29.6.0"
       },
       "engines": {
         "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
@@ -2871,17 +2871,17 @@
       }
     },
     "node_modules/@jest/fake-timers": {
-      "version": "29.5.0",
-      "resolved": "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-29.5.0.tgz",
-      "integrity": "sha512-9ARvuAAQcBwDAqOnglWq2zwNIRUDtk/SCkp/ToGEhFv5r86K21l+VEs0qNTaXtyiY0lEePl3kylijSYJQqdbDg==",
+      "version": "29.6.0",
+      "resolved": "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-29.6.0.tgz",
+      "integrity": "sha512-nuCU46AsZoskthWSDS2Aj6LARgyNcp5Fjx2qxsO/fPl1Wp1CJ+dBDqs0OkEcJK8FBeV/MbjH5efe79M2sHcV+A==",
       "dev": true,
       "dependencies": {
-        "@jest/types": "^29.5.0",
+        "@jest/types": "^29.6.0",
         "@sinonjs/fake-timers": "^10.0.2",
         "@types/node": "*",
-        "jest-message-util": "^29.5.0",
-        "jest-mock": "^29.5.0",
-        "jest-util": "^29.5.0"
+        "jest-message-util": "^29.6.0",
+        "jest-mock": "^29.6.0",
+        "jest-util": "^29.6.0"
       },
       "engines": {
         "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
@@ -3046,12 +3046,12 @@
       }
     },
     "node_modules/@jest/schemas": {
-      "version": "29.4.3",
-      "resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-29.4.3.tgz",
-      "integrity": "sha512-VLYKXQmtmuEz6IxJsrZwzG9NvtkQsWNnWMsKxqWNu3+CnfzJQhp0WDDKWLVV9hLKr0l3SLLFRqcYHjhtyuDVxg==",
+      "version": "29.6.0",
+      "resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-29.6.0.tgz",
+      "integrity": "sha512-rxLjXyJBTL4LQeJW3aKo0M/+GkCOXsO+8i9Iu7eDb6KwtP65ayoDsitrdPBtujxQ88k4wI2FNYfa6TOGwSn6cQ==",
       "dev": true,
       "dependencies": {
-        "@sinclair/typebox": "^0.25.16"
+        "@sinclair/typebox": "^0.27.8"
       },
       "engines": {
         "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
@@ -3204,12 +3204,12 @@
       }
     },
     "node_modules/@jest/types": {
-      "version": "29.5.0",
-      "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.5.0.tgz",
-      "integrity": "sha512-qbu7kN6czmVRc3xWFQcAN03RAUamgppVUdXrvl1Wr3jlNF93o9mJbGcDWrwGB6ht44u7efB1qCFgVQmca24Uog==",
+      "version": "29.6.0",
+      "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.0.tgz",
+      "integrity": "sha512-8XCgL9JhqbJTFnMRjEAO+TuW251+MoMd5BSzLiE3vvzpQ8RlBxy8NoyNkDhs3K3OL3HeVinlOl9or5p7GTeOLg==",
       "dev": true,
       "dependencies": {
-        "@jest/schemas": "^29.4.3",
+        "@jest/schemas": "^29.6.0",
         "@types/istanbul-lib-coverage": "^2.0.0",
         "@types/istanbul-reports": "^3.0.0",
         "@types/node": "*",
@@ -3389,9 +3389,9 @@
       }
     },
     "node_modules/@sinclair/typebox": {
-      "version": "0.25.21",
-      "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.25.21.tgz",
-      "integrity": "sha512-gFukHN4t8K4+wVC+ECqeqwzBDeFeTzBXroBTqE6vcWrQGbEUpHO7LYdG0f4xnvYq4VOEwITSlHlp0JBAIFMS/g==",
+      "version": "0.27.8",
+      "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.27.8.tgz",
+      "integrity": "sha512-+Fj43pSMwJs4KRrH/938Uf+uAELIgVBmQzg/q1YG10djyfA3TnrU8N8XzqCh/okZdszqBQTZf96idMfE5lnwTA==",
       "dev": true
     },
     "node_modules/@sindresorhus/is": {
@@ -10601,18 +10601,18 @@
       }
     },
     "node_modules/jest-environment-jsdom": {
-      "version": "29.5.0",
-      "resolved": "https://registry.npmjs.org/jest-environment-jsdom/-/jest-environment-jsdom-29.5.0.tgz",
-      "integrity": "sha512-/KG8yEK4aN8ak56yFVdqFDzKNHgF4BAymCx2LbPNPsUshUlfAl0eX402Xm1pt+eoG9SLZEUVifqXtX8SK74KCw==",
+      "version": "29.6.0",
+      "resolved": "https://registry.npmjs.org/jest-environment-jsdom/-/jest-environment-jsdom-29.6.0.tgz",
+      "integrity": "sha512-/cOhoyv+uMbOh4nQPyqtkPas/uUxr5AbK6TPqMMFyj1qEJURY78RhqgBjOFIX02+Lvu5V0RWLq2qKY1dHubFOQ==",
       "dev": true,
       "dependencies": {
-        "@jest/environment": "^29.5.0",
-        "@jest/fake-timers": "^29.5.0",
-        "@jest/types": "^29.5.0",
+        "@jest/environment": "^29.6.0",
+        "@jest/fake-timers": "^29.6.0",
+        "@jest/types": "^29.6.0",
         "@types/jsdom": "^20.0.0",
         "@types/node": "*",
-        "jest-mock": "^29.5.0",
-        "jest-util": "^29.5.0",
+        "jest-mock": "^29.6.0",
+        "jest-util": "^29.6.0",
         "jsdom": "^20.0.0"
       },
       "engines": {
@@ -10816,18 +10816,18 @@
       }
     },
     "node_modules/jest-message-util": {
-      "version": "29.5.0",
-      "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-29.5.0.tgz",
-      "integrity": "sha512-Kijeg9Dag6CKtIDA7O21zNTACqD5MD/8HfIV8pdD94vFyFuer52SigdC3IQMhab3vACxXMiFk+yMHNdbqtyTGA==",
+      "version": "29.6.0",
+      "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-29.6.0.tgz",
+      "integrity": "sha512-mkCp56cETbpoNtsaeWVy6SKzk228mMi9FPHSObaRIhbR2Ujw9PqjW/yqVHD2tN1bHbC8ol6h3UEo7dOPmIYwIA==",
       "dev": true,
       "dependencies": {
         "@babel/code-frame": "^7.12.13",
-        "@jest/types": "^29.5.0",
+        "@jest/types": "^29.6.0",
         "@types/stack-utils": "^2.0.0",
         "chalk": "^4.0.0",
         "graceful-fs": "^4.2.9",
         "micromatch": "^4.0.4",
-        "pretty-format": "^29.5.0",
+        "pretty-format": "^29.6.0",
         "slash": "^3.0.0",
         "stack-utils": "^2.0.3"
       },
@@ -10906,14 +10906,14 @@
       }
     },
     "node_modules/jest-mock": {
-      "version": "29.5.0",
-      "resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-29.5.0.tgz",
-      "integrity": "sha512-GqOzvdWDE4fAV2bWQLQCkujxYWL7RxjCnj71b5VhDAGOevB3qj3Ovg26A5NI84ZpODxyzaozXLOh2NCgkbvyaw==",
+      "version": "29.6.0",
+      "resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-29.6.0.tgz",
+      "integrity": "sha512-2Pb7R2w24Q0aUVn+2/vdRDL6CqGqpheDZy7zrXav8FotOpSGw/4bS2hyVoKHMEx4xzOn6EyCAGwc5czWxXeN7w==",
       "dev": true,
       "dependencies": {
-        "@jest/types": "^29.5.0",
+        "@jest/types": "^29.6.0",
         "@types/node": "*",
-        "jest-util": "^29.5.0"
+        "jest-util": "^29.6.0"
       },
       "engines": {
         "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
@@ -11413,12 +11413,12 @@
       }
     },
     "node_modules/jest-util": {
-      "version": "29.5.0",
-      "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-29.5.0.tgz",
-      "integrity": "sha512-RYMgG/MTadOr5t8KdhejfvUU82MxsCu5MF6KuDUHl+NuwzUt+Sm6jJWxTJVrDR1j5M/gJVCPKQEpWXY+yIQ6lQ==",
+      "version": "29.6.0",
+      "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-29.6.0.tgz",
+      "integrity": "sha512-S0USx9YwcvEm4pQ5suisVm/RVxBmi0GFR7ocJhIeaCuW5AXnAnffXbaVKvIFodyZNOc9ygzVtTxmBf40HsHXaA==",
       "dev": true,
       "dependencies": {
-        "@jest/types": "^29.5.0",
+        "@jest/types": "^29.6.0",
         "@types/node": "*",
         "chalk": "^4.0.0",
         "ci-info": "^3.2.0",
@@ -13991,12 +13991,12 @@
       }
     },
     "node_modules/pretty-format": {
-      "version": "29.5.0",
-      "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-29.5.0.tgz",
-      "integrity": "sha512-V2mGkI31qdttvTFX7Mt4efOqHXqJWMu4/r66Xh3Z3BwZaPfPJgp6/gbwoujRpPUtfEF6AUUWx3Jim3GCw5g/Qw==",
+      "version": "29.6.0",
+      "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-29.6.0.tgz",
+      "integrity": "sha512-XH+D4n7Ey0iSR6PdAnBs99cWMZdGsdKrR33iUHQNr79w1szKTCIZDVdXuccAsHVwDBp0XeWPfNEoaxP9EZgRmQ==",
       "dev": true,
       "dependencies": {
-        "@jest/schemas": "^29.4.3",
+        "@jest/schemas": "^29.6.0",
         "ansi-styles": "^5.0.0",
         "react-is": "^18.0.0"
       },
@@ -19380,15 +19380,15 @@
       }
     },
     "@jest/environment": {
-      "version": "29.5.0",
-      "resolved": "https://registry.npmjs.org/@jest/environment/-/environment-29.5.0.tgz",
-      "integrity": "sha512-5FXw2+wD29YU1d4I2htpRX7jYnAyTRjP2CsXQdo9SAM8g3ifxWPSV0HnClSn71xwctr0U3oZIIH+dtbfmnbXVQ==",
+      "version": "29.6.0",
+      "resolved": "https://registry.npmjs.org/@jest/environment/-/environment-29.6.0.tgz",
+      "integrity": "sha512-bUZLYUxYlUIsslBbxII0fq0kr1+friI3Gty+cRLmocGB1jdcAHs7FS8QdCDqedE8q4DZE1g/AJHH6OJZBLGGsg==",
       "dev": true,
       "requires": {
-        "@jest/fake-timers": "^29.5.0",
-        "@jest/types": "^29.5.0",
+        "@jest/fake-timers": "^29.6.0",
+        "@jest/types": "^29.6.0",
         "@types/node": "*",
-        "jest-mock": "^29.5.0"
+        "jest-mock": "^29.6.0"
       }
     },
     "@jest/expect": {
@@ -19411,17 +19411,17 @@
       }
     },
     "@jest/fake-timers": {
-      "version": "29.5.0",
-      "resolved": "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-29.5.0.tgz",
-      "integrity": "sha512-9ARvuAAQcBwDAqOnglWq2zwNIRUDtk/SCkp/ToGEhFv5r86K21l+VEs0qNTaXtyiY0lEePl3kylijSYJQqdbDg==",
+      "version": "29.6.0",
+      "resolved": "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-29.6.0.tgz",
+      "integrity": "sha512-nuCU46AsZoskthWSDS2Aj6LARgyNcp5Fjx2qxsO/fPl1Wp1CJ+dBDqs0OkEcJK8FBeV/MbjH5efe79M2sHcV+A==",
       "dev": true,
       "requires": {
-        "@jest/types": "^29.5.0",
+        "@jest/types": "^29.6.0",
         "@sinonjs/fake-timers": "^10.0.2",
         "@types/node": "*",
-        "jest-message-util": "^29.5.0",
-        "jest-mock": "^29.5.0",
-        "jest-util": "^29.5.0"
+        "jest-message-util": "^29.6.0",
+        "jest-mock": "^29.6.0",
+        "jest-util": "^29.6.0"
       }
     },
     "@jest/globals": {
@@ -19543,12 +19543,12 @@
       }
     },
     "@jest/schemas": {
-      "version": "29.4.3",
-      "resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-29.4.3.tgz",
-      "integrity": "sha512-VLYKXQmtmuEz6IxJsrZwzG9NvtkQsWNnWMsKxqWNu3+CnfzJQhp0WDDKWLVV9hLKr0l3SLLFRqcYHjhtyuDVxg==",
+      "version": "29.6.0",
+      "resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-29.6.0.tgz",
+      "integrity": "sha512-rxLjXyJBTL4LQeJW3aKo0M/+GkCOXsO+8i9Iu7eDb6KwtP65ayoDsitrdPBtujxQ88k4wI2FNYfa6TOGwSn6cQ==",
       "dev": true,
       "requires": {
-        "@sinclair/typebox": "^0.25.16"
+        "@sinclair/typebox": "^0.27.8"
       }
     },
     "@jest/source-map": {
@@ -19667,12 +19667,12 @@
       }
     },
     "@jest/types": {
-      "version": "29.5.0",
-      "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.5.0.tgz",
-      "integrity": "sha512-qbu7kN6czmVRc3xWFQcAN03RAUamgppVUdXrvl1Wr3jlNF93o9mJbGcDWrwGB6ht44u7efB1qCFgVQmca24Uog==",
+      "version": "29.6.0",
+      "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.0.tgz",
+      "integrity": "sha512-8XCgL9JhqbJTFnMRjEAO+TuW251+MoMd5BSzLiE3vvzpQ8RlBxy8NoyNkDhs3K3OL3HeVinlOl9or5p7GTeOLg==",
       "dev": true,
       "requires": {
-        "@jest/schemas": "^29.4.3",
+        "@jest/schemas": "^29.6.0",
         "@types/istanbul-lib-coverage": "^2.0.0",
         "@types/istanbul-reports": "^3.0.0",
         "@types/node": "*",
@@ -19812,9 +19812,9 @@
       }
     },
     "@sinclair/typebox": {
-      "version": "0.25.21",
-      "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.25.21.tgz",
-      "integrity": "sha512-gFukHN4t8K4+wVC+ECqeqwzBDeFeTzBXroBTqE6vcWrQGbEUpHO7LYdG0f4xnvYq4VOEwITSlHlp0JBAIFMS/g==",
+      "version": "0.27.8",
+      "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.27.8.tgz",
+      "integrity": "sha512-+Fj43pSMwJs4KRrH/938Uf+uAELIgVBmQzg/q1YG10djyfA3TnrU8N8XzqCh/okZdszqBQTZf96idMfE5lnwTA==",
       "dev": true
     },
     "@sindresorhus/is": {
@@ -25446,18 +25446,18 @@
       }
     },
     "jest-environment-jsdom": {
-      "version": "29.5.0",
-      "resolved": "https://registry.npmjs.org/jest-environment-jsdom/-/jest-environment-jsdom-29.5.0.tgz",
-      "integrity": "sha512-/KG8yEK4aN8ak56yFVdqFDzKNHgF4BAymCx2LbPNPsUshUlfAl0eX402Xm1pt+eoG9SLZEUVifqXtX8SK74KCw==",
+      "version": "29.6.0",
+      "resolved": "https://registry.npmjs.org/jest-environment-jsdom/-/jest-environment-jsdom-29.6.0.tgz",
+      "integrity": "sha512-/cOhoyv+uMbOh4nQPyqtkPas/uUxr5AbK6TPqMMFyj1qEJURY78RhqgBjOFIX02+Lvu5V0RWLq2qKY1dHubFOQ==",
       "dev": true,
       "requires": {
-        "@jest/environment": "^29.5.0",
-        "@jest/fake-timers": "^29.5.0",
-        "@jest/types": "^29.5.0",
+        "@jest/environment": "^29.6.0",
+        "@jest/fake-timers": "^29.6.0",
+        "@jest/types": "^29.6.0",
         "@types/jsdom": "^20.0.0",
         "@types/node": "*",
-        "jest-mock": "^29.5.0",
-        "jest-util": "^29.5.0",
+        "jest-mock": "^29.6.0",
+        "jest-util": "^29.6.0",
         "jsdom": "^20.0.0"
       }
     },
@@ -25604,18 +25604,18 @@
       }
     },
     "jest-message-util": {
-      "version": "29.5.0",
-      "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-29.5.0.tgz",
-      "integrity": "sha512-Kijeg9Dag6CKtIDA7O21zNTACqD5MD/8HfIV8pdD94vFyFuer52SigdC3IQMhab3vACxXMiFk+yMHNdbqtyTGA==",
+      "version": "29.6.0",
+      "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-29.6.0.tgz",
+      "integrity": "sha512-mkCp56cETbpoNtsaeWVy6SKzk228mMi9FPHSObaRIhbR2Ujw9PqjW/yqVHD2tN1bHbC8ol6h3UEo7dOPmIYwIA==",
       "dev": true,
       "requires": {
         "@babel/code-frame": "^7.12.13",
-        "@jest/types": "^29.5.0",
+        "@jest/types": "^29.6.0",
         "@types/stack-utils": "^2.0.0",
         "chalk": "^4.0.0",
         "graceful-fs": "^4.2.9",
         "micromatch": "^4.0.4",
-        "pretty-format": "^29.5.0",
+        "pretty-format": "^29.6.0",
         "slash": "^3.0.0",
         "stack-utils": "^2.0.3"
       },
@@ -25672,14 +25672,14 @@
       }
     },
     "jest-mock": {
-      "version": "29.5.0",
-      "resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-29.5.0.tgz",
-      "integrity": "sha512-GqOzvdWDE4fAV2bWQLQCkujxYWL7RxjCnj71b5VhDAGOevB3qj3Ovg26A5NI84ZpODxyzaozXLOh2NCgkbvyaw==",
+      "version": "29.6.0",
+      "resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-29.6.0.tgz",
+      "integrity": "sha512-2Pb7R2w24Q0aUVn+2/vdRDL6CqGqpheDZy7zrXav8FotOpSGw/4bS2hyVoKHMEx4xzOn6EyCAGwc5czWxXeN7w==",
       "dev": true,
       "requires": {
-        "@jest/types": "^29.5.0",
+        "@jest/types": "^29.6.0",
         "@types/node": "*",
-        "jest-util": "^29.5.0"
+        "jest-util": "^29.6.0"
       }
     },
     "jest-pnp-resolver": {
@@ -26059,12 +26059,12 @@
       }
     },
     "jest-util": {
-      "version": "29.5.0",
-      "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-29.5.0.tgz",
-      "integrity": "sha512-RYMgG/MTadOr5t8KdhejfvUU82MxsCu5MF6KuDUHl+NuwzUt+Sm6jJWxTJVrDR1j5M/gJVCPKQEpWXY+yIQ6lQ==",
+      "version": "29.6.0",
+      "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-29.6.0.tgz",
+      "integrity": "sha512-S0USx9YwcvEm4pQ5suisVm/RVxBmi0GFR7ocJhIeaCuW5AXnAnffXbaVKvIFodyZNOc9ygzVtTxmBf40HsHXaA==",
       "dev": true,
       "requires": {
-        "@jest/types": "^29.5.0",
+        "@jest/types": "^29.6.0",
         "@types/node": "*",
         "chalk": "^4.0.0",
         "ci-info": "^3.2.0",
@@ -28009,12 +28009,12 @@
       "dev": true
     },
     "pretty-format": {
-      "version": "29.5.0",
-      "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-29.5.0.tgz",
-      "integrity": "sha512-V2mGkI31qdttvTFX7Mt4efOqHXqJWMu4/r66Xh3Z3BwZaPfPJgp6/gbwoujRpPUtfEF6AUUWx3Jim3GCw5g/Qw==",
+      "version": "29.6.0",
+      "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-29.6.0.tgz",
+      "integrity": "sha512-XH+D4n7Ey0iSR6PdAnBs99cWMZdGsdKrR33iUHQNr79w1szKTCIZDVdXuccAsHVwDBp0XeWPfNEoaxP9EZgRmQ==",
       "dev": true,
       "requires": {
-        "@jest/schemas": "^29.4.3",
+        "@jest/schemas": "^29.6.0",
         "ansi-styles": "^5.0.0",
         "react-is": "^18.0.0"
       },
diff --git a/apps/block_scout_web/assets/package.json b/apps/block_scout_web/assets/package.json
index 2d25539c8940..b9141b95ff04 100644
--- a/apps/block_scout_web/assets/package.json
+++ b/apps/block_scout_web/assets/package.json
@@ -97,7 +97,7 @@
     "eslint-plugin-promise": "^6.1.1",
     "file-loader": "^6.2.0",
     "jest": "^29.5.0",
-    "jest-environment-jsdom": "^29.5.0",
+    "jest-environment-jsdom": "^29.6.0",
     "mini-css-extract-plugin": "^2.7.6",
     "postcss": "^8.4.24",
     "postcss-loader": "^7.3.3",

From a863945c43fdce61ba20ca26f48c3ba05c8b2e78 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 4 Jul 2023 20:03:24 +0000
Subject: [PATCH 157/909] Bump @babel/preset-env in
 /apps/block_scout_web/assets

Bumps [@babel/preset-env](https://github.com/babel/babel/tree/HEAD/packages/babel-preset-env) from 7.22.5 to 7.22.6.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/commits/v7.22.6/packages/babel-preset-env)

---
updated-dependencies:
- dependency-name: "@babel/preset-env"
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 apps/block_scout_web/assets/package-lock.json | 82 +++++++++----------
 apps/block_scout_web/assets/package.json      |  2 +-
 2 files changed, 42 insertions(+), 42 deletions(-)

diff --git a/apps/block_scout_web/assets/package-lock.json b/apps/block_scout_web/assets/package-lock.json
index 70f1facf5d96..4089d34a807e 100644
--- a/apps/block_scout_web/assets/package-lock.json
+++ b/apps/block_scout_web/assets/package-lock.json
@@ -72,7 +72,7 @@
       },
       "devDependencies": {
         "@babel/core": "^7.22.6",
-        "@babel/preset-env": "^7.22.5",
+        "@babel/preset-env": "^7.22.6",
         "autoprefixer": "^10.4.14",
         "babel-loader": "^9.1.2",
         "copy-webpack-plugin": "^11.0.0",
@@ -1088,19 +1088,19 @@
       }
     },
     "node_modules/@babel/plugin-transform-classes": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.22.5.tgz",
-      "integrity": "sha512-2edQhLfibpWpsVBx2n/GKOz6JdGQvLruZQfGr9l1qes2KQaWswjBzhQF7UDUZMNaMMQeYnQzxwOMPsbYF7wqPQ==",
+      "version": "7.22.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.22.6.tgz",
+      "integrity": "sha512-58EgM6nuPNG6Py4Z3zSuu0xWu2VfodiMi72Jt5Kj2FECmaYk1RrTXA45z6KBFsu9tRgwQDwIiY4FXTt+YsSFAQ==",
       "dev": true,
       "dependencies": {
         "@babel/helper-annotate-as-pure": "^7.22.5",
-        "@babel/helper-compilation-targets": "^7.22.5",
+        "@babel/helper-compilation-targets": "^7.22.6",
         "@babel/helper-environment-visitor": "^7.22.5",
         "@babel/helper-function-name": "^7.22.5",
         "@babel/helper-optimise-call-expression": "^7.22.5",
         "@babel/helper-plugin-utils": "^7.22.5",
         "@babel/helper-replace-supers": "^7.22.5",
-        "@babel/helper-split-export-declaration": "^7.22.5",
+        "@babel/helper-split-export-declaration": "^7.22.6",
         "globals": "^11.1.0"
       },
       "engines": {
@@ -1496,9 +1496,9 @@
       }
     },
     "node_modules/@babel/plugin-transform-optional-chaining": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-optional-chaining/-/plugin-transform-optional-chaining-7.22.5.tgz",
-      "integrity": "sha512-AconbMKOMkyG+xCng2JogMCDcqW8wedQAqpVIL4cOSescZ7+iW8utC6YDZLMCSUIReEA733gzRSaOSXMAt/4WQ==",
+      "version": "7.22.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-optional-chaining/-/plugin-transform-optional-chaining-7.22.6.tgz",
+      "integrity": "sha512-Vd5HiWml0mDVtcLHIoEU5sw6HOUW/Zk0acLs/SAeuLzkGNOPc9DB4nkUajemhCmTIz3eiaKREZn2hQQqF79YTg==",
       "dev": true,
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.22.5",
@@ -1778,13 +1778,13 @@
       }
     },
     "node_modules/@babel/preset-env": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.22.5.tgz",
-      "integrity": "sha512-fj06hw89dpiZzGZtxn+QybifF07nNiZjZ7sazs2aVDcysAZVGjW7+7iFYxg6GLNM47R/thYfLdrXc+2f11Vi9A==",
+      "version": "7.22.6",
+      "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.22.6.tgz",
+      "integrity": "sha512-IHr0AXHGk8oh8HYSs45Mxuv6iySUBwDTIzJSnXN7PURqHdxJVQlCoXmKJgyvSS9bcNf9NVRVE35z+LkCvGmi6w==",
       "dev": true,
       "dependencies": {
-        "@babel/compat-data": "^7.22.5",
-        "@babel/helper-compilation-targets": "^7.22.5",
+        "@babel/compat-data": "^7.22.6",
+        "@babel/helper-compilation-targets": "^7.22.6",
         "@babel/helper-plugin-utils": "^7.22.5",
         "@babel/helper-validator-option": "^7.22.5",
         "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": "^7.22.5",
@@ -1815,7 +1815,7 @@
         "@babel/plugin-transform-block-scoping": "^7.22.5",
         "@babel/plugin-transform-class-properties": "^7.22.5",
         "@babel/plugin-transform-class-static-block": "^7.22.5",
-        "@babel/plugin-transform-classes": "^7.22.5",
+        "@babel/plugin-transform-classes": "^7.22.6",
         "@babel/plugin-transform-computed-properties": "^7.22.5",
         "@babel/plugin-transform-destructuring": "^7.22.5",
         "@babel/plugin-transform-dotall-regex": "^7.22.5",
@@ -1840,7 +1840,7 @@
         "@babel/plugin-transform-object-rest-spread": "^7.22.5",
         "@babel/plugin-transform-object-super": "^7.22.5",
         "@babel/plugin-transform-optional-catch-binding": "^7.22.5",
-        "@babel/plugin-transform-optional-chaining": "^7.22.5",
+        "@babel/plugin-transform-optional-chaining": "^7.22.6",
         "@babel/plugin-transform-parameters": "^7.22.5",
         "@babel/plugin-transform-private-methods": "^7.22.5",
         "@babel/plugin-transform-private-property-in-object": "^7.22.5",
@@ -1858,11 +1858,11 @@
         "@babel/plugin-transform-unicode-sets-regex": "^7.22.5",
         "@babel/preset-modules": "^0.1.5",
         "@babel/types": "^7.22.5",
+        "@nicolo-ribaudo/semver-v6": "^6.3.3",
         "babel-plugin-polyfill-corejs2": "^0.4.3",
         "babel-plugin-polyfill-corejs3": "^0.8.1",
         "babel-plugin-polyfill-regenerator": "^0.5.0",
-        "core-js-compat": "^3.30.2",
-        "semver": "^6.3.0"
+        "core-js-compat": "^3.31.0"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -5855,9 +5855,9 @@
       }
     },
     "node_modules/core-js-compat": {
-      "version": "3.30.2",
-      "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.30.2.tgz",
-      "integrity": "sha512-nriW1nuJjUgvkEjIot1Spwakz52V9YkYHZAQG6A1eCgC8AA1p0zngrQEP9R0+V6hji5XilWKG1Bd0YRppmGimA==",
+      "version": "3.31.0",
+      "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.31.0.tgz",
+      "integrity": "sha512-hM7YCu1cU6Opx7MXNu0NuumM0ezNeAeRKadixyiQELWY3vT3De9S4J5ZBMraWV2vZnrE1Cirl0GtFtDtMUXzPw==",
       "dependencies": {
         "browserslist": "^4.21.5"
       },
@@ -18226,19 +18226,19 @@
       }
     },
     "@babel/plugin-transform-classes": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.22.5.tgz",
-      "integrity": "sha512-2edQhLfibpWpsVBx2n/GKOz6JdGQvLruZQfGr9l1qes2KQaWswjBzhQF7UDUZMNaMMQeYnQzxwOMPsbYF7wqPQ==",
+      "version": "7.22.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.22.6.tgz",
+      "integrity": "sha512-58EgM6nuPNG6Py4Z3zSuu0xWu2VfodiMi72Jt5Kj2FECmaYk1RrTXA45z6KBFsu9tRgwQDwIiY4FXTt+YsSFAQ==",
       "dev": true,
       "requires": {
         "@babel/helper-annotate-as-pure": "^7.22.5",
-        "@babel/helper-compilation-targets": "^7.22.5",
+        "@babel/helper-compilation-targets": "^7.22.6",
         "@babel/helper-environment-visitor": "^7.22.5",
         "@babel/helper-function-name": "^7.22.5",
         "@babel/helper-optimise-call-expression": "^7.22.5",
         "@babel/helper-plugin-utils": "^7.22.5",
         "@babel/helper-replace-supers": "^7.22.5",
-        "@babel/helper-split-export-declaration": "^7.22.5",
+        "@babel/helper-split-export-declaration": "^7.22.6",
         "globals": "^11.1.0"
       }
     },
@@ -18484,9 +18484,9 @@
       }
     },
     "@babel/plugin-transform-optional-chaining": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-optional-chaining/-/plugin-transform-optional-chaining-7.22.5.tgz",
-      "integrity": "sha512-AconbMKOMkyG+xCng2JogMCDcqW8wedQAqpVIL4cOSescZ7+iW8utC6YDZLMCSUIReEA733gzRSaOSXMAt/4WQ==",
+      "version": "7.22.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-optional-chaining/-/plugin-transform-optional-chaining-7.22.6.tgz",
+      "integrity": "sha512-Vd5HiWml0mDVtcLHIoEU5sw6HOUW/Zk0acLs/SAeuLzkGNOPc9DB4nkUajemhCmTIz3eiaKREZn2hQQqF79YTg==",
       "dev": true,
       "requires": {
         "@babel/helper-plugin-utils": "^7.22.5",
@@ -18663,13 +18663,13 @@
       }
     },
     "@babel/preset-env": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.22.5.tgz",
-      "integrity": "sha512-fj06hw89dpiZzGZtxn+QybifF07nNiZjZ7sazs2aVDcysAZVGjW7+7iFYxg6GLNM47R/thYfLdrXc+2f11Vi9A==",
+      "version": "7.22.6",
+      "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.22.6.tgz",
+      "integrity": "sha512-IHr0AXHGk8oh8HYSs45Mxuv6iySUBwDTIzJSnXN7PURqHdxJVQlCoXmKJgyvSS9bcNf9NVRVE35z+LkCvGmi6w==",
       "dev": true,
       "requires": {
-        "@babel/compat-data": "^7.22.5",
-        "@babel/helper-compilation-targets": "^7.22.5",
+        "@babel/compat-data": "^7.22.6",
+        "@babel/helper-compilation-targets": "^7.22.6",
         "@babel/helper-plugin-utils": "^7.22.5",
         "@babel/helper-validator-option": "^7.22.5",
         "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": "^7.22.5",
@@ -18700,7 +18700,7 @@
         "@babel/plugin-transform-block-scoping": "^7.22.5",
         "@babel/plugin-transform-class-properties": "^7.22.5",
         "@babel/plugin-transform-class-static-block": "^7.22.5",
-        "@babel/plugin-transform-classes": "^7.22.5",
+        "@babel/plugin-transform-classes": "^7.22.6",
         "@babel/plugin-transform-computed-properties": "^7.22.5",
         "@babel/plugin-transform-destructuring": "^7.22.5",
         "@babel/plugin-transform-dotall-regex": "^7.22.5",
@@ -18725,7 +18725,7 @@
         "@babel/plugin-transform-object-rest-spread": "^7.22.5",
         "@babel/plugin-transform-object-super": "^7.22.5",
         "@babel/plugin-transform-optional-catch-binding": "^7.22.5",
-        "@babel/plugin-transform-optional-chaining": "^7.22.5",
+        "@babel/plugin-transform-optional-chaining": "^7.22.6",
         "@babel/plugin-transform-parameters": "^7.22.5",
         "@babel/plugin-transform-private-methods": "^7.22.5",
         "@babel/plugin-transform-private-property-in-object": "^7.22.5",
@@ -18743,11 +18743,11 @@
         "@babel/plugin-transform-unicode-sets-regex": "^7.22.5",
         "@babel/preset-modules": "^0.1.5",
         "@babel/types": "^7.22.5",
+        "@nicolo-ribaudo/semver-v6": "^6.3.3",
         "babel-plugin-polyfill-corejs2": "^0.4.3",
         "babel-plugin-polyfill-corejs3": "^0.8.1",
         "babel-plugin-polyfill-regenerator": "^0.5.0",
-        "core-js-compat": "^3.30.2",
-        "semver": "^6.3.0"
+        "core-js-compat": "^3.31.0"
       },
       "dependencies": {
         "@babel/helper-define-polyfill-provider": {
@@ -21830,9 +21830,9 @@
       "integrity": "sha512-NIp2TQSGfR6ba5aalZD+ZQ1fSxGhDo/s1w0nx3RYzf2pnJxt7YynxFlFScP6eV7+GZsKO95NSjGxyJsU3DZgeQ=="
     },
     "core-js-compat": {
-      "version": "3.30.2",
-      "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.30.2.tgz",
-      "integrity": "sha512-nriW1nuJjUgvkEjIot1Spwakz52V9YkYHZAQG6A1eCgC8AA1p0zngrQEP9R0+V6hji5XilWKG1Bd0YRppmGimA==",
+      "version": "3.31.0",
+      "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.31.0.tgz",
+      "integrity": "sha512-hM7YCu1cU6Opx7MXNu0NuumM0ezNeAeRKadixyiQELWY3vT3De9S4J5ZBMraWV2vZnrE1Cirl0GtFtDtMUXzPw==",
       "requires": {
         "browserslist": "^4.21.5"
       }
diff --git a/apps/block_scout_web/assets/package.json b/apps/block_scout_web/assets/package.json
index f3b6df4ade39..651fd180d79e 100644
--- a/apps/block_scout_web/assets/package.json
+++ b/apps/block_scout_web/assets/package.json
@@ -84,7 +84,7 @@
   },
   "devDependencies": {
     "@babel/core": "^7.22.6",
-    "@babel/preset-env": "^7.22.5",
+    "@babel/preset-env": "^7.22.6",
     "autoprefixer": "^10.4.14",
     "babel-loader": "^9.1.2",
     "copy-webpack-plugin": "^11.0.0",

From 804419076d0b675da94493cbc36dd24d97eb8045 Mon Sep 17 00:00:00 2001
From: Viktor Baranov <baranov.viktor.27@gmail.com>
Date: Wed, 5 Jul 2023 14:22:01 +0300
Subject: [PATCH 158/909] Remove obsolete branches form CI

---
 .github/workflows/config.yml                  |  4 --
 .../publish-docker-image-for-base.yml         | 54 ----------------
 .../publish-docker-image-for-gc-chiado.yml    | 64 -------------------
 .../publish-docker-image-release.yml          |  1 -
 4 files changed, 123 deletions(-)
 delete mode 100644 .github/workflows/publish-docker-image-for-base.yml
 delete mode 100644 .github/workflows/publish-docker-image-for-gc-chiado.yml

diff --git a/.github/workflows/config.yml b/.github/workflows/config.yml
index d59774b73c47..64c2cb8f800e 100644
--- a/.github/workflows/config.yml
+++ b/.github/workflows/config.yml
@@ -4,12 +4,9 @@ on:
   push:
     branches:
       - master
-      - va-bedrock-optimism
       - production-optimism-stg
       - production-eth-stg-experimental
-      - production-base-goerli-stg
       - production-xdai-stg
-      - production-gc-chiado-stg
       - production-polygon-supernets-stg
       - production-core-stg
       - production-sokol-stg
@@ -19,7 +16,6 @@ on:
   pull_request:
     branches:
       - master
-      - va-bedrock-optimism
 
 env:
   MIX_ENV: test
diff --git a/.github/workflows/publish-docker-image-for-base.yml b/.github/workflows/publish-docker-image-for-base.yml
deleted file mode 100644
index 513cce03c92a..000000000000
--- a/.github/workflows/publish-docker-image-for-base.yml
+++ /dev/null
@@ -1,54 +0,0 @@
-# This workflow uses actions that are not certified by GitHub.
-# They are provided by a third-party and are governed by
-# separate terms of service, privacy policy, and support
-# documentation.
-
-name: Publish Docker image for specific chain branches
-
-on:
-  push:
-    branches:
-      - production-base-goerli-stg
-jobs:
-  push_to_registry:
-    name: Push Docker image to Docker Hub
-    runs-on: ubuntu-latest
-    env:
-      RELEASE_VERSION: 5.2.0
-      DOCKER_CHAIN_NAME: base-goerli
-    steps:
-      - name: Check out the repo
-        uses: actions/checkout@v3
-      
-      - name: Log in to Docker Hub
-        uses: docker/login-action@v2
-        with:
-          username: ${{ secrets.DOCKER_USERNAME }}
-          password: ${{ secrets.DOCKER_PASSWORD }}
-      
-      - name: Extract metadata (tags, labels) for Docker
-        id: meta
-        uses: docker/metadata-action@v4
-        with:
-          images: blockscout/blockscout
-
-      - name: Add SHORT_SHA env property with commit short sha
-        run: echo "SHORT_SHA=`echo ${GITHUB_SHA} | cut -c1-8`" >> $GITHUB_ENV
-      
-      - name: Build and push Docker image
-        uses: docker/build-push-action@v3
-        with:
-          context: .
-          file: ./docker/Dockerfile
-          push: true
-          tags: blockscout/blockscout-${{ env.DOCKER_CHAIN_NAME }}:latest, blockscout/blockscout-${{ env.DOCKER_CHAIN_NAME }}:${{ env.RELEASE_VERSION }}-prerelease-${{ env.SHORT_SHA }}
-          build-args: |
-            CACHE_EXCHANGE_RATES_PERIOD=
-            DISABLE_READ_API=false
-            DISABLE_WEBAPP=false
-            DISABLE_WRITE_API=false
-            CACHE_TOTAL_GAS_USAGE_COUNTER_ENABLED=
-            ADMIN_PANEL_ENABLED=false
-            CACHE_ADDRESS_WITH_BALANCES_UPDATE_INTERVAL=
-            BLOCKSCOUT_VERSION=v${{ env.RELEASE_VERSION }}-beta.+commit.${{ env.SHORT_SHA }}
-            RELEASE_VERSION=${{ env.RELEASE_VERSION }}
\ No newline at end of file
diff --git a/.github/workflows/publish-docker-image-for-gc-chiado.yml b/.github/workflows/publish-docker-image-for-gc-chiado.yml
deleted file mode 100644
index a51f986068e5..000000000000
--- a/.github/workflows/publish-docker-image-for-gc-chiado.yml
+++ /dev/null
@@ -1,64 +0,0 @@
-# This workflow uses actions that are not certified by GitHub.
-# They are provided by a third-party and are governed by
-# separate terms of service, privacy policy, and support
-# documentation.
-
-name: Publish Docker image for specific chain branches
-
-on:
-  push:
-    branches:
-      - production-gc-chiado-stg
-env:
-  OTP_VERSION: '24.3.4.1'
-  ELIXIR_VERSION: '1.13.4'
-jobs:
-  push_to_registry:
-    name: Push Docker image to Docker Hub
-    runs-on: ubuntu-latest
-    env:
-      RELEASE_VERSION: 5.2.0
-      DOCKER_CHAIN_NAME: xdai-chiado
-    steps:
-      - name: Check out the repo
-        uses: actions/checkout@v3
-
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v2
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
-      
-      - name: Log in to Docker Hub
-        uses: docker/login-action@v2
-        with:
-          username: ${{ secrets.DOCKER_USERNAME }}
-          password: ${{ secrets.DOCKER_PASSWORD }}
-      
-      - name: Extract metadata (tags, labels) for Docker
-        id: meta
-        uses: docker/metadata-action@v4
-        with:
-          images: blockscout/blockscout
-
-      - name: Add SHORT_SHA env property with commit short sha
-        run: echo "SHORT_SHA=`echo ${GITHUB_SHA} | cut -c1-8`" >> $GITHUB_ENV
-      
-      - name: Build and push Docker image
-        uses: docker/build-push-action@v3
-        with:
-          context: .
-          file: ./docker/Dockerfile
-          push: true
-          tags: blockscout/blockscout-${{ env.DOCKER_CHAIN_NAME }}:latest, blockscout/blockscout-${{ env.DOCKER_CHAIN_NAME }}:${{ env.RELEASE_VERSION }}-prerelease-${{ env.SHORT_SHA }}
-          build-args: |
-            CACHE_EXCHANGE_RATES_PERIOD=
-            DISABLE_READ_API=false
-            DISABLE_WEBAPP=false
-            DISABLE_WRITE_API=false
-            CACHE_TOTAL_GAS_USAGE_COUNTER_ENABLED=
-            ADMIN_PANEL_ENABLED=false
-            CACHE_ADDRESS_WITH_BALANCES_UPDATE_INTERVAL=
-            SENTRY_DSN_CLIENT_GNOSIS=${{ secrets.SENTRY_DSN_CLIENT_GNOSIS }}
-            BLOCKSCOUT_VERSION=v${{ env.RELEASE_VERSION }}-beta.+commit.${{ env.SHORT_SHA }}
-            RELEASE_VERSION=${{ env.RELEASE_VERSION }}
\ No newline at end of file
diff --git a/.github/workflows/publish-docker-image-release.yml b/.github/workflows/publish-docker-image-release.yml
index c99dfff37ea5..7d7fce760b53 100644
--- a/.github/workflows/publish-docker-image-release.yml
+++ b/.github/workflows/publish-docker-image-release.yml
@@ -80,7 +80,6 @@ jobs:
         production-eth-goerli-stg
         production-lukso-stg
         production-xdai-stg
-        production-gc-chiado-stg
         production-polygon-supernets-stg
         production-rsk-stg
     steps:

From 187b4235d653eb44df5352273d5d73f3e80bb7bf Mon Sep 17 00:00:00 2001
From: Qwerty5Uiop <alex000010@bk.ru>
Date: Wed, 5 Jul 2023 18:35:07 +0400
Subject: [PATCH 159/909] Handle internal transactions unique_violation

---
 CHANGELOG.md                                      |  1 +
 .../lib/indexer/fetcher/internal_transaction.ex   | 15 +++++++++++++++
 2 files changed, 16 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4a7c74faae08..22e267b498b2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -15,6 +15,7 @@
 - [#7758](https://github.com/blockscout/blockscout/pull/7758) - Remove limit for configurable fetchers
 - [#7764](https://github.com/blockscout/blockscout/pull/7764) - Fix missing ranges insertion and deletion logic
 - [#7843](https://github.com/blockscout/blockscout/pull/7843) - Fix created_contract_code_indexed_at updating
+- [#7855](https://github.com/blockscout/blockscout/pull/7855) - Handle internal transactions unique_violation
 
 ### Chore
 
diff --git a/apps/indexer/lib/indexer/fetcher/internal_transaction.ex b/apps/indexer/lib/indexer/fetcher/internal_transaction.ex
index bf58da21fbe8..3f3afcf07f52 100644
--- a/apps/indexer/lib/indexer/fetcher/internal_transaction.ex
+++ b/apps/indexer/lib/indexer/fetcher/internal_transaction.ex
@@ -277,6 +277,8 @@ defmodule Indexer.Fetcher.InternalTransaction do
           error_count: Enum.count(unique_numbers)
         )
 
+        handle_unique_key_violation(reason, unique_numbers)
+
         # re-queue the de-duped entries
         {:retry, unique_numbers}
     end
@@ -310,6 +312,19 @@ defmodule Indexer.Fetcher.InternalTransaction do
     end)
   end
 
+  defp handle_unique_key_violation(%{exception: %{postgres: %{code: :unique_violation}}}, block_numbers) do
+    BlocksRunner.invalidate_consensus_blocks(block_numbers)
+
+    Logger.error(fn ->
+      [
+        "unique_violation on internal transactions import, block numbers: ",
+        inspect(block_numbers)
+      ]
+    end)
+  end
+
+  defp handle_unique_key_violation(_reason, _block_numbers), do: :ok
+
   defp handle_foreign_key_violation(internal_transactions_params, block_numbers) do
     BlocksRunner.invalidate_consensus_blocks(block_numbers)
 

From 577ced43ef61af7de5294de9204cdefcd369dce4 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 5 Jul 2023 18:41:48 +0000
Subject: [PATCH 160/909] Bump ex_cldr from 2.37.1 to 2.37.2

Bumps [ex_cldr](https://github.com/elixir-cldr/cldr) from 2.37.1 to 2.37.2.
- [Release notes](https://github.com/elixir-cldr/cldr/releases)
- [Changelog](https://github.com/elixir-cldr/cldr/blob/main/CHANGELOG.md)
- [Commits](https://github.com/elixir-cldr/cldr/compare/v2.37.1...v2.37.2)

---
updated-dependencies:
- dependency-name: ex_cldr
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 mix.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mix.lock b/mix.lock
index 3230fec905c5..76e36aba095f 100644
--- a/mix.lock
+++ b/mix.lock
@@ -42,7 +42,7 @@
   "elixir_make": {:hex, :elixir_make, "0.6.3", "bc07d53221216838d79e03a8019d0839786703129599e9619f4ab74c8c096eac", [:mix], [], "hexpm", "f5cbd651c5678bcaabdbb7857658ee106b12509cd976c2c2fca99688e1daf716"},
   "erlex": {:hex, :erlex, "0.2.6", "c7987d15e899c7a2f34f5420d2a2ea0d659682c06ac607572df55a43753aa12e", [:mix], [], "hexpm", "2ed2e25711feb44d52b17d2780eabf998452f6efda104877a3881c2f8c0c0c75"},
   "ex_abi": {:hex, :ex_abi, "0.6.0", "8cf1fef9490dea0834bc201d399635e72178df05dea87b1c933478762dede142", [:mix], [{:ex_keccak, "~> 0.7.1", [hex: :ex_keccak, repo: "hexpm", optional: false]}, {:jason, "~> 1.4", [hex: :jason, repo: "hexpm", optional: false]}], "hexpm", "b03e5fe07371db3ceceb2d536cc32658dcba47b79952469e3e71d7690495e8d8"},
-  "ex_cldr": {:hex, :ex_cldr, "2.37.1", "6091fa719a7a96f9abee7aba186e63a906d504d08039cc8f0c683a0e71ee1bd7", [:mix], [{:cldr_utils, "~> 2.21", [hex: :cldr_utils, repo: "hexpm", optional: false]}, {:decimal, "~> 1.6 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: false]}, {:gettext, "~> 0.19", [hex: :gettext, repo: "hexpm", optional: true]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}, {:nimble_parsec, "~> 0.5 or ~> 1.0", [hex: :nimble_parsec, repo: "hexpm", optional: true]}], "hexpm", "5d60c3288454bc966e404ea4f59531f7dbb570d7e927dce62f0ab8466713bf78"},
+  "ex_cldr": {:hex, :ex_cldr, "2.37.2", "c45041534ec60af367c4c1af02a608576118044fe3c441c782fd424061d6b517", [:mix], [{:cldr_utils, "~> 2.21", [hex: :cldr_utils, repo: "hexpm", optional: false]}, {:decimal, "~> 1.6 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: false]}, {:gettext, "~> 0.19", [hex: :gettext, repo: "hexpm", optional: true]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}, {:nimble_parsec, "~> 0.5 or ~> 1.0", [hex: :nimble_parsec, repo: "hexpm", optional: true]}], "hexpm", "c8467b1d5080716ace6621703b6656cb2f9545572a54b341da900791a0cf92ba"},
   "ex_cldr_currencies": {:hex, :ex_cldr_currencies, "2.15.0", "aadd34e91cfac7ef6b03fe8f47f8c6fa8c5daf3f89b5d9fee64ec545ded839cf", [:mix], [{:ex_cldr, "~> 2.34", [hex: :ex_cldr, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}], "hexpm", "0521316396c66877a2d636219767560bb2397c583341fcb154ecf9f3000e6ff8"},
   "ex_cldr_lists": {:hex, :ex_cldr_lists, "2.10.0", "4d4c9877da2d0417fd832907d69974e8328969f75fafc79b05ccf85f549f6281", [:mix], [{:ex_cldr_numbers, "~> 2.25", [hex: :ex_cldr_numbers, repo: "hexpm", optional: false]}, {:ex_doc, "~> 0.18", [hex: :ex_doc, repo: "hexpm", optional: true]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}], "hexpm", "adc040cde7b97f7fd7c0b35dd69ddb6fcf607303ae6355bb1851deae1f8b0652"},
   "ex_cldr_numbers": {:hex, :ex_cldr_numbers, "2.31.1", "ad3e8a33e8cb8d048173f2c89cf6fcec9f1694d99f890a75bc745894c3868d5b", [:mix], [{:decimal, "~> 1.6 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: false]}, {:digital_token, "~> 0.3 or ~> 1.0", [hex: :digital_token, repo: "hexpm", optional: false]}, {:ex_cldr, "~> 2.37", [hex: :ex_cldr, repo: "hexpm", optional: false]}, {:ex_cldr_currencies, ">= 2.14.2", [hex: :ex_cldr_currencies, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}], "hexpm", "a94c40f4bf60f0e69c34977f33caeda483677232699ab0a6a98025ea011fabcf"},

From fed40366b3232faea8ed200c17c728f0fa133c9a Mon Sep 17 00:00:00 2001
From: Nikita Pozdniakov <nikitosing4@mail.ru>
Date: Thu, 6 Jul 2023 15:36:32 +0300
Subject: [PATCH 161/909] Add TTL for account sessions

---
 apps/block_scout_web/lib/block_scout_web/endpoint.ex          | 3 ++-
 apps/block_scout_web/lib/block_scout_web/plug/redis_cookie.ex | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/apps/block_scout_web/lib/block_scout_web/endpoint.ex b/apps/block_scout_web/lib/block_scout_web/endpoint.ex
index ed33da3db505..e6641f338e5c 100644
--- a/apps/block_scout_web/lib/block_scout_web/endpoint.ex
+++ b/apps/block_scout_web/lib/block_scout_web/endpoint.ex
@@ -67,7 +67,8 @@ defmodule BlockScoutWeb.Endpoint do
     signing_salt: "iC2ksJHS",
     same_site: "Lax",
     http_only: false,
-    domain: Application.compile_env(:block_scout_web, :cookie_domain)
+    domain: Application.compile_env(:block_scout_web, :cookie_domain),
+    max_age: Application.get_env(:block_scout_web, :session_cookie_ttl)
   )
 
   use SpandexPhoenix
diff --git a/apps/block_scout_web/lib/block_scout_web/plug/redis_cookie.ex b/apps/block_scout_web/lib/block_scout_web/plug/redis_cookie.ex
index 092e5548858c..53248d6ba810 100644
--- a/apps/block_scout_web/lib/block_scout_web/plug/redis_cookie.ex
+++ b/apps/block_scout_web/lib/block_scout_web/plug/redis_cookie.ex
@@ -192,7 +192,7 @@ defmodule BlockScoutWeb.Plug.RedisCookie do
   defp build_rotating_opts(opts, _), do: Map.put(opts, :rotating_options, [])
 
   defp store_to_redis(cookie) do
-    Redix.command(:redix, ["SET", hash(cookie), 1])
+    Redix.command(:redix, ["SET", hash(cookie), 1, "EX", Application.get_env(:block_scout_web, :session_cookie_ttl)])
 
     cookie
   end

From 17ccd776263c98f1565b37db0450231d81f65fc1 Mon Sep 17 00:00:00 2001
From: Nikita Pozdniakov <nikitosing4@mail.ru>
Date: Thu, 6 Jul 2023 16:07:08 +0300
Subject: [PATCH 162/909] Changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4a7c74faae08..7bc73b825353 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -18,6 +18,7 @@
 
 ### Chore
 
+- [#7863](https://github.com/blockscout/blockscout/pull/7863) - Add max_age for account sessions
 - [#7841](https://github.com/blockscout/blockscout/pull/7841) - CORS setup for docker-compose config with new frontend
 - [#7832](https://github.com/blockscout/blockscout/pull/7832) - API v2: Add block_number to logs
 - [#7789](https://github.com/blockscout/blockscout/pull/7789) - Fix test warnings; Fix name of `MICROSERVICE_ETH_BYTECODE_DB_INTERVAL_BETWEEN_LOOKUPS` env variable

From a612b8bbdfee8f3cb954485d369c10bf2af0ad83 Mon Sep 17 00:00:00 2001
From: Nikita Pozdniakov <nikitosing4@mail.ru>
Date: Thu, 6 Jul 2023 16:26:27 +0300
Subject: [PATCH 163/909] Fix warning

---
 apps/block_scout_web/lib/block_scout_web/endpoint.ex | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/block_scout_web/lib/block_scout_web/endpoint.ex b/apps/block_scout_web/lib/block_scout_web/endpoint.ex
index e6641f338e5c..9036939eb195 100644
--- a/apps/block_scout_web/lib/block_scout_web/endpoint.ex
+++ b/apps/block_scout_web/lib/block_scout_web/endpoint.ex
@@ -68,7 +68,7 @@ defmodule BlockScoutWeb.Endpoint do
     same_site: "Lax",
     http_only: false,
     domain: Application.compile_env(:block_scout_web, :cookie_domain),
-    max_age: Application.get_env(:block_scout_web, :session_cookie_ttl)
+    max_age: Application.compile_env(:block_scout_web, :session_cookie_ttl)
   )
 
   use SpandexPhoenix

From 1ab68c0166babc4a8b7a612e80912a1d54b91d6a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 6 Jul 2023 19:03:55 +0000
Subject: [PATCH 164/909] Bump postcss from 8.4.24 to 8.4.25 in
 /apps/block_scout_web/assets

Bumps [postcss](https://github.com/postcss/postcss) from 8.4.24 to 8.4.25.
- [Release notes](https://github.com/postcss/postcss/releases)
- [Changelog](https://github.com/postcss/postcss/blob/main/CHANGELOG.md)
- [Commits](https://github.com/postcss/postcss/compare/8.4.24...8.4.25)

---
updated-dependencies:
- dependency-name: postcss
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 apps/block_scout_web/assets/package-lock.json | 14 +++++++-------
 apps/block_scout_web/assets/package.json      |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/apps/block_scout_web/assets/package-lock.json b/apps/block_scout_web/assets/package-lock.json
index 4089d34a807e..7b9effc868ad 100644
--- a/apps/block_scout_web/assets/package-lock.json
+++ b/apps/block_scout_web/assets/package-lock.json
@@ -87,7 +87,7 @@
         "jest": "^29.5.0",
         "jest-environment-jsdom": "^29.6.0",
         "mini-css-extract-plugin": "^2.7.6",
-        "postcss": "^8.4.24",
+        "postcss": "^8.4.25",
         "postcss-loader": "^7.3.3",
         "sass": "^1.63.6",
         "sass-loader": "^13.3.2",
@@ -13432,9 +13432,9 @@
       }
     },
     "node_modules/postcss": {
-      "version": "8.4.24",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.24.tgz",
-      "integrity": "sha512-M0RzbcI0sO/XJNucsGjvWU9ERWxb/ytp1w6dKtxTKgixdtQDq4rmx/g8W1hnaheq9jgwL/oyEdH5Bc4WwJKMqg==",
+      "version": "8.4.25",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.25.tgz",
+      "integrity": "sha512-7taJ/8t2av0Z+sQEvNzCkpDynl0tX3uJMCODi6nT3PfASC7dYCWV9aQ+uiCf+KBD4SEFcu+GvJdGdwzQ6OSjCw==",
       "dev": true,
       "funding": [
         {
@@ -27684,9 +27684,9 @@
       "integrity": "sha512-Wb4p1J4zyFTbM+u6WuO4XstYx4Ky9Cewe4DWrel7B0w6VVICvPwdOpotjzcf6eD8TsckVnIMNONQyPIUFOUbCQ=="
     },
     "postcss": {
-      "version": "8.4.24",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.24.tgz",
-      "integrity": "sha512-M0RzbcI0sO/XJNucsGjvWU9ERWxb/ytp1w6dKtxTKgixdtQDq4rmx/g8W1hnaheq9jgwL/oyEdH5Bc4WwJKMqg==",
+      "version": "8.4.25",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.25.tgz",
+      "integrity": "sha512-7taJ/8t2av0Z+sQEvNzCkpDynl0tX3uJMCODi6nT3PfASC7dYCWV9aQ+uiCf+KBD4SEFcu+GvJdGdwzQ6OSjCw==",
       "dev": true,
       "requires": {
         "nanoid": "^3.3.6",
diff --git a/apps/block_scout_web/assets/package.json b/apps/block_scout_web/assets/package.json
index 651fd180d79e..bc54e6f9d87b 100644
--- a/apps/block_scout_web/assets/package.json
+++ b/apps/block_scout_web/assets/package.json
@@ -99,7 +99,7 @@
     "jest": "^29.5.0",
     "jest-environment-jsdom": "^29.6.0",
     "mini-css-extract-plugin": "^2.7.6",
-    "postcss": "^8.4.24",
+    "postcss": "^8.4.25",
     "postcss-loader": "^7.3.3",
     "sass": "^1.63.6",
     "sass-loader": "^13.3.2",

From 539054d81dbb50e83af68418cef4918924935f34 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 6 Jul 2023 19:04:40 +0000
Subject: [PATCH 165/909] Bump core-js from 3.31.0 to 3.31.1 in
 /apps/block_scout_web/assets

Bumps [core-js](https://github.com/zloirock/core-js/tree/HEAD/packages/core-js) from 3.31.0 to 3.31.1.
- [Release notes](https://github.com/zloirock/core-js/releases)
- [Changelog](https://github.com/zloirock/core-js/blob/master/CHANGELOG.md)
- [Commits](https://github.com/zloirock/core-js/commits/v3.31.1/packages/core-js)

---
updated-dependencies:
- dependency-name: core-js
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 apps/block_scout_web/assets/package-lock.json | 14 +++++++-------
 apps/block_scout_web/assets/package.json      |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/apps/block_scout_web/assets/package-lock.json b/apps/block_scout_web/assets/package-lock.json
index 4089d34a807e..3733bbf5f2b0 100644
--- a/apps/block_scout_web/assets/package-lock.json
+++ b/apps/block_scout_web/assets/package-lock.json
@@ -17,7 +17,7 @@
         "chart.js": "^4.3.0",
         "chartjs-adapter-luxon": "^1.3.1",
         "clipboard": "^2.0.11",
-        "core-js": "^3.31.0",
+        "core-js": "^3.31.1",
         "crypto-browserify": "^3.12.0",
         "dropzone": "^5.9.3",
         "eth-net-props": "^1.0.41",
@@ -5845,9 +5845,9 @@
       }
     },
     "node_modules/core-js": {
-      "version": "3.31.0",
-      "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.31.0.tgz",
-      "integrity": "sha512-NIp2TQSGfR6ba5aalZD+ZQ1fSxGhDo/s1w0nx3RYzf2pnJxt7YynxFlFScP6eV7+GZsKO95NSjGxyJsU3DZgeQ==",
+      "version": "3.31.1",
+      "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.31.1.tgz",
+      "integrity": "sha512-2sKLtfq1eFST7l7v62zaqXacPc7uG8ZAya8ogijLhTtaKNcpzpB4TMoTw2Si+8GYKRwFPMMtUT0263QFWFfqyQ==",
       "hasInstallScript": true,
       "funding": {
         "type": "opencollective",
@@ -21825,9 +21825,9 @@
       }
     },
     "core-js": {
-      "version": "3.31.0",
-      "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.31.0.tgz",
-      "integrity": "sha512-NIp2TQSGfR6ba5aalZD+ZQ1fSxGhDo/s1w0nx3RYzf2pnJxt7YynxFlFScP6eV7+GZsKO95NSjGxyJsU3DZgeQ=="
+      "version": "3.31.1",
+      "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.31.1.tgz",
+      "integrity": "sha512-2sKLtfq1eFST7l7v62zaqXacPc7uG8ZAya8ogijLhTtaKNcpzpB4TMoTw2Si+8GYKRwFPMMtUT0263QFWFfqyQ=="
     },
     "core-js-compat": {
       "version": "3.31.0",
diff --git a/apps/block_scout_web/assets/package.json b/apps/block_scout_web/assets/package.json
index 651fd180d79e..2c9e65f60b95 100644
--- a/apps/block_scout_web/assets/package.json
+++ b/apps/block_scout_web/assets/package.json
@@ -29,7 +29,7 @@
     "chart.js": "^4.3.0",
     "chartjs-adapter-luxon": "^1.3.1",
     "clipboard": "^2.0.11",
-    "core-js": "^3.31.0",
+    "core-js": "^3.31.1",
     "crypto-browserify": "^3.12.0",
     "dropzone": "^5.9.3",
     "eth-net-props": "^1.0.41",

From 0284c8309bf537cec44da71717d1ce64c3d941e2 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 6 Jul 2023 19:05:08 +0000
Subject: [PATCH 166/909] Bump jest from 29.5.0 to 29.6.1 in
 /apps/block_scout_web/assets

Bumps [jest](https://github.com/facebook/jest/tree/HEAD/packages/jest) from 29.5.0 to 29.6.1.
- [Release notes](https://github.com/facebook/jest/releases)
- [Changelog](https://github.com/jestjs/jest/blob/main/CHANGELOG.md)
- [Commits](https://github.com/facebook/jest/commits/v29.6.1/packages/jest)

---
updated-dependencies:
- dependency-name: jest
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 apps/block_scout_web/assets/package-lock.json | 1597 +++++++----------
 apps/block_scout_web/assets/package.json      |    2 +-
 2 files changed, 634 insertions(+), 965 deletions(-)

diff --git a/apps/block_scout_web/assets/package-lock.json b/apps/block_scout_web/assets/package-lock.json
index 4089d34a807e..7d80396c8888 100644
--- a/apps/block_scout_web/assets/package-lock.json
+++ b/apps/block_scout_web/assets/package-lock.json
@@ -84,7 +84,7 @@
         "eslint-plugin-node": "^11.1.0",
         "eslint-plugin-promise": "^6.1.1",
         "file-loader": "^6.2.0",
-        "jest": "^29.5.0",
+        "jest": "^29.6.1",
         "jest-environment-jsdom": "^29.6.0",
         "mini-css-extract-plugin": "^2.7.6",
         "postcss": "^8.4.24",
@@ -827,12 +827,12 @@
       }
     },
     "node_modules/@babel/plugin-syntax-jsx": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.18.6.tgz",
-      "integrity": "sha512-6mmljtAedFGTWu2p/8WIORGwy+61PLgOMPOdazc7YoJ9ZCWUyFy3A6CpPkRKLKD1ToAesxX8KGEViAiLo9N+7Q==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.22.5.tgz",
+      "integrity": "sha512-gvyP4hZrgrs/wWMaocvxZ44Hw0b3W8Pe+cMxc8V1ULQ07oh8VNbIRaoD1LRZVTvD+0nieDKjfgKg89sD7rrKrg==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.18.6"
+        "@babel/helper-plugin-utils": "^7.22.5"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -944,12 +944,12 @@
       }
     },
     "node_modules/@babel/plugin-syntax-typescript": {
-      "version": "7.20.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.20.0.tgz",
-      "integrity": "sha512-rd9TkG+u1CExzS4SM1BlMEhMXwFLKVjOAFFCDx9PbX5ycJWDoWMcwdJH9RhkPu1dOgn5TrxLot/Gx6lWFuAUNQ==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.22.5.tgz",
+      "integrity": "sha512-1mS2o03i7t1c6VzH6fdQ3OA8tcEIxwG18zIPRp+UY1Ihv6W+XZzBCVxExF9upussPXJ0xE9XRHwMoNs1ep/nRQ==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.19.0"
+        "@babel/helper-plugin-utils": "^7.22.5"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1999,32 +1999,6 @@
       "integrity": "sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==",
       "dev": true
     },
-    "node_modules/@cspotcode/source-map-support": {
-      "version": "0.8.1",
-      "resolved": "https://registry.npmjs.org/@cspotcode/source-map-support/-/source-map-support-0.8.1.tgz",
-      "integrity": "sha512-IchNf6dN4tHoMFIn/7OE8LWZ19Y6q/67Bmf6vnGREv8RSbBVb9LPJxEcnwrcwX6ixSvaiGoomAUvu4YSxXrVgw==",
-      "dev": true,
-      "optional": true,
-      "peer": true,
-      "dependencies": {
-        "@jridgewell/trace-mapping": "0.3.9"
-      },
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@cspotcode/source-map-support/node_modules/@jridgewell/trace-mapping": {
-      "version": "0.3.9",
-      "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.9.tgz",
-      "integrity": "sha512-3Belt6tdc8bPgAtbcmdtNJlirVoTmEb5e2gC94PnkwEW9jI6CAHUeoG85tjWP5WquqfavoMtMwiG4P926ZKKuQ==",
-      "dev": true,
-      "optional": true,
-      "peer": true,
-      "dependencies": {
-        "@jridgewell/resolve-uri": "^3.0.3",
-        "@jridgewell/sourcemap-codec": "^1.4.10"
-      }
-    },
     "node_modules/@discoveryjs/json-ext": {
       "version": "0.5.5",
       "resolved": "https://registry.npmjs.org/@discoveryjs/json-ext/-/json-ext-0.5.5.tgz",
@@ -2627,16 +2601,16 @@
       }
     },
     "node_modules/@jest/console": {
-      "version": "29.5.0",
-      "resolved": "https://registry.npmjs.org/@jest/console/-/console-29.5.0.tgz",
-      "integrity": "sha512-NEpkObxPwyw/XxZVLPmAGKE89IQRp4puc6IQRPru6JKd1M3fW9v1xM1AnzIJE65hbCkzQAdnL8P47e9hzhiYLQ==",
+      "version": "29.6.1",
+      "resolved": "https://registry.npmjs.org/@jest/console/-/console-29.6.1.tgz",
+      "integrity": "sha512-Aj772AYgwTSr5w8qnyoJ0eDYvN6bMsH3ORH1ivMotrInHLKdUz6BDlaEXHdM6kODaBIkNIyQGzsMvRdOv7VG7Q==",
       "dev": true,
       "dependencies": {
-        "@jest/types": "^29.5.0",
+        "@jest/types": "^29.6.1",
         "@types/node": "*",
         "chalk": "^4.0.0",
-        "jest-message-util": "^29.5.0",
-        "jest-util": "^29.5.0",
+        "jest-message-util": "^29.6.1",
+        "jest-util": "^29.6.1",
         "slash": "^3.0.0"
       },
       "engines": {
@@ -2714,16 +2688,16 @@
       }
     },
     "node_modules/@jest/core": {
-      "version": "29.5.0",
-      "resolved": "https://registry.npmjs.org/@jest/core/-/core-29.5.0.tgz",
-      "integrity": "sha512-28UzQc7ulUrOQw1IsN/kv1QES3q2kkbl/wGslyhAclqZ/8cMdB5M68BffkIdSJgKBUt50d3hbwJ92XESlE7LiQ==",
+      "version": "29.6.1",
+      "resolved": "https://registry.npmjs.org/@jest/core/-/core-29.6.1.tgz",
+      "integrity": "sha512-CcowHypRSm5oYQ1obz1wfvkjZZ2qoQlrKKvlfPwh5jUXVU12TWr2qMeH8chLMuTFzHh5a1g2yaqlqDICbr+ukQ==",
       "dev": true,
       "dependencies": {
-        "@jest/console": "^29.5.0",
-        "@jest/reporters": "^29.5.0",
-        "@jest/test-result": "^29.5.0",
-        "@jest/transform": "^29.5.0",
-        "@jest/types": "^29.5.0",
+        "@jest/console": "^29.6.1",
+        "@jest/reporters": "^29.6.1",
+        "@jest/test-result": "^29.6.1",
+        "@jest/transform": "^29.6.1",
+        "@jest/types": "^29.6.1",
         "@types/node": "*",
         "ansi-escapes": "^4.2.1",
         "chalk": "^4.0.0",
@@ -2731,20 +2705,20 @@
         "exit": "^0.1.2",
         "graceful-fs": "^4.2.9",
         "jest-changed-files": "^29.5.0",
-        "jest-config": "^29.5.0",
-        "jest-haste-map": "^29.5.0",
-        "jest-message-util": "^29.5.0",
+        "jest-config": "^29.6.1",
+        "jest-haste-map": "^29.6.1",
+        "jest-message-util": "^29.6.1",
         "jest-regex-util": "^29.4.3",
-        "jest-resolve": "^29.5.0",
-        "jest-resolve-dependencies": "^29.5.0",
-        "jest-runner": "^29.5.0",
-        "jest-runtime": "^29.5.0",
-        "jest-snapshot": "^29.5.0",
-        "jest-util": "^29.5.0",
-        "jest-validate": "^29.5.0",
-        "jest-watcher": "^29.5.0",
+        "jest-resolve": "^29.6.1",
+        "jest-resolve-dependencies": "^29.6.1",
+        "jest-runner": "^29.6.1",
+        "jest-runtime": "^29.6.1",
+        "jest-snapshot": "^29.6.1",
+        "jest-util": "^29.6.1",
+        "jest-validate": "^29.6.1",
+        "jest-watcher": "^29.6.1",
         "micromatch": "^4.0.4",
-        "pretty-format": "^29.5.0",
+        "pretty-format": "^29.6.1",
         "slash": "^3.0.0",
         "strip-ansi": "^6.0.0"
       },
@@ -2831,37 +2805,37 @@
       }
     },
     "node_modules/@jest/environment": {
-      "version": "29.6.0",
-      "resolved": "https://registry.npmjs.org/@jest/environment/-/environment-29.6.0.tgz",
-      "integrity": "sha512-bUZLYUxYlUIsslBbxII0fq0kr1+friI3Gty+cRLmocGB1jdcAHs7FS8QdCDqedE8q4DZE1g/AJHH6OJZBLGGsg==",
+      "version": "29.6.1",
+      "resolved": "https://registry.npmjs.org/@jest/environment/-/environment-29.6.1.tgz",
+      "integrity": "sha512-RMMXx4ws+Gbvw3DfLSuo2cfQlK7IwGbpuEWXCqyYDcqYTI+9Ju3a5hDnXaxjNsa6uKh9PQF2v+qg+RLe63tz5A==",
       "dev": true,
       "dependencies": {
-        "@jest/fake-timers": "^29.6.0",
-        "@jest/types": "^29.6.0",
+        "@jest/fake-timers": "^29.6.1",
+        "@jest/types": "^29.6.1",
         "@types/node": "*",
-        "jest-mock": "^29.6.0"
+        "jest-mock": "^29.6.1"
       },
       "engines": {
         "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
     "node_modules/@jest/expect": {
-      "version": "29.5.0",
-      "resolved": "https://registry.npmjs.org/@jest/expect/-/expect-29.5.0.tgz",
-      "integrity": "sha512-PueDR2HGihN3ciUNGr4uelropW7rqUfTiOn+8u0leg/42UhblPxHkfoh0Ruu3I9Y1962P3u2DY4+h7GVTSVU6g==",
+      "version": "29.6.1",
+      "resolved": "https://registry.npmjs.org/@jest/expect/-/expect-29.6.1.tgz",
+      "integrity": "sha512-N5xlPrAYaRNyFgVf2s9Uyyvr795jnB6rObuPx4QFvNJz8aAjpZUDfO4bh5G/xuplMID8PrnuF1+SfSyDxhsgYg==",
       "dev": true,
       "dependencies": {
-        "expect": "^29.5.0",
-        "jest-snapshot": "^29.5.0"
+        "expect": "^29.6.1",
+        "jest-snapshot": "^29.6.1"
       },
       "engines": {
         "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
     "node_modules/@jest/expect-utils": {
-      "version": "29.5.0",
-      "resolved": "https://registry.npmjs.org/@jest/expect-utils/-/expect-utils-29.5.0.tgz",
-      "integrity": "sha512-fmKzsidoXQT2KwnrwE0SQq3uj8Z763vzR8LnLBwC2qYWEFpjX8daRsk6rHUM1QvNlEW/UJXNXm59ztmJJWs2Mg==",
+      "version": "29.6.1",
+      "resolved": "https://registry.npmjs.org/@jest/expect-utils/-/expect-utils-29.6.1.tgz",
+      "integrity": "sha512-o319vIf5pEMx0LmzSxxkYYxo4wrRLKHq9dP1yJU7FoPTB0LfAKSz8SWD6D/6U3v/O52t9cF5t+MeJiRsfk7zMw==",
       "dev": true,
       "dependencies": {
         "jest-get-type": "^29.4.3"
@@ -2871,49 +2845,49 @@
       }
     },
     "node_modules/@jest/fake-timers": {
-      "version": "29.6.0",
-      "resolved": "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-29.6.0.tgz",
-      "integrity": "sha512-nuCU46AsZoskthWSDS2Aj6LARgyNcp5Fjx2qxsO/fPl1Wp1CJ+dBDqs0OkEcJK8FBeV/MbjH5efe79M2sHcV+A==",
+      "version": "29.6.1",
+      "resolved": "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-29.6.1.tgz",
+      "integrity": "sha512-RdgHgbXyosCDMVYmj7lLpUwXA4c69vcNzhrt69dJJdf8azUrpRh3ckFCaTPNjsEeRi27Cig0oKDGxy5j7hOgHg==",
       "dev": true,
       "dependencies": {
-        "@jest/types": "^29.6.0",
+        "@jest/types": "^29.6.1",
         "@sinonjs/fake-timers": "^10.0.2",
         "@types/node": "*",
-        "jest-message-util": "^29.6.0",
-        "jest-mock": "^29.6.0",
-        "jest-util": "^29.6.0"
+        "jest-message-util": "^29.6.1",
+        "jest-mock": "^29.6.1",
+        "jest-util": "^29.6.1"
       },
       "engines": {
         "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
     "node_modules/@jest/globals": {
-      "version": "29.5.0",
-      "resolved": "https://registry.npmjs.org/@jest/globals/-/globals-29.5.0.tgz",
-      "integrity": "sha512-S02y0qMWGihdzNbUiqSAiKSpSozSuHX5UYc7QbnHP+D9Lyw8DgGGCinrN9uSuHPeKgSSzvPom2q1nAtBvUsvPQ==",
+      "version": "29.6.1",
+      "resolved": "https://registry.npmjs.org/@jest/globals/-/globals-29.6.1.tgz",
+      "integrity": "sha512-2VjpaGy78JY9n9370H8zGRCFbYVWwjY6RdDMhoJHa1sYfwe6XM/azGN0SjY8kk7BOZApIejQ1BFPyH7FPG0w3A==",
       "dev": true,
       "dependencies": {
-        "@jest/environment": "^29.5.0",
-        "@jest/expect": "^29.5.0",
-        "@jest/types": "^29.5.0",
-        "jest-mock": "^29.5.0"
+        "@jest/environment": "^29.6.1",
+        "@jest/expect": "^29.6.1",
+        "@jest/types": "^29.6.1",
+        "jest-mock": "^29.6.1"
       },
       "engines": {
         "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
     "node_modules/@jest/reporters": {
-      "version": "29.5.0",
-      "resolved": "https://registry.npmjs.org/@jest/reporters/-/reporters-29.5.0.tgz",
-      "integrity": "sha512-D05STXqj/M8bP9hQNSICtPqz97u7ffGzZu+9XLucXhkOFBqKcXe04JLZOgIekOxdb73MAoBUFnqvf7MCpKk5OA==",
+      "version": "29.6.1",
+      "resolved": "https://registry.npmjs.org/@jest/reporters/-/reporters-29.6.1.tgz",
+      "integrity": "sha512-9zuaI9QKr9JnoZtFQlw4GREQbxgmNYXU6QuWtmuODvk5nvPUeBYapVR/VYMyi2WSx3jXTLJTJji8rN6+Cm4+FA==",
       "dev": true,
       "dependencies": {
         "@bcoe/v8-coverage": "^0.2.3",
-        "@jest/console": "^29.5.0",
-        "@jest/test-result": "^29.5.0",
-        "@jest/transform": "^29.5.0",
-        "@jest/types": "^29.5.0",
-        "@jridgewell/trace-mapping": "^0.3.15",
+        "@jest/console": "^29.6.1",
+        "@jest/test-result": "^29.6.1",
+        "@jest/transform": "^29.6.1",
+        "@jest/types": "^29.6.1",
+        "@jridgewell/trace-mapping": "^0.3.18",
         "@types/node": "*",
         "chalk": "^4.0.0",
         "collect-v8-coverage": "^1.0.0",
@@ -2925,9 +2899,9 @@
         "istanbul-lib-report": "^3.0.0",
         "istanbul-lib-source-maps": "^4.0.0",
         "istanbul-reports": "^3.1.3",
-        "jest-message-util": "^29.5.0",
-        "jest-util": "^29.5.0",
-        "jest-worker": "^29.5.0",
+        "jest-message-util": "^29.6.1",
+        "jest-util": "^29.6.1",
+        "jest-worker": "^29.6.1",
         "slash": "^3.0.0",
         "string-length": "^4.0.1",
         "strip-ansi": "^6.0.0",
@@ -3004,13 +2978,13 @@
       }
     },
     "node_modules/@jest/reporters/node_modules/jest-worker": {
-      "version": "29.5.0",
-      "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-29.5.0.tgz",
-      "integrity": "sha512-NcrQnevGoSp4b5kg+akIpthoAFHxPBcb5P6mYPY0fUNT+sSvmtu6jlkEle3anczUKIKEbMxFimk9oTP/tpIPgA==",
+      "version": "29.6.1",
+      "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-29.6.1.tgz",
+      "integrity": "sha512-U+Wrbca7S8ZAxAe9L6nb6g8kPdia5hj32Puu5iOqBCMTMWFHXuK6dOV2IFrpedbTV8fjMFLdWNttQTBL6u2MRA==",
       "dev": true,
       "dependencies": {
         "@types/node": "*",
-        "jest-util": "^29.5.0",
+        "jest-util": "^29.6.1",
         "merge-stream": "^2.0.0",
         "supports-color": "^8.0.0"
       },
@@ -3058,12 +3032,12 @@
       }
     },
     "node_modules/@jest/source-map": {
-      "version": "29.4.3",
-      "resolved": "https://registry.npmjs.org/@jest/source-map/-/source-map-29.4.3.tgz",
-      "integrity": "sha512-qyt/mb6rLyd9j1jUts4EQncvS6Yy3PM9HghnNv86QBlV+zdL2inCdK1tuVlL+J+lpiw2BI67qXOrX3UurBqQ1w==",
+      "version": "29.6.0",
+      "resolved": "https://registry.npmjs.org/@jest/source-map/-/source-map-29.6.0.tgz",
+      "integrity": "sha512-oA+I2SHHQGxDCZpbrsCQSoMLb3Bz547JnM+jUr9qEbuw0vQlWZfpPS7CO9J7XiwKicEz9OFn/IYoLkkiUD7bzA==",
       "dev": true,
       "dependencies": {
-        "@jridgewell/trace-mapping": "^0.3.15",
+        "@jridgewell/trace-mapping": "^0.3.18",
         "callsites": "^3.0.0",
         "graceful-fs": "^4.2.9"
       },
@@ -3072,13 +3046,13 @@
       }
     },
     "node_modules/@jest/test-result": {
-      "version": "29.5.0",
-      "resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-29.5.0.tgz",
-      "integrity": "sha512-fGl4rfitnbfLsrfx1uUpDEESS7zM8JdgZgOCQuxQvL1Sn/I6ijeAVQWGfXI9zb1i9Mzo495cIpVZhA0yr60PkQ==",
+      "version": "29.6.1",
+      "resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-29.6.1.tgz",
+      "integrity": "sha512-Ynr13ZRcpX6INak0TPUukU8GWRfm/vAytE3JbJNGAvINySWYdfE7dGZMbk36oVuK4CigpbhMn8eg1dixZ7ZJOw==",
       "dev": true,
       "dependencies": {
-        "@jest/console": "^29.5.0",
-        "@jest/types": "^29.5.0",
+        "@jest/console": "^29.6.1",
+        "@jest/types": "^29.6.1",
         "@types/istanbul-lib-coverage": "^2.0.0",
         "collect-v8-coverage": "^1.0.0"
       },
@@ -3087,14 +3061,14 @@
       }
     },
     "node_modules/@jest/test-sequencer": {
-      "version": "29.5.0",
-      "resolved": "https://registry.npmjs.org/@jest/test-sequencer/-/test-sequencer-29.5.0.tgz",
-      "integrity": "sha512-yPafQEcKjkSfDXyvtgiV4pevSeyuA6MQr6ZIdVkWJly9vkqjnFfcfhRQqpD5whjoU8EORki752xQmjaqoFjzMQ==",
+      "version": "29.6.1",
+      "resolved": "https://registry.npmjs.org/@jest/test-sequencer/-/test-sequencer-29.6.1.tgz",
+      "integrity": "sha512-oBkC36PCDf/wb6dWeQIhaviU0l5u6VCsXa119yqdUosYAt7/FbQU2M2UoziO3igj/HBDEgp57ONQ3fm0v9uyyg==",
       "dev": true,
       "dependencies": {
-        "@jest/test-result": "^29.5.0",
+        "@jest/test-result": "^29.6.1",
         "graceful-fs": "^4.2.9",
-        "jest-haste-map": "^29.5.0",
+        "jest-haste-map": "^29.6.1",
         "slash": "^3.0.0"
       },
       "engines": {
@@ -3102,22 +3076,22 @@
       }
     },
     "node_modules/@jest/transform": {
-      "version": "29.5.0",
-      "resolved": "https://registry.npmjs.org/@jest/transform/-/transform-29.5.0.tgz",
-      "integrity": "sha512-8vbeZWqLJOvHaDfeMuoHITGKSz5qWc9u04lnWrQE3VyuSw604PzQM824ZeX9XSjUCeDiE3GuxZe5UKa8J61NQw==",
+      "version": "29.6.1",
+      "resolved": "https://registry.npmjs.org/@jest/transform/-/transform-29.6.1.tgz",
+      "integrity": "sha512-URnTneIU3ZjRSaf906cvf6Hpox3hIeJXRnz3VDSw5/X93gR8ycdfSIEy19FlVx8NFmpN7fe3Gb1xF+NjXaQLWg==",
       "dev": true,
       "dependencies": {
         "@babel/core": "^7.11.6",
-        "@jest/types": "^29.5.0",
-        "@jridgewell/trace-mapping": "^0.3.15",
+        "@jest/types": "^29.6.1",
+        "@jridgewell/trace-mapping": "^0.3.18",
         "babel-plugin-istanbul": "^6.1.1",
         "chalk": "^4.0.0",
         "convert-source-map": "^2.0.0",
         "fast-json-stable-stringify": "^2.1.0",
         "graceful-fs": "^4.2.9",
-        "jest-haste-map": "^29.5.0",
+        "jest-haste-map": "^29.6.1",
         "jest-regex-util": "^29.4.3",
-        "jest-util": "^29.5.0",
+        "jest-util": "^29.6.1",
         "micromatch": "^4.0.4",
         "pirates": "^4.0.4",
         "slash": "^3.0.0",
@@ -3204,9 +3178,9 @@
       }
     },
     "node_modules/@jest/types": {
-      "version": "29.6.0",
-      "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.0.tgz",
-      "integrity": "sha512-8XCgL9JhqbJTFnMRjEAO+TuW251+MoMd5BSzLiE3vvzpQ8RlBxy8NoyNkDhs3K3OL3HeVinlOl9or5p7GTeOLg==",
+      "version": "29.6.1",
+      "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.1.tgz",
+      "integrity": "sha512-tPKQNMPuXgvdOn2/Lg9HNfUvjYVGolt04Hp03f5hAk878uwOLikN+JzeLY0HcVgKgFl9Hs3EIqpu3WX27XNhnw==",
       "dev": true,
       "dependencies": {
         "@jest/schemas": "^29.6.0",
@@ -3470,42 +3444,10 @@
         "node": ">=10.13.0"
       }
     },
-    "node_modules/@tsconfig/node10": {
-      "version": "1.0.9",
-      "resolved": "https://registry.npmjs.org/@tsconfig/node10/-/node10-1.0.9.tgz",
-      "integrity": "sha512-jNsYVVxU8v5g43Erja32laIDHXeoNvFEpX33OK4d6hljo3jDhCBDhx5dhCCTMWUojscpAagGiRkBKxpdl9fxqA==",
-      "dev": true,
-      "optional": true,
-      "peer": true
-    },
-    "node_modules/@tsconfig/node12": {
-      "version": "1.0.11",
-      "resolved": "https://registry.npmjs.org/@tsconfig/node12/-/node12-1.0.11.tgz",
-      "integrity": "sha512-cqefuRsh12pWyGsIoBKJA9luFu3mRxCA+ORZvA4ktLSzIuCUtWVxGIuXigEwO5/ywWFMZ2QEGKWvkZG1zDMTag==",
-      "dev": true,
-      "optional": true,
-      "peer": true
-    },
-    "node_modules/@tsconfig/node14": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/@tsconfig/node14/-/node14-1.0.3.tgz",
-      "integrity": "sha512-ysT8mhdixWK6Hw3i1V2AeRqZ5WfXg1G43mqoYlM2nc6388Fq5jcXyr5mRsqViLx/GJYdoL0bfXD8nmF+Zn/Iow==",
-      "dev": true,
-      "optional": true,
-      "peer": true
-    },
-    "node_modules/@tsconfig/node16": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/@tsconfig/node16/-/node16-1.0.3.tgz",
-      "integrity": "sha512-yOlFc+7UtL/89t2ZhjPvvB/DeAr3r+Dq58IgzsFkOAvVC6NMJXmCGjbptdXdR9qsX7pKcTL+s87FtYREi2dEEQ==",
-      "dev": true,
-      "optional": true,
-      "peer": true
-    },
     "node_modules/@types/babel__core": {
-      "version": "7.20.0",
-      "resolved": "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.20.0.tgz",
-      "integrity": "sha512-+n8dL/9GWblDO0iU6eZAwEIJVr5DWigtle+Q6HLOrh/pdbXOhOtqzq8VPPE2zvNJzSKY4vH/z3iT3tn0A3ypiQ==",
+      "version": "7.20.1",
+      "resolved": "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.20.1.tgz",
+      "integrity": "sha512-aACu/U/omhdk15O4Nfb+fHgH/z3QsfQzpnvRZhYhThms83ZnAOZz7zZAWO7mn2yyNQaA4xTO8GLK3uqFU4bYYw==",
       "dev": true,
       "dependencies": {
         "@babel/parser": "^7.20.7",
@@ -3535,12 +3477,12 @@
       }
     },
     "node_modules/@types/babel__traverse": {
-      "version": "7.18.3",
-      "resolved": "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.18.3.tgz",
-      "integrity": "sha512-1kbcJ40lLB7MHsj39U4Sh1uTd2E7rLEa79kmDpI6cy+XiXsteB3POdQomoq4FxszMrO3ZYchkhYJw7A2862b3w==",
+      "version": "7.20.1",
+      "resolved": "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.20.1.tgz",
+      "integrity": "sha512-MitHFXnhtgwsGZWtT68URpOvLN4EREih1u3QtQiN4VdAxWKRVvGCSvw/Qth0M0Qq3pJpnGOu5JaM/ydK7OGbqg==",
       "dev": true,
       "dependencies": {
-        "@babel/types": "^7.3.0"
+        "@babel/types": "^7.20.7"
       }
     },
     "node_modules/@types/bn.js": {
@@ -3671,9 +3613,9 @@
       }
     },
     "node_modules/@types/prettier": {
-      "version": "2.7.2",
-      "resolved": "https://registry.npmjs.org/@types/prettier/-/prettier-2.7.2.tgz",
-      "integrity": "sha512-KufADq8uQqo1pYKVIYzfKbJfBAc0sOeXqGbFaSpv8MRmC/zXgowNZmFcbngndGk922QDmOASEXUZCaY48gs4cg==",
+      "version": "2.7.3",
+      "resolved": "https://registry.npmjs.org/@types/prettier/-/prettier-2.7.3.tgz",
+      "integrity": "sha512-+68kP9yzs4LMp7VNh8gdzMSPZFL44MLGqiHWvttYJe+6qnuVr4Ek9wSBQoveqY/r+LwjCcU29kNVkidwim+kYA==",
       "dev": true
     },
     "node_modules/@types/responselike": {
@@ -4386,14 +4328,6 @@
         "node": ">= 8"
       }
     },
-    "node_modules/arg": {
-      "version": "4.1.3",
-      "resolved": "https://registry.npmjs.org/arg/-/arg-4.1.3.tgz",
-      "integrity": "sha512-58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA==",
-      "dev": true,
-      "optional": true,
-      "peer": true
-    },
     "node_modules/argparse": {
       "version": "1.0.10",
       "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
@@ -4611,12 +4545,12 @@
       "integrity": "sha512-xh1Rl34h6Fi1DC2WWKfxUTVqRsNnr6LsKz2+hfwDxQJWmrx8+c7ylaqBMcHfl1U1r2dsifOvKX3LQuLNZ+XSvA=="
     },
     "node_modules/babel-jest": {
-      "version": "29.5.0",
-      "resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-29.5.0.tgz",
-      "integrity": "sha512-mA4eCDh5mSo2EcA9xQjVTpmbbNk32Zb3Q3QFQsNhaK56Q+yoXowzFodLux30HRgyOho5rsQ6B0P9QpMkvvnJ0Q==",
+      "version": "29.6.1",
+      "resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-29.6.1.tgz",
+      "integrity": "sha512-qu+3bdPEQC6KZSPz+4Fyjbga5OODNcp49j6GKzG1EKbkfyJBxEYGVUmVGpwCSeGouG52R4EgYMLb6p9YeEEQ4A==",
       "dev": true,
       "dependencies": {
-        "@jest/transform": "^29.5.0",
+        "@jest/transform": "^29.6.1",
         "@types/babel__core": "^7.1.14",
         "babel-plugin-istanbul": "^6.1.1",
         "babel-preset-jest": "^29.5.0",
@@ -5598,9 +5532,9 @@
       }
     },
     "node_modules/cjs-module-lexer": {
-      "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/cjs-module-lexer/-/cjs-module-lexer-1.2.2.tgz",
-      "integrity": "sha512-cOU9usZw8/dXIXKtwa8pM0OTJQuJkxMN6w30csNRUerHfeQ5R6U3kkU/FtJeIf3M202OHfY2U8ccInBG7/xogA==",
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/cjs-module-lexer/-/cjs-module-lexer-1.2.3.tgz",
+      "integrity": "sha512-0TNiGstbQmCFwt4akjjBg5pLRTSyj/PkWQ1ZoO2zntmg9yLqSRxwEa4iCfQLGjqhiqBfOJa7W/E8wfGrTDmlZQ==",
       "dev": true
     },
     "node_modules/class-is": {
@@ -5676,9 +5610,9 @@
       }
     },
     "node_modules/collect-v8-coverage": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/collect-v8-coverage/-/collect-v8-coverage-1.0.1.tgz",
-      "integrity": "sha512-iBPtljfCNcTKNAto0KEtDfZ3qzjJvqE3aTGZsbhjSBlorqpXJlaWWtPO35D+ZImoC3KWejX64o+yPGxhWSTzfg==",
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/collect-v8-coverage/-/collect-v8-coverage-1.0.2.tgz",
+      "integrity": "sha512-lHl4d5/ONEbLlJvaJNtsF/Lz+WvB07u2ycqTYbdrq7UypDXailES4valYb2eWiJFxZlVmpGekfqoxQhzyFdT4Q==",
       "dev": true
     },
     "node_modules/color-convert": {
@@ -5969,14 +5903,6 @@
         "sha.js": "^2.4.8"
       }
     },
-    "node_modules/create-require": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/create-require/-/create-require-1.1.1.tgz",
-      "integrity": "sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ==",
-      "dev": true,
-      "optional": true,
-      "peer": true
-    },
     "node_modules/cross-fetch": {
       "version": "2.2.6",
       "resolved": "https://registry.npmjs.org/cross-fetch/-/cross-fetch-2.2.6.tgz",
@@ -6506,9 +6432,9 @@
       "dev": true
     },
     "node_modules/deepmerge": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.3.0.tgz",
-      "integrity": "sha512-z2wJZXrmeHdvYJp/Ux55wIjqo81G5Bp4c+oELTW+7ar6SogWHajt5a9gO3s3IDaGSAXjDk0vlQKN3rms8ab3og==",
+      "version": "4.3.1",
+      "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.3.1.tgz",
+      "integrity": "sha512-3sUqbMEc77XqpdNO7FRyRog+eW3ph+GYCbj+rK+uYyRMuwsVy0rMiVtPn+QJlKFvWP/1PYpapqYn0Me2knFn+A==",
       "dev": true,
       "engines": {
         "node": ">=0.10.0"
@@ -6598,17 +6524,6 @@
         "node": ">=8"
       }
     },
-    "node_modules/diff": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/diff/-/diff-4.0.2.tgz",
-      "integrity": "sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==",
-      "dev": true,
-      "optional": true,
-      "peer": true,
-      "engines": {
-        "node": ">=0.3.1"
-      }
-    },
     "node_modules/diff-sequences": {
       "version": "29.4.3",
       "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-29.4.3.tgz",
@@ -8363,16 +8278,17 @@
       }
     },
     "node_modules/expect": {
-      "version": "29.5.0",
-      "resolved": "https://registry.npmjs.org/expect/-/expect-29.5.0.tgz",
-      "integrity": "sha512-yM7xqUrCO2JdpFo4XpM82t+PJBFybdqoQuJLDGeDX2ij8NZzqRHyu3Hp188/JX7SWqud+7t4MUdvcgGBICMHZg==",
+      "version": "29.6.1",
+      "resolved": "https://registry.npmjs.org/expect/-/expect-29.6.1.tgz",
+      "integrity": "sha512-XEdDLonERCU1n9uR56/Stx9OqojaLAQtZf9PrCHH9Hl8YXiEIka3H4NXJ3NOIBmQJTg7+j7buh34PMHfJujc8g==",
       "dev": true,
       "dependencies": {
-        "@jest/expect-utils": "^29.5.0",
+        "@jest/expect-utils": "^29.6.1",
+        "@types/node": "*",
         "jest-get-type": "^29.4.3",
-        "jest-matcher-utils": "^29.5.0",
-        "jest-message-util": "^29.5.0",
-        "jest-util": "^29.5.0"
+        "jest-matcher-utils": "^29.6.1",
+        "jest-message-util": "^29.6.1",
+        "jest-util": "^29.6.1"
       },
       "engines": {
         "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
@@ -10075,15 +9991,15 @@
       }
     },
     "node_modules/jest": {
-      "version": "29.5.0",
-      "resolved": "https://registry.npmjs.org/jest/-/jest-29.5.0.tgz",
-      "integrity": "sha512-juMg3he2uru1QoXX078zTa7pO85QyB9xajZc6bU+d9yEGwrKX6+vGmJQ3UdVZsvTEUARIdObzH68QItim6OSSQ==",
+      "version": "29.6.1",
+      "resolved": "https://registry.npmjs.org/jest/-/jest-29.6.1.tgz",
+      "integrity": "sha512-Nirw5B4nn69rVUZtemCQhwxOBhm0nsp3hmtF4rzCeWD7BkjAXRIji7xWQfnTNbz9g0aVsBX6aZK3n+23LM6uDw==",
       "dev": true,
       "dependencies": {
-        "@jest/core": "^29.5.0",
-        "@jest/types": "^29.5.0",
+        "@jest/core": "^29.6.1",
+        "@jest/types": "^29.6.1",
         "import-local": "^3.0.2",
-        "jest-cli": "^29.5.0"
+        "jest-cli": "^29.6.1"
       },
       "bin": {
         "jest": "bin/jest.js"
@@ -10114,28 +10030,28 @@
       }
     },
     "node_modules/jest-circus": {
-      "version": "29.5.0",
-      "resolved": "https://registry.npmjs.org/jest-circus/-/jest-circus-29.5.0.tgz",
-      "integrity": "sha512-gq/ongqeQKAplVxqJmbeUOJJKkW3dDNPY8PjhJ5G0lBRvu0e3EWGxGy5cI4LAGA7gV2UHCtWBI4EMXK8c9nQKA==",
+      "version": "29.6.1",
+      "resolved": "https://registry.npmjs.org/jest-circus/-/jest-circus-29.6.1.tgz",
+      "integrity": "sha512-tPbYLEiBU4MYAL2XoZme/bgfUeotpDBd81lgHLCbDZZFaGmECk0b+/xejPFtmiBP87GgP/y4jplcRpbH+fgCzQ==",
       "dev": true,
       "dependencies": {
-        "@jest/environment": "^29.5.0",
-        "@jest/expect": "^29.5.0",
-        "@jest/test-result": "^29.5.0",
-        "@jest/types": "^29.5.0",
+        "@jest/environment": "^29.6.1",
+        "@jest/expect": "^29.6.1",
+        "@jest/test-result": "^29.6.1",
+        "@jest/types": "^29.6.1",
         "@types/node": "*",
         "chalk": "^4.0.0",
         "co": "^4.6.0",
         "dedent": "^0.7.0",
         "is-generator-fn": "^2.0.0",
-        "jest-each": "^29.5.0",
-        "jest-matcher-utils": "^29.5.0",
-        "jest-message-util": "^29.5.0",
-        "jest-runtime": "^29.5.0",
-        "jest-snapshot": "^29.5.0",
-        "jest-util": "^29.5.0",
+        "jest-each": "^29.6.1",
+        "jest-matcher-utils": "^29.6.1",
+        "jest-message-util": "^29.6.1",
+        "jest-runtime": "^29.6.1",
+        "jest-snapshot": "^29.6.1",
+        "jest-util": "^29.6.1",
         "p-limit": "^3.1.0",
-        "pretty-format": "^29.5.0",
+        "pretty-format": "^29.6.1",
         "pure-rand": "^6.0.0",
         "slash": "^3.0.0",
         "stack-utils": "^2.0.3"
@@ -10215,21 +10131,21 @@
       }
     },
     "node_modules/jest-cli": {
-      "version": "29.5.0",
-      "resolved": "https://registry.npmjs.org/jest-cli/-/jest-cli-29.5.0.tgz",
-      "integrity": "sha512-L1KcP1l4HtfwdxXNFCL5bmUbLQiKrakMUriBEcc1Vfz6gx31ORKdreuWvmQVBit+1ss9NNR3yxjwfwzZNdQXJw==",
+      "version": "29.6.1",
+      "resolved": "https://registry.npmjs.org/jest-cli/-/jest-cli-29.6.1.tgz",
+      "integrity": "sha512-607dSgTA4ODIN6go9w6xY3EYkyPFGicx51a69H7yfvt7lN53xNswEVLovq+E77VsTRi5fWprLH0yl4DJgE8Ing==",
       "dev": true,
       "dependencies": {
-        "@jest/core": "^29.5.0",
-        "@jest/test-result": "^29.5.0",
-        "@jest/types": "^29.5.0",
+        "@jest/core": "^29.6.1",
+        "@jest/test-result": "^29.6.1",
+        "@jest/types": "^29.6.1",
         "chalk": "^4.0.0",
         "exit": "^0.1.2",
         "graceful-fs": "^4.2.9",
         "import-local": "^3.0.2",
-        "jest-config": "^29.5.0",
-        "jest-util": "^29.5.0",
-        "jest-validate": "^29.5.0",
+        "jest-config": "^29.6.1",
+        "jest-util": "^29.6.1",
+        "jest-validate": "^29.6.1",
         "prompts": "^2.0.1",
         "yargs": "^17.3.1"
       },
@@ -10319,31 +10235,31 @@
       }
     },
     "node_modules/jest-config": {
-      "version": "29.5.0",
-      "resolved": "https://registry.npmjs.org/jest-config/-/jest-config-29.5.0.tgz",
-      "integrity": "sha512-kvDUKBnNJPNBmFFOhDbm59iu1Fii1Q6SxyhXfvylq3UTHbg6o7j/g8k2dZyXWLvfdKB1vAPxNZnMgtKJcmu3kA==",
+      "version": "29.6.1",
+      "resolved": "https://registry.npmjs.org/jest-config/-/jest-config-29.6.1.tgz",
+      "integrity": "sha512-XdjYV2fy2xYixUiV2Wc54t3Z4oxYPAELUzWnV6+mcbq0rh742X2p52pii5A3oeRzYjLnQxCsZmp0qpI6klE2cQ==",
       "dev": true,
       "dependencies": {
         "@babel/core": "^7.11.6",
-        "@jest/test-sequencer": "^29.5.0",
-        "@jest/types": "^29.5.0",
-        "babel-jest": "^29.5.0",
+        "@jest/test-sequencer": "^29.6.1",
+        "@jest/types": "^29.6.1",
+        "babel-jest": "^29.6.1",
         "chalk": "^4.0.0",
         "ci-info": "^3.2.0",
         "deepmerge": "^4.2.2",
         "glob": "^7.1.3",
         "graceful-fs": "^4.2.9",
-        "jest-circus": "^29.5.0",
-        "jest-environment-node": "^29.5.0",
+        "jest-circus": "^29.6.1",
+        "jest-environment-node": "^29.6.1",
         "jest-get-type": "^29.4.3",
         "jest-regex-util": "^29.4.3",
-        "jest-resolve": "^29.5.0",
-        "jest-runner": "^29.5.0",
-        "jest-util": "^29.5.0",
-        "jest-validate": "^29.5.0",
+        "jest-resolve": "^29.6.1",
+        "jest-runner": "^29.6.1",
+        "jest-util": "^29.6.1",
+        "jest-validate": "^29.6.1",
         "micromatch": "^4.0.4",
         "parse-json": "^5.2.0",
-        "pretty-format": "^29.5.0",
+        "pretty-format": "^29.6.1",
         "slash": "^3.0.0",
         "strip-json-comments": "^3.1.1"
       },
@@ -10434,15 +10350,15 @@
       }
     },
     "node_modules/jest-diff": {
-      "version": "29.5.0",
-      "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-29.5.0.tgz",
-      "integrity": "sha512-LtxijLLZBduXnHSniy0WMdaHjmQnt3g5sa16W4p0HqukYTTsyTW3GD1q41TyGl5YFXj/5B2U6dlh5FM1LIMgxw==",
+      "version": "29.6.1",
+      "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-29.6.1.tgz",
+      "integrity": "sha512-FsNCvinvl8oVxpNLttNQX7FAq7vR+gMDGj90tiP7siWw1UdakWUGqrylpsYrpvj908IYckm5Y0Q7azNAozU1Kg==",
       "dev": true,
       "dependencies": {
         "chalk": "^4.0.0",
         "diff-sequences": "^29.4.3",
         "jest-get-type": "^29.4.3",
-        "pretty-format": "^29.5.0"
+        "pretty-format": "^29.6.1"
       },
       "engines": {
         "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
@@ -10531,16 +10447,16 @@
       }
     },
     "node_modules/jest-each": {
-      "version": "29.5.0",
-      "resolved": "https://registry.npmjs.org/jest-each/-/jest-each-29.5.0.tgz",
-      "integrity": "sha512-HM5kIJ1BTnVt+DQZ2ALp3rzXEl+g726csObrW/jpEGl+CDSSQpOJJX2KE/vEg8cxcMXdyEPu6U4QX5eruQv5hA==",
+      "version": "29.6.1",
+      "resolved": "https://registry.npmjs.org/jest-each/-/jest-each-29.6.1.tgz",
+      "integrity": "sha512-n5eoj5eiTHpKQCAVcNTT7DRqeUmJ01hsAL0Q1SMiBHcBcvTKDELixQOGMCpqhbIuTcfC4kMfSnpmDqRgRJcLNQ==",
       "dev": true,
       "dependencies": {
-        "@jest/types": "^29.5.0",
+        "@jest/types": "^29.6.1",
         "chalk": "^4.0.0",
         "jest-get-type": "^29.4.3",
-        "jest-util": "^29.5.0",
-        "pretty-format": "^29.5.0"
+        "jest-util": "^29.6.1",
+        "pretty-format": "^29.6.1"
       },
       "engines": {
         "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
@@ -10644,17 +10560,17 @@
       }
     },
     "node_modules/jest-environment-node": {
-      "version": "29.5.0",
-      "resolved": "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-29.5.0.tgz",
-      "integrity": "sha512-ExxuIK/+yQ+6PRGaHkKewYtg6hto2uGCgvKdb2nfJfKXgZ17DfXjvbZ+jA1Qt9A8EQSfPnt5FKIfnOO3u1h9qw==",
+      "version": "29.6.1",
+      "resolved": "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-29.6.1.tgz",
+      "integrity": "sha512-ZNIfAiE+foBog24W+2caIldl4Irh8Lx1PUhg/GZ0odM1d/h2qORAsejiFc7zb+SEmYPn1yDZzEDSU5PmDkmVLQ==",
       "dev": true,
       "dependencies": {
-        "@jest/environment": "^29.5.0",
-        "@jest/fake-timers": "^29.5.0",
-        "@jest/types": "^29.5.0",
+        "@jest/environment": "^29.6.1",
+        "@jest/fake-timers": "^29.6.1",
+        "@jest/types": "^29.6.1",
         "@types/node": "*",
-        "jest-mock": "^29.5.0",
-        "jest-util": "^29.5.0"
+        "jest-mock": "^29.6.1",
+        "jest-util": "^29.6.1"
       },
       "engines": {
         "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
@@ -10670,20 +10586,20 @@
       }
     },
     "node_modules/jest-haste-map": {
-      "version": "29.5.0",
-      "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-29.5.0.tgz",
-      "integrity": "sha512-IspOPnnBro8YfVYSw6yDRKh/TiCdRngjxeacCps1cQ9cgVN6+10JUcuJ1EabrgYLOATsIAigxA0rLR9x/YlrSA==",
+      "version": "29.6.1",
+      "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-29.6.1.tgz",
+      "integrity": "sha512-0m7f9PZXxOCk1gRACiVgX85knUKPKLPg4oRCjLoqIm9brTHXaorMA0JpmtmVkQiT8nmXyIVoZd/nnH1cfC33ig==",
       "dev": true,
       "dependencies": {
-        "@jest/types": "^29.5.0",
+        "@jest/types": "^29.6.1",
         "@types/graceful-fs": "^4.1.3",
         "@types/node": "*",
         "anymatch": "^3.0.3",
         "fb-watchman": "^2.0.0",
         "graceful-fs": "^4.2.9",
         "jest-regex-util": "^29.4.3",
-        "jest-util": "^29.5.0",
-        "jest-worker": "^29.5.0",
+        "jest-util": "^29.6.1",
+        "jest-worker": "^29.6.1",
         "micromatch": "^4.0.4",
         "walker": "^1.0.8"
       },
@@ -10704,13 +10620,13 @@
       }
     },
     "node_modules/jest-haste-map/node_modules/jest-worker": {
-      "version": "29.5.0",
-      "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-29.5.0.tgz",
-      "integrity": "sha512-NcrQnevGoSp4b5kg+akIpthoAFHxPBcb5P6mYPY0fUNT+sSvmtu6jlkEle3anczUKIKEbMxFimk9oTP/tpIPgA==",
+      "version": "29.6.1",
+      "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-29.6.1.tgz",
+      "integrity": "sha512-U+Wrbca7S8ZAxAe9L6nb6g8kPdia5hj32Puu5iOqBCMTMWFHXuK6dOV2IFrpedbTV8fjMFLdWNttQTBL6u2MRA==",
       "dev": true,
       "dependencies": {
         "@types/node": "*",
-        "jest-util": "^29.5.0",
+        "jest-util": "^29.6.1",
         "merge-stream": "^2.0.0",
         "supports-color": "^8.0.0"
       },
@@ -10734,28 +10650,28 @@
       }
     },
     "node_modules/jest-leak-detector": {
-      "version": "29.5.0",
-      "resolved": "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-29.5.0.tgz",
-      "integrity": "sha512-u9YdeeVnghBUtpN5mVxjID7KbkKE1QU4f6uUwuxiY0vYRi9BUCLKlPEZfDGR67ofdFmDz9oPAy2G92Ujrntmow==",
+      "version": "29.6.1",
+      "resolved": "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-29.6.1.tgz",
+      "integrity": "sha512-OrxMNyZirpOEwkF3UHnIkAiZbtkBWiye+hhBweCHkVbCgyEy71Mwbb5zgeTNYWJBi1qgDVfPC1IwO9dVEeTLwQ==",
       "dev": true,
       "dependencies": {
         "jest-get-type": "^29.4.3",
-        "pretty-format": "^29.5.0"
+        "pretty-format": "^29.6.1"
       },
       "engines": {
         "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
     "node_modules/jest-matcher-utils": {
-      "version": "29.5.0",
-      "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-29.5.0.tgz",
-      "integrity": "sha512-lecRtgm/rjIK0CQ7LPQwzCs2VwW6WAahA55YBuI+xqmhm7LAaxokSB8C97yJeYyT+HvQkH741StzpU41wohhWw==",
+      "version": "29.6.1",
+      "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-29.6.1.tgz",
+      "integrity": "sha512-SLaztw9d2mfQQKHmJXKM0HCbl2PPVld/t9Xa6P9sgiExijviSp7TnZZpw2Fpt+OI3nwUO/slJbOfzfUMKKC5QA==",
       "dev": true,
       "dependencies": {
         "chalk": "^4.0.0",
-        "jest-diff": "^29.5.0",
+        "jest-diff": "^29.6.1",
         "jest-get-type": "^29.4.3",
-        "pretty-format": "^29.5.0"
+        "pretty-format": "^29.6.1"
       },
       "engines": {
         "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
@@ -10832,18 +10748,18 @@
       }
     },
     "node_modules/jest-message-util": {
-      "version": "29.6.0",
-      "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-29.6.0.tgz",
-      "integrity": "sha512-mkCp56cETbpoNtsaeWVy6SKzk228mMi9FPHSObaRIhbR2Ujw9PqjW/yqVHD2tN1bHbC8ol6h3UEo7dOPmIYwIA==",
+      "version": "29.6.1",
+      "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-29.6.1.tgz",
+      "integrity": "sha512-KoAW2zAmNSd3Gk88uJ56qXUWbFk787QKmjjJVOjtGFmmGSZgDBrlIL4AfQw1xyMYPNVD7dNInfIbur9B2rd/wQ==",
       "dev": true,
       "dependencies": {
         "@babel/code-frame": "^7.12.13",
-        "@jest/types": "^29.6.0",
+        "@jest/types": "^29.6.1",
         "@types/stack-utils": "^2.0.0",
         "chalk": "^4.0.0",
         "graceful-fs": "^4.2.9",
         "micromatch": "^4.0.4",
-        "pretty-format": "^29.6.0",
+        "pretty-format": "^29.6.1",
         "slash": "^3.0.0",
         "stack-utils": "^2.0.3"
       },
@@ -10922,14 +10838,14 @@
       }
     },
     "node_modules/jest-mock": {
-      "version": "29.6.0",
-      "resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-29.6.0.tgz",
-      "integrity": "sha512-2Pb7R2w24Q0aUVn+2/vdRDL6CqGqpheDZy7zrXav8FotOpSGw/4bS2hyVoKHMEx4xzOn6EyCAGwc5czWxXeN7w==",
+      "version": "29.6.1",
+      "resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-29.6.1.tgz",
+      "integrity": "sha512-brovyV9HBkjXAEdRooaTQK42n8usKoSRR3gihzUpYeV/vwqgSoNfrksO7UfSACnPmxasO/8TmHM3w9Hp3G1dgw==",
       "dev": true,
       "dependencies": {
-        "@jest/types": "^29.6.0",
+        "@jest/types": "^29.6.1",
         "@types/node": "*",
-        "jest-util": "^29.6.0"
+        "jest-util": "^29.6.1"
       },
       "engines": {
         "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
@@ -10962,17 +10878,17 @@
       }
     },
     "node_modules/jest-resolve": {
-      "version": "29.5.0",
-      "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-29.5.0.tgz",
-      "integrity": "sha512-1TzxJ37FQq7J10jPtQjcc+MkCkE3GBpBecsSUWJ0qZNJpmg6m0D9/7II03yJulm3H/fvVjgqLh/k2eYg+ui52w==",
+      "version": "29.6.1",
+      "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-29.6.1.tgz",
+      "integrity": "sha512-AeRkyS8g37UyJiP9w3mmI/VXU/q8l/IH52vj/cDAyScDcemRbSBhfX/NMYIGilQgSVwsjxrCHf3XJu4f+lxCMg==",
       "dev": true,
       "dependencies": {
         "chalk": "^4.0.0",
         "graceful-fs": "^4.2.9",
-        "jest-haste-map": "^29.5.0",
+        "jest-haste-map": "^29.6.1",
         "jest-pnp-resolver": "^1.2.2",
-        "jest-util": "^29.5.0",
-        "jest-validate": "^29.5.0",
+        "jest-util": "^29.6.1",
+        "jest-validate": "^29.6.1",
         "resolve": "^1.20.0",
         "resolve.exports": "^2.0.0",
         "slash": "^3.0.0"
@@ -10982,13 +10898,13 @@
       }
     },
     "node_modules/jest-resolve-dependencies": {
-      "version": "29.5.0",
-      "resolved": "https://registry.npmjs.org/jest-resolve-dependencies/-/jest-resolve-dependencies-29.5.0.tgz",
-      "integrity": "sha512-sjV3GFr0hDJMBpYeUuGduP+YeCRbd7S/ck6IvL3kQ9cpySYKqcqhdLLC2rFwrcL7tz5vYibomBrsFYWkIGGjOg==",
+      "version": "29.6.1",
+      "resolved": "https://registry.npmjs.org/jest-resolve-dependencies/-/jest-resolve-dependencies-29.6.1.tgz",
+      "integrity": "sha512-BbFvxLXtcldaFOhNMXmHRWx1nXQO5LoXiKSGQcA1LxxirYceZT6ch8KTE1bK3X31TNG/JbkI7OkS/ABexVahiw==",
       "dev": true,
       "dependencies": {
         "jest-regex-util": "^29.4.3",
-        "jest-snapshot": "^29.5.0"
+        "jest-snapshot": "^29.6.1"
       },
       "engines": {
         "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
@@ -11065,30 +10981,30 @@
       }
     },
     "node_modules/jest-runner": {
-      "version": "29.5.0",
-      "resolved": "https://registry.npmjs.org/jest-runner/-/jest-runner-29.5.0.tgz",
-      "integrity": "sha512-m7b6ypERhFghJsslMLhydaXBiLf7+jXy8FwGRHO3BGV1mcQpPbwiqiKUR2zU2NJuNeMenJmlFZCsIqzJCTeGLQ==",
+      "version": "29.6.1",
+      "resolved": "https://registry.npmjs.org/jest-runner/-/jest-runner-29.6.1.tgz",
+      "integrity": "sha512-tw0wb2Q9yhjAQ2w8rHRDxteryyIck7gIzQE4Reu3JuOBpGp96xWgF0nY8MDdejzrLCZKDcp8JlZrBN/EtkQvPQ==",
       "dev": true,
       "dependencies": {
-        "@jest/console": "^29.5.0",
-        "@jest/environment": "^29.5.0",
-        "@jest/test-result": "^29.5.0",
-        "@jest/transform": "^29.5.0",
-        "@jest/types": "^29.5.0",
+        "@jest/console": "^29.6.1",
+        "@jest/environment": "^29.6.1",
+        "@jest/test-result": "^29.6.1",
+        "@jest/transform": "^29.6.1",
+        "@jest/types": "^29.6.1",
         "@types/node": "*",
         "chalk": "^4.0.0",
         "emittery": "^0.13.1",
         "graceful-fs": "^4.2.9",
         "jest-docblock": "^29.4.3",
-        "jest-environment-node": "^29.5.0",
-        "jest-haste-map": "^29.5.0",
-        "jest-leak-detector": "^29.5.0",
-        "jest-message-util": "^29.5.0",
-        "jest-resolve": "^29.5.0",
-        "jest-runtime": "^29.5.0",
-        "jest-util": "^29.5.0",
-        "jest-watcher": "^29.5.0",
-        "jest-worker": "^29.5.0",
+        "jest-environment-node": "^29.6.1",
+        "jest-haste-map": "^29.6.1",
+        "jest-leak-detector": "^29.6.1",
+        "jest-message-util": "^29.6.1",
+        "jest-resolve": "^29.6.1",
+        "jest-runtime": "^29.6.1",
+        "jest-util": "^29.6.1",
+        "jest-watcher": "^29.6.1",
+        "jest-worker": "^29.6.1",
         "p-limit": "^3.1.0",
         "source-map-support": "0.5.13"
       },
@@ -11155,13 +11071,13 @@
       }
     },
     "node_modules/jest-runner/node_modules/jest-worker": {
-      "version": "29.5.0",
-      "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-29.5.0.tgz",
-      "integrity": "sha512-NcrQnevGoSp4b5kg+akIpthoAFHxPBcb5P6mYPY0fUNT+sSvmtu6jlkEle3anczUKIKEbMxFimk9oTP/tpIPgA==",
+      "version": "29.6.1",
+      "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-29.6.1.tgz",
+      "integrity": "sha512-U+Wrbca7S8ZAxAe9L6nb6g8kPdia5hj32Puu5iOqBCMTMWFHXuK6dOV2IFrpedbTV8fjMFLdWNttQTBL6u2MRA==",
       "dev": true,
       "dependencies": {
         "@types/node": "*",
-        "jest-util": "^29.5.0",
+        "jest-util": "^29.6.1",
         "merge-stream": "^2.0.0",
         "supports-color": "^8.0.0"
       },
@@ -11207,31 +11123,31 @@
       }
     },
     "node_modules/jest-runtime": {
-      "version": "29.5.0",
-      "resolved": "https://registry.npmjs.org/jest-runtime/-/jest-runtime-29.5.0.tgz",
-      "integrity": "sha512-1Hr6Hh7bAgXQP+pln3homOiEZtCDZFqwmle7Ew2j8OlbkIu6uE3Y/etJQG8MLQs3Zy90xrp2C0BRrtPHG4zryw==",
-      "dev": true,
-      "dependencies": {
-        "@jest/environment": "^29.5.0",
-        "@jest/fake-timers": "^29.5.0",
-        "@jest/globals": "^29.5.0",
-        "@jest/source-map": "^29.4.3",
-        "@jest/test-result": "^29.5.0",
-        "@jest/transform": "^29.5.0",
-        "@jest/types": "^29.5.0",
+      "version": "29.6.1",
+      "resolved": "https://registry.npmjs.org/jest-runtime/-/jest-runtime-29.6.1.tgz",
+      "integrity": "sha512-D6/AYOA+Lhs5e5il8+5pSLemjtJezUr+8zx+Sn8xlmOux3XOqx4d8l/2udBea8CRPqqrzhsKUsN/gBDE/IcaPQ==",
+      "dev": true,
+      "dependencies": {
+        "@jest/environment": "^29.6.1",
+        "@jest/fake-timers": "^29.6.1",
+        "@jest/globals": "^29.6.1",
+        "@jest/source-map": "^29.6.0",
+        "@jest/test-result": "^29.6.1",
+        "@jest/transform": "^29.6.1",
+        "@jest/types": "^29.6.1",
         "@types/node": "*",
         "chalk": "^4.0.0",
         "cjs-module-lexer": "^1.0.0",
         "collect-v8-coverage": "^1.0.0",
         "glob": "^7.1.3",
         "graceful-fs": "^4.2.9",
-        "jest-haste-map": "^29.5.0",
-        "jest-message-util": "^29.5.0",
-        "jest-mock": "^29.5.0",
+        "jest-haste-map": "^29.6.1",
+        "jest-message-util": "^29.6.1",
+        "jest-mock": "^29.6.1",
         "jest-regex-util": "^29.4.3",
-        "jest-resolve": "^29.5.0",
-        "jest-snapshot": "^29.5.0",
-        "jest-util": "^29.5.0",
+        "jest-resolve": "^29.6.1",
+        "jest-snapshot": "^29.6.1",
+        "jest-util": "^29.6.1",
         "slash": "^3.0.0",
         "strip-bom": "^4.0.0"
       },
@@ -11310,34 +11226,32 @@
       }
     },
     "node_modules/jest-snapshot": {
-      "version": "29.5.0",
-      "resolved": "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-29.5.0.tgz",
-      "integrity": "sha512-x7Wolra5V0tt3wRs3/ts3S6ciSQVypgGQlJpz2rsdQYoUKxMxPNaoHMGJN6qAuPJqS+2iQ1ZUn5kl7HCyls84g==",
+      "version": "29.6.1",
+      "resolved": "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-29.6.1.tgz",
+      "integrity": "sha512-G4UQE1QQ6OaCgfY+A0uR1W2AY0tGXUPQpoUClhWHq1Xdnx1H6JOrC2nH5lqnOEqaDgbHFgIwZ7bNq24HpB180A==",
       "dev": true,
       "dependencies": {
         "@babel/core": "^7.11.6",
         "@babel/generator": "^7.7.2",
         "@babel/plugin-syntax-jsx": "^7.7.2",
         "@babel/plugin-syntax-typescript": "^7.7.2",
-        "@babel/traverse": "^7.7.2",
         "@babel/types": "^7.3.3",
-        "@jest/expect-utils": "^29.5.0",
-        "@jest/transform": "^29.5.0",
-        "@jest/types": "^29.5.0",
-        "@types/babel__traverse": "^7.0.6",
+        "@jest/expect-utils": "^29.6.1",
+        "@jest/transform": "^29.6.1",
+        "@jest/types": "^29.6.1",
         "@types/prettier": "^2.1.5",
         "babel-preset-current-node-syntax": "^1.0.0",
         "chalk": "^4.0.0",
-        "expect": "^29.5.0",
+        "expect": "^29.6.1",
         "graceful-fs": "^4.2.9",
-        "jest-diff": "^29.5.0",
+        "jest-diff": "^29.6.1",
         "jest-get-type": "^29.4.3",
-        "jest-matcher-utils": "^29.5.0",
-        "jest-message-util": "^29.5.0",
-        "jest-util": "^29.5.0",
+        "jest-matcher-utils": "^29.6.1",
+        "jest-message-util": "^29.6.1",
+        "jest-util": "^29.6.1",
         "natural-compare": "^1.4.0",
-        "pretty-format": "^29.5.0",
-        "semver": "^7.3.5"
+        "pretty-format": "^29.6.1",
+        "semver": "^7.5.3"
       },
       "engines": {
         "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
@@ -11402,9 +11316,9 @@
       }
     },
     "node_modules/jest-snapshot/node_modules/semver": {
-      "version": "7.3.8",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz",
-      "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==",
+      "version": "7.5.3",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.3.tgz",
+      "integrity": "sha512-QBlUtyVk/5EeHbi7X0fw6liDZc7BBmEaSYn01fMU1OUYbf6GPsbTtd8WmnqbI20SeycoHSeiybkE/q1Q+qlThQ==",
       "dev": true,
       "dependencies": {
         "lru-cache": "^6.0.0"
@@ -11429,12 +11343,12 @@
       }
     },
     "node_modules/jest-util": {
-      "version": "29.6.0",
-      "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-29.6.0.tgz",
-      "integrity": "sha512-S0USx9YwcvEm4pQ5suisVm/RVxBmi0GFR7ocJhIeaCuW5AXnAnffXbaVKvIFodyZNOc9ygzVtTxmBf40HsHXaA==",
+      "version": "29.6.1",
+      "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-29.6.1.tgz",
+      "integrity": "sha512-NRFCcjc+/uO3ijUVyNOQJluf8PtGCe/W6cix36+M3cTFgiYqFOOW5MgN4JOOcvbUhcKTYVd1CvHz/LWi8d16Mg==",
       "dev": true,
       "dependencies": {
-        "@jest/types": "^29.6.0",
+        "@jest/types": "^29.6.1",
         "@types/node": "*",
         "chalk": "^4.0.0",
         "ci-info": "^3.2.0",
@@ -11516,17 +11430,17 @@
       }
     },
     "node_modules/jest-validate": {
-      "version": "29.5.0",
-      "resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-29.5.0.tgz",
-      "integrity": "sha512-pC26etNIi+y3HV8A+tUGr/lph9B18GnzSRAkPaaZJIE1eFdiYm6/CewuiJQ8/RlfHd1u/8Ioi8/sJ+CmbA+zAQ==",
+      "version": "29.6.1",
+      "resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-29.6.1.tgz",
+      "integrity": "sha512-r3Ds69/0KCN4vx4sYAbGL1EVpZ7MSS0vLmd3gV78O+NAx3PDQQukRU5hNHPXlyqCgFY8XUk7EuTMLugh0KzahA==",
       "dev": true,
       "dependencies": {
-        "@jest/types": "^29.5.0",
+        "@jest/types": "^29.6.1",
         "camelcase": "^6.2.0",
         "chalk": "^4.0.0",
         "jest-get-type": "^29.4.3",
         "leven": "^3.1.0",
-        "pretty-format": "^29.5.0"
+        "pretty-format": "^29.6.1"
       },
       "engines": {
         "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
@@ -11615,18 +11529,18 @@
       }
     },
     "node_modules/jest-watcher": {
-      "version": "29.5.0",
-      "resolved": "https://registry.npmjs.org/jest-watcher/-/jest-watcher-29.5.0.tgz",
-      "integrity": "sha512-KmTojKcapuqYrKDpRwfqcQ3zjMlwu27SYext9pt4GlF5FUgB+7XE1mcCnSm6a4uUpFyQIkb6ZhzZvHl+jiBCiA==",
+      "version": "29.6.1",
+      "resolved": "https://registry.npmjs.org/jest-watcher/-/jest-watcher-29.6.1.tgz",
+      "integrity": "sha512-d4wpjWTS7HEZPaaj8m36QiaP856JthRZkrgcIY/7ISoUWPIillrXM23WPboZVLbiwZBt4/qn2Jke84Sla6JhFA==",
       "dev": true,
       "dependencies": {
-        "@jest/test-result": "^29.5.0",
-        "@jest/types": "^29.5.0",
+        "@jest/test-result": "^29.6.1",
+        "@jest/types": "^29.6.1",
         "@types/node": "*",
         "ansi-escapes": "^4.2.1",
         "chalk": "^4.0.0",
         "emittery": "^0.13.1",
-        "jest-util": "^29.5.0",
+        "jest-util": "^29.6.1",
         "string-length": "^4.0.1"
       },
       "engines": {
@@ -12395,14 +12309,6 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/make-error": {
-      "version": "1.3.6",
-      "resolved": "https://registry.npmjs.org/make-error/-/make-error-1.3.6.tgz",
-      "integrity": "sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==",
-      "dev": true,
-      "optional": true,
-      "peer": true
-    },
     "node_modules/makeerror": {
       "version": "1.0.12",
       "resolved": "https://registry.npmjs.org/makeerror/-/makeerror-1.0.12.tgz",
@@ -13405,9 +13311,9 @@
       "integrity": "sha512-TNtsE+34BIax3WtkB/qqu5uepV1McKYEgvL3kWzU7aqPCpMEN6rBF3AOwu4WCwAealWlBGobXny/9kJb49C1ew=="
     },
     "node_modules/pirates": {
-      "version": "4.0.5",
-      "resolved": "https://registry.npmjs.org/pirates/-/pirates-4.0.5.tgz",
-      "integrity": "sha512-8V9+HQPupnaXMA23c5hvl69zXvTwTzyAYasnkb0Tts4XvO4CliqONMOnvlq26rkhLC3nWDFBJf73LU1e1VZLaQ==",
+      "version": "4.0.6",
+      "resolved": "https://registry.npmjs.org/pirates/-/pirates-4.0.6.tgz",
+      "integrity": "sha512-saLsH7WeYYPiD25LDuLRRY/i+6HaPYr6G1OUlN39otzkSTxKnubR9RTxS3/Kk50s1g2JTgFwWQDQyplC5/SHZg==",
       "dev": true,
       "engines": {
         "node": ">= 6"
@@ -14007,9 +13913,9 @@
       }
     },
     "node_modules/pretty-format": {
-      "version": "29.6.0",
-      "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-29.6.0.tgz",
-      "integrity": "sha512-XH+D4n7Ey0iSR6PdAnBs99cWMZdGsdKrR33iUHQNr79w1szKTCIZDVdXuccAsHVwDBp0XeWPfNEoaxP9EZgRmQ==",
+      "version": "29.6.1",
+      "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-29.6.1.tgz",
+      "integrity": "sha512-7jRj+yXO0W7e4/tSJKoR7HRIHLPPjtNaUGG2xxKQnGvPNRkgWcQ0AZX6P4KBRJN4FcTBWb3sa7DVUJmocYuoog==",
       "dev": true,
       "dependencies": {
         "@jest/schemas": "^29.6.0",
@@ -14144,9 +14050,9 @@
       }
     },
     "node_modules/pure-rand": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/pure-rand/-/pure-rand-6.0.0.tgz",
-      "integrity": "sha512-rLSBxJjP+4DQOgcJAx6RZHT2he2pkhQdSnofG5VWyVl6GRq/K02ISOuOLcsMOrtKDIJb8JN2zm3FFzWNbezdPw==",
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/pure-rand/-/pure-rand-6.0.2.tgz",
+      "integrity": "sha512-6Yg0ekpKICSjPswYOuC5sku/TSWaRYlA0qsXqJgM/d/4pLPHPuTxK7Nbf7jFKzAeedUhR8C7K9Uv63FBsSo8xQ==",
       "dev": true,
       "funding": [
         {
@@ -14727,9 +14633,9 @@
       }
     },
     "node_modules/resolve.exports": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/resolve.exports/-/resolve.exports-2.0.1.tgz",
-      "integrity": "sha512-OEJWVeimw8mgQuj3HfkNl4KqRevH7lzeQNaWRPfx0PPse7Jk6ozcsG4FKVgtzDsC1KUF+YlTHh17NcgHOPykLw==",
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/resolve.exports/-/resolve.exports-2.0.2.tgz",
+      "integrity": "sha512-X2UW6Nw3n/aMgDVy+0rSqgHlv39WZAlZrXCdnbyEiKm17DSqHX4MmQMaST3FbeWR5FTuRcUwYAziZajji0Y7mg==",
       "dev": true,
       "engines": {
         "node": ">=10"
@@ -15974,62 +15880,6 @@
         "node": ">=12"
       }
     },
-    "node_modules/ts-node": {
-      "version": "10.9.1",
-      "resolved": "https://registry.npmjs.org/ts-node/-/ts-node-10.9.1.tgz",
-      "integrity": "sha512-NtVysVPkxxrwFGUUxGYhfux8k78pQB3JqYBXlLRZgdGUqTO5wU/UyHop5p70iEbGhB7q5KmiZiU0Y3KlJrScEw==",
-      "dev": true,
-      "optional": true,
-      "peer": true,
-      "dependencies": {
-        "@cspotcode/source-map-support": "^0.8.0",
-        "@tsconfig/node10": "^1.0.7",
-        "@tsconfig/node12": "^1.0.7",
-        "@tsconfig/node14": "^1.0.0",
-        "@tsconfig/node16": "^1.0.2",
-        "acorn": "^8.4.1",
-        "acorn-walk": "^8.1.1",
-        "arg": "^4.1.0",
-        "create-require": "^1.1.0",
-        "diff": "^4.0.1",
-        "make-error": "^1.1.1",
-        "v8-compile-cache-lib": "^3.0.1",
-        "yn": "3.1.1"
-      },
-      "bin": {
-        "ts-node": "dist/bin.js",
-        "ts-node-cwd": "dist/bin-cwd.js",
-        "ts-node-esm": "dist/bin-esm.js",
-        "ts-node-script": "dist/bin-script.js",
-        "ts-node-transpile-only": "dist/bin-transpile.js",
-        "ts-script": "dist/bin-script-deprecated.js"
-      },
-      "peerDependencies": {
-        "@swc/core": ">=1.2.50",
-        "@swc/wasm": ">=1.2.50",
-        "@types/node": "*",
-        "typescript": ">=2.7"
-      },
-      "peerDependenciesMeta": {
-        "@swc/core": {
-          "optional": true
-        },
-        "@swc/wasm": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/ts-node/node_modules/acorn-walk": {
-      "version": "8.2.0",
-      "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.2.0.tgz",
-      "integrity": "sha512-k+iyHEuPgSw6SbuDpGQM+06HQUa04DZ3o+F6CSzXMvvI5KMvnaEqXe+YVe555R9nn6GPt404fos4wcgpw12SDA==",
-      "dev": true,
-      "optional": true,
-      "peer": true,
-      "engines": {
-        "node": ">=0.4.0"
-      }
-    },
     "node_modules/tsconfig-paths": {
       "version": "3.14.1",
       "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.14.1.tgz",
@@ -16155,21 +16005,6 @@
         "is-typedarray": "^1.0.0"
       }
     },
-    "node_modules/typescript": {
-      "version": "5.0.3",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.0.3.tgz",
-      "integrity": "sha512-xv8mOEDnigb/tN9PSMTwSEqAnUvkoXMQlicOb0IUVDBSQCgBSaAAROUZYy2IcUy5qU6XajK5jjjO7TMWqBTKZA==",
-      "dev": true,
-      "optional": true,
-      "peer": true,
-      "bin": {
-        "tsc": "bin/tsc",
-        "tsserver": "bin/tsserver"
-      },
-      "engines": {
-        "node": ">=12.20"
-      }
-    },
     "node_modules/ultron": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/ultron/-/ultron-1.1.1.tgz",
@@ -16382,14 +16217,6 @@
         "uuid": "bin/uuid"
       }
     },
-    "node_modules/v8-compile-cache-lib": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/v8-compile-cache-lib/-/v8-compile-cache-lib-3.0.1.tgz",
-      "integrity": "sha512-wa7YjyUGfNZngI/vtK0UHAN+lgDCxBPCylVXGp0zu59Fz5aiGtNXaq3DhIov063MorB+VfufLh3JlF2KdTK3xg==",
-      "dev": true,
-      "optional": true,
-      "peer": true
-    },
     "node_modules/v8-to-istanbul": {
       "version": "9.1.0",
       "resolved": "https://registry.npmjs.org/v8-to-istanbul/-/v8-to-istanbul-9.1.0.tgz",
@@ -17440,9 +17267,9 @@
       "dev": true
     },
     "node_modules/yargs": {
-      "version": "17.7.1",
-      "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.1.tgz",
-      "integrity": "sha512-cwiTb08Xuv5fqF4AovYacTFNxk62th7LKJ6BL9IGUpTJrWoU7/7WdQGTP2SjKf1dUNBGzDd28p/Yfs/GI6JrLw==",
+      "version": "17.7.2",
+      "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.2.tgz",
+      "integrity": "sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==",
       "dev": true,
       "dependencies": {
         "cliui": "^8.0.1",
@@ -17475,17 +17302,6 @@
         "node": ">=10"
       }
     },
-    "node_modules/yn": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/yn/-/yn-3.1.1.tgz",
-      "integrity": "sha512-Ux4ygGWsu2c7isFWe8Yu1YluJmqVhxqK2cLXNQA5AcC3QfbGNpM7fu0Y8b/z16pXLnFxZYvWhd3fhBY9DLmC6Q==",
-      "dev": true,
-      "optional": true,
-      "peer": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
     "node_modules/yocto-queue": {
       "version": "0.1.0",
       "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz",
@@ -18055,12 +17871,12 @@
       }
     },
     "@babel/plugin-syntax-jsx": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.18.6.tgz",
-      "integrity": "sha512-6mmljtAedFGTWu2p/8WIORGwy+61PLgOMPOdazc7YoJ9ZCWUyFy3A6CpPkRKLKD1ToAesxX8KGEViAiLo9N+7Q==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.22.5.tgz",
+      "integrity": "sha512-gvyP4hZrgrs/wWMaocvxZ44Hw0b3W8Pe+cMxc8V1ULQ07oh8VNbIRaoD1LRZVTvD+0nieDKjfgKg89sD7rrKrg==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.18.6"
+        "@babel/helper-plugin-utils": "^7.22.5"
       }
     },
     "@babel/plugin-syntax-logical-assignment-operators": {
@@ -18136,12 +17952,12 @@
       }
     },
     "@babel/plugin-syntax-typescript": {
-      "version": "7.20.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.20.0.tgz",
-      "integrity": "sha512-rd9TkG+u1CExzS4SM1BlMEhMXwFLKVjOAFFCDx9PbX5ycJWDoWMcwdJH9RhkPu1dOgn5TrxLot/Gx6lWFuAUNQ==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.22.5.tgz",
+      "integrity": "sha512-1mS2o03i7t1c6VzH6fdQ3OA8tcEIxwG18zIPRp+UY1Ihv6W+XZzBCVxExF9upussPXJ0xE9XRHwMoNs1ep/nRQ==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.19.0"
+        "@babel/helper-plugin-utils": "^7.22.5"
       }
     },
     "@babel/plugin-syntax-unicode-sets-regex": {
@@ -18856,31 +18672,6 @@
       "integrity": "sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==",
       "dev": true
     },
-    "@cspotcode/source-map-support": {
-      "version": "0.8.1",
-      "resolved": "https://registry.npmjs.org/@cspotcode/source-map-support/-/source-map-support-0.8.1.tgz",
-      "integrity": "sha512-IchNf6dN4tHoMFIn/7OE8LWZ19Y6q/67Bmf6vnGREv8RSbBVb9LPJxEcnwrcwX6ixSvaiGoomAUvu4YSxXrVgw==",
-      "dev": true,
-      "optional": true,
-      "peer": true,
-      "requires": {
-        "@jridgewell/trace-mapping": "0.3.9"
-      },
-      "dependencies": {
-        "@jridgewell/trace-mapping": {
-          "version": "0.3.9",
-          "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.9.tgz",
-          "integrity": "sha512-3Belt6tdc8bPgAtbcmdtNJlirVoTmEb5e2gC94PnkwEW9jI6CAHUeoG85tjWP5WquqfavoMtMwiG4P926ZKKuQ==",
-          "dev": true,
-          "optional": true,
-          "peer": true,
-          "requires": {
-            "@jridgewell/resolve-uri": "^3.0.3",
-            "@jridgewell/sourcemap-codec": "^1.4.10"
-          }
-        }
-      }
-    },
     "@discoveryjs/json-ext": {
       "version": "0.5.5",
       "resolved": "https://registry.npmjs.org/@discoveryjs/json-ext/-/json-ext-0.5.5.tgz",
@@ -19248,16 +19039,16 @@
       "dev": true
     },
     "@jest/console": {
-      "version": "29.5.0",
-      "resolved": "https://registry.npmjs.org/@jest/console/-/console-29.5.0.tgz",
-      "integrity": "sha512-NEpkObxPwyw/XxZVLPmAGKE89IQRp4puc6IQRPru6JKd1M3fW9v1xM1AnzIJE65hbCkzQAdnL8P47e9hzhiYLQ==",
+      "version": "29.6.1",
+      "resolved": "https://registry.npmjs.org/@jest/console/-/console-29.6.1.tgz",
+      "integrity": "sha512-Aj772AYgwTSr5w8qnyoJ0eDYvN6bMsH3ORH1ivMotrInHLKdUz6BDlaEXHdM6kODaBIkNIyQGzsMvRdOv7VG7Q==",
       "dev": true,
       "requires": {
-        "@jest/types": "^29.5.0",
+        "@jest/types": "^29.6.1",
         "@types/node": "*",
         "chalk": "^4.0.0",
-        "jest-message-util": "^29.5.0",
-        "jest-util": "^29.5.0",
+        "jest-message-util": "^29.6.1",
+        "jest-util": "^29.6.1",
         "slash": "^3.0.0"
       },
       "dependencies": {
@@ -19313,16 +19104,16 @@
       }
     },
     "@jest/core": {
-      "version": "29.5.0",
-      "resolved": "https://registry.npmjs.org/@jest/core/-/core-29.5.0.tgz",
-      "integrity": "sha512-28UzQc7ulUrOQw1IsN/kv1QES3q2kkbl/wGslyhAclqZ/8cMdB5M68BffkIdSJgKBUt50d3hbwJ92XESlE7LiQ==",
+      "version": "29.6.1",
+      "resolved": "https://registry.npmjs.org/@jest/core/-/core-29.6.1.tgz",
+      "integrity": "sha512-CcowHypRSm5oYQ1obz1wfvkjZZ2qoQlrKKvlfPwh5jUXVU12TWr2qMeH8chLMuTFzHh5a1g2yaqlqDICbr+ukQ==",
       "dev": true,
       "requires": {
-        "@jest/console": "^29.5.0",
-        "@jest/reporters": "^29.5.0",
-        "@jest/test-result": "^29.5.0",
-        "@jest/transform": "^29.5.0",
-        "@jest/types": "^29.5.0",
+        "@jest/console": "^29.6.1",
+        "@jest/reporters": "^29.6.1",
+        "@jest/test-result": "^29.6.1",
+        "@jest/transform": "^29.6.1",
+        "@jest/types": "^29.6.1",
         "@types/node": "*",
         "ansi-escapes": "^4.2.1",
         "chalk": "^4.0.0",
@@ -19330,20 +19121,20 @@
         "exit": "^0.1.2",
         "graceful-fs": "^4.2.9",
         "jest-changed-files": "^29.5.0",
-        "jest-config": "^29.5.0",
-        "jest-haste-map": "^29.5.0",
-        "jest-message-util": "^29.5.0",
+        "jest-config": "^29.6.1",
+        "jest-haste-map": "^29.6.1",
+        "jest-message-util": "^29.6.1",
         "jest-regex-util": "^29.4.3",
-        "jest-resolve": "^29.5.0",
-        "jest-resolve-dependencies": "^29.5.0",
-        "jest-runner": "^29.5.0",
-        "jest-runtime": "^29.5.0",
-        "jest-snapshot": "^29.5.0",
-        "jest-util": "^29.5.0",
-        "jest-validate": "^29.5.0",
-        "jest-watcher": "^29.5.0",
+        "jest-resolve": "^29.6.1",
+        "jest-resolve-dependencies": "^29.6.1",
+        "jest-runner": "^29.6.1",
+        "jest-runtime": "^29.6.1",
+        "jest-snapshot": "^29.6.1",
+        "jest-util": "^29.6.1",
+        "jest-validate": "^29.6.1",
+        "jest-watcher": "^29.6.1",
         "micromatch": "^4.0.4",
-        "pretty-format": "^29.5.0",
+        "pretty-format": "^29.6.1",
         "slash": "^3.0.0",
         "strip-ansi": "^6.0.0"
       },
@@ -19400,74 +19191,74 @@
       }
     },
     "@jest/environment": {
-      "version": "29.6.0",
-      "resolved": "https://registry.npmjs.org/@jest/environment/-/environment-29.6.0.tgz",
-      "integrity": "sha512-bUZLYUxYlUIsslBbxII0fq0kr1+friI3Gty+cRLmocGB1jdcAHs7FS8QdCDqedE8q4DZE1g/AJHH6OJZBLGGsg==",
+      "version": "29.6.1",
+      "resolved": "https://registry.npmjs.org/@jest/environment/-/environment-29.6.1.tgz",
+      "integrity": "sha512-RMMXx4ws+Gbvw3DfLSuo2cfQlK7IwGbpuEWXCqyYDcqYTI+9Ju3a5hDnXaxjNsa6uKh9PQF2v+qg+RLe63tz5A==",
       "dev": true,
       "requires": {
-        "@jest/fake-timers": "^29.6.0",
-        "@jest/types": "^29.6.0",
+        "@jest/fake-timers": "^29.6.1",
+        "@jest/types": "^29.6.1",
         "@types/node": "*",
-        "jest-mock": "^29.6.0"
+        "jest-mock": "^29.6.1"
       }
     },
     "@jest/expect": {
-      "version": "29.5.0",
-      "resolved": "https://registry.npmjs.org/@jest/expect/-/expect-29.5.0.tgz",
-      "integrity": "sha512-PueDR2HGihN3ciUNGr4uelropW7rqUfTiOn+8u0leg/42UhblPxHkfoh0Ruu3I9Y1962P3u2DY4+h7GVTSVU6g==",
+      "version": "29.6.1",
+      "resolved": "https://registry.npmjs.org/@jest/expect/-/expect-29.6.1.tgz",
+      "integrity": "sha512-N5xlPrAYaRNyFgVf2s9Uyyvr795jnB6rObuPx4QFvNJz8aAjpZUDfO4bh5G/xuplMID8PrnuF1+SfSyDxhsgYg==",
       "dev": true,
       "requires": {
-        "expect": "^29.5.0",
-        "jest-snapshot": "^29.5.0"
+        "expect": "^29.6.1",
+        "jest-snapshot": "^29.6.1"
       }
     },
     "@jest/expect-utils": {
-      "version": "29.5.0",
-      "resolved": "https://registry.npmjs.org/@jest/expect-utils/-/expect-utils-29.5.0.tgz",
-      "integrity": "sha512-fmKzsidoXQT2KwnrwE0SQq3uj8Z763vzR8LnLBwC2qYWEFpjX8daRsk6rHUM1QvNlEW/UJXNXm59ztmJJWs2Mg==",
+      "version": "29.6.1",
+      "resolved": "https://registry.npmjs.org/@jest/expect-utils/-/expect-utils-29.6.1.tgz",
+      "integrity": "sha512-o319vIf5pEMx0LmzSxxkYYxo4wrRLKHq9dP1yJU7FoPTB0LfAKSz8SWD6D/6U3v/O52t9cF5t+MeJiRsfk7zMw==",
       "dev": true,
       "requires": {
         "jest-get-type": "^29.4.3"
       }
     },
     "@jest/fake-timers": {
-      "version": "29.6.0",
-      "resolved": "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-29.6.0.tgz",
-      "integrity": "sha512-nuCU46AsZoskthWSDS2Aj6LARgyNcp5Fjx2qxsO/fPl1Wp1CJ+dBDqs0OkEcJK8FBeV/MbjH5efe79M2sHcV+A==",
+      "version": "29.6.1",
+      "resolved": "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-29.6.1.tgz",
+      "integrity": "sha512-RdgHgbXyosCDMVYmj7lLpUwXA4c69vcNzhrt69dJJdf8azUrpRh3ckFCaTPNjsEeRi27Cig0oKDGxy5j7hOgHg==",
       "dev": true,
       "requires": {
-        "@jest/types": "^29.6.0",
+        "@jest/types": "^29.6.1",
         "@sinonjs/fake-timers": "^10.0.2",
         "@types/node": "*",
-        "jest-message-util": "^29.6.0",
-        "jest-mock": "^29.6.0",
-        "jest-util": "^29.6.0"
+        "jest-message-util": "^29.6.1",
+        "jest-mock": "^29.6.1",
+        "jest-util": "^29.6.1"
       }
     },
     "@jest/globals": {
-      "version": "29.5.0",
-      "resolved": "https://registry.npmjs.org/@jest/globals/-/globals-29.5.0.tgz",
-      "integrity": "sha512-S02y0qMWGihdzNbUiqSAiKSpSozSuHX5UYc7QbnHP+D9Lyw8DgGGCinrN9uSuHPeKgSSzvPom2q1nAtBvUsvPQ==",
+      "version": "29.6.1",
+      "resolved": "https://registry.npmjs.org/@jest/globals/-/globals-29.6.1.tgz",
+      "integrity": "sha512-2VjpaGy78JY9n9370H8zGRCFbYVWwjY6RdDMhoJHa1sYfwe6XM/azGN0SjY8kk7BOZApIejQ1BFPyH7FPG0w3A==",
       "dev": true,
       "requires": {
-        "@jest/environment": "^29.5.0",
-        "@jest/expect": "^29.5.0",
-        "@jest/types": "^29.5.0",
-        "jest-mock": "^29.5.0"
+        "@jest/environment": "^29.6.1",
+        "@jest/expect": "^29.6.1",
+        "@jest/types": "^29.6.1",
+        "jest-mock": "^29.6.1"
       }
     },
     "@jest/reporters": {
-      "version": "29.5.0",
-      "resolved": "https://registry.npmjs.org/@jest/reporters/-/reporters-29.5.0.tgz",
-      "integrity": "sha512-D05STXqj/M8bP9hQNSICtPqz97u7ffGzZu+9XLucXhkOFBqKcXe04JLZOgIekOxdb73MAoBUFnqvf7MCpKk5OA==",
+      "version": "29.6.1",
+      "resolved": "https://registry.npmjs.org/@jest/reporters/-/reporters-29.6.1.tgz",
+      "integrity": "sha512-9zuaI9QKr9JnoZtFQlw4GREQbxgmNYXU6QuWtmuODvk5nvPUeBYapVR/VYMyi2WSx3jXTLJTJji8rN6+Cm4+FA==",
       "dev": true,
       "requires": {
         "@bcoe/v8-coverage": "^0.2.3",
-        "@jest/console": "^29.5.0",
-        "@jest/test-result": "^29.5.0",
-        "@jest/transform": "^29.5.0",
-        "@jest/types": "^29.5.0",
-        "@jridgewell/trace-mapping": "^0.3.15",
+        "@jest/console": "^29.6.1",
+        "@jest/test-result": "^29.6.1",
+        "@jest/transform": "^29.6.1",
+        "@jest/types": "^29.6.1",
+        "@jridgewell/trace-mapping": "^0.3.18",
         "@types/node": "*",
         "chalk": "^4.0.0",
         "collect-v8-coverage": "^1.0.0",
@@ -19479,9 +19270,9 @@
         "istanbul-lib-report": "^3.0.0",
         "istanbul-lib-source-maps": "^4.0.0",
         "istanbul-reports": "^3.1.3",
-        "jest-message-util": "^29.5.0",
-        "jest-util": "^29.5.0",
-        "jest-worker": "^29.5.0",
+        "jest-message-util": "^29.6.1",
+        "jest-util": "^29.6.1",
+        "jest-worker": "^29.6.1",
         "slash": "^3.0.0",
         "string-length": "^4.0.1",
         "strip-ansi": "^6.0.0",
@@ -19529,13 +19320,13 @@
           "dev": true
         },
         "jest-worker": {
-          "version": "29.5.0",
-          "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-29.5.0.tgz",
-          "integrity": "sha512-NcrQnevGoSp4b5kg+akIpthoAFHxPBcb5P6mYPY0fUNT+sSvmtu6jlkEle3anczUKIKEbMxFimk9oTP/tpIPgA==",
+          "version": "29.6.1",
+          "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-29.6.1.tgz",
+          "integrity": "sha512-U+Wrbca7S8ZAxAe9L6nb6g8kPdia5hj32Puu5iOqBCMTMWFHXuK6dOV2IFrpedbTV8fjMFLdWNttQTBL6u2MRA==",
           "dev": true,
           "requires": {
             "@types/node": "*",
-            "jest-util": "^29.5.0",
+            "jest-util": "^29.6.1",
             "merge-stream": "^2.0.0",
             "supports-color": "^8.0.0"
           },
@@ -19572,57 +19363,57 @@
       }
     },
     "@jest/source-map": {
-      "version": "29.4.3",
-      "resolved": "https://registry.npmjs.org/@jest/source-map/-/source-map-29.4.3.tgz",
-      "integrity": "sha512-qyt/mb6rLyd9j1jUts4EQncvS6Yy3PM9HghnNv86QBlV+zdL2inCdK1tuVlL+J+lpiw2BI67qXOrX3UurBqQ1w==",
+      "version": "29.6.0",
+      "resolved": "https://registry.npmjs.org/@jest/source-map/-/source-map-29.6.0.tgz",
+      "integrity": "sha512-oA+I2SHHQGxDCZpbrsCQSoMLb3Bz547JnM+jUr9qEbuw0vQlWZfpPS7CO9J7XiwKicEz9OFn/IYoLkkiUD7bzA==",
       "dev": true,
       "requires": {
-        "@jridgewell/trace-mapping": "^0.3.15",
+        "@jridgewell/trace-mapping": "^0.3.18",
         "callsites": "^3.0.0",
         "graceful-fs": "^4.2.9"
       }
     },
     "@jest/test-result": {
-      "version": "29.5.0",
-      "resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-29.5.0.tgz",
-      "integrity": "sha512-fGl4rfitnbfLsrfx1uUpDEESS7zM8JdgZgOCQuxQvL1Sn/I6ijeAVQWGfXI9zb1i9Mzo495cIpVZhA0yr60PkQ==",
+      "version": "29.6.1",
+      "resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-29.6.1.tgz",
+      "integrity": "sha512-Ynr13ZRcpX6INak0TPUukU8GWRfm/vAytE3JbJNGAvINySWYdfE7dGZMbk36oVuK4CigpbhMn8eg1dixZ7ZJOw==",
       "dev": true,
       "requires": {
-        "@jest/console": "^29.5.0",
-        "@jest/types": "^29.5.0",
+        "@jest/console": "^29.6.1",
+        "@jest/types": "^29.6.1",
         "@types/istanbul-lib-coverage": "^2.0.0",
         "collect-v8-coverage": "^1.0.0"
       }
     },
     "@jest/test-sequencer": {
-      "version": "29.5.0",
-      "resolved": "https://registry.npmjs.org/@jest/test-sequencer/-/test-sequencer-29.5.0.tgz",
-      "integrity": "sha512-yPafQEcKjkSfDXyvtgiV4pevSeyuA6MQr6ZIdVkWJly9vkqjnFfcfhRQqpD5whjoU8EORki752xQmjaqoFjzMQ==",
+      "version": "29.6.1",
+      "resolved": "https://registry.npmjs.org/@jest/test-sequencer/-/test-sequencer-29.6.1.tgz",
+      "integrity": "sha512-oBkC36PCDf/wb6dWeQIhaviU0l5u6VCsXa119yqdUosYAt7/FbQU2M2UoziO3igj/HBDEgp57ONQ3fm0v9uyyg==",
       "dev": true,
       "requires": {
-        "@jest/test-result": "^29.5.0",
+        "@jest/test-result": "^29.6.1",
         "graceful-fs": "^4.2.9",
-        "jest-haste-map": "^29.5.0",
+        "jest-haste-map": "^29.6.1",
         "slash": "^3.0.0"
       }
     },
     "@jest/transform": {
-      "version": "29.5.0",
-      "resolved": "https://registry.npmjs.org/@jest/transform/-/transform-29.5.0.tgz",
-      "integrity": "sha512-8vbeZWqLJOvHaDfeMuoHITGKSz5qWc9u04lnWrQE3VyuSw604PzQM824ZeX9XSjUCeDiE3GuxZe5UKa8J61NQw==",
+      "version": "29.6.1",
+      "resolved": "https://registry.npmjs.org/@jest/transform/-/transform-29.6.1.tgz",
+      "integrity": "sha512-URnTneIU3ZjRSaf906cvf6Hpox3hIeJXRnz3VDSw5/X93gR8ycdfSIEy19FlVx8NFmpN7fe3Gb1xF+NjXaQLWg==",
       "dev": true,
       "requires": {
         "@babel/core": "^7.11.6",
-        "@jest/types": "^29.5.0",
-        "@jridgewell/trace-mapping": "^0.3.15",
+        "@jest/types": "^29.6.1",
+        "@jridgewell/trace-mapping": "^0.3.18",
         "babel-plugin-istanbul": "^6.1.1",
         "chalk": "^4.0.0",
         "convert-source-map": "^2.0.0",
         "fast-json-stable-stringify": "^2.1.0",
         "graceful-fs": "^4.2.9",
-        "jest-haste-map": "^29.5.0",
+        "jest-haste-map": "^29.6.1",
         "jest-regex-util": "^29.4.3",
-        "jest-util": "^29.5.0",
+        "jest-util": "^29.6.1",
         "micromatch": "^4.0.4",
         "pirates": "^4.0.4",
         "slash": "^3.0.0",
@@ -19687,9 +19478,9 @@
       }
     },
     "@jest/types": {
-      "version": "29.6.0",
-      "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.0.tgz",
-      "integrity": "sha512-8XCgL9JhqbJTFnMRjEAO+TuW251+MoMd5BSzLiE3vvzpQ8RlBxy8NoyNkDhs3K3OL3HeVinlOl9or5p7GTeOLg==",
+      "version": "29.6.1",
+      "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.1.tgz",
+      "integrity": "sha512-tPKQNMPuXgvdOn2/Lg9HNfUvjYVGolt04Hp03f5hAk878uwOLikN+JzeLY0HcVgKgFl9Hs3EIqpu3WX27XNhnw==",
       "dev": true,
       "requires": {
         "@jest/schemas": "^29.6.0",
@@ -19884,42 +19675,10 @@
       "integrity": "sha512-L7z9BgrNEcYyUYtF+HaEfiS5ebkh9jXqbszz7pC0hRBPaatV0XjSD3+eHrpqFemQfgwiFF0QPIarnIihIDn7OA==",
       "dev": true
     },
-    "@tsconfig/node10": {
-      "version": "1.0.9",
-      "resolved": "https://registry.npmjs.org/@tsconfig/node10/-/node10-1.0.9.tgz",
-      "integrity": "sha512-jNsYVVxU8v5g43Erja32laIDHXeoNvFEpX33OK4d6hljo3jDhCBDhx5dhCCTMWUojscpAagGiRkBKxpdl9fxqA==",
-      "dev": true,
-      "optional": true,
-      "peer": true
-    },
-    "@tsconfig/node12": {
-      "version": "1.0.11",
-      "resolved": "https://registry.npmjs.org/@tsconfig/node12/-/node12-1.0.11.tgz",
-      "integrity": "sha512-cqefuRsh12pWyGsIoBKJA9luFu3mRxCA+ORZvA4ktLSzIuCUtWVxGIuXigEwO5/ywWFMZ2QEGKWvkZG1zDMTag==",
-      "dev": true,
-      "optional": true,
-      "peer": true
-    },
-    "@tsconfig/node14": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/@tsconfig/node14/-/node14-1.0.3.tgz",
-      "integrity": "sha512-ysT8mhdixWK6Hw3i1V2AeRqZ5WfXg1G43mqoYlM2nc6388Fq5jcXyr5mRsqViLx/GJYdoL0bfXD8nmF+Zn/Iow==",
-      "dev": true,
-      "optional": true,
-      "peer": true
-    },
-    "@tsconfig/node16": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/@tsconfig/node16/-/node16-1.0.3.tgz",
-      "integrity": "sha512-yOlFc+7UtL/89t2ZhjPvvB/DeAr3r+Dq58IgzsFkOAvVC6NMJXmCGjbptdXdR9qsX7pKcTL+s87FtYREi2dEEQ==",
-      "dev": true,
-      "optional": true,
-      "peer": true
-    },
     "@types/babel__core": {
-      "version": "7.20.0",
-      "resolved": "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.20.0.tgz",
-      "integrity": "sha512-+n8dL/9GWblDO0iU6eZAwEIJVr5DWigtle+Q6HLOrh/pdbXOhOtqzq8VPPE2zvNJzSKY4vH/z3iT3tn0A3ypiQ==",
+      "version": "7.20.1",
+      "resolved": "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.20.1.tgz",
+      "integrity": "sha512-aACu/U/omhdk15O4Nfb+fHgH/z3QsfQzpnvRZhYhThms83ZnAOZz7zZAWO7mn2yyNQaA4xTO8GLK3uqFU4bYYw==",
       "dev": true,
       "requires": {
         "@babel/parser": "^7.20.7",
@@ -19949,12 +19708,12 @@
       }
     },
     "@types/babel__traverse": {
-      "version": "7.18.3",
-      "resolved": "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.18.3.tgz",
-      "integrity": "sha512-1kbcJ40lLB7MHsj39U4Sh1uTd2E7rLEa79kmDpI6cy+XiXsteB3POdQomoq4FxszMrO3ZYchkhYJw7A2862b3w==",
+      "version": "7.20.1",
+      "resolved": "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.20.1.tgz",
+      "integrity": "sha512-MitHFXnhtgwsGZWtT68URpOvLN4EREih1u3QtQiN4VdAxWKRVvGCSvw/Qth0M0Qq3pJpnGOu5JaM/ydK7OGbqg==",
       "dev": true,
       "requires": {
-        "@babel/types": "^7.3.0"
+        "@babel/types": "^7.20.7"
       }
     },
     "@types/bn.js": {
@@ -20085,9 +19844,9 @@
       }
     },
     "@types/prettier": {
-      "version": "2.7.2",
-      "resolved": "https://registry.npmjs.org/@types/prettier/-/prettier-2.7.2.tgz",
-      "integrity": "sha512-KufADq8uQqo1pYKVIYzfKbJfBAc0sOeXqGbFaSpv8MRmC/zXgowNZmFcbngndGk922QDmOASEXUZCaY48gs4cg==",
+      "version": "2.7.3",
+      "resolved": "https://registry.npmjs.org/@types/prettier/-/prettier-2.7.3.tgz",
+      "integrity": "sha512-+68kP9yzs4LMp7VNh8gdzMSPZFL44MLGqiHWvttYJe+6qnuVr4Ek9wSBQoveqY/r+LwjCcU29kNVkidwim+kYA==",
       "dev": true
     },
     "@types/responselike": {
@@ -20707,14 +20466,6 @@
         "picomatch": "^2.0.4"
       }
     },
-    "arg": {
-      "version": "4.1.3",
-      "resolved": "https://registry.npmjs.org/arg/-/arg-4.1.3.tgz",
-      "integrity": "sha512-58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA==",
-      "dev": true,
-      "optional": true,
-      "peer": true
-    },
     "argparse": {
       "version": "1.0.10",
       "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
@@ -20884,12 +20635,12 @@
       "integrity": "sha512-xh1Rl34h6Fi1DC2WWKfxUTVqRsNnr6LsKz2+hfwDxQJWmrx8+c7ylaqBMcHfl1U1r2dsifOvKX3LQuLNZ+XSvA=="
     },
     "babel-jest": {
-      "version": "29.5.0",
-      "resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-29.5.0.tgz",
-      "integrity": "sha512-mA4eCDh5mSo2EcA9xQjVTpmbbNk32Zb3Q3QFQsNhaK56Q+yoXowzFodLux30HRgyOho5rsQ6B0P9QpMkvvnJ0Q==",
+      "version": "29.6.1",
+      "resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-29.6.1.tgz",
+      "integrity": "sha512-qu+3bdPEQC6KZSPz+4Fyjbga5OODNcp49j6GKzG1EKbkfyJBxEYGVUmVGpwCSeGouG52R4EgYMLb6p9YeEEQ4A==",
       "dev": true,
       "requires": {
-        "@jest/transform": "^29.5.0",
+        "@jest/transform": "^29.6.1",
         "@types/babel__core": "^7.1.14",
         "babel-plugin-istanbul": "^6.1.1",
         "babel-preset-jest": "^29.5.0",
@@ -21631,9 +21382,9 @@
       }
     },
     "cjs-module-lexer": {
-      "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/cjs-module-lexer/-/cjs-module-lexer-1.2.2.tgz",
-      "integrity": "sha512-cOU9usZw8/dXIXKtwa8pM0OTJQuJkxMN6w30csNRUerHfeQ5R6U3kkU/FtJeIf3M202OHfY2U8ccInBG7/xogA==",
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/cjs-module-lexer/-/cjs-module-lexer-1.2.3.tgz",
+      "integrity": "sha512-0TNiGstbQmCFwt4akjjBg5pLRTSyj/PkWQ1ZoO2zntmg9yLqSRxwEa4iCfQLGjqhiqBfOJa7W/E8wfGrTDmlZQ==",
       "dev": true
     },
     "class-is": {
@@ -21693,9 +21444,9 @@
       "dev": true
     },
     "collect-v8-coverage": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/collect-v8-coverage/-/collect-v8-coverage-1.0.1.tgz",
-      "integrity": "sha512-iBPtljfCNcTKNAto0KEtDfZ3qzjJvqE3aTGZsbhjSBlorqpXJlaWWtPO35D+ZImoC3KWejX64o+yPGxhWSTzfg==",
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/collect-v8-coverage/-/collect-v8-coverage-1.0.2.tgz",
+      "integrity": "sha512-lHl4d5/ONEbLlJvaJNtsF/Lz+WvB07u2ycqTYbdrq7UypDXailES4valYb2eWiJFxZlVmpGekfqoxQhzyFdT4Q==",
       "dev": true
     },
     "color-convert": {
@@ -21926,14 +21677,6 @@
         "sha.js": "^2.4.8"
       }
     },
-    "create-require": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/create-require/-/create-require-1.1.1.tgz",
-      "integrity": "sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ==",
-      "dev": true,
-      "optional": true,
-      "peer": true
-    },
     "cross-fetch": {
       "version": "2.2.6",
       "resolved": "https://registry.npmjs.org/cross-fetch/-/cross-fetch-2.2.6.tgz",
@@ -22309,9 +22052,9 @@
       "dev": true
     },
     "deepmerge": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.3.0.tgz",
-      "integrity": "sha512-z2wJZXrmeHdvYJp/Ux55wIjqo81G5Bp4c+oELTW+7ar6SogWHajt5a9gO3s3IDaGSAXjDk0vlQKN3rms8ab3og==",
+      "version": "4.3.1",
+      "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.3.1.tgz",
+      "integrity": "sha512-3sUqbMEc77XqpdNO7FRyRog+eW3ph+GYCbj+rK+uYyRMuwsVy0rMiVtPn+QJlKFvWP/1PYpapqYn0Me2knFn+A==",
       "dev": true
     },
     "defer-to-connect": {
@@ -22376,14 +22119,6 @@
       "integrity": "sha512-TLz+x/vEXm/Y7P7wn1EJFNLxYpUD4TgMosxY6fAVJUnJMbupHBOncxyWUG9OpTaH9EBD7uFI5LfEgmMOc54DsA==",
       "dev": true
     },
-    "diff": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/diff/-/diff-4.0.2.tgz",
-      "integrity": "sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==",
-      "dev": true,
-      "optional": true,
-      "peer": true
-    },
     "diff-sequences": {
       "version": "29.4.3",
       "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-29.4.3.tgz",
@@ -23815,16 +23550,17 @@
       "dev": true
     },
     "expect": {
-      "version": "29.5.0",
-      "resolved": "https://registry.npmjs.org/expect/-/expect-29.5.0.tgz",
-      "integrity": "sha512-yM7xqUrCO2JdpFo4XpM82t+PJBFybdqoQuJLDGeDX2ij8NZzqRHyu3Hp188/JX7SWqud+7t4MUdvcgGBICMHZg==",
+      "version": "29.6.1",
+      "resolved": "https://registry.npmjs.org/expect/-/expect-29.6.1.tgz",
+      "integrity": "sha512-XEdDLonERCU1n9uR56/Stx9OqojaLAQtZf9PrCHH9Hl8YXiEIka3H4NXJ3NOIBmQJTg7+j7buh34PMHfJujc8g==",
       "dev": true,
       "requires": {
-        "@jest/expect-utils": "^29.5.0",
+        "@jest/expect-utils": "^29.6.1",
+        "@types/node": "*",
         "jest-get-type": "^29.4.3",
-        "jest-matcher-utils": "^29.5.0",
-        "jest-message-util": "^29.5.0",
-        "jest-util": "^29.5.0"
+        "jest-matcher-utils": "^29.6.1",
+        "jest-message-util": "^29.6.1",
+        "jest-util": "^29.6.1"
       }
     },
     "express": {
@@ -25082,15 +24818,15 @@
       }
     },
     "jest": {
-      "version": "29.5.0",
-      "resolved": "https://registry.npmjs.org/jest/-/jest-29.5.0.tgz",
-      "integrity": "sha512-juMg3he2uru1QoXX078zTa7pO85QyB9xajZc6bU+d9yEGwrKX6+vGmJQ3UdVZsvTEUARIdObzH68QItim6OSSQ==",
+      "version": "29.6.1",
+      "resolved": "https://registry.npmjs.org/jest/-/jest-29.6.1.tgz",
+      "integrity": "sha512-Nirw5B4nn69rVUZtemCQhwxOBhm0nsp3hmtF4rzCeWD7BkjAXRIji7xWQfnTNbz9g0aVsBX6aZK3n+23LM6uDw==",
       "dev": true,
       "requires": {
-        "@jest/core": "^29.5.0",
-        "@jest/types": "^29.5.0",
+        "@jest/core": "^29.6.1",
+        "@jest/types": "^29.6.1",
         "import-local": "^3.0.2",
-        "jest-cli": "^29.5.0"
+        "jest-cli": "^29.6.1"
       }
     },
     "jest-changed-files": {
@@ -25104,28 +24840,28 @@
       }
     },
     "jest-circus": {
-      "version": "29.5.0",
-      "resolved": "https://registry.npmjs.org/jest-circus/-/jest-circus-29.5.0.tgz",
-      "integrity": "sha512-gq/ongqeQKAplVxqJmbeUOJJKkW3dDNPY8PjhJ5G0lBRvu0e3EWGxGy5cI4LAGA7gV2UHCtWBI4EMXK8c9nQKA==",
+      "version": "29.6.1",
+      "resolved": "https://registry.npmjs.org/jest-circus/-/jest-circus-29.6.1.tgz",
+      "integrity": "sha512-tPbYLEiBU4MYAL2XoZme/bgfUeotpDBd81lgHLCbDZZFaGmECk0b+/xejPFtmiBP87GgP/y4jplcRpbH+fgCzQ==",
       "dev": true,
       "requires": {
-        "@jest/environment": "^29.5.0",
-        "@jest/expect": "^29.5.0",
-        "@jest/test-result": "^29.5.0",
-        "@jest/types": "^29.5.0",
+        "@jest/environment": "^29.6.1",
+        "@jest/expect": "^29.6.1",
+        "@jest/test-result": "^29.6.1",
+        "@jest/types": "^29.6.1",
         "@types/node": "*",
         "chalk": "^4.0.0",
         "co": "^4.6.0",
         "dedent": "^0.7.0",
         "is-generator-fn": "^2.0.0",
-        "jest-each": "^29.5.0",
-        "jest-matcher-utils": "^29.5.0",
-        "jest-message-util": "^29.5.0",
-        "jest-runtime": "^29.5.0",
-        "jest-snapshot": "^29.5.0",
-        "jest-util": "^29.5.0",
+        "jest-each": "^29.6.1",
+        "jest-matcher-utils": "^29.6.1",
+        "jest-message-util": "^29.6.1",
+        "jest-runtime": "^29.6.1",
+        "jest-snapshot": "^29.6.1",
+        "jest-util": "^29.6.1",
         "p-limit": "^3.1.0",
-        "pretty-format": "^29.5.0",
+        "pretty-format": "^29.6.1",
         "pure-rand": "^6.0.0",
         "slash": "^3.0.0",
         "stack-utils": "^2.0.3"
@@ -25183,21 +24919,21 @@
       }
     },
     "jest-cli": {
-      "version": "29.5.0",
-      "resolved": "https://registry.npmjs.org/jest-cli/-/jest-cli-29.5.0.tgz",
-      "integrity": "sha512-L1KcP1l4HtfwdxXNFCL5bmUbLQiKrakMUriBEcc1Vfz6gx31ORKdreuWvmQVBit+1ss9NNR3yxjwfwzZNdQXJw==",
+      "version": "29.6.1",
+      "resolved": "https://registry.npmjs.org/jest-cli/-/jest-cli-29.6.1.tgz",
+      "integrity": "sha512-607dSgTA4ODIN6go9w6xY3EYkyPFGicx51a69H7yfvt7lN53xNswEVLovq+E77VsTRi5fWprLH0yl4DJgE8Ing==",
       "dev": true,
       "requires": {
-        "@jest/core": "^29.5.0",
-        "@jest/test-result": "^29.5.0",
-        "@jest/types": "^29.5.0",
+        "@jest/core": "^29.6.1",
+        "@jest/test-result": "^29.6.1",
+        "@jest/types": "^29.6.1",
         "chalk": "^4.0.0",
         "exit": "^0.1.2",
         "graceful-fs": "^4.2.9",
         "import-local": "^3.0.2",
-        "jest-config": "^29.5.0",
-        "jest-util": "^29.5.0",
-        "jest-validate": "^29.5.0",
+        "jest-config": "^29.6.1",
+        "jest-util": "^29.6.1",
+        "jest-validate": "^29.6.1",
         "prompts": "^2.0.1",
         "yargs": "^17.3.1"
       },
@@ -25254,31 +24990,31 @@
       }
     },
     "jest-config": {
-      "version": "29.5.0",
-      "resolved": "https://registry.npmjs.org/jest-config/-/jest-config-29.5.0.tgz",
-      "integrity": "sha512-kvDUKBnNJPNBmFFOhDbm59iu1Fii1Q6SxyhXfvylq3UTHbg6o7j/g8k2dZyXWLvfdKB1vAPxNZnMgtKJcmu3kA==",
+      "version": "29.6.1",
+      "resolved": "https://registry.npmjs.org/jest-config/-/jest-config-29.6.1.tgz",
+      "integrity": "sha512-XdjYV2fy2xYixUiV2Wc54t3Z4oxYPAELUzWnV6+mcbq0rh742X2p52pii5A3oeRzYjLnQxCsZmp0qpI6klE2cQ==",
       "dev": true,
       "requires": {
         "@babel/core": "^7.11.6",
-        "@jest/test-sequencer": "^29.5.0",
-        "@jest/types": "^29.5.0",
-        "babel-jest": "^29.5.0",
+        "@jest/test-sequencer": "^29.6.1",
+        "@jest/types": "^29.6.1",
+        "babel-jest": "^29.6.1",
         "chalk": "^4.0.0",
         "ci-info": "^3.2.0",
         "deepmerge": "^4.2.2",
         "glob": "^7.1.3",
         "graceful-fs": "^4.2.9",
-        "jest-circus": "^29.5.0",
-        "jest-environment-node": "^29.5.0",
+        "jest-circus": "^29.6.1",
+        "jest-environment-node": "^29.6.1",
         "jest-get-type": "^29.4.3",
         "jest-regex-util": "^29.4.3",
-        "jest-resolve": "^29.5.0",
-        "jest-runner": "^29.5.0",
-        "jest-util": "^29.5.0",
-        "jest-validate": "^29.5.0",
+        "jest-resolve": "^29.6.1",
+        "jest-runner": "^29.6.1",
+        "jest-util": "^29.6.1",
+        "jest-validate": "^29.6.1",
         "micromatch": "^4.0.4",
         "parse-json": "^5.2.0",
-        "pretty-format": "^29.5.0",
+        "pretty-format": "^29.6.1",
         "slash": "^3.0.0",
         "strip-json-comments": "^3.1.1"
       },
@@ -25335,15 +25071,15 @@
       }
     },
     "jest-diff": {
-      "version": "29.5.0",
-      "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-29.5.0.tgz",
-      "integrity": "sha512-LtxijLLZBduXnHSniy0WMdaHjmQnt3g5sa16W4p0HqukYTTsyTW3GD1q41TyGl5YFXj/5B2U6dlh5FM1LIMgxw==",
+      "version": "29.6.1",
+      "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-29.6.1.tgz",
+      "integrity": "sha512-FsNCvinvl8oVxpNLttNQX7FAq7vR+gMDGj90tiP7siWw1UdakWUGqrylpsYrpvj908IYckm5Y0Q7azNAozU1Kg==",
       "dev": true,
       "requires": {
         "chalk": "^4.0.0",
         "diff-sequences": "^29.4.3",
         "jest-get-type": "^29.4.3",
-        "pretty-format": "^29.5.0"
+        "pretty-format": "^29.6.1"
       },
       "dependencies": {
         "ansi-styles": {
@@ -25407,16 +25143,16 @@
       }
     },
     "jest-each": {
-      "version": "29.5.0",
-      "resolved": "https://registry.npmjs.org/jest-each/-/jest-each-29.5.0.tgz",
-      "integrity": "sha512-HM5kIJ1BTnVt+DQZ2ALp3rzXEl+g726csObrW/jpEGl+CDSSQpOJJX2KE/vEg8cxcMXdyEPu6U4QX5eruQv5hA==",
+      "version": "29.6.1",
+      "resolved": "https://registry.npmjs.org/jest-each/-/jest-each-29.6.1.tgz",
+      "integrity": "sha512-n5eoj5eiTHpKQCAVcNTT7DRqeUmJ01hsAL0Q1SMiBHcBcvTKDELixQOGMCpqhbIuTcfC4kMfSnpmDqRgRJcLNQ==",
       "dev": true,
       "requires": {
-        "@jest/types": "^29.5.0",
+        "@jest/types": "^29.6.1",
         "chalk": "^4.0.0",
         "jest-get-type": "^29.4.3",
-        "jest-util": "^29.5.0",
-        "pretty-format": "^29.5.0"
+        "jest-util": "^29.6.1",
+        "pretty-format": "^29.6.1"
       },
       "dependencies": {
         "ansi-styles": {
@@ -25487,17 +25223,17 @@
       }
     },
     "jest-environment-node": {
-      "version": "29.5.0",
-      "resolved": "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-29.5.0.tgz",
-      "integrity": "sha512-ExxuIK/+yQ+6PRGaHkKewYtg6hto2uGCgvKdb2nfJfKXgZ17DfXjvbZ+jA1Qt9A8EQSfPnt5FKIfnOO3u1h9qw==",
+      "version": "29.6.1",
+      "resolved": "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-29.6.1.tgz",
+      "integrity": "sha512-ZNIfAiE+foBog24W+2caIldl4Irh8Lx1PUhg/GZ0odM1d/h2qORAsejiFc7zb+SEmYPn1yDZzEDSU5PmDkmVLQ==",
       "dev": true,
       "requires": {
-        "@jest/environment": "^29.5.0",
-        "@jest/fake-timers": "^29.5.0",
-        "@jest/types": "^29.5.0",
+        "@jest/environment": "^29.6.1",
+        "@jest/fake-timers": "^29.6.1",
+        "@jest/types": "^29.6.1",
         "@types/node": "*",
-        "jest-mock": "^29.5.0",
-        "jest-util": "^29.5.0"
+        "jest-mock": "^29.6.1",
+        "jest-util": "^29.6.1"
       }
     },
     "jest-get-type": {
@@ -25507,12 +25243,12 @@
       "dev": true
     },
     "jest-haste-map": {
-      "version": "29.5.0",
-      "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-29.5.0.tgz",
-      "integrity": "sha512-IspOPnnBro8YfVYSw6yDRKh/TiCdRngjxeacCps1cQ9cgVN6+10JUcuJ1EabrgYLOATsIAigxA0rLR9x/YlrSA==",
+      "version": "29.6.1",
+      "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-29.6.1.tgz",
+      "integrity": "sha512-0m7f9PZXxOCk1gRACiVgX85knUKPKLPg4oRCjLoqIm9brTHXaorMA0JpmtmVkQiT8nmXyIVoZd/nnH1cfC33ig==",
       "dev": true,
       "requires": {
-        "@jest/types": "^29.5.0",
+        "@jest/types": "^29.6.1",
         "@types/graceful-fs": "^4.1.3",
         "@types/node": "*",
         "anymatch": "^3.0.3",
@@ -25520,8 +25256,8 @@
         "fsevents": "^2.3.2",
         "graceful-fs": "^4.2.9",
         "jest-regex-util": "^29.4.3",
-        "jest-util": "^29.5.0",
-        "jest-worker": "^29.5.0",
+        "jest-util": "^29.6.1",
+        "jest-worker": "^29.6.1",
         "micromatch": "^4.0.4",
         "walker": "^1.0.8"
       },
@@ -25533,13 +25269,13 @@
           "dev": true
         },
         "jest-worker": {
-          "version": "29.5.0",
-          "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-29.5.0.tgz",
-          "integrity": "sha512-NcrQnevGoSp4b5kg+akIpthoAFHxPBcb5P6mYPY0fUNT+sSvmtu6jlkEle3anczUKIKEbMxFimk9oTP/tpIPgA==",
+          "version": "29.6.1",
+          "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-29.6.1.tgz",
+          "integrity": "sha512-U+Wrbca7S8ZAxAe9L6nb6g8kPdia5hj32Puu5iOqBCMTMWFHXuK6dOV2IFrpedbTV8fjMFLdWNttQTBL6u2MRA==",
           "dev": true,
           "requires": {
             "@types/node": "*",
-            "jest-util": "^29.5.0",
+            "jest-util": "^29.6.1",
             "merge-stream": "^2.0.0",
             "supports-color": "^8.0.0"
           }
@@ -25556,25 +25292,25 @@
       }
     },
     "jest-leak-detector": {
-      "version": "29.5.0",
-      "resolved": "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-29.5.0.tgz",
-      "integrity": "sha512-u9YdeeVnghBUtpN5mVxjID7KbkKE1QU4f6uUwuxiY0vYRi9BUCLKlPEZfDGR67ofdFmDz9oPAy2G92Ujrntmow==",
+      "version": "29.6.1",
+      "resolved": "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-29.6.1.tgz",
+      "integrity": "sha512-OrxMNyZirpOEwkF3UHnIkAiZbtkBWiye+hhBweCHkVbCgyEy71Mwbb5zgeTNYWJBi1qgDVfPC1IwO9dVEeTLwQ==",
       "dev": true,
       "requires": {
         "jest-get-type": "^29.4.3",
-        "pretty-format": "^29.5.0"
+        "pretty-format": "^29.6.1"
       }
     },
     "jest-matcher-utils": {
-      "version": "29.5.0",
-      "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-29.5.0.tgz",
-      "integrity": "sha512-lecRtgm/rjIK0CQ7LPQwzCs2VwW6WAahA55YBuI+xqmhm7LAaxokSB8C97yJeYyT+HvQkH741StzpU41wohhWw==",
+      "version": "29.6.1",
+      "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-29.6.1.tgz",
+      "integrity": "sha512-SLaztw9d2mfQQKHmJXKM0HCbl2PPVld/t9Xa6P9sgiExijviSp7TnZZpw2Fpt+OI3nwUO/slJbOfzfUMKKC5QA==",
       "dev": true,
       "requires": {
         "chalk": "^4.0.0",
-        "jest-diff": "^29.5.0",
+        "jest-diff": "^29.6.1",
         "jest-get-type": "^29.4.3",
-        "pretty-format": "^29.5.0"
+        "pretty-format": "^29.6.1"
       },
       "dependencies": {
         "ansi-styles": {
@@ -25629,18 +25365,18 @@
       }
     },
     "jest-message-util": {
-      "version": "29.6.0",
-      "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-29.6.0.tgz",
-      "integrity": "sha512-mkCp56cETbpoNtsaeWVy6SKzk228mMi9FPHSObaRIhbR2Ujw9PqjW/yqVHD2tN1bHbC8ol6h3UEo7dOPmIYwIA==",
+      "version": "29.6.1",
+      "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-29.6.1.tgz",
+      "integrity": "sha512-KoAW2zAmNSd3Gk88uJ56qXUWbFk787QKmjjJVOjtGFmmGSZgDBrlIL4AfQw1xyMYPNVD7dNInfIbur9B2rd/wQ==",
       "dev": true,
       "requires": {
         "@babel/code-frame": "^7.12.13",
-        "@jest/types": "^29.6.0",
+        "@jest/types": "^29.6.1",
         "@types/stack-utils": "^2.0.0",
         "chalk": "^4.0.0",
         "graceful-fs": "^4.2.9",
         "micromatch": "^4.0.4",
-        "pretty-format": "^29.6.0",
+        "pretty-format": "^29.6.1",
         "slash": "^3.0.0",
         "stack-utils": "^2.0.3"
       },
@@ -25697,14 +25433,14 @@
       }
     },
     "jest-mock": {
-      "version": "29.6.0",
-      "resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-29.6.0.tgz",
-      "integrity": "sha512-2Pb7R2w24Q0aUVn+2/vdRDL6CqGqpheDZy7zrXav8FotOpSGw/4bS2hyVoKHMEx4xzOn6EyCAGwc5czWxXeN7w==",
+      "version": "29.6.1",
+      "resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-29.6.1.tgz",
+      "integrity": "sha512-brovyV9HBkjXAEdRooaTQK42n8usKoSRR3gihzUpYeV/vwqgSoNfrksO7UfSACnPmxasO/8TmHM3w9Hp3G1dgw==",
       "dev": true,
       "requires": {
-        "@jest/types": "^29.6.0",
+        "@jest/types": "^29.6.1",
         "@types/node": "*",
-        "jest-util": "^29.6.0"
+        "jest-util": "^29.6.1"
       }
     },
     "jest-pnp-resolver": {
@@ -25721,17 +25457,17 @@
       "dev": true
     },
     "jest-resolve": {
-      "version": "29.5.0",
-      "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-29.5.0.tgz",
-      "integrity": "sha512-1TzxJ37FQq7J10jPtQjcc+MkCkE3GBpBecsSUWJ0qZNJpmg6m0D9/7II03yJulm3H/fvVjgqLh/k2eYg+ui52w==",
+      "version": "29.6.1",
+      "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-29.6.1.tgz",
+      "integrity": "sha512-AeRkyS8g37UyJiP9w3mmI/VXU/q8l/IH52vj/cDAyScDcemRbSBhfX/NMYIGilQgSVwsjxrCHf3XJu4f+lxCMg==",
       "dev": true,
       "requires": {
         "chalk": "^4.0.0",
         "graceful-fs": "^4.2.9",
-        "jest-haste-map": "^29.5.0",
+        "jest-haste-map": "^29.6.1",
         "jest-pnp-resolver": "^1.2.2",
-        "jest-util": "^29.5.0",
-        "jest-validate": "^29.5.0",
+        "jest-util": "^29.6.1",
+        "jest-validate": "^29.6.1",
         "resolve": "^1.20.0",
         "resolve.exports": "^2.0.0",
         "slash": "^3.0.0"
@@ -25789,40 +25525,40 @@
       }
     },
     "jest-resolve-dependencies": {
-      "version": "29.5.0",
-      "resolved": "https://registry.npmjs.org/jest-resolve-dependencies/-/jest-resolve-dependencies-29.5.0.tgz",
-      "integrity": "sha512-sjV3GFr0hDJMBpYeUuGduP+YeCRbd7S/ck6IvL3kQ9cpySYKqcqhdLLC2rFwrcL7tz5vYibomBrsFYWkIGGjOg==",
+      "version": "29.6.1",
+      "resolved": "https://registry.npmjs.org/jest-resolve-dependencies/-/jest-resolve-dependencies-29.6.1.tgz",
+      "integrity": "sha512-BbFvxLXtcldaFOhNMXmHRWx1nXQO5LoXiKSGQcA1LxxirYceZT6ch8KTE1bK3X31TNG/JbkI7OkS/ABexVahiw==",
       "dev": true,
       "requires": {
         "jest-regex-util": "^29.4.3",
-        "jest-snapshot": "^29.5.0"
+        "jest-snapshot": "^29.6.1"
       }
     },
     "jest-runner": {
-      "version": "29.5.0",
-      "resolved": "https://registry.npmjs.org/jest-runner/-/jest-runner-29.5.0.tgz",
-      "integrity": "sha512-m7b6ypERhFghJsslMLhydaXBiLf7+jXy8FwGRHO3BGV1mcQpPbwiqiKUR2zU2NJuNeMenJmlFZCsIqzJCTeGLQ==",
+      "version": "29.6.1",
+      "resolved": "https://registry.npmjs.org/jest-runner/-/jest-runner-29.6.1.tgz",
+      "integrity": "sha512-tw0wb2Q9yhjAQ2w8rHRDxteryyIck7gIzQE4Reu3JuOBpGp96xWgF0nY8MDdejzrLCZKDcp8JlZrBN/EtkQvPQ==",
       "dev": true,
       "requires": {
-        "@jest/console": "^29.5.0",
-        "@jest/environment": "^29.5.0",
-        "@jest/test-result": "^29.5.0",
-        "@jest/transform": "^29.5.0",
-        "@jest/types": "^29.5.0",
+        "@jest/console": "^29.6.1",
+        "@jest/environment": "^29.6.1",
+        "@jest/test-result": "^29.6.1",
+        "@jest/transform": "^29.6.1",
+        "@jest/types": "^29.6.1",
         "@types/node": "*",
         "chalk": "^4.0.0",
         "emittery": "^0.13.1",
         "graceful-fs": "^4.2.9",
         "jest-docblock": "^29.4.3",
-        "jest-environment-node": "^29.5.0",
-        "jest-haste-map": "^29.5.0",
-        "jest-leak-detector": "^29.5.0",
-        "jest-message-util": "^29.5.0",
-        "jest-resolve": "^29.5.0",
-        "jest-runtime": "^29.5.0",
-        "jest-util": "^29.5.0",
-        "jest-watcher": "^29.5.0",
-        "jest-worker": "^29.5.0",
+        "jest-environment-node": "^29.6.1",
+        "jest-haste-map": "^29.6.1",
+        "jest-leak-detector": "^29.6.1",
+        "jest-message-util": "^29.6.1",
+        "jest-resolve": "^29.6.1",
+        "jest-runtime": "^29.6.1",
+        "jest-util": "^29.6.1",
+        "jest-watcher": "^29.6.1",
+        "jest-worker": "^29.6.1",
         "p-limit": "^3.1.0",
         "source-map-support": "0.5.13"
       },
@@ -25868,13 +25604,13 @@
           "dev": true
         },
         "jest-worker": {
-          "version": "29.5.0",
-          "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-29.5.0.tgz",
-          "integrity": "sha512-NcrQnevGoSp4b5kg+akIpthoAFHxPBcb5P6mYPY0fUNT+sSvmtu6jlkEle3anczUKIKEbMxFimk9oTP/tpIPgA==",
+          "version": "29.6.1",
+          "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-29.6.1.tgz",
+          "integrity": "sha512-U+Wrbca7S8ZAxAe9L6nb6g8kPdia5hj32Puu5iOqBCMTMWFHXuK6dOV2IFrpedbTV8fjMFLdWNttQTBL6u2MRA==",
           "dev": true,
           "requires": {
             "@types/node": "*",
-            "jest-util": "^29.5.0",
+            "jest-util": "^29.6.1",
             "merge-stream": "^2.0.0",
             "supports-color": "^8.0.0"
           },
@@ -25912,31 +25648,31 @@
       }
     },
     "jest-runtime": {
-      "version": "29.5.0",
-      "resolved": "https://registry.npmjs.org/jest-runtime/-/jest-runtime-29.5.0.tgz",
-      "integrity": "sha512-1Hr6Hh7bAgXQP+pln3homOiEZtCDZFqwmle7Ew2j8OlbkIu6uE3Y/etJQG8MLQs3Zy90xrp2C0BRrtPHG4zryw==",
-      "dev": true,
-      "requires": {
-        "@jest/environment": "^29.5.0",
-        "@jest/fake-timers": "^29.5.0",
-        "@jest/globals": "^29.5.0",
-        "@jest/source-map": "^29.4.3",
-        "@jest/test-result": "^29.5.0",
-        "@jest/transform": "^29.5.0",
-        "@jest/types": "^29.5.0",
+      "version": "29.6.1",
+      "resolved": "https://registry.npmjs.org/jest-runtime/-/jest-runtime-29.6.1.tgz",
+      "integrity": "sha512-D6/AYOA+Lhs5e5il8+5pSLemjtJezUr+8zx+Sn8xlmOux3XOqx4d8l/2udBea8CRPqqrzhsKUsN/gBDE/IcaPQ==",
+      "dev": true,
+      "requires": {
+        "@jest/environment": "^29.6.1",
+        "@jest/fake-timers": "^29.6.1",
+        "@jest/globals": "^29.6.1",
+        "@jest/source-map": "^29.6.0",
+        "@jest/test-result": "^29.6.1",
+        "@jest/transform": "^29.6.1",
+        "@jest/types": "^29.6.1",
         "@types/node": "*",
         "chalk": "^4.0.0",
         "cjs-module-lexer": "^1.0.0",
         "collect-v8-coverage": "^1.0.0",
         "glob": "^7.1.3",
         "graceful-fs": "^4.2.9",
-        "jest-haste-map": "^29.5.0",
-        "jest-message-util": "^29.5.0",
-        "jest-mock": "^29.5.0",
+        "jest-haste-map": "^29.6.1",
+        "jest-message-util": "^29.6.1",
+        "jest-mock": "^29.6.1",
         "jest-regex-util": "^29.4.3",
-        "jest-resolve": "^29.5.0",
-        "jest-snapshot": "^29.5.0",
-        "jest-util": "^29.5.0",
+        "jest-resolve": "^29.6.1",
+        "jest-snapshot": "^29.6.1",
+        "jest-util": "^29.6.1",
         "slash": "^3.0.0",
         "strip-bom": "^4.0.0"
       },
@@ -25993,34 +25729,32 @@
       }
     },
     "jest-snapshot": {
-      "version": "29.5.0",
-      "resolved": "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-29.5.0.tgz",
-      "integrity": "sha512-x7Wolra5V0tt3wRs3/ts3S6ciSQVypgGQlJpz2rsdQYoUKxMxPNaoHMGJN6qAuPJqS+2iQ1ZUn5kl7HCyls84g==",
+      "version": "29.6.1",
+      "resolved": "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-29.6.1.tgz",
+      "integrity": "sha512-G4UQE1QQ6OaCgfY+A0uR1W2AY0tGXUPQpoUClhWHq1Xdnx1H6JOrC2nH5lqnOEqaDgbHFgIwZ7bNq24HpB180A==",
       "dev": true,
       "requires": {
         "@babel/core": "^7.11.6",
         "@babel/generator": "^7.7.2",
         "@babel/plugin-syntax-jsx": "^7.7.2",
         "@babel/plugin-syntax-typescript": "^7.7.2",
-        "@babel/traverse": "^7.7.2",
         "@babel/types": "^7.3.3",
-        "@jest/expect-utils": "^29.5.0",
-        "@jest/transform": "^29.5.0",
-        "@jest/types": "^29.5.0",
-        "@types/babel__traverse": "^7.0.6",
+        "@jest/expect-utils": "^29.6.1",
+        "@jest/transform": "^29.6.1",
+        "@jest/types": "^29.6.1",
         "@types/prettier": "^2.1.5",
         "babel-preset-current-node-syntax": "^1.0.0",
         "chalk": "^4.0.0",
-        "expect": "^29.5.0",
+        "expect": "^29.6.1",
         "graceful-fs": "^4.2.9",
-        "jest-diff": "^29.5.0",
+        "jest-diff": "^29.6.1",
         "jest-get-type": "^29.4.3",
-        "jest-matcher-utils": "^29.5.0",
-        "jest-message-util": "^29.5.0",
-        "jest-util": "^29.5.0",
+        "jest-matcher-utils": "^29.6.1",
+        "jest-message-util": "^29.6.1",
+        "jest-util": "^29.6.1",
         "natural-compare": "^1.4.0",
-        "pretty-format": "^29.5.0",
-        "semver": "^7.3.5"
+        "pretty-format": "^29.6.1",
+        "semver": "^7.5.3"
       },
       "dependencies": {
         "ansi-styles": {
@@ -26064,9 +25798,9 @@
           "dev": true
         },
         "semver": {
-          "version": "7.3.8",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz",
-          "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==",
+          "version": "7.5.3",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.3.tgz",
+          "integrity": "sha512-QBlUtyVk/5EeHbi7X0fw6liDZc7BBmEaSYn01fMU1OUYbf6GPsbTtd8WmnqbI20SeycoHSeiybkE/q1Q+qlThQ==",
           "dev": true,
           "requires": {
             "lru-cache": "^6.0.0"
@@ -26084,12 +25818,12 @@
       }
     },
     "jest-util": {
-      "version": "29.6.0",
-      "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-29.6.0.tgz",
-      "integrity": "sha512-S0USx9YwcvEm4pQ5suisVm/RVxBmi0GFR7ocJhIeaCuW5AXnAnffXbaVKvIFodyZNOc9ygzVtTxmBf40HsHXaA==",
+      "version": "29.6.1",
+      "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-29.6.1.tgz",
+      "integrity": "sha512-NRFCcjc+/uO3ijUVyNOQJluf8PtGCe/W6cix36+M3cTFgiYqFOOW5MgN4JOOcvbUhcKTYVd1CvHz/LWi8d16Mg==",
       "dev": true,
       "requires": {
-        "@jest/types": "^29.6.0",
+        "@jest/types": "^29.6.1",
         "@types/node": "*",
         "chalk": "^4.0.0",
         "ci-info": "^3.2.0",
@@ -26149,17 +25883,17 @@
       }
     },
     "jest-validate": {
-      "version": "29.5.0",
-      "resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-29.5.0.tgz",
-      "integrity": "sha512-pC26etNIi+y3HV8A+tUGr/lph9B18GnzSRAkPaaZJIE1eFdiYm6/CewuiJQ8/RlfHd1u/8Ioi8/sJ+CmbA+zAQ==",
+      "version": "29.6.1",
+      "resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-29.6.1.tgz",
+      "integrity": "sha512-r3Ds69/0KCN4vx4sYAbGL1EVpZ7MSS0vLmd3gV78O+NAx3PDQQukRU5hNHPXlyqCgFY8XUk7EuTMLugh0KzahA==",
       "dev": true,
       "requires": {
-        "@jest/types": "^29.5.0",
+        "@jest/types": "^29.6.1",
         "camelcase": "^6.2.0",
         "chalk": "^4.0.0",
         "jest-get-type": "^29.4.3",
         "leven": "^3.1.0",
-        "pretty-format": "^29.5.0"
+        "pretty-format": "^29.6.1"
       },
       "dependencies": {
         "ansi-styles": {
@@ -26220,18 +25954,18 @@
       }
     },
     "jest-watcher": {
-      "version": "29.5.0",
-      "resolved": "https://registry.npmjs.org/jest-watcher/-/jest-watcher-29.5.0.tgz",
-      "integrity": "sha512-KmTojKcapuqYrKDpRwfqcQ3zjMlwu27SYext9pt4GlF5FUgB+7XE1mcCnSm6a4uUpFyQIkb6ZhzZvHl+jiBCiA==",
+      "version": "29.6.1",
+      "resolved": "https://registry.npmjs.org/jest-watcher/-/jest-watcher-29.6.1.tgz",
+      "integrity": "sha512-d4wpjWTS7HEZPaaj8m36QiaP856JthRZkrgcIY/7ISoUWPIillrXM23WPboZVLbiwZBt4/qn2Jke84Sla6JhFA==",
       "dev": true,
       "requires": {
-        "@jest/test-result": "^29.5.0",
-        "@jest/types": "^29.5.0",
+        "@jest/test-result": "^29.6.1",
+        "@jest/types": "^29.6.1",
         "@types/node": "*",
         "ansi-escapes": "^4.2.1",
         "chalk": "^4.0.0",
         "emittery": "^0.13.1",
-        "jest-util": "^29.5.0",
+        "jest-util": "^29.6.1",
         "string-length": "^4.0.1"
       },
       "dependencies": {
@@ -26873,14 +26607,6 @@
         "semver": "^6.0.0"
       }
     },
-    "make-error": {
-      "version": "1.3.6",
-      "resolved": "https://registry.npmjs.org/make-error/-/make-error-1.3.6.tgz",
-      "integrity": "sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==",
-      "dev": true,
-      "optional": true,
-      "peer": true
-    },
     "makeerror": {
       "version": "1.0.12",
       "resolved": "https://registry.npmjs.org/makeerror/-/makeerror-1.0.12.tgz",
@@ -27668,9 +27394,9 @@
       "integrity": "sha512-TNtsE+34BIax3WtkB/qqu5uepV1McKYEgvL3kWzU7aqPCpMEN6rBF3AOwu4WCwAealWlBGobXny/9kJb49C1ew=="
     },
     "pirates": {
-      "version": "4.0.5",
-      "resolved": "https://registry.npmjs.org/pirates/-/pirates-4.0.5.tgz",
-      "integrity": "sha512-8V9+HQPupnaXMA23c5hvl69zXvTwTzyAYasnkb0Tts4XvO4CliqONMOnvlq26rkhLC3nWDFBJf73LU1e1VZLaQ==",
+      "version": "4.0.6",
+      "resolved": "https://registry.npmjs.org/pirates/-/pirates-4.0.6.tgz",
+      "integrity": "sha512-saLsH7WeYYPiD25LDuLRRY/i+6HaPYr6G1OUlN39otzkSTxKnubR9RTxS3/Kk50s1g2JTgFwWQDQyplC5/SHZg==",
       "dev": true
     },
     "pngjs": {
@@ -28034,9 +27760,9 @@
       "dev": true
     },
     "pretty-format": {
-      "version": "29.6.0",
-      "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-29.6.0.tgz",
-      "integrity": "sha512-XH+D4n7Ey0iSR6PdAnBs99cWMZdGsdKrR33iUHQNr79w1szKTCIZDVdXuccAsHVwDBp0XeWPfNEoaxP9EZgRmQ==",
+      "version": "29.6.1",
+      "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-29.6.1.tgz",
+      "integrity": "sha512-7jRj+yXO0W7e4/tSJKoR7HRIHLPPjtNaUGG2xxKQnGvPNRkgWcQ0AZX6P4KBRJN4FcTBWb3sa7DVUJmocYuoog==",
       "dev": true,
       "requires": {
         "@jest/schemas": "^29.6.0",
@@ -28151,9 +27877,9 @@
       "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A=="
     },
     "pure-rand": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/pure-rand/-/pure-rand-6.0.0.tgz",
-      "integrity": "sha512-rLSBxJjP+4DQOgcJAx6RZHT2he2pkhQdSnofG5VWyVl6GRq/K02ISOuOLcsMOrtKDIJb8JN2zm3FFzWNbezdPw==",
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/pure-rand/-/pure-rand-6.0.2.tgz",
+      "integrity": "sha512-6Yg0ekpKICSjPswYOuC5sku/TSWaRYlA0qsXqJgM/d/4pLPHPuTxK7Nbf7jFKzAeedUhR8C7K9Uv63FBsSo8xQ==",
       "dev": true
     },
     "qrcode": {
@@ -28597,9 +28323,9 @@
       "dev": true
     },
     "resolve.exports": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/resolve.exports/-/resolve.exports-2.0.1.tgz",
-      "integrity": "sha512-OEJWVeimw8mgQuj3HfkNl4KqRevH7lzeQNaWRPfx0PPse7Jk6ozcsG4FKVgtzDsC1KUF+YlTHh17NcgHOPykLw==",
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/resolve.exports/-/resolve.exports-2.0.2.tgz",
+      "integrity": "sha512-X2UW6Nw3n/aMgDVy+0rSqgHlv39WZAlZrXCdnbyEiKm17DSqHX4MmQMaST3FbeWR5FTuRcUwYAziZajji0Y7mg==",
       "dev": true
     },
     "responselike": {
@@ -29494,39 +29220,6 @@
         "punycode": "^2.1.1"
       }
     },
-    "ts-node": {
-      "version": "10.9.1",
-      "resolved": "https://registry.npmjs.org/ts-node/-/ts-node-10.9.1.tgz",
-      "integrity": "sha512-NtVysVPkxxrwFGUUxGYhfux8k78pQB3JqYBXlLRZgdGUqTO5wU/UyHop5p70iEbGhB7q5KmiZiU0Y3KlJrScEw==",
-      "dev": true,
-      "optional": true,
-      "peer": true,
-      "requires": {
-        "@cspotcode/source-map-support": "^0.8.0",
-        "@tsconfig/node10": "^1.0.7",
-        "@tsconfig/node12": "^1.0.7",
-        "@tsconfig/node14": "^1.0.0",
-        "@tsconfig/node16": "^1.0.2",
-        "acorn": "^8.4.1",
-        "acorn-walk": "^8.1.1",
-        "arg": "^4.1.0",
-        "create-require": "^1.1.0",
-        "diff": "^4.0.1",
-        "make-error": "^1.1.1",
-        "v8-compile-cache-lib": "^3.0.1",
-        "yn": "3.1.1"
-      },
-      "dependencies": {
-        "acorn-walk": {
-          "version": "8.2.0",
-          "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.2.0.tgz",
-          "integrity": "sha512-k+iyHEuPgSw6SbuDpGQM+06HQUa04DZ3o+F6CSzXMvvI5KMvnaEqXe+YVe555R9nn6GPt404fos4wcgpw12SDA==",
-          "dev": true,
-          "optional": true,
-          "peer": true
-        }
-      }
-    },
     "tsconfig-paths": {
       "version": "3.14.1",
       "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.14.1.tgz",
@@ -29627,14 +29320,6 @@
         "is-typedarray": "^1.0.0"
       }
     },
-    "typescript": {
-      "version": "5.0.3",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.0.3.tgz",
-      "integrity": "sha512-xv8mOEDnigb/tN9PSMTwSEqAnUvkoXMQlicOb0IUVDBSQCgBSaAAROUZYy2IcUy5qU6XajK5jjjO7TMWqBTKZA==",
-      "dev": true,
-      "optional": true,
-      "peer": true
-    },
     "ultron": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/ultron/-/ultron-1.1.1.tgz",
@@ -29791,14 +29476,6 @@
       "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz",
       "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A=="
     },
-    "v8-compile-cache-lib": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/v8-compile-cache-lib/-/v8-compile-cache-lib-3.0.1.tgz",
-      "integrity": "sha512-wa7YjyUGfNZngI/vtK0UHAN+lgDCxBPCylVXGp0zu59Fz5aiGtNXaq3DhIov063MorB+VfufLh3JlF2KdTK3xg==",
-      "dev": true,
-      "optional": true,
-      "peer": true
-    },
     "v8-to-istanbul": {
       "version": "9.1.0",
       "resolved": "https://registry.npmjs.org/v8-to-istanbul/-/v8-to-istanbul-9.1.0.tgz",
@@ -30653,9 +30330,9 @@
       "dev": true
     },
     "yargs": {
-      "version": "17.7.1",
-      "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.1.tgz",
-      "integrity": "sha512-cwiTb08Xuv5fqF4AovYacTFNxk62th7LKJ6BL9IGUpTJrWoU7/7WdQGTP2SjKf1dUNBGzDd28p/Yfs/GI6JrLw==",
+      "version": "17.7.2",
+      "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.2.tgz",
+      "integrity": "sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==",
       "dev": true,
       "requires": {
         "cliui": "^8.0.1",
@@ -30681,14 +30358,6 @@
       "integrity": "sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==",
       "dev": true
     },
-    "yn": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/yn/-/yn-3.1.1.tgz",
-      "integrity": "sha512-Ux4ygGWsu2c7isFWe8Yu1YluJmqVhxqK2cLXNQA5AcC3QfbGNpM7fu0Y8b/z16pXLnFxZYvWhd3fhBY9DLmC6Q==",
-      "dev": true,
-      "optional": true,
-      "peer": true
-    },
     "yocto-queue": {
       "version": "0.1.0",
       "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz",
diff --git a/apps/block_scout_web/assets/package.json b/apps/block_scout_web/assets/package.json
index 651fd180d79e..89694636dd7c 100644
--- a/apps/block_scout_web/assets/package.json
+++ b/apps/block_scout_web/assets/package.json
@@ -96,7 +96,7 @@
     "eslint-plugin-node": "^11.1.0",
     "eslint-plugin-promise": "^6.1.1",
     "file-loader": "^6.2.0",
-    "jest": "^29.5.0",
+    "jest": "^29.6.1",
     "jest-environment-jsdom": "^29.6.0",
     "mini-css-extract-plugin": "^2.7.6",
     "postcss": "^8.4.24",

From f90caf71581aea1573c8be2900b6b44abeea59f6 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 6 Jul 2023 19:05:30 +0000
Subject: [PATCH 167/909] Bump @babel/core from 7.22.6 to 7.22.8 in
 /apps/block_scout_web/assets

Bumps [@babel/core](https://github.com/babel/babel/tree/HEAD/packages/babel-core) from 7.22.6 to 7.22.8.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/commits/v7.22.8/packages/babel-core)

---
updated-dependencies:
- dependency-name: "@babel/core"
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 apps/block_scout_web/assets/package-lock.json | 70 +++++++++----------
 apps/block_scout_web/assets/package.json      |  2 +-
 2 files changed, 36 insertions(+), 36 deletions(-)

diff --git a/apps/block_scout_web/assets/package-lock.json b/apps/block_scout_web/assets/package-lock.json
index 4089d34a807e..9be4230c0c14 100644
--- a/apps/block_scout_web/assets/package-lock.json
+++ b/apps/block_scout_web/assets/package-lock.json
@@ -71,7 +71,7 @@
         "xss": "^1.0.14"
       },
       "devDependencies": {
-        "@babel/core": "^7.22.6",
+        "@babel/core": "^7.22.8",
         "@babel/preset-env": "^7.22.6",
         "autoprefixer": "^10.4.14",
         "babel-loader": "^9.1.2",
@@ -248,19 +248,19 @@
       }
     },
     "node_modules/@babel/core": {
-      "version": "7.22.6",
-      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.22.6.tgz",
-      "integrity": "sha512-HPIyDa6n+HKw5dEuway3vVAhBboYCtREBMp+IWeseZy6TFtzn6MHkCH2KKYUOC/vKKwgSMHQW4htBOrmuRPXfw==",
+      "version": "7.22.8",
+      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.22.8.tgz",
+      "integrity": "sha512-75+KxFB4CZqYRXjx4NlR4J7yGvKumBuZTmV4NV6v09dVXXkuYVYLT68N6HCzLvfJ+fWCxQsntNzKwwIXL4bHnw==",
       "dependencies": {
         "@ampproject/remapping": "^2.2.0",
         "@babel/code-frame": "^7.22.5",
-        "@babel/generator": "^7.22.5",
+        "@babel/generator": "^7.22.7",
         "@babel/helper-compilation-targets": "^7.22.6",
         "@babel/helper-module-transforms": "^7.22.5",
         "@babel/helpers": "^7.22.6",
-        "@babel/parser": "^7.22.6",
+        "@babel/parser": "^7.22.7",
         "@babel/template": "^7.22.5",
-        "@babel/traverse": "^7.22.6",
+        "@babel/traverse": "^7.22.8",
         "@babel/types": "^7.22.5",
         "@nicolo-ribaudo/semver-v6": "^6.3.3",
         "convert-source-map": "^1.7.0",
@@ -277,9 +277,9 @@
       }
     },
     "node_modules/@babel/generator": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.22.5.tgz",
-      "integrity": "sha512-+lcUbnTRhd0jOewtFSedLyiPsD5tswKkbgcezOqqWFUVNEwoUTlpPOBmvhG7OXWLR4jMdv0czPGH5XbflnD1EA==",
+      "version": "7.22.7",
+      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.22.7.tgz",
+      "integrity": "sha512-p+jPjMG+SI8yvIaxGgeW24u7q9+5+TGpZh8/CuB7RhBKd7RCy8FayNEFNNKrNK/eUcY/4ExQqLmyrvBXKsIcwQ==",
       "dependencies": {
         "@babel/types": "^7.22.5",
         "@jridgewell/gen-mapping": "^0.3.2",
@@ -627,9 +627,9 @@
       }
     },
     "node_modules/@babel/parser": {
-      "version": "7.22.6",
-      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.22.6.tgz",
-      "integrity": "sha512-EIQu22vNkceq3LbjAq7knDf/UmtI2qbcNI8GRBlijez6TpQLvSodJPYfydQmNA5buwkxxxa/PVI44jjYZ+/cLw==",
+      "version": "7.22.7",
+      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.22.7.tgz",
+      "integrity": "sha512-7NF8pOkHP5o2vpmGgNGcfAeCvOYhGLyA3Z4eBQkT1RJlWu47n63bCs93QfJ2hIAFCil7L5P2IWhs1oToVgrL0Q==",
       "bin": {
         "parser": "bin/babel-parser.js"
       },
@@ -1961,17 +1961,17 @@
       }
     },
     "node_modules/@babel/traverse": {
-      "version": "7.22.6",
-      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.22.6.tgz",
-      "integrity": "sha512-53CijMvKlLIDlOTrdWiHileRddlIiwUIyCKqYa7lYnnPldXCG5dUSN38uT0cA6i7rHWNKJLH0VU/Kxdr1GzB3w==",
+      "version": "7.22.8",
+      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.22.8.tgz",
+      "integrity": "sha512-y6LPR+wpM2I3qJrsheCTwhIinzkETbplIgPBbwvqPKc+uljeA5gP+3nP8irdYt1mjQaDnlIcG+dw8OjAco4GXw==",
       "dependencies": {
         "@babel/code-frame": "^7.22.5",
-        "@babel/generator": "^7.22.5",
+        "@babel/generator": "^7.22.7",
         "@babel/helper-environment-visitor": "^7.22.5",
         "@babel/helper-function-name": "^7.22.5",
         "@babel/helper-hoist-variables": "^7.22.5",
         "@babel/helper-split-export-declaration": "^7.22.6",
-        "@babel/parser": "^7.22.6",
+        "@babel/parser": "^7.22.7",
         "@babel/types": "^7.22.5",
         "debug": "^4.1.0",
         "globals": "^11.1.0"
@@ -17639,19 +17639,19 @@
       "integrity": "sha512-29tfsWTq2Ftu7MXmimyC0C5FDZv5DYxOZkh3XD3+QW4V/BYuv/LyEsjj3c0hqedEaDt6DBfDvexMKU8YevdqFg=="
     },
     "@babel/core": {
-      "version": "7.22.6",
-      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.22.6.tgz",
-      "integrity": "sha512-HPIyDa6n+HKw5dEuway3vVAhBboYCtREBMp+IWeseZy6TFtzn6MHkCH2KKYUOC/vKKwgSMHQW4htBOrmuRPXfw==",
+      "version": "7.22.8",
+      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.22.8.tgz",
+      "integrity": "sha512-75+KxFB4CZqYRXjx4NlR4J7yGvKumBuZTmV4NV6v09dVXXkuYVYLT68N6HCzLvfJ+fWCxQsntNzKwwIXL4bHnw==",
       "requires": {
         "@ampproject/remapping": "^2.2.0",
         "@babel/code-frame": "^7.22.5",
-        "@babel/generator": "^7.22.5",
+        "@babel/generator": "^7.22.7",
         "@babel/helper-compilation-targets": "^7.22.6",
         "@babel/helper-module-transforms": "^7.22.5",
         "@babel/helpers": "^7.22.6",
-        "@babel/parser": "^7.22.6",
+        "@babel/parser": "^7.22.7",
         "@babel/template": "^7.22.5",
-        "@babel/traverse": "^7.22.6",
+        "@babel/traverse": "^7.22.8",
         "@babel/types": "^7.22.5",
         "@nicolo-ribaudo/semver-v6": "^6.3.3",
         "convert-source-map": "^1.7.0",
@@ -17661,9 +17661,9 @@
       }
     },
     "@babel/generator": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.22.5.tgz",
-      "integrity": "sha512-+lcUbnTRhd0jOewtFSedLyiPsD5tswKkbgcezOqqWFUVNEwoUTlpPOBmvhG7OXWLR4jMdv0czPGH5XbflnD1EA==",
+      "version": "7.22.7",
+      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.22.7.tgz",
+      "integrity": "sha512-p+jPjMG+SI8yvIaxGgeW24u7q9+5+TGpZh8/CuB7RhBKd7RCy8FayNEFNNKrNK/eUcY/4ExQqLmyrvBXKsIcwQ==",
       "requires": {
         "@babel/types": "^7.22.5",
         "@jridgewell/gen-mapping": "^0.3.2",
@@ -17923,9 +17923,9 @@
       }
     },
     "@babel/parser": {
-      "version": "7.22.6",
-      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.22.6.tgz",
-      "integrity": "sha512-EIQu22vNkceq3LbjAq7knDf/UmtI2qbcNI8GRBlijez6TpQLvSodJPYfydQmNA5buwkxxxa/PVI44jjYZ+/cLw=="
+      "version": "7.22.7",
+      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.22.7.tgz",
+      "integrity": "sha512-7NF8pOkHP5o2vpmGgNGcfAeCvOYhGLyA3Z4eBQkT1RJlWu47n63bCs93QfJ2hIAFCil7L5P2IWhs1oToVgrL0Q=="
     },
     "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": {
       "version": "7.22.5",
@@ -18824,17 +18824,17 @@
       }
     },
     "@babel/traverse": {
-      "version": "7.22.6",
-      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.22.6.tgz",
-      "integrity": "sha512-53CijMvKlLIDlOTrdWiHileRddlIiwUIyCKqYa7lYnnPldXCG5dUSN38uT0cA6i7rHWNKJLH0VU/Kxdr1GzB3w==",
+      "version": "7.22.8",
+      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.22.8.tgz",
+      "integrity": "sha512-y6LPR+wpM2I3qJrsheCTwhIinzkETbplIgPBbwvqPKc+uljeA5gP+3nP8irdYt1mjQaDnlIcG+dw8OjAco4GXw==",
       "requires": {
         "@babel/code-frame": "^7.22.5",
-        "@babel/generator": "^7.22.5",
+        "@babel/generator": "^7.22.7",
         "@babel/helper-environment-visitor": "^7.22.5",
         "@babel/helper-function-name": "^7.22.5",
         "@babel/helper-hoist-variables": "^7.22.5",
         "@babel/helper-split-export-declaration": "^7.22.6",
-        "@babel/parser": "^7.22.6",
+        "@babel/parser": "^7.22.7",
         "@babel/types": "^7.22.5",
         "debug": "^4.1.0",
         "globals": "^11.1.0"
diff --git a/apps/block_scout_web/assets/package.json b/apps/block_scout_web/assets/package.json
index 651fd180d79e..bda3ba2a2d4b 100644
--- a/apps/block_scout_web/assets/package.json
+++ b/apps/block_scout_web/assets/package.json
@@ -83,7 +83,7 @@
     "xss": "^1.0.14"
   },
   "devDependencies": {
-    "@babel/core": "^7.22.6",
+    "@babel/core": "^7.22.8",
     "@babel/preset-env": "^7.22.6",
     "autoprefixer": "^10.4.14",
     "babel-loader": "^9.1.2",

From 74330dc20ded555c5d871995c273df92ab21a8ec Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 6 Jul 2023 19:23:47 +0000
Subject: [PATCH 168/909] Bump @babel/preset-env in
 /apps/block_scout_web/assets

Bumps [@babel/preset-env](https://github.com/babel/babel/tree/HEAD/packages/babel-preset-env) from 7.22.6 to 7.22.7.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/commits/v7.22.7/packages/babel-preset-env)

---
updated-dependencies:
- dependency-name: "@babel/preset-env"
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 apps/block_scout_web/assets/package-lock.json | 154 +++++++++---------
 apps/block_scout_web/assets/package.json      |   2 +-
 2 files changed, 76 insertions(+), 80 deletions(-)

diff --git a/apps/block_scout_web/assets/package-lock.json b/apps/block_scout_web/assets/package-lock.json
index 385ab072bfa0..65b0e09fac38 100644
--- a/apps/block_scout_web/assets/package-lock.json
+++ b/apps/block_scout_web/assets/package-lock.json
@@ -72,7 +72,7 @@
       },
       "devDependencies": {
         "@babel/core": "^7.22.8",
-        "@babel/preset-env": "^7.22.6",
+        "@babel/preset-env": "^7.22.7",
         "autoprefixer": "^10.4.14",
         "babel-loader": "^9.1.2",
         "copy-webpack-plugin": "^11.0.0",
@@ -990,9 +990,9 @@
       }
     },
     "node_modules/@babel/plugin-transform-async-generator-functions": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-generator-functions/-/plugin-transform-async-generator-functions-7.22.5.tgz",
-      "integrity": "sha512-gGOEvFzm3fWoyD5uZq7vVTD57pPJ3PczPUD/xCFGjzBpUosnklmXyKnGQbbbGs1NPNPskFex0j93yKbHt0cHyg==",
+      "version": "7.22.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-generator-functions/-/plugin-transform-async-generator-functions-7.22.7.tgz",
+      "integrity": "sha512-7HmE7pk/Fmke45TODvxvkxRMV9RazV+ZZzhOL9AG8G29TLrr3jkjwF7uJfxZ30EoXpO+LJkq4oA8NjO2DTnEDg==",
       "dev": true,
       "dependencies": {
         "@babel/helper-environment-visitor": "^7.22.5",
@@ -1778,9 +1778,9 @@
       }
     },
     "node_modules/@babel/preset-env": {
-      "version": "7.22.6",
-      "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.22.6.tgz",
-      "integrity": "sha512-IHr0AXHGk8oh8HYSs45Mxuv6iySUBwDTIzJSnXN7PURqHdxJVQlCoXmKJgyvSS9bcNf9NVRVE35z+LkCvGmi6w==",
+      "version": "7.22.7",
+      "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.22.7.tgz",
+      "integrity": "sha512-1whfDtW+CzhETuzYXfcgZAh8/GFMeEbz0V5dVgya8YeJyCU6Y/P2Gnx4Qb3MylK68Zu9UiwUvbPMPTpFAOJ+sQ==",
       "dev": true,
       "dependencies": {
         "@babel/compat-data": "^7.22.6",
@@ -1809,7 +1809,7 @@
         "@babel/plugin-syntax-top-level-await": "^7.14.5",
         "@babel/plugin-syntax-unicode-sets-regex": "^7.18.6",
         "@babel/plugin-transform-arrow-functions": "^7.22.5",
-        "@babel/plugin-transform-async-generator-functions": "^7.22.5",
+        "@babel/plugin-transform-async-generator-functions": "^7.22.7",
         "@babel/plugin-transform-async-to-generator": "^7.22.5",
         "@babel/plugin-transform-block-scoped-functions": "^7.22.5",
         "@babel/plugin-transform-block-scoping": "^7.22.5",
@@ -1859,9 +1859,9 @@
         "@babel/preset-modules": "^0.1.5",
         "@babel/types": "^7.22.5",
         "@nicolo-ribaudo/semver-v6": "^6.3.3",
-        "babel-plugin-polyfill-corejs2": "^0.4.3",
-        "babel-plugin-polyfill-corejs3": "^0.8.1",
-        "babel-plugin-polyfill-regenerator": "^0.5.0",
+        "babel-plugin-polyfill-corejs2": "^0.4.4",
+        "babel-plugin-polyfill-corejs3": "^0.8.2",
+        "babel-plugin-polyfill-regenerator": "^0.5.1",
         "core-js-compat": "^3.31.0"
       },
       "engines": {
@@ -1872,43 +1872,42 @@
       }
     },
     "node_modules/@babel/preset-env/node_modules/@babel/helper-define-polyfill-provider": {
-      "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.4.0.tgz",
-      "integrity": "sha512-RnanLx5ETe6aybRi1cO/edaRH+bNYWaryCEmjDDYyNr4wnSzyOp8T0dWipmqVHKEY3AbVKUom50AKSlj1zmKbg==",
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.4.1.tgz",
+      "integrity": "sha512-kX4oXixDxG197yhX+J3Wp+NpL2wuCFjWQAr6yX2jtCnflK9ulMI51ULFGIrWiX1jGfvAxdHp+XQCcP2bZGPs9A==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-compilation-targets": "^7.17.7",
-        "@babel/helper-plugin-utils": "^7.16.7",
+        "@babel/helper-compilation-targets": "^7.22.6",
+        "@babel/helper-plugin-utils": "^7.22.5",
         "debug": "^4.1.1",
         "lodash.debounce": "^4.0.8",
-        "resolve": "^1.14.2",
-        "semver": "^6.1.2"
+        "resolve": "^1.14.2"
       },
       "peerDependencies": {
         "@babel/core": "^7.4.0-0"
       }
     },
     "node_modules/@babel/preset-env/node_modules/babel-plugin-polyfill-corejs2": {
-      "version": "0.4.3",
-      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.4.3.tgz",
-      "integrity": "sha512-bM3gHc337Dta490gg+/AseNB9L4YLHxq1nGKZZSHbhXv4aTYU2MD2cjza1Ru4S6975YLTaL1K8uJf6ukJhhmtw==",
+      "version": "0.4.4",
+      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.4.4.tgz",
+      "integrity": "sha512-9WeK9snM1BfxB38goUEv2FLnA6ja07UMfazFHzCXUb3NyDZAwfXvQiURQ6guTTMeHcOsdknULm1PDhs4uWtKyA==",
       "dev": true,
       "dependencies": {
-        "@babel/compat-data": "^7.17.7",
-        "@babel/helper-define-polyfill-provider": "^0.4.0",
-        "semver": "^6.1.1"
+        "@babel/compat-data": "^7.22.6",
+        "@babel/helper-define-polyfill-provider": "^0.4.1",
+        "@nicolo-ribaudo/semver-v6": "^6.3.3"
       },
       "peerDependencies": {
         "@babel/core": "^7.0.0-0"
       }
     },
     "node_modules/@babel/preset-env/node_modules/babel-plugin-polyfill-regenerator": {
-      "version": "0.5.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.5.0.tgz",
-      "integrity": "sha512-hDJtKjMLVa7Z+LwnTCxoDLQj6wdc+B8dun7ayF2fYieI6OzfuvcLMB32ihJZ4UhCBwNYGl5bg/x/P9cMdnkc2g==",
+      "version": "0.5.1",
+      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.5.1.tgz",
+      "integrity": "sha512-L8OyySuI6OSQ5hFy9O+7zFjyr4WhAfRjLIOkhQGYl+emwJkd/S4XXT1JpfrgR1jrQ1NcGiOh+yAdGlF8pnC3Jw==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-define-polyfill-provider": "^0.4.0"
+        "@babel/helper-define-polyfill-provider": "^0.4.1"
       },
       "peerDependencies": {
         "@babel/core": "^7.0.0-0"
@@ -4697,30 +4696,29 @@
       }
     },
     "node_modules/babel-plugin-polyfill-corejs3": {
-      "version": "0.8.1",
-      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.8.1.tgz",
-      "integrity": "sha512-ikFrZITKg1xH6pLND8zT14UPgjKHiGLqex7rGEZCH2EvhsneJaJPemmpQaIZV5AL03II+lXylw3UmddDK8RU5Q==",
+      "version": "0.8.2",
+      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.8.2.tgz",
+      "integrity": "sha512-Cid+Jv1BrY9ReW9lIfNlNpsI53N+FN7gE+f73zLAUbr9C52W4gKLWSByx47pfDJsEysojKArqOtOKZSVIIUTuQ==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-define-polyfill-provider": "^0.4.0",
-        "core-js-compat": "^3.30.1"
+        "@babel/helper-define-polyfill-provider": "^0.4.1",
+        "core-js-compat": "^3.31.0"
       },
       "peerDependencies": {
         "@babel/core": "^7.0.0-0"
       }
     },
     "node_modules/babel-plugin-polyfill-corejs3/node_modules/@babel/helper-define-polyfill-provider": {
-      "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.4.0.tgz",
-      "integrity": "sha512-RnanLx5ETe6aybRi1cO/edaRH+bNYWaryCEmjDDYyNr4wnSzyOp8T0dWipmqVHKEY3AbVKUom50AKSlj1zmKbg==",
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.4.1.tgz",
+      "integrity": "sha512-kX4oXixDxG197yhX+J3Wp+NpL2wuCFjWQAr6yX2jtCnflK9ulMI51ULFGIrWiX1jGfvAxdHp+XQCcP2bZGPs9A==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-compilation-targets": "^7.17.7",
-        "@babel/helper-plugin-utils": "^7.16.7",
+        "@babel/helper-compilation-targets": "^7.22.6",
+        "@babel/helper-plugin-utils": "^7.22.5",
         "debug": "^4.1.1",
         "lodash.debounce": "^4.0.8",
-        "resolve": "^1.14.2",
-        "semver": "^6.1.2"
+        "resolve": "^1.14.2"
       },
       "peerDependencies": {
         "@babel/core": "^7.4.0-0"
@@ -17980,9 +17978,9 @@
       }
     },
     "@babel/plugin-transform-async-generator-functions": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-generator-functions/-/plugin-transform-async-generator-functions-7.22.5.tgz",
-      "integrity": "sha512-gGOEvFzm3fWoyD5uZq7vVTD57pPJ3PczPUD/xCFGjzBpUosnklmXyKnGQbbbGs1NPNPskFex0j93yKbHt0cHyg==",
+      "version": "7.22.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-generator-functions/-/plugin-transform-async-generator-functions-7.22.7.tgz",
+      "integrity": "sha512-7HmE7pk/Fmke45TODvxvkxRMV9RazV+ZZzhOL9AG8G29TLrr3jkjwF7uJfxZ30EoXpO+LJkq4oA8NjO2DTnEDg==",
       "dev": true,
       "requires": {
         "@babel/helper-environment-visitor": "^7.22.5",
@@ -18479,9 +18477,9 @@
       }
     },
     "@babel/preset-env": {
-      "version": "7.22.6",
-      "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.22.6.tgz",
-      "integrity": "sha512-IHr0AXHGk8oh8HYSs45Mxuv6iySUBwDTIzJSnXN7PURqHdxJVQlCoXmKJgyvSS9bcNf9NVRVE35z+LkCvGmi6w==",
+      "version": "7.22.7",
+      "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.22.7.tgz",
+      "integrity": "sha512-1whfDtW+CzhETuzYXfcgZAh8/GFMeEbz0V5dVgya8YeJyCU6Y/P2Gnx4Qb3MylK68Zu9UiwUvbPMPTpFAOJ+sQ==",
       "dev": true,
       "requires": {
         "@babel/compat-data": "^7.22.6",
@@ -18510,7 +18508,7 @@
         "@babel/plugin-syntax-top-level-await": "^7.14.5",
         "@babel/plugin-syntax-unicode-sets-regex": "^7.18.6",
         "@babel/plugin-transform-arrow-functions": "^7.22.5",
-        "@babel/plugin-transform-async-generator-functions": "^7.22.5",
+        "@babel/plugin-transform-async-generator-functions": "^7.22.7",
         "@babel/plugin-transform-async-to-generator": "^7.22.5",
         "@babel/plugin-transform-block-scoped-functions": "^7.22.5",
         "@babel/plugin-transform-block-scoping": "^7.22.5",
@@ -18560,44 +18558,43 @@
         "@babel/preset-modules": "^0.1.5",
         "@babel/types": "^7.22.5",
         "@nicolo-ribaudo/semver-v6": "^6.3.3",
-        "babel-plugin-polyfill-corejs2": "^0.4.3",
-        "babel-plugin-polyfill-corejs3": "^0.8.1",
-        "babel-plugin-polyfill-regenerator": "^0.5.0",
+        "babel-plugin-polyfill-corejs2": "^0.4.4",
+        "babel-plugin-polyfill-corejs3": "^0.8.2",
+        "babel-plugin-polyfill-regenerator": "^0.5.1",
         "core-js-compat": "^3.31.0"
       },
       "dependencies": {
         "@babel/helper-define-polyfill-provider": {
-          "version": "0.4.0",
-          "resolved": "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.4.0.tgz",
-          "integrity": "sha512-RnanLx5ETe6aybRi1cO/edaRH+bNYWaryCEmjDDYyNr4wnSzyOp8T0dWipmqVHKEY3AbVKUom50AKSlj1zmKbg==",
+          "version": "0.4.1",
+          "resolved": "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.4.1.tgz",
+          "integrity": "sha512-kX4oXixDxG197yhX+J3Wp+NpL2wuCFjWQAr6yX2jtCnflK9ulMI51ULFGIrWiX1jGfvAxdHp+XQCcP2bZGPs9A==",
           "dev": true,
           "requires": {
-            "@babel/helper-compilation-targets": "^7.17.7",
-            "@babel/helper-plugin-utils": "^7.16.7",
+            "@babel/helper-compilation-targets": "^7.22.6",
+            "@babel/helper-plugin-utils": "^7.22.5",
             "debug": "^4.1.1",
             "lodash.debounce": "^4.0.8",
-            "resolve": "^1.14.2",
-            "semver": "^6.1.2"
+            "resolve": "^1.14.2"
           }
         },
         "babel-plugin-polyfill-corejs2": {
-          "version": "0.4.3",
-          "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.4.3.tgz",
-          "integrity": "sha512-bM3gHc337Dta490gg+/AseNB9L4YLHxq1nGKZZSHbhXv4aTYU2MD2cjza1Ru4S6975YLTaL1K8uJf6ukJhhmtw==",
+          "version": "0.4.4",
+          "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.4.4.tgz",
+          "integrity": "sha512-9WeK9snM1BfxB38goUEv2FLnA6ja07UMfazFHzCXUb3NyDZAwfXvQiURQ6guTTMeHcOsdknULm1PDhs4uWtKyA==",
           "dev": true,
           "requires": {
-            "@babel/compat-data": "^7.17.7",
-            "@babel/helper-define-polyfill-provider": "^0.4.0",
-            "semver": "^6.1.1"
+            "@babel/compat-data": "^7.22.6",
+            "@babel/helper-define-polyfill-provider": "^0.4.1",
+            "@nicolo-ribaudo/semver-v6": "^6.3.3"
           }
         },
         "babel-plugin-polyfill-regenerator": {
-          "version": "0.5.0",
-          "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.5.0.tgz",
-          "integrity": "sha512-hDJtKjMLVa7Z+LwnTCxoDLQj6wdc+B8dun7ayF2fYieI6OzfuvcLMB32ihJZ4UhCBwNYGl5bg/x/P9cMdnkc2g==",
+          "version": "0.5.1",
+          "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.5.1.tgz",
+          "integrity": "sha512-L8OyySuI6OSQ5hFy9O+7zFjyr4WhAfRjLIOkhQGYl+emwJkd/S4XXT1JpfrgR1jrQ1NcGiOh+yAdGlF8pnC3Jw==",
           "dev": true,
           "requires": {
-            "@babel/helper-define-polyfill-provider": "^0.4.0"
+            "@babel/helper-define-polyfill-provider": "^0.4.1"
           }
         }
       }
@@ -20746,27 +20743,26 @@
       }
     },
     "babel-plugin-polyfill-corejs3": {
-      "version": "0.8.1",
-      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.8.1.tgz",
-      "integrity": "sha512-ikFrZITKg1xH6pLND8zT14UPgjKHiGLqex7rGEZCH2EvhsneJaJPemmpQaIZV5AL03II+lXylw3UmddDK8RU5Q==",
+      "version": "0.8.2",
+      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.8.2.tgz",
+      "integrity": "sha512-Cid+Jv1BrY9ReW9lIfNlNpsI53N+FN7gE+f73zLAUbr9C52W4gKLWSByx47pfDJsEysojKArqOtOKZSVIIUTuQ==",
       "dev": true,
       "requires": {
-        "@babel/helper-define-polyfill-provider": "^0.4.0",
-        "core-js-compat": "^3.30.1"
+        "@babel/helper-define-polyfill-provider": "^0.4.1",
+        "core-js-compat": "^3.31.0"
       },
       "dependencies": {
         "@babel/helper-define-polyfill-provider": {
-          "version": "0.4.0",
-          "resolved": "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.4.0.tgz",
-          "integrity": "sha512-RnanLx5ETe6aybRi1cO/edaRH+bNYWaryCEmjDDYyNr4wnSzyOp8T0dWipmqVHKEY3AbVKUom50AKSlj1zmKbg==",
+          "version": "0.4.1",
+          "resolved": "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.4.1.tgz",
+          "integrity": "sha512-kX4oXixDxG197yhX+J3Wp+NpL2wuCFjWQAr6yX2jtCnflK9ulMI51ULFGIrWiX1jGfvAxdHp+XQCcP2bZGPs9A==",
           "dev": true,
           "requires": {
-            "@babel/helper-compilation-targets": "^7.17.7",
-            "@babel/helper-plugin-utils": "^7.16.7",
+            "@babel/helper-compilation-targets": "^7.22.6",
+            "@babel/helper-plugin-utils": "^7.22.5",
             "debug": "^4.1.1",
             "lodash.debounce": "^4.0.8",
-            "resolve": "^1.14.2",
-            "semver": "^6.1.2"
+            "resolve": "^1.14.2"
           }
         }
       }
diff --git a/apps/block_scout_web/assets/package.json b/apps/block_scout_web/assets/package.json
index 17641266e01b..5f352682b3e8 100644
--- a/apps/block_scout_web/assets/package.json
+++ b/apps/block_scout_web/assets/package.json
@@ -84,7 +84,7 @@
   },
   "devDependencies": {
     "@babel/core": "^7.22.8",
-    "@babel/preset-env": "^7.22.6",
+    "@babel/preset-env": "^7.22.7",
     "autoprefixer": "^10.4.14",
     "babel-loader": "^9.1.2",
     "copy-webpack-plugin": "^11.0.0",

From 1c3aab9fc55620791f322fed1ceba3d20086ca5b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 6 Jul 2023 19:24:00 +0000
Subject: [PATCH 169/909] Bump jest-environment-jsdom in
 /apps/block_scout_web/assets

Bumps [jest-environment-jsdom](https://github.com/facebook/jest/tree/HEAD/packages/jest-environment-jsdom) from 29.6.0 to 29.6.1.
- [Release notes](https://github.com/facebook/jest/releases)
- [Changelog](https://github.com/jestjs/jest/blob/main/CHANGELOG.md)
- [Commits](https://github.com/facebook/jest/commits/v29.6.1/packages/jest-environment-jsdom)

---
updated-dependencies:
- dependency-name: jest-environment-jsdom
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 apps/block_scout_web/assets/package-lock.json | 34 +++++++++----------
 apps/block_scout_web/assets/package.json      |  2 +-
 2 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/apps/block_scout_web/assets/package-lock.json b/apps/block_scout_web/assets/package-lock.json
index 385ab072bfa0..782d072d005b 100644
--- a/apps/block_scout_web/assets/package-lock.json
+++ b/apps/block_scout_web/assets/package-lock.json
@@ -85,7 +85,7 @@
         "eslint-plugin-promise": "^6.1.1",
         "file-loader": "^6.2.0",
         "jest": "^29.6.1",
-        "jest-environment-jsdom": "^29.6.0",
+        "jest-environment-jsdom": "^29.6.1",
         "mini-css-extract-plugin": "^2.7.6",
         "postcss": "^8.4.25",
         "postcss-loader": "^7.3.3",
@@ -10533,18 +10533,18 @@
       }
     },
     "node_modules/jest-environment-jsdom": {
-      "version": "29.6.0",
-      "resolved": "https://registry.npmjs.org/jest-environment-jsdom/-/jest-environment-jsdom-29.6.0.tgz",
-      "integrity": "sha512-/cOhoyv+uMbOh4nQPyqtkPas/uUxr5AbK6TPqMMFyj1qEJURY78RhqgBjOFIX02+Lvu5V0RWLq2qKY1dHubFOQ==",
+      "version": "29.6.1",
+      "resolved": "https://registry.npmjs.org/jest-environment-jsdom/-/jest-environment-jsdom-29.6.1.tgz",
+      "integrity": "sha512-PoY+yLaHzVRhVEjcVKSfJ7wXmJW4UqPYNhR05h7u/TK0ouf6DmRNZFBL/Z00zgQMyWGMBXn69/FmOvhEJu8cIw==",
       "dev": true,
       "dependencies": {
-        "@jest/environment": "^29.6.0",
-        "@jest/fake-timers": "^29.6.0",
-        "@jest/types": "^29.6.0",
+        "@jest/environment": "^29.6.1",
+        "@jest/fake-timers": "^29.6.1",
+        "@jest/types": "^29.6.1",
         "@types/jsdom": "^20.0.0",
         "@types/node": "*",
-        "jest-mock": "^29.6.0",
-        "jest-util": "^29.6.0",
+        "jest-mock": "^29.6.1",
+        "jest-util": "^29.6.1",
         "jsdom": "^20.0.0"
       },
       "engines": {
@@ -25207,18 +25207,18 @@
       }
     },
     "jest-environment-jsdom": {
-      "version": "29.6.0",
-      "resolved": "https://registry.npmjs.org/jest-environment-jsdom/-/jest-environment-jsdom-29.6.0.tgz",
-      "integrity": "sha512-/cOhoyv+uMbOh4nQPyqtkPas/uUxr5AbK6TPqMMFyj1qEJURY78RhqgBjOFIX02+Lvu5V0RWLq2qKY1dHubFOQ==",
+      "version": "29.6.1",
+      "resolved": "https://registry.npmjs.org/jest-environment-jsdom/-/jest-environment-jsdom-29.6.1.tgz",
+      "integrity": "sha512-PoY+yLaHzVRhVEjcVKSfJ7wXmJW4UqPYNhR05h7u/TK0ouf6DmRNZFBL/Z00zgQMyWGMBXn69/FmOvhEJu8cIw==",
       "dev": true,
       "requires": {
-        "@jest/environment": "^29.6.0",
-        "@jest/fake-timers": "^29.6.0",
-        "@jest/types": "^29.6.0",
+        "@jest/environment": "^29.6.1",
+        "@jest/fake-timers": "^29.6.1",
+        "@jest/types": "^29.6.1",
         "@types/jsdom": "^20.0.0",
         "@types/node": "*",
-        "jest-mock": "^29.6.0",
-        "jest-util": "^29.6.0",
+        "jest-mock": "^29.6.1",
+        "jest-util": "^29.6.1",
         "jsdom": "^20.0.0"
       }
     },
diff --git a/apps/block_scout_web/assets/package.json b/apps/block_scout_web/assets/package.json
index 17641266e01b..f484438e06fe 100644
--- a/apps/block_scout_web/assets/package.json
+++ b/apps/block_scout_web/assets/package.json
@@ -97,7 +97,7 @@
     "eslint-plugin-promise": "^6.1.1",
     "file-loader": "^6.2.0",
     "jest": "^29.6.1",
-    "jest-environment-jsdom": "^29.6.0",
+    "jest-environment-jsdom": "^29.6.1",
     "mini-css-extract-plugin": "^2.7.6",
     "postcss": "^8.4.25",
     "postcss-loader": "^7.3.3",

From cc193daa7c7be4b2f2a476934fe724bfde0c5a83 Mon Sep 17 00:00:00 2001
From: Viktor Baranov <baranov.viktor.27@gmail.com>
Date: Fri, 7 Jul 2023 13:31:21 +0300
Subject: [PATCH 170/909] Fix pending gas price in pending tx

---
 CHANGELOG.md                                  |  1 +
 .../lib/ethereum_jsonrpc/transaction.ex       |  1 +
 .../lib/explorer/chain/transaction.ex         | 23 +++++++++++++++++--
 3 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 369db5919245..e6dc690e2878 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,7 @@
 - [#7811](https://github.com/blockscout/blockscout/pull/7811) - Filter addresses before insertion
 
 ### Fixes
+- [#7872](https://github.com/blockscout/blockscout/pull/7872) - Fix pending gas price in pending tx
 - [#7825](https://github.com/blockscout/blockscout/pull/7825) - Fix nginx config for the new frontend websockets
 - [#7772](https://github.com/blockscout/blockscout/pull/7772) - Fix parsing of database password period(s)
 - [#7803](https://github.com/blockscout/blockscout/pull/7803) - Fix additional sources and interfaces, save names for vyper contracts
diff --git a/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/transaction.ex b/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/transaction.ex
index f82a94c8d98c..f81ba9d4acef 100644
--- a/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/transaction.ex
+++ b/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/transaction.ex
@@ -230,6 +230,7 @@ defmodule EthereumJSONRPC.Transaction do
       block_number: block_number,
       from_address_hash: from_address_hash,
       gas: gas,
+      gas_price: nil,
       hash: hash,
       index: index,
       input: input,
diff --git a/apps/explorer/lib/explorer/chain/transaction.ex b/apps/explorer/lib/explorer/chain/transaction.ex
index c6c8e3009aa6..c186b56342cf 100644
--- a/apps/explorer/lib/explorer/chain/transaction.ex
+++ b/apps/explorer/lib/explorer/chain/transaction.ex
@@ -36,7 +36,7 @@ defmodule Explorer.Chain.Transaction do
   @optional_attrs ~w(max_priority_fee_per_gas max_fee_per_gas block_hash block_number created_contract_address_hash cumulative_gas_used earliest_processing_start
                      error gas_used index created_contract_code_indexed_at status to_address_hash revert_reason type has_error_in_internal_txs)a
 
-  @required_attrs ~w(from_address_hash gas gas_price hash input nonce r s v value)a
+  @required_attrs ~w(from_address_hash gas hash input nonce r s v value)a
 
   @typedoc """
   X coordinate module n in
@@ -154,7 +154,7 @@ defmodule Explorer.Chain.Transaction do
           from_address: %Ecto.Association.NotLoaded{} | Address.t(),
           from_address_hash: Hash.Address.t(),
           gas: Gas.t(),
-          gas_price: wei_per_gas,
+          gas_price: wei_per_gas | nil,
           gas_used: Gas.t() | nil,
           hash: Hash.t(),
           index: transaction_index | nil,
@@ -305,6 +305,25 @@ defmodule Explorer.Chain.Transaction do
       iex> changeset.valid?
       true
 
+  A pending transaction does not have a `gas_price` (Erigon)
+
+      iex> changeset = Explorer.Chain.Transaction.changeset(
+      ...>   %Transaction{},
+      ...>   %{
+      ...>     from_address_hash: "0xe8ddc5c7a2d2f0d7a9798459c0104fdf5e987aca",
+      ...>     gas: 4700000,
+      ...>     hash: "0x3a3eb134e6792ce9403ea4188e5e79693de9e4c94e499db132be086400da79e6",
+      ...>     input: "0x6060604052341561000f57600080fd5b336000806101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff1602179055506102db8061005e6000396000f300606060405260043610610062576000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff1680630900f01014610067578063445df0ac146100a05780638da5cb5b146100c9578063fdacd5761461011e575b600080fd5b341561007257600080fd5b61009e600480803573ffffffffffffffffffffffffffffffffffffffff16906020019091905050610141565b005b34156100ab57600080fd5b6100b3610224565b6040518082815260200191505060405180910390f35b34156100d457600080fd5b6100dc61022a565b604051808273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200191505060405180910390f35b341561012957600080fd5b61013f600480803590602001909190505061024f565b005b60008060009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff161415610220578190508073ffffffffffffffffffffffffffffffffffffffff1663fdacd5766001546040518263ffffffff167c010000000000000000000000000000000000000000000000000000000002815260040180828152602001915050600060405180830381600087803b151561020b57600080fd5b6102c65a03f1151561021c57600080fd5b5050505b5050565b60015481565b6000809054906101000a900473ffffffffffffffffffffffffffffffffffffffff1681565b6000809054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff1614156102ac57806001819055505b505600a165627a7a72305820a9c628775efbfbc17477a472413c01ee9b33881f550c59d21bee9928835c854b0029",
+      ...>     nonce: 0,
+      ...>     r: 0xAD3733DF250C87556335FFE46C23E34DBAFFDE93097EF92F52C88632A40F0C75,
+      ...>     s: 0x72caddc0371451a58de2ca6ab64e0f586ccdb9465ff54e1c82564940e89291e3,
+      ...>     v: 0x8d,
+      ...>     value: 0
+      ...>   }
+      ...> )
+      iex> changeset.valid?
+      true
+
   A collated transaction MUST have an `index` so its position in the `block` is known and the `cumulative_gas_used` ane
   `gas_used` to know its fees.
 

From 5a4d9c35fa22b195a66bde395bb7a46c626f82e3 Mon Sep 17 00:00:00 2001
From: Viktor Baranov <baranov.viktor.27@gmail.com>
Date: Fri, 7 Jul 2023 15:22:37 +0300
Subject: [PATCH 171/909] Fix ethereum_jsonrpc tests

---
 apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/transaction.ex | 1 +
 1 file changed, 1 insertion(+)

diff --git a/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/transaction.ex b/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/transaction.ex
index f81ba9d4acef..b538612cb413 100644
--- a/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/transaction.ex
+++ b/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/transaction.ex
@@ -135,6 +135,7 @@ defmodule EthereumJSONRPC.Transaction do
       %{
         block_hash: nil,
         block_number: nil,
+        gas_price: nil,
         from_address_hash: "0x870006d72c247bc1e90983c71b3234ee01d3c9d9",
         gas: 182154,
         hash: "0x8d2cd1fae48ea0d2a20bb74abbfca05c2d805793e1b42fa844bbdd90f2512f39",

From b1e60bf452be818c8c3253dbd935de9253efa032 Mon Sep 17 00:00:00 2001
From: Viktor Baranov <baranov.viktor.27@gmail.com>
Date: Fri, 7 Jul 2023 16:34:05 +0300
Subject: [PATCH 172/909] Fix other tests

---
 apps/explorer/lib/explorer/chain/transaction.ex | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/explorer/lib/explorer/chain/transaction.ex b/apps/explorer/lib/explorer/chain/transaction.ex
index c186b56342cf..c40d87769f14 100644
--- a/apps/explorer/lib/explorer/chain/transaction.ex
+++ b/apps/explorer/lib/explorer/chain/transaction.ex
@@ -34,7 +34,7 @@ defmodule Explorer.Chain.Transaction do
   alias Explorer.SmartContract.SigProviderInterface
 
   @optional_attrs ~w(max_priority_fee_per_gas max_fee_per_gas block_hash block_number created_contract_address_hash cumulative_gas_used earliest_processing_start
-                     error gas_used index created_contract_code_indexed_at status to_address_hash revert_reason type has_error_in_internal_txs)a
+                     error gas_price gas_used index created_contract_code_indexed_at status to_address_hash revert_reason type has_error_in_internal_txs)a
 
   @required_attrs ~w(from_address_hash gas hash input nonce r s v value)a
 

From a77c041da8119aa3b02bf51bbc2e1e50cd390204 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 7 Jul 2023 18:41:59 +0000
Subject: [PATCH 173/909] Bump babel-loader from 9.1.2 to 9.1.3 in
 /apps/block_scout_web/assets

Bumps [babel-loader](https://github.com/babel/babel-loader) from 9.1.2 to 9.1.3.
- [Release notes](https://github.com/babel/babel-loader/releases)
- [Changelog](https://github.com/babel/babel-loader/blob/main/CHANGELOG.md)
- [Commits](https://github.com/babel/babel-loader/compare/v9.1.2...v9.1.3)

---
updated-dependencies:
- dependency-name: babel-loader
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 apps/block_scout_web/assets/package-lock.json | 240 ++++++++++++++----
 apps/block_scout_web/assets/package.json      |   2 +-
 2 files changed, 187 insertions(+), 55 deletions(-)

diff --git a/apps/block_scout_web/assets/package-lock.json b/apps/block_scout_web/assets/package-lock.json
index 0c8dd0fa5937..599611d26d36 100644
--- a/apps/block_scout_web/assets/package-lock.json
+++ b/apps/block_scout_web/assets/package-lock.json
@@ -74,7 +74,7 @@
         "@babel/core": "^7.22.8",
         "@babel/preset-env": "^7.22.7",
         "autoprefixer": "^10.4.14",
-        "babel-loader": "^9.1.2",
+        "babel-loader": "^9.1.3",
         "copy-webpack-plugin": "^11.0.0",
         "css-loader": "^5.2.7",
         "css-minimizer-webpack-plugin": "^5.0.1",
@@ -4635,12 +4635,12 @@
       }
     },
     "node_modules/babel-loader": {
-      "version": "9.1.2",
-      "resolved": "https://registry.npmjs.org/babel-loader/-/babel-loader-9.1.2.tgz",
-      "integrity": "sha512-mN14niXW43tddohGl8HPu5yfQq70iUThvFL/4QzESA7GcZoC0eVOhvWdQ8+3UlSjaDE9MVtsW9mxDY07W7VpVA==",
+      "version": "9.1.3",
+      "resolved": "https://registry.npmjs.org/babel-loader/-/babel-loader-9.1.3.tgz",
+      "integrity": "sha512-xG3ST4DglodGf8qSwv0MdeWLhrDsw/32QMdTO5T1ZIp9gQur0HkCyFs7Awskr10JKXFXwpAhiCuYX5oGXnRGbw==",
       "dev": true,
       "dependencies": {
-        "find-cache-dir": "^3.3.2",
+        "find-cache-dir": "^4.0.0",
         "schema-utils": "^4.0.0"
       },
       "engines": {
@@ -5658,10 +5658,10 @@
         "node": ">= 10"
       }
     },
-    "node_modules/commondir": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/commondir/-/commondir-1.0.1.tgz",
-      "integrity": "sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs=",
+    "node_modules/common-path-prefix": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/common-path-prefix/-/common-path-prefix-3.0.0.tgz",
+      "integrity": "sha512-QE33hToZseCH3jS0qN96O/bSh3kaw/h+Tq7ngyY9eWDUnTlTNUyqfqvCXioLe5Na5jFsL78ra/wuBU4iuEgd4w==",
       "dev": true
     },
     "node_modules/concat-map": {
@@ -8616,32 +8616,19 @@
       "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
     },
     "node_modules/find-cache-dir": {
-      "version": "3.3.2",
-      "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-3.3.2.tgz",
-      "integrity": "sha512-wXZV5emFEjrridIgED11OoUKLxiYjAcqot/NJdAkOhlJ+vGzwhOAfcG5OX1jP+S0PcjEn8bdMJv+g2jwQ3Onig==",
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-4.0.0.tgz",
+      "integrity": "sha512-9ZonPT4ZAK4a+1pUPVPZJapbi7O5qbbJPdYw/NOQWZZbVLdDTYM3A4R9z/DpAM08IDaFGsvPgiGZ82WEwUDWjg==",
       "dev": true,
       "dependencies": {
-        "commondir": "^1.0.1",
-        "make-dir": "^3.0.2",
-        "pkg-dir": "^4.1.0"
+        "common-path-prefix": "^3.0.0",
+        "pkg-dir": "^7.0.0"
       },
       "engines": {
-        "node": ">=8"
+        "node": ">=14.16"
       },
       "funding": {
-        "url": "https://github.com/avajs/find-cache-dir?sponsor=1"
-      }
-    },
-    "node_modules/find-cache-dir/node_modules/pkg-dir": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz",
-      "integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==",
-      "dev": true,
-      "dependencies": {
-        "find-up": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
     "node_modules/find-up": {
@@ -13317,6 +13304,103 @@
         "node": ">= 6"
       }
     },
+    "node_modules/pkg-dir": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-7.0.0.tgz",
+      "integrity": "sha512-Ie9z/WINcxxLp27BKOCHGde4ITq9UklYKDzVo1nhk5sqGEXU3FpkwP5GM2voTGJkGd9B3Otl+Q4uwSOeSUtOBA==",
+      "dev": true,
+      "dependencies": {
+        "find-up": "^6.3.0"
+      },
+      "engines": {
+        "node": ">=14.16"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/pkg-dir/node_modules/find-up": {
+      "version": "6.3.0",
+      "resolved": "https://registry.npmjs.org/find-up/-/find-up-6.3.0.tgz",
+      "integrity": "sha512-v2ZsoEuVHYy8ZIlYqwPe/39Cy+cFDzp4dXPaxNvkEuouymu+2Jbz0PxpKarJHYJTmv2HWT3O382qY8l4jMWthw==",
+      "dev": true,
+      "dependencies": {
+        "locate-path": "^7.1.0",
+        "path-exists": "^5.0.0"
+      },
+      "engines": {
+        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/pkg-dir/node_modules/locate-path": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-7.2.0.tgz",
+      "integrity": "sha512-gvVijfZvn7R+2qyPX8mAuKcFGDf6Nc61GdvGafQsHL0sBIxfKzA+usWn4GFC/bk+QdwPUD4kWFJLhElipq+0VA==",
+      "dev": true,
+      "dependencies": {
+        "p-locate": "^6.0.0"
+      },
+      "engines": {
+        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/pkg-dir/node_modules/p-limit": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-4.0.0.tgz",
+      "integrity": "sha512-5b0R4txpzjPWVw/cXXUResoD4hb6U/x9BH08L7nw+GN1sezDzPdxeRvpc9c433fZhBan/wusjbCsqwqm4EIBIQ==",
+      "dev": true,
+      "dependencies": {
+        "yocto-queue": "^1.0.0"
+      },
+      "engines": {
+        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/pkg-dir/node_modules/p-locate": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-6.0.0.tgz",
+      "integrity": "sha512-wPrq66Llhl7/4AGC6I+cqxT07LhXvWL08LNXz1fENOw0Ap4sRZZ/gZpTTJ5jpurzzzfS2W/Ge9BY3LgLjCShcw==",
+      "dev": true,
+      "dependencies": {
+        "p-limit": "^4.0.0"
+      },
+      "engines": {
+        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/pkg-dir/node_modules/path-exists": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-5.0.0.tgz",
+      "integrity": "sha512-RjhtfwJOxzcFmNOi6ltcbcu4Iu+FL3zEj83dk4kAS+fVpTxXLO1b38RvJgT/0QwvV/L3aY9TAnyv0EOqW4GoMQ==",
+      "dev": true,
+      "engines": {
+        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+      }
+    },
+    "node_modules/pkg-dir/node_modules/yocto-queue": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-1.0.0.tgz",
+      "integrity": "sha512-9bnSc/HEW2uRy67wc+T8UwauLuPJVn28jb+GtJY16iiKWyvmYJRXVT4UamsAEGQfPohgr2q4Tq0sQbQlxTfi1g==",
+      "dev": true,
+      "engines": {
+        "node": ">=12.20"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "node_modules/pngjs": {
       "version": "3.4.0",
       "resolved": "https://registry.npmjs.org/pngjs/-/pngjs-3.4.0.tgz",
@@ -20698,12 +20782,12 @@
       }
     },
     "babel-loader": {
-      "version": "9.1.2",
-      "resolved": "https://registry.npmjs.org/babel-loader/-/babel-loader-9.1.2.tgz",
-      "integrity": "sha512-mN14niXW43tddohGl8HPu5yfQq70iUThvFL/4QzESA7GcZoC0eVOhvWdQ8+3UlSjaDE9MVtsW9mxDY07W7VpVA==",
+      "version": "9.1.3",
+      "resolved": "https://registry.npmjs.org/babel-loader/-/babel-loader-9.1.3.tgz",
+      "integrity": "sha512-xG3ST4DglodGf8qSwv0MdeWLhrDsw/32QMdTO5T1ZIp9gQur0HkCyFs7Awskr10JKXFXwpAhiCuYX5oGXnRGbw==",
       "dev": true,
       "requires": {
-        "find-cache-dir": "^3.3.2",
+        "find-cache-dir": "^4.0.0",
         "schema-utils": "^4.0.0"
       }
     },
@@ -21484,10 +21568,10 @@
       "integrity": "sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==",
       "dev": true
     },
-    "commondir": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/commondir/-/commondir-1.0.1.tgz",
-      "integrity": "sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs=",
+    "common-path-prefix": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/common-path-prefix/-/common-path-prefix-3.0.0.tgz",
+      "integrity": "sha512-QE33hToZseCH3jS0qN96O/bSh3kaw/h+Tq7ngyY9eWDUnTlTNUyqfqvCXioLe5Na5jFsL78ra/wuBU4iuEgd4w==",
       "dev": true
     },
     "concat-map": {
@@ -23828,25 +23912,13 @@
       }
     },
     "find-cache-dir": {
-      "version": "3.3.2",
-      "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-3.3.2.tgz",
-      "integrity": "sha512-wXZV5emFEjrridIgED11OoUKLxiYjAcqot/NJdAkOhlJ+vGzwhOAfcG5OX1jP+S0PcjEn8bdMJv+g2jwQ3Onig==",
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-4.0.0.tgz",
+      "integrity": "sha512-9ZonPT4ZAK4a+1pUPVPZJapbi7O5qbbJPdYw/NOQWZZbVLdDTYM3A4R9z/DpAM08IDaFGsvPgiGZ82WEwUDWjg==",
       "dev": true,
       "requires": {
-        "commondir": "^1.0.1",
-        "make-dir": "^3.0.2",
-        "pkg-dir": "^4.1.0"
-      },
-      "dependencies": {
-        "pkg-dir": {
-          "version": "4.2.0",
-          "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz",
-          "integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==",
-          "dev": true,
-          "requires": {
-            "find-up": "^4.0.0"
-          }
-        }
+        "common-path-prefix": "^3.0.0",
+        "pkg-dir": "^7.0.0"
       }
     },
     "find-up": {
@@ -27395,6 +27467,66 @@
       "integrity": "sha512-saLsH7WeYYPiD25LDuLRRY/i+6HaPYr6G1OUlN39otzkSTxKnubR9RTxS3/Kk50s1g2JTgFwWQDQyplC5/SHZg==",
       "dev": true
     },
+    "pkg-dir": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-7.0.0.tgz",
+      "integrity": "sha512-Ie9z/WINcxxLp27BKOCHGde4ITq9UklYKDzVo1nhk5sqGEXU3FpkwP5GM2voTGJkGd9B3Otl+Q4uwSOeSUtOBA==",
+      "dev": true,
+      "requires": {
+        "find-up": "^6.3.0"
+      },
+      "dependencies": {
+        "find-up": {
+          "version": "6.3.0",
+          "resolved": "https://registry.npmjs.org/find-up/-/find-up-6.3.0.tgz",
+          "integrity": "sha512-v2ZsoEuVHYy8ZIlYqwPe/39Cy+cFDzp4dXPaxNvkEuouymu+2Jbz0PxpKarJHYJTmv2HWT3O382qY8l4jMWthw==",
+          "dev": true,
+          "requires": {
+            "locate-path": "^7.1.0",
+            "path-exists": "^5.0.0"
+          }
+        },
+        "locate-path": {
+          "version": "7.2.0",
+          "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-7.2.0.tgz",
+          "integrity": "sha512-gvVijfZvn7R+2qyPX8mAuKcFGDf6Nc61GdvGafQsHL0sBIxfKzA+usWn4GFC/bk+QdwPUD4kWFJLhElipq+0VA==",
+          "dev": true,
+          "requires": {
+            "p-locate": "^6.0.0"
+          }
+        },
+        "p-limit": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-4.0.0.tgz",
+          "integrity": "sha512-5b0R4txpzjPWVw/cXXUResoD4hb6U/x9BH08L7nw+GN1sezDzPdxeRvpc9c433fZhBan/wusjbCsqwqm4EIBIQ==",
+          "dev": true,
+          "requires": {
+            "yocto-queue": "^1.0.0"
+          }
+        },
+        "p-locate": {
+          "version": "6.0.0",
+          "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-6.0.0.tgz",
+          "integrity": "sha512-wPrq66Llhl7/4AGC6I+cqxT07LhXvWL08LNXz1fENOw0Ap4sRZZ/gZpTTJ5jpurzzzfS2W/Ge9BY3LgLjCShcw==",
+          "dev": true,
+          "requires": {
+            "p-limit": "^4.0.0"
+          }
+        },
+        "path-exists": {
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-5.0.0.tgz",
+          "integrity": "sha512-RjhtfwJOxzcFmNOi6ltcbcu4Iu+FL3zEj83dk4kAS+fVpTxXLO1b38RvJgT/0QwvV/L3aY9TAnyv0EOqW4GoMQ==",
+          "dev": true
+        },
+        "yocto-queue": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-1.0.0.tgz",
+          "integrity": "sha512-9bnSc/HEW2uRy67wc+T8UwauLuPJVn28jb+GtJY16iiKWyvmYJRXVT4UamsAEGQfPohgr2q4Tq0sQbQlxTfi1g==",
+          "dev": true
+        }
+      }
+    },
     "pngjs": {
       "version": "3.4.0",
       "resolved": "https://registry.npmjs.org/pngjs/-/pngjs-3.4.0.tgz",
diff --git a/apps/block_scout_web/assets/package.json b/apps/block_scout_web/assets/package.json
index 687340341948..0c3a8701f149 100644
--- a/apps/block_scout_web/assets/package.json
+++ b/apps/block_scout_web/assets/package.json
@@ -86,7 +86,7 @@
     "@babel/core": "^7.22.8",
     "@babel/preset-env": "^7.22.7",
     "autoprefixer": "^10.4.14",
-    "babel-loader": "^9.1.2",
+    "babel-loader": "^9.1.3",
     "copy-webpack-plugin": "^11.0.0",
     "css-loader": "^5.2.7",
     "css-minimizer-webpack-plugin": "^5.0.1",

From 33fb5a70af718b3a9e5ca6c83de82521b817de70 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 7 Jul 2023 19:05:07 +0000
Subject: [PATCH 174/909] Bump absinthe from 1.7.3 to 1.7.4

Bumps [absinthe](https://github.com/absinthe-graphql/absinthe) from 1.7.3 to 1.7.4.
- [Release notes](https://github.com/absinthe-graphql/absinthe/releases)
- [Changelog](https://github.com/absinthe-graphql/absinthe/blob/master/CHANGELOG.md)
- [Commits](https://github.com/absinthe-graphql/absinthe/compare/v1.7.3...v1.7.4)

---
updated-dependencies:
- dependency-name: absinthe
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 mix.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/mix.lock b/mix.lock
index 76e36aba095f..3b3e11cae553 100644
--- a/mix.lock
+++ b/mix.lock
@@ -1,5 +1,5 @@
 %{
-  "absinthe": {:hex, :absinthe, "1.7.3", "128f9de8d8feab761a50483011c2652074de0a670316d0e24a4979daeb460c8f", [:mix], [{:dataloader, "~> 1.0.0", [hex: :dataloader, repo: "hexpm", optional: true]}, {:decimal, "~> 1.0 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: true]}, {:nimble_parsec, "~> 1.2.2 or ~> 1.3.0", [hex: :nimble_parsec, repo: "hexpm", optional: false]}, {:opentelemetry_process_propagator, "~> 0.2.1", [hex: :opentelemetry_process_propagator, repo: "hexpm", optional: true]}, {:telemetry, "~> 1.0 or ~> 0.4", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "6def91514f023832dbb3433baa166366881648932211f2e8146f9792b08b7bb3"},
+  "absinthe": {:hex, :absinthe, "1.7.4", "97e37622fad63997afff96ee5aaaad42ea9150f5d5aa5783a05c61374734cc90", [:mix], [{:dataloader, "~> 1.0.0", [hex: :dataloader, repo: "hexpm", optional: true]}, {:decimal, "~> 1.0 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: true]}, {:nimble_parsec, "~> 1.2.2 or ~> 1.3.0", [hex: :nimble_parsec, repo: "hexpm", optional: false]}, {:opentelemetry_process_propagator, "~> 0.2.1", [hex: :opentelemetry_process_propagator, repo: "hexpm", optional: true]}, {:telemetry, "~> 1.0 or ~> 0.4", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "4d5cf4cd0c44e9d7b11d56bf112721e48cce1a7d04dd461c616a99eedbf1c69b"},
   "absinthe_phoenix": {:hex, :absinthe_phoenix, "2.0.2", "e607b438db900049b9b3760f8ecd0591017a46122fffed7057bf6989020992b5", [:mix], [{:absinthe, "~> 1.5", [hex: :absinthe, repo: "hexpm", optional: false]}, {:absinthe_plug, "~> 1.5", [hex: :absinthe_plug, repo: "hexpm", optional: false]}, {:decimal, "~> 1.0 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: false]}, {:phoenix, "~> 1.5", [hex: :phoenix, repo: "hexpm", optional: false]}, {:phoenix_html, "~> 2.13 or ~> 3.0", [hex: :phoenix_html, repo: "hexpm", optional: true]}, {:phoenix_pubsub, "~> 2.0", [hex: :phoenix_pubsub, repo: "hexpm", optional: false]}], "hexpm", "d36918925c380dc7d2ed7d039c9a3b4182ec36723f7417a68745ade5aab22f8d"},
   "absinthe_plug": {:git, "https://github.com/blockscout/absinthe_plug.git", "c435d43f316769e1beee1dbe500b623124c96785", [tag: "1.5.3"]},
   "absinthe_relay": {:hex, :absinthe_relay, "1.5.2", "cfb8aed70f4e4c7718d3f1c212332d2ea728f17c7fc0f68f1e461f0f5f0c4b9a", [:mix], [{:absinthe, "~> 1.5.0 or ~> 1.6.0 or ~> 1.7.0", [hex: :absinthe, repo: "hexpm", optional: false]}, {:ecto, "~> 2.0 or ~> 3.0", [hex: :ecto, repo: "hexpm", optional: true]}], "hexpm", "0587ee913afa31512e1457a5064ee88427f8fe7bcfbeeecd41c71d9cff0b62b6"},
@@ -37,7 +37,7 @@
   "dialyxir": {:hex, :dialyxir, "1.3.0", "fd1672f0922b7648ff9ce7b1b26fcf0ef56dda964a459892ad15f6b4410b5284", [:mix], [{:erlex, ">= 0.2.6", [hex: :erlex, repo: "hexpm", optional: false]}], "hexpm", "00b2a4bcd6aa8db9dcb0b38c1225b7277dca9bc370b6438715667071a304696f"},
   "digital_token": {:hex, :digital_token, "0.4.0", "2ad6894d4a40be8b2890aad286ecd5745fa473fa5699d80361a8c94428edcd1f", [:mix], [{:cldr_utils, "~> 2.17", [hex: :cldr_utils, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: false]}], "hexpm", "a178edf61d1fee5bb3c34e14b0f4ee21809ee87cade8738f87337e59e5e66e26"},
   "earmark_parser": {:hex, :earmark_parser, "1.4.32", "fa739a0ecfa34493de19426681b23f6814573faee95dfd4b4aafe15a7b5b32c6", [:mix], [], "hexpm", "b8b0dd77d60373e77a3d7e8afa598f325e49e8663a51bcc2b88ef41838cca755"},
-  "ecto": {:hex, :ecto, "3.10.2", "6b887160281a61aa16843e47735b8a266caa437f80588c3ab80a8a960e6abe37", [:mix], [{:decimal, "~> 1.6 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}, {:telemetry, "~> 0.4 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "6a895778f0d7648a4b34b486af59a1c8009041fbdf2b17f1ac215eb829c60235"},
+  "ecto": {:hex, :ecto, "3.10.3", "eb2ae2eecd210b4eb8bece1217b297ad4ff824b4384c0e3fdd28aaf96edd6135", [:mix], [{:decimal, "~> 1.6 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}, {:telemetry, "~> 0.4 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "44bec74e2364d491d70f7e42cd0d690922659d329f6465e89feb8a34e8cd3433"},
   "ecto_sql": {:hex, :ecto_sql, "3.10.1", "6ea6b3036a0b0ca94c2a02613fd9f742614b5cfe494c41af2e6571bb034dd94c", [:mix], [{:db_connection, "~> 2.5 or ~> 2.4.1", [hex: :db_connection, repo: "hexpm", optional: false]}, {:ecto, "~> 3.10.0", [hex: :ecto, repo: "hexpm", optional: false]}, {:myxql, "~> 0.6.0", [hex: :myxql, repo: "hexpm", optional: true]}, {:postgrex, "~> 0.16.0 or ~> 0.17.0 or ~> 1.0", [hex: :postgrex, repo: "hexpm", optional: true]}, {:tds, "~> 2.1.1 or ~> 2.2", [hex: :tds, repo: "hexpm", optional: true]}, {:telemetry, "~> 0.4.0 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "f6a25bdbbd695f12c8171eaff0851fa4c8e72eec1e98c7364402dda9ce11c56b"},
   "elixir_make": {:hex, :elixir_make, "0.6.3", "bc07d53221216838d79e03a8019d0839786703129599e9619f4ab74c8c096eac", [:mix], [], "hexpm", "f5cbd651c5678bcaabdbb7857658ee106b12509cd976c2c2fca99688e1daf716"},
   "erlex": {:hex, :erlex, "0.2.6", "c7987d15e899c7a2f34f5420d2a2ea0d659682c06ac607572df55a43753aa12e", [:mix], [], "hexpm", "2ed2e25711feb44d52b17d2780eabf998452f6efda104877a3881c2f8c0c0c75"},
@@ -70,7 +70,7 @@
   "httpoison": {:hex, :httpoison, "2.1.0", "655fd9a7b0b95ee3e9a3b535cf7ac8e08ef5229bab187fa86ac4208b122d934b", [:mix], [{:hackney, "~> 1.17", [hex: :hackney, repo: "hexpm", optional: false]}], "hexpm", "fc455cb4306b43827def4f57299b2d5ac8ac331cb23f517e734a4b78210a160c"},
   "idna": {:hex, :idna, "6.1.1", "8a63070e9f7d0c62eb9d9fcb360a7de382448200fbbd1b106cc96d3d8099df8d", [:rebar3], [{:unicode_util_compat, "~>0.7.0", [hex: :unicode_util_compat, repo: "hexpm", optional: false]}], "hexpm", "92376eb7894412ed19ac475e4a86f7b413c1b9fbb5bd16dccd57934157944cea"},
   "inflex": {:hex, :inflex, "2.1.0", "a365cf0821a9dacb65067abd95008ca1b0bb7dcdd85ae59965deef2aa062924c", [:mix], [], "hexpm", "14c17d05db4ee9b6d319b0bff1bdf22aa389a25398d1952c7a0b5f3d93162dd8"},
-  "jason": {:hex, :jason, "1.4.0", "e855647bc964a44e2f67df589ccf49105ae039d4179db7f6271dfd3843dc27e6", [:mix], [{:decimal, "~> 1.0 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: true]}], "hexpm", "79a3791085b2a0f743ca04cec0f7be26443738779d09302e01318f97bdb82121"},
+  "jason": {:hex, :jason, "1.4.1", "af1504e35f629ddcdd6addb3513c3853991f694921b1b9368b0bd32beb9f1b63", [:mix], [{:decimal, "~> 1.0 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: true]}], "hexpm", "fbb01ecdfd565b56261302f7e1fcc27c4fb8f32d56eab74db621fc154604a7a1"},
   "jsx": {:hex, :jsx, "2.8.3", "a05252d381885240744d955fbe3cf810504eb2567164824e19303ea59eef62cf", [:mix, :rebar3], [], "hexpm", "fc3499fed7a726995aa659143a248534adc754ebd16ccd437cd93b649a95091f"},
   "junit_formatter": {:hex, :junit_formatter, "3.3.1", "c729befb848f1b9571f317d2fefa648e9d4869befc4b2980daca7c1edc468e40", [:mix], [], "hexpm", "761fc5be4b4c15d8ba91a6dafde0b2c2ae6db9da7b8832a55b5a1deb524da72b"},
   "libsecp256k1": {:hex, :libsecp256k1, "0.1.10", "d27495e2b9851c7765129b76c53b60f5e275bd6ff68292c50536bf6b8d091a4d", [:make, :mix], [{:mix_erlang_tasks, "0.1.0", [hex: :mix_erlang_tasks, repo: "hexpm", optional: false]}], "hexpm", "09ea06239938571124f7f5a27bc9ac45dfb1cfc2df40d46ee9b59c3d51366652"},

From 307a048a6b328d52caa4a01590bd435c5163086f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 7 Jul 2023 19:05:29 +0000
Subject: [PATCH 175/909] Bump ex_cldr_numbers from 2.31.1 to 2.31.2

Bumps [ex_cldr_numbers](https://github.com/elixir-cldr/cldr_numbers) from 2.31.1 to 2.31.2.
- [Release notes](https://github.com/elixir-cldr/cldr_numbers/releases)
- [Changelog](https://github.com/elixir-cldr/cldr_numbers/blob/main/CHANGELOG.md)
- [Commits](https://github.com/elixir-cldr/cldr_numbers/compare/v2.31.1...v2.31.2)

---
updated-dependencies:
- dependency-name: ex_cldr_numbers
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 mix.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/mix.lock b/mix.lock
index 76e36aba095f..b2cc9ed41507 100644
--- a/mix.lock
+++ b/mix.lock
@@ -35,7 +35,7 @@
   "decorator": {:hex, :decorator, "1.4.0", "a57ac32c823ea7e4e67f5af56412d12b33274661bb7640ec7fc882f8d23ac419", [:mix], [], "hexpm", "0a07cedd9083da875c7418dea95b78361197cf2bf3211d743f6f7ce39656597f"},
   "deep_merge": {:hex, :deep_merge, "1.0.0", "b4aa1a0d1acac393bdf38b2291af38cb1d4a52806cf7a4906f718e1feb5ee961", [:mix], [], "hexpm", "ce708e5f094b9cd4e8f2be4f00d2f4250c4095be93f8cd6d018c753894885430"},
   "dialyxir": {:hex, :dialyxir, "1.3.0", "fd1672f0922b7648ff9ce7b1b26fcf0ef56dda964a459892ad15f6b4410b5284", [:mix], [{:erlex, ">= 0.2.6", [hex: :erlex, repo: "hexpm", optional: false]}], "hexpm", "00b2a4bcd6aa8db9dcb0b38c1225b7277dca9bc370b6438715667071a304696f"},
-  "digital_token": {:hex, :digital_token, "0.4.0", "2ad6894d4a40be8b2890aad286ecd5745fa473fa5699d80361a8c94428edcd1f", [:mix], [{:cldr_utils, "~> 2.17", [hex: :cldr_utils, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: false]}], "hexpm", "a178edf61d1fee5bb3c34e14b0f4ee21809ee87cade8738f87337e59e5e66e26"},
+  "digital_token": {:hex, :digital_token, "0.5.0", "c9fc69b6fefa6adfbabd1cca3d81b1a6f1905c2b3b8c6b1d742bba250a5ec8d8", [:mix], [{:cldr_utils, "~> 2.17", [hex: :cldr_utils, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}], "hexpm", "1bf4fb8fb608dbc90a3c535945185688d55731452b08d5fe74860509daeb55ca"},
   "earmark_parser": {:hex, :earmark_parser, "1.4.32", "fa739a0ecfa34493de19426681b23f6814573faee95dfd4b4aafe15a7b5b32c6", [:mix], [], "hexpm", "b8b0dd77d60373e77a3d7e8afa598f325e49e8663a51bcc2b88ef41838cca755"},
   "ecto": {:hex, :ecto, "3.10.2", "6b887160281a61aa16843e47735b8a266caa437f80588c3ab80a8a960e6abe37", [:mix], [{:decimal, "~> 1.6 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}, {:telemetry, "~> 0.4 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "6a895778f0d7648a4b34b486af59a1c8009041fbdf2b17f1ac215eb829c60235"},
   "ecto_sql": {:hex, :ecto_sql, "3.10.1", "6ea6b3036a0b0ca94c2a02613fd9f742614b5cfe494c41af2e6571bb034dd94c", [:mix], [{:db_connection, "~> 2.5 or ~> 2.4.1", [hex: :db_connection, repo: "hexpm", optional: false]}, {:ecto, "~> 3.10.0", [hex: :ecto, repo: "hexpm", optional: false]}, {:myxql, "~> 0.6.0", [hex: :myxql, repo: "hexpm", optional: true]}, {:postgrex, "~> 0.16.0 or ~> 0.17.0 or ~> 1.0", [hex: :postgrex, repo: "hexpm", optional: true]}, {:tds, "~> 2.1.1 or ~> 2.2", [hex: :tds, repo: "hexpm", optional: true]}, {:telemetry, "~> 0.4.0 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "f6a25bdbbd695f12c8171eaff0851fa4c8e72eec1e98c7364402dda9ce11c56b"},
@@ -45,7 +45,7 @@
   "ex_cldr": {:hex, :ex_cldr, "2.37.2", "c45041534ec60af367c4c1af02a608576118044fe3c441c782fd424061d6b517", [:mix], [{:cldr_utils, "~> 2.21", [hex: :cldr_utils, repo: "hexpm", optional: false]}, {:decimal, "~> 1.6 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: false]}, {:gettext, "~> 0.19", [hex: :gettext, repo: "hexpm", optional: true]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}, {:nimble_parsec, "~> 0.5 or ~> 1.0", [hex: :nimble_parsec, repo: "hexpm", optional: true]}], "hexpm", "c8467b1d5080716ace6621703b6656cb2f9545572a54b341da900791a0cf92ba"},
   "ex_cldr_currencies": {:hex, :ex_cldr_currencies, "2.15.0", "aadd34e91cfac7ef6b03fe8f47f8c6fa8c5daf3f89b5d9fee64ec545ded839cf", [:mix], [{:ex_cldr, "~> 2.34", [hex: :ex_cldr, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}], "hexpm", "0521316396c66877a2d636219767560bb2397c583341fcb154ecf9f3000e6ff8"},
   "ex_cldr_lists": {:hex, :ex_cldr_lists, "2.10.0", "4d4c9877da2d0417fd832907d69974e8328969f75fafc79b05ccf85f549f6281", [:mix], [{:ex_cldr_numbers, "~> 2.25", [hex: :ex_cldr_numbers, repo: "hexpm", optional: false]}, {:ex_doc, "~> 0.18", [hex: :ex_doc, repo: "hexpm", optional: true]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}], "hexpm", "adc040cde7b97f7fd7c0b35dd69ddb6fcf607303ae6355bb1851deae1f8b0652"},
-  "ex_cldr_numbers": {:hex, :ex_cldr_numbers, "2.31.1", "ad3e8a33e8cb8d048173f2c89cf6fcec9f1694d99f890a75bc745894c3868d5b", [:mix], [{:decimal, "~> 1.6 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: false]}, {:digital_token, "~> 0.3 or ~> 1.0", [hex: :digital_token, repo: "hexpm", optional: false]}, {:ex_cldr, "~> 2.37", [hex: :ex_cldr, repo: "hexpm", optional: false]}, {:ex_cldr_currencies, ">= 2.14.2", [hex: :ex_cldr_currencies, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}], "hexpm", "a94c40f4bf60f0e69c34977f33caeda483677232699ab0a6a98025ea011fabcf"},
+  "ex_cldr_numbers": {:hex, :ex_cldr_numbers, "2.31.2", "e27a457d594aefd1981094178f95c2efbd0f69c4a0c649c5f4cf5c97e264f310", [:mix], [{:decimal, "~> 1.6 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: false]}, {:digital_token, "~> 0.3 or ~> 1.0", [hex: :digital_token, repo: "hexpm", optional: false]}, {:ex_cldr, "~> 2.37", [hex: :ex_cldr, repo: "hexpm", optional: false]}, {:ex_cldr_currencies, ">= 2.14.2", [hex: :ex_cldr_currencies, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}], "hexpm", "828c0f39df6cc64bb7c586d7d302321322bc65c5d1d5d6115f632c3711d218b7"},
   "ex_cldr_units": {:hex, :ex_cldr_units, "3.16.2", "dbad303fba819981c578234e2aaf19d72efca16ea8b1c6ee46b26232cb45e232", [:mix], [{:cldr_utils, "~> 2.24", [hex: :cldr_utils, repo: "hexpm", optional: false]}, {:decimal, "~> 1.6 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: false]}, {:ex_cldr_lists, "~> 2.10", [hex: :ex_cldr_lists, repo: "hexpm", optional: false]}, {:ex_cldr_numbers, "~> 2.31", [hex: :ex_cldr_numbers, repo: "hexpm", optional: false]}, {:ex_doc, "~> 0.18", [hex: :ex_doc, repo: "hexpm", optional: true]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}], "hexpm", "851095319fb3205c1549619da742cd53a2804c1d9c204cf84014021e2a6ea7e5"},
   "ex_doc": {:hex, :ex_doc, "0.29.4", "6257ecbb20c7396b1fe5accd55b7b0d23f44b6aa18017b415cb4c2b91d997729", [:mix], [{:earmark_parser, "~> 1.4.31", [hex: :earmark_parser, repo: "hexpm", optional: false]}, {:makeup_elixir, "~> 0.14", [hex: :makeup_elixir, repo: "hexpm", optional: false]}, {:makeup_erlang, "~> 0.1", [hex: :makeup_erlang, repo: "hexpm", optional: false]}], "hexpm", "2c6699a737ae46cb61e4ed012af931b57b699643b24dabe2400a8168414bc4f5"},
   "ex_json_schema": {:hex, :ex_json_schema, "0.9.3", "fc17c50d410fd99fa6e814e1aed60122d8ff2578b869d17a9db1ce1c621382b6", [:mix], [{:decimal, "~> 2.0", [hex: :decimal, repo: "hexpm", optional: false]}], "hexpm", "b79962d09cefd33001706255187bdb483a0c2b4442d5edc6822eb7574a8df0a8"},
@@ -70,7 +70,7 @@
   "httpoison": {:hex, :httpoison, "2.1.0", "655fd9a7b0b95ee3e9a3b535cf7ac8e08ef5229bab187fa86ac4208b122d934b", [:mix], [{:hackney, "~> 1.17", [hex: :hackney, repo: "hexpm", optional: false]}], "hexpm", "fc455cb4306b43827def4f57299b2d5ac8ac331cb23f517e734a4b78210a160c"},
   "idna": {:hex, :idna, "6.1.1", "8a63070e9f7d0c62eb9d9fcb360a7de382448200fbbd1b106cc96d3d8099df8d", [:rebar3], [{:unicode_util_compat, "~>0.7.0", [hex: :unicode_util_compat, repo: "hexpm", optional: false]}], "hexpm", "92376eb7894412ed19ac475e4a86f7b413c1b9fbb5bd16dccd57934157944cea"},
   "inflex": {:hex, :inflex, "2.1.0", "a365cf0821a9dacb65067abd95008ca1b0bb7dcdd85ae59965deef2aa062924c", [:mix], [], "hexpm", "14c17d05db4ee9b6d319b0bff1bdf22aa389a25398d1952c7a0b5f3d93162dd8"},
-  "jason": {:hex, :jason, "1.4.0", "e855647bc964a44e2f67df589ccf49105ae039d4179db7f6271dfd3843dc27e6", [:mix], [{:decimal, "~> 1.0 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: true]}], "hexpm", "79a3791085b2a0f743ca04cec0f7be26443738779d09302e01318f97bdb82121"},
+  "jason": {:hex, :jason, "1.4.1", "af1504e35f629ddcdd6addb3513c3853991f694921b1b9368b0bd32beb9f1b63", [:mix], [{:decimal, "~> 1.0 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: true]}], "hexpm", "fbb01ecdfd565b56261302f7e1fcc27c4fb8f32d56eab74db621fc154604a7a1"},
   "jsx": {:hex, :jsx, "2.8.3", "a05252d381885240744d955fbe3cf810504eb2567164824e19303ea59eef62cf", [:mix, :rebar3], [], "hexpm", "fc3499fed7a726995aa659143a248534adc754ebd16ccd437cd93b649a95091f"},
   "junit_formatter": {:hex, :junit_formatter, "3.3.1", "c729befb848f1b9571f317d2fefa648e9d4869befc4b2980daca7c1edc468e40", [:mix], [], "hexpm", "761fc5be4b4c15d8ba91a6dafde0b2c2ae6db9da7b8832a55b5a1deb524da72b"},
   "libsecp256k1": {:hex, :libsecp256k1, "0.1.10", "d27495e2b9851c7765129b76c53b60f5e275bd6ff68292c50536bf6b8d091a4d", [:make, :mix], [{:mix_erlang_tasks, "0.1.0", [hex: :mix_erlang_tasks, repo: "hexpm", optional: false]}], "hexpm", "09ea06239938571124f7f5a27bc9ac45dfb1cfc2df40d46ee9b59c3d51366652"},

From 4e2cda3286ca4a108f20ad74b20c38f5ca8bb008 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 7 Jul 2023 19:05:51 +0000
Subject: [PATCH 176/909] Bump jason from 1.4.0 to 1.4.1

Bumps [jason](https://github.com/michalmuskala/jason) from 1.4.0 to 1.4.1.
- [Release notes](https://github.com/michalmuskala/jason/releases)
- [Changelog](https://github.com/michalmuskala/jason/blob/master/CHANGELOG.md)
- [Commits](https://github.com/michalmuskala/jason/compare/v1.4.0...v1.4.1)

---
updated-dependencies:
- dependency-name: jason
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 mix.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mix.lock b/mix.lock
index 76e36aba095f..08f98ceffcc7 100644
--- a/mix.lock
+++ b/mix.lock
@@ -70,7 +70,7 @@
   "httpoison": {:hex, :httpoison, "2.1.0", "655fd9a7b0b95ee3e9a3b535cf7ac8e08ef5229bab187fa86ac4208b122d934b", [:mix], [{:hackney, "~> 1.17", [hex: :hackney, repo: "hexpm", optional: false]}], "hexpm", "fc455cb4306b43827def4f57299b2d5ac8ac331cb23f517e734a4b78210a160c"},
   "idna": {:hex, :idna, "6.1.1", "8a63070e9f7d0c62eb9d9fcb360a7de382448200fbbd1b106cc96d3d8099df8d", [:rebar3], [{:unicode_util_compat, "~>0.7.0", [hex: :unicode_util_compat, repo: "hexpm", optional: false]}], "hexpm", "92376eb7894412ed19ac475e4a86f7b413c1b9fbb5bd16dccd57934157944cea"},
   "inflex": {:hex, :inflex, "2.1.0", "a365cf0821a9dacb65067abd95008ca1b0bb7dcdd85ae59965deef2aa062924c", [:mix], [], "hexpm", "14c17d05db4ee9b6d319b0bff1bdf22aa389a25398d1952c7a0b5f3d93162dd8"},
-  "jason": {:hex, :jason, "1.4.0", "e855647bc964a44e2f67df589ccf49105ae039d4179db7f6271dfd3843dc27e6", [:mix], [{:decimal, "~> 1.0 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: true]}], "hexpm", "79a3791085b2a0f743ca04cec0f7be26443738779d09302e01318f97bdb82121"},
+  "jason": {:hex, :jason, "1.4.1", "af1504e35f629ddcdd6addb3513c3853991f694921b1b9368b0bd32beb9f1b63", [:mix], [{:decimal, "~> 1.0 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: true]}], "hexpm", "fbb01ecdfd565b56261302f7e1fcc27c4fb8f32d56eab74db621fc154604a7a1"},
   "jsx": {:hex, :jsx, "2.8.3", "a05252d381885240744d955fbe3cf810504eb2567164824e19303ea59eef62cf", [:mix, :rebar3], [], "hexpm", "fc3499fed7a726995aa659143a248534adc754ebd16ccd437cd93b649a95091f"},
   "junit_formatter": {:hex, :junit_formatter, "3.3.1", "c729befb848f1b9571f317d2fefa648e9d4869befc4b2980daca7c1edc468e40", [:mix], [], "hexpm", "761fc5be4b4c15d8ba91a6dafde0b2c2ae6db9da7b8832a55b5a1deb524da72b"},
   "libsecp256k1": {:hex, :libsecp256k1, "0.1.10", "d27495e2b9851c7765129b76c53b60f5e275bd6ff68292c50536bf6b8d091a4d", [:make, :mix], [{:mix_erlang_tasks, "0.1.0", [hex: :mix_erlang_tasks, repo: "hexpm", optional: false]}], "hexpm", "09ea06239938571124f7f5a27bc9ac45dfb1cfc2df40d46ee9b59c3d51366652"},

From dcbedc6963a81836363321fa0c8a15c9f97f1137 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 7 Jul 2023 19:06:35 +0000
Subject: [PATCH 177/909] Bump ecto from 3.10.2 to 3.10.3

Bumps [ecto](https://github.com/elixir-ecto/ecto) from 3.10.2 to 3.10.3.
- [Release notes](https://github.com/elixir-ecto/ecto/releases)
- [Changelog](https://github.com/elixir-ecto/ecto/blob/master/CHANGELOG.md)
- [Commits](https://github.com/elixir-ecto/ecto/compare/v3.10.2...v3.10.3)

---
updated-dependencies:
- dependency-name: ecto
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 mix.lock | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/mix.lock b/mix.lock
index 76e36aba095f..e133252b6aa4 100644
--- a/mix.lock
+++ b/mix.lock
@@ -37,7 +37,7 @@
   "dialyxir": {:hex, :dialyxir, "1.3.0", "fd1672f0922b7648ff9ce7b1b26fcf0ef56dda964a459892ad15f6b4410b5284", [:mix], [{:erlex, ">= 0.2.6", [hex: :erlex, repo: "hexpm", optional: false]}], "hexpm", "00b2a4bcd6aa8db9dcb0b38c1225b7277dca9bc370b6438715667071a304696f"},
   "digital_token": {:hex, :digital_token, "0.4.0", "2ad6894d4a40be8b2890aad286ecd5745fa473fa5699d80361a8c94428edcd1f", [:mix], [{:cldr_utils, "~> 2.17", [hex: :cldr_utils, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: false]}], "hexpm", "a178edf61d1fee5bb3c34e14b0f4ee21809ee87cade8738f87337e59e5e66e26"},
   "earmark_parser": {:hex, :earmark_parser, "1.4.32", "fa739a0ecfa34493de19426681b23f6814573faee95dfd4b4aafe15a7b5b32c6", [:mix], [], "hexpm", "b8b0dd77d60373e77a3d7e8afa598f325e49e8663a51bcc2b88ef41838cca755"},
-  "ecto": {:hex, :ecto, "3.10.2", "6b887160281a61aa16843e47735b8a266caa437f80588c3ab80a8a960e6abe37", [:mix], [{:decimal, "~> 1.6 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}, {:telemetry, "~> 0.4 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "6a895778f0d7648a4b34b486af59a1c8009041fbdf2b17f1ac215eb829c60235"},
+  "ecto": {:hex, :ecto, "3.10.3", "eb2ae2eecd210b4eb8bece1217b297ad4ff824b4384c0e3fdd28aaf96edd6135", [:mix], [{:decimal, "~> 1.6 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}, {:telemetry, "~> 0.4 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "44bec74e2364d491d70f7e42cd0d690922659d329f6465e89feb8a34e8cd3433"},
   "ecto_sql": {:hex, :ecto_sql, "3.10.1", "6ea6b3036a0b0ca94c2a02613fd9f742614b5cfe494c41af2e6571bb034dd94c", [:mix], [{:db_connection, "~> 2.5 or ~> 2.4.1", [hex: :db_connection, repo: "hexpm", optional: false]}, {:ecto, "~> 3.10.0", [hex: :ecto, repo: "hexpm", optional: false]}, {:myxql, "~> 0.6.0", [hex: :myxql, repo: "hexpm", optional: true]}, {:postgrex, "~> 0.16.0 or ~> 0.17.0 or ~> 1.0", [hex: :postgrex, repo: "hexpm", optional: true]}, {:tds, "~> 2.1.1 or ~> 2.2", [hex: :tds, repo: "hexpm", optional: true]}, {:telemetry, "~> 0.4.0 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "f6a25bdbbd695f12c8171eaff0851fa4c8e72eec1e98c7364402dda9ce11c56b"},
   "elixir_make": {:hex, :elixir_make, "0.6.3", "bc07d53221216838d79e03a8019d0839786703129599e9619f4ab74c8c096eac", [:mix], [], "hexpm", "f5cbd651c5678bcaabdbb7857658ee106b12509cd976c2c2fca99688e1daf716"},
   "erlex": {:hex, :erlex, "0.2.6", "c7987d15e899c7a2f34f5420d2a2ea0d659682c06ac607572df55a43753aa12e", [:mix], [], "hexpm", "2ed2e25711feb44d52b17d2780eabf998452f6efda104877a3881c2f8c0c0c75"},
@@ -70,7 +70,7 @@
   "httpoison": {:hex, :httpoison, "2.1.0", "655fd9a7b0b95ee3e9a3b535cf7ac8e08ef5229bab187fa86ac4208b122d934b", [:mix], [{:hackney, "~> 1.17", [hex: :hackney, repo: "hexpm", optional: false]}], "hexpm", "fc455cb4306b43827def4f57299b2d5ac8ac331cb23f517e734a4b78210a160c"},
   "idna": {:hex, :idna, "6.1.1", "8a63070e9f7d0c62eb9d9fcb360a7de382448200fbbd1b106cc96d3d8099df8d", [:rebar3], [{:unicode_util_compat, "~>0.7.0", [hex: :unicode_util_compat, repo: "hexpm", optional: false]}], "hexpm", "92376eb7894412ed19ac475e4a86f7b413c1b9fbb5bd16dccd57934157944cea"},
   "inflex": {:hex, :inflex, "2.1.0", "a365cf0821a9dacb65067abd95008ca1b0bb7dcdd85ae59965deef2aa062924c", [:mix], [], "hexpm", "14c17d05db4ee9b6d319b0bff1bdf22aa389a25398d1952c7a0b5f3d93162dd8"},
-  "jason": {:hex, :jason, "1.4.0", "e855647bc964a44e2f67df589ccf49105ae039d4179db7f6271dfd3843dc27e6", [:mix], [{:decimal, "~> 1.0 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: true]}], "hexpm", "79a3791085b2a0f743ca04cec0f7be26443738779d09302e01318f97bdb82121"},
+  "jason": {:hex, :jason, "1.4.1", "af1504e35f629ddcdd6addb3513c3853991f694921b1b9368b0bd32beb9f1b63", [:mix], [{:decimal, "~> 1.0 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: true]}], "hexpm", "fbb01ecdfd565b56261302f7e1fcc27c4fb8f32d56eab74db621fc154604a7a1"},
   "jsx": {:hex, :jsx, "2.8.3", "a05252d381885240744d955fbe3cf810504eb2567164824e19303ea59eef62cf", [:mix, :rebar3], [], "hexpm", "fc3499fed7a726995aa659143a248534adc754ebd16ccd437cd93b649a95091f"},
   "junit_formatter": {:hex, :junit_formatter, "3.3.1", "c729befb848f1b9571f317d2fefa648e9d4869befc4b2980daca7c1edc468e40", [:mix], [], "hexpm", "761fc5be4b4c15d8ba91a6dafde0b2c2ae6db9da7b8832a55b5a1deb524da72b"},
   "libsecp256k1": {:hex, :libsecp256k1, "0.1.10", "d27495e2b9851c7765129b76c53b60f5e275bd6ff68292c50536bf6b8d091a4d", [:make, :mix], [{:mix_erlang_tasks, "0.1.0", [hex: :mix_erlang_tasks, repo: "hexpm", optional: false]}], "hexpm", "09ea06239938571124f7f5a27bc9ac45dfb1cfc2df40d46ee9b59c3d51366652"},

From ced48eef935814b570cd4d23d48ffaa379107dbe Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 8 Jul 2023 07:31:10 +0000
Subject: [PATCH 178/909] Bump ex_doc from 0.29.4 to 0.30.1

Bumps [ex_doc](https://github.com/elixir-lang/ex_doc) from 0.29.4 to 0.30.1.
- [Changelog](https://github.com/elixir-lang/ex_doc/blob/main/CHANGELOG.md)
- [Commits](https://github.com/elixir-lang/ex_doc/compare/v0.29.4...v0.30.1)

---
updated-dependencies:
- dependency-name: ex_doc
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 mix.exs  | 2 +-
 mix.lock | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/mix.exs b/mix.exs
index f7eb85c3aefc..6df2936fd1ce 100644
--- a/mix.exs
+++ b/mix.exs
@@ -96,7 +96,7 @@ defmodule BlockScout.Mixfile do
       {:absinthe_plug, git: "https://github.com/blockscout/absinthe_plug.git", tag: "1.5.3", override: true},
       {:tesla, "~> 1.7.0"},
       # Documentation
-      {:ex_doc, "~> 0.29.0", only: :dev, runtime: false},
+      {:ex_doc, "~> 0.30.1", only: :dev, runtime: false},
       {:number, "~> 1.0.3"}
     ]
   end
diff --git a/mix.lock b/mix.lock
index 4be76591081f..00ea55b03ef2 100644
--- a/mix.lock
+++ b/mix.lock
@@ -36,7 +36,7 @@
   "deep_merge": {:hex, :deep_merge, "1.0.0", "b4aa1a0d1acac393bdf38b2291af38cb1d4a52806cf7a4906f718e1feb5ee961", [:mix], [], "hexpm", "ce708e5f094b9cd4e8f2be4f00d2f4250c4095be93f8cd6d018c753894885430"},
   "dialyxir": {:hex, :dialyxir, "1.3.0", "fd1672f0922b7648ff9ce7b1b26fcf0ef56dda964a459892ad15f6b4410b5284", [:mix], [{:erlex, ">= 0.2.6", [hex: :erlex, repo: "hexpm", optional: false]}], "hexpm", "00b2a4bcd6aa8db9dcb0b38c1225b7277dca9bc370b6438715667071a304696f"},
   "digital_token": {:hex, :digital_token, "0.5.0", "c9fc69b6fefa6adfbabd1cca3d81b1a6f1905c2b3b8c6b1d742bba250a5ec8d8", [:mix], [{:cldr_utils, "~> 2.17", [hex: :cldr_utils, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}], "hexpm", "1bf4fb8fb608dbc90a3c535945185688d55731452b08d5fe74860509daeb55ca"},
-  "earmark_parser": {:hex, :earmark_parser, "1.4.32", "fa739a0ecfa34493de19426681b23f6814573faee95dfd4b4aafe15a7b5b32c6", [:mix], [], "hexpm", "b8b0dd77d60373e77a3d7e8afa598f325e49e8663a51bcc2b88ef41838cca755"},
+  "earmark_parser": {:hex, :earmark_parser, "1.4.33", "3c3fd9673bb5dcc9edc28dd90f50c87ce506d1f71b70e3de69aa8154bc695d44", [:mix], [], "hexpm", "2d526833729b59b9fdb85785078697c72ac5e5066350663e5be6a1182da61b8f"},
   "ecto": {:hex, :ecto, "3.10.3", "eb2ae2eecd210b4eb8bece1217b297ad4ff824b4384c0e3fdd28aaf96edd6135", [:mix], [{:decimal, "~> 1.6 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}, {:telemetry, "~> 0.4 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "44bec74e2364d491d70f7e42cd0d690922659d329f6465e89feb8a34e8cd3433"},
   "ecto_sql": {:hex, :ecto_sql, "3.10.1", "6ea6b3036a0b0ca94c2a02613fd9f742614b5cfe494c41af2e6571bb034dd94c", [:mix], [{:db_connection, "~> 2.5 or ~> 2.4.1", [hex: :db_connection, repo: "hexpm", optional: false]}, {:ecto, "~> 3.10.0", [hex: :ecto, repo: "hexpm", optional: false]}, {:myxql, "~> 0.6.0", [hex: :myxql, repo: "hexpm", optional: true]}, {:postgrex, "~> 0.16.0 or ~> 0.17.0 or ~> 1.0", [hex: :postgrex, repo: "hexpm", optional: true]}, {:tds, "~> 2.1.1 or ~> 2.2", [hex: :tds, repo: "hexpm", optional: true]}, {:telemetry, "~> 0.4.0 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "f6a25bdbbd695f12c8171eaff0851fa4c8e72eec1e98c7364402dda9ce11c56b"},
   "elixir_make": {:hex, :elixir_make, "0.6.3", "bc07d53221216838d79e03a8019d0839786703129599e9619f4ab74c8c096eac", [:mix], [], "hexpm", "f5cbd651c5678bcaabdbb7857658ee106b12509cd976c2c2fca99688e1daf716"},
@@ -47,7 +47,7 @@
   "ex_cldr_lists": {:hex, :ex_cldr_lists, "2.10.0", "4d4c9877da2d0417fd832907d69974e8328969f75fafc79b05ccf85f549f6281", [:mix], [{:ex_cldr_numbers, "~> 2.25", [hex: :ex_cldr_numbers, repo: "hexpm", optional: false]}, {:ex_doc, "~> 0.18", [hex: :ex_doc, repo: "hexpm", optional: true]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}], "hexpm", "adc040cde7b97f7fd7c0b35dd69ddb6fcf607303ae6355bb1851deae1f8b0652"},
   "ex_cldr_numbers": {:hex, :ex_cldr_numbers, "2.31.2", "e27a457d594aefd1981094178f95c2efbd0f69c4a0c649c5f4cf5c97e264f310", [:mix], [{:decimal, "~> 1.6 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: false]}, {:digital_token, "~> 0.3 or ~> 1.0", [hex: :digital_token, repo: "hexpm", optional: false]}, {:ex_cldr, "~> 2.37", [hex: :ex_cldr, repo: "hexpm", optional: false]}, {:ex_cldr_currencies, ">= 2.14.2", [hex: :ex_cldr_currencies, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}], "hexpm", "828c0f39df6cc64bb7c586d7d302321322bc65c5d1d5d6115f632c3711d218b7"},
   "ex_cldr_units": {:hex, :ex_cldr_units, "3.16.2", "dbad303fba819981c578234e2aaf19d72efca16ea8b1c6ee46b26232cb45e232", [:mix], [{:cldr_utils, "~> 2.24", [hex: :cldr_utils, repo: "hexpm", optional: false]}, {:decimal, "~> 1.6 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: false]}, {:ex_cldr_lists, "~> 2.10", [hex: :ex_cldr_lists, repo: "hexpm", optional: false]}, {:ex_cldr_numbers, "~> 2.31", [hex: :ex_cldr_numbers, repo: "hexpm", optional: false]}, {:ex_doc, "~> 0.18", [hex: :ex_doc, repo: "hexpm", optional: true]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}], "hexpm", "851095319fb3205c1549619da742cd53a2804c1d9c204cf84014021e2a6ea7e5"},
-  "ex_doc": {:hex, :ex_doc, "0.29.4", "6257ecbb20c7396b1fe5accd55b7b0d23f44b6aa18017b415cb4c2b91d997729", [:mix], [{:earmark_parser, "~> 1.4.31", [hex: :earmark_parser, repo: "hexpm", optional: false]}, {:makeup_elixir, "~> 0.14", [hex: :makeup_elixir, repo: "hexpm", optional: false]}, {:makeup_erlang, "~> 0.1", [hex: :makeup_erlang, repo: "hexpm", optional: false]}], "hexpm", "2c6699a737ae46cb61e4ed012af931b57b699643b24dabe2400a8168414bc4f5"},
+  "ex_doc": {:hex, :ex_doc, "0.30.1", "a0f3b598d3c2cb3af48af39e59fa66ac8d4033740409b11dd753a3f30f8f8f7a", [:mix], [{:earmark_parser, "~> 1.4.31", [hex: :earmark_parser, repo: "hexpm", optional: false]}, {:makeup_elixir, "~> 0.14", [hex: :makeup_elixir, repo: "hexpm", optional: false]}, {:makeup_erlang, "~> 0.1", [hex: :makeup_erlang, repo: "hexpm", optional: false]}], "hexpm", "2e2216e84aa33e5803f8898d762b0f5e76bf2de3a08d1f40ac5f74456dd5057c"},
   "ex_json_schema": {:hex, :ex_json_schema, "0.9.3", "fc17c50d410fd99fa6e814e1aed60122d8ff2578b869d17a9db1ce1c621382b6", [:mix], [{:decimal, "~> 2.0", [hex: :decimal, repo: "hexpm", optional: false]}], "hexpm", "b79962d09cefd33001706255187bdb483a0c2b4442d5edc6822eb7574a8df0a8"},
   "ex_keccak": {:hex, :ex_keccak, "0.7.1", "0169f4b0c5073c5df61581d6282b12f1a1b764dcfcda4eeb1c819b5194c9ced0", [:mix], [{:rustler, ">= 0.0.0", [hex: :rustler, repo: "hexpm", optional: true]}, {:rustler_precompiled, "~> 0.6.1", [hex: :rustler_precompiled, repo: "hexpm", optional: false]}], "hexpm", "c18c19f66b6545b4b46b0c71c0cc0079de84e30b26365a92961e91697e8724ed"},
   "ex_machina": {:hex, :ex_machina, "2.7.0", "b792cc3127fd0680fecdb6299235b4727a4944a09ff0fa904cc639272cd92dc7", [:mix], [{:ecto, "~> 2.2 or ~> 3.0", [hex: :ecto, repo: "hexpm", optional: true]}, {:ecto_sql, "~> 3.0", [hex: :ecto_sql, repo: "hexpm", optional: true]}], "hexpm", "419aa7a39bde11894c87a615c4ecaa52d8f107bbdd81d810465186f783245bf8"},
@@ -77,7 +77,7 @@
   "logger_file_backend": {:hex, :logger_file_backend, "0.0.13", "df07b14970e9ac1f57362985d76e6f24e3e1ab05c248055b7d223976881977c2", [:mix], [], "hexpm", "71a453a7e6e899ae4549fb147b1c6621f4233f8f48f58ca10a64ec67b6c50018"},
   "makeup": {:hex, :makeup, "1.1.0", "6b67c8bc2882a6b6a445859952a602afc1a41c2e08379ca057c0f525366fc3ca", [:mix], [{:nimble_parsec, "~> 1.2.2 or ~> 1.3", [hex: :nimble_parsec, repo: "hexpm", optional: false]}], "hexpm", "0a45ed501f4a8897f580eabf99a2e5234ea3e75a4373c8a52824f6e873be57a6"},
   "makeup_elixir": {:hex, :makeup_elixir, "0.16.1", "cc9e3ca312f1cfeccc572b37a09980287e243648108384b97ff2b76e505c3555", [:mix], [{:makeup, "~> 1.0", [hex: :makeup, repo: "hexpm", optional: false]}, {:nimble_parsec, "~> 1.2.3 or ~> 1.3", [hex: :nimble_parsec, repo: "hexpm", optional: false]}], "hexpm", "e127a341ad1b209bd80f7bd1620a15693a9908ed780c3b763bccf7d200c767c6"},
-  "makeup_erlang": {:hex, :makeup_erlang, "0.1.1", "3fcb7f09eb9d98dc4d208f49cc955a34218fc41ff6b84df7c75b3e6e533cc65f", [:mix], [{:makeup, "~> 1.0", [hex: :makeup, repo: "hexpm", optional: false]}], "hexpm", "174d0809e98a4ef0b3309256cbf97101c6ec01c4ab0b23e926a9e17df2077cbb"},
+  "makeup_erlang": {:hex, :makeup_erlang, "0.1.2", "ad87296a092a46e03b7e9b0be7631ddcf64c790fa68a9ef5323b6cbb36affc72", [:mix], [{:makeup, "~> 1.0", [hex: :makeup, repo: "hexpm", optional: false]}], "hexpm", "f3f5a1ca93ce6e092d92b6d9c049bcda58a3b617a8d888f8e7231c85630e8108"},
   "math": {:hex, :math, "0.7.0", "12af548c3892abf939a2e242216c3e7cbfb65b9b2fe0d872d05c6fb609f8127b", [:mix], [], "hexpm", "7987af97a0c6b58ad9db43eb5252a49fc1dfe1f6d98f17da9282e297f594ebc2"},
   "meck": {:hex, :meck, "0.9.2", "85ccbab053f1db86c7ca240e9fc718170ee5bda03810a6292b5306bf31bae5f5", [:rebar3], [], "hexpm", "81344f561357dc40a8344afa53767c32669153355b626ea9fcbc8da6b3045826"},
   "memento": {:hex, :memento, "0.3.2", "38cfc8ff9bcb1adff7cbd0f3b78a762636b86dff764729d1c82d0464c539bdd0", [:mix], [], "hexpm", "25cf691a98a0cb70262f4a7543c04bab24648cb2041d937eb64154a8d6f8012b"},

From 097b188a2ab49dbf24ace486b5f7f6673ab70a57 Mon Sep 17 00:00:00 2001
From: Nikita Pozdniakov <nikitosing4@mail.ru>
Date: Fri, 7 Jul 2023 14:08:47 +0300
Subject: [PATCH 179/909] Fix twin compiler version

---
 CHANGELOG.md                                              | 2 ++
 apps/block_scout_web/assets/js/pages/verification_form.js | 4 +---
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e6dc690e2878..2c8fd6cf9278 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,7 +9,9 @@
 - [#7811](https://github.com/blockscout/blockscout/pull/7811) - Filter addresses before insertion
 
 ### Fixes
+
 - [#7872](https://github.com/blockscout/blockscout/pull/7872) - Fix pending gas price in pending tx
+- [#7875](https://github.com/blockscout/blockscout/pull/7875) - Fix twin compiler version
 - [#7825](https://github.com/blockscout/blockscout/pull/7825) - Fix nginx config for the new frontend websockets
 - [#7772](https://github.com/blockscout/blockscout/pull/7772) - Fix parsing of database password period(s)
 - [#7803](https://github.com/blockscout/blockscout/pull/7803) - Fix additional sources and interfaces, save names for vyper contracts
diff --git a/apps/block_scout_web/assets/js/pages/verification_form.js b/apps/block_scout_web/assets/js/pages/verification_form.js
index ff3db1b9e241..0b546bf3eee2 100644
--- a/apps/block_scout_web/assets/js/pages/verification_form.js
+++ b/apps/block_scout_web/assets/js/pages/verification_form.js
@@ -127,9 +127,7 @@ if ($contractVerificationPage.length) {
   $(function () {
     initializeDropzone()
 
-    setTimeout(function () {
-      $('.nightly-builds-false').trigger('click')
-    }, 10)
+    filterNightlyBuilds(true, false)
 
     $('body').on('click', '.js-btn-add-contract-libraries', function () {
       $('.js-smart-contract-libraries-wrapper').show()

From 25f50471e2ccbfaaadf487fc60bc028100b2a123 Mon Sep 17 00:00:00 2001
From: Nikita Pozdniakov <nikitosing4@mail.ru>
Date: Wed, 5 Jul 2023 12:58:49 +0300
Subject: [PATCH 180/909] Token balances refactoring: put token to preloads;
 fix pagination bugs

---
 .../lib/block_scout_web/chain.ex              | 23 ++++++++++------
 .../controllers/address_token_controller.ex   |  8 +++---
 .../controllers/api/v2/address_controller.ex  |  4 ++-
 .../templates/address_token/_tokens.html.eex  |  2 +-
 .../_token_balances.html.eex                  |  6 ++---
 .../address_token_balance/_tokens.html.eex    | 26 +++++++++----------
 .../views/address_token_balance_view.ex       |  2 +-
 .../views/api/v2/address_view.ex              |  6 ++---
 apps/explorer/lib/explorer/chain.ex           | 18 +------------
 .../chain/address/current_token_balance.ex    | 13 +++++++---
 .../counters/address_tokens_usd_sum.ex        |  6 ++---
 .../fetcher/token_balance_on_demand.ex        | 11 ++++----
 12 files changed, 62 insertions(+), 63 deletions(-)

diff --git a/apps/block_scout_web/lib/block_scout_web/chain.ex b/apps/block_scout_web/lib/block_scout_web/chain.ex
index 3d7414b067ab..d97adb0564ee 100644
--- a/apps/block_scout_web/lib/block_scout_web/chain.ex
+++ b/apps/block_scout_web/lib/block_scout_web/chain.ex
@@ -5,7 +5,7 @@ defmodule BlockScoutWeb.Chain do
 
   import Explorer.Chain,
     only: [
-      balance_in_fiat: 2,
+      balance_in_fiat: 1,
       find_or_insert_address_from_hash: 1,
       hash_to_block: 1,
       hash_to_transaction: 1,
@@ -100,10 +100,17 @@ defmodule BlockScoutWeb.Chain do
     end
   end
 
-  def next_page_params([], _list, _params), do: nil
+  def next_page_params(next_page, list, params, is_ctb_with_fiat_value \\ false)
 
-  def next_page_params(_, list, params) do
-    next_page_params = Map.merge(params, paging_params(List.last(list)))
+  def next_page_params([], _list, _params, _), do: nil
+
+  def next_page_params(_, list, params, is_ctb_with_fiat_value) do
+    paging_params =
+      if is_ctb_with_fiat_value,
+        do: paging_params_with_fiat_value(List.last(list)),
+        else: paging_params(List.last(list))
+
+    next_page_params = Map.merge(params, paging_params)
     current_items_count_str = Map.get(next_page_params, "items_count")
 
     items_count =
@@ -451,10 +458,6 @@ defmodule BlockScoutWeb.Chain do
     %{"address_hash" => to_string(address_hash), "value" => Decimal.to_integer(value)}
   end
 
-  defp paging_params({%CurrentTokenBalance{id: id, value: value} = ctb, token}) do
-    %{"fiat_value" => balance_in_fiat(ctb, token), "value" => value, "id" => id}
-  end
-
   defp paging_params(%CoinBalance{block_number: block_number}) do
     %{"block_number" => block_number}
   end
@@ -498,6 +501,10 @@ defmodule BlockScoutWeb.Chain do
     %{"state_changes" => nil}
   end
 
+  defp paging_params_with_fiat_value(%CurrentTokenBalance{id: id, value: value} = ctb) do
+    %{"fiat_value" => balance_in_fiat(ctb), "value" => value, "id" => id}
+  end
+
   defp block_or_transaction_from_param(param) do
     with {:error, :not_found} <- transaction_from_param(param) do
       hash_string_to_block(param)
diff --git a/apps/block_scout_web/lib/block_scout_web/controllers/address_token_controller.ex b/apps/block_scout_web/lib/block_scout_web/controllers/address_token_controller.ex
index 8762432af79a..3fa058758e6d 100644
--- a/apps/block_scout_web/lib/block_scout_web/controllers/address_token_controller.ex
+++ b/apps/block_scout_web/lib/block_scout_web/controllers/address_token_controller.ex
@@ -1,7 +1,7 @@
 defmodule BlockScoutWeb.AddressTokenController do
   use BlockScoutWeb, :controller
 
-  import BlockScoutWeb.Chain, only: [next_page_params: 3, paging_options: 1, split_list_by_page: 1]
+  import BlockScoutWeb.Chain, only: [next_page_params: 4, paging_options: 1, split_list_by_page: 1]
   import BlockScoutWeb.Account.AuthController, only: [current_user: 1]
   import BlockScoutWeb.Models.GetAddressTags, only: [get_address_tags: 2]
 
@@ -22,7 +22,7 @@ defmodule BlockScoutWeb.AddressTokenController do
       {tokens, next_page} = split_list_by_page(token_balances_plus_one)
 
       next_page_path =
-        case next_page_params(next_page, tokens, params) do
+        case next_page_params(next_page, tokens, params, true) do
           nil ->
             nil
 
@@ -32,12 +32,12 @@ defmodule BlockScoutWeb.AddressTokenController do
 
       items =
         tokens
-        |> Enum.map(fn {token_balance, token} ->
+        |> Enum.map(fn token_balance ->
           View.render_to_string(
             AddressTokenView,
             "_tokens.html",
             token_balance: token_balance,
-            token: token,
+            token: token_balance.token,
             address: address,
             conn: conn
           )
diff --git a/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/address_controller.ex b/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/address_controller.ex
index a2695b155e13..c507b140c375 100644
--- a/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/address_controller.ex
+++ b/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/address_controller.ex
@@ -4,6 +4,7 @@ defmodule BlockScoutWeb.API.V2.AddressController do
   import BlockScoutWeb.Chain,
     only: [
       next_page_params: 3,
+      next_page_params: 4,
       token_transfers_next_page_params: 3,
       paging_options: 1,
       split_list_by_page: 1,
@@ -365,7 +366,8 @@ defmodule BlockScoutWeb.API.V2.AddressController do
 
       {tokens, next_page} = split_list_by_page(results_plus_one)
 
-      next_page_params = next_page |> next_page_params(tokens, params) |> delete_parameters_from_next_page_params()
+      next_page_params =
+        next_page |> next_page_params(tokens, params, true) |> delete_parameters_from_next_page_params()
 
       conn
       |> put_status(200)
diff --git a/apps/block_scout_web/lib/block_scout_web/templates/address_token/_tokens.html.eex b/apps/block_scout_web/lib/block_scout_web/templates/address_token/_tokens.html.eex
index 189c6cf0614e..bb5ac9df2210 100644
--- a/apps/block_scout_web/lib/block_scout_web/templates/address_token/_tokens.html.eex
+++ b/apps/block_scout_web/lib/block_scout_web/templates/address_token/_tokens.html.eex
@@ -40,7 +40,7 @@
   <td class="stakes-td">
     <%= if token_price && @token.decimals do %>
       <p class="mb-0 col-md-6 text-right">
-        <span data-selector="token-balance-usd" data-usd-value="<%= Chain.balance_in_fiat(@token_balance, @token) %>"><%= ChainView.format_usd_value(Chain.balance_in_fiat(@token_balance, @token)) %></span>
+        <span data-selector="token-balance-usd" data-usd-value="<%= Chain.balance_in_fiat(@token_balance) %>"><%= ChainView.format_usd_value(Chain.balance_in_fiat(@token_balance)) %></span>
       </p>
     <% end %>
   </td>
diff --git a/apps/block_scout_web/lib/block_scout_web/templates/address_token_balance/_token_balances.html.eex b/apps/block_scout_web/lib/block_scout_web/templates/address_token_balance/_token_balances.html.eex
index 65b636fbcc1f..807b11b99609 100644
--- a/apps/block_scout_web/lib/block_scout_web/templates/address_token_balance/_token_balances.html.eex
+++ b/apps/block_scout_web/lib/block_scout_web/templates/address_token_balance/_token_balances.html.eex
@@ -47,7 +47,7 @@
               placeholder: gettext("Search tokens")
             ) %>
       </div>
-      <%= if Enum.any?(@token_balances, fn {_token_balance, token} -> token.type == "ERC-721" end) do %>
+      <%= if Enum.any?(@token_balances, fn token_balance -> token_balance.token.type == "ERC-721" end) do %>
         <%= render(
               "_tokens.html",
               conn: @conn,
@@ -56,7 +56,7 @@
             ) %>
       <% end %>
 
-      <%= if Enum.any?(@token_balances, fn {_token_balance, token} -> token.type == "ERC-1155" end) do %>
+      <%= if Enum.any?(@token_balances, fn token_balance -> token_balance.token.type == "ERC-1155" end) do %>
         <%= render(
               "_tokens.html",
               conn: @conn,
@@ -65,7 +65,7 @@
             ) %>
       <% end %>
 
-      <%= if Enum.any?(@token_balances, fn {_token_balance, token} -> token.type == "ERC-20" end) do %>
+      <%= if Enum.any?(@token_balances, fn token_balance -> token_balance.token.type == "ERC-20" end) do %>
         <%= render(
               "_tokens.html",
               conn: @conn,
diff --git a/apps/block_scout_web/lib/block_scout_web/templates/address_token_balance/_tokens.html.eex b/apps/block_scout_web/lib/block_scout_web/templates/address_token_balance/_tokens.html.eex
index 65d4d12c3690..1350b792df96 100644
--- a/apps/block_scout_web/lib/block_scout_web/templates/address_token_balance/_tokens.html.eex
+++ b/apps/block_scout_web/lib/block_scout_web/templates/address_token_balance/_tokens.html.eex
@@ -3,17 +3,17 @@
     <%= @type %> (<span data-number-of-tokens-by-type="<%= @type %>"><%= Enum.count(@token_balances)%></span>)
   </h6>
 
-  <%= for {token_balance, token} <- @token_balances do %>
+  <%= for token_balance <- @token_balances do %>
     <div
       class="border-bottom"
       data-dropdown-token-balance-test
-      data-token-name="<%= token_name(token) %>"
-      data-token-symbol="<%= token_symbol(token) %>"
+      data-token-name="<%= token_name(token_balance.token) %>"
+      data-token-symbol="<%= token_symbol(token_balance.token) %>"
     >
       <% path = cond do
-          token_balance.token_type == "ERC-721" && !is_nil(token_balance.token_id) -> token_instance_path(@conn, :show, token.contract_address_hash, to_string(token_balance.token_id))
-          token_balance.token_type == "ERC-1155" && !is_nil(token_balance.token_id) -> token_instance_path(@conn, :show, token.contract_address_hash, to_string(token_balance.token_id))
-          true -> token_path(@conn, :show, to_string(token.contract_address_hash))
+          token_balance.token_type == "ERC-721" && !is_nil(token_balance.token_id) -> token_instance_path(@conn, :show, token_balance.token.contract_address_hash, to_string(token_balance.token_id))
+          token_balance.token_type == "ERC-1155" && !is_nil(token_balance.token_id) -> token_instance_path(@conn, :show, token_balance.token.contract_address_hash, to_string(token_balance.token_id))
+          true -> token_path(@conn, :show, to_string(token_balance.token.contract_address_hash))
         end
       %>
       <%= link(
@@ -23,7 +23,7 @@
         <div class="row dropdown-row wh-sp">
           <%= if Application.get_env(:block_scout_web, :display_token_icons) do %>
             <% chain_id_for_token_icon = Application.get_env(:block_scout_web, :chain_id) %>
-            <% address_hash = token.contract_address_hash %>
+            <% address_hash = token_balance.token.contract_address_hash %>
             <%=
               render BlockScoutWeb.TokensView,
               "_token_icon.html",
@@ -32,18 +32,18 @@
               additional_classes: ["token-wallet-icon"]
             %>
           <% end %>
-          <p class="mb-0 col-md-6 pl-0 pr-0 el-1 flex-grow-2 <%= if !Application.get_env(:block_scout_web, :display_token_icons), do: "ml-5px" %>"><%= token_name(token) %>
+          <p class="mb-0 col-md-6 pl-0 pr-0 el-1 flex-grow-2 <%= if !Application.get_env(:block_scout_web, :display_token_icons), do: "ml-5px" %>"><%= token_name(token_balance.token) %>
           </p>
-          <%= if token.fiat_value && token.decimals do %>
+          <%= if token_balance.token.fiat_value && token_balance.token.decimals do %>
             <p class="mb-0 col-md-6 text-right usd-total">
-              <span data-selector="token-balance-usd" data-usd-value="<%= Chain.balance_in_fiat(token_balance, token) %>"></span>
+              <span data-selector="token-balance-usd" data-usd-value="<%= Chain.balance_in_fiat(token_balance) %>"></span>
             </p>
           <% end %>
         </div>
         <div class="row dropdown-row wh-sp">
-          <%= if token.fiat_value do %>
+          <%= if token_balance.token.fiat_value do %>
             <p class="mb-0 text-right text-muted usd-rate">
-              <span data-selector="token-price" data-token-usd-value="<%= token.fiat_value %>"></span>
+              <span data-selector="token-price" data-token-usd-value="<%= token_balance.token.fiat_value %>"></span>
             </p>
           <% end %>
         </div>
@@ -52,7 +52,7 @@
             <%= if token_balance.token_type == "ERC-721" && !is_nil(token_balance.token_id) do %>
               1
             <% else %>
-              <%= format_according_to_decimals(token_balance.value, token.decimals) %> <%= token_symbol(token) %>
+              <%= format_according_to_decimals(token_balance.value, token_balance.token.decimals) %> <%= token_symbol(token_balance.token) %>
             <% end %>
             <%= if (token_balance.token_type == "ERC-721" && !is_nil(token_balance.token_id)) or token_balance.token_type == "ERC-1155" do %>
               <%= " TokenID " <> to_string(token_balance.token_id) %>
diff --git a/apps/block_scout_web/lib/block_scout_web/views/address_token_balance_view.ex b/apps/block_scout_web/lib/block_scout_web/views/address_token_balance_view.ex
index 96d6153074e8..f05d049412ee 100644
--- a/apps/block_scout_web/lib/block_scout_web/views/address_token_balance_view.ex
+++ b/apps/block_scout_web/lib/block_scout_web/views/address_token_balance_view.ex
@@ -11,7 +11,7 @@ defmodule BlockScoutWeb.AddressTokenBalanceView do
   end
 
   def filter_by_type(token_balances, type) do
-    Enum.filter(token_balances, fn {_token_balance, token} -> token.type == type end)
+    Enum.filter(token_balances, fn token_balance -> token_balance.token.type == type end)
   end
 
   def address_tokens_usd_sum_cache(address, token_balances) do
diff --git a/apps/block_scout_web/lib/block_scout_web/views/api/v2/address_view.ex b/apps/block_scout_web/lib/block_scout_web/views/api/v2/address_view.ex
index 379959a256cb..4f1601f23481 100644
--- a/apps/block_scout_web/lib/block_scout_web/views/api/v2/address_view.ex
+++ b/apps/block_scout_web/lib/block_scout_web/views/api/v2/address_view.ex
@@ -111,17 +111,17 @@ defmodule BlockScoutWeb.API.V2.AddressView do
     })
   end
 
-  def prepare_token_balance({token_balance, token}, fetch_token_instance? \\ false) do
+  def prepare_token_balance(token_balance, fetch_token_instance? \\ false) do
     %{
       "value" => token_balance.value,
-      "token" => TokenView.render("token.json", %{token: token}),
+      "token" => TokenView.render("token.json", %{token: token_balance.token}),
       "token_id" => token_balance.token_id,
       "token_instance" =>
         if(fetch_token_instance? && token_balance.token_id,
           do:
             fetch_and_render_token_instance(
               token_balance.token_id,
-              token,
+              token_balance.token,
               token_balance.address_hash
             )
         )
diff --git a/apps/explorer/lib/explorer/chain.ex b/apps/explorer/lib/explorer/chain.ex
index e9029a21175f..0fc501c03375 100644
--- a/apps/explorer/lib/explorer/chain.ex
+++ b/apps/explorer/lib/explorer/chain.ex
@@ -2690,24 +2690,8 @@ defmodule Explorer.Chain do
   @doc """
   Return the balance in usd corresponding to this token. Return nil if the fiat_value of the token is not present.
   """
-  def balance_in_fiat(_token_balance, %{fiat_value: fiat_value, decimals: decimals})
-      when nil in [fiat_value, decimals] do
-    nil
-  end
-
-  def balance_in_fiat(token_balance, %{fiat_value: fiat_value, decimals: decimals}) do
-    tokens = CurrencyHelper.divide_decimals(token_balance.value, decimals)
-    Decimal.mult(tokens, fiat_value)
-  end
-
-  def balance_in_fiat(%{token: %{fiat_value: nil}}) do
-    nil
-  end
-
   def balance_in_fiat(token_balance) do
-    tokens = CurrencyHelper.divide_decimals(token_balance.value, token_balance.token.decimals)
-    price = token_balance.token.fiat_value
-    Decimal.mult(tokens, price)
+    token_balance.fiat_value
   end
 
   defp contract?(%{contract_code: nil}), do: false
diff --git a/apps/explorer/lib/explorer/chain/address/current_token_balance.ex b/apps/explorer/lib/explorer/chain/address/current_token_balance.ex
index 109405354d0d..4b4574598a72 100644
--- a/apps/explorer/lib/explorer/chain/address/current_token_balance.ex
+++ b/apps/explorer/lib/explorer/chain/address/current_token_balance.ex
@@ -47,6 +47,7 @@ defmodule Explorer.Chain.Address.CurrentTokenBalance do
     field(:value_fetched_at, :utc_datetime_usec)
     field(:token_id, :decimal)
     field(:token_type, :string)
+    field(:fiat_value, :decimal, virtual: true)
 
     # A transient field for deriving token holder count deltas during address_current_token_balances upserts
     field(:old_value, :decimal)
@@ -170,9 +171,11 @@ defmodule Explorer.Chain.Address.CurrentTokenBalance do
       where: ctb.address_hash == ^address_hash,
       where: ctb.value > 0,
       where: ctb.token_type == ^type,
-      left_join: t in Token,
+      left_join: t in assoc(ctb, :token),
       on: ctb.token_contract_address_hash == t.contract_address_hash,
-      select: {ctb, t},
+      preload: [token: t],
+      select: ctb,
+      select_merge: ^%{fiat_value: fiat_balance},
       order_by: ^[desc_nulls_last: fiat_balance],
       order_by: [desc: ctb.value, desc: ctb.id]
     )
@@ -185,9 +188,11 @@ defmodule Explorer.Chain.Address.CurrentTokenBalance do
       ctb in __MODULE__,
       where: ctb.address_hash == ^address_hash,
       where: ctb.value > 0,
-      left_join: t in Token,
+      left_join: t in assoc(ctb, :token),
       on: ctb.token_contract_address_hash == t.contract_address_hash,
-      select: {ctb, t},
+      preload: [token: t],
+      select: ctb,
+      select_merge: ^%{fiat_value: fiat_balance},
       order_by: ^[desc_nulls_last: fiat_balance],
       order_by: [desc: ctb.value, desc: ctb.id]
     )
diff --git a/apps/explorer/lib/explorer/counters/address_tokens_usd_sum.ex b/apps/explorer/lib/explorer/counters/address_tokens_usd_sum.ex
index c2dbd011526a..a18ea263607e 100644
--- a/apps/explorer/lib/explorer/counters/address_tokens_usd_sum.ex
+++ b/apps/explorer/lib/explorer/counters/address_tokens_usd_sum.ex
@@ -53,9 +53,9 @@ defmodule Explorer.Counters.AddressTokenUsdSum do
   @spec address_tokens_fiat_sum([{Address.CurrentTokenBalance, Explorer.Chain.Token}]) :: Decimal.t()
   defp address_tokens_fiat_sum(token_balances) do
     token_balances
-    |> Enum.reduce(Decimal.new(0), fn {token_balance, token}, acc ->
-      if token_balance.value && token.fiat_value && token.decimals do
-        Decimal.add(acc, Chain.balance_in_fiat(token_balance, token))
+    |> Enum.reduce(Decimal.new(0), fn token_balance, acc ->
+      if token_balance.value && token_balance.token.fiat_value && token_balance.token.decimals do
+        Decimal.add(acc, Chain.balance_in_fiat(token_balance))
       else
         acc
       end
diff --git a/apps/indexer/lib/indexer/fetcher/token_balance_on_demand.ex b/apps/indexer/lib/indexer/fetcher/token_balance_on_demand.ex
index 433fdadfb81b..3f3c05bb7932 100644
--- a/apps/indexer/lib/indexer/fetcher/token_balance_on_demand.ex
+++ b/apps/indexer/lib/indexer/fetcher/token_balance_on_demand.ex
@@ -49,7 +49,7 @@ defmodule Indexer.Fetcher.TokenBalanceOnDemand do
        when not is_nil(address_hash) do
     stale_current_token_balances =
       current_token_balances
-      |> Enum.filter(fn {current_token_balance, _} -> current_token_balance.block_number < stale_balance_window end)
+      |> Enum.filter(fn current_token_balance -> current_token_balance.block_number < stale_balance_window end)
 
     if Enum.count(stale_current_token_balances) > 0 do
       fetch_and_update(latest_block_number, address_hash, stale_current_token_balances)
@@ -63,10 +63,11 @@ defmodule Indexer.Fetcher.TokenBalanceOnDemand do
   defp fetch_and_update(block_number, address_hash, stale_current_token_balances) do
     current_token_balances_update_params =
       stale_current_token_balances
-      |> Enum.map(fn {%{token_id: token_id} = stale_current_token_balance, token} ->
+      |> Enum.map(fn %{token_id: token_id} = stale_current_token_balance ->
         stale_current_token_balances_to_fetch = [
           %{
-            token_contract_address_hash: "0x" <> Base.encode16(token.contract_address_hash.bytes),
+            token_contract_address_hash:
+              "0x" <> Base.encode16(stale_current_token_balance.token.contract_address_hash.bytes),
             address_hash: "0x" <> Base.encode16(address_hash.bytes),
             block_number: block_number,
             token_id: token_id && Decimal.to_integer(token_id)
@@ -84,8 +85,8 @@ defmodule Indexer.Fetcher.TokenBalanceOnDemand do
         if updated_balance do
           %{}
           |> Map.put(:address_hash, stale_current_token_balance.address_hash)
-          |> Map.put(:token_contract_address_hash, token.contract_address_hash)
-          |> Map.put(:token_type, token.type)
+          |> Map.put(:token_contract_address_hash, stale_current_token_balance.token.contract_address_hash)
+          |> Map.put(:token_type, stale_current_token_balance.token.type)
           |> Map.put(:token_id, token_id)
           |> Map.put(:block_number, block_number)
           |> Map.put(:value, Decimal.new(updated_balance))

From d92f13cedae42be2d088af3a1b72a941b9c98b97 Mon Sep 17 00:00:00 2001
From: Nikita Pozdniakov <nikitosing4@mail.ru>
Date: Wed, 5 Jul 2023 13:11:01 +0300
Subject: [PATCH 181/909] Changelog

---
 CHANGELOG.md                        | 1 +
 apps/explorer/lib/explorer/chain.ex | 1 -
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2c8fd6cf9278..d257d0ef7237 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,6 +10,7 @@
 
 ### Fixes
 
+- [#7852](https://github.com/blockscout/blockscout/pull/7852) - Token balances refactoring & fixes
 - [#7872](https://github.com/blockscout/blockscout/pull/7872) - Fix pending gas price in pending tx
 - [#7875](https://github.com/blockscout/blockscout/pull/7875) - Fix twin compiler version
 - [#7825](https://github.com/blockscout/blockscout/pull/7825) - Fix nginx config for the new frontend websockets
diff --git a/apps/explorer/lib/explorer/chain.ex b/apps/explorer/lib/explorer/chain.ex
index 0fc501c03375..d921f44fea88 100644
--- a/apps/explorer/lib/explorer/chain.ex
+++ b/apps/explorer/lib/explorer/chain.ex
@@ -47,7 +47,6 @@ defmodule Explorer.Chain do
     Address.CurrentTokenBalance,
     Address.TokenBalance,
     Block,
-    CurrencyHelper,
     Data,
     DecompiledSmartContract,
     Hash,

From 321b90f75c6d72c84003d412f31ca6b27de5e97c Mon Sep 17 00:00:00 2001
From: Nikita Pozdniakov <nikitosing4@mail.ru>
Date: Thu, 6 Jul 2023 12:53:36 +0300
Subject: [PATCH 182/909] Fix tests

---
 apps/block_scout_web/lib/block_scout_web/chain.ex    |  3 +--
 .../views/address_token_balance_view_test.exs        |  6 ++----
 apps/explorer/lib/explorer/chain.ex                  | 12 +++++++++++-
 .../chain/address/current_token_balance_test.exs     |  4 ++--
 apps/explorer/test/explorer/chain_test.exs           |  2 +-
 .../addresses_tokens_usd_sum_counter_test.exs        |  8 ++++----
 6 files changed, 21 insertions(+), 14 deletions(-)

diff --git a/apps/block_scout_web/lib/block_scout_web/chain.ex b/apps/block_scout_web/lib/block_scout_web/chain.ex
index d97adb0564ee..488f14279b6c 100644
--- a/apps/block_scout_web/lib/block_scout_web/chain.ex
+++ b/apps/block_scout_web/lib/block_scout_web/chain.ex
@@ -5,7 +5,6 @@ defmodule BlockScoutWeb.Chain do
 
   import Explorer.Chain,
     only: [
-      balance_in_fiat: 1,
       find_or_insert_address_from_hash: 1,
       hash_to_block: 1,
       hash_to_transaction: 1,
@@ -502,7 +501,7 @@ defmodule BlockScoutWeb.Chain do
   end
 
   defp paging_params_with_fiat_value(%CurrentTokenBalance{id: id, value: value} = ctb) do
-    %{"fiat_value" => balance_in_fiat(ctb), "value" => value, "id" => id}
+    %{"fiat_value" => ctb.fiat_value, "value" => value, "id" => id}
   end
 
   defp block_or_transaction_from_param(param) do
diff --git a/apps/block_scout_web/test/block_scout_web/views/address_token_balance_view_test.exs b/apps/block_scout_web/test/block_scout_web/views/address_token_balance_view_test.exs
index eb9fa83061d8..778c1eb0364b 100644
--- a/apps/block_scout_web/test/block_scout_web/views/address_token_balance_view_test.exs
+++ b/apps/block_scout_web/test/block_scout_web/views/address_token_balance_view_test.exs
@@ -20,11 +20,9 @@ defmodule BlockScoutWeb.AddressTokenBalanceViewTest do
       token_balance_a = build(:token_balance, token: build(:token, type: "ERC-20"))
       token_balance_b = build(:token_balance, token: build(:token, type: "ERC-721"))
 
-      token_balances = [{token_balance_a, token_balance_a.token}, {token_balance_b, token_balance_b.token}]
+      token_balances = [token_balance_a, token_balance_b]
 
-      assert AddressTokenBalanceView.filter_by_type(token_balances, "ERC-20") == [
-               {token_balance_a, token_balance_a.token}
-             ]
+      assert AddressTokenBalanceView.filter_by_type(token_balances, "ERC-20") == [token_balance_a]
     end
   end
 
diff --git a/apps/explorer/lib/explorer/chain.ex b/apps/explorer/lib/explorer/chain.ex
index d921f44fea88..7ad0d152b9a9 100644
--- a/apps/explorer/lib/explorer/chain.ex
+++ b/apps/explorer/lib/explorer/chain.ex
@@ -47,6 +47,7 @@ defmodule Explorer.Chain do
     Address.CurrentTokenBalance,
     Address.TokenBalance,
     Block,
+    CurrencyHelper,
     Data,
     DecompiledSmartContract,
     Hash,
@@ -2689,10 +2690,19 @@ defmodule Explorer.Chain do
   @doc """
   Return the balance in usd corresponding to this token. Return nil if the fiat_value of the token is not present.
   """
-  def balance_in_fiat(token_balance) do
+  def balance_in_fiat(%{fiat_value: fiat_value} = token_balance) when not is_nil(fiat_value) do
     token_balance.fiat_value
   end
 
+  def balance_in_fiat(%{token: %{fiat_value: fiat_value, decimals: decimals}}) when nil in [fiat_value, decimals] do
+    nil
+  end
+
+  def balance_in_fiat(%{token: %{fiat_value: fiat_value, decimals: decimals}} = token_balance) do
+    tokens = CurrencyHelper.divide_decimals(token_balance.value, decimals)
+    Decimal.mult(tokens, fiat_value)
+  end
+
   defp contract?(%{contract_code: nil}), do: false
 
   defp contract?(%{contract_code: _}), do: true
diff --git a/apps/explorer/test/explorer/chain/address/current_token_balance_test.exs b/apps/explorer/test/explorer/chain/address/current_token_balance_test.exs
index e7a366377ee4..85d49a8c1955 100644
--- a/apps/explorer/test/explorer/chain/address/current_token_balance_test.exs
+++ b/apps/explorer/test/explorer/chain/address/current_token_balance_test.exs
@@ -157,7 +157,7 @@ defmodule Explorer.Chain.Address.CurrentTokenBalanceTest do
         address.hash
         |> CurrentTokenBalance.last_token_balances()
         |> Repo.all()
-        |> Enum.map(fn {token_balance, _} -> token_balance.address_hash end)
+        |> Enum.map(fn token_balance -> token_balance.address_hash end)
 
       assert token_balances == [current_token_balance.address_hash]
     end
@@ -195,7 +195,7 @@ defmodule Explorer.Chain.Address.CurrentTokenBalanceTest do
         address.hash
         |> CurrentTokenBalance.last_token_balances()
         |> Repo.all()
-        |> Enum.map(fn {token_balance, _} -> token_balance.address_hash end)
+        |> Enum.map(fn token_balance -> token_balance.address_hash end)
 
       assert token_balances == [current_token_balance_a.address_hash]
     end
diff --git a/apps/explorer/test/explorer/chain_test.exs b/apps/explorer/test/explorer/chain_test.exs
index 5e284529a8c6..d3739754ebcc 100644
--- a/apps/explorer/test/explorer/chain_test.exs
+++ b/apps/explorer/test/explorer/chain_test.exs
@@ -5080,7 +5080,7 @@ defmodule Explorer.ChainTest do
       token_balances =
         address.hash
         |> Chain.fetch_last_token_balances()
-        |> Enum.map(fn {token_balance, _} -> token_balance.address_hash end)
+        |> Enum.map(fn token_balance -> token_balance.address_hash end)
 
       assert token_balances == [current_token_balance.address_hash]
     end
diff --git a/apps/explorer/test/explorer/counters/addresses_tokens_usd_sum_counter_test.exs b/apps/explorer/test/explorer/counters/addresses_tokens_usd_sum_counter_test.exs
index 12e7153a0a52..d56753852f02 100644
--- a/apps/explorer/test/explorer/counters/addresses_tokens_usd_sum_counter_test.exs
+++ b/apps/explorer/test/explorer/counters/addresses_tokens_usd_sum_counter_test.exs
@@ -19,15 +19,15 @@ defmodule Explorer.Counters.AddressTokenUsdSumTest do
       )
 
     AddressTokenUsdSum.fetch(address.hash, [
-      {address_current_token_balance, address_current_token_balance.token},
-      {address_current_token_balance_2, address_current_token_balance_2.token}
+      address_current_token_balance,
+      address_current_token_balance_2
     ])
 
     Process.sleep(200)
 
     assert AddressTokenUsdSum.fetch(address.hash, [
-             {address_current_token_balance, address_current_token_balance.token},
-             {address_current_token_balance_2, address_current_token_balance_2.token}
+             address_current_token_balance,
+             address_current_token_balance_2
            ]) ==
              Decimal.new(2_010_000)
   end

From 8c07aece2f3e1c619954b4e5f82ab8392a5a558e Mon Sep 17 00:00:00 2001
From: nikitosing <32202610+nikitosing@users.noreply.github.com>
Date: Mon, 10 Jul 2023 12:48:25 +0300
Subject: [PATCH 183/909] API v2: Add block_hash to logs (#7891)

* Add block_hash to logs

* Changelog
---
 CHANGELOG.md                                                   | 2 +-
 .../lib/block_scout_web/views/api/v2/transaction_view.ex       | 3 ++-
 .../controllers/api/v2/address_controller_test.exs             | 1 +
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d257d0ef7237..b21771668a2b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -25,7 +25,7 @@
 
 - [#7863](https://github.com/blockscout/blockscout/pull/7863) - Add max_age for account sessions
 - [#7841](https://github.com/blockscout/blockscout/pull/7841) - CORS setup for docker-compose config with new frontend
-- [#7832](https://github.com/blockscout/blockscout/pull/7832) - API v2: Add block_number to logs
+- [#7832](https://github.com/blockscout/blockscout/pull/7832), [#7891](https://github.com/blockscout/blockscout/pull/7891) - API v2: Add block_number, block_hash to logs
 - [#7789](https://github.com/blockscout/blockscout/pull/7789) - Fix test warnings; Fix name of `MICROSERVICE_ETH_BYTECODE_DB_INTERVAL_BETWEEN_LOOKUPS` env variable
 - [#7819](https://github.com/blockscout/blockscout/pull/7819) - Add logging for unknown error verification result
 - [#7781](https://github.com/blockscout/blockscout/pull/7781) - Add `/api/v1/health/liveness` and `/api/v1/health/readiness`
diff --git a/apps/block_scout_web/lib/block_scout_web/views/api/v2/transaction_view.ex b/apps/block_scout_web/lib/block_scout_web/views/api/v2/transaction_view.ex
index 11cf2d03d363..7fb6089d8ae6 100644
--- a/apps/block_scout_web/lib/block_scout_web/views/api/v2/transaction_view.ex
+++ b/apps/block_scout_web/lib/block_scout_web/views/api/v2/transaction_view.ex
@@ -285,7 +285,8 @@ defmodule BlockScoutWeb.API.V2.TransactionView do
       "index" => log.index,
       "decoded" => decoded,
       "smart_contract" => smart_contract_info(transaction_or_hash),
-      "block_number" => log.block_number
+      "block_number" => log.block_number,
+      "block_hash" => log.block_hash
     }
   end
 
diff --git a/apps/block_scout_web/test/block_scout_web/controllers/api/v2/address_controller_test.exs b/apps/block_scout_web/test/block_scout_web/controllers/api/v2/address_controller_test.exs
index 1896b9149ad0..7073f491550a 100644
--- a/apps/block_scout_web/test/block_scout_web/controllers/api/v2/address_controller_test.exs
+++ b/apps/block_scout_web/test/block_scout_web/controllers/api/v2/address_controller_test.exs
@@ -1729,6 +1729,7 @@ defmodule BlockScoutWeb.API.V2.AddressControllerTest do
     assert Address.checksum(log.address_hash) == json["address"]["hash"]
     assert to_string(log.transaction_hash) == json["tx_hash"]
     assert json["block_number"] == log.block_number
+    assert json["block_hash"] == to_string(log.block_hash)
   end
 
   defp compare_item(%Withdrawal{} = withdrawal, json) do

From 347f5d3641573376fc04d71d000a1a030f735c6d Mon Sep 17 00:00:00 2001
From: Maxim Filonov <53992153+sl1depengwyn@users.noreply.github.com>
Date: Mon, 10 Jul 2023 17:54:00 +0300
Subject: [PATCH 184/909] Add possibility to add extra headers with RPC URL

---
 CHANGELOG.md                                  |  1 +
 .../lib/ethereum_jsonrpc/http.ex              | 10 +++++++---
 .../lib/ethereum_jsonrpc/http/httpoison.ex    |  6 +++---
 .../test/ethereum_jsonrpc/http/mox_test.exs   | 20 +++++++++----------
 config/config_helper.exs                      |  9 +++++++++
 config/runtime.exs                            |  6 ++++++
 docker-compose/envs/common-blockscout.env     |  1 +
 docker/Makefile                               |  3 +++
 8 files changed, 40 insertions(+), 16 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b21771668a2b..b568c5b1fa3d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,7 @@
 
 ### Features
 
+- [#7898](https://github.com/blockscout/blockscout/pull/7898) - Add possibility to add extra headers with JSON RPC URL
 - [#7836](https://github.com/blockscout/blockscout/pull/7836) - Improve unverified email flow
 - [#7784](https://github.com/blockscout/blockscout/pull/7784) - Search improvements: Add new fields, light refactoring
 - [#7811](https://github.com/blockscout/blockscout/pull/7811) - Filter addresses before insertion
diff --git a/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/http.ex b/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/http.ex
index 45b54cdd581d..f6e48de89a71 100644
--- a/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/http.ex
+++ b/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/http.ex
@@ -14,7 +14,7 @@ defmodule EthereumJSONRPC.HTTP do
   @doc """
   Sends JSONRPC request encoded as `t:iodata/0` to `url` with `options`
   """
-  @callback json_rpc(url :: String.t(), json :: iodata(), options :: term()) ::
+  @callback json_rpc(url :: String.t(), json :: iodata(), headers :: [{String.t(), String.t()}], options :: term()) ::
               {:ok, %{body: body :: String.t(), status_code: status_code :: pos_integer()}}
               | {:error, reason :: term}
 
@@ -26,7 +26,7 @@ defmodule EthereumJSONRPC.HTTP do
     url = url(options, method)
     http_options = Keyword.fetch!(options, :http_options)
 
-    with {:ok, %{body: body, status_code: code}} <- http.json_rpc(url, json, http_options),
+    with {:ok, %{body: body, status_code: code}} <- http.json_rpc(url, json, headers(), http_options),
          {:ok, json} <- decode_json(request: [url: url, body: json], response: [status_code: code, body: body]),
          {:ok, response} <- handle_response(json, code) do
       {:ok, response}
@@ -66,7 +66,7 @@ defmodule EthereumJSONRPC.HTTP do
 
     json = encode_json(batch)
 
-    case http.json_rpc(url, json, http_options) do
+    case http.json_rpc(url, json, headers(), http_options) do
       {:ok, %{status_code: status_code} = response} when status_code in [413, 504] ->
         rechunk_json_rpc(chunks, options, response, decoded_response_bodies)
 
@@ -203,4 +203,8 @@ defmodule EthereumJSONRPC.HTTP do
     ArgumentError ->
       :error
   end
+
+  defp headers do
+    Application.get_env(:ethereum_jsonrpc, __MODULE__)[:headers]
+  end
 end
diff --git a/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/http/httpoison.ex b/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/http/httpoison.ex
index c3e466419eee..d7f561075192 100644
--- a/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/http/httpoison.ex
+++ b/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/http/httpoison.ex
@@ -8,8 +8,8 @@ defmodule EthereumJSONRPC.HTTP.HTTPoison do
   @behaviour HTTP
 
   @impl HTTP
-  def json_rpc(url, json, options) when is_binary(url) and is_list(options) do
-    case HTTPoison.post(url, json, [{"Content-Type", "application/json"}], options) do
+  def json_rpc(url, json, headers, options) when is_binary(url) and is_list(options) do
+    case HTTPoison.post(url, json, headers, options) do
       {:ok, %HTTPoison.Response{body: body, status_code: status_code}} ->
         {:ok, %{body: body, status_code: status_code}}
 
@@ -18,5 +18,5 @@ defmodule EthereumJSONRPC.HTTP.HTTPoison do
     end
   end
 
-  def json_rpc(url, _json, _options) when is_nil(url), do: {:error, "URL is nil"}
+  def json_rpc(url, _json, _headers, _options) when is_nil(url), do: {:error, "URL is nil"}
 end
diff --git a/apps/ethereum_jsonrpc/test/ethereum_jsonrpc/http/mox_test.exs b/apps/ethereum_jsonrpc/test/ethereum_jsonrpc/http/mox_test.exs
index 052667657d51..09eee029ba42 100644
--- a/apps/ethereum_jsonrpc/test/ethereum_jsonrpc/http/mox_test.exs
+++ b/apps/ethereum_jsonrpc/test/ethereum_jsonrpc/http/mox_test.exs
@@ -38,12 +38,12 @@ defmodule EthereumJSONRPC.HTTP.MoxTest do
     } do
       if json_rpc_named_arguments[:transport_options][:http] == EthereumJSONRPC.HTTP.Mox do
         EthereumJSONRPC.HTTP.Mox
-        |> expect(:json_rpc, 2, fn _url, json, _options ->
+        |> expect(:json_rpc, 2, fn _url, json, _headers, _options ->
           assert IO.iodata_to_binary(json) =~ ":13000"
 
           {:ok, %{body: "413 Request Entity Too Large", status_code: 413}}
         end)
-        |> expect(:json_rpc, fn _url, json, _options ->
+        |> expect(:json_rpc, fn _url, json, _headers, _options ->
           json_binary = IO.iodata_to_binary(json)
 
           refute json_binary =~ ":13000"
@@ -58,7 +58,7 @@ defmodule EthereumJSONRPC.HTTP.MoxTest do
 
           {:ok, %{body: body, status_code: 200}}
         end)
-        |> expect(:json_rpc, fn _url, json, _options ->
+        |> expect(:json_rpc, fn _url, json, _headers, _options ->
           json_binary = IO.iodata_to_binary(json)
 
           refute json_binary =~ ":6499"
@@ -107,10 +107,10 @@ defmodule EthereumJSONRPC.HTTP.MoxTest do
 
       if json_rpc_named_arguments[:transport_options][:http] == EthereumJSONRPC.HTTP.Mox do
         EthereumJSONRPC.HTTP.Mox
-        |> expect(:json_rpc, fn _url, _json, _options ->
+        |> expect(:json_rpc, fn _url, _json, _headers, _options ->
           {:ok, %{body: "504 Gateway Timeout", status_code: 504}}
         end)
-        |> expect(:json_rpc, fn _url, json, _options ->
+        |> expect(:json_rpc, fn _url, json, _headers, _options ->
           json_binary = IO.iodata_to_binary(json)
 
           refute json_binary =~ "0xD2849"
@@ -141,7 +141,7 @@ defmodule EthereumJSONRPC.HTTP.MoxTest do
 
           {:ok, %{body: body, status_code: 200}}
         end)
-        |> expect(:json_rpc, fn _url, json, _options ->
+        |> expect(:json_rpc, fn _url, json, _headers, _options ->
           json_binary = IO.iodata_to_binary(json)
 
           refute json_binary =~ "0xD2844"
@@ -199,10 +199,10 @@ defmodule EthereumJSONRPC.HTTP.MoxTest do
 
       if json_rpc_named_arguments[:transport_options][:http] == EthereumJSONRPC.HTTP.Mox do
         EthereumJSONRPC.HTTP.Mox
-        |> expect(:json_rpc, fn _url, _json, _options ->
+        |> expect(:json_rpc, fn _url, _json, _headers, _options ->
           {:error, :timeout}
         end)
-        |> expect(:json_rpc, fn _url, json, _options ->
+        |> expect(:json_rpc, fn _url, json, _headers, _options ->
           json_binary = IO.iodata_to_binary(json)
 
           refute json_binary =~ "0xD2849"
@@ -233,7 +233,7 @@ defmodule EthereumJSONRPC.HTTP.MoxTest do
 
           {:ok, %{body: body, status_code: 200}}
         end)
-        |> expect(:json_rpc, fn _url, json, _options ->
+        |> expect(:json_rpc, fn _url, json, _headers, _options ->
           json_binary = IO.iodata_to_binary(json)
 
           refute json_binary =~ "0xD2844"
@@ -293,7 +293,7 @@ defmodule EthereumJSONRPC.HTTP.MoxTest do
     json = Jason.encode_to_iodata!(payload)
     http_options = Keyword.fetch!(transport_options, :http_options)
 
-    assert {:ok, %{body: body, status_code: 413}} = http.json_rpc(url, json, http_options)
+    assert {:ok, %{body: body, status_code: 413}} = http.json_rpc(url, json, [], http_options)
     assert body =~ "413 Request Entity Too Large"
   end
 
diff --git a/config/config_helper.exs b/config/config_helper.exs
index 9d51608a2698..23224e698b92 100644
--- a/config/config_helper.exs
+++ b/config/config_helper.exs
@@ -119,4 +119,13 @@ defmodule ConfigHelper do
         transformer
     end
   end
+
+  @spec parse_json_env_var(String.t(), String.t()) :: any()
+  def parse_json_env_var(env_var, default_value) do
+    env_var
+    |> safe_get_env(default_value)
+    |> Jason.decode!()
+  rescue
+    err -> raise "Invalid JSON in environment variable #{env_var}: #{inspect(err)}"
+  end
 end
diff --git a/config/runtime.exs b/config/runtime.exs
index 0c28db61800f..0619c6ad3707 100644
--- a/config/runtime.exs
+++ b/config/runtime.exs
@@ -150,6 +150,12 @@ config :ethereum_jsonrpc,
   ipc_path: System.get_env("IPC_PATH"),
   disable_archive_balances?: ConfigHelper.parse_bool_env_var("ETHEREUM_JSONRPC_DISABLE_ARCHIVE_BALANCES")
 
+config :ethereum_jsonrpc, EthereumJSONRPC.HTTP,
+  headers:
+    %{"Content-Type" => "application/json"}
+    |> Map.merge(ConfigHelper.parse_json_env_var("ETHEREUM_JSONRPC_HTTP_HEADERS", "{}"))
+    |> Map.to_list()
+
 config :ethereum_jsonrpc, EthereumJSONRPC.Geth,
   debug_trace_transaction_timeout: System.get_env("ETHEREUM_JSONRPC_DEBUG_TRACE_TRANSACTION_TIMEOUT", "5s"),
   tracer: System.get_env("INDEXER_INTERNAL_TRANSACTIONS_TRACER_TYPE", "call_tracer")
diff --git a/docker-compose/envs/common-blockscout.env b/docker-compose/envs/common-blockscout.env
index 37afc533b520..7ec20be1fc07 100644
--- a/docker-compose/envs/common-blockscout.env
+++ b/docker-compose/envs/common-blockscout.env
@@ -12,6 +12,7 @@ LOGO=/images/blockscout_logo.svg
 # ETHEREUM_JSONRPC_WS_URL=
 ETHEREUM_JSONRPC_TRANSPORT=http
 ETHEREUM_JSONRPC_DISABLE_ARCHIVE_BALANCES=false
+# ETHEREUM_JSONRPC_HTTP_HEADERS=
 IPC_PATH=
 NETWORK_PATH=/
 BLOCKSCOUT_HOST=
diff --git a/docker/Makefile b/docker/Makefile
index 6076047bd361..ac4c84a6a8b4 100644
--- a/docker/Makefile
+++ b/docker/Makefile
@@ -60,6 +60,9 @@ endif
 ifdef ETHEREUM_JSONRPC_DISABLE_ARCHIVE_BALANCES
 	BLOCKSCOUT_CONTAINER_PARAMS += -e 'ETHEREUM_JSONRPC_DISABLE_ARCHIVE_BALANCES=$(ETHEREUM_JSONRPC_DISABLE_ARCHIVE_BALANCES)'
 endif
+ifdef ETHEREUM_JSONRPC_HTTP_HEADERS
+	BLOCKSCOUT_CONTAINER_PARAMS += -e 'ETHEREUM_JSONRPC_HTTP_HEADERS=$(ETHEREUM_JSONRPC_HTTP_HEADERS)'
+endif
 ifdef IPC_PATH
 	BLOCKSCOUT_CONTAINER_PARAMS += -e 'IPC_PATH=$(IPC_PATH)'
 endif

From 71fb196b4b765ee5d6e2c5f084ede6be6b02561f Mon Sep 17 00:00:00 2001
From: Viktor Baranov <baranov.viktor.27@gmail.com>
Date: Tue, 11 Jul 2023 00:13:46 +0300
Subject: [PATCH 185/909] Fix Docker image build

---
 CHANGELOG.md                 | 1 +
 apps/block_scout_web/mix.exs | 2 +-
 docker/Dockerfile            | 2 +-
 mix.lock                     | 8 ++++----
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b21771668a2b..f88cacce3f32 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -23,6 +23,7 @@
 
 ### Chore
 
+- [#7901](https://github.com/blockscout/blockscout/pull/7901) - Fix Docker image build
 - [#7863](https://github.com/blockscout/blockscout/pull/7863) - Add max_age for account sessions
 - [#7841](https://github.com/blockscout/blockscout/pull/7841) - CORS setup for docker-compose config with new frontend
 - [#7832](https://github.com/blockscout/blockscout/pull/7832), [#7891](https://github.com/blockscout/blockscout/pull/7891) - API v2: Add block_number, block_hash to logs
diff --git a/apps/block_scout_web/mix.exs b/apps/block_scout_web/mix.exs
index b11b75b2efbc..a335ed5822e2 100644
--- a/apps/block_scout_web/mix.exs
+++ b/apps/block_scout_web/mix.exs
@@ -95,7 +95,7 @@ defmodule BlockScoutWeb.Mixfile do
       {:math, "~> 0.7.0"},
       {:mock, "~> 0.3.0", only: [:test], runtime: false},
       {:number, "~> 1.0.1"},
-      {:phoenix, "== 1.5.13"},
+      {:phoenix, "== 1.5.14"},
       {:phoenix_ecto, "~> 4.1"},
       {:phoenix_html, "== 3.0.4"},
       {:phoenix_live_reload, "~> 1.2", only: [:dev]},
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 4b8018c39be2..8c5ba039f83e 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -5,7 +5,7 @@ WORKDIR /app
 RUN apk --no-cache --update add alpine-sdk gmp-dev automake libtool inotify-tools autoconf python3 file qemu-x86_64
 
 ENV GLIBC_REPO=https://github.com/sgerrand/alpine-pkg-glibc \
-    GLIBC_VERSION=2.30-r0 \
+    GLIBC_VERSION=2.34-r0 \
     PORT=4000 \
     MIX_ENV="prod" \
     SECRET_KEY_BASE="RMgI4C1HSkxsEjdhtGMfwAHfyT6CKWXOgzCboJflfSm4jeAlic52io05KB6mqzc5"
diff --git a/mix.lock b/mix.lock
index 00ea55b03ef2..4e5926844692 100644
--- a/mix.lock
+++ b/mix.lock
@@ -35,7 +35,7 @@
   "decorator": {:hex, :decorator, "1.4.0", "a57ac32c823ea7e4e67f5af56412d12b33274661bb7640ec7fc882f8d23ac419", [:mix], [], "hexpm", "0a07cedd9083da875c7418dea95b78361197cf2bf3211d743f6f7ce39656597f"},
   "deep_merge": {:hex, :deep_merge, "1.0.0", "b4aa1a0d1acac393bdf38b2291af38cb1d4a52806cf7a4906f718e1feb5ee961", [:mix], [], "hexpm", "ce708e5f094b9cd4e8f2be4f00d2f4250c4095be93f8cd6d018c753894885430"},
   "dialyxir": {:hex, :dialyxir, "1.3.0", "fd1672f0922b7648ff9ce7b1b26fcf0ef56dda964a459892ad15f6b4410b5284", [:mix], [{:erlex, ">= 0.2.6", [hex: :erlex, repo: "hexpm", optional: false]}], "hexpm", "00b2a4bcd6aa8db9dcb0b38c1225b7277dca9bc370b6438715667071a304696f"},
-  "digital_token": {:hex, :digital_token, "0.5.0", "c9fc69b6fefa6adfbabd1cca3d81b1a6f1905c2b3b8c6b1d742bba250a5ec8d8", [:mix], [{:cldr_utils, "~> 2.17", [hex: :cldr_utils, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}], "hexpm", "1bf4fb8fb608dbc90a3c535945185688d55731452b08d5fe74860509daeb55ca"},
+  "digital_token": {:hex, :digital_token, "0.4.0", "2ad6894d4a40be8b2890aad286ecd5745fa473fa5699d80361a8c94428edcd1f", [:mix], [{:cldr_utils, "~> 2.17", [hex: :cldr_utils, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: false]}], "hexpm", "a178edf61d1fee5bb3c34e14b0f4ee21809ee87cade8738f87337e59e5e66e26"},
   "earmark_parser": {:hex, :earmark_parser, "1.4.33", "3c3fd9673bb5dcc9edc28dd90f50c87ce506d1f71b70e3de69aa8154bc695d44", [:mix], [], "hexpm", "2d526833729b59b9fdb85785078697c72ac5e5066350663e5be6a1182da61b8f"},
   "ecto": {:hex, :ecto, "3.10.3", "eb2ae2eecd210b4eb8bece1217b297ad4ff824b4384c0e3fdd28aaf96edd6135", [:mix], [{:decimal, "~> 1.6 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}, {:telemetry, "~> 0.4 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "44bec74e2364d491d70f7e42cd0d690922659d329f6465e89feb8a34e8cd3433"},
   "ecto_sql": {:hex, :ecto_sql, "3.10.1", "6ea6b3036a0b0ca94c2a02613fd9f742614b5cfe494c41af2e6571bb034dd94c", [:mix], [{:db_connection, "~> 2.5 or ~> 2.4.1", [hex: :db_connection, repo: "hexpm", optional: false]}, {:ecto, "~> 3.10.0", [hex: :ecto, repo: "hexpm", optional: false]}, {:myxql, "~> 0.6.0", [hex: :myxql, repo: "hexpm", optional: true]}, {:postgrex, "~> 0.16.0 or ~> 0.17.0 or ~> 1.0", [hex: :postgrex, repo: "hexpm", optional: true]}, {:tds, "~> 2.1.1 or ~> 2.2", [hex: :tds, repo: "hexpm", optional: true]}, {:telemetry, "~> 0.4.0 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "f6a25bdbbd695f12c8171eaff0851fa4c8e72eec1e98c7364402dda9ce11c56b"},
@@ -45,7 +45,7 @@
   "ex_cldr": {:hex, :ex_cldr, "2.37.2", "c45041534ec60af367c4c1af02a608576118044fe3c441c782fd424061d6b517", [:mix], [{:cldr_utils, "~> 2.21", [hex: :cldr_utils, repo: "hexpm", optional: false]}, {:decimal, "~> 1.6 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: false]}, {:gettext, "~> 0.19", [hex: :gettext, repo: "hexpm", optional: true]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}, {:nimble_parsec, "~> 0.5 or ~> 1.0", [hex: :nimble_parsec, repo: "hexpm", optional: true]}], "hexpm", "c8467b1d5080716ace6621703b6656cb2f9545572a54b341da900791a0cf92ba"},
   "ex_cldr_currencies": {:hex, :ex_cldr_currencies, "2.15.0", "aadd34e91cfac7ef6b03fe8f47f8c6fa8c5daf3f89b5d9fee64ec545ded839cf", [:mix], [{:ex_cldr, "~> 2.34", [hex: :ex_cldr, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}], "hexpm", "0521316396c66877a2d636219767560bb2397c583341fcb154ecf9f3000e6ff8"},
   "ex_cldr_lists": {:hex, :ex_cldr_lists, "2.10.0", "4d4c9877da2d0417fd832907d69974e8328969f75fafc79b05ccf85f549f6281", [:mix], [{:ex_cldr_numbers, "~> 2.25", [hex: :ex_cldr_numbers, repo: "hexpm", optional: false]}, {:ex_doc, "~> 0.18", [hex: :ex_doc, repo: "hexpm", optional: true]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}], "hexpm", "adc040cde7b97f7fd7c0b35dd69ddb6fcf607303ae6355bb1851deae1f8b0652"},
-  "ex_cldr_numbers": {:hex, :ex_cldr_numbers, "2.31.2", "e27a457d594aefd1981094178f95c2efbd0f69c4a0c649c5f4cf5c97e264f310", [:mix], [{:decimal, "~> 1.6 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: false]}, {:digital_token, "~> 0.3 or ~> 1.0", [hex: :digital_token, repo: "hexpm", optional: false]}, {:ex_cldr, "~> 2.37", [hex: :ex_cldr, repo: "hexpm", optional: false]}, {:ex_cldr_currencies, ">= 2.14.2", [hex: :ex_cldr_currencies, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}], "hexpm", "828c0f39df6cc64bb7c586d7d302321322bc65c5d1d5d6115f632c3711d218b7"},
+  "ex_cldr_numbers": {:hex, :ex_cldr_numbers, "2.31.1", "ad3e8a33e8cb8d048173f2c89cf6fcec9f1694d99f890a75bc745894c3868d5b", [:mix], [{:decimal, "~> 1.6 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: false]}, {:digital_token, "~> 0.3 or ~> 1.0", [hex: :digital_token, repo: "hexpm", optional: false]}, {:ex_cldr, "~> 2.37", [hex: :ex_cldr, repo: "hexpm", optional: false]}, {:ex_cldr_currencies, ">= 2.14.2", [hex: :ex_cldr_currencies, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}], "hexpm", "a94c40f4bf60f0e69c34977f33caeda483677232699ab0a6a98025ea011fabcf"},
   "ex_cldr_units": {:hex, :ex_cldr_units, "3.16.2", "dbad303fba819981c578234e2aaf19d72efca16ea8b1c6ee46b26232cb45e232", [:mix], [{:cldr_utils, "~> 2.24", [hex: :cldr_utils, repo: "hexpm", optional: false]}, {:decimal, "~> 1.6 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: false]}, {:ex_cldr_lists, "~> 2.10", [hex: :ex_cldr_lists, repo: "hexpm", optional: false]}, {:ex_cldr_numbers, "~> 2.31", [hex: :ex_cldr_numbers, repo: "hexpm", optional: false]}, {:ex_doc, "~> 0.18", [hex: :ex_doc, repo: "hexpm", optional: true]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}], "hexpm", "851095319fb3205c1549619da742cd53a2804c1d9c204cf84014021e2a6ea7e5"},
   "ex_doc": {:hex, :ex_doc, "0.30.1", "a0f3b598d3c2cb3af48af39e59fa66ac8d4033740409b11dd753a3f30f8f8f7a", [:mix], [{:earmark_parser, "~> 1.4.31", [hex: :earmark_parser, repo: "hexpm", optional: false]}, {:makeup_elixir, "~> 0.14", [hex: :makeup_elixir, repo: "hexpm", optional: false]}, {:makeup_erlang, "~> 0.1", [hex: :makeup_erlang, repo: "hexpm", optional: false]}], "hexpm", "2e2216e84aa33e5803f8898d762b0f5e76bf2de3a08d1f40ac5f74456dd5057c"},
   "ex_json_schema": {:hex, :ex_json_schema, "0.9.3", "fc17c50d410fd99fa6e814e1aed60122d8ff2578b869d17a9db1ce1c621382b6", [:mix], [{:decimal, "~> 2.0", [hex: :decimal, repo: "hexpm", optional: false]}], "hexpm", "b79962d09cefd33001706255187bdb483a0c2b4442d5edc6822eb7574a8df0a8"},
@@ -70,7 +70,7 @@
   "httpoison": {:hex, :httpoison, "2.1.0", "655fd9a7b0b95ee3e9a3b535cf7ac8e08ef5229bab187fa86ac4208b122d934b", [:mix], [{:hackney, "~> 1.17", [hex: :hackney, repo: "hexpm", optional: false]}], "hexpm", "fc455cb4306b43827def4f57299b2d5ac8ac331cb23f517e734a4b78210a160c"},
   "idna": {:hex, :idna, "6.1.1", "8a63070e9f7d0c62eb9d9fcb360a7de382448200fbbd1b106cc96d3d8099df8d", [:rebar3], [{:unicode_util_compat, "~>0.7.0", [hex: :unicode_util_compat, repo: "hexpm", optional: false]}], "hexpm", "92376eb7894412ed19ac475e4a86f7b413c1b9fbb5bd16dccd57934157944cea"},
   "inflex": {:hex, :inflex, "2.1.0", "a365cf0821a9dacb65067abd95008ca1b0bb7dcdd85ae59965deef2aa062924c", [:mix], [], "hexpm", "14c17d05db4ee9b6d319b0bff1bdf22aa389a25398d1952c7a0b5f3d93162dd8"},
-  "jason": {:hex, :jason, "1.4.1", "af1504e35f629ddcdd6addb3513c3853991f694921b1b9368b0bd32beb9f1b63", [:mix], [{:decimal, "~> 1.0 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: true]}], "hexpm", "fbb01ecdfd565b56261302f7e1fcc27c4fb8f32d56eab74db621fc154604a7a1"},
+  "jason": {:hex, :jason, "1.4.0", "e855647bc964a44e2f67df589ccf49105ae039d4179db7f6271dfd3843dc27e6", [:mix], [{:decimal, "~> 1.0 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: true]}], "hexpm", "79a3791085b2a0f743ca04cec0f7be26443738779d09302e01318f97bdb82121"},
   "jsx": {:hex, :jsx, "2.8.3", "a05252d381885240744d955fbe3cf810504eb2567164824e19303ea59eef62cf", [:mix, :rebar3], [], "hexpm", "fc3499fed7a726995aa659143a248534adc754ebd16ccd437cd93b649a95091f"},
   "junit_formatter": {:hex, :junit_formatter, "3.3.1", "c729befb848f1b9571f317d2fefa648e9d4869befc4b2980daca7c1edc468e40", [:mix], [], "hexpm", "761fc5be4b4c15d8ba91a6dafde0b2c2ae6db9da7b8832a55b5a1deb524da72b"},
   "libsecp256k1": {:hex, :libsecp256k1, "0.1.10", "d27495e2b9851c7765129b76c53b60f5e275bd6ff68292c50536bf6b8d091a4d", [:make, :mix], [{:mix_erlang_tasks, "0.1.0", [hex: :mix_erlang_tasks, repo: "hexpm", optional: false]}], "hexpm", "09ea06239938571124f7f5a27bc9ac45dfb1cfc2df40d46ee9b59c3d51366652"},
@@ -98,7 +98,7 @@
   "optimal": {:hex, :optimal, "0.3.6", "46bbf52fbbbd238cda81e02560caa84f93a53c75620f1fe19e81e4ae7b07d1dd", [:mix], [], "hexpm", "1a06ea6a653120226b35b283a1cd10039550f2c566edcdec22b29316d73640fd"},
   "parallel_stream": {:hex, :parallel_stream, "1.1.0", "f52f73eb344bc22de335992377413138405796e0d0ad99d995d9977ac29f1ca9", [:mix], [], "hexpm", "684fd19191aedfaf387bbabbeb8ff3c752f0220c8112eb907d797f4592d6e871"},
   "parse_trans": {:hex, :parse_trans, "3.3.1", "16328ab840cc09919bd10dab29e431da3af9e9e7e7e6f0089dd5a2d2820011d8", [:rebar3], [], "hexpm", "07cd9577885f56362d414e8c4c4e6bdf10d43a8767abb92d24cbe8b24c54888b"},
-  "phoenix": {:hex, :phoenix, "1.5.13", "d4e0805ec0973bed80d67302631130fb47d75b1a0b7335a0b23c4432b6ce55ee", [:mix], [{:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}, {:phoenix_html, "~> 2.13 or ~> 3.0", [hex: :phoenix_html, repo: "hexpm", optional: true]}, {:phoenix_pubsub, "~> 2.0", [hex: :phoenix_pubsub, repo: "hexpm", optional: false]}, {:plug, "~> 1.10", [hex: :plug, repo: "hexpm", optional: false]}, {:plug_cowboy, "~> 1.0 or ~> 2.2", [hex: :plug_cowboy, repo: "hexpm", optional: true]}, {:plug_crypto, "~> 1.1.2 or ~> 1.2", [hex: :plug_crypto, repo: "hexpm", optional: false]}, {:telemetry, "~> 0.4 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "1a7c4f1900e6e60bb60ae6680e48418e3f7c360d58bcb9f812487b6d0d281a0f"},
+  "phoenix": {:hex, :phoenix, "1.5.14", "2d5db884be496eefa5157505ec0134e66187cb416c072272420c5509d67bf808", [:mix], [{:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}, {:phoenix_html, "~> 2.13 or ~> 3.0", [hex: :phoenix_html, repo: "hexpm", optional: true]}, {:phoenix_pubsub, "~> 2.0", [hex: :phoenix_pubsub, repo: "hexpm", optional: false]}, {:plug, "~> 1.10", [hex: :plug, repo: "hexpm", optional: false]}, {:plug_cowboy, "~> 1.0 or ~> 2.2", [hex: :plug_cowboy, repo: "hexpm", optional: true]}, {:plug_crypto, "~> 1.1.2 or ~> 1.2", [hex: :plug_crypto, repo: "hexpm", optional: false]}, {:telemetry, "~> 0.4 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "207f1aa5520320cbb7940d7ff2dde2342162cf513875848f88249ea0ba02fef7"},
   "phoenix_ecto": {:hex, :phoenix_ecto, "4.4.2", "b21bd01fdeffcfe2fab49e4942aa938b6d3e89e93a480d4aee58085560a0bc0d", [:mix], [{:ecto, "~> 3.5", [hex: :ecto, repo: "hexpm", optional: false]}, {:phoenix_html, "~> 2.14.2 or ~> 3.0", [hex: :phoenix_html, repo: "hexpm", optional: true]}, {:plug, "~> 1.9", [hex: :plug, repo: "hexpm", optional: false]}], "hexpm", "70242edd4601d50b69273b057ecf7b684644c19ee750989fd555625ae4ce8f5d"},
   "phoenix_html": {:hex, :phoenix_html, "3.0.4", "232d41884fe6a9c42d09f48397c175cd6f0d443aaa34c7424da47604201df2e1", [:mix], [{:plug, "~> 1.5", [hex: :plug, repo: "hexpm", optional: true]}], "hexpm", "ce17fd3cf815b2ed874114073e743507704b1f5288bb03c304a77458485efc8b"},
   "phoenix_live_reload": {:hex, :phoenix_live_reload, "1.3.3", "3a53772a6118d5679bf50fc1670505a290e32a1d195df9e069d8c53ab040c054", [:mix], [{:file_system, "~> 0.2.1 or ~> 0.3", [hex: :file_system, repo: "hexpm", optional: false]}, {:phoenix, "~> 1.4", [hex: :phoenix, repo: "hexpm", optional: false]}], "hexpm", "766796676e5f558dbae5d1bdb066849673e956005e3730dfd5affd7a6da4abac"},

From 0186a382eaaff5a957fc162103391690a7711874 Mon Sep 17 00:00:00 2001
From: Qwerty5Uiop <alex000010@bk.ru>
Date: Mon, 10 Jul 2023 22:57:37 +0400
Subject: [PATCH 186/909] Fix catchup numbers_to_ranges function

---
 CHANGELOG.md                                  |  1 +
 .../lib/indexer/block/catchup/fetcher.ex      |  4 +-
 .../indexer/block/catchup/fetcher_test.exs    | 58 +++++++++++++++++++
 3 files changed, 61 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b21771668a2b..bc55df500ead 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -20,6 +20,7 @@
 - [#7764](https://github.com/blockscout/blockscout/pull/7764) - Fix missing ranges insertion and deletion logic
 - [#7843](https://github.com/blockscout/blockscout/pull/7843) - Fix created_contract_code_indexed_at updating
 - [#7855](https://github.com/blockscout/blockscout/pull/7855) - Handle internal transactions unique_violation
+- [#7899](https://github.com/blockscout/blockscout/pull/7899) - Fix catchup numbers_to_ranges function
 
 ### Chore
 
diff --git a/apps/indexer/lib/indexer/block/catchup/fetcher.ex b/apps/indexer/lib/indexer/block/catchup/fetcher.ex
index faa0654ab785..6a7d63e8710d 100644
--- a/apps/indexer/lib/indexer/block/catchup/fetcher.ex
+++ b/apps/indexer/lib/indexer/block/catchup/fetcher.ex
@@ -289,14 +289,14 @@ defmodule Indexer.Block.Catchup.Fetcher do
 
   defp numbers_to_ranges(numbers) when is_list(numbers) do
     numbers
-    |> Enum.sort()
+    |> Enum.sort(&>=/2)
     |> Enum.chunk_while(
       nil,
       fn
         number, nil ->
           {:cont, number..number}
 
-        number, first..last when number == last + 1 ->
+        number, first..last when number == last - 1 ->
           {:cont, first..number}
 
         number, range ->
diff --git a/apps/indexer/test/indexer/block/catchup/fetcher_test.exs b/apps/indexer/test/indexer/block/catchup/fetcher_test.exs
index 3df0179f95ff..68324aa7cf47 100644
--- a/apps/indexer/test/indexer/block/catchup/fetcher_test.exs
+++ b/apps/indexer/test/indexer/block/catchup/fetcher_test.exs
@@ -9,6 +9,7 @@ defmodule Indexer.Block.Catchup.FetcherTest do
   alias Explorer.Chain.Block.Reward
   alias Explorer.Chain.Hash
   alias Explorer.Utility.MissingRangesManipulator
+  alias Explorer.Utility.MissingBlockRange
   alias Indexer.Block
   alias Indexer.Block.Catchup.Fetcher
   alias Indexer.Block.Catchup.MissingRangesCollector
@@ -606,6 +607,63 @@ defmodule Indexer.Block.Catchup.FetcherTest do
 
       assert_receive {:block_numbers, [^block_number]}, 5_000
     end
+
+    test "failed blocks handles correctly", %{json_rpc_named_arguments: json_rpc_named_arguments} do
+      Application.put_env(:indexer, Indexer.Block.Catchup.Fetcher, batch_size: 2, concurrency: 10)
+      Application.put_env(:indexer, :block_ranges, "0..1")
+      start_supervised!({Task.Supervisor, name: Indexer.Block.Catchup.TaskSupervisor})
+      MissingRangesCollector.start_link([])
+      MissingRangesManipulator.start_link([])
+
+      EthereumJSONRPC.Mox
+      |> expect(:json_rpc, 2, fn
+        [
+          %{
+            id: id_1,
+            jsonrpc: "2.0",
+            method: "eth_getBlockByNumber",
+            params: ["0x1", true]
+          },
+          %{
+            id: id_2,
+            jsonrpc: "2.0",
+            method: "eth_getBlockByNumber",
+            params: ["0x0", true]
+          }
+        ],
+        _options ->
+          {:ok,
+           [
+             %{
+               id: id_1,
+               jsonrpc: "2.0",
+               error: %{message: "error"}
+             },
+             %{
+               id: id_2,
+               jsonrpc: "2.0",
+               error: %{message: "error"}
+             }
+           ]}
+
+        [], _options ->
+          {:ok, []}
+      end)
+
+      Process.sleep(50)
+
+      assert %{first_block_number: 1, last_block_number: 0, missing_block_count: 2, shrunk: false} =
+               Fetcher.task(%Fetcher{
+                 block_fetcher: %Block.Fetcher{
+                   callback_module: Fetcher,
+                   json_rpc_named_arguments: json_rpc_named_arguments
+                 }
+               })
+
+      Process.sleep(1000)
+
+      assert %{from_number: 1, to_number: 0} = Repo.one(MissingBlockRange)
+    end
   end
 
   defp count(schema) do

From 7a67a98fa65941364e842a21b64ac316d2d0c42c Mon Sep 17 00:00:00 2001
From: Viktor Baranov <baranov.viktor.27@gmail.com>
Date: Tue, 11 Jul 2023 18:19:44 +0300
Subject: [PATCH 187/909] Resolve warning: Application.get_env/2 is discouraged
 in the module body, use Application.compile_env/3 instead
 lib/indexer/memory/monitor.ex:17: Indexer.Memory.Monitor

---
 CHANGELOG.md                               |  1 +
 apps/indexer/lib/indexer/memory/monitor.ex | 13 ++++++++-----
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c43423bb86a2..c3247409123e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -25,6 +25,7 @@
 ### Chore
 
 - [#7901](https://github.com/blockscout/blockscout/pull/7901) - Fix Docker image build
+- [#7890](https://github.com/blockscout/blockscout/pull/7890) - Resolve warning: Application.get_env/2 is discouraged in the module body, use Application.compile_env/3 instead
 - [#7863](https://github.com/blockscout/blockscout/pull/7863) - Add max_age for account sessions
 - [#7841](https://github.com/blockscout/blockscout/pull/7841) - CORS setup for docker-compose config with new frontend
 - [#7832](https://github.com/blockscout/blockscout/pull/7832), [#7891](https://github.com/blockscout/blockscout/pull/7891) - API v2: Add block_number, block_hash to logs
diff --git a/apps/indexer/lib/indexer/memory/monitor.ex b/apps/indexer/lib/indexer/memory/monitor.ex
index 40562a0f1330..a979ee659136 100644
--- a/apps/indexer/lib/indexer/memory/monitor.ex
+++ b/apps/indexer/lib/indexer/memory/monitor.ex
@@ -14,8 +14,7 @@ defmodule Indexer.Memory.Monitor do
 
   alias Indexer.Memory.Shrinkable
 
-  defstruct limit: Application.get_env(:indexer, :memory_limit),
-            timer_interval: :timer.minutes(1),
+  defstruct timer_interval: :timer.minutes(1),
             timer_reference: nil,
             shrinkable_set: MapSet.new()
 
@@ -62,11 +61,11 @@ defmodule Indexer.Memory.Monitor do
   end
 
   @impl GenServer
-  def handle_info(:check, %__MODULE__{limit: limit} = state) do
+  def handle_info(:check, state) do
     total = :erlang.memory(:total)
 
-    if limit < total do
-      log_memory(%{limit: limit, total: total})
+    if memory_limit() < total do
+      log_memory(%{limit: memory_limit(), total: total})
       shrink_or_log(state)
     end
 
@@ -169,4 +168,8 @@ defmodule Indexer.Memory.Monitor do
     |> Enum.map(fn pid -> {pid, memory(pid)} end)
     |> Enum.sort_by(&elem(&1, 1), &>=/2)
   end
+
+  defp memory_limit do
+    Application.get_env(:indexer, :memory_limit)
+  end
 end

From 2944f67d70cbaf3f08eb63b557f47560a3ed37b0 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 11 Jul 2023 18:38:55 +0000
Subject: [PATCH 188/909] Bump sweetalert2 from 11.7.12 to 11.7.16 in
 /apps/block_scout_web/assets

Bumps [sweetalert2](https://github.com/sweetalert2/sweetalert2) from 11.7.12 to 11.7.16.
- [Release notes](https://github.com/sweetalert2/sweetalert2/releases)
- [Changelog](https://github.com/sweetalert2/sweetalert2/blob/main/CHANGELOG.md)
- [Commits](https://github.com/sweetalert2/sweetalert2/compare/v11.7.12...v11.7.16)

---
updated-dependencies:
- dependency-name: sweetalert2
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 apps/block_scout_web/assets/package-lock.json | 14 +++++++-------
 apps/block_scout_web/assets/package.json      |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/apps/block_scout_web/assets/package-lock.json b/apps/block_scout_web/assets/package-lock.json
index 599611d26d36..cfed248e2ee5 100644
--- a/apps/block_scout_web/assets/package-lock.json
+++ b/apps/block_scout_web/assets/package-lock.json
@@ -61,7 +61,7 @@
         "redux": "^4.2.1",
         "stream-browserify": "^3.0.0",
         "stream-http": "^3.1.1",
-        "sweetalert2": "^11.7.12",
+        "sweetalert2": "^11.7.16",
         "urijs": "^1.19.11",
         "url": "^0.11.1",
         "util": "^0.12.5",
@@ -15703,9 +15703,9 @@
       }
     },
     "node_modules/sweetalert2": {
-      "version": "11.7.12",
-      "resolved": "https://registry.npmjs.org/sweetalert2/-/sweetalert2-11.7.12.tgz",
-      "integrity": "sha512-TQJy8mQymJLzqWPQOMQErd81Zd/rSYr0UL4pEc7bqEihtjS+zt7LWJXLhfPp93e+Hf3Z2FHMB6QGNskAMCsdTg==",
+      "version": "11.7.16",
+      "resolved": "https://registry.npmjs.org/sweetalert2/-/sweetalert2-11.7.16.tgz",
+      "integrity": "sha512-vxqVcA358RWdK/XOG1gFtOzT7qBH186Ry4gnW0Xtrx7vIo1mpnR8hG8MxQms4gz3JPbYQ6UIgZn0+hTK7in3Jw==",
       "funding": {
         "type": "individual",
         "url": "https://github.com/sponsors/limonte"
@@ -29166,9 +29166,9 @@
       }
     },
     "sweetalert2": {
-      "version": "11.7.12",
-      "resolved": "https://registry.npmjs.org/sweetalert2/-/sweetalert2-11.7.12.tgz",
-      "integrity": "sha512-TQJy8mQymJLzqWPQOMQErd81Zd/rSYr0UL4pEc7bqEihtjS+zt7LWJXLhfPp93e+Hf3Z2FHMB6QGNskAMCsdTg=="
+      "version": "11.7.16",
+      "resolved": "https://registry.npmjs.org/sweetalert2/-/sweetalert2-11.7.16.tgz",
+      "integrity": "sha512-vxqVcA358RWdK/XOG1gFtOzT7qBH186Ry4gnW0Xtrx7vIo1mpnR8hG8MxQms4gz3JPbYQ6UIgZn0+hTK7in3Jw=="
     },
     "symbol-tree": {
       "version": "3.2.4",
diff --git a/apps/block_scout_web/assets/package.json b/apps/block_scout_web/assets/package.json
index 0c3a8701f149..0d5cebaf7d0c 100644
--- a/apps/block_scout_web/assets/package.json
+++ b/apps/block_scout_web/assets/package.json
@@ -73,7 +73,7 @@
     "redux": "^4.2.1",
     "stream-browserify": "^3.0.0",
     "stream-http": "^3.1.1",
-    "sweetalert2": "^11.7.12",
+    "sweetalert2": "^11.7.16",
     "urijs": "^1.19.11",
     "url": "^0.11.1",
     "util": "^0.12.5",

From bc3078f25cf5d95c1891a4e5ad17d73379da93da Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 11 Jul 2023 18:47:29 +0000
Subject: [PATCH 189/909] Bump ex_doc from 0.30.1 to 0.30.2

Bumps [ex_doc](https://github.com/elixir-lang/ex_doc) from 0.30.1 to 0.30.2.
- [Changelog](https://github.com/elixir-lang/ex_doc/blob/main/CHANGELOG.md)
- [Commits](https://github.com/elixir-lang/ex_doc/compare/v0.30.1...v0.30.2)

---
updated-dependencies:
- dependency-name: ex_doc
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 mix.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mix.lock b/mix.lock
index 4e5926844692..19229c901337 100644
--- a/mix.lock
+++ b/mix.lock
@@ -47,7 +47,7 @@
   "ex_cldr_lists": {:hex, :ex_cldr_lists, "2.10.0", "4d4c9877da2d0417fd832907d69974e8328969f75fafc79b05ccf85f549f6281", [:mix], [{:ex_cldr_numbers, "~> 2.25", [hex: :ex_cldr_numbers, repo: "hexpm", optional: false]}, {:ex_doc, "~> 0.18", [hex: :ex_doc, repo: "hexpm", optional: true]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}], "hexpm", "adc040cde7b97f7fd7c0b35dd69ddb6fcf607303ae6355bb1851deae1f8b0652"},
   "ex_cldr_numbers": {:hex, :ex_cldr_numbers, "2.31.1", "ad3e8a33e8cb8d048173f2c89cf6fcec9f1694d99f890a75bc745894c3868d5b", [:mix], [{:decimal, "~> 1.6 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: false]}, {:digital_token, "~> 0.3 or ~> 1.0", [hex: :digital_token, repo: "hexpm", optional: false]}, {:ex_cldr, "~> 2.37", [hex: :ex_cldr, repo: "hexpm", optional: false]}, {:ex_cldr_currencies, ">= 2.14.2", [hex: :ex_cldr_currencies, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}], "hexpm", "a94c40f4bf60f0e69c34977f33caeda483677232699ab0a6a98025ea011fabcf"},
   "ex_cldr_units": {:hex, :ex_cldr_units, "3.16.2", "dbad303fba819981c578234e2aaf19d72efca16ea8b1c6ee46b26232cb45e232", [:mix], [{:cldr_utils, "~> 2.24", [hex: :cldr_utils, repo: "hexpm", optional: false]}, {:decimal, "~> 1.6 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: false]}, {:ex_cldr_lists, "~> 2.10", [hex: :ex_cldr_lists, repo: "hexpm", optional: false]}, {:ex_cldr_numbers, "~> 2.31", [hex: :ex_cldr_numbers, repo: "hexpm", optional: false]}, {:ex_doc, "~> 0.18", [hex: :ex_doc, repo: "hexpm", optional: true]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}], "hexpm", "851095319fb3205c1549619da742cd53a2804c1d9c204cf84014021e2a6ea7e5"},
-  "ex_doc": {:hex, :ex_doc, "0.30.1", "a0f3b598d3c2cb3af48af39e59fa66ac8d4033740409b11dd753a3f30f8f8f7a", [:mix], [{:earmark_parser, "~> 1.4.31", [hex: :earmark_parser, repo: "hexpm", optional: false]}, {:makeup_elixir, "~> 0.14", [hex: :makeup_elixir, repo: "hexpm", optional: false]}, {:makeup_erlang, "~> 0.1", [hex: :makeup_erlang, repo: "hexpm", optional: false]}], "hexpm", "2e2216e84aa33e5803f8898d762b0f5e76bf2de3a08d1f40ac5f74456dd5057c"},
+  "ex_doc": {:hex, :ex_doc, "0.30.2", "7a3e63ddb387746925bbbbcf6e9cb00e43c757cc60359a2b40059aea573e3e57", [:mix], [{:earmark_parser, "~> 1.4.31", [hex: :earmark_parser, repo: "hexpm", optional: false]}, {:makeup_elixir, "~> 0.14", [hex: :makeup_elixir, repo: "hexpm", optional: false]}, {:makeup_erlang, "~> 0.1", [hex: :makeup_erlang, repo: "hexpm", optional: false]}], "hexpm", "5ba8cb61d069012f16b50e575b0e3e6cf4083935f7444fab0d92c9314ce86bb6"},
   "ex_json_schema": {:hex, :ex_json_schema, "0.9.3", "fc17c50d410fd99fa6e814e1aed60122d8ff2578b869d17a9db1ce1c621382b6", [:mix], [{:decimal, "~> 2.0", [hex: :decimal, repo: "hexpm", optional: false]}], "hexpm", "b79962d09cefd33001706255187bdb483a0c2b4442d5edc6822eb7574a8df0a8"},
   "ex_keccak": {:hex, :ex_keccak, "0.7.1", "0169f4b0c5073c5df61581d6282b12f1a1b764dcfcda4eeb1c819b5194c9ced0", [:mix], [{:rustler, ">= 0.0.0", [hex: :rustler, repo: "hexpm", optional: true]}, {:rustler_precompiled, "~> 0.6.1", [hex: :rustler_precompiled, repo: "hexpm", optional: false]}], "hexpm", "c18c19f66b6545b4b46b0c71c0cc0079de84e30b26365a92961e91697e8724ed"},
   "ex_machina": {:hex, :ex_machina, "2.7.0", "b792cc3127fd0680fecdb6299235b4727a4944a09ff0fa904cc639272cd92dc7", [:mix], [{:ecto, "~> 2.2 or ~> 3.0", [hex: :ecto, repo: "hexpm", optional: true]}, {:ecto_sql, "~> 3.0", [hex: :ecto_sql, repo: "hexpm", optional: true]}], "hexpm", "419aa7a39bde11894c87a615c4ecaa52d8f107bbdd81d810465186f783245bf8"},

From 94c7c00a82a1b35ccefc6fd3469e5e3a8e29b0e3 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 12 Jul 2023 02:35:53 +0000
Subject: [PATCH 190/909] Bump semver from 5.7.1 to 5.7.2 in /apps/explorer

Bumps [semver](https://github.com/npm/node-semver) from 5.7.1 to 5.7.2.
- [Release notes](https://github.com/npm/node-semver/releases)
- [Changelog](https://github.com/npm/node-semver/blob/v5.7.2/CHANGELOG.md)
- [Commits](https://github.com/npm/node-semver/compare/v5.7.1...v5.7.2)

---
updated-dependencies:
- dependency-name: semver
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 apps/explorer/package-lock.json | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/apps/explorer/package-lock.json b/apps/explorer/package-lock.json
index 4f33855a6d04..97615d52f59e 100644
--- a/apps/explorer/package-lock.json
+++ b/apps/explorer/package-lock.json
@@ -68,9 +68,9 @@
       }
     },
     "node_modules/semver": {
-      "version": "5.7.1",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
-      "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
+      "version": "5.7.2",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz",
+      "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==",
       "bin": {
         "semver": "bin/semver"
       }
@@ -139,9 +139,9 @@
       "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ="
     },
     "semver": {
-      "version": "5.7.1",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
-      "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ=="
+      "version": "5.7.2",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz",
+      "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g=="
     },
     "solc": {
       "version": "0.8.20",

From e0a59e9cf6e949a00eb3685b1704b42e392f5d0f Mon Sep 17 00:00:00 2001
From: Viktor Baranov <baranov.viktor.27@gmail.com>
Date: Wed, 12 Jul 2023 14:19:44 +0300
Subject: [PATCH 191/909] Fix "Elixir.Indexer.Memory.Monitor",{{badkey,limit}

---
 CHANGELOG.md                               | 2 +-
 apps/indexer/lib/indexer/memory/monitor.ex | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c3247409123e..3467d072c1a3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -25,7 +25,7 @@
 ### Chore
 
 - [#7901](https://github.com/blockscout/blockscout/pull/7901) - Fix Docker image build
-- [#7890](https://github.com/blockscout/blockscout/pull/7890) - Resolve warning: Application.get_env/2 is discouraged in the module body, use Application.compile_env/3 instead
+- [#7890](https://github.com/blockscout/blockscout/pull/7890), [#7918](https://github.com/blockscout/blockscout/pull/7918) - Resolve warning: Application.get_env/2 is discouraged in the module body, use Application.compile_env/3 instead
 - [#7863](https://github.com/blockscout/blockscout/pull/7863) - Add max_age for account sessions
 - [#7841](https://github.com/blockscout/blockscout/pull/7841) - CORS setup for docker-compose config with new frontend
 - [#7832](https://github.com/blockscout/blockscout/pull/7832), [#7891](https://github.com/blockscout/blockscout/pull/7891) - API v2: Add block_number, block_hash to logs
diff --git a/apps/indexer/lib/indexer/memory/monitor.ex b/apps/indexer/lib/indexer/memory/monitor.ex
index a979ee659136..704592f2d645 100644
--- a/apps/indexer/lib/indexer/memory/monitor.ex
+++ b/apps/indexer/lib/indexer/memory/monitor.ex
@@ -14,7 +14,8 @@ defmodule Indexer.Memory.Monitor do
 
   alias Indexer.Memory.Shrinkable
 
-  defstruct timer_interval: :timer.minutes(1),
+  defstruct limit: 0,
+            timer_interval: :timer.minutes(1),
             timer_reference: nil,
             shrinkable_set: MapSet.new()
 

From 70e696b6b2cfcab5e823de47ce527937b0dbc3d7 Mon Sep 17 00:00:00 2001
From: Viktor Baranov <baranov.viktor.27@gmail.com>
Date: Thu, 13 Jul 2023 12:38:41 +0300
Subject: [PATCH 192/909] Fix fetching libstdc++ in install_chrome_headless.sh

---
 .github/workflows/config.yml | 54 ++++++++++++++++++------------------
 1 file changed, 27 insertions(+), 27 deletions(-)

diff --git a/.github/workflows/config.yml b/.github/workflows/config.yml
index 64c2cb8f800e..318c79537f1f 100644
--- a/.github/workflows/config.yml
+++ b/.github/workflows/config.yml
@@ -26,7 +26,7 @@ env:
 jobs:
   build-and-cache:
     name: Build and Cache deps
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
     steps:
       - uses: actions/checkout@v2
       - uses: erlef/setup-beam@v1
@@ -47,7 +47,7 @@ jobs:
           path: |
             deps
             _build
-          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_20-${{ hashFiles('mix.lock') }}
+          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_21-${{ hashFiles('mix.lock') }}
           restore-keys: |
             ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-
 
@@ -91,7 +91,7 @@ jobs:
 
   credo:
     name: Credo
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
     needs: build-and-cache
     steps:
       - uses: actions/checkout@v2
@@ -107,7 +107,7 @@ jobs:
           path: |
             deps
             _build
-          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_20-${{ hashFiles('mix.lock') }}
+          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_21-${{ hashFiles('mix.lock') }}
           restore-keys: |
             ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-"
 
@@ -115,7 +115,7 @@ jobs:
 
   check_formatted:
     name: Code formatting checks
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
     needs: build-and-cache
     steps:
       - uses: actions/checkout@v2
@@ -131,14 +131,14 @@ jobs:
           path: |
             deps
             _build
-          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_20-${{ hashFiles('mix.lock') }}
+          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_21-${{ hashFiles('mix.lock') }}
           restore-keys: |
             ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-"
 
       - run: mix format --check-formatted
   dialyzer:
     name: Dialyzer static analysis
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
     needs: build-and-cache
     steps:
       - uses: actions/checkout@v2
@@ -154,7 +154,7 @@ jobs:
           path: |
             deps
             _build
-          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_20-${{ hashFiles('mix.lock') }}
+          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_21-${{ hashFiles('mix.lock') }}
           restore-keys: |
             ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-"
 
@@ -163,7 +163,7 @@ jobs:
         id: dialyzer-cache
         with:
           path: priv/plts
-          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-dialyzer-mixlockhash_20-${{ hashFiles('mix.lock') }}
+          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-dialyzer-mixlockhash_21-${{ hashFiles('mix.lock') }}
           restore-keys: |
             ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-dialyzer-"
 
@@ -178,7 +178,7 @@ jobs:
 
   gettext:
     name: Missing translation keys check
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
     needs: build-and-cache
     steps:
       - uses: actions/checkout@v2
@@ -194,7 +194,7 @@ jobs:
           path: |
             deps
             _build
-          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_20-${{ hashFiles('mix.lock') }}
+          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_21-${{ hashFiles('mix.lock') }}
           restore-keys: |
             ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-"
 
@@ -204,7 +204,7 @@ jobs:
         working-directory: "apps/block_scout_web"
   sobelow:
     name: Sobelow security analysis
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
     needs: build-and-cache
     steps:
       - uses: actions/checkout@v2
@@ -220,7 +220,7 @@ jobs:
           path: |
             deps
             _build
-          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_20-${{ hashFiles('mix.lock') }}
+          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_21-${{ hashFiles('mix.lock') }}
           restore-keys: |
             ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-"
 
@@ -233,7 +233,7 @@ jobs:
 
   cspell:
     name: Check spelling
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
     needs: build-and-cache
     steps:
       - uses: actions/checkout@v2
@@ -249,7 +249,7 @@ jobs:
           path: |
             deps
             _build
-          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_20-${{ hashFiles('mix.lock') }}
+          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_21-${{ hashFiles('mix.lock') }}
           restore-keys: |
             ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-"
 
@@ -281,7 +281,7 @@ jobs:
 
   eslint:
     name: ESLint
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
     needs: build-and-cache
     steps:
       - uses: actions/checkout@v2
@@ -297,7 +297,7 @@ jobs:
           path: |
             deps
             _build
-          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_20-${{ hashFiles('mix.lock') }}
+          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_21-${{ hashFiles('mix.lock') }}
           restore-keys: |
             ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-"
 
@@ -327,7 +327,7 @@ jobs:
         working-directory: apps/block_scout_web/assets
   jest:
     name: JS Tests
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
     needs: build-and-cache
     steps:
       - uses: actions/checkout@v2
@@ -343,7 +343,7 @@ jobs:
           path: |
             deps
             _build
-          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_20-${{ hashFiles('mix.lock') }}
+          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_21-${{ hashFiles('mix.lock') }}
           restore-keys: |
             ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-"
 
@@ -365,7 +365,7 @@ jobs:
 
   test_nethermind_mox_ethereum_jsonrpc:
     name: EthereumJSONRPC Tests
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
     needs: build-and-cache
     services:
       postgres:
@@ -400,7 +400,7 @@ jobs:
           path: |
             deps
             _build
-          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_20-${{ hashFiles('mix.lock') }}
+          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_21-${{ hashFiles('mix.lock') }}
           restore-keys: |
             ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-"
 
@@ -419,7 +419,7 @@ jobs:
           ETHEREUM_JSONRPC_WEB_SOCKET_CASE: "EthereumJSONRPC.WebSocket.Case.Mox"
   test_nethermind_mox_explorer:
     name: Explorer Tests
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
     needs: build-and-cache
     services:
       postgres:
@@ -454,7 +454,7 @@ jobs:
           path: |
             deps
             _build
-          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_20-${{ hashFiles('mix.lock') }}
+          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_21-${{ hashFiles('mix.lock') }}
           restore-keys: |
             ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-"
 
@@ -484,7 +484,7 @@ jobs:
           ETHEREUM_JSONRPC_WEB_SOCKET_CASE: "EthereumJSONRPC.WebSocket.Case.Mox"
   test_nethermind_mox_indexer:
     name: Indexer Tests
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
     needs: build-and-cache
     services:
       postgres:
@@ -519,7 +519,7 @@ jobs:
           path: |
             deps
             _build
-          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_20-${{ hashFiles('mix.lock') }}
+          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_21-${{ hashFiles('mix.lock') }}
           restore-keys: |
             ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-"
 
@@ -543,7 +543,7 @@ jobs:
 
   test_nethermind_mox_block_scout_web:
     name: Blockscout Web Tests
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
     needs: build-and-cache
     services:
       redis_db:
@@ -583,7 +583,7 @@ jobs:
           path: |
             deps
             _build
-          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_20-${{ hashFiles('mix.lock') }}
+          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_21-${{ hashFiles('mix.lock') }}
           restore-keys: |
             ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-"
 

From 6057fb7ce6ce75ec1609053d9b336a05313ebad3 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 13 Jul 2023 10:33:23 +0000
Subject: [PATCH 193/909] Bump @babel/preset-env in
 /apps/block_scout_web/assets

Bumps [@babel/preset-env](https://github.com/babel/babel/tree/HEAD/packages/babel-preset-env) from 7.22.7 to 7.22.9.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/commits/v7.22.9/packages/babel-preset-env)

---
updated-dependencies:
- dependency-name: "@babel/preset-env"
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 apps/block_scout_web/assets/package-lock.json | 78 +++++++++----------
 apps/block_scout_web/assets/package.json      |  2 +-
 2 files changed, 40 insertions(+), 40 deletions(-)

diff --git a/apps/block_scout_web/assets/package-lock.json b/apps/block_scout_web/assets/package-lock.json
index cfed248e2ee5..481f64e972d4 100644
--- a/apps/block_scout_web/assets/package-lock.json
+++ b/apps/block_scout_web/assets/package-lock.json
@@ -72,7 +72,7 @@
       },
       "devDependencies": {
         "@babel/core": "^7.22.8",
-        "@babel/preset-env": "^7.22.7",
+        "@babel/preset-env": "^7.22.9",
         "autoprefixer": "^10.4.14",
         "babel-loader": "^9.1.3",
         "copy-webpack-plugin": "^11.0.0",
@@ -240,9 +240,9 @@
       }
     },
     "node_modules/@babel/compat-data": {
-      "version": "7.22.6",
-      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.22.6.tgz",
-      "integrity": "sha512-29tfsWTq2Ftu7MXmimyC0C5FDZv5DYxOZkh3XD3+QW4V/BYuv/LyEsjj3c0hqedEaDt6DBfDvexMKU8YevdqFg==",
+      "version": "7.22.9",
+      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.22.9.tgz",
+      "integrity": "sha512-5UamI7xkUcJ3i9qVDS+KFDEK8/7oJ55/sJMB1Ge7IEapr7KfdfV/HErR+koZwOfd+SgtFKOKRhRakdg++DcJpQ==",
       "engines": {
         "node": ">=6.9.0"
       }
@@ -314,15 +314,15 @@
       }
     },
     "node_modules/@babel/helper-compilation-targets": {
-      "version": "7.22.6",
-      "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.22.6.tgz",
-      "integrity": "sha512-534sYEqWD9VfUm3IPn2SLcH4Q3P86XL+QvqdC7ZsFrzyyPF3T4XGiVghF6PTYNdWg6pXuoqXxNQAhbYeEInTzA==",
+      "version": "7.22.9",
+      "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.22.9.tgz",
+      "integrity": "sha512-7qYrNM6HjpnPHJbopxmb8hSPoZ0gsX8IvUS32JGVoy+pU9e5N0nLr1VjJoR6kA4d9dmGLxNYOjeB8sUDal2WMw==",
       "dependencies": {
-        "@babel/compat-data": "^7.22.6",
+        "@babel/compat-data": "^7.22.9",
         "@babel/helper-validator-option": "^7.22.5",
-        "@nicolo-ribaudo/semver-v6": "^6.3.3",
         "browserslist": "^4.21.9",
-        "lru-cache": "^5.1.1"
+        "lru-cache": "^5.1.1",
+        "semver": "^6.3.1"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1778,13 +1778,13 @@
       }
     },
     "node_modules/@babel/preset-env": {
-      "version": "7.22.7",
-      "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.22.7.tgz",
-      "integrity": "sha512-1whfDtW+CzhETuzYXfcgZAh8/GFMeEbz0V5dVgya8YeJyCU6Y/P2Gnx4Qb3MylK68Zu9UiwUvbPMPTpFAOJ+sQ==",
+      "version": "7.22.9",
+      "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.22.9.tgz",
+      "integrity": "sha512-wNi5H/Emkhll/bqPjsjQorSykrlfY5OWakd6AulLvMEytpKasMVUpVy8RL4qBIBs5Ac6/5i0/Rv0b/Fg6Eag/g==",
       "dev": true,
       "dependencies": {
-        "@babel/compat-data": "^7.22.6",
-        "@babel/helper-compilation-targets": "^7.22.6",
+        "@babel/compat-data": "^7.22.9",
+        "@babel/helper-compilation-targets": "^7.22.9",
         "@babel/helper-plugin-utils": "^7.22.5",
         "@babel/helper-validator-option": "^7.22.5",
         "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": "^7.22.5",
@@ -1858,11 +1858,11 @@
         "@babel/plugin-transform-unicode-sets-regex": "^7.22.5",
         "@babel/preset-modules": "^0.1.5",
         "@babel/types": "^7.22.5",
-        "@nicolo-ribaudo/semver-v6": "^6.3.3",
         "babel-plugin-polyfill-corejs2": "^0.4.4",
         "babel-plugin-polyfill-corejs3": "^0.8.2",
         "babel-plugin-polyfill-regenerator": "^0.5.1",
-        "core-js-compat": "^3.31.0"
+        "core-js-compat": "^3.31.0",
+        "semver": "^6.3.1"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -15014,9 +15014,9 @@
       }
     },
     "node_modules/semver": {
-      "version": "6.3.0",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-      "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+      "version": "6.3.1",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
+      "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
       "bin": {
         "semver": "bin/semver.js"
       }
@@ -17532,9 +17532,9 @@
       }
     },
     "@babel/compat-data": {
-      "version": "7.22.6",
-      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.22.6.tgz",
-      "integrity": "sha512-29tfsWTq2Ftu7MXmimyC0C5FDZv5DYxOZkh3XD3+QW4V/BYuv/LyEsjj3c0hqedEaDt6DBfDvexMKU8YevdqFg=="
+      "version": "7.22.9",
+      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.22.9.tgz",
+      "integrity": "sha512-5UamI7xkUcJ3i9qVDS+KFDEK8/7oJ55/sJMB1Ge7IEapr7KfdfV/HErR+koZwOfd+SgtFKOKRhRakdg++DcJpQ=="
     },
     "@babel/core": {
       "version": "7.22.8",
@@ -17587,15 +17587,15 @@
       }
     },
     "@babel/helper-compilation-targets": {
-      "version": "7.22.6",
-      "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.22.6.tgz",
-      "integrity": "sha512-534sYEqWD9VfUm3IPn2SLcH4Q3P86XL+QvqdC7ZsFrzyyPF3T4XGiVghF6PTYNdWg6pXuoqXxNQAhbYeEInTzA==",
+      "version": "7.22.9",
+      "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.22.9.tgz",
+      "integrity": "sha512-7qYrNM6HjpnPHJbopxmb8hSPoZ0gsX8IvUS32JGVoy+pU9e5N0nLr1VjJoR6kA4d9dmGLxNYOjeB8sUDal2WMw==",
       "requires": {
-        "@babel/compat-data": "^7.22.6",
+        "@babel/compat-data": "^7.22.9",
         "@babel/helper-validator-option": "^7.22.5",
-        "@nicolo-ribaudo/semver-v6": "^6.3.3",
         "browserslist": "^4.21.9",
-        "lru-cache": "^5.1.1"
+        "lru-cache": "^5.1.1",
+        "semver": "^6.3.1"
       },
       "dependencies": {
         "lru-cache": {
@@ -18561,13 +18561,13 @@
       }
     },
     "@babel/preset-env": {
-      "version": "7.22.7",
-      "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.22.7.tgz",
-      "integrity": "sha512-1whfDtW+CzhETuzYXfcgZAh8/GFMeEbz0V5dVgya8YeJyCU6Y/P2Gnx4Qb3MylK68Zu9UiwUvbPMPTpFAOJ+sQ==",
+      "version": "7.22.9",
+      "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.22.9.tgz",
+      "integrity": "sha512-wNi5H/Emkhll/bqPjsjQorSykrlfY5OWakd6AulLvMEytpKasMVUpVy8RL4qBIBs5Ac6/5i0/Rv0b/Fg6Eag/g==",
       "dev": true,
       "requires": {
-        "@babel/compat-data": "^7.22.6",
-        "@babel/helper-compilation-targets": "^7.22.6",
+        "@babel/compat-data": "^7.22.9",
+        "@babel/helper-compilation-targets": "^7.22.9",
         "@babel/helper-plugin-utils": "^7.22.5",
         "@babel/helper-validator-option": "^7.22.5",
         "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": "^7.22.5",
@@ -18641,11 +18641,11 @@
         "@babel/plugin-transform-unicode-sets-regex": "^7.22.5",
         "@babel/preset-modules": "^0.1.5",
         "@babel/types": "^7.22.5",
-        "@nicolo-ribaudo/semver-v6": "^6.3.3",
         "babel-plugin-polyfill-corejs2": "^0.4.4",
         "babel-plugin-polyfill-corejs3": "^0.8.2",
         "babel-plugin-polyfill-regenerator": "^0.5.1",
-        "core-js-compat": "^3.31.0"
+        "core-js-compat": "^3.31.0",
+        "semver": "^6.3.1"
       },
       "dependencies": {
         "@babel/helper-define-polyfill-provider": {
@@ -28656,9 +28656,9 @@
       "integrity": "sha512-O4OZEaNtkMd/K0i6js9SL+gqy0ZCBMgUvlSqHKi4IBdjhe7wB8pwztUk1BbZ1fmrvpwFrPbHzqd2w5pTcJH6LA=="
     },
     "semver": {
-      "version": "6.3.0",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-      "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw=="
+      "version": "6.3.1",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
+      "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA=="
     },
     "send": {
       "version": "0.18.0",
diff --git a/apps/block_scout_web/assets/package.json b/apps/block_scout_web/assets/package.json
index 0d5cebaf7d0c..28a1848611e0 100644
--- a/apps/block_scout_web/assets/package.json
+++ b/apps/block_scout_web/assets/package.json
@@ -84,7 +84,7 @@
   },
   "devDependencies": {
     "@babel/core": "^7.22.8",
-    "@babel/preset-env": "^7.22.7",
+    "@babel/preset-env": "^7.22.9",
     "autoprefixer": "^10.4.14",
     "babel-loader": "^9.1.3",
     "copy-webpack-plugin": "^11.0.0",

From 220deebcf8e5836c59083acf53df843c3b5b1760 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 13 Jul 2023 10:34:20 +0000
Subject: [PATCH 194/909] Bump postgrex from 0.17.1 to 0.17.2

Bumps [postgrex](https://github.com/elixir-ecto/postgrex) from 0.17.1 to 0.17.2.
- [Release notes](https://github.com/elixir-ecto/postgrex/releases)
- [Changelog](https://github.com/elixir-ecto/postgrex/blob/master/CHANGELOG.md)
- [Commits](https://github.com/elixir-ecto/postgrex/compare/v0.17.1...v0.17.2)

---
updated-dependencies:
- dependency-name: postgrex
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 mix.lock | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/mix.lock b/mix.lock
index 19229c901337..9e8d1348a44c 100644
--- a/mix.lock
+++ b/mix.lock
@@ -70,7 +70,7 @@
   "httpoison": {:hex, :httpoison, "2.1.0", "655fd9a7b0b95ee3e9a3b535cf7ac8e08ef5229bab187fa86ac4208b122d934b", [:mix], [{:hackney, "~> 1.17", [hex: :hackney, repo: "hexpm", optional: false]}], "hexpm", "fc455cb4306b43827def4f57299b2d5ac8ac331cb23f517e734a4b78210a160c"},
   "idna": {:hex, :idna, "6.1.1", "8a63070e9f7d0c62eb9d9fcb360a7de382448200fbbd1b106cc96d3d8099df8d", [:rebar3], [{:unicode_util_compat, "~>0.7.0", [hex: :unicode_util_compat, repo: "hexpm", optional: false]}], "hexpm", "92376eb7894412ed19ac475e4a86f7b413c1b9fbb5bd16dccd57934157944cea"},
   "inflex": {:hex, :inflex, "2.1.0", "a365cf0821a9dacb65067abd95008ca1b0bb7dcdd85ae59965deef2aa062924c", [:mix], [], "hexpm", "14c17d05db4ee9b6d319b0bff1bdf22aa389a25398d1952c7a0b5f3d93162dd8"},
-  "jason": {:hex, :jason, "1.4.0", "e855647bc964a44e2f67df589ccf49105ae039d4179db7f6271dfd3843dc27e6", [:mix], [{:decimal, "~> 1.0 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: true]}], "hexpm", "79a3791085b2a0f743ca04cec0f7be26443738779d09302e01318f97bdb82121"},
+  "jason": {:hex, :jason, "1.4.1", "af1504e35f629ddcdd6addb3513c3853991f694921b1b9368b0bd32beb9f1b63", [:mix], [{:decimal, "~> 1.0 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: true]}], "hexpm", "fbb01ecdfd565b56261302f7e1fcc27c4fb8f32d56eab74db621fc154604a7a1"},
   "jsx": {:hex, :jsx, "2.8.3", "a05252d381885240744d955fbe3cf810504eb2567164824e19303ea59eef62cf", [:mix, :rebar3], [], "hexpm", "fc3499fed7a726995aa659143a248534adc754ebd16ccd437cd93b649a95091f"},
   "junit_formatter": {:hex, :junit_formatter, "3.3.1", "c729befb848f1b9571f317d2fefa648e9d4869befc4b2980daca7c1edc468e40", [:mix], [], "hexpm", "761fc5be4b4c15d8ba91a6dafde0b2c2ae6db9da7b8832a55b5a1deb524da72b"},
   "libsecp256k1": {:hex, :libsecp256k1, "0.1.10", "d27495e2b9851c7765129b76c53b60f5e275bd6ff68292c50536bf6b8d091a4d", [:make, :mix], [{:mix_erlang_tasks, "0.1.0", [hex: :mix_erlang_tasks, repo: "hexpm", optional: false]}], "hexpm", "09ea06239938571124f7f5a27bc9ac45dfb1cfc2df40d46ee9b59c3d51366652"},
@@ -108,7 +108,7 @@
   "plug_crypto": {:hex, :plug_crypto, "1.2.5", "918772575e48e81e455818229bf719d4ab4181fcbf7f85b68a35620f78d89ced", [:mix], [], "hexpm", "26549a1d6345e2172eb1c233866756ae44a9609bd33ee6f99147ab3fd87fd842"},
   "poison": {:hex, :poison, "4.0.1", "bcb755a16fac91cad79bfe9fc3585bb07b9331e50cfe3420a24bcc2d735709ae", [:mix], [], "hexpm", "ba8836feea4b394bb718a161fc59a288fe0109b5006d6bdf97b6badfcf6f0f25"},
   "poolboy": {:hex, :poolboy, "1.5.2", "392b007a1693a64540cead79830443abf5762f5d30cf50bc95cb2c1aaafa006b", [:rebar3], [], "hexpm", "dad79704ce5440f3d5a3681c8590b9dc25d1a561e8f5a9c995281012860901e3"},
-  "postgrex": {:hex, :postgrex, "0.17.1", "01c29fd1205940ee55f7addb8f1dc25618ca63a8817e56fac4f6846fc2cddcbe", [:mix], [{:db_connection, "~> 2.1", [hex: :db_connection, repo: "hexpm", optional: false]}, {:decimal, "~> 1.5 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}, {:table, "~> 0.1.0", [hex: :table, repo: "hexpm", optional: true]}], "hexpm", "14b057b488e73be2beee508fb1955d8db90d6485c6466428fe9ccf1d6692a555"},
+  "postgrex": {:hex, :postgrex, "0.17.2", "a3ec9e3239d9b33f1e5841565c4eb200055c52cc0757a22b63ca2d529bbe764c", [:mix], [{:db_connection, "~> 2.1", [hex: :db_connection, repo: "hexpm", optional: false]}, {:decimal, "~> 1.5 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}, {:table, "~> 0.1.0", [hex: :table, repo: "hexpm", optional: true]}], "hexpm", "80a918a9e9531d39f7bd70621422f3ebc93c01618c645f2d91306f50041ed90c"},
   "prometheus": {:hex, :prometheus, "4.10.0", "792adbf0130ff61b5fa8826f013772af24b6e57b984445c8d602c8a0355704a1", [:mix, :rebar3], [{:quantile_estimator, "~> 0.2.1", [hex: :quantile_estimator, repo: "hexpm", optional: false]}], "hexpm", "2a99bb6dce85e238c7236fde6b0064f9834dc420ddbd962aac4ea2a3c3d59384"},
   "prometheus_ecto": {:hex, :prometheus_ecto, "1.4.3", "3dd4da1812b8e0dbee81ea58bb3b62ed7588f2eae0c9e97e434c46807ff82311", [:mix], [{:ecto, "~> 2.0 or ~> 3.0", [hex: :ecto, repo: "hexpm", optional: false]}, {:prometheus_ex, "~> 1.1 or ~> 2.0 or ~> 3.0", [hex: :prometheus_ex, repo: "hexpm", optional: false]}], "hexpm", "8d66289f77f913b37eda81fd287340c17e61a447549deb28efc254532b2bed82"},
   "prometheus_ex": {:git, "https://github.com/lanodan/prometheus.ex", "31f7fbe4b71b79ba27efc2a5085746c4011ceb8f", [branch: "fix/elixir-1.14"]},

From 5971229923657375040f420a19d11ec520e38118 Mon Sep 17 00:00:00 2001
From: Qwerty5Uiop <alex000010@bk.ru>
Date: Thu, 13 Jul 2023 15:03:24 +0400
Subject: [PATCH 195/909] Revert "Fix fetching libstdc++ in
 install_chrome_headless.sh"

This reverts commit 70e696b6b2cfcab5e823de47ce527937b0dbc3d7.
---
 .github/workflows/config.yml | 54 ++++++++++++++++++------------------
 1 file changed, 27 insertions(+), 27 deletions(-)

diff --git a/.github/workflows/config.yml b/.github/workflows/config.yml
index 318c79537f1f..64c2cb8f800e 100644
--- a/.github/workflows/config.yml
+++ b/.github/workflows/config.yml
@@ -26,7 +26,7 @@ env:
 jobs:
   build-and-cache:
     name: Build and Cache deps
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
       - uses: erlef/setup-beam@v1
@@ -47,7 +47,7 @@ jobs:
           path: |
             deps
             _build
-          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_21-${{ hashFiles('mix.lock') }}
+          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_20-${{ hashFiles('mix.lock') }}
           restore-keys: |
             ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-
 
@@ -91,7 +91,7 @@ jobs:
 
   credo:
     name: Credo
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     needs: build-and-cache
     steps:
       - uses: actions/checkout@v2
@@ -107,7 +107,7 @@ jobs:
           path: |
             deps
             _build
-          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_21-${{ hashFiles('mix.lock') }}
+          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_20-${{ hashFiles('mix.lock') }}
           restore-keys: |
             ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-"
 
@@ -115,7 +115,7 @@ jobs:
 
   check_formatted:
     name: Code formatting checks
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     needs: build-and-cache
     steps:
       - uses: actions/checkout@v2
@@ -131,14 +131,14 @@ jobs:
           path: |
             deps
             _build
-          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_21-${{ hashFiles('mix.lock') }}
+          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_20-${{ hashFiles('mix.lock') }}
           restore-keys: |
             ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-"
 
       - run: mix format --check-formatted
   dialyzer:
     name: Dialyzer static analysis
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     needs: build-and-cache
     steps:
       - uses: actions/checkout@v2
@@ -154,7 +154,7 @@ jobs:
           path: |
             deps
             _build
-          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_21-${{ hashFiles('mix.lock') }}
+          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_20-${{ hashFiles('mix.lock') }}
           restore-keys: |
             ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-"
 
@@ -163,7 +163,7 @@ jobs:
         id: dialyzer-cache
         with:
           path: priv/plts
-          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-dialyzer-mixlockhash_21-${{ hashFiles('mix.lock') }}
+          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-dialyzer-mixlockhash_20-${{ hashFiles('mix.lock') }}
           restore-keys: |
             ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-dialyzer-"
 
@@ -178,7 +178,7 @@ jobs:
 
   gettext:
     name: Missing translation keys check
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     needs: build-and-cache
     steps:
       - uses: actions/checkout@v2
@@ -194,7 +194,7 @@ jobs:
           path: |
             deps
             _build
-          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_21-${{ hashFiles('mix.lock') }}
+          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_20-${{ hashFiles('mix.lock') }}
           restore-keys: |
             ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-"
 
@@ -204,7 +204,7 @@ jobs:
         working-directory: "apps/block_scout_web"
   sobelow:
     name: Sobelow security analysis
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     needs: build-and-cache
     steps:
       - uses: actions/checkout@v2
@@ -220,7 +220,7 @@ jobs:
           path: |
             deps
             _build
-          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_21-${{ hashFiles('mix.lock') }}
+          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_20-${{ hashFiles('mix.lock') }}
           restore-keys: |
             ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-"
 
@@ -233,7 +233,7 @@ jobs:
 
   cspell:
     name: Check spelling
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     needs: build-and-cache
     steps:
       - uses: actions/checkout@v2
@@ -249,7 +249,7 @@ jobs:
           path: |
             deps
             _build
-          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_21-${{ hashFiles('mix.lock') }}
+          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_20-${{ hashFiles('mix.lock') }}
           restore-keys: |
             ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-"
 
@@ -281,7 +281,7 @@ jobs:
 
   eslint:
     name: ESLint
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     needs: build-and-cache
     steps:
       - uses: actions/checkout@v2
@@ -297,7 +297,7 @@ jobs:
           path: |
             deps
             _build
-          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_21-${{ hashFiles('mix.lock') }}
+          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_20-${{ hashFiles('mix.lock') }}
           restore-keys: |
             ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-"
 
@@ -327,7 +327,7 @@ jobs:
         working-directory: apps/block_scout_web/assets
   jest:
     name: JS Tests
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     needs: build-and-cache
     steps:
       - uses: actions/checkout@v2
@@ -343,7 +343,7 @@ jobs:
           path: |
             deps
             _build
-          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_21-${{ hashFiles('mix.lock') }}
+          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_20-${{ hashFiles('mix.lock') }}
           restore-keys: |
             ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-"
 
@@ -365,7 +365,7 @@ jobs:
 
   test_nethermind_mox_ethereum_jsonrpc:
     name: EthereumJSONRPC Tests
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     needs: build-and-cache
     services:
       postgres:
@@ -400,7 +400,7 @@ jobs:
           path: |
             deps
             _build
-          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_21-${{ hashFiles('mix.lock') }}
+          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_20-${{ hashFiles('mix.lock') }}
           restore-keys: |
             ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-"
 
@@ -419,7 +419,7 @@ jobs:
           ETHEREUM_JSONRPC_WEB_SOCKET_CASE: "EthereumJSONRPC.WebSocket.Case.Mox"
   test_nethermind_mox_explorer:
     name: Explorer Tests
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     needs: build-and-cache
     services:
       postgres:
@@ -454,7 +454,7 @@ jobs:
           path: |
             deps
             _build
-          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_21-${{ hashFiles('mix.lock') }}
+          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_20-${{ hashFiles('mix.lock') }}
           restore-keys: |
             ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-"
 
@@ -484,7 +484,7 @@ jobs:
           ETHEREUM_JSONRPC_WEB_SOCKET_CASE: "EthereumJSONRPC.WebSocket.Case.Mox"
   test_nethermind_mox_indexer:
     name: Indexer Tests
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     needs: build-and-cache
     services:
       postgres:
@@ -519,7 +519,7 @@ jobs:
           path: |
             deps
             _build
-          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_21-${{ hashFiles('mix.lock') }}
+          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_20-${{ hashFiles('mix.lock') }}
           restore-keys: |
             ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-"
 
@@ -543,7 +543,7 @@ jobs:
 
   test_nethermind_mox_block_scout_web:
     name: Blockscout Web Tests
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     needs: build-and-cache
     services:
       redis_db:
@@ -583,7 +583,7 @@ jobs:
           path: |
             deps
             _build
-          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_21-${{ hashFiles('mix.lock') }}
+          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_20-${{ hashFiles('mix.lock') }}
           restore-keys: |
             ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-"
 

From 6293b8928cdfade9834900a6499111715328bdd5 Mon Sep 17 00:00:00 2001
From: Qwerty5Uiop <alex000010@bk.ru>
Date: Thu, 13 Jul 2023 15:04:16 +0400
Subject: [PATCH 196/909] Add apt-get update to install chrome script

---
 bin/install_chrome_headless.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/bin/install_chrome_headless.sh b/bin/install_chrome_headless.sh
index 1b365ed7a861..a19902c42c35 100755
--- a/bin/install_chrome_headless.sh
+++ b/bin/install_chrome_headless.sh
@@ -8,4 +8,5 @@ sudo chmod +x chromedriver
 sudo mv chromedriver /usr/local/bin
 wget https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb
 sudo apt install ./google-chrome-stable_current_amd64.deb
+sudo apt-get update
 sudo apt-get install libstdc++6

From 60f2a0a83f984cd012d3ced9adc0b756177e333c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 13 Jul 2023 11:45:09 +0000
Subject: [PATCH 197/909] Bump @babel/core from 7.22.8 to 7.22.9 in
 /apps/block_scout_web/assets

Bumps [@babel/core](https://github.com/babel/babel/tree/HEAD/packages/babel-core) from 7.22.8 to 7.22.9.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/commits/v7.22.9/packages/babel-core)

---
updated-dependencies:
- dependency-name: "@babel/core"
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 apps/block_scout_web/assets/package-lock.json | 79 +++++++++----------
 apps/block_scout_web/assets/package.json      |  2 +-
 2 files changed, 40 insertions(+), 41 deletions(-)

diff --git a/apps/block_scout_web/assets/package-lock.json b/apps/block_scout_web/assets/package-lock.json
index 481f64e972d4..8be40c136c2b 100644
--- a/apps/block_scout_web/assets/package-lock.json
+++ b/apps/block_scout_web/assets/package-lock.json
@@ -71,7 +71,7 @@
         "xss": "^1.0.14"
       },
       "devDependencies": {
-        "@babel/core": "^7.22.8",
+        "@babel/core": "^7.22.9",
         "@babel/preset-env": "^7.22.9",
         "autoprefixer": "^10.4.14",
         "babel-loader": "^9.1.3",
@@ -248,25 +248,25 @@
       }
     },
     "node_modules/@babel/core": {
-      "version": "7.22.8",
-      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.22.8.tgz",
-      "integrity": "sha512-75+KxFB4CZqYRXjx4NlR4J7yGvKumBuZTmV4NV6v09dVXXkuYVYLT68N6HCzLvfJ+fWCxQsntNzKwwIXL4bHnw==",
+      "version": "7.22.9",
+      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.22.9.tgz",
+      "integrity": "sha512-G2EgeufBcYw27U4hhoIwFcgc1XU7TlXJ3mv04oOv1WCuo900U/anZSPzEqNjwdjgffkk2Gs0AN0dW1CKVLcG7w==",
       "dependencies": {
         "@ampproject/remapping": "^2.2.0",
         "@babel/code-frame": "^7.22.5",
-        "@babel/generator": "^7.22.7",
-        "@babel/helper-compilation-targets": "^7.22.6",
-        "@babel/helper-module-transforms": "^7.22.5",
+        "@babel/generator": "^7.22.9",
+        "@babel/helper-compilation-targets": "^7.22.9",
+        "@babel/helper-module-transforms": "^7.22.9",
         "@babel/helpers": "^7.22.6",
         "@babel/parser": "^7.22.7",
         "@babel/template": "^7.22.5",
         "@babel/traverse": "^7.22.8",
         "@babel/types": "^7.22.5",
-        "@nicolo-ribaudo/semver-v6": "^6.3.3",
         "convert-source-map": "^1.7.0",
         "debug": "^4.1.0",
         "gensync": "^1.0.0-beta.2",
-        "json5": "^2.2.2"
+        "json5": "^2.2.2",
+        "semver": "^6.3.1"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -277,9 +277,9 @@
       }
     },
     "node_modules/@babel/generator": {
-      "version": "7.22.7",
-      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.22.7.tgz",
-      "integrity": "sha512-p+jPjMG+SI8yvIaxGgeW24u7q9+5+TGpZh8/CuB7RhBKd7RCy8FayNEFNNKrNK/eUcY/4ExQqLmyrvBXKsIcwQ==",
+      "version": "7.22.9",
+      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.22.9.tgz",
+      "integrity": "sha512-KtLMbmicyuK2Ak/FTCJVbDnkN1SlT8/kceFTiuDiiRUUSMnHMidxSCdG4ndkTOHHpoomWe/4xkvHkEOncwjYIw==",
       "dependencies": {
         "@babel/types": "^7.22.5",
         "@jridgewell/gen-mapping": "^0.3.2",
@@ -455,21 +455,21 @@
       }
     },
     "node_modules/@babel/helper-module-transforms": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.22.5.tgz",
-      "integrity": "sha512-+hGKDt/Ze8GFExiVHno/2dvG5IdstpzCq0y4Qc9OJ25D4q3pKfiIP/4Vp3/JvhDkLKsDK2api3q3fpIgiIF5bw==",
+      "version": "7.22.9",
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.22.9.tgz",
+      "integrity": "sha512-t+WA2Xn5K+rTeGtC8jCsdAH52bjggG5TKRuRrAGNM/mjIbO4GxvlLMFOEz9wXY5I2XQ60PMFsAG2WIcG82dQMQ==",
       "dependencies": {
         "@babel/helper-environment-visitor": "^7.22.5",
         "@babel/helper-module-imports": "^7.22.5",
         "@babel/helper-simple-access": "^7.22.5",
-        "@babel/helper-split-export-declaration": "^7.22.5",
-        "@babel/helper-validator-identifier": "^7.22.5",
-        "@babel/template": "^7.22.5",
-        "@babel/traverse": "^7.22.5",
-        "@babel/types": "^7.22.5"
+        "@babel/helper-split-export-declaration": "^7.22.6",
+        "@babel/helper-validator-identifier": "^7.22.5"
       },
       "engines": {
         "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0"
       }
     },
     "node_modules/@babel/helper-optimise-call-expression": {
@@ -3330,6 +3330,7 @@
       "version": "6.3.3",
       "resolved": "https://registry.npmjs.org/@nicolo-ribaudo/semver-v6/-/semver-v6-6.3.3.tgz",
       "integrity": "sha512-3Yc1fUTs69MG/uZbJlLSI3JISMn2UV2rg+1D/vROUqZyh3l6iYHCs7GMp+M40ZD7yOdDbYjJcU1oTJhrc+dGKg==",
+      "dev": true,
       "bin": {
         "semver": "bin/semver.js"
       }
@@ -17537,31 +17538,31 @@
       "integrity": "sha512-5UamI7xkUcJ3i9qVDS+KFDEK8/7oJ55/sJMB1Ge7IEapr7KfdfV/HErR+koZwOfd+SgtFKOKRhRakdg++DcJpQ=="
     },
     "@babel/core": {
-      "version": "7.22.8",
-      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.22.8.tgz",
-      "integrity": "sha512-75+KxFB4CZqYRXjx4NlR4J7yGvKumBuZTmV4NV6v09dVXXkuYVYLT68N6HCzLvfJ+fWCxQsntNzKwwIXL4bHnw==",
+      "version": "7.22.9",
+      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.22.9.tgz",
+      "integrity": "sha512-G2EgeufBcYw27U4hhoIwFcgc1XU7TlXJ3mv04oOv1WCuo900U/anZSPzEqNjwdjgffkk2Gs0AN0dW1CKVLcG7w==",
       "requires": {
         "@ampproject/remapping": "^2.2.0",
         "@babel/code-frame": "^7.22.5",
-        "@babel/generator": "^7.22.7",
-        "@babel/helper-compilation-targets": "^7.22.6",
-        "@babel/helper-module-transforms": "^7.22.5",
+        "@babel/generator": "^7.22.9",
+        "@babel/helper-compilation-targets": "^7.22.9",
+        "@babel/helper-module-transforms": "^7.22.9",
         "@babel/helpers": "^7.22.6",
         "@babel/parser": "^7.22.7",
         "@babel/template": "^7.22.5",
         "@babel/traverse": "^7.22.8",
         "@babel/types": "^7.22.5",
-        "@nicolo-ribaudo/semver-v6": "^6.3.3",
         "convert-source-map": "^1.7.0",
         "debug": "^4.1.0",
         "gensync": "^1.0.0-beta.2",
-        "json5": "^2.2.2"
+        "json5": "^2.2.2",
+        "semver": "^6.3.1"
       }
     },
     "@babel/generator": {
-      "version": "7.22.7",
-      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.22.7.tgz",
-      "integrity": "sha512-p+jPjMG+SI8yvIaxGgeW24u7q9+5+TGpZh8/CuB7RhBKd7RCy8FayNEFNNKrNK/eUcY/4ExQqLmyrvBXKsIcwQ==",
+      "version": "7.22.9",
+      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.22.9.tgz",
+      "integrity": "sha512-KtLMbmicyuK2Ak/FTCJVbDnkN1SlT8/kceFTiuDiiRUUSMnHMidxSCdG4ndkTOHHpoomWe/4xkvHkEOncwjYIw==",
       "requires": {
         "@babel/types": "^7.22.5",
         "@jridgewell/gen-mapping": "^0.3.2",
@@ -17694,18 +17695,15 @@
       }
     },
     "@babel/helper-module-transforms": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.22.5.tgz",
-      "integrity": "sha512-+hGKDt/Ze8GFExiVHno/2dvG5IdstpzCq0y4Qc9OJ25D4q3pKfiIP/4Vp3/JvhDkLKsDK2api3q3fpIgiIF5bw==",
+      "version": "7.22.9",
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.22.9.tgz",
+      "integrity": "sha512-t+WA2Xn5K+rTeGtC8jCsdAH52bjggG5TKRuRrAGNM/mjIbO4GxvlLMFOEz9wXY5I2XQ60PMFsAG2WIcG82dQMQ==",
       "requires": {
         "@babel/helper-environment-visitor": "^7.22.5",
         "@babel/helper-module-imports": "^7.22.5",
         "@babel/helper-simple-access": "^7.22.5",
-        "@babel/helper-split-export-declaration": "^7.22.5",
-        "@babel/helper-validator-identifier": "^7.22.5",
-        "@babel/template": "^7.22.5",
-        "@babel/traverse": "^7.22.5",
-        "@babel/types": "^7.22.5"
+        "@babel/helper-split-export-declaration": "^7.22.6",
+        "@babel/helper-validator-identifier": "^7.22.5"
       }
     },
     "@babel/helper-optimise-call-expression": {
@@ -19680,7 +19678,8 @@
     "@nicolo-ribaudo/semver-v6": {
       "version": "6.3.3",
       "resolved": "https://registry.npmjs.org/@nicolo-ribaudo/semver-v6/-/semver-v6-6.3.3.tgz",
-      "integrity": "sha512-3Yc1fUTs69MG/uZbJlLSI3JISMn2UV2rg+1D/vROUqZyh3l6iYHCs7GMp+M40ZD7yOdDbYjJcU1oTJhrc+dGKg=="
+      "integrity": "sha512-3Yc1fUTs69MG/uZbJlLSI3JISMn2UV2rg+1D/vROUqZyh3l6iYHCs7GMp+M40ZD7yOdDbYjJcU1oTJhrc+dGKg==",
+      "dev": true
     },
     "@nodelib/fs.scandir": {
       "version": "2.1.5",
diff --git a/apps/block_scout_web/assets/package.json b/apps/block_scout_web/assets/package.json
index 28a1848611e0..fecee6abfd58 100644
--- a/apps/block_scout_web/assets/package.json
+++ b/apps/block_scout_web/assets/package.json
@@ -83,7 +83,7 @@
     "xss": "^1.0.14"
   },
   "devDependencies": {
-    "@babel/core": "^7.22.8",
+    "@babel/core": "^7.22.9",
     "@babel/preset-env": "^7.22.9",
     "autoprefixer": "^10.4.14",
     "babel-loader": "^9.1.3",

From 6447947b1950cddf9ef7ab362542e6d49c71284b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 13 Jul 2023 18:25:28 +0000
Subject: [PATCH 198/909] Bump wallaby from 0.30.3 to 0.30.4

Bumps [wallaby](https://github.com/elixir-wallaby/wallaby) from 0.30.3 to 0.30.4.
- [Release notes](https://github.com/elixir-wallaby/wallaby/releases)
- [Changelog](https://github.com/elixir-wallaby/wallaby/blob/main/CHANGELOG.md)
- [Commits](https://github.com/elixir-wallaby/wallaby/compare/v0.30.3...v0.30.4)

---
updated-dependencies:
- dependency-name: wallaby
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 mix.lock | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/mix.lock b/mix.lock
index 9e8d1348a44c..ec46ae21f314 100644
--- a/mix.lock
+++ b/mix.lock
@@ -88,7 +88,7 @@
   "mix_erlang_tasks": {:hex, :mix_erlang_tasks, "0.1.0", "36819fec60b80689eb1380938675af215565a89320a9e29c72c70d97512e4649", [:mix], [], "hexpm", "95d2839c422c482a70c08a8702da8242f86b773f8ab6e8602a4eb72da8da04ed"},
   "mock": {:hex, :mock, "0.3.8", "7046a306b71db2488ef54395eeb74df0a7f335a7caca4a3d3875d1fc81c884dd", [:mix], [{:meck, "~> 0.9.2", [hex: :meck, repo: "hexpm", optional: false]}], "hexpm", "7fa82364c97617d79bb7d15571193fc0c4fe5afd0c932cef09426b3ee6fe2022"},
   "mox": {:hex, :mox, "1.0.2", "dc2057289ac478b35760ba74165b4b3f402f68803dd5aecd3bfd19c183815d64", [:mix], [], "hexpm", "f9864921b3aaf763c8741b5b8e6f908f44566f1e427b2630e89e9a73b981fef2"},
-  "msgpax": {:hex, :msgpax, "2.3.1", "28e17c4abb4c57da742e75de62abd9d01c76f1da0b103334de3fb1199610b3d9", [:mix], [{:plug, "~> 1.0", [hex: :plug, repo: "hexpm", optional: true]}], "hexpm", "17c8bf2fc2327b74e4bc6633dd520ffa10ea07b0a2f8ab1932db99044e116df5"},
+  "msgpax": {:hex, :msgpax, "2.4.0", "4647575c87cb0c43b93266438242c21f71f196cafa268f45f91498541148c15d", [:mix], [{:plug, "~> 1.0", [hex: :plug, repo: "hexpm", optional: true]}], "hexpm", "ca933891b0e7075701a17507c61642bf6e0407bb244040d5d0a58597a06369d2"},
   "nimble_csv": {:hex, :nimble_csv, "1.2.0", "4e26385d260c61eba9d4412c71cea34421f296d5353f914afe3f2e71cce97722", [:mix], [], "hexpm", "d0628117fcc2148178b034044c55359b26966c6eaa8e2ce15777be3bbc91b12a"},
   "nimble_options": {:hex, :nimble_options, "1.0.2", "92098a74df0072ff37d0c12ace58574d26880e522c22801437151a159392270e", [:mix], [], "hexpm", "fd12a8db2021036ce12a309f26f564ec367373265b53e25403f0ee697380f1b8"},
   "nimble_parsec": {:hex, :nimble_parsec, "1.3.1", "2c54013ecf170e249e9291ed0a62e5832f70a476c61da16f6aac6dca0189f2af", [:mix], [], "hexpm", "2682e3c0b2eb58d90c6375fc0cc30bc7be06f365bf72608804fb9cffa5e1b167"},
@@ -138,7 +138,7 @@
   "ueberauth": {:hex, :ueberauth, "0.10.5", "806adb703df87e55b5615cf365e809f84c20c68aa8c08ff8a416a5a6644c4b02", [:mix], [{:plug, "~> 1.5", [hex: :plug, repo: "hexpm", optional: false]}], "hexpm", "3efd1f31d490a125c7ed453b926f7c31d78b97b8a854c755f5c40064bf3ac9e1"},
   "ueberauth_auth0": {:hex, :ueberauth_auth0, "2.1.0", "0632d5844049fa2f26823f15e1120aa32f27df6f27ce515a4b04641736594bf4", [:mix], [{:oauth2, "~> 2.0", [hex: :oauth2, repo: "hexpm", optional: false]}, {:ueberauth, "~> 0.7", [hex: :ueberauth, repo: "hexpm", optional: false]}], "hexpm", "8d3b30fa27c95c9e82c30c4afb016251405706d2e9627e603c3c9787fd1314fc"},
   "unicode_util_compat": {:hex, :unicode_util_compat, "0.7.0", "bc84380c9ab48177092f43ac89e4dfa2c6d62b40b8bd132b1059ecc7232f9a78", [:rebar3], [], "hexpm", "25eee6d67df61960cf6a794239566599b09e17e668d3700247bc498638152521"},
-  "wallaby": {:hex, :wallaby, "0.30.3", "9213ebf6e22e34544ede60e435bdbf807b67119ba4548f7b9bdbbd53a359767f", [:mix], [{:ecto_sql, ">= 3.0.0", [hex: :ecto_sql, repo: "hexpm", optional: true]}, {:httpoison, "~> 0.12 or ~> 1.0 or ~> 2.0", [hex: :httpoison, repo: "hexpm", optional: false]}, {:jason, "~> 1.1", [hex: :jason, repo: "hexpm", optional: false]}, {:phoenix_ecto, ">= 3.0.0", [hex: :phoenix_ecto, repo: "hexpm", optional: true]}, {:web_driver_client, "~> 0.2.0", [hex: :web_driver_client, repo: "hexpm", optional: false]}], "hexpm", "40844afbf3bf6933f21406bdba2c59042ea0983b7a2533a51f46d372d79bc400"},
+  "wallaby": {:hex, :wallaby, "0.30.4", "a79a9b7efde568b7f701637ae211ecbc41119a53b1bec84de027d8400aeec229", [:mix], [{:ecto_sql, ">= 3.0.0", [hex: :ecto_sql, repo: "hexpm", optional: true]}, {:httpoison, "~> 0.12 or ~> 1.0 or ~> 2.0", [hex: :httpoison, repo: "hexpm", optional: false]}, {:jason, "~> 1.1", [hex: :jason, repo: "hexpm", optional: false]}, {:phoenix_ecto, ">= 3.0.0", [hex: :phoenix_ecto, repo: "hexpm", optional: true]}, {:web_driver_client, "~> 0.2.0", [hex: :web_driver_client, repo: "hexpm", optional: false]}], "hexpm", "330fa16a8fd2e6cefd60c74acbdb90a1b0e539a29cdea9152ca9aec55df7fc0e"},
   "web_driver_client": {:hex, :web_driver_client, "0.2.0", "63b76cd9eb3b0716ec5467a0f8bead73d3d9612e63f7560d21357f03ad86e31a", [:mix], [{:hackney, "~> 1.6", [hex: :hackney, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: false]}, {:tesla, "~> 1.3", [hex: :tesla, repo: "hexpm", optional: false]}], "hexpm", "83cc6092bc3e74926d1c8455f0ce927d5d1d36707b74d9a65e38c084aab0350f"},
   "websocket_client": {:git, "https://github.com/blockscout/websocket_client.git", "0b4ecc5b1fb8a0bd1c8352728da787c20add53aa", [branch: "master"]},
 }

From 2981a6455ec7f064546fb657982b83a039cb446a Mon Sep 17 00:00:00 2001
From: Viktor Baranov <baranov.viktor.27@gmail.com>
Date: Fri, 14 Jul 2023 12:30:53 +0300
Subject: [PATCH 199/909] Explicitly set consensus == true in queries
 (convenient for search)

---
 CHANGELOG.md                                   |  1 +
 .../lib/explorer/account/notifier/summary.ex   |  2 --
 apps/explorer/lib/explorer/chain.ex            |  8 ++++----
 .../lib/explorer/chain/address/coin_balance.ex | 18 +++++++++---------
 .../import/runner/internal_transactions.ex     |  4 ++--
 .../smart_contract/vyper/code_compiler.ex      |  2 --
 .../indexer/fetcher/empty_blocks_sanitizer.ex  |  2 +-
 .../indexer/temporary/uncles_without_index.ex  |  2 +-
 8 files changed, 18 insertions(+), 21 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 938bfee6f190..0428bb019d27 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -25,6 +25,7 @@
 
 ### Chore
 
+- [#7934](https://github.com/blockscout/blockscout/pull/7934) - Explicitly set consensus == true in queries (convenient for search)
 - [#7901](https://github.com/blockscout/blockscout/pull/7901) - Fix Docker image build
 - [#7890](https://github.com/blockscout/blockscout/pull/7890), [#7918](https://github.com/blockscout/blockscout/pull/7918) - Resolve warning: Application.get_env/2 is discouraged in the module body, use Application.compile_env/3 instead
 - [#7863](https://github.com/blockscout/blockscout/pull/7863) - Add max_age for account sessions
diff --git a/apps/explorer/lib/explorer/account/notifier/summary.ex b/apps/explorer/lib/explorer/account/notifier/summary.ex
index 2c795ce252d3..6e7833c904ad 100644
--- a/apps/explorer/lib/explorer/account/notifier/summary.ex
+++ b/apps/explorer/lib/explorer/account/notifier/summary.ex
@@ -3,8 +3,6 @@ defmodule Explorer.Account.Notifier.Summary do
     Compose a summary from transactions
   """
 
-  require Logger
-
   alias Explorer
   alias Explorer.Account.Notifier.Summary
   alias Explorer.{Chain, Repo}
diff --git a/apps/explorer/lib/explorer/chain.ex b/apps/explorer/lib/explorer/chain.ex
index 7ad0d152b9a9..f2d2e5f02377 100644
--- a/apps/explorer/lib/explorer/chain.ex
+++ b/apps/explorer/lib/explorer/chain.ex
@@ -764,7 +764,7 @@ defmodule Explorer.Chain do
   def block_reward(block_number) do
     block_hash =
       Block
-      |> where([block], block.number == ^block_number and block.consensus)
+      |> where([block], block.number == ^block_number and block.consensus == true)
       |> select([block], block.hash)
       |> Repo.one!()
 
@@ -784,7 +784,7 @@ defmodule Explorer.Chain do
             left_join: transaction in assoc(block, :transactions),
             inner_join: emission_reward in EmissionReward,
             on: fragment("? <@ ?", block.number, emission_reward.block_range),
-            where: block.number == ^block_number and block.consensus,
+            where: block.number == ^block_number and block.consensus == true,
             group_by: [emission_reward.reward, block.hash],
             select: %Wei{
               value: coalesce(sum(transaction.gas_used * transaction.gas_price), 0) + emission_reward.reward
@@ -6373,8 +6373,8 @@ defmodule Explorer.Chain do
 
   defp find_block_timestamp(number, options) do
     Block
-    |> where([b], b.number == ^number)
-    |> select([b], b.timestamp)
+    |> where([block], block.number == ^number)
+    |> select([block], block.timestamp)
     |> limit(1)
     |> select_repo(options).one()
   end
diff --git a/apps/explorer/lib/explorer/chain/address/coin_balance.ex b/apps/explorer/lib/explorer/chain/address/coin_balance.ex
index 97e04759585f..bab4a62b6291 100644
--- a/apps/explorer/lib/explorer/chain/address/coin_balance.ex
+++ b/apps/explorer/lib/explorer/chain/address/coin_balance.ex
@@ -104,19 +104,19 @@ defmodule Explorer.Chain.Address.CoinBalance do
       Application.get_env(:block_scout_web, BlockScoutWeb.Chain.Address.CoinBalance)[:coin_balance_history_days]
 
     CoinBalance
-    |> join(:inner, [cb], b in Block, on: cb.block_number == b.number)
+    |> join(:inner, [cb], block in Block, on: cb.block_number == block.number)
     |> where([cb], cb.address_hash == ^address_hash)
     |> limit_time_interval(days_to_consider, block_timestamp)
-    |> group_by([cb, b], fragment("date_trunc('day', ?)", b.timestamp))
-    |> order_by([cb, b], fragment("date_trunc('day', ?)", b.timestamp))
-    |> select([cb, b], %{date: type(fragment("date_trunc('day', ?)", b.timestamp), :date), value: max(cb.value)})
+    |> group_by([cb, block], fragment("date_trunc('day', ?)", block.timestamp))
+    |> order_by([cb, block], fragment("date_trunc('day', ?)", block.timestamp))
+    |> select([cb, block], %{date: type(fragment("date_trunc('day', ?)", block.timestamp), :date), value: max(cb.value)})
   end
 
   def limit_time_interval(query, days_to_consider, nil) do
     query
     |> where(
-      [cb, b],
-      b.timestamp >=
+      [cb, block],
+      block.timestamp >=
         fragment("date_trunc('day', now() - CAST(? AS INTERVAL))", ^%Postgrex.Interval{days: days_to_consider})
     )
   end
@@ -124,8 +124,8 @@ defmodule Explorer.Chain.Address.CoinBalance do
   def limit_time_interval(query, days_to_consider, %{timestamp: timestamp}) do
     query
     |> where(
-      [cb, b],
-      b.timestamp >=
+      [cb, block],
+      block.timestamp >=
         fragment(
           "(? AT TIME ZONE ?) - CAST(? AS INTERVAL)",
           ^timestamp,
@@ -146,7 +146,7 @@ defmodule Explorer.Chain.Address.CoinBalance do
       cb in subquery(coin_balance_query),
       inner_join: block in Block,
       on: cb.block_number == block.number,
-      where: block.consensus,
+      where: block.consensus == true,
       select: %{timestamp: block.timestamp, value: cb.value}
     )
   end
diff --git a/apps/explorer/lib/explorer/chain/import/runner/internal_transactions.ex b/apps/explorer/lib/explorer/chain/import/runner/internal_transactions.ex
index 684e563c4a89..532bf22373de 100644
--- a/apps/explorer/lib/explorer/chain/import/runner/internal_transactions.ex
+++ b/apps/explorer/lib/explorer/chain/import/runner/internal_transactions.ex
@@ -282,7 +282,7 @@ defmodule Explorer.Chain.Import.Runner.InternalTransactions do
     query =
       from(
         block in Block,
-        where: block.number in ^block_numbers and block.consensus,
+        where: block.number in ^block_numbers and block.consensus == true,
         select: block.hash,
         # Enforce Block ShareLocks order (see docs: sharelocks.md)
         order_by: [asc: block.hash],
@@ -672,7 +672,7 @@ defmodule Explorer.Chain.Import.Runner.InternalTransactions do
       update_query =
         from(
           block in Block,
-          where: block.number in ^invalid_block_numbers and block.consensus,
+          where: block.number in ^invalid_block_numbers and block.consensus == true,
           where: block.number > ^minimal_block,
           select: block.hash,
           # ShareLocks order already enforced by `acquire_blocks` (see docs: sharelocks.md)
diff --git a/apps/explorer/lib/explorer/smart_contract/vyper/code_compiler.ex b/apps/explorer/lib/explorer/smart_contract/vyper/code_compiler.ex
index ae932cd52dc7..52e8248c612d 100644
--- a/apps/explorer/lib/explorer/smart_contract/vyper/code_compiler.ex
+++ b/apps/explorer/lib/explorer/smart_contract/vyper/code_compiler.ex
@@ -5,8 +5,6 @@ defmodule Explorer.SmartContract.Vyper.CodeCompiler do
 
   alias Explorer.SmartContract.VyperDownloader
 
-  require Logger
-
   @spec run(Keyword.t()) :: {:ok, map} | {:error, :compilation | :name}
   def run(params) do
     compiler_version = Keyword.fetch!(params, :compiler_version)
diff --git a/apps/indexer/lib/indexer/fetcher/empty_blocks_sanitizer.ex b/apps/indexer/lib/indexer/fetcher/empty_blocks_sanitizer.ex
index 3f15cdf92a87..cbc3e9ec7ea8 100644
--- a/apps/indexer/lib/indexer/fetcher/empty_blocks_sanitizer.ex
+++ b/apps/indexer/lib/indexer/fetcher/empty_blocks_sanitizer.ex
@@ -97,7 +97,7 @@ defmodule Indexer.Fetcher.EmptyBlocksSanitizer do
 
         if transactions_count > 0 do
           Logger.info(
-            "Block with number #{block_number} and hash #{to_string(block_hash)} is full of transactions. We should set consensus=false for it in order to refetch.",
+            "Block with number #{block_number} and hash #{to_string(block_hash)} is full of transactions. We should set consensus = false for it in order to refetch.",
             fetcher: :empty_blocks_to_refetch
           )
 
diff --git a/apps/indexer/lib/indexer/temporary/uncles_without_index.ex b/apps/indexer/lib/indexer/temporary/uncles_without_index.ex
index 814103e4f9b3..79abdc18147a 100644
--- a/apps/indexer/lib/indexer/temporary/uncles_without_index.ex
+++ b/apps/indexer/lib/indexer/temporary/uncles_without_index.ex
@@ -52,7 +52,7 @@ defmodule Indexer.Temporary.UnclesWithoutIndex do
     query =
       from(bsdr in SecondDegreeRelation,
         join: block in assoc(bsdr, :nephew),
-        where: is_nil(bsdr.index) and is_nil(bsdr.uncle_fetched_at) and block.consensus,
+        where: is_nil(bsdr.index) and is_nil(bsdr.uncle_fetched_at) and block.consensus == true,
         select: bsdr.nephew_hash,
         group_by: bsdr.nephew_hash
       )

From 85fa6f1925e1a76b0084712851dcd4502596f167 Mon Sep 17 00:00:00 2001
From: Viktor Baranov <baranov.viktor.27@gmail.com>
Date: Fri, 14 Jul 2023 13:53:44 +0300
Subject: [PATCH 200/909] Small refactoring

---
 .dialyzer-ignore                                             | 2 +-
 CHANGELOG.md                                                 | 2 +-
 apps/block_scout_web/lib/block_scout_web/api_router.ex       | 4 ++--
 apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/rolling_window.ex | 2 --
 apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/transaction.ex    | 4 ----
 apps/indexer/lib/indexer/fetcher/block_reward.ex             | 2 +-
 6 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/.dialyzer-ignore b/.dialyzer-ignore
index 2292e39d131a..84162c2785e0 100644
--- a/.dialyzer-ignore
+++ b/.dialyzer-ignore
@@ -3,7 +3,7 @@
 :0: Unknown type 'Elixir.Map':t/0
 :0: Unknown type 'Elixir.Hash':t/0
 :0: Unknown type 'Elixir.Address':t/0
-lib/ethereum_jsonrpc/rolling_window.ex:173
+lib/ethereum_jsonrpc/rolling_window.ex:171
 lib/explorer/smart_contract/solidity/publisher_worker.ex:1
 lib/explorer/smart_contract/vyper/publisher_worker.ex:1
 lib/explorer/smart_contract/solidity/publisher_worker.ex:6
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0428bb019d27..30d937472302 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -25,7 +25,7 @@
 
 ### Chore
 
-- [#7934](https://github.com/blockscout/blockscout/pull/7934) - Explicitly set consensus == true in queries (convenient for search)
+- [#7934](https://github.com/blockscout/blockscout/pull/7934), [#7936](https://github.com/blockscout/blockscout/pull/7936) - Explicitly set consensus == true in queries (convenient for search), remove logger requirements, where it is not used anymore
 - [#7901](https://github.com/blockscout/blockscout/pull/7901) - Fix Docker image build
 - [#7890](https://github.com/blockscout/blockscout/pull/7890), [#7918](https://github.com/blockscout/blockscout/pull/7918) - Resolve warning: Application.get_env/2 is discouraged in the module body, use Application.compile_env/3 instead
 - [#7863](https://github.com/blockscout/blockscout/pull/7863) - Add max_age for account sessions
diff --git a/apps/block_scout_web/lib/block_scout_web/api_router.ex b/apps/block_scout_web/lib/block_scout_web/api_router.ex
index ee5c4ffe5dd6..12245a9d9bd5 100644
--- a/apps/block_scout_web/lib/block_scout_web/api_router.ex
+++ b/apps/block_scout_web/lib/block_scout_web/api_router.ex
@@ -203,7 +203,7 @@ defmodule BlockScoutWeb.ApiRouter do
   scope "/v1", as: :api_v1 do
     pipe_through(:api)
     alias BlockScoutWeb.API.{EthRPC, RPC, V1}
-    alias BlockScoutWeb.API.V1.HealthController
+    alias BlockScoutWeb.API.V1.{GasPriceOracleController, HealthController}
     alias BlockScoutWeb.API.V2.SearchController
 
     # leave the same endpoint in v1 in order to keep backward compatibility
@@ -215,7 +215,7 @@ defmodule BlockScoutWeb.ApiRouter do
       get("/readiness", HealthController, :readiness)
     end
 
-    get("/gas-price-oracle", V1.GasPriceOracleController, :gas_price_oracle)
+    get("/gas-price-oracle", GasPriceOracleController, :gas_price_oracle)
 
     if Application.compile_env(:block_scout_web, __MODULE__)[:reading_enabled] do
       get("/supply", V1.SupplyController, :supply)
diff --git a/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/rolling_window.ex b/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/rolling_window.ex
index 0b2c6b959462..65657e7b92c5 100644
--- a/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/rolling_window.ex
+++ b/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/rolling_window.ex
@@ -21,8 +21,6 @@ defmodule EthereumJSONRPC.RollingWindow do
 
   use GenServer
 
-  require Logger
-
   def child_spec([init_arguments]) do
     child_spec([init_arguments, []])
   end
diff --git a/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/transaction.ex b/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/transaction.ex
index b538612cb413..d9689a07cd94 100644
--- a/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/transaction.ex
+++ b/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/transaction.ex
@@ -7,8 +7,6 @@ defmodule EthereumJSONRPC.Transaction do
   [`eth_getTransactionByBlockHashAndIndex`](https://github.com/ethereum/wiki/wiki/JSON-RPC#eth_gettransactionbyblockhashandindex),
   and [`eth_getTransactionByBlockNumberAndIndex`](https://github.com/ethereum/wiki/wiki/JSON-RPC#eth_gettransactionbyblocknumberandindex)
   """
-  require Logger
-
   import EthereumJSONRPC, only: [quantity_to_integer: 1, integer_to_quantity: 1, request: 1]
 
   alias EthereumJSONRPC
@@ -425,8 +423,6 @@ defmodule EthereumJSONRPC.Transaction do
   end
 
   def to_elixir(transaction) when is_binary(transaction) do
-    #    Logger.warn(["Fetched transaction is not full: ", transaction])
-
     nil
   end
 
diff --git a/apps/indexer/lib/indexer/fetcher/block_reward.ex b/apps/indexer/lib/indexer/fetcher/block_reward.ex
index 43ceac52682a..f6825a5ffce6 100644
--- a/apps/indexer/lib/indexer/fetcher/block_reward.ex
+++ b/apps/indexer/lib/indexer/fetcher/block_reward.ex
@@ -100,7 +100,7 @@ defmodule Indexer.Fetcher.BlockReward do
       {:error, reason} ->
         Logger.error(
           fn ->
-            ["failed to fetch: ", inspect(reason)]
+            ["failed to fetch: ", inspect(reason), " hash: ", inspect(hash_string_by_number)]
           end,
           error_count: consensus_number_count
         )

From 3a6c07cea077140582efdc6f79a9070e5e472054 Mon Sep 17 00:00:00 2001
From: nikitosing <32202610+nikitosing@users.noreply.github.com>
Date: Fri, 14 Jul 2023 14:53:32 +0300
Subject: [PATCH 201/909] Add token balances info to watchlist address response
 (#7888)

* Add token balances info to watchlist address response

* Changelog

* Handle nil fiat_value
---
 CHANGELOG.md                                  |   1 +
 .../account/api/v1/user_controller.ex         |  28 ++++-
 .../views/account/api/v1/user_view.ex         |   5 +-
 .../account/api/v1/user_controller_test.exs   | 106 ++++++++++++++++++
 .../lib/explorer/account/watchlist_address.ex |   3 +
 apps/explorer/test/support/factory.ex         |   2 +-
 6 files changed, 141 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0428bb019d27..8c6fae903b0e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,7 @@
 
 ### Features
 
+- [#7888](https://github.com/blockscout/blockscout/pull/7888) - Add token balances info to watchlist address response
 - [#7898](https://github.com/blockscout/blockscout/pull/7898) - Add possibility to add extra headers with JSON RPC URL
 - [#7836](https://github.com/blockscout/blockscout/pull/7836) - Improve unverified email flow
 - [#7784](https://github.com/blockscout/blockscout/pull/7784) - Search improvements: Add new fields, light refactoring
diff --git a/apps/block_scout_web/lib/block_scout_web/controllers/account/api/v1/user_controller.ex b/apps/block_scout_web/lib/block_scout_web/controllers/account/api/v1/user_controller.ex
index 6c7f54e867f8..544e2a1c5231 100644
--- a/apps/block_scout_web/lib/block_scout_web/controllers/account/api/v1/user_controller.ex
+++ b/apps/block_scout_web/lib/block_scout_web/controllers/account/api/v1/user_controller.ex
@@ -8,12 +8,13 @@ defmodule BlockScoutWeb.Account.Api.V1.UserController do
   alias Explorer.Account.Api.Key, as: ApiKey
   alias Explorer.Account.CustomABI
   alias Explorer.Account.{Identity, PublicTagsRequest, TagAddress, TagTransaction, WatchlistAddress}
-  alias Explorer.{Market, Repo}
+  alias Explorer.{Chain, Market, PagingOptions, Repo}
   alias Plug.CSRFProtection
 
   action_fallback(BlockScoutWeb.Account.Api.V1.FallbackController)
 
   @ok_message "OK"
+  @token_balances_amount 150
 
   def info(conn, _params) do
     with {:auth, %{id: uid}} <- {:auth, current_user(conn)},
@@ -30,11 +31,34 @@ defmodule BlockScoutWeb.Account.Api.V1.UserController do
          {:watchlist, %{watchlists: [watchlist | _]}} <-
            {:watchlist, Repo.account_repo().preload(identity, :watchlists)},
          watchlist_with_addresses <- preload_watchlist_addresses(watchlist) do
+      watchlist_addresses =
+        Enum.map(watchlist_with_addresses.watchlist_addresses, fn wa ->
+          balances =
+            Chain.fetch_paginated_last_token_balances(wa.address_hash,
+              paging_options: %PagingOptions{page_size: @token_balances_amount + 1}
+            )
+
+          count = Enum.count(balances)
+          overflow? = count > @token_balances_amount
+
+          fiat_sum =
+            balances
+            |> Enum.take(@token_balances_amount)
+            |> Enum.reduce(Decimal.new(0), fn tb, acc -> Decimal.add(acc, tb.fiat_value || 0) end)
+
+          %WatchlistAddress{
+            wa
+            | tokens_fiat_value: fiat_sum,
+              tokens_count: min(count, @token_balances_amount),
+              tokens_overflow: overflow?
+          }
+        end)
+
       conn
       |> put_status(200)
       |> render(:watchlist_addresses, %{
         exchange_rate: Market.get_coin_exchange_rate(),
-        watchlist_addresses: watchlist_with_addresses.watchlist_addresses
+        watchlist_addresses: watchlist_addresses
       })
     end
   end
diff --git a/apps/block_scout_web/lib/block_scout_web/views/account/api/v1/user_view.ex b/apps/block_scout_web/lib/block_scout_web/views/account/api/v1/user_view.ex
index 415b1dbf413d..1dd819166a27 100644
--- a/apps/block_scout_web/lib/block_scout_web/views/account/api/v1/user_view.ex
+++ b/apps/block_scout_web/lib/block_scout_web/views/account/api/v1/user_view.ex
@@ -102,7 +102,10 @@ defmodule BlockScoutWeb.Account.Api.V1.UserView do
       },
       "notification_methods" => %{
         "email" => watchlist.notify_email
-      }
+      },
+      "tokens_fiat_value" => watchlist.tokens_fiat_value,
+      "tokens_count" => watchlist.tokens_count,
+      "tokens_overflow" => watchlist.tokens_overflow
     }
   end
 
diff --git a/apps/block_scout_web/test/block_scout_web/controllers/account/api/v1/user_controller_test.exs b/apps/block_scout_web/test/block_scout_web/controllers/account/api/v1/user_controller_test.exs
index cc7770b71c2a..2c88b617689d 100644
--- a/apps/block_scout_web/test/block_scout_web/controllers/account/api/v1/user_controller_test.exs
+++ b/apps/block_scout_web/test/block_scout_web/controllers/account/api/v1/user_controller_test.exs
@@ -1,6 +1,7 @@
 defmodule BlockScoutWeb.Account.Api.V1.UserControllerTest do
   use BlockScoutWeb.ConnCase
 
+  alias Explorer.Repo
   alias Explorer.Chain.Address
   alias BlockScoutWeb.Models.UserFromAuth
 
@@ -573,6 +574,111 @@ defmodule BlockScoutWeb.Account.Api.V1.UserControllerTest do
              |> json_response(422) == %{"errors" => %{"watchlist_id" => ["Address already added to the watch list"]}}
     end
 
+    test "watchlist address returns with token balances info", %{conn: conn} do
+      watchlist_address_map = build(:watchlist_address)
+
+      conn
+      |> post(
+        "/api/account/v1/user/watchlist",
+        watchlist_address_map
+      )
+      |> json_response(200)
+
+      watchlist_address_map_1 = build(:watchlist_address)
+
+      conn
+      |> post(
+        "/api/account/v1/user/watchlist",
+        watchlist_address_map_1
+      )
+      |> json_response(200)
+
+      values =
+        for _i <- 0..149 do
+          ctb =
+            insert(:address_current_token_balance_with_token_id,
+              address: Repo.get_by(Address, hash: watchlist_address_map["address_hash"])
+            )
+            |> Repo.preload([:token])
+
+          Decimal.div(
+            Decimal.mult(ctb.value, ctb.token.fiat_value),
+            Decimal.new(10 ** Decimal.to_integer(ctb.token.decimals))
+          )
+        end
+
+      values_1 =
+        for _i <- 0..200 do
+          ctb =
+            insert(:address_current_token_balance_with_token_id,
+              address: Repo.get_by(Address, hash: watchlist_address_map_1["address_hash"])
+            )
+            |> Repo.preload([:token])
+
+          Decimal.div(
+            Decimal.mult(ctb.value, ctb.token.fiat_value),
+            Decimal.new(10 ** Decimal.to_integer(ctb.token.decimals))
+          )
+        end
+        |> Enum.sort(fn x1, x2 -> Decimal.compare(x1, x2) in [:gt, :eq] end)
+        |> Enum.take(150)
+
+      [wa2, wa1] = conn |> get("/api/account/v1/user/watchlist") |> json_response(200)
+
+      assert wa1["tokens_fiat_value"] |> Decimal.new() |> Decimal.round(14) ==
+               values |> Enum.reduce(Decimal.new(0), fn x, acc -> Decimal.add(x, acc) end) |> Decimal.round(14)
+
+      assert wa1["tokens_count"] == 150
+      assert wa1["tokens_overflow"] == false
+
+      assert wa2["tokens_fiat_value"] |> Decimal.new() |> Decimal.round(14) ==
+               values_1 |> Enum.reduce(Decimal.new(0), fn x, acc -> Decimal.add(x, acc) end) |> Decimal.round(14)
+
+      assert wa2["tokens_count"] == 150
+      assert wa2["tokens_overflow"] == true
+    end
+
+    test "watchlist address returns with token balances info + handle nil fiat values", %{conn: conn} do
+      watchlist_address_map = build(:watchlist_address)
+
+      conn
+      |> post(
+        "/api/account/v1/user/watchlist",
+        watchlist_address_map
+      )
+      |> json_response(200)
+
+      values =
+        for _i <- 0..148 do
+          ctb =
+            insert(:address_current_token_balance_with_token_id,
+              address: Repo.get_by(Address, hash: watchlist_address_map["address_hash"])
+            )
+            |> Repo.preload([:token])
+
+          Decimal.div(
+            Decimal.mult(ctb.value, ctb.token.fiat_value),
+            Decimal.new(10 ** Decimal.to_integer(ctb.token.decimals))
+          )
+        end
+
+      token = insert(:token, fiat_value: nil)
+
+      insert(:address_current_token_balance_with_token_id,
+        address: Repo.get_by(Address, hash: watchlist_address_map["address_hash"]),
+        token: token,
+        token_contract_address_hash: token.contract_address_hash
+      )
+
+      [wa1] = conn |> get("/api/account/v1/user/watchlist") |> json_response(200)
+
+      assert wa1["tokens_fiat_value"] |> Decimal.new() |> Decimal.round(14) ==
+               values |> Enum.reduce(Decimal.new(0), fn x, acc -> Decimal.add(x, acc) end) |> Decimal.round(14)
+
+      assert wa1["tokens_count"] == 150
+      assert wa1["tokens_overflow"] == false
+    end
+
     test "post api key", %{conn: conn} do
       post_api_key_response =
         conn
diff --git a/apps/explorer/lib/explorer/account/watchlist_address.ex b/apps/explorer/lib/explorer/account/watchlist_address.ex
index 17a10cf63bf8..aab74b457948 100644
--- a/apps/explorer/lib/explorer/account/watchlist_address.ex
+++ b/apps/explorer/lib/explorer/account/watchlist_address.ex
@@ -38,6 +38,9 @@ defmodule Explorer.Account.WatchlistAddress do
     field(:notify_inapp, :boolean)
 
     field(:fetched_coin_balance, Wei, virtual: true)
+    field(:tokens_fiat_value, :decimal, virtual: true)
+    field(:tokens_count, :integer, virtual: true)
+    field(:tokens_overflow, :boolean, virtual: true)
 
     timestamps()
   end
diff --git a/apps/explorer/test/support/factory.ex b/apps/explorer/test/support/factory.ex
index d071430c9c56..9c33824972eb 100644
--- a/apps/explorer/test/support/factory.ex
+++ b/apps/explorer/test/support/factory.ex
@@ -895,7 +895,7 @@ defmodule Explorer.Factory do
       address: build(:address),
       token_contract_address_hash: insert(:token).contract_address_hash,
       block_number: block_number(),
-      value: Enum.random(1..100_000),
+      value: Enum.random(1_000_000_000_000_000_000..10_000_000_000_000_000_000),
       value_fetched_at: DateTime.utc_now(),
       token_id: token_id,
       token_type: token_type

From d8824db2921fbc0e8d3a075b7d5157cb4bcc0804 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 14 Jul 2023 18:11:07 +0000
Subject: [PATCH 202/909] Bump eslint from 8.44.0 to 8.45.0 in
 /apps/block_scout_web/assets

Bumps [eslint](https://github.com/eslint/eslint) from 8.44.0 to 8.45.0.
- [Release notes](https://github.com/eslint/eslint/releases)
- [Changelog](https://github.com/eslint/eslint/blob/main/CHANGELOG.md)
- [Commits](https://github.com/eslint/eslint/compare/v8.44.0...v8.45.0)

---
updated-dependencies:
- dependency-name: eslint
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 apps/block_scout_web/assets/package-lock.json | 18 +++++++-----------
 apps/block_scout_web/assets/package.json      |  2 +-
 2 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/apps/block_scout_web/assets/package-lock.json b/apps/block_scout_web/assets/package-lock.json
index 8be40c136c2b..7a163ad2fa3e 100644
--- a/apps/block_scout_web/assets/package-lock.json
+++ b/apps/block_scout_web/assets/package-lock.json
@@ -78,7 +78,7 @@
         "copy-webpack-plugin": "^11.0.0",
         "css-loader": "^5.2.7",
         "css-minimizer-webpack-plugin": "^5.0.1",
-        "eslint": "^8.44.0",
+        "eslint": "^8.45.0",
         "eslint-config-standard": "^17.1.0",
         "eslint-plugin-import": "^2.27.5",
         "eslint-plugin-node": "^11.1.0",
@@ -7054,9 +7054,9 @@
       }
     },
     "node_modules/eslint": {
-      "version": "8.44.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.44.0.tgz",
-      "integrity": "sha512-0wpHoUbDUHgNCyvFB5aXLiQVfK9B0at6gUvzy83k4kAsQ/u769TQDX6iKC+aO4upIHO9WSaA3QoXYQDHbNwf1A==",
+      "version": "8.45.0",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.45.0.tgz",
+      "integrity": "sha512-pd8KSxiQpdYRfYa9Wufvdoct3ZPQQuVuU5O6scNgMuOMYuxvH0IGaYK0wUFjo4UYYQQCUndlXiMbnxopwvvTiw==",
       "dev": true,
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.2.0",
@@ -7084,7 +7084,6 @@
         "globals": "^13.19.0",
         "graphemer": "^1.4.0",
         "ignore": "^5.2.0",
-        "import-fresh": "^3.0.0",
         "imurmurhash": "^0.1.4",
         "is-glob": "^4.0.0",
         "is-path-inside": "^3.0.3",
@@ -7096,7 +7095,6 @@
         "natural-compare": "^1.4.0",
         "optionator": "^0.9.3",
         "strip-ansi": "^6.0.1",
-        "strip-json-comments": "^3.1.0",
         "text-table": "^0.2.0"
       },
       "bin": {
@@ -22625,9 +22623,9 @@
       }
     },
     "eslint": {
-      "version": "8.44.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.44.0.tgz",
-      "integrity": "sha512-0wpHoUbDUHgNCyvFB5aXLiQVfK9B0at6gUvzy83k4kAsQ/u769TQDX6iKC+aO4upIHO9WSaA3QoXYQDHbNwf1A==",
+      "version": "8.45.0",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.45.0.tgz",
+      "integrity": "sha512-pd8KSxiQpdYRfYa9Wufvdoct3ZPQQuVuU5O6scNgMuOMYuxvH0IGaYK0wUFjo4UYYQQCUndlXiMbnxopwvvTiw==",
       "dev": true,
       "requires": {
         "@eslint-community/eslint-utils": "^4.2.0",
@@ -22655,7 +22653,6 @@
         "globals": "^13.19.0",
         "graphemer": "^1.4.0",
         "ignore": "^5.2.0",
-        "import-fresh": "^3.0.0",
         "imurmurhash": "^0.1.4",
         "is-glob": "^4.0.0",
         "is-path-inside": "^3.0.3",
@@ -22667,7 +22664,6 @@
         "natural-compare": "^1.4.0",
         "optionator": "^0.9.3",
         "strip-ansi": "^6.0.1",
-        "strip-json-comments": "^3.1.0",
         "text-table": "^0.2.0"
       },
       "dependencies": {
diff --git a/apps/block_scout_web/assets/package.json b/apps/block_scout_web/assets/package.json
index fecee6abfd58..433b6ee6e629 100644
--- a/apps/block_scout_web/assets/package.json
+++ b/apps/block_scout_web/assets/package.json
@@ -90,7 +90,7 @@
     "copy-webpack-plugin": "^11.0.0",
     "css-loader": "^5.2.7",
     "css-minimizer-webpack-plugin": "^5.0.1",
-    "eslint": "^8.44.0",
+    "eslint": "^8.45.0",
     "eslint-config-standard": "^17.1.0",
     "eslint-plugin-import": "^2.27.5",
     "eslint-plugin-node": "^11.1.0",

From 2bdfc50fbb5182d92e5c7564a336afa5afa3e32d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 14 Jul 2023 18:11:38 +0000
Subject: [PATCH 203/909] Bump postcss from 8.4.25 to 8.4.26 in
 /apps/block_scout_web/assets

Bumps [postcss](https://github.com/postcss/postcss) from 8.4.25 to 8.4.26.
- [Release notes](https://github.com/postcss/postcss/releases)
- [Changelog](https://github.com/postcss/postcss/blob/main/CHANGELOG.md)
- [Commits](https://github.com/postcss/postcss/compare/8.4.25...8.4.26)

---
updated-dependencies:
- dependency-name: postcss
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 apps/block_scout_web/assets/package-lock.json | 14 +++++++-------
 apps/block_scout_web/assets/package.json      |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/apps/block_scout_web/assets/package-lock.json b/apps/block_scout_web/assets/package-lock.json
index 8be40c136c2b..f4ff671f8373 100644
--- a/apps/block_scout_web/assets/package-lock.json
+++ b/apps/block_scout_web/assets/package-lock.json
@@ -87,7 +87,7 @@
         "jest": "^29.6.1",
         "jest-environment-jsdom": "^29.6.1",
         "mini-css-extract-plugin": "^2.7.6",
-        "postcss": "^8.4.25",
+        "postcss": "^8.4.26",
         "postcss-loader": "^7.3.3",
         "sass": "^1.63.6",
         "sass-loader": "^13.3.2",
@@ -13421,9 +13421,9 @@
       }
     },
     "node_modules/postcss": {
-      "version": "8.4.25",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.25.tgz",
-      "integrity": "sha512-7taJ/8t2av0Z+sQEvNzCkpDynl0tX3uJMCODi6nT3PfASC7dYCWV9aQ+uiCf+KBD4SEFcu+GvJdGdwzQ6OSjCw==",
+      "version": "8.4.26",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.26.tgz",
+      "integrity": "sha512-jrXHFF8iTloAenySjM/ob3gSj7pCu0Ji49hnjqzsgSRa50hkWCKD0HQ+gMNJkW38jBI68MpAAg7ZWwHwX8NMMw==",
       "dev": true,
       "funding": [
         {
@@ -27537,9 +27537,9 @@
       "integrity": "sha512-Wb4p1J4zyFTbM+u6WuO4XstYx4Ky9Cewe4DWrel7B0w6VVICvPwdOpotjzcf6eD8TsckVnIMNONQyPIUFOUbCQ=="
     },
     "postcss": {
-      "version": "8.4.25",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.25.tgz",
-      "integrity": "sha512-7taJ/8t2av0Z+sQEvNzCkpDynl0tX3uJMCODi6nT3PfASC7dYCWV9aQ+uiCf+KBD4SEFcu+GvJdGdwzQ6OSjCw==",
+      "version": "8.4.26",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.26.tgz",
+      "integrity": "sha512-jrXHFF8iTloAenySjM/ob3gSj7pCu0Ji49hnjqzsgSRa50hkWCKD0HQ+gMNJkW38jBI68MpAAg7ZWwHwX8NMMw==",
       "dev": true,
       "requires": {
         "nanoid": "^3.3.6",
diff --git a/apps/block_scout_web/assets/package.json b/apps/block_scout_web/assets/package.json
index fecee6abfd58..7de784312ee9 100644
--- a/apps/block_scout_web/assets/package.json
+++ b/apps/block_scout_web/assets/package.json
@@ -99,7 +99,7 @@
     "jest": "^29.6.1",
     "jest-environment-jsdom": "^29.6.1",
     "mini-css-extract-plugin": "^2.7.6",
-    "postcss": "^8.4.25",
+    "postcss": "^8.4.26",
     "postcss-loader": "^7.3.3",
     "sass": "^1.63.6",
     "sass-loader": "^13.3.2",

From d52bb7acc7d94fe2d660a3a4ac136cd77cd0d980 Mon Sep 17 00:00:00 2001
From: Maxim Filonov <53992153+sl1depengwyn@users.noreply.github.com>
Date: Mon, 10 Jul 2023 14:52:06 +0300
Subject: [PATCH 204/909] API v2: Add sorting to tokens page

---
 CHANGELOG.md                                  |   1 +
 .../lib/block_scout_web/chain.ex              |  38 ++-
 .../controllers/api/v2/token_controller.ex    |   3 +-
 .../controllers/tokens/tokens_controller.ex   |   1 -
 .../lib/block_scout_web/paging_helper.ex      |  34 ++-
 .../api/v2/token_controller_test.exs          | 240 +++++++++++++++++-
 apps/explorer/lib/explorer/chain.ex           |  89 +------
 apps/explorer/lib/explorer/chain/token.ex     | 175 +++++++++++++
 8 files changed, 469 insertions(+), 112 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0ae959948d13..c7300ba06121 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,7 @@
 - [#7836](https://github.com/blockscout/blockscout/pull/7836) - Improve unverified email flow
 - [#7784](https://github.com/blockscout/blockscout/pull/7784) - Search improvements: Add new fields, light refactoring
 - [#7811](https://github.com/blockscout/blockscout/pull/7811) - Filter addresses before insertion
+- [#7895](https://github.com/blockscout/blockscout/pull/7895) - API v2: Add sorting to tokens page
 
 ### Fixes
 
diff --git a/apps/block_scout_web/lib/block_scout_web/chain.ex b/apps/block_scout_web/lib/block_scout_web/chain.ex
index 488f14279b6c..6409cc205331 100644
--- a/apps/block_scout_web/lib/block_scout_web/chain.ex
+++ b/apps/block_scout_web/lib/block_scout_web/chain.ex
@@ -150,16 +150,24 @@ defmodule BlockScoutWeb.Chain do
     ]
   end
 
-  def paging_options(%{
-        "market_cap" => market_cap,
-        "holder_count" => holder_count_str,
-        "name" => name,
-        "contract_address_hash" => contract_address_hash_str,
-        "is_name_null" => is_name_null
-      }) do
+  def paging_options(
+        %{
+          "market_cap" => market_cap,
+          "holder_count" => holder_count_str,
+          "name" => name,
+          "contract_address_hash" => contract_address_hash_str,
+          "is_name_null" => is_name_null
+        } = params
+      ) do
     market_cap_decimal =
       case Decimal.parse(market_cap) do
-        {decimal, ""} -> Decimal.round(decimal, 16)
+        {decimal, ""} -> decimal
+        _ -> nil
+      end
+
+    fiat_value_decimal =
+      case Decimal.parse(params["fiat_value"]) do
+        {decimal, ""} -> decimal
         _ -> nil
       end
 
@@ -171,7 +179,13 @@ defmodule BlockScoutWeb.Chain do
         [
           paging_options: %{
             @default_paging_options
-            | key: {market_cap_decimal, holder_count, token_name, contract_address_hash}
+            | key: %{
+                fiat_value: fiat_value_decimal,
+                circulating_market_cap: market_cap_decimal,
+                holder_count: holder_count,
+                name: token_name,
+                contract_address_hash: contract_address_hash
+              }
           }
         ]
 
@@ -403,14 +417,16 @@ defmodule BlockScoutWeb.Chain do
          contract_address_hash: contract_address_hash,
          circulating_market_cap: circulating_market_cap,
          holder_count: holder_count,
-         name: token_name
+         name: token_name,
+         fiat_value: fiat_value
        }) do
     %{
       "market_cap" => circulating_market_cap,
       "holder_count" => holder_count,
       "contract_address_hash" => contract_address_hash,
       "name" => token_name,
-      "is_name_null" => is_nil(token_name)
+      "is_name_null" => is_nil(token_name),
+      "fiat_value" => fiat_value
     }
   end
 
diff --git a/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/token_controller.ex b/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/token_controller.ex
index fdde35d0bd6b..647e38ab6283 100644
--- a/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/token_controller.ex
+++ b/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/token_controller.ex
@@ -17,7 +17,7 @@ defmodule BlockScoutWeb.API.V2.TokenController do
     ]
 
   import BlockScoutWeb.PagingHelper,
-    only: [delete_parameters_from_next_page_params: 1, token_transfers_types_options: 1]
+    only: [delete_parameters_from_next_page_params: 1, token_transfers_types_options: 1, tokens_sorting: 1]
 
   action_fallback(BlockScoutWeb.API.V2.FallbackController)
 
@@ -208,6 +208,7 @@ defmodule BlockScoutWeb.API.V2.TokenController do
       params
       |> paging_options()
       |> Keyword.merge(token_transfers_types_options(params))
+      |> Keyword.merge(tokens_sorting(params))
       |> Keyword.merge(@api_true)
 
     {tokens, next_page} = filter |> Chain.list_top_tokens(options) |> split_list_by_page()
diff --git a/apps/block_scout_web/lib/block_scout_web/controllers/tokens/tokens_controller.ex b/apps/block_scout_web/lib/block_scout_web/controllers/tokens/tokens_controller.ex
index 4e4f289fcf8a..a0bae11f5ef8 100644
--- a/apps/block_scout_web/lib/block_scout_web/controllers/tokens/tokens_controller.ex
+++ b/apps/block_scout_web/lib/block_scout_web/controllers/tokens/tokens_controller.ex
@@ -2,7 +2,6 @@ defmodule BlockScoutWeb.TokensController do
   use BlockScoutWeb, :controller
 
   import BlockScoutWeb.Chain, only: [paging_options: 1, next_page_params: 3, split_list_by_page: 1]
-
   alias BlockScoutWeb.{Controller, TokensView}
   alias Explorer.Chain
   alias Phoenix.View
diff --git a/apps/block_scout_web/lib/block_scout_web/paging_helper.ex b/apps/block_scout_web/lib/block_scout_web/paging_helper.ex
index 98fd11f72d18..bcbbc9b0a274 100644
--- a/apps/block_scout_web/lib/block_scout_web/paging_helper.ex
+++ b/apps/block_scout_web/lib/block_scout_web/paging_helper.ex
@@ -127,14 +127,18 @@ defmodule BlockScoutWeb.PagingHelper do
 
   def delete_parameters_from_next_page_params(params) when is_map(params) do
     params
-    |> Map.delete("block_hash_or_number")
-    |> Map.delete("transaction_hash")
-    |> Map.delete("address_hash")
-    |> Map.delete("type")
-    |> Map.delete("method")
-    |> Map.delete("filter")
-    |> Map.delete("token_address_hash")
-    |> Map.delete("q")
+    |> Map.drop([
+      "block_hash_or_number",
+      "transaction_hash",
+      "address_hash",
+      "type",
+      "method",
+      "filter",
+      "token_address_hash",
+      "q",
+      "sort",
+      "order"
+    ])
   end
 
   def delete_parameters_from_next_page_params(_), do: nil
@@ -166,4 +170,18 @@ defmodule BlockScoutWeb.PagingHelper do
   end
 
   def search_query(_), do: []
+
+  def tokens_sorting(%{"sort" => sort_field, "order" => order}) do
+    [sorting: do_tokens_sorting(sort_field, order)]
+  end
+
+  def tokens_sorting(_), do: []
+
+  defp do_tokens_sorting("fiat_value", "asc"), do: [asc_nulls_first: :fiat_value]
+  defp do_tokens_sorting("fiat_value", "desc"), do: [desc_nulls_last: :fiat_value]
+  defp do_tokens_sorting("holder_count", "asc"), do: [asc_nulls_first: :holder_count]
+  defp do_tokens_sorting("holder_count", "desc"), do: [desc_nulls_last: :holder_count]
+  defp do_tokens_sorting("circulating_market_cap", "asc"), do: [asc_nulls_first: :circulating_market_cap]
+  defp do_tokens_sorting("circulating_market_cap", "desc"), do: [desc_nulls_last: :circulating_market_cap]
+  defp do_tokens_sorting(_, _), do: []
 end
diff --git a/apps/block_scout_web/test/block_scout_web/controllers/api/v2/token_controller_test.exs b/apps/block_scout_web/test/block_scout_web/controllers/api/v2/token_controller_test.exs
index f46da387f796..fbed9880a6ec 100644
--- a/apps/block_scout_web/test/block_scout_web/controllers/api/v2/token_controller_test.exs
+++ b/apps/block_scout_web/test/block_scout_web/controllers/api/v2/token_controller_test.exs
@@ -393,12 +393,174 @@ defmodule BlockScoutWeb.API.V2.TokenControllerTest do
   end
 
   describe "/tokens" do
-    defp check_tokens_pagination(tokens, conn) do
-      request = get(conn, "/api/v2/tokens")
+    defp check_tokens_pagination(tokens, conn, additional_params \\ %{}) do
+      request = get(conn, "/api/v2/tokens", additional_params)
       assert response = json_response(request, 200)
-      request_2nd_page = get(conn, "/api/v2/tokens", response["next_page_params"])
+      request_2nd_page = get(conn, "/api/v2/tokens", additional_params |> Map.merge(response["next_page_params"]))
       assert response_2nd_page = json_response(request_2nd_page, 200)
       check_paginated_response(response, response_2nd_page, tokens)
+
+      # by fiat_value
+      tokens_ordered_by_fiat_value = Enum.sort(tokens, &(Decimal.compare(&1.fiat_value, &2.fiat_value) in [:eq, :lt]))
+
+      request_ordered_by_fiat_value =
+        get(conn, "/api/v2/tokens", additional_params |> Map.merge(%{"sort" => "fiat_value", "order" => "desc"}))
+
+      assert response_ordered_by_fiat_value = json_response(request_ordered_by_fiat_value, 200)
+
+      request_ordered_by_fiat_value_2nd_page =
+        get(
+          conn,
+          "/api/v2/tokens",
+          additional_params
+          |> Map.merge(%{"sort" => "fiat_value", "order" => "desc"})
+          |> Map.merge(response_ordered_by_fiat_value["next_page_params"])
+        )
+
+      assert response_ordered_by_fiat_value_2nd_page = json_response(request_ordered_by_fiat_value_2nd_page, 200)
+
+      check_paginated_response(
+        response_ordered_by_fiat_value,
+        response_ordered_by_fiat_value_2nd_page,
+        tokens_ordered_by_fiat_value
+      )
+
+      tokens_ordered_by_fiat_value_asc =
+        Enum.sort(tokens, &(Decimal.compare(&1.fiat_value, &2.fiat_value) in [:eq, :gt]))
+
+      request_ordered_by_fiat_value_asc =
+        get(conn, "/api/v2/tokens", additional_params |> Map.merge(%{"sort" => "fiat_value", "order" => "asc"}))
+
+      assert response_ordered_by_fiat_value_asc = json_response(request_ordered_by_fiat_value_asc, 200)
+
+      request_ordered_by_fiat_value_asc_2nd_page =
+        get(
+          conn,
+          "/api/v2/tokens",
+          additional_params
+          |> Map.merge(%{"sort" => "fiat_value", "order" => "asc"})
+          |> Map.merge(response_ordered_by_fiat_value_asc["next_page_params"])
+        )
+
+      assert response_ordered_by_fiat_value_asc_2nd_page =
+               json_response(request_ordered_by_fiat_value_asc_2nd_page, 200)
+
+      check_paginated_response(
+        response_ordered_by_fiat_value_asc,
+        response_ordered_by_fiat_value_asc_2nd_page,
+        tokens_ordered_by_fiat_value_asc
+      )
+
+      # by holders
+      tokens_ordered_by_holders = Enum.sort(tokens, &(&1.holder_count <= &2.holder_count))
+
+      request_ordered_by_holders =
+        get(conn, "/api/v2/tokens", additional_params |> Map.merge(%{"sort" => "holder_count", "order" => "desc"}))
+
+      assert response_ordered_by_holders = json_response(request_ordered_by_holders, 200)
+
+      request_ordered_by_holders_2nd_page =
+        get(
+          conn,
+          "/api/v2/tokens",
+          additional_params
+          |> Map.merge(%{"sort" => "holder_count", "order" => "desc"})
+          |> Map.merge(response_ordered_by_holders["next_page_params"])
+        )
+
+      assert response_ordered_by_holders_2nd_page = json_response(request_ordered_by_holders_2nd_page, 200)
+
+      check_paginated_response(
+        response_ordered_by_holders,
+        response_ordered_by_holders_2nd_page,
+        tokens_ordered_by_holders
+      )
+
+      tokens_ordered_by_holders_asc = Enum.sort(tokens, &(&1.holder_count >= &2.holder_count))
+
+      request_ordered_by_holders_asc =
+        get(conn, "/api/v2/tokens", additional_params |> Map.merge(%{"sort" => "holder_count", "order" => "asc"}))
+
+      assert response_ordered_by_holders_asc = json_response(request_ordered_by_holders_asc, 200)
+
+      request_ordered_by_holders_asc_2nd_page =
+        get(
+          conn,
+          "/api/v2/tokens",
+          additional_params
+          |> Map.merge(%{"sort" => "holder_count", "order" => "asc"})
+          |> Map.merge(response_ordered_by_holders_asc["next_page_params"])
+        )
+
+      assert response_ordered_by_holders_asc_2nd_page = json_response(request_ordered_by_holders_asc_2nd_page, 200)
+
+      check_paginated_response(
+        response_ordered_by_holders_asc,
+        response_ordered_by_holders_asc_2nd_page,
+        tokens_ordered_by_holders_asc
+      )
+
+      # by circulating_market_cap
+      tokens_ordered_by_circulating_market_cap =
+        Enum.sort(tokens, &(&1.circulating_market_cap <= &2.circulating_market_cap))
+
+      request_ordered_by_circulating_market_cap =
+        get(
+          conn,
+          "/api/v2/tokens",
+          additional_params |> Map.merge(%{"sort" => "circulating_market_cap", "order" => "desc"})
+        )
+
+      assert response_ordered_by_circulating_market_cap = json_response(request_ordered_by_circulating_market_cap, 200)
+
+      request_ordered_by_circulating_market_cap_2nd_page =
+        get(
+          conn,
+          "/api/v2/tokens",
+          additional_params
+          |> Map.merge(%{"sort" => "circulating_market_cap", "order" => "desc"})
+          |> Map.merge(response_ordered_by_circulating_market_cap["next_page_params"])
+        )
+
+      assert response_ordered_by_circulating_market_cap_2nd_page =
+               json_response(request_ordered_by_circulating_market_cap_2nd_page, 200)
+
+      check_paginated_response(
+        response_ordered_by_circulating_market_cap,
+        response_ordered_by_circulating_market_cap_2nd_page,
+        tokens_ordered_by_circulating_market_cap
+      )
+
+      tokens_ordered_by_circulating_market_cap_asc =
+        Enum.sort(tokens, &(&1.circulating_market_cap >= &2.circulating_market_cap))
+
+      request_ordered_by_circulating_market_cap_asc =
+        get(
+          conn,
+          "/api/v2/tokens",
+          additional_params |> Map.merge(%{"sort" => "circulating_market_cap", "order" => "asc"})
+        )
+
+      assert response_ordered_by_circulating_market_cap_asc =
+               json_response(request_ordered_by_circulating_market_cap_asc, 200)
+
+      request_ordered_by_circulating_market_cap_asc_2nd_page =
+        get(
+          conn,
+          "/api/v2/tokens",
+          additional_params
+          |> Map.merge(%{"sort" => "circulating_market_cap", "order" => "asc"})
+          |> Map.merge(response_ordered_by_circulating_market_cap_asc["next_page_params"])
+        )
+
+      assert response_ordered_by_circulating_market_cap_asc_2nd_page =
+               json_response(request_ordered_by_circulating_market_cap_asc_2nd_page, 200)
+
+      check_paginated_response(
+        response_ordered_by_circulating_market_cap_asc,
+        response_ordered_by_circulating_market_cap_asc_2nd_page,
+        tokens_ordered_by_circulating_market_cap_asc
+      )
     end
 
     test "get empty list", %{conn: conn} do
@@ -407,6 +569,70 @@ defmodule BlockScoutWeb.API.V2.TokenControllerTest do
       assert %{"items" => [], "next_page_params" => nil} = json_response(request, 200)
     end
 
+    test "tokens are filtered by single type", %{conn: conn} do
+      erc_20_tokens =
+        for i <- 0..50 do
+          insert(:token, fiat_value: i)
+        end
+
+      erc_721_tokens =
+        for _i <- 0..50 do
+          insert(:token, type: "ERC-721")
+        end
+
+      erc_1155_tokens =
+        for _i <- 0..50 do
+          insert(:token, type: "ERC-1155")
+        end
+
+      check_tokens_pagination(erc_20_tokens |> Enum.reverse(), conn, %{"type" => "ERC-20"})
+      check_tokens_pagination(erc_721_tokens |> Enum.reverse(), conn, %{"type" => "ERC-721"})
+      check_tokens_pagination(erc_1155_tokens |> Enum.reverse(), conn, %{"type" => "ERC-1155"})
+    end
+
+    test "tokens are filtered by multiple type", %{conn: conn} do
+      erc_20_tokens =
+        for i <- 0..25 do
+          insert(:token, fiat_value: i)
+        end
+
+      erc_721_tokens =
+        for _i <- 0..25 do
+          insert(:token, type: "ERC-721")
+        end
+
+      erc_1155_tokens =
+        for _i <- 0..24 do
+          insert(:token, type: "ERC-1155")
+        end
+
+      check_tokens_pagination(
+        erc_721_tokens |> Kernel.++(erc_1155_tokens) |> Enum.reverse(),
+        conn,
+        %{
+          "type" => "ERC-1155,ERC-721"
+        }
+      )
+
+      check_tokens_pagination(
+        erc_20_tokens |> Kernel.++(erc_1155_tokens) |> Enum.reverse(),
+        conn,
+        %{
+          "type" => "[erc-20,ERC-1155]"
+        }
+      )
+    end
+
+    test "sorting by fiat_value", %{conn: conn} do
+      tokens =
+        for i <- 0..50 do
+          insert(:token, fiat_value: i)
+        end
+        |> Enum.reverse()
+
+      check_tokens_pagination(tokens, conn)
+    end
+
     # these tests that tokens paginates by each parameter separately and by any combination of them
     test "pagination by address", %{conn: conn} do
       tokens =
@@ -419,14 +645,14 @@ defmodule BlockScoutWeb.API.V2.TokenControllerTest do
     end
 
     test "pagination by name", %{conn: conn} do
+      named_token = insert(:token, holder_count: 0)
+      empty_named_token = insert(:token, name: "", holder_count: 0)
+
       tokens =
-        for i <- 0..48 do
+        for i <- 1..49 do
           insert(:token, holder_count: i)
         end
 
-      empty_named_token = insert(:token, name: "")
-      named_token = insert(:token)
-
       tokens = [named_token, empty_named_token | tokens]
 
       check_tokens_pagination(tokens, conn)
diff --git a/apps/explorer/lib/explorer/chain.ex b/apps/explorer/lib/explorer/chain.ex
index f2d2e5f02377..c9484c673e6e 100644
--- a/apps/explorer/lib/explorer/chain.ex
+++ b/apps/explorer/lib/explorer/chain.ex
@@ -2471,16 +2471,17 @@ defmodule Explorer.Chain do
   def list_top_tokens(filter, options \\ []) do
     paging_options = Keyword.get(options, :paging_options, @default_paging_options)
     token_type = Keyword.get(options, :token_type, nil)
+    sorting = Keyword.get(options, :sorting, [])
 
-    fetch_top_tokens(filter, paging_options, token_type, options)
+    fetch_top_tokens(filter, paging_options, token_type, sorting, options)
   end
 
-  defp fetch_top_tokens(filter, paging_options, token_type, options) do
-    base_query = base_token_query(token_type)
+  defp fetch_top_tokens(filter, paging_options, token_type, sorting, options) do
+    base_query = Token.base_token_query(token_type, sorting)
 
     base_query_with_paging =
       base_query
-      |> page_tokens(paging_options)
+      |> Token.page_tokens(paging_options, sorting)
       |> limit(^paging_options.page_size)
 
     query =
@@ -2501,31 +2502,6 @@ defmodule Explorer.Chain do
     |> select_repo(options).all()
   end
 
-  defp base_token_query(empty_type) when empty_type in [nil, []] do
-    from(t in Token,
-      order_by: [
-        desc_nulls_last: t.circulating_market_cap,
-        desc_nulls_last: t.holder_count,
-        asc: t.name,
-        asc: t.contract_address_hash
-      ],
-      preload: [:contract_address]
-    )
-  end
-
-  defp base_token_query(token_types) when is_list(token_types) do
-    from(t in Token,
-      where: t.type in ^token_types,
-      order_by: [
-        desc_nulls_last: t.circulating_market_cap,
-        desc_nulls_last: t.holder_count,
-        asc: t.name,
-        asc: t.contract_address_hash
-      ],
-      preload: [:contract_address]
-    )
-  end
-
   @doc """
   Calls `reducer` on a stream of `t:Explorer.Chain.Block.t/0` without `t:Explorer.Chain.Block.Reward.t/0`.
   """
@@ -4645,61 +4621,6 @@ defmodule Explorer.Chain do
     )
   end
 
-  defp page_tokens(query, %PagingOptions{key: nil}), do: query
-
-  defp page_tokens(query, %PagingOptions{key: {circulating_market_cap, holder_count, name, contract_address_hash}}) do
-    from(token in query,
-      where: ^page_tokens_circulating_market_cap(circulating_market_cap, holder_count, name, contract_address_hash)
-    )
-  end
-
-  defp page_tokens_circulating_market_cap(nil, holder_count, name, contract_address_hash) do
-    dynamic(
-      [t],
-      is_nil(t.circulating_market_cap) and ^page_tokens_holder_count(holder_count, name, contract_address_hash)
-    )
-  end
-
-  defp page_tokens_circulating_market_cap(circulating_market_cap, holder_count, name, contract_address_hash) do
-    dynamic(
-      [t],
-      is_nil(t.circulating_market_cap) or t.circulating_market_cap < ^circulating_market_cap or
-        (t.circulating_market_cap == ^circulating_market_cap and
-           ^page_tokens_holder_count(holder_count, name, contract_address_hash))
-    )
-  end
-
-  defp page_tokens_holder_count(nil, name, contract_address_hash) do
-    dynamic(
-      [t],
-      is_nil(t.holder_count) and ^page_tokens_name(name, contract_address_hash)
-    )
-  end
-
-  defp page_tokens_holder_count(holder_count, name, contract_address_hash) do
-    dynamic(
-      [t],
-      is_nil(t.holder_count) or t.holder_count < ^holder_count or
-        (t.holder_count == ^holder_count and ^page_tokens_name(name, contract_address_hash))
-    )
-  end
-
-  defp page_tokens_name(nil, contract_address_hash) do
-    dynamic([t], is_nil(t.name) and ^page_tokens_contract_address_hash(contract_address_hash))
-  end
-
-  defp page_tokens_name(name, contract_address_hash) do
-    dynamic(
-      [t],
-      is_nil(t.name) or
-        (t.name > ^name or (t.name == ^name and ^page_tokens_contract_address_hash(contract_address_hash)))
-    )
-  end
-
-  defp page_tokens_contract_address_hash(contract_address_hash) do
-    dynamic([t], t.contract_address_hash > ^contract_address_hash)
-  end
-
   defp page_blocks(query, %PagingOptions{key: nil}), do: query
 
   defp page_blocks(query, %PagingOptions{key: {block_number}}) do
diff --git a/apps/explorer/lib/explorer/chain/token.ex b/apps/explorer/lib/explorer/chain/token.ex
index 4701f109c249..b59f6ef2de5d 100644
--- a/apps/explorer/lib/explorer/chain/token.ex
+++ b/apps/explorer/lib/explorer/chain/token.ex
@@ -24,6 +24,7 @@ defmodule Explorer.Chain.Token do
 
   alias Ecto.Changeset
   alias Explorer.Chain.{Address, Hash, Token}
+  alias Explorer.PagingOptions
   alias Explorer.SmartContract.Helper
 
   @typedoc """
@@ -156,4 +157,178 @@ defmodule Explorer.Chain.Token do
   def tokens_by_contract_address_hashes(contract_address_hashes) do
     from(token in __MODULE__, where: token.contract_address_hash in ^contract_address_hashes)
   end
+
+  def base_token_query(type, sorting) do
+    query = from(t in Token, preload: [:contract_address])
+
+    query |> apply_filter(type) |> apply_sorting(sorting)
+  end
+
+  defp apply_filter(query, empty_type) when empty_type in [nil, []], do: query
+
+  defp apply_filter(query, token_types) when is_list(token_types) do
+    from(t in query, where: t.type in ^token_types)
+  end
+
+  @default_sorting [
+    desc_nulls_last: :circulating_market_cap,
+    desc_nulls_last: :holder_count,
+    asc: :name,
+    asc: :contract_address_hash
+  ]
+
+  defp apply_sorting(query, sorting) when is_list(sorting) do
+    from(t in query, order_by: ^sorting_with_defaults(sorting))
+  end
+
+  defp sorting_with_defaults(sorting) when is_list(sorting) do
+    (sorting ++ @default_sorting)
+    |> Enum.uniq_by(fn {_, field} -> field end)
+  end
+
+  def page_tokens(query, paging_options, sorting \\ [])
+  def page_tokens(query, %PagingOptions{key: nil}, _sorting), do: query
+
+  def page_tokens(
+        query,
+        %PagingOptions{
+          key: %{} = key
+        },
+        sorting
+      ) do
+    dynamic_where = sorting |> sorting_with_defaults() |> do_page_tokens()
+
+    from(token in query,
+      where: ^dynamic_where.(key)
+    )
+  end
+
+  defp do_page_tokens([{order, column} | rest]) do
+    fn key -> page_tokens_by_column(key, column, order, do_page_tokens(rest)) end
+  end
+
+  defp do_page_tokens([]), do: nil
+
+  defp page_tokens_by_column(%{fiat_value: nil} = key, :fiat_value, :desc_nulls_last, next_column) do
+    dynamic(
+      [t],
+      is_nil(t.fiat_value) and ^next_column.(key)
+    )
+  end
+
+  defp page_tokens_by_column(%{fiat_value: nil} = key, :fiat_value, :asc_nulls_first, next_column) do
+    next_column.(key)
+  end
+
+  defp page_tokens_by_column(%{fiat_value: fiat_value} = key, :fiat_value, :desc_nulls_last, next_column) do
+    dynamic(
+      [t],
+      is_nil(t.fiat_value) or t.fiat_value < ^fiat_value or
+        (t.fiat_value == ^fiat_value and ^next_column.(key))
+    )
+  end
+
+  defp page_tokens_by_column(%{fiat_value: fiat_value} = key, :fiat_value, :asc_nulls_first, next_column) do
+    dynamic(
+      [t],
+      not is_nil(t.fiat_value) and
+        (t.fiat_value > ^fiat_value or
+           (t.fiat_value == ^fiat_value and ^next_column.(key)))
+    )
+  end
+
+  defp page_tokens_by_column(
+         %{circulating_market_cap: nil} = key,
+         :circulating_market_cap,
+         :desc_nulls_last,
+         next_column
+       ) do
+    dynamic(
+      [t],
+      is_nil(t.circulating_market_cap) and ^next_column.(key)
+    )
+  end
+
+  defp page_tokens_by_column(
+         %{circulating_market_cap: nil} = key,
+         :circulating_market_cap,
+         :asc_nulls_first,
+         next_column
+       ) do
+    next_column.(key)
+  end
+
+  defp page_tokens_by_column(
+         %{circulating_market_cap: circulating_market_cap} = key,
+         :circulating_market_cap,
+         :desc_nulls_last,
+         next_column
+       ) do
+    dynamic(
+      [t],
+      is_nil(t.circulating_market_cap) or t.circulating_market_cap < ^circulating_market_cap or
+        (t.circulating_market_cap == ^circulating_market_cap and ^next_column.(key))
+    )
+  end
+
+  defp page_tokens_by_column(
+         %{circulating_market_cap: circulating_market_cap} = key,
+         :circulating_market_cap,
+         :asc_nulls_first,
+         next_column
+       ) do
+    dynamic(
+      [t],
+      not is_nil(t.circulating_market_cap) and
+        (t.circulating_market_cap > ^circulating_market_cap or
+           (t.circulating_market_cap == ^circulating_market_cap and ^next_column.(key)))
+    )
+  end
+
+  defp page_tokens_by_column(%{holder_count: nil} = key, :holder_count, :desc_nulls_last, next_column) do
+    dynamic(
+      [t],
+      is_nil(t.holder_count) and ^next_column.(key)
+    )
+  end
+
+  defp page_tokens_by_column(%{holder_count: nil} = key, :holder_count, :asc_nulls_first, next_column) do
+    next_column.(key)
+  end
+
+  defp page_tokens_by_column(%{holder_count: holder_count} = key, :holder_count, :desc_nulls_last, next_column) do
+    dynamic(
+      [t],
+      is_nil(t.holder_count) or t.holder_count < ^holder_count or
+        (t.holder_count == ^holder_count and ^next_column.(key))
+    )
+  end
+
+  defp page_tokens_by_column(%{holder_count: holder_count} = key, :holder_count, :asc_nulls_first, next_column) do
+    dynamic(
+      [t],
+      not is_nil(t.holder_count) and
+        (t.holder_count > ^holder_count or
+           (t.holder_count == ^holder_count and ^next_column.(key)))
+    )
+  end
+
+  defp page_tokens_by_column(%{name: nil} = key, :name, :asc, next_column) do
+    dynamic(
+      [t],
+      is_nil(t.name) and ^next_column.(key)
+    )
+  end
+
+  defp page_tokens_by_column(%{name: name} = key, :name, :asc, next_column) do
+    dynamic(
+      [t],
+      is_nil(t.name) or
+        (t.name > ^name or (t.name == ^name and ^next_column.(key)))
+    )
+  end
+
+  defp page_tokens_by_column(%{contract_address_hash: contract_address_hash}, :contract_address_hash, :asc, nil) do
+    dynamic([t], t.contract_address_hash > ^contract_address_hash)
+  end
 end

From cd19739347f267d8a6ad81bbba2dbdad08bcc134 Mon Sep 17 00:00:00 2001
From: Nikita Pozdniakov <nikitosing4@mail.ru>
Date: Mon, 17 Jul 2023 15:33:55 +0700
Subject: [PATCH 205/909] Put API v2 rate limit token to cookies

---
 apps/block_scout_web/config/config.exs          |  3 ++-
 .../lib/block_scout_web/api_key_v2_router.ex    |  4 +---
 .../controllers/api/v2/api_key_controller.ex    | 16 +++++++++++-----
 .../lib/block_scout_web/views/access_helper.ex  | 17 +++++++++--------
 4 files changed, 23 insertions(+), 17 deletions(-)

diff --git a/apps/block_scout_web/config/config.exs b/apps/block_scout_web/config/config.exs
index bb5f87a1dcda..e0daba023f1e 100644
--- a/apps/block_scout_web/config/config.exs
+++ b/apps/block_scout_web/config/config.exs
@@ -12,7 +12,8 @@ config :block_scout_web,
   cookie_domain: System.get_env("SESSION_COOKIE_DOMAIN"),
   # 604800 seconds, 1 week
   session_cookie_ttl: 60 * 60 * 24 * 7,
-  invalid_session_key: "invalid_session"
+  invalid_session_key: "invalid_session",
+  api_v2_temp_token_key: "api_v2_temp_client_key"
 
 config :block_scout_web,
   admin_panel_enabled: System.get_env("ADMIN_PANEL_ENABLED", "") == "true"
diff --git a/apps/block_scout_web/lib/block_scout_web/api_key_v2_router.ex b/apps/block_scout_web/lib/block_scout_web/api_key_v2_router.ex
index 3a302b8a4761..a1b9943f9bc8 100644
--- a/apps/block_scout_web/lib/block_scout_web/api_key_v2_router.ex
+++ b/apps/block_scout_web/lib/block_scout_web/api_key_v2_router.ex
@@ -9,8 +9,6 @@ defmodule BlockScoutWeb.APIKeyV2Router do
     plug(Logger, application: :api_v2)
     plug(:accepts, ["json"])
     plug(CheckApiV2)
-    plug(:fetch_session)
-    plug(:protect_from_forgery)
   end
 
   scope "/", as: :api_v2 do
@@ -18,6 +16,6 @@ defmodule BlockScoutWeb.APIKeyV2Router do
 
     alias BlockScoutWeb.API.V2
 
-    get("/", V2.APIKeyController, :get_key)
+    post("/", V2.APIKeyController, :get_key)
   end
 end
diff --git a/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/api_key_controller.ex b/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/api_key_controller.ex
index 9b1fc2869b59..255b13872311 100644
--- a/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/api_key_controller.ex
+++ b/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/api_key_controller.ex
@@ -2,10 +2,13 @@ defmodule BlockScoutWeb.API.V2.APIKeyController do
   use BlockScoutWeb, :controller
 
   alias BlockScoutWeb.AccessHelper
-  alias Plug.Crypto
+
+  @api_v2_temp_token_key Application.compile_env(:block_scout_web, :api_v2_temp_token_key)
 
   action_fallback(BlockScoutWeb.API.V2.FallbackController)
 
+  plug(:fetch_cookies, signed: [@api_v2_temp_token_key])
+
   def get_key(conn, params) do
     helper = Application.get_env(:block_scout_web, :captcha_helper)
     ttl = Application.get_env(:block_scout_web, :api_rate_limit)[:api_v2_token_ttl_seconds]
@@ -14,11 +17,14 @@ defmodule BlockScoutWeb.API.V2.APIKeyController do
          {:recaptcha, false} <- {:recaptcha, is_nil(recaptcha_response)},
          {:recaptcha, true} <- {:recaptcha, helper.recaptcha_passed?(recaptcha_response)} do
       conn
+      |> put_resp_cookie(@api_v2_temp_token_key, %{ip: AccessHelper.conn_to_ip_string(conn)},
+        max_age: ttl,
+        sign: true,
+        same_site: "Lax",
+        domain: Application.get_env(:block_scout_web, :cookie_domain)
+      )
       |> json(%{
-        key:
-          Crypto.sign(conn.secret_key_base, conn.secret_key_base, %{ip: AccessHelper.conn_to_ip_string(conn)},
-            max_age: ttl
-          )
+        message: "OK"
       })
     end
   end
diff --git a/apps/block_scout_web/lib/block_scout_web/views/access_helper.ex b/apps/block_scout_web/lib/block_scout_web/views/access_helper.ex
index d481945f60ce..d0fb8d0c574a 100644
--- a/apps/block_scout_web/lib/block_scout_web/views/access_helper.ex
+++ b/apps/block_scout_web/lib/block_scout_web/views/access_helper.ex
@@ -11,7 +11,7 @@ defmodule BlockScoutWeb.AccessHelper do
   alias BlockScoutWeb.WebRouter.Helpers
   alias Explorer.AccessHelper
   alias Explorer.Account.Api.Key, as: ApiKey
-  alias Plug.{Conn, Crypto}
+  alias Plug.Conn
 
   alias RemoteIp
 
@@ -77,7 +77,7 @@ defmodule BlockScoutWeb.AccessHelper do
     ip_string = conn_to_ip_string(conn)
 
     plan = get_plan(conn.query_params)
-    token = get_ui_v2_token(conn, conn.query_params, ip_string)
+    token = get_ui_v2_token(conn, ip_string)
 
     user_agent = get_user_agent(conn)
 
@@ -167,18 +167,19 @@ defmodule BlockScoutWeb.AccessHelper do
     to_string(:inet_parse.ntoa(ip))
   end
 
-  defp get_ui_v2_token(conn, %{"token" => token}, ip_string) do
-    case is_api_v2_request?(conn) && Crypto.verify(conn.secret_key_base, conn.secret_key_base, token) do
-      {:ok, %{ip: ^ip_string}} ->
-        token
+  defp get_ui_v2_token(conn, ip_string) do
+    api_v2_temp_token_key = Application.get_env(:block_scout_web, :api_v2_temp_token_key)
+    conn = Conn.fetch_cookies(conn, signed: [api_v2_temp_token_key])
+
+    case is_api_v2_request?(conn) && conn.cookies[api_v2_temp_token_key] do
+      %{ip: ^ip_string} ->
+        conn.req_cookies[api_v2_temp_token_key]
 
       _ ->
         nil
     end
   end
 
-  defp get_ui_v2_token(_conn, _params, _ip_string), do: nil
-
   defp get_user_agent(conn) do
     case Conn.get_req_header(conn, "user-agent") do
       [agent] ->

From f86e6b2b86f462a5c5c14a7ba97358b885d600ea Mon Sep 17 00:00:00 2001
From: Nikita Pozdniakov <nikitosing4@mail.ru>
Date: Mon, 17 Jul 2023 15:36:38 +0700
Subject: [PATCH 206/909] Changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0ae959948d13..c6496657adab 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,7 @@
 
 ### Features
 
+- [#7946](https://github.com/blockscout/blockscout/pull/7946) - API v2 rate limit: Put token to cookies & change /api/v2/key method
 - [#7888](https://github.com/blockscout/blockscout/pull/7888) - Add token balances info to watchlist address response
 - [#7898](https://github.com/blockscout/blockscout/pull/7898) - Add possibility to add extra headers with JSON RPC URL
 - [#7836](https://github.com/blockscout/blockscout/pull/7836) - Improve unverified email flow

From dce2701207896c1b390e5a90f126897d6b48aa28 Mon Sep 17 00:00:00 2001
From: Viktor Baranov <baranov.viktor.27@gmail.com>
Date: Mon, 17 Jul 2023 16:47:37 +0300
Subject: [PATCH 207/909] Add GA CI for Eth Goerli chain

---
 .github/workflows/config.yml                   |  2 +-
 ...=> publish-docker-image-for-eth-goerli.yml} | 18 ++++--------------
 CHANGELOG.md                                   |  1 +
 docker/Dockerfile                              |  1 -
 docker/Makefile                                |  1 -
 5 files changed, 6 insertions(+), 17 deletions(-)
 rename .github/workflows/{publish-docker-image-for-polygon-supernets.yml => publish-docker-image-for-eth-goerli.yml} (79%)

diff --git a/.github/workflows/config.yml b/.github/workflows/config.yml
index 64c2cb8f800e..37f208aea57b 100644
--- a/.github/workflows/config.yml
+++ b/.github/workflows/config.yml
@@ -6,8 +6,8 @@ on:
       - master
       - production-optimism-stg
       - production-eth-stg-experimental
+      - production-eth-goerli-stg
       - production-xdai-stg
-      - production-polygon-supernets-stg
       - production-core-stg
       - production-sokol-stg
       - production-rsk-stg
diff --git a/.github/workflows/publish-docker-image-for-polygon-supernets.yml b/.github/workflows/publish-docker-image-for-eth-goerli.yml
similarity index 79%
rename from .github/workflows/publish-docker-image-for-polygon-supernets.yml
rename to .github/workflows/publish-docker-image-for-eth-goerli.yml
index f8175de708ea..cfbdc7897403 100644
--- a/.github/workflows/publish-docker-image-for-polygon-supernets.yml
+++ b/.github/workflows/publish-docker-image-for-eth-goerli.yml
@@ -8,26 +8,17 @@ name: Publish Docker image for specific chain branches
 on:
   push:
     branches:
-      - production-polygon-supernets-stg
-env:
-  OTP_VERSION: '24.3.4.1'
-  ELIXIR_VERSION: '1.13.4'
+      - production-eth-goerli-stg
 jobs:
   push_to_registry:
     name: Push Docker image to Docker Hub
     runs-on: ubuntu-latest
     env:
       RELEASE_VERSION: 5.2.0
-      DOCKER_CHAIN_NAME: polygon-supernets
+      DOCKER_CHAIN_NAME: eth-goerli
     steps:
       - name: Check out the repo
         uses: actions/checkout@v3
-
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v2
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
       
       - name: Log in to Docker Hub
         uses: docker/login-action@v2
@@ -53,12 +44,11 @@ jobs:
           tags: blockscout/blockscout-${{ env.DOCKER_CHAIN_NAME }}:latest, blockscout/blockscout-${{ env.DOCKER_CHAIN_NAME }}:${{ env.RELEASE_VERSION }}-prerelease-${{ env.SHORT_SHA }}
           build-args: |
             CACHE_EXCHANGE_RATES_PERIOD=
-            API_V1_READ_METHODS_DISABLED=true
+            DISABLE_READ_API=false
             DISABLE_WEBAPP=false
-            API_V1_WRITE_METHODS_DISABLED=true
+            DISABLE_WRITE_API=false
             CACHE_TOTAL_GAS_USAGE_COUNTER_ENABLED=
             ADMIN_PANEL_ENABLED=false
             CACHE_ADDRESS_WITH_BALANCES_UPDATE_INTERVAL=
-            SENTRY_DSN_CLIENT_GNOSIS=${{ secrets.SENTRY_DSN_CLIENT_GNOSIS }}
             BLOCKSCOUT_VERSION=v${{ env.RELEASE_VERSION }}-beta.+commit.${{ env.SHORT_SHA }}
             RELEASE_VERSION=${{ env.RELEASE_VERSION }}
\ No newline at end of file
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0ae959948d13..90ea79f1137a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -26,6 +26,7 @@
 
 ### Chore
 
+- [#7950](https://github.com/blockscout/blockscout/pull/7950) - Add GA CI for Eth Goerli chain
 - [#7934](https://github.com/blockscout/blockscout/pull/7934), [#7936](https://github.com/blockscout/blockscout/pull/7936) - Explicitly set consensus == true in queries (convenient for search), remove logger requirements, where it is not used anymore
 - [#7901](https://github.com/blockscout/blockscout/pull/7901) - Fix Docker image build
 - [#7890](https://github.com/blockscout/blockscout/pull/7890), [#7918](https://github.com/blockscout/blockscout/pull/7918) - Resolve warning: Application.get_env/2 is discouraged in the module body, use Application.compile_env/3 instead
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 8c5ba039f83e..3885930b28aa 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -78,4 +78,3 @@ COPY --from=builder /opt/release/blockscout .
 COPY --from=builder /app/apps/explorer/node_modules ./node_modules
 COPY --from=builder /app/config/config_helper.exs ./config/config_helper.exs
 COPY --from=builder /app/config/config_helper.exs /app/releases/${RELEASE_VERSION}/config_helper.exs
-
diff --git a/docker/Makefile b/docker/Makefile
index ac4c84a6a8b4..36a704e22461 100644
--- a/docker/Makefile
+++ b/docker/Makefile
@@ -850,4 +850,3 @@ tag-stable-version: ## Generate container `{version}` tag
 				tag \
 				tag-latest \
 				tag-version
-

From 01426d70a1647b7677c90f5cff5f2fa30c5d7beb Mon Sep 17 00:00:00 2001
From: Nikita Pozdniakov <nikitosing4@mail.ru>
Date: Mon, 17 Jul 2023 22:49:15 +0700
Subject: [PATCH 208/909] Process review comments

---
 apps/block_scout_web/config/config.exs                        | 2 +-
 .../block_scout_web/controllers/api/v2/api_key_controller.ex  | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/apps/block_scout_web/config/config.exs b/apps/block_scout_web/config/config.exs
index e0daba023f1e..19182c508d9f 100644
--- a/apps/block_scout_web/config/config.exs
+++ b/apps/block_scout_web/config/config.exs
@@ -13,7 +13,7 @@ config :block_scout_web,
   # 604800 seconds, 1 week
   session_cookie_ttl: 60 * 60 * 24 * 7,
   invalid_session_key: "invalid_session",
-  api_v2_temp_token_key: "api_v2_temp_client_key"
+  api_v2_temp_token_key: "api_v2_temp_token"
 
 config :block_scout_web,
   admin_panel_enabled: System.get_env("ADMIN_PANEL_ENABLED", "") == "true"
diff --git a/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/api_key_controller.ex b/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/api_key_controller.ex
index 255b13872311..4135a6bba9fb 100644
--- a/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/api_key_controller.ex
+++ b/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/api_key_controller.ex
@@ -9,6 +9,10 @@ defmodule BlockScoutWeb.API.V2.APIKeyController do
 
   plug(:fetch_cookies, signed: [@api_v2_temp_token_key])
 
+  @doc """
+    Function to handle POST requests to `/api/v2/key` endpoint. It expects body with `recaptcha_response`. And puts cookie with temporary API v2 token. Which is handled here: https://github.com/blockscout/blockscout/blob/cd19739347f267d8a6ad81bbba2dbdad08bcc134/apps/block_scout_web/lib/block_scout_web/views/access_helper.ex#L170
+  """
+  @spec get_key(Plug.Conn.t(), nil | map) :: {:recaptcha, any} | Plug.Conn.t()
   def get_key(conn, params) do
     helper = Application.get_env(:block_scout_web, :captcha_helper)
     ttl = Application.get_env(:block_scout_web, :api_rate_limit)[:api_v2_token_ttl_seconds]

From 494b89fdeca629891a1d6dfe92daa938ff0e81f7 Mon Sep 17 00:00:00 2001
From: Andrey Atapin <a.atapin@gmail.com>
Date: Mon, 17 Jul 2023 23:03:15 +0500
Subject: [PATCH 209/909] Fixed wrong TX url in email notifications for mainnet
 (#7951)

* Fixed wrong TX url in email notifications for mainnet

* changelog
---
 CHANGELOG.md                                         | 1 +
 apps/explorer/lib/explorer/account/notifier/email.ex | 6 +-----
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b17a0871798e..f80e8214cc89 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -24,6 +24,7 @@
 - [#7843](https://github.com/blockscout/blockscout/pull/7843) - Fix created_contract_code_indexed_at updating
 - [#7855](https://github.com/blockscout/blockscout/pull/7855) - Handle internal transactions unique_violation
 - [#7899](https://github.com/blockscout/blockscout/pull/7899) - Fix catchup numbers_to_ranges function
+- [#7951](https://github.com/blockscout/blockscout/pull/7951) - Fix TX url in email notifications on mainnet
 
 ### Chore
 
diff --git a/apps/explorer/lib/explorer/account/notifier/email.ex b/apps/explorer/lib/explorer/account/notifier/email.ex
index 35555e316914..d15817680d1a 100644
--- a/apps/explorer/lib/explorer/account/notifier/email.ex
+++ b/apps/explorer/lib/explorer/account/notifier/email.ex
@@ -134,11 +134,7 @@ defmodule Explorer.Account.Notifier.Email do
   end
 
   defp host do
-    if System.get_env("MIX_ENV") == "prod" do
-      "blockscout.com"
-    else
-      Application.get_env(:block_scout_web, BlockScoutWeb.Endpoint)[:url][:host]
-    end
+    Application.get_env(:block_scout_web, BlockScoutWeb.Endpoint)[:url][:host]
   end
 
   defp path do

From 565986b4bedfcd1ff68331d17cdb7e60f4d4bef5 Mon Sep 17 00:00:00 2001
From: Viktor Baranov <baranov.viktor.27@gmail.com>
Date: Mon, 17 Jul 2023 21:00:15 +0300
Subject: [PATCH 210/909] Enhance Account email building module test

---
 CHANGELOG.md                                  |  1 +
 .../lib/explorer/account/notifier/email.ex    | 26 ++++++++++++++++---
 .../{notify => notifier}/email_test.exs       | 19 ++++++++------
 .../{notify => notifier}/notify_test.exs      |  2 +-
 .../{notify => notifier}/summary_test.exs     |  2 +-
 5 files changed, 36 insertions(+), 14 deletions(-)
 rename apps/explorer/test/explorer/account/{notify => notifier}/email_test.exs (80%)
 rename apps/explorer/test/explorer/account/{notify => notifier}/notify_test.exs (97%)
 rename apps/explorer/test/explorer/account/{notify => notifier}/summary_test.exs (99%)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f80e8214cc89..d181d3f3b5f0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -28,6 +28,7 @@
 
 ### Chore
 
+- [#7954](https://github.com/blockscout/blockscout/pull/7954) - Enhance Account Explorer.Account.Notifier.Email module tests
 - [#7950](https://github.com/blockscout/blockscout/pull/7950) - Add GA CI for Eth Goerli chain
 - [#7934](https://github.com/blockscout/blockscout/pull/7934), [#7936](https://github.com/blockscout/blockscout/pull/7936) - Explicitly set consensus == true in queries (convenient for search), remove logger requirements, where it is not used anymore
 - [#7901](https://github.com/blockscout/blockscout/pull/7901) - Fix Docker image build
diff --git a/apps/explorer/lib/explorer/account/notifier/email.ex b/apps/explorer/lib/explorer/account/notifier/email.ex
index d15817680d1a..713e5c3f1beb 100644
--- a/apps/explorer/lib/explorer/account/notifier/email.ex
+++ b/apps/explorer/lib/explorer/account/notifier/email.ex
@@ -122,23 +122,41 @@ defmodule Explorer.Account.Notifier.Email do
   end
 
   defp block_url(notification) do
-    URI.to_string(uri()) <> "block/" <> Integer.to_string(notification.block_number)
+    Helpers.block_url(uri(), :show, Integer.to_string(notification.block_number))
   end
 
   defp transaction_url(notification) do
     Helpers.transaction_url(uri(), :show, notification.transaction_hash)
   end
 
+  defp url_params do
+    Application.get_env(:block_scout_web, BlockScoutWeb.Endpoint)[:url]
+  end
+
   defp uri do
-    %URI{scheme: "https", host: host(), path: path()}
+    %URI{scheme: scheme(), host: host(), port: port(), path: path()}
+  end
+
+  defp scheme do
+    Keyword.get(url_params(), :scheme, "http")
   end
 
   defp host do
-    Application.get_env(:block_scout_web, BlockScoutWeb.Endpoint)[:url][:host]
+    url_params()[:host]
+  end
+
+  defp port do
+    url_params()[:http][:port]
   end
 
   defp path do
-    Application.get_env(:block_scout_web, BlockScoutWeb.Endpoint)[:url][:path]
+    raw_path = url_params()[:path]
+
+    if raw_path |> String.ends_with?("/") do
+      raw_path |> String.slice(0..-2)
+    else
+      raw_path
+    end
   end
 
   defp sender do
diff --git a/apps/explorer/test/explorer/account/notify/email_test.exs b/apps/explorer/test/explorer/account/notifier/email_test.exs
similarity index 80%
rename from apps/explorer/test/explorer/account/notify/email_test.exs
rename to apps/explorer/test/explorer/account/notifier/email_test.exs
index 1163d9e32f7c..184e7d33b8a2 100644
--- a/apps/explorer/test/explorer/account/notify/email_test.exs
+++ b/apps/explorer/test/explorer/account/notifier/email_test.exs
@@ -1,4 +1,4 @@
-defmodule Explorer.Account.Notify.EmailTest do
+defmodule Explorer.Account.Notifier.EmailTest do
   use ExUnit.Case
 
   alias Explorer.Account.{
@@ -20,8 +20,11 @@ defmodule Explorer.Account.Notify.EmailTest do
   setup do
     host = Application.get_env(:block_scout_web, BlockScoutWeb.Endpoint)[:url][:host]
     path = Application.get_env(:block_scout_web, BlockScoutWeb.Endpoint)[:url][:path]
+    scheme = Application.get_env(:block_scout_web, BlockScoutWeb.Endpoint)[:url][:scheme]
 
-    Application.put_env(:block_scout_web, BlockScoutWeb.Endpoint, url: [host: "localhost", path: "/"])
+    Application.put_env(:block_scout_web, BlockScoutWeb.Endpoint,
+      url: [scheme: "https", host: "eth.blockscout.com", path: "/", port: 443]
+    )
 
     Application.put_env(:explorer, Explorer.Account,
       sendgrid: [
@@ -33,7 +36,7 @@ defmodule Explorer.Account.Notify.EmailTest do
     :ok
 
     on_exit(fn ->
-      Application.put_env(:block_scout_web, BlockScoutWeb.Endpoint, url: [host: host, path: path])
+      Application.put_env(:block_scout_web, BlockScoutWeb.Endpoint, url: [scheme: scheme, host: host, path: path])
     end)
   end
 
@@ -91,20 +94,20 @@ defmodule Explorer.Account.Notify.EmailTest do
                      dynamic_template_data: %{
                        "address_hash" => "0xe1f4dd38f00b0d8d4d2b4b5010be53f2a0b934e5",
                        "address_name" => "wallet",
-                       "address_url" => "https://localhost//address/0xe1f4dd38f00b0d8d4d2b4b5010be53f2a0b934e5",
+                       "address_url" => "https://eth.blockscout.com/address/0xe1f4dd38f00b0d8d4d2b4b5010be53f2a0b934e5",
                        "amount" => Decimal.new(1),
                        "block_number" => 24_121_177,
-                       "block_url" => "https://localhost/block/24121177",
+                       "block_url" => "https://eth.blockscout.com/block/24121177",
                        "direction" => "received at",
                        "from_address_hash" => "0x092d537737e767dae48c28ae509f34094496f030",
-                       "from_url" => "https://localhost//address/0x092d537737e767dae48c28ae509f34094496f030",
+                       "from_url" => "https://eth.blockscout.com/address/0x092d537737e767dae48c28ae509f34094496f030",
                        "method" => "transfer",
                        "name" => "wallet",
                        "to_address_hash" => "0xe1f4dd38f00b0d8d4d2b4b5010be53f2a0b934e5",
-                       "to_url" => "https://localhost//address/0xe1f4dd38f00b0d8d4d2b4b5010be53f2a0b934e5",
+                       "to_url" => "https://eth.blockscout.com/address/0xe1f4dd38f00b0d8d4d2b4b5010be53f2a0b934e5",
                        "transaction_hash" => "0x5d5ff210261f1b2d6e4af22ea494f428f9997d4ab614a629d4f1390004b3e80d",
                        "transaction_url" =>
-                         "https://localhost//tx/0x5d5ff210261f1b2d6e4af22ea494f428f9997d4ab614a629d4f1390004b3e80d",
+                         "https://eth.blockscout.com/tx/0x5d5ff210261f1b2d6e4af22ea494f428f9997d4ab614a629d4f1390004b3e80d",
                        "tx_fee" => Decimal.new(210_000),
                        "username" => "John Snow"
                      },
diff --git a/apps/explorer/test/explorer/account/notify/notify_test.exs b/apps/explorer/test/explorer/account/notifier/notify_test.exs
similarity index 97%
rename from apps/explorer/test/explorer/account/notify/notify_test.exs
rename to apps/explorer/test/explorer/account/notifier/notify_test.exs
index 7433374aec0b..adde2c2569b2 100644
--- a/apps/explorer/test/explorer/account/notify/notify_test.exs
+++ b/apps/explorer/test/explorer/account/notifier/notify_test.exs
@@ -1,4 +1,4 @@
-defmodule Explorer.Account.Notify.NotifyTest do
+defmodule Explorer.Account.Notifier.NotifyTest do
   # use ExUnit.Case
   use Explorer.DataCase
 
diff --git a/apps/explorer/test/explorer/account/notify/summary_test.exs b/apps/explorer/test/explorer/account/notifier/summary_test.exs
similarity index 99%
rename from apps/explorer/test/explorer/account/notify/summary_test.exs
rename to apps/explorer/test/explorer/account/notifier/summary_test.exs
index 9fcfb9230d00..2f899d8e6ff8 100644
--- a/apps/explorer/test/explorer/account/notify/summary_test.exs
+++ b/apps/explorer/test/explorer/account/notifier/summary_test.exs
@@ -1,4 +1,4 @@
-defmodule Explorer.Account.Notify.SummaryTest do
+defmodule Explorer.Account.Notifier.SummaryTest do
   use Explorer.DataCase
 
   import Explorer.Factory

From 9b93a02e93628e180c3ff9066772f6ae49abce8c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 17 Jul 2023 18:30:31 +0000
Subject: [PATCH 211/909] Bump sweetalert2 from 11.7.16 to 11.7.18 in
 /apps/block_scout_web/assets

Bumps [sweetalert2](https://github.com/sweetalert2/sweetalert2) from 11.7.16 to 11.7.18.
- [Release notes](https://github.com/sweetalert2/sweetalert2/releases)
- [Changelog](https://github.com/sweetalert2/sweetalert2/blob/main/CHANGELOG.md)
- [Commits](https://github.com/sweetalert2/sweetalert2/compare/v11.7.16...v11.7.18)

---
updated-dependencies:
- dependency-name: sweetalert2
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 apps/block_scout_web/assets/package-lock.json | 14 +++++++-------
 apps/block_scout_web/assets/package.json      |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/apps/block_scout_web/assets/package-lock.json b/apps/block_scout_web/assets/package-lock.json
index 0e4559da121c..312df8411da2 100644
--- a/apps/block_scout_web/assets/package-lock.json
+++ b/apps/block_scout_web/assets/package-lock.json
@@ -61,7 +61,7 @@
         "redux": "^4.2.1",
         "stream-browserify": "^3.0.0",
         "stream-http": "^3.1.1",
-        "sweetalert2": "^11.7.16",
+        "sweetalert2": "^11.7.18",
         "urijs": "^1.19.11",
         "url": "^0.11.1",
         "util": "^0.12.5",
@@ -15702,9 +15702,9 @@
       }
     },
     "node_modules/sweetalert2": {
-      "version": "11.7.16",
-      "resolved": "https://registry.npmjs.org/sweetalert2/-/sweetalert2-11.7.16.tgz",
-      "integrity": "sha512-vxqVcA358RWdK/XOG1gFtOzT7qBH186Ry4gnW0Xtrx7vIo1mpnR8hG8MxQms4gz3JPbYQ6UIgZn0+hTK7in3Jw==",
+      "version": "11.7.18",
+      "resolved": "https://registry.npmjs.org/sweetalert2/-/sweetalert2-11.7.18.tgz",
+      "integrity": "sha512-Njl5JTDasSP8yRX9cpLdy2fdxHZYPYNmiIGNZykF2Zt1UHIvurwt/W2LmlGe5RbyMDHYDXuHqlD1Q8Vr5/mqlA==",
       "funding": {
         "type": "individual",
         "url": "https://github.com/sponsors/limonte"
@@ -29161,9 +29161,9 @@
       }
     },
     "sweetalert2": {
-      "version": "11.7.16",
-      "resolved": "https://registry.npmjs.org/sweetalert2/-/sweetalert2-11.7.16.tgz",
-      "integrity": "sha512-vxqVcA358RWdK/XOG1gFtOzT7qBH186Ry4gnW0Xtrx7vIo1mpnR8hG8MxQms4gz3JPbYQ6UIgZn0+hTK7in3Jw=="
+      "version": "11.7.18",
+      "resolved": "https://registry.npmjs.org/sweetalert2/-/sweetalert2-11.7.18.tgz",
+      "integrity": "sha512-Njl5JTDasSP8yRX9cpLdy2fdxHZYPYNmiIGNZykF2Zt1UHIvurwt/W2LmlGe5RbyMDHYDXuHqlD1Q8Vr5/mqlA=="
     },
     "symbol-tree": {
       "version": "3.2.4",
diff --git a/apps/block_scout_web/assets/package.json b/apps/block_scout_web/assets/package.json
index cf4763676a3e..01ea51f5c463 100644
--- a/apps/block_scout_web/assets/package.json
+++ b/apps/block_scout_web/assets/package.json
@@ -73,7 +73,7 @@
     "redux": "^4.2.1",
     "stream-browserify": "^3.0.0",
     "stream-http": "^3.1.1",
-    "sweetalert2": "^11.7.16",
+    "sweetalert2": "^11.7.18",
     "urijs": "^1.19.11",
     "url": "^0.11.1",
     "util": "^0.12.5",

From ac794044d862f7d2eb322be7cf91598b8c794a36 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 17 Jul 2023 19:01:39 +0000
Subject: [PATCH 212/909] Bump ex_doc from 0.30.2 to 0.30.3

Bumps [ex_doc](https://github.com/elixir-lang/ex_doc) from 0.30.2 to 0.30.3.
- [Changelog](https://github.com/elixir-lang/ex_doc/blob/main/CHANGELOG.md)
- [Commits](https://github.com/elixir-lang/ex_doc/commits)

---
updated-dependencies:
- dependency-name: ex_doc
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 mix.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mix.lock b/mix.lock
index ec46ae21f314..b39858e4ad43 100644
--- a/mix.lock
+++ b/mix.lock
@@ -47,7 +47,7 @@
   "ex_cldr_lists": {:hex, :ex_cldr_lists, "2.10.0", "4d4c9877da2d0417fd832907d69974e8328969f75fafc79b05ccf85f549f6281", [:mix], [{:ex_cldr_numbers, "~> 2.25", [hex: :ex_cldr_numbers, repo: "hexpm", optional: false]}, {:ex_doc, "~> 0.18", [hex: :ex_doc, repo: "hexpm", optional: true]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}], "hexpm", "adc040cde7b97f7fd7c0b35dd69ddb6fcf607303ae6355bb1851deae1f8b0652"},
   "ex_cldr_numbers": {:hex, :ex_cldr_numbers, "2.31.1", "ad3e8a33e8cb8d048173f2c89cf6fcec9f1694d99f890a75bc745894c3868d5b", [:mix], [{:decimal, "~> 1.6 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: false]}, {:digital_token, "~> 0.3 or ~> 1.0", [hex: :digital_token, repo: "hexpm", optional: false]}, {:ex_cldr, "~> 2.37", [hex: :ex_cldr, repo: "hexpm", optional: false]}, {:ex_cldr_currencies, ">= 2.14.2", [hex: :ex_cldr_currencies, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}], "hexpm", "a94c40f4bf60f0e69c34977f33caeda483677232699ab0a6a98025ea011fabcf"},
   "ex_cldr_units": {:hex, :ex_cldr_units, "3.16.2", "dbad303fba819981c578234e2aaf19d72efca16ea8b1c6ee46b26232cb45e232", [:mix], [{:cldr_utils, "~> 2.24", [hex: :cldr_utils, repo: "hexpm", optional: false]}, {:decimal, "~> 1.6 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: false]}, {:ex_cldr_lists, "~> 2.10", [hex: :ex_cldr_lists, repo: "hexpm", optional: false]}, {:ex_cldr_numbers, "~> 2.31", [hex: :ex_cldr_numbers, repo: "hexpm", optional: false]}, {:ex_doc, "~> 0.18", [hex: :ex_doc, repo: "hexpm", optional: true]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}], "hexpm", "851095319fb3205c1549619da742cd53a2804c1d9c204cf84014021e2a6ea7e5"},
-  "ex_doc": {:hex, :ex_doc, "0.30.2", "7a3e63ddb387746925bbbbcf6e9cb00e43c757cc60359a2b40059aea573e3e57", [:mix], [{:earmark_parser, "~> 1.4.31", [hex: :earmark_parser, repo: "hexpm", optional: false]}, {:makeup_elixir, "~> 0.14", [hex: :makeup_elixir, repo: "hexpm", optional: false]}, {:makeup_erlang, "~> 0.1", [hex: :makeup_erlang, repo: "hexpm", optional: false]}], "hexpm", "5ba8cb61d069012f16b50e575b0e3e6cf4083935f7444fab0d92c9314ce86bb6"},
+  "ex_doc": {:hex, :ex_doc, "0.30.3", "bfca4d340e3b95f2eb26e72e4890da83e2b3a5c5b0e52607333bf5017284b063", [:mix], [{:earmark_parser, "~> 1.4.31", [hex: :earmark_parser, repo: "hexpm", optional: false]}, {:makeup_elixir, "~> 0.14", [hex: :makeup_elixir, repo: "hexpm", optional: false]}, {:makeup_erlang, "~> 0.1", [hex: :makeup_erlang, repo: "hexpm", optional: false]}], "hexpm", "fbc8702046c1d25edf79de376297e608ac78cdc3a29f075484773ad1718918b6"},
   "ex_json_schema": {:hex, :ex_json_schema, "0.9.3", "fc17c50d410fd99fa6e814e1aed60122d8ff2578b869d17a9db1ce1c621382b6", [:mix], [{:decimal, "~> 2.0", [hex: :decimal, repo: "hexpm", optional: false]}], "hexpm", "b79962d09cefd33001706255187bdb483a0c2b4442d5edc6822eb7574a8df0a8"},
   "ex_keccak": {:hex, :ex_keccak, "0.7.1", "0169f4b0c5073c5df61581d6282b12f1a1b764dcfcda4eeb1c819b5194c9ced0", [:mix], [{:rustler, ">= 0.0.0", [hex: :rustler, repo: "hexpm", optional: true]}, {:rustler_precompiled, "~> 0.6.1", [hex: :rustler_precompiled, repo: "hexpm", optional: false]}], "hexpm", "c18c19f66b6545b4b46b0c71c0cc0079de84e30b26365a92961e91697e8724ed"},
   "ex_machina": {:hex, :ex_machina, "2.7.0", "b792cc3127fd0680fecdb6299235b4727a4944a09ff0fa904cc639272cd92dc7", [:mix], [{:ecto, "~> 2.2 or ~> 3.0", [hex: :ecto, repo: "hexpm", optional: true]}, {:ecto_sql, "~> 3.0", [hex: :ecto_sql, repo: "hexpm", optional: true]}], "hexpm", "419aa7a39bde11894c87a615c4ecaa52d8f107bbdd81d810465186f783245bf8"},

From 97b512d8b85bcfc041598a3f8fff92396bf7cba1 Mon Sep 17 00:00:00 2001
From: nikitosing <32202610+nikitosing@users.noreply.github.com>
Date: Tue, 18 Jul 2023 18:40:56 +0700
Subject: [PATCH 213/909] Csv export improve (#7771)

* Replace all paginated queries to one query with limit 10_000 for CSV export; Get rid of useless DB requests on CSV export

* Fix tests

* Fix test

* Process review comment

* Fix credo
---
 CHANGELOG.md                                  |  1 +
 .../controllers/address_logs_controller.ex    |  4 +-
 .../address_transaction_controller.ex         | 25 ++++---
 .../controllers/api/v2/address_controller.ex  |  4 +-
 .../lib/block_scout_web/notifier.ex           |  2 +-
 .../internal_transaction/_tile.html.eex       |  2 +-
 .../views/api/v2/transaction_view.ex          |  2 +-
 ...s_internal_transaction_controller_test.exs |  3 +-
 apps/explorer/lib/explorer/chain.ex           | 26 +++----
 apps/explorer/lib/explorer/chain/address.ex   |  2 +
 ...dress_internal_transaction_csv_exporter.ex | 55 +++++----------
 .../csv_export/address_log_csv_exporter.ex    | 29 +++-----
 .../address_token_transfer_csv_exporter.ex    | 45 ++++---------
 .../address_transaction_csv_exporter.ex       | 67 +++++++------------
 .../lib/explorer/chain/csv_export/helper.ex   | 10 +--
 .../20230615130940_add_blocks_date_index.exs  | 11 +++
 ...internal_transaction_csv_exporter_test.exs | 10 +--
 .../address_log_csv_exporter_test.exs         |  4 +-
 ...dress_token_transfer_csv_exporter_test.exs |  9 +--
 .../address_transaction_csv_exporter_test.exs |  4 +-
 apps/explorer/test/explorer/chain_test.exs    | 20 +++---
 21 files changed, 141 insertions(+), 194 deletions(-)
 create mode 100644 apps/explorer/priv/repo/migrations/20230615130940_add_blocks_date_index.exs

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e203439cce04..fca657601e44 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,7 @@
 
 ### Features
 
+- [#7771](https://github.com/blockscout/blockscout/pull/7771) - CSV export: speed up
 - [#7946](https://github.com/blockscout/blockscout/pull/7946) - API v2 rate limit: Put token to cookies & change /api/v2/key method
 - [#7888](https://github.com/blockscout/blockscout/pull/7888) - Add token balances info to watchlist address response
 - [#7898](https://github.com/blockscout/blockscout/pull/7898) - Add possibility to add extra headers with JSON RPC URL
diff --git a/apps/block_scout_web/lib/block_scout_web/controllers/address_logs_controller.ex b/apps/block_scout_web/lib/block_scout_web/controllers/address_logs_controller.ex
index ea6c656bac0f..fd7ee5a60970 100644
--- a/apps/block_scout_web/lib/block_scout_web/controllers/address_logs_controller.ex
+++ b/apps/block_scout_web/lib/block_scout_web/controllers/address_logs_controller.ex
@@ -20,7 +20,7 @@ defmodule BlockScoutWeb.AddressLogsController do
     with {:ok, address_hash} <- Chain.string_to_address_hash(address_hash_string),
          :ok <- Chain.check_address_exists(address_hash),
          {:ok, false} <- AccessHelper.restricted_access?(address_hash_string, params) do
-      logs_plus_one = Chain.address_to_logs(address_hash, paging_options(params))
+      logs_plus_one = Chain.address_to_logs(address_hash, false, paging_options(params))
       {results, next_page} = split_list_by_page(logs_plus_one)
 
       next_page_url =
@@ -83,7 +83,7 @@ defmodule BlockScoutWeb.AddressLogsController do
 
       formatted_topic = if String.starts_with?(topic, "0x"), do: topic, else: "0x" <> topic
 
-      logs_plus_one = Chain.address_to_logs(address_hash, topic: formatted_topic)
+      logs_plus_one = Chain.address_to_logs(address_hash, false, topic: formatted_topic)
 
       {results, next_page} = split_list_by_page(logs_plus_one)
 
diff --git a/apps/block_scout_web/lib/block_scout_web/controllers/address_transaction_controller.ex b/apps/block_scout_web/lib/block_scout_web/controllers/address_transaction_controller.ex
index fc9aad5e2035..815c8227a6f3 100644
--- a/apps/block_scout_web/lib/block_scout_web/controllers/address_transaction_controller.ex
+++ b/apps/block_scout_web/lib/block_scout_web/controllers/address_transaction_controller.ex
@@ -190,13 +190,13 @@ defmodule BlockScoutWeb.AddressTransactionController do
          csv_export_module
        )
        when is_binary(address_hash_string) do
-    filter_type = Map.get(params, "filter_type")
-    filter_value = Map.get(params, "filter_value")
-
     with {:ok, address_hash} <- Chain.string_to_address_hash(address_hash_string),
-         {:ok, address} <- Chain.hash_to_address(address_hash),
+         {:address_exists, true} <- {:address_exists, Chain.address_exists?(address_hash)},
          {:recaptcha, true} <- {:recaptcha, captcha_helper().recaptcha_passed?(recaptcha_response)} do
-      address
+      filter_type = Map.get(params, "filter_type")
+      filter_value = Map.get(params, "filter_value")
+
+      address_hash
       |> csv_export_module.export(from_period, to_period, filter_type, filter_value)
       |> Enum.reduce_while(put_resp_params(conn), fn chunk, conn ->
         case Conn.chunk(conn, chunk) do
@@ -211,7 +211,7 @@ defmodule BlockScoutWeb.AddressTransactionController do
       :error ->
         unprocessable_entity(conn)
 
-      {:error, :not_found} ->
+      {:address_exists, false} ->
         not_found(conn)
 
       {:recaptcha, false} ->
@@ -225,15 +225,18 @@ defmodule BlockScoutWeb.AddressTransactionController do
            "address_id" => address_hash_string,
            "from_period" => from_period,
            "to_period" => to_period
-         },
+         } = params,
          csv_export_module
        )
        when is_binary(address_hash_string) do
     with {:ok, address_hash} <- Chain.string_to_address_hash(address_hash_string),
-         {:ok, address} <- Chain.hash_to_address(address_hash),
+         {:address_exists, true} <- {:address_exists, Chain.address_exists?(address_hash)},
          true <- Application.get_env(:block_scout_web, :recaptcha)[:is_disabled] do
-      address
-      |> csv_export_module.export(from_period, to_period)
+      filter_type = Map.get(params, "filter_type")
+      filter_value = Map.get(params, "filter_value")
+
+      address_hash
+      |> csv_export_module.export(from_period, to_period, filter_type, filter_value)
       |> Enum.reduce_while(put_resp_params(conn), fn chunk, conn ->
         case Conn.chunk(conn, chunk) do
           {:ok, conn} ->
@@ -247,7 +250,7 @@ defmodule BlockScoutWeb.AddressTransactionController do
       :error ->
         unprocessable_entity(conn)
 
-      {:error, :not_found} ->
+      {:address_exists, false} ->
         not_found(conn)
 
       false ->
diff --git a/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/address_controller.ex b/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/address_controller.ex
index c507b140c375..c8062039c870 100644
--- a/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/address_controller.ex
+++ b/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/address_controller.ex
@@ -253,7 +253,7 @@ defmodule BlockScoutWeb.API.V2.AddressController do
 
       options = params |> paging_options() |> Keyword.merge(topic: formatted_topic) |> Keyword.merge(@api_true)
 
-      results_plus_one = Chain.address_to_logs(address_hash, options)
+      results_plus_one = Chain.address_to_logs(address_hash, false, options)
 
       {logs, next_page} = split_list_by_page(results_plus_one)
 
@@ -272,7 +272,7 @@ defmodule BlockScoutWeb.API.V2.AddressController do
          {:not_found, {:ok, _address}} <- {:not_found, Chain.hash_to_address(address_hash, @api_true, false)} do
       options = params |> paging_options() |> Keyword.merge(@api_true)
 
-      results_plus_one = Chain.address_to_logs(address_hash, options)
+      results_plus_one = Chain.address_to_logs(address_hash, false, options)
 
       {logs, next_page} = split_list_by_page(results_plus_one)
 
diff --git a/apps/block_scout_web/lib/block_scout_web/notifier.ex b/apps/block_scout_web/lib/block_scout_web/notifier.ex
index be32348540c7..fc69ceb3e27d 100644
--- a/apps/block_scout_web/lib/block_scout_web/notifier.ex
+++ b/apps/block_scout_web/lib/block_scout_web/notifier.ex
@@ -150,7 +150,7 @@ defmodule BlockScoutWeb.Notifier do
     |> Stream.map(
       &(InternalTransaction.where_nonpending_block()
         |> Repo.get_by(transaction_hash: &1.transaction_hash, index: &1.index)
-        |> Repo.preload([:from_address, :to_address, transaction: :block]))
+        |> Repo.preload([:from_address, :to_address, :block]))
     )
     |> Enum.each(&broadcast_internal_transaction/1)
   end
diff --git a/apps/block_scout_web/lib/block_scout_web/templates/internal_transaction/_tile.html.eex b/apps/block_scout_web/lib/block_scout_web/templates/internal_transaction/_tile.html.eex
index 9880c41c3877..27ede917dd8a 100644
--- a/apps/block_scout_web/lib/block_scout_web/templates/internal_transaction/_tile.html.eex
+++ b/apps/block_scout_web/lib/block_scout_web/templates/internal_transaction/_tile.html.eex
@@ -33,7 +33,7 @@
           to: block_path(BlockScoutWeb.Endpoint, :show, @internal_transaction.block_number)
         ) %>
       </span>
-      <span class="mr-2 mr-md-0 order-2" in-tile data-from-now="<%= @internal_transaction.transaction.block.timestamp %>"></span>
+      <span class="mr-2 mr-md-0 order-2" in-tile data-from-now="<%= @internal_transaction.block.timestamp %>"></span>
       <%= if assigns[:current_address] do %>
         <span class="mr-2 mr-md-0 order-0 order-md-3">
           <%= if assigns[:current_address].hash == @internal_transaction.from_address_hash do %>
diff --git a/apps/block_scout_web/lib/block_scout_web/views/api/v2/transaction_view.ex b/apps/block_scout_web/lib/block_scout_web/views/api/v2/transaction_view.ex
index 7fb6089d8ae6..7bd6f70e52b7 100644
--- a/apps/block_scout_web/lib/block_scout_web/views/api/v2/transaction_view.ex
+++ b/apps/block_scout_web/lib/block_scout_web/views/api/v2/transaction_view.ex
@@ -263,7 +263,7 @@ defmodule BlockScoutWeb.API.V2.TransactionView do
         ),
       "value" => internal_transaction.value,
       "block" => internal_transaction.block_number,
-      "timestamp" => internal_transaction.transaction.block.timestamp,
+      "timestamp" => internal_transaction.block.timestamp,
       "index" => internal_transaction.index,
       "gas_limit" => internal_transaction.gas
     }
diff --git a/apps/block_scout_web/test/block_scout_web/controllers/address_internal_transaction_controller_test.exs b/apps/block_scout_web/test/block_scout_web/controllers/address_internal_transaction_controller_test.exs
index 5301e0b1c54b..86a15c8d43fb 100644
--- a/apps/block_scout_web/test/block_scout_web/controllers/address_internal_transaction_controller_test.exs
+++ b/apps/block_scout_web/test/block_scout_web/controllers/address_internal_transaction_controller_test.exs
@@ -538,7 +538,8 @@ defmodule BlockScoutWeb.AddressInternalTransactionControllerTest do
           from_address: address,
           index: index,
           block_hash: transaction.block_hash,
-          block_index: index
+          block_index: index,
+          block_number: transaction.block_number
         )
       end)
 
diff --git a/apps/explorer/lib/explorer/chain.ex b/apps/explorer/lib/explorer/chain.ex
index c9484c673e6e..d7e6d93bb95b 100644
--- a/apps/explorer/lib/explorer/chain.ex
+++ b/apps/explorer/lib/explorer/chain.ex
@@ -291,7 +291,7 @@ defmodule Explorer.Chain do
       |> union(^query_created_contract_address_hash_wrapped)
       |> wrapped_union_subquery()
       |> common_where_limit_order(paging_options)
-      |> preload(transaction: :block)
+      |> preload(:block)
       |> join_associations(necessity_by_association)
       |> select_repo(options).all()
     else
@@ -300,7 +300,7 @@ defmodule Explorer.Chain do
       |> InternalTransaction.where_address_fields_match(hash, direction)
       |> InternalTransaction.where_block_number_in_period(from_block, to_block)
       |> common_where_limit_order(paging_options)
-      |> preload(transaction: :block)
+      |> preload(:block)
       |> join_associations(necessity_by_association)
       |> select_repo(options).all()
     end
@@ -316,7 +316,6 @@ defmodule Explorer.Chain do
   defp common_where_limit_order(query, paging_options) do
     query
     |> InternalTransaction.where_is_different_from_parent_transaction()
-    |> InternalTransaction.where_block_number_is_not_null()
     |> page_internal_transaction(paging_options, %{index_int_tx_desc_order: true})
     |> limit(^paging_options.page_size)
     |> order_by(
@@ -484,13 +483,9 @@ defmodule Explorer.Chain do
     direction = Keyword.get(options, :direction)
     necessity_by_association = Keyword.get(options, :necessity_by_association, %{})
 
-    from_block = from_block(options)
-    to_block = to_block(options)
-
     options
     |> address_to_transactions_tasks_query()
     |> Transaction.not_dropped_or_replaced_transactions()
-    |> where_block_number_in_period(from_block, to_block)
     |> join_associations(necessity_by_association)
     |> put_has_token_transfers_to_tx(old_ui?)
     |> Transaction.matching_address_queries_list(direction, address_hash)
@@ -505,6 +500,7 @@ defmodule Explorer.Chain do
     |> address_to_transactions_tasks_query(true)
     |> Transaction.not_pending_transactions()
     |> join_associations(necessity_by_association)
+    |> put_has_token_transfers_to_tx(false)
     |> Transaction.matching_address_queries_list(direction, address_hashes)
     |> Enum.map(fn query -> Task.async(fn -> select_repo(options).all(query) end) end)
   end
@@ -636,7 +632,7 @@ defmodule Explorer.Chain do
   end
 
   @spec address_to_logs(Hash.Address.t(), Keyword.t()) :: [Log.t()]
-  def address_to_logs(address_hash, options \\ []) when is_list(options) do
+  def address_to_logs(address_hash, csv_export?, options \\ []) when is_list(options) do
     paging_options = Keyword.get(options, :paging_options) || %PagingOptions{page_size: 50}
 
     from_block = from_block(options)
@@ -648,13 +644,20 @@ defmodule Explorer.Chain do
         where: log.address_hash == ^address_hash,
         limit: ^paging_options.page_size,
         select: log,
-        preload: [transaction: [to_address: :smart_contract]],
         inner_join: block in Block,
         on: block.hash == log.block_hash,
         where: block.consensus
       )
 
-    base
+    preloaded_query =
+      if csv_export? do
+        base
+      else
+        base
+        |> preload(transaction: [:to_address, :from_address])
+      end
+
+    preloaded_query
     |> page_logs(paging_options)
     |> filter_topic(Keyword.get(options, :topic))
     |> where_block_number_in_period(from_block, to_block)
@@ -3640,7 +3643,6 @@ defmodule Explorer.Chain do
     |> page_internal_transaction(paging_options)
     |> limit(^paging_options.page_size)
     |> order_by([internal_transaction], asc: internal_transaction.index)
-    |> preload(:transaction)
     |> select_repo(options).all()
   end
 
@@ -3661,7 +3663,7 @@ defmodule Explorer.Chain do
     |> page_internal_transaction(paging_options)
     |> limit(^paging_options.page_size)
     |> order_by([internal_transaction], asc: internal_transaction.index)
-    |> preload(:transaction)
+    |> preload(:block)
     |> select_repo(options).all()
   end
 
diff --git a/apps/explorer/lib/explorer/chain/address.ex b/apps/explorer/lib/explorer/chain/address.ex
index 44b317a42b7f..0b38b0801448 100644
--- a/apps/explorer/lib/explorer/chain/address.ex
+++ b/apps/explorer/lib/explorer/chain/address.ex
@@ -150,6 +150,8 @@ defmodule Explorer.Chain.Address do
 
   def checksum(address_or_hash, iodata? \\ false)
 
+  def checksum(nil, _iodata?), do: ""
+
   def checksum(%__MODULE__{hash: hash}, iodata?) do
     checksum(hash, iodata?)
   end
diff --git a/apps/explorer/lib/explorer/chain/csv_export/address_internal_transaction_csv_exporter.ex b/apps/explorer/lib/explorer/chain/csv_export/address_internal_transaction_csv_exporter.ex
index 82c2c5f5d5a4..f54ae2b36d13 100644
--- a/apps/explorer/lib/explorer/chain/csv_export/address_internal_transaction_csv_exporter.ex
+++ b/apps/explorer/lib/explorer/chain/csv_export/address_internal_transaction_csv_exporter.ex
@@ -4,23 +4,20 @@ defmodule Explorer.Chain.CSVExport.AddressInternalTransactionCsvExporter do
   """
 
   alias Explorer.{Chain, PagingOptions}
-  alias Explorer.Chain.{Address, InternalTransaction, Wei}
+  alias Explorer.Chain.{Address, Hash, Wei}
   alias Explorer.Chain.CSVExport.Helper
 
-  @paging_options %PagingOptions{page_size: Helper.page_size() + 1}
+  @paging_options %PagingOptions{page_size: Helper.limit()}
 
-  @spec export(Address.t(), String.t(), String.t(), String.t() | nil, String.t() | nil) :: Enumerable.t()
-  def export(address, from_period, to_period, filter_type \\ nil, filter_value \\ nil) do
+  @spec export(Hash.Address.t(), String.t(), String.t(), String.t() | nil, String.t() | nil) :: Enumerable.t()
+  def export(address_hash, from_period, to_period, filter_type \\ nil, filter_value \\ nil) do
     {from_block, to_block} = Helper.block_from_period(from_period, to_period)
 
-    res =
-      address.hash
-      |> fetch_all_internal_transactions(from_block, to_block, filter_type, filter_value, @paging_options)
-      |> Enum.sort_by(&{&1.block_number, &1.index, &1.transaction_index}, :desc)
-      |> to_csv_format()
-      |> Helper.dump_to_stream()
-
-    res
+    address_hash
+    |> fetch_all_internal_transactions(from_block, to_block, filter_type, filter_value, @paging_options)
+    |> Enum.sort_by(&{&1.block_number, &1.index, &1.transaction_index}, :desc)
+    |> to_csv_format()
+    |> Helper.dump_to_stream()
   end
 
   # sobelow_skip ["DOS.StringToAtom"]
@@ -30,8 +27,7 @@ defmodule Explorer.Chain.CSVExport.AddressInternalTransactionCsvExporter do
          to_block,
          filter_type,
          filter_value,
-         paging_options,
-         acc \\ []
+         paging_options
        ) do
     options =
       []
@@ -43,28 +39,7 @@ defmodule Explorer.Chain.CSVExport.AddressInternalTransactionCsvExporter do
             else: &1
           )).()
 
-    internal_transactions = Chain.address_to_internal_transactions(address_hash, options)
-
-    new_acc = internal_transactions ++ acc
-
-    case Enum.split(internal_transactions, Helper.page_size()) do
-      {_internal_transactions,
-       [%InternalTransaction{block_number: block_number, transaction_index: transaction_index, index: index}]} ->
-        new_paging_options = %{@paging_options | key: {block_number, transaction_index, index}}
-
-        fetch_all_internal_transactions(
-          address_hash,
-          from_block,
-          to_block,
-          filter_type,
-          filter_value,
-          new_paging_options,
-          new_acc
-        )
-
-      {_, []} ->
-        new_acc
-    end
+    Chain.address_to_internal_transactions(address_hash, options)
   end
 
   defp to_csv_format(internal_transactions) do
@@ -99,10 +74,10 @@ defmodule Explorer.Chain.CSVExport.AddressInternalTransactionCsvExporter do
           internal_transaction.block_hash,
           internal_transaction.block_index,
           internal_transaction.transaction_index,
-          internal_transaction.transaction.block.timestamp,
-          to_string(internal_transaction.from_address_hash),
-          to_string(internal_transaction.to_address_hash),
-          to_string(internal_transaction.created_contract_address_hash),
+          internal_transaction.block.timestamp,
+          Address.checksum(internal_transaction.from_address_hash),
+          Address.checksum(internal_transaction.to_address_hash),
+          Address.checksum(internal_transaction.created_contract_address_hash),
           internal_transaction.type,
           internal_transaction.call_type,
           internal_transaction.gas,
diff --git a/apps/explorer/lib/explorer/chain/csv_export/address_log_csv_exporter.ex b/apps/explorer/lib/explorer/chain/csv_export/address_log_csv_exporter.ex
index 0281bb6e4745..7432cb8a274a 100644
--- a/apps/explorer/lib/explorer/chain/csv_export/address_log_csv_exporter.ex
+++ b/apps/explorer/lib/explorer/chain/csv_export/address_log_csv_exporter.ex
@@ -4,22 +4,22 @@ defmodule Explorer.Chain.CSVExport.AddressLogCsvExporter do
   """
 
   alias Explorer.{Chain, PagingOptions}
-  alias Explorer.Chain.{Address, Log, Transaction}
+  alias Explorer.Chain.{Address, Hash}
   alias Explorer.Chain.CSVExport.Helper
 
-  @paging_options %PagingOptions{page_size: Helper.page_size() + 1}
+  @paging_options %PagingOptions{page_size: Helper.limit()}
 
-  @spec export(Address.t(), String.t(), String.t(), String.t() | nil, String.t() | nil) :: Enumerable.t()
-  def export(address, from_period, to_period, filter_type \\ nil, filter_value \\ nil) do
+  @spec export(Hash.Address.t(), String.t(), String.t(), String.t() | nil, String.t() | nil) :: Enumerable.t()
+  def export(address_hash, from_period, to_period, _filter_type \\ nil, filter_value \\ nil) do
     {from_block, to_block} = Helper.block_from_period(from_period, to_period)
 
-    address.hash
-    |> fetch_all_logs(from_block, to_block, filter_type, filter_value, @paging_options)
+    address_hash
+    |> fetch_all_logs(from_block, to_block, filter_value, @paging_options)
     |> to_csv_format()
     |> Helper.dump_to_stream()
   end
 
-  defp fetch_all_logs(address_hash, from_block, to_block, filter_type, filter_value, paging_options, acc \\ []) do
+  defp fetch_all_logs(address_hash, from_block, to_block, filter_value, paging_options) do
     options =
       []
       |> Keyword.put(:paging_options, paging_options)
@@ -27,18 +27,7 @@ defmodule Explorer.Chain.CSVExport.AddressLogCsvExporter do
       |> Keyword.put(:to_block, to_block)
       |> Keyword.put(:topic, filter_value)
 
-    logs = Chain.address_to_logs(address_hash, options)
-
-    new_acc = logs ++ acc
-
-    case Enum.split(logs, Helper.page_size()) do
-      {_logs, [%Log{block_number: block_number, transaction: %Transaction{index: _transaction_index}, index: index}]} ->
-        new_paging_options = %{@paging_options | key: {block_number, index}}
-        fetch_all_logs(address_hash, from_block, to_block, filter_type, filter_value, new_paging_options, new_acc)
-
-      {_, []} ->
-        new_acc
-    end
+    Chain.address_to_logs(address_hash, true, options)
   end
 
   defp to_csv_format(logs) do
@@ -63,7 +52,7 @@ defmodule Explorer.Chain.CSVExport.AddressLogCsvExporter do
           log.index,
           log.block_number,
           log.block_hash,
-          to_string(log.address_hash),
+          Address.checksum(log.address_hash),
           to_string(log.data),
           to_string(log.first_topic),
           to_string(log.second_topic),
diff --git a/apps/explorer/lib/explorer/chain/csv_export/address_token_transfer_csv_exporter.ex b/apps/explorer/lib/explorer/chain/csv_export/address_token_transfer_csv_exporter.ex
index f06734edd59a..704229757280 100644
--- a/apps/explorer/lib/explorer/chain/csv_export/address_token_transfer_csv_exporter.ex
+++ b/apps/explorer/lib/explorer/chain/csv_export/address_token_transfer_csv_exporter.ex
@@ -15,15 +15,15 @@ defmodule Explorer.Chain.CSVExport.AddressTokenTransferCsvExporter do
   alias Explorer.Chain.{Address, Hash, TokenTransfer}
   alias Explorer.Chain.CSVExport.Helper
 
-  @paging_options %PagingOptions{page_size: Helper.page_size() + 1, asc_order: true}
+  @paging_options %PagingOptions{page_size: Helper.limit(), asc_order: true}
 
-  @spec export(Address.t(), String.t(), String.t(), String.t() | nil, String.t() | nil) :: Enumerable.t()
-  def export(address, from_period, to_period, filter_type \\ nil, filter_value \\ nil) do
+  @spec export(Hash.Address.t(), String.t(), String.t(), String.t() | nil, String.t() | nil) :: Enumerable.t()
+  def export(address_hash, from_period, to_period, filter_type \\ nil, filter_value \\ nil) do
     {from_block, to_block} = Helper.block_from_period(from_period, to_period)
 
-    address.hash
+    address_hash
     |> fetch_all_token_transfers(from_block, to_block, filter_type, filter_value, @paging_options)
-    |> to_csv_format(address)
+    |> to_csv_format(address_hash)
     |> Helper.dump_to_stream()
   end
 
@@ -33,8 +33,7 @@ defmodule Explorer.Chain.CSVExport.AddressTokenTransferCsvExporter do
         to_block,
         filter_type,
         filter_value,
-        paging_options,
-        acc \\ []
+        paging_options
       ) do
     options =
       []
@@ -44,30 +43,10 @@ defmodule Explorer.Chain.CSVExport.AddressTokenTransferCsvExporter do
       |> Keyword.put(:filter_type, filter_type)
       |> Keyword.put(:filter_value, filter_value)
 
-    token_transfers = address_hash_to_token_transfers_including_contract(address_hash, options)
-
-    new_acc = acc ++ token_transfers
-
-    case Enum.split(token_transfers, Helper.page_size()) do
-      {_token_transfers, [%TokenTransfer{block_number: block_number, log_index: log_index}]} ->
-        new_paging_options = %{@paging_options | key: {block_number, log_index}}
-
-        fetch_all_token_transfers(
-          address_hash,
-          from_block,
-          to_block,
-          filter_type,
-          filter_value,
-          new_paging_options,
-          new_acc
-        )
-
-      {_, []} ->
-        new_acc
-    end
+    address_hash_to_token_transfers_including_contract(address_hash, options)
   end
 
-  defp to_csv_format(token_transfers, address) do
+  defp to_csv_format(token_transfers, address_hash) do
     row_names = [
       "TxHash",
       "BlockNumber",
@@ -90,10 +69,10 @@ defmodule Explorer.Chain.CSVExport.AddressTokenTransferCsvExporter do
           to_string(token_transfer.transaction_hash),
           token_transfer.transaction.block_number,
           token_transfer.transaction.block.timestamp,
-          token_transfer.from_address_hash |> to_string() |> String.downcase(),
-          token_transfer.to_address_hash |> to_string() |> String.downcase(),
-          token_transfer.token_contract_address_hash |> to_string() |> String.downcase(),
-          type(token_transfer, address.hash),
+          Address.checksum(token_transfer.from_address_hash),
+          Address.checksum(token_transfer.to_address_hash),
+          Address.checksum(token_transfer.token_contract_address_hash),
+          type(token_transfer, address_hash),
           token_transfer.token.symbol,
           token_transfer.amount,
           fee(token_transfer.transaction),
diff --git a/apps/explorer/lib/explorer/chain/csv_export/address_transaction_csv_exporter.ex b/apps/explorer/lib/explorer/chain/csv_export/address_transaction_csv_exporter.ex
index ae47768cff0b..cd2595a7e3a7 100644
--- a/apps/explorer/lib/explorer/chain/csv_export/address_transaction_csv_exporter.ex
+++ b/apps/explorer/lib/explorer/chain/csv_export/address_transaction_csv_exporter.ex
@@ -15,32 +15,25 @@ defmodule Explorer.Chain.CSVExport.AddressTransactionCsvExporter do
 
   @necessity_by_association [
     necessity_by_association: %{
-      [created_contract_address: :names] => :optional,
-      [from_address: :names] => :optional,
-      [to_address: :names] => :optional,
-      [token_transfers: :token] => :optional,
-      [token_transfers: :to_address] => :optional,
-      [token_transfers: :from_address] => :optional,
-      [token_transfers: :token_contract_address] => :optional,
       :block => :required
     }
   ]
 
-  @paging_options %PagingOptions{page_size: Helper.page_size() + 1}
+  @paging_options %PagingOptions{page_size: Helper.limit()}
 
   @spec export(Address.t(), String.t(), String.t(), String.t() | nil, String.t() | nil) :: Enumerable.t()
-  def export(address, from_period, to_period, filter_type \\ nil, filter_value \\ nil) do
+  def export(address_hash, from_period, to_period, filter_type \\ nil, filter_value \\ nil) do
     {from_block, to_block} = Helper.block_from_period(from_period, to_period)
     exchange_rate = Market.get_coin_exchange_rate()
 
-    address.hash
-    |> fetch_all_transactions(from_block, to_block, filter_type, filter_value, @paging_options)
-    |> to_csv_format(address, exchange_rate)
+    address_hash
+    |> fetch_transactions(from_block, to_block, filter_type, filter_value, @paging_options)
+    |> to_csv_format(address_hash, exchange_rate)
     |> Helper.dump_to_stream()
   end
 
   # sobelow_skip ["DOS.StringToAtom"]
-  def fetch_all_transactions(address_hash, from_block, to_block, filter_type, filter_value, paging_options, acc \\ []) do
+  def fetch_transactions(address_hash, from_block, to_block, filter_type, filter_value, paging_options) do
     options =
       @necessity_by_association
       |> Keyword.put(:paging_options, paging_options)
@@ -51,29 +44,10 @@ defmodule Explorer.Chain.CSVExport.AddressTransactionCsvExporter do
             else: &1
           )).()
 
-    transactions = Chain.address_to_transactions_without_rewards(address_hash, options)
-    new_acc = transactions ++ acc
-
-    case Enum.split(transactions, Helper.page_size()) do
-      {_transactions, [%Transaction{block_number: block_number, index: index}]} ->
-        new_paging_options = %{@paging_options | key: {block_number, index}}
-
-        fetch_all_transactions(
-          address_hash,
-          from_block,
-          to_block,
-          filter_type,
-          filter_value,
-          new_paging_options,
-          new_acc
-        )
-
-      {_, []} ->
-        new_acc
-    end
+    Chain.address_to_transactions_without_rewards(address_hash, options)
   end
 
-  defp to_csv_format(transactions, address, exchange_rate) do
+  defp to_csv_format(transactions, address_hash, exchange_rate) do
     row_names = [
       "TxHash",
       "BlockNumber",
@@ -91,19 +65,30 @@ defmodule Explorer.Chain.CSVExport.AddressTransactionCsvExporter do
       "TxDateClosingPrice"
     ]
 
+    date_to_prices =
+      Enum.reduce(transactions, %{}, fn tx, acc ->
+        date = DateTime.to_date(tx.block.timestamp)
+
+        if Map.has_key?(acc, date) do
+          acc
+        else
+          Map.put(acc, date, price_at_date(date))
+        end
+      end)
+
     transaction_lists =
       transactions
       |> Stream.map(fn transaction ->
-        {opening_price, closing_price} = price_at_date(transaction.block.timestamp)
+        {opening_price, closing_price} = date_to_prices[DateTime.to_date(transaction.block.timestamp)]
 
         [
           to_string(transaction.hash),
           transaction.block_number,
           transaction.block.timestamp,
-          to_string(transaction.from_address),
-          to_string(transaction.to_address),
-          to_string(transaction.created_contract_address),
-          type(transaction, address.hash),
+          Address.checksum(transaction.from_address_hash),
+          Address.checksum(transaction.to_address_hash),
+          Address.checksum(transaction.created_contract_address_hash),
+          type(transaction, address_hash),
           Wei.to(transaction.value, :wei),
           fee(transaction),
           transaction.status,
@@ -132,9 +117,7 @@ defmodule Explorer.Chain.CSVExport.AddressTransactionCsvExporter do
     end
   end
 
-  defp price_at_date(datetime) do
-    date = DateTime.to_date(datetime)
-
+  defp price_at_date(date) do
     query =
       from(
         mh in MarketHistory,
diff --git a/apps/explorer/lib/explorer/chain/csv_export/helper.ex b/apps/explorer/lib/explorer/chain/csv_export/helper.ex
index 1cf905a06b91..92cf9687c427 100644
--- a/apps/explorer/lib/explorer/chain/csv_export/helper.ex
+++ b/apps/explorer/lib/explorer/chain/csv_export/helper.ex
@@ -12,21 +12,21 @@ defmodule Explorer.Chain.CSVExport.Helper do
       where: 3
     ]
 
+  @limit 10_000
   @page_size 150
   @default_paging_options %PagingOptions{page_size: @page_size}
 
   def dump_to_stream(items) do
-    res =
-      items
-      |> RFC4180.dump_to_stream()
-
-    res
+    items
+    |> RFC4180.dump_to_stream()
   end
 
   def page_size, do: @page_size
 
   def default_paging_options, do: @default_paging_options
 
+  def limit, do: @limit
+
   def block_from_period(from_period, to_period) do
     from_block = Chain.convert_date_to_min_block(from_period)
     to_block = Chain.convert_date_to_max_block(to_period)
diff --git a/apps/explorer/priv/repo/migrations/20230615130940_add_blocks_date_index.exs b/apps/explorer/priv/repo/migrations/20230615130940_add_blocks_date_index.exs
new file mode 100644
index 000000000000..c0b415d676e4
--- /dev/null
+++ b/apps/explorer/priv/repo/migrations/20230615130940_add_blocks_date_index.exs
@@ -0,0 +1,11 @@
+defmodule Explorer.Repo.Migrations.AddBlocksDateIndex do
+  use Ecto.Migration
+
+  def up do
+    execute("CREATE INDEX IF NOT EXISTS blocks_date ON blocks(date(timestamp), number);")
+  end
+
+  def down do
+    execute("DROP INDEX IF EXISTS blocks_date;")
+  end
+end
diff --git a/apps/explorer/test/explorer/chain/csv_export/address_internal_transaction_csv_exporter_test.exs b/apps/explorer/test/explorer/chain/csv_export/address_internal_transaction_csv_exporter_test.exs
index be9a2c4cd6e3..a9687dd0aae5 100644
--- a/apps/explorer/test/explorer/chain/csv_export/address_internal_transaction_csv_exporter_test.exs
+++ b/apps/explorer/test/explorer/chain/csv_export/address_internal_transaction_csv_exporter_test.exs
@@ -2,7 +2,7 @@ defmodule Explorer.Chain.CSVExport.AddressInternalTransactionCsvExporterTest do
   use Explorer.DataCase
 
   alias Explorer.Chain.CSVExport.AddressInternalTransactionCsvExporter
-  alias Explorer.Chain.Wei
+  alias Explorer.Chain.{Address, Wei}
 
   describe "export/3" do
     test "exports address internal transactions to csv" do
@@ -28,7 +28,7 @@ defmodule Explorer.Chain.CSVExport.AddressInternalTransactionCsvExporterTest do
       to_period = Timex.format!(Timex.now(), "%Y-%m-%d", :strftime)
 
       res =
-        address
+        address.hash
         |> AddressInternalTransactionCsvExporter.export(from_period, to_period)
         |> Enum.to_list()
         |> Enum.drop(1)
@@ -102,8 +102,8 @@ defmodule Explorer.Chain.CSVExport.AddressInternalTransactionCsvExporterTest do
       assert result.block_hash == to_string(internal_transaction.block_hash)
       assert result.transaction_index == to_string(internal_transaction.transaction_index)
       assert result.timestamp
-      assert result.from_address_hash == to_string(internal_transaction.from_address_hash)
-      assert result.to_address_hash == to_string(internal_transaction.to_address_hash)
+      assert result.from_address_hash == Address.checksum(internal_transaction.from_address_hash)
+      assert result.to_address_hash == Address.checksum(internal_transaction.to_address_hash)
       assert result.created_contract_address_hash == to_string(internal_transaction.created_contract_address_hash)
       assert result.type == to_string(internal_transaction.type)
       assert result.call_type == to_string(internal_transaction.call_type)
@@ -179,7 +179,7 @@ defmodule Explorer.Chain.CSVExport.AddressInternalTransactionCsvExporterTest do
       to_period = Timex.format!(Timex.now(), "%Y-%m-%d", :strftime)
 
       result =
-        address
+        address.hash
         |> AddressInternalTransactionCsvExporter.export(from_period, to_period)
         |> Enum.to_list()
         |> Enum.drop(1)
diff --git a/apps/explorer/test/explorer/chain/csv_export/address_log_csv_exporter_test.exs b/apps/explorer/test/explorer/chain/csv_export/address_log_csv_exporter_test.exs
index e7fd8b7ec343..b863792f8165 100644
--- a/apps/explorer/test/explorer/chain/csv_export/address_log_csv_exporter_test.exs
+++ b/apps/explorer/test/explorer/chain/csv_export/address_log_csv_exporter_test.exs
@@ -30,7 +30,7 @@ defmodule Explorer.Chain.AddressLogCsvExporterTest do
       to_period = Timex.format!(Timex.now(), "%Y-%m-%d", :strftime)
 
       [result] =
-        address
+        address.hash
         |> AddressLogCsvExporter.export(from_period, to_period)
         |> Enum.to_list()
         |> Enum.drop(1)
@@ -106,7 +106,7 @@ defmodule Explorer.Chain.AddressLogCsvExporterTest do
       to_period = Timex.format!(Timex.now(), "%Y-%m-%d", :strftime)
 
       result =
-        address
+        address.hash
         |> AddressLogCsvExporter.export(from_period, to_period)
         |> Enum.to_list()
         |> Enum.drop(1)
diff --git a/apps/explorer/test/explorer/chain/csv_export/address_token_transfer_csv_exporter_test.exs b/apps/explorer/test/explorer/chain/csv_export/address_token_transfer_csv_exporter_test.exs
index ca584c19fa75..36b62d9757b8 100644
--- a/apps/explorer/test/explorer/chain/csv_export/address_token_transfer_csv_exporter_test.exs
+++ b/apps/explorer/test/explorer/chain/csv_export/address_token_transfer_csv_exporter_test.exs
@@ -1,6 +1,7 @@
 defmodule Explorer.Chain.AddressTokenTransferCsvExporterTest do
   use Explorer.DataCase
 
+  alias Explorer.Chain.Address
   alias Explorer.Chain.CSVExport.AddressTokenTransferCsvExporter
 
   describe "export/3" do
@@ -19,7 +20,7 @@ defmodule Explorer.Chain.AddressTokenTransferCsvExporterTest do
       to_period = Timex.format!(Timex.now(), "%Y-%m-%d", :strftime)
 
       [result] =
-        address
+        address.hash
         |> AddressTokenTransferCsvExporter.export(from_period, to_period)
         |> Enum.to_list()
         |> Enum.drop(1)
@@ -67,8 +68,8 @@ defmodule Explorer.Chain.AddressTokenTransferCsvExporterTest do
 
       assert result.block_number == to_string(transaction.block_number)
       assert result.tx_hash == to_string(transaction.hash)
-      assert result.from_address == token_transfer.from_address_hash |> to_string() |> String.downcase()
-      assert result.to_address == token_transfer.to_address_hash |> to_string() |> String.downcase()
+      assert result.from_address == Address.checksum(token_transfer.from_address_hash)
+      assert result.to_address == Address.checksum(token_transfer.to_address_hash)
       assert result.timestamp == to_string(transaction.block.timestamp)
       assert result.type == "OUT"
     end
@@ -110,7 +111,7 @@ defmodule Explorer.Chain.AddressTokenTransferCsvExporterTest do
       to_period = Timex.format!(Timex.now(), "%Y-%m-%d", :strftime)
 
       result =
-        address
+        address.hash
         |> AddressTokenTransferCsvExporter.export(from_period, to_period)
         |> Enum.to_list()
         |> Enum.drop(1)
diff --git a/apps/explorer/test/explorer/chain/csv_export/address_transaction_csv_exporter_test.exs b/apps/explorer/test/explorer/chain/csv_export/address_transaction_csv_exporter_test.exs
index 2035b3465c15..955cad7a0673 100644
--- a/apps/explorer/test/explorer/chain/csv_export/address_transaction_csv_exporter_test.exs
+++ b/apps/explorer/test/explorer/chain/csv_export/address_transaction_csv_exporter_test.exs
@@ -18,7 +18,7 @@ defmodule Explorer.Chain.AddressTransactionCsvExporterTest do
       to_period = Timex.format!(Timex.now(), "%Y-%m-%d", :strftime)
 
       [result] =
-        address
+        address.hash
         |> AddressTransactionCsvExporter.export(from_period, to_period)
         |> Enum.to_list()
         |> Enum.drop(1)
@@ -117,7 +117,7 @@ defmodule Explorer.Chain.AddressTransactionCsvExporterTest do
       to_period = Timex.format!(Timex.now(), "%Y-%m-%d", :strftime)
 
       result =
-        address
+        address.hash
         |> AddressTransactionCsvExporter.export(from_period, to_period)
         |> Enum.to_list()
         |> Enum.drop(1)
diff --git a/apps/explorer/test/explorer/chain_test.exs b/apps/explorer/test/explorer/chain_test.exs
index d3739754ebcc..fbfc00668853 100644
--- a/apps/explorer/test/explorer/chain_test.exs
+++ b/apps/explorer/test/explorer/chain_test.exs
@@ -288,7 +288,7 @@ defmodule Explorer.ChainTest do
         address: address
       )
 
-      assert Enum.count(Chain.address_to_logs(address_hash)) == 2
+      assert Enum.count(Chain.address_to_logs(address_hash, false)) == 2
     end
 
     test "paginates logs" do
@@ -315,11 +315,11 @@ defmodule Explorer.ChainTest do
 
       paging_options1 = %PagingOptions{page_size: 1}
 
-      [_log] = Chain.address_to_logs(address_hash, paging_options: paging_options1)
+      [_log] = Chain.address_to_logs(address_hash, false, paging_options: paging_options1)
 
       paging_options2 = %PagingOptions{page_size: 60, key: {transaction.block_number, 51}}
 
-      assert Enum.count(Chain.address_to_logs(address_hash, paging_options: paging_options2)) == 50
+      assert Enum.count(Chain.address_to_logs(address_hash, false, paging_options: paging_options2)) == 50
     end
 
     test "searches logs by topic when the first topic matches" do
@@ -352,7 +352,7 @@ defmodule Explorer.ChainTest do
         block_number: transaction2.block_number
       )
 
-      [found_log] = Chain.address_to_logs(address_hash, topic: "test")
+      [found_log] = Chain.address_to_logs(address_hash, false, topic: "test")
 
       assert found_log.transaction.hash == transaction2.hash
     end
@@ -387,7 +387,7 @@ defmodule Explorer.ChainTest do
         address: address
       )
 
-      [found_log] = Chain.address_to_logs(address_hash, topic: "test")
+      [found_log] = Chain.address_to_logs(address_hash, false, topic: "test")
 
       assert found_log.transaction.hash == transaction1.hash
     end
@@ -2318,7 +2318,7 @@ defmodule Explorer.ChainTest do
                %InternalTransaction{
                  from_address: %Ecto.Association.NotLoaded{},
                  to_address: %Ecto.Association.NotLoaded{},
-                 transaction: %Transaction{}
+                 transaction: %Ecto.Association.NotLoaded{}
                }
                | _
              ] = Chain.address_to_internal_transactions(address_hash)
@@ -2778,7 +2778,7 @@ defmodule Explorer.ChainTest do
                  ])
              )
 
-      assert internal_transaction.transaction.block_number == block.number
+      assert internal_transaction.block_number == block.number
     end
 
     test "with transaction with internal transactions loads associations with in necessity_by_association" do
@@ -2800,7 +2800,7 @@ defmodule Explorer.ChainTest do
                %InternalTransaction{
                  from_address: %Ecto.Association.NotLoaded{},
                  to_address: %Ecto.Association.NotLoaded{},
-                 transaction: %Transaction{block: %Ecto.Association.NotLoaded{}}
+                 transaction: %Ecto.Association.NotLoaded{}
                }
              ] = Chain.transaction_to_internal_transactions(transaction.hash)
 
@@ -3052,7 +3052,7 @@ defmodule Explorer.ChainTest do
                  ])
              )
 
-      assert internal_transaction.transaction.block_number == block.number
+      assert internal_transaction.block_number == block.number
     end
 
     test "with transaction with internal transactions loads associations with in necessity_by_association" do
@@ -3074,7 +3074,7 @@ defmodule Explorer.ChainTest do
                %InternalTransaction{
                  from_address: %Ecto.Association.NotLoaded{},
                  to_address: %Ecto.Association.NotLoaded{},
-                 transaction: %Transaction{block: %Ecto.Association.NotLoaded{}}
+                 transaction: %Ecto.Association.NotLoaded{}
                }
              ] = Chain.all_transaction_to_internal_transactions(transaction.hash)
 

From a8d1eaa98322900e518d1232d9fabdfd893598c3 Mon Sep 17 00:00:00 2001
From: Qwerty5Uiop <alex000010@bk.ru>
Date: Thu, 6 Jul 2023 13:20:27 +0400
Subject: [PATCH 214/909] Add TokenTotalSupplyUpdater

---
 CHANGELOG.md                                  |  1 +
 .../fetcher/token_total_supply_updater.ex     | 69 +++++++++++++++++++
 apps/indexer/lib/indexer/supervisor.ex        |  2 +
 .../lib/indexer/transform/token_transfers.ex  | 27 +-------
 4 files changed, 74 insertions(+), 25 deletions(-)
 create mode 100644 apps/indexer/lib/indexer/fetcher/token_total_supply_updater.ex

diff --git a/CHANGELOG.md b/CHANGELOG.md
index fca657601e44..9d23abb6f247 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,6 +12,7 @@
 - [#7784](https://github.com/blockscout/blockscout/pull/7784) - Search improvements: Add new fields, light refactoring
 - [#7811](https://github.com/blockscout/blockscout/pull/7811) - Filter addresses before insertion
 - [#7895](https://github.com/blockscout/blockscout/pull/7895) - API v2: Add sorting to tokens page
+- [#7859](https://github.com/blockscout/blockscout/pull/7859) - Add TokenTotalSupplyUpdater
 
 ### Fixes
 
diff --git a/apps/indexer/lib/indexer/fetcher/token_total_supply_updater.ex b/apps/indexer/lib/indexer/fetcher/token_total_supply_updater.ex
new file mode 100644
index 000000000000..407e7407d7c6
--- /dev/null
+++ b/apps/indexer/lib/indexer/fetcher/token_total_supply_updater.ex
@@ -0,0 +1,69 @@
+defmodule Indexer.Fetcher.TokenTotalSupplyUpdater do
+  @moduledoc """
+  Periodically updates tokens total_supply
+  """
+
+  use GenServer
+
+  alias Explorer.{Chain, Repo}
+  alias Explorer.Chain.Token
+  alias Explorer.Counters.AverageBlockTime
+  alias Explorer.Token.MetadataRetriever
+  alias Timex.Duration
+
+  @default_update_interval :timer.seconds(10)
+
+  def start_link(_) do
+    GenServer.start_link(__MODULE__, :ok, name: __MODULE__)
+  end
+
+  def init(_) do
+    schedule_next_update()
+
+    {:ok, []}
+  end
+
+  def add_tokens(contract_address_hashes) do
+    GenServer.cast(__MODULE__, {:add_tokens, contract_address_hashes})
+  end
+
+  def handle_cast({:add_tokens, contract_address_hashes}, state) do
+    {:noreply, Enum.uniq(List.wrap(contract_address_hashes) ++ state)}
+  end
+
+  def handle_info(:update, contract_address_hashes) do
+    Enum.each(contract_address_hashes, &update_token/1)
+
+    schedule_next_update()
+
+    {:noreply, []}
+  end
+
+  defp schedule_next_update do
+    update_interval =
+      case AverageBlockTime.average_block_time() do
+        {:error, :disabled} -> @default_update_interval
+        block_time -> round(Duration.to_milliseconds(block_time))
+      end
+
+    Process.send_after(self(), :update, update_interval)
+  end
+
+  defp update_token(nil), do: :ok
+
+  defp update_token(address_hash_string) do
+    {:ok, address_hash} = Chain.string_to_address_hash(address_hash_string)
+
+    token = Repo.get_by(Token, contract_address_hash: address_hash)
+
+    if token && !token.skip_metadata do
+      token_params = MetadataRetriever.get_total_supply_of(address_hash_string)
+
+      if token_params !== %{} do
+        {:ok, _} = Chain.update_token(token, token_params)
+      end
+    end
+
+    :ok
+  end
+end
diff --git a/apps/indexer/lib/indexer/supervisor.ex b/apps/indexer/lib/indexer/supervisor.ex
index 38b2e39f6d25..249dc7a3f58b 100644
--- a/apps/indexer/lib/indexer/supervisor.ex
+++ b/apps/indexer/lib/indexer/supervisor.ex
@@ -28,6 +28,7 @@ defmodule Indexer.Supervisor do
     ReplacedTransaction,
     Token,
     TokenBalance,
+    TokenTotalSupplyUpdater,
     TokenUpdater,
     TransactionAction,
     UncleBlock,
@@ -125,6 +126,7 @@ defmodule Indexer.Supervisor do
         # Out-of-band fetchers
         {EmptyBlocksSanitizer.Supervisor, [[json_rpc_named_arguments: json_rpc_named_arguments]]},
         {PendingTransactionsSanitizer, [[json_rpc_named_arguments: json_rpc_named_arguments]]},
+        {TokenTotalSupplyUpdater, [[]]},
 
         # Temporary workers
         {UncatalogedTokenTransfers.Supervisor, [[]]},
diff --git a/apps/indexer/lib/indexer/transform/token_transfers.ex b/apps/indexer/lib/indexer/transform/token_transfers.ex
index 6ea41b65000a..3292cd2935de 100644
--- a/apps/indexer/lib/indexer/transform/token_transfers.ex
+++ b/apps/indexer/lib/indexer/transform/token_transfers.ex
@@ -9,6 +9,7 @@ defmodule Indexer.Transform.TokenTransfers do
   alias Explorer.{Chain, Repo}
   alias Explorer.Chain.{Token, TokenTransfer}
   alias Explorer.Token.MetadataRetriever
+  alias Indexer.Fetcher.TokenTotalSupplyUpdater
 
   @burn_address "0x0000000000000000000000000000000000000000"
 
@@ -57,7 +58,7 @@ defmodule Indexer.Transform.TokenTransfers do
       token_transfer.token_contract_address_hash
     end)
     |> Enum.uniq()
-    |> Enum.each(&update_token/1)
+    |> TokenTotalSupplyUpdater.add_tokens()
 
     tokens_uniq = tokens |> Enum.uniq()
 
@@ -260,30 +261,6 @@ defmodule Indexer.Transform.TokenTransfers do
     {token, token_transfer}
   end
 
-  defp update_token(nil), do: :ok
-
-  defp update_token(address_hash_string) do
-    {:ok, address_hash} = Chain.string_to_address_hash(address_hash_string)
-
-    token = Repo.get_by(Token, contract_address_hash: address_hash)
-
-    if token && !token.skip_metadata do
-      token_params =
-        address_hash_string
-        |> MetadataRetriever.get_total_supply_of()
-
-      token_to_update =
-        token
-        |> Repo.preload([:contract_address])
-
-      if token_params !== %{} do
-        {:ok, _} = Chain.update_token(token_to_update, token_params)
-      end
-    end
-
-    :ok
-  end
-
   def parse_erc1155_params(
         %{
           first_topic: unquote(TokenTransfer.erc1155_batch_transfer_signature()),

From 30e5e0904c4de105b1642c398bf016ad479acea6 Mon Sep 17 00:00:00 2001
From: Qwerty5Uiop <alex000010@bk.ru>
Date: Fri, 7 Jul 2023 14:36:40 +0400
Subject: [PATCH 215/909] Chunk realtime balances requests

---
 CHANGELOG.md                                  |   1 +
 apps/ethereum_jsonrpc/lib/ethereum_jsonrpc.ex |   6 +-
 .../lib/ethereum_jsonrpc/http.ex              |   4 +
 .../lib/indexer/block/realtime/fetcher.ex     |   2 +-
 .../lib/indexer/fetcher/coin_balance.ex       |   2 +
 .../indexer/block/realtime/fetcher_test.exs   | 142 ++++++++++--------
 6 files changed, 89 insertions(+), 68 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9d23abb6f247..776dfb36715c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,6 +13,7 @@
 - [#7811](https://github.com/blockscout/blockscout/pull/7811) - Filter addresses before insertion
 - [#7895](https://github.com/blockscout/blockscout/pull/7895) - API v2: Add sorting to tokens page
 - [#7859](https://github.com/blockscout/blockscout/pull/7859) - Add TokenTotalSupplyUpdater
+- [#7873](https://github.com/blockscout/blockscout/pull/7873) - Chunk realtime balances requests
 
 ### Fixes
 
diff --git a/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc.ex b/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc.ex
index 9e4fd59c2f4d..2a6ebeeb397d 100644
--- a/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc.ex
+++ b/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc.ex
@@ -185,7 +185,7 @@ defmodule EthereumJSONRPC do
           [%{required(:block_quantity) => quantity, required(:hash_data) => data()}],
           json_rpc_named_arguments
         ) :: {:ok, FetchedBalances.t()} | {:error, reason :: term}
-  def fetch_balances(params_list, json_rpc_named_arguments)
+  def fetch_balances(params_list, json_rpc_named_arguments, chunk_size \\ nil)
       when is_list(params_list) and is_list(json_rpc_named_arguments) do
     filtered_params =
       if Application.get_env(:ethereum_jsonrpc, :disable_archive_balances?) do
@@ -203,6 +203,7 @@ defmodule EthereumJSONRPC do
     with {:ok, responses} <-
            id_to_params
            |> FetchedBalances.requests()
+           |> chunk_requests(chunk_size)
            |> json_rpc(json_rpc_named_arguments) do
       {:ok, FetchedBalances.from_responses(responses, id_to_params)}
     end
@@ -550,6 +551,9 @@ defmodule EthereumJSONRPC do
     end
   end
 
+  defp chunk_requests(requests, nil), do: requests
+  defp chunk_requests(requests, chunk_size), do: Enum.chunk_every(requests, chunk_size)
+
   def first_block_to_fetch(config) do
     string_value = Application.get_env(:indexer, config)
 
diff --git a/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/http.ex b/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/http.ex
index f6e48de89a71..e7abd430391b 100644
--- a/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/http.ex
+++ b/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/http.ex
@@ -38,6 +38,10 @@ defmodule EthereumJSONRPC.HTTP do
     end
   end
 
+  def json_rpc([batch | _] = chunked_batch_request, options) when is_list(batch) do
+    chunked_json_rpc(chunked_batch_request, options, [])
+  end
+
   def json_rpc(batch_request, options) when is_list(batch_request) do
     chunked_json_rpc([batch_request], options, [])
   end
diff --git a/apps/indexer/lib/indexer/block/realtime/fetcher.ex b/apps/indexer/lib/indexer/block/realtime/fetcher.ex
index a179718883bc..720672987370 100644
--- a/apps/indexer/lib/indexer/block/realtime/fetcher.ex
+++ b/apps/indexer/lib/indexer/block/realtime/fetcher.ex
@@ -428,7 +428,7 @@ defmodule Indexer.Block.Realtime.Fetcher do
        ) do
     case options
          |> fetch_balances_params_list()
-         |> EthereumJSONRPC.fetch_balances(json_rpc_named_arguments) do
+         |> EthereumJSONRPC.fetch_balances(json_rpc_named_arguments, CoinBalance.batch_size()) do
       {:ok, %FetchedBalances{params_list: params_list, errors: []}} ->
         merged_addresses_params =
           %{address_coin_balances: params_list}
diff --git a/apps/indexer/lib/indexer/fetcher/coin_balance.ex b/apps/indexer/lib/indexer/fetcher/coin_balance.ex
index 08a301a68a05..ce80805e5d13 100644
--- a/apps/indexer/lib/indexer/fetcher/coin_balance.ex
+++ b/apps/indexer/lib/indexer/fetcher/coin_balance.ex
@@ -23,6 +23,8 @@ defmodule Indexer.Fetcher.CoinBalance do
   @default_max_batch_size 500
   @default_max_concurrency 4
 
+  def batch_size, do: defaults()[:max_batch_size]
+
   @doc """
   Asynchronously fetches balances for each address `hash` at the `block_number`.
   """
diff --git a/apps/indexer/test/indexer/block/realtime/fetcher_test.exs b/apps/indexer/test/indexer/block/realtime/fetcher_test.exs
index 155fa52c243d..9d0459e915bc 100644
--- a/apps/indexer/test/indexer/block/realtime/fetcher_test.exs
+++ b/apps/indexer/test/indexer/block/realtime/fetcher_test.exs
@@ -472,30 +472,32 @@ defmodule Indexer.Block.Realtime.FetcherTest do
              ]}
 
           [
-            %{
-              id: 0,
-              jsonrpc: "2.0",
-              method: "eth_getBalance",
-              params: ["0x40b18103537c0f15d5e137dd8ddd019b84949d16", "0x3C365F"]
-            },
-            %{
-              id: 1,
-              jsonrpc: "2.0",
-              method: "eth_getBalance",
-              params: ["0x5ee341ac44d344ade1ca3a771c59b98eb2a77df2", "0x3C365F"]
-            },
-            %{
-              id: 2,
-              jsonrpc: "2.0",
-              method: "eth_getBalance",
-              params: ["0x66c9343c7e8ca673a1fedf9dbf2cd7936dbbf7e3", "0x3C3660"]
-            },
-            %{
-              id: 3,
-              jsonrpc: "2.0",
-              method: "eth_getBalance",
-              params: ["0x698bf6943bab687b2756394624aa183f434f65da", "0x3C365F"]
-            }
+            [
+              %{
+                id: 0,
+                jsonrpc: "2.0",
+                method: "eth_getBalance",
+                params: ["0x40b18103537c0f15d5e137dd8ddd019b84949d16", "0x3C365F"]
+              },
+              %{
+                id: 1,
+                jsonrpc: "2.0",
+                method: "eth_getBalance",
+                params: ["0x5ee341ac44d344ade1ca3a771c59b98eb2a77df2", "0x3C365F"]
+              },
+              %{
+                id: 2,
+                jsonrpc: "2.0",
+                method: "eth_getBalance",
+                params: ["0x66c9343c7e8ca673a1fedf9dbf2cd7936dbbf7e3", "0x3C3660"]
+              },
+              %{
+                id: 3,
+                jsonrpc: "2.0",
+                method: "eth_getBalance",
+                params: ["0x698bf6943bab687b2756394624aa183f434f65da", "0x3C365F"]
+              }
+            ]
           ],
           _ ->
             {:ok,
@@ -964,30 +966,32 @@ defmodule Indexer.Block.Realtime.FetcherTest do
              ]}
 
           [
-            %{
-              id: 0,
-              jsonrpc: "2.0",
-              method: "eth_getBalance",
-              params: ["0x40b18103537c0f15d5e137dd8ddd019b84949d16", "0x3C365F"]
-            },
-            %{
-              id: 1,
-              jsonrpc: "2.0",
-              method: "eth_getBalance",
-              params: ["0x5ee341ac44d344ade1ca3a771c59b98eb2a77df2", "0x3C365F"]
-            },
-            %{
-              id: 2,
-              jsonrpc: "2.0",
-              method: "eth_getBalance",
-              params: ["0x66c9343c7e8ca673a1fedf9dbf2cd7936dbbf7e3", "0x3C3660"]
-            },
-            %{
-              id: 3,
-              jsonrpc: "2.0",
-              method: "eth_getBalance",
-              params: ["0x698bf6943bab687b2756394624aa183f434f65da", "0x3C365F"]
-            }
+            [
+              %{
+                id: 0,
+                jsonrpc: "2.0",
+                method: "eth_getBalance",
+                params: ["0x40b18103537c0f15d5e137dd8ddd019b84949d16", "0x3C365F"]
+              },
+              %{
+                id: 1,
+                jsonrpc: "2.0",
+                method: "eth_getBalance",
+                params: ["0x5ee341ac44d344ade1ca3a771c59b98eb2a77df2", "0x3C365F"]
+              },
+              %{
+                id: 2,
+                jsonrpc: "2.0",
+                method: "eth_getBalance",
+                params: ["0x66c9343c7e8ca673a1fedf9dbf2cd7936dbbf7e3", "0x3C3660"]
+              },
+              %{
+                id: 3,
+                jsonrpc: "2.0",
+                method: "eth_getBalance",
+                params: ["0x698bf6943bab687b2756394624aa183f434f65da", "0x3C365F"]
+              }
+            ]
           ],
           _ ->
             {:ok,
@@ -1183,23 +1187,27 @@ defmodule Indexer.Block.Realtime.FetcherTest do
              ]}
 
           [
-            %{
-              id: 0,
-              jsonrpc: "2.0",
-              method: "eth_getBalance",
-              params: ["0x5ee341ac44d344ade1ca3a771c59b98eb2a77df2", "0x3C365F"]
-            }
+            [
+              %{
+                id: 0,
+                jsonrpc: "2.0",
+                method: "eth_getBalance",
+                params: ["0x5ee341ac44d344ade1ca3a771c59b98eb2a77df2", "0x3C365F"]
+              }
+            ]
           ],
           _ ->
             {:ok, [%{id: 0, jsonrpc: "2.0", result: "0x53474fa377a46000"}]}
 
           [
-            %{
-              id: 0,
-              jsonrpc: "2.0",
-              method: "eth_getBalance",
-              params: ["0x66c9343c7e8ca673a1fedf9dbf2cd7936dbbf7e3", "0x3C3660"]
-            }
+            [
+              %{
+                id: 0,
+                jsonrpc: "2.0",
+                method: "eth_getBalance",
+                params: ["0x66c9343c7e8ca673a1fedf9dbf2cd7936dbbf7e3", "0x3C3660"]
+              }
+            ]
           ],
           _ ->
             {:ok, [%{id: 0, jsonrpc: "2.0", result: "0x53507afe51f28000"}]}
@@ -1224,12 +1232,14 @@ defmodule Indexer.Block.Realtime.FetcherTest do
              ]}
 
           [
-            %{
-              id: 0,
-              jsonrpc: "2.0",
-              method: "eth_getBalance",
-              params: ["0x5ee341ac44d344ade1ca3a771c59b98eb2a77df2", "0x3C365F"]
-            }
+            [
+              %{
+                id: 0,
+                jsonrpc: "2.0",
+                method: "eth_getBalance",
+                params: ["0x5ee341ac44d344ade1ca3a771c59b98eb2a77df2", "0x3C365F"]
+              }
+            ]
           ],
           _ ->
             {:ok, [%{id: 0, jsonrpc: "2.0", result: "0x53474fa377a46000"}]}

From e04aea983465c36c7658ea5dec4a871c3533b8fe Mon Sep 17 00:00:00 2001
From: Viktor Baranov <baranov.viktor.27@gmail.com>
Date: Tue, 18 Jul 2023 16:53:04 +0300
Subject: [PATCH 216/909] Add EXCHANGE_RATES_COINMARKETCAP_COIN_ID env var

---
 CHANGELOG.md                                  |  1 +
 .../exchange_rates/source/coin_market_cap.ex  | 16 +++++++-
 .../exchange_rates/source/coin_gecko_test.exs | 32 ++++++++++++++++
 .../source/coin_market_cap_test.exs           | 37 +++++++++++++++++++
 config/runtime.exs                            |  3 +-
 docker-compose/envs/common-blockscout.env     |  1 +
 docker/Makefile                               |  3 ++
 7 files changed, 91 insertions(+), 2 deletions(-)
 create mode 100644 apps/explorer/test/explorer/exchange_rates/source/coin_market_cap_test.exs

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 776dfb36715c..f87304fd266e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,7 @@
 ### Features
 
 - [#7771](https://github.com/blockscout/blockscout/pull/7771) - CSV export: speed up
+- [#7962](https://github.com/blockscout/blockscout/pull/7962) - Allow indicate CMC id of the coin through env var
 - [#7946](https://github.com/blockscout/blockscout/pull/7946) - API v2 rate limit: Put token to cookies & change /api/v2/key method
 - [#7888](https://github.com/blockscout/blockscout/pull/7888) - Add token balances info to watchlist address response
 - [#7898](https://github.com/blockscout/blockscout/pull/7898) - Add possibility to add extra headers with JSON RPC URL
diff --git a/apps/explorer/lib/explorer/exchange_rates/source/coin_market_cap.ex b/apps/explorer/lib/explorer/exchange_rates/source/coin_market_cap.ex
index b8b1b8fd753e..fb1b5472a3fb 100644
--- a/apps/explorer/lib/explorer/exchange_rates/source/coin_market_cap.ex
+++ b/apps/explorer/lib/explorer/exchange_rates/source/coin_market_cap.ex
@@ -55,8 +55,18 @@ defmodule Explorer.ExchangeRates.Source.CoinMarketCap do
   def source_url do
     coin = Explorer.coin()
     symbol = if coin, do: String.upcase(Explorer.coin()), else: nil
+    coin_id = coin_id()
 
-    if symbol, do: "#{api_quotes_latest_url()}?symbol=#{symbol}&CMC_PRO_API_KEY=#{api_key()}", else: nil
+    cond do
+      coin_id ->
+        "#{api_quotes_latest_url()}?id=#{coin_id}&CMC_PRO_API_KEY=#{api_key()}"
+
+      symbol ->
+        "#{api_quotes_latest_url()}?symbol=#{symbol}&CMC_PRO_API_KEY=#{api_key()}"
+
+      true ->
+        nil
+    end
   end
 
   @impl Source
@@ -84,6 +94,10 @@ defmodule Explorer.ExchangeRates.Source.CoinMarketCap do
     config(:api_key)
   end
 
+  defp coin_id do
+    config(:coin_id)
+  end
+
   defp get_token_properties(market_data) do
     token_values_list =
       market_data
diff --git a/apps/explorer/test/explorer/exchange_rates/source/coin_gecko_test.exs b/apps/explorer/test/explorer/exchange_rates/source/coin_gecko_test.exs
index 9f28e1281494..cd5148c4fbeb 100644
--- a/apps/explorer/test/explorer/exchange_rates/source/coin_gecko_test.exs
+++ b/apps/explorer/test/explorer/exchange_rates/source/coin_gecko_test.exs
@@ -58,6 +58,38 @@ defmodule Explorer.ExchangeRates.Source.CoinGeckoTest do
   ]
   """
 
+  describe "source_url/1" do
+    setup do
+      bypass = Bypass.open()
+      Application.put_env(:explorer, CoinGecko, base_url: "https://api.coingecko.com/api/v3")
+
+      {:ok, bypass: bypass}
+    end
+
+    test "composes cg :coins_list URL" do
+      assert "https://api.coingecko.com/api/v3/coins/list?include_platform=true" == CoinGecko.source_url(:coins_list)
+    end
+
+    test "composes cg url to list of contract address hashes" do
+      assert "https://api.coingecko.com/api/v3/simple/token_price/ethereum?vs_currencies=usd&include_market_cap=true&contract_addresses=0xdAC17F958D2ee523a2206206994597C13D831ec7" ==
+               CoinGecko.source_url(["0xdAC17F958D2ee523a2206206994597C13D831ec7"])
+    end
+
+    test "composes cg url by contract address hash" do
+      assert "https://api.coingecko.com/api/v3/coins/ethereum/contract/0xdAC17F958D2ee523a2206206994597C13D831ec7" ==
+               CoinGecko.source_url("0xdAC17F958D2ee523a2206206994597C13D831ec7")
+    end
+
+    test "composes cg url by contract address hash with custom coin_id" do
+      Application.put_env(:explorer, CoinGecko, platform: "poa-network")
+
+      assert "https://api.coingecko.com/api/v3/coins/poa-network/contract/0xdAC17F958D2ee523a2206206994597C13D831ec7" ==
+               CoinGecko.source_url("0xdAC17F958D2ee523a2206206994597C13D831ec7")
+
+      Application.put_env(:explorer, CoinGecko, platform: nil)
+    end
+  end
+
   describe "format_data/1" do
     setup do
       bypass = Bypass.open()
diff --git a/apps/explorer/test/explorer/exchange_rates/source/coin_market_cap_test.exs b/apps/explorer/test/explorer/exchange_rates/source/coin_market_cap_test.exs
new file mode 100644
index 000000000000..c9bfea7ad1f5
--- /dev/null
+++ b/apps/explorer/test/explorer/exchange_rates/source/coin_market_cap_test.exs
@@ -0,0 +1,37 @@
+defmodule Explorer.ExchangeRates.Source.CoinMarketCapTest do
+  use ExUnit.Case
+
+  alias Explorer.ExchangeRates.Source.CoinMarketCap
+
+  describe "source_url/0" do
+    test "returns default cmc source url" do
+      assert "https://pro-api.coinmarketcap.com/v2/cryptocurrency/quotes/latest?symbol=ETH&CMC_PRO_API_KEY=" ==
+               CoinMarketCap.source_url()
+    end
+
+    test "returns cmc source url with not default symbol" do
+      Application.put_env(:explorer, :coin, "ETC")
+
+      assert "https://pro-api.coinmarketcap.com/v2/cryptocurrency/quotes/latest?symbol=ETC&CMC_PRO_API_KEY=" ==
+               CoinMarketCap.source_url()
+
+      Application.put_env(:explorer, :coin, "ETH")
+    end
+
+    test "returns cmc source url with id" do
+      Application.put_env(:explorer, CoinMarketCap, coin_id: 100_500)
+
+      assert "https://pro-api.coinmarketcap.com/v2/cryptocurrency/quotes/latest?id=100500&CMC_PRO_API_KEY=" ==
+               CoinMarketCap.source_url()
+
+      Application.put_env(:explorer, CoinMarketCap, coin_id: nil)
+    end
+  end
+
+  describe "source_url/1" do
+    test "returns cmc source url for symbol" do
+      assert "https://pro-api.coinmarketcap.com/v2/cryptocurrency/quotes/latest?symbol=ETH&CMC_PRO_API_KEY=" ==
+               CoinMarketCap.source_url("ETH")
+    end
+  end
+end
diff --git a/config/runtime.exs b/config/runtime.exs
index 0619c6ad3707..37818f36a576 100644
--- a/config/runtime.exs
+++ b/config/runtime.exs
@@ -269,7 +269,8 @@ config :explorer, Explorer.ExchangeRates,
 config :explorer, Explorer.ExchangeRates.Source, source: ConfigHelper.exchange_rates_source()
 
 config :explorer, Explorer.ExchangeRates.Source.CoinMarketCap,
-  api_key: System.get_env("EXCHANGE_RATES_COINMARKETCAP_API_KEY")
+  api_key: System.get_env("EXCHANGE_RATES_COINMARKETCAP_API_KEY"),
+  coin_id: System.get_env("EXCHANGE_RATES_COINMARKETCAP_COIN_ID")
 
 config :explorer, Explorer.ExchangeRates.Source.CoinGecko,
   platform: System.get_env("EXCHANGE_RATES_COINGECKO_PLATFORM_ID"),
diff --git a/docker-compose/envs/common-blockscout.env b/docker-compose/envs/common-blockscout.env
index 7ec20be1fc07..c7dfa9eae682 100644
--- a/docker-compose/envs/common-blockscout.env
+++ b/docker-compose/envs/common-blockscout.env
@@ -35,6 +35,7 @@ EXCHANGE_RATES_COIN=
 # EXCHANGE_RATES_COINGECKO_COIN_ID=
 # EXCHANGE_RATES_COINGECKO_API_KEY=
 # EXCHANGE_RATES_COINMARKETCAP_API_KEY=
+# EXCHANGE_RATES_COINMARKETCAP_COIN_ID=
 POOL_SIZE=90
 # EXCHANGE_RATES_COINGECKO_PLATFORM_ID=
 # TOKEN_EXCHANGE_RATE_INTERVAL=
diff --git a/docker/Makefile b/docker/Makefile
index 36a704e22461..d985b5ca216d 100644
--- a/docker/Makefile
+++ b/docker/Makefile
@@ -240,6 +240,9 @@ endif
 ifdef EXCHANGE_RATES_COINMARKETCAP_API_KEY
 	BLOCKSCOUT_CONTAINER_PARAMS += -e 'EXCHANGE_RATES_COINMARKETCAP_API_KEY=$(EXCHANGE_RATES_COINMARKETCAP_API_KEY)'
 endif
+ifdef EXCHANGE_RATES_COINMARKETCAP_COIN_ID
+	BLOCKSCOUT_CONTAINER_PARAMS += -e 'EXCHANGE_RATES_COINMARKETCAP_COIN_ID=$(EXCHANGE_RATES_COINMARKETCAP_COIN_ID)'
+endif
 ifdef DISABLE_EXCHANGE_RATES
 	BLOCKSCOUT_CONTAINER_PARAMS += -e 'DISABLE_EXCHANGE_RATES=$(DISABLE_EXCHANGE_RATES)'
 endif

From 2a12423b886483089cd04386c7a0de295b57f6bf Mon Sep 17 00:00:00 2001
From: Viktor Baranov <baranov.viktor.27@gmail.com>
Date: Tue, 18 Jul 2023 17:56:40 +0300
Subject: [PATCH 217/909] Op Stack: ignore depositNonce

---
 CHANGELOG.md                                          | 1 +
 apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/receipt.ex | 5 +++++
 apps/indexer/lib/indexer/transform/token_transfers.ex | 3 +--
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f87304fd266e..40584e965451 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -33,6 +33,7 @@
 
 ### Chore
 
+- [#7963](https://github.com/blockscout/blockscout/pull/7963) - Op Stack: ignore depositNonce
 - [#7954](https://github.com/blockscout/blockscout/pull/7954) - Enhance Account Explorer.Account.Notifier.Email module tests
 - [#7950](https://github.com/blockscout/blockscout/pull/7950) - Add GA CI for Eth Goerli chain
 - [#7934](https://github.com/blockscout/blockscout/pull/7934), [#7936](https://github.com/blockscout/blockscout/pull/7936) - Explicitly set consensus == true in queries (convenient for search), remove logger requirements, where it is not used anymore
diff --git a/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/receipt.ex b/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/receipt.ex
index 62181ef23ff5..00ededb8d86c 100644
--- a/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/receipt.ex
+++ b/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/receipt.ex
@@ -314,6 +314,11 @@ defmodule EthereumJSONRPC.Receipt do
     :ignore
   end
 
+  # Optimism specific transaction receipt fields
+  defp entry_to_elixir({key, _}) when key in ~w(depositNonce) do
+    :ignore
+  end
+
   defp entry_to_elixir({key, value}) do
     {:error, {:unknown_key, %{key: key, value: value}}}
   end
diff --git a/apps/indexer/lib/indexer/transform/token_transfers.ex b/apps/indexer/lib/indexer/transform/token_transfers.ex
index 3292cd2935de..80d153d0f2cc 100644
--- a/apps/indexer/lib/indexer/transform/token_transfers.ex
+++ b/apps/indexer/lib/indexer/transform/token_transfers.ex
@@ -6,9 +6,8 @@ defmodule Indexer.Transform.TokenTransfers do
   require Logger
 
   alias ABI.TypeDecoder
-  alias Explorer.{Chain, Repo}
+  alias Explorer.Repo
   alias Explorer.Chain.{Token, TokenTransfer}
-  alias Explorer.Token.MetadataRetriever
   alias Indexer.Fetcher.TokenTotalSupplyUpdater
 
   @burn_address "0x0000000000000000000000000000000000000000"

From 0275c97db24fe680c1cd0ecc564e48efb0b82a8f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 18 Jul 2023 18:23:29 +0000
Subject: [PATCH 218/909] Bump webpack from 5.88.1 to 5.88.2 in
 /apps/block_scout_web/assets

Bumps [webpack](https://github.com/webpack/webpack) from 5.88.1 to 5.88.2.
- [Release notes](https://github.com/webpack/webpack/releases)
- [Commits](https://github.com/webpack/webpack/compare/v5.88.1...v5.88.2)

---
updated-dependencies:
- dependency-name: webpack
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 apps/block_scout_web/assets/package-lock.json | 14 +++++++-------
 apps/block_scout_web/assets/package.json      |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/apps/block_scout_web/assets/package-lock.json b/apps/block_scout_web/assets/package-lock.json
index 312df8411da2..9b93124b127a 100644
--- a/apps/block_scout_web/assets/package-lock.json
+++ b/apps/block_scout_web/assets/package-lock.json
@@ -92,7 +92,7 @@
         "sass": "^1.63.6",
         "sass-loader": "^13.3.2",
         "style-loader": "^3.3.3",
-        "webpack": "^5.88.1",
+        "webpack": "^5.88.2",
         "webpack-cli": "^5.1.4"
       },
       "engines": {
@@ -16865,9 +16865,9 @@
       }
     },
     "node_modules/webpack": {
-      "version": "5.88.1",
-      "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.88.1.tgz",
-      "integrity": "sha512-FROX3TxQnC/ox4N+3xQoWZzvGXSuscxR32rbzjpXgEzWudJFEJBpdlkkob2ylrv5yzzufD1zph1OoFsLtm6stQ==",
+      "version": "5.88.2",
+      "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.88.2.tgz",
+      "integrity": "sha512-JmcgNZ1iKj+aiR0OvTYtWQqJwq37Pf683dY9bVORwVbUrDhLhdn/PlO2sHsFHPkj7sHNQF3JwaAkp49V+Sq1tQ==",
       "dev": true,
       "dependencies": {
         "@types/eslint-scope": "^3.7.3",
@@ -30093,9 +30093,9 @@
       "dev": true
     },
     "webpack": {
-      "version": "5.88.1",
-      "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.88.1.tgz",
-      "integrity": "sha512-FROX3TxQnC/ox4N+3xQoWZzvGXSuscxR32rbzjpXgEzWudJFEJBpdlkkob2ylrv5yzzufD1zph1OoFsLtm6stQ==",
+      "version": "5.88.2",
+      "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.88.2.tgz",
+      "integrity": "sha512-JmcgNZ1iKj+aiR0OvTYtWQqJwq37Pf683dY9bVORwVbUrDhLhdn/PlO2sHsFHPkj7sHNQF3JwaAkp49V+Sq1tQ==",
       "dev": true,
       "requires": {
         "@types/eslint-scope": "^3.7.3",
diff --git a/apps/block_scout_web/assets/package.json b/apps/block_scout_web/assets/package.json
index 01ea51f5c463..29f9d2fa134c 100644
--- a/apps/block_scout_web/assets/package.json
+++ b/apps/block_scout_web/assets/package.json
@@ -104,7 +104,7 @@
     "sass": "^1.63.6",
     "sass-loader": "^13.3.2",
     "style-loader": "^3.3.3",
-    "webpack": "^5.88.1",
+    "webpack": "^5.88.2",
     "webpack-cli": "^5.1.4"
   },
   "jest": {

From 36d09f93d319bb68f5ae870acdff0f6982054103 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 19 Jul 2023 05:16:33 +0000
Subject: [PATCH 219/909] Bump word-wrap from 1.2.3 to 1.2.4 in
 /apps/block_scout_web/assets

Bumps [word-wrap](https://github.com/jonschlinkert/word-wrap) from 1.2.3 to 1.2.4.
- [Release notes](https://github.com/jonschlinkert/word-wrap/releases)
- [Commits](https://github.com/jonschlinkert/word-wrap/compare/1.2.3...1.2.4)

---
updated-dependencies:
- dependency-name: word-wrap
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 apps/block_scout_web/assets/package-lock.json | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/apps/block_scout_web/assets/package-lock.json b/apps/block_scout_web/assets/package-lock.json
index 312df8411da2..77eb5c392e61 100644
--- a/apps/block_scout_web/assets/package-lock.json
+++ b/apps/block_scout_web/assets/package-lock.json
@@ -17147,9 +17147,9 @@
       "dev": true
     },
     "node_modules/word-wrap": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz",
-      "integrity": "sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==",
+      "version": "1.2.4",
+      "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.4.tgz",
+      "integrity": "sha512-2V81OA4ugVo5pRo46hAoD2ivUJx8jXmWXfUkY4KFNw0hEptvN0QfH3K4nHiwzGeKl5rFKedV48QVoqYavy4YpA==",
       "dev": true,
       "engines": {
         "node": ">=0.10.0"
@@ -30298,9 +30298,9 @@
       "dev": true
     },
     "word-wrap": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz",
-      "integrity": "sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==",
+      "version": "1.2.4",
+      "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.4.tgz",
+      "integrity": "sha512-2V81OA4ugVo5pRo46hAoD2ivUJx8jXmWXfUkY4KFNw0hEptvN0QfH3K4nHiwzGeKl5rFKedV48QVoqYavy4YpA==",
       "dev": true
     },
     "wrap-ansi": {

From 6b047b51442e7a7c6d99d454b8c565cd395e3dde Mon Sep 17 00:00:00 2001
From: Qwerty5Uiop <105209995+Qwerty5Uiop@users.noreply.github.com>
Date: Wed, 19 Jul 2023 15:08:32 +0400
Subject: [PATCH 220/909] Delete token balances only for blocks that lost
 consensus (#7927)

* Delete token balances only for blocks that lost consensus

* Fix tests

* Acquire contract address tokens only for lost consensus blocks
---
 CHANGELOG.md                                  |  1 +
 .../explorer/chain/import/runner/blocks.ex    | 34 +++++++++++--------
 .../chain/import/runner/blocks_test.exs       |  8 +++++
 3 files changed, 29 insertions(+), 14 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 40584e965451..1c260969d558 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -15,6 +15,7 @@
 - [#7895](https://github.com/blockscout/blockscout/pull/7895) - API v2: Add sorting to tokens page
 - [#7859](https://github.com/blockscout/blockscout/pull/7859) - Add TokenTotalSupplyUpdater
 - [#7873](https://github.com/blockscout/blockscout/pull/7873) - Chunk realtime balances requests
+- [#7927](https://github.com/blockscout/blockscout/pull/7927) - Delete token balances only for blocks that lost consensus
 
 ### Fixes
 
diff --git a/apps/explorer/lib/explorer/chain/import/runner/blocks.ex b/apps/explorer/lib/explorer/chain/import/runner/blocks.ex
index 3a4113dba7a6..76655be27dd9 100644
--- a/apps/explorer/lib/explorer/chain/import/runner/blocks.ex
+++ b/apps/explorer/lib/explorer/chain/import/runner/blocks.ex
@@ -149,25 +149,25 @@ defmodule Explorer.Chain.Import.Runner.Blocks do
         :derive_transaction_forks
       )
     end)
-    |> Multi.run(:acquire_contract_address_tokens, fn repo, _ ->
+    |> Multi.run(:acquire_contract_address_tokens, fn repo, %{lose_consensus: non_consensus_blocks} ->
       Instrumenter.block_import_stage_runner(
-        fn -> acquire_contract_address_tokens(repo, consensus_block_numbers) end,
+        fn -> acquire_contract_address_tokens(repo, non_consensus_blocks) end,
         :address_referencing,
         :blocks,
         :acquire_contract_address_tokens
       )
     end)
-    |> Multi.run(:delete_address_token_balances, fn repo, _ ->
+    |> Multi.run(:delete_address_token_balances, fn repo, %{lose_consensus: non_consensus_blocks} ->
       Instrumenter.block_import_stage_runner(
-        fn -> delete_address_token_balances(repo, consensus_block_numbers, insert_options) end,
+        fn -> delete_address_token_balances(repo, non_consensus_blocks, insert_options) end,
         :address_referencing,
         :blocks,
         :delete_address_token_balances
       )
     end)
-    |> Multi.run(:delete_address_current_token_balances, fn repo, _ ->
+    |> Multi.run(:delete_address_current_token_balances, fn repo, %{lose_consensus: non_consensus_blocks} ->
       Instrumenter.block_import_stage_runner(
-        fn -> delete_address_current_token_balances(repo, consensus_block_numbers, insert_options) end,
+        fn -> delete_address_current_token_balances(repo, non_consensus_blocks, insert_options) end,
         :address_referencing,
         :blocks,
         :delete_address_current_token_balances
@@ -205,10 +205,12 @@ defmodule Explorer.Chain.Import.Runner.Blocks do
   @impl Runner
   def timeout, do: @timeout
 
-  defp acquire_contract_address_tokens(repo, consensus_block_numbers) do
+  defp acquire_contract_address_tokens(repo, non_consensus_blocks) do
+    non_consensus_block_numbers = Enum.map(non_consensus_blocks, fn {number, _hash} -> number end)
+
     query =
       from(ctb in Address.CurrentTokenBalance,
-        where: ctb.block_number in ^consensus_block_numbers,
+        where: ctb.block_number in ^non_consensus_block_numbers,
         select: {ctb.token_contract_address_hash, ctb.token_id},
         distinct: [ctb.token_contract_address_hash, ctb.token_id]
       )
@@ -447,10 +449,12 @@ defmodule Explorer.Chain.Import.Runner.Blocks do
 
   defp delete_address_token_balances(_, [], _), do: {:ok, []}
 
-  defp delete_address_token_balances(repo, consensus_block_numbers, %{timeout: timeout}) do
+  defp delete_address_token_balances(repo, non_consensus_blocks, %{timeout: timeout}) do
+    non_consensus_block_numbers = Enum.map(non_consensus_blocks, fn {number, _hash} -> number end)
+
     ordered_query =
       from(tb in Address.TokenBalance,
-        where: tb.block_number in ^consensus_block_numbers,
+        where: tb.block_number in ^non_consensus_block_numbers,
         select: map(tb, [:address_hash, :token_contract_address_hash, :token_id, :block_number]),
         # Enforce TokenBalance ShareLocks order (see docs: sharelocks.md)
         order_by: [
@@ -482,16 +486,18 @@ defmodule Explorer.Chain.Import.Runner.Blocks do
       {:ok, deleted_address_token_balances}
     rescue
       postgrex_error in Postgrex.Error ->
-        {:error, %{exception: postgrex_error, block_numbers: consensus_block_numbers}}
+        {:error, %{exception: postgrex_error, block_numbers: non_consensus_block_numbers}}
     end
   end
 
   defp delete_address_current_token_balances(_, [], _), do: {:ok, []}
 
-  defp delete_address_current_token_balances(repo, consensus_block_numbers, %{timeout: timeout}) do
+  defp delete_address_current_token_balances(repo, non_consensus_blocks, %{timeout: timeout}) do
+    non_consensus_block_numbers = Enum.map(non_consensus_blocks, fn {number, _hash} -> number end)
+
     ordered_query =
       from(ctb in Address.CurrentTokenBalance,
-        where: ctb.block_number in ^consensus_block_numbers,
+        where: ctb.block_number in ^non_consensus_block_numbers,
         select: map(ctb, [:address_hash, :token_contract_address_hash, :token_id]),
         # Enforce CurrentTokenBalance ShareLocks order (see docs: sharelocks.md)
         order_by: [
@@ -529,7 +535,7 @@ defmodule Explorer.Chain.Import.Runner.Blocks do
       {:ok, deleted_address_current_token_balances}
     rescue
       postgrex_error in Postgrex.Error ->
-        {:error, %{exception: postgrex_error, block_numbers: consensus_block_numbers}}
+        {:error, %{exception: postgrex_error, block_numbers: non_consensus_block_numbers}}
     end
   end
 
diff --git a/apps/explorer/test/explorer/chain/import/runner/blocks_test.exs b/apps/explorer/test/explorer/chain/import/runner/blocks_test.exs
index 5a06a1a6a1f2..ab2d5bc46493 100644
--- a/apps/explorer/test/explorer/chain/import/runner/blocks_test.exs
+++ b/apps/explorer/test/explorer/chain/import/runner/blocks_test.exs
@@ -90,6 +90,8 @@ defmodule Explorer.Chain.Import.Runner.BlocksTest do
 
       assert count(Address.CurrentTokenBalance) == 1
 
+      insert(:block, number: block_number, consensus: true)
+
       assert {:ok,
               %{
                 delete_address_current_token_balances: [
@@ -136,6 +138,8 @@ defmodule Explorer.Chain.Import.Runner.BlocksTest do
 
       previous_block_number = block_number - 1
 
+      insert(:block, number: block_number, consensus: true)
+
       assert {:ok,
               %{
                 delete_address_current_token_balances: [
@@ -187,6 +191,8 @@ defmodule Explorer.Chain.Import.Runner.BlocksTest do
       # Token must exist with non-`nil` `holder_count` for `blocks_update_token_holder_counts` to update
       update_holder_count!(token_contract_address_hash, 0)
 
+      insert(:block, number: block_number, consensus: true)
+
       block_params = params_for(:block, hash: block_hash, miner_hash: miner_hash, number: block_number, consensus: true)
 
       %Ecto.Changeset{valid?: true, changes: block_changes} = Block.changeset(%Block{}, block_params)
@@ -219,6 +225,8 @@ defmodule Explorer.Chain.Import.Runner.BlocksTest do
       # Token must exist with non-`nil` `holder_count` for `blocks_update_token_holder_counts` to update
       update_holder_count!(token_contract_address_hash, 1)
 
+      insert(:block, number: block_number, consensus: true)
+
       block_params = params_for(:block, hash: block_hash, miner_hash: miner_hash, number: block_number, consensus: true)
 
       %Ecto.Changeset{valid?: true, changes: block_changes} = Block.changeset(%Block{}, block_params)

From ccab6d6cb900f7f1012636cadd947f6e487fe670 Mon Sep 17 00:00:00 2001
From: Qwerty5Uiop <105209995+Qwerty5Uiop@users.noreply.github.com>
Date: Wed, 19 Jul 2023 18:29:37 +0400
Subject: [PATCH 221/909] Improve locks acquiring (#7947)

* Decrease locks level

* Move tokens lock acquiring

* Update EmptyBlocksSanitizer locks
---
 CHANGELOG.md                                  |  1 +
 apps/explorer/lib/explorer/chain.ex           |  6 +-
 .../runner/address/current_token_balances.ex  | 30 +------
 .../explorer/chain/import/runner/addresses.ex |  2 +-
 .../explorer/chain/import/runner/blocks.ex    | 29 +------
 .../import/runner/internal_transactions.ex    |  4 +-
 .../explorer/chain/import/runner/tokens.ex    | 80 +++----------------
 .../chain/import/runner/transactions.ex       |  2 +-
 .../indexer/fetcher/empty_blocks_sanitizer.ex | 45 +++++------
 .../temporary/blocks_transactions_mismatch.ex |  2 +-
 10 files changed, 42 insertions(+), 159 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1c260969d558..d4dd0f898f9d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -16,6 +16,7 @@
 - [#7859](https://github.com/blockscout/blockscout/pull/7859) - Add TokenTotalSupplyUpdater
 - [#7873](https://github.com/blockscout/blockscout/pull/7873) - Chunk realtime balances requests
 - [#7927](https://github.com/blockscout/blockscout/pull/7927) - Delete token balances only for blocks that lost consensus
+- [#7947](https://github.com/blockscout/blockscout/pull/7947) - Improve locks acquiring
 
 ### Fixes
 
diff --git a/apps/explorer/lib/explorer/chain.ex b/apps/explorer/lib/explorer/chain.ex
index d7e6d93bb95b..481116b902d0 100644
--- a/apps/explorer/lib/explorer/chain.ex
+++ b/apps/explorer/lib/explorer/chain.ex
@@ -4221,7 +4221,7 @@ defmodule Explorer.Chain do
         where: address_name.address_hash == ^address_hash,
         # Enforce Name ShareLocks order (see docs: sharelocks.md)
         order_by: [asc: :address_hash, asc: :name],
-        lock: "FOR UPDATE"
+        lock: "FOR NO KEY UPDATE"
       )
 
     repo.update_all(
@@ -5159,7 +5159,7 @@ defmodule Explorer.Chain do
       )
       # Enforce Transaction ShareLocks order (see docs: sharelocks.md)
       |> order_by(asc: :hash)
-      |> lock("FOR UPDATE")
+      |> lock("FOR NO KEY UPDATE")
 
     hashes = Enum.map(transactions, & &1.hash)
 
@@ -5204,7 +5204,7 @@ defmodule Explorer.Chain do
         end)
         # Enforce Transaction ShareLocks order (see docs: sharelocks.md)
         |> order_by(asc: :hash)
-        |> lock("FOR UPDATE")
+        |> lock("FOR NO KEY UPDATE")
 
       Repo.update_all(
         from(t in Transaction, join: s in subquery(query), on: t.hash == s.hash),
diff --git a/apps/explorer/lib/explorer/chain/import/runner/address/current_token_balances.ex b/apps/explorer/lib/explorer/chain/import/runner/address/current_token_balances.ex
index b0d691190e5e..0903c70cb876 100644
--- a/apps/explorer/lib/explorer/chain/import/runner/address/current_token_balances.ex
+++ b/apps/explorer/lib/explorer/chain/import/runner/address/current_token_balances.ex
@@ -107,35 +107,13 @@ defmodule Explorer.Chain.Import.Runner.Address.CurrentTokenBalances do
       |> Map.put_new(:timeout, @timeout)
       |> Map.put(:timestamps, timestamps)
 
-    # Enforce ShareLocks tables order (see docs: sharelocks.md)
-    run_func = fn repo ->
-      token_contract_address_hashes_and_ids =
-        changes_list
-        |> Enum.map(fn change ->
-          token_id = get_token_id(change)
-
-          {change.token_contract_address_hash, token_id}
-        end)
-        |> Enum.uniq()
-
-      Tokens.acquire_contract_address_tokens(repo, token_contract_address_hashes_and_ids)
-    end
-
     multi
-    |> Multi.run(:acquire_contract_address_tokens, fn repo, _ ->
-      Instrumenter.block_import_stage_runner(
-        fn -> run_func.(repo) end,
-        :block_following,
-        :current_token_balances,
-        :acquire_contract_address_tokens
-      )
-    end)
     |> Multi.run(:address_current_token_balances, fn repo, _ ->
       Instrumenter.block_import_stage_runner(
         fn -> insert(repo, changes_list, insert_options) end,
         :block_following,
         :current_token_balances,
-        :acquire_contract_address_tokens
+        :address_current_token_balances
       )
     end)
     |> Multi.run(:address_current_token_balances_update_token_holder_counts, fn repo,
@@ -156,15 +134,11 @@ defmodule Explorer.Chain.Import.Runner.Address.CurrentTokenBalances do
         end,
         :block_following,
         :current_token_balances,
-        :acquire_contract_address_tokens
+        :address_current_token_balances_update_token_holder_counts
       )
     end)
   end
 
-  defp get_token_id(change) do
-    if Map.has_key?(change, :token_id), do: change.token_id, else: nil
-  end
-
   @impl Import.Runner
   def timeout, do: @timeout
 
diff --git a/apps/explorer/lib/explorer/chain/import/runner/addresses.ex b/apps/explorer/lib/explorer/chain/import/runner/addresses.ex
index 877f8cbe4a50..23a2e7a1d04b 100644
--- a/apps/explorer/lib/explorer/chain/import/runner/addresses.ex
+++ b/apps/explorer/lib/explorer/chain/import/runner/addresses.ex
@@ -243,7 +243,7 @@ defmodule Explorer.Chain.Import.Runner.Addresses do
           where: t.created_contract_address_hash in ^ordered_created_contract_hashes,
           # Enforce Transaction ShareLocks order (see docs: sharelocks.md)
           order_by: t.hash,
-          lock: "FOR UPDATE"
+          lock: "FOR NO KEY UPDATE"
         )
 
       try do
diff --git a/apps/explorer/lib/explorer/chain/import/runner/blocks.ex b/apps/explorer/lib/explorer/chain/import/runner/blocks.ex
index 76655be27dd9..a3d99c65d6a5 100644
--- a/apps/explorer/lib/explorer/chain/import/runner/blocks.ex
+++ b/apps/explorer/lib/explorer/chain/import/runner/blocks.ex
@@ -149,14 +149,6 @@ defmodule Explorer.Chain.Import.Runner.Blocks do
         :derive_transaction_forks
       )
     end)
-    |> Multi.run(:acquire_contract_address_tokens, fn repo, %{lose_consensus: non_consensus_blocks} ->
-      Instrumenter.block_import_stage_runner(
-        fn -> acquire_contract_address_tokens(repo, non_consensus_blocks) end,
-        :address_referencing,
-        :blocks,
-        :acquire_contract_address_tokens
-      )
-    end)
     |> Multi.run(:delete_address_token_balances, fn repo, %{lose_consensus: non_consensus_blocks} ->
       Instrumenter.block_import_stage_runner(
         fn -> delete_address_token_balances(repo, non_consensus_blocks, insert_options) end,
@@ -205,21 +197,6 @@ defmodule Explorer.Chain.Import.Runner.Blocks do
   @impl Runner
   def timeout, do: @timeout
 
-  defp acquire_contract_address_tokens(repo, non_consensus_blocks) do
-    non_consensus_block_numbers = Enum.map(non_consensus_blocks, fn {number, _hash} -> number end)
-
-    query =
-      from(ctb in Address.CurrentTokenBalance,
-        where: ctb.block_number in ^non_consensus_block_numbers,
-        select: {ctb.token_contract_address_hash, ctb.token_id},
-        distinct: [ctb.token_contract_address_hash, ctb.token_id]
-      )
-
-    contract_address_hashes_and_token_ids = repo.all(query)
-
-    Tokens.acquire_contract_address_tokens(repo, contract_address_hashes_and_token_ids)
-  end
-
   defp fork_transactions(%{
          repo: repo,
          timeout: timeout,
@@ -232,7 +209,7 @@ defmodule Explorer.Chain.Import.Runner.Blocks do
         select: transaction,
         # Enforce Transaction ShareLocks order (see docs: sharelocks.md)
         order_by: [asc: :hash],
-        lock: "FOR UPDATE"
+        lock: "FOR NO KEY UPDATE"
       )
 
     update_query =
@@ -378,7 +355,7 @@ defmodule Explorer.Chain.Import.Runner.Blocks do
         select: block.hash,
         # Enforce Block ShareLocks order (see docs: sharelocks.md)
         order_by: [asc: block.hash],
-        lock: "FOR UPDATE"
+        lock: "FOR NO KEY UPDATE"
       )
 
     {_, removed_consensus_block_hashes} =
@@ -683,7 +660,7 @@ defmodule Explorer.Chain.Import.Runner.Blocks do
         where: bsdr.uncle_hash in ^uncle_hashes,
         # Enforce SeconDegreeRelation ShareLocks order (see docs: sharelocks.md)
         order_by: [asc: :nephew_hash, asc: :uncle_hash],
-        lock: "FOR UPDATE"
+        lock: "FOR NO KEY UPDATE"
       )
 
     update_query =
diff --git a/apps/explorer/lib/explorer/chain/import/runner/internal_transactions.ex b/apps/explorer/lib/explorer/chain/import/runner/internal_transactions.ex
index 532bf22373de..8b26d9b2c811 100644
--- a/apps/explorer/lib/explorer/chain/import/runner/internal_transactions.ex
+++ b/apps/explorer/lib/explorer/chain/import/runner/internal_transactions.ex
@@ -286,7 +286,7 @@ defmodule Explorer.Chain.Import.Runner.InternalTransactions do
         select: block.hash,
         # Enforce Block ShareLocks order (see docs: sharelocks.md)
         order_by: [asc: block.hash],
-        lock: "FOR UPDATE"
+        lock: "FOR NO KEY UPDATE"
       )
 
     {:ok, repo.all(query)}
@@ -314,7 +314,7 @@ defmodule Explorer.Chain.Import.Runner.InternalTransactions do
         select: map(t, [:hash, :block_hash, :block_number, :cumulative_gas_used]),
         # Enforce Transaction ShareLocks order (see docs: sharelocks.md)
         order_by: [asc: t.hash],
-        lock: "FOR UPDATE"
+        lock: "FOR NO KEY UPDATE"
       )
 
     {:ok, repo.all(query)}
diff --git a/apps/explorer/lib/explorer/chain/import/runner/tokens.ex b/apps/explorer/lib/explorer/chain/import/runner/tokens.ex
index dbc45718d7cb..d60afaee2d7a 100644
--- a/apps/explorer/lib/explorer/chain/import/runner/tokens.ex
+++ b/apps/explorer/lib/explorer/chain/import/runner/tokens.ex
@@ -22,79 +22,10 @@ defmodule Explorer.Chain.Import.Runner.Tokens do
   @type holder_count :: non_neg_integer()
   @type token_holder_count :: %{contract_address_hash: Hash.Address.t(), count: holder_count()}
 
-  def acquire_contract_address_tokens(repo, contract_address_hashes_and_token_ids) do
-    initial_query_no_token_id =
-      from(token in Token,
-        select: token
-      )
-
-    initial_query_with_token_id =
-      from(token in Token,
-        left_join: instance in Token.Instance,
-        on: token.contract_address_hash == instance.token_contract_address_hash,
-        select: token
-      )
-
-    {query_no_token_id, query_with_token_id} =
-      contract_address_hashes_and_token_ids
-      |> Enum.reduce({initial_query_no_token_id, initial_query_with_token_id}, fn {contract_address_hash, token_id},
-                                                                                  {query_no_token_id,
-                                                                                   query_with_token_id} ->
-        if is_nil(token_id) do
-          {from(
-             token in query_no_token_id,
-             or_where: token.contract_address_hash == ^contract_address_hash
-           ), query_with_token_id}
-        else
-          {query_no_token_id,
-           from(
-             [token, instance] in query_with_token_id,
-             or_where: token.contract_address_hash == ^contract_address_hash and instance.token_id == ^token_id
-           )}
-        end
-      end)
-
-    final_query_no_token_id =
-      if query_no_token_id == initial_query_no_token_id do
-        nil
-      else
-        from(
-          token in query_no_token_id,
-          # Enforce Token ShareLocks order (see docs: sharelocks.md)
-          order_by: [
-            token.contract_address_hash
-          ],
-          lock: "FOR NO KEY UPDATE"
-        )
-      end
-
-    final_query_with_token_id =
-      if query_with_token_id == initial_query_with_token_id do
-        nil
-      else
-        from(
-          [token, instance] in query_with_token_id,
-          # Enforce Token ShareLocks order (see docs: sharelocks.md)
-          order_by: [
-            token.contract_address_hash,
-            instance.token_id
-          ],
-          lock: "FOR NO KEY UPDATE OF t0"
-        )
-      end
-
-    tokens_no_token_id = (final_query_no_token_id && repo.all(final_query_no_token_id)) || []
-    tokens_with_token_id = (final_query_with_token_id && repo.all(final_query_with_token_id)) || []
-    tokens = tokens_no_token_id ++ tokens_with_token_id
-
-    {:ok, tokens}
-  end
-
   def update_holder_counts_with_deltas(repo, token_holder_count_deltas, %{
         timeout: timeout,
         timestamps: %{updated_at: updated_at}
       }) do
-    # NOTE that acquire_contract_address_tokens needs to be called before this
     {hashes, deltas} =
       token_holder_count_deltas
       |> Enum.map(fn %{contract_address_hash: contract_address_hash, delta: delta} ->
@@ -103,6 +34,15 @@ defmodule Explorer.Chain.Import.Runner.Tokens do
       end)
       |> Enum.unzip()
 
+    token_query =
+      from(
+        token in Token,
+        where: token.contract_address_hash in ^hashes,
+        select: token.contract_address_hash,
+        order_by: token.contract_address_hash,
+        lock: "FOR NO KEY UPDATE"
+      )
+
     query =
       from(
         token in Token,
@@ -113,8 +53,8 @@ defmodule Explorer.Chain.Import.Runner.Tokens do
             ^deltas
           ),
         on: token.contract_address_hash == deltas.contract_address_hash,
+        where: token.contract_address_hash in subquery(token_query),
         where: not is_nil(token.holder_count),
-        # ShareLocks order already enforced by `acquire_contract_address_tokens` (see docs: sharelocks.md)
         update: [
           set: [
             holder_count: token.holder_count + deltas.delta,
diff --git a/apps/explorer/lib/explorer/chain/import/runner/transactions.ex b/apps/explorer/lib/explorer/chain/import/runner/transactions.ex
index f35dc4300ddb..53624f199219 100644
--- a/apps/explorer/lib/explorer/chain/import/runner/transactions.ex
+++ b/apps/explorer/lib/explorer/chain/import/runner/transactions.ex
@@ -215,7 +215,7 @@ defmodule Explorer.Chain.Import.Runner.Transactions do
           where: block.hash in ^block_hashes,
           # Enforce Block ShareLocks order (see docs: sharelocks.md)
           order_by: [asc: block.hash],
-          lock: "FOR UPDATE"
+          lock: "FOR NO KEY UPDATE"
         )
 
       try do
diff --git a/apps/indexer/lib/indexer/fetcher/empty_blocks_sanitizer.ex b/apps/indexer/lib/indexer/fetcher/empty_blocks_sanitizer.ex
index cbc3e9ec7ea8..7f3d3dc721fb 100644
--- a/apps/indexer/lib/indexer/fetcher/empty_blocks_sanitizer.ex
+++ b/apps/indexer/lib/indexer/fetcher/empty_blocks_sanitizer.ex
@@ -68,19 +68,15 @@ defmodule Indexer.Fetcher.EmptyBlocksSanitizer do
   end
 
   defp sanitize_empty_blocks(json_rpc_named_arguments) do
-    unprocessed_non_empty_blocks_from_db = unprocessed_non_empty_blocks_query_list(limit())
-
-    uniq_block_hashes = unprocessed_non_empty_blocks_from_db
-
-    if Enum.count(uniq_block_hashes) > 0 do
-      Repo.update_all(
-        from(
-          block in Block,
-          where: block.hash in ^uniq_block_hashes
-        ),
-        set: [is_empty: false, updated_at: Timex.now()]
-      )
-    end
+    unprocessed_non_empty_blocks_query = unprocessed_non_empty_blocks_query(limit())
+
+    Repo.update_all(
+      from(
+        block in Block,
+        where: block.hash in subquery(unprocessed_non_empty_blocks_query)
+      ),
+      set: [is_empty: false, updated_at: Timex.now()]
+    )
 
     unprocessed_empty_blocks_from_db = unprocessed_empty_blocks_query_list(limit())
 
@@ -141,25 +137,20 @@ defmodule Indexer.Fetcher.EmptyBlocksSanitizer do
       where: block.consensus == true,
       order_by: [asc: block.hash],
       limit: ^limit,
-      offset: 1000,
-      lock: "FOR UPDATE"
+      offset: 1000
     )
   end
 
-  defp unprocessed_non_empty_blocks_query_list(limit) do
+  defp unprocessed_non_empty_blocks_query(limit) do
     blocks_query = consensus_blocks_with_nil_is_empty_query(limit)
 
-    query =
-      from(q in subquery(blocks_query),
-        inner_join: transaction in Transaction,
-        on: q.number == transaction.block_number,
-        select: q.hash,
-        distinct: q.hash,
-        order_by: [asc: q.hash]
-      )
-
-    query
-    |> Repo.all(timeout: :infinity)
+    from(q in subquery(blocks_query),
+      inner_join: transaction in Transaction,
+      on: q.number == transaction.block_number,
+      select: q.hash,
+      order_by: [asc: q.hash],
+      lock: fragment("FOR NO KEY UPDATE OF ?", q)
+    )
   end
 
   defp unprocessed_empty_blocks_query_list(limit) do
diff --git a/apps/indexer/lib/indexer/temporary/blocks_transactions_mismatch.ex b/apps/indexer/lib/indexer/temporary/blocks_transactions_mismatch.ex
index 922fcb3e8086..fd7e1907313c 100644
--- a/apps/indexer/lib/indexer/temporary/blocks_transactions_mismatch.ex
+++ b/apps/indexer/lib/indexer/temporary/blocks_transactions_mismatch.ex
@@ -136,7 +136,7 @@ defmodule Indexer.Temporary.BlocksTransactionsMismatch do
         where: block.hash in ^hashes,
         # Enforce Block ShareLocks order (see docs: sharelocks.md)
         order_by: [asc: block.hash],
-        lock: "FOR UPDATE"
+        lock: "FOR NO KEY UPDATE"
       )
 
     Repo.update_all(

From ffe9ba3393ccf8f22e9b55ace87246b7bca0ae35 Mon Sep 17 00:00:00 2001
From: nikitosing <32202610+nikitosing@users.noreply.github.com>
Date: Wed, 19 Jul 2023 22:06:37 +0700
Subject: [PATCH 222/909] =?UTF-8?q?Add=20tokens=20sorting=20by=20market=20?=
 =?UTF-8?q?cap=20and=20fiat=20value;=20Add=20priority=20to=20sear=E2=80=A6?=
 =?UTF-8?q?=20(#7970)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Add tokens sorting by market cap and fiat value; Add priority to search results

* Fix flaking test

* Changelog
---
 CHANGELOG.md                                  |  1 +
 .../views/api/v2/search_view.ex               |  4 +-
 .../account/api/v1/user_controller_test.exs   |  4 +-
 apps/explorer/lib/explorer/chain.ex           | 37 +++++++++++++++----
 4 files changed, 35 insertions(+), 11 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d4dd0f898f9d..df778ca4757f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,7 @@
 
 ### Features
 
+- [#7970](https://github.com/blockscout/blockscout/pull/7970) - Search improvements: add sorting
 - [#7771](https://github.com/blockscout/blockscout/pull/7771) - CSV export: speed up
 - [#7962](https://github.com/blockscout/blockscout/pull/7962) - Allow indicate CMC id of the coin through env var
 - [#7946](https://github.com/blockscout/blockscout/pull/7946) - API v2 rate limit: Put token to cookies & change /api/v2/key method
diff --git a/apps/block_scout_web/lib/block_scout_web/views/api/v2/search_view.ex b/apps/block_scout_web/lib/block_scout_web/views/api/v2/search_view.ex
index edef93f8b424..7b4f45cbb2da 100644
--- a/apps/block_scout_web/lib/block_scout_web/views/api/v2/search_view.ex
+++ b/apps/block_scout_web/lib/block_scout_web/views/api/v2/search_view.ex
@@ -28,7 +28,9 @@ defmodule BlockScoutWeb.API.V2.SearchView do
       "token_type" => search_result.token_type,
       "is_smart_contract_verified" => search_result.verified,
       "exchange_rate" => search_result.exchange_rate && to_string(search_result.exchange_rate),
-      "total_supply" => search_result.total_supply
+      "total_supply" => search_result.total_supply,
+      "circulating_market_cap" =>
+        search_result.circulating_market_cap && to_string(search_result.circulating_market_cap)
     }
   end
 
diff --git a/apps/block_scout_web/test/block_scout_web/controllers/account/api/v1/user_controller_test.exs b/apps/block_scout_web/test/block_scout_web/controllers/account/api/v1/user_controller_test.exs
index 2c88b617689d..810751d6ff0c 100644
--- a/apps/block_scout_web/test/block_scout_web/controllers/account/api/v1/user_controller_test.exs
+++ b/apps/block_scout_web/test/block_scout_web/controllers/account/api/v1/user_controller_test.exs
@@ -672,8 +672,8 @@ defmodule BlockScoutWeb.Account.Api.V1.UserControllerTest do
 
       [wa1] = conn |> get("/api/account/v1/user/watchlist") |> json_response(200)
 
-      assert wa1["tokens_fiat_value"] |> Decimal.new() |> Decimal.round(14) ==
-               values |> Enum.reduce(Decimal.new(0), fn x, acc -> Decimal.add(x, acc) end) |> Decimal.round(14)
+      assert wa1["tokens_fiat_value"] |> Decimal.new() |> Decimal.round(13) ==
+               values |> Enum.reduce(Decimal.new(0), fn x, acc -> Decimal.add(x, acc) end) |> Decimal.round(13)
 
       assert wa1["tokens_count"] == 150
       assert wa1["tokens_overflow"] == false
diff --git a/apps/explorer/lib/explorer/chain.ex b/apps/explorer/lib/explorer/chain.ex
index 481116b902d0..dd4200d0f0c0 100644
--- a/apps/explorer/lib/explorer/chain.ex
+++ b/apps/explorer/lib/explorer/chain.ex
@@ -1513,7 +1513,9 @@ defmodule Explorer.Chain do
         timestamp: fragment("NULL::timestamp without time zone"),
         verified: not is_nil(smart_contract),
         exchange_rate: nil,
-        total_supply: nil
+        total_supply: nil,
+        circulating_market_cap: nil,
+        priority: 1
       }
     )
   end
@@ -1538,7 +1540,9 @@ defmodule Explorer.Chain do
         timestamp: fragment("NULL::timestamp without time zone"),
         verified: not is_nil(smart_contract),
         exchange_rate: token.fiat_value,
-        total_supply: token.total_supply
+        total_supply: token.total_supply,
+        circulating_market_cap: token.circulating_market_cap,
+        priority: 0
       }
     )
   end
@@ -1563,7 +1567,9 @@ defmodule Explorer.Chain do
         timestamp: fragment("NULL::timestamp without time zone"),
         verified: true,
         exchange_rate: nil,
-        total_supply: nil
+        total_supply: nil,
+        circulating_market_cap: nil,
+        priority: 0
       }
     )
   end
@@ -1597,7 +1603,9 @@ defmodule Explorer.Chain do
             timestamp: fragment("NULL::timestamp without time zone"),
             verified: address.verified,
             exchange_rate: nil,
-            total_supply: nil
+            total_supply: nil,
+            circulating_market_cap: nil,
+            priority: 0
           }
         )
 
@@ -1628,7 +1636,9 @@ defmodule Explorer.Chain do
             timestamp: block.timestamp,
             verified: nil,
             exchange_rate: nil,
-            total_supply: nil
+            total_supply: nil,
+            circulating_market_cap: nil,
+            priority: 0
           }
         )
 
@@ -1657,7 +1667,9 @@ defmodule Explorer.Chain do
             timestamp: block.timestamp,
             verified: nil,
             exchange_rate: nil,
-            total_supply: nil
+            total_supply: nil,
+            circulating_market_cap: nil,
+            priority: 0
           }
         )
 
@@ -1681,7 +1693,9 @@ defmodule Explorer.Chain do
                 timestamp: block.timestamp,
                 verified: nil,
                 exchange_rate: nil,
-                total_supply: nil
+                total_supply: nil,
+                circulating_market_cap: nil,
+                priority: 0
               }
             )
 
@@ -1731,7 +1745,14 @@ defmodule Explorer.Chain do
 
         ordered_query =
           from(items in subquery(query),
-            order_by: [desc_nulls_last: items.holder_count, asc: items.name, desc: items.inserted_at],
+            order_by: [
+              desc: items.priority,
+              desc_nulls_last: items.circulating_market_cap,
+              desc_nulls_last: items.exchange_rate,
+              desc_nulls_last: items.holder_count,
+              asc: items.name,
+              desc: items.inserted_at
+            ],
             limit: ^paging_options.page_size,
             offset: ^offset
           )

From 1092170ae824ffdf21d35c34c6e078f6fb76de46 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 19 Jul 2023 18:12:26 +0000
Subject: [PATCH 223/909] Bump solc from 0.8.20 to 0.8.21 in /apps/explorer

Bumps [solc](https://github.com/ethereum/solc-js) from 0.8.20 to 0.8.21.
- [Commits](https://github.com/ethereum/solc-js/compare/v0.8.20...v0.8.21)

---
updated-dependencies:
- dependency-name: solc
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 apps/explorer/package-lock.json | 14 +++++++-------
 apps/explorer/package.json      |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/apps/explorer/package-lock.json b/apps/explorer/package-lock.json
index 97615d52f59e..cc7eb92d7148 100644
--- a/apps/explorer/package-lock.json
+++ b/apps/explorer/package-lock.json
@@ -7,7 +7,7 @@
       "name": "blockscout",
       "license": "GPL-3.0",
       "dependencies": {
-        "solc": "0.8.20"
+        "solc": "0.8.21"
       },
       "engines": {
         "node": "18.x",
@@ -76,9 +76,9 @@
       }
     },
     "node_modules/solc": {
-      "version": "0.8.20",
-      "resolved": "https://registry.npmjs.org/solc/-/solc-0.8.20.tgz",
-      "integrity": "sha512-fPRnGspIEqmhu63RFO3pc79sLA7ZmzO0Uy0L5l6hEt2wAsq0o7UV6pXkAp3Mfv9IBhg7Px/oTu3a+y4gs3BWrQ==",
+      "version": "0.8.21",
+      "resolved": "https://registry.npmjs.org/solc/-/solc-0.8.21.tgz",
+      "integrity": "sha512-N55ogy2dkTRwiONbj4e6wMZqUNaLZkiRcjGyeafjLYzo/tf/IvhHY5P5wpe+H3Fubh9idu071i8eOGO31s1ylg==",
       "dependencies": {
         "command-exists": "^1.2.8",
         "commander": "^8.1.0",
@@ -144,9 +144,9 @@
       "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g=="
     },
     "solc": {
-      "version": "0.8.20",
-      "resolved": "https://registry.npmjs.org/solc/-/solc-0.8.20.tgz",
-      "integrity": "sha512-fPRnGspIEqmhu63RFO3pc79sLA7ZmzO0Uy0L5l6hEt2wAsq0o7UV6pXkAp3Mfv9IBhg7Px/oTu3a+y4gs3BWrQ==",
+      "version": "0.8.21",
+      "resolved": "https://registry.npmjs.org/solc/-/solc-0.8.21.tgz",
+      "integrity": "sha512-N55ogy2dkTRwiONbj4e6wMZqUNaLZkiRcjGyeafjLYzo/tf/IvhHY5P5wpe+H3Fubh9idu071i8eOGO31s1ylg==",
       "requires": {
         "command-exists": "^1.2.8",
         "commander": "^8.1.0",
diff --git a/apps/explorer/package.json b/apps/explorer/package.json
index 0a0f2e851d9d..680ab2b5d43d 100644
--- a/apps/explorer/package.json
+++ b/apps/explorer/package.json
@@ -13,6 +13,6 @@
   },
   "scripts": {},
   "dependencies": {
-    "solc": "0.8.20"
+    "solc": "0.8.21"
   }
 }

From cd284b1e0937d60731c71549e88be6e4a4a7442e Mon Sep 17 00:00:00 2001
From: Viktor Baranov <baranov.viktor.27@gmail.com>
Date: Thu, 20 Jul 2023 12:14:14 +0300
Subject: [PATCH 224/909] Blockscout 5.2.1

---
 .../publish-docker-image-every-push.yml       |  2 +-
 .../publish-docker-image-for-core.yml         |  2 +-
 .../publish-docker-image-for-eth-goerli.yml   |  2 +-
 .../publish-docker-image-for-eth.yml          |  2 +-
 .../publish-docker-image-for-l2-staging.yml   |  2 +-
 .../publish-docker-image-for-lukso.yml        |  2 +-
 .../publish-docker-image-for-optimism.yml     |  2 +-
 .../publish-docker-image-for-rsk.yml          |  2 +-
 .../publish-docker-image-for-xdai.yml         |  2 +-
 .../publish-docker-image-release.yml          |  2 +-
 CHANGELOG.md                                  | 55 +++++++++++++++++++
 apps/block_scout_web/mix.exs                  |  2 +-
 apps/ethereum_jsonrpc/mix.exs                 |  2 +-
 apps/explorer/mix.exs                         |  2 +-
 apps/indexer/mix.exs                          |  2 +-
 .../docker-compose-no-rust-services.yml       |  2 +-
 docker-compose/docker-compose.yml             |  2 +-
 docker/Makefile                               |  2 +-
 mix.exs                                       |  2 +-
 rel/config.exs                                |  2 +-
 20 files changed, 74 insertions(+), 19 deletions(-)

diff --git a/.github/workflows/publish-docker-image-every-push.yml b/.github/workflows/publish-docker-image-every-push.yml
index b54cdf5266da..a2205707247d 100644
--- a/.github/workflows/publish-docker-image-every-push.yml
+++ b/.github/workflows/publish-docker-image-every-push.yml
@@ -7,7 +7,7 @@ on:
 env:
   OTP_VERSION: '25.2.1'
   ELIXIR_VERSION: '1.14.3'
-  RELEASE_VERSION: 5.2.0
+  RELEASE_VERSION: 5.2.1
 
 jobs:
   push_to_registry:
diff --git a/.github/workflows/publish-docker-image-for-core.yml b/.github/workflows/publish-docker-image-for-core.yml
index a6cc28f4dd14..d15ef3531a54 100644
--- a/.github/workflows/publish-docker-image-for-core.yml
+++ b/.github/workflows/publish-docker-image-for-core.yml
@@ -14,7 +14,7 @@ jobs:
     name: Push Docker image to Docker Hub
     runs-on: ubuntu-latest
     env:
-      RELEASE_VERSION: 5.2.0
+      RELEASE_VERSION: 5.2.1
       DOCKER_CHAIN_NAME: poa
     steps:
       - name: Check out the repo
diff --git a/.github/workflows/publish-docker-image-for-eth-goerli.yml b/.github/workflows/publish-docker-image-for-eth-goerli.yml
index cfbdc7897403..0f1dfbb47991 100644
--- a/.github/workflows/publish-docker-image-for-eth-goerli.yml
+++ b/.github/workflows/publish-docker-image-for-eth-goerli.yml
@@ -14,7 +14,7 @@ jobs:
     name: Push Docker image to Docker Hub
     runs-on: ubuntu-latest
     env:
-      RELEASE_VERSION: 5.2.0
+      RELEASE_VERSION: 5.2.1
       DOCKER_CHAIN_NAME: eth-goerli
     steps:
       - name: Check out the repo
diff --git a/.github/workflows/publish-docker-image-for-eth.yml b/.github/workflows/publish-docker-image-for-eth.yml
index 10f38f7c9f28..058b5f77d9a5 100644
--- a/.github/workflows/publish-docker-image-for-eth.yml
+++ b/.github/workflows/publish-docker-image-for-eth.yml
@@ -14,7 +14,7 @@ jobs:
     name: Push Docker image to Docker Hub
     runs-on: ubuntu-latest
     env:
-      RELEASE_VERSION: 5.2.0
+      RELEASE_VERSION: 5.2.1
       DOCKER_CHAIN_NAME: mainnet
     steps:
       - name: Check out the repo
diff --git a/.github/workflows/publish-docker-image-for-l2-staging.yml b/.github/workflows/publish-docker-image-for-l2-staging.yml
index 87cfa8c7f4ce..c903fe819c44 100644
--- a/.github/workflows/publish-docker-image-for-l2-staging.yml
+++ b/.github/workflows/publish-docker-image-for-l2-staging.yml
@@ -14,7 +14,7 @@ jobs:
     name: Push Docker image to Docker Hub
     runs-on: ubuntu-latest
     env:
-      RELEASE_VERSION: 5.2.0
+      RELEASE_VERSION: 5.2.1
       DOCKER_CHAIN_NAME: optimism-l2-advanced
     steps:
       - name: Check out the repo
diff --git a/.github/workflows/publish-docker-image-for-lukso.yml b/.github/workflows/publish-docker-image-for-lukso.yml
index 361865b97c75..544f0729d5cc 100644
--- a/.github/workflows/publish-docker-image-for-lukso.yml
+++ b/.github/workflows/publish-docker-image-for-lukso.yml
@@ -14,7 +14,7 @@ jobs:
     name: Push Docker image to Docker Hub
     runs-on: ubuntu-latest
     env:
-      RELEASE_VERSION: 5.2.0
+      RELEASE_VERSION: 5.2.1
       DOCKER_CHAIN_NAME: lukso
     steps:
       - name: Check out the repo
diff --git a/.github/workflows/publish-docker-image-for-optimism.yml b/.github/workflows/publish-docker-image-for-optimism.yml
index 4e82af2ee050..e1406ee5a24f 100644
--- a/.github/workflows/publish-docker-image-for-optimism.yml
+++ b/.github/workflows/publish-docker-image-for-optimism.yml
@@ -14,7 +14,7 @@ jobs:
     name: Push Docker image to Docker Hub
     runs-on: ubuntu-latest
     env:
-      RELEASE_VERSION: 5.2.0
+      RELEASE_VERSION: 5.2.1
       DOCKER_CHAIN_NAME: optimism
     steps:
       - name: Check out the repo
diff --git a/.github/workflows/publish-docker-image-for-rsk.yml b/.github/workflows/publish-docker-image-for-rsk.yml
index 49c787aa53f6..df49d64ccac0 100644
--- a/.github/workflows/publish-docker-image-for-rsk.yml
+++ b/.github/workflows/publish-docker-image-for-rsk.yml
@@ -14,7 +14,7 @@ jobs:
     name: Push Docker image to Docker Hub
     runs-on: ubuntu-latest
     env:
-      RELEASE_VERSION: 5.2.0
+      RELEASE_VERSION: 5.2.1
       DOCKER_CHAIN_NAME: rsk
     steps:
       - name: Check out the repo
diff --git a/.github/workflows/publish-docker-image-for-xdai.yml b/.github/workflows/publish-docker-image-for-xdai.yml
index 718be2aa288d..9f3ecd4a772e 100644
--- a/.github/workflows/publish-docker-image-for-xdai.yml
+++ b/.github/workflows/publish-docker-image-for-xdai.yml
@@ -17,7 +17,7 @@ jobs:
     name: Push Docker image to Docker Hub
     runs-on: ubuntu-latest
     env:
-      RELEASE_VERSION: 5.2.0
+      RELEASE_VERSION: 5.2.1
       DOCKER_CHAIN_NAME: xdai
     steps:
       - name: Check out the repo
diff --git a/.github/workflows/publish-docker-image-release.yml b/.github/workflows/publish-docker-image-release.yml
index 7d7fce760b53..689f3d7ec858 100644
--- a/.github/workflows/publish-docker-image-release.yml
+++ b/.github/workflows/publish-docker-image-release.yml
@@ -18,7 +18,7 @@ jobs:
     name: Push Docker image to Docker Hub
     runs-on: ubuntu-latest
     env:
-      RELEASE_VERSION: 5.2.0
+      RELEASE_VERSION: 5.2.1
     steps:
       - name: Check out the repo
         uses: actions/checkout@v3
diff --git a/CHANGELOG.md b/CHANGELOG.md
index df778ca4757f..3bc71aff6104 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,19 @@
 
 ### Features
 
+### Fixes
+
+### Chore
+
+<details>
+  <summary>Dependencies version bumps</summary>
+
+</details>
+
+## 5.2.1-beta
+
+### Features
+
 - [#7970](https://github.com/blockscout/blockscout/pull/7970) - Search improvements: add sorting
 - [#7771](https://github.com/blockscout/blockscout/pull/7771) - CSV export: speed up
 - [#7962](https://github.com/blockscout/blockscout/pull/7962) - Allow indicate CMC id of the coin through env var
@@ -52,6 +65,48 @@
 <details>
   <summary>Dependencies version bumps</summary>
 
+- [#7759](https://github.com/blockscout/blockscout/pull/7759) - Bump sass from 1.63.4 to 1.63.5 in /apps/block_scout_web/assets
+- [#7760](https://github.com/blockscout/blockscout/pull/7760) - Bump @amplitude/analytics-browser from 2.0.0 to 2.0.1 in /apps/block_scout_web/assets
+- [#7762](https://github.com/blockscout/blockscout/pull/7762) - Bump webpack from 5.87.0 to 5.88.0 in /apps/block_scout_web/assets
+- [#7769](https://github.com/blockscout/blockscout/pull/7769) - Bump sass from 1.63.5 to 1.63.6 in /apps/block_scout_web/assets
+- [#7805](https://github.com/blockscout/blockscout/pull/7805) - Bump ssl_verify_fun from 1.1.6 to 1.1.7
+- [#7812](https://github.com/blockscout/blockscout/pull/7812) - Bump webpack from 5.88.0 to 5.88.1 in /apps/block_scout_web/assets
+- [#7770](https://github.com/blockscout/blockscout/pull/7770) - Bump @amplitude/analytics-browser from 2.0.1 to 2.1.0 in /apps/block_scout_web/assets
+- [#7821](https://github.com/blockscout/blockscout/pull/7821) - Bump absinthe from 1.7.1 to 1.7.3
+- [#7823](https://github.com/blockscout/blockscout/pull/7823) - Bump @amplitude/analytics-browser from 2.1.0 to 2.1.1 in /apps/block_scout_web/assets
+- [#7838](https://github.com/blockscout/blockscout/pull/7838) - Bump gettext from 0.22.2 to 0.22.3
+- [#7840](https://github.com/blockscout/blockscout/pull/7840) - Bump eslint from 8.43.0 to 8.44.0 in /apps/block_scout_web/assets
+- [#7839](https://github.com/blockscout/blockscout/pull/7839) - Bump photoswipe from 5.3.7 to 5.3.8 in /apps/block_scout_web/assets
+- [#7850](https://github.com/blockscout/blockscout/pull/7850) - Bump jest-environment-jsdom from 29.5.0 to 29.6.0 in /apps/block_scout_web/assets
+- [#7848](https://github.com/blockscout/blockscout/pull/7848) - Bump @amplitude/analytics-browser from 2.1.1 to 2.1.2 in /apps/block_scout_web/assets
+- [#7847](https://github.com/blockscout/blockscout/pull/7847) - Bump @babel/core from 7.22.5 to 7.22.6 in /apps/block_scout_web/assets
+- [#7846](https://github.com/blockscout/blockscout/pull/7846) - Bump @babel/preset-env from 7.22.5 to 7.22.6 in /apps/block_scout_web/assets
+- [#7856](https://github.com/blockscout/blockscout/pull/7856) - Bump ex_cldr from 2.37.1 to 2.37.2
+- [#7870](https://github.com/blockscout/blockscout/pull/7870) - Bump jest from 29.5.0 to 29.6.1 in /apps/block_scout_web/assets
+- [#7867](https://github.com/blockscout/blockscout/pull/7867) - Bump postcss from 8.4.24 to 8.4.25 in /apps/block_scout_web/assets
+- [#7871](https://github.com/blockscout/blockscout/pull/7871) - Bump @babel/core from 7.22.6 to 7.22.8 in /apps/block_scout_web/assets
+- [#7868](https://github.com/blockscout/blockscout/pull/7868) - Bump jest-environment-jsdom from 29.6.0 to 29.6.1 in /apps/block_scout_web/assets
+- [#7866](https://github.com/blockscout/blockscout/pull/7866) - Bump @babel/preset-env from 7.22.6 to 7.22.7 in /apps/block_scout_web/assets 
+- [#7869](https://github.com/blockscout/blockscout/pull/7869) - Bump core-js from 3.31.0 to 3.31.1 in /apps/block_scout_web/assets
+- [#7884](https://github.com/blockscout/blockscout/pull/7884) - Bump ecto from 3.10.2 to 3.10.3
+- [#7882](https://github.com/blockscout/blockscout/pull/7882) - Bump jason from 1.4.0 to 1.4.1
+- [#7880](https://github.com/blockscout/blockscout/pull/7880) - Bump absinthe from 1.7.3 to 1.7.4
+- [#7879](https://github.com/blockscout/blockscout/pull/7879) - Bump babel-loader from 9.1.2 to 9.1.3 in /apps/block_scout_web/assets
+- [#7881](https://github.com/blockscout/blockscout/pull/7881) - Bump ex_cldr_numbers from 2.31.1 to 2.31.2
+- [#7883](https://github.com/blockscout/blockscout/pull/7883) - Bump ex_doc from 0.29.4 to 0.30.1
+- [#7916](https://github.com/blockscout/blockscout/pull/7916) - Bump semver from 5.7.1 to 5.7.2 in /apps/explorer
+- [#7912](https://github.com/blockscout/blockscout/pull/7912) - Bump sweetalert2 from 11.7.12 to 11.7.16 in /apps/block_scout_web/assets
+- [#7913](https://github.com/blockscout/blockscout/pull/7913) - Bump ex_doc from 0.30.1 to 0.30.2
+- [#7923](https://github.com/blockscout/blockscout/pull/7923) - Bump postgrex from 0.17.1 to 0.17.2
+- [#7921](https://github.com/blockscout/blockscout/pull/7921) - Bump @babel/preset-env from 7.22.7 to 7.22.9 in /apps/block_scout_web/assets
+- [#7922](https://github.com/blockscout/blockscout/pull/7922) - Bump @babel/core from 7.22.8 to 7.22.9 in /apps/block_scout_web/assets
+- [#7931](https://github.com/blockscout/blockscout/pull/7931) - Bump wallaby from 0.30.3 to 0.30.4
+- [#7940](https://github.com/blockscout/blockscout/pull/7940) - Bump postcss from 8.4.25 to 8.4.26 in /apps/block_scout_web/assets
+- [#7939](https://github.com/blockscout/blockscout/pull/7939) - Bump eslint from 8.44.0 to 8.45.0 in /apps/block_scout_web/assets
+- [#7955](https://github.com/blockscout/blockscout/pull/7955) - Bump sweetalert2 from 11.7.16 to 11.7.18 in /apps/block_scout_web/assets
+- [#7958](https://github.com/blockscout/blockscout/pull/7958) - Bump ex_doc from 0.30.2 to 0.30.3
+- [#7965](https://github.com/blockscout/blockscout/pull/7965) - Bump webpack from 5.88.1 to 5.88.2 in /apps/block_scout_web/assets
+- [#7972](https://github.com/blockscout/blockscout/pull/7972) - Bump word-wrap from 1.2.3 to 1.2.4 in /apps/block_scout_web/assets
 </details>
 
 ## 5.2.0-beta
diff --git a/apps/block_scout_web/mix.exs b/apps/block_scout_web/mix.exs
index a335ed5822e2..03a852bd85b2 100644
--- a/apps/block_scout_web/mix.exs
+++ b/apps/block_scout_web/mix.exs
@@ -23,7 +23,7 @@ defmodule BlockScoutWeb.Mixfile do
         dialyzer: :test
       ],
       start_permanent: Mix.env() == :prod,
-      version: "5.2.0"
+      version: "5.2.1"
     ]
   end
 
diff --git a/apps/ethereum_jsonrpc/mix.exs b/apps/ethereum_jsonrpc/mix.exs
index 4918340873de..752c6465f656 100644
--- a/apps/ethereum_jsonrpc/mix.exs
+++ b/apps/ethereum_jsonrpc/mix.exs
@@ -23,7 +23,7 @@ defmodule EthereumJsonrpc.MixProject do
         dialyzer: :test
       ],
       start_permanent: Mix.env() == :prod,
-      version: "5.2.0"
+      version: "5.2.1"
     ]
   end
 
diff --git a/apps/explorer/mix.exs b/apps/explorer/mix.exs
index 546b0393def1..fb2cb75bfa64 100644
--- a/apps/explorer/mix.exs
+++ b/apps/explorer/mix.exs
@@ -24,7 +24,7 @@ defmodule Explorer.Mixfile do
         dialyzer: :test
       ],
       start_permanent: Mix.env() == :prod,
-      version: "5.2.0",
+      version: "5.2.1",
       xref: [exclude: [BlockScoutWeb.WebRouter.Helpers]]
     ]
   end
diff --git a/apps/indexer/mix.exs b/apps/indexer/mix.exs
index fc805d5a9817..ae2737e988fe 100644
--- a/apps/indexer/mix.exs
+++ b/apps/indexer/mix.exs
@@ -14,7 +14,7 @@ defmodule Indexer.MixProject do
       elixirc_paths: elixirc_paths(Mix.env()),
       lockfile: "../../mix.lock",
       start_permanent: Mix.env() == :prod,
-      version: "5.2.0"
+      version: "5.2.1"
     ]
   end
 
diff --git a/docker-compose/docker-compose-no-rust-services.yml b/docker-compose/docker-compose-no-rust-services.yml
index ef1682dc2a92..57cb5d830fe3 100644
--- a/docker-compose/docker-compose-no-rust-services.yml
+++ b/docker-compose/docker-compose-no-rust-services.yml
@@ -27,7 +27,7 @@ services:
         CACHE_TOTAL_GAS_USAGE_COUNTER_ENABLED: ""
         CACHE_ADDRESS_WITH_BALANCES_UPDATE_INTERVAL: ""
         ADMIN_PANEL_ENABLED: ""
-        RELEASE_VERSION: 5.2.0
+        RELEASE_VERSION: 5.2.1
     restart: always
     stop_grace_period: 5m
     container_name: 'blockscout'
diff --git a/docker-compose/docker-compose.yml b/docker-compose/docker-compose.yml
index 3af6e1bd0915..4f1539f54028 100644
--- a/docker-compose/docker-compose.yml
+++ b/docker-compose/docker-compose.yml
@@ -28,7 +28,7 @@ services:
         CACHE_TOTAL_GAS_USAGE_COUNTER_ENABLED: ""
         CACHE_ADDRESS_WITH_BALANCES_UPDATE_INTERVAL: ""
         ADMIN_PANEL_ENABLED: ""
-        RELEASE_VERSION: 5.2.0
+        RELEASE_VERSION: 5.2.1
     restart: always
     stop_grace_period: 5m
     container_name: 'blockscout'
diff --git a/docker/Makefile b/docker/Makefile
index d985b5ca216d..b9f15c84c0b4 100644
--- a/docker/Makefile
+++ b/docker/Makefile
@@ -7,7 +7,7 @@ BS_CONTAINER_NAME := blockscout
 PG_CONTAINER_IMAGE := postgres:14
 PG_CONTAINER_NAME := db
 THIS_FILE = $(lastword $(MAKEFILE_LIST))
-RELEASE_VERSION ?= '5.2.0'
+RELEASE_VERSION ?= '5.2.1'
 PORT ?= '4000'
 TAG := $(RELEASE_VERSION)-commit-$(shell git log -1 --pretty=format:"%h")
 STABLE_TAG := $(RELEASE_VERSION)
diff --git a/mix.exs b/mix.exs
index 6df2936fd1ce..744ac916a089 100644
--- a/mix.exs
+++ b/mix.exs
@@ -7,7 +7,7 @@ defmodule BlockScout.Mixfile do
     [
       # app: :block_scout,
       # aliases: aliases(config_env()),
-      version: "5.2.0",
+      version: "5.2.1",
       apps_path: "apps",
       deps: deps(),
       dialyzer: dialyzer(),
diff --git a/rel/config.exs b/rel/config.exs
index fbaccc02ed5b..7d4f453589ca 100644
--- a/rel/config.exs
+++ b/rel/config.exs
@@ -71,7 +71,7 @@ end
 # will be used by default
 
 release :blockscout do
-  set version: "5.2.0-beta"
+  set version: "5.2.1-beta"
   set applications: [
     :runtime_tools,
     block_scout_web: :permanent,

From eb3464c5552d4eda74a463c00ffddca60a1b82ff Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 20 Jul 2023 18:21:25 +0000
Subject: [PATCH 225/909] Bump sass from 1.63.6 to 1.64.0 in
 /apps/block_scout_web/assets

Bumps [sass](https://github.com/sass/dart-sass) from 1.63.6 to 1.64.0.
- [Release notes](https://github.com/sass/dart-sass/releases)
- [Changelog](https://github.com/sass/dart-sass/blob/main/CHANGELOG.md)
- [Commits](https://github.com/sass/dart-sass/compare/1.63.6...1.64.0)

---
updated-dependencies:
- dependency-name: sass
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 apps/block_scout_web/assets/package-lock.json | 14 +++++++-------
 apps/block_scout_web/assets/package.json      |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/apps/block_scout_web/assets/package-lock.json b/apps/block_scout_web/assets/package-lock.json
index 875aebe53436..f208664dc253 100644
--- a/apps/block_scout_web/assets/package-lock.json
+++ b/apps/block_scout_web/assets/package-lock.json
@@ -89,7 +89,7 @@
         "mini-css-extract-plugin": "^2.7.6",
         "postcss": "^8.4.26",
         "postcss-loader": "^7.3.3",
-        "sass": "^1.63.6",
+        "sass": "^1.64.0",
         "sass-loader": "^13.3.2",
         "style-loader": "^3.3.3",
         "webpack": "^5.88.2",
@@ -14848,9 +14848,9 @@
       "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
     },
     "node_modules/sass": {
-      "version": "1.63.6",
-      "resolved": "https://registry.npmjs.org/sass/-/sass-1.63.6.tgz",
-      "integrity": "sha512-MJuxGMHzaOW7ipp+1KdELtqKbfAWbH7OLIdoSMnVe3EXPMTmxTmlaZDCTsgIpPCs3w99lLo9/zDKkOrJuT5byw==",
+      "version": "1.64.0",
+      "resolved": "https://registry.npmjs.org/sass/-/sass-1.64.0.tgz",
+      "integrity": "sha512-m7YtAGmQta9uANIUJwXesAJMSncqH+3INc8kdVXs6eV6GUC8Qu2IYKQSN8PRLgiQfpca697G94klm2leYMxSHw==",
       "dev": true,
       "dependencies": {
         "chokidar": ">=3.0.0 <4.0.0",
@@ -28542,9 +28542,9 @@
       "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
     },
     "sass": {
-      "version": "1.63.6",
-      "resolved": "https://registry.npmjs.org/sass/-/sass-1.63.6.tgz",
-      "integrity": "sha512-MJuxGMHzaOW7ipp+1KdELtqKbfAWbH7OLIdoSMnVe3EXPMTmxTmlaZDCTsgIpPCs3w99lLo9/zDKkOrJuT5byw==",
+      "version": "1.64.0",
+      "resolved": "https://registry.npmjs.org/sass/-/sass-1.64.0.tgz",
+      "integrity": "sha512-m7YtAGmQta9uANIUJwXesAJMSncqH+3INc8kdVXs6eV6GUC8Qu2IYKQSN8PRLgiQfpca697G94klm2leYMxSHw==",
       "dev": true,
       "requires": {
         "chokidar": ">=3.0.0 <4.0.0",
diff --git a/apps/block_scout_web/assets/package.json b/apps/block_scout_web/assets/package.json
index 29f9d2fa134c..462a5c7ef943 100644
--- a/apps/block_scout_web/assets/package.json
+++ b/apps/block_scout_web/assets/package.json
@@ -101,7 +101,7 @@
     "mini-css-extract-plugin": "^2.7.6",
     "postcss": "^8.4.26",
     "postcss-loader": "^7.3.3",
-    "sass": "^1.63.6",
+    "sass": "^1.64.0",
     "sass-loader": "^13.3.2",
     "style-loader": "^3.3.3",
     "webpack": "^5.88.2",

From b86f1408c6577160baf542a0acb1920330136c21 Mon Sep 17 00:00:00 2001
From: sl1depengwyn <max.pengwyn@gmail.com>
Date: Thu, 29 Sep 2022 17:43:51 +0300
Subject: [PATCH 226/909] Add fetch blocks by tag function

---
 apps/ethereum_jsonrpc/lib/ethereum_jsonrpc.ex |  10 +
 .../test/ethereum_jsonrpc_test.exs            | 202 ++++++++++++++++++
 2 files changed, 212 insertions(+)

diff --git a/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc.ex b/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc.ex
index 2a6ebeeb397d..6a1aada7c64c 100644
--- a/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc.ex
+++ b/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc.ex
@@ -275,6 +275,16 @@ defmodule EthereumJSONRPC do
     |> fetch_blocks_by_params(&Block.ByNumber.request/1, json_rpc_named_arguments)
   end
 
+  @doc """
+  Fetches block by "t:tag/0".
+  """
+  @spec fetch_blocks_by_tag(tag(), json_rpc_named_arguments) ::
+          {:ok, Blocks.t()} | {:error, reason :: :invalid_tag | :not_found | term()}
+  def fetch_blocks_by_tag(tag, json_rpc_named_arguments) when tag in ~w(earliest latest pending) do
+    [%{tag: tag}]
+    |> fetch_blocks_by_params(&Block.ByTag.request/1, json_rpc_named_arguments)
+  end
+
   @doc """
   Fetches uncle blocks by nephew hashes and indices.
   """
diff --git a/apps/ethereum_jsonrpc/test/ethereum_jsonrpc_test.exs b/apps/ethereum_jsonrpc/test/ethereum_jsonrpc_test.exs
index bc77cabd5c6a..629e40c4144b 100644
--- a/apps/ethereum_jsonrpc/test/ethereum_jsonrpc_test.exs
+++ b/apps/ethereum_jsonrpc/test/ethereum_jsonrpc_test.exs
@@ -543,6 +543,208 @@ defmodule EthereumJSONRPCTest do
     end
   end
 
+  describe "fetch_blocks_by_tag/2" do
+    @tag capture_log: false
+    test "with earliest", %{json_rpc_named_arguments: json_rpc_named_arguments} do
+      if json_rpc_named_arguments[:transport] == EthereumJSONRPC.Mox do
+        expect(EthereumJSONRPC.Mox, :json_rpc, fn [%{id: id}], _options ->
+          block_number = "0x0"
+          block_hash = "0x29c850324e357f3c0c836d79860c5af55f7b651e5d7ee253c1af1b14908af49c"
+          transaction_hash = "0xa2e81bb56b55ba3dab2daf76501b50dfaad240cccb905dbf89d65c7a84a4a48e"
+
+          {:ok,
+           [
+             %{
+               id: id,
+               result: %{
+                 "difficulty" => "0x0",
+                 "gasLimit" => "0x0",
+                 "gasUsed" => "0x0",
+                 "hash" => block_hash,
+                 "extraData" => "0x0",
+                 "logsBloom" => "0x0",
+                 "miner" => "0x0",
+                 "number" => block_number,
+                 "parentHash" => "0x0",
+                 "receiptsRoot" => "0x0",
+                 "size" => "0x0",
+                 "sha3Uncles" => "0x0",
+                 "stateRoot" => "0x0",
+                 "timestamp" => "0x0",
+                 "totalDifficulty" => "0x0",
+                 "transactions" => [
+                   %{
+                     "blockHash" => block_hash,
+                     "blockNumber" => block_number,
+                     "from" => "0x0",
+                     "gas" => "0x0",
+                     "gasPrice" => "0x0",
+                     "hash" => transaction_hash,
+                     "input" => "0x",
+                     "nonce" => "0x0",
+                     "r" => "0x0",
+                     "s" => "0x0",
+                     "to" => "0x0",
+                     "transactionIndex" => "0x0",
+                     "v" => "0x0",
+                     "value" => "0x0"
+                   }
+                 ],
+                 "transactionsRoot" => "0x0",
+                 "uncles" => []
+               }
+             }
+           ]}
+        end)
+      end
+
+      log_bad_gateway(
+        fn -> EthereumJSONRPC.fetch_blocks_by_tag("earliest", json_rpc_named_arguments) end,
+        fn result ->
+          assert {:ok, %Blocks{blocks_params: [_ | _], transactions_params: [_ | _]}} = result
+        end
+      )
+    end
+
+    @tag capture_log: false
+    test "with latest", %{json_rpc_named_arguments: json_rpc_named_arguments} do
+      if json_rpc_named_arguments[:transport] == EthereumJSONRPC.Mox do
+        expect(EthereumJSONRPC.Mox, :json_rpc, fn [%{id: id}], _options ->
+          block_number = "0x1"
+          block_hash = "0x29c850324e357f3c0c836d79860c5af55f7b651e5d7ee253c1af1b14908af49c"
+          transaction_hash = "0xa2e81bb56b55ba3dab2daf76501b50dfaad240cccb905dbf89d65c7a84a4a48e"
+
+          {:ok,
+           [
+             %{
+               id: id,
+               result: %{
+                 "difficulty" => "0x0",
+                 "gasLimit" => "0x0",
+                 "gasUsed" => "0x0",
+                 "hash" => block_hash,
+                 "extraData" => "0x0",
+                 "logsBloom" => "0x0",
+                 "miner" => "0x0",
+                 "number" => block_number,
+                 "parentHash" => "0x0",
+                 "receiptsRoot" => "0x0",
+                 "size" => "0x0",
+                 "sha3Uncles" => "0x0",
+                 "stateRoot" => "0x0",
+                 "timestamp" => "0x0",
+                 "totalDifficulty" => "0x0",
+                 "transactions" => [
+                   %{
+                     "blockHash" => block_hash,
+                     "blockNumber" => block_number,
+                     "from" => "0x0",
+                     "gas" => "0x0",
+                     "gasPrice" => "0x0",
+                     "hash" => transaction_hash,
+                     "input" => "0x",
+                     "nonce" => "0x0",
+                     "r" => "0x0",
+                     "s" => "0x0",
+                     "to" => "0x0",
+                     "transactionIndex" => "0x0",
+                     "v" => "0x0",
+                     "value" => "0x0"
+                   }
+                 ],
+                 "transactionsRoot" => "0x0",
+                 "uncles" => []
+               }
+             }
+           ]}
+        end)
+      end
+
+      log_bad_gateway(
+        fn -> EthereumJSONRPC.fetch_blocks_by_tag("latest", json_rpc_named_arguments) end,
+        fn result ->
+          {:ok, %Blocks{blocks_params: [_ | _], transactions_params: [_ | _]}} = result
+        end
+      )
+    end
+
+    @tag capture_log: false
+    test "with pending", %{json_rpc_named_arguments: json_rpc_named_arguments} do
+      if json_rpc_named_arguments[:transport] == EthereumJSONRPC.Mox do
+        expect(EthereumJSONRPC.Mox, :json_rpc, fn [%{id: id}], _options ->
+          block_number = "0x1"
+          block_hash = "0x29c850324e357f3c0c836d79860c5af55f7b651e5d7ee253c1af1b14908af49c"
+          transaction_hash = "0xa2e81bb56b55ba3dab2daf76501b50dfaad240cccb905dbf89d65c7a84a4a48e"
+
+          {:ok,
+           [
+             %{
+               id: id,
+               result: %{
+                 "difficulty" => "0x0",
+                 "gasLimit" => "0x0",
+                 "gasUsed" => "0x0",
+                 "hash" => block_hash,
+                 "extraData" => "0x0",
+                 "logsBloom" => "0x0",
+                 "miner" => "0x0",
+                 "number" => block_number,
+                 "parentHash" => "0x0",
+                 "receiptsRoot" => "0x0",
+                 "size" => "0x0",
+                 "sha3Uncles" => "0x0",
+                 "stateRoot" => "0x0",
+                 "timestamp" => "0x0",
+                 "totalDifficulty" => "0x0",
+                 "transactions" => [
+                   %{
+                     "blockHash" => block_hash,
+                     "blockNumber" => block_number,
+                     "from" => "0x0",
+                     "gas" => "0x0",
+                     "gasPrice" => "0x0",
+                     "hash" => transaction_hash,
+                     "input" => "0x",
+                     "nonce" => "0x0",
+                     "r" => "0x0",
+                     "s" => "0x0",
+                     "to" => "0x0",
+                     "transactionIndex" => "0x0",
+                     "v" => "0x0",
+                     "value" => "0x0"
+                   }
+                 ],
+                 "transactionsRoot" => "0x0",
+                 "uncles" => []
+               }
+             }
+           ]}
+        end)
+      end
+
+      log_bad_gateway(
+        fn -> EthereumJSONRPC.fetch_blocks_by_tag("pending", json_rpc_named_arguments) end,
+        fn result ->
+          {:ok, %Blocks{blocks_params: [_ | _], transactions_params: [_ | _]}} = result
+        end
+      )
+    end
+
+    test "unknown errors are returned", %{json_rpc_named_arguments: json_rpc_named_arguments} do
+      # Can't be faked reliably on real chain
+      moxed_json_rpc_named_arguments = Keyword.put(json_rpc_named_arguments, :transport, EthereumJSONRPC.Mox)
+
+      unknown_error = %{"code" => 500, "message" => "Unknown error"}
+
+      expect(EthereumJSONRPC.Mox, :json_rpc, fn _json, _options ->
+        {:error, unknown_error}
+      end)
+
+      assert {:error, ^unknown_error} =
+               EthereumJSONRPC.fetch_block_number_by_tag("latest", moxed_json_rpc_named_arguments)
+    end
+  end
+
   describe "fetch_block_number_by_tag" do
     @tag capture_log: false
     test "with earliest", %{json_rpc_named_arguments: json_rpc_named_arguments} do

From fe8dd0595112e502a7deb79d7288925325049d37 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 24 Jul 2023 18:05:41 +0000
Subject: [PATCH 227/909] Bump dataloader from 1.0.10 to 1.0.11

Bumps [dataloader](https://github.com/absinthe-graphql/dataloader) from 1.0.10 to 1.0.11.
- [Changelog](https://github.com/absinthe-graphql/dataloader/blob/v1.0.11/CHANGELOG.md)
- [Commits](https://github.com/absinthe-graphql/dataloader/commits/v1.0.11)

---
updated-dependencies:
- dependency-name: dataloader
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 mix.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mix.lock b/mix.lock
index b39858e4ad43..dc4ccd1dc466 100644
--- a/mix.lock
+++ b/mix.lock
@@ -29,7 +29,7 @@
   "cowlib": {:hex, :cowlib, "2.12.1", "a9fa9a625f1d2025fe6b462cb865881329b5caff8f1854d1cbc9f9533f00e1e1", [:make, :rebar3], [], "hexpm", "163b73f6367a7341b33c794c4e88e7dbfe6498ac42dcd69ef44c5bc5507c8db0"},
   "credo": {:hex, :credo, "1.7.0", "6119bee47272e85995598ee04f2ebbed3e947678dee048d10b5feca139435f75", [:mix], [{:bunt, "~> 0.2.1", [hex: :bunt, repo: "hexpm", optional: false]}, {:file_system, "~> 0.2.8", [hex: :file_system, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: false]}], "hexpm", "6839fcf63d1f0d1c0f450abc8564a57c43d644077ab96f2934563e68b8a769d7"},
   "csv": {:hex, :csv, "2.5.0", "c47b5a5221bf2e56d6e8eb79e77884046d7fd516280dc7d9b674251e0ae46246", [:mix], [{:parallel_stream, "~> 1.0.4 or ~> 1.1.0", [hex: :parallel_stream, repo: "hexpm", optional: false]}], "hexpm", "e821f541487045c7591a1963eeb42afff0dfa99bdcdbeb3410795a2f59c77d34"},
-  "dataloader": {:hex, :dataloader, "1.0.10", "a42f07641b1a0572e0b21a2a5ae1be11da486a6790f3d0d14512d96ff3e3bbe9", [:mix], [{:ecto, ">= 3.4.3 and < 4.0.0", [hex: :ecto, repo: "hexpm", optional: true]}, {:telemetry, "~> 1.0 or ~> 0.4", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "54cd70cec09addf4b2ace14cc186a283a149fd4d3ec5475b155951bf33cd963f"},
+  "dataloader": {:hex, :dataloader, "1.0.11", "49bbfc7dd8a1990423c51000b869b1fecaab9e3ccd6b29eab51616ae8ad0a2f5", [:mix], [{:ecto, ">= 3.4.3 and < 4.0.0", [hex: :ecto, repo: "hexpm", optional: true]}, {:telemetry, "~> 1.0 or ~> 0.4", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "ba0b0ec532ec68e9d033d03553561d693129bd7cbd5c649dc7903f07ffba08fe"},
   "db_connection": {:hex, :db_connection, "2.5.0", "bb6d4f30d35ded97b29fe80d8bd6f928a1912ca1ff110831edcd238a1973652c", [:mix], [{:telemetry, "~> 0.4 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "c92d5ba26cd69ead1ff7582dbb860adeedfff39774105a4f1c92cbb654b55aa2"},
   "decimal": {:hex, :decimal, "2.1.1", "5611dca5d4b2c3dd497dec8f68751f1f1a54755e8ed2a966c2633cf885973ad6", [:mix], [], "hexpm", "53cfe5f497ed0e7771ae1a475575603d77425099ba5faef9394932b35020ffcc"},
   "decorator": {:hex, :decorator, "1.4.0", "a57ac32c823ea7e4e67f5af56412d12b33274661bb7640ec7fc882f8d23ac419", [:mix], [], "hexpm", "0a07cedd9083da875c7418dea95b78361197cf2bf3211d743f6f7ce39656597f"},

From 8d4754cb51b8d1c45f34356ba98d44d9c2aea137 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 24 Jul 2023 18:32:48 +0000
Subject: [PATCH 228/909] Bump sass from 1.64.0 to 1.64.1 in
 /apps/block_scout_web/assets

Bumps [sass](https://github.com/sass/dart-sass) from 1.64.0 to 1.64.1.
- [Release notes](https://github.com/sass/dart-sass/releases)
- [Changelog](https://github.com/sass/dart-sass/blob/main/CHANGELOG.md)
- [Commits](https://github.com/sass/dart-sass/compare/1.64.0...1.64.1)

---
updated-dependencies:
- dependency-name: sass
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 apps/block_scout_web/assets/package-lock.json | 14 +++++++-------
 apps/block_scout_web/assets/package.json      |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/apps/block_scout_web/assets/package-lock.json b/apps/block_scout_web/assets/package-lock.json
index f208664dc253..1d58fd04157b 100644
--- a/apps/block_scout_web/assets/package-lock.json
+++ b/apps/block_scout_web/assets/package-lock.json
@@ -89,7 +89,7 @@
         "mini-css-extract-plugin": "^2.7.6",
         "postcss": "^8.4.26",
         "postcss-loader": "^7.3.3",
-        "sass": "^1.64.0",
+        "sass": "^1.64.1",
         "sass-loader": "^13.3.2",
         "style-loader": "^3.3.3",
         "webpack": "^5.88.2",
@@ -14848,9 +14848,9 @@
       "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
     },
     "node_modules/sass": {
-      "version": "1.64.0",
-      "resolved": "https://registry.npmjs.org/sass/-/sass-1.64.0.tgz",
-      "integrity": "sha512-m7YtAGmQta9uANIUJwXesAJMSncqH+3INc8kdVXs6eV6GUC8Qu2IYKQSN8PRLgiQfpca697G94klm2leYMxSHw==",
+      "version": "1.64.1",
+      "resolved": "https://registry.npmjs.org/sass/-/sass-1.64.1.tgz",
+      "integrity": "sha512-16rRACSOFEE8VN7SCgBu1MpYCyN7urj9At898tyzdXFhC+a+yOX5dXwAR7L8/IdPJ1NB8OYoXmD55DM30B2kEQ==",
       "dev": true,
       "dependencies": {
         "chokidar": ">=3.0.0 <4.0.0",
@@ -28542,9 +28542,9 @@
       "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
     },
     "sass": {
-      "version": "1.64.0",
-      "resolved": "https://registry.npmjs.org/sass/-/sass-1.64.0.tgz",
-      "integrity": "sha512-m7YtAGmQta9uANIUJwXesAJMSncqH+3INc8kdVXs6eV6GUC8Qu2IYKQSN8PRLgiQfpca697G94klm2leYMxSHw==",
+      "version": "1.64.1",
+      "resolved": "https://registry.npmjs.org/sass/-/sass-1.64.1.tgz",
+      "integrity": "sha512-16rRACSOFEE8VN7SCgBu1MpYCyN7urj9At898tyzdXFhC+a+yOX5dXwAR7L8/IdPJ1NB8OYoXmD55DM30B2kEQ==",
       "dev": true,
       "requires": {
         "chokidar": ">=3.0.0 <4.0.0",
diff --git a/apps/block_scout_web/assets/package.json b/apps/block_scout_web/assets/package.json
index 462a5c7ef943..1fd89e86af19 100644
--- a/apps/block_scout_web/assets/package.json
+++ b/apps/block_scout_web/assets/package.json
@@ -101,7 +101,7 @@
     "mini-css-extract-plugin": "^2.7.6",
     "postcss": "^8.4.26",
     "postcss-loader": "^7.3.3",
-    "sass": "^1.64.0",
+    "sass": "^1.64.1",
     "sass-loader": "^13.3.2",
     "style-loader": "^3.3.3",
     "webpack": "^5.88.2",

From ae216c7e62d4e641b02759bb4637cc37975ea4a6 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 24 Jul 2023 18:33:27 +0000
Subject: [PATCH 229/909] Bump viewerjs from 1.11.3 to 1.11.4 in
 /apps/block_scout_web/assets

Bumps [viewerjs](https://github.com/fengyuanchen/viewerjs) from 1.11.3 to 1.11.4.
- [Release notes](https://github.com/fengyuanchen/viewerjs/releases)
- [Changelog](https://github.com/fengyuanchen/viewerjs/blob/main/CHANGELOG.md)
- [Commits](https://github.com/fengyuanchen/viewerjs/compare/v1.11.3...v1.11.4)

---
updated-dependencies:
- dependency-name: viewerjs
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 apps/block_scout_web/assets/package-lock.json | 14 +++++++-------
 apps/block_scout_web/assets/package.json      |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/apps/block_scout_web/assets/package-lock.json b/apps/block_scout_web/assets/package-lock.json
index f208664dc253..cdd3f02902bd 100644
--- a/apps/block_scout_web/assets/package-lock.json
+++ b/apps/block_scout_web/assets/package-lock.json
@@ -65,7 +65,7 @@
         "urijs": "^1.19.11",
         "url": "^0.11.1",
         "util": "^0.12.5",
-        "viewerjs": "^1.11.3",
+        "viewerjs": "^1.11.4",
         "web3": "^1.10.0",
         "web3modal": "^1.9.12",
         "xss": "^1.0.14"
@@ -16339,9 +16339,9 @@
       }
     },
     "node_modules/viewerjs": {
-      "version": "1.11.3",
-      "resolved": "https://registry.npmjs.org/viewerjs/-/viewerjs-1.11.3.tgz",
-      "integrity": "sha512-efG3U61Umuj/1x6JAtdvnY9m407C/RkrkFilsMcLEWKDivpjNU3/FeL+feCY1Vkur9aQeBJ+z6K4CCPP7hv6vA=="
+      "version": "1.11.4",
+      "resolved": "https://registry.npmjs.org/viewerjs/-/viewerjs-1.11.4.tgz",
+      "integrity": "sha512-/mnqMIwt5Bi9j59+48OqQtqgOx8oh186Xshdr/dqqBrakMSMlLt/jmeNHBod0PvOkesZf66ivQbWmtWYBlKetg=="
     },
     "node_modules/w3c-hr-time": {
       "version": "1.0.2",
@@ -29631,9 +29631,9 @@
       }
     },
     "viewerjs": {
-      "version": "1.11.3",
-      "resolved": "https://registry.npmjs.org/viewerjs/-/viewerjs-1.11.3.tgz",
-      "integrity": "sha512-efG3U61Umuj/1x6JAtdvnY9m407C/RkrkFilsMcLEWKDivpjNU3/FeL+feCY1Vkur9aQeBJ+z6K4CCPP7hv6vA=="
+      "version": "1.11.4",
+      "resolved": "https://registry.npmjs.org/viewerjs/-/viewerjs-1.11.4.tgz",
+      "integrity": "sha512-/mnqMIwt5Bi9j59+48OqQtqgOx8oh186Xshdr/dqqBrakMSMlLt/jmeNHBod0PvOkesZf66ivQbWmtWYBlKetg=="
     },
     "w3c-hr-time": {
       "version": "1.0.2",
diff --git a/apps/block_scout_web/assets/package.json b/apps/block_scout_web/assets/package.json
index 462a5c7ef943..4220113b739c 100644
--- a/apps/block_scout_web/assets/package.json
+++ b/apps/block_scout_web/assets/package.json
@@ -77,7 +77,7 @@
     "urijs": "^1.19.11",
     "url": "^0.11.1",
     "util": "^0.12.5",
-    "viewerjs": "^1.11.3",
+    "viewerjs": "^1.11.4",
     "web3": "^1.10.0",
     "web3modal": "^1.9.12",
     "xss": "^1.0.14"

From 4b56e73d000074e3bb8f3ce593ad1aead66a8da5 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 24 Jul 2023 18:34:28 +0000
Subject: [PATCH 230/909] Bump sweetalert2 from 11.7.18 to 11.7.20 in
 /apps/block_scout_web/assets

Bumps [sweetalert2](https://github.com/sweetalert2/sweetalert2) from 11.7.18 to 11.7.20.
- [Release notes](https://github.com/sweetalert2/sweetalert2/releases)
- [Changelog](https://github.com/sweetalert2/sweetalert2/blob/main/CHANGELOG.md)
- [Commits](https://github.com/sweetalert2/sweetalert2/compare/v11.7.18...v11.7.20)

---
updated-dependencies:
- dependency-name: sweetalert2
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 apps/block_scout_web/assets/package-lock.json | 14 +++++++-------
 apps/block_scout_web/assets/package.json      |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/apps/block_scout_web/assets/package-lock.json b/apps/block_scout_web/assets/package-lock.json
index f208664dc253..196a7441388c 100644
--- a/apps/block_scout_web/assets/package-lock.json
+++ b/apps/block_scout_web/assets/package-lock.json
@@ -61,7 +61,7 @@
         "redux": "^4.2.1",
         "stream-browserify": "^3.0.0",
         "stream-http": "^3.1.1",
-        "sweetalert2": "^11.7.18",
+        "sweetalert2": "^11.7.20",
         "urijs": "^1.19.11",
         "url": "^0.11.1",
         "util": "^0.12.5",
@@ -15702,9 +15702,9 @@
       }
     },
     "node_modules/sweetalert2": {
-      "version": "11.7.18",
-      "resolved": "https://registry.npmjs.org/sweetalert2/-/sweetalert2-11.7.18.tgz",
-      "integrity": "sha512-Njl5JTDasSP8yRX9cpLdy2fdxHZYPYNmiIGNZykF2Zt1UHIvurwt/W2LmlGe5RbyMDHYDXuHqlD1Q8Vr5/mqlA==",
+      "version": "11.7.20",
+      "resolved": "https://registry.npmjs.org/sweetalert2/-/sweetalert2-11.7.20.tgz",
+      "integrity": "sha512-GdU1TkiLpGGC0mcPV8bKmS7G0MR7caxambPkEU8zyepRSNR9EaEvIjNhX5QNkL0VFVzHbI3l12NtuEklkJ0D4Q==",
       "funding": {
         "type": "individual",
         "url": "https://github.com/sponsors/limonte"
@@ -29161,9 +29161,9 @@
       }
     },
     "sweetalert2": {
-      "version": "11.7.18",
-      "resolved": "https://registry.npmjs.org/sweetalert2/-/sweetalert2-11.7.18.tgz",
-      "integrity": "sha512-Njl5JTDasSP8yRX9cpLdy2fdxHZYPYNmiIGNZykF2Zt1UHIvurwt/W2LmlGe5RbyMDHYDXuHqlD1Q8Vr5/mqlA=="
+      "version": "11.7.20",
+      "resolved": "https://registry.npmjs.org/sweetalert2/-/sweetalert2-11.7.20.tgz",
+      "integrity": "sha512-GdU1TkiLpGGC0mcPV8bKmS7G0MR7caxambPkEU8zyepRSNR9EaEvIjNhX5QNkL0VFVzHbI3l12NtuEklkJ0D4Q=="
     },
     "symbol-tree": {
       "version": "3.2.4",
diff --git a/apps/block_scout_web/assets/package.json b/apps/block_scout_web/assets/package.json
index 462a5c7ef943..0b8eb9780d33 100644
--- a/apps/block_scout_web/assets/package.json
+++ b/apps/block_scout_web/assets/package.json
@@ -73,7 +73,7 @@
     "redux": "^4.2.1",
     "stream-browserify": "^3.0.0",
     "stream-http": "^3.1.1",
-    "sweetalert2": "^11.7.18",
+    "sweetalert2": "^11.7.20",
     "urijs": "^1.19.11",
     "url": "^0.11.1",
     "util": "^0.12.5",

From e93b1a55a53650be2cf6e83586d471fdf75e484f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 25 Jul 2023 12:09:36 +0000
Subject: [PATCH 231/909] Bump postcss from 8.4.26 to 8.4.27 in
 /apps/block_scout_web/assets

Bumps [postcss](https://github.com/postcss/postcss) from 8.4.26 to 8.4.27.
- [Release notes](https://github.com/postcss/postcss/releases)
- [Changelog](https://github.com/postcss/postcss/blob/main/CHANGELOG.md)
- [Commits](https://github.com/postcss/postcss/compare/8.4.26...8.4.27)

---
updated-dependencies:
- dependency-name: postcss
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 apps/block_scout_web/assets/package-lock.json | 14 +++++++-------
 apps/block_scout_web/assets/package.json      |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/apps/block_scout_web/assets/package-lock.json b/apps/block_scout_web/assets/package-lock.json
index 5a8e6d41eb0b..8b37232c1434 100644
--- a/apps/block_scout_web/assets/package-lock.json
+++ b/apps/block_scout_web/assets/package-lock.json
@@ -87,7 +87,7 @@
         "jest": "^29.6.1",
         "jest-environment-jsdom": "^29.6.1",
         "mini-css-extract-plugin": "^2.7.6",
-        "postcss": "^8.4.26",
+        "postcss": "^8.4.27",
         "postcss-loader": "^7.3.3",
         "sass": "^1.64.1",
         "sass-loader": "^13.3.2",
@@ -13419,9 +13419,9 @@
       }
     },
     "node_modules/postcss": {
-      "version": "8.4.26",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.26.tgz",
-      "integrity": "sha512-jrXHFF8iTloAenySjM/ob3gSj7pCu0Ji49hnjqzsgSRa50hkWCKD0HQ+gMNJkW38jBI68MpAAg7ZWwHwX8NMMw==",
+      "version": "8.4.27",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.27.tgz",
+      "integrity": "sha512-gY/ACJtJPSmUFPDCHtX78+01fHa64FaU4zaaWfuh1MhGJISufJAH4cun6k/8fwsHYeK4UQmENQK+tRLCFJE8JQ==",
       "dev": true,
       "funding": [
         {
@@ -27533,9 +27533,9 @@
       "integrity": "sha512-Wb4p1J4zyFTbM+u6WuO4XstYx4Ky9Cewe4DWrel7B0w6VVICvPwdOpotjzcf6eD8TsckVnIMNONQyPIUFOUbCQ=="
     },
     "postcss": {
-      "version": "8.4.26",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.26.tgz",
-      "integrity": "sha512-jrXHFF8iTloAenySjM/ob3gSj7pCu0Ji49hnjqzsgSRa50hkWCKD0HQ+gMNJkW38jBI68MpAAg7ZWwHwX8NMMw==",
+      "version": "8.4.27",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.27.tgz",
+      "integrity": "sha512-gY/ACJtJPSmUFPDCHtX78+01fHa64FaU4zaaWfuh1MhGJISufJAH4cun6k/8fwsHYeK4UQmENQK+tRLCFJE8JQ==",
       "dev": true,
       "requires": {
         "nanoid": "^3.3.6",
diff --git a/apps/block_scout_web/assets/package.json b/apps/block_scout_web/assets/package.json
index ca6aaad54bd7..c72f12d67e24 100644
--- a/apps/block_scout_web/assets/package.json
+++ b/apps/block_scout_web/assets/package.json
@@ -99,7 +99,7 @@
     "jest": "^29.6.1",
     "jest-environment-jsdom": "^29.6.1",
     "mini-css-extract-plugin": "^2.7.6",
-    "postcss": "^8.4.26",
+    "postcss": "^8.4.27",
     "postcss-loader": "^7.3.3",
     "sass": "^1.64.1",
     "sass-loader": "^13.3.2",

From 58d47d5d00a16081d3c530de5c8507f78bca855d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 25 Jul 2023 12:15:07 +0000
Subject: [PATCH 232/909] Bump wallaby from 0.30.4 to 0.30.5

Bumps [wallaby](https://github.com/elixir-wallaby/wallaby) from 0.30.4 to 0.30.5.
- [Release notes](https://github.com/elixir-wallaby/wallaby/releases)
- [Changelog](https://github.com/elixir-wallaby/wallaby/blob/main/CHANGELOG.md)
- [Commits](https://github.com/elixir-wallaby/wallaby/compare/v0.30.4...v0.30.5)

---
updated-dependencies:
- dependency-name: wallaby
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 mix.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mix.lock b/mix.lock
index dc4ccd1dc466..4d66f8fbb6ae 100644
--- a/mix.lock
+++ b/mix.lock
@@ -138,7 +138,7 @@
   "ueberauth": {:hex, :ueberauth, "0.10.5", "806adb703df87e55b5615cf365e809f84c20c68aa8c08ff8a416a5a6644c4b02", [:mix], [{:plug, "~> 1.5", [hex: :plug, repo: "hexpm", optional: false]}], "hexpm", "3efd1f31d490a125c7ed453b926f7c31d78b97b8a854c755f5c40064bf3ac9e1"},
   "ueberauth_auth0": {:hex, :ueberauth_auth0, "2.1.0", "0632d5844049fa2f26823f15e1120aa32f27df6f27ce515a4b04641736594bf4", [:mix], [{:oauth2, "~> 2.0", [hex: :oauth2, repo: "hexpm", optional: false]}, {:ueberauth, "~> 0.7", [hex: :ueberauth, repo: "hexpm", optional: false]}], "hexpm", "8d3b30fa27c95c9e82c30c4afb016251405706d2e9627e603c3c9787fd1314fc"},
   "unicode_util_compat": {:hex, :unicode_util_compat, "0.7.0", "bc84380c9ab48177092f43ac89e4dfa2c6d62b40b8bd132b1059ecc7232f9a78", [:rebar3], [], "hexpm", "25eee6d67df61960cf6a794239566599b09e17e668d3700247bc498638152521"},
-  "wallaby": {:hex, :wallaby, "0.30.4", "a79a9b7efde568b7f701637ae211ecbc41119a53b1bec84de027d8400aeec229", [:mix], [{:ecto_sql, ">= 3.0.0", [hex: :ecto_sql, repo: "hexpm", optional: true]}, {:httpoison, "~> 0.12 or ~> 1.0 or ~> 2.0", [hex: :httpoison, repo: "hexpm", optional: false]}, {:jason, "~> 1.1", [hex: :jason, repo: "hexpm", optional: false]}, {:phoenix_ecto, ">= 3.0.0", [hex: :phoenix_ecto, repo: "hexpm", optional: true]}, {:web_driver_client, "~> 0.2.0", [hex: :web_driver_client, repo: "hexpm", optional: false]}], "hexpm", "330fa16a8fd2e6cefd60c74acbdb90a1b0e539a29cdea9152ca9aec55df7fc0e"},
+  "wallaby": {:hex, :wallaby, "0.30.5", "c6a8dbb6f3195dbfe080b50ba707973983e32446f6f9fac514a43918682696bb", [:mix], [{:ecto_sql, ">= 3.0.0", [hex: :ecto_sql, repo: "hexpm", optional: true]}, {:httpoison, "~> 0.12 or ~> 1.0 or ~> 2.0", [hex: :httpoison, repo: "hexpm", optional: false]}, {:jason, "~> 1.1", [hex: :jason, repo: "hexpm", optional: false]}, {:phoenix_ecto, ">= 3.0.0", [hex: :phoenix_ecto, repo: "hexpm", optional: true]}, {:web_driver_client, "~> 0.2.0", [hex: :web_driver_client, repo: "hexpm", optional: false]}], "hexpm", "d759711983c90aaa5338b8b9dcff0c9eb0609ac0a45071f4ef9cbb298bb54077"},
   "web_driver_client": {:hex, :web_driver_client, "0.2.0", "63b76cd9eb3b0716ec5467a0f8bead73d3d9612e63f7560d21357f03ad86e31a", [:mix], [{:hackney, "~> 1.6", [hex: :hackney, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: false]}, {:tesla, "~> 1.3", [hex: :tesla, repo: "hexpm", optional: false]}], "hexpm", "83cc6092bc3e74926d1c8455f0ce927d5d1d36707b74d9a65e38c084aab0350f"},
   "websocket_client": {:git, "https://github.com/blockscout/websocket_client.git", "0b4ecc5b1fb8a0bd1c8352728da787c20add53aa", [branch: "master"]},
 }

From a13216696e003ee58cf7aa38cf899ab37b5bb18b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 25 Jul 2023 12:16:17 +0000
Subject: [PATCH 233/909] Bump absinthe from 1.7.4 to 1.7.5

Bumps [absinthe](https://github.com/absinthe-graphql/absinthe) from 1.7.4 to 1.7.5.
- [Release notes](https://github.com/absinthe-graphql/absinthe/releases)
- [Changelog](https://github.com/absinthe-graphql/absinthe/blob/master/CHANGELOG.md)
- [Commits](https://github.com/absinthe-graphql/absinthe/compare/v1.7.4...v1.7.5)

---
updated-dependencies:
- dependency-name: absinthe
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 mix.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mix.lock b/mix.lock
index dc4ccd1dc466..6b6fdcfa8f34 100644
--- a/mix.lock
+++ b/mix.lock
@@ -1,5 +1,5 @@
 %{
-  "absinthe": {:hex, :absinthe, "1.7.4", "97e37622fad63997afff96ee5aaaad42ea9150f5d5aa5783a05c61374734cc90", [:mix], [{:dataloader, "~> 1.0.0", [hex: :dataloader, repo: "hexpm", optional: true]}, {:decimal, "~> 1.0 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: true]}, {:nimble_parsec, "~> 1.2.2 or ~> 1.3.0", [hex: :nimble_parsec, repo: "hexpm", optional: false]}, {:opentelemetry_process_propagator, "~> 0.2.1", [hex: :opentelemetry_process_propagator, repo: "hexpm", optional: true]}, {:telemetry, "~> 1.0 or ~> 0.4", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "4d5cf4cd0c44e9d7b11d56bf112721e48cce1a7d04dd461c616a99eedbf1c69b"},
+  "absinthe": {:hex, :absinthe, "1.7.5", "a15054f05738e766f7cc7fd352887dfd5e61cec371fb4741cca37c3359ff74ac", [:mix], [{:dataloader, "~> 1.0.0 or ~> 2.0", [hex: :dataloader, repo: "hexpm", optional: true]}, {:decimal, "~> 1.0 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: true]}, {:nimble_parsec, "~> 1.2.2 or ~> 1.3.0", [hex: :nimble_parsec, repo: "hexpm", optional: false]}, {:opentelemetry_process_propagator, "~> 0.2.1", [hex: :opentelemetry_process_propagator, repo: "hexpm", optional: true]}, {:telemetry, "~> 1.0 or ~> 0.4", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "22a9a38adca26294ad0ee91226168f5d215b401efd770b8a1b8fd9c9b21ec316"},
   "absinthe_phoenix": {:hex, :absinthe_phoenix, "2.0.2", "e607b438db900049b9b3760f8ecd0591017a46122fffed7057bf6989020992b5", [:mix], [{:absinthe, "~> 1.5", [hex: :absinthe, repo: "hexpm", optional: false]}, {:absinthe_plug, "~> 1.5", [hex: :absinthe_plug, repo: "hexpm", optional: false]}, {:decimal, "~> 1.0 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: false]}, {:phoenix, "~> 1.5", [hex: :phoenix, repo: "hexpm", optional: false]}, {:phoenix_html, "~> 2.13 or ~> 3.0", [hex: :phoenix_html, repo: "hexpm", optional: true]}, {:phoenix_pubsub, "~> 2.0", [hex: :phoenix_pubsub, repo: "hexpm", optional: false]}], "hexpm", "d36918925c380dc7d2ed7d039c9a3b4182ec36723f7417a68745ade5aab22f8d"},
   "absinthe_plug": {:git, "https://github.com/blockscout/absinthe_plug.git", "c435d43f316769e1beee1dbe500b623124c96785", [tag: "1.5.3"]},
   "absinthe_relay": {:hex, :absinthe_relay, "1.5.2", "cfb8aed70f4e4c7718d3f1c212332d2ea728f17c7fc0f68f1e461f0f5f0c4b9a", [:mix], [{:absinthe, "~> 1.5.0 or ~> 1.6.0 or ~> 1.7.0", [hex: :absinthe, repo: "hexpm", optional: false]}, {:ecto, "~> 2.0 or ~> 3.0", [hex: :ecto, repo: "hexpm", optional: true]}], "hexpm", "0587ee913afa31512e1457a5064ee88427f8fe7bcfbeeecd41c71d9cff0b62b6"},

From 1e1e760b637674fb13b152c0d4ddf14f3c4dde4a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 25 Jul 2023 12:17:33 +0000
Subject: [PATCH 234/909] Bump ex_cldr_numbers from 2.31.1 to 2.31.3

Bumps [ex_cldr_numbers](https://github.com/elixir-cldr/cldr_numbers) from 2.31.1 to 2.31.3.
- [Release notes](https://github.com/elixir-cldr/cldr_numbers/releases)
- [Changelog](https://github.com/elixir-cldr/cldr_numbers/blob/main/CHANGELOG.md)
- [Commits](https://github.com/elixir-cldr/cldr_numbers/compare/v2.31.1...v2.31.3)

---
updated-dependencies:
- dependency-name: ex_cldr_numbers
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 mix.lock | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/mix.lock b/mix.lock
index dc4ccd1dc466..2bc8039d2569 100644
--- a/mix.lock
+++ b/mix.lock
@@ -35,7 +35,7 @@
   "decorator": {:hex, :decorator, "1.4.0", "a57ac32c823ea7e4e67f5af56412d12b33274661bb7640ec7fc882f8d23ac419", [:mix], [], "hexpm", "0a07cedd9083da875c7418dea95b78361197cf2bf3211d743f6f7ce39656597f"},
   "deep_merge": {:hex, :deep_merge, "1.0.0", "b4aa1a0d1acac393bdf38b2291af38cb1d4a52806cf7a4906f718e1feb5ee961", [:mix], [], "hexpm", "ce708e5f094b9cd4e8f2be4f00d2f4250c4095be93f8cd6d018c753894885430"},
   "dialyxir": {:hex, :dialyxir, "1.3.0", "fd1672f0922b7648ff9ce7b1b26fcf0ef56dda964a459892ad15f6b4410b5284", [:mix], [{:erlex, ">= 0.2.6", [hex: :erlex, repo: "hexpm", optional: false]}], "hexpm", "00b2a4bcd6aa8db9dcb0b38c1225b7277dca9bc370b6438715667071a304696f"},
-  "digital_token": {:hex, :digital_token, "0.4.0", "2ad6894d4a40be8b2890aad286ecd5745fa473fa5699d80361a8c94428edcd1f", [:mix], [{:cldr_utils, "~> 2.17", [hex: :cldr_utils, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: false]}], "hexpm", "a178edf61d1fee5bb3c34e14b0f4ee21809ee87cade8738f87337e59e5e66e26"},
+  "digital_token": {:hex, :digital_token, "0.6.0", "13e6de581f0b1f6c686f7c7d12ab11a84a7b22fa79adeb4b50eec1a2d278d258", [:mix], [{:cldr_utils, "~> 2.17", [hex: :cldr_utils, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}], "hexpm", "2455d626e7c61a128b02a4a8caddb092548c3eb613ac6f6a85e4cbb6caddc4d1"},
   "earmark_parser": {:hex, :earmark_parser, "1.4.33", "3c3fd9673bb5dcc9edc28dd90f50c87ce506d1f71b70e3de69aa8154bc695d44", [:mix], [], "hexpm", "2d526833729b59b9fdb85785078697c72ac5e5066350663e5be6a1182da61b8f"},
   "ecto": {:hex, :ecto, "3.10.3", "eb2ae2eecd210b4eb8bece1217b297ad4ff824b4384c0e3fdd28aaf96edd6135", [:mix], [{:decimal, "~> 1.6 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}, {:telemetry, "~> 0.4 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "44bec74e2364d491d70f7e42cd0d690922659d329f6465e89feb8a34e8cd3433"},
   "ecto_sql": {:hex, :ecto_sql, "3.10.1", "6ea6b3036a0b0ca94c2a02613fd9f742614b5cfe494c41af2e6571bb034dd94c", [:mix], [{:db_connection, "~> 2.5 or ~> 2.4.1", [hex: :db_connection, repo: "hexpm", optional: false]}, {:ecto, "~> 3.10.0", [hex: :ecto, repo: "hexpm", optional: false]}, {:myxql, "~> 0.6.0", [hex: :myxql, repo: "hexpm", optional: true]}, {:postgrex, "~> 0.16.0 or ~> 0.17.0 or ~> 1.0", [hex: :postgrex, repo: "hexpm", optional: true]}, {:tds, "~> 2.1.1 or ~> 2.2", [hex: :tds, repo: "hexpm", optional: true]}, {:telemetry, "~> 0.4.0 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "f6a25bdbbd695f12c8171eaff0851fa4c8e72eec1e98c7364402dda9ce11c56b"},
@@ -45,7 +45,7 @@
   "ex_cldr": {:hex, :ex_cldr, "2.37.2", "c45041534ec60af367c4c1af02a608576118044fe3c441c782fd424061d6b517", [:mix], [{:cldr_utils, "~> 2.21", [hex: :cldr_utils, repo: "hexpm", optional: false]}, {:decimal, "~> 1.6 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: false]}, {:gettext, "~> 0.19", [hex: :gettext, repo: "hexpm", optional: true]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}, {:nimble_parsec, "~> 0.5 or ~> 1.0", [hex: :nimble_parsec, repo: "hexpm", optional: true]}], "hexpm", "c8467b1d5080716ace6621703b6656cb2f9545572a54b341da900791a0cf92ba"},
   "ex_cldr_currencies": {:hex, :ex_cldr_currencies, "2.15.0", "aadd34e91cfac7ef6b03fe8f47f8c6fa8c5daf3f89b5d9fee64ec545ded839cf", [:mix], [{:ex_cldr, "~> 2.34", [hex: :ex_cldr, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}], "hexpm", "0521316396c66877a2d636219767560bb2397c583341fcb154ecf9f3000e6ff8"},
   "ex_cldr_lists": {:hex, :ex_cldr_lists, "2.10.0", "4d4c9877da2d0417fd832907d69974e8328969f75fafc79b05ccf85f549f6281", [:mix], [{:ex_cldr_numbers, "~> 2.25", [hex: :ex_cldr_numbers, repo: "hexpm", optional: false]}, {:ex_doc, "~> 0.18", [hex: :ex_doc, repo: "hexpm", optional: true]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}], "hexpm", "adc040cde7b97f7fd7c0b35dd69ddb6fcf607303ae6355bb1851deae1f8b0652"},
-  "ex_cldr_numbers": {:hex, :ex_cldr_numbers, "2.31.1", "ad3e8a33e8cb8d048173f2c89cf6fcec9f1694d99f890a75bc745894c3868d5b", [:mix], [{:decimal, "~> 1.6 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: false]}, {:digital_token, "~> 0.3 or ~> 1.0", [hex: :digital_token, repo: "hexpm", optional: false]}, {:ex_cldr, "~> 2.37", [hex: :ex_cldr, repo: "hexpm", optional: false]}, {:ex_cldr_currencies, ">= 2.14.2", [hex: :ex_cldr_currencies, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}], "hexpm", "a94c40f4bf60f0e69c34977f33caeda483677232699ab0a6a98025ea011fabcf"},
+  "ex_cldr_numbers": {:hex, :ex_cldr_numbers, "2.31.3", "6ec8b18c395c0e8788d46da806f8f2abcbe4b0d809226d2a91363e9ccd85f2f5", [:mix], [{:decimal, "~> 1.6 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: false]}, {:digital_token, "~> 0.3 or ~> 1.0", [hex: :digital_token, repo: "hexpm", optional: false]}, {:ex_cldr, "~> 2.37", [hex: :ex_cldr, repo: "hexpm", optional: false]}, {:ex_cldr_currencies, ">= 2.14.2", [hex: :ex_cldr_currencies, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}], "hexpm", "b519de08ecc4a6402038f3aa75e8654f78ebd6fa714b7e585531504e648588fd"},
   "ex_cldr_units": {:hex, :ex_cldr_units, "3.16.2", "dbad303fba819981c578234e2aaf19d72efca16ea8b1c6ee46b26232cb45e232", [:mix], [{:cldr_utils, "~> 2.24", [hex: :cldr_utils, repo: "hexpm", optional: false]}, {:decimal, "~> 1.6 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: false]}, {:ex_cldr_lists, "~> 2.10", [hex: :ex_cldr_lists, repo: "hexpm", optional: false]}, {:ex_cldr_numbers, "~> 2.31", [hex: :ex_cldr_numbers, repo: "hexpm", optional: false]}, {:ex_doc, "~> 0.18", [hex: :ex_doc, repo: "hexpm", optional: true]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}], "hexpm", "851095319fb3205c1549619da742cd53a2804c1d9c204cf84014021e2a6ea7e5"},
   "ex_doc": {:hex, :ex_doc, "0.30.3", "bfca4d340e3b95f2eb26e72e4890da83e2b3a5c5b0e52607333bf5017284b063", [:mix], [{:earmark_parser, "~> 1.4.31", [hex: :earmark_parser, repo: "hexpm", optional: false]}, {:makeup_elixir, "~> 0.14", [hex: :makeup_elixir, repo: "hexpm", optional: false]}, {:makeup_erlang, "~> 0.1", [hex: :makeup_erlang, repo: "hexpm", optional: false]}], "hexpm", "fbc8702046c1d25edf79de376297e608ac78cdc3a29f075484773ad1718918b6"},
   "ex_json_schema": {:hex, :ex_json_schema, "0.9.3", "fc17c50d410fd99fa6e814e1aed60122d8ff2578b869d17a9db1ce1c621382b6", [:mix], [{:decimal, "~> 2.0", [hex: :decimal, repo: "hexpm", optional: false]}], "hexpm", "b79962d09cefd33001706255187bdb483a0c2b4442d5edc6822eb7574a8df0a8"},

From ccf36dbd3a0f0697e33c54cb622104b7bd7e9b6f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 25 Jul 2023 18:59:54 +0000
Subject: [PATCH 235/909] Bump chart.js from 4.3.0 to 4.3.1 in
 /apps/block_scout_web/assets

Bumps [chart.js](https://github.com/chartjs/Chart.js) from 4.3.0 to 4.3.1.
- [Release notes](https://github.com/chartjs/Chart.js/releases)
- [Commits](https://github.com/chartjs/Chart.js/compare/v4.3.0...v4.3.1)

---
updated-dependencies:
- dependency-name: chart.js
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 apps/block_scout_web/assets/package-lock.json | 14 +++++++-------
 apps/block_scout_web/assets/package.json      |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/apps/block_scout_web/assets/package-lock.json b/apps/block_scout_web/assets/package-lock.json
index 5a8e6d41eb0b..811769c6a261 100644
--- a/apps/block_scout_web/assets/package-lock.json
+++ b/apps/block_scout_web/assets/package-lock.json
@@ -14,7 +14,7 @@
         "assert": "^2.0.0",
         "bignumber.js": "^9.1.1",
         "bootstrap": "^4.6.0",
-        "chart.js": "^4.3.0",
+        "chart.js": "^4.3.1",
         "chartjs-adapter-luxon": "^1.3.1",
         "clipboard": "^2.0.11",
         "core-js": "^3.31.1",
@@ -5400,9 +5400,9 @@
       }
     },
     "node_modules/chart.js": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/chart.js/-/chart.js-4.3.0.tgz",
-      "integrity": "sha512-ynG0E79xGfMaV2xAHdbhwiPLczxnNNnasrmPEXriXsPJGjmhOBYzFVEsB65w2qMDz+CaBJJuJD0inE/ab/h36g==",
+      "version": "4.3.1",
+      "resolved": "https://registry.npmjs.org/chart.js/-/chart.js-4.3.1.tgz",
+      "integrity": "sha512-QHuISG3hTJ0ftq0I0f5jqH9mNVO9bqG8P+zvMOVslgKajQVvFEX7QAhYNJ+QEmw+uYTwo8XpTimaB82oeTWjxw==",
       "dependencies": {
         "@kurkle/color": "^0.3.0"
       },
@@ -21356,9 +21356,9 @@
       "dev": true
     },
     "chart.js": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/chart.js/-/chart.js-4.3.0.tgz",
-      "integrity": "sha512-ynG0E79xGfMaV2xAHdbhwiPLczxnNNnasrmPEXriXsPJGjmhOBYzFVEsB65w2qMDz+CaBJJuJD0inE/ab/h36g==",
+      "version": "4.3.1",
+      "resolved": "https://registry.npmjs.org/chart.js/-/chart.js-4.3.1.tgz",
+      "integrity": "sha512-QHuISG3hTJ0ftq0I0f5jqH9mNVO9bqG8P+zvMOVslgKajQVvFEX7QAhYNJ+QEmw+uYTwo8XpTimaB82oeTWjxw==",
       "requires": {
         "@kurkle/color": "^0.3.0"
       }
diff --git a/apps/block_scout_web/assets/package.json b/apps/block_scout_web/assets/package.json
index ca6aaad54bd7..45d58318de18 100644
--- a/apps/block_scout_web/assets/package.json
+++ b/apps/block_scout_web/assets/package.json
@@ -26,7 +26,7 @@
     "assert": "^2.0.0",
     "bignumber.js": "^9.1.1",
     "bootstrap": "^4.6.0",
-    "chart.js": "^4.3.0",
+    "chart.js": "^4.3.1",
     "chartjs-adapter-luxon": "^1.3.1",
     "clipboard": "^2.0.11",
     "core-js": "^3.31.1",

From 885d925b0698322136f6351f19f035e5966de852 Mon Sep 17 00:00:00 2001
From: Viktor Baranov <baranov.viktor.27@gmail.com>
Date: Wed, 26 Jul 2023 01:17:58 +0300
Subject: [PATCH 236/909] Arm compatible docker image

---
 .circleci/config.yml                          |  3 +-
 .github/workflows/config.yml                  |  2 --
 CHANGELOG.md                                  |  2 ++
 apps/indexer/lib/indexer/transform/blocks.ex  |  5 ++--
 apps/indexer/mix.exs                          |  4 +--
 cspell.json                                   |  3 +-
 .../docker-compose-no-build-erigon.yml        |  2 +-
 .../docker-compose-no-build-frontend.yml      |  2 +-
 .../docker-compose-no-build-ganache.yml       |  2 +-
 ...compose-no-build-geth-clique-consensus.yml |  2 +-
 .../docker-compose-no-build-geth.yml          |  2 +-
 ...ocker-compose-no-build-hardhat-network.yml |  2 +-
 .../docker-compose-no-build-nethermind.yml    |  2 +-
 ...ocker-compose-no-build-no-db-container.yml |  2 +-
 .../docker-compose-no-rust-services.yml       |  2 +-
 docker-compose/docker-compose.yml             |  2 +-
 .../services/docker-compose-frontend.yml      |  1 +
 .../services/docker-compose-sig-provider.yml  |  1 +
 ...docker-compose-smart-contract-verifier.yml |  1 +
 .../services/docker-compose-stats.yml         |  1 +
 .../services/docker-compose-visualizer.yml    |  1 +
 docker/Dockerfile                             | 30 +++++++++----------
 mix.lock                                      |  2 +-
 23 files changed, 41 insertions(+), 35 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index d688fc738005..6b083ce6478a 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -75,10 +75,9 @@ jobs:
 
       - run: mix compile
 
-      # Ensure NIF is compiled for libsecp256k1
       - run:
           command: make
-          working_directory: "deps/libsecp256k1"
+          working_directory: "deps/ex_secp256k1"
 
       # `deps` needs to be cached with `_build` because `_build` will symlink into `deps`
 
diff --git a/.github/workflows/config.yml b/.github/workflows/config.yml
index 37f208aea57b..6bbec02ea1cb 100644
--- a/.github/workflows/config.yml
+++ b/.github/workflows/config.yml
@@ -58,8 +58,6 @@ jobs:
           mix local.rebar --force
           mix deps.get
           mix deps.compile
-          cd deps/libsecp256k1
-          make
 
       - name: Restore Explorer NPM Cache
         uses: actions/cache@v2
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3bc71aff6104..7e63f5eec164 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,8 @@
 
 ### Fixes
 
+- [#8040](https://github.com/blockscout/blockscout/pull/8040) - Resolve issue with Docker image for Mac M1/M2
+
 ### Chore
 
 <details>
diff --git a/apps/indexer/lib/indexer/transform/blocks.ex b/apps/indexer/lib/indexer/transform/blocks.ex
index 37a748795210..195e3642765e 100644
--- a/apps/indexer/lib/indexer/transform/blocks.ex
+++ b/apps/indexer/lib/indexer/transform/blocks.ex
@@ -3,6 +3,8 @@ defmodule Indexer.Transform.Blocks do
   Protocol for transforming blocks.
   """
 
+  alias ExSecp256k1
+
   @type block :: map()
 
   @doc """
@@ -91,8 +93,7 @@ defmodule Indexer.Transform.Blocks do
 
     # First byte represents compression which can be ignored
     # Private key is the last 64 bytes
-    {:ok, <<_compression::bytes-size(1), private_key::binary>>} =
-      :libsecp256k1.ecdsa_recover_compact(signature_hash, r <> s, :uncompressed, v)
+    {:ok, <<_compression::bytes-size(1), private_key::binary>>} = ExSecp256k1.recover(signature_hash, r, s, v)
 
     # Public key comes from the last 20 bytes
     <<_::bytes-size(12), public_key::binary>> = ExKeccak.hash_256(private_key)
diff --git a/apps/indexer/mix.exs b/apps/indexer/mix.exs
index ae2737e988fe..b24c16733a2e 100644
--- a/apps/indexer/mix.exs
+++ b/apps/indexer/mix.exs
@@ -45,8 +45,8 @@ defmodule Indexer.MixProject do
       {:ex_rlp, "~> 0.6.0"},
       # Importing to database
       {:explorer, in_umbrella: true},
-      # libsecp2561k1 crypto functions
-      {:libsecp256k1, "~> 0.1.10"},
+      # ex_secp256k1 crypto functions
+      {:ex_secp256k1, "~> 0.7.0"},
       # Log errors and application output to separate files
       {:logger_file_backend, "~> 0.0.10"},
       # Mocking `EthereumJSONRPC.Transport`, so we avoid hitting real chains for local testing
diff --git a/cspell.json b/cspell.json
index 35a424da029d..2c733cb6d8ad 100644
--- a/cspell.json
+++ b/cspell.json
@@ -518,7 +518,8 @@
         "zkbob",
         "erts",
         "Asfpp",
-        "Nerg"
+        "Nerg",
+        "secp"
     ],
     "enableFiletypes": [
         "dotenv",
diff --git a/docker-compose/docker-compose-no-build-erigon.yml b/docker-compose/docker-compose-no-build-erigon.yml
index d3c40ddcfdce..29231c45d1ef 100644
--- a/docker-compose/docker-compose-no-build-erigon.yml
+++ b/docker-compose/docker-compose-no-build-erigon.yml
@@ -23,7 +23,7 @@ services:
     container_name: 'blockscout'
     links:
       - db:database
-    command: bash -c "bin/blockscout eval \"Elixir.Explorer.ReleaseTasks.create_and_migrate()\" && bin/blockscout start"
+    command: sh -c "bin/blockscout eval \"Elixir.Explorer.ReleaseTasks.create_and_migrate()\" && bin/blockscout start"
     extra_hosts:
       - 'host.docker.internal:host-gateway'
     env_file:
diff --git a/docker-compose/docker-compose-no-build-frontend.yml b/docker-compose/docker-compose-no-build-frontend.yml
index b4ef7ac09a41..e52017c7f78b 100644
--- a/docker-compose/docker-compose-no-build-frontend.yml
+++ b/docker-compose/docker-compose-no-build-frontend.yml
@@ -23,7 +23,7 @@ services:
     container_name: 'blockscout'
     links:
       - db:database
-    command: bash -c "bin/blockscout eval \"Elixir.Explorer.ReleaseTasks.create_and_migrate()\" && bin/blockscout start"
+    command: sh -c "bin/blockscout eval \"Elixir.Explorer.ReleaseTasks.create_and_migrate()\" && bin/blockscout start"
     extra_hosts:
       - 'host.docker.internal:host-gateway'
     env_file:
diff --git a/docker-compose/docker-compose-no-build-ganache.yml b/docker-compose/docker-compose-no-build-ganache.yml
index 6789b5720ffb..1f6679a5eeba 100644
--- a/docker-compose/docker-compose-no-build-ganache.yml
+++ b/docker-compose/docker-compose-no-build-ganache.yml
@@ -23,7 +23,7 @@ services:
     container_name: 'blockscout'
     links:
       - db:database
-    command: bash -c "bin/blockscout eval \"Elixir.Explorer.ReleaseTasks.create_and_migrate()\" && bin/blockscout start"
+    command: sh -c "bin/blockscout eval \"Elixir.Explorer.ReleaseTasks.create_and_migrate()\" && bin/blockscout start"
     extra_hosts:
       - 'host.docker.internal:host-gateway'
     env_file:
diff --git a/docker-compose/docker-compose-no-build-geth-clique-consensus.yml b/docker-compose/docker-compose-no-build-geth-clique-consensus.yml
index 4fe014bf8ed8..bfcb31cb9d27 100644
--- a/docker-compose/docker-compose-no-build-geth-clique-consensus.yml
+++ b/docker-compose/docker-compose-no-build-geth-clique-consensus.yml
@@ -23,7 +23,7 @@ services:
     container_name: 'blockscout'
     links:
       - db:database
-    command: bash -c "bin/blockscout eval \"Elixir.Explorer.ReleaseTasks.create_and_migrate()\" && bin/blockscout start"
+    command: sh -c "bin/blockscout eval \"Elixir.Explorer.ReleaseTasks.create_and_migrate()\" && bin/blockscout start"
     extra_hosts:
       - 'host.docker.internal:host-gateway'
     env_file:
diff --git a/docker-compose/docker-compose-no-build-geth.yml b/docker-compose/docker-compose-no-build-geth.yml
index 55ff3227d48c..d8aa27370019 100644
--- a/docker-compose/docker-compose-no-build-geth.yml
+++ b/docker-compose/docker-compose-no-build-geth.yml
@@ -23,7 +23,7 @@ services:
     container_name: 'blockscout'
     links:
       - db:database
-    command: bash -c "bin/blockscout eval \"Elixir.Explorer.ReleaseTasks.create_and_migrate()\" && bin/blockscout start"
+    command: sh -c "bin/blockscout eval \"Elixir.Explorer.ReleaseTasks.create_and_migrate()\" && bin/blockscout start"
     extra_hosts:
       - 'host.docker.internal:host-gateway'
     env_file:
diff --git a/docker-compose/docker-compose-no-build-hardhat-network.yml b/docker-compose/docker-compose-no-build-hardhat-network.yml
index 588d680bd441..c90e382e2c9f 100644
--- a/docker-compose/docker-compose-no-build-hardhat-network.yml
+++ b/docker-compose/docker-compose-no-build-hardhat-network.yml
@@ -23,7 +23,7 @@ services:
     container_name: 'blockscout'
     links:
       - db:database
-    command: bash -c "bin/blockscout eval \"Elixir.Explorer.ReleaseTasks.create_and_migrate()\" && bin/blockscout start"
+    command: sh -c "bin/blockscout eval \"Elixir.Explorer.ReleaseTasks.create_and_migrate()\" && bin/blockscout start"
     extra_hosts:
       - 'host.docker.internal:host-gateway'
     env_file:
diff --git a/docker-compose/docker-compose-no-build-nethermind.yml b/docker-compose/docker-compose-no-build-nethermind.yml
index 69725888e8eb..4aba06749c91 100644
--- a/docker-compose/docker-compose-no-build-nethermind.yml
+++ b/docker-compose/docker-compose-no-build-nethermind.yml
@@ -23,7 +23,7 @@ services:
     container_name: 'blockscout'
     links:
       - db:database
-    command: bash -c "bin/blockscout eval \"Elixir.Explorer.ReleaseTasks.create_and_migrate()\" && bin/blockscout start"
+    command: sh -c "bin/blockscout eval \"Elixir.Explorer.ReleaseTasks.create_and_migrate()\" && bin/blockscout start"
     extra_hosts:
       - 'host.docker.internal:host-gateway'
     env_file:
diff --git a/docker-compose/docker-compose-no-build-no-db-container.yml b/docker-compose/docker-compose-no-build-no-db-container.yml
index 3ed38a111b19..39232ea66c1d 100644
--- a/docker-compose/docker-compose-no-build-no-db-container.yml
+++ b/docker-compose/docker-compose-no-build-no-db-container.yml
@@ -15,7 +15,7 @@ services:
     restart: always
     stop_grace_period: 5m
     container_name: 'blockscout'
-    command: bash -c "bin/blockscout eval \"Elixir.Explorer.ReleaseTasks.create_and_migrate()\" && bin/blockscout start"
+    command: sh -c "bin/blockscout eval \"Elixir.Explorer.ReleaseTasks.create_and_migrate()\" && bin/blockscout start"
     extra_hosts:
       - 'host.docker.internal:host-gateway'
     env_file:
diff --git a/docker-compose/docker-compose-no-rust-services.yml b/docker-compose/docker-compose-no-rust-services.yml
index 57cb5d830fe3..a35253cd3279 100644
--- a/docker-compose/docker-compose-no-rust-services.yml
+++ b/docker-compose/docker-compose-no-rust-services.yml
@@ -33,7 +33,7 @@ services:
     container_name: 'blockscout'
     links:
       - db:database
-    command: bash -c "bin/blockscout eval \"Elixir.Explorer.ReleaseTasks.create_and_migrate()\" && bin/blockscout start"
+    command: sh -c "bin/blockscout eval \"Elixir.Explorer.ReleaseTasks.create_and_migrate()\" && bin/blockscout start"
     extra_hosts:
       - 'host.docker.internal:host-gateway'
     env_file:
diff --git a/docker-compose/docker-compose.yml b/docker-compose/docker-compose.yml
index 4f1539f54028..9fdb484b9699 100644
--- a/docker-compose/docker-compose.yml
+++ b/docker-compose/docker-compose.yml
@@ -34,7 +34,7 @@ services:
     container_name: 'blockscout'
     links:
       - db:database
-    command: bash -c "bin/blockscout eval \"Elixir.Explorer.ReleaseTasks.create_and_migrate()\" && bin/blockscout start"
+    command: sh -c "bin/blockscout eval \"Elixir.Explorer.ReleaseTasks.create_and_migrate()\" && bin/blockscout start"
     extra_hosts:
       - 'host.docker.internal:host-gateway'
     env_file:
diff --git a/docker-compose/services/docker-compose-frontend.yml b/docker-compose/services/docker-compose-frontend.yml
index 1076c1e3d03b..d8fb04a3b100 100644
--- a/docker-compose/services/docker-compose-frontend.yml
+++ b/docker-compose/services/docker-compose-frontend.yml
@@ -4,6 +4,7 @@ services:
   frontend:
     image: ghcr.io/blockscout/frontend:${FRONTEND_DOCKER_TAG:-latest}
     pull_policy: always
+    platform: linux/amd64
     restart: always
     container_name: 'frontend'
     env_file:
diff --git a/docker-compose/services/docker-compose-sig-provider.yml b/docker-compose/services/docker-compose-sig-provider.yml
index 2a75f9fc18c4..a87d739c2ba0 100644
--- a/docker-compose/services/docker-compose-sig-provider.yml
+++ b/docker-compose/services/docker-compose-sig-provider.yml
@@ -4,6 +4,7 @@ services:
   sig-provider:
     image: ghcr.io/blockscout/sig-provider:${SIG_PROVIDER_DOCKER_TAG:-latest}
     pull_policy: always
+    platform: linux/amd64
     restart: always
     container_name: 'sig-provider'
     ports:
diff --git a/docker-compose/services/docker-compose-smart-contract-verifier.yml b/docker-compose/services/docker-compose-smart-contract-verifier.yml
index 2dca6bcb126f..2d5207a991fd 100644
--- a/docker-compose/services/docker-compose-smart-contract-verifier.yml
+++ b/docker-compose/services/docker-compose-smart-contract-verifier.yml
@@ -4,6 +4,7 @@ services:
   smart-contract-verifier:
     image: ghcr.io/blockscout/smart-contract-verifier:${SMART_CONTRACT_VERIFIER_DOCKER_TAG:-latest}
     pull_policy: always
+    platform: linux/amd64
     restart: always
     container_name: 'smart-contract-verifier'
     env_file:
diff --git a/docker-compose/services/docker-compose-stats.yml b/docker-compose/services/docker-compose-stats.yml
index 95c847d944fb..4b14419fa631 100644
--- a/docker-compose/services/docker-compose-stats.yml
+++ b/docker-compose/services/docker-compose-stats.yml
@@ -18,6 +18,7 @@ services:
       - stats-db
     image: ghcr.io/blockscout/stats:${STATS_DOCKER_TAG:-latest}
     pull_policy: always
+    platform: linux/amd64
     restart: always
     container_name: 'stats'
     extra_hosts:
diff --git a/docker-compose/services/docker-compose-visualizer.yml b/docker-compose/services/docker-compose-visualizer.yml
index a13030e79b74..cc136d858a38 100644
--- a/docker-compose/services/docker-compose-visualizer.yml
+++ b/docker-compose/services/docker-compose-visualizer.yml
@@ -4,6 +4,7 @@ services:
   visualizer:
     image: ghcr.io/blockscout/visualizer:${VISUALIZER_DOCKER_TAG:-latest}
     pull_policy: always
+    platform: linux/amd64
     restart: always
     container_name: 'visualizer'
     env_file:
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 3885930b28aa..9b42fcbe71b2 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -1,22 +1,14 @@
-FROM bitwalker/alpine-elixir-phoenix:1.14 AS builder
+FROM hexpm/elixir:1.14.5-erlang-25.3.2.4-alpine-3.18.2 AS builder
 
 WORKDIR /app
 
-RUN apk --no-cache --update add alpine-sdk gmp-dev automake libtool inotify-tools autoconf python3 file qemu-x86_64
+RUN apk --no-cache --update add alpine-sdk gmp-dev automake libtool inotify-tools autoconf python3 file gcompat
 
-ENV GLIBC_REPO=https://github.com/sgerrand/alpine-pkg-glibc \
-    GLIBC_VERSION=2.34-r0 \
-    PORT=4000 \
+ENV PORT=4000 \
     MIX_ENV="prod" \
     SECRET_KEY_BASE="RMgI4C1HSkxsEjdhtGMfwAHfyT6CKWXOgzCboJflfSm4jeAlic52io05KB6mqzc5"
 
-RUN set -ex && \
-    apk --update add libstdc++ curl ca-certificates && \
-    for pkg in glibc-${GLIBC_VERSION} glibc-bin-${GLIBC_VERSION}; \
-        do curl -sSL ${GLIBC_REPO}/releases/download/${GLIBC_VERSION}/${pkg}.apk -o /tmp/${pkg}.apk; done && \
-    apk add --allow-untrusted /tmp/*.apk && \
-    rm -v /tmp/*.apk && \
-    /usr/glibc-compat/sbin/ldconfig /lib /usr/glibc-compat/lib
+RUN apk --update add libstdc++ curl ca-certificates gcompat
 
 ARG CACHE_EXCHANGE_RATES_PERIOD
 ARG API_V1_READ_METHODS_DISABLED
@@ -38,11 +30,16 @@ ADD apps/explorer/mix.exs ./apps/explorer/
 ADD apps/ethereum_jsonrpc/mix.exs ./apps/ethereum_jsonrpc/
 ADD apps/indexer/mix.exs ./apps/indexer/
 
+ENV MIX_HOME=/opt/mix
+RUN mix local.hex --force
 RUN mix do deps.get, local.rebar --force, deps.compile
 
-ADD . .
+ADD apps ./apps
+ADD config ./config
+ADD rel ./rel
+ADD *.exs .
 
-COPY . .
+RUN apk add --update nodejs npm
 
 # Run forderground build and phoenix digest
 RUN mix compile && npm install npm@latest
@@ -56,6 +53,9 @@ RUN cd apps/block_scout_web/assets/ && \
     apk update && \
     apk del --force-broken-world alpine-sdk gmp-dev automake libtool inotify-tools autoconf python3
 
+RUN apk add --update git make 
+
+RUN export "CFLAGS=-I/usr/local/include -L/usr/local/lib" && cd deps/ex_secp256k1 && mix deps.get && mix compile
 RUN mix phx.digest
 
 RUN mkdir -p /opt/release \
@@ -63,7 +63,7 @@ RUN mkdir -p /opt/release \
   && mv _build/${MIX_ENV}/rel/blockscout /opt/release
 
 ##############################################################
-FROM bitwalker/alpine-elixir-phoenix:1.14
+FROM hexpm/elixir:1.14.5-erlang-25.3.2.4-alpine-3.18.2
 
 ARG RELEASE_VERSION
 ENV RELEASE_VERSION=${RELEASE_VERSION}
diff --git a/mix.lock b/mix.lock
index de61f281cb58..94e1a25546a8 100644
--- a/mix.lock
+++ b/mix.lock
@@ -52,6 +52,7 @@
   "ex_keccak": {:hex, :ex_keccak, "0.7.1", "0169f4b0c5073c5df61581d6282b12f1a1b764dcfcda4eeb1c819b5194c9ced0", [:mix], [{:rustler, ">= 0.0.0", [hex: :rustler, repo: "hexpm", optional: true]}, {:rustler_precompiled, "~> 0.6.1", [hex: :rustler_precompiled, repo: "hexpm", optional: false]}], "hexpm", "c18c19f66b6545b4b46b0c71c0cc0079de84e30b26365a92961e91697e8724ed"},
   "ex_machina": {:hex, :ex_machina, "2.7.0", "b792cc3127fd0680fecdb6299235b4727a4944a09ff0fa904cc639272cd92dc7", [:mix], [{:ecto, "~> 2.2 or ~> 3.0", [hex: :ecto, repo: "hexpm", optional: true]}, {:ecto_sql, "~> 3.0", [hex: :ecto_sql, repo: "hexpm", optional: true]}], "hexpm", "419aa7a39bde11894c87a615c4ecaa52d8f107bbdd81d810465186f783245bf8"},
   "ex_rlp": {:hex, :ex_rlp, "0.6.0", "985391d2356a7cb8712a4a9a2deb93f19f2fbca0323f5c1203fcaf64d077e31e", [:mix], [], "hexpm", "7135db93b861d9e76821039b60b00a6a22d2c4e751bf8c444bffe7a042f1abaf"},
+  "ex_secp256k1": {:hex, :ex_secp256k1, "0.7.0", "fa555152e8680c1e2df09ccc2884eccd25d8bc328c630b0b8952abe3745edc8f", [:mix], [{:rustler, ">= 0.0.0", [hex: :rustler, repo: "hexpm", optional: true]}, {:rustler_precompiled, "~> 0.6", [hex: :rustler_precompiled, repo: "hexpm", optional: false]}], "hexpm", "2a8754c7b3d83bbcab4a188ed033254ca5c6ac252188ced0d382ca343096bf73"},
   "ex_utils": {:hex, :ex_utils, "0.1.7", "2c133e0bcdc49a858cf8dacf893308ebc05bc5fba501dc3d2935e65365ec0bf3", [:mix], [], "hexpm", "66d4fe75285948f2d1e69c2a5ddd651c398c813574f8d36a9eef11dc20356ef6"},
   "exactor": {:hex, :exactor, "2.2.4", "5efb4ddeb2c48d9a1d7c9b465a6fffdd82300eb9618ece5d34c3334d5d7245b1", [:mix], [], "hexpm", "1222419f706e01bfa1095aec9acf6421367dcfab798a6f67c54cf784733cd6b5"},
   "exjsx": {:hex, :exjsx, "4.0.0", "60548841e0212df401e38e63c0078ec57b33e7ea49b032c796ccad8cde794b5c", [:mix], [{:jsx, "~> 2.8.0", [hex: :jsx, repo: "hexpm", optional: false]}], "hexpm", "32e95820a97cffea67830e91514a2ad53b888850442d6d395f53a1ac60c82e07"},
@@ -73,7 +74,6 @@
   "jason": {:hex, :jason, "1.4.1", "af1504e35f629ddcdd6addb3513c3853991f694921b1b9368b0bd32beb9f1b63", [:mix], [{:decimal, "~> 1.0 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: true]}], "hexpm", "fbb01ecdfd565b56261302f7e1fcc27c4fb8f32d56eab74db621fc154604a7a1"},
   "jsx": {:hex, :jsx, "2.8.3", "a05252d381885240744d955fbe3cf810504eb2567164824e19303ea59eef62cf", [:mix, :rebar3], [], "hexpm", "fc3499fed7a726995aa659143a248534adc754ebd16ccd437cd93b649a95091f"},
   "junit_formatter": {:hex, :junit_formatter, "3.3.1", "c729befb848f1b9571f317d2fefa648e9d4869befc4b2980daca7c1edc468e40", [:mix], [], "hexpm", "761fc5be4b4c15d8ba91a6dafde0b2c2ae6db9da7b8832a55b5a1deb524da72b"},
-  "libsecp256k1": {:hex, :libsecp256k1, "0.1.10", "d27495e2b9851c7765129b76c53b60f5e275bd6ff68292c50536bf6b8d091a4d", [:make, :mix], [{:mix_erlang_tasks, "0.1.0", [hex: :mix_erlang_tasks, repo: "hexpm", optional: false]}], "hexpm", "09ea06239938571124f7f5a27bc9ac45dfb1cfc2df40d46ee9b59c3d51366652"},
   "logger_file_backend": {:hex, :logger_file_backend, "0.0.13", "df07b14970e9ac1f57362985d76e6f24e3e1ab05c248055b7d223976881977c2", [:mix], [], "hexpm", "71a453a7e6e899ae4549fb147b1c6621f4233f8f48f58ca10a64ec67b6c50018"},
   "makeup": {:hex, :makeup, "1.1.0", "6b67c8bc2882a6b6a445859952a602afc1a41c2e08379ca057c0f525366fc3ca", [:mix], [{:nimble_parsec, "~> 1.2.2 or ~> 1.3", [hex: :nimble_parsec, repo: "hexpm", optional: false]}], "hexpm", "0a45ed501f4a8897f580eabf99a2e5234ea3e75a4373c8a52824f6e873be57a6"},
   "makeup_elixir": {:hex, :makeup_elixir, "0.16.1", "cc9e3ca312f1cfeccc572b37a09980287e243648108384b97ff2b76e505c3555", [:mix], [{:makeup, "~> 1.0", [hex: :makeup, repo: "hexpm", optional: false]}, {:nimble_parsec, "~> 1.2.3 or ~> 1.3", [hex: :nimble_parsec, repo: "hexpm", optional: false]}], "hexpm", "e127a341ad1b209bd80f7bd1620a15693a9908ed780c3b763bccf7d200c767c6"},

From 7c2633b065ea409f4b207c2fe3e2c8a73530cea1 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 26 Jul 2023 18:06:04 +0000
Subject: [PATCH 237/909] Bump chart.js from 4.3.1 to 4.3.2 in
 /apps/block_scout_web/assets

Bumps [chart.js](https://github.com/chartjs/Chart.js) from 4.3.1 to 4.3.2.
- [Release notes](https://github.com/chartjs/Chart.js/releases)
- [Commits](https://github.com/chartjs/Chart.js/compare/v4.3.1...v4.3.2)

---
updated-dependencies:
- dependency-name: chart.js
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 apps/block_scout_web/assets/package-lock.json | 14 +++++++-------
 apps/block_scout_web/assets/package.json      |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/apps/block_scout_web/assets/package-lock.json b/apps/block_scout_web/assets/package-lock.json
index 811769c6a261..a521866da3aa 100644
--- a/apps/block_scout_web/assets/package-lock.json
+++ b/apps/block_scout_web/assets/package-lock.json
@@ -14,7 +14,7 @@
         "assert": "^2.0.0",
         "bignumber.js": "^9.1.1",
         "bootstrap": "^4.6.0",
-        "chart.js": "^4.3.1",
+        "chart.js": "^4.3.2",
         "chartjs-adapter-luxon": "^1.3.1",
         "clipboard": "^2.0.11",
         "core-js": "^3.31.1",
@@ -5400,9 +5400,9 @@
       }
     },
     "node_modules/chart.js": {
-      "version": "4.3.1",
-      "resolved": "https://registry.npmjs.org/chart.js/-/chart.js-4.3.1.tgz",
-      "integrity": "sha512-QHuISG3hTJ0ftq0I0f5jqH9mNVO9bqG8P+zvMOVslgKajQVvFEX7QAhYNJ+QEmw+uYTwo8XpTimaB82oeTWjxw==",
+      "version": "4.3.2",
+      "resolved": "https://registry.npmjs.org/chart.js/-/chart.js-4.3.2.tgz",
+      "integrity": "sha512-pvQNyFOY1QmbmIr8oDORL16/FFivfxj8V26VFpFilMo4cNvkV5WXLJetDio365pd9gKUHGdirUTbqJfw8tr+Dg==",
       "dependencies": {
         "@kurkle/color": "^0.3.0"
       },
@@ -21356,9 +21356,9 @@
       "dev": true
     },
     "chart.js": {
-      "version": "4.3.1",
-      "resolved": "https://registry.npmjs.org/chart.js/-/chart.js-4.3.1.tgz",
-      "integrity": "sha512-QHuISG3hTJ0ftq0I0f5jqH9mNVO9bqG8P+zvMOVslgKajQVvFEX7QAhYNJ+QEmw+uYTwo8XpTimaB82oeTWjxw==",
+      "version": "4.3.2",
+      "resolved": "https://registry.npmjs.org/chart.js/-/chart.js-4.3.2.tgz",
+      "integrity": "sha512-pvQNyFOY1QmbmIr8oDORL16/FFivfxj8V26VFpFilMo4cNvkV5WXLJetDio365pd9gKUHGdirUTbqJfw8tr+Dg==",
       "requires": {
         "@kurkle/color": "^0.3.0"
       }
diff --git a/apps/block_scout_web/assets/package.json b/apps/block_scout_web/assets/package.json
index 45d58318de18..53436e8d65dc 100644
--- a/apps/block_scout_web/assets/package.json
+++ b/apps/block_scout_web/assets/package.json
@@ -26,7 +26,7 @@
     "assert": "^2.0.0",
     "bignumber.js": "^9.1.1",
     "bootstrap": "^4.6.0",
-    "chart.js": "^4.3.1",
+    "chart.js": "^4.3.2",
     "chartjs-adapter-luxon": "^1.3.1",
     "clipboard": "^2.0.11",
     "core-js": "^3.31.1",

From dd2ae629c0dd40e8e4b8fcf93df38f7e759ae94b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 27 Jul 2023 18:34:07 +0000
Subject: [PATCH 238/909] Bump @amplitude/analytics-browser in
 /apps/block_scout_web/assets

Bumps [@amplitude/analytics-browser](https://github.com/amplitude/Amplitude-TypeScript) from 2.1.2 to 2.1.3.
- [Release notes](https://github.com/amplitude/Amplitude-TypeScript/releases)
- [Commits](https://github.com/amplitude/Amplitude-TypeScript/compare/@amplitude/analytics-browser@2.1.2...@amplitude/analytics-browser@2.1.3)

---
updated-dependencies:
- dependency-name: "@amplitude/analytics-browser"
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 apps/block_scout_web/assets/package-lock.json | 94 +++++++++----------
 apps/block_scout_web/assets/package.json      |  2 +-
 2 files changed, 48 insertions(+), 48 deletions(-)

diff --git a/apps/block_scout_web/assets/package-lock.json b/apps/block_scout_web/assets/package-lock.json
index 584c2c8a4936..d5bc0e7a2517 100644
--- a/apps/block_scout_web/assets/package-lock.json
+++ b/apps/block_scout_web/assets/package-lock.json
@@ -7,7 +7,7 @@
       "name": "blockscout",
       "license": "GPL-3.0",
       "dependencies": {
-        "@amplitude/analytics-browser": "^2.1.2",
+        "@amplitude/analytics-browser": "^2.1.3",
         "@fortawesome/fontawesome-free": "^6.4.0",
         "@tarekraafat/autocomplete.js": "^10.2.7",
         "@walletconnect/web3-provider": "^1.8.0",
@@ -116,15 +116,15 @@
       }
     },
     "node_modules/@amplitude/analytics-browser": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/@amplitude/analytics-browser/-/analytics-browser-2.1.2.tgz",
-      "integrity": "sha512-1XoWJmLgGrszxupz61yCjen53bq7+kJN2gedu+kSrq/Ze9ow5R5QI0YfLyuzi1FHchzmSVWd2PheXOVYC4K/Cw==",
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/@amplitude/analytics-browser/-/analytics-browser-2.1.3.tgz",
+      "integrity": "sha512-DQqjyRdkmUEHxGBuMEDOPNTssE0of+xZa2WtjmsxEZcIhtUSjViEJfRMg6Eup8O72m+7S+wQO3psfQecuZ1OnQ==",
       "dependencies": {
         "@amplitude/analytics-client-common": "^2.0.4",
         "@amplitude/analytics-core": "^2.0.3",
         "@amplitude/analytics-types": "^2.1.1",
-        "@amplitude/plugin-page-view-tracking-browser": "^2.0.4",
-        "@amplitude/plugin-web-attribution-browser": "^2.0.4",
+        "@amplitude/plugin-page-view-tracking-browser": "^2.0.5",
+        "@amplitude/plugin-web-attribution-browser": "^2.0.5",
         "tslib": "^2.4.1"
       }
     },
@@ -145,9 +145,9 @@
       }
     },
     "node_modules/@amplitude/analytics-client-common/node_modules/tslib": {
-      "version": "2.6.0",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.0.tgz",
-      "integrity": "sha512-7At1WUettjcSRHXCyYtTselblcHl9PJFFVKiCAy/bY97+BPZXSQ2wbq0P9s8tK2G7dFQfNnlJnPAiArVBVBsfA=="
+      "version": "2.6.1",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.1.tgz",
+      "integrity": "sha512-t0hLfiEKfMUoqhG+U1oid7Pva4bbDPHYfJNiB7BiIjRkj1pyC++4N3huJfqY6aRH6VTB0rvtzQwjM4K6qpfOig=="
     },
     "node_modules/@amplitude/analytics-connector": {
       "version": "1.4.8",
@@ -164,9 +164,9 @@
       }
     },
     "node_modules/@amplitude/analytics-core/node_modules/tslib": {
-      "version": "2.6.0",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.0.tgz",
-      "integrity": "sha512-7At1WUettjcSRHXCyYtTselblcHl9PJFFVKiCAy/bY97+BPZXSQ2wbq0P9s8tK2G7dFQfNnlJnPAiArVBVBsfA=="
+      "version": "2.6.1",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.1.tgz",
+      "integrity": "sha512-t0hLfiEKfMUoqhG+U1oid7Pva4bbDPHYfJNiB7BiIjRkj1pyC++4N3huJfqY6aRH6VTB0rvtzQwjM4K6qpfOig=="
     },
     "node_modules/@amplitude/analytics-types": {
       "version": "2.1.1",
@@ -174,9 +174,9 @@
       "integrity": "sha512-H3vebPR9onRdp0WzAZmI/4qmAE903uLOd2ZfMeHsVc1zaFTTCk46SoCuV4IrlF+VILrDw9Fy6gC9yl5N2PZcJQ=="
     },
     "node_modules/@amplitude/plugin-page-view-tracking-browser": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/@amplitude/plugin-page-view-tracking-browser/-/plugin-page-view-tracking-browser-2.0.4.tgz",
-      "integrity": "sha512-XQlgydCmfUb+mkXjD8NoOU80eO/578m2AupRcV0dPKwk+VN5D7D1s+xXYM6Bg7l1HSJx2mt0Qwa5xsdSCFzF2g==",
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/@amplitude/plugin-page-view-tracking-browser/-/plugin-page-view-tracking-browser-2.0.5.tgz",
+      "integrity": "sha512-dmW2dckEaI/Z9DQ+3RNJU32cF4c6iYsFamvu73LDu/sttE0gmqWDRvZhh/B7j/VDxYmobySMUEV1kinjbn8vXg==",
       "dependencies": {
         "@amplitude/analytics-client-common": "^2.0.4",
         "@amplitude/analytics-types": "^2.1.1",
@@ -184,14 +184,14 @@
       }
     },
     "node_modules/@amplitude/plugin-page-view-tracking-browser/node_modules/tslib": {
-      "version": "2.6.0",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.0.tgz",
-      "integrity": "sha512-7At1WUettjcSRHXCyYtTselblcHl9PJFFVKiCAy/bY97+BPZXSQ2wbq0P9s8tK2G7dFQfNnlJnPAiArVBVBsfA=="
+      "version": "2.6.1",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.1.tgz",
+      "integrity": "sha512-t0hLfiEKfMUoqhG+U1oid7Pva4bbDPHYfJNiB7BiIjRkj1pyC++4N3huJfqY6aRH6VTB0rvtzQwjM4K6qpfOig=="
     },
     "node_modules/@amplitude/plugin-web-attribution-browser": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/@amplitude/plugin-web-attribution-browser/-/plugin-web-attribution-browser-2.0.4.tgz",
-      "integrity": "sha512-y/VQjDH7tnevRlKO9IWzELF9L87MwiR+y7WCRxR5/wRGKDxKS5Ol33vHYWe1RaOzkC/7wO0px7pZGRZkj/X+1Q==",
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/@amplitude/plugin-web-attribution-browser/-/plugin-web-attribution-browser-2.0.5.tgz",
+      "integrity": "sha512-apLZ4XV0Xbq4E3sHY25zubiyqHX9IWupWk+RTMNqHZJyhC7JuA3ttVFU3p0fWM/XeumITMRPL2NcG9R9WO4y9Q==",
       "dependencies": {
         "@amplitude/analytics-client-common": "^2.0.4",
         "@amplitude/analytics-core": "^2.0.3",
@@ -200,9 +200,9 @@
       }
     },
     "node_modules/@amplitude/plugin-web-attribution-browser/node_modules/tslib": {
-      "version": "2.6.0",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.0.tgz",
-      "integrity": "sha512-7At1WUettjcSRHXCyYtTselblcHl9PJFFVKiCAy/bY97+BPZXSQ2wbq0P9s8tK2G7dFQfNnlJnPAiArVBVBsfA=="
+      "version": "2.6.1",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.1.tgz",
+      "integrity": "sha512-t0hLfiEKfMUoqhG+U1oid7Pva4bbDPHYfJNiB7BiIjRkj1pyC++4N3huJfqY6aRH6VTB0rvtzQwjM4K6qpfOig=="
     },
     "node_modules/@ampproject/remapping": {
       "version": "2.2.0",
@@ -17404,15 +17404,15 @@
       "dev": true
     },
     "@amplitude/analytics-browser": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/@amplitude/analytics-browser/-/analytics-browser-2.1.2.tgz",
-      "integrity": "sha512-1XoWJmLgGrszxupz61yCjen53bq7+kJN2gedu+kSrq/Ze9ow5R5QI0YfLyuzi1FHchzmSVWd2PheXOVYC4K/Cw==",
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/@amplitude/analytics-browser/-/analytics-browser-2.1.3.tgz",
+      "integrity": "sha512-DQqjyRdkmUEHxGBuMEDOPNTssE0of+xZa2WtjmsxEZcIhtUSjViEJfRMg6Eup8O72m+7S+wQO3psfQecuZ1OnQ==",
       "requires": {
         "@amplitude/analytics-client-common": "^2.0.4",
         "@amplitude/analytics-core": "^2.0.3",
         "@amplitude/analytics-types": "^2.1.1",
-        "@amplitude/plugin-page-view-tracking-browser": "^2.0.4",
-        "@amplitude/plugin-web-attribution-browser": "^2.0.4",
+        "@amplitude/plugin-page-view-tracking-browser": "^2.0.5",
+        "@amplitude/plugin-web-attribution-browser": "^2.0.5",
         "tslib": "^2.4.1"
       },
       "dependencies": {
@@ -17435,9 +17435,9 @@
       },
       "dependencies": {
         "tslib": {
-          "version": "2.6.0",
-          "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.0.tgz",
-          "integrity": "sha512-7At1WUettjcSRHXCyYtTselblcHl9PJFFVKiCAy/bY97+BPZXSQ2wbq0P9s8tK2G7dFQfNnlJnPAiArVBVBsfA=="
+          "version": "2.6.1",
+          "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.1.tgz",
+          "integrity": "sha512-t0hLfiEKfMUoqhG+U1oid7Pva4bbDPHYfJNiB7BiIjRkj1pyC++4N3huJfqY6aRH6VTB0rvtzQwjM4K6qpfOig=="
         }
       }
     },
@@ -17456,9 +17456,9 @@
       },
       "dependencies": {
         "tslib": {
-          "version": "2.6.0",
-          "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.0.tgz",
-          "integrity": "sha512-7At1WUettjcSRHXCyYtTselblcHl9PJFFVKiCAy/bY97+BPZXSQ2wbq0P9s8tK2G7dFQfNnlJnPAiArVBVBsfA=="
+          "version": "2.6.1",
+          "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.1.tgz",
+          "integrity": "sha512-t0hLfiEKfMUoqhG+U1oid7Pva4bbDPHYfJNiB7BiIjRkj1pyC++4N3huJfqY6aRH6VTB0rvtzQwjM4K6qpfOig=="
         }
       }
     },
@@ -17468,9 +17468,9 @@
       "integrity": "sha512-H3vebPR9onRdp0WzAZmI/4qmAE903uLOd2ZfMeHsVc1zaFTTCk46SoCuV4IrlF+VILrDw9Fy6gC9yl5N2PZcJQ=="
     },
     "@amplitude/plugin-page-view-tracking-browser": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/@amplitude/plugin-page-view-tracking-browser/-/plugin-page-view-tracking-browser-2.0.4.tgz",
-      "integrity": "sha512-XQlgydCmfUb+mkXjD8NoOU80eO/578m2AupRcV0dPKwk+VN5D7D1s+xXYM6Bg7l1HSJx2mt0Qwa5xsdSCFzF2g==",
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/@amplitude/plugin-page-view-tracking-browser/-/plugin-page-view-tracking-browser-2.0.5.tgz",
+      "integrity": "sha512-dmW2dckEaI/Z9DQ+3RNJU32cF4c6iYsFamvu73LDu/sttE0gmqWDRvZhh/B7j/VDxYmobySMUEV1kinjbn8vXg==",
       "requires": {
         "@amplitude/analytics-client-common": "^2.0.4",
         "@amplitude/analytics-types": "^2.1.1",
@@ -17478,16 +17478,16 @@
       },
       "dependencies": {
         "tslib": {
-          "version": "2.6.0",
-          "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.0.tgz",
-          "integrity": "sha512-7At1WUettjcSRHXCyYtTselblcHl9PJFFVKiCAy/bY97+BPZXSQ2wbq0P9s8tK2G7dFQfNnlJnPAiArVBVBsfA=="
+          "version": "2.6.1",
+          "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.1.tgz",
+          "integrity": "sha512-t0hLfiEKfMUoqhG+U1oid7Pva4bbDPHYfJNiB7BiIjRkj1pyC++4N3huJfqY6aRH6VTB0rvtzQwjM4K6qpfOig=="
         }
       }
     },
     "@amplitude/plugin-web-attribution-browser": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/@amplitude/plugin-web-attribution-browser/-/plugin-web-attribution-browser-2.0.4.tgz",
-      "integrity": "sha512-y/VQjDH7tnevRlKO9IWzELF9L87MwiR+y7WCRxR5/wRGKDxKS5Ol33vHYWe1RaOzkC/7wO0px7pZGRZkj/X+1Q==",
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/@amplitude/plugin-web-attribution-browser/-/plugin-web-attribution-browser-2.0.5.tgz",
+      "integrity": "sha512-apLZ4XV0Xbq4E3sHY25zubiyqHX9IWupWk+RTMNqHZJyhC7JuA3ttVFU3p0fWM/XeumITMRPL2NcG9R9WO4y9Q==",
       "requires": {
         "@amplitude/analytics-client-common": "^2.0.4",
         "@amplitude/analytics-core": "^2.0.3",
@@ -17496,9 +17496,9 @@
       },
       "dependencies": {
         "tslib": {
-          "version": "2.6.0",
-          "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.0.tgz",
-          "integrity": "sha512-7At1WUettjcSRHXCyYtTselblcHl9PJFFVKiCAy/bY97+BPZXSQ2wbq0P9s8tK2G7dFQfNnlJnPAiArVBVBsfA=="
+          "version": "2.6.1",
+          "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.1.tgz",
+          "integrity": "sha512-t0hLfiEKfMUoqhG+U1oid7Pva4bbDPHYfJNiB7BiIjRkj1pyC++4N3huJfqY6aRH6VTB0rvtzQwjM4K6qpfOig=="
         }
       }
     },
diff --git a/apps/block_scout_web/assets/package.json b/apps/block_scout_web/assets/package.json
index c6d74ce6c50a..ff6b0c61334e 100644
--- a/apps/block_scout_web/assets/package.json
+++ b/apps/block_scout_web/assets/package.json
@@ -20,7 +20,7 @@
   },
   "dependencies": {
     "@fortawesome/fontawesome-free": "^6.4.0",
-    "@amplitude/analytics-browser": "^2.1.2",
+    "@amplitude/analytics-browser": "^2.1.3",
     "@tarekraafat/autocomplete.js": "^10.2.7",
     "@walletconnect/web3-provider": "^1.8.0",
     "assert": "^2.0.0",

From 513ad98a7b042931e1cbded4248262b3f6f73944 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 27 Jul 2023 18:35:17 +0000
Subject: [PATCH 239/909] Bump jest-environment-jsdom in
 /apps/block_scout_web/assets

Bumps [jest-environment-jsdom](https://github.com/facebook/jest/tree/HEAD/packages/jest-environment-jsdom) from 29.6.1 to 29.6.2.
- [Release notes](https://github.com/facebook/jest/releases)
- [Changelog](https://github.com/jestjs/jest/blob/main/CHANGELOG.md)
- [Commits](https://github.com/facebook/jest/commits/v29.6.2/packages/jest-environment-jsdom)

---
updated-dependencies:
- dependency-name: jest-environment-jsdom
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 apps/block_scout_web/assets/package-lock.json | 130 +++++++++---------
 apps/block_scout_web/assets/package.json      |   2 +-
 2 files changed, 66 insertions(+), 66 deletions(-)

diff --git a/apps/block_scout_web/assets/package-lock.json b/apps/block_scout_web/assets/package-lock.json
index 584c2c8a4936..bd78762e25e9 100644
--- a/apps/block_scout_web/assets/package-lock.json
+++ b/apps/block_scout_web/assets/package-lock.json
@@ -85,7 +85,7 @@
         "eslint-plugin-promise": "^6.1.1",
         "file-loader": "^6.2.0",
         "jest": "^29.6.1",
-        "jest-environment-jsdom": "^29.6.1",
+        "jest-environment-jsdom": "^29.6.2",
         "mini-css-extract-plugin": "^2.7.6",
         "postcss": "^8.4.27",
         "postcss-loader": "^7.3.3",
@@ -2804,15 +2804,15 @@
       }
     },
     "node_modules/@jest/environment": {
-      "version": "29.6.1",
-      "resolved": "https://registry.npmjs.org/@jest/environment/-/environment-29.6.1.tgz",
-      "integrity": "sha512-RMMXx4ws+Gbvw3DfLSuo2cfQlK7IwGbpuEWXCqyYDcqYTI+9Ju3a5hDnXaxjNsa6uKh9PQF2v+qg+RLe63tz5A==",
+      "version": "29.6.2",
+      "resolved": "https://registry.npmjs.org/@jest/environment/-/environment-29.6.2.tgz",
+      "integrity": "sha512-AEcW43C7huGd/vogTddNNTDRpO6vQ2zaQNrttvWV18ArBx9Z56h7BIsXkNFJVOO4/kblWEQz30ckw0+L3izc+Q==",
       "dev": true,
       "dependencies": {
-        "@jest/fake-timers": "^29.6.1",
+        "@jest/fake-timers": "^29.6.2",
         "@jest/types": "^29.6.1",
         "@types/node": "*",
-        "jest-mock": "^29.6.1"
+        "jest-mock": "^29.6.2"
       },
       "engines": {
         "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
@@ -2844,17 +2844,17 @@
       }
     },
     "node_modules/@jest/fake-timers": {
-      "version": "29.6.1",
-      "resolved": "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-29.6.1.tgz",
-      "integrity": "sha512-RdgHgbXyosCDMVYmj7lLpUwXA4c69vcNzhrt69dJJdf8azUrpRh3ckFCaTPNjsEeRi27Cig0oKDGxy5j7hOgHg==",
+      "version": "29.6.2",
+      "resolved": "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-29.6.2.tgz",
+      "integrity": "sha512-euZDmIlWjm1Z0lJ1D0f7a0/y5Kh/koLFMUBE5SUYWrmy8oNhJpbTBDAP6CxKnadcMLDoDf4waRYCe35cH6G6PA==",
       "dev": true,
       "dependencies": {
         "@jest/types": "^29.6.1",
         "@sinonjs/fake-timers": "^10.0.2",
         "@types/node": "*",
-        "jest-message-util": "^29.6.1",
-        "jest-mock": "^29.6.1",
-        "jest-util": "^29.6.1"
+        "jest-message-util": "^29.6.2",
+        "jest-mock": "^29.6.2",
+        "jest-util": "^29.6.2"
       },
       "engines": {
         "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
@@ -10517,18 +10517,18 @@
       }
     },
     "node_modules/jest-environment-jsdom": {
-      "version": "29.6.1",
-      "resolved": "https://registry.npmjs.org/jest-environment-jsdom/-/jest-environment-jsdom-29.6.1.tgz",
-      "integrity": "sha512-PoY+yLaHzVRhVEjcVKSfJ7wXmJW4UqPYNhR05h7u/TK0ouf6DmRNZFBL/Z00zgQMyWGMBXn69/FmOvhEJu8cIw==",
+      "version": "29.6.2",
+      "resolved": "https://registry.npmjs.org/jest-environment-jsdom/-/jest-environment-jsdom-29.6.2.tgz",
+      "integrity": "sha512-7oa/+266AAEgkzae8i1awNEfTfjwawWKLpiw2XesZmaoVVj9u9t8JOYx18cG29rbPNtkUlZ8V4b5Jb36y/VxoQ==",
       "dev": true,
       "dependencies": {
-        "@jest/environment": "^29.6.1",
-        "@jest/fake-timers": "^29.6.1",
+        "@jest/environment": "^29.6.2",
+        "@jest/fake-timers": "^29.6.2",
         "@jest/types": "^29.6.1",
         "@types/jsdom": "^20.0.0",
         "@types/node": "*",
-        "jest-mock": "^29.6.1",
-        "jest-util": "^29.6.1",
+        "jest-mock": "^29.6.2",
+        "jest-util": "^29.6.2",
         "jsdom": "^20.0.0"
       },
       "engines": {
@@ -10732,9 +10732,9 @@
       }
     },
     "node_modules/jest-message-util": {
-      "version": "29.6.1",
-      "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-29.6.1.tgz",
-      "integrity": "sha512-KoAW2zAmNSd3Gk88uJ56qXUWbFk787QKmjjJVOjtGFmmGSZgDBrlIL4AfQw1xyMYPNVD7dNInfIbur9B2rd/wQ==",
+      "version": "29.6.2",
+      "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-29.6.2.tgz",
+      "integrity": "sha512-vnIGYEjoPSuRqV8W9t+Wow95SDp6KPX2Uf7EoeG9G99J2OVh7OSwpS4B6J0NfpEIpfkBNHlBZpA2rblEuEFhZQ==",
       "dev": true,
       "dependencies": {
         "@babel/code-frame": "^7.12.13",
@@ -10743,7 +10743,7 @@
         "chalk": "^4.0.0",
         "graceful-fs": "^4.2.9",
         "micromatch": "^4.0.4",
-        "pretty-format": "^29.6.1",
+        "pretty-format": "^29.6.2",
         "slash": "^3.0.0",
         "stack-utils": "^2.0.3"
       },
@@ -10822,14 +10822,14 @@
       }
     },
     "node_modules/jest-mock": {
-      "version": "29.6.1",
-      "resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-29.6.1.tgz",
-      "integrity": "sha512-brovyV9HBkjXAEdRooaTQK42n8usKoSRR3gihzUpYeV/vwqgSoNfrksO7UfSACnPmxasO/8TmHM3w9Hp3G1dgw==",
+      "version": "29.6.2",
+      "resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-29.6.2.tgz",
+      "integrity": "sha512-hoSv3lb3byzdKfwqCuT6uTscan471GUECqgNYykg6ob0yiAw3zYc7OrPnI9Qv8Wwoa4lC7AZ9hyS4AiIx5U2zg==",
       "dev": true,
       "dependencies": {
         "@jest/types": "^29.6.1",
         "@types/node": "*",
-        "jest-util": "^29.6.1"
+        "jest-util": "^29.6.2"
       },
       "engines": {
         "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
@@ -11327,9 +11327,9 @@
       }
     },
     "node_modules/jest-util": {
-      "version": "29.6.1",
-      "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-29.6.1.tgz",
-      "integrity": "sha512-NRFCcjc+/uO3ijUVyNOQJluf8PtGCe/W6cix36+M3cTFgiYqFOOW5MgN4JOOcvbUhcKTYVd1CvHz/LWi8d16Mg==",
+      "version": "29.6.2",
+      "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-29.6.2.tgz",
+      "integrity": "sha512-3eX1qb6L88lJNCFlEADKOkjpXJQyZRiavX1INZ4tRnrBVr2COd3RgcTLyUiEXMNBlDU/cgYq6taUS0fExrWW4w==",
       "dev": true,
       "dependencies": {
         "@jest/types": "^29.6.1",
@@ -13994,9 +13994,9 @@
       }
     },
     "node_modules/pretty-format": {
-      "version": "29.6.1",
-      "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-29.6.1.tgz",
-      "integrity": "sha512-7jRj+yXO0W7e4/tSJKoR7HRIHLPPjtNaUGG2xxKQnGvPNRkgWcQ0AZX6P4KBRJN4FcTBWb3sa7DVUJmocYuoog==",
+      "version": "29.6.2",
+      "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-29.6.2.tgz",
+      "integrity": "sha512-1q0oC8eRveTg5nnBEWMXAU2qpv65Gnuf2eCQzSjxpWFkPaPARwqZZDGuNE0zPAZfTCHzIk3A8dIjwlQKKLphyg==",
       "dev": true,
       "dependencies": {
         "@jest/schemas": "^29.6.0",
@@ -19268,15 +19268,15 @@
       }
     },
     "@jest/environment": {
-      "version": "29.6.1",
-      "resolved": "https://registry.npmjs.org/@jest/environment/-/environment-29.6.1.tgz",
-      "integrity": "sha512-RMMXx4ws+Gbvw3DfLSuo2cfQlK7IwGbpuEWXCqyYDcqYTI+9Ju3a5hDnXaxjNsa6uKh9PQF2v+qg+RLe63tz5A==",
+      "version": "29.6.2",
+      "resolved": "https://registry.npmjs.org/@jest/environment/-/environment-29.6.2.tgz",
+      "integrity": "sha512-AEcW43C7huGd/vogTddNNTDRpO6vQ2zaQNrttvWV18ArBx9Z56h7BIsXkNFJVOO4/kblWEQz30ckw0+L3izc+Q==",
       "dev": true,
       "requires": {
-        "@jest/fake-timers": "^29.6.1",
+        "@jest/fake-timers": "^29.6.2",
         "@jest/types": "^29.6.1",
         "@types/node": "*",
-        "jest-mock": "^29.6.1"
+        "jest-mock": "^29.6.2"
       }
     },
     "@jest/expect": {
@@ -19299,17 +19299,17 @@
       }
     },
     "@jest/fake-timers": {
-      "version": "29.6.1",
-      "resolved": "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-29.6.1.tgz",
-      "integrity": "sha512-RdgHgbXyosCDMVYmj7lLpUwXA4c69vcNzhrt69dJJdf8azUrpRh3ckFCaTPNjsEeRi27Cig0oKDGxy5j7hOgHg==",
+      "version": "29.6.2",
+      "resolved": "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-29.6.2.tgz",
+      "integrity": "sha512-euZDmIlWjm1Z0lJ1D0f7a0/y5Kh/koLFMUBE5SUYWrmy8oNhJpbTBDAP6CxKnadcMLDoDf4waRYCe35cH6G6PA==",
       "dev": true,
       "requires": {
         "@jest/types": "^29.6.1",
         "@sinonjs/fake-timers": "^10.0.2",
         "@types/node": "*",
-        "jest-message-util": "^29.6.1",
-        "jest-mock": "^29.6.1",
-        "jest-util": "^29.6.1"
+        "jest-message-util": "^29.6.2",
+        "jest-mock": "^29.6.2",
+        "jest-util": "^29.6.2"
       }
     },
     "@jest/globals": {
@@ -25270,18 +25270,18 @@
       }
     },
     "jest-environment-jsdom": {
-      "version": "29.6.1",
-      "resolved": "https://registry.npmjs.org/jest-environment-jsdom/-/jest-environment-jsdom-29.6.1.tgz",
-      "integrity": "sha512-PoY+yLaHzVRhVEjcVKSfJ7wXmJW4UqPYNhR05h7u/TK0ouf6DmRNZFBL/Z00zgQMyWGMBXn69/FmOvhEJu8cIw==",
+      "version": "29.6.2",
+      "resolved": "https://registry.npmjs.org/jest-environment-jsdom/-/jest-environment-jsdom-29.6.2.tgz",
+      "integrity": "sha512-7oa/+266AAEgkzae8i1awNEfTfjwawWKLpiw2XesZmaoVVj9u9t8JOYx18cG29rbPNtkUlZ8V4b5Jb36y/VxoQ==",
       "dev": true,
       "requires": {
-        "@jest/environment": "^29.6.1",
-        "@jest/fake-timers": "^29.6.1",
+        "@jest/environment": "^29.6.2",
+        "@jest/fake-timers": "^29.6.2",
         "@jest/types": "^29.6.1",
         "@types/jsdom": "^20.0.0",
         "@types/node": "*",
-        "jest-mock": "^29.6.1",
-        "jest-util": "^29.6.1",
+        "jest-mock": "^29.6.2",
+        "jest-util": "^29.6.2",
         "jsdom": "^20.0.0"
       }
     },
@@ -25428,9 +25428,9 @@
       }
     },
     "jest-message-util": {
-      "version": "29.6.1",
-      "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-29.6.1.tgz",
-      "integrity": "sha512-KoAW2zAmNSd3Gk88uJ56qXUWbFk787QKmjjJVOjtGFmmGSZgDBrlIL4AfQw1xyMYPNVD7dNInfIbur9B2rd/wQ==",
+      "version": "29.6.2",
+      "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-29.6.2.tgz",
+      "integrity": "sha512-vnIGYEjoPSuRqV8W9t+Wow95SDp6KPX2Uf7EoeG9G99J2OVh7OSwpS4B6J0NfpEIpfkBNHlBZpA2rblEuEFhZQ==",
       "dev": true,
       "requires": {
         "@babel/code-frame": "^7.12.13",
@@ -25439,7 +25439,7 @@
         "chalk": "^4.0.0",
         "graceful-fs": "^4.2.9",
         "micromatch": "^4.0.4",
-        "pretty-format": "^29.6.1",
+        "pretty-format": "^29.6.2",
         "slash": "^3.0.0",
         "stack-utils": "^2.0.3"
       },
@@ -25496,14 +25496,14 @@
       }
     },
     "jest-mock": {
-      "version": "29.6.1",
-      "resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-29.6.1.tgz",
-      "integrity": "sha512-brovyV9HBkjXAEdRooaTQK42n8usKoSRR3gihzUpYeV/vwqgSoNfrksO7UfSACnPmxasO/8TmHM3w9Hp3G1dgw==",
+      "version": "29.6.2",
+      "resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-29.6.2.tgz",
+      "integrity": "sha512-hoSv3lb3byzdKfwqCuT6uTscan471GUECqgNYykg6ob0yiAw3zYc7OrPnI9Qv8Wwoa4lC7AZ9hyS4AiIx5U2zg==",
       "dev": true,
       "requires": {
         "@jest/types": "^29.6.1",
         "@types/node": "*",
-        "jest-util": "^29.6.1"
+        "jest-util": "^29.6.2"
       }
     },
     "jest-pnp-resolver": {
@@ -25881,9 +25881,9 @@
       }
     },
     "jest-util": {
-      "version": "29.6.1",
-      "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-29.6.1.tgz",
-      "integrity": "sha512-NRFCcjc+/uO3ijUVyNOQJluf8PtGCe/W6cix36+M3cTFgiYqFOOW5MgN4JOOcvbUhcKTYVd1CvHz/LWi8d16Mg==",
+      "version": "29.6.2",
+      "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-29.6.2.tgz",
+      "integrity": "sha512-3eX1qb6L88lJNCFlEADKOkjpXJQyZRiavX1INZ4tRnrBVr2COd3RgcTLyUiEXMNBlDU/cgYq6taUS0fExrWW4w==",
       "dev": true,
       "requires": {
         "@jest/types": "^29.6.1",
@@ -27883,9 +27883,9 @@
       "dev": true
     },
     "pretty-format": {
-      "version": "29.6.1",
-      "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-29.6.1.tgz",
-      "integrity": "sha512-7jRj+yXO0W7e4/tSJKoR7HRIHLPPjtNaUGG2xxKQnGvPNRkgWcQ0AZX6P4KBRJN4FcTBWb3sa7DVUJmocYuoog==",
+      "version": "29.6.2",
+      "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-29.6.2.tgz",
+      "integrity": "sha512-1q0oC8eRveTg5nnBEWMXAU2qpv65Gnuf2eCQzSjxpWFkPaPARwqZZDGuNE0zPAZfTCHzIk3A8dIjwlQKKLphyg==",
       "dev": true,
       "requires": {
         "@jest/schemas": "^29.6.0",
diff --git a/apps/block_scout_web/assets/package.json b/apps/block_scout_web/assets/package.json
index c6d74ce6c50a..cf1dbc63f97a 100644
--- a/apps/block_scout_web/assets/package.json
+++ b/apps/block_scout_web/assets/package.json
@@ -97,7 +97,7 @@
     "eslint-plugin-promise": "^6.1.1",
     "file-loader": "^6.2.0",
     "jest": "^29.6.1",
-    "jest-environment-jsdom": "^29.6.1",
+    "jest-environment-jsdom": "^29.6.2",
     "mini-css-extract-plugin": "^2.7.6",
     "postcss": "^8.4.27",
     "postcss-loader": "^7.3.3",

From a438b5a6e705000a5d8ae8119a8203df7c9a0244 Mon Sep 17 00:00:00 2001
From: Viktor Baranov <baranov.viktor.27@gmail.com>
Date: Fri, 28 Jul 2023 14:06:49 +0300
Subject: [PATCH 240/909] Fix eth_getLogs API endpoint

---
 CHANGELOG.md                                 | 1 +
 apps/explorer/lib/explorer/eth_rpc.ex        | 5 +----
 apps/explorer/lib/explorer/etherscan/logs.ex | 8 +++-----
 3 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7e63f5eec164..a537a513035b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,7 @@
 ### Fixes
 
 - [#8040](https://github.com/blockscout/blockscout/pull/8040) - Resolve issue with Docker image for Mac M1/M2
+- [#8060](https://github.com/blockscout/blockscout/pull/8060) - Fix eth_getLogs API endpoint
 
 ### Chore
 
diff --git a/apps/explorer/lib/explorer/eth_rpc.ex b/apps/explorer/lib/explorer/eth_rpc.ex
index ed7e6830802b..889fdabbba6e 100644
--- a/apps/explorer/lib/explorer/eth_rpc.ex
+++ b/apps/explorer/lib/explorer/eth_rpc.ex
@@ -296,17 +296,14 @@ defmodule Explorer.EthRPC do
   defp paging_options(%{
          "paging_options" => %{
            "logIndex" => log_index,
-           "transactionIndex" => transaction_index,
            "blockNumber" => block_number
          }
-       })
-       when is_integer(transaction_index) do
+       }) do
     with {:ok, parsed_block_number} <- to_number(block_number, "invalid block number"),
          {:ok, parsed_log_index} <- to_number(log_index, "invalid log index") do
       {:ok,
        %{
          log_index: parsed_log_index,
-         transaction_index: transaction_index,
          block_number: parsed_block_number
        }}
     end
diff --git a/apps/explorer/lib/explorer/etherscan/logs.ex b/apps/explorer/lib/explorer/etherscan/logs.ex
index 006c0a2e191b..c7ae91e34732 100644
--- a/apps/explorer/lib/explorer/etherscan/logs.ex
+++ b/apps/explorer/lib/explorer/etherscan/logs.ex
@@ -248,16 +248,14 @@ defmodule Explorer.Etherscan.Logs do
 
   defp where_multiple_topics_match(query, _, _, _), do: query
 
-  defp page_logs(query, %{block_number: nil, transaction_index: nil, log_index: nil}) do
+  defp page_logs(query, %{block_number: nil, log_index: nil}) do
     query
   end
 
-  defp page_logs(query, %{block_number: block_number, transaction_index: transaction_index, log_index: log_index}) do
+  defp page_logs(query, %{block_number: block_number, log_index: log_index}) do
     from(
       data in query,
-      where:
-        data.index > ^log_index and data.block_number >= ^block_number and
-          data.transaction_index >= ^transaction_index
+      where: data.index > ^log_index and data.block_number >= ^block_number
     )
   end
 

From b95f2fc76dca1efa318e0e4ed55525e1ddc30a10 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 28 Jul 2023 15:03:53 +0000
Subject: [PATCH 241/909] Bump jest from 29.6.1 to 29.6.2 in
 /apps/block_scout_web/assets

Bumps [jest](https://github.com/facebook/jest/tree/HEAD/packages/jest) from 29.6.1 to 29.6.2.
- [Release notes](https://github.com/facebook/jest/releases)
- [Changelog](https://github.com/jestjs/jest/blob/main/CHANGELOG.md)
- [Commits](https://github.com/facebook/jest/commits/v29.6.2/packages/jest)

---
updated-dependencies:
- dependency-name: jest
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 apps/block_scout_web/assets/package-lock.json | 979 +++++++++---------
 apps/block_scout_web/assets/package.json      |   2 +-
 2 files changed, 501 insertions(+), 480 deletions(-)

diff --git a/apps/block_scout_web/assets/package-lock.json b/apps/block_scout_web/assets/package-lock.json
index a680a41f4127..1dc5833edd14 100644
--- a/apps/block_scout_web/assets/package-lock.json
+++ b/apps/block_scout_web/assets/package-lock.json
@@ -84,7 +84,7 @@
         "eslint-plugin-node": "^11.1.0",
         "eslint-plugin-promise": "^6.1.1",
         "file-loader": "^6.2.0",
-        "jest": "^29.6.1",
+        "jest": "^29.6.2",
         "jest-environment-jsdom": "^29.6.2",
         "mini-css-extract-plugin": "^2.7.6",
         "postcss": "^8.4.27",
@@ -2600,16 +2600,16 @@
       }
     },
     "node_modules/@jest/console": {
-      "version": "29.6.1",
-      "resolved": "https://registry.npmjs.org/@jest/console/-/console-29.6.1.tgz",
-      "integrity": "sha512-Aj772AYgwTSr5w8qnyoJ0eDYvN6bMsH3ORH1ivMotrInHLKdUz6BDlaEXHdM6kODaBIkNIyQGzsMvRdOv7VG7Q==",
+      "version": "29.6.2",
+      "resolved": "https://registry.npmjs.org/@jest/console/-/console-29.6.2.tgz",
+      "integrity": "sha512-0N0yZof5hi44HAR2pPS+ikJ3nzKNoZdVu8FffRf3wy47I7Dm7etk/3KetMdRUqzVd16V4O2m2ISpNTbnIuqy1w==",
       "dev": true,
       "dependencies": {
         "@jest/types": "^29.6.1",
         "@types/node": "*",
         "chalk": "^4.0.0",
-        "jest-message-util": "^29.6.1",
-        "jest-util": "^29.6.1",
+        "jest-message-util": "^29.6.2",
+        "jest-util": "^29.6.2",
         "slash": "^3.0.0"
       },
       "engines": {
@@ -2687,15 +2687,15 @@
       }
     },
     "node_modules/@jest/core": {
-      "version": "29.6.1",
-      "resolved": "https://registry.npmjs.org/@jest/core/-/core-29.6.1.tgz",
-      "integrity": "sha512-CcowHypRSm5oYQ1obz1wfvkjZZ2qoQlrKKvlfPwh5jUXVU12TWr2qMeH8chLMuTFzHh5a1g2yaqlqDICbr+ukQ==",
+      "version": "29.6.2",
+      "resolved": "https://registry.npmjs.org/@jest/core/-/core-29.6.2.tgz",
+      "integrity": "sha512-Oj+5B+sDMiMWLhPFF+4/DvHOf+U10rgvCLGPHP8Xlsy/7QxS51aU/eBngudHlJXnaWD5EohAgJ4js+T6pa+zOg==",
       "dev": true,
       "dependencies": {
-        "@jest/console": "^29.6.1",
-        "@jest/reporters": "^29.6.1",
-        "@jest/test-result": "^29.6.1",
-        "@jest/transform": "^29.6.1",
+        "@jest/console": "^29.6.2",
+        "@jest/reporters": "^29.6.2",
+        "@jest/test-result": "^29.6.2",
+        "@jest/transform": "^29.6.2",
         "@jest/types": "^29.6.1",
         "@types/node": "*",
         "ansi-escapes": "^4.2.1",
@@ -2704,20 +2704,20 @@
         "exit": "^0.1.2",
         "graceful-fs": "^4.2.9",
         "jest-changed-files": "^29.5.0",
-        "jest-config": "^29.6.1",
-        "jest-haste-map": "^29.6.1",
-        "jest-message-util": "^29.6.1",
+        "jest-config": "^29.6.2",
+        "jest-haste-map": "^29.6.2",
+        "jest-message-util": "^29.6.2",
         "jest-regex-util": "^29.4.3",
-        "jest-resolve": "^29.6.1",
-        "jest-resolve-dependencies": "^29.6.1",
-        "jest-runner": "^29.6.1",
-        "jest-runtime": "^29.6.1",
-        "jest-snapshot": "^29.6.1",
-        "jest-util": "^29.6.1",
-        "jest-validate": "^29.6.1",
-        "jest-watcher": "^29.6.1",
+        "jest-resolve": "^29.6.2",
+        "jest-resolve-dependencies": "^29.6.2",
+        "jest-runner": "^29.6.2",
+        "jest-runtime": "^29.6.2",
+        "jest-snapshot": "^29.6.2",
+        "jest-util": "^29.6.2",
+        "jest-validate": "^29.6.2",
+        "jest-watcher": "^29.6.2",
         "micromatch": "^4.0.4",
-        "pretty-format": "^29.6.1",
+        "pretty-format": "^29.6.2",
         "slash": "^3.0.0",
         "strip-ansi": "^6.0.0"
       },
@@ -2819,22 +2819,22 @@
       }
     },
     "node_modules/@jest/expect": {
-      "version": "29.6.1",
-      "resolved": "https://registry.npmjs.org/@jest/expect/-/expect-29.6.1.tgz",
-      "integrity": "sha512-N5xlPrAYaRNyFgVf2s9Uyyvr795jnB6rObuPx4QFvNJz8aAjpZUDfO4bh5G/xuplMID8PrnuF1+SfSyDxhsgYg==",
+      "version": "29.6.2",
+      "resolved": "https://registry.npmjs.org/@jest/expect/-/expect-29.6.2.tgz",
+      "integrity": "sha512-m6DrEJxVKjkELTVAztTLyS/7C92Y2b0VYqmDROYKLLALHn8T/04yPs70NADUYPrV3ruI+H3J0iUIuhkjp7vkfg==",
       "dev": true,
       "dependencies": {
-        "expect": "^29.6.1",
-        "jest-snapshot": "^29.6.1"
+        "expect": "^29.6.2",
+        "jest-snapshot": "^29.6.2"
       },
       "engines": {
         "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
     "node_modules/@jest/expect-utils": {
-      "version": "29.6.1",
-      "resolved": "https://registry.npmjs.org/@jest/expect-utils/-/expect-utils-29.6.1.tgz",
-      "integrity": "sha512-o319vIf5pEMx0LmzSxxkYYxo4wrRLKHq9dP1yJU7FoPTB0LfAKSz8SWD6D/6U3v/O52t9cF5t+MeJiRsfk7zMw==",
+      "version": "29.6.2",
+      "resolved": "https://registry.npmjs.org/@jest/expect-utils/-/expect-utils-29.6.2.tgz",
+      "integrity": "sha512-6zIhM8go3RV2IG4aIZaZbxwpOzz3ZiM23oxAlkquOIole+G6TrbeXnykxWYlqF7kz2HlBjdKtca20x9atkEQYg==",
       "dev": true,
       "dependencies": {
         "jest-get-type": "^29.4.3"
@@ -2861,30 +2861,30 @@
       }
     },
     "node_modules/@jest/globals": {
-      "version": "29.6.1",
-      "resolved": "https://registry.npmjs.org/@jest/globals/-/globals-29.6.1.tgz",
-      "integrity": "sha512-2VjpaGy78JY9n9370H8zGRCFbYVWwjY6RdDMhoJHa1sYfwe6XM/azGN0SjY8kk7BOZApIejQ1BFPyH7FPG0w3A==",
+      "version": "29.6.2",
+      "resolved": "https://registry.npmjs.org/@jest/globals/-/globals-29.6.2.tgz",
+      "integrity": "sha512-cjuJmNDjs6aMijCmSa1g2TNG4Lby/AeU7/02VtpW+SLcZXzOLK2GpN2nLqcFjmhy3B3AoPeQVx7BnyOf681bAw==",
       "dev": true,
       "dependencies": {
-        "@jest/environment": "^29.6.1",
-        "@jest/expect": "^29.6.1",
+        "@jest/environment": "^29.6.2",
+        "@jest/expect": "^29.6.2",
         "@jest/types": "^29.6.1",
-        "jest-mock": "^29.6.1"
+        "jest-mock": "^29.6.2"
       },
       "engines": {
         "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
     "node_modules/@jest/reporters": {
-      "version": "29.6.1",
-      "resolved": "https://registry.npmjs.org/@jest/reporters/-/reporters-29.6.1.tgz",
-      "integrity": "sha512-9zuaI9QKr9JnoZtFQlw4GREQbxgmNYXU6QuWtmuODvk5nvPUeBYapVR/VYMyi2WSx3jXTLJTJji8rN6+Cm4+FA==",
+      "version": "29.6.2",
+      "resolved": "https://registry.npmjs.org/@jest/reporters/-/reporters-29.6.2.tgz",
+      "integrity": "sha512-sWtijrvIav8LgfJZlrGCdN0nP2EWbakglJY49J1Y5QihcQLfy7ovyxxjJBRXMNltgt4uPtEcFmIMbVshEDfFWw==",
       "dev": true,
       "dependencies": {
         "@bcoe/v8-coverage": "^0.2.3",
-        "@jest/console": "^29.6.1",
-        "@jest/test-result": "^29.6.1",
-        "@jest/transform": "^29.6.1",
+        "@jest/console": "^29.6.2",
+        "@jest/test-result": "^29.6.2",
+        "@jest/transform": "^29.6.2",
         "@jest/types": "^29.6.1",
         "@jridgewell/trace-mapping": "^0.3.18",
         "@types/node": "*",
@@ -2898,9 +2898,9 @@
         "istanbul-lib-report": "^3.0.0",
         "istanbul-lib-source-maps": "^4.0.0",
         "istanbul-reports": "^3.1.3",
-        "jest-message-util": "^29.6.1",
-        "jest-util": "^29.6.1",
-        "jest-worker": "^29.6.1",
+        "jest-message-util": "^29.6.2",
+        "jest-util": "^29.6.2",
+        "jest-worker": "^29.6.2",
         "slash": "^3.0.0",
         "string-length": "^4.0.1",
         "strip-ansi": "^6.0.0",
@@ -2977,13 +2977,13 @@
       }
     },
     "node_modules/@jest/reporters/node_modules/jest-worker": {
-      "version": "29.6.1",
-      "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-29.6.1.tgz",
-      "integrity": "sha512-U+Wrbca7S8ZAxAe9L6nb6g8kPdia5hj32Puu5iOqBCMTMWFHXuK6dOV2IFrpedbTV8fjMFLdWNttQTBL6u2MRA==",
+      "version": "29.6.2",
+      "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-29.6.2.tgz",
+      "integrity": "sha512-l3ccBOabTdkng8I/ORCkADz4eSMKejTYv1vB/Z83UiubqhC1oQ5Li6dWCyqOIvSifGjUBxuvxvlm6KGK2DtuAQ==",
       "dev": true,
       "dependencies": {
         "@types/node": "*",
-        "jest-util": "^29.6.1",
+        "jest-util": "^29.6.2",
         "merge-stream": "^2.0.0",
         "supports-color": "^8.0.0"
       },
@@ -3045,12 +3045,12 @@
       }
     },
     "node_modules/@jest/test-result": {
-      "version": "29.6.1",
-      "resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-29.6.1.tgz",
-      "integrity": "sha512-Ynr13ZRcpX6INak0TPUukU8GWRfm/vAytE3JbJNGAvINySWYdfE7dGZMbk36oVuK4CigpbhMn8eg1dixZ7ZJOw==",
+      "version": "29.6.2",
+      "resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-29.6.2.tgz",
+      "integrity": "sha512-3VKFXzcV42EYhMCsJQURptSqnyjqCGbtLuX5Xxb6Pm6gUf1wIRIl+mandIRGJyWKgNKYF9cnstti6Ls5ekduqw==",
       "dev": true,
       "dependencies": {
-        "@jest/console": "^29.6.1",
+        "@jest/console": "^29.6.2",
         "@jest/types": "^29.6.1",
         "@types/istanbul-lib-coverage": "^2.0.0",
         "collect-v8-coverage": "^1.0.0"
@@ -3060,14 +3060,14 @@
       }
     },
     "node_modules/@jest/test-sequencer": {
-      "version": "29.6.1",
-      "resolved": "https://registry.npmjs.org/@jest/test-sequencer/-/test-sequencer-29.6.1.tgz",
-      "integrity": "sha512-oBkC36PCDf/wb6dWeQIhaviU0l5u6VCsXa119yqdUosYAt7/FbQU2M2UoziO3igj/HBDEgp57ONQ3fm0v9uyyg==",
+      "version": "29.6.2",
+      "resolved": "https://registry.npmjs.org/@jest/test-sequencer/-/test-sequencer-29.6.2.tgz",
+      "integrity": "sha512-GVYi6PfPwVejO7slw6IDO0qKVum5jtrJ3KoLGbgBWyr2qr4GaxFV6su+ZAjdTX75Sr1DkMFRk09r2ZVa+wtCGw==",
       "dev": true,
       "dependencies": {
-        "@jest/test-result": "^29.6.1",
+        "@jest/test-result": "^29.6.2",
         "graceful-fs": "^4.2.9",
-        "jest-haste-map": "^29.6.1",
+        "jest-haste-map": "^29.6.2",
         "slash": "^3.0.0"
       },
       "engines": {
@@ -3075,9 +3075,9 @@
       }
     },
     "node_modules/@jest/transform": {
-      "version": "29.6.1",
-      "resolved": "https://registry.npmjs.org/@jest/transform/-/transform-29.6.1.tgz",
-      "integrity": "sha512-URnTneIU3ZjRSaf906cvf6Hpox3hIeJXRnz3VDSw5/X93gR8ycdfSIEy19FlVx8NFmpN7fe3Gb1xF+NjXaQLWg==",
+      "version": "29.6.2",
+      "resolved": "https://registry.npmjs.org/@jest/transform/-/transform-29.6.2.tgz",
+      "integrity": "sha512-ZqCqEISr58Ce3U+buNFJYUktLJZOggfyvR+bZMaiV1e8B1SIvJbwZMrYz3gx/KAPn9EXmOmN+uB08yLCjWkQQg==",
       "dev": true,
       "dependencies": {
         "@babel/core": "^7.11.6",
@@ -3088,9 +3088,9 @@
         "convert-source-map": "^2.0.0",
         "fast-json-stable-stringify": "^2.1.0",
         "graceful-fs": "^4.2.9",
-        "jest-haste-map": "^29.6.1",
+        "jest-haste-map": "^29.6.2",
         "jest-regex-util": "^29.4.3",
-        "jest-util": "^29.6.1",
+        "jest-util": "^29.6.2",
         "micromatch": "^4.0.4",
         "pirates": "^4.0.4",
         "slash": "^3.0.0",
@@ -3612,12 +3612,6 @@
         "@types/node": "*"
       }
     },
-    "node_modules/@types/prettier": {
-      "version": "2.7.3",
-      "resolved": "https://registry.npmjs.org/@types/prettier/-/prettier-2.7.3.tgz",
-      "integrity": "sha512-+68kP9yzs4LMp7VNh8gdzMSPZFL44MLGqiHWvttYJe+6qnuVr4Ek9wSBQoveqY/r+LwjCcU29kNVkidwim+kYA==",
-      "dev": true
-    },
     "node_modules/@types/responselike": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/@types/responselike/-/responselike-1.0.0.tgz",
@@ -4545,12 +4539,12 @@
       "integrity": "sha512-xh1Rl34h6Fi1DC2WWKfxUTVqRsNnr6LsKz2+hfwDxQJWmrx8+c7ylaqBMcHfl1U1r2dsifOvKX3LQuLNZ+XSvA=="
     },
     "node_modules/babel-jest": {
-      "version": "29.6.1",
-      "resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-29.6.1.tgz",
-      "integrity": "sha512-qu+3bdPEQC6KZSPz+4Fyjbga5OODNcp49j6GKzG1EKbkfyJBxEYGVUmVGpwCSeGouG52R4EgYMLb6p9YeEEQ4A==",
+      "version": "29.6.2",
+      "resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-29.6.2.tgz",
+      "integrity": "sha512-BYCzImLos6J3BH/+HvUCHG1dTf2MzmAB4jaVxHV+29RZLjR29XuYTmsf2sdDwkrb+FczkGo3kOhE7ga6sI0P4A==",
       "dev": true,
       "dependencies": {
-        "@jest/transform": "^29.6.1",
+        "@jest/transform": "^29.6.2",
         "@types/babel__core": "^7.1.14",
         "babel-plugin-istanbul": "^6.1.1",
         "babel-preset-jest": "^29.5.0",
@@ -6408,10 +6402,18 @@
       }
     },
     "node_modules/dedent": {
-      "version": "0.7.0",
-      "resolved": "https://registry.npmjs.org/dedent/-/dedent-0.7.0.tgz",
-      "integrity": "sha512-Q6fKUPqnAHAyhiUgFU7BUzLiv0kd8saH9al7tnu5Q/okj6dnupxyTgFIBjVzJATdfIAm9NAsvXNzjaKa+bxVyA==",
-      "dev": true
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/dedent/-/dedent-1.3.0.tgz",
+      "integrity": "sha512-7glNLfvdsMzZm3FpRY1CHuI2lbYDR+71YmrhmTZjYFD5pfT0ACgnGRdrrC9Mk2uICnzkcdelCx5at787UDGOvg==",
+      "dev": true,
+      "peerDependencies": {
+        "babel-plugin-macros": "^3.1.0"
+      },
+      "peerDependenciesMeta": {
+        "babel-plugin-macros": {
+          "optional": true
+        }
+      }
     },
     "node_modules/deep-eql": {
       "version": "3.0.1",
@@ -8275,17 +8277,17 @@
       }
     },
     "node_modules/expect": {
-      "version": "29.6.1",
-      "resolved": "https://registry.npmjs.org/expect/-/expect-29.6.1.tgz",
-      "integrity": "sha512-XEdDLonERCU1n9uR56/Stx9OqojaLAQtZf9PrCHH9Hl8YXiEIka3H4NXJ3NOIBmQJTg7+j7buh34PMHfJujc8g==",
+      "version": "29.6.2",
+      "resolved": "https://registry.npmjs.org/expect/-/expect-29.6.2.tgz",
+      "integrity": "sha512-iAErsLxJ8C+S02QbLAwgSGSezLQK+XXRDt8IuFXFpwCNw2ECmzZSmjKcCaFVp5VRMk+WAvz6h6jokzEzBFZEuA==",
       "dev": true,
       "dependencies": {
-        "@jest/expect-utils": "^29.6.1",
+        "@jest/expect-utils": "^29.6.2",
         "@types/node": "*",
         "jest-get-type": "^29.4.3",
-        "jest-matcher-utils": "^29.6.1",
-        "jest-message-util": "^29.6.1",
-        "jest-util": "^29.6.1"
+        "jest-matcher-utils": "^29.6.2",
+        "jest-message-util": "^29.6.2",
+        "jest-util": "^29.6.2"
       },
       "engines": {
         "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
@@ -9913,17 +9915,17 @@
       }
     },
     "node_modules/istanbul-lib-report": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz",
-      "integrity": "sha512-wcdi+uAKzfiGT2abPpKZ0hSU1rGQjUQnLvtY5MpQ7QCTahD3VODhcu4wcfY1YtkGaDD5yuydOLINXsfbus9ROw==",
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/istanbul-lib-report/-/istanbul-lib-report-3.0.1.tgz",
+      "integrity": "sha512-GCfE1mtsHGOELCU8e/Z7YWzpmybrx/+dSTfLrvY8qRmaY6zXTKWn6WQIjaAFw069icm6GVMNkgu0NzI4iPZUNw==",
       "dev": true,
       "dependencies": {
         "istanbul-lib-coverage": "^3.0.0",
-        "make-dir": "^3.0.0",
+        "make-dir": "^4.0.0",
         "supports-color": "^7.1.0"
       },
       "engines": {
-        "node": ">=8"
+        "node": ">=10"
       }
     },
     "node_modules/istanbul-lib-report/node_modules/has-flag": {
@@ -9962,9 +9964,9 @@
       }
     },
     "node_modules/istanbul-reports": {
-      "version": "3.1.5",
-      "resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-3.1.5.tgz",
-      "integrity": "sha512-nUsEMa9pBt/NOHqbcbeJEgqIlY/K7rVWUX6Lql2orY5e9roQOthbR3vtY4zzf2orPELg80fnxxk9zUyPlgwD1w==",
+      "version": "3.1.6",
+      "resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-3.1.6.tgz",
+      "integrity": "sha512-TLgnMkKg3iTDsQ9PbPTdpfAK2DzjF9mqUG7RMgcQl8oFjad8ob4laGxv5XV5U9MAfx8D6tSJiUyuAwzLicaxlg==",
       "dev": true,
       "dependencies": {
         "html-escaper": "^2.0.0",
@@ -9975,15 +9977,15 @@
       }
     },
     "node_modules/jest": {
-      "version": "29.6.1",
-      "resolved": "https://registry.npmjs.org/jest/-/jest-29.6.1.tgz",
-      "integrity": "sha512-Nirw5B4nn69rVUZtemCQhwxOBhm0nsp3hmtF4rzCeWD7BkjAXRIji7xWQfnTNbz9g0aVsBX6aZK3n+23LM6uDw==",
+      "version": "29.6.2",
+      "resolved": "https://registry.npmjs.org/jest/-/jest-29.6.2.tgz",
+      "integrity": "sha512-8eQg2mqFbaP7CwfsTpCxQ+sHzw1WuNWL5UUvjnWP4hx2riGz9fPSzYOaU5q8/GqWn1TfgZIVTqYJygbGbWAANg==",
       "dev": true,
       "dependencies": {
-        "@jest/core": "^29.6.1",
+        "@jest/core": "^29.6.2",
         "@jest/types": "^29.6.1",
         "import-local": "^3.0.2",
-        "jest-cli": "^29.6.1"
+        "jest-cli": "^29.6.2"
       },
       "bin": {
         "jest": "bin/jest.js"
@@ -10014,28 +10016,28 @@
       }
     },
     "node_modules/jest-circus": {
-      "version": "29.6.1",
-      "resolved": "https://registry.npmjs.org/jest-circus/-/jest-circus-29.6.1.tgz",
-      "integrity": "sha512-tPbYLEiBU4MYAL2XoZme/bgfUeotpDBd81lgHLCbDZZFaGmECk0b+/xejPFtmiBP87GgP/y4jplcRpbH+fgCzQ==",
+      "version": "29.6.2",
+      "resolved": "https://registry.npmjs.org/jest-circus/-/jest-circus-29.6.2.tgz",
+      "integrity": "sha512-G9mN+KOYIUe2sB9kpJkO9Bk18J4dTDArNFPwoZ7WKHKel55eKIS/u2bLthxgojwlf9NLCVQfgzM/WsOVvoC6Fw==",
       "dev": true,
       "dependencies": {
-        "@jest/environment": "^29.6.1",
-        "@jest/expect": "^29.6.1",
-        "@jest/test-result": "^29.6.1",
+        "@jest/environment": "^29.6.2",
+        "@jest/expect": "^29.6.2",
+        "@jest/test-result": "^29.6.2",
         "@jest/types": "^29.6.1",
         "@types/node": "*",
         "chalk": "^4.0.0",
         "co": "^4.6.0",
-        "dedent": "^0.7.0",
+        "dedent": "^1.0.0",
         "is-generator-fn": "^2.0.0",
-        "jest-each": "^29.6.1",
-        "jest-matcher-utils": "^29.6.1",
-        "jest-message-util": "^29.6.1",
-        "jest-runtime": "^29.6.1",
-        "jest-snapshot": "^29.6.1",
-        "jest-util": "^29.6.1",
+        "jest-each": "^29.6.2",
+        "jest-matcher-utils": "^29.6.2",
+        "jest-message-util": "^29.6.2",
+        "jest-runtime": "^29.6.2",
+        "jest-snapshot": "^29.6.2",
+        "jest-util": "^29.6.2",
         "p-limit": "^3.1.0",
-        "pretty-format": "^29.6.1",
+        "pretty-format": "^29.6.2",
         "pure-rand": "^6.0.0",
         "slash": "^3.0.0",
         "stack-utils": "^2.0.3"
@@ -10115,21 +10117,21 @@
       }
     },
     "node_modules/jest-cli": {
-      "version": "29.6.1",
-      "resolved": "https://registry.npmjs.org/jest-cli/-/jest-cli-29.6.1.tgz",
-      "integrity": "sha512-607dSgTA4ODIN6go9w6xY3EYkyPFGicx51a69H7yfvt7lN53xNswEVLovq+E77VsTRi5fWprLH0yl4DJgE8Ing==",
+      "version": "29.6.2",
+      "resolved": "https://registry.npmjs.org/jest-cli/-/jest-cli-29.6.2.tgz",
+      "integrity": "sha512-TT6O247v6dCEX2UGHGyflMpxhnrL0DNqP2fRTKYm3nJJpCTfXX3GCMQPGFjXDoj0i5/Blp3jriKXFgdfmbYB6Q==",
       "dev": true,
       "dependencies": {
-        "@jest/core": "^29.6.1",
-        "@jest/test-result": "^29.6.1",
+        "@jest/core": "^29.6.2",
+        "@jest/test-result": "^29.6.2",
         "@jest/types": "^29.6.1",
         "chalk": "^4.0.0",
         "exit": "^0.1.2",
         "graceful-fs": "^4.2.9",
         "import-local": "^3.0.2",
-        "jest-config": "^29.6.1",
-        "jest-util": "^29.6.1",
-        "jest-validate": "^29.6.1",
+        "jest-config": "^29.6.2",
+        "jest-util": "^29.6.2",
+        "jest-validate": "^29.6.2",
         "prompts": "^2.0.1",
         "yargs": "^17.3.1"
       },
@@ -10219,31 +10221,31 @@
       }
     },
     "node_modules/jest-config": {
-      "version": "29.6.1",
-      "resolved": "https://registry.npmjs.org/jest-config/-/jest-config-29.6.1.tgz",
-      "integrity": "sha512-XdjYV2fy2xYixUiV2Wc54t3Z4oxYPAELUzWnV6+mcbq0rh742X2p52pii5A3oeRzYjLnQxCsZmp0qpI6klE2cQ==",
+      "version": "29.6.2",
+      "resolved": "https://registry.npmjs.org/jest-config/-/jest-config-29.6.2.tgz",
+      "integrity": "sha512-VxwFOC8gkiJbuodG9CPtMRjBUNZEHxwfQXmIudSTzFWxaci3Qub1ddTRbFNQlD/zUeaifLndh/eDccFX4wCMQw==",
       "dev": true,
       "dependencies": {
         "@babel/core": "^7.11.6",
-        "@jest/test-sequencer": "^29.6.1",
+        "@jest/test-sequencer": "^29.6.2",
         "@jest/types": "^29.6.1",
-        "babel-jest": "^29.6.1",
+        "babel-jest": "^29.6.2",
         "chalk": "^4.0.0",
         "ci-info": "^3.2.0",
         "deepmerge": "^4.2.2",
         "glob": "^7.1.3",
         "graceful-fs": "^4.2.9",
-        "jest-circus": "^29.6.1",
-        "jest-environment-node": "^29.6.1",
+        "jest-circus": "^29.6.2",
+        "jest-environment-node": "^29.6.2",
         "jest-get-type": "^29.4.3",
         "jest-regex-util": "^29.4.3",
-        "jest-resolve": "^29.6.1",
-        "jest-runner": "^29.6.1",
-        "jest-util": "^29.6.1",
-        "jest-validate": "^29.6.1",
+        "jest-resolve": "^29.6.2",
+        "jest-runner": "^29.6.2",
+        "jest-util": "^29.6.2",
+        "jest-validate": "^29.6.2",
         "micromatch": "^4.0.4",
         "parse-json": "^5.2.0",
-        "pretty-format": "^29.6.1",
+        "pretty-format": "^29.6.2",
         "slash": "^3.0.0",
         "strip-json-comments": "^3.1.1"
       },
@@ -10334,15 +10336,15 @@
       }
     },
     "node_modules/jest-diff": {
-      "version": "29.6.1",
-      "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-29.6.1.tgz",
-      "integrity": "sha512-FsNCvinvl8oVxpNLttNQX7FAq7vR+gMDGj90tiP7siWw1UdakWUGqrylpsYrpvj908IYckm5Y0Q7azNAozU1Kg==",
+      "version": "29.6.2",
+      "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-29.6.2.tgz",
+      "integrity": "sha512-t+ST7CB9GX5F2xKwhwCf0TAR17uNDiaPTZnVymP9lw0lssa9vG+AFyDZoeIHStU3WowFFwT+ky+er0WVl2yGhA==",
       "dev": true,
       "dependencies": {
         "chalk": "^4.0.0",
         "diff-sequences": "^29.4.3",
         "jest-get-type": "^29.4.3",
-        "pretty-format": "^29.6.1"
+        "pretty-format": "^29.6.2"
       },
       "engines": {
         "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
@@ -10431,16 +10433,16 @@
       }
     },
     "node_modules/jest-each": {
-      "version": "29.6.1",
-      "resolved": "https://registry.npmjs.org/jest-each/-/jest-each-29.6.1.tgz",
-      "integrity": "sha512-n5eoj5eiTHpKQCAVcNTT7DRqeUmJ01hsAL0Q1SMiBHcBcvTKDELixQOGMCpqhbIuTcfC4kMfSnpmDqRgRJcLNQ==",
+      "version": "29.6.2",
+      "resolved": "https://registry.npmjs.org/jest-each/-/jest-each-29.6.2.tgz",
+      "integrity": "sha512-MsrsqA0Ia99cIpABBc3izS1ZYoYfhIy0NNWqPSE0YXbQjwchyt6B1HD2khzyPe1WiJA7hbxXy77ZoUQxn8UlSw==",
       "dev": true,
       "dependencies": {
         "@jest/types": "^29.6.1",
         "chalk": "^4.0.0",
         "jest-get-type": "^29.4.3",
-        "jest-util": "^29.6.1",
-        "pretty-format": "^29.6.1"
+        "jest-util": "^29.6.2",
+        "pretty-format": "^29.6.2"
       },
       "engines": {
         "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
@@ -10544,17 +10546,17 @@
       }
     },
     "node_modules/jest-environment-node": {
-      "version": "29.6.1",
-      "resolved": "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-29.6.1.tgz",
-      "integrity": "sha512-ZNIfAiE+foBog24W+2caIldl4Irh8Lx1PUhg/GZ0odM1d/h2qORAsejiFc7zb+SEmYPn1yDZzEDSU5PmDkmVLQ==",
+      "version": "29.6.2",
+      "resolved": "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-29.6.2.tgz",
+      "integrity": "sha512-YGdFeZ3T9a+/612c5mTQIllvWkddPbYcN2v95ZH24oWMbGA4GGS2XdIF92QMhUhvrjjuQWYgUGW2zawOyH63MQ==",
       "dev": true,
       "dependencies": {
-        "@jest/environment": "^29.6.1",
-        "@jest/fake-timers": "^29.6.1",
+        "@jest/environment": "^29.6.2",
+        "@jest/fake-timers": "^29.6.2",
         "@jest/types": "^29.6.1",
         "@types/node": "*",
-        "jest-mock": "^29.6.1",
-        "jest-util": "^29.6.1"
+        "jest-mock": "^29.6.2",
+        "jest-util": "^29.6.2"
       },
       "engines": {
         "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
@@ -10570,9 +10572,9 @@
       }
     },
     "node_modules/jest-haste-map": {
-      "version": "29.6.1",
-      "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-29.6.1.tgz",
-      "integrity": "sha512-0m7f9PZXxOCk1gRACiVgX85knUKPKLPg4oRCjLoqIm9brTHXaorMA0JpmtmVkQiT8nmXyIVoZd/nnH1cfC33ig==",
+      "version": "29.6.2",
+      "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-29.6.2.tgz",
+      "integrity": "sha512-+51XleTDAAysvU8rT6AnS1ZJ+WHVNqhj1k6nTvN2PYP+HjU3kqlaKQ1Lnw3NYW3bm2r8vq82X0Z1nDDHZMzHVA==",
       "dev": true,
       "dependencies": {
         "@jest/types": "^29.6.1",
@@ -10582,8 +10584,8 @@
         "fb-watchman": "^2.0.0",
         "graceful-fs": "^4.2.9",
         "jest-regex-util": "^29.4.3",
-        "jest-util": "^29.6.1",
-        "jest-worker": "^29.6.1",
+        "jest-util": "^29.6.2",
+        "jest-worker": "^29.6.2",
         "micromatch": "^4.0.4",
         "walker": "^1.0.8"
       },
@@ -10604,13 +10606,13 @@
       }
     },
     "node_modules/jest-haste-map/node_modules/jest-worker": {
-      "version": "29.6.1",
-      "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-29.6.1.tgz",
-      "integrity": "sha512-U+Wrbca7S8ZAxAe9L6nb6g8kPdia5hj32Puu5iOqBCMTMWFHXuK6dOV2IFrpedbTV8fjMFLdWNttQTBL6u2MRA==",
+      "version": "29.6.2",
+      "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-29.6.2.tgz",
+      "integrity": "sha512-l3ccBOabTdkng8I/ORCkADz4eSMKejTYv1vB/Z83UiubqhC1oQ5Li6dWCyqOIvSifGjUBxuvxvlm6KGK2DtuAQ==",
       "dev": true,
       "dependencies": {
         "@types/node": "*",
-        "jest-util": "^29.6.1",
+        "jest-util": "^29.6.2",
         "merge-stream": "^2.0.0",
         "supports-color": "^8.0.0"
       },
@@ -10634,28 +10636,28 @@
       }
     },
     "node_modules/jest-leak-detector": {
-      "version": "29.6.1",
-      "resolved": "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-29.6.1.tgz",
-      "integrity": "sha512-OrxMNyZirpOEwkF3UHnIkAiZbtkBWiye+hhBweCHkVbCgyEy71Mwbb5zgeTNYWJBi1qgDVfPC1IwO9dVEeTLwQ==",
+      "version": "29.6.2",
+      "resolved": "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-29.6.2.tgz",
+      "integrity": "sha512-aNqYhfp5uYEO3tdWMb2bfWv6f0b4I0LOxVRpnRLAeque2uqOVVMLh6khnTcE2qJ5wAKop0HcreM1btoysD6bPQ==",
       "dev": true,
       "dependencies": {
         "jest-get-type": "^29.4.3",
-        "pretty-format": "^29.6.1"
+        "pretty-format": "^29.6.2"
       },
       "engines": {
         "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
     "node_modules/jest-matcher-utils": {
-      "version": "29.6.1",
-      "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-29.6.1.tgz",
-      "integrity": "sha512-SLaztw9d2mfQQKHmJXKM0HCbl2PPVld/t9Xa6P9sgiExijviSp7TnZZpw2Fpt+OI3nwUO/slJbOfzfUMKKC5QA==",
+      "version": "29.6.2",
+      "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-29.6.2.tgz",
+      "integrity": "sha512-4LiAk3hSSobtomeIAzFTe+N8kL6z0JtF3n6I4fg29iIW7tt99R7ZcIFW34QkX+DuVrf+CUe6wuVOpm7ZKFJzZQ==",
       "dev": true,
       "dependencies": {
         "chalk": "^4.0.0",
-        "jest-diff": "^29.6.1",
+        "jest-diff": "^29.6.2",
         "jest-get-type": "^29.4.3",
-        "pretty-format": "^29.6.1"
+        "pretty-format": "^29.6.2"
       },
       "engines": {
         "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
@@ -10862,17 +10864,17 @@
       }
     },
     "node_modules/jest-resolve": {
-      "version": "29.6.1",
-      "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-29.6.1.tgz",
-      "integrity": "sha512-AeRkyS8g37UyJiP9w3mmI/VXU/q8l/IH52vj/cDAyScDcemRbSBhfX/NMYIGilQgSVwsjxrCHf3XJu4f+lxCMg==",
+      "version": "29.6.2",
+      "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-29.6.2.tgz",
+      "integrity": "sha512-G/iQUvZWI5e3SMFssc4ug4dH0aZiZpsDq9o1PtXTV1210Ztyb2+w+ZgQkB3iOiC5SmAEzJBOHWz6Hvrd+QnNPw==",
       "dev": true,
       "dependencies": {
         "chalk": "^4.0.0",
         "graceful-fs": "^4.2.9",
-        "jest-haste-map": "^29.6.1",
+        "jest-haste-map": "^29.6.2",
         "jest-pnp-resolver": "^1.2.2",
-        "jest-util": "^29.6.1",
-        "jest-validate": "^29.6.1",
+        "jest-util": "^29.6.2",
+        "jest-validate": "^29.6.2",
         "resolve": "^1.20.0",
         "resolve.exports": "^2.0.0",
         "slash": "^3.0.0"
@@ -10882,13 +10884,13 @@
       }
     },
     "node_modules/jest-resolve-dependencies": {
-      "version": "29.6.1",
-      "resolved": "https://registry.npmjs.org/jest-resolve-dependencies/-/jest-resolve-dependencies-29.6.1.tgz",
-      "integrity": "sha512-BbFvxLXtcldaFOhNMXmHRWx1nXQO5LoXiKSGQcA1LxxirYceZT6ch8KTE1bK3X31TNG/JbkI7OkS/ABexVahiw==",
+      "version": "29.6.2",
+      "resolved": "https://registry.npmjs.org/jest-resolve-dependencies/-/jest-resolve-dependencies-29.6.2.tgz",
+      "integrity": "sha512-LGqjDWxg2fuQQm7ypDxduLu/m4+4Lb4gczc13v51VMZbVP5tSBILqVx8qfWcsdP8f0G7aIqByIALDB0R93yL+w==",
       "dev": true,
       "dependencies": {
         "jest-regex-util": "^29.4.3",
-        "jest-snapshot": "^29.6.1"
+        "jest-snapshot": "^29.6.2"
       },
       "engines": {
         "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
@@ -10965,30 +10967,30 @@
       }
     },
     "node_modules/jest-runner": {
-      "version": "29.6.1",
-      "resolved": "https://registry.npmjs.org/jest-runner/-/jest-runner-29.6.1.tgz",
-      "integrity": "sha512-tw0wb2Q9yhjAQ2w8rHRDxteryyIck7gIzQE4Reu3JuOBpGp96xWgF0nY8MDdejzrLCZKDcp8JlZrBN/EtkQvPQ==",
+      "version": "29.6.2",
+      "resolved": "https://registry.npmjs.org/jest-runner/-/jest-runner-29.6.2.tgz",
+      "integrity": "sha512-wXOT/a0EspYgfMiYHxwGLPCZfC0c38MivAlb2lMEAlwHINKemrttu1uSbcGbfDV31sFaPWnWJPmb2qXM8pqZ4w==",
       "dev": true,
       "dependencies": {
-        "@jest/console": "^29.6.1",
-        "@jest/environment": "^29.6.1",
-        "@jest/test-result": "^29.6.1",
-        "@jest/transform": "^29.6.1",
+        "@jest/console": "^29.6.2",
+        "@jest/environment": "^29.6.2",
+        "@jest/test-result": "^29.6.2",
+        "@jest/transform": "^29.6.2",
         "@jest/types": "^29.6.1",
         "@types/node": "*",
         "chalk": "^4.0.0",
         "emittery": "^0.13.1",
         "graceful-fs": "^4.2.9",
         "jest-docblock": "^29.4.3",
-        "jest-environment-node": "^29.6.1",
-        "jest-haste-map": "^29.6.1",
-        "jest-leak-detector": "^29.6.1",
-        "jest-message-util": "^29.6.1",
-        "jest-resolve": "^29.6.1",
-        "jest-runtime": "^29.6.1",
-        "jest-util": "^29.6.1",
-        "jest-watcher": "^29.6.1",
-        "jest-worker": "^29.6.1",
+        "jest-environment-node": "^29.6.2",
+        "jest-haste-map": "^29.6.2",
+        "jest-leak-detector": "^29.6.2",
+        "jest-message-util": "^29.6.2",
+        "jest-resolve": "^29.6.2",
+        "jest-runtime": "^29.6.2",
+        "jest-util": "^29.6.2",
+        "jest-watcher": "^29.6.2",
+        "jest-worker": "^29.6.2",
         "p-limit": "^3.1.0",
         "source-map-support": "0.5.13"
       },
@@ -11055,13 +11057,13 @@
       }
     },
     "node_modules/jest-runner/node_modules/jest-worker": {
-      "version": "29.6.1",
-      "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-29.6.1.tgz",
-      "integrity": "sha512-U+Wrbca7S8ZAxAe9L6nb6g8kPdia5hj32Puu5iOqBCMTMWFHXuK6dOV2IFrpedbTV8fjMFLdWNttQTBL6u2MRA==",
+      "version": "29.6.2",
+      "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-29.6.2.tgz",
+      "integrity": "sha512-l3ccBOabTdkng8I/ORCkADz4eSMKejTYv1vB/Z83UiubqhC1oQ5Li6dWCyqOIvSifGjUBxuvxvlm6KGK2DtuAQ==",
       "dev": true,
       "dependencies": {
         "@types/node": "*",
-        "jest-util": "^29.6.1",
+        "jest-util": "^29.6.2",
         "merge-stream": "^2.0.0",
         "supports-color": "^8.0.0"
       },
@@ -11107,17 +11109,17 @@
       }
     },
     "node_modules/jest-runtime": {
-      "version": "29.6.1",
-      "resolved": "https://registry.npmjs.org/jest-runtime/-/jest-runtime-29.6.1.tgz",
-      "integrity": "sha512-D6/AYOA+Lhs5e5il8+5pSLemjtJezUr+8zx+Sn8xlmOux3XOqx4d8l/2udBea8CRPqqrzhsKUsN/gBDE/IcaPQ==",
+      "version": "29.6.2",
+      "resolved": "https://registry.npmjs.org/jest-runtime/-/jest-runtime-29.6.2.tgz",
+      "integrity": "sha512-2X9dqK768KufGJyIeLmIzToDmsN0m7Iek8QNxRSI/2+iPFYHF0jTwlO3ftn7gdKd98G/VQw9XJCk77rbTGZnJg==",
       "dev": true,
       "dependencies": {
-        "@jest/environment": "^29.6.1",
-        "@jest/fake-timers": "^29.6.1",
-        "@jest/globals": "^29.6.1",
+        "@jest/environment": "^29.6.2",
+        "@jest/fake-timers": "^29.6.2",
+        "@jest/globals": "^29.6.2",
         "@jest/source-map": "^29.6.0",
-        "@jest/test-result": "^29.6.1",
-        "@jest/transform": "^29.6.1",
+        "@jest/test-result": "^29.6.2",
+        "@jest/transform": "^29.6.2",
         "@jest/types": "^29.6.1",
         "@types/node": "*",
         "chalk": "^4.0.0",
@@ -11125,13 +11127,13 @@
         "collect-v8-coverage": "^1.0.0",
         "glob": "^7.1.3",
         "graceful-fs": "^4.2.9",
-        "jest-haste-map": "^29.6.1",
-        "jest-message-util": "^29.6.1",
-        "jest-mock": "^29.6.1",
+        "jest-haste-map": "^29.6.2",
+        "jest-message-util": "^29.6.2",
+        "jest-mock": "^29.6.2",
         "jest-regex-util": "^29.4.3",
-        "jest-resolve": "^29.6.1",
-        "jest-snapshot": "^29.6.1",
-        "jest-util": "^29.6.1",
+        "jest-resolve": "^29.6.2",
+        "jest-snapshot": "^29.6.2",
+        "jest-util": "^29.6.2",
         "slash": "^3.0.0",
         "strip-bom": "^4.0.0"
       },
@@ -11210,9 +11212,9 @@
       }
     },
     "node_modules/jest-snapshot": {
-      "version": "29.6.1",
-      "resolved": "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-29.6.1.tgz",
-      "integrity": "sha512-G4UQE1QQ6OaCgfY+A0uR1W2AY0tGXUPQpoUClhWHq1Xdnx1H6JOrC2nH5lqnOEqaDgbHFgIwZ7bNq24HpB180A==",
+      "version": "29.6.2",
+      "resolved": "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-29.6.2.tgz",
+      "integrity": "sha512-1OdjqvqmRdGNvWXr/YZHuyhh5DeaLp1p/F8Tht/MrMw4Kr1Uu/j4lRG+iKl1DAqUJDWxtQBMk41Lnf/JETYBRA==",
       "dev": true,
       "dependencies": {
         "@babel/core": "^7.11.6",
@@ -11220,21 +11222,20 @@
         "@babel/plugin-syntax-jsx": "^7.7.2",
         "@babel/plugin-syntax-typescript": "^7.7.2",
         "@babel/types": "^7.3.3",
-        "@jest/expect-utils": "^29.6.1",
-        "@jest/transform": "^29.6.1",
+        "@jest/expect-utils": "^29.6.2",
+        "@jest/transform": "^29.6.2",
         "@jest/types": "^29.6.1",
-        "@types/prettier": "^2.1.5",
         "babel-preset-current-node-syntax": "^1.0.0",
         "chalk": "^4.0.0",
-        "expect": "^29.6.1",
+        "expect": "^29.6.2",
         "graceful-fs": "^4.2.9",
-        "jest-diff": "^29.6.1",
+        "jest-diff": "^29.6.2",
         "jest-get-type": "^29.4.3",
-        "jest-matcher-utils": "^29.6.1",
-        "jest-message-util": "^29.6.1",
-        "jest-util": "^29.6.1",
+        "jest-matcher-utils": "^29.6.2",
+        "jest-message-util": "^29.6.2",
+        "jest-util": "^29.6.2",
         "natural-compare": "^1.4.0",
-        "pretty-format": "^29.6.1",
+        "pretty-format": "^29.6.2",
         "semver": "^7.5.3"
       },
       "engines": {
@@ -11300,9 +11301,9 @@
       }
     },
     "node_modules/jest-snapshot/node_modules/semver": {
-      "version": "7.5.3",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.3.tgz",
-      "integrity": "sha512-QBlUtyVk/5EeHbi7X0fw6liDZc7BBmEaSYn01fMU1OUYbf6GPsbTtd8WmnqbI20SeycoHSeiybkE/q1Q+qlThQ==",
+      "version": "7.5.4",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz",
+      "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==",
       "dev": true,
       "dependencies": {
         "lru-cache": "^6.0.0"
@@ -11414,9 +11415,9 @@
       }
     },
     "node_modules/jest-validate": {
-      "version": "29.6.1",
-      "resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-29.6.1.tgz",
-      "integrity": "sha512-r3Ds69/0KCN4vx4sYAbGL1EVpZ7MSS0vLmd3gV78O+NAx3PDQQukRU5hNHPXlyqCgFY8XUk7EuTMLugh0KzahA==",
+      "version": "29.6.2",
+      "resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-29.6.2.tgz",
+      "integrity": "sha512-vGz0yMN5fUFRRbpJDPwxMpgSXW1LDKROHfBopAvDcmD6s+B/s8WJrwi+4bfH4SdInBA5C3P3BI19dBtKzx1Arg==",
       "dev": true,
       "dependencies": {
         "@jest/types": "^29.6.1",
@@ -11424,7 +11425,7 @@
         "chalk": "^4.0.0",
         "jest-get-type": "^29.4.3",
         "leven": "^3.1.0",
-        "pretty-format": "^29.6.1"
+        "pretty-format": "^29.6.2"
       },
       "engines": {
         "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
@@ -11513,18 +11514,18 @@
       }
     },
     "node_modules/jest-watcher": {
-      "version": "29.6.1",
-      "resolved": "https://registry.npmjs.org/jest-watcher/-/jest-watcher-29.6.1.tgz",
-      "integrity": "sha512-d4wpjWTS7HEZPaaj8m36QiaP856JthRZkrgcIY/7ISoUWPIillrXM23WPboZVLbiwZBt4/qn2Jke84Sla6JhFA==",
+      "version": "29.6.2",
+      "resolved": "https://registry.npmjs.org/jest-watcher/-/jest-watcher-29.6.2.tgz",
+      "integrity": "sha512-GZitlqkMkhkefjfN/p3SJjrDaxPflqxEAv3/ik10OirZqJGYH5rPiIsgVcfof0Tdqg3shQGdEIxDBx+B4tuLzA==",
       "dev": true,
       "dependencies": {
-        "@jest/test-result": "^29.6.1",
+        "@jest/test-result": "^29.6.2",
         "@jest/types": "^29.6.1",
         "@types/node": "*",
         "ansi-escapes": "^4.2.1",
         "chalk": "^4.0.0",
         "emittery": "^0.13.1",
-        "jest-util": "^29.6.1",
+        "jest-util": "^29.6.2",
         "string-length": "^4.0.1"
       },
       "engines": {
@@ -12279,20 +12280,35 @@
       }
     },
     "node_modules/make-dir": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz",
-      "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==",
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-4.0.0.tgz",
+      "integrity": "sha512-hXdUTZYIVOt1Ex//jAQi+wTZZpUpwBj/0QsOzqegb3rGMMeJiSEu5xLHnYfBrRV4RH2+OCSOO95Is/7x1WJ4bw==",
       "dev": true,
       "dependencies": {
-        "semver": "^6.0.0"
+        "semver": "^7.5.3"
       },
       "engines": {
-        "node": ">=8"
+        "node": ">=10"
       },
       "funding": {
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "node_modules/make-dir/node_modules/semver": {
+      "version": "7.5.4",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz",
+      "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==",
+      "dev": true,
+      "dependencies": {
+        "lru-cache": "^6.0.0"
+      },
+      "bin": {
+        "semver": "bin/semver.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
     "node_modules/makeerror": {
       "version": "1.0.12",
       "resolved": "https://registry.npmjs.org/makeerror/-/makeerror-1.0.12.tgz",
@@ -19116,16 +19132,16 @@
       "dev": true
     },
     "@jest/console": {
-      "version": "29.6.1",
-      "resolved": "https://registry.npmjs.org/@jest/console/-/console-29.6.1.tgz",
-      "integrity": "sha512-Aj772AYgwTSr5w8qnyoJ0eDYvN6bMsH3ORH1ivMotrInHLKdUz6BDlaEXHdM6kODaBIkNIyQGzsMvRdOv7VG7Q==",
+      "version": "29.6.2",
+      "resolved": "https://registry.npmjs.org/@jest/console/-/console-29.6.2.tgz",
+      "integrity": "sha512-0N0yZof5hi44HAR2pPS+ikJ3nzKNoZdVu8FffRf3wy47I7Dm7etk/3KetMdRUqzVd16V4O2m2ISpNTbnIuqy1w==",
       "dev": true,
       "requires": {
         "@jest/types": "^29.6.1",
         "@types/node": "*",
         "chalk": "^4.0.0",
-        "jest-message-util": "^29.6.1",
-        "jest-util": "^29.6.1",
+        "jest-message-util": "^29.6.2",
+        "jest-util": "^29.6.2",
         "slash": "^3.0.0"
       },
       "dependencies": {
@@ -19181,15 +19197,15 @@
       }
     },
     "@jest/core": {
-      "version": "29.6.1",
-      "resolved": "https://registry.npmjs.org/@jest/core/-/core-29.6.1.tgz",
-      "integrity": "sha512-CcowHypRSm5oYQ1obz1wfvkjZZ2qoQlrKKvlfPwh5jUXVU12TWr2qMeH8chLMuTFzHh5a1g2yaqlqDICbr+ukQ==",
+      "version": "29.6.2",
+      "resolved": "https://registry.npmjs.org/@jest/core/-/core-29.6.2.tgz",
+      "integrity": "sha512-Oj+5B+sDMiMWLhPFF+4/DvHOf+U10rgvCLGPHP8Xlsy/7QxS51aU/eBngudHlJXnaWD5EohAgJ4js+T6pa+zOg==",
       "dev": true,
       "requires": {
-        "@jest/console": "^29.6.1",
-        "@jest/reporters": "^29.6.1",
-        "@jest/test-result": "^29.6.1",
-        "@jest/transform": "^29.6.1",
+        "@jest/console": "^29.6.2",
+        "@jest/reporters": "^29.6.2",
+        "@jest/test-result": "^29.6.2",
+        "@jest/transform": "^29.6.2",
         "@jest/types": "^29.6.1",
         "@types/node": "*",
         "ansi-escapes": "^4.2.1",
@@ -19198,20 +19214,20 @@
         "exit": "^0.1.2",
         "graceful-fs": "^4.2.9",
         "jest-changed-files": "^29.5.0",
-        "jest-config": "^29.6.1",
-        "jest-haste-map": "^29.6.1",
-        "jest-message-util": "^29.6.1",
+        "jest-config": "^29.6.2",
+        "jest-haste-map": "^29.6.2",
+        "jest-message-util": "^29.6.2",
         "jest-regex-util": "^29.4.3",
-        "jest-resolve": "^29.6.1",
-        "jest-resolve-dependencies": "^29.6.1",
-        "jest-runner": "^29.6.1",
-        "jest-runtime": "^29.6.1",
-        "jest-snapshot": "^29.6.1",
-        "jest-util": "^29.6.1",
-        "jest-validate": "^29.6.1",
-        "jest-watcher": "^29.6.1",
+        "jest-resolve": "^29.6.2",
+        "jest-resolve-dependencies": "^29.6.2",
+        "jest-runner": "^29.6.2",
+        "jest-runtime": "^29.6.2",
+        "jest-snapshot": "^29.6.2",
+        "jest-util": "^29.6.2",
+        "jest-validate": "^29.6.2",
+        "jest-watcher": "^29.6.2",
         "micromatch": "^4.0.4",
-        "pretty-format": "^29.6.1",
+        "pretty-format": "^29.6.2",
         "slash": "^3.0.0",
         "strip-ansi": "^6.0.0"
       },
@@ -19280,19 +19296,19 @@
       }
     },
     "@jest/expect": {
-      "version": "29.6.1",
-      "resolved": "https://registry.npmjs.org/@jest/expect/-/expect-29.6.1.tgz",
-      "integrity": "sha512-N5xlPrAYaRNyFgVf2s9Uyyvr795jnB6rObuPx4QFvNJz8aAjpZUDfO4bh5G/xuplMID8PrnuF1+SfSyDxhsgYg==",
+      "version": "29.6.2",
+      "resolved": "https://registry.npmjs.org/@jest/expect/-/expect-29.6.2.tgz",
+      "integrity": "sha512-m6DrEJxVKjkELTVAztTLyS/7C92Y2b0VYqmDROYKLLALHn8T/04yPs70NADUYPrV3ruI+H3J0iUIuhkjp7vkfg==",
       "dev": true,
       "requires": {
-        "expect": "^29.6.1",
-        "jest-snapshot": "^29.6.1"
+        "expect": "^29.6.2",
+        "jest-snapshot": "^29.6.2"
       }
     },
     "@jest/expect-utils": {
-      "version": "29.6.1",
-      "resolved": "https://registry.npmjs.org/@jest/expect-utils/-/expect-utils-29.6.1.tgz",
-      "integrity": "sha512-o319vIf5pEMx0LmzSxxkYYxo4wrRLKHq9dP1yJU7FoPTB0LfAKSz8SWD6D/6U3v/O52t9cF5t+MeJiRsfk7zMw==",
+      "version": "29.6.2",
+      "resolved": "https://registry.npmjs.org/@jest/expect-utils/-/expect-utils-29.6.2.tgz",
+      "integrity": "sha512-6zIhM8go3RV2IG4aIZaZbxwpOzz3ZiM23oxAlkquOIole+G6TrbeXnykxWYlqF7kz2HlBjdKtca20x9atkEQYg==",
       "dev": true,
       "requires": {
         "jest-get-type": "^29.4.3"
@@ -19313,27 +19329,27 @@
       }
     },
     "@jest/globals": {
-      "version": "29.6.1",
-      "resolved": "https://registry.npmjs.org/@jest/globals/-/globals-29.6.1.tgz",
-      "integrity": "sha512-2VjpaGy78JY9n9370H8zGRCFbYVWwjY6RdDMhoJHa1sYfwe6XM/azGN0SjY8kk7BOZApIejQ1BFPyH7FPG0w3A==",
+      "version": "29.6.2",
+      "resolved": "https://registry.npmjs.org/@jest/globals/-/globals-29.6.2.tgz",
+      "integrity": "sha512-cjuJmNDjs6aMijCmSa1g2TNG4Lby/AeU7/02VtpW+SLcZXzOLK2GpN2nLqcFjmhy3B3AoPeQVx7BnyOf681bAw==",
       "dev": true,
       "requires": {
-        "@jest/environment": "^29.6.1",
-        "@jest/expect": "^29.6.1",
+        "@jest/environment": "^29.6.2",
+        "@jest/expect": "^29.6.2",
         "@jest/types": "^29.6.1",
-        "jest-mock": "^29.6.1"
+        "jest-mock": "^29.6.2"
       }
     },
     "@jest/reporters": {
-      "version": "29.6.1",
-      "resolved": "https://registry.npmjs.org/@jest/reporters/-/reporters-29.6.1.tgz",
-      "integrity": "sha512-9zuaI9QKr9JnoZtFQlw4GREQbxgmNYXU6QuWtmuODvk5nvPUeBYapVR/VYMyi2WSx3jXTLJTJji8rN6+Cm4+FA==",
+      "version": "29.6.2",
+      "resolved": "https://registry.npmjs.org/@jest/reporters/-/reporters-29.6.2.tgz",
+      "integrity": "sha512-sWtijrvIav8LgfJZlrGCdN0nP2EWbakglJY49J1Y5QihcQLfy7ovyxxjJBRXMNltgt4uPtEcFmIMbVshEDfFWw==",
       "dev": true,
       "requires": {
         "@bcoe/v8-coverage": "^0.2.3",
-        "@jest/console": "^29.6.1",
-        "@jest/test-result": "^29.6.1",
-        "@jest/transform": "^29.6.1",
+        "@jest/console": "^29.6.2",
+        "@jest/test-result": "^29.6.2",
+        "@jest/transform": "^29.6.2",
         "@jest/types": "^29.6.1",
         "@jridgewell/trace-mapping": "^0.3.18",
         "@types/node": "*",
@@ -19347,9 +19363,9 @@
         "istanbul-lib-report": "^3.0.0",
         "istanbul-lib-source-maps": "^4.0.0",
         "istanbul-reports": "^3.1.3",
-        "jest-message-util": "^29.6.1",
-        "jest-util": "^29.6.1",
-        "jest-worker": "^29.6.1",
+        "jest-message-util": "^29.6.2",
+        "jest-util": "^29.6.2",
+        "jest-worker": "^29.6.2",
         "slash": "^3.0.0",
         "string-length": "^4.0.1",
         "strip-ansi": "^6.0.0",
@@ -19397,13 +19413,13 @@
           "dev": true
         },
         "jest-worker": {
-          "version": "29.6.1",
-          "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-29.6.1.tgz",
-          "integrity": "sha512-U+Wrbca7S8ZAxAe9L6nb6g8kPdia5hj32Puu5iOqBCMTMWFHXuK6dOV2IFrpedbTV8fjMFLdWNttQTBL6u2MRA==",
+          "version": "29.6.2",
+          "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-29.6.2.tgz",
+          "integrity": "sha512-l3ccBOabTdkng8I/ORCkADz4eSMKejTYv1vB/Z83UiubqhC1oQ5Li6dWCyqOIvSifGjUBxuvxvlm6KGK2DtuAQ==",
           "dev": true,
           "requires": {
             "@types/node": "*",
-            "jest-util": "^29.6.1",
+            "jest-util": "^29.6.2",
             "merge-stream": "^2.0.0",
             "supports-color": "^8.0.0"
           },
@@ -19451,33 +19467,33 @@
       }
     },
     "@jest/test-result": {
-      "version": "29.6.1",
-      "resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-29.6.1.tgz",
-      "integrity": "sha512-Ynr13ZRcpX6INak0TPUukU8GWRfm/vAytE3JbJNGAvINySWYdfE7dGZMbk36oVuK4CigpbhMn8eg1dixZ7ZJOw==",
+      "version": "29.6.2",
+      "resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-29.6.2.tgz",
+      "integrity": "sha512-3VKFXzcV42EYhMCsJQURptSqnyjqCGbtLuX5Xxb6Pm6gUf1wIRIl+mandIRGJyWKgNKYF9cnstti6Ls5ekduqw==",
       "dev": true,
       "requires": {
-        "@jest/console": "^29.6.1",
+        "@jest/console": "^29.6.2",
         "@jest/types": "^29.6.1",
         "@types/istanbul-lib-coverage": "^2.0.0",
         "collect-v8-coverage": "^1.0.0"
       }
     },
     "@jest/test-sequencer": {
-      "version": "29.6.1",
-      "resolved": "https://registry.npmjs.org/@jest/test-sequencer/-/test-sequencer-29.6.1.tgz",
-      "integrity": "sha512-oBkC36PCDf/wb6dWeQIhaviU0l5u6VCsXa119yqdUosYAt7/FbQU2M2UoziO3igj/HBDEgp57ONQ3fm0v9uyyg==",
+      "version": "29.6.2",
+      "resolved": "https://registry.npmjs.org/@jest/test-sequencer/-/test-sequencer-29.6.2.tgz",
+      "integrity": "sha512-GVYi6PfPwVejO7slw6IDO0qKVum5jtrJ3KoLGbgBWyr2qr4GaxFV6su+ZAjdTX75Sr1DkMFRk09r2ZVa+wtCGw==",
       "dev": true,
       "requires": {
-        "@jest/test-result": "^29.6.1",
+        "@jest/test-result": "^29.6.2",
         "graceful-fs": "^4.2.9",
-        "jest-haste-map": "^29.6.1",
+        "jest-haste-map": "^29.6.2",
         "slash": "^3.0.0"
       }
     },
     "@jest/transform": {
-      "version": "29.6.1",
-      "resolved": "https://registry.npmjs.org/@jest/transform/-/transform-29.6.1.tgz",
-      "integrity": "sha512-URnTneIU3ZjRSaf906cvf6Hpox3hIeJXRnz3VDSw5/X93gR8ycdfSIEy19FlVx8NFmpN7fe3Gb1xF+NjXaQLWg==",
+      "version": "29.6.2",
+      "resolved": "https://registry.npmjs.org/@jest/transform/-/transform-29.6.2.tgz",
+      "integrity": "sha512-ZqCqEISr58Ce3U+buNFJYUktLJZOggfyvR+bZMaiV1e8B1SIvJbwZMrYz3gx/KAPn9EXmOmN+uB08yLCjWkQQg==",
       "dev": true,
       "requires": {
         "@babel/core": "^7.11.6",
@@ -19488,9 +19504,9 @@
         "convert-source-map": "^2.0.0",
         "fast-json-stable-stringify": "^2.1.0",
         "graceful-fs": "^4.2.9",
-        "jest-haste-map": "^29.6.1",
+        "jest-haste-map": "^29.6.2",
         "jest-regex-util": "^29.4.3",
-        "jest-util": "^29.6.1",
+        "jest-util": "^29.6.2",
         "micromatch": "^4.0.4",
         "pirates": "^4.0.4",
         "slash": "^3.0.0",
@@ -19921,12 +19937,6 @@
         "@types/node": "*"
       }
     },
-    "@types/prettier": {
-      "version": "2.7.3",
-      "resolved": "https://registry.npmjs.org/@types/prettier/-/prettier-2.7.3.tgz",
-      "integrity": "sha512-+68kP9yzs4LMp7VNh8gdzMSPZFL44MLGqiHWvttYJe+6qnuVr4Ek9wSBQoveqY/r+LwjCcU29kNVkidwim+kYA==",
-      "dev": true
-    },
     "@types/responselike": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/@types/responselike/-/responselike-1.0.0.tgz",
@@ -20713,12 +20723,12 @@
       "integrity": "sha512-xh1Rl34h6Fi1DC2WWKfxUTVqRsNnr6LsKz2+hfwDxQJWmrx8+c7ylaqBMcHfl1U1r2dsifOvKX3LQuLNZ+XSvA=="
     },
     "babel-jest": {
-      "version": "29.6.1",
-      "resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-29.6.1.tgz",
-      "integrity": "sha512-qu+3bdPEQC6KZSPz+4Fyjbga5OODNcp49j6GKzG1EKbkfyJBxEYGVUmVGpwCSeGouG52R4EgYMLb6p9YeEEQ4A==",
+      "version": "29.6.2",
+      "resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-29.6.2.tgz",
+      "integrity": "sha512-BYCzImLos6J3BH/+HvUCHG1dTf2MzmAB4jaVxHV+29RZLjR29XuYTmsf2sdDwkrb+FczkGo3kOhE7ga6sI0P4A==",
       "dev": true,
       "requires": {
-        "@jest/transform": "^29.6.1",
+        "@jest/transform": "^29.6.2",
         "@types/babel__core": "^7.1.14",
         "babel-plugin-istanbul": "^6.1.1",
         "babel-preset-jest": "^29.5.0",
@@ -22109,10 +22119,11 @@
       }
     },
     "dedent": {
-      "version": "0.7.0",
-      "resolved": "https://registry.npmjs.org/dedent/-/dedent-0.7.0.tgz",
-      "integrity": "sha512-Q6fKUPqnAHAyhiUgFU7BUzLiv0kd8saH9al7tnu5Q/okj6dnupxyTgFIBjVzJATdfIAm9NAsvXNzjaKa+bxVyA==",
-      "dev": true
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/dedent/-/dedent-1.3.0.tgz",
+      "integrity": "sha512-7glNLfvdsMzZm3FpRY1CHuI2lbYDR+71YmrhmTZjYFD5pfT0ACgnGRdrrC9Mk2uICnzkcdelCx5at787UDGOvg==",
+      "dev": true,
+      "requires": {}
     },
     "deep-eql": {
       "version": "3.0.1",
@@ -23625,17 +23636,17 @@
       "dev": true
     },
     "expect": {
-      "version": "29.6.1",
-      "resolved": "https://registry.npmjs.org/expect/-/expect-29.6.1.tgz",
-      "integrity": "sha512-XEdDLonERCU1n9uR56/Stx9OqojaLAQtZf9PrCHH9Hl8YXiEIka3H4NXJ3NOIBmQJTg7+j7buh34PMHfJujc8g==",
+      "version": "29.6.2",
+      "resolved": "https://registry.npmjs.org/expect/-/expect-29.6.2.tgz",
+      "integrity": "sha512-iAErsLxJ8C+S02QbLAwgSGSezLQK+XXRDt8IuFXFpwCNw2ECmzZSmjKcCaFVp5VRMk+WAvz6h6jokzEzBFZEuA==",
       "dev": true,
       "requires": {
-        "@jest/expect-utils": "^29.6.1",
+        "@jest/expect-utils": "^29.6.2",
         "@types/node": "*",
         "jest-get-type": "^29.4.3",
-        "jest-matcher-utils": "^29.6.1",
-        "jest-message-util": "^29.6.1",
-        "jest-util": "^29.6.1"
+        "jest-matcher-utils": "^29.6.2",
+        "jest-message-util": "^29.6.2",
+        "jest-util": "^29.6.2"
       }
     },
     "express": {
@@ -24832,13 +24843,13 @@
       }
     },
     "istanbul-lib-report": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz",
-      "integrity": "sha512-wcdi+uAKzfiGT2abPpKZ0hSU1rGQjUQnLvtY5MpQ7QCTahD3VODhcu4wcfY1YtkGaDD5yuydOLINXsfbus9ROw==",
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/istanbul-lib-report/-/istanbul-lib-report-3.0.1.tgz",
+      "integrity": "sha512-GCfE1mtsHGOELCU8e/Z7YWzpmybrx/+dSTfLrvY8qRmaY6zXTKWn6WQIjaAFw069icm6GVMNkgu0NzI4iPZUNw==",
       "dev": true,
       "requires": {
         "istanbul-lib-coverage": "^3.0.0",
-        "make-dir": "^3.0.0",
+        "make-dir": "^4.0.0",
         "supports-color": "^7.1.0"
       },
       "dependencies": {
@@ -24871,9 +24882,9 @@
       }
     },
     "istanbul-reports": {
-      "version": "3.1.5",
-      "resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-3.1.5.tgz",
-      "integrity": "sha512-nUsEMa9pBt/NOHqbcbeJEgqIlY/K7rVWUX6Lql2orY5e9roQOthbR3vtY4zzf2orPELg80fnxxk9zUyPlgwD1w==",
+      "version": "3.1.6",
+      "resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-3.1.6.tgz",
+      "integrity": "sha512-TLgnMkKg3iTDsQ9PbPTdpfAK2DzjF9mqUG7RMgcQl8oFjad8ob4laGxv5XV5U9MAfx8D6tSJiUyuAwzLicaxlg==",
       "dev": true,
       "requires": {
         "html-escaper": "^2.0.0",
@@ -24881,15 +24892,15 @@
       }
     },
     "jest": {
-      "version": "29.6.1",
-      "resolved": "https://registry.npmjs.org/jest/-/jest-29.6.1.tgz",
-      "integrity": "sha512-Nirw5B4nn69rVUZtemCQhwxOBhm0nsp3hmtF4rzCeWD7BkjAXRIji7xWQfnTNbz9g0aVsBX6aZK3n+23LM6uDw==",
+      "version": "29.6.2",
+      "resolved": "https://registry.npmjs.org/jest/-/jest-29.6.2.tgz",
+      "integrity": "sha512-8eQg2mqFbaP7CwfsTpCxQ+sHzw1WuNWL5UUvjnWP4hx2riGz9fPSzYOaU5q8/GqWn1TfgZIVTqYJygbGbWAANg==",
       "dev": true,
       "requires": {
-        "@jest/core": "^29.6.1",
+        "@jest/core": "^29.6.2",
         "@jest/types": "^29.6.1",
         "import-local": "^3.0.2",
-        "jest-cli": "^29.6.1"
+        "jest-cli": "^29.6.2"
       }
     },
     "jest-changed-files": {
@@ -24903,28 +24914,28 @@
       }
     },
     "jest-circus": {
-      "version": "29.6.1",
-      "resolved": "https://registry.npmjs.org/jest-circus/-/jest-circus-29.6.1.tgz",
-      "integrity": "sha512-tPbYLEiBU4MYAL2XoZme/bgfUeotpDBd81lgHLCbDZZFaGmECk0b+/xejPFtmiBP87GgP/y4jplcRpbH+fgCzQ==",
+      "version": "29.6.2",
+      "resolved": "https://registry.npmjs.org/jest-circus/-/jest-circus-29.6.2.tgz",
+      "integrity": "sha512-G9mN+KOYIUe2sB9kpJkO9Bk18J4dTDArNFPwoZ7WKHKel55eKIS/u2bLthxgojwlf9NLCVQfgzM/WsOVvoC6Fw==",
       "dev": true,
       "requires": {
-        "@jest/environment": "^29.6.1",
-        "@jest/expect": "^29.6.1",
-        "@jest/test-result": "^29.6.1",
+        "@jest/environment": "^29.6.2",
+        "@jest/expect": "^29.6.2",
+        "@jest/test-result": "^29.6.2",
         "@jest/types": "^29.6.1",
         "@types/node": "*",
         "chalk": "^4.0.0",
         "co": "^4.6.0",
-        "dedent": "^0.7.0",
+        "dedent": "^1.0.0",
         "is-generator-fn": "^2.0.0",
-        "jest-each": "^29.6.1",
-        "jest-matcher-utils": "^29.6.1",
-        "jest-message-util": "^29.6.1",
-        "jest-runtime": "^29.6.1",
-        "jest-snapshot": "^29.6.1",
-        "jest-util": "^29.6.1",
+        "jest-each": "^29.6.2",
+        "jest-matcher-utils": "^29.6.2",
+        "jest-message-util": "^29.6.2",
+        "jest-runtime": "^29.6.2",
+        "jest-snapshot": "^29.6.2",
+        "jest-util": "^29.6.2",
         "p-limit": "^3.1.0",
-        "pretty-format": "^29.6.1",
+        "pretty-format": "^29.6.2",
         "pure-rand": "^6.0.0",
         "slash": "^3.0.0",
         "stack-utils": "^2.0.3"
@@ -24982,21 +24993,21 @@
       }
     },
     "jest-cli": {
-      "version": "29.6.1",
-      "resolved": "https://registry.npmjs.org/jest-cli/-/jest-cli-29.6.1.tgz",
-      "integrity": "sha512-607dSgTA4ODIN6go9w6xY3EYkyPFGicx51a69H7yfvt7lN53xNswEVLovq+E77VsTRi5fWprLH0yl4DJgE8Ing==",
+      "version": "29.6.2",
+      "resolved": "https://registry.npmjs.org/jest-cli/-/jest-cli-29.6.2.tgz",
+      "integrity": "sha512-TT6O247v6dCEX2UGHGyflMpxhnrL0DNqP2fRTKYm3nJJpCTfXX3GCMQPGFjXDoj0i5/Blp3jriKXFgdfmbYB6Q==",
       "dev": true,
       "requires": {
-        "@jest/core": "^29.6.1",
-        "@jest/test-result": "^29.6.1",
+        "@jest/core": "^29.6.2",
+        "@jest/test-result": "^29.6.2",
         "@jest/types": "^29.6.1",
         "chalk": "^4.0.0",
         "exit": "^0.1.2",
         "graceful-fs": "^4.2.9",
         "import-local": "^3.0.2",
-        "jest-config": "^29.6.1",
-        "jest-util": "^29.6.1",
-        "jest-validate": "^29.6.1",
+        "jest-config": "^29.6.2",
+        "jest-util": "^29.6.2",
+        "jest-validate": "^29.6.2",
         "prompts": "^2.0.1",
         "yargs": "^17.3.1"
       },
@@ -25053,31 +25064,31 @@
       }
     },
     "jest-config": {
-      "version": "29.6.1",
-      "resolved": "https://registry.npmjs.org/jest-config/-/jest-config-29.6.1.tgz",
-      "integrity": "sha512-XdjYV2fy2xYixUiV2Wc54t3Z4oxYPAELUzWnV6+mcbq0rh742X2p52pii5A3oeRzYjLnQxCsZmp0qpI6klE2cQ==",
+      "version": "29.6.2",
+      "resolved": "https://registry.npmjs.org/jest-config/-/jest-config-29.6.2.tgz",
+      "integrity": "sha512-VxwFOC8gkiJbuodG9CPtMRjBUNZEHxwfQXmIudSTzFWxaci3Qub1ddTRbFNQlD/zUeaifLndh/eDccFX4wCMQw==",
       "dev": true,
       "requires": {
         "@babel/core": "^7.11.6",
-        "@jest/test-sequencer": "^29.6.1",
+        "@jest/test-sequencer": "^29.6.2",
         "@jest/types": "^29.6.1",
-        "babel-jest": "^29.6.1",
+        "babel-jest": "^29.6.2",
         "chalk": "^4.0.0",
         "ci-info": "^3.2.0",
         "deepmerge": "^4.2.2",
         "glob": "^7.1.3",
         "graceful-fs": "^4.2.9",
-        "jest-circus": "^29.6.1",
-        "jest-environment-node": "^29.6.1",
+        "jest-circus": "^29.6.2",
+        "jest-environment-node": "^29.6.2",
         "jest-get-type": "^29.4.3",
         "jest-regex-util": "^29.4.3",
-        "jest-resolve": "^29.6.1",
-        "jest-runner": "^29.6.1",
-        "jest-util": "^29.6.1",
-        "jest-validate": "^29.6.1",
+        "jest-resolve": "^29.6.2",
+        "jest-runner": "^29.6.2",
+        "jest-util": "^29.6.2",
+        "jest-validate": "^29.6.2",
         "micromatch": "^4.0.4",
         "parse-json": "^5.2.0",
-        "pretty-format": "^29.6.1",
+        "pretty-format": "^29.6.2",
         "slash": "^3.0.0",
         "strip-json-comments": "^3.1.1"
       },
@@ -25134,15 +25145,15 @@
       }
     },
     "jest-diff": {
-      "version": "29.6.1",
-      "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-29.6.1.tgz",
-      "integrity": "sha512-FsNCvinvl8oVxpNLttNQX7FAq7vR+gMDGj90tiP7siWw1UdakWUGqrylpsYrpvj908IYckm5Y0Q7azNAozU1Kg==",
+      "version": "29.6.2",
+      "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-29.6.2.tgz",
+      "integrity": "sha512-t+ST7CB9GX5F2xKwhwCf0TAR17uNDiaPTZnVymP9lw0lssa9vG+AFyDZoeIHStU3WowFFwT+ky+er0WVl2yGhA==",
       "dev": true,
       "requires": {
         "chalk": "^4.0.0",
         "diff-sequences": "^29.4.3",
         "jest-get-type": "^29.4.3",
-        "pretty-format": "^29.6.1"
+        "pretty-format": "^29.6.2"
       },
       "dependencies": {
         "ansi-styles": {
@@ -25206,16 +25217,16 @@
       }
     },
     "jest-each": {
-      "version": "29.6.1",
-      "resolved": "https://registry.npmjs.org/jest-each/-/jest-each-29.6.1.tgz",
-      "integrity": "sha512-n5eoj5eiTHpKQCAVcNTT7DRqeUmJ01hsAL0Q1SMiBHcBcvTKDELixQOGMCpqhbIuTcfC4kMfSnpmDqRgRJcLNQ==",
+      "version": "29.6.2",
+      "resolved": "https://registry.npmjs.org/jest-each/-/jest-each-29.6.2.tgz",
+      "integrity": "sha512-MsrsqA0Ia99cIpABBc3izS1ZYoYfhIy0NNWqPSE0YXbQjwchyt6B1HD2khzyPe1WiJA7hbxXy77ZoUQxn8UlSw==",
       "dev": true,
       "requires": {
         "@jest/types": "^29.6.1",
         "chalk": "^4.0.0",
         "jest-get-type": "^29.4.3",
-        "jest-util": "^29.6.1",
-        "pretty-format": "^29.6.1"
+        "jest-util": "^29.6.2",
+        "pretty-format": "^29.6.2"
       },
       "dependencies": {
         "ansi-styles": {
@@ -25286,17 +25297,17 @@
       }
     },
     "jest-environment-node": {
-      "version": "29.6.1",
-      "resolved": "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-29.6.1.tgz",
-      "integrity": "sha512-ZNIfAiE+foBog24W+2caIldl4Irh8Lx1PUhg/GZ0odM1d/h2qORAsejiFc7zb+SEmYPn1yDZzEDSU5PmDkmVLQ==",
+      "version": "29.6.2",
+      "resolved": "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-29.6.2.tgz",
+      "integrity": "sha512-YGdFeZ3T9a+/612c5mTQIllvWkddPbYcN2v95ZH24oWMbGA4GGS2XdIF92QMhUhvrjjuQWYgUGW2zawOyH63MQ==",
       "dev": true,
       "requires": {
-        "@jest/environment": "^29.6.1",
-        "@jest/fake-timers": "^29.6.1",
+        "@jest/environment": "^29.6.2",
+        "@jest/fake-timers": "^29.6.2",
         "@jest/types": "^29.6.1",
         "@types/node": "*",
-        "jest-mock": "^29.6.1",
-        "jest-util": "^29.6.1"
+        "jest-mock": "^29.6.2",
+        "jest-util": "^29.6.2"
       }
     },
     "jest-get-type": {
@@ -25306,9 +25317,9 @@
       "dev": true
     },
     "jest-haste-map": {
-      "version": "29.6.1",
-      "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-29.6.1.tgz",
-      "integrity": "sha512-0m7f9PZXxOCk1gRACiVgX85knUKPKLPg4oRCjLoqIm9brTHXaorMA0JpmtmVkQiT8nmXyIVoZd/nnH1cfC33ig==",
+      "version": "29.6.2",
+      "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-29.6.2.tgz",
+      "integrity": "sha512-+51XleTDAAysvU8rT6AnS1ZJ+WHVNqhj1k6nTvN2PYP+HjU3kqlaKQ1Lnw3NYW3bm2r8vq82X0Z1nDDHZMzHVA==",
       "dev": true,
       "requires": {
         "@jest/types": "^29.6.1",
@@ -25319,8 +25330,8 @@
         "fsevents": "^2.3.2",
         "graceful-fs": "^4.2.9",
         "jest-regex-util": "^29.4.3",
-        "jest-util": "^29.6.1",
-        "jest-worker": "^29.6.1",
+        "jest-util": "^29.6.2",
+        "jest-worker": "^29.6.2",
         "micromatch": "^4.0.4",
         "walker": "^1.0.8"
       },
@@ -25332,13 +25343,13 @@
           "dev": true
         },
         "jest-worker": {
-          "version": "29.6.1",
-          "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-29.6.1.tgz",
-          "integrity": "sha512-U+Wrbca7S8ZAxAe9L6nb6g8kPdia5hj32Puu5iOqBCMTMWFHXuK6dOV2IFrpedbTV8fjMFLdWNttQTBL6u2MRA==",
+          "version": "29.6.2",
+          "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-29.6.2.tgz",
+          "integrity": "sha512-l3ccBOabTdkng8I/ORCkADz4eSMKejTYv1vB/Z83UiubqhC1oQ5Li6dWCyqOIvSifGjUBxuvxvlm6KGK2DtuAQ==",
           "dev": true,
           "requires": {
             "@types/node": "*",
-            "jest-util": "^29.6.1",
+            "jest-util": "^29.6.2",
             "merge-stream": "^2.0.0",
             "supports-color": "^8.0.0"
           }
@@ -25355,25 +25366,25 @@
       }
     },
     "jest-leak-detector": {
-      "version": "29.6.1",
-      "resolved": "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-29.6.1.tgz",
-      "integrity": "sha512-OrxMNyZirpOEwkF3UHnIkAiZbtkBWiye+hhBweCHkVbCgyEy71Mwbb5zgeTNYWJBi1qgDVfPC1IwO9dVEeTLwQ==",
+      "version": "29.6.2",
+      "resolved": "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-29.6.2.tgz",
+      "integrity": "sha512-aNqYhfp5uYEO3tdWMb2bfWv6f0b4I0LOxVRpnRLAeque2uqOVVMLh6khnTcE2qJ5wAKop0HcreM1btoysD6bPQ==",
       "dev": true,
       "requires": {
         "jest-get-type": "^29.4.3",
-        "pretty-format": "^29.6.1"
+        "pretty-format": "^29.6.2"
       }
     },
     "jest-matcher-utils": {
-      "version": "29.6.1",
-      "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-29.6.1.tgz",
-      "integrity": "sha512-SLaztw9d2mfQQKHmJXKM0HCbl2PPVld/t9Xa6P9sgiExijviSp7TnZZpw2Fpt+OI3nwUO/slJbOfzfUMKKC5QA==",
+      "version": "29.6.2",
+      "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-29.6.2.tgz",
+      "integrity": "sha512-4LiAk3hSSobtomeIAzFTe+N8kL6z0JtF3n6I4fg29iIW7tt99R7ZcIFW34QkX+DuVrf+CUe6wuVOpm7ZKFJzZQ==",
       "dev": true,
       "requires": {
         "chalk": "^4.0.0",
-        "jest-diff": "^29.6.1",
+        "jest-diff": "^29.6.2",
         "jest-get-type": "^29.4.3",
-        "pretty-format": "^29.6.1"
+        "pretty-format": "^29.6.2"
       },
       "dependencies": {
         "ansi-styles": {
@@ -25520,17 +25531,17 @@
       "dev": true
     },
     "jest-resolve": {
-      "version": "29.6.1",
-      "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-29.6.1.tgz",
-      "integrity": "sha512-AeRkyS8g37UyJiP9w3mmI/VXU/q8l/IH52vj/cDAyScDcemRbSBhfX/NMYIGilQgSVwsjxrCHf3XJu4f+lxCMg==",
+      "version": "29.6.2",
+      "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-29.6.2.tgz",
+      "integrity": "sha512-G/iQUvZWI5e3SMFssc4ug4dH0aZiZpsDq9o1PtXTV1210Ztyb2+w+ZgQkB3iOiC5SmAEzJBOHWz6Hvrd+QnNPw==",
       "dev": true,
       "requires": {
         "chalk": "^4.0.0",
         "graceful-fs": "^4.2.9",
-        "jest-haste-map": "^29.6.1",
+        "jest-haste-map": "^29.6.2",
         "jest-pnp-resolver": "^1.2.2",
-        "jest-util": "^29.6.1",
-        "jest-validate": "^29.6.1",
+        "jest-util": "^29.6.2",
+        "jest-validate": "^29.6.2",
         "resolve": "^1.20.0",
         "resolve.exports": "^2.0.0",
         "slash": "^3.0.0"
@@ -25588,40 +25599,40 @@
       }
     },
     "jest-resolve-dependencies": {
-      "version": "29.6.1",
-      "resolved": "https://registry.npmjs.org/jest-resolve-dependencies/-/jest-resolve-dependencies-29.6.1.tgz",
-      "integrity": "sha512-BbFvxLXtcldaFOhNMXmHRWx1nXQO5LoXiKSGQcA1LxxirYceZT6ch8KTE1bK3X31TNG/JbkI7OkS/ABexVahiw==",
+      "version": "29.6.2",
+      "resolved": "https://registry.npmjs.org/jest-resolve-dependencies/-/jest-resolve-dependencies-29.6.2.tgz",
+      "integrity": "sha512-LGqjDWxg2fuQQm7ypDxduLu/m4+4Lb4gczc13v51VMZbVP5tSBILqVx8qfWcsdP8f0G7aIqByIALDB0R93yL+w==",
       "dev": true,
       "requires": {
         "jest-regex-util": "^29.4.3",
-        "jest-snapshot": "^29.6.1"
+        "jest-snapshot": "^29.6.2"
       }
     },
     "jest-runner": {
-      "version": "29.6.1",
-      "resolved": "https://registry.npmjs.org/jest-runner/-/jest-runner-29.6.1.tgz",
-      "integrity": "sha512-tw0wb2Q9yhjAQ2w8rHRDxteryyIck7gIzQE4Reu3JuOBpGp96xWgF0nY8MDdejzrLCZKDcp8JlZrBN/EtkQvPQ==",
+      "version": "29.6.2",
+      "resolved": "https://registry.npmjs.org/jest-runner/-/jest-runner-29.6.2.tgz",
+      "integrity": "sha512-wXOT/a0EspYgfMiYHxwGLPCZfC0c38MivAlb2lMEAlwHINKemrttu1uSbcGbfDV31sFaPWnWJPmb2qXM8pqZ4w==",
       "dev": true,
       "requires": {
-        "@jest/console": "^29.6.1",
-        "@jest/environment": "^29.6.1",
-        "@jest/test-result": "^29.6.1",
-        "@jest/transform": "^29.6.1",
+        "@jest/console": "^29.6.2",
+        "@jest/environment": "^29.6.2",
+        "@jest/test-result": "^29.6.2",
+        "@jest/transform": "^29.6.2",
         "@jest/types": "^29.6.1",
         "@types/node": "*",
         "chalk": "^4.0.0",
         "emittery": "^0.13.1",
         "graceful-fs": "^4.2.9",
         "jest-docblock": "^29.4.3",
-        "jest-environment-node": "^29.6.1",
-        "jest-haste-map": "^29.6.1",
-        "jest-leak-detector": "^29.6.1",
-        "jest-message-util": "^29.6.1",
-        "jest-resolve": "^29.6.1",
-        "jest-runtime": "^29.6.1",
-        "jest-util": "^29.6.1",
-        "jest-watcher": "^29.6.1",
-        "jest-worker": "^29.6.1",
+        "jest-environment-node": "^29.6.2",
+        "jest-haste-map": "^29.6.2",
+        "jest-leak-detector": "^29.6.2",
+        "jest-message-util": "^29.6.2",
+        "jest-resolve": "^29.6.2",
+        "jest-runtime": "^29.6.2",
+        "jest-util": "^29.6.2",
+        "jest-watcher": "^29.6.2",
+        "jest-worker": "^29.6.2",
         "p-limit": "^3.1.0",
         "source-map-support": "0.5.13"
       },
@@ -25667,13 +25678,13 @@
           "dev": true
         },
         "jest-worker": {
-          "version": "29.6.1",
-          "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-29.6.1.tgz",
-          "integrity": "sha512-U+Wrbca7S8ZAxAe9L6nb6g8kPdia5hj32Puu5iOqBCMTMWFHXuK6dOV2IFrpedbTV8fjMFLdWNttQTBL6u2MRA==",
+          "version": "29.6.2",
+          "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-29.6.2.tgz",
+          "integrity": "sha512-l3ccBOabTdkng8I/ORCkADz4eSMKejTYv1vB/Z83UiubqhC1oQ5Li6dWCyqOIvSifGjUBxuvxvlm6KGK2DtuAQ==",
           "dev": true,
           "requires": {
             "@types/node": "*",
-            "jest-util": "^29.6.1",
+            "jest-util": "^29.6.2",
             "merge-stream": "^2.0.0",
             "supports-color": "^8.0.0"
           },
@@ -25711,17 +25722,17 @@
       }
     },
     "jest-runtime": {
-      "version": "29.6.1",
-      "resolved": "https://registry.npmjs.org/jest-runtime/-/jest-runtime-29.6.1.tgz",
-      "integrity": "sha512-D6/AYOA+Lhs5e5il8+5pSLemjtJezUr+8zx+Sn8xlmOux3XOqx4d8l/2udBea8CRPqqrzhsKUsN/gBDE/IcaPQ==",
+      "version": "29.6.2",
+      "resolved": "https://registry.npmjs.org/jest-runtime/-/jest-runtime-29.6.2.tgz",
+      "integrity": "sha512-2X9dqK768KufGJyIeLmIzToDmsN0m7Iek8QNxRSI/2+iPFYHF0jTwlO3ftn7gdKd98G/VQw9XJCk77rbTGZnJg==",
       "dev": true,
       "requires": {
-        "@jest/environment": "^29.6.1",
-        "@jest/fake-timers": "^29.6.1",
-        "@jest/globals": "^29.6.1",
+        "@jest/environment": "^29.6.2",
+        "@jest/fake-timers": "^29.6.2",
+        "@jest/globals": "^29.6.2",
         "@jest/source-map": "^29.6.0",
-        "@jest/test-result": "^29.6.1",
-        "@jest/transform": "^29.6.1",
+        "@jest/test-result": "^29.6.2",
+        "@jest/transform": "^29.6.2",
         "@jest/types": "^29.6.1",
         "@types/node": "*",
         "chalk": "^4.0.0",
@@ -25729,13 +25740,13 @@
         "collect-v8-coverage": "^1.0.0",
         "glob": "^7.1.3",
         "graceful-fs": "^4.2.9",
-        "jest-haste-map": "^29.6.1",
-        "jest-message-util": "^29.6.1",
-        "jest-mock": "^29.6.1",
+        "jest-haste-map": "^29.6.2",
+        "jest-message-util": "^29.6.2",
+        "jest-mock": "^29.6.2",
         "jest-regex-util": "^29.4.3",
-        "jest-resolve": "^29.6.1",
-        "jest-snapshot": "^29.6.1",
-        "jest-util": "^29.6.1",
+        "jest-resolve": "^29.6.2",
+        "jest-snapshot": "^29.6.2",
+        "jest-util": "^29.6.2",
         "slash": "^3.0.0",
         "strip-bom": "^4.0.0"
       },
@@ -25792,9 +25803,9 @@
       }
     },
     "jest-snapshot": {
-      "version": "29.6.1",
-      "resolved": "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-29.6.1.tgz",
-      "integrity": "sha512-G4UQE1QQ6OaCgfY+A0uR1W2AY0tGXUPQpoUClhWHq1Xdnx1H6JOrC2nH5lqnOEqaDgbHFgIwZ7bNq24HpB180A==",
+      "version": "29.6.2",
+      "resolved": "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-29.6.2.tgz",
+      "integrity": "sha512-1OdjqvqmRdGNvWXr/YZHuyhh5DeaLp1p/F8Tht/MrMw4Kr1Uu/j4lRG+iKl1DAqUJDWxtQBMk41Lnf/JETYBRA==",
       "dev": true,
       "requires": {
         "@babel/core": "^7.11.6",
@@ -25802,21 +25813,20 @@
         "@babel/plugin-syntax-jsx": "^7.7.2",
         "@babel/plugin-syntax-typescript": "^7.7.2",
         "@babel/types": "^7.3.3",
-        "@jest/expect-utils": "^29.6.1",
-        "@jest/transform": "^29.6.1",
+        "@jest/expect-utils": "^29.6.2",
+        "@jest/transform": "^29.6.2",
         "@jest/types": "^29.6.1",
-        "@types/prettier": "^2.1.5",
         "babel-preset-current-node-syntax": "^1.0.0",
         "chalk": "^4.0.0",
-        "expect": "^29.6.1",
+        "expect": "^29.6.2",
         "graceful-fs": "^4.2.9",
-        "jest-diff": "^29.6.1",
+        "jest-diff": "^29.6.2",
         "jest-get-type": "^29.4.3",
-        "jest-matcher-utils": "^29.6.1",
-        "jest-message-util": "^29.6.1",
-        "jest-util": "^29.6.1",
+        "jest-matcher-utils": "^29.6.2",
+        "jest-message-util": "^29.6.2",
+        "jest-util": "^29.6.2",
         "natural-compare": "^1.4.0",
-        "pretty-format": "^29.6.1",
+        "pretty-format": "^29.6.2",
         "semver": "^7.5.3"
       },
       "dependencies": {
@@ -25861,9 +25871,9 @@
           "dev": true
         },
         "semver": {
-          "version": "7.5.3",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.3.tgz",
-          "integrity": "sha512-QBlUtyVk/5EeHbi7X0fw6liDZc7BBmEaSYn01fMU1OUYbf6GPsbTtd8WmnqbI20SeycoHSeiybkE/q1Q+qlThQ==",
+          "version": "7.5.4",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz",
+          "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==",
           "dev": true,
           "requires": {
             "lru-cache": "^6.0.0"
@@ -25946,9 +25956,9 @@
       }
     },
     "jest-validate": {
-      "version": "29.6.1",
-      "resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-29.6.1.tgz",
-      "integrity": "sha512-r3Ds69/0KCN4vx4sYAbGL1EVpZ7MSS0vLmd3gV78O+NAx3PDQQukRU5hNHPXlyqCgFY8XUk7EuTMLugh0KzahA==",
+      "version": "29.6.2",
+      "resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-29.6.2.tgz",
+      "integrity": "sha512-vGz0yMN5fUFRRbpJDPwxMpgSXW1LDKROHfBopAvDcmD6s+B/s8WJrwi+4bfH4SdInBA5C3P3BI19dBtKzx1Arg==",
       "dev": true,
       "requires": {
         "@jest/types": "^29.6.1",
@@ -25956,7 +25966,7 @@
         "chalk": "^4.0.0",
         "jest-get-type": "^29.4.3",
         "leven": "^3.1.0",
-        "pretty-format": "^29.6.1"
+        "pretty-format": "^29.6.2"
       },
       "dependencies": {
         "ansi-styles": {
@@ -26017,18 +26027,18 @@
       }
     },
     "jest-watcher": {
-      "version": "29.6.1",
-      "resolved": "https://registry.npmjs.org/jest-watcher/-/jest-watcher-29.6.1.tgz",
-      "integrity": "sha512-d4wpjWTS7HEZPaaj8m36QiaP856JthRZkrgcIY/7ISoUWPIillrXM23WPboZVLbiwZBt4/qn2Jke84Sla6JhFA==",
+      "version": "29.6.2",
+      "resolved": "https://registry.npmjs.org/jest-watcher/-/jest-watcher-29.6.2.tgz",
+      "integrity": "sha512-GZitlqkMkhkefjfN/p3SJjrDaxPflqxEAv3/ik10OirZqJGYH5rPiIsgVcfof0Tdqg3shQGdEIxDBx+B4tuLzA==",
       "dev": true,
       "requires": {
-        "@jest/test-result": "^29.6.1",
+        "@jest/test-result": "^29.6.2",
         "@jest/types": "^29.6.1",
         "@types/node": "*",
         "ansi-escapes": "^4.2.1",
         "chalk": "^4.0.0",
         "emittery": "^0.13.1",
-        "jest-util": "^29.6.1",
+        "jest-util": "^29.6.2",
         "string-length": "^4.0.1"
       },
       "dependencies": {
@@ -26662,12 +26672,23 @@
       "integrity": "sha512-An0UCfG/rSiqtAIiBPO0Y9/zAnHUZxAMiCpTd5h2smgsj7GGmcenvrvww2cqNA8/4A5ZrD1gJpHN2mIHZQF+Mg=="
     },
     "make-dir": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz",
-      "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==",
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-4.0.0.tgz",
+      "integrity": "sha512-hXdUTZYIVOt1Ex//jAQi+wTZZpUpwBj/0QsOzqegb3rGMMeJiSEu5xLHnYfBrRV4RH2+OCSOO95Is/7x1WJ4bw==",
       "dev": true,
       "requires": {
-        "semver": "^6.0.0"
+        "semver": "^7.5.3"
+      },
+      "dependencies": {
+        "semver": {
+          "version": "7.5.4",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz",
+          "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==",
+          "dev": true,
+          "requires": {
+            "lru-cache": "^6.0.0"
+          }
+        }
       }
     },
     "makeerror": {
diff --git a/apps/block_scout_web/assets/package.json b/apps/block_scout_web/assets/package.json
index 830c812f522e..afb7c3e1e4ca 100644
--- a/apps/block_scout_web/assets/package.json
+++ b/apps/block_scout_web/assets/package.json
@@ -96,7 +96,7 @@
     "eslint-plugin-node": "^11.1.0",
     "eslint-plugin-promise": "^6.1.1",
     "file-loader": "^6.2.0",
-    "jest": "^29.6.1",
+    "jest": "^29.6.2",
     "jest-environment-jsdom": "^29.6.2",
     "mini-css-extract-plugin": "^2.7.6",
     "postcss": "^8.4.27",

From b26b7df7e2113a411aeeb25214c2c75f653e89a8 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 28 Jul 2023 18:09:03 +0000
Subject: [PATCH 242/909] Bump eslint from 8.45.0 to 8.46.0 in
 /apps/block_scout_web/assets

Bumps [eslint](https://github.com/eslint/eslint) from 8.45.0 to 8.46.0.
- [Release notes](https://github.com/eslint/eslint/releases)
- [Changelog](https://github.com/eslint/eslint/blob/main/CHANGELOG.md)
- [Commits](https://github.com/eslint/eslint/compare/v8.45.0...v8.46.0)

---
updated-dependencies:
- dependency-name: eslint
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 apps/block_scout_web/assets/package-lock.json | 114 +++++++++---------
 apps/block_scout_web/assets/package.json      |   2 +-
 2 files changed, 58 insertions(+), 58 deletions(-)

diff --git a/apps/block_scout_web/assets/package-lock.json b/apps/block_scout_web/assets/package-lock.json
index a680a41f4127..c9a20d296c18 100644
--- a/apps/block_scout_web/assets/package-lock.json
+++ b/apps/block_scout_web/assets/package-lock.json
@@ -78,7 +78,7 @@
         "copy-webpack-plugin": "^11.0.0",
         "css-loader": "^5.2.7",
         "css-minimizer-webpack-plugin": "^5.0.1",
-        "eslint": "^8.45.0",
+        "eslint": "^8.46.0",
         "eslint-config-standard": "^17.1.0",
         "eslint-plugin-import": "^2.27.5",
         "eslint-plugin-node": "^11.1.0",
@@ -2046,18 +2046,18 @@
       }
     },
     "node_modules/@eslint-community/regexpp": {
-      "version": "4.4.0",
-      "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.4.0.tgz",
-      "integrity": "sha512-A9983Q0LnDGdLPjxyXQ00sbV+K+O+ko2Dr+CZigbHWtX9pNfxlaBkMR8X1CztI73zuEyEBXTVjx7CE+/VSwDiQ==",
+      "version": "4.6.2",
+      "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.6.2.tgz",
+      "integrity": "sha512-pPTNuaAG3QMH+buKyBIGJs3g/S5y0caxw0ygM3YyE6yJFySwiGGSzA+mM3KJ8QQvzeLh3blwgSonkFjgQdxzMw==",
       "dev": true,
       "engines": {
         "node": "^12.0.0 || ^14.0.0 || >=16.0.0"
       }
     },
     "node_modules/@eslint/eslintrc": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.1.0.tgz",
-      "integrity": "sha512-Lj7DECXqIVCqnqjjHMPna4vn6GJcMgul/wuS0je9OZ9gsL0zzDpKPVtcG1HaDVc+9y+qgXneTeUMbCqXJNpH1A==",
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.1.1.tgz",
+      "integrity": "sha512-9t7ZA7NGGK8ckelF0PQCfcxIUzs1Md5rrO6U/c+FIQNanea5UZC0wqKXH4vHBccmu4ZJgZ2idtPeW7+Q2npOEA==",
       "dev": true,
       "dependencies": {
         "ajv": "^6.12.4",
@@ -2123,9 +2123,9 @@
       }
     },
     "node_modules/@eslint/js": {
-      "version": "8.44.0",
-      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.44.0.tgz",
-      "integrity": "sha512-Ag+9YM4ocKQx9AarydN0KY2j0ErMHNIocPDrVo8zAE44xLTjEtz81OdR68/cydGtk6m6jDb5Za3r2useMzYmSw==",
+      "version": "8.46.0",
+      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.46.0.tgz",
+      "integrity": "sha512-a8TLtmPi8xzPkCbp/OGFUo5yhRkHM2Ko9kOWP4znJr0WAhWyThaw3PnwX4vOTWOAMsV2uRt32PPDcEz63esSaA==",
       "dev": true,
       "engines": {
         "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
@@ -7054,27 +7054,27 @@
       }
     },
     "node_modules/eslint": {
-      "version": "8.45.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.45.0.tgz",
-      "integrity": "sha512-pd8KSxiQpdYRfYa9Wufvdoct3ZPQQuVuU5O6scNgMuOMYuxvH0IGaYK0wUFjo4UYYQQCUndlXiMbnxopwvvTiw==",
+      "version": "8.46.0",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.46.0.tgz",
+      "integrity": "sha512-cIO74PvbW0qU8e0mIvk5IV3ToWdCq5FYG6gWPHHkx6gNdjlbAYvtfHmlCMXxjcoVaIdwy/IAt3+mDkZkfvb2Dg==",
       "dev": true,
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.2.0",
-        "@eslint-community/regexpp": "^4.4.0",
-        "@eslint/eslintrc": "^2.1.0",
-        "@eslint/js": "8.44.0",
+        "@eslint-community/regexpp": "^4.6.1",
+        "@eslint/eslintrc": "^2.1.1",
+        "@eslint/js": "^8.46.0",
         "@humanwhocodes/config-array": "^0.11.10",
         "@humanwhocodes/module-importer": "^1.0.1",
         "@nodelib/fs.walk": "^1.2.8",
-        "ajv": "^6.10.0",
+        "ajv": "^6.12.4",
         "chalk": "^4.0.0",
         "cross-spawn": "^7.0.2",
         "debug": "^4.3.2",
         "doctrine": "^3.0.0",
         "escape-string-regexp": "^4.0.0",
-        "eslint-scope": "^7.2.0",
-        "eslint-visitor-keys": "^3.4.1",
-        "espree": "^9.6.0",
+        "eslint-scope": "^7.2.2",
+        "eslint-visitor-keys": "^3.4.2",
+        "espree": "^9.6.1",
         "esquery": "^1.4.2",
         "esutils": "^2.0.2",
         "fast-deep-equal": "^3.1.3",
@@ -7412,9 +7412,9 @@
       }
     },
     "node_modules/eslint-visitor-keys": {
-      "version": "3.4.1",
-      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.1.tgz",
-      "integrity": "sha512-pZnmmLwYzf+kWaM/Qgrvpen51upAktaaiI01nsJD/Yr3lMOdNtq0cxkrrg16w64VtisN6okbs7Q8AfGqj4c9fA==",
+      "version": "3.4.2",
+      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.2.tgz",
+      "integrity": "sha512-8drBzUEyZ2llkpCA67iYrgEssKDUu68V8ChqqOfFupIaG/LCVPUT+CoGJpT77zJprs4T/W7p07LP7zAIMuweVw==",
       "dev": true,
       "engines": {
         "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
@@ -7491,9 +7491,9 @@
       }
     },
     "node_modules/eslint/node_modules/eslint-scope": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.2.0.tgz",
-      "integrity": "sha512-DYj5deGlHBfMt15J7rdtyKNq/Nqlv5KfU4iodrQ019XESsRnwXH9KAE0y3cwtUHDo2ob7CypAnCqefh6vioWRw==",
+      "version": "7.2.2",
+      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.2.2.tgz",
+      "integrity": "sha512-dOt21O7lTMhDM+X9mB4GX+DZrZtCUJPL/wlcTqxyrx5IvO0IYtILdtrQGQp+8n5S0gwSVmOf9NQrjMOgfQZlIg==",
       "dev": true,
       "dependencies": {
         "esrecurse": "^4.3.0",
@@ -7631,9 +7631,9 @@
       }
     },
     "node_modules/espree": {
-      "version": "9.6.0",
-      "resolved": "https://registry.npmjs.org/espree/-/espree-9.6.0.tgz",
-      "integrity": "sha512-1FH/IiruXZ84tpUlm0aCUEwMl2Ho5ilqVh0VvQXw+byAz/4SAciyHLlfmL5WYqsvD38oymdUwBss0LtK8m4s/A==",
+      "version": "9.6.1",
+      "resolved": "https://registry.npmjs.org/espree/-/espree-9.6.1.tgz",
+      "integrity": "sha512-oruZaFkjorTpF32kDSI5/75ViwGeZginGGy2NoOSg3Q9bnwlnmDm4HLnkl0RE3n+njDXR037aY1+x58Z/zFdwQ==",
       "dev": true,
       "dependencies": {
         "acorn": "^8.9.0",
@@ -18788,15 +18788,15 @@
       }
     },
     "@eslint-community/regexpp": {
-      "version": "4.4.0",
-      "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.4.0.tgz",
-      "integrity": "sha512-A9983Q0LnDGdLPjxyXQ00sbV+K+O+ko2Dr+CZigbHWtX9pNfxlaBkMR8X1CztI73zuEyEBXTVjx7CE+/VSwDiQ==",
+      "version": "4.6.2",
+      "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.6.2.tgz",
+      "integrity": "sha512-pPTNuaAG3QMH+buKyBIGJs3g/S5y0caxw0ygM3YyE6yJFySwiGGSzA+mM3KJ8QQvzeLh3blwgSonkFjgQdxzMw==",
       "dev": true
     },
     "@eslint/eslintrc": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.1.0.tgz",
-      "integrity": "sha512-Lj7DECXqIVCqnqjjHMPna4vn6GJcMgul/wuS0je9OZ9gsL0zzDpKPVtcG1HaDVc+9y+qgXneTeUMbCqXJNpH1A==",
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.1.1.tgz",
+      "integrity": "sha512-9t7ZA7NGGK8ckelF0PQCfcxIUzs1Md5rrO6U/c+FIQNanea5UZC0wqKXH4vHBccmu4ZJgZ2idtPeW7+Q2npOEA==",
       "dev": true,
       "requires": {
         "ajv": "^6.12.4",
@@ -18843,9 +18843,9 @@
       }
     },
     "@eslint/js": {
-      "version": "8.44.0",
-      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.44.0.tgz",
-      "integrity": "sha512-Ag+9YM4ocKQx9AarydN0KY2j0ErMHNIocPDrVo8zAE44xLTjEtz81OdR68/cydGtk6m6jDb5Za3r2useMzYmSw==",
+      "version": "8.46.0",
+      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.46.0.tgz",
+      "integrity": "sha512-a8TLtmPi8xzPkCbp/OGFUo5yhRkHM2Ko9kOWP4znJr0WAhWyThaw3PnwX4vOTWOAMsV2uRt32PPDcEz63esSaA==",
       "dev": true
     },
     "@ethereumjs/common": {
@@ -22623,27 +22623,27 @@
       }
     },
     "eslint": {
-      "version": "8.45.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.45.0.tgz",
-      "integrity": "sha512-pd8KSxiQpdYRfYa9Wufvdoct3ZPQQuVuU5O6scNgMuOMYuxvH0IGaYK0wUFjo4UYYQQCUndlXiMbnxopwvvTiw==",
+      "version": "8.46.0",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.46.0.tgz",
+      "integrity": "sha512-cIO74PvbW0qU8e0mIvk5IV3ToWdCq5FYG6gWPHHkx6gNdjlbAYvtfHmlCMXxjcoVaIdwy/IAt3+mDkZkfvb2Dg==",
       "dev": true,
       "requires": {
         "@eslint-community/eslint-utils": "^4.2.0",
-        "@eslint-community/regexpp": "^4.4.0",
-        "@eslint/eslintrc": "^2.1.0",
-        "@eslint/js": "8.44.0",
+        "@eslint-community/regexpp": "^4.6.1",
+        "@eslint/eslintrc": "^2.1.1",
+        "@eslint/js": "^8.46.0",
         "@humanwhocodes/config-array": "^0.11.10",
         "@humanwhocodes/module-importer": "^1.0.1",
         "@nodelib/fs.walk": "^1.2.8",
-        "ajv": "^6.10.0",
+        "ajv": "^6.12.4",
         "chalk": "^4.0.0",
         "cross-spawn": "^7.0.2",
         "debug": "^4.3.2",
         "doctrine": "^3.0.0",
         "escape-string-regexp": "^4.0.0",
-        "eslint-scope": "^7.2.0",
-        "eslint-visitor-keys": "^3.4.1",
-        "espree": "^9.6.0",
+        "eslint-scope": "^7.2.2",
+        "eslint-visitor-keys": "^3.4.2",
+        "espree": "^9.6.1",
         "esquery": "^1.4.2",
         "esutils": "^2.0.2",
         "fast-deep-equal": "^3.1.3",
@@ -22714,9 +22714,9 @@
           "dev": true
         },
         "eslint-scope": {
-          "version": "7.2.0",
-          "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.2.0.tgz",
-          "integrity": "sha512-DYj5deGlHBfMt15J7rdtyKNq/Nqlv5KfU4iodrQ019XESsRnwXH9KAE0y3cwtUHDo2ob7CypAnCqefh6vioWRw==",
+          "version": "7.2.2",
+          "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.2.2.tgz",
+          "integrity": "sha512-dOt21O7lTMhDM+X9mB4GX+DZrZtCUJPL/wlcTqxyrx5IvO0IYtILdtrQGQp+8n5S0gwSVmOf9NQrjMOgfQZlIg==",
           "dev": true,
           "requires": {
             "esrecurse": "^4.3.0",
@@ -23014,15 +23014,15 @@
       }
     },
     "eslint-visitor-keys": {
-      "version": "3.4.1",
-      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.1.tgz",
-      "integrity": "sha512-pZnmmLwYzf+kWaM/Qgrvpen51upAktaaiI01nsJD/Yr3lMOdNtq0cxkrrg16w64VtisN6okbs7Q8AfGqj4c9fA==",
+      "version": "3.4.2",
+      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.2.tgz",
+      "integrity": "sha512-8drBzUEyZ2llkpCA67iYrgEssKDUu68V8ChqqOfFupIaG/LCVPUT+CoGJpT77zJprs4T/W7p07LP7zAIMuweVw==",
       "dev": true
     },
     "espree": {
-      "version": "9.6.0",
-      "resolved": "https://registry.npmjs.org/espree/-/espree-9.6.0.tgz",
-      "integrity": "sha512-1FH/IiruXZ84tpUlm0aCUEwMl2Ho5ilqVh0VvQXw+byAz/4SAciyHLlfmL5WYqsvD38oymdUwBss0LtK8m4s/A==",
+      "version": "9.6.1",
+      "resolved": "https://registry.npmjs.org/espree/-/espree-9.6.1.tgz",
+      "integrity": "sha512-oruZaFkjorTpF32kDSI5/75ViwGeZginGGy2NoOSg3Q9bnwlnmDm4HLnkl0RE3n+njDXR037aY1+x58Z/zFdwQ==",
       "dev": true,
       "requires": {
         "acorn": "^8.9.0",
diff --git a/apps/block_scout_web/assets/package.json b/apps/block_scout_web/assets/package.json
index 830c812f522e..6d905ae1c06a 100644
--- a/apps/block_scout_web/assets/package.json
+++ b/apps/block_scout_web/assets/package.json
@@ -90,7 +90,7 @@
     "copy-webpack-plugin": "^11.0.0",
     "css-loader": "^5.2.7",
     "css-minimizer-webpack-plugin": "^5.0.1",
-    "eslint": "^8.45.0",
+    "eslint": "^8.46.0",
     "eslint-config-standard": "^17.1.0",
     "eslint-plugin-import": "^2.27.5",
     "eslint-plugin-node": "^11.1.0",

From 6d81f89e228e1009c782d74c9f65b662b17a630a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 28 Jul 2023 18:09:40 +0000
Subject: [PATCH 243/909] Bump core-js from 3.31.1 to 3.32.0 in
 /apps/block_scout_web/assets

Bumps [core-js](https://github.com/zloirock/core-js/tree/HEAD/packages/core-js) from 3.31.1 to 3.32.0.
- [Release notes](https://github.com/zloirock/core-js/releases)
- [Changelog](https://github.com/zloirock/core-js/blob/master/CHANGELOG.md)
- [Commits](https://github.com/zloirock/core-js/commits/v3.32.0/packages/core-js)

---
updated-dependencies:
- dependency-name: core-js
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 apps/block_scout_web/assets/package-lock.json | 14 +++++++-------
 apps/block_scout_web/assets/package.json      |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/apps/block_scout_web/assets/package-lock.json b/apps/block_scout_web/assets/package-lock.json
index a680a41f4127..b24e2671e83f 100644
--- a/apps/block_scout_web/assets/package-lock.json
+++ b/apps/block_scout_web/assets/package-lock.json
@@ -17,7 +17,7 @@
         "chart.js": "^4.3.2",
         "chartjs-adapter-luxon": "^1.3.1",
         "clipboard": "^2.0.11",
-        "core-js": "^3.31.1",
+        "core-js": "^3.32.0",
         "crypto-browserify": "^3.12.0",
         "dropzone": "^5.9.3",
         "eth-net-props": "^1.0.41",
@@ -5778,9 +5778,9 @@
       }
     },
     "node_modules/core-js": {
-      "version": "3.31.1",
-      "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.31.1.tgz",
-      "integrity": "sha512-2sKLtfq1eFST7l7v62zaqXacPc7uG8ZAya8ogijLhTtaKNcpzpB4TMoTw2Si+8GYKRwFPMMtUT0263QFWFfqyQ==",
+      "version": "3.32.0",
+      "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.32.0.tgz",
+      "integrity": "sha512-rd4rYZNlF3WuoYuRIDEmbR/ga9CeuWX9U05umAvgrrZoHY4Z++cp/xwPQMvUpBB4Ag6J8KfD80G0zwCyaSxDww==",
       "hasInstallScript": true,
       "funding": {
         "type": "opencollective",
@@ -21653,9 +21653,9 @@
       }
     },
     "core-js": {
-      "version": "3.31.1",
-      "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.31.1.tgz",
-      "integrity": "sha512-2sKLtfq1eFST7l7v62zaqXacPc7uG8ZAya8ogijLhTtaKNcpzpB4TMoTw2Si+8GYKRwFPMMtUT0263QFWFfqyQ=="
+      "version": "3.32.0",
+      "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.32.0.tgz",
+      "integrity": "sha512-rd4rYZNlF3WuoYuRIDEmbR/ga9CeuWX9U05umAvgrrZoHY4Z++cp/xwPQMvUpBB4Ag6J8KfD80G0zwCyaSxDww=="
     },
     "core-js-compat": {
       "version": "3.31.0",
diff --git a/apps/block_scout_web/assets/package.json b/apps/block_scout_web/assets/package.json
index 830c812f522e..968fecfc7ff0 100644
--- a/apps/block_scout_web/assets/package.json
+++ b/apps/block_scout_web/assets/package.json
@@ -29,7 +29,7 @@
     "chart.js": "^4.3.2",
     "chartjs-adapter-luxon": "^1.3.1",
     "clipboard": "^2.0.11",
-    "core-js": "^3.31.1",
+    "core-js": "^3.32.0",
     "crypto-browserify": "^3.12.0",
     "dropzone": "^5.9.3",
     "eth-net-props": "^1.0.41",

From 7214615f8096146c19722970afbc823d235c1336 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 28 Jul 2023 18:40:44 +0000
Subject: [PATCH 244/909] Bump ex_json_schema from 0.9.3 to 0.10.1

Bumps [ex_json_schema](https://github.com/jonasschmidt/ex_json_schema) from 0.9.3 to 0.10.1.
- [Commits](https://github.com/jonasschmidt/ex_json_schema/compare/v0.9.3...v0.10.1)

---
updated-dependencies:
- dependency-name: ex_json_schema
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 apps/block_scout_web/mix.exs | 2 +-
 mix.lock                     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/block_scout_web/mix.exs b/apps/block_scout_web/mix.exs
index 03a852bd85b2..a101102aaa40 100644
--- a/apps/block_scout_web/mix.exs
+++ b/apps/block_scout_web/mix.exs
@@ -128,7 +128,7 @@ defmodule BlockScoutWeb.Mixfile do
       {:wallaby, "~> 0.30", only: :test, runtime: false},
       # `:cowboy` `~> 2.0` and Phoenix 1.4 compatibility
       {:websocket_client, git: "https://github.com/blockscout/websocket_client.git", branch: "master", override: true},
-      {:ex_json_schema, "~> 0.9.1"},
+      {:ex_json_schema, "~> 0.10.1"},
       {:ueberauth, "~> 0.7"},
       {:ueberauth_auth0, "~> 2.0"},
       {:bureaucrat, "~> 0.2.9", only: :test}
diff --git a/mix.lock b/mix.lock
index 419fe5f791e7..c27497c98f85 100644
--- a/mix.lock
+++ b/mix.lock
@@ -48,7 +48,7 @@
   "ex_cldr_numbers": {:hex, :ex_cldr_numbers, "2.31.3", "6ec8b18c395c0e8788d46da806f8f2abcbe4b0d809226d2a91363e9ccd85f2f5", [:mix], [{:decimal, "~> 1.6 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: false]}, {:digital_token, "~> 0.3 or ~> 1.0", [hex: :digital_token, repo: "hexpm", optional: false]}, {:ex_cldr, "~> 2.37", [hex: :ex_cldr, repo: "hexpm", optional: false]}, {:ex_cldr_currencies, ">= 2.14.2", [hex: :ex_cldr_currencies, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}], "hexpm", "b519de08ecc4a6402038f3aa75e8654f78ebd6fa714b7e585531504e648588fd"},
   "ex_cldr_units": {:hex, :ex_cldr_units, "3.16.2", "dbad303fba819981c578234e2aaf19d72efca16ea8b1c6ee46b26232cb45e232", [:mix], [{:cldr_utils, "~> 2.24", [hex: :cldr_utils, repo: "hexpm", optional: false]}, {:decimal, "~> 1.6 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: false]}, {:ex_cldr_lists, "~> 2.10", [hex: :ex_cldr_lists, repo: "hexpm", optional: false]}, {:ex_cldr_numbers, "~> 2.31", [hex: :ex_cldr_numbers, repo: "hexpm", optional: false]}, {:ex_doc, "~> 0.18", [hex: :ex_doc, repo: "hexpm", optional: true]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}], "hexpm", "851095319fb3205c1549619da742cd53a2804c1d9c204cf84014021e2a6ea7e5"},
   "ex_doc": {:hex, :ex_doc, "0.30.3", "bfca4d340e3b95f2eb26e72e4890da83e2b3a5c5b0e52607333bf5017284b063", [:mix], [{:earmark_parser, "~> 1.4.31", [hex: :earmark_parser, repo: "hexpm", optional: false]}, {:makeup_elixir, "~> 0.14", [hex: :makeup_elixir, repo: "hexpm", optional: false]}, {:makeup_erlang, "~> 0.1", [hex: :makeup_erlang, repo: "hexpm", optional: false]}], "hexpm", "fbc8702046c1d25edf79de376297e608ac78cdc3a29f075484773ad1718918b6"},
-  "ex_json_schema": {:hex, :ex_json_schema, "0.9.3", "fc17c50d410fd99fa6e814e1aed60122d8ff2578b869d17a9db1ce1c621382b6", [:mix], [{:decimal, "~> 2.0", [hex: :decimal, repo: "hexpm", optional: false]}], "hexpm", "b79962d09cefd33001706255187bdb483a0c2b4442d5edc6822eb7574a8df0a8"},
+  "ex_json_schema": {:hex, :ex_json_schema, "0.10.1", "e03b746b6675a750c0bb1a5cc919f61353f7ab8450977e11ceede20e6180c560", [:mix], [{:decimal, "~> 2.0", [hex: :decimal, repo: "hexpm", optional: false]}], "hexpm", "66a64e60dadad89914d92f89c7e7906c57de75a8b79ac2480d0d53e1b8096fb0"},
   "ex_keccak": {:hex, :ex_keccak, "0.7.1", "0169f4b0c5073c5df61581d6282b12f1a1b764dcfcda4eeb1c819b5194c9ced0", [:mix], [{:rustler, ">= 0.0.0", [hex: :rustler, repo: "hexpm", optional: true]}, {:rustler_precompiled, "~> 0.6.1", [hex: :rustler_precompiled, repo: "hexpm", optional: false]}], "hexpm", "c18c19f66b6545b4b46b0c71c0cc0079de84e30b26365a92961e91697e8724ed"},
   "ex_machina": {:hex, :ex_machina, "2.7.0", "b792cc3127fd0680fecdb6299235b4727a4944a09ff0fa904cc639272cd92dc7", [:mix], [{:ecto, "~> 2.2 or ~> 3.0", [hex: :ecto, repo: "hexpm", optional: true]}, {:ecto_sql, "~> 3.0", [hex: :ecto_sql, repo: "hexpm", optional: true]}], "hexpm", "419aa7a39bde11894c87a615c4ecaa52d8f107bbdd81d810465186f783245bf8"},
   "ex_rlp": {:hex, :ex_rlp, "0.6.0", "985391d2356a7cb8712a4a9a2deb93f19f2fbca0323f5c1203fcaf64d077e31e", [:mix], [], "hexpm", "7135db93b861d9e76821039b60b00a6a22d2c4e751bf8c444bffe7a042f1abaf"},

From 8c5c25f8cd997bf1a0121154790847a1083eb67c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 28 Jul 2023 19:19:51 +0000
Subject: [PATCH 245/909] Bump eslint-plugin-import in
 /apps/block_scout_web/assets

Bumps [eslint-plugin-import](https://github.com/import-js/eslint-plugin-import) from 2.27.5 to 2.28.0.
- [Release notes](https://github.com/import-js/eslint-plugin-import/releases)
- [Changelog](https://github.com/import-js/eslint-plugin-import/blob/main/CHANGELOG.md)
- [Commits](https://github.com/import-js/eslint-plugin-import/compare/v2.27.5...v2.28.0)

---
updated-dependencies:
- dependency-name: eslint-plugin-import
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 apps/block_scout_web/assets/package-lock.json | 548 ++++++++++++++----
 apps/block_scout_web/assets/package.json      |   2 +-
 2 files changed, 433 insertions(+), 117 deletions(-)

diff --git a/apps/block_scout_web/assets/package-lock.json b/apps/block_scout_web/assets/package-lock.json
index c9a20d296c18..d32d3ae0b90f 100644
--- a/apps/block_scout_web/assets/package-lock.json
+++ b/apps/block_scout_web/assets/package-lock.json
@@ -80,7 +80,7 @@
         "css-minimizer-webpack-plugin": "^5.0.1",
         "eslint": "^8.46.0",
         "eslint-config-standard": "^17.1.0",
-        "eslint-plugin-import": "^2.27.5",
+        "eslint-plugin-import": "^2.28.0",
         "eslint-plugin-node": "^11.1.0",
         "eslint-plugin-promise": "^6.1.1",
         "file-loader": "^6.2.0",
@@ -4337,6 +4337,19 @@
         "sprintf-js": "~1.0.2"
       }
     },
+    "node_modules/array-buffer-byte-length": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/array-buffer-byte-length/-/array-buffer-byte-length-1.0.0.tgz",
+      "integrity": "sha512-LPuwb2P+NrQw3XhxGc36+XSvuBPopovXYTR9Ew++Du9Yb/bx5AzBfrIsBoj0EZUifjQU+sHL21sseZ3jerWO/A==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "is-array-buffer": "^3.0.1"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "node_modules/array-flatten": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz",
@@ -4361,6 +4374,25 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/array.prototype.findlastindex": {
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/array.prototype.findlastindex/-/array.prototype.findlastindex-1.2.2.tgz",
+      "integrity": "sha512-tb5thFFlUcp7NdNF6/MpDk/1r/4awWG1FIz3YqDf+/zJSTezBb+/5WViH41obXULHVpDzoiCLpJ/ZO9YbJMsdw==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.4",
+        "es-abstract": "^1.20.4",
+        "es-shim-unscopables": "^1.0.0",
+        "get-intrinsic": "^1.1.3"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "node_modules/array.prototype.flat": {
       "version": "1.3.1",
       "resolved": "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.3.1.tgz",
@@ -4397,6 +4429,26 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/arraybuffer.prototype.slice": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/arraybuffer.prototype.slice/-/arraybuffer.prototype.slice-1.0.1.tgz",
+      "integrity": "sha512-09x0ZWFEjj4WD8PDbykUwo3t9arLn8NIzmmYEJFpYekOAQjpkGSyrQhNoRTcwwcFRu+ycWF78QZ63oWTqSjBcw==",
+      "dev": true,
+      "dependencies": {
+        "array-buffer-byte-length": "^1.0.0",
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.2.0",
+        "get-intrinsic": "^1.2.1",
+        "is-array-buffer": "^3.0.2",
+        "is-shared-array-buffer": "^1.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "node_modules/asn1": {
       "version": "0.2.4",
       "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.4.tgz",
@@ -6456,9 +6508,9 @@
       }
     },
     "node_modules/define-properties": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.4.tgz",
-      "integrity": "sha512-uckOqKcfaVvtBdsVkdPv3XjveQJsNQqmhXgRi8uhvWWuPYZCNlzT8qAyblUgNoXdHdjMTzAqeGjAoli8f+bzPA==",
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.2.0.tgz",
+      "integrity": "sha512-xvqAVKGfT1+UAvPwKTVw/njhdQ8ZhXK4lI0bCIuCMrp2up9nPnaDftrLtmpTazqd1o+UY4zgzU+avtMbDP+ldA==",
       "dependencies": {
         "has-property-descriptors": "^1.0.0",
         "object-keys": "^1.1.1"
@@ -6815,18 +6867,19 @@
       }
     },
     "node_modules/es-abstract": {
-      "version": "1.21.1",
-      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.21.1.tgz",
-      "integrity": "sha512-QudMsPOz86xYz/1dG1OuGBKOELjCh99IIWHLzy5znUB6j8xG2yMA7bfTV86VSqKF+Y/H08vQPR+9jyXpuC6hfg==",
+      "version": "1.22.1",
+      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.22.1.tgz",
+      "integrity": "sha512-ioRRcXMO6OFyRpyzV3kE1IIBd4WG5/kltnzdxSCqoP8CMGs/Li+M1uF5o7lOkZVFjDs+NLesthnF66Pg/0q0Lw==",
       "dev": true,
       "dependencies": {
+        "array-buffer-byte-length": "^1.0.0",
+        "arraybuffer.prototype.slice": "^1.0.1",
         "available-typed-arrays": "^1.0.5",
         "call-bind": "^1.0.2",
         "es-set-tostringtag": "^2.0.1",
         "es-to-primitive": "^1.2.1",
-        "function-bind": "^1.1.1",
         "function.prototype.name": "^1.1.5",
-        "get-intrinsic": "^1.1.3",
+        "get-intrinsic": "^1.2.1",
         "get-symbol-description": "^1.0.0",
         "globalthis": "^1.0.3",
         "gopd": "^1.0.1",
@@ -6834,8 +6887,8 @@
         "has-property-descriptors": "^1.0.0",
         "has-proto": "^1.0.1",
         "has-symbols": "^1.0.3",
-        "internal-slot": "^1.0.4",
-        "is-array-buffer": "^3.0.1",
+        "internal-slot": "^1.0.5",
+        "is-array-buffer": "^3.0.2",
         "is-callable": "^1.2.7",
         "is-negative-zero": "^2.0.2",
         "is-regex": "^1.1.4",
@@ -6843,16 +6896,21 @@
         "is-string": "^1.0.7",
         "is-typed-array": "^1.1.10",
         "is-weakref": "^1.0.2",
-        "object-inspect": "^1.12.2",
+        "object-inspect": "^1.12.3",
         "object-keys": "^1.1.1",
         "object.assign": "^4.1.4",
-        "regexp.prototype.flags": "^1.4.3",
+        "regexp.prototype.flags": "^1.5.0",
+        "safe-array-concat": "^1.0.0",
         "safe-regex-test": "^1.0.0",
+        "string.prototype.trim": "^1.2.7",
         "string.prototype.trimend": "^1.0.6",
         "string.prototype.trimstart": "^1.0.6",
+        "typed-array-buffer": "^1.0.0",
+        "typed-array-byte-length": "^1.0.0",
+        "typed-array-byte-offset": "^1.0.0",
         "typed-array-length": "^1.0.4",
         "unbox-primitive": "^1.0.2",
-        "which-typed-array": "^1.1.9"
+        "which-typed-array": "^1.1.10"
       },
       "engines": {
         "node": ">= 0.4"
@@ -7157,9 +7215,9 @@
       }
     },
     "node_modules/eslint-module-utils": {
-      "version": "2.7.4",
-      "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.7.4.tgz",
-      "integrity": "sha512-j4GT+rqzCoRKHwURX7pddtIPGySnX9Si/cgMI5ztrcqOPtk5dDEeZ34CQVPphnqkJytlc97Vuk05Um2mJ3gEQA==",
+      "version": "2.8.0",
+      "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.8.0.tgz",
+      "integrity": "sha512-aWajIYfsqCKRDgUfjEXNN/JlrzauMuSEy5sbd7WXbtW3EH6A6MpwEh42c7qD+MqQo9QMJ6fWLAeIJynx0g6OAw==",
       "dev": true,
       "dependencies": {
         "debug": "^3.2.7"
@@ -7203,26 +7261,29 @@
       }
     },
     "node_modules/eslint-plugin-import": {
-      "version": "2.27.5",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.27.5.tgz",
-      "integrity": "sha512-LmEt3GVofgiGuiE+ORpnvP+kAm3h6MLZJ4Q5HCyHADofsb4VzXFsRiWj3c0OFiV+3DWFh0qg3v9gcPlfc3zRow==",
+      "version": "2.28.0",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.28.0.tgz",
+      "integrity": "sha512-B8s/n+ZluN7sxj9eUf7/pRFERX0r5bnFA2dCaLHy2ZeaQEAz0k+ZZkFWRFHJAqxfxQDx6KLv9LeIki7cFdwW+Q==",
       "dev": true,
       "dependencies": {
         "array-includes": "^3.1.6",
+        "array.prototype.findlastindex": "^1.2.2",
         "array.prototype.flat": "^1.3.1",
         "array.prototype.flatmap": "^1.3.1",
         "debug": "^3.2.7",
         "doctrine": "^2.1.0",
         "eslint-import-resolver-node": "^0.3.7",
-        "eslint-module-utils": "^2.7.4",
+        "eslint-module-utils": "^2.8.0",
         "has": "^1.0.3",
-        "is-core-module": "^2.11.0",
+        "is-core-module": "^2.12.1",
         "is-glob": "^4.0.3",
         "minimatch": "^3.1.2",
+        "object.fromentries": "^2.0.6",
+        "object.groupby": "^1.0.0",
         "object.values": "^1.1.6",
-        "resolve": "^1.22.1",
-        "semver": "^6.3.0",
-        "tsconfig-paths": "^3.14.1"
+        "resolve": "^1.22.3",
+        "semver": "^6.3.1",
+        "tsconfig-paths": "^3.14.2"
       },
       "engines": {
         "node": ">=4"
@@ -8834,12 +8895,13 @@
       }
     },
     "node_modules/get-intrinsic": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.3.tgz",
-      "integrity": "sha512-QJVz1Tj7MS099PevUG5jvnt9tSkXN8K14dxQlikJuPt4uD9hHAHjLyLBiLR5zELelBdD9QNRAXZzsJx0WaDL9A==",
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.1.tgz",
+      "integrity": "sha512-2DcsyfABl+gVHEfCOaTrWgyt+tb6MSEGmKq+kI5HwLbIYgjgmMcV8KQ41uaKz1xxUcn9tJtgFbQUEVcEbd0FYw==",
       "dependencies": {
         "function-bind": "^1.1.1",
         "has": "^1.0.3",
+        "has-proto": "^1.0.1",
         "has-symbols": "^1.0.3"
       },
       "funding": {
@@ -9111,7 +9173,6 @@
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/has-proto/-/has-proto-1.0.1.tgz",
       "integrity": "sha512-7qE+iP+O+bgF9clE5+UoBFzE65mlBiVj3tKCrlNQ0Ogwm0BjpT/gK4SlLYDMybDh5I3TCTKnPPa0oMG7JDYrhg==",
-      "dev": true,
       "engines": {
         "node": ">= 0.4"
       },
@@ -9462,12 +9523,12 @@
       "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="
     },
     "node_modules/internal-slot": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.4.tgz",
-      "integrity": "sha512-tA8URYccNzMo94s5MQZgH8NB/XTa6HsOo0MLfXTKKEnHVVdegzaQoFZ7Jp44bdvLvY2waT5dc+j5ICEswhi7UQ==",
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.5.tgz",
+      "integrity": "sha512-Y+R5hJrzs52QCG2laLn4udYVnxsfny9CpOhNhUvk/SSSVyF6T27FzRbF0sroPidSu3X8oEAkOn2K804mjpt6UQ==",
       "dev": true,
       "dependencies": {
-        "get-intrinsic": "^1.1.3",
+        "get-intrinsic": "^1.2.0",
         "has": "^1.0.3",
         "side-channel": "^1.0.4"
       },
@@ -9508,13 +9569,13 @@
       }
     },
     "node_modules/is-array-buffer": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/is-array-buffer/-/is-array-buffer-3.0.1.tgz",
-      "integrity": "sha512-ASfLknmY8Xa2XtB4wmbz13Wu202baeA18cJBCeCy0wXUHZF0IPyVEXqKEcd+t2fNSLLL1vC6k7lxZEojNbISXQ==",
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/is-array-buffer/-/is-array-buffer-3.0.2.tgz",
+      "integrity": "sha512-y+FyyR/w8vfIRq4eQcM1EYgSTnmHXPqaF+IgzgraytCFq5Xh8lllDVmAZolPJiZttZLeFSINPYMaEJ7/vWUa1w==",
       "dev": true,
       "dependencies": {
         "call-bind": "^1.0.2",
-        "get-intrinsic": "^1.1.3",
+        "get-intrinsic": "^1.2.0",
         "is-typed-array": "^1.1.10"
       },
       "funding": {
@@ -9579,9 +9640,9 @@
       }
     },
     "node_modules/is-core-module": {
-      "version": "2.11.0",
-      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.11.0.tgz",
-      "integrity": "sha512-RRjxlvLDkD1YJwDbroBHMb+cukurkDWNyHx7D3oNB5x9rb5ogcksMC5wHCadcXoo67gVr/+3GFySh3134zi6rw==",
+      "version": "2.12.1",
+      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.12.1.tgz",
+      "integrity": "sha512-Q4ZuBAe2FUsKtyQJoQHlvP8OvBERxO3jEmy1I7hcRXcJBGGHFh/aJBswbXuS9sgrDH2QUO8ilkwNPHvHMd8clg==",
       "dependencies": {
         "has": "^1.0.3"
       },
@@ -12960,6 +13021,35 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/object.fromentries": {
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/object.fromentries/-/object.fromentries-2.0.6.tgz",
+      "integrity": "sha512-VciD13dswC4j1Xt5394WR4MzmAQmlgN72phd/riNp9vtD7tp4QQWJ0R4wvclXcafgcYK8veHRed2W6XeGBvcfg==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.4",
+        "es-abstract": "^1.20.4"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/object.groupby": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/object.groupby/-/object.groupby-1.0.0.tgz",
+      "integrity": "sha512-70MWG6NfRH9GnbZOikuhPPYzpUpof9iW2J9E4dW7FXTqPNb6rllE6u39SKwwiNh8lCwX3DDb5OgcKGiEBrTTyw==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.2.0",
+        "es-abstract": "^1.21.2",
+        "get-intrinsic": "^1.2.1"
+      }
+    },
     "node_modules/object.values": {
       "version": "1.1.6",
       "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.1.6.tgz",
@@ -14525,14 +14615,14 @@
       }
     },
     "node_modules/regexp.prototype.flags": {
-      "version": "1.4.3",
-      "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.4.3.tgz",
-      "integrity": "sha512-fjggEOO3slI6Wvgjwflkc4NFRCTZAu5CnNfBd5qOMYhWdn67nJBBu34/TkD++eeFmd8C9r9jfXJ27+nSiRkSUA==",
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.5.0.tgz",
+      "integrity": "sha512-0SutC3pNudRKgquxGoRGIz946MZVHqbNfPjBdxeOhBrdgDKlRoXmYLQN9xRbrR09ZXWeGAdPuif7egofn6v5LA==",
       "dev": true,
       "dependencies": {
         "call-bind": "^1.0.2",
-        "define-properties": "^1.1.3",
-        "functions-have-names": "^1.2.2"
+        "define-properties": "^1.2.0",
+        "functions-have-names": "^1.2.3"
       },
       "engines": {
         "node": ">= 0.4"
@@ -14663,11 +14753,11 @@
       "dev": true
     },
     "node_modules/resolve": {
-      "version": "1.22.1",
-      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.1.tgz",
-      "integrity": "sha512-nBpuuYuY5jFsli/JIs1oldw6fOQCBioohqWZg/2hiaOybXOft4lonv85uDOKXdf8rhyK159cxU5cDcK/NKk8zw==",
+      "version": "1.22.3",
+      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.3.tgz",
+      "integrity": "sha512-P8ur/gp/AmbEzjr729bZnLjXK5Z+4P0zhIJgBgzqRih7hL7BOukHGtSTA3ACMY467GRFz3duQsi0bDZdR7DKdw==",
       "dependencies": {
-        "is-core-module": "^2.9.0",
+        "is-core-module": "^2.12.0",
         "path-parse": "^1.0.7",
         "supports-preserve-symlinks-flag": "^1.0.0"
       },
@@ -14814,6 +14904,30 @@
       "resolved": "https://registry.npmjs.org/rustbn.js/-/rustbn.js-0.2.0.tgz",
       "integrity": "sha512-4VlvkRUuCJvr2J6Y0ImW7NvTCriMi7ErOAqWk1y69vAdoNIzCF3yPmgeNzx+RQTLEDFq5sHfscn1MwHxP9hNfA=="
     },
+    "node_modules/safe-array-concat": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/safe-array-concat/-/safe-array-concat-1.0.0.tgz",
+      "integrity": "sha512-9dVEFruWIsnie89yym+xWTAYASdpw3CJV7Li/6zBewGf9z2i1j31rP6jnY0pHEO4QZh6N0K11bFjWmdR8UGdPQ==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "get-intrinsic": "^1.2.0",
+        "has-symbols": "^1.0.3",
+        "isarray": "^2.0.5"
+      },
+      "engines": {
+        "node": ">=0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/safe-array-concat/node_modules/isarray": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.5.tgz",
+      "integrity": "sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==",
+      "dev": true
+    },
     "node_modules/safe-buffer": {
       "version": "5.1.2",
       "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
@@ -15423,6 +15537,23 @@
         "node": ">=8"
       }
     },
+    "node_modules/string.prototype.trim": {
+      "version": "1.2.7",
+      "resolved": "https://registry.npmjs.org/string.prototype.trim/-/string.prototype.trim-1.2.7.tgz",
+      "integrity": "sha512-p6TmeT1T3411M8Cgg9wBTMRtY2q9+PNy9EV1i2lIXUN/btt763oIfxwN3RR8VU6wHX8j/1CFy0L+YuThm6bgOg==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.4",
+        "es-abstract": "^1.20.4"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "node_modules/string.prototype.trimend": {
       "version": "1.0.6",
       "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.6.tgz",
@@ -15962,13 +16093,13 @@
       }
     },
     "node_modules/tsconfig-paths": {
-      "version": "3.14.1",
-      "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.14.1.tgz",
-      "integrity": "sha512-fxDhWnFSLt3VuTwtvJt5fpwxBHg5AdKWMsgcPOOIilyjymcYVZoCQF8fvFRezCNfblEXmi+PcM1eYHeOAgXCOQ==",
+      "version": "3.14.2",
+      "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.14.2.tgz",
+      "integrity": "sha512-o/9iXgCYc5L/JxCHPe3Hvh8Q/2xm5Z+p18PESBU6Ff33695QnCHBEjcytY2q19ua7Mbl/DavtBOLq+oG0RCL+g==",
       "dev": true,
       "dependencies": {
         "@types/json5": "^0.0.29",
-        "json5": "^1.0.1",
+        "json5": "^1.0.2",
         "minimist": "^1.2.6",
         "strip-bom": "^3.0.0"
       }
@@ -16064,6 +16195,57 @@
         "node": ">= 0.6"
       }
     },
+    "node_modules/typed-array-buffer": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/typed-array-buffer/-/typed-array-buffer-1.0.0.tgz",
+      "integrity": "sha512-Y8KTSIglk9OZEr8zywiIHG/kmQ7KWyjseXs1CbSo8vC42w7hg2HgYTxSWwP0+is7bWDc1H+Fo026CpHFwm8tkw==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "get-intrinsic": "^1.2.1",
+        "is-typed-array": "^1.1.10"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/typed-array-byte-length": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/typed-array-byte-length/-/typed-array-byte-length-1.0.0.tgz",
+      "integrity": "sha512-Or/+kvLxNpeQ9DtSydonMxCx+9ZXOswtwJn17SNLvhptaXYDJvkFFP5zbfU/uLmvnBJlI4yrnXRxpdWH/M5tNA==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "for-each": "^0.3.3",
+        "has-proto": "^1.0.1",
+        "is-typed-array": "^1.1.10"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/typed-array-byte-offset": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/typed-array-byte-offset/-/typed-array-byte-offset-1.0.0.tgz",
+      "integrity": "sha512-RD97prjEt9EL8YgAgpOkf3O4IF9lhJFr9g0htQkm0rchFp/Vx7LW5Q8fSXXub7BXAODyUQohRMyOc3faCPd0hg==",
+      "dev": true,
+      "dependencies": {
+        "available-typed-arrays": "^1.0.5",
+        "call-bind": "^1.0.2",
+        "for-each": "^0.3.3",
+        "has-proto": "^1.0.1",
+        "is-typed-array": "^1.1.10"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "node_modules/typed-array-length": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/typed-array-length/-/typed-array-length-1.0.4.tgz",
@@ -17122,16 +17304,15 @@
       "integrity": "sha512-B+enWhmw6cjfVC7kS8Pj9pCrKSc5txArRyaYGe088shv/FGWH+0Rjx/xPgtsWfsUtS27FkP697E4DDhgrgoc0Q=="
     },
     "node_modules/which-typed-array": {
-      "version": "1.1.9",
-      "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.9.tgz",
-      "integrity": "sha512-w9c4xkx6mPidwp7180ckYWfMmvxpjlZuIudNtDf4N/tTAUB8VJbX25qZoAsrtGuYNnGw3pa0AXgbGKRB8/EceA==",
+      "version": "1.1.11",
+      "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.11.tgz",
+      "integrity": "sha512-qe9UWWpkeG5yzZ0tNYxDmd7vo58HDBc39mZ0xWWpolAGADdFOzkfamWLDxkOWcvHQKVmdTyQdLD4NOfjLWTKew==",
       "dependencies": {
         "available-typed-arrays": "^1.0.5",
         "call-bind": "^1.0.2",
         "for-each": "^0.3.3",
         "gopd": "^1.0.1",
-        "has-tostringtag": "^1.0.0",
-        "is-typed-array": "^1.1.10"
+        "has-tostringtag": "^1.0.0"
       },
       "engines": {
         "node": ">= 0.4"
@@ -20553,6 +20734,16 @@
         "sprintf-js": "~1.0.2"
       }
     },
+    "array-buffer-byte-length": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/array-buffer-byte-length/-/array-buffer-byte-length-1.0.0.tgz",
+      "integrity": "sha512-LPuwb2P+NrQw3XhxGc36+XSvuBPopovXYTR9Ew++Du9Yb/bx5AzBfrIsBoj0EZUifjQU+sHL21sseZ3jerWO/A==",
+      "dev": true,
+      "requires": {
+        "call-bind": "^1.0.2",
+        "is-array-buffer": "^3.0.1"
+      }
+    },
     "array-flatten": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz",
@@ -20571,6 +20762,19 @@
         "is-string": "^1.0.7"
       }
     },
+    "array.prototype.findlastindex": {
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/array.prototype.findlastindex/-/array.prototype.findlastindex-1.2.2.tgz",
+      "integrity": "sha512-tb5thFFlUcp7NdNF6/MpDk/1r/4awWG1FIz3YqDf+/zJSTezBb+/5WViH41obXULHVpDzoiCLpJ/ZO9YbJMsdw==",
+      "dev": true,
+      "requires": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.4",
+        "es-abstract": "^1.20.4",
+        "es-shim-unscopables": "^1.0.0",
+        "get-intrinsic": "^1.1.3"
+      }
+    },
     "array.prototype.flat": {
       "version": "1.3.1",
       "resolved": "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.3.1.tgz",
@@ -20595,6 +20799,20 @@
         "es-shim-unscopables": "^1.0.0"
       }
     },
+    "arraybuffer.prototype.slice": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/arraybuffer.prototype.slice/-/arraybuffer.prototype.slice-1.0.1.tgz",
+      "integrity": "sha512-09x0ZWFEjj4WD8PDbykUwo3t9arLn8NIzmmYEJFpYekOAQjpkGSyrQhNoRTcwwcFRu+ycWF78QZ63oWTqSjBcw==",
+      "dev": true,
+      "requires": {
+        "array-buffer-byte-length": "^1.0.0",
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.2.0",
+        "get-intrinsic": "^1.2.1",
+        "is-array-buffer": "^3.0.2",
+        "is-shared-array-buffer": "^1.0.2"
+      }
+    },
     "asn1": {
       "version": "0.2.4",
       "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.4.tgz",
@@ -22148,9 +22366,9 @@
       }
     },
     "define-properties": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.4.tgz",
-      "integrity": "sha512-uckOqKcfaVvtBdsVkdPv3XjveQJsNQqmhXgRi8uhvWWuPYZCNlzT8qAyblUgNoXdHdjMTzAqeGjAoli8f+bzPA==",
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.2.0.tgz",
+      "integrity": "sha512-xvqAVKGfT1+UAvPwKTVw/njhdQ8ZhXK4lI0bCIuCMrp2up9nPnaDftrLtmpTazqd1o+UY4zgzU+avtMbDP+ldA==",
       "requires": {
         "has-property-descriptors": "^1.0.0",
         "object-keys": "^1.1.1"
@@ -22431,18 +22649,19 @@
       }
     },
     "es-abstract": {
-      "version": "1.21.1",
-      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.21.1.tgz",
-      "integrity": "sha512-QudMsPOz86xYz/1dG1OuGBKOELjCh99IIWHLzy5znUB6j8xG2yMA7bfTV86VSqKF+Y/H08vQPR+9jyXpuC6hfg==",
+      "version": "1.22.1",
+      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.22.1.tgz",
+      "integrity": "sha512-ioRRcXMO6OFyRpyzV3kE1IIBd4WG5/kltnzdxSCqoP8CMGs/Li+M1uF5o7lOkZVFjDs+NLesthnF66Pg/0q0Lw==",
       "dev": true,
       "requires": {
+        "array-buffer-byte-length": "^1.0.0",
+        "arraybuffer.prototype.slice": "^1.0.1",
         "available-typed-arrays": "^1.0.5",
         "call-bind": "^1.0.2",
         "es-set-tostringtag": "^2.0.1",
         "es-to-primitive": "^1.2.1",
-        "function-bind": "^1.1.1",
         "function.prototype.name": "^1.1.5",
-        "get-intrinsic": "^1.1.3",
+        "get-intrinsic": "^1.2.1",
         "get-symbol-description": "^1.0.0",
         "globalthis": "^1.0.3",
         "gopd": "^1.0.1",
@@ -22450,8 +22669,8 @@
         "has-property-descriptors": "^1.0.0",
         "has-proto": "^1.0.1",
         "has-symbols": "^1.0.3",
-        "internal-slot": "^1.0.4",
-        "is-array-buffer": "^3.0.1",
+        "internal-slot": "^1.0.5",
+        "is-array-buffer": "^3.0.2",
         "is-callable": "^1.2.7",
         "is-negative-zero": "^2.0.2",
         "is-regex": "^1.1.4",
@@ -22459,16 +22678,21 @@
         "is-string": "^1.0.7",
         "is-typed-array": "^1.1.10",
         "is-weakref": "^1.0.2",
-        "object-inspect": "^1.12.2",
+        "object-inspect": "^1.12.3",
         "object-keys": "^1.1.1",
         "object.assign": "^4.1.4",
-        "regexp.prototype.flags": "^1.4.3",
+        "regexp.prototype.flags": "^1.5.0",
+        "safe-array-concat": "^1.0.0",
         "safe-regex-test": "^1.0.0",
+        "string.prototype.trim": "^1.2.7",
         "string.prototype.trimend": "^1.0.6",
         "string.prototype.trimstart": "^1.0.6",
+        "typed-array-buffer": "^1.0.0",
+        "typed-array-byte-length": "^1.0.0",
+        "typed-array-byte-offset": "^1.0.0",
         "typed-array-length": "^1.0.4",
         "unbox-primitive": "^1.0.2",
-        "which-typed-array": "^1.1.9"
+        "which-typed-array": "^1.1.10"
       }
     },
     "es-module-lexer": {
@@ -22834,9 +23058,9 @@
       }
     },
     "eslint-module-utils": {
-      "version": "2.7.4",
-      "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.7.4.tgz",
-      "integrity": "sha512-j4GT+rqzCoRKHwURX7pddtIPGySnX9Si/cgMI5ztrcqOPtk5dDEeZ34CQVPphnqkJytlc97Vuk05Um2mJ3gEQA==",
+      "version": "2.8.0",
+      "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.8.0.tgz",
+      "integrity": "sha512-aWajIYfsqCKRDgUfjEXNN/JlrzauMuSEy5sbd7WXbtW3EH6A6MpwEh42c7qD+MqQo9QMJ6fWLAeIJynx0g6OAw==",
       "dev": true,
       "requires": {
         "debug": "^3.2.7"
@@ -22865,26 +23089,29 @@
       }
     },
     "eslint-plugin-import": {
-      "version": "2.27.5",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.27.5.tgz",
-      "integrity": "sha512-LmEt3GVofgiGuiE+ORpnvP+kAm3h6MLZJ4Q5HCyHADofsb4VzXFsRiWj3c0OFiV+3DWFh0qg3v9gcPlfc3zRow==",
+      "version": "2.28.0",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.28.0.tgz",
+      "integrity": "sha512-B8s/n+ZluN7sxj9eUf7/pRFERX0r5bnFA2dCaLHy2ZeaQEAz0k+ZZkFWRFHJAqxfxQDx6KLv9LeIki7cFdwW+Q==",
       "dev": true,
       "requires": {
         "array-includes": "^3.1.6",
+        "array.prototype.findlastindex": "^1.2.2",
         "array.prototype.flat": "^1.3.1",
         "array.prototype.flatmap": "^1.3.1",
         "debug": "^3.2.7",
         "doctrine": "^2.1.0",
         "eslint-import-resolver-node": "^0.3.7",
-        "eslint-module-utils": "^2.7.4",
+        "eslint-module-utils": "^2.8.0",
         "has": "^1.0.3",
-        "is-core-module": "^2.11.0",
+        "is-core-module": "^2.12.1",
         "is-glob": "^4.0.3",
         "minimatch": "^3.1.2",
+        "object.fromentries": "^2.0.6",
+        "object.groupby": "^1.0.0",
         "object.values": "^1.1.6",
-        "resolve": "^1.22.1",
-        "semver": "^6.3.0",
-        "tsconfig-paths": "^3.14.1"
+        "resolve": "^1.22.3",
+        "semver": "^6.3.1",
+        "tsconfig-paths": "^3.14.2"
       },
       "dependencies": {
         "debug": {
@@ -24069,12 +24296,13 @@
       "integrity": "sha1-6td0q+5y4gQJQzoGY2YCPdaIekE="
     },
     "get-intrinsic": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.3.tgz",
-      "integrity": "sha512-QJVz1Tj7MS099PevUG5jvnt9tSkXN8K14dxQlikJuPt4uD9hHAHjLyLBiLR5zELelBdD9QNRAXZzsJx0WaDL9A==",
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.1.tgz",
+      "integrity": "sha512-2DcsyfABl+gVHEfCOaTrWgyt+tb6MSEGmKq+kI5HwLbIYgjgmMcV8KQ41uaKz1xxUcn9tJtgFbQUEVcEbd0FYw==",
       "requires": {
         "function-bind": "^1.1.1",
         "has": "^1.0.3",
+        "has-proto": "^1.0.1",
         "has-symbols": "^1.0.3"
       }
     },
@@ -24271,8 +24499,7 @@
     "has-proto": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/has-proto/-/has-proto-1.0.1.tgz",
-      "integrity": "sha512-7qE+iP+O+bgF9clE5+UoBFzE65mlBiVj3tKCrlNQ0Ogwm0BjpT/gK4SlLYDMybDh5I3TCTKnPPa0oMG7JDYrhg==",
-      "dev": true
+      "integrity": "sha512-7qE+iP+O+bgF9clE5+UoBFzE65mlBiVj3tKCrlNQ0Ogwm0BjpT/gK4SlLYDMybDh5I3TCTKnPPa0oMG7JDYrhg=="
     },
     "has-symbols": {
       "version": "1.0.3",
@@ -24523,12 +24750,12 @@
       "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="
     },
     "internal-slot": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.4.tgz",
-      "integrity": "sha512-tA8URYccNzMo94s5MQZgH8NB/XTa6HsOo0MLfXTKKEnHVVdegzaQoFZ7Jp44bdvLvY2waT5dc+j5ICEswhi7UQ==",
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.5.tgz",
+      "integrity": "sha512-Y+R5hJrzs52QCG2laLn4udYVnxsfny9CpOhNhUvk/SSSVyF6T27FzRbF0sroPidSu3X8oEAkOn2K804mjpt6UQ==",
       "dev": true,
       "requires": {
-        "get-intrinsic": "^1.1.3",
+        "get-intrinsic": "^1.2.0",
         "has": "^1.0.3",
         "side-channel": "^1.0.4"
       }
@@ -24554,13 +24781,13 @@
       }
     },
     "is-array-buffer": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/is-array-buffer/-/is-array-buffer-3.0.1.tgz",
-      "integrity": "sha512-ASfLknmY8Xa2XtB4wmbz13Wu202baeA18cJBCeCy0wXUHZF0IPyVEXqKEcd+t2fNSLLL1vC6k7lxZEojNbISXQ==",
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/is-array-buffer/-/is-array-buffer-3.0.2.tgz",
+      "integrity": "sha512-y+FyyR/w8vfIRq4eQcM1EYgSTnmHXPqaF+IgzgraytCFq5Xh8lllDVmAZolPJiZttZLeFSINPYMaEJ7/vWUa1w==",
       "dev": true,
       "requires": {
         "call-bind": "^1.0.2",
-        "get-intrinsic": "^1.1.3",
+        "get-intrinsic": "^1.2.0",
         "is-typed-array": "^1.1.10"
       }
     },
@@ -24604,9 +24831,9 @@
       "integrity": "sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA=="
     },
     "is-core-module": {
-      "version": "2.11.0",
-      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.11.0.tgz",
-      "integrity": "sha512-RRjxlvLDkD1YJwDbroBHMb+cukurkDWNyHx7D3oNB5x9rb5ogcksMC5wHCadcXoo67gVr/+3GFySh3134zi6rw==",
+      "version": "2.12.1",
+      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.12.1.tgz",
+      "integrity": "sha512-Q4ZuBAe2FUsKtyQJoQHlvP8OvBERxO3jEmy1I7hcRXcJBGGHFh/aJBswbXuS9sgrDH2QUO8ilkwNPHvHMd8clg==",
       "requires": {
         "has": "^1.0.3"
       }
@@ -27206,6 +27433,29 @@
         "object-keys": "^1.1.1"
       }
     },
+    "object.fromentries": {
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/object.fromentries/-/object.fromentries-2.0.6.tgz",
+      "integrity": "sha512-VciD13dswC4j1Xt5394WR4MzmAQmlgN72phd/riNp9vtD7tp4QQWJ0R4wvclXcafgcYK8veHRed2W6XeGBvcfg==",
+      "dev": true,
+      "requires": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.4",
+        "es-abstract": "^1.20.4"
+      }
+    },
+    "object.groupby": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/object.groupby/-/object.groupby-1.0.0.tgz",
+      "integrity": "sha512-70MWG6NfRH9GnbZOikuhPPYzpUpof9iW2J9E4dW7FXTqPNb6rllE6u39SKwwiNh8lCwX3DDb5OgcKGiEBrTTyw==",
+      "dev": true,
+      "requires": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.2.0",
+        "es-abstract": "^1.21.2",
+        "get-intrinsic": "^1.2.1"
+      }
+    },
     "object.values": {
       "version": "1.1.6",
       "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.1.6.tgz",
@@ -28300,14 +28550,14 @@
       }
     },
     "regexp.prototype.flags": {
-      "version": "1.4.3",
-      "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.4.3.tgz",
-      "integrity": "sha512-fjggEOO3slI6Wvgjwflkc4NFRCTZAu5CnNfBd5qOMYhWdn67nJBBu34/TkD++eeFmd8C9r9jfXJ27+nSiRkSUA==",
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.5.0.tgz",
+      "integrity": "sha512-0SutC3pNudRKgquxGoRGIz946MZVHqbNfPjBdxeOhBrdgDKlRoXmYLQN9xRbrR09ZXWeGAdPuif7egofn6v5LA==",
       "dev": true,
       "requires": {
         "call-bind": "^1.0.2",
-        "define-properties": "^1.1.3",
-        "functions-have-names": "^1.2.2"
+        "define-properties": "^1.2.0",
+        "functions-have-names": "^1.2.3"
       }
     },
     "regexpp": {
@@ -28408,11 +28658,11 @@
       "dev": true
     },
     "resolve": {
-      "version": "1.22.1",
-      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.1.tgz",
-      "integrity": "sha512-nBpuuYuY5jFsli/JIs1oldw6fOQCBioohqWZg/2hiaOybXOft4lonv85uDOKXdf8rhyK159cxU5cDcK/NKk8zw==",
+      "version": "1.22.3",
+      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.3.tgz",
+      "integrity": "sha512-P8ur/gp/AmbEzjr729bZnLjXK5Z+4P0zhIJgBgzqRih7hL7BOukHGtSTA3ACMY467GRFz3duQsi0bDZdR7DKdw==",
       "requires": {
-        "is-core-module": "^2.9.0",
+        "is-core-module": "^2.12.0",
         "path-parse": "^1.0.7",
         "supports-preserve-symlinks-flag": "^1.0.0"
       }
@@ -28512,6 +28762,26 @@
       "resolved": "https://registry.npmjs.org/rustbn.js/-/rustbn.js-0.2.0.tgz",
       "integrity": "sha512-4VlvkRUuCJvr2J6Y0ImW7NvTCriMi7ErOAqWk1y69vAdoNIzCF3yPmgeNzx+RQTLEDFq5sHfscn1MwHxP9hNfA=="
     },
+    "safe-array-concat": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/safe-array-concat/-/safe-array-concat-1.0.0.tgz",
+      "integrity": "sha512-9dVEFruWIsnie89yym+xWTAYASdpw3CJV7Li/6zBewGf9z2i1j31rP6jnY0pHEO4QZh6N0K11bFjWmdR8UGdPQ==",
+      "dev": true,
+      "requires": {
+        "call-bind": "^1.0.2",
+        "get-intrinsic": "^1.2.0",
+        "has-symbols": "^1.0.3",
+        "isarray": "^2.0.5"
+      },
+      "dependencies": {
+        "isarray": {
+          "version": "2.0.5",
+          "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.5.tgz",
+          "integrity": "sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==",
+          "dev": true
+        }
+      }
+    },
     "safe-buffer": {
       "version": "5.1.2",
       "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
@@ -28972,6 +29242,17 @@
         "strip-ansi": "^6.0.1"
       }
     },
+    "string.prototype.trim": {
+      "version": "1.2.7",
+      "resolved": "https://registry.npmjs.org/string.prototype.trim/-/string.prototype.trim-1.2.7.tgz",
+      "integrity": "sha512-p6TmeT1T3411M8Cgg9wBTMRtY2q9+PNy9EV1i2lIXUN/btt763oIfxwN3RR8VU6wHX8j/1CFy0L+YuThm6bgOg==",
+      "dev": true,
+      "requires": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.4",
+        "es-abstract": "^1.20.4"
+      }
+    },
     "string.prototype.trimend": {
       "version": "1.0.6",
       "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.6.tgz",
@@ -29344,13 +29625,13 @@
       }
     },
     "tsconfig-paths": {
-      "version": "3.14.1",
-      "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.14.1.tgz",
-      "integrity": "sha512-fxDhWnFSLt3VuTwtvJt5fpwxBHg5AdKWMsgcPOOIilyjymcYVZoCQF8fvFRezCNfblEXmi+PcM1eYHeOAgXCOQ==",
+      "version": "3.14.2",
+      "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.14.2.tgz",
+      "integrity": "sha512-o/9iXgCYc5L/JxCHPe3Hvh8Q/2xm5Z+p18PESBU6Ff33695QnCHBEjcytY2q19ua7Mbl/DavtBOLq+oG0RCL+g==",
       "dev": true,
       "requires": {
         "@types/json5": "^0.0.29",
-        "json5": "^1.0.1",
+        "json5": "^1.0.2",
         "minimist": "^1.2.6",
         "strip-bom": "^3.0.0"
       },
@@ -29424,6 +29705,42 @@
         "mime-types": "~2.1.24"
       }
     },
+    "typed-array-buffer": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/typed-array-buffer/-/typed-array-buffer-1.0.0.tgz",
+      "integrity": "sha512-Y8KTSIglk9OZEr8zywiIHG/kmQ7KWyjseXs1CbSo8vC42w7hg2HgYTxSWwP0+is7bWDc1H+Fo026CpHFwm8tkw==",
+      "dev": true,
+      "requires": {
+        "call-bind": "^1.0.2",
+        "get-intrinsic": "^1.2.1",
+        "is-typed-array": "^1.1.10"
+      }
+    },
+    "typed-array-byte-length": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/typed-array-byte-length/-/typed-array-byte-length-1.0.0.tgz",
+      "integrity": "sha512-Or/+kvLxNpeQ9DtSydonMxCx+9ZXOswtwJn17SNLvhptaXYDJvkFFP5zbfU/uLmvnBJlI4yrnXRxpdWH/M5tNA==",
+      "dev": true,
+      "requires": {
+        "call-bind": "^1.0.2",
+        "for-each": "^0.3.3",
+        "has-proto": "^1.0.1",
+        "is-typed-array": "^1.1.10"
+      }
+    },
+    "typed-array-byte-offset": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/typed-array-byte-offset/-/typed-array-byte-offset-1.0.0.tgz",
+      "integrity": "sha512-RD97prjEt9EL8YgAgpOkf3O4IF9lhJFr9g0htQkm0rchFp/Vx7LW5Q8fSXXub7BXAODyUQohRMyOc3faCPd0hg==",
+      "dev": true,
+      "requires": {
+        "available-typed-arrays": "^1.0.5",
+        "call-bind": "^1.0.2",
+        "for-each": "^0.3.3",
+        "has-proto": "^1.0.1",
+        "is-typed-array": "^1.1.10"
+      }
+    },
     "typed-array-length": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/typed-array-length/-/typed-array-length-1.0.4.tgz",
@@ -30279,16 +30596,15 @@
       "integrity": "sha512-B+enWhmw6cjfVC7kS8Pj9pCrKSc5txArRyaYGe088shv/FGWH+0Rjx/xPgtsWfsUtS27FkP697E4DDhgrgoc0Q=="
     },
     "which-typed-array": {
-      "version": "1.1.9",
-      "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.9.tgz",
-      "integrity": "sha512-w9c4xkx6mPidwp7180ckYWfMmvxpjlZuIudNtDf4N/tTAUB8VJbX25qZoAsrtGuYNnGw3pa0AXgbGKRB8/EceA==",
+      "version": "1.1.11",
+      "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.11.tgz",
+      "integrity": "sha512-qe9UWWpkeG5yzZ0tNYxDmd7vo58HDBc39mZ0xWWpolAGADdFOzkfamWLDxkOWcvHQKVmdTyQdLD4NOfjLWTKew==",
       "requires": {
         "available-typed-arrays": "^1.0.5",
         "call-bind": "^1.0.2",
         "for-each": "^0.3.3",
         "gopd": "^1.0.1",
-        "has-tostringtag": "^1.0.0",
-        "is-typed-array": "^1.1.10"
+        "has-tostringtag": "^1.0.0"
       }
     },
     "wildcard": {
diff --git a/apps/block_scout_web/assets/package.json b/apps/block_scout_web/assets/package.json
index 6d905ae1c06a..2b19e9c59e44 100644
--- a/apps/block_scout_web/assets/package.json
+++ b/apps/block_scout_web/assets/package.json
@@ -92,7 +92,7 @@
     "css-minimizer-webpack-plugin": "^5.0.1",
     "eslint": "^8.46.0",
     "eslint-config-standard": "^17.1.0",
-    "eslint-plugin-import": "^2.27.5",
+    "eslint-plugin-import": "^2.28.0",
     "eslint-plugin-node": "^11.1.0",
     "eslint-plugin-promise": "^6.1.1",
     "file-loader": "^6.2.0",

From a3322e693d29588c68dcccf3e484f49cb464be09 Mon Sep 17 00:00:00 2001
From: sl1depengwyn <max.pengwyn@gmail.com>
Date: Thu, 29 Sep 2022 17:47:32 +0300
Subject: [PATCH 246/909] Take into account EIP-1559 in gas price oracle

---
 apps/ethereum_jsonrpc/lib/ethereum_jsonrpc.ex |   9 +-
 .../lib/ethereum_jsonrpc/block/by_tag.ex      |   5 +
 .../test/ethereum_jsonrpc/mox_test.exs        |  11 +-
 .../test/ethereum_jsonrpc_test.exs            | 325 +++++-------------
 .../explorer/chain/cache/gas_price_oracle.ex  | 167 ++++++---
 .../chain/cache/gas_price_oracle_test.exs     | 118 ++++++-
 .../bound_interval_supervisor_test.exs        |  65 ++--
 7 files changed, 375 insertions(+), 325 deletions(-)

diff --git a/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc.ex b/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc.ex
index 6a1aada7c64c..4a59a80e9c7d 100644
--- a/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc.ex
+++ b/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc.ex
@@ -278,9 +278,9 @@ defmodule EthereumJSONRPC do
   @doc """
   Fetches block by "t:tag/0".
   """
-  @spec fetch_blocks_by_tag(tag(), json_rpc_named_arguments) ::
+  @spec fetch_block_by_tag(tag(), json_rpc_named_arguments) ::
           {:ok, Blocks.t()} | {:error, reason :: :invalid_tag | :not_found | term()}
-  def fetch_blocks_by_tag(tag, json_rpc_named_arguments) when tag in ~w(earliest latest pending) do
+  def fetch_block_by_tag(tag, json_rpc_named_arguments) when tag in ~w(earliest latest pending) do
     [%{tag: tag}]
     |> fetch_blocks_by_params(&Block.ByTag.request/1, json_rpc_named_arguments)
   end
@@ -320,9 +320,8 @@ defmodule EthereumJSONRPC do
   @spec fetch_block_number_by_tag(tag(), json_rpc_named_arguments) ::
           {:ok, non_neg_integer()} | {:error, reason :: :invalid_tag | :not_found | term()}
   def fetch_block_number_by_tag(tag, json_rpc_named_arguments) when tag in ~w(earliest latest pending) do
-    %{id: 0, tag: tag}
-    |> Block.ByTag.request()
-    |> json_rpc(json_rpc_named_arguments)
+    tag
+    |> fetch_block_by_tag(json_rpc_named_arguments)
     |> Block.ByTag.number_from_result()
   end
 
diff --git a/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/block/by_tag.ex b/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/block/by_tag.ex
index fa4a9b83c990..d257f4e506c5 100644
--- a/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/block/by_tag.ex
+++ b/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/block/by_tag.ex
@@ -5,6 +5,7 @@ defmodule EthereumJSONRPC.Block.ByTag do
   """
 
   import EthereumJSONRPC, only: [quantity_to_integer: 1]
+  alias EthereumJSONRPC.Blocks
 
   def request(%{id: id, tag: tag}) when is_binary(tag) do
     EthereumJSONRPC.request(%{id: id, method: "eth_getBlockByNumber", params: [tag, false]})
@@ -16,6 +17,10 @@ defmodule EthereumJSONRPC.Block.ByTag do
     {:ok, quantity_to_integer(quantity)}
   end
 
+  def number_from_result({:ok, %Blocks{blocks_params: []}}), do: {:error, :not_found}
+
+  def number_from_result({:ok, %Blocks{blocks_params: [%{number: number}]}}), do: {:ok, number}
+
   def number_from_result({:ok, nil}), do: {:error, :not_found}
 
   def number_from_result({:error, %{"code" => -32602}}), do: {:error, :invalid_tag}
diff --git a/apps/ethereum_jsonrpc/test/ethereum_jsonrpc/mox_test.exs b/apps/ethereum_jsonrpc/test/ethereum_jsonrpc/mox_test.exs
index 2ad5b8f52c20..f0c4fbaf2d65 100644
--- a/apps/ethereum_jsonrpc/test/ethereum_jsonrpc/mox_test.exs
+++ b/apps/ethereum_jsonrpc/test/ethereum_jsonrpc/mox_test.exs
@@ -21,8 +21,15 @@ defmodule EthereumJSONRPC.MoxTest do
 
   describe "fetch_block_number_by_tag/2" do
     test "with pending with null result", %{json_rpc_named_arguments: json_rpc_named_arguments} do
-      expect(EthereumJSONRPC.Mox, :json_rpc, fn _json, _options ->
-        {:ok, nil}
+      expect(EthereumJSONRPC.Mox, :json_rpc, fn [
+                                                  %{
+                                                    id: id,
+                                                    method: "eth_getBlockByNumber",
+                                                    params: ["pending", false]
+                                                  }
+                                                ],
+                                                _options ->
+        {:ok, [%{id: id, result: nil}]}
       end)
 
       assert {:error, :not_found} = EthereumJSONRPC.fetch_block_number_by_tag("pending", json_rpc_named_arguments)
diff --git a/apps/ethereum_jsonrpc/test/ethereum_jsonrpc_test.exs b/apps/ethereum_jsonrpc/test/ethereum_jsonrpc_test.exs
index 629e40c4144b..7299d48478fb 100644
--- a/apps/ethereum_jsonrpc/test/ethereum_jsonrpc_test.exs
+++ b/apps/ethereum_jsonrpc/test/ethereum_jsonrpc_test.exs
@@ -2,6 +2,7 @@ defmodule EthereumJSONRPCTest do
   use EthereumJSONRPC.Case, async: true
 
   import EthereumJSONRPC.Case
+  import EthereumJSONRPC, only: [quantity_to_integer: 1]
   import Mox
 
   alias EthereumJSONRPC.{Blocks, FetchedBalances, FetchedBeneficiaries, FetchedCodes, Subscription}
@@ -543,191 +544,32 @@ defmodule EthereumJSONRPCTest do
     end
   end
 
-  describe "fetch_blocks_by_tag/2" do
-    @tag capture_log: false
-    test "with earliest", %{json_rpc_named_arguments: json_rpc_named_arguments} do
-      if json_rpc_named_arguments[:transport] == EthereumJSONRPC.Mox do
-        expect(EthereumJSONRPC.Mox, :json_rpc, fn [%{id: id}], _options ->
-          block_number = "0x0"
-          block_hash = "0x29c850324e357f3c0c836d79860c5af55f7b651e5d7ee253c1af1b14908af49c"
-          transaction_hash = "0xa2e81bb56b55ba3dab2daf76501b50dfaad240cccb905dbf89d65c7a84a4a48e"
-
-          {:ok,
-           [
-             %{
-               id: id,
-               result: %{
-                 "difficulty" => "0x0",
-                 "gasLimit" => "0x0",
-                 "gasUsed" => "0x0",
-                 "hash" => block_hash,
-                 "extraData" => "0x0",
-                 "logsBloom" => "0x0",
-                 "miner" => "0x0",
-                 "number" => block_number,
-                 "parentHash" => "0x0",
-                 "receiptsRoot" => "0x0",
-                 "size" => "0x0",
-                 "sha3Uncles" => "0x0",
-                 "stateRoot" => "0x0",
-                 "timestamp" => "0x0",
-                 "totalDifficulty" => "0x0",
-                 "transactions" => [
-                   %{
-                     "blockHash" => block_hash,
-                     "blockNumber" => block_number,
-                     "from" => "0x0",
-                     "gas" => "0x0",
-                     "gasPrice" => "0x0",
-                     "hash" => transaction_hash,
-                     "input" => "0x",
-                     "nonce" => "0x0",
-                     "r" => "0x0",
-                     "s" => "0x0",
-                     "to" => "0x0",
-                     "transactionIndex" => "0x0",
-                     "v" => "0x0",
-                     "value" => "0x0"
-                   }
-                 ],
-                 "transactionsRoot" => "0x0",
-                 "uncles" => []
-               }
-             }
-           ]}
-        end)
-      end
-
-      log_bad_gateway(
-        fn -> EthereumJSONRPC.fetch_blocks_by_tag("earliest", json_rpc_named_arguments) end,
-        fn result ->
-          assert {:ok, %Blocks{blocks_params: [_ | _], transactions_params: [_ | _]}} = result
-        end
-      )
-    end
+  describe "fetch_block_by_tag/2" do
+    @supported_tags ~w(earliest latest pending)
 
     @tag capture_log: false
-    test "with latest", %{json_rpc_named_arguments: json_rpc_named_arguments} do
-      if json_rpc_named_arguments[:transport] == EthereumJSONRPC.Mox do
-        expect(EthereumJSONRPC.Mox, :json_rpc, fn [%{id: id}], _options ->
-          block_number = "0x1"
-          block_hash = "0x29c850324e357f3c0c836d79860c5af55f7b651e5d7ee253c1af1b14908af49c"
-          transaction_hash = "0xa2e81bb56b55ba3dab2daf76501b50dfaad240cccb905dbf89d65c7a84a4a48e"
-
-          {:ok,
-           [
-             %{
-               id: id,
-               result: %{
-                 "difficulty" => "0x0",
-                 "gasLimit" => "0x0",
-                 "gasUsed" => "0x0",
-                 "hash" => block_hash,
-                 "extraData" => "0x0",
-                 "logsBloom" => "0x0",
-                 "miner" => "0x0",
-                 "number" => block_number,
-                 "parentHash" => "0x0",
-                 "receiptsRoot" => "0x0",
-                 "size" => "0x0",
-                 "sha3Uncles" => "0x0",
-                 "stateRoot" => "0x0",
-                 "timestamp" => "0x0",
-                 "totalDifficulty" => "0x0",
-                 "transactions" => [
-                   %{
-                     "blockHash" => block_hash,
-                     "blockNumber" => block_number,
-                     "from" => "0x0",
-                     "gas" => "0x0",
-                     "gasPrice" => "0x0",
-                     "hash" => transaction_hash,
-                     "input" => "0x",
-                     "nonce" => "0x0",
-                     "r" => "0x0",
-                     "s" => "0x0",
-                     "to" => "0x0",
-                     "transactionIndex" => "0x0",
-                     "v" => "0x0",
-                     "value" => "0x0"
-                   }
-                 ],
-                 "transactionsRoot" => "0x0",
-                 "uncles" => []
-               }
-             }
-           ]}
-        end)
-      end
-
-      log_bad_gateway(
-        fn -> EthereumJSONRPC.fetch_blocks_by_tag("latest", json_rpc_named_arguments) end,
-        fn result ->
-          {:ok, %Blocks{blocks_params: [_ | _], transactions_params: [_ | _]}} = result
+    test "with all supported tags", %{json_rpc_named_arguments: json_rpc_named_arguments} do
+      for tag <- @supported_tags do
+        if json_rpc_named_arguments[:transport] == EthereumJSONRPC.Mox do
+          expect(EthereumJSONRPC.Mox, :json_rpc, fn [
+                                                      %{
+                                                        id: id,
+                                                        method: "eth_getBlockByNumber",
+                                                        params: [^tag, false]
+                                                      }
+                                                    ],
+                                                    _options ->
+            block_response(id, tag == "pending", "0x1")
+          end)
         end
-      )
-    end
-
-    @tag capture_log: false
-    test "with pending", %{json_rpc_named_arguments: json_rpc_named_arguments} do
-      if json_rpc_named_arguments[:transport] == EthereumJSONRPC.Mox do
-        expect(EthereumJSONRPC.Mox, :json_rpc, fn [%{id: id}], _options ->
-          block_number = "0x1"
-          block_hash = "0x29c850324e357f3c0c836d79860c5af55f7b651e5d7ee253c1af1b14908af49c"
-          transaction_hash = "0xa2e81bb56b55ba3dab2daf76501b50dfaad240cccb905dbf89d65c7a84a4a48e"
 
-          {:ok,
-           [
-             %{
-               id: id,
-               result: %{
-                 "difficulty" => "0x0",
-                 "gasLimit" => "0x0",
-                 "gasUsed" => "0x0",
-                 "hash" => block_hash,
-                 "extraData" => "0x0",
-                 "logsBloom" => "0x0",
-                 "miner" => "0x0",
-                 "number" => block_number,
-                 "parentHash" => "0x0",
-                 "receiptsRoot" => "0x0",
-                 "size" => "0x0",
-                 "sha3Uncles" => "0x0",
-                 "stateRoot" => "0x0",
-                 "timestamp" => "0x0",
-                 "totalDifficulty" => "0x0",
-                 "transactions" => [
-                   %{
-                     "blockHash" => block_hash,
-                     "blockNumber" => block_number,
-                     "from" => "0x0",
-                     "gas" => "0x0",
-                     "gasPrice" => "0x0",
-                     "hash" => transaction_hash,
-                     "input" => "0x",
-                     "nonce" => "0x0",
-                     "r" => "0x0",
-                     "s" => "0x0",
-                     "to" => "0x0",
-                     "transactionIndex" => "0x0",
-                     "v" => "0x0",
-                     "value" => "0x0"
-                   }
-                 ],
-                 "transactionsRoot" => "0x0",
-                 "uncles" => []
-               }
-             }
-           ]}
-        end)
+        log_bad_gateway(
+          fn -> EthereumJSONRPC.fetch_block_by_tag(tag, json_rpc_named_arguments) end,
+          fn result ->
+            {:ok, %Blocks{blocks_params: [_ | _], transactions_params: []}} = result
+          end
+        )
       end
-
-      log_bad_gateway(
-        fn -> EthereumJSONRPC.fetch_blocks_by_tag("pending", json_rpc_named_arguments) end,
-        fn result ->
-          {:ok, %Blocks{blocks_params: [_ | _], transactions_params: [_ | _]}} = result
-        end
-      )
     end
 
     test "unknown errors are returned", %{json_rpc_named_arguments: json_rpc_named_arguments} do
@@ -740,66 +582,54 @@ defmodule EthereumJSONRPCTest do
         {:error, unknown_error}
       end)
 
-      assert {:error, ^unknown_error} =
-               EthereumJSONRPC.fetch_block_number_by_tag("latest", moxed_json_rpc_named_arguments)
+      assert {:error, ^unknown_error} = EthereumJSONRPC.fetch_block_by_tag("latest", moxed_json_rpc_named_arguments)
     end
   end
 
   describe "fetch_block_number_by_tag" do
-    @tag capture_log: false
-    test "with earliest", %{json_rpc_named_arguments: json_rpc_named_arguments} do
-      if json_rpc_named_arguments[:transport] == EthereumJSONRPC.Mox do
-        expect(EthereumJSONRPC.Mox, :json_rpc, fn _json, _options ->
-          {:ok, %{"number" => "0x0"}}
-        end)
-      end
-
-      log_bad_gateway(
-        fn -> EthereumJSONRPC.fetch_block_number_by_tag("earliest", json_rpc_named_arguments) end,
-        fn result ->
-          assert {:ok, 0} = result
-        end
-      )
-    end
+    @supported_tags %{"earliest" => "0x0", "latest" => "0x1", "pending" => nil}
 
     @tag capture_log: false
-    test "with latest", %{json_rpc_named_arguments: json_rpc_named_arguments} do
-      if json_rpc_named_arguments[:transport] == EthereumJSONRPC.Mox do
-        expect(EthereumJSONRPC.Mox, :json_rpc, fn _json, _options ->
-          {:ok, %{"number" => "0x1"}}
-        end)
-      end
-
-      log_bad_gateway(
-        fn -> EthereumJSONRPC.fetch_block_number_by_tag("latest", json_rpc_named_arguments) end,
-        fn result ->
-          assert {:ok, number} = result
-          assert number > 0
+    test "with all supported tags", %{json_rpc_named_arguments: json_rpc_named_arguments} do
+      for {tag, expected_result} <- @supported_tags do
+        if json_rpc_named_arguments[:transport] == EthereumJSONRPC.Mox do
+          expect(EthereumJSONRPC.Mox, :json_rpc, fn [
+                                                      %{
+                                                        id: id,
+                                                        method: "eth_getBlockByNumber",
+                                                        params: [^tag, false]
+                                                      }
+                                                    ],
+                                                    _options ->
+            if tag == "pending" do
+              {:ok, [%{id: id, result: nil}]}
+            else
+              block_response(id, false, expected_result)
+            end
+          end)
         end
-      )
-    end
 
-    @tag capture_log: false
-    test "with pending", %{json_rpc_named_arguments: json_rpc_named_arguments} do
-      if json_rpc_named_arguments[:transport] == EthereumJSONRPC.Mox do
-        expect(EthereumJSONRPC.Mox, :json_rpc, fn _json, _options ->
-          {:ok, nil}
-        end)
+        log_bad_gateway(
+          fn -> EthereumJSONRPC.fetch_block_number_by_tag(tag, json_rpc_named_arguments) end,
+          if tag == "pending" do
+            fn
+              # Parity after https://github.com/paritytech/parity-ethereum/pull/8281 and anything spec-compliant
+              {:error, reason} ->
+                assert reason == :not_found
+
+              # Parity before https://github.com/paritytech/parity-ethereum/pull/8281
+              {:ok, number} ->
+                assert is_integer(number)
+                assert number > 0
+            end
+          else
+            fn result ->
+              integer_result = expected_result && quantity_to_integer(expected_result)
+              assert {:ok, ^integer_result} = result
+            end
+          end
+        )
       end
-
-      log_bad_gateway(
-        fn -> EthereumJSONRPC.fetch_block_number_by_tag("pending", json_rpc_named_arguments) end,
-        fn
-          # Parity after https://github.com/paritytech/parity-ethereum/pull/8281 and anything spec-compliant
-          {:error, reason} ->
-            assert reason == :not_found
-
-          # Parity before https://github.com/paritytech/parity-ethereum/pull/8281
-          {:ok, number} ->
-            assert is_integer(number)
-            assert number > 0
-        end
-      )
     end
 
     test "unknown errors are returned", %{json_rpc_named_arguments: json_rpc_named_arguments} do
@@ -1114,12 +944,43 @@ defmodule EthereumJSONRPCTest do
         :ok
     end
   end
+
+  defp block_response(id, pending, block_number) do
+    block_hash = "0x29c850324e357f3c0c836d79860c5af55f7b651e5d7ee253c1af1b14908af49c"
+    transaction_hash = "0xa2e81bb56b55ba3dab2daf76501b50dfaad240cccb905dbf89d65c7a84a4a48e"
+
+    {:ok,
+     [
+       %{
+         id: id,
+         result: %{
+           "difficulty" => "0x0",
+           "gasLimit" => "0x0",
+           "gasUsed" => "0x0",
+           "hash" => if(pending, do: nil, else: block_hash),
+           "extraData" => "0x0",
+           "logsBloom" => "0x0",
+           "miner" => "0x0",
+           "number" => block_number,
+           "parentHash" => "0x0",
+           "receiptsRoot" => "0x0",
+           "size" => "0x0",
+           "sha3Uncles" => "0x0",
+           "stateRoot" => "0x0",
+           "timestamp" => "0x0",
+           "totalDifficulty" => "0x0",
+           "transactions" => [transaction_hash],
+           "transactionsRoot" => "0x0",
+           "uncles" => []
+         }
+       }
+     ]}
+  end
 end
 
 defmodule EthereumJSONRPCSyncTest do
   use EthereumJSONRPC.Case, async: false
 
-  import EthereumJSONRPC.Case
   import Mox
 
   alias EthereumJSONRPC.FetchedBalances
diff --git a/apps/explorer/lib/explorer/chain/cache/gas_price_oracle.ex b/apps/explorer/lib/explorer/chain/cache/gas_price_oracle.ex
index 4315bd7b5d1a..60111725e142 100644
--- a/apps/explorer/lib/explorer/chain/cache/gas_price_oracle.ex
+++ b/apps/explorer/lib/explorer/chain/cache/gas_price_oracle.ex
@@ -10,6 +10,8 @@ defmodule Explorer.Chain.Cache.GasPriceOracle do
       from: 2
     ]
 
+  alias EthereumJSONRPC.Blocks
+
   alias Explorer.Chain.{
     Block,
     Wei
@@ -25,8 +27,17 @@ defmodule Explorer.Chain.Cache.GasPriceOracle do
     ttl_check_interval: :timer.seconds(1),
     callback: &async_task_on_deletion(&1)
 
+  @doc """
+  Get `safelow`, `average` and `fast` percentile of transactions gas prices among the last `num_of_blocks` blocks
+  """
+  @spec get_average_gas_price(pos_integer(), pos_integer(), pos_integer(), pos_integer()) ::
+          {:error, any} | {:ok, %{String.t() => nil | float, String.t() => nil | float, String.t() => nil | float}}
   def get_average_gas_price(num_of_blocks, safelow_percentile, average_percentile, fast_percentile) do
-    latest_gas_price_query =
+    safelow_percentile_fraction = safelow_percentile / 100
+    average_percentile_fraction = average_percentile / 100
+    fast_percentile_fraction = fast_percentile / 100
+
+    fee_query =
       from(
         block in Block,
         left_join: transaction in assoc(block, :transactions),
@@ -35,27 +46,48 @@ defmodule Explorer.Chain.Cache.GasPriceOracle do
         where: transaction.gas_price > ^0,
         group_by: block.number,
         order_by: [desc: block.number],
-        select: min(transaction.gas_price),
+        select: %{
+          slow_gas_price:
+            fragment(
+              "percentile_disc(?) within group ( order by ? )",
+              ^safelow_percentile_fraction,
+              transaction.gas_price
+            ),
+          average_gas_price:
+            fragment(
+              "percentile_disc(?) within group ( order by ? )",
+              ^average_percentile_fraction,
+              transaction.gas_price
+            ),
+          fast_gas_price:
+            fragment(
+              "percentile_disc(?) within group ( order by ? )",
+              ^fast_percentile_fraction,
+              transaction.gas_price
+            ),
+          slow:
+            fragment(
+              "percentile_disc(?) within group ( order by ? )",
+              ^safelow_percentile_fraction,
+              transaction.max_priority_fee_per_gas
+            ),
+          average:
+            fragment(
+              "percentile_disc(?) within group ( order by ? )",
+              ^average_percentile_fraction,
+              transaction.max_priority_fee_per_gas
+            ),
+          fast:
+            fragment(
+              "percentile_disc(?) within group ( order by ? )",
+              ^fast_percentile_fraction,
+              transaction.max_priority_fee_per_gas
+            )
+        },
         limit: ^num_of_blocks
       )
 
-    latest_gas_prices =
-      latest_gas_price_query
-      |> Repo.all(timeout: :infinity)
-
-    latest_ordered_gas_prices =
-      latest_gas_prices
-      |> Enum.map(fn %Wei{value: gas_price} -> Decimal.to_integer(gas_price) end)
-
-    safelow_gas_price = gas_price_percentile_to_gwei(latest_ordered_gas_prices, safelow_percentile)
-    average_gas_price = gas_price_percentile_to_gwei(latest_ordered_gas_prices, average_percentile)
-    fast_gas_price = gas_price_percentile_to_gwei(latest_ordered_gas_prices, fast_percentile)
-
-    gas_prices = %{
-      "slow" => safelow_gas_price,
-      "average" => average_gas_price,
-      "fast" => fast_gas_price
-    }
+    gas_prices = fee_query |> Repo.all(timeout: :infinity) |> process_fee_data_from_db()
 
     {:ok, gas_prices}
   catch
@@ -63,6 +95,69 @@ defmodule Explorer.Chain.Cache.GasPriceOracle do
       {:error, error}
   end
 
+  defp process_fee_data_from_db([]) do
+    %{
+      "slow" => nil,
+      "average" => nil,
+      "fast" => nil
+    }
+  end
+
+  defp process_fee_data_from_db(fees) do
+    fees_length = Enum.count(fees)
+
+    %{
+      slow_gas_price: slow_gas_price,
+      average_gas_price: average_gas_price,
+      fast_gas_price: fast_gas_price,
+      slow: slow,
+      average: average,
+      fast: fast
+    } =
+      fees
+      |> Enum.reduce(
+        &Map.merge(&1, &2, fn
+          _, v1, v2 when nil not in [v1, v2] -> Decimal.add(v1, v2)
+          _, v1, v2 -> v1 || v2
+        end)
+      )
+      |> Map.new(fn
+        {key, nil} -> {key, nil}
+        {key, value} -> {key, Decimal.div(value, fees_length)}
+      end)
+
+    json_rpc_named_arguments = Application.get_env(:explorer, :json_rpc_named_arguments)
+
+    {slow_fee, average_fee, fast_fee} =
+      case {nil not in [slow, average, fast], EthereumJSONRPC.fetch_block_by_tag("pending", json_rpc_named_arguments)} do
+        {true, {:ok, %Blocks{blocks_params: [%{base_fee_per_gas: base_fee}]}}} when not is_nil(base_fee) ->
+          base_fee_wei = base_fee |> Decimal.new() |> Wei.from(:wei)
+
+          {
+            priority_with_base_fee(slow, base_fee_wei),
+            priority_with_base_fee(average, base_fee_wei),
+            priority_with_base_fee(fast, base_fee_wei)
+          }
+
+        _ ->
+          {gas_price(slow_gas_price), gas_price(average_gas_price), gas_price(fast_gas_price)}
+      end
+
+    %{
+      "slow" => slow_fee,
+      "average" => average_fee,
+      "fast" => fast_fee
+    }
+  end
+
+  defp priority_with_base_fee(priority, base_fee) do
+    priority |> Wei.from(:wei) |> Wei.sum(base_fee) |> Wei.to(:gwei) |> Decimal.to_float() |> Float.ceil(2)
+  end
+
+  defp gas_price(value) do
+    value |> Wei.from(:wei) |> Wei.to(:gwei) |> Decimal.to_float() |> Float.ceil(2)
+  end
+
   defp num_of_blocks, do: Application.get_env(:explorer, __MODULE__)[:num_of_blocks]
 
   defp safelow, do: Application.get_env(:explorer, __MODULE__)[:safelow_percentile]
@@ -102,40 +197,6 @@ defmodule Explorer.Chain.Cache.GasPriceOracle do
     {:update, task}
   end
 
-  defp gas_price_percentile_to_gwei(gas_prices, percentile) do
-    gas_price_wei = percentile(gas_prices, percentile)
-
-    if gas_price_wei do
-      gas_price_gwei = Wei.to(%Wei{value: Decimal.from_float(gas_price_wei)}, :gwei)
-
-      gas_price_gwei_float = gas_price_gwei |> Decimal.to_float()
-
-      if gas_price_gwei_float > 0.01 do
-        gas_price_gwei_float
-        |> Float.ceil(2)
-      else
-        gas_price_gwei_float
-      end
-    else
-      nil
-    end
-  end
-
-  @spec percentile(list, number) :: number | nil
-  defp percentile([], _), do: nil
-  defp percentile([x], _), do: x
-  defp percentile(list, 0), do: Enum.min(list)
-  defp percentile(list, 100), do: Enum.max(list)
-
-  defp percentile(list, n) when is_list(list) and is_number(n) do
-    s = Enum.sort(list)
-    r = n / 100.0 * (length(list) - 1)
-    f = :erlang.trunc(r)
-    lower = Enum.at(s, f)
-    upper = Enum.at(s, f + 1)
-    lower + (upper - lower) * (r - f)
-  end
-
   # By setting this as a `callback` an async task will be started each time the
   # `gas_prices` expires (unless there is one already running)
   defp async_task_on_deletion({:delete, _, :gas_prices}), do: get_async_task()
diff --git a/apps/explorer/test/explorer/chain/cache/gas_price_oracle_test.exs b/apps/explorer/test/explorer/chain/cache/gas_price_oracle_test.exs
index 630301488aad..d7004d11d0ed 100644
--- a/apps/explorer/test/explorer/chain/cache/gas_price_oracle_test.exs
+++ b/apps/explorer/test/explorer/chain/cache/gas_price_oracle_test.exs
@@ -1,10 +1,53 @@
 defmodule Explorer.Chain.Cache.GasPriceOracleTest do
   use Explorer.DataCase
 
+  import Mox
+
   alias Explorer.Chain.Cache.GasPriceOracle
 
+  @block %{
+    "difficulty" => "0x0",
+    "gasLimit" => "0x0",
+    "gasUsed" => "0x0",
+    "hash" => "0x29c850324e357f3c0c836d79860c5af55f7b651e5d7ee253c1af1b14908af49c",
+    "extraData" => "0x0",
+    "logsBloom" => "0x0",
+    "miner" => "0x0",
+    "number" => "0x1",
+    "parentHash" => "0x0",
+    "receiptsRoot" => "0x0",
+    "size" => "0x0",
+    "sha3Uncles" => "0x0",
+    "stateRoot" => "0x0",
+    "timestamp" => "0x0",
+    "baseFeePerGas" => "0x1DCD6500",
+    "totalDifficulty" => "0x0",
+    "transactions" => [
+      %{
+        "blockHash" => "0x29c850324e357f3c0c836d79860c5af55f7b651e5d7ee253c1af1b14908af49c",
+        "blockNumber" => "0x1",
+        "from" => "0x0",
+        "gas" => "0x0",
+        "gasPrice" => "0x0",
+        "hash" => "0xa2e81bb56b55ba3dab2daf76501b50dfaad240cccb905dbf89d65c7a84a4a48e",
+        "input" => "0x",
+        "nonce" => "0x0",
+        "r" => "0x0",
+        "s" => "0x0",
+        "to" => "0x0",
+        "transactionIndex" => "0x0",
+        "v" => "0x0",
+        "value" => "0x0"
+      }
+    ],
+    "transactionsRoot" => "0x0",
+    "uncles" => []
+  }
+
   describe "get_average_gas_price/4" do
     test "returns nil percentile values if no blocks in the DB" do
+      expect(EthereumJSONRPC.Mox, :json_rpc, fn [%{id: id}], _options -> {:ok, [%{id: id, result: @block}]} end)
+
       assert {:ok,
               %{
                 "slow" => nil,
@@ -14,6 +57,8 @@ defmodule Explorer.Chain.Cache.GasPriceOracleTest do
     end
 
     test "returns nil percentile values if blocks are empty in the DB" do
+      expect(EthereumJSONRPC.Mox, :json_rpc, fn [%{id: id}], _options -> {:ok, [%{id: id, result: @block}]} end)
+
       insert(:block)
       insert(:block)
       insert(:block)
@@ -27,6 +72,8 @@ defmodule Explorer.Chain.Cache.GasPriceOracleTest do
     end
 
     test "returns nil percentile values for blocks with failed txs in the DB" do
+      expect(EthereumJSONRPC.Mox, :json_rpc, fn [%{id: id}], _options -> {:ok, [%{id: id, result: @block}]} end)
+
       block = insert(:block, number: 100, hash: "0x3e51328bccedee581e8ba35190216a61a5d67fd91ca528f3553142c0c7d18391")
 
       :transaction
@@ -51,6 +98,8 @@ defmodule Explorer.Chain.Cache.GasPriceOracleTest do
     end
 
     test "returns nil percentile values for transactions with 0 gas price aka 'whitelisted transactions' in the DB" do
+      expect(EthereumJSONRPC.Mox, :json_rpc, fn [%{id: id}], _options -> {:ok, [%{id: id, result: @block}]} end)
+
       block1 = insert(:block, number: 100, hash: "0x3e51328bccedee581e8ba35190216a61a5d67fd91ca528f3553142c0c7d18391")
       block2 = insert(:block, number: 101, hash: "0x76c3da57334fffdc66c0d954dce1a910fcff13ec889a13b2d8b0b6e9440ce729")
 
@@ -87,6 +136,8 @@ defmodule Explorer.Chain.Cache.GasPriceOracleTest do
     end
 
     test "returns the same percentile values if gas price is the same over transactions" do
+      expect(EthereumJSONRPC.Mox, :json_rpc, fn [%{id: id}], _options -> {:ok, [%{id: id, result: @block}]} end)
+
       block1 = insert(:block, number: 100, hash: "0x3e51328bccedee581e8ba35190216a61a5d67fd91ca528f3553142c0c7d18391")
       block2 = insert(:block, number: 101, hash: "0x76c3da57334fffdc66c0d954dce1a910fcff13ec889a13b2d8b0b6e9440ce729")
 
@@ -123,6 +174,8 @@ defmodule Explorer.Chain.Cache.GasPriceOracleTest do
     end
 
     test "returns correct min gas price from the block" do
+      expect(EthereumJSONRPC.Mox, :json_rpc, fn [%{id: id}], _options -> {:ok, [%{id: id, result: @block}]} end)
+
       block1 = insert(:block, number: 100, hash: "0x3e51328bccedee581e8ba35190216a61a5d67fd91ca528f3553142c0c7d18391")
       block2 = insert(:block, number: 101, hash: "0x76c3da57334fffdc66c0d954dce1a910fcff13ec889a13b2d8b0b6e9440ce729")
 
@@ -165,12 +218,14 @@ defmodule Explorer.Chain.Cache.GasPriceOracleTest do
       assert {:ok,
               %{
                 "slow" => 1.0,
-                "average" => 1.0,
-                "fast" => 1.0
+                "average" => 2.0,
+                "fast" => 2.0
               }} = GasPriceOracle.get_average_gas_price(3, 35, 60, 90)
     end
 
     test "returns correct average percentile" do
+      expect(EthereumJSONRPC.Mox, :json_rpc, fn [%{id: id}], _options -> {:ok, [%{id: id, result: @block}]} end)
+
       block1 = insert(:block, number: 100, hash: "0x3e51328bccedee581e8ba35190216a61a5d67fd91ca528f3553142c0c7d18391")
       block2 = insert(:block, number: 101, hash: "0x76c3da57334fffdc66c0d954dce1a910fcff13ec889a13b2d8b0b6e9440ce729")
       block3 = insert(:block, number: 102, hash: "0x659b2a1cc4dd1a5729900cf0c81c471d1c7891b2517bf9466f7fba56ead2fca0")
@@ -213,7 +268,64 @@ defmodule Explorer.Chain.Cache.GasPriceOracleTest do
 
       assert {:ok,
               %{
-                "average" => 4.0
+                "average" => 3.34
+              }} = GasPriceOracle.get_average_gas_price(3, 35, 60, 90)
+    end
+
+    test "returns correct gas price for EIP-1559 transactions" do
+      expect(EthereumJSONRPC.Mox, :json_rpc, fn [%{id: id}], _options -> {:ok, [%{id: id, result: @block}]} end)
+
+      block1 = insert(:block, number: 100, hash: "0x3e51328bccedee581e8ba35190216a61a5d67fd91ca528f3553142c0c7d18391")
+      block2 = insert(:block, number: 101, hash: "0x76c3da57334fffdc66c0d954dce1a910fcff13ec889a13b2d8b0b6e9440ce729")
+
+      :transaction
+      |> insert(
+        status: :ok,
+        block_hash: block1.hash,
+        block_number: block1.number,
+        cumulative_gas_used: 884_322,
+        gas_used: 106_025,
+        index: 0,
+        gas_price: 1_000_000_000,
+        max_priority_fee_per_gas: 1_000_000_000,
+        max_fee_per_gas: 1_000_000_000,
+        hash: "0xac2a7dab94d965893199e7ee01649e2d66f0787a4c558b3118c09e80d4df8269"
+      )
+
+      :transaction
+      |> insert(
+        status: :ok,
+        block_hash: block2.hash,
+        block_number: block2.number,
+        cumulative_gas_used: 884_322,
+        gas_used: 106_025,
+        index: 0,
+        gas_price: 1_000_000_000,
+        max_priority_fee_per_gas: 1_000_000_000,
+        max_fee_per_gas: 1_000_000_000,
+        hash: "0x5d5c2776f96704e7845f7d3c1fbba6685ab6efd6f82b6cd11d549f3b3a46bd03"
+      )
+
+      :transaction
+      |> insert(
+        status: :ok,
+        block_hash: block2.hash,
+        block_number: block2.number,
+        cumulative_gas_used: 884_322,
+        gas_used: 106_025,
+        index: 1,
+        gas_price: 3_000_000_000,
+        max_priority_fee_per_gas: 3_000_000_000,
+        max_fee_per_gas: 3_000_000_000,
+        hash: "0x906b80861b4a0921acfbb91a7b527227b0d32adabc88bc73e8c52ff714e55016"
+      )
+
+      assert {:ok,
+              %{
+                # including base fee
+                "slow" => 1.5,
+                "average" => 2.5,
+                "fast" => 2.5
               }} = GasPriceOracle.get_average_gas_price(3, 35, 60, 90)
     end
   end
diff --git a/apps/indexer/test/indexer/block/catchup/bound_interval_supervisor_test.exs b/apps/indexer/test/indexer/block/catchup/bound_interval_supervisor_test.exs
index 77f7a63512dc..774ebfe3a5ab 100644
--- a/apps/indexer/test/indexer/block/catchup/bound_interval_supervisor_test.exs
+++ b/apps/indexer/test/indexer/block/catchup/bound_interval_supervisor_test.exs
@@ -50,37 +50,42 @@ defmodule Indexer.Block.Catchup.BoundIntervalSupervisorTest do
             EthereumJSONRPC.Mox
             |> stub(:json_rpc, fn
               # latest block number to seed starting block number for genesis and realtime tasks
-              %{method: "eth_getBlockByNumber", params: ["latest", false]}, _options ->
+              [%{id: id, method: "eth_getBlockByNumber", params: ["latest", false]}], _options ->
                 {:ok,
-                 %{
-                   "author" => "0xe2ac1c6843a33f81ae4935e5ef1277a392990381",
-                   "difficulty" => "0xfffffffffffffffffffffffffffffffe",
-                   "extraData" => "0xd583010a068650617269747986312e32362e32826c69",
-                   "gasLimit" => "0x7a1200",
-                   "gasUsed" => "0x0",
-                   "hash" => "0x627baabf5a17c0cfc547b6903ac5e19eaa91f30d9141be1034e3768f6adbc94e",
-                   "logsBloom" =>
-                     "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                   "miner" => "0xe2ac1c6843a33f81ae4935e5ef1277a392990381",
-                   "number" => block_quantity,
-                   "parentHash" => "0x006edcaa1e6fde822908783bc4ef1ad3675532d542fce53537557391cfe34c3c",
-                   "receiptsRoot" => "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                   "sealFields" => [
-                     "0x841240b30d",
-                     "0xb84158bc4fa5891934bc94c5dca0301867ce4f35925ef46ea187496162668210bba61b4cda09d7e0dca2f1dd041fad498ced6697aeef72656927f52c55b630f2591c01"
-                   ],
-                   "sha3Uncles" => "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347",
-                   "signature" =>
-                     "58bc4fa5891934bc94c5dca0301867ce4f35925ef46ea187496162668210bba61b4cda09d7e0dca2f1dd041fad498ced6697aeef72656927f52c55b630f2591c01",
-                   "size" => "0x243",
-                   "stateRoot" => "0x9a8111062667f7b162851a1cbbe8aece5ff12e761b3dcee93b787fcc12548cf7",
-                   "step" => "306230029",
-                   "timestamp" => "0x5b437f41",
-                   "totalDifficulty" => "0x342337ffffffffffffffffffffffffed8d29bb",
-                   "transactions" => [],
-                   "transactionsRoot" => "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                   "uncles" => []
-                 }}
+                 [
+                   %{
+                     id: id,
+                     result: %{
+                       "author" => "0xe2ac1c6843a33f81ae4935e5ef1277a392990381",
+                       "difficulty" => "0xfffffffffffffffffffffffffffffffe",
+                       "extraData" => "0xd583010a068650617269747986312e32362e32826c69",
+                       "gasLimit" => "0x7a1200",
+                       "gasUsed" => "0x0",
+                       "hash" => "0x627baabf5a17c0cfc547b6903ac5e19eaa91f30d9141be1034e3768f6adbc94e",
+                       "logsBloom" =>
+                         "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                       "miner" => "0xe2ac1c6843a33f81ae4935e5ef1277a392990381",
+                       "number" => block_quantity,
+                       "parentHash" => "0x006edcaa1e6fde822908783bc4ef1ad3675532d542fce53537557391cfe34c3c",
+                       "receiptsRoot" => "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+                       "sealFields" => [
+                         "0x841240b30d",
+                         "0xb84158bc4fa5891934bc94c5dca0301867ce4f35925ef46ea187496162668210bba61b4cda09d7e0dca2f1dd041fad498ced6697aeef72656927f52c55b630f2591c01"
+                       ],
+                       "sha3Uncles" => "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347",
+                       "signature" =>
+                         "58bc4fa5891934bc94c5dca0301867ce4f35925ef46ea187496162668210bba61b4cda09d7e0dca2f1dd041fad498ced6697aeef72656927f52c55b630f2591c01",
+                       "size" => "0x243",
+                       "stateRoot" => "0x9a8111062667f7b162851a1cbbe8aece5ff12e761b3dcee93b787fcc12548cf7",
+                       "step" => "306230029",
+                       "timestamp" => "0x5b437f41",
+                       "totalDifficulty" => "0x342337ffffffffffffffffffffffffed8d29bb",
+                       "transactions" => [],
+                       "transactionsRoot" => "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+                       "uncles" => []
+                     }
+                   }
+                 ]}
 
               [%{method: "trace_block"} | _] = requests, _options ->
                 {:ok, Enum.map(requests, fn %{id: id} -> %{id: id, result: []} end)}

From 450642cdcece3bc9ffbdb3cb9c9a04019d8bca53 Mon Sep 17 00:00:00 2001
From: Maxim Filonov <53992153+sl1depengwyn@users.noreply.github.com>
Date: Tue, 18 Jul 2023 15:51:07 +0300
Subject: [PATCH 247/909] Update CHANGELOG.md

---
 CHANGELOG.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3bc71aff6104..4152e3dcdf30 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,8 @@
 
 ### Features
 
+- [#6190](https://github.com/blockscout/blockscout/pull/6190) - Add EIP-1559 support to gas price oracle
+
 ### Fixes
 
 ### Chore

From c3d67c8c9480d9520db6910dfa5cf18ad4ac7ee9 Mon Sep 17 00:00:00 2001
From: Viktor Baranov <baranov.viktor.27@gmail.com>
Date: Tue, 1 Aug 2023 13:13:36 +0300
Subject: [PATCH 248/909] Fix Rootstock charts API

---
 CHANGELOG.md                                  |  1 +
 .../controllers/api/v2/stats_controller.ex    | 17 ++++++++-
 .../explorer/lib/explorer/chain/supply/rsk.ex | 37 ++++++++++---------
 3 files changed, 37 insertions(+), 18 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a537a513035b..7a093cb63220 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,7 @@
 
 - [#8040](https://github.com/blockscout/blockscout/pull/8040) - Resolve issue with Docker image for Mac M1/M2
 - [#8060](https://github.com/blockscout/blockscout/pull/8060) - Fix eth_getLogs API endpoint
+- [#8082](https://github.com/blockscout/blockscout/pull/8082) - Fix Rootstock charts API
 
 ### Chore
 
diff --git a/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/stats_controller.ex b/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/stats_controller.ex
index 6ffbd0c6bbfe..921ed5c4bf45 100644
--- a/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/stats_controller.ex
+++ b/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/stats_controller.ex
@@ -125,5 +125,20 @@ defmodule BlockScoutWeb.API.V2.StatsController do
 
   defp available_supply(:ok, exchange_rate), do: exchange_rate.available_supply || 0
 
-  defp available_supply({:ok, supply_for_days}, _exchange_rate), do: supply_for_days
+  defp available_supply({:ok, supply_for_days}, _exchange_rate) do
+    supply_for_days
+    |> Jason.encode()
+    |> case do
+      {:ok, _data} ->
+        current_date =
+          supply_for_days
+          |> Map.keys()
+          |> Enum.max(Date)
+
+        Map.get(supply_for_days, current_date)
+
+      _ ->
+        nil
+    end
+  end
 end
diff --git a/apps/explorer/lib/explorer/chain/supply/rsk.ex b/apps/explorer/lib/explorer/chain/supply/rsk.ex
index 1037dd4cf79e..2eb9caa93350 100644
--- a/apps/explorer/lib/explorer/chain/supply/rsk.ex
+++ b/apps/explorer/lib/explorer/chain/supply/rsk.ex
@@ -5,7 +5,7 @@ defmodule Explorer.Chain.Supply.RSK do
 
   use Explorer.Chain.Supply
 
-  import Ecto.Query, only: [from: 2]
+  import Ecto.Query, only: [from: 2, subquery: 1]
   import EthereumJSONRPC, only: [integer_to_quantity: 1]
 
   alias EthereumJSONRPC.FetchedBalances
@@ -16,7 +16,9 @@ defmodule Explorer.Chain.Supply.RSK do
 
   @cache_name :rsk_balance
   @balance_key :balance
+  @rsk_bridge_contract_address "0x0000000000000000000000000000000001000006"
 
+  @spec market_cap(any()) :: Decimal.t()
   def market_cap(%{usd_value: usd_value}) when not is_nil(usd_value) do
     btc = circulating()
 
@@ -25,31 +27,32 @@ defmodule Explorer.Chain.Supply.RSK do
 
   def market_cap(_), do: Decimal.new(0)
 
-  @doc "Equivalent to getting the circulating value "
+  @doc "Equivalent to getting the circulating value"
   def supply_for_days(days) do
     now = Timex.now()
 
-    balances_query =
+    base_query =
       from(balance in CoinBalance,
         join: block in Block,
         on: block.number == balance.block_number,
         where: block.consensus == true,
-        where: balance.address_hash == ^"0x0000000000000000000000000000000001000006",
-        where: block.timestamp > ^Timex.shift(now, days: -days),
-        distinct: fragment("date_trunc('day', ?)", block.timestamp),
-        select: {block.timestamp, balance.value}
+        where: balance.address_hash == ^@rsk_bridge_contract_address,
+        select: %{timestamp: block.timestamp, value: balance.value}
+      )
+
+    balances_query =
+      from(q in subquery(base_query),
+        where: q.timestamp > ^Timex.shift(now, days: -days),
+        distinct: fragment("date_trunc('day', ?)", q.timestamp),
+        select: {q.timestamp, q.value}
       )
 
     balance_before_query =
-      from(balance in CoinBalance,
-        join: block in Block,
-        on: block.number == balance.block_number,
-        where: block.consensus == true,
-        where: balance.address_hash == ^"0x0000000000000000000000000000000001000006",
-        where: block.timestamp <= ^Timex.shift(Timex.now(), days: -days),
-        order_by: [desc: block.timestamp],
+      from(q in subquery(base_query),
+        where: q.timestamp <= ^Timex.shift(Timex.now(), days: -days),
+        order_by: [desc: q.timestamp],
         limit: 1,
-        select: balance.value
+        select: q.value
       )
 
     by_day =
@@ -105,7 +108,7 @@ defmodule Explorer.Chain.Supply.RSK do
     max_number = BlockNumber.get_max()
 
     params = [
-      %{block_quantity: integer_to_quantity(max_number), hash_data: "0x0000000000000000000000000000000001000006"}
+      %{block_quantity: integer_to_quantity(max_number), hash_data: @rsk_bridge_contract_address}
     ]
 
     json_rpc_named_arguments = Application.get_env(:explorer, :json_rpc_named_arguments)
@@ -116,7 +119,7 @@ defmodule Explorer.Chain.Supply.RSK do
          errors: [],
          params_list: [
            %{
-             address_hash: "0x0000000000000000000000000000000001000006",
+             address_hash: @rsk_bridge_contract_address,
              value: value
            }
          ]

From 286b9579b2b0404e44e03db93d85ff6d0e16db36 Mon Sep 17 00:00:00 2001
From: Viktor Baranov <baranov.viktor.27@gmail.com>
Date: Tue, 1 Aug 2023 14:19:35 +0300
Subject: [PATCH 249/909] CI for Immutable

---
 .../publish-docker-image-for-immutable.yml    | 63 +++++++++++++++++++
 1 file changed, 63 insertions(+)
 create mode 100644 .github/workflows/publish-docker-image-for-immutable.yml

diff --git a/.github/workflows/publish-docker-image-for-immutable.yml b/.github/workflows/publish-docker-image-for-immutable.yml
new file mode 100644
index 000000000000..fb19f2f49d02
--- /dev/null
+++ b/.github/workflows/publish-docker-image-for-immutable.yml
@@ -0,0 +1,63 @@
+# This workflow uses actions that are not certified by GitHub.
+# They are provided by a third-party and are governed by
+# separate terms of service, privacy policy, and support
+# documentation.
+
+name: Publish Docker image for specific chain branches
+
+on:
+  push:
+    branches:
+      - production-immutable-stg
+env:
+  OTP_VERSION: '24.3.4.1'
+  ELIXIR_VERSION: '1.13.4'
+jobs:
+  push_to_registry:
+    name: Push Docker image to Docker Hub
+    runs-on: ubuntu-latest
+    env:
+      RELEASE_VERSION: 5.2.1
+      DOCKER_CHAIN_NAME: immutable
+    steps:
+      - name: Check out the repo
+        uses: actions/checkout@v3
+
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v2
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2
+      
+      - name: Log in to Docker Hub
+        uses: docker/login-action@v2
+        with:
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
+      
+      - name: Extract metadata (tags, labels) for Docker
+        id: meta
+        uses: docker/metadata-action@v4
+        with:
+          images: blockscout/blockscout
+
+      - name: Add SHORT_SHA env property with commit short sha
+        run: echo "SHORT_SHA=`echo ${GITHUB_SHA} | cut -c1-8`" >> $GITHUB_ENV
+      
+      - name: Build and push Docker image
+        uses: docker/build-push-action@v3
+        with:
+          context: .
+          file: ./docker/Dockerfile
+          push: true
+          tags: blockscout/blockscout-${{ env.DOCKER_CHAIN_NAME }}:latest, blockscout/blockscout-${{ env.DOCKER_CHAIN_NAME }}:${{ env.RELEASE_VERSION }}-prerelease-${{ env.SHORT_SHA }}
+          build-args: |
+            CACHE_EXCHANGE_RATES_PERIOD=
+            DISABLE_READ_API=false
+            DISABLE_WEBAPP=false
+            DISABLE_WRITE_API=false
+            CACHE_TOTAL_GAS_USAGE_COUNTER_ENABLED=
+            ADMIN_PANEL_ENABLED=false
+            CACHE_ADDRESS_WITH_BALANCES_UPDATE_INTERVAL=
+            BLOCKSCOUT_VERSION=v${{ env.RELEASE_VERSION }}-beta.+commit.${{ env.SHORT_SHA }}
+            RELEASE_VERSION=${{ env.RELEASE_VERSION }}
\ No newline at end of file

From 643c4eb071449e36a746462ab00d307776e9533e Mon Sep 17 00:00:00 2001
From: Viktor Baranov <baranov.viktor.27@gmail.com>
Date: Tue, 1 Aug 2023 14:44:27 +0300
Subject: [PATCH 250/909] CI: prerelease -> postrelease

---
 .github/workflows/publish-docker-image-for-core.yml       | 2 +-
 .github/workflows/publish-docker-image-for-eth-goerli.yml | 2 +-
 .github/workflows/publish-docker-image-for-eth.yml        | 2 +-
 .github/workflows/publish-docker-image-for-immutable.yml  | 2 +-
 .github/workflows/publish-docker-image-for-l2-staging.yml | 2 +-
 .github/workflows/publish-docker-image-for-lukso.yml      | 2 +-
 .github/workflows/publish-docker-image-for-rsk.yml        | 2 +-
 .github/workflows/publish-docker-image-for-xdai.yml       | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/publish-docker-image-for-core.yml b/.github/workflows/publish-docker-image-for-core.yml
index d15ef3531a54..cf8c9344c091 100644
--- a/.github/workflows/publish-docker-image-for-core.yml
+++ b/.github/workflows/publish-docker-image-for-core.yml
@@ -41,7 +41,7 @@ jobs:
           context: .
           file: ./docker/Dockerfile
           push: true
-          tags: blockscout/blockscout-${{ env.DOCKER_CHAIN_NAME }}:latest, blockscout/blockscout-${{ env.DOCKER_CHAIN_NAME }}:${{ env.RELEASE_VERSION }}-prerelease-${{ env.SHORT_SHA }}
+          tags: blockscout/blockscout-${{ env.DOCKER_CHAIN_NAME }}:latest, blockscout/blockscout-${{ env.DOCKER_CHAIN_NAME }}:${{ env.RELEASE_VERSION }}-postrelease-${{ env.SHORT_SHA }}
           build-args: |
             CACHE_EXCHANGE_RATES_PERIOD=
             DISABLE_READ_API=false
diff --git a/.github/workflows/publish-docker-image-for-eth-goerli.yml b/.github/workflows/publish-docker-image-for-eth-goerli.yml
index 0f1dfbb47991..99da783794be 100644
--- a/.github/workflows/publish-docker-image-for-eth-goerli.yml
+++ b/.github/workflows/publish-docker-image-for-eth-goerli.yml
@@ -41,7 +41,7 @@ jobs:
           context: .
           file: ./docker/Dockerfile
           push: true
-          tags: blockscout/blockscout-${{ env.DOCKER_CHAIN_NAME }}:latest, blockscout/blockscout-${{ env.DOCKER_CHAIN_NAME }}:${{ env.RELEASE_VERSION }}-prerelease-${{ env.SHORT_SHA }}
+          tags: blockscout/blockscout-${{ env.DOCKER_CHAIN_NAME }}:latest, blockscout/blockscout-${{ env.DOCKER_CHAIN_NAME }}:${{ env.RELEASE_VERSION }}-postrelease-${{ env.SHORT_SHA }}
           build-args: |
             CACHE_EXCHANGE_RATES_PERIOD=
             DISABLE_READ_API=false
diff --git a/.github/workflows/publish-docker-image-for-eth.yml b/.github/workflows/publish-docker-image-for-eth.yml
index 058b5f77d9a5..a4598fa845b4 100644
--- a/.github/workflows/publish-docker-image-for-eth.yml
+++ b/.github/workflows/publish-docker-image-for-eth.yml
@@ -41,7 +41,7 @@ jobs:
           context: .
           file: ./docker/Dockerfile
           push: true
-          tags:  blockscout/blockscout-${{ env.DOCKER_CHAIN_NAME }}:${{ env.RELEASE_VERSION }}-prerelease-${{ env.SHORT_SHA }}-experimental
+          tags:  blockscout/blockscout-${{ env.DOCKER_CHAIN_NAME }}:${{ env.RELEASE_VERSION }}-postrelease-${{ env.SHORT_SHA }}-experimental
           build-args: |
             CACHE_EXCHANGE_RATES_PERIOD=
             DISABLE_READ_API=false
diff --git a/.github/workflows/publish-docker-image-for-immutable.yml b/.github/workflows/publish-docker-image-for-immutable.yml
index fb19f2f49d02..abf6071504bc 100644
--- a/.github/workflows/publish-docker-image-for-immutable.yml
+++ b/.github/workflows/publish-docker-image-for-immutable.yml
@@ -50,7 +50,7 @@ jobs:
           context: .
           file: ./docker/Dockerfile
           push: true
-          tags: blockscout/blockscout-${{ env.DOCKER_CHAIN_NAME }}:latest, blockscout/blockscout-${{ env.DOCKER_CHAIN_NAME }}:${{ env.RELEASE_VERSION }}-prerelease-${{ env.SHORT_SHA }}
+          tags: blockscout/blockscout-${{ env.DOCKER_CHAIN_NAME }}:latest, blockscout/blockscout-${{ env.DOCKER_CHAIN_NAME }}:${{ env.RELEASE_VERSION }}-postrelease-${{ env.SHORT_SHA }}
           build-args: |
             CACHE_EXCHANGE_RATES_PERIOD=
             DISABLE_READ_API=false
diff --git a/.github/workflows/publish-docker-image-for-l2-staging.yml b/.github/workflows/publish-docker-image-for-l2-staging.yml
index c903fe819c44..4a85493e9efb 100644
--- a/.github/workflows/publish-docker-image-for-l2-staging.yml
+++ b/.github/workflows/publish-docker-image-for-l2-staging.yml
@@ -41,7 +41,7 @@ jobs:
           context: .
           file: ./docker/Dockerfile
           push: true
-          tags: blockscout/blockscout-${{ env.DOCKER_CHAIN_NAME }}:latest, blockscout/blockscout-${{ env.DOCKER_CHAIN_NAME }}:${{ env.RELEASE_VERSION }}-prerelease-${{ env.SHORT_SHA }}
+          tags: blockscout/blockscout-${{ env.DOCKER_CHAIN_NAME }}:latest, blockscout/blockscout-${{ env.DOCKER_CHAIN_NAME }}:${{ env.RELEASE_VERSION }}-postrelease-${{ env.SHORT_SHA }}
           build-args: |
             CACHE_EXCHANGE_RATES_PERIOD=
             DISABLE_READ_API=false
diff --git a/.github/workflows/publish-docker-image-for-lukso.yml b/.github/workflows/publish-docker-image-for-lukso.yml
index 544f0729d5cc..96109f811cf1 100644
--- a/.github/workflows/publish-docker-image-for-lukso.yml
+++ b/.github/workflows/publish-docker-image-for-lukso.yml
@@ -41,7 +41,7 @@ jobs:
           context: .
           file: ./docker/Dockerfile
           push: true
-          tags: blockscout/blockscout-${{ env.DOCKER_CHAIN_NAME }}:latest, blockscout/blockscout-${{ env.DOCKER_CHAIN_NAME }}:${{ env.RELEASE_VERSION }}-prerelease-${{ env.SHORT_SHA }}
+          tags: blockscout/blockscout-${{ env.DOCKER_CHAIN_NAME }}:latest, blockscout/blockscout-${{ env.DOCKER_CHAIN_NAME }}:${{ env.RELEASE_VERSION }}-postrelease-${{ env.SHORT_SHA }}
           build-args: |
             CACHE_EXCHANGE_RATES_PERIOD=
             DISABLE_READ_API=false
diff --git a/.github/workflows/publish-docker-image-for-rsk.yml b/.github/workflows/publish-docker-image-for-rsk.yml
index df49d64ccac0..fca3a4d13f04 100644
--- a/.github/workflows/publish-docker-image-for-rsk.yml
+++ b/.github/workflows/publish-docker-image-for-rsk.yml
@@ -41,7 +41,7 @@ jobs:
           context: .
           file: ./docker/Dockerfile
           push: true
-          tags: blockscout/blockscout-${{ env.DOCKER_CHAIN_NAME }}:latest, blockscout/blockscout-${{ env.DOCKER_CHAIN_NAME }}:${{ env.RELEASE_VERSION }}-prerelease-${{ env.SHORT_SHA }}
+          tags: blockscout/blockscout-${{ env.DOCKER_CHAIN_NAME }}:latest, blockscout/blockscout-${{ env.DOCKER_CHAIN_NAME }}:${{ env.RELEASE_VERSION }}-postrelease-${{ env.SHORT_SHA }}
           build-args: |
             CACHE_EXCHANGE_RATES_PERIOD=
             DISABLE_READ_API=false
diff --git a/.github/workflows/publish-docker-image-for-xdai.yml b/.github/workflows/publish-docker-image-for-xdai.yml
index 9f3ecd4a772e..1f047a818b84 100644
--- a/.github/workflows/publish-docker-image-for-xdai.yml
+++ b/.github/workflows/publish-docker-image-for-xdai.yml
@@ -50,7 +50,7 @@ jobs:
           context: .
           file: ./docker/Dockerfile
           push: true
-          tags: blockscout/blockscout-${{ env.DOCKER_CHAIN_NAME }}:latest, blockscout/blockscout-${{ env.DOCKER_CHAIN_NAME }}:${{ env.RELEASE_VERSION }}-prerelease-${{ env.SHORT_SHA }}
+          tags: blockscout/blockscout-${{ env.DOCKER_CHAIN_NAME }}:latest, blockscout/blockscout-${{ env.DOCKER_CHAIN_NAME }}:${{ env.RELEASE_VERSION }}-postrelease-${{ env.SHORT_SHA }}
           build-args: |
             CACHE_EXCHANGE_RATES_PERIOD=
             DISABLE_READ_API=false

From f31c5d78c8ec8f0ec78eb4474aa4901e6733b24a Mon Sep 17 00:00:00 2001
From: lewtran <34024382+lewtran@users.noreply.github.com>
Date: Tue, 1 Aug 2023 21:19:16 +0700
Subject: [PATCH 251/909] Fix Dockerfile build

---
 docker/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker/Dockerfile b/docker/Dockerfile
index 9b42fcbe71b2..9193b154aec7 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -37,7 +37,7 @@ RUN mix do deps.get, local.rebar --force, deps.compile
 ADD apps ./apps
 ADD config ./config
 ADD rel ./rel
-ADD *.exs .
+ADD *.exs ./
 
 RUN apk add --update nodejs npm
 

From f91f53e8baf8c645d6ce331324b0e34c24fa79e2 Mon Sep 17 00:00:00 2001
From: Viktor Baranov <baranov.viktor.27@gmail.com>
Date: Tue, 1 Aug 2023 17:58:30 +0300
Subject: [PATCH 252/909] Generalize available_supply across application
 versions

---
 CHANGELOG.md                                  |  2 +-
 .../controllers/api/v2/stats_controller.ex    | 21 +------------------
 .../chain/market_history_chart_controller.ex  | 18 ++++++++++------
 3 files changed, 14 insertions(+), 27 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d6a8480e0d51..33496ee991e9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,7 +10,7 @@
 
 - [#8040](https://github.com/blockscout/blockscout/pull/8040) - Resolve issue with Docker image for Mac M1/M2
 - [#8060](https://github.com/blockscout/blockscout/pull/8060) - Fix eth_getLogs API endpoint
-- [#8082](https://github.com/blockscout/blockscout/pull/8082) - Fix Rootstock charts API
+- [#8082](https://github.com/blockscout/blockscout/pull/8082), [#8088](https://github.com/blockscout/blockscout/pull/8088) - Fix Rootstock charts API
 
 ### Chore
 
diff --git a/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/stats_controller.ex b/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/stats_controller.ex
index 921ed5c4bf45..f85e5f54be31 100644
--- a/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/stats_controller.ex
+++ b/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/stats_controller.ex
@@ -94,7 +94,7 @@ defmodule BlockScoutWeb.API.V2.StatsController do
     exchange_rate = Market.get_coin_exchange_rate()
 
     recent_market_history = Market.fetch_recent_history()
-    current_total_supply = available_supply(Chain.supply_for_days(), exchange_rate)
+    current_total_supply = MarketHistoryChartController.available_supply(Chain.supply_for_days(), exchange_rate)
 
     price_history_data =
       recent_market_history
@@ -122,23 +122,4 @@ defmodule BlockScoutWeb.API.V2.StatsController do
       available_supply: current_total_supply
     })
   end
-
-  defp available_supply(:ok, exchange_rate), do: exchange_rate.available_supply || 0
-
-  defp available_supply({:ok, supply_for_days}, _exchange_rate) do
-    supply_for_days
-    |> Jason.encode()
-    |> case do
-      {:ok, _data} ->
-        current_date =
-          supply_for_days
-          |> Map.keys()
-          |> Enum.max(Date)
-
-        Map.get(supply_for_days, current_date)
-
-      _ ->
-        nil
-    end
-  end
 end
diff --git a/apps/block_scout_web/lib/block_scout_web/controllers/chain/market_history_chart_controller.ex b/apps/block_scout_web/lib/block_scout_web/controllers/chain/market_history_chart_controller.ex
index 5ab997f4a91e..a9816adcbd04 100644
--- a/apps/block_scout_web/lib/block_scout_web/controllers/chain/market_history_chart_controller.ex
+++ b/apps/block_scout_web/lib/block_scout_web/controllers/chain/market_history_chart_controller.ex
@@ -29,16 +29,22 @@ defmodule BlockScoutWeb.Chain.MarketHistoryChartController do
     end
   end
 
-  defp available_supply(:ok, exchange_rate) do
-    to_string(exchange_rate.available_supply || 0)
-  end
+  def available_supply(:ok, exchange_rate), do: exchange_rate.available_supply || 0
 
-  defp available_supply({:ok, supply_for_days}, _exchange_rate) do
+  def available_supply({:ok, supply_for_days}, _exchange_rate) do
     supply_for_days
     |> Jason.encode()
     |> case do
-      {:ok, data} -> data
-      _ -> []
+      {:ok, _data} ->
+        current_date =
+          supply_for_days
+          |> Map.keys()
+          |> Enum.max(Date)
+
+        Map.get(supply_for_days, current_date)
+
+      _ ->
+        nil
     end
   end
 

From fc2d019c116a9717bde2349cea600b7d79628a00 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 1 Aug 2023 18:49:16 +0000
Subject: [PATCH 253/909] Bump sass from 1.64.1 to 1.64.2 in
 /apps/block_scout_web/assets

Bumps [sass](https://github.com/sass/dart-sass) from 1.64.1 to 1.64.2.
- [Release notes](https://github.com/sass/dart-sass/releases)
- [Changelog](https://github.com/sass/dart-sass/blob/main/CHANGELOG.md)
- [Commits](https://github.com/sass/dart-sass/compare/1.64.1...1.64.2)

---
updated-dependencies:
- dependency-name: sass
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 apps/block_scout_web/assets/package-lock.json | 14 +++++++-------
 apps/block_scout_web/assets/package.json      |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/apps/block_scout_web/assets/package-lock.json b/apps/block_scout_web/assets/package-lock.json
index ec7334673ed8..99113b248e40 100644
--- a/apps/block_scout_web/assets/package-lock.json
+++ b/apps/block_scout_web/assets/package-lock.json
@@ -89,7 +89,7 @@
         "mini-css-extract-plugin": "^2.7.6",
         "postcss": "^8.4.27",
         "postcss-loader": "^7.3.3",
-        "sass": "^1.64.1",
+        "sass": "^1.64.2",
         "sass-loader": "^13.3.2",
         "style-loader": "^3.3.3",
         "webpack": "^5.88.2",
@@ -14978,9 +14978,9 @@
       "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
     },
     "node_modules/sass": {
-      "version": "1.64.1",
-      "resolved": "https://registry.npmjs.org/sass/-/sass-1.64.1.tgz",
-      "integrity": "sha512-16rRACSOFEE8VN7SCgBu1MpYCyN7urj9At898tyzdXFhC+a+yOX5dXwAR7L8/IdPJ1NB8OYoXmD55DM30B2kEQ==",
+      "version": "1.64.2",
+      "resolved": "https://registry.npmjs.org/sass/-/sass-1.64.2.tgz",
+      "integrity": "sha512-TnDlfc+CRnUAgLO9D8cQLFu/GIjJIzJCGkE7o4ekIGQOH7T3GetiRR/PsTWJUHhkzcSPrARkPI+gNWn5alCzDg==",
       "dev": true,
       "dependencies": {
         "chokidar": ">=3.0.0 <4.0.0",
@@ -28833,9 +28833,9 @@
       "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
     },
     "sass": {
-      "version": "1.64.1",
-      "resolved": "https://registry.npmjs.org/sass/-/sass-1.64.1.tgz",
-      "integrity": "sha512-16rRACSOFEE8VN7SCgBu1MpYCyN7urj9At898tyzdXFhC+a+yOX5dXwAR7L8/IdPJ1NB8OYoXmD55DM30B2kEQ==",
+      "version": "1.64.2",
+      "resolved": "https://registry.npmjs.org/sass/-/sass-1.64.2.tgz",
+      "integrity": "sha512-TnDlfc+CRnUAgLO9D8cQLFu/GIjJIzJCGkE7o4ekIGQOH7T3GetiRR/PsTWJUHhkzcSPrARkPI+gNWn5alCzDg==",
       "dev": true,
       "requires": {
         "chokidar": ">=3.0.0 <4.0.0",
diff --git a/apps/block_scout_web/assets/package.json b/apps/block_scout_web/assets/package.json
index 752adc827da3..28a60def3631 100644
--- a/apps/block_scout_web/assets/package.json
+++ b/apps/block_scout_web/assets/package.json
@@ -101,7 +101,7 @@
     "mini-css-extract-plugin": "^2.7.6",
     "postcss": "^8.4.27",
     "postcss-loader": "^7.3.3",
-    "sass": "^1.64.1",
+    "sass": "^1.64.2",
     "sass-loader": "^13.3.2",
     "style-loader": "^3.3.3",
     "webpack": "^5.88.2",

From 75558d62989ca637473a3d6314975baa1e6994e0 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 1 Aug 2023 19:00:23 +0000
Subject: [PATCH 254/909] Bump exvcr from 0.14.1 to 0.14.2

Bumps [exvcr](https://github.com/parroty/exvcr) from 0.14.1 to 0.14.2.
- [Release notes](https://github.com/parroty/exvcr/releases)
- [Changelog](https://github.com/parroty/exvcr/blob/master/CHANGELOG.md)
- [Commits](https://github.com/parroty/exvcr/compare/v0.14.1...v0.14.2)

---
updated-dependencies:
- dependency-name: exvcr
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 mix.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mix.lock b/mix.lock
index c27497c98f85..80808bb7d0f1 100644
--- a/mix.lock
+++ b/mix.lock
@@ -57,7 +57,7 @@
   "exactor": {:hex, :exactor, "2.2.4", "5efb4ddeb2c48d9a1d7c9b465a6fffdd82300eb9618ece5d34c3334d5d7245b1", [:mix], [], "hexpm", "1222419f706e01bfa1095aec9acf6421367dcfab798a6f67c54cf784733cd6b5"},
   "exjsx": {:hex, :exjsx, "4.0.0", "60548841e0212df401e38e63c0078ec57b33e7ea49b032c796ccad8cde794b5c", [:mix], [{:jsx, "~> 2.8.0", [hex: :jsx, repo: "hexpm", optional: false]}], "hexpm", "32e95820a97cffea67830e91514a2ad53b888850442d6d395f53a1ac60c82e07"},
   "expo": {:hex, :expo, "0.4.1", "1c61d18a5df197dfda38861673d392e642649a9cef7694d2f97a587b2cfb319b", [:mix], [], "hexpm", "2ff7ba7a798c8c543c12550fa0e2cbc81b95d4974c65855d8d15ba7b37a1ce47"},
-  "exvcr": {:hex, :exvcr, "0.14.1", "d9aacec631ed379e366bce5b3c68f6ec5b92b89142f9379425854e80a28c1107", [:mix], [{:exactor, "~> 2.2", [hex: :exactor, repo: "hexpm", optional: false]}, {:exjsx, "~> 4.0", [hex: :exjsx, repo: "hexpm", optional: false]}, {:finch, "~> 0.16", [hex: :finch, repo: "hexpm", optional: true]}, {:httpoison, "~> 1.0 or ~> 2.0", [hex: :httpoison, repo: "hexpm", optional: true]}, {:httpotion, "~> 3.1", [hex: :httpotion, repo: "hexpm", optional: true]}, {:ibrowse, "4.4.0", [hex: :ibrowse, repo: "hexpm", optional: true]}, {:meck, "~> 0.8", [hex: :meck, repo: "hexpm", optional: false]}], "hexpm", "5f1e0854fbad0c4bb64ae8cdd289eeace90b8a0a209788c2f840d70f86a2d63c"},
+  "exvcr": {:hex, :exvcr, "0.14.2", "90830764b7a428c07bb1475628b4e020f34a081605b9484df6b7b3fe7e32ee9c", [:mix], [{:exactor, "~> 2.2", [hex: :exactor, repo: "hexpm", optional: false]}, {:exjsx, "~> 4.0", [hex: :exjsx, repo: "hexpm", optional: false]}, {:finch, "~> 0.16", [hex: :finch, repo: "hexpm", optional: true]}, {:httpoison, "~> 1.0 or ~> 2.0", [hex: :httpoison, repo: "hexpm", optional: true]}, {:httpotion, "~> 3.1", [hex: :httpotion, repo: "hexpm", optional: true]}, {:ibrowse, "4.4.0", [hex: :ibrowse, repo: "hexpm", optional: true]}, {:meck, "~> 0.8", [hex: :meck, repo: "hexpm", optional: false]}], "hexpm", "2ca98dabbfd10215cb2072fc5c83d91f6d1e1a7b5e576300c0ec6825ac97a070"},
   "file_info": {:hex, :file_info, "0.0.4", "2e0e77f211e833f38ead22cb29ce53761d457d80b3ffe0ffe0eb93880b0963b2", [:mix], [{:mimetype_parser, "~> 0.1.2", [hex: :mimetype_parser, repo: "hexpm", optional: false]}], "hexpm", "50e7ad01c2c8b9339010675fe4dc4a113b8d6ca7eddce24d1d74fd0e762781a5"},
   "file_system": {:hex, :file_system, "0.2.10", "fb082005a9cd1711c05b5248710f8826b02d7d1784e7c3451f9c1231d4fc162d", [:mix], [], "hexpm", "41195edbfb562a593726eda3b3e8b103a309b733ad25f3d642ba49696bf715dc"},
   "floki": {:hex, :floki, "0.34.3", "5e2dcaec5d7c228ce5b1d3501502e308b2d79eb655e4191751a1fe491c37feac", [:mix], [], "hexpm", "9577440eea5b97924b4bf3c7ea55f7b8b6dce589f9b28b096cc294a8dc342341"},

From e152cf0909485bcda14fdba4e29b0a45b2013448 Mon Sep 17 00:00:00 2001
From: Andrew Gross <andogro@gmail.com>
Date: Tue, 1 Aug 2023 15:19:08 -0600
Subject: [PATCH 255/909] Update README.md

Fix broken links on Readme
---
 README.md | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/README.md b/README.md
index 316e101047f5..0a59692f9704 100644
--- a/README.md
+++ b/README.md
@@ -8,24 +8,21 @@
 </div>
 
 
-BlockScout provides a comprehensive, easy-to-use interface for users to view, confirm, and inspect transactions on EVM (Ethereum Virtual Machine) blockchains. This includes the POA Network, Gnosis Chain, Ethereum Classic and other **Ethereum testnets, private networks and sidechains**.
+BlockScout provides a comprehensive, easy-to-use interface for users to view, confirm, and inspect transactions on EVM (Ethereum Virtual Machine) blockchains. This includes Ethereum Mainnet, Ethereum Classic, Optimism, Gnosis Chain and many other **Ethereum testnets, private networks, L2s and sidechains**.
 
 See our [project documentation](https://docs.blockscout.com/) for detailed information and setup instructions.
 
-For questions, comments and feature requests see the [discussions section](https://github.com/blockscout/blockscout/discussions).
+For questions, comments and feature requests see the [discussions section](https://github.com/blockscout/blockscout/discussions) or via [Discord](https://discord.com/invite/blockscout).
 
 ## About BlockScout
 
-BlockScout is an Elixir application that allows users to search transactions, view accounts and balances, and verify smart contracts on the Ethereum network including all forks and sidechains.
+BlockScout allows users to search transactions, view accounts and balances, verify and interact with smart contracts and view and interact with applications on the Ethereum network including many forks, sidechains, L2s and testnets.
 
-Currently available full-featured block explorers (Etherscan, Etherchain, Blockchair) are closed systems which are not independently verifiable.  As Ethereum sidechains continue to proliferate in both private and public settings, transparent, open-source tools are needed to analyze and validate transactions.
+Blockscout is an open-source alternative to centralized, closed source block explorers such as Etherscan, Etherchain and others.  As Ethereum sidechains and L2s continue to proliferate in both private and public settings, transparent, open-source tools are needed to analyze and validate all transactions.
 
 ## Supported Projects
 
-BlockScout supports a number of projects. Hosted instances include POA Network, Gnosis Chain, Ethereum Classic, Sokol & Kovan testnets, and other EVM chains.
-
-- [List of hosted mainnets, testnets, and additional chains using BlockScout](https://docs.blockscout.com/for-projects/supported-projects)
-- [Hosted instance versions](https://docs.blockscout.com/about/use-cases/hosted-blockscout)
+BlockScout currently supports several hundred chains and rollups throughout the greater blockchain ecosystem. Ethereum, Cosmos, Polkadot, Avalanche, Near and many others include Blockscout integrations. [A comprehensive list is available here](https://docs.blockscout.com/about/projects). If your project is not listed, please submit a PR or [contact the team in Discord](https://discord.com/invite/blockscout).
 
 ## Getting Started
 

From 2fde184a4d4644f873d52c5ac3aed6b3affaa237 Mon Sep 17 00:00:00 2001
From: Viktor Baranov <baranov.viktor.27@gmail.com>
Date: Wed, 2 Aug 2023 15:15:41 +0300
Subject: [PATCH 256/909] Extend docker-compose configs with new config when
 front is running externally

---
 CHANGELOG.md                                  |  2 +
 ...ker-compose-no-build-external-frontend.yml | 83 +++++++++++++++++++
 .../docker-compose-no-build-frontend.yml      |  4 +-
 docker-compose/envs/common-stats.env          |  1 -
 .../{nginx.conf => default.conf.template}     |  2 +-
 .../services/docker-compose-nginx.yml         |  8 +-
 .../services/docker-compose-stats.yml         |  6 +-
 7 files changed, 95 insertions(+), 11 deletions(-)
 create mode 100644 docker-compose/docker-compose-no-build-external-frontend.yml
 rename docker-compose/proxy/{nginx.conf => default.conf.template} (97%)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 33496ee991e9..811490b27479 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -14,6 +14,8 @@
 
 ### Chore
 
+- [#8100](https://github.com/blockscout/blockscout/pull/8100) - Extend docker-compose configs with new config when front is running externally
+
 <details>
   <summary>Dependencies version bumps</summary>
 
diff --git a/docker-compose/docker-compose-no-build-external-frontend.yml b/docker-compose/docker-compose-no-build-external-frontend.yml
new file mode 100644
index 000000000000..35dbc93a81b0
--- /dev/null
+++ b/docker-compose/docker-compose-no-build-external-frontend.yml
@@ -0,0 +1,83 @@
+version: '3.8'
+
+services:
+  redis_db:
+    extends:
+      file: ./services/docker-compose-redis.yml
+      service: redis_db
+
+  db:
+    extends:
+      file: ./services/docker-compose-db.yml
+      service: db
+
+  backend:
+    depends_on:
+      - db
+      - smart-contract-verifier
+      - redis_db
+    image: blockscout/blockscout:${DOCKER_TAG:-master}
+    pull_policy: always
+    restart: always
+    stop_grace_period: 5m
+    container_name: 'blockscout'
+    links:
+      - db:database
+    command: sh -c "bin/blockscout eval \"Elixir.Explorer.ReleaseTasks.create_and_migrate()\" && bin/blockscout start"
+    extra_hosts:
+      - 'host.docker.internal:host-gateway'
+    env_file:
+      -  ./envs/common-blockscout.env
+    environment:
+        ETHEREUM_JSONRPC_VARIANT: 'ganache'
+        ETHEREUM_JSONRPC_HTTP_URL: http://host.docker.internal:8545/
+        ETHEREUM_JSONRPC_WS_URL: ws://host.docker.internal:8545/
+        INDEXER_DISABLE_INTERNAL_TRANSACTIONS_FETCHER: 'true'
+        INDEXER_DISABLE_PENDING_TRANSACTIONS_FETCHER: 'true'
+        DATABASE_URL: postgresql://postgres:@host.docker.internal:7432/blockscout?ssl=false
+        ECTO_USE_SSL: 'false'
+        SECRET_KEY_BASE: '56NtB48ear7+wMSf0IQuWDAAazhpb31qyc7GiyspBP2vh7t5zlCsF5QDv76chXeN'
+        CHAIN_ID: '1337'
+        API_V2_ENABLED: 'true'
+        MIX_ENV: 'prod'
+    ports:
+      - 4000:4000
+    volumes:
+      - ./logs/:/app/logs/
+
+  smart-contract-verifier:
+    extends:
+      file: ./services/docker-compose-smart-contract-verifier.yml
+      service: smart-contract-verifier
+
+  visualizer:
+    extends:
+      file: ./services/docker-compose-visualizer.yml
+      service: visualizer
+
+  sig-provider:
+    extends:
+      file: ./services/docker-compose-sig-provider.yml
+      service: sig-provider
+
+  stats-db:
+    depends_on:
+      - backend
+    extends:
+      file: ./services/docker-compose-stats.yml
+      service: stats-db
+
+  stats:
+    depends_on:
+      - stats-db
+    extends:
+      file: ./services/docker-compose-stats.yml
+      service: stats
+
+  proxy:
+    depends_on:
+      - backend
+      - stats
+    extends:
+      file: ./services/docker-compose-nginx.yml
+      service: proxy
\ No newline at end of file
diff --git a/docker-compose/docker-compose-no-build-frontend.yml b/docker-compose/docker-compose-no-build-frontend.yml
index e52017c7f78b..76ae066b383a 100644
--- a/docker-compose/docker-compose-no-build-frontend.yml
+++ b/docker-compose/docker-compose-no-build-frontend.yml
@@ -76,14 +76,16 @@ services:
 
   stats:
     depends_on:
-      - backend
+      - stats-db
     extends:
       file: ./services/docker-compose-stats.yml
       service: stats
 
   proxy:
     depends_on:
+      - backend
       - frontend
+      - stats
     extends:
       file: ./services/docker-compose-nginx.yml
       service: proxy
diff --git a/docker-compose/envs/common-stats.env b/docker-compose/envs/common-stats.env
index aa1f48225e6b..f5eed636bab6 100644
--- a/docker-compose/envs/common-stats.env
+++ b/docker-compose/envs/common-stats.env
@@ -15,7 +15,6 @@ STATS__CREATE_DATABASE=false
 STATS__RUN_MIGRATIONS=false
 STATS__DEFAULT_SCHEDULE=0 0 1 * * * *
 STATS__FORCE_UPDATE_ON_START=false
-STATS__CHARTS_CONFIG=config/charts.toml
 
 STATS__METRICS__ENABLED=false
 STATS__METRICS__ADDR=0.0.0.0:6060
diff --git a/docker-compose/proxy/nginx.conf b/docker-compose/proxy/default.conf.template
similarity index 97%
rename from docker-compose/proxy/nginx.conf
rename to docker-compose/proxy/default.conf.template
index d20a44c819eb..3967119647c0 100644
--- a/docker-compose/proxy/nginx.conf
+++ b/docker-compose/proxy/default.conf.template
@@ -3,7 +3,7 @@ server {
     server_name  localhost;
     proxy_http_version 1.1;
     location / {
-        proxy_pass          http://frontend:3000;
+        proxy_pass          ${FRONT_PROXY_PASS};
     }
     location /socket/v2 {
         proxy_pass http://backend:4000;
diff --git a/docker-compose/services/docker-compose-nginx.yml b/docker-compose/services/docker-compose-nginx.yml
index 2d2bd87dc127..295913b4607b 100644
--- a/docker-compose/services/docker-compose-nginx.yml
+++ b/docker-compose/services/docker-compose-nginx.yml
@@ -3,11 +3,11 @@ version: '3.8'
 services:  
   proxy:
     image: nginx
+    container_name: proxy
     volumes:
-      - type: bind
-        source: ../proxy/nginx.conf
-        target: /etc/nginx/conf.d/default.conf
-        read_only: true
+      - "../proxy:/etc/nginx/templates"
+    environment:
+      FRONT_PROXY_PASS: ${FRONT_PROXY_PASS:-http://frontend:3000}
     ports:
       - 80:80
       - 81:81
diff --git a/docker-compose/services/docker-compose-stats.yml b/docker-compose/services/docker-compose-stats.yml
index 4b14419fa631..b6ea6552b1da 100644
--- a/docker-compose/services/docker-compose-stats.yml
+++ b/docker-compose/services/docker-compose-stats.yml
@@ -12,10 +12,10 @@ services:
         POSTGRES_HOST_AUTH_METHOD: 'trust'
     ports:
       - 7433:5432
+    volumes:
+      - ./stats-db-data:/var/lib/postgresql/data/
 
   stats:
-    depends_on:
-      - stats-db
     image: ghcr.io/blockscout/stats:${STATS_DOCKER_TAG:-latest}
     pull_policy: always
     platform: linux/amd64
@@ -32,5 +32,3 @@ services:
       - STATS__RUN_MIGRATIONS=true
     ports:
       - 8153:8050
-    volumes:
-      - ./stats-db-data:/var/lib/postgresql/data/

From fa0e0dca0fce9100ddd9d569bab4e21659a4da9a Mon Sep 17 00:00:00 2001
From: Viktor Baranov <baranov.viktor.27@gmail.com>
Date: Wed, 2 Aug 2023 19:34:36 +0300
Subject: [PATCH 257/909] Fix docker-compose with new frontend Auth0 path

---
 CHANGELOG.md                               | 2 +-
 docker-compose/proxy/default.conf.template | 8 ++++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 811490b27479..8699f6026ca9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -14,7 +14,7 @@
 
 ### Chore
 
-- [#8100](https://github.com/blockscout/blockscout/pull/8100) - Extend docker-compose configs with new config when front is running externally
+- [#8100](https://github.com/blockscout/blockscout/pull/8100), [#8103](https://github.com/blockscout/blockscout/pull/8103) - Extend docker-compose configs with new config when front is running externally
 
 <details>
   <summary>Dependencies version bumps</summary>
diff --git a/docker-compose/proxy/default.conf.template b/docker-compose/proxy/default.conf.template
index 3967119647c0..47a7b7131a8b 100644
--- a/docker-compose/proxy/default.conf.template
+++ b/docker-compose/proxy/default.conf.template
@@ -30,6 +30,14 @@ server {
         proxy_pass          http://backend:4000;
     }
 
+    location /auth {
+        proxy_pass http://backend:4000;
+        proxy_http_version 1.1;
+        proxy_set_header Upgrade $http_upgrade;
+        proxy_set_header Connection "Upgrade";
+        proxy_set_header Host $host;
+    }
+
     location /socket {
         proxy_pass http://backend:4000;
         proxy_http_version 1.1;

From 3808e104cbe9b34aad7df47bdd55b9a7d45f35a3 Mon Sep 17 00:00:00 2001
From: Viktor Baranov <baranov.viktor.27@gmail.com>
Date: Wed, 2 Aug 2023 22:47:03 +0300
Subject: [PATCH 258/909] GraphQL extend schema with new field for existing
 objects

---
 CHANGELOG.md                                  |  1 +
 .../lib/block_scout_web/schema/types.ex       | 79 ++++++++++++-------
 2 files changed, 52 insertions(+), 28 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8699f6026ca9..ca76ae3e0440 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,7 @@
 ### Features
 
 - [#6190](https://github.com/blockscout/blockscout/pull/6190) - Add EIP-1559 support to gas price oracle
+- [#7977](https://github.com/blockscout/blockscout/pull/7977) - GraphQL: extend schema with new field for existing objects
 
 ### Fixes
 
diff --git a/apps/block_scout_web/lib/block_scout_web/schema/types.ex b/apps/block_scout_web/lib/block_scout_web/schema/types.ex
index 426d9909f59b..99f47a29163b 100644
--- a/apps/block_scout_web/lib/block_scout_web/schema/types.ex
+++ b/apps/block_scout_web/lib/block_scout_web/schema/types.ex
@@ -22,10 +22,14 @@ defmodule BlockScoutWeb.Schema.Types do
   A stored representation of a Web3 address.
   """
   object :address do
-    field(:hash, :address_hash)
     field(:fetched_coin_balance, :wei)
     field(:fetched_coin_balance_block_number, :integer)
+    field(:hash, :address_hash)
     field(:contract_code, :data)
+    field(:nonce, :integer)
+    field(:gas_used, :integer)
+    field(:transactions_count, :integer)
+    field(:token_transfers_count, :integer)
 
     field :smart_contract, :smart_contract do
       resolve(dataloader(:db, :smart_contract))
@@ -36,16 +40,7 @@ defmodule BlockScoutWeb.Schema.Types do
       arg(:order, type: :sort_order, default_value: :desc)
       resolve(&Transaction.get_by/3)
 
-      complexity(fn
-        %{first: first}, child_complexity ->
-          first * child_complexity
-
-        %{last: last}, child_complexity ->
-          last * child_complexity
-
-        %{}, _child_complexity ->
-          0
-      end)
+      complexity(fn params, child_complexity -> process_complexity(params, child_complexity) end)
     end
   end
 
@@ -55,18 +50,20 @@ defmodule BlockScoutWeb.Schema.Types do
   structure that they form is called a "blockchain".
   """
   object :block do
-    field(:hash, :full_hash)
     field(:consensus, :boolean)
     field(:difficulty, :decimal)
     field(:gas_limit, :decimal)
     field(:gas_used, :decimal)
+    field(:hash, :full_hash)
+    field(:miner_hash, :address_hash)
     field(:nonce, :nonce_hash)
     field(:number, :integer)
+    field(:parent_hash, :full_hash)
     field(:size, :integer)
     field(:timestamp, :datetime)
     field(:total_difficulty, :decimal)
-    field(:miner_hash, :address_hash)
-    field(:parent_hash, :full_hash)
+    field(:base_fee_per_gas, :wei)
+    field(:is_empty, :boolean)
   end
 
   @desc """
@@ -85,12 +82,14 @@ defmodule BlockScoutWeb.Schema.Types do
     field(:trace_address, :json)
     field(:type, :type)
     field(:value, :wei)
-    field(:block_number, :integer)
-    field(:transaction_index, :integer)
     field(:created_contract_address_hash, :address_hash)
     field(:from_address_hash, :address_hash)
     field(:to_address_hash, :address_hash)
     field(:transaction_hash, :full_hash)
+    field(:block_number, :integer)
+    field(:transaction_index, :integer)
+    field(:block_hash, :full_hash)
+    field(:block_index, :integer)
   end
 
   @desc """
@@ -108,6 +107,19 @@ defmodule BlockScoutWeb.Schema.Types do
     field(:contract_source_code, :string)
     field(:abi, :json)
     field(:address_hash, :address_hash)
+    field(:constructor_arguments, :string)
+    field(:optimization_runs, :integer)
+    field(:evm_version, :string)
+    field(:external_libraries, :json)
+    field(:verified_via_sourcify, :boolean)
+    field(:partially_verified, :boolean)
+    field(:file_path, :string)
+    field(:is_vyper_contract, :boolean)
+    field(:is_changed_bytecode, :boolean)
+    field(:implementation_name, :string)
+    field(:implementation_address_hash, :address_hash)
+    field(:compiler_settings, :json)
+    field(:verified_via_eth_bytecode_db, :boolean)
   end
 
   @desc """
@@ -130,13 +142,12 @@ defmodule BlockScoutWeb.Schema.Types do
   Models a Web3 transaction.
   """
   node object(:transaction, id_fetcher: &transaction_id_fetcher/2) do
-    field(:hash, :full_hash)
-    field(:block_number, :integer)
     field(:cumulative_gas_used, :decimal)
     field(:error, :string)
     field(:gas, :decimal)
     field(:gas_price, :wei)
     field(:gas_used, :decimal)
+    field(:hash, :full_hash)
     field(:index, :integer)
     field(:input, :string)
     field(:nonce, :nonce_hash)
@@ -145,24 +156,23 @@ defmodule BlockScoutWeb.Schema.Types do
     field(:status, :status)
     field(:v, :decimal)
     field(:value, :wei)
+    field(:block_hash, :full_hash)
+    field(:block_number, :integer)
     field(:from_address_hash, :address_hash)
     field(:to_address_hash, :address_hash)
     field(:created_contract_address_hash, :address_hash)
+    field(:earliest_processing_start, :datetime)
+    field(:revert_reason, :string)
+    field(:max_priority_fee_per_gas, :wei)
+    field(:max_fee_per_gas, :wei)
+    field(:type, :integer)
+    field(:has_error_in_internal_txs, :boolean)
 
     connection field(:internal_transactions, node_type: :internal_transaction) do
       arg(:count, :integer)
       resolve(&InternalTransaction.get_by/3)
 
-      complexity(fn
-        %{first: first}, child_complexity ->
-          first * child_complexity
-
-        %{last: last}, child_complexity ->
-          last * child_complexity
-
-        %{}, _child_complexity ->
-          0
-      end)
+      complexity(fn params, child_complexity -> process_complexity(params, child_complexity) end)
     end
   end
 
@@ -175,4 +185,17 @@ defmodule BlockScoutWeb.Schema.Types do
   def internal_transaction_id_fetcher(%{transaction_hash: transaction_hash, index: index}, _) do
     Jason.encode!(%{transaction_hash: to_string(transaction_hash), index: index})
   end
+
+  defp process_complexity(params, child_complexity) do
+    case params do
+      %{first: first} ->
+        first * child_complexity
+
+      %{last: last} ->
+        last * child_complexity
+
+      %{} ->
+        0
+    end
+  end
 end

From bd238fbb587aa88216590d1c24f89e0f533f6150 Mon Sep 17 00:00:00 2001
From: Viktor Baranov <baranov.viktor.27@gmail.com>
Date: Wed, 2 Aug 2023 22:49:51 +0300
Subject: [PATCH 259/909] Remove TODO from API v2 response

---
 CHANGELOG.md                                                  | 1 +
 .../lib/block_scout_web/views/api/v2/block_view.ex            | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8699f6026ca9..5ee1616b32e7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -14,6 +14,7 @@
 
 ### Chore
 
+- [#8104](https://github.com/blockscout/blockscout/pull/8104) - remove "TODO" from API v2 response
 - [#8100](https://github.com/blockscout/blockscout/pull/8100), [#8103](https://github.com/blockscout/blockscout/pull/8103) - Extend docker-compose configs with new config when front is running externally
 
 <details>
diff --git a/apps/block_scout_web/lib/block_scout_web/views/api/v2/block_view.ex b/apps/block_scout_web/lib/block_scout_web/views/api/v2/block_view.ex
index 9c022d364e52..8da05d3b686a 100644
--- a/apps/block_scout_web/lib/block_scout_web/views/api/v2/block_view.ex
+++ b/apps/block_scout_web/lib/block_scout_web/views/api/v2/block_view.ex
@@ -50,9 +50,9 @@ defmodule BlockScoutWeb.API.V2.BlockView do
       "base_fee_per_gas" => block.base_fee_per_gas,
       "burnt_fees" => burned_fee,
       "priority_fee" => priority_fee,
-      "extra_data" => "TODO",
+      # "extra_data" => "TODO",
       "uncles_hashes" => prepare_uncles(block.uncle_relations),
-      "state_root" => "TODO",
+      # "state_root" => "TODO",
       "rewards" => prepare_rewards(block.rewards, block, single_block?),
       "gas_target_percentage" => gas_target(block),
       "gas_used_percentage" => gas_used_percentage(block),

From 980691c63daf3adeaed8e5dae94b50ba34772f03 Mon Sep 17 00:00:00 2001
From: Viktor Baranov <baranov.viktor.27@gmail.com>
Date: Thu, 3 Aug 2023 12:40:35 +0300
Subject: [PATCH 260/909] Add production-immutable-stg branch into CI

---
 .github/workflows/config.yml                       | 1 +
 .github/workflows/publish-docker-image-release.yml | 1 +
 2 files changed, 2 insertions(+)

diff --git a/.github/workflows/config.yml b/.github/workflows/config.yml
index 6bbec02ea1cb..e78e8c389c64 100644
--- a/.github/workflows/config.yml
+++ b/.github/workflows/config.yml
@@ -12,6 +12,7 @@ on:
       - production-sokol-stg
       - production-rsk-stg
       - production-lukso-stg
+      - production-immutable-stg
       - staging-l2
   pull_request:
     branches:
diff --git a/.github/workflows/publish-docker-image-release.yml b/.github/workflows/publish-docker-image-release.yml
index 689f3d7ec858..9a7167c63951 100644
--- a/.github/workflows/publish-docker-image-release.yml
+++ b/.github/workflows/publish-docker-image-release.yml
@@ -82,6 +82,7 @@ jobs:
         production-xdai-stg
         production-polygon-supernets-stg
         production-rsk-stg
+        production-immutable-stg
     steps:
     - uses: actions/checkout@v2
     - name: Set Git config

From b97db839fb2efe070954e3db4f98b653d758abbd Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 3 Aug 2023 18:27:27 +0000
Subject: [PATCH 261/909] Bump ex_doc from 0.30.3 to 0.30.4

Bumps [ex_doc](https://github.com/elixir-lang/ex_doc) from 0.30.3 to 0.30.4.
- [Changelog](https://github.com/elixir-lang/ex_doc/blob/main/CHANGELOG.md)
- [Commits](https://github.com/elixir-lang/ex_doc/compare/v0.30.3...v0.30.4)

---
updated-dependencies:
- dependency-name: ex_doc
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 mix.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mix.lock b/mix.lock
index 80808bb7d0f1..f4f8239d78ce 100644
--- a/mix.lock
+++ b/mix.lock
@@ -47,7 +47,7 @@
   "ex_cldr_lists": {:hex, :ex_cldr_lists, "2.10.0", "4d4c9877da2d0417fd832907d69974e8328969f75fafc79b05ccf85f549f6281", [:mix], [{:ex_cldr_numbers, "~> 2.25", [hex: :ex_cldr_numbers, repo: "hexpm", optional: false]}, {:ex_doc, "~> 0.18", [hex: :ex_doc, repo: "hexpm", optional: true]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}], "hexpm", "adc040cde7b97f7fd7c0b35dd69ddb6fcf607303ae6355bb1851deae1f8b0652"},
   "ex_cldr_numbers": {:hex, :ex_cldr_numbers, "2.31.3", "6ec8b18c395c0e8788d46da806f8f2abcbe4b0d809226d2a91363e9ccd85f2f5", [:mix], [{:decimal, "~> 1.6 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: false]}, {:digital_token, "~> 0.3 or ~> 1.0", [hex: :digital_token, repo: "hexpm", optional: false]}, {:ex_cldr, "~> 2.37", [hex: :ex_cldr, repo: "hexpm", optional: false]}, {:ex_cldr_currencies, ">= 2.14.2", [hex: :ex_cldr_currencies, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}], "hexpm", "b519de08ecc4a6402038f3aa75e8654f78ebd6fa714b7e585531504e648588fd"},
   "ex_cldr_units": {:hex, :ex_cldr_units, "3.16.2", "dbad303fba819981c578234e2aaf19d72efca16ea8b1c6ee46b26232cb45e232", [:mix], [{:cldr_utils, "~> 2.24", [hex: :cldr_utils, repo: "hexpm", optional: false]}, {:decimal, "~> 1.6 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: false]}, {:ex_cldr_lists, "~> 2.10", [hex: :ex_cldr_lists, repo: "hexpm", optional: false]}, {:ex_cldr_numbers, "~> 2.31", [hex: :ex_cldr_numbers, repo: "hexpm", optional: false]}, {:ex_doc, "~> 0.18", [hex: :ex_doc, repo: "hexpm", optional: true]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}], "hexpm", "851095319fb3205c1549619da742cd53a2804c1d9c204cf84014021e2a6ea7e5"},
-  "ex_doc": {:hex, :ex_doc, "0.30.3", "bfca4d340e3b95f2eb26e72e4890da83e2b3a5c5b0e52607333bf5017284b063", [:mix], [{:earmark_parser, "~> 1.4.31", [hex: :earmark_parser, repo: "hexpm", optional: false]}, {:makeup_elixir, "~> 0.14", [hex: :makeup_elixir, repo: "hexpm", optional: false]}, {:makeup_erlang, "~> 0.1", [hex: :makeup_erlang, repo: "hexpm", optional: false]}], "hexpm", "fbc8702046c1d25edf79de376297e608ac78cdc3a29f075484773ad1718918b6"},
+  "ex_doc": {:hex, :ex_doc, "0.30.4", "e8395c8e3c007321abb30a334f9f7c0858d80949af298302daf77553468c0c39", [:mix], [{:earmark_parser, "~> 1.4.31", [hex: :earmark_parser, repo: "hexpm", optional: false]}, {:makeup_elixir, "~> 0.14", [hex: :makeup_elixir, repo: "hexpm", optional: false]}, {:makeup_erlang, "~> 0.1", [hex: :makeup_erlang, repo: "hexpm", optional: false]}], "hexpm", "9a19f0c50ffaa02435668f5242f2b2a61d46b541ebf326884505dfd3dd7af5e4"},
   "ex_json_schema": {:hex, :ex_json_schema, "0.10.1", "e03b746b6675a750c0bb1a5cc919f61353f7ab8450977e11ceede20e6180c560", [:mix], [{:decimal, "~> 2.0", [hex: :decimal, repo: "hexpm", optional: false]}], "hexpm", "66a64e60dadad89914d92f89c7e7906c57de75a8b79ac2480d0d53e1b8096fb0"},
   "ex_keccak": {:hex, :ex_keccak, "0.7.1", "0169f4b0c5073c5df61581d6282b12f1a1b764dcfcda4eeb1c819b5194c9ced0", [:mix], [{:rustler, ">= 0.0.0", [hex: :rustler, repo: "hexpm", optional: true]}, {:rustler_precompiled, "~> 0.6.1", [hex: :rustler_precompiled, repo: "hexpm", optional: false]}], "hexpm", "c18c19f66b6545b4b46b0c71c0cc0079de84e30b26365a92961e91697e8724ed"},
   "ex_machina": {:hex, :ex_machina, "2.7.0", "b792cc3127fd0680fecdb6299235b4727a4944a09ff0fa904cc639272cd92dc7", [:mix], [{:ecto, "~> 2.2 or ~> 3.0", [hex: :ecto, repo: "hexpm", optional: true]}, {:ecto_sql, "~> 3.0", [hex: :ecto_sql, repo: "hexpm", optional: true]}], "hexpm", "419aa7a39bde11894c87a615c4ecaa52d8f107bbdd81d810465186f783245bf8"},

From 46f11860dc157d1da9c1fab92aeb59a6a6107886 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 3 Aug 2023 19:00:58 +0000
Subject: [PATCH 262/909] Bump chart.js from 4.3.2 to 4.3.3 in
 /apps/block_scout_web/assets

Bumps [chart.js](https://github.com/chartjs/Chart.js) from 4.3.2 to 4.3.3.
- [Release notes](https://github.com/chartjs/Chart.js/releases)
- [Commits](https://github.com/chartjs/Chart.js/compare/v4.3.2...v4.3.3)

---
updated-dependencies:
- dependency-name: chart.js
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 apps/block_scout_web/assets/package-lock.json | 14 +++++++-------
 apps/block_scout_web/assets/package.json      |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/apps/block_scout_web/assets/package-lock.json b/apps/block_scout_web/assets/package-lock.json
index 99113b248e40..ddbcd433ce6d 100644
--- a/apps/block_scout_web/assets/package-lock.json
+++ b/apps/block_scout_web/assets/package-lock.json
@@ -14,7 +14,7 @@
         "assert": "^2.0.0",
         "bignumber.js": "^9.1.1",
         "bootstrap": "^4.6.0",
-        "chart.js": "^4.3.2",
+        "chart.js": "^4.3.3",
         "chartjs-adapter-luxon": "^1.3.1",
         "clipboard": "^2.0.11",
         "core-js": "^3.32.0",
@@ -5446,9 +5446,9 @@
       }
     },
     "node_modules/chart.js": {
-      "version": "4.3.2",
-      "resolved": "https://registry.npmjs.org/chart.js/-/chart.js-4.3.2.tgz",
-      "integrity": "sha512-pvQNyFOY1QmbmIr8oDORL16/FFivfxj8V26VFpFilMo4cNvkV5WXLJetDio365pd9gKUHGdirUTbqJfw8tr+Dg==",
+      "version": "4.3.3",
+      "resolved": "https://registry.npmjs.org/chart.js/-/chart.js-4.3.3.tgz",
+      "integrity": "sha512-aTk7pBw+x6sQYhon/NR3ikfUJuym/LdgpTlgZRe2PaEhjUMKBKyNaFCMVRAyTEWYFNO7qRu7iQVqOw/OqzxZxQ==",
       "dependencies": {
         "@kurkle/color": "^0.3.0"
       },
@@ -21584,9 +21584,9 @@
       "dev": true
     },
     "chart.js": {
-      "version": "4.3.2",
-      "resolved": "https://registry.npmjs.org/chart.js/-/chart.js-4.3.2.tgz",
-      "integrity": "sha512-pvQNyFOY1QmbmIr8oDORL16/FFivfxj8V26VFpFilMo4cNvkV5WXLJetDio365pd9gKUHGdirUTbqJfw8tr+Dg==",
+      "version": "4.3.3",
+      "resolved": "https://registry.npmjs.org/chart.js/-/chart.js-4.3.3.tgz",
+      "integrity": "sha512-aTk7pBw+x6sQYhon/NR3ikfUJuym/LdgpTlgZRe2PaEhjUMKBKyNaFCMVRAyTEWYFNO7qRu7iQVqOw/OqzxZxQ==",
       "requires": {
         "@kurkle/color": "^0.3.0"
       }
diff --git a/apps/block_scout_web/assets/package.json b/apps/block_scout_web/assets/package.json
index 28a60def3631..f1f3f8304c62 100644
--- a/apps/block_scout_web/assets/package.json
+++ b/apps/block_scout_web/assets/package.json
@@ -26,7 +26,7 @@
     "assert": "^2.0.0",
     "bignumber.js": "^9.1.1",
     "bootstrap": "^4.6.0",
-    "chart.js": "^4.3.2",
+    "chart.js": "^4.3.3",
     "chartjs-adapter-luxon": "^1.3.1",
     "clipboard": "^2.0.11",
     "core-js": "^3.32.0",

From 94e3722701506051980cb7ba23ae3ce16c693c21 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 3 Aug 2023 19:01:21 +0000
Subject: [PATCH 263/909] Bump @fortawesome/fontawesome-free in
 /apps/block_scout_web/assets

Bumps [@fortawesome/fontawesome-free](https://github.com/FortAwesome/Font-Awesome) from 6.4.0 to 6.4.2.
- [Release notes](https://github.com/FortAwesome/Font-Awesome/releases)
- [Changelog](https://github.com/FortAwesome/Font-Awesome/blob/6.x/CHANGELOG.md)
- [Commits](https://github.com/FortAwesome/Font-Awesome/compare/6.4.0...6.4.2)

---
updated-dependencies:
- dependency-name: "@fortawesome/fontawesome-free"
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 apps/block_scout_web/assets/package-lock.json | 14 +++++++-------
 apps/block_scout_web/assets/package.json      |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/apps/block_scout_web/assets/package-lock.json b/apps/block_scout_web/assets/package-lock.json
index 99113b248e40..f13fe315932b 100644
--- a/apps/block_scout_web/assets/package-lock.json
+++ b/apps/block_scout_web/assets/package-lock.json
@@ -8,7 +8,7 @@
       "license": "GPL-3.0",
       "dependencies": {
         "@amplitude/analytics-browser": "^2.1.3",
-        "@fortawesome/fontawesome-free": "^6.4.0",
+        "@fortawesome/fontawesome-free": "^6.4.2",
         "@tarekraafat/autocomplete.js": "^10.2.7",
         "@walletconnect/web3-provider": "^1.8.0",
         "assert": "^2.0.0",
@@ -2524,9 +2524,9 @@
       }
     },
     "node_modules/@fortawesome/fontawesome-free": {
-      "version": "6.4.0",
-      "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-free/-/fontawesome-free-6.4.0.tgz",
-      "integrity": "sha512-0NyytTlPJwB/BF5LtRV8rrABDbe3TdTXqNB3PdZ+UUUZAEIrdOJdmABqKjt4AXwIoJNaRVVZEXxpNrqvE1GAYQ==",
+      "version": "6.4.2",
+      "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-free/-/fontawesome-free-6.4.2.tgz",
+      "integrity": "sha512-m5cPn3e2+FDCOgi1mz0RexTUvvQibBebOUlUlW0+YrMjDTPkiJ6VTKukA1GRsvRw+12KyJndNjj0O4AgTxm2Pg==",
       "hasInstallScript": true,
       "engines": {
         "node": ">=6"
@@ -19258,9 +19258,9 @@
       }
     },
     "@fortawesome/fontawesome-free": {
-      "version": "6.4.0",
-      "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-free/-/fontawesome-free-6.4.0.tgz",
-      "integrity": "sha512-0NyytTlPJwB/BF5LtRV8rrABDbe3TdTXqNB3PdZ+UUUZAEIrdOJdmABqKjt4AXwIoJNaRVVZEXxpNrqvE1GAYQ=="
+      "version": "6.4.2",
+      "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-free/-/fontawesome-free-6.4.2.tgz",
+      "integrity": "sha512-m5cPn3e2+FDCOgi1mz0RexTUvvQibBebOUlUlW0+YrMjDTPkiJ6VTKukA1GRsvRw+12KyJndNjj0O4AgTxm2Pg=="
     },
     "@humanwhocodes/config-array": {
       "version": "0.11.10",
diff --git a/apps/block_scout_web/assets/package.json b/apps/block_scout_web/assets/package.json
index 28a60def3631..ef34580bcc29 100644
--- a/apps/block_scout_web/assets/package.json
+++ b/apps/block_scout_web/assets/package.json
@@ -19,7 +19,7 @@
     "eslint": "eslint js/**"
   },
   "dependencies": {
-    "@fortawesome/fontawesome-free": "^6.4.0",
+    "@fortawesome/fontawesome-free": "^6.4.2",
     "@amplitude/analytics-browser": "^2.1.3",
     "@tarekraafat/autocomplete.js": "^10.2.7",
     "@walletconnect/web3-provider": "^1.8.0",

From c755bdf9dc03e8a79d02009d49b5105908d03de1 Mon Sep 17 00:00:00 2001
From: Victor Baranov <baranov.viktor.27@gmail.com>
Date: Fri, 4 Aug 2023 15:57:43 +0300
Subject: [PATCH 264/909] Extend API v1 with endpoints used by new UI (#8105)

* Extend API v1 with endpoints used by new UI

* Add backward compatibility: /graphql and csv export related endpoints without /api/v1 path
---
 CHANGELOG.md                                  |  1 +
 .../lib/block_scout_web/api_router.ex         | 18 ++++++++++-
 .../lib/block_scout_web/router.ex             |  1 +
 .../templates/csv_export/index.html.eex       |  2 +-
 .../templates/page_not_found/index.json.eex   |  1 +
 .../lib/block_scout_web/views/csv_export.ex   | 11 +++----
 .../lib/block_scout_web/web_router.ex         |  5 ++--
 .../address_transaction_controller_test.exs   | 14 ++++-----
 .../schema/query/address_test.exs             | 30 +++++++++----------
 .../schema/query/addresses_test.exs           | 14 ++++-----
 .../schema/query/block_test.exs               |  8 ++---
 .../schema/query/node_test.exs                | 12 ++++----
 .../schema/query/token_transfers_test.exs     | 16 +++++-----
 .../schema/query/transaction_test.exs         | 26 ++++++++--------
 ...ker-compose-no-build-external-frontend.yml |  9 ++++++
 15 files changed, 97 insertions(+), 71 deletions(-)
 create mode 100644 apps/block_scout_web/lib/block_scout_web/templates/page_not_found/index.json.eex

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 924e43b89a95..bfa5c3c7fdca 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -15,6 +15,7 @@
 
 ### Chore
 
+- [#8105](https://github.com/blockscout/blockscout/pull/8105) - Extend API v1 with endpoints used by new UI
 - [#8104](https://github.com/blockscout/blockscout/pull/8104) - remove "TODO" from API v2 response
 - [#8100](https://github.com/blockscout/blockscout/pull/8100), [#8103](https://github.com/blockscout/blockscout/pull/8103) - Extend docker-compose configs with new config when front is running externally
 
diff --git a/apps/block_scout_web/lib/block_scout_web/api_router.ex b/apps/block_scout_web/lib/block_scout_web/api_router.ex
index 12245a9d9bd5..45bacd7ad97e 100644
--- a/apps/block_scout_web/lib/block_scout_web/api_router.ex
+++ b/apps/block_scout_web/lib/block_scout_web/api_router.ex
@@ -13,7 +13,7 @@ defmodule BlockScoutWeb.ApiRouter do
   Router for API
   """
   use BlockScoutWeb, :router
-  alias BlockScoutWeb.{APIKeyV2Router, SmartContractsApiV2Router}
+  alias BlockScoutWeb.{AddressTransactionController, APIKeyV2Router, SmartContractsApiV2Router}
   alias BlockScoutWeb.Plug.{CheckAccountAPI, CheckApiV2, RateLimit}
 
   forward("/v2/smart-contracts", SmartContractsApiV2Router)
@@ -209,6 +209,22 @@ defmodule BlockScoutWeb.ApiRouter do
     # leave the same endpoint in v1 in order to keep backward compatibility
     get("/search", SearchController, :search)
 
+    @max_complexity 200
+
+    forward("/graphql", Absinthe.Plug,
+      schema: BlockScoutWeb.Schema,
+      analyze_complexity: true,
+      max_complexity: @max_complexity
+    )
+
+    get("/transactions-csv", AddressTransactionController, :transactions_csv)
+
+    get("/token-transfers-csv", AddressTransactionController, :token_transfers_csv)
+
+    get("/internal-transactions-csv", AddressTransactionController, :internal_transactions_csv)
+
+    get("/logs-csv", AddressTransactionController, :logs_csv)
+
     scope "/health" do
       get("/", HealthController, :health)
       get("/liveness", HealthController, :liveness)
diff --git a/apps/block_scout_web/lib/block_scout_web/router.ex b/apps/block_scout_web/lib/block_scout_web/router.ex
index 8b7421b2773b..ba54d60412f4 100644
--- a/apps/block_scout_web/lib/block_scout_web/router.ex
+++ b/apps/block_scout_web/lib/block_scout_web/router.ex
@@ -28,6 +28,7 @@ defmodule BlockScoutWeb.Router do
     # Needs to be 200 to support the schema introspection for graphiql
     @max_complexity 200
 
+    # todo: remove once frontend will migrate to /api/v1/... path
     forward("/graphql", Absinthe.Plug,
       schema: BlockScoutWeb.Schema,
       analyze_complexity: true,
diff --git a/apps/block_scout_web/lib/block_scout_web/templates/csv_export/index.html.eex b/apps/block_scout_web/lib/block_scout_web/templates/csv_export/index.html.eex
index f0484d83d28e..979926300cf6 100644
--- a/apps/block_scout_web/lib/block_scout_web/templates/csv_export/index.html.eex
+++ b/apps/block_scout_web/lib/block_scout_web/templates/csv_export/index.html.eex
@@ -27,7 +27,7 @@
         id="export-csv-button"
         class="button button-primary"
         style="padding: 10px 25px;"
-        data-link=<%= address_transaction_path(@conn, type_download_path(@type)) %>
+        data-link=<%= BlockScoutWebController.full_path("/api/v1/#{type_download_path(@type)}") %>
         data-address-hash=<%= address_checksum(@address_hash_string) %>
         data-type=<%= @type %>
       ><%= gettext("Download") %></button>
diff --git a/apps/block_scout_web/lib/block_scout_web/templates/page_not_found/index.json.eex b/apps/block_scout_web/lib/block_scout_web/templates/page_not_found/index.json.eex
new file mode 100644
index 000000000000..98b8502d5f4f
--- /dev/null
+++ b/apps/block_scout_web/lib/block_scout_web/templates/page_not_found/index.json.eex
@@ -0,0 +1 @@
+Page not found
\ No newline at end of file
diff --git a/apps/block_scout_web/lib/block_scout_web/views/csv_export.ex b/apps/block_scout_web/lib/block_scout_web/views/csv_export.ex
index 34596956e45a..a076e1d00afe 100644
--- a/apps/block_scout_web/lib/block_scout_web/views/csv_export.ex
+++ b/apps/block_scout_web/lib/block_scout_web/views/csv_export.ex
@@ -1,6 +1,7 @@
 defmodule BlockScoutWeb.CsvExportView do
   use BlockScoutWeb, :view
 
+  alias BlockScoutWeb.Controller, as: BlockScoutWebController
   alias Explorer.Chain
   alias Explorer.Chain.Address
   alias Explorer.Chain.CSVExport.Helper
@@ -15,14 +16,10 @@ defmodule BlockScoutWeb.CsvExportView do
     end
   end
 
+  defp type_download_path(nil), do: ""
+
   defp type_download_path(type) do
-    case type do
-      "internal-transactions" -> :internal_transactions_csv
-      "transactions" -> :transactions_csv
-      "token-transfers" -> :token_transfers_csv
-      "logs" -> :logs_csv
-      _ -> ""
-    end
+    type <> "-csv"
   end
 
   defp address_checksum(address_hash_string) do
diff --git a/apps/block_scout_web/lib/block_scout_web/web_router.ex b/apps/block_scout_web/lib/block_scout_web/web_router.ex
index 4b3f7a20ae74..bd675182b642 100644
--- a/apps/block_scout_web/lib/block_scout_web/web_router.ex
+++ b/apps/block_scout_web/lib/block_scout_web/web_router.ex
@@ -493,10 +493,11 @@ defmodule BlockScoutWeb.WebRouter do
 
     get("/csv-export", CsvExportController, :index)
 
-    get("/transactions-csv", AddressTransactionController, :transactions_csv)
-
     get("/token-autocomplete", ChainController, :token_autocomplete)
 
+    # todo: remove once frontend will migrate to /api/v1/... path
+    get("/transactions-csv", AddressTransactionController, :transactions_csv)
+
     get("/token-transfers-csv", AddressTransactionController, :token_transfers_csv)
 
     get("/internal-transactions-csv", AddressTransactionController, :internal_transactions_csv)
diff --git a/apps/block_scout_web/test/block_scout_web/controllers/address_transaction_controller_test.exs b/apps/block_scout_web/test/block_scout_web/controllers/address_transaction_controller_test.exs
index 3e1434750870..ad86587530fc 100644
--- a/apps/block_scout_web/test/block_scout_web/controllers/address_transaction_controller_test.exs
+++ b/apps/block_scout_web/test/block_scout_web/controllers/address_transaction_controller_test.exs
@@ -176,7 +176,7 @@ defmodule BlockScoutWeb.AddressTransactionControllerTest do
       to_period = Timex.format!(Timex.now(), "%Y-%m-%d", :strftime)
 
       conn =
-        get(conn, "/token-transfers-csv", %{
+        get(conn, "/api/v1/token-transfers-csv", %{
           "address_id" => Address.checksum(address.hash),
           "from_period" => from_period,
           "to_period" => to_period
@@ -203,7 +203,7 @@ defmodule BlockScoutWeb.AddressTransactionControllerTest do
       to_period = Timex.format!(Timex.now(), "%Y-%m-%d", :strftime)
 
       conn =
-        get(conn, "/token-transfers-csv", %{
+        get(conn, "/api/v1/token-transfers-csv", %{
           "address_id" => Address.checksum(address.hash),
           "from_period" => from_period,
           "to_period" => to_period,
@@ -231,7 +231,7 @@ defmodule BlockScoutWeb.AddressTransactionControllerTest do
       to_period = Timex.format!(Timex.now(), "%Y-%m-%d", :strftime)
 
       conn =
-        get(conn, "/token-transfers-csv", %{
+        get(conn, "/api/v1/token-transfers-csv", %{
           "address_id" => Address.checksum(address.hash),
           "from_period" => from_period,
           "to_period" => to_period
@@ -260,7 +260,7 @@ defmodule BlockScoutWeb.AddressTransactionControllerTest do
       to_period = Timex.format!(Timex.now(), "%Y-%m-%d", :strftime)
 
       conn =
-        get(conn, "/token-transfers-csv", %{
+        get(conn, "/api/v1/token-transfers-csv", %{
           "address_id" => Address.checksum(address.hash),
           "from_period" => from_period,
           "to_period" => to_period,
@@ -290,7 +290,7 @@ defmodule BlockScoutWeb.AddressTransactionControllerTest do
       to_period = Timex.format!(Timex.now(), "%Y-%m-%d", :strftime)
 
       conn =
-        get(conn, "/transactions-csv", %{
+        get(conn, "/api/v1/transactions-csv", %{
           "address_id" => Address.checksum(address.hash),
           "from_period" => from_period,
           "to_period" => to_period,
@@ -357,7 +357,7 @@ defmodule BlockScoutWeb.AddressTransactionControllerTest do
       to_period = Timex.format!(Timex.now(), "%Y-%m-%d", :strftime)
 
       conn =
-        get(conn, "/internal-transactions-csv", %{
+        get(conn, "/api/v1/internal-transactions-csv", %{
           "address_id" => Address.checksum(address.hash),
           "from_period" => from_period,
           "to_period" => to_period,
@@ -418,7 +418,7 @@ defmodule BlockScoutWeb.AddressTransactionControllerTest do
       to_period = Timex.format!(Timex.now(), "%Y-%m-%d", :strftime)
 
       conn =
-        get(conn, "/logs-csv", %{
+        get(conn, "/api/v1/logs-csv", %{
           "address_id" => Address.checksum(address.hash),
           "from_period" => from_period,
           "to_period" => to_period,
diff --git a/apps/block_scout_web/test/block_scout_web/schema/query/address_test.exs b/apps/block_scout_web/test/block_scout_web/schema/query/address_test.exs
index ea1f5579f01c..f4526bc31454 100644
--- a/apps/block_scout_web/test/block_scout_web/schema/query/address_test.exs
+++ b/apps/block_scout_web/test/block_scout_web/schema/query/address_test.exs
@@ -18,7 +18,7 @@ defmodule BlockScoutWeb.Schema.Query.AddressTest do
 
       variables = %{"hash" => to_string(address.hash)}
 
-      conn = get(conn, "/graphql", query: query, variables: variables)
+      conn = get(conn, "/api/v1/graphql", query: query, variables: variables)
 
       assert json_response(conn, 200) == %{
                "data" => %{
@@ -45,7 +45,7 @@ defmodule BlockScoutWeb.Schema.Query.AddressTest do
 
       variables = %{"hash" => to_string(address.hash)}
 
-      conn = get(conn, "/graphql", query: query, variables: variables)
+      conn = get(conn, "/api/v1/graphql", query: query, variables: variables)
 
       assert json_response(conn, 200) == %{
                "data" => %{
@@ -78,7 +78,7 @@ defmodule BlockScoutWeb.Schema.Query.AddressTest do
 
       variables = %{"hash" => to_string(address.hash)}
 
-      conn = get(conn, "/graphql", query: query, variables: variables)
+      conn = get(conn, "/api/v1/graphql", query: query, variables: variables)
 
       assert json_response(conn, 200) == %{
                "data" => %{
@@ -110,7 +110,7 @@ defmodule BlockScoutWeb.Schema.Query.AddressTest do
 
       variables = %{"hash" => to_string(address.hash)}
 
-      conn = get(conn, "/graphql", query: query, variables: variables)
+      conn = get(conn, "/api/v1/graphql", query: query, variables: variables)
 
       assert %{"errors" => [error]} = json_response(conn, 200)
       assert error["message"] =~ ~s(Address not found.)
@@ -127,7 +127,7 @@ defmodule BlockScoutWeb.Schema.Query.AddressTest do
 
       variables = %{}
 
-      conn = get(conn, "/graphql", query: query, variables: variables)
+      conn = get(conn, "/api/v1/graphql", query: query, variables: variables)
 
       assert %{"errors" => [error]} = json_response(conn, 200)
       assert error["message"] == ~s(In argument "hash": Expected type "AddressHash!", found null.)
@@ -144,7 +144,7 @@ defmodule BlockScoutWeb.Schema.Query.AddressTest do
 
       variables = %{"hash" => "someInvalidHash"}
 
-      conn = get(conn, "/graphql", query: query, variables: variables)
+      conn = get(conn, "/api/v1/graphql", query: query, variables: variables)
 
       assert %{"errors" => [error]} = json_response(conn, 200)
       assert error["message"] =~ ~s(Argument "hash" has invalid value)
@@ -193,7 +193,7 @@ defmodule BlockScoutWeb.Schema.Query.AddressTest do
         "first" => 1
       }
 
-      conn = post(conn, "/graphql", query: query, variables: variables)
+      conn = post(conn, "/api/v1/graphql", query: query, variables: variables)
 
       assert json_response(conn, 200) == %{
                "data" => %{
@@ -251,7 +251,7 @@ defmodule BlockScoutWeb.Schema.Query.AddressTest do
         "first" => 1
       }
 
-      conn = post(conn, "/graphql", query: query, variables: variables)
+      conn = post(conn, "/api/v1/graphql", query: query, variables: variables)
 
       assert json_response(conn, 200) == %{
                "data" => %{
@@ -304,7 +304,7 @@ defmodule BlockScoutWeb.Schema.Query.AddressTest do
         "first" => 3
       }
 
-      conn = post(conn, "/graphql", query: query, variables: variables)
+      conn = post(conn, "/api/v1/graphql", query: query, variables: variables)
 
       %{
         "data" => %{
@@ -366,7 +366,7 @@ defmodule BlockScoutWeb.Schema.Query.AddressTest do
         "first" => 3
       }
 
-      conn = post(conn, "/graphql", query: query, variables: variables)
+      conn = post(conn, "/api/v1/graphql", query: query, variables: variables)
 
       %{
         "data" => %{
@@ -410,7 +410,7 @@ defmodule BlockScoutWeb.Schema.Query.AddressTest do
         "first" => 67
       }
 
-      conn = post(conn, "/graphql", query: query, variables: variables)
+      conn = post(conn, "/api/v1/graphql", query: query, variables: variables)
 
       assert %{"errors" => [error1, error2, error3]} = json_response(conn, 200)
       assert error1["message"] =~ ~s(Field transactions is too complex)
@@ -465,7 +465,7 @@ defmodule BlockScoutWeb.Schema.Query.AddressTest do
         "count" => 9
       }
 
-      conn = post(conn, "/graphql", query: query, variables: variables)
+      conn = post(conn, "/api/v1/graphql", query: query, variables: variables)
 
       %{
         "data" => %{
@@ -525,7 +525,7 @@ defmodule BlockScoutWeb.Schema.Query.AddressTest do
         "first" => 3
       }
 
-      conn = post(conn, "/graphql", query: query1, variables: variables1)
+      conn = post(conn, "/api/v1/graphql", query: query1, variables: variables1)
 
       %{"data" => %{"address" => %{"transactions" => page1}}} = json_response(conn, 200)
 
@@ -564,7 +564,7 @@ defmodule BlockScoutWeb.Schema.Query.AddressTest do
         "after" => last_cursor_page1
       }
 
-      conn = post(conn, "/graphql", query: query2, variables: variables2)
+      conn = post(conn, "/api/v1/graphql", query: query2, variables: variables2)
 
       %{"data" => %{"address" => %{"transactions" => page2}}} = json_response(conn, 200)
 
@@ -583,7 +583,7 @@ defmodule BlockScoutWeb.Schema.Query.AddressTest do
         "after" => last_cursor_page2
       }
 
-      conn = post(conn, "/graphql", query: query2, variables: variables3)
+      conn = post(conn, "/api/v1/graphql", query: query2, variables: variables3)
 
       %{"data" => %{"address" => %{"transactions" => page3}}} = json_response(conn, 200)
 
diff --git a/apps/block_scout_web/test/block_scout_web/schema/query/addresses_test.exs b/apps/block_scout_web/test/block_scout_web/schema/query/addresses_test.exs
index f6145a4afc1d..e3ca744f4937 100644
--- a/apps/block_scout_web/test/block_scout_web/schema/query/addresses_test.exs
+++ b/apps/block_scout_web/test/block_scout_web/schema/query/addresses_test.exs
@@ -18,7 +18,7 @@ defmodule BlockScoutWeb.Schema.Query.AddressesTest do
 
       variables = %{"hashes" => to_string(address.hash)}
 
-      conn = get(conn, "/graphql", query: query, variables: variables)
+      conn = get(conn, "/api/v1/graphql", query: query, variables: variables)
 
       assert json_response(conn, 200) == %{
                "data" => %{
@@ -47,7 +47,7 @@ defmodule BlockScoutWeb.Schema.Query.AddressesTest do
 
       variables = %{"hashes" => to_string(address.hash)}
 
-      conn = get(conn, "/graphql", query: query, variables: variables)
+      conn = get(conn, "/api/v1/graphql", query: query, variables: variables)
 
       assert json_response(conn, 200) == %{
                "data" => %{
@@ -82,7 +82,7 @@ defmodule BlockScoutWeb.Schema.Query.AddressesTest do
 
       variables = %{"hashes" => to_string(address.hash)}
 
-      conn = get(conn, "/graphql", query: query, variables: variables)
+      conn = get(conn, "/api/v1/graphql", query: query, variables: variables)
 
       assert json_response(conn, 200) == %{
                "data" => %{
@@ -116,7 +116,7 @@ defmodule BlockScoutWeb.Schema.Query.AddressesTest do
 
       variables = %{"hashes" => [to_string(address.hash)]}
 
-      conn = get(conn, "/graphql", query: query, variables: variables)
+      conn = get(conn, "/api/v1/graphql", query: query, variables: variables)
 
       assert %{"errors" => [error]} = json_response(conn, 200)
       assert error["message"] =~ ~s(Addresses not found.)
@@ -133,7 +133,7 @@ defmodule BlockScoutWeb.Schema.Query.AddressesTest do
 
       variables = %{}
 
-      conn = get(conn, "/graphql", query: query, variables: variables)
+      conn = get(conn, "/api/v1/graphql", query: query, variables: variables)
 
       assert %{"errors" => [error]} = json_response(conn, 200)
       assert error["message"] == ~s(In argument "hashes": Expected type "[AddressHash!]!", found null.)
@@ -150,7 +150,7 @@ defmodule BlockScoutWeb.Schema.Query.AddressesTest do
 
       variables = %{"hashes" => ["someInvalidHash"]}
 
-      conn = get(conn, "/graphql", query: query, variables: variables)
+      conn = get(conn, "/api/v1/graphql", query: query, variables: variables)
 
       assert %{"errors" => [error]} = json_response(conn, 200)
       assert error["message"] =~ ~s(Argument "hashes" has invalid value)
@@ -175,7 +175,7 @@ defmodule BlockScoutWeb.Schema.Query.AddressesTest do
 
       variables = %{"hashes" => hashes}
 
-      conn = get(conn, "/graphql", query: query, variables: variables)
+      conn = get(conn, "/api/v1/graphql", query: query, variables: variables)
 
       assert %{"errors" => [error1, error2]} = json_response(conn, 200)
       assert error1["message"] =~ ~s(Field addresses is too complex)
diff --git a/apps/block_scout_web/test/block_scout_web/schema/query/block_test.exs b/apps/block_scout_web/test/block_scout_web/schema/query/block_test.exs
index d601e3dd1005..26c612b344ce 100644
--- a/apps/block_scout_web/test/block_scout_web/schema/query/block_test.exs
+++ b/apps/block_scout_web/test/block_scout_web/schema/query/block_test.exs
@@ -27,7 +27,7 @@ defmodule BlockScoutWeb.Schema.Query.BlockTest do
 
       variables = %{"number" => block.number}
 
-      conn = post(conn, "/graphql", query: query, variables: variables)
+      conn = post(conn, "/api/v1/graphql", query: query, variables: variables)
 
       assert json_response(conn, 200) == %{
                "data" => %{
@@ -63,7 +63,7 @@ defmodule BlockScoutWeb.Schema.Query.BlockTest do
 
       variables = %{"number" => non_existent_block_number}
 
-      conn = post(conn, "/graphql", query: query, variables: variables)
+      conn = post(conn, "/api/v1/graphql", query: query, variables: variables)
 
       assert %{"errors" => [error]} = json_response(conn, 200)
       assert error["message"] =~ ~s(Block number #{non_existent_block_number} was not found)
@@ -80,7 +80,7 @@ defmodule BlockScoutWeb.Schema.Query.BlockTest do
       }
       """
 
-      conn = get(conn, "/graphql", query: query)
+      conn = get(conn, "/api/v1/graphql", query: query)
 
       assert %{"errors" => [error]} = json_response(conn, 200)
       assert error["message"] == ~s(In argument "number": Expected type "Int!", found null.)
@@ -99,7 +99,7 @@ defmodule BlockScoutWeb.Schema.Query.BlockTest do
 
       variables = %{"number" => "invalid"}
 
-      conn = get(conn, "/graphql", query: query, variables: variables)
+      conn = get(conn, "/api/v1/graphql", query: query, variables: variables)
 
       assert %{"errors" => [error]} = json_response(conn, 200)
       assert error["message"] =~ ~s(Argument "number" has invalid value)
diff --git a/apps/block_scout_web/test/block_scout_web/schema/query/node_test.exs b/apps/block_scout_web/test/block_scout_web/schema/query/node_test.exs
index 4638e2f1c379..75e6aacd1ac6 100644
--- a/apps/block_scout_web/test/block_scout_web/schema/query/node_test.exs
+++ b/apps/block_scout_web/test/block_scout_web/schema/query/node_test.exs
@@ -20,7 +20,7 @@ defmodule BlockScoutWeb.Schema.Query.NodeTest do
 
       variables = %{"id" => id}
 
-      conn = get(conn, "/graphql", query: query, variables: variables)
+      conn = get(conn, "/api/v1/graphql", query: query, variables: variables)
 
       assert json_response(conn, 200) == %{
                "data" => %{
@@ -50,7 +50,7 @@ defmodule BlockScoutWeb.Schema.Query.NodeTest do
 
       variables = %{"id" => id}
 
-      conn = get(conn, "/graphql", query: query, variables: variables)
+      conn = get(conn, "/api/v1/graphql", query: query, variables: variables)
 
       %{"errors" => [error]} = json_response(conn, 200)
 
@@ -88,7 +88,7 @@ defmodule BlockScoutWeb.Schema.Query.NodeTest do
 
       variables = %{"id" => id}
 
-      conn = get(conn, "/graphql", query: query, variables: variables)
+      conn = get(conn, "/api/v1/graphql", query: query, variables: variables)
 
       assert json_response(conn, 200) == %{
                "data" => %{
@@ -132,7 +132,7 @@ defmodule BlockScoutWeb.Schema.Query.NodeTest do
 
       variables = %{"id" => id}
 
-      conn = get(conn, "/graphql", query: query, variables: variables)
+      conn = get(conn, "/api/v1/graphql", query: query, variables: variables)
 
       %{"errors" => [error]} = json_response(conn, 200)
 
@@ -163,7 +163,7 @@ defmodule BlockScoutWeb.Schema.Query.NodeTest do
 
       variables = %{"id" => id}
 
-      conn = get(conn, "/graphql", query: query, variables: variables)
+      conn = get(conn, "/api/v1/graphql", query: query, variables: variables)
 
       assert json_response(conn, 200) == %{
                "data" => %{
@@ -199,7 +199,7 @@ defmodule BlockScoutWeb.Schema.Query.NodeTest do
 
       variables = %{"id" => id}
 
-      conn = get(conn, "/graphql", query: query, variables: variables)
+      conn = get(conn, "/api/v1/graphql", query: query, variables: variables)
 
       %{"errors" => [error]} = json_response(conn, 200)
 
diff --git a/apps/block_scout_web/test/block_scout_web/schema/query/token_transfers_test.exs b/apps/block_scout_web/test/block_scout_web/schema/query/token_transfers_test.exs
index aef875fe3e16..ea20aa4f4ede 100644
--- a/apps/block_scout_web/test/block_scout_web/schema/query/token_transfers_test.exs
+++ b/apps/block_scout_web/test/block_scout_web/schema/query/token_transfers_test.exs
@@ -33,7 +33,7 @@ defmodule BlockScoutWeb.Schema.Query.TokenTransfersTest do
         "first" => 1
       }
 
-      conn = post(conn, "/graphql", query: query, variables: variables)
+      conn = post(conn, "/api/v1/graphql", query: query, variables: variables)
 
       assert json_response(conn, 200) == %{
                "data" => %{
@@ -86,7 +86,7 @@ defmodule BlockScoutWeb.Schema.Query.TokenTransfersTest do
         "first" => 10
       }
 
-      conn = post(conn, "/graphql", query: query, variables: variables)
+      conn = post(conn, "/api/v1/graphql", query: query, variables: variables)
 
       assert json_response(conn, 200) == %{
                "data" => %{
@@ -121,7 +121,7 @@ defmodule BlockScoutWeb.Schema.Query.TokenTransfersTest do
 
       response1 =
         conn
-        |> post("/graphql", query: query1, variables: variables1)
+        |> post("/api/v1/graphql", query: query1, variables: variables1)
         |> json_response(200)
 
       %{"errors" => [response1_error1, response1_error2]} = response1
@@ -150,7 +150,7 @@ defmodule BlockScoutWeb.Schema.Query.TokenTransfersTest do
 
       response2 =
         conn
-        |> post("/graphql", query: query2, variables: variables2)
+        |> post("/api/v1/graphql", query: query2, variables: variables2)
         |> json_response(200)
 
       %{"errors" => [response2_error1, response2_error2]} = response2
@@ -212,7 +212,7 @@ defmodule BlockScoutWeb.Schema.Query.TokenTransfersTest do
 
       [token_transfer] =
         conn
-        |> post("/graphql", query: query, variables: variables)
+        |> post("/api/v1/graphql", query: query, variables: variables)
         |> json_response(200)
         |> get_in(["data", "token_transfers", "edges"])
 
@@ -264,7 +264,7 @@ defmodule BlockScoutWeb.Schema.Query.TokenTransfersTest do
         "first" => 1
       }
 
-      conn = post(conn, "/graphql", query: query1, variables: variables1)
+      conn = post(conn, "/api/v1/graphql", query: query1, variables: variables1)
 
       %{"data" => %{"token_transfers" => page1}} = json_response(conn, 200)
 
@@ -300,7 +300,7 @@ defmodule BlockScoutWeb.Schema.Query.TokenTransfersTest do
         "after" => last_cursor_page1
       }
 
-      conn = post(conn, "/graphql", query: query2, variables: variables2)
+      conn = post(conn, "/api/v1/graphql", query: query2, variables: variables2)
 
       %{"data" => %{"token_transfers" => page2}} = json_response(conn, 200)
 
@@ -319,7 +319,7 @@ defmodule BlockScoutWeb.Schema.Query.TokenTransfersTest do
         "after" => last_cursor_page2
       }
 
-      conn = post(conn, "/graphql", query: query2, variables: variables3)
+      conn = post(conn, "/api/v1/graphql", query: query2, variables: variables3)
 
       %{"data" => %{"token_transfers" => page3}} = json_response(conn, 200)
 
diff --git a/apps/block_scout_web/test/block_scout_web/schema/query/transaction_test.exs b/apps/block_scout_web/test/block_scout_web/schema/query/transaction_test.exs
index 66b31d676c72..6212ca89a788 100644
--- a/apps/block_scout_web/test/block_scout_web/schema/query/transaction_test.exs
+++ b/apps/block_scout_web/test/block_scout_web/schema/query/transaction_test.exs
@@ -37,7 +37,7 @@ defmodule BlockScoutWeb.Schema.Query.TransactionTest do
 
       variables = %{"hash" => to_string(transaction.hash)}
 
-      conn = get(conn, "/graphql", query: query, variables: variables)
+      conn = get(conn, "/api/v1/graphql", query: query, variables: variables)
 
       assert json_response(conn, 200) == %{
                "data" => %{
@@ -78,7 +78,7 @@ defmodule BlockScoutWeb.Schema.Query.TransactionTest do
 
       variables = %{"hash" => to_string(transaction.hash)}
 
-      conn = get(conn, "/graphql", query: query, variables: variables)
+      conn = get(conn, "/api/v1/graphql", query: query, variables: variables)
 
       assert %{"errors" => [error]} = json_response(conn, 200)
       assert error["message"] == "Transaction not found."
@@ -93,7 +93,7 @@ defmodule BlockScoutWeb.Schema.Query.TransactionTest do
       }
       """
 
-      conn = get(conn, "/graphql", query: query)
+      conn = get(conn, "/api/v1/graphql", query: query)
 
       assert %{"errors" => [error]} = json_response(conn, 200)
       assert error["message"] == ~s(In argument "hash": Expected type "FullHash!", found null.)
@@ -110,7 +110,7 @@ defmodule BlockScoutWeb.Schema.Query.TransactionTest do
 
       variables = %{"hash" => "0x000"}
 
-      conn = get(conn, "/graphql", query: query, variables: variables)
+      conn = get(conn, "/api/v1/graphql", query: query, variables: variables)
 
       assert %{"errors" => [error]} = json_response(conn, 200)
       assert error["message"] =~ ~s(Argument "hash" has invalid value)
@@ -180,7 +180,7 @@ defmodule BlockScoutWeb.Schema.Query.TransactionTest do
         "first" => 1
       }
 
-      conn = post(conn, "/graphql", query: query, variables: variables)
+      conn = post(conn, "/api/v1/graphql", query: query, variables: variables)
 
       assert json_response(conn, 200) == %{
                "data" => %{
@@ -247,7 +247,7 @@ defmodule BlockScoutWeb.Schema.Query.TransactionTest do
         "first" => 1
       }
 
-      conn = post(conn, "/graphql", query: query, variables: variables)
+      conn = post(conn, "/api/v1/graphql", query: query, variables: variables)
 
       assert json_response(conn, 200) == %{
                "data" => %{
@@ -306,7 +306,7 @@ defmodule BlockScoutWeb.Schema.Query.TransactionTest do
 
       response =
         conn
-        |> post("/graphql", query: query, variables: variables)
+        |> post("/api/v1/graphql", query: query, variables: variables)
         |> json_response(200)
 
       internal_transactions = get_in(response, ["data", "transaction", "internal_transactions", "edges"])
@@ -341,7 +341,7 @@ defmodule BlockScoutWeb.Schema.Query.TransactionTest do
 
       response1 =
         conn
-        |> post("/graphql", query: query1, variables: variables1)
+        |> post("/api/v1/graphql", query: query1, variables: variables1)
         |> json_response(200)
 
       assert %{"errors" => [error1, error2, error3]} = response1
@@ -372,7 +372,7 @@ defmodule BlockScoutWeb.Schema.Query.TransactionTest do
 
       response2 =
         conn
-        |> post("/graphql", query: query2, variables: variables2)
+        |> post("/api/v1/graphql", query: query2, variables: variables2)
         |> json_response(200)
 
       assert %{"errors" => [error1, error2, error3]} = response2
@@ -435,7 +435,7 @@ defmodule BlockScoutWeb.Schema.Query.TransactionTest do
 
       [internal_transaction] =
         conn
-        |> post("/graphql", query: query, variables: variables)
+        |> post("/api/v1/graphql", query: query, variables: variables)
         |> json_response(200)
         |> get_in(["data", "transaction", "internal_transactions", "edges"])
 
@@ -479,7 +479,7 @@ defmodule BlockScoutWeb.Schema.Query.TransactionTest do
         "first" => 2
       }
 
-      conn = post(conn, "/graphql", query: query1, variables: variables1)
+      conn = post(conn, "/api/v1/graphql", query: query1, variables: variables1)
 
       %{"data" => %{"transaction" => %{"internal_transactions" => page1}}} = json_response(conn, 200)
 
@@ -520,7 +520,7 @@ defmodule BlockScoutWeb.Schema.Query.TransactionTest do
 
       page2 =
         conn
-        |> post("/graphql", query: query2, variables: variables2)
+        |> post("/api/v1/graphql", query: query2, variables: variables2)
         |> json_response(200)
         |> get_in(["data", "transaction", "internal_transactions"])
 
@@ -541,7 +541,7 @@ defmodule BlockScoutWeb.Schema.Query.TransactionTest do
 
       page3 =
         conn
-        |> post("/graphql", query: query2, variables: variables3)
+        |> post("/api/v1/graphql", query: query2, variables: variables3)
         |> json_response(200)
         |> get_in(["data", "transaction", "internal_transactions"])
 
diff --git a/docker-compose/docker-compose-no-build-external-frontend.yml b/docker-compose/docker-compose-no-build-external-frontend.yml
index 35dbc93a81b0..660cbd41a7cd 100644
--- a/docker-compose/docker-compose-no-build-external-frontend.yml
+++ b/docker-compose/docker-compose-no-build-external-frontend.yml
@@ -40,6 +40,15 @@ services:
         CHAIN_ID: '1337'
         API_V2_ENABLED: 'true'
         MIX_ENV: 'prod'
+        ACCOUNT_ENABLED: 'true'
+        ACCOUNT_AUTH0_DOMAIN: 'dev-d1e3mu4f.us.auth0.com'
+        ACCOUNT_AUTH0_CLIENT_ID: '0Kz1eaBlFGEjtdtbRaEyUAjMxTGcWPbw'
+        ACCOUNT_AUTH0_CLIENT_SECRET: 'kkbPvKz79UG13HBavWlCUqDER8QkuMYvBLlh4xriiZNdlL9FPmyGjzfALn00hker'
+        ACCOUNT_SENDGRID_SENDER: 'noreply@blockscout.com'
+        ACCOUNT_SENDGRID_TEMPLATE: 'd-7ab86397e5bb4f0e94e285879a42be64'
+        ACCOUNT_PUBLIC_TAGS_AIRTABLE_URL: '"https://api.airtable.com/v0/appKlc01pN7paPrhk/Public%20Tags"'
+        ACCOUNT_PUBLIC_TAGS_AIRTABLE_API_KEY: 'keySVvWCUqSuQMfJB'
+        ACCOUNT_CLOAK_KEY: 'yb49fJfTh0lyifuXIWKxcf4rrK9elF5D45e4pgvmcn4='
     ports:
       - 4000:4000
     volumes:

From f7eef31a70a77c70e45320c4a881baf7845272e1 Mon Sep 17 00:00:00 2001
From: Viktor Baranov <baranov.viktor.27@gmail.com>
Date: Fri, 4 Aug 2023 18:00:35 +0300
Subject: [PATCH 265/909] docker-compose-nginx.yml add extra_hosts

---
 docker-compose/services/docker-compose-nginx.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/docker-compose/services/docker-compose-nginx.yml b/docker-compose/services/docker-compose-nginx.yml
index 295913b4607b..9ff76f5a173e 100644
--- a/docker-compose/services/docker-compose-nginx.yml
+++ b/docker-compose/services/docker-compose-nginx.yml
@@ -4,6 +4,8 @@ services:
   proxy:
     image: nginx
     container_name: proxy
+    extra_hosts:
+      - 'host.docker.internal:host-gateway'
     volumes:
       - "../proxy:/etc/nginx/templates"
     environment:

From 348a8acc1e5fd9359d7ee0d12937cc22c729e2c6 Mon Sep 17 00:00:00 2001
From: Nikita Pozdniakov <nikitosing4@mail.ru>
Date: Mon, 17 Jul 2023 22:31:37 +0700
Subject: [PATCH 266/909] Add parsing constructor arguments for sourcify
 contracts

---
 apps/explorer/lib/explorer/chain.ex           | 34 +++++++++++++++++--
 .../smart_contract/solidity/verifier.ex       | 34 +++++++++++++++++++
 2 files changed, 66 insertions(+), 2 deletions(-)

diff --git a/apps/explorer/lib/explorer/chain.ex b/apps/explorer/lib/explorer/chain.ex
index dd4200d0f0c0..e2ed9160291d 100644
--- a/apps/explorer/lib/explorer/chain.ex
+++ b/apps/explorer/lib/explorer/chain.ex
@@ -98,6 +98,7 @@ defmodule Explorer.Chain do
   alias Explorer.Market.MarketHistoryCache
   alias Explorer.{PagingOptions, Repo}
   alias Explorer.SmartContract.Helper
+  alias Explorer.SmartContract.Solidity.Verifier
   alias Explorer.Tags.{AddressTag, AddressToTag}
 
   alias Dataloader.Ecto, as: DataloaderEcto
@@ -1913,7 +1914,7 @@ defmodule Explorer.Chain do
           if smart_contract do
             CheckBytecodeMatchingOnDemand.trigger_check(address_result, smart_contract)
             LookUpSmartContractSourcesOnDemand.trigger_fetch(address_result, smart_contract)
-            address_result
+            check_and_update_constructor_args(address_result)
           else
             LookUpSmartContractSourcesOnDemand.trigger_fetch(address_result, nil)
 
@@ -1936,6 +1937,35 @@ defmodule Explorer.Chain do
     end
   end
 
+  defp check_and_update_constructor_args(
+         %SmartContract{address_hash: address_hash, constructor_arguments: nil} = smart_contract
+       ) do
+    if args = Verifier.parse_constructor_arguments_for_sourcify_contract(address_hash, smart_contract.abi) do
+      smart_contract |> SmartContract.changeset(%{constructor_arguments: args}) |> Repo.update()
+      %SmartContract{smart_contract | constructor_arguments: args}
+    else
+      smart_contract
+    end
+  end
+
+  defp check_and_update_constructor_args(
+         %Address{
+           hash: address_hash,
+           contract_code: deployed_bytecode,
+           smart_contract: %SmartContract{constructor_arguments: nil} = smart_contract
+         } = address
+       ) do
+    if args =
+         Verifier.parse_constructor_arguments_for_sourcify_contract(address_hash, smart_contract.abi, deployed_bytecode) do
+      smart_contract |> SmartContract.changeset(%{constructor_arguments: args}) |> Repo.update()
+      %Address{address | smart_contract: %SmartContract{smart_contract | constructor_arguments: args}}
+    else
+      address
+    end
+  end
+
+  defp check_and_update_constructor_args(other), do: other
+
   defp add_twin_info_to_contract(address_result, address_verified_twin_contract, _hash)
        when is_nil(address_verified_twin_contract),
        do: address_result
@@ -4310,7 +4340,7 @@ defmodule Explorer.Chain do
       verified_contract_twin_additional_sources = get_contract_additional_sources(verified_contract_twin, options)
 
       %{
-        :verified_contract => verified_contract_twin,
+        :verified_contract => check_and_update_constructor_args(verified_contract_twin),
         :additional_sources => verified_contract_twin_additional_sources
       }
     else
diff --git a/apps/explorer/lib/explorer/smart_contract/solidity/verifier.ex b/apps/explorer/lib/explorer/smart_contract/solidity/verifier.ex
index 57c11709abd5..50cd34a24d81 100644
--- a/apps/explorer/lib/explorer/smart_contract/solidity/verifier.ex
+++ b/apps/explorer/lib/explorer/smart_contract/solidity/verifier.ex
@@ -13,6 +13,7 @@ defmodule Explorer.SmartContract.Solidity.Verifier do
 
   alias ABI.{FunctionSelector, TypeDecoder}
   alias Explorer.Chain
+  alias Explorer.Chain.Data
   alias Explorer.SmartContract.RustVerifierInterface
   alias Explorer.SmartContract.Solidity.CodeCompiler
 
@@ -533,4 +534,37 @@ defmodule Explorer.SmartContract.Solidity.Verifier do
   def parse_boolean(false), do: false
 
   def parse_boolean(_), do: false
+
+  def parse_constructor_arguments_for_sourcify_contract(address_hash, abi) do
+    parse_constructor_arguments_for_sourcify_contract(address_hash, abi, Chain.smart_contract_bytecode(address_hash))
+  end
+
+  def parse_constructor_arguments_for_sourcify_contract(address_hash, abi, deployed_bytecode)
+      when is_binary(deployed_bytecode) do
+    creation_tx_input =
+      case Chain.smart_contract_creation_tx_bytecode(address_hash) do
+        %{init: init, created_contract_code: _created_contract_code} ->
+          "0x" <> init_without_0x = init
+          init_without_0x
+
+        _ ->
+          nil
+      end
+
+    with true <- has_constructor_with_params?(abi),
+         check_function <- parse_constructor_and_return_check_function(abi),
+         false <- is_nil(creation_tx_input) || deployed_bytecode == "0x",
+         {meta, meta_length} <- extract_meta_from_deployed_bytecode(deployed_bytecode),
+         [_bytecode, constructor_args] <- String.split(creation_tx_input, meta <> meta_length),
+         ^constructor_args <- check_function.(constructor_args) do
+      constructor_args
+    else
+      _ ->
+        nil
+    end
+  end
+
+  def parse_constructor_arguments_for_sourcify_contract(address_hash, abi, deployed_bytecode) do
+    parse_constructor_arguments_for_sourcify_contract(address_hash, abi, Data.to_string(deployed_bytecode))
+  end
 end

From fda97f53c28ec44d90ea030b000196cf3e632c50 Mon Sep 17 00:00:00 2001
From: Nikita Pozdniakov <nikitosing4@mail.ru>
Date: Mon, 17 Jul 2023 22:38:17 +0700
Subject: [PATCH 267/909] Changelog

---
 CHANGELOG.md                                                 | 1 +
 .../templates/address_contract/index.html.eex                | 2 +-
 apps/explorer/lib/explorer/chain.ex                          | 5 +++--
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index bfa5c3c7fdca..557055970d13 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,7 @@
 
 ### Features
 
+- [#7952](https://github.com/blockscout/blockscout/pull/7952) - Add parsing constructor arguments for sourcify contracts
 - [#6190](https://github.com/blockscout/blockscout/pull/6190) - Add EIP-1559 support to gas price oracle
 - [#7977](https://github.com/blockscout/blockscout/pull/7977) - GraphQL: extend schema with new field for existing objects
 
diff --git a/apps/block_scout_web/lib/block_scout_web/templates/address_contract/index.html.eex b/apps/block_scout_web/lib/block_scout_web/templates/address_contract/index.html.eex
index 658acfd417b4..77c96739cb5d 100644
--- a/apps/block_scout_web/lib/block_scout_web/templates/address_contract/index.html.eex
+++ b/apps/block_scout_web/lib/block_scout_web/templates/address_contract/index.html.eex
@@ -43,7 +43,7 @@
       <% end %>
       <%= if smart_contract_verified || (!smart_contract_verified && metadata_for_verification) do %>
         <% target_contract = if smart_contract_verified, do: @address.smart_contract, else: metadata_for_verification %>
-        <%= if @address.smart_contract.partially_verified && smart_contract_verified do %>
+        <%= if @address.smart_contract.verified_via_sourcify && @address.smart_contract.partially_verified && smart_contract_verified do %>
           <div class="mb-4">
             <i style="color: #f7b32b;" class="fa fa-info-circle"></i><span> <%= gettext("This contract has been partially verified via Sourcify.") %>
         <% else %>
diff --git a/apps/explorer/lib/explorer/chain.ex b/apps/explorer/lib/explorer/chain.ex
index e2ed9160291d..4861fe6103b7 100644
--- a/apps/explorer/lib/explorer/chain.ex
+++ b/apps/explorer/lib/explorer/chain.ex
@@ -1938,7 +1938,8 @@ defmodule Explorer.Chain do
   end
 
   defp check_and_update_constructor_args(
-         %SmartContract{address_hash: address_hash, constructor_arguments: nil} = smart_contract
+         %SmartContract{address_hash: address_hash, constructor_arguments: nil, verified_via_sourcify: true} =
+           smart_contract
        ) do
     if args = Verifier.parse_constructor_arguments_for_sourcify_contract(address_hash, smart_contract.abi) do
       smart_contract |> SmartContract.changeset(%{constructor_arguments: args}) |> Repo.update()
@@ -1952,7 +1953,7 @@ defmodule Explorer.Chain do
          %Address{
            hash: address_hash,
            contract_code: deployed_bytecode,
-           smart_contract: %SmartContract{constructor_arguments: nil} = smart_contract
+           smart_contract: %SmartContract{constructor_arguments: nil, verified_via_sourcify: true} = smart_contract
          } = address
        ) do
     if args =

From 1135e7b66b050ff4766aebeb1e9b6250b4f5f227 Mon Sep 17 00:00:00 2001
From: Nikita Pozdniakov <nikitosing4@mail.ru>
Date: Mon, 7 Aug 2023 09:54:14 +0300
Subject: [PATCH 268/909] Add @spec and @doc

---
 .../smart_contract/solidity/verifier.ex       | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/apps/explorer/lib/explorer/smart_contract/solidity/verifier.ex b/apps/explorer/lib/explorer/smart_contract/solidity/verifier.ex
index 50cd34a24d81..ee5554a0361d 100644
--- a/apps/explorer/lib/explorer/smart_contract/solidity/verifier.ex
+++ b/apps/explorer/lib/explorer/smart_contract/solidity/verifier.ex
@@ -11,9 +11,10 @@ defmodule Explorer.SmartContract.Solidity.Verifier do
   import Explorer.SmartContract.Helper,
     only: [cast_libraries: 1, prepare_bytecode_for_microservice: 3, contract_creation_input: 1]
 
+  # import  Explorer.Chain.SmartContract, only: [:function_description]
   alias ABI.{FunctionSelector, TypeDecoder}
   alias Explorer.Chain
-  alias Explorer.Chain.Data
+  alias Explorer.Chain.{Data, Hash, SmartContract}
   alias Explorer.SmartContract.RustVerifierInterface
   alias Explorer.SmartContract.Solidity.CodeCompiler
 
@@ -535,10 +536,26 @@ defmodule Explorer.SmartContract.Solidity.Verifier do
 
   def parse_boolean(_), do: false
 
+  @doc """
+    Function tries to parse constructor args from smart contract creation input.
+      1. using `extract_meta_from_deployed_bytecode/1` we derive CBOR metadata string
+      2. using metadata we split creation_tx_input and try to decode resulting constructor arguments
+       2.1. if we successfully decoded args using constructor's abi, then return constructor args
+       2.2 otherwise return nil
+  """
+  @spec parse_constructor_arguments_for_sourcify_contract(Hash.Address.t(), SmartContract.abi()) :: nil | binary
   def parse_constructor_arguments_for_sourcify_contract(address_hash, abi) do
     parse_constructor_arguments_for_sourcify_contract(address_hash, abi, Chain.smart_contract_bytecode(address_hash))
   end
 
+  @doc """
+    Clause for cases when we already can pass deployed bytecode to this function (in order to avoid excessive read DB accesses)
+  """
+  @spec parse_constructor_arguments_for_sourcify_contract(
+          Hash.Address.t(),
+          SmartContract.abi(),
+          binary | Explorer.Chain.Data.t()
+        ) :: nil | binary
   def parse_constructor_arguments_for_sourcify_contract(address_hash, abi, deployed_bytecode)
       when is_binary(deployed_bytecode) do
     creation_tx_input =

From 545d775bd7d3c81ac170dae7e2da7e75a4323b63 Mon Sep 17 00:00:00 2001
From: Nikita Pozdniakov <nikitosing4@mail.ru>
Date: Mon, 7 Aug 2023 11:49:50 +0300
Subject: [PATCH 269/909] Fix explorer tests

---
 .../chain/csv_export/address_log_csv_exporter_test.exs         | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/apps/explorer/test/explorer/chain/csv_export/address_log_csv_exporter_test.exs b/apps/explorer/test/explorer/chain/csv_export/address_log_csv_exporter_test.exs
index b863792f8165..bff1ca818d33 100644
--- a/apps/explorer/test/explorer/chain/csv_export/address_log_csv_exporter_test.exs
+++ b/apps/explorer/test/explorer/chain/csv_export/address_log_csv_exporter_test.exs
@@ -1,6 +1,7 @@
 defmodule Explorer.Chain.AddressLogCsvExporterTest do
   use Explorer.DataCase
 
+  alias Explorer.Chain.Address
   alias Explorer.Chain.CSVExport.AddressLogCsvExporter
 
   describe "export/3" do
@@ -74,7 +75,7 @@ defmodule Explorer.Chain.AddressLogCsvExporterTest do
       assert result.index == to_string(log.index)
       assert result.block_number == to_string(log.block_number)
       assert result.block_hash == to_string(log.block_hash)
-      assert result.address == String.downcase(to_string(log.address))
+      assert result.address == Address.checksum(log.address.hash)
       assert result.data == to_string(log.data)
       assert result.first_topic == to_string(log.first_topic)
       assert result.second_topic == to_string(log.second_topic)

From ab99741602ef19788e61958c5ec020743a6bfaed Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 7 Aug 2023 18:08:08 +0000
Subject: [PATCH 270/909] Bump @babel/core from 7.22.9 to 7.22.10 in
 /apps/block_scout_web/assets

Bumps [@babel/core](https://github.com/babel/babel/tree/HEAD/packages/babel-core) from 7.22.9 to 7.22.10.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/commits/v7.22.10/packages/babel-core)

---
updated-dependencies:
- dependency-name: "@babel/core"
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 apps/block_scout_web/assets/package-lock.json | 179 +++++++++---------
 apps/block_scout_web/assets/package.json      |   2 +-
 2 files changed, 90 insertions(+), 91 deletions(-)

diff --git a/apps/block_scout_web/assets/package-lock.json b/apps/block_scout_web/assets/package-lock.json
index 488bce5694e5..b68813ff5800 100644
--- a/apps/block_scout_web/assets/package-lock.json
+++ b/apps/block_scout_web/assets/package-lock.json
@@ -71,7 +71,7 @@
         "xss": "^1.0.14"
       },
       "devDependencies": {
-        "@babel/core": "^7.22.9",
+        "@babel/core": "^7.22.10",
         "@babel/preset-env": "^7.22.9",
         "autoprefixer": "^10.4.14",
         "babel-loader": "^9.1.3",
@@ -229,11 +229,12 @@
       }
     },
     "node_modules/@babel/code-frame": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.22.5.tgz",
-      "integrity": "sha512-Xmwn266vad+6DAqEB2A6V/CcZVp62BbwVmcOJc2RPuwih1kw02TjQvWVWlcKGbBPd+8/0V5DEkOcizRGYsspYQ==",
+      "version": "7.22.10",
+      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.22.10.tgz",
+      "integrity": "sha512-/KKIMG4UEL35WmI9OlvMhurwtytjvXoFcGNrOvyG9zIzA8YmPjVtIZUf7b05+TPO7G7/GEmLHDaoCgACHl9hhA==",
       "dependencies": {
-        "@babel/highlight": "^7.22.5"
+        "@babel/highlight": "^7.22.10",
+        "chalk": "^2.4.2"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -248,20 +249,20 @@
       }
     },
     "node_modules/@babel/core": {
-      "version": "7.22.9",
-      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.22.9.tgz",
-      "integrity": "sha512-G2EgeufBcYw27U4hhoIwFcgc1XU7TlXJ3mv04oOv1WCuo900U/anZSPzEqNjwdjgffkk2Gs0AN0dW1CKVLcG7w==",
+      "version": "7.22.10",
+      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.22.10.tgz",
+      "integrity": "sha512-fTmqbbUBAwCcre6zPzNngvsI0aNrPZe77AeqvDxWM9Nm+04RrJ3CAmGHA9f7lJQY6ZMhRztNemy4uslDxTX4Qw==",
       "dependencies": {
         "@ampproject/remapping": "^2.2.0",
-        "@babel/code-frame": "^7.22.5",
-        "@babel/generator": "^7.22.9",
-        "@babel/helper-compilation-targets": "^7.22.9",
+        "@babel/code-frame": "^7.22.10",
+        "@babel/generator": "^7.22.10",
+        "@babel/helper-compilation-targets": "^7.22.10",
         "@babel/helper-module-transforms": "^7.22.9",
-        "@babel/helpers": "^7.22.6",
-        "@babel/parser": "^7.22.7",
+        "@babel/helpers": "^7.22.10",
+        "@babel/parser": "^7.22.10",
         "@babel/template": "^7.22.5",
-        "@babel/traverse": "^7.22.8",
-        "@babel/types": "^7.22.5",
+        "@babel/traverse": "^7.22.10",
+        "@babel/types": "^7.22.10",
         "convert-source-map": "^1.7.0",
         "debug": "^4.1.0",
         "gensync": "^1.0.0-beta.2",
@@ -277,11 +278,11 @@
       }
     },
     "node_modules/@babel/generator": {
-      "version": "7.22.9",
-      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.22.9.tgz",
-      "integrity": "sha512-KtLMbmicyuK2Ak/FTCJVbDnkN1SlT8/kceFTiuDiiRUUSMnHMidxSCdG4ndkTOHHpoomWe/4xkvHkEOncwjYIw==",
+      "version": "7.22.10",
+      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.22.10.tgz",
+      "integrity": "sha512-79KIf7YiWjjdZ81JnLujDRApWtl7BxTqWD88+FFdQEIOG8LJ0etDOM7CXuIgGJa55sGOwZVwuEsaLEm0PJ5/+A==",
       "dependencies": {
-        "@babel/types": "^7.22.5",
+        "@babel/types": "^7.22.10",
         "@jridgewell/gen-mapping": "^0.3.2",
         "@jridgewell/trace-mapping": "^0.3.17",
         "jsesc": "^2.5.1"
@@ -314,9 +315,9 @@
       }
     },
     "node_modules/@babel/helper-compilation-targets": {
-      "version": "7.22.9",
-      "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.22.9.tgz",
-      "integrity": "sha512-7qYrNM6HjpnPHJbopxmb8hSPoZ0gsX8IvUS32JGVoy+pU9e5N0nLr1VjJoR6kA4d9dmGLxNYOjeB8sUDal2WMw==",
+      "version": "7.22.10",
+      "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.22.10.tgz",
+      "integrity": "sha512-JMSwHD4J7SLod0idLq5PKgI+6g/hLD/iuWBq08ZX49xE14VpVEojJ5rHWptpirV2j020MvypRLAXAO50igCJ5Q==",
       "dependencies": {
         "@babel/compat-data": "^7.22.9",
         "@babel/helper-validator-option": "^7.22.5",
@@ -326,9 +327,6 @@
       },
       "engines": {
         "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0"
       }
     },
     "node_modules/@babel/helper-compilation-targets/node_modules/lru-cache": {
@@ -601,25 +599,25 @@
       }
     },
     "node_modules/@babel/helpers": {
-      "version": "7.22.6",
-      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.22.6.tgz",
-      "integrity": "sha512-YjDs6y/fVOYFV8hAf1rxd1QvR9wJe1pDBZ2AREKq/SDayfPzgk0PBnVuTCE5X1acEpMMNOVUqoe+OwiZGJ+OaA==",
+      "version": "7.22.10",
+      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.22.10.tgz",
+      "integrity": "sha512-a41J4NW8HyZa1I1vAndrraTlPZ/eZoga2ZgS7fEr0tZJGVU4xqdE80CEm0CcNjha5EZ8fTBYLKHF0kqDUuAwQw==",
       "dependencies": {
         "@babel/template": "^7.22.5",
-        "@babel/traverse": "^7.22.6",
-        "@babel/types": "^7.22.5"
+        "@babel/traverse": "^7.22.10",
+        "@babel/types": "^7.22.10"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/highlight": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.22.5.tgz",
-      "integrity": "sha512-BSKlD1hgnedS5XRnGOljZawtag7H1yPfQp0tdNJCHoH6AZ+Pcm9VvkrK59/Yy593Ypg0zMxH2BxD1VPYUQ7UIw==",
+      "version": "7.22.10",
+      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.22.10.tgz",
+      "integrity": "sha512-78aUtVcT7MUscr0K5mIEnkwxPE0MaxkR5RxRwuHaQ+JuU5AmTPhY+do2mdzVTnIJJpyBglql2pehuBIWHug+WQ==",
       "dependencies": {
         "@babel/helper-validator-identifier": "^7.22.5",
-        "chalk": "^2.0.0",
+        "chalk": "^2.4.2",
         "js-tokens": "^4.0.0"
       },
       "engines": {
@@ -627,9 +625,9 @@
       }
     },
     "node_modules/@babel/parser": {
-      "version": "7.22.7",
-      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.22.7.tgz",
-      "integrity": "sha512-7NF8pOkHP5o2vpmGgNGcfAeCvOYhGLyA3Z4eBQkT1RJlWu47n63bCs93QfJ2hIAFCil7L5P2IWhs1oToVgrL0Q==",
+      "version": "7.22.10",
+      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.22.10.tgz",
+      "integrity": "sha512-lNbdGsQb9ekfsnjFGhEiF4hfFqGgfOP3H3d27re3n+CGhNuTSUEQdfWk556sTLNTloczcdM5TYF2LhzmDQKyvQ==",
       "bin": {
         "parser": "bin/babel-parser.js"
       },
@@ -1960,18 +1958,18 @@
       }
     },
     "node_modules/@babel/traverse": {
-      "version": "7.22.8",
-      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.22.8.tgz",
-      "integrity": "sha512-y6LPR+wpM2I3qJrsheCTwhIinzkETbplIgPBbwvqPKc+uljeA5gP+3nP8irdYt1mjQaDnlIcG+dw8OjAco4GXw==",
+      "version": "7.22.10",
+      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.22.10.tgz",
+      "integrity": "sha512-Q/urqV4pRByiNNpb/f5OSv28ZlGJiFiiTh+GAHktbIrkPhPbl90+uW6SmpoLyZqutrg9AEaEf3Q/ZBRHBXgxig==",
       "dependencies": {
-        "@babel/code-frame": "^7.22.5",
-        "@babel/generator": "^7.22.7",
+        "@babel/code-frame": "^7.22.10",
+        "@babel/generator": "^7.22.10",
         "@babel/helper-environment-visitor": "^7.22.5",
         "@babel/helper-function-name": "^7.22.5",
         "@babel/helper-hoist-variables": "^7.22.5",
         "@babel/helper-split-export-declaration": "^7.22.6",
-        "@babel/parser": "^7.22.7",
-        "@babel/types": "^7.22.5",
+        "@babel/parser": "^7.22.10",
+        "@babel/types": "^7.22.10",
         "debug": "^4.1.0",
         "globals": "^11.1.0"
       },
@@ -1980,9 +1978,9 @@
       }
     },
     "node_modules/@babel/types": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.22.5.tgz",
-      "integrity": "sha512-zo3MIHGOkPOfoRXitsgHLjEXmlDaD/5KU1Uzuc9GNiZPhSqVxVRtxuPaSBZDsYZ9qV88AjtMtWW7ww98loJ9KA==",
+      "version": "7.22.10",
+      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.22.10.tgz",
+      "integrity": "sha512-obaoigiLrlDZ7TUQln/8m4mSqIW2QFeOrCQc9r+xsaHGNoplVNYlRVpsfE8Vj35GEm2ZH4ZhrNYogs/3fj85kg==",
       "dependencies": {
         "@babel/helper-string-parser": "^7.22.5",
         "@babel/helper-validator-identifier": "^7.22.5",
@@ -17720,11 +17718,12 @@
       }
     },
     "@babel/code-frame": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.22.5.tgz",
-      "integrity": "sha512-Xmwn266vad+6DAqEB2A6V/CcZVp62BbwVmcOJc2RPuwih1kw02TjQvWVWlcKGbBPd+8/0V5DEkOcizRGYsspYQ==",
+      "version": "7.22.10",
+      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.22.10.tgz",
+      "integrity": "sha512-/KKIMG4UEL35WmI9OlvMhurwtytjvXoFcGNrOvyG9zIzA8YmPjVtIZUf7b05+TPO7G7/GEmLHDaoCgACHl9hhA==",
       "requires": {
-        "@babel/highlight": "^7.22.5"
+        "@babel/highlight": "^7.22.10",
+        "chalk": "^2.4.2"
       }
     },
     "@babel/compat-data": {
@@ -17733,20 +17732,20 @@
       "integrity": "sha512-5UamI7xkUcJ3i9qVDS+KFDEK8/7oJ55/sJMB1Ge7IEapr7KfdfV/HErR+koZwOfd+SgtFKOKRhRakdg++DcJpQ=="
     },
     "@babel/core": {
-      "version": "7.22.9",
-      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.22.9.tgz",
-      "integrity": "sha512-G2EgeufBcYw27U4hhoIwFcgc1XU7TlXJ3mv04oOv1WCuo900U/anZSPzEqNjwdjgffkk2Gs0AN0dW1CKVLcG7w==",
+      "version": "7.22.10",
+      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.22.10.tgz",
+      "integrity": "sha512-fTmqbbUBAwCcre6zPzNngvsI0aNrPZe77AeqvDxWM9Nm+04RrJ3CAmGHA9f7lJQY6ZMhRztNemy4uslDxTX4Qw==",
       "requires": {
         "@ampproject/remapping": "^2.2.0",
-        "@babel/code-frame": "^7.22.5",
-        "@babel/generator": "^7.22.9",
-        "@babel/helper-compilation-targets": "^7.22.9",
+        "@babel/code-frame": "^7.22.10",
+        "@babel/generator": "^7.22.10",
+        "@babel/helper-compilation-targets": "^7.22.10",
         "@babel/helper-module-transforms": "^7.22.9",
-        "@babel/helpers": "^7.22.6",
-        "@babel/parser": "^7.22.7",
+        "@babel/helpers": "^7.22.10",
+        "@babel/parser": "^7.22.10",
         "@babel/template": "^7.22.5",
-        "@babel/traverse": "^7.22.8",
-        "@babel/types": "^7.22.5",
+        "@babel/traverse": "^7.22.10",
+        "@babel/types": "^7.22.10",
         "convert-source-map": "^1.7.0",
         "debug": "^4.1.0",
         "gensync": "^1.0.0-beta.2",
@@ -17755,11 +17754,11 @@
       }
     },
     "@babel/generator": {
-      "version": "7.22.9",
-      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.22.9.tgz",
-      "integrity": "sha512-KtLMbmicyuK2Ak/FTCJVbDnkN1SlT8/kceFTiuDiiRUUSMnHMidxSCdG4ndkTOHHpoomWe/4xkvHkEOncwjYIw==",
+      "version": "7.22.10",
+      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.22.10.tgz",
+      "integrity": "sha512-79KIf7YiWjjdZ81JnLujDRApWtl7BxTqWD88+FFdQEIOG8LJ0etDOM7CXuIgGJa55sGOwZVwuEsaLEm0PJ5/+A==",
       "requires": {
-        "@babel/types": "^7.22.5",
+        "@babel/types": "^7.22.10",
         "@jridgewell/gen-mapping": "^0.3.2",
         "@jridgewell/trace-mapping": "^0.3.17",
         "jsesc": "^2.5.1"
@@ -17783,9 +17782,9 @@
       }
     },
     "@babel/helper-compilation-targets": {
-      "version": "7.22.9",
-      "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.22.9.tgz",
-      "integrity": "sha512-7qYrNM6HjpnPHJbopxmb8hSPoZ0gsX8IvUS32JGVoy+pU9e5N0nLr1VjJoR6kA4d9dmGLxNYOjeB8sUDal2WMw==",
+      "version": "7.22.10",
+      "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.22.10.tgz",
+      "integrity": "sha512-JMSwHD4J7SLod0idLq5PKgI+6g/hLD/iuWBq08ZX49xE14VpVEojJ5rHWptpirV2j020MvypRLAXAO50igCJ5Q==",
       "requires": {
         "@babel/compat-data": "^7.22.9",
         "@babel/helper-validator-option": "^7.22.5",
@@ -17994,29 +17993,29 @@
       }
     },
     "@babel/helpers": {
-      "version": "7.22.6",
-      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.22.6.tgz",
-      "integrity": "sha512-YjDs6y/fVOYFV8hAf1rxd1QvR9wJe1pDBZ2AREKq/SDayfPzgk0PBnVuTCE5X1acEpMMNOVUqoe+OwiZGJ+OaA==",
+      "version": "7.22.10",
+      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.22.10.tgz",
+      "integrity": "sha512-a41J4NW8HyZa1I1vAndrraTlPZ/eZoga2ZgS7fEr0tZJGVU4xqdE80CEm0CcNjha5EZ8fTBYLKHF0kqDUuAwQw==",
       "requires": {
         "@babel/template": "^7.22.5",
-        "@babel/traverse": "^7.22.6",
-        "@babel/types": "^7.22.5"
+        "@babel/traverse": "^7.22.10",
+        "@babel/types": "^7.22.10"
       }
     },
     "@babel/highlight": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.22.5.tgz",
-      "integrity": "sha512-BSKlD1hgnedS5XRnGOljZawtag7H1yPfQp0tdNJCHoH6AZ+Pcm9VvkrK59/Yy593Ypg0zMxH2BxD1VPYUQ7UIw==",
+      "version": "7.22.10",
+      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.22.10.tgz",
+      "integrity": "sha512-78aUtVcT7MUscr0K5mIEnkwxPE0MaxkR5RxRwuHaQ+JuU5AmTPhY+do2mdzVTnIJJpyBglql2pehuBIWHug+WQ==",
       "requires": {
         "@babel/helper-validator-identifier": "^7.22.5",
-        "chalk": "^2.0.0",
+        "chalk": "^2.4.2",
         "js-tokens": "^4.0.0"
       }
     },
     "@babel/parser": {
-      "version": "7.22.7",
-      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.22.7.tgz",
-      "integrity": "sha512-7NF8pOkHP5o2vpmGgNGcfAeCvOYhGLyA3Z4eBQkT1RJlWu47n63bCs93QfJ2hIAFCil7L5P2IWhs1oToVgrL0Q=="
+      "version": "7.22.10",
+      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.22.10.tgz",
+      "integrity": "sha512-lNbdGsQb9ekfsnjFGhEiF4hfFqGgfOP3H3d27re3n+CGhNuTSUEQdfWk556sTLNTloczcdM5TYF2LhzmDQKyvQ=="
     },
     "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": {
       "version": "7.22.5",
@@ -18914,26 +18913,26 @@
       }
     },
     "@babel/traverse": {
-      "version": "7.22.8",
-      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.22.8.tgz",
-      "integrity": "sha512-y6LPR+wpM2I3qJrsheCTwhIinzkETbplIgPBbwvqPKc+uljeA5gP+3nP8irdYt1mjQaDnlIcG+dw8OjAco4GXw==",
+      "version": "7.22.10",
+      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.22.10.tgz",
+      "integrity": "sha512-Q/urqV4pRByiNNpb/f5OSv28ZlGJiFiiTh+GAHktbIrkPhPbl90+uW6SmpoLyZqutrg9AEaEf3Q/ZBRHBXgxig==",
       "requires": {
-        "@babel/code-frame": "^7.22.5",
-        "@babel/generator": "^7.22.7",
+        "@babel/code-frame": "^7.22.10",
+        "@babel/generator": "^7.22.10",
         "@babel/helper-environment-visitor": "^7.22.5",
         "@babel/helper-function-name": "^7.22.5",
         "@babel/helper-hoist-variables": "^7.22.5",
         "@babel/helper-split-export-declaration": "^7.22.6",
-        "@babel/parser": "^7.22.7",
-        "@babel/types": "^7.22.5",
+        "@babel/parser": "^7.22.10",
+        "@babel/types": "^7.22.10",
         "debug": "^4.1.0",
         "globals": "^11.1.0"
       }
     },
     "@babel/types": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.22.5.tgz",
-      "integrity": "sha512-zo3MIHGOkPOfoRXitsgHLjEXmlDaD/5KU1Uzuc9GNiZPhSqVxVRtxuPaSBZDsYZ9qV88AjtMtWW7ww98loJ9KA==",
+      "version": "7.22.10",
+      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.22.10.tgz",
+      "integrity": "sha512-obaoigiLrlDZ7TUQln/8m4mSqIW2QFeOrCQc9r+xsaHGNoplVNYlRVpsfE8Vj35GEm2ZH4ZhrNYogs/3fj85kg==",
       "requires": {
         "@babel/helper-string-parser": "^7.22.5",
         "@babel/helper-validator-identifier": "^7.22.5",
diff --git a/apps/block_scout_web/assets/package.json b/apps/block_scout_web/assets/package.json
index a775ec23fdcc..7fd96189bef6 100644
--- a/apps/block_scout_web/assets/package.json
+++ b/apps/block_scout_web/assets/package.json
@@ -83,7 +83,7 @@
     "xss": "^1.0.14"
   },
   "devDependencies": {
-    "@babel/core": "^7.22.9",
+    "@babel/core": "^7.22.10",
     "@babel/preset-env": "^7.22.9",
     "autoprefixer": "^10.4.14",
     "babel-loader": "^9.1.3",

From 33b1cc2de42ebda407206e63a34817c8a351521b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 7 Aug 2023 18:43:29 +0000
Subject: [PATCH 271/909] Bump sobelow from 0.12.2 to 0.13.0

Bumps [sobelow](https://github.com/nccgroup/sobelow) from 0.12.2 to 0.13.0.
- [Release notes](https://github.com/nccgroup/sobelow/releases)
- [Changelog](https://github.com/nccgroup/sobelow/blob/master/CHANGELOG.md)
- [Commits](https://github.com/nccgroup/sobelow/compare/v0.12.2...v0.13.0)

---
updated-dependencies:
- dependency-name: sobelow
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 mix.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mix.lock b/mix.lock
index f4f8239d78ce..4663c6cad8ed 100644
--- a/mix.lock
+++ b/mix.lock
@@ -123,7 +123,7 @@
   "redix": {:hex, :redix, "1.2.3", "3036e7c6080c42e1bbaa9168d1e28e367b01e8960a640a899b8ef8067273cb5e", [:mix], [{:castore, "~> 0.1.0 or ~> 1.0", [hex: :castore, repo: "hexpm", optional: true]}, {:nimble_options, "~> 0.5.0 or ~> 1.0", [hex: :nimble_options, repo: "hexpm", optional: false]}, {:telemetry, "~> 0.4.0 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "14e2bca8a03fad297a78a3d201032df260ee5f0e0ef9c173c0f9ca5b3e0331b7"},
   "remote_ip": {:hex, :remote_ip, "1.1.0", "cb308841595d15df3f9073b7c39243a1dd6ca56e5020295cb012c76fbec50f2d", [:mix], [{:combine, "~> 0.10", [hex: :combine, repo: "hexpm", optional: false]}, {:plug, "~> 1.14", [hex: :plug, repo: "hexpm", optional: false]}], "hexpm", "616ffdf66aaad6a72fc546dabf42eed87e2a99e97b09cbd92b10cc180d02ed74"},
   "rustler_precompiled": {:hex, :rustler_precompiled, "0.6.1", "160b545bce8bf9a3f1b436b2c10f53574036a0db628e40f393328cbbe593602f", [:mix], [{:castore, "~> 0.1 or ~> 1.0", [hex: :castore, repo: "hexpm", optional: false]}, {:rustler, "~> 0.23", [hex: :rustler, repo: "hexpm", optional: true]}], "hexpm", "0dd269fa261c4e3df290b12031c575fff07a542749f7b0e8b744d72d66c43600"},
-  "sobelow": {:hex, :sobelow, "0.12.2", "45f4d500e09f95fdb5a7b94c2838d6b26625828751d9f1127174055a78542cf5", [:mix], [{:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: false]}], "hexpm", "2f0b617dce551db651145662b84c8da4f158e7abe049a76daaaae2282df01c5d"},
+  "sobelow": {:hex, :sobelow, "0.13.0", "218afe9075904793f5c64b8837cc356e493d88fddde126a463839351870b8d1e", [:mix], [{:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: false]}], "hexpm", "cd6e9026b85fc35d7529da14f95e85a078d9dd1907a9097b3ba6ac7ebbe34a0d"},
   "spandex": {:hex, :spandex, "3.2.0", "f8cd40146ea988c87f3c14054150c9a47ba17e53cd4515c00e1f93c29c45404d", [:mix], [{:decorator, "~> 1.2", [hex: :decorator, repo: "hexpm", optional: true]}, {:optimal, "~> 0.3.3", [hex: :optimal, repo: "hexpm", optional: false]}, {:plug, "~> 1.0", [hex: :plug, repo: "hexpm", optional: false]}], "hexpm", "d0a7d5aef4c5af9cf5467f2003e8a5d8d2bdae3823a6cc95d776b9a2251d4d03"},
   "spandex_datadog": {:hex, :spandex_datadog, "1.3.0", "cabe82980f55612a8befa6c12904b1a429bf17faf7271a94b9aae278af6362cf", [:mix], [{:msgpax, "~> 2.2.1 or ~> 2.3", [hex: :msgpax, repo: "hexpm", optional: false]}, {:spandex, "~> 3.0", [hex: :spandex, repo: "hexpm", optional: false]}, {:telemetry, "~> 0.4.2 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "c826e4e29d1612e866b2c7bae2df3beeee84fc57351968c2772672afe59b789c"},
   "spandex_ecto": {:hex, :spandex_ecto, "0.7.0", "259ad2feb7c834e774ec623f99c0fbacca8d60a73be212f92b75e37f853c81be", [:mix], [{:spandex, "~> 2.2 or ~> 3.0", [hex: :spandex, repo: "hexpm", optional: false]}], "hexpm", "c64784be79d95538013b7c60828830411c5c7aff1f4e8d66dfe564b3c83b500e"},

From 06d41d00eb78fb26fc8e5d0b0d20ded9b1da24e3 Mon Sep 17 00:00:00 2001
From: Nikita Pozdniakov <nikitosing4@mail.ru>
Date: Tue, 8 Aug 2023 08:52:08 +0300
Subject: [PATCH 272/909] Handle negative holders count

---
 .../lib/block_scout_web/views/api/v2/token_view.ex          | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/apps/block_scout_web/lib/block_scout_web/views/api/v2/token_view.ex b/apps/block_scout_web/lib/block_scout_web/views/api/v2/token_view.ex
index fe60782eb14b..7f983ed84b56 100644
--- a/apps/block_scout_web/lib/block_scout_web/views/api/v2/token_view.ex
+++ b/apps/block_scout_web/lib/block_scout_web/views/api/v2/token_view.ex
@@ -13,7 +13,7 @@ defmodule BlockScoutWeb.API.V2.TokenView do
       "name" => token.name,
       "decimals" => token.decimals,
       "type" => token.type,
-      "holders" => token.holder_count && to_string(token.holder_count),
+      "holders" => prepare_holders_count(token.holder_count),
       "exchange_rate" => exchange_rate(token),
       "total_supply" => token.total_supply,
       "icon_url" => token.icon_url,
@@ -80,4 +80,8 @@ defmodule BlockScoutWeb.API.V2.TokenView do
       "is_unique" => is_unique
     }
   end
+
+  defp prepare_holders_count(nil), do: nil
+  defp prepare_holders_count(count) when count < 0, do: prepare_holders_count(0)
+  defp prepare_holders_count(count), do: to_string(count)
 end

From 8675fef1bd3372734e96dbba15ead45f1b3475d5 Mon Sep 17 00:00:00 2001
From: Nikita Pozdniakov <nikitosing4@mail.ru>
Date: Tue, 8 Aug 2023 08:54:37 +0300
Subject: [PATCH 273/909] Changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index bfa5c3c7fdca..ebb5e8825f78 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,7 @@
 
 ### Fixes
 
+- [#8145](https://github.com/blockscout/blockscout/pull/8145) - Handle negative holders count in API v2
 - [#8040](https://github.com/blockscout/blockscout/pull/8040) - Resolve issue with Docker image for Mac M1/M2
 - [#8060](https://github.com/blockscout/blockscout/pull/8060) - Fix eth_getLogs API endpoint
 - [#8082](https://github.com/blockscout/blockscout/pull/8082), [#8088](https://github.com/blockscout/blockscout/pull/8088) - Fix Rootstock charts API

From 3b2d7570b3bad5749bde4334fec14a6ad9789612 Mon Sep 17 00:00:00 2001
From: Nikita Pozdniakov <nikitosing4@mail.ru>
Date: Tue, 8 Aug 2023 10:31:27 +0300
Subject: [PATCH 274/909] Add method_id to write methods in API v2 response

---
 .../controllers/api/v2/smart_contract_controller.ex    | 10 +++++++---
 .../api/v2/smart_contract_controller_test.exs          |  7 +++++--
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/smart_contract_controller.ex b/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/smart_contract_controller.ex
index 8d016c404714..b991044be9a0 100644
--- a/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/smart_contract_controller.ex
+++ b/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/smart_contract_controller.ex
@@ -82,7 +82,7 @@ defmodule BlockScoutWeb.API.V2.SmartContractController do
          {:not_found, true} <- {:not_found, AddressView.check_custom_abi_for_having_write_functions(custom_abi)} do
       conn
       |> put_status(200)
-      |> json(Writer.filter_write_functions(custom_abi.abi))
+      |> json(custom_abi.abi |> Writer.filter_write_functions() |> Reader.get_abi_with_method_id())
     end
   end
 
@@ -95,7 +95,7 @@ defmodule BlockScoutWeb.API.V2.SmartContractController do
          {:not_found, false} <- {:not_found, is_nil(smart_contract)} do
       conn
       |> put_status(200)
-      |> json(Writer.write_functions(smart_contract))
+      |> json(smart_contract |> Writer.write_functions() |> Reader.get_abi_with_method_id())
     end
   end
 
@@ -135,7 +135,11 @@ defmodule BlockScoutWeb.API.V2.SmartContractController do
 
       conn
       |> put_status(200)
-      |> json(Writer.write_functions_proxy(implementation_address_hash_string, @api_true))
+      |> json(
+        implementation_address_hash_string
+        |> Writer.write_functions_proxy(@api_true)
+        |> Reader.get_abi_with_method_id()
+      )
     end
   end
 
diff --git a/apps/block_scout_web/test/block_scout_web/controllers/api/v2/smart_contract_controller_test.exs b/apps/block_scout_web/test/block_scout_web/controllers/api/v2/smart_contract_controller_test.exs
index 12dd8c8c5f4b..863345a9038a 100644
--- a/apps/block_scout_web/test/block_scout_web/controllers/api/v2/smart_contract_controller_test.exs
+++ b/apps/block_scout_web/test/block_scout_web/controllers/api/v2/smart_contract_controller_test.exs
@@ -1205,6 +1205,7 @@ defmodule BlockScoutWeb.API.V2.SmartContractControllerTest do
 
       assert [
                %{
+                 "method_id" => "49ba1b49",
                  "type" => "function",
                  "stateMutability" => "nonpayable",
                  "outputs" => [],
@@ -1271,7 +1272,8 @@ defmodule BlockScoutWeb.API.V2.SmartContractControllerTest do
                  "stateMutability" => "nonpayable",
                  "outputs" => [],
                  "name" => "disableWhitelist",
-                 "inputs" => [%{"type" => "bool", "name" => "disable", "internalType" => "bool"}]
+                 "inputs" => [%{"type" => "bool", "name" => "disable", "internalType" => "bool"}],
+                 "method_id" => "49ba1b49"
                }
              ] == response
     end
@@ -1912,7 +1914,8 @@ defmodule BlockScoutWeb.API.V2.SmartContractControllerTest do
                  "stateMutability" => "nonpayable",
                  "outputs" => [],
                  "name" => "disableWhitelist",
-                 "inputs" => [%{"type" => "bool", "name" => "disable", "internalType" => "bool"}]
+                 "inputs" => [%{"type" => "bool", "name" => "disable", "internalType" => "bool"}],
+                 "method_id" => "49ba1b49"
                }
              ] == response
     end

From 8dfde6ad33ed0a58d5ebefa22cfebc240afbb827 Mon Sep 17 00:00:00 2001
From: Nikita Pozdniakov <nikitosing4@mail.ru>
Date: Tue, 8 Aug 2023 10:35:22 +0300
Subject: [PATCH 275/909] Changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index bfa5c3c7fdca..472cc997d892 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -15,6 +15,7 @@
 
 ### Chore
 
+- [#8146](https://github.com/blockscout/blockscout/pull/8146) - Add method_id to write methods in API v2 response
 - [#8105](https://github.com/blockscout/blockscout/pull/8105) - Extend API v1 with endpoints used by new UI
 - [#8104](https://github.com/blockscout/blockscout/pull/8104) - remove "TODO" from API v2 response
 - [#8100](https://github.com/blockscout/blockscout/pull/8100), [#8103](https://github.com/blockscout/blockscout/pull/8103) - Extend docker-compose configs with new config when front is running externally

From 457f105d229022f850c33c99776cf080b53ea420 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 8 Aug 2023 09:30:13 +0000
Subject: [PATCH 276/909] Bump @babel/preset-env in
 /apps/block_scout_web/assets

Bumps [@babel/preset-env](https://github.com/babel/babel/tree/HEAD/packages/babel-preset-env) from 7.22.9 to 7.22.10.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/commits/v7.22.10/packages/babel-preset-env)

---
updated-dependencies:
- dependency-name: "@babel/preset-env"
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 apps/block_scout_web/assets/package-lock.json | 335 ++++++++----------
 apps/block_scout_web/assets/package.json      |   2 +-
 2 files changed, 144 insertions(+), 193 deletions(-)

diff --git a/apps/block_scout_web/assets/package-lock.json b/apps/block_scout_web/assets/package-lock.json
index b68813ff5800..b6a915f0fbaf 100644
--- a/apps/block_scout_web/assets/package-lock.json
+++ b/apps/block_scout_web/assets/package-lock.json
@@ -72,7 +72,7 @@
       },
       "devDependencies": {
         "@babel/core": "^7.22.10",
-        "@babel/preset-env": "^7.22.9",
+        "@babel/preset-env": "^7.22.10",
         "autoprefixer": "^10.4.14",
         "babel-loader": "^9.1.3",
         "copy-webpack-plugin": "^11.0.0",
@@ -491,15 +491,14 @@
       }
     },
     "node_modules/@babel/helper-remap-async-to-generator": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.22.5.tgz",
-      "integrity": "sha512-cU0Sq1Rf4Z55fgz7haOakIyM7+x/uCFwXpLPaeRzfoUtAEAuUZjZvFPjL/rk5rW693dIgn2hng1W7xbT7lWT4g==",
+      "version": "7.22.9",
+      "resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.22.9.tgz",
+      "integrity": "sha512-8WWC4oR4Px+tr+Fp0X3RHDVfINGpF3ad1HIbrc8A77epiR6eMMc6jsgozkzT2uDiOOdoS9cLIQ+XD2XvI2WSmQ==",
       "dev": true,
       "dependencies": {
         "@babel/helper-annotate-as-pure": "^7.22.5",
         "@babel/helper-environment-visitor": "^7.22.5",
-        "@babel/helper-wrap-function": "^7.22.5",
-        "@babel/types": "^7.22.5"
+        "@babel/helper-wrap-function": "^7.22.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -584,15 +583,14 @@
       }
     },
     "node_modules/@babel/helper-wrap-function": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.22.5.tgz",
-      "integrity": "sha512-bYqLIBSEshYcYQyfks8ewYA8S30yaGSeRslcvKMvoUk6HHPySbxHq9YRi6ghhzEU+yhQv9bP/jXnygkStOcqZw==",
+      "version": "7.22.10",
+      "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.22.10.tgz",
+      "integrity": "sha512-OnMhjWjuGYtdoO3FmsEFWvBStBAe2QOgwOLsLNDjN+aaiMD8InJk1/O3HSD8lkqTjCgg5YI34Tz15KNNA3p+nQ==",
       "dev": true,
       "dependencies": {
         "@babel/helper-function-name": "^7.22.5",
         "@babel/template": "^7.22.5",
-        "@babel/traverse": "^7.22.5",
-        "@babel/types": "^7.22.5"
+        "@babel/types": "^7.22.10"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -679,22 +677,6 @@
         "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/plugin-proposal-unicode-property-regex": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.18.6.tgz",
-      "integrity": "sha512-2BShG/d5yoZyXZfVePH91urL5wTG6ASZU9M4o03lKK8u8UW1y08OMttBSOADTcJrnPMpvDXRG3G8fyLh4ovs8w==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-create-regexp-features-plugin": "^7.18.6",
-        "@babel/helper-plugin-utils": "^7.18.6"
-      },
-      "engines": {
-        "node": ">=4"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
     "node_modules/@babel/plugin-syntax-async-generators": {
       "version": "7.8.4",
       "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz",
@@ -988,14 +970,14 @@
       }
     },
     "node_modules/@babel/plugin-transform-async-generator-functions": {
-      "version": "7.22.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-generator-functions/-/plugin-transform-async-generator-functions-7.22.7.tgz",
-      "integrity": "sha512-7HmE7pk/Fmke45TODvxvkxRMV9RazV+ZZzhOL9AG8G29TLrr3jkjwF7uJfxZ30EoXpO+LJkq4oA8NjO2DTnEDg==",
+      "version": "7.22.10",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-generator-functions/-/plugin-transform-async-generator-functions-7.22.10.tgz",
+      "integrity": "sha512-eueE8lvKVzq5wIObKK/7dvoeKJ+xc6TvRn6aysIjS6pSCeLy7S/eVi7pEQknZqyqvzaNKdDtem8nUNTBgDVR2g==",
       "dev": true,
       "dependencies": {
         "@babel/helper-environment-visitor": "^7.22.5",
         "@babel/helper-plugin-utils": "^7.22.5",
-        "@babel/helper-remap-async-to-generator": "^7.22.5",
+        "@babel/helper-remap-async-to-generator": "^7.22.9",
         "@babel/plugin-syntax-async-generators": "^7.8.4"
       },
       "engines": {
@@ -1038,9 +1020,9 @@
       }
     },
     "node_modules/@babel/plugin-transform-block-scoping": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.22.5.tgz",
-      "integrity": "sha512-EcACl1i5fSQ6bt+YGuU/XGCeZKStLmyVGytWkpyhCLeQVA0eu6Wtiw92V+I1T/hnezUv7j74dA/Ro69gWcU+hg==",
+      "version": "7.22.10",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.22.10.tgz",
+      "integrity": "sha512-1+kVpGAOOI1Albt6Vse7c8pHzcZQdQKW+wJH+g8mCaszOdDVwRXa/slHPqIw+oJAJANTKDMuM2cBdV0Dg618Vg==",
       "dev": true,
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.22.5"
@@ -1125,9 +1107,9 @@
       }
     },
     "node_modules/@babel/plugin-transform-destructuring": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.22.5.tgz",
-      "integrity": "sha512-GfqcFuGW8vnEqTUBM7UtPd5A4q797LTvvwKxXTgRsFjoqaJiEg9deBG6kWeQYkVEL569NpnmpC0Pkr/8BLKGnQ==",
+      "version": "7.22.10",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.22.10.tgz",
+      "integrity": "sha512-dPJrL0VOyxqLM9sritNbMSGx/teueHF/htMKrPT7DNxccXxRDPYqlgPFFdr8u+F+qUZOkZoXue/6rL5O5GduEw==",
       "dev": true,
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.22.5"
@@ -1494,9 +1476,9 @@
       }
     },
     "node_modules/@babel/plugin-transform-optional-chaining": {
-      "version": "7.22.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-optional-chaining/-/plugin-transform-optional-chaining-7.22.6.tgz",
-      "integrity": "sha512-Vd5HiWml0mDVtcLHIoEU5sw6HOUW/Zk0acLs/SAeuLzkGNOPc9DB4nkUajemhCmTIz3eiaKREZn2hQQqF79YTg==",
+      "version": "7.22.10",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-optional-chaining/-/plugin-transform-optional-chaining-7.22.10.tgz",
+      "integrity": "sha512-MMkQqZAZ+MGj+jGTG3OTuhKeBpNcO+0oCEbrGNEaOmiEn+1MzRyQlYsruGiU8RTK3zV6XwrVJTmwiDOyYK6J9g==",
       "dev": true,
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.22.5",
@@ -1575,13 +1557,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-regenerator": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.22.5.tgz",
-      "integrity": "sha512-rR7KePOE7gfEtNTh9Qw+iO3Q/e4DEsoQ+hdvM6QUDH7JRJ5qxq5AA52ZzBWbI5i9lfNuvySgOGP8ZN7LAmaiPw==",
+      "version": "7.22.10",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.22.10.tgz",
+      "integrity": "sha512-F28b1mDt8KcT5bUyJc/U9nwzw6cV+UmTeRlXYIl2TNqMMJif0Jeey9/RQ3C4NOd2zp0/TRsDns9ttj2L523rsw==",
       "dev": true,
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.22.5",
-        "regenerator-transform": "^0.15.1"
+        "regenerator-transform": "^0.15.2"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1713,9 +1695,9 @@
       }
     },
     "node_modules/@babel/plugin-transform-unicode-escapes": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.22.5.tgz",
-      "integrity": "sha512-biEmVg1IYB/raUO5wT1tgfacCef15Fbzhkx493D3urBI++6hpJ+RFG4SrWMn0NEZLfvilqKf3QDrRVZHo08FYg==",
+      "version": "7.22.10",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.22.10.tgz",
+      "integrity": "sha512-lRfaRKGZCBqDlRU3UIFovdp9c9mEvlylmpod0/OatICsSfuQ9YFthRo1tpTkGsklEefZdqlEFdY4A2dwTb6ohg==",
       "dev": true,
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.22.5"
@@ -1776,13 +1758,13 @@
       }
     },
     "node_modules/@babel/preset-env": {
-      "version": "7.22.9",
-      "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.22.9.tgz",
-      "integrity": "sha512-wNi5H/Emkhll/bqPjsjQorSykrlfY5OWakd6AulLvMEytpKasMVUpVy8RL4qBIBs5Ac6/5i0/Rv0b/Fg6Eag/g==",
+      "version": "7.22.10",
+      "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.22.10.tgz",
+      "integrity": "sha512-riHpLb1drNkpLlocmSyEg4oYJIQFeXAK/d7rI6mbD0XsvoTOOweXDmQPG/ErxsEhWk3rl3Q/3F6RFQlVFS8m0A==",
       "dev": true,
       "dependencies": {
         "@babel/compat-data": "^7.22.9",
-        "@babel/helper-compilation-targets": "^7.22.9",
+        "@babel/helper-compilation-targets": "^7.22.10",
         "@babel/helper-plugin-utils": "^7.22.5",
         "@babel/helper-validator-option": "^7.22.5",
         "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": "^7.22.5",
@@ -1807,15 +1789,15 @@
         "@babel/plugin-syntax-top-level-await": "^7.14.5",
         "@babel/plugin-syntax-unicode-sets-regex": "^7.18.6",
         "@babel/plugin-transform-arrow-functions": "^7.22.5",
-        "@babel/plugin-transform-async-generator-functions": "^7.22.7",
+        "@babel/plugin-transform-async-generator-functions": "^7.22.10",
         "@babel/plugin-transform-async-to-generator": "^7.22.5",
         "@babel/plugin-transform-block-scoped-functions": "^7.22.5",
-        "@babel/plugin-transform-block-scoping": "^7.22.5",
+        "@babel/plugin-transform-block-scoping": "^7.22.10",
         "@babel/plugin-transform-class-properties": "^7.22.5",
         "@babel/plugin-transform-class-static-block": "^7.22.5",
         "@babel/plugin-transform-classes": "^7.22.6",
         "@babel/plugin-transform-computed-properties": "^7.22.5",
-        "@babel/plugin-transform-destructuring": "^7.22.5",
+        "@babel/plugin-transform-destructuring": "^7.22.10",
         "@babel/plugin-transform-dotall-regex": "^7.22.5",
         "@babel/plugin-transform-duplicate-keys": "^7.22.5",
         "@babel/plugin-transform-dynamic-import": "^7.22.5",
@@ -1838,27 +1820,27 @@
         "@babel/plugin-transform-object-rest-spread": "^7.22.5",
         "@babel/plugin-transform-object-super": "^7.22.5",
         "@babel/plugin-transform-optional-catch-binding": "^7.22.5",
-        "@babel/plugin-transform-optional-chaining": "^7.22.6",
+        "@babel/plugin-transform-optional-chaining": "^7.22.10",
         "@babel/plugin-transform-parameters": "^7.22.5",
         "@babel/plugin-transform-private-methods": "^7.22.5",
         "@babel/plugin-transform-private-property-in-object": "^7.22.5",
         "@babel/plugin-transform-property-literals": "^7.22.5",
-        "@babel/plugin-transform-regenerator": "^7.22.5",
+        "@babel/plugin-transform-regenerator": "^7.22.10",
         "@babel/plugin-transform-reserved-words": "^7.22.5",
         "@babel/plugin-transform-shorthand-properties": "^7.22.5",
         "@babel/plugin-transform-spread": "^7.22.5",
         "@babel/plugin-transform-sticky-regex": "^7.22.5",
         "@babel/plugin-transform-template-literals": "^7.22.5",
         "@babel/plugin-transform-typeof-symbol": "^7.22.5",
-        "@babel/plugin-transform-unicode-escapes": "^7.22.5",
+        "@babel/plugin-transform-unicode-escapes": "^7.22.10",
         "@babel/plugin-transform-unicode-property-regex": "^7.22.5",
         "@babel/plugin-transform-unicode-regex": "^7.22.5",
         "@babel/plugin-transform-unicode-sets-regex": "^7.22.5",
-        "@babel/preset-modules": "^0.1.5",
-        "@babel/types": "^7.22.5",
-        "babel-plugin-polyfill-corejs2": "^0.4.4",
-        "babel-plugin-polyfill-corejs3": "^0.8.2",
-        "babel-plugin-polyfill-regenerator": "^0.5.1",
+        "@babel/preset-modules": "0.1.6-no-external-plugins",
+        "@babel/types": "^7.22.10",
+        "babel-plugin-polyfill-corejs2": "^0.4.5",
+        "babel-plugin-polyfill-corejs3": "^0.8.3",
+        "babel-plugin-polyfill-regenerator": "^0.5.2",
         "core-js-compat": "^3.31.0",
         "semver": "^6.3.1"
       },
@@ -1870,9 +1852,9 @@
       }
     },
     "node_modules/@babel/preset-env/node_modules/@babel/helper-define-polyfill-provider": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.4.1.tgz",
-      "integrity": "sha512-kX4oXixDxG197yhX+J3Wp+NpL2wuCFjWQAr6yX2jtCnflK9ulMI51ULFGIrWiX1jGfvAxdHp+XQCcP2bZGPs9A==",
+      "version": "0.4.2",
+      "resolved": "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.4.2.tgz",
+      "integrity": "sha512-k0qnnOqHn5dK9pZpfD5XXZ9SojAITdCKRn2Lp6rnDGzIbaP0rHyMPk/4wsSxVBVz4RfN0q6VpXWP2pDGIoQ7hw==",
       "dev": true,
       "dependencies": {
         "@babel/helper-compilation-targets": "^7.22.6",
@@ -1882,49 +1864,47 @@
         "resolve": "^1.14.2"
       },
       "peerDependencies": {
-        "@babel/core": "^7.4.0-0"
+        "@babel/core": "^7.4.0 || ^8.0.0-0 <8.0.0"
       }
     },
     "node_modules/@babel/preset-env/node_modules/babel-plugin-polyfill-corejs2": {
-      "version": "0.4.4",
-      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.4.4.tgz",
-      "integrity": "sha512-9WeK9snM1BfxB38goUEv2FLnA6ja07UMfazFHzCXUb3NyDZAwfXvQiURQ6guTTMeHcOsdknULm1PDhs4uWtKyA==",
+      "version": "0.4.5",
+      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.4.5.tgz",
+      "integrity": "sha512-19hwUH5FKl49JEsvyTcoHakh6BE0wgXLLptIyKZ3PijHc/Ci521wygORCUCCred+E/twuqRyAkE02BAWPmsHOg==",
       "dev": true,
       "dependencies": {
         "@babel/compat-data": "^7.22.6",
-        "@babel/helper-define-polyfill-provider": "^0.4.1",
-        "@nicolo-ribaudo/semver-v6": "^6.3.3"
+        "@babel/helper-define-polyfill-provider": "^0.4.2",
+        "semver": "^6.3.1"
       },
       "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
+        "@babel/core": "^7.4.0 || ^8.0.0-0 <8.0.0"
       }
     },
     "node_modules/@babel/preset-env/node_modules/babel-plugin-polyfill-regenerator": {
-      "version": "0.5.1",
-      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.5.1.tgz",
-      "integrity": "sha512-L8OyySuI6OSQ5hFy9O+7zFjyr4WhAfRjLIOkhQGYl+emwJkd/S4XXT1JpfrgR1jrQ1NcGiOh+yAdGlF8pnC3Jw==",
+      "version": "0.5.2",
+      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.5.2.tgz",
+      "integrity": "sha512-tAlOptU0Xj34V1Y2PNTL4Y0FOJMDB6bZmoW39FeCQIhigGLkqu3Fj6uiXpxIf6Ij274ENdYx64y6Au+ZKlb1IA==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-define-polyfill-provider": "^0.4.1"
+        "@babel/helper-define-polyfill-provider": "^0.4.2"
       },
       "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
+        "@babel/core": "^7.4.0 || ^8.0.0-0 <8.0.0"
       }
     },
     "node_modules/@babel/preset-modules": {
-      "version": "0.1.5",
-      "resolved": "https://registry.npmjs.org/@babel/preset-modules/-/preset-modules-0.1.5.tgz",
-      "integrity": "sha512-A57th6YRG7oR3cq/yt/Y84MvGgE0eJG2F1JLhKuyG+jFxEgrd/HAMJatiFtmOiZurz+0DkrvbheCLaV5f2JfjA==",
+      "version": "0.1.6-no-external-plugins",
+      "resolved": "https://registry.npmjs.org/@babel/preset-modules/-/preset-modules-0.1.6-no-external-plugins.tgz",
+      "integrity": "sha512-HrcgcIESLm9aIR842yhJ5RWan/gebQUJ6E/E5+rf0y9o6oj7w0Br+sWuL6kEQ/o/AdfvR1Je9jG18/gnpwjEyA==",
       "dev": true,
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.0.0",
-        "@babel/plugin-proposal-unicode-property-regex": "^7.4.4",
-        "@babel/plugin-transform-dotall-regex": "^7.4.4",
         "@babel/types": "^7.4.4",
         "esutils": "^2.0.2"
       },
       "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
+        "@babel/core": "^7.0.0-0 || ^8.0.0-0 <8.0.0"
       }
     },
     "node_modules/@babel/regjsgen": {
@@ -3324,15 +3304,6 @@
       "resolved": "https://registry.npmjs.org/@metamask/safe-event-emitter/-/safe-event-emitter-2.0.0.tgz",
       "integrity": "sha512-/kSXhY692qiV1MXu6EeOZvg5nECLclxNXcKCxJ3cXQgYuRymRHpdx/t7JXfsK+JLjwA1e1c1/SBrlQYpusC29Q=="
     },
-    "node_modules/@nicolo-ribaudo/semver-v6": {
-      "version": "6.3.3",
-      "resolved": "https://registry.npmjs.org/@nicolo-ribaudo/semver-v6/-/semver-v6-6.3.3.tgz",
-      "integrity": "sha512-3Yc1fUTs69MG/uZbJlLSI3JISMn2UV2rg+1D/vROUqZyh3l6iYHCs7GMp+M40ZD7yOdDbYjJcU1oTJhrc+dGKg==",
-      "dev": true,
-      "bin": {
-        "semver": "bin/semver.js"
-      }
-    },
     "node_modules/@nodelib/fs.scandir": {
       "version": "2.1.5",
       "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
@@ -4741,22 +4712,22 @@
       }
     },
     "node_modules/babel-plugin-polyfill-corejs3": {
-      "version": "0.8.2",
-      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.8.2.tgz",
-      "integrity": "sha512-Cid+Jv1BrY9ReW9lIfNlNpsI53N+FN7gE+f73zLAUbr9C52W4gKLWSByx47pfDJsEysojKArqOtOKZSVIIUTuQ==",
+      "version": "0.8.3",
+      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.8.3.tgz",
+      "integrity": "sha512-z41XaniZL26WLrvjy7soabMXrfPWARN25PZoriDEiLMxAp50AUW3t35BGQUMg5xK3UrpVTtagIDklxYa+MhiNA==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-define-polyfill-provider": "^0.4.1",
+        "@babel/helper-define-polyfill-provider": "^0.4.2",
         "core-js-compat": "^3.31.0"
       },
       "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
+        "@babel/core": "^7.4.0 || ^8.0.0-0 <8.0.0"
       }
     },
     "node_modules/babel-plugin-polyfill-corejs3/node_modules/@babel/helper-define-polyfill-provider": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.4.1.tgz",
-      "integrity": "sha512-kX4oXixDxG197yhX+J3Wp+NpL2wuCFjWQAr6yX2jtCnflK9ulMI51ULFGIrWiX1jGfvAxdHp+XQCcP2bZGPs9A==",
+      "version": "0.4.2",
+      "resolved": "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.4.2.tgz",
+      "integrity": "sha512-k0qnnOqHn5dK9pZpfD5XXZ9SojAITdCKRn2Lp6rnDGzIbaP0rHyMPk/4wsSxVBVz4RfN0q6VpXWP2pDGIoQ7hw==",
       "dev": true,
       "dependencies": {
         "@babel/helper-compilation-targets": "^7.22.6",
@@ -4766,7 +4737,7 @@
         "resolve": "^1.14.2"
       },
       "peerDependencies": {
-        "@babel/core": "^7.4.0-0"
+        "@babel/core": "^7.4.0 || ^8.0.0-0 <8.0.0"
       }
     },
     "node_modules/babel-plugin-polyfill-regenerator": {
@@ -14620,9 +14591,9 @@
       "integrity": "sha512-p3VT+cOEgxFsRRA9X4lkI1E+k2/CtnKtU4gcxyaCUreilL/vqI6CdZ3wxVUx3UOUg+gnUOQQcRI7BmSI656MYA=="
     },
     "node_modules/regenerator-transform": {
-      "version": "0.15.1",
-      "resolved": "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.15.1.tgz",
-      "integrity": "sha512-knzmNAcuyxV+gQCufkYcvOqX/qIIfHLv0u5x79kRxuGojfYVky1f15TzZEu2Avte8QGepvUNTnLskf8E6X6Vyg==",
+      "version": "0.15.2",
+      "resolved": "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.15.2.tgz",
+      "integrity": "sha512-hfMp2BoF0qOk3uc5V20ALGDS2ddjQaLrdl7xrGXvAIow7qeWRM2VA2HuCHkUKk9slq3VwEwLNK3DFBqDfPGYtg==",
       "dev": true,
       "dependencies": {
         "@babel/runtime": "^7.8.4"
@@ -17915,15 +17886,14 @@
       "integrity": "sha512-uLls06UVKgFG9QD4OeFYLEGteMIAa5kpTPcFL28yuCIIzsf6ZyKZMllKVOCZFhiZ5ptnwX4mtKdWCBE/uT4amg=="
     },
     "@babel/helper-remap-async-to-generator": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.22.5.tgz",
-      "integrity": "sha512-cU0Sq1Rf4Z55fgz7haOakIyM7+x/uCFwXpLPaeRzfoUtAEAuUZjZvFPjL/rk5rW693dIgn2hng1W7xbT7lWT4g==",
+      "version": "7.22.9",
+      "resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.22.9.tgz",
+      "integrity": "sha512-8WWC4oR4Px+tr+Fp0X3RHDVfINGpF3ad1HIbrc8A77epiR6eMMc6jsgozkzT2uDiOOdoS9cLIQ+XD2XvI2WSmQ==",
       "dev": true,
       "requires": {
         "@babel/helper-annotate-as-pure": "^7.22.5",
         "@babel/helper-environment-visitor": "^7.22.5",
-        "@babel/helper-wrap-function": "^7.22.5",
-        "@babel/types": "^7.22.5"
+        "@babel/helper-wrap-function": "^7.22.9"
       }
     },
     "@babel/helper-replace-supers": {
@@ -17981,15 +17951,14 @@
       "integrity": "sha512-R3oB6xlIVKUnxNUxbmgq7pKjxpru24zlimpE8WK47fACIlM0II/Hm1RS8IaOI7NgCr6LNS+jl5l75m20npAziw=="
     },
     "@babel/helper-wrap-function": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.22.5.tgz",
-      "integrity": "sha512-bYqLIBSEshYcYQyfks8ewYA8S30yaGSeRslcvKMvoUk6HHPySbxHq9YRi6ghhzEU+yhQv9bP/jXnygkStOcqZw==",
+      "version": "7.22.10",
+      "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.22.10.tgz",
+      "integrity": "sha512-OnMhjWjuGYtdoO3FmsEFWvBStBAe2QOgwOLsLNDjN+aaiMD8InJk1/O3HSD8lkqTjCgg5YI34Tz15KNNA3p+nQ==",
       "dev": true,
       "requires": {
         "@babel/helper-function-name": "^7.22.5",
         "@babel/template": "^7.22.5",
-        "@babel/traverse": "^7.22.5",
-        "@babel/types": "^7.22.5"
+        "@babel/types": "^7.22.10"
       }
     },
     "@babel/helpers": {
@@ -18044,16 +18013,6 @@
       "dev": true,
       "requires": {}
     },
-    "@babel/plugin-proposal-unicode-property-regex": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.18.6.tgz",
-      "integrity": "sha512-2BShG/d5yoZyXZfVePH91urL5wTG6ASZU9M4o03lKK8u8UW1y08OMttBSOADTcJrnPMpvDXRG3G8fyLh4ovs8w==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-create-regexp-features-plugin": "^7.18.6",
-        "@babel/helper-plugin-utils": "^7.18.6"
-      }
-    },
     "@babel/plugin-syntax-async-generators": {
       "version": "7.8.4",
       "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz",
@@ -18254,14 +18213,14 @@
       }
     },
     "@babel/plugin-transform-async-generator-functions": {
-      "version": "7.22.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-generator-functions/-/plugin-transform-async-generator-functions-7.22.7.tgz",
-      "integrity": "sha512-7HmE7pk/Fmke45TODvxvkxRMV9RazV+ZZzhOL9AG8G29TLrr3jkjwF7uJfxZ30EoXpO+LJkq4oA8NjO2DTnEDg==",
+      "version": "7.22.10",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-generator-functions/-/plugin-transform-async-generator-functions-7.22.10.tgz",
+      "integrity": "sha512-eueE8lvKVzq5wIObKK/7dvoeKJ+xc6TvRn6aysIjS6pSCeLy7S/eVi7pEQknZqyqvzaNKdDtem8nUNTBgDVR2g==",
       "dev": true,
       "requires": {
         "@babel/helper-environment-visitor": "^7.22.5",
         "@babel/helper-plugin-utils": "^7.22.5",
-        "@babel/helper-remap-async-to-generator": "^7.22.5",
+        "@babel/helper-remap-async-to-generator": "^7.22.9",
         "@babel/plugin-syntax-async-generators": "^7.8.4"
       }
     },
@@ -18286,9 +18245,9 @@
       }
     },
     "@babel/plugin-transform-block-scoping": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.22.5.tgz",
-      "integrity": "sha512-EcACl1i5fSQ6bt+YGuU/XGCeZKStLmyVGytWkpyhCLeQVA0eu6Wtiw92V+I1T/hnezUv7j74dA/Ro69gWcU+hg==",
+      "version": "7.22.10",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.22.10.tgz",
+      "integrity": "sha512-1+kVpGAOOI1Albt6Vse7c8pHzcZQdQKW+wJH+g8mCaszOdDVwRXa/slHPqIw+oJAJANTKDMuM2cBdV0Dg618Vg==",
       "dev": true,
       "requires": {
         "@babel/helper-plugin-utils": "^7.22.5"
@@ -18343,9 +18302,9 @@
       }
     },
     "@babel/plugin-transform-destructuring": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.22.5.tgz",
-      "integrity": "sha512-GfqcFuGW8vnEqTUBM7UtPd5A4q797LTvvwKxXTgRsFjoqaJiEg9deBG6kWeQYkVEL569NpnmpC0Pkr/8BLKGnQ==",
+      "version": "7.22.10",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.22.10.tgz",
+      "integrity": "sha512-dPJrL0VOyxqLM9sritNbMSGx/teueHF/htMKrPT7DNxccXxRDPYqlgPFFdr8u+F+qUZOkZoXue/6rL5O5GduEw==",
       "dev": true,
       "requires": {
         "@babel/helper-plugin-utils": "^7.22.5"
@@ -18574,9 +18533,9 @@
       }
     },
     "@babel/plugin-transform-optional-chaining": {
-      "version": "7.22.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-optional-chaining/-/plugin-transform-optional-chaining-7.22.6.tgz",
-      "integrity": "sha512-Vd5HiWml0mDVtcLHIoEU5sw6HOUW/Zk0acLs/SAeuLzkGNOPc9DB4nkUajemhCmTIz3eiaKREZn2hQQqF79YTg==",
+      "version": "7.22.10",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-optional-chaining/-/plugin-transform-optional-chaining-7.22.10.tgz",
+      "integrity": "sha512-MMkQqZAZ+MGj+jGTG3OTuhKeBpNcO+0oCEbrGNEaOmiEn+1MzRyQlYsruGiU8RTK3zV6XwrVJTmwiDOyYK6J9g==",
       "dev": true,
       "requires": {
         "@babel/helper-plugin-utils": "^7.22.5",
@@ -18625,13 +18584,13 @@
       }
     },
     "@babel/plugin-transform-regenerator": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.22.5.tgz",
-      "integrity": "sha512-rR7KePOE7gfEtNTh9Qw+iO3Q/e4DEsoQ+hdvM6QUDH7JRJ5qxq5AA52ZzBWbI5i9lfNuvySgOGP8ZN7LAmaiPw==",
+      "version": "7.22.10",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.22.10.tgz",
+      "integrity": "sha512-F28b1mDt8KcT5bUyJc/U9nwzw6cV+UmTeRlXYIl2TNqMMJif0Jeey9/RQ3C4NOd2zp0/TRsDns9ttj2L523rsw==",
       "dev": true,
       "requires": {
         "@babel/helper-plugin-utils": "^7.22.5",
-        "regenerator-transform": "^0.15.1"
+        "regenerator-transform": "^0.15.2"
       }
     },
     "@babel/plugin-transform-reserved-words": {
@@ -18714,9 +18673,9 @@
       }
     },
     "@babel/plugin-transform-unicode-escapes": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.22.5.tgz",
-      "integrity": "sha512-biEmVg1IYB/raUO5wT1tgfacCef15Fbzhkx493D3urBI++6hpJ+RFG4SrWMn0NEZLfvilqKf3QDrRVZHo08FYg==",
+      "version": "7.22.10",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.22.10.tgz",
+      "integrity": "sha512-lRfaRKGZCBqDlRU3UIFovdp9c9mEvlylmpod0/OatICsSfuQ9YFthRo1tpTkGsklEefZdqlEFdY4A2dwTb6ohg==",
       "dev": true,
       "requires": {
         "@babel/helper-plugin-utils": "^7.22.5"
@@ -18753,13 +18712,13 @@
       }
     },
     "@babel/preset-env": {
-      "version": "7.22.9",
-      "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.22.9.tgz",
-      "integrity": "sha512-wNi5H/Emkhll/bqPjsjQorSykrlfY5OWakd6AulLvMEytpKasMVUpVy8RL4qBIBs5Ac6/5i0/Rv0b/Fg6Eag/g==",
+      "version": "7.22.10",
+      "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.22.10.tgz",
+      "integrity": "sha512-riHpLb1drNkpLlocmSyEg4oYJIQFeXAK/d7rI6mbD0XsvoTOOweXDmQPG/ErxsEhWk3rl3Q/3F6RFQlVFS8m0A==",
       "dev": true,
       "requires": {
         "@babel/compat-data": "^7.22.9",
-        "@babel/helper-compilation-targets": "^7.22.9",
+        "@babel/helper-compilation-targets": "^7.22.10",
         "@babel/helper-plugin-utils": "^7.22.5",
         "@babel/helper-validator-option": "^7.22.5",
         "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": "^7.22.5",
@@ -18784,15 +18743,15 @@
         "@babel/plugin-syntax-top-level-await": "^7.14.5",
         "@babel/plugin-syntax-unicode-sets-regex": "^7.18.6",
         "@babel/plugin-transform-arrow-functions": "^7.22.5",
-        "@babel/plugin-transform-async-generator-functions": "^7.22.7",
+        "@babel/plugin-transform-async-generator-functions": "^7.22.10",
         "@babel/plugin-transform-async-to-generator": "^7.22.5",
         "@babel/plugin-transform-block-scoped-functions": "^7.22.5",
-        "@babel/plugin-transform-block-scoping": "^7.22.5",
+        "@babel/plugin-transform-block-scoping": "^7.22.10",
         "@babel/plugin-transform-class-properties": "^7.22.5",
         "@babel/plugin-transform-class-static-block": "^7.22.5",
         "@babel/plugin-transform-classes": "^7.22.6",
         "@babel/plugin-transform-computed-properties": "^7.22.5",
-        "@babel/plugin-transform-destructuring": "^7.22.5",
+        "@babel/plugin-transform-destructuring": "^7.22.10",
         "@babel/plugin-transform-dotall-regex": "^7.22.5",
         "@babel/plugin-transform-duplicate-keys": "^7.22.5",
         "@babel/plugin-transform-dynamic-import": "^7.22.5",
@@ -18815,35 +18774,35 @@
         "@babel/plugin-transform-object-rest-spread": "^7.22.5",
         "@babel/plugin-transform-object-super": "^7.22.5",
         "@babel/plugin-transform-optional-catch-binding": "^7.22.5",
-        "@babel/plugin-transform-optional-chaining": "^7.22.6",
+        "@babel/plugin-transform-optional-chaining": "^7.22.10",
         "@babel/plugin-transform-parameters": "^7.22.5",
         "@babel/plugin-transform-private-methods": "^7.22.5",
         "@babel/plugin-transform-private-property-in-object": "^7.22.5",
         "@babel/plugin-transform-property-literals": "^7.22.5",
-        "@babel/plugin-transform-regenerator": "^7.22.5",
+        "@babel/plugin-transform-regenerator": "^7.22.10",
         "@babel/plugin-transform-reserved-words": "^7.22.5",
         "@babel/plugin-transform-shorthand-properties": "^7.22.5",
         "@babel/plugin-transform-spread": "^7.22.5",
         "@babel/plugin-transform-sticky-regex": "^7.22.5",
         "@babel/plugin-transform-template-literals": "^7.22.5",
         "@babel/plugin-transform-typeof-symbol": "^7.22.5",
-        "@babel/plugin-transform-unicode-escapes": "^7.22.5",
+        "@babel/plugin-transform-unicode-escapes": "^7.22.10",
         "@babel/plugin-transform-unicode-property-regex": "^7.22.5",
         "@babel/plugin-transform-unicode-regex": "^7.22.5",
         "@babel/plugin-transform-unicode-sets-regex": "^7.22.5",
-        "@babel/preset-modules": "^0.1.5",
-        "@babel/types": "^7.22.5",
-        "babel-plugin-polyfill-corejs2": "^0.4.4",
-        "babel-plugin-polyfill-corejs3": "^0.8.2",
-        "babel-plugin-polyfill-regenerator": "^0.5.1",
+        "@babel/preset-modules": "0.1.6-no-external-plugins",
+        "@babel/types": "^7.22.10",
+        "babel-plugin-polyfill-corejs2": "^0.4.5",
+        "babel-plugin-polyfill-corejs3": "^0.8.3",
+        "babel-plugin-polyfill-regenerator": "^0.5.2",
         "core-js-compat": "^3.31.0",
         "semver": "^6.3.1"
       },
       "dependencies": {
         "@babel/helper-define-polyfill-provider": {
-          "version": "0.4.1",
-          "resolved": "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.4.1.tgz",
-          "integrity": "sha512-kX4oXixDxG197yhX+J3Wp+NpL2wuCFjWQAr6yX2jtCnflK9ulMI51ULFGIrWiX1jGfvAxdHp+XQCcP2bZGPs9A==",
+          "version": "0.4.2",
+          "resolved": "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.4.2.tgz",
+          "integrity": "sha512-k0qnnOqHn5dK9pZpfD5XXZ9SojAITdCKRn2Lp6rnDGzIbaP0rHyMPk/4wsSxVBVz4RfN0q6VpXWP2pDGIoQ7hw==",
           "dev": true,
           "requires": {
             "@babel/helper-compilation-targets": "^7.22.6",
@@ -18854,36 +18813,34 @@
           }
         },
         "babel-plugin-polyfill-corejs2": {
-          "version": "0.4.4",
-          "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.4.4.tgz",
-          "integrity": "sha512-9WeK9snM1BfxB38goUEv2FLnA6ja07UMfazFHzCXUb3NyDZAwfXvQiURQ6guTTMeHcOsdknULm1PDhs4uWtKyA==",
+          "version": "0.4.5",
+          "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.4.5.tgz",
+          "integrity": "sha512-19hwUH5FKl49JEsvyTcoHakh6BE0wgXLLptIyKZ3PijHc/Ci521wygORCUCCred+E/twuqRyAkE02BAWPmsHOg==",
           "dev": true,
           "requires": {
             "@babel/compat-data": "^7.22.6",
-            "@babel/helper-define-polyfill-provider": "^0.4.1",
-            "@nicolo-ribaudo/semver-v6": "^6.3.3"
+            "@babel/helper-define-polyfill-provider": "^0.4.2",
+            "semver": "^6.3.1"
           }
         },
         "babel-plugin-polyfill-regenerator": {
-          "version": "0.5.1",
-          "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.5.1.tgz",
-          "integrity": "sha512-L8OyySuI6OSQ5hFy9O+7zFjyr4WhAfRjLIOkhQGYl+emwJkd/S4XXT1JpfrgR1jrQ1NcGiOh+yAdGlF8pnC3Jw==",
+          "version": "0.5.2",
+          "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.5.2.tgz",
+          "integrity": "sha512-tAlOptU0Xj34V1Y2PNTL4Y0FOJMDB6bZmoW39FeCQIhigGLkqu3Fj6uiXpxIf6Ij274ENdYx64y6Au+ZKlb1IA==",
           "dev": true,
           "requires": {
-            "@babel/helper-define-polyfill-provider": "^0.4.1"
+            "@babel/helper-define-polyfill-provider": "^0.4.2"
           }
         }
       }
     },
     "@babel/preset-modules": {
-      "version": "0.1.5",
-      "resolved": "https://registry.npmjs.org/@babel/preset-modules/-/preset-modules-0.1.5.tgz",
-      "integrity": "sha512-A57th6YRG7oR3cq/yt/Y84MvGgE0eJG2F1JLhKuyG+jFxEgrd/HAMJatiFtmOiZurz+0DkrvbheCLaV5f2JfjA==",
+      "version": "0.1.6-no-external-plugins",
+      "resolved": "https://registry.npmjs.org/@babel/preset-modules/-/preset-modules-0.1.6-no-external-plugins.tgz",
+      "integrity": "sha512-HrcgcIESLm9aIR842yhJ5RWan/gebQUJ6E/E5+rf0y9o6oj7w0Br+sWuL6kEQ/o/AdfvR1Je9jG18/gnpwjEyA==",
       "dev": true,
       "requires": {
         "@babel/helper-plugin-utils": "^7.0.0",
-        "@babel/plugin-proposal-unicode-property-regex": "^7.4.4",
-        "@babel/plugin-transform-dotall-regex": "^7.4.4",
         "@babel/types": "^7.4.4",
         "esutils": "^2.0.2"
       }
@@ -19869,12 +19826,6 @@
       "resolved": "https://registry.npmjs.org/@metamask/safe-event-emitter/-/safe-event-emitter-2.0.0.tgz",
       "integrity": "sha512-/kSXhY692qiV1MXu6EeOZvg5nECLclxNXcKCxJ3cXQgYuRymRHpdx/t7JXfsK+JLjwA1e1c1/SBrlQYpusC29Q=="
     },
-    "@nicolo-ribaudo/semver-v6": {
-      "version": "6.3.3",
-      "resolved": "https://registry.npmjs.org/@nicolo-ribaudo/semver-v6/-/semver-v6-6.3.3.tgz",
-      "integrity": "sha512-3Yc1fUTs69MG/uZbJlLSI3JISMn2UV2rg+1D/vROUqZyh3l6iYHCs7GMp+M40ZD7yOdDbYjJcU1oTJhrc+dGKg==",
-      "dev": true
-    },
     "@nodelib/fs.scandir": {
       "version": "2.1.5",
       "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
@@ -21051,19 +21002,19 @@
       }
     },
     "babel-plugin-polyfill-corejs3": {
-      "version": "0.8.2",
-      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.8.2.tgz",
-      "integrity": "sha512-Cid+Jv1BrY9ReW9lIfNlNpsI53N+FN7gE+f73zLAUbr9C52W4gKLWSByx47pfDJsEysojKArqOtOKZSVIIUTuQ==",
+      "version": "0.8.3",
+      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.8.3.tgz",
+      "integrity": "sha512-z41XaniZL26WLrvjy7soabMXrfPWARN25PZoriDEiLMxAp50AUW3t35BGQUMg5xK3UrpVTtagIDklxYa+MhiNA==",
       "dev": true,
       "requires": {
-        "@babel/helper-define-polyfill-provider": "^0.4.1",
+        "@babel/helper-define-polyfill-provider": "^0.4.2",
         "core-js-compat": "^3.31.0"
       },
       "dependencies": {
         "@babel/helper-define-polyfill-provider": {
-          "version": "0.4.1",
-          "resolved": "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.4.1.tgz",
-          "integrity": "sha512-kX4oXixDxG197yhX+J3Wp+NpL2wuCFjWQAr6yX2jtCnflK9ulMI51ULFGIrWiX1jGfvAxdHp+XQCcP2bZGPs9A==",
+          "version": "0.4.2",
+          "resolved": "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.4.2.tgz",
+          "integrity": "sha512-k0qnnOqHn5dK9pZpfD5XXZ9SojAITdCKRn2Lp6rnDGzIbaP0rHyMPk/4wsSxVBVz4RfN0q6VpXWP2pDGIoQ7hw==",
           "dev": true,
           "requires": {
             "@babel/helper-compilation-targets": "^7.22.6",
@@ -28561,9 +28512,9 @@
       "integrity": "sha512-p3VT+cOEgxFsRRA9X4lkI1E+k2/CtnKtU4gcxyaCUreilL/vqI6CdZ3wxVUx3UOUg+gnUOQQcRI7BmSI656MYA=="
     },
     "regenerator-transform": {
-      "version": "0.15.1",
-      "resolved": "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.15.1.tgz",
-      "integrity": "sha512-knzmNAcuyxV+gQCufkYcvOqX/qIIfHLv0u5x79kRxuGojfYVky1f15TzZEu2Avte8QGepvUNTnLskf8E6X6Vyg==",
+      "version": "0.15.2",
+      "resolved": "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.15.2.tgz",
+      "integrity": "sha512-hfMp2BoF0qOk3uc5V20ALGDS2ddjQaLrdl7xrGXvAIow7qeWRM2VA2HuCHkUKk9slq3VwEwLNK3DFBqDfPGYtg==",
       "dev": true,
       "requires": {
         "@babel/runtime": "^7.8.4"
diff --git a/apps/block_scout_web/assets/package.json b/apps/block_scout_web/assets/package.json
index 7fd96189bef6..cfd5fa63d668 100644
--- a/apps/block_scout_web/assets/package.json
+++ b/apps/block_scout_web/assets/package.json
@@ -84,7 +84,7 @@
   },
   "devDependencies": {
     "@babel/core": "^7.22.10",
-    "@babel/preset-env": "^7.22.9",
+    "@babel/preset-env": "^7.22.10",
     "autoprefixer": "^10.4.14",
     "babel-loader": "^9.1.3",
     "copy-webpack-plugin": "^11.0.0",

From 25ddf2ab52e8b2dc90bde2ffc26285b243b51cfe Mon Sep 17 00:00:00 2001
From: Nikita Pozdniakov <nikitosing4@mail.ru>
Date: Tue, 8 Aug 2023 11:20:23 +0300
Subject: [PATCH 277/909] Switch sourcify tests from POA Sokol to Gnosis Chiado

---
 .github/workflows/config.yml                                | 2 +-
 CHANGELOG.md                                                | 1 +
 .../controllers/api/rpc/contract_controller_test.exs        | 6 +++---
 .../controllers/api/v2/verification_controller_test.exs     | 2 +-
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/config.yml b/.github/workflows/config.yml
index e78e8c389c64..1242102032d4 100644
--- a/.github/workflows/config.yml
+++ b/.github/workflows/config.yml
@@ -625,7 +625,7 @@ jobs:
           PGUSER: postgres
           ETHEREUM_JSONRPC_CASE: "EthereumJSONRPC.Case.Nethermind.Mox"
           ETHEREUM_JSONRPC_WEB_SOCKET_CASE: "EthereumJSONRPC.WebSocket.Case.Mox"
-          CHAIN_ID: "77"
+          CHAIN_ID: "10200"
           API_RATE_LIMIT_DISABLED: "true"
           ADMIN_PANEL_ENABLED: "true"
           ACCOUNT_ENABLED: "true"
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4ac75610d1a7..4922a7415ddd 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,6 +10,7 @@
 
 ### Fixes
 
+- [#8147](https://github.com/blockscout/blockscout/pull/8147) - Switch sourcify tests from POA Sokol to Gnosis Chiado
 - [#8145](https://github.com/blockscout/blockscout/pull/8145) - Handle negative holders count in API v2
 - [#8040](https://github.com/blockscout/blockscout/pull/8040) - Resolve issue with Docker image for Mac M1/M2
 - [#8060](https://github.com/blockscout/blockscout/pull/8060) - Fix eth_getLogs API endpoint
diff --git a/apps/block_scout_web/test/block_scout_web/controllers/api/rpc/contract_controller_test.exs b/apps/block_scout_web/test/block_scout_web/controllers/api/rpc/contract_controller_test.exs
index 0cd2b50bd390..752c393c4710 100644
--- a/apps/block_scout_web/test/block_scout_web/controllers/api/rpc/contract_controller_test.exs
+++ b/apps/block_scout_web/test/block_scout_web/controllers/api/rpc/contract_controller_test.exs
@@ -712,7 +712,7 @@ defmodule BlockScoutWeb.API.RPC.ContractControllerTest do
       params = %{
         "module" => "contract",
         "action" => "verify_via_sourcify",
-        "addressHash" => "0x18d89C12e9463Be6343c35C9990361bA4C42AfC2"
+        "addressHash" => "0xf26594F585De4EB0Ae9De865d9053FEe02ac6eF1"
       }
 
       response =
@@ -732,14 +732,14 @@ defmodule BlockScoutWeb.API.RPC.ContractControllerTest do
       _created_contract_address =
         insert(
           :address,
-          hash: "0x18d89C12e9463Be6343c35C9990361bA4C42AfC2",
+          hash: "0xf26594F585De4EB0Ae9De865d9053FEe02ac6eF1",
           contract_code: smart_contract_bytecode
         )
 
       params = %{
         "module" => "contract",
         "action" => "verify_via_sourcify",
-        "addressHash" => "0x18d89C12e9463Be6343c35C9990361bA4C42AfC2"
+        "addressHash" => "0xf26594F585De4EB0Ae9De865d9053FEe02ac6eF1"
       }
 
       get_implementation()
diff --git a/apps/block_scout_web/test/block_scout_web/controllers/api/v2/verification_controller_test.exs b/apps/block_scout_web/test/block_scout_web/controllers/api/v2/verification_controller_test.exs
index 4ff1545377bd..1b21ecabea27 100644
--- a/apps/block_scout_web/test/block_scout_web/controllers/api/v2/verification_controller_test.exs
+++ b/apps/block_scout_web/test/block_scout_web/controllers/api/v2/verification_controller_test.exs
@@ -222,7 +222,7 @@ defmodule BlockScoutWeb.API.V2.VerificationControllerTest do
     end
 
     test "verify contract from sourcify repo", %{conn: conn} do
-      address = "0x18d89C12e9463Be6343c35C9990361bA4C42AfC2"
+      address = "0xf26594F585De4EB0Ae9De865d9053FEe02ac6eF1"
 
       _contract = insert(:address, hash: address, contract_code: "0x01")
 

From 33494a38d2c0087046f7c888c635e97a7559281a Mon Sep 17 00:00:00 2001
From: Viktor Baranov <baranov.viktor.27@gmail.com>
Date: Tue, 8 Aug 2023 16:19:38 +0300
Subject: [PATCH 278/909] Remove unused env vars

---
 .../docker-compose-no-build-external-frontend.yml      | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/docker-compose/docker-compose-no-build-external-frontend.yml b/docker-compose/docker-compose-no-build-external-frontend.yml
index 660cbd41a7cd..93170be47ee1 100644
--- a/docker-compose/docker-compose-no-build-external-frontend.yml
+++ b/docker-compose/docker-compose-no-build-external-frontend.yml
@@ -40,15 +40,7 @@ services:
         CHAIN_ID: '1337'
         API_V2_ENABLED: 'true'
         MIX_ENV: 'prod'
-        ACCOUNT_ENABLED: 'true'
-        ACCOUNT_AUTH0_DOMAIN: 'dev-d1e3mu4f.us.auth0.com'
-        ACCOUNT_AUTH0_CLIENT_ID: '0Kz1eaBlFGEjtdtbRaEyUAjMxTGcWPbw'
-        ACCOUNT_AUTH0_CLIENT_SECRET: 'kkbPvKz79UG13HBavWlCUqDER8QkuMYvBLlh4xriiZNdlL9FPmyGjzfALn00hker'
-        ACCOUNT_SENDGRID_SENDER: 'noreply@blockscout.com'
-        ACCOUNT_SENDGRID_TEMPLATE: 'd-7ab86397e5bb4f0e94e285879a42be64'
-        ACCOUNT_PUBLIC_TAGS_AIRTABLE_URL: '"https://api.airtable.com/v0/appKlc01pN7paPrhk/Public%20Tags"'
-        ACCOUNT_PUBLIC_TAGS_AIRTABLE_API_KEY: 'keySVvWCUqSuQMfJB'
-        ACCOUNT_CLOAK_KEY: 'yb49fJfTh0lyifuXIWKxcf4rrK9elF5D45e4pgvmcn4='
+        ACCOUNT_ENABLED: 'false'
     ports:
       - 4000:4000
     volumes:

From e2764de98e3f773c6cba8f336b85d05621b8a836 Mon Sep 17 00:00:00 2001
From: Viktor Baranov <baranov.viktor.27@gmail.com>
Date: Tue, 8 Aug 2023 18:42:31 +0300
Subject: [PATCH 279/909] Configure gitleaks pre-commit hook

---
 docker-compose/.pre-commit-config.yaml | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 docker-compose/.pre-commit-config.yaml

diff --git a/docker-compose/.pre-commit-config.yaml b/docker-compose/.pre-commit-config.yaml
new file mode 100644
index 000000000000..505db0421db5
--- /dev/null
+++ b/docker-compose/.pre-commit-config.yaml
@@ -0,0 +1,5 @@
+repos:
+  - repo: https://github.com/gitleaks/gitleaks
+    rev: v8.17.0
+    hooks:
+      - id: gitleaks
\ No newline at end of file

From 8f626539281413056126ef80078866c8196915f8 Mon Sep 17 00:00:00 2001
From: Viktor Baranov <baranov.viktor.27@gmail.com>
Date: Tue, 8 Aug 2023 23:07:52 +0300
Subject: [PATCH 280/909] Move .pre-commit-config.yaml to the root

---
 docker-compose/.pre-commit-config.yaml => .pre-commit-config.yaml | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename docker-compose/.pre-commit-config.yaml => .pre-commit-config.yaml (100%)

diff --git a/docker-compose/.pre-commit-config.yaml b/.pre-commit-config.yaml
similarity index 100%
rename from docker-compose/.pre-commit-config.yaml
rename to .pre-commit-config.yaml

From 5568d70d087aeb9684bd173e1164ddf4d0a2570f Mon Sep 17 00:00:00 2001
From: Qwerty5Uiop <alex000010@bk.ru>
Date: Fri, 21 Jul 2023 10:04:05 +0400
Subject: [PATCH 281/909] Fix missing range insert

---
 CHANGELOG.md                                              | 1 +
 apps/explorer/lib/explorer/utility/missing_block_range.ex | 1 +
 2 files changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4922a7415ddd..44f49a86f437 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -15,6 +15,7 @@
 - [#8040](https://github.com/blockscout/blockscout/pull/8040) - Resolve issue with Docker image for Mac M1/M2
 - [#8060](https://github.com/blockscout/blockscout/pull/8060) - Fix eth_getLogs API endpoint
 - [#8082](https://github.com/blockscout/blockscout/pull/8082), [#8088](https://github.com/blockscout/blockscout/pull/8088) - Fix Rootstock charts API
+- [#7992](https://github.com/blockscout/blockscout/pull/7992) - Fix missing range insert
 
 ### Chore
 
diff --git a/apps/explorer/lib/explorer/utility/missing_block_range.ex b/apps/explorer/lib/explorer/utility/missing_block_range.ex
index b9355d0c6192..4892334d5fd5 100644
--- a/apps/explorer/lib/explorer/utility/missing_block_range.ex
+++ b/apps/explorer/lib/explorer/utility/missing_block_range.ex
@@ -61,6 +61,7 @@ defmodule Explorer.Utility.MissingBlockRange do
         update_range(range_1, %{from_number: range_2.from_number})
 
       _ ->
+        delete_ranges_between(max_number, min_number)
         insert_range(%{from_number: max_number, to_number: min_number})
     end
   end

From 2cac586fb66932c1d907cf9bfc2cd3de161e8a94 Mon Sep 17 00:00:00 2001
From: Qwerty5Uiop <alex000010@bk.ru>
Date: Mon, 24 Jul 2023 21:26:24 +0400
Subject: [PATCH 282/909] Don't add reorg block number to missing blocks

---
 CHANGELOG.md                                             | 1 +
 apps/explorer/lib/explorer/chain/import/runner/blocks.ex | 1 +
 2 files changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 44f49a86f437..a812a5df92ca 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -16,6 +16,7 @@
 - [#8060](https://github.com/blockscout/blockscout/pull/8060) - Fix eth_getLogs API endpoint
 - [#8082](https://github.com/blockscout/blockscout/pull/8082), [#8088](https://github.com/blockscout/blockscout/pull/8088) - Fix Rootstock charts API
 - [#7992](https://github.com/blockscout/blockscout/pull/7992) - Fix missing range insert
+- [#8022](https://github.com/blockscout/blockscout/pull/8022) - Don't add reorg block number to missing blocks
 
 ### Chore
 
diff --git a/apps/explorer/lib/explorer/chain/import/runner/blocks.ex b/apps/explorer/lib/explorer/chain/import/runner/blocks.ex
index a3d99c65d6a5..3839dd58341c 100644
--- a/apps/explorer/lib/explorer/chain/import/runner/blocks.ex
+++ b/apps/explorer/lib/explorer/chain/import/runner/blocks.ex
@@ -374,6 +374,7 @@ defmodule Explorer.Chain.Import.Runner.Blocks do
 
     removed_consensus_block_hashes
     |> Enum.map(fn {number, _hash} -> number end)
+    |> Enum.reject(&Enum.member?(consensus_block_numbers, &1))
     |> MissingRangesManipulator.add_ranges_by_block_numbers()
 
     {:ok, removed_consensus_block_hashes}

From b3b897e1ccd06ea96630e93f0543b84ce8d73923 Mon Sep 17 00:00:00 2001
From: Qwerty5Uiop <alex000010@bk.ru>
Date: Tue, 25 Jul 2023 19:34:17 +0400
Subject: [PATCH 283/909] Filter consensus blocks before fetching

---
 .../lib/indexer/block/catchup/fetcher.ex      | 25 ++++++++++++++++++-
 .../lib/indexer/block/realtime/fetcher.ex     |  2 ++
 2 files changed, 26 insertions(+), 1 deletion(-)

diff --git a/apps/indexer/lib/indexer/block/catchup/fetcher.ex b/apps/indexer/lib/indexer/block/catchup/fetcher.ex
index 6a7d63e8710d..740d788a251a 100644
--- a/apps/indexer/lib/indexer/block/catchup/fetcher.ex
+++ b/apps/indexer/lib/indexer/block/catchup/fetcher.ex
@@ -55,7 +55,9 @@ defmodule Indexer.Block.Catchup.Fetcher do
           shrunk: false
         }
 
-      missing_ranges ->
+      latest_missing_ranges ->
+        missing_ranges = filter_consensus_blocks(latest_missing_ranges)
+
         first.._ = List.first(missing_ranges)
         _..last = List.last(missing_ranges)
 
@@ -85,6 +87,21 @@ defmodule Indexer.Block.Catchup.Fetcher do
     end
   end
 
+  defp filter_consensus_blocks(ranges) do
+    filtered_ranges =
+      ranges
+      |> Enum.map(&Chain.missing_block_number_ranges(&1))
+      |> List.flatten()
+
+    consensus_blocks = ranges_to_numbers(ranges) -- ranges_to_numbers(filtered_ranges)
+
+    consensus_blocks
+    |> numbers_to_ranges()
+    |> MissingRangesManipulator.clear_batch()
+
+    filtered_ranges
+  end
+
   @doc """
   The number of blocks to request in one call to the JSONRPC.  Defaults to
   10.  Block requests also include the transactions for those blocks.  *These transactions
@@ -306,6 +323,12 @@ defmodule Indexer.Block.Catchup.Fetcher do
     )
   end
 
+  defp ranges_to_numbers(ranges) do
+    ranges
+    |> Enum.map(&Enum.to_list/1)
+    |> List.flatten()
+  end
+
   defp put_memory_monitor(sequence_options, %__MODULE__{memory_monitor: nil}) when is_list(sequence_options),
     do: sequence_options
 
diff --git a/apps/indexer/lib/indexer/block/realtime/fetcher.ex b/apps/indexer/lib/indexer/block/realtime/fetcher.ex
index 720672987370..1b3a8fcb74fc 100644
--- a/apps/indexer/lib/indexer/block/realtime/fetcher.ex
+++ b/apps/indexer/lib/indexer/block/realtime/fetcher.ex
@@ -30,6 +30,7 @@ defmodule Indexer.Block.Realtime.Fetcher do
   alias Explorer.Chain.Cache.Accounts
   alias Explorer.Chain.Events.Publisher
   alias Explorer.Counters.AverageBlockTime
+  alias Explorer.Utility.MissingRangesManipulator
   alias Indexer.{Block, Tracer}
   alias Indexer.Block.Realtime.TaskSupervisor
   alias Indexer.Fetcher.CoinBalance
@@ -310,6 +311,7 @@ defmodule Indexer.Block.Realtime.Fetcher do
     case result do
       {:ok, %{inserted: inserted, errors: []}} ->
         log_import_timings(inserted, fetch_duration, time_before)
+        MissingRangesManipulator.clear_batch([block_number_to_fetch..block_number_to_fetch])
         Logger.debug("Fetched and imported.")
 
       {:ok, %{inserted: _, errors: [_ | _] = errors}} ->

From 6fc90296c82adbb59da62177291c23d1f14a77ce Mon Sep 17 00:00:00 2001
From: Qwerty5Uiop <alex000010@bk.ru>
Date: Wed, 9 Aug 2023 19:51:42 +0400
Subject: [PATCH 284/909] Include unfetched balances in TokenBalanceOnDemand
 fetcher

---
 CHANGELOG.md                                  |  1 +
 .../address_token_balance_controller.ex       |  8 ++------
 .../controllers/api/v2/address_controller.ex  |  4 ++--
 apps/explorer/lib/explorer/chain.ex           |  7 +++++++
 .../chain/address/current_token_balance.ex    | 20 +++++++++++++++++++
 .../lib/indexer/fetcher/token_balance.ex      |  3 +--
 .../fetcher/token_balance_on_demand.ex        | 11 +++++-----
 7 files changed, 39 insertions(+), 15 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 44f49a86f437..6a1fe8168bd3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,7 @@
 - [#7952](https://github.com/blockscout/blockscout/pull/7952) - Add parsing constructor arguments for sourcify contracts
 - [#6190](https://github.com/blockscout/blockscout/pull/6190) - Add EIP-1559 support to gas price oracle
 - [#7977](https://github.com/blockscout/blockscout/pull/7977) - GraphQL: extend schema with new field for existing objects
+- [#8158](https://github.com/blockscout/blockscout/pull/8158) - Include unfetched balances in TokenBalanceOnDemand fetcher
 
 ### Fixes
 
diff --git a/apps/block_scout_web/lib/block_scout_web/controllers/address_token_balance_controller.ex b/apps/block_scout_web/lib/block_scout_web/controllers/address_token_balance_controller.ex
index 2013c7bcaad5..5899458fd887 100644
--- a/apps/block_scout_web/lib/block_scout_web/controllers/address_token_balance_controller.ex
+++ b/apps/block_scout_web/lib/block_scout_web/controllers/address_token_balance_controller.ex
@@ -9,12 +9,8 @@ defmodule BlockScoutWeb.AddressTokenBalanceController do
   def index(conn, %{"address_id" => address_hash_string} = params) do
     with true <- ajax?(conn),
          {:ok, address_hash} <- Chain.string_to_address_hash(address_hash_string) do
-      token_balances =
-        address_hash
-        |> Chain.fetch_last_token_balances()
-
       Task.start_link(fn ->
-        TokenBalanceOnDemand.trigger_fetch(address_hash, token_balances)
+        TokenBalanceOnDemand.trigger_fetch(address_hash)
       end)
 
       case AccessHelper.restricted_access?(address_hash_string, params) do
@@ -24,7 +20,7 @@ defmodule BlockScoutWeb.AddressTokenBalanceController do
           |> put_layout(false)
           |> render("_token_balances.html",
             address_hash: Address.checksum(address_hash),
-            token_balances: token_balances,
+            token_balances: Chain.fetch_last_token_balances(address_hash),
             conn: conn
           )
 
diff --git a/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/address_controller.ex b/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/address_controller.ex
index c8062039c870..487828ca68de 100644
--- a/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/address_controller.ex
+++ b/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/address_controller.ex
@@ -97,7 +97,7 @@ defmodule BlockScoutWeb.API.V2.AddressController do
         |> Chain.fetch_last_token_balances(@api_true)
 
       Task.start_link(fn ->
-        TokenBalanceOnDemand.trigger_fetch(address_hash, token_balances)
+        TokenBalanceOnDemand.trigger_fetch(address_hash)
       end)
 
       conn
@@ -361,7 +361,7 @@ defmodule BlockScoutWeb.API.V2.AddressController do
         )
 
       Task.start_link(fn ->
-        TokenBalanceOnDemand.trigger_fetch(address_hash, results_plus_one)
+        TokenBalanceOnDemand.trigger_fetch(address_hash)
       end)
 
       {tokens, next_page} = split_list_by_page(results_plus_one)
diff --git a/apps/explorer/lib/explorer/chain.ex b/apps/explorer/lib/explorer/chain.ex
index 4861fe6103b7..5ee7d0c7306e 100644
--- a/apps/explorer/lib/explorer/chain.ex
+++ b/apps/explorer/lib/explorer/chain.ex
@@ -5326,6 +5326,13 @@ defmodule Explorer.Chain do
     end
   end
 
+  @spec fetch_last_token_balances_include_unfetched(Hash.Address.t(), [api?]) :: []
+  def fetch_last_token_balances_include_unfetched(address_hash, options \\ []) do
+    address_hash
+    |> CurrentTokenBalance.last_token_balances_include_unfetched()
+    |> select_repo(options).all()
+  end
+
   @spec fetch_last_token_balances(Hash.Address.t(), [api?]) :: []
   def fetch_last_token_balances(address_hash, options \\ []) do
     address_hash
diff --git a/apps/explorer/lib/explorer/chain/address/current_token_balance.ex b/apps/explorer/lib/explorer/chain/address/current_token_balance.ex
index 4b4574598a72..6b95dff2bab9 100644
--- a/apps/explorer/lib/explorer/chain/address/current_token_balance.ex
+++ b/apps/explorer/lib/explorer/chain/address/current_token_balance.ex
@@ -158,6 +158,26 @@ defmodule Explorer.Chain.Address.CurrentTokenBalance do
     dynamic([ctb, t], ctb.value * t.fiat_value / fragment("10 ^ ?", t.decimals))
   end
 
+  @doc """
+  Builds an `t:Ecto.Query.t/0` to fetch the current token balances of the given address (include unfetched).
+  """
+  def last_token_balances_include_unfetched(address_hash) do
+    fiat_balance = fiat_value_query()
+
+    from(
+      ctb in __MODULE__,
+      where: ctb.address_hash == ^address_hash,
+      where: ctb.value > 0 or is_nil(ctb.value_fetched_at),
+      left_join: t in assoc(ctb, :token),
+      on: ctb.token_contract_address_hash == t.contract_address_hash,
+      preload: [token: t],
+      select: ctb,
+      select_merge: ^%{fiat_value: fiat_balance},
+      order_by: ^[desc_nulls_last: fiat_balance],
+      order_by: [desc: ctb.value, desc: ctb.id]
+    )
+  end
+
   @doc """
   Builds an `t:Ecto.Query.t/0` to fetch the current token balances of the given address.
   """
diff --git a/apps/indexer/lib/indexer/fetcher/token_balance.ex b/apps/indexer/lib/indexer/fetcher/token_balance.ex
index 9a40d88e6f0b..9804e0d3be5c 100644
--- a/apps/indexer/lib/indexer/fetcher/token_balance.ex
+++ b/apps/indexer/lib/indexer/fetcher/token_balance.ex
@@ -75,8 +75,7 @@ defmodule Indexer.Fetcher.TokenBalance do
           token_balance
           |> entry()
           |> reducer.(acc)
-        end,
-        true
+        end
       )
 
     final
diff --git a/apps/indexer/lib/indexer/fetcher/token_balance_on_demand.ex b/apps/indexer/lib/indexer/fetcher/token_balance_on_demand.ex
index 3f3c05bb7932..7c8c042a097e 100644
--- a/apps/indexer/lib/indexer/fetcher/token_balance_on_demand.ex
+++ b/apps/indexer/lib/indexer/fetcher/token_balance_on_demand.ex
@@ -16,8 +16,8 @@ defmodule Indexer.Fetcher.TokenBalanceOnDemand do
 
   ## Interface
 
-  @spec trigger_fetch(Hash.t(), [CurrentTokenBalance.t()]) :: :ok
-  def trigger_fetch(address_hash, current_token_balances) do
+  @spec trigger_fetch(Hash.t()) :: :ok
+  def trigger_fetch(address_hash) do
     latest_block_number = latest_block_number()
 
     case stale_balance_window(latest_block_number) do
@@ -25,7 +25,7 @@ defmodule Indexer.Fetcher.TokenBalanceOnDemand do
         :current
 
       stale_balance_window ->
-        do_trigger_fetch(address_hash, current_token_balances, latest_block_number, stale_balance_window)
+        do_trigger_fetch(address_hash, latest_block_number, stale_balance_window)
     end
   end
 
@@ -45,10 +45,11 @@ defmodule Indexer.Fetcher.TokenBalanceOnDemand do
 
   ## Implementation
 
-  defp do_trigger_fetch(address_hash, current_token_balances, latest_block_number, stale_balance_window)
+  defp do_trigger_fetch(address_hash, latest_block_number, stale_balance_window)
        when not is_nil(address_hash) do
     stale_current_token_balances =
-      current_token_balances
+      address_hash
+      |> Chain.fetch_last_token_balances_include_unfetched()
       |> Enum.filter(fn current_token_balance -> current_token_balance.block_number < stale_balance_window end)
 
     if Enum.count(stale_current_token_balances) > 0 do

From fc9b7793268c160135214356f20d0ba5b6ac77f5 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 9 Aug 2023 18:35:53 +0000
Subject: [PATCH 285/909] Bump luxon from 3.3.0 to 3.4.0 in
 /apps/block_scout_web/assets

Bumps [luxon](https://github.com/moment/luxon) from 3.3.0 to 3.4.0.
- [Changelog](https://github.com/moment/luxon/blob/master/CHANGELOG.md)
- [Commits](https://github.com/moment/luxon/compare/3.3.0...3.4.0)

---
updated-dependencies:
- dependency-name: luxon
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 apps/block_scout_web/assets/package-lock.json | 14 +++++++-------
 apps/block_scout_web/assets/package.json      |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/apps/block_scout_web/assets/package-lock.json b/apps/block_scout_web/assets/package-lock.json
index b6a915f0fbaf..faed39aa1ffc 100644
--- a/apps/block_scout_web/assets/package-lock.json
+++ b/apps/block_scout_web/assets/package-lock.json
@@ -44,7 +44,7 @@
         "lodash.omit": "^4.5.0",
         "lodash.rangeright": "^4.2.0",
         "lodash.reduce": "^4.6.0",
-        "luxon": "^3.3.0",
+        "luxon": "^3.4.0",
         "malihu-custom-scrollbar-plugin": "3.1.5",
         "mixpanel-browser": "^2.47.0",
         "moment": "^2.29.4",
@@ -12302,9 +12302,9 @@
       "integrity": "sha1-81ypHEk/e3PaDgdJUwTxezH4fuU="
     },
     "node_modules/luxon": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/luxon/-/luxon-3.3.0.tgz",
-      "integrity": "sha512-An0UCfG/rSiqtAIiBPO0Y9/zAnHUZxAMiCpTd5h2smgsj7GGmcenvrvww2cqNA8/4A5ZrD1gJpHN2mIHZQF+Mg==",
+      "version": "3.4.0",
+      "resolved": "https://registry.npmjs.org/luxon/-/luxon-3.4.0.tgz",
+      "integrity": "sha512-7eDo4Pt7aGhoCheGFIuq4Xa2fJm4ZpmldpGhjTYBNUYNCN6TIEP6v7chwwwt3KRp7YR+rghbfvjyo3V5y9hgBw==",
       "engines": {
         "node": ">=12"
       }
@@ -26844,9 +26844,9 @@
       "integrity": "sha1-81ypHEk/e3PaDgdJUwTxezH4fuU="
     },
     "luxon": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/luxon/-/luxon-3.3.0.tgz",
-      "integrity": "sha512-An0UCfG/rSiqtAIiBPO0Y9/zAnHUZxAMiCpTd5h2smgsj7GGmcenvrvww2cqNA8/4A5ZrD1gJpHN2mIHZQF+Mg=="
+      "version": "3.4.0",
+      "resolved": "https://registry.npmjs.org/luxon/-/luxon-3.4.0.tgz",
+      "integrity": "sha512-7eDo4Pt7aGhoCheGFIuq4Xa2fJm4ZpmldpGhjTYBNUYNCN6TIEP6v7chwwwt3KRp7YR+rghbfvjyo3V5y9hgBw=="
     },
     "make-dir": {
       "version": "4.0.0",
diff --git a/apps/block_scout_web/assets/package.json b/apps/block_scout_web/assets/package.json
index cfd5fa63d668..3f798d666786 100644
--- a/apps/block_scout_web/assets/package.json
+++ b/apps/block_scout_web/assets/package.json
@@ -56,7 +56,7 @@
     "lodash.omit": "^4.5.0",
     "lodash.rangeright": "^4.2.0",
     "lodash.reduce": "^4.6.0",
-    "luxon": "^3.3.0",
+    "luxon": "^3.4.0",
     "malihu-custom-scrollbar-plugin": "3.1.5",
     "mixpanel-browser": "^2.47.0",
     "moment": "^2.29.4",

From b748632e79fc0ce81801eb9c897828565aa0fa5b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 9 Aug 2023 18:41:32 +0000
Subject: [PATCH 286/909] Bump exvcr from 0.14.2 to 0.14.3

Bumps [exvcr](https://github.com/parroty/exvcr) from 0.14.2 to 0.14.3.
- [Release notes](https://github.com/parroty/exvcr/releases)
- [Changelog](https://github.com/parroty/exvcr/blob/master/CHANGELOG.md)
- [Commits](https://github.com/parroty/exvcr/compare/v0.14.2...v0.14.3)

---
updated-dependencies:
- dependency-name: exvcr
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 mix.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mix.lock b/mix.lock
index 4663c6cad8ed..6449b2184b3c 100644
--- a/mix.lock
+++ b/mix.lock
@@ -57,7 +57,7 @@
   "exactor": {:hex, :exactor, "2.2.4", "5efb4ddeb2c48d9a1d7c9b465a6fffdd82300eb9618ece5d34c3334d5d7245b1", [:mix], [], "hexpm", "1222419f706e01bfa1095aec9acf6421367dcfab798a6f67c54cf784733cd6b5"},
   "exjsx": {:hex, :exjsx, "4.0.0", "60548841e0212df401e38e63c0078ec57b33e7ea49b032c796ccad8cde794b5c", [:mix], [{:jsx, "~> 2.8.0", [hex: :jsx, repo: "hexpm", optional: false]}], "hexpm", "32e95820a97cffea67830e91514a2ad53b888850442d6d395f53a1ac60c82e07"},
   "expo": {:hex, :expo, "0.4.1", "1c61d18a5df197dfda38861673d392e642649a9cef7694d2f97a587b2cfb319b", [:mix], [], "hexpm", "2ff7ba7a798c8c543c12550fa0e2cbc81b95d4974c65855d8d15ba7b37a1ce47"},
-  "exvcr": {:hex, :exvcr, "0.14.2", "90830764b7a428c07bb1475628b4e020f34a081605b9484df6b7b3fe7e32ee9c", [:mix], [{:exactor, "~> 2.2", [hex: :exactor, repo: "hexpm", optional: false]}, {:exjsx, "~> 4.0", [hex: :exjsx, repo: "hexpm", optional: false]}, {:finch, "~> 0.16", [hex: :finch, repo: "hexpm", optional: true]}, {:httpoison, "~> 1.0 or ~> 2.0", [hex: :httpoison, repo: "hexpm", optional: true]}, {:httpotion, "~> 3.1", [hex: :httpotion, repo: "hexpm", optional: true]}, {:ibrowse, "4.4.0", [hex: :ibrowse, repo: "hexpm", optional: true]}, {:meck, "~> 0.8", [hex: :meck, repo: "hexpm", optional: false]}], "hexpm", "2ca98dabbfd10215cb2072fc5c83d91f6d1e1a7b5e576300c0ec6825ac97a070"},
+  "exvcr": {:hex, :exvcr, "0.14.3", "e7d93b3b25919fbb653b06bc015cab99f658400eae96ed8e59758f1bb12ae167", [:mix], [{:exactor, "~> 2.2", [hex: :exactor, repo: "hexpm", optional: false]}, {:exjsx, "~> 4.0", [hex: :exjsx, repo: "hexpm", optional: false]}, {:finch, "~> 0.16", [hex: :finch, repo: "hexpm", optional: true]}, {:httpoison, "~> 1.0 or ~> 2.0", [hex: :httpoison, repo: "hexpm", optional: true]}, {:httpotion, "~> 3.1", [hex: :httpotion, repo: "hexpm", optional: true]}, {:ibrowse, "4.4.0", [hex: :ibrowse, repo: "hexpm", optional: true]}, {:meck, "~> 0.8", [hex: :meck, repo: "hexpm", optional: false]}], "hexpm", "38fa7d918aeda0ecc8e70346225c1299d21d4c432061c832f23a421ac2ed791d"},
   "file_info": {:hex, :file_info, "0.0.4", "2e0e77f211e833f38ead22cb29ce53761d457d80b3ffe0ffe0eb93880b0963b2", [:mix], [{:mimetype_parser, "~> 0.1.2", [hex: :mimetype_parser, repo: "hexpm", optional: false]}], "hexpm", "50e7ad01c2c8b9339010675fe4dc4a113b8d6ca7eddce24d1d74fd0e762781a5"},
   "file_system": {:hex, :file_system, "0.2.10", "fb082005a9cd1711c05b5248710f8826b02d7d1784e7c3451f9c1231d4fc162d", [:mix], [], "hexpm", "41195edbfb562a593726eda3b3e8b103a309b733ad25f3d642ba49696bf715dc"},
   "floki": {:hex, :floki, "0.34.3", "5e2dcaec5d7c228ce5b1d3501502e308b2d79eb655e4191751a1fe491c37feac", [:mix], [], "hexpm", "9577440eea5b97924b4bf3c7ea55f7b8b6dce589f9b28b096cc294a8dc342341"},

From e4bf56a294ed5ff1faecc814186a0b880b762ea1 Mon Sep 17 00:00:00 2001
From: Qwerty5Uiop <alex000010@bk.ru>
Date: Thu, 10 Aug 2023 12:38:42 +0400
Subject: [PATCH 287/909] Remove query filters for TokenBalanceOnDemand fetcher

---
 CHANGELOG.md                                                    | 2 +-
 .../lib/explorer/chain/address/current_token_balance.ex         | 1 -
 apps/indexer/lib/indexer/fetcher/token_balance_on_demand.ex     | 1 -
 3 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1aeaf8ad3179..c61fe6e97ae4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,7 +7,7 @@
 - [#7952](https://github.com/blockscout/blockscout/pull/7952) - Add parsing constructor arguments for sourcify contracts
 - [#6190](https://github.com/blockscout/blockscout/pull/6190) - Add EIP-1559 support to gas price oracle
 - [#7977](https://github.com/blockscout/blockscout/pull/7977) - GraphQL: extend schema with new field for existing objects
-- [#8158](https://github.com/blockscout/blockscout/pull/8158) - Include unfetched balances in TokenBalanceOnDemand fetcher
+- [#8158](https://github.com/blockscout/blockscout/pull/8158), [#8164](https://github.com/blockscout/blockscout/pull/8164) - Include unfetched balances in TokenBalanceOnDemand fetcher
 
 ### Fixes
 
diff --git a/apps/explorer/lib/explorer/chain/address/current_token_balance.ex b/apps/explorer/lib/explorer/chain/address/current_token_balance.ex
index 6b95dff2bab9..196f17cf3b04 100644
--- a/apps/explorer/lib/explorer/chain/address/current_token_balance.ex
+++ b/apps/explorer/lib/explorer/chain/address/current_token_balance.ex
@@ -167,7 +167,6 @@ defmodule Explorer.Chain.Address.CurrentTokenBalance do
     from(
       ctb in __MODULE__,
       where: ctb.address_hash == ^address_hash,
-      where: ctb.value > 0 or is_nil(ctb.value_fetched_at),
       left_join: t in assoc(ctb, :token),
       on: ctb.token_contract_address_hash == t.contract_address_hash,
       preload: [token: t],
diff --git a/apps/indexer/lib/indexer/fetcher/token_balance_on_demand.ex b/apps/indexer/lib/indexer/fetcher/token_balance_on_demand.ex
index 7c8c042a097e..585b978c409b 100644
--- a/apps/indexer/lib/indexer/fetcher/token_balance_on_demand.ex
+++ b/apps/indexer/lib/indexer/fetcher/token_balance_on_demand.ex
@@ -7,7 +7,6 @@ defmodule Indexer.Fetcher.TokenBalanceOnDemand do
   use Indexer.Fetcher
 
   alias Explorer.Chain
-  alias Explorer.Chain.Address.CurrentTokenBalance
   alias Explorer.Chain.Cache.BlockNumber
   alias Explorer.Chain.Hash
   alias Explorer.Counters.AverageBlockTime

From 2849540e7ff7e299afe50a7c2bfb5185b5920062 Mon Sep 17 00:00:00 2001
From: Nikita Pozdniakov <nikitosing4@mail.ru>
Date: Thu, 10 Aug 2023 14:01:15 +0300
Subject: [PATCH 288/909] Indexer.Fetcher.TokenBalanceOnDemand now sends batch
 requests to node; Add broadcast of address_current_token_balances

---
 CHANGELOG.md                                  |   1 +
 .../channels/address_channel.ex               |  32 ++++-
 .../lib/block_scout_web/endpoint.ex           |   2 +-
 .../lib/block_scout_web/notifier.ex           |  11 +-
 .../block_scout_web/realtime_event_handler.ex |   1 +
 .../lib/explorer/chain/events/publisher.ex    |   2 +-
 .../lib/explorer/chain/events/subscriber.ex   |   2 +-
 .../fetcher/token_balance_on_demand.ex        | 127 +++++++++++++-----
 8 files changed, 132 insertions(+), 46 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c61fe6e97ae4..e6fb6123a6ee 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,7 @@
 
 ### Features
 
+- [#8165](https://github.com/blockscout/blockscout/pull/8165) - Add broadcast of updated address_current_token_balances
 - [#7952](https://github.com/blockscout/blockscout/pull/7952) - Add parsing constructor arguments for sourcify contracts
 - [#6190](https://github.com/blockscout/blockscout/pull/6190) - Add EIP-1559 support to gas price oracle
 - [#7977](https://github.com/blockscout/blockscout/pull/7977) - GraphQL: extend schema with new field for existing objects
diff --git a/apps/block_scout_web/lib/block_scout_web/channels/address_channel.ex b/apps/block_scout_web/lib/block_scout_web/channels/address_channel.ex
index ba808cc16f2b..35a5ea606c07 100644
--- a/apps/block_scout_web/lib/block_scout_web/channels/address_channel.ex
+++ b/apps/block_scout_web/lib/block_scout_web/channels/address_channel.ex
@@ -28,11 +28,13 @@ defmodule BlockScoutWeb.AddressChannel do
     "transaction",
     "verification_result",
     "token_transfer",
-    "pending_transaction"
+    "pending_transaction",
+    "address_current_token_balances"
   ])
 
   {:ok, burn_address_hash} = Chain.string_to_address_hash("0x0000000000000000000000000000000000000000")
   @burn_address_hash burn_address_hash
+  @current_token_balances_limit 50
 
   def join("addresses:" <> address_hash, _params, socket) do
     {:ok, %{}, assign(socket, :address_hash, address_hash)}
@@ -225,6 +227,34 @@ defmodule BlockScoutWeb.AddressChannel do
 
   def handle_out("pending_transaction", data, socket), do: handle_transaction(data, socket, "transaction")
 
+  def handle_out(
+        "address_current_token_balances",
+        %{address_current_token_balances: address_current_token_balances},
+        %Phoenix.Socket{handler: BlockScoutWeb.UserSocketV2} = socket
+      ) do
+    push_current_token_balances(socket, address_current_token_balances, "erc_20", "ERC-20")
+    push_current_token_balances(socket, address_current_token_balances, "erc_721", "ERC-721")
+    push_current_token_balances(socket, address_current_token_balances, "erc_1155", "ERC-1155")
+
+    {:noreply, socket}
+  end
+
+  def handle_out("address_current_token_balances", _, socket) do
+    {:noreply, socket}
+  end
+
+  defp push_current_token_balances(socket, address_current_token_balances, event_postfix, token_type) do
+    filtered_ctbs = address_current_token_balances |> Enum.filter(fn ctb -> ctb.token_type == token_type end)
+
+    push(socket, "updated_token_balances_" <> event_postfix, %{
+      token_balances:
+        AddressViewAPI.render("token_balances.json", %{
+          token_balances: Enum.take(filtered_ctbs, @current_token_balances_limit)
+        }),
+      overflow: Enum.count(filtered_ctbs) > @current_token_balances_limit
+    })
+  end
+
   def push_current_coin_balance(
         %Phoenix.Socket{handler: BlockScoutWeb.UserSocketV2} = socket,
         block_number,
diff --git a/apps/block_scout_web/lib/block_scout_web/endpoint.ex b/apps/block_scout_web/lib/block_scout_web/endpoint.ex
index 9036939eb195..900c6c406d31 100644
--- a/apps/block_scout_web/lib/block_scout_web/endpoint.ex
+++ b/apps/block_scout_web/lib/block_scout_web/endpoint.ex
@@ -7,7 +7,7 @@ defmodule BlockScoutWeb.Endpoint do
   end
 
   socket("/socket", BlockScoutWeb.UserSocket, websocket: [timeout: 45_000])
-  socket("/socket/v2", BlockScoutWeb.UserSocketV2, websocket: [timeout: 45_000])
+  socket("/socket/v2", BlockScoutWeb.UserSocketV2, websocket: [timeout: :infinity])
 
   # Serve at "/" the static files from "priv/static" directory.
   #
diff --git a/apps/block_scout_web/lib/block_scout_web/notifier.ex b/apps/block_scout_web/lib/block_scout_web/notifier.ex
index fc69ceb3e27d..97f6f10a5201 100644
--- a/apps/block_scout_web/lib/block_scout_web/notifier.ex
+++ b/apps/block_scout_web/lib/block_scout_web/notifier.ex
@@ -44,11 +44,6 @@ defmodule BlockScoutWeb.Notifier do
     Enum.each(address_token_balances, &broadcast_address_token_balance/1)
   end
 
-  def handle_event({:chain_event, :address_current_token_balances, type, address_current_token_balances})
-      when type in [:realtime, :on_demand] do
-    Enum.each(address_current_token_balances, &broadcast_address_token_balance/1)
-  end
-
   def handle_event(
         {:chain_event, :contract_verification_result, :on_demand, {address_hash, contract_verification_result}}
       ) do
@@ -225,6 +220,12 @@ defmodule BlockScoutWeb.Notifier do
     Endpoint.broadcast("addresses:#{to_string(address_hash)}", "smart_contract_was_verified", %{})
   end
 
+  def handle_event({:chain_event, :address_current_token_balances, :on_demand, address_current_token_balances}) do
+    Endpoint.broadcast("addresses:#{address_current_token_balances.address_hash}", "address_current_token_balances", %{
+      address_current_token_balances: address_current_token_balances.address_current_token_balances
+    })
+  end
+
   def handle_event(_), do: nil
 
   def fetch_compiler_version(compiler) do
diff --git a/apps/block_scout_web/lib/block_scout_web/realtime_event_handler.ex b/apps/block_scout_web/lib/block_scout_web/realtime_event_handler.ex
index 7c0a05969912..47c9289f8301 100644
--- a/apps/block_scout_web/lib/block_scout_web/realtime_event_handler.ex
+++ b/apps/block_scout_web/lib/block_scout_web/realtime_event_handler.ex
@@ -26,6 +26,7 @@ defmodule BlockScoutWeb.RealtimeEventHandler do
     Subscriber.to(:transactions, :realtime)
     Subscriber.to(:addresses, :on_demand)
     Subscriber.to(:address_coin_balances, :on_demand)
+    Subscriber.to(:address_current_token_balances, :on_demand)
     Subscriber.to(:address_token_balances, :on_demand)
     Subscriber.to(:contract_verification_result, :on_demand)
     Subscriber.to(:token_total_supply, :on_demand)
diff --git a/apps/explorer/lib/explorer/chain/events/publisher.ex b/apps/explorer/lib/explorer/chain/events/publisher.ex
index 92f01bfc844d..8d47f337ec64 100644
--- a/apps/explorer/lib/explorer/chain/events/publisher.ex
+++ b/apps/explorer/lib/explorer/chain/events/publisher.ex
@@ -3,7 +3,7 @@ defmodule Explorer.Chain.Events.Publisher do
   Publishes events related to the Chain context.
   """
 
-  @allowed_events ~w(addresses address_coin_balances address_token_balances blocks block_rewards internal_transactions last_block_number token_transfers transactions contract_verification_result token_total_supply changed_bytecode smart_contract_was_verified)a
+  @allowed_events ~w(addresses address_coin_balances address_token_balances address_current_token_balances blocks block_rewards internal_transactions last_block_number token_transfers transactions contract_verification_result token_total_supply changed_bytecode smart_contract_was_verified)a
 
   def broadcast(_data, false), do: :ok
 
diff --git a/apps/explorer/lib/explorer/chain/events/subscriber.ex b/apps/explorer/lib/explorer/chain/events/subscriber.ex
index 9862e2e6c043..fa0203cbaf90 100644
--- a/apps/explorer/lib/explorer/chain/events/subscriber.ex
+++ b/apps/explorer/lib/explorer/chain/events/subscriber.ex
@@ -3,7 +3,7 @@ defmodule Explorer.Chain.Events.Subscriber do
   Subscribes to events related to the Chain context.
   """
 
-  @allowed_broadcast_events ~w(addresses address_coin_balances address_token_balances blocks block_rewards internal_transactions last_block_number token_transfers transactions contract_verification_result token_total_supply changed_bytecode smart_contract_was_verified)a
+  @allowed_broadcast_events ~w(addresses address_coin_balances address_token_balances address_current_token_balances blocks block_rewards internal_transactions last_block_number token_transfers transactions contract_verification_result token_total_supply changed_bytecode smart_contract_was_verified)a
 
   @allowed_broadcast_types ~w(catchup realtime on_demand contract_verification_result)a
 
diff --git a/apps/indexer/lib/indexer/fetcher/token_balance_on_demand.ex b/apps/indexer/lib/indexer/fetcher/token_balance_on_demand.ex
index 585b978c409b..d1dfcf6d3364 100644
--- a/apps/indexer/lib/indexer/fetcher/token_balance_on_demand.ex
+++ b/apps/indexer/lib/indexer/fetcher/token_balance_on_demand.ex
@@ -7,12 +7,16 @@ defmodule Indexer.Fetcher.TokenBalanceOnDemand do
   use Indexer.Fetcher
 
   alias Explorer.Chain
+  alias Explorer.Chain.Address.CurrentTokenBalance
   alias Explorer.Chain.Cache.BlockNumber
+  alias Explorer.Chain.Events.Publisher
   alias Explorer.Chain.Hash
   alias Explorer.Counters.AverageBlockTime
   alias Explorer.Token.BalanceReader
   alias Timex.Duration
 
+  require Logger
+
   ## Interface
 
   @spec trigger_fetch(Hash.t()) :: :ok
@@ -35,7 +39,6 @@ defmodule Indexer.Fetcher.TokenBalanceOnDemand do
           Decimal.t() | nil,
           non_neg_integer()
         ) :: {:ok, pid}
-
   def trigger_historic_fetch(address_hash, contract_address_hash, token_type, token_id, block_number) do
     Task.start(fn ->
       do_trigger_historic_fetch(address_hash, contract_address_hash, token_type, token_id, block_number)
@@ -61,51 +64,101 @@ defmodule Indexer.Fetcher.TokenBalanceOnDemand do
   end
 
   defp fetch_and_update(block_number, address_hash, stale_current_token_balances) do
-    current_token_balances_update_params =
+    %{erc_1155: erc_1155_ctbs, other: other_ctbs, tokens: tokens} =
       stale_current_token_balances
-      |> Enum.map(fn %{token_id: token_id} = stale_current_token_balance ->
-        stale_current_token_balances_to_fetch = [
-          %{
-            token_contract_address_hash:
-              "0x" <> Base.encode16(stale_current_token_balance.token.contract_address_hash.bytes),
-            address_hash: "0x" <> Base.encode16(address_hash.bytes),
-            block_number: block_number,
-            token_id: token_id && Decimal.to_integer(token_id)
-          }
-        ]
-
-        balance_response =
-          case stale_current_token_balance.token_type do
-            "ERC-1155" -> BalanceReader.get_balances_of_erc_1155(stale_current_token_balances_to_fetch)
-            _ -> BalanceReader.get_balances_of(stale_current_token_balances_to_fetch)
+      |> Enum.reduce(%{erc_1155: [], other: [], tokens: %{}}, fn %{token_id: token_id} = stale_current_token_balance,
+                                                                 acc ->
+        prepared_ctb = %{
+          token_contract_address_hash:
+            "0x" <> Base.encode16(stale_current_token_balance.token.contract_address_hash.bytes),
+          address_hash: "0x" <> Base.encode16(address_hash.bytes),
+          block_number: block_number,
+          token_id: token_id && Decimal.to_integer(token_id),
+          token_type: stale_current_token_balance.token_type
+        }
+
+        updated_tokens =
+          Map.put_new(
+            acc[:tokens],
+            stale_current_token_balance.token.contract_address_hash.bytes,
+            stale_current_token_balance.token
+          )
+
+        result =
+          if stale_current_token_balance.token_type == "ERC-1155" do
+            Map.put(acc, :erc_1155, [prepared_ctb | acc[:erc_1155]])
+          else
+            Map.put(acc, :other, [prepared_ctb | acc[:other]])
           end
 
-        updated_balance = balance_response[:ok]
-
-        if updated_balance do
-          %{}
-          |> Map.put(:address_hash, stale_current_token_balance.address_hash)
-          |> Map.put(:token_contract_address_hash, stale_current_token_balance.token.contract_address_hash)
-          |> Map.put(:token_type, stale_current_token_balance.token.type)
-          |> Map.put(:token_id, token_id)
-          |> Map.put(:block_number, block_number)
-          |> Map.put(:value, Decimal.new(updated_balance))
-          |> Map.put(:value_fetched_at, DateTime.utc_now())
-        else
-          nil
-        end
+        Map.put(result, :tokens, updated_tokens)
       end)
 
+    erc_1155_ctbs_reversed = Enum.reverse(erc_1155_ctbs)
+    other_ctbs_reversed = Enum.reverse(other_ctbs)
+
+    updated_erc_1155_ctbs =
+      if Enum.count(erc_1155_ctbs_reversed) > 0 do
+        erc_1155_ctbs_reversed
+        |> BalanceReader.get_balances_of_erc_1155()
+        |> Enum.zip(erc_1155_ctbs_reversed)
+        |> Enum.map(&prepare_updated_balance(&1, block_number))
+      else
+        []
+      end
+
+    updated_other_ctbs =
+      if Enum.count(other_ctbs_reversed) > 0 do
+        other_ctbs_reversed
+        |> BalanceReader.get_balances_of()
+        |> Enum.zip(other_ctbs_reversed)
+        |> Enum.map(&prepare_updated_balance(&1, block_number))
+      else
+        []
+      end
+
     filtered_current_token_balances_update_params =
-      current_token_balances_update_params
+      (updated_erc_1155_ctbs ++ updated_other_ctbs)
       |> Enum.filter(&(!is_nil(&1)))
 
-    Chain.import(%{
-      address_current_token_balances: %{
-        params: filtered_current_token_balances_update_params
+    {:ok,
+     %{
+       address_current_token_balances: imported_ctbs
+     }} =
+      Chain.import(%{
+        address_current_token_balances: %{
+          params: filtered_current_token_balances_update_params
+        },
+        broadcast: false
+      })
+
+    Publisher.broadcast(
+      %{
+        address_current_token_balances: %{
+          address_hash: to_string(address_hash),
+          address_current_token_balances:
+            imported_ctbs
+            |> Enum.map(fn ctb -> %CurrentTokenBalance{ctb | token: tokens[ctb.token_contract_address_hash.bytes]} end)
+        }
       },
-      broadcast: :on_demand
-    })
+      :on_demand
+    )
+  end
+
+  defp prepare_updated_balance({{:ok, updated_balance}, stale_current_token_balance}, block_number) do
+    %{}
+    |> Map.put(:address_hash, stale_current_token_balance.address_hash)
+    |> Map.put(:token_contract_address_hash, stale_current_token_balance.token_contract_address_hash)
+    |> Map.put(:token_type, stale_current_token_balance.token_type)
+    |> Map.put(:token_id, stale_current_token_balance.token_id)
+    |> Map.put(:block_number, block_number)
+    |> Map.put(:value, Decimal.new(updated_balance))
+    |> Map.put(:value_fetched_at, DateTime.utc_now())
+  end
+
+  defp prepare_updated_balance({{:error, error}, _ctb}, _block_number) do
+    Logger.warn(fn -> ["Error on updating current token balance: ", inspect(error)] end)
+    nil
   end
 
   defp do_trigger_historic_fetch(address_hash, contract_address_hash, token_type, token_id, block_number) do

From 5fbc9fc49d1b1bb41e76337a015e2352da9ab618 Mon Sep 17 00:00:00 2001
From: Viktor Baranov <baranov.viktor.27@gmail.com>
Date: Thu, 10 Aug 2023 19:26:32 +0300
Subject: [PATCH 289/909] Manage concurrency for Token and TokenBalance
 fetchers

---
 CHANGELOG.md                                   |  1 +
 apps/indexer/lib/indexer/fetcher/token.ex      | 18 +++++++++++-------
 .../lib/indexer/fetcher/token_balance.ex       |  3 ++-
 config/runtime.exs                             |  5 ++++-
 docker-compose/envs/common-blockscout.env      |  2 ++
 docker/Makefile                                |  6 ++++++
 6 files changed, 26 insertions(+), 9 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e6fb6123a6ee..6076326dae2c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -22,6 +22,7 @@
 
 ### Chore
 
+- [#8167](https://github.com/blockscout/blockscout/pull/8167) - Manage concurrency for Token and TokenBalance fetcher
 - [#8146](https://github.com/blockscout/blockscout/pull/8146) - Add method_id to write methods in API v2 response
 - [#8105](https://github.com/blockscout/blockscout/pull/8105) - Extend API v1 with endpoints used by new UI
 - [#8104](https://github.com/blockscout/blockscout/pull/8104) - remove "TODO" from API v2 response
diff --git a/apps/indexer/lib/indexer/fetcher/token.ex b/apps/indexer/lib/indexer/fetcher/token.ex
index 57b815a03e54..9d4b0dd253f3 100644
--- a/apps/indexer/lib/indexer/fetcher/token.ex
+++ b/apps/indexer/lib/indexer/fetcher/token.ex
@@ -14,12 +14,7 @@ defmodule Indexer.Fetcher.Token do
 
   @behaviour BufferedTask
 
-  @defaults [
-    flush_interval: 300,
-    max_batch_size: 1,
-    max_concurrency: 10,
-    task_supervisor: Indexer.Fetcher.Token.TaskSupervisor
-  ]
+  @default_max_concurrency 10
 
   @doc false
   def child_spec([init_options, gen_server_options]) do
@@ -32,7 +27,7 @@ defmodule Indexer.Fetcher.Token do
     end
 
     merged_init_opts =
-      @defaults
+      defaults()
       |> Keyword.merge(mergeable_init_options)
       |> Keyword.put(:state, state)
 
@@ -81,4 +76,13 @@ defmodule Indexer.Fetcher.Token do
     {:ok, _} = Chain.update_token(token, token_params)
     :ok
   end
+
+  defp defaults do
+    [
+      flush_interval: 300,
+      max_batch_size: 1,
+      max_concurrency: Application.get_env(:indexer, __MODULE__)[:concurrency] || @default_max_concurrency,
+      task_supervisor: Indexer.Fetcher.Token.TaskSupervisor
+    ]
+  end
 end
diff --git a/apps/indexer/lib/indexer/fetcher/token_balance.ex b/apps/indexer/lib/indexer/fetcher/token_balance.ex
index 9804e0d3be5c..93add63827d2 100644
--- a/apps/indexer/lib/indexer/fetcher/token_balance.ex
+++ b/apps/indexer/lib/indexer/fetcher/token_balance.ex
@@ -26,6 +26,7 @@ defmodule Indexer.Fetcher.TokenBalance do
   @behaviour BufferedTask
 
   @default_max_batch_size 100
+  @default_max_concurrency 10
 
   @max_retries 3
 
@@ -234,7 +235,7 @@ defmodule Indexer.Fetcher.TokenBalance do
     [
       flush_interval: 300,
       max_batch_size: Application.get_env(:indexer, __MODULE__)[:batch_size] || @default_max_batch_size,
-      max_concurrency: 10,
+      max_concurrency: Application.get_env(:indexer, __MODULE__)[:concurrency] || @default_max_concurrency,
       task_supervisor: Indexer.Fetcher.TokenBalance.TaskSupervisor
     ]
   end
diff --git a/config/runtime.exs b/config/runtime.exs
index 37818f36a576..146c43349338 100644
--- a/config/runtime.exs
+++ b/config/runtime.exs
@@ -444,8 +444,11 @@ config :indexer, Indexer.Fetcher.PendingTransaction.Supervisor,
     System.get_env("ETHEREUM_JSONRPC_VARIANT") == "besu" ||
       ConfigHelper.parse_bool_env_var("INDEXER_DISABLE_PENDING_TRANSACTIONS_FETCHER")
 
+config :indexer, Indexer.Fetcher.Token, concurrency: ConfigHelper.parse_integer_env_var("INDEXER_TOKEN_CONCURRENCY", 10)
+
 config :indexer, Indexer.Fetcher.TokenBalance,
-  batch_size: ConfigHelper.parse_integer_env_var("INDEXER_TOKEN_BALANCES_BATCH_SIZE", 100)
+  batch_size: ConfigHelper.parse_integer_env_var("INDEXER_TOKEN_BALANCES_BATCH_SIZE", 100),
+  concurrency: ConfigHelper.parse_integer_env_var("INDEXER_TOKEN_BALANCES_CONCURRENCY", 10)
 
 config :indexer, Indexer.Fetcher.TokenBalanceOnDemand,
   threshold: ConfigHelper.parse_time_env_var("TOKEN_BALANCE_ON_DEMAND_FETCHER_THRESHOLD", "1h"),
diff --git a/docker-compose/envs/common-blockscout.env b/docker-compose/envs/common-blockscout.env
index c7dfa9eae682..ac9ee0e86ce4 100644
--- a/docker-compose/envs/common-blockscout.env
+++ b/docker-compose/envs/common-blockscout.env
@@ -114,7 +114,9 @@ INDEXER_DISABLE_INTERNAL_TRANSACTIONS_FETCHER=false
 # INDEXER_COIN_BALANCES_CONCURRENCY=
 # INDEXER_RECEIPTS_BATCH_SIZE=
 # INDEXER_RECEIPTS_CONCURRENCY=
+# INDEXER_TOKEN_CONCURRENCY=
 # INDEXER_TOKEN_BALANCES_BATCH_SIZE=
+# INDEXER_TOKEN_BALANCES_CONCURRENCY=
 # INDEXER_TX_ACTIONS_ENABLE=
 # INDEXER_TX_ACTIONS_MAX_TOKEN_CACHE_SIZE=
 # INDEXER_TX_ACTIONS_REINDEX_FIRST_BLOCK=
diff --git a/docker/Makefile b/docker/Makefile
index b9f15c84c0b4..bccf86840c62 100644
--- a/docker/Makefile
+++ b/docker/Makefile
@@ -561,9 +561,15 @@ endif
 ifdef INDEXER_EMPTY_BLOCKS_SANITIZER_BATCH_SIZE
     BLOCKSCOUT_CONTAINER_PARAMS += -e 'INDEXER_EMPTY_BLOCKS_SANITIZER_BATCH_SIZE=$(INDEXER_EMPTY_BLOCKS_SANITIZER_BATCH_SIZE)'
 endif
+ifdef INDEXER_TOKEN_CONCURRENCY
+    BLOCKSCOUT_CONTAINER_PARAMS += -e 'INDEXER_TOKEN_CONCURRENCY=$(INDEXER_TOKEN_CONCURRENCY)'
+endif
 ifdef INDEXER_TOKEN_BALANCES_BATCH_SIZE
     BLOCKSCOUT_CONTAINER_PARAMS += -e 'INDEXER_TOKEN_BALANCES_BATCH_SIZE=$(INDEXER_TOKEN_BALANCES_BATCH_SIZE)'
 endif
+ifdef INDEXER_TOKEN_BALANCES_CONCURRENCY
+    BLOCKSCOUT_CONTAINER_PARAMS += -e 'INDEXER_TOKEN_BALANCES_CONCURRENCY=$(INDEXER_TOKEN_BALANCES_CONCURRENCY)'
+endif
 ifdef INDEXER_REALTIME_FETCHER_MAX_GAP
     BLOCKSCOUT_CONTAINER_PARAMS += -e 'INDEXER_REALTIME_FETCHER_MAX_GAP=$(INDEXER_REALTIME_FETCHER_MAX_GAP)'
 endif

From ce02d3d28674d1fdf5a84ac340a80b467a3c05a0 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 10 Aug 2023 18:07:05 +0000
Subject: [PATCH 290/909] Bump sass from 1.64.2 to 1.65.1 in
 /apps/block_scout_web/assets

Bumps [sass](https://github.com/sass/dart-sass) from 1.64.2 to 1.65.1.
- [Release notes](https://github.com/sass/dart-sass/releases)
- [Changelog](https://github.com/sass/dart-sass/blob/main/CHANGELOG.md)
- [Commits](https://github.com/sass/dart-sass/compare/1.64.2...1.65.1)

---
updated-dependencies:
- dependency-name: sass
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 apps/block_scout_web/assets/package-lock.json | 14 +++++++-------
 apps/block_scout_web/assets/package.json      |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/apps/block_scout_web/assets/package-lock.json b/apps/block_scout_web/assets/package-lock.json
index faed39aa1ffc..d27f292ceb2f 100644
--- a/apps/block_scout_web/assets/package-lock.json
+++ b/apps/block_scout_web/assets/package-lock.json
@@ -89,7 +89,7 @@
         "mini-css-extract-plugin": "^2.7.6",
         "postcss": "^8.4.27",
         "postcss-loader": "^7.3.3",
-        "sass": "^1.64.2",
+        "sass": "^1.65.1",
         "sass-loader": "^13.3.2",
         "style-loader": "^3.3.3",
         "webpack": "^5.88.2",
@@ -14947,9 +14947,9 @@
       "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
     },
     "node_modules/sass": {
-      "version": "1.64.2",
-      "resolved": "https://registry.npmjs.org/sass/-/sass-1.64.2.tgz",
-      "integrity": "sha512-TnDlfc+CRnUAgLO9D8cQLFu/GIjJIzJCGkE7o4ekIGQOH7T3GetiRR/PsTWJUHhkzcSPrARkPI+gNWn5alCzDg==",
+      "version": "1.65.1",
+      "resolved": "https://registry.npmjs.org/sass/-/sass-1.65.1.tgz",
+      "integrity": "sha512-9DINwtHmA41SEd36eVPQ9BJKpn7eKDQmUHmpI0y5Zv2Rcorrh0zS+cFrt050hdNbmmCNKTW3hV5mWfuegNRsEA==",
       "dev": true,
       "dependencies": {
         "chokidar": ">=3.0.0 <4.0.0",
@@ -28783,9 +28783,9 @@
       "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
     },
     "sass": {
-      "version": "1.64.2",
-      "resolved": "https://registry.npmjs.org/sass/-/sass-1.64.2.tgz",
-      "integrity": "sha512-TnDlfc+CRnUAgLO9D8cQLFu/GIjJIzJCGkE7o4ekIGQOH7T3GetiRR/PsTWJUHhkzcSPrARkPI+gNWn5alCzDg==",
+      "version": "1.65.1",
+      "resolved": "https://registry.npmjs.org/sass/-/sass-1.65.1.tgz",
+      "integrity": "sha512-9DINwtHmA41SEd36eVPQ9BJKpn7eKDQmUHmpI0y5Zv2Rcorrh0zS+cFrt050hdNbmmCNKTW3hV5mWfuegNRsEA==",
       "dev": true,
       "requires": {
         "chokidar": ">=3.0.0 <4.0.0",
diff --git a/apps/block_scout_web/assets/package.json b/apps/block_scout_web/assets/package.json
index 3f798d666786..d174340fbe6b 100644
--- a/apps/block_scout_web/assets/package.json
+++ b/apps/block_scout_web/assets/package.json
@@ -101,7 +101,7 @@
     "mini-css-extract-plugin": "^2.7.6",
     "postcss": "^8.4.27",
     "postcss-loader": "^7.3.3",
-    "sass": "^1.64.2",
+    "sass": "^1.65.1",
     "sass-loader": "^13.3.2",
     "style-loader": "^3.3.3",
     "webpack": "^5.88.2",

From ee7e680fbdd8c42c34b62aa1f99bd83295b22f7b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 10 Aug 2023 18:07:19 +0000
Subject: [PATCH 291/909] Bump sweetalert2 from 11.7.20 to 11.7.22 in
 /apps/block_scout_web/assets

Bumps [sweetalert2](https://github.com/sweetalert2/sweetalert2) from 11.7.20 to 11.7.22.
- [Release notes](https://github.com/sweetalert2/sweetalert2/releases)
- [Changelog](https://github.com/sweetalert2/sweetalert2/blob/main/CHANGELOG.md)
- [Commits](https://github.com/sweetalert2/sweetalert2/compare/v11.7.20...v11.7.22)

---
updated-dependencies:
- dependency-name: sweetalert2
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 apps/block_scout_web/assets/package-lock.json | 14 +++++++-------
 apps/block_scout_web/assets/package.json      |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/apps/block_scout_web/assets/package-lock.json b/apps/block_scout_web/assets/package-lock.json
index faed39aa1ffc..eec1c65fce08 100644
--- a/apps/block_scout_web/assets/package-lock.json
+++ b/apps/block_scout_web/assets/package-lock.json
@@ -61,7 +61,7 @@
         "redux": "^4.2.1",
         "stream-browserify": "^3.0.0",
         "stream-http": "^3.1.1",
-        "sweetalert2": "^11.7.20",
+        "sweetalert2": "^11.7.22",
         "urijs": "^1.19.11",
         "url": "^0.11.1",
         "util": "^0.12.5",
@@ -15818,9 +15818,9 @@
       }
     },
     "node_modules/sweetalert2": {
-      "version": "11.7.20",
-      "resolved": "https://registry.npmjs.org/sweetalert2/-/sweetalert2-11.7.20.tgz",
-      "integrity": "sha512-GdU1TkiLpGGC0mcPV8bKmS7G0MR7caxambPkEU8zyepRSNR9EaEvIjNhX5QNkL0VFVzHbI3l12NtuEklkJ0D4Q==",
+      "version": "11.7.22",
+      "resolved": "https://registry.npmjs.org/sweetalert2/-/sweetalert2-11.7.22.tgz",
+      "integrity": "sha512-Xu5now8VnxBKtdnoQw562zXldCOJ/pNsFHTcmSGgJHH+702Bulh4Ps00/js9HqFv00mZ6Hf1wm4BXxqssWyREg==",
       "funding": {
         "type": "individual",
         "url": "https://github.com/sponsors/limonte"
@@ -29413,9 +29413,9 @@
       }
     },
     "sweetalert2": {
-      "version": "11.7.20",
-      "resolved": "https://registry.npmjs.org/sweetalert2/-/sweetalert2-11.7.20.tgz",
-      "integrity": "sha512-GdU1TkiLpGGC0mcPV8bKmS7G0MR7caxambPkEU8zyepRSNR9EaEvIjNhX5QNkL0VFVzHbI3l12NtuEklkJ0D4Q=="
+      "version": "11.7.22",
+      "resolved": "https://registry.npmjs.org/sweetalert2/-/sweetalert2-11.7.22.tgz",
+      "integrity": "sha512-Xu5now8VnxBKtdnoQw562zXldCOJ/pNsFHTcmSGgJHH+702Bulh4Ps00/js9HqFv00mZ6Hf1wm4BXxqssWyREg=="
     },
     "symbol-tree": {
       "version": "3.2.4",
diff --git a/apps/block_scout_web/assets/package.json b/apps/block_scout_web/assets/package.json
index 3f798d666786..5bc4c85b6794 100644
--- a/apps/block_scout_web/assets/package.json
+++ b/apps/block_scout_web/assets/package.json
@@ -73,7 +73,7 @@
     "redux": "^4.2.1",
     "stream-browserify": "^3.0.0",
     "stream-http": "^3.1.1",
-    "sweetalert2": "^11.7.20",
+    "sweetalert2": "^11.7.22",
     "urijs": "^1.19.11",
     "url": "^0.11.1",
     "util": "^0.12.5",

From 0693954092a3a5d0fe5eb471798bbc7edbdf4dfa Mon Sep 17 00:00:00 2001
From: nikitosing <32202610+nikitosing@users.noreply.github.com>
Date: Fri, 11 Aug 2023 13:20:33 +0300
Subject: [PATCH 292/909] Add is_verified_via_admin_panel property to tokens
 table (#8156)

* Add is_verified_via_admin_panel property to tokens table

* Add sorting by is_verified_via_admin_panel in search; Add in API v2 response is_verified_via_admin_panel field
---
 CHANGELOG.md                                  |  1 +
 .../controllers/api/v2/import_controller.ex   |  2 +-
 .../views/api/v2/search_view.ex               |  3 ++-
 .../api/v2/search_controller_test.exs         |  1 +
 apps/explorer/lib/explorer/chain.ex           | 22 +++++++++++++------
 apps/explorer/lib/explorer/chain/token.ex     |  7 ++++--
 ...134253_add_is_verified_via_admin_panel.exs |  9 ++++++++
 apps/explorer/test/support/factory.ex         |  3 ++-
 8 files changed, 36 insertions(+), 12 deletions(-)
 create mode 100644 apps/explorer/priv/repo/migrations/20230809134253_add_is_verified_via_admin_panel.exs

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6076326dae2c..9e8e60f94e3e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,7 @@
 
 ### Features
 
+- [#8156](https://github.com/blockscout/blockscout/pull/8156) - Add `is_verified_via_admin_panel` property to tokens table
 - [#8165](https://github.com/blockscout/blockscout/pull/8165) - Add broadcast of updated address_current_token_balances
 - [#7952](https://github.com/blockscout/blockscout/pull/7952) - Add parsing constructor arguments for sourcify contracts
 - [#6190](https://github.com/blockscout/blockscout/pull/6190) - Add EIP-1559 support to gas price oracle
diff --git a/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/import_controller.ex b/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/import_controller.ex
index 29175a1ad697..a89cbb323e74 100644
--- a/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/import_controller.ex
+++ b/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/import_controller.ex
@@ -18,7 +18,7 @@ defmodule BlockScoutWeb.API.V2.ImportController do
            {:format_address, Chain.string_to_address_hash(token_address_hash_string)},
          {:not_found, {:ok, token}} <- {:not_found, Chain.token_from_address_hash(address_hash, @api_true)},
          {:format_url, true} <- {:format_url, valid_url?(icon_url)} do
-      case token |> Token.changeset(%{icon_url: icon_url}) |> Repo.update() do
+      case token |> Token.changeset(%{icon_url: icon_url, is_verified_via_admin_panel: true}) |> Repo.update() do
         {:ok, _} ->
           conn
           |> put_view(ApiView)
diff --git a/apps/block_scout_web/lib/block_scout_web/views/api/v2/search_view.ex b/apps/block_scout_web/lib/block_scout_web/views/api/v2/search_view.ex
index 7b4f45cbb2da..91077ba84289 100644
--- a/apps/block_scout_web/lib/block_scout_web/views/api/v2/search_view.ex
+++ b/apps/block_scout_web/lib/block_scout_web/views/api/v2/search_view.ex
@@ -30,7 +30,8 @@ defmodule BlockScoutWeb.API.V2.SearchView do
       "exchange_rate" => search_result.exchange_rate && to_string(search_result.exchange_rate),
       "total_supply" => search_result.total_supply,
       "circulating_market_cap" =>
-        search_result.circulating_market_cap && to_string(search_result.circulating_market_cap)
+        search_result.circulating_market_cap && to_string(search_result.circulating_market_cap),
+      "is_verified_via_admin_panel" => search_result.is_verified_via_admin_panel
     }
   end
 
diff --git a/apps/block_scout_web/test/block_scout_web/controllers/api/v2/search_controller_test.exs b/apps/block_scout_web/test/block_scout_web/controllers/api/v2/search_controller_test.exs
index e9dda32b848e..fc19b050d089 100644
--- a/apps/block_scout_web/test/block_scout_web/controllers/api/v2/search_controller_test.exs
+++ b/apps/block_scout_web/test/block_scout_web/controllers/api/v2/search_controller_test.exs
@@ -135,6 +135,7 @@ defmodule BlockScoutWeb.API.V2.SearchControllerTest do
       assert item["exchange_rate"] == (token.fiat_value && to_string(token.fiat_value))
       assert item["total_supply"] == to_string(token.total_supply)
       assert item["icon_url"] == token.icon_url
+      assert item["is_verified_via_admin_panel"] == token.is_verified_via_admin_panel
     end
 
     test "search transaction", %{conn: conn} do
diff --git a/apps/explorer/lib/explorer/chain.ex b/apps/explorer/lib/explorer/chain.ex
index 5ee7d0c7306e..9d59ec5ed1f6 100644
--- a/apps/explorer/lib/explorer/chain.ex
+++ b/apps/explorer/lib/explorer/chain.ex
@@ -1516,7 +1516,8 @@ defmodule Explorer.Chain do
         exchange_rate: nil,
         total_supply: nil,
         circulating_market_cap: nil,
-        priority: 1
+        priority: 1,
+        is_verified_via_admin_panel: nil
       }
     )
   end
@@ -1543,7 +1544,8 @@ defmodule Explorer.Chain do
         exchange_rate: token.fiat_value,
         total_supply: token.total_supply,
         circulating_market_cap: token.circulating_market_cap,
-        priority: 0
+        priority: 0,
+        is_verified_via_admin_panel: token.is_verified_via_admin_panel
       }
     )
   end
@@ -1570,7 +1572,8 @@ defmodule Explorer.Chain do
         exchange_rate: nil,
         total_supply: nil,
         circulating_market_cap: nil,
-        priority: 0
+        priority: 0,
+        is_verified_via_admin_panel: nil
       }
     )
   end
@@ -1606,7 +1609,8 @@ defmodule Explorer.Chain do
             exchange_rate: nil,
             total_supply: nil,
             circulating_market_cap: nil,
-            priority: 0
+            priority: 0,
+            is_verified_via_admin_panel: nil
           }
         )
 
@@ -1639,7 +1643,8 @@ defmodule Explorer.Chain do
             exchange_rate: nil,
             total_supply: nil,
             circulating_market_cap: nil,
-            priority: 0
+            priority: 0,
+            is_verified_via_admin_panel: nil
           }
         )
 
@@ -1670,7 +1675,8 @@ defmodule Explorer.Chain do
             exchange_rate: nil,
             total_supply: nil,
             circulating_market_cap: nil,
-            priority: 0
+            priority: 0,
+            is_verified_via_admin_panel: nil
           }
         )
 
@@ -1696,7 +1702,8 @@ defmodule Explorer.Chain do
                 exchange_rate: nil,
                 total_supply: nil,
                 circulating_market_cap: nil,
-                priority: 0
+                priority: 0,
+                is_verified_via_admin_panel: nil
               }
             )
 
@@ -1750,6 +1757,7 @@ defmodule Explorer.Chain do
               desc: items.priority,
               desc_nulls_last: items.circulating_market_cap,
               desc_nulls_last: items.exchange_rate,
+              desc_nulls_last: items.is_verified_via_admin_panel,
               desc_nulls_last: items.holder_count,
               asc: items.name,
               desc: items.inserted_at
diff --git a/apps/explorer/lib/explorer/chain/token.ex b/apps/explorer/lib/explorer/chain/token.ex
index b59f6ef2de5d..2bdc6c40d062 100644
--- a/apps/explorer/lib/explorer/chain/token.ex
+++ b/apps/explorer/lib/explorer/chain/token.ex
@@ -41,6 +41,7 @@ defmodule Explorer.Chain.Token do
   * `fiat_value` - The price of a token in a configured currency (USD by default).
   * `circulating_market_cap` - The circulating market cap of a token in a configured currency (USD by default).
   * `icon_url` - URL of the token's icon.
+  * `is_verified_via_admin_panel` - is token verified via admin panel.
   """
   @type t :: %Token{
           name: String.t(),
@@ -56,7 +57,8 @@ defmodule Explorer.Chain.Token do
           total_supply_updated_at_block: non_neg_integer() | nil,
           fiat_value: Decimal.t() | nil,
           circulating_market_cap: Decimal.t() | nil,
-          icon_url: String.t()
+          icon_url: String.t(),
+          is_verified_via_admin_panel: boolean()
         }
 
   @derive {Poison.Encoder,
@@ -89,6 +91,7 @@ defmodule Explorer.Chain.Token do
     field(:fiat_value, :decimal)
     field(:circulating_market_cap, :decimal)
     field(:icon_url, :string)
+    field(:is_verified_via_admin_panel, :boolean)
 
     belongs_to(
       :contract_address,
@@ -103,7 +106,7 @@ defmodule Explorer.Chain.Token do
   end
 
   @required_attrs ~w(contract_address_hash type)a
-  @optional_attrs ~w(cataloged decimals name symbol total_supply skip_metadata total_supply_updated_at_block updated_at fiat_value circulating_market_cap icon_url)a
+  @optional_attrs ~w(cataloged decimals name symbol total_supply skip_metadata total_supply_updated_at_block updated_at fiat_value circulating_market_cap icon_url is_verified_via_admin_panel)a
 
   @doc false
   def changeset(%Token{} = token, params \\ %{}) do
diff --git a/apps/explorer/priv/repo/migrations/20230809134253_add_is_verified_via_admin_panel.exs b/apps/explorer/priv/repo/migrations/20230809134253_add_is_verified_via_admin_panel.exs
new file mode 100644
index 000000000000..1cfa57cb6fca
--- /dev/null
+++ b/apps/explorer/priv/repo/migrations/20230809134253_add_is_verified_via_admin_panel.exs
@@ -0,0 +1,9 @@
+defmodule Explorer.Repo.Migrations.AddIsVerifiedViaAdminPanel do
+  use Ecto.Migration
+
+  def change do
+    alter table(:tokens) do
+      add(:is_verified_via_admin_panel, :boolean, null: true, default: false)
+    end
+  end
+end
diff --git a/apps/explorer/test/support/factory.ex b/apps/explorer/test/support/factory.ex
index 9c33824972eb..c46fb36e3fb7 100644
--- a/apps/explorer/test/support/factory.ex
+++ b/apps/explorer/test/support/factory.ex
@@ -656,7 +656,8 @@ defmodule Explorer.Factory do
       type: "ERC-20",
       cataloged: true,
       icon_url: sequence("https://example.com/icon"),
-      fiat_value: 10.1
+      fiat_value: 10.1,
+      is_verified_via_admin_panel: Enum.random([true, false])
     }
   end
 

From 2e1dcd7c33d468061094e2da491c7669021bb42b Mon Sep 17 00:00:00 2001
From: Viktor Baranov <baranov.viktor.27@gmail.com>
Date: Fri, 11 Aug 2023 15:38:41 +0300
Subject: [PATCH 293/909] Update frontend envs in order to pass their
 validation

---
 CHANGELOG.md                            | 1 +
 docker-compose/envs/common-frontend.env | 7 +------
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9e8e60f94e3e..9d3c2400dda7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -23,6 +23,7 @@
 
 ### Chore
 
+- [#8183](https://github.com/blockscout/blockscout/pull/8183) - Update frontend envs in order to pass their validation
 - [#8167](https://github.com/blockscout/blockscout/pull/8167) - Manage concurrency for Token and TokenBalance fetcher
 - [#8146](https://github.com/blockscout/blockscout/pull/8146) - Add method_id to write methods in API v2 response
 - [#8105](https://github.com/blockscout/blockscout/pull/8105) - Extend API v1 with endpoints used by new UI
diff --git a/docker-compose/envs/common-frontend.env b/docker-compose/envs/common-frontend.env
index 84da58952bc6..81a4731b72bf 100644
--- a/docker-compose/envs/common-frontend.env
+++ b/docker-compose/envs/common-frontend.env
@@ -4,23 +4,18 @@ NEXT_PUBLIC_API_PROTOCOL=http
 NEXT_PUBLIC_STATS_API_HOST=http://localhost:82
 NEXT_PUBLIC_NETWORK_NAME=Göerli
 NEXT_PUBLIC_NETWORK_SHORT_NAME=Göerli
-NEXT_PUBLIC_NETWORK_ASSETS_PATHNAME=ethereum
 NEXT_PUBLIC_NETWORK_ID=5
 NEXT_PUBLIC_NETWORK_CURRENCY_NAME=Ether
 NEXT_PUBLIC_NETWORK_CURRENCY_SYMBOL=ETH
 NEXT_PUBLIC_NETWORK_CURRENCY_DECIMALS=18
 NEXT_PUBLIC_API_BASE_PATH=/
 NEXT_PUBLIC_FEATURED_NETWORKS=https://raw.githubusercontent.com/blockscout/frontend-configs/main/configs/featured-networks/eth-goerli.json
-NEXT_PUBLIC_FOOTER_GITHUB_LINK=https://github.com/blockscout/blockscout
-NEXT_PUBLIC_FOOTER_TWITTER_LINK=https://www.twitter.com/blockscoutcom
-NEXT_PUBLIC_APP_ENV=staging
-NEXT_PUBLIC_APP_INSTANCE=eth_goerli
 NEXT_PUBLIC_APP_HOST=localhost
 NEXT_PUBLIC_HOMEPAGE_CHARTS="['daily_txs']"
 NEXT_PUBLIC_VISUALIZE_API_HOST=http://visualizer:80
 NEXT_PUBLIC_IS_TESTNET='true'
 NEXT_PUBLIC_NETWORK_LOGO=https://raw.githubusercontent.com/blockscout/frontend-configs/main/configs/network-logos/goerli.svg
 NEXT_PUBLIC_NETWORK_ICON=https://raw.githubusercontent.com/blockscout/frontend-configs/main/configs/network-icons/goerli.svg
-NEXT_PUBLIC_HOMEPAGE_PLATE_GRADIENT="radial-gradient(103.03% 103.03% at 0% 0%, rgba(183, 148, 244, 0.8) 0%, rgba(0, 163, 196, 0.8) 100%)"
+NEXT_PUBLIC_HOMEPAGE_PLATE_BACKGROUND="radial-gradient(103.03% 103.03% at 0% 0%, rgba(183, 148, 244, 0.8) 0%, rgba(0, 163, 196, 0.8) 100%)"
 NEXT_PUBLIC_HOMEPAGE_PLATE_TEXT_COLOR="rgb(255, 255, 255)"
 NEXT_PUBLIC_API_WEBSOCKET_PROTOCOL='ws'

From e3205029c0c1d8a227a278941e57c7342f50fa0e Mon Sep 17 00:00:00 2001
From: Nick Zenchik <65654967+nzenchik@users.noreply.github.com>
Date: Fri, 11 Aug 2023 17:16:07 +0300
Subject: [PATCH 294/909] Enhance nginx config (#8179)

* Nginx config for frontend and backend in docker-compose

* Adding external frontend compatibility

* Adding l2 routes to nginx

* Fixing stats and account not working in docker-compose

* Fixing frontend custom url in docker-compose

* Fixing ws and stats v2

* Fixing frontend address in docker-compose

* Add CHANGELOG

---------

Co-authored-by: Viktor Baranov <baranov.viktor.27@gmail.com>
---
 CHANGELOG.md                                  |  1 +
 docker-compose/envs/common-frontend.env       |  4 +-
 docker-compose/proxy/default.conf.template    | 91 +++++++++----------
 .../services/docker-compose-nginx.yml         |  5 +-
 4 files changed, 49 insertions(+), 52 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9d3c2400dda7..d6acbe747062 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -25,6 +25,7 @@
 
 - [#8183](https://github.com/blockscout/blockscout/pull/8183) - Update frontend envs in order to pass their validation
 - [#8167](https://github.com/blockscout/blockscout/pull/8167) - Manage concurrency for Token and TokenBalance fetcher
+- [#8179](https://github.com/blockscout/blockscout/pull/8179) - Enhance nginx config
 - [#8146](https://github.com/blockscout/blockscout/pull/8146) - Add method_id to write methods in API v2 response
 - [#8105](https://github.com/blockscout/blockscout/pull/8105) - Extend API v1 with endpoints used by new UI
 - [#8104](https://github.com/blockscout/blockscout/pull/8104) - remove "TODO" from API v2 response
diff --git a/docker-compose/envs/common-frontend.env b/docker-compose/envs/common-frontend.env
index 81a4731b72bf..4ebd7d9d00fb 100644
--- a/docker-compose/envs/common-frontend.env
+++ b/docker-compose/envs/common-frontend.env
@@ -1,7 +1,6 @@
 NEXT_PUBLIC_API_HOST=localhost
-NEXT_PUBLIC_API_PORT=81
 NEXT_PUBLIC_API_PROTOCOL=http
-NEXT_PUBLIC_STATS_API_HOST=http://localhost:82
+NEXT_PUBLIC_STATS_API_HOST=http://localhost:8080
 NEXT_PUBLIC_NETWORK_NAME=Göerli
 NEXT_PUBLIC_NETWORK_SHORT_NAME=Göerli
 NEXT_PUBLIC_NETWORK_ID=5
@@ -11,6 +10,7 @@ NEXT_PUBLIC_NETWORK_CURRENCY_DECIMALS=18
 NEXT_PUBLIC_API_BASE_PATH=/
 NEXT_PUBLIC_FEATURED_NETWORKS=https://raw.githubusercontent.com/blockscout/frontend-configs/main/configs/featured-networks/eth-goerli.json
 NEXT_PUBLIC_APP_HOST=localhost
+NEXT_PUBLIC_APP_PROTOCOL=http
 NEXT_PUBLIC_HOMEPAGE_CHARTS="['daily_txs']"
 NEXT_PUBLIC_VISUALIZE_API_HOST=http://visualizer:80
 NEXT_PUBLIC_IS_TESTNET='true'
diff --git a/docker-compose/proxy/default.conf.template b/docker-compose/proxy/default.conf.template
index 47a7b7131a8b..5d2fa0a490e0 100644
--- a/docker-compose/proxy/default.conf.template
+++ b/docker-compose/proxy/default.conf.template
@@ -1,54 +1,50 @@
-server {
-    listen       80;
-    server_name  localhost;
-    proxy_http_version 1.1;
-    location / {
-        proxy_pass          ${FRONT_PROXY_PASS};
-    }
-    location /socket/v2 {
-        proxy_pass http://backend:4000;
-        proxy_http_version 1.1;
-        proxy_set_header Upgrade $http_upgrade;
-        proxy_set_header Connection "Upgrade";
-        proxy_set_header Host $host;
-    }
-    location /api/ {
-        proxy_pass          http://backend:4000/api;
-    }
+map $http_upgrade $connection_upgrade {
+
+  default upgrade;
+  ''      close;
 }
 
 server {
-    listen       81;
+    listen       80;
     server_name  localhost;
     proxy_http_version 1.1;
-    proxy_hide_header Access-Control-Allow-Origin;
-    proxy_hide_header Access-Control-Allow-Methods;
-    add_header 'Access-Control-Allow-Origin' 'http://localhost' always;
-    add_header 'Access-Control-Allow-Methods' 'PUT, GET, POST, OPTIONS, DELETE, PATCH' always;
 
     location / {
-        proxy_pass          http://backend:4000;
+        proxy_pass            http://backend:4000;
+        proxy_http_version    1.1;
+        proxy_set_header      Host "$host";
+        proxy_set_header      X-Real-IP "$remote_addr";
+        proxy_set_header      X-Forwarded-For "$proxy_add_x_forwarded_for";
+        proxy_set_header      X-Forwarded-Proto "$scheme";
+        proxy_set_header      Upgrade "$http_upgrade";
+        proxy_set_header      Connection $connection_upgrade;
+        proxy_cache_bypass    $http_upgrade;
     }
-
-    location /auth {
-        proxy_pass http://backend:4000;
-        proxy_http_version 1.1;
-        proxy_set_header Upgrade $http_upgrade;
-        proxy_set_header Connection "Upgrade";
-        proxy_set_header Host $host;
+    location = / {
+        proxy_pass            ${FRONT_PROXY_PASS};
+        proxy_http_version    1.1;
+        proxy_set_header      Host "$host";
+        proxy_set_header      X-Real-IP "$remote_addr";
+        proxy_set_header      X-Forwarded-For "$proxy_add_x_forwarded_for";
+        proxy_set_header      X-Forwarded-Proto "$scheme";
+        proxy_set_header      Upgrade "$http_upgrade";
+        proxy_set_header      Connection $connection_upgrade;
+        proxy_cache_bypass    $http_upgrade;
     }
-
-    location /socket {
-        proxy_pass http://backend:4000;
-        proxy_http_version 1.1;
-        proxy_set_header Upgrade $http_upgrade;
-        proxy_set_header Connection "Upgrade";
-        proxy_set_header Host $host;
+    location ~ ^/(_next|node-api|apps|account|accounts|static|auth/profile|auth/unverified-email|txs|tx|blocks|block|login|address|stats|search-results|token|tokens|visualize|api-docs|csv-export|verified-contracts|graphiql|withdrawals) {
+        proxy_pass            ${FRONT_PROXY_PASS};
+        proxy_http_version    1.1;
+        proxy_set_header      Host "$host";
+        proxy_set_header      X-Real-IP "$remote_addr";
+        proxy_set_header      X-Forwarded-For "$proxy_add_x_forwarded_for";
+        proxy_set_header      X-Forwarded-Proto "$scheme";
+        proxy_set_header      Upgrade "$http_upgrade";
+        proxy_set_header      Connection $connection_upgrade;
+        proxy_cache_bypass    $http_upgrade;
     }
 }
-
 server {
-    listen       82;
+    listen       8080;
     server_name  localhost;
     proxy_http_version 1.1;
     proxy_hide_header Access-Control-Allow-Origin;
@@ -58,13 +54,14 @@ server {
     add_header 'Access-Control-Allow-Methods' 'PUT, GET, POST, OPTIONS, DELETE, PATCH' always;
 
     location / {
-        proxy_pass          http://stats:8050;
-    }
-    location /socket/v2 {
-        proxy_pass http://backend:4000;
-        proxy_http_version 1.1;
-        proxy_set_header Upgrade $http_upgrade;
-        proxy_set_header Connection "Upgrade";
-        proxy_set_header Host $host;
+        proxy_pass            http://stats:8050;
+        proxy_http_version    1.1;
+        proxy_set_header      Host "$host";
+        proxy_set_header      X-Real-IP "$remote_addr";
+        proxy_set_header      X-Forwarded-For "$proxy_add_x_forwarded_for";
+        proxy_set_header      X-Forwarded-Proto "$scheme";
+        proxy_set_header      Upgrade "$http_upgrade";
+        proxy_set_header      Connection $connection_upgrade;
+        proxy_cache_bypass    $http_upgrade;
     }
 }
\ No newline at end of file
diff --git a/docker-compose/services/docker-compose-nginx.yml b/docker-compose/services/docker-compose-nginx.yml
index 9ff76f5a173e..c5c005b4b2db 100644
--- a/docker-compose/services/docker-compose-nginx.yml
+++ b/docker-compose/services/docker-compose-nginx.yml
@@ -1,6 +1,6 @@
 version: '3.8'
 
-services:  
+services:
   proxy:
     image: nginx
     container_name: proxy
@@ -12,5 +12,4 @@ services:
       FRONT_PROXY_PASS: ${FRONT_PROXY_PASS:-http://frontend:3000}
     ports:
       - 80:80
-      - 81:81
-      - 82:82
\ No newline at end of file
+      - 8080:8080

From 319f8c4c45d44d5ffb9f00131a624be4e7713d64 Mon Sep 17 00:00:00 2001
From: Viktor Baranov <baranov.viktor.27@gmail.com>
Date: Fri, 11 Aug 2023 18:22:15 +0300
Subject: [PATCH 295/909] API v1 500 error convert to 404, if just path is
 incorrect

---
 CHANGELOG.md                                         |  1 +
 .../controllers/api/rpc/rpc_translator.ex            | 12 ++++++++++--
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d6acbe747062..569c081ef3b9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -57,6 +57,7 @@
 
 ### Fixes
 
+- [#8187](https://github.com/blockscout/blockscout/pull/8187) - API v1 500 error convert to 404, if requested path is incorrect
 - [#7852](https://github.com/blockscout/blockscout/pull/7852) - Token balances refactoring & fixes
 - [#7872](https://github.com/blockscout/blockscout/pull/7872) - Fix pending gas price in pending tx
 - [#7875](https://github.com/blockscout/blockscout/pull/7875) - Fix twin compiler version
diff --git a/apps/block_scout_web/lib/block_scout_web/controllers/api/rpc/rpc_translator.ex b/apps/block_scout_web/lib/block_scout_web/controllers/api/rpc/rpc_translator.ex
index 53a5ec3add25..b27554eed39b 100644
--- a/apps/block_scout_web/lib/block_scout_web/controllers/api/rpc/rpc_translator.ex
+++ b/apps/block_scout_web/lib/block_scout_web/controllers/api/rpc/rpc_translator.ex
@@ -29,7 +29,7 @@ defmodule BlockScoutWeb.API.RPC.RPCTranslator do
   end
 
   def call(%Conn{params: %{"module" => module, "action" => action}} = conn, translations) do
-    with true <- valid_api_request_path(conn),
+    with {:valid_api_request, true} <- {:valid_api_request, valid_api_request_path(conn)},
          {:ok, {controller, write_actions}} <- translate_module(translations, module),
          {:ok, action} <- translate_action(action),
          true <- action_accessed?(action, write_actions),
@@ -58,6 +58,13 @@ defmodule BlockScoutWeb.API.RPC.RPCTranslator do
       :rate_limit_reached ->
         AccessHelper.handle_rate_limit_deny(conn)
 
+      {:valid_api_request, false} ->
+        conn
+        |> put_status(404)
+        |> put_view(RPCView)
+        |> Controller.render(:error, error: "Not found")
+        |> halt()
+
       _ ->
         conn
         |> put_status(500)
@@ -119,7 +126,8 @@ defmodule BlockScoutWeb.API.RPC.RPCTranslator do
   end
 
   defp valid_api_request_path(conn) do
-    if conn.request_path == "/api" || conn.request_path == "/api/v1" do
+    if conn.request_path == "/api" || conn.request_path == "/api/" || conn.request_path == "/api/v1" ||
+         conn.request_path == "/api/v1/" do
       true
     else
       false

From 3cc9d35250237de593c53ae840e12cf06b034f14 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 11 Aug 2023 18:49:15 +0000
Subject: [PATCH 296/909] Bump eslint from 8.46.0 to 8.47.0 in
 /apps/block_scout_web/assets

Bumps [eslint](https://github.com/eslint/eslint) from 8.46.0 to 8.47.0.
- [Release notes](https://github.com/eslint/eslint/releases)
- [Changelog](https://github.com/eslint/eslint/blob/main/CHANGELOG.md)
- [Commits](https://github.com/eslint/eslint/compare/v8.46.0...v8.47.0)

---
updated-dependencies:
- dependency-name: eslint
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 apps/block_scout_web/assets/package-lock.json | 74 +++++++++----------
 apps/block_scout_web/assets/package.json      |  2 +-
 2 files changed, 38 insertions(+), 38 deletions(-)

diff --git a/apps/block_scout_web/assets/package-lock.json b/apps/block_scout_web/assets/package-lock.json
index 3a31234efb68..848ae854eeee 100644
--- a/apps/block_scout_web/assets/package-lock.json
+++ b/apps/block_scout_web/assets/package-lock.json
@@ -78,7 +78,7 @@
         "copy-webpack-plugin": "^11.0.0",
         "css-loader": "^5.2.7",
         "css-minimizer-webpack-plugin": "^5.0.1",
-        "eslint": "^8.46.0",
+        "eslint": "^8.47.0",
         "eslint-config-standard": "^17.1.0",
         "eslint-plugin-import": "^2.28.0",
         "eslint-plugin-node": "^11.1.0",
@@ -2033,9 +2033,9 @@
       }
     },
     "node_modules/@eslint/eslintrc": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.1.1.tgz",
-      "integrity": "sha512-9t7ZA7NGGK8ckelF0PQCfcxIUzs1Md5rrO6U/c+FIQNanea5UZC0wqKXH4vHBccmu4ZJgZ2idtPeW7+Q2npOEA==",
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.1.2.tgz",
+      "integrity": "sha512-+wvgpDsrB1YqAMdEUCcnTlpfVBH7Vqn6A/NT3D8WVXFIaKMlErPIZT3oCIAVCOtarRpMtelZLqJeU3t7WY6X6g==",
       "dev": true,
       "dependencies": {
         "ajv": "^6.12.4",
@@ -2062,9 +2062,9 @@
       "dev": true
     },
     "node_modules/@eslint/eslintrc/node_modules/globals": {
-      "version": "13.20.0",
-      "resolved": "https://registry.npmjs.org/globals/-/globals-13.20.0.tgz",
-      "integrity": "sha512-Qg5QtVkCy/kv3FUSlu4ukeZDVf9ee0iXLAUYX13gbR17bnejFTzr4iS9bY7kwCf1NztRNm1t91fjOiyx4CSwPQ==",
+      "version": "13.21.0",
+      "resolved": "https://registry.npmjs.org/globals/-/globals-13.21.0.tgz",
+      "integrity": "sha512-ybyme3s4yy/t/3s35bewwXKOf7cvzfreG2lH0lZl0JB7I4GxRP2ghxOK/Nb9EkRXdbBXZLfq/p/0W2JUONB/Gg==",
       "dev": true,
       "dependencies": {
         "type-fest": "^0.20.2"
@@ -2101,9 +2101,9 @@
       }
     },
     "node_modules/@eslint/js": {
-      "version": "8.46.0",
-      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.46.0.tgz",
-      "integrity": "sha512-a8TLtmPi8xzPkCbp/OGFUo5yhRkHM2Ko9kOWP4znJr0WAhWyThaw3PnwX4vOTWOAMsV2uRt32PPDcEz63esSaA==",
+      "version": "8.47.0",
+      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.47.0.tgz",
+      "integrity": "sha512-P6omY1zv5MItm93kLM8s2vr1HICJH8v0dvddDhysbIuZ+vcjOHg5Zbkf1mTkcmi2JA9oBG2anOkRnW8WJTS8Og==",
       "dev": true,
       "engines": {
         "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
@@ -7083,15 +7083,15 @@
       }
     },
     "node_modules/eslint": {
-      "version": "8.46.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.46.0.tgz",
-      "integrity": "sha512-cIO74PvbW0qU8e0mIvk5IV3ToWdCq5FYG6gWPHHkx6gNdjlbAYvtfHmlCMXxjcoVaIdwy/IAt3+mDkZkfvb2Dg==",
+      "version": "8.47.0",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.47.0.tgz",
+      "integrity": "sha512-spUQWrdPt+pRVP1TTJLmfRNJJHHZryFmptzcafwSvHsceV81djHOdnEeDmkdotZyLNjDhrOasNK8nikkoG1O8Q==",
       "dev": true,
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.2.0",
         "@eslint-community/regexpp": "^4.6.1",
-        "@eslint/eslintrc": "^2.1.1",
-        "@eslint/js": "^8.46.0",
+        "@eslint/eslintrc": "^2.1.2",
+        "@eslint/js": "^8.47.0",
         "@humanwhocodes/config-array": "^0.11.10",
         "@humanwhocodes/module-importer": "^1.0.1",
         "@nodelib/fs.walk": "^1.2.8",
@@ -7102,7 +7102,7 @@
         "doctrine": "^3.0.0",
         "escape-string-regexp": "^4.0.0",
         "eslint-scope": "^7.2.2",
-        "eslint-visitor-keys": "^3.4.2",
+        "eslint-visitor-keys": "^3.4.3",
         "espree": "^9.6.1",
         "esquery": "^1.4.2",
         "esutils": "^2.0.2",
@@ -7444,9 +7444,9 @@
       }
     },
     "node_modules/eslint-visitor-keys": {
-      "version": "3.4.2",
-      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.2.tgz",
-      "integrity": "sha512-8drBzUEyZ2llkpCA67iYrgEssKDUu68V8ChqqOfFupIaG/LCVPUT+CoGJpT77zJprs4T/W7p07LP7zAIMuweVw==",
+      "version": "3.4.3",
+      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz",
+      "integrity": "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==",
       "dev": true,
       "engines": {
         "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
@@ -18947,9 +18947,9 @@
       "dev": true
     },
     "@eslint/eslintrc": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.1.1.tgz",
-      "integrity": "sha512-9t7ZA7NGGK8ckelF0PQCfcxIUzs1Md5rrO6U/c+FIQNanea5UZC0wqKXH4vHBccmu4ZJgZ2idtPeW7+Q2npOEA==",
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.1.2.tgz",
+      "integrity": "sha512-+wvgpDsrB1YqAMdEUCcnTlpfVBH7Vqn6A/NT3D8WVXFIaKMlErPIZT3oCIAVCOtarRpMtelZLqJeU3t7WY6X6g==",
       "dev": true,
       "requires": {
         "ajv": "^6.12.4",
@@ -18970,9 +18970,9 @@
           "dev": true
         },
         "globals": {
-          "version": "13.20.0",
-          "resolved": "https://registry.npmjs.org/globals/-/globals-13.20.0.tgz",
-          "integrity": "sha512-Qg5QtVkCy/kv3FUSlu4ukeZDVf9ee0iXLAUYX13gbR17bnejFTzr4iS9bY7kwCf1NztRNm1t91fjOiyx4CSwPQ==",
+          "version": "13.21.0",
+          "resolved": "https://registry.npmjs.org/globals/-/globals-13.21.0.tgz",
+          "integrity": "sha512-ybyme3s4yy/t/3s35bewwXKOf7cvzfreG2lH0lZl0JB7I4GxRP2ghxOK/Nb9EkRXdbBXZLfq/p/0W2JUONB/Gg==",
           "dev": true,
           "requires": {
             "type-fest": "^0.20.2"
@@ -18996,9 +18996,9 @@
       }
     },
     "@eslint/js": {
-      "version": "8.46.0",
-      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.46.0.tgz",
-      "integrity": "sha512-a8TLtmPi8xzPkCbp/OGFUo5yhRkHM2Ko9kOWP4znJr0WAhWyThaw3PnwX4vOTWOAMsV2uRt32PPDcEz63esSaA==",
+      "version": "8.47.0",
+      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.47.0.tgz",
+      "integrity": "sha512-P6omY1zv5MItm93kLM8s2vr1HICJH8v0dvddDhysbIuZ+vcjOHg5Zbkf1mTkcmi2JA9oBG2anOkRnW8WJTS8Og==",
       "dev": true
     },
     "@ethereumjs/common": {
@@ -22808,15 +22808,15 @@
       }
     },
     "eslint": {
-      "version": "8.46.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.46.0.tgz",
-      "integrity": "sha512-cIO74PvbW0qU8e0mIvk5IV3ToWdCq5FYG6gWPHHkx6gNdjlbAYvtfHmlCMXxjcoVaIdwy/IAt3+mDkZkfvb2Dg==",
+      "version": "8.47.0",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.47.0.tgz",
+      "integrity": "sha512-spUQWrdPt+pRVP1TTJLmfRNJJHHZryFmptzcafwSvHsceV81djHOdnEeDmkdotZyLNjDhrOasNK8nikkoG1O8Q==",
       "dev": true,
       "requires": {
         "@eslint-community/eslint-utils": "^4.2.0",
         "@eslint-community/regexpp": "^4.6.1",
-        "@eslint/eslintrc": "^2.1.1",
-        "@eslint/js": "^8.46.0",
+        "@eslint/eslintrc": "^2.1.2",
+        "@eslint/js": "^8.47.0",
         "@humanwhocodes/config-array": "^0.11.10",
         "@humanwhocodes/module-importer": "^1.0.1",
         "@nodelib/fs.walk": "^1.2.8",
@@ -22827,7 +22827,7 @@
         "doctrine": "^3.0.0",
         "escape-string-regexp": "^4.0.0",
         "eslint-scope": "^7.2.2",
-        "eslint-visitor-keys": "^3.4.2",
+        "eslint-visitor-keys": "^3.4.3",
         "espree": "^9.6.1",
         "esquery": "^1.4.2",
         "esutils": "^2.0.2",
@@ -23202,9 +23202,9 @@
       }
     },
     "eslint-visitor-keys": {
-      "version": "3.4.2",
-      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.2.tgz",
-      "integrity": "sha512-8drBzUEyZ2llkpCA67iYrgEssKDUu68V8ChqqOfFupIaG/LCVPUT+CoGJpT77zJprs4T/W7p07LP7zAIMuweVw==",
+      "version": "3.4.3",
+      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz",
+      "integrity": "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==",
       "dev": true
     },
     "espree": {
diff --git a/apps/block_scout_web/assets/package.json b/apps/block_scout_web/assets/package.json
index af6b377adb43..49f2d87b1200 100644
--- a/apps/block_scout_web/assets/package.json
+++ b/apps/block_scout_web/assets/package.json
@@ -90,7 +90,7 @@
     "copy-webpack-plugin": "^11.0.0",
     "css-loader": "^5.2.7",
     "css-minimizer-webpack-plugin": "^5.0.1",
-    "eslint": "^8.46.0",
+    "eslint": "^8.47.0",
     "eslint-config-standard": "^17.1.0",
     "eslint-plugin-import": "^2.28.0",
     "eslint-plugin-node": "^11.1.0",

From bd5b657a8b71195c427183bba31a0637b3491c86 Mon Sep 17 00:00:00 2001
From: Nikita Pozdniakov <nikitosing4@mail.ru>
Date: Mon, 14 Aug 2023 13:38:06 +0300
Subject: [PATCH 297/909] Revert changing /socket/v2 timeout

---
 CHANGELOG.md                                         | 2 +-
 apps/block_scout_web/lib/block_scout_web/endpoint.ex | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 569c081ef3b9..fffe6720d208 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,7 +5,7 @@
 ### Features
 
 - [#8156](https://github.com/blockscout/blockscout/pull/8156) - Add `is_verified_via_admin_panel` property to tokens table
-- [#8165](https://github.com/blockscout/blockscout/pull/8165) - Add broadcast of updated address_current_token_balances
+- [#8165](https://github.com/blockscout/blockscout/pull/8165), [#8201](https://github.com/blockscout/blockscout/pull/8201) - Add broadcast of updated address_current_token_balances
 - [#7952](https://github.com/blockscout/blockscout/pull/7952) - Add parsing constructor arguments for sourcify contracts
 - [#6190](https://github.com/blockscout/blockscout/pull/6190) - Add EIP-1559 support to gas price oracle
 - [#7977](https://github.com/blockscout/blockscout/pull/7977) - GraphQL: extend schema with new field for existing objects
diff --git a/apps/block_scout_web/lib/block_scout_web/endpoint.ex b/apps/block_scout_web/lib/block_scout_web/endpoint.ex
index 900c6c406d31..9036939eb195 100644
--- a/apps/block_scout_web/lib/block_scout_web/endpoint.ex
+++ b/apps/block_scout_web/lib/block_scout_web/endpoint.ex
@@ -7,7 +7,7 @@ defmodule BlockScoutWeb.Endpoint do
   end
 
   socket("/socket", BlockScoutWeb.UserSocket, websocket: [timeout: 45_000])
-  socket("/socket/v2", BlockScoutWeb.UserSocketV2, websocket: [timeout: :infinity])
+  socket("/socket/v2", BlockScoutWeb.UserSocketV2, websocket: [timeout: 45_000])
 
   # Serve at "/" the static files from "priv/static" directory.
   #

From 2018b48e971b53c169e4966fbe63c6b28eb62007 Mon Sep 17 00:00:00 2001
From: Nikita Pozdniakov <nikitosing4@mail.ru>
Date: Fri, 11 Aug 2023 13:30:36 +0300
Subject: [PATCH 298/909] Refactor address counter functions

---
 .github/workflows/config.yml                  |  28 +-
 CHANGELOG.md                                  |   1 +
 .../controllers/address_controller.ex         |   5 +-
 .../controllers/api/v2/address_controller.ex  |   3 +-
 .../controllers/api/v2/stats_controller.ex    |   3 +-
 .../controllers/chain_controller.ex           |   3 +-
 .../lib/block_scout_web/notifier.ex           |   3 +-
 .../templates/address/_tabs.html.eex          |  10 +-
 .../lib/block_scout_web/views/address_view.ex |   1 +
 .../views/api/v2/address_view.ex              |  11 +-
 apps/block_scout_web/priv/gettext/default.pot |  36 +--
 .../priv/gettext/en/LC_MESSAGES/default.po    |  36 +--
 .../api/v2/address_controller_test.exs        |   7 +-
 apps/explorer/lib/explorer/chain.ex           | 280 +----------------
 .../lib/explorer/chain/address/counters.ex    | 290 ++++++++++++++++++
 .../counters/address_gas_usage_counter.ex     |   5 +-
 .../address_token_transfers_counter.ex        |   5 +-
 .../counters/address_transactions_counter.ex  |   5 +-
 .../explorer/counters/addresses_counter.ex    |   4 +-
 .../addresses_with_balance_counter.ex         |   4 +-
 apps/explorer/test/explorer/chain_test.exs    |  15 +-
 21 files changed, 393 insertions(+), 362 deletions(-)
 create mode 100644 apps/explorer/lib/explorer/chain/address/counters.ex

diff --git a/.github/workflows/config.yml b/.github/workflows/config.yml
index 1242102032d4..749bc068c48a 100644
--- a/.github/workflows/config.yml
+++ b/.github/workflows/config.yml
@@ -48,7 +48,7 @@ jobs:
           path: |
             deps
             _build
-          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_20-${{ hashFiles('mix.lock') }}
+          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_21-${{ hashFiles('mix.lock') }}
           restore-keys: |
             ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-
 
@@ -106,7 +106,7 @@ jobs:
           path: |
             deps
             _build
-          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_20-${{ hashFiles('mix.lock') }}
+          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_21-${{ hashFiles('mix.lock') }}
           restore-keys: |
             ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-"
 
@@ -130,7 +130,7 @@ jobs:
           path: |
             deps
             _build
-          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_20-${{ hashFiles('mix.lock') }}
+          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_21-${{ hashFiles('mix.lock') }}
           restore-keys: |
             ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-"
 
@@ -153,7 +153,7 @@ jobs:
           path: |
             deps
             _build
-          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_20-${{ hashFiles('mix.lock') }}
+          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_21-${{ hashFiles('mix.lock') }}
           restore-keys: |
             ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-"
 
@@ -162,7 +162,7 @@ jobs:
         id: dialyzer-cache
         with:
           path: priv/plts
-          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-dialyzer-mixlockhash_20-${{ hashFiles('mix.lock') }}
+          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-dialyzer-mixlockhash_21-${{ hashFiles('mix.lock') }}
           restore-keys: |
             ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-dialyzer-"
 
@@ -193,7 +193,7 @@ jobs:
           path: |
             deps
             _build
-          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_20-${{ hashFiles('mix.lock') }}
+          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_21-${{ hashFiles('mix.lock') }}
           restore-keys: |
             ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-"
 
@@ -219,7 +219,7 @@ jobs:
           path: |
             deps
             _build
-          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_20-${{ hashFiles('mix.lock') }}
+          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_21-${{ hashFiles('mix.lock') }}
           restore-keys: |
             ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-"
 
@@ -248,7 +248,7 @@ jobs:
           path: |
             deps
             _build
-          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_20-${{ hashFiles('mix.lock') }}
+          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_21-${{ hashFiles('mix.lock') }}
           restore-keys: |
             ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-"
 
@@ -296,7 +296,7 @@ jobs:
           path: |
             deps
             _build
-          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_20-${{ hashFiles('mix.lock') }}
+          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_21-${{ hashFiles('mix.lock') }}
           restore-keys: |
             ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-"
 
@@ -342,7 +342,7 @@ jobs:
           path: |
             deps
             _build
-          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_20-${{ hashFiles('mix.lock') }}
+          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_21-${{ hashFiles('mix.lock') }}
           restore-keys: |
             ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-"
 
@@ -399,7 +399,7 @@ jobs:
           path: |
             deps
             _build
-          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_20-${{ hashFiles('mix.lock') }}
+          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_21-${{ hashFiles('mix.lock') }}
           restore-keys: |
             ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-"
 
@@ -453,7 +453,7 @@ jobs:
           path: |
             deps
             _build
-          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_20-${{ hashFiles('mix.lock') }}
+          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_21-${{ hashFiles('mix.lock') }}
           restore-keys: |
             ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-"
 
@@ -518,7 +518,7 @@ jobs:
           path: |
             deps
             _build
-          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_20-${{ hashFiles('mix.lock') }}
+          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_21-${{ hashFiles('mix.lock') }}
           restore-keys: |
             ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-"
 
@@ -582,7 +582,7 @@ jobs:
           path: |
             deps
             _build
-          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_20-${{ hashFiles('mix.lock') }}
+          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_21-${{ hashFiles('mix.lock') }}
           restore-keys: |
             ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-"
 
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 569c081ef3b9..b0e574c745ae 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -23,6 +23,7 @@
 
 ### Chore
 
+- [#8177](https://github.com/blockscout/blockscout/pull/8177) - Refactor address counter functions
 - [#8183](https://github.com/blockscout/blockscout/pull/8183) - Update frontend envs in order to pass their validation
 - [#8167](https://github.com/blockscout/blockscout/pull/8167) - Manage concurrency for Token and TokenBalance fetcher
 - [#8179](https://github.com/blockscout/blockscout/pull/8179) - Enhance nginx config
diff --git a/apps/block_scout_web/lib/block_scout_web/controllers/address_controller.ex b/apps/block_scout_web/lib/block_scout_web/controllers/address_controller.ex
index 9e37382e12a7..c352cb8e783b 100644
--- a/apps/block_scout_web/lib/block_scout_web/controllers/address_controller.ex
+++ b/apps/block_scout_web/lib/block_scout_web/controllers/address_controller.ex
@@ -15,6 +15,7 @@ defmodule BlockScoutWeb.AddressController do
   }
 
   alias Explorer.{Chain, Market}
+  alias Explorer.Chain.Address.Counters
   alias Explorer.Chain.Wei
   alias Indexer.Fetcher.CoinBalanceOnDemand
   alias Phoenix.View
@@ -82,7 +83,7 @@ defmodule BlockScoutWeb.AddressController do
 
     render(conn, "index.html",
       current_path: Controller.current_full_path(conn),
-      address_count: Chain.address_estimated_count(),
+      address_count: Counters.address_estimated_count(),
       total_supply: total_supply
     )
   end
@@ -146,7 +147,7 @@ defmodule BlockScoutWeb.AddressController do
   def address_counters(conn, %{"id" => address_hash_string}) do
     with {:ok, address_hash} <- Chain.string_to_address_hash(address_hash_string),
          {:ok, address} <- Chain.hash_to_address(address_hash) do
-      {validation_count} = Chain.address_counters(address)
+      {validation_count} = Counters.address_counters(address)
 
       transactions_from_db = address.transactions_count || 0
       token_transfers_from_db = address.token_transfers_count || 0
diff --git a/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/address_controller.ex b/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/address_controller.ex
index 487828ca68de..e2c8941ad82c 100644
--- a/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/address_controller.ex
+++ b/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/address_controller.ex
@@ -17,6 +17,7 @@ defmodule BlockScoutWeb.API.V2.AddressController do
   alias BlockScoutWeb.AccessHelper
   alias BlockScoutWeb.API.V2.{BlockView, TransactionView, WithdrawalView}
   alias Explorer.{Chain, Market}
+  alias Explorer.Chain.Address.Counters
   alias Indexer.Fetcher.{CoinBalanceOnDemand, TokenBalanceOnDemand}
 
   @transaction_necessity_by_association [
@@ -73,7 +74,7 @@ defmodule BlockScoutWeb.API.V2.AddressController do
     with {:format, {:ok, address_hash}} <- {:format, Chain.string_to_address_hash(address_hash_string)},
          {:ok, false} <- AccessHelper.restricted_access?(address_hash_string, params),
          {:not_found, {:ok, address}} <- {:not_found, Chain.hash_to_address(address_hash, @api_true, false)} do
-      {validation_count} = Chain.address_counters(address, @api_true)
+      {validation_count} = Counters.address_counters(address, @api_true)
 
       transactions_from_db = address.transactions_count || 0
       token_transfers_from_db = address.token_transfers_count || 0
diff --git a/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/stats_controller.ex b/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/stats_controller.ex
index f85e5f54be31..098b05f7e9c8 100644
--- a/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/stats_controller.ex
+++ b/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/stats_controller.ex
@@ -4,6 +4,7 @@ defmodule BlockScoutWeb.API.V2.StatsController do
   alias BlockScoutWeb.API.V2.Helper
   alias BlockScoutWeb.Chain.MarketHistoryChartController
   alias Explorer.{Chain, Market}
+  alias Explorer.Chain.Address.Counters
   alias Explorer.Chain.Cache.Block, as: BlockCache
   alias Explorer.Chain.Cache.{GasPriceOracle, GasUsage}
   alias Explorer.Chain.Cache.Transaction, as: TransactionCache
@@ -43,7 +44,7 @@ defmodule BlockScoutWeb.API.V2.StatsController do
       conn,
       %{
         "total_blocks" => BlockCache.estimated_count() |> to_string(),
-        "total_addresses" => @api_true |> Chain.address_estimated_count() |> to_string(),
+        "total_addresses" => @api_true |> Counters.address_estimated_count() |> to_string(),
         "total_transactions" => TransactionCache.estimated_count() |> to_string(),
         "average_block_time" => AverageBlockTime.average_block_time() |> Duration.to_milliseconds(),
         "coin_price" => exchange_rate.usd_value,
diff --git a/apps/block_scout_web/lib/block_scout_web/controllers/chain_controller.ex b/apps/block_scout_web/lib/block_scout_web/controllers/chain_controller.ex
index afa8143329b3..2ea919ac0eb9 100644
--- a/apps/block_scout_web/lib/block_scout_web/controllers/chain_controller.ex
+++ b/apps/block_scout_web/lib/block_scout_web/controllers/chain_controller.ex
@@ -6,6 +6,7 @@ defmodule BlockScoutWeb.ChainController do
   alias BlockScoutWeb.API.V2.Helper
   alias BlockScoutWeb.{ChainView, Controller}
   alias Explorer.{Chain, PagingOptions, Repo}
+  alias Explorer.Chain.Address.Counters
   alias Explorer.Chain.{Address, Block, Transaction}
   alias Explorer.Chain.Cache.Block, as: BlockCache
   alias Explorer.Chain.Cache.GasUsage
@@ -19,7 +20,7 @@ defmodule BlockScoutWeb.ChainController do
     transaction_estimated_count = TransactionCache.estimated_count()
     total_gas_usage = GasUsage.total()
     block_count = BlockCache.estimated_count()
-    address_count = Chain.address_estimated_count()
+    address_count = Counters.address_estimated_count()
 
     market_cap_calculation =
       case Application.get_env(:explorer, :supply) do
diff --git a/apps/block_scout_web/lib/block_scout_web/notifier.ex b/apps/block_scout_web/lib/block_scout_web/notifier.ex
index 97f6f10a5201..06f39fafccdb 100644
--- a/apps/block_scout_web/lib/block_scout_web/notifier.ex
+++ b/apps/block_scout_web/lib/block_scout_web/notifier.ex
@@ -17,6 +17,7 @@ defmodule BlockScoutWeb.Notifier do
   }
 
   alias Explorer.{Chain, Market, Repo}
+  alias Explorer.Chain.Address.Counters
   alias Explorer.Chain.{Address, InternalTransaction, Transaction}
   alias Explorer.Chain.Supply.RSK
   alias Explorer.Chain.Transaction.History.TransactionStats
@@ -27,7 +28,7 @@ defmodule BlockScoutWeb.Notifier do
   @check_broadcast_sequence_period 500
 
   def handle_event({:chain_event, :addresses, type, addresses}) when type in [:realtime, :on_demand] do
-    Endpoint.broadcast("addresses:new_address", "count", %{count: Chain.address_estimated_count()})
+    Endpoint.broadcast("addresses:new_address", "count", %{count: Counters.address_estimated_count()})
 
     addresses
     |> Stream.reject(fn %Address{fetched_coin_balance: fetched_coin_balance} -> is_nil(fetched_coin_balance) end)
diff --git a/apps/block_scout_web/lib/block_scout_web/templates/address/_tabs.html.eex b/apps/block_scout_web/lib/block_scout_web/templates/address/_tabs.html.eex
index de29c7e7fd9d..a4060c9485d9 100644
--- a/apps/block_scout_web/lib/block_scout_web/templates/address/_tabs.html.eex
+++ b/apps/block_scout_web/lib/block_scout_web/templates/address/_tabs.html.eex
@@ -8,7 +8,7 @@
         class: "card-tab #{tab_status("transactions", @conn.request_path)}",
         to: AccessHelper.get_path(@conn, :address_transaction_path, :index, @address.hash)
       ) %>
-  <%= if Chain.check_if_token_transfers_at_address(@address.hash) do %>
+  <%= if Counters.check_if_token_transfers_at_address(@address.hash) do %>
     <%= link(
         gettext("Token Transfers"),
         class: "card-tab #{tab_status("token-transfers", @conn.request_path)}",
@@ -16,7 +16,7 @@
         to: AccessHelper.get_path(@conn, :address_token_transfers_path, :index, @address.hash)
         ) %>
   <% end %>
-  <%= if Chain.check_if_tokens_at_address(@address.hash) do %>
+  <%= if Counters.check_if_tokens_at_address(@address.hash) do %>
   <%= link(
         gettext("Tokens"),
         class: "card-tab #{tab_status("tokens", @conn.request_path)}",
@@ -24,7 +24,7 @@
         "data-test": "tokens_tab_link"
       ) %>
   <% end %>
-  <%= if Chain.check_if_withdrawals_at_address(@address.hash) do %>
+  <%= if Counters.check_if_withdrawals_at_address(@address.hash) do %>
   <%= link(
         gettext("Withdrawals"),
         class: "card-tab #{tab_status("withdrawals", @conn.request_path)}",
@@ -44,14 +44,14 @@
         "data-test": "coin_balance_tab_link",
         to: AccessHelper.get_path(@conn, :address_coin_balance_path, :index, @address.hash)
       ) %>
-  <%= if Chain.check_if_logs_at_address(@address.hash) do %>
+  <%= if Counters.check_if_logs_at_address(@address.hash) do %>
     <%= link(
         gettext("Logs"),
         class: "card-tab #{tab_status("logs", @conn.request_path)}",
         to: AccessHelper.get_path(@conn, :address_logs_path, :index, @address.hash)
         ) %>
   <% end %>
-  <%= if Chain.check_if_validated_blocks_at_address(@address.hash) do %>
+  <%= if Counters.check_if_validated_blocks_at_address(@address.hash) do %>
     <%= link(
       gettext("Blocks Validated"),
       class: "card-tab #{tab_status("validations", @conn.request_path)}",
diff --git a/apps/block_scout_web/lib/block_scout_web/views/address_view.ex b/apps/block_scout_web/lib/block_scout_web/views/address_view.ex
index 3f60d4c7eadc..41ebf80976d6 100644
--- a/apps/block_scout_web/lib/block_scout_web/views/address_view.ex
+++ b/apps/block_scout_web/lib/block_scout_web/views/address_view.ex
@@ -6,6 +6,7 @@ defmodule BlockScoutWeb.AddressView do
   alias BlockScoutWeb.{AccessHelper, LayoutView}
   alias Explorer.Account.CustomABI
   alias Explorer.{Chain, CustomContractsHelper, Repo}
+  alias Explorer.Chain.Address.Counters
   alias Explorer.Chain.{Address, Hash, InternalTransaction, Log, SmartContract, Token, TokenTransfer, Transaction, Wei}
   alias Explorer.Chain.Block.Reward
   alias Explorer.ExchangeRates.Token, as: TokenExchangeRate
diff --git a/apps/block_scout_web/lib/block_scout_web/views/api/v2/address_view.ex b/apps/block_scout_web/lib/block_scout_web/views/api/v2/address_view.ex
index 4f1601f23481..9cdf88abb2f9 100644
--- a/apps/block_scout_web/lib/block_scout_web/views/api/v2/address_view.ex
+++ b/apps/block_scout_web/lib/block_scout_web/views/api/v2/address_view.ex
@@ -7,6 +7,7 @@ defmodule BlockScoutWeb.API.V2.AddressView do
   alias BlockScoutWeb.API.V2.{ApiView, Helper, TokenView}
   alias BlockScoutWeb.API.V2.Helper
   alias Explorer.{Chain, Market}
+  alias Explorer.Chain.Address.Counters
   alias Explorer.Chain.{Address, SmartContract}
 
   @api_true [api?: true]
@@ -102,12 +103,12 @@ defmodule BlockScoutWeb.API.V2.AddressView do
       "has_methods_read_proxy" => is_proxy,
       "has_methods_write_proxy" => AddressView.smart_contract_with_write_functions?(address) && is_proxy,
       "has_decompiled_code" => AddressView.has_decompiled_code?(address),
-      "has_validated_blocks" => Chain.check_if_validated_blocks_at_address(address.hash, @api_true),
-      "has_logs" => Chain.check_if_logs_at_address(address.hash, @api_true),
-      "has_tokens" => Chain.check_if_tokens_at_address(address.hash, @api_true),
-      "has_token_transfers" => Chain.check_if_token_transfers_at_address(address.hash, @api_true),
+      "has_validated_blocks" => Counters.check_if_validated_blocks_at_address(address.hash, @api_true),
+      "has_logs" => Counters.check_if_logs_at_address(address.hash, @api_true),
+      "has_tokens" => Counters.check_if_tokens_at_address(address.hash, @api_true),
+      "has_token_transfers" => Counters.check_if_token_transfers_at_address(address.hash, @api_true),
       "watchlist_address_id" => Chain.select_watchlist_address_id(get_watchlist_id(conn), address.hash),
-      "has_beacon_chain_withdrawals" => Chain.check_if_withdrawals_at_address(address.hash, @api_true)
+      "has_beacon_chain_withdrawals" => Counters.check_if_withdrawals_at_address(address.hash, @api_true)
     })
   end
 
diff --git a/apps/block_scout_web/priv/gettext/default.pot b/apps/block_scout_web/priv/gettext/default.pot
index 9e448f7f82a7..930e2348eca3 100644
--- a/apps/block_scout_web/priv/gettext/default.pot
+++ b/apps/block_scout_web/priv/gettext/default.pot
@@ -265,7 +265,7 @@ msgstr ""
 #: lib/block_scout_web/templates/transaction_log/_logs.html.eex:20
 #: lib/block_scout_web/templates/transaction_state/index.html.eex:34
 #: lib/block_scout_web/templates/verified_contracts/index.html.eex:60
-#: lib/block_scout_web/views/address_view.ex:107
+#: lib/block_scout_web/views/address_view.ex:108
 #, elixir-autogen, elixir-format
 msgid "Address"
 msgstr ""
@@ -556,7 +556,7 @@ msgstr ""
 #: lib/block_scout_web/templates/address/_tabs.html.eex:56
 #: lib/block_scout_web/templates/address/overview.html.eex:275
 #: lib/block_scout_web/templates/address_validation/index.html.eex:11
-#: lib/block_scout_web/views/address_view.ex:384
+#: lib/block_scout_web/views/address_view.ex:385
 #, elixir-autogen, elixir-format
 msgid "Blocks Validated"
 msgstr ""
@@ -656,13 +656,13 @@ msgstr ""
 #: lib/block_scout_web/templates/api_docs/_action_tile.html.eex:187
 #: lib/block_scout_web/templates/api_docs/_eth_rpc_item.html.eex:126
 #: lib/block_scout_web/templates/api_docs/_eth_rpc_item.html.eex:149
-#: lib/block_scout_web/views/address_view.ex:377
+#: lib/block_scout_web/views/address_view.ex:378
 #, elixir-autogen, elixir-format
 msgid "Code"
 msgstr ""
 
 #: lib/block_scout_web/templates/address/_tabs.html.eex:42
-#: lib/block_scout_web/views/address_view.ex:383
+#: lib/block_scout_web/views/address_view.ex:384
 #, elixir-autogen, elixir-format
 msgid "Coin Balance History"
 msgstr ""
@@ -771,14 +771,14 @@ msgstr ""
 #: lib/block_scout_web/templates/account/custom_abi/form.html.eex:18
 #: lib/block_scout_web/templates/account/custom_abi/index.html.eex:29
 #: lib/block_scout_web/templates/address_contract_verification_common_fields/_contract_address_field.html.eex:3
-#: lib/block_scout_web/views/address_view.ex:105
+#: lib/block_scout_web/views/address_view.ex:106
 #, elixir-autogen, elixir-format
 msgid "Contract Address"
 msgstr ""
 
 #: lib/block_scout_web/templates/transaction/_pending_tile.html.eex:16
-#: lib/block_scout_web/views/address_view.ex:45
-#: lib/block_scout_web/views/address_view.ex:79
+#: lib/block_scout_web/views/address_view.ex:46
+#: lib/block_scout_web/views/address_view.ex:80
 #, elixir-autogen, elixir-format
 msgid "Contract Address Pending"
 msgstr ""
@@ -1084,7 +1084,7 @@ msgstr ""
 msgid "Decoded"
 msgstr ""
 
-#: lib/block_scout_web/views/address_view.ex:378
+#: lib/block_scout_web/views/address_view.ex:379
 #, elixir-autogen, elixir-format
 msgid "Decompiled Code"
 msgstr ""
@@ -1601,7 +1601,7 @@ msgstr ""
 #: lib/block_scout_web/templates/address_internal_transaction/index.html.eex:17
 #: lib/block_scout_web/templates/transaction/_tabs.html.eex:11
 #: lib/block_scout_web/templates/transaction_internal_transaction/index.html.eex:6
-#: lib/block_scout_web/views/address_view.ex:374
+#: lib/block_scout_web/views/address_view.ex:375
 #: lib/block_scout_web/views/transaction_view.ex:533
 #, elixir-autogen, elixir-format
 msgid "Internal Transactions"
@@ -1718,7 +1718,7 @@ msgstr ""
 #: lib/block_scout_web/templates/address_logs/index.html.eex:10
 #: lib/block_scout_web/templates/transaction/_tabs.html.eex:17
 #: lib/block_scout_web/templates/transaction_log/index.html.eex:8
-#: lib/block_scout_web/views/address_view.ex:385
+#: lib/block_scout_web/views/address_view.ex:386
 #: lib/block_scout_web/views/transaction_view.ex:534
 #, elixir-autogen, elixir-format
 msgid "Logs"
@@ -1732,7 +1732,7 @@ msgstr ""
 #: lib/block_scout_web/templates/chain/show.html.eex:53
 #: lib/block_scout_web/templates/layout/app.html.eex:50
 #: lib/block_scout_web/templates/tokens/overview/_details.html.eex:85
-#: lib/block_scout_web/views/address_view.ex:145
+#: lib/block_scout_web/views/address_view.ex:146
 #, elixir-autogen, elixir-format
 msgid "Market Cap"
 msgstr ""
@@ -2208,7 +2208,7 @@ msgstr ""
 
 #: lib/block_scout_web/templates/address/_tabs.html.eex:89
 #: lib/block_scout_web/templates/tokens/overview/_tabs.html.eex:27
-#: lib/block_scout_web/views/address_view.ex:379
+#: lib/block_scout_web/views/address_view.ex:380
 #: lib/block_scout_web/views/tokens/overview_view.ex:41
 #, elixir-autogen, elixir-format
 msgid "Read Contract"
@@ -2216,7 +2216,7 @@ msgstr ""
 
 #: lib/block_scout_web/templates/address/_tabs.html.eex:96
 #: lib/block_scout_web/templates/tokens/overview/_tabs.html.eex:41
-#: lib/block_scout_web/views/address_view.ex:380
+#: lib/block_scout_web/views/address_view.ex:381
 #, elixir-autogen, elixir-format
 msgid "Read Proxy"
 msgstr ""
@@ -2903,7 +2903,7 @@ msgstr ""
 #: lib/block_scout_web/templates/tokens/transfer/index.html.eex:15
 #: lib/block_scout_web/templates/transaction/_tabs.html.eex:4
 #: lib/block_scout_web/templates/transaction_token_transfer/index.html.eex:7
-#: lib/block_scout_web/views/address_view.ex:376
+#: lib/block_scout_web/views/address_view.ex:377
 #: lib/block_scout_web/views/tokens/instance/overview_view.ex:114
 #: lib/block_scout_web/views/tokens/overview_view.ex:39
 #: lib/block_scout_web/views/transaction_view.ex:532
@@ -2927,7 +2927,7 @@ msgstr ""
 #: lib/block_scout_web/templates/address_token_transfer/index.html.eex:13
 #: lib/block_scout_web/templates/layout/_topnav.html.eex:84
 #: lib/block_scout_web/templates/tokens/index.html.eex:10
-#: lib/block_scout_web/views/address_view.ex:373
+#: lib/block_scout_web/views/address_view.ex:374
 #, elixir-autogen, elixir-format
 msgid "Tokens"
 msgstr ""
@@ -3099,7 +3099,7 @@ msgstr ""
 #: lib/block_scout_web/templates/block/overview.html.eex:80
 #: lib/block_scout_web/templates/chain/show.html.eex:214
 #: lib/block_scout_web/templates/layout/_topnav.html.eex:49
-#: lib/block_scout_web/views/address_view.ex:375
+#: lib/block_scout_web/views/address_view.ex:376
 #, elixir-autogen, elixir-format
 msgid "Transactions"
 msgstr ""
@@ -3469,14 +3469,14 @@ msgstr ""
 
 #: lib/block_scout_web/templates/address/_tabs.html.eex:103
 #: lib/block_scout_web/templates/tokens/overview/_tabs.html.eex:34
-#: lib/block_scout_web/views/address_view.ex:381
+#: lib/block_scout_web/views/address_view.ex:382
 #, elixir-autogen, elixir-format
 msgid "Write Contract"
 msgstr ""
 
 #: lib/block_scout_web/templates/address/_tabs.html.eex:110
 #: lib/block_scout_web/templates/tokens/overview/_tabs.html.eex:48
-#: lib/block_scout_web/views/address_view.ex:382
+#: lib/block_scout_web/views/address_view.ex:383
 #, elixir-autogen, elixir-format
 msgid "Write Proxy"
 msgstr ""
diff --git a/apps/block_scout_web/priv/gettext/en/LC_MESSAGES/default.po b/apps/block_scout_web/priv/gettext/en/LC_MESSAGES/default.po
index d84b5aca859a..dd08664c4b1f 100644
--- a/apps/block_scout_web/priv/gettext/en/LC_MESSAGES/default.po
+++ b/apps/block_scout_web/priv/gettext/en/LC_MESSAGES/default.po
@@ -265,7 +265,7 @@ msgstr ""
 #: lib/block_scout_web/templates/transaction_log/_logs.html.eex:20
 #: lib/block_scout_web/templates/transaction_state/index.html.eex:34
 #: lib/block_scout_web/templates/verified_contracts/index.html.eex:60
-#: lib/block_scout_web/views/address_view.ex:107
+#: lib/block_scout_web/views/address_view.ex:108
 #, elixir-autogen, elixir-format
 msgid "Address"
 msgstr ""
@@ -556,7 +556,7 @@ msgstr ""
 #: lib/block_scout_web/templates/address/_tabs.html.eex:56
 #: lib/block_scout_web/templates/address/overview.html.eex:275
 #: lib/block_scout_web/templates/address_validation/index.html.eex:11
-#: lib/block_scout_web/views/address_view.ex:384
+#: lib/block_scout_web/views/address_view.ex:385
 #, elixir-autogen, elixir-format
 msgid "Blocks Validated"
 msgstr ""
@@ -656,13 +656,13 @@ msgstr ""
 #: lib/block_scout_web/templates/api_docs/_action_tile.html.eex:187
 #: lib/block_scout_web/templates/api_docs/_eth_rpc_item.html.eex:126
 #: lib/block_scout_web/templates/api_docs/_eth_rpc_item.html.eex:149
-#: lib/block_scout_web/views/address_view.ex:377
+#: lib/block_scout_web/views/address_view.ex:378
 #, elixir-autogen, elixir-format
 msgid "Code"
 msgstr ""
 
 #: lib/block_scout_web/templates/address/_tabs.html.eex:42
-#: lib/block_scout_web/views/address_view.ex:383
+#: lib/block_scout_web/views/address_view.ex:384
 #, elixir-autogen, elixir-format
 msgid "Coin Balance History"
 msgstr ""
@@ -771,14 +771,14 @@ msgstr ""
 #: lib/block_scout_web/templates/account/custom_abi/form.html.eex:18
 #: lib/block_scout_web/templates/account/custom_abi/index.html.eex:29
 #: lib/block_scout_web/templates/address_contract_verification_common_fields/_contract_address_field.html.eex:3
-#: lib/block_scout_web/views/address_view.ex:105
+#: lib/block_scout_web/views/address_view.ex:106
 #, elixir-autogen, elixir-format
 msgid "Contract Address"
 msgstr ""
 
 #: lib/block_scout_web/templates/transaction/_pending_tile.html.eex:16
-#: lib/block_scout_web/views/address_view.ex:45
-#: lib/block_scout_web/views/address_view.ex:79
+#: lib/block_scout_web/views/address_view.ex:46
+#: lib/block_scout_web/views/address_view.ex:80
 #, elixir-autogen, elixir-format
 msgid "Contract Address Pending"
 msgstr ""
@@ -1084,7 +1084,7 @@ msgstr ""
 msgid "Decoded"
 msgstr ""
 
-#: lib/block_scout_web/views/address_view.ex:378
+#: lib/block_scout_web/views/address_view.ex:379
 #, elixir-autogen, elixir-format
 msgid "Decompiled Code"
 msgstr ""
@@ -1601,7 +1601,7 @@ msgstr ""
 #: lib/block_scout_web/templates/address_internal_transaction/index.html.eex:17
 #: lib/block_scout_web/templates/transaction/_tabs.html.eex:11
 #: lib/block_scout_web/templates/transaction_internal_transaction/index.html.eex:6
-#: lib/block_scout_web/views/address_view.ex:374
+#: lib/block_scout_web/views/address_view.ex:375
 #: lib/block_scout_web/views/transaction_view.ex:533
 #, elixir-autogen, elixir-format
 msgid "Internal Transactions"
@@ -1718,7 +1718,7 @@ msgstr ""
 #: lib/block_scout_web/templates/address_logs/index.html.eex:10
 #: lib/block_scout_web/templates/transaction/_tabs.html.eex:17
 #: lib/block_scout_web/templates/transaction_log/index.html.eex:8
-#: lib/block_scout_web/views/address_view.ex:385
+#: lib/block_scout_web/views/address_view.ex:386
 #: lib/block_scout_web/views/transaction_view.ex:534
 #, elixir-autogen, elixir-format
 msgid "Logs"
@@ -1732,7 +1732,7 @@ msgstr ""
 #: lib/block_scout_web/templates/chain/show.html.eex:53
 #: lib/block_scout_web/templates/layout/app.html.eex:50
 #: lib/block_scout_web/templates/tokens/overview/_details.html.eex:85
-#: lib/block_scout_web/views/address_view.ex:145
+#: lib/block_scout_web/views/address_view.ex:146
 #, elixir-autogen, elixir-format
 msgid "Market Cap"
 msgstr ""
@@ -2208,7 +2208,7 @@ msgstr ""
 
 #: lib/block_scout_web/templates/address/_tabs.html.eex:89
 #: lib/block_scout_web/templates/tokens/overview/_tabs.html.eex:27
-#: lib/block_scout_web/views/address_view.ex:379
+#: lib/block_scout_web/views/address_view.ex:380
 #: lib/block_scout_web/views/tokens/overview_view.ex:41
 #, elixir-autogen, elixir-format
 msgid "Read Contract"
@@ -2216,7 +2216,7 @@ msgstr ""
 
 #: lib/block_scout_web/templates/address/_tabs.html.eex:96
 #: lib/block_scout_web/templates/tokens/overview/_tabs.html.eex:41
-#: lib/block_scout_web/views/address_view.ex:380
+#: lib/block_scout_web/views/address_view.ex:381
 #, elixir-autogen, elixir-format
 msgid "Read Proxy"
 msgstr ""
@@ -2903,7 +2903,7 @@ msgstr ""
 #: lib/block_scout_web/templates/tokens/transfer/index.html.eex:15
 #: lib/block_scout_web/templates/transaction/_tabs.html.eex:4
 #: lib/block_scout_web/templates/transaction_token_transfer/index.html.eex:7
-#: lib/block_scout_web/views/address_view.ex:376
+#: lib/block_scout_web/views/address_view.ex:377
 #: lib/block_scout_web/views/tokens/instance/overview_view.ex:114
 #: lib/block_scout_web/views/tokens/overview_view.ex:39
 #: lib/block_scout_web/views/transaction_view.ex:532
@@ -2927,7 +2927,7 @@ msgstr ""
 #: lib/block_scout_web/templates/address_token_transfer/index.html.eex:13
 #: lib/block_scout_web/templates/layout/_topnav.html.eex:84
 #: lib/block_scout_web/templates/tokens/index.html.eex:10
-#: lib/block_scout_web/views/address_view.ex:373
+#: lib/block_scout_web/views/address_view.ex:374
 #, elixir-autogen, elixir-format
 msgid "Tokens"
 msgstr ""
@@ -3099,7 +3099,7 @@ msgstr ""
 #: lib/block_scout_web/templates/block/overview.html.eex:80
 #: lib/block_scout_web/templates/chain/show.html.eex:214
 #: lib/block_scout_web/templates/layout/_topnav.html.eex:49
-#: lib/block_scout_web/views/address_view.ex:375
+#: lib/block_scout_web/views/address_view.ex:376
 #, elixir-autogen, elixir-format
 msgid "Transactions"
 msgstr ""
@@ -3469,14 +3469,14 @@ msgstr ""
 
 #: lib/block_scout_web/templates/address/_tabs.html.eex:103
 #: lib/block_scout_web/templates/tokens/overview/_tabs.html.eex:34
-#: lib/block_scout_web/views/address_view.ex:381
+#: lib/block_scout_web/views/address_view.ex:382
 #, elixir-autogen, elixir-format
 msgid "Write Contract"
 msgstr ""
 
 #: lib/block_scout_web/templates/address/_tabs.html.eex:110
 #: lib/block_scout_web/templates/tokens/overview/_tabs.html.eex:48
-#: lib/block_scout_web/views/address_view.ex:382
+#: lib/block_scout_web/views/address_view.ex:383
 #, elixir-autogen, elixir-format
 msgid "Write Proxy"
 msgstr ""
diff --git a/apps/block_scout_web/test/block_scout_web/controllers/api/v2/address_controller_test.exs b/apps/block_scout_web/test/block_scout_web/controllers/api/v2/address_controller_test.exs
index 7073f491550a..adfba5247640 100644
--- a/apps/block_scout_web/test/block_scout_web/controllers/api/v2/address_controller_test.exs
+++ b/apps/block_scout_web/test/block_scout_web/controllers/api/v2/address_controller_test.exs
@@ -3,6 +3,7 @@ defmodule BlockScoutWeb.API.V2.AddressControllerTest do
 
   alias BlockScoutWeb.Models.UserFromAuth
   alias Explorer.{Chain, Repo}
+  alias Explorer.Chain.Address.Counters
 
   alias Explorer.Chain.{
     Address,
@@ -159,9 +160,9 @@ defmodule BlockScoutWeb.API.V2.AddressControllerTest do
 
       insert(:block, miner: address)
 
-      Chain.transaction_count(address)
-      Chain.token_transfers_count(address)
-      Chain.gas_usage_count(address)
+      Counters.transaction_count(address)
+      Counters.token_transfers_count(address)
+      Counters.gas_usage_count(address)
 
       request = get(conn, "/api/v2/addresses/#{address.hash}/counters")
 
diff --git a/apps/explorer/lib/explorer/chain.ex b/apps/explorer/lib/explorer/chain.ex
index 9d59ec5ed1f6..f69815cabbb9 100644
--- a/apps/explorer/lib/explorer/chain.ex
+++ b/apps/explorer/lib/explorer/chain.ex
@@ -81,20 +81,11 @@ defmodule Explorer.Chain do
   }
 
   alias Explorer.Chain.Cache.Block, as: BlockCache
-  alias Explorer.Chain.Cache.Helper, as: CacheHelper
   alias Explorer.Chain.Cache.PendingBlockOperation, as: PendingBlockOperationCache
   alias Explorer.Chain.Fetcher.{CheckBytecodeMatchingOnDemand, LookUpSmartContractSourcesOnDemand}
   alias Explorer.Chain.Import.Runner
   alias Explorer.Chain.InternalTransaction.{CallType, Type}
 
-  alias Explorer.Counters.{
-    AddressesCounter,
-    AddressesWithBalanceCounter,
-    AddressTokenTransfersCounter,
-    AddressTransactionsCounter,
-    AddressTransactionsGasUsageCounter
-  }
-
   alias Explorer.Market.MarketHistoryCache
   alias Explorer.{PagingOptions, Repo}
   alias Explorer.SmartContract.Helper
@@ -122,8 +113,6 @@ defmodule Explorer.Chain do
     "commit" => "f14fcbc8"
   }
 
-  @max_incoming_transactions_count 10_000
-
   @revert_msg_prefix_1 "Revert: "
   @revert_msg_prefix_2 "revert: "
   @revert_msg_prefix_3 "reverted "
@@ -179,56 +168,7 @@ defmodule Explorer.Chain do
   @typep necessity_by_association_option :: {:necessity_by_association, necessity_by_association}
   @typep paging_options :: {:paging_options, PagingOptions.t()}
   @typep balance_by_day :: %{date: String.t(), value: Wei.t()}
-  @typep api? :: {:api?, true | false}
-
-  @doc """
-  Gets from the cache the count of `t:Explorer.Chain.Address.t/0`'s where the `fetched_coin_balance` is > 0
-  """
-  @spec count_addresses_with_balance_from_cache :: non_neg_integer()
-  def count_addresses_with_balance_from_cache do
-    AddressesWithBalanceCounter.fetch()
-  end
-
-  @doc """
-  Estimated count of `t:Explorer.Chain.Address.t/0`.
-
-  Estimated count of addresses.
-  """
-  @spec address_estimated_count() :: non_neg_integer()
-  def address_estimated_count(options \\ []) do
-    cached_value = AddressesCounter.fetch()
-
-    if is_nil(cached_value) || cached_value == 0 do
-      count = CacheHelper.estimated_count_from("addresses", options)
-
-      max(count, 0)
-    else
-      cached_value
-    end
-  end
-
-  @doc """
-  Counts the number of addresses with fetched coin balance > 0.
-
-  This function should be used with caution. In larger databases, it may take a
-  while to have the return back.
-  """
-  def count_addresses_with_balance do
-    Repo.one(
-      Address.count_with_fetched_coin_balance(),
-      timeout: :infinity
-    )
-  end
-
-  @doc """
-  Counts the number of all addresses.
-
-  This function should be used with caution. In larger databases, it may take a
-  while to have the return back.
-  """
-  def count_addresses do
-    Repo.aggregate(Address, :count, timeout: :infinity)
-  end
+  @type api? :: {:api?, true | false}
 
   @doc """
   `t:Explorer.Chain.InternalTransaction/0`s from the address with the given `hash`.
@@ -327,25 +267,6 @@ defmodule Explorer.Chain do
     )
   end
 
-  @doc """
-  Get the total number of transactions sent by the address with the given hash according to the last block indexed.
-
-  We have to increment +1 in the last nonce result because it works like an array position, the first
-  nonce has the value 0. When last nonce is nil, it considers that the given address has 0 transactions.
-  """
-  @spec total_transactions_sent_by_address(Hash.Address.t()) :: non_neg_integer()
-  def total_transactions_sent_by_address(address_hash) do
-    last_nonce =
-      address_hash
-      |> Transaction.last_nonce_by_address_query()
-      |> Repo.one(timeout: :infinity)
-
-    case last_nonce do
-      nil -> 0
-      value -> value + 1
-    end
-  end
-
   @doc """
   Fetches the transactions related to the address with the given hash, including
   transactions that only have the address in the `token_transfers` related table
@@ -1028,53 +949,6 @@ defmodule Explorer.Chain do
     |> select_repo(options).exists?()
   end
 
-  @spec address_to_incoming_transaction_count(Hash.Address.t()) :: non_neg_integer()
-  def address_to_incoming_transaction_count(address_hash) do
-    to_address_query =
-      from(
-        transaction in Transaction,
-        where: transaction.to_address_hash == ^address_hash
-      )
-
-    Repo.aggregate(to_address_query, :count, :hash, timeout: :infinity)
-  end
-
-  @spec address_hash_to_transaction_count(Hash.Address.t()) :: non_neg_integer()
-  def address_hash_to_transaction_count(address_hash) do
-    query =
-      from(
-        transaction in Transaction,
-        where: transaction.to_address_hash == ^address_hash or transaction.from_address_hash == ^address_hash
-      )
-
-    Repo.aggregate(query, :count, :hash, timeout: :infinity)
-  end
-
-  @spec address_to_incoming_transaction_gas_usage(Hash.Address.t()) :: Decimal.t() | nil
-  def address_to_incoming_transaction_gas_usage(address_hash) do
-    to_address_query =
-      from(
-        transaction in Transaction,
-        where: transaction.to_address_hash == ^address_hash
-      )
-
-    Repo.aggregate(to_address_query, :sum, :gas_used, timeout: :infinity)
-  end
-
-  @spec address_to_outcoming_transaction_gas_usage(Hash.Address.t()) :: Decimal.t() | nil
-  def address_to_outcoming_transaction_gas_usage(address_hash) do
-    to_address_query =
-      from(
-        transaction in Transaction,
-        where: transaction.from_address_hash == ^address_hash
-      )
-
-    Repo.aggregate(to_address_query, :sum, :gas_used, timeout: :infinity)
-  end
-
-  @spec max_incoming_transactions_count() :: non_neg_integer()
-  def max_incoming_transactions_count, do: @max_incoming_transactions_count
-
   @doc """
   How many blocks have confirmed `block` based on the current `max_block_number`
 
@@ -2613,56 +2487,6 @@ defmodule Explorer.Chain do
     |> select_repo(options).all()
   end
 
-  def check_if_validated_blocks_at_address(address_hash, options \\ []) do
-    select_repo(options).exists?(from(b in Block, where: b.miner_hash == ^address_hash))
-  end
-
-  def check_if_logs_at_address(address_hash, options \\ []) do
-    select_repo(options).exists?(from(l in Log, where: l.address_hash == ^address_hash))
-  end
-
-  def check_if_internal_transactions_at_address(address_hash) do
-    internal_transactions_exists_by_created_contract_address_hash =
-      Repo.exists?(from(it in InternalTransaction, where: it.created_contract_address_hash == ^address_hash))
-
-    internal_transactions_exists_by_from_address_hash =
-      Repo.exists?(from(it in InternalTransaction, where: it.from_address_hash == ^address_hash))
-
-    internal_transactions_exists_by_to_address_hash =
-      Repo.exists?(from(it in InternalTransaction, where: it.to_address_hash == ^address_hash))
-
-    internal_transactions_exists_by_created_contract_address_hash || internal_transactions_exists_by_from_address_hash ||
-      internal_transactions_exists_by_to_address_hash
-  end
-
-  def check_if_token_transfers_at_address(address_hash, options \\ []) do
-    token_transfers_exists_by_from_address_hash =
-      select_repo(options).exists?(from(tt in TokenTransfer, where: tt.from_address_hash == ^address_hash))
-
-    token_transfers_exists_by_to_address_hash =
-      select_repo(options).exists?(from(tt in TokenTransfer, where: tt.to_address_hash == ^address_hash))
-
-    token_transfers_exists_by_from_address_hash ||
-      token_transfers_exists_by_to_address_hash
-  end
-
-  def check_if_tokens_at_address(address_hash, options \\ []) do
-    select_repo(options).exists?(
-      from(
-        tb in CurrentTokenBalance,
-        where: tb.address_hash == ^address_hash,
-        where: tb.value > 0
-      )
-    )
-  end
-
-  @spec check_if_withdrawals_at_address(Hash.Address.t()) :: boolean()
-  def check_if_withdrawals_at_address(address_hash, options \\ []) do
-    address_hash
-    |> Withdrawal.address_hash_to_withdrawals_unordered_query()
-    |> select_repo(options).exists?()
-  end
-
   @doc """
   Counts all of the block validations and groups by the `miner_hash`.
   """
@@ -2679,53 +2503,6 @@ defmodule Explorer.Chain do
     Repo.stream_each(query, fun)
   end
 
-  @doc """
-  Counts the number of `t:Explorer.Chain.Block.t/0` validated by the address with the given `hash`.
-  """
-  @spec address_to_validation_count(Hash.Address.t(), [api?]) :: non_neg_integer()
-  def address_to_validation_count(hash, options) do
-    query = from(block in Block, where: block.miner_hash == ^hash, select: fragment("COUNT(*)"))
-
-    select_repo(options).one(query)
-  end
-
-  @spec address_to_transaction_count(Address.t()) :: non_neg_integer()
-  def address_to_transaction_count(address) do
-    address_hash_to_transaction_count(address.hash)
-  end
-
-  @spec address_to_token_transfer_count(Address.t()) :: non_neg_integer()
-  def address_to_token_transfer_count(address) do
-    query =
-      from(
-        token_transfer in TokenTransfer,
-        where: token_transfer.to_address_hash == ^address.hash,
-        or_where: token_transfer.from_address_hash == ^address.hash
-      )
-
-    Repo.aggregate(query, :count, timeout: :infinity)
-  end
-
-  @spec address_to_gas_usage_count(Address.t()) :: Decimal.t() | nil
-  def address_to_gas_usage_count(address) do
-    if contract?(address) do
-      incoming_transaction_gas_usage = address_to_incoming_transaction_gas_usage(address.hash)
-
-      cond do
-        !incoming_transaction_gas_usage ->
-          address_to_outcoming_transaction_gas_usage(address.hash)
-
-        Decimal.compare(incoming_transaction_gas_usage, 0) == :eq ->
-          address_to_outcoming_transaction_gas_usage(address.hash)
-
-        true ->
-          incoming_transaction_gas_usage
-      end
-    else
-      address_to_outcoming_transaction_gas_usage(address.hash)
-    end
-  end
-
   @doc """
   Return the balance in usd corresponding to this token. Return nil if the fiat_value of the token is not present.
   """
@@ -2742,9 +2519,9 @@ defmodule Explorer.Chain do
     Decimal.mult(tokens, fiat_value)
   end
 
-  defp contract?(%{contract_code: nil}), do: false
+  def contract?(%{contract_code: nil}), do: false
 
-  defp contract?(%{contract_code: _}), do: true
+  def contract?(%{contract_code: _}), do: true
 
   @doc """
   Returns a stream of unfetched `t:Explorer.Chain.Address.CoinBalance.t/0`.
@@ -5624,7 +5401,7 @@ defmodule Explorer.Chain do
   def count_token_holders_from_token_hash(contract_address_hash) do
     query =
       from(ctb in CurrentTokenBalance.token_holders_query_for_count(contract_address_hash),
-        select: fragment("COUNT(DISTINCT(address_hash))")
+        select: fragment("COUNT(DISTINCT(?))", ctb.address_hash)
       )
 
     Repo.one!(query, timeout: :infinity)
@@ -6696,55 +6473,6 @@ defmodule Explorer.Chain do
     NewContractsCounter.fetch(options)
   end
 
-  def address_counters(address, options \\ []) do
-    validation_count_task =
-      Task.async(fn ->
-        address_to_validation_count(address.hash, options)
-      end)
-
-    Task.start_link(fn ->
-      transaction_count(address)
-    end)
-
-    Task.start_link(fn ->
-      token_transfers_count(address)
-    end)
-
-    Task.start_link(fn ->
-      gas_usage_count(address)
-    end)
-
-    [
-      validation_count_task
-    ]
-    |> Task.yield_many(:infinity)
-    |> Enum.map(fn {_task, res} ->
-      case res do
-        {:ok, result} ->
-          result
-
-        {:exit, reason} ->
-          raise "Query fetching address counters terminated: #{inspect(reason)}"
-
-        nil ->
-          raise "Query fetching address counters timed out."
-      end
-    end)
-    |> List.to_tuple()
-  end
-
-  def transaction_count(address) do
-    AddressTransactionsCounter.fetch(address)
-  end
-
-  def token_transfers_count(address) do
-    AddressTokenTransfersCounter.fetch(address)
-  end
-
-  def gas_usage_count(address) do
-    AddressTransactionsGasUsageCounter.fetch(address)
-  end
-
   def fetch_token_counters(address_hash, timeout) do
     total_token_transfers_task =
       Task.async(fn ->
diff --git a/apps/explorer/lib/explorer/chain/address/counters.ex b/apps/explorer/lib/explorer/chain/address/counters.ex
new file mode 100644
index 000000000000..9548f4168c20
--- /dev/null
+++ b/apps/explorer/lib/explorer/chain/address/counters.ex
@@ -0,0 +1,290 @@
+defmodule Explorer.Chain.Address.Counters do
+  @moduledoc """
+    Functions related to Explorer.Chain.Address counters
+  """
+  import Ecto.Query, only: [from: 2]
+
+  import Explorer.Chain,
+    only: [select_repo: 1]
+
+  alias Explorer.{Chain, Repo}
+
+  alias Explorer.Counters.{
+    AddressesCounter,
+    AddressesWithBalanceCounter,
+    AddressTokenTransfersCounter,
+    AddressTransactionsCounter,
+    AddressTransactionsGasUsageCounter
+  }
+
+  alias Explorer.Chain.{
+    Address,
+    Address.CurrentTokenBalance,
+    Block,
+    Hash,
+    InternalTransaction,
+    Log,
+    TokenTransfer,
+    Transaction,
+    Withdrawal
+  }
+
+  alias Explorer.Chain.Cache.Helper, as: CacheHelper
+
+  def check_if_validated_blocks_at_address(address_hash, options \\ []) do
+    select_repo(options).exists?(from(b in Block, where: b.miner_hash == ^address_hash))
+  end
+
+  def check_if_logs_at_address(address_hash, options \\ []) do
+    select_repo(options).exists?(from(l in Log, where: l.address_hash == ^address_hash))
+  end
+
+  def check_if_internal_transactions_at_address(address_hash) do
+    Repo.exists?(from(it in InternalTransaction, where: it.created_contract_address_hash == ^address_hash)) ||
+      Repo.exists?(from(it in InternalTransaction, where: it.from_address_hash == ^address_hash)) ||
+      Repo.exists?(from(it in InternalTransaction, where: it.to_address_hash == ^address_hash))
+  end
+
+  def check_if_token_transfers_at_address(address_hash, options \\ []) do
+    token_transfers_exists_by_from_address_hash =
+      select_repo(options).exists?(from(tt in TokenTransfer, where: tt.from_address_hash == ^address_hash))
+
+    token_transfers_exists_by_to_address_hash =
+      select_repo(options).exists?(from(tt in TokenTransfer, where: tt.to_address_hash == ^address_hash))
+
+    token_transfers_exists_by_from_address_hash ||
+      token_transfers_exists_by_to_address_hash
+  end
+
+  def check_if_tokens_at_address(address_hash, options \\ []) do
+    select_repo(options).exists?(
+      from(
+        tb in CurrentTokenBalance,
+        where: tb.address_hash == ^address_hash,
+        where: tb.value > 0
+      )
+    )
+  end
+
+  @spec check_if_withdrawals_at_address(Hash.Address.t()) :: boolean()
+  def check_if_withdrawals_at_address(address_hash, options \\ []) do
+    address_hash
+    |> Withdrawal.address_hash_to_withdrawals_unordered_query()
+    |> select_repo(options).exists?()
+  end
+
+  @doc """
+  Gets from the cache the count of `t:Explorer.Chain.Address.t/0`'s where the `fetched_coin_balance` is > 0
+  """
+  @spec count_addresses_with_balance_from_cache :: non_neg_integer()
+  def count_addresses_with_balance_from_cache do
+    AddressesWithBalanceCounter.fetch()
+  end
+
+  @doc """
+  Estimated count of `t:Explorer.Chain.Address.t/0`.
+
+  Estimated count of addresses.
+  """
+  @spec address_estimated_count() :: non_neg_integer()
+  def address_estimated_count(options \\ []) do
+    cached_value = AddressesCounter.fetch()
+
+    if is_nil(cached_value) || cached_value == 0 do
+      count = CacheHelper.estimated_count_from("addresses", options)
+
+      max(count, 0)
+    else
+      cached_value
+    end
+  end
+
+  @doc """
+  Counts the number of all addresses.
+
+  This function should be used with caution. In larger databases, it may take a
+  while to have the return back.
+  """
+  def count_addresses do
+    Repo.aggregate(Address, :count, timeout: :infinity)
+  end
+
+  @doc """
+  Get the total number of transactions sent by the address with the given hash according to the last block indexed.
+
+  We have to increment +1 in the last nonce result because it works like an array position, the first
+  nonce has the value 0. When last nonce is nil, it considers that the given address has 0 transactions.
+  """
+  @spec total_transactions_sent_by_address(Hash.Address.t()) :: non_neg_integer()
+  def total_transactions_sent_by_address(address_hash) do
+    last_nonce =
+      address_hash
+      |> Transaction.last_nonce_by_address_query()
+      |> Repo.one(timeout: :infinity)
+
+    case last_nonce do
+      nil -> 0
+      value -> value + 1
+    end
+  end
+
+  def address_hash_to_transaction_count_query(address_hash) do
+    from(
+      transaction in Transaction,
+      where: transaction.to_address_hash == ^address_hash or transaction.from_address_hash == ^address_hash
+    )
+  end
+
+  @spec address_hash_to_transaction_count(Hash.Address.t()) :: non_neg_integer()
+  def address_hash_to_transaction_count(address_hash) do
+    query = address_hash_to_transaction_count_query(address_hash)
+
+    Repo.aggregate(query, :count, :hash, timeout: :infinity)
+  end
+
+  @spec address_to_transaction_count(Address.t()) :: non_neg_integer()
+  def address_to_transaction_count(address) do
+    address_hash_to_transaction_count(address.hash)
+  end
+
+  def address_hash_to_validation_count_query(hash) do
+    from(block in Block, where: block.miner_hash == ^hash, select: fragment("COUNT(*)"))
+  end
+
+  @doc """
+  Counts the number of `t:Explorer.Chain.Block.t/0` validated by the address with the given `hash`.
+  """
+  @spec address_to_validation_count(Hash.Address.t(), [Chain.api?()]) :: non_neg_integer()
+  def address_to_validation_count(hash, options) do
+    query = address_hash_to_validation_count_query(hash)
+
+    select_repo(options).one(query)
+  end
+
+  @doc """
+  Counts the number of addresses with fetched coin balance > 0.
+
+  This function should be used with caution. In larger databases, it may take a
+  while to have the return back.
+  """
+  def count_addresses_with_balance do
+    Repo.one(
+      Address.count_with_fetched_coin_balance(),
+      timeout: :infinity
+    )
+  end
+
+  @spec address_to_incoming_transaction_count(Hash.Address.t()) :: non_neg_integer()
+  def address_to_incoming_transaction_count(address_hash) do
+    to_address_query =
+      from(
+        transaction in Transaction,
+        where: transaction.to_address_hash == ^address_hash
+      )
+
+    Repo.aggregate(to_address_query, :count, :hash, timeout: :infinity)
+  end
+
+  @spec address_to_incoming_transaction_gas_usage(Hash.Address.t()) :: Decimal.t() | nil
+  def address_to_incoming_transaction_gas_usage(address_hash) do
+    to_address_query =
+      from(
+        transaction in Transaction,
+        where: transaction.to_address_hash == ^address_hash
+      )
+
+    Repo.aggregate(to_address_query, :sum, :gas_used, timeout: :infinity)
+  end
+
+  @spec address_to_outcoming_transaction_gas_usage(Hash.Address.t()) :: Decimal.t() | nil
+  def address_to_outcoming_transaction_gas_usage(address_hash) do
+    to_address_query =
+      from(
+        transaction in Transaction,
+        where: transaction.from_address_hash == ^address_hash
+      )
+
+    Repo.aggregate(to_address_query, :sum, :gas_used, timeout: :infinity)
+  end
+
+  @spec address_to_token_transfer_count(Address.t()) :: non_neg_integer()
+  def address_to_token_transfer_count(address) do
+    query =
+      from(
+        token_transfer in TokenTransfer,
+        where: token_transfer.to_address_hash == ^address.hash,
+        or_where: token_transfer.from_address_hash == ^address.hash
+      )
+
+    Repo.aggregate(query, :count, timeout: :infinity)
+  end
+
+  @spec address_to_gas_usage_count(Address.t()) :: Decimal.t() | nil
+  def address_to_gas_usage_count(address) do
+    if Chain.contract?(address) do
+      incoming_transaction_gas_usage = address_to_incoming_transaction_gas_usage(address.hash)
+
+      cond do
+        !incoming_transaction_gas_usage ->
+          address_to_outcoming_transaction_gas_usage(address.hash)
+
+        Decimal.compare(incoming_transaction_gas_usage, 0) == :eq ->
+          address_to_outcoming_transaction_gas_usage(address.hash)
+
+        true ->
+          incoming_transaction_gas_usage
+      end
+    else
+      address_to_outcoming_transaction_gas_usage(address.hash)
+    end
+  end
+
+  def address_counters(address, options \\ []) do
+    validation_count_task =
+      Task.async(fn ->
+        address_to_validation_count(address.hash, options)
+      end)
+
+    Task.start_link(fn ->
+      transaction_count(address)
+    end)
+
+    Task.start_link(fn ->
+      token_transfers_count(address)
+    end)
+
+    Task.start_link(fn ->
+      gas_usage_count(address)
+    end)
+
+    [
+      validation_count_task
+    ]
+    |> Task.yield_many(:infinity)
+    |> Enum.map(fn {_task, res} ->
+      case res do
+        {:ok, result} ->
+          result
+
+        {:exit, reason} ->
+          raise "Query fetching address counters terminated: #{inspect(reason)}"
+
+        nil ->
+          raise "Query fetching address counters timed out."
+      end
+    end)
+    |> List.to_tuple()
+  end
+
+  def transaction_count(address) do
+    AddressTransactionsCounter.fetch(address)
+  end
+
+  def token_transfers_count(address) do
+    AddressTokenTransfersCounter.fetch(address)
+  end
+
+  def gas_usage_count(address) do
+    AddressTransactionsGasUsageCounter.fetch(address)
+  end
+end
diff --git a/apps/explorer/lib/explorer/counters/address_gas_usage_counter.ex b/apps/explorer/lib/explorer/counters/address_gas_usage_counter.ex
index 5ca1520cb2b5..573ab8a988a5 100644
--- a/apps/explorer/lib/explorer/counters/address_gas_usage_counter.ex
+++ b/apps/explorer/lib/explorer/counters/address_gas_usage_counter.ex
@@ -5,8 +5,9 @@ defmodule Explorer.Counters.AddressTransactionsGasUsageCounter do
   use GenServer
 
   alias Ecto.Changeset
-  alias Explorer.{Chain, Repo}
+  alias Explorer.Chain.Address.Counters
   alias Explorer.Counters.Helper
+  alias Explorer.Repo
 
   @cache_name :address_transactions_gas_usage_counter
   @last_update_key "last_update"
@@ -67,7 +68,7 @@ defmodule Explorer.Counters.AddressTransactionsGasUsageCounter do
   defp update_cache(address) do
     address_hash_string = to_string(address.hash)
     put_into_cache("hash_#{address_hash_string}_#{@last_update_key}", Helper.current_time())
-    new_data = Chain.address_to_gas_usage_count(address)
+    new_data = Counters.address_to_gas_usage_count(address)
     put_into_cache("hash_#{address_hash_string}", new_data)
     put_into_db(address, new_data)
   end
diff --git a/apps/explorer/lib/explorer/counters/address_token_transfers_counter.ex b/apps/explorer/lib/explorer/counters/address_token_transfers_counter.ex
index ffec588f3131..db3c82da3b48 100644
--- a/apps/explorer/lib/explorer/counters/address_token_transfers_counter.ex
+++ b/apps/explorer/lib/explorer/counters/address_token_transfers_counter.ex
@@ -5,8 +5,9 @@ defmodule Explorer.Counters.AddressTokenTransfersCounter do
   use GenServer
 
   alias Ecto.Changeset
-  alias Explorer.{Chain, Repo}
+  alias Explorer.Chain.Address.Counters
   alias Explorer.Counters.Helper
+  alias Explorer.Repo
 
   @cache_name :address_token_transfers_counter
   @last_update_key "last_update"
@@ -67,7 +68,7 @@ defmodule Explorer.Counters.AddressTokenTransfersCounter do
   defp update_cache(address) do
     address_hash_string = to_string(address.hash)
     put_into_cache("hash_#{address_hash_string}_#{@last_update_key}", Helper.current_time())
-    new_data = Chain.address_to_token_transfer_count(address)
+    new_data = Counters.address_to_token_transfer_count(address)
     put_into_cache("hash_#{address_hash_string}", new_data)
     put_into_db(address, new_data)
   end
diff --git a/apps/explorer/lib/explorer/counters/address_transactions_counter.ex b/apps/explorer/lib/explorer/counters/address_transactions_counter.ex
index e3c6dfffb690..7b2c912335fa 100644
--- a/apps/explorer/lib/explorer/counters/address_transactions_counter.ex
+++ b/apps/explorer/lib/explorer/counters/address_transactions_counter.ex
@@ -5,8 +5,9 @@ defmodule Explorer.Counters.AddressTransactionsCounter do
   use GenServer
 
   alias Ecto.Changeset
-  alias Explorer.{Chain, Repo}
+  alias Explorer.Chain.Address.Counters
   alias Explorer.Counters.Helper
+  alias Explorer.Repo
 
   @cache_name :address_transactions_counter
   @last_update_key "last_update"
@@ -67,7 +68,7 @@ defmodule Explorer.Counters.AddressTransactionsCounter do
   defp update_cache(address) do
     address_hash_string = to_string(address.hash)
     put_into_cache("hash_#{address_hash_string}_#{@last_update_key}", Helper.current_time())
-    new_data = Chain.address_to_transaction_count(address)
+    new_data = Counters.address_to_transaction_count(address)
     put_into_cache("hash_#{address_hash_string}", new_data)
     put_into_db(address, new_data)
   end
diff --git a/apps/explorer/lib/explorer/counters/addresses_counter.ex b/apps/explorer/lib/explorer/counters/addresses_counter.ex
index 820d96a9152f..51fb845bb945 100644
--- a/apps/explorer/lib/explorer/counters/addresses_counter.ex
+++ b/apps/explorer/lib/explorer/counters/addresses_counter.ex
@@ -7,7 +7,7 @@ defmodule Explorer.Counters.AddressesCounter do
 
   use GenServer
 
-  alias Explorer.Chain
+  alias Explorer.Chain.Address.Counters
 
   @table :addresses_counter
 
@@ -104,7 +104,7 @@ defmodule Explorer.Counters.AddressesCounter do
   Consolidates the info by populating the `:ets` table with the current database information.
   """
   def consolidate do
-    counter = Chain.count_addresses()
+    counter = Counters.count_addresses()
 
     insert_counter({cache_key(), counter})
   end
diff --git a/apps/explorer/lib/explorer/counters/addresses_with_balance_counter.ex b/apps/explorer/lib/explorer/counters/addresses_with_balance_counter.ex
index 1358e52a21e8..53621029afd7 100644
--- a/apps/explorer/lib/explorer/counters/addresses_with_balance_counter.ex
+++ b/apps/explorer/lib/explorer/counters/addresses_with_balance_counter.ex
@@ -7,7 +7,7 @@ defmodule Explorer.Counters.AddressesWithBalanceCounter do
 
   use GenServer
 
-  alias Explorer.Chain
+  alias Explorer.Chain.Address.Counters
 
   @table :addresses_with_balance_counter
 
@@ -104,7 +104,7 @@ defmodule Explorer.Counters.AddressesWithBalanceCounter do
   Consolidates the info by populating the `:ets` table with the current database information.
   """
   def consolidate do
-    counter = Chain.count_addresses_with_balance()
+    counter = Counters.count_addresses_with_balance()
 
     insert_counter({cache_key(), counter})
   end
diff --git a/apps/explorer/test/explorer/chain_test.exs b/apps/explorer/test/explorer/chain_test.exs
index fbfc00668853..728d7adc2971 100644
--- a/apps/explorer/test/explorer/chain_test.exs
+++ b/apps/explorer/test/explorer/chain_test.exs
@@ -28,6 +28,7 @@ defmodule Explorer.ChainTest do
   }
 
   alias Explorer.{Chain, Etherscan}
+  alias Explorer.Chain.Address.Counters
   alias Explorer.Chain.Cache.Block, as: BlockCache
   alias Explorer.Chain.Cache.Transaction, as: TransactionCache
   alias Explorer.Chain.Cache.PendingBlockOperation, as: PendingBlockOperationCache
@@ -84,7 +85,7 @@ defmodule Explorer.ChainTest do
       start_supervised!(AddressesWithBalanceCounter)
       AddressesWithBalanceCounter.consolidate()
 
-      addresses_with_balance = Chain.count_addresses_with_balance_from_cache()
+      addresses_with_balance = Counters.count_addresses_with_balance_from_cache()
 
       assert is_integer(addresses_with_balance)
       assert addresses_with_balance == 2
@@ -100,7 +101,7 @@ defmodule Explorer.ChainTest do
       start_supervised!(AddressesCounter)
       AddressesCounter.consolidate()
 
-      addresses_with_balance = Chain.address_estimated_count()
+      addresses_with_balance = Counters.address_estimated_count()
 
       assert is_integer(addresses_with_balance)
       assert addresses_with_balance == 3
@@ -108,7 +109,7 @@ defmodule Explorer.ChainTest do
 
     test "returns 0 on empty table" do
       start_supervised!(AddressesCounter)
-      assert 0 == Chain.address_estimated_count()
+      assert 0 == Counters.address_estimated_count()
     end
   end
 
@@ -875,7 +876,7 @@ defmodule Explorer.ChainTest do
       |> insert(nonce: 100, from_address: address)
       |> with_block(insert(:block, number: 1000))
 
-      assert Chain.total_transactions_sent_by_address(address.hash) == 101
+      assert Counters.total_transactions_sent_by_address(address.hash) == 101
     end
 
     test "returns 0 when the address did not send transactions" do
@@ -885,7 +886,7 @@ defmodule Explorer.ChainTest do
       |> insert(nonce: 100, to_address: address)
       |> with_block(insert(:block, number: 1000))
 
-      assert Chain.total_transactions_sent_by_address(address.hash) == 0
+      assert Counters.total_transactions_sent_by_address(address.hash) == 0
     end
   end
 
@@ -1099,13 +1100,13 @@ defmodule Explorer.ChainTest do
     test "without transactions" do
       %Address{hash: address_hash} = insert(:address)
 
-      assert Chain.address_to_incoming_transaction_count(address_hash) == 0
+      assert Counters.address_to_incoming_transaction_count(address_hash) == 0
     end
 
     test "with transactions" do
       %Transaction{to_address: to_address} = insert(:transaction)
 
-      assert Chain.address_to_incoming_transaction_count(to_address.hash) == 1
+      assert Counters.address_to_incoming_transaction_count(to_address.hash) == 1
     end
   end
 

From 482c5bd2eb381e7318d654674672c8b672502f09 Mon Sep 17 00:00:00 2001
From: Nikita Pozdniakov <nikitosing4@mail.ru>
Date: Mon, 14 Aug 2023 15:50:51 +0300
Subject: [PATCH 299/909] Add /api/v2/addresses/:address_hash/tabs-counters

---
 CHANGELOG.md                                  |   1 +
 .../lib/block_scout_web/api_router.ex         |   1 +
 .../controllers/api/v2/address_controller.ex  |  22 ++
 .../lib/explorer/chain/address/counters.ex    | 319 ++++++++++++++++--
 4 files changed, 310 insertions(+), 33 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index bb77d6c8852f..fd2cafcb7288 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,6 +13,7 @@
 
 ### Fixes
 
+- [#8202](https://github.com/blockscout/blockscout/pull/8202) - Add `/api/v2/addresses/:address_hash/tabs-counters` endpoint
 - [#8147](https://github.com/blockscout/blockscout/pull/8147) - Switch sourcify tests from POA Sokol to Gnosis Chiado
 - [#8145](https://github.com/blockscout/blockscout/pull/8145) - Handle negative holders count in API v2
 - [#8040](https://github.com/blockscout/blockscout/pull/8040) - Resolve issue with Docker image for Mac M1/M2
diff --git a/apps/block_scout_web/lib/block_scout_web/api_router.ex b/apps/block_scout_web/lib/block_scout_web/api_router.ex
index 45bacd7ad97e..55e621636b4e 100644
--- a/apps/block_scout_web/lib/block_scout_web/api_router.ex
+++ b/apps/block_scout_web/lib/block_scout_web/api_router.ex
@@ -152,6 +152,7 @@ defmodule BlockScoutWeb.ApiRouter do
     scope "/addresses" do
       get("/", V2.AddressController, :addresses_list)
       get("/:address_hash", V2.AddressController, :address)
+      get("/:address_hash/tabs-counters", V2.AddressController, :tabs_counters)
       get("/:address_hash/counters", V2.AddressController, :counters)
       get("/:address_hash/token-balances", V2.AddressController, :token_balances)
       get("/:address_hash/tokens", V2.AddressController, :tokens)
diff --git a/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/address_controller.ex b/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/address_controller.ex
index e2c8941ad82c..56c14a8c2b51 100644
--- a/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/address_controller.ex
+++ b/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/address_controller.ex
@@ -415,4 +415,26 @@ defmodule BlockScoutWeb.API.V2.AddressController do
       total_supply: total_supply
     })
   end
+
+  def tabs_counters(conn, %{"address_hash" => address_hash_string} = params) do
+    with {:format, {:ok, address_hash}} <- {:format, Chain.string_to_address_hash(address_hash_string)},
+         {:ok, false} <- AccessHelper.restricted_access?(address_hash_string, params),
+         {:not_found, {:ok, _address}} <- {:not_found, Chain.hash_to_address(address_hash, @api_true, false)} do
+      {validations, transactions, token_transfers, token_balances, logs, withdrawals, internal_txs, coin_balances} =
+        Counters.address_limited_counters(address_hash_string, @api_true)
+
+      conn
+      |> put_status(200)
+      |> json(%{
+        validations_count: validations,
+        transactions_count: transactions,
+        token_transfers_count: token_transfers,
+        token_balances_count: token_balances,
+        logs_count: logs,
+        withdrawals_count: withdrawals,
+        internal_txs_count: internal_txs,
+        coin_balances_count: coin_balances
+      })
+    end
+  end
 end
diff --git a/apps/explorer/lib/explorer/chain/address/counters.ex b/apps/explorer/lib/explorer/chain/address/counters.ex
index 9548f4168c20..a8d2b78b6d69 100644
--- a/apps/explorer/lib/explorer/chain/address/counters.ex
+++ b/apps/explorer/lib/explorer/chain/address/counters.ex
@@ -2,10 +2,10 @@ defmodule Explorer.Chain.Address.Counters do
   @moduledoc """
     Functions related to Explorer.Chain.Address counters
   """
-  import Ecto.Query, only: [from: 2]
+  import Ecto.Query, only: [from: 2, limit: 2, select: 3, subquery: 1, union: 2, where: 3]
 
   import Explorer.Chain,
-    only: [select_repo: 1]
+    only: [select_repo: 1, wrapped_union_subquery: 1]
 
   alias Explorer.{Chain, Repo}
 
@@ -19,6 +19,7 @@ defmodule Explorer.Chain.Address.Counters do
 
   alias Explorer.Chain.{
     Address,
+    Address.CoinBalance,
     Address.CurrentTokenBalance,
     Block,
     Hash,
@@ -31,39 +32,47 @@ defmodule Explorer.Chain.Address.Counters do
 
   alias Explorer.Chain.Cache.Helper, as: CacheHelper
 
+  require Logger
+
+  defp address_hash_to_logs_query(address_hash) do
+    from(l in Log, where: l.address_hash == ^address_hash)
+  end
+
+  defp address_hash_to_validated_blocks_query(address_hash) do
+    from(b in Block, where: b.miner_hash == ^address_hash)
+  end
+
   def check_if_validated_blocks_at_address(address_hash, options \\ []) do
-    select_repo(options).exists?(from(b in Block, where: b.miner_hash == ^address_hash))
+    select_repo(options).exists?(address_hash_to_validated_blocks_query(address_hash))
   end
 
   def check_if_logs_at_address(address_hash, options \\ []) do
-    select_repo(options).exists?(from(l in Log, where: l.address_hash == ^address_hash))
+    select_repo(options).exists?(address_hash_to_logs_query(address_hash))
   end
 
-  def check_if_internal_transactions_at_address(address_hash) do
-    Repo.exists?(from(it in InternalTransaction, where: it.created_contract_address_hash == ^address_hash)) ||
-      Repo.exists?(from(it in InternalTransaction, where: it.from_address_hash == ^address_hash)) ||
-      Repo.exists?(from(it in InternalTransaction, where: it.to_address_hash == ^address_hash))
+  defp address_hash_to_coin_balances(address_hash) do
+    query =
+      from(
+        cb in CoinBalance,
+        where: cb.address_hash == ^address_hash,
+        where: not is_nil(cb.value),
+        select_merge: %{
+          delta: fragment("? - coalesce(lead(?, 1) over (order by ? desc), 0)", cb.value, cb.value, cb.block_number)
+        }
+      )
+
+    from(balance in subquery(query),
+      where: balance.delta != 0
+    )
   end
 
   def check_if_token_transfers_at_address(address_hash, options \\ []) do
-    token_transfers_exists_by_from_address_hash =
-      select_repo(options).exists?(from(tt in TokenTransfer, where: tt.from_address_hash == ^address_hash))
-
-    token_transfers_exists_by_to_address_hash =
+    select_repo(options).exists?(from(tt in TokenTransfer, where: tt.from_address_hash == ^address_hash)) ||
       select_repo(options).exists?(from(tt in TokenTransfer, where: tt.to_address_hash == ^address_hash))
-
-    token_transfers_exists_by_from_address_hash ||
-      token_transfers_exists_by_to_address_hash
   end
 
   def check_if_tokens_at_address(address_hash, options \\ []) do
-    select_repo(options).exists?(
-      from(
-        tb in CurrentTokenBalance,
-        where: tb.address_hash == ^address_hash,
-        where: tb.value > 0
-      )
-    )
+    select_repo(options).exists?(address_hash_to_token_balances_query(address_hash))
   end
 
   @spec check_if_withdrawals_at_address(Hash.Address.t()) :: boolean()
@@ -147,16 +156,12 @@ defmodule Explorer.Chain.Address.Counters do
     address_hash_to_transaction_count(address.hash)
   end
 
-  def address_hash_to_validation_count_query(hash) do
-    from(block in Block, where: block.miner_hash == ^hash, select: fragment("COUNT(*)"))
-  end
-
   @doc """
   Counts the number of `t:Explorer.Chain.Block.t/0` validated by the address with the given `hash`.
   """
   @spec address_to_validation_count(Hash.Address.t(), [Chain.api?()]) :: non_neg_integer()
   def address_to_validation_count(hash, options) do
-    query = address_hash_to_validation_count_query(hash)
+    query = from(block in Block, where: block.miner_hash == ^hash, select: fragment("COUNT(*)"))
 
     select_repo(options).one(query)
   end
@@ -207,18 +212,29 @@ defmodule Explorer.Chain.Address.Counters do
     Repo.aggregate(to_address_query, :sum, :gas_used, timeout: :infinity)
   end
 
+  def address_to_token_transfer_count_query(address_hash) do
+    from(
+      token_transfer in TokenTransfer,
+      where: token_transfer.to_address_hash == ^address_hash,
+      or_where: token_transfer.from_address_hash == ^address_hash
+    )
+  end
+
   @spec address_to_token_transfer_count(Address.t()) :: non_neg_integer()
   def address_to_token_transfer_count(address) do
-    query =
-      from(
-        token_transfer in TokenTransfer,
-        where: token_transfer.to_address_hash == ^address.hash,
-        or_where: token_transfer.from_address_hash == ^address.hash
-      )
+    query = address_to_token_transfer_count_query(address.hash)
 
     Repo.aggregate(query, :count, timeout: :infinity)
   end
 
+  def address_hash_to_token_balances_query(address_hash) do
+    from(
+      tb in CurrentTokenBalance,
+      where: tb.address_hash == ^address_hash,
+      where: tb.value > 0
+    )
+  end
+
   @spec address_to_gas_usage_count(Address.t()) :: Decimal.t() | nil
   def address_to_gas_usage_count(address) do
     if Chain.contract?(address) do
@@ -287,4 +303,241 @@ defmodule Explorer.Chain.Address.Counters do
   def gas_usage_count(address) do
     AddressTransactionsGasUsageCounter.fetch(address)
   end
+
+  @counters_limit 51
+
+  def address_limited_counters(address_hash, options) do
+    start = Time.utc_now()
+
+    validations_count_task =
+      Task.async(fn ->
+        result =
+          address_hash
+          |> address_hash_to_validated_blocks_query()
+          |> limit(@counters_limit)
+          |> select_repo(options).aggregate(:count)
+
+        Logger.info(
+          "Time consumed for validations_count_task for #{address_hash} is #{Time.diff(Time.utc_now(), start, :millisecond)}ms"
+        )
+
+        result
+      end)
+
+    transactions_from_count_task =
+      Task.async(fn ->
+        result =
+          Transaction
+          |> where([t], t.from_address_hash == ^address_hash)
+          |> Transaction.not_dropped_or_replaced_transactions()
+          |> select([t], t.hash)
+          |> limit(@counters_limit)
+          |> select_repo(options).all()
+
+        Logger.info(
+          "Time consumed for transactions_from_count_task for #{address_hash} is #{Time.diff(Time.utc_now(), start, :millisecond)}ms"
+        )
+
+        result
+      end)
+
+    transactions_to_count_task =
+      Task.async(fn ->
+        result =
+          Transaction
+          |> where([t], t.to_address_hash == ^address_hash)
+          |> Transaction.not_dropped_or_replaced_transactions()
+          |> select([t], t.hash)
+          |> limit(@counters_limit)
+          |> select_repo(options).all()
+
+        Logger.info(
+          "Time consumed for transactions_to_count_task for #{address_hash} is #{Time.diff(Time.utc_now(), start, :millisecond)}ms"
+        )
+
+        result
+      end)
+
+    transactions_created_contract_count_task =
+      Task.async(fn ->
+        result =
+          Transaction
+          |> where([t], t.created_contract_address_hash == ^address_hash)
+          |> Transaction.not_dropped_or_replaced_transactions()
+          |> select([t], t.hash)
+          |> limit(@counters_limit)
+          |> select_repo(options).all()
+
+        Logger.info(
+          "Time consumed for transactions_created_contract_count_task for #{address_hash} is #{Time.diff(Time.utc_now(), start, :millisecond)}ms"
+        )
+
+        result
+      end)
+
+    token_transfer_count_task =
+      Task.async(fn ->
+        result =
+          address_hash
+          |> address_to_token_transfer_count_query()
+          |> limit(@counters_limit)
+          |> select_repo(options).aggregate(:count)
+
+        Logger.info(
+          "Time consumed for token_transfer_count_task for #{address_hash} is #{Time.diff(Time.utc_now(), start, :millisecond)}ms"
+        )
+
+        result
+      end)
+
+    token_balances_count_task =
+      Task.async(fn ->
+        result =
+          address_hash
+          |> address_hash_to_token_balances_query()
+          |> limit(@counters_limit)
+          |> select_repo(options).aggregate(:count)
+
+        Logger.info(
+          "Time consumed for token_balances_count_task for #{address_hash} is #{Time.diff(Time.utc_now(), start, :millisecond)}ms"
+        )
+
+        result
+      end)
+
+    logs_count_task =
+      Task.async(fn ->
+        result =
+          address_hash
+          |> address_hash_to_logs_query()
+          |> limit(@counters_limit)
+          |> select_repo(options).aggregate(:count)
+
+        Logger.info(
+          "Time consumed for logs_count_task for #{address_hash} is #{Time.diff(Time.utc_now(), start, :millisecond)}ms"
+        )
+
+        result
+      end)
+
+    withdrawals_count_task =
+      Task.async(fn ->
+        result =
+          address_hash
+          |> Withdrawal.address_hash_to_withdrawals_unordered_query()
+          |> limit(@counters_limit)
+          |> select_repo(options).aggregate(:count)
+
+        Logger.info(
+          "Time consumed for withdrawals_count_task for #{address_hash} is #{Time.diff(Time.utc_now(), start, :millisecond)}ms"
+        )
+
+        result
+      end)
+
+    internal_txs_count_task =
+      Task.async(fn ->
+        query_to_address_hash_wrapped =
+          InternalTransaction
+          |> InternalTransaction.where_nonpending_block()
+          |> InternalTransaction.where_address_fields_match(address_hash, :to_address_hash)
+          |> InternalTransaction.where_is_different_from_parent_transaction()
+          |> limit(@counters_limit)
+          |> wrapped_union_subquery()
+
+        query_from_address_hash_wrapped =
+          InternalTransaction
+          |> InternalTransaction.where_nonpending_block()
+          |> InternalTransaction.where_address_fields_match(address_hash, :from_address_hash)
+          |> InternalTransaction.where_is_different_from_parent_transaction()
+          |> limit(@counters_limit)
+          |> wrapped_union_subquery()
+
+        query_created_contract_address_hash_wrapped =
+          InternalTransaction
+          |> InternalTransaction.where_nonpending_block()
+          |> InternalTransaction.where_address_fields_match(address_hash, :created_contract_address_hash)
+          |> InternalTransaction.where_is_different_from_parent_transaction()
+          |> limit(@counters_limit)
+          |> wrapped_union_subquery()
+
+        result =
+          query_to_address_hash_wrapped
+          |> union(^query_from_address_hash_wrapped)
+          |> union(^query_created_contract_address_hash_wrapped)
+          |> wrapped_union_subquery()
+          |> InternalTransaction.where_is_different_from_parent_transaction()
+          |> limit(@counters_limit)
+          |> select_repo(options).aggregate(:count)
+
+        Logger.info(
+          "Time consumed for internal_txs_count_task for #{address_hash} is #{Time.diff(Time.utc_now(), start, :millisecond)}ms"
+        )
+
+        result
+      end)
+
+    coin_balances_count_task =
+      Task.async(fn ->
+        result =
+          address_hash
+          |> address_hash_to_coin_balances()
+          |> limit(@counters_limit)
+          |> select_repo(options).aggregate(:count)
+
+        Logger.info(
+          "Time consumed for coin_balances_count_task for #{address_hash} is #{Time.diff(Time.utc_now(), start, :millisecond)}ms"
+        )
+
+        result
+      end)
+
+    {validations, txs_from, txs_to, txs_contract, token_transfers, token_balances, logs, withdrawals, internal_txs,
+     coin_balances} =
+      [
+        validations_count_task,
+        transactions_from_count_task,
+        transactions_to_count_task,
+        transactions_created_contract_count_task,
+        token_transfer_count_task,
+        token_balances_count_task,
+        logs_count_task,
+        withdrawals_count_task,
+        internal_txs_count_task,
+        coin_balances_count_task
+      ]
+      |> Task.yield_many(:timer.seconds(30))
+      |> Enum.map(fn {_task, res} ->
+        case res do
+          {:ok, result} ->
+            result
+
+          {:exit, reason} ->
+            Logger.warn(fn ->
+              [
+                "Query fetching address counters terminated: #{inspect(reason)}"
+              ]
+            end)
+
+            nil
+
+          nil ->
+            Logger.warn(fn ->
+              [
+                "Query fetching address counters timed out."
+              ]
+            end)
+
+            nil
+        end
+      end)
+      |> List.to_tuple()
+
+    {validations,
+     (sanitize_list(txs_from) ++ sanitize_list(txs_to) ++ sanitize_list(txs_contract)) |> Enum.dedup() |> Enum.count(),
+     token_transfers, token_balances, logs, withdrawals, internal_txs, coin_balances}
+  end
+
+  defp sanitize_list(nil), do: []
+  defp sanitize_list(other), do: other
 end

From 8a57a5057ef56115a387effe10ea3dc947dbba9c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 14 Aug 2023 18:32:28 +0000
Subject: [PATCH 300/909] Bump autoprefixer in /apps/block_scout_web/assets

Bumps [autoprefixer](https://github.com/postcss/autoprefixer) from 10.4.14 to 10.4.15.
- [Release notes](https://github.com/postcss/autoprefixer/releases)
- [Changelog](https://github.com/postcss/autoprefixer/blob/main/CHANGELOG.md)
- [Commits](https://github.com/postcss/autoprefixer/compare/10.4.14...10.4.15)

---
updated-dependencies:
- dependency-name: autoprefixer
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 apps/block_scout_web/assets/package-lock.json | 86 ++++++++++---------
 apps/block_scout_web/assets/package.json      |  2 +-
 2 files changed, 46 insertions(+), 42 deletions(-)

diff --git a/apps/block_scout_web/assets/package-lock.json b/apps/block_scout_web/assets/package-lock.json
index 848ae854eeee..b0d9743152d7 100644
--- a/apps/block_scout_web/assets/package-lock.json
+++ b/apps/block_scout_web/assets/package-lock.json
@@ -73,7 +73,7 @@
       "devDependencies": {
         "@babel/core": "^7.22.10",
         "@babel/preset-env": "^7.22.10",
-        "autoprefixer": "^10.4.14",
+        "autoprefixer": "^10.4.15",
         "babel-loader": "^9.1.3",
         "copy-webpack-plugin": "^11.0.0",
         "css-loader": "^5.2.7",
@@ -4503,9 +4503,9 @@
       "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k="
     },
     "node_modules/autoprefixer": {
-      "version": "10.4.14",
-      "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.4.14.tgz",
-      "integrity": "sha512-FQzyfOsTlwVzjHxKEqRIAdJx9niO6VCBCoEwax/VLSoQF29ggECcPuBqUMZ+u8jCZOPSy8b8/8KnuFbp0SaFZQ==",
+      "version": "10.4.15",
+      "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.4.15.tgz",
+      "integrity": "sha512-KCuPB8ZCIqFdA4HwKXsvz7j6gvSDNhDP7WnUjBleRkKjPdvCmHFuQ77ocavI8FT6NdvlBnE2UFr2H4Mycn8Vew==",
       "dev": true,
       "funding": [
         {
@@ -4515,11 +4515,15 @@
         {
           "type": "tidelift",
           "url": "https://tidelift.com/funding/github/npm/autoprefixer"
+        },
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/ai"
         }
       ],
       "dependencies": {
-        "browserslist": "^4.21.5",
-        "caniuse-lite": "^1.0.30001464",
+        "browserslist": "^4.21.10",
+        "caniuse-lite": "^1.0.30001520",
         "fraction.js": "^4.2.0",
         "normalize-range": "^0.1.2",
         "picocolors": "^1.0.0",
@@ -5083,9 +5087,9 @@
       ]
     },
     "node_modules/browserslist": {
-      "version": "4.21.9",
-      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.21.9.tgz",
-      "integrity": "sha512-M0MFoZzbUrRU4KNfCrDLnvyE7gub+peetoTid3TBIqtunaDJyXlwhakT+/VkvSXcfIzFfK/nkCs4nmyTmxdNSg==",
+      "version": "4.21.10",
+      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.21.10.tgz",
+      "integrity": "sha512-bipEBdZfVH5/pwrvqc+Ub0kUPVfGUhlKxbvfD+z1BDnPEO/X98ruXGA1WP5ASpAFKan7Qr6j736IacbZQuAlKQ==",
       "funding": [
         {
           "type": "opencollective",
@@ -5101,9 +5105,9 @@
         }
       ],
       "dependencies": {
-        "caniuse-lite": "^1.0.30001503",
-        "electron-to-chromium": "^1.4.431",
-        "node-releases": "^2.0.12",
+        "caniuse-lite": "^1.0.30001517",
+        "electron-to-chromium": "^1.4.477",
+        "node-releases": "^2.0.13",
         "update-browserslist-db": "^1.0.11"
       },
       "bin": {
@@ -5353,9 +5357,9 @@
       }
     },
     "node_modules/caniuse-lite": {
-      "version": "1.0.30001512",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001512.tgz",
-      "integrity": "sha512-2S9nK0G/mE+jasCUsMPlARhRCts1ebcp2Ji8Y8PWi4NDE1iRdLCnEPHkEfeBrGC45L4isBx5ur3IQ6yTE2mRZw==",
+      "version": "1.0.30001520",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001520.tgz",
+      "integrity": "sha512-tahF5O9EiiTzwTUqAeFjIZbn4Dnqxzz7ktrgGlMYNLH43Ul26IgTMH/zvL3DG0lZxBYnlT04axvInszUsZULdA==",
       "funding": [
         {
           "type": "opencollective",
@@ -6691,9 +6695,9 @@
       "integrity": "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow=="
     },
     "node_modules/electron-to-chromium": {
-      "version": "1.4.450",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.450.tgz",
-      "integrity": "sha512-BLG5HxSELlrMx7dJ2s+8SFlsCtJp37Zpk2VAxyC6CZtbc+9AJeZHfYHbrlSgdXp6saQ8StMqOTEDaBKgA7u1sw=="
+      "version": "1.4.490",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.490.tgz",
+      "integrity": "sha512-6s7NVJz+sATdYnIwhdshx/N/9O6rvMxmhVoDSDFdj6iA45gHR8EQje70+RYsF4GeB+k0IeNSBnP7yG9ZXJFr7A=="
     },
     "node_modules/elliptic": {
       "version": "6.5.4",
@@ -12852,9 +12856,9 @@
       "dev": true
     },
     "node_modules/node-releases": {
-      "version": "2.0.12",
-      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.12.tgz",
-      "integrity": "sha512-QzsYKWhXTWx8h1kIvqfnC++o0pEmpRQA/aenALsL2F4pqNVr7YzcdMlDij5WBnwftRbJCNJL/O7zdKaxKPHqgQ=="
+      "version": "2.0.13",
+      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.13.tgz",
+      "integrity": "sha512-uYr7J37ae/ORWdZeQ1xxMJe3NtdmqMC/JZK+geofDrkLUApKRHPd18/TxtBOJ4A0/+uUIliorNrfYV6s1b02eQ=="
     },
     "node_modules/normalize-path": {
       "version": "3.0.0",
@@ -20862,13 +20866,13 @@
       "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k="
     },
     "autoprefixer": {
-      "version": "10.4.14",
-      "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.4.14.tgz",
-      "integrity": "sha512-FQzyfOsTlwVzjHxKEqRIAdJx9niO6VCBCoEwax/VLSoQF29ggECcPuBqUMZ+u8jCZOPSy8b8/8KnuFbp0SaFZQ==",
+      "version": "10.4.15",
+      "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.4.15.tgz",
+      "integrity": "sha512-KCuPB8ZCIqFdA4HwKXsvz7j6gvSDNhDP7WnUjBleRkKjPdvCmHFuQ77ocavI8FT6NdvlBnE2UFr2H4Mycn8Vew==",
       "dev": true,
       "requires": {
-        "browserslist": "^4.21.5",
-        "caniuse-lite": "^1.0.30001464",
+        "browserslist": "^4.21.10",
+        "caniuse-lite": "^1.0.30001520",
         "fraction.js": "^4.2.0",
         "normalize-range": "^0.1.2",
         "picocolors": "^1.0.0",
@@ -21298,13 +21302,13 @@
       }
     },
     "browserslist": {
-      "version": "4.21.9",
-      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.21.9.tgz",
-      "integrity": "sha512-M0MFoZzbUrRU4KNfCrDLnvyE7gub+peetoTid3TBIqtunaDJyXlwhakT+/VkvSXcfIzFfK/nkCs4nmyTmxdNSg==",
+      "version": "4.21.10",
+      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.21.10.tgz",
+      "integrity": "sha512-bipEBdZfVH5/pwrvqc+Ub0kUPVfGUhlKxbvfD+z1BDnPEO/X98ruXGA1WP5ASpAFKan7Qr6j736IacbZQuAlKQ==",
       "requires": {
-        "caniuse-lite": "^1.0.30001503",
-        "electron-to-chromium": "^1.4.431",
-        "node-releases": "^2.0.12",
+        "caniuse-lite": "^1.0.30001517",
+        "electron-to-chromium": "^1.4.477",
+        "node-releases": "^2.0.13",
         "update-browserslist-db": "^1.0.11"
       }
     },
@@ -21495,9 +21499,9 @@
       }
     },
     "caniuse-lite": {
-      "version": "1.0.30001512",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001512.tgz",
-      "integrity": "sha512-2S9nK0G/mE+jasCUsMPlARhRCts1ebcp2Ji8Y8PWi4NDE1iRdLCnEPHkEfeBrGC45L4isBx5ur3IQ6yTE2mRZw=="
+      "version": "1.0.30001520",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001520.tgz",
+      "integrity": "sha512-tahF5O9EiiTzwTUqAeFjIZbn4Dnqxzz7ktrgGlMYNLH43Ul26IgTMH/zvL3DG0lZxBYnlT04axvInszUsZULdA=="
     },
     "caseless": {
       "version": "0.12.0",
@@ -22492,9 +22496,9 @@
       "integrity": "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow=="
     },
     "electron-to-chromium": {
-      "version": "1.4.450",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.450.tgz",
-      "integrity": "sha512-BLG5HxSELlrMx7dJ2s+8SFlsCtJp37Zpk2VAxyC6CZtbc+9AJeZHfYHbrlSgdXp6saQ8StMqOTEDaBKgA7u1sw=="
+      "version": "1.4.490",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.490.tgz",
+      "integrity": "sha512-6s7NVJz+sATdYnIwhdshx/N/9O6rvMxmhVoDSDFdj6iA45gHR8EQje70+RYsF4GeB+k0IeNSBnP7yG9ZXJFr7A=="
     },
     "elliptic": {
       "version": "6.5.4",
@@ -27297,9 +27301,9 @@
       "dev": true
     },
     "node-releases": {
-      "version": "2.0.12",
-      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.12.tgz",
-      "integrity": "sha512-QzsYKWhXTWx8h1kIvqfnC++o0pEmpRQA/aenALsL2F4pqNVr7YzcdMlDij5WBnwftRbJCNJL/O7zdKaxKPHqgQ=="
+      "version": "2.0.13",
+      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.13.tgz",
+      "integrity": "sha512-uYr7J37ae/ORWdZeQ1xxMJe3NtdmqMC/JZK+geofDrkLUApKRHPd18/TxtBOJ4A0/+uUIliorNrfYV6s1b02eQ=="
     },
     "normalize-path": {
       "version": "3.0.0",
diff --git a/apps/block_scout_web/assets/package.json b/apps/block_scout_web/assets/package.json
index 49f2d87b1200..1b5f4ba600c0 100644
--- a/apps/block_scout_web/assets/package.json
+++ b/apps/block_scout_web/assets/package.json
@@ -85,7 +85,7 @@
   "devDependencies": {
     "@babel/core": "^7.22.10",
     "@babel/preset-env": "^7.22.10",
-    "autoprefixer": "^10.4.14",
+    "autoprefixer": "^10.4.15",
     "babel-loader": "^9.1.3",
     "copy-webpack-plugin": "^11.0.0",
     "css-loader": "^5.2.7",

From 64983d7cb77d37d2ba7d057b2a44616c3a1d37f3 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 14 Aug 2023 18:57:06 +0000
Subject: [PATCH 301/909] Bump ex_doc from 0.30.4 to 0.30.5

Bumps [ex_doc](https://github.com/elixir-lang/ex_doc) from 0.30.4 to 0.30.5.
- [Changelog](https://github.com/elixir-lang/ex_doc/blob/main/CHANGELOG.md)
- [Commits](https://github.com/elixir-lang/ex_doc/compare/v0.30.4...v0.30.5)

---
updated-dependencies:
- dependency-name: ex_doc
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 mix.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mix.lock b/mix.lock
index 6449b2184b3c..3ebde9060e0b 100644
--- a/mix.lock
+++ b/mix.lock
@@ -47,7 +47,7 @@
   "ex_cldr_lists": {:hex, :ex_cldr_lists, "2.10.0", "4d4c9877da2d0417fd832907d69974e8328969f75fafc79b05ccf85f549f6281", [:mix], [{:ex_cldr_numbers, "~> 2.25", [hex: :ex_cldr_numbers, repo: "hexpm", optional: false]}, {:ex_doc, "~> 0.18", [hex: :ex_doc, repo: "hexpm", optional: true]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}], "hexpm", "adc040cde7b97f7fd7c0b35dd69ddb6fcf607303ae6355bb1851deae1f8b0652"},
   "ex_cldr_numbers": {:hex, :ex_cldr_numbers, "2.31.3", "6ec8b18c395c0e8788d46da806f8f2abcbe4b0d809226d2a91363e9ccd85f2f5", [:mix], [{:decimal, "~> 1.6 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: false]}, {:digital_token, "~> 0.3 or ~> 1.0", [hex: :digital_token, repo: "hexpm", optional: false]}, {:ex_cldr, "~> 2.37", [hex: :ex_cldr, repo: "hexpm", optional: false]}, {:ex_cldr_currencies, ">= 2.14.2", [hex: :ex_cldr_currencies, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}], "hexpm", "b519de08ecc4a6402038f3aa75e8654f78ebd6fa714b7e585531504e648588fd"},
   "ex_cldr_units": {:hex, :ex_cldr_units, "3.16.2", "dbad303fba819981c578234e2aaf19d72efca16ea8b1c6ee46b26232cb45e232", [:mix], [{:cldr_utils, "~> 2.24", [hex: :cldr_utils, repo: "hexpm", optional: false]}, {:decimal, "~> 1.6 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: false]}, {:ex_cldr_lists, "~> 2.10", [hex: :ex_cldr_lists, repo: "hexpm", optional: false]}, {:ex_cldr_numbers, "~> 2.31", [hex: :ex_cldr_numbers, repo: "hexpm", optional: false]}, {:ex_doc, "~> 0.18", [hex: :ex_doc, repo: "hexpm", optional: true]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}], "hexpm", "851095319fb3205c1549619da742cd53a2804c1d9c204cf84014021e2a6ea7e5"},
-  "ex_doc": {:hex, :ex_doc, "0.30.4", "e8395c8e3c007321abb30a334f9f7c0858d80949af298302daf77553468c0c39", [:mix], [{:earmark_parser, "~> 1.4.31", [hex: :earmark_parser, repo: "hexpm", optional: false]}, {:makeup_elixir, "~> 0.14", [hex: :makeup_elixir, repo: "hexpm", optional: false]}, {:makeup_erlang, "~> 0.1", [hex: :makeup_erlang, repo: "hexpm", optional: false]}], "hexpm", "9a19f0c50ffaa02435668f5242f2b2a61d46b541ebf326884505dfd3dd7af5e4"},
+  "ex_doc": {:hex, :ex_doc, "0.30.5", "aa6da96a5c23389d7dc7c381eba862710e108cee9cfdc629b7ec021313900e9e", [:mix], [{:earmark_parser, "~> 1.4.31", [hex: :earmark_parser, repo: "hexpm", optional: false]}, {:makeup_elixir, "~> 0.14", [hex: :makeup_elixir, repo: "hexpm", optional: false]}, {:makeup_erlang, "~> 0.1", [hex: :makeup_erlang, repo: "hexpm", optional: false]}], "hexpm", "88a1e115dcb91cefeef7e22df4a6ebbe4634fbf98b38adcbc25c9607d6d9d8e6"},
   "ex_json_schema": {:hex, :ex_json_schema, "0.10.1", "e03b746b6675a750c0bb1a5cc919f61353f7ab8450977e11ceede20e6180c560", [:mix], [{:decimal, "~> 2.0", [hex: :decimal, repo: "hexpm", optional: false]}], "hexpm", "66a64e60dadad89914d92f89c7e7906c57de75a8b79ac2480d0d53e1b8096fb0"},
   "ex_keccak": {:hex, :ex_keccak, "0.7.1", "0169f4b0c5073c5df61581d6282b12f1a1b764dcfcda4eeb1c819b5194c9ced0", [:mix], [{:rustler, ">= 0.0.0", [hex: :rustler, repo: "hexpm", optional: true]}, {:rustler_precompiled, "~> 0.6.1", [hex: :rustler_precompiled, repo: "hexpm", optional: false]}], "hexpm", "c18c19f66b6545b4b46b0c71c0cc0079de84e30b26365a92961e91697e8724ed"},
   "ex_machina": {:hex, :ex_machina, "2.7.0", "b792cc3127fd0680fecdb6299235b4727a4944a09ff0fa904cc639272cd92dc7", [:mix], [{:ecto, "~> 2.2 or ~> 3.0", [hex: :ecto, repo: "hexpm", optional: true]}, {:ecto_sql, "~> 3.0", [hex: :ecto_sql, repo: "hexpm", optional: true]}], "hexpm", "419aa7a39bde11894c87a615c4ecaa52d8f107bbdd81d810465186f783245bf8"},

From 0407a109556d6b62865bb8c97aa036d55d11a77b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 15 Aug 2023 08:30:42 +0000
Subject: [PATCH 302/909] Bump wallaby from 0.30.5 to 0.30.6

Bumps [wallaby](https://github.com/elixir-wallaby/wallaby) from 0.30.5 to 0.30.6.
- [Release notes](https://github.com/elixir-wallaby/wallaby/releases)
- [Changelog](https://github.com/elixir-wallaby/wallaby/blob/main/CHANGELOG.md)
- [Commits](https://github.com/elixir-wallaby/wallaby/compare/v0.30.5...v0.30.6)

---
updated-dependencies:
- dependency-name: wallaby
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 mix.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mix.lock b/mix.lock
index 3ebde9060e0b..506f06a33517 100644
--- a/mix.lock
+++ b/mix.lock
@@ -138,7 +138,7 @@
   "ueberauth": {:hex, :ueberauth, "0.10.5", "806adb703df87e55b5615cf365e809f84c20c68aa8c08ff8a416a5a6644c4b02", [:mix], [{:plug, "~> 1.5", [hex: :plug, repo: "hexpm", optional: false]}], "hexpm", "3efd1f31d490a125c7ed453b926f7c31d78b97b8a854c755f5c40064bf3ac9e1"},
   "ueberauth_auth0": {:hex, :ueberauth_auth0, "2.1.0", "0632d5844049fa2f26823f15e1120aa32f27df6f27ce515a4b04641736594bf4", [:mix], [{:oauth2, "~> 2.0", [hex: :oauth2, repo: "hexpm", optional: false]}, {:ueberauth, "~> 0.7", [hex: :ueberauth, repo: "hexpm", optional: false]}], "hexpm", "8d3b30fa27c95c9e82c30c4afb016251405706d2e9627e603c3c9787fd1314fc"},
   "unicode_util_compat": {:hex, :unicode_util_compat, "0.7.0", "bc84380c9ab48177092f43ac89e4dfa2c6d62b40b8bd132b1059ecc7232f9a78", [:rebar3], [], "hexpm", "25eee6d67df61960cf6a794239566599b09e17e668d3700247bc498638152521"},
-  "wallaby": {:hex, :wallaby, "0.30.5", "c6a8dbb6f3195dbfe080b50ba707973983e32446f6f9fac514a43918682696bb", [:mix], [{:ecto_sql, ">= 3.0.0", [hex: :ecto_sql, repo: "hexpm", optional: true]}, {:httpoison, "~> 0.12 or ~> 1.0 or ~> 2.0", [hex: :httpoison, repo: "hexpm", optional: false]}, {:jason, "~> 1.1", [hex: :jason, repo: "hexpm", optional: false]}, {:phoenix_ecto, ">= 3.0.0", [hex: :phoenix_ecto, repo: "hexpm", optional: true]}, {:web_driver_client, "~> 0.2.0", [hex: :web_driver_client, repo: "hexpm", optional: false]}], "hexpm", "d759711983c90aaa5338b8b9dcff0c9eb0609ac0a45071f4ef9cbb298bb54077"},
+  "wallaby": {:hex, :wallaby, "0.30.6", "7dc4c1213f3b52c4152581d126632bc7e06892336d3a0f582853efeeabd45a71", [:mix], [{:ecto_sql, ">= 3.0.0", [hex: :ecto_sql, repo: "hexpm", optional: true]}, {:httpoison, "~> 0.12 or ~> 1.0 or ~> 2.0", [hex: :httpoison, repo: "hexpm", optional: false]}, {:jason, "~> 1.1", [hex: :jason, repo: "hexpm", optional: false]}, {:phoenix_ecto, ">= 3.0.0", [hex: :phoenix_ecto, repo: "hexpm", optional: true]}, {:web_driver_client, "~> 0.2.0", [hex: :web_driver_client, repo: "hexpm", optional: false]}], "hexpm", "50950c1d968549b54c20e16175c68c7fc0824138e2bb93feb11ef6add8eb23d4"},
   "web_driver_client": {:hex, :web_driver_client, "0.2.0", "63b76cd9eb3b0716ec5467a0f8bead73d3d9612e63f7560d21357f03ad86e31a", [:mix], [{:hackney, "~> 1.6", [hex: :hackney, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: false]}, {:tesla, "~> 1.3", [hex: :tesla, repo: "hexpm", optional: false]}], "hexpm", "83cc6092bc3e74926d1c8455f0ce927d5d1d36707b74d9a65e38c084aab0350f"},
   "websocket_client": {:git, "https://github.com/blockscout/websocket_client.git", "0b4ecc5b1fb8a0bd1c8352728da787c20add53aa", [branch: "master"]},
 }

From 14c2a7cc7e4adfb2c8c229b9967a7ea4bfa4123b Mon Sep 17 00:00:00 2001
From: Viktor Baranov <baranov.viktor.27@gmail.com>
Date: Tue, 15 Aug 2023 16:30:53 +0300
Subject: [PATCH 303/909] Rename outdated DISABLE_READ_API/DISABLE_WRITE_API
 env vars

---
 .github/workflows/publish-docker-image-for-core.yml       | 4 ++--
 .github/workflows/publish-docker-image-for-eth-goerli.yml | 4 ++--
 .github/workflows/publish-docker-image-for-eth.yml        | 4 ++--
 .github/workflows/publish-docker-image-for-immutable.yml  | 4 ++--
 .github/workflows/publish-docker-image-for-l2-staging.yml | 4 ++--
 .github/workflows/publish-docker-image-for-lukso.yml      | 4 ++--
 .github/workflows/publish-docker-image-for-optimism.yml   | 4 ++--
 .github/workflows/publish-docker-image-for-rsk.yml        | 4 ++--
 .github/workflows/publish-docker-image-for-xdai.yml       | 4 ++--
 9 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/.github/workflows/publish-docker-image-for-core.yml b/.github/workflows/publish-docker-image-for-core.yml
index cf8c9344c091..4d96913b7ec4 100644
--- a/.github/workflows/publish-docker-image-for-core.yml
+++ b/.github/workflows/publish-docker-image-for-core.yml
@@ -44,9 +44,9 @@ jobs:
           tags: blockscout/blockscout-${{ env.DOCKER_CHAIN_NAME }}:latest, blockscout/blockscout-${{ env.DOCKER_CHAIN_NAME }}:${{ env.RELEASE_VERSION }}-postrelease-${{ env.SHORT_SHA }}
           build-args: |
             CACHE_EXCHANGE_RATES_PERIOD=
-            DISABLE_READ_API=false
+            API_V1_READ_METHODS_DISABLED=false
             DISABLE_WEBAPP=false
-            DISABLE_WRITE_API=false
+            API_V1_WRITE_METHODS_DISABLED=false
             CACHE_TOTAL_GAS_USAGE_COUNTER_ENABLED=
             ADMIN_PANEL_ENABLED=false
             CACHE_ADDRESS_WITH_BALANCES_UPDATE_INTERVAL=
diff --git a/.github/workflows/publish-docker-image-for-eth-goerli.yml b/.github/workflows/publish-docker-image-for-eth-goerli.yml
index 99da783794be..b1929be54ee2 100644
--- a/.github/workflows/publish-docker-image-for-eth-goerli.yml
+++ b/.github/workflows/publish-docker-image-for-eth-goerli.yml
@@ -44,9 +44,9 @@ jobs:
           tags: blockscout/blockscout-${{ env.DOCKER_CHAIN_NAME }}:latest, blockscout/blockscout-${{ env.DOCKER_CHAIN_NAME }}:${{ env.RELEASE_VERSION }}-postrelease-${{ env.SHORT_SHA }}
           build-args: |
             CACHE_EXCHANGE_RATES_PERIOD=
-            DISABLE_READ_API=false
+            API_V1_READ_METHODS_DISABLED=false
             DISABLE_WEBAPP=false
-            DISABLE_WRITE_API=false
+            API_V1_WRITE_METHODS_DISABLED=false
             CACHE_TOTAL_GAS_USAGE_COUNTER_ENABLED=
             ADMIN_PANEL_ENABLED=false
             CACHE_ADDRESS_WITH_BALANCES_UPDATE_INTERVAL=
diff --git a/.github/workflows/publish-docker-image-for-eth.yml b/.github/workflows/publish-docker-image-for-eth.yml
index a4598fa845b4..370325c7475c 100644
--- a/.github/workflows/publish-docker-image-for-eth.yml
+++ b/.github/workflows/publish-docker-image-for-eth.yml
@@ -44,9 +44,9 @@ jobs:
           tags:  blockscout/blockscout-${{ env.DOCKER_CHAIN_NAME }}:${{ env.RELEASE_VERSION }}-postrelease-${{ env.SHORT_SHA }}-experimental
           build-args: |
             CACHE_EXCHANGE_RATES_PERIOD=
-            DISABLE_READ_API=false
+            API_V1_READ_METHODS_DISABLED=false
             DISABLE_WEBAPP=false
-            DISABLE_WRITE_API=false
+            API_V1_WRITE_METHODS_DISABLED=false
             CACHE_TOTAL_GAS_USAGE_COUNTER_ENABLED=false
             ADMIN_PANEL_ENABLED=false
             CACHE_ADDRESS_WITH_BALANCES_UPDATE_INTERVAL=
diff --git a/.github/workflows/publish-docker-image-for-immutable.yml b/.github/workflows/publish-docker-image-for-immutable.yml
index abf6071504bc..b627dd193504 100644
--- a/.github/workflows/publish-docker-image-for-immutable.yml
+++ b/.github/workflows/publish-docker-image-for-immutable.yml
@@ -53,9 +53,9 @@ jobs:
           tags: blockscout/blockscout-${{ env.DOCKER_CHAIN_NAME }}:latest, blockscout/blockscout-${{ env.DOCKER_CHAIN_NAME }}:${{ env.RELEASE_VERSION }}-postrelease-${{ env.SHORT_SHA }}
           build-args: |
             CACHE_EXCHANGE_RATES_PERIOD=
-            DISABLE_READ_API=false
+            API_V1_READ_METHODS_DISABLED=false
             DISABLE_WEBAPP=false
-            DISABLE_WRITE_API=false
+            API_V1_WRITE_METHODS_DISABLED=false
             CACHE_TOTAL_GAS_USAGE_COUNTER_ENABLED=
             ADMIN_PANEL_ENABLED=false
             CACHE_ADDRESS_WITH_BALANCES_UPDATE_INTERVAL=
diff --git a/.github/workflows/publish-docker-image-for-l2-staging.yml b/.github/workflows/publish-docker-image-for-l2-staging.yml
index 4a85493e9efb..61e543b5bef1 100644
--- a/.github/workflows/publish-docker-image-for-l2-staging.yml
+++ b/.github/workflows/publish-docker-image-for-l2-staging.yml
@@ -44,9 +44,9 @@ jobs:
           tags: blockscout/blockscout-${{ env.DOCKER_CHAIN_NAME }}:latest, blockscout/blockscout-${{ env.DOCKER_CHAIN_NAME }}:${{ env.RELEASE_VERSION }}-postrelease-${{ env.SHORT_SHA }}
           build-args: |
             CACHE_EXCHANGE_RATES_PERIOD=
-            DISABLE_READ_API=false
+            API_V1_READ_METHODS_DISABLED=false
             DISABLE_WEBAPP=false
-            DISABLE_WRITE_API=false
+            API_V1_WRITE_METHODS_DISABLED=false
             CACHE_TOTAL_GAS_USAGE_COUNTER_ENABLED=
             ADMIN_PANEL_ENABLED=false
             CACHE_ADDRESS_WITH_BALANCES_UPDATE_INTERVAL=
diff --git a/.github/workflows/publish-docker-image-for-lukso.yml b/.github/workflows/publish-docker-image-for-lukso.yml
index 96109f811cf1..2848e38333b6 100644
--- a/.github/workflows/publish-docker-image-for-lukso.yml
+++ b/.github/workflows/publish-docker-image-for-lukso.yml
@@ -44,9 +44,9 @@ jobs:
           tags: blockscout/blockscout-${{ env.DOCKER_CHAIN_NAME }}:latest, blockscout/blockscout-${{ env.DOCKER_CHAIN_NAME }}:${{ env.RELEASE_VERSION }}-postrelease-${{ env.SHORT_SHA }}
           build-args: |
             CACHE_EXCHANGE_RATES_PERIOD=
-            DISABLE_READ_API=false
+            API_V1_READ_METHODS_DISABLED=false
             DISABLE_WEBAPP=false
-            DISABLE_WRITE_API=false
+            API_V1_WRITE_METHODS_DISABLED=false
             CACHE_TOTAL_GAS_USAGE_COUNTER_ENABLED=
             ADMIN_PANEL_ENABLED=false
             CACHE_ADDRESS_WITH_BALANCES_UPDATE_INTERVAL=
diff --git a/.github/workflows/publish-docker-image-for-optimism.yml b/.github/workflows/publish-docker-image-for-optimism.yml
index e1406ee5a24f..c955d0d20396 100644
--- a/.github/workflows/publish-docker-image-for-optimism.yml
+++ b/.github/workflows/publish-docker-image-for-optimism.yml
@@ -44,9 +44,9 @@ jobs:
           tags: blockscout/blockscout-${{ env.DOCKER_CHAIN_NAME }}:latest, blockscout/blockscout-${{ env.DOCKER_CHAIN_NAME }}:${{ env.RELEASE_VERSION }}-postrelease-${{ env.SHORT_SHA }}
           build-args: |
             CACHE_EXCHANGE_RATES_PERIOD=
-            DISABLE_READ_API=false
+            API_V1_READ_METHODS_DISABLED=false
             DISABLE_WEBAPP=false
-            DISABLE_WRITE_API=false
+            API_V1_WRITE_METHODS_DISABLED=false
             CACHE_TOTAL_GAS_USAGE_COUNTER_ENABLED=
             ADMIN_PANEL_ENABLED=false
             CACHE_ADDRESS_WITH_BALANCES_UPDATE_INTERVAL=
diff --git a/.github/workflows/publish-docker-image-for-rsk.yml b/.github/workflows/publish-docker-image-for-rsk.yml
index fca3a4d13f04..9e7a2e261ff7 100644
--- a/.github/workflows/publish-docker-image-for-rsk.yml
+++ b/.github/workflows/publish-docker-image-for-rsk.yml
@@ -44,9 +44,9 @@ jobs:
           tags: blockscout/blockscout-${{ env.DOCKER_CHAIN_NAME }}:latest, blockscout/blockscout-${{ env.DOCKER_CHAIN_NAME }}:${{ env.RELEASE_VERSION }}-postrelease-${{ env.SHORT_SHA }}
           build-args: |
             CACHE_EXCHANGE_RATES_PERIOD=
-            DISABLE_READ_API=false
+            API_V1_READ_METHODS_DISABLED=false
             DISABLE_WEBAPP=false
-            DISABLE_WRITE_API=false
+            API_V1_WRITE_METHODS_DISABLED=false
             CACHE_TOTAL_GAS_USAGE_COUNTER_ENABLED=
             ADMIN_PANEL_ENABLED=false
             CACHE_ADDRESS_WITH_BALANCES_UPDATE_INTERVAL=
diff --git a/.github/workflows/publish-docker-image-for-xdai.yml b/.github/workflows/publish-docker-image-for-xdai.yml
index 1f047a818b84..42f7cf603698 100644
--- a/.github/workflows/publish-docker-image-for-xdai.yml
+++ b/.github/workflows/publish-docker-image-for-xdai.yml
@@ -53,9 +53,9 @@ jobs:
           tags: blockscout/blockscout-${{ env.DOCKER_CHAIN_NAME }}:latest, blockscout/blockscout-${{ env.DOCKER_CHAIN_NAME }}:${{ env.RELEASE_VERSION }}-postrelease-${{ env.SHORT_SHA }}
           build-args: |
             CACHE_EXCHANGE_RATES_PERIOD=
-            DISABLE_READ_API=false
+            API_V1_READ_METHODS_DISABLED=false
             DISABLE_WEBAPP=false
-            DISABLE_WRITE_API=false
+            API_V1_WRITE_METHODS_DISABLED=false
             CACHE_TOTAL_GAS_USAGE_COUNTER_ENABLED=
             ADMIN_PANEL_ENABLED=false
             CACHE_ADDRESS_WITH_BALANCES_UPDATE_INTERVAL=

From 7b2baefd8b696706ae5d0c29f44683c12e61f2a5 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 15 Aug 2023 18:15:54 +0000
Subject: [PATCH 304/909] Bump sweetalert2 from 11.7.22 to 11.7.23 in
 /apps/block_scout_web/assets

Bumps [sweetalert2](https://github.com/sweetalert2/sweetalert2) from 11.7.22 to 11.7.23.
- [Release notes](https://github.com/sweetalert2/sweetalert2/releases)
- [Changelog](https://github.com/sweetalert2/sweetalert2/blob/main/CHANGELOG.md)
- [Commits](https://github.com/sweetalert2/sweetalert2/compare/v11.7.22...v11.7.23)

---
updated-dependencies:
- dependency-name: sweetalert2
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 apps/block_scout_web/assets/package-lock.json | 14 +++++++-------
 apps/block_scout_web/assets/package.json      |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/apps/block_scout_web/assets/package-lock.json b/apps/block_scout_web/assets/package-lock.json
index 848ae854eeee..8f826ae5b2c7 100644
--- a/apps/block_scout_web/assets/package-lock.json
+++ b/apps/block_scout_web/assets/package-lock.json
@@ -61,7 +61,7 @@
         "redux": "^4.2.1",
         "stream-browserify": "^3.0.0",
         "stream-http": "^3.1.1",
-        "sweetalert2": "^11.7.22",
+        "sweetalert2": "^11.7.23",
         "urijs": "^1.19.11",
         "url": "^0.11.1",
         "util": "^0.12.5",
@@ -15818,9 +15818,9 @@
       }
     },
     "node_modules/sweetalert2": {
-      "version": "11.7.22",
-      "resolved": "https://registry.npmjs.org/sweetalert2/-/sweetalert2-11.7.22.tgz",
-      "integrity": "sha512-Xu5now8VnxBKtdnoQw562zXldCOJ/pNsFHTcmSGgJHH+702Bulh4Ps00/js9HqFv00mZ6Hf1wm4BXxqssWyREg==",
+      "version": "11.7.23",
+      "resolved": "https://registry.npmjs.org/sweetalert2/-/sweetalert2-11.7.23.tgz",
+      "integrity": "sha512-zhc2Jc/coeUFPCM7LyVaUddbSz1Av9/EgQVXxZVPre8cwJrTZXCOEAboCT11StS3vaFTio74cumWustmNzDOEw==",
       "funding": {
         "type": "individual",
         "url": "https://github.com/sponsors/limonte"
@@ -29413,9 +29413,9 @@
       }
     },
     "sweetalert2": {
-      "version": "11.7.22",
-      "resolved": "https://registry.npmjs.org/sweetalert2/-/sweetalert2-11.7.22.tgz",
-      "integrity": "sha512-Xu5now8VnxBKtdnoQw562zXldCOJ/pNsFHTcmSGgJHH+702Bulh4Ps00/js9HqFv00mZ6Hf1wm4BXxqssWyREg=="
+      "version": "11.7.23",
+      "resolved": "https://registry.npmjs.org/sweetalert2/-/sweetalert2-11.7.23.tgz",
+      "integrity": "sha512-zhc2Jc/coeUFPCM7LyVaUddbSz1Av9/EgQVXxZVPre8cwJrTZXCOEAboCT11StS3vaFTio74cumWustmNzDOEw=="
     },
     "symbol-tree": {
       "version": "3.2.4",
diff --git a/apps/block_scout_web/assets/package.json b/apps/block_scout_web/assets/package.json
index 49f2d87b1200..ee7cc3765c09 100644
--- a/apps/block_scout_web/assets/package.json
+++ b/apps/block_scout_web/assets/package.json
@@ -73,7 +73,7 @@
     "redux": "^4.2.1",
     "stream-browserify": "^3.0.0",
     "stream-http": "^3.1.1",
-    "sweetalert2": "^11.7.22",
+    "sweetalert2": "^11.7.23",
     "urijs": "^1.19.11",
     "url": "^0.11.1",
     "util": "^0.12.5",

From ef41c845b919a138ab35e1937a2219fecd718e2f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 15 Aug 2023 18:16:40 +0000
Subject: [PATCH 305/909] Bump @amplitude/analytics-browser in
 /apps/block_scout_web/assets

Bumps [@amplitude/analytics-browser](https://github.com/amplitude/Amplitude-TypeScript) from 2.1.3 to 2.2.0.
- [Release notes](https://github.com/amplitude/Amplitude-TypeScript/releases)
- [Commits](https://github.com/amplitude/Amplitude-TypeScript/compare/@amplitude/analytics-browser@2.1.3...@amplitude/analytics-browser@2.2.0)

---
updated-dependencies:
- dependency-name: "@amplitude/analytics-browser"
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 apps/block_scout_web/assets/package-lock.json | 46 +++++++++----------
 apps/block_scout_web/assets/package.json      |  2 +-
 2 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/apps/block_scout_web/assets/package-lock.json b/apps/block_scout_web/assets/package-lock.json
index 848ae854eeee..179319c65c40 100644
--- a/apps/block_scout_web/assets/package-lock.json
+++ b/apps/block_scout_web/assets/package-lock.json
@@ -7,7 +7,7 @@
       "name": "blockscout",
       "license": "GPL-3.0",
       "dependencies": {
-        "@amplitude/analytics-browser": "^2.1.3",
+        "@amplitude/analytics-browser": "^2.2.0",
         "@fortawesome/fontawesome-free": "^6.4.2",
         "@tarekraafat/autocomplete.js": "^10.2.7",
         "@walletconnect/web3-provider": "^1.8.0",
@@ -116,15 +116,15 @@
       }
     },
     "node_modules/@amplitude/analytics-browser": {
-      "version": "2.1.3",
-      "resolved": "https://registry.npmjs.org/@amplitude/analytics-browser/-/analytics-browser-2.1.3.tgz",
-      "integrity": "sha512-DQqjyRdkmUEHxGBuMEDOPNTssE0of+xZa2WtjmsxEZcIhtUSjViEJfRMg6Eup8O72m+7S+wQO3psfQecuZ1OnQ==",
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/@amplitude/analytics-browser/-/analytics-browser-2.2.0.tgz",
+      "integrity": "sha512-gCRnvXT5FDmaXbrmDVdVLbm7ubYgpQX2dRnA3R8uPfqw3YGXszueVxTPKYuMf0fdQ3+1N9RcPmyEycpywN9vKg==",
       "dependencies": {
         "@amplitude/analytics-client-common": "^2.0.4",
         "@amplitude/analytics-core": "^2.0.3",
         "@amplitude/analytics-types": "^2.1.1",
-        "@amplitude/plugin-page-view-tracking-browser": "^2.0.5",
-        "@amplitude/plugin-web-attribution-browser": "^2.0.5",
+        "@amplitude/plugin-page-view-tracking-browser": "^2.0.6",
+        "@amplitude/plugin-web-attribution-browser": "^2.0.6",
         "tslib": "^2.4.1"
       }
     },
@@ -174,9 +174,9 @@
       "integrity": "sha512-H3vebPR9onRdp0WzAZmI/4qmAE903uLOd2ZfMeHsVc1zaFTTCk46SoCuV4IrlF+VILrDw9Fy6gC9yl5N2PZcJQ=="
     },
     "node_modules/@amplitude/plugin-page-view-tracking-browser": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/@amplitude/plugin-page-view-tracking-browser/-/plugin-page-view-tracking-browser-2.0.5.tgz",
-      "integrity": "sha512-dmW2dckEaI/Z9DQ+3RNJU32cF4c6iYsFamvu73LDu/sttE0gmqWDRvZhh/B7j/VDxYmobySMUEV1kinjbn8vXg==",
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/@amplitude/plugin-page-view-tracking-browser/-/plugin-page-view-tracking-browser-2.0.6.tgz",
+      "integrity": "sha512-V8ef24E+KYINQf1o9MQnkmhFmQHGD5lb6mlTH8jGD2PdUe/KDXdO4S4rpBewxcrAfUH+iEqEanbVnTWpg6iPnw==",
       "dependencies": {
         "@amplitude/analytics-client-common": "^2.0.4",
         "@amplitude/analytics-types": "^2.1.1",
@@ -189,9 +189,9 @@
       "integrity": "sha512-t0hLfiEKfMUoqhG+U1oid7Pva4bbDPHYfJNiB7BiIjRkj1pyC++4N3huJfqY6aRH6VTB0rvtzQwjM4K6qpfOig=="
     },
     "node_modules/@amplitude/plugin-web-attribution-browser": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/@amplitude/plugin-web-attribution-browser/-/plugin-web-attribution-browser-2.0.5.tgz",
-      "integrity": "sha512-apLZ4XV0Xbq4E3sHY25zubiyqHX9IWupWk+RTMNqHZJyhC7JuA3ttVFU3p0fWM/XeumITMRPL2NcG9R9WO4y9Q==",
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/@amplitude/plugin-web-attribution-browser/-/plugin-web-attribution-browser-2.0.6.tgz",
+      "integrity": "sha512-+WQuhHJn7ZsYaTMe6iPE081b6y2oe9m+W/eZW+Lyf99Vt3rntDVYZIgZVwwds0s2SsUBcSvYFu1JgS65NfxWNQ==",
       "dependencies": {
         "@amplitude/analytics-client-common": "^2.0.4",
         "@amplitude/analytics-core": "^2.0.3",
@@ -17570,15 +17570,15 @@
       "dev": true
     },
     "@amplitude/analytics-browser": {
-      "version": "2.1.3",
-      "resolved": "https://registry.npmjs.org/@amplitude/analytics-browser/-/analytics-browser-2.1.3.tgz",
-      "integrity": "sha512-DQqjyRdkmUEHxGBuMEDOPNTssE0of+xZa2WtjmsxEZcIhtUSjViEJfRMg6Eup8O72m+7S+wQO3psfQecuZ1OnQ==",
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/@amplitude/analytics-browser/-/analytics-browser-2.2.0.tgz",
+      "integrity": "sha512-gCRnvXT5FDmaXbrmDVdVLbm7ubYgpQX2dRnA3R8uPfqw3YGXszueVxTPKYuMf0fdQ3+1N9RcPmyEycpywN9vKg==",
       "requires": {
         "@amplitude/analytics-client-common": "^2.0.4",
         "@amplitude/analytics-core": "^2.0.3",
         "@amplitude/analytics-types": "^2.1.1",
-        "@amplitude/plugin-page-view-tracking-browser": "^2.0.5",
-        "@amplitude/plugin-web-attribution-browser": "^2.0.5",
+        "@amplitude/plugin-page-view-tracking-browser": "^2.0.6",
+        "@amplitude/plugin-web-attribution-browser": "^2.0.6",
         "tslib": "^2.4.1"
       },
       "dependencies": {
@@ -17634,9 +17634,9 @@
       "integrity": "sha512-H3vebPR9onRdp0WzAZmI/4qmAE903uLOd2ZfMeHsVc1zaFTTCk46SoCuV4IrlF+VILrDw9Fy6gC9yl5N2PZcJQ=="
     },
     "@amplitude/plugin-page-view-tracking-browser": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/@amplitude/plugin-page-view-tracking-browser/-/plugin-page-view-tracking-browser-2.0.5.tgz",
-      "integrity": "sha512-dmW2dckEaI/Z9DQ+3RNJU32cF4c6iYsFamvu73LDu/sttE0gmqWDRvZhh/B7j/VDxYmobySMUEV1kinjbn8vXg==",
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/@amplitude/plugin-page-view-tracking-browser/-/plugin-page-view-tracking-browser-2.0.6.tgz",
+      "integrity": "sha512-V8ef24E+KYINQf1o9MQnkmhFmQHGD5lb6mlTH8jGD2PdUe/KDXdO4S4rpBewxcrAfUH+iEqEanbVnTWpg6iPnw==",
       "requires": {
         "@amplitude/analytics-client-common": "^2.0.4",
         "@amplitude/analytics-types": "^2.1.1",
@@ -17651,9 +17651,9 @@
       }
     },
     "@amplitude/plugin-web-attribution-browser": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/@amplitude/plugin-web-attribution-browser/-/plugin-web-attribution-browser-2.0.5.tgz",
-      "integrity": "sha512-apLZ4XV0Xbq4E3sHY25zubiyqHX9IWupWk+RTMNqHZJyhC7JuA3ttVFU3p0fWM/XeumITMRPL2NcG9R9WO4y9Q==",
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/@amplitude/plugin-web-attribution-browser/-/plugin-web-attribution-browser-2.0.6.tgz",
+      "integrity": "sha512-+WQuhHJn7ZsYaTMe6iPE081b6y2oe9m+W/eZW+Lyf99Vt3rntDVYZIgZVwwds0s2SsUBcSvYFu1JgS65NfxWNQ==",
       "requires": {
         "@amplitude/analytics-client-common": "^2.0.4",
         "@amplitude/analytics-core": "^2.0.3",
diff --git a/apps/block_scout_web/assets/package.json b/apps/block_scout_web/assets/package.json
index 49f2d87b1200..e8bc939ee690 100644
--- a/apps/block_scout_web/assets/package.json
+++ b/apps/block_scout_web/assets/package.json
@@ -20,7 +20,7 @@
   },
   "dependencies": {
     "@fortawesome/fontawesome-free": "^6.4.2",
-    "@amplitude/analytics-browser": "^2.1.3",
+    "@amplitude/analytics-browser": "^2.2.0",
     "@tarekraafat/autocomplete.js": "^10.2.7",
     "@walletconnect/web3-provider": "^1.8.0",
     "assert": "^2.0.0",

From 13274d6068f6a60f4411d6f44f3662c7ca6416a7 Mon Sep 17 00:00:00 2001
From: Nikita Pozdniakov <nikitosing4@mail.ru>
Date: Wed, 16 Aug 2023 13:58:51 +0300
Subject: [PATCH 306/909] Add /api/v2/search/quick method

---
 CHANGELOG.md                                  |   1 +
 .../lib/block_scout_web/api_router.ex         |   1 +
 .../controllers/api/v2/search_controller.ex   |  14 +-
 .../views/api/v2/search_view.ex               |   7 +-
 .../api/v2/search_controller_test.exs         |  41 ++++++
 apps/explorer/lib/explorer/chain.ex           | 121 ++++++++++++++++++
 apps/explorer/test/support/factory.ex         |  12 +-
 7 files changed, 190 insertions(+), 7 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index bb77d6c8852f..ce8465be618e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,7 @@
 
 ### Features
 
+- [#8218](https://github.com/blockscout/blockscout/pull/8218) - Add `/api/v2/search/quick` method
 - [#8156](https://github.com/blockscout/blockscout/pull/8156) - Add `is_verified_via_admin_panel` property to tokens table
 - [#8165](https://github.com/blockscout/blockscout/pull/8165), [#8201](https://github.com/blockscout/blockscout/pull/8201) - Add broadcast of updated address_current_token_balances
 - [#7952](https://github.com/blockscout/blockscout/pull/7952) - Add parsing constructor arguments for sourcify contracts
diff --git a/apps/block_scout_web/lib/block_scout_web/api_router.ex b/apps/block_scout_web/lib/block_scout_web/api_router.ex
index 45bacd7ad97e..ee86539fce22 100644
--- a/apps/block_scout_web/lib/block_scout_web/api_router.ex
+++ b/apps/block_scout_web/lib/block_scout_web/api_router.ex
@@ -124,6 +124,7 @@ defmodule BlockScoutWeb.ApiRouter do
     scope "/search" do
       get("/", V2.SearchController, :search)
       get("/check-redirect", V2.SearchController, :check_redirect)
+      get("/quick", V2.SearchController, :quick_search)
     end
 
     scope "/config" do
diff --git a/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/search_controller.ex b/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/search_controller.ex
index e76b4408e2f0..c2418a94c386 100644
--- a/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/search_controller.ex
+++ b/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/search_controller.ex
@@ -3,7 +3,9 @@ defmodule BlockScoutWeb.API.V2.SearchController do
 
   import BlockScoutWeb.Chain, only: [paging_options: 1, next_page_params: 3, split_list_by_page: 1, from_param: 1]
 
-  alias Explorer.Chain
+  alias Explorer.{Chain, PagingOptions}
+
+  @api_true [api?: true]
 
   def search(conn, %{"q" => query} = params) do
     [paging_options: paging_options] = paging_options(params)
@@ -11,7 +13,7 @@ defmodule BlockScoutWeb.API.V2.SearchController do
 
     search_results_plus_one =
       paging_options
-      |> Chain.joint_search(offset, query, api?: true)
+      |> Chain.joint_search(offset, query, @api_true)
 
     {search_results, next_page} = split_list_by_page(search_results_plus_one)
 
@@ -32,4 +34,12 @@ defmodule BlockScoutWeb.API.V2.SearchController do
     |> put_status(200)
     |> render(:search_results, %{result: result})
   end
+
+  def quick_search(conn, %{"q" => query}) do
+    search_results = Chain.balanced_unpaginated_search(%PagingOptions{page_size: 50}, query, @api_true)
+
+    conn
+    |> put_status(200)
+    |> render(:search_results, %{search_results: search_results})
+  end
 end
diff --git a/apps/block_scout_web/lib/block_scout_web/views/api/v2/search_view.ex b/apps/block_scout_web/lib/block_scout_web/views/api/v2/search_view.ex
index 91077ba84289..3663e2f96e80 100644
--- a/apps/block_scout_web/lib/block_scout_web/views/api/v2/search_view.ex
+++ b/apps/block_scout_web/lib/block_scout_web/views/api/v2/search_view.ex
@@ -2,12 +2,16 @@ defmodule BlockScoutWeb.API.V2.SearchView do
   use BlockScoutWeb, :view
 
   alias BlockScoutWeb.Endpoint
-  alias Explorer.Chain.{Address, Block, Transaction}
+  alias Explorer.Chain.{Address, Block, Hash, Transaction}
 
   def render("search_results.json", %{search_results: search_results, next_page_params: next_page_params}) do
     %{"items" => Enum.map(search_results, &prepare_search_result/1), "next_page_params" => next_page_params}
   end
 
+  def render("search_results.json", %{search_results: search_results}) do
+    Enum.map(search_results, &prepare_search_result/1)
+  end
+
   def render("search_results.json", %{result: {:ok, result}}) do
     Map.merge(%{"redirect" => true}, redirect_search_results(result))
   end
@@ -69,6 +73,7 @@ defmodule BlockScoutWeb.API.V2.SearchView do
     }
   end
 
+  defp hash_to_string(%Hash{bytes: bytes}), do: hash_to_string(bytes)
   defp hash_to_string(hash), do: "0x" <> Base.encode16(hash, case: :lower)
 
   defp redirect_search_results(%Address{} = item) do
diff --git a/apps/block_scout_web/test/block_scout_web/controllers/api/v2/search_controller_test.exs b/apps/block_scout_web/test/block_scout_web/controllers/api/v2/search_controller_test.exs
index fc19b050d089..a00fce0d386f 100644
--- a/apps/block_scout_web/test/block_scout_web/controllers/api/v2/search_controller_test.exs
+++ b/apps/block_scout_web/test/block_scout_web/controllers/api/v2/search_controller_test.exs
@@ -3,6 +3,7 @@ defmodule BlockScoutWeb.API.V2.SearchControllerTest do
 
   alias Explorer.Chain.{Address, Block}
   alias Explorer.Repo
+  alias Explorer.Tags.AddressTag
 
   setup do
     insert(:block)
@@ -288,4 +289,44 @@ defmodule BlockScoutWeb.API.V2.SearchControllerTest do
       %{"redirect" => false, "type" => nil, "parameter" => nil} = json_response(request, 200)
     end
   end
+
+  describe "/search/quick" do
+    test "check that all categories are in response list", %{conn: conn} do
+      name = "156000"
+
+      tags =
+        for _ <- 0..50 do
+          insert(:address_to_tag, tag: build(:address_tag, display_name: name))
+        end
+
+      contracts = insert_list(50, :smart_contract, name: name)
+      tokens = insert_list(50, :token, name: name)
+      blocks = [insert(:block, number: name, consensus: false), insert(:block, number: name)]
+
+      request = get(conn, "/api/v2/search/quick?q=#{name}")
+      assert response = json_response(request, 200)
+      assert Enum.count(response) == 50
+
+      assert response |> Enum.filter(fn x -> x["type"] == "label" end) |> Enum.map(fn x -> x["address"] end) ==
+               tags |> Enum.reverse() |> Enum.take(16) |> Enum.map(fn tag -> Address.checksum(tag.address.hash) end)
+
+      assert response |> Enum.filter(fn x -> x["type"] == "contract" end) |> Enum.map(fn x -> x["address"] end) ==
+               contracts
+               |> Enum.reverse()
+               |> Enum.take(16)
+               |> Enum.map(fn contract -> Address.checksum(contract.address_hash) end)
+
+      assert response |> Enum.filter(fn x -> x["type"] == "token" end) |> Enum.map(fn x -> x["address"] end) ==
+               tokens
+               |> Enum.reverse()
+               |> Enum.sort_by(fn x -> x.is_verified_via_admin_panel end, :desc)
+               |> Enum.take(16)
+               |> Enum.map(fn token -> Address.checksum(token.contract_address_hash) end)
+
+      block_hashes = response |> Enum.filter(fn x -> x["type"] == "block" end) |> Enum.map(fn x -> x["block_hash"] end)
+
+      assert block_hashes == blocks |> Enum.reverse() |> Enum.map(fn block -> to_string(block.hash) end) ||
+               block_hashes == blocks |> Enum.map(fn block -> to_string(block.hash) end)
+    end
+  end
 end
diff --git a/apps/explorer/lib/explorer/chain.ex b/apps/explorer/lib/explorer/chain.ex
index f69815cabbb9..b80020cec605 100644
--- a/apps/explorer/lib/explorer/chain.ex
+++ b/apps/explorer/lib/explorer/chain.ex
@@ -1658,6 +1658,127 @@ defmodule Explorer.Chain do
     end
   end
 
+  def balanced_unpaginated_search(paging_options, raw_search_query, options \\ []) do
+    search_query = String.trim(raw_search_query)
+
+    case prepare_search_term(search_query) do
+      {:some, term} ->
+        tokens_result =
+          term
+          |> search_token_query()
+          |> order_by([token],
+            desc_nulls_last: token.circulating_market_cap,
+            desc_nulls_last: token.fiat_value,
+            desc_nulls_last: token.is_verified_via_admin_panel,
+            desc_nulls_last: token.holder_count,
+            asc: token.name,
+            desc: token.inserted_at
+          )
+          |> limit(^paging_options.page_size)
+          |> select_repo(options).all()
+
+        contracts_result =
+          term
+          |> search_contract_query()
+          |> order_by([items], asc: items.name, desc: items.inserted_at)
+          |> limit(^paging_options.page_size)
+          |> select_repo(options).all()
+
+        labels_result =
+          term
+          |> search_label_query()
+          |> order_by([att, at], asc: at.display_name, desc: att.inserted_at)
+          |> limit(^paging_options.page_size)
+          |> select_repo(options).all()
+
+        tx_result =
+          if query = search_tx_query(search_query) do
+            query
+            |> select_repo(options).all()
+          else
+            []
+          end
+
+        address_result =
+          if query = search_address_query(search_query) do
+            query
+            |> select_repo(options).all()
+          else
+            []
+          end
+
+        blocks_result =
+          if query = search_block_query(search_query) do
+            query
+            |> limit(^paging_options.page_size)
+            |> select_repo(options).all()
+          else
+            []
+          end
+
+        non_empty_lists =
+          [tokens_result, contracts_result, labels_result, tx_result, address_result, blocks_result]
+          |> Enum.filter(fn list -> Enum.count(list) > 0 end)
+          |> Enum.sort_by(fn list -> Enum.count(list) end, :asc)
+
+        to_take =
+          non_empty_lists
+          |> Enum.map(fn list -> Enum.count(list) end)
+          |> take_all_categories(List.duplicate(0, Enum.count(non_empty_lists)), paging_options.page_size)
+
+        non_empty_lists
+        |> Enum.zip_reduce(to_take, [], fn x, y, acc -> acc ++ Enum.take(x, y) end)
+        |> Enum.map(fn result ->
+          result
+          |> compose_result_checksummed_address_hash()
+          |> format_timestamp()
+        end)
+
+      _ ->
+        []
+    end
+  end
+
+  defp take_all_categories(lengths, taken_lengths, remained) do
+    non_zero_count = count_non_zero(lengths)
+
+    target = if(remained < non_zero_count, do: 1, else: div(remained, non_zero_count))
+
+    {lengths_updated, %{result: taken_lengths_reversed}} =
+      Enum.map_reduce(lengths, %{result: [], sum: 0}, fn el, acc ->
+        taken =
+          cond do
+            acc[:sum] >= remained ->
+              0
+
+            el < target ->
+              el
+
+            true ->
+              target
+          end
+
+        {el - taken, %{result: [taken | acc[:result]], sum: acc[:sum] + taken}}
+      end)
+
+    taken_lengths =
+      taken_lengths
+      |> Enum.zip_reduce(Enum.reverse(taken_lengths_reversed), [], fn x, y, acc -> [x + y | acc] end)
+      |> Enum.reverse()
+
+    remained = remained - Enum.sum(taken_lengths_reversed)
+
+    if remained > 0 and count_non_zero(lengths_updated) > 0 do
+      take_all_categories(lengths_updated, taken_lengths, remained)
+    else
+      taken_lengths
+    end
+  end
+
+  defp count_non_zero(list) do
+    Enum.reduce(list, 0, fn el, acc -> acc + if el > 0, do: 1, else: 0 end)
+  end
+
   defp compose_result_checksummed_address_hash(result) do
     if result.address_hash do
       result
diff --git a/apps/explorer/test/support/factory.ex b/apps/explorer/test/support/factory.ex
index c46fb36e3fb7..28093d950e19 100644
--- a/apps/explorer/test/support/factory.ex
+++ b/apps/explorer/test/support/factory.ex
@@ -142,14 +142,18 @@ defmodule Explorer.Factory do
 
   def address_to_tag_factory do
     %AddressToTag{
-      tag: %AddressTag{
-        label: sequence("label"),
-        display_name: sequence("display_name")
-      },
+      tag: build(:address_tag),
       address: build(:address)
     }
   end
 
+  def address_tag_factory do
+    %AddressTag{
+      label: sequence("label"),
+      display_name: sequence("display_name")
+    }
+  end
+
   def account_watchlist_address_factory do
     hash = build(:address).hash
 

From ba6c5d61fd596b8cf23e69f21ead3c41d927eab7 Mon Sep 17 00:00:00 2001
From: Viktor Baranov <baranov.viktor.27@gmail.com>
Date: Wed, 16 Aug 2023 19:18:10 +0300
Subject: [PATCH 307/909] docker-compose for new UI with external backend

---
 CHANGELOG.md                                  |  1 +
 ...cker-compose-no-build-external-backend.yml | 52 +++++++++++++++++++
 docker-compose/envs/common-frontend.env       |  2 +-
 docker-compose/proxy/default.conf.template    | 27 +++++++++-
 .../services/docker-compose-nginx.yml         |  2 +
 5 files changed, 82 insertions(+), 2 deletions(-)
 create mode 100644 docker-compose/docker-compose-no-build-external-backend.yml

diff --git a/CHANGELOG.md b/CHANGELOG.md
index fd2cafcb7288..c95d6f54f341 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -24,6 +24,7 @@
 
 ### Chore
 
+- [#8222](https://github.com/blockscout/blockscout/pull/8222) - docker-compose for new UI with external backend
 - [#8177](https://github.com/blockscout/blockscout/pull/8177) - Refactor address counter functions
 - [#8183](https://github.com/blockscout/blockscout/pull/8183) - Update frontend envs in order to pass their validation
 - [#8167](https://github.com/blockscout/blockscout/pull/8167) - Manage concurrency for Token and TokenBalance fetcher
diff --git a/docker-compose/docker-compose-no-build-external-backend.yml b/docker-compose/docker-compose-no-build-external-backend.yml
new file mode 100644
index 000000000000..3e1726bf846e
--- /dev/null
+++ b/docker-compose/docker-compose-no-build-external-backend.yml
@@ -0,0 +1,52 @@
+version: '3.8'
+
+services:
+  redis_db:
+    extends:
+      file: ./services/docker-compose-redis.yml
+      service: redis_db
+
+  db:
+    extends:
+      file: ./services/docker-compose-db.yml
+      service: db
+
+  smart-contract-verifier:
+    extends:
+      file: ./services/docker-compose-smart-contract-verifier.yml
+      service: smart-contract-verifier
+
+  visualizer:
+    extends:
+      file: ./services/docker-compose-visualizer.yml
+      service: visualizer
+
+  sig-provider:
+    extends:
+      file: ./services/docker-compose-sig-provider.yml
+      service: sig-provider
+
+  frontend:
+    extends:
+      file: ./services/docker-compose-frontend.yml
+      service: frontend
+
+  stats-db:
+    extends:
+      file: ./services/docker-compose-stats.yml
+      service: stats-db
+
+  stats:
+    depends_on:
+      - stats-db
+    extends:
+      file: ./services/docker-compose-stats.yml
+      service: stats
+
+  proxy:
+    depends_on:
+      - frontend
+      - stats
+    extends:
+      file: ./services/docker-compose-nginx.yml
+      service: proxy
diff --git a/docker-compose/envs/common-frontend.env b/docker-compose/envs/common-frontend.env
index 4ebd7d9d00fb..73d9ae64cf76 100644
--- a/docker-compose/envs/common-frontend.env
+++ b/docker-compose/envs/common-frontend.env
@@ -12,7 +12,7 @@ NEXT_PUBLIC_FEATURED_NETWORKS=https://raw.githubusercontent.com/blockscout/front
 NEXT_PUBLIC_APP_HOST=localhost
 NEXT_PUBLIC_APP_PROTOCOL=http
 NEXT_PUBLIC_HOMEPAGE_CHARTS="['daily_txs']"
-NEXT_PUBLIC_VISUALIZE_API_HOST=http://visualizer:80
+NEXT_PUBLIC_VISUALIZE_API_HOST=http://localhost:8090
 NEXT_PUBLIC_IS_TESTNET='true'
 NEXT_PUBLIC_NETWORK_LOGO=https://raw.githubusercontent.com/blockscout/frontend-configs/main/configs/network-logos/goerli.svg
 NEXT_PUBLIC_NETWORK_ICON=https://raw.githubusercontent.com/blockscout/frontend-configs/main/configs/network-icons/goerli.svg
diff --git a/docker-compose/proxy/default.conf.template b/docker-compose/proxy/default.conf.template
index 5d2fa0a490e0..a6474729f54f 100644
--- a/docker-compose/proxy/default.conf.template
+++ b/docker-compose/proxy/default.conf.template
@@ -10,7 +10,7 @@ server {
     proxy_http_version 1.1;
 
     location / {
-        proxy_pass            http://backend:4000;
+        proxy_pass            ${BACK_PROXY_PASS};
         proxy_http_version    1.1;
         proxy_set_header      Host "$host";
         proxy_set_header      X-Real-IP "$remote_addr";
@@ -64,4 +64,29 @@ server {
         proxy_set_header      Connection $connection_upgrade;
         proxy_cache_bypass    $http_upgrade;
     }
+}
+
+server {
+    listen       8090;
+    server_name  localhost;
+    proxy_http_version 1.1;
+    proxy_hide_header Access-Control-Allow-Origin;
+    proxy_hide_header Access-Control-Allow-Methods;
+    proxy_hide_header Access-Control-Allow-Headers;
+    add_header 'Access-Control-Allow-Origin' 'http://localhost' always;
+    add_header 'Access-Control-Allow-Credentials' 'true' always;
+    add_header 'Access-Control-Allow-Methods' 'PUT, GET, POST, OPTIONS, DELETE, PATCH' always;
+    add_header 'Access-Control-Allow-Headers' 'DNT,Keep-Alive,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type,Range,Authorization,x-csrf-token' always;
+
+    location / {
+        proxy_pass            http://visualizer:8050;
+        proxy_http_version    1.1;
+        proxy_set_header      Host "$host";
+        proxy_set_header      X-Real-IP "$remote_addr";
+        proxy_set_header      X-Forwarded-For "$proxy_add_x_forwarded_for";
+        proxy_set_header      X-Forwarded-Proto "$scheme";
+        proxy_set_header      Upgrade "$http_upgrade";
+        proxy_set_header      Connection $connection_upgrade;
+        proxy_cache_bypass    $http_upgrade;
+    }
 }
\ No newline at end of file
diff --git a/docker-compose/services/docker-compose-nginx.yml b/docker-compose/services/docker-compose-nginx.yml
index c5c005b4b2db..bae470638d1b 100644
--- a/docker-compose/services/docker-compose-nginx.yml
+++ b/docker-compose/services/docker-compose-nginx.yml
@@ -9,7 +9,9 @@ services:
     volumes:
       - "../proxy:/etc/nginx/templates"
     environment:
+      BACK_PROXY_PASS: ${BACK_PROXY_PASS:-http://backend:4000}
       FRONT_PROXY_PASS: ${FRONT_PROXY_PASS:-http://frontend:3000}
     ports:
       - 80:80
       - 8080:8080
+      - 8090:8090

From 54c7a593b32c23882fbe445b17f5a51ef1abd300 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 16 Aug 2023 18:56:16 +0000
Subject: [PATCH 308/909] Bump gettext from 0.22.3 to 0.23.1

Bumps [gettext](https://github.com/elixir-gettext/gettext) from 0.22.3 to 0.23.1.
- [Changelog](https://github.com/elixir-gettext/gettext/blob/main/CHANGELOG.md)
- [Commits](https://github.com/elixir-gettext/gettext/compare/v0.22.3...v0.23.1)

---
updated-dependencies:
- dependency-name: gettext
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 apps/block_scout_web/mix.exs | 2 +-
 mix.lock                     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/block_scout_web/mix.exs b/apps/block_scout_web/mix.exs
index a101102aaa40..d33d85819898 100644
--- a/apps/block_scout_web/mix.exs
+++ b/apps/block_scout_web/mix.exs
@@ -83,7 +83,7 @@ defmodule BlockScoutWeb.Mixfile do
       # HTML CSS selectors for Phoenix controller tests
       {:floki, "~> 0.31"},
       {:flow, "~> 1.2"},
-      {:gettext, "~> 0.22.0"},
+      {:gettext, "~> 0.23.1"},
       {:hammer, "~> 6.0"},
       {:httpoison, "~> 2.0"},
       {:indexer, in_umbrella: true, runtime: false},
diff --git a/mix.lock b/mix.lock
index 506f06a33517..e677fc1e35a2 100644
--- a/mix.lock
+++ b/mix.lock
@@ -63,7 +63,7 @@
   "floki": {:hex, :floki, "0.34.3", "5e2dcaec5d7c228ce5b1d3501502e308b2d79eb655e4191751a1fe491c37feac", [:mix], [], "hexpm", "9577440eea5b97924b4bf3c7ea55f7b8b6dce589f9b28b096cc294a8dc342341"},
   "flow": {:hex, :flow, "1.2.4", "1dd58918287eb286656008777cb32714b5123d3855956f29aa141ebae456922d", [:mix], [{:gen_stage, "~> 1.0", [hex: :gen_stage, repo: "hexpm", optional: false]}], "hexpm", "874adde96368e71870f3510b91e35bc31652291858c86c0e75359cbdd35eb211"},
   "gen_stage": {:hex, :gen_stage, "1.2.1", "19d8b5e9a5996d813b8245338a28246307fd8b9c99d1237de199d21efc4c76a1", [:mix], [], "hexpm", "83e8be657fa05b992ffa6ac1e3af6d57aa50aace8f691fcf696ff02f8335b001"},
-  "gettext": {:hex, :gettext, "0.22.3", "c8273e78db4a0bb6fba7e9f0fd881112f349a3117f7f7c598fa18c66c888e524", [:mix], [{:expo, "~> 0.4.0", [hex: :expo, repo: "hexpm", optional: false]}], "hexpm", "935f23447713954a6866f1bb28c3a878c4c011e802bcd68a726f5e558e4b64bd"},
+  "gettext": {:hex, :gettext, "0.23.1", "821e619a240e6000db2fc16a574ef68b3bd7fe0167ccc264a81563cc93e67a31", [:mix], [{:expo, "~> 0.4.0", [hex: :expo, repo: "hexpm", optional: false]}], "hexpm", "19d744a36b809d810d610b57c27b934425859d158ebd56561bc41f7eeb8795db"},
   "hackney": {:hex, :hackney, "1.18.1", "f48bf88f521f2a229fc7bae88cf4f85adc9cd9bcf23b5dc8eb6a1788c662c4f6", [:rebar3], [{:certifi, "~>2.9.0", [hex: :certifi, repo: "hexpm", optional: false]}, {:idna, "~>6.1.0", [hex: :idna, repo: "hexpm", optional: false]}, {:metrics, "~>1.0.0", [hex: :metrics, repo: "hexpm", optional: false]}, {:mimerl, "~>1.1", [hex: :mimerl, repo: "hexpm", optional: false]}, {:parse_trans, "3.3.1", [hex: :parse_trans, repo: "hexpm", optional: false]}, {:ssl_verify_fun, "~>1.1.0", [hex: :ssl_verify_fun, repo: "hexpm", optional: false]}, {:unicode_util_compat, "~>0.7.0", [hex: :unicode_util_compat, repo: "hexpm", optional: false]}], "hexpm", "a4ecdaff44297e9b5894ae499e9a070ea1888c84afdd1fd9b7b2bc384950128e"},
   "hammer": {:hex, :hammer, "6.1.0", "f263e3c3e9946bd410ea0336b2abe0cb6260af4afb3a221e1027540706e76c55", [:make, :mix], [{:poolboy, "~> 1.5", [hex: :poolboy, repo: "hexpm", optional: false]}], "hexpm", "b47e415a562a6d072392deabcd58090d8a41182cf9044cdd6b0d0faaaf68ba57"},
   "hammer_backend_redis": {:hex, :hammer_backend_redis, "6.1.2", "eb296bb4924928e24135308b2afc189201fd09411c870c6bbadea444a49b2f2c", [:mix], [{:hammer, "~> 6.0", [hex: :hammer, repo: "hexpm", optional: false]}, {:redix, "~> 1.1", [hex: :redix, repo: "hexpm", optional: false]}], "hexpm", "217ea066278910543a5e9b577d5bf2425419446b94fe76bdd9f255f39feec9fa"},

From 82611cc5f5345a1b1893c2c814702334401716a2 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 16 Aug 2023 18:57:39 +0000
Subject: [PATCH 309/909] Bump postcss from 8.4.27 to 8.4.28 in
 /apps/block_scout_web/assets

Bumps [postcss](https://github.com/postcss/postcss) from 8.4.27 to 8.4.28.
- [Release notes](https://github.com/postcss/postcss/releases)
- [Changelog](https://github.com/postcss/postcss/blob/main/CHANGELOG.md)
- [Commits](https://github.com/postcss/postcss/compare/8.4.27...8.4.28)

---
updated-dependencies:
- dependency-name: postcss
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 apps/block_scout_web/assets/package-lock.json | 14 +++++++-------
 apps/block_scout_web/assets/package.json      |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/apps/block_scout_web/assets/package-lock.json b/apps/block_scout_web/assets/package-lock.json
index 017f481eb298..1f46733be32d 100644
--- a/apps/block_scout_web/assets/package-lock.json
+++ b/apps/block_scout_web/assets/package-lock.json
@@ -87,7 +87,7 @@
         "jest": "^29.6.2",
         "jest-environment-jsdom": "^29.6.2",
         "mini-css-extract-plugin": "^2.7.6",
-        "postcss": "^8.4.27",
+        "postcss": "^8.4.28",
         "postcss-loader": "^7.3.3",
         "sass": "^1.65.1",
         "sass-loader": "^13.3.2",
@@ -13498,9 +13498,9 @@
       }
     },
     "node_modules/postcss": {
-      "version": "8.4.27",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.27.tgz",
-      "integrity": "sha512-gY/ACJtJPSmUFPDCHtX78+01fHa64FaU4zaaWfuh1MhGJISufJAH4cun6k/8fwsHYeK4UQmENQK+tRLCFJE8JQ==",
+      "version": "8.4.28",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.28.tgz",
+      "integrity": "sha512-Z7V5j0cq8oEKyejIKfpD8b4eBy9cwW2JWPk0+fB1HOAMsfHbnAXLLS+PfVWlzMSLQaWttKDt607I0XHmpE67Vw==",
       "dev": true,
       "funding": [
         {
@@ -27758,9 +27758,9 @@
       "integrity": "sha512-Wb4p1J4zyFTbM+u6WuO4XstYx4Ky9Cewe4DWrel7B0w6VVICvPwdOpotjzcf6eD8TsckVnIMNONQyPIUFOUbCQ=="
     },
     "postcss": {
-      "version": "8.4.27",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.27.tgz",
-      "integrity": "sha512-gY/ACJtJPSmUFPDCHtX78+01fHa64FaU4zaaWfuh1MhGJISufJAH4cun6k/8fwsHYeK4UQmENQK+tRLCFJE8JQ==",
+      "version": "8.4.28",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.28.tgz",
+      "integrity": "sha512-Z7V5j0cq8oEKyejIKfpD8b4eBy9cwW2JWPk0+fB1HOAMsfHbnAXLLS+PfVWlzMSLQaWttKDt607I0XHmpE67Vw==",
       "dev": true,
       "requires": {
         "nanoid": "^3.3.6",
diff --git a/apps/block_scout_web/assets/package.json b/apps/block_scout_web/assets/package.json
index 9a21514f97ab..8da00944207e 100644
--- a/apps/block_scout_web/assets/package.json
+++ b/apps/block_scout_web/assets/package.json
@@ -99,7 +99,7 @@
     "jest": "^29.6.2",
     "jest-environment-jsdom": "^29.6.2",
     "mini-css-extract-plugin": "^2.7.6",
-    "postcss": "^8.4.27",
+    "postcss": "^8.4.28",
     "postcss-loader": "^7.3.3",
     "sass": "^1.65.1",
     "sass-loader": "^13.3.2",

From 74acd01eaef1d48e1fc80ab515626c5633ac3c6f Mon Sep 17 00:00:00 2001
From: Nikita Pozdniakov <nikitosing4@mail.ru>
Date: Thu, 17 Aug 2023 11:53:01 +0300
Subject: [PATCH 310/909] Search refactoring

---
 .../controllers/api/v2/search_controller.ex   |   7 +-
 .../controllers/chain_controller.ex           |   3 +-
 .../controllers/search_controller.ex          |   4 +-
 apps/explorer/lib/explorer/chain.ex           | 486 +---------------
 apps/explorer/lib/explorer/chain/search.ex    | 521 ++++++++++++++++++
 5 files changed, 531 insertions(+), 490 deletions(-)
 create mode 100644 apps/explorer/lib/explorer/chain/search.ex

diff --git a/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/search_controller.ex b/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/search_controller.ex
index c2418a94c386..abe0aca31486 100644
--- a/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/search_controller.ex
+++ b/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/search_controller.ex
@@ -3,7 +3,8 @@ defmodule BlockScoutWeb.API.V2.SearchController do
 
   import BlockScoutWeb.Chain, only: [paging_options: 1, next_page_params: 3, split_list_by_page: 1, from_param: 1]
 
-  alias Explorer.{Chain, PagingOptions}
+  alias Explorer.Chain.Search
+  alias Explorer.PagingOptions
 
   @api_true [api?: true]
 
@@ -13,7 +14,7 @@ defmodule BlockScoutWeb.API.V2.SearchController do
 
     search_results_plus_one =
       paging_options
-      |> Chain.joint_search(offset, query, @api_true)
+      |> Search.joint_search(offset, query, @api_true)
 
     {search_results, next_page} = split_list_by_page(search_results_plus_one)
 
@@ -36,7 +37,7 @@ defmodule BlockScoutWeb.API.V2.SearchController do
   end
 
   def quick_search(conn, %{"q" => query}) do
-    search_results = Chain.balanced_unpaginated_search(%PagingOptions{page_size: 50}, query, @api_true)
+    search_results = Search.balanced_unpaginated_search(%PagingOptions{page_size: 50}, query, @api_true)
 
     conn
     |> put_status(200)
diff --git a/apps/block_scout_web/lib/block_scout_web/controllers/chain_controller.ex b/apps/block_scout_web/lib/block_scout_web/controllers/chain_controller.ex
index 2ea919ac0eb9..eabc844c7d01 100644
--- a/apps/block_scout_web/lib/block_scout_web/controllers/chain_controller.ex
+++ b/apps/block_scout_web/lib/block_scout_web/controllers/chain_controller.ex
@@ -11,6 +11,7 @@ defmodule BlockScoutWeb.ChainController do
   alias Explorer.Chain.Cache.Block, as: BlockCache
   alias Explorer.Chain.Cache.GasUsage
   alias Explorer.Chain.Cache.Transaction, as: TransactionCache
+  alias Explorer.Chain.Search
   alias Explorer.Chain.Supply.RSK
   alias Explorer.Counters.AverageBlockTime
   alias Explorer.Market
@@ -91,7 +92,7 @@ defmodule BlockScoutWeb.ChainController do
 
     results =
       paging_options
-      |> Chain.joint_search(offset, term)
+      |> Search.joint_search(offset, term)
 
     encoded_results =
       results
diff --git a/apps/block_scout_web/lib/block_scout_web/controllers/search_controller.ex b/apps/block_scout_web/lib/block_scout_web/controllers/search_controller.ex
index b2f639a6e3a9..937c4b2603a6 100644
--- a/apps/block_scout_web/lib/block_scout_web/controllers/search_controller.ex
+++ b/apps/block_scout_web/lib/block_scout_web/controllers/search_controller.ex
@@ -4,7 +4,7 @@ defmodule BlockScoutWeb.SearchController do
   import BlockScoutWeb.Chain, only: [paging_options: 1, next_page_params: 3, split_list_by_page: 1]
 
   alias BlockScoutWeb.{Controller, SearchView}
-  alias Explorer.Chain
+  alias Explorer.Chain.Search
   alias Phoenix.View
 
   def search_results(conn, %{"q" => query, "type" => "JSON"} = params) do
@@ -13,7 +13,7 @@ defmodule BlockScoutWeb.SearchController do
 
     search_results_plus_one =
       paging_options
-      |> Chain.joint_search(offset, query)
+      |> Search.joint_search(offset, query)
 
     {search_results, next_page} = split_list_by_page(search_results_plus_one)
 
diff --git a/apps/explorer/lib/explorer/chain.ex b/apps/explorer/lib/explorer/chain.ex
index b80020cec605..264ce9d67b1d 100644
--- a/apps/explorer/lib/explorer/chain.ex
+++ b/apps/explorer/lib/explorer/chain.ex
@@ -55,6 +55,7 @@ defmodule Explorer.Chain do
     InternalTransaction,
     Log,
     PendingBlockOperation,
+    Search,
     SmartContract,
     SmartContractAdditionalSource,
     Token,
@@ -90,7 +91,6 @@ defmodule Explorer.Chain do
   alias Explorer.{PagingOptions, Repo}
   alias Explorer.SmartContract.Helper
   alias Explorer.SmartContract.Solidity.Verifier
-  alias Explorer.Tags.{AddressTag, AddressToTag}
 
   alias Dataloader.Ecto, as: DataloaderEcto
 
@@ -1347,457 +1347,6 @@ defmodule Explorer.Chain do
     end
   end
 
-  defp prepare_search_term(string) do
-    case Regex.scan(~r/[a-zA-Z0-9]+/, string) do
-      [_ | _] = words ->
-        term_final =
-          words
-          |> Enum.map_join(" & ", fn [word] -> word <> ":*" end)
-
-        {:some, term_final}
-
-      _ ->
-        :none
-    end
-  end
-
-  def search_label_query(term) do
-    inner_query =
-      from(tag in AddressTag,
-        where: fragment("to_tsvector('english', ?) @@ to_tsquery(?)", tag.display_name, ^term),
-        select: tag
-      )
-
-    from(att in AddressToTag,
-      inner_join: at in subquery(inner_query),
-      on: att.tag_id == at.id,
-      left_join: smart_contract in SmartContract,
-      on: att.address_hash == smart_contract.address_hash,
-      select: %{
-        address_hash: att.address_hash,
-        tx_hash: fragment("CAST(NULL AS bytea)"),
-        block_hash: fragment("CAST(NULL AS bytea)"),
-        type: "label",
-        name: at.display_name,
-        symbol: ^nil,
-        holder_count: ^nil,
-        inserted_at: att.inserted_at,
-        block_number: 0,
-        icon_url: nil,
-        token_type: nil,
-        timestamp: fragment("NULL::timestamp without time zone"),
-        verified: not is_nil(smart_contract),
-        exchange_rate: nil,
-        total_supply: nil,
-        circulating_market_cap: nil,
-        priority: 1,
-        is_verified_via_admin_panel: nil
-      }
-    )
-  end
-
-  defp search_token_query(term) do
-    from(token in Token,
-      left_join: smart_contract in SmartContract,
-      on: token.contract_address_hash == smart_contract.address_hash,
-      where: fragment("to_tsvector('english', ? || ' ' || ?) @@ to_tsquery(?)", token.symbol, token.name, ^term),
-      select: %{
-        address_hash: token.contract_address_hash,
-        tx_hash: fragment("CAST(NULL AS bytea)"),
-        block_hash: fragment("CAST(NULL AS bytea)"),
-        type: "token",
-        name: token.name,
-        symbol: token.symbol,
-        holder_count: token.holder_count,
-        inserted_at: token.inserted_at,
-        block_number: 0,
-        icon_url: token.icon_url,
-        token_type: token.type,
-        timestamp: fragment("NULL::timestamp without time zone"),
-        verified: not is_nil(smart_contract),
-        exchange_rate: token.fiat_value,
-        total_supply: token.total_supply,
-        circulating_market_cap: token.circulating_market_cap,
-        priority: 0,
-        is_verified_via_admin_panel: token.is_verified_via_admin_panel
-      }
-    )
-  end
-
-  defp search_contract_query(term) do
-    from(smart_contract in SmartContract,
-      left_join: address in Address,
-      on: smart_contract.address_hash == address.hash,
-      where: fragment("to_tsvector('english', ?) @@ to_tsquery(?)", smart_contract.name, ^term),
-      select: %{
-        address_hash: smart_contract.address_hash,
-        tx_hash: fragment("CAST(NULL AS bytea)"),
-        block_hash: fragment("CAST(NULL AS bytea)"),
-        type: "contract",
-        name: smart_contract.name,
-        symbol: ^nil,
-        holder_count: ^nil,
-        inserted_at: address.inserted_at,
-        block_number: 0,
-        icon_url: nil,
-        token_type: nil,
-        timestamp: fragment("NULL::timestamp without time zone"),
-        verified: true,
-        exchange_rate: nil,
-        total_supply: nil,
-        circulating_market_cap: nil,
-        priority: 0,
-        is_verified_via_admin_panel: nil
-      }
-    )
-  end
-
-  defp search_address_query(term) do
-    case Chain.string_to_address_hash(term) do
-      {:ok, address_hash} ->
-        from(address in Address,
-          left_join:
-            address_name in subquery(
-              from(name in Address.Name,
-                where: name.address_hash == ^address_hash,
-                order_by: [desc: name.primary],
-                limit: 1
-              )
-            ),
-          on: address.hash == address_name.address_hash,
-          where: address.hash == ^address_hash,
-          select: %{
-            address_hash: address.hash,
-            tx_hash: fragment("CAST(NULL AS bytea)"),
-            block_hash: fragment("CAST(NULL AS bytea)"),
-            type: "address",
-            name: address_name.name,
-            symbol: ^nil,
-            holder_count: ^nil,
-            inserted_at: address.inserted_at,
-            block_number: 0,
-            icon_url: nil,
-            token_type: nil,
-            timestamp: fragment("NULL::timestamp without time zone"),
-            verified: address.verified,
-            exchange_rate: nil,
-            total_supply: nil,
-            circulating_market_cap: nil,
-            priority: 0,
-            is_verified_via_admin_panel: nil
-          }
-        )
-
-      _ ->
-        nil
-    end
-  end
-
-  defp search_tx_query(term) do
-    case Chain.string_to_transaction_hash(term) do
-      {:ok, tx_hash} ->
-        from(transaction in Transaction,
-          left_join: block in Block,
-          on: transaction.block_hash == block.hash,
-          where: transaction.hash == ^tx_hash,
-          select: %{
-            address_hash: fragment("CAST(NULL AS bytea)"),
-            tx_hash: transaction.hash,
-            block_hash: fragment("CAST(NULL AS bytea)"),
-            type: "transaction",
-            name: ^nil,
-            symbol: ^nil,
-            holder_count: ^nil,
-            inserted_at: transaction.inserted_at,
-            block_number: 0,
-            icon_url: nil,
-            token_type: nil,
-            timestamp: block.timestamp,
-            verified: nil,
-            exchange_rate: nil,
-            total_supply: nil,
-            circulating_market_cap: nil,
-            priority: 0,
-            is_verified_via_admin_panel: nil
-          }
-        )
-
-      _ ->
-        nil
-    end
-  end
-
-  defp search_block_query(term) do
-    case Chain.string_to_block_hash(term) do
-      {:ok, block_hash} ->
-        from(block in Block,
-          where: block.hash == ^block_hash,
-          select: %{
-            address_hash: fragment("CAST(NULL AS bytea)"),
-            tx_hash: fragment("CAST(NULL AS bytea)"),
-            block_hash: block.hash,
-            type: "block",
-            name: ^nil,
-            symbol: ^nil,
-            holder_count: ^nil,
-            inserted_at: block.inserted_at,
-            block_number: block.number,
-            icon_url: nil,
-            token_type: nil,
-            timestamp: block.timestamp,
-            verified: nil,
-            exchange_rate: nil,
-            total_supply: nil,
-            circulating_market_cap: nil,
-            priority: 0,
-            is_verified_via_admin_panel: nil
-          }
-        )
-
-      _ ->
-        case Integer.parse(term) do
-          {block_number, ""} ->
-            from(block in Block,
-              where: block.number == ^block_number,
-              select: %{
-                address_hash: fragment("CAST(NULL AS bytea)"),
-                tx_hash: fragment("CAST(NULL AS bytea)"),
-                block_hash: block.hash,
-                type: "block",
-                name: ^nil,
-                symbol: ^nil,
-                holder_count: ^nil,
-                inserted_at: block.inserted_at,
-                block_number: block.number,
-                icon_url: nil,
-                token_type: nil,
-                timestamp: block.timestamp,
-                verified: nil,
-                exchange_rate: nil,
-                total_supply: nil,
-                circulating_market_cap: nil,
-                priority: 0,
-                is_verified_via_admin_panel: nil
-              }
-            )
-
-          _ ->
-            nil
-        end
-    end
-  end
-
-  def joint_search(paging_options, offset, raw_string, options \\ []) do
-    string = String.trim(raw_string)
-
-    case prepare_search_term(string) do
-      {:some, term} ->
-        tokens_query = search_token_query(term)
-        contracts_query = search_contract_query(term)
-        labels_query = search_label_query(term)
-        tx_query = search_tx_query(string)
-        address_query = search_address_query(string)
-        block_query = search_block_query(string)
-
-        basic_query =
-          from(
-            tokens in subquery(tokens_query),
-            union: ^contracts_query,
-            union: ^labels_query
-          )
-
-        query =
-          cond do
-            address_query ->
-              basic_query
-              |> union(^address_query)
-
-            tx_query ->
-              basic_query
-              |> union(^tx_query)
-              |> union(^block_query)
-
-            block_query ->
-              basic_query
-              |> union(^block_query)
-
-            true ->
-              basic_query
-          end
-
-        ordered_query =
-          from(items in subquery(query),
-            order_by: [
-              desc: items.priority,
-              desc_nulls_last: items.circulating_market_cap,
-              desc_nulls_last: items.exchange_rate,
-              desc_nulls_last: items.is_verified_via_admin_panel,
-              desc_nulls_last: items.holder_count,
-              asc: items.name,
-              desc: items.inserted_at
-            ],
-            limit: ^paging_options.page_size,
-            offset: ^offset
-          )
-
-        paginated_ordered_query =
-          ordered_query
-          |> page_search_results(paging_options)
-
-        search_results = select_repo(options).all(paginated_ordered_query)
-
-        search_results
-        |> Enum.map(fn result ->
-          result
-          |> compose_result_checksummed_address_hash()
-          |> format_timestamp()
-        end)
-
-      _ ->
-        []
-    end
-  end
-
-  def balanced_unpaginated_search(paging_options, raw_search_query, options \\ []) do
-    search_query = String.trim(raw_search_query)
-
-    case prepare_search_term(search_query) do
-      {:some, term} ->
-        tokens_result =
-          term
-          |> search_token_query()
-          |> order_by([token],
-            desc_nulls_last: token.circulating_market_cap,
-            desc_nulls_last: token.fiat_value,
-            desc_nulls_last: token.is_verified_via_admin_panel,
-            desc_nulls_last: token.holder_count,
-            asc: token.name,
-            desc: token.inserted_at
-          )
-          |> limit(^paging_options.page_size)
-          |> select_repo(options).all()
-
-        contracts_result =
-          term
-          |> search_contract_query()
-          |> order_by([items], asc: items.name, desc: items.inserted_at)
-          |> limit(^paging_options.page_size)
-          |> select_repo(options).all()
-
-        labels_result =
-          term
-          |> search_label_query()
-          |> order_by([att, at], asc: at.display_name, desc: att.inserted_at)
-          |> limit(^paging_options.page_size)
-          |> select_repo(options).all()
-
-        tx_result =
-          if query = search_tx_query(search_query) do
-            query
-            |> select_repo(options).all()
-          else
-            []
-          end
-
-        address_result =
-          if query = search_address_query(search_query) do
-            query
-            |> select_repo(options).all()
-          else
-            []
-          end
-
-        blocks_result =
-          if query = search_block_query(search_query) do
-            query
-            |> limit(^paging_options.page_size)
-            |> select_repo(options).all()
-          else
-            []
-          end
-
-        non_empty_lists =
-          [tokens_result, contracts_result, labels_result, tx_result, address_result, blocks_result]
-          |> Enum.filter(fn list -> Enum.count(list) > 0 end)
-          |> Enum.sort_by(fn list -> Enum.count(list) end, :asc)
-
-        to_take =
-          non_empty_lists
-          |> Enum.map(fn list -> Enum.count(list) end)
-          |> take_all_categories(List.duplicate(0, Enum.count(non_empty_lists)), paging_options.page_size)
-
-        non_empty_lists
-        |> Enum.zip_reduce(to_take, [], fn x, y, acc -> acc ++ Enum.take(x, y) end)
-        |> Enum.map(fn result ->
-          result
-          |> compose_result_checksummed_address_hash()
-          |> format_timestamp()
-        end)
-
-      _ ->
-        []
-    end
-  end
-
-  defp take_all_categories(lengths, taken_lengths, remained) do
-    non_zero_count = count_non_zero(lengths)
-
-    target = if(remained < non_zero_count, do: 1, else: div(remained, non_zero_count))
-
-    {lengths_updated, %{result: taken_lengths_reversed}} =
-      Enum.map_reduce(lengths, %{result: [], sum: 0}, fn el, acc ->
-        taken =
-          cond do
-            acc[:sum] >= remained ->
-              0
-
-            el < target ->
-              el
-
-            true ->
-              target
-          end
-
-        {el - taken, %{result: [taken | acc[:result]], sum: acc[:sum] + taken}}
-      end)
-
-    taken_lengths =
-      taken_lengths
-      |> Enum.zip_reduce(Enum.reverse(taken_lengths_reversed), [], fn x, y, acc -> [x + y | acc] end)
-      |> Enum.reverse()
-
-    remained = remained - Enum.sum(taken_lengths_reversed)
-
-    if remained > 0 and count_non_zero(lengths_updated) > 0 do
-      take_all_categories(lengths_updated, taken_lengths, remained)
-    else
-      taken_lengths
-    end
-  end
-
-  defp count_non_zero(list) do
-    Enum.reduce(list, 0, fn el, acc -> acc + if el > 0, do: 1, else: 0 end)
-  end
-
-  defp compose_result_checksummed_address_hash(result) do
-    if result.address_hash do
-      result
-      |> Map.put(:address_hash, Address.checksum(result.address_hash))
-    else
-      result
-    end
-  end
-
-  # For some reasons timestamp for blocks and txs returns as ~N[2023-06-25 19:39:47.339493]
-  defp format_timestamp(result) do
-    if result.timestamp do
-      result
-      |> Map.put(:timestamp, DateTime.from_naive!(result.timestamp, "Etc/UTC"))
-    else
-      result
-    end
-  end
-
   @doc """
   Converts `t:Explorer.Chain.Address.t/0` `hash` to the `t:Explorer.Chain.Address.t/0` with that `hash`.
 
@@ -2544,7 +2093,7 @@ defmodule Explorer.Chain do
 
     query =
       if filter && filter !== "" do
-        case prepare_search_term(filter) do
+        case Search.prepare_search_term(filter) do
           {:some, filter_term} ->
             base_query_with_paging
             |> where(fragment("to_tsvector('english', symbol || ' ' || name) @@ to_tsquery(?)", ^filter_term))
@@ -4709,37 +4258,6 @@ defmodule Explorer.Chain do
     where(query, [transaction], transaction.index < ^index)
   end
 
-  defp page_search_results(query, %PagingOptions{key: nil}), do: query
-
-  defp page_search_results(query, %PagingOptions{
-         key: {_address_hash, _tx_hash, _block_hash, holder_count, name, inserted_at, item_type}
-       })
-       when holder_count in [nil, ""] do
-    where(
-      query,
-      [item],
-      (item.name > ^name and item.type == ^item_type) or
-        (item.name == ^name and item.inserted_at < ^inserted_at and
-           item.type == ^item_type) or
-        item.type != ^item_type
-    )
-  end
-
-  # credo:disable-for-next-line
-  defp page_search_results(query, %PagingOptions{
-         key: {_address_hash, _tx_hash, _block_hash, holder_count, name, inserted_at, item_type}
-       }) do
-    where(
-      query,
-      [item],
-      (item.holder_count < ^holder_count and item.type == ^item_type) or
-        (item.holder_count == ^holder_count and item.name > ^name and item.type == ^item_type) or
-        (item.holder_count == ^holder_count and item.name == ^name and item.inserted_at < ^inserted_at and
-           item.type == ^item_type) or
-        item.type != ^item_type
-    )
-  end
-
   def page_token_balances(query, %PagingOptions{key: nil}), do: query
 
   def page_token_balances(query, %PagingOptions{key: {value, address_hash}}) do
diff --git a/apps/explorer/lib/explorer/chain/search.ex b/apps/explorer/lib/explorer/chain/search.ex
new file mode 100644
index 000000000000..339587631952
--- /dev/null
+++ b/apps/explorer/lib/explorer/chain/search.ex
@@ -0,0 +1,521 @@
+defmodule Explorer.Chain.Search do
+  @moduledoc """
+    Search related functions
+  """
+  import Ecto.Query,
+    only: [
+      from: 2,
+      limit: 2,
+      order_by: 3,
+      subquery: 1,
+      union: 2,
+      where: 3
+    ]
+
+  import Explorer.Chain, only: [select_repo: 1]
+
+  alias Explorer.{Chain, PagingOptions}
+  alias Explorer.Tags.{AddressTag, AddressToTag}
+
+  alias Explorer.Chain.{
+    Address,
+    Block,
+    SmartContract,
+    Token,
+    Transaction
+  }
+
+  @doc """
+    Search function used in web interface. Returns paginated search results
+  """
+  @spec joint_search(PagingOptions.t(), integer(), binary(), [Chain.api?()] | []) :: list
+  def joint_search(paging_options, offset, raw_string, options \\ []) do
+    string = String.trim(raw_string)
+
+    case prepare_search_term(string) do
+      {:some, term} ->
+        tokens_query = search_token_query(term)
+        contracts_query = search_contract_query(term)
+        labels_query = search_label_query(term)
+        tx_query = search_tx_query(string)
+        address_query = search_address_query(string)
+        block_query = search_block_query(string)
+
+        basic_query =
+          from(
+            tokens in subquery(tokens_query),
+            union: ^contracts_query,
+            union: ^labels_query
+          )
+
+        query =
+          cond do
+            address_query ->
+              basic_query
+              |> union(^address_query)
+
+            tx_query ->
+              basic_query
+              |> union(^tx_query)
+              |> union(^block_query)
+
+            block_query ->
+              basic_query
+              |> union(^block_query)
+
+            true ->
+              basic_query
+          end
+
+        ordered_query =
+          from(items in subquery(query),
+            order_by: [
+              desc: items.priority,
+              desc_nulls_last: items.circulating_market_cap,
+              desc_nulls_last: items.exchange_rate,
+              desc_nulls_last: items.is_verified_via_admin_panel,
+              desc_nulls_last: items.holder_count,
+              asc: items.name,
+              desc: items.inserted_at
+            ],
+            limit: ^paging_options.page_size,
+            offset: ^offset
+          )
+
+        paginated_ordered_query =
+          ordered_query
+          |> page_search_results(paging_options)
+
+        search_results = select_repo(options).all(paginated_ordered_query)
+
+        search_results
+        |> Enum.map(fn result ->
+          result
+          |> compose_result_checksummed_address_hash()
+          |> format_timestamp()
+        end)
+
+      _ ->
+        []
+    end
+  end
+
+  @doc """
+    Search function. Differences from joint_search/4:
+      1. Returns all the found categories (amount of results up to `paging_options.page_size`).
+          For example if was found 50 tokens, 50 smart-contracts, 50 labels, 1 address, 1 transaction and 2 blocks (impossible, just example) and page_size=50. Then function will return:
+            [1 address, 1 transaction, 2 blocks, 16 tokens, 15 smart-contracts, 15 labels]
+      2. Results couldn't be paginated
+  """
+  @spec balanced_unpaginated_search(PagingOptions.t(), binary(), [Chain.api?()] | []) :: list
+  def balanced_unpaginated_search(paging_options, raw_search_query, options \\ []) do
+    search_query = String.trim(raw_search_query)
+
+    case prepare_search_term(search_query) do
+      {:some, term} ->
+        tokens_result =
+          term
+          |> search_token_query()
+          |> order_by([token],
+            desc_nulls_last: token.circulating_market_cap,
+            desc_nulls_last: token.fiat_value,
+            desc_nulls_last: token.is_verified_via_admin_panel,
+            desc_nulls_last: token.holder_count,
+            asc: token.name,
+            desc: token.inserted_at
+          )
+          |> limit(^paging_options.page_size)
+          |> select_repo(options).all()
+
+        contracts_result =
+          term
+          |> search_contract_query()
+          |> order_by([items], asc: items.name, desc: items.inserted_at)
+          |> limit(^paging_options.page_size)
+          |> select_repo(options).all()
+
+        labels_result =
+          term
+          |> search_label_query()
+          |> order_by([att, at], asc: at.display_name, desc: att.inserted_at)
+          |> limit(^paging_options.page_size)
+          |> select_repo(options).all()
+
+        tx_result =
+          if query = search_tx_query(search_query) do
+            query
+            |> select_repo(options).all()
+          else
+            []
+          end
+
+        address_result =
+          if query = search_address_query(search_query) do
+            query
+            |> select_repo(options).all()
+          else
+            []
+          end
+
+        blocks_result =
+          if query = search_block_query(search_query) do
+            query
+            |> limit(^paging_options.page_size)
+            |> select_repo(options).all()
+          else
+            []
+          end
+
+        non_empty_lists =
+          [tokens_result, contracts_result, labels_result, tx_result, address_result, blocks_result]
+          |> Enum.filter(fn list -> Enum.count(list) > 0 end)
+          |> Enum.sort_by(fn list -> Enum.count(list) end, :asc)
+
+        to_take =
+          non_empty_lists
+          |> Enum.map(fn list -> Enum.count(list) end)
+          |> take_all_categories(List.duplicate(0, Enum.count(non_empty_lists)), paging_options.page_size)
+
+        non_empty_lists
+        |> Enum.zip_reduce(to_take, [], fn x, y, acc -> acc ++ Enum.take(x, y) end)
+        |> Enum.map(fn result ->
+          result
+          |> compose_result_checksummed_address_hash()
+          |> format_timestamp()
+        end)
+
+      _ ->
+        []
+    end
+  end
+
+  def prepare_search_term(string) do
+    case Regex.scan(~r/[a-zA-Z0-9]+/, string) do
+      [_ | _] = words ->
+        term_final =
+          words
+          |> Enum.map_join(" & ", fn [word] -> word <> ":*" end)
+
+        {:some, term_final}
+
+      _ ->
+        :none
+    end
+  end
+
+  defp search_label_query(term) do
+    inner_query =
+      from(tag in AddressTag,
+        where: fragment("to_tsvector('english', ?) @@ to_tsquery(?)", tag.display_name, ^term),
+        select: tag
+      )
+
+    from(att in AddressToTag,
+      inner_join: at in subquery(inner_query),
+      on: att.tag_id == at.id,
+      left_join: smart_contract in SmartContract,
+      on: att.address_hash == smart_contract.address_hash,
+      select: %{
+        address_hash: att.address_hash,
+        tx_hash: fragment("CAST(NULL AS bytea)"),
+        block_hash: fragment("CAST(NULL AS bytea)"),
+        type: "label",
+        name: at.display_name,
+        symbol: ^nil,
+        holder_count: ^nil,
+        inserted_at: att.inserted_at,
+        block_number: 0,
+        icon_url: nil,
+        token_type: nil,
+        timestamp: fragment("NULL::timestamp without time zone"),
+        verified: not is_nil(smart_contract),
+        exchange_rate: nil,
+        total_supply: nil,
+        circulating_market_cap: nil,
+        priority: 1,
+        is_verified_via_admin_panel: nil
+      }
+    )
+  end
+
+  defp search_token_query(term) do
+    from(token in Token,
+      left_join: smart_contract in SmartContract,
+      on: token.contract_address_hash == smart_contract.address_hash,
+      where: fragment("to_tsvector('english', ? || ' ' || ?) @@ to_tsquery(?)", token.symbol, token.name, ^term),
+      select: %{
+        address_hash: token.contract_address_hash,
+        tx_hash: fragment("CAST(NULL AS bytea)"),
+        block_hash: fragment("CAST(NULL AS bytea)"),
+        type: "token",
+        name: token.name,
+        symbol: token.symbol,
+        holder_count: token.holder_count,
+        inserted_at: token.inserted_at,
+        block_number: 0,
+        icon_url: token.icon_url,
+        token_type: token.type,
+        timestamp: fragment("NULL::timestamp without time zone"),
+        verified: not is_nil(smart_contract),
+        exchange_rate: token.fiat_value,
+        total_supply: token.total_supply,
+        circulating_market_cap: token.circulating_market_cap,
+        priority: 0,
+        is_verified_via_admin_panel: token.is_verified_via_admin_panel
+      }
+    )
+  end
+
+  defp search_contract_query(term) do
+    from(smart_contract in SmartContract,
+      left_join: address in Address,
+      on: smart_contract.address_hash == address.hash,
+      where: fragment("to_tsvector('english', ?) @@ to_tsquery(?)", smart_contract.name, ^term),
+      select: %{
+        address_hash: smart_contract.address_hash,
+        tx_hash: fragment("CAST(NULL AS bytea)"),
+        block_hash: fragment("CAST(NULL AS bytea)"),
+        type: "contract",
+        name: smart_contract.name,
+        symbol: ^nil,
+        holder_count: ^nil,
+        inserted_at: address.inserted_at,
+        block_number: 0,
+        icon_url: nil,
+        token_type: nil,
+        timestamp: fragment("NULL::timestamp without time zone"),
+        verified: true,
+        exchange_rate: nil,
+        total_supply: nil,
+        circulating_market_cap: nil,
+        priority: 0,
+        is_verified_via_admin_panel: nil
+      }
+    )
+  end
+
+  defp search_address_query(term) do
+    case Chain.string_to_address_hash(term) do
+      {:ok, address_hash} ->
+        from(address in Address,
+          left_join:
+            address_name in subquery(
+              from(name in Address.Name,
+                where: name.address_hash == ^address_hash,
+                order_by: [desc: name.primary],
+                limit: 1
+              )
+            ),
+          on: address.hash == address_name.address_hash,
+          where: address.hash == ^address_hash,
+          select: %{
+            address_hash: address.hash,
+            tx_hash: fragment("CAST(NULL AS bytea)"),
+            block_hash: fragment("CAST(NULL AS bytea)"),
+            type: "address",
+            name: address_name.name,
+            symbol: ^nil,
+            holder_count: ^nil,
+            inserted_at: address.inserted_at,
+            block_number: 0,
+            icon_url: nil,
+            token_type: nil,
+            timestamp: fragment("NULL::timestamp without time zone"),
+            verified: address.verified,
+            exchange_rate: nil,
+            total_supply: nil,
+            circulating_market_cap: nil,
+            priority: 0,
+            is_verified_via_admin_panel: nil
+          }
+        )
+
+      _ ->
+        nil
+    end
+  end
+
+  defp search_tx_query(term) do
+    case Chain.string_to_transaction_hash(term) do
+      {:ok, tx_hash} ->
+        from(transaction in Transaction,
+          left_join: block in Block,
+          on: transaction.block_hash == block.hash,
+          where: transaction.hash == ^tx_hash,
+          select: %{
+            address_hash: fragment("CAST(NULL AS bytea)"),
+            tx_hash: transaction.hash,
+            block_hash: fragment("CAST(NULL AS bytea)"),
+            type: "transaction",
+            name: ^nil,
+            symbol: ^nil,
+            holder_count: ^nil,
+            inserted_at: transaction.inserted_at,
+            block_number: 0,
+            icon_url: nil,
+            token_type: nil,
+            timestamp: block.timestamp,
+            verified: nil,
+            exchange_rate: nil,
+            total_supply: nil,
+            circulating_market_cap: nil,
+            priority: 0,
+            is_verified_via_admin_panel: nil
+          }
+        )
+
+      _ ->
+        nil
+    end
+  end
+
+  defp search_block_query(term) do
+    case Chain.string_to_block_hash(term) do
+      {:ok, block_hash} ->
+        from(block in Block,
+          where: block.hash == ^block_hash,
+          select: %{
+            address_hash: fragment("CAST(NULL AS bytea)"),
+            tx_hash: fragment("CAST(NULL AS bytea)"),
+            block_hash: block.hash,
+            type: "block",
+            name: ^nil,
+            symbol: ^nil,
+            holder_count: ^nil,
+            inserted_at: block.inserted_at,
+            block_number: block.number,
+            icon_url: nil,
+            token_type: nil,
+            timestamp: block.timestamp,
+            verified: nil,
+            exchange_rate: nil,
+            total_supply: nil,
+            circulating_market_cap: nil,
+            priority: 0,
+            is_verified_via_admin_panel: nil
+          }
+        )
+
+      _ ->
+        case Integer.parse(term) do
+          {block_number, ""} ->
+            from(block in Block,
+              where: block.number == ^block_number,
+              select: %{
+                address_hash: fragment("CAST(NULL AS bytea)"),
+                tx_hash: fragment("CAST(NULL AS bytea)"),
+                block_hash: block.hash,
+                type: "block",
+                name: ^nil,
+                symbol: ^nil,
+                holder_count: ^nil,
+                inserted_at: block.inserted_at,
+                block_number: block.number,
+                icon_url: nil,
+                token_type: nil,
+                timestamp: block.timestamp,
+                verified: nil,
+                exchange_rate: nil,
+                total_supply: nil,
+                circulating_market_cap: nil,
+                priority: 0,
+                is_verified_via_admin_panel: nil
+              }
+            )
+
+          _ ->
+            nil
+        end
+    end
+  end
+
+  defp page_search_results(query, %PagingOptions{key: nil}), do: query
+
+  defp page_search_results(query, %PagingOptions{
+         key: {_address_hash, _tx_hash, _block_hash, holder_count, name, inserted_at, item_type}
+       })
+       when holder_count in [nil, ""] do
+    where(
+      query,
+      [item],
+      (item.name > ^name and item.type == ^item_type) or
+        (item.name == ^name and item.inserted_at < ^inserted_at and
+           item.type == ^item_type) or
+        item.type != ^item_type
+    )
+  end
+
+  # credo:disable-for-next-line
+  defp page_search_results(query, %PagingOptions{
+         key: {_address_hash, _tx_hash, _block_hash, holder_count, name, inserted_at, item_type}
+       }) do
+    where(
+      query,
+      [item],
+      (item.holder_count < ^holder_count and item.type == ^item_type) or
+        (item.holder_count == ^holder_count and item.name > ^name and item.type == ^item_type) or
+        (item.holder_count == ^holder_count and item.name == ^name and item.inserted_at < ^inserted_at and
+           item.type == ^item_type) or
+        item.type != ^item_type
+    )
+  end
+
+  defp take_all_categories(lengths, taken_lengths, remained) do
+    non_zero_count = count_non_zero(lengths)
+
+    target = if(remained < non_zero_count, do: 1, else: div(remained, non_zero_count))
+
+    {lengths_updated, %{result: taken_lengths_reversed}} =
+      Enum.map_reduce(lengths, %{result: [], sum: 0}, fn el, acc ->
+        taken =
+          cond do
+            acc[:sum] >= remained ->
+              0
+
+            el < target ->
+              el
+
+            true ->
+              target
+          end
+
+        {el - taken, %{result: [taken | acc[:result]], sum: acc[:sum] + taken}}
+      end)
+
+    taken_lengths =
+      taken_lengths
+      |> Enum.zip_reduce(Enum.reverse(taken_lengths_reversed), [], fn x, y, acc -> [x + y | acc] end)
+      |> Enum.reverse()
+
+    remained = remained - Enum.sum(taken_lengths_reversed)
+
+    if remained > 0 and count_non_zero(lengths_updated) > 0 do
+      take_all_categories(lengths_updated, taken_lengths, remained)
+    else
+      taken_lengths
+    end
+  end
+
+  defp count_non_zero(list) do
+    Enum.reduce(list, 0, fn el, acc -> acc + if el > 0, do: 1, else: 0 end)
+  end
+
+  defp compose_result_checksummed_address_hash(result) do
+    if result.address_hash do
+      result
+      |> Map.put(:address_hash, Address.checksum(result.address_hash))
+    else
+      result
+    end
+  end
+
+  # For some reasons timestamp for blocks and txs returns as ~N[2023-06-25 19:39:47.339493]
+  defp format_timestamp(result) do
+    if result.timestamp do
+      result
+      |> Map.put(:timestamp, DateTime.from_naive!(result.timestamp, "Etc/UTC"))
+    else
+      result
+    end
+  end
+end

From 3c8c1d014c926c8c320abde2d38c2cf18885fdab Mon Sep 17 00:00:00 2001
From: Nikita Pozdniakov <nikitosing4@mail.ru>
Date: Thu, 17 Aug 2023 12:32:21 +0300
Subject: [PATCH 311/909] Reset GA cache; Process review comment

---
 .github/workflows/config.yml                  | 28 +++++++++----------
 .../api/v2/search_controller_test.exs         |  5 ++++
 apps/explorer/lib/explorer/chain/search.ex    |  2 ++
 cspell.json                                   |  3 +-
 4 files changed, 23 insertions(+), 15 deletions(-)

diff --git a/.github/workflows/config.yml b/.github/workflows/config.yml
index 749bc068c48a..18d436a17d06 100644
--- a/.github/workflows/config.yml
+++ b/.github/workflows/config.yml
@@ -48,7 +48,7 @@ jobs:
           path: |
             deps
             _build
-          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_21-${{ hashFiles('mix.lock') }}
+          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_22-${{ hashFiles('mix.lock') }}
           restore-keys: |
             ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-
 
@@ -106,7 +106,7 @@ jobs:
           path: |
             deps
             _build
-          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_21-${{ hashFiles('mix.lock') }}
+          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_22-${{ hashFiles('mix.lock') }}
           restore-keys: |
             ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-"
 
@@ -130,7 +130,7 @@ jobs:
           path: |
             deps
             _build
-          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_21-${{ hashFiles('mix.lock') }}
+          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_22-${{ hashFiles('mix.lock') }}
           restore-keys: |
             ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-"
 
@@ -153,7 +153,7 @@ jobs:
           path: |
             deps
             _build
-          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_21-${{ hashFiles('mix.lock') }}
+          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_22-${{ hashFiles('mix.lock') }}
           restore-keys: |
             ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-"
 
@@ -162,7 +162,7 @@ jobs:
         id: dialyzer-cache
         with:
           path: priv/plts
-          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-dialyzer-mixlockhash_21-${{ hashFiles('mix.lock') }}
+          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-dialyzer-mixlockhash_22-${{ hashFiles('mix.lock') }}
           restore-keys: |
             ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-dialyzer-"
 
@@ -193,7 +193,7 @@ jobs:
           path: |
             deps
             _build
-          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_21-${{ hashFiles('mix.lock') }}
+          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_22-${{ hashFiles('mix.lock') }}
           restore-keys: |
             ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-"
 
@@ -219,7 +219,7 @@ jobs:
           path: |
             deps
             _build
-          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_21-${{ hashFiles('mix.lock') }}
+          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_22-${{ hashFiles('mix.lock') }}
           restore-keys: |
             ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-"
 
@@ -248,7 +248,7 @@ jobs:
           path: |
             deps
             _build
-          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_21-${{ hashFiles('mix.lock') }}
+          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_22-${{ hashFiles('mix.lock') }}
           restore-keys: |
             ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-"
 
@@ -296,7 +296,7 @@ jobs:
           path: |
             deps
             _build
-          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_21-${{ hashFiles('mix.lock') }}
+          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_22-${{ hashFiles('mix.lock') }}
           restore-keys: |
             ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-"
 
@@ -342,7 +342,7 @@ jobs:
           path: |
             deps
             _build
-          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_21-${{ hashFiles('mix.lock') }}
+          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_22-${{ hashFiles('mix.lock') }}
           restore-keys: |
             ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-"
 
@@ -399,7 +399,7 @@ jobs:
           path: |
             deps
             _build
-          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_21-${{ hashFiles('mix.lock') }}
+          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_22-${{ hashFiles('mix.lock') }}
           restore-keys: |
             ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-"
 
@@ -453,7 +453,7 @@ jobs:
           path: |
             deps
             _build
-          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_21-${{ hashFiles('mix.lock') }}
+          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_22-${{ hashFiles('mix.lock') }}
           restore-keys: |
             ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-"
 
@@ -518,7 +518,7 @@ jobs:
           path: |
             deps
             _build
-          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_21-${{ hashFiles('mix.lock') }}
+          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_22-${{ hashFiles('mix.lock') }}
           restore-keys: |
             ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-"
 
@@ -582,7 +582,7 @@ jobs:
           path: |
             deps
             _build
-          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_21-${{ hashFiles('mix.lock') }}
+          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_22-${{ hashFiles('mix.lock') }}
           restore-keys: |
             ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-"
 
diff --git a/apps/block_scout_web/test/block_scout_web/controllers/api/v2/search_controller_test.exs b/apps/block_scout_web/test/block_scout_web/controllers/api/v2/search_controller_test.exs
index a00fce0d386f..2bae0f6dc415 100644
--- a/apps/block_scout_web/test/block_scout_web/controllers/api/v2/search_controller_test.exs
+++ b/apps/block_scout_web/test/block_scout_web/controllers/api/v2/search_controller_test.exs
@@ -328,5 +328,10 @@ defmodule BlockScoutWeb.API.V2.SearchControllerTest do
       assert block_hashes == blocks |> Enum.reverse() |> Enum.map(fn block -> to_string(block.hash) end) ||
                block_hashes == blocks |> Enum.map(fn block -> to_string(block.hash) end)
     end
+
+    test "returns empty list and don't crash", %{conn: conn} do
+      request = get(conn, "/api/v2/search/quick?q=qwertyuioiuytrewertyuioiuytrertyuio")
+      assert [] = json_response(request, 200)
+    end
   end
 end
diff --git a/apps/explorer/lib/explorer/chain/search.ex b/apps/explorer/lib/explorer/chain/search.ex
index 339587631952..b2439545a424 100644
--- a/apps/explorer/lib/explorer/chain/search.ex
+++ b/apps/explorer/lib/explorer/chain/search.ex
@@ -460,6 +460,8 @@ defmodule Explorer.Chain.Search do
     )
   end
 
+  defp take_all_categories([], taken_lengths, _remained), do: taken_lengths
+
   defp take_all_categories(lengths, taken_lengths, remained) do
     non_zero_count = count_non_zero(lengths)
 
diff --git a/cspell.json b/cspell.json
index 2c733cb6d8ad..c35c242239f4 100644
--- a/cspell.json
+++ b/cspell.json
@@ -519,7 +519,8 @@
         "erts",
         "Asfpp",
         "Nerg",
-        "secp"
+        "secp",
+        "qwertyuioiuytrewertyuioiuytrertyuio"
     ],
     "enableFiletypes": [
         "dotenv",

From 6e573f89ff9ee7b23b40ccde048e279edee92b9b Mon Sep 17 00:00:00 2001
From: Nikita Pozdniakov <nikitosing4@mail.ru>
Date: Thu, 17 Aug 2023 16:11:44 +0300
Subject: [PATCH 312/909] Fix API v2 broken tx response

---
 CHANGELOG.md                                         |  3 ++-
 .../block_scout_web/views/abi_encoded_value_view.ex  | 12 +++++-------
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 41423270b11c..a7934fa879f2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,7 @@
 ### Features
 
 - [#8218](https://github.com/blockscout/blockscout/pull/8218) - Add `/api/v2/search/quick` method
+- [#8202](https://github.com/blockscout/blockscout/pull/8202) - Add `/api/v2/addresses/:address_hash/tabs-counters` endpoint
 - [#8156](https://github.com/blockscout/blockscout/pull/8156) - Add `is_verified_via_admin_panel` property to tokens table
 - [#8165](https://github.com/blockscout/blockscout/pull/8165), [#8201](https://github.com/blockscout/blockscout/pull/8201) - Add broadcast of updated address_current_token_balances
 - [#7952](https://github.com/blockscout/blockscout/pull/7952) - Add parsing constructor arguments for sourcify contracts
@@ -14,7 +15,7 @@
 
 ### Fixes
 
-- [#8202](https://github.com/blockscout/blockscout/pull/8202) - Add `/api/v2/addresses/:address_hash/tabs-counters` endpoint
+- [#8233](https://github.com/blockscout/blockscout/pull/8233) - Fix API v2 broken tx response
 - [#8147](https://github.com/blockscout/blockscout/pull/8147) - Switch sourcify tests from POA Sokol to Gnosis Chiado
 - [#8145](https://github.com/blockscout/blockscout/pull/8145) - Handle negative holders count in API v2
 - [#8040](https://github.com/blockscout/blockscout/pull/8040) - Resolve issue with Docker image for Mac M1/M2
diff --git a/apps/block_scout_web/lib/block_scout_web/views/abi_encoded_value_view.ex b/apps/block_scout_web/lib/block_scout_web/views/abi_encoded_value_view.ex
index a4a7fc66bebb..c25dbbf5392e 100644
--- a/apps/block_scout_web/lib/block_scout_web/views/abi_encoded_value_view.ex
+++ b/apps/block_scout_web/lib/block_scout_web/views/abi_encoded_value_view.ex
@@ -192,23 +192,21 @@ defmodule BlockScoutWeb.ABIEncodedValueView do
   end
 
   defp base_value_json(_, {:dynamic, value}) do
-    hex(value)
+    hex_for_json(value)
   end
 
   defp base_value_json(:address, value) do
-    hex(value)
-  end
-
-  defp base_value_json(:address_text, value) do
-    hex(value)
+    hex_for_json(value)
   end
 
   defp base_value_json(:bytes, value) do
-    hex(value)
+    hex_for_json(value)
   end
 
   defp base_value_json(_, value), do: to_string(value)
 
   defp hex("0x" <> value), do: "0x" <> value
   defp hex(value), do: "0x" <> Base.encode16(value, case: :lower)
+
+  defp hex_for_json(value), do: "0x" <> Base.encode16(value, case: :lower)
 end

From 4df2be6c7f29051ab5c16496b9613abe92053bf7 Mon Sep 17 00:00:00 2001
From: Viktor Baranov <baranov.viktor.27@gmail.com>
Date: Thu, 17 Aug 2023 17:22:37 +0300
Subject: [PATCH 313/909] 5.2.2

---
 .../publish-docker-image-every-push.yml       |  2 +-
 .../publish-docker-image-for-core.yml         |  2 +-
 .../publish-docker-image-for-eth-goerli.yml   |  2 +-
 .../publish-docker-image-for-eth.yml          |  2 +-
 .../publish-docker-image-for-immutable.yml    |  2 +-
 .../publish-docker-image-for-l2-staging.yml   |  2 +-
 .../publish-docker-image-for-lukso.yml        |  2 +-
 .../publish-docker-image-for-optimism.yml     |  2 +-
 .../publish-docker-image-for-rsk.yml          |  2 +-
 .../publish-docker-image-for-xdai.yml         |  2 +-
 .../publish-docker-image-release.yml          |  2 +-
 CHANGELOG.md                                  | 53 +++++++++++++++++++
 apps/block_scout_web/mix.exs                  |  2 +-
 apps/ethereum_jsonrpc/mix.exs                 |  2 +-
 apps/explorer/mix.exs                         |  2 +-
 apps/indexer/mix.exs                          |  2 +-
 .../docker-compose-no-rust-services.yml       |  2 +-
 docker-compose/docker-compose.yml             |  2 +-
 docker/Makefile                               |  2 +-
 mix.exs                                       |  2 +-
 rel/config.exs                                |  2 +-
 21 files changed, 73 insertions(+), 20 deletions(-)

diff --git a/.github/workflows/publish-docker-image-every-push.yml b/.github/workflows/publish-docker-image-every-push.yml
index a2205707247d..c748dfd25ea2 100644
--- a/.github/workflows/publish-docker-image-every-push.yml
+++ b/.github/workflows/publish-docker-image-every-push.yml
@@ -7,7 +7,7 @@ on:
 env:
   OTP_VERSION: '25.2.1'
   ELIXIR_VERSION: '1.14.3'
-  RELEASE_VERSION: 5.2.1
+  RELEASE_VERSION: 5.2.2
 
 jobs:
   push_to_registry:
diff --git a/.github/workflows/publish-docker-image-for-core.yml b/.github/workflows/publish-docker-image-for-core.yml
index 4d96913b7ec4..48470e040e3a 100644
--- a/.github/workflows/publish-docker-image-for-core.yml
+++ b/.github/workflows/publish-docker-image-for-core.yml
@@ -14,7 +14,7 @@ jobs:
     name: Push Docker image to Docker Hub
     runs-on: ubuntu-latest
     env:
-      RELEASE_VERSION: 5.2.1
+      RELEASE_VERSION: 5.2.2
       DOCKER_CHAIN_NAME: poa
     steps:
       - name: Check out the repo
diff --git a/.github/workflows/publish-docker-image-for-eth-goerli.yml b/.github/workflows/publish-docker-image-for-eth-goerli.yml
index b1929be54ee2..95c8e9fa996f 100644
--- a/.github/workflows/publish-docker-image-for-eth-goerli.yml
+++ b/.github/workflows/publish-docker-image-for-eth-goerli.yml
@@ -14,7 +14,7 @@ jobs:
     name: Push Docker image to Docker Hub
     runs-on: ubuntu-latest
     env:
-      RELEASE_VERSION: 5.2.1
+      RELEASE_VERSION: 5.2.2
       DOCKER_CHAIN_NAME: eth-goerli
     steps:
       - name: Check out the repo
diff --git a/.github/workflows/publish-docker-image-for-eth.yml b/.github/workflows/publish-docker-image-for-eth.yml
index 370325c7475c..237eec76e5cd 100644
--- a/.github/workflows/publish-docker-image-for-eth.yml
+++ b/.github/workflows/publish-docker-image-for-eth.yml
@@ -14,7 +14,7 @@ jobs:
     name: Push Docker image to Docker Hub
     runs-on: ubuntu-latest
     env:
-      RELEASE_VERSION: 5.2.1
+      RELEASE_VERSION: 5.2.2
       DOCKER_CHAIN_NAME: mainnet
     steps:
       - name: Check out the repo
diff --git a/.github/workflows/publish-docker-image-for-immutable.yml b/.github/workflows/publish-docker-image-for-immutable.yml
index b627dd193504..92eff232935f 100644
--- a/.github/workflows/publish-docker-image-for-immutable.yml
+++ b/.github/workflows/publish-docker-image-for-immutable.yml
@@ -17,7 +17,7 @@ jobs:
     name: Push Docker image to Docker Hub
     runs-on: ubuntu-latest
     env:
-      RELEASE_VERSION: 5.2.1
+      RELEASE_VERSION: 5.2.2
       DOCKER_CHAIN_NAME: immutable
     steps:
       - name: Check out the repo
diff --git a/.github/workflows/publish-docker-image-for-l2-staging.yml b/.github/workflows/publish-docker-image-for-l2-staging.yml
index 61e543b5bef1..a95c63ad9e66 100644
--- a/.github/workflows/publish-docker-image-for-l2-staging.yml
+++ b/.github/workflows/publish-docker-image-for-l2-staging.yml
@@ -14,7 +14,7 @@ jobs:
     name: Push Docker image to Docker Hub
     runs-on: ubuntu-latest
     env:
-      RELEASE_VERSION: 5.2.1
+      RELEASE_VERSION: 5.2.2
       DOCKER_CHAIN_NAME: optimism-l2-advanced
     steps:
       - name: Check out the repo
diff --git a/.github/workflows/publish-docker-image-for-lukso.yml b/.github/workflows/publish-docker-image-for-lukso.yml
index 2848e38333b6..8279c009f00f 100644
--- a/.github/workflows/publish-docker-image-for-lukso.yml
+++ b/.github/workflows/publish-docker-image-for-lukso.yml
@@ -14,7 +14,7 @@ jobs:
     name: Push Docker image to Docker Hub
     runs-on: ubuntu-latest
     env:
-      RELEASE_VERSION: 5.2.1
+      RELEASE_VERSION: 5.2.2
       DOCKER_CHAIN_NAME: lukso
     steps:
       - name: Check out the repo
diff --git a/.github/workflows/publish-docker-image-for-optimism.yml b/.github/workflows/publish-docker-image-for-optimism.yml
index c955d0d20396..7c7bd2f11e64 100644
--- a/.github/workflows/publish-docker-image-for-optimism.yml
+++ b/.github/workflows/publish-docker-image-for-optimism.yml
@@ -14,7 +14,7 @@ jobs:
     name: Push Docker image to Docker Hub
     runs-on: ubuntu-latest
     env:
-      RELEASE_VERSION: 5.2.1
+      RELEASE_VERSION: 5.2.2
       DOCKER_CHAIN_NAME: optimism
     steps:
       - name: Check out the repo
diff --git a/.github/workflows/publish-docker-image-for-rsk.yml b/.github/workflows/publish-docker-image-for-rsk.yml
index 9e7a2e261ff7..5eb97cf0de37 100644
--- a/.github/workflows/publish-docker-image-for-rsk.yml
+++ b/.github/workflows/publish-docker-image-for-rsk.yml
@@ -14,7 +14,7 @@ jobs:
     name: Push Docker image to Docker Hub
     runs-on: ubuntu-latest
     env:
-      RELEASE_VERSION: 5.2.1
+      RELEASE_VERSION: 5.2.2
       DOCKER_CHAIN_NAME: rsk
     steps:
       - name: Check out the repo
diff --git a/.github/workflows/publish-docker-image-for-xdai.yml b/.github/workflows/publish-docker-image-for-xdai.yml
index 42f7cf603698..37295fedd354 100644
--- a/.github/workflows/publish-docker-image-for-xdai.yml
+++ b/.github/workflows/publish-docker-image-for-xdai.yml
@@ -17,7 +17,7 @@ jobs:
     name: Push Docker image to Docker Hub
     runs-on: ubuntu-latest
     env:
-      RELEASE_VERSION: 5.2.1
+      RELEASE_VERSION: 5.2.2
       DOCKER_CHAIN_NAME: xdai
     steps:
       - name: Check out the repo
diff --git a/.github/workflows/publish-docker-image-release.yml b/.github/workflows/publish-docker-image-release.yml
index 9a7167c63951..918abd13067d 100644
--- a/.github/workflows/publish-docker-image-release.yml
+++ b/.github/workflows/publish-docker-image-release.yml
@@ -18,7 +18,7 @@ jobs:
     name: Push Docker image to Docker Hub
     runs-on: ubuntu-latest
     env:
-      RELEASE_VERSION: 5.2.1
+      RELEASE_VERSION: 5.2.2
     steps:
       - name: Check out the repo
         uses: actions/checkout@v3
diff --git a/CHANGELOG.md b/CHANGELOG.md
index a7934fa879f2..afeca5a831e7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,19 @@
 
 ### Features
 
+### Fixes
+
+### Chore
+
+<details>
+  <summary>Dependencies version bumps</summary>
+
+</details>
+
+## 5.2.2-beta
+
+### Features
+
 - [#8218](https://github.com/blockscout/blockscout/pull/8218) - Add `/api/v2/search/quick` method
 - [#8202](https://github.com/blockscout/blockscout/pull/8202) - Add `/api/v2/addresses/:address_hash/tabs-counters` endpoint
 - [#8156](https://github.com/blockscout/blockscout/pull/8156) - Add `is_verified_via_admin_panel` property to tokens table
@@ -39,6 +52,46 @@
 <details>
   <summary>Dependencies version bumps</summary>
 
+- [#7980](https://github.com/blockscout/blockscout/pull/7980) - Bump solc from 0.8.20 to 0.8.21 in /apps/explorer
+- [#7986](https://github.com/blockscout/blockscout/pull/7986) - Bump sass from 1.63.6 to 1.64.0 in /apps/block_scout_web/assets
+- [#8030](https://github.com/blockscout/blockscout/pull/8030) - Bump sweetalert2 from 11.7.18 to 11.7.20 in /apps/block_scout_web/assets
+- [#8029](https://github.com/blockscout/blockscout/pull/8029) - Bump viewerjs from 1.11.3 to 1.11.4 in /apps/block_scout_web/assets
+- [#8028](https://github.com/blockscout/blockscout/pull/8028) - Bump sass from 1.64.0 to 1.64.1 in /apps/block_scout_web/assets
+- [#8026](https://github.com/blockscout/blockscout/pull/8026) - Bump dataloader from 1.0.10 to 1.0.11
+- [#8036](https://github.com/blockscout/blockscout/pull/8036) - Bump ex_cldr_numbers from 2.31.1 to 2.31.3
+- [#8027](https://github.com/blockscout/blockscout/pull/8027) - Bump absinthe from 1.7.4 to 1.7.5
+- [#8035](https://github.com/blockscout/blockscout/pull/8035) - Bump wallaby from 0.30.4 to 0.30.5
+- [#8038](https://github.com/blockscout/blockscout/pull/8038) - Bump chart.js from 4.3.0 to 4.3.1 in /apps/block_scout_web/assets
+- [#8047](https://github.com/blockscout/blockscout/pull/8047) - Bump chart.js from 4.3.1 to 4.3.2 in /apps/block_scout_web/assets
+- [#8000](https://github.com/blockscout/blockscout/pull/8000) - Bump postcss from 8.4.26 to 8.4.27 in /apps/block_scout_web/assets
+- [#8052](https://github.com/blockscout/blockscout/pull/8052) - Bump @amplitude/analytics-browser from 2.1.2 to 2.1.3 in /apps/block_scout_web/assets
+- [#8054](https://github.com/blockscout/blockscout/pull/8054) - Bump jest-environment-jsdom from 29.6.1 to 29.6.2 in /apps/block_scout_web/assets
+- [#8063](https://github.com/blockscout/blockscout/pull/8063) - Bump eslint from 8.45.0 to 8.46.0 in /apps/block_scout_web/assets
+- [#8066](https://github.com/blockscout/blockscout/pull/8066) - Bump ex_json_schema from 0.9.3 to 0.10.1
+- [#8064](https://github.com/blockscout/blockscout/pull/8064) - Bump core-js from 3.31.1 to 3.32.0 in /apps/block_scout_web/assets
+- [#8053](https://github.com/blockscout/blockscout/pull/8053) - Bump jest from 29.6.1 to 29.6.2 in /apps/block_scout_web/assets
+- [#8065](https://github.com/blockscout/blockscout/pull/8065) - Bump eslint-plugin-import from 2.27.5 to 2.28.0 in /apps/block_scout_web/assets
+- [#8092](https://github.com/blockscout/blockscout/pull/8092) - Bump exvcr from 0.14.1 to 0.14.2
+- [#8091](https://github.com/blockscout/blockscout/pull/8091) - Bump sass from 1.64.1 to 1.64.2 in /apps/block_scout_web/assets
+- [#8114](https://github.com/blockscout/blockscout/pull/8114) - Bump ex_doc from 0.30.3 to 0.30.4
+- [#8115](https://github.com/blockscout/blockscout/pull/8115) - Bump chart.js from 4.3.2 to 4.3.3 in /apps/block_scout_web/assets
+- [#8116](https://github.com/blockscout/blockscout/pull/8116) - Bump @fortawesome/fontawesome-free from 6.4.0 to 6.4.2 in /apps/block_scout_web/assets
+- [#8142](https://github.com/blockscout/blockscout/pull/8142) - Bump sobelow from 0.12.2 to 0.13.0
+- [#8141](https://github.com/blockscout/blockscout/pull/8141) - Bump @babel/core from 7.22.9 to 7.22.10 in /apps/block_scout_web/assets
+- [#8140](https://github.com/blockscout/blockscout/pull/8140) - Bump @babel/preset-env from 7.22.9 to 7.22.10 in /apps/block_scout_web/assets
+- [#8160](https://github.com/blockscout/blockscout/pull/8160) - Bump exvcr from 0.14.2 to 0.14.3
+- [#8159](https://github.com/blockscout/blockscout/pull/8159) - Bump luxon from 3.3.0 to 3.4.0 in /apps/block_scout_web/assets
+- [#8169](https://github.com/blockscout/blockscout/pull/8169) - Bump sass from 1.64.2 to 1.65.1 in /apps/block_scout_web/assets
+- [#8170](https://github.com/blockscout/blockscout/pull/8170) - Bump sweetalert2 from 11.7.20 to 11.7.22 in /apps/block_scout_web/assets
+- [#8188](https://github.com/blockscout/blockscout/pull/8188) - Bump eslint from 8.46.0 to 8.47.0 in /apps/block_scout_web/assets
+- [#8204](https://github.com/blockscout/blockscout/pull/8204) - Bump ex_doc from 0.30.4 to 0.30.5
+- [#8207](https://github.com/blockscout/blockscout/pull/8207) - Bump wallaby from 0.30.5 to 0.30.6
+- [#8212](https://github.com/blockscout/blockscout/pull/8212) - Bump sweetalert2 from 11.7.22 to 11.7.23 in /apps/block_scout_web/assets
+- [#8203](https://github.com/blockscout/blockscout/pull/8203) - Bump autoprefixer from 10.4.14 to 10.4.15 in /apps/block_scout_web/assets
+- [#8214](https://github.com/blockscout/blockscout/pull/8214) - Bump @amplitude/analytics-browser from 2.1.3 to 2.2.0 in /apps/block_scout_web/assets
+- [#8225](https://github.com/blockscout/blockscout/pull/8225) - Bump postcss from 8.4.27 to 8.4.28 in /apps/block_scout_web/assets
+- [#8224](https://github.com/blockscout/blockscout/pull/8224) - Bump gettext from 0.22.3 to 0.23.1
+
 </details>
 
 ## 5.2.1-beta
diff --git a/apps/block_scout_web/mix.exs b/apps/block_scout_web/mix.exs
index d33d85819898..01efe54cadbf 100644
--- a/apps/block_scout_web/mix.exs
+++ b/apps/block_scout_web/mix.exs
@@ -23,7 +23,7 @@ defmodule BlockScoutWeb.Mixfile do
         dialyzer: :test
       ],
       start_permanent: Mix.env() == :prod,
-      version: "5.2.1"
+      version: "5.2.2"
     ]
   end
 
diff --git a/apps/ethereum_jsonrpc/mix.exs b/apps/ethereum_jsonrpc/mix.exs
index 752c6465f656..5c4003d17880 100644
--- a/apps/ethereum_jsonrpc/mix.exs
+++ b/apps/ethereum_jsonrpc/mix.exs
@@ -23,7 +23,7 @@ defmodule EthereumJsonrpc.MixProject do
         dialyzer: :test
       ],
       start_permanent: Mix.env() == :prod,
-      version: "5.2.1"
+      version: "5.2.2"
     ]
   end
 
diff --git a/apps/explorer/mix.exs b/apps/explorer/mix.exs
index fb2cb75bfa64..7bf6eb62cc2d 100644
--- a/apps/explorer/mix.exs
+++ b/apps/explorer/mix.exs
@@ -24,7 +24,7 @@ defmodule Explorer.Mixfile do
         dialyzer: :test
       ],
       start_permanent: Mix.env() == :prod,
-      version: "5.2.1",
+      version: "5.2.2",
       xref: [exclude: [BlockScoutWeb.WebRouter.Helpers]]
     ]
   end
diff --git a/apps/indexer/mix.exs b/apps/indexer/mix.exs
index b24c16733a2e..444a7a27e772 100644
--- a/apps/indexer/mix.exs
+++ b/apps/indexer/mix.exs
@@ -14,7 +14,7 @@ defmodule Indexer.MixProject do
       elixirc_paths: elixirc_paths(Mix.env()),
       lockfile: "../../mix.lock",
       start_permanent: Mix.env() == :prod,
-      version: "5.2.1"
+      version: "5.2.2"
     ]
   end
 
diff --git a/docker-compose/docker-compose-no-rust-services.yml b/docker-compose/docker-compose-no-rust-services.yml
index a35253cd3279..af87b47c1c28 100644
--- a/docker-compose/docker-compose-no-rust-services.yml
+++ b/docker-compose/docker-compose-no-rust-services.yml
@@ -27,7 +27,7 @@ services:
         CACHE_TOTAL_GAS_USAGE_COUNTER_ENABLED: ""
         CACHE_ADDRESS_WITH_BALANCES_UPDATE_INTERVAL: ""
         ADMIN_PANEL_ENABLED: ""
-        RELEASE_VERSION: 5.2.1
+        RELEASE_VERSION: 5.2.2
     restart: always
     stop_grace_period: 5m
     container_name: 'blockscout'
diff --git a/docker-compose/docker-compose.yml b/docker-compose/docker-compose.yml
index 9fdb484b9699..93552c9d9cac 100644
--- a/docker-compose/docker-compose.yml
+++ b/docker-compose/docker-compose.yml
@@ -28,7 +28,7 @@ services:
         CACHE_TOTAL_GAS_USAGE_COUNTER_ENABLED: ""
         CACHE_ADDRESS_WITH_BALANCES_UPDATE_INTERVAL: ""
         ADMIN_PANEL_ENABLED: ""
-        RELEASE_VERSION: 5.2.1
+        RELEASE_VERSION: 5.2.2
     restart: always
     stop_grace_period: 5m
     container_name: 'blockscout'
diff --git a/docker/Makefile b/docker/Makefile
index bccf86840c62..1014310015df 100644
--- a/docker/Makefile
+++ b/docker/Makefile
@@ -7,7 +7,7 @@ BS_CONTAINER_NAME := blockscout
 PG_CONTAINER_IMAGE := postgres:14
 PG_CONTAINER_NAME := db
 THIS_FILE = $(lastword $(MAKEFILE_LIST))
-RELEASE_VERSION ?= '5.2.1'
+RELEASE_VERSION ?= '5.2.2'
 PORT ?= '4000'
 TAG := $(RELEASE_VERSION)-commit-$(shell git log -1 --pretty=format:"%h")
 STABLE_TAG := $(RELEASE_VERSION)
diff --git a/mix.exs b/mix.exs
index 744ac916a089..9983272fe866 100644
--- a/mix.exs
+++ b/mix.exs
@@ -7,7 +7,7 @@ defmodule BlockScout.Mixfile do
     [
       # app: :block_scout,
       # aliases: aliases(config_env()),
-      version: "5.2.1",
+      version: "5.2.2",
       apps_path: "apps",
       deps: deps(),
       dialyzer: dialyzer(),
diff --git a/rel/config.exs b/rel/config.exs
index 7d4f453589ca..3782a1b80d82 100644
--- a/rel/config.exs
+++ b/rel/config.exs
@@ -71,7 +71,7 @@ end
 # will be used by default
 
 release :blockscout do
-  set version: "5.2.1-beta"
+  set version: "5.2.2-beta"
   set applications: [
     :runtime_tools,
     block_scout_web: :permanent,

From fe936268f339ac07056489661eabfc47231e336a Mon Sep 17 00:00:00 2001
From: Nikita Pozdniakov <nikitosing4@mail.ru>
Date: Fri, 18 Aug 2023 10:18:29 +0300
Subject: [PATCH 314/909] Refactor and fix paging params in API v2

---
 CHANGELOG.md                                  |  2 +
 .../lib/block_scout_web/api_router.ex         | 56 +++++++++----------
 .../controllers/api/v2/address_controller.ex  | 56 +++++++++----------
 .../controllers/api/v2/block_controller.ex    |  7 +--
 .../api/v2/smart_contract_controller.ex       |  3 +-
 .../controllers/api/v2/token_controller.ex    | 37 ++++++------
 .../api/v2/transaction_controller.ex          | 29 ++++------
 .../api/v2/withdrawal_controller.ex           |  2 +-
 .../lib/block_scout_web/paging_helper.ex      |  5 +-
 .../api/v2/search_controller_test.exs         |  1 -
 .../api/v2/token_controller_test.exs          | 24 ++++++++
 11 files changed, 116 insertions(+), 106 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index afeca5a831e7..8fc5b21cdb77 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,8 @@
 
 ### Fixes
 
+- [#8240](https://github.com/blockscout/blockscout/pull/8240) - Refactor and fix paging params in API v2
+
 ### Chore
 
 <details>
diff --git a/apps/block_scout_web/lib/block_scout_web/api_router.ex b/apps/block_scout_web/lib/block_scout_web/api_router.ex
index 01546f2b43dc..c422faed4620 100644
--- a/apps/block_scout_web/lib/block_scout_web/api_router.ex
+++ b/apps/block_scout_web/lib/block_scout_web/api_router.ex
@@ -135,12 +135,12 @@ defmodule BlockScoutWeb.ApiRouter do
     scope "/transactions" do
       get("/", V2.TransactionController, :transactions)
       get("/watchlist", V2.TransactionController, :watchlist_transactions)
-      get("/:transaction_hash", V2.TransactionController, :transaction)
-      get("/:transaction_hash/token-transfers", V2.TransactionController, :token_transfers)
-      get("/:transaction_hash/internal-transactions", V2.TransactionController, :internal_transactions)
-      get("/:transaction_hash/logs", V2.TransactionController, :logs)
-      get("/:transaction_hash/raw-trace", V2.TransactionController, :raw_trace)
-      get("/:transaction_hash/state-changes", V2.TransactionController, :state_changes)
+      get("/:transaction_hash_param", V2.TransactionController, :transaction)
+      get("/:transaction_hash_param/token-transfers", V2.TransactionController, :token_transfers)
+      get("/:transaction_hash_param/internal-transactions", V2.TransactionController, :internal_transactions)
+      get("/:transaction_hash_param/logs", V2.TransactionController, :logs)
+      get("/:transaction_hash_param/raw-trace", V2.TransactionController, :raw_trace)
+      get("/:transaction_hash_param/state-changes", V2.TransactionController, :state_changes)
     end
 
     scope "/blocks" do
@@ -152,32 +152,32 @@ defmodule BlockScoutWeb.ApiRouter do
 
     scope "/addresses" do
       get("/", V2.AddressController, :addresses_list)
-      get("/:address_hash", V2.AddressController, :address)
-      get("/:address_hash/tabs-counters", V2.AddressController, :tabs_counters)
-      get("/:address_hash/counters", V2.AddressController, :counters)
-      get("/:address_hash/token-balances", V2.AddressController, :token_balances)
-      get("/:address_hash/tokens", V2.AddressController, :tokens)
-      get("/:address_hash/transactions", V2.AddressController, :transactions)
-      get("/:address_hash/token-transfers", V2.AddressController, :token_transfers)
-      get("/:address_hash/internal-transactions", V2.AddressController, :internal_transactions)
-      get("/:address_hash/logs", V2.AddressController, :logs)
-      get("/:address_hash/blocks-validated", V2.AddressController, :blocks_validated)
-      get("/:address_hash/coin-balance-history", V2.AddressController, :coin_balance_history)
-      get("/:address_hash/coin-balance-history-by-day", V2.AddressController, :coin_balance_history_by_day)
-      get("/:address_hash/withdrawals", V2.AddressController, :withdrawals)
+      get("/:address_hash_param", V2.AddressController, :address)
+      get("/:address_hash_param/tabs-counters", V2.AddressController, :tabs_counters)
+      get("/:address_hash_param/counters", V2.AddressController, :counters)
+      get("/:address_hash_param/token-balances", V2.AddressController, :token_balances)
+      get("/:address_hash_param/tokens", V2.AddressController, :tokens)
+      get("/:address_hash_param/transactions", V2.AddressController, :transactions)
+      get("/:address_hash_param/token-transfers", V2.AddressController, :token_transfers)
+      get("/:address_hash_param/internal-transactions", V2.AddressController, :internal_transactions)
+      get("/:address_hash_param/logs", V2.AddressController, :logs)
+      get("/:address_hash_param/blocks-validated", V2.AddressController, :blocks_validated)
+      get("/:address_hash_param/coin-balance-history", V2.AddressController, :coin_balance_history)
+      get("/:address_hash_param/coin-balance-history-by-day", V2.AddressController, :coin_balance_history_by_day)
+      get("/:address_hash_param/withdrawals", V2.AddressController, :withdrawals)
     end
 
     scope "/tokens" do
       get("/", V2.TokenController, :tokens_list)
-      get("/:address_hash", V2.TokenController, :token)
-      get("/:address_hash/counters", V2.TokenController, :counters)
-      get("/:address_hash/transfers", V2.TokenController, :transfers)
-      get("/:address_hash/holders", V2.TokenController, :holders)
-      get("/:address_hash/instances", V2.TokenController, :instances)
-      get("/:address_hash/instances/:token_id", V2.TokenController, :instance)
-      get("/:address_hash/instances/:token_id/transfers", V2.TokenController, :transfers_by_instance)
-      get("/:address_hash/instances/:token_id/holders", V2.TokenController, :holders_by_instance)
-      get("/:address_hash/instances/:token_id/transfers-count", V2.TokenController, :transfers_count_by_instance)
+      get("/:address_hash_param", V2.TokenController, :token)
+      get("/:address_hash_param/counters", V2.TokenController, :counters)
+      get("/:address_hash_param/transfers", V2.TokenController, :transfers)
+      get("/:address_hash_param/holders", V2.TokenController, :holders)
+      get("/:address_hash_param/instances", V2.TokenController, :instances)
+      get("/:address_hash_param/instances/:token_id", V2.TokenController, :instance)
+      get("/:address_hash_param/instances/:token_id/transfers", V2.TokenController, :transfers_by_instance)
+      get("/:address_hash_param/instances/:token_id/holders", V2.TokenController, :holders_by_instance)
+      get("/:address_hash_param/instances/:token_id/transfers-count", V2.TokenController, :transfers_count_by_instance)
     end
 
     scope "/main-page" do
diff --git a/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/address_controller.ex b/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/address_controller.ex
index 56c14a8c2b51..160fd28cf60d 100644
--- a/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/address_controller.ex
+++ b/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/address_controller.ex
@@ -58,7 +58,7 @@ defmodule BlockScoutWeb.API.V2.AddressController do
 
   action_fallback(BlockScoutWeb.API.V2.FallbackController)
 
-  def address(conn, %{"address_hash" => address_hash_string} = params) do
+  def address(conn, %{"address_hash_param" => address_hash_string} = params) do
     with {:format, {:ok, address_hash}} <- {:format, Chain.string_to_address_hash(address_hash_string)},
          {:ok, false} <- AccessHelper.restricted_access?(address_hash_string, params),
          {:not_found, {:ok, address}} <- {:not_found, Chain.hash_to_address(address_hash, @address_options)} do
@@ -70,7 +70,7 @@ defmodule BlockScoutWeb.API.V2.AddressController do
     end
   end
 
-  def counters(conn, %{"address_hash" => address_hash_string} = params) do
+  def counters(conn, %{"address_hash_param" => address_hash_string} = params) do
     with {:format, {:ok, address_hash}} <- {:format, Chain.string_to_address_hash(address_hash_string)},
          {:ok, false} <- AccessHelper.restricted_access?(address_hash_string, params),
          {:not_found, {:ok, address}} <- {:not_found, Chain.hash_to_address(address_hash, @api_true, false)} do
@@ -89,7 +89,7 @@ defmodule BlockScoutWeb.API.V2.AddressController do
     end
   end
 
-  def token_balances(conn, %{"address_hash" => address_hash_string} = params) do
+  def token_balances(conn, %{"address_hash_param" => address_hash_string} = params) do
     with {:format, {:ok, address_hash}} <- {:format, Chain.string_to_address_hash(address_hash_string)},
          {:ok, false} <- AccessHelper.restricted_access?(address_hash_string, params),
          {:not_found, {:ok, _address}} <- {:not_found, Chain.hash_to_address(address_hash, @api_true, false)} do
@@ -107,7 +107,7 @@ defmodule BlockScoutWeb.API.V2.AddressController do
     end
   end
 
-  def transactions(conn, %{"address_hash" => address_hash_string} = params) do
+  def transactions(conn, %{"address_hash_param" => address_hash_string} = params) do
     with {:format, {:ok, address_hash}} <- {:format, Chain.string_to_address_hash(address_hash_string)},
          {:ok, false} <- AccessHelper.restricted_access?(address_hash_string, params),
          {:not_found, {:ok, _address}} <- {:not_found, Chain.hash_to_address(address_hash, @api_true, false)} do
@@ -119,8 +119,7 @@ defmodule BlockScoutWeb.API.V2.AddressController do
       results_plus_one = Chain.address_to_transactions_without_rewards(address_hash, options, false)
       {transactions, next_page} = split_list_by_page(results_plus_one)
 
-      next_page_params =
-        next_page |> next_page_params(transactions, params) |> delete_parameters_from_next_page_params()
+      next_page_params = next_page |> next_page_params(transactions, delete_parameters_from_next_page_params(params))
 
       conn
       |> put_status(200)
@@ -131,7 +130,7 @@ defmodule BlockScoutWeb.API.V2.AddressController do
 
   def token_transfers(
         conn,
-        %{"address_hash" => address_hash_string, "token" => token_address_hash_string} = params
+        %{"address_hash_param" => address_hash_string, "token" => token_address_hash_string} = params
       ) do
     with {:format, {:ok, address_hash}} <- {:format, Chain.string_to_address_hash(address_hash_string)},
          {:format, {:ok, token_address_hash}} <- {:format, Chain.string_to_address_hash(token_address_hash_string)},
@@ -167,8 +166,7 @@ defmodule BlockScoutWeb.API.V2.AddressController do
 
       next_page_params =
         next_page
-        |> token_transfers_next_page_params(token_transfers, params)
-        |> delete_parameters_from_next_page_params()
+        |> token_transfers_next_page_params(token_transfers, delete_parameters_from_next_page_params(params))
 
       conn
       |> put_status(200)
@@ -177,7 +175,7 @@ defmodule BlockScoutWeb.API.V2.AddressController do
     end
   end
 
-  def token_transfers(conn, %{"address_hash" => address_hash_string} = params) do
+  def token_transfers(conn, %{"address_hash_param" => address_hash_string} = params) do
     with {:format, {:ok, address_hash}} <- {:format, Chain.string_to_address_hash(address_hash_string)},
          {:ok, false} <- AccessHelper.restricted_access?(address_hash_string, params),
          {:not_found, {:ok, _address}} <- {:not_found, Chain.hash_to_address(address_hash, @api_true, false)} do
@@ -199,8 +197,7 @@ defmodule BlockScoutWeb.API.V2.AddressController do
 
       next_page_params =
         next_page
-        |> token_transfers_next_page_params(token_transfers, params)
-        |> delete_parameters_from_next_page_params()
+        |> token_transfers_next_page_params(token_transfers, delete_parameters_from_next_page_params(params))
 
       conn
       |> put_status(200)
@@ -209,7 +206,7 @@ defmodule BlockScoutWeb.API.V2.AddressController do
     end
   end
 
-  def internal_transactions(conn, %{"address_hash" => address_hash_string} = params) do
+  def internal_transactions(conn, %{"address_hash_param" => address_hash_string} = params) do
     with {:format, {:ok, address_hash}} <- {:format, Chain.string_to_address_hash(address_hash_string)},
          {:ok, false} <- AccessHelper.restricted_access?(address_hash_string, params),
          {:not_found, {:ok, _address}} <- {:not_found, Chain.hash_to_address(address_hash, @api_true, false)} do
@@ -232,7 +229,7 @@ defmodule BlockScoutWeb.API.V2.AddressController do
       {internal_transactions, next_page} = split_list_by_page(results_plus_one)
 
       next_page_params =
-        next_page |> next_page_params(internal_transactions, params) |> delete_parameters_from_next_page_params()
+        next_page |> next_page_params(internal_transactions, delete_parameters_from_next_page_params(params))
 
       conn
       |> put_status(200)
@@ -244,7 +241,7 @@ defmodule BlockScoutWeb.API.V2.AddressController do
     end
   end
 
-  def logs(conn, %{"address_hash" => address_hash_string, "topic" => topic} = params) do
+  def logs(conn, %{"address_hash_param" => address_hash_string, "topic" => topic} = params) do
     with {:format, {:ok, address_hash}} <- {:format, Chain.string_to_address_hash(address_hash_string)},
          {:ok, false} <- AccessHelper.restricted_access?(address_hash_string, params),
          {:not_found, {:ok, _address}} <- {:not_found, Chain.hash_to_address(address_hash, @api_true, false)} do
@@ -258,7 +255,7 @@ defmodule BlockScoutWeb.API.V2.AddressController do
 
       {logs, next_page} = split_list_by_page(results_plus_one)
 
-      next_page_params = next_page |> next_page_params(logs, params) |> delete_parameters_from_next_page_params()
+      next_page_params = next_page |> next_page_params(logs, delete_parameters_from_next_page_params(params))
 
       conn
       |> put_status(200)
@@ -267,7 +264,7 @@ defmodule BlockScoutWeb.API.V2.AddressController do
     end
   end
 
-  def logs(conn, %{"address_hash" => address_hash_string} = params) do
+  def logs(conn, %{"address_hash_param" => address_hash_string} = params) do
     with {:format, {:ok, address_hash}} <- {:format, Chain.string_to_address_hash(address_hash_string)},
          {:ok, false} <- AccessHelper.restricted_access?(address_hash_string, params),
          {:not_found, {:ok, _address}} <- {:not_found, Chain.hash_to_address(address_hash, @api_true, false)} do
@@ -277,7 +274,7 @@ defmodule BlockScoutWeb.API.V2.AddressController do
 
       {logs, next_page} = split_list_by_page(results_plus_one)
 
-      next_page_params = next_page |> next_page_params(logs, params) |> delete_parameters_from_next_page_params()
+      next_page_params = next_page |> next_page_params(logs, delete_parameters_from_next_page_params(params))
 
       conn
       |> put_status(200)
@@ -286,7 +283,7 @@ defmodule BlockScoutWeb.API.V2.AddressController do
     end
   end
 
-  def blocks_validated(conn, %{"address_hash" => address_hash_string} = params) do
+  def blocks_validated(conn, %{"address_hash_param" => address_hash_string} = params) do
     with {:format, {:ok, address_hash}} <- {:format, Chain.string_to_address_hash(address_hash_string)},
          {:ok, false} <- AccessHelper.restricted_access?(address_hash_string, params),
          {:not_found, {:ok, _address}} <- {:not_found, Chain.hash_to_address(address_hash, @api_true, false)} do
@@ -305,7 +302,7 @@ defmodule BlockScoutWeb.API.V2.AddressController do
       results_plus_one = Chain.get_blocks_validated_by_address(full_options, address_hash)
       {blocks, next_page} = split_list_by_page(results_plus_one)
 
-      next_page_params = next_page |> next_page_params(blocks, params) |> delete_parameters_from_next_page_params()
+      next_page_params = next_page |> next_page_params(blocks, delete_parameters_from_next_page_params(params))
 
       conn
       |> put_status(200)
@@ -314,7 +311,7 @@ defmodule BlockScoutWeb.API.V2.AddressController do
     end
   end
 
-  def coin_balance_history(conn, %{"address_hash" => address_hash_string} = params) do
+  def coin_balance_history(conn, %{"address_hash_param" => address_hash_string} = params) do
     with {:format, {:ok, address_hash}} <- {:format, Chain.string_to_address_hash(address_hash_string)},
          {:ok, false} <- AccessHelper.restricted_access?(address_hash_string, params),
          {:not_found, {:ok, address}} <- {:not_found, Chain.hash_to_address(address_hash, @api_true, false)} do
@@ -324,8 +321,7 @@ defmodule BlockScoutWeb.API.V2.AddressController do
 
       {coin_balances, next_page} = split_list_by_page(results_plus_one)
 
-      next_page_params =
-        next_page |> next_page_params(coin_balances, params) |> delete_parameters_from_next_page_params()
+      next_page_params = next_page |> next_page_params(coin_balances, delete_parameters_from_next_page_params(params))
 
       conn
       |> put_status(200)
@@ -333,7 +329,7 @@ defmodule BlockScoutWeb.API.V2.AddressController do
     end
   end
 
-  def coin_balance_history_by_day(conn, %{"address_hash" => address_hash_string} = params) do
+  def coin_balance_history_by_day(conn, %{"address_hash_param" => address_hash_string} = params) do
     with {:format, {:ok, address_hash}} <- {:format, Chain.string_to_address_hash(address_hash_string)},
          {:ok, false} <- AccessHelper.restricted_access?(address_hash_string, params),
          {:not_found, {:ok, _address}} <- {:not_found, Chain.hash_to_address(address_hash, @api_true, false)} do
@@ -347,7 +343,7 @@ defmodule BlockScoutWeb.API.V2.AddressController do
     end
   end
 
-  def tokens(conn, %{"address_hash" => address_hash_string} = params) do
+  def tokens(conn, %{"address_hash_param" => address_hash_string} = params) do
     with {:format, {:ok, address_hash}} <- {:format, Chain.string_to_address_hash(address_hash_string)},
          {:ok, false} <- AccessHelper.restricted_access?(address_hash_string, params),
          {:not_found, {:ok, _address}} <- {:not_found, Chain.hash_to_address(address_hash, @api_true, false)} do
@@ -355,7 +351,6 @@ defmodule BlockScoutWeb.API.V2.AddressController do
         address_hash
         |> Chain.fetch_paginated_last_token_balances(
           params
-          |> delete_parameters_from_next_page_params()
           |> paging_options()
           |> Keyword.merge(token_transfers_types_options(params))
           |> Keyword.merge(@api_true)
@@ -367,8 +362,7 @@ defmodule BlockScoutWeb.API.V2.AddressController do
 
       {tokens, next_page} = split_list_by_page(results_plus_one)
 
-      next_page_params =
-        next_page |> next_page_params(tokens, params, true) |> delete_parameters_from_next_page_params()
+      next_page_params = next_page |> next_page_params(tokens, delete_parameters_from_next_page_params(params), true)
 
       conn
       |> put_status(200)
@@ -376,7 +370,7 @@ defmodule BlockScoutWeb.API.V2.AddressController do
     end
   end
 
-  def withdrawals(conn, %{"address_hash" => address_hash_string} = params) do
+  def withdrawals(conn, %{"address_hash_param" => address_hash_string} = params) do
     with {:format, {:ok, address_hash}} <- {:format, Chain.string_to_address_hash(address_hash_string)},
          {:ok, false} <- AccessHelper.restricted_access?(address_hash_string, params),
          {:not_found, {:ok, _address}} <- {:not_found, Chain.hash_to_address(address_hash, @api_true, false)} do
@@ -384,7 +378,7 @@ defmodule BlockScoutWeb.API.V2.AddressController do
       withdrawals_plus_one = address_hash |> Chain.address_hash_to_withdrawals(options)
       {withdrawals, next_page} = split_list_by_page(withdrawals_plus_one)
 
-      next_page_params = next_page |> next_page_params(withdrawals, params) |> delete_parameters_from_next_page_params()
+      next_page_params = next_page |> next_page_params(withdrawals, delete_parameters_from_next_page_params(params))
 
       conn
       |> put_status(200)
@@ -416,7 +410,7 @@ defmodule BlockScoutWeb.API.V2.AddressController do
     })
   end
 
-  def tabs_counters(conn, %{"address_hash" => address_hash_string} = params) do
+  def tabs_counters(conn, %{"address_hash_param" => address_hash_string} = params) do
     with {:format, {:ok, address_hash}} <- {:format, Chain.string_to_address_hash(address_hash_string)},
          {:ok, false} <- AccessHelper.restricted_access?(address_hash_string, params),
          {:not_found, {:ok, _address}} <- {:not_found, Chain.hash_to_address(address_hash, @api_true, false)} do
diff --git a/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/block_controller.ex b/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/block_controller.ex
index 865127d756a0..a680d7616d40 100644
--- a/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/block_controller.ex
+++ b/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/block_controller.ex
@@ -77,7 +77,7 @@ defmodule BlockScoutWeb.API.V2.BlockController do
 
     {blocks, next_page} = split_list_by_page(blocks_plus_one)
 
-    next_page_params = next_page |> next_page_params(blocks, params) |> delete_parameters_from_next_page_params()
+    next_page_params = next_page |> next_page_params(blocks, delete_parameters_from_next_page_params(params))
 
     conn
     |> put_status(200)
@@ -98,8 +98,7 @@ defmodule BlockScoutWeb.API.V2.BlockController do
 
       next_page_params =
         next_page
-        |> next_page_params(transactions, params)
-        |> delete_parameters_from_next_page_params()
+        |> next_page_params(transactions, delete_parameters_from_next_page_params(params))
 
       conn
       |> put_status(200)
@@ -118,7 +117,7 @@ defmodule BlockScoutWeb.API.V2.BlockController do
       withdrawals_plus_one = Chain.block_to_withdrawals(block.hash, full_options)
       {withdrawals, next_page} = split_list_by_page(withdrawals_plus_one)
 
-      next_page_params = next_page |> next_page_params(withdrawals, params) |> delete_parameters_from_next_page_params()
+      next_page_params = next_page |> next_page_params(withdrawals, delete_parameters_from_next_page_params(params))
 
       conn
       |> put_status(200)
diff --git a/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/smart_contract_controller.ex b/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/smart_contract_controller.ex
index b991044be9a0..34ad68ca255c 100644
--- a/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/smart_contract_controller.ex
+++ b/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/smart_contract_controller.ex
@@ -204,8 +204,7 @@ defmodule BlockScoutWeb.API.V2.SmartContractController do
 
     next_page_params =
       next_page
-      |> next_page_params(smart_contracts, params)
-      |> delete_parameters_from_next_page_params()
+      |> next_page_params(smart_contracts, delete_parameters_from_next_page_params(params))
 
     conn
     |> put_status(200)
diff --git a/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/token_controller.ex b/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/token_controller.ex
index 647e38ab6283..1ec2a32a3e0b 100644
--- a/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/token_controller.ex
+++ b/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/token_controller.ex
@@ -23,7 +23,7 @@ defmodule BlockScoutWeb.API.V2.TokenController do
 
   @api_true [api?: true]
 
-  def token(conn, %{"address_hash" => address_hash_string} = params) do
+  def token(conn, %{"address_hash_param" => address_hash_string} = params) do
     with {:format, {:ok, address_hash}} <- {:format, Chain.string_to_address_hash(address_hash_string)},
          {:ok, false} <- AccessHelper.restricted_access?(address_hash_string, params),
          {:not_found, {:ok, token}} <- {:not_found, Chain.token_from_address_hash(address_hash, @api_true)} do
@@ -35,7 +35,7 @@ defmodule BlockScoutWeb.API.V2.TokenController do
     end
   end
 
-  def counters(conn, %{"address_hash" => address_hash_string} = params) do
+  def counters(conn, %{"address_hash_param" => address_hash_string} = params) do
     with {:format, {:ok, address_hash}} <- {:format, Chain.string_to_address_hash(address_hash_string)},
          {:ok, false} <- AccessHelper.restricted_access?(address_hash_string, params),
          {:not_found, true} <- {:not_found, Chain.token_from_address_hash_exists?(address_hash, @api_true)} do
@@ -45,7 +45,7 @@ defmodule BlockScoutWeb.API.V2.TokenController do
     end
   end
 
-  def transfers(conn, %{"address_hash" => address_hash_string} = params) do
+  def transfers(conn, %{"address_hash_param" => address_hash_string} = params) do
     with {:format, {:ok, address_hash}} <- {:format, Chain.string_to_address_hash(address_hash_string)},
          {:ok, false} <- AccessHelper.restricted_access?(address_hash_string, params),
          {:not_found, true} <- {:not_found, Chain.token_from_address_hash_exists?(address_hash, @api_true)} do
@@ -61,8 +61,7 @@ defmodule BlockScoutWeb.API.V2.TokenController do
 
       next_page_params =
         next_page
-        |> token_transfers_next_page_params(token_transfers, params)
-        |> delete_parameters_from_next_page_params()
+        |> token_transfers_next_page_params(token_transfers, delete_parameters_from_next_page_params(params))
 
       conn
       |> put_status(200)
@@ -71,7 +70,7 @@ defmodule BlockScoutWeb.API.V2.TokenController do
     end
   end
 
-  def holders(conn, %{"address_hash" => address_hash_string} = params) do
+  def holders(conn, %{"address_hash_param" => address_hash_string} = params) do
     with {:format, {:ok, address_hash}} <- {:format, Chain.string_to_address_hash(address_hash_string)},
          {:ok, false} <- AccessHelper.restricted_access?(address_hash_string, params),
          {:not_found, {:ok, token}} <- {:not_found, Chain.token_from_address_hash(address_hash, @api_true)} do
@@ -80,8 +79,7 @@ defmodule BlockScoutWeb.API.V2.TokenController do
 
       {token_balances, next_page} = split_list_by_page(results_plus_one)
 
-      next_page_params =
-        next_page |> next_page_params(token_balances, params) |> delete_parameters_from_next_page_params()
+      next_page_params = next_page |> next_page_params(token_balances, delete_parameters_from_next_page_params(params))
 
       conn
       |> put_status(200)
@@ -89,7 +87,7 @@ defmodule BlockScoutWeb.API.V2.TokenController do
     end
   end
 
-  def instances(conn, %{"address_hash" => address_hash_string} = params) do
+  def instances(conn, %{"address_hash_param" => address_hash_string} = params) do
     with {:format, {:ok, address_hash}} <- {:format, Chain.string_to_address_hash(address_hash_string)},
          {:ok, false} <- AccessHelper.restricted_access?(address_hash_string, params),
          {:not_found, {:ok, token}} <- {:not_found, Chain.token_from_address_hash(address_hash, @api_true)} do
@@ -102,7 +100,7 @@ defmodule BlockScoutWeb.API.V2.TokenController do
       {token_instances, next_page} = split_list_by_page(results_plus_one)
 
       next_page_params =
-        next_page |> unique_tokens_next_page(token_instances, params) |> delete_parameters_from_next_page_params()
+        next_page |> unique_tokens_next_page(token_instances, delete_parameters_from_next_page_params(params))
 
       conn
       |> put_status(200)
@@ -110,7 +108,7 @@ defmodule BlockScoutWeb.API.V2.TokenController do
     end
   end
 
-  def instance(conn, %{"address_hash" => address_hash_string, "token_id" => token_id_str} = params) do
+  def instance(conn, %{"address_hash_param" => address_hash_string, "token_id" => token_id_str} = params) do
     with {:format, {:ok, address_hash}} <- {:format, Chain.string_to_address_hash(address_hash_string)},
          {:ok, false} <- AccessHelper.restricted_access?(address_hash_string, params),
          {:not_found, {:ok, token}} <- {:not_found, Chain.token_from_address_hash(address_hash, @api_true)},
@@ -131,7 +129,7 @@ defmodule BlockScoutWeb.API.V2.TokenController do
     end
   end
 
-  def transfers_by_instance(conn, %{"address_hash" => address_hash_string, "token_id" => token_id_str} = params) do
+  def transfers_by_instance(conn, %{"address_hash_param" => address_hash_string, "token_id" => token_id_str} = params) do
     with {:format, {:ok, address_hash}} <- {:format, Chain.string_to_address_hash(address_hash_string)},
          {:ok, false} <- AccessHelper.restricted_access?(address_hash_string, params),
          {:not_found, {:ok, token}} <- {:not_found, Chain.token_from_address_hash(address_hash, @api_true)},
@@ -149,8 +147,7 @@ defmodule BlockScoutWeb.API.V2.TokenController do
 
       next_page_params =
         next_page
-        |> token_transfers_next_page_params(token_transfers, params)
-        |> delete_parameters_from_next_page_params()
+        |> token_transfers_next_page_params(token_transfers, delete_parameters_from_next_page_params(params))
 
       conn
       |> put_status(200)
@@ -159,7 +156,7 @@ defmodule BlockScoutWeb.API.V2.TokenController do
     end
   end
 
-  def holders_by_instance(conn, %{"address_hash" => address_hash_string, "token_id" => token_id_str} = params) do
+  def holders_by_instance(conn, %{"address_hash_param" => address_hash_string, "token_id" => token_id_str} = params) do
     with {:format, {:ok, address_hash}} <- {:format, Chain.string_to_address_hash(address_hash_string)},
          {:ok, false} <- AccessHelper.restricted_access?(address_hash_string, params),
          {:not_found, {:ok, token}} <- {:not_found, Chain.token_from_address_hash(address_hash, @api_true)},
@@ -178,8 +175,7 @@ defmodule BlockScoutWeb.API.V2.TokenController do
 
       next_page_params =
         next_page
-        |> next_page_params(token_holders, params)
-        |> delete_parameters_from_next_page_params()
+        |> next_page_params(token_holders, delete_parameters_from_next_page_params(params))
 
       conn
       |> put_status(200)
@@ -187,7 +183,10 @@ defmodule BlockScoutWeb.API.V2.TokenController do
     end
   end
 
-  def transfers_count_by_instance(conn, %{"address_hash" => address_hash_string, "token_id" => token_id_str} = params) do
+  def transfers_count_by_instance(
+        conn,
+        %{"address_hash_param" => address_hash_string, "token_id" => token_id_str} = params
+      ) do
     with {:format, {:ok, address_hash}} <- {:format, Chain.string_to_address_hash(address_hash_string)},
          {:ok, false} <- AccessHelper.restricted_access?(address_hash_string, params),
          {:not_found, {:ok, token}} <- {:not_found, Chain.token_from_address_hash(address_hash, @api_true)},
@@ -213,7 +212,7 @@ defmodule BlockScoutWeb.API.V2.TokenController do
 
     {tokens, next_page} = filter |> Chain.list_top_tokens(options) |> split_list_by_page()
 
-    next_page_params = next_page |> next_page_params(tokens, params) |> delete_parameters_from_next_page_params()
+    next_page_params = next_page |> next_page_params(tokens, delete_parameters_from_next_page_params(params))
 
     conn
     |> put_status(200)
diff --git a/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/transaction_controller.ex b/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/transaction_controller.ex
index 94d060f918ad..973fdc7094dd 100644
--- a/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/transaction_controller.ex
+++ b/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/transaction_controller.ex
@@ -62,7 +62,7 @@ defmodule BlockScoutWeb.API.V2.TransactionController do
 
   @api_true [api?: true]
 
-  def transaction(conn, %{"transaction_hash" => transaction_hash_string} = params) do
+  def transaction(conn, %{"transaction_hash_param" => transaction_hash_string} = params) do
     with {:format, {:ok, transaction_hash}} <- {:format, Chain.string_to_transaction_hash(transaction_hash_string)},
          {:not_found, {:ok, transaction}} <-
            {:not_found,
@@ -97,14 +97,14 @@ defmodule BlockScoutWeb.API.V2.TransactionController do
 
     {transactions, next_page} = split_list_by_page(transactions_plus_one)
 
-    next_page_params = next_page |> next_page_params(transactions, params) |> delete_parameters_from_next_page_params()
+    next_page_params = next_page |> next_page_params(transactions, delete_parameters_from_next_page_params(params))
 
     conn
     |> put_status(200)
     |> render(:transactions, %{transactions: transactions, next_page_params: next_page_params})
   end
 
-  def raw_trace(conn, %{"transaction_hash" => transaction_hash_string} = params) do
+  def raw_trace(conn, %{"transaction_hash_param" => transaction_hash_string} = params) do
     with {:format, {:ok, transaction_hash}} <- {:format, Chain.string_to_transaction_hash(transaction_hash_string)},
          {:not_found, {:ok, transaction}} <-
            {:not_found, Chain.hash_to_transaction(transaction_hash, @api_true)},
@@ -133,7 +133,7 @@ defmodule BlockScoutWeb.API.V2.TransactionController do
     end
   end
 
-  def token_transfers(conn, %{"transaction_hash" => transaction_hash_string} = params) do
+  def token_transfers(conn, %{"transaction_hash_param" => transaction_hash_string} = params) do
     with {:format, {:ok, transaction_hash}} <- {:format, Chain.string_to_transaction_hash(transaction_hash_string)},
          {:not_found, {:ok, transaction}} <-
            {:not_found, Chain.hash_to_transaction(transaction_hash, @api_true)},
@@ -157,8 +157,7 @@ defmodule BlockScoutWeb.API.V2.TransactionController do
 
       next_page_params =
         next_page
-        |> token_transfers_next_page_params(token_transfers, params)
-        |> delete_parameters_from_next_page_params()
+        |> token_transfers_next_page_params(token_transfers, delete_parameters_from_next_page_params(params))
 
       conn
       |> put_status(200)
@@ -166,7 +165,7 @@ defmodule BlockScoutWeb.API.V2.TransactionController do
     end
   end
 
-  def internal_transactions(conn, %{"transaction_hash" => transaction_hash_string} = params) do
+  def internal_transactions(conn, %{"transaction_hash_param" => transaction_hash_string} = params) do
     with {:format, {:ok, transaction_hash}} <- {:format, Chain.string_to_transaction_hash(transaction_hash_string)},
          {:not_found, {:ok, transaction}} <-
            {:not_found, Chain.hash_to_transaction(transaction_hash, @api_true)},
@@ -183,8 +182,7 @@ defmodule BlockScoutWeb.API.V2.TransactionController do
 
       next_page_params =
         next_page
-        |> next_page_params(internal_transactions, params)
-        |> delete_parameters_from_next_page_params()
+        |> next_page_params(internal_transactions, delete_parameters_from_next_page_params(params))
 
       conn
       |> put_status(200)
@@ -195,7 +193,7 @@ defmodule BlockScoutWeb.API.V2.TransactionController do
     end
   end
 
-  def logs(conn, %{"transaction_hash" => transaction_hash_string} = params) do
+  def logs(conn, %{"transaction_hash_param" => transaction_hash_string} = params) do
     with {:format, {:ok, transaction_hash}} <- {:format, Chain.string_to_transaction_hash(transaction_hash_string)},
          {:not_found, {:ok, transaction}} <-
            {:not_found, Chain.hash_to_transaction(transaction_hash, @api_true)},
@@ -218,8 +216,7 @@ defmodule BlockScoutWeb.API.V2.TransactionController do
 
       next_page_params =
         next_page
-        |> next_page_params(logs, params)
-        |> delete_parameters_from_next_page_params()
+        |> next_page_params(logs, delete_parameters_from_next_page_params(params))
 
       conn
       |> put_status(200)
@@ -231,7 +228,7 @@ defmodule BlockScoutWeb.API.V2.TransactionController do
     end
   end
 
-  def state_changes(conn, %{"transaction_hash" => transaction_hash_string} = params) do
+  def state_changes(conn, %{"transaction_hash_param" => transaction_hash_string} = params) do
     with {:format, {:ok, transaction_hash}} <- {:format, Chain.string_to_transaction_hash(transaction_hash_string)},
          {:not_found, {:ok, transaction}} <-
            {:not_found,
@@ -249,8 +246,7 @@ defmodule BlockScoutWeb.API.V2.TransactionController do
 
       next_page_params =
         next_page
-        |> next_page_params(state_changes, params)
-        |> delete_parameters_from_next_page_params()
+        |> next_page_params(state_changes, delete_parameters_from_next_page_params(params))
 
       conn
       |> put_status(200)
@@ -271,8 +267,7 @@ defmodule BlockScoutWeb.API.V2.TransactionController do
 
       {transactions, next_page} = split_list_by_page(transactions_plus_one)
 
-      next_page_params =
-        next_page |> next_page_params(transactions, params) |> delete_parameters_from_next_page_params()
+      next_page_params = next_page |> next_page_params(transactions, delete_parameters_from_next_page_params(params))
 
       conn
       |> put_status(200)
diff --git a/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/withdrawal_controller.ex b/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/withdrawal_controller.ex
index 396e66712a54..fc26823e5211 100644
--- a/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/withdrawal_controller.ex
+++ b/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/withdrawal_controller.ex
@@ -16,7 +16,7 @@ defmodule BlockScoutWeb.API.V2.WithdrawalController do
     withdrawals_plus_one = Chain.list_withdrawals(full_options)
     {withdrawals, next_page} = split_list_by_page(withdrawals_plus_one)
 
-    next_page_params = next_page |> next_page_params(withdrawals, params) |> delete_parameters_from_next_page_params()
+    next_page_params = next_page |> next_page_params(withdrawals, delete_parameters_from_next_page_params(params))
 
     conn
     |> put_status(200)
diff --git a/apps/block_scout_web/lib/block_scout_web/paging_helper.ex b/apps/block_scout_web/lib/block_scout_web/paging_helper.ex
index bcbbc9b0a274..860a8f7d4a15 100644
--- a/apps/block_scout_web/lib/block_scout_web/paging_helper.ex
+++ b/apps/block_scout_web/lib/block_scout_web/paging_helper.ex
@@ -129,12 +129,11 @@ defmodule BlockScoutWeb.PagingHelper do
     params
     |> Map.drop([
       "block_hash_or_number",
-      "transaction_hash",
-      "address_hash",
+      "transaction_hash_param",
+      "address_hash_param",
       "type",
       "method",
       "filter",
-      "token_address_hash",
       "q",
       "sort",
       "order"
diff --git a/apps/block_scout_web/test/block_scout_web/controllers/api/v2/search_controller_test.exs b/apps/block_scout_web/test/block_scout_web/controllers/api/v2/search_controller_test.exs
index 2bae0f6dc415..145963c99d32 100644
--- a/apps/block_scout_web/test/block_scout_web/controllers/api/v2/search_controller_test.exs
+++ b/apps/block_scout_web/test/block_scout_web/controllers/api/v2/search_controller_test.exs
@@ -3,7 +3,6 @@ defmodule BlockScoutWeb.API.V2.SearchControllerTest do
 
   alias Explorer.Chain.{Address, Block}
   alias Explorer.Repo
-  alias Explorer.Tags.AddressTag
 
   setup do
     insert(:block)
diff --git a/apps/block_scout_web/test/block_scout_web/controllers/api/v2/token_controller_test.exs b/apps/block_scout_web/test/block_scout_web/controllers/api/v2/token_controller_test.exs
index fbed9880a6ec..05b7009487c4 100644
--- a/apps/block_scout_web/test/block_scout_web/controllers/api/v2/token_controller_test.exs
+++ b/apps/block_scout_web/test/block_scout_web/controllers/api/v2/token_controller_test.exs
@@ -390,6 +390,30 @@ defmodule BlockScoutWeb.API.V2.TokenControllerTest do
 
       check_paginated_response(response, response_2nd_page, token_balances)
     end
+
+    test "check pagination with the same values", %{conn: conn} do
+      token = insert(:token)
+
+      token_balances =
+        for _ <- 0..50 do
+          insert(
+            :address_current_token_balance,
+            token_contract_address_hash: token.contract_address_hash,
+            value: 1000
+          )
+        end
+        |> Enum.sort_by(fn x -> x.address_hash end, :asc)
+
+      request = get(conn, "/api/v2/tokens/#{token.contract_address.hash}/holders")
+      assert response = json_response(request, 200)
+
+      request_2nd_page =
+        get(conn, "/api/v2/tokens/#{token.contract_address.hash}/holders", response["next_page_params"])
+
+      assert response_2nd_page = json_response(request_2nd_page, 200)
+
+      check_paginated_response(response, response_2nd_page, token_balances)
+    end
   end
 
   describe "/tokens" do

From d37638ba7b8877f83be19c18723310ce6536ca4c Mon Sep 17 00:00:00 2001
From: Nick Zenchik <n.zenchik@gmail.com>
Date: Fri, 18 Aug 2023 15:54:03 +0300
Subject: [PATCH 315/909] Fixing visualizer CORS issue in docker-compose

---
 docker-compose/envs/common-frontend.env       |  3 +--
 docker-compose/proxy/default.conf.template    | 22 ++++++++++++++-----
 .../services/docker-compose-nginx.yml         |  2 +-
 3 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/docker-compose/envs/common-frontend.env b/docker-compose/envs/common-frontend.env
index 73d9ae64cf76..e871aa294ca6 100644
--- a/docker-compose/envs/common-frontend.env
+++ b/docker-compose/envs/common-frontend.env
@@ -12,10 +12,9 @@ NEXT_PUBLIC_FEATURED_NETWORKS=https://raw.githubusercontent.com/blockscout/front
 NEXT_PUBLIC_APP_HOST=localhost
 NEXT_PUBLIC_APP_PROTOCOL=http
 NEXT_PUBLIC_HOMEPAGE_CHARTS="['daily_txs']"
-NEXT_PUBLIC_VISUALIZE_API_HOST=http://localhost:8090
+NEXT_PUBLIC_VISUALIZE_API_HOST=http://localhost:8081/
 NEXT_PUBLIC_IS_TESTNET='true'
 NEXT_PUBLIC_NETWORK_LOGO=https://raw.githubusercontent.com/blockscout/frontend-configs/main/configs/network-logos/goerli.svg
 NEXT_PUBLIC_NETWORK_ICON=https://raw.githubusercontent.com/blockscout/frontend-configs/main/configs/network-icons/goerli.svg
-NEXT_PUBLIC_HOMEPAGE_PLATE_BACKGROUND="radial-gradient(103.03% 103.03% at 0% 0%, rgba(183, 148, 244, 0.8) 0%, rgba(0, 163, 196, 0.8) 100%)"
 NEXT_PUBLIC_HOMEPAGE_PLATE_TEXT_COLOR="rgb(255, 255, 255)"
 NEXT_PUBLIC_API_WEBSOCKET_PROTOCOL='ws'
diff --git a/docker-compose/proxy/default.conf.template b/docker-compose/proxy/default.conf.template
index a6474729f54f..1b20024c4d3a 100644
--- a/docker-compose/proxy/default.conf.template
+++ b/docker-compose/proxy/default.conf.template
@@ -54,7 +54,7 @@ server {
     add_header 'Access-Control-Allow-Methods' 'PUT, GET, POST, OPTIONS, DELETE, PATCH' always;
 
     location / {
-        proxy_pass            http://stats:8050;
+        proxy_pass            http://stats:8050/;
         proxy_http_version    1.1;
         proxy_set_header      Host "$host";
         proxy_set_header      X-Real-IP "$remote_addr";
@@ -65,28 +65,40 @@ server {
         proxy_cache_bypass    $http_upgrade;
     }
 }
-
 server {
-    listen       8090;
+    listen       8081;
     server_name  localhost;
     proxy_http_version 1.1;
     proxy_hide_header Access-Control-Allow-Origin;
     proxy_hide_header Access-Control-Allow-Methods;
-    proxy_hide_header Access-Control-Allow-Headers;
     add_header 'Access-Control-Allow-Origin' 'http://localhost' always;
     add_header 'Access-Control-Allow-Credentials' 'true' always;
     add_header 'Access-Control-Allow-Methods' 'PUT, GET, POST, OPTIONS, DELETE, PATCH' always;
     add_header 'Access-Control-Allow-Headers' 'DNT,Keep-Alive,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type,Range,Authorization,x-csrf-token' always;
 
     location / {
-        proxy_pass            http://visualizer:8050;
+        proxy_pass            http://visualizer:8050/;
         proxy_http_version    1.1;
+        proxy_buffering       off;
         proxy_set_header      Host "$host";
         proxy_set_header      X-Real-IP "$remote_addr";
+        proxy_connect_timeout 30m;
+        proxy_read_timeout    30m;
+        proxy_send_timeout    30m;
         proxy_set_header      X-Forwarded-For "$proxy_add_x_forwarded_for";
         proxy_set_header      X-Forwarded-Proto "$scheme";
         proxy_set_header      Upgrade "$http_upgrade";
         proxy_set_header      Connection $connection_upgrade;
         proxy_cache_bypass    $http_upgrade;
+        if ($request_method = 'OPTIONS') {
+            add_header 'Access-Control-Allow-Origin' 'http://localhost' always;
+            add_header 'Access-Control-Allow-Credentials' 'true' always;
+            add_header 'Access-Control-Allow-Methods' 'PUT, GET, POST, OPTIONS, DELETE, PATCH' always;
+            add_header 'Access-Control-Allow-Headers' 'DNT,Keep-Alive,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type,Range,Authorization,x-csrf-token' always;
+            add_header 'Access-Control-Max-Age' 1728000;
+            add_header 'Content-Type' 'text/plain charset=UTF-8';
+            add_header 'Content-Length' 0;
+            return 204;
+        }
     }
 }
\ No newline at end of file
diff --git a/docker-compose/services/docker-compose-nginx.yml b/docker-compose/services/docker-compose-nginx.yml
index bae470638d1b..e54401d3f5ae 100644
--- a/docker-compose/services/docker-compose-nginx.yml
+++ b/docker-compose/services/docker-compose-nginx.yml
@@ -14,4 +14,4 @@ services:
     ports:
       - 80:80
       - 8080:8080
-      - 8090:8090
+      - 8081:8081

From 9f0062a7f5acd3e71a81b0b58ad7baefe8e52ba6 Mon Sep 17 00:00:00 2001
From: Nick Zenchik <n.zenchik@gmail.com>
Date: Fri, 18 Aug 2023 16:06:34 +0300
Subject: [PATCH 316/909] Updating Changelog

---
 CHANGELOG.md | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8fc5b21cdb77..86774e7a65ab 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,7 @@
 ### Fixes
 
 - [#8240](https://github.com/blockscout/blockscout/pull/8240) - Refactor and fix paging params in API v2
+- [#8242](https://github.com/blockscout/blockscout/pull/8242) - Fixing visualizer service CORS issue when running docker-compose
 
 ### Chore
 
@@ -170,7 +171,7 @@
 - [#7867](https://github.com/blockscout/blockscout/pull/7867) - Bump postcss from 8.4.24 to 8.4.25 in /apps/block_scout_web/assets
 - [#7871](https://github.com/blockscout/blockscout/pull/7871) - Bump @babel/core from 7.22.6 to 7.22.8 in /apps/block_scout_web/assets
 - [#7868](https://github.com/blockscout/blockscout/pull/7868) - Bump jest-environment-jsdom from 29.6.0 to 29.6.1 in /apps/block_scout_web/assets
-- [#7866](https://github.com/blockscout/blockscout/pull/7866) - Bump @babel/preset-env from 7.22.6 to 7.22.7 in /apps/block_scout_web/assets 
+- [#7866](https://github.com/blockscout/blockscout/pull/7866) - Bump @babel/preset-env from 7.22.6 to 7.22.7 in /apps/block_scout_web/assets
 - [#7869](https://github.com/blockscout/blockscout/pull/7869) - Bump core-js from 3.31.0 to 3.31.1 in /apps/block_scout_web/assets
 - [#7884](https://github.com/blockscout/blockscout/pull/7884) - Bump ecto from 3.10.2 to 3.10.3
 - [#7882](https://github.com/blockscout/blockscout/pull/7882) - Bump jason from 1.4.0 to 1.4.1
@@ -297,7 +298,7 @@
 - [#7702](https://github.com/blockscout/blockscout/pull/7702) - Bump @amplitude/analytics-browser from 1.10.8 to 1.11.0 in /apps/block_scout_web/assets
 - [#7708](https://github.com/blockscout/blockscout/pull/7708) - Bump phoenix_pubsub from 2.1.2 to 2.1.3
 - [#7707](https://github.com/blockscout/blockscout/pull/7707) - Bump @amplitude/analytics-browser from 1.11.0 to 2.0.0 in /apps/block_scout_web/assets
-- [#7706](https://github.com/blockscout/blockscout/pull/7706) - Bump webpack from 5.86.0 to 5.87.0 in /apps/block_scout_web/assets 
+- [#7706](https://github.com/blockscout/blockscout/pull/7706) - Bump webpack from 5.86.0 to 5.87.0 in /apps/block_scout_web/assets
 - [#7705](https://github.com/blockscout/blockscout/pull/7705) - Bump sass from 1.63.3 to 1.63.4 in /apps/block_scout_web/assets
 - [#7714](https://github.com/blockscout/blockscout/pull/7714) - Bump ex_cldr_units from 3.16.1 to 3.16.2
 - [#7748](https://github.com/blockscout/blockscout/pull/7748) - Bump mock from 0.3.7 to 0.3.8

From 4efbc8002ad5e885f7ef94a20a0338e45ddcb5d8 Mon Sep 17 00:00:00 2001
From: Nick Zenchik <n.zenchik@gmail.com>
Date: Fri, 18 Aug 2023 16:14:01 +0300
Subject: [PATCH 317/909] Removing / from visualizer env var

---
 docker-compose/envs/common-frontend.env | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker-compose/envs/common-frontend.env b/docker-compose/envs/common-frontend.env
index e871aa294ca6..f1c77cdfa7ca 100644
--- a/docker-compose/envs/common-frontend.env
+++ b/docker-compose/envs/common-frontend.env
@@ -12,7 +12,7 @@ NEXT_PUBLIC_FEATURED_NETWORKS=https://raw.githubusercontent.com/blockscout/front
 NEXT_PUBLIC_APP_HOST=localhost
 NEXT_PUBLIC_APP_PROTOCOL=http
 NEXT_PUBLIC_HOMEPAGE_CHARTS="['daily_txs']"
-NEXT_PUBLIC_VISUALIZE_API_HOST=http://localhost:8081/
+NEXT_PUBLIC_VISUALIZE_API_HOST=http://localhost:8081
 NEXT_PUBLIC_IS_TESTNET='true'
 NEXT_PUBLIC_NETWORK_LOGO=https://raw.githubusercontent.com/blockscout/frontend-configs/main/configs/network-logos/goerli.svg
 NEXT_PUBLIC_NETWORK_ICON=https://raw.githubusercontent.com/blockscout/frontend-configs/main/configs/network-icons/goerli.svg

From cf85d16c76bff3ba8a2f0702545876e2e34058a8 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 18 Aug 2023 18:08:51 +0000
Subject: [PATCH 318/909] Bump sass from 1.65.1 to 1.66.0 in
 /apps/block_scout_web/assets

Bumps [sass](https://github.com/sass/dart-sass) from 1.65.1 to 1.66.0.
- [Release notes](https://github.com/sass/dart-sass/releases)
- [Changelog](https://github.com/sass/dart-sass/blob/main/CHANGELOG.md)
- [Commits](https://github.com/sass/dart-sass/compare/1.65.1...1.66.0)

---
updated-dependencies:
- dependency-name: sass
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 apps/block_scout_web/assets/package-lock.json | 14 +++++++-------
 apps/block_scout_web/assets/package.json      |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/apps/block_scout_web/assets/package-lock.json b/apps/block_scout_web/assets/package-lock.json
index 1f46733be32d..1980d20a844c 100644
--- a/apps/block_scout_web/assets/package-lock.json
+++ b/apps/block_scout_web/assets/package-lock.json
@@ -89,7 +89,7 @@
         "mini-css-extract-plugin": "^2.7.6",
         "postcss": "^8.4.28",
         "postcss-loader": "^7.3.3",
-        "sass": "^1.65.1",
+        "sass": "^1.66.0",
         "sass-loader": "^13.3.2",
         "style-loader": "^3.3.3",
         "webpack": "^5.88.2",
@@ -14951,9 +14951,9 @@
       "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
     },
     "node_modules/sass": {
-      "version": "1.65.1",
-      "resolved": "https://registry.npmjs.org/sass/-/sass-1.65.1.tgz",
-      "integrity": "sha512-9DINwtHmA41SEd36eVPQ9BJKpn7eKDQmUHmpI0y5Zv2Rcorrh0zS+cFrt050hdNbmmCNKTW3hV5mWfuegNRsEA==",
+      "version": "1.66.0",
+      "resolved": "https://registry.npmjs.org/sass/-/sass-1.66.0.tgz",
+      "integrity": "sha512-C3U+RgpAAlTXULZkWwzfysgbbBBo8IZudNAOJAVBLslFbIaZv4MBPkTqhuvpK4lqgdoFiWhnOGMoV4L1FyOBag==",
       "dev": true,
       "dependencies": {
         "chokidar": ">=3.0.0 <4.0.0",
@@ -28787,9 +28787,9 @@
       "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
     },
     "sass": {
-      "version": "1.65.1",
-      "resolved": "https://registry.npmjs.org/sass/-/sass-1.65.1.tgz",
-      "integrity": "sha512-9DINwtHmA41SEd36eVPQ9BJKpn7eKDQmUHmpI0y5Zv2Rcorrh0zS+cFrt050hdNbmmCNKTW3hV5mWfuegNRsEA==",
+      "version": "1.66.0",
+      "resolved": "https://registry.npmjs.org/sass/-/sass-1.66.0.tgz",
+      "integrity": "sha512-C3U+RgpAAlTXULZkWwzfysgbbBBo8IZudNAOJAVBLslFbIaZv4MBPkTqhuvpK4lqgdoFiWhnOGMoV4L1FyOBag==",
       "dev": true,
       "requires": {
         "chokidar": ">=3.0.0 <4.0.0",
diff --git a/apps/block_scout_web/assets/package.json b/apps/block_scout_web/assets/package.json
index 8da00944207e..f77acb548418 100644
--- a/apps/block_scout_web/assets/package.json
+++ b/apps/block_scout_web/assets/package.json
@@ -101,7 +101,7 @@
     "mini-css-extract-plugin": "^2.7.6",
     "postcss": "^8.4.28",
     "postcss-loader": "^7.3.3",
-    "sass": "^1.65.1",
+    "sass": "^1.66.0",
     "sass-loader": "^13.3.2",
     "style-loader": "^3.3.3",
     "webpack": "^5.88.2",

From f71f4d8ba7a5f35e432f723d0de56a8b78ebfbf5 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 18 Aug 2023 18:09:33 +0000
Subject: [PATCH 319/909] Bump core-js from 3.32.0 to 3.32.1 in
 /apps/block_scout_web/assets

Bumps [core-js](https://github.com/zloirock/core-js/tree/HEAD/packages/core-js) from 3.32.0 to 3.32.1.
- [Release notes](https://github.com/zloirock/core-js/releases)
- [Changelog](https://github.com/zloirock/core-js/blob/master/CHANGELOG.md)
- [Commits](https://github.com/zloirock/core-js/commits/v3.32.1/packages/core-js)

---
updated-dependencies:
- dependency-name: core-js
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 apps/block_scout_web/assets/package-lock.json | 14 +++++++-------
 apps/block_scout_web/assets/package.json      |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/apps/block_scout_web/assets/package-lock.json b/apps/block_scout_web/assets/package-lock.json
index 1f46733be32d..593966fc7acd 100644
--- a/apps/block_scout_web/assets/package-lock.json
+++ b/apps/block_scout_web/assets/package-lock.json
@@ -17,7 +17,7 @@
         "chart.js": "^4.3.3",
         "chartjs-adapter-luxon": "^1.3.1",
         "clipboard": "^2.0.11",
-        "core-js": "^3.32.0",
+        "core-js": "^3.32.1",
         "crypto-browserify": "^3.12.0",
         "dropzone": "^5.9.3",
         "eth-net-props": "^1.0.41",
@@ -5797,9 +5797,9 @@
       }
     },
     "node_modules/core-js": {
-      "version": "3.32.0",
-      "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.32.0.tgz",
-      "integrity": "sha512-rd4rYZNlF3WuoYuRIDEmbR/ga9CeuWX9U05umAvgrrZoHY4Z++cp/xwPQMvUpBB4Ag6J8KfD80G0zwCyaSxDww==",
+      "version": "3.32.1",
+      "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.32.1.tgz",
+      "integrity": "sha512-lqufgNn9NLnESg5mQeYsxQP5w7wrViSj0jr/kv6ECQiByzQkrn1MKvV0L3acttpDqfQrHLwr2KCMgX5b8X+lyQ==",
       "hasInstallScript": true,
       "funding": {
         "type": "opencollective",
@@ -21835,9 +21835,9 @@
       }
     },
     "core-js": {
-      "version": "3.32.0",
-      "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.32.0.tgz",
-      "integrity": "sha512-rd4rYZNlF3WuoYuRIDEmbR/ga9CeuWX9U05umAvgrrZoHY4Z++cp/xwPQMvUpBB4Ag6J8KfD80G0zwCyaSxDww=="
+      "version": "3.32.1",
+      "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.32.1.tgz",
+      "integrity": "sha512-lqufgNn9NLnESg5mQeYsxQP5w7wrViSj0jr/kv6ECQiByzQkrn1MKvV0L3acttpDqfQrHLwr2KCMgX5b8X+lyQ=="
     },
     "core-js-compat": {
       "version": "3.31.0",
diff --git a/apps/block_scout_web/assets/package.json b/apps/block_scout_web/assets/package.json
index 8da00944207e..b3cdaf5b33c2 100644
--- a/apps/block_scout_web/assets/package.json
+++ b/apps/block_scout_web/assets/package.json
@@ -29,7 +29,7 @@
     "chart.js": "^4.3.3",
     "chartjs-adapter-luxon": "^1.3.1",
     "clipboard": "^2.0.11",
-    "core-js": "^3.32.0",
+    "core-js": "^3.32.1",
     "crypto-browserify": "^3.12.0",
     "dropzone": "^5.9.3",
     "eth-net-props": "^1.0.41",

From f5208645b70406d10d29fdedc25466e65474056b Mon Sep 17 00:00:00 2001
From: Qwerty5Uiop <alex000010@bk.ru>
Date: Fri, 11 Aug 2023 15:37:01 +0400
Subject: [PATCH 320/909] Insert current token balances placeholders along with
 historical

---
 CHANGELOG.md                                      |  2 ++
 .../runner/address/current_token_balances.ex      | 11 ++++++-----
 .../address/current_token_balances_test.exs       | 15 ++++++++++-----
 apps/indexer/lib/indexer/block/fetcher.ex         |  5 ++++-
 4 files changed, 22 insertions(+), 11 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 86774e7a65ab..672aba72bf4e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,8 @@
 
 ### Features
 
+- [#8181](https://github.com/blockscout/blockscout/pull/8181) - Insert current token balances placeholders along with historical
+
 ### Fixes
 
 - [#8240](https://github.com/blockscout/blockscout/pull/8240) - Refactor and fix paging params in API v2
diff --git a/apps/explorer/lib/explorer/chain/import/runner/address/current_token_balances.ex b/apps/explorer/lib/explorer/chain/import/runner/address/current_token_balances.ex
index 0903c70cb876..cc51fb87376c 100644
--- a/apps/explorer/lib/explorer/chain/import/runner/address/current_token_balances.ex
+++ b/apps/explorer/lib/explorer/chain/import/runner/address/current_token_balances.ex
@@ -273,11 +273,12 @@ defmodule Explorer.Chain.Import.Runner.Address.CurrentTokenBalances do
         ]
       ],
       where:
-        fragment("? < EXCLUDED.block_number", current_token_balance.block_number) or
-          (fragment("? = EXCLUDED.block_number", current_token_balance.block_number) and
-             fragment("EXCLUDED.value IS NOT NULL") and
-             (is_nil(current_token_balance.value_fetched_at) or
-                fragment("? < EXCLUDED.value_fetched_at", current_token_balance.value_fetched_at)))
+        fragment("EXCLUDED.value_fetched_at IS NOT NULL") and
+          (fragment("? < EXCLUDED.block_number", current_token_balance.block_number) or
+             (fragment("? = EXCLUDED.block_number", current_token_balance.block_number) and
+                fragment("EXCLUDED.value IS NOT NULL") and
+                (is_nil(current_token_balance.value_fetched_at) or
+                   fragment("? < EXCLUDED.value_fetched_at", current_token_balance.value_fetched_at))))
     )
   end
 
diff --git a/apps/explorer/test/explorer/chain/import/runner/address/current_token_balances_test.exs b/apps/explorer/test/explorer/chain/import/runner/address/current_token_balances_test.exs
index 31eba0553de0..fa8d97e0a5c2 100644
--- a/apps/explorer/test/explorer/chain/import/runner/address/current_token_balances_test.exs
+++ b/apps/explorer/test/explorer/chain/import/runner/address/current_token_balances_test.exs
@@ -218,7 +218,8 @@ defmodule Explorer.Chain.Import.Runner.Address.CurrentTokenBalancesTest do
           address_hash: address.hash,
           block_number: 2,
           token_contract_address_hash: token.contract_address_hash,
-          value: Decimal.new(200)
+          value: Decimal.new(200),
+          value_fetched_at: DateTime.utc_now()
         },
         options
       )
@@ -300,7 +301,8 @@ defmodule Explorer.Chain.Import.Runner.Address.CurrentTokenBalancesTest do
                    address_hash: address_hash,
                    token_contract_address_hash: token_contract_address_hash,
                    block_number: block_number,
-                   value: value
+                   value: value,
+                   value_fetched_at: DateTime.utc_now()
                  },
                  options
                )
@@ -344,7 +346,8 @@ defmodule Explorer.Chain.Import.Runner.Address.CurrentTokenBalancesTest do
                    address_hash: address_hash,
                    token_contract_address_hash: token_contract_address_hash,
                    block_number: block_number,
-                   value: value
+                   value: value,
+                   value_fetched_at: DateTime.utc_now()
                  },
                  options
                )
@@ -404,13 +407,15 @@ defmodule Explorer.Chain.Import.Runner.Address.CurrentTokenBalancesTest do
                      address_hash: non_holder_becomes_holder_address_hash,
                      token_contract_address_hash: token_contract_address_hash,
                      block_number: block_number,
-                     value: non_holder_becomes_holder_value
+                     value: non_holder_becomes_holder_value,
+                     value_fetched_at: DateTime.utc_now()
                    },
                    %{
                      address_hash: holder_becomes_non_holder_address_hash,
                      token_contract_address_hash: token_contract_address_hash,
                      block_number: block_number,
-                     value: holder_becomes_non_holder_value
+                     value: holder_becomes_non_holder_value,
+                     value_fetched_at: DateTime.utc_now()
                    }
                  ],
                  options
diff --git a/apps/indexer/lib/indexer/block/fetcher.ex b/apps/indexer/lib/indexer/block/fetcher.ex
index d7b9be8d31e7..cffd739843bf 100644
--- a/apps/indexer/lib/indexer/block/fetcher.ex
+++ b/apps/indexer/lib/indexer/block/fetcher.ex
@@ -29,7 +29,7 @@ defmodule Indexer.Block.Fetcher do
     UncleBlock
   }
 
-  alias Indexer.{Prometheus, Tracer}
+  alias Indexer.{Prometheus, TokenBalances, Tracer}
 
   alias Indexer.Transform.{
     AddressCoinBalances,
@@ -182,6 +182,9 @@ defmodule Indexer.Block.Fetcher do
                address_coin_balances: %{params: coin_balances_params_set},
                address_coin_balances_daily: %{params: coin_balances_params_daily_set},
                address_token_balances: %{params: address_token_balances},
+               address_current_token_balances: %{
+                 params: address_token_balances |> MapSet.to_list() |> TokenBalances.to_address_current_token_balances()
+               },
                blocks: %{params: blocks},
                block_second_degree_relations: %{params: block_second_degree_relations_params},
                block_rewards: %{errors: beneficiaries_errors, params: beneficiaries_with_gas_payment},

From fc5fb4f91f0fb28eddf686cf8e0aad806fe94052 Mon Sep 17 00:00:00 2001
From: Qwerty5Uiop <alex000010@bk.ru>
Date: Tue, 15 Aug 2023 17:22:13 +0400
Subject: [PATCH 321/909] Drop logs address_hash foreign key

---
 CHANGELOG.md                                              | 1 +
 .../20230815131151_drop_logs_address_hash_foreign_key.exs | 8 ++++++++
 2 files changed, 9 insertions(+)
 create mode 100644 apps/explorer/priv/repo/migrations/20230815131151_drop_logs_address_hash_foreign_key.exs

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 672aba72bf4e..cca03946c559 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -30,6 +30,7 @@
 - [#6190](https://github.com/blockscout/blockscout/pull/6190) - Add EIP-1559 support to gas price oracle
 - [#7977](https://github.com/blockscout/blockscout/pull/7977) - GraphQL: extend schema with new field for existing objects
 - [#8158](https://github.com/blockscout/blockscout/pull/8158), [#8164](https://github.com/blockscout/blockscout/pull/8164) - Include unfetched balances in TokenBalanceOnDemand fetcher
+- [#8210](https://github.com/blockscout/blockscout/pull/8210) - Drop logs address_hash foreign key
 
 ### Fixes
 
diff --git a/apps/explorer/priv/repo/migrations/20230815131151_drop_logs_address_hash_foreign_key.exs b/apps/explorer/priv/repo/migrations/20230815131151_drop_logs_address_hash_foreign_key.exs
new file mode 100644
index 000000000000..e847cb14d74f
--- /dev/null
+++ b/apps/explorer/priv/repo/migrations/20230815131151_drop_logs_address_hash_foreign_key.exs
@@ -0,0 +1,8 @@
+# cspell:ignore fkey
+defmodule Explorer.Repo.Migrations.DropLogsAddressHashForeignKey do
+  use Ecto.Migration
+
+  def change do
+    drop_if_exists(constraint(:logs, :logs_address_hash_fkey))
+  end
+end

From e381723d609a77b49c9b3710b34654d093186e70 Mon Sep 17 00:00:00 2001
From: Qwerty5Uiop <alex000010@bk.ru>
Date: Wed, 16 Aug 2023 11:00:45 +0400
Subject: [PATCH 322/909] Drop address foreign keys from token transfers and
 transactions

---
 CHANGELOG.md                                        |  2 +-
 apps/explorer/lib/explorer/chain/token_transfer.ex  |  3 ---
 ...ansfers_and_transactions_address_foreign_key.exs | 13 +++++++++++++
 3 files changed, 14 insertions(+), 4 deletions(-)
 create mode 100644 apps/explorer/priv/repo/migrations/20230816061723_drop_token_transfers_and_transactions_address_foreign_key.exs

diff --git a/CHANGELOG.md b/CHANGELOG.md
index cca03946c559..286dec346a89 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -30,7 +30,7 @@
 - [#6190](https://github.com/blockscout/blockscout/pull/6190) - Add EIP-1559 support to gas price oracle
 - [#7977](https://github.com/blockscout/blockscout/pull/7977) - GraphQL: extend schema with new field for existing objects
 - [#8158](https://github.com/blockscout/blockscout/pull/8158), [#8164](https://github.com/blockscout/blockscout/pull/8164) - Include unfetched balances in TokenBalanceOnDemand fetcher
-- [#8210](https://github.com/blockscout/blockscout/pull/8210) - Drop logs address_hash foreign key
+- [#8210](https://github.com/blockscout/blockscout/pull/8210) - Drop address foreign keys from logs, token transfers and transactions
 
 ### Fixes
 
diff --git a/apps/explorer/lib/explorer/chain/token_transfer.ex b/apps/explorer/lib/explorer/chain/token_transfer.ex
index d1abd9971e74..ff17c0f768cb 100644
--- a/apps/explorer/lib/explorer/chain/token_transfer.ex
+++ b/apps/explorer/lib/explorer/chain/token_transfer.ex
@@ -136,9 +136,6 @@ defmodule Explorer.Chain.TokenTransfer do
     struct
     |> cast(params, @required_attrs ++ @optional_attrs)
     |> validate_required(@required_attrs)
-    |> foreign_key_constraint(:from_address)
-    |> foreign_key_constraint(:to_address)
-    |> foreign_key_constraint(:token_contract_address)
     |> foreign_key_constraint(:transaction)
   end
 
diff --git a/apps/explorer/priv/repo/migrations/20230816061723_drop_token_transfers_and_transactions_address_foreign_key.exs b/apps/explorer/priv/repo/migrations/20230816061723_drop_token_transfers_and_transactions_address_foreign_key.exs
new file mode 100644
index 000000000000..1cfe0a5fb3d7
--- /dev/null
+++ b/apps/explorer/priv/repo/migrations/20230816061723_drop_token_transfers_and_transactions_address_foreign_key.exs
@@ -0,0 +1,13 @@
+# cspell:ignore fkey
+defmodule Explorer.Repo.Migrations.DropTokenTransfersAndTransactionsAddressForeignKey do
+  use Ecto.Migration
+
+  def change do
+    drop_if_exists(constraint(:token_transfers, :token_transfers_from_address_hash_fkey))
+    drop_if_exists(constraint(:token_transfers, :token_transfers_to_address_hash_fkey))
+    drop_if_exists(constraint(:token_transfers, :token_transfers_token_contract_address_hash_fkey))
+    drop_if_exists(constraint(:transactions, :transactions_created_contract_address_hash_fkey))
+    drop_if_exists(constraint(:transactions, :transactions_from_address_hash_fkey))
+    drop_if_exists(constraint(:transactions, :transactions_to_address_hash_fkey))
+  end
+end

From a8553eefe989fe2e6f91c2dc79f1b691ef4c5cea Mon Sep 17 00:00:00 2001
From: Qwerty5Uiop <alex000010@bk.ru>
Date: Thu, 17 Aug 2023 10:22:41 +0400
Subject: [PATCH 323/909] Drop foreign keys for token/coin balances, tokens,
 int transactions

---
 CHANGELOG.md                                       |  2 +-
 .../lib/explorer/chain/address/coin_balance.ex     |  1 -
 .../chain/address/current_token_balance.ex         |  1 -
 .../lib/explorer/chain/address/token_balance.ex    |  1 -
 .../lib/explorer/chain/internal_transaction.ex     |  6 ------
 apps/explorer/lib/explorer/chain/token.ex          |  1 -
 .../20230817061317_drop_address_foreign_keys.exs   | 14 ++++++++++++++
 7 files changed, 15 insertions(+), 11 deletions(-)
 create mode 100644 apps/explorer/priv/repo/migrations/20230817061317_drop_address_foreign_keys.exs

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 286dec346a89..076fb98717f5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,7 @@
 ### Features
 
 - [#8181](https://github.com/blockscout/blockscout/pull/8181) - Insert current token balances placeholders along with historical
+- [#8210](https://github.com/blockscout/blockscout/pull/8210) - Drop address foreign keys
 
 ### Fixes
 
@@ -30,7 +31,6 @@
 - [#6190](https://github.com/blockscout/blockscout/pull/6190) - Add EIP-1559 support to gas price oracle
 - [#7977](https://github.com/blockscout/blockscout/pull/7977) - GraphQL: extend schema with new field for existing objects
 - [#8158](https://github.com/blockscout/blockscout/pull/8158), [#8164](https://github.com/blockscout/blockscout/pull/8164) - Include unfetched balances in TokenBalanceOnDemand fetcher
-- [#8210](https://github.com/blockscout/blockscout/pull/8210) - Drop address foreign keys from logs, token transfers and transactions
 
 ### Fixes
 
diff --git a/apps/explorer/lib/explorer/chain/address/coin_balance.ex b/apps/explorer/lib/explorer/chain/address/coin_balance.ex
index bab4a62b6291..b2e5a46f263e 100644
--- a/apps/explorer/lib/explorer/chain/address/coin_balance.ex
+++ b/apps/explorer/lib/explorer/chain/address/coin_balance.ex
@@ -155,7 +155,6 @@ defmodule Explorer.Chain.Address.CoinBalance do
     balance
     |> cast(params, @allowed_fields)
     |> validate_required(@required_fields)
-    |> foreign_key_constraint(:address_hash)
     |> unique_constraint(:block_number, name: :address_coin_balances_address_hash_block_number_index)
   end
 end
diff --git a/apps/explorer/lib/explorer/chain/address/current_token_balance.ex b/apps/explorer/lib/explorer/chain/address/current_token_balance.ex
index 196f17cf3b04..88c4594a3a7b 100644
--- a/apps/explorer/lib/explorer/chain/address/current_token_balance.ex
+++ b/apps/explorer/lib/explorer/chain/address/current_token_balance.ex
@@ -74,7 +74,6 @@ defmodule Explorer.Chain.Address.CurrentTokenBalance do
     token_balance
     |> cast(attrs, @allowed_fields)
     |> validate_required(@required_fields)
-    |> foreign_key_constraint(:address_hash)
     |> foreign_key_constraint(:token_contract_address_hash)
   end
 
diff --git a/apps/explorer/lib/explorer/chain/address/token_balance.ex b/apps/explorer/lib/explorer/chain/address/token_balance.ex
index bdf7d42293b9..24b8dfb1c856 100644
--- a/apps/explorer/lib/explorer/chain/address/token_balance.ex
+++ b/apps/explorer/lib/explorer/chain/address/token_balance.ex
@@ -65,7 +65,6 @@ defmodule Explorer.Chain.Address.TokenBalance do
     token_balance
     |> cast(attrs, @allowed_fields)
     |> validate_required(@required_fields)
-    |> foreign_key_constraint(:address_hash)
     |> foreign_key_constraint(:token_contract_address_hash)
     |> unique_constraint(:block_number, name: :token_balances_address_hash_block_number_index)
   end
diff --git a/apps/explorer/lib/explorer/chain/internal_transaction.ex b/apps/explorer/lib/explorer/chain/internal_transaction.ex
index b91509a3dcf9..2d0c6ae2da02 100644
--- a/apps/explorer/lib/explorer/chain/internal_transaction.ex
+++ b/apps/explorer/lib/explorer/chain/internal_transaction.ex
@@ -444,8 +444,6 @@ defmodule Explorer.Chain.InternalTransaction do
     |> validate_call_error_or_result()
     |> check_constraint(:call_type, message: ~S|can't be blank when type is 'call'|, name: :call_has_call_type)
     |> check_constraint(:input, message: ~S|can't be blank when type is 'call'|, name: :call_has_call_type)
-    |> foreign_key_constraint(:from_address_hash)
-    |> foreign_key_constraint(:to_address_hash)
     |> foreign_key_constraint(:transaction_hash)
     |> unique_constraint(:index)
   end
@@ -460,8 +458,6 @@ defmodule Explorer.Chain.InternalTransaction do
     |> validate_required(@create_required_fields)
     |> validate_create_error_or_result()
     |> check_constraint(:init, message: ~S|can't be blank when type is 'create'|, name: :create_has_init)
-    |> foreign_key_constraint(:created_contract_address_hash)
-    |> foreign_key_constraint(:from_address_hash)
     |> foreign_key_constraint(:transaction_hash)
     |> unique_constraint(:index)
   end
@@ -474,8 +470,6 @@ defmodule Explorer.Chain.InternalTransaction do
     changeset
     |> cast(attrs, @selfdestruct_allowed_fields)
     |> validate_required(@selfdestruct_required_fields)
-    |> foreign_key_constraint(:from_address_hash)
-    |> foreign_key_constraint(:to_address_hash)
     |> unique_constraint(:index)
   end
 
diff --git a/apps/explorer/lib/explorer/chain/token.ex b/apps/explorer/lib/explorer/chain/token.ex
index 2bdc6c40d062..3b9eb2e95e18 100644
--- a/apps/explorer/lib/explorer/chain/token.ex
+++ b/apps/explorer/lib/explorer/chain/token.ex
@@ -113,7 +113,6 @@ defmodule Explorer.Chain.Token do
     token
     |> cast(params, @required_attrs ++ @optional_attrs)
     |> validate_required(@required_attrs)
-    |> foreign_key_constraint(:contract_address)
     |> trim_name()
     |> sanitize_token_input(:name)
     |> sanitize_token_input(:symbol)
diff --git a/apps/explorer/priv/repo/migrations/20230817061317_drop_address_foreign_keys.exs b/apps/explorer/priv/repo/migrations/20230817061317_drop_address_foreign_keys.exs
new file mode 100644
index 000000000000..f10c301b76e3
--- /dev/null
+++ b/apps/explorer/priv/repo/migrations/20230817061317_drop_address_foreign_keys.exs
@@ -0,0 +1,14 @@
+# cspell:ignore fkey
+defmodule Explorer.Repo.Migrations.DropAddressForeignKeys do
+  use Ecto.Migration
+
+  def change do
+    drop_if_exists(constraint(:address_coin_balances, :address_coin_balances_address_hash_fkey))
+    drop_if_exists(constraint(:address_token_balances, :address_token_balances_address_hash_fkey))
+    drop_if_exists(constraint(:address_current_token_balances, :address_current_token_balances_address_hash_fkey))
+    drop_if_exists(constraint(:tokens, :tokens_contract_address_hash_fkey))
+    drop_if_exists(constraint(:internal_transactions, :internal_transactions_created_contract_address_hash_fkey))
+    drop_if_exists(constraint(:internal_transactions, :internal_transactions_from_address_hash_fkey))
+    drop_if_exists(constraint(:internal_transactions, :internal_transactions_to_address_hash_fkey))
+  end
+end

From 270e4634f3072b18514fb7e14798dfba4b9b7ba1 Mon Sep 17 00:00:00 2001
From: Qwerty5Uiop <alex000010@bk.ru>
Date: Mon, 21 Aug 2023 15:50:31 +0300
Subject: [PATCH 324/909] Drop rest address foreign keys

---
 .../explorer/chain/address/coin_balance_daily.ex   |  1 -
 ...230821120625_drop_rest_address_foreign_keys.exs | 14 ++++++++++++++
 2 files changed, 14 insertions(+), 1 deletion(-)
 create mode 100644 apps/explorer/priv/repo/migrations/20230821120625_drop_rest_address_foreign_keys.exs

diff --git a/apps/explorer/lib/explorer/chain/address/coin_balance_daily.ex b/apps/explorer/lib/explorer/chain/address/coin_balance_daily.ex
index 0aab03e3619a..cc881d9c471d 100644
--- a/apps/explorer/lib/explorer/chain/address/coin_balance_daily.ex
+++ b/apps/explorer/lib/explorer/chain/address/coin_balance_daily.ex
@@ -69,7 +69,6 @@ defmodule Explorer.Chain.Address.CoinBalanceDaily do
     balance
     |> cast(params, @allowed_fields)
     |> validate_required(@required_fields)
-    |> foreign_key_constraint(:address_hash)
     |> unique_constraint(:day, name: :address_coin_balances_daily_address_hash_day_index)
   end
 end
diff --git a/apps/explorer/priv/repo/migrations/20230821120625_drop_rest_address_foreign_keys.exs b/apps/explorer/priv/repo/migrations/20230821120625_drop_rest_address_foreign_keys.exs
new file mode 100644
index 000000000000..36cdd2353fa5
--- /dev/null
+++ b/apps/explorer/priv/repo/migrations/20230821120625_drop_rest_address_foreign_keys.exs
@@ -0,0 +1,14 @@
+# cspell:ignore fkey
+defmodule Explorer.Repo.Migrations.DropRestAddressForeignKeys do
+  use Ecto.Migration
+
+  def change do
+    drop_if_exists(constraint(:address_coin_balances_daily, :address_coin_balances_daily_address_hash_fkey))
+    drop_if_exists(constraint(:address_to_tags, :address_to_tags_address_hash_fkey))
+    drop_if_exists(constraint(:block_rewards, :block_rewards_address_hash_fkey))
+    drop_if_exists(constraint(:decompiled_smart_contracts, :decompiled_smart_contracts_address_hash_fkey))
+    drop_if_exists(constraint(:smart_contracts, :smart_contracts_address_hash_fkey))
+    drop_if_exists(constraint(:withdrawals, :withdrawals_address_hash_fkey))
+    drop_if_exists(constraint(:blocks, :blocks_miner_hash_fkey))
+  end
+end

From b5b2906cf088f86464d1a8c55eb5cb981c729c7c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 21 Aug 2023 19:00:21 +0000
Subject: [PATCH 325/909] Bump sass from 1.66.0 to 1.66.1 in
 /apps/block_scout_web/assets

Bumps [sass](https://github.com/sass/dart-sass) from 1.66.0 to 1.66.1.
- [Release notes](https://github.com/sass/dart-sass/releases)
- [Changelog](https://github.com/sass/dart-sass/blob/main/CHANGELOG.md)
- [Commits](https://github.com/sass/dart-sass/compare/1.66.0...1.66.1)

---
updated-dependencies:
- dependency-name: sass
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 apps/block_scout_web/assets/package-lock.json | 14 +++++++-------
 apps/block_scout_web/assets/package.json      |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/apps/block_scout_web/assets/package-lock.json b/apps/block_scout_web/assets/package-lock.json
index 20f5fa377e45..1347f9d969f7 100644
--- a/apps/block_scout_web/assets/package-lock.json
+++ b/apps/block_scout_web/assets/package-lock.json
@@ -89,7 +89,7 @@
         "mini-css-extract-plugin": "^2.7.6",
         "postcss": "^8.4.28",
         "postcss-loader": "^7.3.3",
-        "sass": "^1.66.0",
+        "sass": "^1.66.1",
         "sass-loader": "^13.3.2",
         "style-loader": "^3.3.3",
         "webpack": "^5.88.2",
@@ -14951,9 +14951,9 @@
       "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
     },
     "node_modules/sass": {
-      "version": "1.66.0",
-      "resolved": "https://registry.npmjs.org/sass/-/sass-1.66.0.tgz",
-      "integrity": "sha512-C3U+RgpAAlTXULZkWwzfysgbbBBo8IZudNAOJAVBLslFbIaZv4MBPkTqhuvpK4lqgdoFiWhnOGMoV4L1FyOBag==",
+      "version": "1.66.1",
+      "resolved": "https://registry.npmjs.org/sass/-/sass-1.66.1.tgz",
+      "integrity": "sha512-50c+zTsZOJVgFfTgwwEzkjA3/QACgdNsKueWPyAR0mRINIvLAStVQBbPg14iuqEQ74NPDbXzJARJ/O4SI1zftA==",
       "dev": true,
       "dependencies": {
         "chokidar": ">=3.0.0 <4.0.0",
@@ -28787,9 +28787,9 @@
       "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
     },
     "sass": {
-      "version": "1.66.0",
-      "resolved": "https://registry.npmjs.org/sass/-/sass-1.66.0.tgz",
-      "integrity": "sha512-C3U+RgpAAlTXULZkWwzfysgbbBBo8IZudNAOJAVBLslFbIaZv4MBPkTqhuvpK4lqgdoFiWhnOGMoV4L1FyOBag==",
+      "version": "1.66.1",
+      "resolved": "https://registry.npmjs.org/sass/-/sass-1.66.1.tgz",
+      "integrity": "sha512-50c+zTsZOJVgFfTgwwEzkjA3/QACgdNsKueWPyAR0mRINIvLAStVQBbPg14iuqEQ74NPDbXzJARJ/O4SI1zftA==",
       "dev": true,
       "requires": {
         "chokidar": ">=3.0.0 <4.0.0",
diff --git a/apps/block_scout_web/assets/package.json b/apps/block_scout_web/assets/package.json
index a12fd25a671c..b06ab347b7a0 100644
--- a/apps/block_scout_web/assets/package.json
+++ b/apps/block_scout_web/assets/package.json
@@ -101,7 +101,7 @@
     "mini-css-extract-plugin": "^2.7.6",
     "postcss": "^8.4.28",
     "postcss-loader": "^7.3.3",
-    "sass": "^1.66.0",
+    "sass": "^1.66.1",
     "sass-loader": "^13.3.2",
     "style-loader": "^3.3.3",
     "webpack": "^5.88.2",

From 3dddb634340c4b7e66f680590e637db897f315e4 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 21 Aug 2023 19:00:40 +0000
Subject: [PATCH 326/909] Bump sweetalert2 from 11.7.23 to 11.7.27 in
 /apps/block_scout_web/assets

Bumps [sweetalert2](https://github.com/sweetalert2/sweetalert2) from 11.7.23 to 11.7.27.
- [Release notes](https://github.com/sweetalert2/sweetalert2/releases)
- [Changelog](https://github.com/sweetalert2/sweetalert2/blob/main/CHANGELOG.md)
- [Commits](https://github.com/sweetalert2/sweetalert2/compare/v11.7.23...v11.7.27)

---
updated-dependencies:
- dependency-name: sweetalert2
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 apps/block_scout_web/assets/package-lock.json | 14 +++++++-------
 apps/block_scout_web/assets/package.json      |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/apps/block_scout_web/assets/package-lock.json b/apps/block_scout_web/assets/package-lock.json
index 20f5fa377e45..68e441edd480 100644
--- a/apps/block_scout_web/assets/package-lock.json
+++ b/apps/block_scout_web/assets/package-lock.json
@@ -61,7 +61,7 @@
         "redux": "^4.2.1",
         "stream-browserify": "^3.0.0",
         "stream-http": "^3.1.1",
-        "sweetalert2": "^11.7.23",
+        "sweetalert2": "^11.7.27",
         "urijs": "^1.19.11",
         "url": "^0.11.1",
         "util": "^0.12.5",
@@ -15822,9 +15822,9 @@
       }
     },
     "node_modules/sweetalert2": {
-      "version": "11.7.23",
-      "resolved": "https://registry.npmjs.org/sweetalert2/-/sweetalert2-11.7.23.tgz",
-      "integrity": "sha512-zhc2Jc/coeUFPCM7LyVaUddbSz1Av9/EgQVXxZVPre8cwJrTZXCOEAboCT11StS3vaFTio74cumWustmNzDOEw==",
+      "version": "11.7.27",
+      "resolved": "https://registry.npmjs.org/sweetalert2/-/sweetalert2-11.7.27.tgz",
+      "integrity": "sha512-QbRXGQn1sb7HEhzA/K2xtWIwQHh/qkSbb1w6jYcTql2xy17876lTREEt1D4X6Q0x2wHtfUjKJ+Cb8IVkRoq7DQ==",
       "funding": {
         "type": "individual",
         "url": "https://github.com/sponsors/limonte"
@@ -29417,9 +29417,9 @@
       }
     },
     "sweetalert2": {
-      "version": "11.7.23",
-      "resolved": "https://registry.npmjs.org/sweetalert2/-/sweetalert2-11.7.23.tgz",
-      "integrity": "sha512-zhc2Jc/coeUFPCM7LyVaUddbSz1Av9/EgQVXxZVPre8cwJrTZXCOEAboCT11StS3vaFTio74cumWustmNzDOEw=="
+      "version": "11.7.27",
+      "resolved": "https://registry.npmjs.org/sweetalert2/-/sweetalert2-11.7.27.tgz",
+      "integrity": "sha512-QbRXGQn1sb7HEhzA/K2xtWIwQHh/qkSbb1w6jYcTql2xy17876lTREEt1D4X6Q0x2wHtfUjKJ+Cb8IVkRoq7DQ=="
     },
     "symbol-tree": {
       "version": "3.2.4",
diff --git a/apps/block_scout_web/assets/package.json b/apps/block_scout_web/assets/package.json
index a12fd25a671c..9c590991580f 100644
--- a/apps/block_scout_web/assets/package.json
+++ b/apps/block_scout_web/assets/package.json
@@ -73,7 +73,7 @@
     "redux": "^4.2.1",
     "stream-browserify": "^3.0.0",
     "stream-http": "^3.1.1",
-    "sweetalert2": "^11.7.23",
+    "sweetalert2": "^11.7.27",
     "urijs": "^1.19.11",
     "url": "^0.11.1",
     "util": "^0.12.5",

From c8843bfe0fdf17f45fbcd4670ebb4f101b235d47 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 21 Aug 2023 19:01:10 +0000
Subject: [PATCH 327/909] Bump jest from 29.6.2 to 29.6.3 in
 /apps/block_scout_web/assets

Bumps [jest](https://github.com/jestjs/jest/tree/HEAD/packages/jest) from 29.6.2 to 29.6.3.
- [Release notes](https://github.com/jestjs/jest/releases)
- [Changelog](https://github.com/jestjs/jest/blob/main/CHANGELOG.md)
- [Commits](https://github.com/jestjs/jest/commits/v29.6.3/packages/jest)

---
updated-dependencies:
- dependency-name: jest
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 apps/block_scout_web/assets/package-lock.json | 1357 +++++++++--------
 apps/block_scout_web/assets/package.json      |    2 +-
 2 files changed, 708 insertions(+), 651 deletions(-)

diff --git a/apps/block_scout_web/assets/package-lock.json b/apps/block_scout_web/assets/package-lock.json
index 20f5fa377e45..200c4695aa27 100644
--- a/apps/block_scout_web/assets/package-lock.json
+++ b/apps/block_scout_web/assets/package-lock.json
@@ -84,7 +84,7 @@
         "eslint-plugin-node": "^11.1.0",
         "eslint-plugin-promise": "^6.1.1",
         "file-loader": "^6.2.0",
-        "jest": "^29.6.2",
+        "jest": "^29.6.3",
         "jest-environment-jsdom": "^29.6.2",
         "mini-css-extract-plugin": "^2.7.6",
         "postcss": "^8.4.28",
@@ -2578,16 +2578,16 @@
       }
     },
     "node_modules/@jest/console": {
-      "version": "29.6.2",
-      "resolved": "https://registry.npmjs.org/@jest/console/-/console-29.6.2.tgz",
-      "integrity": "sha512-0N0yZof5hi44HAR2pPS+ikJ3nzKNoZdVu8FffRf3wy47I7Dm7etk/3KetMdRUqzVd16V4O2m2ISpNTbnIuqy1w==",
+      "version": "29.6.3",
+      "resolved": "https://registry.npmjs.org/@jest/console/-/console-29.6.3.tgz",
+      "integrity": "sha512-ukZbHAdDH4ktZIOKvWs1juAXhiVAdvCyM8zv4S/7Ii3vJSDvMW5k+wOVGMQmHLHUFw3Ko63ZQNy7NI6PSlsD5w==",
       "dev": true,
       "dependencies": {
-        "@jest/types": "^29.6.1",
+        "@jest/types": "^29.6.3",
         "@types/node": "*",
         "chalk": "^4.0.0",
-        "jest-message-util": "^29.6.2",
-        "jest-util": "^29.6.2",
+        "jest-message-util": "^29.6.3",
+        "jest-util": "^29.6.3",
         "slash": "^3.0.0"
       },
       "engines": {
@@ -2665,37 +2665,37 @@
       }
     },
     "node_modules/@jest/core": {
-      "version": "29.6.2",
-      "resolved": "https://registry.npmjs.org/@jest/core/-/core-29.6.2.tgz",
-      "integrity": "sha512-Oj+5B+sDMiMWLhPFF+4/DvHOf+U10rgvCLGPHP8Xlsy/7QxS51aU/eBngudHlJXnaWD5EohAgJ4js+T6pa+zOg==",
+      "version": "29.6.3",
+      "resolved": "https://registry.npmjs.org/@jest/core/-/core-29.6.3.tgz",
+      "integrity": "sha512-skV1XrfNxfagmjRUrk2FyN5/2YwIzdWVVBa/orUfbLvQUANXxERq2pTvY0I+FinWHjDKB2HRmpveUiph4X0TJw==",
       "dev": true,
       "dependencies": {
-        "@jest/console": "^29.6.2",
-        "@jest/reporters": "^29.6.2",
-        "@jest/test-result": "^29.6.2",
-        "@jest/transform": "^29.6.2",
-        "@jest/types": "^29.6.1",
+        "@jest/console": "^29.6.3",
+        "@jest/reporters": "^29.6.3",
+        "@jest/test-result": "^29.6.3",
+        "@jest/transform": "^29.6.3",
+        "@jest/types": "^29.6.3",
         "@types/node": "*",
         "ansi-escapes": "^4.2.1",
         "chalk": "^4.0.0",
         "ci-info": "^3.2.0",
         "exit": "^0.1.2",
         "graceful-fs": "^4.2.9",
-        "jest-changed-files": "^29.5.0",
-        "jest-config": "^29.6.2",
-        "jest-haste-map": "^29.6.2",
-        "jest-message-util": "^29.6.2",
-        "jest-regex-util": "^29.4.3",
-        "jest-resolve": "^29.6.2",
-        "jest-resolve-dependencies": "^29.6.2",
-        "jest-runner": "^29.6.2",
-        "jest-runtime": "^29.6.2",
-        "jest-snapshot": "^29.6.2",
-        "jest-util": "^29.6.2",
-        "jest-validate": "^29.6.2",
-        "jest-watcher": "^29.6.2",
+        "jest-changed-files": "^29.6.3",
+        "jest-config": "^29.6.3",
+        "jest-haste-map": "^29.6.3",
+        "jest-message-util": "^29.6.3",
+        "jest-regex-util": "^29.6.3",
+        "jest-resolve": "^29.6.3",
+        "jest-resolve-dependencies": "^29.6.3",
+        "jest-runner": "^29.6.3",
+        "jest-runtime": "^29.6.3",
+        "jest-snapshot": "^29.6.3",
+        "jest-util": "^29.6.3",
+        "jest-validate": "^29.6.3",
+        "jest-watcher": "^29.6.3",
         "micromatch": "^4.0.4",
-        "pretty-format": "^29.6.2",
+        "pretty-format": "^29.6.3",
         "slash": "^3.0.0",
         "strip-ansi": "^6.0.0"
       },
@@ -2782,88 +2782,88 @@
       }
     },
     "node_modules/@jest/environment": {
-      "version": "29.6.2",
-      "resolved": "https://registry.npmjs.org/@jest/environment/-/environment-29.6.2.tgz",
-      "integrity": "sha512-AEcW43C7huGd/vogTddNNTDRpO6vQ2zaQNrttvWV18ArBx9Z56h7BIsXkNFJVOO4/kblWEQz30ckw0+L3izc+Q==",
+      "version": "29.6.3",
+      "resolved": "https://registry.npmjs.org/@jest/environment/-/environment-29.6.3.tgz",
+      "integrity": "sha512-u/u3cCztYCfgBiGHsamqP5x+XvucftOGPbf5RJQxfpeC1y4AL8pCjKvPDA3oCmdhZYPgk5AE0VOD/flweR69WA==",
       "dev": true,
       "dependencies": {
-        "@jest/fake-timers": "^29.6.2",
-        "@jest/types": "^29.6.1",
+        "@jest/fake-timers": "^29.6.3",
+        "@jest/types": "^29.6.3",
         "@types/node": "*",
-        "jest-mock": "^29.6.2"
+        "jest-mock": "^29.6.3"
       },
       "engines": {
         "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
     "node_modules/@jest/expect": {
-      "version": "29.6.2",
-      "resolved": "https://registry.npmjs.org/@jest/expect/-/expect-29.6.2.tgz",
-      "integrity": "sha512-m6DrEJxVKjkELTVAztTLyS/7C92Y2b0VYqmDROYKLLALHn8T/04yPs70NADUYPrV3ruI+H3J0iUIuhkjp7vkfg==",
+      "version": "29.6.3",
+      "resolved": "https://registry.npmjs.org/@jest/expect/-/expect-29.6.3.tgz",
+      "integrity": "sha512-Ic08XbI2jlg6rECy+CGwk/8NDa6VE7UmIG6++9OTPAMnQmNGY28hu69Nf629CWv6T7YMODLbONxDFKdmQeI9FA==",
       "dev": true,
       "dependencies": {
-        "expect": "^29.6.2",
-        "jest-snapshot": "^29.6.2"
+        "expect": "^29.6.3",
+        "jest-snapshot": "^29.6.3"
       },
       "engines": {
         "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
     "node_modules/@jest/expect-utils": {
-      "version": "29.6.2",
-      "resolved": "https://registry.npmjs.org/@jest/expect-utils/-/expect-utils-29.6.2.tgz",
-      "integrity": "sha512-6zIhM8go3RV2IG4aIZaZbxwpOzz3ZiM23oxAlkquOIole+G6TrbeXnykxWYlqF7kz2HlBjdKtca20x9atkEQYg==",
+      "version": "29.6.3",
+      "resolved": "https://registry.npmjs.org/@jest/expect-utils/-/expect-utils-29.6.3.tgz",
+      "integrity": "sha512-nvOEW4YoqRKD9HBJ9OJ6przvIvP9qilp5nAn1462P5ZlL/MM9SgPEZFyjTGPfs7QkocdUsJa6KjHhyRn4ueItA==",
       "dev": true,
       "dependencies": {
-        "jest-get-type": "^29.4.3"
+        "jest-get-type": "^29.6.3"
       },
       "engines": {
         "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
     "node_modules/@jest/fake-timers": {
-      "version": "29.6.2",
-      "resolved": "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-29.6.2.tgz",
-      "integrity": "sha512-euZDmIlWjm1Z0lJ1D0f7a0/y5Kh/koLFMUBE5SUYWrmy8oNhJpbTBDAP6CxKnadcMLDoDf4waRYCe35cH6G6PA==",
+      "version": "29.6.3",
+      "resolved": "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-29.6.3.tgz",
+      "integrity": "sha512-pa1wmqvbj6eX0nMvOM2VDAWvJOI5A/Mk3l8O7n7EsAh71sMZblaKO9iT4GjIj0LwwK3CP/Jp1ypEV0x3m89RvA==",
       "dev": true,
       "dependencies": {
-        "@jest/types": "^29.6.1",
+        "@jest/types": "^29.6.3",
         "@sinonjs/fake-timers": "^10.0.2",
         "@types/node": "*",
-        "jest-message-util": "^29.6.2",
-        "jest-mock": "^29.6.2",
-        "jest-util": "^29.6.2"
+        "jest-message-util": "^29.6.3",
+        "jest-mock": "^29.6.3",
+        "jest-util": "^29.6.3"
       },
       "engines": {
         "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
     "node_modules/@jest/globals": {
-      "version": "29.6.2",
-      "resolved": "https://registry.npmjs.org/@jest/globals/-/globals-29.6.2.tgz",
-      "integrity": "sha512-cjuJmNDjs6aMijCmSa1g2TNG4Lby/AeU7/02VtpW+SLcZXzOLK2GpN2nLqcFjmhy3B3AoPeQVx7BnyOf681bAw==",
+      "version": "29.6.3",
+      "resolved": "https://registry.npmjs.org/@jest/globals/-/globals-29.6.3.tgz",
+      "integrity": "sha512-RB+uI+CZMHntzlnOPlll5x/jgRff3LEPl/td/jzMXiIgR0iIhKq9qm1HLU+EC52NuoVy/1swit/sDGjVn4bc6A==",
       "dev": true,
       "dependencies": {
-        "@jest/environment": "^29.6.2",
-        "@jest/expect": "^29.6.2",
-        "@jest/types": "^29.6.1",
-        "jest-mock": "^29.6.2"
+        "@jest/environment": "^29.6.3",
+        "@jest/expect": "^29.6.3",
+        "@jest/types": "^29.6.3",
+        "jest-mock": "^29.6.3"
       },
       "engines": {
         "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
     "node_modules/@jest/reporters": {
-      "version": "29.6.2",
-      "resolved": "https://registry.npmjs.org/@jest/reporters/-/reporters-29.6.2.tgz",
-      "integrity": "sha512-sWtijrvIav8LgfJZlrGCdN0nP2EWbakglJY49J1Y5QihcQLfy7ovyxxjJBRXMNltgt4uPtEcFmIMbVshEDfFWw==",
+      "version": "29.6.3",
+      "resolved": "https://registry.npmjs.org/@jest/reporters/-/reporters-29.6.3.tgz",
+      "integrity": "sha512-kGz59zMi0GkVjD2CJeYWG9k6cvj7eBqt9aDAqo2rcCLRTYlvQ62Gu/n+tOmJMBHGjzeijjuCENjzTyYBgrtLUw==",
       "dev": true,
       "dependencies": {
         "@bcoe/v8-coverage": "^0.2.3",
-        "@jest/console": "^29.6.2",
-        "@jest/test-result": "^29.6.2",
-        "@jest/transform": "^29.6.2",
-        "@jest/types": "^29.6.1",
+        "@jest/console": "^29.6.3",
+        "@jest/test-result": "^29.6.3",
+        "@jest/transform": "^29.6.3",
+        "@jest/types": "^29.6.3",
         "@jridgewell/trace-mapping": "^0.3.18",
         "@types/node": "*",
         "chalk": "^4.0.0",
@@ -2872,13 +2872,13 @@
         "glob": "^7.1.3",
         "graceful-fs": "^4.2.9",
         "istanbul-lib-coverage": "^3.0.0",
-        "istanbul-lib-instrument": "^5.1.0",
+        "istanbul-lib-instrument": "^6.0.0",
         "istanbul-lib-report": "^3.0.0",
         "istanbul-lib-source-maps": "^4.0.0",
         "istanbul-reports": "^3.1.3",
-        "jest-message-util": "^29.6.2",
-        "jest-util": "^29.6.2",
-        "jest-worker": "^29.6.2",
+        "jest-message-util": "^29.6.3",
+        "jest-util": "^29.6.3",
+        "jest-worker": "^29.6.3",
         "slash": "^3.0.0",
         "string-length": "^4.0.1",
         "strip-ansi": "^6.0.0",
@@ -2955,13 +2955,13 @@
       }
     },
     "node_modules/@jest/reporters/node_modules/jest-worker": {
-      "version": "29.6.2",
-      "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-29.6.2.tgz",
-      "integrity": "sha512-l3ccBOabTdkng8I/ORCkADz4eSMKejTYv1vB/Z83UiubqhC1oQ5Li6dWCyqOIvSifGjUBxuvxvlm6KGK2DtuAQ==",
+      "version": "29.6.3",
+      "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-29.6.3.tgz",
+      "integrity": "sha512-wacANXecZ/GbQakpf2CClrqrlwsYYDSXFd4fIGdL+dXpM2GWoJ+6bhQ7vR3TKi3+gkSfBkjy1/khH/WrYS4Q6g==",
       "dev": true,
       "dependencies": {
         "@types/node": "*",
-        "jest-util": "^29.6.2",
+        "jest-util": "^29.6.3",
         "merge-stream": "^2.0.0",
         "supports-color": "^8.0.0"
       },
@@ -2997,9 +2997,9 @@
       }
     },
     "node_modules/@jest/schemas": {
-      "version": "29.6.0",
-      "resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-29.6.0.tgz",
-      "integrity": "sha512-rxLjXyJBTL4LQeJW3aKo0M/+GkCOXsO+8i9Iu7eDb6KwtP65ayoDsitrdPBtujxQ88k4wI2FNYfa6TOGwSn6cQ==",
+      "version": "29.6.3",
+      "resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-29.6.3.tgz",
+      "integrity": "sha512-mo5j5X+jIZmJQveBKeS/clAueipV7KgiX1vMgCxam1RNYiqE1w62n0/tJJnHtjW8ZHcQco5gY85jA3mi0L+nSA==",
       "dev": true,
       "dependencies": {
         "@sinclair/typebox": "^0.27.8"
@@ -3009,9 +3009,9 @@
       }
     },
     "node_modules/@jest/source-map": {
-      "version": "29.6.0",
-      "resolved": "https://registry.npmjs.org/@jest/source-map/-/source-map-29.6.0.tgz",
-      "integrity": "sha512-oA+I2SHHQGxDCZpbrsCQSoMLb3Bz547JnM+jUr9qEbuw0vQlWZfpPS7CO9J7XiwKicEz9OFn/IYoLkkiUD7bzA==",
+      "version": "29.6.3",
+      "resolved": "https://registry.npmjs.org/@jest/source-map/-/source-map-29.6.3.tgz",
+      "integrity": "sha512-MHjT95QuipcPrpLM+8JMSzFx6eHp5Bm+4XeFDJlwsvVBjmKNiIAvasGK2fxz2WbGRlnvqehFbh07MMa7n3YJnw==",
       "dev": true,
       "dependencies": {
         "@jridgewell/trace-mapping": "^0.3.18",
@@ -3023,13 +3023,13 @@
       }
     },
     "node_modules/@jest/test-result": {
-      "version": "29.6.2",
-      "resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-29.6.2.tgz",
-      "integrity": "sha512-3VKFXzcV42EYhMCsJQURptSqnyjqCGbtLuX5Xxb6Pm6gUf1wIRIl+mandIRGJyWKgNKYF9cnstti6Ls5ekduqw==",
+      "version": "29.6.3",
+      "resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-29.6.3.tgz",
+      "integrity": "sha512-k7ZZaNvOSMBHPZYiy0kuiaFoyansR5QnTwDux1EjK3kD5iWpRVyJIJ0RAIV39SThafchuW59vra7F8mdy5Hfgw==",
       "dev": true,
       "dependencies": {
-        "@jest/console": "^29.6.2",
-        "@jest/types": "^29.6.1",
+        "@jest/console": "^29.6.3",
+        "@jest/types": "^29.6.3",
         "@types/istanbul-lib-coverage": "^2.0.0",
         "collect-v8-coverage": "^1.0.0"
       },
@@ -3038,14 +3038,14 @@
       }
     },
     "node_modules/@jest/test-sequencer": {
-      "version": "29.6.2",
-      "resolved": "https://registry.npmjs.org/@jest/test-sequencer/-/test-sequencer-29.6.2.tgz",
-      "integrity": "sha512-GVYi6PfPwVejO7slw6IDO0qKVum5jtrJ3KoLGbgBWyr2qr4GaxFV6su+ZAjdTX75Sr1DkMFRk09r2ZVa+wtCGw==",
+      "version": "29.6.3",
+      "resolved": "https://registry.npmjs.org/@jest/test-sequencer/-/test-sequencer-29.6.3.tgz",
+      "integrity": "sha512-/SmijaAU2TY9ComFGIYa6Z+fmKqQMnqs2Nmwb0P/Z/tROdZ7M0iruES1EaaU9PBf8o9uED5xzaJ3YPFEIcDgAg==",
       "dev": true,
       "dependencies": {
-        "@jest/test-result": "^29.6.2",
+        "@jest/test-result": "^29.6.3",
         "graceful-fs": "^4.2.9",
-        "jest-haste-map": "^29.6.2",
+        "jest-haste-map": "^29.6.3",
         "slash": "^3.0.0"
       },
       "engines": {
@@ -3053,22 +3053,22 @@
       }
     },
     "node_modules/@jest/transform": {
-      "version": "29.6.2",
-      "resolved": "https://registry.npmjs.org/@jest/transform/-/transform-29.6.2.tgz",
-      "integrity": "sha512-ZqCqEISr58Ce3U+buNFJYUktLJZOggfyvR+bZMaiV1e8B1SIvJbwZMrYz3gx/KAPn9EXmOmN+uB08yLCjWkQQg==",
+      "version": "29.6.3",
+      "resolved": "https://registry.npmjs.org/@jest/transform/-/transform-29.6.3.tgz",
+      "integrity": "sha512-dPIc3DsvMZ/S8ut4L2ViCj265mKO0owB0wfzBv2oGzL9pQ+iRvJewHqLBmsGb7XFb5UotWIEtvY5A/lnylaIoQ==",
       "dev": true,
       "dependencies": {
         "@babel/core": "^7.11.6",
-        "@jest/types": "^29.6.1",
+        "@jest/types": "^29.6.3",
         "@jridgewell/trace-mapping": "^0.3.18",
         "babel-plugin-istanbul": "^6.1.1",
         "chalk": "^4.0.0",
         "convert-source-map": "^2.0.0",
         "fast-json-stable-stringify": "^2.1.0",
         "graceful-fs": "^4.2.9",
-        "jest-haste-map": "^29.6.2",
-        "jest-regex-util": "^29.4.3",
-        "jest-util": "^29.6.2",
+        "jest-haste-map": "^29.6.3",
+        "jest-regex-util": "^29.6.3",
+        "jest-util": "^29.6.3",
         "micromatch": "^4.0.4",
         "pirates": "^4.0.4",
         "slash": "^3.0.0",
@@ -3155,12 +3155,12 @@
       }
     },
     "node_modules/@jest/types": {
-      "version": "29.6.1",
-      "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.1.tgz",
-      "integrity": "sha512-tPKQNMPuXgvdOn2/Lg9HNfUvjYVGolt04Hp03f5hAk878uwOLikN+JzeLY0HcVgKgFl9Hs3EIqpu3WX27XNhnw==",
+      "version": "29.6.3",
+      "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.3.tgz",
+      "integrity": "sha512-u3UPsIilWKOM3F9CXtrG8LEJmNxwoCQC/XVj4IKYXvvpx7QIi/Kg1LI5uDmDpKlac62NUtX7eLjRh+jVZcLOzw==",
       "dev": true,
       "dependencies": {
-        "@jest/schemas": "^29.6.0",
+        "@jest/schemas": "^29.6.3",
         "@types/istanbul-lib-coverage": "^2.0.0",
         "@types/istanbul-reports": "^3.0.0",
         "@types/node": "*",
@@ -4564,15 +4564,15 @@
       "integrity": "sha512-xh1Rl34h6Fi1DC2WWKfxUTVqRsNnr6LsKz2+hfwDxQJWmrx8+c7ylaqBMcHfl1U1r2dsifOvKX3LQuLNZ+XSvA=="
     },
     "node_modules/babel-jest": {
-      "version": "29.6.2",
-      "resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-29.6.2.tgz",
-      "integrity": "sha512-BYCzImLos6J3BH/+HvUCHG1dTf2MzmAB4jaVxHV+29RZLjR29XuYTmsf2sdDwkrb+FczkGo3kOhE7ga6sI0P4A==",
+      "version": "29.6.3",
+      "resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-29.6.3.tgz",
+      "integrity": "sha512-1Ne93zZZEy5XmTa4Q+W5+zxBrDpExX8E3iy+xJJ+24ewlfo/T3qHfQJCzi/MMVFmBQDNxtRR/Gfd2dwb/0yrQw==",
       "dev": true,
       "dependencies": {
-        "@jest/transform": "^29.6.2",
+        "@jest/transform": "^29.6.3",
         "@types/babel__core": "^7.1.14",
         "babel-plugin-istanbul": "^6.1.1",
-        "babel-preset-jest": "^29.5.0",
+        "babel-preset-jest": "^29.6.3",
         "chalk": "^4.0.0",
         "graceful-fs": "^4.2.9",
         "slash": "^3.0.0"
@@ -4687,10 +4687,26 @@
         "node": ">=8"
       }
     },
+    "node_modules/babel-plugin-istanbul/node_modules/istanbul-lib-instrument": {
+      "version": "5.2.1",
+      "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-5.2.1.tgz",
+      "integrity": "sha512-pzqtp31nLv/XFOzXGuvhCb8qhjmTVo5vjVk19XE4CRlSWz0KoeJ3bw9XsA7nOp9YBf4qHjwBxkDzKcME/J29Yg==",
+      "dev": true,
+      "dependencies": {
+        "@babel/core": "^7.12.3",
+        "@babel/parser": "^7.14.7",
+        "@istanbuljs/schema": "^0.1.2",
+        "istanbul-lib-coverage": "^3.2.0",
+        "semver": "^6.3.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/babel-plugin-jest-hoist": {
-      "version": "29.5.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-29.5.0.tgz",
-      "integrity": "sha512-zSuuuAlTMT4mzLj2nPnUm6fsE6270vdOfnpbJ+RmruU75UhLFvL0N2NgI7xpeS7NaB6hGqmd5pVpGTDYvi4Q3w==",
+      "version": "29.6.3",
+      "resolved": "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-29.6.3.tgz",
+      "integrity": "sha512-ESAc/RJvGTFEzRwOTT4+lNDk/GNHMkKbNzsvT0qKRfDyyYTskxB5rnU2njIDYVxXCBHHEI1c0YwHob3WaYujOg==",
       "dev": true,
       "dependencies": {
         "@babel/template": "^7.3.3",
@@ -4798,12 +4814,12 @@
       }
     },
     "node_modules/babel-preset-jest": {
-      "version": "29.5.0",
-      "resolved": "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-29.5.0.tgz",
-      "integrity": "sha512-JOMloxOqdiBSxMAzjRaH023/vvcaSaec49zvg+2LmNsktC7ei39LTJGw02J+9uUtTZUq6xbLyJ4dxe9sSmIuAg==",
+      "version": "29.6.3",
+      "resolved": "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-29.6.3.tgz",
+      "integrity": "sha512-0B3bhxR6snWXJZtR/RliHTDPRgn1sNHOR0yVtq/IiQFyuOVjFS+wuio/R4gSNkyYmKmJB4wGZv2NZanmKmTnNA==",
       "dev": true,
       "dependencies": {
-        "babel-plugin-jest-hoist": "^29.5.0",
+        "babel-plugin-jest-hoist": "^29.6.3",
         "babel-preset-current-node-syntax": "^1.0.0"
       },
       "engines": {
@@ -6427,9 +6443,9 @@
       }
     },
     "node_modules/dedent": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/dedent/-/dedent-1.3.0.tgz",
-      "integrity": "sha512-7glNLfvdsMzZm3FpRY1CHuI2lbYDR+71YmrhmTZjYFD5pfT0ACgnGRdrrC9Mk2uICnzkcdelCx5at787UDGOvg==",
+      "version": "1.5.1",
+      "resolved": "https://registry.npmjs.org/dedent/-/dedent-1.5.1.tgz",
+      "integrity": "sha512-+LxW+KLWxu3HW3M2w2ympwtqPrqYRzU8fqi6Fhd18fBALe15blJPI/I4+UHveMVG6lJqB4JNd4UG0S5cnVHwIg==",
       "dev": true,
       "peerDependencies": {
         "babel-plugin-macros": "^3.1.0"
@@ -6551,9 +6567,9 @@
       }
     },
     "node_modules/diff-sequences": {
-      "version": "29.4.3",
-      "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-29.4.3.tgz",
-      "integrity": "sha512-ofrBgwpPhCD85kMKtE9RYFFq6OC1A89oW2vvgWZNCwxrUpRUILopY7lsYyMDSjc8g6U6aiO0Qubg6r4Wgt5ZnA==",
+      "version": "29.6.3",
+      "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-29.6.3.tgz",
+      "integrity": "sha512-EjePK1srD3P08o2j4f0ExnylqRs5B9tJjcp9t1krH2qRi8CCdsYfwe9JgSLurFBWwq4uOlipzfk5fHNvwFKr8Q==",
       "dev": true,
       "engines": {
         "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
@@ -8311,17 +8327,16 @@
       }
     },
     "node_modules/expect": {
-      "version": "29.6.2",
-      "resolved": "https://registry.npmjs.org/expect/-/expect-29.6.2.tgz",
-      "integrity": "sha512-iAErsLxJ8C+S02QbLAwgSGSezLQK+XXRDt8IuFXFpwCNw2ECmzZSmjKcCaFVp5VRMk+WAvz6h6jokzEzBFZEuA==",
+      "version": "29.6.3",
+      "resolved": "https://registry.npmjs.org/expect/-/expect-29.6.3.tgz",
+      "integrity": "sha512-x1vY4LlEMWUYVZQrFi4ZANXFwqYbJ/JNQspLVvzhW2BNY28aNcXMQH6imBbt+RBf5sVRTodYHXtSP/TLEU0Dxw==",
       "dev": true,
       "dependencies": {
-        "@jest/expect-utils": "^29.6.2",
-        "@types/node": "*",
-        "jest-get-type": "^29.4.3",
-        "jest-matcher-utils": "^29.6.2",
-        "jest-message-util": "^29.6.2",
-        "jest-util": "^29.6.2"
+        "@jest/expect-utils": "^29.6.3",
+        "jest-get-type": "^29.6.3",
+        "jest-matcher-utils": "^29.6.3",
+        "jest-message-util": "^29.6.3",
+        "jest-util": "^29.6.3"
       },
       "engines": {
         "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
@@ -9933,19 +9948,34 @@
       }
     },
     "node_modules/istanbul-lib-instrument": {
-      "version": "5.2.1",
-      "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-5.2.1.tgz",
-      "integrity": "sha512-pzqtp31nLv/XFOzXGuvhCb8qhjmTVo5vjVk19XE4CRlSWz0KoeJ3bw9XsA7nOp9YBf4qHjwBxkDzKcME/J29Yg==",
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-6.0.0.tgz",
+      "integrity": "sha512-x58orMzEVfzPUKqlbLd1hXCnySCxKdDKa6Rjg97CwuLLRI4g3FHTdnExu1OqffVFay6zeMW+T6/DowFLndWnIw==",
       "dev": true,
       "dependencies": {
         "@babel/core": "^7.12.3",
         "@babel/parser": "^7.14.7",
         "@istanbuljs/schema": "^0.1.2",
         "istanbul-lib-coverage": "^3.2.0",
-        "semver": "^6.3.0"
+        "semver": "^7.5.4"
       },
       "engines": {
-        "node": ">=8"
+        "node": ">=10"
+      }
+    },
+    "node_modules/istanbul-lib-instrument/node_modules/semver": {
+      "version": "7.5.4",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz",
+      "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==",
+      "dev": true,
+      "dependencies": {
+        "lru-cache": "^6.0.0"
+      },
+      "bin": {
+        "semver": "bin/semver.js"
+      },
+      "engines": {
+        "node": ">=10"
       }
     },
     "node_modules/istanbul-lib-report": {
@@ -10011,15 +10041,15 @@
       }
     },
     "node_modules/jest": {
-      "version": "29.6.2",
-      "resolved": "https://registry.npmjs.org/jest/-/jest-29.6.2.tgz",
-      "integrity": "sha512-8eQg2mqFbaP7CwfsTpCxQ+sHzw1WuNWL5UUvjnWP4hx2riGz9fPSzYOaU5q8/GqWn1TfgZIVTqYJygbGbWAANg==",
+      "version": "29.6.3",
+      "resolved": "https://registry.npmjs.org/jest/-/jest-29.6.3.tgz",
+      "integrity": "sha512-alueLuoPCDNHFcFGmgETR4KpQ+0ff3qVaiJwxQM4B5sC0CvXcgg4PEi7xrDkxuItDmdz/FVc7SSit4KEu8GRvw==",
       "dev": true,
       "dependencies": {
-        "@jest/core": "^29.6.2",
-        "@jest/types": "^29.6.1",
+        "@jest/core": "^29.6.3",
+        "@jest/types": "^29.6.3",
         "import-local": "^3.0.2",
-        "jest-cli": "^29.6.2"
+        "jest-cli": "^29.6.3"
       },
       "bin": {
         "jest": "bin/jest.js"
@@ -10037,12 +10067,13 @@
       }
     },
     "node_modules/jest-changed-files": {
-      "version": "29.5.0",
-      "resolved": "https://registry.npmjs.org/jest-changed-files/-/jest-changed-files-29.5.0.tgz",
-      "integrity": "sha512-IFG34IUMUaNBIxjQXF/iu7g6EcdMrGRRxaUSw92I/2g2YC6vCdTltl4nHvt7Ci5nSJwXIkCu8Ka1DKF+X7Z1Ag==",
+      "version": "29.6.3",
+      "resolved": "https://registry.npmjs.org/jest-changed-files/-/jest-changed-files-29.6.3.tgz",
+      "integrity": "sha512-G5wDnElqLa4/c66ma5PG9eRjE342lIbF6SUnTJi26C3J28Fv2TVY2rOyKB9YGbSA5ogwevgmxc4j4aVjrEK6Yg==",
       "dev": true,
       "dependencies": {
         "execa": "^5.0.0",
+        "jest-util": "^29.6.3",
         "p-limit": "^3.1.0"
       },
       "engines": {
@@ -10050,28 +10081,28 @@
       }
     },
     "node_modules/jest-circus": {
-      "version": "29.6.2",
-      "resolved": "https://registry.npmjs.org/jest-circus/-/jest-circus-29.6.2.tgz",
-      "integrity": "sha512-G9mN+KOYIUe2sB9kpJkO9Bk18J4dTDArNFPwoZ7WKHKel55eKIS/u2bLthxgojwlf9NLCVQfgzM/WsOVvoC6Fw==",
+      "version": "29.6.3",
+      "resolved": "https://registry.npmjs.org/jest-circus/-/jest-circus-29.6.3.tgz",
+      "integrity": "sha512-p0R5YqZEMnOpHqHLWRSjm2z/0p6RNsrNE/GRRT3eli8QGOAozj6Ys/3Tv+Ej+IfltJoSPwcQ6/hOCRkNlxLLCw==",
       "dev": true,
       "dependencies": {
-        "@jest/environment": "^29.6.2",
-        "@jest/expect": "^29.6.2",
-        "@jest/test-result": "^29.6.2",
-        "@jest/types": "^29.6.1",
+        "@jest/environment": "^29.6.3",
+        "@jest/expect": "^29.6.3",
+        "@jest/test-result": "^29.6.3",
+        "@jest/types": "^29.6.3",
         "@types/node": "*",
         "chalk": "^4.0.0",
         "co": "^4.6.0",
         "dedent": "^1.0.0",
         "is-generator-fn": "^2.0.0",
-        "jest-each": "^29.6.2",
-        "jest-matcher-utils": "^29.6.2",
-        "jest-message-util": "^29.6.2",
-        "jest-runtime": "^29.6.2",
-        "jest-snapshot": "^29.6.2",
-        "jest-util": "^29.6.2",
+        "jest-each": "^29.6.3",
+        "jest-matcher-utils": "^29.6.3",
+        "jest-message-util": "^29.6.3",
+        "jest-runtime": "^29.6.3",
+        "jest-snapshot": "^29.6.3",
+        "jest-util": "^29.6.3",
         "p-limit": "^3.1.0",
-        "pretty-format": "^29.6.2",
+        "pretty-format": "^29.6.3",
         "pure-rand": "^6.0.0",
         "slash": "^3.0.0",
         "stack-utils": "^2.0.3"
@@ -10151,21 +10182,21 @@
       }
     },
     "node_modules/jest-cli": {
-      "version": "29.6.2",
-      "resolved": "https://registry.npmjs.org/jest-cli/-/jest-cli-29.6.2.tgz",
-      "integrity": "sha512-TT6O247v6dCEX2UGHGyflMpxhnrL0DNqP2fRTKYm3nJJpCTfXX3GCMQPGFjXDoj0i5/Blp3jriKXFgdfmbYB6Q==",
+      "version": "29.6.3",
+      "resolved": "https://registry.npmjs.org/jest-cli/-/jest-cli-29.6.3.tgz",
+      "integrity": "sha512-KuPdXUPXQIf0t6DvmG8MV4QyhcjR1a6ruKl3YL7aGn/AQ8JkROwFkWzEpDIpt11Qy188dHbRm8WjwMsV/4nmnQ==",
       "dev": true,
       "dependencies": {
-        "@jest/core": "^29.6.2",
-        "@jest/test-result": "^29.6.2",
-        "@jest/types": "^29.6.1",
+        "@jest/core": "^29.6.3",
+        "@jest/test-result": "^29.6.3",
+        "@jest/types": "^29.6.3",
         "chalk": "^4.0.0",
         "exit": "^0.1.2",
         "graceful-fs": "^4.2.9",
         "import-local": "^3.0.2",
-        "jest-config": "^29.6.2",
-        "jest-util": "^29.6.2",
-        "jest-validate": "^29.6.2",
+        "jest-config": "^29.6.3",
+        "jest-util": "^29.6.3",
+        "jest-validate": "^29.6.3",
         "prompts": "^2.0.1",
         "yargs": "^17.3.1"
       },
@@ -10255,31 +10286,31 @@
       }
     },
     "node_modules/jest-config": {
-      "version": "29.6.2",
-      "resolved": "https://registry.npmjs.org/jest-config/-/jest-config-29.6.2.tgz",
-      "integrity": "sha512-VxwFOC8gkiJbuodG9CPtMRjBUNZEHxwfQXmIudSTzFWxaci3Qub1ddTRbFNQlD/zUeaifLndh/eDccFX4wCMQw==",
+      "version": "29.6.3",
+      "resolved": "https://registry.npmjs.org/jest-config/-/jest-config-29.6.3.tgz",
+      "integrity": "sha512-nb9bOq2aEqogbyL4F9mLkAeQGAgNt7Uz6U59YtQDIxFPiL7Ejgq0YIrp78oyEHD6H4CIV/k7mFrK7eFDzUJ69w==",
       "dev": true,
       "dependencies": {
         "@babel/core": "^7.11.6",
-        "@jest/test-sequencer": "^29.6.2",
-        "@jest/types": "^29.6.1",
-        "babel-jest": "^29.6.2",
+        "@jest/test-sequencer": "^29.6.3",
+        "@jest/types": "^29.6.3",
+        "babel-jest": "^29.6.3",
         "chalk": "^4.0.0",
         "ci-info": "^3.2.0",
         "deepmerge": "^4.2.2",
         "glob": "^7.1.3",
         "graceful-fs": "^4.2.9",
-        "jest-circus": "^29.6.2",
-        "jest-environment-node": "^29.6.2",
-        "jest-get-type": "^29.4.3",
-        "jest-regex-util": "^29.4.3",
-        "jest-resolve": "^29.6.2",
-        "jest-runner": "^29.6.2",
-        "jest-util": "^29.6.2",
-        "jest-validate": "^29.6.2",
+        "jest-circus": "^29.6.3",
+        "jest-environment-node": "^29.6.3",
+        "jest-get-type": "^29.6.3",
+        "jest-regex-util": "^29.6.3",
+        "jest-resolve": "^29.6.3",
+        "jest-runner": "^29.6.3",
+        "jest-util": "^29.6.3",
+        "jest-validate": "^29.6.3",
         "micromatch": "^4.0.4",
         "parse-json": "^5.2.0",
-        "pretty-format": "^29.6.2",
+        "pretty-format": "^29.6.3",
         "slash": "^3.0.0",
         "strip-json-comments": "^3.1.1"
       },
@@ -10370,15 +10401,15 @@
       }
     },
     "node_modules/jest-diff": {
-      "version": "29.6.2",
-      "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-29.6.2.tgz",
-      "integrity": "sha512-t+ST7CB9GX5F2xKwhwCf0TAR17uNDiaPTZnVymP9lw0lssa9vG+AFyDZoeIHStU3WowFFwT+ky+er0WVl2yGhA==",
+      "version": "29.6.3",
+      "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-29.6.3.tgz",
+      "integrity": "sha512-3sw+AdWnwH9sSNohMRKA7JiYUJSRr/WS6+sEFfBuhxU5V5GlEVKfvUn8JuMHE0wqKowemR1C2aHy8VtXbaV8dQ==",
       "dev": true,
       "dependencies": {
         "chalk": "^4.0.0",
-        "diff-sequences": "^29.4.3",
-        "jest-get-type": "^29.4.3",
-        "pretty-format": "^29.6.2"
+        "diff-sequences": "^29.6.3",
+        "jest-get-type": "^29.6.3",
+        "pretty-format": "^29.6.3"
       },
       "engines": {
         "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
@@ -10455,9 +10486,9 @@
       }
     },
     "node_modules/jest-docblock": {
-      "version": "29.4.3",
-      "resolved": "https://registry.npmjs.org/jest-docblock/-/jest-docblock-29.4.3.tgz",
-      "integrity": "sha512-fzdTftThczeSD9nZ3fzA/4KkHtnmllawWrXO69vtI+L9WjEIuXWs4AmyME7lN5hU7dB0sHhuPfcKofRsUb/2Fg==",
+      "version": "29.6.3",
+      "resolved": "https://registry.npmjs.org/jest-docblock/-/jest-docblock-29.6.3.tgz",
+      "integrity": "sha512-2+H+GOTQBEm2+qFSQ7Ma+BvyV+waiIFxmZF5LdpBsAEjWX8QYjSCa4FrkIYtbfXUJJJnFCYrOtt6TZ+IAiTjBQ==",
       "dev": true,
       "dependencies": {
         "detect-newline": "^3.0.0"
@@ -10467,16 +10498,16 @@
       }
     },
     "node_modules/jest-each": {
-      "version": "29.6.2",
-      "resolved": "https://registry.npmjs.org/jest-each/-/jest-each-29.6.2.tgz",
-      "integrity": "sha512-MsrsqA0Ia99cIpABBc3izS1ZYoYfhIy0NNWqPSE0YXbQjwchyt6B1HD2khzyPe1WiJA7hbxXy77ZoUQxn8UlSw==",
+      "version": "29.6.3",
+      "resolved": "https://registry.npmjs.org/jest-each/-/jest-each-29.6.3.tgz",
+      "integrity": "sha512-KoXfJ42k8cqbkfshW7sSHcdfnv5agDdHCPA87ZBdmHP+zJstTJc0ttQaJ/x7zK6noAL76hOuTIJ6ZkQRS5dcyg==",
       "dev": true,
       "dependencies": {
-        "@jest/types": "^29.6.1",
+        "@jest/types": "^29.6.3",
         "chalk": "^4.0.0",
-        "jest-get-type": "^29.4.3",
-        "jest-util": "^29.6.2",
-        "pretty-format": "^29.6.2"
+        "jest-get-type": "^29.6.3",
+        "jest-util": "^29.6.3",
+        "pretty-format": "^29.6.3"
       },
       "engines": {
         "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
@@ -10580,46 +10611,46 @@
       }
     },
     "node_modules/jest-environment-node": {
-      "version": "29.6.2",
-      "resolved": "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-29.6.2.tgz",
-      "integrity": "sha512-YGdFeZ3T9a+/612c5mTQIllvWkddPbYcN2v95ZH24oWMbGA4GGS2XdIF92QMhUhvrjjuQWYgUGW2zawOyH63MQ==",
+      "version": "29.6.3",
+      "resolved": "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-29.6.3.tgz",
+      "integrity": "sha512-PKl7upfPJXMYbWpD+60o4HP86KvFO2c9dZ+Zr6wUzsG5xcPx/65o3ArNgHW5M0RFvLYdW4/aieR4JSooD0a2ew==",
       "dev": true,
       "dependencies": {
-        "@jest/environment": "^29.6.2",
-        "@jest/fake-timers": "^29.6.2",
-        "@jest/types": "^29.6.1",
+        "@jest/environment": "^29.6.3",
+        "@jest/fake-timers": "^29.6.3",
+        "@jest/types": "^29.6.3",
         "@types/node": "*",
-        "jest-mock": "^29.6.2",
-        "jest-util": "^29.6.2"
+        "jest-mock": "^29.6.3",
+        "jest-util": "^29.6.3"
       },
       "engines": {
         "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
     "node_modules/jest-get-type": {
-      "version": "29.4.3",
-      "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-29.4.3.tgz",
-      "integrity": "sha512-J5Xez4nRRMjk8emnTpWrlkyb9pfRQQanDrvWHhsR1+VUfbwxi30eVcZFlcdGInRibU4G5LwHXpI7IRHU0CY+gg==",
+      "version": "29.6.3",
+      "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-29.6.3.tgz",
+      "integrity": "sha512-zrteXnqYxfQh7l5FHyL38jL39di8H8rHoecLH3JNxH3BwOrBsNeabdap5e0I23lD4HHI8W5VFBZqG4Eaq5LNcw==",
       "dev": true,
       "engines": {
         "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
     "node_modules/jest-haste-map": {
-      "version": "29.6.2",
-      "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-29.6.2.tgz",
-      "integrity": "sha512-+51XleTDAAysvU8rT6AnS1ZJ+WHVNqhj1k6nTvN2PYP+HjU3kqlaKQ1Lnw3NYW3bm2r8vq82X0Z1nDDHZMzHVA==",
+      "version": "29.6.3",
+      "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-29.6.3.tgz",
+      "integrity": "sha512-GecR5YavfjkhOytEFHAeI6aWWG3f/cOKNB1YJvj/B76xAmeVjy4zJUYobGF030cRmKaO1FBw3V8CZZ6KVh9ZSw==",
       "dev": true,
       "dependencies": {
-        "@jest/types": "^29.6.1",
+        "@jest/types": "^29.6.3",
         "@types/graceful-fs": "^4.1.3",
         "@types/node": "*",
         "anymatch": "^3.0.3",
         "fb-watchman": "^2.0.0",
         "graceful-fs": "^4.2.9",
-        "jest-regex-util": "^29.4.3",
-        "jest-util": "^29.6.2",
-        "jest-worker": "^29.6.2",
+        "jest-regex-util": "^29.6.3",
+        "jest-util": "^29.6.3",
+        "jest-worker": "^29.6.3",
         "micromatch": "^4.0.4",
         "walker": "^1.0.8"
       },
@@ -10640,13 +10671,13 @@
       }
     },
     "node_modules/jest-haste-map/node_modules/jest-worker": {
-      "version": "29.6.2",
-      "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-29.6.2.tgz",
-      "integrity": "sha512-l3ccBOabTdkng8I/ORCkADz4eSMKejTYv1vB/Z83UiubqhC1oQ5Li6dWCyqOIvSifGjUBxuvxvlm6KGK2DtuAQ==",
+      "version": "29.6.3",
+      "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-29.6.3.tgz",
+      "integrity": "sha512-wacANXecZ/GbQakpf2CClrqrlwsYYDSXFd4fIGdL+dXpM2GWoJ+6bhQ7vR3TKi3+gkSfBkjy1/khH/WrYS4Q6g==",
       "dev": true,
       "dependencies": {
         "@types/node": "*",
-        "jest-util": "^29.6.2",
+        "jest-util": "^29.6.3",
         "merge-stream": "^2.0.0",
         "supports-color": "^8.0.0"
       },
@@ -10670,28 +10701,28 @@
       }
     },
     "node_modules/jest-leak-detector": {
-      "version": "29.6.2",
-      "resolved": "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-29.6.2.tgz",
-      "integrity": "sha512-aNqYhfp5uYEO3tdWMb2bfWv6f0b4I0LOxVRpnRLAeque2uqOVVMLh6khnTcE2qJ5wAKop0HcreM1btoysD6bPQ==",
+      "version": "29.6.3",
+      "resolved": "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-29.6.3.tgz",
+      "integrity": "sha512-0kfbESIHXYdhAdpLsW7xdwmYhLf1BRu4AA118/OxFm0Ho1b2RcTmO4oF6aAMaxpxdxnJ3zve2rgwzNBD4Zbm7Q==",
       "dev": true,
       "dependencies": {
-        "jest-get-type": "^29.4.3",
-        "pretty-format": "^29.6.2"
+        "jest-get-type": "^29.6.3",
+        "pretty-format": "^29.6.3"
       },
       "engines": {
         "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
     "node_modules/jest-matcher-utils": {
-      "version": "29.6.2",
-      "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-29.6.2.tgz",
-      "integrity": "sha512-4LiAk3hSSobtomeIAzFTe+N8kL6z0JtF3n6I4fg29iIW7tt99R7ZcIFW34QkX+DuVrf+CUe6wuVOpm7ZKFJzZQ==",
+      "version": "29.6.3",
+      "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-29.6.3.tgz",
+      "integrity": "sha512-6ZrMYINZdwduSt5Xu18/n49O1IgXdjsfG7NEZaQws9k69eTKWKcVbJBw/MZsjOZe2sSyJFmuzh8042XWwl54Zg==",
       "dev": true,
       "dependencies": {
         "chalk": "^4.0.0",
-        "jest-diff": "^29.6.2",
-        "jest-get-type": "^29.4.3",
-        "pretty-format": "^29.6.2"
+        "jest-diff": "^29.6.3",
+        "jest-get-type": "^29.6.3",
+        "pretty-format": "^29.6.3"
       },
       "engines": {
         "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
@@ -10768,18 +10799,18 @@
       }
     },
     "node_modules/jest-message-util": {
-      "version": "29.6.2",
-      "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-29.6.2.tgz",
-      "integrity": "sha512-vnIGYEjoPSuRqV8W9t+Wow95SDp6KPX2Uf7EoeG9G99J2OVh7OSwpS4B6J0NfpEIpfkBNHlBZpA2rblEuEFhZQ==",
+      "version": "29.6.3",
+      "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-29.6.3.tgz",
+      "integrity": "sha512-FtzaEEHzjDpQp51HX4UMkPZjy46ati4T5pEMyM6Ik48ztu4T9LQplZ6OsimHx7EuM9dfEh5HJa6D3trEftu3dA==",
       "dev": true,
       "dependencies": {
         "@babel/code-frame": "^7.12.13",
-        "@jest/types": "^29.6.1",
+        "@jest/types": "^29.6.3",
         "@types/stack-utils": "^2.0.0",
         "chalk": "^4.0.0",
         "graceful-fs": "^4.2.9",
         "micromatch": "^4.0.4",
-        "pretty-format": "^29.6.2",
+        "pretty-format": "^29.6.3",
         "slash": "^3.0.0",
         "stack-utils": "^2.0.3"
       },
@@ -10858,14 +10889,14 @@
       }
     },
     "node_modules/jest-mock": {
-      "version": "29.6.2",
-      "resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-29.6.2.tgz",
-      "integrity": "sha512-hoSv3lb3byzdKfwqCuT6uTscan471GUECqgNYykg6ob0yiAw3zYc7OrPnI9Qv8Wwoa4lC7AZ9hyS4AiIx5U2zg==",
+      "version": "29.6.3",
+      "resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-29.6.3.tgz",
+      "integrity": "sha512-Z7Gs/mOyTSR4yPsaZ72a/MtuK6RnC3JYqWONe48oLaoEcYwEDxqvbXz85G4SJrm2Z5Ar9zp6MiHF4AlFlRM4Pg==",
       "dev": true,
       "dependencies": {
-        "@jest/types": "^29.6.1",
+        "@jest/types": "^29.6.3",
         "@types/node": "*",
-        "jest-util": "^29.6.2"
+        "jest-util": "^29.6.3"
       },
       "engines": {
         "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
@@ -10889,26 +10920,26 @@
       }
     },
     "node_modules/jest-regex-util": {
-      "version": "29.4.3",
-      "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-29.4.3.tgz",
-      "integrity": "sha512-O4FglZaMmWXbGHSQInfXewIsd1LMn9p3ZXB/6r4FOkyhX2/iP/soMG98jGvk/A3HAN78+5VWcBGO0BJAPRh4kg==",
+      "version": "29.6.3",
+      "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-29.6.3.tgz",
+      "integrity": "sha512-KJJBsRCyyLNWCNBOvZyRDnAIfUiRJ8v+hOBQYGn8gDyF3UegwiP4gwRR3/SDa42g1YbVycTidUF3rKjyLFDWbg==",
       "dev": true,
       "engines": {
         "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
     "node_modules/jest-resolve": {
-      "version": "29.6.2",
-      "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-29.6.2.tgz",
-      "integrity": "sha512-G/iQUvZWI5e3SMFssc4ug4dH0aZiZpsDq9o1PtXTV1210Ztyb2+w+ZgQkB3iOiC5SmAEzJBOHWz6Hvrd+QnNPw==",
+      "version": "29.6.3",
+      "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-29.6.3.tgz",
+      "integrity": "sha512-WMXwxhvzDeA/J+9jz1i8ZKGmbw/n+s988EiUvRI4egM+eTn31Hb5v10Re3slG3/qxntkBt2/6GkQVDGu6Bwyhw==",
       "dev": true,
       "dependencies": {
         "chalk": "^4.0.0",
         "graceful-fs": "^4.2.9",
-        "jest-haste-map": "^29.6.2",
+        "jest-haste-map": "^29.6.3",
         "jest-pnp-resolver": "^1.2.2",
-        "jest-util": "^29.6.2",
-        "jest-validate": "^29.6.2",
+        "jest-util": "^29.6.3",
+        "jest-validate": "^29.6.3",
         "resolve": "^1.20.0",
         "resolve.exports": "^2.0.0",
         "slash": "^3.0.0"
@@ -10918,13 +10949,13 @@
       }
     },
     "node_modules/jest-resolve-dependencies": {
-      "version": "29.6.2",
-      "resolved": "https://registry.npmjs.org/jest-resolve-dependencies/-/jest-resolve-dependencies-29.6.2.tgz",
-      "integrity": "sha512-LGqjDWxg2fuQQm7ypDxduLu/m4+4Lb4gczc13v51VMZbVP5tSBILqVx8qfWcsdP8f0G7aIqByIALDB0R93yL+w==",
+      "version": "29.6.3",
+      "resolved": "https://registry.npmjs.org/jest-resolve-dependencies/-/jest-resolve-dependencies-29.6.3.tgz",
+      "integrity": "sha512-iah5nhSPTwtUV7yzpTc9xGg8gP3Ch2VNsuFMsKoCkNCrQSbFtx5KRPemmPJ32AUhTSDqJXB6djPN6zAaUGV53g==",
       "dev": true,
       "dependencies": {
-        "jest-regex-util": "^29.4.3",
-        "jest-snapshot": "^29.6.2"
+        "jest-regex-util": "^29.6.3",
+        "jest-snapshot": "^29.6.3"
       },
       "engines": {
         "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
@@ -11001,30 +11032,30 @@
       }
     },
     "node_modules/jest-runner": {
-      "version": "29.6.2",
-      "resolved": "https://registry.npmjs.org/jest-runner/-/jest-runner-29.6.2.tgz",
-      "integrity": "sha512-wXOT/a0EspYgfMiYHxwGLPCZfC0c38MivAlb2lMEAlwHINKemrttu1uSbcGbfDV31sFaPWnWJPmb2qXM8pqZ4w==",
+      "version": "29.6.3",
+      "resolved": "https://registry.npmjs.org/jest-runner/-/jest-runner-29.6.3.tgz",
+      "integrity": "sha512-E4zsMhQnjhirFPhDTJgoLMWUrVCDij/KGzWlbslDHGuO8Hl2pVUfOiygMzVZtZq+BzmlqwEr7LYmW+WFLlmX8w==",
       "dev": true,
       "dependencies": {
-        "@jest/console": "^29.6.2",
-        "@jest/environment": "^29.6.2",
-        "@jest/test-result": "^29.6.2",
-        "@jest/transform": "^29.6.2",
-        "@jest/types": "^29.6.1",
+        "@jest/console": "^29.6.3",
+        "@jest/environment": "^29.6.3",
+        "@jest/test-result": "^29.6.3",
+        "@jest/transform": "^29.6.3",
+        "@jest/types": "^29.6.3",
         "@types/node": "*",
         "chalk": "^4.0.0",
         "emittery": "^0.13.1",
         "graceful-fs": "^4.2.9",
-        "jest-docblock": "^29.4.3",
-        "jest-environment-node": "^29.6.2",
-        "jest-haste-map": "^29.6.2",
-        "jest-leak-detector": "^29.6.2",
-        "jest-message-util": "^29.6.2",
-        "jest-resolve": "^29.6.2",
-        "jest-runtime": "^29.6.2",
-        "jest-util": "^29.6.2",
-        "jest-watcher": "^29.6.2",
-        "jest-worker": "^29.6.2",
+        "jest-docblock": "^29.6.3",
+        "jest-environment-node": "^29.6.3",
+        "jest-haste-map": "^29.6.3",
+        "jest-leak-detector": "^29.6.3",
+        "jest-message-util": "^29.6.3",
+        "jest-resolve": "^29.6.3",
+        "jest-runtime": "^29.6.3",
+        "jest-util": "^29.6.3",
+        "jest-watcher": "^29.6.3",
+        "jest-worker": "^29.6.3",
         "p-limit": "^3.1.0",
         "source-map-support": "0.5.13"
       },
@@ -11091,13 +11122,13 @@
       }
     },
     "node_modules/jest-runner/node_modules/jest-worker": {
-      "version": "29.6.2",
-      "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-29.6.2.tgz",
-      "integrity": "sha512-l3ccBOabTdkng8I/ORCkADz4eSMKejTYv1vB/Z83UiubqhC1oQ5Li6dWCyqOIvSifGjUBxuvxvlm6KGK2DtuAQ==",
+      "version": "29.6.3",
+      "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-29.6.3.tgz",
+      "integrity": "sha512-wacANXecZ/GbQakpf2CClrqrlwsYYDSXFd4fIGdL+dXpM2GWoJ+6bhQ7vR3TKi3+gkSfBkjy1/khH/WrYS4Q6g==",
       "dev": true,
       "dependencies": {
         "@types/node": "*",
-        "jest-util": "^29.6.2",
+        "jest-util": "^29.6.3",
         "merge-stream": "^2.0.0",
         "supports-color": "^8.0.0"
       },
@@ -11143,31 +11174,31 @@
       }
     },
     "node_modules/jest-runtime": {
-      "version": "29.6.2",
-      "resolved": "https://registry.npmjs.org/jest-runtime/-/jest-runtime-29.6.2.tgz",
-      "integrity": "sha512-2X9dqK768KufGJyIeLmIzToDmsN0m7Iek8QNxRSI/2+iPFYHF0jTwlO3ftn7gdKd98G/VQw9XJCk77rbTGZnJg==",
-      "dev": true,
-      "dependencies": {
-        "@jest/environment": "^29.6.2",
-        "@jest/fake-timers": "^29.6.2",
-        "@jest/globals": "^29.6.2",
-        "@jest/source-map": "^29.6.0",
-        "@jest/test-result": "^29.6.2",
-        "@jest/transform": "^29.6.2",
-        "@jest/types": "^29.6.1",
+      "version": "29.6.3",
+      "resolved": "https://registry.npmjs.org/jest-runtime/-/jest-runtime-29.6.3.tgz",
+      "integrity": "sha512-VM0Z3a9xaqizGpEKwCOIhImkrINYzxgwk8oQAvrmAiXX8LNrJrRjyva30RkuRY0ETAotHLlUcd2moviCA1hgsQ==",
+      "dev": true,
+      "dependencies": {
+        "@jest/environment": "^29.6.3",
+        "@jest/fake-timers": "^29.6.3",
+        "@jest/globals": "^29.6.3",
+        "@jest/source-map": "^29.6.3",
+        "@jest/test-result": "^29.6.3",
+        "@jest/transform": "^29.6.3",
+        "@jest/types": "^29.6.3",
         "@types/node": "*",
         "chalk": "^4.0.0",
         "cjs-module-lexer": "^1.0.0",
         "collect-v8-coverage": "^1.0.0",
         "glob": "^7.1.3",
         "graceful-fs": "^4.2.9",
-        "jest-haste-map": "^29.6.2",
-        "jest-message-util": "^29.6.2",
-        "jest-mock": "^29.6.2",
-        "jest-regex-util": "^29.4.3",
-        "jest-resolve": "^29.6.2",
-        "jest-snapshot": "^29.6.2",
-        "jest-util": "^29.6.2",
+        "jest-haste-map": "^29.6.3",
+        "jest-message-util": "^29.6.3",
+        "jest-mock": "^29.6.3",
+        "jest-regex-util": "^29.6.3",
+        "jest-resolve": "^29.6.3",
+        "jest-snapshot": "^29.6.3",
+        "jest-util": "^29.6.3",
         "slash": "^3.0.0",
         "strip-bom": "^4.0.0"
       },
@@ -11246,9 +11277,9 @@
       }
     },
     "node_modules/jest-snapshot": {
-      "version": "29.6.2",
-      "resolved": "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-29.6.2.tgz",
-      "integrity": "sha512-1OdjqvqmRdGNvWXr/YZHuyhh5DeaLp1p/F8Tht/MrMw4Kr1Uu/j4lRG+iKl1DAqUJDWxtQBMk41Lnf/JETYBRA==",
+      "version": "29.6.3",
+      "resolved": "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-29.6.3.tgz",
+      "integrity": "sha512-66Iu7H1ojiveQMGFnKecHIZPPPBjZwfQEnF6wxqpxGf57sV3YSUtAb5/sTKM5TPa3OndyxZp1wxHFbmgVhc53w==",
       "dev": true,
       "dependencies": {
         "@babel/core": "^7.11.6",
@@ -11256,20 +11287,20 @@
         "@babel/plugin-syntax-jsx": "^7.7.2",
         "@babel/plugin-syntax-typescript": "^7.7.2",
         "@babel/types": "^7.3.3",
-        "@jest/expect-utils": "^29.6.2",
-        "@jest/transform": "^29.6.2",
-        "@jest/types": "^29.6.1",
+        "@jest/expect-utils": "^29.6.3",
+        "@jest/transform": "^29.6.3",
+        "@jest/types": "^29.6.3",
         "babel-preset-current-node-syntax": "^1.0.0",
         "chalk": "^4.0.0",
-        "expect": "^29.6.2",
+        "expect": "^29.6.3",
         "graceful-fs": "^4.2.9",
-        "jest-diff": "^29.6.2",
-        "jest-get-type": "^29.4.3",
-        "jest-matcher-utils": "^29.6.2",
-        "jest-message-util": "^29.6.2",
-        "jest-util": "^29.6.2",
+        "jest-diff": "^29.6.3",
+        "jest-get-type": "^29.6.3",
+        "jest-matcher-utils": "^29.6.3",
+        "jest-message-util": "^29.6.3",
+        "jest-util": "^29.6.3",
         "natural-compare": "^1.4.0",
-        "pretty-format": "^29.6.2",
+        "pretty-format": "^29.6.3",
         "semver": "^7.5.3"
       },
       "engines": {
@@ -11362,12 +11393,12 @@
       }
     },
     "node_modules/jest-util": {
-      "version": "29.6.2",
-      "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-29.6.2.tgz",
-      "integrity": "sha512-3eX1qb6L88lJNCFlEADKOkjpXJQyZRiavX1INZ4tRnrBVr2COd3RgcTLyUiEXMNBlDU/cgYq6taUS0fExrWW4w==",
+      "version": "29.6.3",
+      "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-29.6.3.tgz",
+      "integrity": "sha512-QUjna/xSy4B32fzcKTSz1w7YYzgiHrjjJjevdRf61HYk998R5vVMMNmrHESYZVDS5DSWs+1srPLPKxXPkeSDOA==",
       "dev": true,
       "dependencies": {
-        "@jest/types": "^29.6.1",
+        "@jest/types": "^29.6.3",
         "@types/node": "*",
         "chalk": "^4.0.0",
         "ci-info": "^3.2.0",
@@ -11449,17 +11480,17 @@
       }
     },
     "node_modules/jest-validate": {
-      "version": "29.6.2",
-      "resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-29.6.2.tgz",
-      "integrity": "sha512-vGz0yMN5fUFRRbpJDPwxMpgSXW1LDKROHfBopAvDcmD6s+B/s8WJrwi+4bfH4SdInBA5C3P3BI19dBtKzx1Arg==",
+      "version": "29.6.3",
+      "resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-29.6.3.tgz",
+      "integrity": "sha512-e7KWZcAIX+2W1o3cHfnqpGajdCs1jSM3DkXjGeLSNmCazv1EeI1ggTeK5wdZhF+7N+g44JI2Od3veojoaumlfg==",
       "dev": true,
       "dependencies": {
-        "@jest/types": "^29.6.1",
+        "@jest/types": "^29.6.3",
         "camelcase": "^6.2.0",
         "chalk": "^4.0.0",
-        "jest-get-type": "^29.4.3",
+        "jest-get-type": "^29.6.3",
         "leven": "^3.1.0",
-        "pretty-format": "^29.6.2"
+        "pretty-format": "^29.6.3"
       },
       "engines": {
         "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
@@ -11548,18 +11579,18 @@
       }
     },
     "node_modules/jest-watcher": {
-      "version": "29.6.2",
-      "resolved": "https://registry.npmjs.org/jest-watcher/-/jest-watcher-29.6.2.tgz",
-      "integrity": "sha512-GZitlqkMkhkefjfN/p3SJjrDaxPflqxEAv3/ik10OirZqJGYH5rPiIsgVcfof0Tdqg3shQGdEIxDBx+B4tuLzA==",
+      "version": "29.6.3",
+      "resolved": "https://registry.npmjs.org/jest-watcher/-/jest-watcher-29.6.3.tgz",
+      "integrity": "sha512-NgpFjZ2U2MKusjidbi4Oiu7tfs+nrgdIxIEVROvH1cFmOei9Uj25lwkMsakqLnH/s0nEcvxO1ck77FiRlcnpZg==",
       "dev": true,
       "dependencies": {
-        "@jest/test-result": "^29.6.2",
-        "@jest/types": "^29.6.1",
+        "@jest/test-result": "^29.6.3",
+        "@jest/types": "^29.6.3",
         "@types/node": "*",
         "ansi-escapes": "^4.2.1",
         "chalk": "^4.0.0",
         "emittery": "^0.13.1",
-        "jest-util": "^29.6.2",
+        "jest-util": "^29.6.3",
         "string-length": "^4.0.1"
       },
       "engines": {
@@ -14073,12 +14104,12 @@
       }
     },
     "node_modules/pretty-format": {
-      "version": "29.6.2",
-      "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-29.6.2.tgz",
-      "integrity": "sha512-1q0oC8eRveTg5nnBEWMXAU2qpv65Gnuf2eCQzSjxpWFkPaPARwqZZDGuNE0zPAZfTCHzIk3A8dIjwlQKKLphyg==",
+      "version": "29.6.3",
+      "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-29.6.3.tgz",
+      "integrity": "sha512-ZsBgjVhFAj5KeK+nHfF1305/By3lechHQSMWCTl8iHSbfOm2TN5nHEtFc/+W7fAyUeCs2n5iow72gld4gW0xDw==",
       "dev": true,
       "dependencies": {
-        "@jest/schemas": "^29.6.0",
+        "@jest/schemas": "^29.6.3",
         "ansi-styles": "^5.0.0",
         "react-is": "^18.0.0"
       },
@@ -19273,16 +19304,16 @@
       "dev": true
     },
     "@jest/console": {
-      "version": "29.6.2",
-      "resolved": "https://registry.npmjs.org/@jest/console/-/console-29.6.2.tgz",
-      "integrity": "sha512-0N0yZof5hi44HAR2pPS+ikJ3nzKNoZdVu8FffRf3wy47I7Dm7etk/3KetMdRUqzVd16V4O2m2ISpNTbnIuqy1w==",
+      "version": "29.6.3",
+      "resolved": "https://registry.npmjs.org/@jest/console/-/console-29.6.3.tgz",
+      "integrity": "sha512-ukZbHAdDH4ktZIOKvWs1juAXhiVAdvCyM8zv4S/7Ii3vJSDvMW5k+wOVGMQmHLHUFw3Ko63ZQNy7NI6PSlsD5w==",
       "dev": true,
       "requires": {
-        "@jest/types": "^29.6.1",
+        "@jest/types": "^29.6.3",
         "@types/node": "*",
         "chalk": "^4.0.0",
-        "jest-message-util": "^29.6.2",
-        "jest-util": "^29.6.2",
+        "jest-message-util": "^29.6.3",
+        "jest-util": "^29.6.3",
         "slash": "^3.0.0"
       },
       "dependencies": {
@@ -19338,37 +19369,37 @@
       }
     },
     "@jest/core": {
-      "version": "29.6.2",
-      "resolved": "https://registry.npmjs.org/@jest/core/-/core-29.6.2.tgz",
-      "integrity": "sha512-Oj+5B+sDMiMWLhPFF+4/DvHOf+U10rgvCLGPHP8Xlsy/7QxS51aU/eBngudHlJXnaWD5EohAgJ4js+T6pa+zOg==",
+      "version": "29.6.3",
+      "resolved": "https://registry.npmjs.org/@jest/core/-/core-29.6.3.tgz",
+      "integrity": "sha512-skV1XrfNxfagmjRUrk2FyN5/2YwIzdWVVBa/orUfbLvQUANXxERq2pTvY0I+FinWHjDKB2HRmpveUiph4X0TJw==",
       "dev": true,
       "requires": {
-        "@jest/console": "^29.6.2",
-        "@jest/reporters": "^29.6.2",
-        "@jest/test-result": "^29.6.2",
-        "@jest/transform": "^29.6.2",
-        "@jest/types": "^29.6.1",
+        "@jest/console": "^29.6.3",
+        "@jest/reporters": "^29.6.3",
+        "@jest/test-result": "^29.6.3",
+        "@jest/transform": "^29.6.3",
+        "@jest/types": "^29.6.3",
         "@types/node": "*",
         "ansi-escapes": "^4.2.1",
         "chalk": "^4.0.0",
         "ci-info": "^3.2.0",
         "exit": "^0.1.2",
         "graceful-fs": "^4.2.9",
-        "jest-changed-files": "^29.5.0",
-        "jest-config": "^29.6.2",
-        "jest-haste-map": "^29.6.2",
-        "jest-message-util": "^29.6.2",
-        "jest-regex-util": "^29.4.3",
-        "jest-resolve": "^29.6.2",
-        "jest-resolve-dependencies": "^29.6.2",
-        "jest-runner": "^29.6.2",
-        "jest-runtime": "^29.6.2",
-        "jest-snapshot": "^29.6.2",
-        "jest-util": "^29.6.2",
-        "jest-validate": "^29.6.2",
-        "jest-watcher": "^29.6.2",
+        "jest-changed-files": "^29.6.3",
+        "jest-config": "^29.6.3",
+        "jest-haste-map": "^29.6.3",
+        "jest-message-util": "^29.6.3",
+        "jest-regex-util": "^29.6.3",
+        "jest-resolve": "^29.6.3",
+        "jest-resolve-dependencies": "^29.6.3",
+        "jest-runner": "^29.6.3",
+        "jest-runtime": "^29.6.3",
+        "jest-snapshot": "^29.6.3",
+        "jest-util": "^29.6.3",
+        "jest-validate": "^29.6.3",
+        "jest-watcher": "^29.6.3",
         "micromatch": "^4.0.4",
-        "pretty-format": "^29.6.2",
+        "pretty-format": "^29.6.3",
         "slash": "^3.0.0",
         "strip-ansi": "^6.0.0"
       },
@@ -19425,73 +19456,73 @@
       }
     },
     "@jest/environment": {
-      "version": "29.6.2",
-      "resolved": "https://registry.npmjs.org/@jest/environment/-/environment-29.6.2.tgz",
-      "integrity": "sha512-AEcW43C7huGd/vogTddNNTDRpO6vQ2zaQNrttvWV18ArBx9Z56h7BIsXkNFJVOO4/kblWEQz30ckw0+L3izc+Q==",
+      "version": "29.6.3",
+      "resolved": "https://registry.npmjs.org/@jest/environment/-/environment-29.6.3.tgz",
+      "integrity": "sha512-u/u3cCztYCfgBiGHsamqP5x+XvucftOGPbf5RJQxfpeC1y4AL8pCjKvPDA3oCmdhZYPgk5AE0VOD/flweR69WA==",
       "dev": true,
       "requires": {
-        "@jest/fake-timers": "^29.6.2",
-        "@jest/types": "^29.6.1",
+        "@jest/fake-timers": "^29.6.3",
+        "@jest/types": "^29.6.3",
         "@types/node": "*",
-        "jest-mock": "^29.6.2"
+        "jest-mock": "^29.6.3"
       }
     },
     "@jest/expect": {
-      "version": "29.6.2",
-      "resolved": "https://registry.npmjs.org/@jest/expect/-/expect-29.6.2.tgz",
-      "integrity": "sha512-m6DrEJxVKjkELTVAztTLyS/7C92Y2b0VYqmDROYKLLALHn8T/04yPs70NADUYPrV3ruI+H3J0iUIuhkjp7vkfg==",
+      "version": "29.6.3",
+      "resolved": "https://registry.npmjs.org/@jest/expect/-/expect-29.6.3.tgz",
+      "integrity": "sha512-Ic08XbI2jlg6rECy+CGwk/8NDa6VE7UmIG6++9OTPAMnQmNGY28hu69Nf629CWv6T7YMODLbONxDFKdmQeI9FA==",
       "dev": true,
       "requires": {
-        "expect": "^29.6.2",
-        "jest-snapshot": "^29.6.2"
+        "expect": "^29.6.3",
+        "jest-snapshot": "^29.6.3"
       }
     },
     "@jest/expect-utils": {
-      "version": "29.6.2",
-      "resolved": "https://registry.npmjs.org/@jest/expect-utils/-/expect-utils-29.6.2.tgz",
-      "integrity": "sha512-6zIhM8go3RV2IG4aIZaZbxwpOzz3ZiM23oxAlkquOIole+G6TrbeXnykxWYlqF7kz2HlBjdKtca20x9atkEQYg==",
+      "version": "29.6.3",
+      "resolved": "https://registry.npmjs.org/@jest/expect-utils/-/expect-utils-29.6.3.tgz",
+      "integrity": "sha512-nvOEW4YoqRKD9HBJ9OJ6przvIvP9qilp5nAn1462P5ZlL/MM9SgPEZFyjTGPfs7QkocdUsJa6KjHhyRn4ueItA==",
       "dev": true,
       "requires": {
-        "jest-get-type": "^29.4.3"
+        "jest-get-type": "^29.6.3"
       }
     },
     "@jest/fake-timers": {
-      "version": "29.6.2",
-      "resolved": "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-29.6.2.tgz",
-      "integrity": "sha512-euZDmIlWjm1Z0lJ1D0f7a0/y5Kh/koLFMUBE5SUYWrmy8oNhJpbTBDAP6CxKnadcMLDoDf4waRYCe35cH6G6PA==",
+      "version": "29.6.3",
+      "resolved": "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-29.6.3.tgz",
+      "integrity": "sha512-pa1wmqvbj6eX0nMvOM2VDAWvJOI5A/Mk3l8O7n7EsAh71sMZblaKO9iT4GjIj0LwwK3CP/Jp1ypEV0x3m89RvA==",
       "dev": true,
       "requires": {
-        "@jest/types": "^29.6.1",
+        "@jest/types": "^29.6.3",
         "@sinonjs/fake-timers": "^10.0.2",
         "@types/node": "*",
-        "jest-message-util": "^29.6.2",
-        "jest-mock": "^29.6.2",
-        "jest-util": "^29.6.2"
+        "jest-message-util": "^29.6.3",
+        "jest-mock": "^29.6.3",
+        "jest-util": "^29.6.3"
       }
     },
     "@jest/globals": {
-      "version": "29.6.2",
-      "resolved": "https://registry.npmjs.org/@jest/globals/-/globals-29.6.2.tgz",
-      "integrity": "sha512-cjuJmNDjs6aMijCmSa1g2TNG4Lby/AeU7/02VtpW+SLcZXzOLK2GpN2nLqcFjmhy3B3AoPeQVx7BnyOf681bAw==",
+      "version": "29.6.3",
+      "resolved": "https://registry.npmjs.org/@jest/globals/-/globals-29.6.3.tgz",
+      "integrity": "sha512-RB+uI+CZMHntzlnOPlll5x/jgRff3LEPl/td/jzMXiIgR0iIhKq9qm1HLU+EC52NuoVy/1swit/sDGjVn4bc6A==",
       "dev": true,
       "requires": {
-        "@jest/environment": "^29.6.2",
-        "@jest/expect": "^29.6.2",
-        "@jest/types": "^29.6.1",
-        "jest-mock": "^29.6.2"
+        "@jest/environment": "^29.6.3",
+        "@jest/expect": "^29.6.3",
+        "@jest/types": "^29.6.3",
+        "jest-mock": "^29.6.3"
       }
     },
     "@jest/reporters": {
-      "version": "29.6.2",
-      "resolved": "https://registry.npmjs.org/@jest/reporters/-/reporters-29.6.2.tgz",
-      "integrity": "sha512-sWtijrvIav8LgfJZlrGCdN0nP2EWbakglJY49J1Y5QihcQLfy7ovyxxjJBRXMNltgt4uPtEcFmIMbVshEDfFWw==",
+      "version": "29.6.3",
+      "resolved": "https://registry.npmjs.org/@jest/reporters/-/reporters-29.6.3.tgz",
+      "integrity": "sha512-kGz59zMi0GkVjD2CJeYWG9k6cvj7eBqt9aDAqo2rcCLRTYlvQ62Gu/n+tOmJMBHGjzeijjuCENjzTyYBgrtLUw==",
       "dev": true,
       "requires": {
         "@bcoe/v8-coverage": "^0.2.3",
-        "@jest/console": "^29.6.2",
-        "@jest/test-result": "^29.6.2",
-        "@jest/transform": "^29.6.2",
-        "@jest/types": "^29.6.1",
+        "@jest/console": "^29.6.3",
+        "@jest/test-result": "^29.6.3",
+        "@jest/transform": "^29.6.3",
+        "@jest/types": "^29.6.3",
         "@jridgewell/trace-mapping": "^0.3.18",
         "@types/node": "*",
         "chalk": "^4.0.0",
@@ -19500,13 +19531,13 @@
         "glob": "^7.1.3",
         "graceful-fs": "^4.2.9",
         "istanbul-lib-coverage": "^3.0.0",
-        "istanbul-lib-instrument": "^5.1.0",
+        "istanbul-lib-instrument": "^6.0.0",
         "istanbul-lib-report": "^3.0.0",
         "istanbul-lib-source-maps": "^4.0.0",
         "istanbul-reports": "^3.1.3",
-        "jest-message-util": "^29.6.2",
-        "jest-util": "^29.6.2",
-        "jest-worker": "^29.6.2",
+        "jest-message-util": "^29.6.3",
+        "jest-util": "^29.6.3",
+        "jest-worker": "^29.6.3",
         "slash": "^3.0.0",
         "string-length": "^4.0.1",
         "strip-ansi": "^6.0.0",
@@ -19554,13 +19585,13 @@
           "dev": true
         },
         "jest-worker": {
-          "version": "29.6.2",
-          "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-29.6.2.tgz",
-          "integrity": "sha512-l3ccBOabTdkng8I/ORCkADz4eSMKejTYv1vB/Z83UiubqhC1oQ5Li6dWCyqOIvSifGjUBxuvxvlm6KGK2DtuAQ==",
+          "version": "29.6.3",
+          "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-29.6.3.tgz",
+          "integrity": "sha512-wacANXecZ/GbQakpf2CClrqrlwsYYDSXFd4fIGdL+dXpM2GWoJ+6bhQ7vR3TKi3+gkSfBkjy1/khH/WrYS4Q6g==",
           "dev": true,
           "requires": {
             "@types/node": "*",
-            "jest-util": "^29.6.2",
+            "jest-util": "^29.6.3",
             "merge-stream": "^2.0.0",
             "supports-color": "^8.0.0"
           },
@@ -19588,18 +19619,18 @@
       }
     },
     "@jest/schemas": {
-      "version": "29.6.0",
-      "resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-29.6.0.tgz",
-      "integrity": "sha512-rxLjXyJBTL4LQeJW3aKo0M/+GkCOXsO+8i9Iu7eDb6KwtP65ayoDsitrdPBtujxQ88k4wI2FNYfa6TOGwSn6cQ==",
+      "version": "29.6.3",
+      "resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-29.6.3.tgz",
+      "integrity": "sha512-mo5j5X+jIZmJQveBKeS/clAueipV7KgiX1vMgCxam1RNYiqE1w62n0/tJJnHtjW8ZHcQco5gY85jA3mi0L+nSA==",
       "dev": true,
       "requires": {
         "@sinclair/typebox": "^0.27.8"
       }
     },
     "@jest/source-map": {
-      "version": "29.6.0",
-      "resolved": "https://registry.npmjs.org/@jest/source-map/-/source-map-29.6.0.tgz",
-      "integrity": "sha512-oA+I2SHHQGxDCZpbrsCQSoMLb3Bz547JnM+jUr9qEbuw0vQlWZfpPS7CO9J7XiwKicEz9OFn/IYoLkkiUD7bzA==",
+      "version": "29.6.3",
+      "resolved": "https://registry.npmjs.org/@jest/source-map/-/source-map-29.6.3.tgz",
+      "integrity": "sha512-MHjT95QuipcPrpLM+8JMSzFx6eHp5Bm+4XeFDJlwsvVBjmKNiIAvasGK2fxz2WbGRlnvqehFbh07MMa7n3YJnw==",
       "dev": true,
       "requires": {
         "@jridgewell/trace-mapping": "^0.3.18",
@@ -19608,46 +19639,46 @@
       }
     },
     "@jest/test-result": {
-      "version": "29.6.2",
-      "resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-29.6.2.tgz",
-      "integrity": "sha512-3VKFXzcV42EYhMCsJQURptSqnyjqCGbtLuX5Xxb6Pm6gUf1wIRIl+mandIRGJyWKgNKYF9cnstti6Ls5ekduqw==",
+      "version": "29.6.3",
+      "resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-29.6.3.tgz",
+      "integrity": "sha512-k7ZZaNvOSMBHPZYiy0kuiaFoyansR5QnTwDux1EjK3kD5iWpRVyJIJ0RAIV39SThafchuW59vra7F8mdy5Hfgw==",
       "dev": true,
       "requires": {
-        "@jest/console": "^29.6.2",
-        "@jest/types": "^29.6.1",
+        "@jest/console": "^29.6.3",
+        "@jest/types": "^29.6.3",
         "@types/istanbul-lib-coverage": "^2.0.0",
         "collect-v8-coverage": "^1.0.0"
       }
     },
     "@jest/test-sequencer": {
-      "version": "29.6.2",
-      "resolved": "https://registry.npmjs.org/@jest/test-sequencer/-/test-sequencer-29.6.2.tgz",
-      "integrity": "sha512-GVYi6PfPwVejO7slw6IDO0qKVum5jtrJ3KoLGbgBWyr2qr4GaxFV6su+ZAjdTX75Sr1DkMFRk09r2ZVa+wtCGw==",
+      "version": "29.6.3",
+      "resolved": "https://registry.npmjs.org/@jest/test-sequencer/-/test-sequencer-29.6.3.tgz",
+      "integrity": "sha512-/SmijaAU2TY9ComFGIYa6Z+fmKqQMnqs2Nmwb0P/Z/tROdZ7M0iruES1EaaU9PBf8o9uED5xzaJ3YPFEIcDgAg==",
       "dev": true,
       "requires": {
-        "@jest/test-result": "^29.6.2",
+        "@jest/test-result": "^29.6.3",
         "graceful-fs": "^4.2.9",
-        "jest-haste-map": "^29.6.2",
+        "jest-haste-map": "^29.6.3",
         "slash": "^3.0.0"
       }
     },
     "@jest/transform": {
-      "version": "29.6.2",
-      "resolved": "https://registry.npmjs.org/@jest/transform/-/transform-29.6.2.tgz",
-      "integrity": "sha512-ZqCqEISr58Ce3U+buNFJYUktLJZOggfyvR+bZMaiV1e8B1SIvJbwZMrYz3gx/KAPn9EXmOmN+uB08yLCjWkQQg==",
+      "version": "29.6.3",
+      "resolved": "https://registry.npmjs.org/@jest/transform/-/transform-29.6.3.tgz",
+      "integrity": "sha512-dPIc3DsvMZ/S8ut4L2ViCj265mKO0owB0wfzBv2oGzL9pQ+iRvJewHqLBmsGb7XFb5UotWIEtvY5A/lnylaIoQ==",
       "dev": true,
       "requires": {
         "@babel/core": "^7.11.6",
-        "@jest/types": "^29.6.1",
+        "@jest/types": "^29.6.3",
         "@jridgewell/trace-mapping": "^0.3.18",
         "babel-plugin-istanbul": "^6.1.1",
         "chalk": "^4.0.0",
         "convert-source-map": "^2.0.0",
         "fast-json-stable-stringify": "^2.1.0",
         "graceful-fs": "^4.2.9",
-        "jest-haste-map": "^29.6.2",
-        "jest-regex-util": "^29.4.3",
-        "jest-util": "^29.6.2",
+        "jest-haste-map": "^29.6.3",
+        "jest-regex-util": "^29.6.3",
+        "jest-util": "^29.6.3",
         "micromatch": "^4.0.4",
         "pirates": "^4.0.4",
         "slash": "^3.0.0",
@@ -19712,12 +19743,12 @@
       }
     },
     "@jest/types": {
-      "version": "29.6.1",
-      "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.1.tgz",
-      "integrity": "sha512-tPKQNMPuXgvdOn2/Lg9HNfUvjYVGolt04Hp03f5hAk878uwOLikN+JzeLY0HcVgKgFl9Hs3EIqpu3WX27XNhnw==",
+      "version": "29.6.3",
+      "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.3.tgz",
+      "integrity": "sha512-u3UPsIilWKOM3F9CXtrG8LEJmNxwoCQC/XVj4IKYXvvpx7QIi/Kg1LI5uDmDpKlac62NUtX7eLjRh+jVZcLOzw==",
       "dev": true,
       "requires": {
-        "@jest/schemas": "^29.6.0",
+        "@jest/schemas": "^29.6.3",
         "@types/istanbul-lib-coverage": "^2.0.0",
         "@types/istanbul-reports": "^3.0.0",
         "@types/node": "*",
@@ -20895,15 +20926,15 @@
       "integrity": "sha512-xh1Rl34h6Fi1DC2WWKfxUTVqRsNnr6LsKz2+hfwDxQJWmrx8+c7ylaqBMcHfl1U1r2dsifOvKX3LQuLNZ+XSvA=="
     },
     "babel-jest": {
-      "version": "29.6.2",
-      "resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-29.6.2.tgz",
-      "integrity": "sha512-BYCzImLos6J3BH/+HvUCHG1dTf2MzmAB4jaVxHV+29RZLjR29XuYTmsf2sdDwkrb+FczkGo3kOhE7ga6sI0P4A==",
+      "version": "29.6.3",
+      "resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-29.6.3.tgz",
+      "integrity": "sha512-1Ne93zZZEy5XmTa4Q+W5+zxBrDpExX8E3iy+xJJ+24ewlfo/T3qHfQJCzi/MMVFmBQDNxtRR/Gfd2dwb/0yrQw==",
       "dev": true,
       "requires": {
-        "@jest/transform": "^29.6.2",
+        "@jest/transform": "^29.6.3",
         "@types/babel__core": "^7.1.14",
         "babel-plugin-istanbul": "^6.1.1",
-        "babel-preset-jest": "^29.5.0",
+        "babel-preset-jest": "^29.6.3",
         "chalk": "^4.0.0",
         "graceful-fs": "^4.2.9",
         "slash": "^3.0.0"
@@ -20981,12 +21012,27 @@
         "@istanbuljs/schema": "^0.1.2",
         "istanbul-lib-instrument": "^5.0.4",
         "test-exclude": "^6.0.0"
+      },
+      "dependencies": {
+        "istanbul-lib-instrument": {
+          "version": "5.2.1",
+          "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-5.2.1.tgz",
+          "integrity": "sha512-pzqtp31nLv/XFOzXGuvhCb8qhjmTVo5vjVk19XE4CRlSWz0KoeJ3bw9XsA7nOp9YBf4qHjwBxkDzKcME/J29Yg==",
+          "dev": true,
+          "requires": {
+            "@babel/core": "^7.12.3",
+            "@babel/parser": "^7.14.7",
+            "@istanbuljs/schema": "^0.1.2",
+            "istanbul-lib-coverage": "^3.2.0",
+            "semver": "^6.3.0"
+          }
+        }
       }
     },
     "babel-plugin-jest-hoist": {
-      "version": "29.5.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-29.5.0.tgz",
-      "integrity": "sha512-zSuuuAlTMT4mzLj2nPnUm6fsE6270vdOfnpbJ+RmruU75UhLFvL0N2NgI7xpeS7NaB6hGqmd5pVpGTDYvi4Q3w==",
+      "version": "29.6.3",
+      "resolved": "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-29.6.3.tgz",
+      "integrity": "sha512-ESAc/RJvGTFEzRwOTT4+lNDk/GNHMkKbNzsvT0qKRfDyyYTskxB5rnU2njIDYVxXCBHHEI1c0YwHob3WaYujOg==",
       "dev": true,
       "requires": {
         "@babel/template": "^7.3.3",
@@ -21075,12 +21121,12 @@
       }
     },
     "babel-preset-jest": {
-      "version": "29.5.0",
-      "resolved": "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-29.5.0.tgz",
-      "integrity": "sha512-JOMloxOqdiBSxMAzjRaH023/vvcaSaec49zvg+2LmNsktC7ei39LTJGw02J+9uUtTZUq6xbLyJ4dxe9sSmIuAg==",
+      "version": "29.6.3",
+      "resolved": "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-29.6.3.tgz",
+      "integrity": "sha512-0B3bhxR6snWXJZtR/RliHTDPRgn1sNHOR0yVtq/IiQFyuOVjFS+wuio/R4gSNkyYmKmJB4wGZv2NZanmKmTnNA==",
       "dev": true,
       "requires": {
-        "babel-plugin-jest-hoist": "^29.5.0",
+        "babel-plugin-jest-hoist": "^29.6.3",
         "babel-preset-current-node-syntax": "^1.0.0"
       }
     },
@@ -22291,9 +22337,9 @@
       }
     },
     "dedent": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/dedent/-/dedent-1.3.0.tgz",
-      "integrity": "sha512-7glNLfvdsMzZm3FpRY1CHuI2lbYDR+71YmrhmTZjYFD5pfT0ACgnGRdrrC9Mk2uICnzkcdelCx5at787UDGOvg==",
+      "version": "1.5.1",
+      "resolved": "https://registry.npmjs.org/dedent/-/dedent-1.5.1.tgz",
+      "integrity": "sha512-+LxW+KLWxu3HW3M2w2ympwtqPrqYRzU8fqi6Fhd18fBALe15blJPI/I4+UHveMVG6lJqB4JNd4UG0S5cnVHwIg==",
       "dev": true,
       "requires": {}
     },
@@ -22380,9 +22426,9 @@
       "dev": true
     },
     "diff-sequences": {
-      "version": "29.4.3",
-      "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-29.4.3.tgz",
-      "integrity": "sha512-ofrBgwpPhCD85kMKtE9RYFFq6OC1A89oW2vvgWZNCwxrUpRUILopY7lsYyMDSjc8g6U6aiO0Qubg6r4Wgt5ZnA==",
+      "version": "29.6.3",
+      "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-29.6.3.tgz",
+      "integrity": "sha512-EjePK1srD3P08o2j4f0ExnylqRs5B9tJjcp9t1krH2qRi8CCdsYfwe9JgSLurFBWwq4uOlipzfk5fHNvwFKr8Q==",
       "dev": true
     },
     "diffie-hellman": {
@@ -23817,17 +23863,16 @@
       "dev": true
     },
     "expect": {
-      "version": "29.6.2",
-      "resolved": "https://registry.npmjs.org/expect/-/expect-29.6.2.tgz",
-      "integrity": "sha512-iAErsLxJ8C+S02QbLAwgSGSezLQK+XXRDt8IuFXFpwCNw2ECmzZSmjKcCaFVp5VRMk+WAvz6h6jokzEzBFZEuA==",
+      "version": "29.6.3",
+      "resolved": "https://registry.npmjs.org/expect/-/expect-29.6.3.tgz",
+      "integrity": "sha512-x1vY4LlEMWUYVZQrFi4ZANXFwqYbJ/JNQspLVvzhW2BNY28aNcXMQH6imBbt+RBf5sVRTodYHXtSP/TLEU0Dxw==",
       "dev": true,
       "requires": {
-        "@jest/expect-utils": "^29.6.2",
-        "@types/node": "*",
-        "jest-get-type": "^29.4.3",
-        "jest-matcher-utils": "^29.6.2",
-        "jest-message-util": "^29.6.2",
-        "jest-util": "^29.6.2"
+        "@jest/expect-utils": "^29.6.3",
+        "jest-get-type": "^29.6.3",
+        "jest-matcher-utils": "^29.6.3",
+        "jest-message-util": "^29.6.3",
+        "jest-util": "^29.6.3"
       }
     },
     "express": {
@@ -25011,16 +25056,27 @@
       "dev": true
     },
     "istanbul-lib-instrument": {
-      "version": "5.2.1",
-      "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-5.2.1.tgz",
-      "integrity": "sha512-pzqtp31nLv/XFOzXGuvhCb8qhjmTVo5vjVk19XE4CRlSWz0KoeJ3bw9XsA7nOp9YBf4qHjwBxkDzKcME/J29Yg==",
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-6.0.0.tgz",
+      "integrity": "sha512-x58orMzEVfzPUKqlbLd1hXCnySCxKdDKa6Rjg97CwuLLRI4g3FHTdnExu1OqffVFay6zeMW+T6/DowFLndWnIw==",
       "dev": true,
       "requires": {
         "@babel/core": "^7.12.3",
         "@babel/parser": "^7.14.7",
         "@istanbuljs/schema": "^0.1.2",
         "istanbul-lib-coverage": "^3.2.0",
-        "semver": "^6.3.0"
+        "semver": "^7.5.4"
+      },
+      "dependencies": {
+        "semver": {
+          "version": "7.5.4",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz",
+          "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==",
+          "dev": true,
+          "requires": {
+            "lru-cache": "^6.0.0"
+          }
+        }
       }
     },
     "istanbul-lib-report": {
@@ -25073,50 +25129,51 @@
       }
     },
     "jest": {
-      "version": "29.6.2",
-      "resolved": "https://registry.npmjs.org/jest/-/jest-29.6.2.tgz",
-      "integrity": "sha512-8eQg2mqFbaP7CwfsTpCxQ+sHzw1WuNWL5UUvjnWP4hx2riGz9fPSzYOaU5q8/GqWn1TfgZIVTqYJygbGbWAANg==",
+      "version": "29.6.3",
+      "resolved": "https://registry.npmjs.org/jest/-/jest-29.6.3.tgz",
+      "integrity": "sha512-alueLuoPCDNHFcFGmgETR4KpQ+0ff3qVaiJwxQM4B5sC0CvXcgg4PEi7xrDkxuItDmdz/FVc7SSit4KEu8GRvw==",
       "dev": true,
       "requires": {
-        "@jest/core": "^29.6.2",
-        "@jest/types": "^29.6.1",
+        "@jest/core": "^29.6.3",
+        "@jest/types": "^29.6.3",
         "import-local": "^3.0.2",
-        "jest-cli": "^29.6.2"
+        "jest-cli": "^29.6.3"
       }
     },
     "jest-changed-files": {
-      "version": "29.5.0",
-      "resolved": "https://registry.npmjs.org/jest-changed-files/-/jest-changed-files-29.5.0.tgz",
-      "integrity": "sha512-IFG34IUMUaNBIxjQXF/iu7g6EcdMrGRRxaUSw92I/2g2YC6vCdTltl4nHvt7Ci5nSJwXIkCu8Ka1DKF+X7Z1Ag==",
+      "version": "29.6.3",
+      "resolved": "https://registry.npmjs.org/jest-changed-files/-/jest-changed-files-29.6.3.tgz",
+      "integrity": "sha512-G5wDnElqLa4/c66ma5PG9eRjE342lIbF6SUnTJi26C3J28Fv2TVY2rOyKB9YGbSA5ogwevgmxc4j4aVjrEK6Yg==",
       "dev": true,
       "requires": {
         "execa": "^5.0.0",
+        "jest-util": "^29.6.3",
         "p-limit": "^3.1.0"
       }
     },
     "jest-circus": {
-      "version": "29.6.2",
-      "resolved": "https://registry.npmjs.org/jest-circus/-/jest-circus-29.6.2.tgz",
-      "integrity": "sha512-G9mN+KOYIUe2sB9kpJkO9Bk18J4dTDArNFPwoZ7WKHKel55eKIS/u2bLthxgojwlf9NLCVQfgzM/WsOVvoC6Fw==",
+      "version": "29.6.3",
+      "resolved": "https://registry.npmjs.org/jest-circus/-/jest-circus-29.6.3.tgz",
+      "integrity": "sha512-p0R5YqZEMnOpHqHLWRSjm2z/0p6RNsrNE/GRRT3eli8QGOAozj6Ys/3Tv+Ej+IfltJoSPwcQ6/hOCRkNlxLLCw==",
       "dev": true,
       "requires": {
-        "@jest/environment": "^29.6.2",
-        "@jest/expect": "^29.6.2",
-        "@jest/test-result": "^29.6.2",
-        "@jest/types": "^29.6.1",
+        "@jest/environment": "^29.6.3",
+        "@jest/expect": "^29.6.3",
+        "@jest/test-result": "^29.6.3",
+        "@jest/types": "^29.6.3",
         "@types/node": "*",
         "chalk": "^4.0.0",
         "co": "^4.6.0",
         "dedent": "^1.0.0",
         "is-generator-fn": "^2.0.0",
-        "jest-each": "^29.6.2",
-        "jest-matcher-utils": "^29.6.2",
-        "jest-message-util": "^29.6.2",
-        "jest-runtime": "^29.6.2",
-        "jest-snapshot": "^29.6.2",
-        "jest-util": "^29.6.2",
+        "jest-each": "^29.6.3",
+        "jest-matcher-utils": "^29.6.3",
+        "jest-message-util": "^29.6.3",
+        "jest-runtime": "^29.6.3",
+        "jest-snapshot": "^29.6.3",
+        "jest-util": "^29.6.3",
         "p-limit": "^3.1.0",
-        "pretty-format": "^29.6.2",
+        "pretty-format": "^29.6.3",
         "pure-rand": "^6.0.0",
         "slash": "^3.0.0",
         "stack-utils": "^2.0.3"
@@ -25174,21 +25231,21 @@
       }
     },
     "jest-cli": {
-      "version": "29.6.2",
-      "resolved": "https://registry.npmjs.org/jest-cli/-/jest-cli-29.6.2.tgz",
-      "integrity": "sha512-TT6O247v6dCEX2UGHGyflMpxhnrL0DNqP2fRTKYm3nJJpCTfXX3GCMQPGFjXDoj0i5/Blp3jriKXFgdfmbYB6Q==",
+      "version": "29.6.3",
+      "resolved": "https://registry.npmjs.org/jest-cli/-/jest-cli-29.6.3.tgz",
+      "integrity": "sha512-KuPdXUPXQIf0t6DvmG8MV4QyhcjR1a6ruKl3YL7aGn/AQ8JkROwFkWzEpDIpt11Qy188dHbRm8WjwMsV/4nmnQ==",
       "dev": true,
       "requires": {
-        "@jest/core": "^29.6.2",
-        "@jest/test-result": "^29.6.2",
-        "@jest/types": "^29.6.1",
+        "@jest/core": "^29.6.3",
+        "@jest/test-result": "^29.6.3",
+        "@jest/types": "^29.6.3",
         "chalk": "^4.0.0",
         "exit": "^0.1.2",
         "graceful-fs": "^4.2.9",
         "import-local": "^3.0.2",
-        "jest-config": "^29.6.2",
-        "jest-util": "^29.6.2",
-        "jest-validate": "^29.6.2",
+        "jest-config": "^29.6.3",
+        "jest-util": "^29.6.3",
+        "jest-validate": "^29.6.3",
         "prompts": "^2.0.1",
         "yargs": "^17.3.1"
       },
@@ -25245,31 +25302,31 @@
       }
     },
     "jest-config": {
-      "version": "29.6.2",
-      "resolved": "https://registry.npmjs.org/jest-config/-/jest-config-29.6.2.tgz",
-      "integrity": "sha512-VxwFOC8gkiJbuodG9CPtMRjBUNZEHxwfQXmIudSTzFWxaci3Qub1ddTRbFNQlD/zUeaifLndh/eDccFX4wCMQw==",
+      "version": "29.6.3",
+      "resolved": "https://registry.npmjs.org/jest-config/-/jest-config-29.6.3.tgz",
+      "integrity": "sha512-nb9bOq2aEqogbyL4F9mLkAeQGAgNt7Uz6U59YtQDIxFPiL7Ejgq0YIrp78oyEHD6H4CIV/k7mFrK7eFDzUJ69w==",
       "dev": true,
       "requires": {
         "@babel/core": "^7.11.6",
-        "@jest/test-sequencer": "^29.6.2",
-        "@jest/types": "^29.6.1",
-        "babel-jest": "^29.6.2",
+        "@jest/test-sequencer": "^29.6.3",
+        "@jest/types": "^29.6.3",
+        "babel-jest": "^29.6.3",
         "chalk": "^4.0.0",
         "ci-info": "^3.2.0",
         "deepmerge": "^4.2.2",
         "glob": "^7.1.3",
         "graceful-fs": "^4.2.9",
-        "jest-circus": "^29.6.2",
-        "jest-environment-node": "^29.6.2",
-        "jest-get-type": "^29.4.3",
-        "jest-regex-util": "^29.4.3",
-        "jest-resolve": "^29.6.2",
-        "jest-runner": "^29.6.2",
-        "jest-util": "^29.6.2",
-        "jest-validate": "^29.6.2",
+        "jest-circus": "^29.6.3",
+        "jest-environment-node": "^29.6.3",
+        "jest-get-type": "^29.6.3",
+        "jest-regex-util": "^29.6.3",
+        "jest-resolve": "^29.6.3",
+        "jest-runner": "^29.6.3",
+        "jest-util": "^29.6.3",
+        "jest-validate": "^29.6.3",
         "micromatch": "^4.0.4",
         "parse-json": "^5.2.0",
-        "pretty-format": "^29.6.2",
+        "pretty-format": "^29.6.3",
         "slash": "^3.0.0",
         "strip-json-comments": "^3.1.1"
       },
@@ -25326,15 +25383,15 @@
       }
     },
     "jest-diff": {
-      "version": "29.6.2",
-      "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-29.6.2.tgz",
-      "integrity": "sha512-t+ST7CB9GX5F2xKwhwCf0TAR17uNDiaPTZnVymP9lw0lssa9vG+AFyDZoeIHStU3WowFFwT+ky+er0WVl2yGhA==",
+      "version": "29.6.3",
+      "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-29.6.3.tgz",
+      "integrity": "sha512-3sw+AdWnwH9sSNohMRKA7JiYUJSRr/WS6+sEFfBuhxU5V5GlEVKfvUn8JuMHE0wqKowemR1C2aHy8VtXbaV8dQ==",
       "dev": true,
       "requires": {
         "chalk": "^4.0.0",
-        "diff-sequences": "^29.4.3",
-        "jest-get-type": "^29.4.3",
-        "pretty-format": "^29.6.2"
+        "diff-sequences": "^29.6.3",
+        "jest-get-type": "^29.6.3",
+        "pretty-format": "^29.6.3"
       },
       "dependencies": {
         "ansi-styles": {
@@ -25389,25 +25446,25 @@
       }
     },
     "jest-docblock": {
-      "version": "29.4.3",
-      "resolved": "https://registry.npmjs.org/jest-docblock/-/jest-docblock-29.4.3.tgz",
-      "integrity": "sha512-fzdTftThczeSD9nZ3fzA/4KkHtnmllawWrXO69vtI+L9WjEIuXWs4AmyME7lN5hU7dB0sHhuPfcKofRsUb/2Fg==",
+      "version": "29.6.3",
+      "resolved": "https://registry.npmjs.org/jest-docblock/-/jest-docblock-29.6.3.tgz",
+      "integrity": "sha512-2+H+GOTQBEm2+qFSQ7Ma+BvyV+waiIFxmZF5LdpBsAEjWX8QYjSCa4FrkIYtbfXUJJJnFCYrOtt6TZ+IAiTjBQ==",
       "dev": true,
       "requires": {
         "detect-newline": "^3.0.0"
       }
     },
     "jest-each": {
-      "version": "29.6.2",
-      "resolved": "https://registry.npmjs.org/jest-each/-/jest-each-29.6.2.tgz",
-      "integrity": "sha512-MsrsqA0Ia99cIpABBc3izS1ZYoYfhIy0NNWqPSE0YXbQjwchyt6B1HD2khzyPe1WiJA7hbxXy77ZoUQxn8UlSw==",
+      "version": "29.6.3",
+      "resolved": "https://registry.npmjs.org/jest-each/-/jest-each-29.6.3.tgz",
+      "integrity": "sha512-KoXfJ42k8cqbkfshW7sSHcdfnv5agDdHCPA87ZBdmHP+zJstTJc0ttQaJ/x7zK6noAL76hOuTIJ6ZkQRS5dcyg==",
       "dev": true,
       "requires": {
-        "@jest/types": "^29.6.1",
+        "@jest/types": "^29.6.3",
         "chalk": "^4.0.0",
-        "jest-get-type": "^29.4.3",
-        "jest-util": "^29.6.2",
-        "pretty-format": "^29.6.2"
+        "jest-get-type": "^29.6.3",
+        "jest-util": "^29.6.3",
+        "pretty-format": "^29.6.3"
       },
       "dependencies": {
         "ansi-styles": {
@@ -25478,41 +25535,41 @@
       }
     },
     "jest-environment-node": {
-      "version": "29.6.2",
-      "resolved": "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-29.6.2.tgz",
-      "integrity": "sha512-YGdFeZ3T9a+/612c5mTQIllvWkddPbYcN2v95ZH24oWMbGA4GGS2XdIF92QMhUhvrjjuQWYgUGW2zawOyH63MQ==",
+      "version": "29.6.3",
+      "resolved": "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-29.6.3.tgz",
+      "integrity": "sha512-PKl7upfPJXMYbWpD+60o4HP86KvFO2c9dZ+Zr6wUzsG5xcPx/65o3ArNgHW5M0RFvLYdW4/aieR4JSooD0a2ew==",
       "dev": true,
       "requires": {
-        "@jest/environment": "^29.6.2",
-        "@jest/fake-timers": "^29.6.2",
-        "@jest/types": "^29.6.1",
+        "@jest/environment": "^29.6.3",
+        "@jest/fake-timers": "^29.6.3",
+        "@jest/types": "^29.6.3",
         "@types/node": "*",
-        "jest-mock": "^29.6.2",
-        "jest-util": "^29.6.2"
+        "jest-mock": "^29.6.3",
+        "jest-util": "^29.6.3"
       }
     },
     "jest-get-type": {
-      "version": "29.4.3",
-      "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-29.4.3.tgz",
-      "integrity": "sha512-J5Xez4nRRMjk8emnTpWrlkyb9pfRQQanDrvWHhsR1+VUfbwxi30eVcZFlcdGInRibU4G5LwHXpI7IRHU0CY+gg==",
+      "version": "29.6.3",
+      "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-29.6.3.tgz",
+      "integrity": "sha512-zrteXnqYxfQh7l5FHyL38jL39di8H8rHoecLH3JNxH3BwOrBsNeabdap5e0I23lD4HHI8W5VFBZqG4Eaq5LNcw==",
       "dev": true
     },
     "jest-haste-map": {
-      "version": "29.6.2",
-      "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-29.6.2.tgz",
-      "integrity": "sha512-+51XleTDAAysvU8rT6AnS1ZJ+WHVNqhj1k6nTvN2PYP+HjU3kqlaKQ1Lnw3NYW3bm2r8vq82X0Z1nDDHZMzHVA==",
+      "version": "29.6.3",
+      "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-29.6.3.tgz",
+      "integrity": "sha512-GecR5YavfjkhOytEFHAeI6aWWG3f/cOKNB1YJvj/B76xAmeVjy4zJUYobGF030cRmKaO1FBw3V8CZZ6KVh9ZSw==",
       "dev": true,
       "requires": {
-        "@jest/types": "^29.6.1",
+        "@jest/types": "^29.6.3",
         "@types/graceful-fs": "^4.1.3",
         "@types/node": "*",
         "anymatch": "^3.0.3",
         "fb-watchman": "^2.0.0",
         "fsevents": "^2.3.2",
         "graceful-fs": "^4.2.9",
-        "jest-regex-util": "^29.4.3",
-        "jest-util": "^29.6.2",
-        "jest-worker": "^29.6.2",
+        "jest-regex-util": "^29.6.3",
+        "jest-util": "^29.6.3",
+        "jest-worker": "^29.6.3",
         "micromatch": "^4.0.4",
         "walker": "^1.0.8"
       },
@@ -25524,13 +25581,13 @@
           "dev": true
         },
         "jest-worker": {
-          "version": "29.6.2",
-          "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-29.6.2.tgz",
-          "integrity": "sha512-l3ccBOabTdkng8I/ORCkADz4eSMKejTYv1vB/Z83UiubqhC1oQ5Li6dWCyqOIvSifGjUBxuvxvlm6KGK2DtuAQ==",
+          "version": "29.6.3",
+          "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-29.6.3.tgz",
+          "integrity": "sha512-wacANXecZ/GbQakpf2CClrqrlwsYYDSXFd4fIGdL+dXpM2GWoJ+6bhQ7vR3TKi3+gkSfBkjy1/khH/WrYS4Q6g==",
           "dev": true,
           "requires": {
             "@types/node": "*",
-            "jest-util": "^29.6.2",
+            "jest-util": "^29.6.3",
             "merge-stream": "^2.0.0",
             "supports-color": "^8.0.0"
           }
@@ -25547,25 +25604,25 @@
       }
     },
     "jest-leak-detector": {
-      "version": "29.6.2",
-      "resolved": "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-29.6.2.tgz",
-      "integrity": "sha512-aNqYhfp5uYEO3tdWMb2bfWv6f0b4I0LOxVRpnRLAeque2uqOVVMLh6khnTcE2qJ5wAKop0HcreM1btoysD6bPQ==",
+      "version": "29.6.3",
+      "resolved": "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-29.6.3.tgz",
+      "integrity": "sha512-0kfbESIHXYdhAdpLsW7xdwmYhLf1BRu4AA118/OxFm0Ho1b2RcTmO4oF6aAMaxpxdxnJ3zve2rgwzNBD4Zbm7Q==",
       "dev": true,
       "requires": {
-        "jest-get-type": "^29.4.3",
-        "pretty-format": "^29.6.2"
+        "jest-get-type": "^29.6.3",
+        "pretty-format": "^29.6.3"
       }
     },
     "jest-matcher-utils": {
-      "version": "29.6.2",
-      "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-29.6.2.tgz",
-      "integrity": "sha512-4LiAk3hSSobtomeIAzFTe+N8kL6z0JtF3n6I4fg29iIW7tt99R7ZcIFW34QkX+DuVrf+CUe6wuVOpm7ZKFJzZQ==",
+      "version": "29.6.3",
+      "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-29.6.3.tgz",
+      "integrity": "sha512-6ZrMYINZdwduSt5Xu18/n49O1IgXdjsfG7NEZaQws9k69eTKWKcVbJBw/MZsjOZe2sSyJFmuzh8042XWwl54Zg==",
       "dev": true,
       "requires": {
         "chalk": "^4.0.0",
-        "jest-diff": "^29.6.2",
-        "jest-get-type": "^29.4.3",
-        "pretty-format": "^29.6.2"
+        "jest-diff": "^29.6.3",
+        "jest-get-type": "^29.6.3",
+        "pretty-format": "^29.6.3"
       },
       "dependencies": {
         "ansi-styles": {
@@ -25620,18 +25677,18 @@
       }
     },
     "jest-message-util": {
-      "version": "29.6.2",
-      "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-29.6.2.tgz",
-      "integrity": "sha512-vnIGYEjoPSuRqV8W9t+Wow95SDp6KPX2Uf7EoeG9G99J2OVh7OSwpS4B6J0NfpEIpfkBNHlBZpA2rblEuEFhZQ==",
+      "version": "29.6.3",
+      "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-29.6.3.tgz",
+      "integrity": "sha512-FtzaEEHzjDpQp51HX4UMkPZjy46ati4T5pEMyM6Ik48ztu4T9LQplZ6OsimHx7EuM9dfEh5HJa6D3trEftu3dA==",
       "dev": true,
       "requires": {
         "@babel/code-frame": "^7.12.13",
-        "@jest/types": "^29.6.1",
+        "@jest/types": "^29.6.3",
         "@types/stack-utils": "^2.0.0",
         "chalk": "^4.0.0",
         "graceful-fs": "^4.2.9",
         "micromatch": "^4.0.4",
-        "pretty-format": "^29.6.2",
+        "pretty-format": "^29.6.3",
         "slash": "^3.0.0",
         "stack-utils": "^2.0.3"
       },
@@ -25688,14 +25745,14 @@
       }
     },
     "jest-mock": {
-      "version": "29.6.2",
-      "resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-29.6.2.tgz",
-      "integrity": "sha512-hoSv3lb3byzdKfwqCuT6uTscan471GUECqgNYykg6ob0yiAw3zYc7OrPnI9Qv8Wwoa4lC7AZ9hyS4AiIx5U2zg==",
+      "version": "29.6.3",
+      "resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-29.6.3.tgz",
+      "integrity": "sha512-Z7Gs/mOyTSR4yPsaZ72a/MtuK6RnC3JYqWONe48oLaoEcYwEDxqvbXz85G4SJrm2Z5Ar9zp6MiHF4AlFlRM4Pg==",
       "dev": true,
       "requires": {
-        "@jest/types": "^29.6.1",
+        "@jest/types": "^29.6.3",
         "@types/node": "*",
-        "jest-util": "^29.6.2"
+        "jest-util": "^29.6.3"
       }
     },
     "jest-pnp-resolver": {
@@ -25706,23 +25763,23 @@
       "requires": {}
     },
     "jest-regex-util": {
-      "version": "29.4.3",
-      "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-29.4.3.tgz",
-      "integrity": "sha512-O4FglZaMmWXbGHSQInfXewIsd1LMn9p3ZXB/6r4FOkyhX2/iP/soMG98jGvk/A3HAN78+5VWcBGO0BJAPRh4kg==",
+      "version": "29.6.3",
+      "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-29.6.3.tgz",
+      "integrity": "sha512-KJJBsRCyyLNWCNBOvZyRDnAIfUiRJ8v+hOBQYGn8gDyF3UegwiP4gwRR3/SDa42g1YbVycTidUF3rKjyLFDWbg==",
       "dev": true
     },
     "jest-resolve": {
-      "version": "29.6.2",
-      "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-29.6.2.tgz",
-      "integrity": "sha512-G/iQUvZWI5e3SMFssc4ug4dH0aZiZpsDq9o1PtXTV1210Ztyb2+w+ZgQkB3iOiC5SmAEzJBOHWz6Hvrd+QnNPw==",
+      "version": "29.6.3",
+      "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-29.6.3.tgz",
+      "integrity": "sha512-WMXwxhvzDeA/J+9jz1i8ZKGmbw/n+s988EiUvRI4egM+eTn31Hb5v10Re3slG3/qxntkBt2/6GkQVDGu6Bwyhw==",
       "dev": true,
       "requires": {
         "chalk": "^4.0.0",
         "graceful-fs": "^4.2.9",
-        "jest-haste-map": "^29.6.2",
+        "jest-haste-map": "^29.6.3",
         "jest-pnp-resolver": "^1.2.2",
-        "jest-util": "^29.6.2",
-        "jest-validate": "^29.6.2",
+        "jest-util": "^29.6.3",
+        "jest-validate": "^29.6.3",
         "resolve": "^1.20.0",
         "resolve.exports": "^2.0.0",
         "slash": "^3.0.0"
@@ -25780,40 +25837,40 @@
       }
     },
     "jest-resolve-dependencies": {
-      "version": "29.6.2",
-      "resolved": "https://registry.npmjs.org/jest-resolve-dependencies/-/jest-resolve-dependencies-29.6.2.tgz",
-      "integrity": "sha512-LGqjDWxg2fuQQm7ypDxduLu/m4+4Lb4gczc13v51VMZbVP5tSBILqVx8qfWcsdP8f0G7aIqByIALDB0R93yL+w==",
+      "version": "29.6.3",
+      "resolved": "https://registry.npmjs.org/jest-resolve-dependencies/-/jest-resolve-dependencies-29.6.3.tgz",
+      "integrity": "sha512-iah5nhSPTwtUV7yzpTc9xGg8gP3Ch2VNsuFMsKoCkNCrQSbFtx5KRPemmPJ32AUhTSDqJXB6djPN6zAaUGV53g==",
       "dev": true,
       "requires": {
-        "jest-regex-util": "^29.4.3",
-        "jest-snapshot": "^29.6.2"
+        "jest-regex-util": "^29.6.3",
+        "jest-snapshot": "^29.6.3"
       }
     },
     "jest-runner": {
-      "version": "29.6.2",
-      "resolved": "https://registry.npmjs.org/jest-runner/-/jest-runner-29.6.2.tgz",
-      "integrity": "sha512-wXOT/a0EspYgfMiYHxwGLPCZfC0c38MivAlb2lMEAlwHINKemrttu1uSbcGbfDV31sFaPWnWJPmb2qXM8pqZ4w==",
+      "version": "29.6.3",
+      "resolved": "https://registry.npmjs.org/jest-runner/-/jest-runner-29.6.3.tgz",
+      "integrity": "sha512-E4zsMhQnjhirFPhDTJgoLMWUrVCDij/KGzWlbslDHGuO8Hl2pVUfOiygMzVZtZq+BzmlqwEr7LYmW+WFLlmX8w==",
       "dev": true,
       "requires": {
-        "@jest/console": "^29.6.2",
-        "@jest/environment": "^29.6.2",
-        "@jest/test-result": "^29.6.2",
-        "@jest/transform": "^29.6.2",
-        "@jest/types": "^29.6.1",
+        "@jest/console": "^29.6.3",
+        "@jest/environment": "^29.6.3",
+        "@jest/test-result": "^29.6.3",
+        "@jest/transform": "^29.6.3",
+        "@jest/types": "^29.6.3",
         "@types/node": "*",
         "chalk": "^4.0.0",
         "emittery": "^0.13.1",
         "graceful-fs": "^4.2.9",
-        "jest-docblock": "^29.4.3",
-        "jest-environment-node": "^29.6.2",
-        "jest-haste-map": "^29.6.2",
-        "jest-leak-detector": "^29.6.2",
-        "jest-message-util": "^29.6.2",
-        "jest-resolve": "^29.6.2",
-        "jest-runtime": "^29.6.2",
-        "jest-util": "^29.6.2",
-        "jest-watcher": "^29.6.2",
-        "jest-worker": "^29.6.2",
+        "jest-docblock": "^29.6.3",
+        "jest-environment-node": "^29.6.3",
+        "jest-haste-map": "^29.6.3",
+        "jest-leak-detector": "^29.6.3",
+        "jest-message-util": "^29.6.3",
+        "jest-resolve": "^29.6.3",
+        "jest-runtime": "^29.6.3",
+        "jest-util": "^29.6.3",
+        "jest-watcher": "^29.6.3",
+        "jest-worker": "^29.6.3",
         "p-limit": "^3.1.0",
         "source-map-support": "0.5.13"
       },
@@ -25859,13 +25916,13 @@
           "dev": true
         },
         "jest-worker": {
-          "version": "29.6.2",
-          "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-29.6.2.tgz",
-          "integrity": "sha512-l3ccBOabTdkng8I/ORCkADz4eSMKejTYv1vB/Z83UiubqhC1oQ5Li6dWCyqOIvSifGjUBxuvxvlm6KGK2DtuAQ==",
+          "version": "29.6.3",
+          "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-29.6.3.tgz",
+          "integrity": "sha512-wacANXecZ/GbQakpf2CClrqrlwsYYDSXFd4fIGdL+dXpM2GWoJ+6bhQ7vR3TKi3+gkSfBkjy1/khH/WrYS4Q6g==",
           "dev": true,
           "requires": {
             "@types/node": "*",
-            "jest-util": "^29.6.2",
+            "jest-util": "^29.6.3",
             "merge-stream": "^2.0.0",
             "supports-color": "^8.0.0"
           },
@@ -25903,31 +25960,31 @@
       }
     },
     "jest-runtime": {
-      "version": "29.6.2",
-      "resolved": "https://registry.npmjs.org/jest-runtime/-/jest-runtime-29.6.2.tgz",
-      "integrity": "sha512-2X9dqK768KufGJyIeLmIzToDmsN0m7Iek8QNxRSI/2+iPFYHF0jTwlO3ftn7gdKd98G/VQw9XJCk77rbTGZnJg==",
-      "dev": true,
-      "requires": {
-        "@jest/environment": "^29.6.2",
-        "@jest/fake-timers": "^29.6.2",
-        "@jest/globals": "^29.6.2",
-        "@jest/source-map": "^29.6.0",
-        "@jest/test-result": "^29.6.2",
-        "@jest/transform": "^29.6.2",
-        "@jest/types": "^29.6.1",
+      "version": "29.6.3",
+      "resolved": "https://registry.npmjs.org/jest-runtime/-/jest-runtime-29.6.3.tgz",
+      "integrity": "sha512-VM0Z3a9xaqizGpEKwCOIhImkrINYzxgwk8oQAvrmAiXX8LNrJrRjyva30RkuRY0ETAotHLlUcd2moviCA1hgsQ==",
+      "dev": true,
+      "requires": {
+        "@jest/environment": "^29.6.3",
+        "@jest/fake-timers": "^29.6.3",
+        "@jest/globals": "^29.6.3",
+        "@jest/source-map": "^29.6.3",
+        "@jest/test-result": "^29.6.3",
+        "@jest/transform": "^29.6.3",
+        "@jest/types": "^29.6.3",
         "@types/node": "*",
         "chalk": "^4.0.0",
         "cjs-module-lexer": "^1.0.0",
         "collect-v8-coverage": "^1.0.0",
         "glob": "^7.1.3",
         "graceful-fs": "^4.2.9",
-        "jest-haste-map": "^29.6.2",
-        "jest-message-util": "^29.6.2",
-        "jest-mock": "^29.6.2",
-        "jest-regex-util": "^29.4.3",
-        "jest-resolve": "^29.6.2",
-        "jest-snapshot": "^29.6.2",
-        "jest-util": "^29.6.2",
+        "jest-haste-map": "^29.6.3",
+        "jest-message-util": "^29.6.3",
+        "jest-mock": "^29.6.3",
+        "jest-regex-util": "^29.6.3",
+        "jest-resolve": "^29.6.3",
+        "jest-snapshot": "^29.6.3",
+        "jest-util": "^29.6.3",
         "slash": "^3.0.0",
         "strip-bom": "^4.0.0"
       },
@@ -25984,9 +26041,9 @@
       }
     },
     "jest-snapshot": {
-      "version": "29.6.2",
-      "resolved": "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-29.6.2.tgz",
-      "integrity": "sha512-1OdjqvqmRdGNvWXr/YZHuyhh5DeaLp1p/F8Tht/MrMw4Kr1Uu/j4lRG+iKl1DAqUJDWxtQBMk41Lnf/JETYBRA==",
+      "version": "29.6.3",
+      "resolved": "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-29.6.3.tgz",
+      "integrity": "sha512-66Iu7H1ojiveQMGFnKecHIZPPPBjZwfQEnF6wxqpxGf57sV3YSUtAb5/sTKM5TPa3OndyxZp1wxHFbmgVhc53w==",
       "dev": true,
       "requires": {
         "@babel/core": "^7.11.6",
@@ -25994,20 +26051,20 @@
         "@babel/plugin-syntax-jsx": "^7.7.2",
         "@babel/plugin-syntax-typescript": "^7.7.2",
         "@babel/types": "^7.3.3",
-        "@jest/expect-utils": "^29.6.2",
-        "@jest/transform": "^29.6.2",
-        "@jest/types": "^29.6.1",
+        "@jest/expect-utils": "^29.6.3",
+        "@jest/transform": "^29.6.3",
+        "@jest/types": "^29.6.3",
         "babel-preset-current-node-syntax": "^1.0.0",
         "chalk": "^4.0.0",
-        "expect": "^29.6.2",
+        "expect": "^29.6.3",
         "graceful-fs": "^4.2.9",
-        "jest-diff": "^29.6.2",
-        "jest-get-type": "^29.4.3",
-        "jest-matcher-utils": "^29.6.2",
-        "jest-message-util": "^29.6.2",
-        "jest-util": "^29.6.2",
+        "jest-diff": "^29.6.3",
+        "jest-get-type": "^29.6.3",
+        "jest-matcher-utils": "^29.6.3",
+        "jest-message-util": "^29.6.3",
+        "jest-util": "^29.6.3",
         "natural-compare": "^1.4.0",
-        "pretty-format": "^29.6.2",
+        "pretty-format": "^29.6.3",
         "semver": "^7.5.3"
       },
       "dependencies": {
@@ -26072,12 +26129,12 @@
       }
     },
     "jest-util": {
-      "version": "29.6.2",
-      "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-29.6.2.tgz",
-      "integrity": "sha512-3eX1qb6L88lJNCFlEADKOkjpXJQyZRiavX1INZ4tRnrBVr2COd3RgcTLyUiEXMNBlDU/cgYq6taUS0fExrWW4w==",
+      "version": "29.6.3",
+      "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-29.6.3.tgz",
+      "integrity": "sha512-QUjna/xSy4B32fzcKTSz1w7YYzgiHrjjJjevdRf61HYk998R5vVMMNmrHESYZVDS5DSWs+1srPLPKxXPkeSDOA==",
       "dev": true,
       "requires": {
-        "@jest/types": "^29.6.1",
+        "@jest/types": "^29.6.3",
         "@types/node": "*",
         "chalk": "^4.0.0",
         "ci-info": "^3.2.0",
@@ -26137,17 +26194,17 @@
       }
     },
     "jest-validate": {
-      "version": "29.6.2",
-      "resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-29.6.2.tgz",
-      "integrity": "sha512-vGz0yMN5fUFRRbpJDPwxMpgSXW1LDKROHfBopAvDcmD6s+B/s8WJrwi+4bfH4SdInBA5C3P3BI19dBtKzx1Arg==",
+      "version": "29.6.3",
+      "resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-29.6.3.tgz",
+      "integrity": "sha512-e7KWZcAIX+2W1o3cHfnqpGajdCs1jSM3DkXjGeLSNmCazv1EeI1ggTeK5wdZhF+7N+g44JI2Od3veojoaumlfg==",
       "dev": true,
       "requires": {
-        "@jest/types": "^29.6.1",
+        "@jest/types": "^29.6.3",
         "camelcase": "^6.2.0",
         "chalk": "^4.0.0",
-        "jest-get-type": "^29.4.3",
+        "jest-get-type": "^29.6.3",
         "leven": "^3.1.0",
-        "pretty-format": "^29.6.2"
+        "pretty-format": "^29.6.3"
       },
       "dependencies": {
         "ansi-styles": {
@@ -26208,18 +26265,18 @@
       }
     },
     "jest-watcher": {
-      "version": "29.6.2",
-      "resolved": "https://registry.npmjs.org/jest-watcher/-/jest-watcher-29.6.2.tgz",
-      "integrity": "sha512-GZitlqkMkhkefjfN/p3SJjrDaxPflqxEAv3/ik10OirZqJGYH5rPiIsgVcfof0Tdqg3shQGdEIxDBx+B4tuLzA==",
+      "version": "29.6.3",
+      "resolved": "https://registry.npmjs.org/jest-watcher/-/jest-watcher-29.6.3.tgz",
+      "integrity": "sha512-NgpFjZ2U2MKusjidbi4Oiu7tfs+nrgdIxIEVROvH1cFmOei9Uj25lwkMsakqLnH/s0nEcvxO1ck77FiRlcnpZg==",
       "dev": true,
       "requires": {
-        "@jest/test-result": "^29.6.2",
-        "@jest/types": "^29.6.1",
+        "@jest/test-result": "^29.6.3",
+        "@jest/types": "^29.6.3",
         "@types/node": "*",
         "ansi-escapes": "^4.2.1",
         "chalk": "^4.0.0",
         "emittery": "^0.13.1",
-        "jest-util": "^29.6.2",
+        "jest-util": "^29.6.3",
         "string-length": "^4.0.1"
       },
       "dependencies": {
@@ -28108,12 +28165,12 @@
       "dev": true
     },
     "pretty-format": {
-      "version": "29.6.2",
-      "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-29.6.2.tgz",
-      "integrity": "sha512-1q0oC8eRveTg5nnBEWMXAU2qpv65Gnuf2eCQzSjxpWFkPaPARwqZZDGuNE0zPAZfTCHzIk3A8dIjwlQKKLphyg==",
+      "version": "29.6.3",
+      "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-29.6.3.tgz",
+      "integrity": "sha512-ZsBgjVhFAj5KeK+nHfF1305/By3lechHQSMWCTl8iHSbfOm2TN5nHEtFc/+W7fAyUeCs2n5iow72gld4gW0xDw==",
       "dev": true,
       "requires": {
-        "@jest/schemas": "^29.6.0",
+        "@jest/schemas": "^29.6.3",
         "ansi-styles": "^5.0.0",
         "react-is": "^18.0.0"
       },
diff --git a/apps/block_scout_web/assets/package.json b/apps/block_scout_web/assets/package.json
index a12fd25a671c..fe73d6f39e44 100644
--- a/apps/block_scout_web/assets/package.json
+++ b/apps/block_scout_web/assets/package.json
@@ -96,7 +96,7 @@
     "eslint-plugin-node": "^11.1.0",
     "eslint-plugin-promise": "^6.1.1",
     "file-loader": "^6.2.0",
-    "jest": "^29.6.2",
+    "jest": "^29.6.3",
     "jest-environment-jsdom": "^29.6.2",
     "mini-css-extract-plugin": "^2.7.6",
     "postcss": "^8.4.28",

From e719f3a99fa1c349254e4d67e9161feb77176b24 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 21 Aug 2023 19:01:24 +0000
Subject: [PATCH 328/909] Bump eslint-plugin-import in
 /apps/block_scout_web/assets

Bumps [eslint-plugin-import](https://github.com/import-js/eslint-plugin-import) from 2.28.0 to 2.28.1.
- [Release notes](https://github.com/import-js/eslint-plugin-import/releases)
- [Changelog](https://github.com/import-js/eslint-plugin-import/blob/main/CHANGELOG.md)
- [Commits](https://github.com/import-js/eslint-plugin-import/compare/v2.28.0...v2.28.1)

---
updated-dependencies:
- dependency-name: eslint-plugin-import
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 apps/block_scout_web/assets/package-lock.json | 32 +++++++++----------
 apps/block_scout_web/assets/package.json      |  2 +-
 2 files changed, 16 insertions(+), 18 deletions(-)

diff --git a/apps/block_scout_web/assets/package-lock.json b/apps/block_scout_web/assets/package-lock.json
index 20f5fa377e45..2a68017ab9e6 100644
--- a/apps/block_scout_web/assets/package-lock.json
+++ b/apps/block_scout_web/assets/package-lock.json
@@ -80,7 +80,7 @@
         "css-minimizer-webpack-plugin": "^5.0.1",
         "eslint": "^8.47.0",
         "eslint-config-standard": "^17.1.0",
-        "eslint-plugin-import": "^2.28.0",
+        "eslint-plugin-import": "^2.28.1",
         "eslint-plugin-node": "^11.1.0",
         "eslint-plugin-promise": "^6.1.1",
         "file-loader": "^6.2.0",
@@ -7236,9 +7236,9 @@
       }
     },
     "node_modules/eslint-plugin-import": {
-      "version": "2.28.0",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.28.0.tgz",
-      "integrity": "sha512-B8s/n+ZluN7sxj9eUf7/pRFERX0r5bnFA2dCaLHy2ZeaQEAz0k+ZZkFWRFHJAqxfxQDx6KLv9LeIki7cFdwW+Q==",
+      "version": "2.28.1",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.28.1.tgz",
+      "integrity": "sha512-9I9hFlITvOV55alzoKBI+K9q74kv0iKMeY6av5+umsNwayt59fz692daGyjR+oStBQgx6nwR9rXldDev3Clw+A==",
       "dev": true,
       "dependencies": {
         "array-includes": "^3.1.6",
@@ -7250,13 +7250,12 @@
         "eslint-import-resolver-node": "^0.3.7",
         "eslint-module-utils": "^2.8.0",
         "has": "^1.0.3",
-        "is-core-module": "^2.12.1",
+        "is-core-module": "^2.13.0",
         "is-glob": "^4.0.3",
         "minimatch": "^3.1.2",
         "object.fromentries": "^2.0.6",
         "object.groupby": "^1.0.0",
         "object.values": "^1.1.6",
-        "resolve": "^1.22.3",
         "semver": "^6.3.1",
         "tsconfig-paths": "^3.14.2"
       },
@@ -9615,9 +9614,9 @@
       }
     },
     "node_modules/is-core-module": {
-      "version": "2.12.1",
-      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.12.1.tgz",
-      "integrity": "sha512-Q4ZuBAe2FUsKtyQJoQHlvP8OvBERxO3jEmy1I7hcRXcJBGGHFh/aJBswbXuS9sgrDH2QUO8ilkwNPHvHMd8clg==",
+      "version": "2.13.0",
+      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.13.0.tgz",
+      "integrity": "sha512-Z7dk6Qo8pOCp3l4tsX2C5ZVas4V+UxwQodwZhLopL91TX8UyyHEXafPcyoeeWuLrwzHcr3igO78wNLwHJHsMCQ==",
       "dependencies": {
         "has": "^1.0.3"
       },
@@ -23054,9 +23053,9 @@
       }
     },
     "eslint-plugin-import": {
-      "version": "2.28.0",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.28.0.tgz",
-      "integrity": "sha512-B8s/n+ZluN7sxj9eUf7/pRFERX0r5bnFA2dCaLHy2ZeaQEAz0k+ZZkFWRFHJAqxfxQDx6KLv9LeIki7cFdwW+Q==",
+      "version": "2.28.1",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.28.1.tgz",
+      "integrity": "sha512-9I9hFlITvOV55alzoKBI+K9q74kv0iKMeY6av5+umsNwayt59fz692daGyjR+oStBQgx6nwR9rXldDev3Clw+A==",
       "dev": true,
       "requires": {
         "array-includes": "^3.1.6",
@@ -23068,13 +23067,12 @@
         "eslint-import-resolver-node": "^0.3.7",
         "eslint-module-utils": "^2.8.0",
         "has": "^1.0.3",
-        "is-core-module": "^2.12.1",
+        "is-core-module": "^2.13.0",
         "is-glob": "^4.0.3",
         "minimatch": "^3.1.2",
         "object.fromentries": "^2.0.6",
         "object.groupby": "^1.0.0",
         "object.values": "^1.1.6",
-        "resolve": "^1.22.3",
         "semver": "^6.3.1",
         "tsconfig-paths": "^3.14.2"
       },
@@ -24796,9 +24794,9 @@
       "integrity": "sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA=="
     },
     "is-core-module": {
-      "version": "2.12.1",
-      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.12.1.tgz",
-      "integrity": "sha512-Q4ZuBAe2FUsKtyQJoQHlvP8OvBERxO3jEmy1I7hcRXcJBGGHFh/aJBswbXuS9sgrDH2QUO8ilkwNPHvHMd8clg==",
+      "version": "2.13.0",
+      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.13.0.tgz",
+      "integrity": "sha512-Z7dk6Qo8pOCp3l4tsX2C5ZVas4V+UxwQodwZhLopL91TX8UyyHEXafPcyoeeWuLrwzHcr3igO78wNLwHJHsMCQ==",
       "requires": {
         "has": "^1.0.3"
       }
diff --git a/apps/block_scout_web/assets/package.json b/apps/block_scout_web/assets/package.json
index a12fd25a671c..2de6d0d81e57 100644
--- a/apps/block_scout_web/assets/package.json
+++ b/apps/block_scout_web/assets/package.json
@@ -92,7 +92,7 @@
     "css-minimizer-webpack-plugin": "^5.0.1",
     "eslint": "^8.47.0",
     "eslint-config-standard": "^17.1.0",
-    "eslint-plugin-import": "^2.28.0",
+    "eslint-plugin-import": "^2.28.1",
     "eslint-plugin-node": "^11.1.0",
     "eslint-plugin-promise": "^6.1.1",
     "file-loader": "^6.2.0",

From 5d842c6e984cd372f0e8b1535ec05608c61b86a3 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 21 Aug 2023 19:14:03 +0000
Subject: [PATCH 329/909] Bump jest-environment-jsdom in
 /apps/block_scout_web/assets

Bumps [jest-environment-jsdom](https://github.com/jestjs/jest/tree/HEAD/packages/jest-environment-jsdom) from 29.6.2 to 29.6.3.
- [Release notes](https://github.com/jestjs/jest/releases)
- [Changelog](https://github.com/jestjs/jest/blob/main/CHANGELOG.md)
- [Commits](https://github.com/jestjs/jest/commits/v29.6.3/packages/jest-environment-jsdom)

---
updated-dependencies:
- dependency-name: jest-environment-jsdom
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 apps/block_scout_web/assets/package-lock.json | 34 +++++++++----------
 apps/block_scout_web/assets/package.json      |  2 +-
 2 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/apps/block_scout_web/assets/package-lock.json b/apps/block_scout_web/assets/package-lock.json
index cbe9fe8d59a6..c93e08b46e8f 100644
--- a/apps/block_scout_web/assets/package-lock.json
+++ b/apps/block_scout_web/assets/package-lock.json
@@ -85,7 +85,7 @@
         "eslint-plugin-promise": "^6.1.1",
         "file-loader": "^6.2.0",
         "jest": "^29.6.3",
-        "jest-environment-jsdom": "^29.6.2",
+        "jest-environment-jsdom": "^29.6.3",
         "mini-css-extract-plugin": "^2.7.6",
         "postcss": "^8.4.28",
         "postcss-loader": "^7.3.3",
@@ -10584,18 +10584,18 @@
       }
     },
     "node_modules/jest-environment-jsdom": {
-      "version": "29.6.2",
-      "resolved": "https://registry.npmjs.org/jest-environment-jsdom/-/jest-environment-jsdom-29.6.2.tgz",
-      "integrity": "sha512-7oa/+266AAEgkzae8i1awNEfTfjwawWKLpiw2XesZmaoVVj9u9t8JOYx18cG29rbPNtkUlZ8V4b5Jb36y/VxoQ==",
+      "version": "29.6.3",
+      "resolved": "https://registry.npmjs.org/jest-environment-jsdom/-/jest-environment-jsdom-29.6.3.tgz",
+      "integrity": "sha512-nMJz/i27Moit9bv8Z323/13Melj4FEQH93yRu7GnilvBmPBMH4EGEkEfBTJXYuubyzhMO7w/VHzljIDV+Q/SeQ==",
       "dev": true,
       "dependencies": {
-        "@jest/environment": "^29.6.2",
-        "@jest/fake-timers": "^29.6.2",
-        "@jest/types": "^29.6.1",
+        "@jest/environment": "^29.6.3",
+        "@jest/fake-timers": "^29.6.3",
+        "@jest/types": "^29.6.3",
         "@types/jsdom": "^20.0.0",
         "@types/node": "*",
-        "jest-mock": "^29.6.2",
-        "jest-util": "^29.6.2",
+        "jest-mock": "^29.6.3",
+        "jest-util": "^29.6.3",
         "jsdom": "^20.0.0"
       },
       "engines": {
@@ -25519,18 +25519,18 @@
       }
     },
     "jest-environment-jsdom": {
-      "version": "29.6.2",
-      "resolved": "https://registry.npmjs.org/jest-environment-jsdom/-/jest-environment-jsdom-29.6.2.tgz",
-      "integrity": "sha512-7oa/+266AAEgkzae8i1awNEfTfjwawWKLpiw2XesZmaoVVj9u9t8JOYx18cG29rbPNtkUlZ8V4b5Jb36y/VxoQ==",
+      "version": "29.6.3",
+      "resolved": "https://registry.npmjs.org/jest-environment-jsdom/-/jest-environment-jsdom-29.6.3.tgz",
+      "integrity": "sha512-nMJz/i27Moit9bv8Z323/13Melj4FEQH93yRu7GnilvBmPBMH4EGEkEfBTJXYuubyzhMO7w/VHzljIDV+Q/SeQ==",
       "dev": true,
       "requires": {
-        "@jest/environment": "^29.6.2",
-        "@jest/fake-timers": "^29.6.2",
-        "@jest/types": "^29.6.1",
+        "@jest/environment": "^29.6.3",
+        "@jest/fake-timers": "^29.6.3",
+        "@jest/types": "^29.6.3",
         "@types/jsdom": "^20.0.0",
         "@types/node": "*",
-        "jest-mock": "^29.6.2",
-        "jest-util": "^29.6.2",
+        "jest-mock": "^29.6.3",
+        "jest-util": "^29.6.3",
         "jsdom": "^20.0.0"
       }
     },
diff --git a/apps/block_scout_web/assets/package.json b/apps/block_scout_web/assets/package.json
index 6ccea387df3d..251bbd1945fe 100644
--- a/apps/block_scout_web/assets/package.json
+++ b/apps/block_scout_web/assets/package.json
@@ -97,7 +97,7 @@
     "eslint-plugin-promise": "^6.1.1",
     "file-loader": "^6.2.0",
     "jest": "^29.6.3",
-    "jest-environment-jsdom": "^29.6.2",
+    "jest-environment-jsdom": "^29.6.3",
     "mini-css-extract-plugin": "^2.7.6",
     "postcss": "^8.4.28",
     "postcss-loader": "^7.3.3",

From ddf6265cd1c1e8259865fb1d164ba1698420e5ba Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 22 Aug 2023 18:14:29 +0000
Subject: [PATCH 330/909] Bump ecto_sql from 3.10.1 to 3.10.2

Bumps [ecto_sql](https://github.com/elixir-ecto/ecto_sql) from 3.10.1 to 3.10.2.
- [Changelog](https://github.com/elixir-ecto/ecto_sql/blob/master/CHANGELOG.md)
- [Commits](https://github.com/elixir-ecto/ecto_sql/compare/v3.10.1...v3.10.2)

---
updated-dependencies:
- dependency-name: ecto_sql
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 mix.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mix.lock b/mix.lock
index e677fc1e35a2..48442769907c 100644
--- a/mix.lock
+++ b/mix.lock
@@ -38,7 +38,7 @@
   "digital_token": {:hex, :digital_token, "0.6.0", "13e6de581f0b1f6c686f7c7d12ab11a84a7b22fa79adeb4b50eec1a2d278d258", [:mix], [{:cldr_utils, "~> 2.17", [hex: :cldr_utils, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}], "hexpm", "2455d626e7c61a128b02a4a8caddb092548c3eb613ac6f6a85e4cbb6caddc4d1"},
   "earmark_parser": {:hex, :earmark_parser, "1.4.33", "3c3fd9673bb5dcc9edc28dd90f50c87ce506d1f71b70e3de69aa8154bc695d44", [:mix], [], "hexpm", "2d526833729b59b9fdb85785078697c72ac5e5066350663e5be6a1182da61b8f"},
   "ecto": {:hex, :ecto, "3.10.3", "eb2ae2eecd210b4eb8bece1217b297ad4ff824b4384c0e3fdd28aaf96edd6135", [:mix], [{:decimal, "~> 1.6 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}, {:telemetry, "~> 0.4 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "44bec74e2364d491d70f7e42cd0d690922659d329f6465e89feb8a34e8cd3433"},
-  "ecto_sql": {:hex, :ecto_sql, "3.10.1", "6ea6b3036a0b0ca94c2a02613fd9f742614b5cfe494c41af2e6571bb034dd94c", [:mix], [{:db_connection, "~> 2.5 or ~> 2.4.1", [hex: :db_connection, repo: "hexpm", optional: false]}, {:ecto, "~> 3.10.0", [hex: :ecto, repo: "hexpm", optional: false]}, {:myxql, "~> 0.6.0", [hex: :myxql, repo: "hexpm", optional: true]}, {:postgrex, "~> 0.16.0 or ~> 0.17.0 or ~> 1.0", [hex: :postgrex, repo: "hexpm", optional: true]}, {:tds, "~> 2.1.1 or ~> 2.2", [hex: :tds, repo: "hexpm", optional: true]}, {:telemetry, "~> 0.4.0 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "f6a25bdbbd695f12c8171eaff0851fa4c8e72eec1e98c7364402dda9ce11c56b"},
+  "ecto_sql": {:hex, :ecto_sql, "3.10.2", "6b98b46534b5c2f8b8b5f03f126e75e2a73c64f3c071149d32987a5378b0fdbd", [:mix], [{:db_connection, "~> 2.5 or ~> 2.4.1", [hex: :db_connection, repo: "hexpm", optional: false]}, {:ecto, "~> 3.10.0", [hex: :ecto, repo: "hexpm", optional: false]}, {:myxql, "~> 0.6.0", [hex: :myxql, repo: "hexpm", optional: true]}, {:postgrex, "~> 0.16.0 or ~> 0.17.0 or ~> 1.0", [hex: :postgrex, repo: "hexpm", optional: true]}, {:tds, "~> 2.1.1 or ~> 2.2", [hex: :tds, repo: "hexpm", optional: true]}, {:telemetry, "~> 0.4.0 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "68c018debca57cb9235e3889affdaec7a10616a4e3a80c99fa1d01fdafaa9007"},
   "elixir_make": {:hex, :elixir_make, "0.6.3", "bc07d53221216838d79e03a8019d0839786703129599e9619f4ab74c8c096eac", [:mix], [], "hexpm", "f5cbd651c5678bcaabdbb7857658ee106b12509cd976c2c2fca99688e1daf716"},
   "erlex": {:hex, :erlex, "0.2.6", "c7987d15e899c7a2f34f5420d2a2ea0d659682c06ac607572df55a43753aa12e", [:mix], [], "hexpm", "2ed2e25711feb44d52b17d2780eabf998452f6efda104877a3881c2f8c0c0c75"},
   "ex_abi": {:hex, :ex_abi, "0.6.0", "8cf1fef9490dea0834bc201d399635e72178df05dea87b1c933478762dede142", [:mix], [{:ex_keccak, "~> 0.7.1", [hex: :ex_keccak, repo: "hexpm", optional: false]}, {:jason, "~> 1.4", [hex: :jason, repo: "hexpm", optional: false]}], "hexpm", "b03e5fe07371db3ceceb2d536cc32658dcba47b79952469e3e71d7690495e8d8"},

From cccd21b5914c5b94d6dad5367ef58861d9f39e91 Mon Sep 17 00:00:00 2001
From: Viktor Baranov <baranov.viktor.27@gmail.com>
Date: Wed, 23 Aug 2023 14:10:52 +0300
Subject: [PATCH 331/909] Planned removal of duplicate API endpoints: for CSV
 and GraphQL

---
 CHANGELOG.md                                           | 2 ++
 apps/block_scout_web/lib/block_scout_web/router.ex     | 7 -------
 apps/block_scout_web/lib/block_scout_web/web_router.ex | 9 ---------
 3 files changed, 2 insertions(+), 16 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 076fb98717f5..d26884a41079 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -14,6 +14,8 @@
 
 ### Chore
 
+- [#8281](https://github.com/blockscout/blockscout/pull/8281) - Planned removal of duplicate API endpoints: for CSV export and GraphQL
+
 <details>
   <summary>Dependencies version bumps</summary>
 
diff --git a/apps/block_scout_web/lib/block_scout_web/router.ex b/apps/block_scout_web/lib/block_scout_web/router.ex
index ba54d60412f4..ff9d5afcc609 100644
--- a/apps/block_scout_web/lib/block_scout_web/router.ex
+++ b/apps/block_scout_web/lib/block_scout_web/router.ex
@@ -28,13 +28,6 @@ defmodule BlockScoutWeb.Router do
     # Needs to be 200 to support the schema introspection for graphiql
     @max_complexity 200
 
-    # todo: remove once frontend will migrate to /api/v1/... path
-    forward("/graphql", Absinthe.Plug,
-      schema: BlockScoutWeb.Schema,
-      analyze_complexity: true,
-      max_complexity: @max_complexity
-    )
-
     forward("/graphiql", Absinthe.Plug.GraphiQL,
       schema: BlockScoutWeb.Schema,
       interface: :advanced,
diff --git a/apps/block_scout_web/lib/block_scout_web/web_router.ex b/apps/block_scout_web/lib/block_scout_web/web_router.ex
index bd675182b642..3f3dbed7d10e 100644
--- a/apps/block_scout_web/lib/block_scout_web/web_router.ex
+++ b/apps/block_scout_web/lib/block_scout_web/web_router.ex
@@ -495,15 +495,6 @@ defmodule BlockScoutWeb.WebRouter do
 
     get("/token-autocomplete", ChainController, :token_autocomplete)
 
-    # todo: remove once frontend will migrate to /api/v1/... path
-    get("/transactions-csv", AddressTransactionController, :transactions_csv)
-
-    get("/token-transfers-csv", AddressTransactionController, :token_transfers_csv)
-
-    get("/internal-transactions-csv", AddressTransactionController, :internal_transactions_csv)
-
-    get("/logs-csv", AddressTransactionController, :logs_csv)
-
     get("/chain-blocks", ChainController, :chain_blocks, as: :chain_blocks)
 
     get("/token-counters", Tokens.TokenController, :token_counters)

From 3cc171fcc113fa50725a00d50aea1f57c835092f Mon Sep 17 00:00:00 2001
From: Viktor Baranov <baranov.viktor.27@gmail.com>
Date: Fri, 21 Jul 2023 18:14:09 +0300
Subject: [PATCH 332/909] API v2 smart-contract verification extended logging

---
 .dialyzer-ignore                              |   4 +-
 CHANGELOG.md                                  |   1 +
 .../controllers/api/v2/fallback_controller.ex | 137 +++++++++++++++---
 .../api/v2/verification_controller.ex         |  41 +++++-
 .../lib/block_scout_web/notifier.ex           |  19 ++-
 .../api/v2/verification_controller_test.exs   |  10 +-
 .../lib/explorer/chain/smart_contract.ex      |  47 ++++--
 .../smart_contract/solidity/publisher.ex      |  14 ++
 .../solidity/publisher_worker.ex              |   4 +
 .../smart_contract/vyper/publisher.ex         |   5 +
 .../smart_contract/vyper/publisher_worker.ex  |   4 +
 11 files changed, 241 insertions(+), 45 deletions(-)

diff --git a/.dialyzer-ignore b/.dialyzer-ignore
index 84162c2785e0..6dd625f3298f 100644
--- a/.dialyzer-ignore
+++ b/.dialyzer-ignore
@@ -6,8 +6,8 @@
 lib/ethereum_jsonrpc/rolling_window.ex:171
 lib/explorer/smart_contract/solidity/publisher_worker.ex:1
 lib/explorer/smart_contract/vyper/publisher_worker.ex:1
-lib/explorer/smart_contract/solidity/publisher_worker.ex:6
-lib/explorer/smart_contract/vyper/publisher_worker.ex:6
+lib/explorer/smart_contract/solidity/publisher_worker.ex:8
+lib/explorer/smart_contract/vyper/publisher_worker.ex:8
 lib/block_scout_web/router.ex:1
 lib/block_scout_web/schema/types.ex:31
 lib/phoenix/router.ex:324
diff --git a/CHANGELOG.md b/CHANGELOG.md
index d26884a41079..7696d9e77540 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -56,6 +56,7 @@
 - [#8105](https://github.com/blockscout/blockscout/pull/8105) - Extend API v1 with endpoints used by new UI
 - [#8104](https://github.com/blockscout/blockscout/pull/8104) - remove "TODO" from API v2 response
 - [#8100](https://github.com/blockscout/blockscout/pull/8100), [#8103](https://github.com/blockscout/blockscout/pull/8103) - Extend docker-compose configs with new config when front is running externally
+- [#8012](https://github.com/blockscout/blockscout/pull/8012) - API v2 smart-contract verification extended logging
 
 <details>
   <summary>Dependencies version bumps</summary>
diff --git a/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/fallback_controller.ex b/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/fallback_controller.ex
index 78ef0980d2c5..79cad2ebffed 100644
--- a/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/fallback_controller.ex
+++ b/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/fallback_controller.ex
@@ -1,134 +1,235 @@
 defmodule BlockScoutWeb.API.V2.FallbackController do
   use Phoenix.Controller
 
+  require Logger
+
   alias BlockScoutWeb.API.V2.ApiView
 
-  def call(conn, {:format, _}) do
+  @verification_failed "API v2 smart-contract verification failed"
+  @invalid_parameters "Invalid parameter(s)"
+  @invalid_address_hash "Invalid address hash"
+  @invalid_hash "Invalid hash"
+  @invalid_number "Invalid number"
+  @invalid_url "Invalid URL"
+  @not_found "Not found"
+  @contract_interaction_disabled "Contract interaction disabled"
+  @restricted_access "Restricted access"
+  @already_verified "Already verified"
+  @json_not_found "JSON files not found"
+  @error_while_reading_json "Error while reading JSON file"
+  @error_in_libraries "Libraries are not valid JSON map"
+  @block_lost_consensus "Block lost consensus"
+  @invalid_captcha_resp "Invalid reCAPTCHA response"
+  @unauthorized "Unauthorized"
+  @not_configured_api_key "API key not configured on the server"
+  @wrong_api_key "Wrong API key"
+
+  def call(conn, {:format, _params}) do
+    Logger.error(fn ->
+      ["#{@verification_failed}: #{@invalid_parameters}"]
+    end)
+
     conn
     |> put_status(:unprocessable_entity)
     |> put_view(ApiView)
-    |> render(:message, %{message: "Invalid parameter(s)"})
+    |> render(:message, %{message: @invalid_parameters})
   end
 
   def call(conn, {:format_address, _}) do
+    Logger.error(fn ->
+      ["#{@verification_failed}: #{@invalid_address_hash}"]
+    end)
+
     conn
     |> put_status(:unprocessable_entity)
     |> put_view(ApiView)
-    |> render(:message, %{message: "Invalid address hash"})
+    |> render(:message, %{message: @invalid_address_hash})
   end
 
   def call(conn, {:format_url, _}) do
+    Logger.error(fn ->
+      ["#{@verification_failed}: #{@invalid_url}"]
+    end)
+
     conn
     |> put_status(:unprocessable_entity)
     |> put_view(ApiView)
-    |> render(:message, %{message: "Invalid URL"})
+    |> render(:message, %{message: @invalid_url})
   end
 
   def call(conn, {:not_found, _, :empty_items_with_next_page_params}) do
+    Logger.error(fn ->
+      ["#{@verification_failed}: :empty_items_with_next_page_params"]
+    end)
+
     conn
     |> json(%{"items" => [], "next_page_params" => nil})
   end
 
   def call(conn, {:not_found, _}) do
+    Logger.error(fn ->
+      ["#{@verification_failed}: #{@not_found}"]
+    end)
+
     conn
     |> put_status(:not_found)
     |> put_view(ApiView)
-    |> render(:message, %{message: "Not found"})
+    |> render(:message, %{message: @not_found})
   end
 
   def call(conn, {:contract_interaction_disabled, _}) do
+    Logger.error(fn ->
+      ["#{@verification_failed}: #{@contract_interaction_disabled}"]
+    end)
+
     conn
     |> put_status(:forbidden)
     |> put_view(ApiView)
-    |> render(:message, %{message: "Contract interaction disabled"})
+    |> render(:message, %{message: @contract_interaction_disabled})
   end
 
   def call(conn, {:error, {:invalid, :hash}}) do
+    Logger.error(fn ->
+      ["#{@verification_failed}: #{@invalid_hash}"]
+    end)
+
     conn
     |> put_status(:unprocessable_entity)
     |> put_view(ApiView)
-    |> render(:message, %{message: "Invalid hash"})
+    |> render(:message, %{message: @invalid_hash})
   end
 
   def call(conn, {:error, {:invalid, :number}}) do
+    Logger.error(fn ->
+      ["#{@verification_failed}: #{@invalid_number}"]
+    end)
+
     conn
     |> put_status(:unprocessable_entity)
     |> put_view(ApiView)
-    |> render(:message, %{message: "Invalid number"})
+    |> render(:message, %{message: @invalid_number})
   end
 
   def call(conn, {:error, :not_found}) do
+    Logger.error(fn ->
+      ["#{@verification_failed}: :not_found"]
+    end)
+
     conn
     |> call({:not_found, nil})
   end
 
   def call(conn, {:restricted_access, true}) do
+    Logger.error(fn ->
+      ["#{@verification_failed}: #{@restricted_access}"]
+    end)
+
     conn
     |> put_status(:forbidden)
     |> put_view(ApiView)
-    |> render(:message, %{message: "Restricted access"})
+    |> render(:message, %{message: @restricted_access})
   end
 
   def call(conn, {:already_verified, true}) do
+    Logger.error(fn ->
+      ["#{@verification_failed}: #{@already_verified}"]
+    end)
+
     conn
     |> put_view(ApiView)
-    |> render(:message, %{message: "Already verified"})
+    |> render(:message, %{message: @already_verified})
   end
 
   def call(conn, {:no_json_file, _}) do
+    Logger.error(fn ->
+      ["#{@verification_failed}: #{@json_not_found}"]
+    end)
+
     conn
     |> put_view(ApiView)
-    |> render(:message, %{message: "JSON files not found"})
+    |> render(:message, %{message: @json_not_found})
   end
 
   def call(conn, {:file_error, _}) do
+    Logger.error(fn ->
+      ["#{@verification_failed}: #{@error_while_reading_json}"]
+    end)
+
     conn
     |> put_view(ApiView)
-    |> render(:message, %{message: "Error while reading JSON file"})
+    |> render(:message, %{message: @error_while_reading_json})
   end
 
   def call(conn, {:libs_format, _}) do
+    Logger.error(fn ->
+      ["#{@verification_failed}: #{@error_in_libraries}"]
+    end)
+
     conn
     |> put_view(ApiView)
-    |> render(:message, %{message: "Libraries are not valid JSON map"})
+    |> render(:message, %{message: @error_in_libraries})
   end
 
   def call(conn, {:lost_consensus, {:ok, block}}) do
+    Logger.error(fn ->
+      ["#{@verification_failed}: #{@block_lost_consensus}"]
+    end)
+
     conn
     |> put_status(:not_found)
-    |> json(%{message: "Block lost consensus", hash: to_string(block.hash)})
+    |> json(%{message: @block_lost_consensus, hash: to_string(block.hash)})
   end
 
   def call(conn, {:lost_consensus, {:error, :not_found}}) do
+    Logger.error(fn ->
+      ["#{@verification_failed}: #{@block_lost_consensus}"]
+    end)
+
     conn
     |> call({:not_found, nil})
   end
 
   def call(conn, {:recaptcha, _}) do
+    Logger.error(fn ->
+      ["#{@verification_failed}: #{@invalid_captcha_resp}"]
+    end)
+
     conn
     |> put_status(:forbidden)
     |> put_view(ApiView)
-    |> render(:message, %{message: "Invalid reCAPTCHA response"})
+    |> render(:message, %{message: @invalid_captcha_resp})
   end
 
   def call(conn, {:auth, _}) do
+    Logger.error(fn ->
+      ["#{@verification_failed}: #{@unauthorized}"]
+    end)
+
     conn
     |> put_status(:unauthorized)
     |> put_view(ApiView)
-    |> render(:message, %{message: "Unauthorized"})
+    |> render(:message, %{message: @unauthorized})
   end
 
   def call(conn, {:sensitive_endpoints_api_key, _}) do
+    Logger.error(fn ->
+      ["#{@verification_failed}: #{@not_configured_api_key}"]
+    end)
+
     conn
     |> put_status(:forbidden)
     |> put_view(ApiView)
-    |> render(:message, %{message: "API key not configured on the server"})
+    |> render(:message, %{message: @not_configured_api_key})
   end
 
   def call(conn, {:api_key, _}) do
+    Logger.error(fn ->
+      ["#{@verification_failed}: #{@wrong_api_key}"]
+    end)
+
     conn
     |> put_status(:unauthorized)
     |> put_view(ApiView)
-    |> render(:message, %{message: "Wrong API key"})
+    |> render(:message, %{message: @wrong_api_key})
   end
 end
diff --git a/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/verification_controller.ex b/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/verification_controller.ex
index 49c98c5153ee..b2bbb07d3189 100644
--- a/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/verification_controller.ex
+++ b/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/verification_controller.ex
@@ -3,6 +3,8 @@ defmodule BlockScoutWeb.API.V2.VerificationController do
 
   import Explorer.SmartContract.Solidity.Verifier, only: [parse_boolean: 1]
 
+  require Logger
+
   alias BlockScoutWeb.AccessHelper
   alias BlockScoutWeb.API.V2.ApiView
   alias Explorer.Chain
@@ -14,6 +16,7 @@ defmodule BlockScoutWeb.API.V2.VerificationController do
   action_fallback(BlockScoutWeb.API.V2.FallbackController)
 
   @api_true [api?: true]
+  @sc_verification_started "Smart-contract verification started"
 
   def config(conn, _params) do
     solidity_compiler_versions = CompilerVersion.fetch_version_list(:solc)
@@ -46,6 +49,8 @@ defmodule BlockScoutWeb.API.V2.VerificationController do
         %{"address_hash" => address_hash_string, "compiler_version" => compiler_version, "source_code" => source_code} =
           params
       ) do
+    Logger.info("API v2 smart-contract #{address_hash_string} verification via flattened file")
+
     with :validated <- validate_address(params) do
       verification_params =
         %{
@@ -65,11 +70,12 @@ defmodule BlockScoutWeb.API.V2.VerificationController do
         |> Map.put("external_libraries", Map.get(params, "libraries", %{}))
         |> Map.put("is_yul", Map.get(params, "is_yul_contract", false))
 
+      log_sc_verification_started(address_hash_string)
       Que.add(SolidityPublisherWorker, {"flattened_api_v2", verification_params})
 
       conn
       |> put_view(ApiView)
-      |> render(:message, %{message: "Verification started"})
+      |> render(:message, %{message: @sc_verification_started})
     end
   end
 
@@ -77,6 +83,8 @@ defmodule BlockScoutWeb.API.V2.VerificationController do
         conn,
         %{"address_hash" => address_hash_string, "files" => _files, "compiler_version" => compiler_version} = params
       ) do
+    Logger.info("API v2 smart-contract #{address_hash_string} verification via standard json input")
+
     with {:json_input, json_input} <- validate_params_standard_json_input(params) do
       verification_params =
         %{
@@ -87,15 +95,18 @@ defmodule BlockScoutWeb.API.V2.VerificationController do
         |> Map.put("constructor_arguments", Map.get(params, "constructor_args", ""))
         |> Map.put("name", Map.get(params, "contract_name", ""))
 
+      log_sc_verification_started(address_hash_string)
       Que.add(SolidityPublisherWorker, {"json_api_v2", verification_params, json_input})
 
       conn
       |> put_view(ApiView)
-      |> render(:message, %{message: "Verification started"})
+      |> render(:message, %{message: @sc_verification_started})
     end
   end
 
   def verification_via_sourcify(conn, %{"address_hash" => address_hash_string, "files" => files} = params) do
+    Logger.info("API v2 smart-contract #{address_hash_string} verification via Sourcify")
+
     with {:not_found, true} <-
            {:not_found, Application.get_env(:explorer, Explorer.ThirdPartyIntegrations.Sourcify)[:enabled]},
          :validated <- validate_address(params),
@@ -105,6 +116,8 @@ defmodule BlockScoutWeb.API.V2.VerificationController do
          files_content <- PublishHelper.read_files(files_array) do
       chosen_contract = params["chosen_contract_index"]
 
+      log_sc_verification_started(address_hash_string)
+
       Que.add(
         SolidityPublisherWorker,
         {"sourcify_api_v2", String.downcase(address_hash_string), files_content, conn, chosen_contract}
@@ -112,7 +125,7 @@ defmodule BlockScoutWeb.API.V2.VerificationController do
 
       conn
       |> put_view(ApiView)
-      |> render(:message, %{message: "Verification started"})
+      |> render(:message, %{message: @sc_verification_started})
     end
   end
 
@@ -120,6 +133,8 @@ defmodule BlockScoutWeb.API.V2.VerificationController do
         conn,
         %{"address_hash" => address_hash_string, "compiler_version" => compiler_version, "files" => files} = params
       ) do
+    Logger.info("API v2 smart-contract #{address_hash_string} verification via multipart")
+
     with :verifier_enabled <- check_microservice(),
          :validated <- validate_address(params),
          libraries <- Map.get(params, "libraries", "{}"),
@@ -142,11 +157,12 @@ defmodule BlockScoutWeb.API.V2.VerificationController do
         |> PublishHelper.prepare_files_array()
         |> PublishHelper.read_files()
 
+      log_sc_verification_started(address_hash_string)
       Que.add(SolidityPublisherWorker, {"multipart_api_v2", verification_params, files_array})
 
       conn
       |> put_view(ApiView)
-      |> render(:message, %{message: "Verification started"})
+      |> render(:message, %{message: @sc_verification_started})
     end
   end
 
@@ -166,11 +182,12 @@ defmodule BlockScoutWeb.API.V2.VerificationController do
         |> Map.put("name", Map.get(params, "contract_name", "Vyper_contract"))
         |> Map.put("evm_version", Map.get(params, "evm_version"))
 
+      log_sc_verification_started(address_hash_string)
       Que.add(VyperPublisherWorker, {"vyper_flattened", verification_params})
 
       conn
       |> put_view(ApiView)
-      |> render(:message, %{message: "Verification started"})
+      |> render(:message, %{message: @sc_verification_started})
     end
   end
 
@@ -178,6 +195,8 @@ defmodule BlockScoutWeb.API.V2.VerificationController do
         conn,
         %{"address_hash" => address_hash_string, "compiler_version" => compiler_version, "files" => files} = params
       ) do
+    Logger.info("API v2 vyper smart-contract #{address_hash_string} verification")
+
     with :verifier_enabled <- check_microservice(),
          :validated <- validate_address(params) do
       interfaces = parse_interfaces(params["interfaces"])
@@ -195,11 +214,12 @@ defmodule BlockScoutWeb.API.V2.VerificationController do
         |> PublishHelper.prepare_files_array()
         |> PublishHelper.read_files()
 
+      log_sc_verification_started(address_hash_string)
       Que.add(VyperPublisherWorker, {"vyper_multipart", verification_params, files_array})
 
       conn
       |> put_view(ApiView)
-      |> render(:message, %{message: "Verification started"})
+      |> render(:message, %{message: @sc_verification_started})
     end
   end
 
@@ -207,6 +227,8 @@ defmodule BlockScoutWeb.API.V2.VerificationController do
         conn,
         %{"address_hash" => address_hash_string, "files" => _files, "compiler_version" => compiler_version} = params
       ) do
+    Logger.info("API v2 vyper smart-contract #{address_hash_string} verification via standard json input")
+
     with :verifier_enabled <- check_microservice(),
          {:json_input, json_input} <- validate_params_standard_json_input(params) do
       verification_params = %{
@@ -215,11 +237,12 @@ defmodule BlockScoutWeb.API.V2.VerificationController do
         "input" => json_input
       }
 
+      log_sc_verification_started(address_hash_string)
       Que.add(VyperPublisherWorker, {"vyper_standard_json", verification_params})
 
       conn
       |> put_view(ApiView)
-      |> render(:message, %{message: "Verification started"})
+      |> render(:message, %{message: @sc_verification_started})
     end
   end
 
@@ -269,4 +292,8 @@ defmodule BlockScoutWeb.API.V2.VerificationController do
       :verifier_enabled
     end
   end
+
+  defp log_sc_verification_started(address_hash_string) do
+    Logger.info("API v2 smart-contract #{address_hash_string} verification request sent to the microservice")
+  end
 end
diff --git a/apps/block_scout_web/lib/block_scout_web/notifier.ex b/apps/block_scout_web/lib/block_scout_web/notifier.ex
index 06f39fafccdb..a82202c4acdc 100644
--- a/apps/block_scout_web/lib/block_scout_web/notifier.ex
+++ b/apps/block_scout_web/lib/block_scout_web/notifier.ex
@@ -3,6 +3,8 @@ defmodule BlockScoutWeb.Notifier do
   Responds to events by sending appropriate channel updates to front-end.
   """
 
+  require Logger
+
   alias Absinthe.Subscription
 
   alias BlockScoutWeb.API.V2, as: API_V2
@@ -48,6 +50,8 @@ defmodule BlockScoutWeb.Notifier do
   def handle_event(
         {:chain_event, :contract_verification_result, :on_demand, {address_hash, contract_verification_result}}
       ) do
+    log_broadcast_verification_results_for_address(address_hash)
+
     Endpoint.broadcast(
       "addresses:#{address_hash}",
       "verification_result",
@@ -60,6 +64,7 @@ defmodule BlockScoutWeb.Notifier do
   def handle_event(
         {:chain_event, :contract_verification_result, :on_demand, {address_hash, contract_verification_result, conn}}
       ) do
+    log_broadcast_verification_results_for_address(address_hash)
     %{view: view, compiler: compiler} = select_contract_type_and_form_view(conn.params)
 
     contract_verification_result =
@@ -218,6 +223,7 @@ defmodule BlockScoutWeb.Notifier do
   end
 
   def handle_event({:chain_event, :smart_contract_was_verified, :on_demand, [address_hash]}) do
+    log_broadcast_smart_contract_was_verified(address_hash)
     Endpoint.broadcast("addresses:#{to_string(address_hash)}", "smart_contract_was_verified", %{})
   end
 
@@ -227,7 +233,10 @@ defmodule BlockScoutWeb.Notifier do
     })
   end
 
-  def handle_event(_), do: nil
+  def handle_event(event) do
+    Logger.warning("Unknown broadcasted event #{inspect(event)}.")
+    nil
+  end
 
   def fetch_compiler_version(compiler) do
     case CompilerVersion.fetch_versions(compiler) do
@@ -481,4 +490,12 @@ defmodule BlockScoutWeb.Notifier do
       Endpoint.broadcast("addresses:#{address_hash}", event, %{map_key => elements})
     end
   end
+
+  defp log_broadcast_verification_results_for_address(address_hash) do
+    Logger.info("Broadcast smart-contract #{address_hash} verification results")
+  end
+
+  defp log_broadcast_smart_contract_was_verified(address_hash) do
+    Logger.info("Broadcast smart-contract #{address_hash} was verified")
+  end
 end
diff --git a/apps/block_scout_web/test/block_scout_web/controllers/api/v2/verification_controller_test.exs b/apps/block_scout_web/test/block_scout_web/controllers/api/v2/verification_controller_test.exs
index 1b21ecabea27..bd471e8d771f 100644
--- a/apps/block_scout_web/test/block_scout_web/controllers/api/v2/verification_controller_test.exs
+++ b/apps/block_scout_web/test/block_scout_web/controllers/api/v2/verification_controller_test.exs
@@ -75,7 +75,7 @@ defmodule BlockScoutWeb.API.V2.VerificationControllerTest do
 
       request = post(conn, "/api/v2/smart-contracts/#{contract_address.hash}/verification/via/flattened-code", params)
 
-      assert %{"message" => "Verification started"} = json_response(request, 200)
+      assert %{"message" => "Smart-contract verification started"} = json_response(request, 200)
 
       assert_receive %Phoenix.Socket.Message{
                        payload: %{status: "success"},
@@ -118,7 +118,7 @@ defmodule BlockScoutWeb.API.V2.VerificationControllerTest do
 
       request = post(conn, "/api/v2/smart-contracts/#{contract_address.hash}/verification/via/flattened-code", params)
 
-      assert %{"message" => "Verification started"} = json_response(request, 200)
+      assert %{"message" => "Smart-contract verification started"} = json_response(request, 200)
 
       assert_receive %Phoenix.Socket.Message{
                        payload: %{status: "error", errors: %{name: ["Wrong contract name, please try again."]}},
@@ -198,7 +198,7 @@ defmodule BlockScoutWeb.API.V2.VerificationControllerTest do
           body
         )
 
-      assert %{"message" => "Verification started"} = json_response(request, 200)
+      assert %{"message" => "Smart-contract verification started"} = json_response(request, 200)
 
       assert_receive %Phoenix.Socket.Message{
                        payload: %{status: "success"},
@@ -259,7 +259,7 @@ defmodule BlockScoutWeb.API.V2.VerificationControllerTest do
           body
         )
 
-      assert %{"message" => "Verification started"} = json_response(request, 200)
+      assert %{"message" => "Smart-contract verification started"} = json_response(request, 200)
 
       assert_receive %Phoenix.Socket.Message{
                        payload: %{status: "success"},
@@ -329,7 +329,7 @@ defmodule BlockScoutWeb.API.V2.VerificationControllerTest do
 
       request = post(conn, "/api/v2/smart-contracts/#{contract_address.hash}/verification/via/vyper-code", params)
 
-      assert %{"message" => "Verification started"} = json_response(request, 200)
+      assert %{"message" => "Smart-contract verification started"} = json_response(request, 200)
 
       assert_receive %Phoenix.Socket.Message{
                        payload: %{status: "success"},
diff --git a/apps/explorer/lib/explorer/chain/smart_contract.ex b/apps/explorer/lib/explorer/chain/smart_contract.ex
index c1cb17f1022e..6b3696d28259 100644
--- a/apps/explorer/lib/explorer/chain/smart_contract.ex
+++ b/apps/explorer/lib/explorer/chain/smart_contract.ex
@@ -424,30 +424,53 @@ defmodule Explorer.Chain.SmartContract do
 
   defp upsert_contract_methods(changeset), do: changeset
 
-  defp error_message(:compilation), do: "There was an error compiling your contract."
-  defp error_message(:compiler_version), do: "Compiler version does not match, please try again."
-  defp error_message(:generated_bytecode), do: "Bytecode does not match, please try again."
-  defp error_message(:constructor_arguments), do: "Constructor arguments do not match, please try again."
-  defp error_message(:name), do: "Wrong contract name, please try again."
-  defp error_message(:json), do: "Invalid JSON file."
+  defp error_message(:compilation), do: error_message_with_log("There was an error compiling your contract.")
+
+  defp error_message(:compiler_version),
+    do: error_message_with_log("Compiler version does not match, please try again.")
+
+  defp error_message(:generated_bytecode), do: error_message_with_log("Bytecode does not match, please try again.")
+
+  defp error_message(:constructor_arguments),
+    do: error_message_with_log("Constructor arguments do not match, please try again.")
+
+  defp error_message(:name), do: error_message_with_log("Wrong contract name, please try again.")
+  defp error_message(:json), do: error_message_with_log("Invalid JSON file.")
 
   defp error_message(:autodetect_constructor_arguments_failed),
-    do: "Autodetection of constructor arguments failed. Please try to input constructor arguments manually."
+    do:
+      error_message_with_log(
+        "Autodetection of constructor arguments failed. Please try to input constructor arguments manually."
+      )
 
   defp error_message(:no_creation_data),
-    do: "The contract creation transaction has not been indexed yet. Please wait a few minutes and try again."
+    do:
+      error_message_with_log(
+        "The contract creation transaction has not been indexed yet. Please wait a few minutes and try again."
+      )
 
-  defp error_message(:unknown_error), do: "Unable to verify: unknown error."
-  defp error_message(:deployed_bytecode), do: "Deployed bytecode does not correspond to contract creation code."
+  defp error_message(:unknown_error), do: error_message_with_log("Unable to verify: unknown error.")
 
-  defp error_message(string) when is_binary(string), do: string
+  defp error_message(:deployed_bytecode),
+    do: error_message_with_log("Deployed bytecode does not correspond to contract creation code.")
+
+  defp error_message(:contract_source_code), do: error_message_with_log("Empty contract source code.")
+
+  defp error_message(string) when is_binary(string), do: error_message_with_log(string)
+  defp error_message(%{"message" => string} = error) when is_map(error), do: error_message_with_log(string)
 
   defp error_message(error) do
     Logger.warn(fn -> ["Unknown verifier error: ", inspect(error)] end)
     "There was an error validating your contract, please try again."
   end
 
-  defp error_message(:compilation, error_message), do: "There was an error compiling your contract: #{error_message}"
+  defp error_message(:compilation, error_message),
+    do: error_message_with_log("There was an error compiling your contract: #{error_message}")
+
+  defp error_message_with_log(error_string) do
+    Logger.error("Smart-contract verification error: #{error_string}")
+    error_string
+  end
 
   defp select_error_field(:no_creation_data), do: :address_hash
   defp select_error_field(:compiler_version), do: :compiler_version
diff --git a/apps/explorer/lib/explorer/smart_contract/solidity/publisher.ex b/apps/explorer/lib/explorer/smart_contract/solidity/publisher.ex
index 96455e7c327c..045766198150 100644
--- a/apps/explorer/lib/explorer/smart_contract/solidity/publisher.ex
+++ b/apps/explorer/lib/explorer/smart_contract/solidity/publisher.ex
@@ -3,6 +3,8 @@ defmodule Explorer.SmartContract.Solidity.Publisher do
   Module responsible to control the contract verification.
   """
 
+  require Logger
+
   import Explorer.SmartContract.Helper, only: [cast_libraries: 1]
 
   alias Explorer.Chain
@@ -10,6 +12,10 @@ defmodule Explorer.SmartContract.Solidity.Publisher do
   alias Explorer.SmartContract.{CompilerVersion, Helper}
   alias Explorer.SmartContract.Solidity.Verifier
 
+  @sc_verification_via_flattened_file_started "Smart-contract verification via flattened file started"
+  @sc_verification_via_standard_json_input_started "Smart-contract verification via standard json input started"
+  @sc_verification_via_multipart_files_started "Smart-contract verification via multipart files started"
+
   @doc """
   Evaluates smart contract authenticity and saves its details.
 
@@ -27,6 +33,7 @@ defmodule Explorer.SmartContract.Solidity.Publisher do
 
   """
   def publish(address_hash, params, external_libraries \\ %{}) do
+    Logger.info(@sc_verification_via_flattened_file_started)
     params_with_external_libraries = add_external_libraries(params, external_libraries)
 
     case Verifier.evaluate_authenticity(address_hash, params_with_external_libraries) do
@@ -65,6 +72,8 @@ defmodule Explorer.SmartContract.Solidity.Publisher do
   end
 
   def publish_with_standard_json_input(%{"address_hash" => address_hash} = params, json_input) do
+    Logger.info(@sc_verification_via_standard_json_input_started)
+
     case Verifier.evaluate_authenticity_via_standard_json_input(address_hash, params, json_input) do
       {:ok,
        %{
@@ -102,6 +111,7 @@ defmodule Explorer.SmartContract.Solidity.Publisher do
   end
 
   def publish_with_multi_part_files(%{"address_hash" => address_hash} = params, external_libraries \\ %{}, files) do
+    Logger.info(@sc_verification_via_multipart_files_started)
     params_with_external_libraries = add_external_libraries(params, external_libraries)
 
     case Verifier.evaluate_authenticity_via_multi_part_files(address_hash, params_with_external_libraries, files) do
@@ -187,6 +197,8 @@ defmodule Explorer.SmartContract.Solidity.Publisher do
   end
 
   defp create_or_update_smart_contract(address_hash, attrs) do
+    Logger.info("Publish successfully verified Solidity smart-contract #{address_hash} into the DB")
+
     if Chain.smart_contract_verified?(address_hash) do
       Chain.update_smart_contract(attrs, attrs.external_libraries, attrs.secondary_sources)
     else
@@ -209,6 +221,8 @@ defmodule Explorer.SmartContract.Solidity.Publisher do
         verification_with_files?
       )
 
+    Logger.error("Solidity smart-contract verification #{address_hash} failed because of the error #{error}")
+
     %{changeset | action: :insert}
   end
 
diff --git a/apps/explorer/lib/explorer/smart_contract/solidity/publisher_worker.ex b/apps/explorer/lib/explorer/smart_contract/solidity/publisher_worker.ex
index b8dbc3f81dba..b9ae134d54cb 100644
--- a/apps/explorer/lib/explorer/smart_contract/solidity/publisher_worker.ex
+++ b/apps/explorer/lib/explorer/smart_contract/solidity/publisher_worker.ex
@@ -3,6 +3,8 @@ defmodule Explorer.SmartContract.Solidity.PublisherWorker do
   Background smart contract verification worker.
   """
 
+  require Logger
+
   use Que.Worker, concurrency: 5
 
   alias Explorer.Chain.Events.Publisher, as: EventsPublisher
@@ -68,6 +70,8 @@ defmodule Explorer.SmartContract.Solidity.PublisherWorker do
           {:error, changeset}
       end
 
+    Logger.info("Smart-contract #{address_hash} verification: broadcast verification results")
+
     if conn do
       EventsPublisher.broadcast([{:contract_verification_result, {address_hash, result, conn}}], :on_demand)
     else
diff --git a/apps/explorer/lib/explorer/smart_contract/vyper/publisher.ex b/apps/explorer/lib/explorer/smart_contract/vyper/publisher.ex
index 64f91345f787..e5c38116d06f 100644
--- a/apps/explorer/lib/explorer/smart_contract/vyper/publisher.ex
+++ b/apps/explorer/lib/explorer/smart_contract/vyper/publisher.ex
@@ -5,6 +5,8 @@ defmodule Explorer.SmartContract.Vyper.Publisher do
 
   import Explorer.SmartContract.Helper, only: [cast_libraries: 1]
 
+  require Logger
+
   alias Explorer.Chain
   alias Explorer.Chain.SmartContract
   alias Explorer.SmartContract.CompilerVersion
@@ -119,6 +121,7 @@ defmodule Explorer.SmartContract.Vyper.Publisher do
   end
 
   def publish_smart_contract(address_hash, params, abi) do
+    Logger.info("Publish successfully verified Vyper smart-contract #{address_hash} into the DB")
     attrs = address_hash |> attributes(params, abi)
 
     Chain.create_smart_contract(attrs, attrs.external_libraries, attrs.secondary_sources)
@@ -136,6 +139,8 @@ defmodule Explorer.SmartContract.Vyper.Publisher do
         verification_with_files?
       )
 
+    Logger.error("Vyper smart-contract verification #{address_hash} failed because of the error #{error}")
+
     %{changeset | action: :insert}
   end
 
diff --git a/apps/explorer/lib/explorer/smart_contract/vyper/publisher_worker.ex b/apps/explorer/lib/explorer/smart_contract/vyper/publisher_worker.ex
index 45b8feccffa9..690efc346635 100644
--- a/apps/explorer/lib/explorer/smart_contract/vyper/publisher_worker.ex
+++ b/apps/explorer/lib/explorer/smart_contract/vyper/publisher_worker.ex
@@ -3,6 +3,8 @@ defmodule Explorer.SmartContract.Vyper.PublisherWorker do
   Background smart contract verification worker.
   """
 
+  require Logger
+
   use Que.Worker, concurrency: 5
 
   alias Explorer.Chain.Events.Publisher, as: EventsPublisher
@@ -34,6 +36,8 @@ defmodule Explorer.SmartContract.Vyper.PublisherWorker do
           {:error, changeset}
       end
 
+    Logger.info("Smart-contract #{address_hash} verification: broadcast verification results")
+
     if conn do
       EventsPublisher.broadcast([{:contract_verification_result, {address_hash, result, conn}}], :on_demand)
     else

From 9d2fffda6d7566f8edca6d2f4258136d72e1e955 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 23 Aug 2023 19:03:58 +0000
Subject: [PATCH 333/909] Bump luxon from 3.4.0 to 3.4.1 in
 /apps/block_scout_web/assets

Bumps [luxon](https://github.com/moment/luxon) from 3.4.0 to 3.4.1.
- [Changelog](https://github.com/moment/luxon/blob/master/CHANGELOG.md)
- [Commits](https://github.com/moment/luxon/compare/3.4.0...3.4.1)

---
updated-dependencies:
- dependency-name: luxon
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 apps/block_scout_web/assets/package-lock.json | 14 +++++++-------
 apps/block_scout_web/assets/package.json      |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/apps/block_scout_web/assets/package-lock.json b/apps/block_scout_web/assets/package-lock.json
index 5e6b2ceb063d..421a0861ea94 100644
--- a/apps/block_scout_web/assets/package-lock.json
+++ b/apps/block_scout_web/assets/package-lock.json
@@ -44,7 +44,7 @@
         "lodash.omit": "^4.5.0",
         "lodash.rangeright": "^4.2.0",
         "lodash.reduce": "^4.6.0",
-        "luxon": "^3.4.0",
+        "luxon": "^3.4.1",
         "malihu-custom-scrollbar-plugin": "3.1.5",
         "mixpanel-browser": "^2.47.0",
         "moment": "^2.29.4",
@@ -12336,9 +12336,9 @@
       "integrity": "sha1-81ypHEk/e3PaDgdJUwTxezH4fuU="
     },
     "node_modules/luxon": {
-      "version": "3.4.0",
-      "resolved": "https://registry.npmjs.org/luxon/-/luxon-3.4.0.tgz",
-      "integrity": "sha512-7eDo4Pt7aGhoCheGFIuq4Xa2fJm4ZpmldpGhjTYBNUYNCN6TIEP6v7chwwwt3KRp7YR+rghbfvjyo3V5y9hgBw==",
+      "version": "3.4.1",
+      "resolved": "https://registry.npmjs.org/luxon/-/luxon-3.4.1.tgz",
+      "integrity": "sha512-2USspxOCXWGIKHwuQ9XElxPPYrDOJHDQ5DQ870CoD+CxJbBnRDIBCfhioUJJjct7BKOy80Ia8cVstIcIMb/0+Q==",
       "engines": {
         "node": ">=12"
       }
@@ -26903,9 +26903,9 @@
       "integrity": "sha1-81ypHEk/e3PaDgdJUwTxezH4fuU="
     },
     "luxon": {
-      "version": "3.4.0",
-      "resolved": "https://registry.npmjs.org/luxon/-/luxon-3.4.0.tgz",
-      "integrity": "sha512-7eDo4Pt7aGhoCheGFIuq4Xa2fJm4ZpmldpGhjTYBNUYNCN6TIEP6v7chwwwt3KRp7YR+rghbfvjyo3V5y9hgBw=="
+      "version": "3.4.1",
+      "resolved": "https://registry.npmjs.org/luxon/-/luxon-3.4.1.tgz",
+      "integrity": "sha512-2USspxOCXWGIKHwuQ9XElxPPYrDOJHDQ5DQ870CoD+CxJbBnRDIBCfhioUJJjct7BKOy80Ia8cVstIcIMb/0+Q=="
     },
     "make-dir": {
       "version": "4.0.0",
diff --git a/apps/block_scout_web/assets/package.json b/apps/block_scout_web/assets/package.json
index 4e7f8ca476b3..030c75b07638 100644
--- a/apps/block_scout_web/assets/package.json
+++ b/apps/block_scout_web/assets/package.json
@@ -56,7 +56,7 @@
     "lodash.omit": "^4.5.0",
     "lodash.rangeright": "^4.2.0",
     "lodash.reduce": "^4.6.0",
-    "luxon": "^3.4.0",
+    "luxon": "^3.4.1",
     "malihu-custom-scrollbar-plugin": "3.1.5",
     "mixpanel-browser": "^2.47.0",
     "moment": "^2.29.4",

From 0c9c61ca2a6fb8590d7d09fc67ee9f0a02eab223 Mon Sep 17 00:00:00 2001
From: Qwerty5Uiop <alex000010@bk.ru>
Date: Thu, 24 Aug 2023 16:44:11 +0300
Subject: [PATCH 334/909] Add ETHEREUM_JSONRPC_WAIT_PER_TIMEOUT env var

---
 CHANGELOG.md                                  | 1 +
 apps/ethereum_jsonrpc/config/config.exs       | 1 -
 apps/ethereum_jsonrpc/config/runtime/test.exs | 2 ++
 apps/ethereum_jsonrpc/config/test.exs         | 1 -
 config/runtime.exs                            | 3 +++
 docker-compose/envs/common-blockscout.env     | 1 +
 docker/Makefile                               | 3 +++
 7 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7696d9e77540..6c88fb385c1e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,7 @@
 
 - [#8181](https://github.com/blockscout/blockscout/pull/8181) - Insert current token balances placeholders along with historical
 - [#8210](https://github.com/blockscout/blockscout/pull/8210) - Drop address foreign keys
+- [#8292](https://github.com/blockscout/blockscout/pull/8292) - Add ETHEREUM_JSONRPC_WAIT_PER_TIMEOUT env var
 
 ### Fixes
 
diff --git a/apps/ethereum_jsonrpc/config/config.exs b/apps/ethereum_jsonrpc/config/config.exs
index e578ffbea78a..503b7a3828ed 100644
--- a/apps/ethereum_jsonrpc/config/config.exs
+++ b/apps/ethereum_jsonrpc/config/config.exs
@@ -6,7 +6,6 @@ config :ethereum_jsonrpc, EthereumJSONRPC.RequestCoordinator,
     duration: :timer.minutes(1),
     table: EthereumJSONRPC.RequestCoordinator.TimeoutCounter
   ],
-  wait_per_timeout: :timer.seconds(20),
   max_jitter: :timer.seconds(2)
 
 # Add this configuration to add global RPC request throttling.
diff --git a/apps/ethereum_jsonrpc/config/runtime/test.exs b/apps/ethereum_jsonrpc/config/runtime/test.exs
index e2043f6c1435..081c952dfc9d 100644
--- a/apps/ethereum_jsonrpc/config/runtime/test.exs
+++ b/apps/ethereum_jsonrpc/config/runtime/test.exs
@@ -2,6 +2,8 @@ import Config
 
 alias EthereumJSONRPC.Variant
 
+config :ethereum_jsonrpc, EthereumJSONRPC.RequestCoordinator, wait_per_timeout: 2
+
 variant = Variant.get()
 
 Code.require_file("#{variant}.exs", "#{__DIR__}/../../../explorer/config/test")
diff --git a/apps/ethereum_jsonrpc/config/test.exs b/apps/ethereum_jsonrpc/config/test.exs
index 0ed3de28b282..61e5f67398a0 100644
--- a/apps/ethereum_jsonrpc/config/test.exs
+++ b/apps/ethereum_jsonrpc/config/test.exs
@@ -6,7 +6,6 @@ config :ethereum_jsonrpc, EthereumJSONRPC.RequestCoordinator,
     duration: :timer.seconds(6),
     table: EthereumJSONRPC.RequestCoordinator.TimeoutCounter
   ],
-  wait_per_timeout: 2,
   max_jitter: 1,
   # This should not actually limit anything in tests, but it is here to enable the relevant code for testing
   throttle_rate_limit: 10_000,
diff --git a/config/runtime.exs b/config/runtime.exs
index 146c43349338..bc104efce14e 100644
--- a/config/runtime.exs
+++ b/config/runtime.exs
@@ -163,6 +163,9 @@ config :ethereum_jsonrpc, EthereumJSONRPC.Geth,
 config :ethereum_jsonrpc, EthereumJSONRPC.PendingTransaction,
   type: System.get_env("ETHEREUM_JSONRPC_PENDING_TRANSACTIONS_TYPE", "default")
 
+config :ethereum_jsonrpc, EthereumJSONRPC.RequestCoordinator,
+  wait_per_timeout: ConfigHelper.parse_time_env_var("ETHEREUM_JSONRPC_WAIT_PER_TIMEOUT", "20s")
+
 ################
 ### Explorer ###
 ################
diff --git a/docker-compose/envs/common-blockscout.env b/docker-compose/envs/common-blockscout.env
index ac9ee0e86ce4..65b40fd43f06 100644
--- a/docker-compose/envs/common-blockscout.env
+++ b/docker-compose/envs/common-blockscout.env
@@ -13,6 +13,7 @@ LOGO=/images/blockscout_logo.svg
 ETHEREUM_JSONRPC_TRANSPORT=http
 ETHEREUM_JSONRPC_DISABLE_ARCHIVE_BALANCES=false
 # ETHEREUM_JSONRPC_HTTP_HEADERS=
+# ETHEREUM_JSONRPC_WAIT_PER_TIMEOUT=
 IPC_PATH=
 NETWORK_PATH=/
 BLOCKSCOUT_HOST=
diff --git a/docker/Makefile b/docker/Makefile
index 1014310015df..3f948c710617 100644
--- a/docker/Makefile
+++ b/docker/Makefile
@@ -63,6 +63,9 @@ endif
 ifdef ETHEREUM_JSONRPC_HTTP_HEADERS
 	BLOCKSCOUT_CONTAINER_PARAMS += -e 'ETHEREUM_JSONRPC_HTTP_HEADERS=$(ETHEREUM_JSONRPC_HTTP_HEADERS)'
 endif
+ifdef ETHEREUM_JSONRPC_WAIT_PER_TIMEOUT
+	BLOCKSCOUT_CONTAINER_PARAMS += -e 'ETHEREUM_JSONRPC_WAIT_PER_TIMEOUT=$(ETHEREUM_JSONRPC_WAIT_PER_TIMEOUT)'
+endif
 ifdef IPC_PATH
 	BLOCKSCOUT_CONTAINER_PARAMS += -e 'IPC_PATH=$(IPC_PATH)'
 endif

From 54a0777aa44d19b96085a04891714ce900dc8dfd Mon Sep 17 00:00:00 2001
From: Victor Baranov <baranov.viktor.27@gmail.com>
Date: Thu, 24 Aug 2023 18:02:15 +0300
Subject: [PATCH 335/909] Add ETHEREUM_JSONRPC_TRACE_URL for Geth in
 docker-compose.yml (#8293)

* Add ETHEREUM_JSONRPC_TRACE_URL for Geth in docker-compose.yml

* Add ETHEREUM_JSONRPC_TRACE_URL for Geth in docker-compose.yml
---
 CHANGELOG.md                                                     | 1 +
 docker-compose/docker-compose-no-build-external-frontend.yml     | 1 +
 docker-compose/docker-compose-no-build-frontend.yml              | 1 +
 docker-compose/docker-compose-no-build-geth-clique-consensus.yml | 1 +
 docker-compose/docker-compose-no-build-geth.yml                  | 1 +
 5 files changed, 5 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7696d9e77540..a843a3b20722 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,7 @@
 
 ### Fixes
 
+- [#8293](https://github.com/blockscout/blockscout/pull/8293) - Add ETHEREUM_JSONRPC_TRACE_URL for Geth in docker-compose.yml
 - [#8240](https://github.com/blockscout/blockscout/pull/8240) - Refactor and fix paging params in API v2
 - [#8242](https://github.com/blockscout/blockscout/pull/8242) - Fixing visualizer service CORS issue when running docker-compose
 
diff --git a/docker-compose/docker-compose-no-build-external-frontend.yml b/docker-compose/docker-compose-no-build-external-frontend.yml
index 93170be47ee1..bc96e61f854d 100644
--- a/docker-compose/docker-compose-no-build-external-frontend.yml
+++ b/docker-compose/docker-compose-no-build-external-frontend.yml
@@ -31,6 +31,7 @@ services:
     environment:
         ETHEREUM_JSONRPC_VARIANT: 'ganache'
         ETHEREUM_JSONRPC_HTTP_URL: http://host.docker.internal:8545/
+        ETHEREUM_JSONRPC_TRACE_URL: http://host.docker.internal:8545/
         ETHEREUM_JSONRPC_WS_URL: ws://host.docker.internal:8545/
         INDEXER_DISABLE_INTERNAL_TRANSACTIONS_FETCHER: 'true'
         INDEXER_DISABLE_PENDING_TRANSACTIONS_FETCHER: 'true'
diff --git a/docker-compose/docker-compose-no-build-frontend.yml b/docker-compose/docker-compose-no-build-frontend.yml
index 76ae066b383a..663d580398dc 100644
--- a/docker-compose/docker-compose-no-build-frontend.yml
+++ b/docker-compose/docker-compose-no-build-frontend.yml
@@ -31,6 +31,7 @@ services:
     environment:
         ETHEREUM_JSONRPC_VARIANT: 'ganache'
         ETHEREUM_JSONRPC_HTTP_URL: http://host.docker.internal:8545/
+        ETHEREUM_JSONRPC_TRACE_URL: http://host.docker.internal:8545/
         ETHEREUM_JSONRPC_WS_URL: ws://host.docker.internal:8545/
         INDEXER_DISABLE_INTERNAL_TRANSACTIONS_FETCHER: 'true'
         INDEXER_DISABLE_PENDING_TRANSACTIONS_FETCHER: 'true'
diff --git a/docker-compose/docker-compose-no-build-geth-clique-consensus.yml b/docker-compose/docker-compose-no-build-geth-clique-consensus.yml
index bfcb31cb9d27..fb0924808f3e 100644
--- a/docker-compose/docker-compose-no-build-geth-clique-consensus.yml
+++ b/docker-compose/docker-compose-no-build-geth-clique-consensus.yml
@@ -32,6 +32,7 @@ services:
         ETHEREUM_JSONRPC_VARIANT: 'geth'
         BLOCK_TRANSFORMER: 'clique'
         ETHEREUM_JSONRPC_HTTP_URL: http://host.docker.internal:8545/
+        ETHEREUM_JSONRPC_TRACE_URL: http://host.docker.internal:8545/
         DATABASE_URL: postgresql://postgres:@host.docker.internal:7432/blockscout?ssl=false
         ECTO_USE_SSL: 'false'
         SECRET_KEY_BASE: '56NtB48ear7+wMSf0IQuWDAAazhpb31qyc7GiyspBP2vh7t5zlCsF5QDv76chXeN'
diff --git a/docker-compose/docker-compose-no-build-geth.yml b/docker-compose/docker-compose-no-build-geth.yml
index d8aa27370019..acd74b684871 100644
--- a/docker-compose/docker-compose-no-build-geth.yml
+++ b/docker-compose/docker-compose-no-build-geth.yml
@@ -31,6 +31,7 @@ services:
     environment:
         ETHEREUM_JSONRPC_VARIANT: 'geth'
         ETHEREUM_JSONRPC_HTTP_URL: http://host.docker.internal:8545/
+        ETHEREUM_JSONRPC_TRACE_URL: http://host.docker.internal:8545/
         DATABASE_URL: postgresql://postgres:@host.docker.internal:7432/blockscout?ssl=false
         ECTO_USE_SSL: 'false'
         SECRET_KEY_BASE: '56NtB48ear7+wMSf0IQuWDAAazhpb31qyc7GiyspBP2vh7t5zlCsF5QDv76chXeN'

From ea7e5c201dfa5b50b1f1c5df9aaf9702336071d6 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 24 Aug 2023 18:24:53 +0000
Subject: [PATCH 336/909] Bump chart.js from 4.3.3 to 4.4.0 in
 /apps/block_scout_web/assets

Bumps [chart.js](https://github.com/chartjs/Chart.js) from 4.3.3 to 4.4.0.
- [Release notes](https://github.com/chartjs/Chart.js/releases)
- [Commits](https://github.com/chartjs/Chart.js/compare/v4.3.3...v4.4.0)

---
updated-dependencies:
- dependency-name: chart.js
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 apps/block_scout_web/assets/package-lock.json | 14 +++++++-------
 apps/block_scout_web/assets/package.json      |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/apps/block_scout_web/assets/package-lock.json b/apps/block_scout_web/assets/package-lock.json
index 421a0861ea94..bc89155a67a3 100644
--- a/apps/block_scout_web/assets/package-lock.json
+++ b/apps/block_scout_web/assets/package-lock.json
@@ -14,7 +14,7 @@
         "assert": "^2.0.0",
         "bignumber.js": "^9.1.1",
         "bootstrap": "^4.6.0",
-        "chart.js": "^4.3.3",
+        "chart.js": "^4.4.0",
         "chartjs-adapter-luxon": "^1.3.1",
         "clipboard": "^2.0.11",
         "core-js": "^3.32.1",
@@ -5435,9 +5435,9 @@
       }
     },
     "node_modules/chart.js": {
-      "version": "4.3.3",
-      "resolved": "https://registry.npmjs.org/chart.js/-/chart.js-4.3.3.tgz",
-      "integrity": "sha512-aTk7pBw+x6sQYhon/NR3ikfUJuym/LdgpTlgZRe2PaEhjUMKBKyNaFCMVRAyTEWYFNO7qRu7iQVqOw/OqzxZxQ==",
+      "version": "4.4.0",
+      "resolved": "https://registry.npmjs.org/chart.js/-/chart.js-4.4.0.tgz",
+      "integrity": "sha512-vQEj6d+z0dcsKLlQvbKIMYFHd3t8W/7L2vfJIbYcfyPcRx92CsHqECpueN8qVGNlKyDcr5wBrYAYKnfu/9Q1hQ==",
       "dependencies": {
         "@kurkle/color": "^0.3.0"
       },
@@ -21583,9 +21583,9 @@
       "dev": true
     },
     "chart.js": {
-      "version": "4.3.3",
-      "resolved": "https://registry.npmjs.org/chart.js/-/chart.js-4.3.3.tgz",
-      "integrity": "sha512-aTk7pBw+x6sQYhon/NR3ikfUJuym/LdgpTlgZRe2PaEhjUMKBKyNaFCMVRAyTEWYFNO7qRu7iQVqOw/OqzxZxQ==",
+      "version": "4.4.0",
+      "resolved": "https://registry.npmjs.org/chart.js/-/chart.js-4.4.0.tgz",
+      "integrity": "sha512-vQEj6d+z0dcsKLlQvbKIMYFHd3t8W/7L2vfJIbYcfyPcRx92CsHqECpueN8qVGNlKyDcr5wBrYAYKnfu/9Q1hQ==",
       "requires": {
         "@kurkle/color": "^0.3.0"
       }
diff --git a/apps/block_scout_web/assets/package.json b/apps/block_scout_web/assets/package.json
index 030c75b07638..9cfc0376ba19 100644
--- a/apps/block_scout_web/assets/package.json
+++ b/apps/block_scout_web/assets/package.json
@@ -26,7 +26,7 @@
     "assert": "^2.0.0",
     "bignumber.js": "^9.1.1",
     "bootstrap": "^4.6.0",
-    "chart.js": "^4.3.3",
+    "chart.js": "^4.4.0",
     "chartjs-adapter-luxon": "^1.3.1",
     "clipboard": "^2.0.11",
     "core-js": "^3.32.1",

From 6f229554fa48d0f91e1bcc8d773cbae7e29aa6ab Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 24 Aug 2023 18:25:12 +0000
Subject: [PATCH 337/909] Bump jest from 29.6.3 to 29.6.4 in
 /apps/block_scout_web/assets

Bumps [jest](https://github.com/jestjs/jest/tree/HEAD/packages/jest) from 29.6.3 to 29.6.4.
- [Release notes](https://github.com/jestjs/jest/releases)
- [Changelog](https://github.com/jestjs/jest/blob/main/CHANGELOG.md)
- [Commits](https://github.com/jestjs/jest/commits/v29.6.4/packages/jest)

---
updated-dependencies:
- dependency-name: jest
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 apps/block_scout_web/assets/package-lock.json | 662 +++++++++---------
 apps/block_scout_web/assets/package.json      |   2 +-
 2 files changed, 332 insertions(+), 332 deletions(-)

diff --git a/apps/block_scout_web/assets/package-lock.json b/apps/block_scout_web/assets/package-lock.json
index 421a0861ea94..921d8b570e20 100644
--- a/apps/block_scout_web/assets/package-lock.json
+++ b/apps/block_scout_web/assets/package-lock.json
@@ -84,7 +84,7 @@
         "eslint-plugin-node": "^11.1.0",
         "eslint-plugin-promise": "^6.1.1",
         "file-loader": "^6.2.0",
-        "jest": "^29.6.3",
+        "jest": "^29.6.4",
         "jest-environment-jsdom": "^29.6.3",
         "mini-css-extract-plugin": "^2.7.6",
         "postcss": "^8.4.28",
@@ -2578,9 +2578,9 @@
       }
     },
     "node_modules/@jest/console": {
-      "version": "29.6.3",
-      "resolved": "https://registry.npmjs.org/@jest/console/-/console-29.6.3.tgz",
-      "integrity": "sha512-ukZbHAdDH4ktZIOKvWs1juAXhiVAdvCyM8zv4S/7Ii3vJSDvMW5k+wOVGMQmHLHUFw3Ko63ZQNy7NI6PSlsD5w==",
+      "version": "29.6.4",
+      "resolved": "https://registry.npmjs.org/@jest/console/-/console-29.6.4.tgz",
+      "integrity": "sha512-wNK6gC0Ha9QeEPSkeJedQuTQqxZYnDPuDcDhVuVatRvMkL4D0VTvFVZj+Yuh6caG2aOfzkUZ36KtCmLNtR02hw==",
       "dev": true,
       "dependencies": {
         "@jest/types": "^29.6.3",
@@ -2665,15 +2665,15 @@
       }
     },
     "node_modules/@jest/core": {
-      "version": "29.6.3",
-      "resolved": "https://registry.npmjs.org/@jest/core/-/core-29.6.3.tgz",
-      "integrity": "sha512-skV1XrfNxfagmjRUrk2FyN5/2YwIzdWVVBa/orUfbLvQUANXxERq2pTvY0I+FinWHjDKB2HRmpveUiph4X0TJw==",
+      "version": "29.6.4",
+      "resolved": "https://registry.npmjs.org/@jest/core/-/core-29.6.4.tgz",
+      "integrity": "sha512-U/vq5ccNTSVgYH7mHnodHmCffGWHJnz/E1BEWlLuK5pM4FZmGfBn/nrJGLjUsSmyx3otCeqc1T31F4y08AMDLg==",
       "dev": true,
       "dependencies": {
-        "@jest/console": "^29.6.3",
-        "@jest/reporters": "^29.6.3",
-        "@jest/test-result": "^29.6.3",
-        "@jest/transform": "^29.6.3",
+        "@jest/console": "^29.6.4",
+        "@jest/reporters": "^29.6.4",
+        "@jest/test-result": "^29.6.4",
+        "@jest/transform": "^29.6.4",
         "@jest/types": "^29.6.3",
         "@types/node": "*",
         "ansi-escapes": "^4.2.1",
@@ -2682,18 +2682,18 @@
         "exit": "^0.1.2",
         "graceful-fs": "^4.2.9",
         "jest-changed-files": "^29.6.3",
-        "jest-config": "^29.6.3",
-        "jest-haste-map": "^29.6.3",
+        "jest-config": "^29.6.4",
+        "jest-haste-map": "^29.6.4",
         "jest-message-util": "^29.6.3",
         "jest-regex-util": "^29.6.3",
-        "jest-resolve": "^29.6.3",
-        "jest-resolve-dependencies": "^29.6.3",
-        "jest-runner": "^29.6.3",
-        "jest-runtime": "^29.6.3",
-        "jest-snapshot": "^29.6.3",
+        "jest-resolve": "^29.6.4",
+        "jest-resolve-dependencies": "^29.6.4",
+        "jest-runner": "^29.6.4",
+        "jest-runtime": "^29.6.4",
+        "jest-snapshot": "^29.6.4",
         "jest-util": "^29.6.3",
         "jest-validate": "^29.6.3",
-        "jest-watcher": "^29.6.3",
+        "jest-watcher": "^29.6.4",
         "micromatch": "^4.0.4",
         "pretty-format": "^29.6.3",
         "slash": "^3.0.0",
@@ -2782,12 +2782,12 @@
       }
     },
     "node_modules/@jest/environment": {
-      "version": "29.6.3",
-      "resolved": "https://registry.npmjs.org/@jest/environment/-/environment-29.6.3.tgz",
-      "integrity": "sha512-u/u3cCztYCfgBiGHsamqP5x+XvucftOGPbf5RJQxfpeC1y4AL8pCjKvPDA3oCmdhZYPgk5AE0VOD/flweR69WA==",
+      "version": "29.6.4",
+      "resolved": "https://registry.npmjs.org/@jest/environment/-/environment-29.6.4.tgz",
+      "integrity": "sha512-sQ0SULEjA1XUTHmkBRl7A1dyITM9yb1yb3ZNKPX3KlTd6IG7mWUe3e2yfExtC2Zz1Q+mMckOLHmL/qLiuQJrBQ==",
       "dev": true,
       "dependencies": {
-        "@jest/fake-timers": "^29.6.3",
+        "@jest/fake-timers": "^29.6.4",
         "@jest/types": "^29.6.3",
         "@types/node": "*",
         "jest-mock": "^29.6.3"
@@ -2797,22 +2797,22 @@
       }
     },
     "node_modules/@jest/expect": {
-      "version": "29.6.3",
-      "resolved": "https://registry.npmjs.org/@jest/expect/-/expect-29.6.3.tgz",
-      "integrity": "sha512-Ic08XbI2jlg6rECy+CGwk/8NDa6VE7UmIG6++9OTPAMnQmNGY28hu69Nf629CWv6T7YMODLbONxDFKdmQeI9FA==",
+      "version": "29.6.4",
+      "resolved": "https://registry.npmjs.org/@jest/expect/-/expect-29.6.4.tgz",
+      "integrity": "sha512-Warhsa7d23+3X5bLbrbYvaehcgX5TLYhI03JKoedTiI8uJU4IhqYBWF7OSSgUyz4IgLpUYPkK0AehA5/fRclAA==",
       "dev": true,
       "dependencies": {
-        "expect": "^29.6.3",
-        "jest-snapshot": "^29.6.3"
+        "expect": "^29.6.4",
+        "jest-snapshot": "^29.6.4"
       },
       "engines": {
         "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
     "node_modules/@jest/expect-utils": {
-      "version": "29.6.3",
-      "resolved": "https://registry.npmjs.org/@jest/expect-utils/-/expect-utils-29.6.3.tgz",
-      "integrity": "sha512-nvOEW4YoqRKD9HBJ9OJ6przvIvP9qilp5nAn1462P5ZlL/MM9SgPEZFyjTGPfs7QkocdUsJa6KjHhyRn4ueItA==",
+      "version": "29.6.4",
+      "resolved": "https://registry.npmjs.org/@jest/expect-utils/-/expect-utils-29.6.4.tgz",
+      "integrity": "sha512-FEhkJhqtvBwgSpiTrocquJCdXPsyvNKcl/n7A3u7X4pVoF4bswm11c9d4AV+kfq2Gpv/mM8x7E7DsRvH+djkrg==",
       "dev": true,
       "dependencies": {
         "jest-get-type": "^29.6.3"
@@ -2822,9 +2822,9 @@
       }
     },
     "node_modules/@jest/fake-timers": {
-      "version": "29.6.3",
-      "resolved": "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-29.6.3.tgz",
-      "integrity": "sha512-pa1wmqvbj6eX0nMvOM2VDAWvJOI5A/Mk3l8O7n7EsAh71sMZblaKO9iT4GjIj0LwwK3CP/Jp1ypEV0x3m89RvA==",
+      "version": "29.6.4",
+      "resolved": "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-29.6.4.tgz",
+      "integrity": "sha512-6UkCwzoBK60edXIIWb0/KWkuj7R7Qq91vVInOe3De6DSpaEiqjKcJw4F7XUet24Wupahj9J6PlR09JqJ5ySDHw==",
       "dev": true,
       "dependencies": {
         "@jest/types": "^29.6.3",
@@ -2839,13 +2839,13 @@
       }
     },
     "node_modules/@jest/globals": {
-      "version": "29.6.3",
-      "resolved": "https://registry.npmjs.org/@jest/globals/-/globals-29.6.3.tgz",
-      "integrity": "sha512-RB+uI+CZMHntzlnOPlll5x/jgRff3LEPl/td/jzMXiIgR0iIhKq9qm1HLU+EC52NuoVy/1swit/sDGjVn4bc6A==",
+      "version": "29.6.4",
+      "resolved": "https://registry.npmjs.org/@jest/globals/-/globals-29.6.4.tgz",
+      "integrity": "sha512-wVIn5bdtjlChhXAzVXavcY/3PEjf4VqM174BM3eGL5kMxLiZD5CLnbmkEyA1Dwh9q8XjP6E8RwjBsY/iCWrWsA==",
       "dev": true,
       "dependencies": {
-        "@jest/environment": "^29.6.3",
-        "@jest/expect": "^29.6.3",
+        "@jest/environment": "^29.6.4",
+        "@jest/expect": "^29.6.4",
         "@jest/types": "^29.6.3",
         "jest-mock": "^29.6.3"
       },
@@ -2854,15 +2854,15 @@
       }
     },
     "node_modules/@jest/reporters": {
-      "version": "29.6.3",
-      "resolved": "https://registry.npmjs.org/@jest/reporters/-/reporters-29.6.3.tgz",
-      "integrity": "sha512-kGz59zMi0GkVjD2CJeYWG9k6cvj7eBqt9aDAqo2rcCLRTYlvQ62Gu/n+tOmJMBHGjzeijjuCENjzTyYBgrtLUw==",
+      "version": "29.6.4",
+      "resolved": "https://registry.npmjs.org/@jest/reporters/-/reporters-29.6.4.tgz",
+      "integrity": "sha512-sxUjWxm7QdchdrD3NfWKrL8FBsortZeibSJv4XLjESOOjSUOkjQcb0ZHJwfhEGIvBvTluTzfG2yZWZhkrXJu8g==",
       "dev": true,
       "dependencies": {
         "@bcoe/v8-coverage": "^0.2.3",
-        "@jest/console": "^29.6.3",
-        "@jest/test-result": "^29.6.3",
-        "@jest/transform": "^29.6.3",
+        "@jest/console": "^29.6.4",
+        "@jest/test-result": "^29.6.4",
+        "@jest/transform": "^29.6.4",
         "@jest/types": "^29.6.3",
         "@jridgewell/trace-mapping": "^0.3.18",
         "@types/node": "*",
@@ -2878,7 +2878,7 @@
         "istanbul-reports": "^3.1.3",
         "jest-message-util": "^29.6.3",
         "jest-util": "^29.6.3",
-        "jest-worker": "^29.6.3",
+        "jest-worker": "^29.6.4",
         "slash": "^3.0.0",
         "string-length": "^4.0.1",
         "strip-ansi": "^6.0.0",
@@ -2955,9 +2955,9 @@
       }
     },
     "node_modules/@jest/reporters/node_modules/jest-worker": {
-      "version": "29.6.3",
-      "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-29.6.3.tgz",
-      "integrity": "sha512-wacANXecZ/GbQakpf2CClrqrlwsYYDSXFd4fIGdL+dXpM2GWoJ+6bhQ7vR3TKi3+gkSfBkjy1/khH/WrYS4Q6g==",
+      "version": "29.6.4",
+      "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-29.6.4.tgz",
+      "integrity": "sha512-6dpvFV4WjcWbDVGgHTWo/aupl8/LbBx2NSKfiwqf79xC/yeJjKHT1+StcKy/2KTmW16hE68ccKVOtXf+WZGz7Q==",
       "dev": true,
       "dependencies": {
         "@types/node": "*",
@@ -3023,12 +3023,12 @@
       }
     },
     "node_modules/@jest/test-result": {
-      "version": "29.6.3",
-      "resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-29.6.3.tgz",
-      "integrity": "sha512-k7ZZaNvOSMBHPZYiy0kuiaFoyansR5QnTwDux1EjK3kD5iWpRVyJIJ0RAIV39SThafchuW59vra7F8mdy5Hfgw==",
+      "version": "29.6.4",
+      "resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-29.6.4.tgz",
+      "integrity": "sha512-uQ1C0AUEN90/dsyEirgMLlouROgSY+Wc/JanVVk0OiUKa5UFh7sJpMEM3aoUBAz2BRNvUJ8j3d294WFuRxSyOQ==",
       "dev": true,
       "dependencies": {
-        "@jest/console": "^29.6.3",
+        "@jest/console": "^29.6.4",
         "@jest/types": "^29.6.3",
         "@types/istanbul-lib-coverage": "^2.0.0",
         "collect-v8-coverage": "^1.0.0"
@@ -3038,14 +3038,14 @@
       }
     },
     "node_modules/@jest/test-sequencer": {
-      "version": "29.6.3",
-      "resolved": "https://registry.npmjs.org/@jest/test-sequencer/-/test-sequencer-29.6.3.tgz",
-      "integrity": "sha512-/SmijaAU2TY9ComFGIYa6Z+fmKqQMnqs2Nmwb0P/Z/tROdZ7M0iruES1EaaU9PBf8o9uED5xzaJ3YPFEIcDgAg==",
+      "version": "29.6.4",
+      "resolved": "https://registry.npmjs.org/@jest/test-sequencer/-/test-sequencer-29.6.4.tgz",
+      "integrity": "sha512-E84M6LbpcRq3fT4ckfKs9ryVanwkaIB0Ws9bw3/yP4seRLg/VaCZ/LgW0MCq5wwk4/iP/qnilD41aj2fsw2RMg==",
       "dev": true,
       "dependencies": {
-        "@jest/test-result": "^29.6.3",
+        "@jest/test-result": "^29.6.4",
         "graceful-fs": "^4.2.9",
-        "jest-haste-map": "^29.6.3",
+        "jest-haste-map": "^29.6.4",
         "slash": "^3.0.0"
       },
       "engines": {
@@ -3053,9 +3053,9 @@
       }
     },
     "node_modules/@jest/transform": {
-      "version": "29.6.3",
-      "resolved": "https://registry.npmjs.org/@jest/transform/-/transform-29.6.3.tgz",
-      "integrity": "sha512-dPIc3DsvMZ/S8ut4L2ViCj265mKO0owB0wfzBv2oGzL9pQ+iRvJewHqLBmsGb7XFb5UotWIEtvY5A/lnylaIoQ==",
+      "version": "29.6.4",
+      "resolved": "https://registry.npmjs.org/@jest/transform/-/transform-29.6.4.tgz",
+      "integrity": "sha512-8thgRSiXUqtr/pPGY/OsyHuMjGyhVnWrFAwoxmIemlBuiMyU1WFs0tXoNxzcr4A4uErs/ABre76SGmrr5ab/AA==",
       "dev": true,
       "dependencies": {
         "@babel/core": "^7.11.6",
@@ -3066,7 +3066,7 @@
         "convert-source-map": "^2.0.0",
         "fast-json-stable-stringify": "^2.1.0",
         "graceful-fs": "^4.2.9",
-        "jest-haste-map": "^29.6.3",
+        "jest-haste-map": "^29.6.4",
         "jest-regex-util": "^29.6.3",
         "jest-util": "^29.6.3",
         "micromatch": "^4.0.4",
@@ -4564,12 +4564,12 @@
       "integrity": "sha512-xh1Rl34h6Fi1DC2WWKfxUTVqRsNnr6LsKz2+hfwDxQJWmrx8+c7ylaqBMcHfl1U1r2dsifOvKX3LQuLNZ+XSvA=="
     },
     "node_modules/babel-jest": {
-      "version": "29.6.3",
-      "resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-29.6.3.tgz",
-      "integrity": "sha512-1Ne93zZZEy5XmTa4Q+W5+zxBrDpExX8E3iy+xJJ+24ewlfo/T3qHfQJCzi/MMVFmBQDNxtRR/Gfd2dwb/0yrQw==",
+      "version": "29.6.4",
+      "resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-29.6.4.tgz",
+      "integrity": "sha512-meLj23UlSLddj6PC+YTOFRgDAtjnZom8w/ACsrx0gtPtv5cJZk0A5Unk5bV4wixD7XaPCN1fQvpww8czkZURmw==",
       "dev": true,
       "dependencies": {
-        "@jest/transform": "^29.6.3",
+        "@jest/transform": "^29.6.4",
         "@types/babel__core": "^7.1.14",
         "babel-plugin-istanbul": "^6.1.1",
         "babel-preset-jest": "^29.6.3",
@@ -8326,14 +8326,14 @@
       }
     },
     "node_modules/expect": {
-      "version": "29.6.3",
-      "resolved": "https://registry.npmjs.org/expect/-/expect-29.6.3.tgz",
-      "integrity": "sha512-x1vY4LlEMWUYVZQrFi4ZANXFwqYbJ/JNQspLVvzhW2BNY28aNcXMQH6imBbt+RBf5sVRTodYHXtSP/TLEU0Dxw==",
+      "version": "29.6.4",
+      "resolved": "https://registry.npmjs.org/expect/-/expect-29.6.4.tgz",
+      "integrity": "sha512-F2W2UyQ8XYyftHT57dtfg8Ue3X5qLgm2sSug0ivvLRH/VKNRL/pDxg/TH7zVzbQB0tu80clNFy6LU7OS/VSEKA==",
       "dev": true,
       "dependencies": {
-        "@jest/expect-utils": "^29.6.3",
+        "@jest/expect-utils": "^29.6.4",
         "jest-get-type": "^29.6.3",
-        "jest-matcher-utils": "^29.6.3",
+        "jest-matcher-utils": "^29.6.4",
         "jest-message-util": "^29.6.3",
         "jest-util": "^29.6.3"
       },
@@ -10040,15 +10040,15 @@
       }
     },
     "node_modules/jest": {
-      "version": "29.6.3",
-      "resolved": "https://registry.npmjs.org/jest/-/jest-29.6.3.tgz",
-      "integrity": "sha512-alueLuoPCDNHFcFGmgETR4KpQ+0ff3qVaiJwxQM4B5sC0CvXcgg4PEi7xrDkxuItDmdz/FVc7SSit4KEu8GRvw==",
+      "version": "29.6.4",
+      "resolved": "https://registry.npmjs.org/jest/-/jest-29.6.4.tgz",
+      "integrity": "sha512-tEFhVQFF/bzoYV1YuGyzLPZ6vlPrdfvDmmAxudA1dLEuiztqg2Rkx20vkKY32xiDROcD2KXlgZ7Cu8RPeEHRKw==",
       "dev": true,
       "dependencies": {
-        "@jest/core": "^29.6.3",
+        "@jest/core": "^29.6.4",
         "@jest/types": "^29.6.3",
         "import-local": "^3.0.2",
-        "jest-cli": "^29.6.3"
+        "jest-cli": "^29.6.4"
       },
       "bin": {
         "jest": "bin/jest.js"
@@ -10080,14 +10080,14 @@
       }
     },
     "node_modules/jest-circus": {
-      "version": "29.6.3",
-      "resolved": "https://registry.npmjs.org/jest-circus/-/jest-circus-29.6.3.tgz",
-      "integrity": "sha512-p0R5YqZEMnOpHqHLWRSjm2z/0p6RNsrNE/GRRT3eli8QGOAozj6Ys/3Tv+Ej+IfltJoSPwcQ6/hOCRkNlxLLCw==",
+      "version": "29.6.4",
+      "resolved": "https://registry.npmjs.org/jest-circus/-/jest-circus-29.6.4.tgz",
+      "integrity": "sha512-YXNrRyntVUgDfZbjXWBMPslX1mQ8MrSG0oM/Y06j9EYubODIyHWP8hMUbjbZ19M3M+zamqEur7O80HODwACoJw==",
       "dev": true,
       "dependencies": {
-        "@jest/environment": "^29.6.3",
-        "@jest/expect": "^29.6.3",
-        "@jest/test-result": "^29.6.3",
+        "@jest/environment": "^29.6.4",
+        "@jest/expect": "^29.6.4",
+        "@jest/test-result": "^29.6.4",
         "@jest/types": "^29.6.3",
         "@types/node": "*",
         "chalk": "^4.0.0",
@@ -10095,10 +10095,10 @@
         "dedent": "^1.0.0",
         "is-generator-fn": "^2.0.0",
         "jest-each": "^29.6.3",
-        "jest-matcher-utils": "^29.6.3",
+        "jest-matcher-utils": "^29.6.4",
         "jest-message-util": "^29.6.3",
-        "jest-runtime": "^29.6.3",
-        "jest-snapshot": "^29.6.3",
+        "jest-runtime": "^29.6.4",
+        "jest-snapshot": "^29.6.4",
         "jest-util": "^29.6.3",
         "p-limit": "^3.1.0",
         "pretty-format": "^29.6.3",
@@ -10181,19 +10181,19 @@
       }
     },
     "node_modules/jest-cli": {
-      "version": "29.6.3",
-      "resolved": "https://registry.npmjs.org/jest-cli/-/jest-cli-29.6.3.tgz",
-      "integrity": "sha512-KuPdXUPXQIf0t6DvmG8MV4QyhcjR1a6ruKl3YL7aGn/AQ8JkROwFkWzEpDIpt11Qy188dHbRm8WjwMsV/4nmnQ==",
+      "version": "29.6.4",
+      "resolved": "https://registry.npmjs.org/jest-cli/-/jest-cli-29.6.4.tgz",
+      "integrity": "sha512-+uMCQ7oizMmh8ZwRfZzKIEszFY9ksjjEQnTEMTaL7fYiL3Kw4XhqT9bYh+A4DQKUb67hZn2KbtEnDuHvcgK4pQ==",
       "dev": true,
       "dependencies": {
-        "@jest/core": "^29.6.3",
-        "@jest/test-result": "^29.6.3",
+        "@jest/core": "^29.6.4",
+        "@jest/test-result": "^29.6.4",
         "@jest/types": "^29.6.3",
         "chalk": "^4.0.0",
         "exit": "^0.1.2",
         "graceful-fs": "^4.2.9",
         "import-local": "^3.0.2",
-        "jest-config": "^29.6.3",
+        "jest-config": "^29.6.4",
         "jest-util": "^29.6.3",
         "jest-validate": "^29.6.3",
         "prompts": "^2.0.1",
@@ -10285,26 +10285,26 @@
       }
     },
     "node_modules/jest-config": {
-      "version": "29.6.3",
-      "resolved": "https://registry.npmjs.org/jest-config/-/jest-config-29.6.3.tgz",
-      "integrity": "sha512-nb9bOq2aEqogbyL4F9mLkAeQGAgNt7Uz6U59YtQDIxFPiL7Ejgq0YIrp78oyEHD6H4CIV/k7mFrK7eFDzUJ69w==",
+      "version": "29.6.4",
+      "resolved": "https://registry.npmjs.org/jest-config/-/jest-config-29.6.4.tgz",
+      "integrity": "sha512-JWohr3i9m2cVpBumQFv2akMEnFEPVOh+9L2xIBJhJ0zOaci2ZXuKJj0tgMKQCBZAKA09H049IR4HVS/43Qb19A==",
       "dev": true,
       "dependencies": {
         "@babel/core": "^7.11.6",
-        "@jest/test-sequencer": "^29.6.3",
+        "@jest/test-sequencer": "^29.6.4",
         "@jest/types": "^29.6.3",
-        "babel-jest": "^29.6.3",
+        "babel-jest": "^29.6.4",
         "chalk": "^4.0.0",
         "ci-info": "^3.2.0",
         "deepmerge": "^4.2.2",
         "glob": "^7.1.3",
         "graceful-fs": "^4.2.9",
-        "jest-circus": "^29.6.3",
-        "jest-environment-node": "^29.6.3",
+        "jest-circus": "^29.6.4",
+        "jest-environment-node": "^29.6.4",
         "jest-get-type": "^29.6.3",
         "jest-regex-util": "^29.6.3",
-        "jest-resolve": "^29.6.3",
-        "jest-runner": "^29.6.3",
+        "jest-resolve": "^29.6.4",
+        "jest-runner": "^29.6.4",
         "jest-util": "^29.6.3",
         "jest-validate": "^29.6.3",
         "micromatch": "^4.0.4",
@@ -10400,9 +10400,9 @@
       }
     },
     "node_modules/jest-diff": {
-      "version": "29.6.3",
-      "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-29.6.3.tgz",
-      "integrity": "sha512-3sw+AdWnwH9sSNohMRKA7JiYUJSRr/WS6+sEFfBuhxU5V5GlEVKfvUn8JuMHE0wqKowemR1C2aHy8VtXbaV8dQ==",
+      "version": "29.6.4",
+      "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-29.6.4.tgz",
+      "integrity": "sha512-9F48UxR9e4XOEZvoUXEHSWY4qC4zERJaOfrbBg9JpbJOO43R1vN76REt/aMGZoY6GD5g84nnJiBIVlscegefpw==",
       "dev": true,
       "dependencies": {
         "chalk": "^4.0.0",
@@ -10610,13 +10610,13 @@
       }
     },
     "node_modules/jest-environment-node": {
-      "version": "29.6.3",
-      "resolved": "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-29.6.3.tgz",
-      "integrity": "sha512-PKl7upfPJXMYbWpD+60o4HP86KvFO2c9dZ+Zr6wUzsG5xcPx/65o3ArNgHW5M0RFvLYdW4/aieR4JSooD0a2ew==",
+      "version": "29.6.4",
+      "resolved": "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-29.6.4.tgz",
+      "integrity": "sha512-i7SbpH2dEIFGNmxGCpSc2w9cA4qVD+wfvg2ZnfQ7XVrKL0NA5uDVBIiGH8SR4F0dKEv/0qI5r+aDomDf04DpEQ==",
       "dev": true,
       "dependencies": {
-        "@jest/environment": "^29.6.3",
-        "@jest/fake-timers": "^29.6.3",
+        "@jest/environment": "^29.6.4",
+        "@jest/fake-timers": "^29.6.4",
         "@jest/types": "^29.6.3",
         "@types/node": "*",
         "jest-mock": "^29.6.3",
@@ -10636,9 +10636,9 @@
       }
     },
     "node_modules/jest-haste-map": {
-      "version": "29.6.3",
-      "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-29.6.3.tgz",
-      "integrity": "sha512-GecR5YavfjkhOytEFHAeI6aWWG3f/cOKNB1YJvj/B76xAmeVjy4zJUYobGF030cRmKaO1FBw3V8CZZ6KVh9ZSw==",
+      "version": "29.6.4",
+      "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-29.6.4.tgz",
+      "integrity": "sha512-12Ad+VNTDHxKf7k+M65sviyynRoZYuL1/GTuhEVb8RYsNSNln71nANRb/faSyWvx0j+gHcivChXHIoMJrGYjog==",
       "dev": true,
       "dependencies": {
         "@jest/types": "^29.6.3",
@@ -10649,7 +10649,7 @@
         "graceful-fs": "^4.2.9",
         "jest-regex-util": "^29.6.3",
         "jest-util": "^29.6.3",
-        "jest-worker": "^29.6.3",
+        "jest-worker": "^29.6.4",
         "micromatch": "^4.0.4",
         "walker": "^1.0.8"
       },
@@ -10670,9 +10670,9 @@
       }
     },
     "node_modules/jest-haste-map/node_modules/jest-worker": {
-      "version": "29.6.3",
-      "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-29.6.3.tgz",
-      "integrity": "sha512-wacANXecZ/GbQakpf2CClrqrlwsYYDSXFd4fIGdL+dXpM2GWoJ+6bhQ7vR3TKi3+gkSfBkjy1/khH/WrYS4Q6g==",
+      "version": "29.6.4",
+      "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-29.6.4.tgz",
+      "integrity": "sha512-6dpvFV4WjcWbDVGgHTWo/aupl8/LbBx2NSKfiwqf79xC/yeJjKHT1+StcKy/2KTmW16hE68ccKVOtXf+WZGz7Q==",
       "dev": true,
       "dependencies": {
         "@types/node": "*",
@@ -10713,13 +10713,13 @@
       }
     },
     "node_modules/jest-matcher-utils": {
-      "version": "29.6.3",
-      "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-29.6.3.tgz",
-      "integrity": "sha512-6ZrMYINZdwduSt5Xu18/n49O1IgXdjsfG7NEZaQws9k69eTKWKcVbJBw/MZsjOZe2sSyJFmuzh8042XWwl54Zg==",
+      "version": "29.6.4",
+      "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-29.6.4.tgz",
+      "integrity": "sha512-KSzwyzGvK4HcfnserYqJHYi7sZVqdREJ9DMPAKVbS98JsIAvumihaNUbjrWw0St7p9IY7A9UskCW5MYlGmBQFQ==",
       "dev": true,
       "dependencies": {
         "chalk": "^4.0.0",
-        "jest-diff": "^29.6.3",
+        "jest-diff": "^29.6.4",
         "jest-get-type": "^29.6.3",
         "pretty-format": "^29.6.3"
       },
@@ -10928,14 +10928,14 @@
       }
     },
     "node_modules/jest-resolve": {
-      "version": "29.6.3",
-      "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-29.6.3.tgz",
-      "integrity": "sha512-WMXwxhvzDeA/J+9jz1i8ZKGmbw/n+s988EiUvRI4egM+eTn31Hb5v10Re3slG3/qxntkBt2/6GkQVDGu6Bwyhw==",
+      "version": "29.6.4",
+      "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-29.6.4.tgz",
+      "integrity": "sha512-fPRq+0vcxsuGlG0O3gyoqGTAxasagOxEuyoxHeyxaZbc9QNek0AmJWSkhjlMG+mTsj+8knc/mWb3fXlRNVih7Q==",
       "dev": true,
       "dependencies": {
         "chalk": "^4.0.0",
         "graceful-fs": "^4.2.9",
-        "jest-haste-map": "^29.6.3",
+        "jest-haste-map": "^29.6.4",
         "jest-pnp-resolver": "^1.2.2",
         "jest-util": "^29.6.3",
         "jest-validate": "^29.6.3",
@@ -10948,13 +10948,13 @@
       }
     },
     "node_modules/jest-resolve-dependencies": {
-      "version": "29.6.3",
-      "resolved": "https://registry.npmjs.org/jest-resolve-dependencies/-/jest-resolve-dependencies-29.6.3.tgz",
-      "integrity": "sha512-iah5nhSPTwtUV7yzpTc9xGg8gP3Ch2VNsuFMsKoCkNCrQSbFtx5KRPemmPJ32AUhTSDqJXB6djPN6zAaUGV53g==",
+      "version": "29.6.4",
+      "resolved": "https://registry.npmjs.org/jest-resolve-dependencies/-/jest-resolve-dependencies-29.6.4.tgz",
+      "integrity": "sha512-7+6eAmr1ZBF3vOAJVsfLj1QdqeXG+WYhidfLHBRZqGN24MFRIiKG20ItpLw2qRAsW/D2ZUUmCNf6irUr/v6KHA==",
       "dev": true,
       "dependencies": {
         "jest-regex-util": "^29.6.3",
-        "jest-snapshot": "^29.6.3"
+        "jest-snapshot": "^29.6.4"
       },
       "engines": {
         "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
@@ -11031,30 +11031,30 @@
       }
     },
     "node_modules/jest-runner": {
-      "version": "29.6.3",
-      "resolved": "https://registry.npmjs.org/jest-runner/-/jest-runner-29.6.3.tgz",
-      "integrity": "sha512-E4zsMhQnjhirFPhDTJgoLMWUrVCDij/KGzWlbslDHGuO8Hl2pVUfOiygMzVZtZq+BzmlqwEr7LYmW+WFLlmX8w==",
+      "version": "29.6.4",
+      "resolved": "https://registry.npmjs.org/jest-runner/-/jest-runner-29.6.4.tgz",
+      "integrity": "sha512-SDaLrMmtVlQYDuG0iSPYLycG8P9jLI+fRm8AF/xPKhYDB2g6xDWjXBrR5M8gEWsK6KVFlebpZ4QsrxdyIX1Jaw==",
       "dev": true,
       "dependencies": {
-        "@jest/console": "^29.6.3",
-        "@jest/environment": "^29.6.3",
-        "@jest/test-result": "^29.6.3",
-        "@jest/transform": "^29.6.3",
+        "@jest/console": "^29.6.4",
+        "@jest/environment": "^29.6.4",
+        "@jest/test-result": "^29.6.4",
+        "@jest/transform": "^29.6.4",
         "@jest/types": "^29.6.3",
         "@types/node": "*",
         "chalk": "^4.0.0",
         "emittery": "^0.13.1",
         "graceful-fs": "^4.2.9",
         "jest-docblock": "^29.6.3",
-        "jest-environment-node": "^29.6.3",
-        "jest-haste-map": "^29.6.3",
+        "jest-environment-node": "^29.6.4",
+        "jest-haste-map": "^29.6.4",
         "jest-leak-detector": "^29.6.3",
         "jest-message-util": "^29.6.3",
-        "jest-resolve": "^29.6.3",
-        "jest-runtime": "^29.6.3",
+        "jest-resolve": "^29.6.4",
+        "jest-runtime": "^29.6.4",
         "jest-util": "^29.6.3",
-        "jest-watcher": "^29.6.3",
-        "jest-worker": "^29.6.3",
+        "jest-watcher": "^29.6.4",
+        "jest-worker": "^29.6.4",
         "p-limit": "^3.1.0",
         "source-map-support": "0.5.13"
       },
@@ -11121,9 +11121,9 @@
       }
     },
     "node_modules/jest-runner/node_modules/jest-worker": {
-      "version": "29.6.3",
-      "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-29.6.3.tgz",
-      "integrity": "sha512-wacANXecZ/GbQakpf2CClrqrlwsYYDSXFd4fIGdL+dXpM2GWoJ+6bhQ7vR3TKi3+gkSfBkjy1/khH/WrYS4Q6g==",
+      "version": "29.6.4",
+      "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-29.6.4.tgz",
+      "integrity": "sha512-6dpvFV4WjcWbDVGgHTWo/aupl8/LbBx2NSKfiwqf79xC/yeJjKHT1+StcKy/2KTmW16hE68ccKVOtXf+WZGz7Q==",
       "dev": true,
       "dependencies": {
         "@types/node": "*",
@@ -11173,17 +11173,17 @@
       }
     },
     "node_modules/jest-runtime": {
-      "version": "29.6.3",
-      "resolved": "https://registry.npmjs.org/jest-runtime/-/jest-runtime-29.6.3.tgz",
-      "integrity": "sha512-VM0Z3a9xaqizGpEKwCOIhImkrINYzxgwk8oQAvrmAiXX8LNrJrRjyva30RkuRY0ETAotHLlUcd2moviCA1hgsQ==",
+      "version": "29.6.4",
+      "resolved": "https://registry.npmjs.org/jest-runtime/-/jest-runtime-29.6.4.tgz",
+      "integrity": "sha512-s/QxMBLvmwLdchKEjcLfwzP7h+jsHvNEtxGP5P+Fl1FMaJX2jMiIqe4rJw4tFprzCwuSvVUo9bn0uj4gNRXsbA==",
       "dev": true,
       "dependencies": {
-        "@jest/environment": "^29.6.3",
-        "@jest/fake-timers": "^29.6.3",
-        "@jest/globals": "^29.6.3",
+        "@jest/environment": "^29.6.4",
+        "@jest/fake-timers": "^29.6.4",
+        "@jest/globals": "^29.6.4",
         "@jest/source-map": "^29.6.3",
-        "@jest/test-result": "^29.6.3",
-        "@jest/transform": "^29.6.3",
+        "@jest/test-result": "^29.6.4",
+        "@jest/transform": "^29.6.4",
         "@jest/types": "^29.6.3",
         "@types/node": "*",
         "chalk": "^4.0.0",
@@ -11191,12 +11191,12 @@
         "collect-v8-coverage": "^1.0.0",
         "glob": "^7.1.3",
         "graceful-fs": "^4.2.9",
-        "jest-haste-map": "^29.6.3",
+        "jest-haste-map": "^29.6.4",
         "jest-message-util": "^29.6.3",
         "jest-mock": "^29.6.3",
         "jest-regex-util": "^29.6.3",
-        "jest-resolve": "^29.6.3",
-        "jest-snapshot": "^29.6.3",
+        "jest-resolve": "^29.6.4",
+        "jest-snapshot": "^29.6.4",
         "jest-util": "^29.6.3",
         "slash": "^3.0.0",
         "strip-bom": "^4.0.0"
@@ -11276,9 +11276,9 @@
       }
     },
     "node_modules/jest-snapshot": {
-      "version": "29.6.3",
-      "resolved": "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-29.6.3.tgz",
-      "integrity": "sha512-66Iu7H1ojiveQMGFnKecHIZPPPBjZwfQEnF6wxqpxGf57sV3YSUtAb5/sTKM5TPa3OndyxZp1wxHFbmgVhc53w==",
+      "version": "29.6.4",
+      "resolved": "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-29.6.4.tgz",
+      "integrity": "sha512-VC1N8ED7+4uboUKGIDsbvNAZb6LakgIPgAF4RSpF13dN6YaMokfRqO+BaqK4zIh6X3JffgwbzuGqDEjHm/MrvA==",
       "dev": true,
       "dependencies": {
         "@babel/core": "^7.11.6",
@@ -11286,16 +11286,16 @@
         "@babel/plugin-syntax-jsx": "^7.7.2",
         "@babel/plugin-syntax-typescript": "^7.7.2",
         "@babel/types": "^7.3.3",
-        "@jest/expect-utils": "^29.6.3",
-        "@jest/transform": "^29.6.3",
+        "@jest/expect-utils": "^29.6.4",
+        "@jest/transform": "^29.6.4",
         "@jest/types": "^29.6.3",
         "babel-preset-current-node-syntax": "^1.0.0",
         "chalk": "^4.0.0",
-        "expect": "^29.6.3",
+        "expect": "^29.6.4",
         "graceful-fs": "^4.2.9",
-        "jest-diff": "^29.6.3",
+        "jest-diff": "^29.6.4",
         "jest-get-type": "^29.6.3",
-        "jest-matcher-utils": "^29.6.3",
+        "jest-matcher-utils": "^29.6.4",
         "jest-message-util": "^29.6.3",
         "jest-util": "^29.6.3",
         "natural-compare": "^1.4.0",
@@ -11578,12 +11578,12 @@
       }
     },
     "node_modules/jest-watcher": {
-      "version": "29.6.3",
-      "resolved": "https://registry.npmjs.org/jest-watcher/-/jest-watcher-29.6.3.tgz",
-      "integrity": "sha512-NgpFjZ2U2MKusjidbi4Oiu7tfs+nrgdIxIEVROvH1cFmOei9Uj25lwkMsakqLnH/s0nEcvxO1ck77FiRlcnpZg==",
+      "version": "29.6.4",
+      "resolved": "https://registry.npmjs.org/jest-watcher/-/jest-watcher-29.6.4.tgz",
+      "integrity": "sha512-oqUWvx6+On04ShsT00Ir9T4/FvBeEh2M9PTubgITPxDa739p4hoQweWPRGyYeaojgT0xTpZKF0Y/rSY1UgMxvQ==",
       "dev": true,
       "dependencies": {
-        "@jest/test-result": "^29.6.3",
+        "@jest/test-result": "^29.6.4",
         "@jest/types": "^29.6.3",
         "@types/node": "*",
         "ansi-escapes": "^4.2.1",
@@ -19303,9 +19303,9 @@
       "dev": true
     },
     "@jest/console": {
-      "version": "29.6.3",
-      "resolved": "https://registry.npmjs.org/@jest/console/-/console-29.6.3.tgz",
-      "integrity": "sha512-ukZbHAdDH4ktZIOKvWs1juAXhiVAdvCyM8zv4S/7Ii3vJSDvMW5k+wOVGMQmHLHUFw3Ko63ZQNy7NI6PSlsD5w==",
+      "version": "29.6.4",
+      "resolved": "https://registry.npmjs.org/@jest/console/-/console-29.6.4.tgz",
+      "integrity": "sha512-wNK6gC0Ha9QeEPSkeJedQuTQqxZYnDPuDcDhVuVatRvMkL4D0VTvFVZj+Yuh6caG2aOfzkUZ36KtCmLNtR02hw==",
       "dev": true,
       "requires": {
         "@jest/types": "^29.6.3",
@@ -19368,15 +19368,15 @@
       }
     },
     "@jest/core": {
-      "version": "29.6.3",
-      "resolved": "https://registry.npmjs.org/@jest/core/-/core-29.6.3.tgz",
-      "integrity": "sha512-skV1XrfNxfagmjRUrk2FyN5/2YwIzdWVVBa/orUfbLvQUANXxERq2pTvY0I+FinWHjDKB2HRmpveUiph4X0TJw==",
+      "version": "29.6.4",
+      "resolved": "https://registry.npmjs.org/@jest/core/-/core-29.6.4.tgz",
+      "integrity": "sha512-U/vq5ccNTSVgYH7mHnodHmCffGWHJnz/E1BEWlLuK5pM4FZmGfBn/nrJGLjUsSmyx3otCeqc1T31F4y08AMDLg==",
       "dev": true,
       "requires": {
-        "@jest/console": "^29.6.3",
-        "@jest/reporters": "^29.6.3",
-        "@jest/test-result": "^29.6.3",
-        "@jest/transform": "^29.6.3",
+        "@jest/console": "^29.6.4",
+        "@jest/reporters": "^29.6.4",
+        "@jest/test-result": "^29.6.4",
+        "@jest/transform": "^29.6.4",
         "@jest/types": "^29.6.3",
         "@types/node": "*",
         "ansi-escapes": "^4.2.1",
@@ -19385,18 +19385,18 @@
         "exit": "^0.1.2",
         "graceful-fs": "^4.2.9",
         "jest-changed-files": "^29.6.3",
-        "jest-config": "^29.6.3",
-        "jest-haste-map": "^29.6.3",
+        "jest-config": "^29.6.4",
+        "jest-haste-map": "^29.6.4",
         "jest-message-util": "^29.6.3",
         "jest-regex-util": "^29.6.3",
-        "jest-resolve": "^29.6.3",
-        "jest-resolve-dependencies": "^29.6.3",
-        "jest-runner": "^29.6.3",
-        "jest-runtime": "^29.6.3",
-        "jest-snapshot": "^29.6.3",
+        "jest-resolve": "^29.6.4",
+        "jest-resolve-dependencies": "^29.6.4",
+        "jest-runner": "^29.6.4",
+        "jest-runtime": "^29.6.4",
+        "jest-snapshot": "^29.6.4",
         "jest-util": "^29.6.3",
         "jest-validate": "^29.6.3",
-        "jest-watcher": "^29.6.3",
+        "jest-watcher": "^29.6.4",
         "micromatch": "^4.0.4",
         "pretty-format": "^29.6.3",
         "slash": "^3.0.0",
@@ -19455,40 +19455,40 @@
       }
     },
     "@jest/environment": {
-      "version": "29.6.3",
-      "resolved": "https://registry.npmjs.org/@jest/environment/-/environment-29.6.3.tgz",
-      "integrity": "sha512-u/u3cCztYCfgBiGHsamqP5x+XvucftOGPbf5RJQxfpeC1y4AL8pCjKvPDA3oCmdhZYPgk5AE0VOD/flweR69WA==",
+      "version": "29.6.4",
+      "resolved": "https://registry.npmjs.org/@jest/environment/-/environment-29.6.4.tgz",
+      "integrity": "sha512-sQ0SULEjA1XUTHmkBRl7A1dyITM9yb1yb3ZNKPX3KlTd6IG7mWUe3e2yfExtC2Zz1Q+mMckOLHmL/qLiuQJrBQ==",
       "dev": true,
       "requires": {
-        "@jest/fake-timers": "^29.6.3",
+        "@jest/fake-timers": "^29.6.4",
         "@jest/types": "^29.6.3",
         "@types/node": "*",
         "jest-mock": "^29.6.3"
       }
     },
     "@jest/expect": {
-      "version": "29.6.3",
-      "resolved": "https://registry.npmjs.org/@jest/expect/-/expect-29.6.3.tgz",
-      "integrity": "sha512-Ic08XbI2jlg6rECy+CGwk/8NDa6VE7UmIG6++9OTPAMnQmNGY28hu69Nf629CWv6T7YMODLbONxDFKdmQeI9FA==",
+      "version": "29.6.4",
+      "resolved": "https://registry.npmjs.org/@jest/expect/-/expect-29.6.4.tgz",
+      "integrity": "sha512-Warhsa7d23+3X5bLbrbYvaehcgX5TLYhI03JKoedTiI8uJU4IhqYBWF7OSSgUyz4IgLpUYPkK0AehA5/fRclAA==",
       "dev": true,
       "requires": {
-        "expect": "^29.6.3",
-        "jest-snapshot": "^29.6.3"
+        "expect": "^29.6.4",
+        "jest-snapshot": "^29.6.4"
       }
     },
     "@jest/expect-utils": {
-      "version": "29.6.3",
-      "resolved": "https://registry.npmjs.org/@jest/expect-utils/-/expect-utils-29.6.3.tgz",
-      "integrity": "sha512-nvOEW4YoqRKD9HBJ9OJ6przvIvP9qilp5nAn1462P5ZlL/MM9SgPEZFyjTGPfs7QkocdUsJa6KjHhyRn4ueItA==",
+      "version": "29.6.4",
+      "resolved": "https://registry.npmjs.org/@jest/expect-utils/-/expect-utils-29.6.4.tgz",
+      "integrity": "sha512-FEhkJhqtvBwgSpiTrocquJCdXPsyvNKcl/n7A3u7X4pVoF4bswm11c9d4AV+kfq2Gpv/mM8x7E7DsRvH+djkrg==",
       "dev": true,
       "requires": {
         "jest-get-type": "^29.6.3"
       }
     },
     "@jest/fake-timers": {
-      "version": "29.6.3",
-      "resolved": "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-29.6.3.tgz",
-      "integrity": "sha512-pa1wmqvbj6eX0nMvOM2VDAWvJOI5A/Mk3l8O7n7EsAh71sMZblaKO9iT4GjIj0LwwK3CP/Jp1ypEV0x3m89RvA==",
+      "version": "29.6.4",
+      "resolved": "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-29.6.4.tgz",
+      "integrity": "sha512-6UkCwzoBK60edXIIWb0/KWkuj7R7Qq91vVInOe3De6DSpaEiqjKcJw4F7XUet24Wupahj9J6PlR09JqJ5ySDHw==",
       "dev": true,
       "requires": {
         "@jest/types": "^29.6.3",
@@ -19500,27 +19500,27 @@
       }
     },
     "@jest/globals": {
-      "version": "29.6.3",
-      "resolved": "https://registry.npmjs.org/@jest/globals/-/globals-29.6.3.tgz",
-      "integrity": "sha512-RB+uI+CZMHntzlnOPlll5x/jgRff3LEPl/td/jzMXiIgR0iIhKq9qm1HLU+EC52NuoVy/1swit/sDGjVn4bc6A==",
+      "version": "29.6.4",
+      "resolved": "https://registry.npmjs.org/@jest/globals/-/globals-29.6.4.tgz",
+      "integrity": "sha512-wVIn5bdtjlChhXAzVXavcY/3PEjf4VqM174BM3eGL5kMxLiZD5CLnbmkEyA1Dwh9q8XjP6E8RwjBsY/iCWrWsA==",
       "dev": true,
       "requires": {
-        "@jest/environment": "^29.6.3",
-        "@jest/expect": "^29.6.3",
+        "@jest/environment": "^29.6.4",
+        "@jest/expect": "^29.6.4",
         "@jest/types": "^29.6.3",
         "jest-mock": "^29.6.3"
       }
     },
     "@jest/reporters": {
-      "version": "29.6.3",
-      "resolved": "https://registry.npmjs.org/@jest/reporters/-/reporters-29.6.3.tgz",
-      "integrity": "sha512-kGz59zMi0GkVjD2CJeYWG9k6cvj7eBqt9aDAqo2rcCLRTYlvQ62Gu/n+tOmJMBHGjzeijjuCENjzTyYBgrtLUw==",
+      "version": "29.6.4",
+      "resolved": "https://registry.npmjs.org/@jest/reporters/-/reporters-29.6.4.tgz",
+      "integrity": "sha512-sxUjWxm7QdchdrD3NfWKrL8FBsortZeibSJv4XLjESOOjSUOkjQcb0ZHJwfhEGIvBvTluTzfG2yZWZhkrXJu8g==",
       "dev": true,
       "requires": {
         "@bcoe/v8-coverage": "^0.2.3",
-        "@jest/console": "^29.6.3",
-        "@jest/test-result": "^29.6.3",
-        "@jest/transform": "^29.6.3",
+        "@jest/console": "^29.6.4",
+        "@jest/test-result": "^29.6.4",
+        "@jest/transform": "^29.6.4",
         "@jest/types": "^29.6.3",
         "@jridgewell/trace-mapping": "^0.3.18",
         "@types/node": "*",
@@ -19536,7 +19536,7 @@
         "istanbul-reports": "^3.1.3",
         "jest-message-util": "^29.6.3",
         "jest-util": "^29.6.3",
-        "jest-worker": "^29.6.3",
+        "jest-worker": "^29.6.4",
         "slash": "^3.0.0",
         "string-length": "^4.0.1",
         "strip-ansi": "^6.0.0",
@@ -19584,9 +19584,9 @@
           "dev": true
         },
         "jest-worker": {
-          "version": "29.6.3",
-          "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-29.6.3.tgz",
-          "integrity": "sha512-wacANXecZ/GbQakpf2CClrqrlwsYYDSXFd4fIGdL+dXpM2GWoJ+6bhQ7vR3TKi3+gkSfBkjy1/khH/WrYS4Q6g==",
+          "version": "29.6.4",
+          "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-29.6.4.tgz",
+          "integrity": "sha512-6dpvFV4WjcWbDVGgHTWo/aupl8/LbBx2NSKfiwqf79xC/yeJjKHT1+StcKy/2KTmW16hE68ccKVOtXf+WZGz7Q==",
           "dev": true,
           "requires": {
             "@types/node": "*",
@@ -19638,33 +19638,33 @@
       }
     },
     "@jest/test-result": {
-      "version": "29.6.3",
-      "resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-29.6.3.tgz",
-      "integrity": "sha512-k7ZZaNvOSMBHPZYiy0kuiaFoyansR5QnTwDux1EjK3kD5iWpRVyJIJ0RAIV39SThafchuW59vra7F8mdy5Hfgw==",
+      "version": "29.6.4",
+      "resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-29.6.4.tgz",
+      "integrity": "sha512-uQ1C0AUEN90/dsyEirgMLlouROgSY+Wc/JanVVk0OiUKa5UFh7sJpMEM3aoUBAz2BRNvUJ8j3d294WFuRxSyOQ==",
       "dev": true,
       "requires": {
-        "@jest/console": "^29.6.3",
+        "@jest/console": "^29.6.4",
         "@jest/types": "^29.6.3",
         "@types/istanbul-lib-coverage": "^2.0.0",
         "collect-v8-coverage": "^1.0.0"
       }
     },
     "@jest/test-sequencer": {
-      "version": "29.6.3",
-      "resolved": "https://registry.npmjs.org/@jest/test-sequencer/-/test-sequencer-29.6.3.tgz",
-      "integrity": "sha512-/SmijaAU2TY9ComFGIYa6Z+fmKqQMnqs2Nmwb0P/Z/tROdZ7M0iruES1EaaU9PBf8o9uED5xzaJ3YPFEIcDgAg==",
+      "version": "29.6.4",
+      "resolved": "https://registry.npmjs.org/@jest/test-sequencer/-/test-sequencer-29.6.4.tgz",
+      "integrity": "sha512-E84M6LbpcRq3fT4ckfKs9ryVanwkaIB0Ws9bw3/yP4seRLg/VaCZ/LgW0MCq5wwk4/iP/qnilD41aj2fsw2RMg==",
       "dev": true,
       "requires": {
-        "@jest/test-result": "^29.6.3",
+        "@jest/test-result": "^29.6.4",
         "graceful-fs": "^4.2.9",
-        "jest-haste-map": "^29.6.3",
+        "jest-haste-map": "^29.6.4",
         "slash": "^3.0.0"
       }
     },
     "@jest/transform": {
-      "version": "29.6.3",
-      "resolved": "https://registry.npmjs.org/@jest/transform/-/transform-29.6.3.tgz",
-      "integrity": "sha512-dPIc3DsvMZ/S8ut4L2ViCj265mKO0owB0wfzBv2oGzL9pQ+iRvJewHqLBmsGb7XFb5UotWIEtvY5A/lnylaIoQ==",
+      "version": "29.6.4",
+      "resolved": "https://registry.npmjs.org/@jest/transform/-/transform-29.6.4.tgz",
+      "integrity": "sha512-8thgRSiXUqtr/pPGY/OsyHuMjGyhVnWrFAwoxmIemlBuiMyU1WFs0tXoNxzcr4A4uErs/ABre76SGmrr5ab/AA==",
       "dev": true,
       "requires": {
         "@babel/core": "^7.11.6",
@@ -19675,7 +19675,7 @@
         "convert-source-map": "^2.0.0",
         "fast-json-stable-stringify": "^2.1.0",
         "graceful-fs": "^4.2.9",
-        "jest-haste-map": "^29.6.3",
+        "jest-haste-map": "^29.6.4",
         "jest-regex-util": "^29.6.3",
         "jest-util": "^29.6.3",
         "micromatch": "^4.0.4",
@@ -20925,12 +20925,12 @@
       "integrity": "sha512-xh1Rl34h6Fi1DC2WWKfxUTVqRsNnr6LsKz2+hfwDxQJWmrx8+c7ylaqBMcHfl1U1r2dsifOvKX3LQuLNZ+XSvA=="
     },
     "babel-jest": {
-      "version": "29.6.3",
-      "resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-29.6.3.tgz",
-      "integrity": "sha512-1Ne93zZZEy5XmTa4Q+W5+zxBrDpExX8E3iy+xJJ+24ewlfo/T3qHfQJCzi/MMVFmBQDNxtRR/Gfd2dwb/0yrQw==",
+      "version": "29.6.4",
+      "resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-29.6.4.tgz",
+      "integrity": "sha512-meLj23UlSLddj6PC+YTOFRgDAtjnZom8w/ACsrx0gtPtv5cJZk0A5Unk5bV4wixD7XaPCN1fQvpww8czkZURmw==",
       "dev": true,
       "requires": {
-        "@jest/transform": "^29.6.3",
+        "@jest/transform": "^29.6.4",
         "@types/babel__core": "^7.1.14",
         "babel-plugin-istanbul": "^6.1.1",
         "babel-preset-jest": "^29.6.3",
@@ -23861,14 +23861,14 @@
       "dev": true
     },
     "expect": {
-      "version": "29.6.3",
-      "resolved": "https://registry.npmjs.org/expect/-/expect-29.6.3.tgz",
-      "integrity": "sha512-x1vY4LlEMWUYVZQrFi4ZANXFwqYbJ/JNQspLVvzhW2BNY28aNcXMQH6imBbt+RBf5sVRTodYHXtSP/TLEU0Dxw==",
+      "version": "29.6.4",
+      "resolved": "https://registry.npmjs.org/expect/-/expect-29.6.4.tgz",
+      "integrity": "sha512-F2W2UyQ8XYyftHT57dtfg8Ue3X5qLgm2sSug0ivvLRH/VKNRL/pDxg/TH7zVzbQB0tu80clNFy6LU7OS/VSEKA==",
       "dev": true,
       "requires": {
-        "@jest/expect-utils": "^29.6.3",
+        "@jest/expect-utils": "^29.6.4",
         "jest-get-type": "^29.6.3",
-        "jest-matcher-utils": "^29.6.3",
+        "jest-matcher-utils": "^29.6.4",
         "jest-message-util": "^29.6.3",
         "jest-util": "^29.6.3"
       }
@@ -25127,15 +25127,15 @@
       }
     },
     "jest": {
-      "version": "29.6.3",
-      "resolved": "https://registry.npmjs.org/jest/-/jest-29.6.3.tgz",
-      "integrity": "sha512-alueLuoPCDNHFcFGmgETR4KpQ+0ff3qVaiJwxQM4B5sC0CvXcgg4PEi7xrDkxuItDmdz/FVc7SSit4KEu8GRvw==",
+      "version": "29.6.4",
+      "resolved": "https://registry.npmjs.org/jest/-/jest-29.6.4.tgz",
+      "integrity": "sha512-tEFhVQFF/bzoYV1YuGyzLPZ6vlPrdfvDmmAxudA1dLEuiztqg2Rkx20vkKY32xiDROcD2KXlgZ7Cu8RPeEHRKw==",
       "dev": true,
       "requires": {
-        "@jest/core": "^29.6.3",
+        "@jest/core": "^29.6.4",
         "@jest/types": "^29.6.3",
         "import-local": "^3.0.2",
-        "jest-cli": "^29.6.3"
+        "jest-cli": "^29.6.4"
       }
     },
     "jest-changed-files": {
@@ -25150,14 +25150,14 @@
       }
     },
     "jest-circus": {
-      "version": "29.6.3",
-      "resolved": "https://registry.npmjs.org/jest-circus/-/jest-circus-29.6.3.tgz",
-      "integrity": "sha512-p0R5YqZEMnOpHqHLWRSjm2z/0p6RNsrNE/GRRT3eli8QGOAozj6Ys/3Tv+Ej+IfltJoSPwcQ6/hOCRkNlxLLCw==",
+      "version": "29.6.4",
+      "resolved": "https://registry.npmjs.org/jest-circus/-/jest-circus-29.6.4.tgz",
+      "integrity": "sha512-YXNrRyntVUgDfZbjXWBMPslX1mQ8MrSG0oM/Y06j9EYubODIyHWP8hMUbjbZ19M3M+zamqEur7O80HODwACoJw==",
       "dev": true,
       "requires": {
-        "@jest/environment": "^29.6.3",
-        "@jest/expect": "^29.6.3",
-        "@jest/test-result": "^29.6.3",
+        "@jest/environment": "^29.6.4",
+        "@jest/expect": "^29.6.4",
+        "@jest/test-result": "^29.6.4",
         "@jest/types": "^29.6.3",
         "@types/node": "*",
         "chalk": "^4.0.0",
@@ -25165,10 +25165,10 @@
         "dedent": "^1.0.0",
         "is-generator-fn": "^2.0.0",
         "jest-each": "^29.6.3",
-        "jest-matcher-utils": "^29.6.3",
+        "jest-matcher-utils": "^29.6.4",
         "jest-message-util": "^29.6.3",
-        "jest-runtime": "^29.6.3",
-        "jest-snapshot": "^29.6.3",
+        "jest-runtime": "^29.6.4",
+        "jest-snapshot": "^29.6.4",
         "jest-util": "^29.6.3",
         "p-limit": "^3.1.0",
         "pretty-format": "^29.6.3",
@@ -25229,19 +25229,19 @@
       }
     },
     "jest-cli": {
-      "version": "29.6.3",
-      "resolved": "https://registry.npmjs.org/jest-cli/-/jest-cli-29.6.3.tgz",
-      "integrity": "sha512-KuPdXUPXQIf0t6DvmG8MV4QyhcjR1a6ruKl3YL7aGn/AQ8JkROwFkWzEpDIpt11Qy188dHbRm8WjwMsV/4nmnQ==",
+      "version": "29.6.4",
+      "resolved": "https://registry.npmjs.org/jest-cli/-/jest-cli-29.6.4.tgz",
+      "integrity": "sha512-+uMCQ7oizMmh8ZwRfZzKIEszFY9ksjjEQnTEMTaL7fYiL3Kw4XhqT9bYh+A4DQKUb67hZn2KbtEnDuHvcgK4pQ==",
       "dev": true,
       "requires": {
-        "@jest/core": "^29.6.3",
-        "@jest/test-result": "^29.6.3",
+        "@jest/core": "^29.6.4",
+        "@jest/test-result": "^29.6.4",
         "@jest/types": "^29.6.3",
         "chalk": "^4.0.0",
         "exit": "^0.1.2",
         "graceful-fs": "^4.2.9",
         "import-local": "^3.0.2",
-        "jest-config": "^29.6.3",
+        "jest-config": "^29.6.4",
         "jest-util": "^29.6.3",
         "jest-validate": "^29.6.3",
         "prompts": "^2.0.1",
@@ -25300,26 +25300,26 @@
       }
     },
     "jest-config": {
-      "version": "29.6.3",
-      "resolved": "https://registry.npmjs.org/jest-config/-/jest-config-29.6.3.tgz",
-      "integrity": "sha512-nb9bOq2aEqogbyL4F9mLkAeQGAgNt7Uz6U59YtQDIxFPiL7Ejgq0YIrp78oyEHD6H4CIV/k7mFrK7eFDzUJ69w==",
+      "version": "29.6.4",
+      "resolved": "https://registry.npmjs.org/jest-config/-/jest-config-29.6.4.tgz",
+      "integrity": "sha512-JWohr3i9m2cVpBumQFv2akMEnFEPVOh+9L2xIBJhJ0zOaci2ZXuKJj0tgMKQCBZAKA09H049IR4HVS/43Qb19A==",
       "dev": true,
       "requires": {
         "@babel/core": "^7.11.6",
-        "@jest/test-sequencer": "^29.6.3",
+        "@jest/test-sequencer": "^29.6.4",
         "@jest/types": "^29.6.3",
-        "babel-jest": "^29.6.3",
+        "babel-jest": "^29.6.4",
         "chalk": "^4.0.0",
         "ci-info": "^3.2.0",
         "deepmerge": "^4.2.2",
         "glob": "^7.1.3",
         "graceful-fs": "^4.2.9",
-        "jest-circus": "^29.6.3",
-        "jest-environment-node": "^29.6.3",
+        "jest-circus": "^29.6.4",
+        "jest-environment-node": "^29.6.4",
         "jest-get-type": "^29.6.3",
         "jest-regex-util": "^29.6.3",
-        "jest-resolve": "^29.6.3",
-        "jest-runner": "^29.6.3",
+        "jest-resolve": "^29.6.4",
+        "jest-runner": "^29.6.4",
         "jest-util": "^29.6.3",
         "jest-validate": "^29.6.3",
         "micromatch": "^4.0.4",
@@ -25381,9 +25381,9 @@
       }
     },
     "jest-diff": {
-      "version": "29.6.3",
-      "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-29.6.3.tgz",
-      "integrity": "sha512-3sw+AdWnwH9sSNohMRKA7JiYUJSRr/WS6+sEFfBuhxU5V5GlEVKfvUn8JuMHE0wqKowemR1C2aHy8VtXbaV8dQ==",
+      "version": "29.6.4",
+      "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-29.6.4.tgz",
+      "integrity": "sha512-9F48UxR9e4XOEZvoUXEHSWY4qC4zERJaOfrbBg9JpbJOO43R1vN76REt/aMGZoY6GD5g84nnJiBIVlscegefpw==",
       "dev": true,
       "requires": {
         "chalk": "^4.0.0",
@@ -25533,13 +25533,13 @@
       }
     },
     "jest-environment-node": {
-      "version": "29.6.3",
-      "resolved": "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-29.6.3.tgz",
-      "integrity": "sha512-PKl7upfPJXMYbWpD+60o4HP86KvFO2c9dZ+Zr6wUzsG5xcPx/65o3ArNgHW5M0RFvLYdW4/aieR4JSooD0a2ew==",
+      "version": "29.6.4",
+      "resolved": "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-29.6.4.tgz",
+      "integrity": "sha512-i7SbpH2dEIFGNmxGCpSc2w9cA4qVD+wfvg2ZnfQ7XVrKL0NA5uDVBIiGH8SR4F0dKEv/0qI5r+aDomDf04DpEQ==",
       "dev": true,
       "requires": {
-        "@jest/environment": "^29.6.3",
-        "@jest/fake-timers": "^29.6.3",
+        "@jest/environment": "^29.6.4",
+        "@jest/fake-timers": "^29.6.4",
         "@jest/types": "^29.6.3",
         "@types/node": "*",
         "jest-mock": "^29.6.3",
@@ -25553,9 +25553,9 @@
       "dev": true
     },
     "jest-haste-map": {
-      "version": "29.6.3",
-      "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-29.6.3.tgz",
-      "integrity": "sha512-GecR5YavfjkhOytEFHAeI6aWWG3f/cOKNB1YJvj/B76xAmeVjy4zJUYobGF030cRmKaO1FBw3V8CZZ6KVh9ZSw==",
+      "version": "29.6.4",
+      "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-29.6.4.tgz",
+      "integrity": "sha512-12Ad+VNTDHxKf7k+M65sviyynRoZYuL1/GTuhEVb8RYsNSNln71nANRb/faSyWvx0j+gHcivChXHIoMJrGYjog==",
       "dev": true,
       "requires": {
         "@jest/types": "^29.6.3",
@@ -25567,7 +25567,7 @@
         "graceful-fs": "^4.2.9",
         "jest-regex-util": "^29.6.3",
         "jest-util": "^29.6.3",
-        "jest-worker": "^29.6.3",
+        "jest-worker": "^29.6.4",
         "micromatch": "^4.0.4",
         "walker": "^1.0.8"
       },
@@ -25579,9 +25579,9 @@
           "dev": true
         },
         "jest-worker": {
-          "version": "29.6.3",
-          "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-29.6.3.tgz",
-          "integrity": "sha512-wacANXecZ/GbQakpf2CClrqrlwsYYDSXFd4fIGdL+dXpM2GWoJ+6bhQ7vR3TKi3+gkSfBkjy1/khH/WrYS4Q6g==",
+          "version": "29.6.4",
+          "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-29.6.4.tgz",
+          "integrity": "sha512-6dpvFV4WjcWbDVGgHTWo/aupl8/LbBx2NSKfiwqf79xC/yeJjKHT1+StcKy/2KTmW16hE68ccKVOtXf+WZGz7Q==",
           "dev": true,
           "requires": {
             "@types/node": "*",
@@ -25612,13 +25612,13 @@
       }
     },
     "jest-matcher-utils": {
-      "version": "29.6.3",
-      "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-29.6.3.tgz",
-      "integrity": "sha512-6ZrMYINZdwduSt5Xu18/n49O1IgXdjsfG7NEZaQws9k69eTKWKcVbJBw/MZsjOZe2sSyJFmuzh8042XWwl54Zg==",
+      "version": "29.6.4",
+      "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-29.6.4.tgz",
+      "integrity": "sha512-KSzwyzGvK4HcfnserYqJHYi7sZVqdREJ9DMPAKVbS98JsIAvumihaNUbjrWw0St7p9IY7A9UskCW5MYlGmBQFQ==",
       "dev": true,
       "requires": {
         "chalk": "^4.0.0",
-        "jest-diff": "^29.6.3",
+        "jest-diff": "^29.6.4",
         "jest-get-type": "^29.6.3",
         "pretty-format": "^29.6.3"
       },
@@ -25767,14 +25767,14 @@
       "dev": true
     },
     "jest-resolve": {
-      "version": "29.6.3",
-      "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-29.6.3.tgz",
-      "integrity": "sha512-WMXwxhvzDeA/J+9jz1i8ZKGmbw/n+s988EiUvRI4egM+eTn31Hb5v10Re3slG3/qxntkBt2/6GkQVDGu6Bwyhw==",
+      "version": "29.6.4",
+      "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-29.6.4.tgz",
+      "integrity": "sha512-fPRq+0vcxsuGlG0O3gyoqGTAxasagOxEuyoxHeyxaZbc9QNek0AmJWSkhjlMG+mTsj+8knc/mWb3fXlRNVih7Q==",
       "dev": true,
       "requires": {
         "chalk": "^4.0.0",
         "graceful-fs": "^4.2.9",
-        "jest-haste-map": "^29.6.3",
+        "jest-haste-map": "^29.6.4",
         "jest-pnp-resolver": "^1.2.2",
         "jest-util": "^29.6.3",
         "jest-validate": "^29.6.3",
@@ -25835,40 +25835,40 @@
       }
     },
     "jest-resolve-dependencies": {
-      "version": "29.6.3",
-      "resolved": "https://registry.npmjs.org/jest-resolve-dependencies/-/jest-resolve-dependencies-29.6.3.tgz",
-      "integrity": "sha512-iah5nhSPTwtUV7yzpTc9xGg8gP3Ch2VNsuFMsKoCkNCrQSbFtx5KRPemmPJ32AUhTSDqJXB6djPN6zAaUGV53g==",
+      "version": "29.6.4",
+      "resolved": "https://registry.npmjs.org/jest-resolve-dependencies/-/jest-resolve-dependencies-29.6.4.tgz",
+      "integrity": "sha512-7+6eAmr1ZBF3vOAJVsfLj1QdqeXG+WYhidfLHBRZqGN24MFRIiKG20ItpLw2qRAsW/D2ZUUmCNf6irUr/v6KHA==",
       "dev": true,
       "requires": {
         "jest-regex-util": "^29.6.3",
-        "jest-snapshot": "^29.6.3"
+        "jest-snapshot": "^29.6.4"
       }
     },
     "jest-runner": {
-      "version": "29.6.3",
-      "resolved": "https://registry.npmjs.org/jest-runner/-/jest-runner-29.6.3.tgz",
-      "integrity": "sha512-E4zsMhQnjhirFPhDTJgoLMWUrVCDij/KGzWlbslDHGuO8Hl2pVUfOiygMzVZtZq+BzmlqwEr7LYmW+WFLlmX8w==",
+      "version": "29.6.4",
+      "resolved": "https://registry.npmjs.org/jest-runner/-/jest-runner-29.6.4.tgz",
+      "integrity": "sha512-SDaLrMmtVlQYDuG0iSPYLycG8P9jLI+fRm8AF/xPKhYDB2g6xDWjXBrR5M8gEWsK6KVFlebpZ4QsrxdyIX1Jaw==",
       "dev": true,
       "requires": {
-        "@jest/console": "^29.6.3",
-        "@jest/environment": "^29.6.3",
-        "@jest/test-result": "^29.6.3",
-        "@jest/transform": "^29.6.3",
+        "@jest/console": "^29.6.4",
+        "@jest/environment": "^29.6.4",
+        "@jest/test-result": "^29.6.4",
+        "@jest/transform": "^29.6.4",
         "@jest/types": "^29.6.3",
         "@types/node": "*",
         "chalk": "^4.0.0",
         "emittery": "^0.13.1",
         "graceful-fs": "^4.2.9",
         "jest-docblock": "^29.6.3",
-        "jest-environment-node": "^29.6.3",
-        "jest-haste-map": "^29.6.3",
+        "jest-environment-node": "^29.6.4",
+        "jest-haste-map": "^29.6.4",
         "jest-leak-detector": "^29.6.3",
         "jest-message-util": "^29.6.3",
-        "jest-resolve": "^29.6.3",
-        "jest-runtime": "^29.6.3",
+        "jest-resolve": "^29.6.4",
+        "jest-runtime": "^29.6.4",
         "jest-util": "^29.6.3",
-        "jest-watcher": "^29.6.3",
-        "jest-worker": "^29.6.3",
+        "jest-watcher": "^29.6.4",
+        "jest-worker": "^29.6.4",
         "p-limit": "^3.1.0",
         "source-map-support": "0.5.13"
       },
@@ -25914,9 +25914,9 @@
           "dev": true
         },
         "jest-worker": {
-          "version": "29.6.3",
-          "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-29.6.3.tgz",
-          "integrity": "sha512-wacANXecZ/GbQakpf2CClrqrlwsYYDSXFd4fIGdL+dXpM2GWoJ+6bhQ7vR3TKi3+gkSfBkjy1/khH/WrYS4Q6g==",
+          "version": "29.6.4",
+          "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-29.6.4.tgz",
+          "integrity": "sha512-6dpvFV4WjcWbDVGgHTWo/aupl8/LbBx2NSKfiwqf79xC/yeJjKHT1+StcKy/2KTmW16hE68ccKVOtXf+WZGz7Q==",
           "dev": true,
           "requires": {
             "@types/node": "*",
@@ -25958,17 +25958,17 @@
       }
     },
     "jest-runtime": {
-      "version": "29.6.3",
-      "resolved": "https://registry.npmjs.org/jest-runtime/-/jest-runtime-29.6.3.tgz",
-      "integrity": "sha512-VM0Z3a9xaqizGpEKwCOIhImkrINYzxgwk8oQAvrmAiXX8LNrJrRjyva30RkuRY0ETAotHLlUcd2moviCA1hgsQ==",
+      "version": "29.6.4",
+      "resolved": "https://registry.npmjs.org/jest-runtime/-/jest-runtime-29.6.4.tgz",
+      "integrity": "sha512-s/QxMBLvmwLdchKEjcLfwzP7h+jsHvNEtxGP5P+Fl1FMaJX2jMiIqe4rJw4tFprzCwuSvVUo9bn0uj4gNRXsbA==",
       "dev": true,
       "requires": {
-        "@jest/environment": "^29.6.3",
-        "@jest/fake-timers": "^29.6.3",
-        "@jest/globals": "^29.6.3",
+        "@jest/environment": "^29.6.4",
+        "@jest/fake-timers": "^29.6.4",
+        "@jest/globals": "^29.6.4",
         "@jest/source-map": "^29.6.3",
-        "@jest/test-result": "^29.6.3",
-        "@jest/transform": "^29.6.3",
+        "@jest/test-result": "^29.6.4",
+        "@jest/transform": "^29.6.4",
         "@jest/types": "^29.6.3",
         "@types/node": "*",
         "chalk": "^4.0.0",
@@ -25976,12 +25976,12 @@
         "collect-v8-coverage": "^1.0.0",
         "glob": "^7.1.3",
         "graceful-fs": "^4.2.9",
-        "jest-haste-map": "^29.6.3",
+        "jest-haste-map": "^29.6.4",
         "jest-message-util": "^29.6.3",
         "jest-mock": "^29.6.3",
         "jest-regex-util": "^29.6.3",
-        "jest-resolve": "^29.6.3",
-        "jest-snapshot": "^29.6.3",
+        "jest-resolve": "^29.6.4",
+        "jest-snapshot": "^29.6.4",
         "jest-util": "^29.6.3",
         "slash": "^3.0.0",
         "strip-bom": "^4.0.0"
@@ -26039,9 +26039,9 @@
       }
     },
     "jest-snapshot": {
-      "version": "29.6.3",
-      "resolved": "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-29.6.3.tgz",
-      "integrity": "sha512-66Iu7H1ojiveQMGFnKecHIZPPPBjZwfQEnF6wxqpxGf57sV3YSUtAb5/sTKM5TPa3OndyxZp1wxHFbmgVhc53w==",
+      "version": "29.6.4",
+      "resolved": "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-29.6.4.tgz",
+      "integrity": "sha512-VC1N8ED7+4uboUKGIDsbvNAZb6LakgIPgAF4RSpF13dN6YaMokfRqO+BaqK4zIh6X3JffgwbzuGqDEjHm/MrvA==",
       "dev": true,
       "requires": {
         "@babel/core": "^7.11.6",
@@ -26049,16 +26049,16 @@
         "@babel/plugin-syntax-jsx": "^7.7.2",
         "@babel/plugin-syntax-typescript": "^7.7.2",
         "@babel/types": "^7.3.3",
-        "@jest/expect-utils": "^29.6.3",
-        "@jest/transform": "^29.6.3",
+        "@jest/expect-utils": "^29.6.4",
+        "@jest/transform": "^29.6.4",
         "@jest/types": "^29.6.3",
         "babel-preset-current-node-syntax": "^1.0.0",
         "chalk": "^4.0.0",
-        "expect": "^29.6.3",
+        "expect": "^29.6.4",
         "graceful-fs": "^4.2.9",
-        "jest-diff": "^29.6.3",
+        "jest-diff": "^29.6.4",
         "jest-get-type": "^29.6.3",
-        "jest-matcher-utils": "^29.6.3",
+        "jest-matcher-utils": "^29.6.4",
         "jest-message-util": "^29.6.3",
         "jest-util": "^29.6.3",
         "natural-compare": "^1.4.0",
@@ -26263,12 +26263,12 @@
       }
     },
     "jest-watcher": {
-      "version": "29.6.3",
-      "resolved": "https://registry.npmjs.org/jest-watcher/-/jest-watcher-29.6.3.tgz",
-      "integrity": "sha512-NgpFjZ2U2MKusjidbi4Oiu7tfs+nrgdIxIEVROvH1cFmOei9Uj25lwkMsakqLnH/s0nEcvxO1ck77FiRlcnpZg==",
+      "version": "29.6.4",
+      "resolved": "https://registry.npmjs.org/jest-watcher/-/jest-watcher-29.6.4.tgz",
+      "integrity": "sha512-oqUWvx6+On04ShsT00Ir9T4/FvBeEh2M9PTubgITPxDa739p4hoQweWPRGyYeaojgT0xTpZKF0Y/rSY1UgMxvQ==",
       "dev": true,
       "requires": {
-        "@jest/test-result": "^29.6.3",
+        "@jest/test-result": "^29.6.4",
         "@jest/types": "^29.6.3",
         "@types/node": "*",
         "ansi-escapes": "^4.2.1",
diff --git a/apps/block_scout_web/assets/package.json b/apps/block_scout_web/assets/package.json
index 030c75b07638..09a800b27409 100644
--- a/apps/block_scout_web/assets/package.json
+++ b/apps/block_scout_web/assets/package.json
@@ -96,7 +96,7 @@
     "eslint-plugin-node": "^11.1.0",
     "eslint-plugin-promise": "^6.1.1",
     "file-loader": "^6.2.0",
-    "jest": "^29.6.3",
+    "jest": "^29.6.4",
     "jest-environment-jsdom": "^29.6.3",
     "mini-css-extract-plugin": "^2.7.6",
     "postcss": "^8.4.28",

From bc53b1bf8ae2cb283bf5bb45c92d6425f8f8e063 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 25 Aug 2023 07:41:46 +0000
Subject: [PATCH 338/909] Bump jest-environment-jsdom in
 /apps/block_scout_web/assets

Bumps [jest-environment-jsdom](https://github.com/jestjs/jest/tree/HEAD/packages/jest-environment-jsdom) from 29.6.3 to 29.6.4.
- [Release notes](https://github.com/jestjs/jest/releases)
- [Changelog](https://github.com/jestjs/jest/blob/main/CHANGELOG.md)
- [Commits](https://github.com/jestjs/jest/commits/v29.6.4/packages/jest-environment-jsdom)

---
updated-dependencies:
- dependency-name: jest-environment-jsdom
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 apps/block_scout_web/assets/package-lock.json | 22 +++++++++----------
 apps/block_scout_web/assets/package.json      |  2 +-
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/apps/block_scout_web/assets/package-lock.json b/apps/block_scout_web/assets/package-lock.json
index 547042da3cdc..bb346cb40e4a 100644
--- a/apps/block_scout_web/assets/package-lock.json
+++ b/apps/block_scout_web/assets/package-lock.json
@@ -85,7 +85,7 @@
         "eslint-plugin-promise": "^6.1.1",
         "file-loader": "^6.2.0",
         "jest": "^29.6.4",
-        "jest-environment-jsdom": "^29.6.3",
+        "jest-environment-jsdom": "^29.6.4",
         "mini-css-extract-plugin": "^2.7.6",
         "postcss": "^8.4.28",
         "postcss-loader": "^7.3.3",
@@ -10583,13 +10583,13 @@
       }
     },
     "node_modules/jest-environment-jsdom": {
-      "version": "29.6.3",
-      "resolved": "https://registry.npmjs.org/jest-environment-jsdom/-/jest-environment-jsdom-29.6.3.tgz",
-      "integrity": "sha512-nMJz/i27Moit9bv8Z323/13Melj4FEQH93yRu7GnilvBmPBMH4EGEkEfBTJXYuubyzhMO7w/VHzljIDV+Q/SeQ==",
+      "version": "29.6.4",
+      "resolved": "https://registry.npmjs.org/jest-environment-jsdom/-/jest-environment-jsdom-29.6.4.tgz",
+      "integrity": "sha512-K6wfgUJ16DoMs02JYFid9lOsqfpoVtyJxpRlnTxUHzvZWBnnh2VNGRB9EC1Cro96TQdq5TtSjb3qUjNaJP9IyA==",
       "dev": true,
       "dependencies": {
-        "@jest/environment": "^29.6.3",
-        "@jest/fake-timers": "^29.6.3",
+        "@jest/environment": "^29.6.4",
+        "@jest/fake-timers": "^29.6.4",
         "@jest/types": "^29.6.3",
         "@types/jsdom": "^20.0.0",
         "@types/node": "*",
@@ -25517,13 +25517,13 @@
       }
     },
     "jest-environment-jsdom": {
-      "version": "29.6.3",
-      "resolved": "https://registry.npmjs.org/jest-environment-jsdom/-/jest-environment-jsdom-29.6.3.tgz",
-      "integrity": "sha512-nMJz/i27Moit9bv8Z323/13Melj4FEQH93yRu7GnilvBmPBMH4EGEkEfBTJXYuubyzhMO7w/VHzljIDV+Q/SeQ==",
+      "version": "29.6.4",
+      "resolved": "https://registry.npmjs.org/jest-environment-jsdom/-/jest-environment-jsdom-29.6.4.tgz",
+      "integrity": "sha512-K6wfgUJ16DoMs02JYFid9lOsqfpoVtyJxpRlnTxUHzvZWBnnh2VNGRB9EC1Cro96TQdq5TtSjb3qUjNaJP9IyA==",
       "dev": true,
       "requires": {
-        "@jest/environment": "^29.6.3",
-        "@jest/fake-timers": "^29.6.3",
+        "@jest/environment": "^29.6.4",
+        "@jest/fake-timers": "^29.6.4",
         "@jest/types": "^29.6.3",
         "@types/jsdom": "^20.0.0",
         "@types/node": "*",
diff --git a/apps/block_scout_web/assets/package.json b/apps/block_scout_web/assets/package.json
index 4200a8ab0b49..ca96b86d4b72 100644
--- a/apps/block_scout_web/assets/package.json
+++ b/apps/block_scout_web/assets/package.json
@@ -97,7 +97,7 @@
     "eslint-plugin-promise": "^6.1.1",
     "file-loader": "^6.2.0",
     "jest": "^29.6.4",
-    "jest-environment-jsdom": "^29.6.3",
+    "jest-environment-jsdom": "^29.6.4",
     "mini-css-extract-plugin": "^2.7.6",
     "postcss": "^8.4.28",
     "postcss-loader": "^7.3.3",

From 4c55d3828e4bdb9cc7dad2c5c8bcb5f91d83692f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 25 Aug 2023 07:41:47 +0000
Subject: [PATCH 339/909] Bump @babel/core from 7.22.10 to 7.22.11 in
 /apps/block_scout_web/assets

Bumps [@babel/core](https://github.com/babel/babel/tree/HEAD/packages/babel-core) from 7.22.10 to 7.22.11.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/commits/v7.22.11/packages/babel-core)

---
updated-dependencies:
- dependency-name: "@babel/core"
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 apps/block_scout_web/assets/package-lock.json | 98 +++++++++----------
 apps/block_scout_web/assets/package.json      |  2 +-
 2 files changed, 50 insertions(+), 50 deletions(-)

diff --git a/apps/block_scout_web/assets/package-lock.json b/apps/block_scout_web/assets/package-lock.json
index 547042da3cdc..e0d1fdaf2263 100644
--- a/apps/block_scout_web/assets/package-lock.json
+++ b/apps/block_scout_web/assets/package-lock.json
@@ -71,7 +71,7 @@
         "xss": "^1.0.14"
       },
       "devDependencies": {
-        "@babel/core": "^7.22.10",
+        "@babel/core": "^7.22.11",
         "@babel/preset-env": "^7.22.10",
         "autoprefixer": "^10.4.15",
         "babel-loader": "^9.1.3",
@@ -249,24 +249,24 @@
       }
     },
     "node_modules/@babel/core": {
-      "version": "7.22.10",
-      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.22.10.tgz",
-      "integrity": "sha512-fTmqbbUBAwCcre6zPzNngvsI0aNrPZe77AeqvDxWM9Nm+04RrJ3CAmGHA9f7lJQY6ZMhRztNemy4uslDxTX4Qw==",
+      "version": "7.22.11",
+      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.22.11.tgz",
+      "integrity": "sha512-lh7RJrtPdhibbxndr6/xx0w8+CVlY5FJZiaSz908Fpy+G0xkBFTvwLcKJFF4PJxVfGhVWNebikpWGnOoC71juQ==",
       "dependencies": {
         "@ampproject/remapping": "^2.2.0",
         "@babel/code-frame": "^7.22.10",
         "@babel/generator": "^7.22.10",
         "@babel/helper-compilation-targets": "^7.22.10",
         "@babel/helper-module-transforms": "^7.22.9",
-        "@babel/helpers": "^7.22.10",
-        "@babel/parser": "^7.22.10",
+        "@babel/helpers": "^7.22.11",
+        "@babel/parser": "^7.22.11",
         "@babel/template": "^7.22.5",
-        "@babel/traverse": "^7.22.10",
-        "@babel/types": "^7.22.10",
+        "@babel/traverse": "^7.22.11",
+        "@babel/types": "^7.22.11",
         "convert-source-map": "^1.7.0",
         "debug": "^4.1.0",
         "gensync": "^1.0.0-beta.2",
-        "json5": "^2.2.2",
+        "json5": "^2.2.3",
         "semver": "^6.3.1"
       },
       "engines": {
@@ -597,13 +597,13 @@
       }
     },
     "node_modules/@babel/helpers": {
-      "version": "7.22.10",
-      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.22.10.tgz",
-      "integrity": "sha512-a41J4NW8HyZa1I1vAndrraTlPZ/eZoga2ZgS7fEr0tZJGVU4xqdE80CEm0CcNjha5EZ8fTBYLKHF0kqDUuAwQw==",
+      "version": "7.22.11",
+      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.22.11.tgz",
+      "integrity": "sha512-vyOXC8PBWaGc5h7GMsNx68OH33cypkEDJCHvYVVgVbbxJDROYVtexSk0gK5iCF1xNjRIN2s8ai7hwkWDq5szWg==",
       "dependencies": {
         "@babel/template": "^7.22.5",
-        "@babel/traverse": "^7.22.10",
-        "@babel/types": "^7.22.10"
+        "@babel/traverse": "^7.22.11",
+        "@babel/types": "^7.22.11"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -623,9 +623,9 @@
       }
     },
     "node_modules/@babel/parser": {
-      "version": "7.22.10",
-      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.22.10.tgz",
-      "integrity": "sha512-lNbdGsQb9ekfsnjFGhEiF4hfFqGgfOP3H3d27re3n+CGhNuTSUEQdfWk556sTLNTloczcdM5TYF2LhzmDQKyvQ==",
+      "version": "7.22.11",
+      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.22.11.tgz",
+      "integrity": "sha512-R5zb8eJIBPJriQtbH/htEQy4k7E2dHWlD2Y2VT07JCzwYZHBxV5ZYtM0UhXSNMT74LyxuM+b1jdL7pSesXbC/g==",
       "bin": {
         "parser": "bin/babel-parser.js"
       },
@@ -1938,9 +1938,9 @@
       }
     },
     "node_modules/@babel/traverse": {
-      "version": "7.22.10",
-      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.22.10.tgz",
-      "integrity": "sha512-Q/urqV4pRByiNNpb/f5OSv28ZlGJiFiiTh+GAHktbIrkPhPbl90+uW6SmpoLyZqutrg9AEaEf3Q/ZBRHBXgxig==",
+      "version": "7.22.11",
+      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.22.11.tgz",
+      "integrity": "sha512-mzAenteTfomcB7mfPtyi+4oe5BZ6MXxWcn4CX+h4IRJ+OOGXBrWU6jDQavkQI9Vuc5P+donFabBfFCcmWka9lQ==",
       "dependencies": {
         "@babel/code-frame": "^7.22.10",
         "@babel/generator": "^7.22.10",
@@ -1948,8 +1948,8 @@
         "@babel/helper-function-name": "^7.22.5",
         "@babel/helper-hoist-variables": "^7.22.5",
         "@babel/helper-split-export-declaration": "^7.22.6",
-        "@babel/parser": "^7.22.10",
-        "@babel/types": "^7.22.10",
+        "@babel/parser": "^7.22.11",
+        "@babel/types": "^7.22.11",
         "debug": "^4.1.0",
         "globals": "^11.1.0"
       },
@@ -1958,9 +1958,9 @@
       }
     },
     "node_modules/@babel/types": {
-      "version": "7.22.10",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.22.10.tgz",
-      "integrity": "sha512-obaoigiLrlDZ7TUQln/8m4mSqIW2QFeOrCQc9r+xsaHGNoplVNYlRVpsfE8Vj35GEm2ZH4ZhrNYogs/3fj85kg==",
+      "version": "7.22.11",
+      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.22.11.tgz",
+      "integrity": "sha512-siazHiGuZRz9aB9NpHy9GOs9xiQPKnMzgdr493iI1M67vRXpnEq8ZOOKzezC5q7zwuQ6sDhdSp4SD9ixKSqKZg==",
       "dependencies": {
         "@babel/helper-string-parser": "^7.22.5",
         "@babel/helper-validator-identifier": "^7.22.5",
@@ -17737,24 +17737,24 @@
       "integrity": "sha512-5UamI7xkUcJ3i9qVDS+KFDEK8/7oJ55/sJMB1Ge7IEapr7KfdfV/HErR+koZwOfd+SgtFKOKRhRakdg++DcJpQ=="
     },
     "@babel/core": {
-      "version": "7.22.10",
-      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.22.10.tgz",
-      "integrity": "sha512-fTmqbbUBAwCcre6zPzNngvsI0aNrPZe77AeqvDxWM9Nm+04RrJ3CAmGHA9f7lJQY6ZMhRztNemy4uslDxTX4Qw==",
+      "version": "7.22.11",
+      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.22.11.tgz",
+      "integrity": "sha512-lh7RJrtPdhibbxndr6/xx0w8+CVlY5FJZiaSz908Fpy+G0xkBFTvwLcKJFF4PJxVfGhVWNebikpWGnOoC71juQ==",
       "requires": {
         "@ampproject/remapping": "^2.2.0",
         "@babel/code-frame": "^7.22.10",
         "@babel/generator": "^7.22.10",
         "@babel/helper-compilation-targets": "^7.22.10",
         "@babel/helper-module-transforms": "^7.22.9",
-        "@babel/helpers": "^7.22.10",
-        "@babel/parser": "^7.22.10",
+        "@babel/helpers": "^7.22.11",
+        "@babel/parser": "^7.22.11",
         "@babel/template": "^7.22.5",
-        "@babel/traverse": "^7.22.10",
-        "@babel/types": "^7.22.10",
+        "@babel/traverse": "^7.22.11",
+        "@babel/types": "^7.22.11",
         "convert-source-map": "^1.7.0",
         "debug": "^4.1.0",
         "gensync": "^1.0.0-beta.2",
-        "json5": "^2.2.2",
+        "json5": "^2.2.3",
         "semver": "^6.3.1"
       }
     },
@@ -17996,13 +17996,13 @@
       }
     },
     "@babel/helpers": {
-      "version": "7.22.10",
-      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.22.10.tgz",
-      "integrity": "sha512-a41J4NW8HyZa1I1vAndrraTlPZ/eZoga2ZgS7fEr0tZJGVU4xqdE80CEm0CcNjha5EZ8fTBYLKHF0kqDUuAwQw==",
+      "version": "7.22.11",
+      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.22.11.tgz",
+      "integrity": "sha512-vyOXC8PBWaGc5h7GMsNx68OH33cypkEDJCHvYVVgVbbxJDROYVtexSk0gK5iCF1xNjRIN2s8ai7hwkWDq5szWg==",
       "requires": {
         "@babel/template": "^7.22.5",
-        "@babel/traverse": "^7.22.10",
-        "@babel/types": "^7.22.10"
+        "@babel/traverse": "^7.22.11",
+        "@babel/types": "^7.22.11"
       }
     },
     "@babel/highlight": {
@@ -18016,9 +18016,9 @@
       }
     },
     "@babel/parser": {
-      "version": "7.22.10",
-      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.22.10.tgz",
-      "integrity": "sha512-lNbdGsQb9ekfsnjFGhEiF4hfFqGgfOP3H3d27re3n+CGhNuTSUEQdfWk556sTLNTloczcdM5TYF2LhzmDQKyvQ=="
+      "version": "7.22.11",
+      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.22.11.tgz",
+      "integrity": "sha512-R5zb8eJIBPJriQtbH/htEQy4k7E2dHWlD2Y2VT07JCzwYZHBxV5ZYtM0UhXSNMT74LyxuM+b1jdL7pSesXbC/g=="
     },
     "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": {
       "version": "7.22.5",
@@ -18904,9 +18904,9 @@
       }
     },
     "@babel/traverse": {
-      "version": "7.22.10",
-      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.22.10.tgz",
-      "integrity": "sha512-Q/urqV4pRByiNNpb/f5OSv28ZlGJiFiiTh+GAHktbIrkPhPbl90+uW6SmpoLyZqutrg9AEaEf3Q/ZBRHBXgxig==",
+      "version": "7.22.11",
+      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.22.11.tgz",
+      "integrity": "sha512-mzAenteTfomcB7mfPtyi+4oe5BZ6MXxWcn4CX+h4IRJ+OOGXBrWU6jDQavkQI9Vuc5P+donFabBfFCcmWka9lQ==",
       "requires": {
         "@babel/code-frame": "^7.22.10",
         "@babel/generator": "^7.22.10",
@@ -18914,16 +18914,16 @@
         "@babel/helper-function-name": "^7.22.5",
         "@babel/helper-hoist-variables": "^7.22.5",
         "@babel/helper-split-export-declaration": "^7.22.6",
-        "@babel/parser": "^7.22.10",
-        "@babel/types": "^7.22.10",
+        "@babel/parser": "^7.22.11",
+        "@babel/types": "^7.22.11",
         "debug": "^4.1.0",
         "globals": "^11.1.0"
       }
     },
     "@babel/types": {
-      "version": "7.22.10",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.22.10.tgz",
-      "integrity": "sha512-obaoigiLrlDZ7TUQln/8m4mSqIW2QFeOrCQc9r+xsaHGNoplVNYlRVpsfE8Vj35GEm2ZH4ZhrNYogs/3fj85kg==",
+      "version": "7.22.11",
+      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.22.11.tgz",
+      "integrity": "sha512-siazHiGuZRz9aB9NpHy9GOs9xiQPKnMzgdr493iI1M67vRXpnEq8ZOOKzezC5q7zwuQ6sDhdSp4SD9ixKSqKZg==",
       "requires": {
         "@babel/helper-string-parser": "^7.22.5",
         "@babel/helper-validator-identifier": "^7.22.5",
diff --git a/apps/block_scout_web/assets/package.json b/apps/block_scout_web/assets/package.json
index 4200a8ab0b49..7b9e0769eccc 100644
--- a/apps/block_scout_web/assets/package.json
+++ b/apps/block_scout_web/assets/package.json
@@ -83,7 +83,7 @@
     "xss": "^1.0.14"
   },
   "devDependencies": {
-    "@babel/core": "^7.22.10",
+    "@babel/core": "^7.22.11",
     "@babel/preset-env": "^7.22.10",
     "autoprefixer": "^10.4.15",
     "babel-loader": "^9.1.3",

From b605eb6ec933b63930856fd0e22744b0e34c3c9b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 25 Aug 2023 18:26:18 +0000
Subject: [PATCH 340/909] Bump @amplitude/analytics-browser in
 /apps/block_scout_web/assets

Bumps [@amplitude/analytics-browser](https://github.com/amplitude/Amplitude-TypeScript) from 2.2.0 to 2.2.1.
- [Release notes](https://github.com/amplitude/Amplitude-TypeScript/releases)
- [Commits](https://github.com/amplitude/Amplitude-TypeScript/compare/@amplitude/analytics-browser@2.2.0...@amplitude/analytics-browser@2.2.1)

---
updated-dependencies:
- dependency-name: "@amplitude/analytics-browser"
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 apps/block_scout_web/assets/package-lock.json | 190 +++++++++---------
 apps/block_scout_web/assets/package.json      |   2 +-
 2 files changed, 96 insertions(+), 96 deletions(-)

diff --git a/apps/block_scout_web/assets/package-lock.json b/apps/block_scout_web/assets/package-lock.json
index 0a8382f6cf54..8fdfa49f7209 100644
--- a/apps/block_scout_web/assets/package-lock.json
+++ b/apps/block_scout_web/assets/package-lock.json
@@ -7,7 +7,7 @@
       "name": "blockscout",
       "license": "GPL-3.0",
       "dependencies": {
-        "@amplitude/analytics-browser": "^2.2.0",
+        "@amplitude/analytics-browser": "^2.2.1",
         "@fortawesome/fontawesome-free": "^6.4.2",
         "@tarekraafat/autocomplete.js": "^10.2.7",
         "@walletconnect/web3-provider": "^1.8.0",
@@ -116,15 +116,15 @@
       }
     },
     "node_modules/@amplitude/analytics-browser": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/@amplitude/analytics-browser/-/analytics-browser-2.2.0.tgz",
-      "integrity": "sha512-gCRnvXT5FDmaXbrmDVdVLbm7ubYgpQX2dRnA3R8uPfqw3YGXszueVxTPKYuMf0fdQ3+1N9RcPmyEycpywN9vKg==",
-      "dependencies": {
-        "@amplitude/analytics-client-common": "^2.0.4",
-        "@amplitude/analytics-core": "^2.0.3",
-        "@amplitude/analytics-types": "^2.1.1",
-        "@amplitude/plugin-page-view-tracking-browser": "^2.0.6",
-        "@amplitude/plugin-web-attribution-browser": "^2.0.6",
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/@amplitude/analytics-browser/-/analytics-browser-2.2.1.tgz",
+      "integrity": "sha512-RrXXAnL2mbbkgyTUJ45azw3Q3938pH8ricGt0zImTHdeqYjhSvhyXRy3M/yn7V+99oeB0sibILRCy99YSUp0hw==",
+      "dependencies": {
+        "@amplitude/analytics-client-common": "^2.0.5",
+        "@amplitude/analytics-core": "^2.0.4",
+        "@amplitude/analytics-types": "^2.1.2",
+        "@amplitude/plugin-page-view-tracking-browser": "^2.0.7",
+        "@amplitude/plugin-web-attribution-browser": "^2.0.7",
         "tslib": "^2.4.1"
       }
     },
@@ -134,75 +134,75 @@
       "integrity": "sha512-tGyy4dAjRIEwI7BzsB0lynWgOpfqjUdq91XXAlIWD2OwKBH7oCl/GZG/HT4BOHrTlPMOASlMQ7veyTqpmRcrNA=="
     },
     "node_modules/@amplitude/analytics-client-common": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/@amplitude/analytics-client-common/-/analytics-client-common-2.0.4.tgz",
-      "integrity": "sha512-X0+zE8sODcQ2ioj9ZB98Gr/9FCRDiJuSixefaLrfng/4x5VwHK0if8biCqqBHXu6HlMpeMFrCyiABUTDT87QVA==",
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/@amplitude/analytics-client-common/-/analytics-client-common-2.0.5.tgz",
+      "integrity": "sha512-5BrGl188h4Ayx4Z2e1x4I3Z8ykC+ap65cy8ShBByiaBBrR40gnXSuLZR7xeex3lvTp2b5lMBcVCqArdRbeZrgQ==",
       "dependencies": {
         "@amplitude/analytics-connector": "^1.4.8",
-        "@amplitude/analytics-core": "^2.0.3",
-        "@amplitude/analytics-types": "^2.1.1",
+        "@amplitude/analytics-core": "^2.0.4",
+        "@amplitude/analytics-types": "^2.1.2",
         "tslib": "^2.4.1"
       }
     },
     "node_modules/@amplitude/analytics-client-common/node_modules/tslib": {
-      "version": "2.6.1",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.1.tgz",
-      "integrity": "sha512-t0hLfiEKfMUoqhG+U1oid7Pva4bbDPHYfJNiB7BiIjRkj1pyC++4N3huJfqY6aRH6VTB0rvtzQwjM4K6qpfOig=="
+      "version": "2.6.2",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz",
+      "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q=="
     },
     "node_modules/@amplitude/analytics-connector": {
-      "version": "1.4.8",
-      "resolved": "https://registry.npmjs.org/@amplitude/analytics-connector/-/analytics-connector-1.4.8.tgz",
-      "integrity": "sha512-dFW7c7Wb6Ng7vbmzwbaXZSpqfBx37ukamJV9ErFYYS8vGZK/Hkbt3M7fZHBI4WFU6CCwakr2ZXPme11uGPYWkQ=="
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/@amplitude/analytics-connector/-/analytics-connector-1.5.0.tgz",
+      "integrity": "sha512-T8mOYzB9RRxckzhL0NTHwdge9xuFxXEOplC8B1Y3UX3NHa3BLh7DlBUZlCOwQgMc2nxDfnSweDL5S3bhC+W90g=="
     },
     "node_modules/@amplitude/analytics-core": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/@amplitude/analytics-core/-/analytics-core-2.0.3.tgz",
-      "integrity": "sha512-tpD1gCmPpzPNPumQT1ecOJtuan5OsQdKp9AX8YKc7t1/K3xHzGo3FH3JvdaAJVYYWeZV40bp/JL6wJiYIzyZjA==",
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/@amplitude/analytics-core/-/analytics-core-2.0.4.tgz",
+      "integrity": "sha512-AM4g1ucaAJuFqaMBg7FiqwKHveyV2QpZ3yPxw3OxNCgZz2QmqeYE1bp47x4FlfzNsoGyuYqRKs1mCbmGobAYWA==",
       "dependencies": {
-        "@amplitude/analytics-types": "^2.1.1",
+        "@amplitude/analytics-types": "^2.1.2",
         "tslib": "^2.4.1"
       }
     },
     "node_modules/@amplitude/analytics-core/node_modules/tslib": {
-      "version": "2.6.1",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.1.tgz",
-      "integrity": "sha512-t0hLfiEKfMUoqhG+U1oid7Pva4bbDPHYfJNiB7BiIjRkj1pyC++4N3huJfqY6aRH6VTB0rvtzQwjM4K6qpfOig=="
+      "version": "2.6.2",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz",
+      "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q=="
     },
     "node_modules/@amplitude/analytics-types": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/@amplitude/analytics-types/-/analytics-types-2.1.1.tgz",
-      "integrity": "sha512-H3vebPR9onRdp0WzAZmI/4qmAE903uLOd2ZfMeHsVc1zaFTTCk46SoCuV4IrlF+VILrDw9Fy6gC9yl5N2PZcJQ=="
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/@amplitude/analytics-types/-/analytics-types-2.1.2.tgz",
+      "integrity": "sha512-ASKwH9g+5gglTHr7h7miK8J/ofIzuEtGRDCjnZAtRbE6+laoOfCLYPPJXMYz0k1x+rIhLO/6I6WWjT7zchmpyA=="
     },
     "node_modules/@amplitude/plugin-page-view-tracking-browser": {
-      "version": "2.0.6",
-      "resolved": "https://registry.npmjs.org/@amplitude/plugin-page-view-tracking-browser/-/plugin-page-view-tracking-browser-2.0.6.tgz",
-      "integrity": "sha512-V8ef24E+KYINQf1o9MQnkmhFmQHGD5lb6mlTH8jGD2PdUe/KDXdO4S4rpBewxcrAfUH+iEqEanbVnTWpg6iPnw==",
+      "version": "2.0.7",
+      "resolved": "https://registry.npmjs.org/@amplitude/plugin-page-view-tracking-browser/-/plugin-page-view-tracking-browser-2.0.7.tgz",
+      "integrity": "sha512-hVRgI29W6dsBokteDUBm4GHR8mN6Z+qStieU7x3XtPBuF+jYDEIgyF76iiHmbcILSRMuKQswH5fE6hkARvGK7g==",
       "dependencies": {
-        "@amplitude/analytics-client-common": "^2.0.4",
-        "@amplitude/analytics-types": "^2.1.1",
+        "@amplitude/analytics-client-common": "^2.0.5",
+        "@amplitude/analytics-types": "^2.1.2",
         "tslib": "^2.4.1"
       }
     },
     "node_modules/@amplitude/plugin-page-view-tracking-browser/node_modules/tslib": {
-      "version": "2.6.1",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.1.tgz",
-      "integrity": "sha512-t0hLfiEKfMUoqhG+U1oid7Pva4bbDPHYfJNiB7BiIjRkj1pyC++4N3huJfqY6aRH6VTB0rvtzQwjM4K6qpfOig=="
+      "version": "2.6.2",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz",
+      "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q=="
     },
     "node_modules/@amplitude/plugin-web-attribution-browser": {
-      "version": "2.0.6",
-      "resolved": "https://registry.npmjs.org/@amplitude/plugin-web-attribution-browser/-/plugin-web-attribution-browser-2.0.6.tgz",
-      "integrity": "sha512-+WQuhHJn7ZsYaTMe6iPE081b6y2oe9m+W/eZW+Lyf99Vt3rntDVYZIgZVwwds0s2SsUBcSvYFu1JgS65NfxWNQ==",
+      "version": "2.0.7",
+      "resolved": "https://registry.npmjs.org/@amplitude/plugin-web-attribution-browser/-/plugin-web-attribution-browser-2.0.7.tgz",
+      "integrity": "sha512-vfIIiWZgVKPck9i9/Pkih8Udx/eVK+P3UoBARCaV2uKUiA9WnJ/0uGm6/bkJeR1i9Kbp+MoVfSUPZXf7fBg5+A==",
       "dependencies": {
-        "@amplitude/analytics-client-common": "^2.0.4",
-        "@amplitude/analytics-core": "^2.0.3",
-        "@amplitude/analytics-types": "^2.1.1",
+        "@amplitude/analytics-client-common": "^2.0.5",
+        "@amplitude/analytics-core": "^2.0.4",
+        "@amplitude/analytics-types": "^2.1.2",
         "tslib": "^2.4.1"
       }
     },
     "node_modules/@amplitude/plugin-web-attribution-browser/node_modules/tslib": {
-      "version": "2.6.1",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.1.tgz",
-      "integrity": "sha512-t0hLfiEKfMUoqhG+U1oid7Pva4bbDPHYfJNiB7BiIjRkj1pyC++4N3huJfqY6aRH6VTB0rvtzQwjM4K6qpfOig=="
+      "version": "2.6.2",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz",
+      "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q=="
     },
     "node_modules/@ampproject/remapping": {
       "version": "2.2.0",
@@ -17604,15 +17604,15 @@
       "dev": true
     },
     "@amplitude/analytics-browser": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/@amplitude/analytics-browser/-/analytics-browser-2.2.0.tgz",
-      "integrity": "sha512-gCRnvXT5FDmaXbrmDVdVLbm7ubYgpQX2dRnA3R8uPfqw3YGXszueVxTPKYuMf0fdQ3+1N9RcPmyEycpywN9vKg==",
-      "requires": {
-        "@amplitude/analytics-client-common": "^2.0.4",
-        "@amplitude/analytics-core": "^2.0.3",
-        "@amplitude/analytics-types": "^2.1.1",
-        "@amplitude/plugin-page-view-tracking-browser": "^2.0.6",
-        "@amplitude/plugin-web-attribution-browser": "^2.0.6",
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/@amplitude/analytics-browser/-/analytics-browser-2.2.1.tgz",
+      "integrity": "sha512-RrXXAnL2mbbkgyTUJ45azw3Q3938pH8ricGt0zImTHdeqYjhSvhyXRy3M/yn7V+99oeB0sibILRCy99YSUp0hw==",
+      "requires": {
+        "@amplitude/analytics-client-common": "^2.0.5",
+        "@amplitude/analytics-core": "^2.0.4",
+        "@amplitude/analytics-types": "^2.1.2",
+        "@amplitude/plugin-page-view-tracking-browser": "^2.0.7",
+        "@amplitude/plugin-web-attribution-browser": "^2.0.7",
         "tslib": "^2.4.1"
       },
       "dependencies": {
@@ -17624,81 +17624,81 @@
       }
     },
     "@amplitude/analytics-client-common": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/@amplitude/analytics-client-common/-/analytics-client-common-2.0.4.tgz",
-      "integrity": "sha512-X0+zE8sODcQ2ioj9ZB98Gr/9FCRDiJuSixefaLrfng/4x5VwHK0if8biCqqBHXu6HlMpeMFrCyiABUTDT87QVA==",
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/@amplitude/analytics-client-common/-/analytics-client-common-2.0.5.tgz",
+      "integrity": "sha512-5BrGl188h4Ayx4Z2e1x4I3Z8ykC+ap65cy8ShBByiaBBrR40gnXSuLZR7xeex3lvTp2b5lMBcVCqArdRbeZrgQ==",
       "requires": {
         "@amplitude/analytics-connector": "^1.4.8",
-        "@amplitude/analytics-core": "^2.0.3",
-        "@amplitude/analytics-types": "^2.1.1",
+        "@amplitude/analytics-core": "^2.0.4",
+        "@amplitude/analytics-types": "^2.1.2",
         "tslib": "^2.4.1"
       },
       "dependencies": {
         "tslib": {
-          "version": "2.6.1",
-          "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.1.tgz",
-          "integrity": "sha512-t0hLfiEKfMUoqhG+U1oid7Pva4bbDPHYfJNiB7BiIjRkj1pyC++4N3huJfqY6aRH6VTB0rvtzQwjM4K6qpfOig=="
+          "version": "2.6.2",
+          "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz",
+          "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q=="
         }
       }
     },
     "@amplitude/analytics-connector": {
-      "version": "1.4.8",
-      "resolved": "https://registry.npmjs.org/@amplitude/analytics-connector/-/analytics-connector-1.4.8.tgz",
-      "integrity": "sha512-dFW7c7Wb6Ng7vbmzwbaXZSpqfBx37ukamJV9ErFYYS8vGZK/Hkbt3M7fZHBI4WFU6CCwakr2ZXPme11uGPYWkQ=="
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/@amplitude/analytics-connector/-/analytics-connector-1.5.0.tgz",
+      "integrity": "sha512-T8mOYzB9RRxckzhL0NTHwdge9xuFxXEOplC8B1Y3UX3NHa3BLh7DlBUZlCOwQgMc2nxDfnSweDL5S3bhC+W90g=="
     },
     "@amplitude/analytics-core": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/@amplitude/analytics-core/-/analytics-core-2.0.3.tgz",
-      "integrity": "sha512-tpD1gCmPpzPNPumQT1ecOJtuan5OsQdKp9AX8YKc7t1/K3xHzGo3FH3JvdaAJVYYWeZV40bp/JL6wJiYIzyZjA==",
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/@amplitude/analytics-core/-/analytics-core-2.0.4.tgz",
+      "integrity": "sha512-AM4g1ucaAJuFqaMBg7FiqwKHveyV2QpZ3yPxw3OxNCgZz2QmqeYE1bp47x4FlfzNsoGyuYqRKs1mCbmGobAYWA==",
       "requires": {
-        "@amplitude/analytics-types": "^2.1.1",
+        "@amplitude/analytics-types": "^2.1.2",
         "tslib": "^2.4.1"
       },
       "dependencies": {
         "tslib": {
-          "version": "2.6.1",
-          "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.1.tgz",
-          "integrity": "sha512-t0hLfiEKfMUoqhG+U1oid7Pva4bbDPHYfJNiB7BiIjRkj1pyC++4N3huJfqY6aRH6VTB0rvtzQwjM4K6qpfOig=="
+          "version": "2.6.2",
+          "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz",
+          "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q=="
         }
       }
     },
     "@amplitude/analytics-types": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/@amplitude/analytics-types/-/analytics-types-2.1.1.tgz",
-      "integrity": "sha512-H3vebPR9onRdp0WzAZmI/4qmAE903uLOd2ZfMeHsVc1zaFTTCk46SoCuV4IrlF+VILrDw9Fy6gC9yl5N2PZcJQ=="
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/@amplitude/analytics-types/-/analytics-types-2.1.2.tgz",
+      "integrity": "sha512-ASKwH9g+5gglTHr7h7miK8J/ofIzuEtGRDCjnZAtRbE6+laoOfCLYPPJXMYz0k1x+rIhLO/6I6WWjT7zchmpyA=="
     },
     "@amplitude/plugin-page-view-tracking-browser": {
-      "version": "2.0.6",
-      "resolved": "https://registry.npmjs.org/@amplitude/plugin-page-view-tracking-browser/-/plugin-page-view-tracking-browser-2.0.6.tgz",
-      "integrity": "sha512-V8ef24E+KYINQf1o9MQnkmhFmQHGD5lb6mlTH8jGD2PdUe/KDXdO4S4rpBewxcrAfUH+iEqEanbVnTWpg6iPnw==",
+      "version": "2.0.7",
+      "resolved": "https://registry.npmjs.org/@amplitude/plugin-page-view-tracking-browser/-/plugin-page-view-tracking-browser-2.0.7.tgz",
+      "integrity": "sha512-hVRgI29W6dsBokteDUBm4GHR8mN6Z+qStieU7x3XtPBuF+jYDEIgyF76iiHmbcILSRMuKQswH5fE6hkARvGK7g==",
       "requires": {
-        "@amplitude/analytics-client-common": "^2.0.4",
-        "@amplitude/analytics-types": "^2.1.1",
+        "@amplitude/analytics-client-common": "^2.0.5",
+        "@amplitude/analytics-types": "^2.1.2",
         "tslib": "^2.4.1"
       },
       "dependencies": {
         "tslib": {
-          "version": "2.6.1",
-          "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.1.tgz",
-          "integrity": "sha512-t0hLfiEKfMUoqhG+U1oid7Pva4bbDPHYfJNiB7BiIjRkj1pyC++4N3huJfqY6aRH6VTB0rvtzQwjM4K6qpfOig=="
+          "version": "2.6.2",
+          "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz",
+          "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q=="
         }
       }
     },
     "@amplitude/plugin-web-attribution-browser": {
-      "version": "2.0.6",
-      "resolved": "https://registry.npmjs.org/@amplitude/plugin-web-attribution-browser/-/plugin-web-attribution-browser-2.0.6.tgz",
-      "integrity": "sha512-+WQuhHJn7ZsYaTMe6iPE081b6y2oe9m+W/eZW+Lyf99Vt3rntDVYZIgZVwwds0s2SsUBcSvYFu1JgS65NfxWNQ==",
+      "version": "2.0.7",
+      "resolved": "https://registry.npmjs.org/@amplitude/plugin-web-attribution-browser/-/plugin-web-attribution-browser-2.0.7.tgz",
+      "integrity": "sha512-vfIIiWZgVKPck9i9/Pkih8Udx/eVK+P3UoBARCaV2uKUiA9WnJ/0uGm6/bkJeR1i9Kbp+MoVfSUPZXf7fBg5+A==",
       "requires": {
-        "@amplitude/analytics-client-common": "^2.0.4",
-        "@amplitude/analytics-core": "^2.0.3",
-        "@amplitude/analytics-types": "^2.1.1",
+        "@amplitude/analytics-client-common": "^2.0.5",
+        "@amplitude/analytics-core": "^2.0.4",
+        "@amplitude/analytics-types": "^2.1.2",
         "tslib": "^2.4.1"
       },
       "dependencies": {
         "tslib": {
-          "version": "2.6.1",
-          "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.1.tgz",
-          "integrity": "sha512-t0hLfiEKfMUoqhG+U1oid7Pva4bbDPHYfJNiB7BiIjRkj1pyC++4N3huJfqY6aRH6VTB0rvtzQwjM4K6qpfOig=="
+          "version": "2.6.2",
+          "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz",
+          "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q=="
         }
       }
     },
diff --git a/apps/block_scout_web/assets/package.json b/apps/block_scout_web/assets/package.json
index 475dbd99d212..0b0f97c3d2a4 100644
--- a/apps/block_scout_web/assets/package.json
+++ b/apps/block_scout_web/assets/package.json
@@ -20,7 +20,7 @@
   },
   "dependencies": {
     "@fortawesome/fontawesome-free": "^6.4.2",
-    "@amplitude/analytics-browser": "^2.2.0",
+    "@amplitude/analytics-browser": "^2.2.1",
     "@tarekraafat/autocomplete.js": "^10.2.7",
     "@walletconnect/web3-provider": "^1.8.0",
     "assert": "^2.0.0",

From 6a7029b3c15a8661d1d22d3b22e7b500a27992c1 Mon Sep 17 00:00:00 2001
From: Nikita Pozdniakov <nikitosing4@mail.ru>
Date: Thu, 24 Aug 2023 12:40:04 +0300
Subject: [PATCH 341/909] Add separate hackney pool for TokenInstance fetchers

---
 CHANGELOG.md                                  |  1 +
 .../instance_metadata_retriever_test.exs      | 37 +++++++++----------
 apps/indexer/lib/indexer/application.ex       |  6 +++
 .../indexer/fetcher/token_instance/helper.ex  |  4 +-
 .../token_instance/metadata_retriever.ex}     |  5 ++-
 5 files changed, 30 insertions(+), 23 deletions(-)
 rename apps/{explorer/lib/explorer/token/instance_metadata_retriever.ex => indexer/lib/indexer/fetcher/token_instance/metadata_retriever.ex} (98%)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f31d821ced65..5435dba7cc4d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,6 +10,7 @@
 
 ### Fixes
 
+- [#8287](https://github.com/blockscout/blockscout/pull/8287) - Add separate hackney pool for TokenInstance fetchers
 - [#8293](https://github.com/blockscout/blockscout/pull/8293) - Add ETHEREUM_JSONRPC_TRACE_URL for Geth in docker-compose.yml
 - [#8240](https://github.com/blockscout/blockscout/pull/8240) - Refactor and fix paging params in API v2
 - [#8242](https://github.com/blockscout/blockscout/pull/8242) - Fixing visualizer service CORS issue when running docker-compose
diff --git a/apps/explorer/test/explorer/token/instance_metadata_retriever_test.exs b/apps/explorer/test/explorer/token/instance_metadata_retriever_test.exs
index e9ef52dc583e..0e5ba979a939 100644
--- a/apps/explorer/test/explorer/token/instance_metadata_retriever_test.exs
+++ b/apps/explorer/test/explorer/token/instance_metadata_retriever_test.exs
@@ -1,8 +1,8 @@
-defmodule Explorer.Token.InstanceMetadataRetrieverTest do
+defmodule Explorer.Token.MetadataRetrieverTest do
   use EthereumJSONRPC.Case
 
   alias EthereumJSONRPC.Encoder
-  alias Explorer.Token.InstanceMetadataRetriever
+  alias Indexer.Fetcher.TokenInstance.MetadataRetriever
   alias Plug.Conn
 
   import Mox
@@ -90,7 +90,7 @@ defmodule Explorer.Token.InstanceMetadataRetrieverTest do
       assert %{
                "c87b56dd" => {:ok, ["https://vault.warriders.com/18290729947667102496.json"]}
              } ==
-               InstanceMetadataRetriever.query_contract(
+               MetadataRetriever.query_contract(
                  "0x5caebd3b32e210e85ce3e9d51638b9c445481567",
                  %{
                    "c87b56dd" => [18_290_729_947_667_102_496]
@@ -133,7 +133,7 @@ defmodule Explorer.Token.InstanceMetadataRetrieverTest do
       assert %{
                "0e89341c" => {:ok, ["https://vault.warriders.com/18290729947667102496.json"]}
              } ==
-               InstanceMetadataRetriever.query_contract(
+               MetadataRetriever.query_contract(
                  "0x5caebd3b32e210e85ce3e9d51638b9c445481567",
                  %{
                    "0e89341c" => [18_290_729_947_667_102_496]
@@ -164,7 +164,7 @@ defmodule Explorer.Token.InstanceMetadataRetrieverTest do
       end)
 
       assert {:ok, %{metadata: %{"name" => "Sérgio Mendonça"}}} ==
-               InstanceMetadataRetriever.fetch_json(%{
+               MetadataRetriever.fetch_json(%{
                  "c87b56dd" => {:ok, ["http://localhost:#{bypass.port}#{path}"]}
                })
     end
@@ -181,7 +181,7 @@ defmodule Explorer.Token.InstanceMetadataRetrieverTest do
       end)
 
       {:ok, %{metadata: metadata}} =
-        InstanceMetadataRetriever.fetch_metadata("0x06012c8cf97bead5deae237070f9587f8e7a266d", 100_500)
+        MetadataRetriever.fetch_metadata("0x06012c8cf97bead5deae237070f9587f8e7a266d", 100_500)
 
       assert Map.get(metadata, "name") == "KittyBlue_2_Lemonade"
 
@@ -212,8 +212,7 @@ defmodule Explorer.Token.InstanceMetadataRetrieverTest do
         Conn.resp(conn, 200, json)
       end)
 
-      {:ok, %{metadata: metadata}} =
-        InstanceMetadataRetriever.fetch_metadata_from_uri("http://localhost:#{bypass.port}#{path}")
+      {:ok, %{metadata: metadata}} = MetadataRetriever.fetch_metadata_from_uri("http://localhost:#{bypass.port}#{path}")
 
       assert Map.get(metadata, "attributes") == Jason.decode!(attributes)
     end
@@ -313,7 +312,7 @@ defmodule Explorer.Token.InstanceMetadataRetrieverTest do
                   "name" => "Sérgio Mendonça 0000000000000000000000000000000000000000000000000000000000000309"
                 }
               }} ==
-               InstanceMetadataRetriever.fetch_metadata("0x5caebd3b32e210e85ce3e9d51638b9c445481567", 777)
+               MetadataRetriever.fetch_metadata("0x5caebd3b32e210e85ce3e9d51638b9c445481567", 777)
     end
 
     test "decodes json file in tokenURI" do
@@ -325,7 +324,7 @@ defmodule Explorer.Token.InstanceMetadataRetrieverTest do
            ]}
       }
 
-      assert InstanceMetadataRetriever.fetch_json(data) ==
+      assert MetadataRetriever.fetch_json(data) ==
                {:ok,
                 %{
                   metadata: %{
@@ -347,7 +346,7 @@ defmodule Explorer.Token.InstanceMetadataRetrieverTest do
            ]}
       }
 
-      assert InstanceMetadataRetriever.fetch_json(data) ==
+      assert MetadataRetriever.fetch_json(data) ==
                {:ok,
                 %{
                   metadata: %{
@@ -368,7 +367,7 @@ defmodule Explorer.Token.InstanceMetadataRetrieverTest do
            ]}
       }
 
-      assert InstanceMetadataRetriever.fetch_json(data) ==
+      assert MetadataRetriever.fetch_json(data) ==
                {:ok,
                 %{
                   metadata: %{
@@ -403,7 +402,7 @@ defmodule Explorer.Token.InstanceMetadataRetrieverTest do
                 metadata: %{
                   "image" => "https://ipfs.io/ipfs/bafybeig6nlmyzui7llhauc52j2xo5hoy4lzp6442lkve5wysdvjkizxonu"
                 }
-              }} == InstanceMetadataRetriever.fetch_json(data)
+              }} == MetadataRetriever.fetch_json(data)
     end
 
     test "Fetches metadata from ipfs", %{bypass: bypass} do
@@ -430,7 +429,7 @@ defmodule Explorer.Token.InstanceMetadataRetrieverTest do
       {:ok,
        %{
          metadata: metadata
-       }} = InstanceMetadataRetriever.fetch_json(data)
+       }} = MetadataRetriever.fetch_json(data)
 
       assert "ipfs://bafybeihxuj3gxk7x5p36amzootyukbugmx3pw7dyntsrohg3se64efkuga/51.png" == Map.get(metadata, "image")
     end
@@ -467,7 +466,7 @@ defmodule Explorer.Token.InstanceMetadataRetrieverTest do
       assert {:ok,
               %{
                 metadata: Jason.decode!(json)
-              }} == InstanceMetadataRetriever.fetch_json(data)
+              }} == MetadataRetriever.fetch_json(data)
     end
 
     test "Process custom execution reverted" do
@@ -477,7 +476,7 @@ defmodule Explorer.Token.InstanceMetadataRetrieverTest do
            "(3) execution reverted: Nonexistent token (0x08c379a0000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000114e6f6e6578697374656e7420746f6b656e000000000000000000000000000000)"}
       }
 
-      assert {:ok, %{error: "VM execution error"}} == InstanceMetadataRetriever.fetch_json(data)
+      assert {:ok, %{error: "VM execution error"}} == MetadataRetriever.fetch_json(data)
     end
 
     test "Process CIDv0 IPFS links" do
@@ -507,7 +506,7 @@ defmodule Explorer.Token.InstanceMetadataRetrieverTest do
                   "name" => "asda",
                   "salePrice" => 34
                 }
-              }} == InstanceMetadataRetriever.fetch_json(%{"0e89341c" => {:ok, [data]}})
+              }} == MetadataRetriever.fetch_json(%{"0e89341c" => {:ok, [data]}})
 
       Application.put_env(:explorer, :http_adapter, HTTPoison)
     end
@@ -553,7 +552,7 @@ defmodule Explorer.Token.InstanceMetadataRetrieverTest do
               %{
                 metadata: Jason.decode!(json)
               }} ==
-               InstanceMetadataRetriever.fetch_json(%{"0e89341c" => {:ok, ["http://localhost:#{bypass.port}#{path}"]}})
+               MetadataRetriever.fetch_json(%{"0e89341c" => {:ok, ["http://localhost:#{bypass.port}#{path}"]}})
     end
 
     test "fetch ipfs of ipfs/{id} format" do
@@ -598,7 +597,7 @@ defmodule Explorer.Token.InstanceMetadataRetrieverTest do
                   "image" => "https://ipfs.io/ipfs/Qmd9pvThEwgjTBbEkNmmGFbcpJKw17fnRBAT4Td4rcog22"
                 }
               }} ==
-               InstanceMetadataRetriever.fetch_metadata("0x7e01CC81fCfdf6a71323900288A69e234C464f63", 0)
+               MetadataRetriever.fetch_metadata("0x7e01CC81fCfdf6a71323900288A69e234C464f63", 0)
 
       Application.put_env(:explorer, :http_adapter, HTTPoison)
     end
diff --git a/apps/indexer/lib/indexer/application.ex b/apps/indexer/lib/indexer/application.ex
index e47f5deeed23..9984918e06f9 100644
--- a/apps/indexer/lib/indexer/application.ex
+++ b/apps/indexer/lib/indexer/application.ex
@@ -24,7 +24,13 @@ defmodule Indexer.Application do
 
     json_rpc_named_arguments = Application.fetch_env!(:indexer, :json_rpc_named_arguments)
 
+    pool_size =
+      Application.get_env(:indexer, Indexer.Fetcher.TokenInstance.Retry)[:concurrency] +
+        Application.get_env(:indexer, Indexer.Fetcher.TokenInstance.Realtime)[:concurrency] +
+        Application.get_env(:indexer, Indexer.Fetcher.TokenInstance.Sanitize)[:concurrency]
+
     base_children = [
+      :hackney_pool.child_spec(:token_instance_fetcher, max_connections: pool_size),
       {Memory.Monitor, [memory_monitor_options, [name: memory_monitor_name]]},
       {CoinBalanceOnDemand.Supervisor, [json_rpc_named_arguments]},
       {TokenTotalSupplyOnDemand.Supervisor, []},
diff --git a/apps/indexer/lib/indexer/fetcher/token_instance/helper.ex b/apps/indexer/lib/indexer/fetcher/token_instance/helper.ex
index 57bc8ca37f58..8fa628ad9d9f 100644
--- a/apps/indexer/lib/indexer/fetcher/token_instance/helper.ex
+++ b/apps/indexer/lib/indexer/fetcher/token_instance/helper.ex
@@ -4,13 +4,13 @@ defmodule Indexer.Fetcher.TokenInstance.Helper do
   """
   alias Explorer.Chain
   alias Explorer.Chain.{Hash, Token.Instance}
-  alias Explorer.Token.InstanceMetadataRetriever
+  alias Indexer.Fetcher.TokenInstance.MetadataRetriever
 
   @spec fetch_instance(Hash.Address.t(), Decimal.t() | non_neg_integer()) :: {:ok, Instance.t()}
   def fetch_instance(token_contract_address_hash, token_id) do
     token_id = prepare_token_id(token_id)
 
-    case InstanceMetadataRetriever.fetch_metadata(to_string(token_contract_address_hash), token_id) do
+    case MetadataRetriever.fetch_metadata(to_string(token_contract_address_hash), token_id) do
       {:ok, %{metadata: metadata}} ->
         params = %{
           token_id: token_id,
diff --git a/apps/explorer/lib/explorer/token/instance_metadata_retriever.ex b/apps/indexer/lib/indexer/fetcher/token_instance/metadata_retriever.ex
similarity index 98%
rename from apps/explorer/lib/explorer/token/instance_metadata_retriever.ex
rename to apps/indexer/lib/indexer/fetcher/token_instance/metadata_retriever.ex
index 6967a756aed3..3ef7aa45c25f 100644
--- a/apps/explorer/lib/explorer/token/instance_metadata_retriever.ex
+++ b/apps/indexer/lib/indexer/fetcher/token_instance/metadata_retriever.ex
@@ -1,4 +1,4 @@
-defmodule Explorer.Token.InstanceMetadataRetriever do
+defmodule Indexer.Fetcher.TokenInstance.MetadataRetriever do
   @moduledoc """
   Fetches ERC721 token instance metadata.
   """
@@ -245,7 +245,8 @@ defmodule Explorer.Token.InstanceMetadataRetriever do
   def fetch_metadata_from_uri_inner(uri, hex_token_id) do
     case Application.get_env(:explorer, :http_adapter).get(uri, [],
            recv_timeout: 30_000,
-           follow_redirect: true
+           follow_redirect: true,
+           pool: :token_instance_fetcher
          ) do
       {:ok, %Response{body: body, status_code: 200, headers: headers}} ->
         content_type = get_content_type_from_headers(headers)

From 8c3451ce6c17ee504e4831a9d49afcfac137efb8 Mon Sep 17 00:00:00 2001
From: Nikita Pozdniakov <nikitosing4@mail.ru>
Date: Thu, 24 Aug 2023 17:44:39 +0300
Subject: [PATCH 342/909] Fix hackney options

---
 .../lib/indexer/fetcher/token_instance/metadata_retriever.ex    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/indexer/lib/indexer/fetcher/token_instance/metadata_retriever.ex b/apps/indexer/lib/indexer/fetcher/token_instance/metadata_retriever.ex
index 3ef7aa45c25f..bb4d39aee936 100644
--- a/apps/indexer/lib/indexer/fetcher/token_instance/metadata_retriever.ex
+++ b/apps/indexer/lib/indexer/fetcher/token_instance/metadata_retriever.ex
@@ -246,7 +246,7 @@ defmodule Indexer.Fetcher.TokenInstance.MetadataRetriever do
     case Application.get_env(:explorer, :http_adapter).get(uri, [],
            recv_timeout: 30_000,
            follow_redirect: true,
-           pool: :token_instance_fetcher
+           hackney: [pool: :token_instance_fetcher]
          ) do
       {:ok, %Response{body: body, status_code: 200, headers: headers}} ->
         content_type = get_content_type_from_headers(headers)

From 6ac168782cae6f8e218a4c070ea0755ae15f6626 Mon Sep 17 00:00:00 2001
From: Nikita Pozdniakov <nikitosing4@mail.ru>
Date: Wed, 23 Aug 2023 21:42:39 +0300
Subject: [PATCH 343/909] Add ranking of NFTs to the
 Indexer.Fetcher.TokenInstance.Retry

---
 CHANGELOG.md                        | 1 +
 apps/explorer/lib/explorer/chain.ex | 6 ++++++
 2 files changed, 7 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5435dba7cc4d..59d677f08ec0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,6 +10,7 @@
 
 ### Fixes
 
+- [#8282](https://github.com/blockscout/blockscout/pull/8282) - NFT fetcher improvements
 - [#8287](https://github.com/blockscout/blockscout/pull/8287) - Add separate hackney pool for TokenInstance fetchers
 - [#8293](https://github.com/blockscout/blockscout/pull/8293) - Add ETHEREUM_JSONRPC_TRACE_URL for Geth in docker-compose.yml
 - [#8240](https://github.com/blockscout/blockscout/pull/8240) - Refactor and fix paging params in API v2
diff --git a/apps/explorer/lib/explorer/chain.ex b/apps/explorer/lib/explorer/chain.ex
index 264ce9d67b1d..5fff5a423f7c 100644
--- a/apps/explorer/lib/explorer/chain.ex
+++ b/apps/explorer/lib/explorer/chain.ex
@@ -4446,6 +4446,11 @@ defmodule Explorer.Chain do
         ) :: {:ok, accumulator}
         when accumulator: term()
   def stream_token_instances_with_error(initial, reducer, limited? \\ false) when is_function(reducer, 2) do
+    # likely to get valid metadata
+    high_priority = ["request error: 429", ":checkout_timeout", ":econnrefused", ":timeout"]
+    # almost impossible to get valid metadata
+    negative_priority = ["VM execution error", "no uri", "invalid json"]
+
     Instance
     |> where([instance], not is_nil(instance.error))
     |> select([instance], %{
@@ -4453,6 +4458,7 @@ defmodule Explorer.Chain do
       token_id: instance.token_id,
       updated_at: instance.updated_at
     })
+    |> order_by([instance], desc: instance.error in ^high_priority, asc: instance.error in ^negative_priority)
     |> add_fetcher_limit(limited?)
     |> Repo.stream_reduce(initial, reducer)
   end

From 952206ef9a681c3590ede0818df16199044bfdc5 Mon Sep 17 00:00:00 2001
From: Qwerty5Uiop <alex000010@bk.ru>
Date: Tue, 22 Aug 2023 14:23:37 +0300
Subject: [PATCH 344/909] Don't push back to sequence on catchup exception

---
 CHANGELOG.md                                      | 1 +
 apps/indexer/lib/indexer/block/catchup/fetcher.ex | 3 ---
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5435dba7cc4d..b6f991a8a254 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,7 @@
 - [#8181](https://github.com/blockscout/blockscout/pull/8181) - Insert current token balances placeholders along with historical
 - [#8210](https://github.com/blockscout/blockscout/pull/8210) - Drop address foreign keys
 - [#8292](https://github.com/blockscout/blockscout/pull/8292) - Add ETHEREUM_JSONRPC_WAIT_PER_TIMEOUT env var
+- [#8269](https://github.com/blockscout/blockscout/pull/8269) - Don't push back to sequence on catchup exception
 
 ### Fixes
 
diff --git a/apps/indexer/lib/indexer/block/catchup/fetcher.ex b/apps/indexer/lib/indexer/block/catchup/fetcher.ex
index 740d788a251a..3b5fcbbc31fa 100644
--- a/apps/indexer/lib/indexer/block/catchup/fetcher.ex
+++ b/apps/indexer/lib/indexer/block/catchup/fetcher.ex
@@ -247,9 +247,6 @@ defmodule Indexer.Block.Catchup.Fetcher do
   rescue
     exception ->
       Logger.error(fn -> [Exception.format(:error, exception, __STACKTRACE__), ?\n, ?\n, "Retrying."] end)
-
-      push_back(sequence, range)
-
       {:error, exception}
   end
 

From ba481afc8db15beab85bade0c0c004c6f1b49ebf Mon Sep 17 00:00:00 2001
From: Nikita Pozdniakov <nikitosing4@mail.ru>
Date: Mon, 28 Aug 2023 11:08:37 +0300
Subject: [PATCH 345/909] Add batches to TokenInstance fetchers

---
 CHANGELOG.md                                  |   1 +
 .../lib/ethereum_jsonrpc/encoder.ex           |   4 +-
 apps/explorer/lib/explorer/chain.ex           |  11 +
 .../instance_metadata_retriever_test.exs      | 249 +++---------------
 .../indexer/fetcher/token_instance/helper.ex  | 174 ++++++++++--
 .../token_instance/metadata_retriever.ex      | 102 ++-----
 .../fetcher/token_instance/realtime.ex        |  12 +-
 .../indexer/fetcher/token_instance/retry.ex   |  18 +-
 .../fetcher/token_instance/sanitize.ex        |  14 +-
 .../fetcher/token_instance/helper_test.exs    | 178 +++++++++++++
 apps/indexer/test/test_helper.exs             |   1 +
 config/runtime.exs                            |   7 +-
 docker-compose/envs/common-blockscout.env     |   3 +
 docker/Makefile                               |   9 +
 14 files changed, 435 insertions(+), 348 deletions(-)
 create mode 100644 apps/indexer/test/indexer/fetcher/token_instance/helper_test.exs

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5435dba7cc4d..5dfacc16cda1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,7 @@
 
 ### Features
 
+- [#8313](https://github.com/blockscout/blockscout/pull/8313) - Add batches to TokenInstance fetchers
 - [#8181](https://github.com/blockscout/blockscout/pull/8181) - Insert current token balances placeholders along with historical
 - [#8210](https://github.com/blockscout/blockscout/pull/8210) - Drop address foreign keys
 - [#8292](https://github.com/blockscout/blockscout/pull/8292) - Add ETHEREUM_JSONRPC_WAIT_PER_TIMEOUT env var
diff --git a/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/encoder.ex b/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/encoder.ex
index 221c082b0218..37573679aa51 100644
--- a/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/encoder.ex
+++ b/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/encoder.ex
@@ -69,7 +69,7 @@ defmodule EthereumJSONRPC.Encoder do
     end
   end
 
-  def decode_result(result, selectors, _leave_error_as_map) when is_list(selectors) do
+  def decode_result(%{id: id, result: _result} = result, selectors, _leave_error_as_map) when is_list(selectors) do
     selectors
     |> Enum.map(fn selector ->
       try do
@@ -78,7 +78,7 @@ defmodule EthereumJSONRPC.Encoder do
         _ -> :error
       end
     end)
-    |> Enum.find(fn decode ->
+    |> Enum.find({id, {:error, :unable_to_decode}}, fn decode ->
       case decode do
         {_id, {:ok, _}} -> true
         _ -> false
diff --git a/apps/explorer/lib/explorer/chain.ex b/apps/explorer/lib/explorer/chain.ex
index 264ce9d67b1d..2c9ffe38aff5 100644
--- a/apps/explorer/lib/explorer/chain.ex
+++ b/apps/explorer/lib/explorer/chain.ex
@@ -4690,6 +4690,9 @@ defmodule Explorer.Chain do
     end
   end
 
+  @doc """
+    Expects map of change params. Inserts using on_conflict: :replace_all
+  """
   @spec upsert_token_instance(map()) :: {:ok, Instance.t()} | {:error, Ecto.Changeset.t()}
   def upsert_token_instance(params) do
     changeset = Instance.changeset(%Instance{}, params)
@@ -4700,6 +4703,14 @@ defmodule Explorer.Chain do
     )
   end
 
+  @doc """
+    Inserts list of token instances via upsert_token_instance/1.
+  """
+  @spec upsert_token_instances_list([map()]) :: list()
+  def upsert_token_instances_list(instances) do
+    Enum.map(instances, &upsert_token_instance/1)
+  end
+
   @doc """
   Update a new `t:Token.t/0` record.
 
diff --git a/apps/explorer/test/explorer/token/instance_metadata_retriever_test.exs b/apps/explorer/test/explorer/token/instance_metadata_retriever_test.exs
index 0e5ba979a939..a9255d04c796 100644
--- a/apps/explorer/test/explorer/token/instance_metadata_retriever_test.exs
+++ b/apps/explorer/test/explorer/token/instance_metadata_retriever_test.exs
@@ -1,7 +1,6 @@
 defmodule Explorer.Token.MetadataRetrieverTest do
   use EthereumJSONRPC.Case
 
-  alias EthereumJSONRPC.Encoder
   alias Indexer.Fetcher.TokenInstance.MetadataRetriever
   alias Plug.Conn
 
@@ -164,28 +163,7 @@ defmodule Explorer.Token.MetadataRetrieverTest do
       end)
 
       assert {:ok, %{metadata: %{"name" => "Sérgio Mendonça"}}} ==
-               MetadataRetriever.fetch_json(%{
-                 "c87b56dd" => {:ok, ["http://localhost:#{bypass.port}#{path}"]}
-               })
-    end
-
-    test "fetches json metadata for kitties" do
-      Application.put_env(:explorer, :http_adapter, Explorer.Mox.HTTPoison)
-
-      result =
-        "{\"id\":100500,\"name\":\"KittyBlue_2_Lemonade\",\"generation\":20,\"genes\":\"623509754227292470437941473598751240781530569131665917719736997423495595\",\"created_at\":\"2017-12-06T01:56:27.000Z\",\"birthday\":\"2017-12-06T00:00:00.000Z\",\"image_url\":\"https://img.cryptokitties.co/0x06012c8cf97bead5deae237070f9587f8e7a266d/100500.svg\",\"image_url_cdn\":\"https://img.cn.cryptokitties.co/0x06012c8cf97bead5deae237070f9587f8e7a266d/100500.svg\",\"color\":\"strawberry\",\"background_color\":\"#ffe0e5\",\"bio\":\"Shalom! I'm KittyBlue_2_Lemonade. I'm a professional Foreign Film Director and I love cantaloupe. I'm convinced that the world is flat. One day I'll prove it. It's pawesome to meet you!\",\"kitty_type\":null,\"is_fancy\":false,\"is_exclusive\":false,\"is_special_edition\":false,\"fancy_type\":null,\"language\":\"en\",\"is_prestige\":false,\"prestige_type\":null,\"prestige_ranking\":null,\"prestige_time_limit\":null,\"status\":{\"is_ready\":true,\"is_gestating\":false,\"cooldown\":1410310201506,\"dynamic_cooldown\":1475064986478,\"cooldown_index\":10,\"cooldown_end_block\":0,\"pending_tx_type\":null,\"pending_tx_since\":null},\"purrs\":{\"count\":1,\"is_purred\":false},\"watchlist\":{\"count\":0,\"is_watchlisted\":false},\"hatcher\":{\"address\":\"0x7b9ea9ac69b8fde875554321472c732eeff06ca0\",\"image\":\"14\",\"nickname\":\"KittyBlu\",\"hasDapper\":false,\"twitter_id\":null,\"twitter_image_url\":null,\"twitter_handle\":null},\"auction\":{},\"offer\":{},\"owner\":{\"address\":\"0x7b9ea9ac69b8fde875554321472c732eeff06ca0\",\"hasDapper\":false,\"twitter_id\":null,\"twitter_image_url\":null,\"twitter_handle\":null,\"image\":\"14\",\"nickname\":\"KittyBlu\"},\"matron\":{\"id\":46234,\"name\":\"KittyBlue_1_Limegreen\",\"generation\":10,\"enhanced_cattributes\":[{\"type\":\"body\",\"kittyId\":19631,\"position\":105,\"description\":\"cymric\"},{\"type\":\"coloreyes\",\"kittyId\":40356,\"position\":263,\"description\":\"limegreen\"},{\"type\":\"eyes\",\"kittyId\":3185,\"position\":16,\"description\":\"raisedbrow\"},{\"type\":\"pattern\",\"kittyId\":46234,\"position\":-1,\"description\":\"totesbasic\"},{\"type\":\"mouth\",\"kittyId\":46234,\"position\":-1,\"description\":\"happygokitty\"},{\"type\":\"colorprimary\",\"kittyId\":46234,\"position\":-1,\"description\":\"greymatter\"},{\"type\":\"colorsecondary\",\"kittyId\":46234,\"position\":-1,\"description\":\"lemonade\"},{\"type\":\"colortertiary\",\"kittyId\":46234,\"position\":-1,\"description\":\"granitegrey\"}],\"owner_wallet_address\":\"0x7b9ea9ac69b8fde875554321472c732eeff06ca0\",\"owner\":{\"address\":\"0x7b9ea9ac69b8fde875554321472c732eeff06ca0\"},\"created_at\":\"2017-12-03T21:29:17.000Z\",\"image_url\":\"https://img.cryptokitties.co/0x06012c8cf97bead5deae237070f9587f8e7a266d/46234.svg\",\"image_url_cdn\":\"https://img.cn.cryptokitties.co/0x06012c8cf97bead5deae237070f9587f8e7a266d/46234.svg\",\"color\":\"limegreen\",\"is_fancy\":false,\"kitty_type\":null,\"is_exclusive\":false,\"is_special_edition\":false,\"fancy_type\":null,\"status\":{\"is_ready\":true,\"is_gestating\":false,\"cooldown\":1486487069384},\"hatched\":true,\"wrapped\":false,\"image_url_png\":\"https://img.cryptokitties.co/0x06012c8cf97bead5deae237070f9587f8e7a266d/46234.png\"},\"sire\":{\"id\":82090,\"name\":null,\"generation\":19,\"enhanced_cattributes\":[{\"type\":\"body\",\"kittyId\":82090,\"position\":-1,\"description\":\"himalayan\"},{\"type\":\"coloreyes\",\"kittyId\":82090,\"position\":-1,\"description\":\"strawberry\"},{\"type\":\"eyes\",\"kittyId\":82090,\"position\":-1,\"description\":\"thicccbrowz\"},{\"type\":\"pattern\",\"kittyId\":82090,\"position\":-1,\"description\":\"totesbasic\"},{\"type\":\"mouth\",\"kittyId\":82090,\"position\":-1,\"description\":\"pouty\"},{\"type\":\"colorprimary\",\"kittyId\":82090,\"position\":-1,\"description\":\"aquamarine\"},{\"type\":\"colorsecondary\",\"kittyId\":82090,\"position\":-1,\"description\":\"chocolate\"},{\"type\":\"colortertiary\",\"kittyId\":82090,\"position\":-1,\"description\":\"granitegrey\"}],\"owner_wallet_address\":\"0x798fdad0cedc4b298fc7d53a982fa0c5f447eaa5\",\"owner\":{\"address\":\"0x798fdad0cedc4b298fc7d53a982fa0c5f447eaa5\"},\"created_at\":\"2017-12-05T06:30:05.000Z\",\"image_url\":\"https://img.cryptokitties.co/0x06012c8cf97bead5deae237070f9587f8e7a266d/82090.svg\",\"image_url_cdn\":\"https://img.cn.cryptokitties.co/0x06012c8cf97bead5deae237070f9587f8e7a266d/82090.svg\",\"color\":\"strawberry\",\"is_fancy\":false,\"is_exclusive\":false,\"is_special_edition\":false,\"fancy_type\":null,\"status\":{\"is_ready\":true,\"is_gestating\":false,\"cooldown\":1486619010030},\"kitty_type\":null,\"hatched\":true,\"wrapped\":false,\"image_url_png\":\"https://img.cryptokitties.co/0x06012c8cf97bead5deae237070f9587f8e7a266d/82090.png\"},\"children\":[],\"hatched\":true,\"wrapped\":false,\"enhanced_cattributes\":[{\"type\":\"colorprimary\",\"description\":\"greymatter\",\"position\":null,\"kittyId\":100500},{\"type\":\"coloreyes\",\"description\":\"strawberry\",\"position\":null,\"kittyId\":100500},{\"type\":\"body\",\"description\":\"himalayan\",\"position\":null,\"kittyId\":100500},{\"type\":\"colorsecondary\",\"description\":\"lemonade\",\"position\":null,\"kittyId\":100500},{\"type\":\"mouth\",\"description\":\"pouty\",\"position\":null,\"kittyId\":100500},{\"type\":\"pattern\",\"description\":\"totesbasic\",\"position\":null,\"kittyId\":100500},{\"type\":\"eyes\",\"description\":\"thicccbrowz\",\"position\":null,\"kittyId\":100500},{\"type\":\"colortertiary\",\"description\":\"kittencream\",\"position\":null,\"kittyId\":100500},{\"type\":\"secret\",\"description\":\"se5\",\"position\":-1,\"kittyId\":100500},{\"type\":\"purrstige\",\"description\":\"pu20\",\"position\":-1,\"kittyId\":100500}],\"variation\":null,\"variation_ranking\":null,\"image_url_png\":\"https://img.cryptokitties.co/0x06012c8cf97bead5deae237070f9587f8e7a266d/100500.png\",\"items\":[]}"
-
-      Explorer.Mox.HTTPoison
-      |> expect(:get, fn "https://api.cryptokitties.co/kitties/100500", _headers, _options ->
-        {:ok, %HTTPoison.Response{status_code: 200, body: result}}
-      end)
-
-      {:ok, %{metadata: metadata}} =
-        MetadataRetriever.fetch_metadata("0x06012c8cf97bead5deae237070f9587f8e7a266d", 100_500)
-
-      assert Map.get(metadata, "name") == "KittyBlue_2_Lemonade"
-
-      Application.put_env(:explorer, :http_adapter, HTTPoison)
+               MetadataRetriever.fetch_json({:ok, ["http://localhost:#{bypass.port}#{path}"]})
     end
 
     test "fetches json metadata when HTTP status 301", %{bypass: bypass} do
@@ -217,112 +195,12 @@ defmodule Explorer.Token.MetadataRetrieverTest do
       assert Map.get(metadata, "attributes") == Jason.decode!(attributes)
     end
 
-    test "replace {id} with actual token_id", %{bypass: bypass} do
-      json = """
-      {
-        "name": "Sérgio Mendonça {id}"
-      }
-      """
-
-      abi =
-        [
-          %{
-            "type" => "function",
-            "stateMutability" => "nonpayable",
-            "payable" => false,
-            "outputs" => [],
-            "name" => "tokenURI",
-            "inputs" => [
-              %{"type" => "string", "name" => "name", "internalType" => "string"}
-            ]
-          }
-        ]
-        |> ABI.parse_specification()
-        |> Enum.at(0)
-
-      encoded_url =
-        abi
-        |> Encoder.encode_function_call(["http://localhost:#{bypass.port}/api/card/{id}"])
-        |> String.replace("4cf12d26", "")
-
-      EthereumJSONRPC.Mox
-      |> expect(:json_rpc, fn [
-                                %{
-                                  id: 0,
-                                  jsonrpc: "2.0",
-                                  method: "eth_call",
-                                  params: [
-                                    %{
-                                      data:
-                                        "0xc87b56dd0000000000000000000000000000000000000000000000000000000000000309",
-                                      to: "0x5caebd3b32e210e85ce3e9d51638b9c445481567"
-                                    },
-                                    "latest"
-                                  ]
-                                }
-                              ],
-                              _options ->
-        {:ok,
-         [
-           %{
-             id: 0,
-             jsonrpc: "2.0",
-             error: %{code: -32000, message: "execution reverted"}
-           }
-         ]}
-      end)
-      |> expect(:json_rpc, fn [
-                                %{
-                                  id: 0,
-                                  jsonrpc: "2.0",
-                                  method: "eth_call",
-                                  params: [
-                                    %{
-                                      data:
-                                        "0x0e89341c0000000000000000000000000000000000000000000000000000000000000309",
-                                      to: "0x5caebd3b32e210e85ce3e9d51638b9c445481567"
-                                    },
-                                    "latest"
-                                  ]
-                                }
-                              ],
-                              _options ->
+    test "decodes json file in tokenURI" do
+      data =
         {:ok,
          [
-           %{
-             id: 0,
-             jsonrpc: "2.0",
-             result: encoded_url
-           }
+           "data:application/json,{\"name\":\"Home%20Address%20-%200x0000000000C1A6066c6c8B9d63e9B6E8865dC117\",\"description\":\"This%20NFT%20can%20be%20redeemed%20on%20HomeWork%20to%20grant%20a%20controller%20the%20exclusive%20right%20to%20deploy%20contracts%20with%20arbitrary%20bytecode%20to%20the%20designated%20home%20address.\",\"image\":\"data:image/svg+xml;charset=utf-8;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCAxNDQgNzIiPjxzdHlsZT48IVtDREFUQVsuQntzdHJva2UtbGluZWpvaW46cm91bmR9LkN7c3Ryb2tlLW1pdGVybGltaXQ6MTB9LkR7c3Ryb2tlLXdpZHRoOjJ9LkV7ZmlsbDojOWI5YjlhfS5Ge3N0cm9rZS1saW5lY2FwOnJvdW5kfV1dPjwvc3R5bGU+PGcgdHJhbnNmb3JtPSJtYXRyaXgoMS4wMiAwIDAgMS4wMiA4LjEgMCkiPjxwYXRoIGZpbGw9IiNmZmYiIGQ9Ik0xOSAzMmgzNHYyNEgxOXoiLz48ZyBzdHJva2U9IiMwMDAiIGNsYXNzPSJCIEMgRCI+PHBhdGggZmlsbD0iI2E1NzkzOSIgZD0iTTI1IDQwaDl2MTZoLTl6Ii8+PHBhdGggZmlsbD0iIzkyZDNmNSIgZD0iTTQwIDQwaDh2N2gtOHoiLz48cGF0aCBmaWxsPSIjZWE1YTQ3IiBkPSJNNTMgMzJIMTl2LTFsMTYtMTYgMTggMTZ6Ii8+PHBhdGggZmlsbD0ibm9uZSIgZD0iTTE5IDMyaDM0djI0SDE5eiIvPjxwYXRoIGZpbGw9IiNlYTVhNDciIGQ9Ik0yOSAyMWwtNSA1di05aDV6Ii8+PC9nPjwvZz48ZyB0cmFuc2Zvcm09Im1hdHJpeCguODQgMCAwIC44NCA2NSA1KSI+PHBhdGggZD0iTTkuNSAyMi45bDQuOCA2LjRhMy4xMiAzLjEyIDAgMCAxLTMgMi4ybC00LjgtNi40Yy4zLTEuNCAxLjYtMi40IDMtMi4yeiIgZmlsbD0iI2QwY2ZjZSIvPjxwYXRoIGZpbGw9IiMwMTAxMDEiIGQ9Ik00MS43IDM4LjVsNS4xLTYuNSIvPjxwYXRoIGQ9Ik00Mi45IDI3LjhMMTguNCA1OC4xIDI0IDYybDIxLjgtMjcuMyAyLjMtMi44eiIgY2xhc3M9IkUiLz48cGF0aCBmaWxsPSIjMDEwMTAxIiBkPSJNNDMuNCAyOS4zbC00LjcgNS44Ii8+PHBhdGggZD0iTTQ2LjggMzJjMy4yIDIuNiA4LjcgMS4yIDEyLjEtMy4yczMuNi05LjkuMy0xMi41bC01LjEgNi41LTIuOC0uMS0uNy0yLjcgNS4xLTYuNWMtMy4yLTIuNi04LjctMS4yLTEyLjEgMy4ycy0zLjYgOS45LS4zIDEyLjUiIGNsYXNzPSJFIi8+PHBhdGggZmlsbD0iI2E1NzkzOSIgZD0iTTI3LjMgMjZsMTEuOCAxNS43IDMuNCAyLjQgOS4xIDE0LjQtMy4yIDIuMy0xIC43LTEwLjItMTMuNi0xLjMtMy45LTExLjgtMTUuN3oiLz48cGF0aCBkPSJNMTIgMTkuOWw1LjkgNy45IDEwLjItNy42LTMuNC00LjVzNi44LTUuMSAxMC43LTQuNWMwIDAtNi42LTMtMTMuMyAxLjFTMTIgMTkuOSAxMiAxOS45eiIgY2xhc3M9IkUiLz48ZyBmaWxsPSJub25lIiBzdHJva2U9IiMwMDAiIGNsYXNzPSJCIEMgRCI+PHBhdGggZD0iTTUyIDU4LjlMNDAuOSA0My4ybC0zLjEtMi4zLTEwLjYtMTQuNy0yLjkgMi4yIDEwLjYgMTQuNyAxLjEgMy42IDExLjUgMTUuNXpNMTIuNSAxOS44bDUuOCA4IDEwLjMtNy40LTMuMy00LjZzNi45LTUgMTAuOC00LjNjMCAwLTYuNi0zLjEtMTMuMy45cy0xMC4zIDcuNC0xMC4zIDcuNHptLTIuNiAyLjlsNC43IDYuNWMtLjUgMS4zLTEuNyAyLjEtMyAyLjJsLTQuNy02LjVjLjMtMS40IDEuNi0yLjQgMy0yLjJ6Ii8+PHBhdGggZD0iTTQxLjMgMzguNWw1LjEtNi41bS0zLjUtMi43bC00LjYgNS44bTguMS0zLjFjMy4yIDIuNiA4LjcgMS4yIDEyLjEtMy4yczMuNi05LjkuMy0xMi41bC01LjEgNi41LTIuOC0uMS0uOC0yLjcgNS4xLTYuNWMtMy4yLTIuNi04LjctMS4yLTEyLjEgMy4yLTMuNCA0LjMtMy42IDkuOS0uMyAxMi41IiBjbGFzcz0iRiIvPjxwYXRoIGQ9Ik0zMC44IDQ0LjRMMTkgNTguOWw0IDMgMTAtMTIuNyIgY2xhc3M9IkYiLz48L2c+PC9nPjwvc3ZnPg==\"}"
          ]}
-      end)
-
-      Bypass.expect(
-        bypass,
-        "GET",
-        "/api/card/0000000000000000000000000000000000000000000000000000000000000309",
-        fn conn ->
-          Conn.resp(conn, 200, json)
-        end
-      )
-
-      assert {:ok,
-              %{
-                metadata: %{
-                  "name" => "Sérgio Mendonça 0000000000000000000000000000000000000000000000000000000000000309"
-                }
-              }} ==
-               MetadataRetriever.fetch_metadata("0x5caebd3b32e210e85ce3e9d51638b9c445481567", 777)
-    end
-
-    test "decodes json file in tokenURI" do
-      data = %{
-        "c87b56dd" =>
-          {:ok,
-           [
-             "data:application/json,{\"name\":\"Home%20Address%20-%200x0000000000C1A6066c6c8B9d63e9B6E8865dC117\",\"description\":\"This%20NFT%20can%20be%20redeemed%20on%20HomeWork%20to%20grant%20a%20controller%20the%20exclusive%20right%20to%20deploy%20contracts%20with%20arbitrary%20bytecode%20to%20the%20designated%20home%20address.\",\"image\":\"data:image/svg+xml;charset=utf-8;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCAxNDQgNzIiPjxzdHlsZT48IVtDREFUQVsuQntzdHJva2UtbGluZWpvaW46cm91bmR9LkN7c3Ryb2tlLW1pdGVybGltaXQ6MTB9LkR7c3Ryb2tlLXdpZHRoOjJ9LkV7ZmlsbDojOWI5YjlhfS5Ge3N0cm9rZS1saW5lY2FwOnJvdW5kfV1dPjwvc3R5bGU+PGcgdHJhbnNmb3JtPSJtYXRyaXgoMS4wMiAwIDAgMS4wMiA4LjEgMCkiPjxwYXRoIGZpbGw9IiNmZmYiIGQ9Ik0xOSAzMmgzNHYyNEgxOXoiLz48ZyBzdHJva2U9IiMwMDAiIGNsYXNzPSJCIEMgRCI+PHBhdGggZmlsbD0iI2E1NzkzOSIgZD0iTTI1IDQwaDl2MTZoLTl6Ii8+PHBhdGggZmlsbD0iIzkyZDNmNSIgZD0iTTQwIDQwaDh2N2gtOHoiLz48cGF0aCBmaWxsPSIjZWE1YTQ3IiBkPSJNNTMgMzJIMTl2LTFsMTYtMTYgMTggMTZ6Ii8+PHBhdGggZmlsbD0ibm9uZSIgZD0iTTE5IDMyaDM0djI0SDE5eiIvPjxwYXRoIGZpbGw9IiNlYTVhNDciIGQ9Ik0yOSAyMWwtNSA1di05aDV6Ii8+PC9nPjwvZz48ZyB0cmFuc2Zvcm09Im1hdHJpeCguODQgMCAwIC44NCA2NSA1KSI+PHBhdGggZD0iTTkuNSAyMi45bDQuOCA2LjRhMy4xMiAzLjEyIDAgMCAxLTMgMi4ybC00LjgtNi40Yy4zLTEuNCAxLjYtMi40IDMtMi4yeiIgZmlsbD0iI2QwY2ZjZSIvPjxwYXRoIGZpbGw9IiMwMTAxMDEiIGQ9Ik00MS43IDM4LjVsNS4xLTYuNSIvPjxwYXRoIGQ9Ik00Mi45IDI3LjhMMTguNCA1OC4xIDI0IDYybDIxLjgtMjcuMyAyLjMtMi44eiIgY2xhc3M9IkUiLz48cGF0aCBmaWxsPSIjMDEwMTAxIiBkPSJNNDMuNCAyOS4zbC00LjcgNS44Ii8+PHBhdGggZD0iTTQ2LjggMzJjMy4yIDIuNiA4LjcgMS4yIDEyLjEtMy4yczMuNi05LjkuMy0xMi41bC01LjEgNi41LTIuOC0uMS0uNy0yLjcgNS4xLTYuNWMtMy4yLTIuNi04LjctMS4yLTEyLjEgMy4ycy0zLjYgOS45LS4zIDEyLjUiIGNsYXNzPSJFIi8+PHBhdGggZmlsbD0iI2E1NzkzOSIgZD0iTTI3LjMgMjZsMTEuOCAxNS43IDMuNCAyLjQgOS4xIDE0LjQtMy4yIDIuMy0xIC43LTEwLjItMTMuNi0xLjMtMy45LTExLjgtMTUuN3oiLz48cGF0aCBkPSJNMTIgMTkuOWw1LjkgNy45IDEwLjItNy42LTMuNC00LjVzNi44LTUuMSAxMC43LTQuNWMwIDAtNi42LTMtMTMuMyAxLjFTMTIgMTkuOSAxMiAxOS45eiIgY2xhc3M9IkUiLz48ZyBmaWxsPSJub25lIiBzdHJva2U9IiMwMDAiIGNsYXNzPSJCIEMgRCI+PHBhdGggZD0iTTUyIDU4LjlMNDAuOSA0My4ybC0zLjEtMi4zLTEwLjYtMTQuNy0yLjkgMi4yIDEwLjYgMTQuNyAxLjEgMy42IDExLjUgMTUuNXpNMTIuNSAxOS44bDUuOCA4IDEwLjMtNy40LTMuMy00LjZzNi45LTUgMTAuOC00LjNjMCAwLTYuNi0zLjEtMTMuMy45cy0xMC4zIDcuNC0xMC4zIDcuNHptLTIuNiAyLjlsNC43IDYuNWMtLjUgMS4zLTEuNyAyLjEtMyAyLjJsLTQuNy02LjVjLjMtMS40IDEuNi0yLjQgMy0yLjJ6Ii8+PHBhdGggZD0iTTQxLjMgMzguNWw1LjEtNi41bS0zLjUtMi43bC00LjYgNS44bTguMS0zLjFjMy4yIDIuNiA4LjcgMS4yIDEyLjEtMy4yczMuNi05LjkuMy0xMi41bC01LjEgNi41LTIuOC0uMS0uOC0yLjcgNS4xLTYuNWMtMy4yLTIuNi04LjctMS4yLTEyLjEgMy4yLTMuNCA0LjMtMy42IDkuOS0uMyAxMi41IiBjbGFzcz0iRiIvPjxwYXRoIGQ9Ik0zMC44IDQ0LjRMMTkgNTguOWw0IDMgMTAtMTIuNyIgY2xhc3M9IkYiLz48L2c+PC9nPjwvc3ZnPg==\"}"
-           ]}
-      }
 
       assert MetadataRetriever.fetch_json(data) ==
                {:ok,
@@ -338,13 +216,11 @@ defmodule Explorer.Token.MetadataRetrieverTest do
     end
 
     test "decodes base64 encoded json file in tokenURI" do
-      data = %{
-        "c87b56dd" =>
-          {:ok,
-           [
-             "data:application/json;base64,eyJuYW1lIjogIi54ZGFpIiwgImRlc2NyaXB0aW9uIjogIlB1bmsgRG9tYWlucyBkaWdpdGFsIGlkZW50aXR5LiBWaXNpdCBodHRwczovL3B1bmsuZG9tYWlucy8iLCAiaW1hZ2UiOiAiZGF0YTppbWFnZS9zdmcreG1sO2Jhc2U2NCxQSE4yWnlCNGJXeHVjejBpYUhSMGNEb3ZMM2QzZHk1M015NXZjbWN2TWpBd01DOXpkbWNpSUhacFpYZENiM2c5SWpBZ01DQTFNREFnTlRBd0lpQjNhV1IwYUQwaU5UQXdJaUJvWldsbmFIUTlJalV3TUNJK1BHUmxabk0rUEd4cGJtVmhja2R5WVdScFpXNTBJR2xrUFNKbmNtRmtJaUI0TVQwaU1DVWlJSGt4UFNJd0pTSWdlREk5SWpFd01DVWlJSGt5UFNJd0pTSStQSE4wYjNBZ2IyWm1jMlYwUFNJd0pTSWdjM1I1YkdVOUluTjBiM0F0WTI5c2IzSTZjbWRpS0RVNExERTNMREV4TmlrN2MzUnZjQzF2Y0dGamFYUjVPakVpSUM4K1BITjBiM0FnYjJabWMyVjBQU0l4TURBbElpQnpkSGxzWlQwaWMzUnZjQzFqYjJ4dmNqcHlaMklvTVRFMkxESTFMREUzS1R0emRHOXdMVzl3WVdOcGRIazZNU0lnTHo0OEwyeHBibVZoY2tkeVlXUnBaVzUwUGp3dlpHVm1jejQ4Y21WamRDQjRQU0l3SWlCNVBTSXdJaUIzYVdSMGFEMGlOVEF3SWlCb1pXbG5hSFE5SWpVd01DSWdabWxzYkQwaWRYSnNLQ05uY21Ga0tTSXZQangwWlhoMElIZzlJalV3SlNJZ2VUMGlOVEFsSWlCa2IyMXBibUZ1ZEMxaVlYTmxiR2x1WlQwaWJXbGtaR3hsSWlCbWFXeHNQU0ozYUdsMFpTSWdkR1Y0ZEMxaGJtTm9iM0k5SW0xcFpHUnNaU0lnWm05dWRDMXphWHBsUFNKNExXeGhjbWRsSWo0dWVHUmhhVHd2ZEdWNGRENDhkR1Y0ZENCNFBTSTFNQ1VpSUhrOUlqY3dKU0lnWkc5dGFXNWhiblF0WW1GelpXeHBibVU5SW0xcFpHUnNaU0lnWm1sc2JEMGlkMmhwZEdVaUlIUmxlSFF0WVc1amFHOXlQU0p0YVdSa2JHVWlQbkIxYm1zdVpHOXRZV2x1Y3p3dmRHVjRkRDQ4TDNOMlp6ND0ifQ=="
-           ]}
-      }
+      data =
+        {:ok,
+         [
+           "data:application/json;base64,eyJuYW1lIjogIi54ZGFpIiwgImRlc2NyaXB0aW9uIjogIlB1bmsgRG9tYWlucyBkaWdpdGFsIGlkZW50aXR5LiBWaXNpdCBodHRwczovL3B1bmsuZG9tYWlucy8iLCAiaW1hZ2UiOiAiZGF0YTppbWFnZS9zdmcreG1sO2Jhc2U2NCxQSE4yWnlCNGJXeHVjejBpYUhSMGNEb3ZMM2QzZHk1M015NXZjbWN2TWpBd01DOXpkbWNpSUhacFpYZENiM2c5SWpBZ01DQTFNREFnTlRBd0lpQjNhV1IwYUQwaU5UQXdJaUJvWldsbmFIUTlJalV3TUNJK1BHUmxabk0rUEd4cGJtVmhja2R5WVdScFpXNTBJR2xrUFNKbmNtRmtJaUI0TVQwaU1DVWlJSGt4UFNJd0pTSWdlREk5SWpFd01DVWlJSGt5UFNJd0pTSStQSE4wYjNBZ2IyWm1jMlYwUFNJd0pTSWdjM1I1YkdVOUluTjBiM0F0WTI5c2IzSTZjbWRpS0RVNExERTNMREV4TmlrN2MzUnZjQzF2Y0dGamFYUjVPakVpSUM4K1BITjBiM0FnYjJabWMyVjBQU0l4TURBbElpQnpkSGxzWlQwaWMzUnZjQzFqYjJ4dmNqcHlaMklvTVRFMkxESTFMREUzS1R0emRHOXdMVzl3WVdOcGRIazZNU0lnTHo0OEwyeHBibVZoY2tkeVlXUnBaVzUwUGp3dlpHVm1jejQ4Y21WamRDQjRQU0l3SWlCNVBTSXdJaUIzYVdSMGFEMGlOVEF3SWlCb1pXbG5hSFE5SWpVd01DSWdabWxzYkQwaWRYSnNLQ05uY21Ga0tTSXZQangwWlhoMElIZzlJalV3SlNJZ2VUMGlOVEFsSWlCa2IyMXBibUZ1ZEMxaVlYTmxiR2x1WlQwaWJXbGtaR3hsSWlCbWFXeHNQU0ozYUdsMFpTSWdkR1Y0ZEMxaGJtTm9iM0k5SW0xcFpHUnNaU0lnWm05dWRDMXphWHBsUFNKNExXeGhjbWRsSWo0dWVHUmhhVHd2ZEdWNGRENDhkR1Y0ZENCNFBTSTFNQ1VpSUhrOUlqY3dKU0lnWkc5dGFXNWhiblF0WW1GelpXeHBibVU5SW0xcFpHUnNaU0lnWm1sc2JEMGlkMmhwZEdVaUlIUmxlSFF0WVc1amFHOXlQU0p0YVdSa2JHVWlQbkIxYm1zdVpHOXRZV2x1Y3p3dmRHVjRkRDQ4TDNOMlp6ND0ifQ=="
+         ]}
 
       assert MetadataRetriever.fetch_json(data) ==
                {:ok,
@@ -359,13 +235,11 @@ defmodule Explorer.Token.MetadataRetrieverTest do
     end
 
     test "decodes base64 encoded json file (with unicode string) in tokenURI" do
-      data = %{
-        "c87b56dd" =>
-          {:ok,
-           [
-             "data:application/json;base64,eyJkZXNjcmlwdGlvbiI6ICJQdW5rIERvbWFpbnMgZGlnaXRhbCBpZGVudGl0eSDDry4gVmlzaXQgaHR0cHM6Ly9wdW5rLmRvbWFpbnMvIn0="
-           ]}
-      }
+      data =
+        {:ok,
+         [
+           "data:application/json;base64,eyJkZXNjcmlwdGlvbiI6ICJQdW5rIERvbWFpbnMgZGlnaXRhbCBpZGVudGl0eSDDry4gVmlzaXQgaHR0cHM6Ly9wdW5rLmRvbWFpbnMvIn0="
+         ]}
 
       assert MetadataRetriever.fetch_json(data) ==
                {:ok,
@@ -389,13 +263,11 @@ defmodule Explorer.Token.MetadataRetrieverTest do
         Conn.resp(conn, 200, json)
       end)
 
-      data = %{
-        "c87b56dd" =>
-          {:ok,
-           [
-             "http://localhost:#{bypass.port}#{path}"
-           ]}
-      }
+      data =
+        {:ok,
+         [
+           "http://localhost:#{bypass.port}#{path}"
+         ]}
 
       assert {:ok,
               %{
@@ -418,13 +290,11 @@ defmodule Explorer.Token.MetadataRetrieverTest do
         Conn.resp(conn, 200, json)
       end)
 
-      data = %{
-        "c87b56dd" =>
-          {:ok,
-           [
-             "http://localhost:#{bypass.port}#{path}"
-           ]}
-      }
+      data =
+        {:ok,
+         [
+           "http://localhost:#{bypass.port}#{path}"
+         ]}
 
       {:ok,
        %{
@@ -437,13 +307,11 @@ defmodule Explorer.Token.MetadataRetrieverTest do
     test "Fetches metadata from '${url}'", %{bypass: bypass} do
       path = "/data/8/8578.json"
 
-      data = %{
-        "c87b56dd" =>
-          {:ok,
-           [
-             "'http://localhost:#{bypass.port}#{path}'"
-           ]}
-      }
+      data =
+        {:ok,
+         [
+           "'http://localhost:#{bypass.port}#{path}'"
+         ]}
 
       json = """
       {
@@ -470,11 +338,9 @@ defmodule Explorer.Token.MetadataRetrieverTest do
     end
 
     test "Process custom execution reverted" do
-      data = %{
-        "c87b56dd" =>
-          {:error,
-           "(3) execution reverted: Nonexistent token (0x08c379a0000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000114e6f6e6578697374656e7420746f6b656e000000000000000000000000000000)"}
-      }
+      data =
+        {:error,
+         "(3) execution reverted: Nonexistent token (0x08c379a0000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000114e6f6e6578697374656e7420746f6b656e000000000000000000000000000000)"}
 
       assert {:ok, %{error: "VM execution error"}} == MetadataRetriever.fetch_json(data)
     end
@@ -506,7 +372,7 @@ defmodule Explorer.Token.MetadataRetrieverTest do
                   "name" => "asda",
                   "salePrice" => 34
                 }
-              }} == MetadataRetriever.fetch_json(%{"0e89341c" => {:ok, [data]}})
+              }} == MetadataRetriever.fetch_json({:ok, [data]})
 
       Application.put_env(:explorer, :http_adapter, HTTPoison)
     end
@@ -552,54 +418,7 @@ defmodule Explorer.Token.MetadataRetrieverTest do
               %{
                 metadata: Jason.decode!(json)
               }} ==
-               MetadataRetriever.fetch_json(%{"0e89341c" => {:ok, ["http://localhost:#{bypass.port}#{path}"]}})
-    end
-
-    test "fetch ipfs of ipfs/{id} format" do
-      EthereumJSONRPC.Mox
-      |> expect(:json_rpc, fn [
-                                %{
-                                  id: 0,
-                                  jsonrpc: "2.0",
-                                  method: "eth_call",
-                                  params: [
-                                    %{
-                                      data:
-                                        "0xc87b56dd0000000000000000000000000000000000000000000000000000000000000000",
-                                      to: "0x7e01CC81fCfdf6a71323900288A69e234C464f63"
-                                    },
-                                    "latest"
-                                  ]
-                                }
-                              ],
-                              _options ->
-        {:ok,
-         [
-           %{
-             id: 0,
-             jsonrpc: "2.0",
-             result:
-               "0x00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000033697066732f516d6439707654684577676a544262456b4e6d6d47466263704a4b773137666e524241543454643472636f67323200000000000000000000000000"
-           }
-         ]}
-      end)
-
-      Application.put_env(:explorer, :http_adapter, Explorer.Mox.HTTPoison)
-
-      Explorer.Mox.HTTPoison
-      |> expect(:get, fn "https://ipfs.io/ipfs/Qmd9pvThEwgjTBbEkNmmGFbcpJKw17fnRBAT4Td4rcog22", _headers, _options ->
-        {:ok, %HTTPoison.Response{status_code: 200, body: "123", headers: [{"Content-Type", "image/jpg"}]}}
-      end)
-
-      assert {:ok,
-              %{
-                metadata: %{
-                  "image" => "https://ipfs.io/ipfs/Qmd9pvThEwgjTBbEkNmmGFbcpJKw17fnRBAT4Td4rcog22"
-                }
-              }} ==
-               MetadataRetriever.fetch_metadata("0x7e01CC81fCfdf6a71323900288A69e234C464f63", 0)
-
-      Application.put_env(:explorer, :http_adapter, HTTPoison)
+               MetadataRetriever.fetch_json({:ok, ["http://localhost:#{bypass.port}#{path}"]})
     end
   end
 end
diff --git a/apps/indexer/lib/indexer/fetcher/token_instance/helper.ex b/apps/indexer/lib/indexer/fetcher/token_instance/helper.ex
index 8fa628ad9d9f..e5e2256ff9eb 100644
--- a/apps/indexer/lib/indexer/fetcher/token_instance/helper.ex
+++ b/apps/indexer/lib/indexer/fetcher/token_instance/helper.ex
@@ -3,45 +3,171 @@ defmodule Indexer.Fetcher.TokenInstance.Helper do
     Common functions for Indexer.Fetcher.TokenInstance fetchers
   """
   alias Explorer.Chain
-  alias Explorer.Chain.{Hash, Token.Instance}
+  alias Explorer.SmartContract.Reader
   alias Indexer.Fetcher.TokenInstance.MetadataRetriever
 
-  @spec fetch_instance(Hash.Address.t(), Decimal.t() | non_neg_integer()) :: {:ok, Instance.t()}
-  def fetch_instance(token_contract_address_hash, token_id) do
-    token_id = prepare_token_id(token_id)
-
-    case MetadataRetriever.fetch_metadata(to_string(token_contract_address_hash), token_id) do
-      {:ok, %{metadata: metadata}} ->
-        params = %{
-          token_id: token_id,
-          token_contract_address_hash: token_contract_address_hash,
-          metadata: metadata,
-          error: nil
+  @cryptokitties_address_hash "0x06012c8cf97bead5deae237070f9587f8e7a266d"
+
+  @token_uri "c87b56dd"
+  @uri "0e89341c"
+
+  @erc_721_1155_abi [
+    %{
+      "type" => "function",
+      "stateMutability" => "view",
+      "payable" => false,
+      "outputs" => [
+        %{"type" => "string", "name" => ""}
+      ],
+      "name" => "tokenURI",
+      "inputs" => [
+        %{
+          "type" => "uint256",
+          "name" => "_tokenId"
+        }
+      ],
+      "constant" => true
+    },
+    %{
+      "type" => "function",
+      "stateMutability" => "view",
+      "payable" => false,
+      "outputs" => [
+        %{
+          "type" => "string",
+          "name" => "",
+          "internalType" => "string"
+        }
+      ],
+      "name" => "uri",
+      "inputs" => [
+        %{
+          "type" => "uint256",
+          "name" => "_id",
+          "internalType" => "uint256"
         }
+      ],
+      "constant" => true
+    }
+  ]
+
+  @spec batch_fetch_instances([%{}]) :: list()
+  def batch_fetch_instances(token_instances) do
+    token_instances =
+      Enum.map(token_instances, fn
+        %{contract_address_hash: hash, token_id: token_id} -> {hash, token_id}
+        {_, _} = tuple -> tuple
+      end)
+
+    splitted =
+      Enum.group_by(token_instances, fn {contract_address_hash, _token_id} ->
+        to_string(contract_address_hash) == @cryptokitties_address_hash
+      end)
 
-        {:ok, _result} = Chain.upsert_token_instance(params)
+    cryptokitties =
+      (splitted[true] || [])
+      |> Enum.map(fn {contract_address_hash, token_id} ->
+        {{:ok, ["https://api.cryptokitties.co/kitties/{id}"]}, to_string(token_id), contract_address_hash, token_id}
+      end)
 
-      {:ok, %{error: error}} ->
-        upsert_token_instance_with_error(token_id, token_contract_address_hash, error)
+    other = splitted[false] || []
 
-      {:error_code, code} ->
-        upsert_token_instance_with_error(token_id, token_contract_address_hash, "request error: #{code}")
+    token_types_map =
+      Enum.reduce(other, %{}, fn {contract_address_hash, _token_id}, acc ->
+        address_hash_string = to_string(contract_address_hash)
 
-      {:error, reason} ->
-        upsert_token_instance_with_error(token_id, token_contract_address_hash, reason)
-    end
+        Map.put_new(acc, address_hash_string, Chain.get_token_type(contract_address_hash))
+      end)
+
+    contract_results =
+      (other
+       |> Enum.map(fn {contract_address_hash, token_id} ->
+         token_id = prepare_token_id(token_id)
+         contract_address_hash_string = to_string(contract_address_hash)
+
+         prepare_request(token_types_map[contract_address_hash_string], contract_address_hash_string, token_id)
+       end)
+       |> Reader.query_contracts(@erc_721_1155_abi, [], false)
+       |> Enum.zip_reduce(other, [], fn result, {contract_address_hash, token_id}, acc ->
+         token_id = prepare_token_id(token_id)
+
+         [
+           {result, normalize_token_id(token_types_map[to_string(contract_address_hash)], token_id),
+            contract_address_hash, token_id}
+           | acc
+         ]
+       end)
+       |> Enum.reverse()) ++
+        cryptokitties
+
+    contract_results
+    |> Enum.map(fn {result, normalized_token_id, _contract_address_hash, _token_id} ->
+      Task.async(fn -> MetadataRetriever.fetch_json(result, normalized_token_id) end)
+    end)
+    |> Task.yield_many(:infinity)
+    |> Enum.zip(contract_results)
+    |> Enum.map(fn {{_task, res}, {_result, _normalized_token_id, contract_address_hash, token_id}} ->
+      case res do
+        {:ok, result} ->
+          result_to_insert_params(result, contract_address_hash, token_id)
+
+        {:exit, reason} ->
+          result_to_insert_params(
+            {:error, MetadataRetriever.truncate_error("Terminated:" <> inspect(reason))},
+            contract_address_hash,
+            token_id
+          )
+      end
+    end)
+    |> Chain.upsert_token_instances_list()
   end
 
   defp prepare_token_id(%Decimal{} = token_id), do: Decimal.to_integer(token_id)
   defp prepare_token_id(token_id), do: token_id
 
-  defp upsert_token_instance_with_error(token_id, token_contract_address_hash, error) do
-    params = %{
+  defp prepare_request("ERC-721", contract_address_hash_string, token_id) do
+    %{
+      contract_address: contract_address_hash_string,
+      method_id: @token_uri,
+      args: [token_id],
+      block_number: nil
+    }
+  end
+
+  defp prepare_request(_token_type, contract_address_hash_string, token_id) do
+    %{
+      contract_address: contract_address_hash_string,
+      method_id: @uri,
+      args: [token_id],
+      block_number: nil
+    }
+  end
+
+  defp normalize_token_id("ERC-721", _token_id), do: nil
+
+  defp normalize_token_id(_token_type, token_id),
+    do: token_id |> Integer.to_string(16) |> String.downcase() |> String.pad_leading(64, "0")
+
+  defp result_to_insert_params({:ok, %{metadata: metadata}}, token_contract_address_hash, token_id) do
+    %{
       token_id: token_id,
       token_contract_address_hash: token_contract_address_hash,
-      error: error
+      metadata: metadata,
+      error: nil
     }
+  end
+
+  defp result_to_insert_params({:error_code, code}, token_contract_address_hash, token_id),
+    do: token_instance_map_with_error(token_id, token_contract_address_hash, "request error: #{code}")
 
-    {:ok, _result} = Chain.upsert_token_instance(params)
+  defp result_to_insert_params({:error, reason}, token_contract_address_hash, token_id),
+    do: token_instance_map_with_error(token_id, token_contract_address_hash, reason)
+
+  defp token_instance_map_with_error(token_id, token_contract_address_hash, error) do
+    %{
+      token_id: token_id,
+      token_contract_address_hash: token_contract_address_hash,
+      error: error
+    }
   end
 end
diff --git a/apps/indexer/lib/indexer/fetcher/token_instance/metadata_retriever.ex b/apps/indexer/lib/indexer/fetcher/token_instance/metadata_retriever.ex
index bb4d39aee936..89c383f5a5d0 100644
--- a/apps/indexer/lib/indexer/fetcher/token_instance/metadata_retriever.ex
+++ b/apps/indexer/lib/indexer/fetcher/token_instance/metadata_retriever.ex
@@ -1,6 +1,6 @@
 defmodule Indexer.Fetcher.TokenInstance.MetadataRetriever do
   @moduledoc """
-  Fetches ERC721 token instance metadata.
+  Fetches ERC-721 & ERC-1155 token instance metadata.
   """
 
   require Logger
@@ -8,55 +8,6 @@ defmodule Indexer.Fetcher.TokenInstance.MetadataRetriever do
   alias Explorer.SmartContract.Reader
   alias HTTPoison.{Error, Response}
 
-  @token_uri "c87b56dd"
-
-  @abi [
-    %{
-      "type" => "function",
-      "stateMutability" => "view",
-      "payable" => false,
-      "outputs" => [
-        %{"type" => "string", "name" => ""}
-      ],
-      "name" => "tokenURI",
-      "inputs" => [
-        %{
-          "type" => "uint256",
-          "name" => "_tokenId"
-        }
-      ],
-      "constant" => true
-    }
-  ]
-
-  @uri "0e89341c"
-
-  @abi_uri [
-    %{
-      "type" => "function",
-      "stateMutability" => "view",
-      "payable" => false,
-      "outputs" => [
-        %{
-          "type" => "string",
-          "name" => "",
-          "internalType" => "string"
-        }
-      ],
-      "name" => "uri",
-      "inputs" => [
-        %{
-          "type" => "uint256",
-          "name" => "_id",
-          "internalType" => "uint256"
-        }
-      ],
-      "constant" => true
-    }
-  ]
-
-  @cryptokitties_address_hash "0x06012c8cf97bead5deae237070f9587f8e7a266d"
-
   @no_uri_error "no uri"
   @vm_execution_error "VM execution error"
   @ipfs_protocol "ipfs://"
@@ -69,54 +20,29 @@ defmodule Indexer.Fetcher.TokenInstance.MetadataRetriever do
 
   @ignored_hosts ["localhost", "127.0.0.1", "0.0.0.0", "", nil]
 
-  def fetch_metadata(unquote(@cryptokitties_address_hash), token_id) do
-    %{@token_uri => {:ok, ["https://api.cryptokitties.co/kitties/{id}"]}}
-    |> fetch_json(to_string(token_id))
-  end
-
-  def fetch_metadata(contract_address_hash, token_id) do
-    # c87b56dd =  keccak256(tokenURI(uint256))
-    contract_functions = %{@token_uri => [token_id]}
-
-    res =
-      contract_address_hash
-      |> query_contract(contract_functions, @abi)
-      |> fetch_json()
-
-    if res == {:ok, %{error: @vm_execution_error}} do
-      hex_normalized_token_id = token_id |> Integer.to_string(16) |> String.downcase() |> String.pad_leading(64, "0")
-
-      contract_functions_uri = %{@uri => [token_id]}
-
-      contract_address_hash
-      |> query_contract(contract_functions_uri, @abi_uri)
-      |> fetch_json(hex_normalized_token_id)
-    else
-      res
-    end
-  end
-
   def query_contract(contract_address_hash, contract_functions, abi) do
     Reader.query_contract(contract_address_hash, abi, contract_functions, false)
   end
 
+  @doc """
+    Fetch/parse metadata using smart-contract's response
+  """
+  @spec fetch_json(any, binary() | nil) :: {:error, binary} | {:error_code, any} | {:ok, %{metadata: any}}
   def fetch_json(uri, hex_token_id \\ nil)
 
-  def fetch_json(uri, _hex_token_id) when uri in [%{@token_uri => {:ok, [""]}}, %{@uri => {:ok, [""]}}] do
-    {:ok, %{error: @no_uri_error}}
-  end
-
-  def fetch_json(%{@token_uri => uri}, hex_token_id) do
-    fetch_json_from_uri(uri, hex_token_id)
+  def fetch_json(uri, _hex_token_id) when uri in [{:ok, [""]}, {:ok, [""]}] do
+    {:error, @no_uri_error}
   end
 
-  def fetch_json(%{@uri => uri}, hex_token_id) do
+  def fetch_json(uri, hex_token_id) do
     fetch_json_from_uri(uri, hex_token_id)
   end
 
   defp fetch_json_from_uri({:error, error}, _hex_token_id) do
+    error = to_string(error)
+
     if error =~ "execution reverted" or error =~ @vm_execution_error do
-      {:ok, %{error: @vm_execution_error}}
+      {:error, @vm_execution_error}
     else
       Logger.debug(["Unknown metadata format error #{inspect(error)}."], fetcher: :token_instances)
 
@@ -351,5 +277,9 @@ defmodule Indexer.Fetcher.TokenInstance.MetadataRetriever do
     String.replace(token_uri, @erc1155_token_id_placeholder, hex_token_id)
   end
 
-  defp truncate_error(error), do: String.slice(error, 0, @max_error_length)
+  @doc """
+    Truncate error string to @max_error_length symbols
+  """
+  @spec truncate_error(binary()) :: binary()
+  def truncate_error(error), do: String.slice(error, 0, @max_error_length)
 end
diff --git a/apps/indexer/lib/indexer/fetcher/token_instance/realtime.ex b/apps/indexer/lib/indexer/fetcher/token_instance/realtime.ex
index 3f82494b55b6..804c9258c851 100644
--- a/apps/indexer/lib/indexer/fetcher/token_instance/realtime.ex
+++ b/apps/indexer/lib/indexer/fetcher/token_instance/realtime.ex
@@ -32,10 +32,12 @@ defmodule Indexer.Fetcher.TokenInstance.Realtime do
   end
 
   @impl BufferedTask
-  def run([%{contract_address_hash: hash, token_id: token_id}], _json_rpc_named_arguments) do
-    if not Chain.token_instance_exists?(token_id, hash) do
-      fetch_instance(hash, token_id)
-    end
+  def run(token_instances, _) when is_list(token_instances) do
+    token_instances
+    |> Enum.filter(fn %{contract_address_hash: hash, token_id: token_id} ->
+      not Chain.token_instance_exists?(token_id, hash)
+    end)
+    |> batch_fetch_instances()
 
     :ok
   end
@@ -75,7 +77,7 @@ defmodule Indexer.Fetcher.TokenInstance.Realtime do
     [
       flush_interval: 100,
       max_concurrency: Application.get_env(:indexer, __MODULE__)[:concurrency] || @default_max_concurrency,
-      max_batch_size: @default_max_batch_size,
+      max_batch_size: Application.get_env(:indexer, __MODULE__)[:batch_size] || @default_max_batch_size,
       poll: false,
       task_supervisor: __MODULE__.TaskSupervisor
     ]
diff --git a/apps/indexer/lib/indexer/fetcher/token_instance/retry.ex b/apps/indexer/lib/indexer/fetcher/token_instance/retry.ex
index 24b2df433f81..a09bce459698 100644
--- a/apps/indexer/lib/indexer/fetcher/token_instance/retry.ex
+++ b/apps/indexer/lib/indexer/fetcher/token_instance/retry.ex
@@ -13,7 +13,7 @@ defmodule Indexer.Fetcher.TokenInstance.Retry do
 
   @behaviour BufferedTask
 
-  @default_max_batch_size 1
+  @default_max_batch_size 10
   @default_max_concurrency 10
 
   @doc false
@@ -40,14 +40,16 @@ defmodule Indexer.Fetcher.TokenInstance.Retry do
   end
 
   @impl BufferedTask
-  def run([%{contract_address_hash: hash, token_id: token_id, updated_at: updated_at}], _json_rpc_named_arguments) do
+  def run(token_instances, _json_rpc_named_arguments) when is_list(token_instances) do
     refetch_interval = Application.get_env(:indexer, __MODULE__)[:refetch_interval]
 
-    if updated_at
-       |> DateTime.add(refetch_interval, :millisecond)
-       |> DateTime.compare(DateTime.utc_now()) != :gt do
-      fetch_instance(hash, token_id)
-    end
+    token_instances
+    |> Enum.filter(fn %{contract_address_hash: _hash, token_id: _token_id, updated_at: updated_at} ->
+      updated_at
+      |> DateTime.add(refetch_interval, :millisecond)
+      |> DateTime.compare(DateTime.utc_now()) != :gt
+    end)
+    |> batch_fetch_instances()
 
     :ok
   end
@@ -56,7 +58,7 @@ defmodule Indexer.Fetcher.TokenInstance.Retry do
     [
       flush_interval: :timer.minutes(10),
       max_concurrency: Application.get_env(:indexer, __MODULE__)[:concurrency] || @default_max_concurrency,
-      max_batch_size: @default_max_batch_size,
+      max_batch_size: Application.get_env(:indexer, __MODULE__)[:batch_size] || @default_max_batch_size,
       task_supervisor: __MODULE__.TaskSupervisor
     ]
   end
diff --git a/apps/indexer/lib/indexer/fetcher/token_instance/sanitize.ex b/apps/indexer/lib/indexer/fetcher/token_instance/sanitize.ex
index 31c594ec0055..1bc3a70bd1f1 100644
--- a/apps/indexer/lib/indexer/fetcher/token_instance/sanitize.ex
+++ b/apps/indexer/lib/indexer/fetcher/token_instance/sanitize.ex
@@ -13,7 +13,7 @@ defmodule Indexer.Fetcher.TokenInstance.Sanitize do
 
   @behaviour BufferedTask
 
-  @default_max_batch_size 1
+  @default_max_batch_size 10
   @default_max_concurrency 10
   @doc false
   def child_spec([init_options, gen_server_options]) do
@@ -36,10 +36,12 @@ defmodule Indexer.Fetcher.TokenInstance.Sanitize do
   end
 
   @impl BufferedTask
-  def run([%{contract_address_hash: hash, token_id: token_id}], _json_rpc_named_arguments) do
-    if not Chain.token_instance_exists?(token_id, hash) do
-      fetch_instance(hash, token_id)
-    end
+  def run(token_instances, _) when is_list(token_instances) do
+    token_instances
+    |> Enum.filter(fn %{contract_address_hash: hash, token_id: token_id} ->
+      not Chain.token_instance_exists?(token_id, hash)
+    end)
+    |> batch_fetch_instances()
 
     :ok
   end
@@ -48,7 +50,7 @@ defmodule Indexer.Fetcher.TokenInstance.Sanitize do
     [
       flush_interval: :infinity,
       max_concurrency: Application.get_env(:indexer, __MODULE__)[:concurrency] || @default_max_concurrency,
-      max_batch_size: @default_max_batch_size,
+      max_batch_size: Application.get_env(:indexer, __MODULE__)[:batch_size] || @default_max_batch_size,
       poll: false,
       task_supervisor: __MODULE__.TaskSupervisor
     ]
diff --git a/apps/indexer/test/indexer/fetcher/token_instance/helper_test.exs b/apps/indexer/test/indexer/fetcher/token_instance/helper_test.exs
new file mode 100644
index 000000000000..8d9987f9de24
--- /dev/null
+++ b/apps/indexer/test/indexer/fetcher/token_instance/helper_test.exs
@@ -0,0 +1,178 @@
+defmodule Indexer.Fetcher.TokenInstance.HelperTest do
+  use EthereumJSONRPC.Case
+  use Explorer.DataCase
+
+  alias Explorer.Chain.Token.Instance
+  alias EthereumJSONRPC.Encoder
+  alias Indexer.Fetcher.TokenInstance.Helper
+  alias Plug.Conn
+
+  import Mox
+
+  setup :verify_on_exit!
+  setup :set_mox_global
+
+  setup do
+    bypass = Bypass.open()
+
+    {:ok, bypass: bypass}
+  end
+
+  describe "fetch instance tests" do
+    test "fetches json metadata for kitties" do
+      Application.put_env(:explorer, :http_adapter, Explorer.Mox.HTTPoison)
+
+      result =
+        "{\"id\":100500,\"name\":\"KittyBlue_2_Lemonade\",\"generation\":20,\"genes\":\"623509754227292470437941473598751240781530569131665917719736997423495595\",\"created_at\":\"2017-12-06T01:56:27.000Z\",\"birthday\":\"2017-12-06T00:00:00.000Z\",\"image_url\":\"https://img.cryptokitties.co/0x06012c8cf97bead5deae237070f9587f8e7a266d/100500.svg\",\"image_url_cdn\":\"https://img.cn.cryptokitties.co/0x06012c8cf97bead5deae237070f9587f8e7a266d/100500.svg\",\"color\":\"strawberry\",\"background_color\":\"#ffe0e5\",\"bio\":\"Shalom! I'm KittyBlue_2_Lemonade. I'm a professional Foreign Film Director and I love cantaloupe. I'm convinced that the world is flat. One day I'll prove it. It's pawesome to meet you!\",\"kitty_type\":null,\"is_fancy\":false,\"is_exclusive\":false,\"is_special_edition\":false,\"fancy_type\":null,\"language\":\"en\",\"is_prestige\":false,\"prestige_type\":null,\"prestige_ranking\":null,\"prestige_time_limit\":null,\"status\":{\"is_ready\":true,\"is_gestating\":false,\"cooldown\":1410310201506,\"dynamic_cooldown\":1475064986478,\"cooldown_index\":10,\"cooldown_end_block\":0,\"pending_tx_type\":null,\"pending_tx_since\":null},\"purrs\":{\"count\":1,\"is_purred\":false},\"watchlist\":{\"count\":0,\"is_watchlisted\":false},\"hatcher\":{\"address\":\"0x7b9ea9ac69b8fde875554321472c732eeff06ca0\",\"image\":\"14\",\"nickname\":\"KittyBlu\",\"hasDapper\":false,\"twitter_id\":null,\"twitter_image_url\":null,\"twitter_handle\":null},\"auction\":{},\"offer\":{},\"owner\":{\"address\":\"0x7b9ea9ac69b8fde875554321472c732eeff06ca0\",\"hasDapper\":false,\"twitter_id\":null,\"twitter_image_url\":null,\"twitter_handle\":null,\"image\":\"14\",\"nickname\":\"KittyBlu\"},\"matron\":{\"id\":46234,\"name\":\"KittyBlue_1_Limegreen\",\"generation\":10,\"enhanced_cattributes\":[{\"type\":\"body\",\"kittyId\":19631,\"position\":105,\"description\":\"cymric\"},{\"type\":\"coloreyes\",\"kittyId\":40356,\"position\":263,\"description\":\"limegreen\"},{\"type\":\"eyes\",\"kittyId\":3185,\"position\":16,\"description\":\"raisedbrow\"},{\"type\":\"pattern\",\"kittyId\":46234,\"position\":-1,\"description\":\"totesbasic\"},{\"type\":\"mouth\",\"kittyId\":46234,\"position\":-1,\"description\":\"happygokitty\"},{\"type\":\"colorprimary\",\"kittyId\":46234,\"position\":-1,\"description\":\"greymatter\"},{\"type\":\"colorsecondary\",\"kittyId\":46234,\"position\":-1,\"description\":\"lemonade\"},{\"type\":\"colortertiary\",\"kittyId\":46234,\"position\":-1,\"description\":\"granitegrey\"}],\"owner_wallet_address\":\"0x7b9ea9ac69b8fde875554321472c732eeff06ca0\",\"owner\":{\"address\":\"0x7b9ea9ac69b8fde875554321472c732eeff06ca0\"},\"created_at\":\"2017-12-03T21:29:17.000Z\",\"image_url\":\"https://img.cryptokitties.co/0x06012c8cf97bead5deae237070f9587f8e7a266d/46234.svg\",\"image_url_cdn\":\"https://img.cn.cryptokitties.co/0x06012c8cf97bead5deae237070f9587f8e7a266d/46234.svg\",\"color\":\"limegreen\",\"is_fancy\":false,\"kitty_type\":null,\"is_exclusive\":false,\"is_special_edition\":false,\"fancy_type\":null,\"status\":{\"is_ready\":true,\"is_gestating\":false,\"cooldown\":1486487069384},\"hatched\":true,\"wrapped\":false,\"image_url_png\":\"https://img.cryptokitties.co/0x06012c8cf97bead5deae237070f9587f8e7a266d/46234.png\"},\"sire\":{\"id\":82090,\"name\":null,\"generation\":19,\"enhanced_cattributes\":[{\"type\":\"body\",\"kittyId\":82090,\"position\":-1,\"description\":\"himalayan\"},{\"type\":\"coloreyes\",\"kittyId\":82090,\"position\":-1,\"description\":\"strawberry\"},{\"type\":\"eyes\",\"kittyId\":82090,\"position\":-1,\"description\":\"thicccbrowz\"},{\"type\":\"pattern\",\"kittyId\":82090,\"position\":-1,\"description\":\"totesbasic\"},{\"type\":\"mouth\",\"kittyId\":82090,\"position\":-1,\"description\":\"pouty\"},{\"type\":\"colorprimary\",\"kittyId\":82090,\"position\":-1,\"description\":\"aquamarine\"},{\"type\":\"colorsecondary\",\"kittyId\":82090,\"position\":-1,\"description\":\"chocolate\"},{\"type\":\"colortertiary\",\"kittyId\":82090,\"position\":-1,\"description\":\"granitegrey\"}],\"owner_wallet_address\":\"0x798fdad0cedc4b298fc7d53a982fa0c5f447eaa5\",\"owner\":{\"address\":\"0x798fdad0cedc4b298fc7d53a982fa0c5f447eaa5\"},\"created_at\":\"2017-12-05T06:30:05.000Z\",\"image_url\":\"https://img.cryptokitties.co/0x06012c8cf97bead5deae237070f9587f8e7a266d/82090.svg\",\"image_url_cdn\":\"https://img.cn.cryptokitties.co/0x06012c8cf97bead5deae237070f9587f8e7a266d/82090.svg\",\"color\":\"strawberry\",\"is_fancy\":false,\"is_exclusive\":false,\"is_special_edition\":false,\"fancy_type\":null,\"status\":{\"is_ready\":true,\"is_gestating\":false,\"cooldown\":1486619010030},\"kitty_type\":null,\"hatched\":true,\"wrapped\":false,\"image_url_png\":\"https://img.cryptokitties.co/0x06012c8cf97bead5deae237070f9587f8e7a266d/82090.png\"},\"children\":[],\"hatched\":true,\"wrapped\":false,\"enhanced_cattributes\":[{\"type\":\"colorprimary\",\"description\":\"greymatter\",\"position\":null,\"kittyId\":100500},{\"type\":\"coloreyes\",\"description\":\"strawberry\",\"position\":null,\"kittyId\":100500},{\"type\":\"body\",\"description\":\"himalayan\",\"position\":null,\"kittyId\":100500},{\"type\":\"colorsecondary\",\"description\":\"lemonade\",\"position\":null,\"kittyId\":100500},{\"type\":\"mouth\",\"description\":\"pouty\",\"position\":null,\"kittyId\":100500},{\"type\":\"pattern\",\"description\":\"totesbasic\",\"position\":null,\"kittyId\":100500},{\"type\":\"eyes\",\"description\":\"thicccbrowz\",\"position\":null,\"kittyId\":100500},{\"type\":\"colortertiary\",\"description\":\"kittencream\",\"position\":null,\"kittyId\":100500},{\"type\":\"secret\",\"description\":\"se5\",\"position\":-1,\"kittyId\":100500},{\"type\":\"purrstige\",\"description\":\"pu20\",\"position\":-1,\"kittyId\":100500}],\"variation\":null,\"variation_ranking\":null,\"image_url_png\":\"https://img.cryptokitties.co/0x06012c8cf97bead5deae237070f9587f8e7a266d/100500.png\",\"items\":[]}"
+
+      Explorer.Mox.HTTPoison
+      |> expect(:get, fn "https://api.cryptokitties.co/kitties/100500", _headers, _options ->
+        {:ok, %HTTPoison.Response{status_code: 200, body: result}}
+      end)
+
+      insert(:token,
+        contract_address: build(:address, hash: "0x06012c8cf97bead5deae237070f9587f8e7a266d"),
+        type: "ERC-721"
+      )
+
+      [{:ok, %Instance{metadata: metadata}}] =
+        Helper.batch_fetch_instances([{"0x06012c8cf97bead5deae237070f9587f8e7a266d", 100_500}])
+
+      assert Map.get(metadata, "name") == "KittyBlue_2_Lemonade"
+
+      Application.put_env(:explorer, :http_adapter, HTTPoison)
+    end
+
+    test "replace {id} with actual token_id", %{bypass: bypass} do
+      json = """
+      {
+        "name": "Sérgio Mendonça {id}"
+      }
+      """
+
+      abi =
+        [
+          %{
+            "type" => "function",
+            "stateMutability" => "nonpayable",
+            "payable" => false,
+            "outputs" => [],
+            "name" => "tokenURI",
+            "inputs" => [
+              %{"type" => "string", "name" => "name", "internalType" => "string"}
+            ]
+          }
+        ]
+        |> ABI.parse_specification()
+        |> Enum.at(0)
+
+      encoded_url =
+        abi
+        |> Encoder.encode_function_call(["http://localhost:#{bypass.port}/api/card/{id}"])
+        |> String.replace("4cf12d26", "")
+
+      EthereumJSONRPC.Mox
+      |> expect(:json_rpc, fn [
+                                %{
+                                  id: 0,
+                                  jsonrpc: "2.0",
+                                  method: "eth_call",
+                                  params: [
+                                    %{
+                                      data:
+                                        "0x0e89341c0000000000000000000000000000000000000000000000000000000000000309",
+                                      to: "0x5caebd3b32e210e85ce3e9d51638b9c445481567"
+                                    },
+                                    "latest"
+                                  ]
+                                }
+                              ],
+                              _options ->
+        {:ok,
+         [
+           %{
+             id: 0,
+             jsonrpc: "2.0",
+             result: encoded_url
+           }
+         ]}
+      end)
+
+      Bypass.expect(
+        bypass,
+        "GET",
+        "/api/card/0000000000000000000000000000000000000000000000000000000000000309",
+        fn conn ->
+          Conn.resp(conn, 200, json)
+        end
+      )
+
+      insert(:token,
+        contract_address: build(:address, hash: "0x5caebd3b32e210e85ce3e9d51638b9c445481567"),
+        type: "ERC-1155"
+      )
+
+      assert [
+               {:ok,
+                %Instance{
+                  metadata: %{
+                    "name" => "Sérgio Mendonça 0000000000000000000000000000000000000000000000000000000000000309"
+                  }
+                }}
+             ] = Helper.batch_fetch_instances([{"0x5caebd3b32e210e85ce3e9d51638b9c445481567", 777}])
+    end
+
+    test "fetch ipfs of ipfs/{id} format" do
+      EthereumJSONRPC.Mox
+      |> expect(:json_rpc, fn [
+                                %{
+                                  id: 0,
+                                  jsonrpc: "2.0",
+                                  method: "eth_call",
+                                  params: [
+                                    %{
+                                      data:
+                                        "0xc87b56dd0000000000000000000000000000000000000000000000000000000000000000",
+                                      to: "0x7e01CC81fCfdf6a71323900288A69e234C464f63"
+                                    },
+                                    "latest"
+                                  ]
+                                }
+                              ],
+                              _options ->
+        {:ok,
+         [
+           %{
+             id: 0,
+             jsonrpc: "2.0",
+             result:
+               "0x00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000033697066732f516d6439707654684577676a544262456b4e6d6d47466263704a4b773137666e524241543454643472636f67323200000000000000000000000000"
+           }
+         ]}
+      end)
+
+      Application.put_env(:explorer, :http_adapter, Explorer.Mox.HTTPoison)
+
+      Explorer.Mox.HTTPoison
+      |> expect(:get, fn "https://ipfs.io/ipfs/Qmd9pvThEwgjTBbEkNmmGFbcpJKw17fnRBAT4Td4rcog22", _headers, _options ->
+        {:ok, %HTTPoison.Response{status_code: 200, body: "123", headers: [{"Content-Type", "image/jpg"}]}}
+      end)
+
+      insert(:token,
+        contract_address: build(:address, hash: "0x7e01CC81fCfdf6a71323900288A69e234C464f63"),
+        type: "ERC-721"
+      )
+
+      assert [
+               {:ok,
+                %Instance{
+                  metadata: %{
+                    "image" => "https://ipfs.io/ipfs/Qmd9pvThEwgjTBbEkNmmGFbcpJKw17fnRBAT4Td4rcog22"
+                  }
+                }}
+             ] = Helper.batch_fetch_instances([{"0x7e01CC81fCfdf6a71323900288A69e234C464f63", 0}])
+
+      Application.put_env(:explorer, :http_adapter, HTTPoison)
+    end
+  end
+end
diff --git a/apps/indexer/test/test_helper.exs b/apps/indexer/test/test_helper.exs
index 0df43337026a..381b6272bc29 100644
--- a/apps/indexer/test/test_helper.exs
+++ b/apps/indexer/test/test_helper.exs
@@ -17,6 +17,7 @@ end
 Mox.defmock(EthereumJSONRPC.Mox, for: EthereumJSONRPC.Transport)
 Mox.defmock(Indexer.BufferedTaskTest.RetryableTask, for: Indexer.BufferedTask)
 Mox.defmock(Indexer.BufferedTaskTest.ShrinkableTask, for: Indexer.BufferedTask)
+Mox.defmock(Explorer.Mox.HTTPoison, for: HTTPoison.Base)
 
 ExUnit.configure(formatters: [JUnitFormatter, ExUnit.CLIFormatter])
 ExUnit.start()
diff --git a/config/runtime.exs b/config/runtime.exs
index bc104efce14e..10831b7a6772 100644
--- a/config/runtime.exs
+++ b/config/runtime.exs
@@ -507,13 +507,16 @@ config :indexer, Indexer.Fetcher.BlockReward,
 
 config :indexer, Indexer.Fetcher.TokenInstance.Retry,
   concurrency: ConfigHelper.parse_integer_env_var("INDEXER_TOKEN_INSTANCE_RETRY_CONCURRENCY", 10),
+  batch_size: ConfigHelper.parse_integer_env_var("INDEXER_TOKEN_INSTANCE_RETRY_BATCH_SIZE", 10),
   refetch_interval: ConfigHelper.parse_time_env_var("INDEXER_TOKEN_INSTANCE_RETRY_REFETCH_INTERVAL", "24h")
 
 config :indexer, Indexer.Fetcher.TokenInstance.Realtime,
-  concurrency: ConfigHelper.parse_integer_env_var("INDEXER_TOKEN_INSTANCE_REALTIME_CONCURRENCY", 10)
+  concurrency: ConfigHelper.parse_integer_env_var("INDEXER_TOKEN_INSTANCE_REALTIME_CONCURRENCY", 10),
+  batch_size: ConfigHelper.parse_integer_env_var("INDEXER_TOKEN_INSTANCE_REALTIME_BATCH_SIZE", 1)
 
 config :indexer, Indexer.Fetcher.TokenInstance.Sanitize,
-  concurrency: ConfigHelper.parse_integer_env_var("INDEXER_TOKEN_INSTANCE_SANITIZE_CONCURRENCY", 10)
+  concurrency: ConfigHelper.parse_integer_env_var("INDEXER_TOKEN_INSTANCE_SANITIZE_CONCURRENCY", 10),
+  batch_size: ConfigHelper.parse_integer_env_var("INDEXER_TOKEN_INSTANCE_SANITIZE_BATCH_SIZE", 10)
 
 config :indexer, Indexer.Fetcher.InternalTransaction,
   batch_size: ConfigHelper.parse_integer_env_var("INDEXER_INTERNAL_TRANSACTIONS_BATCH_SIZE", 10),
diff --git a/docker-compose/envs/common-blockscout.env b/docker-compose/envs/common-blockscout.env
index 65b40fd43f06..7fcb5879a0cb 100644
--- a/docker-compose/envs/common-blockscout.env
+++ b/docker-compose/envs/common-blockscout.env
@@ -211,3 +211,6 @@ ACCOUNT_REDIS_URL=redis://redis_db:6379
 EIP_1559_ELASTICITY_MULTIPLIER=2
 # API_SENSITIVE_ENDPOINTS_KEY=
 # ACCOUNT_VERIFICATION_EMAIL_RESEND_INTERVAL=
+# INDEXER_TOKEN_INSTANCE_RETRY_BATCH_SIZE=10
+# INDEXER_TOKEN_INSTANCE_REALTIME_BATCH_SIZE=1
+# INDEXER_TOKEN_INSTANCE_SANITIZE_BATCH_SIZE=10
diff --git a/docker/Makefile b/docker/Makefile
index 3f948c710617..2067f59b545b 100644
--- a/docker/Makefile
+++ b/docker/Makefile
@@ -732,6 +732,15 @@ endif
 ifdef ACCOUNT_VERIFICATION_EMAIL_RESEND_INTERVAL
 	BLOCKSCOUT_CONTAINER_PARAMS += -e 'ACCOUNT_VERIFICATION_EMAIL_RESEND_INTERVAL=$(ACCOUNT_VERIFICATION_EMAIL_RESEND_INTERVAL)'
 endif
+ifdef INDEXER_TOKEN_INSTANCE_RETRY_BATCH_SIZE
+	BLOCKSCOUT_CONTAINER_PARAMS += -e 'INDEXER_TOKEN_INSTANCE_RETRY_BATCH_SIZE=$(INDEXER_TOKEN_INSTANCE_RETRY_BATCH_SIZE)'
+endif
+ifdef INDEXER_TOKEN_INSTANCE_REALTIME_BATCH_SIZE
+	BLOCKSCOUT_CONTAINER_PARAMS += -e 'INDEXER_TOKEN_INSTANCE_REALTIME_BATCH_SIZE=$(INDEXER_TOKEN_INSTANCE_REALTIME_BATCH_SIZE)'
+endif
+ifdef INDEXER_TOKEN_INSTANCE_SANITIZE_BATCH_SIZE
+	BLOCKSCOUT_CONTAINER_PARAMS += -e 'INDEXER_TOKEN_INSTANCE_SANITIZE_BATCH_SIZE=$(INDEXER_TOKEN_INSTANCE_SANITIZE_BATCH_SIZE)'
+endif
 
 HAS_BLOCKSCOUT_IMAGE := $(shell docker images | grep -sw "${BS_CONTAINER_IMAGE} ")
 build:

From f11f1cb89a4aa64eccdcc7cd6c15e275f9225a71 Mon Sep 17 00:00:00 2001
From: Viktor Baranov <baranov.viktor.27@gmail.com>
Date: Mon, 28 Aug 2023 14:44:08 +0300
Subject: [PATCH 346/909] Add MIX_ENV: 'prod' to docker-compose

---
 CHANGELOG.md                                                     | 1 +
 docker-compose/docker-compose-no-build-erigon.yml                | 1 +
 docker-compose/docker-compose-no-build-geth-clique-consensus.yml | 1 +
 docker-compose/docker-compose-no-build-geth.yml                  | 1 +
 docker-compose/docker-compose-no-build-nethermind.yml            | 1 +
 docker-compose/docker-compose-no-build-no-db-container.yml       | 1 +
 docker-compose/docker-compose-no-rust-services.yml               | 1 +
 7 files changed, 7 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b6f991a8a254..b33fd95206bd 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -18,6 +18,7 @@
 
 ### Chore
 
+- [#8319](https://github.com/blockscout/blockscout/pull/8319) - Add MIX_ENV: 'prod' to docker-compose
 - [#8281](https://github.com/blockscout/blockscout/pull/8281) - Planned removal of duplicate API endpoints: for CSV export and GraphQL
 
 <details>
diff --git a/docker-compose/docker-compose-no-build-erigon.yml b/docker-compose/docker-compose-no-build-erigon.yml
index 29231c45d1ef..5c93dd2547f3 100644
--- a/docker-compose/docker-compose-no-build-erigon.yml
+++ b/docker-compose/docker-compose-no-build-erigon.yml
@@ -35,6 +35,7 @@ services:
         DATABASE_URL: postgresql://postgres:@host.docker.internal:7432/blockscout?ssl=false
         ECTO_USE_SSL: 'false'
         SECRET_KEY_BASE: '56NtB48ear7+wMSf0IQuWDAAazhpb31qyc7GiyspBP2vh7t5zlCsF5QDv76chXeN'
+        MIX_ENV: 'prod'
     ports:
       - 4000:4000
     volumes:
diff --git a/docker-compose/docker-compose-no-build-geth-clique-consensus.yml b/docker-compose/docker-compose-no-build-geth-clique-consensus.yml
index fb0924808f3e..7ce75af41903 100644
--- a/docker-compose/docker-compose-no-build-geth-clique-consensus.yml
+++ b/docker-compose/docker-compose-no-build-geth-clique-consensus.yml
@@ -36,6 +36,7 @@ services:
         DATABASE_URL: postgresql://postgres:@host.docker.internal:7432/blockscout?ssl=false
         ECTO_USE_SSL: 'false'
         SECRET_KEY_BASE: '56NtB48ear7+wMSf0IQuWDAAazhpb31qyc7GiyspBP2vh7t5zlCsF5QDv76chXeN'
+        MIX_ENV: 'prod'
     ports:
       - 4000:4000
     volumes:
diff --git a/docker-compose/docker-compose-no-build-geth.yml b/docker-compose/docker-compose-no-build-geth.yml
index acd74b684871..f163cdb1956a 100644
--- a/docker-compose/docker-compose-no-build-geth.yml
+++ b/docker-compose/docker-compose-no-build-geth.yml
@@ -35,6 +35,7 @@ services:
         DATABASE_URL: postgresql://postgres:@host.docker.internal:7432/blockscout?ssl=false
         ECTO_USE_SSL: 'false'
         SECRET_KEY_BASE: '56NtB48ear7+wMSf0IQuWDAAazhpb31qyc7GiyspBP2vh7t5zlCsF5QDv76chXeN'
+        MIX_ENV: 'prod'
     ports:
       - 4000:4000
     volumes:
diff --git a/docker-compose/docker-compose-no-build-nethermind.yml b/docker-compose/docker-compose-no-build-nethermind.yml
index 4aba06749c91..9488dd597798 100644
--- a/docker-compose/docker-compose-no-build-nethermind.yml
+++ b/docker-compose/docker-compose-no-build-nethermind.yml
@@ -35,6 +35,7 @@ services:
         DATABASE_URL: postgresql://postgres:@host.docker.internal:7432/blockscout?ssl=false
         ECTO_USE_SSL: 'false'
         SECRET_KEY_BASE: '56NtB48ear7+wMSf0IQuWDAAazhpb31qyc7GiyspBP2vh7t5zlCsF5QDv76chXeN'
+        MIX_ENV: 'prod'
     ports:
       - 4000:4000
     volumes:
diff --git a/docker-compose/docker-compose-no-build-no-db-container.yml b/docker-compose/docker-compose-no-build-no-db-container.yml
index 39232ea66c1d..ad4c844db6f9 100644
--- a/docker-compose/docker-compose-no-build-no-db-container.yml
+++ b/docker-compose/docker-compose-no-build-no-db-container.yml
@@ -26,6 +26,7 @@ services:
         DATABASE_URL: postgresql://postgres:@host.docker.internal:5432/blockscout?ssl=false
         ECTO_USE_SSL: 'false'
         SECRET_KEY_BASE: '56NtB48ear7+wMSf0IQuWDAAazhpb31qyc7GiyspBP2vh7t5zlCsF5QDv76chXeN'
+        MIX_ENV: 'prod'
     ports:
       - 4000:4000
     volumes:
diff --git a/docker-compose/docker-compose-no-rust-services.yml b/docker-compose/docker-compose-no-rust-services.yml
index af87b47c1c28..e6a6336433ff 100644
--- a/docker-compose/docker-compose-no-rust-services.yml
+++ b/docker-compose/docker-compose-no-rust-services.yml
@@ -28,6 +28,7 @@ services:
         CACHE_ADDRESS_WITH_BALANCES_UPDATE_INTERVAL: ""
         ADMIN_PANEL_ENABLED: ""
         RELEASE_VERSION: 5.2.2
+        MIX_ENV: 'prod'
     restart: always
     stop_grace_period: 5m
     container_name: 'blockscout'

From 9b6e61350093f4266fc3449458528ac1bbb2e84c Mon Sep 17 00:00:00 2001
From: Viktor Baranov <baranov.viktor.27@gmail.com>
Date: Wed, 23 Aug 2023 23:06:58 +0300
Subject: [PATCH 347/909] Add different price sources

---
 CHANGELOG.md                                  |  1 +
 .../exchange_rates/source/coin_gecko.ex       | 11 ++++
 .../exchange_rates/source/coin_market_cap.ex  | 59 +++++++++++--------
 .../lib/explorer/market/history/cataloger.ex  | 55 ++++++-----------
 .../history/source/market_cap/coin_gecko.ex   | 10 +---
 .../source/market_cap/coin_market_cap.ex      | 54 +++++++++++++++++
 .../market/history/source/price/coin_gecko.ex | 59 +++++++++++++++++++
 .../history/source/price/coin_market_cap.ex   | 55 +++++++++++++++++
 .../market/history/cataloger_test.exs         | 34 +++++++++++
 .../test/support/fakes/no_op_price_source.ex  | 12 ++++
 config/config_helper.exs                      | 28 +++++++--
 config/runtime.exs                            |  5 +-
 config/test.exs                               |  6 +-
 docker-compose/envs/common-blockscout.env     |  3 +-
 docker/Makefile                               |  7 ++-
 15 files changed, 319 insertions(+), 80 deletions(-)
 create mode 100644 apps/explorer/lib/explorer/market/history/source/market_cap/coin_market_cap.ex
 create mode 100644 apps/explorer/lib/explorer/market/history/source/price/coin_gecko.ex
 create mode 100644 apps/explorer/lib/explorer/market/history/source/price/coin_market_cap.ex
 create mode 100644 apps/explorer/test/support/fakes/no_op_price_source.ex

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8137b5633f5e..baada1ae34d4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,7 @@
 ### Features
 
 - [#8313](https://github.com/blockscout/blockscout/pull/8313) - Add batches to TokenInstance fetchers
+- [#8285](https://github.com/blockscout/blockscout/pull/8285) - Add CG/CMC coin price sources
 - [#8181](https://github.com/blockscout/blockscout/pull/8181) - Insert current token balances placeholders along with historical
 - [#8210](https://github.com/blockscout/blockscout/pull/8210) - Drop address foreign keys
 - [#8292](https://github.com/blockscout/blockscout/pull/8292) - Add ETHEREUM_JSONRPC_WAIT_PER_TIMEOUT env var
diff --git a/apps/explorer/lib/explorer/exchange_rates/source/coin_gecko.ex b/apps/explorer/lib/explorer/exchange_rates/source/coin_gecko.ex
index 4c726ccc5106..d9ce085dee93 100644
--- a/apps/explorer/lib/explorer/exchange_rates/source/coin_gecko.ex
+++ b/apps/explorer/lib/explorer/exchange_rates/source/coin_gecko.ex
@@ -152,6 +152,17 @@ defmodule Explorer.ExchangeRates.Source.CoinGecko do
     end
   end
 
+  @doc """
+  Converts date time string into DateTime object formatted as date
+  """
+  @spec date(String.t()) :: Date.t()
+  def date(date_time_string) do
+    with {:ok, datetime, _} <- DateTime.from_iso8601(date_time_string) do
+      datetime
+      |> DateTime.to_date()
+    end
+  end
+
   defp api_key do
     config(:api_key) || nil
   end
diff --git a/apps/explorer/lib/explorer/exchange_rates/source/coin_market_cap.ex b/apps/explorer/lib/explorer/exchange_rates/source/coin_market_cap.ex
index fb1b5472a3fb..711f089a26dc 100644
--- a/apps/explorer/lib/explorer/exchange_rates/source/coin_market_cap.ex
+++ b/apps/explorer/lib/explorer/exchange_rates/source/coin_market_cap.ex
@@ -18,7 +18,7 @@ defmodule Explorer.ExchangeRates.Source.CoinMarketCap do
     last_updated = get_last_updated(token_properties)
     current_price = get_current_price(token_properties)
 
-    id = token_properties && token_properties["id"]
+    id = token_properties["id"]
 
     btc_value =
       if Application.get_env(:explorer, Explorer.ExchangeRates)[:fetch_btc_value],
@@ -40,8 +40,8 @@ defmodule Explorer.ExchangeRates.Source.CoinMarketCap do
         id: id,
         last_updated: last_updated,
         market_cap_usd: to_decimal(market_cap_data_usd),
-        name: token_properties && token_properties["name"],
-        symbol: token_properties && String.upcase(token_properties["symbol"]),
+        name: token_properties["name"],
+        symbol: String.upcase(token_properties["symbol"]),
         usd_value: current_price,
         volume_24h_usd: to_decimal(total_volume_data_usd)
       }
@@ -98,45 +98,50 @@ defmodule Explorer.ExchangeRates.Source.CoinMarketCap do
     config(:coin_id)
   end
 
-  defp get_token_properties(market_data) do
-    token_values_list =
-      market_data
-      |> Map.values()
-
-    if Enum.count(token_values_list) > 0 do
-      token_values = token_values_list |> Enum.at(0)
-
-      if Enum.count(token_values) > 0 do
-        token_values |> Enum.at(0)
-      else
-        %{}
-      end
+  @doc """
+  Extracts token properties from CoinMarketCap coin endpoint response
+  """
+  @spec get_token_properties(map()) :: map()
+  def get_token_properties(market_data) do
+    with token_values_list <- market_data |> Map.values(),
+         true <- Enum.count(token_values_list) > 0,
+         token_values <- token_values_list |> Enum.at(0),
+         true <- Enum.count(token_values) > 0 do
+      token_values |> Enum.at(0)
     else
-      %{}
+      _ -> %{}
     end
   end
 
   defp get_circulating_supply(token_properties) do
-    token_properties && token_properties["circulating_supply"]
+    token_properties["circulating_supply"]
   end
 
   defp get_total_supply(token_properties) do
-    token_properties && token_properties["total_supply"]
+    token_properties["total_supply"]
   end
 
-  defp get_market_cap_data_usd(token_properties) do
-    token_properties && token_properties["quote"] &&
+  @doc """
+  Extracts market cap in usd from token properties, which are returned in get_token_properties/1
+  """
+  @spec get_market_cap_data_usd(map()) :: String.t()
+  def get_market_cap_data_usd(token_properties) do
+    token_properties["quote"] &&
       token_properties["quote"]["USD"] &&
       token_properties["quote"]["USD"]["market_cap"]
   end
 
   defp get_total_volume_data_usd(token_properties) do
-    token_properties && token_properties["quote"] &&
+    token_properties["quote"] &&
       token_properties["quote"]["USD"] &&
       token_properties["quote"]["USD"]["volume_24h"]
   end
 
-  defp get_last_updated(token_properties) do
+  @doc """
+  Extracts last updated from token properties, which are returned in get_token_properties/1
+  """
+  @spec get_last_updated(map()) :: DateTime.t()
+  def get_last_updated(token_properties) do
     last_updated_data = token_properties && token_properties["last_updated"]
 
     if last_updated_data do
@@ -147,8 +152,12 @@ defmodule Explorer.ExchangeRates.Source.CoinMarketCap do
     end
   end
 
-  defp get_current_price(token_properties) do
-    if token_properties && token_properties["quote"] && token_properties["quote"]["USD"] &&
+  @doc """
+  Extracts current price from token properties, which are returned in get_token_properties/1
+  """
+  @spec get_current_price(map()) :: String.t() | non_neg_integer()
+  def get_current_price(token_properties) do
+    if token_properties["quote"] && token_properties["quote"]["USD"] &&
          token_properties["quote"]["USD"]["price"] do
       to_decimal(token_properties["quote"]["USD"]["price"])
     else
diff --git a/apps/explorer/lib/explorer/market/history/cataloger.ex b/apps/explorer/lib/explorer/market/history/cataloger.ex
index 0672412d3311..a6bb33604bdd 100644
--- a/apps/explorer/lib/explorer/market/history/cataloger.ex
+++ b/apps/explorer/lib/explorer/market/history/cataloger.ex
@@ -8,26 +8,15 @@ defmodule Explorer.Market.History.Cataloger do
   source will follow exponential backoff `100ms * 2^(n+1)` where `n` is the
   number of failed requests.
 
-  ## Configuration
-
-  The following example shows the configurable values in a sample config.
-
-      config :explorer, Explorer.Market.History.Cataloger,
-        # fetch interval in milliseconds
-        history_fetch_interval: :timer.minutes(60),
-        # Base backoff in milliseconds for failed requests to history API
-        base_backoff: 100
-
   """
 
   use GenServer
 
   require Logger
 
+  alias Explorer.History.Process, as: HistoryProcess
   alias Explorer.Market
 
-  @typep milliseconds :: non_neg_integer()
-
   @price_failed_attempts 10
   @market_cap_failed_attempts 3
 
@@ -108,6 +97,16 @@ defmodule Explorer.Market.History.Cataloger do
     GenServer.start_link(__MODULE__, :ok, name: __MODULE__)
   end
 
+  @spec config_or_default(atom(), term(), term()) :: term()
+  defp config_or_default(key, module, default) do
+    Application.get_env(:explorer, module)[key] || default
+  end
+
+  @spec config_or_default(atom(), term()) :: term()
+  defp config_or_default(key, default) do
+    Application.get_env(:explorer, __MODULE__)[key] || default
+  end
+
   defp market_cap_history(records, state) do
     Market.bulk_insert_history(records)
 
@@ -118,30 +117,24 @@ defmodule Explorer.Market.History.Cataloger do
     {:noreply, state}
   end
 
-  @spec base_backoff :: milliseconds()
-  defp base_backoff do
-    config_or_default(:base_backoff, 100)
-  end
-
-  @spec config_or_default(atom(), term()) :: term()
-  defp config_or_default(key, default) do
-    Application.get_env(:explorer, __MODULE__, [])[key] || default
-  end
-
   @spec source_price() :: module()
   defp source_price do
-    config_or_default(:source, Explorer.Market.History.Source.Price.CryptoCompare)
+    config_or_default(:price_source, Explorer.ExchangeRates.Source, Explorer.Market.History.Source.Price.CryptoCompare)
   end
 
   @spec source_market_cap() :: module()
   defp source_market_cap do
-    config_or_default(:source_market_cap, Explorer.Market.History.Source.MarketCap.CoinGecko)
+    config_or_default(
+      :market_cap_source,
+      Explorer.ExchangeRates.Source,
+      Explorer.Market.History.Source.MarketCap.CoinGecko
+    )
   end
 
   @spec fetch_price_history(non_neg_integer(), non_neg_integer()) :: Task.t()
   defp fetch_price_history(day_count, failed_attempts \\ 0) do
     Task.Supervisor.async_nolink(Explorer.MarketTaskSupervisor, fn ->
-      Process.sleep(delay(failed_attempts))
+      Process.sleep(HistoryProcess.delay(failed_attempts))
 
       if failed_attempts < @price_failed_attempts do
         {:price_history, {day_count, failed_attempts, source_price().fetch_price_history(day_count)}}
@@ -154,7 +147,7 @@ defmodule Explorer.Market.History.Cataloger do
   @spec fetch_market_cap_history(non_neg_integer()) :: Task.t()
   defp fetch_market_cap_history(failed_attempts \\ 0) do
     Task.Supervisor.async_nolink(Explorer.MarketTaskSupervisor, fn ->
-      Process.sleep(delay(failed_attempts))
+      Process.sleep(HistoryProcess.delay(failed_attempts))
 
       if failed_attempts < @market_cap_failed_attempts do
         {:market_cap_history, {failed_attempts, source_market_cap().fetch_market_cap()}}
@@ -186,14 +179,4 @@ defmodule Explorer.Market.History.Cataloger do
       price_records
     end
   end
-
-  @spec delay(non_neg_integer()) :: milliseconds()
-  defp delay(0), do: 0
-  defp delay(1), do: base_backoff()
-
-  defp delay(failed_attempts) do
-    # Simulates 2^n
-    multiplier = Enum.reduce(2..failed_attempts, 1, fn _, acc -> 2 * acc end)
-    multiplier * base_backoff()
-  end
 end
diff --git a/apps/explorer/lib/explorer/market/history/source/market_cap/coin_gecko.ex b/apps/explorer/lib/explorer/market/history/source/market_cap/coin_gecko.ex
index 9875f0d0a663..fee23a9b9cd3 100644
--- a/apps/explorer/lib/explorer/market/history/source/market_cap/coin_gecko.ex
+++ b/apps/explorer/lib/explorer/market/history/source/market_cap/coin_gecko.ex
@@ -37,14 +37,6 @@ defmodule Explorer.Market.History.Source.MarketCap.CoinGecko do
     end
   end
 
-  @spec date(String.t()) :: Date.t()
-  defp date(date_time_string) do
-    with {:ok, datetime, _} <- DateTime.from_iso8601(date_time_string) do
-      datetime
-      |> DateTime.to_date()
-    end
-  end
-
   @spec format_data(term()) :: SourceMarketCap.record() | nil
   defp format_data(nil), do: nil
 
@@ -54,7 +46,7 @@ defmodule Explorer.Market.History.Source.MarketCap.CoinGecko do
 
     %{
       market_cap: Decimal.new(to_string(market_cap["usd"])),
-      date: date(data["last_updated"])
+      date: ExchangeRatesSourceCoinGecko.date(data["last_updated"])
     }
   end
 end
diff --git a/apps/explorer/lib/explorer/market/history/source/market_cap/coin_market_cap.ex b/apps/explorer/lib/explorer/market/history/source/market_cap/coin_market_cap.ex
new file mode 100644
index 000000000000..9a95ed1e73dd
--- /dev/null
+++ b/apps/explorer/lib/explorer/market/history/source/market_cap/coin_market_cap.ex
@@ -0,0 +1,54 @@
+defmodule Explorer.Market.History.Source.MarketCap.CoinMarketCap do
+  @moduledoc """
+  Adapter for fetching current market from CoinMarketCap.
+  """
+
+  alias Explorer.ExchangeRates.Source
+  alias Explorer.ExchangeRates.Source.CoinMarketCap, as: ExchangeRatesSourceCoinMarketCap
+  alias Explorer.Market.History.Source.MarketCap, as: SourceMarketCap
+
+  import Source, only: [to_decimal: 1]
+
+  @behaviour SourceMarketCap
+
+  @impl SourceMarketCap
+  def fetch_market_cap do
+    url = ExchangeRatesSourceCoinMarketCap.source_url()
+
+    if url do
+      case Source.http_request(url, ExchangeRatesSourceCoinMarketCap.headers()) do
+        {:ok, data} ->
+          result =
+            data
+            |> format_data()
+
+          {:ok, result}
+
+        _ ->
+          :error
+      end
+    else
+      :error
+    end
+  end
+
+  @spec format_data(term()) :: SourceMarketCap.record() | nil
+  defp format_data(nil), do: nil
+
+  defp format_data(%{"data" => _} = json_data) do
+    market_data = json_data["data"]
+    token_properties = ExchangeRatesSourceCoinMarketCap.get_token_properties(market_data)
+
+    last_updated =
+      token_properties
+      |> ExchangeRatesSourceCoinMarketCap.get_last_updated()
+      |> DateTime.to_date()
+
+    market_cap_data_usd = ExchangeRatesSourceCoinMarketCap.get_market_cap_data_usd(token_properties)
+
+    %{
+      market_cap: to_decimal(market_cap_data_usd),
+      date: last_updated
+    }
+  end
+end
diff --git a/apps/explorer/lib/explorer/market/history/source/price/coin_gecko.ex b/apps/explorer/lib/explorer/market/history/source/price/coin_gecko.ex
new file mode 100644
index 000000000000..e4cf9dfa15a3
--- /dev/null
+++ b/apps/explorer/lib/explorer/market/history/source/price/coin_gecko.ex
@@ -0,0 +1,59 @@
+defmodule Explorer.Market.History.Source.Price.CoinGecko do
+  @moduledoc """
+  Adapter for fetching current market from CoinGecko.
+  """
+
+  alias Explorer.ExchangeRates.Source
+  alias Explorer.ExchangeRates.Source.CoinGecko, as: ExchangeRatesSourceCoinGecko
+  alias Explorer.Market.History.Source.Price, as: SourcePrice
+
+  @behaviour SourcePrice
+
+  @impl SourcePrice
+  def fetch_price_history(_previous_days \\ nil) do
+    url = ExchangeRatesSourceCoinGecko.source_url()
+
+    if url do
+      case Source.http_request(url, ExchangeRatesSourceCoinGecko.headers()) do
+        {:ok, data} ->
+          result =
+            data
+            |> format_data()
+
+          {:ok, result}
+
+        _ ->
+          :error
+      end
+    else
+      :error
+    end
+  end
+
+  @spec format_data(term()) :: SourcePrice.record() | nil
+  defp format_data(nil), do: nil
+
+  defp format_data(data) do
+    market_data = data["market_data"]
+    current_price = market_data["current_price"]
+    current_price_usd = Decimal.new(to_string(current_price["usd"]))
+    price_change_percentage_24h_in_currency = market_data["price_change_percentage_24h_in_currency"]
+
+    delta_perc = Decimal.new(to_string(price_change_percentage_24h_in_currency["usd"]))
+
+    delta =
+      current_price_usd
+      |> Decimal.mult(delta_perc)
+      |> Decimal.div(100)
+
+    opening_price = Decimal.add(current_price_usd, delta)
+
+    [
+      %{
+        closing_price: current_price_usd,
+        date: ExchangeRatesSourceCoinGecko.date(data["last_updated"]),
+        opening_price: opening_price
+      }
+    ]
+  end
+end
diff --git a/apps/explorer/lib/explorer/market/history/source/price/coin_market_cap.ex b/apps/explorer/lib/explorer/market/history/source/price/coin_market_cap.ex
new file mode 100644
index 000000000000..0a8c4bf28dae
--- /dev/null
+++ b/apps/explorer/lib/explorer/market/history/source/price/coin_market_cap.ex
@@ -0,0 +1,55 @@
+defmodule Explorer.Market.History.Source.Price.CoinMarketCap do
+  @moduledoc """
+  Adapter for fetching current market from CoinMarketCap.
+  """
+
+  alias Explorer.ExchangeRates.Source
+  alias Explorer.ExchangeRates.Source.CoinMarketCap, as: ExchangeRatesSourceCoinMarketCap
+  alias Explorer.Market.History.Source.Price, as: SourcePrice
+
+  @behaviour SourcePrice
+
+  @impl SourcePrice
+  def fetch_price_history(_previous_days \\ nil) do
+    url = ExchangeRatesSourceCoinMarketCap.source_url()
+
+    if url do
+      case Source.http_request(url, ExchangeRatesSourceCoinMarketCap.headers()) do
+        {:ok, data} ->
+          result =
+            data
+            |> format_data()
+
+          {:ok, result}
+
+        _ ->
+          :error
+      end
+    else
+      :error
+    end
+  end
+
+  @spec format_data(term()) :: SourcePrice.record() | nil
+  defp format_data(nil), do: nil
+
+  defp format_data(%{"data" => _} = json_data) do
+    market_data = json_data["data"]
+    token_properties = ExchangeRatesSourceCoinMarketCap.get_token_properties(market_data)
+
+    last_updated =
+      token_properties
+      |> ExchangeRatesSourceCoinMarketCap.get_last_updated()
+      |> DateTime.to_date()
+
+    current_price_usd = ExchangeRatesSourceCoinMarketCap.get_current_price(token_properties)
+
+    [
+      %{
+        closing_price: current_price_usd,
+        date: last_updated,
+        opening_price: current_price_usd
+      }
+    ]
+  end
+end
diff --git a/apps/explorer/test/explorer/market/history/cataloger_test.exs b/apps/explorer/test/explorer/market/history/cataloger_test.exs
index 0acc04a7f24b..68f2aa9779cc 100644
--- a/apps/explorer/test/explorer/market/history/cataloger_test.exs
+++ b/apps/explorer/test/explorer/market/history/cataloger_test.exs
@@ -6,7 +6,9 @@ defmodule Explorer.Market.History.CatalogerTest do
   alias Explorer.Market.MarketHistory
   alias Explorer.Market.History.Cataloger
   alias Explorer.Market.History.Source.Price.TestSource
+  alias Explorer.Market.History.Source.Price.CryptoCompare
   alias Explorer.Repo
+  alias Plug.Conn
 
   setup do
     Application.put_env(:explorer, Cataloger, source: TestSource)
@@ -19,6 +21,38 @@ defmodule Explorer.Market.History.CatalogerTest do
   end
 
   test "handle_info with `{:fetch_price_history, days}`" do
+    bypass = Bypass.open()
+    Application.put_env(:explorer, CryptoCompare, base_url: "http://localhost:#{bypass.port}")
+
+    resp = """
+    {
+      "Response": "Success",
+      "Type": 100,
+      "Aggregated": false,
+      "TimeTo": 1522569618,
+      "TimeFrom": 1522566018,
+      "FirstValueInArray": true,
+      "ConversionType": {
+        "type": "multiply",
+        "conversionSymbol": "ETH"
+      },
+      "Data": [{
+        "time": 1522566018,
+        "high": 10,
+        "low": 5,
+        "open": 5,
+        "volumefrom": 0,
+        "volumeto": 0,
+        "close": 10,
+        "conversionType": "multiply",
+        "conversionSymbol": "ETH"
+      }],
+      "RateLimit": {},
+      "HasWarning": false
+    }
+    """
+
+    Bypass.expect(bypass, fn conn -> Conn.resp(conn, 200, resp) end)
     records = [%{date: ~D[2018-04-01], closing_price: Decimal.new(10), opening_price: Decimal.new(5)}]
     expect(TestSource, :fetch_price_history, fn 1 -> {:ok, records} end)
     set_mox_global()
diff --git a/apps/explorer/test/support/fakes/no_op_price_source.ex b/apps/explorer/test/support/fakes/no_op_price_source.ex
new file mode 100644
index 000000000000..b9a460ac8876
--- /dev/null
+++ b/apps/explorer/test/support/fakes/no_op_price_source.ex
@@ -0,0 +1,12 @@
+defmodule Explorer.ExchangeRates.Source.NoOpPriceSource do
+  @moduledoc false
+
+  alias Explorer.Market.History.Source.Price, as: SourcePrice
+
+  @behaviour SourcePrice
+
+  @impl SourcePrice
+  def fetch_price_history(_previous_days) do
+    {:ok, []}
+  end
+end
diff --git a/config/config_helper.exs b/config/config_helper.exs
index 23224e698b92..a7e0706d3088 100644
--- a/config/config_helper.exs
+++ b/config/config_helper.exs
@@ -1,6 +1,7 @@
 defmodule ConfigHelper do
   import Bitwise
   alias Explorer.ExchangeRates.Source
+  alias Explorer.Market.History.Source.{MarketCap, Price}
   alias Indexer.Transform.Blocks
 
   @spec hackney_options() :: any()
@@ -88,10 +89,29 @@ defmodule ConfigHelper do
 
   @spec exchange_rates_source() :: Source.CoinGecko | Source.CoinMarketCap
   def exchange_rates_source do
-    cond do
-      System.get_env("EXCHANGE_RATES_SOURCE") == "coin_gecko" -> Source.CoinGecko
-      System.get_env("EXCHANGE_RATES_SOURCE") == "coin_market_cap" -> Source.CoinMarketCap
-      true -> Source.CoinGecko
+    case System.get_env("EXCHANGE_RATES_MARKET_CAP_SOURCE") do
+      "coin_gecko" -> Source.CoinGecko
+      "coin_market_cap" -> Source.CoinMarketCap
+      _ -> Source.CoinGecko
+    end
+  end
+
+  @spec exchange_rates_market_cap_source() :: MarketCap.CoinGecko | MarketCap.CoinMarketCap
+  def exchange_rates_market_cap_source do
+    case System.get_env("EXCHANGE_RATES_MARKET_CAP_SOURCE") do
+      "coin_gecko" -> MarketCap.CoinGecko
+      "coin_market_cap" -> MarketCap.CoinMarketCap
+      _ -> MarketCap.CoinGecko
+    end
+  end
+
+  @spec exchange_rates_price_source() :: Price.CoinGecko | Price.CoinMarketCap | Price.CryptoCompare
+  def exchange_rates_price_source do
+    case System.get_env("EXCHANGE_RATES_PRICE_SOURCE") do
+      "coin_gecko" -> Price.CoinGecko
+      "coin_market_cap" -> Price.CoinMarketCap
+      "crypto_compare" -> Price.CryptoCompare
+      _ -> Price.CryptoCompare
     end
   end
 
diff --git a/config/runtime.exs b/config/runtime.exs
index 10831b7a6772..36939f976a1c 100644
--- a/config/runtime.exs
+++ b/config/runtime.exs
@@ -269,7 +269,10 @@ config :explorer, Explorer.ExchangeRates,
   enabled: !ConfigHelper.parse_bool_env_var("DISABLE_EXCHANGE_RATES"),
   fetch_btc_value: ConfigHelper.parse_bool_env_var("EXCHANGE_RATES_FETCH_BTC_VALUE")
 
-config :explorer, Explorer.ExchangeRates.Source, source: ConfigHelper.exchange_rates_source()
+config :explorer, Explorer.ExchangeRates.Source,
+  source: ConfigHelper.exchange_rates_source(),
+  price_source: ConfigHelper.exchange_rates_price_source(),
+  market_cap_source: ConfigHelper.exchange_rates_market_cap_source()
 
 config :explorer, Explorer.ExchangeRates.Source.CoinMarketCap,
   api_key: System.get_env("EXCHANGE_RATES_COINMARKETCAP_API_KEY"),
diff --git a/config/test.exs b/config/test.exs
index c87adaeda1de..92ddca6a93a0 100644
--- a/config/test.exs
+++ b/config/test.exs
@@ -10,6 +10,8 @@ config :logger, :ecto,
 
 config :logger, :error, path: Path.absname("logs/test/error.log")
 
-config :explorer, Explorer.ExchangeRates,
+config :explorer, Explorer.ExchangeRates, store: :none
+
+config :explorer, Explorer.ExchangeRates.Source,
   source: Explorer.ExchangeRates.Source.NoOpSource,
-  store: :none
+  price_source: Explorer.ExchangeRates.Source.NoOpPriceSource
diff --git a/docker-compose/envs/common-blockscout.env b/docker-compose/envs/common-blockscout.env
index 7fcb5879a0cb..a8ae85965cc8 100644
--- a/docker-compose/envs/common-blockscout.env
+++ b/docker-compose/envs/common-blockscout.env
@@ -32,7 +32,8 @@ EMISSION_FORMAT=DEFAULT
 # SUPPLY_MODULE=
 COIN=
 EXCHANGE_RATES_COIN=
-# EXCHANGE_RATES_SOURCE=
+# EXCHANGE_RATES_MARKET_CAP_SOURCE=
+# EXCHANGE_RATES_PRICE_SOURCE=
 # EXCHANGE_RATES_COINGECKO_COIN_ID=
 # EXCHANGE_RATES_COINGECKO_API_KEY=
 # EXCHANGE_RATES_COINMARKETCAP_API_KEY=
diff --git a/docker/Makefile b/docker/Makefile
index 2067f59b545b..3c5289bc6ac2 100644
--- a/docker/Makefile
+++ b/docker/Makefile
@@ -228,8 +228,11 @@ endif
 ifdef EXCHANGE_RATES_COIN
 	BLOCKSCOUT_CONTAINER_PARAMS += -e 'EXCHANGE_RATES_COIN=$(EXCHANGE_RATES_COIN)'
 endif
-ifdef EXCHANGE_RATES_SOURCE
-	BLOCKSCOUT_CONTAINER_PARAMS += -e 'EXCHANGE_RATES_SOURCE=$(EXCHANGE_RATES_SOURCE)'
+ifdef EXCHANGE_RATES_MARKET_CAP_SOURCE
+	BLOCKSCOUT_CONTAINER_PARAMS += -e 'EXCHANGE_RATES_MARKET_CAP_SOURCE=$(EXCHANGE_RATES_MARKET_CAP_SOURCE)'
+endif
+ifdef EXCHANGE_RATES_PRICE_SOURCE
+	BLOCKSCOUT_CONTAINER_PARAMS += -e 'EXCHANGE_RATES_PRICE_SOURCE=$(EXCHANGE_RATES_PRICE_SOURCE)'
 endif
 ifdef EXCHANGE_RATES_COINGECKO_COIN_ID
 	BLOCKSCOUT_CONTAINER_PARAMS += -e 'EXCHANGE_RATES_COINGECKO_COIN_ID=$(EXCHANGE_RATES_COINGECKO_COIN_ID)'

From 09c794ef9b8394fb41a1fe87440c0fa76ce3ca97 Mon Sep 17 00:00:00 2001
From: Viktor Baranov <baranov.viktor.27@gmail.com>
Date: Mon, 28 Aug 2023 19:26:28 +0300
Subject: [PATCH 348/909] Add curl into resulting image

---
 CHANGELOG.md      | 1 +
 docker/Dockerfile | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d4e4f4401771..730642281d8f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -21,6 +21,7 @@
 
 ### Chore
 
+- [#8321](https://github.com/blockscout/blockscout/pull/8321) - Add curl into resulting Docker image
 - [#8319](https://github.com/blockscout/blockscout/pull/8319) - Add MIX_ENV: 'prod' to docker-compose
 - [#8281](https://github.com/blockscout/blockscout/pull/8281) - Planned removal of duplicate API endpoints: for CSV export and GraphQL
 
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 9193b154aec7..5a8569a1d0bc 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -70,7 +70,7 @@ ENV RELEASE_VERSION=${RELEASE_VERSION}
 ARG BLOCKSCOUT_VERSION
 ENV BLOCKSCOUT_VERSION=${BLOCKSCOUT_VERSION}
 
-RUN apk --no-cache --update add jq
+RUN apk --no-cache --update add jq curl
 
 WORKDIR /app
 

From 01666c7e203c246f1fde25beb050d768182a6549 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 28 Aug 2023 18:14:24 +0000
Subject: [PATCH 349/909] Bump dialyxir from 1.3.0 to 1.4.0

Bumps [dialyxir](https://github.com/jeremyjh/dialyxir) from 1.3.0 to 1.4.0.
- [Release notes](https://github.com/jeremyjh/dialyxir/releases)
- [Changelog](https://github.com/jeremyjh/dialyxir/blob/master/CHANGELOG.md)
- [Commits](https://github.com/jeremyjh/dialyxir/compare/1.3.0...1.4.0)

---
updated-dependencies:
- dependency-name: dialyxir
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 mix.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mix.lock b/mix.lock
index 48442769907c..04a6df34ee58 100644
--- a/mix.lock
+++ b/mix.lock
@@ -34,7 +34,7 @@
   "decimal": {:hex, :decimal, "2.1.1", "5611dca5d4b2c3dd497dec8f68751f1f1a54755e8ed2a966c2633cf885973ad6", [:mix], [], "hexpm", "53cfe5f497ed0e7771ae1a475575603d77425099ba5faef9394932b35020ffcc"},
   "decorator": {:hex, :decorator, "1.4.0", "a57ac32c823ea7e4e67f5af56412d12b33274661bb7640ec7fc882f8d23ac419", [:mix], [], "hexpm", "0a07cedd9083da875c7418dea95b78361197cf2bf3211d743f6f7ce39656597f"},
   "deep_merge": {:hex, :deep_merge, "1.0.0", "b4aa1a0d1acac393bdf38b2291af38cb1d4a52806cf7a4906f718e1feb5ee961", [:mix], [], "hexpm", "ce708e5f094b9cd4e8f2be4f00d2f4250c4095be93f8cd6d018c753894885430"},
-  "dialyxir": {:hex, :dialyxir, "1.3.0", "fd1672f0922b7648ff9ce7b1b26fcf0ef56dda964a459892ad15f6b4410b5284", [:mix], [{:erlex, ">= 0.2.6", [hex: :erlex, repo: "hexpm", optional: false]}], "hexpm", "00b2a4bcd6aa8db9dcb0b38c1225b7277dca9bc370b6438715667071a304696f"},
+  "dialyxir": {:hex, :dialyxir, "1.4.0", "6b698401c16de79e8596b73dca63762255e70e4bbe26423530e173917220d5fc", [:mix], [{:erlex, ">= 0.2.6", [hex: :erlex, repo: "hexpm", optional: false]}], "hexpm", "c7ecaa1da27debae488ab09d9827ec58a0161c7821972b6d2cb26c1614648849"},
   "digital_token": {:hex, :digital_token, "0.6.0", "13e6de581f0b1f6c686f7c7d12ab11a84a7b22fa79adeb4b50eec1a2d278d258", [:mix], [{:cldr_utils, "~> 2.17", [hex: :cldr_utils, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}], "hexpm", "2455d626e7c61a128b02a4a8caddb092548c3eb613ac6f6a85e4cbb6caddc4d1"},
   "earmark_parser": {:hex, :earmark_parser, "1.4.33", "3c3fd9673bb5dcc9edc28dd90f50c87ce506d1f71b70e3de69aa8154bc695d44", [:mix], [], "hexpm", "2d526833729b59b9fdb85785078697c72ac5e5066350663e5be6a1182da61b8f"},
   "ecto": {:hex, :ecto, "3.10.3", "eb2ae2eecd210b4eb8bece1217b297ad4ff824b4384c0e3fdd28aaf96edd6135", [:mix], [{:decimal, "~> 1.6 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}, {:telemetry, "~> 0.4 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "44bec74e2364d491d70f7e42cd0d690922659d329f6465e89feb8a34e8cd3433"},

From 6e4b1510d5fc5434290bd8f37f0ab54002bbac5a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 28 Aug 2023 18:14:47 +0000
Subject: [PATCH 350/909] Bump ex_doc from 0.30.5 to 0.30.6

Bumps [ex_doc](https://github.com/elixir-lang/ex_doc) from 0.30.5 to 0.30.6.
- [Changelog](https://github.com/elixir-lang/ex_doc/blob/main/CHANGELOG.md)
- [Commits](https://github.com/elixir-lang/ex_doc/compare/v0.30.5...v0.30.6)

---
updated-dependencies:
- dependency-name: ex_doc
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 mix.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mix.lock b/mix.lock
index 48442769907c..bdcb359fef29 100644
--- a/mix.lock
+++ b/mix.lock
@@ -47,7 +47,7 @@
   "ex_cldr_lists": {:hex, :ex_cldr_lists, "2.10.0", "4d4c9877da2d0417fd832907d69974e8328969f75fafc79b05ccf85f549f6281", [:mix], [{:ex_cldr_numbers, "~> 2.25", [hex: :ex_cldr_numbers, repo: "hexpm", optional: false]}, {:ex_doc, "~> 0.18", [hex: :ex_doc, repo: "hexpm", optional: true]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}], "hexpm", "adc040cde7b97f7fd7c0b35dd69ddb6fcf607303ae6355bb1851deae1f8b0652"},
   "ex_cldr_numbers": {:hex, :ex_cldr_numbers, "2.31.3", "6ec8b18c395c0e8788d46da806f8f2abcbe4b0d809226d2a91363e9ccd85f2f5", [:mix], [{:decimal, "~> 1.6 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: false]}, {:digital_token, "~> 0.3 or ~> 1.0", [hex: :digital_token, repo: "hexpm", optional: false]}, {:ex_cldr, "~> 2.37", [hex: :ex_cldr, repo: "hexpm", optional: false]}, {:ex_cldr_currencies, ">= 2.14.2", [hex: :ex_cldr_currencies, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}], "hexpm", "b519de08ecc4a6402038f3aa75e8654f78ebd6fa714b7e585531504e648588fd"},
   "ex_cldr_units": {:hex, :ex_cldr_units, "3.16.2", "dbad303fba819981c578234e2aaf19d72efca16ea8b1c6ee46b26232cb45e232", [:mix], [{:cldr_utils, "~> 2.24", [hex: :cldr_utils, repo: "hexpm", optional: false]}, {:decimal, "~> 1.6 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: false]}, {:ex_cldr_lists, "~> 2.10", [hex: :ex_cldr_lists, repo: "hexpm", optional: false]}, {:ex_cldr_numbers, "~> 2.31", [hex: :ex_cldr_numbers, repo: "hexpm", optional: false]}, {:ex_doc, "~> 0.18", [hex: :ex_doc, repo: "hexpm", optional: true]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}], "hexpm", "851095319fb3205c1549619da742cd53a2804c1d9c204cf84014021e2a6ea7e5"},
-  "ex_doc": {:hex, :ex_doc, "0.30.5", "aa6da96a5c23389d7dc7c381eba862710e108cee9cfdc629b7ec021313900e9e", [:mix], [{:earmark_parser, "~> 1.4.31", [hex: :earmark_parser, repo: "hexpm", optional: false]}, {:makeup_elixir, "~> 0.14", [hex: :makeup_elixir, repo: "hexpm", optional: false]}, {:makeup_erlang, "~> 0.1", [hex: :makeup_erlang, repo: "hexpm", optional: false]}], "hexpm", "88a1e115dcb91cefeef7e22df4a6ebbe4634fbf98b38adcbc25c9607d6d9d8e6"},
+  "ex_doc": {:hex, :ex_doc, "0.30.6", "5f8b54854b240a2b55c9734c4b1d0dd7bdd41f71a095d42a70445c03cf05a281", [:mix], [{:earmark_parser, "~> 1.4.31", [hex: :earmark_parser, repo: "hexpm", optional: false]}, {:makeup_elixir, "~> 0.14", [hex: :makeup_elixir, repo: "hexpm", optional: false]}, {:makeup_erlang, "~> 0.1", [hex: :makeup_erlang, repo: "hexpm", optional: false]}], "hexpm", "bd48f2ddacf4e482c727f9293d9498e0881597eae6ddc3d9562bd7923375109f"},
   "ex_json_schema": {:hex, :ex_json_schema, "0.10.1", "e03b746b6675a750c0bb1a5cc919f61353f7ab8450977e11ceede20e6180c560", [:mix], [{:decimal, "~> 2.0", [hex: :decimal, repo: "hexpm", optional: false]}], "hexpm", "66a64e60dadad89914d92f89c7e7906c57de75a8b79ac2480d0d53e1b8096fb0"},
   "ex_keccak": {:hex, :ex_keccak, "0.7.1", "0169f4b0c5073c5df61581d6282b12f1a1b764dcfcda4eeb1c819b5194c9ced0", [:mix], [{:rustler, ">= 0.0.0", [hex: :rustler, repo: "hexpm", optional: true]}, {:rustler_precompiled, "~> 0.6.1", [hex: :rustler_precompiled, repo: "hexpm", optional: false]}], "hexpm", "c18c19f66b6545b4b46b0c71c0cc0079de84e30b26365a92961e91697e8724ed"},
   "ex_machina": {:hex, :ex_machina, "2.7.0", "b792cc3127fd0680fecdb6299235b4727a4944a09ff0fa904cc639272cd92dc7", [:mix], [{:ecto, "~> 2.2 or ~> 3.0", [hex: :ecto, repo: "hexpm", optional: true]}, {:ecto_sql, "~> 3.0", [hex: :ecto_sql, repo: "hexpm", optional: true]}], "hexpm", "419aa7a39bde11894c87a615c4ecaa52d8f107bbdd81d810465186f783245bf8"},

From 5167043f8078e08a23e61d7b3d6bad4374e2cee1 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 28 Aug 2023 18:15:17 +0000
Subject: [PATCH 351/909] Bump spandex_datadog from 1.3.0 to 1.4.0

Bumps [spandex_datadog](https://github.com/spandex-project/spandex_datadog) from 1.3.0 to 1.4.0.
- [Release notes](https://github.com/spandex-project/spandex_datadog/releases)
- [Changelog](https://github.com/spandex-project/spandex_datadog/blob/master/CHANGELOG.md)
- [Commits](https://github.com/spandex-project/spandex_datadog/compare/1.3.0...1.4.0)

---
updated-dependencies:
- dependency-name: spandex_datadog
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 mix.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mix.lock b/mix.lock
index 48442769907c..ff836cae8a6f 100644
--- a/mix.lock
+++ b/mix.lock
@@ -125,7 +125,7 @@
   "rustler_precompiled": {:hex, :rustler_precompiled, "0.6.1", "160b545bce8bf9a3f1b436b2c10f53574036a0db628e40f393328cbbe593602f", [:mix], [{:castore, "~> 0.1 or ~> 1.0", [hex: :castore, repo: "hexpm", optional: false]}, {:rustler, "~> 0.23", [hex: :rustler, repo: "hexpm", optional: true]}], "hexpm", "0dd269fa261c4e3df290b12031c575fff07a542749f7b0e8b744d72d66c43600"},
   "sobelow": {:hex, :sobelow, "0.13.0", "218afe9075904793f5c64b8837cc356e493d88fddde126a463839351870b8d1e", [:mix], [{:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: false]}], "hexpm", "cd6e9026b85fc35d7529da14f95e85a078d9dd1907a9097b3ba6ac7ebbe34a0d"},
   "spandex": {:hex, :spandex, "3.2.0", "f8cd40146ea988c87f3c14054150c9a47ba17e53cd4515c00e1f93c29c45404d", [:mix], [{:decorator, "~> 1.2", [hex: :decorator, repo: "hexpm", optional: true]}, {:optimal, "~> 0.3.3", [hex: :optimal, repo: "hexpm", optional: false]}, {:plug, "~> 1.0", [hex: :plug, repo: "hexpm", optional: false]}], "hexpm", "d0a7d5aef4c5af9cf5467f2003e8a5d8d2bdae3823a6cc95d776b9a2251d4d03"},
-  "spandex_datadog": {:hex, :spandex_datadog, "1.3.0", "cabe82980f55612a8befa6c12904b1a429bf17faf7271a94b9aae278af6362cf", [:mix], [{:msgpax, "~> 2.2.1 or ~> 2.3", [hex: :msgpax, repo: "hexpm", optional: false]}, {:spandex, "~> 3.0", [hex: :spandex, repo: "hexpm", optional: false]}, {:telemetry, "~> 0.4.2 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "c826e4e29d1612e866b2c7bae2df3beeee84fc57351968c2772672afe59b789c"},
+  "spandex_datadog": {:hex, :spandex_datadog, "1.4.0", "0594b9655b0af00ab9137122616bc0208b68ceec01e9916ab13d6fbb33dcce35", [:mix], [{:msgpax, "~> 2.2.1 or ~> 2.3", [hex: :msgpax, repo: "hexpm", optional: false]}, {:spandex, "~> 3.2", [hex: :spandex, repo: "hexpm", optional: false]}, {:telemetry, "~> 0.4.2 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "360f8e1b4db238c1749c4872b1697b096429927fa42b8858d0bb782067380123"},
   "spandex_ecto": {:hex, :spandex_ecto, "0.7.0", "259ad2feb7c834e774ec623f99c0fbacca8d60a73be212f92b75e37f853c81be", [:mix], [{:spandex, "~> 2.2 or ~> 3.0", [hex: :spandex, repo: "hexpm", optional: false]}], "hexpm", "c64784be79d95538013b7c60828830411c5c7aff1f4e8d66dfe564b3c83b500e"},
   "spandex_phoenix": {:hex, :spandex_phoenix, "1.1.0", "9cff829d05258dd49a227c56711b19b69a8fd5d4873d8e9a92a4f4097e7322ab", [:mix], [{:phoenix, "~> 1.0", [hex: :phoenix, repo: "hexpm", optional: true]}, {:plug, "~> 1.3", [hex: :plug, repo: "hexpm", optional: false]}, {:spandex, "~> 2.2 or ~> 3.0", [hex: :spandex, repo: "hexpm", optional: false]}, {:telemetry, "~> 0.4 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: true]}], "hexpm", "265fe05c1736485fbb75d66ef7576682ebf6428c391dd54d22217f612fd4ddad"},
   "ssl_verify_fun": {:hex, :ssl_verify_fun, "1.1.7", "354c321cf377240c7b8716899e182ce4890c5938111a1296add3ec74cf1715df", [:make, :mix, :rebar3], [], "hexpm", "fe4c190e8f37401d30167c8c405eda19469f34577987c76dde613e838bbc67f8"},

From 81542351d8e2efa044edd80d4611c7cfffcace8e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 28 Aug 2023 18:16:03 +0000
Subject: [PATCH 352/909] Bump comeonin from 5.3.3 to 5.4.0

Bumps [comeonin](https://github.com/riverrun/comeonin) from 5.3.3 to 5.4.0.
- [Changelog](https://github.com/riverrun/comeonin/blob/master/CHANGELOG.md)
- [Commits](https://github.com/riverrun/comeonin/compare/v5.3.3...v5.4.0)

---
updated-dependencies:
- dependency-name: comeonin
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 mix.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mix.lock b/mix.lock
index 48442769907c..6e5ef00560d6 100644
--- a/mix.lock
+++ b/mix.lock
@@ -20,7 +20,7 @@
   "cloak_ecto": {:hex, :cloak_ecto, "1.2.0", "e86a3df3bf0dc8980f70406bcb0af2858bac247d55494d40bc58a152590bd402", [:mix], [{:cloak, "~> 1.1.1", [hex: :cloak, repo: "hexpm", optional: false]}, {:ecto, "~> 3.0", [hex: :ecto, repo: "hexpm", optional: false]}], "hexpm", "8bcc677185c813fe64b786618bd6689b1707b35cd95acaae0834557b15a0c62f"},
   "coerce": {:hex, :coerce, "1.0.1", "211c27386315dc2894ac11bc1f413a0e38505d808153367bd5c6e75a4003d096", [:mix], [], "hexpm", "b44a691700f7a1a15b4b7e2ff1fa30bebd669929ac8aa43cffe9e2f8bf051cf1"},
   "combine": {:hex, :combine, "0.10.0", "eff8224eeb56498a2af13011d142c5e7997a80c8f5b97c499f84c841032e429f", [:mix], [], "hexpm", "1b1dbc1790073076580d0d1d64e42eae2366583e7aecd455d1215b0d16f2451b"},
-  "comeonin": {:hex, :comeonin, "5.3.3", "2c564dac95a35650e9b6acfe6d2952083d8a08e4a89b93a481acb552b325892e", [:mix], [], "hexpm", "3e38c9c2cb080828116597ca8807bb482618a315bfafd98c90bc22a821cc84df"},
+  "comeonin": {:hex, :comeonin, "5.4.0", "246a56ca3f41d404380fc6465650ddaa532c7f98be4bda1b4656b3a37cc13abe", [:mix], [], "hexpm", "796393a9e50d01999d56b7b8420ab0481a7538d0caf80919da493b4a6e51faf1"},
   "con_cache": {:hex, :con_cache, "1.0.0", "6405e2bd5d5005334af72939432783562a8c35a196c2e63108fe10bb97b366e6", [:mix], [], "hexpm", "4d1f5cb1a67f3c1a468243dc98d10ac83af7f3e33b7e7c15999dc2c9bc0a551e"},
   "connection": {:hex, :connection, "1.1.0", "ff2a49c4b75b6fb3e674bfc5536451607270aac754ffd1bdfe175abe4a6d7a68", [:mix], [], "hexpm", "722c1eb0a418fbe91ba7bd59a47e28008a189d47e37e0e7bb85585a016b2869c"},
   "cors_plug": {:hex, :cors_plug, "3.0.3", "7c3ac52b39624bc616db2e937c282f3f623f25f8d550068b6710e58d04a0e330", [:mix], [{:plug, "~> 1.13", [hex: :plug, repo: "hexpm", optional: false]}], "hexpm", "3f2d759e8c272ed3835fab2ef11b46bddab8c1ab9528167bd463b6452edf830d"},

From 7459dee43307bf81c9b58ead66080ad3b213740a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 28 Aug 2023 18:16:25 +0000
Subject: [PATCH 353/909] Bump bcrypt_elixir from 3.0.1 to 3.1.0

Bumps [bcrypt_elixir](https://github.com/riverrun/bcrypt_elixir) from 3.0.1 to 3.1.0.
- [Changelog](https://github.com/riverrun/bcrypt_elixir/blob/master/CHANGELOG.md)
- [Commits](https://github.com/riverrun/bcrypt_elixir/compare/v3.0.1...v3.1.0)

---
updated-dependencies:
- dependency-name: bcrypt_elixir
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 mix.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/mix.lock b/mix.lock
index 48442769907c..a358556ec27c 100644
--- a/mix.lock
+++ b/mix.lock
@@ -5,7 +5,7 @@
   "absinthe_relay": {:hex, :absinthe_relay, "1.5.2", "cfb8aed70f4e4c7718d3f1c212332d2ea728f17c7fc0f68f1e461f0f5f0c4b9a", [:mix], [{:absinthe, "~> 1.5.0 or ~> 1.6.0 or ~> 1.7.0", [hex: :absinthe, repo: "hexpm", optional: false]}, {:ecto, "~> 2.0 or ~> 3.0", [hex: :ecto, repo: "hexpm", optional: true]}], "hexpm", "0587ee913afa31512e1457a5064ee88427f8fe7bcfbeeecd41c71d9cff0b62b6"},
   "accept": {:hex, :accept, "0.3.5", "b33b127abca7cc948bbe6caa4c263369abf1347cfa9d8e699c6d214660f10cd1", [:rebar3], [], "hexpm", "11b18c220bcc2eab63b5470c038ef10eb6783bcb1fcdb11aa4137defa5ac1bb8"},
   "bamboo": {:hex, :bamboo, "2.3.0", "d2392a2cabe91edf488553d3c70638b532e8db7b76b84b0a39e3dfe492ffd6fc", [:mix], [{:hackney, ">= 1.15.2", [hex: :hackney, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}, {:mime, "~> 1.4 or ~> 2.0", [hex: :mime, repo: "hexpm", optional: false]}, {:plug, "~> 1.0", [hex: :plug, repo: "hexpm", optional: false]}], "hexpm", "dd0037e68e108fd04d0e8773921512c940e35d981e097b5793543e3b2f9cd3f6"},
-  "bcrypt_elixir": {:hex, :bcrypt_elixir, "3.0.1", "9be815469e6bfefec40fa74658ecbbe6897acfb57614df1416eeccd4903f602c", [:make, :mix], [{:comeonin, "~> 5.3", [hex: :comeonin, repo: "hexpm", optional: false]}, {:elixir_make, "~> 0.6", [hex: :elixir_make, repo: "hexpm", optional: false]}], "hexpm", "486bb95efb645d1efc6794c1ddd776a186a9a713abf06f45708a6ce324fb96cf"},
+  "bcrypt_elixir": {:hex, :bcrypt_elixir, "3.1.0", "0b110a9a6c619b19a7f73fa3004aa11d6e719a67e672d1633dc36b6b2290a0f7", [:make, :mix], [{:comeonin, "~> 5.3", [hex: :comeonin, repo: "hexpm", optional: false]}, {:elixir_make, "~> 0.6", [hex: :elixir_make, repo: "hexpm", optional: false]}], "hexpm", "2ad2acb5a8bc049e8d5aa267802631912bb80d5f4110a178ae7999e69dca1bf7"},
   "benchee": {:hex, :benchee, "1.1.0", "f3a43817209a92a1fade36ef36b86e1052627fd8934a8b937ac9ab3a76c43062", [:mix], [{:deep_merge, "~> 1.0", [hex: :deep_merge, repo: "hexpm", optional: false]}, {:statistex, "~> 1.0", [hex: :statistex, repo: "hexpm", optional: false]}], "hexpm", "7da57d545003165a012b587077f6ba90b89210fd88074ce3c60ce239eb5e6d93"},
   "benchee_csv": {:hex, :benchee_csv, "1.0.0", "0b3b9223290bfcb8003552705bec9bcf1a89b4a83b70bd686e45295c264f3d16", [:mix], [{:benchee, ">= 0.99.0 and < 2.0.0", [hex: :benchee, repo: "hexpm", optional: false]}, {:csv, "~> 2.0", [hex: :csv, repo: "hexpm", optional: false]}], "hexpm", "cdefb804c021dcf7a99199492026584be9b5a21d6644ac0d01c81c5d97c520d5"},
   "briefly": {:git, "https://github.com/CargoSense/briefly.git", "678a3763e72a7d1f23ac71b209b96bd199bffbbb", []},
@@ -20,7 +20,7 @@
   "cloak_ecto": {:hex, :cloak_ecto, "1.2.0", "e86a3df3bf0dc8980f70406bcb0af2858bac247d55494d40bc58a152590bd402", [:mix], [{:cloak, "~> 1.1.1", [hex: :cloak, repo: "hexpm", optional: false]}, {:ecto, "~> 3.0", [hex: :ecto, repo: "hexpm", optional: false]}], "hexpm", "8bcc677185c813fe64b786618bd6689b1707b35cd95acaae0834557b15a0c62f"},
   "coerce": {:hex, :coerce, "1.0.1", "211c27386315dc2894ac11bc1f413a0e38505d808153367bd5c6e75a4003d096", [:mix], [], "hexpm", "b44a691700f7a1a15b4b7e2ff1fa30bebd669929ac8aa43cffe9e2f8bf051cf1"},
   "combine": {:hex, :combine, "0.10.0", "eff8224eeb56498a2af13011d142c5e7997a80c8f5b97c499f84c841032e429f", [:mix], [], "hexpm", "1b1dbc1790073076580d0d1d64e42eae2366583e7aecd455d1215b0d16f2451b"},
-  "comeonin": {:hex, :comeonin, "5.3.3", "2c564dac95a35650e9b6acfe6d2952083d8a08e4a89b93a481acb552b325892e", [:mix], [], "hexpm", "3e38c9c2cb080828116597ca8807bb482618a315bfafd98c90bc22a821cc84df"},
+  "comeonin": {:hex, :comeonin, "5.4.0", "246a56ca3f41d404380fc6465650ddaa532c7f98be4bda1b4656b3a37cc13abe", [:mix], [], "hexpm", "796393a9e50d01999d56b7b8420ab0481a7538d0caf80919da493b4a6e51faf1"},
   "con_cache": {:hex, :con_cache, "1.0.0", "6405e2bd5d5005334af72939432783562a8c35a196c2e63108fe10bb97b366e6", [:mix], [], "hexpm", "4d1f5cb1a67f3c1a468243dc98d10ac83af7f3e33b7e7c15999dc2c9bc0a551e"},
   "connection": {:hex, :connection, "1.1.0", "ff2a49c4b75b6fb3e674bfc5536451607270aac754ffd1bdfe175abe4a6d7a68", [:mix], [], "hexpm", "722c1eb0a418fbe91ba7bd59a47e28008a189d47e37e0e7bb85585a016b2869c"},
   "cors_plug": {:hex, :cors_plug, "3.0.3", "7c3ac52b39624bc616db2e937c282f3f623f25f8d550068b6710e58d04a0e330", [:mix], [{:plug, "~> 1.13", [hex: :plug, repo: "hexpm", optional: false]}], "hexpm", "3f2d759e8c272ed3835fab2ef11b46bddab8c1ab9528167bd463b6452edf830d"},
@@ -39,7 +39,7 @@
   "earmark_parser": {:hex, :earmark_parser, "1.4.33", "3c3fd9673bb5dcc9edc28dd90f50c87ce506d1f71b70e3de69aa8154bc695d44", [:mix], [], "hexpm", "2d526833729b59b9fdb85785078697c72ac5e5066350663e5be6a1182da61b8f"},
   "ecto": {:hex, :ecto, "3.10.3", "eb2ae2eecd210b4eb8bece1217b297ad4ff824b4384c0e3fdd28aaf96edd6135", [:mix], [{:decimal, "~> 1.6 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}, {:telemetry, "~> 0.4 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "44bec74e2364d491d70f7e42cd0d690922659d329f6465e89feb8a34e8cd3433"},
   "ecto_sql": {:hex, :ecto_sql, "3.10.2", "6b98b46534b5c2f8b8b5f03f126e75e2a73c64f3c071149d32987a5378b0fdbd", [:mix], [{:db_connection, "~> 2.5 or ~> 2.4.1", [hex: :db_connection, repo: "hexpm", optional: false]}, {:ecto, "~> 3.10.0", [hex: :ecto, repo: "hexpm", optional: false]}, {:myxql, "~> 0.6.0", [hex: :myxql, repo: "hexpm", optional: true]}, {:postgrex, "~> 0.16.0 or ~> 0.17.0 or ~> 1.0", [hex: :postgrex, repo: "hexpm", optional: true]}, {:tds, "~> 2.1.1 or ~> 2.2", [hex: :tds, repo: "hexpm", optional: true]}, {:telemetry, "~> 0.4.0 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "68c018debca57cb9235e3889affdaec7a10616a4e3a80c99fa1d01fdafaa9007"},
-  "elixir_make": {:hex, :elixir_make, "0.6.3", "bc07d53221216838d79e03a8019d0839786703129599e9619f4ab74c8c096eac", [:mix], [], "hexpm", "f5cbd651c5678bcaabdbb7857658ee106b12509cd976c2c2fca99688e1daf716"},
+  "elixir_make": {:hex, :elixir_make, "0.7.7", "7128c60c2476019ed978210c245badf08b03dbec4f24d05790ef791da11aa17c", [:mix], [{:castore, "~> 0.1 or ~> 1.0", [hex: :castore, repo: "hexpm", optional: true]}], "hexpm", "5bc19fff950fad52bbe5f211b12db9ec82c6b34a9647da0c2224b8b8464c7e6c"},
   "erlex": {:hex, :erlex, "0.2.6", "c7987d15e899c7a2f34f5420d2a2ea0d659682c06ac607572df55a43753aa12e", [:mix], [], "hexpm", "2ed2e25711feb44d52b17d2780eabf998452f6efda104877a3881c2f8c0c0c75"},
   "ex_abi": {:hex, :ex_abi, "0.6.0", "8cf1fef9490dea0834bc201d399635e72178df05dea87b1c933478762dede142", [:mix], [{:ex_keccak, "~> 0.7.1", [hex: :ex_keccak, repo: "hexpm", optional: false]}, {:jason, "~> 1.4", [hex: :jason, repo: "hexpm", optional: false]}], "hexpm", "b03e5fe07371db3ceceb2d536cc32658dcba47b79952469e3e71d7690495e8d8"},
   "ex_cldr": {:hex, :ex_cldr, "2.37.2", "c45041534ec60af367c4c1af02a608576118044fe3c441c782fd424061d6b517", [:mix], [{:cldr_utils, "~> 2.21", [hex: :cldr_utils, repo: "hexpm", optional: false]}, {:decimal, "~> 1.6 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: false]}, {:gettext, "~> 0.19", [hex: :gettext, repo: "hexpm", optional: true]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}, {:nimble_parsec, "~> 0.5 or ~> 1.0", [hex: :nimble_parsec, repo: "hexpm", optional: true]}], "hexpm", "c8467b1d5080716ace6621703b6656cb2f9545572a54b341da900791a0cf92ba"},

From 47db52b6774380aa3b61b29e794745477ee44e19 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 29 Aug 2023 18:16:28 +0000
Subject: [PATCH 354/909] Bump hackney from 1.18.1 to 1.18.2

Bumps [hackney](https://github.com/benoitc/hackney) from 1.18.1 to 1.18.2.
- [Release notes](https://github.com/benoitc/hackney/releases)
- [Changelog](https://github.com/benoitc/hackney/blob/master/NEWS.md)
- [Commits](https://github.com/benoitc/hackney/compare/1.18.1...1.18.2)

---
updated-dependencies:
- dependency-name: hackney
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 mix.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/mix.lock b/mix.lock
index 48442769907c..21a42182f220 100644
--- a/mix.lock
+++ b/mix.lock
@@ -14,7 +14,7 @@
   "bypass": {:hex, :bypass, "2.1.0", "909782781bf8e20ee86a9cabde36b259d44af8b9f38756173e8f5e2e1fabb9b1", [:mix], [{:plug, "~> 1.7", [hex: :plug, repo: "hexpm", optional: false]}, {:plug_cowboy, "~> 2.0", [hex: :plug_cowboy, repo: "hexpm", optional: false]}, {:ranch, "~> 1.3", [hex: :ranch, repo: "hexpm", optional: false]}], "hexpm", "d9b5df8fa5b7a6efa08384e9bbecfe4ce61c77d28a4282f79e02f1ef78d96b80"},
   "castore": {:hex, :castore, "1.0.3", "7130ba6d24c8424014194676d608cb989f62ef8039efd50ff4b3f33286d06db8", [:mix], [], "hexpm", "680ab01ef5d15b161ed6a95449fac5c6b8f60055677a8e79acf01b27baa4390b"},
   "cbor": {:hex, :cbor, "1.0.1", "39511158e8ea5a57c1fcb9639aaa7efde67129678fee49ebbda780f6f24959b0", [:mix], [], "hexpm", "5431acbe7a7908f17f6a9cd43311002836a34a8ab01876918d8cfb709cd8b6a2"},
-  "certifi": {:hex, :certifi, "2.9.0", "6f2a475689dd47f19fb74334859d460a2dc4e3252a3324bd2111b8f0429e7e21", [:rebar3], [], "hexpm", "266da46bdb06d6c6d35fde799bcb28d36d985d424ad7c08b5bb48f5b5cdd4641"},
+  "certifi": {:hex, :certifi, "2.12.0", "2d1cca2ec95f59643862af91f001478c9863c2ac9cb6e2f89780bfd8de987329", [:rebar3], [], "hexpm", "ee68d85df22e554040cdb4be100f33873ac6051387baf6a8f6ce82272340ff1c"},
   "cldr_utils": {:hex, :cldr_utils, "2.24.1", "5ff8c8c55f96666228827bcf85a23d632022def200566346545d01d15e4c30dc", [:mix], [{:castore, "~> 0.1 or ~> 1.0", [hex: :castore, repo: "hexpm", optional: true]}, {:certifi, "~> 2.5", [hex: :certifi, repo: "hexpm", optional: true]}, {:decimal, "~> 1.9 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: false]}], "hexpm", "1820300531b5b849d0bc468e5a87cd64f8f2c5191916f548cbe69b2efc203780"},
   "cloak": {:hex, :cloak, "1.1.2", "7e0006c2b0b98d976d4f559080fabefd81f0e0a50a3c4b621f85ceeb563e80bb", [:mix], [{:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}], "hexpm", "940d5ac4fcd51b252930fd112e319ea5ae6ab540b722f3ca60a85666759b9585"},
   "cloak_ecto": {:hex, :cloak_ecto, "1.2.0", "e86a3df3bf0dc8980f70406bcb0af2858bac247d55494d40bc58a152590bd402", [:mix], [{:cloak, "~> 1.1.1", [hex: :cloak, repo: "hexpm", optional: false]}, {:ecto, "~> 3.0", [hex: :ecto, repo: "hexpm", optional: false]}], "hexpm", "8bcc677185c813fe64b786618bd6689b1707b35cd95acaae0834557b15a0c62f"},
@@ -64,7 +64,7 @@
   "flow": {:hex, :flow, "1.2.4", "1dd58918287eb286656008777cb32714b5123d3855956f29aa141ebae456922d", [:mix], [{:gen_stage, "~> 1.0", [hex: :gen_stage, repo: "hexpm", optional: false]}], "hexpm", "874adde96368e71870f3510b91e35bc31652291858c86c0e75359cbdd35eb211"},
   "gen_stage": {:hex, :gen_stage, "1.2.1", "19d8b5e9a5996d813b8245338a28246307fd8b9c99d1237de199d21efc4c76a1", [:mix], [], "hexpm", "83e8be657fa05b992ffa6ac1e3af6d57aa50aace8f691fcf696ff02f8335b001"},
   "gettext": {:hex, :gettext, "0.23.1", "821e619a240e6000db2fc16a574ef68b3bd7fe0167ccc264a81563cc93e67a31", [:mix], [{:expo, "~> 0.4.0", [hex: :expo, repo: "hexpm", optional: false]}], "hexpm", "19d744a36b809d810d610b57c27b934425859d158ebd56561bc41f7eeb8795db"},
-  "hackney": {:hex, :hackney, "1.18.1", "f48bf88f521f2a229fc7bae88cf4f85adc9cd9bcf23b5dc8eb6a1788c662c4f6", [:rebar3], [{:certifi, "~>2.9.0", [hex: :certifi, repo: "hexpm", optional: false]}, {:idna, "~>6.1.0", [hex: :idna, repo: "hexpm", optional: false]}, {:metrics, "~>1.0.0", [hex: :metrics, repo: "hexpm", optional: false]}, {:mimerl, "~>1.1", [hex: :mimerl, repo: "hexpm", optional: false]}, {:parse_trans, "3.3.1", [hex: :parse_trans, repo: "hexpm", optional: false]}, {:ssl_verify_fun, "~>1.1.0", [hex: :ssl_verify_fun, repo: "hexpm", optional: false]}, {:unicode_util_compat, "~>0.7.0", [hex: :unicode_util_compat, repo: "hexpm", optional: false]}], "hexpm", "a4ecdaff44297e9b5894ae499e9a070ea1888c84afdd1fd9b7b2bc384950128e"},
+  "hackney": {:hex, :hackney, "1.18.2", "d7ff544ddae5e1cb49e9cf7fa4e356d7f41b283989a1c304bfc47a8cc1cf966f", [:rebar3], [{:certifi, "~>2.12.0", [hex: :certifi, repo: "hexpm", optional: false]}, {:idna, "~>6.1.0", [hex: :idna, repo: "hexpm", optional: false]}, {:metrics, "~>1.0.0", [hex: :metrics, repo: "hexpm", optional: false]}, {:mimerl, "~>1.1", [hex: :mimerl, repo: "hexpm", optional: false]}, {:parse_trans, "3.4.1", [hex: :parse_trans, repo: "hexpm", optional: false]}, {:ssl_verify_fun, "~>1.1.0", [hex: :ssl_verify_fun, repo: "hexpm", optional: false]}, {:unicode_util_compat, "~>0.7.0", [hex: :unicode_util_compat, repo: "hexpm", optional: false]}], "hexpm", "af94d5c9f97857db257090a4a10e5426ecb6f4918aa5cc666798566ae14b65fd"},
   "hammer": {:hex, :hammer, "6.1.0", "f263e3c3e9946bd410ea0336b2abe0cb6260af4afb3a221e1027540706e76c55", [:make, :mix], [{:poolboy, "~> 1.5", [hex: :poolboy, repo: "hexpm", optional: false]}], "hexpm", "b47e415a562a6d072392deabcd58090d8a41182cf9044cdd6b0d0faaaf68ba57"},
   "hammer_backend_redis": {:hex, :hammer_backend_redis, "6.1.2", "eb296bb4924928e24135308b2afc189201fd09411c870c6bbadea444a49b2f2c", [:mix], [{:hammer, "~> 6.0", [hex: :hammer, repo: "hexpm", optional: false]}, {:redix, "~> 1.1", [hex: :redix, repo: "hexpm", optional: false]}], "hexpm", "217ea066278910543a5e9b577d5bf2425419446b94fe76bdd9f255f39feec9fa"},
   "html_entities": {:hex, :html_entities, "0.5.2", "9e47e70598da7de2a9ff6af8758399251db6dbb7eebe2b013f2bbd2515895c3c", [:mix], [], "hexpm", "c53ba390403485615623b9531e97696f076ed415e8d8058b1dbaa28181f4fdcc"},
@@ -97,7 +97,7 @@
   "oauth2": {:hex, :oauth2, "2.0.1", "70729503e05378697b958919bb2d65b002ba6b28c8112328063648a9348aaa3f", [:mix], [{:hackney, "~> 1.13", [hex: :hackney, repo: "hexpm", optional: false]}], "hexpm", "c64e20d4d105bcdbcbe03170fb530d0eddc3a3e6b135a87528a22c8aecf74c52"},
   "optimal": {:hex, :optimal, "0.3.6", "46bbf52fbbbd238cda81e02560caa84f93a53c75620f1fe19e81e4ae7b07d1dd", [:mix], [], "hexpm", "1a06ea6a653120226b35b283a1cd10039550f2c566edcdec22b29316d73640fd"},
   "parallel_stream": {:hex, :parallel_stream, "1.1.0", "f52f73eb344bc22de335992377413138405796e0d0ad99d995d9977ac29f1ca9", [:mix], [], "hexpm", "684fd19191aedfaf387bbabbeb8ff3c752f0220c8112eb907d797f4592d6e871"},
-  "parse_trans": {:hex, :parse_trans, "3.3.1", "16328ab840cc09919bd10dab29e431da3af9e9e7e7e6f0089dd5a2d2820011d8", [:rebar3], [], "hexpm", "07cd9577885f56362d414e8c4c4e6bdf10d43a8767abb92d24cbe8b24c54888b"},
+  "parse_trans": {:hex, :parse_trans, "3.4.1", "6e6aa8167cb44cc8f39441d05193be6e6f4e7c2946cb2759f015f8c56b76e5ff", [:rebar3], [], "hexpm", "620a406ce75dada827b82e453c19cf06776be266f5a67cff34e1ef2cbb60e49a"},
   "phoenix": {:hex, :phoenix, "1.5.14", "2d5db884be496eefa5157505ec0134e66187cb416c072272420c5509d67bf808", [:mix], [{:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}, {:phoenix_html, "~> 2.13 or ~> 3.0", [hex: :phoenix_html, repo: "hexpm", optional: true]}, {:phoenix_pubsub, "~> 2.0", [hex: :phoenix_pubsub, repo: "hexpm", optional: false]}, {:plug, "~> 1.10", [hex: :plug, repo: "hexpm", optional: false]}, {:plug_cowboy, "~> 1.0 or ~> 2.2", [hex: :plug_cowboy, repo: "hexpm", optional: true]}, {:plug_crypto, "~> 1.1.2 or ~> 1.2", [hex: :plug_crypto, repo: "hexpm", optional: false]}, {:telemetry, "~> 0.4 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "207f1aa5520320cbb7940d7ff2dde2342162cf513875848f88249ea0ba02fef7"},
   "phoenix_ecto": {:hex, :phoenix_ecto, "4.4.2", "b21bd01fdeffcfe2fab49e4942aa938b6d3e89e93a480d4aee58085560a0bc0d", [:mix], [{:ecto, "~> 3.5", [hex: :ecto, repo: "hexpm", optional: false]}, {:phoenix_html, "~> 2.14.2 or ~> 3.0", [hex: :phoenix_html, repo: "hexpm", optional: true]}, {:plug, "~> 1.9", [hex: :plug, repo: "hexpm", optional: false]}], "hexpm", "70242edd4601d50b69273b057ecf7b684644c19ee750989fd555625ae4ce8f5d"},
   "phoenix_html": {:hex, :phoenix_html, "3.0.4", "232d41884fe6a9c42d09f48397c175cd6f0d443aaa34c7424da47604201df2e1", [:mix], [{:plug, "~> 1.5", [hex: :plug, repo: "hexpm", optional: true]}], "hexpm", "ce17fd3cf815b2ed874114073e743507704b1f5288bb03c304a77458485efc8b"},

From 6c4c10ac0f9139ccee60d8322d00e400eefe8ffb Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 29 Aug 2023 18:17:06 +0000
Subject: [PATCH 355/909] Bump postgrex from 0.17.2 to 0.17.3

Bumps [postgrex](https://github.com/elixir-ecto/postgrex) from 0.17.2 to 0.17.3.
- [Release notes](https://github.com/elixir-ecto/postgrex/releases)
- [Changelog](https://github.com/elixir-ecto/postgrex/blob/master/CHANGELOG.md)
- [Commits](https://github.com/elixir-ecto/postgrex/compare/v0.17.2...v0.17.3)

---
updated-dependencies:
- dependency-name: postgrex
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 mix.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mix.lock b/mix.lock
index 48442769907c..632526a01bbc 100644
--- a/mix.lock
+++ b/mix.lock
@@ -108,7 +108,7 @@
   "plug_crypto": {:hex, :plug_crypto, "1.2.5", "918772575e48e81e455818229bf719d4ab4181fcbf7f85b68a35620f78d89ced", [:mix], [], "hexpm", "26549a1d6345e2172eb1c233866756ae44a9609bd33ee6f99147ab3fd87fd842"},
   "poison": {:hex, :poison, "4.0.1", "bcb755a16fac91cad79bfe9fc3585bb07b9331e50cfe3420a24bcc2d735709ae", [:mix], [], "hexpm", "ba8836feea4b394bb718a161fc59a288fe0109b5006d6bdf97b6badfcf6f0f25"},
   "poolboy": {:hex, :poolboy, "1.5.2", "392b007a1693a64540cead79830443abf5762f5d30cf50bc95cb2c1aaafa006b", [:rebar3], [], "hexpm", "dad79704ce5440f3d5a3681c8590b9dc25d1a561e8f5a9c995281012860901e3"},
-  "postgrex": {:hex, :postgrex, "0.17.2", "a3ec9e3239d9b33f1e5841565c4eb200055c52cc0757a22b63ca2d529bbe764c", [:mix], [{:db_connection, "~> 2.1", [hex: :db_connection, repo: "hexpm", optional: false]}, {:decimal, "~> 1.5 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}, {:table, "~> 0.1.0", [hex: :table, repo: "hexpm", optional: true]}], "hexpm", "80a918a9e9531d39f7bd70621422f3ebc93c01618c645f2d91306f50041ed90c"},
+  "postgrex": {:hex, :postgrex, "0.17.3", "c92cda8de2033a7585dae8c61b1d420a1a1322421df84da9a82a6764580c503d", [:mix], [{:db_connection, "~> 2.1", [hex: :db_connection, repo: "hexpm", optional: false]}, {:decimal, "~> 1.5 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}, {:table, "~> 0.1.0", [hex: :table, repo: "hexpm", optional: true]}], "hexpm", "946cf46935a4fdca7a81448be76ba3503cff082df42c6ec1ff16a4bdfbfb098d"},
   "prometheus": {:hex, :prometheus, "4.10.0", "792adbf0130ff61b5fa8826f013772af24b6e57b984445c8d602c8a0355704a1", [:mix, :rebar3], [{:quantile_estimator, "~> 0.2.1", [hex: :quantile_estimator, repo: "hexpm", optional: false]}], "hexpm", "2a99bb6dce85e238c7236fde6b0064f9834dc420ddbd962aac4ea2a3c3d59384"},
   "prometheus_ecto": {:hex, :prometheus_ecto, "1.4.3", "3dd4da1812b8e0dbee81ea58bb3b62ed7588f2eae0c9e97e434c46807ff82311", [:mix], [{:ecto, "~> 2.0 or ~> 3.0", [hex: :ecto, repo: "hexpm", optional: false]}, {:prometheus_ex, "~> 1.1 or ~> 2.0 or ~> 3.0", [hex: :prometheus_ex, repo: "hexpm", optional: false]}], "hexpm", "8d66289f77f913b37eda81fd287340c17e61a447549deb28efc254532b2bed82"},
   "prometheus_ex": {:git, "https://github.com/lanodan/prometheus.ex", "31f7fbe4b71b79ba27efc2a5085746c4011ceb8f", [branch: "fix/elixir-1.14"]},

From 40814661119b8f80a99c83358319efa1a12a10f3 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 29 Aug 2023 18:28:59 +0000
Subject: [PATCH 356/909] Bump @amplitude/analytics-browser in
 /apps/block_scout_web/assets

Bumps [@amplitude/analytics-browser](https://github.com/amplitude/Amplitude-TypeScript) from 2.2.1 to 2.2.2.
- [Release notes](https://github.com/amplitude/Amplitude-TypeScript/releases)
- [Commits](https://github.com/amplitude/Amplitude-TypeScript/compare/@amplitude/analytics-browser@2.2.1...@amplitude/analytics-browser@2.2.2)

---
updated-dependencies:
- dependency-name: "@amplitude/analytics-browser"
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 apps/block_scout_web/assets/package-lock.json | 46 +++++++++----------
 apps/block_scout_web/assets/package.json      |  2 +-
 2 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/apps/block_scout_web/assets/package-lock.json b/apps/block_scout_web/assets/package-lock.json
index 8fdfa49f7209..255c9040d111 100644
--- a/apps/block_scout_web/assets/package-lock.json
+++ b/apps/block_scout_web/assets/package-lock.json
@@ -7,7 +7,7 @@
       "name": "blockscout",
       "license": "GPL-3.0",
       "dependencies": {
-        "@amplitude/analytics-browser": "^2.2.1",
+        "@amplitude/analytics-browser": "^2.2.2",
         "@fortawesome/fontawesome-free": "^6.4.2",
         "@tarekraafat/autocomplete.js": "^10.2.7",
         "@walletconnect/web3-provider": "^1.8.0",
@@ -116,15 +116,15 @@
       }
     },
     "node_modules/@amplitude/analytics-browser": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/@amplitude/analytics-browser/-/analytics-browser-2.2.1.tgz",
-      "integrity": "sha512-RrXXAnL2mbbkgyTUJ45azw3Q3938pH8ricGt0zImTHdeqYjhSvhyXRy3M/yn7V+99oeB0sibILRCy99YSUp0hw==",
+      "version": "2.2.2",
+      "resolved": "https://registry.npmjs.org/@amplitude/analytics-browser/-/analytics-browser-2.2.2.tgz",
+      "integrity": "sha512-7H2lp6fu2umjmrOvBS3DeCkf7hEiM4+M9VYB9Dvn8QwlaeLhQrk/+TLyew12lmApOowI/C1f8TAupSIKB5MucQ==",
       "dependencies": {
         "@amplitude/analytics-client-common": "^2.0.5",
         "@amplitude/analytics-core": "^2.0.4",
         "@amplitude/analytics-types": "^2.1.2",
-        "@amplitude/plugin-page-view-tracking-browser": "^2.0.7",
-        "@amplitude/plugin-web-attribution-browser": "^2.0.7",
+        "@amplitude/plugin-page-view-tracking-browser": "^2.0.8",
+        "@amplitude/plugin-web-attribution-browser": "^2.0.8",
         "tslib": "^2.4.1"
       }
     },
@@ -174,9 +174,9 @@
       "integrity": "sha512-ASKwH9g+5gglTHr7h7miK8J/ofIzuEtGRDCjnZAtRbE6+laoOfCLYPPJXMYz0k1x+rIhLO/6I6WWjT7zchmpyA=="
     },
     "node_modules/@amplitude/plugin-page-view-tracking-browser": {
-      "version": "2.0.7",
-      "resolved": "https://registry.npmjs.org/@amplitude/plugin-page-view-tracking-browser/-/plugin-page-view-tracking-browser-2.0.7.tgz",
-      "integrity": "sha512-hVRgI29W6dsBokteDUBm4GHR8mN6Z+qStieU7x3XtPBuF+jYDEIgyF76iiHmbcILSRMuKQswH5fE6hkARvGK7g==",
+      "version": "2.0.8",
+      "resolved": "https://registry.npmjs.org/@amplitude/plugin-page-view-tracking-browser/-/plugin-page-view-tracking-browser-2.0.8.tgz",
+      "integrity": "sha512-TwZuJZj5x1x98Dg8e/Papq9NmP5smKQiHg0/N7MY+qXELsM0zJ53TsXC0Eo2J9U8Ok6jfZSRoYCp/s7mQ2zDoA==",
       "dependencies": {
         "@amplitude/analytics-client-common": "^2.0.5",
         "@amplitude/analytics-types": "^2.1.2",
@@ -189,9 +189,9 @@
       "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q=="
     },
     "node_modules/@amplitude/plugin-web-attribution-browser": {
-      "version": "2.0.7",
-      "resolved": "https://registry.npmjs.org/@amplitude/plugin-web-attribution-browser/-/plugin-web-attribution-browser-2.0.7.tgz",
-      "integrity": "sha512-vfIIiWZgVKPck9i9/Pkih8Udx/eVK+P3UoBARCaV2uKUiA9WnJ/0uGm6/bkJeR1i9Kbp+MoVfSUPZXf7fBg5+A==",
+      "version": "2.0.8",
+      "resolved": "https://registry.npmjs.org/@amplitude/plugin-web-attribution-browser/-/plugin-web-attribution-browser-2.0.8.tgz",
+      "integrity": "sha512-ZRk67ErKc+uNFKpgPEtdT+7kut3RkdiuZa52c3rX6OeUYpFpVlwWnH565AnpNh/clBPlqJPL7T90Dq0ku9QZtg==",
       "dependencies": {
         "@amplitude/analytics-client-common": "^2.0.5",
         "@amplitude/analytics-core": "^2.0.4",
@@ -17604,15 +17604,15 @@
       "dev": true
     },
     "@amplitude/analytics-browser": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/@amplitude/analytics-browser/-/analytics-browser-2.2.1.tgz",
-      "integrity": "sha512-RrXXAnL2mbbkgyTUJ45azw3Q3938pH8ricGt0zImTHdeqYjhSvhyXRy3M/yn7V+99oeB0sibILRCy99YSUp0hw==",
+      "version": "2.2.2",
+      "resolved": "https://registry.npmjs.org/@amplitude/analytics-browser/-/analytics-browser-2.2.2.tgz",
+      "integrity": "sha512-7H2lp6fu2umjmrOvBS3DeCkf7hEiM4+M9VYB9Dvn8QwlaeLhQrk/+TLyew12lmApOowI/C1f8TAupSIKB5MucQ==",
       "requires": {
         "@amplitude/analytics-client-common": "^2.0.5",
         "@amplitude/analytics-core": "^2.0.4",
         "@amplitude/analytics-types": "^2.1.2",
-        "@amplitude/plugin-page-view-tracking-browser": "^2.0.7",
-        "@amplitude/plugin-web-attribution-browser": "^2.0.7",
+        "@amplitude/plugin-page-view-tracking-browser": "^2.0.8",
+        "@amplitude/plugin-web-attribution-browser": "^2.0.8",
         "tslib": "^2.4.1"
       },
       "dependencies": {
@@ -17668,9 +17668,9 @@
       "integrity": "sha512-ASKwH9g+5gglTHr7h7miK8J/ofIzuEtGRDCjnZAtRbE6+laoOfCLYPPJXMYz0k1x+rIhLO/6I6WWjT7zchmpyA=="
     },
     "@amplitude/plugin-page-view-tracking-browser": {
-      "version": "2.0.7",
-      "resolved": "https://registry.npmjs.org/@amplitude/plugin-page-view-tracking-browser/-/plugin-page-view-tracking-browser-2.0.7.tgz",
-      "integrity": "sha512-hVRgI29W6dsBokteDUBm4GHR8mN6Z+qStieU7x3XtPBuF+jYDEIgyF76iiHmbcILSRMuKQswH5fE6hkARvGK7g==",
+      "version": "2.0.8",
+      "resolved": "https://registry.npmjs.org/@amplitude/plugin-page-view-tracking-browser/-/plugin-page-view-tracking-browser-2.0.8.tgz",
+      "integrity": "sha512-TwZuJZj5x1x98Dg8e/Papq9NmP5smKQiHg0/N7MY+qXELsM0zJ53TsXC0Eo2J9U8Ok6jfZSRoYCp/s7mQ2zDoA==",
       "requires": {
         "@amplitude/analytics-client-common": "^2.0.5",
         "@amplitude/analytics-types": "^2.1.2",
@@ -17685,9 +17685,9 @@
       }
     },
     "@amplitude/plugin-web-attribution-browser": {
-      "version": "2.0.7",
-      "resolved": "https://registry.npmjs.org/@amplitude/plugin-web-attribution-browser/-/plugin-web-attribution-browser-2.0.7.tgz",
-      "integrity": "sha512-vfIIiWZgVKPck9i9/Pkih8Udx/eVK+P3UoBARCaV2uKUiA9WnJ/0uGm6/bkJeR1i9Kbp+MoVfSUPZXf7fBg5+A==",
+      "version": "2.0.8",
+      "resolved": "https://registry.npmjs.org/@amplitude/plugin-web-attribution-browser/-/plugin-web-attribution-browser-2.0.8.tgz",
+      "integrity": "sha512-ZRk67ErKc+uNFKpgPEtdT+7kut3RkdiuZa52c3rX6OeUYpFpVlwWnH565AnpNh/clBPlqJPL7T90Dq0ku9QZtg==",
       "requires": {
         "@amplitude/analytics-client-common": "^2.0.5",
         "@amplitude/analytics-core": "^2.0.4",
diff --git a/apps/block_scout_web/assets/package.json b/apps/block_scout_web/assets/package.json
index 0b0f97c3d2a4..17d5a80a43e7 100644
--- a/apps/block_scout_web/assets/package.json
+++ b/apps/block_scout_web/assets/package.json
@@ -20,7 +20,7 @@
   },
   "dependencies": {
     "@fortawesome/fontawesome-free": "^6.4.2",
-    "@amplitude/analytics-browser": "^2.2.1",
+    "@amplitude/analytics-browser": "^2.2.2",
     "@tarekraafat/autocomplete.js": "^10.2.7",
     "@walletconnect/web3-provider": "^1.8.0",
     "assert": "^2.0.0",

From 938745f0b1277a359e9b0649ccda24fb8f97a4ce Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 29 Aug 2023 20:25:07 +0000
Subject: [PATCH 357/909] Bump jquery from 3.7.0 to 3.7.1 in
 /apps/block_scout_web/assets

Bumps [jquery](https://github.com/jquery/jquery) from 3.7.0 to 3.7.1.
- [Release notes](https://github.com/jquery/jquery/releases)
- [Commits](https://github.com/jquery/jquery/compare/3.7.0...3.7.1)

---
updated-dependencies:
- dependency-name: jquery
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 apps/block_scout_web/assets/package-lock.json | 14 +++++++-------
 apps/block_scout_web/assets/package.json      |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/apps/block_scout_web/assets/package-lock.json b/apps/block_scout_web/assets/package-lock.json
index 255c9040d111..b71d9a7c0091 100644
--- a/apps/block_scout_web/assets/package-lock.json
+++ b/apps/block_scout_web/assets/package-lock.json
@@ -24,7 +24,7 @@
         "highlight.js": "^11.8.0",
         "https-browserify": "^1.0.0",
         "humps": "^2.0.1",
-        "jquery": "^3.7.0",
+        "jquery": "^3.7.1",
         "js-cookie": "^3.0.5",
         "lodash.debounce": "^4.0.8",
         "lodash.differenceby": "^4.8.0",
@@ -11714,9 +11714,9 @@
       }
     },
     "node_modules/jquery": {
-      "version": "3.7.0",
-      "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.7.0.tgz",
-      "integrity": "sha512-umpJ0/k8X0MvD1ds0P9SfowREz2LenHsQaxSohMZ5OMNEU2r0tf8pdeEFTHMFxWVxKNyU9rTtK3CWzUCTKJUeQ=="
+      "version": "3.7.1",
+      "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.7.1.tgz",
+      "integrity": "sha512-m4avr8yL8kmFN8psrbFFFmB/If14iN5o9nw/NgnnM+kybDJpRsAynV2BsfpTYrTRysYUdADVD7CkUUizgkpLfg=="
     },
     "node_modules/jquery-mousewheel": {
       "version": "3.1.13",
@@ -26364,9 +26364,9 @@
       "dev": true
     },
     "jquery": {
-      "version": "3.7.0",
-      "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.7.0.tgz",
-      "integrity": "sha512-umpJ0/k8X0MvD1ds0P9SfowREz2LenHsQaxSohMZ5OMNEU2r0tf8pdeEFTHMFxWVxKNyU9rTtK3CWzUCTKJUeQ=="
+      "version": "3.7.1",
+      "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.7.1.tgz",
+      "integrity": "sha512-m4avr8yL8kmFN8psrbFFFmB/If14iN5o9nw/NgnnM+kybDJpRsAynV2BsfpTYrTRysYUdADVD7CkUUizgkpLfg=="
     },
     "jquery-mousewheel": {
       "version": "3.1.13",
diff --git a/apps/block_scout_web/assets/package.json b/apps/block_scout_web/assets/package.json
index 17d5a80a43e7..0ff1000db010 100644
--- a/apps/block_scout_web/assets/package.json
+++ b/apps/block_scout_web/assets/package.json
@@ -36,7 +36,7 @@
     "highlight.js": "^11.8.0",
     "https-browserify": "^1.0.0",
     "humps": "^2.0.1",
-    "jquery": "^3.7.0",
+    "jquery": "^3.7.1",
     "js-cookie": "^3.0.5",
     "lodash.debounce": "^4.0.8",
     "lodash.differenceby": "^4.8.0",

From 4f6f28b39a8ffc6f9f7ab3f201e428d9110a373d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 29 Aug 2023 20:25:18 +0000
Subject: [PATCH 358/909] Bump bignumber.js from 9.1.1 to 9.1.2 in
 /apps/block_scout_web/assets

Bumps [bignumber.js](https://github.com/MikeMcl/bignumber.js) from 9.1.1 to 9.1.2.
- [Release notes](https://github.com/MikeMcl/bignumber.js/releases)
- [Changelog](https://github.com/MikeMcl/bignumber.js/blob/master/CHANGELOG.md)
- [Commits](https://github.com/MikeMcl/bignumber.js/compare/v9.1.1...v9.1.2)

---
updated-dependencies:
- dependency-name: bignumber.js
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 apps/block_scout_web/assets/package-lock.json | 14 +++++++-------
 apps/block_scout_web/assets/package.json      |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/apps/block_scout_web/assets/package-lock.json b/apps/block_scout_web/assets/package-lock.json
index 255c9040d111..9e852a280491 100644
--- a/apps/block_scout_web/assets/package-lock.json
+++ b/apps/block_scout_web/assets/package-lock.json
@@ -12,7 +12,7 @@
         "@tarekraafat/autocomplete.js": "^10.2.7",
         "@walletconnect/web3-provider": "^1.8.0",
         "assert": "^2.0.0",
-        "bignumber.js": "^9.1.1",
+        "bignumber.js": "^9.1.2",
         "bootstrap": "^4.6.0",
         "chart.js": "^4.4.0",
         "chartjs-adapter-luxon": "^1.3.1",
@@ -4891,9 +4891,9 @@
       }
     },
     "node_modules/bignumber.js": {
-      "version": "9.1.1",
-      "resolved": "https://registry.npmjs.org/bignumber.js/-/bignumber.js-9.1.1.tgz",
-      "integrity": "sha512-pHm4LsMJ6lzgNGVfZHjMoO8sdoRhOzOH4MLmY65Jg70bpxCKu5iOHNJyfF6OyvYw7t8Fpf35RuzUyqnQsj8Vig==",
+      "version": "9.1.2",
+      "resolved": "https://registry.npmjs.org/bignumber.js/-/bignumber.js-9.1.2.tgz",
+      "integrity": "sha512-2/mKyZH9K85bzOEfhXDBFZTGd1CTs+5IHpeFQo9luiBG7hghdC851Pj2WAhb6E3R6b9tZj/XKhbg4fum+Kepug==",
       "engines": {
         "node": "*"
       }
@@ -21171,9 +21171,9 @@
       "dev": true
     },
     "bignumber.js": {
-      "version": "9.1.1",
-      "resolved": "https://registry.npmjs.org/bignumber.js/-/bignumber.js-9.1.1.tgz",
-      "integrity": "sha512-pHm4LsMJ6lzgNGVfZHjMoO8sdoRhOzOH4MLmY65Jg70bpxCKu5iOHNJyfF6OyvYw7t8Fpf35RuzUyqnQsj8Vig=="
+      "version": "9.1.2",
+      "resolved": "https://registry.npmjs.org/bignumber.js/-/bignumber.js-9.1.2.tgz",
+      "integrity": "sha512-2/mKyZH9K85bzOEfhXDBFZTGd1CTs+5IHpeFQo9luiBG7hghdC851Pj2WAhb6E3R6b9tZj/XKhbg4fum+Kepug=="
     },
     "binary-extensions": {
       "version": "2.2.0",
diff --git a/apps/block_scout_web/assets/package.json b/apps/block_scout_web/assets/package.json
index 17d5a80a43e7..1c38e4ece574 100644
--- a/apps/block_scout_web/assets/package.json
+++ b/apps/block_scout_web/assets/package.json
@@ -24,7 +24,7 @@
     "@tarekraafat/autocomplete.js": "^10.2.7",
     "@walletconnect/web3-provider": "^1.8.0",
     "assert": "^2.0.0",
-    "bignumber.js": "^9.1.1",
+    "bignumber.js": "^9.1.2",
     "bootstrap": "^4.6.0",
     "chart.js": "^4.4.0",
     "chartjs-adapter-luxon": "^1.3.1",

From b3f39a2a087e2da54a2c96229555637d9c5d30d1 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 29 Aug 2023 20:25:26 +0000
Subject: [PATCH 359/909] Bump postcss from 8.4.28 to 8.4.29 in
 /apps/block_scout_web/assets

Bumps [postcss](https://github.com/postcss/postcss) from 8.4.28 to 8.4.29.
- [Release notes](https://github.com/postcss/postcss/releases)
- [Changelog](https://github.com/postcss/postcss/blob/main/CHANGELOG.md)
- [Commits](https://github.com/postcss/postcss/compare/8.4.28...8.4.29)

---
updated-dependencies:
- dependency-name: postcss
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 apps/block_scout_web/assets/package-lock.json | 14 +++++++-------
 apps/block_scout_web/assets/package.json      |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/apps/block_scout_web/assets/package-lock.json b/apps/block_scout_web/assets/package-lock.json
index 255c9040d111..ec01a587d876 100644
--- a/apps/block_scout_web/assets/package-lock.json
+++ b/apps/block_scout_web/assets/package-lock.json
@@ -87,7 +87,7 @@
         "jest": "^29.6.4",
         "jest-environment-jsdom": "^29.6.4",
         "mini-css-extract-plugin": "^2.7.6",
-        "postcss": "^8.4.28",
+        "postcss": "^8.4.29",
         "postcss-loader": "^7.3.3",
         "sass": "^1.66.1",
         "sass-loader": "^13.3.2",
@@ -13528,9 +13528,9 @@
       }
     },
     "node_modules/postcss": {
-      "version": "8.4.28",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.28.tgz",
-      "integrity": "sha512-Z7V5j0cq8oEKyejIKfpD8b4eBy9cwW2JWPk0+fB1HOAMsfHbnAXLLS+PfVWlzMSLQaWttKDt607I0XHmpE67Vw==",
+      "version": "8.4.29",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.29.tgz",
+      "integrity": "sha512-cbI+jaqIeu/VGqXEarWkRCCffhjgXc0qjBtXpqJhTBohMUjUQnbBr0xqX3vEKudc4iviTewcJo5ajcec5+wdJw==",
       "dev": true,
       "funding": [
         {
@@ -27813,9 +27813,9 @@
       "integrity": "sha512-Wb4p1J4zyFTbM+u6WuO4XstYx4Ky9Cewe4DWrel7B0w6VVICvPwdOpotjzcf6eD8TsckVnIMNONQyPIUFOUbCQ=="
     },
     "postcss": {
-      "version": "8.4.28",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.28.tgz",
-      "integrity": "sha512-Z7V5j0cq8oEKyejIKfpD8b4eBy9cwW2JWPk0+fB1HOAMsfHbnAXLLS+PfVWlzMSLQaWttKDt607I0XHmpE67Vw==",
+      "version": "8.4.29",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.29.tgz",
+      "integrity": "sha512-cbI+jaqIeu/VGqXEarWkRCCffhjgXc0qjBtXpqJhTBohMUjUQnbBr0xqX3vEKudc4iviTewcJo5ajcec5+wdJw==",
       "dev": true,
       "requires": {
         "nanoid": "^3.3.6",
diff --git a/apps/block_scout_web/assets/package.json b/apps/block_scout_web/assets/package.json
index 17d5a80a43e7..d00caafc8d6c 100644
--- a/apps/block_scout_web/assets/package.json
+++ b/apps/block_scout_web/assets/package.json
@@ -99,7 +99,7 @@
     "jest": "^29.6.4",
     "jest-environment-jsdom": "^29.6.4",
     "mini-css-extract-plugin": "^2.7.6",
-    "postcss": "^8.4.28",
+    "postcss": "^8.4.29",
     "postcss-loader": "^7.3.3",
     "sass": "^1.66.1",
     "sass-loader": "^13.3.2",

From 7f99ed441f0504615dc0bd70e4b6d8c21890e13f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 29 Aug 2023 20:25:48 +0000
Subject: [PATCH 360/909] Bump viewerjs from 1.11.4 to 1.11.5 in
 /apps/block_scout_web/assets

Bumps [viewerjs](https://github.com/fengyuanchen/viewerjs) from 1.11.4 to 1.11.5.
- [Release notes](https://github.com/fengyuanchen/viewerjs/releases)
- [Changelog](https://github.com/fengyuanchen/viewerjs/blob/main/CHANGELOG.md)
- [Commits](https://github.com/fengyuanchen/viewerjs/compare/v1.11.4...v1.11.5)

---
updated-dependencies:
- dependency-name: viewerjs
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 apps/block_scout_web/assets/package-lock.json | 14 +++++++-------
 apps/block_scout_web/assets/package.json      |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/apps/block_scout_web/assets/package-lock.json b/apps/block_scout_web/assets/package-lock.json
index 255c9040d111..eafb171a3659 100644
--- a/apps/block_scout_web/assets/package-lock.json
+++ b/apps/block_scout_web/assets/package-lock.json
@@ -65,7 +65,7 @@
         "urijs": "^1.19.11",
         "url": "^0.11.1",
         "util": "^0.12.5",
-        "viewerjs": "^1.11.4",
+        "viewerjs": "^1.11.5",
         "web3": "^1.10.0",
         "web3modal": "^1.9.12",
         "xss": "^1.0.14"
@@ -16540,9 +16540,9 @@
       }
     },
     "node_modules/viewerjs": {
-      "version": "1.11.4",
-      "resolved": "https://registry.npmjs.org/viewerjs/-/viewerjs-1.11.4.tgz",
-      "integrity": "sha512-/mnqMIwt5Bi9j59+48OqQtqgOx8oh186Xshdr/dqqBrakMSMlLt/jmeNHBod0PvOkesZf66ivQbWmtWYBlKetg=="
+      "version": "1.11.5",
+      "resolved": "https://registry.npmjs.org/viewerjs/-/viewerjs-1.11.5.tgz",
+      "integrity": "sha512-nsvQkC5jnqZ/2ggFYWUH5gpUGPtFAYidsFh8Q7B7sioAdqJzSJrELvbu9ozUm0W+A2uHN5XuuiheHHB+dWiPEA=="
     },
     "node_modules/w3c-hr-time": {
       "version": "1.0.2",
@@ -29978,9 +29978,9 @@
       }
     },
     "viewerjs": {
-      "version": "1.11.4",
-      "resolved": "https://registry.npmjs.org/viewerjs/-/viewerjs-1.11.4.tgz",
-      "integrity": "sha512-/mnqMIwt5Bi9j59+48OqQtqgOx8oh186Xshdr/dqqBrakMSMlLt/jmeNHBod0PvOkesZf66ivQbWmtWYBlKetg=="
+      "version": "1.11.5",
+      "resolved": "https://registry.npmjs.org/viewerjs/-/viewerjs-1.11.5.tgz",
+      "integrity": "sha512-nsvQkC5jnqZ/2ggFYWUH5gpUGPtFAYidsFh8Q7B7sioAdqJzSJrELvbu9ozUm0W+A2uHN5XuuiheHHB+dWiPEA=="
     },
     "w3c-hr-time": {
       "version": "1.0.2",
diff --git a/apps/block_scout_web/assets/package.json b/apps/block_scout_web/assets/package.json
index 17d5a80a43e7..ce83052f87d5 100644
--- a/apps/block_scout_web/assets/package.json
+++ b/apps/block_scout_web/assets/package.json
@@ -77,7 +77,7 @@
     "urijs": "^1.19.11",
     "url": "^0.11.1",
     "util": "^0.12.5",
-    "viewerjs": "^1.11.4",
+    "viewerjs": "^1.11.5",
     "web3": "^1.10.0",
     "web3modal": "^1.9.12",
     "xss": "^1.0.14"

From 04d4b10ca79a5ad7ea48d13694e491c8d890d5e6 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 29 Aug 2023 20:43:51 +0000
Subject: [PATCH 361/909] Bump luxon from 3.4.1 to 3.4.2 in
 /apps/block_scout_web/assets

Bumps [luxon](https://github.com/moment/luxon) from 3.4.1 to 3.4.2.
- [Changelog](https://github.com/moment/luxon/blob/master/CHANGELOG.md)
- [Commits](https://github.com/moment/luxon/compare/3.4.1...3.4.2)

---
updated-dependencies:
- dependency-name: luxon
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 apps/block_scout_web/assets/package-lock.json | 14 +++++++-------
 apps/block_scout_web/assets/package.json      |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/apps/block_scout_web/assets/package-lock.json b/apps/block_scout_web/assets/package-lock.json
index 69e4604e3b51..15d67f08b99a 100644
--- a/apps/block_scout_web/assets/package-lock.json
+++ b/apps/block_scout_web/assets/package-lock.json
@@ -44,7 +44,7 @@
         "lodash.omit": "^4.5.0",
         "lodash.rangeright": "^4.2.0",
         "lodash.reduce": "^4.6.0",
-        "luxon": "^3.4.1",
+        "luxon": "^3.4.2",
         "malihu-custom-scrollbar-plugin": "3.1.5",
         "mixpanel-browser": "^2.47.0",
         "moment": "^2.29.4",
@@ -12336,9 +12336,9 @@
       "integrity": "sha1-81ypHEk/e3PaDgdJUwTxezH4fuU="
     },
     "node_modules/luxon": {
-      "version": "3.4.1",
-      "resolved": "https://registry.npmjs.org/luxon/-/luxon-3.4.1.tgz",
-      "integrity": "sha512-2USspxOCXWGIKHwuQ9XElxPPYrDOJHDQ5DQ870CoD+CxJbBnRDIBCfhioUJJjct7BKOy80Ia8cVstIcIMb/0+Q==",
+      "version": "3.4.2",
+      "resolved": "https://registry.npmjs.org/luxon/-/luxon-3.4.2.tgz",
+      "integrity": "sha512-uBoAVCVcajsrqy3pv7eo5jEUz1oeLmCcnMv8n4AJpT5hbpN9lUssAXibNElpbLce3Mhm9dyBzwYLs9zctM/0tA==",
       "engines": {
         "node": ">=12"
       }
@@ -26903,9 +26903,9 @@
       "integrity": "sha1-81ypHEk/e3PaDgdJUwTxezH4fuU="
     },
     "luxon": {
-      "version": "3.4.1",
-      "resolved": "https://registry.npmjs.org/luxon/-/luxon-3.4.1.tgz",
-      "integrity": "sha512-2USspxOCXWGIKHwuQ9XElxPPYrDOJHDQ5DQ870CoD+CxJbBnRDIBCfhioUJJjct7BKOy80Ia8cVstIcIMb/0+Q=="
+      "version": "3.4.2",
+      "resolved": "https://registry.npmjs.org/luxon/-/luxon-3.4.2.tgz",
+      "integrity": "sha512-uBoAVCVcajsrqy3pv7eo5jEUz1oeLmCcnMv8n4AJpT5hbpN9lUssAXibNElpbLce3Mhm9dyBzwYLs9zctM/0tA=="
     },
     "make-dir": {
       "version": "4.0.0",
diff --git a/apps/block_scout_web/assets/package.json b/apps/block_scout_web/assets/package.json
index 32f7d7be7d36..3f891de03cfe 100644
--- a/apps/block_scout_web/assets/package.json
+++ b/apps/block_scout_web/assets/package.json
@@ -56,7 +56,7 @@
     "lodash.omit": "^4.5.0",
     "lodash.rangeright": "^4.2.0",
     "lodash.reduce": "^4.6.0",
-    "luxon": "^3.4.1",
+    "luxon": "^3.4.2",
     "malihu-custom-scrollbar-plugin": "3.1.5",
     "mixpanel-browser": "^2.47.0",
     "moment": "^2.29.4",

From cf07eb5b812be8bb7b97f36267dff1c6ba2cc87c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 29 Aug 2023 20:53:22 +0000
Subject: [PATCH 362/909] Bump exvcr from 0.14.3 to 0.14.4

Bumps [exvcr](https://github.com/parroty/exvcr) from 0.14.3 to 0.14.4.
- [Release notes](https://github.com/parroty/exvcr/releases)
- [Changelog](https://github.com/parroty/exvcr/blob/master/CHANGELOG.md)
- [Commits](https://github.com/parroty/exvcr/compare/v0.14.3...v0.14.4)

---
updated-dependencies:
- dependency-name: exvcr
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 mix.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mix.lock b/mix.lock
index da4856d07c87..386b188b4dd3 100644
--- a/mix.lock
+++ b/mix.lock
@@ -57,7 +57,7 @@
   "exactor": {:hex, :exactor, "2.2.4", "5efb4ddeb2c48d9a1d7c9b465a6fffdd82300eb9618ece5d34c3334d5d7245b1", [:mix], [], "hexpm", "1222419f706e01bfa1095aec9acf6421367dcfab798a6f67c54cf784733cd6b5"},
   "exjsx": {:hex, :exjsx, "4.0.0", "60548841e0212df401e38e63c0078ec57b33e7ea49b032c796ccad8cde794b5c", [:mix], [{:jsx, "~> 2.8.0", [hex: :jsx, repo: "hexpm", optional: false]}], "hexpm", "32e95820a97cffea67830e91514a2ad53b888850442d6d395f53a1ac60c82e07"},
   "expo": {:hex, :expo, "0.4.1", "1c61d18a5df197dfda38861673d392e642649a9cef7694d2f97a587b2cfb319b", [:mix], [], "hexpm", "2ff7ba7a798c8c543c12550fa0e2cbc81b95d4974c65855d8d15ba7b37a1ce47"},
-  "exvcr": {:hex, :exvcr, "0.14.3", "e7d93b3b25919fbb653b06bc015cab99f658400eae96ed8e59758f1bb12ae167", [:mix], [{:exactor, "~> 2.2", [hex: :exactor, repo: "hexpm", optional: false]}, {:exjsx, "~> 4.0", [hex: :exjsx, repo: "hexpm", optional: false]}, {:finch, "~> 0.16", [hex: :finch, repo: "hexpm", optional: true]}, {:httpoison, "~> 1.0 or ~> 2.0", [hex: :httpoison, repo: "hexpm", optional: true]}, {:httpotion, "~> 3.1", [hex: :httpotion, repo: "hexpm", optional: true]}, {:ibrowse, "4.4.0", [hex: :ibrowse, repo: "hexpm", optional: true]}, {:meck, "~> 0.8", [hex: :meck, repo: "hexpm", optional: false]}], "hexpm", "38fa7d918aeda0ecc8e70346225c1299d21d4c432061c832f23a421ac2ed791d"},
+  "exvcr": {:hex, :exvcr, "0.14.4", "1aa5fe7d3f10b117251c158f8d28b39f7fc73d0a7628b2d0b75bf8cfb1111576", [:mix], [{:exactor, "~> 2.2", [hex: :exactor, repo: "hexpm", optional: false]}, {:exjsx, "~> 4.0", [hex: :exjsx, repo: "hexpm", optional: false]}, {:finch, "~> 0.16", [hex: :finch, repo: "hexpm", optional: true]}, {:httpoison, "~> 1.0 or ~> 2.0", [hex: :httpoison, repo: "hexpm", optional: true]}, {:httpotion, "~> 3.1", [hex: :httpotion, repo: "hexpm", optional: true]}, {:ibrowse, "4.4.0", [hex: :ibrowse, repo: "hexpm", optional: true]}, {:meck, "~> 0.8", [hex: :meck, repo: "hexpm", optional: false]}], "hexpm", "4e600568c02ed29d46bc2e2c74927d172ba06658aa8b14705c0207363c44cc94"},
   "file_info": {:hex, :file_info, "0.0.4", "2e0e77f211e833f38ead22cb29ce53761d457d80b3ffe0ffe0eb93880b0963b2", [:mix], [{:mimetype_parser, "~> 0.1.2", [hex: :mimetype_parser, repo: "hexpm", optional: false]}], "hexpm", "50e7ad01c2c8b9339010675fe4dc4a113b8d6ca7eddce24d1d74fd0e762781a5"},
   "file_system": {:hex, :file_system, "0.2.10", "fb082005a9cd1711c05b5248710f8826b02d7d1784e7c3451f9c1231d4fc162d", [:mix], [], "hexpm", "41195edbfb562a593726eda3b3e8b103a309b733ad25f3d642ba49696bf715dc"},
   "floki": {:hex, :floki, "0.34.3", "5e2dcaec5d7c228ce5b1d3501502e308b2d79eb655e4191751a1fe491c37feac", [:mix], [], "hexpm", "9577440eea5b97924b4bf3c7ea55f7b8b6dce589f9b28b096cc294a8dc342341"},

From d1a018710c922a6ed01f8d102951284d5d041860 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 29 Aug 2023 20:58:28 +0000
Subject: [PATCH 363/909] Bump eslint from 8.47.0 to 8.48.0 in
 /apps/block_scout_web/assets

Bumps [eslint](https://github.com/eslint/eslint) from 8.47.0 to 8.48.0.
- [Release notes](https://github.com/eslint/eslint/releases)
- [Changelog](https://github.com/eslint/eslint/blob/main/CHANGELOG.md)
- [Commits](https://github.com/eslint/eslint/compare/v8.47.0...v8.48.0)

---
updated-dependencies:
- dependency-name: eslint
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 apps/block_scout_web/assets/package-lock.json | 30 +++++++++----------
 apps/block_scout_web/assets/package.json      |  2 +-
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/apps/block_scout_web/assets/package-lock.json b/apps/block_scout_web/assets/package-lock.json
index 69e4604e3b51..add58b0659db 100644
--- a/apps/block_scout_web/assets/package-lock.json
+++ b/apps/block_scout_web/assets/package-lock.json
@@ -78,7 +78,7 @@
         "copy-webpack-plugin": "^11.0.0",
         "css-loader": "^5.2.7",
         "css-minimizer-webpack-plugin": "^5.0.1",
-        "eslint": "^8.47.0",
+        "eslint": "^8.48.0",
         "eslint-config-standard": "^17.1.0",
         "eslint-plugin-import": "^2.28.1",
         "eslint-plugin-node": "^11.1.0",
@@ -2101,9 +2101,9 @@
       }
     },
     "node_modules/@eslint/js": {
-      "version": "8.47.0",
-      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.47.0.tgz",
-      "integrity": "sha512-P6omY1zv5MItm93kLM8s2vr1HICJH8v0dvddDhysbIuZ+vcjOHg5Zbkf1mTkcmi2JA9oBG2anOkRnW8WJTS8Og==",
+      "version": "8.48.0",
+      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.48.0.tgz",
+      "integrity": "sha512-ZSjtmelB7IJfWD2Fvb7+Z+ChTIKWq6kjda95fLcQKNS5aheVHn4IkfgRQE3sIIzTcSLwLcLZUD9UBt+V7+h+Pw==",
       "dev": true,
       "engines": {
         "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
@@ -7103,15 +7103,15 @@
       }
     },
     "node_modules/eslint": {
-      "version": "8.47.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.47.0.tgz",
-      "integrity": "sha512-spUQWrdPt+pRVP1TTJLmfRNJJHHZryFmptzcafwSvHsceV81djHOdnEeDmkdotZyLNjDhrOasNK8nikkoG1O8Q==",
+      "version": "8.48.0",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.48.0.tgz",
+      "integrity": "sha512-sb6DLeIuRXxeM1YljSe1KEx9/YYeZFQWcV8Rq9HfigmdDEugjLEVEa1ozDjL6YDjBpQHPJxJzze+alxi4T3OLg==",
       "dev": true,
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.2.0",
         "@eslint-community/regexpp": "^4.6.1",
         "@eslint/eslintrc": "^2.1.2",
-        "@eslint/js": "^8.47.0",
+        "@eslint/js": "8.48.0",
         "@humanwhocodes/config-array": "^0.11.10",
         "@humanwhocodes/module-importer": "^1.0.1",
         "@nodelib/fs.walk": "^1.2.8",
@@ -19030,9 +19030,9 @@
       }
     },
     "@eslint/js": {
-      "version": "8.47.0",
-      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.47.0.tgz",
-      "integrity": "sha512-P6omY1zv5MItm93kLM8s2vr1HICJH8v0dvddDhysbIuZ+vcjOHg5Zbkf1mTkcmi2JA9oBG2anOkRnW8WJTS8Og==",
+      "version": "8.48.0",
+      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.48.0.tgz",
+      "integrity": "sha512-ZSjtmelB7IJfWD2Fvb7+Z+ChTIKWq6kjda95fLcQKNS5aheVHn4IkfgRQE3sIIzTcSLwLcLZUD9UBt+V7+h+Pw==",
       "dev": true
     },
     "@ethereumjs/common": {
@@ -22857,15 +22857,15 @@
       }
     },
     "eslint": {
-      "version": "8.47.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.47.0.tgz",
-      "integrity": "sha512-spUQWrdPt+pRVP1TTJLmfRNJJHHZryFmptzcafwSvHsceV81djHOdnEeDmkdotZyLNjDhrOasNK8nikkoG1O8Q==",
+      "version": "8.48.0",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.48.0.tgz",
+      "integrity": "sha512-sb6DLeIuRXxeM1YljSe1KEx9/YYeZFQWcV8Rq9HfigmdDEugjLEVEa1ozDjL6YDjBpQHPJxJzze+alxi4T3OLg==",
       "dev": true,
       "requires": {
         "@eslint-community/eslint-utils": "^4.2.0",
         "@eslint-community/regexpp": "^4.6.1",
         "@eslint/eslintrc": "^2.1.2",
-        "@eslint/js": "^8.47.0",
+        "@eslint/js": "8.48.0",
         "@humanwhocodes/config-array": "^0.11.10",
         "@humanwhocodes/module-importer": "^1.0.1",
         "@nodelib/fs.walk": "^1.2.8",
diff --git a/apps/block_scout_web/assets/package.json b/apps/block_scout_web/assets/package.json
index 32f7d7be7d36..90434c735015 100644
--- a/apps/block_scout_web/assets/package.json
+++ b/apps/block_scout_web/assets/package.json
@@ -90,7 +90,7 @@
     "copy-webpack-plugin": "^11.0.0",
     "css-loader": "^5.2.7",
     "css-minimizer-webpack-plugin": "^5.0.1",
-    "eslint": "^8.47.0",
+    "eslint": "^8.48.0",
     "eslint-config-standard": "^17.1.0",
     "eslint-plugin-import": "^2.28.1",
     "eslint-plugin-node": "^11.1.0",

From 21ca3093be4adbed81b55cb153d1e7e24e1e0688 Mon Sep 17 00:00:00 2001
From: POA <33550681+poa@users.noreply.github.com>
Date: Wed, 30 Aug 2023 08:28:16 +0300
Subject: [PATCH 364/909] Add Base Mainnet support for tx actions

---
 apps/indexer/lib/indexer/transform/transaction_actions.ex | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/apps/indexer/lib/indexer/transform/transaction_actions.ex b/apps/indexer/lib/indexer/transform/transaction_actions.ex
index 549be9fa80cb..e4305c33c384 100644
--- a/apps/indexer/lib/indexer/transform/transaction_actions.ex
+++ b/apps/indexer/lib/indexer/transform/transaction_actions.ex
@@ -18,6 +18,7 @@ defmodule Indexer.Transform.TransactionActions do
   @goerli 5
   @optimism 10
   @polygon 137
+  @base_mainnet 8453
   @base_goerli 84531
   # @gnosis 100
 
@@ -161,7 +162,7 @@ defmodule Indexer.Transform.TransactionActions do
   end
 
   defp parse_uniswap_v3(logs, actions, protocols_to_rewrite, chain_id) do
-    if Enum.member?([@mainnet, @goerli, @optimism, @polygon, @base_goerli], chain_id) and
+    if Enum.member?([@mainnet, @goerli, @optimism, @polygon, @base_mainnet, @base_goerli], chain_id) and
          (is_nil(protocols_to_rewrite) or Enum.empty?(protocols_to_rewrite) or
             Enum.member?(protocols_to_rewrite, "uniswap_v3")) do
       uniswap_v3_positions_nft =

From 31f992363c2e7bccbe905d1a029fd09415f50b63 Mon Sep 17 00:00:00 2001
From: POA <33550681+poa@users.noreply.github.com>
Date: Wed, 30 Aug 2023 08:32:37 +0300
Subject: [PATCH 365/909] Update changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 730642281d8f..5ccd93ca59e0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,6 +13,7 @@
 
 ### Fixes
 
+- [#8350](https://github.com/blockscout/blockscout/pull/8350) - Add Base Mainnet support for tx actions
 - [#8282](https://github.com/blockscout/blockscout/pull/8282) - NFT fetcher improvements
 - [#8287](https://github.com/blockscout/blockscout/pull/8287) - Add separate hackney pool for TokenInstance fetchers
 - [#8293](https://github.com/blockscout/blockscout/pull/8293) - Add ETHEREUM_JSONRPC_TRACE_URL for Geth in docker-compose.yml

From 9908cbb7dc81416acd7d0220076bc60f58f50b03 Mon Sep 17 00:00:00 2001
From: Nikita Pozdniakov <nikitosing4@mail.ru>
Date: Wed, 30 Aug 2023 15:39:46 +0300
Subject: [PATCH 366/909] Hotfix for proper addresses' tokens displaying

---
 CHANGELOG.md                                   |  1 +
 .../api/v2/address_controller_test.exs         | 16 ++++++++++++----
 .../chain/address/current_token_balance.ex     |  2 +-
 apps/explorer/test/support/factory.ex          | 18 +++++++++++++++++-
 4 files changed, 31 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5ccd93ca59e0..d9d72cf68070 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,6 +13,7 @@
 
 ### Fixes
 
+- [#8354](https://github.com/blockscout/blockscout/pull/8354) - Hotfix for proper addresses' tokens displaying
 - [#8350](https://github.com/blockscout/blockscout/pull/8350) - Add Base Mainnet support for tx actions
 - [#8282](https://github.com/blockscout/blockscout/pull/8282) - NFT fetcher improvements
 - [#8287](https://github.com/blockscout/blockscout/pull/8287) - Add separate hackney pool for TokenInstance fetchers
diff --git a/apps/block_scout_web/test/block_scout_web/controllers/api/v2/address_controller_test.exs b/apps/block_scout_web/test/block_scout_web/controllers/api/v2/address_controller_test.exs
index adfba5247640..ee6f156fa525 100644
--- a/apps/block_scout_web/test/block_scout_web/controllers/api/v2/address_controller_test.exs
+++ b/apps/block_scout_web/test/block_scout_web/controllers/api/v2/address_controller_test.exs
@@ -1535,21 +1535,29 @@ defmodule BlockScoutWeb.API.V2.AddressControllerTest do
 
       ctbs_erc_20 =
         for _ <- 0..50 do
-          insert(:address_current_token_balance_with_token_id, address: address, token_type: "ERC-20", token_id: nil)
+          insert(:address_current_token_balance_with_token_id_and_fixed_token_type,
+            address: address,
+            token_type: "ERC-20",
+            token_id: nil
+          )
           |> Repo.preload([:token])
         end
-        |> Enum.sort_by(fn x -> x.value end, :asc)
+        |> Enum.sort_by(fn x -> Decimal.to_float(Decimal.mult(x.value, x.token.fiat_value)) end, :asc)
 
       ctbs_erc_721 =
         for _ <- 0..50 do
-          insert(:address_current_token_balance_with_token_id, address: address, token_type: "ERC-721", token_id: nil)
+          insert(:address_current_token_balance_with_token_id_and_fixed_token_type,
+            address: address,
+            token_type: "ERC-721",
+            token_id: nil
+          )
           |> Repo.preload([:token])
         end
         |> Enum.sort_by(fn x -> x.value end, :asc)
 
       ctbs_erc_1155 =
         for _ <- 0..50 do
-          insert(:address_current_token_balance_with_token_id,
+          insert(:address_current_token_balance_with_token_id_and_fixed_token_type,
             address: address,
             token_type: "ERC-1155",
             token_id: Enum.random(1..100_000)
diff --git a/apps/explorer/lib/explorer/chain/address/current_token_balance.ex b/apps/explorer/lib/explorer/chain/address/current_token_balance.ex
index 88c4594a3a7b..b14bf07dc814 100644
--- a/apps/explorer/lib/explorer/chain/address/current_token_balance.ex
+++ b/apps/explorer/lib/explorer/chain/address/current_token_balance.ex
@@ -188,10 +188,10 @@ defmodule Explorer.Chain.Address.CurrentTokenBalance do
       ctb in __MODULE__,
       where: ctb.address_hash == ^address_hash,
       where: ctb.value > 0,
-      where: ctb.token_type == ^type,
       left_join: t in assoc(ctb, :token),
       on: ctb.token_contract_address_hash == t.contract_address_hash,
       preload: [token: t],
+      where: t.type == ^type,
       select: ctb,
       select_merge: ^%{fiat_value: fiat_balance},
       order_by: ^[desc_nulls_last: fiat_balance],
diff --git a/apps/explorer/test/support/factory.ex b/apps/explorer/test/support/factory.ex
index 28093d950e19..da2e13f6669d 100644
--- a/apps/explorer/test/support/factory.ex
+++ b/apps/explorer/test/support/factory.ex
@@ -898,7 +898,23 @@ defmodule Explorer.Factory do
 
     %CurrentTokenBalance{
       address: build(:address),
-      token_contract_address_hash: insert(:token).contract_address_hash,
+      token_contract_address_hash: insert(:token, type: token_type).contract_address_hash,
+      block_number: block_number(),
+      value: Enum.random(1_000_000_000_000_000_000..10_000_000_000_000_000_000),
+      value_fetched_at: DateTime.utc_now(),
+      token_id: token_id,
+      token_type: token_type
+    }
+  end
+
+  def address_current_token_balance_with_token_id_and_fixed_token_type_factory(%{
+        token_type: token_type,
+        address: address,
+        token_id: token_id
+      }) do
+    %CurrentTokenBalance{
+      address: address,
+      token_contract_address_hash: insert(:token, type: token_type).contract_address_hash,
       block_number: block_number(),
       value: Enum.random(1_000_000_000_000_000_000..10_000_000_000_000_000_000),
       value_fetched_at: DateTime.utc_now(),

From 131949baf8ce0c5123a163a75d8f32829fd2341c Mon Sep 17 00:00:00 2001
From: Qwerty5Uiop <alex000010@bk.ru>
Date: Wed, 30 Aug 2023 17:16:29 +0300
Subject: [PATCH 367/909] Fix current token balances redefining

---
 CHANGELOG.md                                             | 1 +
 apps/explorer/lib/explorer/chain/import/runner/blocks.ex | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5ccd93ca59e0..fec6e8a095bc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -19,6 +19,7 @@
 - [#8293](https://github.com/blockscout/blockscout/pull/8293) - Add ETHEREUM_JSONRPC_TRACE_URL for Geth in docker-compose.yml
 - [#8240](https://github.com/blockscout/blockscout/pull/8240) - Refactor and fix paging params in API v2
 - [#8242](https://github.com/blockscout/blockscout/pull/8242) - Fixing visualizer service CORS issue when running docker-compose
+- [#8355](https://github.com/blockscout/blockscout/pull/8355) - Fix current token balances redefining
 
 ### Chore
 
diff --git a/apps/explorer/lib/explorer/chain/import/runner/blocks.ex b/apps/explorer/lib/explorer/chain/import/runner/blocks.ex
index 3839dd58341c..adc1106be2c3 100644
--- a/apps/explorer/lib/explorer/chain/import/runner/blocks.ex
+++ b/apps/explorer/lib/explorer/chain/import/runner/blocks.ex
@@ -541,8 +541,10 @@ defmodule Explorer.Chain.Import.Runner.Blocks do
           address_hash: new_current_token_balance.address_hash,
           token_contract_address_hash: new_current_token_balance.token_contract_address_hash,
           token_id: new_current_token_balance.token_id,
+          token_type: tb.token_type,
           block_number: new_current_token_balance.block_number,
           value: tb.value,
+          value_fetched_at: tb.value_fetched_at,
           inserted_at: over(min(tb.inserted_at), :w),
           updated_at: over(max(tb.updated_at), :w)
         },

From dbc1846d4e8b331de1b500c2de5bc4676720178d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 30 Aug 2023 18:53:58 +0000
Subject: [PATCH 368/909] Bump @babel/preset-env in
 /apps/block_scout_web/assets

Bumps [@babel/preset-env](https://github.com/babel/babel/tree/HEAD/packages/babel-preset-env) from 7.22.10 to 7.22.14.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/commits/v7.22.14/packages/babel-preset-env)

---
updated-dependencies:
- dependency-name: "@babel/preset-env"
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 apps/block_scout_web/assets/package-lock.json | 315 +++++++++---------
 apps/block_scout_web/assets/package.json      |   2 +-
 2 files changed, 157 insertions(+), 160 deletions(-)

diff --git a/apps/block_scout_web/assets/package-lock.json b/apps/block_scout_web/assets/package-lock.json
index c95503f6ed12..da1f57d73d4f 100644
--- a/apps/block_scout_web/assets/package-lock.json
+++ b/apps/block_scout_web/assets/package-lock.json
@@ -72,7 +72,7 @@
       },
       "devDependencies": {
         "@babel/core": "^7.22.11",
-        "@babel/preset-env": "^7.22.10",
+        "@babel/preset-env": "^7.22.14",
         "autoprefixer": "^10.4.15",
         "babel-loader": "^9.1.3",
         "copy-webpack-plugin": "^11.0.0",
@@ -343,9 +343,9 @@
       "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g=="
     },
     "node_modules/@babel/helper-create-class-features-plugin": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.22.5.tgz",
-      "integrity": "sha512-xkb58MyOYIslxu3gKmVXmjTtUPvBU4odYzbiIQbWwLKIHCsx6UGZGX6F1IznMFVnDdirseUZopzN+ZRt8Xb33Q==",
+      "version": "7.22.11",
+      "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.22.11.tgz",
+      "integrity": "sha512-y1grdYL4WzmUDBRGK0pDbIoFd7UZKoDurDzWEoNMYoj1EL+foGRQNyPWDcC+YyegN5y1DUsFFmzjGijB3nSVAQ==",
       "dev": true,
       "dependencies": {
         "@babel/helper-annotate-as-pure": "^7.22.5",
@@ -353,10 +353,10 @@
         "@babel/helper-function-name": "^7.22.5",
         "@babel/helper-member-expression-to-functions": "^7.22.5",
         "@babel/helper-optimise-call-expression": "^7.22.5",
-        "@babel/helper-replace-supers": "^7.22.5",
+        "@babel/helper-replace-supers": "^7.22.9",
         "@babel/helper-skip-transparent-expression-wrappers": "^7.22.5",
-        "@babel/helper-split-export-declaration": "^7.22.5",
-        "semver": "^6.3.0"
+        "@babel/helper-split-export-declaration": "^7.22.6",
+        "semver": "^6.3.1"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -508,20 +508,20 @@
       }
     },
     "node_modules/@babel/helper-replace-supers": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.22.5.tgz",
-      "integrity": "sha512-aLdNM5I3kdI/V9xGNyKSF3X/gTyMUBohTZ+/3QdQKAA9vxIiy12E+8E2HoOP1/DjeqU+g6as35QHJNMDDYpuCg==",
+      "version": "7.22.9",
+      "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.22.9.tgz",
+      "integrity": "sha512-LJIKvvpgPOPUThdYqcX6IXRuIcTkcAub0IaDRGCZH0p5GPUp7PhRU9QVgFcDDd51BaPkk77ZjqFwh6DZTAEmGg==",
       "dev": true,
       "dependencies": {
         "@babel/helper-environment-visitor": "^7.22.5",
         "@babel/helper-member-expression-to-functions": "^7.22.5",
-        "@babel/helper-optimise-call-expression": "^7.22.5",
-        "@babel/template": "^7.22.5",
-        "@babel/traverse": "^7.22.5",
-        "@babel/types": "^7.22.5"
+        "@babel/helper-optimise-call-expression": "^7.22.5"
       },
       "engines": {
         "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0"
       }
     },
     "node_modules/@babel/helper-simple-access": {
@@ -970,9 +970,9 @@
       }
     },
     "node_modules/@babel/plugin-transform-async-generator-functions": {
-      "version": "7.22.10",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-generator-functions/-/plugin-transform-async-generator-functions-7.22.10.tgz",
-      "integrity": "sha512-eueE8lvKVzq5wIObKK/7dvoeKJ+xc6TvRn6aysIjS6pSCeLy7S/eVi7pEQknZqyqvzaNKdDtem8nUNTBgDVR2g==",
+      "version": "7.22.11",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-generator-functions/-/plugin-transform-async-generator-functions-7.22.11.tgz",
+      "integrity": "sha512-0pAlmeRJn6wU84zzZsEOx1JV1Jf8fqO9ok7wofIJwUnplYo247dcd24P+cMJht7ts9xkzdtB0EPHmOb7F+KzXw==",
       "dev": true,
       "dependencies": {
         "@babel/helper-environment-visitor": "^7.22.5",
@@ -1051,12 +1051,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-class-static-block": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-class-static-block/-/plugin-transform-class-static-block-7.22.5.tgz",
-      "integrity": "sha512-SPToJ5eYZLxlnp1UzdARpOGeC2GbHvr9d/UV0EukuVx8atktg194oe+C5BqQ8jRTkgLRVOPYeXRSBg1IlMoVRA==",
+      "version": "7.22.11",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-class-static-block/-/plugin-transform-class-static-block-7.22.11.tgz",
+      "integrity": "sha512-GMM8gGmqI7guS/llMFk1bJDkKfn3v3C4KHK9Yg1ey5qcHcOlKb0QvcMrgzvxo+T03/4szNh5lghY+fEC98Kq9g==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-create-class-features-plugin": "^7.22.5",
+        "@babel/helper-create-class-features-plugin": "^7.22.11",
         "@babel/helper-plugin-utils": "^7.22.5",
         "@babel/plugin-syntax-class-static-block": "^7.14.5"
       },
@@ -1153,9 +1153,9 @@
       }
     },
     "node_modules/@babel/plugin-transform-dynamic-import": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dynamic-import/-/plugin-transform-dynamic-import-7.22.5.tgz",
-      "integrity": "sha512-0MC3ppTB1AMxd8fXjSrbPa7LT9hrImt+/fcj+Pg5YMD7UQyWp/02+JWpdnCymmsXwIx5Z+sYn1bwCn4ZJNvhqQ==",
+      "version": "7.22.11",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dynamic-import/-/plugin-transform-dynamic-import-7.22.11.tgz",
+      "integrity": "sha512-g/21plo58sfteWjaO0ZNVb+uEOkJNjAaHhbejrnBmu011l/eNDScmkbjCC3l4FKb10ViaGU4aOkFznSu2zRHgA==",
       "dev": true,
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.22.5",
@@ -1185,9 +1185,9 @@
       }
     },
     "node_modules/@babel/plugin-transform-export-namespace-from": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-export-namespace-from/-/plugin-transform-export-namespace-from-7.22.5.tgz",
-      "integrity": "sha512-X4hhm7FRnPgd4nDA4b/5V280xCx6oL7Oob5+9qVS5C13Zq4bh1qq7LU0GgRU6b5dBWBvhGaXYVB4AcN6+ol6vg==",
+      "version": "7.22.11",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-export-namespace-from/-/plugin-transform-export-namespace-from-7.22.11.tgz",
+      "integrity": "sha512-xa7aad7q7OiT8oNZ1mU7NrISjlSkVdMbNxn9IuLZyL9AJEhs1Apba3I+u5riX1dIkdptP5EKDG5XDPByWxtehw==",
       "dev": true,
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.22.5",
@@ -1233,9 +1233,9 @@
       }
     },
     "node_modules/@babel/plugin-transform-json-strings": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-json-strings/-/plugin-transform-json-strings-7.22.5.tgz",
-      "integrity": "sha512-DuCRB7fu8MyTLbEQd1ew3R85nx/88yMoqo2uPSjevMj3yoN7CDM8jkgrY0wmVxfJZyJ/B9fE1iq7EQppWQmR5A==",
+      "version": "7.22.11",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-json-strings/-/plugin-transform-json-strings-7.22.11.tgz",
+      "integrity": "sha512-CxT5tCqpA9/jXFlme9xIBCc5RPtdDq3JpkkhgHQqtDdiTnTI0jtZ0QzXhr5DILeYifDPp2wvY2ad+7+hLMW5Pw==",
       "dev": true,
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.22.5",
@@ -1264,9 +1264,9 @@
       }
     },
     "node_modules/@babel/plugin-transform-logical-assignment-operators": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-logical-assignment-operators/-/plugin-transform-logical-assignment-operators-7.22.5.tgz",
-      "integrity": "sha512-MQQOUW1KL8X0cDWfbwYP+TbVbZm16QmQXJQ+vndPtH/BoO0lOKpVoEDMI7+PskYxH+IiE0tS8xZye0qr1lGzSA==",
+      "version": "7.22.11",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-logical-assignment-operators/-/plugin-transform-logical-assignment-operators-7.22.11.tgz",
+      "integrity": "sha512-qQwRTP4+6xFCDV5k7gZBF3C31K34ut0tbEcTKxlX/0KXxm9GLcO14p570aWxFvVzx6QAfPgq7gaeIHXJC8LswQ==",
       "dev": true,
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.22.5",
@@ -1311,12 +1311,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-modules-commonjs": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.22.5.tgz",
-      "integrity": "sha512-B4pzOXj+ONRmuaQTg05b3y/4DuFz3WcCNAXPLb2Q0GT0TrGKGxNKV4jwsXts+StaM0LQczZbOpj8o1DLPDJIiA==",
+      "version": "7.22.11",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.22.11.tgz",
+      "integrity": "sha512-o2+bg7GDS60cJMgz9jWqRUsWkMzLCxp+jFDeDUT5sjRlAxcJWZ2ylNdI7QQ2+CH5hWu7OnN+Cv3htt7AkSf96g==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-module-transforms": "^7.22.5",
+        "@babel/helper-module-transforms": "^7.22.9",
         "@babel/helper-plugin-utils": "^7.22.5",
         "@babel/helper-simple-access": "^7.22.5"
       },
@@ -1328,13 +1328,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-modules-systemjs": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.22.5.tgz",
-      "integrity": "sha512-emtEpoaTMsOs6Tzz+nbmcePl6AKVtS1yC4YNAeMun9U8YCsgadPNxnOPQ8GhHFB2qdx+LZu9LgoC0Lthuu05DQ==",
+      "version": "7.22.11",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.22.11.tgz",
+      "integrity": "sha512-rIqHmHoMEOhI3VkVf5jQ15l539KrwhzqcBO6wdCNWPWc/JWt9ILNYNUssbRpeq0qWns8svuw8LnMNCvWBIJ8wA==",
       "dev": true,
       "dependencies": {
         "@babel/helper-hoist-variables": "^7.22.5",
-        "@babel/helper-module-transforms": "^7.22.5",
+        "@babel/helper-module-transforms": "^7.22.9",
         "@babel/helper-plugin-utils": "^7.22.5",
         "@babel/helper-validator-identifier": "^7.22.5"
       },
@@ -1393,9 +1393,9 @@
       }
     },
     "node_modules/@babel/plugin-transform-nullish-coalescing-operator": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-nullish-coalescing-operator/-/plugin-transform-nullish-coalescing-operator-7.22.5.tgz",
-      "integrity": "sha512-6CF8g6z1dNYZ/VXok5uYkkBBICHZPiGEl7oDnAx2Mt1hlHVHOSIKWJaXHjQJA5VB43KZnXZDIexMchY4y2PGdA==",
+      "version": "7.22.11",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-nullish-coalescing-operator/-/plugin-transform-nullish-coalescing-operator-7.22.11.tgz",
+      "integrity": "sha512-YZWOw4HxXrotb5xsjMJUDlLgcDXSfO9eCmdl1bgW4+/lAGdkjaEvOnQ4p5WKKdUgSzO39dgPl0pTnfxm0OAXcg==",
       "dev": true,
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.22.5",
@@ -1409,9 +1409,9 @@
       }
     },
     "node_modules/@babel/plugin-transform-numeric-separator": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-numeric-separator/-/plugin-transform-numeric-separator-7.22.5.tgz",
-      "integrity": "sha512-NbslED1/6M+sXiwwtcAB/nieypGw02Ejf4KtDeMkCEpP6gWFMX1wI9WKYua+4oBneCCEmulOkRpwywypVZzs/g==",
+      "version": "7.22.11",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-numeric-separator/-/plugin-transform-numeric-separator-7.22.11.tgz",
+      "integrity": "sha512-3dzU4QGPsILdJbASKhF/V2TVP+gJya1PsueQCxIPCEcerqF21oEcrob4mzjsp2Py/1nLfF5m+xYNMDpmA8vffg==",
       "dev": true,
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.22.5",
@@ -1425,13 +1425,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-object-rest-spread": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-rest-spread/-/plugin-transform-object-rest-spread-7.22.5.tgz",
-      "integrity": "sha512-Kk3lyDmEslH9DnvCDA1s1kkd3YWQITiBOHngOtDL9Pt6BZjzqb6hiOlb8VfjiiQJ2unmegBqZu0rx5RxJb5vmQ==",
+      "version": "7.22.11",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-rest-spread/-/plugin-transform-object-rest-spread-7.22.11.tgz",
+      "integrity": "sha512-nX8cPFa6+UmbepISvlf5jhQyaC7ASs/7UxHmMkuJ/k5xSHvDPPaibMo+v3TXwU/Pjqhep/nFNpd3zn4YR59pnw==",
       "dev": true,
       "dependencies": {
-        "@babel/compat-data": "^7.22.5",
-        "@babel/helper-compilation-targets": "^7.22.5",
+        "@babel/compat-data": "^7.22.9",
+        "@babel/helper-compilation-targets": "^7.22.10",
         "@babel/helper-plugin-utils": "^7.22.5",
         "@babel/plugin-syntax-object-rest-spread": "^7.8.3",
         "@babel/plugin-transform-parameters": "^7.22.5"
@@ -1460,9 +1460,9 @@
       }
     },
     "node_modules/@babel/plugin-transform-optional-catch-binding": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-optional-catch-binding/-/plugin-transform-optional-catch-binding-7.22.5.tgz",
-      "integrity": "sha512-pH8orJahy+hzZje5b8e2QIlBWQvGpelS76C63Z+jhZKsmzfNaPQ+LaW6dcJ9bxTpo1mtXbgHwy765Ro3jftmUg==",
+      "version": "7.22.11",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-optional-catch-binding/-/plugin-transform-optional-catch-binding-7.22.11.tgz",
+      "integrity": "sha512-rli0WxesXUeCJnMYhzAglEjLWVDF6ahb45HuprcmQuLidBJFWjNnOzssk2kuc6e33FlLaiZhG/kUIzUMWdBKaQ==",
       "dev": true,
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.22.5",
@@ -1476,9 +1476,9 @@
       }
     },
     "node_modules/@babel/plugin-transform-optional-chaining": {
-      "version": "7.22.10",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-optional-chaining/-/plugin-transform-optional-chaining-7.22.10.tgz",
-      "integrity": "sha512-MMkQqZAZ+MGj+jGTG3OTuhKeBpNcO+0oCEbrGNEaOmiEn+1MzRyQlYsruGiU8RTK3zV6XwrVJTmwiDOyYK6J9g==",
+      "version": "7.22.12",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-optional-chaining/-/plugin-transform-optional-chaining-7.22.12.tgz",
+      "integrity": "sha512-7XXCVqZtyFWqjDsYDY4T45w4mlx1rf7aOgkc/Ww76xkgBiOlmjPkx36PBLHa1k1rwWvVgYMPsbuVnIamx2ZQJw==",
       "dev": true,
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.22.5",
@@ -1524,13 +1524,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-private-property-in-object": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-private-property-in-object/-/plugin-transform-private-property-in-object-7.22.5.tgz",
-      "integrity": "sha512-/9xnaTTJcVoBtSSmrVyhtSvO3kbqS2ODoh2juEU72c3aYonNF0OMGiaz2gjukyKM2wBBYJP38S4JiE0Wfb5VMQ==",
+      "version": "7.22.11",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-private-property-in-object/-/plugin-transform-private-property-in-object-7.22.11.tgz",
+      "integrity": "sha512-sSCbqZDBKHetvjSwpyWzhuHkmW5RummxJBVbYLkGkaiTOWGxml7SXt0iWa03bzxFIx7wOj3g/ILRd0RcJKBeSQ==",
       "dev": true,
       "dependencies": {
         "@babel/helper-annotate-as-pure": "^7.22.5",
-        "@babel/helper-create-class-features-plugin": "^7.22.5",
+        "@babel/helper-create-class-features-plugin": "^7.22.11",
         "@babel/helper-plugin-utils": "^7.22.5",
         "@babel/plugin-syntax-private-property-in-object": "^7.14.5"
       },
@@ -1758,9 +1758,9 @@
       }
     },
     "node_modules/@babel/preset-env": {
-      "version": "7.22.10",
-      "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.22.10.tgz",
-      "integrity": "sha512-riHpLb1drNkpLlocmSyEg4oYJIQFeXAK/d7rI6mbD0XsvoTOOweXDmQPG/ErxsEhWk3rl3Q/3F6RFQlVFS8m0A==",
+      "version": "7.22.14",
+      "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.22.14.tgz",
+      "integrity": "sha512-daodMIoVo+ol/g+//c/AH+szBkFj4STQUikvBijRGL72Ph+w+AMTSh55DUETe8KJlPlDT1k/mp7NBfOuiWmoig==",
       "dev": true,
       "dependencies": {
         "@babel/compat-data": "^7.22.9",
@@ -1789,41 +1789,41 @@
         "@babel/plugin-syntax-top-level-await": "^7.14.5",
         "@babel/plugin-syntax-unicode-sets-regex": "^7.18.6",
         "@babel/plugin-transform-arrow-functions": "^7.22.5",
-        "@babel/plugin-transform-async-generator-functions": "^7.22.10",
+        "@babel/plugin-transform-async-generator-functions": "^7.22.11",
         "@babel/plugin-transform-async-to-generator": "^7.22.5",
         "@babel/plugin-transform-block-scoped-functions": "^7.22.5",
         "@babel/plugin-transform-block-scoping": "^7.22.10",
         "@babel/plugin-transform-class-properties": "^7.22.5",
-        "@babel/plugin-transform-class-static-block": "^7.22.5",
+        "@babel/plugin-transform-class-static-block": "^7.22.11",
         "@babel/plugin-transform-classes": "^7.22.6",
         "@babel/plugin-transform-computed-properties": "^7.22.5",
         "@babel/plugin-transform-destructuring": "^7.22.10",
         "@babel/plugin-transform-dotall-regex": "^7.22.5",
         "@babel/plugin-transform-duplicate-keys": "^7.22.5",
-        "@babel/plugin-transform-dynamic-import": "^7.22.5",
+        "@babel/plugin-transform-dynamic-import": "^7.22.11",
         "@babel/plugin-transform-exponentiation-operator": "^7.22.5",
-        "@babel/plugin-transform-export-namespace-from": "^7.22.5",
+        "@babel/plugin-transform-export-namespace-from": "^7.22.11",
         "@babel/plugin-transform-for-of": "^7.22.5",
         "@babel/plugin-transform-function-name": "^7.22.5",
-        "@babel/plugin-transform-json-strings": "^7.22.5",
+        "@babel/plugin-transform-json-strings": "^7.22.11",
         "@babel/plugin-transform-literals": "^7.22.5",
-        "@babel/plugin-transform-logical-assignment-operators": "^7.22.5",
+        "@babel/plugin-transform-logical-assignment-operators": "^7.22.11",
         "@babel/plugin-transform-member-expression-literals": "^7.22.5",
         "@babel/plugin-transform-modules-amd": "^7.22.5",
-        "@babel/plugin-transform-modules-commonjs": "^7.22.5",
-        "@babel/plugin-transform-modules-systemjs": "^7.22.5",
+        "@babel/plugin-transform-modules-commonjs": "^7.22.11",
+        "@babel/plugin-transform-modules-systemjs": "^7.22.11",
         "@babel/plugin-transform-modules-umd": "^7.22.5",
         "@babel/plugin-transform-named-capturing-groups-regex": "^7.22.5",
         "@babel/plugin-transform-new-target": "^7.22.5",
-        "@babel/plugin-transform-nullish-coalescing-operator": "^7.22.5",
-        "@babel/plugin-transform-numeric-separator": "^7.22.5",
-        "@babel/plugin-transform-object-rest-spread": "^7.22.5",
+        "@babel/plugin-transform-nullish-coalescing-operator": "^7.22.11",
+        "@babel/plugin-transform-numeric-separator": "^7.22.11",
+        "@babel/plugin-transform-object-rest-spread": "^7.22.11",
         "@babel/plugin-transform-object-super": "^7.22.5",
-        "@babel/plugin-transform-optional-catch-binding": "^7.22.5",
-        "@babel/plugin-transform-optional-chaining": "^7.22.10",
+        "@babel/plugin-transform-optional-catch-binding": "^7.22.11",
+        "@babel/plugin-transform-optional-chaining": "^7.22.12",
         "@babel/plugin-transform-parameters": "^7.22.5",
         "@babel/plugin-transform-private-methods": "^7.22.5",
-        "@babel/plugin-transform-private-property-in-object": "^7.22.5",
+        "@babel/plugin-transform-private-property-in-object": "^7.22.11",
         "@babel/plugin-transform-property-literals": "^7.22.5",
         "@babel/plugin-transform-regenerator": "^7.22.10",
         "@babel/plugin-transform-reserved-words": "^7.22.5",
@@ -1837,7 +1837,7 @@
         "@babel/plugin-transform-unicode-regex": "^7.22.5",
         "@babel/plugin-transform-unicode-sets-regex": "^7.22.5",
         "@babel/preset-modules": "0.1.6-no-external-plugins",
-        "@babel/types": "^7.22.10",
+        "@babel/types": "^7.22.11",
         "babel-plugin-polyfill-corejs2": "^0.4.5",
         "babel-plugin-polyfill-corejs3": "^0.8.3",
         "babel-plugin-polyfill-regenerator": "^0.5.2",
@@ -17814,9 +17814,9 @@
       }
     },
     "@babel/helper-create-class-features-plugin": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.22.5.tgz",
-      "integrity": "sha512-xkb58MyOYIslxu3gKmVXmjTtUPvBU4odYzbiIQbWwLKIHCsx6UGZGX6F1IznMFVnDdirseUZopzN+ZRt8Xb33Q==",
+      "version": "7.22.11",
+      "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.22.11.tgz",
+      "integrity": "sha512-y1grdYL4WzmUDBRGK0pDbIoFd7UZKoDurDzWEoNMYoj1EL+foGRQNyPWDcC+YyegN5y1DUsFFmzjGijB3nSVAQ==",
       "dev": true,
       "requires": {
         "@babel/helper-annotate-as-pure": "^7.22.5",
@@ -17824,10 +17824,10 @@
         "@babel/helper-function-name": "^7.22.5",
         "@babel/helper-member-expression-to-functions": "^7.22.5",
         "@babel/helper-optimise-call-expression": "^7.22.5",
-        "@babel/helper-replace-supers": "^7.22.5",
+        "@babel/helper-replace-supers": "^7.22.9",
         "@babel/helper-skip-transparent-expression-wrappers": "^7.22.5",
-        "@babel/helper-split-export-declaration": "^7.22.5",
-        "semver": "^6.3.0"
+        "@babel/helper-split-export-declaration": "^7.22.6",
+        "semver": "^6.3.1"
       }
     },
     "@babel/helper-create-regexp-features-plugin": {
@@ -17931,17 +17931,14 @@
       }
     },
     "@babel/helper-replace-supers": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.22.5.tgz",
-      "integrity": "sha512-aLdNM5I3kdI/V9xGNyKSF3X/gTyMUBohTZ+/3QdQKAA9vxIiy12E+8E2HoOP1/DjeqU+g6as35QHJNMDDYpuCg==",
+      "version": "7.22.9",
+      "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.22.9.tgz",
+      "integrity": "sha512-LJIKvvpgPOPUThdYqcX6IXRuIcTkcAub0IaDRGCZH0p5GPUp7PhRU9QVgFcDDd51BaPkk77ZjqFwh6DZTAEmGg==",
       "dev": true,
       "requires": {
         "@babel/helper-environment-visitor": "^7.22.5",
         "@babel/helper-member-expression-to-functions": "^7.22.5",
-        "@babel/helper-optimise-call-expression": "^7.22.5",
-        "@babel/template": "^7.22.5",
-        "@babel/traverse": "^7.22.5",
-        "@babel/types": "^7.22.5"
+        "@babel/helper-optimise-call-expression": "^7.22.5"
       }
     },
     "@babel/helper-simple-access": {
@@ -18247,9 +18244,9 @@
       }
     },
     "@babel/plugin-transform-async-generator-functions": {
-      "version": "7.22.10",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-generator-functions/-/plugin-transform-async-generator-functions-7.22.10.tgz",
-      "integrity": "sha512-eueE8lvKVzq5wIObKK/7dvoeKJ+xc6TvRn6aysIjS6pSCeLy7S/eVi7pEQknZqyqvzaNKdDtem8nUNTBgDVR2g==",
+      "version": "7.22.11",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-generator-functions/-/plugin-transform-async-generator-functions-7.22.11.tgz",
+      "integrity": "sha512-0pAlmeRJn6wU84zzZsEOx1JV1Jf8fqO9ok7wofIJwUnplYo247dcd24P+cMJht7ts9xkzdtB0EPHmOb7F+KzXw==",
       "dev": true,
       "requires": {
         "@babel/helper-environment-visitor": "^7.22.5",
@@ -18298,12 +18295,12 @@
       }
     },
     "@babel/plugin-transform-class-static-block": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-class-static-block/-/plugin-transform-class-static-block-7.22.5.tgz",
-      "integrity": "sha512-SPToJ5eYZLxlnp1UzdARpOGeC2GbHvr9d/UV0EukuVx8atktg194oe+C5BqQ8jRTkgLRVOPYeXRSBg1IlMoVRA==",
+      "version": "7.22.11",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-class-static-block/-/plugin-transform-class-static-block-7.22.11.tgz",
+      "integrity": "sha512-GMM8gGmqI7guS/llMFk1bJDkKfn3v3C4KHK9Yg1ey5qcHcOlKb0QvcMrgzvxo+T03/4szNh5lghY+fEC98Kq9g==",
       "dev": true,
       "requires": {
-        "@babel/helper-create-class-features-plugin": "^7.22.5",
+        "@babel/helper-create-class-features-plugin": "^7.22.11",
         "@babel/helper-plugin-utils": "^7.22.5",
         "@babel/plugin-syntax-class-static-block": "^7.14.5"
       }
@@ -18364,9 +18361,9 @@
       }
     },
     "@babel/plugin-transform-dynamic-import": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dynamic-import/-/plugin-transform-dynamic-import-7.22.5.tgz",
-      "integrity": "sha512-0MC3ppTB1AMxd8fXjSrbPa7LT9hrImt+/fcj+Pg5YMD7UQyWp/02+JWpdnCymmsXwIx5Z+sYn1bwCn4ZJNvhqQ==",
+      "version": "7.22.11",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dynamic-import/-/plugin-transform-dynamic-import-7.22.11.tgz",
+      "integrity": "sha512-g/21plo58sfteWjaO0ZNVb+uEOkJNjAaHhbejrnBmu011l/eNDScmkbjCC3l4FKb10ViaGU4aOkFznSu2zRHgA==",
       "dev": true,
       "requires": {
         "@babel/helper-plugin-utils": "^7.22.5",
@@ -18384,9 +18381,9 @@
       }
     },
     "@babel/plugin-transform-export-namespace-from": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-export-namespace-from/-/plugin-transform-export-namespace-from-7.22.5.tgz",
-      "integrity": "sha512-X4hhm7FRnPgd4nDA4b/5V280xCx6oL7Oob5+9qVS5C13Zq4bh1qq7LU0GgRU6b5dBWBvhGaXYVB4AcN6+ol6vg==",
+      "version": "7.22.11",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-export-namespace-from/-/plugin-transform-export-namespace-from-7.22.11.tgz",
+      "integrity": "sha512-xa7aad7q7OiT8oNZ1mU7NrISjlSkVdMbNxn9IuLZyL9AJEhs1Apba3I+u5riX1dIkdptP5EKDG5XDPByWxtehw==",
       "dev": true,
       "requires": {
         "@babel/helper-plugin-utils": "^7.22.5",
@@ -18414,9 +18411,9 @@
       }
     },
     "@babel/plugin-transform-json-strings": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-json-strings/-/plugin-transform-json-strings-7.22.5.tgz",
-      "integrity": "sha512-DuCRB7fu8MyTLbEQd1ew3R85nx/88yMoqo2uPSjevMj3yoN7CDM8jkgrY0wmVxfJZyJ/B9fE1iq7EQppWQmR5A==",
+      "version": "7.22.11",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-json-strings/-/plugin-transform-json-strings-7.22.11.tgz",
+      "integrity": "sha512-CxT5tCqpA9/jXFlme9xIBCc5RPtdDq3JpkkhgHQqtDdiTnTI0jtZ0QzXhr5DILeYifDPp2wvY2ad+7+hLMW5Pw==",
       "dev": true,
       "requires": {
         "@babel/helper-plugin-utils": "^7.22.5",
@@ -18433,9 +18430,9 @@
       }
     },
     "@babel/plugin-transform-logical-assignment-operators": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-logical-assignment-operators/-/plugin-transform-logical-assignment-operators-7.22.5.tgz",
-      "integrity": "sha512-MQQOUW1KL8X0cDWfbwYP+TbVbZm16QmQXJQ+vndPtH/BoO0lOKpVoEDMI7+PskYxH+IiE0tS8xZye0qr1lGzSA==",
+      "version": "7.22.11",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-logical-assignment-operators/-/plugin-transform-logical-assignment-operators-7.22.11.tgz",
+      "integrity": "sha512-qQwRTP4+6xFCDV5k7gZBF3C31K34ut0tbEcTKxlX/0KXxm9GLcO14p570aWxFvVzx6QAfPgq7gaeIHXJC8LswQ==",
       "dev": true,
       "requires": {
         "@babel/helper-plugin-utils": "^7.22.5",
@@ -18462,24 +18459,24 @@
       }
     },
     "@babel/plugin-transform-modules-commonjs": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.22.5.tgz",
-      "integrity": "sha512-B4pzOXj+ONRmuaQTg05b3y/4DuFz3WcCNAXPLb2Q0GT0TrGKGxNKV4jwsXts+StaM0LQczZbOpj8o1DLPDJIiA==",
+      "version": "7.22.11",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.22.11.tgz",
+      "integrity": "sha512-o2+bg7GDS60cJMgz9jWqRUsWkMzLCxp+jFDeDUT5sjRlAxcJWZ2ylNdI7QQ2+CH5hWu7OnN+Cv3htt7AkSf96g==",
       "dev": true,
       "requires": {
-        "@babel/helper-module-transforms": "^7.22.5",
+        "@babel/helper-module-transforms": "^7.22.9",
         "@babel/helper-plugin-utils": "^7.22.5",
         "@babel/helper-simple-access": "^7.22.5"
       }
     },
     "@babel/plugin-transform-modules-systemjs": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.22.5.tgz",
-      "integrity": "sha512-emtEpoaTMsOs6Tzz+nbmcePl6AKVtS1yC4YNAeMun9U8YCsgadPNxnOPQ8GhHFB2qdx+LZu9LgoC0Lthuu05DQ==",
+      "version": "7.22.11",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.22.11.tgz",
+      "integrity": "sha512-rIqHmHoMEOhI3VkVf5jQ15l539KrwhzqcBO6wdCNWPWc/JWt9ILNYNUssbRpeq0qWns8svuw8LnMNCvWBIJ8wA==",
       "dev": true,
       "requires": {
         "@babel/helper-hoist-variables": "^7.22.5",
-        "@babel/helper-module-transforms": "^7.22.5",
+        "@babel/helper-module-transforms": "^7.22.9",
         "@babel/helper-plugin-utils": "^7.22.5",
         "@babel/helper-validator-identifier": "^7.22.5"
       }
@@ -18514,9 +18511,9 @@
       }
     },
     "@babel/plugin-transform-nullish-coalescing-operator": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-nullish-coalescing-operator/-/plugin-transform-nullish-coalescing-operator-7.22.5.tgz",
-      "integrity": "sha512-6CF8g6z1dNYZ/VXok5uYkkBBICHZPiGEl7oDnAx2Mt1hlHVHOSIKWJaXHjQJA5VB43KZnXZDIexMchY4y2PGdA==",
+      "version": "7.22.11",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-nullish-coalescing-operator/-/plugin-transform-nullish-coalescing-operator-7.22.11.tgz",
+      "integrity": "sha512-YZWOw4HxXrotb5xsjMJUDlLgcDXSfO9eCmdl1bgW4+/lAGdkjaEvOnQ4p5WKKdUgSzO39dgPl0pTnfxm0OAXcg==",
       "dev": true,
       "requires": {
         "@babel/helper-plugin-utils": "^7.22.5",
@@ -18524,9 +18521,9 @@
       }
     },
     "@babel/plugin-transform-numeric-separator": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-numeric-separator/-/plugin-transform-numeric-separator-7.22.5.tgz",
-      "integrity": "sha512-NbslED1/6M+sXiwwtcAB/nieypGw02Ejf4KtDeMkCEpP6gWFMX1wI9WKYua+4oBneCCEmulOkRpwywypVZzs/g==",
+      "version": "7.22.11",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-numeric-separator/-/plugin-transform-numeric-separator-7.22.11.tgz",
+      "integrity": "sha512-3dzU4QGPsILdJbASKhF/V2TVP+gJya1PsueQCxIPCEcerqF21oEcrob4mzjsp2Py/1nLfF5m+xYNMDpmA8vffg==",
       "dev": true,
       "requires": {
         "@babel/helper-plugin-utils": "^7.22.5",
@@ -18534,13 +18531,13 @@
       }
     },
     "@babel/plugin-transform-object-rest-spread": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-rest-spread/-/plugin-transform-object-rest-spread-7.22.5.tgz",
-      "integrity": "sha512-Kk3lyDmEslH9DnvCDA1s1kkd3YWQITiBOHngOtDL9Pt6BZjzqb6hiOlb8VfjiiQJ2unmegBqZu0rx5RxJb5vmQ==",
+      "version": "7.22.11",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-rest-spread/-/plugin-transform-object-rest-spread-7.22.11.tgz",
+      "integrity": "sha512-nX8cPFa6+UmbepISvlf5jhQyaC7ASs/7UxHmMkuJ/k5xSHvDPPaibMo+v3TXwU/Pjqhep/nFNpd3zn4YR59pnw==",
       "dev": true,
       "requires": {
-        "@babel/compat-data": "^7.22.5",
-        "@babel/helper-compilation-targets": "^7.22.5",
+        "@babel/compat-data": "^7.22.9",
+        "@babel/helper-compilation-targets": "^7.22.10",
         "@babel/helper-plugin-utils": "^7.22.5",
         "@babel/plugin-syntax-object-rest-spread": "^7.8.3",
         "@babel/plugin-transform-parameters": "^7.22.5"
@@ -18557,9 +18554,9 @@
       }
     },
     "@babel/plugin-transform-optional-catch-binding": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-optional-catch-binding/-/plugin-transform-optional-catch-binding-7.22.5.tgz",
-      "integrity": "sha512-pH8orJahy+hzZje5b8e2QIlBWQvGpelS76C63Z+jhZKsmzfNaPQ+LaW6dcJ9bxTpo1mtXbgHwy765Ro3jftmUg==",
+      "version": "7.22.11",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-optional-catch-binding/-/plugin-transform-optional-catch-binding-7.22.11.tgz",
+      "integrity": "sha512-rli0WxesXUeCJnMYhzAglEjLWVDF6ahb45HuprcmQuLidBJFWjNnOzssk2kuc6e33FlLaiZhG/kUIzUMWdBKaQ==",
       "dev": true,
       "requires": {
         "@babel/helper-plugin-utils": "^7.22.5",
@@ -18567,9 +18564,9 @@
       }
     },
     "@babel/plugin-transform-optional-chaining": {
-      "version": "7.22.10",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-optional-chaining/-/plugin-transform-optional-chaining-7.22.10.tgz",
-      "integrity": "sha512-MMkQqZAZ+MGj+jGTG3OTuhKeBpNcO+0oCEbrGNEaOmiEn+1MzRyQlYsruGiU8RTK3zV6XwrVJTmwiDOyYK6J9g==",
+      "version": "7.22.12",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-optional-chaining/-/plugin-transform-optional-chaining-7.22.12.tgz",
+      "integrity": "sha512-7XXCVqZtyFWqjDsYDY4T45w4mlx1rf7aOgkc/Ww76xkgBiOlmjPkx36PBLHa1k1rwWvVgYMPsbuVnIamx2ZQJw==",
       "dev": true,
       "requires": {
         "@babel/helper-plugin-utils": "^7.22.5",
@@ -18597,13 +18594,13 @@
       }
     },
     "@babel/plugin-transform-private-property-in-object": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-private-property-in-object/-/plugin-transform-private-property-in-object-7.22.5.tgz",
-      "integrity": "sha512-/9xnaTTJcVoBtSSmrVyhtSvO3kbqS2ODoh2juEU72c3aYonNF0OMGiaz2gjukyKM2wBBYJP38S4JiE0Wfb5VMQ==",
+      "version": "7.22.11",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-private-property-in-object/-/plugin-transform-private-property-in-object-7.22.11.tgz",
+      "integrity": "sha512-sSCbqZDBKHetvjSwpyWzhuHkmW5RummxJBVbYLkGkaiTOWGxml7SXt0iWa03bzxFIx7wOj3g/ILRd0RcJKBeSQ==",
       "dev": true,
       "requires": {
         "@babel/helper-annotate-as-pure": "^7.22.5",
-        "@babel/helper-create-class-features-plugin": "^7.22.5",
+        "@babel/helper-create-class-features-plugin": "^7.22.11",
         "@babel/helper-plugin-utils": "^7.22.5",
         "@babel/plugin-syntax-private-property-in-object": "^7.14.5"
       }
@@ -18746,9 +18743,9 @@
       }
     },
     "@babel/preset-env": {
-      "version": "7.22.10",
-      "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.22.10.tgz",
-      "integrity": "sha512-riHpLb1drNkpLlocmSyEg4oYJIQFeXAK/d7rI6mbD0XsvoTOOweXDmQPG/ErxsEhWk3rl3Q/3F6RFQlVFS8m0A==",
+      "version": "7.22.14",
+      "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.22.14.tgz",
+      "integrity": "sha512-daodMIoVo+ol/g+//c/AH+szBkFj4STQUikvBijRGL72Ph+w+AMTSh55DUETe8KJlPlDT1k/mp7NBfOuiWmoig==",
       "dev": true,
       "requires": {
         "@babel/compat-data": "^7.22.9",
@@ -18777,41 +18774,41 @@
         "@babel/plugin-syntax-top-level-await": "^7.14.5",
         "@babel/plugin-syntax-unicode-sets-regex": "^7.18.6",
         "@babel/plugin-transform-arrow-functions": "^7.22.5",
-        "@babel/plugin-transform-async-generator-functions": "^7.22.10",
+        "@babel/plugin-transform-async-generator-functions": "^7.22.11",
         "@babel/plugin-transform-async-to-generator": "^7.22.5",
         "@babel/plugin-transform-block-scoped-functions": "^7.22.5",
         "@babel/plugin-transform-block-scoping": "^7.22.10",
         "@babel/plugin-transform-class-properties": "^7.22.5",
-        "@babel/plugin-transform-class-static-block": "^7.22.5",
+        "@babel/plugin-transform-class-static-block": "^7.22.11",
         "@babel/plugin-transform-classes": "^7.22.6",
         "@babel/plugin-transform-computed-properties": "^7.22.5",
         "@babel/plugin-transform-destructuring": "^7.22.10",
         "@babel/plugin-transform-dotall-regex": "^7.22.5",
         "@babel/plugin-transform-duplicate-keys": "^7.22.5",
-        "@babel/plugin-transform-dynamic-import": "^7.22.5",
+        "@babel/plugin-transform-dynamic-import": "^7.22.11",
         "@babel/plugin-transform-exponentiation-operator": "^7.22.5",
-        "@babel/plugin-transform-export-namespace-from": "^7.22.5",
+        "@babel/plugin-transform-export-namespace-from": "^7.22.11",
         "@babel/plugin-transform-for-of": "^7.22.5",
         "@babel/plugin-transform-function-name": "^7.22.5",
-        "@babel/plugin-transform-json-strings": "^7.22.5",
+        "@babel/plugin-transform-json-strings": "^7.22.11",
         "@babel/plugin-transform-literals": "^7.22.5",
-        "@babel/plugin-transform-logical-assignment-operators": "^7.22.5",
+        "@babel/plugin-transform-logical-assignment-operators": "^7.22.11",
         "@babel/plugin-transform-member-expression-literals": "^7.22.5",
         "@babel/plugin-transform-modules-amd": "^7.22.5",
-        "@babel/plugin-transform-modules-commonjs": "^7.22.5",
-        "@babel/plugin-transform-modules-systemjs": "^7.22.5",
+        "@babel/plugin-transform-modules-commonjs": "^7.22.11",
+        "@babel/plugin-transform-modules-systemjs": "^7.22.11",
         "@babel/plugin-transform-modules-umd": "^7.22.5",
         "@babel/plugin-transform-named-capturing-groups-regex": "^7.22.5",
         "@babel/plugin-transform-new-target": "^7.22.5",
-        "@babel/plugin-transform-nullish-coalescing-operator": "^7.22.5",
-        "@babel/plugin-transform-numeric-separator": "^7.22.5",
-        "@babel/plugin-transform-object-rest-spread": "^7.22.5",
+        "@babel/plugin-transform-nullish-coalescing-operator": "^7.22.11",
+        "@babel/plugin-transform-numeric-separator": "^7.22.11",
+        "@babel/plugin-transform-object-rest-spread": "^7.22.11",
         "@babel/plugin-transform-object-super": "^7.22.5",
-        "@babel/plugin-transform-optional-catch-binding": "^7.22.5",
-        "@babel/plugin-transform-optional-chaining": "^7.22.10",
+        "@babel/plugin-transform-optional-catch-binding": "^7.22.11",
+        "@babel/plugin-transform-optional-chaining": "^7.22.12",
         "@babel/plugin-transform-parameters": "^7.22.5",
         "@babel/plugin-transform-private-methods": "^7.22.5",
-        "@babel/plugin-transform-private-property-in-object": "^7.22.5",
+        "@babel/plugin-transform-private-property-in-object": "^7.22.11",
         "@babel/plugin-transform-property-literals": "^7.22.5",
         "@babel/plugin-transform-regenerator": "^7.22.10",
         "@babel/plugin-transform-reserved-words": "^7.22.5",
@@ -18825,7 +18822,7 @@
         "@babel/plugin-transform-unicode-regex": "^7.22.5",
         "@babel/plugin-transform-unicode-sets-regex": "^7.22.5",
         "@babel/preset-modules": "0.1.6-no-external-plugins",
-        "@babel/types": "^7.22.10",
+        "@babel/types": "^7.22.11",
         "babel-plugin-polyfill-corejs2": "^0.4.5",
         "babel-plugin-polyfill-corejs3": "^0.8.3",
         "babel-plugin-polyfill-regenerator": "^0.5.2",
diff --git a/apps/block_scout_web/assets/package.json b/apps/block_scout_web/assets/package.json
index b20aab8c814e..2d7b45635a04 100644
--- a/apps/block_scout_web/assets/package.json
+++ b/apps/block_scout_web/assets/package.json
@@ -84,7 +84,7 @@
   },
   "devDependencies": {
     "@babel/core": "^7.22.11",
-    "@babel/preset-env": "^7.22.10",
+    "@babel/preset-env": "^7.22.14",
     "autoprefixer": "^10.4.15",
     "babel-loader": "^9.1.3",
     "copy-webpack-plugin": "^11.0.0",

From b212ddf631f467b4c36b4032439ce64e75eaa490 Mon Sep 17 00:00:00 2001
From: Qwerty5Uiop <alex000010@bk.ru>
Date: Thu, 31 Aug 2023 15:33:54 +0300
Subject: [PATCH 369/909] Drop ctb tokens foreign key

---
 CHANGELOG.md                                           |  1 +
 .../explorer/chain/address/current_token_balance.ex    |  1 -
 ..._drop_current_token_balances_tokens_foreign_key.exs | 10 ++++++++++
 3 files changed, 11 insertions(+), 1 deletion(-)
 create mode 100644 apps/explorer/priv/repo/migrations/20230831122819_drop_current_token_balances_tokens_foreign_key.exs

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f5a303e1096d..7271430d98f2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,6 +10,7 @@
 - [#8210](https://github.com/blockscout/blockscout/pull/8210) - Drop address foreign keys
 - [#8292](https://github.com/blockscout/blockscout/pull/8292) - Add ETHEREUM_JSONRPC_WAIT_PER_TIMEOUT env var
 - [#8269](https://github.com/blockscout/blockscout/pull/8269) - Don't push back to sequence on catchup exception
+- [#8362](https://github.com/blockscout/blockscout/pull/8362) - Drop current token balances tokens foreign key
 
 ### Fixes
 
diff --git a/apps/explorer/lib/explorer/chain/address/current_token_balance.ex b/apps/explorer/lib/explorer/chain/address/current_token_balance.ex
index b14bf07dc814..c5c77f6c5cfe 100644
--- a/apps/explorer/lib/explorer/chain/address/current_token_balance.ex
+++ b/apps/explorer/lib/explorer/chain/address/current_token_balance.ex
@@ -74,7 +74,6 @@ defmodule Explorer.Chain.Address.CurrentTokenBalance do
     token_balance
     |> cast(attrs, @allowed_fields)
     |> validate_required(@required_fields)
-    |> foreign_key_constraint(:token_contract_address_hash)
   end
 
   {:ok, burn_address_hash} = Chain.string_to_address_hash("0x0000000000000000000000000000000000000000")
diff --git a/apps/explorer/priv/repo/migrations/20230831122819_drop_current_token_balances_tokens_foreign_key.exs b/apps/explorer/priv/repo/migrations/20230831122819_drop_current_token_balances_tokens_foreign_key.exs
new file mode 100644
index 000000000000..3befa9600c66
--- /dev/null
+++ b/apps/explorer/priv/repo/migrations/20230831122819_drop_current_token_balances_tokens_foreign_key.exs
@@ -0,0 +1,10 @@
+# cspell:ignore fkey
+defmodule Explorer.Repo.Migrations.DropCurrentTokenBalancesTokensForeignKey do
+  use Ecto.Migration
+
+  def change do
+    drop_if_exists(
+      constraint(:address_current_token_balances, :address_current_token_balances_token_contract_address_hash_fkey)
+    )
+  end
+end

From 010f03a0c100dbc900a2a89898b7d2c9f6369528 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 31 Aug 2023 19:04:45 +0000
Subject: [PATCH 370/909] Bump dialyxir from 1.4.0 to 1.4.1

Bumps [dialyxir](https://github.com/jeremyjh/dialyxir) from 1.4.0 to 1.4.1.
- [Release notes](https://github.com/jeremyjh/dialyxir/releases)
- [Changelog](https://github.com/jeremyjh/dialyxir/blob/master/CHANGELOG.md)
- [Commits](https://github.com/jeremyjh/dialyxir/compare/1.4.0...1.4.1)

---
updated-dependencies:
- dependency-name: dialyxir
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 mix.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mix.lock b/mix.lock
index 38dbf8d38c25..0b3709e99bbf 100644
--- a/mix.lock
+++ b/mix.lock
@@ -34,7 +34,7 @@
   "decimal": {:hex, :decimal, "2.1.1", "5611dca5d4b2c3dd497dec8f68751f1f1a54755e8ed2a966c2633cf885973ad6", [:mix], [], "hexpm", "53cfe5f497ed0e7771ae1a475575603d77425099ba5faef9394932b35020ffcc"},
   "decorator": {:hex, :decorator, "1.4.0", "a57ac32c823ea7e4e67f5af56412d12b33274661bb7640ec7fc882f8d23ac419", [:mix], [], "hexpm", "0a07cedd9083da875c7418dea95b78361197cf2bf3211d743f6f7ce39656597f"},
   "deep_merge": {:hex, :deep_merge, "1.0.0", "b4aa1a0d1acac393bdf38b2291af38cb1d4a52806cf7a4906f718e1feb5ee961", [:mix], [], "hexpm", "ce708e5f094b9cd4e8f2be4f00d2f4250c4095be93f8cd6d018c753894885430"},
-  "dialyxir": {:hex, :dialyxir, "1.4.0", "6b698401c16de79e8596b73dca63762255e70e4bbe26423530e173917220d5fc", [:mix], [{:erlex, ">= 0.2.6", [hex: :erlex, repo: "hexpm", optional: false]}], "hexpm", "c7ecaa1da27debae488ab09d9827ec58a0161c7821972b6d2cb26c1614648849"},
+  "dialyxir": {:hex, :dialyxir, "1.4.1", "a22ed1e7bd3a3e3f197b68d806ef66acb61ee8f57b3ac85fc5d57354c5482a93", [:mix], [{:erlex, ">= 0.2.6", [hex: :erlex, repo: "hexpm", optional: false]}], "hexpm", "84b795d6d7796297cca5a3118444b80c7d94f7ce247d49886e7c291e1ae49801"},
   "digital_token": {:hex, :digital_token, "0.6.0", "13e6de581f0b1f6c686f7c7d12ab11a84a7b22fa79adeb4b50eec1a2d278d258", [:mix], [{:cldr_utils, "~> 2.17", [hex: :cldr_utils, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}], "hexpm", "2455d626e7c61a128b02a4a8caddb092548c3eb613ac6f6a85e4cbb6caddc4d1"},
   "earmark_parser": {:hex, :earmark_parser, "1.4.33", "3c3fd9673bb5dcc9edc28dd90f50c87ce506d1f71b70e3de69aa8154bc695d44", [:mix], [], "hexpm", "2d526833729b59b9fdb85785078697c72ac5e5066350663e5be6a1182da61b8f"},
   "ecto": {:hex, :ecto, "3.10.3", "eb2ae2eecd210b4eb8bece1217b297ad4ff824b4384c0e3fdd28aaf96edd6135", [:mix], [{:decimal, "~> 1.6 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}, {:telemetry, "~> 0.4 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "44bec74e2364d491d70f7e42cd0d690922659d329f6465e89feb8a34e8cd3433"},

From 359cabe5dc85504b1c4dbfaf761e7cb4aca61863 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 1 Sep 2023 18:41:03 +0000
Subject: [PATCH 371/909] Bump ex_secp256k1 from 0.7.0 to 0.7.1

Bumps [ex_secp256k1](https://github.com/omgnetwork/ex_secp256k1) from 0.7.0 to 0.7.1.
- [Release notes](https://github.com/omgnetwork/ex_secp256k1/releases)
- [Changelog](https://github.com/ayrat555/ex_secp256k1/blob/master/CHANGELOG.md)
- [Commits](https://github.com/omgnetwork/ex_secp256k1/compare/v0.7.0...v0.7.1)

---
updated-dependencies:
- dependency-name: ex_secp256k1
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 mix.lock | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/mix.lock b/mix.lock
index 0b3709e99bbf..c9a25c08c8fc 100644
--- a/mix.lock
+++ b/mix.lock
@@ -52,7 +52,7 @@
   "ex_keccak": {:hex, :ex_keccak, "0.7.1", "0169f4b0c5073c5df61581d6282b12f1a1b764dcfcda4eeb1c819b5194c9ced0", [:mix], [{:rustler, ">= 0.0.0", [hex: :rustler, repo: "hexpm", optional: true]}, {:rustler_precompiled, "~> 0.6.1", [hex: :rustler_precompiled, repo: "hexpm", optional: false]}], "hexpm", "c18c19f66b6545b4b46b0c71c0cc0079de84e30b26365a92961e91697e8724ed"},
   "ex_machina": {:hex, :ex_machina, "2.7.0", "b792cc3127fd0680fecdb6299235b4727a4944a09ff0fa904cc639272cd92dc7", [:mix], [{:ecto, "~> 2.2 or ~> 3.0", [hex: :ecto, repo: "hexpm", optional: true]}, {:ecto_sql, "~> 3.0", [hex: :ecto_sql, repo: "hexpm", optional: true]}], "hexpm", "419aa7a39bde11894c87a615c4ecaa52d8f107bbdd81d810465186f783245bf8"},
   "ex_rlp": {:hex, :ex_rlp, "0.6.0", "985391d2356a7cb8712a4a9a2deb93f19f2fbca0323f5c1203fcaf64d077e31e", [:mix], [], "hexpm", "7135db93b861d9e76821039b60b00a6a22d2c4e751bf8c444bffe7a042f1abaf"},
-  "ex_secp256k1": {:hex, :ex_secp256k1, "0.7.0", "fa555152e8680c1e2df09ccc2884eccd25d8bc328c630b0b8952abe3745edc8f", [:mix], [{:rustler, ">= 0.0.0", [hex: :rustler, repo: "hexpm", optional: true]}, {:rustler_precompiled, "~> 0.6", [hex: :rustler_precompiled, repo: "hexpm", optional: false]}], "hexpm", "2a8754c7b3d83bbcab4a188ed033254ca5c6ac252188ced0d382ca343096bf73"},
+  "ex_secp256k1": {:hex, :ex_secp256k1, "0.7.1", "a03653a05b373a43e29aaf72e302edb83c697d971180156b4576ceef245f4217", [:mix], [{:rustler, ">= 0.0.0", [hex: :rustler, repo: "hexpm", optional: true]}, {:rustler_precompiled, "~> 0.6", [hex: :rustler_precompiled, repo: "hexpm", optional: false]}], "hexpm", "33399818b45ecbdef0af8205aa26f28334cddbe263541ce616e1808c2f5a7431"},
   "ex_utils": {:hex, :ex_utils, "0.1.7", "2c133e0bcdc49a858cf8dacf893308ebc05bc5fba501dc3d2935e65365ec0bf3", [:mix], [], "hexpm", "66d4fe75285948f2d1e69c2a5ddd651c398c813574f8d36a9eef11dc20356ef6"},
   "exactor": {:hex, :exactor, "2.2.4", "5efb4ddeb2c48d9a1d7c9b465a6fffdd82300eb9618ece5d34c3334d5d7245b1", [:mix], [], "hexpm", "1222419f706e01bfa1095aec9acf6421367dcfab798a6f67c54cf784733cd6b5"},
   "exjsx": {:hex, :exjsx, "4.0.0", "60548841e0212df401e38e63c0078ec57b33e7ea49b032c796ccad8cde794b5c", [:mix], [{:jsx, "~> 2.8.0", [hex: :jsx, repo: "hexpm", optional: false]}], "hexpm", "32e95820a97cffea67830e91514a2ad53b888850442d6d395f53a1ac60c82e07"},
@@ -122,7 +122,7 @@
   "ratio": {:hex, :ratio, "2.4.2", "c8518f3536d49b1b00d88dd20d49f8b11abb7819638093314a6348139f14f9f9", [:mix], [{:decimal, "~> 1.6 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: true]}, {:numbers, "~> 5.2.0", [hex: :numbers, repo: "hexpm", optional: false]}], "hexpm", "441ef6f73172a3503de65ccf1769030997b0d533b1039422f1e5e0e0b4cbf89e"},
   "redix": {:hex, :redix, "1.2.3", "3036e7c6080c42e1bbaa9168d1e28e367b01e8960a640a899b8ef8067273cb5e", [:mix], [{:castore, "~> 0.1.0 or ~> 1.0", [hex: :castore, repo: "hexpm", optional: true]}, {:nimble_options, "~> 0.5.0 or ~> 1.0", [hex: :nimble_options, repo: "hexpm", optional: false]}, {:telemetry, "~> 0.4.0 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "14e2bca8a03fad297a78a3d201032df260ee5f0e0ef9c173c0f9ca5b3e0331b7"},
   "remote_ip": {:hex, :remote_ip, "1.1.0", "cb308841595d15df3f9073b7c39243a1dd6ca56e5020295cb012c76fbec50f2d", [:mix], [{:combine, "~> 0.10", [hex: :combine, repo: "hexpm", optional: false]}, {:plug, "~> 1.14", [hex: :plug, repo: "hexpm", optional: false]}], "hexpm", "616ffdf66aaad6a72fc546dabf42eed87e2a99e97b09cbd92b10cc180d02ed74"},
-  "rustler_precompiled": {:hex, :rustler_precompiled, "0.6.1", "160b545bce8bf9a3f1b436b2c10f53574036a0db628e40f393328cbbe593602f", [:mix], [{:castore, "~> 0.1 or ~> 1.0", [hex: :castore, repo: "hexpm", optional: false]}, {:rustler, "~> 0.23", [hex: :rustler, repo: "hexpm", optional: true]}], "hexpm", "0dd269fa261c4e3df290b12031c575fff07a542749f7b0e8b744d72d66c43600"},
+  "rustler_precompiled": {:hex, :rustler_precompiled, "0.6.3", "f838d94bc35e1844973ee7266127b156fdc962e9e8b7ff666c8fb4fed7964d23", [:mix], [{:castore, "~> 0.1 or ~> 1.0", [hex: :castore, repo: "hexpm", optional: false]}, {:rustler, "~> 0.23", [hex: :rustler, repo: "hexpm", optional: true]}], "hexpm", "e18ecca3669a7454b3a2be75ae6c3ef01d550bc9a8cf5fbddcfff843b881d7c6"},
   "sobelow": {:hex, :sobelow, "0.13.0", "218afe9075904793f5c64b8837cc356e493d88fddde126a463839351870b8d1e", [:mix], [{:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: false]}], "hexpm", "cd6e9026b85fc35d7529da14f95e85a078d9dd1907a9097b3ba6ac7ebbe34a0d"},
   "spandex": {:hex, :spandex, "3.2.0", "f8cd40146ea988c87f3c14054150c9a47ba17e53cd4515c00e1f93c29c45404d", [:mix], [{:decorator, "~> 1.2", [hex: :decorator, repo: "hexpm", optional: true]}, {:optimal, "~> 0.3.3", [hex: :optimal, repo: "hexpm", optional: false]}, {:plug, "~> 1.0", [hex: :plug, repo: "hexpm", optional: false]}], "hexpm", "d0a7d5aef4c5af9cf5467f2003e8a5d8d2bdae3823a6cc95d776b9a2251d4d03"},
   "spandex_datadog": {:hex, :spandex_datadog, "1.4.0", "0594b9655b0af00ab9137122616bc0208b68ceec01e9916ab13d6fbb33dcce35", [:mix], [{:msgpax, "~> 2.2.1 or ~> 2.3", [hex: :msgpax, repo: "hexpm", optional: false]}, {:spandex, "~> 3.2", [hex: :spandex, repo: "hexpm", optional: false]}, {:telemetry, "~> 0.4.2 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "360f8e1b4db238c1749c4872b1697b096429927fa42b8858d0bb782067380123"},

From 5dd460112bf115fcf8b98bfcffa9cecad8b5a7ee Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 1 Sep 2023 19:00:17 +0000
Subject: [PATCH 372/909] Bump @amplitude/analytics-browser in
 /apps/block_scout_web/assets

Bumps [@amplitude/analytics-browser](https://github.com/amplitude/Amplitude-TypeScript) from 2.2.2 to 2.2.3.
- [Release notes](https://github.com/amplitude/Amplitude-TypeScript/releases)
- [Commits](https://github.com/amplitude/Amplitude-TypeScript/compare/@amplitude/analytics-browser@2.2.2...@amplitude/analytics-browser@2.2.3)

---
updated-dependencies:
- dependency-name: "@amplitude/analytics-browser"
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 apps/block_scout_web/assets/package-lock.json | 46 +++++++++----------
 apps/block_scout_web/assets/package.json      |  2 +-
 2 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/apps/block_scout_web/assets/package-lock.json b/apps/block_scout_web/assets/package-lock.json
index da1f57d73d4f..3c21a5b79f98 100644
--- a/apps/block_scout_web/assets/package-lock.json
+++ b/apps/block_scout_web/assets/package-lock.json
@@ -7,7 +7,7 @@
       "name": "blockscout",
       "license": "GPL-3.0",
       "dependencies": {
-        "@amplitude/analytics-browser": "^2.2.2",
+        "@amplitude/analytics-browser": "^2.2.3",
         "@fortawesome/fontawesome-free": "^6.4.2",
         "@tarekraafat/autocomplete.js": "^10.2.7",
         "@walletconnect/web3-provider": "^1.8.0",
@@ -116,15 +116,15 @@
       }
     },
     "node_modules/@amplitude/analytics-browser": {
-      "version": "2.2.2",
-      "resolved": "https://registry.npmjs.org/@amplitude/analytics-browser/-/analytics-browser-2.2.2.tgz",
-      "integrity": "sha512-7H2lp6fu2umjmrOvBS3DeCkf7hEiM4+M9VYB9Dvn8QwlaeLhQrk/+TLyew12lmApOowI/C1f8TAupSIKB5MucQ==",
+      "version": "2.2.3",
+      "resolved": "https://registry.npmjs.org/@amplitude/analytics-browser/-/analytics-browser-2.2.3.tgz",
+      "integrity": "sha512-vuKG8/jqtsAFe0xK0ZGtXDxH7oPx989VIoCpUi97bkfxholySCNHjVMd5Q8D4Mqm/3eDH7YZhkFwEb0JFyCAfA==",
       "dependencies": {
         "@amplitude/analytics-client-common": "^2.0.5",
         "@amplitude/analytics-core": "^2.0.4",
         "@amplitude/analytics-types": "^2.1.2",
-        "@amplitude/plugin-page-view-tracking-browser": "^2.0.8",
-        "@amplitude/plugin-web-attribution-browser": "^2.0.8",
+        "@amplitude/plugin-page-view-tracking-browser": "^2.0.9",
+        "@amplitude/plugin-web-attribution-browser": "^2.0.9",
         "tslib": "^2.4.1"
       }
     },
@@ -174,9 +174,9 @@
       "integrity": "sha512-ASKwH9g+5gglTHr7h7miK8J/ofIzuEtGRDCjnZAtRbE6+laoOfCLYPPJXMYz0k1x+rIhLO/6I6WWjT7zchmpyA=="
     },
     "node_modules/@amplitude/plugin-page-view-tracking-browser": {
-      "version": "2.0.8",
-      "resolved": "https://registry.npmjs.org/@amplitude/plugin-page-view-tracking-browser/-/plugin-page-view-tracking-browser-2.0.8.tgz",
-      "integrity": "sha512-TwZuJZj5x1x98Dg8e/Papq9NmP5smKQiHg0/N7MY+qXELsM0zJ53TsXC0Eo2J9U8Ok6jfZSRoYCp/s7mQ2zDoA==",
+      "version": "2.0.9",
+      "resolved": "https://registry.npmjs.org/@amplitude/plugin-page-view-tracking-browser/-/plugin-page-view-tracking-browser-2.0.9.tgz",
+      "integrity": "sha512-OjhAxvQ52lDcRap2sjUbYEcSM6bzeDa6SdBx6vCaeXswvjafcH9LeDPawLUHgaqvQJiAhA7lxrQ7ThfH0P6c0g==",
       "dependencies": {
         "@amplitude/analytics-client-common": "^2.0.5",
         "@amplitude/analytics-types": "^2.1.2",
@@ -189,9 +189,9 @@
       "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q=="
     },
     "node_modules/@amplitude/plugin-web-attribution-browser": {
-      "version": "2.0.8",
-      "resolved": "https://registry.npmjs.org/@amplitude/plugin-web-attribution-browser/-/plugin-web-attribution-browser-2.0.8.tgz",
-      "integrity": "sha512-ZRk67ErKc+uNFKpgPEtdT+7kut3RkdiuZa52c3rX6OeUYpFpVlwWnH565AnpNh/clBPlqJPL7T90Dq0ku9QZtg==",
+      "version": "2.0.9",
+      "resolved": "https://registry.npmjs.org/@amplitude/plugin-web-attribution-browser/-/plugin-web-attribution-browser-2.0.9.tgz",
+      "integrity": "sha512-QrNgieAEXEBbtnsxYzfeJl2U/5XwCCvO3Dg0hntAtnTdu1A3HlN5ItRtoHg0jGBbu4jpSbvag72UlkCotqJ+Yg==",
       "dependencies": {
         "@amplitude/analytics-client-common": "^2.0.5",
         "@amplitude/analytics-core": "^2.0.4",
@@ -17604,15 +17604,15 @@
       "dev": true
     },
     "@amplitude/analytics-browser": {
-      "version": "2.2.2",
-      "resolved": "https://registry.npmjs.org/@amplitude/analytics-browser/-/analytics-browser-2.2.2.tgz",
-      "integrity": "sha512-7H2lp6fu2umjmrOvBS3DeCkf7hEiM4+M9VYB9Dvn8QwlaeLhQrk/+TLyew12lmApOowI/C1f8TAupSIKB5MucQ==",
+      "version": "2.2.3",
+      "resolved": "https://registry.npmjs.org/@amplitude/analytics-browser/-/analytics-browser-2.2.3.tgz",
+      "integrity": "sha512-vuKG8/jqtsAFe0xK0ZGtXDxH7oPx989VIoCpUi97bkfxholySCNHjVMd5Q8D4Mqm/3eDH7YZhkFwEb0JFyCAfA==",
       "requires": {
         "@amplitude/analytics-client-common": "^2.0.5",
         "@amplitude/analytics-core": "^2.0.4",
         "@amplitude/analytics-types": "^2.1.2",
-        "@amplitude/plugin-page-view-tracking-browser": "^2.0.8",
-        "@amplitude/plugin-web-attribution-browser": "^2.0.8",
+        "@amplitude/plugin-page-view-tracking-browser": "^2.0.9",
+        "@amplitude/plugin-web-attribution-browser": "^2.0.9",
         "tslib": "^2.4.1"
       },
       "dependencies": {
@@ -17668,9 +17668,9 @@
       "integrity": "sha512-ASKwH9g+5gglTHr7h7miK8J/ofIzuEtGRDCjnZAtRbE6+laoOfCLYPPJXMYz0k1x+rIhLO/6I6WWjT7zchmpyA=="
     },
     "@amplitude/plugin-page-view-tracking-browser": {
-      "version": "2.0.8",
-      "resolved": "https://registry.npmjs.org/@amplitude/plugin-page-view-tracking-browser/-/plugin-page-view-tracking-browser-2.0.8.tgz",
-      "integrity": "sha512-TwZuJZj5x1x98Dg8e/Papq9NmP5smKQiHg0/N7MY+qXELsM0zJ53TsXC0Eo2J9U8Ok6jfZSRoYCp/s7mQ2zDoA==",
+      "version": "2.0.9",
+      "resolved": "https://registry.npmjs.org/@amplitude/plugin-page-view-tracking-browser/-/plugin-page-view-tracking-browser-2.0.9.tgz",
+      "integrity": "sha512-OjhAxvQ52lDcRap2sjUbYEcSM6bzeDa6SdBx6vCaeXswvjafcH9LeDPawLUHgaqvQJiAhA7lxrQ7ThfH0P6c0g==",
       "requires": {
         "@amplitude/analytics-client-common": "^2.0.5",
         "@amplitude/analytics-types": "^2.1.2",
@@ -17685,9 +17685,9 @@
       }
     },
     "@amplitude/plugin-web-attribution-browser": {
-      "version": "2.0.8",
-      "resolved": "https://registry.npmjs.org/@amplitude/plugin-web-attribution-browser/-/plugin-web-attribution-browser-2.0.8.tgz",
-      "integrity": "sha512-ZRk67ErKc+uNFKpgPEtdT+7kut3RkdiuZa52c3rX6OeUYpFpVlwWnH565AnpNh/clBPlqJPL7T90Dq0ku9QZtg==",
+      "version": "2.0.9",
+      "resolved": "https://registry.npmjs.org/@amplitude/plugin-web-attribution-browser/-/plugin-web-attribution-browser-2.0.9.tgz",
+      "integrity": "sha512-QrNgieAEXEBbtnsxYzfeJl2U/5XwCCvO3Dg0hntAtnTdu1A3HlN5ItRtoHg0jGBbu4jpSbvag72UlkCotqJ+Yg==",
       "requires": {
         "@amplitude/analytics-client-common": "^2.0.5",
         "@amplitude/analytics-core": "^2.0.4",
diff --git a/apps/block_scout_web/assets/package.json b/apps/block_scout_web/assets/package.json
index 2d7b45635a04..a643181b484a 100644
--- a/apps/block_scout_web/assets/package.json
+++ b/apps/block_scout_web/assets/package.json
@@ -20,7 +20,7 @@
   },
   "dependencies": {
     "@fortawesome/fontawesome-free": "^6.4.2",
-    "@amplitude/analytics-browser": "^2.2.2",
+    "@amplitude/analytics-browser": "^2.2.3",
     "@tarekraafat/autocomplete.js": "^10.2.7",
     "@walletconnect/web3-provider": "^1.8.0",
     "assert": "^2.0.0",

From 3842009144c9516aec3f875cdfc867bec4914056 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 4 Sep 2023 18:07:09 +0000
Subject: [PATCH 373/909] Bump photoswipe from 5.3.8 to 5.3.9 in
 /apps/block_scout_web/assets

Bumps [photoswipe](https://github.com/dimsemenov/Photoswipe) from 5.3.8 to 5.3.9.
- [Release notes](https://github.com/dimsemenov/Photoswipe/releases)
- [Commits](https://github.com/dimsemenov/Photoswipe/compare/v5.3.8...v5.3.9)

---
updated-dependencies:
- dependency-name: photoswipe
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 apps/block_scout_web/assets/package-lock.json | 14 +++++++-------
 apps/block_scout_web/assets/package.json      |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/apps/block_scout_web/assets/package-lock.json b/apps/block_scout_web/assets/package-lock.json
index 3c21a5b79f98..8a51106cda7f 100644
--- a/apps/block_scout_web/assets/package-lock.json
+++ b/apps/block_scout_web/assets/package-lock.json
@@ -54,7 +54,7 @@
         "path-parser": "^6.1.0",
         "phoenix": "file:../../../deps/phoenix",
         "phoenix_html": "file:../../../deps/phoenix_html",
-        "photoswipe": "^5.3.8",
+        "photoswipe": "^5.3.9",
         "pikaday": "^1.8.2",
         "popper.js": "^1.14.7",
         "reduce-reducers": "^1.0.4",
@@ -13366,9 +13366,9 @@
       "link": true
     },
     "node_modules/photoswipe": {
-      "version": "5.3.8",
-      "resolved": "https://registry.npmjs.org/photoswipe/-/photoswipe-5.3.8.tgz",
-      "integrity": "sha512-4vTzOQt8GP4Chsm0s+8j2xDtVHAEN252PxrU12A1zXauNn0zD5HRHgjALKO2GKTyBnTnOrJUOxbV8LTrFIMrYw==",
+      "version": "5.3.9",
+      "resolved": "https://registry.npmjs.org/photoswipe/-/photoswipe-5.3.9.tgz",
+      "integrity": "sha512-z9ACLW9472gAawrIXXiliuz9xNZ3xEl7cIPHqY/lAeFQT9X+N9sgCwa86WK9wnK8cuk/F3QEO45n+QSiZnKd2A==",
       "engines": {
         "node": ">= 0.12.0"
       }
@@ -27708,9 +27708,9 @@
       "version": "file:../../../deps/phoenix_html"
     },
     "photoswipe": {
-      "version": "5.3.8",
-      "resolved": "https://registry.npmjs.org/photoswipe/-/photoswipe-5.3.8.tgz",
-      "integrity": "sha512-4vTzOQt8GP4Chsm0s+8j2xDtVHAEN252PxrU12A1zXauNn0zD5HRHgjALKO2GKTyBnTnOrJUOxbV8LTrFIMrYw=="
+      "version": "5.3.9",
+      "resolved": "https://registry.npmjs.org/photoswipe/-/photoswipe-5.3.9.tgz",
+      "integrity": "sha512-z9ACLW9472gAawrIXXiliuz9xNZ3xEl7cIPHqY/lAeFQT9X+N9sgCwa86WK9wnK8cuk/F3QEO45n+QSiZnKd2A=="
     },
     "picocolors": {
       "version": "1.0.0",
diff --git a/apps/block_scout_web/assets/package.json b/apps/block_scout_web/assets/package.json
index a643181b484a..d0ddea92bc94 100644
--- a/apps/block_scout_web/assets/package.json
+++ b/apps/block_scout_web/assets/package.json
@@ -66,7 +66,7 @@
     "path-parser": "^6.1.0",
     "phoenix": "file:../../../deps/phoenix",
     "phoenix_html": "file:../../../deps/phoenix_html",
-    "photoswipe": "^5.3.8",
+    "photoswipe": "^5.3.9",
     "pikaday": "^1.8.2",
     "popper.js": "^1.14.7",
     "reduce-reducers": "^1.0.4",

From a0333dca482af4209a60ee152d73969ae36f8ea5 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 4 Sep 2023 18:07:30 +0000
Subject: [PATCH 374/909] Bump @babel/preset-env in
 /apps/block_scout_web/assets

Bumps [@babel/preset-env](https://github.com/babel/babel/tree/HEAD/packages/babel-preset-env) from 7.22.14 to 7.22.15.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/commits/v7.22.15/packages/babel-preset-env)

---
updated-dependencies:
- dependency-name: "@babel/preset-env"
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 apps/block_scout_web/assets/package-lock.json | 318 +++++++++---------
 apps/block_scout_web/assets/package.json      |   2 +-
 2 files changed, 160 insertions(+), 160 deletions(-)

diff --git a/apps/block_scout_web/assets/package-lock.json b/apps/block_scout_web/assets/package-lock.json
index 3c21a5b79f98..c340e13d0534 100644
--- a/apps/block_scout_web/assets/package-lock.json
+++ b/apps/block_scout_web/assets/package-lock.json
@@ -72,7 +72,7 @@
       },
       "devDependencies": {
         "@babel/core": "^7.22.11",
-        "@babel/preset-env": "^7.22.14",
+        "@babel/preset-env": "^7.22.15",
         "autoprefixer": "^10.4.15",
         "babel-loader": "^9.1.3",
         "copy-webpack-plugin": "^11.0.0",
@@ -315,12 +315,12 @@
       }
     },
     "node_modules/@babel/helper-compilation-targets": {
-      "version": "7.22.10",
-      "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.22.10.tgz",
-      "integrity": "sha512-JMSwHD4J7SLod0idLq5PKgI+6g/hLD/iuWBq08ZX49xE14VpVEojJ5rHWptpirV2j020MvypRLAXAO50igCJ5Q==",
+      "version": "7.22.15",
+      "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.22.15.tgz",
+      "integrity": "sha512-y6EEzULok0Qvz8yyLkCvVX+02ic+By2UdOhylwUOvOn9dvYc9mKICJuuU1n1XBI02YWsNsnrY1kc6DVbjcXbtw==",
       "dependencies": {
         "@babel/compat-data": "^7.22.9",
-        "@babel/helper-validator-option": "^7.22.5",
+        "@babel/helper-validator-option": "^7.22.15",
         "browserslist": "^4.21.9",
         "lru-cache": "^5.1.1",
         "semver": "^6.3.1"
@@ -442,26 +442,26 @@
       }
     },
     "node_modules/@babel/helper-module-imports": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.22.5.tgz",
-      "integrity": "sha512-8Dl6+HD/cKifutF5qGd/8ZJi84QeAKh+CEe1sBzz8UayBBGg1dAIJrdHOcOM5b2MpzWL2yuotJTtGjETq0qjXg==",
+      "version": "7.22.15",
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.22.15.tgz",
+      "integrity": "sha512-0pYVBnDKZO2fnSPCrgM/6WMc7eS20Fbok+0r88fp+YtWVLZrp4CkafFGIp+W0VKw4a22sgebPT99y+FDNMdP4w==",
       "dependencies": {
-        "@babel/types": "^7.22.5"
+        "@babel/types": "^7.22.15"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-module-transforms": {
-      "version": "7.22.9",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.22.9.tgz",
-      "integrity": "sha512-t+WA2Xn5K+rTeGtC8jCsdAH52bjggG5TKRuRrAGNM/mjIbO4GxvlLMFOEz9wXY5I2XQ60PMFsAG2WIcG82dQMQ==",
+      "version": "7.22.15",
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.22.15.tgz",
+      "integrity": "sha512-l1UiX4UyHSFsYt17iQ3Se5pQQZZHa22zyIXURmvkmLCD4t/aU+dvNWHatKac/D9Vm9UES7nvIqHs4jZqKviUmQ==",
       "dependencies": {
         "@babel/helper-environment-visitor": "^7.22.5",
-        "@babel/helper-module-imports": "^7.22.5",
+        "@babel/helper-module-imports": "^7.22.15",
         "@babel/helper-simple-access": "^7.22.5",
         "@babel/helper-split-export-declaration": "^7.22.6",
-        "@babel/helper-validator-identifier": "^7.22.5"
+        "@babel/helper-validator-identifier": "^7.22.15"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -567,17 +567,17 @@
       }
     },
     "node_modules/@babel/helper-validator-identifier": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.5.tgz",
-      "integrity": "sha512-aJXu+6lErq8ltp+JhkJUfk1MTGyuA4v7f3pA+BJ5HLfNC6nAQ0Cpi9uOquUj8Hehg0aUiHzWQbOVJGao6ztBAQ==",
+      "version": "7.22.15",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.15.tgz",
+      "integrity": "sha512-4E/F9IIEi8WR94324mbDUMo074YTheJmd7eZF5vITTeYchqAi6sYXRLHUVsmkdmY4QjfKTcB2jB7dVP3NaBElQ==",
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-validator-option": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.22.5.tgz",
-      "integrity": "sha512-R3oB6xlIVKUnxNUxbmgq7pKjxpru24zlimpE8WK47fACIlM0II/Hm1RS8IaOI7NgCr6LNS+jl5l75m20npAziw==",
+      "version": "7.22.15",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.22.15.tgz",
+      "integrity": "sha512-bMn7RmyFjY/mdECUbgn9eoSY4vqvacUnS9i9vGAGttgFWesO6B4CYWA7XlpbWgBt71iv/hfbPlynohStqnu5hA==",
       "engines": {
         "node": ">=6.9.0"
       }
@@ -634,9 +634,9 @@
       }
     },
     "node_modules/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.22.5.tgz",
-      "integrity": "sha512-NP1M5Rf+u2Gw9qfSO4ihjcTGW5zXTi36ITLd4/EoAcEhIZ0yjMqmftDNl3QC19CX7olhrjpyU454g/2W7X0jvQ==",
+      "version": "7.22.15",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.22.15.tgz",
+      "integrity": "sha512-FB9iYlz7rURmRJyXRKEnalYPPdn87H5no108cyuQQyMwlpJ2SJtpIUBI27kdTin956pz+LPypkPVPUTlxOmrsg==",
       "dev": true,
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.22.5"
@@ -649,14 +649,14 @@
       }
     },
     "node_modules/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.22.5.tgz",
-      "integrity": "sha512-31Bb65aZaUwqCbWMnZPduIZxCBngHFlzyN6Dq6KAJjtx+lx6ohKHubc61OomYi7XwVD4Ol0XCVz4h+pYFR048g==",
+      "version": "7.22.15",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.22.15.tgz",
+      "integrity": "sha512-Hyph9LseGvAeeXzikV88bczhsrLrIZqDPxO+sSmAunMPaGrBGhfMWzCPYTtiW9t+HzSE2wtV8e5cc5P6r1xMDQ==",
       "dev": true,
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.22.5",
         "@babel/helper-skip-transparent-expression-wrappers": "^7.22.5",
-        "@babel/plugin-transform-optional-chaining": "^7.22.5"
+        "@babel/plugin-transform-optional-chaining": "^7.22.15"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -970,9 +970,9 @@
       }
     },
     "node_modules/@babel/plugin-transform-async-generator-functions": {
-      "version": "7.22.11",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-generator-functions/-/plugin-transform-async-generator-functions-7.22.11.tgz",
-      "integrity": "sha512-0pAlmeRJn6wU84zzZsEOx1JV1Jf8fqO9ok7wofIJwUnplYo247dcd24P+cMJht7ts9xkzdtB0EPHmOb7F+KzXw==",
+      "version": "7.22.15",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-generator-functions/-/plugin-transform-async-generator-functions-7.22.15.tgz",
+      "integrity": "sha512-jBm1Es25Y+tVoTi5rfd5t1KLmL8ogLKpXszboWOTTtGFGz2RKnQe2yn7HbZ+kb/B8N0FVSGQo874NSlOU1T4+w==",
       "dev": true,
       "dependencies": {
         "@babel/helper-environment-visitor": "^7.22.5",
@@ -1020,9 +1020,9 @@
       }
     },
     "node_modules/@babel/plugin-transform-block-scoping": {
-      "version": "7.22.10",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.22.10.tgz",
-      "integrity": "sha512-1+kVpGAOOI1Albt6Vse7c8pHzcZQdQKW+wJH+g8mCaszOdDVwRXa/slHPqIw+oJAJANTKDMuM2cBdV0Dg618Vg==",
+      "version": "7.22.15",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.22.15.tgz",
+      "integrity": "sha512-G1czpdJBZCtngoK1sJgloLiOHUnkb/bLZwqVZD8kXmq0ZnVfTTWUcs9OWtp0mBtYJ+4LQY1fllqBkOIPhXmFmw==",
       "dev": true,
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.22.5"
@@ -1068,18 +1068,18 @@
       }
     },
     "node_modules/@babel/plugin-transform-classes": {
-      "version": "7.22.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.22.6.tgz",
-      "integrity": "sha512-58EgM6nuPNG6Py4Z3zSuu0xWu2VfodiMi72Jt5Kj2FECmaYk1RrTXA45z6KBFsu9tRgwQDwIiY4FXTt+YsSFAQ==",
+      "version": "7.22.15",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.22.15.tgz",
+      "integrity": "sha512-VbbC3PGjBdE0wAWDdHM9G8Gm977pnYI0XpqMd6LrKISj8/DJXEsWqgRuTYaNE9Bv0JGhTZUzHDlMk18IpOuoqw==",
       "dev": true,
       "dependencies": {
         "@babel/helper-annotate-as-pure": "^7.22.5",
-        "@babel/helper-compilation-targets": "^7.22.6",
+        "@babel/helper-compilation-targets": "^7.22.15",
         "@babel/helper-environment-visitor": "^7.22.5",
         "@babel/helper-function-name": "^7.22.5",
         "@babel/helper-optimise-call-expression": "^7.22.5",
         "@babel/helper-plugin-utils": "^7.22.5",
-        "@babel/helper-replace-supers": "^7.22.5",
+        "@babel/helper-replace-supers": "^7.22.9",
         "@babel/helper-split-export-declaration": "^7.22.6",
         "globals": "^11.1.0"
       },
@@ -1107,9 +1107,9 @@
       }
     },
     "node_modules/@babel/plugin-transform-destructuring": {
-      "version": "7.22.10",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.22.10.tgz",
-      "integrity": "sha512-dPJrL0VOyxqLM9sritNbMSGx/teueHF/htMKrPT7DNxccXxRDPYqlgPFFdr8u+F+qUZOkZoXue/6rL5O5GduEw==",
+      "version": "7.22.15",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.22.15.tgz",
+      "integrity": "sha512-HzG8sFl1ZVGTme74Nw+X01XsUTqERVQ6/RLHo3XjGRzm7XD6QTtfS3NJotVgCGy8BzkDqRjRBD8dAyJn5TuvSQ==",
       "dev": true,
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.22.5"
@@ -1201,9 +1201,9 @@
       }
     },
     "node_modules/@babel/plugin-transform-for-of": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.22.5.tgz",
-      "integrity": "sha512-3kxQjX1dU9uudwSshyLeEipvrLjBCVthCgeTp6CzE/9JYrlAIaeekVxRpCWsDDfYTfRZRoCeZatCQvwo+wvK8A==",
+      "version": "7.22.15",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.22.15.tgz",
+      "integrity": "sha512-me6VGeHsx30+xh9fbDLLPi0J1HzmeIIyenoOQHuw2D4m2SAU3NrspX5XxJLBpqn5yrLzrlw2Iy3RA//Bx27iOA==",
       "dev": true,
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.22.5"
@@ -1311,12 +1311,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-modules-commonjs": {
-      "version": "7.22.11",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.22.11.tgz",
-      "integrity": "sha512-o2+bg7GDS60cJMgz9jWqRUsWkMzLCxp+jFDeDUT5sjRlAxcJWZ2ylNdI7QQ2+CH5hWu7OnN+Cv3htt7AkSf96g==",
+      "version": "7.22.15",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.22.15.tgz",
+      "integrity": "sha512-jWL4eh90w0HQOTKP2MoXXUpVxilxsB2Vl4ji69rSjS3EcZ/v4sBmn+A3NpepuJzBhOaEBbR7udonlHHn5DWidg==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-module-transforms": "^7.22.9",
+        "@babel/helper-module-transforms": "^7.22.15",
         "@babel/helper-plugin-utils": "^7.22.5",
         "@babel/helper-simple-access": "^7.22.5"
       },
@@ -1425,16 +1425,16 @@
       }
     },
     "node_modules/@babel/plugin-transform-object-rest-spread": {
-      "version": "7.22.11",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-rest-spread/-/plugin-transform-object-rest-spread-7.22.11.tgz",
-      "integrity": "sha512-nX8cPFa6+UmbepISvlf5jhQyaC7ASs/7UxHmMkuJ/k5xSHvDPPaibMo+v3TXwU/Pjqhep/nFNpd3zn4YR59pnw==",
+      "version": "7.22.15",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-rest-spread/-/plugin-transform-object-rest-spread-7.22.15.tgz",
+      "integrity": "sha512-fEB+I1+gAmfAyxZcX1+ZUwLeAuuf8VIg67CTznZE0MqVFumWkh8xWtn58I4dxdVf080wn7gzWoF8vndOViJe9Q==",
       "dev": true,
       "dependencies": {
         "@babel/compat-data": "^7.22.9",
-        "@babel/helper-compilation-targets": "^7.22.10",
+        "@babel/helper-compilation-targets": "^7.22.15",
         "@babel/helper-plugin-utils": "^7.22.5",
         "@babel/plugin-syntax-object-rest-spread": "^7.8.3",
-        "@babel/plugin-transform-parameters": "^7.22.5"
+        "@babel/plugin-transform-parameters": "^7.22.15"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1476,9 +1476,9 @@
       }
     },
     "node_modules/@babel/plugin-transform-optional-chaining": {
-      "version": "7.22.12",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-optional-chaining/-/plugin-transform-optional-chaining-7.22.12.tgz",
-      "integrity": "sha512-7XXCVqZtyFWqjDsYDY4T45w4mlx1rf7aOgkc/Ww76xkgBiOlmjPkx36PBLHa1k1rwWvVgYMPsbuVnIamx2ZQJw==",
+      "version": "7.22.15",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-optional-chaining/-/plugin-transform-optional-chaining-7.22.15.tgz",
+      "integrity": "sha512-ngQ2tBhq5vvSJw2Q2Z9i7ealNkpDMU0rGWnHPKqRZO0tzZ5tlaoz4hDvhXioOoaE0X2vfNss1djwg0DXlfu30A==",
       "dev": true,
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.22.5",
@@ -1493,9 +1493,9 @@
       }
     },
     "node_modules/@babel/plugin-transform-parameters": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.22.5.tgz",
-      "integrity": "sha512-AVkFUBurORBREOmHRKo06FjHYgjrabpdqRSwq6+C7R5iTCZOsM4QbcB27St0a4U6fffyAOqh3s/qEfybAhfivg==",
+      "version": "7.22.15",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.22.15.tgz",
+      "integrity": "sha512-hjk7qKIqhyzhhUvRT683TYQOFa/4cQKwQy7ALvTpODswN40MljzNDa0YldevS6tGbxwaEKVn502JmY0dP7qEtQ==",
       "dev": true,
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.22.5"
@@ -1758,17 +1758,17 @@
       }
     },
     "node_modules/@babel/preset-env": {
-      "version": "7.22.14",
-      "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.22.14.tgz",
-      "integrity": "sha512-daodMIoVo+ol/g+//c/AH+szBkFj4STQUikvBijRGL72Ph+w+AMTSh55DUETe8KJlPlDT1k/mp7NBfOuiWmoig==",
+      "version": "7.22.15",
+      "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.22.15.tgz",
+      "integrity": "sha512-tZFHr54GBkHk6hQuVA8w4Fmq+MSPsfvMG0vPnOYyTnJpyfMqybL8/MbNCPRT9zc2KBO2pe4tq15g6Uno4Jpoag==",
       "dev": true,
       "dependencies": {
         "@babel/compat-data": "^7.22.9",
-        "@babel/helper-compilation-targets": "^7.22.10",
+        "@babel/helper-compilation-targets": "^7.22.15",
         "@babel/helper-plugin-utils": "^7.22.5",
-        "@babel/helper-validator-option": "^7.22.5",
-        "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": "^7.22.5",
-        "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": "^7.22.5",
+        "@babel/helper-validator-option": "^7.22.15",
+        "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": "^7.22.15",
+        "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": "^7.22.15",
         "@babel/plugin-proposal-private-property-in-object": "7.21.0-placeholder-for-preset-env.2",
         "@babel/plugin-syntax-async-generators": "^7.8.4",
         "@babel/plugin-syntax-class-properties": "^7.12.13",
@@ -1789,39 +1789,39 @@
         "@babel/plugin-syntax-top-level-await": "^7.14.5",
         "@babel/plugin-syntax-unicode-sets-regex": "^7.18.6",
         "@babel/plugin-transform-arrow-functions": "^7.22.5",
-        "@babel/plugin-transform-async-generator-functions": "^7.22.11",
+        "@babel/plugin-transform-async-generator-functions": "^7.22.15",
         "@babel/plugin-transform-async-to-generator": "^7.22.5",
         "@babel/plugin-transform-block-scoped-functions": "^7.22.5",
-        "@babel/plugin-transform-block-scoping": "^7.22.10",
+        "@babel/plugin-transform-block-scoping": "^7.22.15",
         "@babel/plugin-transform-class-properties": "^7.22.5",
         "@babel/plugin-transform-class-static-block": "^7.22.11",
-        "@babel/plugin-transform-classes": "^7.22.6",
+        "@babel/plugin-transform-classes": "^7.22.15",
         "@babel/plugin-transform-computed-properties": "^7.22.5",
-        "@babel/plugin-transform-destructuring": "^7.22.10",
+        "@babel/plugin-transform-destructuring": "^7.22.15",
         "@babel/plugin-transform-dotall-regex": "^7.22.5",
         "@babel/plugin-transform-duplicate-keys": "^7.22.5",
         "@babel/plugin-transform-dynamic-import": "^7.22.11",
         "@babel/plugin-transform-exponentiation-operator": "^7.22.5",
         "@babel/plugin-transform-export-namespace-from": "^7.22.11",
-        "@babel/plugin-transform-for-of": "^7.22.5",
+        "@babel/plugin-transform-for-of": "^7.22.15",
         "@babel/plugin-transform-function-name": "^7.22.5",
         "@babel/plugin-transform-json-strings": "^7.22.11",
         "@babel/plugin-transform-literals": "^7.22.5",
         "@babel/plugin-transform-logical-assignment-operators": "^7.22.11",
         "@babel/plugin-transform-member-expression-literals": "^7.22.5",
         "@babel/plugin-transform-modules-amd": "^7.22.5",
-        "@babel/plugin-transform-modules-commonjs": "^7.22.11",
+        "@babel/plugin-transform-modules-commonjs": "^7.22.15",
         "@babel/plugin-transform-modules-systemjs": "^7.22.11",
         "@babel/plugin-transform-modules-umd": "^7.22.5",
         "@babel/plugin-transform-named-capturing-groups-regex": "^7.22.5",
         "@babel/plugin-transform-new-target": "^7.22.5",
         "@babel/plugin-transform-nullish-coalescing-operator": "^7.22.11",
         "@babel/plugin-transform-numeric-separator": "^7.22.11",
-        "@babel/plugin-transform-object-rest-spread": "^7.22.11",
+        "@babel/plugin-transform-object-rest-spread": "^7.22.15",
         "@babel/plugin-transform-object-super": "^7.22.5",
         "@babel/plugin-transform-optional-catch-binding": "^7.22.11",
-        "@babel/plugin-transform-optional-chaining": "^7.22.12",
-        "@babel/plugin-transform-parameters": "^7.22.5",
+        "@babel/plugin-transform-optional-chaining": "^7.22.15",
+        "@babel/plugin-transform-parameters": "^7.22.15",
         "@babel/plugin-transform-private-methods": "^7.22.5",
         "@babel/plugin-transform-private-property-in-object": "^7.22.11",
         "@babel/plugin-transform-property-literals": "^7.22.5",
@@ -1837,7 +1837,7 @@
         "@babel/plugin-transform-unicode-regex": "^7.22.5",
         "@babel/plugin-transform-unicode-sets-regex": "^7.22.5",
         "@babel/preset-modules": "0.1.6-no-external-plugins",
-        "@babel/types": "^7.22.11",
+        "@babel/types": "^7.22.15",
         "babel-plugin-polyfill-corejs2": "^0.4.5",
         "babel-plugin-polyfill-corejs3": "^0.8.3",
         "babel-plugin-polyfill-regenerator": "^0.5.2",
@@ -1958,12 +1958,12 @@
       }
     },
     "node_modules/@babel/types": {
-      "version": "7.22.11",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.22.11.tgz",
-      "integrity": "sha512-siazHiGuZRz9aB9NpHy9GOs9xiQPKnMzgdr493iI1M67vRXpnEq8ZOOKzezC5q7zwuQ6sDhdSp4SD9ixKSqKZg==",
+      "version": "7.22.15",
+      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.22.15.tgz",
+      "integrity": "sha512-X+NLXr0N8XXmN5ZsaQdm9U2SSC3UbIYq/doL++sueHOTisgZHoKaQtZxGuV2cUPQHMfjKEfg/g6oy7Hm6SKFtA==",
       "dependencies": {
         "@babel/helper-string-parser": "^7.22.5",
-        "@babel/helper-validator-identifier": "^7.22.5",
+        "@babel/helper-validator-identifier": "^7.22.15",
         "to-fast-properties": "^2.0.0"
       },
       "engines": {
@@ -17787,12 +17787,12 @@
       }
     },
     "@babel/helper-compilation-targets": {
-      "version": "7.22.10",
-      "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.22.10.tgz",
-      "integrity": "sha512-JMSwHD4J7SLod0idLq5PKgI+6g/hLD/iuWBq08ZX49xE14VpVEojJ5rHWptpirV2j020MvypRLAXAO50igCJ5Q==",
+      "version": "7.22.15",
+      "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.22.15.tgz",
+      "integrity": "sha512-y6EEzULok0Qvz8yyLkCvVX+02ic+By2UdOhylwUOvOn9dvYc9mKICJuuU1n1XBI02YWsNsnrY1kc6DVbjcXbtw==",
       "requires": {
         "@babel/compat-data": "^7.22.9",
-        "@babel/helper-validator-option": "^7.22.5",
+        "@babel/helper-validator-option": "^7.22.15",
         "browserslist": "^4.21.9",
         "lru-cache": "^5.1.1",
         "semver": "^6.3.1"
@@ -17886,23 +17886,23 @@
       }
     },
     "@babel/helper-module-imports": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.22.5.tgz",
-      "integrity": "sha512-8Dl6+HD/cKifutF5qGd/8ZJi84QeAKh+CEe1sBzz8UayBBGg1dAIJrdHOcOM5b2MpzWL2yuotJTtGjETq0qjXg==",
+      "version": "7.22.15",
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.22.15.tgz",
+      "integrity": "sha512-0pYVBnDKZO2fnSPCrgM/6WMc7eS20Fbok+0r88fp+YtWVLZrp4CkafFGIp+W0VKw4a22sgebPT99y+FDNMdP4w==",
       "requires": {
-        "@babel/types": "^7.22.5"
+        "@babel/types": "^7.22.15"
       }
     },
     "@babel/helper-module-transforms": {
-      "version": "7.22.9",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.22.9.tgz",
-      "integrity": "sha512-t+WA2Xn5K+rTeGtC8jCsdAH52bjggG5TKRuRrAGNM/mjIbO4GxvlLMFOEz9wXY5I2XQ60PMFsAG2WIcG82dQMQ==",
+      "version": "7.22.15",
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.22.15.tgz",
+      "integrity": "sha512-l1UiX4UyHSFsYt17iQ3Se5pQQZZHa22zyIXURmvkmLCD4t/aU+dvNWHatKac/D9Vm9UES7nvIqHs4jZqKviUmQ==",
       "requires": {
         "@babel/helper-environment-visitor": "^7.22.5",
-        "@babel/helper-module-imports": "^7.22.5",
+        "@babel/helper-module-imports": "^7.22.15",
         "@babel/helper-simple-access": "^7.22.5",
         "@babel/helper-split-export-declaration": "^7.22.6",
-        "@babel/helper-validator-identifier": "^7.22.5"
+        "@babel/helper-validator-identifier": "^7.22.15"
       }
     },
     "@babel/helper-optimise-call-expression": {
@@ -17972,14 +17972,14 @@
       "integrity": "sha512-mM4COjgZox8U+JcXQwPijIZLElkgEpO5rsERVDJTc2qfCDfERyob6k5WegS14SX18IIjv+XD+GrqNumY5JRCDw=="
     },
     "@babel/helper-validator-identifier": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.5.tgz",
-      "integrity": "sha512-aJXu+6lErq8ltp+JhkJUfk1MTGyuA4v7f3pA+BJ5HLfNC6nAQ0Cpi9uOquUj8Hehg0aUiHzWQbOVJGao6ztBAQ=="
+      "version": "7.22.15",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.15.tgz",
+      "integrity": "sha512-4E/F9IIEi8WR94324mbDUMo074YTheJmd7eZF5vITTeYchqAi6sYXRLHUVsmkdmY4QjfKTcB2jB7dVP3NaBElQ=="
     },
     "@babel/helper-validator-option": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.22.5.tgz",
-      "integrity": "sha512-R3oB6xlIVKUnxNUxbmgq7pKjxpru24zlimpE8WK47fACIlM0II/Hm1RS8IaOI7NgCr6LNS+jl5l75m20npAziw=="
+      "version": "7.22.15",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.22.15.tgz",
+      "integrity": "sha512-bMn7RmyFjY/mdECUbgn9eoSY4vqvacUnS9i9vGAGttgFWesO6B4CYWA7XlpbWgBt71iv/hfbPlynohStqnu5hA=="
     },
     "@babel/helper-wrap-function": {
       "version": "7.22.10",
@@ -18018,23 +18018,23 @@
       "integrity": "sha512-R5zb8eJIBPJriQtbH/htEQy4k7E2dHWlD2Y2VT07JCzwYZHBxV5ZYtM0UhXSNMT74LyxuM+b1jdL7pSesXbC/g=="
     },
     "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.22.5.tgz",
-      "integrity": "sha512-NP1M5Rf+u2Gw9qfSO4ihjcTGW5zXTi36ITLd4/EoAcEhIZ0yjMqmftDNl3QC19CX7olhrjpyU454g/2W7X0jvQ==",
+      "version": "7.22.15",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.22.15.tgz",
+      "integrity": "sha512-FB9iYlz7rURmRJyXRKEnalYPPdn87H5no108cyuQQyMwlpJ2SJtpIUBI27kdTin956pz+LPypkPVPUTlxOmrsg==",
       "dev": true,
       "requires": {
         "@babel/helper-plugin-utils": "^7.22.5"
       }
     },
     "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.22.5.tgz",
-      "integrity": "sha512-31Bb65aZaUwqCbWMnZPduIZxCBngHFlzyN6Dq6KAJjtx+lx6ohKHubc61OomYi7XwVD4Ol0XCVz4h+pYFR048g==",
+      "version": "7.22.15",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.22.15.tgz",
+      "integrity": "sha512-Hyph9LseGvAeeXzikV88bczhsrLrIZqDPxO+sSmAunMPaGrBGhfMWzCPYTtiW9t+HzSE2wtV8e5cc5P6r1xMDQ==",
       "dev": true,
       "requires": {
         "@babel/helper-plugin-utils": "^7.22.5",
         "@babel/helper-skip-transparent-expression-wrappers": "^7.22.5",
-        "@babel/plugin-transform-optional-chaining": "^7.22.5"
+        "@babel/plugin-transform-optional-chaining": "^7.22.15"
       }
     },
     "@babel/plugin-proposal-private-property-in-object": {
@@ -18244,9 +18244,9 @@
       }
     },
     "@babel/plugin-transform-async-generator-functions": {
-      "version": "7.22.11",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-generator-functions/-/plugin-transform-async-generator-functions-7.22.11.tgz",
-      "integrity": "sha512-0pAlmeRJn6wU84zzZsEOx1JV1Jf8fqO9ok7wofIJwUnplYo247dcd24P+cMJht7ts9xkzdtB0EPHmOb7F+KzXw==",
+      "version": "7.22.15",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-generator-functions/-/plugin-transform-async-generator-functions-7.22.15.tgz",
+      "integrity": "sha512-jBm1Es25Y+tVoTi5rfd5t1KLmL8ogLKpXszboWOTTtGFGz2RKnQe2yn7HbZ+kb/B8N0FVSGQo874NSlOU1T4+w==",
       "dev": true,
       "requires": {
         "@babel/helper-environment-visitor": "^7.22.5",
@@ -18276,9 +18276,9 @@
       }
     },
     "@babel/plugin-transform-block-scoping": {
-      "version": "7.22.10",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.22.10.tgz",
-      "integrity": "sha512-1+kVpGAOOI1Albt6Vse7c8pHzcZQdQKW+wJH+g8mCaszOdDVwRXa/slHPqIw+oJAJANTKDMuM2cBdV0Dg618Vg==",
+      "version": "7.22.15",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.22.15.tgz",
+      "integrity": "sha512-G1czpdJBZCtngoK1sJgloLiOHUnkb/bLZwqVZD8kXmq0ZnVfTTWUcs9OWtp0mBtYJ+4LQY1fllqBkOIPhXmFmw==",
       "dev": true,
       "requires": {
         "@babel/helper-plugin-utils": "^7.22.5"
@@ -18306,18 +18306,18 @@
       }
     },
     "@babel/plugin-transform-classes": {
-      "version": "7.22.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.22.6.tgz",
-      "integrity": "sha512-58EgM6nuPNG6Py4Z3zSuu0xWu2VfodiMi72Jt5Kj2FECmaYk1RrTXA45z6KBFsu9tRgwQDwIiY4FXTt+YsSFAQ==",
+      "version": "7.22.15",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.22.15.tgz",
+      "integrity": "sha512-VbbC3PGjBdE0wAWDdHM9G8Gm977pnYI0XpqMd6LrKISj8/DJXEsWqgRuTYaNE9Bv0JGhTZUzHDlMk18IpOuoqw==",
       "dev": true,
       "requires": {
         "@babel/helper-annotate-as-pure": "^7.22.5",
-        "@babel/helper-compilation-targets": "^7.22.6",
+        "@babel/helper-compilation-targets": "^7.22.15",
         "@babel/helper-environment-visitor": "^7.22.5",
         "@babel/helper-function-name": "^7.22.5",
         "@babel/helper-optimise-call-expression": "^7.22.5",
         "@babel/helper-plugin-utils": "^7.22.5",
-        "@babel/helper-replace-supers": "^7.22.5",
+        "@babel/helper-replace-supers": "^7.22.9",
         "@babel/helper-split-export-declaration": "^7.22.6",
         "globals": "^11.1.0"
       }
@@ -18333,9 +18333,9 @@
       }
     },
     "@babel/plugin-transform-destructuring": {
-      "version": "7.22.10",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.22.10.tgz",
-      "integrity": "sha512-dPJrL0VOyxqLM9sritNbMSGx/teueHF/htMKrPT7DNxccXxRDPYqlgPFFdr8u+F+qUZOkZoXue/6rL5O5GduEw==",
+      "version": "7.22.15",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.22.15.tgz",
+      "integrity": "sha512-HzG8sFl1ZVGTme74Nw+X01XsUTqERVQ6/RLHo3XjGRzm7XD6QTtfS3NJotVgCGy8BzkDqRjRBD8dAyJn5TuvSQ==",
       "dev": true,
       "requires": {
         "@babel/helper-plugin-utils": "^7.22.5"
@@ -18391,9 +18391,9 @@
       }
     },
     "@babel/plugin-transform-for-of": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.22.5.tgz",
-      "integrity": "sha512-3kxQjX1dU9uudwSshyLeEipvrLjBCVthCgeTp6CzE/9JYrlAIaeekVxRpCWsDDfYTfRZRoCeZatCQvwo+wvK8A==",
+      "version": "7.22.15",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.22.15.tgz",
+      "integrity": "sha512-me6VGeHsx30+xh9fbDLLPi0J1HzmeIIyenoOQHuw2D4m2SAU3NrspX5XxJLBpqn5yrLzrlw2Iy3RA//Bx27iOA==",
       "dev": true,
       "requires": {
         "@babel/helper-plugin-utils": "^7.22.5"
@@ -18459,12 +18459,12 @@
       }
     },
     "@babel/plugin-transform-modules-commonjs": {
-      "version": "7.22.11",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.22.11.tgz",
-      "integrity": "sha512-o2+bg7GDS60cJMgz9jWqRUsWkMzLCxp+jFDeDUT5sjRlAxcJWZ2ylNdI7QQ2+CH5hWu7OnN+Cv3htt7AkSf96g==",
+      "version": "7.22.15",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.22.15.tgz",
+      "integrity": "sha512-jWL4eh90w0HQOTKP2MoXXUpVxilxsB2Vl4ji69rSjS3EcZ/v4sBmn+A3NpepuJzBhOaEBbR7udonlHHn5DWidg==",
       "dev": true,
       "requires": {
-        "@babel/helper-module-transforms": "^7.22.9",
+        "@babel/helper-module-transforms": "^7.22.15",
         "@babel/helper-plugin-utils": "^7.22.5",
         "@babel/helper-simple-access": "^7.22.5"
       }
@@ -18531,16 +18531,16 @@
       }
     },
     "@babel/plugin-transform-object-rest-spread": {
-      "version": "7.22.11",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-rest-spread/-/plugin-transform-object-rest-spread-7.22.11.tgz",
-      "integrity": "sha512-nX8cPFa6+UmbepISvlf5jhQyaC7ASs/7UxHmMkuJ/k5xSHvDPPaibMo+v3TXwU/Pjqhep/nFNpd3zn4YR59pnw==",
+      "version": "7.22.15",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-rest-spread/-/plugin-transform-object-rest-spread-7.22.15.tgz",
+      "integrity": "sha512-fEB+I1+gAmfAyxZcX1+ZUwLeAuuf8VIg67CTznZE0MqVFumWkh8xWtn58I4dxdVf080wn7gzWoF8vndOViJe9Q==",
       "dev": true,
       "requires": {
         "@babel/compat-data": "^7.22.9",
-        "@babel/helper-compilation-targets": "^7.22.10",
+        "@babel/helper-compilation-targets": "^7.22.15",
         "@babel/helper-plugin-utils": "^7.22.5",
         "@babel/plugin-syntax-object-rest-spread": "^7.8.3",
-        "@babel/plugin-transform-parameters": "^7.22.5"
+        "@babel/plugin-transform-parameters": "^7.22.15"
       }
     },
     "@babel/plugin-transform-object-super": {
@@ -18564,9 +18564,9 @@
       }
     },
     "@babel/plugin-transform-optional-chaining": {
-      "version": "7.22.12",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-optional-chaining/-/plugin-transform-optional-chaining-7.22.12.tgz",
-      "integrity": "sha512-7XXCVqZtyFWqjDsYDY4T45w4mlx1rf7aOgkc/Ww76xkgBiOlmjPkx36PBLHa1k1rwWvVgYMPsbuVnIamx2ZQJw==",
+      "version": "7.22.15",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-optional-chaining/-/plugin-transform-optional-chaining-7.22.15.tgz",
+      "integrity": "sha512-ngQ2tBhq5vvSJw2Q2Z9i7ealNkpDMU0rGWnHPKqRZO0tzZ5tlaoz4hDvhXioOoaE0X2vfNss1djwg0DXlfu30A==",
       "dev": true,
       "requires": {
         "@babel/helper-plugin-utils": "^7.22.5",
@@ -18575,9 +18575,9 @@
       }
     },
     "@babel/plugin-transform-parameters": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.22.5.tgz",
-      "integrity": "sha512-AVkFUBurORBREOmHRKo06FjHYgjrabpdqRSwq6+C7R5iTCZOsM4QbcB27St0a4U6fffyAOqh3s/qEfybAhfivg==",
+      "version": "7.22.15",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.22.15.tgz",
+      "integrity": "sha512-hjk7qKIqhyzhhUvRT683TYQOFa/4cQKwQy7ALvTpODswN40MljzNDa0YldevS6tGbxwaEKVn502JmY0dP7qEtQ==",
       "dev": true,
       "requires": {
         "@babel/helper-plugin-utils": "^7.22.5"
@@ -18743,17 +18743,17 @@
       }
     },
     "@babel/preset-env": {
-      "version": "7.22.14",
-      "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.22.14.tgz",
-      "integrity": "sha512-daodMIoVo+ol/g+//c/AH+szBkFj4STQUikvBijRGL72Ph+w+AMTSh55DUETe8KJlPlDT1k/mp7NBfOuiWmoig==",
+      "version": "7.22.15",
+      "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.22.15.tgz",
+      "integrity": "sha512-tZFHr54GBkHk6hQuVA8w4Fmq+MSPsfvMG0vPnOYyTnJpyfMqybL8/MbNCPRT9zc2KBO2pe4tq15g6Uno4Jpoag==",
       "dev": true,
       "requires": {
         "@babel/compat-data": "^7.22.9",
-        "@babel/helper-compilation-targets": "^7.22.10",
+        "@babel/helper-compilation-targets": "^7.22.15",
         "@babel/helper-plugin-utils": "^7.22.5",
-        "@babel/helper-validator-option": "^7.22.5",
-        "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": "^7.22.5",
-        "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": "^7.22.5",
+        "@babel/helper-validator-option": "^7.22.15",
+        "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": "^7.22.15",
+        "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": "^7.22.15",
         "@babel/plugin-proposal-private-property-in-object": "7.21.0-placeholder-for-preset-env.2",
         "@babel/plugin-syntax-async-generators": "^7.8.4",
         "@babel/plugin-syntax-class-properties": "^7.12.13",
@@ -18774,39 +18774,39 @@
         "@babel/plugin-syntax-top-level-await": "^7.14.5",
         "@babel/plugin-syntax-unicode-sets-regex": "^7.18.6",
         "@babel/plugin-transform-arrow-functions": "^7.22.5",
-        "@babel/plugin-transform-async-generator-functions": "^7.22.11",
+        "@babel/plugin-transform-async-generator-functions": "^7.22.15",
         "@babel/plugin-transform-async-to-generator": "^7.22.5",
         "@babel/plugin-transform-block-scoped-functions": "^7.22.5",
-        "@babel/plugin-transform-block-scoping": "^7.22.10",
+        "@babel/plugin-transform-block-scoping": "^7.22.15",
         "@babel/plugin-transform-class-properties": "^7.22.5",
         "@babel/plugin-transform-class-static-block": "^7.22.11",
-        "@babel/plugin-transform-classes": "^7.22.6",
+        "@babel/plugin-transform-classes": "^7.22.15",
         "@babel/plugin-transform-computed-properties": "^7.22.5",
-        "@babel/plugin-transform-destructuring": "^7.22.10",
+        "@babel/plugin-transform-destructuring": "^7.22.15",
         "@babel/plugin-transform-dotall-regex": "^7.22.5",
         "@babel/plugin-transform-duplicate-keys": "^7.22.5",
         "@babel/plugin-transform-dynamic-import": "^7.22.11",
         "@babel/plugin-transform-exponentiation-operator": "^7.22.5",
         "@babel/plugin-transform-export-namespace-from": "^7.22.11",
-        "@babel/plugin-transform-for-of": "^7.22.5",
+        "@babel/plugin-transform-for-of": "^7.22.15",
         "@babel/plugin-transform-function-name": "^7.22.5",
         "@babel/plugin-transform-json-strings": "^7.22.11",
         "@babel/plugin-transform-literals": "^7.22.5",
         "@babel/plugin-transform-logical-assignment-operators": "^7.22.11",
         "@babel/plugin-transform-member-expression-literals": "^7.22.5",
         "@babel/plugin-transform-modules-amd": "^7.22.5",
-        "@babel/plugin-transform-modules-commonjs": "^7.22.11",
+        "@babel/plugin-transform-modules-commonjs": "^7.22.15",
         "@babel/plugin-transform-modules-systemjs": "^7.22.11",
         "@babel/plugin-transform-modules-umd": "^7.22.5",
         "@babel/plugin-transform-named-capturing-groups-regex": "^7.22.5",
         "@babel/plugin-transform-new-target": "^7.22.5",
         "@babel/plugin-transform-nullish-coalescing-operator": "^7.22.11",
         "@babel/plugin-transform-numeric-separator": "^7.22.11",
-        "@babel/plugin-transform-object-rest-spread": "^7.22.11",
+        "@babel/plugin-transform-object-rest-spread": "^7.22.15",
         "@babel/plugin-transform-object-super": "^7.22.5",
         "@babel/plugin-transform-optional-catch-binding": "^7.22.11",
-        "@babel/plugin-transform-optional-chaining": "^7.22.12",
-        "@babel/plugin-transform-parameters": "^7.22.5",
+        "@babel/plugin-transform-optional-chaining": "^7.22.15",
+        "@babel/plugin-transform-parameters": "^7.22.15",
         "@babel/plugin-transform-private-methods": "^7.22.5",
         "@babel/plugin-transform-private-property-in-object": "^7.22.11",
         "@babel/plugin-transform-property-literals": "^7.22.5",
@@ -18822,7 +18822,7 @@
         "@babel/plugin-transform-unicode-regex": "^7.22.5",
         "@babel/plugin-transform-unicode-sets-regex": "^7.22.5",
         "@babel/preset-modules": "0.1.6-no-external-plugins",
-        "@babel/types": "^7.22.11",
+        "@babel/types": "^7.22.15",
         "babel-plugin-polyfill-corejs2": "^0.4.5",
         "babel-plugin-polyfill-corejs3": "^0.8.3",
         "babel-plugin-polyfill-regenerator": "^0.5.2",
@@ -18918,12 +18918,12 @@
       }
     },
     "@babel/types": {
-      "version": "7.22.11",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.22.11.tgz",
-      "integrity": "sha512-siazHiGuZRz9aB9NpHy9GOs9xiQPKnMzgdr493iI1M67vRXpnEq8ZOOKzezC5q7zwuQ6sDhdSp4SD9ixKSqKZg==",
+      "version": "7.22.15",
+      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.22.15.tgz",
+      "integrity": "sha512-X+NLXr0N8XXmN5ZsaQdm9U2SSC3UbIYq/doL++sueHOTisgZHoKaQtZxGuV2cUPQHMfjKEfg/g6oy7Hm6SKFtA==",
       "requires": {
         "@babel/helper-string-parser": "^7.22.5",
-        "@babel/helper-validator-identifier": "^7.22.5",
+        "@babel/helper-validator-identifier": "^7.22.15",
         "to-fast-properties": "^2.0.0"
       }
     },
diff --git a/apps/block_scout_web/assets/package.json b/apps/block_scout_web/assets/package.json
index a643181b484a..cd346aaeb1d4 100644
--- a/apps/block_scout_web/assets/package.json
+++ b/apps/block_scout_web/assets/package.json
@@ -84,7 +84,7 @@
   },
   "devDependencies": {
     "@babel/core": "^7.22.11",
-    "@babel/preset-env": "^7.22.14",
+    "@babel/preset-env": "^7.22.15",
     "autoprefixer": "^10.4.15",
     "babel-loader": "^9.1.3",
     "copy-webpack-plugin": "^11.0.0",

From 7cae89754c5da3e75dc8ced21866f65bb60e1676 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 4 Sep 2023 18:56:28 +0000
Subject: [PATCH 375/909] Bump ex_cldr_numbers from 2.31.3 to 2.32.0

Bumps [ex_cldr_numbers](https://github.com/elixir-cldr/cldr_numbers) from 2.31.3 to 2.32.0.
- [Release notes](https://github.com/elixir-cldr/cldr_numbers/releases)
- [Changelog](https://github.com/elixir-cldr/cldr_numbers/blob/main/CHANGELOG.md)
- [Commits](https://github.com/elixir-cldr/cldr_numbers/compare/v2.31.3...v2.32.0)

---
updated-dependencies:
- dependency-name: ex_cldr_numbers
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 mix.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mix.lock b/mix.lock
index c9a25c08c8fc..75f3f2b0d102 100644
--- a/mix.lock
+++ b/mix.lock
@@ -45,7 +45,7 @@
   "ex_cldr": {:hex, :ex_cldr, "2.37.2", "c45041534ec60af367c4c1af02a608576118044fe3c441c782fd424061d6b517", [:mix], [{:cldr_utils, "~> 2.21", [hex: :cldr_utils, repo: "hexpm", optional: false]}, {:decimal, "~> 1.6 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: false]}, {:gettext, "~> 0.19", [hex: :gettext, repo: "hexpm", optional: true]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}, {:nimble_parsec, "~> 0.5 or ~> 1.0", [hex: :nimble_parsec, repo: "hexpm", optional: true]}], "hexpm", "c8467b1d5080716ace6621703b6656cb2f9545572a54b341da900791a0cf92ba"},
   "ex_cldr_currencies": {:hex, :ex_cldr_currencies, "2.15.0", "aadd34e91cfac7ef6b03fe8f47f8c6fa8c5daf3f89b5d9fee64ec545ded839cf", [:mix], [{:ex_cldr, "~> 2.34", [hex: :ex_cldr, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}], "hexpm", "0521316396c66877a2d636219767560bb2397c583341fcb154ecf9f3000e6ff8"},
   "ex_cldr_lists": {:hex, :ex_cldr_lists, "2.10.0", "4d4c9877da2d0417fd832907d69974e8328969f75fafc79b05ccf85f549f6281", [:mix], [{:ex_cldr_numbers, "~> 2.25", [hex: :ex_cldr_numbers, repo: "hexpm", optional: false]}, {:ex_doc, "~> 0.18", [hex: :ex_doc, repo: "hexpm", optional: true]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}], "hexpm", "adc040cde7b97f7fd7c0b35dd69ddb6fcf607303ae6355bb1851deae1f8b0652"},
-  "ex_cldr_numbers": {:hex, :ex_cldr_numbers, "2.31.3", "6ec8b18c395c0e8788d46da806f8f2abcbe4b0d809226d2a91363e9ccd85f2f5", [:mix], [{:decimal, "~> 1.6 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: false]}, {:digital_token, "~> 0.3 or ~> 1.0", [hex: :digital_token, repo: "hexpm", optional: false]}, {:ex_cldr, "~> 2.37", [hex: :ex_cldr, repo: "hexpm", optional: false]}, {:ex_cldr_currencies, ">= 2.14.2", [hex: :ex_cldr_currencies, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}], "hexpm", "b519de08ecc4a6402038f3aa75e8654f78ebd6fa714b7e585531504e648588fd"},
+  "ex_cldr_numbers": {:hex, :ex_cldr_numbers, "2.32.0", "9abfb0aa9964cb797b5b1c5b55bc773fdff3192a667259a538dd25edb60d44ce", [:mix], [{:decimal, "~> 1.6 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: false]}, {:digital_token, "~> 0.3 or ~> 1.0", [hex: :digital_token, repo: "hexpm", optional: false]}, {:ex_cldr, "~> 2.37", [hex: :ex_cldr, repo: "hexpm", optional: false]}, {:ex_cldr_currencies, ">= 2.14.2", [hex: :ex_cldr_currencies, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}], "hexpm", "08c43c26b8605b56b5856bb9277d2a0282f2e29b43c57dfbfd7bf9c28b4a504a"},
   "ex_cldr_units": {:hex, :ex_cldr_units, "3.16.2", "dbad303fba819981c578234e2aaf19d72efca16ea8b1c6ee46b26232cb45e232", [:mix], [{:cldr_utils, "~> 2.24", [hex: :cldr_utils, repo: "hexpm", optional: false]}, {:decimal, "~> 1.6 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: false]}, {:ex_cldr_lists, "~> 2.10", [hex: :ex_cldr_lists, repo: "hexpm", optional: false]}, {:ex_cldr_numbers, "~> 2.31", [hex: :ex_cldr_numbers, repo: "hexpm", optional: false]}, {:ex_doc, "~> 0.18", [hex: :ex_doc, repo: "hexpm", optional: true]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}], "hexpm", "851095319fb3205c1549619da742cd53a2804c1d9c204cf84014021e2a6ea7e5"},
   "ex_doc": {:hex, :ex_doc, "0.30.6", "5f8b54854b240a2b55c9734c4b1d0dd7bdd41f71a095d42a70445c03cf05a281", [:mix], [{:earmark_parser, "~> 1.4.31", [hex: :earmark_parser, repo: "hexpm", optional: false]}, {:makeup_elixir, "~> 0.14", [hex: :makeup_elixir, repo: "hexpm", optional: false]}, {:makeup_erlang, "~> 0.1", [hex: :makeup_erlang, repo: "hexpm", optional: false]}], "hexpm", "bd48f2ddacf4e482c727f9293d9498e0881597eae6ddc3d9562bd7923375109f"},
   "ex_json_schema": {:hex, :ex_json_schema, "0.10.1", "e03b746b6675a750c0bb1a5cc919f61353f7ab8450977e11ceede20e6180c560", [:mix], [{:decimal, "~> 2.0", [hex: :decimal, repo: "hexpm", optional: false]}], "hexpm", "66a64e60dadad89914d92f89c7e7906c57de75a8b79ac2480d0d53e1b8096fb0"},

From fd568870d3a27197c985b2343483fccc6c8a59fe Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 4 Sep 2023 18:58:08 +0000
Subject: [PATCH 376/909] Bump @babel/core from 7.22.11 to 7.22.15 in
 /apps/block_scout_web/assets

Bumps [@babel/core](https://github.com/babel/babel/tree/HEAD/packages/babel-core) from 7.22.11 to 7.22.15.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/commits/v7.22.15/packages/babel-core)

---
updated-dependencies:
- dependency-name: "@babel/core"
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 apps/block_scout_web/assets/package-lock.json | 182 +++++++++---------
 apps/block_scout_web/assets/package.json      |   2 +-
 2 files changed, 92 insertions(+), 92 deletions(-)

diff --git a/apps/block_scout_web/assets/package-lock.json b/apps/block_scout_web/assets/package-lock.json
index e13c7d7e888d..b4c9c0581fec 100644
--- a/apps/block_scout_web/assets/package-lock.json
+++ b/apps/block_scout_web/assets/package-lock.json
@@ -71,7 +71,7 @@
         "xss": "^1.0.14"
       },
       "devDependencies": {
-        "@babel/core": "^7.22.11",
+        "@babel/core": "^7.22.15",
         "@babel/preset-env": "^7.22.15",
         "autoprefixer": "^10.4.15",
         "babel-loader": "^9.1.3",
@@ -229,11 +229,11 @@
       }
     },
     "node_modules/@babel/code-frame": {
-      "version": "7.22.10",
-      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.22.10.tgz",
-      "integrity": "sha512-/KKIMG4UEL35WmI9OlvMhurwtytjvXoFcGNrOvyG9zIzA8YmPjVtIZUf7b05+TPO7G7/GEmLHDaoCgACHl9hhA==",
+      "version": "7.22.13",
+      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.22.13.tgz",
+      "integrity": "sha512-XktuhWlJ5g+3TJXc5upd9Ks1HutSArik6jf2eAjYFyIOf4ej3RN+184cZbzDvbPnuTJIUhPKKJE3cIsYTiAT3w==",
       "dependencies": {
-        "@babel/highlight": "^7.22.10",
+        "@babel/highlight": "^7.22.13",
         "chalk": "^2.4.2"
       },
       "engines": {
@@ -249,20 +249,20 @@
       }
     },
     "node_modules/@babel/core": {
-      "version": "7.22.11",
-      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.22.11.tgz",
-      "integrity": "sha512-lh7RJrtPdhibbxndr6/xx0w8+CVlY5FJZiaSz908Fpy+G0xkBFTvwLcKJFF4PJxVfGhVWNebikpWGnOoC71juQ==",
+      "version": "7.22.15",
+      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.22.15.tgz",
+      "integrity": "sha512-PtZqMmgRrvj8ruoEOIwVA3yoF91O+Hgw9o7DAUTNBA6Mo2jpu31clx9a7Nz/9JznqetTR6zwfC4L3LAjKQXUwA==",
       "dependencies": {
         "@ampproject/remapping": "^2.2.0",
-        "@babel/code-frame": "^7.22.10",
-        "@babel/generator": "^7.22.10",
-        "@babel/helper-compilation-targets": "^7.22.10",
-        "@babel/helper-module-transforms": "^7.22.9",
-        "@babel/helpers": "^7.22.11",
-        "@babel/parser": "^7.22.11",
-        "@babel/template": "^7.22.5",
-        "@babel/traverse": "^7.22.11",
-        "@babel/types": "^7.22.11",
+        "@babel/code-frame": "^7.22.13",
+        "@babel/generator": "^7.22.15",
+        "@babel/helper-compilation-targets": "^7.22.15",
+        "@babel/helper-module-transforms": "^7.22.15",
+        "@babel/helpers": "^7.22.15",
+        "@babel/parser": "^7.22.15",
+        "@babel/template": "^7.22.15",
+        "@babel/traverse": "^7.22.15",
+        "@babel/types": "^7.22.15",
         "convert-source-map": "^1.7.0",
         "debug": "^4.1.0",
         "gensync": "^1.0.0-beta.2",
@@ -278,11 +278,11 @@
       }
     },
     "node_modules/@babel/generator": {
-      "version": "7.22.10",
-      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.22.10.tgz",
-      "integrity": "sha512-79KIf7YiWjjdZ81JnLujDRApWtl7BxTqWD88+FFdQEIOG8LJ0etDOM7CXuIgGJa55sGOwZVwuEsaLEm0PJ5/+A==",
+      "version": "7.22.15",
+      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.22.15.tgz",
+      "integrity": "sha512-Zu9oWARBqeVOW0dZOjXc3JObrzuqothQ3y/n1kUtrjCoCPLkXUwMvOo/F/TCfoHMbWIFlWwpZtkZVb9ga4U2pA==",
       "dependencies": {
-        "@babel/types": "^7.22.10",
+        "@babel/types": "^7.22.15",
         "@jridgewell/gen-mapping": "^0.3.2",
         "@jridgewell/trace-mapping": "^0.3.17",
         "jsesc": "^2.5.1"
@@ -597,22 +597,22 @@
       }
     },
     "node_modules/@babel/helpers": {
-      "version": "7.22.11",
-      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.22.11.tgz",
-      "integrity": "sha512-vyOXC8PBWaGc5h7GMsNx68OH33cypkEDJCHvYVVgVbbxJDROYVtexSk0gK5iCF1xNjRIN2s8ai7hwkWDq5szWg==",
+      "version": "7.22.15",
+      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.22.15.tgz",
+      "integrity": "sha512-7pAjK0aSdxOwR+CcYAqgWOGy5dcfvzsTIfFTb2odQqW47MDfv14UaJDY6eng8ylM2EaeKXdxaSWESbkmaQHTmw==",
       "dependencies": {
-        "@babel/template": "^7.22.5",
-        "@babel/traverse": "^7.22.11",
-        "@babel/types": "^7.22.11"
+        "@babel/template": "^7.22.15",
+        "@babel/traverse": "^7.22.15",
+        "@babel/types": "^7.22.15"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/highlight": {
-      "version": "7.22.10",
-      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.22.10.tgz",
-      "integrity": "sha512-78aUtVcT7MUscr0K5mIEnkwxPE0MaxkR5RxRwuHaQ+JuU5AmTPhY+do2mdzVTnIJJpyBglql2pehuBIWHug+WQ==",
+      "version": "7.22.13",
+      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.22.13.tgz",
+      "integrity": "sha512-C/BaXcnnvBCmHTpz/VGZ8jgtE2aYlW4hxDhseJAWZb7gqGM/qtCK6iZUb0TyKFf7BOUsBH7Q7fkRsDRhg1XklQ==",
       "dependencies": {
         "@babel/helper-validator-identifier": "^7.22.5",
         "chalk": "^2.4.2",
@@ -623,9 +623,9 @@
       }
     },
     "node_modules/@babel/parser": {
-      "version": "7.22.11",
-      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.22.11.tgz",
-      "integrity": "sha512-R5zb8eJIBPJriQtbH/htEQy4k7E2dHWlD2Y2VT07JCzwYZHBxV5ZYtM0UhXSNMT74LyxuM+b1jdL7pSesXbC/g==",
+      "version": "7.22.15",
+      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.22.15.tgz",
+      "integrity": "sha512-RWmQ/sklUN9BvGGpCDgSubhHWfAx24XDTDObup4ffvxaYsptOg2P3KG0j+1eWKLxpkX0j0uHxmpq2Z1SP/VhxA==",
       "bin": {
         "parser": "bin/babel-parser.js"
       },
@@ -1925,31 +1925,31 @@
       }
     },
     "node_modules/@babel/template": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.22.5.tgz",
-      "integrity": "sha512-X7yV7eiwAxdj9k94NEylvbVHLiVG1nvzCV2EAowhxLTwODV1jl9UzZ48leOC0sH7OnuHrIkllaBgneUykIcZaw==",
+      "version": "7.22.15",
+      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.22.15.tgz",
+      "integrity": "sha512-QPErUVm4uyJa60rkI73qneDacvdvzxshT3kksGqlGWYdOTIUOwJ7RDUL8sGqslY1uXWSL6xMFKEXDS3ox2uF0w==",
       "dependencies": {
-        "@babel/code-frame": "^7.22.5",
-        "@babel/parser": "^7.22.5",
-        "@babel/types": "^7.22.5"
+        "@babel/code-frame": "^7.22.13",
+        "@babel/parser": "^7.22.15",
+        "@babel/types": "^7.22.15"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/traverse": {
-      "version": "7.22.11",
-      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.22.11.tgz",
-      "integrity": "sha512-mzAenteTfomcB7mfPtyi+4oe5BZ6MXxWcn4CX+h4IRJ+OOGXBrWU6jDQavkQI9Vuc5P+donFabBfFCcmWka9lQ==",
+      "version": "7.22.15",
+      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.22.15.tgz",
+      "integrity": "sha512-DdHPwvJY0sEeN4xJU5uRLmZjgMMDIvMPniLuYzUVXj/GGzysPl0/fwt44JBkyUIzGJPV8QgHMcQdQ34XFuKTYQ==",
       "dependencies": {
-        "@babel/code-frame": "^7.22.10",
-        "@babel/generator": "^7.22.10",
+        "@babel/code-frame": "^7.22.13",
+        "@babel/generator": "^7.22.15",
         "@babel/helper-environment-visitor": "^7.22.5",
         "@babel/helper-function-name": "^7.22.5",
         "@babel/helper-hoist-variables": "^7.22.5",
         "@babel/helper-split-export-declaration": "^7.22.6",
-        "@babel/parser": "^7.22.11",
-        "@babel/types": "^7.22.11",
+        "@babel/parser": "^7.22.15",
+        "@babel/types": "^7.22.15",
         "debug": "^4.1.0",
         "globals": "^11.1.0"
       },
@@ -17723,11 +17723,11 @@
       }
     },
     "@babel/code-frame": {
-      "version": "7.22.10",
-      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.22.10.tgz",
-      "integrity": "sha512-/KKIMG4UEL35WmI9OlvMhurwtytjvXoFcGNrOvyG9zIzA8YmPjVtIZUf7b05+TPO7G7/GEmLHDaoCgACHl9hhA==",
+      "version": "7.22.13",
+      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.22.13.tgz",
+      "integrity": "sha512-XktuhWlJ5g+3TJXc5upd9Ks1HutSArik6jf2eAjYFyIOf4ej3RN+184cZbzDvbPnuTJIUhPKKJE3cIsYTiAT3w==",
       "requires": {
-        "@babel/highlight": "^7.22.10",
+        "@babel/highlight": "^7.22.13",
         "chalk": "^2.4.2"
       }
     },
@@ -17737,20 +17737,20 @@
       "integrity": "sha512-5UamI7xkUcJ3i9qVDS+KFDEK8/7oJ55/sJMB1Ge7IEapr7KfdfV/HErR+koZwOfd+SgtFKOKRhRakdg++DcJpQ=="
     },
     "@babel/core": {
-      "version": "7.22.11",
-      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.22.11.tgz",
-      "integrity": "sha512-lh7RJrtPdhibbxndr6/xx0w8+CVlY5FJZiaSz908Fpy+G0xkBFTvwLcKJFF4PJxVfGhVWNebikpWGnOoC71juQ==",
+      "version": "7.22.15",
+      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.22.15.tgz",
+      "integrity": "sha512-PtZqMmgRrvj8ruoEOIwVA3yoF91O+Hgw9o7DAUTNBA6Mo2jpu31clx9a7Nz/9JznqetTR6zwfC4L3LAjKQXUwA==",
       "requires": {
         "@ampproject/remapping": "^2.2.0",
-        "@babel/code-frame": "^7.22.10",
-        "@babel/generator": "^7.22.10",
-        "@babel/helper-compilation-targets": "^7.22.10",
-        "@babel/helper-module-transforms": "^7.22.9",
-        "@babel/helpers": "^7.22.11",
-        "@babel/parser": "^7.22.11",
-        "@babel/template": "^7.22.5",
-        "@babel/traverse": "^7.22.11",
-        "@babel/types": "^7.22.11",
+        "@babel/code-frame": "^7.22.13",
+        "@babel/generator": "^7.22.15",
+        "@babel/helper-compilation-targets": "^7.22.15",
+        "@babel/helper-module-transforms": "^7.22.15",
+        "@babel/helpers": "^7.22.15",
+        "@babel/parser": "^7.22.15",
+        "@babel/template": "^7.22.15",
+        "@babel/traverse": "^7.22.15",
+        "@babel/types": "^7.22.15",
         "convert-source-map": "^1.7.0",
         "debug": "^4.1.0",
         "gensync": "^1.0.0-beta.2",
@@ -17759,11 +17759,11 @@
       }
     },
     "@babel/generator": {
-      "version": "7.22.10",
-      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.22.10.tgz",
-      "integrity": "sha512-79KIf7YiWjjdZ81JnLujDRApWtl7BxTqWD88+FFdQEIOG8LJ0etDOM7CXuIgGJa55sGOwZVwuEsaLEm0PJ5/+A==",
+      "version": "7.22.15",
+      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.22.15.tgz",
+      "integrity": "sha512-Zu9oWARBqeVOW0dZOjXc3JObrzuqothQ3y/n1kUtrjCoCPLkXUwMvOo/F/TCfoHMbWIFlWwpZtkZVb9ga4U2pA==",
       "requires": {
-        "@babel/types": "^7.22.10",
+        "@babel/types": "^7.22.15",
         "@jridgewell/gen-mapping": "^0.3.2",
         "@jridgewell/trace-mapping": "^0.3.17",
         "jsesc": "^2.5.1"
@@ -17993,19 +17993,19 @@
       }
     },
     "@babel/helpers": {
-      "version": "7.22.11",
-      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.22.11.tgz",
-      "integrity": "sha512-vyOXC8PBWaGc5h7GMsNx68OH33cypkEDJCHvYVVgVbbxJDROYVtexSk0gK5iCF1xNjRIN2s8ai7hwkWDq5szWg==",
+      "version": "7.22.15",
+      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.22.15.tgz",
+      "integrity": "sha512-7pAjK0aSdxOwR+CcYAqgWOGy5dcfvzsTIfFTb2odQqW47MDfv14UaJDY6eng8ylM2EaeKXdxaSWESbkmaQHTmw==",
       "requires": {
-        "@babel/template": "^7.22.5",
-        "@babel/traverse": "^7.22.11",
-        "@babel/types": "^7.22.11"
+        "@babel/template": "^7.22.15",
+        "@babel/traverse": "^7.22.15",
+        "@babel/types": "^7.22.15"
       }
     },
     "@babel/highlight": {
-      "version": "7.22.10",
-      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.22.10.tgz",
-      "integrity": "sha512-78aUtVcT7MUscr0K5mIEnkwxPE0MaxkR5RxRwuHaQ+JuU5AmTPhY+do2mdzVTnIJJpyBglql2pehuBIWHug+WQ==",
+      "version": "7.22.13",
+      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.22.13.tgz",
+      "integrity": "sha512-C/BaXcnnvBCmHTpz/VGZ8jgtE2aYlW4hxDhseJAWZb7gqGM/qtCK6iZUb0TyKFf7BOUsBH7Q7fkRsDRhg1XklQ==",
       "requires": {
         "@babel/helper-validator-identifier": "^7.22.5",
         "chalk": "^2.4.2",
@@ -18013,9 +18013,9 @@
       }
     },
     "@babel/parser": {
-      "version": "7.22.11",
-      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.22.11.tgz",
-      "integrity": "sha512-R5zb8eJIBPJriQtbH/htEQy4k7E2dHWlD2Y2VT07JCzwYZHBxV5ZYtM0UhXSNMT74LyxuM+b1jdL7pSesXbC/g=="
+      "version": "7.22.15",
+      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.22.15.tgz",
+      "integrity": "sha512-RWmQ/sklUN9BvGGpCDgSubhHWfAx24XDTDObup4ffvxaYsptOg2P3KG0j+1eWKLxpkX0j0uHxmpq2Z1SP/VhxA=="
     },
     "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": {
       "version": "7.22.15",
@@ -18891,28 +18891,28 @@
       }
     },
     "@babel/template": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.22.5.tgz",
-      "integrity": "sha512-X7yV7eiwAxdj9k94NEylvbVHLiVG1nvzCV2EAowhxLTwODV1jl9UzZ48leOC0sH7OnuHrIkllaBgneUykIcZaw==",
+      "version": "7.22.15",
+      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.22.15.tgz",
+      "integrity": "sha512-QPErUVm4uyJa60rkI73qneDacvdvzxshT3kksGqlGWYdOTIUOwJ7RDUL8sGqslY1uXWSL6xMFKEXDS3ox2uF0w==",
       "requires": {
-        "@babel/code-frame": "^7.22.5",
-        "@babel/parser": "^7.22.5",
-        "@babel/types": "^7.22.5"
+        "@babel/code-frame": "^7.22.13",
+        "@babel/parser": "^7.22.15",
+        "@babel/types": "^7.22.15"
       }
     },
     "@babel/traverse": {
-      "version": "7.22.11",
-      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.22.11.tgz",
-      "integrity": "sha512-mzAenteTfomcB7mfPtyi+4oe5BZ6MXxWcn4CX+h4IRJ+OOGXBrWU6jDQavkQI9Vuc5P+donFabBfFCcmWka9lQ==",
+      "version": "7.22.15",
+      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.22.15.tgz",
+      "integrity": "sha512-DdHPwvJY0sEeN4xJU5uRLmZjgMMDIvMPniLuYzUVXj/GGzysPl0/fwt44JBkyUIzGJPV8QgHMcQdQ34XFuKTYQ==",
       "requires": {
-        "@babel/code-frame": "^7.22.10",
-        "@babel/generator": "^7.22.10",
+        "@babel/code-frame": "^7.22.13",
+        "@babel/generator": "^7.22.15",
         "@babel/helper-environment-visitor": "^7.22.5",
         "@babel/helper-function-name": "^7.22.5",
         "@babel/helper-hoist-variables": "^7.22.5",
         "@babel/helper-split-export-declaration": "^7.22.6",
-        "@babel/parser": "^7.22.11",
-        "@babel/types": "^7.22.11",
+        "@babel/parser": "^7.22.15",
+        "@babel/types": "^7.22.15",
         "debug": "^4.1.0",
         "globals": "^11.1.0"
       }
diff --git a/apps/block_scout_web/assets/package.json b/apps/block_scout_web/assets/package.json
index 11afa3f59418..88e232f79b28 100644
--- a/apps/block_scout_web/assets/package.json
+++ b/apps/block_scout_web/assets/package.json
@@ -83,7 +83,7 @@
     "xss": "^1.0.14"
   },
   "devDependencies": {
-    "@babel/core": "^7.22.11",
+    "@babel/core": "^7.22.15",
     "@babel/preset-env": "^7.22.15",
     "autoprefixer": "^10.4.15",
     "babel-loader": "^9.1.3",

From 45d92f245cd46fda8a788ac9b820f2fb1d8b46dc Mon Sep 17 00:00:00 2001
From: jasonzysun <jasonzysun@163.com>
Date: Tue, 5 Sep 2023 09:52:47 +0800
Subject: [PATCH 377/909] Fix errors in some variables in the file
 docker-compose/envs/common-frontend.env

---
 docker-compose/envs/common-frontend.env | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/docker-compose/envs/common-frontend.env b/docker-compose/envs/common-frontend.env
index f1c77cdfa7ca..57e8a6a5f7a2 100644
--- a/docker-compose/envs/common-frontend.env
+++ b/docker-compose/envs/common-frontend.env
@@ -11,10 +11,10 @@ NEXT_PUBLIC_API_BASE_PATH=/
 NEXT_PUBLIC_FEATURED_NETWORKS=https://raw.githubusercontent.com/blockscout/frontend-configs/main/configs/featured-networks/eth-goerli.json
 NEXT_PUBLIC_APP_HOST=localhost
 NEXT_PUBLIC_APP_PROTOCOL=http
-NEXT_PUBLIC_HOMEPAGE_CHARTS="['daily_txs']"
+NEXT_PUBLIC_HOMEPAGE_CHARTS=['daily_txs']
 NEXT_PUBLIC_VISUALIZE_API_HOST=http://localhost:8081
-NEXT_PUBLIC_IS_TESTNET='true'
+NEXT_PUBLIC_IS_TESTNET=true
 NEXT_PUBLIC_NETWORK_LOGO=https://raw.githubusercontent.com/blockscout/frontend-configs/main/configs/network-logos/goerli.svg
 NEXT_PUBLIC_NETWORK_ICON=https://raw.githubusercontent.com/blockscout/frontend-configs/main/configs/network-icons/goerli.svg
-NEXT_PUBLIC_HOMEPAGE_PLATE_TEXT_COLOR="rgb(255, 255, 255)"
-NEXT_PUBLIC_API_WEBSOCKET_PROTOCOL='ws'
+NEXT_PUBLIC_HOMEPAGE_PLATE_TEXT_COLOR=rgb(255, 255, 255)
+NEXT_PUBLIC_API_WEBSOCKET_PROTOCOL=ws

From cd201e83dc6b8d49ea52991bdf3a5f0a84adcfc8 Mon Sep 17 00:00:00 2001
From: Nikita Pozdniakov <nikitosing4@mail.ru>
Date: Sun, 3 Sep 2023 16:42:22 +0300
Subject: [PATCH 378/909] Add sitemap.xml

---
 CHANGELOG.md                                  |  1 +
 .../controllers/robots_controller.ex          | 13 +++++
 .../lib/block_scout_web/endpoint.ex           |  1 -
 .../lib/block_scout_web/router.ex             |  2 +
 .../templates/robots/robots.txt.eex}          |  1 +
 .../templates/robots/sitemap.xml.eex          | 53 +++++++++++++++++++
 .../lib/block_scout_web/views/robots_view.ex  | 10 ++++
 apps/explorer/lib/explorer/chain.ex           | 14 +++++
 cspell.json                                   |  4 +-
 9 files changed, 97 insertions(+), 2 deletions(-)
 create mode 100644 apps/block_scout_web/lib/block_scout_web/controllers/robots_controller.ex
 rename apps/block_scout_web/{assets/static/robots.txt => lib/block_scout_web/templates/robots/robots.txt.eex} (76%)
 create mode 100644 apps/block_scout_web/lib/block_scout_web/templates/robots/sitemap.xml.eex
 create mode 100644 apps/block_scout_web/lib/block_scout_web/views/robots_view.ex

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f5a303e1096d..ded504fdae92 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,7 @@
 
 ### Features
 
+- [#8382](https://github.com/blockscout/blockscout/pull/8382) - Add sitemap.xml
 - [#8313](https://github.com/blockscout/blockscout/pull/8313) - Add batches to TokenInstance fetchers
 - [#8285](https://github.com/blockscout/blockscout/pull/8285) - Add CG/CMC coin price sources
 - [#8181](https://github.com/blockscout/blockscout/pull/8181) - Insert current token balances placeholders along with historical
diff --git a/apps/block_scout_web/lib/block_scout_web/controllers/robots_controller.ex b/apps/block_scout_web/lib/block_scout_web/controllers/robots_controller.ex
new file mode 100644
index 000000000000..a482fb1a73c7
--- /dev/null
+++ b/apps/block_scout_web/lib/block_scout_web/controllers/robots_controller.ex
@@ -0,0 +1,13 @@
+defmodule BlockScoutWeb.RobotsController do
+  use BlockScoutWeb, :controller
+
+  def robots(conn, _params) do
+    conn
+    |> render("robots.txt")
+  end
+
+  def sitemap(conn, _params) do
+    conn
+    |> render("sitemap.xml")
+  end
+end
diff --git a/apps/block_scout_web/lib/block_scout_web/endpoint.ex b/apps/block_scout_web/lib/block_scout_web/endpoint.ex
index 9036939eb195..10d8d99f36b6 100644
--- a/apps/block_scout_web/lib/block_scout_web/endpoint.ex
+++ b/apps/block_scout_web/lib/block_scout_web/endpoint.ex
@@ -29,7 +29,6 @@ defmodule BlockScoutWeb.Endpoint do
       browserconfig.xml
       mstile-150x150.png
       safari-pinned-tab.svg
-      robots.txt
     ),
     only_matching: ~w(manifest)
   )
diff --git a/apps/block_scout_web/lib/block_scout_web/router.ex b/apps/block_scout_web/lib/block_scout_web/router.ex
index ff9d5afcc609..b56899ce80f3 100644
--- a/apps/block_scout_web/lib/block_scout_web/router.ex
+++ b/apps/block_scout_web/lib/block_scout_web/router.ex
@@ -47,6 +47,8 @@ defmodule BlockScoutWeb.Router do
   scope "/", BlockScoutWeb do
     pipe_through(:browser)
 
+    get("/robots.txt", RobotsController, :robots)
+    get("/sitemap.xml", RobotsController, :sitemap)
     get("/api-docs", APIDocsController, :index)
     get("/eth-rpc-api-docs", APIDocsController, :eth_rpc)
   end
diff --git a/apps/block_scout_web/assets/static/robots.txt b/apps/block_scout_web/lib/block_scout_web/templates/robots/robots.txt.eex
similarity index 76%
rename from apps/block_scout_web/assets/static/robots.txt
rename to apps/block_scout_web/lib/block_scout_web/templates/robots/robots.txt.eex
index 3c9c7c01f30b..e2f1434e2429 100644
--- a/apps/block_scout_web/assets/static/robots.txt
+++ b/apps/block_scout_web/lib/block_scout_web/templates/robots/robots.txt.eex
@@ -3,3 +3,4 @@
 # To ban all spiders from the entire site uncomment the next two lines:
 # User-agent: *
 # Disallow: /
+Sitemap: <%= APIDocsView.blockscout_url(true) %>/sitemap.xml
diff --git a/apps/block_scout_web/lib/block_scout_web/templates/robots/sitemap.xml.eex b/apps/block_scout_web/lib/block_scout_web/templates/robots/sitemap.xml.eex
new file mode 100644
index 000000000000..0c5334f21aa4
--- /dev/null
+++ b/apps/block_scout_web/lib/block_scout_web/templates/robots/sitemap.xml.eex
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<% host = APIDocsView.blockscout_url(true) %>
+<% date = to_string(Date.utc_today()) %>
+<% non_parameterized_urls = ["/", "/txs", "/blocks", "/accounts", "/verified-contracts", "/tokens", "/apps", "/stats", "/api-docs", "/graphiql", "/search-results", "/withdrawals", "/l2-deposits", "/l2-output-roots", "/l2-txn-batches", "/l2-withdrawals"] %>
+<% params = [paging_options: %PagingOptions{page_size: limit()}] %>
+<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">
+  <%= for url <- non_parameterized_urls do %>
+    <url>
+      <loc><%= host %><%= url %></loc>
+      <lastmod><%= date %></lastmod>
+    </url>
+  <% end %>
+
+  <% addresses = Chain.list_top_addresses(params) %>
+  <%= for {address, _} <- addresses do %>
+    <url>
+      <loc><%= host %>/address/<%= to_string(address) %></loc>
+      <lastmod><%= date %></lastmod>
+    </url>
+  <% end %>
+
+  <% txs = Chain.recent_transactions(params, [:validated]) %>
+  <%= for tx <- txs do %>
+    <url>
+      <loc><%= host %>/tx/<%= to_string(tx.hash) %></loc>
+      <lastmod><%= date %></lastmod>
+    </url>
+  <% end %>
+
+  <% blocks = Chain.list_blocks(params) %>
+  <%= for block <- blocks do %>
+    <url>
+      <loc><%= host %>/block/<%= to_string(block.number) %></loc>
+      <lastmod><%= date %></lastmod>
+    </url>
+  <% end %>
+
+  <% tokens = Chain.list_top_tokens(nil, params) %>
+  <%= for token <- tokens do %>
+    <url>
+      <loc><%= host %>/token/<%= to_string(token.contract_address_hash) %></loc>
+      <lastmod><%= date %></lastmod>
+    </url>
+  <% end %>
+
+  <% smart_contracts_hashes = Chain.verified_contracts_top(limit()) %>
+  <%= for hash <- smart_contracts_hashes do %>
+    <url>
+      <loc><%= host %>/address/<%= Address.checksum(hash) %>?tab=contract</loc>
+      <lastmod><%= date %></lastmod>
+    </url>
+  <% end %>
+</urlset>
\ No newline at end of file
diff --git a/apps/block_scout_web/lib/block_scout_web/views/robots_view.ex b/apps/block_scout_web/lib/block_scout_web/views/robots_view.ex
new file mode 100644
index 000000000000..20e4cca0596f
--- /dev/null
+++ b/apps/block_scout_web/lib/block_scout_web/views/robots_view.ex
@@ -0,0 +1,10 @@
+defmodule BlockScoutWeb.RobotsView do
+  use BlockScoutWeb, :view
+
+  alias BlockScoutWeb.APIDocsView
+  alias Explorer.{Chain, PagingOptions}
+  alias Explorer.Chain.Address
+
+  @limit 200
+  defp limit, do: @limit
+end
diff --git a/apps/explorer/lib/explorer/chain.ex b/apps/explorer/lib/explorer/chain.ex
index ed937d3bdbc8..c1b9331fc451 100644
--- a/apps/explorer/lib/explorer/chain.ex
+++ b/apps/explorer/lib/explorer/chain.ex
@@ -6321,4 +6321,18 @@ defmodule Explorer.Chain do
       }
     )
   end
+
+  @spec verified_contracts_top(non_neg_integer()) :: [Hash.Address.t()]
+  def verified_contracts_top(limit) do
+    query =
+      from(contract in SmartContract,
+        inner_join: address in Address,
+        on: contract.address_hash == address.hash,
+        order_by: [desc: address.transactions_count],
+        limit: ^limit,
+        select: contract.address_hash
+      )
+
+    Repo.all(query)
+  end
 end
diff --git a/cspell.json b/cspell.json
index c35c242239f4..db95f259f771 100644
--- a/cspell.json
+++ b/cspell.json
@@ -520,7 +520,9 @@
         "Asfpp",
         "Nerg",
         "secp",
-        "qwertyuioiuytrewertyuioiuytrertyuio"
+        "qwertyuioiuytrewertyuioiuytrertyuio",
+        "urlset",
+        "lastmod"
     ],
     "enableFiletypes": [
         "dotenv",

From fa0a167f98f167de9ce425053e25dbbfe38d46bf Mon Sep 17 00:00:00 2001
From: Qwerty5Uiop <alex000010@bk.ru>
Date: Tue, 5 Sep 2023 12:00:37 +0300
Subject: [PATCH 379/909] Drop token balances tokens foreign key

---
 CHANGELOG.md                                              | 2 +-
 apps/explorer/lib/explorer/chain/address/token_balance.ex | 1 -
 ...30905085809_drop_token_balances_tokens_foreign_key.exs | 8 ++++++++
 3 files changed, 9 insertions(+), 2 deletions(-)
 create mode 100644 apps/explorer/priv/repo/migrations/20230905085809_drop_token_balances_tokens_foreign_key.exs

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7271430d98f2..b4bd910e1546 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,7 +10,7 @@
 - [#8210](https://github.com/blockscout/blockscout/pull/8210) - Drop address foreign keys
 - [#8292](https://github.com/blockscout/blockscout/pull/8292) - Add ETHEREUM_JSONRPC_WAIT_PER_TIMEOUT env var
 - [#8269](https://github.com/blockscout/blockscout/pull/8269) - Don't push back to sequence on catchup exception
-- [#8362](https://github.com/blockscout/blockscout/pull/8362) - Drop current token balances tokens foreign key
+- [#8362](https://github.com/blockscout/blockscout/pull/8362), [#8398](https://github.com/blockscout/blockscout/pull/8398) - Drop token balances tokens foreign key
 
 ### Fixes
 
diff --git a/apps/explorer/lib/explorer/chain/address/token_balance.ex b/apps/explorer/lib/explorer/chain/address/token_balance.ex
index 24b8dfb1c856..e2c7bdeb2fb8 100644
--- a/apps/explorer/lib/explorer/chain/address/token_balance.ex
+++ b/apps/explorer/lib/explorer/chain/address/token_balance.ex
@@ -65,7 +65,6 @@ defmodule Explorer.Chain.Address.TokenBalance do
     token_balance
     |> cast(attrs, @allowed_fields)
     |> validate_required(@required_fields)
-    |> foreign_key_constraint(:token_contract_address_hash)
     |> unique_constraint(:block_number, name: :token_balances_address_hash_block_number_index)
   end
 
diff --git a/apps/explorer/priv/repo/migrations/20230905085809_drop_token_balances_tokens_foreign_key.exs b/apps/explorer/priv/repo/migrations/20230905085809_drop_token_balances_tokens_foreign_key.exs
new file mode 100644
index 000000000000..265933ff4c23
--- /dev/null
+++ b/apps/explorer/priv/repo/migrations/20230905085809_drop_token_balances_tokens_foreign_key.exs
@@ -0,0 +1,8 @@
+# cspell:ignore fkey
+defmodule Explorer.Repo.Migrations.DropTokenBalancesTokensForeignKey do
+  use Ecto.Migration
+
+  def change do
+    drop_if_exists(constraint(:address_token_balances, :address_token_balances_token_contract_address_hash_fkey))
+  end
+end

From 04809781d02857f008b42fdb27813f044663185a Mon Sep 17 00:00:00 2001
From: Viktor Baranov <baranov.viktor.27@gmail.com>
Date: Tue, 5 Sep 2023 17:00:37 +0300
Subject: [PATCH 380/909] Fix market cap in /stats endpoint

---
 CHANGELOG.md                                              | 2 +-
 .../lib/block_scout_web/views/api/v2/helper.ex            | 8 ++------
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b0fbb0b285ab..3d874f87ca85 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,7 +6,7 @@
 
 - [#8382](https://github.com/blockscout/blockscout/pull/8382) - Add sitemap.xml
 - [#8313](https://github.com/blockscout/blockscout/pull/8313) - Add batches to TokenInstance fetchers
-- [#8285](https://github.com/blockscout/blockscout/pull/8285) - Add CG/CMC coin price sources
+- [#8285](https://github.com/blockscout/blockscout/pull/8285), [#8399](https://github.com/blockscout/blockscout/pull/8399) - Add CG/CMC coin price sources
 - [#8181](https://github.com/blockscout/blockscout/pull/8181) - Insert current token balances placeholders along with historical
 - [#8210](https://github.com/blockscout/blockscout/pull/8210) - Drop address foreign keys
 - [#8292](https://github.com/blockscout/blockscout/pull/8292) - Add ETHEREUM_JSONRPC_WAIT_PER_TIMEOUT env var
diff --git a/apps/block_scout_web/lib/block_scout_web/views/api/v2/helper.ex b/apps/block_scout_web/lib/block_scout_web/views/api/v2/helper.ex
index b0e25f978d02..9b82e01ede77 100644
--- a/apps/block_scout_web/lib/block_scout_web/views/api/v2/helper.ex
+++ b/apps/block_scout_web/lib/block_scout_web/views/api/v2/helper.ex
@@ -104,19 +104,15 @@ defmodule BlockScoutWeb.API.V2.Helper do
   def is_verified(%Address{smart_contract: %NotLoaded{}}), do: nil
   def is_verified(%Address{smart_contract: _}), do: true
 
-  def market_cap(:standard, %{available_supply: available_supply, usd_value: usd_value})
+  def market_cap(:standard, %{available_supply: available_supply, usd_value: usd_value, market_cap_usd: market_cap_usd})
       when is_nil(available_supply) or is_nil(usd_value) do
-    Decimal.new(0)
+    max(Decimal.new(0), market_cap_usd)
   end
 
   def market_cap(:standard, %{available_supply: available_supply, usd_value: usd_value}) do
     Decimal.mult(available_supply, usd_value)
   end
 
-  def market_cap(:standard, exchange_rate) do
-    exchange_rate.market_cap_usd
-  end
-
   def market_cap(module, exchange_rate) do
     module.market_cap(exchange_rate)
   end

From b6eb4869aa62004dd7b1b4ec72a7d70bd551d09c Mon Sep 17 00:00:00 2001
From: Viktor Baranov <baranov.viktor.27@gmail.com>
Date: Tue, 5 Sep 2023 19:31:02 +0300
Subject: [PATCH 381/909] Add branch to CI

---
 .../publish-docker-image-for-zksync.yml       | 54 +++++++++++++++++++
 1 file changed, 54 insertions(+)
 create mode 100644 .github/workflows/publish-docker-image-for-zksync.yml

diff --git a/.github/workflows/publish-docker-image-for-zksync.yml b/.github/workflows/publish-docker-image-for-zksync.yml
new file mode 100644
index 000000000000..e37e195a118a
--- /dev/null
+++ b/.github/workflows/publish-docker-image-for-zksync.yml
@@ -0,0 +1,54 @@
+# This workflow uses actions that are not certified by GitHub.
+# They are provided by a third-party and are governed by
+# separate terms of service, privacy policy, and support
+# documentation.
+
+name: Publish Docker image for specific chain branches
+
+on:
+  push:
+    branches:
+      - production-zksync-stg
+jobs:
+  push_to_registry:
+    name: Push Docker image to Docker Hub
+    runs-on: ubuntu-latest
+    env:
+      RELEASE_VERSION: 5.2.2
+      DOCKER_CHAIN_NAME: zksync
+    steps:
+      - name: Check out the repo
+        uses: actions/checkout@v3
+      
+      - name: Log in to Docker Hub
+        uses: docker/login-action@v2
+        with:
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
+      
+      - name: Extract metadata (tags, labels) for Docker
+        id: meta
+        uses: docker/metadata-action@v4
+        with:
+          images: blockscout/blockscout
+
+      - name: Add SHORT_SHA env property with commit short sha
+        run: echo "SHORT_SHA=`echo ${GITHUB_SHA} | cut -c1-8`" >> $GITHUB_ENV
+      
+      - name: Build and push Docker image
+        uses: docker/build-push-action@v3
+        with:
+          context: .
+          file: ./docker/Dockerfile
+          push: true
+          tags: blockscout/blockscout-${{ env.DOCKER_CHAIN_NAME }}:latest, blockscout/blockscout-${{ env.DOCKER_CHAIN_NAME }}:${{ env.RELEASE_VERSION }}-postrelease-${{ env.SHORT_SHA }}
+          build-args: |
+            CACHE_EXCHANGE_RATES_PERIOD=
+            API_V1_READ_METHODS_DISABLED=false
+            DISABLE_WEBAPP=false
+            API_V1_WRITE_METHODS_DISABLED=false
+            CACHE_TOTAL_GAS_USAGE_COUNTER_ENABLED=
+            ADMIN_PANEL_ENABLED=false
+            CACHE_ADDRESS_WITH_BALANCES_UPDATE_INTERVAL=
+            BLOCKSCOUT_VERSION=v${{ env.RELEASE_VERSION }}-beta.+commit.${{ env.SHORT_SHA }}
+            RELEASE_VERSION=${{ env.RELEASE_VERSION }}
\ No newline at end of file

From a41c222facc2afa4877648e6006c677084a36aaf Mon Sep 17 00:00:00 2001
From: Viktor Baranov <baranov.viktor.27@gmail.com>
Date: Tue, 5 Sep 2023 19:32:13 +0300
Subject: [PATCH 382/909] Add branch to CI

---
 .github/workflows/config.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/config.yml b/.github/workflows/config.yml
index 18d436a17d06..645ad98490ba 100644
--- a/.github/workflows/config.yml
+++ b/.github/workflows/config.yml
@@ -13,6 +13,7 @@ on:
       - production-rsk-stg
       - production-lukso-stg
       - production-immutable-stg
+      - production-zksync-stg
       - staging-l2
   pull_request:
     branches:

From 3b953bf75cf3933572eb8cf309ce3953ce0f12e1 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 5 Sep 2023 19:02:59 +0000
Subject: [PATCH 383/909] Bump ex_secp256k1 from 0.7.1 to 0.7.2

Bumps [ex_secp256k1](https://github.com/omgnetwork/ex_secp256k1) from 0.7.1 to 0.7.2.
- [Release notes](https://github.com/omgnetwork/ex_secp256k1/releases)
- [Changelog](https://github.com/ayrat555/ex_secp256k1/blob/master/CHANGELOG.md)
- [Commits](https://github.com/omgnetwork/ex_secp256k1/compare/v0.7.1...v0.7.2)

---
updated-dependencies:
- dependency-name: ex_secp256k1
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 mix.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mix.lock b/mix.lock
index 75f3f2b0d102..f5b7c0e75ec1 100644
--- a/mix.lock
+++ b/mix.lock
@@ -52,7 +52,7 @@
   "ex_keccak": {:hex, :ex_keccak, "0.7.1", "0169f4b0c5073c5df61581d6282b12f1a1b764dcfcda4eeb1c819b5194c9ced0", [:mix], [{:rustler, ">= 0.0.0", [hex: :rustler, repo: "hexpm", optional: true]}, {:rustler_precompiled, "~> 0.6.1", [hex: :rustler_precompiled, repo: "hexpm", optional: false]}], "hexpm", "c18c19f66b6545b4b46b0c71c0cc0079de84e30b26365a92961e91697e8724ed"},
   "ex_machina": {:hex, :ex_machina, "2.7.0", "b792cc3127fd0680fecdb6299235b4727a4944a09ff0fa904cc639272cd92dc7", [:mix], [{:ecto, "~> 2.2 or ~> 3.0", [hex: :ecto, repo: "hexpm", optional: true]}, {:ecto_sql, "~> 3.0", [hex: :ecto_sql, repo: "hexpm", optional: true]}], "hexpm", "419aa7a39bde11894c87a615c4ecaa52d8f107bbdd81d810465186f783245bf8"},
   "ex_rlp": {:hex, :ex_rlp, "0.6.0", "985391d2356a7cb8712a4a9a2deb93f19f2fbca0323f5c1203fcaf64d077e31e", [:mix], [], "hexpm", "7135db93b861d9e76821039b60b00a6a22d2c4e751bf8c444bffe7a042f1abaf"},
-  "ex_secp256k1": {:hex, :ex_secp256k1, "0.7.1", "a03653a05b373a43e29aaf72e302edb83c697d971180156b4576ceef245f4217", [:mix], [{:rustler, ">= 0.0.0", [hex: :rustler, repo: "hexpm", optional: true]}, {:rustler_precompiled, "~> 0.6", [hex: :rustler_precompiled, repo: "hexpm", optional: false]}], "hexpm", "33399818b45ecbdef0af8205aa26f28334cddbe263541ce616e1808c2f5a7431"},
+  "ex_secp256k1": {:hex, :ex_secp256k1, "0.7.2", "33398c172813b90fab9ab75c12b98d16cfab472c6dcbde832b13c45ce1c01947", [:mix], [{:rustler, ">= 0.0.0", [hex: :rustler, repo: "hexpm", optional: true]}, {:rustler_precompiled, "~> 0.6", [hex: :rustler_precompiled, repo: "hexpm", optional: false]}], "hexpm", "f3b1bf56e6992e28b9d86e3bf741a4aca3e641052eb47d13ae4f5f4d4944bdaf"},
   "ex_utils": {:hex, :ex_utils, "0.1.7", "2c133e0bcdc49a858cf8dacf893308ebc05bc5fba501dc3d2935e65365ec0bf3", [:mix], [], "hexpm", "66d4fe75285948f2d1e69c2a5ddd651c398c813574f8d36a9eef11dc20356ef6"},
   "exactor": {:hex, :exactor, "2.2.4", "5efb4ddeb2c48d9a1d7c9b465a6fffdd82300eb9618ece5d34c3334d5d7245b1", [:mix], [], "hexpm", "1222419f706e01bfa1095aec9acf6421367dcfab798a6f67c54cf784733cd6b5"},
   "exjsx": {:hex, :exjsx, "4.0.0", "60548841e0212df401e38e63c0078ec57b33e7ea49b032c796ccad8cde794b5c", [:mix], [{:jsx, "~> 2.8.0", [hex: :jsx, repo: "hexpm", optional: false]}], "hexpm", "32e95820a97cffea67830e91514a2ad53b888850442d6d395f53a1ac60c82e07"},

From 57e23fe96d40439f071d75a241bd974dbc37c467 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 6 Sep 2023 18:29:22 +0000
Subject: [PATCH 384/909] Bump ex_abi from 0.6.0 to 0.6.1

Bumps [ex_abi](https://github.com/poanetwork/ex_abi) from 0.6.0 to 0.6.1.
- [Release notes](https://github.com/poanetwork/ex_abi/releases)
- [Changelog](https://github.com/poanetwork/ex_abi/blob/master/CHANGELOG.md)
- [Commits](https://github.com/poanetwork/ex_abi/commits)

---
updated-dependencies:
- dependency-name: ex_abi
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 mix.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mix.lock b/mix.lock
index f5b7c0e75ec1..aba6b621909e 100644
--- a/mix.lock
+++ b/mix.lock
@@ -41,7 +41,7 @@
   "ecto_sql": {:hex, :ecto_sql, "3.10.2", "6b98b46534b5c2f8b8b5f03f126e75e2a73c64f3c071149d32987a5378b0fdbd", [:mix], [{:db_connection, "~> 2.5 or ~> 2.4.1", [hex: :db_connection, repo: "hexpm", optional: false]}, {:ecto, "~> 3.10.0", [hex: :ecto, repo: "hexpm", optional: false]}, {:myxql, "~> 0.6.0", [hex: :myxql, repo: "hexpm", optional: true]}, {:postgrex, "~> 0.16.0 or ~> 0.17.0 or ~> 1.0", [hex: :postgrex, repo: "hexpm", optional: true]}, {:tds, "~> 2.1.1 or ~> 2.2", [hex: :tds, repo: "hexpm", optional: true]}, {:telemetry, "~> 0.4.0 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "68c018debca57cb9235e3889affdaec7a10616a4e3a80c99fa1d01fdafaa9007"},
   "elixir_make": {:hex, :elixir_make, "0.7.7", "7128c60c2476019ed978210c245badf08b03dbec4f24d05790ef791da11aa17c", [:mix], [{:castore, "~> 0.1 or ~> 1.0", [hex: :castore, repo: "hexpm", optional: true]}], "hexpm", "5bc19fff950fad52bbe5f211b12db9ec82c6b34a9647da0c2224b8b8464c7e6c"},
   "erlex": {:hex, :erlex, "0.2.6", "c7987d15e899c7a2f34f5420d2a2ea0d659682c06ac607572df55a43753aa12e", [:mix], [], "hexpm", "2ed2e25711feb44d52b17d2780eabf998452f6efda104877a3881c2f8c0c0c75"},
-  "ex_abi": {:hex, :ex_abi, "0.6.0", "8cf1fef9490dea0834bc201d399635e72178df05dea87b1c933478762dede142", [:mix], [{:ex_keccak, "~> 0.7.1", [hex: :ex_keccak, repo: "hexpm", optional: false]}, {:jason, "~> 1.4", [hex: :jason, repo: "hexpm", optional: false]}], "hexpm", "b03e5fe07371db3ceceb2d536cc32658dcba47b79952469e3e71d7690495e8d8"},
+  "ex_abi": {:hex, :ex_abi, "0.6.1", "b3dfc1f81e88c5927ac7ab18b7b743772323d151be6febc08c2a79372ce58842", [:mix], [{:ex_keccak, "~> 0.7.1", [hex: :ex_keccak, repo: "hexpm", optional: false]}, {:jason, "~> 1.4", [hex: :jason, repo: "hexpm", optional: false]}], "hexpm", "23f446e19b81428bb1c56de88a595b6aa45a423a7e4a97952c44bef50a66d921"},
   "ex_cldr": {:hex, :ex_cldr, "2.37.2", "c45041534ec60af367c4c1af02a608576118044fe3c441c782fd424061d6b517", [:mix], [{:cldr_utils, "~> 2.21", [hex: :cldr_utils, repo: "hexpm", optional: false]}, {:decimal, "~> 1.6 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: false]}, {:gettext, "~> 0.19", [hex: :gettext, repo: "hexpm", optional: true]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}, {:nimble_parsec, "~> 0.5 or ~> 1.0", [hex: :nimble_parsec, repo: "hexpm", optional: true]}], "hexpm", "c8467b1d5080716ace6621703b6656cb2f9545572a54b341da900791a0cf92ba"},
   "ex_cldr_currencies": {:hex, :ex_cldr_currencies, "2.15.0", "aadd34e91cfac7ef6b03fe8f47f8c6fa8c5daf3f89b5d9fee64ec545ded839cf", [:mix], [{:ex_cldr, "~> 2.34", [hex: :ex_cldr, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}], "hexpm", "0521316396c66877a2d636219767560bb2397c583341fcb154ecf9f3000e6ff8"},
   "ex_cldr_lists": {:hex, :ex_cldr_lists, "2.10.0", "4d4c9877da2d0417fd832907d69974e8328969f75fafc79b05ccf85f549f6281", [:mix], [{:ex_cldr_numbers, "~> 2.25", [hex: :ex_cldr_numbers, repo: "hexpm", optional: false]}, {:ex_doc, "~> 0.18", [hex: :ex_doc, repo: "hexpm", optional: true]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}], "hexpm", "adc040cde7b97f7fd7c0b35dd69ddb6fcf607303ae6355bb1851deae1f8b0652"},

From 12c3ed0e2a458ca5444ec13ac874ba91bcad4f11 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 6 Sep 2023 18:44:22 +0000
Subject: [PATCH 385/909] Bump luxon from 3.4.2 to 3.4.3 in
 /apps/block_scout_web/assets

Bumps [luxon](https://github.com/moment/luxon) from 3.4.2 to 3.4.3.
- [Changelog](https://github.com/moment/luxon/blob/master/CHANGELOG.md)
- [Commits](https://github.com/moment/luxon/compare/3.4.2...3.4.3)

---
updated-dependencies:
- dependency-name: luxon
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 apps/block_scout_web/assets/package-lock.json | 14 +++++++-------
 apps/block_scout_web/assets/package.json      |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/apps/block_scout_web/assets/package-lock.json b/apps/block_scout_web/assets/package-lock.json
index b4c9c0581fec..e7eb7fbf2b6a 100644
--- a/apps/block_scout_web/assets/package-lock.json
+++ b/apps/block_scout_web/assets/package-lock.json
@@ -44,7 +44,7 @@
         "lodash.omit": "^4.5.0",
         "lodash.rangeright": "^4.2.0",
         "lodash.reduce": "^4.6.0",
-        "luxon": "^3.4.2",
+        "luxon": "^3.4.3",
         "malihu-custom-scrollbar-plugin": "3.1.5",
         "mixpanel-browser": "^2.47.0",
         "moment": "^2.29.4",
@@ -12336,9 +12336,9 @@
       "integrity": "sha1-81ypHEk/e3PaDgdJUwTxezH4fuU="
     },
     "node_modules/luxon": {
-      "version": "3.4.2",
-      "resolved": "https://registry.npmjs.org/luxon/-/luxon-3.4.2.tgz",
-      "integrity": "sha512-uBoAVCVcajsrqy3pv7eo5jEUz1oeLmCcnMv8n4AJpT5hbpN9lUssAXibNElpbLce3Mhm9dyBzwYLs9zctM/0tA==",
+      "version": "3.4.3",
+      "resolved": "https://registry.npmjs.org/luxon/-/luxon-3.4.3.tgz",
+      "integrity": "sha512-tFWBiv3h7z+T/tDaoxA8rqTxy1CHV6gHS//QdaH4pulbq/JuBSGgQspQQqcgnwdAx6pNI7cmvz5Sv/addzHmUg==",
       "engines": {
         "node": ">=12"
       }
@@ -26900,9 +26900,9 @@
       "integrity": "sha1-81ypHEk/e3PaDgdJUwTxezH4fuU="
     },
     "luxon": {
-      "version": "3.4.2",
-      "resolved": "https://registry.npmjs.org/luxon/-/luxon-3.4.2.tgz",
-      "integrity": "sha512-uBoAVCVcajsrqy3pv7eo5jEUz1oeLmCcnMv8n4AJpT5hbpN9lUssAXibNElpbLce3Mhm9dyBzwYLs9zctM/0tA=="
+      "version": "3.4.3",
+      "resolved": "https://registry.npmjs.org/luxon/-/luxon-3.4.3.tgz",
+      "integrity": "sha512-tFWBiv3h7z+T/tDaoxA8rqTxy1CHV6gHS//QdaH4pulbq/JuBSGgQspQQqcgnwdAx6pNI7cmvz5Sv/addzHmUg=="
     },
     "make-dir": {
       "version": "4.0.0",
diff --git a/apps/block_scout_web/assets/package.json b/apps/block_scout_web/assets/package.json
index 88e232f79b28..b953a822f495 100644
--- a/apps/block_scout_web/assets/package.json
+++ b/apps/block_scout_web/assets/package.json
@@ -56,7 +56,7 @@
     "lodash.omit": "^4.5.0",
     "lodash.rangeright": "^4.2.0",
     "lodash.reduce": "^4.6.0",
-    "luxon": "^3.4.2",
+    "luxon": "^3.4.3",
     "malihu-custom-scrollbar-plugin": "3.1.5",
     "mixpanel-browser": "^2.47.0",
     "moment": "^2.29.4",

From cf6218314332d9588f7056c8a5a54759bcbfc090 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 7 Sep 2023 18:21:33 +0000
Subject: [PATCH 386/909] Bump core-js from 3.32.1 to 3.32.2 in
 /apps/block_scout_web/assets

Bumps [core-js](https://github.com/zloirock/core-js/tree/HEAD/packages/core-js) from 3.32.1 to 3.32.2.
- [Release notes](https://github.com/zloirock/core-js/releases)
- [Changelog](https://github.com/zloirock/core-js/blob/master/CHANGELOG.md)
- [Commits](https://github.com/zloirock/core-js/commits/v3.32.2/packages/core-js)

---
updated-dependencies:
- dependency-name: core-js
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 apps/block_scout_web/assets/package-lock.json | 14 +++++++-------
 apps/block_scout_web/assets/package.json      |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/apps/block_scout_web/assets/package-lock.json b/apps/block_scout_web/assets/package-lock.json
index e7eb7fbf2b6a..ca7f50e61e3c 100644
--- a/apps/block_scout_web/assets/package-lock.json
+++ b/apps/block_scout_web/assets/package-lock.json
@@ -17,7 +17,7 @@
         "chart.js": "^4.4.0",
         "chartjs-adapter-luxon": "^1.3.1",
         "clipboard": "^2.0.11",
-        "core-js": "^3.32.1",
+        "core-js": "^3.32.2",
         "crypto-browserify": "^3.12.0",
         "dropzone": "^5.9.3",
         "eth-net-props": "^1.0.41",
@@ -5813,9 +5813,9 @@
       }
     },
     "node_modules/core-js": {
-      "version": "3.32.1",
-      "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.32.1.tgz",
-      "integrity": "sha512-lqufgNn9NLnESg5mQeYsxQP5w7wrViSj0jr/kv6ECQiByzQkrn1MKvV0L3acttpDqfQrHLwr2KCMgX5b8X+lyQ==",
+      "version": "3.32.2",
+      "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.32.2.tgz",
+      "integrity": "sha512-pxXSw1mYZPDGvTQqEc5vgIb83jGQKFGYWY76z4a7weZXUolw3G+OvpZqSRcfYOoOVUQJYEPsWeQK8pKEnUtWxQ==",
       "hasInstallScript": true,
       "funding": {
         "type": "opencollective",
@@ -21877,9 +21877,9 @@
       }
     },
     "core-js": {
-      "version": "3.32.1",
-      "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.32.1.tgz",
-      "integrity": "sha512-lqufgNn9NLnESg5mQeYsxQP5w7wrViSj0jr/kv6ECQiByzQkrn1MKvV0L3acttpDqfQrHLwr2KCMgX5b8X+lyQ=="
+      "version": "3.32.2",
+      "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.32.2.tgz",
+      "integrity": "sha512-pxXSw1mYZPDGvTQqEc5vgIb83jGQKFGYWY76z4a7weZXUolw3G+OvpZqSRcfYOoOVUQJYEPsWeQK8pKEnUtWxQ=="
     },
     "core-js-compat": {
       "version": "3.31.0",
diff --git a/apps/block_scout_web/assets/package.json b/apps/block_scout_web/assets/package.json
index b953a822f495..7575d730ccd9 100644
--- a/apps/block_scout_web/assets/package.json
+++ b/apps/block_scout_web/assets/package.json
@@ -29,7 +29,7 @@
     "chart.js": "^4.4.0",
     "chartjs-adapter-luxon": "^1.3.1",
     "clipboard": "^2.0.11",
-    "core-js": "^3.32.1",
+    "core-js": "^3.32.2",
     "crypto-browserify": "^3.12.0",
     "dropzone": "^5.9.3",
     "eth-net-props": "^1.0.41",

From 63a045f352b0f5e90dfecbc2d24e6e784c97e15b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 8 Sep 2023 18:47:22 +0000
Subject: [PATCH 387/909] Bump @babel/core from 7.22.15 to 7.22.17 in
 /apps/block_scout_web/assets

Bumps [@babel/core](https://github.com/babel/babel/tree/HEAD/packages/babel-core) from 7.22.15 to 7.22.17.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/commits/v7.22.17/packages/babel-core)

---
updated-dependencies:
- dependency-name: "@babel/core"
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 apps/block_scout_web/assets/package-lock.json | 86 +++++++++----------
 apps/block_scout_web/assets/package.json      |  2 +-
 2 files changed, 44 insertions(+), 44 deletions(-)

diff --git a/apps/block_scout_web/assets/package-lock.json b/apps/block_scout_web/assets/package-lock.json
index ca7f50e61e3c..c73febfd0642 100644
--- a/apps/block_scout_web/assets/package-lock.json
+++ b/apps/block_scout_web/assets/package-lock.json
@@ -71,7 +71,7 @@
         "xss": "^1.0.14"
       },
       "devDependencies": {
-        "@babel/core": "^7.22.15",
+        "@babel/core": "^7.22.17",
         "@babel/preset-env": "^7.22.15",
         "autoprefixer": "^10.4.15",
         "babel-loader": "^9.1.3",
@@ -249,20 +249,20 @@
       }
     },
     "node_modules/@babel/core": {
-      "version": "7.22.15",
-      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.22.15.tgz",
-      "integrity": "sha512-PtZqMmgRrvj8ruoEOIwVA3yoF91O+Hgw9o7DAUTNBA6Mo2jpu31clx9a7Nz/9JznqetTR6zwfC4L3LAjKQXUwA==",
+      "version": "7.22.17",
+      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.22.17.tgz",
+      "integrity": "sha512-2EENLmhpwplDux5PSsZnSbnSkB3tZ6QTksgO25xwEL7pIDcNOMhF5v/s6RzwjMZzZzw9Ofc30gHv5ChCC8pifQ==",
       "dependencies": {
         "@ampproject/remapping": "^2.2.0",
         "@babel/code-frame": "^7.22.13",
         "@babel/generator": "^7.22.15",
         "@babel/helper-compilation-targets": "^7.22.15",
-        "@babel/helper-module-transforms": "^7.22.15",
+        "@babel/helper-module-transforms": "^7.22.17",
         "@babel/helpers": "^7.22.15",
-        "@babel/parser": "^7.22.15",
+        "@babel/parser": "^7.22.16",
         "@babel/template": "^7.22.15",
-        "@babel/traverse": "^7.22.15",
-        "@babel/types": "^7.22.15",
+        "@babel/traverse": "^7.22.17",
+        "@babel/types": "^7.22.17",
         "convert-source-map": "^1.7.0",
         "debug": "^4.1.0",
         "gensync": "^1.0.0-beta.2",
@@ -453,9 +453,9 @@
       }
     },
     "node_modules/@babel/helper-module-transforms": {
-      "version": "7.22.15",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.22.15.tgz",
-      "integrity": "sha512-l1UiX4UyHSFsYt17iQ3Se5pQQZZHa22zyIXURmvkmLCD4t/aU+dvNWHatKac/D9Vm9UES7nvIqHs4jZqKviUmQ==",
+      "version": "7.22.17",
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.22.17.tgz",
+      "integrity": "sha512-XouDDhQESrLHTpnBtCKExJdyY4gJCdrvH2Pyv8r8kovX2U8G0dRUOT45T9XlbLtuu9CLXP15eusnkprhoPV5iQ==",
       "dependencies": {
         "@babel/helper-environment-visitor": "^7.22.5",
         "@babel/helper-module-imports": "^7.22.15",
@@ -623,9 +623,9 @@
       }
     },
     "node_modules/@babel/parser": {
-      "version": "7.22.15",
-      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.22.15.tgz",
-      "integrity": "sha512-RWmQ/sklUN9BvGGpCDgSubhHWfAx24XDTDObup4ffvxaYsptOg2P3KG0j+1eWKLxpkX0j0uHxmpq2Z1SP/VhxA==",
+      "version": "7.22.16",
+      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.22.16.tgz",
+      "integrity": "sha512-+gPfKv8UWeKKeJTUxe59+OobVcrYHETCsORl61EmSkmgymguYk/X5bp7GuUIXaFsc6y++v8ZxPsLSSuujqDphA==",
       "bin": {
         "parser": "bin/babel-parser.js"
       },
@@ -1938,9 +1938,9 @@
       }
     },
     "node_modules/@babel/traverse": {
-      "version": "7.22.15",
-      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.22.15.tgz",
-      "integrity": "sha512-DdHPwvJY0sEeN4xJU5uRLmZjgMMDIvMPniLuYzUVXj/GGzysPl0/fwt44JBkyUIzGJPV8QgHMcQdQ34XFuKTYQ==",
+      "version": "7.22.17",
+      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.22.17.tgz",
+      "integrity": "sha512-xK4Uwm0JnAMvxYZxOVecss85WxTEIbTa7bnGyf/+EgCL5Zt3U7htUpEOWv9detPlamGKuRzCqw74xVglDWpPdg==",
       "dependencies": {
         "@babel/code-frame": "^7.22.13",
         "@babel/generator": "^7.22.15",
@@ -1948,8 +1948,8 @@
         "@babel/helper-function-name": "^7.22.5",
         "@babel/helper-hoist-variables": "^7.22.5",
         "@babel/helper-split-export-declaration": "^7.22.6",
-        "@babel/parser": "^7.22.15",
-        "@babel/types": "^7.22.15",
+        "@babel/parser": "^7.22.16",
+        "@babel/types": "^7.22.17",
         "debug": "^4.1.0",
         "globals": "^11.1.0"
       },
@@ -1958,9 +1958,9 @@
       }
     },
     "node_modules/@babel/types": {
-      "version": "7.22.15",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.22.15.tgz",
-      "integrity": "sha512-X+NLXr0N8XXmN5ZsaQdm9U2SSC3UbIYq/doL++sueHOTisgZHoKaQtZxGuV2cUPQHMfjKEfg/g6oy7Hm6SKFtA==",
+      "version": "7.22.17",
+      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.22.17.tgz",
+      "integrity": "sha512-YSQPHLFtQNE5xN9tHuZnzu8vPr61wVTBZdfv1meex1NBosa4iT05k/Jw06ddJugi4bk7The/oSwQGFcksmEJQg==",
       "dependencies": {
         "@babel/helper-string-parser": "^7.22.5",
         "@babel/helper-validator-identifier": "^7.22.15",
@@ -17737,20 +17737,20 @@
       "integrity": "sha512-5UamI7xkUcJ3i9qVDS+KFDEK8/7oJ55/sJMB1Ge7IEapr7KfdfV/HErR+koZwOfd+SgtFKOKRhRakdg++DcJpQ=="
     },
     "@babel/core": {
-      "version": "7.22.15",
-      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.22.15.tgz",
-      "integrity": "sha512-PtZqMmgRrvj8ruoEOIwVA3yoF91O+Hgw9o7DAUTNBA6Mo2jpu31clx9a7Nz/9JznqetTR6zwfC4L3LAjKQXUwA==",
+      "version": "7.22.17",
+      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.22.17.tgz",
+      "integrity": "sha512-2EENLmhpwplDux5PSsZnSbnSkB3tZ6QTksgO25xwEL7pIDcNOMhF5v/s6RzwjMZzZzw9Ofc30gHv5ChCC8pifQ==",
       "requires": {
         "@ampproject/remapping": "^2.2.0",
         "@babel/code-frame": "^7.22.13",
         "@babel/generator": "^7.22.15",
         "@babel/helper-compilation-targets": "^7.22.15",
-        "@babel/helper-module-transforms": "^7.22.15",
+        "@babel/helper-module-transforms": "^7.22.17",
         "@babel/helpers": "^7.22.15",
-        "@babel/parser": "^7.22.15",
+        "@babel/parser": "^7.22.16",
         "@babel/template": "^7.22.15",
-        "@babel/traverse": "^7.22.15",
-        "@babel/types": "^7.22.15",
+        "@babel/traverse": "^7.22.17",
+        "@babel/types": "^7.22.17",
         "convert-source-map": "^1.7.0",
         "debug": "^4.1.0",
         "gensync": "^1.0.0-beta.2",
@@ -17894,9 +17894,9 @@
       }
     },
     "@babel/helper-module-transforms": {
-      "version": "7.22.15",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.22.15.tgz",
-      "integrity": "sha512-l1UiX4UyHSFsYt17iQ3Se5pQQZZHa22zyIXURmvkmLCD4t/aU+dvNWHatKac/D9Vm9UES7nvIqHs4jZqKviUmQ==",
+      "version": "7.22.17",
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.22.17.tgz",
+      "integrity": "sha512-XouDDhQESrLHTpnBtCKExJdyY4gJCdrvH2Pyv8r8kovX2U8G0dRUOT45T9XlbLtuu9CLXP15eusnkprhoPV5iQ==",
       "requires": {
         "@babel/helper-environment-visitor": "^7.22.5",
         "@babel/helper-module-imports": "^7.22.15",
@@ -18013,9 +18013,9 @@
       }
     },
     "@babel/parser": {
-      "version": "7.22.15",
-      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.22.15.tgz",
-      "integrity": "sha512-RWmQ/sklUN9BvGGpCDgSubhHWfAx24XDTDObup4ffvxaYsptOg2P3KG0j+1eWKLxpkX0j0uHxmpq2Z1SP/VhxA=="
+      "version": "7.22.16",
+      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.22.16.tgz",
+      "integrity": "sha512-+gPfKv8UWeKKeJTUxe59+OobVcrYHETCsORl61EmSkmgymguYk/X5bp7GuUIXaFsc6y++v8ZxPsLSSuujqDphA=="
     },
     "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": {
       "version": "7.22.15",
@@ -18901,9 +18901,9 @@
       }
     },
     "@babel/traverse": {
-      "version": "7.22.15",
-      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.22.15.tgz",
-      "integrity": "sha512-DdHPwvJY0sEeN4xJU5uRLmZjgMMDIvMPniLuYzUVXj/GGzysPl0/fwt44JBkyUIzGJPV8QgHMcQdQ34XFuKTYQ==",
+      "version": "7.22.17",
+      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.22.17.tgz",
+      "integrity": "sha512-xK4Uwm0JnAMvxYZxOVecss85WxTEIbTa7bnGyf/+EgCL5Zt3U7htUpEOWv9detPlamGKuRzCqw74xVglDWpPdg==",
       "requires": {
         "@babel/code-frame": "^7.22.13",
         "@babel/generator": "^7.22.15",
@@ -18911,16 +18911,16 @@
         "@babel/helper-function-name": "^7.22.5",
         "@babel/helper-hoist-variables": "^7.22.5",
         "@babel/helper-split-export-declaration": "^7.22.6",
-        "@babel/parser": "^7.22.15",
-        "@babel/types": "^7.22.15",
+        "@babel/parser": "^7.22.16",
+        "@babel/types": "^7.22.17",
         "debug": "^4.1.0",
         "globals": "^11.1.0"
       }
     },
     "@babel/types": {
-      "version": "7.22.15",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.22.15.tgz",
-      "integrity": "sha512-X+NLXr0N8XXmN5ZsaQdm9U2SSC3UbIYq/doL++sueHOTisgZHoKaQtZxGuV2cUPQHMfjKEfg/g6oy7Hm6SKFtA==",
+      "version": "7.22.17",
+      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.22.17.tgz",
+      "integrity": "sha512-YSQPHLFtQNE5xN9tHuZnzu8vPr61wVTBZdfv1meex1NBosa4iT05k/Jw06ddJugi4bk7The/oSwQGFcksmEJQg==",
       "requires": {
         "@babel/helper-string-parser": "^7.22.5",
         "@babel/helper-validator-identifier": "^7.22.15",
diff --git a/apps/block_scout_web/assets/package.json b/apps/block_scout_web/assets/package.json
index 7575d730ccd9..81a4469a8ed1 100644
--- a/apps/block_scout_web/assets/package.json
+++ b/apps/block_scout_web/assets/package.json
@@ -83,7 +83,7 @@
     "xss": "^1.0.14"
   },
   "devDependencies": {
-    "@babel/core": "^7.22.15",
+    "@babel/core": "^7.22.17",
     "@babel/preset-env": "^7.22.15",
     "autoprefixer": "^10.4.15",
     "babel-loader": "^9.1.3",

From be4011543e9efb144d5d173eb816ea4f2afb87c7 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 8 Sep 2023 18:48:06 +0000
Subject: [PATCH 388/909] Bump url from 0.11.1 to 0.11.2 in
 /apps/block_scout_web/assets

Bumps [url](https://github.com/defunctzombie/node-url) from 0.11.1 to 0.11.2.
- [Commits](https://github.com/defunctzombie/node-url/compare/v0.11.1...v0.11.2)

---
updated-dependencies:
- dependency-name: url
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 apps/block_scout_web/assets/package-lock.json | 18 +++++++++---------
 apps/block_scout_web/assets/package.json      |  2 +-
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/apps/block_scout_web/assets/package-lock.json b/apps/block_scout_web/assets/package-lock.json
index ca7f50e61e3c..716522c924b9 100644
--- a/apps/block_scout_web/assets/package-lock.json
+++ b/apps/block_scout_web/assets/package-lock.json
@@ -63,7 +63,7 @@
         "stream-http": "^3.1.1",
         "sweetalert2": "^11.7.27",
         "urijs": "^1.19.11",
-        "url": "^0.11.1",
+        "url": "^0.11.2",
         "util": "^0.12.5",
         "viewerjs": "^1.11.5",
         "web3": "^1.10.0",
@@ -16406,12 +16406,12 @@
       "integrity": "sha512-HXgFDgDommxn5/bIv0cnQZsPhHDA90NPHD6+c/v21U5+Sx5hoP8+dP9IZXBU1gIfvdRfhG8cel9QNPeionfcCQ=="
     },
     "node_modules/url": {
-      "version": "0.11.1",
-      "resolved": "https://registry.npmjs.org/url/-/url-0.11.1.tgz",
-      "integrity": "sha512-rWS3H04/+mzzJkv0eZ7vEDGiQbgquI1fGfOad6zKvgYQi1SzMmhl7c/DdRGxhaWrVH6z0qWITo8rpnxK/RfEhA==",
+      "version": "0.11.2",
+      "resolved": "https://registry.npmjs.org/url/-/url-0.11.2.tgz",
+      "integrity": "sha512-7yIgNnrST44S7PJ5+jXbdIupfU1nWUdQJBFBeJRclPXiWgCvrSq5Frw8lr/i//n5sqDfzoKmBymMS81l4U/7cg==",
       "dependencies": {
         "punycode": "^1.4.1",
-        "qs": "^6.11.0"
+        "qs": "^6.11.2"
       }
     },
     "node_modules/url-parse": {
@@ -29865,12 +29865,12 @@
       "integrity": "sha512-HXgFDgDommxn5/bIv0cnQZsPhHDA90NPHD6+c/v21U5+Sx5hoP8+dP9IZXBU1gIfvdRfhG8cel9QNPeionfcCQ=="
     },
     "url": {
-      "version": "0.11.1",
-      "resolved": "https://registry.npmjs.org/url/-/url-0.11.1.tgz",
-      "integrity": "sha512-rWS3H04/+mzzJkv0eZ7vEDGiQbgquI1fGfOad6zKvgYQi1SzMmhl7c/DdRGxhaWrVH6z0qWITo8rpnxK/RfEhA==",
+      "version": "0.11.2",
+      "resolved": "https://registry.npmjs.org/url/-/url-0.11.2.tgz",
+      "integrity": "sha512-7yIgNnrST44S7PJ5+jXbdIupfU1nWUdQJBFBeJRclPXiWgCvrSq5Frw8lr/i//n5sqDfzoKmBymMS81l4U/7cg==",
       "requires": {
         "punycode": "^1.4.1",
-        "qs": "^6.11.0"
+        "qs": "^6.11.2"
       },
       "dependencies": {
         "punycode": {
diff --git a/apps/block_scout_web/assets/package.json b/apps/block_scout_web/assets/package.json
index 7575d730ccd9..d3b6063f1f2c 100644
--- a/apps/block_scout_web/assets/package.json
+++ b/apps/block_scout_web/assets/package.json
@@ -75,7 +75,7 @@
     "stream-http": "^3.1.1",
     "sweetalert2": "^11.7.27",
     "urijs": "^1.19.11",
-    "url": "^0.11.1",
+    "url": "^0.11.2",
     "util": "^0.12.5",
     "viewerjs": "^1.11.5",
     "web3": "^1.10.0",

From 78c69c7f042a1dae8b3968188a9c21e5e0b0e356 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 8 Sep 2023 18:48:20 +0000
Subject: [PATCH 389/909] Bump assert from 2.0.0 to 2.1.0 in
 /apps/block_scout_web/assets

Bumps [assert](https://github.com/browserify/commonjs-assert) from 2.0.0 to 2.1.0.
- [Release notes](https://github.com/browserify/commonjs-assert/releases)
- [Changelog](https://github.com/browserify/commonjs-assert/blob/main/CHANGELOG.md)
- [Commits](https://github.com/browserify/commonjs-assert/compare/v2.0.0...v2.1.0)

---
updated-dependencies:
- dependency-name: assert
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 apps/block_scout_web/assets/package-lock.json | 44 +++++++------------
 apps/block_scout_web/assets/package.json      |  2 +-
 2 files changed, 18 insertions(+), 28 deletions(-)

diff --git a/apps/block_scout_web/assets/package-lock.json b/apps/block_scout_web/assets/package-lock.json
index ca7f50e61e3c..28cc6e07cc98 100644
--- a/apps/block_scout_web/assets/package-lock.json
+++ b/apps/block_scout_web/assets/package-lock.json
@@ -11,7 +11,7 @@
         "@fortawesome/fontawesome-free": "^6.4.2",
         "@tarekraafat/autocomplete.js": "^10.2.7",
         "@walletconnect/web3-provider": "^1.8.0",
-        "assert": "^2.0.0",
+        "assert": "^2.1.0",
         "bignumber.js": "^9.1.2",
         "bootstrap": "^4.6.0",
         "chart.js": "^4.4.0",
@@ -4437,14 +4437,15 @@
       "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA=="
     },
     "node_modules/assert": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/assert/-/assert-2.0.0.tgz",
-      "integrity": "sha512-se5Cd+js9dXJnu6Ag2JFc00t+HmHOen+8Q+L7O9zI0PqQXr20uk2J0XQqMxZEeo5U50o8Nvmmx7dZrl+Ufr35A==",
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/assert/-/assert-2.1.0.tgz",
+      "integrity": "sha512-eLHpSK/Y4nhMJ07gDaAzoX/XAKS8PSaojml3M0DM4JpV1LAi5JOJ/p6H/XWrl8L+DzVEvVCW1z3vWAaB9oTsQw==",
       "dependencies": {
-        "es6-object-assign": "^1.1.0",
-        "is-nan": "^1.2.1",
-        "object-is": "^1.0.1",
-        "util": "^0.12.0"
+        "call-bind": "^1.0.2",
+        "is-nan": "^1.3.2",
+        "object-is": "^1.1.5",
+        "object.assign": "^4.1.4",
+        "util": "^0.12.5"
       }
     },
     "node_modules/assert-plus": {
@@ -6980,11 +6981,6 @@
         "es6-symbol": "^3.1.1"
       }
     },
-    "node_modules/es6-object-assign": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/es6-object-assign/-/es6-object-assign-1.1.0.tgz",
-      "integrity": "sha1-wsNYJlYkfDnqEHyx5mUrb58kUjw="
-    },
     "node_modules/es6-promise": {
       "version": "4.2.8",
       "resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-4.2.8.tgz",
@@ -13026,7 +13022,6 @@
       "version": "4.1.4",
       "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.4.tgz",
       "integrity": "sha512-1mxKf0e58bvyjSCtKYY4sRe9itRk3PJpquJOjeIkz885CczcI4IvJJDLPS72oowuSh+pBxUFROpX+TU++hxhZQ==",
-      "dev": true,
       "dependencies": {
         "call-bind": "^1.0.2",
         "define-properties": "^1.1.4",
@@ -20831,14 +20826,15 @@
       }
     },
     "assert": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/assert/-/assert-2.0.0.tgz",
-      "integrity": "sha512-se5Cd+js9dXJnu6Ag2JFc00t+HmHOen+8Q+L7O9zI0PqQXr20uk2J0XQqMxZEeo5U50o8Nvmmx7dZrl+Ufr35A==",
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/assert/-/assert-2.1.0.tgz",
+      "integrity": "sha512-eLHpSK/Y4nhMJ07gDaAzoX/XAKS8PSaojml3M0DM4JpV1LAi5JOJ/p6H/XWrl8L+DzVEvVCW1z3vWAaB9oTsQw==",
       "requires": {
-        "es6-object-assign": "^1.1.0",
-        "is-nan": "^1.2.1",
-        "object-is": "^1.0.1",
-        "util": "^0.12.0"
+        "call-bind": "^1.0.2",
+        "is-nan": "^1.3.2",
+        "object-is": "^1.1.5",
+        "object.assign": "^4.1.4",
+        "util": "^0.12.5"
       }
     },
     "assert-plus": {
@@ -22759,11 +22755,6 @@
         "es6-symbol": "^3.1.1"
       }
     },
-    "es6-object-assign": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/es6-object-assign/-/es6-object-assign-1.1.0.tgz",
-      "integrity": "sha1-wsNYJlYkfDnqEHyx5mUrb58kUjw="
-    },
     "es6-promise": {
       "version": "4.2.8",
       "resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-4.2.8.tgz",
@@ -27452,7 +27443,6 @@
       "version": "4.1.4",
       "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.4.tgz",
       "integrity": "sha512-1mxKf0e58bvyjSCtKYY4sRe9itRk3PJpquJOjeIkz885CczcI4IvJJDLPS72oowuSh+pBxUFROpX+TU++hxhZQ==",
-      "dev": true,
       "requires": {
         "call-bind": "^1.0.2",
         "define-properties": "^1.1.4",
diff --git a/apps/block_scout_web/assets/package.json b/apps/block_scout_web/assets/package.json
index 7575d730ccd9..0feddd20ae64 100644
--- a/apps/block_scout_web/assets/package.json
+++ b/apps/block_scout_web/assets/package.json
@@ -23,7 +23,7 @@
     "@amplitude/analytics-browser": "^2.2.3",
     "@tarekraafat/autocomplete.js": "^10.2.7",
     "@walletconnect/web3-provider": "^1.8.0",
-    "assert": "^2.0.0",
+    "assert": "^2.1.0",
     "bignumber.js": "^9.1.2",
     "bootstrap": "^4.6.0",
     "chart.js": "^4.4.0",

From e148a7fb8b68c294bb7f6449fd81a7ba0d6a6597 Mon Sep 17 00:00:00 2001
From: jasonzysun <jasonzysun@163.com>
Date: Sat, 9 Sep 2023 17:21:16 +0800
Subject: [PATCH 390/909] Add routing proxies starting with favicon to
 FRONT_PROXY_PASS

---
 docker-compose/proxy/default.conf.template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker-compose/proxy/default.conf.template b/docker-compose/proxy/default.conf.template
index 1b20024c4d3a..0ea0e3bf9fb2 100644
--- a/docker-compose/proxy/default.conf.template
+++ b/docker-compose/proxy/default.conf.template
@@ -31,7 +31,7 @@ server {
         proxy_set_header      Connection $connection_upgrade;
         proxy_cache_bypass    $http_upgrade;
     }
-    location ~ ^/(_next|node-api|apps|account|accounts|static|auth/profile|auth/unverified-email|txs|tx|blocks|block|login|address|stats|search-results|token|tokens|visualize|api-docs|csv-export|verified-contracts|graphiql|withdrawals) {
+    location ~ ^/(_next|node-api|apps|account|accounts|favicon|static|auth/profile|auth/unverified-email|txs|tx|blocks|block|login|address|stats|search-results|token|tokens|visualize|api-docs|csv-export|verified-contracts|graphiql|withdrawals) {
         proxy_pass            ${FRONT_PROXY_PASS};
         proxy_http_version    1.1;
         proxy_set_header      Host "$host";

From 6d8df8a37ba5e961566c07e94cd2bc77ef6d4984 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 10 Sep 2023 14:37:51 +0000
Subject: [PATCH 391/909] Bump photoswipe from 5.3.9 to 5.4.0 in
 /apps/block_scout_web/assets

Bumps [photoswipe](https://github.com/dimsemenov/Photoswipe) from 5.3.9 to 5.4.0.
- [Release notes](https://github.com/dimsemenov/Photoswipe/releases)
- [Commits](https://github.com/dimsemenov/Photoswipe/compare/v5.3.9...v5.4.0)

---
updated-dependencies:
- dependency-name: photoswipe
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 apps/block_scout_web/assets/package-lock.json | 14 +++++++-------
 apps/block_scout_web/assets/package.json      |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/apps/block_scout_web/assets/package-lock.json b/apps/block_scout_web/assets/package-lock.json
index c8e1998b6e54..ff7bf7093ffc 100644
--- a/apps/block_scout_web/assets/package-lock.json
+++ b/apps/block_scout_web/assets/package-lock.json
@@ -54,7 +54,7 @@
         "path-parser": "^6.1.0",
         "phoenix": "file:../../../deps/phoenix",
         "phoenix_html": "file:../../../deps/phoenix_html",
-        "photoswipe": "^5.3.9",
+        "photoswipe": "^5.4.0",
         "pikaday": "^1.8.2",
         "popper.js": "^1.14.7",
         "reduce-reducers": "^1.0.4",
@@ -13361,9 +13361,9 @@
       "link": true
     },
     "node_modules/photoswipe": {
-      "version": "5.3.9",
-      "resolved": "https://registry.npmjs.org/photoswipe/-/photoswipe-5.3.9.tgz",
-      "integrity": "sha512-z9ACLW9472gAawrIXXiliuz9xNZ3xEl7cIPHqY/lAeFQT9X+N9sgCwa86WK9wnK8cuk/F3QEO45n+QSiZnKd2A==",
+      "version": "5.4.0",
+      "resolved": "https://registry.npmjs.org/photoswipe/-/photoswipe-5.4.0.tgz",
+      "integrity": "sha512-PZvdK1D94TApU0MNWc9H6eXOolKJOMkgt7CJ9ZfIdkHR4CrEj47MOe4Vrlcv6ZpHslK+uKS6Ai3y3VIe7gsi+Q==",
       "engines": {
         "node": ">= 0.12.0"
       }
@@ -27698,9 +27698,9 @@
       "version": "file:../../../deps/phoenix_html"
     },
     "photoswipe": {
-      "version": "5.3.9",
-      "resolved": "https://registry.npmjs.org/photoswipe/-/photoswipe-5.3.9.tgz",
-      "integrity": "sha512-z9ACLW9472gAawrIXXiliuz9xNZ3xEl7cIPHqY/lAeFQT9X+N9sgCwa86WK9wnK8cuk/F3QEO45n+QSiZnKd2A=="
+      "version": "5.4.0",
+      "resolved": "https://registry.npmjs.org/photoswipe/-/photoswipe-5.4.0.tgz",
+      "integrity": "sha512-PZvdK1D94TApU0MNWc9H6eXOolKJOMkgt7CJ9ZfIdkHR4CrEj47MOe4Vrlcv6ZpHslK+uKS6Ai3y3VIe7gsi+Q=="
     },
     "picocolors": {
       "version": "1.0.0",
diff --git a/apps/block_scout_web/assets/package.json b/apps/block_scout_web/assets/package.json
index c2896d5f5a04..11a58274dca4 100644
--- a/apps/block_scout_web/assets/package.json
+++ b/apps/block_scout_web/assets/package.json
@@ -66,7 +66,7 @@
     "path-parser": "^6.1.0",
     "phoenix": "file:../../../deps/phoenix",
     "phoenix_html": "file:../../../deps/phoenix_html",
-    "photoswipe": "^5.3.9",
+    "photoswipe": "^5.4.0",
     "pikaday": "^1.8.2",
     "popper.js": "^1.14.7",
     "reduce-reducers": "^1.0.4",

From 9cf34bd6c1da9c7c67bdaa0d1bc85bedac1cafd3 Mon Sep 17 00:00:00 2001
From: Nikita Pozdniakov <nikitosing4@mail.ru>
Date: Sun, 10 Sep 2023 14:54:36 +0300
Subject: [PATCH 392/909] Fix contracts' output decoding

---
 CHANGELOG.md                                  |   1 +
 .../views/api/v2/smart_contract_view.ex       |  27 ++--
 .../views/smart_contract_view.ex              |  81 +---------
 .../api/v2/smart_contract_controller_test.exs | 142 ++++++++++++++++++
 .../views/smart_contract_view_test.exs        |  49 +++---
 .../lib/explorer/smart_contract/reader.ex     | 112 ++++++++++++++
 6 files changed, 295 insertions(+), 117 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3d874f87ca85..c766d2207beb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -15,6 +15,7 @@
 
 ### Fixes
 
+- [#8431](https://github.com/blockscout/blockscout/pull/8431) - Fix contracts' output decoding
 - [#8354](https://github.com/blockscout/blockscout/pull/8354) - Hotfix for proper addresses' tokens displaying
 - [#8350](https://github.com/blockscout/blockscout/pull/8350) - Add Base Mainnet support for tx actions
 - [#8282](https://github.com/blockscout/blockscout/pull/8282) - NFT fetcher improvements
diff --git a/apps/block_scout_web/lib/block_scout_web/views/api/v2/smart_contract_view.ex b/apps/block_scout_web/lib/block_scout_web/views/api/v2/smart_contract_view.ex
index 6a35a0c6fbd3..1c102bf0cc11 100644
--- a/apps/block_scout_web/lib/block_scout_web/views/api/v2/smart_contract_view.ex
+++ b/apps/block_scout_web/lib/block_scout_web/views/api/v2/smart_contract_view.ex
@@ -1,6 +1,8 @@
 defmodule BlockScoutWeb.API.V2.SmartContractView do
   use BlockScoutWeb, :view
 
+  import Explorer.SmartContract.Reader, only: [zip_tuple_values_with_types: 2]
+
   alias ABI.FunctionSelector
   alias BlockScoutWeb.API.V2.{Helper, TransactionView}
   alias BlockScoutWeb.SmartContractView
@@ -284,28 +286,31 @@ defmodule BlockScoutWeb.API.V2.SmartContractView do
     %{"type" => type, "value" => render_json(value, type)}
   end
 
-  def render_json(value, type) when type in [:address, "address", "address payable"] do
-    SmartContractView.cast_address(value)
-  end
-
-  def render_json(value, type) when type in [:string, "string"] do
-    to_string(value)
-  end
-
   def render_json(value, type) when is_tuple(value) do
     value
-    |> SmartContractView.zip_tuple_values_with_types(type)
+    |> zip_tuple_values_with_types(type)
     |> Enum.map(fn {type, value} ->
       render_json(value, type)
     end)
   end
 
   def render_json(value, type) when is_list(value) do
+    type =
+      if String.ends_with?(type, "[]") do
+        String.slice(type, 0..-3)
+      else
+        type
+      end
+
     value |> Enum.map(&render_json(&1, type))
   end
 
-  def render_json(value, _type) when is_binary(value) do
-    SmartContractView.binary_to_utf_string(value)
+  def render_json(value, type) when type in [:address, "address", "address payable"] do
+    SmartContractView.cast_address(value)
+  end
+
+  def render_json(value, type) when type in [:string, "string"] do
+    to_string(value)
   end
 
   def render_json(value, _type) do
diff --git a/apps/block_scout_web/lib/block_scout_web/views/smart_contract_view.ex b/apps/block_scout_web/lib/block_scout_web/views/smart_contract_view.ex
index 4a96a93adb6c..f0245adc2dfc 100644
--- a/apps/block_scout_web/lib/block_scout_web/views/smart_contract_view.ex
+++ b/apps/block_scout_web/lib/block_scout_web/views/smart_contract_view.ex
@@ -1,6 +1,8 @@
 defmodule BlockScoutWeb.SmartContractView do
   use BlockScoutWeb, :view
 
+  import Explorer.SmartContract.Reader, only: [zip_tuple_values_with_types: 2]
+
   alias Explorer.Chain
   alias Explorer.Chain.{Address, Transaction}
   alias Explorer.Chain.Hash.Address, as: HashAddress
@@ -72,7 +74,7 @@ defmodule BlockScoutWeb.SmartContractView do
       String.starts_with?(type, "bytes") ->
         values =
           value
-          |> Enum.map_join(", ", &binary_to_utf_string(&1))
+          |> Enum.join(", ")
 
         render_array_type_value(type, values, fetch_name(names, index))
 
@@ -107,6 +109,9 @@ defmodule BlockScoutWeb.SmartContractView do
   def values_with_type(value, string, names, index, _components) when string in ["string", :string],
     do: render_type_value("string", Helper.sanitize_input(value), fetch_name(names, index))
 
+  def values_with_type(value, "bytes" <> _ = bytes_type, names, index, _components),
+    do: render_type_value(bytes_type, Helper.sanitize_input(value), fetch_name(names, index))
+
   def values_with_type(value, bytes, names, index, _components) when bytes in [:bytes],
     do: render_type_value("bytes", Helper.sanitize_input(value), fetch_name(names, index))
 
@@ -114,7 +119,7 @@ defmodule BlockScoutWeb.SmartContractView do
     do: render_type_value("bool", Helper.sanitize_input(to_string(value)), fetch_name(names, index))
 
   def values_with_type(value, type, names, index, _components),
-    do: render_type_value(type, Helper.sanitize_input(binary_to_utf_string(value)), fetch_name(names, index))
+    do: render_type_value(type, Helper.sanitize_input(value), fetch_name(names, index))
 
   def values_with_type(value, :error, _components),
     do: render_type_value("error", Helper.sanitize_input(value), "error")
@@ -158,78 +163,6 @@ defmodule BlockScoutWeb.SmartContractView do
     end)
   end
 
-  def zip_tuple_values_with_types(value, type) do
-    types_string =
-      type
-      |> String.slice(6..-2)
-
-    types =
-      if String.trim(types_string) == "" do
-        []
-      else
-        types_string
-        |> String.split(",")
-      end
-
-    {tuple_types, _} =
-      types
-      |> Enum.reduce({[], nil}, fn val, acc ->
-        {arr, to_merge} = acc
-
-        if to_merge do
-          compose_array_if_to_merge(arr, val, to_merge)
-        else
-          compose_array_else(arr, val, to_merge)
-        end
-      end)
-
-    values_list =
-      value
-      |> Tuple.to_list()
-
-    Enum.zip(tuple_types, values_list)
-  end
-
-  def compose_array_if_to_merge(arr, val, to_merge) do
-    if count_string_symbols(val)["]"] > count_string_symbols(val)["["] do
-      updated_arr = update_last_list_item(arr, val)
-      {updated_arr, !to_merge}
-    else
-      updated_arr = update_last_list_item(arr, val)
-      {updated_arr, to_merge}
-    end
-  end
-
-  def compose_array_else(arr, val, to_merge) do
-    if count_string_symbols(val)["["] > count_string_symbols(val)["]"] do
-      # credo:disable-for-next-line
-      {arr ++ [val], !to_merge}
-    else
-      # credo:disable-for-next-line
-      {arr ++ [val], to_merge}
-    end
-  end
-
-  defp update_last_list_item(arr, new_val) do
-    arr
-    |> Enum.with_index()
-    |> Enum.map(fn {item, index} ->
-      if index == Enum.count(arr) - 1 do
-        item <> "," <> new_val
-      else
-        item
-      end
-    end)
-  end
-
-  defp count_string_symbols(str) do
-    str
-    |> String.graphemes()
-    |> Enum.reduce(%{"[" => 0, "]" => 0}, fn char, acc ->
-      Map.update(acc, char, 1, &(&1 + 1))
-    end)
-  end
-
   def binary_to_utf_string(item) do
     case Integer.parse(to_string(item)) do
       {item_integer, ""} ->
diff --git a/apps/block_scout_web/test/block_scout_web/controllers/api/v2/smart_contract_controller_test.exs b/apps/block_scout_web/test/block_scout_web/controllers/api/v2/smart_contract_controller_test.exs
index 863345a9038a..6799c10396db 100644
--- a/apps/block_scout_web/test/block_scout_web/controllers/api/v2/smart_contract_controller_test.exs
+++ b/apps/block_scout_web/test/block_scout_web/controllers/api/v2/smart_contract_controller_test.exs
@@ -702,6 +702,148 @@ defmodule BlockScoutWeb.API.V2.SmartContractControllerTest do
                "method_id" => Base.encode16(id, case: :lower)
              } in response
     end
+
+    test "get correct bytes value 1", %{conn: conn} do
+      abi = [
+        %{
+          "inputs" => [],
+          "name" => "all_messages_hash",
+          "outputs" => [
+            %{
+              "internalType" => "bytes32",
+              "name" => "",
+              "type" => "bytes32"
+            }
+          ],
+          "stateMutability" => "view",
+          "type" => "function"
+        }
+      ]
+
+      id_1 =
+        abi
+        |> ABI.parse_specification()
+        |> Enum.at(0)
+        |> Map.fetch!(:method_id)
+
+      target_contract = insert(:smart_contract, abi: abi)
+      address_hash_string = to_string(target_contract.address_hash)
+
+      EthereumJSONRPC.Mox
+      |> expect(
+        :json_rpc,
+        fn [
+             %{
+               id: id,
+               method: "eth_call",
+               params: [
+                 %{data: "0x1dd69d06", to: ^address_hash_string},
+                 "latest"
+               ]
+             }
+           ],
+           _opts ->
+          {:ok,
+           [
+             %{
+               id: id,
+               jsonrpc: "2.0",
+               result: "0x0000000000000000000000000000000000000000000000000000000000000000"
+             }
+           ]}
+        end
+      )
+
+      request = get(conn, "/api/v2/smart-contracts/#{target_contract.address_hash}/methods-read")
+      assert response = json_response(request, 200)
+
+      assert %{
+               "inputs" => [],
+               "name" => "all_messages_hash",
+               "outputs" => [
+                 %{
+                   "value" => "0x0000000000000000000000000000000000000000000000000000000000000000",
+                   "type" => "bytes32"
+                 }
+               ],
+               "stateMutability" => "view",
+               "type" => "function",
+               "method_id" => Base.encode16(id_1, case: :lower),
+               "names" => ["bytes32"]
+             } in response
+    end
+
+    test "get correct bytes value 2", %{conn: conn} do
+      abi = [
+        %{
+          "inputs" => [],
+          "name" => "FRAUD_STRING",
+          "outputs" => [
+            %{
+              "internalType" => "bytes",
+              "name" => "",
+              "type" => "bytes"
+            }
+          ],
+          "stateMutability" => "view",
+          "type" => "function"
+        }
+      ]
+
+      id_2 =
+        abi
+        |> ABI.parse_specification()
+        |> Enum.at(0)
+        |> Map.fetch!(:method_id)
+
+      target_contract = insert(:smart_contract, abi: abi)
+      address_hash_string = to_string(target_contract.address_hash)
+
+      EthereumJSONRPC.Mox
+      |> expect(
+        :json_rpc,
+        fn [
+             %{
+               id: id,
+               method: "eth_call",
+               params: [
+                 %{data: "0x46b2eb9b", to: ^address_hash_string},
+                 "latest"
+               ]
+             }
+           ],
+           _opts ->
+          {:ok,
+           [
+             %{
+               id: id,
+               jsonrpc: "2.0",
+               result:
+                 "0x000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000322d2d5468697320697320612062616420737472696e672e204e6f626f64792073617973207468697320737472696e672e2d2d0000000000000000000000000000"
+             }
+           ]}
+        end
+      )
+
+      request = get(conn, "/api/v2/smart-contracts/#{target_contract.address_hash}/methods-read")
+      assert response = json_response(request, 200)
+
+      assert %{
+               "inputs" => [],
+               "name" => "FRAUD_STRING",
+               "outputs" => [
+                 %{
+                   "value" =>
+                     "0x2d2d5468697320697320612062616420737472696e672e204e6f626f64792073617973207468697320737472696e672e2d2d",
+                   "type" => "bytes"
+                 }
+               ],
+               "stateMutability" => "view",
+               "type" => "function",
+               "method_id" => Base.encode16(id_2, case: :lower),
+               "names" => ["bytes"]
+             } in response
+    end
   end
 
   describe "/smart-contracts/{address_hash}/query-read-method" do
diff --git a/apps/block_scout_web/test/block_scout_web/views/smart_contract_view_test.exs b/apps/block_scout_web/test/block_scout_web/views/smart_contract_view_test.exs
index 7ba53f18ced2..cb63435730b2 100644
--- a/apps/block_scout_web/test/block_scout_web/views/smart_contract_view_test.exs
+++ b/apps/block_scout_web/test/block_scout_web/views/smart_contract_view_test.exs
@@ -8,47 +8,32 @@ defmodule BlockScoutWeb.SmartContractViewTest do
   describe "values_with_type/1" do
     test "complex data type case" do
       value =
-        {<<156, 209, 70, 119, 249, 170, 85, 105, 179, 187, 179, 81, 252, 214, 125, 17, 21, 170, 86, 58, 225, 98, 66,
-           118, 211, 212, 230, 127, 179, 214, 249, 38>>, 23_183_417, true,
+        {"0x9cd14677f9aa5569b3bbb351fcd67d1115aa563ae1624276d3d4e67fb3d6f926", 23_183_417, true,
          [
            {<<164, 118, 64, 69, 133, 31, 23, 170, 96, 182, 200, 232, 182, 32, 114, 190, 169, 83, 133, 33>>,
             [
-              <<15, 103, 152, 165, 96, 121, 58, 84, 195, 188, 254, 134, 169, 60, 222, 30, 115, 8, 125, 148, 76, 14, 162,
-                5, 68, 19, 125, 65, 33, 57, 104, 133>>,
-              <<0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 191, 61, 111, 131, 12, 226, 99, 202, 233, 135, 25, 57, 130, 25, 44,
-                217, 144, 68, 43, 83>>
-            ],
-            <<0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 170, 178, 96, 212, 241, 78, 0, 0>>},
+              "0x0f6798a560793a54c3bcfe86a93cde1e73087d944c0ea20544137d4121396885",
+              "0x000000000000000000000000bf3d6f830ce263cae987193982192cd990442b53"
+            ], "0x000000000000000000000000000000000000000000000000aab260d4f14e0000"},
            {<<164, 118, 64, 69, 133, 31, 23, 170, 96, 182, 200, 232, 182, 32, 114, 190, 169, 83, 133, 33>>,
             [
-              <<221, 242, 82, 173, 27, 226, 200, 155, 105, 194, 176, 104, 252, 55, 141, 170, 149, 43, 167, 241, 99, 196,
-                161, 22, 40, 245, 90, 77, 245, 35, 179, 239>>,
-              <<0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0>>,
-              <<0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 191, 61, 111, 131, 12, 226, 99, 202, 233, 135, 25, 57, 130, 25, 44,
-                217, 144, 68, 43, 83>>
-            ],
-            <<0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 170, 178, 96, 212, 241, 78, 0, 0>>},
+              "0xddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef",
+              "0x0000000000000000000000000000000000000000000000000000000000000000",
+              "0x000000000000000000000000bf3d6f830ce263cae987193982192cd990442b53"
+            ], "0x000000000000000000000000000000000000000000000000aab260d4f14e0000"},
            {<<166, 139, 214, 89, 169, 22, 127, 61, 60, 1, 186, 151, 118, 161, 32, 141, 174, 143, 0, 59>>,
             [
-              <<47, 154, 96, 152, 212, 80, 58, 18, 119, 121, 186, 151, 95, 95, 107, 4, 248, 66, 54, 43, 24, 9, 243, 70,
-                152, 158, 154, 188, 11, 77, 237, 182>>,
-              <<0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 191, 61, 111, 131, 12, 226, 99, 202, 233, 135, 25, 57, 130, 25, 44,
-                217, 144, 68, 43, 83>>,
-              <<0, 5, 0, 0, 36, 155, 252, 47, 60, 200, 214, 143, 107, 107, 247, 35, 14, 160, 168, 237, 133, 61, 231, 49,
-                0, 0, 0, 0, 0, 0, 2, 79>>
-            ],
-            <<0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 170, 178, 96, 212, 241, 78, 0, 0>>},
+              "0x2f9a6098d4503a127779ba975f5f6b04f842362b1809f346989e9abc0b4dedb6",
+              "0x000000000000000000000000bf3d6f830ce263cae987193982192cd990442b53",
+              "0x00050000249bfc2f3cc8d68f6b6bf7230ea0a8ed853de731000000000000024f"
+            ], "0x000000000000000000000000000000000000000000000000aab260d4f14e0000"},
            {<<254, 68, 107, 239, 29, 191, 122, 254, 36, 232, 30, 5, 188, 139, 39, 28, 27, 169, 165, 96>>,
             [
-              <<39, 51, 62, 219, 139, 220, 212, 10, 10, 233, 68, 251, 18, 27, 94, 45, 98, 234, 120, 38, 131, 148, 102,
-                84, 160, 245, 230, 7, 169, 8, 213, 120>>,
-              <<0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 42, 95, 197, 45, 138, 86, 59, 47, 24, 28, 106, 82, 125, 66, 46, 21,
-                146, 201, 236, 250>>,
-              <<0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 166, 139, 214, 89, 169, 22, 127, 61, 60, 1, 186, 151, 118, 161, 32,
-                141, 174, 143, 0, 59>>,
-              <<0, 5, 0, 0, 36, 155, 252, 47, 60, 200, 214, 143, 107, 107, 247, 35, 14, 160, 168, 237, 133, 61, 231, 49,
-                0, 0, 0, 0, 0, 0, 2, 79>>
-            ], <<0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1>>}
+              "0x27333edb8bdcd40a0ae944fb121b5e2d62ea782683946654a0f5e607a908d578",
+              "0x0000000000000000000000002a5fc52d8a563b2f181c6a527d422e1592c9ecfa",
+              "0x000000000000000000000000a68bd659a9167f3d3c01ba9776a1208dae8f003b",
+              "0x00050000249bfc2f3cc8d68f6b6bf7230ea0a8ed853de731000000000000024f"
+            ], "0x0000000000000000000000000000000000000000000000000000000000000001"}
          ]}
 
       type = "tuple[bytes32,uint256,bool,tuple[address,bytes32[],bytes][]]"
diff --git a/apps/explorer/lib/explorer/smart_contract/reader.ex b/apps/explorer/lib/explorer/smart_contract/reader.ex
index 4fa3e8dadf86..6222438d4fd0 100644
--- a/apps/explorer/lib/explorer/smart_contract/reader.ex
+++ b/apps/explorer/lib/explorer/smart_contract/reader.ex
@@ -754,6 +754,27 @@ defmodule Explorer.SmartContract.Reader do
     Map.put_new(output, "value", Encoder.unescape(value))
   end
 
+  defp new_value(%{"type" => "tuple" <> _types = type} = output, values, index) do
+    value = Enum.at(values, index)
+
+    result =
+      if String.ends_with?(type, "[]") do
+        value
+        |> Enum.map(fn tuple -> new_value(%{"type" => String.slice(type, 0..-3)}, [tuple], 0) end)
+        |> flat_arrays_map()
+      else
+        value
+        |> zip_tuple_values_with_types(type)
+        |> Enum.map(fn {type, part_value} ->
+          new_value(%{"type" => type}, [part_value], 0)
+        end)
+        |> flat_arrays_map()
+        |> List.to_tuple()
+      end
+
+    Map.put_new(output, "value", result)
+  end
+
   defp new_value(output, [value], _index) do
     Map.put_new(output, "value", value)
   end
@@ -762,6 +783,97 @@ defmodule Explorer.SmartContract.Reader do
     Map.put_new(output, "value", Enum.at(values, index))
   end
 
+  defp flat_arrays_map(%{"value" => value}) do
+    flat_arrays_map(value)
+  end
+
+  defp flat_arrays_map(value) when is_list(value) do
+    Enum.map(value, &flat_arrays_map/1)
+  end
+
+  defp flat_arrays_map(value) when is_tuple(value) do
+    value
+    |> Tuple.to_list()
+    |> flat_arrays_map()
+    |> List.to_tuple()
+  end
+
+  defp flat_arrays_map(value) do
+    value
+  end
+
+  def zip_tuple_values_with_types(value, type) do
+    types_string =
+      type
+      |> String.slice(6..-2)
+
+    types =
+      if String.trim(types_string) == "" do
+        []
+      else
+        types_string
+        |> String.split(",")
+      end
+
+    {tuple_types, _} =
+      types
+      |> Enum.reduce({[], nil}, fn val, acc ->
+        {arr, to_merge} = acc
+
+        if to_merge do
+          compose_array_if_to_merge(arr, val, to_merge)
+        else
+          compose_array_else(arr, val, to_merge)
+        end
+      end)
+
+    values_list =
+      value
+      |> Tuple.to_list()
+
+    Enum.zip(tuple_types, values_list)
+  end
+
+  def compose_array_if_to_merge(arr, val, to_merge) do
+    if count_string_symbols(val)["]"] > count_string_symbols(val)["["] do
+      updated_arr = update_last_list_item(arr, val)
+      {updated_arr, !to_merge}
+    else
+      updated_arr = update_last_list_item(arr, val)
+      {updated_arr, to_merge}
+    end
+  end
+
+  def compose_array_else(arr, val, to_merge) do
+    if count_string_symbols(val)["["] > count_string_symbols(val)["]"] do
+      # credo:disable-for-next-line
+      {arr ++ [val], !to_merge}
+    else
+      # credo:disable-for-next-line
+      {arr ++ [val], to_merge}
+    end
+  end
+
+  defp update_last_list_item(arr, new_val) do
+    arr
+    |> Enum.with_index()
+    |> Enum.map(fn {item, index} ->
+      if index == Enum.count(arr) - 1 do
+        item <> "," <> new_val
+      else
+        item
+      end
+    end)
+  end
+
+  defp count_string_symbols(str) do
+    str
+    |> String.graphemes()
+    |> Enum.reduce(%{"[" => 0, "]" => 0}, fn char, acc ->
+      Map.update(acc, char, 1, &(&1 + 1))
+    end)
+  end
+
   @spec bytes_to_string(<<_::_*8>>) :: String.t()
   defp bytes_to_string(value) do
     if value do

From 993189f1183b3ff65c21ae31c322a7d642bef623 Mon Sep 17 00:00:00 2001
From: Nikita Pozdniakov <nikitosing4@mail.ru>
Date: Mon, 11 Sep 2023 13:22:03 +0300
Subject: [PATCH 393/909] Refactor zip_tuple_values_with_types/2

---
 .../lib/explorer/smart_contract/reader.ex     | 45 ++++++++-----------
 1 file changed, 19 insertions(+), 26 deletions(-)

diff --git a/apps/explorer/lib/explorer/smart_contract/reader.ex b/apps/explorer/lib/explorer/smart_contract/reader.ex
index 6222438d4fd0..3729cbe7222f 100644
--- a/apps/explorer/lib/explorer/smart_contract/reader.ex
+++ b/apps/explorer/lib/explorer/smart_contract/reader.ex
@@ -802,6 +802,7 @@ defmodule Explorer.SmartContract.Reader do
     value
   end
 
+  @spec zip_tuple_values_with_types(tuple, binary) :: [{binary, any}]
   def zip_tuple_values_with_types(value, type) do
     types_string =
       type
@@ -815,18 +816,18 @@ defmodule Explorer.SmartContract.Reader do
         |> String.split(",")
       end
 
-    {tuple_types, _} =
+    {tuple_types_reversed, _} =
       types
-      |> Enum.reduce({[], nil}, fn val, acc ->
+      |> Enum.reduce({[], false}, fn val, acc ->
         {arr, to_merge} = acc
 
-        if to_merge do
-          compose_array_if_to_merge(arr, val, to_merge)
-        else
-          compose_array_else(arr, val, to_merge)
-        end
+        compose_array(to_merge, arr, val)
       end)
 
+    tuple_types =
+      tuple_types_reversed
+      |> Enum.reverse()
+
     values_list =
       value
       |> Tuple.to_list()
@@ -834,36 +835,28 @@ defmodule Explorer.SmartContract.Reader do
     Enum.zip(tuple_types, values_list)
   end
 
-  def compose_array_if_to_merge(arr, val, to_merge) do
+  defp compose_array(true, arr, val) do
+    updated_arr = update_last_list_item(arr, val)
+
     if count_string_symbols(val)["]"] > count_string_symbols(val)["["] do
-      updated_arr = update_last_list_item(arr, val)
-      {updated_arr, !to_merge}
+      {updated_arr, false}
     else
-      updated_arr = update_last_list_item(arr, val)
-      {updated_arr, to_merge}
+      {updated_arr, true}
     end
   end
 
-  def compose_array_else(arr, val, to_merge) do
+  defp compose_array(to_merge, arr, val) do
     if count_string_symbols(val)["["] > count_string_symbols(val)["]"] do
-      # credo:disable-for-next-line
-      {arr ++ [val], !to_merge}
+      {[val | arr], !to_merge}
     else
-      # credo:disable-for-next-line
-      {arr ++ [val], to_merge}
+      {[val | arr], to_merge}
     end
   end
 
   defp update_last_list_item(arr, new_val) do
-    arr
-    |> Enum.with_index()
-    |> Enum.map(fn {item, index} ->
-      if index == Enum.count(arr) - 1 do
-        item <> "," <> new_val
-      else
-        item
-      end
-    end)
+    [last_element | remain] = arr
+
+    [last_element <> "," <> new_val | remain]
   end
 
   defp count_string_symbols(str) do

From 4ecd6a77e60e8a58e6e223d05cfd2d8f718c9a71 Mon Sep 17 00:00:00 2001
From: Maxim Filonov <53992153+sl1depengwyn@users.noreply.github.com>
Date: Mon, 11 Sep 2023 14:01:16 +0300
Subject: [PATCH 394/909] Refactor zip_tuple_values_with_types/2

---
 .../lib/explorer/smart_contract/reader.ex     | 62 ++++++-------------
 1 file changed, 20 insertions(+), 42 deletions(-)

diff --git a/apps/explorer/lib/explorer/smart_contract/reader.ex b/apps/explorer/lib/explorer/smart_contract/reader.ex
index 3729cbe7222f..19b8a86af152 100644
--- a/apps/explorer/lib/explorer/smart_contract/reader.ex
+++ b/apps/explorer/lib/explorer/smart_contract/reader.ex
@@ -813,19 +813,29 @@ defmodule Explorer.SmartContract.Reader do
         []
       else
         types_string
-        |> String.split(",")
+        |> String.graphemes()
       end
 
-    {tuple_types_reversed, _} =
-      types
-      |> Enum.reduce({[], false}, fn val, acc ->
-        {arr, to_merge} = acc
-
-        compose_array(to_merge, arr, val)
-      end)
-
     tuple_types =
-      tuple_types_reversed
+      types
+      |> Enum.reduce(
+        {[""], 0},
+        fn
+          ",", {types_acc, 0} ->
+            {["" | types_acc], 0}
+
+          char, {[acc | types_acc], bracket_stack} ->
+            new_bracket_stack =
+              case char do
+                "[" -> bracket_stack + 1
+                "]" -> bracket_stack - 1
+                _ -> bracket_stack
+              end
+
+            {[acc <> char | types_acc], new_bracket_stack}
+        end
+      )
+      |> elem(0)
       |> Enum.reverse()
 
     values_list =
@@ -835,38 +845,6 @@ defmodule Explorer.SmartContract.Reader do
     Enum.zip(tuple_types, values_list)
   end
 
-  defp compose_array(true, arr, val) do
-    updated_arr = update_last_list_item(arr, val)
-
-    if count_string_symbols(val)["]"] > count_string_symbols(val)["["] do
-      {updated_arr, false}
-    else
-      {updated_arr, true}
-    end
-  end
-
-  defp compose_array(to_merge, arr, val) do
-    if count_string_symbols(val)["["] > count_string_symbols(val)["]"] do
-      {[val | arr], !to_merge}
-    else
-      {[val | arr], to_merge}
-    end
-  end
-
-  defp update_last_list_item(arr, new_val) do
-    [last_element | remain] = arr
-
-    [last_element <> "," <> new_val | remain]
-  end
-
-  defp count_string_symbols(str) do
-    str
-    |> String.graphemes()
-    |> Enum.reduce(%{"[" => 0, "]" => 0}, fn char, acc ->
-      Map.update(acc, char, 1, &(&1 + 1))
-    end)
-  end
-
   @spec bytes_to_string(<<_::_*8>>) :: String.t()
   defp bytes_to_string(value) do
     if value do

From 2df97b4192fce23a598430962c78a816de57f0c5 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 11 Sep 2023 18:18:33 +0000
Subject: [PATCH 395/909] Bump ex_cldr_numbers from 2.32.0 to 2.32.1

Bumps [ex_cldr_numbers](https://github.com/elixir-cldr/cldr_numbers) from 2.32.0 to 2.32.1.
- [Release notes](https://github.com/elixir-cldr/cldr_numbers/releases)
- [Changelog](https://github.com/elixir-cldr/cldr_numbers/blob/main/CHANGELOG.md)
- [Commits](https://github.com/elixir-cldr/cldr_numbers/compare/v2.32.0...v2.32.1)

---
updated-dependencies:
- dependency-name: ex_cldr_numbers
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 mix.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mix.lock b/mix.lock
index aba6b621909e..baa4518de7d5 100644
--- a/mix.lock
+++ b/mix.lock
@@ -45,7 +45,7 @@
   "ex_cldr": {:hex, :ex_cldr, "2.37.2", "c45041534ec60af367c4c1af02a608576118044fe3c441c782fd424061d6b517", [:mix], [{:cldr_utils, "~> 2.21", [hex: :cldr_utils, repo: "hexpm", optional: false]}, {:decimal, "~> 1.6 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: false]}, {:gettext, "~> 0.19", [hex: :gettext, repo: "hexpm", optional: true]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}, {:nimble_parsec, "~> 0.5 or ~> 1.0", [hex: :nimble_parsec, repo: "hexpm", optional: true]}], "hexpm", "c8467b1d5080716ace6621703b6656cb2f9545572a54b341da900791a0cf92ba"},
   "ex_cldr_currencies": {:hex, :ex_cldr_currencies, "2.15.0", "aadd34e91cfac7ef6b03fe8f47f8c6fa8c5daf3f89b5d9fee64ec545ded839cf", [:mix], [{:ex_cldr, "~> 2.34", [hex: :ex_cldr, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}], "hexpm", "0521316396c66877a2d636219767560bb2397c583341fcb154ecf9f3000e6ff8"},
   "ex_cldr_lists": {:hex, :ex_cldr_lists, "2.10.0", "4d4c9877da2d0417fd832907d69974e8328969f75fafc79b05ccf85f549f6281", [:mix], [{:ex_cldr_numbers, "~> 2.25", [hex: :ex_cldr_numbers, repo: "hexpm", optional: false]}, {:ex_doc, "~> 0.18", [hex: :ex_doc, repo: "hexpm", optional: true]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}], "hexpm", "adc040cde7b97f7fd7c0b35dd69ddb6fcf607303ae6355bb1851deae1f8b0652"},
-  "ex_cldr_numbers": {:hex, :ex_cldr_numbers, "2.32.0", "9abfb0aa9964cb797b5b1c5b55bc773fdff3192a667259a538dd25edb60d44ce", [:mix], [{:decimal, "~> 1.6 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: false]}, {:digital_token, "~> 0.3 or ~> 1.0", [hex: :digital_token, repo: "hexpm", optional: false]}, {:ex_cldr, "~> 2.37", [hex: :ex_cldr, repo: "hexpm", optional: false]}, {:ex_cldr_currencies, ">= 2.14.2", [hex: :ex_cldr_currencies, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}], "hexpm", "08c43c26b8605b56b5856bb9277d2a0282f2e29b43c57dfbfd7bf9c28b4a504a"},
+  "ex_cldr_numbers": {:hex, :ex_cldr_numbers, "2.32.1", "55161546ccf9e7b1adcfc6f80fc9952c7d87a63376ebe72e643659d14c5d638d", [:mix], [{:decimal, "~> 1.6 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: false]}, {:digital_token, "~> 0.3 or ~> 1.0", [hex: :digital_token, repo: "hexpm", optional: false]}, {:ex_cldr, "~> 2.37", [hex: :ex_cldr, repo: "hexpm", optional: false]}, {:ex_cldr_currencies, ">= 2.14.2", [hex: :ex_cldr_currencies, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}], "hexpm", "beecc1ef2b3518e4d54deb6fecd0f8b8c78583dd74c939ec263f7b838217bb48"},
   "ex_cldr_units": {:hex, :ex_cldr_units, "3.16.2", "dbad303fba819981c578234e2aaf19d72efca16ea8b1c6ee46b26232cb45e232", [:mix], [{:cldr_utils, "~> 2.24", [hex: :cldr_utils, repo: "hexpm", optional: false]}, {:decimal, "~> 1.6 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: false]}, {:ex_cldr_lists, "~> 2.10", [hex: :ex_cldr_lists, repo: "hexpm", optional: false]}, {:ex_cldr_numbers, "~> 2.31", [hex: :ex_cldr_numbers, repo: "hexpm", optional: false]}, {:ex_doc, "~> 0.18", [hex: :ex_doc, repo: "hexpm", optional: true]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}], "hexpm", "851095319fb3205c1549619da742cd53a2804c1d9c204cf84014021e2a6ea7e5"},
   "ex_doc": {:hex, :ex_doc, "0.30.6", "5f8b54854b240a2b55c9734c4b1d0dd7bdd41f71a095d42a70445c03cf05a281", [:mix], [{:earmark_parser, "~> 1.4.31", [hex: :earmark_parser, repo: "hexpm", optional: false]}, {:makeup_elixir, "~> 0.14", [hex: :makeup_elixir, repo: "hexpm", optional: false]}, {:makeup_erlang, "~> 0.1", [hex: :makeup_erlang, repo: "hexpm", optional: false]}], "hexpm", "bd48f2ddacf4e482c727f9293d9498e0881597eae6ddc3d9562bd7923375109f"},
   "ex_json_schema": {:hex, :ex_json_schema, "0.10.1", "e03b746b6675a750c0bb1a5cc919f61353f7ab8450977e11ceede20e6180c560", [:mix], [{:decimal, "~> 2.0", [hex: :decimal, repo: "hexpm", optional: false]}], "hexpm", "66a64e60dadad89914d92f89c7e7906c57de75a8b79ac2480d0d53e1b8096fb0"},

From 89ed214e27c19c063a26be6bfd3e1aa5dcf42b8f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 11 Sep 2023 18:58:51 +0000
Subject: [PATCH 396/909] Bump eslint from 8.48.0 to 8.49.0 in
 /apps/block_scout_web/assets

Bumps [eslint](https://github.com/eslint/eslint) from 8.48.0 to 8.49.0.
- [Release notes](https://github.com/eslint/eslint/releases)
- [Changelog](https://github.com/eslint/eslint/blob/main/CHANGELOG.md)
- [Commits](https://github.com/eslint/eslint/compare/v8.48.0...v8.49.0)

---
updated-dependencies:
- dependency-name: eslint
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 apps/block_scout_web/assets/package-lock.json | 46 +++++++++----------
 apps/block_scout_web/assets/package.json      |  2 +-
 2 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/apps/block_scout_web/assets/package-lock.json b/apps/block_scout_web/assets/package-lock.json
index ff7bf7093ffc..5e1b1f86300a 100644
--- a/apps/block_scout_web/assets/package-lock.json
+++ b/apps/block_scout_web/assets/package-lock.json
@@ -78,7 +78,7 @@
         "copy-webpack-plugin": "^11.0.0",
         "css-loader": "^5.2.7",
         "css-minimizer-webpack-plugin": "^5.0.1",
-        "eslint": "^8.48.0",
+        "eslint": "^8.49.0",
         "eslint-config-standard": "^17.1.0",
         "eslint-plugin-import": "^2.28.1",
         "eslint-plugin-node": "^11.1.0",
@@ -2101,9 +2101,9 @@
       }
     },
     "node_modules/@eslint/js": {
-      "version": "8.48.0",
-      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.48.0.tgz",
-      "integrity": "sha512-ZSjtmelB7IJfWD2Fvb7+Z+ChTIKWq6kjda95fLcQKNS5aheVHn4IkfgRQE3sIIzTcSLwLcLZUD9UBt+V7+h+Pw==",
+      "version": "8.49.0",
+      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.49.0.tgz",
+      "integrity": "sha512-1S8uAY/MTJqVx0SC4epBq+N2yhuwtNwLbJYNZyhL2pO1ZVKn5HFXav5T41Ryzy9K9V7ZId2JB2oy/W4aCd9/2w==",
       "dev": true,
       "engines": {
         "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
@@ -2511,9 +2511,9 @@
       }
     },
     "node_modules/@humanwhocodes/config-array": {
-      "version": "0.11.10",
-      "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.10.tgz",
-      "integrity": "sha512-KVVjQmNUepDVGXNuoRRdmmEjruj0KfiGSbS8LVc12LMsWDQzRXJ0qdhN8L8uUigKpfEHRhlaQFY0ib1tnUbNeQ==",
+      "version": "0.11.11",
+      "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.11.tgz",
+      "integrity": "sha512-N2brEuAadi0CcdeMXUkhbZB84eskAc8MEX1By6qEchoVywSgXPIjou4rYsl0V3Hj0ZnuGycGCjdNgockbzeWNA==",
       "dev": true,
       "dependencies": {
         "@humanwhocodes/object-schema": "^1.2.1",
@@ -7099,16 +7099,16 @@
       }
     },
     "node_modules/eslint": {
-      "version": "8.48.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.48.0.tgz",
-      "integrity": "sha512-sb6DLeIuRXxeM1YljSe1KEx9/YYeZFQWcV8Rq9HfigmdDEugjLEVEa1ozDjL6YDjBpQHPJxJzze+alxi4T3OLg==",
+      "version": "8.49.0",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.49.0.tgz",
+      "integrity": "sha512-jw03ENfm6VJI0jA9U+8H5zfl5b+FvuU3YYvZRdZHOlU2ggJkxrlkJH4HcDrZpj6YwD8kuYqvQM8LyesoazrSOQ==",
       "dev": true,
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.2.0",
         "@eslint-community/regexpp": "^4.6.1",
         "@eslint/eslintrc": "^2.1.2",
-        "@eslint/js": "8.48.0",
-        "@humanwhocodes/config-array": "^0.11.10",
+        "@eslint/js": "8.49.0",
+        "@humanwhocodes/config-array": "^0.11.11",
         "@humanwhocodes/module-importer": "^1.0.1",
         "@nodelib/fs.walk": "^1.2.8",
         "ajv": "^6.12.4",
@@ -19022,9 +19022,9 @@
       }
     },
     "@eslint/js": {
-      "version": "8.48.0",
-      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.48.0.tgz",
-      "integrity": "sha512-ZSjtmelB7IJfWD2Fvb7+Z+ChTIKWq6kjda95fLcQKNS5aheVHn4IkfgRQE3sIIzTcSLwLcLZUD9UBt+V7+h+Pw==",
+      "version": "8.49.0",
+      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.49.0.tgz",
+      "integrity": "sha512-1S8uAY/MTJqVx0SC4epBq+N2yhuwtNwLbJYNZyhL2pO1ZVKn5HFXav5T41Ryzy9K9V7ZId2JB2oy/W4aCd9/2w==",
       "dev": true
     },
     "@ethereumjs/common": {
@@ -19245,9 +19245,9 @@
       "integrity": "sha512-m5cPn3e2+FDCOgi1mz0RexTUvvQibBebOUlUlW0+YrMjDTPkiJ6VTKukA1GRsvRw+12KyJndNjj0O4AgTxm2Pg=="
     },
     "@humanwhocodes/config-array": {
-      "version": "0.11.10",
-      "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.10.tgz",
-      "integrity": "sha512-KVVjQmNUepDVGXNuoRRdmmEjruj0KfiGSbS8LVc12LMsWDQzRXJ0qdhN8L8uUigKpfEHRhlaQFY0ib1tnUbNeQ==",
+      "version": "0.11.11",
+      "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.11.tgz",
+      "integrity": "sha512-N2brEuAadi0CcdeMXUkhbZB84eskAc8MEX1By6qEchoVywSgXPIjou4rYsl0V3Hj0ZnuGycGCjdNgockbzeWNA==",
       "dev": true,
       "requires": {
         "@humanwhocodes/object-schema": "^1.2.1",
@@ -22845,16 +22845,16 @@
       }
     },
     "eslint": {
-      "version": "8.48.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.48.0.tgz",
-      "integrity": "sha512-sb6DLeIuRXxeM1YljSe1KEx9/YYeZFQWcV8Rq9HfigmdDEugjLEVEa1ozDjL6YDjBpQHPJxJzze+alxi4T3OLg==",
+      "version": "8.49.0",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.49.0.tgz",
+      "integrity": "sha512-jw03ENfm6VJI0jA9U+8H5zfl5b+FvuU3YYvZRdZHOlU2ggJkxrlkJH4HcDrZpj6YwD8kuYqvQM8LyesoazrSOQ==",
       "dev": true,
       "requires": {
         "@eslint-community/eslint-utils": "^4.2.0",
         "@eslint-community/regexpp": "^4.6.1",
         "@eslint/eslintrc": "^2.1.2",
-        "@eslint/js": "8.48.0",
-        "@humanwhocodes/config-array": "^0.11.10",
+        "@eslint/js": "8.49.0",
+        "@humanwhocodes/config-array": "^0.11.11",
         "@humanwhocodes/module-importer": "^1.0.1",
         "@nodelib/fs.walk": "^1.2.8",
         "ajv": "^6.12.4",
diff --git a/apps/block_scout_web/assets/package.json b/apps/block_scout_web/assets/package.json
index 11a58274dca4..964bd513fb28 100644
--- a/apps/block_scout_web/assets/package.json
+++ b/apps/block_scout_web/assets/package.json
@@ -90,7 +90,7 @@
     "copy-webpack-plugin": "^11.0.0",
     "css-loader": "^5.2.7",
     "css-minimizer-webpack-plugin": "^5.0.1",
-    "eslint": "^8.48.0",
+    "eslint": "^8.49.0",
     "eslint-config-standard": "^17.1.0",
     "eslint-plugin-import": "^2.28.1",
     "eslint-plugin-node": "^11.1.0",

From 5077f9e051be3692f990c5f85b79288de22d246c Mon Sep 17 00:00:00 2001
From: Viktor Baranov <baranov.viktor.27@gmail.com>
Date: Mon, 11 Sep 2023 23:35:33 +0300
Subject: [PATCH 397/909] Unify burn address definition

---
 CHANGELOG.md                                  |  1 +
 .../channels/address_channel.ex               |  4 +-
 .../block_scout_web/channels/token_channel.ex |  4 +-
 .../channels/transaction_channel.ex           |  4 +-
 .../address_token_transfer_controller.ex      |  4 +-
 .../address_transaction_controller.ex         |  5 +-
 .../api/v2/smart_contract_controller.ex       |  7 ++-
 .../block_transaction_controller.ex           |  3 +-
 .../pending_transaction_controller.ex         |  3 +-
 .../recent_transactions_controller.ex         |  4 +-
 .../controllers/smart_contract_controller.ex  |  9 ++--
 .../tokens/instance/transfer_controller.ex    |  3 +-
 .../controllers/tokens/transfer_controller.ex |  3 +-
 .../controllers/transaction_controller.ex     |  3 +-
 .../transaction_state_controller.ex           |  3 +-
 .../transaction_token_transfer_controller.ex  |  3 +-
 .../models/transaction_state_helper.ex        |  4 +-
 .../account/notifier/forbidden_address.ex     |  4 +-
 .../lib/explorer/account/notifier/summary.ex  |  6 +--
 apps/explorer/lib/explorer/chain.ex           |  5 +-
 .../chain/address/current_token_balance.ex    |  3 +-
 .../explorer/chain/address/token_balance.ex   |  4 +-
 .../lib/explorer/chain/block/reward.ex        |  8 ++--
 .../lib/explorer/chain/smart_contract.ex      | 48 +++++++++++--------
 apps/explorer/lib/explorer/etherscan.ex       |  5 +-
 .../transform/address_token_balances.ex       |  6 +--
 .../lib/indexer/transform/token_transfers.ex  | 13 ++---
 .../indexer/transform/transaction_actions.ex  | 10 ++--
 28 files changed, 105 insertions(+), 74 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1ddb30c87312..b957f4bcec24 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -26,6 +26,7 @@
 
 ### Chore
 
+- [#8442](https://github.com/blockscout/blockscout/pull/8442) - Unify burn address definition
 - [#8321](https://github.com/blockscout/blockscout/pull/8321) - Add curl into resulting Docker image
 - [#8319](https://github.com/blockscout/blockscout/pull/8319) - Add MIX_ENV: 'prod' to docker-compose
 - [#8281](https://github.com/blockscout/blockscout/pull/8281) - Planned removal of duplicate API endpoints: for CSV export and GraphQL
diff --git a/apps/block_scout_web/lib/block_scout_web/channels/address_channel.ex b/apps/block_scout_web/lib/block_scout_web/channels/address_channel.ex
index 35a5ea606c07..f0ead554c72d 100644
--- a/apps/block_scout_web/lib/block_scout_web/channels/address_channel.ex
+++ b/apps/block_scout_web/lib/block_scout_web/channels/address_channel.ex
@@ -4,6 +4,8 @@ defmodule BlockScoutWeb.AddressChannel do
   """
   use BlockScoutWeb, :channel
 
+  import Explorer.Chain.SmartContract, only: [burn_address_hash_string: 0]
+
   alias BlockScoutWeb.API.V2.AddressView, as: AddressViewAPI
   alias BlockScoutWeb.API.V2.SmartContractView, as: SmartContractViewAPI
   alias BlockScoutWeb.API.V2.TransactionView, as: TransactionViewAPI
@@ -32,7 +34,7 @@ defmodule BlockScoutWeb.AddressChannel do
     "address_current_token_balances"
   ])
 
-  {:ok, burn_address_hash} = Chain.string_to_address_hash("0x0000000000000000000000000000000000000000")
+  {:ok, burn_address_hash} = Chain.string_to_address_hash(burn_address_hash_string())
   @burn_address_hash burn_address_hash
   @current_token_balances_limit 50
 
diff --git a/apps/block_scout_web/lib/block_scout_web/channels/token_channel.ex b/apps/block_scout_web/lib/block_scout_web/channels/token_channel.ex
index ac4295e6b010..0de43f328859 100644
--- a/apps/block_scout_web/lib/block_scout_web/channels/token_channel.ex
+++ b/apps/block_scout_web/lib/block_scout_web/channels/token_channel.ex
@@ -4,6 +4,8 @@ defmodule BlockScoutWeb.TokenChannel do
   """
   use BlockScoutWeb, :channel
 
+  import Explorer.Chain.SmartContract, only: [burn_address_hash_string: 0]
+
   alias BlockScoutWeb.{CurrencyHelper, TokensView}
   alias BlockScoutWeb.Tokens.TransferView
   alias Explorer.Chain
@@ -12,7 +14,7 @@ defmodule BlockScoutWeb.TokenChannel do
 
   intercept(["token_transfer", "token_total_supply"])
 
-  {:ok, burn_address_hash} = Chain.string_to_address_hash("0x0000000000000000000000000000000000000000")
+  {:ok, burn_address_hash} = Chain.string_to_address_hash(burn_address_hash_string())
   @burn_address_hash burn_address_hash
 
   def join("tokens:" <> _transaction_hash, _params, socket) do
diff --git a/apps/block_scout_web/lib/block_scout_web/channels/transaction_channel.ex b/apps/block_scout_web/lib/block_scout_web/channels/transaction_channel.ex
index df026d0b0b58..5c1247786a05 100644
--- a/apps/block_scout_web/lib/block_scout_web/channels/transaction_channel.ex
+++ b/apps/block_scout_web/lib/block_scout_web/channels/transaction_channel.ex
@@ -4,6 +4,8 @@ defmodule BlockScoutWeb.TransactionChannel do
   """
   use BlockScoutWeb, :channel
 
+  import Explorer.Chain.SmartContract, only: [burn_address_hash_string: 0]
+
   alias BlockScoutWeb.API.V2.TransactionView, as: TransactionViewV2
   alias BlockScoutWeb.{TransactionRawTraceView, TransactionView}
   alias Explorer.Chain
@@ -12,7 +14,7 @@ defmodule BlockScoutWeb.TransactionChannel do
 
   intercept(["pending_transaction", "transaction", "raw_trace"])
 
-  {:ok, burn_address_hash} = Chain.string_to_address_hash("0x0000000000000000000000000000000000000000")
+  {:ok, burn_address_hash} = Chain.string_to_address_hash(burn_address_hash_string())
   @burn_address_hash burn_address_hash
 
   def join("transactions:new_transaction", _params, socket) do
diff --git a/apps/block_scout_web/lib/block_scout_web/controllers/address_token_transfer_controller.ex b/apps/block_scout_web/lib/block_scout_web/controllers/address_token_transfer_controller.ex
index e8d21d0d2c97..25bec31b7dd4 100644
--- a/apps/block_scout_web/lib/block_scout_web/controllers/address_token_transfer_controller.ex
+++ b/apps/block_scout_web/lib/block_scout_web/controllers/address_token_transfer_controller.ex
@@ -13,6 +13,8 @@ defmodule BlockScoutWeb.AddressTokenTransferController do
   import BlockScoutWeb.Chain,
     only: [current_filter: 1, next_page_params: 3, paging_options: 1, split_list_by_page: 1]
 
+  import Explorer.Chain.SmartContract, only: [burn_address_hash_string: 0]
+
   @transaction_necessity_by_association [
     necessity_by_association: %{
       [created_contract_address: :names] => :optional,
@@ -29,7 +31,7 @@ defmodule BlockScoutWeb.AddressTokenTransferController do
     }
   ]
 
-  {:ok, burn_address_hash} = Chain.string_to_address_hash("0x0000000000000000000000000000000000000000")
+  {:ok, burn_address_hash} = Chain.string_to_address_hash(burn_address_hash_string())
   @burn_address_hash burn_address_hash
 
   def index(
diff --git a/apps/block_scout_web/lib/block_scout_web/controllers/address_transaction_controller.ex b/apps/block_scout_web/lib/block_scout_web/controllers/address_transaction_controller.ex
index 815c8227a6f3..639e5cc39466 100644
--- a/apps/block_scout_web/lib/block_scout_web/controllers/address_transaction_controller.ex
+++ b/apps/block_scout_web/lib/block_scout_web/controllers/address_transaction_controller.ex
@@ -6,10 +6,9 @@ defmodule BlockScoutWeb.AddressTransactionController do
   use BlockScoutWeb, :controller
 
   import BlockScoutWeb.Account.AuthController, only: [current_user: 1]
-
   import BlockScoutWeb.Chain, only: [current_filter: 1, paging_options: 1, next_page_params: 3, split_list_by_page: 1]
-
   import BlockScoutWeb.Models.GetAddressTags, only: [get_address_tags: 2]
+  import Explorer.Chain.SmartContract, only: [burn_address_hash_string: 0]
 
   alias BlockScoutWeb.{AccessHelper, Controller, TransactionView}
   alias Explorer.{Chain, Market}
@@ -40,7 +39,7 @@ defmodule BlockScoutWeb.AddressTransactionController do
     }
   ]
 
-  {:ok, burn_address_hash} = Chain.string_to_address_hash("0x0000000000000000000000000000000000000000")
+  {:ok, burn_address_hash} = Chain.string_to_address_hash(burn_address_hash_string())
   @burn_address_hash burn_address_hash
 
   def index(conn, %{"address_id" => address_hash_string, "type" => "JSON"} = params) do
diff --git a/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/smart_contract_controller.ex b/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/smart_contract_controller.ex
index 34ad68ca255c..7002858350ba 100644
--- a/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/smart_contract_controller.ex
+++ b/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/smart_contract_controller.ex
@@ -6,6 +6,7 @@ defmodule BlockScoutWeb.API.V2.SmartContractController do
   import BlockScoutWeb.PagingHelper,
     only: [current_filter: 1, delete_parameters_from_next_page_params: 1, search_query: 1]
 
+  import Explorer.Chain.SmartContract, only: [burn_address_hash_string: 0]
   import Explorer.SmartContract.Solidity.Verifier, only: [parse_boolean: 1]
 
   alias BlockScoutWeb.{AccessHelper, AddressView}
@@ -26,8 +27,6 @@ defmodule BlockScoutWeb.API.V2.SmartContractController do
 
   @api_true [api?: true]
 
-  @burn_address "0x0000000000000000000000000000000000000000"
-
   action_fallback(BlockScoutWeb.API.V2.FallbackController)
 
   def smart_contract(conn, %{"address_hash" => address_hash_string} = params) do
@@ -109,7 +108,7 @@ defmodule BlockScoutWeb.API.V2.SmartContractController do
         address.smart_contract
         |> SmartContract.get_implementation_address_hash(@api_true)
         |> Tuple.to_list()
-        |> List.first() || @burn_address
+        |> List.first() || burn_address_hash_string()
 
       conn
       |> put_status(200)
@@ -131,7 +130,7 @@ defmodule BlockScoutWeb.API.V2.SmartContractController do
         address.smart_contract
         |> SmartContract.get_implementation_address_hash(@api_true)
         |> Tuple.to_list()
-        |> List.first() || @burn_address
+        |> List.first() || burn_address_hash_string()
 
       conn
       |> put_status(200)
diff --git a/apps/block_scout_web/lib/block_scout_web/controllers/block_transaction_controller.ex b/apps/block_scout_web/lib/block_scout_web/controllers/block_transaction_controller.ex
index 74ef3f6b2f1e..4a92e7c5ca52 100644
--- a/apps/block_scout_web/lib/block_scout_web/controllers/block_transaction_controller.ex
+++ b/apps/block_scout_web/lib/block_scout_web/controllers/block_transaction_controller.ex
@@ -11,12 +11,13 @@ defmodule BlockScoutWeb.BlockTransactionController do
     ]
 
   import Explorer.Chain, only: [hash_to_block: 2, number_to_block: 2]
+  import Explorer.Chain.SmartContract, only: [burn_address_hash_string: 0]
 
   alias BlockScoutWeb.{Controller, TransactionView}
   alias Explorer.Chain
   alias Phoenix.View
 
-  {:ok, burn_address_hash} = Chain.string_to_address_hash("0x0000000000000000000000000000000000000000")
+  {:ok, burn_address_hash} = Chain.string_to_address_hash(burn_address_hash_string())
   @burn_address_hash burn_address_hash
 
   def index(conn, %{"block_hash_or_number" => formatted_block_hash_or_number, "type" => "JSON"} = params) do
diff --git a/apps/block_scout_web/lib/block_scout_web/controllers/pending_transaction_controller.ex b/apps/block_scout_web/lib/block_scout_web/controllers/pending_transaction_controller.ex
index 906fbc3194b4..f709855b000a 100644
--- a/apps/block_scout_web/lib/block_scout_web/controllers/pending_transaction_controller.ex
+++ b/apps/block_scout_web/lib/block_scout_web/controllers/pending_transaction_controller.ex
@@ -2,12 +2,13 @@ defmodule BlockScoutWeb.PendingTransactionController do
   use BlockScoutWeb, :controller
 
   import BlockScoutWeb.Chain, only: [paging_options: 1, next_page_params: 3, split_list_by_page: 1]
+  import Explorer.Chain.SmartContract, only: [burn_address_hash_string: 0]
 
   alias BlockScoutWeb.{Controller, TransactionView}
   alias Explorer.Chain
   alias Phoenix.View
 
-  {:ok, burn_address_hash} = Chain.string_to_address_hash("0x0000000000000000000000000000000000000000")
+  {:ok, burn_address_hash} = Chain.string_to_address_hash(burn_address_hash_string())
   @burn_address_hash burn_address_hash
 
   def index(conn, %{"type" => "JSON"} = params) do
diff --git a/apps/block_scout_web/lib/block_scout_web/controllers/recent_transactions_controller.ex b/apps/block_scout_web/lib/block_scout_web/controllers/recent_transactions_controller.ex
index d692d6de1471..f3406fc6cab6 100644
--- a/apps/block_scout_web/lib/block_scout_web/controllers/recent_transactions_controller.ex
+++ b/apps/block_scout_web/lib/block_scout_web/controllers/recent_transactions_controller.ex
@@ -1,11 +1,13 @@
 defmodule BlockScoutWeb.RecentTransactionsController do
   use BlockScoutWeb, :controller
 
+  import Explorer.Chain.SmartContract, only: [burn_address_hash_string: 0]
+
   alias Explorer.{Chain, PagingOptions}
   alias Explorer.Chain.Hash
   alias Phoenix.View
 
-  {:ok, burn_address_hash} = Chain.string_to_address_hash("0x0000000000000000000000000000000000000000")
+  {:ok, burn_address_hash} = Chain.string_to_address_hash(burn_address_hash_string())
   @burn_address_hash burn_address_hash
 
   def index(conn, _params) do
diff --git a/apps/block_scout_web/lib/block_scout_web/controllers/smart_contract_controller.ex b/apps/block_scout_web/lib/block_scout_web/controllers/smart_contract_controller.ex
index b403e0e7d592..30832eee4aae 100644
--- a/apps/block_scout_web/lib/block_scout_web/controllers/smart_contract_controller.ex
+++ b/apps/block_scout_web/lib/block_scout_web/controllers/smart_contract_controller.ex
@@ -7,8 +7,7 @@ defmodule BlockScoutWeb.SmartContractController do
   alias Explorer.SmartContract.{Reader, Writer}
 
   import Explorer.SmartContract.Solidity.Verifier, only: [parse_boolean: 1]
-
-  @burn_address "0x0000000000000000000000000000000000000000"
+  import Explorer.Chain.SmartContract, only: [burn_address_hash_string: 0]
 
   def index(conn, %{"hash" => address_hash_string, "type" => contract_type, "action" => action} = params) do
     address_options = [
@@ -30,9 +29,9 @@ defmodule BlockScoutWeb.SmartContractController do
           address.smart_contract
           |> SmartContract.get_implementation_address_hash()
           |> Tuple.to_list()
-          |> List.first() || @burn_address
+          |> List.first() || burn_address_hash_string()
         else
-          @burn_address
+          burn_address_hash_string()
         end
 
       functions =
@@ -137,7 +136,7 @@ defmodule BlockScoutWeb.SmartContractController do
         address: %{hash: address_hash},
         custom_abi: true,
         contract_abi: contract_abi,
-        implementation_address: @burn_address,
+        implementation_address: burn_address_hash_string(),
         implementation_abi: [],
         contract_type: contract_type,
         action: action
diff --git a/apps/block_scout_web/lib/block_scout_web/controllers/tokens/instance/transfer_controller.ex b/apps/block_scout_web/lib/block_scout_web/controllers/tokens/instance/transfer_controller.ex
index 7909faf07674..0eaa0115adc8 100644
--- a/apps/block_scout_web/lib/block_scout_web/controllers/tokens/instance/transfer_controller.ex
+++ b/apps/block_scout_web/lib/block_scout_web/controllers/tokens/instance/transfer_controller.ex
@@ -8,8 +8,9 @@ defmodule BlockScoutWeb.Tokens.Instance.TransferController do
   alias Phoenix.View
 
   import BlockScoutWeb.Chain, only: [split_list_by_page: 1, paging_options: 1, next_page_params: 3]
+  import Explorer.Chain.SmartContract, only: [burn_address_hash_string: 0]
 
-  {:ok, burn_address_hash} = Chain.string_to_address_hash("0x0000000000000000000000000000000000000000")
+  {:ok, burn_address_hash} = Chain.string_to_address_hash(burn_address_hash_string())
   @burn_address_hash burn_address_hash
 
   def index(conn, %{"token_id" => token_address_hash, "instance_id" => token_id_str, "type" => "JSON"} = params) do
diff --git a/apps/block_scout_web/lib/block_scout_web/controllers/tokens/transfer_controller.ex b/apps/block_scout_web/lib/block_scout_web/controllers/tokens/transfer_controller.ex
index a349af147408..b36159b82b66 100644
--- a/apps/block_scout_web/lib/block_scout_web/controllers/tokens/transfer_controller.ex
+++ b/apps/block_scout_web/lib/block_scout_web/controllers/tokens/transfer_controller.ex
@@ -12,8 +12,9 @@ defmodule BlockScoutWeb.Tokens.TransferController do
   alias Phoenix.View
 
   import BlockScoutWeb.Chain, only: [split_list_by_page: 1, paging_options: 1, next_page_params: 3]
+  import Explorer.Chain.SmartContract, only: [burn_address_hash_string: 0]
 
-  {:ok, burn_address_hash} = Chain.string_to_address_hash("0x0000000000000000000000000000000000000000")
+  {:ok, burn_address_hash} = Chain.string_to_address_hash(burn_address_hash_string())
   @burn_address_hash burn_address_hash
 
   def index(conn, %{"token_id" => address_hash_string, "type" => "JSON"} = params) do
diff --git a/apps/block_scout_web/lib/block_scout_web/controllers/transaction_controller.ex b/apps/block_scout_web/lib/block_scout_web/controllers/transaction_controller.ex
index 5983ab8920cd..51a75bf85fcb 100644
--- a/apps/block_scout_web/lib/block_scout_web/controllers/transaction_controller.ex
+++ b/apps/block_scout_web/lib/block_scout_web/controllers/transaction_controller.ex
@@ -14,6 +14,7 @@ defmodule BlockScoutWeb.TransactionController do
 
   import BlockScoutWeb.Models.GetAddressTags, only: [get_address_tags: 2]
   import BlockScoutWeb.Models.GetTransactionTags, only: [get_transaction_with_addresses_tags: 2]
+  import Explorer.Chain.SmartContract, only: [burn_address_hash_string: 0]
 
   alias BlockScoutWeb.{
     AccessHelper,
@@ -36,7 +37,7 @@ defmodule BlockScoutWeb.TransactionController do
     :token_transfers => :optional
   }
 
-  {:ok, burn_address_hash} = Chain.string_to_address_hash("0x0000000000000000000000000000000000000000")
+  {:ok, burn_address_hash} = Chain.string_to_address_hash(burn_address_hash_string())
   @burn_address_hash burn_address_hash
 
   @default_options [
diff --git a/apps/block_scout_web/lib/block_scout_web/controllers/transaction_state_controller.ex b/apps/block_scout_web/lib/block_scout_web/controllers/transaction_state_controller.ex
index e2020a47bcca..7ea2d6e74e6c 100644
--- a/apps/block_scout_web/lib/block_scout_web/controllers/transaction_state_controller.ex
+++ b/apps/block_scout_web/lib/block_scout_web/controllers/transaction_state_controller.ex
@@ -16,8 +16,9 @@ defmodule BlockScoutWeb.TransactionStateController do
   import BlockScoutWeb.Models.GetAddressTags, only: [get_address_tags: 2]
   import BlockScoutWeb.Models.GetTransactionTags, only: [get_transaction_with_addresses_tags: 2]
   import BlockScoutWeb.Chain, only: [paging_options: 1, next_page_params: 3, split_list_by_page: 1]
+  import Explorer.Chain.SmartContract, only: [burn_address_hash_string: 0]
 
-  {:ok, burn_address_hash} = Chain.string_to_address_hash("0x0000000000000000000000000000000000000000")
+  {:ok, burn_address_hash} = Chain.string_to_address_hash(burn_address_hash_string())
 
   @burn_address_hash burn_address_hash
 
diff --git a/apps/block_scout_web/lib/block_scout_web/controllers/transaction_token_transfer_controller.ex b/apps/block_scout_web/lib/block_scout_web/controllers/transaction_token_transfer_controller.ex
index d0f7fed1584f..061fde450ad4 100644
--- a/apps/block_scout_web/lib/block_scout_web/controllers/transaction_token_transfer_controller.ex
+++ b/apps/block_scout_web/lib/block_scout_web/controllers/transaction_token_transfer_controller.ex
@@ -5,12 +5,13 @@ defmodule BlockScoutWeb.TransactionTokenTransferController do
   import BlockScoutWeb.Chain, only: [paging_options: 1, next_page_params: 3, split_list_by_page: 1]
   import BlockScoutWeb.Models.GetAddressTags, only: [get_address_tags: 2]
   import BlockScoutWeb.Models.GetTransactionTags, only: [get_transaction_with_addresses_tags: 2]
+  import Explorer.Chain.SmartContract, only: [burn_address_hash_string: 0]
 
   alias BlockScoutWeb.{AccessHelper, Controller, TransactionController, TransactionTokenTransferView}
   alias Explorer.{Chain, Market}
   alias Phoenix.View
 
-  {:ok, burn_address_hash} = Chain.string_to_address_hash("0x0000000000000000000000000000000000000000")
+  {:ok, burn_address_hash} = Chain.string_to_address_hash(burn_address_hash_string())
   @burn_address_hash burn_address_hash
 
   def index(conn, %{"transaction_id" => transaction_hash_string, "type" => "JSON"} = params) do
diff --git a/apps/block_scout_web/lib/block_scout_web/models/transaction_state_helper.ex b/apps/block_scout_web/lib/block_scout_web/models/transaction_state_helper.ex
index e679627e8a74..3971a5463a64 100644
--- a/apps/block_scout_web/lib/block_scout_web/models/transaction_state_helper.ex
+++ b/apps/block_scout_web/lib/block_scout_web/models/transaction_state_helper.ex
@@ -4,13 +4,15 @@ defmodule BlockScoutWeb.Models.TransactionStateHelper do
   """
 
   import BlockScoutWeb.Chain, only: [default_paging_options: 0]
+  import Explorer.Chain.SmartContract, only: [burn_address_hash_string: 0]
+
   alias Explorer.Chain.Transaction.StateChange
   alias Explorer.{Chain, PagingOptions}
   alias Explorer.Chain.{Block, Transaction, Wei}
   alias Explorer.Chain.Cache.StateChanges
   alias Indexer.Fetcher.{CoinBalanceOnDemand, TokenBalanceOnDemand}
 
-  {:ok, burn_address_hash} = Chain.string_to_address_hash("0x0000000000000000000000000000000000000000")
+  {:ok, burn_address_hash} = Chain.string_to_address_hash(burn_address_hash_string())
   @burn_address_hash burn_address_hash
 
   def state_changes(transaction, options \\ [])
diff --git a/apps/explorer/lib/explorer/account/notifier/forbidden_address.ex b/apps/explorer/lib/explorer/account/notifier/forbidden_address.ex
index 26d5e3836cbe..6022c87fcc7d 100644
--- a/apps/explorer/lib/explorer/account/notifier/forbidden_address.ex
+++ b/apps/explorer/lib/explorer/account/notifier/forbidden_address.ex
@@ -3,8 +3,10 @@ defmodule Explorer.Account.Notifier.ForbiddenAddress do
     Check if address is forbidden to notify
   """
 
+  import Explorer.Chain.SmartContract, only: [burn_address_hash_string: 0]
+
   @blacklist [
-    "0x0000000000000000000000000000000000000000",
+    burn_address_hash_string(),
     "0x000000000000000000000000000000000000dEaD"
   ]
 
diff --git a/apps/explorer/lib/explorer/account/notifier/summary.ex b/apps/explorer/lib/explorer/account/notifier/summary.ex
index 6e7833c904ad..db39423bb48c 100644
--- a/apps/explorer/lib/explorer/account/notifier/summary.ex
+++ b/apps/explorer/lib/explorer/account/notifier/summary.ex
@@ -3,6 +3,8 @@ defmodule Explorer.Account.Notifier.Summary do
     Compose a summary from transactions
   """
 
+  import Explorer.Chain.SmartContract, only: [burn_address_hash_string: 0]
+
   alias Explorer
   alias Explorer.Account.Notifier.Summary
   alias Explorer.{Chain, Repo}
@@ -154,10 +156,8 @@ defmodule Explorer.Account.Notifier.Summary do
 
   def fetch_summary(_, _), do: :nothing
 
-  @burn_address "0x0000000000000000000000000000000000000000"
-
   def method(%{from_address_hash: from, to_address_hash: to}) do
-    {:ok, burn_address} = format_address(@burn_address)
+    {:ok, burn_address} = format_address(burn_address_hash_string())
 
     cond do
       burn_address == from -> "mint"
diff --git a/apps/explorer/lib/explorer/chain.ex b/apps/explorer/lib/explorer/chain.ex
index c1b9331fc451..5b4d96d9b940 100644
--- a/apps/explorer/lib/explorer/chain.ex
+++ b/apps/explorer/lib/explorer/chain.ex
@@ -26,6 +26,7 @@ defmodule Explorer.Chain do
     ]
 
   import EthereumJSONRPC, only: [integer_to_quantity: 1, fetch_block_internal_transactions: 2]
+  import Explorer.Chain.SmartContract, only: [burn_address_hash_string: 0]
 
   require Logger
 
@@ -122,8 +123,6 @@ defmodule Explorer.Chain do
   # keccak256("Error(string)")
   @revert_error_method_id "08c379a0"
 
-  @burn_address_hash_str "0x0000000000000000000000000000000000000000"
-
   @limit_showing_transactions 10_000
   @default_page_size 50
 
@@ -5805,7 +5804,7 @@ defmodule Explorer.Chain do
   @spec get_token_transfer_type(TokenTransfer.t()) ::
           :token_burning | :token_minting | :token_spawning | :token_transfer
   def get_token_transfer_type(transfer) do
-    {:ok, burn_address_hash} = Chain.string_to_address_hash(@burn_address_hash_str)
+    {:ok, burn_address_hash} = Chain.string_to_address_hash(burn_address_hash_string())
 
     cond do
       transfer.to_address_hash == burn_address_hash && transfer.from_address_hash !== burn_address_hash ->
diff --git a/apps/explorer/lib/explorer/chain/address/current_token_balance.ex b/apps/explorer/lib/explorer/chain/address/current_token_balance.ex
index c5c77f6c5cfe..50af3af4dd5d 100644
--- a/apps/explorer/lib/explorer/chain/address/current_token_balance.ex
+++ b/apps/explorer/lib/explorer/chain/address/current_token_balance.ex
@@ -10,6 +10,7 @@ defmodule Explorer.Chain.Address.CurrentTokenBalance do
 
   import Ecto.Changeset
   import Ecto.Query, only: [from: 2, limit: 2, offset: 2, order_by: 3, preload: 2, dynamic: 2]
+  import Explorer.Chain.SmartContract, only: [burn_address_hash_string: 0]
 
   alias Explorer.{Chain, PagingOptions, Repo}
   alias Explorer.Chain.{Address, Block, Hash, Token}
@@ -76,7 +77,7 @@ defmodule Explorer.Chain.Address.CurrentTokenBalance do
     |> validate_required(@required_fields)
   end
 
-  {:ok, burn_address_hash} = Chain.string_to_address_hash("0x0000000000000000000000000000000000000000")
+  {:ok, burn_address_hash} = Chain.string_to_address_hash(burn_address_hash_string())
   @burn_address_hash burn_address_hash
 
   @doc """
diff --git a/apps/explorer/lib/explorer/chain/address/token_balance.ex b/apps/explorer/lib/explorer/chain/address/token_balance.ex
index e2c7bdeb2fb8..ab7a75b62486 100644
--- a/apps/explorer/lib/explorer/chain/address/token_balance.ex
+++ b/apps/explorer/lib/explorer/chain/address/token_balance.ex
@@ -9,6 +9,8 @@ defmodule Explorer.Chain.Address.TokenBalance do
 
   use Explorer.Schema
 
+  import Explorer.Chain.SmartContract, only: [burn_address_hash_string: 0]
+
   alias Explorer.Chain
   alias Explorer.Chain.Address.TokenBalance
   alias Explorer.Chain.{Address, Block, Hash, Token}
@@ -68,7 +70,7 @@ defmodule Explorer.Chain.Address.TokenBalance do
     |> unique_constraint(:block_number, name: :token_balances_address_hash_block_number_index)
   end
 
-  {:ok, burn_address_hash} = Chain.string_to_address_hash("0x0000000000000000000000000000000000000000")
+  {:ok, burn_address_hash} = Chain.string_to_address_hash(burn_address_hash_string())
   @burn_address_hash burn_address_hash
 
   @doc """
diff --git a/apps/explorer/lib/explorer/chain/block/reward.ex b/apps/explorer/lib/explorer/chain/block/reward.ex
index b57af7a8cfa1..fd6296a550ea 100644
--- a/apps/explorer/lib/explorer/chain/block/reward.ex
+++ b/apps/explorer/lib/explorer/chain/block/reward.ex
@@ -5,6 +5,8 @@ defmodule Explorer.Chain.Block.Reward do
 
   use Explorer.Schema
 
+  import Explorer.Chain.SmartContract, only: [burn_address_hash_string: 0]
+
   alias Explorer.Application.Constants
   alias Explorer.{Chain, PagingOptions}
   alias Explorer.Chain.Block.Reward.AddressType
@@ -34,8 +36,6 @@ defmodule Explorer.Chain.Block.Reward do
     "constant" => true
   }
 
-  @empty_address "0x0000000000000000000000000000000000000000"
-
   @typedoc """
   The validation reward given related to a block.
 
@@ -218,7 +218,7 @@ defmodule Explorer.Chain.Block.Reward do
       payout_key_hash =
         call_contract(keys_manager_contract_address, @get_payout_by_mining_abi, get_payout_by_mining_params)
 
-      if payout_key_hash == @empty_address do
+      if payout_key_hash == burn_address_hash_string() do
         mining_key
       else
         choose_key(payout_key_hash, mining_key)
@@ -248,7 +248,7 @@ defmodule Explorer.Chain.Block.Reward do
 
     case Reader.query_contract(address, abi, params, false) do
       %{^method_id => {:ok, [result]}} -> result
-      _ -> @empty_address
+      _ -> burn_address_hash_string()
     end
   end
 
diff --git a/apps/explorer/lib/explorer/chain/smart_contract.ex b/apps/explorer/lib/explorer/chain/smart_contract.ex
index 6b3696d28259..adb743d34773 100644
--- a/apps/explorer/lib/explorer/chain/smart_contract.ex
+++ b/apps/explorer/lib/explorer/chain/smart_contract.ex
@@ -21,8 +21,26 @@ defmodule Explorer.Chain.SmartContract do
   alias Explorer.SmartContract.Reader
   alias Timex.Duration
 
-  @burn_address_hash_str "0x0000000000000000000000000000000000000000"
-  @burn_address_hash_str_32 "0x0000000000000000000000000000000000000000000000000000000000000000"
+  # supported signatures:
+  # 5c60da1b = keccak256(implementation())
+  @implementation_signature "5c60da1b"
+  # aaf10f42 = keccak256(getImplementation())
+  @get_implementation_signature "aaf10f42"
+
+  @burn_address_hash_string "0x0000000000000000000000000000000000000000"
+  @burn_address_hash_string_32 "0x0000000000000000000000000000000000000000000000000000000000000000"
+
+  defguard is_burn_signature(term) when term in ["0x", "0x0", @burn_address_hash_string_32]
+  defguard is_burn_signature_or_nil(term) when is_burn_signature(term) or term == nil
+  defguard is_burn_signature_extended(term) when is_burn_signature(term) or term == @burn_address_hash_string
+
+  @doc """
+    Returns burn address hash
+  """
+  @spec burn_address_hash_string() :: String.t()
+  def burn_address_hash_string do
+    @burn_address_hash_string
+  end
 
   @typep api? :: {:api?, true | false}
 
@@ -699,10 +717,10 @@ defmodule Explorer.Chain.SmartContract do
     implementation_address =
       cond do
         implementation_method_abi ->
-          get_implementation_address_hash_basic("5c60da1b", proxy_address_hash, abi)
+          get_implementation_address_hash_basic(@implementation_signature, proxy_address_hash, abi)
 
         get_implementation_method_abi ->
-          get_implementation_address_hash_basic("aaf10f42", proxy_address_hash, abi)
+          get_implementation_address_hash_basic(@get_implementation_signature, proxy_address_hash, abi)
 
         master_copy_method_abi ->
           get_implementation_address_hash_from_master_copy_pattern(proxy_address_hash)
@@ -732,7 +750,7 @@ defmodule Explorer.Chain.SmartContract do
              json_rpc_named_arguments
            ) do
         {:ok, empty_address}
-        when empty_address in ["0x", "0x0", @burn_address_hash_str_32, nil] ->
+        when is_burn_signature_or_nil(empty_address) ->
           fetch_beacon_proxy_implementation(proxy_address_hash, json_rpc_named_arguments)
 
         {:ok, implementation_logic_address} ->
@@ -768,13 +786,13 @@ defmodule Explorer.Chain.SmartContract do
            json_rpc_named_arguments
          ) do
       {:ok, empty_address}
-      when empty_address in ["0x", "0x0", @burn_address_hash_str_32, nil] ->
+      when is_burn_signature_or_nil(empty_address) ->
         fetch_openzeppelin_proxy_implementation(proxy_address_hash, json_rpc_named_arguments)
 
       {:ok, beacon_contract_address} ->
         case beacon_contract_address
              |> abi_decode_address_output()
-             |> get_implementation_address_hash_basic("5c60da1b", implementation_method_abi) do
+             |> get_implementation_address_hash_basic(@implementation_signature, implementation_method_abi) do
           <<implementation_address::binary-size(42)>> ->
             {:ok, implementation_address}
 
@@ -799,7 +817,7 @@ defmodule Explorer.Chain.SmartContract do
            json_rpc_named_arguments
          ) do
       {:ok, empty_address}
-      when empty_address in ["0x", "0x0", @burn_address_hash_str_32] ->
+      when is_burn_signature(empty_address) ->
         {:ok, "0x"}
 
       {:ok, logic_contract_address} ->
@@ -811,9 +829,6 @@ defmodule Explorer.Chain.SmartContract do
   end
 
   defp get_implementation_address_hash_basic(signature, proxy_address_hash, abi) do
-    # supported signatures:
-    # 5c60da1b = keccak256(implementation())
-    # aaf10f42 = keccak256(getImplementation())
     implementation_address =
       case Reader.query_contract(
              proxy_address_hash,
@@ -843,7 +858,7 @@ defmodule Explorer.Chain.SmartContract do
              json_rpc_named_arguments
            ) do
         {:ok, empty_address}
-        when empty_address in ["0x", "0x0", @burn_address_hash_str_32] ->
+        when is_burn_signature(empty_address) ->
           {:ok, "0x"}
 
         {:ok, logic_contract_address} ->
@@ -859,12 +874,7 @@ defmodule Explorer.Chain.SmartContract do
   defp save_implementation_data(nil, _, _, _), do: {nil, nil}
 
   defp save_implementation_data(empty_address_hash_string, proxy_address_hash, metadata_from_verified_twin, options)
-       when empty_address_hash_string in [
-              "0x",
-              "0x0",
-              @burn_address_hash_str_32,
-              @burn_address_hash_str
-            ] do
+       when is_burn_signature_extended(empty_address_hash_string) do
     if is_nil(metadata_from_verified_twin) or !metadata_from_verified_twin do
       proxy_address_hash
       |> Chain.address_hash_to_smart_contract_without_twin(options)
@@ -932,7 +942,7 @@ defmodule Explorer.Chain.SmartContract do
 
   defp abi_decode_address_output(nil), do: nil
 
-  defp abi_decode_address_output("0x"), do: @burn_address_hash_str
+  defp abi_decode_address_output("0x"), do: burn_address_hash_string()
 
   defp abi_decode_address_output(address) when is_binary(address) do
     if String.length(address) > 42 do
diff --git a/apps/explorer/lib/explorer/etherscan.ex b/apps/explorer/lib/explorer/etherscan.ex
index 604bfae66fc2..4663c3c9b9db 100644
--- a/apps/explorer/lib/explorer/etherscan.ex
+++ b/apps/explorer/lib/explorer/etherscan.ex
@@ -4,6 +4,7 @@ defmodule Explorer.Etherscan do
   """
 
   import Ecto.Query, only: [from: 2, where: 3, or_where: 3, union: 2, subquery: 1, order_by: 3]
+  import Explorer.Chain.SmartContract, only: [burn_address_hash_string: 0]
 
   alias Explorer.Etherscan.Logs
   alias Explorer.{Chain, Repo}
@@ -21,8 +22,6 @@ defmodule Explorer.Etherscan do
     end_timestamp: nil
   }
 
-  @burn_address_hash_str "0x0000000000000000000000000000000000000000"
-
   @doc """
   Returns the maximum allowed page size number.
 
@@ -585,7 +584,7 @@ defmodule Explorer.Etherscan do
 
   @spec fetch_sum_coin_total_supply_minus_burnt() :: non_neg_integer
   def fetch_sum_coin_total_supply_minus_burnt do
-    {:ok, burn_address_hash} = Chain.string_to_address_hash(@burn_address_hash_str)
+    {:ok, burn_address_hash} = Chain.string_to_address_hash(burn_address_hash_string())
 
     query =
       from(
diff --git a/apps/indexer/lib/indexer/transform/address_token_balances.ex b/apps/indexer/lib/indexer/transform/address_token_balances.ex
index 3dc7b5be525d..cae8b2cbac7b 100644
--- a/apps/indexer/lib/indexer/transform/address_token_balances.ex
+++ b/apps/indexer/lib/indexer/transform/address_token_balances.ex
@@ -3,7 +3,7 @@ defmodule Indexer.Transform.AddressTokenBalances do
   Extracts `Explorer.Address.TokenBalance` params from other schema's params.
   """
 
-  @burn_address "0x0000000000000000000000000000000000000000"
+  import Explorer.Chain.SmartContract, only: [burn_address_hash_string: 0]
 
   def params_set(%{} = import_options) do
     Enum.reduce(import_options, MapSet.new(), &reducer/2)
@@ -35,7 +35,7 @@ defmodule Indexer.Transform.AddressTokenBalances do
     Enum.filter(token_transfers_params, &do_filter_burn_address/1)
   end
 
-  defp add_token_balance_address(map_set, unquote(@burn_address), _, _, _, _), do: map_set
+  defp add_token_balance_address(map_set, unquote(burn_address_hash_string()), _, _, _, _), do: map_set
 
   defp add_token_balance_address(map_set, address, token_contract_address, token_id, token_type, block_number) do
     MapSet.put(map_set, %{
@@ -47,7 +47,7 @@ defmodule Indexer.Transform.AddressTokenBalances do
     })
   end
 
-  def do_filter_burn_address(%{to_address_hash: unquote(@burn_address), token_type: "ERC-721"}) do
+  def do_filter_burn_address(%{to_address_hash: unquote(burn_address_hash_string()), token_type: "ERC-721"}) do
     false
   end
 
diff --git a/apps/indexer/lib/indexer/transform/token_transfers.ex b/apps/indexer/lib/indexer/transform/token_transfers.ex
index 80d153d0f2cc..f5c3e3cabf06 100644
--- a/apps/indexer/lib/indexer/transform/token_transfers.ex
+++ b/apps/indexer/lib/indexer/transform/token_transfers.ex
@@ -5,13 +5,13 @@ defmodule Indexer.Transform.TokenTransfers do
 
   require Logger
 
+  import Explorer.Chain.SmartContract, only: [burn_address_hash_string: 0]
+
   alias ABI.TypeDecoder
   alias Explorer.Repo
   alias Explorer.Chain.{Token, TokenTransfer}
   alias Indexer.Fetcher.TokenTotalSupplyUpdater
 
-  @burn_address "0x0000000000000000000000000000000000000000"
-
   @doc """
   Returns a list of token transfers given a list of logs.
   """
@@ -51,7 +51,8 @@ defmodule Indexer.Transform.TokenTransfers do
 
     token_transfers
     |> Enum.filter(fn token_transfer ->
-      token_transfer.to_address_hash == @burn_address || token_transfer.from_address_hash == @burn_address
+      token_transfer.to_address_hash == burn_address_hash_string() ||
+        token_transfer.from_address_hash == burn_address_hash_string()
     end)
     |> Enum.map(fn token_transfer ->
       token_transfer.token_contract_address_hash
@@ -177,9 +178,9 @@ defmodule Indexer.Transform.TokenTransfers do
 
     {from_address_hash, to_address_hash} =
       if log.first_topic == TokenTransfer.weth_deposit_signature() do
-        {@burn_address, truncate_address_hash(log.second_topic)}
+        {burn_address_hash_string(), truncate_address_hash(log.second_topic)}
       else
-        {truncate_address_hash(log.second_topic), @burn_address}
+        {truncate_address_hash(log.second_topic), burn_address_hash_string()}
       end
 
     token_transfer = %{
@@ -315,7 +316,7 @@ defmodule Indexer.Transform.TokenTransfers do
     {token, token_transfer}
   end
 
-  defp truncate_address_hash(nil), do: "0x0000000000000000000000000000000000000000"
+  defp truncate_address_hash(nil), do: burn_address_hash_string()
 
   defp truncate_address_hash("0x000000000000000000000000" <> truncated_hash) do
     "0x#{truncated_hash}"
diff --git a/apps/indexer/lib/indexer/transform/transaction_actions.ex b/apps/indexer/lib/indexer/transform/transaction_actions.ex
index e4305c33c384..d22274decd98 100644
--- a/apps/indexer/lib/indexer/transform/transaction_actions.ex
+++ b/apps/indexer/lib/indexer/transform/transaction_actions.ex
@@ -6,6 +6,7 @@ defmodule Indexer.Transform.TransactionActions do
   require Logger
 
   import Ecto.Query, only: [from: 2]
+  import Explorer.Chain.SmartContract, only: [burn_address_hash_string: 0]
 
   alias ABI.TypeDecoder
   alias Explorer.Chain.Cache.NetVersion
@@ -22,7 +23,6 @@ defmodule Indexer.Transform.TransactionActions do
   @base_goerli 84531
   # @gnosis 100
 
-  @burn_address "0x0000000000000000000000000000000000000000"
   @uniswap_v3_factory_abi [
     %{
       "inputs" => [
@@ -450,7 +450,7 @@ defmodule Indexer.Transform.TransactionActions do
           from = truncate_address_hash(log.second_topic)
 
           # credo:disable-for-next-line
-          if from == @burn_address do
+          if from == burn_address_hash_string() do
             to = truncate_address_hash(log.third_topic)
             [token_id] = decode_data(log.fourth_topic, [{:uint, 256}])
             mint_nft_ids = Map.put_new(acc, to, %{ids: [], log_index: log.index})
@@ -651,8 +651,8 @@ defmodule Indexer.Transform.TransactionActions do
         end
       end)
       |> Enum.map(fn {pool_address, pool} ->
-        token0 = if is_address_correct?(pool.token0), do: String.downcase(pool.token0), else: @burn_address
-        token1 = if is_address_correct?(pool.token1), do: String.downcase(pool.token1), else: @burn_address
+        token0 = if is_address_correct?(pool.token0), do: String.downcase(pool.token0), else: burn_address_hash_string()
+        token1 = if is_address_correct?(pool.token1), do: String.downcase(pool.token1), else: burn_address_hash_string()
         fee = if pool.fee == "", do: 0, else: pool.fee
 
         # we will call getPool(token0, token1, fee) public getter
@@ -999,7 +999,7 @@ defmodule Indexer.Transform.TransactionActions do
     if is_nil(first_topic), do: "", else: String.downcase(first_topic)
   end
 
-  defp truncate_address_hash(nil), do: @burn_address
+  defp truncate_address_hash(nil), do: burn_address_hash_string()
 
   defp truncate_address_hash("0x000000000000000000000000" <> truncated_hash) do
     "0x#{truncated_hash}"

From 0cd2cb97bc957f39dfd4c3aef63c29608c5f0ab2 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 12 Sep 2023 07:13:28 +0000
Subject: [PATCH 398/909] Bump ex_cldr_numbers from 2.32.1 to 2.32.2

Bumps [ex_cldr_numbers](https://github.com/elixir-cldr/cldr_numbers) from 2.32.1 to 2.32.2.
- [Release notes](https://github.com/elixir-cldr/cldr_numbers/releases)
- [Changelog](https://github.com/elixir-cldr/cldr_numbers/blob/main/CHANGELOG.md)
- [Commits](https://github.com/elixir-cldr/cldr_numbers/compare/v2.32.1...v2.32.2)

---
updated-dependencies:
- dependency-name: ex_cldr_numbers
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 mix.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mix.lock b/mix.lock
index baa4518de7d5..5e4c901be446 100644
--- a/mix.lock
+++ b/mix.lock
@@ -45,7 +45,7 @@
   "ex_cldr": {:hex, :ex_cldr, "2.37.2", "c45041534ec60af367c4c1af02a608576118044fe3c441c782fd424061d6b517", [:mix], [{:cldr_utils, "~> 2.21", [hex: :cldr_utils, repo: "hexpm", optional: false]}, {:decimal, "~> 1.6 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: false]}, {:gettext, "~> 0.19", [hex: :gettext, repo: "hexpm", optional: true]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}, {:nimble_parsec, "~> 0.5 or ~> 1.0", [hex: :nimble_parsec, repo: "hexpm", optional: true]}], "hexpm", "c8467b1d5080716ace6621703b6656cb2f9545572a54b341da900791a0cf92ba"},
   "ex_cldr_currencies": {:hex, :ex_cldr_currencies, "2.15.0", "aadd34e91cfac7ef6b03fe8f47f8c6fa8c5daf3f89b5d9fee64ec545ded839cf", [:mix], [{:ex_cldr, "~> 2.34", [hex: :ex_cldr, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}], "hexpm", "0521316396c66877a2d636219767560bb2397c583341fcb154ecf9f3000e6ff8"},
   "ex_cldr_lists": {:hex, :ex_cldr_lists, "2.10.0", "4d4c9877da2d0417fd832907d69974e8328969f75fafc79b05ccf85f549f6281", [:mix], [{:ex_cldr_numbers, "~> 2.25", [hex: :ex_cldr_numbers, repo: "hexpm", optional: false]}, {:ex_doc, "~> 0.18", [hex: :ex_doc, repo: "hexpm", optional: true]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}], "hexpm", "adc040cde7b97f7fd7c0b35dd69ddb6fcf607303ae6355bb1851deae1f8b0652"},
-  "ex_cldr_numbers": {:hex, :ex_cldr_numbers, "2.32.1", "55161546ccf9e7b1adcfc6f80fc9952c7d87a63376ebe72e643659d14c5d638d", [:mix], [{:decimal, "~> 1.6 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: false]}, {:digital_token, "~> 0.3 or ~> 1.0", [hex: :digital_token, repo: "hexpm", optional: false]}, {:ex_cldr, "~> 2.37", [hex: :ex_cldr, repo: "hexpm", optional: false]}, {:ex_cldr_currencies, ">= 2.14.2", [hex: :ex_cldr_currencies, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}], "hexpm", "beecc1ef2b3518e4d54deb6fecd0f8b8c78583dd74c939ec263f7b838217bb48"},
+  "ex_cldr_numbers": {:hex, :ex_cldr_numbers, "2.32.2", "5e0e3031d3f54b51fe7078a7a94592987b70b06d631bdc88813b222dc5a8b1bd", [:mix], [{:decimal, "~> 1.6 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: false]}, {:digital_token, "~> 0.3 or ~> 1.0", [hex: :digital_token, repo: "hexpm", optional: false]}, {:ex_cldr, "~> 2.37", [hex: :ex_cldr, repo: "hexpm", optional: false]}, {:ex_cldr_currencies, ">= 2.14.2", [hex: :ex_cldr_currencies, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}], "hexpm", "91257684a9c4d6abdf738f0cc5671837de876e69552e8bd4bc5fa1bfd5817713"},
   "ex_cldr_units": {:hex, :ex_cldr_units, "3.16.2", "dbad303fba819981c578234e2aaf19d72efca16ea8b1c6ee46b26232cb45e232", [:mix], [{:cldr_utils, "~> 2.24", [hex: :cldr_utils, repo: "hexpm", optional: false]}, {:decimal, "~> 1.6 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: false]}, {:ex_cldr_lists, "~> 2.10", [hex: :ex_cldr_lists, repo: "hexpm", optional: false]}, {:ex_cldr_numbers, "~> 2.31", [hex: :ex_cldr_numbers, repo: "hexpm", optional: false]}, {:ex_doc, "~> 0.18", [hex: :ex_doc, repo: "hexpm", optional: true]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}], "hexpm", "851095319fb3205c1549619da742cd53a2804c1d9c204cf84014021e2a6ea7e5"},
   "ex_doc": {:hex, :ex_doc, "0.30.6", "5f8b54854b240a2b55c9734c4b1d0dd7bdd41f71a095d42a70445c03cf05a281", [:mix], [{:earmark_parser, "~> 1.4.31", [hex: :earmark_parser, repo: "hexpm", optional: false]}, {:makeup_elixir, "~> 0.14", [hex: :makeup_elixir, repo: "hexpm", optional: false]}, {:makeup_erlang, "~> 0.1", [hex: :makeup_erlang, repo: "hexpm", optional: false]}], "hexpm", "bd48f2ddacf4e482c727f9293d9498e0881597eae6ddc3d9562bd7923375109f"},
   "ex_json_schema": {:hex, :ex_json_schema, "0.10.1", "e03b746b6675a750c0bb1a5cc919f61353f7ab8450977e11ceede20e6180c560", [:mix], [{:decimal, "~> 2.0", [hex: :decimal, repo: "hexpm", optional: false]}], "hexpm", "66a64e60dadad89914d92f89c7e7906c57de75a8b79ac2480d0d53e1b8096fb0"},

From a5d8962b48209fd7c7dfa9ee8da06b1a47e08b59 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 12 Sep 2023 07:15:13 +0000
Subject: [PATCH 399/909] Bump ex_abi from 0.6.1 to 0.6.2

Bumps [ex_abi](https://github.com/poanetwork/ex_abi) from 0.6.1 to 0.6.2.
- [Release notes](https://github.com/poanetwork/ex_abi/releases)
- [Changelog](https://github.com/poanetwork/ex_abi/blob/master/CHANGELOG.md)
- [Commits](https://github.com/poanetwork/ex_abi/commits)

---
updated-dependencies:
- dependency-name: ex_abi
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 mix.lock | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/mix.lock b/mix.lock
index baa4518de7d5..1f6883447514 100644
--- a/mix.lock
+++ b/mix.lock
@@ -41,7 +41,7 @@
   "ecto_sql": {:hex, :ecto_sql, "3.10.2", "6b98b46534b5c2f8b8b5f03f126e75e2a73c64f3c071149d32987a5378b0fdbd", [:mix], [{:db_connection, "~> 2.5 or ~> 2.4.1", [hex: :db_connection, repo: "hexpm", optional: false]}, {:ecto, "~> 3.10.0", [hex: :ecto, repo: "hexpm", optional: false]}, {:myxql, "~> 0.6.0", [hex: :myxql, repo: "hexpm", optional: true]}, {:postgrex, "~> 0.16.0 or ~> 0.17.0 or ~> 1.0", [hex: :postgrex, repo: "hexpm", optional: true]}, {:tds, "~> 2.1.1 or ~> 2.2", [hex: :tds, repo: "hexpm", optional: true]}, {:telemetry, "~> 0.4.0 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "68c018debca57cb9235e3889affdaec7a10616a4e3a80c99fa1d01fdafaa9007"},
   "elixir_make": {:hex, :elixir_make, "0.7.7", "7128c60c2476019ed978210c245badf08b03dbec4f24d05790ef791da11aa17c", [:mix], [{:castore, "~> 0.1 or ~> 1.0", [hex: :castore, repo: "hexpm", optional: true]}], "hexpm", "5bc19fff950fad52bbe5f211b12db9ec82c6b34a9647da0c2224b8b8464c7e6c"},
   "erlex": {:hex, :erlex, "0.2.6", "c7987d15e899c7a2f34f5420d2a2ea0d659682c06ac607572df55a43753aa12e", [:mix], [], "hexpm", "2ed2e25711feb44d52b17d2780eabf998452f6efda104877a3881c2f8c0c0c75"},
-  "ex_abi": {:hex, :ex_abi, "0.6.1", "b3dfc1f81e88c5927ac7ab18b7b743772323d151be6febc08c2a79372ce58842", [:mix], [{:ex_keccak, "~> 0.7.1", [hex: :ex_keccak, repo: "hexpm", optional: false]}, {:jason, "~> 1.4", [hex: :jason, repo: "hexpm", optional: false]}], "hexpm", "23f446e19b81428bb1c56de88a595b6aa45a423a7e4a97952c44bef50a66d921"},
+  "ex_abi": {:hex, :ex_abi, "0.6.2", "a33d0df94efd54d6879d20ab8cb6561432f13cbb1e912801d2e97ef50f795e9d", [:mix], [{:ex_keccak, "~> 0.7.3", [hex: :ex_keccak, repo: "hexpm", optional: false]}, {:jason, "~> 1.4", [hex: :jason, repo: "hexpm", optional: false]}], "hexpm", "e901c580a2491b19a6c27891c6d40cd8fe41d996c8c2ec02d5dd4c5a86239bc6"},
   "ex_cldr": {:hex, :ex_cldr, "2.37.2", "c45041534ec60af367c4c1af02a608576118044fe3c441c782fd424061d6b517", [:mix], [{:cldr_utils, "~> 2.21", [hex: :cldr_utils, repo: "hexpm", optional: false]}, {:decimal, "~> 1.6 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: false]}, {:gettext, "~> 0.19", [hex: :gettext, repo: "hexpm", optional: true]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}, {:nimble_parsec, "~> 0.5 or ~> 1.0", [hex: :nimble_parsec, repo: "hexpm", optional: true]}], "hexpm", "c8467b1d5080716ace6621703b6656cb2f9545572a54b341da900791a0cf92ba"},
   "ex_cldr_currencies": {:hex, :ex_cldr_currencies, "2.15.0", "aadd34e91cfac7ef6b03fe8f47f8c6fa8c5daf3f89b5d9fee64ec545ded839cf", [:mix], [{:ex_cldr, "~> 2.34", [hex: :ex_cldr, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}], "hexpm", "0521316396c66877a2d636219767560bb2397c583341fcb154ecf9f3000e6ff8"},
   "ex_cldr_lists": {:hex, :ex_cldr_lists, "2.10.0", "4d4c9877da2d0417fd832907d69974e8328969f75fafc79b05ccf85f549f6281", [:mix], [{:ex_cldr_numbers, "~> 2.25", [hex: :ex_cldr_numbers, repo: "hexpm", optional: false]}, {:ex_doc, "~> 0.18", [hex: :ex_doc, repo: "hexpm", optional: true]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}], "hexpm", "adc040cde7b97f7fd7c0b35dd69ddb6fcf607303ae6355bb1851deae1f8b0652"},
@@ -49,7 +49,7 @@
   "ex_cldr_units": {:hex, :ex_cldr_units, "3.16.2", "dbad303fba819981c578234e2aaf19d72efca16ea8b1c6ee46b26232cb45e232", [:mix], [{:cldr_utils, "~> 2.24", [hex: :cldr_utils, repo: "hexpm", optional: false]}, {:decimal, "~> 1.6 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: false]}, {:ex_cldr_lists, "~> 2.10", [hex: :ex_cldr_lists, repo: "hexpm", optional: false]}, {:ex_cldr_numbers, "~> 2.31", [hex: :ex_cldr_numbers, repo: "hexpm", optional: false]}, {:ex_doc, "~> 0.18", [hex: :ex_doc, repo: "hexpm", optional: true]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}], "hexpm", "851095319fb3205c1549619da742cd53a2804c1d9c204cf84014021e2a6ea7e5"},
   "ex_doc": {:hex, :ex_doc, "0.30.6", "5f8b54854b240a2b55c9734c4b1d0dd7bdd41f71a095d42a70445c03cf05a281", [:mix], [{:earmark_parser, "~> 1.4.31", [hex: :earmark_parser, repo: "hexpm", optional: false]}, {:makeup_elixir, "~> 0.14", [hex: :makeup_elixir, repo: "hexpm", optional: false]}, {:makeup_erlang, "~> 0.1", [hex: :makeup_erlang, repo: "hexpm", optional: false]}], "hexpm", "bd48f2ddacf4e482c727f9293d9498e0881597eae6ddc3d9562bd7923375109f"},
   "ex_json_schema": {:hex, :ex_json_schema, "0.10.1", "e03b746b6675a750c0bb1a5cc919f61353f7ab8450977e11ceede20e6180c560", [:mix], [{:decimal, "~> 2.0", [hex: :decimal, repo: "hexpm", optional: false]}], "hexpm", "66a64e60dadad89914d92f89c7e7906c57de75a8b79ac2480d0d53e1b8096fb0"},
-  "ex_keccak": {:hex, :ex_keccak, "0.7.1", "0169f4b0c5073c5df61581d6282b12f1a1b764dcfcda4eeb1c819b5194c9ced0", [:mix], [{:rustler, ">= 0.0.0", [hex: :rustler, repo: "hexpm", optional: true]}, {:rustler_precompiled, "~> 0.6.1", [hex: :rustler_precompiled, repo: "hexpm", optional: false]}], "hexpm", "c18c19f66b6545b4b46b0c71c0cc0079de84e30b26365a92961e91697e8724ed"},
+  "ex_keccak": {:hex, :ex_keccak, "0.7.3", "33298f97159f6b0acd28f6e96ce5ea975a0f4a19f85fe615b4f4579b88b24d06", [:mix], [{:rustler, ">= 0.0.0", [hex: :rustler, repo: "hexpm", optional: true]}, {:rustler_precompiled, "~> 0.6.1", [hex: :rustler_precompiled, repo: "hexpm", optional: false]}], "hexpm", "4c5e6d9d5f77b64ab48769a0166a9814180d40ced68ed74ce60a5174ab55b3fc"},
   "ex_machina": {:hex, :ex_machina, "2.7.0", "b792cc3127fd0680fecdb6299235b4727a4944a09ff0fa904cc639272cd92dc7", [:mix], [{:ecto, "~> 2.2 or ~> 3.0", [hex: :ecto, repo: "hexpm", optional: true]}, {:ecto_sql, "~> 3.0", [hex: :ecto_sql, repo: "hexpm", optional: true]}], "hexpm", "419aa7a39bde11894c87a615c4ecaa52d8f107bbdd81d810465186f783245bf8"},
   "ex_rlp": {:hex, :ex_rlp, "0.6.0", "985391d2356a7cb8712a4a9a2deb93f19f2fbca0323f5c1203fcaf64d077e31e", [:mix], [], "hexpm", "7135db93b861d9e76821039b60b00a6a22d2c4e751bf8c444bffe7a042f1abaf"},
   "ex_secp256k1": {:hex, :ex_secp256k1, "0.7.2", "33398c172813b90fab9ab75c12b98d16cfab472c6dcbde832b13c45ce1c01947", [:mix], [{:rustler, ">= 0.0.0", [hex: :rustler, repo: "hexpm", optional: true]}, {:rustler_precompiled, "~> 0.6", [hex: :rustler_precompiled, repo: "hexpm", optional: false]}], "hexpm", "f3b1bf56e6992e28b9d86e3bf741a4aca3e641052eb47d13ae4f5f4d4944bdaf"},

From b1ab8bcc770f24247368903d883c24c26f641f0a Mon Sep 17 00:00:00 2001
From: Viktor Baranov <baranov.viktor.27@gmail.com>
Date: Tue, 12 Sep 2023 12:08:10 +0300
Subject: [PATCH 400/909] Fix market cap calculation in case of CMC

---
 CHANGELOG.md                                  |  1 +
 .../exchange_rates/source/coin_market_cap.ex  |  6 +-
 .../source/coin_market_cap_test.exs           | 99 +++++++++++++++++++
 cspell.json                                   |  4 +-
 4 files changed, 108 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4166d15ffecf..8660565682db 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -15,6 +15,7 @@
 
 ### Fixes
 
+- [#8446](https://github.com/blockscout/blockscout/pull/8446) - Fix market cap calculation in case of CMC
 - [#8431](https://github.com/blockscout/blockscout/pull/8431) - Fix contracts' output decoding
 - [#8354](https://github.com/blockscout/blockscout/pull/8354) - Hotfix for proper addresses' tokens displaying
 - [#8350](https://github.com/blockscout/blockscout/pull/8350) - Add Base Mainnet support for tx actions
diff --git a/apps/explorer/lib/explorer/exchange_rates/source/coin_market_cap.ex b/apps/explorer/lib/explorer/exchange_rates/source/coin_market_cap.ex
index 711f089a26dc..0ef28b6c395b 100644
--- a/apps/explorer/lib/explorer/exchange_rates/source/coin_market_cap.ex
+++ b/apps/explorer/lib/explorer/exchange_rates/source/coin_market_cap.ex
@@ -107,7 +107,11 @@ defmodule Explorer.ExchangeRates.Source.CoinMarketCap do
          true <- Enum.count(token_values_list) > 0,
          token_values <- token_values_list |> Enum.at(0),
          true <- Enum.count(token_values) > 0 do
-      token_values |> Enum.at(0)
+      if is_list(token_values) do
+        token_values |> Enum.at(0)
+      else
+        token_values
+      end
     else
       _ -> %{}
     end
diff --git a/apps/explorer/test/explorer/exchange_rates/source/coin_market_cap_test.exs b/apps/explorer/test/explorer/exchange_rates/source/coin_market_cap_test.exs
index c9bfea7ad1f5..1d957f4e4aa0 100644
--- a/apps/explorer/test/explorer/exchange_rates/source/coin_market_cap_test.exs
+++ b/apps/explorer/test/explorer/exchange_rates/source/coin_market_cap_test.exs
@@ -34,4 +34,103 @@ defmodule Explorer.ExchangeRates.Source.CoinMarketCapTest do
                CoinMarketCap.source_url("ETH")
     end
   end
+
+  @token_properties %{
+    "circulating_supply" => 0,
+    "cmc_rank" => 2977,
+    "date_added" => "2021-12-06T11:25:31.000Z",
+    "id" => 15658,
+    "infinite_supply" => false,
+    "is_active" => 1,
+    "is_fiat" => 0,
+    "last_updated" => "2023-09-12T09:03:00.000Z",
+    "max_supply" => 210_240_000,
+    "name" => "Qitmeer Network",
+    "num_market_pairs" => 10,
+    "platform" => nil,
+    "quote" => %{
+      "USD" => %{
+        "fully_diluted_market_cap" => 27_390_222.61,
+        "last_updated" => "2023-09-12T09:03:00.000Z",
+        "market_cap" => 0,
+        "market_cap_dominance" => 0,
+        "percent_change_1h" => -0.14807635,
+        "percent_change_24h" => -4.05784287,
+        "percent_change_30d" => -20.18918329,
+        "percent_change_60d" => 85.21384726,
+        "percent_change_7d" => -5.49776979,
+        "percent_change_90d" => 22.27442093,
+        "price" => 0.13028073920022334,
+        "tvl" => nil,
+        "volume_24h" => 93766.09652096,
+        "volume_change_24h" => -0.9423
+      }
+    },
+    "self_reported_circulating_supply" => 71_348_557,
+    "self_reported_market_cap" => 9_295_342.74682927,
+    "slug" => "qitmeer-network",
+    "symbol" => "MEER",
+    "tags" => [],
+    "total_supply" => 71_348_557,
+    "tvl_ratio" => nil
+  }
+
+  @market_data_multiple_tokens %{
+    "MEER" => [
+      @token_properties,
+      %{
+        "circulating_supply" => nil,
+        "cmc_rank" => nil,
+        "date_added" => "2023-05-12T15:52:05.000Z",
+        "id" => 25240,
+        "infinite_supply" => false,
+        "is_active" => 0,
+        "is_fiat" => 0,
+        "last_updated" => "2023-09-12T09:05:15.725Z",
+        "max_supply" => 210_240_000,
+        "name" => "Meer Coin",
+        "num_market_pairs" => nil,
+        "platform" => nil,
+        "quote" => %{
+          "USD" => %{
+            "fully_diluted_market_cap" => nil,
+            "last_updated" => "2023-09-12T09:05:15.725Z",
+            "market_cap" => nil,
+            "market_cap_dominance" => nil,
+            "percent_change_1h" => nil,
+            "percent_change_24h" => nil,
+            "percent_change_30d" => nil,
+            "percent_change_60d" => nil,
+            "percent_change_7d" => nil,
+            "percent_change_90d" => nil,
+            "price" => 0,
+            "tvl" => nil,
+            "volume_24h" => nil,
+            "volume_change_24h" => nil
+          }
+        },
+        "self_reported_circulating_supply" => nil,
+        "self_reported_market_cap" => nil,
+        "slug" => "meer-coin",
+        "symbol" => "MEER",
+        "tags" => [],
+        "total_supply" => nil,
+        "tvl_ratio" => nil
+      }
+    ]
+  }
+
+  @market_data_single_token %{
+    "15658" => @token_properties
+  }
+
+  describe "get_token_properties/1" do
+    test "returns a single token property, when market_data contains multiple tokens" do
+      assert CoinMarketCap.get_token_properties(@market_data_multiple_tokens) == @token_properties
+    end
+
+    test "returns a single token property, when market_data contains a single token" do
+      assert CoinMarketCap.get_token_properties(@market_data_single_token) == @token_properties
+    end
+  end
 end
diff --git a/cspell.json b/cspell.json
index db95f259f771..ef83d12ef464 100644
--- a/cspell.json
+++ b/cspell.json
@@ -522,7 +522,9 @@
         "secp",
         "qwertyuioiuytrewertyuioiuytrertyuio",
         "urlset",
-        "lastmod"
+        "lastmod",
+        "qitmeer",
+        "meer",
     ],
     "enableFiletypes": [
         "dotenv",

From 636472cd3f3934d7db284fd4fa086fe4290c74df Mon Sep 17 00:00:00 2001
From: Qwerty5Uiop <alex000010@bk.ru>
Date: Tue, 29 Aug 2023 10:53:18 +0300
Subject: [PATCH 401/909] Fix reorgs query

---
 CHANGELOG.md                                         |  1 +
 .../controllers/api/v2/block_controller_test.exs     |  4 ++++
 .../controllers/block_controller_test.exs            |  4 ++--
 .../block_scout_web/features/viewing_blocks_test.exs |  3 ++-
 apps/explorer/lib/explorer/chain/block.ex            | 12 ++++++++----
 5 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8660565682db..cb2e21442578 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -25,6 +25,7 @@
 - [#8240](https://github.com/blockscout/blockscout/pull/8240) - Refactor and fix paging params in API v2
 - [#8242](https://github.com/blockscout/blockscout/pull/8242) - Fixing visualizer service CORS issue when running docker-compose
 - [#8355](https://github.com/blockscout/blockscout/pull/8355) - Fix current token balances redefining
+- [#8338](https://github.com/blockscout/blockscout/pull/8338) - Fix reorgs query
 
 ### Chore
 
diff --git a/apps/block_scout_web/test/block_scout_web/controllers/api/v2/block_controller_test.exs b/apps/block_scout_web/test/block_scout_web/controllers/api/v2/block_controller_test.exs
index 9e115db4bd65..5a29e5168366 100644
--- a/apps/block_scout_web/test/block_scout_web/controllers/api/v2/block_controller_test.exs
+++ b/apps/block_scout_web/test/block_scout_web/controllers/api/v2/block_controller_test.exs
@@ -103,6 +103,8 @@ defmodule BlockScoutWeb.API.V2.BlockControllerTest do
         |> insert_list(:block, consensus: false)
         |> Enum.reverse()
 
+      Enum.each(reorgs, fn b -> insert(:block, number: b.number, consensus: true) end)
+
       request = get(conn, "/api/v2/blocks", %{"type" => "reorg"})
 
       assert response = json_response(request, 200)
@@ -119,6 +121,8 @@ defmodule BlockScoutWeb.API.V2.BlockControllerTest do
         51
         |> insert_list(:block, consensus: false)
 
+      Enum.each(reorgs, fn b -> insert(:block, number: b.number, consensus: true) end)
+
       filter = %{"type" => "reorg"}
       request = get(conn, "/api/v2/blocks", filter)
       assert response = json_response(request, 200)
diff --git a/apps/block_scout_web/test/block_scout_web/controllers/block_controller_test.exs b/apps/block_scout_web/test/block_scout_web/controllers/block_controller_test.exs
index b407e0a44c32..8c5333adfc38 100644
--- a/apps/block_scout_web/test/block_scout_web/controllers/block_controller_test.exs
+++ b/apps/block_scout_web/test/block_scout_web/controllers/block_controller_test.exs
@@ -134,7 +134,7 @@ defmodule BlockScoutWeb.BlockControllerTest do
     test "returns all reorgs", %{conn: conn} do
       4
       |> insert_list(:block, consensus: false)
-      |> Enum.map(& &1.hash)
+      |> Enum.each(fn b -> insert(:block, number: b.number, consensus: true) end)
 
       conn = get(conn, reorg_path(conn, :reorg), %{"type" => "JSON"})
 
@@ -146,7 +146,7 @@ defmodule BlockScoutWeb.BlockControllerTest do
     test "does not include blocks or uncles", %{conn: conn} do
       4
       |> insert_list(:block, consensus: false)
-      |> Enum.map(& &1.hash)
+      |> Enum.each(fn b -> insert(:block, number: b.number, consensus: true) end)
 
       insert(:block)
       uncle = insert(:block, consensus: false)
diff --git a/apps/block_scout_web/test/block_scout_web/features/viewing_blocks_test.exs b/apps/block_scout_web/test/block_scout_web/features/viewing_blocks_test.exs
index c1f6688d4d0d..914ef68edb16 100644
--- a/apps/block_scout_web/test/block_scout_web/features/viewing_blocks_test.exs
+++ b/apps/block_scout_web/test/block_scout_web/features/viewing_blocks_test.exs
@@ -174,7 +174,8 @@ defmodule BlockScoutWeb.ViewingBlocksTest do
 
   describe "viewing reorg blocks list" do
     test "lists uncle blocks", %{session: session} do
-      [reorg | _] = insert_list(10, :block, consensus: false)
+      [reorg | _] = blocks = insert_list(10, :block, consensus: false)
+      Enum.each(blocks, fn b -> insert(:block, number: b.number, consensus: true) end)
 
       session
       |> BlockListPage.visit_reorgs_page()
diff --git a/apps/explorer/lib/explorer/chain/block.ex b/apps/explorer/lib/explorer/chain/block.ex
index 8b1334a357b3..a1ab2d19e6a8 100644
--- a/apps/explorer/lib/explorer/chain/block.ex
+++ b/apps/explorer/lib/explorer/chain/block.ex
@@ -7,7 +7,7 @@ defmodule Explorer.Chain.Block do
 
   use Explorer.Schema
 
-  alias Explorer.Chain.{Address, Gas, Hash, PendingBlockOperation, Transaction, Wei, Withdrawal}
+  alias Explorer.Chain.{Address, Block, Gas, Hash, PendingBlockOperation, Transaction, Wei, Withdrawal}
   alias Explorer.Chain.Block.{Reward, SecondDegreeRelation}
 
   @optional_attrs ~w(size refetch_needed total_difficulty difficulty base_fee_per_gas)a
@@ -149,9 +149,13 @@ defmodule Explorer.Chain.Block do
   def block_type_filter(query, "Block"), do: where(query, [block], block.consensus == true)
 
   def block_type_filter(query, "Reorg") do
-    query
-    |> join(:left, [block], uncles in assoc(block, :nephew_relations))
-    |> where([block, uncles], block.consensus == false and is_nil(uncles.uncle_hash))
+    from(block in query,
+      as: :block,
+      left_join: uncles in assoc(block, :nephew_relations),
+      where:
+        block.consensus == false and is_nil(uncles.uncle_hash) and
+          exists(from(b in Block, where: b.number == parent_as(:block).number and b.consensus))
+    )
   end
 
   def block_type_filter(query, "Uncle"), do: where(query, [block], block.consensus == false)

From cbc99b35acb1c8f0d3b8e1cc8bbb1424050412e6 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 12 Sep 2023 18:24:41 +0000
Subject: [PATCH 402/909] Bump jest-environment-jsdom in
 /apps/block_scout_web/assets

Bumps [jest-environment-jsdom](https://github.com/jestjs/jest/tree/HEAD/packages/jest-environment-jsdom) from 29.6.4 to 29.7.0.
- [Release notes](https://github.com/jestjs/jest/releases)
- [Changelog](https://github.com/jestjs/jest/blob/main/CHANGELOG.md)
- [Commits](https://github.com/jestjs/jest/commits/v29.7.0/packages/jest-environment-jsdom)

---
updated-dependencies:
- dependency-name: jest-environment-jsdom
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 apps/block_scout_web/assets/package-lock.json | 130 +++++++++---------
 apps/block_scout_web/assets/package.json      |   2 +-
 2 files changed, 66 insertions(+), 66 deletions(-)

diff --git a/apps/block_scout_web/assets/package-lock.json b/apps/block_scout_web/assets/package-lock.json
index 5e1b1f86300a..c9cb33d59617 100644
--- a/apps/block_scout_web/assets/package-lock.json
+++ b/apps/block_scout_web/assets/package-lock.json
@@ -85,7 +85,7 @@
         "eslint-plugin-promise": "^6.1.1",
         "file-loader": "^6.2.0",
         "jest": "^29.6.4",
-        "jest-environment-jsdom": "^29.6.4",
+        "jest-environment-jsdom": "^29.7.0",
         "mini-css-extract-plugin": "^2.7.6",
         "postcss": "^8.4.29",
         "postcss-loader": "^7.3.3",
@@ -2782,15 +2782,15 @@
       }
     },
     "node_modules/@jest/environment": {
-      "version": "29.6.4",
-      "resolved": "https://registry.npmjs.org/@jest/environment/-/environment-29.6.4.tgz",
-      "integrity": "sha512-sQ0SULEjA1XUTHmkBRl7A1dyITM9yb1yb3ZNKPX3KlTd6IG7mWUe3e2yfExtC2Zz1Q+mMckOLHmL/qLiuQJrBQ==",
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/@jest/environment/-/environment-29.7.0.tgz",
+      "integrity": "sha512-aQIfHDq33ExsN4jP1NWGXhxgQ/wixs60gDiKO+XVMd8Mn0NWPWgc34ZQDTb2jKaUWQ7MuwoitXAsN2XVXNMpAw==",
       "dev": true,
       "dependencies": {
-        "@jest/fake-timers": "^29.6.4",
+        "@jest/fake-timers": "^29.7.0",
         "@jest/types": "^29.6.3",
         "@types/node": "*",
-        "jest-mock": "^29.6.3"
+        "jest-mock": "^29.7.0"
       },
       "engines": {
         "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
@@ -2822,17 +2822,17 @@
       }
     },
     "node_modules/@jest/fake-timers": {
-      "version": "29.6.4",
-      "resolved": "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-29.6.4.tgz",
-      "integrity": "sha512-6UkCwzoBK60edXIIWb0/KWkuj7R7Qq91vVInOe3De6DSpaEiqjKcJw4F7XUet24Wupahj9J6PlR09JqJ5ySDHw==",
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-29.7.0.tgz",
+      "integrity": "sha512-q4DH1Ha4TTFPdxLsqDXK1d3+ioSL7yL5oCMJZgDYm6i+6CygW5E5xVr/D1HdsGxjt1ZWSfUAs9OxSB/BNelWrQ==",
       "dev": true,
       "dependencies": {
         "@jest/types": "^29.6.3",
         "@sinonjs/fake-timers": "^10.0.2",
         "@types/node": "*",
-        "jest-message-util": "^29.6.3",
-        "jest-mock": "^29.6.3",
-        "jest-util": "^29.6.3"
+        "jest-message-util": "^29.7.0",
+        "jest-mock": "^29.7.0",
+        "jest-util": "^29.7.0"
       },
       "engines": {
         "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
@@ -10579,18 +10579,18 @@
       }
     },
     "node_modules/jest-environment-jsdom": {
-      "version": "29.6.4",
-      "resolved": "https://registry.npmjs.org/jest-environment-jsdom/-/jest-environment-jsdom-29.6.4.tgz",
-      "integrity": "sha512-K6wfgUJ16DoMs02JYFid9lOsqfpoVtyJxpRlnTxUHzvZWBnnh2VNGRB9EC1Cro96TQdq5TtSjb3qUjNaJP9IyA==",
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-environment-jsdom/-/jest-environment-jsdom-29.7.0.tgz",
+      "integrity": "sha512-k9iQbsf9OyOfdzWH8HDmrRT0gSIcX+FLNW7IQq94tFX0gynPwqDTW0Ho6iMVNjGz/nb+l/vW3dWM2bbLLpkbXA==",
       "dev": true,
       "dependencies": {
-        "@jest/environment": "^29.6.4",
-        "@jest/fake-timers": "^29.6.4",
+        "@jest/environment": "^29.7.0",
+        "@jest/fake-timers": "^29.7.0",
         "@jest/types": "^29.6.3",
         "@types/jsdom": "^20.0.0",
         "@types/node": "*",
-        "jest-mock": "^29.6.3",
-        "jest-util": "^29.6.3",
+        "jest-mock": "^29.7.0",
+        "jest-util": "^29.7.0",
         "jsdom": "^20.0.0"
       },
       "engines": {
@@ -10794,9 +10794,9 @@
       }
     },
     "node_modules/jest-message-util": {
-      "version": "29.6.3",
-      "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-29.6.3.tgz",
-      "integrity": "sha512-FtzaEEHzjDpQp51HX4UMkPZjy46ati4T5pEMyM6Ik48ztu4T9LQplZ6OsimHx7EuM9dfEh5HJa6D3trEftu3dA==",
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-29.7.0.tgz",
+      "integrity": "sha512-GBEV4GRADeP+qtB2+6u61stea8mGcOT4mCtrYISZwfu9/ISHFJ/5zOMXYbpBE9RsS5+Gb63DW4FgmnKJ79Kf6w==",
       "dev": true,
       "dependencies": {
         "@babel/code-frame": "^7.12.13",
@@ -10805,7 +10805,7 @@
         "chalk": "^4.0.0",
         "graceful-fs": "^4.2.9",
         "micromatch": "^4.0.4",
-        "pretty-format": "^29.6.3",
+        "pretty-format": "^29.7.0",
         "slash": "^3.0.0",
         "stack-utils": "^2.0.3"
       },
@@ -10884,14 +10884,14 @@
       }
     },
     "node_modules/jest-mock": {
-      "version": "29.6.3",
-      "resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-29.6.3.tgz",
-      "integrity": "sha512-Z7Gs/mOyTSR4yPsaZ72a/MtuK6RnC3JYqWONe48oLaoEcYwEDxqvbXz85G4SJrm2Z5Ar9zp6MiHF4AlFlRM4Pg==",
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-29.7.0.tgz",
+      "integrity": "sha512-ITOMZn+UkYS4ZFh83xYAOzWStloNzJFO2s8DWrE4lhtGD+AorgnbkiKERe4wQVBydIGPx059g6riW5Btp6Llnw==",
       "dev": true,
       "dependencies": {
         "@jest/types": "^29.6.3",
         "@types/node": "*",
-        "jest-util": "^29.6.3"
+        "jest-util": "^29.7.0"
       },
       "engines": {
         "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
@@ -11388,9 +11388,9 @@
       }
     },
     "node_modules/jest-util": {
-      "version": "29.6.3",
-      "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-29.6.3.tgz",
-      "integrity": "sha512-QUjna/xSy4B32fzcKTSz1w7YYzgiHrjjJjevdRf61HYk998R5vVMMNmrHESYZVDS5DSWs+1srPLPKxXPkeSDOA==",
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-29.7.0.tgz",
+      "integrity": "sha512-z6EbKajIpqGKU56y5KBUgy1dt1ihhQJgWzUlZHArA/+X2ad7Cb5iF+AK1EWVL/Bo7Rz9uurpqw6SiBCefUbCGA==",
       "dev": true,
       "dependencies": {
         "@jest/types": "^29.6.3",
@@ -14098,9 +14098,9 @@
       }
     },
     "node_modules/pretty-format": {
-      "version": "29.6.3",
-      "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-29.6.3.tgz",
-      "integrity": "sha512-ZsBgjVhFAj5KeK+nHfF1305/By3lechHQSMWCTl8iHSbfOm2TN5nHEtFc/+W7fAyUeCs2n5iow72gld4gW0xDw==",
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-29.7.0.tgz",
+      "integrity": "sha512-Pdlw/oPxN+aXdmM9R00JVC9WVFoCLTKJvDVLgmJ+qAffBMxsV85l/Lu7sNx4zSzPyoL2euImuEwHhOXdEgNFZQ==",
       "dev": true,
       "dependencies": {
         "@jest/schemas": "^29.6.3",
@@ -19447,15 +19447,15 @@
       }
     },
     "@jest/environment": {
-      "version": "29.6.4",
-      "resolved": "https://registry.npmjs.org/@jest/environment/-/environment-29.6.4.tgz",
-      "integrity": "sha512-sQ0SULEjA1XUTHmkBRl7A1dyITM9yb1yb3ZNKPX3KlTd6IG7mWUe3e2yfExtC2Zz1Q+mMckOLHmL/qLiuQJrBQ==",
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/@jest/environment/-/environment-29.7.0.tgz",
+      "integrity": "sha512-aQIfHDq33ExsN4jP1NWGXhxgQ/wixs60gDiKO+XVMd8Mn0NWPWgc34ZQDTb2jKaUWQ7MuwoitXAsN2XVXNMpAw==",
       "dev": true,
       "requires": {
-        "@jest/fake-timers": "^29.6.4",
+        "@jest/fake-timers": "^29.7.0",
         "@jest/types": "^29.6.3",
         "@types/node": "*",
-        "jest-mock": "^29.6.3"
+        "jest-mock": "^29.7.0"
       }
     },
     "@jest/expect": {
@@ -19478,17 +19478,17 @@
       }
     },
     "@jest/fake-timers": {
-      "version": "29.6.4",
-      "resolved": "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-29.6.4.tgz",
-      "integrity": "sha512-6UkCwzoBK60edXIIWb0/KWkuj7R7Qq91vVInOe3De6DSpaEiqjKcJw4F7XUet24Wupahj9J6PlR09JqJ5ySDHw==",
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-29.7.0.tgz",
+      "integrity": "sha512-q4DH1Ha4TTFPdxLsqDXK1d3+ioSL7yL5oCMJZgDYm6i+6CygW5E5xVr/D1HdsGxjt1ZWSfUAs9OxSB/BNelWrQ==",
       "dev": true,
       "requires": {
         "@jest/types": "^29.6.3",
         "@sinonjs/fake-timers": "^10.0.2",
         "@types/node": "*",
-        "jest-message-util": "^29.6.3",
-        "jest-mock": "^29.6.3",
-        "jest-util": "^29.6.3"
+        "jest-message-util": "^29.7.0",
+        "jest-mock": "^29.7.0",
+        "jest-util": "^29.7.0"
       }
     },
     "@jest/globals": {
@@ -25505,18 +25505,18 @@
       }
     },
     "jest-environment-jsdom": {
-      "version": "29.6.4",
-      "resolved": "https://registry.npmjs.org/jest-environment-jsdom/-/jest-environment-jsdom-29.6.4.tgz",
-      "integrity": "sha512-K6wfgUJ16DoMs02JYFid9lOsqfpoVtyJxpRlnTxUHzvZWBnnh2VNGRB9EC1Cro96TQdq5TtSjb3qUjNaJP9IyA==",
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-environment-jsdom/-/jest-environment-jsdom-29.7.0.tgz",
+      "integrity": "sha512-k9iQbsf9OyOfdzWH8HDmrRT0gSIcX+FLNW7IQq94tFX0gynPwqDTW0Ho6iMVNjGz/nb+l/vW3dWM2bbLLpkbXA==",
       "dev": true,
       "requires": {
-        "@jest/environment": "^29.6.4",
-        "@jest/fake-timers": "^29.6.4",
+        "@jest/environment": "^29.7.0",
+        "@jest/fake-timers": "^29.7.0",
         "@jest/types": "^29.6.3",
         "@types/jsdom": "^20.0.0",
         "@types/node": "*",
-        "jest-mock": "^29.6.3",
-        "jest-util": "^29.6.3",
+        "jest-mock": "^29.7.0",
+        "jest-util": "^29.7.0",
         "jsdom": "^20.0.0"
       }
     },
@@ -25663,9 +25663,9 @@
       }
     },
     "jest-message-util": {
-      "version": "29.6.3",
-      "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-29.6.3.tgz",
-      "integrity": "sha512-FtzaEEHzjDpQp51HX4UMkPZjy46ati4T5pEMyM6Ik48ztu4T9LQplZ6OsimHx7EuM9dfEh5HJa6D3trEftu3dA==",
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-29.7.0.tgz",
+      "integrity": "sha512-GBEV4GRADeP+qtB2+6u61stea8mGcOT4mCtrYISZwfu9/ISHFJ/5zOMXYbpBE9RsS5+Gb63DW4FgmnKJ79Kf6w==",
       "dev": true,
       "requires": {
         "@babel/code-frame": "^7.12.13",
@@ -25674,7 +25674,7 @@
         "chalk": "^4.0.0",
         "graceful-fs": "^4.2.9",
         "micromatch": "^4.0.4",
-        "pretty-format": "^29.6.3",
+        "pretty-format": "^29.7.0",
         "slash": "^3.0.0",
         "stack-utils": "^2.0.3"
       },
@@ -25731,14 +25731,14 @@
       }
     },
     "jest-mock": {
-      "version": "29.6.3",
-      "resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-29.6.3.tgz",
-      "integrity": "sha512-Z7Gs/mOyTSR4yPsaZ72a/MtuK6RnC3JYqWONe48oLaoEcYwEDxqvbXz85G4SJrm2Z5Ar9zp6MiHF4AlFlRM4Pg==",
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-29.7.0.tgz",
+      "integrity": "sha512-ITOMZn+UkYS4ZFh83xYAOzWStloNzJFO2s8DWrE4lhtGD+AorgnbkiKERe4wQVBydIGPx059g6riW5Btp6Llnw==",
       "dev": true,
       "requires": {
         "@jest/types": "^29.6.3",
         "@types/node": "*",
-        "jest-util": "^29.6.3"
+        "jest-util": "^29.7.0"
       }
     },
     "jest-pnp-resolver": {
@@ -26115,9 +26115,9 @@
       }
     },
     "jest-util": {
-      "version": "29.6.3",
-      "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-29.6.3.tgz",
-      "integrity": "sha512-QUjna/xSy4B32fzcKTSz1w7YYzgiHrjjJjevdRf61HYk998R5vVMMNmrHESYZVDS5DSWs+1srPLPKxXPkeSDOA==",
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-29.7.0.tgz",
+      "integrity": "sha512-z6EbKajIpqGKU56y5KBUgy1dt1ihhQJgWzUlZHArA/+X2ad7Cb5iF+AK1EWVL/Bo7Rz9uurpqw6SiBCefUbCGA==",
       "dev": true,
       "requires": {
         "@jest/types": "^29.6.3",
@@ -28150,9 +28150,9 @@
       "dev": true
     },
     "pretty-format": {
-      "version": "29.6.3",
-      "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-29.6.3.tgz",
-      "integrity": "sha512-ZsBgjVhFAj5KeK+nHfF1305/By3lechHQSMWCTl8iHSbfOm2TN5nHEtFc/+W7fAyUeCs2n5iow72gld4gW0xDw==",
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-29.7.0.tgz",
+      "integrity": "sha512-Pdlw/oPxN+aXdmM9R00JVC9WVFoCLTKJvDVLgmJ+qAffBMxsV85l/Lu7sNx4zSzPyoL2euImuEwHhOXdEgNFZQ==",
       "dev": true,
       "requires": {
         "@jest/schemas": "^29.6.3",
diff --git a/apps/block_scout_web/assets/package.json b/apps/block_scout_web/assets/package.json
index 964bd513fb28..16623a911a08 100644
--- a/apps/block_scout_web/assets/package.json
+++ b/apps/block_scout_web/assets/package.json
@@ -97,7 +97,7 @@
     "eslint-plugin-promise": "^6.1.1",
     "file-loader": "^6.2.0",
     "jest": "^29.6.4",
-    "jest-environment-jsdom": "^29.6.4",
+    "jest-environment-jsdom": "^29.7.0",
     "mini-css-extract-plugin": "^2.7.6",
     "postcss": "^8.4.29",
     "postcss-loader": "^7.3.3",

From 5158ef386622225f3481cdb5dd3906ea10c6e3f8 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 12 Sep 2023 18:37:55 +0000
Subject: [PATCH 403/909] Bump jest from 29.6.4 to 29.7.0 in
 /apps/block_scout_web/assets

Bumps [jest](https://github.com/jestjs/jest/tree/HEAD/packages/jest) from 29.6.4 to 29.7.0.
- [Release notes](https://github.com/jestjs/jest/releases)
- [Changelog](https://github.com/jestjs/jest/blob/main/CHANGELOG.md)
- [Commits](https://github.com/jestjs/jest/commits/v29.7.0/packages/jest)

---
updated-dependencies:
- dependency-name: jest
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 apps/block_scout_web/assets/package-lock.json | 1061 ++++++++++-------
 apps/block_scout_web/assets/package.json      |    2 +-
 2 files changed, 609 insertions(+), 454 deletions(-)

diff --git a/apps/block_scout_web/assets/package-lock.json b/apps/block_scout_web/assets/package-lock.json
index c9cb33d59617..221eba335a53 100644
--- a/apps/block_scout_web/assets/package-lock.json
+++ b/apps/block_scout_web/assets/package-lock.json
@@ -84,7 +84,7 @@
         "eslint-plugin-node": "^11.1.0",
         "eslint-plugin-promise": "^6.1.1",
         "file-loader": "^6.2.0",
-        "jest": "^29.6.4",
+        "jest": "^29.7.0",
         "jest-environment-jsdom": "^29.7.0",
         "mini-css-extract-plugin": "^2.7.6",
         "postcss": "^8.4.29",
@@ -2578,16 +2578,16 @@
       }
     },
     "node_modules/@jest/console": {
-      "version": "29.6.4",
-      "resolved": "https://registry.npmjs.org/@jest/console/-/console-29.6.4.tgz",
-      "integrity": "sha512-wNK6gC0Ha9QeEPSkeJedQuTQqxZYnDPuDcDhVuVatRvMkL4D0VTvFVZj+Yuh6caG2aOfzkUZ36KtCmLNtR02hw==",
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/@jest/console/-/console-29.7.0.tgz",
+      "integrity": "sha512-5Ni4CU7XHQi32IJ398EEP4RrB8eV09sXP2ROqD4bksHrnTree52PsxvX8tpL8LvTZ3pFzXyPbNQReSN41CAhOg==",
       "dev": true,
       "dependencies": {
         "@jest/types": "^29.6.3",
         "@types/node": "*",
         "chalk": "^4.0.0",
-        "jest-message-util": "^29.6.3",
-        "jest-util": "^29.6.3",
+        "jest-message-util": "^29.7.0",
+        "jest-util": "^29.7.0",
         "slash": "^3.0.0"
       },
       "engines": {
@@ -2665,15 +2665,15 @@
       }
     },
     "node_modules/@jest/core": {
-      "version": "29.6.4",
-      "resolved": "https://registry.npmjs.org/@jest/core/-/core-29.6.4.tgz",
-      "integrity": "sha512-U/vq5ccNTSVgYH7mHnodHmCffGWHJnz/E1BEWlLuK5pM4FZmGfBn/nrJGLjUsSmyx3otCeqc1T31F4y08AMDLg==",
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/@jest/core/-/core-29.7.0.tgz",
+      "integrity": "sha512-n7aeXWKMnGtDA48y8TLWJPJmLmmZ642Ceo78cYWEpiD7FzDgmNDV/GCVRorPABdXLJZ/9wzzgZAlHjXjxDHGsg==",
       "dev": true,
       "dependencies": {
-        "@jest/console": "^29.6.4",
-        "@jest/reporters": "^29.6.4",
-        "@jest/test-result": "^29.6.4",
-        "@jest/transform": "^29.6.4",
+        "@jest/console": "^29.7.0",
+        "@jest/reporters": "^29.7.0",
+        "@jest/test-result": "^29.7.0",
+        "@jest/transform": "^29.7.0",
         "@jest/types": "^29.6.3",
         "@types/node": "*",
         "ansi-escapes": "^4.2.1",
@@ -2681,21 +2681,21 @@
         "ci-info": "^3.2.0",
         "exit": "^0.1.2",
         "graceful-fs": "^4.2.9",
-        "jest-changed-files": "^29.6.3",
-        "jest-config": "^29.6.4",
-        "jest-haste-map": "^29.6.4",
-        "jest-message-util": "^29.6.3",
+        "jest-changed-files": "^29.7.0",
+        "jest-config": "^29.7.0",
+        "jest-haste-map": "^29.7.0",
+        "jest-message-util": "^29.7.0",
         "jest-regex-util": "^29.6.3",
-        "jest-resolve": "^29.6.4",
-        "jest-resolve-dependencies": "^29.6.4",
-        "jest-runner": "^29.6.4",
-        "jest-runtime": "^29.6.4",
-        "jest-snapshot": "^29.6.4",
-        "jest-util": "^29.6.3",
-        "jest-validate": "^29.6.3",
-        "jest-watcher": "^29.6.4",
+        "jest-resolve": "^29.7.0",
+        "jest-resolve-dependencies": "^29.7.0",
+        "jest-runner": "^29.7.0",
+        "jest-runtime": "^29.7.0",
+        "jest-snapshot": "^29.7.0",
+        "jest-util": "^29.7.0",
+        "jest-validate": "^29.7.0",
+        "jest-watcher": "^29.7.0",
         "micromatch": "^4.0.4",
-        "pretty-format": "^29.6.3",
+        "pretty-format": "^29.7.0",
         "slash": "^3.0.0",
         "strip-ansi": "^6.0.0"
       },
@@ -2797,22 +2797,22 @@
       }
     },
     "node_modules/@jest/expect": {
-      "version": "29.6.4",
-      "resolved": "https://registry.npmjs.org/@jest/expect/-/expect-29.6.4.tgz",
-      "integrity": "sha512-Warhsa7d23+3X5bLbrbYvaehcgX5TLYhI03JKoedTiI8uJU4IhqYBWF7OSSgUyz4IgLpUYPkK0AehA5/fRclAA==",
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/@jest/expect/-/expect-29.7.0.tgz",
+      "integrity": "sha512-8uMeAMycttpva3P1lBHB8VciS9V0XAr3GymPpipdyQXbBcuhkLQOSe8E/p92RyAdToS6ZD1tFkX+CkhoECE0dQ==",
       "dev": true,
       "dependencies": {
-        "expect": "^29.6.4",
-        "jest-snapshot": "^29.6.4"
+        "expect": "^29.7.0",
+        "jest-snapshot": "^29.7.0"
       },
       "engines": {
         "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
     "node_modules/@jest/expect-utils": {
-      "version": "29.6.4",
-      "resolved": "https://registry.npmjs.org/@jest/expect-utils/-/expect-utils-29.6.4.tgz",
-      "integrity": "sha512-FEhkJhqtvBwgSpiTrocquJCdXPsyvNKcl/n7A3u7X4pVoF4bswm11c9d4AV+kfq2Gpv/mM8x7E7DsRvH+djkrg==",
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/@jest/expect-utils/-/expect-utils-29.7.0.tgz",
+      "integrity": "sha512-GlsNBWiFQFCVi9QVSx7f5AgMeLxe9YCCs5PuP2O2LdjDAA8Jh9eX7lA1Jq/xdXw3Wb3hyvlFNfZIfcRetSzYcA==",
       "dev": true,
       "dependencies": {
         "jest-get-type": "^29.6.3"
@@ -2839,30 +2839,30 @@
       }
     },
     "node_modules/@jest/globals": {
-      "version": "29.6.4",
-      "resolved": "https://registry.npmjs.org/@jest/globals/-/globals-29.6.4.tgz",
-      "integrity": "sha512-wVIn5bdtjlChhXAzVXavcY/3PEjf4VqM174BM3eGL5kMxLiZD5CLnbmkEyA1Dwh9q8XjP6E8RwjBsY/iCWrWsA==",
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/@jest/globals/-/globals-29.7.0.tgz",
+      "integrity": "sha512-mpiz3dutLbkW2MNFubUGUEVLkTGiqW6yLVTA+JbP6fI6J5iL9Y0Nlg8k95pcF8ctKwCS7WVxteBs29hhfAotzQ==",
       "dev": true,
       "dependencies": {
-        "@jest/environment": "^29.6.4",
-        "@jest/expect": "^29.6.4",
+        "@jest/environment": "^29.7.0",
+        "@jest/expect": "^29.7.0",
         "@jest/types": "^29.6.3",
-        "jest-mock": "^29.6.3"
+        "jest-mock": "^29.7.0"
       },
       "engines": {
         "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
     "node_modules/@jest/reporters": {
-      "version": "29.6.4",
-      "resolved": "https://registry.npmjs.org/@jest/reporters/-/reporters-29.6.4.tgz",
-      "integrity": "sha512-sxUjWxm7QdchdrD3NfWKrL8FBsortZeibSJv4XLjESOOjSUOkjQcb0ZHJwfhEGIvBvTluTzfG2yZWZhkrXJu8g==",
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/@jest/reporters/-/reporters-29.7.0.tgz",
+      "integrity": "sha512-DApq0KJbJOEzAFYjHADNNxAE3KbhxQB1y5Kplb5Waqw6zVbuWatSnMjE5gs8FUgEPmNsnZA3NCWl9NG0ia04Pg==",
       "dev": true,
       "dependencies": {
         "@bcoe/v8-coverage": "^0.2.3",
-        "@jest/console": "^29.6.4",
-        "@jest/test-result": "^29.6.4",
-        "@jest/transform": "^29.6.4",
+        "@jest/console": "^29.7.0",
+        "@jest/test-result": "^29.7.0",
+        "@jest/transform": "^29.7.0",
         "@jest/types": "^29.6.3",
         "@jridgewell/trace-mapping": "^0.3.18",
         "@types/node": "*",
@@ -2876,9 +2876,9 @@
         "istanbul-lib-report": "^3.0.0",
         "istanbul-lib-source-maps": "^4.0.0",
         "istanbul-reports": "^3.1.3",
-        "jest-message-util": "^29.6.3",
-        "jest-util": "^29.6.3",
-        "jest-worker": "^29.6.4",
+        "jest-message-util": "^29.7.0",
+        "jest-util": "^29.7.0",
+        "jest-worker": "^29.7.0",
         "slash": "^3.0.0",
         "string-length": "^4.0.1",
         "strip-ansi": "^6.0.0",
@@ -2955,13 +2955,13 @@
       }
     },
     "node_modules/@jest/reporters/node_modules/jest-worker": {
-      "version": "29.6.4",
-      "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-29.6.4.tgz",
-      "integrity": "sha512-6dpvFV4WjcWbDVGgHTWo/aupl8/LbBx2NSKfiwqf79xC/yeJjKHT1+StcKy/2KTmW16hE68ccKVOtXf+WZGz7Q==",
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-29.7.0.tgz",
+      "integrity": "sha512-eIz2msL/EzL9UFTFFx7jBTkeZfku0yUAyZZZmJ93H2TYEiroIx2PQjEXcwYtYl8zXCxb+PAmA2hLIt/6ZEkPHw==",
       "dev": true,
       "dependencies": {
         "@types/node": "*",
-        "jest-util": "^29.6.3",
+        "jest-util": "^29.7.0",
         "merge-stream": "^2.0.0",
         "supports-color": "^8.0.0"
       },
@@ -3023,12 +3023,12 @@
       }
     },
     "node_modules/@jest/test-result": {
-      "version": "29.6.4",
-      "resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-29.6.4.tgz",
-      "integrity": "sha512-uQ1C0AUEN90/dsyEirgMLlouROgSY+Wc/JanVVk0OiUKa5UFh7sJpMEM3aoUBAz2BRNvUJ8j3d294WFuRxSyOQ==",
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-29.7.0.tgz",
+      "integrity": "sha512-Fdx+tv6x1zlkJPcWXmMDAG2HBnaR9XPSd5aDWQVsfrZmLVT3lU1cwyxLgRmXR9yrq4NBoEm9BMsfgFzTQAbJYA==",
       "dev": true,
       "dependencies": {
-        "@jest/console": "^29.6.4",
+        "@jest/console": "^29.7.0",
         "@jest/types": "^29.6.3",
         "@types/istanbul-lib-coverage": "^2.0.0",
         "collect-v8-coverage": "^1.0.0"
@@ -3038,14 +3038,14 @@
       }
     },
     "node_modules/@jest/test-sequencer": {
-      "version": "29.6.4",
-      "resolved": "https://registry.npmjs.org/@jest/test-sequencer/-/test-sequencer-29.6.4.tgz",
-      "integrity": "sha512-E84M6LbpcRq3fT4ckfKs9ryVanwkaIB0Ws9bw3/yP4seRLg/VaCZ/LgW0MCq5wwk4/iP/qnilD41aj2fsw2RMg==",
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/@jest/test-sequencer/-/test-sequencer-29.7.0.tgz",
+      "integrity": "sha512-GQwJ5WZVrKnOJuiYiAF52UNUJXgTZx1NHjFSEB0qEMmSZKAkdMoIzw/Cj6x6NF4AvV23AUqDpFzQkN/eYCYTxw==",
       "dev": true,
       "dependencies": {
-        "@jest/test-result": "^29.6.4",
+        "@jest/test-result": "^29.7.0",
         "graceful-fs": "^4.2.9",
-        "jest-haste-map": "^29.6.4",
+        "jest-haste-map": "^29.7.0",
         "slash": "^3.0.0"
       },
       "engines": {
@@ -3053,9 +3053,9 @@
       }
     },
     "node_modules/@jest/transform": {
-      "version": "29.6.4",
-      "resolved": "https://registry.npmjs.org/@jest/transform/-/transform-29.6.4.tgz",
-      "integrity": "sha512-8thgRSiXUqtr/pPGY/OsyHuMjGyhVnWrFAwoxmIemlBuiMyU1WFs0tXoNxzcr4A4uErs/ABre76SGmrr5ab/AA==",
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/@jest/transform/-/transform-29.7.0.tgz",
+      "integrity": "sha512-ok/BTPFzFKVMwO5eOHRrvnBVHdRy9IrsrW1GpMaQ9MCnilNLXQKmAX8s1YXDFaai9xJpac2ySzV0YeRRECr2Vw==",
       "dev": true,
       "dependencies": {
         "@babel/core": "^7.11.6",
@@ -3066,9 +3066,9 @@
         "convert-source-map": "^2.0.0",
         "fast-json-stable-stringify": "^2.1.0",
         "graceful-fs": "^4.2.9",
-        "jest-haste-map": "^29.6.4",
+        "jest-haste-map": "^29.7.0",
         "jest-regex-util": "^29.6.3",
-        "jest-util": "^29.6.3",
+        "jest-util": "^29.7.0",
         "micromatch": "^4.0.4",
         "pirates": "^4.0.4",
         "slash": "^3.0.0",
@@ -4565,12 +4565,12 @@
       "integrity": "sha512-xh1Rl34h6Fi1DC2WWKfxUTVqRsNnr6LsKz2+hfwDxQJWmrx8+c7ylaqBMcHfl1U1r2dsifOvKX3LQuLNZ+XSvA=="
     },
     "node_modules/babel-jest": {
-      "version": "29.6.4",
-      "resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-29.6.4.tgz",
-      "integrity": "sha512-meLj23UlSLddj6PC+YTOFRgDAtjnZom8w/ACsrx0gtPtv5cJZk0A5Unk5bV4wixD7XaPCN1fQvpww8czkZURmw==",
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-29.7.0.tgz",
+      "integrity": "sha512-BrvGY3xZSwEcCzKvKsCi2GgHqDqsYkOP4/by5xCgIwGXQxIEh+8ew3gmrE1y7XRR6LHZIj6yLYnUi/mm2KXKBg==",
       "dev": true,
       "dependencies": {
-        "@jest/transform": "^29.6.4",
+        "@jest/transform": "^29.7.0",
         "@types/babel__core": "^7.1.14",
         "babel-plugin-istanbul": "^6.1.1",
         "babel-preset-jest": "^29.6.3",
@@ -5938,6 +5938,97 @@
         "sha.js": "^2.4.8"
       }
     },
+    "node_modules/create-jest": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/create-jest/-/create-jest-29.7.0.tgz",
+      "integrity": "sha512-Adz2bdH0Vq3F53KEMJOoftQFutWCukm6J24wbPWRO4k1kMY7gS7ds/uoJkNuV8wDCtWWnuwGcJwpWcih+zEW1Q==",
+      "dev": true,
+      "dependencies": {
+        "@jest/types": "^29.6.3",
+        "chalk": "^4.0.0",
+        "exit": "^0.1.2",
+        "graceful-fs": "^4.2.9",
+        "jest-config": "^29.7.0",
+        "jest-util": "^29.7.0",
+        "prompts": "^2.0.1"
+      },
+      "bin": {
+        "create-jest": "bin/create-jest.js"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/create-jest/node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+      "dev": true,
+      "dependencies": {
+        "color-convert": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/create-jest/node_modules/chalk": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
+      }
+    },
+    "node_modules/create-jest/node_modules/color-convert": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+      "dev": true,
+      "dependencies": {
+        "color-name": "~1.1.4"
+      },
+      "engines": {
+        "node": ">=7.0.0"
+      }
+    },
+    "node_modules/create-jest/node_modules/color-name": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+      "dev": true
+    },
+    "node_modules/create-jest/node_modules/has-flag": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/create-jest/node_modules/supports-color": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+      "dev": true,
+      "dependencies": {
+        "has-flag": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/cross-fetch": {
       "version": "2.2.6",
       "resolved": "https://registry.npmjs.org/cross-fetch/-/cross-fetch-2.2.6.tgz",
@@ -8322,16 +8413,16 @@
       }
     },
     "node_modules/expect": {
-      "version": "29.6.4",
-      "resolved": "https://registry.npmjs.org/expect/-/expect-29.6.4.tgz",
-      "integrity": "sha512-F2W2UyQ8XYyftHT57dtfg8Ue3X5qLgm2sSug0ivvLRH/VKNRL/pDxg/TH7zVzbQB0tu80clNFy6LU7OS/VSEKA==",
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/expect/-/expect-29.7.0.tgz",
+      "integrity": "sha512-2Zks0hf1VLFYI1kbh0I5jP3KHHyCHpkfyHBzsSXRFgl/Bg9mWYfMW8oD+PdMPlEwy5HNsR9JutYy6pMeOh61nw==",
       "dev": true,
       "dependencies": {
-        "@jest/expect-utils": "^29.6.4",
+        "@jest/expect-utils": "^29.7.0",
         "jest-get-type": "^29.6.3",
-        "jest-matcher-utils": "^29.6.4",
-        "jest-message-util": "^29.6.3",
-        "jest-util": "^29.6.3"
+        "jest-matcher-utils": "^29.7.0",
+        "jest-message-util": "^29.7.0",
+        "jest-util": "^29.7.0"
       },
       "engines": {
         "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
@@ -10036,15 +10127,15 @@
       }
     },
     "node_modules/jest": {
-      "version": "29.6.4",
-      "resolved": "https://registry.npmjs.org/jest/-/jest-29.6.4.tgz",
-      "integrity": "sha512-tEFhVQFF/bzoYV1YuGyzLPZ6vlPrdfvDmmAxudA1dLEuiztqg2Rkx20vkKY32xiDROcD2KXlgZ7Cu8RPeEHRKw==",
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest/-/jest-29.7.0.tgz",
+      "integrity": "sha512-NIy3oAFp9shda19hy4HK0HRTWKtPJmGdnvywu01nOqNC2vZg+Z+fvJDxpMQA88eb2I9EcafcdjYgsDthnYTvGw==",
       "dev": true,
       "dependencies": {
-        "@jest/core": "^29.6.4",
+        "@jest/core": "^29.7.0",
         "@jest/types": "^29.6.3",
         "import-local": "^3.0.2",
-        "jest-cli": "^29.6.4"
+        "jest-cli": "^29.7.0"
       },
       "bin": {
         "jest": "bin/jest.js"
@@ -10062,13 +10153,13 @@
       }
     },
     "node_modules/jest-changed-files": {
-      "version": "29.6.3",
-      "resolved": "https://registry.npmjs.org/jest-changed-files/-/jest-changed-files-29.6.3.tgz",
-      "integrity": "sha512-G5wDnElqLa4/c66ma5PG9eRjE342lIbF6SUnTJi26C3J28Fv2TVY2rOyKB9YGbSA5ogwevgmxc4j4aVjrEK6Yg==",
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-changed-files/-/jest-changed-files-29.7.0.tgz",
+      "integrity": "sha512-fEArFiwf1BpQ+4bXSprcDc3/x4HSzL4al2tozwVpDFpsxALjLYdyiIK4e5Vz66GQJIbXJ82+35PtysofptNX2w==",
       "dev": true,
       "dependencies": {
         "execa": "^5.0.0",
-        "jest-util": "^29.6.3",
+        "jest-util": "^29.7.0",
         "p-limit": "^3.1.0"
       },
       "engines": {
@@ -10076,28 +10167,28 @@
       }
     },
     "node_modules/jest-circus": {
-      "version": "29.6.4",
-      "resolved": "https://registry.npmjs.org/jest-circus/-/jest-circus-29.6.4.tgz",
-      "integrity": "sha512-YXNrRyntVUgDfZbjXWBMPslX1mQ8MrSG0oM/Y06j9EYubODIyHWP8hMUbjbZ19M3M+zamqEur7O80HODwACoJw==",
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-circus/-/jest-circus-29.7.0.tgz",
+      "integrity": "sha512-3E1nCMgipcTkCocFwM90XXQab9bS+GMsjdpmPrlelaxwD93Ad8iVEjX/vvHPdLPnFf+L40u+5+iutRdA1N9myw==",
       "dev": true,
       "dependencies": {
-        "@jest/environment": "^29.6.4",
-        "@jest/expect": "^29.6.4",
-        "@jest/test-result": "^29.6.4",
+        "@jest/environment": "^29.7.0",
+        "@jest/expect": "^29.7.0",
+        "@jest/test-result": "^29.7.0",
         "@jest/types": "^29.6.3",
         "@types/node": "*",
         "chalk": "^4.0.0",
         "co": "^4.6.0",
         "dedent": "^1.0.0",
         "is-generator-fn": "^2.0.0",
-        "jest-each": "^29.6.3",
-        "jest-matcher-utils": "^29.6.4",
-        "jest-message-util": "^29.6.3",
-        "jest-runtime": "^29.6.4",
-        "jest-snapshot": "^29.6.4",
-        "jest-util": "^29.6.3",
+        "jest-each": "^29.7.0",
+        "jest-matcher-utils": "^29.7.0",
+        "jest-message-util": "^29.7.0",
+        "jest-runtime": "^29.7.0",
+        "jest-snapshot": "^29.7.0",
+        "jest-util": "^29.7.0",
         "p-limit": "^3.1.0",
-        "pretty-format": "^29.6.3",
+        "pretty-format": "^29.7.0",
         "pure-rand": "^6.0.0",
         "slash": "^3.0.0",
         "stack-utils": "^2.0.3"
@@ -10177,22 +10268,21 @@
       }
     },
     "node_modules/jest-cli": {
-      "version": "29.6.4",
-      "resolved": "https://registry.npmjs.org/jest-cli/-/jest-cli-29.6.4.tgz",
-      "integrity": "sha512-+uMCQ7oizMmh8ZwRfZzKIEszFY9ksjjEQnTEMTaL7fYiL3Kw4XhqT9bYh+A4DQKUb67hZn2KbtEnDuHvcgK4pQ==",
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-cli/-/jest-cli-29.7.0.tgz",
+      "integrity": "sha512-OVVobw2IubN/GSYsxETi+gOe7Ka59EFMR/twOU3Jb2GnKKeMGJB5SGUUrEz3SFVmJASUdZUzy83sLNNQ2gZslg==",
       "dev": true,
       "dependencies": {
-        "@jest/core": "^29.6.4",
-        "@jest/test-result": "^29.6.4",
+        "@jest/core": "^29.7.0",
+        "@jest/test-result": "^29.7.0",
         "@jest/types": "^29.6.3",
         "chalk": "^4.0.0",
+        "create-jest": "^29.7.0",
         "exit": "^0.1.2",
-        "graceful-fs": "^4.2.9",
         "import-local": "^3.0.2",
-        "jest-config": "^29.6.4",
-        "jest-util": "^29.6.3",
-        "jest-validate": "^29.6.3",
-        "prompts": "^2.0.1",
+        "jest-config": "^29.7.0",
+        "jest-util": "^29.7.0",
+        "jest-validate": "^29.7.0",
         "yargs": "^17.3.1"
       },
       "bin": {
@@ -10281,31 +10371,31 @@
       }
     },
     "node_modules/jest-config": {
-      "version": "29.6.4",
-      "resolved": "https://registry.npmjs.org/jest-config/-/jest-config-29.6.4.tgz",
-      "integrity": "sha512-JWohr3i9m2cVpBumQFv2akMEnFEPVOh+9L2xIBJhJ0zOaci2ZXuKJj0tgMKQCBZAKA09H049IR4HVS/43Qb19A==",
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-config/-/jest-config-29.7.0.tgz",
+      "integrity": "sha512-uXbpfeQ7R6TZBqI3/TxCU4q4ttk3u0PJeC+E0zbfSoSjq6bJ7buBPxzQPL0ifrkY4DNu4JUdk0ImlBUYi840eQ==",
       "dev": true,
       "dependencies": {
         "@babel/core": "^7.11.6",
-        "@jest/test-sequencer": "^29.6.4",
+        "@jest/test-sequencer": "^29.7.0",
         "@jest/types": "^29.6.3",
-        "babel-jest": "^29.6.4",
+        "babel-jest": "^29.7.0",
         "chalk": "^4.0.0",
         "ci-info": "^3.2.0",
         "deepmerge": "^4.2.2",
         "glob": "^7.1.3",
         "graceful-fs": "^4.2.9",
-        "jest-circus": "^29.6.4",
-        "jest-environment-node": "^29.6.4",
+        "jest-circus": "^29.7.0",
+        "jest-environment-node": "^29.7.0",
         "jest-get-type": "^29.6.3",
         "jest-regex-util": "^29.6.3",
-        "jest-resolve": "^29.6.4",
-        "jest-runner": "^29.6.4",
-        "jest-util": "^29.6.3",
-        "jest-validate": "^29.6.3",
+        "jest-resolve": "^29.7.0",
+        "jest-runner": "^29.7.0",
+        "jest-util": "^29.7.0",
+        "jest-validate": "^29.7.0",
         "micromatch": "^4.0.4",
         "parse-json": "^5.2.0",
-        "pretty-format": "^29.6.3",
+        "pretty-format": "^29.7.0",
         "slash": "^3.0.0",
         "strip-json-comments": "^3.1.1"
       },
@@ -10396,15 +10486,15 @@
       }
     },
     "node_modules/jest-diff": {
-      "version": "29.6.4",
-      "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-29.6.4.tgz",
-      "integrity": "sha512-9F48UxR9e4XOEZvoUXEHSWY4qC4zERJaOfrbBg9JpbJOO43R1vN76REt/aMGZoY6GD5g84nnJiBIVlscegefpw==",
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-29.7.0.tgz",
+      "integrity": "sha512-LMIgiIrhigmPrs03JHpxUh2yISK3vLFPkAodPeo0+BuF7wA2FoQbkEg1u8gBYBThncu7e1oEDUfIXVuTqLRUjw==",
       "dev": true,
       "dependencies": {
         "chalk": "^4.0.0",
         "diff-sequences": "^29.6.3",
         "jest-get-type": "^29.6.3",
-        "pretty-format": "^29.6.3"
+        "pretty-format": "^29.7.0"
       },
       "engines": {
         "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
@@ -10481,9 +10571,9 @@
       }
     },
     "node_modules/jest-docblock": {
-      "version": "29.6.3",
-      "resolved": "https://registry.npmjs.org/jest-docblock/-/jest-docblock-29.6.3.tgz",
-      "integrity": "sha512-2+H+GOTQBEm2+qFSQ7Ma+BvyV+waiIFxmZF5LdpBsAEjWX8QYjSCa4FrkIYtbfXUJJJnFCYrOtt6TZ+IAiTjBQ==",
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-docblock/-/jest-docblock-29.7.0.tgz",
+      "integrity": "sha512-q617Auw3A612guyaFgsbFeYpNP5t2aoUNLwBUbc/0kD1R4t9ixDbyFTHd1nok4epoVFpr7PmeWHrhvuV3XaJ4g==",
       "dev": true,
       "dependencies": {
         "detect-newline": "^3.0.0"
@@ -10493,16 +10583,16 @@
       }
     },
     "node_modules/jest-each": {
-      "version": "29.6.3",
-      "resolved": "https://registry.npmjs.org/jest-each/-/jest-each-29.6.3.tgz",
-      "integrity": "sha512-KoXfJ42k8cqbkfshW7sSHcdfnv5agDdHCPA87ZBdmHP+zJstTJc0ttQaJ/x7zK6noAL76hOuTIJ6ZkQRS5dcyg==",
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-each/-/jest-each-29.7.0.tgz",
+      "integrity": "sha512-gns+Er14+ZrEoC5fhOfYCY1LOHHr0TI+rQUHZS8Ttw2l7gl+80eHc/gFf2Ktkw0+SIACDTeWvpFcv3B04VembQ==",
       "dev": true,
       "dependencies": {
         "@jest/types": "^29.6.3",
         "chalk": "^4.0.0",
         "jest-get-type": "^29.6.3",
-        "jest-util": "^29.6.3",
-        "pretty-format": "^29.6.3"
+        "jest-util": "^29.7.0",
+        "pretty-format": "^29.7.0"
       },
       "engines": {
         "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
@@ -10606,17 +10696,17 @@
       }
     },
     "node_modules/jest-environment-node": {
-      "version": "29.6.4",
-      "resolved": "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-29.6.4.tgz",
-      "integrity": "sha512-i7SbpH2dEIFGNmxGCpSc2w9cA4qVD+wfvg2ZnfQ7XVrKL0NA5uDVBIiGH8SR4F0dKEv/0qI5r+aDomDf04DpEQ==",
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-29.7.0.tgz",
+      "integrity": "sha512-DOSwCRqXirTOyheM+4d5YZOrWcdu0LNZ87ewUoywbcb2XR4wKgqiG8vNeYwhjFMbEkfju7wx2GYH0P2gevGvFw==",
       "dev": true,
       "dependencies": {
-        "@jest/environment": "^29.6.4",
-        "@jest/fake-timers": "^29.6.4",
+        "@jest/environment": "^29.7.0",
+        "@jest/fake-timers": "^29.7.0",
         "@jest/types": "^29.6.3",
         "@types/node": "*",
-        "jest-mock": "^29.6.3",
-        "jest-util": "^29.6.3"
+        "jest-mock": "^29.7.0",
+        "jest-util": "^29.7.0"
       },
       "engines": {
         "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
@@ -10632,9 +10722,9 @@
       }
     },
     "node_modules/jest-haste-map": {
-      "version": "29.6.4",
-      "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-29.6.4.tgz",
-      "integrity": "sha512-12Ad+VNTDHxKf7k+M65sviyynRoZYuL1/GTuhEVb8RYsNSNln71nANRb/faSyWvx0j+gHcivChXHIoMJrGYjog==",
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-29.7.0.tgz",
+      "integrity": "sha512-fP8u2pyfqx0K1rGn1R9pyE0/KTn+G7PxktWidOBTqFPLYX0b9ksaMFkhK5vrS3DVun09pckLdlx90QthlW7AmA==",
       "dev": true,
       "dependencies": {
         "@jest/types": "^29.6.3",
@@ -10644,8 +10734,8 @@
         "fb-watchman": "^2.0.0",
         "graceful-fs": "^4.2.9",
         "jest-regex-util": "^29.6.3",
-        "jest-util": "^29.6.3",
-        "jest-worker": "^29.6.4",
+        "jest-util": "^29.7.0",
+        "jest-worker": "^29.7.0",
         "micromatch": "^4.0.4",
         "walker": "^1.0.8"
       },
@@ -10666,13 +10756,13 @@
       }
     },
     "node_modules/jest-haste-map/node_modules/jest-worker": {
-      "version": "29.6.4",
-      "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-29.6.4.tgz",
-      "integrity": "sha512-6dpvFV4WjcWbDVGgHTWo/aupl8/LbBx2NSKfiwqf79xC/yeJjKHT1+StcKy/2KTmW16hE68ccKVOtXf+WZGz7Q==",
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-29.7.0.tgz",
+      "integrity": "sha512-eIz2msL/EzL9UFTFFx7jBTkeZfku0yUAyZZZmJ93H2TYEiroIx2PQjEXcwYtYl8zXCxb+PAmA2hLIt/6ZEkPHw==",
       "dev": true,
       "dependencies": {
         "@types/node": "*",
-        "jest-util": "^29.6.3",
+        "jest-util": "^29.7.0",
         "merge-stream": "^2.0.0",
         "supports-color": "^8.0.0"
       },
@@ -10696,28 +10786,28 @@
       }
     },
     "node_modules/jest-leak-detector": {
-      "version": "29.6.3",
-      "resolved": "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-29.6.3.tgz",
-      "integrity": "sha512-0kfbESIHXYdhAdpLsW7xdwmYhLf1BRu4AA118/OxFm0Ho1b2RcTmO4oF6aAMaxpxdxnJ3zve2rgwzNBD4Zbm7Q==",
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-29.7.0.tgz",
+      "integrity": "sha512-kYA8IJcSYtST2BY9I+SMC32nDpBT3J2NvWJx8+JCuCdl/CR1I4EKUJROiP8XtCcxqgTTBGJNdbB1A8XRKbTetw==",
       "dev": true,
       "dependencies": {
         "jest-get-type": "^29.6.3",
-        "pretty-format": "^29.6.3"
+        "pretty-format": "^29.7.0"
       },
       "engines": {
         "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
     "node_modules/jest-matcher-utils": {
-      "version": "29.6.4",
-      "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-29.6.4.tgz",
-      "integrity": "sha512-KSzwyzGvK4HcfnserYqJHYi7sZVqdREJ9DMPAKVbS98JsIAvumihaNUbjrWw0St7p9IY7A9UskCW5MYlGmBQFQ==",
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-29.7.0.tgz",
+      "integrity": "sha512-sBkD+Xi9DtcChsI3L3u0+N0opgPYnCRPtGcQYrgXmR+hmt/fYfWAL0xRXYU8eWOdfuLgBe0YCW3AFtnRLagq/g==",
       "dev": true,
       "dependencies": {
         "chalk": "^4.0.0",
-        "jest-diff": "^29.6.4",
+        "jest-diff": "^29.7.0",
         "jest-get-type": "^29.6.3",
-        "pretty-format": "^29.6.3"
+        "pretty-format": "^29.7.0"
       },
       "engines": {
         "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
@@ -10924,17 +11014,17 @@
       }
     },
     "node_modules/jest-resolve": {
-      "version": "29.6.4",
-      "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-29.6.4.tgz",
-      "integrity": "sha512-fPRq+0vcxsuGlG0O3gyoqGTAxasagOxEuyoxHeyxaZbc9QNek0AmJWSkhjlMG+mTsj+8knc/mWb3fXlRNVih7Q==",
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-29.7.0.tgz",
+      "integrity": "sha512-IOVhZSrg+UvVAshDSDtHyFCCBUl/Q3AAJv8iZ6ZjnZ74xzvwuzLXid9IIIPgTnY62SJjfuupMKZsZQRsCvxEgA==",
       "dev": true,
       "dependencies": {
         "chalk": "^4.0.0",
         "graceful-fs": "^4.2.9",
-        "jest-haste-map": "^29.6.4",
+        "jest-haste-map": "^29.7.0",
         "jest-pnp-resolver": "^1.2.2",
-        "jest-util": "^29.6.3",
-        "jest-validate": "^29.6.3",
+        "jest-util": "^29.7.0",
+        "jest-validate": "^29.7.0",
         "resolve": "^1.20.0",
         "resolve.exports": "^2.0.0",
         "slash": "^3.0.0"
@@ -10944,13 +11034,13 @@
       }
     },
     "node_modules/jest-resolve-dependencies": {
-      "version": "29.6.4",
-      "resolved": "https://registry.npmjs.org/jest-resolve-dependencies/-/jest-resolve-dependencies-29.6.4.tgz",
-      "integrity": "sha512-7+6eAmr1ZBF3vOAJVsfLj1QdqeXG+WYhidfLHBRZqGN24MFRIiKG20ItpLw2qRAsW/D2ZUUmCNf6irUr/v6KHA==",
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-resolve-dependencies/-/jest-resolve-dependencies-29.7.0.tgz",
+      "integrity": "sha512-un0zD/6qxJ+S0et7WxeI3H5XSe9lTBBR7bOHCHXkKR6luG5mwDDlIzVQ0V5cZCuoTgEdcdwzTghYkTWfubi+nA==",
       "dev": true,
       "dependencies": {
         "jest-regex-util": "^29.6.3",
-        "jest-snapshot": "^29.6.4"
+        "jest-snapshot": "^29.7.0"
       },
       "engines": {
         "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
@@ -11027,30 +11117,30 @@
       }
     },
     "node_modules/jest-runner": {
-      "version": "29.6.4",
-      "resolved": "https://registry.npmjs.org/jest-runner/-/jest-runner-29.6.4.tgz",
-      "integrity": "sha512-SDaLrMmtVlQYDuG0iSPYLycG8P9jLI+fRm8AF/xPKhYDB2g6xDWjXBrR5M8gEWsK6KVFlebpZ4QsrxdyIX1Jaw==",
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-runner/-/jest-runner-29.7.0.tgz",
+      "integrity": "sha512-fsc4N6cPCAahybGBfTRcq5wFR6fpLznMg47sY5aDpsoejOcVYFb07AHuSnR0liMcPTgBsA3ZJL6kFOjPdoNipQ==",
       "dev": true,
       "dependencies": {
-        "@jest/console": "^29.6.4",
-        "@jest/environment": "^29.6.4",
-        "@jest/test-result": "^29.6.4",
-        "@jest/transform": "^29.6.4",
+        "@jest/console": "^29.7.0",
+        "@jest/environment": "^29.7.0",
+        "@jest/test-result": "^29.7.0",
+        "@jest/transform": "^29.7.0",
         "@jest/types": "^29.6.3",
         "@types/node": "*",
         "chalk": "^4.0.0",
         "emittery": "^0.13.1",
         "graceful-fs": "^4.2.9",
-        "jest-docblock": "^29.6.3",
-        "jest-environment-node": "^29.6.4",
-        "jest-haste-map": "^29.6.4",
-        "jest-leak-detector": "^29.6.3",
-        "jest-message-util": "^29.6.3",
-        "jest-resolve": "^29.6.4",
-        "jest-runtime": "^29.6.4",
-        "jest-util": "^29.6.3",
-        "jest-watcher": "^29.6.4",
-        "jest-worker": "^29.6.4",
+        "jest-docblock": "^29.7.0",
+        "jest-environment-node": "^29.7.0",
+        "jest-haste-map": "^29.7.0",
+        "jest-leak-detector": "^29.7.0",
+        "jest-message-util": "^29.7.0",
+        "jest-resolve": "^29.7.0",
+        "jest-runtime": "^29.7.0",
+        "jest-util": "^29.7.0",
+        "jest-watcher": "^29.7.0",
+        "jest-worker": "^29.7.0",
         "p-limit": "^3.1.0",
         "source-map-support": "0.5.13"
       },
@@ -11117,13 +11207,13 @@
       }
     },
     "node_modules/jest-runner/node_modules/jest-worker": {
-      "version": "29.6.4",
-      "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-29.6.4.tgz",
-      "integrity": "sha512-6dpvFV4WjcWbDVGgHTWo/aupl8/LbBx2NSKfiwqf79xC/yeJjKHT1+StcKy/2KTmW16hE68ccKVOtXf+WZGz7Q==",
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-29.7.0.tgz",
+      "integrity": "sha512-eIz2msL/EzL9UFTFFx7jBTkeZfku0yUAyZZZmJ93H2TYEiroIx2PQjEXcwYtYl8zXCxb+PAmA2hLIt/6ZEkPHw==",
       "dev": true,
       "dependencies": {
         "@types/node": "*",
-        "jest-util": "^29.6.3",
+        "jest-util": "^29.7.0",
         "merge-stream": "^2.0.0",
         "supports-color": "^8.0.0"
       },
@@ -11169,17 +11259,17 @@
       }
     },
     "node_modules/jest-runtime": {
-      "version": "29.6.4",
-      "resolved": "https://registry.npmjs.org/jest-runtime/-/jest-runtime-29.6.4.tgz",
-      "integrity": "sha512-s/QxMBLvmwLdchKEjcLfwzP7h+jsHvNEtxGP5P+Fl1FMaJX2jMiIqe4rJw4tFprzCwuSvVUo9bn0uj4gNRXsbA==",
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-runtime/-/jest-runtime-29.7.0.tgz",
+      "integrity": "sha512-gUnLjgwdGqW7B4LvOIkbKs9WGbn+QLqRQQ9juC6HndeDiezIwhDP+mhMwHWCEcfQ5RUXa6OPnFF8BJh5xegwwQ==",
       "dev": true,
       "dependencies": {
-        "@jest/environment": "^29.6.4",
-        "@jest/fake-timers": "^29.6.4",
-        "@jest/globals": "^29.6.4",
+        "@jest/environment": "^29.7.0",
+        "@jest/fake-timers": "^29.7.0",
+        "@jest/globals": "^29.7.0",
         "@jest/source-map": "^29.6.3",
-        "@jest/test-result": "^29.6.4",
-        "@jest/transform": "^29.6.4",
+        "@jest/test-result": "^29.7.0",
+        "@jest/transform": "^29.7.0",
         "@jest/types": "^29.6.3",
         "@types/node": "*",
         "chalk": "^4.0.0",
@@ -11187,13 +11277,13 @@
         "collect-v8-coverage": "^1.0.0",
         "glob": "^7.1.3",
         "graceful-fs": "^4.2.9",
-        "jest-haste-map": "^29.6.4",
-        "jest-message-util": "^29.6.3",
-        "jest-mock": "^29.6.3",
+        "jest-haste-map": "^29.7.0",
+        "jest-message-util": "^29.7.0",
+        "jest-mock": "^29.7.0",
         "jest-regex-util": "^29.6.3",
-        "jest-resolve": "^29.6.4",
-        "jest-snapshot": "^29.6.4",
-        "jest-util": "^29.6.3",
+        "jest-resolve": "^29.7.0",
+        "jest-snapshot": "^29.7.0",
+        "jest-util": "^29.7.0",
         "slash": "^3.0.0",
         "strip-bom": "^4.0.0"
       },
@@ -11272,9 +11362,9 @@
       }
     },
     "node_modules/jest-snapshot": {
-      "version": "29.6.4",
-      "resolved": "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-29.6.4.tgz",
-      "integrity": "sha512-VC1N8ED7+4uboUKGIDsbvNAZb6LakgIPgAF4RSpF13dN6YaMokfRqO+BaqK4zIh6X3JffgwbzuGqDEjHm/MrvA==",
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-29.7.0.tgz",
+      "integrity": "sha512-Rm0BMWtxBcioHr1/OX5YCP8Uov4riHvKPknOGs804Zg9JGZgmIBkbtlxJC/7Z4msKYVbIJtfU+tKb8xlYNfdkw==",
       "dev": true,
       "dependencies": {
         "@babel/core": "^7.11.6",
@@ -11282,20 +11372,20 @@
         "@babel/plugin-syntax-jsx": "^7.7.2",
         "@babel/plugin-syntax-typescript": "^7.7.2",
         "@babel/types": "^7.3.3",
-        "@jest/expect-utils": "^29.6.4",
-        "@jest/transform": "^29.6.4",
+        "@jest/expect-utils": "^29.7.0",
+        "@jest/transform": "^29.7.0",
         "@jest/types": "^29.6.3",
         "babel-preset-current-node-syntax": "^1.0.0",
         "chalk": "^4.0.0",
-        "expect": "^29.6.4",
+        "expect": "^29.7.0",
         "graceful-fs": "^4.2.9",
-        "jest-diff": "^29.6.4",
+        "jest-diff": "^29.7.0",
         "jest-get-type": "^29.6.3",
-        "jest-matcher-utils": "^29.6.4",
-        "jest-message-util": "^29.6.3",
-        "jest-util": "^29.6.3",
+        "jest-matcher-utils": "^29.7.0",
+        "jest-message-util": "^29.7.0",
+        "jest-util": "^29.7.0",
         "natural-compare": "^1.4.0",
-        "pretty-format": "^29.6.3",
+        "pretty-format": "^29.7.0",
         "semver": "^7.5.3"
       },
       "engines": {
@@ -11475,9 +11565,9 @@
       }
     },
     "node_modules/jest-validate": {
-      "version": "29.6.3",
-      "resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-29.6.3.tgz",
-      "integrity": "sha512-e7KWZcAIX+2W1o3cHfnqpGajdCs1jSM3DkXjGeLSNmCazv1EeI1ggTeK5wdZhF+7N+g44JI2Od3veojoaumlfg==",
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-29.7.0.tgz",
+      "integrity": "sha512-ZB7wHqaRGVw/9hST/OuFUReG7M8vKeq0/J2egIGLdvjHCmYqGARhzXmtgi+gVeZ5uXFF219aOc3Ls2yLg27tkw==",
       "dev": true,
       "dependencies": {
         "@jest/types": "^29.6.3",
@@ -11485,7 +11575,7 @@
         "chalk": "^4.0.0",
         "jest-get-type": "^29.6.3",
         "leven": "^3.1.0",
-        "pretty-format": "^29.6.3"
+        "pretty-format": "^29.7.0"
       },
       "engines": {
         "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
@@ -11574,18 +11664,18 @@
       }
     },
     "node_modules/jest-watcher": {
-      "version": "29.6.4",
-      "resolved": "https://registry.npmjs.org/jest-watcher/-/jest-watcher-29.6.4.tgz",
-      "integrity": "sha512-oqUWvx6+On04ShsT00Ir9T4/FvBeEh2M9PTubgITPxDa739p4hoQweWPRGyYeaojgT0xTpZKF0Y/rSY1UgMxvQ==",
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-watcher/-/jest-watcher-29.7.0.tgz",
+      "integrity": "sha512-49Fg7WXkU3Vl2h6LbLtMQ/HyB6rXSIX7SqvBLQmssRBGN9I0PNvPmAmCWSOY6SOvrjhI/F7/bGAv9RtnsPA03g==",
       "dev": true,
       "dependencies": {
-        "@jest/test-result": "^29.6.4",
+        "@jest/test-result": "^29.7.0",
         "@jest/types": "^29.6.3",
         "@types/node": "*",
         "ansi-escapes": "^4.2.1",
         "chalk": "^4.0.0",
         "emittery": "^0.13.1",
-        "jest-util": "^29.6.3",
+        "jest-util": "^29.7.0",
         "string-length": "^4.0.1"
       },
       "engines": {
@@ -14235,9 +14325,9 @@
       }
     },
     "node_modules/pure-rand": {
-      "version": "6.0.2",
-      "resolved": "https://registry.npmjs.org/pure-rand/-/pure-rand-6.0.2.tgz",
-      "integrity": "sha512-6Yg0ekpKICSjPswYOuC5sku/TSWaRYlA0qsXqJgM/d/4pLPHPuTxK7Nbf7jFKzAeedUhR8C7K9Uv63FBsSo8xQ==",
+      "version": "6.0.3",
+      "resolved": "https://registry.npmjs.org/pure-rand/-/pure-rand-6.0.3.tgz",
+      "integrity": "sha512-KddyFewCsO0j3+np81IQ+SweXLDnDQTs5s67BOnrYmYe/yNmUhttQyGsYzy8yUnoljGAQ9sl38YB4vH8ur7Y+w==",
       "dev": true,
       "funding": [
         {
@@ -19295,16 +19385,16 @@
       "dev": true
     },
     "@jest/console": {
-      "version": "29.6.4",
-      "resolved": "https://registry.npmjs.org/@jest/console/-/console-29.6.4.tgz",
-      "integrity": "sha512-wNK6gC0Ha9QeEPSkeJedQuTQqxZYnDPuDcDhVuVatRvMkL4D0VTvFVZj+Yuh6caG2aOfzkUZ36KtCmLNtR02hw==",
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/@jest/console/-/console-29.7.0.tgz",
+      "integrity": "sha512-5Ni4CU7XHQi32IJ398EEP4RrB8eV09sXP2ROqD4bksHrnTree52PsxvX8tpL8LvTZ3pFzXyPbNQReSN41CAhOg==",
       "dev": true,
       "requires": {
         "@jest/types": "^29.6.3",
         "@types/node": "*",
         "chalk": "^4.0.0",
-        "jest-message-util": "^29.6.3",
-        "jest-util": "^29.6.3",
+        "jest-message-util": "^29.7.0",
+        "jest-util": "^29.7.0",
         "slash": "^3.0.0"
       },
       "dependencies": {
@@ -19360,15 +19450,15 @@
       }
     },
     "@jest/core": {
-      "version": "29.6.4",
-      "resolved": "https://registry.npmjs.org/@jest/core/-/core-29.6.4.tgz",
-      "integrity": "sha512-U/vq5ccNTSVgYH7mHnodHmCffGWHJnz/E1BEWlLuK5pM4FZmGfBn/nrJGLjUsSmyx3otCeqc1T31F4y08AMDLg==",
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/@jest/core/-/core-29.7.0.tgz",
+      "integrity": "sha512-n7aeXWKMnGtDA48y8TLWJPJmLmmZ642Ceo78cYWEpiD7FzDgmNDV/GCVRorPABdXLJZ/9wzzgZAlHjXjxDHGsg==",
       "dev": true,
       "requires": {
-        "@jest/console": "^29.6.4",
-        "@jest/reporters": "^29.6.4",
-        "@jest/test-result": "^29.6.4",
-        "@jest/transform": "^29.6.4",
+        "@jest/console": "^29.7.0",
+        "@jest/reporters": "^29.7.0",
+        "@jest/test-result": "^29.7.0",
+        "@jest/transform": "^29.7.0",
         "@jest/types": "^29.6.3",
         "@types/node": "*",
         "ansi-escapes": "^4.2.1",
@@ -19376,21 +19466,21 @@
         "ci-info": "^3.2.0",
         "exit": "^0.1.2",
         "graceful-fs": "^4.2.9",
-        "jest-changed-files": "^29.6.3",
-        "jest-config": "^29.6.4",
-        "jest-haste-map": "^29.6.4",
-        "jest-message-util": "^29.6.3",
+        "jest-changed-files": "^29.7.0",
+        "jest-config": "^29.7.0",
+        "jest-haste-map": "^29.7.0",
+        "jest-message-util": "^29.7.0",
         "jest-regex-util": "^29.6.3",
-        "jest-resolve": "^29.6.4",
-        "jest-resolve-dependencies": "^29.6.4",
-        "jest-runner": "^29.6.4",
-        "jest-runtime": "^29.6.4",
-        "jest-snapshot": "^29.6.4",
-        "jest-util": "^29.6.3",
-        "jest-validate": "^29.6.3",
-        "jest-watcher": "^29.6.4",
+        "jest-resolve": "^29.7.0",
+        "jest-resolve-dependencies": "^29.7.0",
+        "jest-runner": "^29.7.0",
+        "jest-runtime": "^29.7.0",
+        "jest-snapshot": "^29.7.0",
+        "jest-util": "^29.7.0",
+        "jest-validate": "^29.7.0",
+        "jest-watcher": "^29.7.0",
         "micromatch": "^4.0.4",
-        "pretty-format": "^29.6.3",
+        "pretty-format": "^29.7.0",
         "slash": "^3.0.0",
         "strip-ansi": "^6.0.0"
       },
@@ -19459,19 +19549,19 @@
       }
     },
     "@jest/expect": {
-      "version": "29.6.4",
-      "resolved": "https://registry.npmjs.org/@jest/expect/-/expect-29.6.4.tgz",
-      "integrity": "sha512-Warhsa7d23+3X5bLbrbYvaehcgX5TLYhI03JKoedTiI8uJU4IhqYBWF7OSSgUyz4IgLpUYPkK0AehA5/fRclAA==",
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/@jest/expect/-/expect-29.7.0.tgz",
+      "integrity": "sha512-8uMeAMycttpva3P1lBHB8VciS9V0XAr3GymPpipdyQXbBcuhkLQOSe8E/p92RyAdToS6ZD1tFkX+CkhoECE0dQ==",
       "dev": true,
       "requires": {
-        "expect": "^29.6.4",
-        "jest-snapshot": "^29.6.4"
+        "expect": "^29.7.0",
+        "jest-snapshot": "^29.7.0"
       }
     },
     "@jest/expect-utils": {
-      "version": "29.6.4",
-      "resolved": "https://registry.npmjs.org/@jest/expect-utils/-/expect-utils-29.6.4.tgz",
-      "integrity": "sha512-FEhkJhqtvBwgSpiTrocquJCdXPsyvNKcl/n7A3u7X4pVoF4bswm11c9d4AV+kfq2Gpv/mM8x7E7DsRvH+djkrg==",
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/@jest/expect-utils/-/expect-utils-29.7.0.tgz",
+      "integrity": "sha512-GlsNBWiFQFCVi9QVSx7f5AgMeLxe9YCCs5PuP2O2LdjDAA8Jh9eX7lA1Jq/xdXw3Wb3hyvlFNfZIfcRetSzYcA==",
       "dev": true,
       "requires": {
         "jest-get-type": "^29.6.3"
@@ -19492,27 +19582,27 @@
       }
     },
     "@jest/globals": {
-      "version": "29.6.4",
-      "resolved": "https://registry.npmjs.org/@jest/globals/-/globals-29.6.4.tgz",
-      "integrity": "sha512-wVIn5bdtjlChhXAzVXavcY/3PEjf4VqM174BM3eGL5kMxLiZD5CLnbmkEyA1Dwh9q8XjP6E8RwjBsY/iCWrWsA==",
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/@jest/globals/-/globals-29.7.0.tgz",
+      "integrity": "sha512-mpiz3dutLbkW2MNFubUGUEVLkTGiqW6yLVTA+JbP6fI6J5iL9Y0Nlg8k95pcF8ctKwCS7WVxteBs29hhfAotzQ==",
       "dev": true,
       "requires": {
-        "@jest/environment": "^29.6.4",
-        "@jest/expect": "^29.6.4",
+        "@jest/environment": "^29.7.0",
+        "@jest/expect": "^29.7.0",
         "@jest/types": "^29.6.3",
-        "jest-mock": "^29.6.3"
+        "jest-mock": "^29.7.0"
       }
     },
     "@jest/reporters": {
-      "version": "29.6.4",
-      "resolved": "https://registry.npmjs.org/@jest/reporters/-/reporters-29.6.4.tgz",
-      "integrity": "sha512-sxUjWxm7QdchdrD3NfWKrL8FBsortZeibSJv4XLjESOOjSUOkjQcb0ZHJwfhEGIvBvTluTzfG2yZWZhkrXJu8g==",
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/@jest/reporters/-/reporters-29.7.0.tgz",
+      "integrity": "sha512-DApq0KJbJOEzAFYjHADNNxAE3KbhxQB1y5Kplb5Waqw6zVbuWatSnMjE5gs8FUgEPmNsnZA3NCWl9NG0ia04Pg==",
       "dev": true,
       "requires": {
         "@bcoe/v8-coverage": "^0.2.3",
-        "@jest/console": "^29.6.4",
-        "@jest/test-result": "^29.6.4",
-        "@jest/transform": "^29.6.4",
+        "@jest/console": "^29.7.0",
+        "@jest/test-result": "^29.7.0",
+        "@jest/transform": "^29.7.0",
         "@jest/types": "^29.6.3",
         "@jridgewell/trace-mapping": "^0.3.18",
         "@types/node": "*",
@@ -19526,9 +19616,9 @@
         "istanbul-lib-report": "^3.0.0",
         "istanbul-lib-source-maps": "^4.0.0",
         "istanbul-reports": "^3.1.3",
-        "jest-message-util": "^29.6.3",
-        "jest-util": "^29.6.3",
-        "jest-worker": "^29.6.4",
+        "jest-message-util": "^29.7.0",
+        "jest-util": "^29.7.0",
+        "jest-worker": "^29.7.0",
         "slash": "^3.0.0",
         "string-length": "^4.0.1",
         "strip-ansi": "^6.0.0",
@@ -19576,13 +19666,13 @@
           "dev": true
         },
         "jest-worker": {
-          "version": "29.6.4",
-          "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-29.6.4.tgz",
-          "integrity": "sha512-6dpvFV4WjcWbDVGgHTWo/aupl8/LbBx2NSKfiwqf79xC/yeJjKHT1+StcKy/2KTmW16hE68ccKVOtXf+WZGz7Q==",
+          "version": "29.7.0",
+          "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-29.7.0.tgz",
+          "integrity": "sha512-eIz2msL/EzL9UFTFFx7jBTkeZfku0yUAyZZZmJ93H2TYEiroIx2PQjEXcwYtYl8zXCxb+PAmA2hLIt/6ZEkPHw==",
           "dev": true,
           "requires": {
             "@types/node": "*",
-            "jest-util": "^29.6.3",
+            "jest-util": "^29.7.0",
             "merge-stream": "^2.0.0",
             "supports-color": "^8.0.0"
           },
@@ -19630,33 +19720,33 @@
       }
     },
     "@jest/test-result": {
-      "version": "29.6.4",
-      "resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-29.6.4.tgz",
-      "integrity": "sha512-uQ1C0AUEN90/dsyEirgMLlouROgSY+Wc/JanVVk0OiUKa5UFh7sJpMEM3aoUBAz2BRNvUJ8j3d294WFuRxSyOQ==",
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-29.7.0.tgz",
+      "integrity": "sha512-Fdx+tv6x1zlkJPcWXmMDAG2HBnaR9XPSd5aDWQVsfrZmLVT3lU1cwyxLgRmXR9yrq4NBoEm9BMsfgFzTQAbJYA==",
       "dev": true,
       "requires": {
-        "@jest/console": "^29.6.4",
+        "@jest/console": "^29.7.0",
         "@jest/types": "^29.6.3",
         "@types/istanbul-lib-coverage": "^2.0.0",
         "collect-v8-coverage": "^1.0.0"
       }
     },
     "@jest/test-sequencer": {
-      "version": "29.6.4",
-      "resolved": "https://registry.npmjs.org/@jest/test-sequencer/-/test-sequencer-29.6.4.tgz",
-      "integrity": "sha512-E84M6LbpcRq3fT4ckfKs9ryVanwkaIB0Ws9bw3/yP4seRLg/VaCZ/LgW0MCq5wwk4/iP/qnilD41aj2fsw2RMg==",
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/@jest/test-sequencer/-/test-sequencer-29.7.0.tgz",
+      "integrity": "sha512-GQwJ5WZVrKnOJuiYiAF52UNUJXgTZx1NHjFSEB0qEMmSZKAkdMoIzw/Cj6x6NF4AvV23AUqDpFzQkN/eYCYTxw==",
       "dev": true,
       "requires": {
-        "@jest/test-result": "^29.6.4",
+        "@jest/test-result": "^29.7.0",
         "graceful-fs": "^4.2.9",
-        "jest-haste-map": "^29.6.4",
+        "jest-haste-map": "^29.7.0",
         "slash": "^3.0.0"
       }
     },
     "@jest/transform": {
-      "version": "29.6.4",
-      "resolved": "https://registry.npmjs.org/@jest/transform/-/transform-29.6.4.tgz",
-      "integrity": "sha512-8thgRSiXUqtr/pPGY/OsyHuMjGyhVnWrFAwoxmIemlBuiMyU1WFs0tXoNxzcr4A4uErs/ABre76SGmrr5ab/AA==",
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/@jest/transform/-/transform-29.7.0.tgz",
+      "integrity": "sha512-ok/BTPFzFKVMwO5eOHRrvnBVHdRy9IrsrW1GpMaQ9MCnilNLXQKmAX8s1YXDFaai9xJpac2ySzV0YeRRECr2Vw==",
       "dev": true,
       "requires": {
         "@babel/core": "^7.11.6",
@@ -19667,9 +19757,9 @@
         "convert-source-map": "^2.0.0",
         "fast-json-stable-stringify": "^2.1.0",
         "graceful-fs": "^4.2.9",
-        "jest-haste-map": "^29.6.4",
+        "jest-haste-map": "^29.7.0",
         "jest-regex-util": "^29.6.3",
-        "jest-util": "^29.6.3",
+        "jest-util": "^29.7.0",
         "micromatch": "^4.0.4",
         "pirates": "^4.0.4",
         "slash": "^3.0.0",
@@ -20918,12 +21008,12 @@
       "integrity": "sha512-xh1Rl34h6Fi1DC2WWKfxUTVqRsNnr6LsKz2+hfwDxQJWmrx8+c7ylaqBMcHfl1U1r2dsifOvKX3LQuLNZ+XSvA=="
     },
     "babel-jest": {
-      "version": "29.6.4",
-      "resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-29.6.4.tgz",
-      "integrity": "sha512-meLj23UlSLddj6PC+YTOFRgDAtjnZom8w/ACsrx0gtPtv5cJZk0A5Unk5bV4wixD7XaPCN1fQvpww8czkZURmw==",
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-29.7.0.tgz",
+      "integrity": "sha512-BrvGY3xZSwEcCzKvKsCi2GgHqDqsYkOP4/by5xCgIwGXQxIEh+8ew3gmrE1y7XRR6LHZIj6yLYnUi/mm2KXKBg==",
       "dev": true,
       "requires": {
-        "@jest/transform": "^29.6.4",
+        "@jest/transform": "^29.7.0",
         "@types/babel__core": "^7.1.14",
         "babel-plugin-istanbul": "^6.1.1",
         "babel-preset-jest": "^29.6.3",
@@ -21974,6 +22064,72 @@
         "sha.js": "^2.4.8"
       }
     },
+    "create-jest": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/create-jest/-/create-jest-29.7.0.tgz",
+      "integrity": "sha512-Adz2bdH0Vq3F53KEMJOoftQFutWCukm6J24wbPWRO4k1kMY7gS7ds/uoJkNuV8wDCtWWnuwGcJwpWcih+zEW1Q==",
+      "dev": true,
+      "requires": {
+        "@jest/types": "^29.6.3",
+        "chalk": "^4.0.0",
+        "exit": "^0.1.2",
+        "graceful-fs": "^4.2.9",
+        "jest-config": "^29.7.0",
+        "jest-util": "^29.7.0",
+        "prompts": "^2.0.1"
+      },
+      "dependencies": {
+        "ansi-styles": {
+          "version": "4.3.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+          "dev": true,
+          "requires": {
+            "color-convert": "^2.0.1"
+          }
+        },
+        "chalk": {
+          "version": "4.1.2",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "^4.1.0",
+            "supports-color": "^7.1.0"
+          }
+        },
+        "color-convert": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+          "dev": true,
+          "requires": {
+            "color-name": "~1.1.4"
+          }
+        },
+        "color-name": {
+          "version": "1.1.4",
+          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+          "dev": true
+        },
+        "has-flag": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+          "dev": true
+        },
+        "supports-color": {
+          "version": "7.2.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+          "dev": true,
+          "requires": {
+            "has-flag": "^4.0.0"
+          }
+        }
+      }
+    },
     "cross-fetch": {
       "version": "2.2.6",
       "resolved": "https://registry.npmjs.org/cross-fetch/-/cross-fetch-2.2.6.tgz",
@@ -23849,16 +24005,16 @@
       "dev": true
     },
     "expect": {
-      "version": "29.6.4",
-      "resolved": "https://registry.npmjs.org/expect/-/expect-29.6.4.tgz",
-      "integrity": "sha512-F2W2UyQ8XYyftHT57dtfg8Ue3X5qLgm2sSug0ivvLRH/VKNRL/pDxg/TH7zVzbQB0tu80clNFy6LU7OS/VSEKA==",
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/expect/-/expect-29.7.0.tgz",
+      "integrity": "sha512-2Zks0hf1VLFYI1kbh0I5jP3KHHyCHpkfyHBzsSXRFgl/Bg9mWYfMW8oD+PdMPlEwy5HNsR9JutYy6pMeOh61nw==",
       "dev": true,
       "requires": {
-        "@jest/expect-utils": "^29.6.4",
+        "@jest/expect-utils": "^29.7.0",
         "jest-get-type": "^29.6.3",
-        "jest-matcher-utils": "^29.6.4",
-        "jest-message-util": "^29.6.3",
-        "jest-util": "^29.6.3"
+        "jest-matcher-utils": "^29.7.0",
+        "jest-message-util": "^29.7.0",
+        "jest-util": "^29.7.0"
       }
     },
     "express": {
@@ -25115,51 +25271,51 @@
       }
     },
     "jest": {
-      "version": "29.6.4",
-      "resolved": "https://registry.npmjs.org/jest/-/jest-29.6.4.tgz",
-      "integrity": "sha512-tEFhVQFF/bzoYV1YuGyzLPZ6vlPrdfvDmmAxudA1dLEuiztqg2Rkx20vkKY32xiDROcD2KXlgZ7Cu8RPeEHRKw==",
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest/-/jest-29.7.0.tgz",
+      "integrity": "sha512-NIy3oAFp9shda19hy4HK0HRTWKtPJmGdnvywu01nOqNC2vZg+Z+fvJDxpMQA88eb2I9EcafcdjYgsDthnYTvGw==",
       "dev": true,
       "requires": {
-        "@jest/core": "^29.6.4",
+        "@jest/core": "^29.7.0",
         "@jest/types": "^29.6.3",
         "import-local": "^3.0.2",
-        "jest-cli": "^29.6.4"
+        "jest-cli": "^29.7.0"
       }
     },
     "jest-changed-files": {
-      "version": "29.6.3",
-      "resolved": "https://registry.npmjs.org/jest-changed-files/-/jest-changed-files-29.6.3.tgz",
-      "integrity": "sha512-G5wDnElqLa4/c66ma5PG9eRjE342lIbF6SUnTJi26C3J28Fv2TVY2rOyKB9YGbSA5ogwevgmxc4j4aVjrEK6Yg==",
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-changed-files/-/jest-changed-files-29.7.0.tgz",
+      "integrity": "sha512-fEArFiwf1BpQ+4bXSprcDc3/x4HSzL4al2tozwVpDFpsxALjLYdyiIK4e5Vz66GQJIbXJ82+35PtysofptNX2w==",
       "dev": true,
       "requires": {
         "execa": "^5.0.0",
-        "jest-util": "^29.6.3",
+        "jest-util": "^29.7.0",
         "p-limit": "^3.1.0"
       }
     },
     "jest-circus": {
-      "version": "29.6.4",
-      "resolved": "https://registry.npmjs.org/jest-circus/-/jest-circus-29.6.4.tgz",
-      "integrity": "sha512-YXNrRyntVUgDfZbjXWBMPslX1mQ8MrSG0oM/Y06j9EYubODIyHWP8hMUbjbZ19M3M+zamqEur7O80HODwACoJw==",
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-circus/-/jest-circus-29.7.0.tgz",
+      "integrity": "sha512-3E1nCMgipcTkCocFwM90XXQab9bS+GMsjdpmPrlelaxwD93Ad8iVEjX/vvHPdLPnFf+L40u+5+iutRdA1N9myw==",
       "dev": true,
       "requires": {
-        "@jest/environment": "^29.6.4",
-        "@jest/expect": "^29.6.4",
-        "@jest/test-result": "^29.6.4",
+        "@jest/environment": "^29.7.0",
+        "@jest/expect": "^29.7.0",
+        "@jest/test-result": "^29.7.0",
         "@jest/types": "^29.6.3",
         "@types/node": "*",
         "chalk": "^4.0.0",
         "co": "^4.6.0",
         "dedent": "^1.0.0",
         "is-generator-fn": "^2.0.0",
-        "jest-each": "^29.6.3",
-        "jest-matcher-utils": "^29.6.4",
-        "jest-message-util": "^29.6.3",
-        "jest-runtime": "^29.6.4",
-        "jest-snapshot": "^29.6.4",
-        "jest-util": "^29.6.3",
+        "jest-each": "^29.7.0",
+        "jest-matcher-utils": "^29.7.0",
+        "jest-message-util": "^29.7.0",
+        "jest-runtime": "^29.7.0",
+        "jest-snapshot": "^29.7.0",
+        "jest-util": "^29.7.0",
         "p-limit": "^3.1.0",
-        "pretty-format": "^29.6.3",
+        "pretty-format": "^29.7.0",
         "pure-rand": "^6.0.0",
         "slash": "^3.0.0",
         "stack-utils": "^2.0.3"
@@ -25217,22 +25373,21 @@
       }
     },
     "jest-cli": {
-      "version": "29.6.4",
-      "resolved": "https://registry.npmjs.org/jest-cli/-/jest-cli-29.6.4.tgz",
-      "integrity": "sha512-+uMCQ7oizMmh8ZwRfZzKIEszFY9ksjjEQnTEMTaL7fYiL3Kw4XhqT9bYh+A4DQKUb67hZn2KbtEnDuHvcgK4pQ==",
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-cli/-/jest-cli-29.7.0.tgz",
+      "integrity": "sha512-OVVobw2IubN/GSYsxETi+gOe7Ka59EFMR/twOU3Jb2GnKKeMGJB5SGUUrEz3SFVmJASUdZUzy83sLNNQ2gZslg==",
       "dev": true,
       "requires": {
-        "@jest/core": "^29.6.4",
-        "@jest/test-result": "^29.6.4",
+        "@jest/core": "^29.7.0",
+        "@jest/test-result": "^29.7.0",
         "@jest/types": "^29.6.3",
         "chalk": "^4.0.0",
+        "create-jest": "^29.7.0",
         "exit": "^0.1.2",
-        "graceful-fs": "^4.2.9",
         "import-local": "^3.0.2",
-        "jest-config": "^29.6.4",
-        "jest-util": "^29.6.3",
-        "jest-validate": "^29.6.3",
-        "prompts": "^2.0.1",
+        "jest-config": "^29.7.0",
+        "jest-util": "^29.7.0",
+        "jest-validate": "^29.7.0",
         "yargs": "^17.3.1"
       },
       "dependencies": {
@@ -25288,31 +25443,31 @@
       }
     },
     "jest-config": {
-      "version": "29.6.4",
-      "resolved": "https://registry.npmjs.org/jest-config/-/jest-config-29.6.4.tgz",
-      "integrity": "sha512-JWohr3i9m2cVpBumQFv2akMEnFEPVOh+9L2xIBJhJ0zOaci2ZXuKJj0tgMKQCBZAKA09H049IR4HVS/43Qb19A==",
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-config/-/jest-config-29.7.0.tgz",
+      "integrity": "sha512-uXbpfeQ7R6TZBqI3/TxCU4q4ttk3u0PJeC+E0zbfSoSjq6bJ7buBPxzQPL0ifrkY4DNu4JUdk0ImlBUYi840eQ==",
       "dev": true,
       "requires": {
         "@babel/core": "^7.11.6",
-        "@jest/test-sequencer": "^29.6.4",
+        "@jest/test-sequencer": "^29.7.0",
         "@jest/types": "^29.6.3",
-        "babel-jest": "^29.6.4",
+        "babel-jest": "^29.7.0",
         "chalk": "^4.0.0",
         "ci-info": "^3.2.0",
         "deepmerge": "^4.2.2",
         "glob": "^7.1.3",
         "graceful-fs": "^4.2.9",
-        "jest-circus": "^29.6.4",
-        "jest-environment-node": "^29.6.4",
+        "jest-circus": "^29.7.0",
+        "jest-environment-node": "^29.7.0",
         "jest-get-type": "^29.6.3",
         "jest-regex-util": "^29.6.3",
-        "jest-resolve": "^29.6.4",
-        "jest-runner": "^29.6.4",
-        "jest-util": "^29.6.3",
-        "jest-validate": "^29.6.3",
+        "jest-resolve": "^29.7.0",
+        "jest-runner": "^29.7.0",
+        "jest-util": "^29.7.0",
+        "jest-validate": "^29.7.0",
         "micromatch": "^4.0.4",
         "parse-json": "^5.2.0",
-        "pretty-format": "^29.6.3",
+        "pretty-format": "^29.7.0",
         "slash": "^3.0.0",
         "strip-json-comments": "^3.1.1"
       },
@@ -25369,15 +25524,15 @@
       }
     },
     "jest-diff": {
-      "version": "29.6.4",
-      "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-29.6.4.tgz",
-      "integrity": "sha512-9F48UxR9e4XOEZvoUXEHSWY4qC4zERJaOfrbBg9JpbJOO43R1vN76REt/aMGZoY6GD5g84nnJiBIVlscegefpw==",
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-29.7.0.tgz",
+      "integrity": "sha512-LMIgiIrhigmPrs03JHpxUh2yISK3vLFPkAodPeo0+BuF7wA2FoQbkEg1u8gBYBThncu7e1oEDUfIXVuTqLRUjw==",
       "dev": true,
       "requires": {
         "chalk": "^4.0.0",
         "diff-sequences": "^29.6.3",
         "jest-get-type": "^29.6.3",
-        "pretty-format": "^29.6.3"
+        "pretty-format": "^29.7.0"
       },
       "dependencies": {
         "ansi-styles": {
@@ -25432,25 +25587,25 @@
       }
     },
     "jest-docblock": {
-      "version": "29.6.3",
-      "resolved": "https://registry.npmjs.org/jest-docblock/-/jest-docblock-29.6.3.tgz",
-      "integrity": "sha512-2+H+GOTQBEm2+qFSQ7Ma+BvyV+waiIFxmZF5LdpBsAEjWX8QYjSCa4FrkIYtbfXUJJJnFCYrOtt6TZ+IAiTjBQ==",
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-docblock/-/jest-docblock-29.7.0.tgz",
+      "integrity": "sha512-q617Auw3A612guyaFgsbFeYpNP5t2aoUNLwBUbc/0kD1R4t9ixDbyFTHd1nok4epoVFpr7PmeWHrhvuV3XaJ4g==",
       "dev": true,
       "requires": {
         "detect-newline": "^3.0.0"
       }
     },
     "jest-each": {
-      "version": "29.6.3",
-      "resolved": "https://registry.npmjs.org/jest-each/-/jest-each-29.6.3.tgz",
-      "integrity": "sha512-KoXfJ42k8cqbkfshW7sSHcdfnv5agDdHCPA87ZBdmHP+zJstTJc0ttQaJ/x7zK6noAL76hOuTIJ6ZkQRS5dcyg==",
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-each/-/jest-each-29.7.0.tgz",
+      "integrity": "sha512-gns+Er14+ZrEoC5fhOfYCY1LOHHr0TI+rQUHZS8Ttw2l7gl+80eHc/gFf2Ktkw0+SIACDTeWvpFcv3B04VembQ==",
       "dev": true,
       "requires": {
         "@jest/types": "^29.6.3",
         "chalk": "^4.0.0",
         "jest-get-type": "^29.6.3",
-        "jest-util": "^29.6.3",
-        "pretty-format": "^29.6.3"
+        "jest-util": "^29.7.0",
+        "pretty-format": "^29.7.0"
       },
       "dependencies": {
         "ansi-styles": {
@@ -25521,17 +25676,17 @@
       }
     },
     "jest-environment-node": {
-      "version": "29.6.4",
-      "resolved": "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-29.6.4.tgz",
-      "integrity": "sha512-i7SbpH2dEIFGNmxGCpSc2w9cA4qVD+wfvg2ZnfQ7XVrKL0NA5uDVBIiGH8SR4F0dKEv/0qI5r+aDomDf04DpEQ==",
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-29.7.0.tgz",
+      "integrity": "sha512-DOSwCRqXirTOyheM+4d5YZOrWcdu0LNZ87ewUoywbcb2XR4wKgqiG8vNeYwhjFMbEkfju7wx2GYH0P2gevGvFw==",
       "dev": true,
       "requires": {
-        "@jest/environment": "^29.6.4",
-        "@jest/fake-timers": "^29.6.4",
+        "@jest/environment": "^29.7.0",
+        "@jest/fake-timers": "^29.7.0",
         "@jest/types": "^29.6.3",
         "@types/node": "*",
-        "jest-mock": "^29.6.3",
-        "jest-util": "^29.6.3"
+        "jest-mock": "^29.7.0",
+        "jest-util": "^29.7.0"
       }
     },
     "jest-get-type": {
@@ -25541,9 +25696,9 @@
       "dev": true
     },
     "jest-haste-map": {
-      "version": "29.6.4",
-      "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-29.6.4.tgz",
-      "integrity": "sha512-12Ad+VNTDHxKf7k+M65sviyynRoZYuL1/GTuhEVb8RYsNSNln71nANRb/faSyWvx0j+gHcivChXHIoMJrGYjog==",
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-29.7.0.tgz",
+      "integrity": "sha512-fP8u2pyfqx0K1rGn1R9pyE0/KTn+G7PxktWidOBTqFPLYX0b9ksaMFkhK5vrS3DVun09pckLdlx90QthlW7AmA==",
       "dev": true,
       "requires": {
         "@jest/types": "^29.6.3",
@@ -25554,8 +25709,8 @@
         "fsevents": "^2.3.2",
         "graceful-fs": "^4.2.9",
         "jest-regex-util": "^29.6.3",
-        "jest-util": "^29.6.3",
-        "jest-worker": "^29.6.4",
+        "jest-util": "^29.7.0",
+        "jest-worker": "^29.7.0",
         "micromatch": "^4.0.4",
         "walker": "^1.0.8"
       },
@@ -25567,13 +25722,13 @@
           "dev": true
         },
         "jest-worker": {
-          "version": "29.6.4",
-          "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-29.6.4.tgz",
-          "integrity": "sha512-6dpvFV4WjcWbDVGgHTWo/aupl8/LbBx2NSKfiwqf79xC/yeJjKHT1+StcKy/2KTmW16hE68ccKVOtXf+WZGz7Q==",
+          "version": "29.7.0",
+          "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-29.7.0.tgz",
+          "integrity": "sha512-eIz2msL/EzL9UFTFFx7jBTkeZfku0yUAyZZZmJ93H2TYEiroIx2PQjEXcwYtYl8zXCxb+PAmA2hLIt/6ZEkPHw==",
           "dev": true,
           "requires": {
             "@types/node": "*",
-            "jest-util": "^29.6.3",
+            "jest-util": "^29.7.0",
             "merge-stream": "^2.0.0",
             "supports-color": "^8.0.0"
           }
@@ -25590,25 +25745,25 @@
       }
     },
     "jest-leak-detector": {
-      "version": "29.6.3",
-      "resolved": "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-29.6.3.tgz",
-      "integrity": "sha512-0kfbESIHXYdhAdpLsW7xdwmYhLf1BRu4AA118/OxFm0Ho1b2RcTmO4oF6aAMaxpxdxnJ3zve2rgwzNBD4Zbm7Q==",
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-29.7.0.tgz",
+      "integrity": "sha512-kYA8IJcSYtST2BY9I+SMC32nDpBT3J2NvWJx8+JCuCdl/CR1I4EKUJROiP8XtCcxqgTTBGJNdbB1A8XRKbTetw==",
       "dev": true,
       "requires": {
         "jest-get-type": "^29.6.3",
-        "pretty-format": "^29.6.3"
+        "pretty-format": "^29.7.0"
       }
     },
     "jest-matcher-utils": {
-      "version": "29.6.4",
-      "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-29.6.4.tgz",
-      "integrity": "sha512-KSzwyzGvK4HcfnserYqJHYi7sZVqdREJ9DMPAKVbS98JsIAvumihaNUbjrWw0St7p9IY7A9UskCW5MYlGmBQFQ==",
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-29.7.0.tgz",
+      "integrity": "sha512-sBkD+Xi9DtcChsI3L3u0+N0opgPYnCRPtGcQYrgXmR+hmt/fYfWAL0xRXYU8eWOdfuLgBe0YCW3AFtnRLagq/g==",
       "dev": true,
       "requires": {
         "chalk": "^4.0.0",
-        "jest-diff": "^29.6.4",
+        "jest-diff": "^29.7.0",
         "jest-get-type": "^29.6.3",
-        "pretty-format": "^29.6.3"
+        "pretty-format": "^29.7.0"
       },
       "dependencies": {
         "ansi-styles": {
@@ -25755,17 +25910,17 @@
       "dev": true
     },
     "jest-resolve": {
-      "version": "29.6.4",
-      "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-29.6.4.tgz",
-      "integrity": "sha512-fPRq+0vcxsuGlG0O3gyoqGTAxasagOxEuyoxHeyxaZbc9QNek0AmJWSkhjlMG+mTsj+8knc/mWb3fXlRNVih7Q==",
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-29.7.0.tgz",
+      "integrity": "sha512-IOVhZSrg+UvVAshDSDtHyFCCBUl/Q3AAJv8iZ6ZjnZ74xzvwuzLXid9IIIPgTnY62SJjfuupMKZsZQRsCvxEgA==",
       "dev": true,
       "requires": {
         "chalk": "^4.0.0",
         "graceful-fs": "^4.2.9",
-        "jest-haste-map": "^29.6.4",
+        "jest-haste-map": "^29.7.0",
         "jest-pnp-resolver": "^1.2.2",
-        "jest-util": "^29.6.3",
-        "jest-validate": "^29.6.3",
+        "jest-util": "^29.7.0",
+        "jest-validate": "^29.7.0",
         "resolve": "^1.20.0",
         "resolve.exports": "^2.0.0",
         "slash": "^3.0.0"
@@ -25823,40 +25978,40 @@
       }
     },
     "jest-resolve-dependencies": {
-      "version": "29.6.4",
-      "resolved": "https://registry.npmjs.org/jest-resolve-dependencies/-/jest-resolve-dependencies-29.6.4.tgz",
-      "integrity": "sha512-7+6eAmr1ZBF3vOAJVsfLj1QdqeXG+WYhidfLHBRZqGN24MFRIiKG20ItpLw2qRAsW/D2ZUUmCNf6irUr/v6KHA==",
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-resolve-dependencies/-/jest-resolve-dependencies-29.7.0.tgz",
+      "integrity": "sha512-un0zD/6qxJ+S0et7WxeI3H5XSe9lTBBR7bOHCHXkKR6luG5mwDDlIzVQ0V5cZCuoTgEdcdwzTghYkTWfubi+nA==",
       "dev": true,
       "requires": {
         "jest-regex-util": "^29.6.3",
-        "jest-snapshot": "^29.6.4"
+        "jest-snapshot": "^29.7.0"
       }
     },
     "jest-runner": {
-      "version": "29.6.4",
-      "resolved": "https://registry.npmjs.org/jest-runner/-/jest-runner-29.6.4.tgz",
-      "integrity": "sha512-SDaLrMmtVlQYDuG0iSPYLycG8P9jLI+fRm8AF/xPKhYDB2g6xDWjXBrR5M8gEWsK6KVFlebpZ4QsrxdyIX1Jaw==",
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-runner/-/jest-runner-29.7.0.tgz",
+      "integrity": "sha512-fsc4N6cPCAahybGBfTRcq5wFR6fpLznMg47sY5aDpsoejOcVYFb07AHuSnR0liMcPTgBsA3ZJL6kFOjPdoNipQ==",
       "dev": true,
       "requires": {
-        "@jest/console": "^29.6.4",
-        "@jest/environment": "^29.6.4",
-        "@jest/test-result": "^29.6.4",
-        "@jest/transform": "^29.6.4",
+        "@jest/console": "^29.7.0",
+        "@jest/environment": "^29.7.0",
+        "@jest/test-result": "^29.7.0",
+        "@jest/transform": "^29.7.0",
         "@jest/types": "^29.6.3",
         "@types/node": "*",
         "chalk": "^4.0.0",
         "emittery": "^0.13.1",
         "graceful-fs": "^4.2.9",
-        "jest-docblock": "^29.6.3",
-        "jest-environment-node": "^29.6.4",
-        "jest-haste-map": "^29.6.4",
-        "jest-leak-detector": "^29.6.3",
-        "jest-message-util": "^29.6.3",
-        "jest-resolve": "^29.6.4",
-        "jest-runtime": "^29.6.4",
-        "jest-util": "^29.6.3",
-        "jest-watcher": "^29.6.4",
-        "jest-worker": "^29.6.4",
+        "jest-docblock": "^29.7.0",
+        "jest-environment-node": "^29.7.0",
+        "jest-haste-map": "^29.7.0",
+        "jest-leak-detector": "^29.7.0",
+        "jest-message-util": "^29.7.0",
+        "jest-resolve": "^29.7.0",
+        "jest-runtime": "^29.7.0",
+        "jest-util": "^29.7.0",
+        "jest-watcher": "^29.7.0",
+        "jest-worker": "^29.7.0",
         "p-limit": "^3.1.0",
         "source-map-support": "0.5.13"
       },
@@ -25902,13 +26057,13 @@
           "dev": true
         },
         "jest-worker": {
-          "version": "29.6.4",
-          "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-29.6.4.tgz",
-          "integrity": "sha512-6dpvFV4WjcWbDVGgHTWo/aupl8/LbBx2NSKfiwqf79xC/yeJjKHT1+StcKy/2KTmW16hE68ccKVOtXf+WZGz7Q==",
+          "version": "29.7.0",
+          "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-29.7.0.tgz",
+          "integrity": "sha512-eIz2msL/EzL9UFTFFx7jBTkeZfku0yUAyZZZmJ93H2TYEiroIx2PQjEXcwYtYl8zXCxb+PAmA2hLIt/6ZEkPHw==",
           "dev": true,
           "requires": {
             "@types/node": "*",
-            "jest-util": "^29.6.3",
+            "jest-util": "^29.7.0",
             "merge-stream": "^2.0.0",
             "supports-color": "^8.0.0"
           },
@@ -25946,17 +26101,17 @@
       }
     },
     "jest-runtime": {
-      "version": "29.6.4",
-      "resolved": "https://registry.npmjs.org/jest-runtime/-/jest-runtime-29.6.4.tgz",
-      "integrity": "sha512-s/QxMBLvmwLdchKEjcLfwzP7h+jsHvNEtxGP5P+Fl1FMaJX2jMiIqe4rJw4tFprzCwuSvVUo9bn0uj4gNRXsbA==",
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-runtime/-/jest-runtime-29.7.0.tgz",
+      "integrity": "sha512-gUnLjgwdGqW7B4LvOIkbKs9WGbn+QLqRQQ9juC6HndeDiezIwhDP+mhMwHWCEcfQ5RUXa6OPnFF8BJh5xegwwQ==",
       "dev": true,
       "requires": {
-        "@jest/environment": "^29.6.4",
-        "@jest/fake-timers": "^29.6.4",
-        "@jest/globals": "^29.6.4",
+        "@jest/environment": "^29.7.0",
+        "@jest/fake-timers": "^29.7.0",
+        "@jest/globals": "^29.7.0",
         "@jest/source-map": "^29.6.3",
-        "@jest/test-result": "^29.6.4",
-        "@jest/transform": "^29.6.4",
+        "@jest/test-result": "^29.7.0",
+        "@jest/transform": "^29.7.0",
         "@jest/types": "^29.6.3",
         "@types/node": "*",
         "chalk": "^4.0.0",
@@ -25964,13 +26119,13 @@
         "collect-v8-coverage": "^1.0.0",
         "glob": "^7.1.3",
         "graceful-fs": "^4.2.9",
-        "jest-haste-map": "^29.6.4",
-        "jest-message-util": "^29.6.3",
-        "jest-mock": "^29.6.3",
+        "jest-haste-map": "^29.7.0",
+        "jest-message-util": "^29.7.0",
+        "jest-mock": "^29.7.0",
         "jest-regex-util": "^29.6.3",
-        "jest-resolve": "^29.6.4",
-        "jest-snapshot": "^29.6.4",
-        "jest-util": "^29.6.3",
+        "jest-resolve": "^29.7.0",
+        "jest-snapshot": "^29.7.0",
+        "jest-util": "^29.7.0",
         "slash": "^3.0.0",
         "strip-bom": "^4.0.0"
       },
@@ -26027,9 +26182,9 @@
       }
     },
     "jest-snapshot": {
-      "version": "29.6.4",
-      "resolved": "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-29.6.4.tgz",
-      "integrity": "sha512-VC1N8ED7+4uboUKGIDsbvNAZb6LakgIPgAF4RSpF13dN6YaMokfRqO+BaqK4zIh6X3JffgwbzuGqDEjHm/MrvA==",
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-29.7.0.tgz",
+      "integrity": "sha512-Rm0BMWtxBcioHr1/OX5YCP8Uov4riHvKPknOGs804Zg9JGZgmIBkbtlxJC/7Z4msKYVbIJtfU+tKb8xlYNfdkw==",
       "dev": true,
       "requires": {
         "@babel/core": "^7.11.6",
@@ -26037,20 +26192,20 @@
         "@babel/plugin-syntax-jsx": "^7.7.2",
         "@babel/plugin-syntax-typescript": "^7.7.2",
         "@babel/types": "^7.3.3",
-        "@jest/expect-utils": "^29.6.4",
-        "@jest/transform": "^29.6.4",
+        "@jest/expect-utils": "^29.7.0",
+        "@jest/transform": "^29.7.0",
         "@jest/types": "^29.6.3",
         "babel-preset-current-node-syntax": "^1.0.0",
         "chalk": "^4.0.0",
-        "expect": "^29.6.4",
+        "expect": "^29.7.0",
         "graceful-fs": "^4.2.9",
-        "jest-diff": "^29.6.4",
+        "jest-diff": "^29.7.0",
         "jest-get-type": "^29.6.3",
-        "jest-matcher-utils": "^29.6.4",
-        "jest-message-util": "^29.6.3",
-        "jest-util": "^29.6.3",
+        "jest-matcher-utils": "^29.7.0",
+        "jest-message-util": "^29.7.0",
+        "jest-util": "^29.7.0",
         "natural-compare": "^1.4.0",
-        "pretty-format": "^29.6.3",
+        "pretty-format": "^29.7.0",
         "semver": "^7.5.3"
       },
       "dependencies": {
@@ -26180,9 +26335,9 @@
       }
     },
     "jest-validate": {
-      "version": "29.6.3",
-      "resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-29.6.3.tgz",
-      "integrity": "sha512-e7KWZcAIX+2W1o3cHfnqpGajdCs1jSM3DkXjGeLSNmCazv1EeI1ggTeK5wdZhF+7N+g44JI2Od3veojoaumlfg==",
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-29.7.0.tgz",
+      "integrity": "sha512-ZB7wHqaRGVw/9hST/OuFUReG7M8vKeq0/J2egIGLdvjHCmYqGARhzXmtgi+gVeZ5uXFF219aOc3Ls2yLg27tkw==",
       "dev": true,
       "requires": {
         "@jest/types": "^29.6.3",
@@ -26190,7 +26345,7 @@
         "chalk": "^4.0.0",
         "jest-get-type": "^29.6.3",
         "leven": "^3.1.0",
-        "pretty-format": "^29.6.3"
+        "pretty-format": "^29.7.0"
       },
       "dependencies": {
         "ansi-styles": {
@@ -26251,18 +26406,18 @@
       }
     },
     "jest-watcher": {
-      "version": "29.6.4",
-      "resolved": "https://registry.npmjs.org/jest-watcher/-/jest-watcher-29.6.4.tgz",
-      "integrity": "sha512-oqUWvx6+On04ShsT00Ir9T4/FvBeEh2M9PTubgITPxDa739p4hoQweWPRGyYeaojgT0xTpZKF0Y/rSY1UgMxvQ==",
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-watcher/-/jest-watcher-29.7.0.tgz",
+      "integrity": "sha512-49Fg7WXkU3Vl2h6LbLtMQ/HyB6rXSIX7SqvBLQmssRBGN9I0PNvPmAmCWSOY6SOvrjhI/F7/bGAv9RtnsPA03g==",
       "dev": true,
       "requires": {
-        "@jest/test-result": "^29.6.4",
+        "@jest/test-result": "^29.7.0",
         "@jest/types": "^29.6.3",
         "@types/node": "*",
         "ansi-escapes": "^4.2.1",
         "chalk": "^4.0.0",
         "emittery": "^0.13.1",
-        "jest-util": "^29.6.3",
+        "jest-util": "^29.7.0",
         "string-length": "^4.0.1"
       },
       "dependencies": {
@@ -28267,9 +28422,9 @@
       "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A=="
     },
     "pure-rand": {
-      "version": "6.0.2",
-      "resolved": "https://registry.npmjs.org/pure-rand/-/pure-rand-6.0.2.tgz",
-      "integrity": "sha512-6Yg0ekpKICSjPswYOuC5sku/TSWaRYlA0qsXqJgM/d/4pLPHPuTxK7Nbf7jFKzAeedUhR8C7K9Uv63FBsSo8xQ==",
+      "version": "6.0.3",
+      "resolved": "https://registry.npmjs.org/pure-rand/-/pure-rand-6.0.3.tgz",
+      "integrity": "sha512-KddyFewCsO0j3+np81IQ+SweXLDnDQTs5s67BOnrYmYe/yNmUhttQyGsYzy8yUnoljGAQ9sl38YB4vH8ur7Y+w==",
       "dev": true
     },
     "qrcode": {
diff --git a/apps/block_scout_web/assets/package.json b/apps/block_scout_web/assets/package.json
index 16623a911a08..51dafd9eb23c 100644
--- a/apps/block_scout_web/assets/package.json
+++ b/apps/block_scout_web/assets/package.json
@@ -96,7 +96,7 @@
     "eslint-plugin-node": "^11.1.0",
     "eslint-plugin-promise": "^6.1.1",
     "file-loader": "^6.2.0",
-    "jest": "^29.6.4",
+    "jest": "^29.7.0",
     "jest-environment-jsdom": "^29.7.0",
     "mini-css-extract-plugin": "^2.7.6",
     "postcss": "^8.4.29",

From e0941b16dc765a164c6fa638f807986136f317fc Mon Sep 17 00:00:00 2001
From: Qwerty5Uiop <alex000010@bk.ru>
Date: Thu, 14 Sep 2023 18:17:31 +0300
Subject: [PATCH 404/909] Add configurable limit for token balance fetcher init

---
 apps/explorer/lib/explorer/chain.ex               | 10 +++++++++-
 apps/indexer/lib/indexer/fetcher/token_balance.ex |  3 ++-
 config/runtime.exs                                |  4 +++-
 docker-compose/envs/common-blockscout.env         |  1 +
 docker/Makefile                                   |  3 +++
 5 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/apps/explorer/lib/explorer/chain.ex b/apps/explorer/lib/explorer/chain.ex
index 5b4d96d9b940..ecfc013d0e19 100644
--- a/apps/explorer/lib/explorer/chain.ex
+++ b/apps/explorer/lib/explorer/chain.ex
@@ -2247,7 +2247,7 @@ defmodule Explorer.Chain do
         when accumulator: term()
   def stream_unfetched_token_balances(initial, reducer, limited? \\ false) when is_function(reducer, 2) do
     TokenBalance.unfetched_token_balances()
-    |> add_fetcher_limit(limited?)
+    |> add_token_balances_fetcher_limit(limited?)
     |> Repo.stream_reduce(initial, reducer)
   end
 
@@ -6307,6 +6307,14 @@ defmodule Explorer.Chain do
     limit(query, ^fetcher_limit)
   end
 
+  defp add_token_balances_fetcher_limit(query, false), do: query
+
+  defp add_token_balances_fetcher_limit(query, true) do
+    token_balances_fetcher_limit = Application.get_env(:indexer, :token_balances_fetcher_init_limit)
+
+    limit(query, ^token_balances_fetcher_limit)
+  end
+
   def put_has_token_transfers_to_tx(query, true), do: query
 
   def put_has_token_transfers_to_tx(query, false) do
diff --git a/apps/indexer/lib/indexer/fetcher/token_balance.ex b/apps/indexer/lib/indexer/fetcher/token_balance.ex
index 93add63827d2..b313a37da866 100644
--- a/apps/indexer/lib/indexer/fetcher/token_balance.ex
+++ b/apps/indexer/lib/indexer/fetcher/token_balance.ex
@@ -76,7 +76,8 @@ defmodule Indexer.Fetcher.TokenBalance do
           token_balance
           |> entry()
           |> reducer.(acc)
-        end
+        end,
+        true
       )
 
     final
diff --git a/config/runtime.exs b/config/runtime.exs
index 36939f976a1c..d8cb3b4a80c4 100644
--- a/config/runtime.exs
+++ b/config/runtime.exs
@@ -422,7 +422,9 @@ config :indexer,
   receipts_batch_size: ConfigHelper.parse_integer_env_var("INDEXER_RECEIPTS_BATCH_SIZE", 250),
   receipts_concurrency: ConfigHelper.parse_integer_env_var("INDEXER_RECEIPTS_CONCURRENCY", 10),
   hide_indexing_progress_alert: ConfigHelper.parse_bool_env_var("INDEXER_HIDE_INDEXING_PROGRESS_ALERT"),
-  fetcher_init_limit: ConfigHelper.parse_integer_env_var("INDEXER_FETCHER_INIT_QUERY_LIMIT", 100)
+  fetcher_init_limit: ConfigHelper.parse_integer_env_var("INDEXER_FETCHER_INIT_QUERY_LIMIT", 100),
+  token_balances_fetcher_init_limit:
+    ConfigHelper.parse_integer_env_var("INDEXER_TOKEN_BALANCES_FETCHER_INIT_QUERY_LIMIT", 100_000)
 
 config :indexer, Indexer.Supervisor, enabled: !ConfigHelper.parse_bool_env_var("DISABLE_INDEXER")
 
diff --git a/docker-compose/envs/common-blockscout.env b/docker-compose/envs/common-blockscout.env
index a8ae85965cc8..f2dea8643121 100644
--- a/docker-compose/envs/common-blockscout.env
+++ b/docker-compose/envs/common-blockscout.env
@@ -127,6 +127,7 @@ INDEXER_DISABLE_INTERNAL_TRANSACTIONS_FETCHER=false
 # INDEXER_TX_ACTIONS_AAVE_V3_POOL_CONTRACT=
 # INDEXER_REALTIME_FETCHER_MAX_GAP=
 # INDEXER_FETCHER_INIT_QUERY_LIMIT=
+# INDEXER_TOKEN_BALANCES_FETCHER_INIT_QUERY_LIMIT=
 # INDEXER_DISABLE_WITHDRAWALS_FETCHER=
 # WITHDRAWALS_FIRST_BLOCK=
 # TOKEN_ID_MIGRATION_FIRST_BLOCK=
diff --git a/docker/Makefile b/docker/Makefile
index 3c5289bc6ac2..c01bfd82be69 100644
--- a/docker/Makefile
+++ b/docker/Makefile
@@ -582,6 +582,9 @@ endif
 ifdef INDEXER_FETCHER_INIT_QUERY_LIMIT
     BLOCKSCOUT_CONTAINER_PARAMS += -e 'INDEXER_FETCHER_INIT_QUERY_LIMIT=$(INDEXER_FETCHER_INIT_QUERY_LIMIT)'
 endif
+ifdef INDEXER_TOKEN_BALANCES_FETCHER_INIT_QUERY_LIMIT
+    BLOCKSCOUT_CONTAINER_PARAMS += -e 'INDEXER_TOKEN_BALANCES_FETCHER_INIT_QUERY_LIMIT=$(INDEXER_TOKEN_BALANCES_FETCHER_INIT_QUERY_LIMIT)'
+endif
 ifdef INDEXER_INTERNAL_TRANSACTIONS_TRACER_TYPE
     BLOCKSCOUT_CONTAINER_PARAMS += -e 'INDEXER_INTERNAL_TRANSACTIONS_TRACER_TYPE=$(INDEXER_INTERNAL_TRANSACTIONS_TRACER_TYPE)'
 endif

From 1a6db9ba18edc804e83eb04687cd7d9cd3a9d023 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 14 Sep 2023 18:20:16 +0000
Subject: [PATCH 405/909] Bump sweetalert2 from 11.7.27 to 11.7.28 in
 /apps/block_scout_web/assets

Bumps [sweetalert2](https://github.com/sweetalert2/sweetalert2) from 11.7.27 to 11.7.28.
- [Release notes](https://github.com/sweetalert2/sweetalert2/releases)
- [Changelog](https://github.com/sweetalert2/sweetalert2/blob/main/CHANGELOG.md)
- [Commits](https://github.com/sweetalert2/sweetalert2/compare/v11.7.27...v11.7.28)

---
updated-dependencies:
- dependency-name: sweetalert2
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 apps/block_scout_web/assets/package-lock.json | 14 +++++++-------
 apps/block_scout_web/assets/package.json      |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/apps/block_scout_web/assets/package-lock.json b/apps/block_scout_web/assets/package-lock.json
index 221eba335a53..2e2d0cd54db9 100644
--- a/apps/block_scout_web/assets/package-lock.json
+++ b/apps/block_scout_web/assets/package-lock.json
@@ -61,7 +61,7 @@
         "redux": "^4.2.1",
         "stream-browserify": "^3.0.0",
         "stream-http": "^3.1.1",
-        "sweetalert2": "^11.7.27",
+        "sweetalert2": "^11.7.28",
         "urijs": "^1.19.11",
         "url": "^0.11.2",
         "util": "^0.12.5",
@@ -15937,9 +15937,9 @@
       }
     },
     "node_modules/sweetalert2": {
-      "version": "11.7.27",
-      "resolved": "https://registry.npmjs.org/sweetalert2/-/sweetalert2-11.7.27.tgz",
-      "integrity": "sha512-QbRXGQn1sb7HEhzA/K2xtWIwQHh/qkSbb1w6jYcTql2xy17876lTREEt1D4X6Q0x2wHtfUjKJ+Cb8IVkRoq7DQ==",
+      "version": "11.7.28",
+      "resolved": "https://registry.npmjs.org/sweetalert2/-/sweetalert2-11.7.28.tgz",
+      "integrity": "sha512-9895DVuYTDlV4Hx4IJablFKMdSqzwpy0PKycztbO4cXnOeVMmw55weOq4gcZAh3/tAyunCKjApFDrlSAcswwcA==",
       "funding": {
         "type": "individual",
         "url": "https://github.com/sponsors/limonte"
@@ -29614,9 +29614,9 @@
       }
     },
     "sweetalert2": {
-      "version": "11.7.27",
-      "resolved": "https://registry.npmjs.org/sweetalert2/-/sweetalert2-11.7.27.tgz",
-      "integrity": "sha512-QbRXGQn1sb7HEhzA/K2xtWIwQHh/qkSbb1w6jYcTql2xy17876lTREEt1D4X6Q0x2wHtfUjKJ+Cb8IVkRoq7DQ=="
+      "version": "11.7.28",
+      "resolved": "https://registry.npmjs.org/sweetalert2/-/sweetalert2-11.7.28.tgz",
+      "integrity": "sha512-9895DVuYTDlV4Hx4IJablFKMdSqzwpy0PKycztbO4cXnOeVMmw55weOq4gcZAh3/tAyunCKjApFDrlSAcswwcA=="
     },
     "symbol-tree": {
       "version": "3.2.4",
diff --git a/apps/block_scout_web/assets/package.json b/apps/block_scout_web/assets/package.json
index 51dafd9eb23c..34f7b8fba425 100644
--- a/apps/block_scout_web/assets/package.json
+++ b/apps/block_scout_web/assets/package.json
@@ -73,7 +73,7 @@
     "redux": "^4.2.1",
     "stream-browserify": "^3.0.0",
     "stream-http": "^3.1.1",
-    "sweetalert2": "^11.7.27",
+    "sweetalert2": "^11.7.28",
     "urijs": "^1.19.11",
     "url": "^0.11.2",
     "util": "^0.12.5",

From f6b8cab9144641a2119a05105b30e0dbaf502fed Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 14 Sep 2023 18:20:30 +0000
Subject: [PATCH 406/909] Bump sass from 1.66.1 to 1.67.0 in
 /apps/block_scout_web/assets

Bumps [sass](https://github.com/sass/dart-sass) from 1.66.1 to 1.67.0.
- [Release notes](https://github.com/sass/dart-sass/releases)
- [Changelog](https://github.com/sass/dart-sass/blob/main/CHANGELOG.md)
- [Commits](https://github.com/sass/dart-sass/compare/1.66.1...1.67.0)

---
updated-dependencies:
- dependency-name: sass
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 apps/block_scout_web/assets/package-lock.json | 14 +++++++-------
 apps/block_scout_web/assets/package.json      |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/apps/block_scout_web/assets/package-lock.json b/apps/block_scout_web/assets/package-lock.json
index 221eba335a53..7992bc6f0817 100644
--- a/apps/block_scout_web/assets/package-lock.json
+++ b/apps/block_scout_web/assets/package-lock.json
@@ -89,7 +89,7 @@
         "mini-css-extract-plugin": "^2.7.6",
         "postcss": "^8.4.29",
         "postcss-loader": "^7.3.3",
-        "sass": "^1.66.1",
+        "sass": "^1.67.0",
         "sass-loader": "^13.3.2",
         "style-loader": "^3.3.3",
         "webpack": "^5.88.2",
@@ -15066,9 +15066,9 @@
       "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
     },
     "node_modules/sass": {
-      "version": "1.66.1",
-      "resolved": "https://registry.npmjs.org/sass/-/sass-1.66.1.tgz",
-      "integrity": "sha512-50c+zTsZOJVgFfTgwwEzkjA3/QACgdNsKueWPyAR0mRINIvLAStVQBbPg14iuqEQ74NPDbXzJARJ/O4SI1zftA==",
+      "version": "1.67.0",
+      "resolved": "https://registry.npmjs.org/sass/-/sass-1.67.0.tgz",
+      "integrity": "sha512-SVrO9ZeX/QQyEGtuZYCVxoeAL5vGlYjJ9p4i4HFuekWl8y/LtJ7tJc10Z+ck1c8xOuoBm2MYzcLfTAffD0pl/A==",
       "dev": true,
       "dependencies": {
         "chokidar": ">=3.0.0 <4.0.0",
@@ -28984,9 +28984,9 @@
       "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
     },
     "sass": {
-      "version": "1.66.1",
-      "resolved": "https://registry.npmjs.org/sass/-/sass-1.66.1.tgz",
-      "integrity": "sha512-50c+zTsZOJVgFfTgwwEzkjA3/QACgdNsKueWPyAR0mRINIvLAStVQBbPg14iuqEQ74NPDbXzJARJ/O4SI1zftA==",
+      "version": "1.67.0",
+      "resolved": "https://registry.npmjs.org/sass/-/sass-1.67.0.tgz",
+      "integrity": "sha512-SVrO9ZeX/QQyEGtuZYCVxoeAL5vGlYjJ9p4i4HFuekWl8y/LtJ7tJc10Z+ck1c8xOuoBm2MYzcLfTAffD0pl/A==",
       "dev": true,
       "requires": {
         "chokidar": ">=3.0.0 <4.0.0",
diff --git a/apps/block_scout_web/assets/package.json b/apps/block_scout_web/assets/package.json
index 51dafd9eb23c..00f8801e33d2 100644
--- a/apps/block_scout_web/assets/package.json
+++ b/apps/block_scout_web/assets/package.json
@@ -101,7 +101,7 @@
     "mini-css-extract-plugin": "^2.7.6",
     "postcss": "^8.4.29",
     "postcss-loader": "^7.3.3",
-    "sass": "^1.66.1",
+    "sass": "^1.67.0",
     "sass-loader": "^13.3.2",
     "style-loader": "^3.3.3",
     "webpack": "^5.88.2",

From 8f0fa41e5f7d5ab6fbb81c2c8a0b71ca451d188b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 14 Sep 2023 18:21:06 +0000
Subject: [PATCH 407/909] Bump @babel/core from 7.22.17 to 7.22.19 in
 /apps/block_scout_web/assets

Bumps [@babel/core](https://github.com/babel/babel/tree/HEAD/packages/babel-core) from 7.22.17 to 7.22.19.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/commits/v7.22.19/packages/babel-core)

---
updated-dependencies:
- dependency-name: "@babel/core"
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 apps/block_scout_web/assets/package-lock.json | 86 +++++++++----------
 apps/block_scout_web/assets/package.json      |  2 +-
 2 files changed, 44 insertions(+), 44 deletions(-)

diff --git a/apps/block_scout_web/assets/package-lock.json b/apps/block_scout_web/assets/package-lock.json
index 221eba335a53..e61320eae220 100644
--- a/apps/block_scout_web/assets/package-lock.json
+++ b/apps/block_scout_web/assets/package-lock.json
@@ -71,7 +71,7 @@
         "xss": "^1.0.14"
       },
       "devDependencies": {
-        "@babel/core": "^7.22.17",
+        "@babel/core": "^7.22.19",
         "@babel/preset-env": "^7.22.15",
         "autoprefixer": "^10.4.15",
         "babel-loader": "^9.1.3",
@@ -249,20 +249,20 @@
       }
     },
     "node_modules/@babel/core": {
-      "version": "7.22.17",
-      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.22.17.tgz",
-      "integrity": "sha512-2EENLmhpwplDux5PSsZnSbnSkB3tZ6QTksgO25xwEL7pIDcNOMhF5v/s6RzwjMZzZzw9Ofc30gHv5ChCC8pifQ==",
+      "version": "7.22.19",
+      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.22.19.tgz",
+      "integrity": "sha512-Q8Yj5X4LHVYTbLCKVz0//2D2aDmHF4xzCdEttYvKOnWvErGsa6geHXD6w46x64n5tP69VfeH+IfSrdyH3MLhwA==",
       "dependencies": {
         "@ampproject/remapping": "^2.2.0",
         "@babel/code-frame": "^7.22.13",
         "@babel/generator": "^7.22.15",
         "@babel/helper-compilation-targets": "^7.22.15",
-        "@babel/helper-module-transforms": "^7.22.17",
+        "@babel/helper-module-transforms": "^7.22.19",
         "@babel/helpers": "^7.22.15",
         "@babel/parser": "^7.22.16",
         "@babel/template": "^7.22.15",
-        "@babel/traverse": "^7.22.17",
-        "@babel/types": "^7.22.17",
+        "@babel/traverse": "^7.22.19",
+        "@babel/types": "^7.22.19",
         "convert-source-map": "^1.7.0",
         "debug": "^4.1.0",
         "gensync": "^1.0.0-beta.2",
@@ -453,15 +453,15 @@
       }
     },
     "node_modules/@babel/helper-module-transforms": {
-      "version": "7.22.17",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.22.17.tgz",
-      "integrity": "sha512-XouDDhQESrLHTpnBtCKExJdyY4gJCdrvH2Pyv8r8kovX2U8G0dRUOT45T9XlbLtuu9CLXP15eusnkprhoPV5iQ==",
+      "version": "7.22.19",
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.22.19.tgz",
+      "integrity": "sha512-m6h1cJvn+OJ+R3jOHp30faq5xKJ7VbjwDj5RGgHuRlU9hrMeKsGC+JpihkR5w1g7IfseCPPtZ0r7/hB4UKaYlA==",
       "dependencies": {
         "@babel/helper-environment-visitor": "^7.22.5",
         "@babel/helper-module-imports": "^7.22.15",
         "@babel/helper-simple-access": "^7.22.5",
         "@babel/helper-split-export-declaration": "^7.22.6",
-        "@babel/helper-validator-identifier": "^7.22.15"
+        "@babel/helper-validator-identifier": "^7.22.19"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -567,9 +567,9 @@
       }
     },
     "node_modules/@babel/helper-validator-identifier": {
-      "version": "7.22.15",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.15.tgz",
-      "integrity": "sha512-4E/F9IIEi8WR94324mbDUMo074YTheJmd7eZF5vITTeYchqAi6sYXRLHUVsmkdmY4QjfKTcB2jB7dVP3NaBElQ==",
+      "version": "7.22.19",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.19.tgz",
+      "integrity": "sha512-Tinq7ybnEPFFXhlYOYFiSjespWQk0dq2dRNAiMdRTOYQzEGqnnNyrTxPYHP5r6wGjlF1rFgABdDV0g8EwD6Qbg==",
       "engines": {
         "node": ">=6.9.0"
       }
@@ -1938,9 +1938,9 @@
       }
     },
     "node_modules/@babel/traverse": {
-      "version": "7.22.17",
-      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.22.17.tgz",
-      "integrity": "sha512-xK4Uwm0JnAMvxYZxOVecss85WxTEIbTa7bnGyf/+EgCL5Zt3U7htUpEOWv9detPlamGKuRzCqw74xVglDWpPdg==",
+      "version": "7.22.19",
+      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.22.19.tgz",
+      "integrity": "sha512-ZCcpVPK64krfdScRbpxF6xA5fz7IOsfMwx1tcACvCzt6JY+0aHkBk7eIU8FRDSZRU5Zei6Z4JfgAxN1bqXGECg==",
       "dependencies": {
         "@babel/code-frame": "^7.22.13",
         "@babel/generator": "^7.22.15",
@@ -1949,7 +1949,7 @@
         "@babel/helper-hoist-variables": "^7.22.5",
         "@babel/helper-split-export-declaration": "^7.22.6",
         "@babel/parser": "^7.22.16",
-        "@babel/types": "^7.22.17",
+        "@babel/types": "^7.22.19",
         "debug": "^4.1.0",
         "globals": "^11.1.0"
       },
@@ -1958,12 +1958,12 @@
       }
     },
     "node_modules/@babel/types": {
-      "version": "7.22.17",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.22.17.tgz",
-      "integrity": "sha512-YSQPHLFtQNE5xN9tHuZnzu8vPr61wVTBZdfv1meex1NBosa4iT05k/Jw06ddJugi4bk7The/oSwQGFcksmEJQg==",
+      "version": "7.22.19",
+      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.22.19.tgz",
+      "integrity": "sha512-P7LAw/LbojPzkgp5oznjE6tQEIWbp4PkkfrZDINTro9zgBRtI324/EYsiSI7lhPbpIQ+DCeR2NNmMWANGGfZsg==",
       "dependencies": {
         "@babel/helper-string-parser": "^7.22.5",
-        "@babel/helper-validator-identifier": "^7.22.15",
+        "@babel/helper-validator-identifier": "^7.22.19",
         "to-fast-properties": "^2.0.0"
       },
       "engines": {
@@ -17822,20 +17822,20 @@
       "integrity": "sha512-5UamI7xkUcJ3i9qVDS+KFDEK8/7oJ55/sJMB1Ge7IEapr7KfdfV/HErR+koZwOfd+SgtFKOKRhRakdg++DcJpQ=="
     },
     "@babel/core": {
-      "version": "7.22.17",
-      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.22.17.tgz",
-      "integrity": "sha512-2EENLmhpwplDux5PSsZnSbnSkB3tZ6QTksgO25xwEL7pIDcNOMhF5v/s6RzwjMZzZzw9Ofc30gHv5ChCC8pifQ==",
+      "version": "7.22.19",
+      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.22.19.tgz",
+      "integrity": "sha512-Q8Yj5X4LHVYTbLCKVz0//2D2aDmHF4xzCdEttYvKOnWvErGsa6geHXD6w46x64n5tP69VfeH+IfSrdyH3MLhwA==",
       "requires": {
         "@ampproject/remapping": "^2.2.0",
         "@babel/code-frame": "^7.22.13",
         "@babel/generator": "^7.22.15",
         "@babel/helper-compilation-targets": "^7.22.15",
-        "@babel/helper-module-transforms": "^7.22.17",
+        "@babel/helper-module-transforms": "^7.22.19",
         "@babel/helpers": "^7.22.15",
         "@babel/parser": "^7.22.16",
         "@babel/template": "^7.22.15",
-        "@babel/traverse": "^7.22.17",
-        "@babel/types": "^7.22.17",
+        "@babel/traverse": "^7.22.19",
+        "@babel/types": "^7.22.19",
         "convert-source-map": "^1.7.0",
         "debug": "^4.1.0",
         "gensync": "^1.0.0-beta.2",
@@ -17979,15 +17979,15 @@
       }
     },
     "@babel/helper-module-transforms": {
-      "version": "7.22.17",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.22.17.tgz",
-      "integrity": "sha512-XouDDhQESrLHTpnBtCKExJdyY4gJCdrvH2Pyv8r8kovX2U8G0dRUOT45T9XlbLtuu9CLXP15eusnkprhoPV5iQ==",
+      "version": "7.22.19",
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.22.19.tgz",
+      "integrity": "sha512-m6h1cJvn+OJ+R3jOHp30faq5xKJ7VbjwDj5RGgHuRlU9hrMeKsGC+JpihkR5w1g7IfseCPPtZ0r7/hB4UKaYlA==",
       "requires": {
         "@babel/helper-environment-visitor": "^7.22.5",
         "@babel/helper-module-imports": "^7.22.15",
         "@babel/helper-simple-access": "^7.22.5",
         "@babel/helper-split-export-declaration": "^7.22.6",
-        "@babel/helper-validator-identifier": "^7.22.15"
+        "@babel/helper-validator-identifier": "^7.22.19"
       }
     },
     "@babel/helper-optimise-call-expression": {
@@ -18057,9 +18057,9 @@
       "integrity": "sha512-mM4COjgZox8U+JcXQwPijIZLElkgEpO5rsERVDJTc2qfCDfERyob6k5WegS14SX18IIjv+XD+GrqNumY5JRCDw=="
     },
     "@babel/helper-validator-identifier": {
-      "version": "7.22.15",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.15.tgz",
-      "integrity": "sha512-4E/F9IIEi8WR94324mbDUMo074YTheJmd7eZF5vITTeYchqAi6sYXRLHUVsmkdmY4QjfKTcB2jB7dVP3NaBElQ=="
+      "version": "7.22.19",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.19.tgz",
+      "integrity": "sha512-Tinq7ybnEPFFXhlYOYFiSjespWQk0dq2dRNAiMdRTOYQzEGqnnNyrTxPYHP5r6wGjlF1rFgABdDV0g8EwD6Qbg=="
     },
     "@babel/helper-validator-option": {
       "version": "7.22.15",
@@ -18986,9 +18986,9 @@
       }
     },
     "@babel/traverse": {
-      "version": "7.22.17",
-      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.22.17.tgz",
-      "integrity": "sha512-xK4Uwm0JnAMvxYZxOVecss85WxTEIbTa7bnGyf/+EgCL5Zt3U7htUpEOWv9detPlamGKuRzCqw74xVglDWpPdg==",
+      "version": "7.22.19",
+      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.22.19.tgz",
+      "integrity": "sha512-ZCcpVPK64krfdScRbpxF6xA5fz7IOsfMwx1tcACvCzt6JY+0aHkBk7eIU8FRDSZRU5Zei6Z4JfgAxN1bqXGECg==",
       "requires": {
         "@babel/code-frame": "^7.22.13",
         "@babel/generator": "^7.22.15",
@@ -18997,18 +18997,18 @@
         "@babel/helper-hoist-variables": "^7.22.5",
         "@babel/helper-split-export-declaration": "^7.22.6",
         "@babel/parser": "^7.22.16",
-        "@babel/types": "^7.22.17",
+        "@babel/types": "^7.22.19",
         "debug": "^4.1.0",
         "globals": "^11.1.0"
       }
     },
     "@babel/types": {
-      "version": "7.22.17",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.22.17.tgz",
-      "integrity": "sha512-YSQPHLFtQNE5xN9tHuZnzu8vPr61wVTBZdfv1meex1NBosa4iT05k/Jw06ddJugi4bk7The/oSwQGFcksmEJQg==",
+      "version": "7.22.19",
+      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.22.19.tgz",
+      "integrity": "sha512-P7LAw/LbojPzkgp5oznjE6tQEIWbp4PkkfrZDINTro9zgBRtI324/EYsiSI7lhPbpIQ+DCeR2NNmMWANGGfZsg==",
       "requires": {
         "@babel/helper-string-parser": "^7.22.5",
-        "@babel/helper-validator-identifier": "^7.22.15",
+        "@babel/helper-validator-identifier": "^7.22.19",
         "to-fast-properties": "^2.0.0"
       }
     },
diff --git a/apps/block_scout_web/assets/package.json b/apps/block_scout_web/assets/package.json
index 51dafd9eb23c..7a91f72bf4b5 100644
--- a/apps/block_scout_web/assets/package.json
+++ b/apps/block_scout_web/assets/package.json
@@ -83,7 +83,7 @@
     "xss": "^1.0.14"
   },
   "devDependencies": {
-    "@babel/core": "^7.22.17",
+    "@babel/core": "^7.22.19",
     "@babel/preset-env": "^7.22.15",
     "autoprefixer": "^10.4.15",
     "babel-loader": "^9.1.3",

From 6e9d14cd0eb7b09d78f3ddbae44f894f4ef12a3f Mon Sep 17 00:00:00 2001
From: Qwerty5Uiop <alex000010@bk.ru>
Date: Fri, 8 Sep 2023 15:17:10 +0300
Subject: [PATCH 408/909] Put error in last call for STOP opcode

---
 CHANGELOG.md                                       | 1 +
 apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/geth.ex | 6 +++++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index cb2e21442578..53e412b9e78f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -26,6 +26,7 @@
 - [#8242](https://github.com/blockscout/blockscout/pull/8242) - Fixing visualizer service CORS issue when running docker-compose
 - [#8355](https://github.com/blockscout/blockscout/pull/8355) - Fix current token balances redefining
 - [#8338](https://github.com/blockscout/blockscout/pull/8338) - Fix reorgs query
+- [#8413](https://github.com/blockscout/blockscout/pull/8413) - Put error in last call for STOP opcode
 
 ### Chore
 
diff --git a/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/geth.ex b/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/geth.ex
index d7de16ff25d5..5bc1c758aefe 100644
--- a/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/geth.ex
+++ b/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/geth.ex
@@ -269,13 +269,17 @@ defmodule EthereumJSONRPC.Geth do
   defp parse_call_tracer_calls([], acc, _trace_address, _inner?), do: acc
   defp parse_call_tracer_calls({%{"type" => 0}, _}, acc, _trace_address, _inner?), do: acc
 
+  defp parse_call_tracer_calls({%{"type" => "STOP"}, _}, [last | acc], _trace_address, _inner?) do
+    [Map.put(last, "error", "execution stopped") | acc]
+  end
+
   defp parse_call_tracer_calls(
          {%{"type" => type, "from" => from} = call, index},
          acc,
          trace_address,
          inner?
        )
-       when type in ~w(CALL CALLCODE DELEGATECALL STATICCALL CREATE CREATE2 SELFDESTRUCT REWARD) do
+       when type in ~w(CALL CALLCODE DELEGATECALL STATICCALL CREATE CREATE2 SELFDESTRUCT REVERT) do
     new_trace_address = [index | trace_address]
 
     formatted_call =

From 153eb47f59fe3de569a082e1d8e1350afa70cd51 Mon Sep 17 00:00:00 2001
From: Qwerty5Uiop <alex000010@bk.ru>
Date: Wed, 13 Sep 2023 18:26:40 +0300
Subject: [PATCH 409/909] Handle STOP opcode for single call

---
 .../lib/ethereum_jsonrpc/geth.ex              |  2 +-
 .../lib/ethereum_jsonrpc/geth/call.ex         | 26 +++++++++++++++++++
 2 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/geth.ex b/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/geth.ex
index 5bc1c758aefe..cfa5c8c511fa 100644
--- a/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/geth.ex
+++ b/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/geth.ex
@@ -279,7 +279,7 @@ defmodule EthereumJSONRPC.Geth do
          trace_address,
          inner?
        )
-       when type in ~w(CALL CALLCODE DELEGATECALL STATICCALL CREATE CREATE2 SELFDESTRUCT REVERT) do
+       when type in ~w(CALL CALLCODE DELEGATECALL STATICCALL CREATE CREATE2 SELFDESTRUCT REVERT STOP) do
     new_trace_address = [index | trace_address]
 
     formatted_call =
diff --git a/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/geth/call.ex b/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/geth/call.ex
index dfdbb965fcd4..c7a1642c8065 100644
--- a/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/geth/call.ex
+++ b/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/geth/call.ex
@@ -511,4 +511,30 @@ defmodule EthereumJSONRPC.Geth.Call do
       value: value
     }
   end
+
+  defp elixir_to_internal_transaction_params(%{
+         "blockNumber" => block_number,
+         "transactionIndex" => transaction_index,
+         "transactionHash" => transaction_hash,
+         "index" => index,
+         "traceAddress" => trace_address,
+         "type" => "stop" = type,
+         "from" => from_address_hash,
+         "input" => input,
+         "gas" => gas,
+         "gasUsed" => gas_used
+       }) do
+    %{
+      block_number: block_number,
+      transaction_index: transaction_index,
+      transaction_hash: transaction_hash,
+      index: index,
+      trace_address: trace_address,
+      type: type,
+      from_address_hash: from_address_hash,
+      input: input,
+      gas: gas,
+      gas_used: gas_used
+    }
+  end
 end

From f79364c3f754c699ae7744a5c47179e30821ffcb Mon Sep 17 00:00:00 2001
From: Qwerty5Uiop <alex000010@bk.ru>
Date: Thu, 14 Sep 2023 10:59:22 +0300
Subject: [PATCH 410/909] Add stop internal transaction type

---
 apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/geth/call.ex     | 3 ++-
 .../lib/explorer/chain/internal_transaction/type.ex         | 6 +++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/geth/call.ex b/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/geth/call.ex
index c7a1642c8065..4e4eceffb5b3 100644
--- a/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/geth/call.ex
+++ b/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/geth/call.ex
@@ -534,7 +534,8 @@ defmodule EthereumJSONRPC.Geth.Call do
       from_address_hash: from_address_hash,
       input: input,
       gas: gas,
-      gas_used: gas_used
+      gas_used: gas_used,
+      error: "execution stopped"
     }
   end
 end
diff --git a/apps/explorer/lib/explorer/chain/internal_transaction/type.ex b/apps/explorer/lib/explorer/chain/internal_transaction/type.ex
index 6c2890c59be0..d852ea8ecfdf 100644
--- a/apps/explorer/lib/explorer/chain/internal_transaction/type.ex
+++ b/apps/explorer/lib/explorer/chain/internal_transaction/type.ex
@@ -10,8 +10,9 @@ defmodule Explorer.Chain.InternalTransaction.Type do
    * `:create`
    * `:reward`
    * `:selfdestruct`
+   * `:stop`
   """
-  @type t :: :call | :create | :create2 | :reward | :selfdestruct
+  @type t :: :call | :create | :create2 | :reward | :selfdestruct | :stop
 
   @doc """
   Casts `term` to `t:t/0`
@@ -63,6 +64,7 @@ defmodule Explorer.Chain.InternalTransaction.Type do
   def cast("create2"), do: {:ok, :create2}
   def cast("reward"), do: {:ok, :reward}
   def cast("selfdestruct"), do: {:ok, :selfdestruct}
+  def cast("stop"), do: {:ok, :stop}
   def cast(_), do: :error
 
   @doc """
@@ -97,6 +99,7 @@ defmodule Explorer.Chain.InternalTransaction.Type do
   def dump(:create2), do: {:ok, "create2"}
   def dump(:reward), do: {:ok, "reward"}
   def dump(:selfdestruct), do: {:ok, "selfdestruct"}
+  def dump(:stop), do: {:ok, "stop"}
   def dump(_), do: :error
 
   @doc """
@@ -131,6 +134,7 @@ defmodule Explorer.Chain.InternalTransaction.Type do
   def load("create2"), do: {:ok, :create2}
   def load("reward"), do: {:ok, :reward}
   def load("selfdestruct"), do: {:ok, :selfdestruct}
+  def load("stop"), do: {:ok, :stop}
   # deprecated
   def load("suicide"), do: {:ok, :selfdestruct}
   def load(_), do: :error

From 549f8ac74148a319b51cc9b7a7ecef6282a150fb Mon Sep 17 00:00:00 2001
From: Qwerty5Uiop <alex000010@bk.ru>
Date: Thu, 14 Sep 2023 18:02:28 +0300
Subject: [PATCH 411/909] Add int transaction stop changeset + tests

---
 .../lib/ethereum_jsonrpc/geth/call.ex         |  4 +-
 .../test/ethereum_jsonrpc/geth_test.exs       | 46 +++++++++++++++++++
 .../explorer/chain/internal_transaction.ex    | 11 +++++
 .../runner/internal_transactions_test.exs     | 28 +++++++++++
 .../chain/internal_transaction_test.exs       | 24 ++++++++++
 5 files changed, 112 insertions(+), 1 deletion(-)

diff --git a/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/geth/call.ex b/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/geth/call.ex
index 4e4eceffb5b3..c90c652db3f4 100644
--- a/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/geth/call.ex
+++ b/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/geth/call.ex
@@ -522,7 +522,8 @@ defmodule EthereumJSONRPC.Geth.Call do
          "from" => from_address_hash,
          "input" => input,
          "gas" => gas,
-         "gasUsed" => gas_used
+         "gasUsed" => gas_used,
+         "value" => value
        }) do
     %{
       block_number: block_number,
@@ -535,6 +536,7 @@ defmodule EthereumJSONRPC.Geth.Call do
       input: input,
       gas: gas,
       gas_used: gas_used,
+      value: value,
       error: "execution stopped"
     }
   end
diff --git a/apps/ethereum_jsonrpc/test/ethereum_jsonrpc/geth_test.exs b/apps/ethereum_jsonrpc/test/ethereum_jsonrpc/geth_test.exs
index 0aa365b73325..9f3620039ae2 100644
--- a/apps/ethereum_jsonrpc/test/ethereum_jsonrpc/geth_test.exs
+++ b/apps/ethereum_jsonrpc/test/ethereum_jsonrpc/geth_test.exs
@@ -434,6 +434,52 @@ defmodule EthereumJSONRPC.GethTest do
       assert call_tracer_internal_txs ==
                Geth.fetch_internal_transactions([transaction_params], json_rpc_named_arguments)
     end
+
+    test "successfully handle single stop opcode from call_tracer", %{
+      json_rpc_named_arguments: json_rpc_named_arguments
+    } do
+      transaction_hash = "0xb342cafc6ac552c3be2090561453204c8784caf025ac8267320834e4cd163d96"
+      block_number = 3_287_375
+      transaction_index = 13
+
+      transaction_params = %{
+        block_number: block_number,
+        transaction_index: transaction_index,
+        hash_data: transaction_hash
+      }
+
+      expect(EthereumJSONRPC.Mox, :json_rpc, 1, fn
+        [%{id: id, params: [^transaction_hash, %{"tracer" => "callTracer"}]}], _ ->
+          {:ok,
+           [
+             %{
+               id: id,
+               result: %{
+                 "type" => "STOP",
+                 "from" => "0x0000000000000000000000000000000000000000",
+                 "value" => "0x0",
+                 "gas" => "0x0",
+                 "gasUsed" => "0x5842"
+               }
+             }
+           ]}
+      end)
+
+      assert {:ok,
+              [
+                %{
+                  block_number: 3_287_375,
+                  error: "execution stopped",
+                  from_address_hash: "0x0000000000000000000000000000000000000000",
+                  input: "0x",
+                  trace_address: [],
+                  transaction_hash: "0xb342cafc6ac552c3be2090561453204c8784caf025ac8267320834e4cd163d96",
+                  transaction_index: 13,
+                  type: "stop",
+                  value: 0
+                }
+              ]} = Geth.fetch_internal_transactions([transaction_params], json_rpc_named_arguments)
+    end
   end
 
   describe "fetch_block_internal_transactions/1" do
diff --git a/apps/explorer/lib/explorer/chain/internal_transaction.ex b/apps/explorer/lib/explorer/chain/internal_transaction.ex
index 2d0c6ae2da02..b3669442eaed 100644
--- a/apps/explorer/lib/explorer/chain/internal_transaction.ex
+++ b/apps/explorer/lib/explorer/chain/internal_transaction.ex
@@ -473,6 +473,17 @@ defmodule Explorer.Chain.InternalTransaction do
     |> unique_constraint(:index)
   end
 
+  @stop_optional_fields ~w(from_address_hash gas gas_used error)a
+  @stop_required_fields ~w(block_number transaction_hash transaction_index index type value)a
+  @stop_allowed_fields @stop_optional_fields ++ @stop_required_fields
+
+  defp type_changeset(changeset, attrs, :stop) do
+    changeset
+    |> cast(attrs, @stop_allowed_fields)
+    |> validate_required(@stop_required_fields)
+    |> unique_constraint(:index)
+  end
+
   defp type_changeset(changeset, _, nil), do: changeset
 
   defp validate_disallowed(changeset, field, named_arguments) when is_atom(field) do
diff --git a/apps/explorer/test/explorer/chain/import/runner/internal_transactions_test.exs b/apps/explorer/test/explorer/chain/import/runner/internal_transactions_test.exs
index caf219b42983..033c2b8cab3b 100644
--- a/apps/explorer/test/explorer/chain/import/runner/internal_transactions_test.exs
+++ b/apps/explorer/test/explorer/chain/import/runner/internal_transactions_test.exs
@@ -329,6 +329,34 @@ defmodule Explorer.Chain.Import.Runner.InternalTransactionsTest do
       assert %{consensus: true} = Repo.get(Block, full_block.hash)
       assert PendingBlockOperation |> Repo.get(full_block.hash) |> is_nil()
     end
+
+    test "successfully imports internal transaction with stop type" do
+      block = insert(:block)
+      transaction = insert(:transaction) |> with_block(block, status: :ok)
+      insert(:pending_block_operation, block_hash: transaction.block_hash, block_number: transaction.block_number)
+
+      assert :ok == transaction.status
+
+      {:ok, from_address_hash} = Explorer.Chain.Hash.Address.cast("0x0000000000000000000000000000000000000000")
+      {:ok, input} = Explorer.Chain.Data.cast("0x")
+
+      internal_transaction_changes = %{
+        block_number: block.number,
+        error: "execution stopped",
+        from_address_hash: from_address_hash,
+        gas: 0,
+        gas_used: 22594,
+        index: 0,
+        input: input,
+        trace_address: [],
+        transaction_hash: transaction.hash,
+        transaction_index: 0,
+        type: :stop,
+        value: Wei.from(Decimal.new(0), :wei)
+      }
+
+      assert {:ok, _} = run_internal_transactions([internal_transaction_changes])
+    end
   end
 
   defp run_internal_transactions(changes_list, multi \\ Multi.new()) when is_list(changes_list) do
diff --git a/apps/explorer/test/explorer/chain/internal_transaction_test.exs b/apps/explorer/test/explorer/chain/internal_transaction_test.exs
index 54a1b9f5b164..96b66e9b7e2d 100644
--- a/apps/explorer/test/explorer/chain/internal_transaction_test.exs
+++ b/apps/explorer/test/explorer/chain/internal_transaction_test.exs
@@ -58,6 +58,30 @@ defmodule Explorer.Chain.InternalTransactionTest do
 
       assert Repo.insert(changeset)
     end
+
+    test "with stop type" do
+      transaction = insert(:transaction)
+
+      changeset =
+        InternalTransaction.changeset(%InternalTransaction{}, %{
+          from_address_hash: "0x0000000000000000000000000000000000000000",
+          gas: 0,
+          gas_used: 22234,
+          index: 0,
+          input: "0x",
+          trace_address: [],
+          transaction_hash: transaction.hash,
+          transaction_index: 0,
+          type: "stop",
+          error: "execution stopped",
+          value: 0,
+          block_number: 35,
+          block_hash: "0xf6b4b8c88df3ebd252ec476328334dc026cf66606a84fb769b3d3cbccc8471bd",
+          block_index: 0
+        })
+
+      assert changeset.valid?
+    end
   end
 
   defp call_type(opts) do

From 47918c3f42fe9c59cfabfbdb27f1a1db2c58c71e Mon Sep 17 00:00:00 2001
From: Qwerty5Uiop <alex000010@bk.ru>
Date: Thu, 14 Sep 2023 19:29:25 +0300
Subject: [PATCH 412/909] Add trace_address to stop changeset

---
 apps/explorer/lib/explorer/chain/internal_transaction.ex | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/explorer/lib/explorer/chain/internal_transaction.ex b/apps/explorer/lib/explorer/chain/internal_transaction.ex
index b3669442eaed..c86bfa699f53 100644
--- a/apps/explorer/lib/explorer/chain/internal_transaction.ex
+++ b/apps/explorer/lib/explorer/chain/internal_transaction.ex
@@ -474,7 +474,7 @@ defmodule Explorer.Chain.InternalTransaction do
   end
 
   @stop_optional_fields ~w(from_address_hash gas gas_used error)a
-  @stop_required_fields ~w(block_number transaction_hash transaction_index index type value)a
+  @stop_required_fields ~w(block_number transaction_hash transaction_index index type value trace_address)a
   @stop_allowed_fields @stop_optional_fields ++ @stop_required_fields
 
   defp type_changeset(changeset, attrs, :stop) do

From d84c1dc282fe3105e90280b1b50e51e1d3a1bd92 Mon Sep 17 00:00:00 2001
From: Qwerty5Uiop <alex000010@bk.ru>
Date: Tue, 12 Sep 2023 14:20:31 +0300
Subject: [PATCH 413/909] Fix reorg transactions

---
 CHANGELOG.md                                  |  1 +
 .../explorer/chain/import/runner/blocks.ex    |  3 ++
 .../chain/import/runner/transactions.ex       | 30 +++++++++++++
 .../chain/import/runner/transactions_test.exs | 43 ++++++++++++++++++-
 4 files changed, 76 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 53e412b9e78f..d7ed81f662cd 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -27,6 +27,7 @@
 - [#8355](https://github.com/blockscout/blockscout/pull/8355) - Fix current token balances redefining
 - [#8338](https://github.com/blockscout/blockscout/pull/8338) - Fix reorgs query
 - [#8413](https://github.com/blockscout/blockscout/pull/8413) - Put error in last call for STOP opcode
+- [#8447](https://github.com/blockscout/blockscout/pull/8447) - Fix reorg transactions
 
 ### Chore
 
diff --git a/apps/explorer/lib/explorer/chain/import/runner/blocks.ex b/apps/explorer/lib/explorer/chain/import/runner/blocks.ex
index adc1106be2c3..ea533119015e 100644
--- a/apps/explorer/lib/explorer/chain/import/runner/blocks.ex
+++ b/apps/explorer/lib/explorer/chain/import/runner/blocks.ex
@@ -226,6 +226,9 @@ defmodule Explorer.Chain.Import.Runner.Blocks do
             index: nil,
             status: nil,
             error: nil,
+            max_priority_fee_per_gas: nil,
+            max_fee_per_gas: nil,
+            type: nil,
             updated_at: ^updated_at
           ]
         ],
diff --git a/apps/explorer/lib/explorer/chain/import/runner/transactions.ex b/apps/explorer/lib/explorer/chain/import/runner/transactions.ex
index 53624f199219..65eeba1f2ddb 100644
--- a/apps/explorer/lib/explorer/chain/import/runner/transactions.ex
+++ b/apps/explorer/lib/explorer/chain/import/runner/transactions.ex
@@ -218,6 +218,29 @@ defmodule Explorer.Chain.Import.Runner.Transactions do
           lock: "FOR NO KEY UPDATE"
         )
 
+      transactions_query =
+        from(
+          transaction in Transaction,
+          where: transaction.block_hash in ^block_hashes,
+          # Enforce Transaction ShareLocks order (see docs: sharelocks.md)
+          order_by: [asc: :hash],
+          lock: "FOR NO KEY UPDATE"
+        )
+
+      transactions_replacements = [
+        block_hash: nil,
+        block_number: nil,
+        gas_used: nil,
+        cumulative_gas_used: nil,
+        index: nil,
+        status: nil,
+        error: nil,
+        max_priority_fee_per_gas: nil,
+        max_fee_per_gas: nil,
+        type: nil,
+        updated_at: updated_at
+      ]
+
       try do
         {_, result} =
           repo.update_all(
@@ -226,6 +249,13 @@ defmodule Explorer.Chain.Import.Runner.Transactions do
             timeout: timeout
           )
 
+        {_, _transactions_result} =
+          repo.update_all(
+            from(t in Transaction, join: s in subquery(transactions_query), on: t.hash == s.hash),
+            [set: transactions_replacements],
+            timeout: timeout
+          )
+
         MissingRangesManipulator.add_ranges_by_block_numbers(result)
 
         {:ok, result}
diff --git a/apps/explorer/test/explorer/chain/import/runner/transactions_test.exs b/apps/explorer/test/explorer/chain/import/runner/transactions_test.exs
index 2bfea8750b0f..a6ab5af0a21e 100644
--- a/apps/explorer/test/explorer/chain/import/runner/transactions_test.exs
+++ b/apps/explorer/test/explorer/chain/import/runner/transactions_test.exs
@@ -2,7 +2,7 @@ defmodule Explorer.Chain.Import.Runner.TransactionsTest do
   use Explorer.DataCase
 
   alias Ecto.Multi
-  alias Explorer.Chain.{Address, Transaction}
+  alias Explorer.Chain.{Address, Block, Transaction}
   alias Explorer.Chain.Import.Runner.Transactions
 
   describe "run/1" do
@@ -37,6 +37,47 @@ defmodule Explorer.Chain.Import.Runner.TransactionsTest do
 
       assert is_nil(Repo.get(Transaction, transaction.hash).created_contract_code_indexed_at)
     end
+
+    test "recollated transactions replaced with empty data" do
+      reorg = insert(:block)
+      reorg_transaction = :transaction |> insert() |> with_block(reorg)
+      transaction = :transaction |> insert() |> with_block(reorg)
+      reorg |> Block.changeset(%{consensus: false}) |> Repo.update()
+      block = insert(:block, consensus: true, number: reorg.number)
+
+      transaction_params = %{
+        block_hash: block.hash,
+        block_number: block.number,
+        gas_used: transaction.gas_used,
+        cumulative_gas_used: transaction.cumulative_gas_used,
+        index: transaction.index,
+        from_address_hash: transaction.from_address.hash,
+        gas: transaction.gas,
+        gas_price: transaction.gas_price,
+        hash: transaction.hash,
+        input: transaction.input,
+        nonce: transaction.nonce,
+        r: transaction.r,
+        s: transaction.s,
+        to_address_hash: transaction.to_address.hash,
+        v: transaction.v,
+        value: transaction.value
+      }
+
+      assert {:ok, _} = run_transactions([transaction_params])
+
+      assert %{
+               block_hash: nil,
+               block_number: nil,
+               gas_used: nil,
+               cumulative_gas_used: nil,
+               index: nil,
+               status: nil,
+               error: nil
+             } = Repo.get_by(Transaction, hash: reorg_transaction.hash)
+
+      assert not is_nil(Repo.get_by(Transaction, hash: transaction.hash).block_hash)
+    end
   end
 
   defp run_transactions(changes_list) when is_list(changes_list) do

From e30a9a6467a971b500fb53949423aacd65aeca43 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 15 Sep 2023 18:08:55 +0000
Subject: [PATCH 414/909] Bump url from 0.11.2 to 0.11.3 in
 /apps/block_scout_web/assets

Bumps [url](https://github.com/defunctzombie/node-url) from 0.11.2 to 0.11.3.
- [Commits](https://github.com/defunctzombie/node-url/compare/v0.11.2...v0.11.3)

---
updated-dependencies:
- dependency-name: url
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 apps/block_scout_web/assets/package-lock.json | 14 +++++++-------
 apps/block_scout_web/assets/package.json      |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/apps/block_scout_web/assets/package-lock.json b/apps/block_scout_web/assets/package-lock.json
index eba3a41493c0..e0c634a9ddf3 100644
--- a/apps/block_scout_web/assets/package-lock.json
+++ b/apps/block_scout_web/assets/package-lock.json
@@ -63,7 +63,7 @@
         "stream-http": "^3.1.1",
         "sweetalert2": "^11.7.28",
         "urijs": "^1.19.11",
-        "url": "^0.11.2",
+        "url": "^0.11.3",
         "util": "^0.12.5",
         "viewerjs": "^1.11.5",
         "web3": "^1.10.0",
@@ -16491,9 +16491,9 @@
       "integrity": "sha512-HXgFDgDommxn5/bIv0cnQZsPhHDA90NPHD6+c/v21U5+Sx5hoP8+dP9IZXBU1gIfvdRfhG8cel9QNPeionfcCQ=="
     },
     "node_modules/url": {
-      "version": "0.11.2",
-      "resolved": "https://registry.npmjs.org/url/-/url-0.11.2.tgz",
-      "integrity": "sha512-7yIgNnrST44S7PJ5+jXbdIupfU1nWUdQJBFBeJRclPXiWgCvrSq5Frw8lr/i//n5sqDfzoKmBymMS81l4U/7cg==",
+      "version": "0.11.3",
+      "resolved": "https://registry.npmjs.org/url/-/url-0.11.3.tgz",
+      "integrity": "sha512-6hxOLGfZASQK/cijlZnZJTq8OXAkt/3YGfQX45vvMYXpZoo8NdWZcY73K108Jf759lS1Bv/8wXnHDTSz17dSRw==",
       "dependencies": {
         "punycode": "^1.4.1",
         "qs": "^6.11.2"
@@ -30010,9 +30010,9 @@
       "integrity": "sha512-HXgFDgDommxn5/bIv0cnQZsPhHDA90NPHD6+c/v21U5+Sx5hoP8+dP9IZXBU1gIfvdRfhG8cel9QNPeionfcCQ=="
     },
     "url": {
-      "version": "0.11.2",
-      "resolved": "https://registry.npmjs.org/url/-/url-0.11.2.tgz",
-      "integrity": "sha512-7yIgNnrST44S7PJ5+jXbdIupfU1nWUdQJBFBeJRclPXiWgCvrSq5Frw8lr/i//n5sqDfzoKmBymMS81l4U/7cg==",
+      "version": "0.11.3",
+      "resolved": "https://registry.npmjs.org/url/-/url-0.11.3.tgz",
+      "integrity": "sha512-6hxOLGfZASQK/cijlZnZJTq8OXAkt/3YGfQX45vvMYXpZoo8NdWZcY73K108Jf759lS1Bv/8wXnHDTSz17dSRw==",
       "requires": {
         "punycode": "^1.4.1",
         "qs": "^6.11.2"
diff --git a/apps/block_scout_web/assets/package.json b/apps/block_scout_web/assets/package.json
index 418843654611..9cebd2eb8507 100644
--- a/apps/block_scout_web/assets/package.json
+++ b/apps/block_scout_web/assets/package.json
@@ -75,7 +75,7 @@
     "stream-http": "^3.1.1",
     "sweetalert2": "^11.7.28",
     "urijs": "^1.19.11",
-    "url": "^0.11.2",
+    "url": "^0.11.3",
     "util": "^0.12.5",
     "viewerjs": "^1.11.5",
     "web3": "^1.10.0",

From 1d6da1b305747b8fe6c4749a5d0deed3b8dc4f05 Mon Sep 17 00:00:00 2001
From: Viktor Baranov <baranov.viktor.27@gmail.com>
Date: Mon, 18 Sep 2023 19:23:55 +0300
Subject: [PATCH 415/909] Set integration with Blockscout eth bytecode DB
 endpoint by default, replace old UI with new one in docker-compose configs,
 set default value for port: 4000

---
 .dockerignore                                 |   3 +
 .tool-versions                                |   4 +-
 CHANGELOG.md                                  |   1 +
 .../lib/explorer/repo/config_helper.ex        |  11 +
 config/runtime.exs                            |   4 +-
 config/runtime/dev.exs                        |  11 +-
 config/runtime/prod.exs                       |   6 +-
 deploy/testing/eth-goerli/.sops.yaml          |   6 -
 deploy/testing/eth-goerli/secrets.yaml        | 158 -------
 deploy/testing/eth-goerli/values.yaml         | 436 ------------------
 docker-compose/README.md                      |  15 +-
 .../docker-compose-no-build-erigon.yml        |  13 +-
 ...cker-compose-no-build-external-backend.yml |   5 -
 ...ker-compose-no-build-external-frontend.yml |  13 +-
 .../docker-compose-no-build-frontend.yml      |  92 ----
 .../docker-compose-no-build-ganache.yml       |  42 +-
 ...compose-no-build-geth-clique-consensus.yml |  43 +-
 .../docker-compose-no-build-geth.yml          |  43 +-
 ...ocker-compose-no-build-hardhat-network.yml |  42 +-
 .../docker-compose-no-build-nethermind.yml    |  43 +-
 ...ocker-compose-no-build-no-db-container.yml |  43 +-
 .../docker-compose-no-rust-services.yml       |  49 --
 docker-compose/docker-compose.yml             |  47 +-
 docker-compose/envs/common-blockscout.env     |   9 +-
 docker/Dockerfile                             |  12 +-
 docker/Makefile                               |   4 +-
 26 files changed, 276 insertions(+), 879 deletions(-)
 delete mode 100644 deploy/testing/eth-goerli/.sops.yaml
 delete mode 100644 deploy/testing/eth-goerli/secrets.yaml
 delete mode 100644 deploy/testing/eth-goerli/values.yaml
 delete mode 100644 docker-compose/docker-compose-no-build-frontend.yml
 delete mode 100644 docker-compose/docker-compose-no-rust-services.yml

diff --git a/.dockerignore b/.dockerignore
index b52edd4f4769..8ff38c4786c6 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -5,5 +5,8 @@ apps/explorer/node_modules
 test
 .git
 .circleci
+.vscode
+.elixir_ls
+erl_crash.dump
 logs
 apps/*/test
diff --git a/.tool-versions b/.tool-versions
index 45a68c2a12b2..13dabe9920d1 100644
--- a/.tool-versions
+++ b/.tool-versions
@@ -1,3 +1,3 @@
 elixir 1.14.5-otp-25
-erlang 25.3.2.3
-nodejs 18.16.1
+erlang 25.3.2.6
+nodejs 18.17.1
diff --git a/CHANGELOG.md b/CHANGELOG.md
index d7ed81f662cd..3206c76823dd 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -31,6 +31,7 @@
 
 ### Chore
 
+- [#8478](https://github.com/blockscout/blockscout/pull/8478) - Set integration with Blockscout's eth bytecode DB endpoint by default and other enhancements
 - [#8442](https://github.com/blockscout/blockscout/pull/8442) - Unify burn address definition
 - [#8321](https://github.com/blockscout/blockscout/pull/8321) - Add curl into resulting Docker image
 - [#8319](https://github.com/blockscout/blockscout/pull/8319) - Add MIX_ENV: 'prod' to docker-compose
diff --git a/apps/explorer/lib/explorer/repo/config_helper.ex b/apps/explorer/lib/explorer/repo/config_helper.ex
index d8ccf1800814..e269bbd77aaf 100644
--- a/apps/explorer/lib/explorer/repo/config_helper.ex
+++ b/apps/explorer/lib/explorer/repo/config_helper.ex
@@ -58,6 +58,17 @@ defmodule Explorer.Repo.ConfigHelper do
     path_from_env(path)
   end
 
+  @doc """
+  Defines http port of the application
+  """
+  @spec get_port() :: non_neg_integer()
+  def get_port do
+    case System.get_env("PORT") && Integer.parse(System.get_env("PORT")) do
+      {port, _} -> port
+      _ -> 4000
+    end
+  end
+
   defp path_from_env(path_env_var) do
     if String.ends_with?(path_env_var, "/") do
       path_env_var
diff --git a/config/runtime.exs b/config/runtime.exs
index d8cb3b4a80c4..85434f343f36 100644
--- a/config/runtime.exs
+++ b/config/runtime.exs
@@ -353,10 +353,10 @@ config :explorer, Explorer.ThirdPartyIntegrations.Sourcify,
   repo_url: System.get_env("SOURCIFY_REPO_URL") || "https://repo.sourcify.dev/contracts"
 
 config :explorer, Explorer.SmartContract.RustVerifierInterfaceBehaviour,
-  service_url: System.get_env("MICROSERVICE_SC_VERIFIER_URL"),
+  service_url: System.get_env("MICROSERVICE_SC_VERIFIER_URL") || "https://eth-bytecode-db.services.blockscout.com/",
   enabled: ConfigHelper.parse_bool_env_var("MICROSERVICE_SC_VERIFIER_ENABLED"),
   # or "eth_bytecode_db"
-  type: System.get_env("MICROSERVICE_SC_VERIFIER_TYPE", "sc_verifier")
+  type: System.get_env("MICROSERVICE_SC_VERIFIER_TYPE", "eth_bytecode_db")
 
 config :explorer, Explorer.Visualize.Sol2uml,
   service_url: System.get_env("MICROSERVICE_VISUALIZE_SOL2UML_URL"),
diff --git a/config/runtime/dev.exs b/config/runtime/dev.exs
index 853a30bd1836..3edc8c239fb6 100644
--- a/config/runtime/dev.exs
+++ b/config/runtime/dev.exs
@@ -7,25 +7,20 @@ alias Explorer.Repo.ConfigHelper, as: ExplorerConfigHelper
 ### BlockScout Web ###
 ######################
 
-port =
-  case System.get_env("PORT") && Integer.parse(System.get_env("PORT")) do
-    {port, _} -> port
-    :error -> nil
-    nil -> nil
-  end
+port = ExplorerConfigHelper.get_port()
 
 config :block_scout_web, BlockScoutWeb.Endpoint,
   secret_key_base:
     System.get_env("SECRET_KEY_BASE") || "RMgI4C1HSkxsEjdhtGMfwAHfyT6CKWXOgzCboJflfSm4jeAlic52io05KB6mqzc5",
   http: [
-    port: port || 4000
+    port: port
   ],
   url: [
     scheme: "http",
     host: System.get_env("BLOCKSCOUT_HOST", "localhost")
   ],
   https: [
-    port: (port && port + 1) || 4001,
+    port: port + 1,
     cipher_suite: :strong,
     certfile: System.get_env("CERTFILE") || "priv/cert/selfsigned.pem",
     keyfile: System.get_env("KEYFILE") || "priv/cert/selfsigned_key.pem"
diff --git a/config/runtime/prod.exs b/config/runtime/prod.exs
index 640f34ed0be0..8b65aff1124a 100644
--- a/config/runtime/prod.exs
+++ b/config/runtime/prod.exs
@@ -7,13 +7,15 @@ alias Explorer.Repo.ConfigHelper, as: ExplorerConfigHelper
 ### BlockScout Web ###
 ######################
 
+port = ExplorerConfigHelper.get_port()
+
 config :block_scout_web, BlockScoutWeb.Endpoint,
   secret_key_base: System.get_env("SECRET_KEY_BASE"),
   check_origin: System.get_env("CHECK_ORIGIN", "false") == "true" || false,
-  http: [port: System.get_env("PORT")],
+  http: [port: port],
   url: [
     scheme: System.get_env("BLOCKSCOUT_PROTOCOL") || "https",
-    port: System.get_env("PORT"),
+    port: port,
     host: System.get_env("BLOCKSCOUT_HOST") || "localhost"
   ]
 
diff --git a/deploy/testing/eth-goerli/.sops.yaml b/deploy/testing/eth-goerli/.sops.yaml
deleted file mode 100644
index ca70dd5af411..000000000000
--- a/deploy/testing/eth-goerli/.sops.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-
----
-creation_rules:
-  - path_regex: ^(.+/)?secrets\.yaml$
-    pgp: >-
-      99E83B7490B1A9F51781E6055317CE0D5CE1230B
diff --git a/deploy/testing/eth-goerli/secrets.yaml b/deploy/testing/eth-goerli/secrets.yaml
deleted file mode 100644
index 05f1a27ff179..000000000000
--- a/deploy/testing/eth-goerli/secrets.yaml
+++ /dev/null
@@ -1,158 +0,0 @@
-blockscout:
-    ingress:
-        host:
-            _default: ENC[AES256_GCM,data:vqpMhSKV74ITG50wZ/pjfqQSDb4QpNCqX4kTmhb52u63dZZVFuPSlHQ6K11LSA==,iv:BNJhX9oX7Bdz+ZsdqxoQi5Qg4V5KTm9etGAzUBtVEAI=,tag:772dB//F331xZ+WICgbZ4A==,type:str]
-    environment:
-        ETHEREUM_JSONRPC_TRACE_URL:
-            _default: ENC[AES256_GCM,data:Gxei79q5mOdbCQXv7k/9QNpw8lrJJ2C3kQ==,iv:jgAtB+YY0xp7GbbzUkqKLMVhnCBpfOYop5oxgstTCQw=,tag:yY21Yi7Ie7S0f3KHa7pSIw==,type:str]
-        ETHEREUM_JSONRPC_HTTP_URL:
-            _default: ENC[AES256_GCM,data:MLJ3HsljmSFFbeKrW/+3HJoSLxu0tE7izw==,iv:vpK/M+Zdx8U2IVRa+cD3UFPpsQG4CBxfNO72I9JkbyA=,tag:Pelx5iRxmoB2ZiTIj+5FNA==,type:str]
-        MICROSERVICE_SC_VERIFIER_URL:
-            _default: ENC[AES256_GCM,data:PcrMP4zuXRjObBj1JI+hDE6fyhMhzseFag==,iv:J6dtGXi7yGxiPqi8Hk6/64BgsaMuU445woZnQUrZLRA=,tag:3Mejc4O3xAhsWruW+ocdbg==,type:str]
-        MICROSERVICE_VISUALIZE_SOL2UML_URL:
-            _default: ENC[AES256_GCM,data:MR7hsQ3ut8aPGW7O6L6Ghs8Bielnaqx+,iv:y6cnGKRv41CTWSAi1YbHdTJ3bEIV0PObmfpuz2LUAB8=,tag:iEljIcZVuxd+U/GD1K1CUQ==,type:str]
-        MICROSERVICE_SIG_PROVIDER_URL:
-            _default: ENC[AES256_GCM,data:RLmbcciVU8fMGQWUa2GKXjmPFCTdmYHJTrNg,iv:Hu3BiKiiK1mGLEaKeiR5v9kq5doed9UKpQXdiq7J3wY=,tag:O6Ra/oe6EW8BTff0HfLJ6w==,type:str]
-        BLOCKSCOUT_HOST:
-            _default: ENC[AES256_GCM,data:beCEVQcGu7YJ3FHGqYJDD65hMdboDTSpnsrXgwm6cIRihukdvcdVmzsYnjOuGg==,iv:U/ZrjGQmMhnP/oLbSZ7xMJlZNl+5XxI8qjbPJthB7Kk=,tag:r9MKtOT7cT5WDT+dQ/gW8w==,type:str]
-        JSON_RPC:
-            _default: ENC[AES256_GCM,data:MIGBVQ/zNmnHLuVJHDQmOZfvn5IEJKcSwRE/XAVdNg==,iv:n/XDYMMuIYvPIDd8E0srRVdOmsAnZxsvb0HmoCxBAUk=,tag:JuF1Dtd1G3O0dM3hwu7sZw==,type:str]
-        GRAPHIQL_TRANSACTION:
-            _default: ENC[AES256_GCM,data:ZXaGdfqEhGbPSgKEJEd/5C+n2kScv0lnvFaqbBdIp73/XbHEN28ROl6phqybrMc9kEoghLOh5WjwD3S/hHybIz2B,iv:0+GGcyGyj2q0dev2Ra4/HD+6xY5/x0KJOfBwe2hf4vk=,tag:ElGSQnegLDJNTuHNxtsrxw==,type:str]
-        SUPPORTED_CHAINS:
-            _default: ENC[AES256_GCM,data:0MB1opTgRIWOdHsAy+ZYSUnqi1jG2K6IFvCRsJza5oY6ElptvmU7prPqclmBB9keG8y6gA3clhcnLvy/nDcDEManI+S5EUgMr3U7g+1mY+VpJWRWNx398MINmk4bwHZD8ZKEaaqnXuDdRwryVZyqbj7lITj5NCBj9PVnQnv/Kaxz2cj6MpyofZpiVzEheA7Q6BL8jw/Vd8s7dxQg7bJBD/s8tTnaAqoK181iPK80zQrEn5LlMAm4DQBMGb4rmSfVjfryJu6ihzTba7GLrBossY/Nm53URylvNmG6m3RXSaLKtu8pN6NAxP2W/IjQ11erEte4mxFe1mcXxs8kNxD6fOtrtNcmq49EcSJSwrlAHp4wY07UWxTgmCeiD8N/gZONeX6FCaA+jZjzdrNYSfdGPDYlBnXqG4+jH0WHJuaFtyFfgvvadQRfIT4HyfcuJb7Ew0lQ/iytldnWfSBfCNt8pe5W2uEJ4Tak6dKMrrb3Kw1GMClKwL1oYTRoG6RVGltYwU3+B+4V4eD+lTHFxAeDdJf2fNHLqWqiiDCYvliKHv71ZzaQabvoIzMjk5jXS5qaqyuUnkr192FxJXySjdp2cNXKsafHdJnrG2n7CFBIt+etybXhYLD3/Lrcyjc8nHOEIsRhw50t+UZyxMyInBjaFSVlu2EghHkDg3r3lKZ5xJil6jdQxmvMgiH5qkQnwhzUKECEWTZiNx1jrhA0QUQ1ujCMZ2uyxJJBAW76qgnAgbsyaTEGIsYJk5wvZx0UTfTI+909o/kW1c5SEtESi3t/t9VaVdj325a7UuBgCWjuwpGnXKS6VMOcO6VRvY4BqTbNHm+/h5W/ZK/qft956eyO6e5KRKRPCgEmC2JA5CtFQQLYLRZwMr0r+4piI5u9rgJKF0PLYVldMA8H0rUUWNuF7DOi+F+sMGD56VH6Y39bQN7FFhVuGWb1c7cZYAXWwu+zRpPl7eCrxIcRO5zakKs8IDFFOWJmWkUmOcQZZzLqb9ROpQhucbyd8Ec9MXN2H3WDWaeX5Hz32ULGjjvgDUR3A02a9Dyv5IL7vlwCm7Fdr5uqqHJvMWN6UfV3nGOhCwWKMM8+Yvlp8BTcIN+HamwKHK06jdhZB7MmIPnZoH38AKxHCJq+1Mia3pPyb1OUp58XlK0ES7RtL6V5vsBEv4mu8CXtIfvXYHoC,iv:UvpB4xqK31vEtjAaLXAr4tyW82FSF0dRx3sHn5GzJXo=,tag:aAm88WRWD4s/8Yn/S8kzNw==,type:str]
-        DATABASE_URL:
-            _default: ENC[AES256_GCM,data:cB7mpaqYiuhpwie5VxWSyA0/tk5sNIdnE8Gu6+qBOBwoOXb/hixk6xDcfuz4iV3kDsJpcH/v2MnXzojDtX3o0yg=,iv:AfMtEniYnX8vJsYV7yoO66F6/BToeffxENbS0QcXIuM=,tag:mHP/8Mt1e3gM/o+5XmCz+A==,type:str]
-        ACCOUNT_DATABASE_URL:
-            _default: ENC[AES256_GCM,data:3T22+sjT4jklfigR2cCvwdrLLi1EmK5sMFeoLmw/Eu4mmFjZ9Ln67O5Wmw8zDrUM0KFdJuf4x7AdIbFTWcXPyZbXaWEUbBG4YQ==,iv:uodCjhbCiIZhPdO1eG2tCrxZwAyuzpcDZaerNb8CKhE=,tag:0AJ9wlcX+iycqQa3xfY1LQ==,type:str]
-        SECRET_KEY_BASE:
-            _default: ENC[AES256_GCM,data:PL8RKVSFqHtvoJzrAoo+F4Rdij391hUeK1FQQ+W5h4Xeq1+TJZzqD78cJufBQgvmn0/5IcDIwfg4kT+oPpqzbg==,iv:9HF7xAe8EyECkmEIIUrk8gNFfAb37m1ZX0U0/dWF7Oc=,tag:xvQIbKcEPXjKWJwG7BIIYw==,type:str]
-        RE_CAPTCHA_SECRET_KEY:
-            _default: ENC[AES256_GCM,data:WeroF56dG3/j7jahdwdWblQYPbQKcjffiGR8Lo5zZhA+4VZeWsLXYg==,iv:IkA2SQOJsb4T03KS+ax6NrofqifUzEKdWNQSTjeAsXM=,tag:t+PM0gLlaPRxmndDnRxNDg==,type:str]
-        RE_CAPTCHA_CLIENT_KEY:
-            _default: ENC[AES256_GCM,data:EmyO1sEvSxmNzSiUtl7OOy01h3FjquV16e7XGCGEdfktyBqgJ9XLzQ==,iv:mv3X1rC8kzUpaB4NHKbIEeKmuKimoA+d9e5liDou1A8=,tag:qVYjd7z6ilzrwUzQd3rYeg==,type:str]
-        ACCOUNT_AUTH0_DOMAIN:
-            _default: ENC[AES256_GCM,data:3twuloplIcvXb3eRcYWGC2Fg18zauwD8vxLKWjFa,iv:Cy8nMO79hXv7RGSoszNEXd4L8ZQfs6Tj0VtOtKImWgI=,tag:Y5Yv66V2pvA4NEWwkhKXGg==,type:str]
-        ACCOUNT_AUTH0_CLIENT_ID:
-            _default: ENC[AES256_GCM,data:d9/TFO0DcXBNy1b51vXe0y/VbUpyyWdTfoAO5/yM6pQ=,iv:J7tWz7DQEIXm5+JNxEVRjhabnaE6eHW3uze+HDgm9r8=,tag:6R9sqmkVUL2Sy6kLdFsajA==,type:str]
-        ACCOUNT_AUTH0_CLIENT_SECRET:
-            _default: ENC[AES256_GCM,data:+amaFFZYsjSK5CUmJuoDioStwPO/VM1NfPwVil5wLkR2sgBKUnLOd04dn9PYdvFXQ87f0OwH13NwSppKPlx3PA==,iv:fWMO6a7xtq4/OBMIo6rIHZMpuoNPbsYKiEu7lfs10XY=,tag:YXsYNKkbwT1C6tYRpni/rA==,type:str]
-        ACCOUNT_SENDGRID_API_KEY:
-            _default: ENC[AES256_GCM,data:wTkE2ISxbX2gpObQibxl4wH7FrKtZ2eflbVaVUsImnO6kP2XRDVaKXwqaoKkzE8hztWYOpxwMcvbF7B5tjNrWgarMvFi,iv:ngGupc1U9wOu2FKPP8QacO4NmgjH84PLyf2sjwZ0yQ8=,tag:BJr7RvrrrBZMF3OpISan8g==,type:str]
-        ACCOUNT_SENDGRID_SENDER:
-            _default: ENC[AES256_GCM,data:rjoADYaA1apZ0pl8V+QVISc7Vhcq4w==,iv:SwOr+jdqcs9za6fLaIzicbmDv2Wgrm6iIEqBKwT1KRI=,tag:a6/0sVVymHzseIGppbLY/w==,type:str]
-        ACCOUNT_SENDGRID_TEMPLATE:
-            _default: ENC[AES256_GCM,data:JrF6kgqfmvjRJAJEj153w2QobWIbLFxcL+C3j5sfbAl7sg==,iv:F2BILGqbtIHsgwibRgWgV0RFbjZygamO0iRFKZjHYFU=,tag:CR9gxOo98vuiEi+2FY3jBg==,type:str]
-        ACCOUNT_PUBLIC_TAGS_AIRTABLE_URL:
-            _default: ENC[AES256_GCM,data:7PH2IDS2r7HTF8Y5fW/GvNk0ywY4ZGcu/vANV5t+J1yMj4LAuAzfb1GntnsJDgHsLvqx6fwqbDTwiOb2mwxEGQ==,iv:KscvT5H4AHsuSgk7fRp++kYaQHx/SiDk+zgqb0P0oMQ=,tag:SG1fiVGiWU/02p4pO75PIg==,type:str]
-        ACCOUNT_PUBLIC_TAGS_AIRTABLE_API_KEY:
-            _default: ENC[AES256_GCM,data:T+FkQRcBSFvY/FRtCx8XURk=,iv:bl3EjfKi8nRWlRR2zVWvBH97NsfFTtIFV5UsQU9WLr0=,tag:ODGU6tkZAzfPkaNFobEcDQ==,type:str]
-        ACCOUNT_CLOAK_KEY:
-            _default: ENC[AES256_GCM,data:GFYQQiw+QrMA7LaS7/sDb+YBcnbKpicGj2l4MeIoOgA0/prRMUizvwyqTQE=,iv:g580lCS6RGLUTgl4+q1g9aQQJeejX2wku6p9NbdRiVA=,tag:LNkqSkRXfxajFDAtdgnxgQ==,type:str]
-        ACCOUNT_REDIS_URL:
-            _default: ENC[AES256_GCM,data:31993QW0ae1+sRcNMICL6c23qE+lb5xCPEXVxMoi34i1FARER3/2FKn326qEEV9r7UWXk0a0jGAzZgSB/c0vnpTnrWWOU7sFU5qwiHUvu6Be,iv:TNHDJ9eerDzgbphPQmwhteJE1gGQbka3tEsopgN9D4I=,tag:Sx+OWiwlKZmpGpt7wYKkQw==,type:str]
-frontend:
-    ingress:
-        host:
-            _default: ENC[AES256_GCM,data:AVrEvMPJWBhhUsDNphev65DWAr8FT3+itC/0o5oF6dj+NYmbaWfRmlWvJ8+hXA==,iv:H8+uxy6IspImxbSSx+M8QFjoZfVtp48EuoGdaCaWzJk=,tag:FYv4faD+e48U3iLP9IlFdA==,type:str]
-    environment:
-        NEXT_PUBLIC_NETWORK_TOKEN_ADDRESS:
-            _default: ENC[AES256_GCM,data:UpykLbd01n2vU4YSMVh41HEGIYy6o0xhqvi9PAfNK9/b3GXyjv33FYhd,iv:+XIMuaMYhlkoN+vAy93LGKLqnKZrDhKcf8R6YihOKwA=,tag:SkdEWLEmdyvVizhqFVaERA==,type:str]
-        NEXT_PUBLIC_SENTRY_DSN:
-            _default: ENC[AES256_GCM,data:SzsCF6Yocn9Z7rkXq75PJ7BkVqRUe2j/E9EaaJFkZuk/xKJLW2YbFrl76ZS/0iQR1Ktg7NhTe2YkD5nJ4rg7ZHKNiEpp2f34b71cG3YzKaEPbvQ=,iv:bj2cq6aRu4XRW1LGV5JJUr7dqGtXErOmVFyx4/I0vOc=,tag:1cne5902pQIc988xmYZ3zQ==,type:str]
-        SENTRY_CSP_REPORT_URI:
-            _default: ENC[AES256_GCM,data:0vSZJ2ZOFMC27oHVRLCf0jkniNSQU4/TVZwx3+nAGkkO/Dm2B7Rl7UzMWYAeb+UYWQxGip+gCsani02dP+o2TKDSEwZNL1+wnzVcnk68tvFFZ7iXK53jKCoXdACT7JeWarrR+VphRFxO0urk,iv:XjkF0DB3zog6iAFW4ti04Zc7CRMJorhbjZ1WcwYuNQA=,tag:X2dUjM006P/gcJ7C6C2pxQ==,type:str]
-        NEXT_PUBLIC_AUTH0_CLIENT_ID:
-            _default: ENC[AES256_GCM,data:0ScmS+enGat+wP4cyr1AUwESRlESyIervgRizNaZIic=,iv:JXKJXXp/Vf3BUuDCcgqXtl8/jBoyYsVk0BhKuUZuGvY=,tag:1ct04cvr8X9vl3okTQz+Ow==,type:str]
-        NEXT_PUBLIC_WALLET_CONNECT_PROJECT_ID:
-            _default: ENC[AES256_GCM,data:HvD7k5vjYvlYmmqOcaq7K/omYuxbAdNxZuHhX7+1dwU=,iv:KKiujbqgxXzABRUhbN8oSjU7qdWR3u1FMrjBzJfDkkM=,tag:PfeGqmvkWE3c6trwlcwnyQ==,type:str]
-        NEXT_PUBLIC_RE_CAPTCHA_APP_SITE_KEY:
-            _default: ENC[AES256_GCM,data:lWako8QyUYRzE5Czh5SK3OMVn84XzdpCf0sZR9USO6h0bvdd9DUx7w==,iv:ZNqhl1WQZhRW7BeJdaNE3Pc5JWGttcgYuRfxBR1ObRc=,tag:RVQIMKHANIv0rDe1KEgSqA==,type:str]
-        NEXT_PUBLIC_FEATURED_NETWORKS:
-            _default: ENC[AES256_GCM,data:jvHaezRYUJeESlOpfyPrxT6tKmC02l+0cEeFffqyE12KaOIegCbAJydWadU3rCayAykQp/YEdvtJ43CVKbuP/m14M0UXP6GeqNkZrQIbNVWy6Zepx5OGr8SoAhFWxp/vEoq3XQtOTlutGC0CXtXxRqgIdgLYmM6YW8Z5Ubic/4i8tmEhK02T0V/z95hPFLY1eU6gfGO9u3xShtgieHGixNJ0ISzSJ1YvyUHt4sr5P2h2n2n+1gORT8kAbybSxD07qRMPLuNmWlHahozQDPTmbLY7z7/Kmeul5A9nt7v7ZXrJUHMzDbD+LYF2xCY1qk+Ec1/AjqBTi1xgAKZjI0TkEs8IrUeB6LVwEs0pW8gSBoHzEC8cCZ68JkfGAi9teCvIEgqSYBwz/5uxjJTgfh3bU+Ndf0obGH9+ZWUh7979I32p9g+tuHRbQRdoFrlLcDzdKZDtZbEkbqvQpQfTPRHdOxJ24LIAYaFpfnL9AF412mGFp248G+E9vRRsrgziE9yJUQ3KUuiCKYqLo9d8ircjzORHxQx4rOiwyc2zCY5WqyxiPyAZA3Z3/q1P5J1lIxamZ7Ar+re1+B/0lRLHPPMcTCiGUAq2i7jYpTtV+5RCEph5EYTcOl04n4ZGy5DcMrLIlOVbMIV8XP2acNELs0SgovNXSchaecBEgWomWhuSciZqkDQa1PvAoUI3gxy9bZyKbEx24oz9oKY6UZKNpigTsGp2tKwRBRUpLdQeAnhGwnKJqtOwEIKtfTpqdHfHrBa7fT1NjTFlNgYWUKz9Fm+JRLF7iR6VU3iRMhHcNlRd+E5LYFocN7EqJrlGCEKM2ZRHYmyAmVKwLl4BM+hhSYs3NEyGDRlZQtjyuAHd+rGrONJhDZDNFlnzaTa0y3zjkgj8+m7ohnZ9BNWi5w5htvu3uK4CTN1LAAVpV6XlnNxYjmGZPvTg7Obn1Cubg56mqpFTYSxAWPfnr+s0YacxFPyHez8MXLaNtoBLuEMZWqPHXhUhFF/MO1r6+gWt+UsYxkKEbIqu5qBbAmoXtbGuPlkkG5ikyFpae7XMoDWtPrJ8MBq8KLfzcDy+ZLwePBss7UmRY6C2vEnuMCwVoi4U+qD1fhHUDtKyCV8BH8p7MSRKqzyX7Fmz3/1sRjESAjCenV5tj2RdRaMipOgqrXxRRh7WjS7qts+NkwwVmxqlDVgkBkiTEvK4XEF30vHedPFdkgX1A/EF8Zz8im6ma+8ALanI0Vp4NavdJo6C6530yEQDcANuo+tpyJhz+9Fm/exgQjP4wVfc8BNSHspHP7b6q4qEYl3IuiyYpsahEuZd3DbmBbsH3lBFEQtcFxRR/nY7lTKVVFkIZ/Ra47JOBuOIlMo+f9kSsRYB6xk0OeL2I0wJNGV/YMtuh0U0M4jfZ72f9QvSaeVltny26o/d7YFsXpN4vGI4htBEAaVz+oDwM7MqQrKXsKxoy8teOV71Urn/YAQZ54QF3k7iXDAN3x3cQH/dSMkcAiG6P19uQ1mPuC8g9rAeTt+aYddBKdVrWm6X19pSwFS1cAengq29ES6kz+1kmgfhEU6PkWaywXsRZlXKEILJELUu/R3nzXb7zFeYOE4rCwxPAWCyASSrT5zIstS5NCddHtkg8gM2D3h1NG47SXOLK6FbULd9Blpis3gv3uKF7FPZxFCceb8di9xOZNnlNNsJbxeZtDv9eNpW5GAuydX0WECdHI5I9xKY0zmYGCX10NfgosrOEY6M/whZAZUs2LmZZVLIjYc1ZnGfvoEA0YNdhbQ8zDolB8PMPkPHb81gGhV4ZzSSwkfXRiMrM+QG9dR/pAyjAuhggmcIpLmXRcr4espKBzPf3N43VcjBbAusV3Xlu6N244yh5kHbe29eK1IZMX7BpejnK7IB1nNKUmzKG2Xn+7eDAfQihpccHyW2SD9uoGt2NdIakqUDfbdrMUa+VgnT99u0pZExqU+fs+ItbNx6KVMllgS5hcfLuHTPYxlvQRxE1vOEkjRYwxEl5uVLDlAGwQ0nYQ5Grh1b8aEI3wZQUC0XNBbH6H+HkMdPbd0pjh6ZgTPvdqkdsuJA7OQlKP91iTcDoTYijCQWtfals2lupg03xlxra6Ll9hIG2cUQQrVglAo7UkvL01Z2MJpG6XK1iS/ZD6iGfbNQlWjAHj29+Hs4LWaVY0i9yWC5v5eKwNSM6AysIQUP75aVHYo60ZOSdipAXenSynmU6d3QW4A2PvkajtI+7T5olrA58PEtn8LH/Q2PzBc8OdE78J9Zm7FlSoJSKdcSp8UYr6/DlRjQ2v+WmQ2bFitcmXnXqZ5/hf5CEtTx9vCdBwJx8hngzTBzbNo9uhsqkAEuhikD3mZber5h80BCeOLmkLwra7B+0bAFIHaDWGIeATwVJsSaKAkXCymOD0+QULU7TdbEhxXV4cJzSYYDzN66MKbnQny9e6WVgTxsOmwPaVi9HRxmzsaZKz8vj+PtPGWPbgdUoWXV0x+W,iv:JcG3LpHO9QT9P96lIbHMcA+LVMJNk0aksoWSybuBhyg=,tag:+fR/3iHP0Cp8eY2XAEV8Ng==,type:str]
-        NEXT_PUBLIC_MARKETPLACE_APP_LIST:
-            _default: ENC[AES256_GCM,data:VCKlk4zVExU7alasmSsw0De3rR55COnrvPM9QjxF9ITkkriLq5wB/9Kpw+UJof98ynJxRst3vW3mI+7iz70yLBGNhw/vuUpq78nhU4SB9nq198A6ycuKrVIKBZybKU20LZOnivzs/a0TaFkpGY8UajjkpbdBa3fFUiMtkd3sdrOjFatTJ0qppJ0vTExBWxDHZf6P+sYn7l7DEMfyCSbzPmfzOYjE3r2IHfyELJ82IjqSy1SOmaIqnyhroTlj4uCpkRblwP2sAd+p4P4K86MpboNca9Gc7/Nb9My7igRwsCo2usJb9caisk9gzr27qQUfhBjT2/NPRJqLPV1vmRbUJzvFHpHh9leqPyRieUoAL7VU7OH0BQE0mhgT2LMd9dIwrZUp3bgoWLV3/i5+aWlDeRcoXUFT6O2V40uuVeZSqehoTEk0TPG/idkRoC3VsHlKiqNXuzbNnuCywWOUeozkfUu3eGCrareRifBXP6xeuZwMKcKFwa0tWivgmnr2XTgqcExV1YuLPf4OyXws9PCRo7NlUxNwZ3dYaIYadPYF+FOaXIvqFod0LxmuI92l3bvraZxvpxXJWWMmBwTW4nqrd4Z53xYMxrV7xZrx2jqt0SXcQ+sd14jp44z7jnrJOjH+MrTjUf81DKqz0WJBozvbAOU3ILOqXJkW+fbc87pAEGPeSqv2Ia8TDlh4uU5OfOLM9xtvJXg7xvPQdsfU6b0qp6hVgg8cQojhKHYXBiB1LpCLajskMYC+zarAx2VHWqvAKDwBrkVcE0jv+C9LysVKTN0nuY70/Vg99E/DXR/dpA9cnJB1vzB/m1qTomWddbslWvwydhGTgd7qdjXEB7HrjdLSFQxLUh4DTVlCeNtXc28WMc9ma0C9JndU1hmI9IMMdIcYrRrL9ac2fzGCtLAf4ML4Pnd9YzKISqwDn3fGhs6QMyedBcJ3f12en4dQbqBpZOnUIEHm1ru8DYwCd259CQNYFybh0dVJRjcnV9P3qOqHChs+F4C3C69N8ryk1bRiewlkSypb1Hc+ITq8D6pO+5QMNGEU08T/fm+0tYPAOl0lLPJhEFdYKWDKht59oV/DY1Zqef/V2dh0DMBIyVApgWjv9Gf8KzRlwViG3peFpXOXAcCZ9f1vX77tSI6Y4A9YRNXDf9dMPa4EmqAXNSQZpRMCF0ir14hIr0LVqrdmNtl3twhiVL3dEKjc2dGOPzGpzZyBVXTzPDPClRwE2maYCwRm5++9L3nBjvgQsk4+3ztsOZzd6d6526JycD4LE04O0v1KFc6b3w7kW+VINDoRuBidL39TOdgAOo8CZR0Q2XLu6w3YYhghnU1hjmIw9cCCVod9GN6T3HMCsshNc6Uh9xYCLaJM24VYHdYprPH+mEllNdWTPtlF6olksKcgXmE8E0yMsilash9xE2yCxp0kPEOqBqkxgOqumfd2jHNCRr4JfQ1/ZVEukli6NVk/ouLL10KnwL7noSioJpM3RsDSPntWCQCY/vN9wB5ZK7m01u8dZiT/HJ+HE11cmmHQ80Fmgzq6yrTQb0Qn0QyxJGNLITtoz26m0W0NIEBrzAzL2pfvNu82hZ4Tie1tGnKMDgX5wgh0Dn1Fd5zzoeYSa8oKWaJh2n4i3tT9o6d0Pl/jRwon2uIJzNN5rRg6hGZZuMWvnTAXV7mJop8T6AACZBcqq0opIb+G3mL5Ui8+Kw0VdxyOM/0T/tUL4z2ZEh/ZWZqYwTocRj7uP4AMCGH7fPeSqXeJ8A8bls6AzsPm27ivAtY8f7OLSSEu6idbTD80Htwcs9rNZ7iaxzdPTnlVduSgKS6fMVt2L2sks2//PBhvi2svMc+1jP/OL0JsGvn7FKtuI/bp+/+MrqlfuMMFlh9NCx6KXkQ0dOB0MGhDcvFYpjRZlB81JxiPNHq+1qNTDqeKsIOqCsbXqh2OnHGLU0U4hJAhNkNOLNAw9s29ddl+oBEWqihrjx2uuz/3Vl/iE7pyE/aEZJ3xRjGobUk+b8/VjYm/X7o6aSVq8wsrbgwiE1uenCLYxRBLVeX8VieTxLA+GY88eefO5NoN2IN1m+cyAVwptrISTvKqWKm1Sq9riRUft9eK298OoGN+ya3+DKgTdFM4Ym1c2cnUc+q5p4gae8SH68Ia++b2/xZ6zoBRfGZf3ZGJwP/GMDGL8QLoW90MWTG5okrM8IiI7hVEy5u79+dGPiTUAVteIrNGl8t/DJ0rcxr1xghIvqBIWJ/n79XWlik3AB78M1jKV4yDm0n3Ua27VVV1JmXGooEBzbj89KI6xK0OZ9QO62+Ed/WcKN3HW4DMO6L5cccfgx+7efh7u5/NYdGFdgKJvCKPnnYW5UEqtXxJtBWQdZ2IAABNCr59pBkgRVu6yzV0+Fqgh8De/65AkoNmKhLuiK05D8+77WHbw9AxEeVO5b7O+537OYPBH1Im7uNS/B3gaf6kev0Cqk+aeC011jlSPyuYKF/x63Bkq2cRR6qP35ncQrktUdDuoaHI+DJI/9EbXdG64qen8I5VqIeJDFCmtsCidzQL4oMDSzxULQoil8FRgXPWVlc78agakgBUmykcTaKrd8WVkbFi5SFa/OP/vQLLdiF540+iFQ3w9DyP42uh5U5OsCqR1RqdAbXHOIJJbMm0qGew1VDxZw0A1LA1nzByoYliIw+D9rS4NDiL7Fv2ieTAaNE+QrtKjJubOiy1i4LIMVmG/8OQIbrk5lPop1G1mq4i/ExSA2Z1FdyGBErQgPNMuwIhZCZUlXm+RkAjO+5feih3Vg1uU2lTByf6FRL55frbxvPAQiwnRI3xQ/eKJGxUCL3DcAklfBJC68zHbZoH9oiFNIrJUU/f3gnR+aLXQcK9OQOwVykU8MBbgXOXtQXGr70v2jCsV4YEoItOKBxGxD+N75K4ZiFeUNTb4yzkAloLUjz+LWO2CrLAXz5vMuPtpEj+Az5ZE6HYtxhstQkxH8LfVKvJwKn6zd522VIgGZ56THAYcAGRfFViLNgvbDrJEoQz4FD2Ixuko4Hoa3Y1qK4ceZXWYgTd3mOLyn3EycYmNhpZZYAxWpqY0SYNP9uSeKJuDUAzXoY5/j66AW6XJNMGvkeIiaEgtXxgdyVyQPaZIb5EpWoxrk/J0etnJjAmGhI1v7XPr2L2CCgAP/mxBKVIypyjQqavsvHxjhn9nwQbLldSc5D1CruH7GPI9tcBKqtefVxxYDgL+p8IFqPWQUxuacFivlzfyqqzJZ6kGEaZb6cdU4NiUJdLKAtszaS0Mmw+z0mcXpWMc1tEHi5I61HbIIGWZDCDoEybJpIA0SQRQSSw6RddWE7zroOVQA/FOAlfys9FlMQRVjXzTEliBnQi9gbMUPvcEWoS/4o1k6V70sScthaNkkjcoxRnoDoz9Pw1FkSxoFkDAby074wiJDQzwKaos4lWZtlcV8Vqf/g0sT5v9o04OLloiHzGjFTo/s0NrkPMB2UUjWC/vn/m3OaoW0ogSqFqGDaMt8YoO9q1LyVpM7hvEcD7BQKkPu3ouLe/hslwP9vruHpniVY2jCmEcBcljm50Bu6XbBNsdv7sS+M/JPmbRe4ApGAz1MPrBvdnAtFCE6bcuMQRQkdK6bOL5cNGGSzDRZQW33i0iTQcCrGa02kdNTDRPGP8R4o8R8loy+aMJfm98lf3x38BoGuIOWKPEqC04z4G71bmJ9r4HrDtFYPl91qDSpaFXNDatMb5biexOejU/L5+NyJfvcw5oRWcmsuwsi1a0jrdLMgatrwGQ//oHdCTwWyHNcLwk982HK7r4F5iDKJBkA/GGfx+Bo1I3SfxySbZyIeVOw7OQFL8ZUfs8L/iTY0D8hps37ELlcLC4SjwdIfWB4YXzQgBzgcSjb8GGu91qtHsLaEVRMMO46QNdZh1FB9n0+xk9M4hvmxIFONNZhp+zcXwoFekPBQIcn+IbT7ZvpFZwxtYp09DTFS1HyGDSBxTpiOISQh5BN4jGVkoZBzK29uvfAoj9kd8Ks/sw6+myVqlvdi1RgEm42bFpF/4JCTtjLrS6pv46imACUcXwbckhXK/UrdaspBociiMEvTze/g5Grb2t+g1C2RD2QgvJ1WwDCUG0Yn+0PMMXLZbTza4s2cYWjtSKLkEUkwdwaZtnhFsYmH7IBk6yRC93Gw9yi3Rv8wOoXyB9rbq+7DlObuH0oRBtC4uwcZES/43d5+lvrBY/e7wYKo8y+8oCEL2WsOMb4vVklbxF1yj1xqpjuGQyUn0WHWyLUxGNmtm7xKPL1ViQevDIvsWaz5KPTPyJBFLJ7RKnLilXVWFlRMFS/FTdi43JkYFchiiOX06vUGdx0QrwWjKGtWkCyHtLy+splSA9rPeAmWHMBkNFDlmkbUlMFOS7/DFr9pWNs5f8q3Y1S13vzynPLsB21s+xKxjyRDNVIKgJYyoZWXDEsXoqTmyj+aqLM2s5zDAT7LIQiEhrxjwBV/PPGla+Fge3qTOnm5wLC8laEyuTUG/j/iV+Ubm6+3WbWq2qje9N0s6FhUkkydgW79i3aeG+fxrd0hD2/+zc1dJfB4c9pVUYFU/3/pYZKtOv3FBJ5M7zaqTp5oyOSXkrA+2EAxBG13kxB9XMuQO7igKTr2E6Dh350H0QfIfKts0xyIjCvTekOobXnvqvIsYXDPUgWavTKjVA3vK9ZxbwRyZfQrosdOmB1dFeZzGUFW1mCHeciN3jN3yO4I5YS5wzwIpb2CsGiYOBnrRE8IU1YI7Yzhml5fSJ3dGKNCZRG+YkrzjnK+F+tmOHEEI29aFUvqicqGTU9laoNvSZJaYxA7sobFhSqd1jwoVgmAkVpwUoJdf+QbJsA5W/TOBu47SK1xCfFfrXClVoSiQISqR7HJ4edDeljlrp/XvePoa4NKmEzWVEUBOb4Cs6UXlqAoisxmCyiVYSotPbRmHZs9zjFW2iZr5lgDoB+ppzu6dVllt8hM65RHLJ7Ccoo8yjNyUm+MEywOR6/RIrBP1nVTht3JV4wnSiklcgIeL/AYIXxMSH8YVSr0VxqSVtIGFCmSuJMqU7c73fzDeUTp0W84mQFwoEOFZgsID7smydLf+FEYxuib7EO000GnrASj5dBNd+FdEWNantR74s+CuFI1bIHRyh9/f+OBS5h5I1bUKjpcfK9yG8ybAYjSWKQfL7YTIEyK6tJPYt7265zhHEb8df+Y/KQukrcge1dH6DMwWdMKxGLD6VxDFQz3mFmX2vcYfNjE4XDg28bIOaxh0eS+yuagUq7lj7XJy6NwOAyOJzjE55dGhcXON3WGSVlVuYWsGUmuiuCPGo7gtfvDC8k8jTD9qNHNlNddGHY5713IcAZVCtkzaFfwrPPf4upheqF0oKesC2RyKTO8l9+uH6r0vBzsfp3bRhFLMB2dHX67/PnPlnnMat0CN9ZvJi7RsjDekue0ufNdUl/vWlkq8vZkaKd8X9NUQAWilpb6yDn3zBoKVeasc5ds67ztJEiRY8OyhFJ/V+3NygvsM3E0nD22pHldxAwtOuJIOBd0Id73cTqjBeEgs47FqNUjmpBUy8f7WVyELa0QK1fGBbCad+TrTQkxvzQ7vBGrfDx84WgF0QeDr4kwoG2VUfo8vYK8k6kzMYguTth7HepSDSs5fyJ/eseal6oPsLAqQ5uLap0YPkwyyChNBGJ/RBb9qAi9BlmO+c7N6qvNe+6nSrGvpF4QEOWxI8AFZNMQ2Bu8GczE5P92uQ1xVXXKuFoVv7ABBbxDzT/ASX2tfClgoJw4Xi6zKMxRLS9fOziE3fssWw45FRGIQrNH/HoRXhtjA1OPHLaMskdkxHbkGr2mY0K9DikL/WYuuRa5U8jtEnXTuOnRWWrlHk+KHf/UtPw82tcfdZYcmqZILxgv4DN+qIP76zZh6TunFvFUZ+lPpDgchG1YsVE8WaoI13aaQcD4mnrvubblQ8dNHOC+zWOGwzeJRJuJGVxLLjyeSem3JYDK2rQ4opCY1e3lA3euxKKq8lxc9q5HrxO9cXjVEHY1bsULHcRhgpaF0EPw1Jc8KqT22vU4T/5SGWQ4JOlyhpA/8AkfuFtQpGX13tlx9nHH/N1w8bRVzcF9Z+Ch1kqlfL5YbWgxw9OHPMX/LY9i+jELLsIyYZnfwC0hjQM7uj1se7CwxjGWMjpDA40sR5kxV0q2uN+AW/qP4cY06vMZ8CU9b9ByfIbTExt1ZpT+uBwvamo0lJRKSdHVl1KqUN5fdBTv7rMDXzbhdOttagnAmlAKryTLQL/M8vzJ4riU/IpbsUam39dQwFYetkzRlq0dNp/yjCjLHVhk1WG/NJbldgM7Pxp5oDr2zXaNgnD79m5T2U5RP9WUUzBZMP5QEPZhhhDOWZO0GOQHlIukBN/8VE//BRVf9//S1+qYVUAfe7/WtxoHhfU4OfxWo4Vbo4eBAQX4T2NCaJkihaqwlWVijkxjIwR5lEileJVgm2N3nFImCsf/iCSacedDCkp5kVOno8YqK/0T9HLtshN419OcMyIFbxHHb50Xd8vwdHFsxfXw/u46bfas1SEh/zpQfdvy1SbIRf1u632XUMPnLTmRStBPPs4BSrJgRRIjgAh+ELD5bJnWVH8m/ZXCvtKuPEDGwMBr4VC06macpKnbSrljaDAeYa92b0E2D8tTF2HCz0edS7W2HmwtcuXIw874LDD8fBfBpvWOV+sb3izrx7PcNliMUZ+ueigrysXpKciLe5Ik3Z+eNVjYeeTunfOqbupRQLIzf0Qr7kgvexWNz8G64jwquMoL6Ja9i4NzCwVV/Rc4/UHqsaEj3kSehUYUdFFEphGAzzDVV682oDQ3KtSnfsGdqyR3aH15R3kKJLykdLbVWouvzqm9ChT2SLfDzu21uaLoMKdAs/Ux1f6ZCcF6q9xNX8G3YTYviy1K/B/FAAnlUmVpu0AKC+dsUsDcsmUcEqK4dL68Gp0IRO2saRcuJZnLmFA6nT2AStOjzbMorXNjD6ZJxpoNKiFOCpJCUUjKnim/8dkFtLDaGLBek58AS5iIzrqSYsJVVx8GO+wOPnECgOTfGSfkoJ+EnB9HF4tS02Wng7cSsVQBtvlEySm0xpDvAiXJfHd0G/RDoaB/Z5Hk7LhsWHE9j5Mekb64JMSu8tiw5XcJl+4klpTmgK+kxdrd/B+b5w+hyKLXQ8DKXymT7AVrNPf4HCiagI07SZ9z/tGLF4OGcyDcYU9Kr5rXL3WLCtMqESDrA7f3VrDqA6P+PKcm2Q51R/H39Nri+Zio63QL8UvMEqilJOIkUnRpG7Caej4NvXCpGRsfkV7gjHCIVjNhxKaXx7VR4KKON6dWvoi4nR4UWlE6i3Tn1EbzDnDIR/5XVrNJbKwNX8H0jYYBrJTPASTkro9WnTI43J/7Ik+GvaAk67UuYq0MLvrdE6hVGUZa6TVSCUuwRouV/rbRe3ap8NrfuyKQGRLJ9ecpTZXzfpSEszwRXNeun7qneeNIOmugEwNEZO04OGYCLSL26MAm68VykDZjfLnCcXvIRwWwRnTmhggbc0myQMumTppAEKNdDCY2WKHONZxwcBVwSu8Ka9S51/yJzMisLvaEQOlQZAy46RyPitTbBR16iYC+8iQgeNbVkGy7lSWO0+alw+XmebT7nRJ3ZvDv1/I5DhPbwfVfyeLp02KJvvK5AwH1JdjX0jbXP8zBjY1hnAXmiABmBUp/UrQJr5kYbW1YwCcjqlILJz95q1rkHWBaJmovqvwTHse/24hBT7Qwutgt59FBW+qGir1HMBvSAhf5qov6xwasrkYDJdKyen/2IytUd7qeSEcj7SxupotZFrLLWQ34gAK8BcNrQWKaNEokTpzLrJeRWvZN2TXTFKBh5CUGNYrr36WaZr2zlInqT/4qXeVbMQp2vvImg8WLdGLa69b7EAXY/kzEiZRqsXFhOlUdvXkUMJXzy+eP0GKVhbDYzGOxJOqo0mNzslfKIxWwFY6nuqpR0hHtNOGYnlEhfygwRL3AfNaCUpfQMlk6cTRwVTG+Ulv+CLxcYgTsS89SctsyQ6tBeTSiQQgAoFeQjijRHRLGVFaHCRsHKFSTYFy5Ch1XV7EnWKZqOKqx5PrTpuM2cDiRZ/0eAUSTPjF9Alu9rHTutOGIYJRsXr3XGugBa6rQQBtMuWt4J6aSr7E5YEFX+fK22tGtp/e/8g2jQYil3ipsCwJiRk85Qt+Ojy5fl5i0h1Wq0eKr/7YfJdeOwK+AkerZ4SbB0o9SO7OfF25xpymZtqlu90tJKs2F/jhQaQF/9RLJ43vZVf1xBG5a3aTw+VOaFl86O0p9KxbHm5VfaVe+Ry8hwQ13j7tTxKrbSFAxjSpY+pY+yPzcfmk5RQb1hjq9jNH2eTdo+m0BR2Hb6iG0eslUrdTNbBELRzEkpTU822T1XpXg1CbT+shgF5rSV3z+20aa9reJBrRdf2Dro1e6xTuGBGOmgrAr1NsYv9A0YkYM0ABCJxgG1siEJfkMpdFEBMZ3s8/wpN2AxRs0KgghnlDSEdtk8tITnME0ZKS/+/oJe7t4M4oCFWLNfA/Ri9/xHUhfmdWTFaJ3kc/+wH7AaAxrLMPXcpEYTnSkrSyn7uJovhueOQFQByVO3KNOqd2uueg9GkQ5NQkYaZSmPYuPkJqzSsXa+EabIOsJEp4Hnx2PO/QdRaEdxuL1P7n6X0vY7SniVlUlYcKCOJhfpohNK9pkWNUiE4/6PFQmpq78s2BlsFKBtsQXW4BOA2O+0gSaUAPZSIcZsOZ0Mzoh1RTOp0D6AHXlOmwrKThbOSQThZD2PHdr8Bpr+iA39ehXaZG9tKs3RwXq6xOyYplUIwpH2stg51CVwyt/MkG/frFEabEnRhl/4FXayMXwfbS30mYu5mfgFDUPXel8HZnPQOrpHF9RsdG2pGNtJw/LcHUf44W3s1tnSbfLdOh4maYwTqW+jnhqvtn+RWVSjtTOKIAAAxWoxY4gIuZBQyvBL6qkRRNvUU6c4wQQMM0FuO0kIbehW6n2kbzIADrYX4oe6MvCj1fddBmWfNtPgSeGeaqm9mBOMiZt1f05ft+qFEVUunepBYr230k2CPD4fiS9n4nvkcXtRDKE0wewu2h+PB4OO7SVR3lGWlygncLP9v3D94STloUVau2G5w9V+GDi2+begAoM4QOQPTe0bTFRxIjaGnQSaE+bb7tG7WvTgYuYTVKze/vgSKGHaxpiAJkgEz3CcYWzsaaHKefHrxQRVmrhji8D8NX/g1iWpUoR4vGzU4Bf0pGHLuwon4j3iPyWqTIxBIY+Fp7D3c1v1KavR3yJIK443JNw/n1JrEYVydNl+IFnHx7ZJnKh/GMn8NYViZ92KcyPHN0dAKgrNzt/RUTelywa/6PdnJ+RWR6W253TqPrqQnIzOyvF905oH3orKsIuQ6s02RHaNRMUUplOl3KpeKI0jM7Jt6yYoLUtnktUqf3EHjyKaxj7boO+i++cS9YSMxk2LwQBY3I0HtIDd7EQSsinAPjjgAcDHJ4pZwdMRZXtZp9fxhx/JbvkCB95SlHCcI4kBTNMONp+xk36mz944S+RHjQG8hpoSJnp9BcUPjfOADGJMQwDYTM1BD3hp1fPNaOIdaIAmrOTZu6roDp74zmSDb1fbqui+rNpYQNDJdtRuH2e+dlbckJXGtFQ2398Y0uoCvkVb6QB2h6bsi8yPl9ITMVPTyQPJDY5ya2yxGP9dJVji69rEHHglYa9CBDKJn/Q04FD4ouXW6YQ3bhj03LOVwrQqn6RTxALsuKDeuCMPjdvjlOfFYZ5x0HJypbJ+BwyMFwzEcitTQ0eur7kLXrryuBWV3eC7d20L9hHqB5fWNoD8acetkHUs5U4J26Rvy777fNwuzYX3H1+sq5+s9DL4/5O9q159/Ec3wJgMQxuwF2Oh9i5HpqlpyEzvb9qz3gmkaymW6f/Zn3vNGNVdnCavKyI7CWjJZxY2yD5ybr9Uc74i9C/xuEcIyhYQ1gFEbt786c3SAmyBTpssTQk1HLvoQpdCTb1ETK9hZhccwiyEVnLNur0O4xZD7dpa34kqA54EOstBjYuvd7SwIh9BCz2E9S1RB+jCEQb+7UdA1Yrhxc/jDQK0A6NmWkclCdYXUCyxY1I1q5UaDUAtkZg+oHtNYPimQnEjF5hDTTfrTqlSczliMYPopCnvm73ywNW5rb3xY9LFxTFW7Pn94/YeJBqNTBhZ9DSXIYt8u60G4vLV85geDkOeW+GqWacwx2WgdRfylZJxOsx3XHLZbFeHHlYOm+zv6NwGZwV9E3INSyVc0TrErJ36/UkZsOfWF0H965RYUvyuvGPiMyOaGe5lb45/xOIUY5EiXS7kGvKxsiHt+DrTvmuZeOTd21cuP6y2UAFi6qCgw8lSbsl0NZFqm7ZwfyxyYkxgV0wZv88nuA485NjHE7K1iXjHqcMk7J+XK1F8sX1JLyogNC37H2l6NOEVdPif4TGKn5Gr/Vlz5+iPTra5AzepvjXpx7k8/btlsH0IrPRL2QO61R9exhVdtzVjxVo/uCRySBkLF3hIU6Udet4vXu4tU8Wy6WNqlOVDbaBshDMqxEQYdGKzVWTl/i6cP1I8wrgzHAmu4k4sqZlzAHLqC3IIIUAXkpVJbdhtr25y7hi5ZPgtyDwELDpOSSkROAxmuuORR048+XwRm+vUOns2IXkZJTTrt7/PT7aqJdWXz6vm7sqKPm3lXbYCttZUVi6lOBB4vncFAIo9MtaTDHScLAuThcYgEVb1rGnVzj71K81Trf4OyhBaX0udSTU+QCUIkDsINkQ5LwR4ejvKYOEqU4ISASB8x4B/kR87m8jM6zv6C44Y57IW4anyFGOdJCRdMU7nBaPrFK7kkk8MaADqRc5NoL0w6tYNT/5PVWA6U/QggyD50QAR/CzozdIBfYDI/FuUMUWHSLejdACEOaLhyKAWIwnKvM1mSy61EVnT/CAOwGmRi7GRq+GM6gR/ycteNvXC7v1jW2Cxf+BdRxOS2cBOcH4s4tUs5DT3I94zjqRkkmQKb0gFZHbghtJ5FYXZIySI21RKeVjvzW3UqtCSWaILdWiAiEvxTSgZE8UO/T5Vl4Y/Xy5HKwa7Suyyxbax4usowoRzBUvX0F1AyFqJOK2ptgdXZbJXE6ph5eGjWjVOMq6zTtOv4CKt8GPXGu7sa7HwiwM7gA++hkA6T+PfXExakbCWQRjWnHqHXHSTbX1Vu7/9wosjNUQPrXUS8luMEpcon7Bgj73RdhEt8RJhj4xIhTAoI1QgKaR4vo9UNZlfbjA65SEcYQ0ZKLrVpdnE3HrxvfhxwtwaoOFWT9fAZlkz2YejVDDVbPqpX45PKPvE+Fu4VLtlNIA/NvpNrhVRH+Ia9ExYxGiQ9un7njxiPFs=,iv:pHRYaxmcQZ8ga2oeH6MZ7lUC8/NxZPAp+o7+JE392Qk=,tag:XYXyj2GmXSGd54UwHW+Scg==,type:str]
-        NEXT_PUBLIC_API_HOST:
-            _default: ENC[AES256_GCM,data:Ymv0EXpev9qEu9TD1un/3muOM0BDPeTjBZIvG7Off7u7iHUOl7NHZZUavNxUIw==,iv:j3W5n0LUnmwSLOCcuMeEITcDf4YImfR/2iJqyQOO5KQ=,tag:BYaIMnVRpO4CM65mYiDP6A==,type:str]
-        NEXT_PUBLIC_APP_HOST:
-            _default: ENC[AES256_GCM,data:OVcDHK/0UXBGlQyitKU95Rkct3EKirhOGKjZLPKqQVzsgf3YBfsof5st74dGWw==,iv:gqh0X94J56InUJJSv03/4fTJEJIBSVLlTE45FvnHv2c=,tag:Nwv6gbhANg8MoR8TIzvlVg==,type:str]
-        NEXT_PUBLIC_STATS_API_HOST:
-            _default: ENC[AES256_GCM,data:Zp5lp7hwy0ivPPUGyPjb0FOsrbJIaySDXD936GnZm20ZXirWLcoCY5xr6rPlQE0NrSNDnMt9cwQ=,iv:r9HF3gtwQPc+OyGsQxy2dmnC6q7+vYiQJrZrlWo8jkA=,tag:/rS6US+f2Sv8q+jW2VZPeg==,type:str]
-        NEXT_PUBLIC_VISUALIZE_API_HOST:
-            _default: ENC[AES256_GCM,data:t2vaoquUrkdXpszKFqktjDkpPzw6ot/jVmCdYZKto7HVJjVjxlogdRhTjDdB2iw5WQXLOuKuDN9Odd4AlQ==,iv:amdYXGuCkyqn3gPBvKMYBFiOOP43gkKGMeJH2MgZHbE=,tag:4ecKv5hbmC2sRrlGtSsrXQ==,type:str]
-        NEXT_PUBLIC_LOGOUT_URL:
-            _default: ENC[AES256_GCM,data:GzimJRj+bBPa1P/vob1NbARs2GPRnxr2kc8Ypx6lNHcBFXU4NXt8tVlwUofcwZn2,iv:R2qwSSDCpfAka2VUnXBVU+iYj74A8TzsTvWMAVrLWo4=,tag:Ly7HG+cUqm1Gd+OdUr9EQw==,type:str]
-        NEXT_PUBLIC_LOGOUT_RETURN_URL:
-            _default: ENC[AES256_GCM,data:+RrUv6rE/9aKVQ/W6sBTOjN56L7Et0eroTctStkr9RKfbYtSsnEGQ+aCtFoGvkxyDAI5AQz02dMQDO5UOhMVzp8=,iv:hKir85sJ3+Ghbxu8gj4l0VGacMaGWGEq1WYfW6Nuj64=,tag:AWaDR7PNZE1y/ZEg/XQWTw==,type:str]
-stats:
-    ingress:
-        host:
-            _default: ENC[AES256_GCM,data:sZpjhZvk8u7hwagYSl4+C4bFEodiK+iiic0Zu3EGNEjH+aH807LC3DC9TpsTeUNZ,iv:H1k1bmKiFEbTurG2FJsmbuPIOgY3YP4DjuoJXFb7DkY=,tag:Fw85Up5Cm2jki+t/E5T0Qg==,type:str]
-        annotations:
-            - ENC[AES256_GCM,data:8uSrvKNXgKOlxc4qY8Slgwr8e3D8Dub/brwe9QYKGFV+K6qzhU+jGAR2/v+kRer74t+ZR+FuVucGrgL7S5jjDQHdX8c7b/qFP1I2euOWOuuxiAEl8p0bLfLlUWB6pNSFCTT0pddfRKRJq9nVUhVxs3m+qFQUqCqbfyK1/4d4sxMX8GMMCC0wopwWeAF+v6Dx8Je34fU1y3MSjI9Ir7ZvMP/A55MGJ49NfCrfmKCnXn8khmBhFww2SNH7TPrx0EbMY9Vs/pgMEtCSTNZbM6wpKNQonawrIrnM/TwLXI25KyY=,iv:z7SbnZ2OT8TWpv5bsvk68KLs3R7lPAXxyZx3F0I9Bes=,tag:gVJu/qpy0hGvBeDi40xbzw==,type:str]
-            - ENC[AES256_GCM,data:1m6bfhJ30mQCKSyuW2ZB4ljsAB6nJSUSwQAP15ctU8iw8COZwUthH1aoRaY4D+IGtAQXtoUES1ezqQ==,iv:d8QE5WjV5PKebu6h10z7KXqoZMGZgO2+tb1s6DUe6ok=,tag:JtpwFc19RxVS/Hd4WDBFSg==,type:str]
-            - ENC[AES256_GCM,data:pb+c5IE+pDi5X+xz/D95KMely3BRx0AQF5Un1T5PZ8Fuqw588TDmgzACrVPHmawiLhtflj/zY0w4Q5vSNySaWK2u+dpmJsWDT/aXaLzQIlDtqh9sjQo=,iv:0fUIuucihrilgcxPEYEfKTujBGgJ1Txkdnd3ejoMKrQ=,tag:W6A+748GYKfDCPMzk0pYJQ==,type:str]
-            - ENC[AES256_GCM,data:DIOfgK+gt86iBiLRaHBD7KDnWqW2h35WI/0wbXSY9frW9Hjlx69+uPHqj3I7VG8=,iv:n7opDpqF5cj2xJn5G1HB3AbfEN+BkZE/X2th3kxabQY=,tag:JONAoISL6wa5mUAt6Wr26A==,type:str]
-    environment:
-        STATS__DB_URL:
-            _default: ENC[AES256_GCM,data:kumdg7QQc2A/hPW6x3nySrpzlwG7HyOJHLFg448+7R944H1Nb8QXEckqOFmvQB0NTYSg6ydOgsDNEJZz,iv:SFOifTQ0W0OUX4HxufKtBpDLPrPG0o7vNbZ/+7lX19U=,tag:zxPYEMeSfWh9A82HB4O2pw==,type:str]
-        STATS__BLOCKSCOUT_DB_URL:
-            _default: ENC[AES256_GCM,data:+rN8WyD6QRK/I2PlM8pLErsaQXcaN3is8wlOAe04Dkp0TY+OyhTS8eGdDnzKdEml12YZshz/XImkNJSHHdAulCs=,iv:S2dtEQDReW1n1LPOBL9eV4tFDtyTY0axrjlwZMxUsnw=,tag:/pa5bwa5FH293C4xgMfS4Q==,type:str]
-postgres:
-    environment:
-        POSTGRES_USER:
-            _default: ENC[AES256_GCM,data:hXEpOIBfSLE=,iv:nyiIipUKCS8OBXMqHbZARztemsoKRvyk0z7L6Okd8zo=,tag:MsyfRUipTTFiW3TJbNDcYw==,type:str]
-        POSTGRES_HOST_AUTH_METHOD:
-            _default: ENC[AES256_GCM,data:0Gge77A=,iv:+/lWnof/k7LvjUAcg1xPMEgcIMklSrF/OYuqqojivac=,tag:l6wG5IvYYaTCgJfounIR2Q==,type:str]
-        POSTGRES_PASSWORD:
-            _default: ENC[AES256_GCM,data:4AjRIf3NTW0=,iv:ECek8lT9eKca0gvTbXV9L1ucRuRoWoZNj5Vd3RtxBxQ=,tag:mezpd+nWbh+EbwpAebunYA==,type:str]
-        POSTGRES_DB:
-            _default: ENC[AES256_GCM,data:aBfXcDN1/Cd60w==,iv:tC3xv+uqck90yXn3Ye1FYqVXDdv/7wkluCO5D4dVEus=,tag:UFWNDKWWeDwPs2Cksf+cTg==,type:str]
-    files:
-        list:
-            init.sql: ENC[AES256_GCM,data:kTAyepHKX1b1M8JVUMMPD2O58AO/Gb20G5XJYClunCAgHXWzJVybmuUqW0H+wo/7FIWGnn1LnbUYpQ6HtkSRvQehJ7vpOR3wG0SS,iv:RVzbNfjaMhS+An361AEoRxBkPycDT1rMhAoL7GTMH9A=,tag:95u4/FUoeJvz0PiP6Qplkg==,type:str]
-scVerifier:
-    ingress:
-        host:
-            _default: ENC[AES256_GCM,data:RghlOyQTbha0Kuo1jaMt/wy+QS8HDCFXC02JysC8SS/GPaSe2WgSGwLtUBF+9gnHDJ///8/HGhoBgA==,iv:n2X0uZyO1TDFx1J3glmdCRsk+OfsMezAOXWWXYCMu6c=,tag:Bab9tMDfWxRvjzxEpNIMIw==,type:str]
-    environment:
-        SMART_CONTRACT_VERIFIER__SOLIDITY__FETCHER__S3__ACCESS_KEY:
-            _default: ENC[AES256_GCM,data:YFP7tsoFlDHdtv1u22e8dea7aV5o+M8p,iv:eH5OArjzABIx60DMDgq0vdnAYS5x7mln4iddFaoLbkg=,tag:HEjR41aRgK5FhGvSa0WN1w==,type:str]
-        SMART_CONTRACT_VERIFIER__SOLIDITY__FETCHER__S3__SECRET_KEY:
-            _default: ENC[AES256_GCM,data:xitivq3rWyvSGrGXfg3XGylD2yOcGTwwEdXbkedq/Z3cF4lry34kJw==,iv:lb1J1qqGod900fIIsP3bH5uM/Rr3XKvQvO3+d0x5XtA=,tag:aLzbXbMCIYUzIEeK5QGqmw==,type:str]
-        SMART_CONTRACT_VERIFIER__SOLIDITY__FETCHER__S3__BUCKET:
-            _default: ENC[AES256_GCM,data:ezHIeKHhAhOJAXrEYQ==,iv:aoXA0e3kFaYr2NPZQbpaiVmBl2MCzoGVJBMmHJU3xuo=,tag:aZ/WqfLFXQ2B/o86A7BZQg==,type:str]
-sigProvider:
-    ingress:
-        host:
-            _default: ENC[AES256_GCM,data:MCWXySvrj4+rL9UdYY5DYsfFCWQ7LC0dHlkeH2BNoLo1ep8CihvlD96W/jiEsNfVJQgwxKGziw==,iv:xADLeEIMxpAhspztXQuuN734gSTfR9haunfozL/IpHU=,tag:c56OXOIomKULIoqHiM4fcQ==,type:str]
-visualizer:
-    ingress:
-        host:
-            _default: ENC[AES256_GCM,data:ogYiUKW6vVFfl+r4U2gQXi++HZagi85WJp/mXKKDhTLaaSTBXOIQ9faWVdXzGZDWRPMhleo=,iv:YFh+Klw730IzWipjq5XwW+o+tAt7s94V+4bdo61WHO8=,tag:D8AsZxoRi3lg0RlGioMklw==,type:str]
-sops:
-    kms: []
-    gcp_kms: []
-    azure_kv: []
-    hc_vault: []
-    age: []
-    lastmodified: "2023-04-26T10:43:55Z"
-    mac: ENC[AES256_GCM,data:YXMsmP9rZBcN6HUbR34v2OY8XpllCKLhoR4uBCru/fJeA76DNdIhwPDSDLA5XIfpMNIswq4bE7Oc6776gzkBLyiAALOPIOWI4MAz4qRl8jX7jSRRkxvEcEEX09dq3lkej52BeKvFAjTSdnfSed0IwWt62yqaic2NHmXvGbkSnUI=,iv:X+KDKi1y/F5qBS5vPz+SxxyEmDKTWDc/k4ivhRxPNKA=,tag:asIyutQ2veDiIwRvC9S6Kg==,type:str]
-    pgp:
-        - created_at: "2022-10-10T07:37:16Z"
-          enc: |
-            -----BEGIN PGP MESSAGE-----
-
-            hQEMA1MXzg1c4SMLAQf+Kyj8/Ws9rdLdRWh0G8kR+Ni2gBPnHkcRgA5ol845Jpyj
-            p61tlQX6lPyJVKE9vpbSGk9JDX6Mpiwp+qfXlcmR91oUubPUl61e+vjZST+lk/G+
-            nkaKCAo0TnUSm0vJGDEkbV26gO5JT71Ziq/k2Pw7IZ3UYmuq19SMdzdG/2xsWZ+g
-            zKPdw/XVw0SYMSha6TnMDIoCuZDlstLmpBx2AktujiSDBJE5cz1i0Vuqnz5xOi6Y
-            CafMxrQTiPD4ljV+Hzckvf4tLsiU441x/g3x/VgDjtDaofPMa4dVVRpSSLuiIFN+
-            TePyzQE/PnDZUbwy8EKUr+GDslm2ch+WUhpZaGOnrtJeAZ2PEXLJeNQbqs5nnnBO
-            Wa+BNuV0H/OaVHL34GNFvgyeiWqlsAc/V/QFBRBS4K5G9XOqKH1hTidFTc+Nd7dh
-            i4qobisBGW9mm4ecmKyzrSB6sVijfPbv7VQ4UFO8xA==
-            =1Uwc
-            -----END PGP MESSAGE-----
-          fp: 99E83B7490B1A9F51781E6055317CE0D5CE1230B
-    unencrypted_suffix: _unencrypted
-    version: 3.7.3
diff --git a/deploy/testing/eth-goerli/values.yaml b/deploy/testing/eth-goerli/values.yaml
deleted file mode 100644
index 97391887a270..000000000000
--- a/deploy/testing/eth-goerli/values.yaml
+++ /dev/null
@@ -1,436 +0,0 @@
-global:
-  env: testnet
-
-blockscout:
-  enabled: true
-  image:
-    _default: &image blockscout/blockscout:latest
-
-  ingress:
-    enabled: true
-    tls:
-      enabled: true
-      createSecret: true
-  # init container
-  init:
-    enabled: true
-    image:
-      _default: *image
-
-  resources:
-    limits:
-      memory:
-        _default: "8Gi"
-      cpu:
-        _default: "3"
-    requests:
-      memory:
-        _default: "6Gi"
-      cpu:
-        _default: "2"
-
-  # node label
-  nodeSelector:
-    enabled: true
-    labels:
-      _default:
-        app: blockscout
-
-  environment:
-    ETHEREUM_JSONRPC_VARIANT:
-      _default: geth
-    HEART_BEAT_TIMEOUT:
-      _default: 30
-    PORT:
-      _default: 4000
-    SUBNETWORK:
-      _default: Goerli
-    HEALTHY_BLOCKS_PERIOD:
-      _default: 60
-    NETWORK:
-      _default: (Ethereum)
-    NETWORK_ICON:
-      _default: _network_icon.html
-    COIN:
-      _default: ETH
-    ECTO_USE_SSL:
-      _default: 'false'
-    COIN_NAME:
-      _default: ETH
-    LOGO:
-      _default: /images/goerli_logo.svg
-    TXS_STATS_DAYS_TO_COMPILE_AT_INIT:
-      _default: 10
-    COIN_BALANCE_HISTORY_DAYS:
-      _default: 90
-    POOL_SIZE:
-      _default: 300
-    POOL_SIZE_API:
-      _default: 10
-    ACCOUNT_POOL_SIZE:
-      _default: 10
-    DISPLAY_TOKEN_ICONS:
-      _default: 'true'
-    FETCH_REWARDS_WAY:
-      _default: manual
-    SHOW_TESTNET_LABEL:
-      _default: 'true'
-    CHAIN_ID:
-      _default: 5
-    MICROSERVICE_SC_VERIFIER_ENABLED:
-      _default: 'true'
-    MICROSERVICE_VISUALIZE_SOL2UML_ENABLED:
-      _default: 'true'
-    MICROSERVICE_SIG_PROVIDER_ENABLED:
-      _default: 'true'
-    INDEXER_MEMORY_LIMIT:
-      _default: 7
-    ACCOUNT_ENABLED:
-      _default: 'true'
-    API_V2_ENABLED:
-      _default: 'true'
-    APPS_MENU:
-      _default: 'true'
-    APPS:
-      _default: '[{"title": "Marketplace", "url": "/apps", "embedded?": true}]'
-    ETHEREUM_JSONRPC_DEBUG_TRACE_TRANSACTION_TIMEOUT:
-      _default: '20s'
-    ETHEREUM_JSONRPC_HTTP_TIMEOUT:
-      _default: 60
-    INDEXER_INTERNAL_TRANSACTIONS_BATCH_SIZE:
-      _default: 15
-    INDEXER_DISABLE_EMPTY_BLOCKS_SANITIZER:
-      _default: 'true'
-    INDEXER_RECEIPTS_BATCH_SIZE:
-      _default: 50
-    INDEXER_COIN_BALANCES_BATCH_SIZE:
-      _default: 50
-    INDEXER_DISABLE_PENDING_TRANSACTIONS_FETCHER:
-      _default: 'true'
-    INDEXER_TX_ACTIONS_ENABLE:
-      _default: 'true'
-    DISABLE_EXCHANGE_RATES:
-      _default: 'true'
-    SOURCIFY_INTEGRATION_ENABLED:
-      _default: 'true'
-
-frontend:
-  app: blockscout
-  enabled: true
-  image:
-    _default: ghcr.io/blockscout/frontend:main
-  replicas:
-    app: 2
-  ingress:
-    enabled: true
-    # enable https
-    tls:
-      enabled: true
-      createSecret: false
-    path:
-      exact:
-        - "/"
-      prefix:
-        - "/apps"
-        - "/_next"
-        - "/node-api"
-        - "/static"
-        - "/auth/profile"
-        - "/account"
-        - "/txs"
-        - "/tx"
-        - "/blocks"
-        - "/block"
-        - "/stats"
-        - "/address"
-        - "/search-results"
-        - "/token"
-        - "/tokens"
-        - "/accounts"
-        - "/visualize"
-        - "/api-docs"
-        - "/csv-export"
-
-  resources:
-    limits:
-      memory:
-        _default: "2Gi"
-      cpu:
-        _default: "2"
-    requests:
-      memory:
-        _default: "512Mi"
-      cpu:
-        _default: "250m"
-  # node label
-  nodeSelector:
-    enabled: true
-    labels:
-      _default:
-        app: blockscout-prod
-  environment:
-    # ui config
-    NEXT_PUBLIC_NETWORK_EXPLORERS:
-      _default: "[{'title':'Etherscan','baseUrl':'https://goerli.etherscan.io/','paths':{'tx':'/tx','address':'/address'}}]"
-    # network config
-    NEXT_PUBLIC_NETWORK_NAME:
-      _default: Ethereum
-    NEXT_PUBLIC_NETWORK_SHORT_NAME:
-      _default: Goerli
-    NEXT_PUBLIC_NETWORK_ASSETS_PATHNAME:
-      _default: ethereum
-    NEXT_PUBLIC_NETWORK_ID:
-      _default: 5
-    NEXT_PUBLIC_NETWORK_CURRENCY_NAME:
-      _default: Ether
-    NEXT_PUBLIC_NETWORK_CURRENCY_SYMBOL:
-      _default: ETH
-    NEXT_PUBLIC_NETWORK_CURRENCY_DECIMALS:
-      _default: 18
-    NEXT_PUBLIC_NETWORK_TOKEN_ADDRESS:
-      _default: 0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2
-    NEXT_PUBLIC_IS_ACCOUNT_SUPPORTED:
-      _default: true
-    NEXT_PUBLIC_NETWORK_VERIFICATION_TYPE:
-      _default: validation
-    NEXT_PUBLIC_MARKETPLACE_SUBMIT_FORM:
-      _default: https://airtable.com/shrqUAcjgGJ4jU88C
-    # api config
-    NEXT_PUBLIC_API_BASE_PATH:
-      _default: /
-    NEXT_PUBLIC_FOOTER_GITHUB_LINK:
-      _default: https://github.com/blockscout/blockscout
-    NEXT_PUBLIC_FOOTER_TWITTER_LINK:
-      _default: https://www.twitter.com/blockscoutcom
-    NEXT_PUBLIC_APP_ENV:
-      _default: staging
-    NEXT_PUBLIC_APP_INSTANCE:
-      _default: unknown
-    NEXT_PUBLIC_HOMEPAGE_CHARTS:
-      _default: "['daily_txs']"
-    NEXT_PUBLIC_NETWORK_RPC_URL:
-      _default: https://rpc.ankr.com/eth_goerli
-    NEXT_PUBLIC_IS_TESTNET:
-      _default: 'true'
-    NEXT_PUBLIC_API_SPEC_URL:
-      _default: https://raw.githubusercontent.com/blockscout/blockscout-api-v2-swagger/main/swagger.yaml
-# enable stats deploy
-stats:
-  enabled: true
-  image:
-    _default: ghcr.io/blockscout/stats:main
-
-  # enable ingress
-  ingress:
-    enabled: true
-    # enable https
-    tls:
-      enabled: true
-      createSecret: true
-
-  resources:
-    limits:
-      memory:
-        _default: 128Mi
-      cpu:
-        _default: 100m
-    requests:
-      memory:
-        _default: 128Mi
-      cpu:
-        _default: 100m
-
-  # node label
-  nodeSelector:
-    enabled: true
-    labels:
-      _default:
-        app: blockscout
-
-  # enable Horizontal Pod Autoscaler
-  hpa:
-    enabled: true
-
-  environment:
-    RUST_LOG:
-      _default: info
-    STATS__RUN_MIGRATIONS:
-      _default: 'true'
-    STATS__TRACING__FORMAT:
-      _default: json
-    STATS__METRICS__ENABLED:
-      _default: 'true'
-
-postgres:
-  enabled: true
-  image: postgres:14.7
-  port: 5432
-
-  command: '["docker-entrypoint.sh", "-c"]'
-  args: '["max_connections=500"]'
-
-  customShm:
-    enabled: false
-
-  files:
-    enabled: true
-    mountPath: /docker-entrypoint-initdb.d
-
-  persistence: true
-  storage: 500Gi
-
-  resources:
-    limits:
-      memory:
-        _default: "2Gi"
-      cpu:
-        _default: "2"
-    requests:
-      memory:
-        _default: "2Gi"
-      cpu:
-        _default: "2"
-
-# enable Smart-contract-verifier deploy
-scVerifier:
-  enabled: true
-  image:
-    _default: ghcr.io/blockscout/smart-contract-verifier:main
-  # enable ingress
-  ingress:
-    enabled: true
-    # enable https
-    tls:
-      enabled: true
-  resources:
-    limits:
-      memory:
-        _default: 512Mi
-      cpu:
-        _default: 250m
-    requests:
-      memory:
-        _default: 512Mi
-      cpu:
-        _default: 250m
-  # probes
-  livenessProbe:
-    enabled: true
-    # path: /health
-  readinessProbe:
-    enabled: true
-    # path: /health
-  # enable Horizontal Pod Autoscaler
-  hpa:
-    enabled: true
-  environment:
-    SMART_CONTRACT_VERIFIER__SERVER__HTTP__ADDR:
-      _default: 0.0.0.0:8050
-    SMART_CONTRACT_VERIFIER__SERVER__GRPC__ADDR:
-      _default: 0.0.0.0:8051
-    # SMART_CONTRACT_VERIFIER__SOLIDITY__ENABLED:
-    #   _default: 'true'
-    SMART_CONTRACT_VERIFIER__SOLIDITY__COMPILERS_DIR:
-      _default: /tmp/solidity-compilers
-    SMART_CONTRACT_VERIFIER__SOLIDITY__REFRESH_VERSIONS_SCHEDULE:
-      _default: 0 0 * * * * *
-    # It depends on the OS you are running the service on
-    # SMART_CONTRACT_VERIFIER__SOLIDITY__FETCHER__LIST__LIST_URL:
-    #   _default: https://solc-bin.ethereum.org/linux-amd64/list.json
-    #SMART_CONTRACT_VERIFIER__SOLIDITY__FETCHER__LIST__LIST_URL=https://solc-bin.ethereum.org/macosx-amd64/list.json
-    #SMART_CONTRACT_VERIFIER__SOLIDITY__FETCHER__LIST__LIST_URL=https://solc-bin.ethereum.org/windows-amd64/list.json
-    SMART_CONTRACT_VERIFIER__SOLIDITY__FETCHER__S3__REGION:
-      _default: ""
-    SMART_CONTRACT_VERIFIER__SOLIDITY__FETCHER__S3__ENDPOINT:
-      _default: https://storage.googleapis.com
-    SMART_CONTRACT_VERIFIER__SOURCIFY__ENABLED:
-      _default: 'true'
-    SMART_CONTRACT_VERIFIER__SOURCIFY__API_URL:
-      _default: https://sourcify.dev/server/
-    SMART_CONTRACT_VERIFIER__SOURCIFY__VERIFICATION_ATTEMPTS:
-      _default: 3
-    SMART_CONTRACT_VERIFIER__SOURCIFY__REQUEST_TIMEOUT:
-      _default: 10
-    SMART_CONTRACT_VERIFIER__METRICS__ENABLED:
-      _default: 'true'
-    SMART_CONTRACT_VERIFIER__METRICS__ADDR:
-      _default: 0.0.0.0:6060
-    SMART_CONTRACT_VERIFIER__METRICS__ROUTE:
-      _default: /metrics
-    SMART_CONTRACT_VERIFIER__JAEGER__ENABLED:
-      _default: 'false'
-
-# enable visualizer deploy
-visualizer:
-  enabled: true
-  image:
-    _default: ghcr.io/blockscout/visualizer:main
-
-  # enable ingress
-  ingress:
-    enabled: true
-    host:
-      _default: visualizer.test.aws-k8s.blockscout.com
-    # enable https
-    tls:
-      enabled: true
-      createSecret: false
-
-  resources:
-    limits:
-      memory:
-        _default: 64Mi
-      cpu:
-        _default: 50m
-    requests:
-      memory:
-        _default: 64Mi
-      cpu:
-        _default: 50m
-
-  # node label
-  nodeSelector:
-    enabled: true
-    labels:
-      _default:
-        app: blockscout
-
-  environment:
-    VISUALIZER__SERVER__HTTP__ENABLED:
-      _default: 'true'
-    VISUALIZER__SERVER__HTTP__ADDR:
-      _default: 0.0.0.0:8050
-    VISUALIZER__SERVER__GRPC__ENABLED:
-      _default: 'false'
-
-# enable sig-provider deploy
-sigProvider:
-  enabled: true
-  image:
-    _default: ghcr.io/blockscout/sig-provider:main
-
-  # enable ingress
-  ingress:
-    enabled: true
-    # enable https
-    tls:
-      enabled: true
-      createSecret: false
-
-  # enable Horizontal Pod Autoscaler
-  hpa:
-    enabled: false
-
-  # probes
-  livenessProbe:
-    enabled: false
-  readinessProbe:
-    enabled: false
-
-  environment:
-    SIG_PROVIDER__METRICS__ENABLED:
-      _default: 'true'
-    SIG_PROVIDER__SERVER__HTTP__ADDR:
-      _default: 0.0.0.0:8043
-    SIG_PROVIDER__SERVER__GRPC__ENABLED:
-      _default: 'false'
diff --git a/docker-compose/README.md b/docker-compose/README.md
index 74a49e565783..a3520a32a47c 100644
--- a/docker-compose/README.md
+++ b/docker-compose/README.md
@@ -14,29 +14,22 @@ Runs Blockscout locally in Docker containers with [docker-compose](https://githu
 docker-compose up --build
 ```
 
-This command uses by-default `docker-compose.yml`, which builds the explorer into the Docker image and runs 6 Docker containers:
+This command uses by-default `docker-compose.yml`, which builds the explorer into the Docker image and runs 5 Docker containers:
 
 - Postgres 14.x database, which will be available at port 7432 on localhost.
 - Redis database of latest version, which will be available at port 6379 on localhost.
 - Blockscout explorer at http://localhost:4000.
 
-and 3 Rust microservices:
+and 2 microservices (written in Rust):
 
-- [Smart-contract-verifier](https://github.com/blockscout/blockscout-rs/tree/main/smart-contract-verifier) service, which will be available at port 8150 on the host machine.
 - [Sig-provider](https://github.com/blockscout/blockscout-rs/tree/main/sig-provider) service, which will be available at port 8151 on the host machine.
 - [Sol2UML visualizer](https://github.com/blockscout/blockscout-rs/tree/main/visualizer) service, which will be available at port 8152 on the host machine.
 
 Note for Linux users: Linux users need to run the local node on http://0.0.0.0/ rather than http://127.0.0.1/
 
-## Building Docker containers from source with native smart contract verification (deprecated)
-
-```bash
-docker-compose -f docker-compose-no-rust-verification.yml up --build
-```
-
 ## Configs for different Ethereum clients
 
-The repo contains built-in configs for different clients without needing to build the image.
+The repo contains built-in configs for different JSON RPC clients without need to build the image.
 
 - Erigon: `docker-compose -f docker-compose-no-build-erigon.yml up -d`
 - Geth: `docker-compose -f docker-compose-no-build-geth.yml up -d`
@@ -47,6 +40,8 @@ The repo contains built-in configs for different clients without needing to buil
 
 All of the configs assume the Ethereum JSON RPC is running at http://localhost:8545.
 
+Explorer UI will be available at http://localhost.
+
 In order to stop launched containers, run `docker-compose -d -f config_file.yml down`, replacing `config_file.yml` with the file name of the config which was previously launched.
 
 You can adjust BlockScout environment variables from `./envs/common-blockscout.env`. Descriptions of the ENVs are available in [the docs](https://docs.blockscout.com/for-developers/information-and-settings/env-variables).
diff --git a/docker-compose/docker-compose-no-build-erigon.yml b/docker-compose/docker-compose-no-build-erigon.yml
index 5c93dd2547f3..7ae6a91d34a0 100644
--- a/docker-compose/docker-compose-no-build-erigon.yml
+++ b/docker-compose/docker-compose-no-build-erigon.yml
@@ -11,16 +11,15 @@ services:
       file: ./services/docker-compose-db.yml
       service: db
 
-  blockscout:
+  backend:
     depends_on:
       - db
-      - smart-contract-verifier
       - redis_db
     image: blockscout/blockscout:${DOCKER_TAG:-latest}
     pull_policy: always
     restart: always
     stop_grace_period: 5m
-    container_name: 'blockscout'
+    container_name: 'backend'
     links:
       - db:database
     command: sh -c "bin/blockscout eval \"Elixir.Explorer.ReleaseTasks.create_and_migrate()\" && bin/blockscout start"
@@ -33,19 +32,11 @@ services:
         ETHEREUM_JSONRPC_HTTP_URL: http://host.docker.internal:8545/
         ETHEREUM_JSONRPC_TRACE_URL: http://host.docker.internal:8545/
         DATABASE_URL: postgresql://postgres:@host.docker.internal:7432/blockscout?ssl=false
-        ECTO_USE_SSL: 'false'
-        SECRET_KEY_BASE: '56NtB48ear7+wMSf0IQuWDAAazhpb31qyc7GiyspBP2vh7t5zlCsF5QDv76chXeN'
-        MIX_ENV: 'prod'
     ports:
       - 4000:4000
     volumes:
       - ./logs/:/app/logs/
 
-  smart-contract-verifier:
-    extends:
-      file: ./services/docker-compose-smart-contract-verifier.yml
-      service: smart-contract-verifier
-
   visualizer:
     extends:
       file: ./services/docker-compose-visualizer.yml
diff --git a/docker-compose/docker-compose-no-build-external-backend.yml b/docker-compose/docker-compose-no-build-external-backend.yml
index 3e1726bf846e..8520f2000a4e 100644
--- a/docker-compose/docker-compose-no-build-external-backend.yml
+++ b/docker-compose/docker-compose-no-build-external-backend.yml
@@ -11,11 +11,6 @@ services:
       file: ./services/docker-compose-db.yml
       service: db
 
-  smart-contract-verifier:
-    extends:
-      file: ./services/docker-compose-smart-contract-verifier.yml
-      service: smart-contract-verifier
-
   visualizer:
     extends:
       file: ./services/docker-compose-visualizer.yml
diff --git a/docker-compose/docker-compose-no-build-external-frontend.yml b/docker-compose/docker-compose-no-build-external-frontend.yml
index bc96e61f854d..48739af55b94 100644
--- a/docker-compose/docker-compose-no-build-external-frontend.yml
+++ b/docker-compose/docker-compose-no-build-external-frontend.yml
@@ -14,13 +14,12 @@ services:
   backend:
     depends_on:
       - db
-      - smart-contract-verifier
       - redis_db
     image: blockscout/blockscout:${DOCKER_TAG:-master}
     pull_policy: always
     restart: always
     stop_grace_period: 5m
-    container_name: 'blockscout'
+    container_name: 'backend'
     links:
       - db:database
     command: sh -c "bin/blockscout eval \"Elixir.Explorer.ReleaseTasks.create_and_migrate()\" && bin/blockscout start"
@@ -36,22 +35,12 @@ services:
         INDEXER_DISABLE_INTERNAL_TRANSACTIONS_FETCHER: 'true'
         INDEXER_DISABLE_PENDING_TRANSACTIONS_FETCHER: 'true'
         DATABASE_URL: postgresql://postgres:@host.docker.internal:7432/blockscout?ssl=false
-        ECTO_USE_SSL: 'false'
-        SECRET_KEY_BASE: '56NtB48ear7+wMSf0IQuWDAAazhpb31qyc7GiyspBP2vh7t5zlCsF5QDv76chXeN'
         CHAIN_ID: '1337'
-        API_V2_ENABLED: 'true'
-        MIX_ENV: 'prod'
-        ACCOUNT_ENABLED: 'false'
     ports:
       - 4000:4000
     volumes:
       - ./logs/:/app/logs/
 
-  smart-contract-verifier:
-    extends:
-      file: ./services/docker-compose-smart-contract-verifier.yml
-      service: smart-contract-verifier
-
   visualizer:
     extends:
       file: ./services/docker-compose-visualizer.yml
diff --git a/docker-compose/docker-compose-no-build-frontend.yml b/docker-compose/docker-compose-no-build-frontend.yml
deleted file mode 100644
index 663d580398dc..000000000000
--- a/docker-compose/docker-compose-no-build-frontend.yml
+++ /dev/null
@@ -1,92 +0,0 @@
-version: '3.8'
-
-services:
-  redis_db:
-    extends:
-      file: ./services/docker-compose-redis.yml
-      service: redis_db
-
-  db:
-    extends:
-      file: ./services/docker-compose-db.yml
-      service: db
-
-  backend:
-    depends_on:
-      - db
-      - smart-contract-verifier
-      - redis_db
-    image: blockscout/blockscout:${DOCKER_TAG:-master}
-    pull_policy: always
-    restart: always
-    stop_grace_period: 5m
-    container_name: 'blockscout'
-    links:
-      - db:database
-    command: sh -c "bin/blockscout eval \"Elixir.Explorer.ReleaseTasks.create_and_migrate()\" && bin/blockscout start"
-    extra_hosts:
-      - 'host.docker.internal:host-gateway'
-    env_file:
-      -  ./envs/common-blockscout.env
-    environment:
-        ETHEREUM_JSONRPC_VARIANT: 'ganache'
-        ETHEREUM_JSONRPC_HTTP_URL: http://host.docker.internal:8545/
-        ETHEREUM_JSONRPC_TRACE_URL: http://host.docker.internal:8545/
-        ETHEREUM_JSONRPC_WS_URL: ws://host.docker.internal:8545/
-        INDEXER_DISABLE_INTERNAL_TRANSACTIONS_FETCHER: 'true'
-        INDEXER_DISABLE_PENDING_TRANSACTIONS_FETCHER: 'true'
-        DATABASE_URL: postgresql://postgres:@host.docker.internal:7432/blockscout?ssl=false
-        ECTO_USE_SSL: 'false'
-        SECRET_KEY_BASE: '56NtB48ear7+wMSf0IQuWDAAazhpb31qyc7GiyspBP2vh7t5zlCsF5QDv76chXeN'
-        CHAIN_ID: '1337'
-        API_V2_ENABLED: 'true'
-        MIX_ENV: 'prod'
-    ports:
-      - 4000:4000
-    volumes:
-      - ./logs/:/app/logs/
-
-  smart-contract-verifier:
-    extends:
-      file: ./services/docker-compose-smart-contract-verifier.yml
-      service: smart-contract-verifier
-
-  visualizer:
-    extends:
-      file: ./services/docker-compose-visualizer.yml
-      service: visualizer
-
-  sig-provider:
-    extends:
-      file: ./services/docker-compose-sig-provider.yml
-      service: sig-provider
-
-  frontend:
-    depends_on:
-      - backend
-    extends:
-      file: ./services/docker-compose-frontend.yml
-      service: frontend
-
-  stats-db:
-    depends_on:
-      - backend
-    extends:
-      file: ./services/docker-compose-stats.yml
-      service: stats-db
-
-  stats:
-    depends_on:
-      - stats-db
-    extends:
-      file: ./services/docker-compose-stats.yml
-      service: stats
-
-  proxy:
-    depends_on:
-      - backend
-      - frontend
-      - stats
-    extends:
-      file: ./services/docker-compose-nginx.yml
-      service: proxy
diff --git a/docker-compose/docker-compose-no-build-ganache.yml b/docker-compose/docker-compose-no-build-ganache.yml
index 1f6679a5eeba..f2f53e51d21c 100644
--- a/docker-compose/docker-compose-no-build-ganache.yml
+++ b/docker-compose/docker-compose-no-build-ganache.yml
@@ -11,16 +11,15 @@ services:
       file: ./services/docker-compose-db.yml
       service: db
 
-  blockscout:
+  backend:
     depends_on:
       - db
-      - smart-contract-verifier
       - redis_db
     image: blockscout/blockscout:${DOCKER_TAG:-latest}
     pull_policy: always
     restart: always
     stop_grace_period: 5m
-    container_name: 'blockscout'
+    container_name: 'backend'
     links:
       - db:database
     command: sh -c "bin/blockscout eval \"Elixir.Explorer.ReleaseTasks.create_and_migrate()\" && bin/blockscout start"
@@ -35,19 +34,12 @@ services:
         INDEXER_DISABLE_INTERNAL_TRANSACTIONS_FETCHER: 'true'
         INDEXER_DISABLE_PENDING_TRANSACTIONS_FETCHER: 'true'
         DATABASE_URL: postgresql://postgres:@host.docker.internal:7432/blockscout?ssl=false
-        ECTO_USE_SSL: 'false'
-        SECRET_KEY_BASE: '56NtB48ear7+wMSf0IQuWDAAazhpb31qyc7GiyspBP2vh7t5zlCsF5QDv76chXeN'
         CHAIN_ID: '1337'
     ports:
       - 4000:4000
     volumes:
       - ./logs/:/app/logs/
 
-  smart-contract-verifier:
-    extends:
-      file: ./services/docker-compose-smart-contract-verifier.yml
-      service: smart-contract-verifier
-
   visualizer:
     extends:
       file: ./services/docker-compose-visualizer.yml
@@ -57,3 +49,33 @@ services:
     extends:
       file: ./services/docker-compose-sig-provider.yml
       service: sig-provider
+
+  frontend:
+    depends_on:
+      - backend
+    extends:
+      file: ./services/docker-compose-frontend.yml
+      service: frontend
+
+  stats-db:
+    depends_on:
+      - backend
+    extends:
+      file: ./services/docker-compose-stats.yml
+      service: stats-db
+
+  stats:
+    depends_on:
+      - stats-db
+    extends:
+      file: ./services/docker-compose-stats.yml
+      service: stats
+
+  proxy:
+    depends_on:
+      - backend
+      - frontend
+      - stats
+    extends:
+      file: ./services/docker-compose-nginx.yml
+      service: proxy
diff --git a/docker-compose/docker-compose-no-build-geth-clique-consensus.yml b/docker-compose/docker-compose-no-build-geth-clique-consensus.yml
index 7ce75af41903..d60ef4acd2e9 100644
--- a/docker-compose/docker-compose-no-build-geth-clique-consensus.yml
+++ b/docker-compose/docker-compose-no-build-geth-clique-consensus.yml
@@ -11,16 +11,15 @@ services:
       file: ./services/docker-compose-db.yml
       service: db
 
-  blockscout:
+  backend:
     depends_on:
       - db
-      - smart-contract-verifier
       - redis_db
     image: blockscout/blockscout:${DOCKER_TAG:-latest}
     pull_policy: always
     restart: always
     stop_grace_period: 5m
-    container_name: 'blockscout'
+    container_name: 'backend'
     links:
       - db:database
     command: sh -c "bin/blockscout eval \"Elixir.Explorer.ReleaseTasks.create_and_migrate()\" && bin/blockscout start"
@@ -34,19 +33,11 @@ services:
         ETHEREUM_JSONRPC_HTTP_URL: http://host.docker.internal:8545/
         ETHEREUM_JSONRPC_TRACE_URL: http://host.docker.internal:8545/
         DATABASE_URL: postgresql://postgres:@host.docker.internal:7432/blockscout?ssl=false
-        ECTO_USE_SSL: 'false'
-        SECRET_KEY_BASE: '56NtB48ear7+wMSf0IQuWDAAazhpb31qyc7GiyspBP2vh7t5zlCsF5QDv76chXeN'
-        MIX_ENV: 'prod'
     ports:
       - 4000:4000
     volumes:
       - ./logs/:/app/logs/
 
-  smart-contract-verifier:
-    extends:
-      file: ./services/docker-compose-smart-contract-verifier.yml
-      service: smart-contract-verifier
-
   visualizer:
     extends:
       file: ./services/docker-compose-visualizer.yml
@@ -56,3 +47,33 @@ services:
     extends:
       file: ./services/docker-compose-sig-provider.yml
       service: sig-provider
+
+  frontend:
+    depends_on:
+      - backend
+    extends:
+      file: ./services/docker-compose-frontend.yml
+      service: frontend
+
+  stats-db:
+    depends_on:
+      - backend
+    extends:
+      file: ./services/docker-compose-stats.yml
+      service: stats-db
+
+  stats:
+    depends_on:
+      - stats-db
+    extends:
+      file: ./services/docker-compose-stats.yml
+      service: stats
+
+  proxy:
+    depends_on:
+      - backend
+      - frontend
+      - stats
+    extends:
+      file: ./services/docker-compose-nginx.yml
+      service: proxy
diff --git a/docker-compose/docker-compose-no-build-geth.yml b/docker-compose/docker-compose-no-build-geth.yml
index f163cdb1956a..aade4c5f9935 100644
--- a/docker-compose/docker-compose-no-build-geth.yml
+++ b/docker-compose/docker-compose-no-build-geth.yml
@@ -11,16 +11,15 @@ services:
       file: ./services/docker-compose-db.yml
       service: db
 
-  blockscout:
+  backend:
     depends_on:
       - db
-      - smart-contract-verifier
       - redis_db
     image: blockscout/blockscout:${DOCKER_TAG:-latest}
     pull_policy: always
     restart: always
     stop_grace_period: 5m
-    container_name: 'blockscout'
+    container_name: 'backend'
     links:
       - db:database
     command: sh -c "bin/blockscout eval \"Elixir.Explorer.ReleaseTasks.create_and_migrate()\" && bin/blockscout start"
@@ -33,19 +32,11 @@ services:
         ETHEREUM_JSONRPC_HTTP_URL: http://host.docker.internal:8545/
         ETHEREUM_JSONRPC_TRACE_URL: http://host.docker.internal:8545/
         DATABASE_URL: postgresql://postgres:@host.docker.internal:7432/blockscout?ssl=false
-        ECTO_USE_SSL: 'false'
-        SECRET_KEY_BASE: '56NtB48ear7+wMSf0IQuWDAAazhpb31qyc7GiyspBP2vh7t5zlCsF5QDv76chXeN'
-        MIX_ENV: 'prod'
     ports:
       - 4000:4000
     volumes:
       - ./logs/:/app/logs/
 
-  smart-contract-verifier:
-    extends:
-      file: ./services/docker-compose-smart-contract-verifier.yml
-      service: smart-contract-verifier
-
   visualizer:
     extends:
       file: ./services/docker-compose-visualizer.yml
@@ -55,3 +46,33 @@ services:
     extends:
       file: ./services/docker-compose-sig-provider.yml
       service: sig-provider
+
+  frontend:
+    depends_on:
+      - backend
+    extends:
+      file: ./services/docker-compose-frontend.yml
+      service: frontend
+
+  stats-db:
+    depends_on:
+      - backend
+    extends:
+      file: ./services/docker-compose-stats.yml
+      service: stats-db
+
+  stats:
+    depends_on:
+      - stats-db
+    extends:
+      file: ./services/docker-compose-stats.yml
+      service: stats
+
+  proxy:
+    depends_on:
+      - backend
+      - frontend
+      - stats
+    extends:
+      file: ./services/docker-compose-nginx.yml
+      service: proxy
diff --git a/docker-compose/docker-compose-no-build-hardhat-network.yml b/docker-compose/docker-compose-no-build-hardhat-network.yml
index c90e382e2c9f..b92450c464ed 100644
--- a/docker-compose/docker-compose-no-build-hardhat-network.yml
+++ b/docker-compose/docker-compose-no-build-hardhat-network.yml
@@ -11,16 +11,15 @@ services:
       file: ./services/docker-compose-db.yml
       service: db
 
-  blockscout:
+  backend:
     depends_on:
       - db
-      - smart-contract-verifier
       - redis_db
     image: blockscout/blockscout:${DOCKER_TAG:-latest}
     pull_policy: always
     restart: always
     stop_grace_period: 5m
-    container_name: 'blockscout'
+    container_name: 'backend'
     links:
       - db:database
     command: sh -c "bin/blockscout eval \"Elixir.Explorer.ReleaseTasks.create_and_migrate()\" && bin/blockscout start"
@@ -34,18 +33,11 @@ services:
         ETHEREUM_JSONRPC_WS_URL: ws://host.docker.internal:8545/
         INDEXER_DISABLE_PENDING_TRANSACTIONS_FETCHER: 'true'
         DATABASE_URL: postgresql://postgres:@host.docker.internal:7432/blockscout?ssl=false
-        ECTO_USE_SSL: 'false'
-        SECRET_KEY_BASE: '56NtB48ear7+wMSf0IQuWDAAazhpb31qyc7GiyspBP2vh7t5zlCsF5QDv76chXeN'
     ports:
       - 4000:4000
     volumes:
       - ./logs/:/app/logs/
 
-  smart-contract-verifier:
-    extends:
-      file: ./services/docker-compose-smart-contract-verifier.yml
-      service: smart-contract-verifier
-
   visualizer:
     extends:
       file: ./services/docker-compose-visualizer.yml
@@ -55,3 +47,33 @@ services:
     extends:
       file: ./services/docker-compose-sig-provider.yml
       service: sig-provider
+
+  frontend:
+    depends_on:
+      - backend
+    extends:
+      file: ./services/docker-compose-frontend.yml
+      service: frontend
+
+  stats-db:
+    depends_on:
+      - backend
+    extends:
+      file: ./services/docker-compose-stats.yml
+      service: stats-db
+
+  stats:
+    depends_on:
+      - stats-db
+    extends:
+      file: ./services/docker-compose-stats.yml
+      service: stats
+
+  proxy:
+    depends_on:
+      - backend
+      - frontend
+      - stats
+    extends:
+      file: ./services/docker-compose-nginx.yml
+      service: proxy
diff --git a/docker-compose/docker-compose-no-build-nethermind.yml b/docker-compose/docker-compose-no-build-nethermind.yml
index 9488dd597798..84488d6cf8b3 100644
--- a/docker-compose/docker-compose-no-build-nethermind.yml
+++ b/docker-compose/docker-compose-no-build-nethermind.yml
@@ -11,16 +11,15 @@ services:
       file: ./services/docker-compose-db.yml
       service: db
 
-  blockscout:
+  backend:
     depends_on:
       - db
-      - smart-contract-verifier
       - redis_db
     image: blockscout/blockscout:${DOCKER_TAG:-latest}
     pull_policy: always
     restart: always
     stop_grace_period: 5m
-    container_name: 'blockscout'
+    container_name: 'backend'
     links:
       - db:database
     command: sh -c "bin/blockscout eval \"Elixir.Explorer.ReleaseTasks.create_and_migrate()\" && bin/blockscout start"
@@ -33,19 +32,11 @@ services:
         ETHEREUM_JSONRPC_HTTP_URL: http://host.docker.internal:8545/
         ETHEREUM_JSONRPC_TRACE_URL: http://host.docker.internal:8545/
         DATABASE_URL: postgresql://postgres:@host.docker.internal:7432/blockscout?ssl=false
-        ECTO_USE_SSL: 'false'
-        SECRET_KEY_BASE: '56NtB48ear7+wMSf0IQuWDAAazhpb31qyc7GiyspBP2vh7t5zlCsF5QDv76chXeN'
-        MIX_ENV: 'prod'
     ports:
       - 4000:4000
     volumes:
       - ./logs/:/app/logs/
 
-  smart-contract-verifier:
-    extends:
-      file: ./services/docker-compose-smart-contract-verifier.yml
-      service: smart-contract-verifier
-
   visualizer:
     extends:
       file: ./services/docker-compose-visualizer.yml
@@ -55,3 +46,33 @@ services:
     extends:
       file: ./services/docker-compose-sig-provider.yml
       service: sig-provider
+
+  frontend:
+    depends_on:
+      - backend
+    extends:
+      file: ./services/docker-compose-frontend.yml
+      service: frontend
+
+  stats-db:
+    depends_on:
+      - backend
+    extends:
+      file: ./services/docker-compose-stats.yml
+      service: stats-db
+
+  stats:
+    depends_on:
+      - stats-db
+    extends:
+      file: ./services/docker-compose-stats.yml
+      service: stats
+
+  proxy:
+    depends_on:
+      - backend
+      - frontend
+      - stats
+    extends:
+      file: ./services/docker-compose-nginx.yml
+      service: proxy
diff --git a/docker-compose/docker-compose-no-build-no-db-container.yml b/docker-compose/docker-compose-no-build-no-db-container.yml
index ad4c844db6f9..8307647bb508 100644
--- a/docker-compose/docker-compose-no-build-no-db-container.yml
+++ b/docker-compose/docker-compose-no-build-no-db-container.yml
@@ -6,15 +6,14 @@ services:
       file: ./services/docker-compose-redis.yml
       service: redis_db
 
-  blockscout:
+  backend:
     depends_on:
-      - smart-contract-verifier
       - redis_db
     image: blockscout/blockscout:${DOCKER_TAG:-latest}
     pull_policy: always
     restart: always
     stop_grace_period: 5m
-    container_name: 'blockscout'
+    container_name: 'backend'
     command: sh -c "bin/blockscout eval \"Elixir.Explorer.ReleaseTasks.create_and_migrate()\" && bin/blockscout start"
     extra_hosts:
       - 'host.docker.internal:host-gateway'
@@ -24,19 +23,11 @@ services:
         ETHEREUM_JSONRPC_VARIANT: 'geth'
         ETHEREUM_JSONRPC_HTTP_URL: http://host.docker.internal:8545/
         DATABASE_URL: postgresql://postgres:@host.docker.internal:5432/blockscout?ssl=false
-        ECTO_USE_SSL: 'false'
-        SECRET_KEY_BASE: '56NtB48ear7+wMSf0IQuWDAAazhpb31qyc7GiyspBP2vh7t5zlCsF5QDv76chXeN'
-        MIX_ENV: 'prod'
     ports:
       - 4000:4000
     volumes:
       - ./logs/:/app/logs/
 
-  smart-contract-verifier:
-    extends:
-      file: ./services/docker-compose-smart-contract-verifier.yml
-      service: smart-contract-verifier
-
   visualizer:
     extends:
       file: ./services/docker-compose-visualizer.yml
@@ -46,3 +37,33 @@ services:
     extends:
       file: ./services/docker-compose-sig-provider.yml
       service: sig-provider
+
+  frontend:
+    depends_on:
+      - backend
+    extends:
+      file: ./services/docker-compose-frontend.yml
+      service: frontend
+
+  stats-db:
+    depends_on:
+      - backend
+    extends:
+      file: ./services/docker-compose-stats.yml
+      service: stats-db
+
+  stats:
+    depends_on:
+      - stats-db
+    extends:
+      file: ./services/docker-compose-stats.yml
+      service: stats
+
+  proxy:
+    depends_on:
+      - backend
+      - frontend
+      - stats
+    extends:
+      file: ./services/docker-compose-nginx.yml
+      service: proxy
diff --git a/docker-compose/docker-compose-no-rust-services.yml b/docker-compose/docker-compose-no-rust-services.yml
deleted file mode 100644
index e6a6336433ff..000000000000
--- a/docker-compose/docker-compose-no-rust-services.yml
+++ /dev/null
@@ -1,49 +0,0 @@
-version: '3.8'
-
-services:
-  redis_db:
-    extends:
-      file: ./services/docker-compose-redis.yml
-      service: redis_db
-
-  db:
-    extends:
-      file: ./services/docker-compose-db.yml
-      service: db
-
-  blockscout:
-    depends_on:
-      - db
-      - redis_db
-    image: blockscout/blockscout:${DOCKER_TAG:-latest}
-    build:
-      context: ..
-      dockerfile: ./docker/Dockerfile
-      args:
-        CACHE_EXCHANGE_RATES_PERIOD: ""
-        API_V1_READ_METHODS_DISABLED: "false"
-        DISABLE_WEBAPP: "false"
-        API_V1_WRITE_METHODS_DISABLED: "false"
-        CACHE_TOTAL_GAS_USAGE_COUNTER_ENABLED: ""
-        CACHE_ADDRESS_WITH_BALANCES_UPDATE_INTERVAL: ""
-        ADMIN_PANEL_ENABLED: ""
-        RELEASE_VERSION: 5.2.2
-        MIX_ENV: 'prod'
-    restart: always
-    stop_grace_period: 5m
-    container_name: 'blockscout'
-    links:
-      - db:database
-    command: sh -c "bin/blockscout eval \"Elixir.Explorer.ReleaseTasks.create_and_migrate()\" && bin/blockscout start"
-    extra_hosts:
-      - 'host.docker.internal:host-gateway'
-    env_file:
-      -  ./envs/common-blockscout.env
-    environment:
-        MICROSERVICE_SC_VERIFIER_ENABLED: 'false'
-        MICROSERVICE_VISUALIZE_SOL2UML_ENABLED: 'false'
-        MICROSERVICE_SIG_PROVIDER_ENABLED: 'false'
-    ports:
-      - 4000:4000
-    volumes:
-      - ./logs/:/app/logs/
diff --git a/docker-compose/docker-compose.yml b/docker-compose/docker-compose.yml
index 93552c9d9cac..906bf599ca20 100644
--- a/docker-compose/docker-compose.yml
+++ b/docker-compose/docker-compose.yml
@@ -11,12 +11,12 @@ services:
       file: ./services/docker-compose-db.yml
       service: db
 
-  blockscout:
+  backend:
     depends_on:
       - db
-      - smart-contract-verifier
       - redis_db
     image: blockscout/blockscout:${DOCKER_TAG:-latest}
+    pull_policy: always
     build:
       context: ..
       dockerfile: ./docker/Dockerfile
@@ -31,7 +31,7 @@ services:
         RELEASE_VERSION: 5.2.2
     restart: always
     stop_grace_period: 5m
-    container_name: 'blockscout'
+    container_name: 'backend'
     links:
       - db:database
     command: sh -c "bin/blockscout eval \"Elixir.Explorer.ReleaseTasks.create_and_migrate()\" && bin/blockscout start"
@@ -39,16 +39,17 @@ services:
       - 'host.docker.internal:host-gateway'
     env_file:
       -  ./envs/common-blockscout.env
+    environment:
+        ETHEREUM_JSONRPC_HTTP_URL: http://host.docker.internal:8545/
+        ETHEREUM_JSONRPC_TRACE_URL: http://host.docker.internal:8545/
+        ETHEREUM_JSONRPC_WS_URL: ws://host.docker.internal:8545/
+        DATABASE_URL: postgresql://postgres:@host.docker.internal:7432/blockscout?ssl=false
+        CHAIN_ID: '1337'
     ports:
       - 4000:4000
     volumes:
       - ./logs/:/app/logs/
 
-  smart-contract-verifier:
-    extends:
-      file: ./services/docker-compose-smart-contract-verifier.yml
-      service: smart-contract-verifier
-
   visualizer:
     extends:
       file: ./services/docker-compose-visualizer.yml
@@ -58,3 +59,33 @@ services:
     extends:
       file: ./services/docker-compose-sig-provider.yml
       service: sig-provider
+
+  frontend:
+    depends_on:
+      - backend
+    extends:
+      file: ./services/docker-compose-frontend.yml
+      service: frontend
+
+  stats-db:
+    depends_on:
+      - backend
+    extends:
+      file: ./services/docker-compose-stats.yml
+      service: stats-db
+
+  stats:
+    depends_on:
+      - stats-db
+    extends:
+      file: ./services/docker-compose-stats.yml
+      service: stats
+
+  proxy:
+    depends_on:
+      - backend
+      - frontend
+      - stats
+    extends:
+      file: ./services/docker-compose-nginx.yml
+      service: proxy
diff --git a/docker-compose/envs/common-blockscout.env b/docker-compose/envs/common-blockscout.env
index f2dea8643121..581bc0cb6278 100644
--- a/docker-compose/envs/common-blockscout.env
+++ b/docker-compose/envs/common-blockscout.env
@@ -18,7 +18,7 @@ IPC_PATH=
 NETWORK_PATH=/
 BLOCKSCOUT_HOST=
 BLOCKSCOUT_PROTOCOL=
-# SECRET_KEY_BASE=
+SECRET_KEY_BASE=56NtB48ear7+wMSf0IQuWDAAazhpb31qyc7GiyspBP2vh7t5zlCsF5QDv76chXeN
 # CHECK_ORIGIN=
 PORT=4000
 COIN_NAME=
@@ -184,8 +184,10 @@ API_RATE_LIMIT_BY_IP=3000
 API_RATE_LIMIT_UI_V2_TOKEN_TTL_IN_SECONDS=18000
 FETCH_REWARDS_WAY=trace_block
 MICROSERVICE_SC_VERIFIER_ENABLED=true
-MICROSERVICE_SC_VERIFIER_URL=http://smart-contract-verifier:8050/
-MICROSERVICE_SC_VERIFIER_TYPE=sc_verifier
+#MICROSERVICE_SC_VERIFIER_URL=http://smart-contract-verifier:8050/
+#MICROSERVICE_SC_VERIFIER_TYPE=sc_verifier
+MICROSERVICE_SC_VERIFIER_URL=https://eth-bytecode-db.services.blockscout.com/
+MICROSERVICE_SC_VERIFIER_TYPE=eth_bytecode_db
 MICROSERVICE_ETH_BYTECODE_DB_INTERVAL_BETWEEN_LOOKUPS=10m
 MICROSERVICE_VISUALIZE_SOL2UML_ENABLED=true
 MICROSERVICE_VISUALIZE_SOL2UML_URL=http://visualizer:8050/
@@ -216,3 +218,4 @@ EIP_1559_ELASTICITY_MULTIPLIER=2
 # INDEXER_TOKEN_INSTANCE_RETRY_BATCH_SIZE=10
 # INDEXER_TOKEN_INSTANCE_REALTIME_BATCH_SIZE=1
 # INDEXER_TOKEN_INSTANCE_SANITIZE_BATCH_SIZE=10
+API_V2_ENABLED=true
\ No newline at end of file
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 5a8569a1d0bc..4c1e2ab29999 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -2,11 +2,9 @@ FROM hexpm/elixir:1.14.5-erlang-25.3.2.4-alpine-3.18.2 AS builder
 
 WORKDIR /app
 
-RUN apk --no-cache --update add alpine-sdk gmp-dev automake libtool inotify-tools autoconf python3 file gcompat
+RUN apk --no-cache --update add alpine-sdk gmp-dev automake libtool inotify-tools autoconf python3 file libstdc++ curl ca-certificates gcompat
 
-ENV PORT=4000 \
-    MIX_ENV="prod" \
-    SECRET_KEY_BASE="RMgI4C1HSkxsEjdhtGMfwAHfyT6CKWXOgzCboJflfSm4jeAlic52io05KB6mqzc5"
+ENV MIX_ENV="prod"
 
 RUN apk --update add libstdc++ curl ca-certificates gcompat
 
@@ -49,11 +47,7 @@ RUN cd apps/block_scout_web/assets/ && \
     npm install && \
     npm run deploy && \
     cd /app/apps/explorer/ && \
-    npm install && \
-    apk update && \
-    apk del --force-broken-world alpine-sdk gmp-dev automake libtool inotify-tools autoconf python3
-
-RUN apk add --update git make 
+    npm install
 
 RUN export "CFLAGS=-I/usr/local/include -L/usr/local/lib" && cd deps/ex_secp256k1 && mix deps.get && mix compile
 RUN mix phx.digest
diff --git a/docker/Makefile b/docker/Makefile
index c01bfd82be69..0b4518fa1ca2 100644
--- a/docker/Makefile
+++ b/docker/Makefile
@@ -23,7 +23,7 @@ else
 	ECTO_USE_SSL = 'false'
 endif
 BLOCKSCOUT_CONTAINER_PARAMS = -e 'MIX_ENV=prod' \
-															 -e 'DATABASE_URL=$(DB_URL)'
+							  -e 'DATABASE_URL=$(DB_URL)'
 ifeq ($(SYSTEM), Linux)
 	BLOCKSCOUT_CONTAINER_PARAMS += --network=host
 endif
@@ -805,7 +805,7 @@ start: build postgres
 					-p 4000:4000 \
 					$(BS_CONTAINER_IMAGE) /bin/sh -c "./bin/blockscout start"
 
-BS_STARTED := $(shell docker ps --no-trunc --filter name=^/${BS_CONTAINER_NAME}$)
+BS_STARTED := $(shell docker ps --no-trunc --filter name=^/${BS_CONTAINER_NAME}$  | grep ${BS_CONTAINER_NAME})
 stop:
 ifdef BS_STARTED
 	@echo "==> Stopping BlockScout container."

From d371daa7c26af9291c4c5af06d6688fb6c16f430 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 18 Sep 2023 18:50:41 +0000
Subject: [PATCH 416/909] Bump photoswipe from 5.4.0 to 5.4.1 in
 /apps/block_scout_web/assets

Bumps [photoswipe](https://github.com/dimsemenov/Photoswipe) from 5.4.0 to 5.4.1.
- [Release notes](https://github.com/dimsemenov/Photoswipe/releases)
- [Commits](https://github.com/dimsemenov/Photoswipe/compare/v5.4.0...v5.4.1)

---
updated-dependencies:
- dependency-name: photoswipe
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 apps/block_scout_web/assets/package-lock.json | 14 +++++++-------
 apps/block_scout_web/assets/package.json      |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/apps/block_scout_web/assets/package-lock.json b/apps/block_scout_web/assets/package-lock.json
index e0c634a9ddf3..997cd0628189 100644
--- a/apps/block_scout_web/assets/package-lock.json
+++ b/apps/block_scout_web/assets/package-lock.json
@@ -54,7 +54,7 @@
         "path-parser": "^6.1.0",
         "phoenix": "file:../../../deps/phoenix",
         "phoenix_html": "file:../../../deps/phoenix_html",
-        "photoswipe": "^5.4.0",
+        "photoswipe": "^5.4.1",
         "pikaday": "^1.8.2",
         "popper.js": "^1.14.7",
         "reduce-reducers": "^1.0.4",
@@ -13451,9 +13451,9 @@
       "link": true
     },
     "node_modules/photoswipe": {
-      "version": "5.4.0",
-      "resolved": "https://registry.npmjs.org/photoswipe/-/photoswipe-5.4.0.tgz",
-      "integrity": "sha512-PZvdK1D94TApU0MNWc9H6eXOolKJOMkgt7CJ9ZfIdkHR4CrEj47MOe4Vrlcv6ZpHslK+uKS6Ai3y3VIe7gsi+Q==",
+      "version": "5.4.1",
+      "resolved": "https://registry.npmjs.org/photoswipe/-/photoswipe-5.4.1.tgz",
+      "integrity": "sha512-iauO0fP4oMdZvjlXzeIe8um1fZatkGE0bqdoIwpb65jlo/KK1KhfD7Z51+0YhS2tC4FOoOtE1p0c4o/HbY1s2Q==",
       "engines": {
         "node": ">= 0.12.0"
       }
@@ -27853,9 +27853,9 @@
       "version": "file:../../../deps/phoenix_html"
     },
     "photoswipe": {
-      "version": "5.4.0",
-      "resolved": "https://registry.npmjs.org/photoswipe/-/photoswipe-5.4.0.tgz",
-      "integrity": "sha512-PZvdK1D94TApU0MNWc9H6eXOolKJOMkgt7CJ9ZfIdkHR4CrEj47MOe4Vrlcv6ZpHslK+uKS6Ai3y3VIe7gsi+Q=="
+      "version": "5.4.1",
+      "resolved": "https://registry.npmjs.org/photoswipe/-/photoswipe-5.4.1.tgz",
+      "integrity": "sha512-iauO0fP4oMdZvjlXzeIe8um1fZatkGE0bqdoIwpb65jlo/KK1KhfD7Z51+0YhS2tC4FOoOtE1p0c4o/HbY1s2Q=="
     },
     "picocolors": {
       "version": "1.0.0",
diff --git a/apps/block_scout_web/assets/package.json b/apps/block_scout_web/assets/package.json
index 9cebd2eb8507..1a9c360019e9 100644
--- a/apps/block_scout_web/assets/package.json
+++ b/apps/block_scout_web/assets/package.json
@@ -66,7 +66,7 @@
     "path-parser": "^6.1.0",
     "phoenix": "file:../../../deps/phoenix",
     "phoenix_html": "file:../../../deps/phoenix_html",
-    "photoswipe": "^5.4.0",
+    "photoswipe": "^5.4.1",
     "pikaday": "^1.8.2",
     "popper.js": "^1.14.7",
     "reduce-reducers": "^1.0.4",

From 785c22c5af94b3319bfa06d9d2a32b13d0856693 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 18 Sep 2023 18:51:11 +0000
Subject: [PATCH 417/909] Bump @babel/preset-env in
 /apps/block_scout_web/assets

Bumps [@babel/preset-env](https://github.com/babel/babel/tree/HEAD/packages/babel-preset-env) from 7.22.15 to 7.22.20.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/commits/v7.22.20/packages/babel-preset-env)

---
updated-dependencies:
- dependency-name: "@babel/preset-env"
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 apps/block_scout_web/assets/package-lock.json | 34 +++++++++----------
 apps/block_scout_web/assets/package.json      |  2 +-
 2 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/apps/block_scout_web/assets/package-lock.json b/apps/block_scout_web/assets/package-lock.json
index e0c634a9ddf3..7d770be704a7 100644
--- a/apps/block_scout_web/assets/package-lock.json
+++ b/apps/block_scout_web/assets/package-lock.json
@@ -72,7 +72,7 @@
       },
       "devDependencies": {
         "@babel/core": "^7.22.19",
-        "@babel/preset-env": "^7.22.15",
+        "@babel/preset-env": "^7.22.20",
         "autoprefixer": "^10.4.15",
         "babel-loader": "^9.1.3",
         "copy-webpack-plugin": "^11.0.0",
@@ -241,9 +241,9 @@
       }
     },
     "node_modules/@babel/compat-data": {
-      "version": "7.22.9",
-      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.22.9.tgz",
-      "integrity": "sha512-5UamI7xkUcJ3i9qVDS+KFDEK8/7oJ55/sJMB1Ge7IEapr7KfdfV/HErR+koZwOfd+SgtFKOKRhRakdg++DcJpQ==",
+      "version": "7.22.20",
+      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.22.20.tgz",
+      "integrity": "sha512-BQYjKbpXjoXwFW5jGqiizJQQT/aC7pFm9Ok1OWssonuguICi264lbgMzRp2ZMmRSlfkX6DsWDDcsrctK8Rwfiw==",
       "engines": {
         "node": ">=6.9.0"
       }
@@ -1758,12 +1758,12 @@
       }
     },
     "node_modules/@babel/preset-env": {
-      "version": "7.22.15",
-      "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.22.15.tgz",
-      "integrity": "sha512-tZFHr54GBkHk6hQuVA8w4Fmq+MSPsfvMG0vPnOYyTnJpyfMqybL8/MbNCPRT9zc2KBO2pe4tq15g6Uno4Jpoag==",
+      "version": "7.22.20",
+      "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.22.20.tgz",
+      "integrity": "sha512-11MY04gGC4kSzlPHRfvVkNAZhUxOvm7DCJ37hPDnUENwe06npjIRAfInEMTGSb4LZK5ZgDFkv5hw0lGebHeTyg==",
       "dev": true,
       "dependencies": {
-        "@babel/compat-data": "^7.22.9",
+        "@babel/compat-data": "^7.22.20",
         "@babel/helper-compilation-targets": "^7.22.15",
         "@babel/helper-plugin-utils": "^7.22.5",
         "@babel/helper-validator-option": "^7.22.15",
@@ -1837,7 +1837,7 @@
         "@babel/plugin-transform-unicode-regex": "^7.22.5",
         "@babel/plugin-transform-unicode-sets-regex": "^7.22.5",
         "@babel/preset-modules": "0.1.6-no-external-plugins",
-        "@babel/types": "^7.22.15",
+        "@babel/types": "^7.22.19",
         "babel-plugin-polyfill-corejs2": "^0.4.5",
         "babel-plugin-polyfill-corejs3": "^0.8.3",
         "babel-plugin-polyfill-regenerator": "^0.5.2",
@@ -17817,9 +17817,9 @@
       }
     },
     "@babel/compat-data": {
-      "version": "7.22.9",
-      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.22.9.tgz",
-      "integrity": "sha512-5UamI7xkUcJ3i9qVDS+KFDEK8/7oJ55/sJMB1Ge7IEapr7KfdfV/HErR+koZwOfd+SgtFKOKRhRakdg++DcJpQ=="
+      "version": "7.22.20",
+      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.22.20.tgz",
+      "integrity": "sha512-BQYjKbpXjoXwFW5jGqiizJQQT/aC7pFm9Ok1OWssonuguICi264lbgMzRp2ZMmRSlfkX6DsWDDcsrctK8Rwfiw=="
     },
     "@babel/core": {
       "version": "7.22.19",
@@ -18828,12 +18828,12 @@
       }
     },
     "@babel/preset-env": {
-      "version": "7.22.15",
-      "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.22.15.tgz",
-      "integrity": "sha512-tZFHr54GBkHk6hQuVA8w4Fmq+MSPsfvMG0vPnOYyTnJpyfMqybL8/MbNCPRT9zc2KBO2pe4tq15g6Uno4Jpoag==",
+      "version": "7.22.20",
+      "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.22.20.tgz",
+      "integrity": "sha512-11MY04gGC4kSzlPHRfvVkNAZhUxOvm7DCJ37hPDnUENwe06npjIRAfInEMTGSb4LZK5ZgDFkv5hw0lGebHeTyg==",
       "dev": true,
       "requires": {
-        "@babel/compat-data": "^7.22.9",
+        "@babel/compat-data": "^7.22.20",
         "@babel/helper-compilation-targets": "^7.22.15",
         "@babel/helper-plugin-utils": "^7.22.5",
         "@babel/helper-validator-option": "^7.22.15",
@@ -18907,7 +18907,7 @@
         "@babel/plugin-transform-unicode-regex": "^7.22.5",
         "@babel/plugin-transform-unicode-sets-regex": "^7.22.5",
         "@babel/preset-modules": "0.1.6-no-external-plugins",
-        "@babel/types": "^7.22.15",
+        "@babel/types": "^7.22.19",
         "babel-plugin-polyfill-corejs2": "^0.4.5",
         "babel-plugin-polyfill-corejs3": "^0.8.3",
         "babel-plugin-polyfill-regenerator": "^0.5.2",
diff --git a/apps/block_scout_web/assets/package.json b/apps/block_scout_web/assets/package.json
index 9cebd2eb8507..5774037d46a7 100644
--- a/apps/block_scout_web/assets/package.json
+++ b/apps/block_scout_web/assets/package.json
@@ -84,7 +84,7 @@
   },
   "devDependencies": {
     "@babel/core": "^7.22.19",
-    "@babel/preset-env": "^7.22.15",
+    "@babel/preset-env": "^7.22.20",
     "autoprefixer": "^10.4.15",
     "babel-loader": "^9.1.3",
     "copy-webpack-plugin": "^11.0.0",

From cd6c671ee893e80901dee4b6a21f34262cb24203 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 18 Sep 2023 18:51:26 +0000
Subject: [PATCH 418/909] Bump viewerjs from 1.11.5 to 1.11.6 in
 /apps/block_scout_web/assets

Bumps [viewerjs](https://github.com/fengyuanchen/viewerjs) from 1.11.5 to 1.11.6.
- [Release notes](https://github.com/fengyuanchen/viewerjs/releases)
- [Changelog](https://github.com/fengyuanchen/viewerjs/blob/main/CHANGELOG.md)
- [Commits](https://github.com/fengyuanchen/viewerjs/compare/v1.11.5...v1.11.6)

---
updated-dependencies:
- dependency-name: viewerjs
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 apps/block_scout_web/assets/package-lock.json | 14 +++++++-------
 apps/block_scout_web/assets/package.json      |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/apps/block_scout_web/assets/package-lock.json b/apps/block_scout_web/assets/package-lock.json
index e0c634a9ddf3..25b107b3dd87 100644
--- a/apps/block_scout_web/assets/package-lock.json
+++ b/apps/block_scout_web/assets/package-lock.json
@@ -65,7 +65,7 @@
         "urijs": "^1.19.11",
         "url": "^0.11.3",
         "util": "^0.12.5",
-        "viewerjs": "^1.11.5",
+        "viewerjs": "^1.11.6",
         "web3": "^1.10.0",
         "web3modal": "^1.9.12",
         "xss": "^1.0.14"
@@ -16625,9 +16625,9 @@
       }
     },
     "node_modules/viewerjs": {
-      "version": "1.11.5",
-      "resolved": "https://registry.npmjs.org/viewerjs/-/viewerjs-1.11.5.tgz",
-      "integrity": "sha512-nsvQkC5jnqZ/2ggFYWUH5gpUGPtFAYidsFh8Q7B7sioAdqJzSJrELvbu9ozUm0W+A2uHN5XuuiheHHB+dWiPEA=="
+      "version": "1.11.6",
+      "resolved": "https://registry.npmjs.org/viewerjs/-/viewerjs-1.11.6.tgz",
+      "integrity": "sha512-TlhdSp2oEOLFXvEp4psKaeTjR5zBjTRcM/sHUN8PkV1UWuY8HKC8n7GaVdW5Xqnwdr/F1OmzLik1QwDjI4w/nw=="
     },
     "node_modules/w3c-hr-time": {
       "version": "1.0.2",
@@ -30120,9 +30120,9 @@
       }
     },
     "viewerjs": {
-      "version": "1.11.5",
-      "resolved": "https://registry.npmjs.org/viewerjs/-/viewerjs-1.11.5.tgz",
-      "integrity": "sha512-nsvQkC5jnqZ/2ggFYWUH5gpUGPtFAYidsFh8Q7B7sioAdqJzSJrELvbu9ozUm0W+A2uHN5XuuiheHHB+dWiPEA=="
+      "version": "1.11.6",
+      "resolved": "https://registry.npmjs.org/viewerjs/-/viewerjs-1.11.6.tgz",
+      "integrity": "sha512-TlhdSp2oEOLFXvEp4psKaeTjR5zBjTRcM/sHUN8PkV1UWuY8HKC8n7GaVdW5Xqnwdr/F1OmzLik1QwDjI4w/nw=="
     },
     "w3c-hr-time": {
       "version": "1.0.2",
diff --git a/apps/block_scout_web/assets/package.json b/apps/block_scout_web/assets/package.json
index 9cebd2eb8507..35bfacd042eb 100644
--- a/apps/block_scout_web/assets/package.json
+++ b/apps/block_scout_web/assets/package.json
@@ -77,7 +77,7 @@
     "urijs": "^1.19.11",
     "url": "^0.11.3",
     "util": "^0.12.5",
-    "viewerjs": "^1.11.5",
+    "viewerjs": "^1.11.6",
     "web3": "^1.10.0",
     "web3modal": "^1.9.12",
     "xss": "^1.0.14"

From 35e5c776558057ec5bb89c8f3eb29e060235a6af Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 18 Sep 2023 18:51:47 +0000
Subject: [PATCH 419/909] Bump @amplitude/analytics-browser in
 /apps/block_scout_web/assets

Bumps [@amplitude/analytics-browser](https://github.com/amplitude/Amplitude-TypeScript) from 2.2.3 to 2.3.1.
- [Release notes](https://github.com/amplitude/Amplitude-TypeScript/releases)
- [Commits](https://github.com/amplitude/Amplitude-TypeScript/compare/@amplitude/analytics-browser@2.2.3...@amplitude/analytics-browser@2.3.1)

---
updated-dependencies:
- dependency-name: "@amplitude/analytics-browser"
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 apps/block_scout_web/assets/package-lock.json | 130 +++++++++---------
 apps/block_scout_web/assets/package.json      |   2 +-
 2 files changed, 66 insertions(+), 66 deletions(-)

diff --git a/apps/block_scout_web/assets/package-lock.json b/apps/block_scout_web/assets/package-lock.json
index e0c634a9ddf3..e34cfb2c95db 100644
--- a/apps/block_scout_web/assets/package-lock.json
+++ b/apps/block_scout_web/assets/package-lock.json
@@ -7,7 +7,7 @@
       "name": "blockscout",
       "license": "GPL-3.0",
       "dependencies": {
-        "@amplitude/analytics-browser": "^2.2.3",
+        "@amplitude/analytics-browser": "^2.3.1",
         "@fortawesome/fontawesome-free": "^6.4.2",
         "@tarekraafat/autocomplete.js": "^10.2.7",
         "@walletconnect/web3-provider": "^1.8.0",
@@ -116,15 +116,15 @@
       }
     },
     "node_modules/@amplitude/analytics-browser": {
-      "version": "2.2.3",
-      "resolved": "https://registry.npmjs.org/@amplitude/analytics-browser/-/analytics-browser-2.2.3.tgz",
-      "integrity": "sha512-vuKG8/jqtsAFe0xK0ZGtXDxH7oPx989VIoCpUi97bkfxholySCNHjVMd5Q8D4Mqm/3eDH7YZhkFwEb0JFyCAfA==",
-      "dependencies": {
-        "@amplitude/analytics-client-common": "^2.0.5",
-        "@amplitude/analytics-core": "^2.0.4",
-        "@amplitude/analytics-types": "^2.1.2",
-        "@amplitude/plugin-page-view-tracking-browser": "^2.0.9",
-        "@amplitude/plugin-web-attribution-browser": "^2.0.9",
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/@amplitude/analytics-browser/-/analytics-browser-2.3.1.tgz",
+      "integrity": "sha512-sDX6Nupw6SSsTfaCYrrIwRys4Ins/H7TzmJimEqM4bEoKmM9ONkKFAAF+E9sQz9XvMr5iBBqbmb5Sd+u3f7SRA==",
+      "dependencies": {
+        "@amplitude/analytics-client-common": "^2.0.6",
+        "@amplitude/analytics-core": "^2.0.5",
+        "@amplitude/analytics-types": "^2.2.0",
+        "@amplitude/plugin-page-view-tracking-browser": "^2.0.11",
+        "@amplitude/plugin-web-attribution-browser": "^2.0.11",
         "tslib": "^2.4.1"
       }
     },
@@ -134,13 +134,13 @@
       "integrity": "sha512-tGyy4dAjRIEwI7BzsB0lynWgOpfqjUdq91XXAlIWD2OwKBH7oCl/GZG/HT4BOHrTlPMOASlMQ7veyTqpmRcrNA=="
     },
     "node_modules/@amplitude/analytics-client-common": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/@amplitude/analytics-client-common/-/analytics-client-common-2.0.5.tgz",
-      "integrity": "sha512-5BrGl188h4Ayx4Z2e1x4I3Z8ykC+ap65cy8ShBByiaBBrR40gnXSuLZR7xeex3lvTp2b5lMBcVCqArdRbeZrgQ==",
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/@amplitude/analytics-client-common/-/analytics-client-common-2.0.6.tgz",
+      "integrity": "sha512-jnDh0uJXztVisAOUATCOmS+tlocqJgKbaPsA0PfUmhpsjipTlp8hqrQh20wopp/A5PT0vZ91Cw4CJqkLuEAwvw==",
       "dependencies": {
         "@amplitude/analytics-connector": "^1.4.8",
-        "@amplitude/analytics-core": "^2.0.4",
-        "@amplitude/analytics-types": "^2.1.2",
+        "@amplitude/analytics-core": "^2.0.5",
+        "@amplitude/analytics-types": "^2.2.0",
         "tslib": "^2.4.1"
       }
     },
@@ -155,11 +155,11 @@
       "integrity": "sha512-T8mOYzB9RRxckzhL0NTHwdge9xuFxXEOplC8B1Y3UX3NHa3BLh7DlBUZlCOwQgMc2nxDfnSweDL5S3bhC+W90g=="
     },
     "node_modules/@amplitude/analytics-core": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/@amplitude/analytics-core/-/analytics-core-2.0.4.tgz",
-      "integrity": "sha512-AM4g1ucaAJuFqaMBg7FiqwKHveyV2QpZ3yPxw3OxNCgZz2QmqeYE1bp47x4FlfzNsoGyuYqRKs1mCbmGobAYWA==",
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/@amplitude/analytics-core/-/analytics-core-2.0.5.tgz",
+      "integrity": "sha512-ke937QKOHFeUuQxwu5fQ5X9x9KUJoe+5XnJ589Fuz0VStWwqQZl7AkgSe85cX45z0bMUdbG7q8u9y/9uaqf2SQ==",
       "dependencies": {
-        "@amplitude/analytics-types": "^2.1.2",
+        "@amplitude/analytics-types": "^2.2.0",
         "tslib": "^2.4.1"
       }
     },
@@ -169,17 +169,17 @@
       "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q=="
     },
     "node_modules/@amplitude/analytics-types": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/@amplitude/analytics-types/-/analytics-types-2.1.2.tgz",
-      "integrity": "sha512-ASKwH9g+5gglTHr7h7miK8J/ofIzuEtGRDCjnZAtRbE6+laoOfCLYPPJXMYz0k1x+rIhLO/6I6WWjT7zchmpyA=="
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/@amplitude/analytics-types/-/analytics-types-2.2.0.tgz",
+      "integrity": "sha512-HThPlsX5KnxCorQnPVNQR8WZy0/PdgAzlT5n8bubjSmzPEWQgvn8bQzD48wYXoAkEZxlfYlaSnx7IxD5j3N1Dw=="
     },
     "node_modules/@amplitude/plugin-page-view-tracking-browser": {
-      "version": "2.0.9",
-      "resolved": "https://registry.npmjs.org/@amplitude/plugin-page-view-tracking-browser/-/plugin-page-view-tracking-browser-2.0.9.tgz",
-      "integrity": "sha512-OjhAxvQ52lDcRap2sjUbYEcSM6bzeDa6SdBx6vCaeXswvjafcH9LeDPawLUHgaqvQJiAhA7lxrQ7ThfH0P6c0g==",
+      "version": "2.0.11",
+      "resolved": "https://registry.npmjs.org/@amplitude/plugin-page-view-tracking-browser/-/plugin-page-view-tracking-browser-2.0.11.tgz",
+      "integrity": "sha512-GZ5JpyZOX6Ejif+m9vE/H8XbB41OkPOLDzIudd52vVlZN/o5Pmovb5UyDW+C9osNP7mra7YeB28vrJwqN18IbQ==",
       "dependencies": {
-        "@amplitude/analytics-client-common": "^2.0.5",
-        "@amplitude/analytics-types": "^2.1.2",
+        "@amplitude/analytics-client-common": "^2.0.6",
+        "@amplitude/analytics-types": "^2.2.0",
         "tslib": "^2.4.1"
       }
     },
@@ -189,13 +189,13 @@
       "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q=="
     },
     "node_modules/@amplitude/plugin-web-attribution-browser": {
-      "version": "2.0.9",
-      "resolved": "https://registry.npmjs.org/@amplitude/plugin-web-attribution-browser/-/plugin-web-attribution-browser-2.0.9.tgz",
-      "integrity": "sha512-QrNgieAEXEBbtnsxYzfeJl2U/5XwCCvO3Dg0hntAtnTdu1A3HlN5ItRtoHg0jGBbu4jpSbvag72UlkCotqJ+Yg==",
+      "version": "2.0.11",
+      "resolved": "https://registry.npmjs.org/@amplitude/plugin-web-attribution-browser/-/plugin-web-attribution-browser-2.0.11.tgz",
+      "integrity": "sha512-5NyjGq6FaNCU2ZBuaViaqf3/x9JQOghA40gjNoGSpsogeZZbxdpZDDMWbE3Zq5+ruTGbwed6IqlrFkT3NUQyZw==",
       "dependencies": {
-        "@amplitude/analytics-client-common": "^2.0.5",
-        "@amplitude/analytics-core": "^2.0.4",
-        "@amplitude/analytics-types": "^2.1.2",
+        "@amplitude/analytics-client-common": "^2.0.6",
+        "@amplitude/analytics-core": "^2.0.5",
+        "@amplitude/analytics-types": "^2.2.0",
         "tslib": "^2.4.1"
       }
     },
@@ -17689,15 +17689,15 @@
       "dev": true
     },
     "@amplitude/analytics-browser": {
-      "version": "2.2.3",
-      "resolved": "https://registry.npmjs.org/@amplitude/analytics-browser/-/analytics-browser-2.2.3.tgz",
-      "integrity": "sha512-vuKG8/jqtsAFe0xK0ZGtXDxH7oPx989VIoCpUi97bkfxholySCNHjVMd5Q8D4Mqm/3eDH7YZhkFwEb0JFyCAfA==",
-      "requires": {
-        "@amplitude/analytics-client-common": "^2.0.5",
-        "@amplitude/analytics-core": "^2.0.4",
-        "@amplitude/analytics-types": "^2.1.2",
-        "@amplitude/plugin-page-view-tracking-browser": "^2.0.9",
-        "@amplitude/plugin-web-attribution-browser": "^2.0.9",
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/@amplitude/analytics-browser/-/analytics-browser-2.3.1.tgz",
+      "integrity": "sha512-sDX6Nupw6SSsTfaCYrrIwRys4Ins/H7TzmJimEqM4bEoKmM9ONkKFAAF+E9sQz9XvMr5iBBqbmb5Sd+u3f7SRA==",
+      "requires": {
+        "@amplitude/analytics-client-common": "^2.0.6",
+        "@amplitude/analytics-core": "^2.0.5",
+        "@amplitude/analytics-types": "^2.2.0",
+        "@amplitude/plugin-page-view-tracking-browser": "^2.0.11",
+        "@amplitude/plugin-web-attribution-browser": "^2.0.11",
         "tslib": "^2.4.1"
       },
       "dependencies": {
@@ -17709,13 +17709,13 @@
       }
     },
     "@amplitude/analytics-client-common": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/@amplitude/analytics-client-common/-/analytics-client-common-2.0.5.tgz",
-      "integrity": "sha512-5BrGl188h4Ayx4Z2e1x4I3Z8ykC+ap65cy8ShBByiaBBrR40gnXSuLZR7xeex3lvTp2b5lMBcVCqArdRbeZrgQ==",
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/@amplitude/analytics-client-common/-/analytics-client-common-2.0.6.tgz",
+      "integrity": "sha512-jnDh0uJXztVisAOUATCOmS+tlocqJgKbaPsA0PfUmhpsjipTlp8hqrQh20wopp/A5PT0vZ91Cw4CJqkLuEAwvw==",
       "requires": {
         "@amplitude/analytics-connector": "^1.4.8",
-        "@amplitude/analytics-core": "^2.0.4",
-        "@amplitude/analytics-types": "^2.1.2",
+        "@amplitude/analytics-core": "^2.0.5",
+        "@amplitude/analytics-types": "^2.2.0",
         "tslib": "^2.4.1"
       },
       "dependencies": {
@@ -17732,11 +17732,11 @@
       "integrity": "sha512-T8mOYzB9RRxckzhL0NTHwdge9xuFxXEOplC8B1Y3UX3NHa3BLh7DlBUZlCOwQgMc2nxDfnSweDL5S3bhC+W90g=="
     },
     "@amplitude/analytics-core": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/@amplitude/analytics-core/-/analytics-core-2.0.4.tgz",
-      "integrity": "sha512-AM4g1ucaAJuFqaMBg7FiqwKHveyV2QpZ3yPxw3OxNCgZz2QmqeYE1bp47x4FlfzNsoGyuYqRKs1mCbmGobAYWA==",
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/@amplitude/analytics-core/-/analytics-core-2.0.5.tgz",
+      "integrity": "sha512-ke937QKOHFeUuQxwu5fQ5X9x9KUJoe+5XnJ589Fuz0VStWwqQZl7AkgSe85cX45z0bMUdbG7q8u9y/9uaqf2SQ==",
       "requires": {
-        "@amplitude/analytics-types": "^2.1.2",
+        "@amplitude/analytics-types": "^2.2.0",
         "tslib": "^2.4.1"
       },
       "dependencies": {
@@ -17748,17 +17748,17 @@
       }
     },
     "@amplitude/analytics-types": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/@amplitude/analytics-types/-/analytics-types-2.1.2.tgz",
-      "integrity": "sha512-ASKwH9g+5gglTHr7h7miK8J/ofIzuEtGRDCjnZAtRbE6+laoOfCLYPPJXMYz0k1x+rIhLO/6I6WWjT7zchmpyA=="
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/@amplitude/analytics-types/-/analytics-types-2.2.0.tgz",
+      "integrity": "sha512-HThPlsX5KnxCorQnPVNQR8WZy0/PdgAzlT5n8bubjSmzPEWQgvn8bQzD48wYXoAkEZxlfYlaSnx7IxD5j3N1Dw=="
     },
     "@amplitude/plugin-page-view-tracking-browser": {
-      "version": "2.0.9",
-      "resolved": "https://registry.npmjs.org/@amplitude/plugin-page-view-tracking-browser/-/plugin-page-view-tracking-browser-2.0.9.tgz",
-      "integrity": "sha512-OjhAxvQ52lDcRap2sjUbYEcSM6bzeDa6SdBx6vCaeXswvjafcH9LeDPawLUHgaqvQJiAhA7lxrQ7ThfH0P6c0g==",
+      "version": "2.0.11",
+      "resolved": "https://registry.npmjs.org/@amplitude/plugin-page-view-tracking-browser/-/plugin-page-view-tracking-browser-2.0.11.tgz",
+      "integrity": "sha512-GZ5JpyZOX6Ejif+m9vE/H8XbB41OkPOLDzIudd52vVlZN/o5Pmovb5UyDW+C9osNP7mra7YeB28vrJwqN18IbQ==",
       "requires": {
-        "@amplitude/analytics-client-common": "^2.0.5",
-        "@amplitude/analytics-types": "^2.1.2",
+        "@amplitude/analytics-client-common": "^2.0.6",
+        "@amplitude/analytics-types": "^2.2.0",
         "tslib": "^2.4.1"
       },
       "dependencies": {
@@ -17770,13 +17770,13 @@
       }
     },
     "@amplitude/plugin-web-attribution-browser": {
-      "version": "2.0.9",
-      "resolved": "https://registry.npmjs.org/@amplitude/plugin-web-attribution-browser/-/plugin-web-attribution-browser-2.0.9.tgz",
-      "integrity": "sha512-QrNgieAEXEBbtnsxYzfeJl2U/5XwCCvO3Dg0hntAtnTdu1A3HlN5ItRtoHg0jGBbu4jpSbvag72UlkCotqJ+Yg==",
+      "version": "2.0.11",
+      "resolved": "https://registry.npmjs.org/@amplitude/plugin-web-attribution-browser/-/plugin-web-attribution-browser-2.0.11.tgz",
+      "integrity": "sha512-5NyjGq6FaNCU2ZBuaViaqf3/x9JQOghA40gjNoGSpsogeZZbxdpZDDMWbE3Zq5+ruTGbwed6IqlrFkT3NUQyZw==",
       "requires": {
-        "@amplitude/analytics-client-common": "^2.0.5",
-        "@amplitude/analytics-core": "^2.0.4",
-        "@amplitude/analytics-types": "^2.1.2",
+        "@amplitude/analytics-client-common": "^2.0.6",
+        "@amplitude/analytics-core": "^2.0.5",
+        "@amplitude/analytics-types": "^2.2.0",
         "tslib": "^2.4.1"
       },
       "dependencies": {
diff --git a/apps/block_scout_web/assets/package.json b/apps/block_scout_web/assets/package.json
index 9cebd2eb8507..c5c2135b3a86 100644
--- a/apps/block_scout_web/assets/package.json
+++ b/apps/block_scout_web/assets/package.json
@@ -20,7 +20,7 @@
   },
   "dependencies": {
     "@fortawesome/fontawesome-free": "^6.4.2",
-    "@amplitude/analytics-browser": "^2.2.3",
+    "@amplitude/analytics-browser": "^2.3.1",
     "@tarekraafat/autocomplete.js": "^10.2.7",
     "@walletconnect/web3-provider": "^1.8.0",
     "assert": "^2.1.0",

From 776f30d9d52b27e406d69a5d200b4a174c8e0e27 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 19 Sep 2023 05:55:33 +0000
Subject: [PATCH 420/909] Bump @babel/core from 7.22.19 to 7.22.20 in
 /apps/block_scout_web/assets

Bumps [@babel/core](https://github.com/babel/babel/tree/HEAD/packages/babel-core) from 7.22.19 to 7.22.20.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/commits/v7.22.20/packages/babel-core)

---
updated-dependencies:
- dependency-name: "@babel/core"
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 apps/block_scout_web/assets/package-lock.json | 82 +++++++++----------
 apps/block_scout_web/assets/package.json      |  2 +-
 2 files changed, 42 insertions(+), 42 deletions(-)

diff --git a/apps/block_scout_web/assets/package-lock.json b/apps/block_scout_web/assets/package-lock.json
index a49606228145..712a235f8037 100644
--- a/apps/block_scout_web/assets/package-lock.json
+++ b/apps/block_scout_web/assets/package-lock.json
@@ -71,7 +71,7 @@
         "xss": "^1.0.14"
       },
       "devDependencies": {
-        "@babel/core": "^7.22.19",
+        "@babel/core": "^7.22.20",
         "@babel/preset-env": "^7.22.20",
         "autoprefixer": "^10.4.15",
         "babel-loader": "^9.1.3",
@@ -249,19 +249,19 @@
       }
     },
     "node_modules/@babel/core": {
-      "version": "7.22.19",
-      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.22.19.tgz",
-      "integrity": "sha512-Q8Yj5X4LHVYTbLCKVz0//2D2aDmHF4xzCdEttYvKOnWvErGsa6geHXD6w46x64n5tP69VfeH+IfSrdyH3MLhwA==",
+      "version": "7.22.20",
+      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.22.20.tgz",
+      "integrity": "sha512-Y6jd1ahLubuYweD/zJH+vvOY141v4f9igNQAQ+MBgq9JlHS2iTsZKn1aMsb3vGccZsXI16VzTBw52Xx0DWmtnA==",
       "dependencies": {
         "@ampproject/remapping": "^2.2.0",
         "@babel/code-frame": "^7.22.13",
         "@babel/generator": "^7.22.15",
         "@babel/helper-compilation-targets": "^7.22.15",
-        "@babel/helper-module-transforms": "^7.22.19",
+        "@babel/helper-module-transforms": "^7.22.20",
         "@babel/helpers": "^7.22.15",
         "@babel/parser": "^7.22.16",
         "@babel/template": "^7.22.15",
-        "@babel/traverse": "^7.22.19",
+        "@babel/traverse": "^7.22.20",
         "@babel/types": "^7.22.19",
         "convert-source-map": "^1.7.0",
         "debug": "^4.1.0",
@@ -399,9 +399,9 @@
       }
     },
     "node_modules/@babel/helper-environment-visitor": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.22.5.tgz",
-      "integrity": "sha512-XGmhECfVA/5sAt+H+xpSg0mfrHq6FzNr9Oxh7PSEBBRUb/mL7Kz3NICXb194rCqAEdxkhPT1a88teizAFyvk8Q==",
+      "version": "7.22.20",
+      "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.22.20.tgz",
+      "integrity": "sha512-zfedSIzFhat/gFhWfHtgWvlec0nqB9YEIVrpuwjruLlXfUSnA8cJB0miHKwqDnQ7d32aKo2xt88/xZptwxbfhA==",
       "engines": {
         "node": ">=6.9.0"
       }
@@ -453,15 +453,15 @@
       }
     },
     "node_modules/@babel/helper-module-transforms": {
-      "version": "7.22.19",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.22.19.tgz",
-      "integrity": "sha512-m6h1cJvn+OJ+R3jOHp30faq5xKJ7VbjwDj5RGgHuRlU9hrMeKsGC+JpihkR5w1g7IfseCPPtZ0r7/hB4UKaYlA==",
+      "version": "7.22.20",
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.22.20.tgz",
+      "integrity": "sha512-dLT7JVWIUUxKOs1UnJUBR3S70YK+pKX6AbJgB2vMIvEkZkrfJDbYDJesnPshtKV4LhDOR3Oc5YULeDizRek+5A==",
       "dependencies": {
-        "@babel/helper-environment-visitor": "^7.22.5",
+        "@babel/helper-environment-visitor": "^7.22.20",
         "@babel/helper-module-imports": "^7.22.15",
         "@babel/helper-simple-access": "^7.22.5",
         "@babel/helper-split-export-declaration": "^7.22.6",
-        "@babel/helper-validator-identifier": "^7.22.19"
+        "@babel/helper-validator-identifier": "^7.22.20"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -567,9 +567,9 @@
       }
     },
     "node_modules/@babel/helper-validator-identifier": {
-      "version": "7.22.19",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.19.tgz",
-      "integrity": "sha512-Tinq7ybnEPFFXhlYOYFiSjespWQk0dq2dRNAiMdRTOYQzEGqnnNyrTxPYHP5r6wGjlF1rFgABdDV0g8EwD6Qbg==",
+      "version": "7.22.20",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.20.tgz",
+      "integrity": "sha512-Y4OZ+ytlatR8AI+8KZfKuL5urKp7qey08ha31L8b3BwewJAoJamTzyvxPR/5D+KkdJCGPq/+8TukHBlY10FX9A==",
       "engines": {
         "node": ">=6.9.0"
       }
@@ -1938,13 +1938,13 @@
       }
     },
     "node_modules/@babel/traverse": {
-      "version": "7.22.19",
-      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.22.19.tgz",
-      "integrity": "sha512-ZCcpVPK64krfdScRbpxF6xA5fz7IOsfMwx1tcACvCzt6JY+0aHkBk7eIU8FRDSZRU5Zei6Z4JfgAxN1bqXGECg==",
+      "version": "7.22.20",
+      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.22.20.tgz",
+      "integrity": "sha512-eU260mPZbU7mZ0N+X10pxXhQFMGTeLb9eFS0mxehS8HZp9o1uSnFeWQuG1UPrlxgA7QoUzFhOnilHDp0AXCyHw==",
       "dependencies": {
         "@babel/code-frame": "^7.22.13",
         "@babel/generator": "^7.22.15",
-        "@babel/helper-environment-visitor": "^7.22.5",
+        "@babel/helper-environment-visitor": "^7.22.20",
         "@babel/helper-function-name": "^7.22.5",
         "@babel/helper-hoist-variables": "^7.22.5",
         "@babel/helper-split-export-declaration": "^7.22.6",
@@ -17822,19 +17822,19 @@
       "integrity": "sha512-BQYjKbpXjoXwFW5jGqiizJQQT/aC7pFm9Ok1OWssonuguICi264lbgMzRp2ZMmRSlfkX6DsWDDcsrctK8Rwfiw=="
     },
     "@babel/core": {
-      "version": "7.22.19",
-      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.22.19.tgz",
-      "integrity": "sha512-Q8Yj5X4LHVYTbLCKVz0//2D2aDmHF4xzCdEttYvKOnWvErGsa6geHXD6w46x64n5tP69VfeH+IfSrdyH3MLhwA==",
+      "version": "7.22.20",
+      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.22.20.tgz",
+      "integrity": "sha512-Y6jd1ahLubuYweD/zJH+vvOY141v4f9igNQAQ+MBgq9JlHS2iTsZKn1aMsb3vGccZsXI16VzTBw52Xx0DWmtnA==",
       "requires": {
         "@ampproject/remapping": "^2.2.0",
         "@babel/code-frame": "^7.22.13",
         "@babel/generator": "^7.22.15",
         "@babel/helper-compilation-targets": "^7.22.15",
-        "@babel/helper-module-transforms": "^7.22.19",
+        "@babel/helper-module-transforms": "^7.22.20",
         "@babel/helpers": "^7.22.15",
         "@babel/parser": "^7.22.16",
         "@babel/template": "^7.22.15",
-        "@babel/traverse": "^7.22.19",
+        "@babel/traverse": "^7.22.20",
         "@babel/types": "^7.22.19",
         "convert-source-map": "^1.7.0",
         "debug": "^4.1.0",
@@ -17940,9 +17940,9 @@
       }
     },
     "@babel/helper-environment-visitor": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.22.5.tgz",
-      "integrity": "sha512-XGmhECfVA/5sAt+H+xpSg0mfrHq6FzNr9Oxh7PSEBBRUb/mL7Kz3NICXb194rCqAEdxkhPT1a88teizAFyvk8Q=="
+      "version": "7.22.20",
+      "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.22.20.tgz",
+      "integrity": "sha512-zfedSIzFhat/gFhWfHtgWvlec0nqB9YEIVrpuwjruLlXfUSnA8cJB0miHKwqDnQ7d32aKo2xt88/xZptwxbfhA=="
     },
     "@babel/helper-function-name": {
       "version": "7.22.5",
@@ -17979,15 +17979,15 @@
       }
     },
     "@babel/helper-module-transforms": {
-      "version": "7.22.19",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.22.19.tgz",
-      "integrity": "sha512-m6h1cJvn+OJ+R3jOHp30faq5xKJ7VbjwDj5RGgHuRlU9hrMeKsGC+JpihkR5w1g7IfseCPPtZ0r7/hB4UKaYlA==",
+      "version": "7.22.20",
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.22.20.tgz",
+      "integrity": "sha512-dLT7JVWIUUxKOs1UnJUBR3S70YK+pKX6AbJgB2vMIvEkZkrfJDbYDJesnPshtKV4LhDOR3Oc5YULeDizRek+5A==",
       "requires": {
-        "@babel/helper-environment-visitor": "^7.22.5",
+        "@babel/helper-environment-visitor": "^7.22.20",
         "@babel/helper-module-imports": "^7.22.15",
         "@babel/helper-simple-access": "^7.22.5",
         "@babel/helper-split-export-declaration": "^7.22.6",
-        "@babel/helper-validator-identifier": "^7.22.19"
+        "@babel/helper-validator-identifier": "^7.22.20"
       }
     },
     "@babel/helper-optimise-call-expression": {
@@ -18057,9 +18057,9 @@
       "integrity": "sha512-mM4COjgZox8U+JcXQwPijIZLElkgEpO5rsERVDJTc2qfCDfERyob6k5WegS14SX18IIjv+XD+GrqNumY5JRCDw=="
     },
     "@babel/helper-validator-identifier": {
-      "version": "7.22.19",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.19.tgz",
-      "integrity": "sha512-Tinq7ybnEPFFXhlYOYFiSjespWQk0dq2dRNAiMdRTOYQzEGqnnNyrTxPYHP5r6wGjlF1rFgABdDV0g8EwD6Qbg=="
+      "version": "7.22.20",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.20.tgz",
+      "integrity": "sha512-Y4OZ+ytlatR8AI+8KZfKuL5urKp7qey08ha31L8b3BwewJAoJamTzyvxPR/5D+KkdJCGPq/+8TukHBlY10FX9A=="
     },
     "@babel/helper-validator-option": {
       "version": "7.22.15",
@@ -18986,13 +18986,13 @@
       }
     },
     "@babel/traverse": {
-      "version": "7.22.19",
-      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.22.19.tgz",
-      "integrity": "sha512-ZCcpVPK64krfdScRbpxF6xA5fz7IOsfMwx1tcACvCzt6JY+0aHkBk7eIU8FRDSZRU5Zei6Z4JfgAxN1bqXGECg==",
+      "version": "7.22.20",
+      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.22.20.tgz",
+      "integrity": "sha512-eU260mPZbU7mZ0N+X10pxXhQFMGTeLb9eFS0mxehS8HZp9o1uSnFeWQuG1UPrlxgA7QoUzFhOnilHDp0AXCyHw==",
       "requires": {
         "@babel/code-frame": "^7.22.13",
         "@babel/generator": "^7.22.15",
-        "@babel/helper-environment-visitor": "^7.22.5",
+        "@babel/helper-environment-visitor": "^7.22.20",
         "@babel/helper-function-name": "^7.22.5",
         "@babel/helper-hoist-variables": "^7.22.5",
         "@babel/helper-split-export-declaration": "^7.22.6",
diff --git a/apps/block_scout_web/assets/package.json b/apps/block_scout_web/assets/package.json
index 981dba874617..a8966a0bf044 100644
--- a/apps/block_scout_web/assets/package.json
+++ b/apps/block_scout_web/assets/package.json
@@ -83,7 +83,7 @@
     "xss": "^1.0.14"
   },
   "devDependencies": {
-    "@babel/core": "^7.22.19",
+    "@babel/core": "^7.22.20",
     "@babel/preset-env": "^7.22.20",
     "autoprefixer": "^10.4.15",
     "babel-loader": "^9.1.3",

From 024435cd8ebb2776de43543e21f7a1ce01f6c67a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 19 Sep 2023 18:31:08 +0000
Subject: [PATCH 421/909] Bump postcss from 8.4.29 to 8.4.30 in
 /apps/block_scout_web/assets

Bumps [postcss](https://github.com/postcss/postcss) from 8.4.29 to 8.4.30.
- [Release notes](https://github.com/postcss/postcss/releases)
- [Changelog](https://github.com/postcss/postcss/blob/main/CHANGELOG.md)
- [Commits](https://github.com/postcss/postcss/compare/8.4.29...8.4.30)

---
updated-dependencies:
- dependency-name: postcss
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 apps/block_scout_web/assets/package-lock.json | 14 +++++++-------
 apps/block_scout_web/assets/package.json      |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/apps/block_scout_web/assets/package-lock.json b/apps/block_scout_web/assets/package-lock.json
index b9c07f19b598..d540e43cf0c5 100644
--- a/apps/block_scout_web/assets/package-lock.json
+++ b/apps/block_scout_web/assets/package-lock.json
@@ -87,7 +87,7 @@
         "jest": "^29.7.0",
         "jest-environment-jsdom": "^29.7.0",
         "mini-css-extract-plugin": "^2.7.6",
-        "postcss": "^8.4.29",
+        "postcss": "^8.4.30",
         "postcss-loader": "^7.3.3",
         "sass": "^1.67.0",
         "sass-loader": "^13.3.2",
@@ -13613,9 +13613,9 @@
       }
     },
     "node_modules/postcss": {
-      "version": "8.4.29",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.29.tgz",
-      "integrity": "sha512-cbI+jaqIeu/VGqXEarWkRCCffhjgXc0qjBtXpqJhTBohMUjUQnbBr0xqX3vEKudc4iviTewcJo5ajcec5+wdJw==",
+      "version": "8.4.30",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.30.tgz",
+      "integrity": "sha512-7ZEao1g4kd68l97aWG/etQKPKq07us0ieSZ2TnFDk11i0ZfDW2AwKHYU8qv4MZKqN2fdBfg+7q0ES06UA73C1g==",
       "dev": true,
       "funding": [
         {
@@ -27955,9 +27955,9 @@
       "integrity": "sha512-Wb4p1J4zyFTbM+u6WuO4XstYx4Ky9Cewe4DWrel7B0w6VVICvPwdOpotjzcf6eD8TsckVnIMNONQyPIUFOUbCQ=="
     },
     "postcss": {
-      "version": "8.4.29",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.29.tgz",
-      "integrity": "sha512-cbI+jaqIeu/VGqXEarWkRCCffhjgXc0qjBtXpqJhTBohMUjUQnbBr0xqX3vEKudc4iviTewcJo5ajcec5+wdJw==",
+      "version": "8.4.30",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.30.tgz",
+      "integrity": "sha512-7ZEao1g4kd68l97aWG/etQKPKq07us0ieSZ2TnFDk11i0ZfDW2AwKHYU8qv4MZKqN2fdBfg+7q0ES06UA73C1g==",
       "dev": true,
       "requires": {
         "nanoid": "^3.3.6",
diff --git a/apps/block_scout_web/assets/package.json b/apps/block_scout_web/assets/package.json
index 539b083d914d..2781472614f7 100644
--- a/apps/block_scout_web/assets/package.json
+++ b/apps/block_scout_web/assets/package.json
@@ -99,7 +99,7 @@
     "jest": "^29.7.0",
     "jest-environment-jsdom": "^29.7.0",
     "mini-css-extract-plugin": "^2.7.6",
-    "postcss": "^8.4.29",
+    "postcss": "^8.4.30",
     "postcss-loader": "^7.3.3",
     "sass": "^1.67.0",
     "sass-loader": "^13.3.2",

From 29b9d96bfb9d626540fdc159968af4c23b14f7c6 Mon Sep 17 00:00:00 2001
From: Viktor Baranov <baranov.viktor.27@gmail.com>
Date: Wed, 20 Sep 2023 14:18:31 +0300
Subject: [PATCH 422/909] Fix arm docker image build

---
 CHANGELOG.md      | 1 +
 docker/Dockerfile | 8 +++-----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3206c76823dd..a94bb0a0769e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -31,6 +31,7 @@
 
 ### Chore
 
+- [#8493](https://github.com/blockscout/blockscout/pull/8493) - Fix arm docker image build
 - [#8478](https://github.com/blockscout/blockscout/pull/8478) - Set integration with Blockscout's eth bytecode DB endpoint by default and other enhancements
 - [#8442](https://github.com/blockscout/blockscout/pull/8442) - Unify burn address definition
 - [#8321](https://github.com/blockscout/blockscout/pull/8321) - Add curl into resulting Docker image
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 4c1e2ab29999..aba6de879ff1 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -1,12 +1,10 @@
-FROM hexpm/elixir:1.14.5-erlang-25.3.2.4-alpine-3.18.2 AS builder
+FROM bitwalker/alpine-elixir-phoenix:1.14 AS builder
 
 WORKDIR /app
 
-RUN apk --no-cache --update add alpine-sdk gmp-dev automake libtool inotify-tools autoconf python3 file libstdc++ curl ca-certificates gcompat
-
 ENV MIX_ENV="prod"
 
-RUN apk --update add libstdc++ curl ca-certificates gcompat
+RUN apk --no-cache --update add alpine-sdk gmp-dev automake libtool inotify-tools autoconf python3 file libstdc++ curl ca-certificates
 
 ARG CACHE_EXCHANGE_RATES_PERIOD
 ARG API_V1_READ_METHODS_DISABLED
@@ -57,7 +55,7 @@ RUN mkdir -p /opt/release \
   && mv _build/${MIX_ENV}/rel/blockscout /opt/release
 
 ##############################################################
-FROM hexpm/elixir:1.14.5-erlang-25.3.2.4-alpine-3.18.2
+FROM bitwalker/alpine-elixir-phoenix:1.14
 
 ARG RELEASE_VERSION
 ENV RELEASE_VERSION=${RELEASE_VERSION}

From 30a9efc49fa0bd36344bd02a2b5dad861bb08a11 Mon Sep 17 00:00:00 2001
From: Viktor Baranov <baranov.viktor.27@gmail.com>
Date: Wed, 20 Sep 2023 14:35:09 +0300
Subject: [PATCH 423/909] Add release announcement in Slack

---
 .../publish-docker-image-release.yml          | 94 +++++++++++--------
 CHANGELOG.md                                  |  1 +
 2 files changed, 54 insertions(+), 41 deletions(-)

diff --git a/.github/workflows/publish-docker-image-release.yml b/.github/workflows/publish-docker-image-release.yml
index 918abd13067d..e9aa32d9beb3 100644
--- a/.github/workflows/publish-docker-image-release.yml
+++ b/.github/workflows/publish-docker-image-release.yml
@@ -69,44 +69,56 @@ jobs:
             BLOCKSCOUT_VERSION=v${{ env.RELEASE_VERSION }}-beta
             RELEASE_VERSION=${{ env.RELEASE_VERSION }}
 
-  merge-master-after-release:
-    name: Merge 'master' to specific branch after release
-    runs-on: ubuntu-latest
-    env:
-      BRANCHES: |
-        production-core-stg
-        production-sokol-stg
-        production-eth-stg-experimental
-        production-eth-goerli-stg
-        production-lukso-stg
-        production-xdai-stg
-        production-polygon-supernets-stg
-        production-rsk-stg
-        production-immutable-stg
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set Git config
-      run: |
-          git config --local user.email "actions@github.com"
-          git config --local user.name "Github Actions"
-    - name: Merge master back after release
-      run: |
-          git fetch --unshallow
-          touch errors.txt
-          for branch in $BRANCHES;
-          do
-            git reset --merge
-            git checkout master
-            git fetch origin
-            echo $branch
-            git ls-remote --exit-code --heads origin $branch || { echo $branch >> errors.txt; continue; }
-            echo "Merge 'master' to $branch"
-            git checkout $branch
-            git pull || { echo $branch >> errors.txt; continue; }
-            git merge --no-ff master -m "Auto-merge master back to $branch" || { echo $branch >> errors.txt; continue; }
-            git push || { echo $branch >> errors.txt; continue; }
-            git checkout master;
-          done
-          [ -s errors.txt ] && echo "There are problems with merging 'master' to branches:" || echo "Errors file is empty"
-          cat errors.txt
-          [ ! -s errors.txt ]
+      - name: Send release announcement to Slack workflow
+        id: slack
+        uses: slackapi/slack-github-action@v1.24.0
+        with:
+          payload: |
+            {
+              "release-version": "${{ env.RELEASE_VERSION }}",
+              "release-link": "https://github.com/blockscout/blockscout/releases/tag/v${{ env.RELEASE_VERSION }}-beta"
+            }
+        env:
+          SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}
+
+  # merge-master-after-release:
+  #   name: Merge 'master' to specific branch after release
+  #   runs-on: ubuntu-latest
+  #   env:
+  #     BRANCHES: |
+  #       production-core-stg
+  #       production-sokol-stg
+  #       production-eth-stg-experimental
+  #       production-eth-goerli-stg
+  #       production-lukso-stg
+  #       production-xdai-stg
+  #       production-polygon-supernets-stg
+  #       production-rsk-stg
+  #       production-immutable-stg
+  #   steps:
+  #   - uses: actions/checkout@v2
+  #   - name: Set Git config
+  #     run: |
+  #         git config --local user.email "actions@github.com"
+  #         git config --local user.name "Github Actions"
+  #   - name: Merge master back after release
+  #     run: |
+  #         git fetch --unshallow
+  #         touch errors.txt
+  #         for branch in $BRANCHES;
+  #         do
+  #           git reset --merge
+  #           git checkout master
+  #           git fetch origin
+  #           echo $branch
+  #           git ls-remote --exit-code --heads origin $branch || { echo $branch >> errors.txt; continue; }
+  #           echo "Merge 'master' to $branch"
+  #           git checkout $branch
+  #           git pull || { echo $branch >> errors.txt; continue; }
+  #           git merge --no-ff master -m "Auto-merge master back to $branch" || { echo $branch >> errors.txt; continue; }
+  #           git push || { echo $branch >> errors.txt; continue; }
+  #           git checkout master;
+  #         done
+  #         [ -s errors.txt ] && echo "There are problems with merging 'master' to branches:" || echo "Errors file is empty"
+  #         cat errors.txt
+  #         [ ! -s errors.txt ]
diff --git a/CHANGELOG.md b/CHANGELOG.md
index a94bb0a0769e..3cfe1d9180ff 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -31,6 +31,7 @@
 
 ### Chore
 
+- [#8494](https://github.com/blockscout/blockscout/pull/8494) - Add release announcement in Slack
 - [#8493](https://github.com/blockscout/blockscout/pull/8493) - Fix arm docker image build
 - [#8478](https://github.com/blockscout/blockscout/pull/8478) - Set integration with Blockscout's eth bytecode DB endpoint by default and other enhancements
 - [#8442](https://github.com/blockscout/blockscout/pull/8442) - Unify burn address definition

From cddf90a2ec97cb3b18568fddd20bc5cc04681a1d Mon Sep 17 00:00:00 2001
From: Victor Baranov <baranov.viktor.27@gmail.com>
Date: Wed, 20 Sep 2023 14:50:20 +0300
Subject: [PATCH 424/909] Revert "Bump hackney from 1.18.1 to 1.18.2"

---
 mix.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/mix.lock b/mix.lock
index 6fff474571f3..8e136fc15db7 100644
--- a/mix.lock
+++ b/mix.lock
@@ -14,7 +14,7 @@
   "bypass": {:hex, :bypass, "2.1.0", "909782781bf8e20ee86a9cabde36b259d44af8b9f38756173e8f5e2e1fabb9b1", [:mix], [{:plug, "~> 1.7", [hex: :plug, repo: "hexpm", optional: false]}, {:plug_cowboy, "~> 2.0", [hex: :plug_cowboy, repo: "hexpm", optional: false]}, {:ranch, "~> 1.3", [hex: :ranch, repo: "hexpm", optional: false]}], "hexpm", "d9b5df8fa5b7a6efa08384e9bbecfe4ce61c77d28a4282f79e02f1ef78d96b80"},
   "castore": {:hex, :castore, "1.0.3", "7130ba6d24c8424014194676d608cb989f62ef8039efd50ff4b3f33286d06db8", [:mix], [], "hexpm", "680ab01ef5d15b161ed6a95449fac5c6b8f60055677a8e79acf01b27baa4390b"},
   "cbor": {:hex, :cbor, "1.0.1", "39511158e8ea5a57c1fcb9639aaa7efde67129678fee49ebbda780f6f24959b0", [:mix], [], "hexpm", "5431acbe7a7908f17f6a9cd43311002836a34a8ab01876918d8cfb709cd8b6a2"},
-  "certifi": {:hex, :certifi, "2.12.0", "2d1cca2ec95f59643862af91f001478c9863c2ac9cb6e2f89780bfd8de987329", [:rebar3], [], "hexpm", "ee68d85df22e554040cdb4be100f33873ac6051387baf6a8f6ce82272340ff1c"},
+  "certifi": {:hex, :certifi, "2.9.0", "6f2a475689dd47f19fb74334859d460a2dc4e3252a3324bd2111b8f0429e7e21", [:rebar3], [], "hexpm", "266da46bdb06d6c6d35fde799bcb28d36d985d424ad7c08b5bb48f5b5cdd4641"},
   "cldr_utils": {:hex, :cldr_utils, "2.24.1", "5ff8c8c55f96666228827bcf85a23d632022def200566346545d01d15e4c30dc", [:mix], [{:castore, "~> 0.1 or ~> 1.0", [hex: :castore, repo: "hexpm", optional: true]}, {:certifi, "~> 2.5", [hex: :certifi, repo: "hexpm", optional: true]}, {:decimal, "~> 1.9 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: false]}], "hexpm", "1820300531b5b849d0bc468e5a87cd64f8f2c5191916f548cbe69b2efc203780"},
   "cloak": {:hex, :cloak, "1.1.2", "7e0006c2b0b98d976d4f559080fabefd81f0e0a50a3c4b621f85ceeb563e80bb", [:mix], [{:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}], "hexpm", "940d5ac4fcd51b252930fd112e319ea5ae6ab540b722f3ca60a85666759b9585"},
   "cloak_ecto": {:hex, :cloak_ecto, "1.2.0", "e86a3df3bf0dc8980f70406bcb0af2858bac247d55494d40bc58a152590bd402", [:mix], [{:cloak, "~> 1.1.1", [hex: :cloak, repo: "hexpm", optional: false]}, {:ecto, "~> 3.0", [hex: :ecto, repo: "hexpm", optional: false]}], "hexpm", "8bcc677185c813fe64b786618bd6689b1707b35cd95acaae0834557b15a0c62f"},
@@ -64,7 +64,7 @@
   "flow": {:hex, :flow, "1.2.4", "1dd58918287eb286656008777cb32714b5123d3855956f29aa141ebae456922d", [:mix], [{:gen_stage, "~> 1.0", [hex: :gen_stage, repo: "hexpm", optional: false]}], "hexpm", "874adde96368e71870f3510b91e35bc31652291858c86c0e75359cbdd35eb211"},
   "gen_stage": {:hex, :gen_stage, "1.2.1", "19d8b5e9a5996d813b8245338a28246307fd8b9c99d1237de199d21efc4c76a1", [:mix], [], "hexpm", "83e8be657fa05b992ffa6ac1e3af6d57aa50aace8f691fcf696ff02f8335b001"},
   "gettext": {:hex, :gettext, "0.23.1", "821e619a240e6000db2fc16a574ef68b3bd7fe0167ccc264a81563cc93e67a31", [:mix], [{:expo, "~> 0.4.0", [hex: :expo, repo: "hexpm", optional: false]}], "hexpm", "19d744a36b809d810d610b57c27b934425859d158ebd56561bc41f7eeb8795db"},
-  "hackney": {:hex, :hackney, "1.18.2", "d7ff544ddae5e1cb49e9cf7fa4e356d7f41b283989a1c304bfc47a8cc1cf966f", [:rebar3], [{:certifi, "~>2.12.0", [hex: :certifi, repo: "hexpm", optional: false]}, {:idna, "~>6.1.0", [hex: :idna, repo: "hexpm", optional: false]}, {:metrics, "~>1.0.0", [hex: :metrics, repo: "hexpm", optional: false]}, {:mimerl, "~>1.1", [hex: :mimerl, repo: "hexpm", optional: false]}, {:parse_trans, "3.4.1", [hex: :parse_trans, repo: "hexpm", optional: false]}, {:ssl_verify_fun, "~>1.1.0", [hex: :ssl_verify_fun, repo: "hexpm", optional: false]}, {:unicode_util_compat, "~>0.7.0", [hex: :unicode_util_compat, repo: "hexpm", optional: false]}], "hexpm", "af94d5c9f97857db257090a4a10e5426ecb6f4918aa5cc666798566ae14b65fd"},
+  "hackney": {:hex, :hackney, "1.18.1", "f48bf88f521f2a229fc7bae88cf4f85adc9cd9bcf23b5dc8eb6a1788c662c4f6", [:rebar3], [{:certifi, "~>2.9.0", [hex: :certifi, repo: "hexpm", optional: false]}, {:idna, "~>6.1.0", [hex: :idna, repo: "hexpm", optional: false]}, {:metrics, "~>1.0.0", [hex: :metrics, repo: "hexpm", optional: false]}, {:mimerl, "~>1.1", [hex: :mimerl, repo: "hexpm", optional: false]}, {:parse_trans, "3.3.1", [hex: :parse_trans, repo: "hexpm", optional: false]}, {:ssl_verify_fun, "~>1.1.0", [hex: :ssl_verify_fun, repo: "hexpm", optional: false]}, {:unicode_util_compat, "~>0.7.0", [hex: :unicode_util_compat, repo: "hexpm", optional: false]}], "hexpm", "a4ecdaff44297e9b5894ae499e9a070ea1888c84afdd1fd9b7b2bc384950128e"},
   "hammer": {:hex, :hammer, "6.1.0", "f263e3c3e9946bd410ea0336b2abe0cb6260af4afb3a221e1027540706e76c55", [:make, :mix], [{:poolboy, "~> 1.5", [hex: :poolboy, repo: "hexpm", optional: false]}], "hexpm", "b47e415a562a6d072392deabcd58090d8a41182cf9044cdd6b0d0faaaf68ba57"},
   "hammer_backend_redis": {:hex, :hammer_backend_redis, "6.1.2", "eb296bb4924928e24135308b2afc189201fd09411c870c6bbadea444a49b2f2c", [:mix], [{:hammer, "~> 6.0", [hex: :hammer, repo: "hexpm", optional: false]}, {:redix, "~> 1.1", [hex: :redix, repo: "hexpm", optional: false]}], "hexpm", "217ea066278910543a5e9b577d5bf2425419446b94fe76bdd9f255f39feec9fa"},
   "html_entities": {:hex, :html_entities, "0.5.2", "9e47e70598da7de2a9ff6af8758399251db6dbb7eebe2b013f2bbd2515895c3c", [:mix], [], "hexpm", "c53ba390403485615623b9531e97696f076ed415e8d8058b1dbaa28181f4fdcc"},
@@ -97,7 +97,7 @@
   "oauth2": {:hex, :oauth2, "2.0.1", "70729503e05378697b958919bb2d65b002ba6b28c8112328063648a9348aaa3f", [:mix], [{:hackney, "~> 1.13", [hex: :hackney, repo: "hexpm", optional: false]}], "hexpm", "c64e20d4d105bcdbcbe03170fb530d0eddc3a3e6b135a87528a22c8aecf74c52"},
   "optimal": {:hex, :optimal, "0.3.6", "46bbf52fbbbd238cda81e02560caa84f93a53c75620f1fe19e81e4ae7b07d1dd", [:mix], [], "hexpm", "1a06ea6a653120226b35b283a1cd10039550f2c566edcdec22b29316d73640fd"},
   "parallel_stream": {:hex, :parallel_stream, "1.1.0", "f52f73eb344bc22de335992377413138405796e0d0ad99d995d9977ac29f1ca9", [:mix], [], "hexpm", "684fd19191aedfaf387bbabbeb8ff3c752f0220c8112eb907d797f4592d6e871"},
-  "parse_trans": {:hex, :parse_trans, "3.4.1", "6e6aa8167cb44cc8f39441d05193be6e6f4e7c2946cb2759f015f8c56b76e5ff", [:rebar3], [], "hexpm", "620a406ce75dada827b82e453c19cf06776be266f5a67cff34e1ef2cbb60e49a"},
+  "parse_trans": {:hex, :parse_trans, "3.3.1", "16328ab840cc09919bd10dab29e431da3af9e9e7e7e6f0089dd5a2d2820011d8", [:rebar3], [], "hexpm", "07cd9577885f56362d414e8c4c4e6bdf10d43a8767abb92d24cbe8b24c54888b"},
   "phoenix": {:hex, :phoenix, "1.5.14", "2d5db884be496eefa5157505ec0134e66187cb416c072272420c5509d67bf808", [:mix], [{:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}, {:phoenix_html, "~> 2.13 or ~> 3.0", [hex: :phoenix_html, repo: "hexpm", optional: true]}, {:phoenix_pubsub, "~> 2.0", [hex: :phoenix_pubsub, repo: "hexpm", optional: false]}, {:plug, "~> 1.10", [hex: :plug, repo: "hexpm", optional: false]}, {:plug_cowboy, "~> 1.0 or ~> 2.2", [hex: :plug_cowboy, repo: "hexpm", optional: true]}, {:plug_crypto, "~> 1.1.2 or ~> 1.2", [hex: :plug_crypto, repo: "hexpm", optional: false]}, {:telemetry, "~> 0.4 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "207f1aa5520320cbb7940d7ff2dde2342162cf513875848f88249ea0ba02fef7"},
   "phoenix_ecto": {:hex, :phoenix_ecto, "4.4.2", "b21bd01fdeffcfe2fab49e4942aa938b6d3e89e93a480d4aee58085560a0bc0d", [:mix], [{:ecto, "~> 3.5", [hex: :ecto, repo: "hexpm", optional: false]}, {:phoenix_html, "~> 2.14.2 or ~> 3.0", [hex: :phoenix_html, repo: "hexpm", optional: true]}, {:plug, "~> 1.9", [hex: :plug, repo: "hexpm", optional: false]}], "hexpm", "70242edd4601d50b69273b057ecf7b684644c19ee750989fd555625ae4ce8f5d"},
   "phoenix_html": {:hex, :phoenix_html, "3.0.4", "232d41884fe6a9c42d09f48397c175cd6f0d443aaa34c7424da47604201df2e1", [:mix], [{:plug, "~> 1.5", [hex: :plug, repo: "hexpm", optional: true]}], "hexpm", "ce17fd3cf815b2ed874114073e743507704b1f5288bb03c304a77458485efc8b"},

From 6728fe4ac2580d27dec3efc1d486a7740ae2a2d7 Mon Sep 17 00:00:00 2001
From: Viktor Baranov <baranov.viktor.27@gmail.com>
Date: Wed, 20 Sep 2023 15:22:39 +0300
Subject: [PATCH 425/909] v5.2.3

---
 .../publish-docker-image-every-push.yml       |  2 +-
 .../publish-docker-image-for-core.yml         |  2 +-
 .../publish-docker-image-for-eth-goerli.yml   |  2 +-
 .../publish-docker-image-for-eth.yml          |  2 +-
 .../publish-docker-image-for-immutable.yml    |  2 +-
 .../publish-docker-image-for-l2-staging.yml   |  2 +-
 .../publish-docker-image-for-lukso.yml        |  2 +-
 .../publish-docker-image-for-optimism.yml     |  2 +-
 .../publish-docker-image-for-rsk.yml          |  2 +-
 .../publish-docker-image-for-xdai.yml         |  2 +-
 .../publish-docker-image-for-zksync.yml       |  2 +-
 .../publish-docker-image-release.yml          |  2 +-
 CHANGELOG.md                                  | 69 ++++++++++++++++++-
 apps/block_scout_web/mix.exs                  |  2 +-
 apps/ethereum_jsonrpc/mix.exs                 |  2 +-
 apps/explorer/mix.exs                         |  2 +-
 apps/indexer/mix.exs                          |  2 +-
 docker-compose/docker-compose.yml             |  2 +-
 docker/Makefile                               |  2 +-
 mix.exs                                       |  2 +-
 rel/config.exs                                |  2 +-
 21 files changed, 88 insertions(+), 21 deletions(-)

diff --git a/.github/workflows/publish-docker-image-every-push.yml b/.github/workflows/publish-docker-image-every-push.yml
index c748dfd25ea2..0548205deae1 100644
--- a/.github/workflows/publish-docker-image-every-push.yml
+++ b/.github/workflows/publish-docker-image-every-push.yml
@@ -7,7 +7,7 @@ on:
 env:
   OTP_VERSION: '25.2.1'
   ELIXIR_VERSION: '1.14.3'
-  RELEASE_VERSION: 5.2.2
+  RELEASE_VERSION: 5.2.3
 
 jobs:
   push_to_registry:
diff --git a/.github/workflows/publish-docker-image-for-core.yml b/.github/workflows/publish-docker-image-for-core.yml
index 48470e040e3a..52f5e4645762 100644
--- a/.github/workflows/publish-docker-image-for-core.yml
+++ b/.github/workflows/publish-docker-image-for-core.yml
@@ -14,7 +14,7 @@ jobs:
     name: Push Docker image to Docker Hub
     runs-on: ubuntu-latest
     env:
-      RELEASE_VERSION: 5.2.2
+      RELEASE_VERSION: 5.2.3
       DOCKER_CHAIN_NAME: poa
     steps:
       - name: Check out the repo
diff --git a/.github/workflows/publish-docker-image-for-eth-goerli.yml b/.github/workflows/publish-docker-image-for-eth-goerli.yml
index 95c8e9fa996f..bb79109025b6 100644
--- a/.github/workflows/publish-docker-image-for-eth-goerli.yml
+++ b/.github/workflows/publish-docker-image-for-eth-goerli.yml
@@ -14,7 +14,7 @@ jobs:
     name: Push Docker image to Docker Hub
     runs-on: ubuntu-latest
     env:
-      RELEASE_VERSION: 5.2.2
+      RELEASE_VERSION: 5.2.3
       DOCKER_CHAIN_NAME: eth-goerli
     steps:
       - name: Check out the repo
diff --git a/.github/workflows/publish-docker-image-for-eth.yml b/.github/workflows/publish-docker-image-for-eth.yml
index 237eec76e5cd..9095a49265c3 100644
--- a/.github/workflows/publish-docker-image-for-eth.yml
+++ b/.github/workflows/publish-docker-image-for-eth.yml
@@ -14,7 +14,7 @@ jobs:
     name: Push Docker image to Docker Hub
     runs-on: ubuntu-latest
     env:
-      RELEASE_VERSION: 5.2.2
+      RELEASE_VERSION: 5.2.3
       DOCKER_CHAIN_NAME: mainnet
     steps:
       - name: Check out the repo
diff --git a/.github/workflows/publish-docker-image-for-immutable.yml b/.github/workflows/publish-docker-image-for-immutable.yml
index 92eff232935f..4a21d0f9a86a 100644
--- a/.github/workflows/publish-docker-image-for-immutable.yml
+++ b/.github/workflows/publish-docker-image-for-immutable.yml
@@ -17,7 +17,7 @@ jobs:
     name: Push Docker image to Docker Hub
     runs-on: ubuntu-latest
     env:
-      RELEASE_VERSION: 5.2.2
+      RELEASE_VERSION: 5.2.3
       DOCKER_CHAIN_NAME: immutable
     steps:
       - name: Check out the repo
diff --git a/.github/workflows/publish-docker-image-for-l2-staging.yml b/.github/workflows/publish-docker-image-for-l2-staging.yml
index a95c63ad9e66..f05ff42df5b4 100644
--- a/.github/workflows/publish-docker-image-for-l2-staging.yml
+++ b/.github/workflows/publish-docker-image-for-l2-staging.yml
@@ -14,7 +14,7 @@ jobs:
     name: Push Docker image to Docker Hub
     runs-on: ubuntu-latest
     env:
-      RELEASE_VERSION: 5.2.2
+      RELEASE_VERSION: 5.2.3
       DOCKER_CHAIN_NAME: optimism-l2-advanced
     steps:
       - name: Check out the repo
diff --git a/.github/workflows/publish-docker-image-for-lukso.yml b/.github/workflows/publish-docker-image-for-lukso.yml
index 8279c009f00f..0775d2b59bf5 100644
--- a/.github/workflows/publish-docker-image-for-lukso.yml
+++ b/.github/workflows/publish-docker-image-for-lukso.yml
@@ -14,7 +14,7 @@ jobs:
     name: Push Docker image to Docker Hub
     runs-on: ubuntu-latest
     env:
-      RELEASE_VERSION: 5.2.2
+      RELEASE_VERSION: 5.2.3
       DOCKER_CHAIN_NAME: lukso
     steps:
       - name: Check out the repo
diff --git a/.github/workflows/publish-docker-image-for-optimism.yml b/.github/workflows/publish-docker-image-for-optimism.yml
index 7c7bd2f11e64..3601cff8ae7e 100644
--- a/.github/workflows/publish-docker-image-for-optimism.yml
+++ b/.github/workflows/publish-docker-image-for-optimism.yml
@@ -14,7 +14,7 @@ jobs:
     name: Push Docker image to Docker Hub
     runs-on: ubuntu-latest
     env:
-      RELEASE_VERSION: 5.2.2
+      RELEASE_VERSION: 5.2.3
       DOCKER_CHAIN_NAME: optimism
     steps:
       - name: Check out the repo
diff --git a/.github/workflows/publish-docker-image-for-rsk.yml b/.github/workflows/publish-docker-image-for-rsk.yml
index 5eb97cf0de37..a596128b8731 100644
--- a/.github/workflows/publish-docker-image-for-rsk.yml
+++ b/.github/workflows/publish-docker-image-for-rsk.yml
@@ -14,7 +14,7 @@ jobs:
     name: Push Docker image to Docker Hub
     runs-on: ubuntu-latest
     env:
-      RELEASE_VERSION: 5.2.2
+      RELEASE_VERSION: 5.2.3
       DOCKER_CHAIN_NAME: rsk
     steps:
       - name: Check out the repo
diff --git a/.github/workflows/publish-docker-image-for-xdai.yml b/.github/workflows/publish-docker-image-for-xdai.yml
index 37295fedd354..0129b45997f3 100644
--- a/.github/workflows/publish-docker-image-for-xdai.yml
+++ b/.github/workflows/publish-docker-image-for-xdai.yml
@@ -17,7 +17,7 @@ jobs:
     name: Push Docker image to Docker Hub
     runs-on: ubuntu-latest
     env:
-      RELEASE_VERSION: 5.2.2
+      RELEASE_VERSION: 5.2.3
       DOCKER_CHAIN_NAME: xdai
     steps:
       - name: Check out the repo
diff --git a/.github/workflows/publish-docker-image-for-zksync.yml b/.github/workflows/publish-docker-image-for-zksync.yml
index e37e195a118a..dbd13e3b3237 100644
--- a/.github/workflows/publish-docker-image-for-zksync.yml
+++ b/.github/workflows/publish-docker-image-for-zksync.yml
@@ -14,7 +14,7 @@ jobs:
     name: Push Docker image to Docker Hub
     runs-on: ubuntu-latest
     env:
-      RELEASE_VERSION: 5.2.2
+      RELEASE_VERSION: 5.2.3
       DOCKER_CHAIN_NAME: zksync
     steps:
       - name: Check out the repo
diff --git a/.github/workflows/publish-docker-image-release.yml b/.github/workflows/publish-docker-image-release.yml
index 918abd13067d..c01f1cc1a606 100644
--- a/.github/workflows/publish-docker-image-release.yml
+++ b/.github/workflows/publish-docker-image-release.yml
@@ -18,7 +18,7 @@ jobs:
     name: Push Docker image to Docker Hub
     runs-on: ubuntu-latest
     env:
-      RELEASE_VERSION: 5.2.2
+      RELEASE_VERSION: 5.2.3
     steps:
       - name: Check out the repo
         uses: actions/checkout@v3
diff --git a/CHANGELOG.md b/CHANGELOG.md
index a94bb0a0769e..1cbe39190a2b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,14 @@
 
 ### Features
 
+### Fixes
+
+### Chore
+
+## 5.2.3-beta
+
+### Features
+
 - [#8382](https://github.com/blockscout/blockscout/pull/8382) - Add sitemap.xml
 - [#8313](https://github.com/blockscout/blockscout/pull/8313) - Add batches to TokenInstance fetchers
 - [#8285](https://github.com/blockscout/blockscout/pull/8285), [#8399](https://github.com/blockscout/blockscout/pull/8399) - Add CG/CMC coin price sources
@@ -40,7 +48,66 @@
 
 <details>
   <summary>Dependencies version bumps</summary>
-
+- [#8244](https://github.com/blockscout/blockscout/pull/8244) - Bump core-js from 3.32.0 to 3.32.1 in /apps/block_scout_web/assets
+- [#8243](https://github.com/blockscout/blockscout/pull/8243) - Bump sass from 1.65.1 to 1.66.0 in /apps/block_scout_web/assets
+- [#8259](https://github.com/blockscout/blockscout/pull/8259) - Bump sweetalert2 from 11.7.23 to 11.7.27 in /apps/block_scout_web/assets
+- [#8258](https://github.com/blockscout/blockscout/pull/8258) - Bump sass from 1.66.0 to 1.66.1 in /apps/block_scout_web/assets
+- [#8260](https://github.com/blockscout/blockscout/pull/8260) - Bump jest from 29.6.2 to 29.6.3 in /apps/block_scout_web/assets
+- [#8261](https://github.com/blockscout/blockscout/pull/8261) - Bump eslint-plugin-import from 2.28.0 to 2.28.1 in /apps/block_scout_web/assets
+- [#8262](https://github.com/blockscout/blockscout/pull/8262) - Bump jest-environment-jsdom from 29.6.2 to 29.6.3 in /apps/block_scout_web/assets
+- [#8275](https://github.com/blockscout/blockscout/pull/8275) - Bump ecto_sql from 3.10.1 to 3.10.2
+- [#8284](https://github.com/blockscout/blockscout/pull/8284) - Bump luxon from 3.4.0 to 3.4.1 in /apps/block_scout_web/assets
+- [#8294](https://github.com/blockscout/blockscout/pull/8294) - Bump chart.js from 4.3.3 to 4.4.0 in /apps/block_scout_web/assets
+- [#8295](https://github.com/blockscout/blockscout/pull/8295) - Bump jest from 29.6.3 to 29.6.4 in /apps/block_scout_web/assets
+- [#8296](https://github.com/blockscout/blockscout/pull/8296) - Bump jest-environment-jsdom from 29.6.3 to 29.6.4 in /apps/block_scout_web/assets
+- [#8297](https://github.com/blockscout/blockscout/pull/8297) - Bump @babel/core from 7.22.10 to 7.22.11 in /apps/block_scout_web/assets
+- [#8305](https://github.com/blockscout/blockscout/pull/8305) - Bump @amplitude/analytics-browser from 2.2.0 to 2.2.1 in /apps/block_scout_web/assets
+- [#8342](https://github.com/blockscout/blockscout/pull/8342) - Bump postgrex from 0.17.2 to 0.17.3
+- [#8341](https://github.com/blockscout/blockscout/pull/8341) - Bump hackney from 1.18.1 to 1.18.2
+- [#8343](https://github.com/blockscout/blockscout/pull/8343) - Bump @amplitude/analytics-browser from 2.2.1 to 2.2.2 in /apps/block_scout_web/assets
+- [#8344](https://github.com/blockscout/blockscout/pull/8344) - Bump postcss from 8.4.28 to 8.4.29 in /apps/block_scout_web/assets
+- [#8330](https://github.com/blockscout/blockscout/pull/8330) - Bump bignumber.js from 9.1.1 to 9.1.2 in /apps/block_scout_web/assets
+- [#8332](https://github.com/blockscout/blockscout/pull/8332) - Bump jquery from 3.7.0 to 3.7.1 in /apps/block_scout_web/assets
+- [#8329](https://github.com/blockscout/blockscout/pull/8329) - Bump viewerjs from 1.11.4 to 1.11.5 in /apps/block_scout_web/assets
+- [#8328](https://github.com/blockscout/blockscout/pull/8328) - Bump eslint from 8.47.0 to 8.48.0 in /apps/block_scout_web/assets
+- [#8325](https://github.com/blockscout/blockscout/pull/8325) - Bump exvcr from 0.14.3 to 0.14.4
+- [#8323](https://github.com/blockscout/blockscout/pull/8323) - Bump ex_doc from 0.30.5 to 0.30.6
+- [#8322](https://github.com/blockscout/blockscout/pull/8322) - Bump dialyxir from 1.3.0 to 1.4.0
+- [#8326](https://github.com/blockscout/blockscout/pull/8326) - Bump comeonin from 5.3.3 to 5.4.0
+- [#8331](https://github.com/blockscout/blockscout/pull/8331) - Bump luxon from 3.4.1 to 3.4.2 in /apps/block_scout_web/assets
+- [#8324](https://github.com/blockscout/blockscout/pull/8324) - Bump spandex_datadog from 1.3.0 to 1.4.0
+- [#8327](https://github.com/blockscout/blockscout/pull/8327) - Bump bcrypt_elixir from 3.0.1 to 3.1.0
+- [#8358](https://github.com/blockscout/blockscout/pull/8358) - Bump @babel/preset-env from 7.22.10 to 7.22.14 in /apps/block_scout_web/assets
+- [#8365](https://github.com/blockscout/blockscout/pull/8365) - Bump dialyxir from 1.4.0 to 1.4.1
+- [#8374](https://github.com/blockscout/blockscout/pull/8374) - Bump @amplitude/analytics-browser from 2.2.2 to 2.2.3 in /apps/block_scout_web/assets
+- [#8373](https://github.com/blockscout/blockscout/pull/8373) - Bump ex_secp256k1 from 0.7.0 to 0.7.1
+- [#8391](https://github.com/blockscout/blockscout/pull/8391) - Bump @babel/preset-env from 7.22.14 to 7.22.15 in /apps/block_scout_web/assets
+- [#8390](https://github.com/blockscout/blockscout/pull/8390) - Bump photoswipe from 5.3.8 to 5.3.9 in /apps/block_scout_web/assets
+- [#8389](https://github.com/blockscout/blockscout/pull/8389) - Bump @babel/core from 7.22.11 to 7.22.15 in /apps/block_scout_web/assets
+- [#8392](https://github.com/blockscout/blockscout/pull/8392) - Bump ex_cldr_numbers from 2.31.3 to 2.32.0
+- [#8400](https://github.com/blockscout/blockscout/pull/8400) - Bump ex_secp256k1 from 0.7.1 to 0.7.2
+- [#8405](https://github.com/blockscout/blockscout/pull/8405) - Bump luxon from 3.4.2 to 3.4.3 in /apps/block_scout_web/assets
+- [#8404](https://github.com/blockscout/blockscout/pull/8404) - Bump ex_abi from 0.6.0 to 0.6.1
+- [#8410](https://github.com/blockscout/blockscout/pull/8410) - Bump core-js from 3.32.1 to 3.32.2 in /apps/block_scout_web/assets
+- [#8418](https://github.com/blockscout/blockscout/pull/8418) - Bump url from 0.11.1 to 0.11.2 in /apps/block_scout_web/assets
+- [#8416](https://github.com/blockscout/blockscout/pull/8416) - Bump @babel/core from 7.22.15 to 7.22.17 in /apps/block_scout_web/assets
+- [#8419](https://github.com/blockscout/blockscout/pull/8419) - Bump assert from 2.0.0 to 2.1.0 in /apps/block_scout_web/assets
+- [#8417](https://github.com/blockscout/blockscout/pull/8417) - Bump photoswipe from 5.3.9 to 5.4.0 in /apps/block_scout_web/assets
+- [#8441](https://github.com/blockscout/blockscout/pull/8441) - Bump eslint from 8.48.0 to 8.49.0 in /apps/block_scout_web/assets
+- [#8439](https://github.com/blockscout/blockscout/pull/8439) - Bump ex_cldr_numbers from 2.32.0 to 2.32.1
+- [#8444](https://github.com/blockscout/blockscout/pull/8444) - Bump ex_cldr_numbers from 2.32.1 to 2.32.2
+- [#8445](https://github.com/blockscout/blockscout/pull/8445) - Bump ex_abi from 0.6.1 to 0.6.2
+- [#8450](https://github.com/blockscout/blockscout/pull/8450) - Bump jest-environment-jsdom from 29.6.4 to 29.7.0 in /apps/block_scout_web/assets
+- [#8451](https://github.com/blockscout/blockscout/pull/8451) - Bump jest from 29.6.4 to 29.7.0 in /apps/block_scout_web/assets
+- [#8463](https://github.com/blockscout/blockscout/pull/8463) - Bump sass from 1.66.1 to 1.67.0 in /apps/block_scout_web/assets
+- [#8464](https://github.com/blockscout/blockscout/pull/8464) - Bump @babel/core from 7.22.17 to 7.22.19 in /apps/block_scout_web/assets
+- [#8462](https://github.com/blockscout/blockscout/pull/8462) - Bump sweetalert2 from 11.7.27 to 11.7.28 in /apps/block_scout_web/assets
+- [#8479](https://github.com/blockscout/blockscout/pull/8479) - Bump photoswipe from 5.4.0 to 5.4.1 in /apps/block_scout_web/assets
+- [#8483](https://github.com/blockscout/blockscout/pull/8483) - Bump @amplitude/analytics-browser from 2.2.3 to 2.3.1 in /apps/block_scout_web/assets
+- [#8481](https://github.com/blockscout/blockscout/pull/8481) - Bump @babel/preset-env from 7.22.15 to 7.22.20 in /apps/block_scout_web/assets
+- [#8480](https://github.com/blockscout/blockscout/pull/8480) - Bump @babel/core from 7.22.19 to 7.22.20 in /apps/block_scout_web/assets
+- [#8482](https://github.com/blockscout/blockscout/pull/8482) - Bump viewerjs from 1.11.5 to 1.11.6 in /apps/block_scout_web/assets
+- [#8489](https://github.com/blockscout/blockscout/pull/8489) - Bump postcss from 8.4.29 to 8.4.30 in /apps/block_scout_web/assets
 </details>
 
 ## 5.2.2-beta
diff --git a/apps/block_scout_web/mix.exs b/apps/block_scout_web/mix.exs
index 01efe54cadbf..58acfaa8e402 100644
--- a/apps/block_scout_web/mix.exs
+++ b/apps/block_scout_web/mix.exs
@@ -23,7 +23,7 @@ defmodule BlockScoutWeb.Mixfile do
         dialyzer: :test
       ],
       start_permanent: Mix.env() == :prod,
-      version: "5.2.2"
+      version: "5.2.3"
     ]
   end
 
diff --git a/apps/ethereum_jsonrpc/mix.exs b/apps/ethereum_jsonrpc/mix.exs
index 5c4003d17880..c72ae2a9a707 100644
--- a/apps/ethereum_jsonrpc/mix.exs
+++ b/apps/ethereum_jsonrpc/mix.exs
@@ -23,7 +23,7 @@ defmodule EthereumJsonrpc.MixProject do
         dialyzer: :test
       ],
       start_permanent: Mix.env() == :prod,
-      version: "5.2.2"
+      version: "5.2.3"
     ]
   end
 
diff --git a/apps/explorer/mix.exs b/apps/explorer/mix.exs
index 7bf6eb62cc2d..387b6e5f4342 100644
--- a/apps/explorer/mix.exs
+++ b/apps/explorer/mix.exs
@@ -24,7 +24,7 @@ defmodule Explorer.Mixfile do
         dialyzer: :test
       ],
       start_permanent: Mix.env() == :prod,
-      version: "5.2.2",
+      version: "5.2.3",
       xref: [exclude: [BlockScoutWeb.WebRouter.Helpers]]
     ]
   end
diff --git a/apps/indexer/mix.exs b/apps/indexer/mix.exs
index 444a7a27e772..d0555486a0c0 100644
--- a/apps/indexer/mix.exs
+++ b/apps/indexer/mix.exs
@@ -14,7 +14,7 @@ defmodule Indexer.MixProject do
       elixirc_paths: elixirc_paths(Mix.env()),
       lockfile: "../../mix.lock",
       start_permanent: Mix.env() == :prod,
-      version: "5.2.2"
+      version: "5.2.3"
     ]
   end
 
diff --git a/docker-compose/docker-compose.yml b/docker-compose/docker-compose.yml
index 906bf599ca20..1f2a1f0a37e4 100644
--- a/docker-compose/docker-compose.yml
+++ b/docker-compose/docker-compose.yml
@@ -28,7 +28,7 @@ services:
         CACHE_TOTAL_GAS_USAGE_COUNTER_ENABLED: ""
         CACHE_ADDRESS_WITH_BALANCES_UPDATE_INTERVAL: ""
         ADMIN_PANEL_ENABLED: ""
-        RELEASE_VERSION: 5.2.2
+        RELEASE_VERSION: 5.2.3
     restart: always
     stop_grace_period: 5m
     container_name: 'backend'
diff --git a/docker/Makefile b/docker/Makefile
index 0b4518fa1ca2..c01e2b0540c0 100644
--- a/docker/Makefile
+++ b/docker/Makefile
@@ -7,7 +7,7 @@ BS_CONTAINER_NAME := blockscout
 PG_CONTAINER_IMAGE := postgres:14
 PG_CONTAINER_NAME := db
 THIS_FILE = $(lastword $(MAKEFILE_LIST))
-RELEASE_VERSION ?= '5.2.2'
+RELEASE_VERSION ?= '5.2.3'
 PORT ?= '4000'
 TAG := $(RELEASE_VERSION)-commit-$(shell git log -1 --pretty=format:"%h")
 STABLE_TAG := $(RELEASE_VERSION)
diff --git a/mix.exs b/mix.exs
index 9983272fe866..bcd86c8316ea 100644
--- a/mix.exs
+++ b/mix.exs
@@ -7,7 +7,7 @@ defmodule BlockScout.Mixfile do
     [
       # app: :block_scout,
       # aliases: aliases(config_env()),
-      version: "5.2.2",
+      version: "5.2.3",
       apps_path: "apps",
       deps: deps(),
       dialyzer: dialyzer(),
diff --git a/rel/config.exs b/rel/config.exs
index 3782a1b80d82..3754ba0c5de4 100644
--- a/rel/config.exs
+++ b/rel/config.exs
@@ -71,7 +71,7 @@ end
 # will be used by default
 
 release :blockscout do
-  set version: "5.2.2-beta"
+  set version: "5.2.3-beta"
   set applications: [
     :runtime_tools,
     block_scout_web: :permanent,

From aa18728bcd446a201d3b2856baaf6d1b5d2b0691 Mon Sep 17 00:00:00 2001
From: Viktor Baranov <baranov.viktor.27@gmail.com>
Date: Wed, 20 Sep 2023 23:03:55 +0300
Subject: [PATCH 426/909] Conceal secondary ports in docker compose setup

---
 CHANGELOG.md                                  |  2 +
 docker-compose/README.md                      | 38 +++++++++++++------
 .../docker-compose-no-build-erigon.yml        |  2 -
 ...ker-compose-no-build-external-frontend.yml |  2 -
 .../docker-compose-no-build-ganache.yml       |  2 -
 ...compose-no-build-geth-clique-consensus.yml |  2 -
 .../docker-compose-no-build-geth.yml          |  2 -
 ...ocker-compose-no-build-hardhat-network.yml |  2 -
 .../docker-compose-no-build-nethermind.yml    |  2 -
 ...ocker-compose-no-build-no-db-container.yml |  2 -
 docker-compose/docker-compose.yml             |  2 -
 docker-compose/envs/common-frontend.env       |  9 ++---
 .../services/docker-compose-frontend.yml      |  2 -
 .../services/docker-compose-redis.yml         |  2 -
 .../services/docker-compose-sig-provider.yml  |  2 -
 ...docker-compose-smart-contract-verifier.yml |  2 -
 .../services/docker-compose-stats.yml         |  2 -
 .../services/docker-compose-visualizer.yml    |  2 -
 18 files changed, 32 insertions(+), 47 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index cff3b88fe461..f20e2a5fb039 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,8 @@
 
 ### Chore
 
+- [#8501](https://github.com/blockscout/blockscout/pull/8501) - Conceal secondary ports in docker compose setup
+
 ## 5.2.3-beta
 
 ### Features
diff --git a/docker-compose/README.md b/docker-compose/README.md
index a3520a32a47c..02db1bdd1191 100644
--- a/docker-compose/README.md
+++ b/docker-compose/README.md
@@ -11,19 +11,25 @@ Runs Blockscout locally in Docker containers with [docker-compose](https://githu
 ## Building Docker containers from source
 
 ```bash
+cd ./docker-compose
 docker-compose up --build
 ```
 
-This command uses by-default `docker-compose.yml`, which builds the explorer into the Docker image and runs 5 Docker containers:
+Note: if you don't need to make backend customizations, you can run `docker-compose up` in order to launch from pre-build backend Docker image. This will be much faster.
 
-- Postgres 14.x database, which will be available at port 7432 on localhost.
-- Redis database of latest version, which will be available at port 6379 on localhost.
-- Blockscout explorer at http://localhost:4000.
+This command uses `docker-compose.yml` by-default, which builds the backend of the explorer into the Docker image and runs 9 Docker containers:
 
-and 2 microservices (written in Rust):
+- Postgres 14.x database, which will be available at port 7432 on the host machine.
+- Redis database of the latest version.
+- Blockscout backend with api at /api path.
+- Nginx proxy to bind backend, frontend and microservices.
+- Blockscout explorer at http://localhost.
 
-- [Sig-provider](https://github.com/blockscout/blockscout-rs/tree/main/sig-provider) service, which will be available at port 8151 on the host machine.
-- [Sol2UML visualizer](https://github.com/blockscout/blockscout-rs/tree/main/visualizer) service, which will be available at port 8152 on the host machine.
+and 4 containers for microservices (written in Rust):
+
+- [Stats](https://github.com/blockscout/blockscout-rs/tree/main/stats) service with a separate Postgres 14 DB.
+- [Sol2UML visualizer](https://github.com/blockscout/blockscout-rs/tree/main/visualizer) service.
+- [Sig-provider](https://github.com/blockscout/blockscout-rs/tree/main/sig-provider) service.
 
 Note for Linux users: Linux users need to run the local node on http://0.0.0.0/ rather than http://127.0.0.1/
 
@@ -32,16 +38,26 @@ Note for Linux users: Linux users need to run the local node on http://0.0.0.0/
 The repo contains built-in configs for different JSON RPC clients without need to build the image.
 
 - Erigon: `docker-compose -f docker-compose-no-build-erigon.yml up -d`
-- Geth: `docker-compose -f docker-compose-no-build-geth.yml up -d`
+- Geth (suitable for Reth as well): `docker-compose -f docker-compose-no-build-geth.yml up -d`
+- Geth Clique: `docker-compose -f docker-compose-no-build-geth-clique-consensus.yml up -d`
 - Nethermind, OpenEthereum: `docker-compose -f docker-compose-no-build-nethermind up -d`
 - Ganache: `docker-compose -f docker-compose-no-build-ganache.yml up -d`
 - HardHat network: `docker-compose -f docker-compose-no-build-hardhat-network.yml up -d`
 - Running only explorer without DB: `docker-compose -f docker-compose-no-build-no-db-container.yml up -d`. In this case, one container is created - for the explorer itself. And it assumes that the DB credentials are provided through `DATABASE_URL` environment variable.
+- Running explorer with external backend: `docker-compose -f docker-compose-no-build-external-backend.yml up -d`
+- Running explorer with external frontend: `docker-compose -f docker-compose-no-build-external-frontend.yml up -d`
 
 All of the configs assume the Ethereum JSON RPC is running at http://localhost:8545.
 
-Explorer UI will be available at http://localhost.
-
 In order to stop launched containers, run `docker-compose -d -f config_file.yml down`, replacing `config_file.yml` with the file name of the config which was previously launched.
 
-You can adjust BlockScout environment variables from `./envs/common-blockscout.env`. Descriptions of the ENVs are available in [the docs](https://docs.blockscout.com/for-developers/information-and-settings/env-variables).
+You can adjust BlockScout environment variables:
+
+- for backend in `./envs/common-blockscout.env`
+- for frontend in `./envs/common-frontend.env`
+- for stats service in `./envs/common-stats.env`
+- for visualizer in `./envs/common-visualizer.env`
+
+Descriptions of the ENVs are available
+-  for [backend](https://docs.blockscout.com/for-developers/information-and-settings/env-variables)
+-  for [frontend](https://github.com/blockscout/frontend/blob/main/docs/ENVS.md).
diff --git a/docker-compose/docker-compose-no-build-erigon.yml b/docker-compose/docker-compose-no-build-erigon.yml
index 7ae6a91d34a0..ded39cde19bc 100644
--- a/docker-compose/docker-compose-no-build-erigon.yml
+++ b/docker-compose/docker-compose-no-build-erigon.yml
@@ -32,8 +32,6 @@ services:
         ETHEREUM_JSONRPC_HTTP_URL: http://host.docker.internal:8545/
         ETHEREUM_JSONRPC_TRACE_URL: http://host.docker.internal:8545/
         DATABASE_URL: postgresql://postgres:@host.docker.internal:7432/blockscout?ssl=false
-    ports:
-      - 4000:4000
     volumes:
       - ./logs/:/app/logs/
 
diff --git a/docker-compose/docker-compose-no-build-external-frontend.yml b/docker-compose/docker-compose-no-build-external-frontend.yml
index 48739af55b94..924526cdc5e5 100644
--- a/docker-compose/docker-compose-no-build-external-frontend.yml
+++ b/docker-compose/docker-compose-no-build-external-frontend.yml
@@ -36,8 +36,6 @@ services:
         INDEXER_DISABLE_PENDING_TRANSACTIONS_FETCHER: 'true'
         DATABASE_URL: postgresql://postgres:@host.docker.internal:7432/blockscout?ssl=false
         CHAIN_ID: '1337'
-    ports:
-      - 4000:4000
     volumes:
       - ./logs/:/app/logs/
 
diff --git a/docker-compose/docker-compose-no-build-ganache.yml b/docker-compose/docker-compose-no-build-ganache.yml
index f2f53e51d21c..e02daf2fa700 100644
--- a/docker-compose/docker-compose-no-build-ganache.yml
+++ b/docker-compose/docker-compose-no-build-ganache.yml
@@ -35,8 +35,6 @@ services:
         INDEXER_DISABLE_PENDING_TRANSACTIONS_FETCHER: 'true'
         DATABASE_URL: postgresql://postgres:@host.docker.internal:7432/blockscout?ssl=false
         CHAIN_ID: '1337'
-    ports:
-      - 4000:4000
     volumes:
       - ./logs/:/app/logs/
 
diff --git a/docker-compose/docker-compose-no-build-geth-clique-consensus.yml b/docker-compose/docker-compose-no-build-geth-clique-consensus.yml
index d60ef4acd2e9..b168c2d3a0e1 100644
--- a/docker-compose/docker-compose-no-build-geth-clique-consensus.yml
+++ b/docker-compose/docker-compose-no-build-geth-clique-consensus.yml
@@ -33,8 +33,6 @@ services:
         ETHEREUM_JSONRPC_HTTP_URL: http://host.docker.internal:8545/
         ETHEREUM_JSONRPC_TRACE_URL: http://host.docker.internal:8545/
         DATABASE_URL: postgresql://postgres:@host.docker.internal:7432/blockscout?ssl=false
-    ports:
-      - 4000:4000
     volumes:
       - ./logs/:/app/logs/
 
diff --git a/docker-compose/docker-compose-no-build-geth.yml b/docker-compose/docker-compose-no-build-geth.yml
index aade4c5f9935..b060cf6fcf36 100644
--- a/docker-compose/docker-compose-no-build-geth.yml
+++ b/docker-compose/docker-compose-no-build-geth.yml
@@ -32,8 +32,6 @@ services:
         ETHEREUM_JSONRPC_HTTP_URL: http://host.docker.internal:8545/
         ETHEREUM_JSONRPC_TRACE_URL: http://host.docker.internal:8545/
         DATABASE_URL: postgresql://postgres:@host.docker.internal:7432/blockscout?ssl=false
-    ports:
-      - 4000:4000
     volumes:
       - ./logs/:/app/logs/
 
diff --git a/docker-compose/docker-compose-no-build-hardhat-network.yml b/docker-compose/docker-compose-no-build-hardhat-network.yml
index b92450c464ed..a8838e7b6c74 100644
--- a/docker-compose/docker-compose-no-build-hardhat-network.yml
+++ b/docker-compose/docker-compose-no-build-hardhat-network.yml
@@ -33,8 +33,6 @@ services:
         ETHEREUM_JSONRPC_WS_URL: ws://host.docker.internal:8545/
         INDEXER_DISABLE_PENDING_TRANSACTIONS_FETCHER: 'true'
         DATABASE_URL: postgresql://postgres:@host.docker.internal:7432/blockscout?ssl=false
-    ports:
-      - 4000:4000
     volumes:
       - ./logs/:/app/logs/
 
diff --git a/docker-compose/docker-compose-no-build-nethermind.yml b/docker-compose/docker-compose-no-build-nethermind.yml
index 84488d6cf8b3..f5c4efd55363 100644
--- a/docker-compose/docker-compose-no-build-nethermind.yml
+++ b/docker-compose/docker-compose-no-build-nethermind.yml
@@ -32,8 +32,6 @@ services:
         ETHEREUM_JSONRPC_HTTP_URL: http://host.docker.internal:8545/
         ETHEREUM_JSONRPC_TRACE_URL: http://host.docker.internal:8545/
         DATABASE_URL: postgresql://postgres:@host.docker.internal:7432/blockscout?ssl=false
-    ports:
-      - 4000:4000
     volumes:
       - ./logs/:/app/logs/
 
diff --git a/docker-compose/docker-compose-no-build-no-db-container.yml b/docker-compose/docker-compose-no-build-no-db-container.yml
index 8307647bb508..b183fcc21edb 100644
--- a/docker-compose/docker-compose-no-build-no-db-container.yml
+++ b/docker-compose/docker-compose-no-build-no-db-container.yml
@@ -23,8 +23,6 @@ services:
         ETHEREUM_JSONRPC_VARIANT: 'geth'
         ETHEREUM_JSONRPC_HTTP_URL: http://host.docker.internal:8545/
         DATABASE_URL: postgresql://postgres:@host.docker.internal:5432/blockscout?ssl=false
-    ports:
-      - 4000:4000
     volumes:
       - ./logs/:/app/logs/
 
diff --git a/docker-compose/docker-compose.yml b/docker-compose/docker-compose.yml
index 1f2a1f0a37e4..4472d2ef4b82 100644
--- a/docker-compose/docker-compose.yml
+++ b/docker-compose/docker-compose.yml
@@ -45,8 +45,6 @@ services:
         ETHEREUM_JSONRPC_WS_URL: ws://host.docker.internal:8545/
         DATABASE_URL: postgresql://postgres:@host.docker.internal:7432/blockscout?ssl=false
         CHAIN_ID: '1337'
-    ports:
-      - 4000:4000
     volumes:
       - ./logs/:/app/logs/
 
diff --git a/docker-compose/envs/common-frontend.env b/docker-compose/envs/common-frontend.env
index 57e8a6a5f7a2..c3fac7dcd6a7 100644
--- a/docker-compose/envs/common-frontend.env
+++ b/docker-compose/envs/common-frontend.env
@@ -1,20 +1,17 @@
 NEXT_PUBLIC_API_HOST=localhost
 NEXT_PUBLIC_API_PROTOCOL=http
 NEXT_PUBLIC_STATS_API_HOST=http://localhost:8080
-NEXT_PUBLIC_NETWORK_NAME=Göerli
-NEXT_PUBLIC_NETWORK_SHORT_NAME=Göerli
+NEXT_PUBLIC_NETWORK_NAME=Awesome chain
+NEXT_PUBLIC_NETWORK_SHORT_NAME=Awesome chain
 NEXT_PUBLIC_NETWORK_ID=5
 NEXT_PUBLIC_NETWORK_CURRENCY_NAME=Ether
 NEXT_PUBLIC_NETWORK_CURRENCY_SYMBOL=ETH
 NEXT_PUBLIC_NETWORK_CURRENCY_DECIMALS=18
 NEXT_PUBLIC_API_BASE_PATH=/
-NEXT_PUBLIC_FEATURED_NETWORKS=https://raw.githubusercontent.com/blockscout/frontend-configs/main/configs/featured-networks/eth-goerli.json
 NEXT_PUBLIC_APP_HOST=localhost
 NEXT_PUBLIC_APP_PROTOCOL=http
 NEXT_PUBLIC_HOMEPAGE_CHARTS=['daily_txs']
 NEXT_PUBLIC_VISUALIZE_API_HOST=http://localhost:8081
 NEXT_PUBLIC_IS_TESTNET=true
-NEXT_PUBLIC_NETWORK_LOGO=https://raw.githubusercontent.com/blockscout/frontend-configs/main/configs/network-logos/goerli.svg
-NEXT_PUBLIC_NETWORK_ICON=https://raw.githubusercontent.com/blockscout/frontend-configs/main/configs/network-icons/goerli.svg
-NEXT_PUBLIC_HOMEPAGE_PLATE_TEXT_COLOR=rgb(255, 255, 255)
 NEXT_PUBLIC_API_WEBSOCKET_PROTOCOL=ws
+NEXT_PUBLIC_API_SPEC_URL: https://raw.githubusercontent.com/blockscout/blockscout-api-v2-swagger/main/swagger.yaml
\ No newline at end of file
diff --git a/docker-compose/services/docker-compose-frontend.yml b/docker-compose/services/docker-compose-frontend.yml
index d8fb04a3b100..2c0210ebf8ec 100644
--- a/docker-compose/services/docker-compose-frontend.yml
+++ b/docker-compose/services/docker-compose-frontend.yml
@@ -9,5 +9,3 @@ services:
     container_name: 'frontend'
     env_file:
       -  ../envs/common-frontend.env
-    ports:
-      - 3000:3000
diff --git a/docker-compose/services/docker-compose-redis.yml b/docker-compose/services/docker-compose-redis.yml
index 1101d9b03e22..c4b425509dea 100644
--- a/docker-compose/services/docker-compose-redis.yml
+++ b/docker-compose/services/docker-compose-redis.yml
@@ -3,8 +3,6 @@ version: '3.8'
 services:
   redis_db:
     image: 'redis:alpine'
-    ports:
-      - 6379:6379
     container_name: redis_db
     command: redis-server
     volumes:
diff --git a/docker-compose/services/docker-compose-sig-provider.yml b/docker-compose/services/docker-compose-sig-provider.yml
index a87d739c2ba0..df508404f752 100644
--- a/docker-compose/services/docker-compose-sig-provider.yml
+++ b/docker-compose/services/docker-compose-sig-provider.yml
@@ -7,5 +7,3 @@ services:
     platform: linux/amd64
     restart: always
     container_name: 'sig-provider'
-    ports:
-      - 8151:8050
diff --git a/docker-compose/services/docker-compose-smart-contract-verifier.yml b/docker-compose/services/docker-compose-smart-contract-verifier.yml
index 2d5207a991fd..baa98f2157a7 100644
--- a/docker-compose/services/docker-compose-smart-contract-verifier.yml
+++ b/docker-compose/services/docker-compose-smart-contract-verifier.yml
@@ -9,5 +9,3 @@ services:
     container_name: 'smart-contract-verifier'
     env_file:
       -  ../envs/common-smart-contract-verifier.env
-    ports:
-      - 8150:8050
diff --git a/docker-compose/services/docker-compose-stats.yml b/docker-compose/services/docker-compose-stats.yml
index b6ea6552b1da..5dde5bbad13b 100644
--- a/docker-compose/services/docker-compose-stats.yml
+++ b/docker-compose/services/docker-compose-stats.yml
@@ -30,5 +30,3 @@ services:
       - STATS__BLOCKSCOUT_DB_URL=postgresql://postgres:@host.docker.internal:7432/blockscout?ssl=false
       - STATS__CREATE_DATABASE=true
       - STATS__RUN_MIGRATIONS=true
-    ports:
-      - 8153:8050
diff --git a/docker-compose/services/docker-compose-visualizer.yml b/docker-compose/services/docker-compose-visualizer.yml
index cc136d858a38..39dbfaf440e9 100644
--- a/docker-compose/services/docker-compose-visualizer.yml
+++ b/docker-compose/services/docker-compose-visualizer.yml
@@ -9,5 +9,3 @@ services:
     container_name: 'visualizer'
     env_file:
       -  ../envs/common-visualizer.env
-    ports:
-      - 8152:8050

From 25f20b5cba788fa48f06afbad6c76a6ee0d83ad0 Mon Sep 17 00:00:00 2001
From: Viktor Baranov <baranov.viktor.27@gmail.com>
Date: Thu, 21 Sep 2023 15:46:56 +0300
Subject: [PATCH 427/909] New UI through Makefile

---
 .gitignore                                    |   2 +-
 CHANGELOG.md                                  |   1 +
 docker-compose/README.md                      |  29 +-
 .../docker-compose-no-build-erigon.yml        |  15 +-
 ...ker-compose-no-build-external-frontend.yml |  15 +-
 .../docker-compose-no-build-ganache.yml       |  15 +-
 ...compose-no-build-geth-clique-consensus.yml |  15 +-
 .../docker-compose-no-build-geth.yml          |  15 +-
 ...ocker-compose-no-build-hardhat-network.yml |  15 +-
 .../docker-compose-no-build-nethermind.yml    |  15 +-
 ...ocker-compose-no-build-no-db-container.yml |  15 +-
 docker-compose/docker-compose.yml             |  15 +-
 docker-compose/envs/common-blockscout.env     |   2 +-
 .../services/docker-compose-backend.yml       |  16 +
 docker/Makefile                               | 885 ++----------------
 15 files changed, 149 insertions(+), 921 deletions(-)
 create mode 100644 docker-compose/services/docker-compose-backend.yml

diff --git a/.gitignore b/.gitignore
index 77e0d82c4cce..9e53084c62bb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -51,8 +51,8 @@ dump.rdb
 /docker-compose/services/blockscout-db-data
 /docker-compose/services/stats-db-data
 /docker-compose/services/redis-data
+/docker-compose/services/logs
 /docker-compose/tmp
-/docker-compose/logs
 
 .idea/
 *.iml
diff --git a/CHANGELOG.md b/CHANGELOG.md
index f20e2a5fb039..fb84e4dfdee5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,7 @@
 
 ### Chore
 
+- [#8504](https://github.com/blockscout/blockscout/pull/8504) - Deploy new UI through Makefile
 - [#8501](https://github.com/blockscout/blockscout/pull/8501) - Conceal secondary ports in docker compose setup
 
 ## 5.2.3-beta
diff --git a/docker-compose/README.md b/docker-compose/README.md
index 02db1bdd1191..ded1ce9ad0b4 100644
--- a/docker-compose/README.md
+++ b/docker-compose/README.md
@@ -15,7 +15,7 @@ cd ./docker-compose
 docker-compose up --build
 ```
 
-Note: if you don't need to make backend customizations, you can run `docker-compose up` in order to launch from pre-build backend Docker image. This will be much faster.
+**Note**: if you don't need to make backend customizations, you can run `docker-compose up` in order to launch from pre-build backend Docker image. This will be much faster.
 
 This command uses `docker-compose.yml` by-default, which builds the backend of the explorer into the Docker image and runs 9 Docker containers:
 
@@ -31,7 +31,7 @@ and 4 containers for microservices (written in Rust):
 - [Sol2UML visualizer](https://github.com/blockscout/blockscout-rs/tree/main/visualizer) service.
 - [Sig-provider](https://github.com/blockscout/blockscout-rs/tree/main/sig-provider) service.
 
-Note for Linux users: Linux users need to run the local node on http://0.0.0.0/ rather than http://127.0.0.1/
+**Note for Linux users**: Linux users need to run the local node on http://0.0.0.0/ rather than http://127.0.0.1/
 
 ## Configs for different Ethereum clients
 
@@ -59,5 +59,26 @@ You can adjust BlockScout environment variables:
 - for visualizer in `./envs/common-visualizer.env`
 
 Descriptions of the ENVs are available
--  for [backend](https://docs.blockscout.com/for-developers/information-and-settings/env-variables)
--  for [frontend](https://github.com/blockscout/frontend/blob/main/docs/ENVS.md).
+
+- for [backend](https://docs.blockscout.com/for-developers/information-and-settings/env-variables)
+- for [frontend](https://github.com/blockscout/frontend/blob/main/docs/ENVS.md).
+
+## Running Docker containers via Makefile
+
+Prerequisites are the same, as for docker-compose setup.
+
+Start all containers:
+
+```bash
+cd ./docker
+make start
+```
+
+Stop all containers:
+
+```bash
+cd ./docker
+make stop
+```
+
+***Note***: Makefile uses the same .env files since it is running docker-compose services inside.
diff --git a/docker-compose/docker-compose-no-build-erigon.yml b/docker-compose/docker-compose-no-build-erigon.yml
index ded39cde19bc..bd8fb304b1d1 100644
--- a/docker-compose/docker-compose-no-build-erigon.yml
+++ b/docker-compose/docker-compose-no-build-erigon.yml
@@ -15,25 +15,16 @@ services:
     depends_on:
       - db
       - redis_db
-    image: blockscout/blockscout:${DOCKER_TAG:-latest}
-    pull_policy: always
-    restart: always
-    stop_grace_period: 5m
-    container_name: 'backend'
+    extends:
+      file: ./services/docker-compose-backend.yml
+      service: backend
     links:
       - db:database
-    command: sh -c "bin/blockscout eval \"Elixir.Explorer.ReleaseTasks.create_and_migrate()\" && bin/blockscout start"
-    extra_hosts:
-      - 'host.docker.internal:host-gateway'
-    env_file:
-      -  ./envs/common-blockscout.env
     environment:
         ETHEREUM_JSONRPC_VARIANT: 'erigon'
         ETHEREUM_JSONRPC_HTTP_URL: http://host.docker.internal:8545/
         ETHEREUM_JSONRPC_TRACE_URL: http://host.docker.internal:8545/
         DATABASE_URL: postgresql://postgres:@host.docker.internal:7432/blockscout?ssl=false
-    volumes:
-      - ./logs/:/app/logs/
 
   visualizer:
     extends:
diff --git a/docker-compose/docker-compose-no-build-external-frontend.yml b/docker-compose/docker-compose-no-build-external-frontend.yml
index 924526cdc5e5..d7bef3f12f7a 100644
--- a/docker-compose/docker-compose-no-build-external-frontend.yml
+++ b/docker-compose/docker-compose-no-build-external-frontend.yml
@@ -15,18 +15,11 @@ services:
     depends_on:
       - db
       - redis_db
-    image: blockscout/blockscout:${DOCKER_TAG:-master}
-    pull_policy: always
-    restart: always
-    stop_grace_period: 5m
-    container_name: 'backend'
+    extends:
+      file: ./services/docker-compose-backend.yml
+      service: backend
     links:
       - db:database
-    command: sh -c "bin/blockscout eval \"Elixir.Explorer.ReleaseTasks.create_and_migrate()\" && bin/blockscout start"
-    extra_hosts:
-      - 'host.docker.internal:host-gateway'
-    env_file:
-      -  ./envs/common-blockscout.env
     environment:
         ETHEREUM_JSONRPC_VARIANT: 'ganache'
         ETHEREUM_JSONRPC_HTTP_URL: http://host.docker.internal:8545/
@@ -36,8 +29,6 @@ services:
         INDEXER_DISABLE_PENDING_TRANSACTIONS_FETCHER: 'true'
         DATABASE_URL: postgresql://postgres:@host.docker.internal:7432/blockscout?ssl=false
         CHAIN_ID: '1337'
-    volumes:
-      - ./logs/:/app/logs/
 
   visualizer:
     extends:
diff --git a/docker-compose/docker-compose-no-build-ganache.yml b/docker-compose/docker-compose-no-build-ganache.yml
index e02daf2fa700..291913e36bc3 100644
--- a/docker-compose/docker-compose-no-build-ganache.yml
+++ b/docker-compose/docker-compose-no-build-ganache.yml
@@ -15,18 +15,11 @@ services:
     depends_on:
       - db
       - redis_db
-    image: blockscout/blockscout:${DOCKER_TAG:-latest}
-    pull_policy: always
-    restart: always
-    stop_grace_period: 5m
-    container_name: 'backend'
+    extends:
+      file: ./services/docker-compose-backend.yml
+      service: backend
     links:
       - db:database
-    command: sh -c "bin/blockscout eval \"Elixir.Explorer.ReleaseTasks.create_and_migrate()\" && bin/blockscout start"
-    extra_hosts:
-      - 'host.docker.internal:host-gateway'
-    env_file:
-      -  ./envs/common-blockscout.env
     environment:
         ETHEREUM_JSONRPC_VARIANT: 'ganache'
         ETHEREUM_JSONRPC_HTTP_URL: http://host.docker.internal:8545/
@@ -35,8 +28,6 @@ services:
         INDEXER_DISABLE_PENDING_TRANSACTIONS_FETCHER: 'true'
         DATABASE_URL: postgresql://postgres:@host.docker.internal:7432/blockscout?ssl=false
         CHAIN_ID: '1337'
-    volumes:
-      - ./logs/:/app/logs/
 
   visualizer:
     extends:
diff --git a/docker-compose/docker-compose-no-build-geth-clique-consensus.yml b/docker-compose/docker-compose-no-build-geth-clique-consensus.yml
index b168c2d3a0e1..ec01bd0c687e 100644
--- a/docker-compose/docker-compose-no-build-geth-clique-consensus.yml
+++ b/docker-compose/docker-compose-no-build-geth-clique-consensus.yml
@@ -15,26 +15,17 @@ services:
     depends_on:
       - db
       - redis_db
-    image: blockscout/blockscout:${DOCKER_TAG:-latest}
-    pull_policy: always
-    restart: always
-    stop_grace_period: 5m
-    container_name: 'backend'
+    extends:
+      file: ./services/docker-compose-backend.yml
+      service: backend
     links:
       - db:database
-    command: sh -c "bin/blockscout eval \"Elixir.Explorer.ReleaseTasks.create_and_migrate()\" && bin/blockscout start"
-    extra_hosts:
-      - 'host.docker.internal:host-gateway'
-    env_file:
-      -  ./envs/common-blockscout.env
     environment:
         ETHEREUM_JSONRPC_VARIANT: 'geth'
         BLOCK_TRANSFORMER: 'clique'
         ETHEREUM_JSONRPC_HTTP_URL: http://host.docker.internal:8545/
         ETHEREUM_JSONRPC_TRACE_URL: http://host.docker.internal:8545/
         DATABASE_URL: postgresql://postgres:@host.docker.internal:7432/blockscout?ssl=false
-    volumes:
-      - ./logs/:/app/logs/
 
   visualizer:
     extends:
diff --git a/docker-compose/docker-compose-no-build-geth.yml b/docker-compose/docker-compose-no-build-geth.yml
index b060cf6fcf36..430f2d0d75a2 100644
--- a/docker-compose/docker-compose-no-build-geth.yml
+++ b/docker-compose/docker-compose-no-build-geth.yml
@@ -15,25 +15,16 @@ services:
     depends_on:
       - db
       - redis_db
-    image: blockscout/blockscout:${DOCKER_TAG:-latest}
-    pull_policy: always
-    restart: always
-    stop_grace_period: 5m
-    container_name: 'backend'
+    extends:
+      file: ./services/docker-compose-backend.yml
+      service: backend
     links:
       - db:database
-    command: sh -c "bin/blockscout eval \"Elixir.Explorer.ReleaseTasks.create_and_migrate()\" && bin/blockscout start"
-    extra_hosts:
-      - 'host.docker.internal:host-gateway'
-    env_file:
-      -  ./envs/common-blockscout.env
     environment:
         ETHEREUM_JSONRPC_VARIANT: 'geth'
         ETHEREUM_JSONRPC_HTTP_URL: http://host.docker.internal:8545/
         ETHEREUM_JSONRPC_TRACE_URL: http://host.docker.internal:8545/
         DATABASE_URL: postgresql://postgres:@host.docker.internal:7432/blockscout?ssl=false
-    volumes:
-      - ./logs/:/app/logs/
 
   visualizer:
     extends:
diff --git a/docker-compose/docker-compose-no-build-hardhat-network.yml b/docker-compose/docker-compose-no-build-hardhat-network.yml
index a8838e7b6c74..fcf3b74afbde 100644
--- a/docker-compose/docker-compose-no-build-hardhat-network.yml
+++ b/docker-compose/docker-compose-no-build-hardhat-network.yml
@@ -15,26 +15,17 @@ services:
     depends_on:
       - db
       - redis_db
-    image: blockscout/blockscout:${DOCKER_TAG:-latest}
-    pull_policy: always
-    restart: always
-    stop_grace_period: 5m
-    container_name: 'backend'
+    extends:
+      file: ./services/docker-compose-backend.yml
+      service: backend
     links:
       - db:database
-    command: sh -c "bin/blockscout eval \"Elixir.Explorer.ReleaseTasks.create_and_migrate()\" && bin/blockscout start"
-    extra_hosts:
-      - 'host.docker.internal:host-gateway'
-    env_file:
-      -  ./envs/common-blockscout.env
     environment:
         ETHEREUM_JSONRPC_VARIANT: 'geth'
         ETHEREUM_JSONRPC_HTTP_URL: http://host.docker.internal:8545/
         ETHEREUM_JSONRPC_WS_URL: ws://host.docker.internal:8545/
         INDEXER_DISABLE_PENDING_TRANSACTIONS_FETCHER: 'true'
         DATABASE_URL: postgresql://postgres:@host.docker.internal:7432/blockscout?ssl=false
-    volumes:
-      - ./logs/:/app/logs/
 
   visualizer:
     extends:
diff --git a/docker-compose/docker-compose-no-build-nethermind.yml b/docker-compose/docker-compose-no-build-nethermind.yml
index f5c4efd55363..a8daf005fd83 100644
--- a/docker-compose/docker-compose-no-build-nethermind.yml
+++ b/docker-compose/docker-compose-no-build-nethermind.yml
@@ -15,25 +15,16 @@ services:
     depends_on:
       - db
       - redis_db
-    image: blockscout/blockscout:${DOCKER_TAG:-latest}
-    pull_policy: always
-    restart: always
-    stop_grace_period: 5m
-    container_name: 'backend'
+    extends:
+      file: ./services/docker-compose-backend.yml
+      service: backend
     links:
       - db:database
-    command: sh -c "bin/blockscout eval \"Elixir.Explorer.ReleaseTasks.create_and_migrate()\" && bin/blockscout start"
-    extra_hosts:
-      - 'host.docker.internal:host-gateway'
-    env_file:
-      -  ./envs/common-blockscout.env
     environment:
         ETHEREUM_JSONRPC_VARIANT: 'nethermind'
         ETHEREUM_JSONRPC_HTTP_URL: http://host.docker.internal:8545/
         ETHEREUM_JSONRPC_TRACE_URL: http://host.docker.internal:8545/
         DATABASE_URL: postgresql://postgres:@host.docker.internal:7432/blockscout?ssl=false
-    volumes:
-      - ./logs/:/app/logs/
 
   visualizer:
     extends:
diff --git a/docker-compose/docker-compose-no-build-no-db-container.yml b/docker-compose/docker-compose-no-build-no-db-container.yml
index b183fcc21edb..f86808690881 100644
--- a/docker-compose/docker-compose-no-build-no-db-container.yml
+++ b/docker-compose/docker-compose-no-build-no-db-container.yml
@@ -9,22 +9,13 @@ services:
   backend:
     depends_on:
       - redis_db
-    image: blockscout/blockscout:${DOCKER_TAG:-latest}
-    pull_policy: always
-    restart: always
-    stop_grace_period: 5m
-    container_name: 'backend'
-    command: sh -c "bin/blockscout eval \"Elixir.Explorer.ReleaseTasks.create_and_migrate()\" && bin/blockscout start"
-    extra_hosts:
-      - 'host.docker.internal:host-gateway'
-    env_file:
-      -  ./envs/common-blockscout.env
+    extends:
+      file: ./services/docker-compose-backend.yml
+      service: backend
     environment:
         ETHEREUM_JSONRPC_VARIANT: 'geth'
         ETHEREUM_JSONRPC_HTTP_URL: http://host.docker.internal:8545/
         DATABASE_URL: postgresql://postgres:@host.docker.internal:5432/blockscout?ssl=false
-    volumes:
-      - ./logs/:/app/logs/
 
   visualizer:
     extends:
diff --git a/docker-compose/docker-compose.yml b/docker-compose/docker-compose.yml
index 4472d2ef4b82..5359ab6e623e 100644
--- a/docker-compose/docker-compose.yml
+++ b/docker-compose/docker-compose.yml
@@ -15,8 +15,9 @@ services:
     depends_on:
       - db
       - redis_db
-    image: blockscout/blockscout:${DOCKER_TAG:-latest}
-    pull_policy: always
+    extends:
+      file: ./services/docker-compose-backend.yml
+      service: backend
     build:
       context: ..
       dockerfile: ./docker/Dockerfile
@@ -29,24 +30,14 @@ services:
         CACHE_ADDRESS_WITH_BALANCES_UPDATE_INTERVAL: ""
         ADMIN_PANEL_ENABLED: ""
         RELEASE_VERSION: 5.2.3
-    restart: always
-    stop_grace_period: 5m
-    container_name: 'backend'
     links:
       - db:database
-    command: sh -c "bin/blockscout eval \"Elixir.Explorer.ReleaseTasks.create_and_migrate()\" && bin/blockscout start"
-    extra_hosts:
-      - 'host.docker.internal:host-gateway'
-    env_file:
-      -  ./envs/common-blockscout.env
     environment:
         ETHEREUM_JSONRPC_HTTP_URL: http://host.docker.internal:8545/
         ETHEREUM_JSONRPC_TRACE_URL: http://host.docker.internal:8545/
         ETHEREUM_JSONRPC_WS_URL: ws://host.docker.internal:8545/
         DATABASE_URL: postgresql://postgres:@host.docker.internal:7432/blockscout?ssl=false
         CHAIN_ID: '1337'
-    volumes:
-      - ./logs/:/app/logs/
 
   visualizer:
     extends:
diff --git a/docker-compose/envs/common-blockscout.env b/docker-compose/envs/common-blockscout.env
index 581bc0cb6278..bfeb0f74cb9a 100644
--- a/docker-compose/envs/common-blockscout.env
+++ b/docker-compose/envs/common-blockscout.env
@@ -38,7 +38,7 @@ EXCHANGE_RATES_COIN=
 # EXCHANGE_RATES_COINGECKO_API_KEY=
 # EXCHANGE_RATES_COINMARKETCAP_API_KEY=
 # EXCHANGE_RATES_COINMARKETCAP_COIN_ID=
-POOL_SIZE=90
+POOL_SIZE=80
 # EXCHANGE_RATES_COINGECKO_PLATFORM_ID=
 # TOKEN_EXCHANGE_RATE_INTERVAL=
 # TOKEN_EXCHANGE_RATE_REFETCH_INTERVAL=
diff --git a/docker-compose/services/docker-compose-backend.yml b/docker-compose/services/docker-compose-backend.yml
new file mode 100644
index 000000000000..f73af4dab12f
--- /dev/null
+++ b/docker-compose/services/docker-compose-backend.yml
@@ -0,0 +1,16 @@
+version: '3.8'
+
+services:
+  backend:
+    image: blockscout/blockscout:${DOCKER_TAG:-latest}
+    pull_policy: always
+    restart: always
+    stop_grace_period: 5m
+    container_name: 'backend'
+    command: sh -c "bin/blockscout eval \"Elixir.Explorer.ReleaseTasks.create_and_migrate()\" && bin/blockscout start"
+    extra_hosts:
+      - 'host.docker.internal:host-gateway'
+    env_file:
+      -  ../envs/common-blockscout.env
+    volumes:
+      - ./logs/:/app/logs/
\ No newline at end of file
diff --git a/docker/Makefile b/docker/Makefile
index c01e2b0540c0..7e585865e92d 100644
--- a/docker/Makefile
+++ b/docker/Makefile
@@ -1,818 +1,91 @@
-SYSTEM := $(shell uname -s)
-HOST := host.docker.internal
 DOCKER_REPO := blockscout
-APP_NAME := blockscout
-BS_CONTAINER_IMAGE := $(DOCKER_REPO)/$(APP_NAME)
-BS_CONTAINER_NAME := blockscout
-PG_CONTAINER_IMAGE := postgres:14
-PG_CONTAINER_NAME := db
-THIS_FILE = $(lastword $(MAKEFILE_LIST))
+BACKEND_APP_NAME := blockscout
+FRONTEND_APP_NAME := frontend
+BACKEND_CONTAINER_IMAGE := $(DOCKER_REPO)/$(BACKEND_APP_NAME)
+BACKEND_CONTAINER_NAME := backend
+FRONTEND_CONTAINER_NAME := frontend
+VISUALIZER_CONTAINER_NAME := visualizer
+SIG_PROVIDER_CONTAINER_NAME := sig-provider
+STATS_CONTAINER_NAME := stats
+STATS_DB_CONTAINER_NAME := stats-postgres
+PROXY_CONTAINER_NAME := proxy
+PG_CONTAINER_NAME := postgres
 RELEASE_VERSION ?= '5.2.3'
-PORT ?= '4000'
 TAG := $(RELEASE_VERSION)-commit-$(shell git log -1 --pretty=format:"%h")
 STABLE_TAG := $(RELEASE_VERSION)
 
-ifeq ($(SYSTEM), Linux)
-	HOST=localhost
-endif
-
-ifdef DATABASE_URL
-	DB_URL = $(DATABASE_URL)
+start:
+	@echo "==> Starting blockscout db"
+	@docker-compose -f ../docker-compose/services/docker-compose-db.yml up -d
+	@echo "==> Starting blockscout backend"
+	@docker-compose -f ../docker-compose/services/docker-compose-backend.yml up -d
+	@echo "==> Starting stats microservice"
+	@docker-compose -f ../docker-compose/services/docker-compose-stats.yml up -d
+	@echo "==> Starting visualizer microservice"
+	@docker-compose -f ../docker-compose/services/docker-compose-visualizer.yml up -d
+	@echo "==> Starting sig-provider microservice"
+	@docker-compose -f ../docker-compose/services/docker-compose-sig-provider.yml up -d
+	@echo "==> Starting blockscout frontend"
+	@docker-compose -f ../docker-compose/services/docker-compose-frontend.yml up -d
+	@echo "==> Starting Nginx proxy"
+	@docker-compose -f ../docker-compose/services/docker-compose-nginx.yml up -d
+
+BS_BACKEND_STARTED := $(shell docker ps --no-trunc --filter name=^/${BACKEND_CONTAINER_NAME}$  | grep ${BACKEND_CONTAINER_NAME})
+BS_FRONTEND_STARTED := $(shell docker ps --no-trunc --filter name=^/${FRONTEND_CONTAINER_NAME}$  | grep ${FRONTEND_CONTAINER_NAME})
+BS_STATS_STARTED := $(shell docker ps --no-trunc --filter name=^/${STATS_CONTAINER_NAME}$  | grep ${STATS_CONTAINER_NAME})
+BS_STATS_DB_STARTED := $(shell docker ps --no-trunc --filter name=^/${STATS_DB_CONTAINER_NAME}$  | grep ${STATS_DB_CONTAINER_NAME})
+BS_VISUALIZER_STARTED := $(shell docker ps --no-trunc --filter name=^/${VISUALIZER_CONTAINER_NAME}$  | grep ${VISUALIZER_CONTAINER_NAME})
+BS_SIG_PROVIDER_STARTED := $(shell docker ps --no-trunc --filter name=^/${SIG_PROVIDER_CONTAINER_NAME}$  | grep ${SIG_PROVIDER_CONTAINER_NAME})
+BS_PROXY_STARTED := $(shell docker ps --no-trunc --filter name=^/${PROXY_CONTAINER_NAME}$  | grep ${PROXY_CONTAINER_NAME})
+stop:
+ifdef BS_FRONTEND_STARTED
+	@echo "==> Stopping Blockscout frontend container."
+	@docker stop $(FRONTEND_CONTAINER_NAME) && docker rm -f $(FRONTEND_CONTAINER_NAME)
+	@echo "==> Blockscout frontend container stopped."
 else
-	DB_URL = postgresql://postgres:@$(HOST):5432/blockscout?ssl=false
-	ECTO_USE_SSL = 'false'
-endif
-BLOCKSCOUT_CONTAINER_PARAMS = -e 'MIX_ENV=prod' \
-							  -e 'DATABASE_URL=$(DB_URL)'
-ifeq ($(SYSTEM), Linux)
-	BLOCKSCOUT_CONTAINER_PARAMS += --network=host
-endif
-ifdef NETWORK
-	BLOCKSCOUT_CONTAINER_PARAMS += -e 'NETWORK=$(NETWORK)'
-endif
-ifdef SUBNETWORK
-	BLOCKSCOUT_CONTAINER_PARAMS += -e 'SUBNETWORK=$(SUBNETWORK)'
-endif
-ifdef LOGO
-	BLOCKSCOUT_CONTAINER_PARAMS += -e 'LOGO=$(LOGO)'
-endif
-ifdef ETHEREUM_JSONRPC_VARIANT
-	BLOCKSCOUT_CONTAINER_PARAMS += -e 'ETHEREUM_JSONRPC_VARIANT=$(ETHEREUM_JSONRPC_VARIANT)'
-endif
-ifdef ETHEREUM_JSONRPC_HTTP_URL
-	BLOCKSCOUT_CONTAINER_PARAMS += -e 'ETHEREUM_JSONRPC_HTTP_URL=$(ETHEREUM_JSONRPC_HTTP_URL)'
-endif
-ifdef ETHEREUM_JSONRPC_FALLBACK_HTTP_URL
-	BLOCKSCOUT_CONTAINER_PARAMS += -e 'ETHEREUM_JSONRPC_FALLBACK_HTTP_URL=$(ETHEREUM_JSONRPC_FALLBACK_HTTP_URL)'
-endif
-ifdef ETHEREUM_JSONRPC_TRACE_URL
-	BLOCKSCOUT_CONTAINER_PARAMS += -e 'ETHEREUM_JSONRPC_TRACE_URL=$(ETHEREUM_JSONRPC_TRACE_URL)'
-endif
-ifdef ETHEREUM_JSONRPC_FALLBACK_TRACE_URL
-	BLOCKSCOUT_CONTAINER_PARAMS += -e 'ETHEREUM_JSONRPC_FALLBACK_TRACE_URL=$(ETHEREUM_JSONRPC_FALLBACK_TRACE_URL)'
-endif
-ifdef ETHEREUM_JSONRPC_WS_URL
-	BLOCKSCOUT_CONTAINER_PARAMS += -e 'ETHEREUM_JSONRPC_WS_URL=$(ETHEREUM_JSONRPC_WS_URL)'
-endif
-ifdef ETHEREUM_JSONRPC_TRANSPORT
-	BLOCKSCOUT_CONTAINER_PARAMS += -e 'ETHEREUM_JSONRPC_TRANSPORT=$(ETHEREUM_JSONRPC_TRANSPORT)'
-endif
-ifdef ETHEREUM_JSONRPC_DISABLE_ARCHIVE_BALANCES
-	BLOCKSCOUT_CONTAINER_PARAMS += -e 'ETHEREUM_JSONRPC_DISABLE_ARCHIVE_BALANCES=$(ETHEREUM_JSONRPC_DISABLE_ARCHIVE_BALANCES)'
-endif
-ifdef ETHEREUM_JSONRPC_HTTP_HEADERS
-	BLOCKSCOUT_CONTAINER_PARAMS += -e 'ETHEREUM_JSONRPC_HTTP_HEADERS=$(ETHEREUM_JSONRPC_HTTP_HEADERS)'
-endif
-ifdef ETHEREUM_JSONRPC_WAIT_PER_TIMEOUT
-	BLOCKSCOUT_CONTAINER_PARAMS += -e 'ETHEREUM_JSONRPC_WAIT_PER_TIMEOUT=$(ETHEREUM_JSONRPC_WAIT_PER_TIMEOUT)'
-endif
-ifdef IPC_PATH
-	BLOCKSCOUT_CONTAINER_PARAMS += -e 'IPC_PATH=$(IPC_PATH)'
-endif
-ifdef NETWORK_PATH
-	BLOCKSCOUT_CONTAINER_PARAMS += -e 'NETWORK_PATH=$(NETWORK_PATH)'
-endif
-ifdef CHECK_ORIGIN
-	BLOCKSCOUT_CONTAINER_PARAMS += -e 'CHECK_ORIGIN=$(CHECK_ORIGIN)'
-endif
-ifdef COIN
-	BLOCKSCOUT_CONTAINER_PARAMS += -e 'COIN=$(COIN)'
-endif
-ifdef METADATA_CONTRACT
-	BLOCKSCOUT_CONTAINER_PARAMS += -e 'METADATA_CONTRACT=$(METADATA_CONTRACT)'
-endif
-ifdef VALIDATORS_CONTRACT
-	BLOCKSCOUT_CONTAINER_PARAMS += -e 'VALIDATORS_CONTRACT=$(VALIDATORS_CONTRACT)'
-endif
-ifdef KEYS_MANAGER_CONTRACT
-	BLOCKSCOUT_CONTAINER_PARAMS += -e 'KEYS_MANAGER_CONTRACT=$(KEYS_MANAGER_CONTRACT)'
-endif
-ifdef SUPPLY_MODULE
-	BLOCKSCOUT_CONTAINER_PARAMS += -e 'SUPPLY_MODULE=$(SUPPLY_MODULE)'
-endif
-ifdef POOL_SIZE
-	BLOCKSCOUT_CONTAINER_PARAMS += -e 'POOL_SIZE=$(POOL_SIZE)'
-endif
-ifdef ECTO_USE_SSL
-	BLOCKSCOUT_CONTAINER_PARAMS += -e 'ECTO_USE_SSL=$(ECTO_USE_SSL)'
-endif
-ifdef DATADOG_HOST
-	BLOCKSCOUT_CONTAINER_PARAMS += -e 'DATADOG_HOST=$(DATADOG_HOST)'
-endif
-ifdef DATADOG_PORT
-	BLOCKSCOUT_CONTAINER_PARAMS += -e 'DATADOG_PORT=$(DATADOG_PORT)'
-endif
-ifdef SPANDEX_BATCH_SIZE
-	BLOCKSCOUT_CONTAINER_PARAMS += -e 'SPANDEX_BATCH_SIZE=$(SPANDEX_BATCH_SIZE)'
-endif
-ifdef SPANDEX_SYNC_THRESHOLD
-	BLOCKSCOUT_CONTAINER_PARAMS += -e 'SPANDEX_SYNC_THRESHOLD=$(SPANDEX_SYNC_THRESHOLD)'
-endif
-ifdef HEART_BEAT_TIMEOUT
-	BLOCKSCOUT_CONTAINER_PARAMS += -e 'HEART_BEAT_TIMEOUT=$(HEART_BEAT_TIMEOUT)'
-endif
-ifdef HEART_COMMAND
-	BLOCKSCOUT_CONTAINER_PARAMS += -e 'HEART_COMMAND=$(HEART_COMMAND)'
-endif
-ifdef BLOCKSCOUT_VERSION
-	BLOCKSCOUT_CONTAINER_PARAMS += -e 'BLOCKSCOUT_VERSION=$(BLOCKSCOUT_VERSION)'
-endif
-ifdef RELEASE_LINK
-	BLOCKSCOUT_CONTAINER_PARAMS += -e 'RELEASE_LINK=$(RELEASE_LINK)'
-endif
-ifdef ELIXIR_VERSION
-	BLOCKSCOUT_CONTAINER_PARAMS += -e 'ELIXIR_VERSION=$(ELIXIR_VERSION)'
-endif
-ifdef BLOCK_TRANSFORMER
-	BLOCKSCOUT_CONTAINER_PARAMS += -e 'BLOCK_TRANSFORMER=$(BLOCK_TRANSFORMER)'
-endif
-ifdef GRAPHIQL_TRANSACTION
-	BLOCKSCOUT_CONTAINER_PARAMS += -e 'GRAPHIQL_TRANSACTION=$(GRAPHIQL_TRANSACTION)'
-endif
-ifdef BLOCK_RANGES
-	BLOCKSCOUT_CONTAINER_PARAMS += -e 'BLOCK_RANGES=$(BLOCK_RANGES)'
-endif
-ifdef FIRST_BLOCK
-	BLOCKSCOUT_CONTAINER_PARAMS += -e 'FIRST_BLOCK=$(FIRST_BLOCK)'
-endif
-ifdef LAST_BLOCK
-	BLOCKSCOUT_CONTAINER_PARAMS += -e 'LAST_BLOCK=$(LAST_BLOCK)'
-endif
-ifdef TRACE_FIRST_BLOCK
-	BLOCKSCOUT_CONTAINER_PARAMS += -e 'TRACE_FIRST_BLOCK=$(TRACE_FIRST_BLOCK)'
-endif
-ifdef TRACE_LAST_BLOCK
-	BLOCKSCOUT_CONTAINER_PARAMS += -e 'TRACE_LAST_BLOCK=$(TRACE_LAST_BLOCK)'
-endif
-ifdef CACHE_TXS_COUNT_PERIOD
-	BLOCKSCOUT_CONTAINER_PARAMS += -e 'CACHE_TXS_COUNT_PERIOD=$(CACHE_TXS_COUNT_PERIOD)'
-endif
-ifdef CACHE_ADDRESS_WITH_BALANCES_UPDATE_INTERVAL
-	BLOCKSCOUT_CONTAINER_PARAMS += -e 'CACHE_ADDRESS_WITH_BALANCES_UPDATE_INTERVAL=$(CACHE_ADDRESS_WITH_BALANCES_UPDATE_INTERVAL)'
-endif
-ifdef SUPPORTED_CHAINS
-	BLOCKSCOUT_CONTAINER_PARAMS += -e 'SUPPORTED_CHAINS=$(SUPPORTED_CHAINS)'
-endif
-ifdef CACHE_BLOCK_COUNT_PERIOD
-	BLOCKSCOUT_CONTAINER_PARAMS += -e 'CACHE_BLOCK_COUNT_PERIOD=$(CACHE_BLOCK_COUNT_PERIOD)'
-endif
-ifdef CACHE_ADDRESS_SUM_PERIOD
-	BLOCKSCOUT_CONTAINER_PARAMS += -e 'CACHE_ADDRESS_SUM_PERIOD=$(CACHE_ADDRESS_SUM_PERIOD)'
-endif
-ifdef UNCLES_IN_AVERAGE_BLOCK_TIME
-	BLOCKSCOUT_CONTAINER_PARAMS += -e 'UNCLES_IN_AVERAGE_BLOCK_TIME=$(UNCLES_IN_AVERAGE_BLOCK_TIME)'
-endif
-ifdef CACHE_AVERAGE_BLOCK_PERIOD
-	BLOCKSCOUT_CONTAINER_PARAMS += -e 'CACHE_AVERAGE_BLOCK_PERIOD=$(CACHE_AVERAGE_BLOCK_PERIOD)'
-endif
-ifdef CACHE_MARKET_HISTORY_PERIOD
-	BLOCKSCOUT_CONTAINER_PARAMS += -e 'CACHE_MARKET_HISTORY_PERIOD=$(CACHE_MARKET_HISTORY_PERIOD)'
-endif
-ifdef DISABLE_WEBAPP
-	BLOCKSCOUT_CONTAINER_PARAMS += -e 'DISABLE_WEBAPP=$(DISABLE_WEBAPP)'
-endif
-ifdef API_V1_READ_METHODS_DISABLED
-	BLOCKSCOUT_CONTAINER_PARAMS += -e 'API_V1_READ_METHODS_DISABLED=$(API_V1_READ_METHODS_DISABLED)'
-endif
-ifdef API_V1_WRITE_METHODS_DISABLED
-	BLOCKSCOUT_CONTAINER_PARAMS += -e 'API_V1_WRITE_METHODS_DISABLED=$(API_V1_WRITE_METHODS_DISABLED)'
-endif
-ifdef DISABLE_INDEXER
-	BLOCKSCOUT_CONTAINER_PARAMS += -e 'DISABLE_INDEXER=$(DISABLE_INDEXER)'
-endif
-ifdef DISABLE_REALTIME_INDEXER
-	BLOCKSCOUT_CONTAINER_PARAMS += -e 'DISABLE_REALTIME_INDEXER=$(DISABLE_REALTIME_INDEXER)'
-endif
-ifdef INDEXER_DISABLE_TOKEN_INSTANCE_REALTIME_FETCHER
-	BLOCKSCOUT_CONTAINER_PARAMS += -e 'INDEXER_DISABLE_TOKEN_INSTANCE_REALTIME_FETCHER=$(INDEXER_DISABLE_TOKEN_INSTANCE_REALTIME_FETCHER)'
-endif
-ifdef INDEXER_DISABLE_TOKEN_INSTANCE_RETRY_FETCHER
-	BLOCKSCOUT_CONTAINER_PARAMS += -e 'INDEXER_DISABLE_TOKEN_INSTANCE_RETRY_FETCHER=$(INDEXER_DISABLE_TOKEN_INSTANCE_RETRY_FETCHER)'
-endif
-ifdef INDEXER_DISABLE_TOKEN_INSTANCE_SANITIZE_FETCHER
-	BLOCKSCOUT_CONTAINER_PARAMS += -e 'INDEXER_DISABLE_TOKEN_INSTANCE_SANITIZE_FETCHER=$(INDEXER_DISABLE_TOKEN_INSTANCE_SANITIZE_FETCHER)'
-endif
-ifdef WEBAPP_URL
-	BLOCKSCOUT_CONTAINER_PARAMS += -e 'WEBAPP_URL=$(WEBAPP_URL)'
-endif
-ifdef API_URL
-	BLOCKSCOUT_CONTAINER_PARAMS += -e 'API_URL=$(API_URL)'
-endif
-ifdef CHAIN_SPEC_PATH
-	BLOCKSCOUT_CONTAINER_PARAMS += -e 'CHAIN_SPEC_PATH=$(CHAIN_SPEC_PATH)'
-endif
-ifdef EMISSION_FORMAT
-	BLOCKSCOUT_CONTAINER_PARAMS += -e 'EMISSION_FORMAT=$(EMISSION_FORMAT)'
-endif
-ifdef REWARDS_CONTRACT
-	BLOCKSCOUT_CONTAINER_PARAMS += -e 'REWARDS_CONTRACT=$(REWARDS_CONTRACT)'
-endif
-ifdef SHOW_ADDRESS_MARKETCAP_PERCENTAGE
-	BLOCKSCOUT_CONTAINER_PARAMS += -e 'SHOW_ADDRESS_MARKETCAP_PERCENTAGE=$(SHOW_ADDRESS_MARKETCAP_PERCENTAGE)'
-endif
-ifdef BLOCKSCOUT_PROTOCOL
-	BLOCKSCOUT_CONTAINER_PARAMS += -e 'BLOCKSCOUT_PROTOCOL=$(BLOCKSCOUT_PROTOCOL)'
-endif
-ifdef BLOCKSCOUT_HOST
-	BLOCKSCOUT_CONTAINER_PARAMS += -e 'BLOCKSCOUT_HOST=$(BLOCKSCOUT_HOST)'
-endif
-ifdef DECOMPILED_SMART_CONTRACT_TOKEN
-	BLOCKSCOUT_CONTAINER_PARAMS += -e 'DECOMPILED_SMART_CONTRACT_TOKEN=$(DECOMPILED_SMART_CONTRACT_TOKEN)'
-endif
-ifdef CHECKSUM_ADDRESS_HASHES
-	BLOCKSCOUT_CONTAINER_PARAMS += -e 'CHECKSUM_ADDRESS_HASHES=$(CHECKSUM_ADDRESS_HASHES)'
-endif
-ifdef CHECKSUM_FUNCTION
-	BLOCKSCOUT_CONTAINER_PARAMS += -e 'CHECKSUM_FUNCTION=$(CHECKSUM_FUNCTION)'
-endif
-ifdef EXCHANGE_RATES_COIN
-	BLOCKSCOUT_CONTAINER_PARAMS += -e 'EXCHANGE_RATES_COIN=$(EXCHANGE_RATES_COIN)'
-endif
-ifdef EXCHANGE_RATES_MARKET_CAP_SOURCE
-	BLOCKSCOUT_CONTAINER_PARAMS += -e 'EXCHANGE_RATES_MARKET_CAP_SOURCE=$(EXCHANGE_RATES_MARKET_CAP_SOURCE)'
-endif
-ifdef EXCHANGE_RATES_PRICE_SOURCE
-	BLOCKSCOUT_CONTAINER_PARAMS += -e 'EXCHANGE_RATES_PRICE_SOURCE=$(EXCHANGE_RATES_PRICE_SOURCE)'
-endif
-ifdef EXCHANGE_RATES_COINGECKO_COIN_ID
-	BLOCKSCOUT_CONTAINER_PARAMS += -e 'EXCHANGE_RATES_COINGECKO_COIN_ID=$(EXCHANGE_RATES_COINGECKO_COIN_ID)'
-endif
-ifdef EXCHANGE_RATES_COINGECKO_API_KEY
-	BLOCKSCOUT_CONTAINER_PARAMS += -e 'EXCHANGE_RATES_COINGECKO_API_KEY=$(EXCHANGE_RATES_COINGECKO_API_KEY)'
-endif
-ifdef EXCHANGE_RATES_COINGECKO_PLATFORM_ID
-	BLOCKSCOUT_CONTAINER_PARAMS += -e 'EXCHANGE_RATES_COINGECKO_PLATFORM_ID=$(EXCHANGE_RATES_COINGECKO_PLATFORM_ID)'
-endif
-ifdef EXCHANGE_RATES_COINMARKETCAP_API_KEY
-	BLOCKSCOUT_CONTAINER_PARAMS += -e 'EXCHANGE_RATES_COINMARKETCAP_API_KEY=$(EXCHANGE_RATES_COINMARKETCAP_API_KEY)'
-endif
-ifdef EXCHANGE_RATES_COINMARKETCAP_COIN_ID
-	BLOCKSCOUT_CONTAINER_PARAMS += -e 'EXCHANGE_RATES_COINMARKETCAP_COIN_ID=$(EXCHANGE_RATES_COINMARKETCAP_COIN_ID)'
-endif
-ifdef DISABLE_EXCHANGE_RATES
-	BLOCKSCOUT_CONTAINER_PARAMS += -e 'DISABLE_EXCHANGE_RATES=$(DISABLE_EXCHANGE_RATES)'
-endif
-ifdef TOKEN_EXCHANGE_RATE_INTERVAL
-	BLOCKSCOUT_CONTAINER_PARAMS += -e 'TOKEN_EXCHANGE_RATE_INTERVAL=$(TOKEN_EXCHANGE_RATE_INTERVAL)'
-endif
-ifdef TOKEN_EXCHANGE_RATE_REFETCH_INTERVAL
-	BLOCKSCOUT_CONTAINER_PARAMS += -e 'TOKEN_EXCHANGE_RATE_REFETCH_INTERVAL=$(TOKEN_EXCHANGE_RATE_REFETCH_INTERVAL)'
-endif
-ifdef TOKEN_EXCHANGE_RATE_MAX_BATCH_SIZE
-	BLOCKSCOUT_CONTAINER_PARAMS += -e 'TOKEN_EXCHANGE_RATE_MAX_BATCH_SIZE=$(TOKEN_EXCHANGE_RATE_MAX_BATCH_SIZE)'
-endif
-ifdef DISABLE_TOKEN_EXCHANGE_RATE
-	BLOCKSCOUT_CONTAINER_PARAMS += -e 'DISABLE_TOKEN_EXCHANGE_RATE=$(DISABLE_TOKEN_EXCHANGE_RATE)'
-endif
-ifdef SHOW_PRICE_CHART
-	BLOCKSCOUT_CONTAINER_PARAMS += -e 'SHOW_PRICE_CHART=$(SHOW_PRICE_CHART)'
-endif
-ifdef SHOW_PRICE_CHART_LEGEND
-	BLOCKSCOUT_CONTAINER_PARAMS += -e 'SHOW_PRICE_CHART_LEGEND=$(SHOW_PRICE_CHART_LEGEND)'
-endif
-ifdef SHOW_TXS_CHART
-	BLOCKSCOUT_CONTAINER_PARAMS += -e 'SHOW_TXS_CHART=$(SHOW_TXS_CHART)'
-endif
-ifdef TXS_HISTORIAN_INIT_LAG
-	BLOCKSCOUT_CONTAINER_PARAMS += -e 'TXS_HISTORIAN_INIT_LAG=$(TXS_HISTORIAN_INIT_LAG)'
-endif
-ifdef TXS_STATS_DAYS_TO_COMPILE_AT_INIT
-	BLOCKSCOUT_CONTAINER_PARAMS += -e 'TXS_STATS_DAYS_TO_COMPILE_AT_INIT=$(TXS_STATS_DAYS_TO_COMPILE_AT_INIT)'
-endif
-ifdef APPS_MENU
-	BLOCKSCOUT_CONTAINER_PARAMS += -e 'APPS_MENU=$(APPS_MENU)'
-endif
-ifdef EXTERNAL_APPS
-	BLOCKSCOUT_CONTAINER_PARAMS += -e 'EXTERNAL_APPS=$(EXTERNAL_APPS)'
-endif
-ifdef GAS_PRICE
-	BLOCKSCOUT_CONTAINER_PARAMS += -e 'GAS_PRICE=$(GAS_PRICE)'
-endif
-ifdef GAS_PRICE_ORACLE_NUM_OF_BLOCKS
-    BLOCKSCOUT_CONTAINER_PARAMS += -e 'GAS_PRICE_ORACLE_NUM_OF_BLOCKS=$(GAS_PRICE_ORACLE_NUM_OF_BLOCKS)'
-endif
-ifdef GAS_PRICE_ORACLE_SAFELOW_PERCENTILE
-    BLOCKSCOUT_CONTAINER_PARAMS += -e 'GAS_PRICE_ORACLE_SAFELOW_PERCENTILE=$(GAS_PRICE_ORACLE_SAFELOW_PERCENTILE)'
-endif
-ifdef GAS_PRICE_ORACLE_AVERAGE_PERCENTILE
-    BLOCKSCOUT_CONTAINER_PARAMS += -e 'GAS_PRICE_ORACLE_AVERAGE_PERCENTILE=$(GAS_PRICE_ORACLE_AVERAGE_PERCENTILE)'
-endif
-ifdef GAS_PRICE_ORACLE_FAST_PERCENTILE
-    BLOCKSCOUT_CONTAINER_PARAMS += -e 'GAS_PRICE_ORACLE_FAST_PERCENTILE=$(GAS_PRICE_ORACLE_FAST_PERCENTILE)'
-endif
-ifdef GAS_PRICE_ORACLE_CACHE_PERIOD
-    BLOCKSCOUT_CONTAINER_PARAMS += -e 'GAS_PRICE_ORACLE_CACHE_PERIOD=$(GAS_PRICE_ORACLE_CACHE_PERIOD)'
-endif
-ifdef TOKEN_METADATA_UPDATE_INTERVAL
-	BLOCKSCOUT_CONTAINER_PARAMS += -e 'TOKEN_METADATA_UPDATE_INTERVAL=$(TOKEN_METADATA_UPDATE_INTERVAL)'
-endif
-ifdef RESTRICTED_LIST
-	BLOCKSCOUT_CONTAINER_PARAMS += -e 'RESTRICTED_LIST=$(RESTRICTED_LIST)'
-endif
-ifdef RESTRICTED_LIST_KEY
-	BLOCKSCOUT_CONTAINER_PARAMS += -e 'RESTRICTED_LIST_KEY=$(RESTRICTED_LIST_KEY)'
-endif
-ifdef CACHE_ADDRESS_TRANSACTIONS_COUNTER_PERIOD
-	BLOCKSCOUT_CONTAINER_PARAMS += -e 'CACHE_ADDRESS_TRANSACTIONS_COUNTER_PERIOD=$(CACHE_ADDRESS_TRANSACTIONS_COUNTER_PERIOD)'
-endif
-ifdef CACHE_ADDRESS_TRANSACTIONS_GAS_USAGE_COUNTER_PERIOD
-	BLOCKSCOUT_CONTAINER_PARAMS += -e 'CACHE_ADDRESS_TRANSACTIONS_GAS_USAGE_COUNTER_PERIOD=$(CACHE_ADDRESS_TRANSACTIONS_GAS_USAGE_COUNTER_PERIOD)'
-endif
-ifdef CACHE_TOTAL_GAS_USAGE_PERIOD
-	BLOCKSCOUT_CONTAINER_PARAMS += -e 'CACHE_TOTAL_GAS_USAGE_PERIOD=$(CACHE_TOTAL_GAS_USAGE_PERIOD)'
-endif
-ifdef CACHE_TOTAL_GAS_USAGE_COUNTER_ENABLED
-	BLOCKSCOUT_CONTAINER_PARAMS += -e 'CACHE_TOTAL_GAS_USAGE_COUNTER_ENABLED=$(CACHE_TOTAL_GAS_USAGE_COUNTER_ENABLED)'
-endif
-ifdef DISABLE_LP_TOKENS_IN_MARKET_CAP
-	BLOCKSCOUT_CONTAINER_PARAMS += -e 'DISABLE_LP_TOKENS_IN_MARKET_CAP=$(DISABLE_LP_TOKENS_IN_MARKET_CAP)'
-endif
-ifdef HIDE_BLOCK_MINER
-	BLOCKSCOUT_CONTAINER_PARAMS += -e 'HIDE_BLOCK_MINER=$(HIDE_BLOCK_MINER)'
-endif
-ifdef COIN_BALANCE_HISTORY_DAYS
-	BLOCKSCOUT_CONTAINER_PARAMS += -e 'COIN_BALANCE_HISTORY_DAYS=$(COIN_BALANCE_HISTORY_DAYS)'
-endif
-ifdef CACHE_ADDRESS_TOKENS_USD_SUM_PERIOD
-	BLOCKSCOUT_CONTAINER_PARAMS += -e 'CACHE_ADDRESS_TOKENS_USD_SUM_PERIOD=$(CACHE_ADDRESS_TOKENS_USD_SUM_PERIOD)'
-endif
-ifdef SHOW_MAINTENANCE_ALERT
-	BLOCKSCOUT_CONTAINER_PARAMS += -e 'SHOW_MAINTENANCE_ALERT=$(SHOW_MAINTENANCE_ALERT)'
-endif
-ifdef MAINTENANCE_ALERT_MESSAGE
-	BLOCKSCOUT_CONTAINER_PARAMS += -e 'MAINTENANCE_ALERT_MESSAGE=$(MAINTENANCE_ALERT_MESSAGE)'
-endif
-ifdef SOURCIFY_INTEGRATION_ENABLED
-	BLOCKSCOUT_CONTAINER_PARAMS += -e 'SOURCIFY_INTEGRATION_ENABLED=$(SOURCIFY_INTEGRATION_ENABLED)'
-endif
-ifdef SOURCIFY_SERVER_URL
-	BLOCKSCOUT_CONTAINER_PARAMS += -e 'SOURCIFY_SERVER_URL=$(SOURCIFY_SERVER_URL)'
-endif
-ifdef SOURCIFY_REPO_URL
-	BLOCKSCOUT_CONTAINER_PARAMS += -e 'SOURCIFY_REPO_URL=$(SOURCIFY_REPO_URL)'
-endif
-ifdef CHAIN_ID
-	BLOCKSCOUT_CONTAINER_PARAMS += -e 'CHAIN_ID=$(CHAIN_ID)'
-endif
-ifdef JSON_RPC
-	BLOCKSCOUT_CONTAINER_PARAMS += -e 'JSON_RPC=$(JSON_RPC)'
-endif
-ifdef MAX_SIZE_UNLESS_HIDE_ARRAY
-	BLOCKSCOUT_CONTAINER_PARAMS += -e 'MAX_SIZE_UNLESS_HIDE_ARRAY=$(MAX_SIZE_UNLESS_HIDE_ARRAY)'
-endif
-ifdef DISPLAY_TOKEN_ICONS
-	BLOCKSCOUT_CONTAINER_PARAMS += -e 'DISPLAY_TOKEN_ICONS=$(DISPLAY_TOKEN_ICONS)'
-endif
-ifdef SHOW_TENDERLY_LINK
-	BLOCKSCOUT_CONTAINER_PARAMS += -e 'SHOW_TENDERLY_LINK=$(SHOW_TENDERLY_LINK)'
-endif
-ifdef TENDERLY_CHAIN_PATH
-	BLOCKSCOUT_CONTAINER_PARAMS += -e 'TENDERLY_CHAIN_PATH=$(TENDERLY_CHAIN_PATH)'
-endif
-ifdef RE_CAPTCHA_SECRET_KEY
-	BLOCKSCOUT_CONTAINER_PARAMS += -e 'RE_CAPTCHA_SECRET_KEY=$(RE_CAPTCHA_SECRET_KEY)'
-endif
-ifdef RE_CAPTCHA_CLIENT_KEY
-	BLOCKSCOUT_CONTAINER_PARAMS += -e 'RE_CAPTCHA_CLIENT_KEY=$(RE_CAPTCHA_CLIENT_KEY)'
-endif
-ifdef RE_CAPTCHA_V3_SECRET_KEY
-	BLOCKSCOUT_CONTAINER_PARAMS += -e 'RE_CAPTCHA_V3_SECRET_KEY=$(RE_CAPTCHA_V3_SECRET_KEY)'
-endif
-ifdef RE_CAPTCHA_V3_CLIENT_KEY
-	BLOCKSCOUT_CONTAINER_PARAMS += -e 'RE_CAPTCHA_V3_CLIENT_KEY=$(RE_CAPTCHA_V3_CLIENT_KEY)'
-endif
-ifdef RE_CAPTCHA_DISABLED
-	BLOCKSCOUT_CONTAINER_PARAMS += -e 'RE_CAPTCHA_DISABLED=$(RE_CAPTCHA_DISABLED)'
-endif
-ifdef CACHE_ADDRESS_TOKEN_TRANSFERS_COUNTER_PERIOD
-	BLOCKSCOUT_CONTAINER_PARAMS += -e 'CACHE_ADDRESS_TOKEN_TRANSFERS_COUNTER_PERIOD=$(CACHE_ADDRESS_TOKEN_TRANSFERS_COUNTER_PERIOD)'
-endif
-ifdef API_RATE_LIMIT
-	BLOCKSCOUT_CONTAINER_PARAMS += -e 'API_RATE_LIMIT=$(API_RATE_LIMIT)'
-endif
-ifdef API_RATE_LIMIT_BY_KEY
-	BLOCKSCOUT_CONTAINER_PARAMS += -e 'API_RATE_LIMIT_BY_KEY=$(API_RATE_LIMIT_BY_KEY)'
-endif
-ifdef API_RATE_LIMIT_BY_WHITELISTED_IP
-	BLOCKSCOUT_CONTAINER_PARAMS += -e 'API_RATE_LIMIT_BY_WHITELISTED_IP=$(API_RATE_LIMIT_BY_WHITELISTED_IP)'
-endif
-ifdef API_RATE_LIMIT_STATIC_API_KEY
-	BLOCKSCOUT_CONTAINER_PARAMS += -e 'API_RATE_LIMIT_STATIC_API_KEY=$(API_RATE_LIMIT_STATIC_API_KEY)'
+	@echo "==> Blockscout frontend container already stopped before."
 endif
-ifdef API_RATE_LIMIT_WHITELISTED_IPS
-	BLOCKSCOUT_CONTAINER_PARAMS += -e 'API_RATE_LIMIT_WHITELISTED_IPS=$(API_RATE_LIMIT_WHITELISTED_IPS)'
-endif
-ifdef API_RATE_LIMIT_DISABLED
-	BLOCKSCOUT_CONTAINER_PARAMS += -e 'API_RATE_LIMIT_DISABLED=$(API_RATE_LIMIT_DISABLED)'
-endif
-ifdef API_RATE_LIMIT_HAMMER_REDIS_URL
-	BLOCKSCOUT_CONTAINER_PARAMS += -e 'API_RATE_LIMIT_HAMMER_REDIS_URL=$(API_RATE_LIMIT_HAMMER_REDIS_URL)'
-endif
-ifdef API_RATE_LIMIT_IS_BLOCKSCOUT_BEHIND_PROXY
-	BLOCKSCOUT_CONTAINER_PARAMS += -e 'API_RATE_LIMIT_IS_BLOCKSCOUT_BEHIND_PROXY=$(API_RATE_LIMIT_IS_BLOCKSCOUT_BEHIND_PROXY)'
-endif
-ifdef API_RATE_LIMIT_UI_V2_WITH_TOKEN
-	BLOCKSCOUT_CONTAINER_PARAMS += -e 'API_RATE_LIMIT_UI_V2_WITH_TOKEN=$(API_RATE_LIMIT_UI_V2_WITH_TOKEN)'
-endif
-ifdef API_RATE_LIMIT_BY_IP
-	BLOCKSCOUT_CONTAINER_PARAMS += -e 'API_RATE_LIMIT_BY_IP=$(API_RATE_LIMIT_BY_IP)'
-endif
-ifdef API_RATE_LIMIT_TIME_INTERVAL
-	BLOCKSCOUT_CONTAINER_PARAMS += -e 'API_RATE_LIMIT_TIME_INTERVAL=$(API_RATE_LIMIT_TIME_INTERVAL)'
-endif
-ifdef API_RATE_LIMIT_BY_IP_TIME_INTERVAL
-	BLOCKSCOUT_CONTAINER_PARAMS += -e 'API_RATE_LIMIT_BY_IP_TIME_INTERVAL=$(API_RATE_LIMIT_BY_IP_TIME_INTERVAL)'
-endif
-ifdef API_RATE_LIMIT_UI_V2_TOKEN_TTL_IN_SECONDS
-	BLOCKSCOUT_CONTAINER_PARAMS += -e 'API_RATE_LIMIT_UI_V2_TOKEN_TTL_IN_SECONDS=$(API_RATE_LIMIT_UI_V2_TOKEN_TTL_IN_SECONDS)'
-endif
-ifdef TOKEN_BALANCE_ON_DEMAND_FETCHER_THRESHOLD
-	BLOCKSCOUT_CONTAINER_PARAMS += -e 'TOKEN_BALANCE_ON_DEMAND_FETCHER_THRESHOLD=$(TOKEN_BALANCE_ON_DEMAND_FETCHER_THRESHOLD)'
-endif
-ifdef COIN_BALANCE_ON_DEMAND_FETCHER_THRESHOLD
-	BLOCKSCOUT_CONTAINER_PARAMS += -e 'COIN_BALANCE_ON_DEMAND_FETCHER_THRESHOLD=$(COIN_BALANCE_ON_DEMAND_FETCHER_THRESHOLD)'
-endif
-ifdef ETHEREUM_JSONRPC_DEBUG_TRACE_TRANSACTION_TIMEOUT
-	BLOCKSCOUT_CONTAINER_PARAMS += -e 'ETHEREUM_JSONRPC_DEBUG_TRACE_TRANSACTION_TIMEOUT=$(ETHEREUM_JSONRPC_DEBUG_TRACE_TRANSACTION_TIMEOUT)'
-endif
-ifdef ETHEREUM_JSONRPC_HTTP_TIMEOUT
-	BLOCKSCOUT_CONTAINER_PARAMS += -e 'ETHEREUM_JSONRPC_HTTP_TIMEOUT=$(ETHEREUM_JSONRPC_HTTP_TIMEOUT)'
-endif
-ifdef FETCH_REWARDS_WAY
-	BLOCKSCOUT_CONTAINER_PARAMS += -e 'FETCH_REWARDS_WAY=$(FETCH_REWARDS_WAY)'
-endif
-ifdef FOOTER_LOGO
-	BLOCKSCOUT_CONTAINER_PARAMS += -e 'FOOTER_LOGO=$(FOOTER_LOGO)'
-endif
-ifdef FOOTER_CHAT_LINK
-    BLOCKSCOUT_CONTAINER_PARAMS += -e 'FOOTER_CHAT_LINK=$(FOOTER_CHAT_LINK)'
-endif
-ifdef FOOTER_GITHUB_LINK
-    BLOCKSCOUT_CONTAINER_PARAMS += -e 'FOOTER_GITHUB_LINK=$(FOOTER_GITHUB_LINK)'
-endif
-ifdef FOOTER_FORUM_LINK_ENABLED
-    BLOCKSCOUT_CONTAINER_PARAMS += -e 'FOOTER_FORUM_LINK_ENABLED=$(FOOTER_FORUM_LINK_ENABLED)'
-endif
-ifdef FOOTER_FORUM_LINK
-    BLOCKSCOUT_CONTAINER_PARAMS += -e 'FOOTER_FORUM_LINK=$(FOOTER_FORUM_LINK)'
-endif
-ifdef FOOTER_TELEGRAM_LINK_ENABLED
-    BLOCKSCOUT_CONTAINER_PARAMS += -e 'FOOTER_TELEGRAM_LINK_ENABLED=$(FOOTER_TELEGRAM_LINK_ENABLED)'
-endif
-ifdef FOOTER_TELEGRAM_LINK
-    BLOCKSCOUT_CONTAINER_PARAMS += -e 'FOOTER_TELEGRAM_LINK=$(FOOTER_TELEGRAM_LINK)'
-endif
-ifdef FOOTER_LINK_TO_OTHER_EXPLORERS
-	BLOCKSCOUT_CONTAINER_PARAMS += -e 'FOOTER_LINK_TO_OTHER_EXPLORERS=$(FOOTER_LINK_TO_OTHER_EXPLORERS)'
-endif
-ifdef FOOTER_OTHER_EXPLORERS
-    BLOCKSCOUT_CONTAINER_PARAMS += -e 'FOOTER_OTHER_EXPLORERS=$(FOOTER_OTHER_EXPLORERS)'
-endif
-ifdef NETWORK_ICON
-    BLOCKSCOUT_CONTAINER_PARAMS += -e 'NETWORK_ICON=$(NETWORK_ICON)'
-endif
-ifdef LOGO_TEXT
-    BLOCKSCOUT_CONTAINER_PARAMS += -e 'LOGO_TEXT=$(LOGO_TEXT)'
-endif
-ifdef SHOW_TESTNET_LABEL
-    BLOCKSCOUT_CONTAINER_PARAMS += -e 'SHOW_TESTNET_LABEL=$(SHOW_TESTNET_LABEL)'
-endif
-ifdef TESTNET_LABEL_TEXT
-    BLOCKSCOUT_CONTAINER_PARAMS += -e 'TESTNET_LABEL_TEXT=$(TESTNET_LABEL_TEXT)'
-endif
-ifdef CUSTOM_CONTRACT_ADDRESSES_DARK_FOREST
-    BLOCKSCOUT_CONTAINER_PARAMS += -e 'CUSTOM_CONTRACT_ADDRESSES_DARK_FOREST=$(CUSTOM_CONTRACT_ADDRESSES_DARK_FOREST)'
-endif
-ifdef CUSTOM_CONTRACT_ADDRESSES_DARK_FOREST_V_0_5
-    BLOCKSCOUT_CONTAINER_PARAMS += -e 'CUSTOM_CONTRACT_ADDRESSES_DARK_FOREST_V_0_5=$(CUSTOM_CONTRACT_ADDRESSES_DARK_FOREST_V_0_5)'
-endif
-ifdef CUSTOM_CONTRACT_ADDRESSES_CIRCLES
-    BLOCKSCOUT_CONTAINER_PARAMS += -e 'CUSTOM_CONTRACT_ADDRESSES_CIRCLES=$(CUSTOM_CONTRACT_ADDRESSES_CIRCLES)'
-endif
-ifdef HEALTHY_BLOCKS_PERIOD
-    BLOCKSCOUT_CONTAINER_PARAMS += -e 'HEALTHY_BLOCKS_PERIOD=$(HEALTHY_BLOCKS_PERIOD)'
-endif
-ifdef EXCHANGE_RATES_FETCH_BTC_VALUE
-    BLOCKSCOUT_CONTAINER_PARAMS += -e 'EXCHANGE_RATES_FETCH_BTC_VALUE=$(EXCHANGE_RATES_FETCH_BTC_VALUE)'
-endif
-ifdef TXS_STATS_ENABLED
-    BLOCKSCOUT_CONTAINER_PARAMS += -e 'TXS_STATS_ENABLED=$(TXS_STATS_ENABLED)'
-endif
-ifdef INDEXER_MEMORY_LIMIT
-	BLOCKSCOUT_CONTAINER_PARAMS += -e 'INDEXER_MEMORY_LIMIT=$(INDEXER_MEMORY_LIMIT)'
-endif
-ifdef INDEXER_DISABLE_PENDING_TRANSACTIONS_FETCHER
-	BLOCKSCOUT_CONTAINER_PARAMS += -e 'INDEXER_DISABLE_PENDING_TRANSACTIONS_FETCHER=$(INDEXER_DISABLE_PENDING_TRANSACTIONS_FETCHER)'
-endif
-ifdef INDEXER_DISABLE_INTERNAL_TRANSACTIONS_FETCHER
-	BLOCKSCOUT_CONTAINER_PARAMS += -e 'INDEXER_DISABLE_INTERNAL_TRANSACTIONS_FETCHER=$(INDEXER_DISABLE_INTERNAL_TRANSACTIONS_FETCHER)'
-endif
-ifdef INDEXER_DISABLE_BLOCK_REWARD_FETCHER
-    BLOCKSCOUT_CONTAINER_PARAMS += -e 'INDEXER_DISABLE_BLOCK_REWARD_FETCHER=$(INDEXER_DISABLE_BLOCK_REWARD_FETCHER)'
-endif
-ifdef INDEXER_DISABLE_ADDRESS_COIN_BALANCE_FETCHER
-    BLOCKSCOUT_CONTAINER_PARAMS += -e 'INDEXER_DISABLE_ADDRESS_COIN_BALANCE_FETCHER=$(INDEXER_DISABLE_ADDRESS_COIN_BALANCE_FETCHER)'
-endif
-ifdef INDEXER_DISABLE_CATALOGED_TOKEN_UPDATER_FETCHER
-    BLOCKSCOUT_CONTAINER_PARAMS += -e 'INDEXER_DISABLE_CATALOGED_TOKEN_UPDATER_FETCHER=$(INDEXER_DISABLE_CATALOGED_TOKEN_UPDATER_FETCHER)'
-endif
-ifdef INDEXER_DISABLE_EMPTY_BLOCKS_SANITIZER
-    BLOCKSCOUT_CONTAINER_PARAMS += -e 'INDEXER_DISABLE_EMPTY_BLOCKS_SANITIZER=$(INDEXER_DISABLE_EMPTY_BLOCKS_SANITIZER)'
-endif
-ifdef INDEXER_CATCHUP_BLOCKS_BATCH_SIZE
-    BLOCKSCOUT_CONTAINER_PARAMS += -e 'INDEXER_CATCHUP_BLOCKS_BATCH_SIZE=$(INDEXER_CATCHUP_BLOCKS_BATCH_SIZE)'
-endif
-ifdef INDEXER_CATCHUP_BLOCKS_CONCURRENCY
-    BLOCKSCOUT_CONTAINER_PARAMS += -e 'INDEXER_CATCHUP_BLOCKS_CONCURRENCY=$(INDEXER_CATCHUP_BLOCKS_CONCURRENCY)'
-endif
-ifdef INDEXER_CATCHUP_BLOCK_INTERVAL
-    BLOCKSCOUT_CONTAINER_PARAMS += -e 'INDEXER_CATCHUP_BLOCK_INTERVAL=$(INDEXER_CATCHUP_BLOCK_INTERVAL)'
-endif
-ifdef INDEXER_INTERNAL_TRANSACTIONS_BATCH_SIZE
-    BLOCKSCOUT_CONTAINER_PARAMS += -e 'INDEXER_INTERNAL_TRANSACTIONS_BATCH_SIZE=$(INDEXER_INTERNAL_TRANSACTIONS_BATCH_SIZE)'
-endif
-ifdef INDEXER_INTERNAL_TRANSACTIONS_CONCURRENCY
-    BLOCKSCOUT_CONTAINER_PARAMS += -e 'INDEXER_INTERNAL_TRANSACTIONS_CONCURRENCY=$(INDEXER_INTERNAL_TRANSACTIONS_CONCURRENCY)'
-endif
-ifdef INDEXER_BLOCK_REWARD_BATCH_SIZE
-    BLOCKSCOUT_CONTAINER_PARAMS += -e 'INDEXER_BLOCK_REWARD_BATCH_SIZE=$(INDEXER_BLOCK_REWARD_BATCH_SIZE)'
-endif
-ifdef INDEXER_BLOCK_REWARD_CONCURRENCY
-    BLOCKSCOUT_CONTAINER_PARAMS += -e 'INDEXER_BLOCK_REWARD_CONCURRENCY=$(INDEXER_BLOCK_REWARD_CONCURRENCY)'
-endif
-ifdef INDEXER_TOKEN_INSTANCE_RETRY_REFETCH_INTERVAL
-    BLOCKSCOUT_CONTAINER_PARAMS += -e 'INDEXER_TOKEN_INSTANCE_RETRY_REFETCH_INTERVAL=$(INDEXER_TOKEN_INSTANCE_RETRY_REFETCH_INTERVAL)'
-endif
-ifdef INDEXER_TOKEN_INSTANCE_RETRY_CONCURRENCY
-    BLOCKSCOUT_CONTAINER_PARAMS += -e 'INDEXER_TOKEN_INSTANCE_RETRY_CONCURRENCY=$(INDEXER_TOKEN_INSTANCE_RETRY_CONCURRENCY)'
-endif
-ifdef INDEXER_TOKEN_INSTANCE_REALTIME_CONCURRENCY
-    BLOCKSCOUT_CONTAINER_PARAMS += -e 'INDEXER_TOKEN_INSTANCE_REALTIME_CONCURRENCY=$(INDEXER_TOKEN_INSTANCE_REALTIME_CONCURRENCY)'
-endif
-ifdef INDEXER_TOKEN_INSTANCE_SANITIZE_CONCURRENCY
-    BLOCKSCOUT_CONTAINER_PARAMS += -e 'INDEXER_TOKEN_INSTANCE_SANITIZE_CONCURRENCY=$(INDEXER_TOKEN_INSTANCE_SANITIZE_CONCURRENCY)'
-endif
-ifdef INDEXER_COIN_BALANCES_BATCH_SIZE
-    BLOCKSCOUT_CONTAINER_PARAMS += -e 'INDEXER_RECEIPTS_BATCH_SIZE=$(INDEXER_RECEIPTS_BATCH_SIZE)'
-endif
-ifdef INDEXER_COIN_BALANCES_CONCURRENCY
-    BLOCKSCOUT_CONTAINER_PARAMS += -e 'INDEXER_RECEIPTS_CONCURRENCY=$(INDEXER_RECEIPTS_CONCURRENCY)'
-endif
-ifdef INDEXER_RECEIPTS_BATCH_SIZE
-    BLOCKSCOUT_CONTAINER_PARAMS += -e 'INDEXER_RECEIPTS_BATCH_SIZE=$(INDEXER_RECEIPTS_BATCH_SIZE)'
-endif
-ifdef INDEXER_RECEIPTS_CONCURRENCY
-    BLOCKSCOUT_CONTAINER_PARAMS += -e 'INDEXER_RECEIPTS_CONCURRENCY=$(INDEXER_RECEIPTS_CONCURRENCY)'
-endif
-ifdef INDEXER_EMPTY_BLOCKS_SANITIZER_BATCH_SIZE
-    BLOCKSCOUT_CONTAINER_PARAMS += -e 'INDEXER_EMPTY_BLOCKS_SANITIZER_BATCH_SIZE=$(INDEXER_EMPTY_BLOCKS_SANITIZER_BATCH_SIZE)'
-endif
-ifdef INDEXER_TOKEN_CONCURRENCY
-    BLOCKSCOUT_CONTAINER_PARAMS += -e 'INDEXER_TOKEN_CONCURRENCY=$(INDEXER_TOKEN_CONCURRENCY)'
-endif
-ifdef INDEXER_TOKEN_BALANCES_BATCH_SIZE
-    BLOCKSCOUT_CONTAINER_PARAMS += -e 'INDEXER_TOKEN_BALANCES_BATCH_SIZE=$(INDEXER_TOKEN_BALANCES_BATCH_SIZE)'
-endif
-ifdef INDEXER_TOKEN_BALANCES_CONCURRENCY
-    BLOCKSCOUT_CONTAINER_PARAMS += -e 'INDEXER_TOKEN_BALANCES_CONCURRENCY=$(INDEXER_TOKEN_BALANCES_CONCURRENCY)'
-endif
-ifdef INDEXER_REALTIME_FETCHER_MAX_GAP
-    BLOCKSCOUT_CONTAINER_PARAMS += -e 'INDEXER_REALTIME_FETCHER_MAX_GAP=$(INDEXER_REALTIME_FETCHER_MAX_GAP)'
-endif
-ifdef INDEXER_FETCHER_INIT_QUERY_LIMIT
-    BLOCKSCOUT_CONTAINER_PARAMS += -e 'INDEXER_FETCHER_INIT_QUERY_LIMIT=$(INDEXER_FETCHER_INIT_QUERY_LIMIT)'
-endif
-ifdef INDEXER_TOKEN_BALANCES_FETCHER_INIT_QUERY_LIMIT
-    BLOCKSCOUT_CONTAINER_PARAMS += -e 'INDEXER_TOKEN_BALANCES_FETCHER_INIT_QUERY_LIMIT=$(INDEXER_TOKEN_BALANCES_FETCHER_INIT_QUERY_LIMIT)'
-endif
-ifdef INDEXER_INTERNAL_TRANSACTIONS_TRACER_TYPE
-    BLOCKSCOUT_CONTAINER_PARAMS += -e 'INDEXER_INTERNAL_TRANSACTIONS_TRACER_TYPE=$(INDEXER_INTERNAL_TRANSACTIONS_TRACER_TYPE)'
-endif
-ifdef INDEXER_DISABLE_WITHDRAWALS_FETCHER
-    BLOCKSCOUT_CONTAINER_PARAMS += -e 'INDEXER_DISABLE_WITHDRAWALS_FETCHER=$(INDEXER_DISABLE_WITHDRAWALS_FETCHER)'
-endif
-ifdef WITHDRAWALS_FIRST_BLOCK
-    BLOCKSCOUT_CONTAINER_PARAMS += -e 'WITHDRAWALS_FIRST_BLOCK=$(WITHDRAWALS_FIRST_BLOCK)'
-endif
-ifdef TOKEN_ID_MIGRATION_FIRST_BLOCK
-    BLOCKSCOUT_CONTAINER_PARAMS += -e 'TOKEN_ID_MIGRATION_FIRST_BLOCK=$(TOKEN_ID_MIGRATION_FIRST_BLOCK)'
-endif
-ifdef TOKEN_ID_MIGRATION_CONCURRENCY
-    BLOCKSCOUT_CONTAINER_PARAMS += -e 'TOKEN_ID_MIGRATION_CONCURRENCY=$(TOKEN_ID_MIGRATION_CONCURRENCY)'
-endif
-ifdef TOKEN_ID_MIGRATION_BATCH_SIZE
-    BLOCKSCOUT_CONTAINER_PARAMS += -e 'TOKEN_ID_MIGRATION_BATCH_SIZE=$(TOKEN_ID_MIGRATION_BATCH_SIZE)'
-endif
-ifdef INDEXER_TX_ACTIONS_ENABLE
-    BLOCKSCOUT_CONTAINER_PARAMS += -e 'INDEXER_TX_ACTIONS_ENABLE=$(INDEXER_TX_ACTIONS_ENABLE)'
-endif
-ifdef INDEXER_TX_ACTIONS_MAX_TOKEN_CACHE_SIZE
-    BLOCKSCOUT_CONTAINER_PARAMS += -e 'INDEXER_TX_ACTIONS_MAX_TOKEN_CACHE_SIZE=$(INDEXER_TX_ACTIONS_MAX_TOKEN_CACHE_SIZE)'
-endif
-ifdef INDEXER_TX_ACTIONS_REINDEX_FIRST_BLOCK
-    BLOCKSCOUT_CONTAINER_PARAMS += -e 'INDEXER_TX_ACTIONS_REINDEX_FIRST_BLOCK=$(INDEXER_TX_ACTIONS_REINDEX_FIRST_BLOCK)'
-endif
-ifdef INDEXER_TX_ACTIONS_REINDEX_LAST_BLOCK
-    BLOCKSCOUT_CONTAINER_PARAMS += -e 'INDEXER_TX_ACTIONS_REINDEX_LAST_BLOCK=$(INDEXER_TX_ACTIONS_REINDEX_LAST_BLOCK)'
-endif
-ifdef INDEXER_TX_ACTIONS_REINDEX_PROTOCOLS
-    BLOCKSCOUT_CONTAINER_PARAMS += -e 'INDEXER_TX_ACTIONS_REINDEX_PROTOCOLS=$(INDEXER_TX_ACTIONS_REINDEX_PROTOCOLS)'
-endif
-ifdef INDEXER_TX_ACTIONS_AAVE_V3_POOL_CONTRACT
-    BLOCKSCOUT_CONTAINER_PARAMS += -e 'INDEXER_TX_ACTIONS_AAVE_V3_POOL_CONTRACT=$(INDEXER_TX_ACTIONS_AAVE_V3_POOL_CONTRACT)'
-endif
-ifdef SECRET_KEY_BASE
-    BLOCKSCOUT_CONTAINER_PARAMS += -e 'SECRET_KEY_BASE=$(SECRET_KEY_BASE)'
-endif
-ifdef PORT
-    BLOCKSCOUT_CONTAINER_PARAMS += -e 'PORT=$(PORT)'
-endif
-ifdef DATABASE_READ_ONLY_API_URL
-    BLOCKSCOUT_CONTAINER_PARAMS += -e 'DATABASE_READ_ONLY_API_URL=$(DATABASE_READ_ONLY_API_URL)'
-endif
-ifdef POOL_SIZE_API
-    BLOCKSCOUT_CONTAINER_PARAMS += -e 'POOL_SIZE_API=$(POOL_SIZE_API)'
-endif
-ifdef MICROSERVICE_SC_VERIFIER_ENABLED
-	BLOCKSCOUT_CONTAINER_PARAMS += -e 'MICROSERVICE_SC_VERIFIER_ENABLED=$(MICROSERVICE_SC_VERIFIER_ENABLED)'
-endif
-ifdef MICROSERVICE_SC_VERIFIER_URL
-	BLOCKSCOUT_CONTAINER_PARAMS += -e 'MICROSERVICE_SC_VERIFIER_URL=$(MICROSERVICE_SC_VERIFIER_URL)'
-endif
-ifdef MICROSERVICE_SC_VERIFIER_TYPE
-	BLOCKSCOUT_CONTAINER_PARAMS += -e 'MICROSERVICE_SC_VERIFIER_TYPE=$(MICROSERVICE_SC_VERIFIER_TYPE)'
-endif
-ifdef MICROSERVICE_ETH_BYTECODE_DB_INTERVAL_BETWEEN_LOOKUPS
-	BLOCKSCOUT_CONTAINER_PARAMS += -e 'MICROSERVICE_ETH_BYTECODE_DB_INTERVAL_BETWEEN_LOOKUPS=$(MICROSERVICE_ETH_BYTECODE_DB_INTERVAL_BETWEEN_LOOKUPS)'
-endif
-ifdef MICROSERVICE_VISUALIZE_SOL2UML_ENABLED
-	BLOCKSCOUT_CONTAINER_PARAMS += -e 'MICROSERVICE_VISUALIZE_SOL2UML_ENABLED=$(MICROSERVICE_VISUALIZE_SOL2UML_ENABLED)'
-endif
-ifdef MICROSERVICE_VISUALIZE_SOL2UML_URL
-	BLOCKSCOUT_CONTAINER_PARAMS += -e 'MICROSERVICE_VISUALIZE_SOL2UML_URL=$(MICROSERVICE_VISUALIZE_SOL2UML_URL)'
-endif
-ifdef MICROSERVICE_SIG_PROVIDER_ENABLED
-	BLOCKSCOUT_CONTAINER_PARAMS += -e 'MICROSERVICE_SIG_PROVIDER_ENABLED=$(MICROSERVICE_SIG_PROVIDER_ENABLED)'
-endif
-ifdef MICROSERVICE_SIG_PROVIDER_URL
-	BLOCKSCOUT_CONTAINER_PARAMS += -e 'MICROSERVICE_SIG_PROVIDER_URL=$(MICROSERVICE_SIG_PROVIDER_URL)'
-endif
-ifdef ACCOUNT_ENABLED
-	BLOCKSCOUT_CONTAINER_PARAMS += -e 'ACCOUNT_ENABLED=$(ACCOUNT_ENABLED)'
-endif
-ifdef ACCOUNT_REDIS_URL
-	BLOCKSCOUT_CONTAINER_PARAMS += -e 'ACCOUNT_REDIS_URL=$(ACCOUNT_REDIS_URL)'
-endif
-ifdef COIN_NAME
-	BLOCKSCOUT_CONTAINER_PARAMS += -e 'COIN_NAME=$(COIN_NAME)'
-endif
-ifdef ACCOUNT_AUTH0_DOMAIN
-	BLOCKSCOUT_CONTAINER_PARAMS += -e 'ACCOUNT_AUTH0_DOMAIN=$(ACCOUNT_AUTH0_DOMAIN)'
-endif
-ifdef ACCOUNT_AUTH0_CLIENT_ID
-	BLOCKSCOUT_CONTAINER_PARAMS += -e 'ACCOUNT_AUTH0_CLIENT_ID=$(ACCOUNT_AUTH0_CLIENT_ID)'
-endif
-ifdef ACCOUNT_AUTH0_CLIENT_SECRET
-	BLOCKSCOUT_CONTAINER_PARAMS += -e 'ACCOUNT_AUTH0_CLIENT_SECRET=$(ACCOUNT_AUTH0_CLIENT_SECRET)'
-endif
-ifdef ACCOUNT_SENDGRID_API_KEY
-	BLOCKSCOUT_CONTAINER_PARAMS += -e 'ACCOUNT_SENDGRID_API_KEY=$(ACCOUNT_SENDGRID_API_KEY)'
-endif
-ifdef ACCOUNT_SENDGRID_SENDER
-	BLOCKSCOUT_CONTAINER_PARAMS += -e 'ACCOUNT_SENDGRID_SENDER=$(ACCOUNT_SENDGRID_SENDER)'
-endif
-ifdef ACCOUNT_SENDGRID_TEMPLATE
-	BLOCKSCOUT_CONTAINER_PARAMS += -e 'ACCOUNT_SENDGRID_TEMPLATE=$(ACCOUNT_SENDGRID_TEMPLATE)'
-endif
-ifdef ACCOUNT_PUBLIC_TAGS_AIRTABLE_URL
-	BLOCKSCOUT_CONTAINER_PARAMS += -e 'ACCOUNT_PUBLIC_TAGS_AIRTABLE_URL=$(ACCOUNT_PUBLIC_TAGS_AIRTABLE_URL)'
-endif
-ifdef ACCOUNT_PUBLIC_TAGS_AIRTABLE_API_KEY
-	BLOCKSCOUT_CONTAINER_PARAMS += -e 'ACCOUNT_PUBLIC_TAGS_AIRTABLE_API_KEY=$(ACCOUNT_PUBLIC_TAGS_AIRTABLE_API_KEY)'
-endif
-ifdef ACCOUNT_DATABASE_URL
-	BLOCKSCOUT_CONTAINER_PARAMS += -e 'ACCOUNT_DATABASE_URL=$(ACCOUNT_DATABASE_URL)'
-endif
-ifdef ACCOUNT_POOL_SIZE
-	BLOCKSCOUT_CONTAINER_PARAMS += -e 'ACCOUNT_POOL_SIZE=$(ACCOUNT_POOL_SIZE)'
-endif
-ifdef ACCOUNT_CLOAK_KEY
-	BLOCKSCOUT_CONTAINER_PARAMS += -e 'ACCOUNT_CLOAK_KEY=$(ACCOUNT_CLOAK_KEY)'
-endif
-ifdef MIXPANEL_TOKEN
-	BLOCKSCOUT_CONTAINER_PARAMS += -e 'MIXPANEL_TOKEN=$(MIXPANEL_TOKEN)'
-endif
-ifdef MIXPANEL_URL
-	BLOCKSCOUT_CONTAINER_PARAMS += -e 'MIXPANEL_URL=$(MIXPANEL_URL)'
-endif
-ifdef AMPLITUDE_API_KEY
-	BLOCKSCOUT_CONTAINER_PARAMS += -e 'AMPLITUDE_API_KEY=$(AMPLITUDE_API_KEY)'
-endif
-ifdef AMPLITUDE_URL
-	BLOCKSCOUT_CONTAINER_PARAMS += -e 'AMPLITUDE_URL=$(AMPLITUDE_URL)'
-endif
-ifdef DECODE_NOT_A_CONTRACT_CALLS
-	BLOCKSCOUT_CONTAINER_PARAMS += -e 'DECODE_NOT_A_CONTRACT_CALLS=$(DECODE_NOT_A_CONTRACT_CALLS)'
-endif
-ifdef CONTRACT_VERIFICATION_ALLOWED_SOLIDITY_EVM_VERSIONS
-	BLOCKSCOUT_CONTAINER_PARAMS += -e 'CONTRACT_VERIFICATION_ALLOWED_SOLIDITY_EVM_VERSIONS=$(CONTRACT_VERIFICATION_ALLOWED_SOLIDITY_EVM_VERSIONS)'
-endif
-ifdef CONTRACT_VERIFICATION_ALLOWED_VYPER_EVM_VERSIONS
-	BLOCKSCOUT_CONTAINER_PARAMS += -e 'CONTRACT_VERIFICATION_ALLOWED_VYPER_EVM_VERSIONS=$(CONTRACT_VERIFICATION_ALLOWED_VYPER_EVM_VERSIONS)'
-endif
-ifdef CONTRACT_VERIFICATION_MAX_LIBRARIES
-	BLOCKSCOUT_CONTAINER_PARAMS += -e 'CONTRACT_VERIFICATION_MAX_LIBRARIES=$(CONTRACT_VERIFICATION_MAX_LIBRARIES)'
-endif
-ifdef CONTRACT_MAX_STRING_LENGTH_WITHOUT_TRIMMING
-	BLOCKSCOUT_CONTAINER_PARAMS += -e 'CONTRACT_MAX_STRING_LENGTH_WITHOUT_TRIMMING=$(CONTRACT_MAX_STRING_LENGTH_WITHOUT_TRIMMING)'
-endif
-ifdef CONTRACT_DISABLE_INTERACTION
-	BLOCKSCOUT_CONTAINER_PARAMS += -e 'CONTRACT_DISABLE_INTERACTION=$(CONTRACT_DISABLE_INTERACTION)'
-endif
-ifdef EIP_1559_ELASTICITY_MULTIPLIER
-	BLOCKSCOUT_CONTAINER_PARAMS += -e 'EIP_1559_ELASTICITY_MULTIPLIER=$(EIP_1559_ELASTICITY_MULTIPLIER)'
-endif
-ifdef API_SENSITIVE_ENDPOINTS_KEY
-	BLOCKSCOUT_CONTAINER_PARAMS += -e 'API_SENSITIVE_ENDPOINTS_KEY=$(API_SENSITIVE_ENDPOINTS_KEY)'
-endif
-ifdef ACCOUNT_VERIFICATION_EMAIL_RESEND_INTERVAL
-	BLOCKSCOUT_CONTAINER_PARAMS += -e 'ACCOUNT_VERIFICATION_EMAIL_RESEND_INTERVAL=$(ACCOUNT_VERIFICATION_EMAIL_RESEND_INTERVAL)'
-endif
-ifdef INDEXER_TOKEN_INSTANCE_RETRY_BATCH_SIZE
-	BLOCKSCOUT_CONTAINER_PARAMS += -e 'INDEXER_TOKEN_INSTANCE_RETRY_BATCH_SIZE=$(INDEXER_TOKEN_INSTANCE_RETRY_BATCH_SIZE)'
-endif
-ifdef INDEXER_TOKEN_INSTANCE_REALTIME_BATCH_SIZE
-	BLOCKSCOUT_CONTAINER_PARAMS += -e 'INDEXER_TOKEN_INSTANCE_REALTIME_BATCH_SIZE=$(INDEXER_TOKEN_INSTANCE_REALTIME_BATCH_SIZE)'
-endif
-ifdef INDEXER_TOKEN_INSTANCE_SANITIZE_BATCH_SIZE
-	BLOCKSCOUT_CONTAINER_PARAMS += -e 'INDEXER_TOKEN_INSTANCE_SANITIZE_BATCH_SIZE=$(INDEXER_TOKEN_INSTANCE_SANITIZE_BATCH_SIZE)'
-endif
-
-HAS_BLOCKSCOUT_IMAGE := $(shell docker images | grep -sw "${BS_CONTAINER_IMAGE} ")
-build:
-	@echo "==> Checking for blockscout image $(BS_CONTAINER_IMAGE)"
-ifdef HAS_BLOCKSCOUT_IMAGE
-	@echo "==> Image exist. Using $(BS_CONTAINER_IMAGE)"
+ifdef BS_BACKEND_STARTED
+	@echo "==> Stopping Blockscout backend container."
+	@docker stop $(BACKEND_CONTAINER_NAME)  && docker rm -f $(BACKEND_CONTAINER_NAME)
+	@echo "==> Blockscout backend container stopped."
 else
-	@echo "==> No image found, trying to build one..."
-	@docker build -f ./Dockerfile --build-arg RELEASE_VERSION=$(RELEASE_VERSION) -t $(BS_CONTAINER_IMAGE) ../
+	@echo "==> Blockscout backend container already stopped before."
 endif
-
-migrate_only:
-	@echo "==> Running migrations"
-	@docker run --rm \
-					$(BLOCKSCOUT_CONTAINER_PARAMS) \
-					$(BS_CONTAINER_IMAGE) /bin/sh -c "echo $$MIX_ENV && ./bin/blockscout eval \"Elixir.Explorer.ReleaseTasks.create_and_migrate()\""
-
-migrate: build postgres
-	@$(MAKE) -f $(THIS_FILE) migrate_only
-
-PG_EXIST := $(shell docker ps -a --no-trunc --filter name=^/${PG_CONTAINER_NAME}$ | grep ${PG_CONTAINER_NAME})
-PG_STARTED := $(shell docker ps --no-trunc --filter name=^/${PG_CONTAINER_NAME}$ | grep ${PG_CONTAINER_NAME})
-
-postgres:
-ifdef DATABASE_URL
-	@echo "==> DATABASE_URL of external DB provided. There is no need to start a container for DB."
-	@$(MAKE) -f $(THIS_FILE) migrate_only
+ifdef BS_STATS_DB_STARTED
+	@echo "==> Stopping Blockscout stats db container."
+	@docker stop $(STATS_DB_CONTAINER_NAME) && docker rm -f $(STATS_DB_CONTAINER_NAME)
+	@echo "==> Blockscout stats db container stopped."
 else
-ifdef PG_EXIST
-	@echo "==> Checking PostrgeSQL container"
-ifdef PG_STARTED
-	@echo "==> PostgreSQL Already started"
-	@$(MAKE) -f $(THIS_FILE) migrate_only
+	@echo "==> Blockscout stats db container already stopped before."
+endif
+ifdef BS_STATS_STARTED
+	@echo "==> Stopping Blockscout stats container."
+	@docker stop $(STATS_CONTAINER_NAME) && docker rm -f $(STATS_CONTAINER_NAME)
+	@echo "==> Blockscout stats container stopped."
 else
-	@echo "==> Starting PostgreSQL container"
-	@docker start $(PG_CONTAINER_NAME)
-	@$(MAKE) -f $(THIS_FILE) migrate_only
+	@echo "==> Blockscout stats container already stopped before."
 endif
+ifdef BS_VISUALIZER_STARTED
+	@echo "==> Stopping Blockscout visualizer container."
+	@docker stop $(VISUALIZER_CONTAINER_NAME) && docker rm -f $(VISUALIZER_CONTAINER_NAME)
+	@echo "==> Blockscout visualizer container stopped."
 else
-	@echo "==> Creating new PostgreSQL container"
-	@docker run -d --name $(PG_CONTAINER_NAME) \
-					-e POSTGRES_PASSWORD="" \
-					-e POSTGRES_USER="postgres" \
-					-e POSTGRES_HOST_AUTH_METHOD="trust" \
-					-p 5432:5432 \
-					$(PG_CONTAINER_IMAGE)
-	@sleep 1
-	@$(MAKE) -f $(THIS_FILE) migrate_only
+	@echo "==> Blockscout visualizer container already stopped before."
 endif
+ifdef BS_SIG_PROVIDER_STARTED
+	@echo "==> Stopping Blockscout sig-provider container."
+	@docker stop $(SIG_PROVIDER_CONTAINER_NAME) && docker rm -f $(SIG_PROVIDER_CONTAINER_NAME)
+	@echo "==> Blockscout sig-provider container stopped."
+else
+	@echo "==> Blockscout sig-provider container already stopped before."
 endif
-
-start: build postgres
-	@echo "==> Starting blockscout"
-	@docker run --rm --name $(BS_CONTAINER_NAME) \
-					$(BLOCKSCOUT_CONTAINER_PARAMS) \
-					-p 4000:4000 \
-					$(BS_CONTAINER_IMAGE) /bin/sh -c "./bin/blockscout start"
-
-BS_STARTED := $(shell docker ps --no-trunc --filter name=^/${BS_CONTAINER_NAME}$  | grep ${BS_CONTAINER_NAME})
-stop:
-ifdef BS_STARTED
-	@echo "==> Stopping BlockScout container."
-	@docker stop $(BS_CONTAINER_NAME)
-	@echo "==> BlockScout container stopped."
+ifdef BS_PROXY_STARTED
+	@echo "==> Stopping Nginx proxy container."
+	@docker stop $(PROXY_CONTAINER_NAME) && docker rm -f $(PROXY_CONTAINER_NAME)
+	@echo "==> Nginx proxy container stopped."
 else
-	@echo "==> BlockScout container already stopped before."
+	@echo "==> Nginx proxy container already stopped before."
 endif
 ifdef PG_STARTED
 	@echo "==> Stopping Postgres container."
@@ -837,15 +110,15 @@ publish-stable: docker-login publish-latest publish-stable-version ## publish th
 
 publish-latest: tag-latest ## publish the `latest` tagged container to hub
 	@echo 'publish latest to $(DOCKER_REPO)'
-	docker push $(BS_CONTAINER_IMAGE):latest
+	docker push $(BACKEND_CONTAINER_IMAGE):latest
 
 publish-version: tag-version ## publish the `{version}` tagged container to hub
 	@echo 'publish $(TAG) to $(DOCKER_REPO)'
-	docker push $(BS_CONTAINER_IMAGE):$(TAG)
+	docker push $(BACKEND_CONTAINER_IMAGE):$(TAG)
 
 publish-stable-version: tag-stable-version ## publish the `{version}` tagged container to hub
 	@echo 'publish $(STABLE_TAG) to $(DOCKER_REPO)'
-	docker push $(BS_CONTAINER_IMAGE):$(STABLE_TAG)
+	docker push $(BACKEND_CONTAINER_IMAGE):$(STABLE_TAG)
 
 # Docker tagging
 tag: tag-latest tag-version ## Generate container tags for the `{version}` ans `latest` tags
@@ -853,21 +126,19 @@ tag-stable: tag-latest tag-stable-version ## Generate container tags for the `{v
 
 tag-latest: ## Generate container `latest` tag
 	@echo 'create latest tag'
-	docker tag $(BS_CONTAINER_IMAGE) $(BS_CONTAINER_IMAGE):latest
+	docker tag $(BACKEND_CONTAINER_IMAGE) $(BACKEND_CONTAINER_IMAGE):latest
 
 tag-version: ## Generate container `{version}` tag
 	@echo 'create tag $(TAG)'
-	docker tag $(BS_CONTAINER_IMAGE) $(BS_CONTAINER_IMAGE):$(TAG)
+	docker tag $(BACKEND_CONTAINER_IMAGE) $(BACKEND_CONTAINER_IMAGE):$(TAG)
 
 tag-stable-version: ## Generate container `{version}` tag
 	@echo 'create tag $(STABLE_TAG)'
-	docker tag $(BS_CONTAINER_IMAGE) $(BS_CONTAINER_IMAGE):$(STABLE_TAG)
+	docker tag $(BACKEND_CONTAINER_IMAGE) $(BACKEND_CONTAINER_IMAGE):$(STABLE_TAG)
 
 .PHONY: build \
-				migrate \
 				start \
 				stop \
-				postgres \
 				run \
 				docker-login \
 				release \

From 2c37fc9a845a3ff11d0cecc82b26f2a856d57f16 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 21 Sep 2023 18:18:02 +0000
Subject: [PATCH 428/909] Bump sass from 1.67.0 to 1.68.0 in
 /apps/block_scout_web/assets

Bumps [sass](https://github.com/sass/dart-sass) from 1.67.0 to 1.68.0.
- [Release notes](https://github.com/sass/dart-sass/releases)
- [Changelog](https://github.com/sass/dart-sass/blob/main/CHANGELOG.md)
- [Commits](https://github.com/sass/dart-sass/compare/1.67.0...1.68.0)

---
updated-dependencies:
- dependency-name: sass
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 apps/block_scout_web/assets/package-lock.json | 14 +++++++-------
 apps/block_scout_web/assets/package.json      |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/apps/block_scout_web/assets/package-lock.json b/apps/block_scout_web/assets/package-lock.json
index d540e43cf0c5..32a70c53680b 100644
--- a/apps/block_scout_web/assets/package-lock.json
+++ b/apps/block_scout_web/assets/package-lock.json
@@ -89,7 +89,7 @@
         "mini-css-extract-plugin": "^2.7.6",
         "postcss": "^8.4.30",
         "postcss-loader": "^7.3.3",
-        "sass": "^1.67.0",
+        "sass": "^1.68.0",
         "sass-loader": "^13.3.2",
         "style-loader": "^3.3.3",
         "webpack": "^5.88.2",
@@ -15066,9 +15066,9 @@
       "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
     },
     "node_modules/sass": {
-      "version": "1.67.0",
-      "resolved": "https://registry.npmjs.org/sass/-/sass-1.67.0.tgz",
-      "integrity": "sha512-SVrO9ZeX/QQyEGtuZYCVxoeAL5vGlYjJ9p4i4HFuekWl8y/LtJ7tJc10Z+ck1c8xOuoBm2MYzcLfTAffD0pl/A==",
+      "version": "1.68.0",
+      "resolved": "https://registry.npmjs.org/sass/-/sass-1.68.0.tgz",
+      "integrity": "sha512-Lmj9lM/fef0nQswm1J2HJcEsBUba4wgNx2fea6yJHODREoMFnwRpZydBnX/RjyXw2REIwdkbqE4hrTo4qfDBUA==",
       "dev": true,
       "dependencies": {
         "chokidar": ">=3.0.0 <4.0.0",
@@ -28984,9 +28984,9 @@
       "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
     },
     "sass": {
-      "version": "1.67.0",
-      "resolved": "https://registry.npmjs.org/sass/-/sass-1.67.0.tgz",
-      "integrity": "sha512-SVrO9ZeX/QQyEGtuZYCVxoeAL5vGlYjJ9p4i4HFuekWl8y/LtJ7tJc10Z+ck1c8xOuoBm2MYzcLfTAffD0pl/A==",
+      "version": "1.68.0",
+      "resolved": "https://registry.npmjs.org/sass/-/sass-1.68.0.tgz",
+      "integrity": "sha512-Lmj9lM/fef0nQswm1J2HJcEsBUba4wgNx2fea6yJHODREoMFnwRpZydBnX/RjyXw2REIwdkbqE4hrTo4qfDBUA==",
       "dev": true,
       "requires": {
         "chokidar": ">=3.0.0 <4.0.0",
diff --git a/apps/block_scout_web/assets/package.json b/apps/block_scout_web/assets/package.json
index 2781472614f7..e5b146d157ca 100644
--- a/apps/block_scout_web/assets/package.json
+++ b/apps/block_scout_web/assets/package.json
@@ -101,7 +101,7 @@
     "mini-css-extract-plugin": "^2.7.6",
     "postcss": "^8.4.30",
     "postcss-loader": "^7.3.3",
-    "sass": "^1.67.0",
+    "sass": "^1.68.0",
     "sass-loader": "^13.3.2",
     "style-loader": "^3.3.3",
     "webpack": "^5.88.2",

From c73ebe7c4036497635f48e036d23eb106354a13b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 21 Sep 2023 18:18:25 +0000
Subject: [PATCH 429/909] Bump autoprefixer in /apps/block_scout_web/assets

Bumps [autoprefixer](https://github.com/postcss/autoprefixer) from 10.4.15 to 10.4.16.
- [Release notes](https://github.com/postcss/autoprefixer/releases)
- [Changelog](https://github.com/postcss/autoprefixer/blob/main/CHANGELOG.md)
- [Commits](https://github.com/postcss/autoprefixer/compare/10.4.15...10.4.16)

---
updated-dependencies:
- dependency-name: autoprefixer
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 apps/block_scout_web/assets/package-lock.json | 48 +++++++++----------
 apps/block_scout_web/assets/package.json      |  2 +-
 2 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/apps/block_scout_web/assets/package-lock.json b/apps/block_scout_web/assets/package-lock.json
index d540e43cf0c5..b2424571344f 100644
--- a/apps/block_scout_web/assets/package-lock.json
+++ b/apps/block_scout_web/assets/package-lock.json
@@ -73,7 +73,7 @@
       "devDependencies": {
         "@babel/core": "^7.22.20",
         "@babel/preset-env": "^7.22.20",
-        "autoprefixer": "^10.4.15",
+        "autoprefixer": "^10.4.16",
         "babel-loader": "^9.1.3",
         "copy-webpack-plugin": "^11.0.0",
         "css-loader": "^5.2.7",
@@ -4504,9 +4504,9 @@
       "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k="
     },
     "node_modules/autoprefixer": {
-      "version": "10.4.15",
-      "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.4.15.tgz",
-      "integrity": "sha512-KCuPB8ZCIqFdA4HwKXsvz7j6gvSDNhDP7WnUjBleRkKjPdvCmHFuQ77ocavI8FT6NdvlBnE2UFr2H4Mycn8Vew==",
+      "version": "10.4.16",
+      "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.4.16.tgz",
+      "integrity": "sha512-7vd3UC6xKp0HLfua5IjZlcXvGAGy7cBAXTg2lyQ/8WpNhd6SiZ8Be+xm3FyBSYJx5GKcpRCzBh7RH4/0dnY+uQ==",
       "dev": true,
       "funding": [
         {
@@ -4524,8 +4524,8 @@
       ],
       "dependencies": {
         "browserslist": "^4.21.10",
-        "caniuse-lite": "^1.0.30001520",
-        "fraction.js": "^4.2.0",
+        "caniuse-lite": "^1.0.30001538",
+        "fraction.js": "^4.3.6",
         "normalize-range": "^0.1.2",
         "picocolors": "^1.0.0",
         "postcss-value-parser": "^4.2.0"
@@ -5374,9 +5374,9 @@
       }
     },
     "node_modules/caniuse-lite": {
-      "version": "1.0.30001520",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001520.tgz",
-      "integrity": "sha512-tahF5O9EiiTzwTUqAeFjIZbn4Dnqxzz7ktrgGlMYNLH43Ul26IgTMH/zvL3DG0lZxBYnlT04axvInszUsZULdA==",
+      "version": "1.0.30001538",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001538.tgz",
+      "integrity": "sha512-HWJnhnID+0YMtGlzcp3T9drmBJUVDchPJ08tpUGFLs9CYlwWPH2uLgpHn8fND5pCgXVtnGS3H4QR9XLMHVNkHw==",
       "funding": [
         {
           "type": "opencollective",
@@ -8851,16 +8851,16 @@
       }
     },
     "node_modules/fraction.js": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/fraction.js/-/fraction.js-4.2.0.tgz",
-      "integrity": "sha512-MhLuK+2gUcnZe8ZHlaaINnQLl0xRIGRfcGk2yl8xoQAfHrSsL3rYu6FCmBdkdbhc9EPlwyGHewaRsvwRMJtAlA==",
+      "version": "4.3.6",
+      "resolved": "https://registry.npmjs.org/fraction.js/-/fraction.js-4.3.6.tgz",
+      "integrity": "sha512-n2aZ9tNfYDwaHhvFTkhFErqOMIb8uyzSQ+vGJBjZyanAKZVbGUQ1sngfk9FdkBw7G26O7AgNjLcecLffD1c7eg==",
       "dev": true,
       "engines": {
         "node": "*"
       },
       "funding": {
         "type": "patreon",
-        "url": "https://www.patreon.com/infusion"
+        "url": "https://github.com/sponsors/rawify"
       }
     },
     "node_modules/fresh": {
@@ -20979,14 +20979,14 @@
       "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k="
     },
     "autoprefixer": {
-      "version": "10.4.15",
-      "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.4.15.tgz",
-      "integrity": "sha512-KCuPB8ZCIqFdA4HwKXsvz7j6gvSDNhDP7WnUjBleRkKjPdvCmHFuQ77ocavI8FT6NdvlBnE2UFr2H4Mycn8Vew==",
+      "version": "10.4.16",
+      "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.4.16.tgz",
+      "integrity": "sha512-7vd3UC6xKp0HLfua5IjZlcXvGAGy7cBAXTg2lyQ/8WpNhd6SiZ8Be+xm3FyBSYJx5GKcpRCzBh7RH4/0dnY+uQ==",
       "dev": true,
       "requires": {
         "browserslist": "^4.21.10",
-        "caniuse-lite": "^1.0.30001520",
-        "fraction.js": "^4.2.0",
+        "caniuse-lite": "^1.0.30001538",
+        "fraction.js": "^4.3.6",
         "normalize-range": "^0.1.2",
         "picocolors": "^1.0.0",
         "postcss-value-parser": "^4.2.0"
@@ -21627,9 +21627,9 @@
       }
     },
     "caniuse-lite": {
-      "version": "1.0.30001520",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001520.tgz",
-      "integrity": "sha512-tahF5O9EiiTzwTUqAeFjIZbn4Dnqxzz7ktrgGlMYNLH43Ul26IgTMH/zvL3DG0lZxBYnlT04axvInszUsZULdA=="
+      "version": "1.0.30001538",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001538.tgz",
+      "integrity": "sha512-HWJnhnID+0YMtGlzcp3T9drmBJUVDchPJ08tpUGFLs9CYlwWPH2uLgpHn8fND5pCgXVtnGS3H4QR9XLMHVNkHw=="
     },
     "caseless": {
       "version": "0.12.0",
@@ -24363,9 +24363,9 @@
       "integrity": "sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow=="
     },
     "fraction.js": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/fraction.js/-/fraction.js-4.2.0.tgz",
-      "integrity": "sha512-MhLuK+2gUcnZe8ZHlaaINnQLl0xRIGRfcGk2yl8xoQAfHrSsL3rYu6FCmBdkdbhc9EPlwyGHewaRsvwRMJtAlA==",
+      "version": "4.3.6",
+      "resolved": "https://registry.npmjs.org/fraction.js/-/fraction.js-4.3.6.tgz",
+      "integrity": "sha512-n2aZ9tNfYDwaHhvFTkhFErqOMIb8uyzSQ+vGJBjZyanAKZVbGUQ1sngfk9FdkBw7G26O7AgNjLcecLffD1c7eg==",
       "dev": true
     },
     "fresh": {
diff --git a/apps/block_scout_web/assets/package.json b/apps/block_scout_web/assets/package.json
index 2781472614f7..f82565e52512 100644
--- a/apps/block_scout_web/assets/package.json
+++ b/apps/block_scout_web/assets/package.json
@@ -85,7 +85,7 @@
   "devDependencies": {
     "@babel/core": "^7.22.20",
     "@babel/preset-env": "^7.22.20",
-    "autoprefixer": "^10.4.15",
+    "autoprefixer": "^10.4.16",
     "babel-loader": "^9.1.3",
     "copy-webpack-plugin": "^11.0.0",
     "css-loader": "^5.2.7",

From f29059e0e37926450a3bf1e9d40786b77ed8cd23 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 21 Sep 2023 18:40:49 +0000
Subject: [PATCH 430/909] Bump mox from 1.0.2 to 1.1.0

Bumps [mox](https://github.com/dashbitco/mox) from 1.0.2 to 1.1.0.
- [Changelog](https://github.com/dashbitco/mox/blob/master/CHANGELOG.md)
- [Commits](https://github.com/dashbitco/mox/compare/v1.0.2...v1.1.0)

---
updated-dependencies:
- dependency-name: mox
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 mix.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mix.lock b/mix.lock
index 8e136fc15db7..2ed2ed4fa812 100644
--- a/mix.lock
+++ b/mix.lock
@@ -87,7 +87,7 @@
   "mimetype_parser": {:hex, :mimetype_parser, "0.1.3", "628ac9fe56aa7edcedb534d68397dd66674ab82493c8ebe39acb9a19b666099d", [:mix], [], "hexpm", "7d8f80c567807ce78cd93c938e7f4b0a20b1aaaaab914bf286f68457d9f7a852"},
   "mix_erlang_tasks": {:hex, :mix_erlang_tasks, "0.1.0", "36819fec60b80689eb1380938675af215565a89320a9e29c72c70d97512e4649", [:mix], [], "hexpm", "95d2839c422c482a70c08a8702da8242f86b773f8ab6e8602a4eb72da8da04ed"},
   "mock": {:hex, :mock, "0.3.8", "7046a306b71db2488ef54395eeb74df0a7f335a7caca4a3d3875d1fc81c884dd", [:mix], [{:meck, "~> 0.9.2", [hex: :meck, repo: "hexpm", optional: false]}], "hexpm", "7fa82364c97617d79bb7d15571193fc0c4fe5afd0c932cef09426b3ee6fe2022"},
-  "mox": {:hex, :mox, "1.0.2", "dc2057289ac478b35760ba74165b4b3f402f68803dd5aecd3bfd19c183815d64", [:mix], [], "hexpm", "f9864921b3aaf763c8741b5b8e6f908f44566f1e427b2630e89e9a73b981fef2"},
+  "mox": {:hex, :mox, "1.1.0", "0f5e399649ce9ab7602f72e718305c0f9cdc351190f72844599545e4996af73c", [:mix], [], "hexpm", "d44474c50be02d5b72131070281a5d3895c0e7a95c780e90bc0cfe712f633a13"},
   "msgpax": {:hex, :msgpax, "2.4.0", "4647575c87cb0c43b93266438242c21f71f196cafa268f45f91498541148c15d", [:mix], [{:plug, "~> 1.0", [hex: :plug, repo: "hexpm", optional: true]}], "hexpm", "ca933891b0e7075701a17507c61642bf6e0407bb244040d5d0a58597a06369d2"},
   "nimble_csv": {:hex, :nimble_csv, "1.2.0", "4e26385d260c61eba9d4412c71cea34421f296d5353f914afe3f2e71cce97722", [:mix], [], "hexpm", "d0628117fcc2148178b034044c55359b26966c6eaa8e2ce15777be3bbc91b12a"},
   "nimble_options": {:hex, :nimble_options, "1.0.2", "92098a74df0072ff37d0c12ace58574d26880e522c22801437151a159392270e", [:mix], [], "hexpm", "fd12a8db2021036ce12a309f26f564ec367373265b53e25403f0ee697380f1b8"},

From 3235ab1caab23ce11acfecfcb2bbe4908961b7c0 Mon Sep 17 00:00:00 2001
From: varasev <33550681+varasev@users.noreply.github.com>
Date: Fri, 22 Sep 2023 14:21:29 +0300
Subject: [PATCH 431/909] Deposits and Withdrawals for Polygon Edge (#8180)

* Prepare tables for Polygon Supernet Withdrawals module

* Prepare Indexer.Fetcher.PolygonSupernetWithdrawal

* Prepare Indexer.Fetcher.PolygonSupernetWithdrawalExit

* Prepare tables for Polygon Supernet Deposits module

* Partially add Polygon Supernet Deposits module

* Add Polygon Supernet Deposits module

* Extend transaction data in API v2 for Polygon Supernet Deposits and Withdrawals

* Extend API v2 for list of Polygon Supernet Deposits

* Extend API v2 for list of Polygon Supernet Withdrawals

* Modify collated_gas_price constraint to support Immutable test chain

* Update number of retries

* Fix Indexer.Fetcher.PolygonSupernetWithdrawal

* Fix API v2 for Indexer.Fetcher.PolygonSupernetWithdrawal

* Return page_size to 50

* Fix API v2 for Indexer.Fetcher.PolygonSupernetDeposit

* Fix Explorer.Validator.MetadataRetriever to prevent sending request to nil address

* Refactor PolygonSupernet* modules

* Refactor PolygonSupernet* modules

* Small refactoring of PolygonSupernet* modules

* Update changelog

* Fixes for dialyzer and cspell

* Fix of Explorer tests

* Add env vars for docker

* Add env variable for eth_getLogs

* Share event signatures between modules

* Refactoring for fill_block_range function

* Small refactoring of transaction actions module

* Move polygon_supernet_* modules to a separate folder

* Add specs for public functions

* Remove redundant function

* Reuse decode_data function

* Move polygon_supernet_* files into a separate folder

* Move polygon_supernet_* files into a separate folder

* Partially disband Explorer.Chain module

* Define chain type

* Remove infinite waiting for safe block

* max format

* Rename Polygon Supernet to Polygon Edge

* Set INDEXER_INTERNAL_TRANSACTIONS_TRACER_TYPE to polygon_edge if CHAIN_TYPE is polygon_edge

* Fix chain type definition

* Fix repos list definition in releases_tasks

* INDEXER_POLYGON_SUPERNET_ -> INDEXER_POLYGON_EDGE_

---------

Co-authored-by: POA <33550681+poa@users.noreply.github.com>
Co-authored-by: Viktor Baranov <baranov.viktor.27@gmail.com>
---
 .dialyzer-ignore                              |   5 +
 .github/workflows/config.yml                  |  28 +-
 CHANGELOG.md                                  |   2 +
 apps/block_scout_web/config/config.exs        |   6 +-
 .../lib/block_scout_web/api_router.ex         |   9 +
 .../lib/block_scout_web/chain.ex              |  21 +
 .../api/v2/polygon_edge_controller.ex         |  70 ++
 .../views/address_contract_view.ex            |  14 +-
 .../views/api/v2/polygon_edge_view.ex         |  50 ++
 .../views/api/v2/smart_contract_view.ex       |   3 +-
 .../views/api/v2/transaction_view.ex          |  48 +-
 apps/block_scout_web/priv/gettext/default.pot |   4 +-
 .../priv/gettext/en/LC_MESSAGES/default.po    |   4 +-
 apps/block_scout_web/test/test_helper.exs     |   1 +
 apps/ethereum_jsonrpc/lib/ethereum_jsonrpc.ex |   4 +-
 .../lib/ethereum_jsonrpc/block/by_number.ex   |  14 +-
 apps/explorer/config/config.exs               |   2 +-
 apps/explorer/config/dev.exs                  |   2 +
 apps/explorer/config/prod.exs                 |   4 +
 apps/explorer/config/test.exs                 |   9 +
 apps/explorer/lib/explorer/application.ex     |   1 +
 apps/explorer/lib/explorer/chain.ex           |   5 +
 .../lib/explorer/chain/events/publisher.ex    |   2 +-
 .../lib/explorer/chain/events/subscriber.ex   |   2 +-
 .../runner/polygon_edge/deposit_executes.ex   | 106 +++
 .../import/runner/polygon_edge/deposits.ex    | 110 +++
 .../runner/polygon_edge/withdrawal_exits.ex   | 106 +++
 .../import/runner/polygon_edge/withdrawals.ex | 108 +++
 .../chain/import/stage/block_referencing.ex   |  34 +-
 .../explorer/chain/polygon_edge/deposit.ex    |  53 ++
 .../chain/polygon_edge/deposit_execute.ex     |  41 +
 .../lib/explorer/chain/polygon_edge/reader.ex | 141 +++
 .../explorer/chain/polygon_edge/withdrawal.ex |  58 ++
 .../chain/polygon_edge/withdrawal_exit.ex     |  40 +
 apps/explorer/lib/explorer/helper.ex          |  25 +
 apps/explorer/lib/explorer/repo.ex            |  24 +
 .../explorer/validator/metadata_retriever.ex  |  28 +-
 apps/explorer/lib/release_tasks.ex            |  24 +-
 ..._create_polygon_edge_withdrawal_tables.exs |  28 +
 ...550_create_polygon_edge_deposit_tables.exs |  29 +
 ...3_modify_collated_gas_price_constraint.exs |  15 +
 apps/explorer/test/support/data_case.ex       |   2 +
 apps/explorer/test/test_helper.exs            |   1 +
 apps/indexer/lib/indexer/block/fetcher.ex     |  52 +-
 .../lib/indexer/block/realtime/fetcher.ex     |  11 +
 .../lib/indexer/fetcher/polygon_edge.ex       | 837 ++++++++++++++++++
 .../indexer/fetcher/polygon_edge/deposit.ex   | 140 +++
 .../fetcher/polygon_edge/deposit_execute.ex   | 196 ++++
 .../fetcher/polygon_edge/withdrawal.ex        | 216 +++++
 .../fetcher/polygon_edge/withdrawal_exit.ex   |  84 ++
 apps/indexer/lib/indexer/helper.ex            |  35 +
 apps/indexer/lib/indexer/supervisor.ex        |   8 +
 .../polygon_edge/deposit_executes.ex          |  55 ++
 .../transform/polygon_edge/withdrawals.ex     |  54 ++
 .../lib/indexer/transform/token_transfers.ex  |  12 +-
 .../indexer/transform/transaction_actions.ex  |  52 +-
 config/config_helper.exs                      |   8 +
 config/runtime.exs                            |  40 +-
 config/runtime/dev.exs                        |   7 +
 config/runtime/prod.exs                       |   6 +
 cspell.json                                   |   1 +
 docker-compose/envs/common-blockscout.env     |  11 +
 62 files changed, 2976 insertions(+), 132 deletions(-)
 create mode 100644 apps/block_scout_web/lib/block_scout_web/controllers/api/v2/polygon_edge_controller.ex
 create mode 100644 apps/block_scout_web/lib/block_scout_web/views/api/v2/polygon_edge_view.ex
 create mode 100644 apps/explorer/lib/explorer/chain/import/runner/polygon_edge/deposit_executes.ex
 create mode 100644 apps/explorer/lib/explorer/chain/import/runner/polygon_edge/deposits.ex
 create mode 100644 apps/explorer/lib/explorer/chain/import/runner/polygon_edge/withdrawal_exits.ex
 create mode 100644 apps/explorer/lib/explorer/chain/import/runner/polygon_edge/withdrawals.ex
 create mode 100644 apps/explorer/lib/explorer/chain/polygon_edge/deposit.ex
 create mode 100644 apps/explorer/lib/explorer/chain/polygon_edge/deposit_execute.ex
 create mode 100644 apps/explorer/lib/explorer/chain/polygon_edge/reader.ex
 create mode 100644 apps/explorer/lib/explorer/chain/polygon_edge/withdrawal.ex
 create mode 100644 apps/explorer/lib/explorer/chain/polygon_edge/withdrawal_exit.ex
 create mode 100644 apps/explorer/priv/polygon_edge/migrations/20230618132249_create_polygon_edge_withdrawal_tables.exs
 create mode 100644 apps/explorer/priv/polygon_edge/migrations/20230707113550_create_polygon_edge_deposit_tables.exs
 create mode 100644 apps/explorer/priv/repo/migrations/20230731130103_modify_collated_gas_price_constraint.exs
 create mode 100644 apps/indexer/lib/indexer/fetcher/polygon_edge.ex
 create mode 100644 apps/indexer/lib/indexer/fetcher/polygon_edge/deposit.ex
 create mode 100644 apps/indexer/lib/indexer/fetcher/polygon_edge/deposit_execute.ex
 create mode 100644 apps/indexer/lib/indexer/fetcher/polygon_edge/withdrawal.ex
 create mode 100644 apps/indexer/lib/indexer/fetcher/polygon_edge/withdrawal_exit.ex
 create mode 100644 apps/indexer/lib/indexer/helper.ex
 create mode 100644 apps/indexer/lib/indexer/transform/polygon_edge/deposit_executes.ex
 create mode 100644 apps/indexer/lib/indexer/transform/polygon_edge/withdrawals.ex

diff --git a/.dialyzer-ignore b/.dialyzer-ignore
index 6dd625f3298f..d7825ac3f477 100644
--- a/.dialyzer-ignore
+++ b/.dialyzer-ignore
@@ -15,3 +15,8 @@ lib/phoenix/router.ex:402
 lib/explorer/smart_contract/reader.ex:435
 lib/explorer/exchange_rates/source.ex:139
 lib/explorer/exchange_rates/source.ex:142
+lib/indexer/fetcher/polygon_edge.ex:737
+lib/indexer/fetcher/polygon_edge/deposit_execute.ex:140
+lib/indexer/fetcher/polygon_edge/deposit_execute.ex:184
+lib/indexer/fetcher/polygon_edge/withdrawal.ex:160
+lib/indexer/fetcher/polygon_edge/withdrawal.ex:204
diff --git a/.github/workflows/config.yml b/.github/workflows/config.yml
index 645ad98490ba..6893d0ef319b 100644
--- a/.github/workflows/config.yml
+++ b/.github/workflows/config.yml
@@ -49,7 +49,7 @@ jobs:
           path: |
             deps
             _build
-          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_22-${{ hashFiles('mix.lock') }}
+          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_23-${{ hashFiles('mix.lock') }}
           restore-keys: |
             ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-
 
@@ -107,7 +107,7 @@ jobs:
           path: |
             deps
             _build
-          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_22-${{ hashFiles('mix.lock') }}
+          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_23-${{ hashFiles('mix.lock') }}
           restore-keys: |
             ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-"
 
@@ -131,7 +131,7 @@ jobs:
           path: |
             deps
             _build
-          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_22-${{ hashFiles('mix.lock') }}
+          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_23-${{ hashFiles('mix.lock') }}
           restore-keys: |
             ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-"
 
@@ -154,7 +154,7 @@ jobs:
           path: |
             deps
             _build
-          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_22-${{ hashFiles('mix.lock') }}
+          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_23-${{ hashFiles('mix.lock') }}
           restore-keys: |
             ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-"
 
@@ -163,7 +163,7 @@ jobs:
         id: dialyzer-cache
         with:
           path: priv/plts
-          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-dialyzer-mixlockhash_22-${{ hashFiles('mix.lock') }}
+          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-dialyzer-mixlockhash_23-${{ hashFiles('mix.lock') }}
           restore-keys: |
             ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-dialyzer-"
 
@@ -194,7 +194,7 @@ jobs:
           path: |
             deps
             _build
-          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_22-${{ hashFiles('mix.lock') }}
+          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_23-${{ hashFiles('mix.lock') }}
           restore-keys: |
             ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-"
 
@@ -220,7 +220,7 @@ jobs:
           path: |
             deps
             _build
-          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_22-${{ hashFiles('mix.lock') }}
+          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_23-${{ hashFiles('mix.lock') }}
           restore-keys: |
             ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-"
 
@@ -249,7 +249,7 @@ jobs:
           path: |
             deps
             _build
-          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_22-${{ hashFiles('mix.lock') }}
+          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_23-${{ hashFiles('mix.lock') }}
           restore-keys: |
             ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-"
 
@@ -297,7 +297,7 @@ jobs:
           path: |
             deps
             _build
-          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_22-${{ hashFiles('mix.lock') }}
+          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_23-${{ hashFiles('mix.lock') }}
           restore-keys: |
             ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-"
 
@@ -343,7 +343,7 @@ jobs:
           path: |
             deps
             _build
-          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_22-${{ hashFiles('mix.lock') }}
+          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_23-${{ hashFiles('mix.lock') }}
           restore-keys: |
             ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-"
 
@@ -400,7 +400,7 @@ jobs:
           path: |
             deps
             _build
-          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_22-${{ hashFiles('mix.lock') }}
+          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_23-${{ hashFiles('mix.lock') }}
           restore-keys: |
             ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-"
 
@@ -454,7 +454,7 @@ jobs:
           path: |
             deps
             _build
-          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_22-${{ hashFiles('mix.lock') }}
+          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_23-${{ hashFiles('mix.lock') }}
           restore-keys: |
             ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-"
 
@@ -519,7 +519,7 @@ jobs:
           path: |
             deps
             _build
-          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_22-${{ hashFiles('mix.lock') }}
+          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_23-${{ hashFiles('mix.lock') }}
           restore-keys: |
             ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-"
 
@@ -583,7 +583,7 @@ jobs:
           path: |
             deps
             _build
-          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_22-${{ hashFiles('mix.lock') }}
+          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_23-${{ hashFiles('mix.lock') }}
           restore-keys: |
             ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-"
 
diff --git a/CHANGELOG.md b/CHANGELOG.md
index fb84e4dfdee5..53cba9522b71 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,8 @@
 
 ### Features
 
+- [#8180](https://github.com/blockscout/blockscout/pull/8180) - Deposits and Withdrawals for Polygon Edge
+
 ### Fixes
 
 ### Chore
diff --git a/apps/block_scout_web/config/config.exs b/apps/block_scout_web/config/config.exs
index 19182c508d9f..bb545430cbe8 100644
--- a/apps/block_scout_web/config/config.exs
+++ b/apps/block_scout_web/config/config.exs
@@ -5,10 +5,14 @@
 # is restricted to this project.
 import Config
 
+[__DIR__ | ~w(.. .. .. config config_helper.exs)]
+|> Path.join()
+|> Code.eval_file()
+
 # General application configuration
 config :block_scout_web,
   namespace: BlockScoutWeb,
-  ecto_repos: [Explorer.Repo, Explorer.Repo.Account],
+  ecto_repos: ConfigHelper.repos(),
   cookie_domain: System.get_env("SESSION_COOKIE_DOMAIN"),
   # 604800 seconds, 1 week
   session_cookie_ttl: 60 * 60 * 24 * 7,
diff --git a/apps/block_scout_web/lib/block_scout_web/api_router.ex b/apps/block_scout_web/lib/block_scout_web/api_router.ex
index c422faed4620..7cd8dfb601ba 100644
--- a/apps/block_scout_web/lib/block_scout_web/api_router.ex
+++ b/apps/block_scout_web/lib/block_scout_web/api_router.ex
@@ -196,6 +196,15 @@ defmodule BlockScoutWeb.ApiRouter do
       end
     end
 
+    scope "/polygon-edge" do
+      if System.get_env("CHAIN_TYPE") == "polygon_edge" do
+        get("/deposits", V2.PolygonEdgeController, :deposits)
+        get("/deposits/count", V2.PolygonEdgeController, :deposits_count)
+        get("/withdrawals", V2.PolygonEdgeController, :withdrawals)
+        get("/withdrawals/count", V2.PolygonEdgeController, :withdrawals_count)
+      end
+    end
+
     scope "/withdrawals" do
       get("/", V2.WithdrawalController, :withdrawals_list)
       get("/counters", V2.WithdrawalController, :withdrawals_counters)
diff --git a/apps/block_scout_web/lib/block_scout_web/chain.ex b/apps/block_scout_web/lib/block_scout_web/chain.ex
index 6409cc205331..8e8c2b465dcb 100644
--- a/apps/block_scout_web/lib/block_scout_web/chain.ex
+++ b/apps/block_scout_web/lib/block_scout_web/chain.ex
@@ -334,6 +334,22 @@ defmodule BlockScoutWeb.Chain do
     end
   end
 
+  # clause for Polygon Edge Deposits and Withdrawals
+  def paging_options(%{"id" => id_string}) when is_binary(id_string) do
+    case Integer.parse(id_string) do
+      {id, ""} ->
+        [paging_options: %{@default_paging_options | key: {id}}]
+
+      _ ->
+        [paging_options: @default_paging_options]
+    end
+  end
+
+  # clause for Polygon Edge Deposits and Withdrawals
+  def paging_options(%{"id" => id}) when is_integer(id) do
+    [paging_options: %{@default_paging_options | key: {id}}]
+  end
+
   def paging_options(_params), do: [paging_options: @default_paging_options]
 
   def put_key_value_to_paging_options([paging_options: paging_options], key, value) do
@@ -516,6 +532,11 @@ defmodule BlockScoutWeb.Chain do
     %{"state_changes" => nil}
   end
 
+  # clause for Polygon Edge Deposits and Withdrawals
+  defp paging_params(%{msg_id: msg_id}) do
+    %{"id" => msg_id}
+  end
+
   defp paging_params_with_fiat_value(%CurrentTokenBalance{id: id, value: value} = ctb) do
     %{"fiat_value" => ctb.fiat_value, "value" => value, "id" => id}
   end
diff --git a/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/polygon_edge_controller.ex b/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/polygon_edge_controller.ex
new file mode 100644
index 000000000000..53157d08bdbe
--- /dev/null
+++ b/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/polygon_edge_controller.ex
@@ -0,0 +1,70 @@
+defmodule BlockScoutWeb.API.V2.PolygonEdgeController do
+  use BlockScoutWeb, :controller
+
+  import BlockScoutWeb.Chain,
+    only: [
+      next_page_params: 3,
+      paging_options: 1,
+      split_list_by_page: 1
+    ]
+
+  alias Explorer.Chain.PolygonEdge.Reader
+
+  action_fallback(BlockScoutWeb.API.V2.FallbackController)
+
+  @spec deposits(Plug.Conn.t(), map()) :: Plug.Conn.t()
+  def deposits(conn, params) do
+    {deposits, next_page} =
+      params
+      |> paging_options()
+      |> Keyword.put(:api?, true)
+      |> Reader.deposits()
+      |> split_list_by_page()
+
+    next_page_params = next_page_params(next_page, deposits, params)
+
+    conn
+    |> put_status(200)
+    |> render(:polygon_edge_deposits, %{
+      deposits: deposits,
+      next_page_params: next_page_params
+    })
+  end
+
+  @spec deposits_count(Plug.Conn.t(), map()) :: Plug.Conn.t()
+  def deposits_count(conn, _params) do
+    count = Reader.deposits_count(api?: true)
+
+    conn
+    |> put_status(200)
+    |> render(:polygon_edge_items_count, %{count: count})
+  end
+
+  @spec withdrawals(Plug.Conn.t(), map()) :: Plug.Conn.t()
+  def withdrawals(conn, params) do
+    {withdrawals, next_page} =
+      params
+      |> paging_options()
+      |> Keyword.put(:api?, true)
+      |> Reader.withdrawals()
+      |> split_list_by_page()
+
+    next_page_params = next_page_params(next_page, withdrawals, params)
+
+    conn
+    |> put_status(200)
+    |> render(:polygon_edge_withdrawals, %{
+      withdrawals: withdrawals,
+      next_page_params: next_page_params
+    })
+  end
+
+  @spec withdrawals_count(Plug.Conn.t(), map()) :: Plug.Conn.t()
+  def withdrawals_count(conn, _params) do
+    count = Reader.withdrawals_count(api?: true)
+
+    conn
+    |> put_status(200)
+    |> render(:polygon_edge_items_count, %{count: count})
+  end
+end
diff --git a/apps/block_scout_web/lib/block_scout_web/views/address_contract_view.ex b/apps/block_scout_web/lib/block_scout_web/views/address_contract_view.ex
index 44991dd85f01..608971ec7af6 100644
--- a/apps/block_scout_web/lib/block_scout_web/views/address_contract_view.ex
+++ b/apps/block_scout_web/lib/block_scout_web/views/address_contract_view.ex
@@ -1,7 +1,9 @@
 defmodule BlockScoutWeb.AddressContractView do
   use BlockScoutWeb, :view
 
-  alias ABI.{FunctionSelector, TypeDecoder}
+  import Explorer.Helper, only: [decode_data: 2]
+
+  alias ABI.FunctionSelector
   alias Explorer.Chain
   alias Explorer.Chain.{Address, Data, InternalTransaction, Transaction}
 
@@ -90,16 +92,6 @@ defmodule BlockScoutWeb.AddressContractView do
     end
   end
 
-  def decode_data("0x" <> encoded_data, types) do
-    decode_data(encoded_data, types)
-  end
-
-  def decode_data(encoded_data, types) do
-    encoded_data
-    |> Base.decode16!(case: :mixed)
-    |> TypeDecoder.decode_raw(types)
-  end
-
   def format_external_libraries(libraries, conn) do
     Enum.reduce(libraries, "", fn %{name: name, address_hash: address_hash}, acc ->
       address = get_address(address_hash)
diff --git a/apps/block_scout_web/lib/block_scout_web/views/api/v2/polygon_edge_view.ex b/apps/block_scout_web/lib/block_scout_web/views/api/v2/polygon_edge_view.ex
new file mode 100644
index 000000000000..3a813a6a1960
--- /dev/null
+++ b/apps/block_scout_web/lib/block_scout_web/views/api/v2/polygon_edge_view.ex
@@ -0,0 +1,50 @@
+defmodule BlockScoutWeb.API.V2.PolygonEdgeView do
+  use BlockScoutWeb, :view
+
+  @spec render(String.t(), map()) :: map()
+  def render("polygon_edge_deposits.json", %{
+        deposits: deposits,
+        next_page_params: next_page_params
+      }) do
+    %{
+      items:
+        Enum.map(deposits, fn deposit ->
+          %{
+            "msg_id" => deposit.msg_id,
+            "from" => deposit.from,
+            "to" => deposit.to,
+            "l1_transaction_hash" => deposit.l1_transaction_hash,
+            "l1_timestamp" => deposit.l1_timestamp,
+            "success" => deposit.success,
+            "l2_transaction_hash" => deposit.l2_transaction_hash
+          }
+        end),
+      next_page_params: next_page_params
+    }
+  end
+
+  def render("polygon_edge_withdrawals.json", %{
+        withdrawals: withdrawals,
+        next_page_params: next_page_params
+      }) do
+    %{
+      items:
+        Enum.map(withdrawals, fn withdrawal ->
+          %{
+            "msg_id" => withdrawal.msg_id,
+            "from" => withdrawal.from,
+            "to" => withdrawal.to,
+            "l2_transaction_hash" => withdrawal.l2_transaction_hash,
+            "l2_timestamp" => withdrawal.l2_timestamp,
+            "success" => withdrawal.success,
+            "l1_transaction_hash" => withdrawal.l1_transaction_hash
+          }
+        end),
+      next_page_params: next_page_params
+    }
+  end
+
+  def render("polygon_edge_items_count.json", %{count: count}) do
+    count
+  end
+end
diff --git a/apps/block_scout_web/lib/block_scout_web/views/api/v2/smart_contract_view.ex b/apps/block_scout_web/lib/block_scout_web/views/api/v2/smart_contract_view.ex
index 1c102bf0cc11..f62dffc9697b 100644
--- a/apps/block_scout_web/lib/block_scout_web/views/api/v2/smart_contract_view.ex
+++ b/apps/block_scout_web/lib/block_scout_web/views/api/v2/smart_contract_view.ex
@@ -1,6 +1,7 @@
 defmodule BlockScoutWeb.API.V2.SmartContractView do
   use BlockScoutWeb, :view
 
+  import Explorer.Helper, only: [decode_data: 2]
   import Explorer.SmartContract.Reader, only: [zip_tuple_values_with_types: 2]
 
   alias ABI.FunctionSelector
@@ -231,7 +232,7 @@ defmodule BlockScoutWeb.API.V2.SmartContractView do
 
     result =
       constructor_arguments
-      |> AddressContractView.decode_data(input_types)
+      |> decode_data(input_types)
       |> Enum.zip(constructor_abi["inputs"])
       |> Enum.map(fn {value, %{"type" => type} = input_arg} ->
         [ABIEncodedValueView.value_json(type, value), input_arg]
diff --git a/apps/block_scout_web/lib/block_scout_web/views/api/v2/transaction_view.ex b/apps/block_scout_web/lib/block_scout_web/views/api/v2/transaction_view.ex
index 7bd6f70e52b7..24ecda93570c 100644
--- a/apps/block_scout_web/lib/block_scout_web/views/api/v2/transaction_view.ex
+++ b/apps/block_scout_web/lib/block_scout_web/views/api/v2/transaction_view.ex
@@ -10,6 +10,7 @@ defmodule BlockScoutWeb.API.V2.TransactionView do
   alias Explorer.{Chain, Market}
   alias Explorer.Chain.{Address, Block, InternalTransaction, Log, Token, Transaction, Wei}
   alias Explorer.Chain.Block.Reward
+  alias Explorer.Chain.PolygonEdge.Reader
   alias Explorer.Chain.Transaction.StateChange
   alias Explorer.Counters.AverageBlockTime
   alias Timex.Duration
@@ -349,7 +350,7 @@ defmodule BlockScoutWeb.API.V2.TransactionView do
 
     decoded_input_data = decoded_input(decoded_input)
 
-    %{
+    result = %{
       "hash" => transaction.hash,
       "result" => status,
       "status" => transaction.status,
@@ -406,6 +407,14 @@ defmodule BlockScoutWeb.API.V2.TransactionView do
       "tx_tag" => GetTransactionTags.get_transaction_tags(transaction.hash, current_user(single_tx? && conn)),
       "has_error_in_internal_txs" => transaction.has_error_in_internal_txs
     }
+
+    if Application.get_env(:explorer, :chain_type) == "polygon_edge" && single_tx? do
+      result
+      |> Map.put("polygon_edge_deposit", polygon_edge_deposit(transaction.hash, conn))
+      |> Map.put("polygon_edge_withdrawal", polygon_edge_withdrawal(transaction.hash, conn))
+    else
+      result
+    end
   end
 
   def token_transfers(_, _conn, false), do: nil
@@ -681,4 +690,41 @@ defmodule BlockScoutWeb.API.V2.TransactionView do
 
     Map.merge(map, %{"change" => change})
   end
+
+  defp polygon_edge_deposit(transaction_hash, conn) do
+    transaction_hash
+    |> Reader.deposit_by_transaction_hash()
+    |> polygon_edge_deposit_or_withdrawal(conn)
+  end
+
+  defp polygon_edge_withdrawal(transaction_hash, conn) do
+    transaction_hash
+    |> Reader.withdrawal_by_transaction_hash()
+    |> polygon_edge_deposit_or_withdrawal(conn)
+  end
+
+  defp polygon_edge_deposit_or_withdrawal(item, conn) do
+    if not is_nil(item) do
+      {from_address, from_address_hash} = hash_to_address_and_hash(item.from)
+      {to_address, to_address_hash} = hash_to_address_and_hash(item.to)
+
+      item
+      |> Map.put(:from, Helper.address_with_info(conn, from_address, from_address_hash, item.from))
+      |> Map.put(:to, Helper.address_with_info(conn, to_address, to_address_hash, item.to))
+    end
+  end
+
+  defp hash_to_address_and_hash(hash) do
+    with false <- is_nil(hash),
+         {:ok, address} <-
+           Chain.hash_to_address(
+             hash,
+             [necessity_by_association: %{:names => :optional, :smart_contract => :optional}, api?: true],
+             false
+           ) do
+      {address, address.hash}
+    else
+      _ -> {nil, nil}
+    end
+  end
 end
diff --git a/apps/block_scout_web/priv/gettext/default.pot b/apps/block_scout_web/priv/gettext/default.pot
index 930e2348eca3..d15c1455abf1 100644
--- a/apps/block_scout_web/priv/gettext/default.pot
+++ b/apps/block_scout_web/priv/gettext/default.pot
@@ -3585,7 +3585,7 @@ msgstr ""
 msgid "fallback"
 msgstr ""
 
-#: lib/block_scout_web/views/address_contract_view.ex:24
+#: lib/block_scout_web/views/address_contract_view.ex:26
 #, elixir-autogen, elixir-format
 msgid "false"
 msgstr ""
@@ -3641,7 +3641,7 @@ msgstr ""
 msgid "string"
 msgstr ""
 
-#: lib/block_scout_web/views/address_contract_view.ex:23
+#: lib/block_scout_web/views/address_contract_view.ex:25
 #, elixir-autogen, elixir-format
 msgid "true"
 msgstr ""
diff --git a/apps/block_scout_web/priv/gettext/en/LC_MESSAGES/default.po b/apps/block_scout_web/priv/gettext/en/LC_MESSAGES/default.po
index dd08664c4b1f..d770bca3428d 100644
--- a/apps/block_scout_web/priv/gettext/en/LC_MESSAGES/default.po
+++ b/apps/block_scout_web/priv/gettext/en/LC_MESSAGES/default.po
@@ -3585,7 +3585,7 @@ msgstr ""
 msgid "fallback"
 msgstr ""
 
-#: lib/block_scout_web/views/address_contract_view.ex:24
+#: lib/block_scout_web/views/address_contract_view.ex:26
 #, elixir-autogen, elixir-format
 msgid "false"
 msgstr ""
@@ -3641,7 +3641,7 @@ msgstr ""
 msgid "string"
 msgstr ""
 
-#: lib/block_scout_web/views/address_contract_view.ex:23
+#: lib/block_scout_web/views/address_contract_view.ex:25
 #, elixir-autogen, elixir-format
 msgid "true"
 msgstr ""
diff --git a/apps/block_scout_web/test/test_helper.exs b/apps/block_scout_web/test/test_helper.exs
index a99ba9a234d5..d923caa304a4 100644
--- a/apps/block_scout_web/test/test_helper.exs
+++ b/apps/block_scout_web/test/test_helper.exs
@@ -26,6 +26,7 @@ Mox.defmock(Explorer.ExchangeRates.Source.TestSource, for: Explorer.ExchangeRate
 
 Ecto.Adapters.SQL.Sandbox.mode(Explorer.Repo, :manual)
 Ecto.Adapters.SQL.Sandbox.mode(Explorer.Repo.Account, :manual)
+Ecto.Adapters.SQL.Sandbox.mode(Explorer.Repo.PolygonEdge, :manual)
 
 Absinthe.Test.prime(BlockScoutWeb.Schema)
 
diff --git a/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc.ex b/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc.ex
index 4a59a80e9c7d..6695c41b8618 100644
--- a/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc.ex
+++ b/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc.ex
@@ -280,7 +280,7 @@ defmodule EthereumJSONRPC do
   """
   @spec fetch_block_by_tag(tag(), json_rpc_named_arguments) ::
           {:ok, Blocks.t()} | {:error, reason :: :invalid_tag | :not_found | term()}
-  def fetch_block_by_tag(tag, json_rpc_named_arguments) when tag in ~w(earliest latest pending) do
+  def fetch_block_by_tag(tag, json_rpc_named_arguments) when tag in ~w(earliest latest pending safe) do
     [%{tag: tag}]
     |> fetch_blocks_by_params(&Block.ByTag.request/1, json_rpc_named_arguments)
   end
@@ -319,7 +319,7 @@ defmodule EthereumJSONRPC do
   """
   @spec fetch_block_number_by_tag(tag(), json_rpc_named_arguments) ::
           {:ok, non_neg_integer()} | {:error, reason :: :invalid_tag | :not_found | term()}
-  def fetch_block_number_by_tag(tag, json_rpc_named_arguments) when tag in ~w(earliest latest pending) do
+  def fetch_block_number_by_tag(tag, json_rpc_named_arguments) when tag in ~w(earliest latest pending safe) do
     tag
     |> fetch_block_by_tag(json_rpc_named_arguments)
     |> Block.ByTag.number_from_result()
diff --git a/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/block/by_number.ex b/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/block/by_number.ex
index 80ec9b1cd105..5a1cf1eeca41 100644
--- a/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/block/by_number.ex
+++ b/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/block/by_number.ex
@@ -5,7 +5,17 @@ defmodule EthereumJSONRPC.Block.ByNumber do
 
   import EthereumJSONRPC, only: [integer_to_quantity: 1]
 
-  def request(%{id: id, number: number}) do
-    EthereumJSONRPC.request(%{id: id, method: "eth_getBlockByNumber", params: [integer_to_quantity(number), true]})
+  alias EthereumJSONRPC.Transport
+
+  @spec request(map(), boolean(), boolean()) :: Transport.request()
+  def request(%{id: id, number: number}, hydrated \\ true, int_to_qty \\ true) do
+    block_number =
+      if int_to_qty do
+        integer_to_quantity(number)
+      else
+        number
+      end
+
+    EthereumJSONRPC.request(%{id: id, method: "eth_getBlockByNumber", params: [block_number, hydrated]})
   end
 end
diff --git a/apps/explorer/config/config.exs b/apps/explorer/config/config.exs
index 4e077d969cb1..8bfc263b536d 100644
--- a/apps/explorer/config/config.exs
+++ b/apps/explorer/config/config.exs
@@ -11,7 +11,7 @@ import Config
 
 # General application configuration
 config :explorer,
-  ecto_repos: [Explorer.Repo, Explorer.Repo.Account],
+  ecto_repos: ConfigHelper.repos(),
   token_functions_reader_max_retries: 3,
   # for not fully indexed blockchains
   decode_not_a_contract_calls: ConfigHelper.parse_bool_env_var("DECODE_NOT_A_CONTRACT_CALLS")
diff --git a/apps/explorer/config/dev.exs b/apps/explorer/config/dev.exs
index 821c11c17a6d..57bb58ebf0f6 100644
--- a/apps/explorer/config/dev.exs
+++ b/apps/explorer/config/dev.exs
@@ -11,6 +11,8 @@ config :explorer, Explorer.Repo.Replica1, timeout: :timer.seconds(80)
 # Configure Account database
 config :explorer, Explorer.Repo.Account, timeout: :timer.seconds(80)
 
+config :explorer, Explorer.Repo.PolygonEdge, timeout: :timer.seconds(80)
+
 config :explorer, Explorer.Tracer, env: "dev", disabled?: true
 
 config :logger, :explorer,
diff --git a/apps/explorer/config/prod.exs b/apps/explorer/config/prod.exs
index 43be5c0e9146..620a4c440231 100644
--- a/apps/explorer/config/prod.exs
+++ b/apps/explorer/config/prod.exs
@@ -16,6 +16,10 @@ config :explorer, Explorer.Repo.Account,
   prepare: :unnamed,
   timeout: :timer.seconds(60)
 
+config :explorer, Explorer.Repo.PolygonEdge,
+  prepare: :unnamed,
+  timeout: :timer.seconds(60)
+
 config :explorer, Explorer.Tracer, env: "production", disabled?: true
 
 config :logger, :explorer,
diff --git a/apps/explorer/config/test.exs b/apps/explorer/config/test.exs
index a5eac2e7352c..b7a989dd9963 100644
--- a/apps/explorer/config/test.exs
+++ b/apps/explorer/config/test.exs
@@ -38,6 +38,15 @@ config :explorer, Explorer.Repo.Account,
   timeout: :timer.seconds(60),
   queue_target: 1000
 
+config :explorer, Explorer.Repo.PolygonEdge,
+  database: "explorer_test",
+  hostname: "localhost",
+  pool: Ecto.Adapters.SQL.Sandbox,
+  # Default of `5_000` was too low for `BlockFetcher` test
+  ownership_timeout: :timer.minutes(1),
+  timeout: :timer.seconds(60),
+  queue_target: 1000
+
 config :logger, :explorer,
   level: :warn,
   path: Path.absname("logs/test/explorer.log")
diff --git a/apps/explorer/lib/explorer/application.ex b/apps/explorer/lib/explorer/application.ex
index 2431f0eee028..beb6f4082408 100644
--- a/apps/explorer/lib/explorer/application.ex
+++ b/apps/explorer/lib/explorer/application.ex
@@ -47,6 +47,7 @@ defmodule Explorer.Application do
       Explorer.Repo,
       Explorer.Repo.Replica1,
       Explorer.Repo.Account,
+      Explorer.Repo.PolygonEdge,
       Explorer.Vault,
       Supervisor.child_spec({SpandexDatadog.ApiServer, datadog_opts()}, id: SpandexDatadog.ApiServer),
       Supervisor.child_spec({Task.Supervisor, name: Explorer.HistoryTaskSupervisor}, id: Explorer.HistoryTaskSupervisor),
diff --git a/apps/explorer/lib/explorer/chain.ex b/apps/explorer/lib/explorer/chain.ex
index ecfc013d0e19..3c4239b7ce0f 100644
--- a/apps/explorer/lib/explorer/chain.ex
+++ b/apps/explorer/lib/explorer/chain.ex
@@ -6342,4 +6342,9 @@ defmodule Explorer.Chain do
 
     Repo.all(query)
   end
+
+  @spec default_paging_options() :: map()
+  def default_paging_options do
+    @default_paging_options
+  end
 end
diff --git a/apps/explorer/lib/explorer/chain/events/publisher.ex b/apps/explorer/lib/explorer/chain/events/publisher.ex
index 8d47f337ec64..a02951290059 100644
--- a/apps/explorer/lib/explorer/chain/events/publisher.ex
+++ b/apps/explorer/lib/explorer/chain/events/publisher.ex
@@ -3,7 +3,7 @@ defmodule Explorer.Chain.Events.Publisher do
   Publishes events related to the Chain context.
   """
 
-  @allowed_events ~w(addresses address_coin_balances address_token_balances address_current_token_balances blocks block_rewards internal_transactions last_block_number token_transfers transactions contract_verification_result token_total_supply changed_bytecode smart_contract_was_verified)a
+  @allowed_events ~w(addresses address_coin_balances address_token_balances address_current_token_balances blocks block_rewards internal_transactions last_block_number polygon_edge_reorg_block token_transfers transactions contract_verification_result token_total_supply changed_bytecode smart_contract_was_verified)a
 
   def broadcast(_data, false), do: :ok
 
diff --git a/apps/explorer/lib/explorer/chain/events/subscriber.ex b/apps/explorer/lib/explorer/chain/events/subscriber.ex
index fa0203cbaf90..bc028df157ed 100644
--- a/apps/explorer/lib/explorer/chain/events/subscriber.ex
+++ b/apps/explorer/lib/explorer/chain/events/subscriber.ex
@@ -3,7 +3,7 @@ defmodule Explorer.Chain.Events.Subscriber do
   Subscribes to events related to the Chain context.
   """
 
-  @allowed_broadcast_events ~w(addresses address_coin_balances address_token_balances address_current_token_balances blocks block_rewards internal_transactions last_block_number token_transfers transactions contract_verification_result token_total_supply changed_bytecode smart_contract_was_verified)a
+  @allowed_broadcast_events ~w(addresses address_coin_balances address_token_balances address_current_token_balances blocks block_rewards internal_transactions last_block_number polygon_edge_reorg_block token_transfers transactions contract_verification_result token_total_supply changed_bytecode smart_contract_was_verified)a
 
   @allowed_broadcast_types ~w(catchup realtime on_demand contract_verification_result)a
 
diff --git a/apps/explorer/lib/explorer/chain/import/runner/polygon_edge/deposit_executes.ex b/apps/explorer/lib/explorer/chain/import/runner/polygon_edge/deposit_executes.ex
new file mode 100644
index 000000000000..bc20a12567c2
--- /dev/null
+++ b/apps/explorer/lib/explorer/chain/import/runner/polygon_edge/deposit_executes.ex
@@ -0,0 +1,106 @@
+defmodule Explorer.Chain.Import.Runner.PolygonEdge.DepositExecutes do
+  @moduledoc """
+  Bulk imports `t:Explorer.Chain.PolygonEdge.DepositExecute.t/0`.
+  """
+
+  require Ecto.Query
+
+  import Ecto.Query, only: [from: 2]
+
+  alias Ecto.{Changeset, Multi, Repo}
+  alias Explorer.Chain.Import
+  alias Explorer.Chain.PolygonEdge.DepositExecute
+  alias Explorer.Prometheus.Instrumenter
+
+  @behaviour Import.Runner
+
+  # milliseconds
+  @timeout 60_000
+
+  @type imported :: [DepositExecute.t()]
+
+  @impl Import.Runner
+  def ecto_schema_module, do: DepositExecute
+
+  @impl Import.Runner
+  def option_key, do: :polygon_edge_deposit_executes
+
+  @impl Import.Runner
+  @spec imported_table_row() :: %{:value_description => binary(), :value_type => binary()}
+  def imported_table_row do
+    %{
+      value_type: "[#{ecto_schema_module()}.t()]",
+      value_description: "List of `t:#{ecto_schema_module()}.t/0`s"
+    }
+  end
+
+  @impl Import.Runner
+  @spec run(Multi.t(), list(), map()) :: Multi.t()
+  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)
+
+    Multi.run(multi, :insert_polygon_edge_deposit_executes, fn repo, _ ->
+      Instrumenter.block_import_stage_runner(
+        fn -> insert(repo, changes_list, insert_options) end,
+        :block_referencing,
+        :polygon_edge_deposit_executes,
+        :polygon_edge_deposit_executes
+      )
+    end)
+  end
+
+  @impl Import.Runner
+  def timeout, do: @timeout
+
+  @spec insert(Repo.t(), [map()], %{required(:timeout) => timeout(), required(:timestamps) => Import.timestamps()}) ::
+          {:ok, [DepositExecute.t()]}
+          | {:error, [Changeset.t()]}
+  def 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 PolygonEdge.DepositExecute ShareLocks order (see docs: sharelock.md)
+    ordered_changes_list = Enum.sort_by(changes_list, & &1.msg_id)
+
+    {:ok, inserted} =
+      Import.insert_changes_list(
+        repo,
+        ordered_changes_list,
+        conflict_target: :msg_id,
+        on_conflict: on_conflict,
+        for: DepositExecute,
+        returning: true,
+        timeout: timeout,
+        timestamps: timestamps
+      )
+
+    {:ok, inserted}
+  end
+
+  defp default_on_conflict do
+    from(
+      de in DepositExecute,
+      update: [
+        set: [
+          # Don't update `msg_id` as it is a primary key and used for the conflict target
+          l2_transaction_hash: fragment("EXCLUDED.l2_transaction_hash"),
+          l2_block_number: fragment("EXCLUDED.l2_block_number"),
+          success: fragment("EXCLUDED.success"),
+          inserted_at: fragment("LEAST(?, EXCLUDED.inserted_at)", de.inserted_at),
+          updated_at: fragment("GREATEST(?, EXCLUDED.updated_at)", de.updated_at)
+        ]
+      ],
+      where:
+        fragment(
+          "(EXCLUDED.l2_transaction_hash, EXCLUDED.l2_block_number, EXCLUDED.success) IS DISTINCT FROM (?, ?, ?)",
+          de.l2_transaction_hash,
+          de.l2_block_number,
+          de.success
+        )
+    )
+  end
+end
diff --git a/apps/explorer/lib/explorer/chain/import/runner/polygon_edge/deposits.ex b/apps/explorer/lib/explorer/chain/import/runner/polygon_edge/deposits.ex
new file mode 100644
index 000000000000..b4893f86b67d
--- /dev/null
+++ b/apps/explorer/lib/explorer/chain/import/runner/polygon_edge/deposits.ex
@@ -0,0 +1,110 @@
+defmodule Explorer.Chain.Import.Runner.PolygonEdge.Deposits do
+  @moduledoc """
+  Bulk imports `t:Explorer.Chain.PolygonEdge.Deposit.t/0`.
+  """
+
+  require Ecto.Query
+
+  import Ecto.Query, only: [from: 2]
+
+  alias Ecto.{Changeset, Multi, Repo}
+  alias Explorer.Chain.Import
+  alias Explorer.Chain.PolygonEdge.Deposit
+  alias Explorer.Prometheus.Instrumenter
+
+  @behaviour Import.Runner
+
+  # milliseconds
+  @timeout 60_000
+
+  @type imported :: [Deposit.t()]
+
+  @impl Import.Runner
+  def ecto_schema_module, do: Deposit
+
+  @impl Import.Runner
+  def option_key, do: :polygon_edge_deposits
+
+  @impl Import.Runner
+  @spec imported_table_row() :: %{:value_description => binary(), :value_type => binary()}
+  def imported_table_row do
+    %{
+      value_type: "[#{ecto_schema_module()}.t()]",
+      value_description: "List of `t:#{ecto_schema_module()}.t/0`s"
+    }
+  end
+
+  @impl Import.Runner
+  @spec run(Multi.t(), list(), map()) :: Multi.t()
+  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)
+
+    Multi.run(multi, :insert_polygon_edge_deposits, fn repo, _ ->
+      Instrumenter.block_import_stage_runner(
+        fn -> insert(repo, changes_list, insert_options) end,
+        :block_referencing,
+        :polygon_edge_deposits,
+        :polygon_edge_deposits
+      )
+    end)
+  end
+
+  @impl Import.Runner
+  def timeout, do: @timeout
+
+  @spec insert(Repo.t(), [map()], %{required(:timeout) => timeout(), required(:timestamps) => Import.timestamps()}) ::
+          {:ok, [Deposit.t()]}
+          | {:error, [Changeset.t()]}
+  def 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 PolygonEdge.Deposit ShareLocks order (see docs: sharelock.md)
+    ordered_changes_list = Enum.sort_by(changes_list, & &1.msg_id)
+
+    {:ok, inserted} =
+      Import.insert_changes_list(
+        repo,
+        ordered_changes_list,
+        conflict_target: :msg_id,
+        on_conflict: on_conflict,
+        for: Deposit,
+        returning: true,
+        timeout: timeout,
+        timestamps: timestamps
+      )
+
+    {:ok, inserted}
+  end
+
+  defp default_on_conflict do
+    from(
+      d in Deposit,
+      update: [
+        set: [
+          # Don't update `msg_id` as it is a primary key and used for the conflict target
+          from: fragment("EXCLUDED.from"),
+          to: fragment("EXCLUDED.to"),
+          l1_transaction_hash: fragment("EXCLUDED.l1_transaction_hash"),
+          l1_timestamp: fragment("EXCLUDED.l1_timestamp"),
+          l1_block_number: fragment("EXCLUDED.l1_block_number"),
+          inserted_at: fragment("LEAST(?, EXCLUDED.inserted_at)", d.inserted_at),
+          updated_at: fragment("GREATEST(?, EXCLUDED.updated_at)", d.updated_at)
+        ]
+      ],
+      where:
+        fragment(
+          "(EXCLUDED.from, EXCLUDED.to, EXCLUDED.l1_transaction_hash, EXCLUDED.l1_timestamp, EXCLUDED.l1_block_number) IS DISTINCT FROM (?, ?, ?, ?, ?)",
+          d.from,
+          d.to,
+          d.l1_transaction_hash,
+          d.l1_timestamp,
+          d.l1_block_number
+        )
+    )
+  end
+end
diff --git a/apps/explorer/lib/explorer/chain/import/runner/polygon_edge/withdrawal_exits.ex b/apps/explorer/lib/explorer/chain/import/runner/polygon_edge/withdrawal_exits.ex
new file mode 100644
index 000000000000..16c13eadbf1f
--- /dev/null
+++ b/apps/explorer/lib/explorer/chain/import/runner/polygon_edge/withdrawal_exits.ex
@@ -0,0 +1,106 @@
+defmodule Explorer.Chain.Import.Runner.PolygonEdge.WithdrawalExits do
+  @moduledoc """
+  Bulk imports `t:Explorer.Chain.PolygonEdge.WithdrawalExit.t/0`.
+  """
+
+  require Ecto.Query
+
+  import Ecto.Query, only: [from: 2]
+
+  alias Ecto.{Changeset, Multi, Repo}
+  alias Explorer.Chain.Import
+  alias Explorer.Chain.PolygonEdge.WithdrawalExit
+  alias Explorer.Prometheus.Instrumenter
+
+  @behaviour Import.Runner
+
+  # milliseconds
+  @timeout 60_000
+
+  @type imported :: [WithdrawalExit.t()]
+
+  @impl Import.Runner
+  def ecto_schema_module, do: WithdrawalExit
+
+  @impl Import.Runner
+  def option_key, do: :polygon_edge_withdrawal_exits
+
+  @impl Import.Runner
+  @spec imported_table_row() :: %{:value_description => binary(), :value_type => binary()}
+  def imported_table_row do
+    %{
+      value_type: "[#{ecto_schema_module()}.t()]",
+      value_description: "List of `t:#{ecto_schema_module()}.t/0`s"
+    }
+  end
+
+  @impl Import.Runner
+  @spec run(Multi.t(), list(), map()) :: Multi.t()
+  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)
+
+    Multi.run(multi, :insert_polygon_edge_withdrawal_exits, fn repo, _ ->
+      Instrumenter.block_import_stage_runner(
+        fn -> insert(repo, changes_list, insert_options) end,
+        :block_referencing,
+        :polygon_edge_withdrawal_exits,
+        :polygon_edge_withdrawal_exits
+      )
+    end)
+  end
+
+  @impl Import.Runner
+  def timeout, do: @timeout
+
+  @spec insert(Repo.t(), [map()], %{required(:timeout) => timeout(), required(:timestamps) => Import.timestamps()}) ::
+          {:ok, [WithdrawalExit.t()]}
+          | {:error, [Changeset.t()]}
+  def 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 PolygonEdge.WithdrawalExit ShareLocks order (see docs: sharelock.md)
+    ordered_changes_list = Enum.sort_by(changes_list, & &1.msg_id)
+
+    {:ok, inserted} =
+      Import.insert_changes_list(
+        repo,
+        ordered_changes_list,
+        conflict_target: :msg_id,
+        on_conflict: on_conflict,
+        for: WithdrawalExit,
+        returning: true,
+        timeout: timeout,
+        timestamps: timestamps
+      )
+
+    {:ok, inserted}
+  end
+
+  defp default_on_conflict do
+    from(
+      we in WithdrawalExit,
+      update: [
+        set: [
+          # Don't update `msg_id` as it is a primary key and used for the conflict target
+          l1_transaction_hash: fragment("EXCLUDED.l1_transaction_hash"),
+          l1_block_number: fragment("EXCLUDED.l1_block_number"),
+          success: fragment("EXCLUDED.success"),
+          inserted_at: fragment("LEAST(?, EXCLUDED.inserted_at)", we.inserted_at),
+          updated_at: fragment("GREATEST(?, EXCLUDED.updated_at)", we.updated_at)
+        ]
+      ],
+      where:
+        fragment(
+          "(EXCLUDED.l1_transaction_hash, EXCLUDED.l1_block_number, EXCLUDED.success) IS DISTINCT FROM (?, ?, ?)",
+          we.l1_transaction_hash,
+          we.l1_block_number,
+          we.success
+        )
+    )
+  end
+end
diff --git a/apps/explorer/lib/explorer/chain/import/runner/polygon_edge/withdrawals.ex b/apps/explorer/lib/explorer/chain/import/runner/polygon_edge/withdrawals.ex
new file mode 100644
index 000000000000..e728e2cba495
--- /dev/null
+++ b/apps/explorer/lib/explorer/chain/import/runner/polygon_edge/withdrawals.ex
@@ -0,0 +1,108 @@
+defmodule Explorer.Chain.Import.Runner.PolygonEdge.Withdrawals do
+  @moduledoc """
+  Bulk imports `t:Explorer.Chain.PolygonEdge.Withdrawal.t/0`.
+  """
+
+  require Ecto.Query
+
+  import Ecto.Query, only: [from: 2]
+
+  alias Ecto.{Changeset, Multi, Repo}
+  alias Explorer.Chain.Import
+  alias Explorer.Chain.PolygonEdge.Withdrawal
+  alias Explorer.Prometheus.Instrumenter
+
+  @behaviour Import.Runner
+
+  # milliseconds
+  @timeout 60_000
+
+  @type imported :: [Withdrawal.t()]
+
+  @impl Import.Runner
+  def ecto_schema_module, do: Withdrawal
+
+  @impl Import.Runner
+  def option_key, do: :polygon_edge_withdrawals
+
+  @impl Import.Runner
+  @spec imported_table_row() :: %{:value_description => binary(), :value_type => binary()}
+  def imported_table_row do
+    %{
+      value_type: "[#{ecto_schema_module()}.t()]",
+      value_description: "List of `t:#{ecto_schema_module()}.t/0`s"
+    }
+  end
+
+  @impl Import.Runner
+  @spec run(Multi.t(), list(), map()) :: Multi.t()
+  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)
+
+    Multi.run(multi, :insert_polygon_edge_withdrawals, fn repo, _ ->
+      Instrumenter.block_import_stage_runner(
+        fn -> insert(repo, changes_list, insert_options) end,
+        :block_referencing,
+        :polygon_edge_withdrawals,
+        :polygon_edge_withdrawals
+      )
+    end)
+  end
+
+  @impl Import.Runner
+  def timeout, do: @timeout
+
+  @spec insert(Repo.t(), [map()], %{required(:timeout) => timeout(), required(:timestamps) => Import.timestamps()}) ::
+          {:ok, [Withdrawal.t()]}
+          | {:error, [Changeset.t()]}
+  def 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 PolygonEdge.Withdrawal ShareLocks order (see docs: sharelock.md)
+    ordered_changes_list = Enum.sort_by(changes_list, & &1.msg_id)
+
+    {:ok, inserted} =
+      Import.insert_changes_list(
+        repo,
+        ordered_changes_list,
+        conflict_target: :msg_id,
+        on_conflict: on_conflict,
+        for: Withdrawal,
+        returning: true,
+        timeout: timeout,
+        timestamps: timestamps
+      )
+
+    {:ok, inserted}
+  end
+
+  defp default_on_conflict do
+    from(
+      w in Withdrawal,
+      update: [
+        set: [
+          # Don't update `msg_id` as it is a primary key and used for the conflict target
+          from: fragment("EXCLUDED.from"),
+          to: fragment("EXCLUDED.to"),
+          l2_transaction_hash: fragment("EXCLUDED.l2_transaction_hash"),
+          l2_block_number: fragment("EXCLUDED.l2_block_number"),
+          inserted_at: fragment("LEAST(?, EXCLUDED.inserted_at)", w.inserted_at),
+          updated_at: fragment("GREATEST(?, EXCLUDED.updated_at)", w.updated_at)
+        ]
+      ],
+      where:
+        fragment(
+          "(EXCLUDED.from, EXCLUDED.to, EXCLUDED.l2_transaction_hash, EXCLUDED.l2_block_number) IS DISTINCT FROM (?, ?, ?, ?)",
+          w.from,
+          w.to,
+          w.l2_transaction_hash,
+          w.l2_block_number
+        )
+    )
+  end
+end
diff --git a/apps/explorer/lib/explorer/chain/import/stage/block_referencing.ex b/apps/explorer/lib/explorer/chain/import/stage/block_referencing.ex
index 578e4b98942d..7f0434e35880 100644
--- a/apps/explorer/lib/explorer/chain/import/stage/block_referencing.ex
+++ b/apps/explorer/lib/explorer/chain/import/stage/block_referencing.ex
@@ -8,19 +8,31 @@ defmodule Explorer.Chain.Import.Stage.BlockReferencing do
   alias Explorer.Chain.Import.{Runner, Stage}
 
   @behaviour Stage
+  @default_runners [
+    Runner.Transactions,
+    Runner.Transaction.Forks,
+    Runner.Logs,
+    Runner.Tokens,
+    Runner.TokenTransfers,
+    Runner.Address.TokenBalances,
+    Runner.TransactionActions,
+    Runner.Withdrawals
+  ]
 
   @impl Stage
-  def runners,
-    do: [
-      Runner.Transactions,
-      Runner.Transaction.Forks,
-      Runner.Logs,
-      Runner.Tokens,
-      Runner.TokenTransfers,
-      Runner.Address.TokenBalances,
-      Runner.TransactionActions,
-      Runner.Withdrawals
-    ]
+  def runners do
+    if System.get_env("CHAIN_TYPE") == "polygon_edge" do
+      @default_runners ++
+        [
+          Runner.PolygonEdge.Deposits,
+          Runner.PolygonEdge.DepositExecutes,
+          Runner.PolygonEdge.Withdrawals,
+          Runner.PolygonEdge.WithdrawalExits
+        ]
+    else
+      @default_runners
+    end
+  end
 
   @impl Stage
   def multis(runner_to_changes_list, options) do
diff --git a/apps/explorer/lib/explorer/chain/polygon_edge/deposit.ex b/apps/explorer/lib/explorer/chain/polygon_edge/deposit.ex
new file mode 100644
index 000000000000..b9ad75bc3a5b
--- /dev/null
+++ b/apps/explorer/lib/explorer/chain/polygon_edge/deposit.ex
@@ -0,0 +1,53 @@
+defmodule Explorer.Chain.PolygonEdge.Deposit do
+  @moduledoc "Models Polygon Edge deposit."
+
+  use Explorer.Schema
+
+  alias Explorer.Chain.{
+    Block,
+    Hash
+  }
+
+  @optional_attrs ~w(from to l1_transaction_hash l1_timestamp)a
+
+  @required_attrs ~w(msg_id l1_block_number)a
+
+  @allowed_attrs @optional_attrs ++ @required_attrs
+
+  @typedoc """
+  * `msg_id` - id of the message
+  * `from` - source address of the message
+  * `to` - target address of the message
+  * `l1_transaction_hash` - hash of the L1 transaction containing the corresponding StateSynced event
+  * `l1_timestamp` - timestamp of the L1 transaction block
+  * `l1_block_number` - block number of the L1 transaction
+  """
+  @type t :: %__MODULE__{
+          msg_id: non_neg_integer(),
+          from: Hash.Address.t() | nil,
+          to: Hash.Address.t() | nil,
+          l1_transaction_hash: Hash.t() | nil,
+          l1_timestamp: DateTime.t() | nil,
+          l1_block_number: Block.block_number()
+        }
+
+  @primary_key false
+  schema "polygon_edge_deposits" do
+    field(:msg_id, :integer, primary_key: true)
+    field(:from, Hash.Address)
+    field(:to, Hash.Address)
+    field(:l1_transaction_hash, Hash.Full)
+    field(:l1_timestamp, :utc_datetime_usec)
+    field(:l1_block_number, :integer)
+
+    timestamps()
+  end
+
+  @spec changeset(Ecto.Schema.t(), map()) :: Ecto.Schema.t()
+  def changeset(%__MODULE__{} = module, attrs \\ %{}) do
+    module
+    |> cast(attrs, @allowed_attrs)
+    |> validate_required(@required_attrs)
+    |> unique_constraint(:msg_id)
+  end
+end
diff --git a/apps/explorer/lib/explorer/chain/polygon_edge/deposit_execute.ex b/apps/explorer/lib/explorer/chain/polygon_edge/deposit_execute.ex
new file mode 100644
index 000000000000..e3e7617d579f
--- /dev/null
+++ b/apps/explorer/lib/explorer/chain/polygon_edge/deposit_execute.ex
@@ -0,0 +1,41 @@
+defmodule Explorer.Chain.PolygonEdge.DepositExecute do
+  @moduledoc "Models Polygon Edge deposit execute."
+
+  use Explorer.Schema
+
+  alias Explorer.Chain.{Block, Hash}
+
+  @required_attrs ~w(msg_id l2_transaction_hash l2_block_number success)a
+
+  @typedoc """
+  * `msg_id` - id of the message
+  * `l2_transaction_hash` - hash of the L2 transaction containing the corresponding StateSyncResult event
+  * `l2_block_number` - block number of the L2 transaction
+  * `success` - a status of onStateReceive internal call (namely internal deposit transaction)
+  """
+  @type t :: %__MODULE__{
+          msg_id: non_neg_integer(),
+          l2_transaction_hash: Hash.t(),
+          l2_block_number: Block.block_number(),
+          success: boolean()
+        }
+
+  @primary_key false
+  schema "polygon_edge_deposit_executes" do
+    field(:msg_id, :integer, primary_key: true)
+    field(:l2_transaction_hash, Hash.Full)
+    field(:l2_block_number, :integer)
+    field(:success, :boolean)
+
+    timestamps()
+  end
+
+  @spec changeset(Ecto.Schema.t(), map()) :: Ecto.Schema.t()
+  def changeset(%__MODULE__{} = module, attrs \\ %{}) do
+    module
+    |> cast(attrs, @required_attrs)
+    |> validate_required(@required_attrs)
+    |> unique_constraint(:msg_id)
+    |> unique_constraint(:l2_transaction_hash)
+  end
+end
diff --git a/apps/explorer/lib/explorer/chain/polygon_edge/reader.ex b/apps/explorer/lib/explorer/chain/polygon_edge/reader.ex
new file mode 100644
index 000000000000..9d8d7dbf4bb5
--- /dev/null
+++ b/apps/explorer/lib/explorer/chain/polygon_edge/reader.ex
@@ -0,0 +1,141 @@
+defmodule Explorer.Chain.PolygonEdge.Reader do
+  @moduledoc "Contains read functions for Polygon Edge modules."
+
+  import Ecto.Query,
+    only: [
+      from: 2,
+      limit: 2
+    ]
+
+  import Explorer.Chain, only: [default_paging_options: 0, select_repo: 1]
+
+  alias Explorer.{PagingOptions, Repo}
+  alias Explorer.Chain.PolygonEdge.{Deposit, DepositExecute, Withdrawal, WithdrawalExit}
+  alias Explorer.Chain.{Block, Hash}
+
+  @spec deposits(list()) :: list()
+  def deposits(options \\ []) do
+    paging_options = Keyword.get(options, :paging_options, default_paging_options())
+
+    base_query =
+      from(
+        de in DepositExecute,
+        inner_join: d in Deposit,
+        on: d.msg_id == de.msg_id and not is_nil(d.l1_timestamp),
+        select: %{
+          msg_id: de.msg_id,
+          from: d.from,
+          to: d.to,
+          l1_transaction_hash: d.l1_transaction_hash,
+          l1_timestamp: d.l1_timestamp,
+          success: de.success,
+          l2_transaction_hash: de.l2_transaction_hash
+        },
+        order_by: [desc: de.msg_id]
+      )
+
+    base_query
+    |> page_deposits_or_withdrawals(paging_options)
+    |> limit(^paging_options.page_size)
+    |> select_repo(options).all()
+  end
+
+  @spec deposits_count(list()) :: term() | nil
+  def deposits_count(options \\ []) do
+    query =
+      from(
+        de in DepositExecute,
+        inner_join: d in Deposit,
+        on: d.msg_id == de.msg_id and not is_nil(d.l1_timestamp)
+      )
+
+    select_repo(options).aggregate(query, :count, timeout: :infinity)
+  end
+
+  @spec withdrawals(list()) :: list()
+  def withdrawals(options \\ []) do
+    paging_options = Keyword.get(options, :paging_options, default_paging_options())
+
+    base_query =
+      from(
+        w in Withdrawal,
+        left_join: we in WithdrawalExit,
+        on: we.msg_id == w.msg_id,
+        left_join: b in Block,
+        on: b.number == w.l2_block_number and b.consensus == true,
+        select: %{
+          msg_id: w.msg_id,
+          from: w.from,
+          to: w.to,
+          l2_transaction_hash: w.l2_transaction_hash,
+          l2_timestamp: b.timestamp,
+          success: we.success,
+          l1_transaction_hash: we.l1_transaction_hash
+        },
+        where: not is_nil(w.from),
+        order_by: [desc: w.msg_id]
+      )
+
+    base_query
+    |> page_deposits_or_withdrawals(paging_options)
+    |> limit(^paging_options.page_size)
+    |> select_repo(options).all()
+  end
+
+  @spec withdrawals_count(list()) :: term() | nil
+  def withdrawals_count(options \\ []) do
+    query =
+      from(
+        w in Withdrawal,
+        where: not is_nil(w.from)
+      )
+
+    select_repo(options).aggregate(query, :count, timeout: :infinity)
+  end
+
+  @spec deposit_by_transaction_hash(Hash.t()) :: Ecto.Schema.t() | term() | nil
+  def deposit_by_transaction_hash(hash) do
+    query =
+      from(
+        de in DepositExecute,
+        inner_join: d in Deposit,
+        on: d.msg_id == de.msg_id and not is_nil(d.from),
+        select: %{
+          msg_id: de.msg_id,
+          from: d.from,
+          to: d.to,
+          success: de.success,
+          l1_transaction_hash: d.l1_transaction_hash
+        },
+        where: de.l2_transaction_hash == ^hash
+      )
+
+    Repo.replica().one(query)
+  end
+
+  @spec withdrawal_by_transaction_hash(Hash.t()) :: Ecto.Schema.t() | term() | nil
+  def withdrawal_by_transaction_hash(hash) do
+    query =
+      from(
+        w in Withdrawal,
+        left_join: we in WithdrawalExit,
+        on: we.msg_id == w.msg_id,
+        select: %{
+          msg_id: w.msg_id,
+          from: w.from,
+          to: w.to,
+          success: we.success,
+          l1_transaction_hash: we.l1_transaction_hash
+        },
+        where: w.l2_transaction_hash == ^hash and not is_nil(w.from)
+      )
+
+    Repo.replica().one(query)
+  end
+
+  defp page_deposits_or_withdrawals(query, %PagingOptions{key: nil}), do: query
+
+  defp page_deposits_or_withdrawals(query, %PagingOptions{key: {msg_id}}) do
+    from(item in query, where: item.msg_id < ^msg_id)
+  end
+end
diff --git a/apps/explorer/lib/explorer/chain/polygon_edge/withdrawal.ex b/apps/explorer/lib/explorer/chain/polygon_edge/withdrawal.ex
new file mode 100644
index 000000000000..9cfc109b0bcb
--- /dev/null
+++ b/apps/explorer/lib/explorer/chain/polygon_edge/withdrawal.ex
@@ -0,0 +1,58 @@
+defmodule Explorer.Chain.PolygonEdge.Withdrawal do
+  @moduledoc "Models Polygon Edge withdrawal."
+
+  use Explorer.Schema
+
+  alias Explorer.Chain.{
+    Address,
+    Block,
+    Hash,
+    Transaction
+  }
+
+  @optional_attrs ~w(from to)a
+
+  @required_attrs ~w(msg_id l2_transaction_hash l2_block_number)a
+
+  @allowed_attrs @optional_attrs ++ @required_attrs
+
+  @typedoc """
+  * `msg_id` - id of the message
+  * `from` - source address of the message
+  * `to` - target address of the message
+  * `l2_transaction_hash` - hash of the L2 transaction containing the corresponding L2StateSynced event
+  * `l2_block_number` - block number of the L2 transaction
+  """
+  @type t :: %__MODULE__{
+          msg_id: non_neg_integer(),
+          from: Hash.Address.t() | nil,
+          from_address: %Ecto.Association.NotLoaded{} | Address.t() | nil,
+          to: Hash.Address.t() | nil,
+          to_address: %Ecto.Association.NotLoaded{} | Address.t() | nil,
+          l2_transaction_hash: Hash.t(),
+          l2_transaction: %Ecto.Association.NotLoaded{} | Transaction.t(),
+          l2_block_number: Block.block_number(),
+          l2_block: %Ecto.Association.NotLoaded{} | Block.t()
+        }
+
+  @primary_key false
+  schema "polygon_edge_withdrawals" do
+    field(:msg_id, :integer, primary_key: true)
+
+    belongs_to(:from_address, Address, foreign_key: :from, references: :hash, type: Hash.Address)
+    belongs_to(:to_address, Address, foreign_key: :to, references: :hash, type: Hash.Address)
+    belongs_to(:l2_transaction, Transaction, foreign_key: :l2_transaction_hash, references: :hash, type: Hash.Full)
+    belongs_to(:l2_block, Block, foreign_key: :l2_block_number, references: :number, type: :integer)
+
+    timestamps()
+  end
+
+  @spec changeset(Ecto.Schema.t(), map()) :: Ecto.Schema.t()
+  def changeset(%__MODULE__{} = module, attrs \\ %{}) do
+    module
+    |> cast(attrs, @allowed_attrs)
+    |> validate_required(@required_attrs)
+    |> unique_constraint(:msg_id)
+    |> unique_constraint(:l2_transaction_hash)
+  end
+end
diff --git a/apps/explorer/lib/explorer/chain/polygon_edge/withdrawal_exit.ex b/apps/explorer/lib/explorer/chain/polygon_edge/withdrawal_exit.ex
new file mode 100644
index 000000000000..27ee5583af66
--- /dev/null
+++ b/apps/explorer/lib/explorer/chain/polygon_edge/withdrawal_exit.ex
@@ -0,0 +1,40 @@
+defmodule Explorer.Chain.PolygonEdge.WithdrawalExit do
+  @moduledoc "Models Polygon Edge withdrawal exit."
+
+  use Explorer.Schema
+
+  alias Explorer.Chain.{Block, Hash}
+
+  @required_attrs ~w(msg_id l1_transaction_hash l1_block_number success)a
+
+  @typedoc """
+  * `msg_id` - id of the message
+  * `l1_transaction_hash` - hash of the L1 transaction containing the corresponding ExitProcessed event
+  * `l1_block_number` - block number of the L1 transaction
+  * `success` - a status of onL2StateReceive internal call (namely internal withdrawal transaction)
+  """
+  @type t :: %__MODULE__{
+          msg_id: non_neg_integer(),
+          l1_transaction_hash: Hash.t(),
+          l1_block_number: Block.block_number(),
+          success: boolean()
+        }
+
+  @primary_key false
+  schema "polygon_edge_withdrawal_exits" do
+    field(:msg_id, :integer, primary_key: true)
+    field(:l1_transaction_hash, Hash.Full)
+    field(:l1_block_number, :integer)
+    field(:success, :boolean)
+
+    timestamps()
+  end
+
+  @spec changeset(Ecto.Schema.t(), map()) :: Ecto.Schema.t()
+  def changeset(%__MODULE__{} = module, attrs \\ %{}) do
+    module
+    |> cast(attrs, @required_attrs)
+    |> validate_required(@required_attrs)
+    |> unique_constraint(:msg_id)
+  end
+end
diff --git a/apps/explorer/lib/explorer/helper.ex b/apps/explorer/lib/explorer/helper.ex
index efbcfe156172..4b1dab59a392 100644
--- a/apps/explorer/lib/explorer/helper.ex
+++ b/apps/explorer/lib/explorer/helper.ex
@@ -3,6 +3,31 @@ defmodule Explorer.Helper do
   Common explorer helper
   """
 
+  alias ABI.TypeDecoder
+  alias Explorer.Chain.Data
+
+  @spec decode_data(binary() | map(), list()) :: list() | nil
+  def decode_data("0x", types) do
+    for _ <- types, do: nil
+  end
+
+  def decode_data("0x" <> encoded_data, types) do
+    decode_data(encoded_data, types)
+  end
+
+  def decode_data(%Data{} = data, types) do
+    data
+    |> Data.to_string()
+    |> decode_data(types)
+  end
+
+  def decode_data(encoded_data, types) do
+    encoded_data
+    |> Base.decode16!(case: :mixed)
+    |> TypeDecoder.decode_raw(types)
+  end
+
+  @spec parse_integer(binary() | nil) :: integer() | nil
   def parse_integer(nil), do: nil
 
   def parse_integer(string) do
diff --git a/apps/explorer/lib/explorer/repo.ex b/apps/explorer/lib/explorer/repo.ex
index c64db8b97d21..d4029f04fa5b 100644
--- a/apps/explorer/lib/explorer/repo.ex
+++ b/apps/explorer/lib/explorer/repo.ex
@@ -178,4 +178,28 @@ defmodule Explorer.Repo do
       {:ok, Keyword.put(opts, :url, db_url)}
     end
   end
+
+  defmodule PolygonEdge do
+    use Ecto.Repo,
+      otp_app: :explorer,
+      adapter: Ecto.Adapters.Postgres
+
+    def init(_, opts) do
+      db_url = Application.get_env(:explorer, Explorer.Repo.PolygonEdge)[:url]
+      repo_conf = Application.get_env(:explorer, Explorer.Repo.PolygonEdge)
+
+      merged =
+        %{url: db_url}
+        |> ConfigHelper.get_db_config()
+        |> Keyword.merge(repo_conf, fn
+          _key, v1, nil -> v1
+          _key, nil, v2 -> v2
+          _, _, v2 -> v2
+        end)
+
+      Application.put_env(:explorer, Explorer.Repo.PolygonEdge, merged)
+
+      {:ok, Keyword.put(opts, :url, db_url)}
+    end
+  end
 end
diff --git a/apps/explorer/lib/explorer/validator/metadata_retriever.ex b/apps/explorer/lib/explorer/validator/metadata_retriever.ex
index 6978bab0e032..10794167b13c 100644
--- a/apps/explorer/lib/explorer/validator/metadata_retriever.ex
+++ b/apps/explorer/lib/explorer/validator/metadata_retriever.ex
@@ -16,16 +16,26 @@ defmodule Explorer.Validator.MetadataRetriever do
   end
 
   def fetch_validators_list do
+    validators_contract_address = config(:validators_contract_address)
+
+    validators_contract_address_checked =
+      if is_nil(validators_contract_address) and Mix.env() == :test do
+        "0x0000000000000000000000000000000000006001"
+      else
+        validators_contract_address
+      end
+
     # b7ab4db5 = keccak256(getValidators())
-    case Reader.query_contract(
-           config(:validators_contract_address),
-           contract_abi("validators.json"),
-           %{
-             "b7ab4db5" => []
-           },
-           false
-         ) do
-      %{"b7ab4db5" => {:ok, [validators]}} -> validators
+    with false <- is_nil(validators_contract_address_checked),
+         %{"b7ab4db5" => {:ok, [validators]}} <-
+           Reader.query_contract(
+             validators_contract_address_checked,
+             contract_abi("validators.json"),
+             %{"b7ab4db5" => []},
+             false
+           ) do
+      validators
+    else
       _ -> []
     end
   end
diff --git a/apps/explorer/lib/release_tasks.ex b/apps/explorer/lib/release_tasks.ex
index 1fcdc7fca8c3..50050f379187 100644
--- a/apps/explorer/lib/release_tasks.ex
+++ b/apps/explorer/lib/release_tasks.ex
@@ -14,7 +14,21 @@ defmodule Explorer.ReleaseTasks do
     :ecto_sql
   ]
 
-  @repos Application.compile_env(:blockscout, :ecto_repos, [Explorer.Repo, Explorer.Repo.Account])
+  def repos do
+    base_repos_list = [
+      Explorer.Repo,
+      Explorer.Repo.Account
+    ]
+
+    repos_list =
+      if System.get_env("CHAIN_TYPE") == "polygon_edge" do
+        [Explorer.Repo.PolygonEdge | base_repos_list]
+      else
+        base_repos_list
+      end
+
+    Application.get_env(:blockscout, :ecto_repos, repos_list)
+  end
 
   def create_and_migrate do
     start_services()
@@ -26,7 +40,7 @@ defmodule Explorer.ReleaseTasks do
   end
 
   def create do
-    Enum.each(@repos, &create_db_for/1)
+    Enum.each(repos(), &create_db_for/1)
   end
 
   def migrate(_argv) do
@@ -56,7 +70,7 @@ defmodule Explorer.ReleaseTasks do
     IO.puts("Starting repos..")
 
     # Switch pool_size to 2 for ecto > 3.0
-    Enum.each(@repos, & &1.start_link(pool_size: 2))
+    Enum.each(repos(), & &1.start_link(pool_size: 2))
   end
 
   defp stop_services do
@@ -75,7 +89,7 @@ defmodule Explorer.ReleaseTasks do
   end
 
   defp run_migrations do
-    Enum.each(@repos, &run_migrations_for/1)
+    Enum.each(repos(), &run_migrations_for/1)
   end
 
   defp run_migrations_for(repo) do
@@ -86,7 +100,7 @@ defmodule Explorer.ReleaseTasks do
   end
 
   defp run_seeds do
-    Enum.each(@repos, &run_seeds_for/1)
+    Enum.each(repos(), &run_seeds_for/1)
   end
 
   # sobelow_skip ["RCE.CodeModule"]
diff --git a/apps/explorer/priv/polygon_edge/migrations/20230618132249_create_polygon_edge_withdrawal_tables.exs b/apps/explorer/priv/polygon_edge/migrations/20230618132249_create_polygon_edge_withdrawal_tables.exs
new file mode 100644
index 000000000000..b69751a14a2b
--- /dev/null
+++ b/apps/explorer/priv/polygon_edge/migrations/20230618132249_create_polygon_edge_withdrawal_tables.exs
@@ -0,0 +1,28 @@
+defmodule Explorer.Repo.PolygonEdge.Migrations.CreatePolygonEdgeWithdrawalTables do
+  use Ecto.Migration
+
+  def change do
+    create table(:polygon_edge_withdrawals, primary_key: false) do
+      add(:msg_id, :bigint, null: false, primary_key: true)
+      add(:from, :bytea, null: true)
+      add(:to, :bytea, null: true)
+      add(:l2_transaction_hash, :bytea, null: false)
+      add(:l2_block_number, :bigint, null: false)
+
+      timestamps(null: false, type: :utc_datetime_usec)
+    end
+
+    create table(:polygon_edge_withdrawal_exits, primary_key: false) do
+      add(:msg_id, :bigint, null: false, primary_key: true)
+      add(:l1_transaction_hash, :bytea, null: false)
+      add(:l1_block_number, :bigint, null: false)
+      add(:success, :boolean, null: false)
+
+      timestamps(null: false, type: :utc_datetime_usec)
+    end
+
+    create(unique_index(:polygon_edge_withdrawals, :l2_transaction_hash))
+    create(index(:polygon_edge_withdrawals, :l2_block_number))
+    create(index(:polygon_edge_withdrawal_exits, :l1_block_number))
+  end
+end
diff --git a/apps/explorer/priv/polygon_edge/migrations/20230707113550_create_polygon_edge_deposit_tables.exs b/apps/explorer/priv/polygon_edge/migrations/20230707113550_create_polygon_edge_deposit_tables.exs
new file mode 100644
index 000000000000..36ef8613b2e5
--- /dev/null
+++ b/apps/explorer/priv/polygon_edge/migrations/20230707113550_create_polygon_edge_deposit_tables.exs
@@ -0,0 +1,29 @@
+defmodule Explorer.Repo.PolygonEdge.Migrations.CreatePolygonEdgeDepositTables do
+  use Ecto.Migration
+
+  def change do
+    create table(:polygon_edge_deposits, primary_key: false) do
+      add(:msg_id, :bigint, null: false, primary_key: true)
+      add(:from, :bytea, null: true)
+      add(:to, :bytea, null: true)
+      add(:l1_transaction_hash, :bytea, null: false)
+      add(:l1_block_number, :bigint, null: false)
+      add(:l1_timestamp, :"timestamp without time zone", null: true)
+
+      timestamps(null: false, type: :utc_datetime_usec)
+    end
+
+    create table(:polygon_edge_deposit_executes, primary_key: false) do
+      add(:msg_id, :bigint, null: false, primary_key: true)
+      add(:l2_transaction_hash, :bytea, null: false)
+      add(:l2_block_number, :bigint, null: false)
+      add(:success, :boolean, null: false)
+
+      timestamps(null: false, type: :utc_datetime_usec)
+    end
+
+    create(unique_index(:polygon_edge_deposit_executes, :l2_transaction_hash))
+    create(index(:polygon_edge_deposits, :l1_block_number))
+    create(index(:polygon_edge_deposit_executes, :l2_block_number))
+  end
+end
diff --git a/apps/explorer/priv/repo/migrations/20230731130103_modify_collated_gas_price_constraint.exs b/apps/explorer/priv/repo/migrations/20230731130103_modify_collated_gas_price_constraint.exs
new file mode 100644
index 000000000000..559799e0dee2
--- /dev/null
+++ b/apps/explorer/priv/repo/migrations/20230731130103_modify_collated_gas_price_constraint.exs
@@ -0,0 +1,15 @@
+defmodule Explorer.Repo.Migrations.ModifyCollatedGasPriceConstraint do
+  use Ecto.Migration
+
+  def change do
+    execute("ALTER TABLE transactions DROP CONSTRAINT collated_gas_price")
+
+    create(
+      constraint(
+        :transactions,
+        :collated_gas_price,
+        check: "block_hash IS NULL OR gas_price IS NOT NULL OR max_fee_per_gas IS NOT NULL"
+      )
+    )
+  end
+end
diff --git a/apps/explorer/test/support/data_case.ex b/apps/explorer/test/support/data_case.ex
index da18760983cc..9ee9bb4893d6 100644
--- a/apps/explorer/test/support/data_case.ex
+++ b/apps/explorer/test/support/data_case.ex
@@ -35,10 +35,12 @@ defmodule Explorer.DataCase do
 
     :ok = Ecto.Adapters.SQL.Sandbox.checkout(Explorer.Repo)
     :ok = Ecto.Adapters.SQL.Sandbox.checkout(Explorer.Repo.Account)
+    :ok = Ecto.Adapters.SQL.Sandbox.checkout(Explorer.Repo.PolygonEdge)
 
     unless tags[:async] do
       Ecto.Adapters.SQL.Sandbox.mode(Explorer.Repo, {:shared, self()})
       Ecto.Adapters.SQL.Sandbox.mode(Explorer.Repo.Account, {:shared, self()})
+      Ecto.Adapters.SQL.Sandbox.mode(Explorer.Repo.PolygonEdge, {:shared, self()})
     end
 
     Supervisor.terminate_child(Explorer.Supervisor, Explorer.Chain.Cache.BlockNumber.child_id())
diff --git a/apps/explorer/test/test_helper.exs b/apps/explorer/test/test_helper.exs
index 5f07fdcc59e0..75155d62bad8 100644
--- a/apps/explorer/test/test_helper.exs
+++ b/apps/explorer/test/test_helper.exs
@@ -13,6 +13,7 @@ ExUnit.start()
 
 Ecto.Adapters.SQL.Sandbox.mode(Explorer.Repo, :auto)
 Ecto.Adapters.SQL.Sandbox.mode(Explorer.Repo.Account, :auto)
+Ecto.Adapters.SQL.Sandbox.mode(Explorer.Repo.PolygonEdge, :auto)
 
 Mox.defmock(Explorer.ExchangeRates.Source.TestSource, for: Explorer.ExchangeRates.Source)
 Mox.defmock(Explorer.Market.History.Source.Price.TestSource, for: Explorer.Market.History.Source.Price)
diff --git a/apps/indexer/lib/indexer/block/fetcher.ex b/apps/indexer/lib/indexer/block/fetcher.ex
index cffd739843bf..4b0cf3aaa00b 100644
--- a/apps/indexer/lib/indexer/block/fetcher.ex
+++ b/apps/indexer/lib/indexer/block/fetcher.ex
@@ -41,6 +41,8 @@ defmodule Indexer.Block.Fetcher do
     TransactionActions
   }
 
+  alias Indexer.Transform.PolygonEdge.{DepositExecutes, Withdrawals}
+
   alias Indexer.Transform.Blocks, as: TransformBlocks
 
   @type address_hash_to_fetched_balance_block_number :: %{String.t() => Block.block_number()}
@@ -141,6 +143,13 @@ defmodule Indexer.Block.Fetcher do
          %{token_transfers: token_transfers, tokens: tokens} = TokenTransfers.parse(logs),
          %{transaction_actions: transaction_actions} = TransactionActions.parse(logs),
          %{mint_transfers: mint_transfers} = MintTransfers.parse(logs),
+         polygon_edge_withdrawals =
+           if(callback_module == Indexer.Block.Realtime.Fetcher, do: Withdrawals.parse(logs), else: []),
+         polygon_edge_deposit_executes =
+           if(callback_module == Indexer.Block.Realtime.Fetcher,
+             do: DepositExecutes.parse(logs),
+             else: []
+           ),
          %FetchedBeneficiaries{params_set: beneficiary_params_set, errors: beneficiaries_errors} =
            fetch_beneficiaries(blocks, transactions_with_receipts, json_rpc_named_arguments),
          addresses =
@@ -174,26 +183,35 @@ defmodule Indexer.Block.Fetcher do
          address_token_balances = AddressTokenBalances.params_set(%{token_transfers_params: token_transfers}),
          transaction_actions =
            Enum.map(transaction_actions, fn action -> Map.put(action, :data, Map.delete(action.data, :block_number)) end),
+         basic_import_options = %{
+           addresses: %{params: addresses},
+           address_coin_balances: %{params: coin_balances_params_set},
+           address_coin_balances_daily: %{params: coin_balances_params_daily_set},
+           address_token_balances: %{params: address_token_balances},
+           address_current_token_balances: %{
+             params: address_token_balances |> MapSet.to_list() |> TokenBalances.to_address_current_token_balances()
+           },
+           blocks: %{params: blocks},
+           block_second_degree_relations: %{params: block_second_degree_relations_params},
+           block_rewards: %{errors: beneficiaries_errors, params: beneficiaries_with_gas_payment},
+           logs: %{params: logs},
+           token_transfers: %{params: token_transfers},
+           tokens: %{on_conflict: :nothing, params: tokens},
+           transactions: %{params: transactions_with_receipts},
+           withdrawals: %{params: withdrawals_params}
+         },
+         import_options =
+           (if Application.get_env(:explorer, :chain_type) == "polygon_edge" do
+              basic_import_options
+              |> Map.put_new(:polygon_edge_withdrawals, %{params: polygon_edge_withdrawals})
+              |> Map.put_new(:polygon_edge_deposit_executes, %{params: polygon_edge_deposit_executes})
+            else
+              basic_import_options
+            end),
          {:ok, inserted} <-
            __MODULE__.import(
              state,
-             %{
-               addresses: %{params: addresses},
-               address_coin_balances: %{params: coin_balances_params_set},
-               address_coin_balances_daily: %{params: coin_balances_params_daily_set},
-               address_token_balances: %{params: address_token_balances},
-               address_current_token_balances: %{
-                 params: address_token_balances |> MapSet.to_list() |> TokenBalances.to_address_current_token_balances()
-               },
-               blocks: %{params: blocks},
-               block_second_degree_relations: %{params: block_second_degree_relations_params},
-               block_rewards: %{errors: beneficiaries_errors, params: beneficiaries_with_gas_payment},
-               logs: %{params: logs},
-               token_transfers: %{params: token_transfers},
-               tokens: %{on_conflict: :nothing, params: tokens},
-               transactions: %{params: transactions_with_receipts},
-               withdrawals: %{params: withdrawals_params}
-             }
+             import_options
            ),
          {:tx_actions, {:ok, inserted_tx_actions}} <-
            {:tx_actions,
diff --git a/apps/indexer/lib/indexer/block/realtime/fetcher.ex b/apps/indexer/lib/indexer/block/realtime/fetcher.ex
index 1b3a8fcb74fc..3093aa142378 100644
--- a/apps/indexer/lib/indexer/block/realtime/fetcher.ex
+++ b/apps/indexer/lib/indexer/block/realtime/fetcher.ex
@@ -34,6 +34,7 @@ defmodule Indexer.Block.Realtime.Fetcher do
   alias Indexer.{Block, Tracer}
   alias Indexer.Block.Realtime.TaskSupervisor
   alias Indexer.Fetcher.CoinBalance
+  alias Indexer.Fetcher.PolygonEdge.{DepositExecute, Withdrawal}
   alias Indexer.Prometheus
   alias Indexer.Transform.Addresses
   alias Timex.Duration
@@ -287,6 +288,9 @@ defmodule Indexer.Block.Realtime.Fetcher do
     Indexer.Logger.metadata(
       fn ->
         if reorg? do
+          # we need to remove all rows from `polygon_edge_withdrawals` and `polygon_edge_deposit_executes` tables previously written starting from reorg block number
+          remove_polygon_edge_assets_by_number(block_number_to_fetch)
+
           # give previous fetch attempt (for same block number) a chance to finish
           # before fetching again, to reduce block consensus mistakes
           :timer.sleep(@reorg_delay)
@@ -299,6 +303,13 @@ defmodule Indexer.Block.Realtime.Fetcher do
     )
   end
 
+  defp remove_polygon_edge_assets_by_number(block_number_to_fetch) do
+    if Application.get_env(:explorer, :chain_type) == "polygon_edge" do
+      Withdrawal.remove(block_number_to_fetch)
+      DepositExecute.remove(block_number_to_fetch)
+    end
+  end
+
   @decorate span(tracer: Tracer)
   defp do_fetch_and_import_block(block_number_to_fetch, block_fetcher, retry) do
     time_before = Timex.now()
diff --git a/apps/indexer/lib/indexer/fetcher/polygon_edge.ex b/apps/indexer/lib/indexer/fetcher/polygon_edge.ex
new file mode 100644
index 000000000000..9365bd58609f
--- /dev/null
+++ b/apps/indexer/lib/indexer/fetcher/polygon_edge.ex
@@ -0,0 +1,837 @@
+defmodule Indexer.Fetcher.PolygonEdge do
+  @moduledoc """
+  Contains common functions for PolygonEdge.* fetchers.
+  """
+
+  use GenServer
+  use Indexer.Fetcher
+
+  require Logger
+
+  import Ecto.Query
+
+  import EthereumJSONRPC,
+    only: [fetch_block_number_by_tag: 2, json_rpc: 2, integer_to_quantity: 1, quantity_to_integer: 1, request: 1]
+
+  import Explorer.Helper, only: [parse_integer: 1]
+
+  alias EthereumJSONRPC.Block.ByNumber
+  alias Explorer.Chain.Events.Publisher
+  alias Explorer.{Chain, Repo}
+  alias Indexer.{BoundQueue, Helper}
+  alias Indexer.Fetcher.PolygonEdge.{Deposit, DepositExecute, Withdrawal, WithdrawalExit}
+
+  @fetcher_name :polygon_edge
+  @block_check_interval_range_size 100
+
+  def child_spec(start_link_arguments) do
+    spec = %{
+      id: __MODULE__,
+      start: {__MODULE__, :start_link, start_link_arguments},
+      restart: :transient,
+      type: :worker
+    }
+
+    Supervisor.child_spec(spec, [])
+  end
+
+  def start_link(args, gen_server_options \\ []) do
+    GenServer.start_link(__MODULE__, args, Keyword.put_new(gen_server_options, :name, __MODULE__))
+  end
+
+  @impl GenServer
+  def init(_args) do
+    Logger.metadata(fetcher: @fetcher_name)
+
+    modules_using_reorg_monitor = [Deposit, WithdrawalExit]
+
+    reorg_monitor_not_needed =
+      modules_using_reorg_monitor
+      |> Enum.all?(fn module ->
+        is_nil(Application.get_all_env(:indexer)[module][:start_block_l1])
+      end)
+
+    if reorg_monitor_not_needed do
+      :ignore
+    else
+      polygon_edge_l1_rpc = Application.get_all_env(:indexer)[Indexer.Fetcher.PolygonEdge][:polygon_edge_l1_rpc]
+
+      json_rpc_named_arguments = json_rpc_named_arguments(polygon_edge_l1_rpc)
+
+      {:ok, block_check_interval, _} = get_block_check_interval(json_rpc_named_arguments)
+
+      Process.send(self(), :reorg_monitor, [])
+
+      {:ok,
+       %{block_check_interval: block_check_interval, json_rpc_named_arguments: json_rpc_named_arguments, prev_latest: 0}}
+    end
+  end
+
+  @spec init_l1(
+          Explorer.Chain.PolygonEdge.Deposit | Explorer.Chain.PolygonEdge.WithdrawalExit,
+          list(),
+          pid(),
+          binary(),
+          binary(),
+          binary(),
+          binary()
+        ) :: {:ok, map()} | :ignore
+  def init_l1(table, env, pid, contract_address, contract_name, table_name, entity_name)
+      when table in [Explorer.Chain.PolygonEdge.Deposit, Explorer.Chain.PolygonEdge.WithdrawalExit] do
+    with {:start_block_l1_undefined, false} <- {:start_block_l1_undefined, is_nil(env[:start_block_l1])},
+         {:reorg_monitor_started, true} <-
+           {:reorg_monitor_started, !is_nil(Process.whereis(Indexer.Fetcher.PolygonEdge))},
+         polygon_edge_l1_rpc = Application.get_all_env(:indexer)[Indexer.Fetcher.PolygonEdge][:polygon_edge_l1_rpc],
+         {:rpc_l1_undefined, false} <- {:rpc_l1_undefined, is_nil(polygon_edge_l1_rpc)},
+         {:contract_is_valid, true} <- {:contract_is_valid, Helper.is_address_correct?(contract_address)},
+         start_block_l1 = parse_integer(env[:start_block_l1]),
+         false <- is_nil(start_block_l1),
+         true <- start_block_l1 > 0,
+         {last_l1_block_number, last_l1_transaction_hash} <- get_last_l1_item(table),
+         {:start_block_l1_valid, true} <-
+           {:start_block_l1_valid, start_block_l1 <= last_l1_block_number || last_l1_block_number == 0},
+         json_rpc_named_arguments = json_rpc_named_arguments(polygon_edge_l1_rpc),
+         {:ok, last_l1_tx} <-
+           get_transaction_by_hash(last_l1_transaction_hash, json_rpc_named_arguments, 100_000_000),
+         {:l1_tx_not_found, false} <- {:l1_tx_not_found, !is_nil(last_l1_transaction_hash) && is_nil(last_l1_tx)},
+         {:ok, block_check_interval, last_safe_block} <-
+           get_block_check_interval(json_rpc_named_arguments) do
+      start_block = max(start_block_l1, last_l1_block_number)
+
+      Process.send(pid, :continue, [])
+
+      {:ok,
+       %{
+         contract_address: contract_address,
+         block_check_interval: block_check_interval,
+         start_block: start_block,
+         end_block: last_safe_block,
+         json_rpc_named_arguments: json_rpc_named_arguments
+       }}
+    else
+      {:start_block_l1_undefined, true} ->
+        # the process shouldn't start if the start block is not defined
+        :ignore
+
+      {:reorg_monitor_started, false} ->
+        Logger.error("Cannot start this process as reorg monitor in Indexer.Fetcher.PolygonEdge is not started.")
+        :ignore
+
+      {:rpc_l1_undefined, true} ->
+        Logger.error("L1 RPC URL is not defined.")
+        :ignore
+
+      {:contract_is_valid, false} ->
+        Logger.error("#{contract_name} contract address is invalid or not defined.")
+        :ignore
+
+      {:start_block_l1_valid, false} ->
+        Logger.error("Invalid L1 Start Block value. Please, check the value and #{table_name} table.")
+
+        :ignore
+
+      {:error, error_data} ->
+        Logger.error(
+          "Cannot get last L1 transaction from RPC by its hash, last safe block, or block timestamp by its number due to RPC error: #{inspect(error_data)}"
+        )
+
+        :ignore
+
+      {:l1_tx_not_found, true} ->
+        Logger.error(
+          "Cannot find last L1 transaction from RPC by its hash. Probably, there was a reorg on L1 chain. Please, check #{table_name} table."
+        )
+
+        :ignore
+
+      _ ->
+        Logger.error("#{entity_name} L1 Start Block is invalid or zero.")
+        :ignore
+    end
+  end
+
+  @spec init_l2(
+          Explorer.Chain.PolygonEdge.DepositExecute | Explorer.Chain.PolygonEdge.Withdrawal,
+          list(),
+          pid(),
+          binary(),
+          binary(),
+          binary(),
+          binary(),
+          list()
+        ) :: {:ok, map()} | :ignore
+  def init_l2(table, env, pid, contract_address, contract_name, table_name, entity_name, json_rpc_named_arguments)
+      when table in [Explorer.Chain.PolygonEdge.DepositExecute, Explorer.Chain.PolygonEdge.Withdrawal] do
+    with {:start_block_l2_undefined, false} <- {:start_block_l2_undefined, is_nil(env[:start_block_l2])},
+         {:contract_address_valid, true} <- {:contract_address_valid, Helper.is_address_correct?(contract_address)},
+         start_block_l2 = parse_integer(env[:start_block_l2]),
+         false <- is_nil(start_block_l2),
+         true <- start_block_l2 > 0,
+         {last_l2_block_number, last_l2_transaction_hash} <- get_last_l2_item(table),
+         {safe_block, safe_block_is_latest} = get_safe_block(json_rpc_named_arguments),
+         {:start_block_l2_valid, true} <-
+           {:start_block_l2_valid,
+            (start_block_l2 <= last_l2_block_number || last_l2_block_number == 0) && start_block_l2 <= safe_block},
+         {:ok, last_l2_tx} <- get_transaction_by_hash(last_l2_transaction_hash, json_rpc_named_arguments, 100_000_000),
+         {:l2_tx_not_found, false} <- {:l2_tx_not_found, !is_nil(last_l2_transaction_hash) && is_nil(last_l2_tx)} do
+      Process.send(pid, :continue, [])
+
+      {:ok,
+       %{
+         start_block: max(start_block_l2, last_l2_block_number),
+         start_block_l2: start_block_l2,
+         safe_block: safe_block,
+         safe_block_is_latest: safe_block_is_latest,
+         contract_address: contract_address,
+         json_rpc_named_arguments: json_rpc_named_arguments
+       }}
+    else
+      {:start_block_l2_undefined, true} ->
+        # the process shouldn't start if the start block is not defined
+        :ignore
+
+      {:contract_address_valid, false} ->
+        Logger.error("#{contract_name} contract address is invalid or not defined.")
+        :ignore
+
+      {:start_block_l2_valid, false} ->
+        Logger.error("Invalid L2 Start Block value. Please, check the value and #{table_name} table.")
+
+        :ignore
+
+      {:error, error_data} ->
+        Logger.error("Cannot get last L2 transaction from RPC by its hash due to RPC error: #{inspect(error_data)}")
+
+        :ignore
+
+      {:l2_tx_not_found, true} ->
+        Logger.error(
+          "Cannot find last L2 transaction from RPC by its hash. Probably, there was a reorg on L2 chain. Please, check #{table_name} table."
+        )
+
+        :ignore
+
+      _ ->
+        Logger.error("#{entity_name} L2 Start Block is invalid or zero.")
+        :ignore
+    end
+  end
+
+  @impl GenServer
+  def handle_info(
+        :reorg_monitor,
+        %{
+          block_check_interval: block_check_interval,
+          json_rpc_named_arguments: json_rpc_named_arguments,
+          prev_latest: prev_latest
+        } = state
+      ) do
+    {:ok, latest} = get_block_number_by_tag("latest", json_rpc_named_arguments, 100_000_000)
+
+    if latest < prev_latest do
+      Logger.warning("Reorg detected: previous latest block ##{prev_latest}, current latest block ##{latest}.")
+
+      Publisher.broadcast([{:polygon_edge_reorg_block, latest}], :realtime)
+    end
+
+    Process.send_after(self(), :reorg_monitor, block_check_interval)
+
+    {:noreply, %{state | prev_latest: latest}}
+  end
+
+  @spec handle_continue(map(), binary(), Deposit | WithdrawalExit, atom()) :: {:noreply, map()}
+  def handle_continue(
+        %{
+          contract_address: contract_address,
+          block_check_interval: block_check_interval,
+          start_block: start_block,
+          end_block: end_block,
+          json_rpc_named_arguments: json_rpc_named_arguments
+        } = state,
+        event_signature,
+        calling_module,
+        fetcher_name
+      )
+      when calling_module in [Deposit, WithdrawalExit] do
+    time_before = Timex.now()
+
+    eth_get_logs_range_size =
+      Application.get_all_env(:indexer)[Indexer.Fetcher.PolygonEdge][:polygon_edge_eth_get_logs_range_size]
+
+    chunks_number = ceil((end_block - start_block + 1) / eth_get_logs_range_size)
+    chunk_range = Range.new(0, max(chunks_number - 1, 0), 1)
+
+    last_written_block =
+      chunk_range
+      |> Enum.reduce_while(start_block - 1, fn current_chunk, _ ->
+        chunk_start = start_block + eth_get_logs_range_size * current_chunk
+        chunk_end = min(chunk_start + eth_get_logs_range_size - 1, end_block)
+
+        if chunk_end >= chunk_start do
+          log_blocks_chunk_handling(chunk_start, chunk_end, start_block, end_block, nil, "L1")
+
+          {:ok, result} =
+            get_logs(
+              chunk_start,
+              chunk_end,
+              contract_address,
+              event_signature,
+              json_rpc_named_arguments,
+              100_000_000
+            )
+
+          {events, event_name} =
+            result
+            |> calling_module.prepare_events(json_rpc_named_arguments)
+            |> import_events(calling_module)
+
+          log_blocks_chunk_handling(
+            chunk_start,
+            chunk_end,
+            start_block,
+            end_block,
+            "#{Enum.count(events)} #{event_name} event(s)",
+            "L1"
+          )
+        end
+
+        reorg_block = reorg_block_pop(fetcher_name)
+
+        if !is_nil(reorg_block) && reorg_block > 0 do
+          reorg_handle(reorg_block, calling_module)
+          {:halt, if(reorg_block <= chunk_end, do: reorg_block - 1, else: chunk_end)}
+        else
+          {:cont, chunk_end}
+        end
+      end)
+
+    new_start_block = last_written_block + 1
+    {:ok, new_end_block} = get_block_number_by_tag("latest", json_rpc_named_arguments, 100_000_000)
+
+    delay =
+      if new_end_block == last_written_block do
+        # there is no new block, so wait for some time to let the chain issue the new block
+        max(block_check_interval - Timex.diff(Timex.now(), time_before, :milliseconds), 0)
+      else
+        0
+      end
+
+    Process.send_after(self(), :continue, delay)
+
+    {:noreply, %{state | start_block: new_start_block, end_block: new_end_block}}
+  end
+
+  @spec fill_block_range(integer(), integer(), DepositExecute | Withdrawal, binary(), list(), boolean()) :: integer()
+  def fill_block_range(
+        l2_block_start,
+        l2_block_end,
+        calling_module,
+        contract_address,
+        json_rpc_named_arguments,
+        scan_db
+      )
+      when calling_module in [
+             DepositExecute,
+             Withdrawal
+           ] do
+    eth_get_logs_range_size =
+      Application.get_all_env(:indexer)[Indexer.Fetcher.PolygonEdge][:polygon_edge_eth_get_logs_range_size]
+
+    chunks_number =
+      if scan_db do
+        1
+      else
+        ceil((l2_block_end - l2_block_start + 1) / eth_get_logs_range_size)
+      end
+
+    chunk_range = Range.new(0, max(chunks_number - 1, 0), 1)
+
+    Enum.reduce(chunk_range, 0, fn current_chunk, count_acc ->
+      chunk_start = l2_block_start + eth_get_logs_range_size * current_chunk
+
+      chunk_end =
+        if scan_db do
+          l2_block_end
+        else
+          min(chunk_start + eth_get_logs_range_size - 1, l2_block_end)
+        end
+
+      log_blocks_chunk_handling(chunk_start, chunk_end, l2_block_start, l2_block_end, nil, "L2")
+
+      count =
+        calling_module.find_and_save_entities(
+          scan_db,
+          contract_address,
+          chunk_start,
+          chunk_end,
+          json_rpc_named_arguments
+        )
+
+      event_name =
+        if calling_module == Indexer.Fetcher.PolygonEdge.DepositExecute do
+          "StateSyncResult"
+        else
+          "L2StateSynced"
+        end
+
+      log_blocks_chunk_handling(
+        chunk_start,
+        chunk_end,
+        l2_block_start,
+        l2_block_end,
+        "#{count} #{event_name} event(s)",
+        "L2"
+      )
+
+      count_acc + count
+    end)
+  end
+
+  @spec fill_block_range(integer(), integer(), {module(), module()}, binary(), list()) :: integer()
+  def fill_block_range(start_block, end_block, {module, table}, contract_address, json_rpc_named_arguments) do
+    fill_block_range(start_block, end_block, module, contract_address, json_rpc_named_arguments, true)
+
+    fill_msg_id_gaps(
+      start_block,
+      table,
+      module,
+      contract_address,
+      json_rpc_named_arguments,
+      false
+    )
+
+    {last_l2_block_number, _} = get_last_l2_item(table)
+
+    fill_block_range(
+      max(start_block, last_l2_block_number),
+      end_block,
+      module,
+      contract_address,
+      json_rpc_named_arguments,
+      false
+    )
+  end
+
+  @spec fill_msg_id_gaps(integer(), module(), module(), binary(), list(), boolean()) :: no_return()
+  def fill_msg_id_gaps(
+        start_block_l2,
+        table,
+        calling_module,
+        contract_address,
+        json_rpc_named_arguments,
+        scan_db \\ true
+      ) do
+    id_min = Repo.aggregate(table, :min, :msg_id)
+    id_max = Repo.aggregate(table, :max, :msg_id)
+
+    with true <- !is_nil(id_min) and !is_nil(id_max),
+         starts = msg_id_gap_starts(id_max, table),
+         ends = msg_id_gap_ends(id_min, table),
+         min_block_l2 = l2_block_number_by_msg_id(id_min, table),
+         {new_starts, new_ends} =
+           if(start_block_l2 < min_block_l2,
+             do: {[start_block_l2 | starts], [min_block_l2 | ends]},
+             else: {starts, ends}
+           ),
+         true <- Enum.count(new_starts) == Enum.count(new_ends) do
+      ranges = Enum.zip(new_starts, new_ends)
+
+      invalid_range_exists = Enum.any?(ranges, fn {l2_block_start, l2_block_end} -> l2_block_start > l2_block_end end)
+
+      ranges_final =
+        with {:ranges_are_invalid, true} <- {:ranges_are_invalid, invalid_range_exists},
+             {max_block_l2, _} = get_last_l2_item(table),
+             {:start_block_l2_is_min, true} <- {:start_block_l2_is_min, start_block_l2 <= max_block_l2} do
+          [{start_block_l2, max_block_l2}]
+        else
+          {:ranges_are_invalid, false} -> ranges
+          {:start_block_l2_is_min, false} -> []
+        end
+
+      ranges_final
+      |> Enum.each(fn {l2_block_start, l2_block_end} ->
+        count =
+          fill_block_range(
+            l2_block_start,
+            l2_block_end,
+            calling_module,
+            contract_address,
+            json_rpc_named_arguments,
+            scan_db
+          )
+
+        if count > 0 do
+          log_fill_msg_id_gaps(scan_db, l2_block_start, l2_block_end, table, count)
+        end
+      end)
+
+      if scan_db do
+        fill_msg_id_gaps(start_block_l2, table, calling_module, contract_address, json_rpc_named_arguments, false)
+      end
+    end
+  end
+
+  defp log_fill_msg_id_gaps(scan_db, l2_block_start, l2_block_end, table, count) do
+    find_place = if scan_db, do: "in DB", else: "through RPC"
+    table_name = table.__schema__(:source)
+
+    Logger.info(
+      "Filled gaps between L2 blocks #{l2_block_start} and #{l2_block_end}. #{count} event(s) were found #{find_place} and written to #{table_name} table."
+    )
+  end
+
+  defp msg_id_gap_starts(id_max, table)
+       when table in [Explorer.Chain.PolygonEdge.DepositExecute, Explorer.Chain.PolygonEdge.Withdrawal] do
+    query =
+      if table == Explorer.Chain.PolygonEdge.DepositExecute do
+        from(item in table,
+          select: item.l2_block_number,
+          order_by: item.msg_id,
+          where:
+            fragment(
+              "NOT EXISTS (SELECT msg_id FROM polygon_edge_deposit_executes WHERE msg_id = (? + 1)) AND msg_id != ?",
+              item.msg_id,
+              ^id_max
+            )
+        )
+      else
+        from(item in table,
+          select: item.l2_block_number,
+          order_by: item.msg_id,
+          where:
+            fragment(
+              "NOT EXISTS (SELECT msg_id FROM polygon_edge_withdrawals WHERE msg_id = (? + 1)) AND msg_id != ?",
+              item.msg_id,
+              ^id_max
+            )
+        )
+      end
+
+    Repo.all(query)
+  end
+
+  defp msg_id_gap_ends(id_min, table)
+       when table in [Explorer.Chain.PolygonEdge.DepositExecute, Explorer.Chain.PolygonEdge.Withdrawal] do
+    query =
+      if table == Explorer.Chain.PolygonEdge.DepositExecute do
+        from(item in table,
+          select: item.l2_block_number,
+          order_by: item.msg_id,
+          where:
+            fragment(
+              "NOT EXISTS (SELECT msg_id FROM polygon_edge_deposit_executes WHERE msg_id = (? - 1)) AND msg_id != ?",
+              item.msg_id,
+              ^id_min
+            )
+        )
+      else
+        from(item in table,
+          select: item.l2_block_number,
+          order_by: item.msg_id,
+          where:
+            fragment(
+              "NOT EXISTS (SELECT msg_id FROM polygon_edge_withdrawals WHERE msg_id = (? - 1)) AND msg_id != ?",
+              item.msg_id,
+              ^id_min
+            )
+        )
+      end
+
+    Repo.all(query)
+  end
+
+  defp get_block_check_interval(json_rpc_named_arguments) do
+    {last_safe_block, _} = get_safe_block(json_rpc_named_arguments)
+
+    first_block = max(last_safe_block - @block_check_interval_range_size, 1)
+
+    with {:ok, first_block_timestamp} <-
+           get_block_timestamp_by_number(first_block, json_rpc_named_arguments, 100_000_000),
+         {:ok, last_safe_block_timestamp} <-
+           get_block_timestamp_by_number(last_safe_block, json_rpc_named_arguments, 100_000_000) do
+      block_check_interval =
+        ceil((last_safe_block_timestamp - first_block_timestamp) / (last_safe_block - first_block) * 1000 / 2)
+
+      Logger.info("Block check interval is calculated as #{block_check_interval} ms.")
+      {:ok, block_check_interval, last_safe_block}
+    else
+      {:error, error} ->
+        {:error, "Failed to calculate block check interval due to #{inspect(error)}"}
+    end
+  end
+
+  @spec get_block_number_by_tag(binary(), list(), integer()) :: {:ok, non_neg_integer()} | {:error, atom()}
+  def get_block_number_by_tag(tag, json_rpc_named_arguments, retries \\ 3) do
+    error_message = &"Cannot fetch #{tag} block number. Error: #{inspect(&1)}"
+    repeated_call(&fetch_block_number_by_tag/2, [tag, json_rpc_named_arguments], error_message, retries)
+  end
+
+  defp get_block_timestamp_by_number_inner(number, json_rpc_named_arguments) do
+    result =
+      %{id: 0, number: number}
+      |> ByNumber.request(false)
+      |> json_rpc(json_rpc_named_arguments)
+
+    with {:ok, block} <- result,
+         false <- is_nil(block),
+         timestamp <- Map.get(block, "timestamp"),
+         false <- is_nil(timestamp) do
+      {:ok, quantity_to_integer(timestamp)}
+    else
+      {:error, message} ->
+        {:error, message}
+
+      true ->
+        {:error, "RPC returned nil."}
+    end
+  end
+
+  defp get_block_timestamp_by_number(number, json_rpc_named_arguments, retries) do
+    func = &get_block_timestamp_by_number_inner/2
+    args = [number, json_rpc_named_arguments]
+    error_message = &"Cannot fetch block ##{number} or its timestamp. Error: #{inspect(&1)}"
+    repeated_call(func, args, error_message, retries)
+  end
+
+  defp get_safe_block(json_rpc_named_arguments) do
+    case get_block_number_by_tag("safe", json_rpc_named_arguments) do
+      {:ok, safe_block} ->
+        {safe_block, false}
+
+      {:error, :not_found} ->
+        {:ok, latest_block} = get_block_number_by_tag("latest", json_rpc_named_arguments, 100_000_000)
+        {latest_block, true}
+    end
+  end
+
+  @spec get_logs(
+          non_neg_integer() | binary(),
+          non_neg_integer() | binary(),
+          binary(),
+          binary(),
+          list(),
+          non_neg_integer()
+        ) :: {:ok, list()} | {:error, term()}
+  def get_logs(from_block, to_block, address, topic0, json_rpc_named_arguments, retries) do
+    processed_from_block = if is_integer(from_block), do: integer_to_quantity(from_block), else: from_block
+    processed_to_block = if is_integer(to_block), do: integer_to_quantity(to_block), else: to_block
+
+    req =
+      request(%{
+        id: 0,
+        method: "eth_getLogs",
+        params: [
+          %{
+            :fromBlock => processed_from_block,
+            :toBlock => processed_to_block,
+            :address => address,
+            :topics => [topic0]
+          }
+        ]
+      })
+
+    error_message = &"Cannot fetch logs for the block range #{from_block}..#{to_block}. Error: #{inspect(&1)}"
+
+    repeated_call(&json_rpc/2, [req, json_rpc_named_arguments], error_message, retries)
+  end
+
+  defp get_transaction_by_hash(hash, _json_rpc_named_arguments, _retries_left) when is_nil(hash), do: {:ok, nil}
+
+  defp get_transaction_by_hash(hash, json_rpc_named_arguments, retries) do
+    req =
+      request(%{
+        id: 0,
+        method: "eth_getTransactionByHash",
+        params: [hash]
+      })
+
+    error_message = &"eth_getTransactionByHash failed. Error: #{inspect(&1)}"
+
+    repeated_call(&json_rpc/2, [req, json_rpc_named_arguments], error_message, retries)
+  end
+
+  defp get_last_l1_item(table) do
+    query =
+      from(item in table,
+        select: {item.l1_block_number, item.l1_transaction_hash},
+        order_by: [desc: item.msg_id],
+        limit: 1
+      )
+
+    query
+    |> Repo.one()
+    |> Kernel.||({0, nil})
+  end
+
+  @spec get_last_l2_item(module()) :: {non_neg_integer(), binary() | nil}
+  def get_last_l2_item(table) do
+    query =
+      from(item in table,
+        select: {item.l2_block_number, item.l2_transaction_hash},
+        order_by: [desc: item.msg_id],
+        limit: 1
+      )
+
+    query
+    |> Repo.one()
+    |> Kernel.||({0, nil})
+  end
+
+  defp json_rpc_named_arguments(polygon_edge_l1_rpc) do
+    [
+      transport: EthereumJSONRPC.HTTP,
+      transport_options: [
+        http: EthereumJSONRPC.HTTP.HTTPoison,
+        url: polygon_edge_l1_rpc,
+        http_options: [
+          recv_timeout: :timer.minutes(10),
+          timeout: :timer.minutes(10),
+          hackney: [pool: :ethereum_jsonrpc]
+        ]
+      ]
+    ]
+  end
+
+  defp l2_block_number_by_msg_id(id, table) do
+    Repo.one(from(item in table, select: item.l2_block_number, where: item.msg_id == ^id))
+  end
+
+  defp log_blocks_chunk_handling(chunk_start, chunk_end, start_block, end_block, items_count, layer) do
+    is_start = is_nil(items_count)
+
+    {type, found} =
+      if is_start do
+        {"Start", ""}
+      else
+        {"Finish", " Found #{items_count}."}
+      end
+
+    target_range =
+      if chunk_start != start_block or chunk_end != end_block do
+        progress =
+          if is_start do
+            ""
+          else
+            percentage =
+              (chunk_end - start_block + 1)
+              |> Decimal.div(end_block - start_block + 1)
+              |> Decimal.mult(100)
+              |> Decimal.round(2)
+              |> Decimal.to_string()
+
+            " Progress: #{percentage}%"
+          end
+
+        " Target range: #{start_block}..#{end_block}.#{progress}"
+      else
+        ""
+      end
+
+    if chunk_start == chunk_end do
+      Logger.info("#{type} handling #{layer} block ##{chunk_start}.#{found}#{target_range}")
+    else
+      Logger.info("#{type} handling #{layer} block range #{chunk_start}..#{chunk_end}.#{found}#{target_range}")
+    end
+  end
+
+  defp import_events(events, calling_module) do
+    {import_data, event_name} =
+      if calling_module == Deposit do
+        {%{polygon_edge_deposits: %{params: events}, timeout: :infinity}, "StateSynced"}
+      else
+        {%{polygon_edge_withdrawal_exits: %{params: events}, timeout: :infinity}, "ExitProcessed"}
+      end
+
+    {:ok, _} = Chain.import(import_data)
+
+    {events, event_name}
+  end
+
+  defp log_deleted_rows_count(reorg_block, count, table_name) do
+    if count > 0 do
+      Logger.warning(
+        "As L1 reorg was detected, all rows with l1_block_number >= #{reorg_block} were removed from the #{table_name} table. Number of removed rows: #{count}."
+      )
+    end
+  end
+
+  defp repeated_call(func, args, error_message, retries_left) do
+    case apply(func, args) do
+      {:ok, _} = res ->
+        res
+
+      {:error, message} = err ->
+        retries_left = retries_left - 1
+
+        if retries_left <= 0 do
+          Logger.error(error_message.(message))
+          err
+        else
+          Logger.error("#{error_message.(message)} Retrying...")
+          :timer.sleep(3000)
+          repeated_call(func, args, error_message, retries_left)
+        end
+    end
+  end
+
+  @spec repeated_request(list(), any(), list(), non_neg_integer()) :: {:ok, any()} | {:error, atom()}
+  def repeated_request(req, error_message, json_rpc_named_arguments, retries) do
+    repeated_call(&json_rpc/2, [req, json_rpc_named_arguments], error_message, retries)
+  end
+
+  defp reorg_block_pop(fetcher_name) do
+    table_name = reorg_table_name(fetcher_name)
+
+    case BoundQueue.pop_front(reorg_queue_get(table_name)) do
+      {:ok, {block_number, updated_queue}} ->
+        :ets.insert(table_name, {:queue, updated_queue})
+        block_number
+
+      {:error, :empty} ->
+        nil
+    end
+  end
+
+  @spec reorg_block_push(atom(), non_neg_integer()) :: no_return()
+  def reorg_block_push(fetcher_name, block_number) do
+    table_name = reorg_table_name(fetcher_name)
+    {:ok, updated_queue} = BoundQueue.push_back(reorg_queue_get(table_name), block_number)
+    :ets.insert(table_name, {:queue, updated_queue})
+  end
+
+  defp reorg_handle(reorg_block, calling_module) do
+    {table, table_name} =
+      if calling_module == Deposit do
+        {Explorer.Chain.PolygonEdge.Deposit, "polygon_edge_deposits"}
+      else
+        {Explorer.Chain.PolygonEdge.WithdrawalExit, "polygon_edge_withdrawal_exits"}
+      end
+
+    {deleted_count, _} = Repo.delete_all(from(item in table, where: item.l1_block_number >= ^reorg_block))
+
+    log_deleted_rows_count(reorg_block, deleted_count, table_name)
+  end
+
+  defp reorg_queue_get(table_name) do
+    if :ets.whereis(table_name) == :undefined do
+      :ets.new(table_name, [
+        :set,
+        :named_table,
+        :public,
+        read_concurrency: true,
+        write_concurrency: true
+      ])
+    end
+
+    with info when info != :undefined <- :ets.info(table_name),
+         [{_, value}] <- :ets.lookup(table_name, :queue) do
+      value
+    else
+      _ -> %BoundQueue{}
+    end
+  end
+
+  defp reorg_table_name(fetcher_name) do
+    :"#{fetcher_name}#{:_reorgs}"
+  end
+end
diff --git a/apps/indexer/lib/indexer/fetcher/polygon_edge/deposit.ex b/apps/indexer/lib/indexer/fetcher/polygon_edge/deposit.ex
new file mode 100644
index 000000000000..ca11c30e08c8
--- /dev/null
+++ b/apps/indexer/lib/indexer/fetcher/polygon_edge/deposit.ex
@@ -0,0 +1,140 @@
+defmodule Indexer.Fetcher.PolygonEdge.Deposit do
+  @moduledoc """
+  Fills polygon_edge_deposits DB table.
+  """
+
+  use GenServer
+  use Indexer.Fetcher
+
+  require Logger
+
+  import EthereumJSONRPC, only: [quantity_to_integer: 1]
+  import Explorer.Helper, only: [decode_data: 2]
+
+  alias ABI.TypeDecoder
+  alias EthereumJSONRPC.Block.ByNumber
+  alias EthereumJSONRPC.Blocks
+  alias Explorer.Chain.Events.Subscriber
+  alias Explorer.Chain.PolygonEdge.Deposit
+  alias Indexer.Fetcher.PolygonEdge
+
+  @fetcher_name :polygon_edge_deposit
+
+  # 32-byte signature of the event StateSynced(uint256 indexed id, address indexed sender, address indexed receiver, bytes data)
+  @state_synced_event "0xd1d7f6609674cc5871fdb4b0bcd4f0a214118411de9e38983866514f22659165"
+
+  # 32-byte representation of deposit signature, keccak256("DEPOSIT")
+  @deposit_signature "87a7811f4bfedea3d341ad165680ae306b01aaeacc205d227629cf157dd9f821"
+
+  def child_spec(start_link_arguments) do
+    spec = %{
+      id: __MODULE__,
+      start: {__MODULE__, :start_link, start_link_arguments},
+      restart: :transient,
+      type: :worker
+    }
+
+    Supervisor.child_spec(spec, [])
+  end
+
+  def start_link(args, gen_server_options \\ []) do
+    GenServer.start_link(__MODULE__, args, Keyword.put_new(gen_server_options, :name, __MODULE__))
+  end
+
+  @impl GenServer
+  def init(_args) do
+    Logger.metadata(fetcher: @fetcher_name)
+
+    env = Application.get_all_env(:indexer)[__MODULE__]
+
+    Subscriber.to(:polygon_edge_reorg_block, :realtime)
+
+    PolygonEdge.init_l1(
+      Deposit,
+      env,
+      self(),
+      env[:state_sender],
+      "State Sender",
+      "polygon_edge_deposits",
+      "Deposits"
+    )
+  end
+
+  @impl GenServer
+  def handle_info(:continue, state) do
+    PolygonEdge.handle_continue(state, @state_synced_event, __MODULE__, @fetcher_name)
+  end
+
+  @impl GenServer
+  def handle_info({:chain_event, :polygon_edge_reorg_block, :realtime, block_number}, state) do
+    PolygonEdge.reorg_block_push(@fetcher_name, block_number)
+    {:noreply, state}
+  end
+
+  @impl GenServer
+  def handle_info({ref, _result}, state) do
+    Process.demonitor(ref, [:flush])
+    {:noreply, state}
+  end
+
+  @spec prepare_events(list(), list()) :: list()
+  def prepare_events(events, json_rpc_named_arguments) do
+    Enum.map(events, fn event ->
+      [data_bytes] = decode_data(event["data"], [:bytes])
+
+      sig = binary_part(data_bytes, 0, 32)
+
+      l1_block_number = quantity_to_integer(event["blockNumber"])
+
+      {from, to, l1_timestamp} =
+        if Base.encode16(sig, case: :lower) == @deposit_signature do
+          timestamps = get_timestamps_by_events(events, json_rpc_named_arguments)
+
+          [_sig, _root_token, sender, receiver, _amount] =
+            TypeDecoder.decode_raw(data_bytes, [{:bytes, 32}, :address, :address, :address, {:uint, 256}])
+
+          {sender, receiver, Map.get(timestamps, l1_block_number)}
+        else
+          {nil, nil, nil}
+        end
+
+      %{
+        msg_id: quantity_to_integer(Enum.at(event["topics"], 1)),
+        from: from,
+        to: to,
+        l1_transaction_hash: event["transactionHash"],
+        l1_timestamp: l1_timestamp,
+        l1_block_number: l1_block_number
+      }
+    end)
+  end
+
+  defp get_blocks_by_events(events, json_rpc_named_arguments, retries) do
+    request =
+      events
+      |> Enum.reduce(%{}, fn event, acc ->
+        Map.put(acc, event["blockNumber"], 0)
+      end)
+      |> Stream.map(fn {block_number, _} -> %{number: block_number} end)
+      |> Stream.with_index()
+      |> Enum.into(%{}, fn {params, id} -> {id, params} end)
+      |> Blocks.requests(&ByNumber.request(&1, false, false))
+
+    error_message = &"Cannot fetch blocks with batch request. Error: #{inspect(&1)}. Request: #{inspect(request)}"
+
+    case PolygonEdge.repeated_request(request, error_message, json_rpc_named_arguments, retries) do
+      {:ok, results} -> Enum.map(results, fn %{result: result} -> result end)
+      {:error, _} -> []
+    end
+  end
+
+  defp get_timestamps_by_events(events, json_rpc_named_arguments) do
+    events
+    |> get_blocks_by_events(json_rpc_named_arguments, 100_000_000)
+    |> Enum.reduce(%{}, fn block, acc ->
+      block_number = quantity_to_integer(Map.get(block, "number"))
+      {:ok, timestamp} = DateTime.from_unix(quantity_to_integer(Map.get(block, "timestamp")))
+      Map.put(acc, block_number, timestamp)
+    end)
+  end
+end
diff --git a/apps/indexer/lib/indexer/fetcher/polygon_edge/deposit_execute.ex b/apps/indexer/lib/indexer/fetcher/polygon_edge/deposit_execute.ex
new file mode 100644
index 000000000000..4e2dd57d09eb
--- /dev/null
+++ b/apps/indexer/lib/indexer/fetcher/polygon_edge/deposit_execute.ex
@@ -0,0 +1,196 @@
+defmodule Indexer.Fetcher.PolygonEdge.DepositExecute do
+  @moduledoc """
+  Fills polygon_edge_deposit_executes DB table.
+  """
+
+  use GenServer
+  use Indexer.Fetcher
+
+  require Logger
+
+  import Ecto.Query
+
+  import EthereumJSONRPC, only: [quantity_to_integer: 1]
+  import Indexer.Fetcher.PolygonEdge, only: [fill_block_range: 5, get_block_number_by_tag: 3]
+
+  alias Explorer.{Chain, Repo}
+  alias Explorer.Chain.Log
+  alias Explorer.Chain.PolygonEdge.DepositExecute
+  alias Indexer.Fetcher.PolygonEdge
+
+  @fetcher_name :polygon_edge_deposit_execute
+
+  # 32-byte signature of the event StateSyncResult(uint256 indexed counter, bool indexed status, bytes message)
+  @state_sync_result_event "0x31c652130602f3ce96ceaf8a4c2b8b49f049166c6fcf2eb31943a75ec7c936ae"
+
+  def child_spec(start_link_arguments) do
+    spec = %{
+      id: __MODULE__,
+      start: {__MODULE__, :start_link, start_link_arguments},
+      restart: :transient,
+      type: :worker
+    }
+
+    Supervisor.child_spec(spec, [])
+  end
+
+  def start_link(args, gen_server_options \\ []) do
+    GenServer.start_link(__MODULE__, args, Keyword.put_new(gen_server_options, :name, __MODULE__))
+  end
+
+  @impl GenServer
+  def init(args) do
+    Logger.metadata(fetcher: @fetcher_name)
+
+    json_rpc_named_arguments = args[:json_rpc_named_arguments]
+    env = Application.get_all_env(:indexer)[__MODULE__]
+
+    PolygonEdge.init_l2(
+      DepositExecute,
+      env,
+      self(),
+      env[:state_receiver],
+      "StateReceiver",
+      "polygon_edge_deposit_executes",
+      "Deposit Executes",
+      json_rpc_named_arguments
+    )
+  end
+
+  @impl GenServer
+  def handle_info(
+        :continue,
+        %{
+          start_block_l2: start_block_l2,
+          contract_address: contract_address,
+          json_rpc_named_arguments: json_rpc_named_arguments
+        } = state
+      ) do
+    PolygonEdge.fill_msg_id_gaps(
+      start_block_l2,
+      DepositExecute,
+      __MODULE__,
+      contract_address,
+      json_rpc_named_arguments
+    )
+
+    Process.send(self(), :find_new_events, [])
+    {:noreply, state}
+  end
+
+  @impl GenServer
+  def handle_info(
+        :find_new_events,
+        %{
+          start_block: start_block,
+          safe_block: safe_block,
+          safe_block_is_latest: safe_block_is_latest,
+          contract_address: contract_address,
+          json_rpc_named_arguments: json_rpc_named_arguments
+        } = state
+      ) do
+    # find and fill all events between start_block and "safe" block
+    # the "safe" block can be "latest" (when safe_block_is_latest == true)
+    fill_block_range(
+      start_block,
+      safe_block,
+      {__MODULE__, DepositExecute},
+      contract_address,
+      json_rpc_named_arguments
+    )
+
+    if not safe_block_is_latest do
+      # find and fill all events between "safe" and "latest" block (excluding "safe")
+      {:ok, latest_block} = get_block_number_by_tag("latest", json_rpc_named_arguments, 100_000_000)
+
+      fill_block_range(
+        safe_block + 1,
+        latest_block,
+        {__MODULE__, DepositExecute},
+        contract_address,
+        json_rpc_named_arguments
+      )
+    end
+
+    {:stop, :normal, state}
+  end
+
+  @impl GenServer
+  def handle_info({ref, _result}, state) do
+    Process.demonitor(ref, [:flush])
+    {:noreply, state}
+  end
+
+  @spec remove(non_neg_integer()) :: no_return()
+  def remove(starting_block) do
+    Repo.delete_all(from(de in DepositExecute, where: de.l2_block_number >= ^starting_block))
+  end
+
+  @spec event_to_deposit_execute(binary(), binary(), binary(), binary()) :: map()
+  def event_to_deposit_execute(second_topic, third_topic, l2_transaction_hash, l2_block_number) do
+    %{
+      msg_id: quantity_to_integer(second_topic),
+      l2_transaction_hash: l2_transaction_hash,
+      l2_block_number: quantity_to_integer(l2_block_number),
+      success: quantity_to_integer(third_topic) != 0
+    }
+  end
+
+  @spec find_and_save_entities(boolean(), binary(), non_neg_integer(), non_neg_integer(), list()) :: non_neg_integer()
+  def find_and_save_entities(
+        scan_db,
+        state_receiver,
+        block_start,
+        block_end,
+        json_rpc_named_arguments
+      ) do
+    executes =
+      if scan_db do
+        query =
+          from(log in Log,
+            select: {log.second_topic, log.third_topic, log.transaction_hash, log.block_number},
+            where:
+              log.first_topic == @state_sync_result_event and log.address_hash == ^state_receiver and
+                log.block_number >= ^block_start and log.block_number <= ^block_end
+          )
+
+        query
+        |> Repo.all(timeout: :infinity)
+        |> Enum.map(fn {second_topic, third_topic, l2_transaction_hash, l2_block_number} ->
+          event_to_deposit_execute(second_topic, third_topic, l2_transaction_hash, l2_block_number)
+        end)
+      else
+        {:ok, result} =
+          PolygonEdge.get_logs(
+            block_start,
+            block_end,
+            state_receiver,
+            @state_sync_result_event,
+            json_rpc_named_arguments,
+            100_000_000
+          )
+
+        Enum.map(result, fn event ->
+          event_to_deposit_execute(
+            Enum.at(event["topics"], 1),
+            Enum.at(event["topics"], 2),
+            event["transactionHash"],
+            event["blockNumber"]
+          )
+        end)
+      end
+
+    {:ok, _} =
+      Chain.import(%{
+        polygon_edge_deposit_executes: %{params: executes},
+        timeout: :infinity
+      })
+
+    Enum.count(executes)
+  end
+
+  @spec state_sync_result_event_signature() :: binary()
+  def state_sync_result_event_signature do
+    @state_sync_result_event
+  end
+end
diff --git a/apps/indexer/lib/indexer/fetcher/polygon_edge/withdrawal.ex b/apps/indexer/lib/indexer/fetcher/polygon_edge/withdrawal.ex
new file mode 100644
index 000000000000..80fb20568c99
--- /dev/null
+++ b/apps/indexer/lib/indexer/fetcher/polygon_edge/withdrawal.ex
@@ -0,0 +1,216 @@
+defmodule Indexer.Fetcher.PolygonEdge.Withdrawal do
+  @moduledoc """
+  Fills polygon_edge_withdrawals DB table.
+  """
+
+  use GenServer
+  use Indexer.Fetcher
+
+  require Logger
+
+  import Ecto.Query
+
+  import EthereumJSONRPC, only: [quantity_to_integer: 1]
+  import Explorer.Helper, only: [decode_data: 2]
+  import Indexer.Fetcher.PolygonEdge, only: [fill_block_range: 5, get_block_number_by_tag: 3]
+
+  alias ABI.TypeDecoder
+  alias Explorer.{Chain, Repo}
+  alias Explorer.Chain.Log
+  alias Explorer.Chain.PolygonEdge.Withdrawal
+  alias Indexer.Fetcher.PolygonEdge
+
+  @fetcher_name :polygon_edge_withdrawal
+
+  # 32-byte signature of the event L2StateSynced(uint256 indexed id, address indexed sender, address indexed receiver, bytes data)
+  @l2_state_synced_event "0xedaf3c471ebd67d60c29efe34b639ede7d6a1d92eaeb3f503e784971e67118a5"
+
+  # 32-byte representation of withdrawal signature, keccak256("WITHDRAW")
+  @withdrawal_signature "7a8dc26796a1e50e6e190b70259f58f6a4edd5b22280ceecc82b687b8e982869"
+
+  def child_spec(start_link_arguments) do
+    spec = %{
+      id: __MODULE__,
+      start: {__MODULE__, :start_link, start_link_arguments},
+      restart: :transient,
+      type: :worker
+    }
+
+    Supervisor.child_spec(spec, [])
+  end
+
+  def start_link(args, gen_server_options \\ []) do
+    GenServer.start_link(__MODULE__, args, Keyword.put_new(gen_server_options, :name, __MODULE__))
+  end
+
+  @impl GenServer
+  def init(args) do
+    Logger.metadata(fetcher: @fetcher_name)
+
+    json_rpc_named_arguments = args[:json_rpc_named_arguments]
+    env = Application.get_all_env(:indexer)[__MODULE__]
+
+    PolygonEdge.init_l2(
+      Withdrawal,
+      env,
+      self(),
+      env[:state_sender],
+      "L2StateSender",
+      "polygon_edge_withdrawals",
+      "Withdrawals",
+      json_rpc_named_arguments
+    )
+  end
+
+  @impl GenServer
+  def handle_info(
+        :continue,
+        %{
+          start_block_l2: start_block_l2,
+          contract_address: contract_address,
+          json_rpc_named_arguments: json_rpc_named_arguments
+        } = state
+      ) do
+    PolygonEdge.fill_msg_id_gaps(
+      start_block_l2,
+      Withdrawal,
+      __MODULE__,
+      contract_address,
+      json_rpc_named_arguments
+    )
+
+    Process.send(self(), :find_new_events, [])
+    {:noreply, state}
+  end
+
+  @impl GenServer
+  def handle_info(
+        :find_new_events,
+        %{
+          start_block: start_block,
+          safe_block: safe_block,
+          safe_block_is_latest: safe_block_is_latest,
+          contract_address: contract_address,
+          json_rpc_named_arguments: json_rpc_named_arguments
+        } = state
+      ) do
+    # find and fill all events between start_block and "safe" block
+    # the "safe" block can be "latest" (when safe_block_is_latest == true)
+    fill_block_range(
+      start_block,
+      safe_block,
+      {__MODULE__, Withdrawal},
+      contract_address,
+      json_rpc_named_arguments
+    )
+
+    if not safe_block_is_latest do
+      # find and fill all events between "safe" and "latest" block (excluding "safe")
+      {:ok, latest_block} = get_block_number_by_tag("latest", json_rpc_named_arguments, 100_000_000)
+
+      fill_block_range(
+        safe_block + 1,
+        latest_block,
+        {__MODULE__, Withdrawal},
+        contract_address,
+        json_rpc_named_arguments
+      )
+    end
+
+    {:stop, :normal, state}
+  end
+
+  @impl GenServer
+  def handle_info({ref, _result}, state) do
+    Process.demonitor(ref, [:flush])
+    {:noreply, state}
+  end
+
+  @spec remove(non_neg_integer()) :: no_return()
+  def remove(starting_block) do
+    Repo.delete_all(from(w in Withdrawal, where: w.l2_block_number >= ^starting_block))
+  end
+
+  @spec event_to_withdrawal(binary(), map(), binary(), binary()) :: map()
+  def event_to_withdrawal(second_topic, data, l2_transaction_hash, l2_block_number) do
+    [data_bytes] = decode_data(data, [:bytes])
+
+    sig = binary_part(data_bytes, 0, 32)
+
+    {from, to} =
+      if Base.encode16(sig, case: :lower) == @withdrawal_signature do
+        [_sig, _root_token, sender, receiver, _amount] =
+          TypeDecoder.decode_raw(data_bytes, [{:bytes, 32}, :address, :address, :address, {:uint, 256}])
+
+        {sender, receiver}
+      else
+        {nil, nil}
+      end
+
+    %{
+      msg_id: quantity_to_integer(second_topic),
+      from: from,
+      to: to,
+      l2_transaction_hash: l2_transaction_hash,
+      l2_block_number: quantity_to_integer(l2_block_number)
+    }
+  end
+
+  @spec find_and_save_entities(boolean(), binary(), non_neg_integer(), non_neg_integer(), list()) :: non_neg_integer()
+  def find_and_save_entities(
+        scan_db,
+        state_sender,
+        block_start,
+        block_end,
+        json_rpc_named_arguments
+      ) do
+    withdrawals =
+      if scan_db do
+        query =
+          from(log in Log,
+            select: {log.second_topic, log.data, log.transaction_hash, log.block_number},
+            where:
+              log.first_topic == @l2_state_synced_event and log.address_hash == ^state_sender and
+                log.block_number >= ^block_start and log.block_number <= ^block_end
+          )
+
+        query
+        |> Repo.all(timeout: :infinity)
+        |> Enum.map(fn {second_topic, data, l2_transaction_hash, l2_block_number} ->
+          event_to_withdrawal(second_topic, data, l2_transaction_hash, l2_block_number)
+        end)
+      else
+        {:ok, result} =
+          PolygonEdge.get_logs(
+            block_start,
+            block_end,
+            state_sender,
+            @l2_state_synced_event,
+            json_rpc_named_arguments,
+            100_000_000
+          )
+
+        Enum.map(result, fn event ->
+          event_to_withdrawal(
+            Enum.at(event["topics"], 1),
+            event["data"],
+            event["transactionHash"],
+            event["blockNumber"]
+          )
+        end)
+      end
+
+    {:ok, _} =
+      Chain.import(%{
+        polygon_edge_withdrawals: %{params: withdrawals},
+        timeout: :infinity
+      })
+
+    Enum.count(withdrawals)
+  end
+
+  @spec l2_state_synced_event_signature() :: binary()
+  def l2_state_synced_event_signature do
+    @l2_state_synced_event
+  end
+end
diff --git a/apps/indexer/lib/indexer/fetcher/polygon_edge/withdrawal_exit.ex b/apps/indexer/lib/indexer/fetcher/polygon_edge/withdrawal_exit.ex
new file mode 100644
index 000000000000..5b41e122ddc8
--- /dev/null
+++ b/apps/indexer/lib/indexer/fetcher/polygon_edge/withdrawal_exit.ex
@@ -0,0 +1,84 @@
+defmodule Indexer.Fetcher.PolygonEdge.WithdrawalExit do
+  @moduledoc """
+  Fills polygon_edge_withdrawal_exits DB table.
+  """
+
+  use GenServer
+  use Indexer.Fetcher
+
+  require Logger
+
+  import EthereumJSONRPC, only: [quantity_to_integer: 1]
+
+  alias Explorer.Chain.Events.Subscriber
+  alias Explorer.Chain.PolygonEdge.WithdrawalExit
+  alias Indexer.Fetcher.PolygonEdge
+
+  @fetcher_name :polygon_edge_withdrawal_exit
+
+  # 32-byte signature of the event ExitProcessed(uint256 indexed id, bool indexed success, bytes returnData)
+  @exit_processed_event "0x8bbfa0c9bee3785c03700d2a909592286efb83fc7e7002be5764424b9842f7ec"
+
+  def child_spec(start_link_arguments) do
+    spec = %{
+      id: __MODULE__,
+      start: {__MODULE__, :start_link, start_link_arguments},
+      restart: :transient,
+      type: :worker
+    }
+
+    Supervisor.child_spec(spec, [])
+  end
+
+  def start_link(args, gen_server_options \\ []) do
+    GenServer.start_link(__MODULE__, args, Keyword.put_new(gen_server_options, :name, __MODULE__))
+  end
+
+  @impl GenServer
+  def init(_args) do
+    Logger.metadata(fetcher: @fetcher_name)
+
+    env = Application.get_all_env(:indexer)[__MODULE__]
+
+    Subscriber.to(:polygon_edge_reorg_block, :realtime)
+
+    PolygonEdge.init_l1(
+      WithdrawalExit,
+      env,
+      self(),
+      env[:exit_helper],
+      "Exit Helper",
+      "polygon_edge_withdrawal_exits",
+      "Withdrawals"
+    )
+  end
+
+  @impl GenServer
+  def handle_info(:continue, state) do
+    PolygonEdge.handle_continue(state, @exit_processed_event, __MODULE__, @fetcher_name)
+  end
+
+  @impl GenServer
+  def handle_info({:chain_event, :polygon_edge_reorg_block, :realtime, block_number}, state) do
+    PolygonEdge.reorg_block_push(@fetcher_name, block_number)
+    {:noreply, state}
+  end
+
+  @impl GenServer
+  def handle_info({ref, _result}, state) do
+    Process.demonitor(ref, [:flush])
+    {:noreply, state}
+  end
+
+  @spec prepare_events(list(), list()) :: list()
+  def prepare_events(events, _) do
+    Enum.map(events, fn event ->
+      %{
+        msg_id: quantity_to_integer(Enum.at(event["topics"], 1)),
+        l1_transaction_hash: event["transactionHash"],
+        l1_block_number: quantity_to_integer(event["blockNumber"]),
+        success: quantity_to_integer(Enum.at(event["topics"], 2)) != 0
+      }
+    end)
+  end
+end
diff --git a/apps/indexer/lib/indexer/helper.ex b/apps/indexer/lib/indexer/helper.ex
new file mode 100644
index 000000000000..540606fe222f
--- /dev/null
+++ b/apps/indexer/lib/indexer/helper.ex
@@ -0,0 +1,35 @@
+defmodule Indexer.Helper do
+  @moduledoc """
+  Auxiliary common functions for indexers.
+  """
+
+  alias Explorer.Chain.Hash
+
+  @spec address_hash_to_string(binary(), boolean()) :: binary()
+  def address_hash_to_string(hash, downcase \\ false)
+
+  def address_hash_to_string(hash, downcase) when is_binary(hash) do
+    if downcase do
+      String.downcase(hash)
+    else
+      hash
+    end
+  end
+
+  def address_hash_to_string(hash, downcase) do
+    if downcase do
+      String.downcase(Hash.to_string(hash))
+    else
+      Hash.to_string(hash)
+    end
+  end
+
+  @spec is_address_correct?(binary()) :: boolean()
+  def is_address_correct?(address) when is_binary(address) do
+    String.match?(address, ~r/^0x[[:xdigit:]]{40}$/i)
+  end
+
+  def is_address_correct?(_address) do
+    false
+  end
+end
diff --git a/apps/indexer/lib/indexer/supervisor.ex b/apps/indexer/lib/indexer/supervisor.ex
index 249dc7a3f58b..ccbeddca5045 100644
--- a/apps/indexer/lib/indexer/supervisor.ex
+++ b/apps/indexer/lib/indexer/supervisor.ex
@@ -25,6 +25,7 @@ defmodule Indexer.Supervisor do
     InternalTransaction,
     PendingBlockOperationsSanitizer,
     PendingTransaction,
+    PolygonEdge,
     ReplacedTransaction,
     Token,
     TokenBalance,
@@ -122,6 +123,13 @@ defmodule Indexer.Supervisor do
         {TokenUpdater.Supervisor,
          [[json_rpc_named_arguments: json_rpc_named_arguments, memory_monitor: memory_monitor]]},
         {ReplacedTransaction.Supervisor, [[memory_monitor: memory_monitor]]},
+        {PolygonEdge.Supervisor, [[memory_monitor: memory_monitor]]},
+        {Indexer.Fetcher.PolygonEdge.Deposit.Supervisor, [[memory_monitor: memory_monitor]]},
+        {Indexer.Fetcher.PolygonEdge.DepositExecute.Supervisor,
+         [[memory_monitor: memory_monitor, json_rpc_named_arguments: json_rpc_named_arguments]]},
+        {Indexer.Fetcher.PolygonEdge.Withdrawal.Supervisor,
+         [[memory_monitor: memory_monitor, json_rpc_named_arguments: json_rpc_named_arguments]]},
+        {Indexer.Fetcher.PolygonEdge.WithdrawalExit.Supervisor, [[memory_monitor: memory_monitor]]},
 
         # Out-of-band fetchers
         {EmptyBlocksSanitizer.Supervisor, [[json_rpc_named_arguments: json_rpc_named_arguments]]},
diff --git a/apps/indexer/lib/indexer/transform/polygon_edge/deposit_executes.ex b/apps/indexer/lib/indexer/transform/polygon_edge/deposit_executes.ex
new file mode 100644
index 000000000000..93dec160353c
--- /dev/null
+++ b/apps/indexer/lib/indexer/transform/polygon_edge/deposit_executes.ex
@@ -0,0 +1,55 @@
+defmodule Indexer.Transform.PolygonEdge.DepositExecutes do
+  @moduledoc """
+  Helper functions for transforming data for Polygon Edge deposit executes.
+  """
+
+  require Logger
+
+  alias Indexer.Fetcher.PolygonEdge.DepositExecute
+  alias Indexer.Helper
+
+  @doc """
+  Returns a list of deposit executes given a list of logs.
+  """
+  @spec parse(list()) :: list()
+  def parse(logs) do
+    prev_metadata = Logger.metadata()
+    Logger.metadata(fetcher: :polygon_edge_deposit_executes_realtime)
+
+    items =
+      with false <-
+             is_nil(Application.get_env(:indexer, DepositExecute)[:start_block_l2]),
+           state_receiver = Application.get_env(:indexer, DepositExecute)[:state_receiver],
+           true <- Helper.is_address_correct?(state_receiver) do
+        state_receiver = String.downcase(state_receiver)
+        state_sync_result_event_signature = DepositExecute.state_sync_result_event_signature()
+
+        logs
+        |> Enum.filter(fn log ->
+          !is_nil(log.first_topic) && String.downcase(log.first_topic) == state_sync_result_event_signature &&
+            String.downcase(Helper.address_hash_to_string(log.address_hash)) == state_receiver
+        end)
+        |> Enum.map(fn log ->
+          Logger.info("Deposit Execute (StateSyncResult) message found, id: #{log.second_topic}.")
+
+          DepositExecute.event_to_deposit_execute(
+            log.second_topic,
+            log.third_topic,
+            log.transaction_hash,
+            log.block_number
+          )
+        end)
+      else
+        true ->
+          []
+
+        false ->
+          Logger.error("StateReceiver contract address is incorrect. Cannot use #{__MODULE__} for parsing logs.")
+          []
+      end
+
+    Logger.reset_metadata(prev_metadata)
+
+    items
+  end
+end
diff --git a/apps/indexer/lib/indexer/transform/polygon_edge/withdrawals.ex b/apps/indexer/lib/indexer/transform/polygon_edge/withdrawals.ex
new file mode 100644
index 000000000000..1562f1fea61d
--- /dev/null
+++ b/apps/indexer/lib/indexer/transform/polygon_edge/withdrawals.ex
@@ -0,0 +1,54 @@
+defmodule Indexer.Transform.PolygonEdge.Withdrawals do
+  @moduledoc """
+  Helper functions for transforming data for Polygon Edge withdrawals.
+  """
+
+  require Logger
+
+  alias Indexer.Fetcher.PolygonEdge.Withdrawal
+  alias Indexer.Helper
+
+  @doc """
+  Returns a list of withdrawals given a list of logs.
+  """
+  @spec parse(list()) :: list()
+  def parse(logs) do
+    prev_metadata = Logger.metadata()
+    Logger.metadata(fetcher: :polygon_edge_withdrawals_realtime)
+
+    items =
+      with false <- is_nil(Application.get_env(:indexer, Withdrawal)[:start_block_l2]),
+           state_sender = Application.get_env(:indexer, Withdrawal)[:state_sender],
+           true <- Helper.is_address_correct?(state_sender) do
+        state_sender = String.downcase(state_sender)
+        l2_state_synced_event_signature = Withdrawal.l2_state_synced_event_signature()
+
+        logs
+        |> Enum.filter(fn log ->
+          !is_nil(log.first_topic) && String.downcase(log.first_topic) == l2_state_synced_event_signature &&
+            String.downcase(Helper.address_hash_to_string(log.address_hash)) == state_sender
+        end)
+        |> Enum.map(fn log ->
+          Logger.info("Withdrawal message found, id: #{log.second_topic}.")
+
+          Withdrawal.event_to_withdrawal(
+            log.second_topic,
+            log.data,
+            log.transaction_hash,
+            log.block_number
+          )
+        end)
+      else
+        true ->
+          []
+
+        false ->
+          Logger.error("L2StateSender contract address is incorrect. Cannot use #{__MODULE__} for parsing logs.")
+          []
+      end
+
+    Logger.reset_metadata(prev_metadata)
+
+    items
+  end
+end
diff --git a/apps/indexer/lib/indexer/transform/token_transfers.ex b/apps/indexer/lib/indexer/transform/token_transfers.ex
index f5c3e3cabf06..dae077901adc 100644
--- a/apps/indexer/lib/indexer/transform/token_transfers.ex
+++ b/apps/indexer/lib/indexer/transform/token_transfers.ex
@@ -6,8 +6,8 @@ defmodule Indexer.Transform.TokenTransfers do
   require Logger
 
   import Explorer.Chain.SmartContract, only: [burn_address_hash_string: 0]
+  import Explorer.Helper, only: [decode_data: 2]
 
-  alias ABI.TypeDecoder
   alias Explorer.Repo
   alias Explorer.Chain.{Token, TokenTransfer}
   alias Indexer.Fetcher.TokenTotalSupplyUpdater
@@ -325,14 +325,4 @@ defmodule Indexer.Transform.TokenTransfers do
   defp encode_address_hash(binary) do
     "0x" <> Base.encode16(binary, case: :lower)
   end
-
-  defp decode_data("0x", types) do
-    for _ <- types, do: nil
-  end
-
-  defp decode_data("0x" <> encoded_data, types) do
-    encoded_data
-    |> Base.decode16!(case: :mixed)
-    |> TypeDecoder.decode_raw(types)
-  end
 end
diff --git a/apps/indexer/lib/indexer/transform/transaction_actions.ex b/apps/indexer/lib/indexer/transform/transaction_actions.ex
index d22274decd98..1620fd724dd2 100644
--- a/apps/indexer/lib/indexer/transform/transaction_actions.ex
+++ b/apps/indexer/lib/indexer/transform/transaction_actions.ex
@@ -7,13 +7,14 @@ defmodule Indexer.Transform.TransactionActions do
 
   import Ecto.Query, only: [from: 2]
   import Explorer.Chain.SmartContract, only: [burn_address_hash_string: 0]
+  import Explorer.Helper, only: [decode_data: 2]
 
-  alias ABI.TypeDecoder
   alias Explorer.Chain.Cache.NetVersion
   alias Explorer.Chain.Cache.{TransactionActionTokensData, TransactionActionUniswapPools}
-  alias Explorer.Chain.{Address, Data, Hash, Token, TransactionAction}
+  alias Explorer.Chain.{Address, Hash, Token, TransactionAction}
   alias Explorer.Repo
   alias Explorer.SmartContract.Reader
+  alias Indexer.Helper
 
   @mainnet 1
   @goerli 5
@@ -194,7 +195,7 @@ defmodule Indexer.Transform.TransactionActions do
           @aave_v3_liquidation_call_event
         ],
         sanitize_first_topic(log.first_topic)
-      ) && address_hash_to_string(log.address_hash) == pool_address
+      ) && Helper.address_hash_to_string(log.address_hash, true) == pool_address
     end)
   end
 
@@ -398,7 +399,7 @@ defmodule Indexer.Transform.TransactionActions do
         first_topic
       ) ||
         (first_topic == @uniswap_v3_transfer_nft_event &&
-           address_hash_to_string(log.address_hash) == uniswap_v3_positions_nft)
+           Helper.address_hash_to_string(log.address_hash, true) == uniswap_v3_positions_nft)
     end)
   end
 
@@ -407,7 +408,7 @@ defmodule Indexer.Transform.TransactionActions do
 
     with false <- first_topic == @uniswap_v3_transfer_nft_event,
          # check UniswapV3Pool contract is legitimate
-         pool_address <- address_hash_to_string(log.address_hash),
+         pool_address <- Helper.address_hash_to_string(log.address_hash, true),
          false <- is_nil(legitimate[pool_address]),
          false <- Enum.empty?(legitimate[pool_address]),
          # this is legitimate uniswap pool, so handle this event
@@ -586,7 +587,7 @@ defmodule Indexer.Transform.TransactionActions do
           sanitize_first_topic(log.first_topic) != @uniswap_v3_transfer_nft_event
         end)
         |> Enum.reduce(addresses_acc, fn log, acc ->
-          pool_address = address_hash_to_string(log.address_hash)
+          pool_address = Helper.address_hash_to_string(log.address_hash, true)
           Map.put(acc, pool_address, true)
         end)
       end)
@@ -651,8 +652,12 @@ defmodule Indexer.Transform.TransactionActions do
         end
       end)
       |> Enum.map(fn {pool_address, pool} ->
-        token0 = if is_address_correct?(pool.token0), do: String.downcase(pool.token0), else: burn_address_hash_string()
-        token1 = if is_address_correct?(pool.token1), do: String.downcase(pool.token1), else: burn_address_hash_string()
+        token0 =
+          if Helper.is_address_correct?(pool.token0), do: String.downcase(pool.token0), else: burn_address_hash_string()
+
+        token1 =
+          if Helper.is_address_correct?(pool.token1), do: String.downcase(pool.token1), else: burn_address_hash_string()
+
         fee = if pool.fee == "", do: 0, else: pool.fee
 
         # we will call getPool(token0, token1, fee) public getter
@@ -760,22 +765,6 @@ defmodule Indexer.Transform.TransactionActions do
     end)
   end
 
-  defp decode_data("0x", types) do
-    for _ <- types, do: nil
-  end
-
-  defp decode_data("0x" <> encoded_data, types) do
-    encoded_data
-    |> Base.decode16!(case: :mixed)
-    |> TypeDecoder.decode_raw(types)
-  end
-
-  defp decode_data(%Data{} = data, types) do
-    data
-    |> Data.to_string()
-    |> decode_data(types)
-  end
-
   defp fractional(%Decimal{} = amount, %Decimal{} = decimals) do
     amount.sign
     |> Decimal.new(amount.coef, amount.exp - Decimal.to_integer(decimals))
@@ -949,21 +938,6 @@ defmodule Indexer.Transform.TransactionActions do
     {requests, responses}
   end
 
-  defp is_address_correct?(address) do
-    String.match?(address, ~r/^0x[[:xdigit:]]{40}$/i)
-  end
-
-  defp address_hash_to_string(hash) do
-    address_string =
-      if is_binary(hash) do
-        hash
-      else
-        Hash.to_string(hash)
-      end
-
-    String.downcase(address_string)
-  end
-
   defp logs_group_by_txs(logs) do
     logs
     |> Enum.group_by(& &1.transaction_hash)
diff --git a/config/config_helper.exs b/config/config_helper.exs
index a7e0706d3088..709b6455b2cc 100644
--- a/config/config_helper.exs
+++ b/config/config_helper.exs
@@ -4,6 +4,14 @@ defmodule ConfigHelper do
   alias Explorer.Market.History.Source.{MarketCap, Price}
   alias Indexer.Transform.Blocks
 
+  def repos do
+    if System.get_env("CHAIN_TYPE") == "polygon_edge" do
+      [Explorer.Repo, Explorer.Repo.Account, Explorer.Repo.PolygonEdge]
+    else
+      [Explorer.Repo, Explorer.Repo.Account]
+    end
+  end
+
   @spec hackney_options() :: any()
   def hackney_options() do
     basic_auth_user = System.get_env("ETHEREUM_JSONRPC_USER", "")
diff --git a/config/runtime.exs b/config/runtime.exs
index 85434f343f36..54b268988fc6 100644
--- a/config/runtime.exs
+++ b/config/runtime.exs
@@ -4,6 +4,8 @@ import Config
 |> Path.join()
 |> Code.eval_file()
 
+chain_type = System.get_env("CHAIN_TYPE") || "ethereum"
+
 ######################
 ### BlockScout Web ###
 ######################
@@ -158,7 +160,11 @@ config :ethereum_jsonrpc, EthereumJSONRPC.HTTP,
 
 config :ethereum_jsonrpc, EthereumJSONRPC.Geth,
   debug_trace_transaction_timeout: System.get_env("ETHEREUM_JSONRPC_DEBUG_TRACE_TRANSACTION_TIMEOUT", "5s"),
-  tracer: System.get_env("INDEXER_INTERNAL_TRANSACTIONS_TRACER_TYPE", "call_tracer")
+  tracer:
+    if(chain_type == "polygon_edge",
+      do: "polygon_edge",
+      else: System.get_env("INDEXER_INTERNAL_TRANSACTIONS_TRACER_TYPE", "call_tracer")
+    )
 
 config :ethereum_jsonrpc, EthereumJSONRPC.PendingTransaction,
   type: System.get_env("ETHEREUM_JSONRPC_PENDING_TRANSACTIONS_TYPE", "default")
@@ -177,6 +183,7 @@ checksum_function = System.get_env("CHECKSUM_FUNCTION")
 exchange_rates_coin = System.get_env("EXCHANGE_RATES_COIN")
 
 config :explorer,
+  chain_type: chain_type,
   coin: System.get_env("COIN") || exchange_rates_coin || "ETH",
   coin_name: System.get_env("COIN_NAME") || exchange_rates_coin || "ETH",
   allowed_solidity_evm_versions:
@@ -538,6 +545,37 @@ config :indexer, Indexer.Fetcher.Withdrawal.Supervisor,
 
 config :indexer, Indexer.Fetcher.Withdrawal, first_block: System.get_env("WITHDRAWALS_FIRST_BLOCK")
 
+config :indexer, Indexer.Fetcher.PolygonEdge.Supervisor, disabled?: !(chain_type == "polygon_edge")
+
+config :indexer, Indexer.Fetcher.PolygonEdge.Deposit.Supervisor, disabled?: !(chain_type == "polygon_edge")
+
+config :indexer, Indexer.Fetcher.PolygonEdge.DepositExecute.Supervisor, disabled?: !(chain_type == "polygon_edge")
+
+config :indexer, Indexer.Fetcher.PolygonEdge.Withdrawal.Supervisor, disabled?: !(chain_type == "polygon_edge")
+
+config :indexer, Indexer.Fetcher.PolygonEdge.WithdrawalExit.Supervisor, disabled?: !(chain_type == "polygon_edge")
+
+config :indexer, Indexer.Fetcher.PolygonEdge,
+  polygon_edge_l1_rpc: System.get_env("INDEXER_POLYGON_EDGE_L1_RPC"),
+  polygon_edge_eth_get_logs_range_size:
+    ConfigHelper.parse_integer_env_var("INDEXER_POLYGON_EDGE_ETH_GET_LOGS_RANGE_SIZE", 1000)
+
+config :indexer, Indexer.Fetcher.PolygonEdge.Deposit,
+  start_block_l1: System.get_env("INDEXER_POLYGON_EDGE_L1_DEPOSITS_START_BLOCK"),
+  state_sender: System.get_env("INDEXER_POLYGON_EDGE_L1_STATE_SENDER_CONTRACT")
+
+config :indexer, Indexer.Fetcher.PolygonEdge.DepositExecute,
+  start_block_l2: System.get_env("INDEXER_POLYGON_EDGE_L2_DEPOSITS_START_BLOCK"),
+  state_receiver: System.get_env("INDEXER_POLYGON_EDGE_L2_STATE_RECEIVER_CONTRACT")
+
+config :indexer, Indexer.Fetcher.PolygonEdge.Withdrawal,
+  start_block_l2: System.get_env("INDEXER_POLYGON_EDGE_L2_WITHDRAWALS_START_BLOCK"),
+  state_sender: System.get_env("INDEXER_POLYGON_EDGE_L2_STATE_SENDER_CONTRACT")
+
+config :indexer, Indexer.Fetcher.PolygonEdge.WithdrawalExit,
+  start_block_l1: System.get_env("INDEXER_POLYGON_EDGE_L1_WITHDRAWALS_START_BLOCK"),
+  exit_helper: System.get_env("INDEXER_POLYGON_EDGE_L1_EXIT_HELPER_CONTRACT")
+
 Code.require_file("#{config_env()}.exs", "config/runtime")
 
 for config <- "../apps/*/config/runtime/#{config_env()}.exs" |> Path.expand(__DIR__) |> Path.wildcard() do
diff --git a/config/runtime/dev.exs b/config/runtime/dev.exs
index 3edc8c239fb6..891e2c204afc 100644
--- a/config/runtime/dev.exs
+++ b/config/runtime/dev.exs
@@ -69,6 +69,13 @@ config :explorer, Explorer.Repo.Account,
   url: ExplorerConfigHelper.get_account_db_url(),
   pool_size: ConfigHelper.parse_integer_env_var("ACCOUNT_POOL_SIZE", 10)
 
+# Configure PolygonEdge database
+config :explorer, Explorer.Repo.PolygonEdge,
+  database: database,
+  hostname: hostname,
+  url: System.get_env("DATABASE_URL"),
+  pool_size: ConfigHelper.parse_integer_env_var("POLYGON_EDGE_POOL_SIZE", 10)
+
 variant = Variant.get()
 
 Code.require_file("#{variant}.exs", "apps/explorer/config/dev")
diff --git a/config/runtime/prod.exs b/config/runtime/prod.exs
index 8b65aff1124a..15f3e7168357 100644
--- a/config/runtime/prod.exs
+++ b/config/runtime/prod.exs
@@ -55,6 +55,12 @@ config :explorer, Explorer.Repo.Account,
   pool_size: ConfigHelper.parse_integer_env_var("ACCOUNT_POOL_SIZE", 50),
   ssl: ExplorerConfigHelper.ssl_enabled?()
 
+# Configures PolygonEdge database
+config :explorer, Explorer.Repo.PolygonEdge,
+  url: System.get_env("DATABASE_URL"),
+  pool_size: ConfigHelper.parse_integer_env_var("POLYGON_EDGE_POOL_SIZE", 50),
+  ssl: ExplorerConfigHelper.ssl_enabled?()
+
 variant = Variant.get()
 
 Code.require_file("#{variant}.exs", "apps/explorer/config/prod")
diff --git a/cspell.json b/cspell.json
index ef83d12ef464..0338069e35c2 100644
--- a/cspell.json
+++ b/cspell.json
@@ -420,6 +420,7 @@
         "subtraces",
         "successa",
         "successb",
+        "supernet",
         "swal",
         "sweetalert",
         "Synthereum",
diff --git a/docker-compose/envs/common-blockscout.env b/docker-compose/envs/common-blockscout.env
index bfeb0f74cb9a..39ad8823cd83 100644
--- a/docker-compose/envs/common-blockscout.env
+++ b/docker-compose/envs/common-blockscout.env
@@ -6,6 +6,7 @@ DATABASE_URL=postgresql://postgres:@host.docker.internal:7432/blockscout?ssl=fal
 ETHEREUM_JSONRPC_TRACE_URL=http://host.docker.internal:8545/
 # ETHEREUM_JSONRPC_FALLBACK_TRACE_URL=
 # ETHEREUM_JSONRPC_HTTP_TIMEOUT=
+# CHAIN_TYPE=
 NETWORK=
 SUBNETWORK=Awesome chain
 LOGO=/images/blockscout_logo.svg
@@ -125,6 +126,16 @@ INDEXER_DISABLE_INTERNAL_TRANSACTIONS_FETCHER=false
 # INDEXER_TX_ACTIONS_REINDEX_LAST_BLOCK=
 # INDEXER_TX_ACTIONS_REINDEX_PROTOCOLS=
 # INDEXER_TX_ACTIONS_AAVE_V3_POOL_CONTRACT=
+# INDEXER_POLYGON_EDGE_L1_RPC=
+# INDEXER_POLYGON_EDGE_L1_EXIT_HELPER_CONTRACT=
+# INDEXER_POLYGON_EDGE_L1_WITHDRAWALS_START_BLOCK=
+# INDEXER_POLYGON_EDGE_L1_STATE_SENDER_CONTRACT=
+# INDEXER_POLYGON_EDGE_L1_DEPOSITS_START_BLOCK=
+# INDEXER_POLYGON_EDGE_L2_STATE_SENDER_CONTRACT=
+# INDEXER_POLYGON_EDGE_L2_WITHDRAWALS_START_BLOCK=
+# INDEXER_POLYGON_EDGE_L2_STATE_RECEIVER_CONTRACT=
+# INDEXER_POLYGON_EDGE_L2_DEPOSITS_START_BLOCK=
+# INDEXER_POLYGON_EDGE_ETH_GET_LOGS_RANGE_SIZE=
 # INDEXER_REALTIME_FETCHER_MAX_GAP=
 # INDEXER_FETCHER_INIT_QUERY_LIMIT=
 # INDEXER_TOKEN_BALANCES_FETCHER_INIT_QUERY_LIMIT=

From aee79da124c56e05c64f337afcd367e1cdc45640 Mon Sep 17 00:00:00 2001
From: Qwerty5Uiop <alex000010@bk.ru>
Date: Fri, 22 Sep 2023 13:53:35 +0300
Subject: [PATCH 432/909] Don't override transaction status

---
 CHANGELOG.md                                  |  2 +
 .../import/runner/internal_transactions.ex    | 33 ++++++++++++++--
 .../runner/internal_transactions_test.exs     | 38 ++++---------------
 3 files changed, 38 insertions(+), 35 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 53cba9522b71..0a707ea38114 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,8 @@
 
 ### Fixes
 
+- [#8513](https://github.com/blockscout/blockscout/pull/8513) - Don't override transaction status
+
 ### Chore
 
 - [#8504](https://github.com/blockscout/blockscout/pull/8504) - Deploy new UI through Makefile
diff --git a/apps/explorer/lib/explorer/chain/import/runner/internal_transactions.ex b/apps/explorer/lib/explorer/chain/import/runner/internal_transactions.ex
index 8b26d9b2c811..5ca6ef92c67a 100644
--- a/apps/explorer/lib/explorer/chain/import/runner/internal_transactions.ex
+++ b/apps/explorer/lib/explorer/chain/import/runner/internal_transactions.ex
@@ -311,7 +311,7 @@ defmodule Explorer.Chain.Import.Runner.InternalTransactions do
       from(
         t in Transaction,
         where: t.block_hash in ^pending_block_hashes,
-        select: map(t, [:hash, :block_hash, :block_number, :cumulative_gas_used]),
+        select: map(t, [:hash, :block_hash, :block_number, :cumulative_gas_used, :status]),
         # Enforce Transaction ShareLocks order (see docs: sharelocks.md)
         order_by: [asc: t.hash],
         lock: "FOR NO KEY UPDATE"
@@ -514,6 +514,7 @@ defmodule Explorer.Chain.Import.Runner.InternalTransactions do
           timeout,
           timestamps,
           first_trace,
+          transaction_from_db,
           transaction_receipt_from_node
         )
 
@@ -525,7 +526,8 @@ defmodule Explorer.Chain.Import.Runner.InternalTransactions do
           transaction_hashes_iterator,
           timeout,
           timestamps,
-          first_trace
+          first_trace,
+          transaction_from_db
         )
 
       true ->
@@ -539,6 +541,7 @@ defmodule Explorer.Chain.Import.Runner.InternalTransactions do
           timeout,
           timestamps,
           first_trace,
+          transaction_from_db,
           transaction_receipt_from_node
         )
     end
@@ -579,6 +582,7 @@ defmodule Explorer.Chain.Import.Runner.InternalTransactions do
     end
   end
 
+  # credo:disable-for-next-line
   defp update_transactions_inner(
          repo,
          valid_internal_transactions,
@@ -587,6 +591,7 @@ defmodule Explorer.Chain.Import.Runner.InternalTransactions do
          timeout,
          timestamps,
          first_trace,
+         transaction_from_db,
          transaction_receipt_from_node \\ nil
        ) do
     valid_internal_transactions_count = Enum.count(valid_internal_transactions)
@@ -595,6 +600,7 @@ defmodule Explorer.Chain.Import.Runner.InternalTransactions do
     set =
       generate_transaction_set_to_update(
         first_trace,
+        transaction_from_db,
         transaction_receipt_from_node,
         timestamps,
         txs_with_error_in_internal_txs
@@ -628,19 +634,20 @@ defmodule Explorer.Chain.Import.Runner.InternalTransactions do
 
   def generate_transaction_set_to_update(
         first_trace,
+        transaction_from_db,
         transaction_receipt_from_node,
         timestamps,
         txs_with_error_in_internal_txs
       ) do
     default_set = [
       created_contract_address_hash: first_trace.created_contract_address_hash,
-      error: first_trace.error,
-      status: first_trace.status,
       updated_at: timestamps.updated_at
     ]
 
     set =
       default_set
+      |> put_status_in_update_set(first_trace, transaction_from_db)
+      |> put_error_in_update_set(first_trace, transaction_from_db, transaction_receipt_from_node)
       |> Keyword.put_new(:block_hash, first_trace.block_hash)
       |> Keyword.put_new(:block_number, first_trace.block_number)
       |> Keyword.put_new(:index, transaction_receipt_from_node && transaction_receipt_from_node.transaction_index)
@@ -665,6 +672,24 @@ defmodule Explorer.Chain.Import.Runner.InternalTransactions do
     filtered_set
   end
 
+  defp put_status_in_update_set(update_set, first_trace, %{status: nil}),
+    do: Keyword.put_new(update_set, :status, first_trace.status)
+
+  defp put_status_in_update_set(update_set, _first_trace, _transaction_from_db), do: update_set
+
+  defp put_error_in_update_set(update_set, first_trace, _transaction_from_db, %{status: :error}),
+    do: Keyword.put_new(update_set, :error, first_trace.error)
+
+  defp put_error_in_update_set(update_set, first_trace, %{status: :error}, _transaction_receipt_from_node),
+    do: Keyword.put_new(update_set, :error, first_trace.error)
+
+  defp put_error_in_update_set(update_set, first_trace, _transaction_from_db, _transaction_receipt_from_node) do
+    case update_set[:status] do
+      :error -> Keyword.put_new(update_set, :error, first_trace.error)
+      _ -> update_set
+    end
+  end
+
   defp remove_consensus_of_invalid_blocks(repo, invalid_block_numbers) do
     minimal_block = EthereumJSONRPC.first_block_to_fetch(:trace_first_block)
 
diff --git a/apps/explorer/test/explorer/chain/import/runner/internal_transactions_test.exs b/apps/explorer/test/explorer/chain/import/runner/internal_transactions_test.exs
index 033c2b8cab3b..ffe02c5dc7df 100644
--- a/apps/explorer/test/explorer/chain/import/runner/internal_transactions_test.exs
+++ b/apps/explorer/test/explorer/chain/import/runner/internal_transactions_test.exs
@@ -6,7 +6,7 @@ defmodule Explorer.Chain.Import.Runner.InternalTransactionsTest do
   alias Explorer.Chain.Import.Runner.InternalTransactions
 
   describe "run/1" do
-    test "transaction's status becomes :error when its internal_transaction has an error" do
+    test "transaction's status doesn't become :error when its internal_transaction has an error" do
       transaction = insert(:transaction) |> with_block(status: :ok)
       insert(:pending_block_operation, block_hash: transaction.block_hash, block_number: transaction.block_number)
 
@@ -19,7 +19,7 @@ defmodule Explorer.Chain.Import.Runner.InternalTransactionsTest do
 
       assert {:ok, _} = run_internal_transactions([internal_transaction_changes])
 
-      assert :error == Repo.get(Transaction, transaction.hash).status
+      assert :ok == Repo.get(Transaction, transaction.hash).status
     end
 
     test "transaction's has_error_in_internal_txs become true when its internal_transaction (where index != 0) has an error" do
@@ -61,7 +61,7 @@ defmodule Explorer.Chain.Import.Runner.InternalTransactionsTest do
       assert {:ok, _} = run_internal_transactions([internal_transaction_changes])
       tx = Repo.get(Transaction, transaction.hash)
 
-      assert :error == tx.status
+      assert :ok == tx.status
       assert false == tx.has_error_in_internal_txs
     end
 
@@ -90,7 +90,7 @@ defmodule Explorer.Chain.Import.Runner.InternalTransactionsTest do
       assert false == tx.has_error_in_internal_txs
     end
 
-    test "simple coin transfer's status becomes :error when its internal_transaction has an error" do
+    test "simple coin transfer's status doesn't become :error when its internal_transaction has an error" do
       transaction = insert(:transaction) |> with_block(status: :ok)
       insert(:pending_block_operation, block_hash: transaction.block_hash, block_number: transaction.block_number)
 
@@ -104,10 +104,10 @@ defmodule Explorer.Chain.Import.Runner.InternalTransactionsTest do
 
       assert {:ok, _} = run_internal_transactions([internal_transaction_changes])
 
-      assert :error == Repo.get(Transaction, transaction.hash).status
+      assert :ok == Repo.get(Transaction, transaction.hash).status
     end
 
-    test "for block with 2 simple coin transfer's statuses become :error when its both internal_transactions has an error" do
+    test "for block with 2 simple coin transfer's statuses doesn't become :error even when its both internal_transactions has an error" do
       a_block = insert(:block, number: 1000)
       transaction1 = insert(:transaction) |> with_block(a_block, status: :ok)
       transaction2 = insert(:transaction) |> with_block(a_block, status: :ok)
@@ -128,31 +128,7 @@ defmodule Explorer.Chain.Import.Runner.InternalTransactionsTest do
 
       assert {:ok, _} = run_internal_transactions([internal_transaction_changes_1, internal_transaction_changes_2])
 
-      assert :error == Repo.get(Transaction, transaction1.hash).status
-      assert :error == Repo.get(Transaction, transaction2.hash).status
-    end
-
-    test "for block with 2 simple coin transfer's only status become :error for tx where internal_transactions has an error" do
-      a_block = insert(:block, number: 1000)
-      transaction1 = insert(:transaction) |> with_block(a_block, status: :ok)
-      transaction2 = insert(:transaction) |> with_block(a_block, status: :ok)
-      insert(:pending_block_operation, block_hash: a_block.hash, block_number: a_block.number)
-
-      assert :ok == transaction1.status
-      assert :ok == transaction2.status
-
-      index = 0
-      error = "Out of gas"
-
-      internal_transaction_changes_1 =
-        make_internal_transaction_changes_for_simple_coin_transfers(transaction1, index, error)
-
-      internal_transaction_changes_2 =
-        make_internal_transaction_changes_for_simple_coin_transfers(transaction2, index, nil)
-
-      assert {:ok, _} = run_internal_transactions([internal_transaction_changes_1, internal_transaction_changes_2])
-
-      assert :error == Repo.get(Transaction, transaction1.hash).status
+      assert :ok == Repo.get(Transaction, transaction1.hash).status
       assert :ok == Repo.get(Transaction, transaction2.hash).status
     end
 

From 7afe8e19b59923ac4bf1b065c6e3a0f0a0ed9d45 Mon Sep 17 00:00:00 2001
From: Qwerty5Uiop <alex000010@bk.ru>
Date: Fri, 21 Jul 2023 14:10:46 +0400
Subject: [PATCH 433/909] Add CoinBalance fetcher init query limit

---
 CHANGELOG.md                                     |  1 +
 apps/explorer/lib/explorer/chain.ex              | 10 +++++++++-
 apps/indexer/lib/indexer/fetcher/coin_balance.ex |  3 ++-
 config/runtime.exs                               |  4 +++-
 docker-compose/envs/common-blockscout.env        |  1 +
 5 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0a707ea38114..649eee411014 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,7 @@
 ### Features
 
 - [#8180](https://github.com/blockscout/blockscout/pull/8180) - Deposits and Withdrawals for Polygon Edge
+- [#7996](https://github.com/blockscout/blockscout/pull/7996) - Add CoinBalance fetcher init query limit
 
 ### Fixes
 
diff --git a/apps/explorer/lib/explorer/chain.ex b/apps/explorer/lib/explorer/chain.ex
index 3c4239b7ce0f..6aa532de03e1 100644
--- a/apps/explorer/lib/explorer/chain.ex
+++ b/apps/explorer/lib/explorer/chain.ex
@@ -2232,7 +2232,7 @@ defmodule Explorer.Chain do
       )
 
     query
-    |> add_fetcher_limit(limited?)
+    |> add_coin_balances_fetcher_limit(limited?)
     |> Repo.stream_reduce(initial, reducer)
   end
 
@@ -6315,6 +6315,14 @@ defmodule Explorer.Chain do
     limit(query, ^token_balances_fetcher_limit)
   end
 
+  defp add_coin_balances_fetcher_limit(query, false), do: query
+
+  defp add_coin_balances_fetcher_limit(query, true) do
+    coin_balances_fetcher_limit = Application.get_env(:indexer, :coin_balances_fetcher_init_limit)
+
+    limit(query, ^coin_balances_fetcher_limit)
+  end
+
   def put_has_token_transfers_to_tx(query, true), do: query
 
   def put_has_token_transfers_to_tx(query, false) do
diff --git a/apps/indexer/lib/indexer/fetcher/coin_balance.ex b/apps/indexer/lib/indexer/fetcher/coin_balance.ex
index ce80805e5d13..26d5d399624a 100644
--- a/apps/indexer/lib/indexer/fetcher/coin_balance.ex
+++ b/apps/indexer/lib/indexer/fetcher/coin_balance.ex
@@ -69,7 +69,8 @@ defmodule Indexer.Fetcher.CoinBalance do
           address_fields
           |> entry()
           |> reducer.(acc)
-        end
+        end,
+        true
       )
 
     final
diff --git a/config/runtime.exs b/config/runtime.exs
index 54b268988fc6..2d51abb6198b 100644
--- a/config/runtime.exs
+++ b/config/runtime.exs
@@ -431,7 +431,9 @@ config :indexer,
   hide_indexing_progress_alert: ConfigHelper.parse_bool_env_var("INDEXER_HIDE_INDEXING_PROGRESS_ALERT"),
   fetcher_init_limit: ConfigHelper.parse_integer_env_var("INDEXER_FETCHER_INIT_QUERY_LIMIT", 100),
   token_balances_fetcher_init_limit:
-    ConfigHelper.parse_integer_env_var("INDEXER_TOKEN_BALANCES_FETCHER_INIT_QUERY_LIMIT", 100_000)
+    ConfigHelper.parse_integer_env_var("INDEXER_TOKEN_BALANCES_FETCHER_INIT_QUERY_LIMIT", 100_000),
+  coin_balances_fetcher_init_limit:
+    ConfigHelper.parse_integer_env_var("INDEXER_COIN_BALANCES_FETCHER_INIT_QUERY_LIMIT", 2000)
 
 config :indexer, Indexer.Supervisor, enabled: !ConfigHelper.parse_bool_env_var("DISABLE_INDEXER")
 
diff --git a/docker-compose/envs/common-blockscout.env b/docker-compose/envs/common-blockscout.env
index 39ad8823cd83..5d8c29b3c563 100644
--- a/docker-compose/envs/common-blockscout.env
+++ b/docker-compose/envs/common-blockscout.env
@@ -139,6 +139,7 @@ INDEXER_DISABLE_INTERNAL_TRANSACTIONS_FETCHER=false
 # INDEXER_REALTIME_FETCHER_MAX_GAP=
 # INDEXER_FETCHER_INIT_QUERY_LIMIT=
 # INDEXER_TOKEN_BALANCES_FETCHER_INIT_QUERY_LIMIT=
+# INDEXER_COIN_BALANCES_FETCHER_INIT_QUERY_LIMIT=
 # INDEXER_DISABLE_WITHDRAWALS_FETCHER=
 # WITHDRAWALS_FIRST_BLOCK=
 # TOKEN_ID_MIGRATION_FIRST_BLOCK=

From 9f07e5a3646bb70eaef567d6d3c8ee1ea30c9cf6 Mon Sep 17 00:00:00 2001
From: Viktor Baranov <baranov.viktor.27@gmail.com>
Date: Mon, 25 Sep 2023 15:13:16 +0300
Subject: [PATCH 434/909] Move PolygonEdge-related migration to the
 corresponding repository

---
 CHANGELOG.md                                                     | 1 +
 .../20230731130103_modify_collated_gas_price_constraint.exs      | 0
 2 files changed, 1 insertion(+)
 rename apps/explorer/priv/{repo => polygon_edge}/migrations/20230731130103_modify_collated_gas_price_constraint.exs (100%)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0a707ea38114..b3ba42ee4077 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,6 +12,7 @@
 
 ### Chore
 
+- [#8529](https://github.com/blockscout/blockscout/pull/8529) - Move PolygonEdge-related migration to the corresponding ecto repository
 - [#8504](https://github.com/blockscout/blockscout/pull/8504) - Deploy new UI through Makefile
 - [#8501](https://github.com/blockscout/blockscout/pull/8501) - Conceal secondary ports in docker compose setup
 
diff --git a/apps/explorer/priv/repo/migrations/20230731130103_modify_collated_gas_price_constraint.exs b/apps/explorer/priv/polygon_edge/migrations/20230731130103_modify_collated_gas_price_constraint.exs
similarity index 100%
rename from apps/explorer/priv/repo/migrations/20230731130103_modify_collated_gas_price_constraint.exs
rename to apps/explorer/priv/polygon_edge/migrations/20230731130103_modify_collated_gas_price_constraint.exs

From 776ff695bb974d9118294bcd0b670a1acf22fbfe Mon Sep 17 00:00:00 2001
From: Andrey Atapin <a.atapin@gmail.com>
Date: Mon, 25 Sep 2023 21:12:21 +0500
Subject: [PATCH 435/909] Fix empty TransferBatch event handling (#7959)

* Fix empty TransferBatch event handling

* changelog

* format

* migration

* fixed changelog

---------

Co-authored-by: Victor Baranov <baranov.viktor.27@gmail.com>
---
 CHANGELOG.md                                  |  1 +
 ...elete_erc_1155_tt_with_empty_token_ids.exs |  9 +++
 .../lib/indexer/transform/token_transfers.ex  | 58 +++++++++++--------
 .../transform/token_transfers_test.exs        | 22 +++++++
 4 files changed, 66 insertions(+), 24 deletions(-)
 create mode 100644 apps/explorer/priv/repo/migrations/20230719160318_delete_erc_1155_tt_with_empty_token_ids.exs

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 440ba02ff718..890e43e8a61e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,7 @@
 
 ### Fixes
 
+- [#7959](https://github.com/blockscout/blockscout/pull/7959) - Fix empty batch transfers handling
 - [#8513](https://github.com/blockscout/blockscout/pull/8513) - Don't override transaction status
 
 ### Chore
diff --git a/apps/explorer/priv/repo/migrations/20230719160318_delete_erc_1155_tt_with_empty_token_ids.exs b/apps/explorer/priv/repo/migrations/20230719160318_delete_erc_1155_tt_with_empty_token_ids.exs
new file mode 100644
index 000000000000..190fdf8e8023
--- /dev/null
+++ b/apps/explorer/priv/repo/migrations/20230719160318_delete_erc_1155_tt_with_empty_token_ids.exs
@@ -0,0 +1,9 @@
+defmodule Explorer.Repo.Migrations.DeleteErc1155TtWithEmptyTokenIds do
+  use Ecto.Migration
+
+  def change do
+    execute("""
+    DELETE from token_transfers USING tokens WHERE token_transfers.token_contract_address_hash = tokens.contract_address_hash AND tokens.type = 'ERC-1155' AND (token_transfers.token_ids IS NULL OR ARRAY_LENGTH(token_transfers.token_ids, 1) = 0) ;
+    """)
+  end
+end
diff --git a/apps/indexer/lib/indexer/transform/token_transfers.ex b/apps/indexer/lib/indexer/transform/token_transfers.ex
index dae077901adc..fc6fb6a6cfe7 100644
--- a/apps/indexer/lib/indexer/transform/token_transfers.ex
+++ b/apps/indexer/lib/indexer/transform/token_transfers.ex
@@ -125,17 +125,23 @@ defmodule Indexer.Transform.TokenTransfers do
   end
 
   defp do_parse(log, %{tokens: tokens, token_transfers: token_transfers} = acc, type \\ :erc20_erc721) do
-    {token, token_transfer} =
+    parse_result =
       if type != :erc1155 do
         parse_params(log)
       else
         parse_erc1155_params(log)
       end
 
-    %{
-      tokens: [token | tokens],
-      token_transfers: [token_transfer | token_transfers]
-    }
+    case parse_result do
+      {token, token_transfer} ->
+        %{
+          tokens: [token | tokens],
+          token_transfers: [token_transfer | token_transfers]
+        }
+
+      nil ->
+        acc
+    end
   rescue
     e in [FunctionClauseError, MatchError] ->
       Logger.error(fn ->
@@ -271,25 +277,29 @@ defmodule Indexer.Transform.TokenTransfers do
       ) do
     [token_ids, values] = decode_data(data, [{:array, {:uint, 256}}, {:array, {:uint, 256}}])
 
-    token_transfer = %{
-      block_number: log.block_number,
-      block_hash: log.block_hash,
-      log_index: log.index,
-      from_address_hash: truncate_address_hash(third_topic),
-      to_address_hash: truncate_address_hash(fourth_topic),
-      token_contract_address_hash: log.address_hash,
-      transaction_hash: log.transaction_hash,
-      token_type: "ERC-1155",
-      token_ids: token_ids,
-      amounts: values
-    }
-
-    token = %{
-      contract_address_hash: log.address_hash,
-      type: "ERC-1155"
-    }
-
-    {token, token_transfer}
+    if token_ids == [] || values == [] do
+      nil
+    else
+      token_transfer = %{
+        block_number: log.block_number,
+        block_hash: log.block_hash,
+        log_index: log.index,
+        from_address_hash: truncate_address_hash(third_topic),
+        to_address_hash: truncate_address_hash(fourth_topic),
+        token_contract_address_hash: log.address_hash,
+        transaction_hash: log.transaction_hash,
+        token_type: "ERC-1155",
+        token_ids: token_ids,
+        amounts: values
+      }
+
+      token = %{
+        contract_address_hash: log.address_hash,
+        type: "ERC-1155"
+      }
+
+      {token, token_transfer}
+    end
   end
 
   def parse_erc1155_params(%{third_topic: third_topic, fourth_topic: fourth_topic, data: data} = log) do
diff --git a/apps/indexer/test/indexer/transform/token_transfers_test.exs b/apps/indexer/test/indexer/transform/token_transfers_test.exs
index f416733ea13b..8833474acccc 100644
--- a/apps/indexer/test/indexer/transform/token_transfers_test.exs
+++ b/apps/indexer/test/indexer/transform/token_transfers_test.exs
@@ -263,6 +263,28 @@ defmodule Indexer.Transform.TokenTransfersTest do
              }
     end
 
+    test "parses erc1155 batch token transfer with empty ids/values" do
+      log = %{
+        address_hash: "0x598AF04C88122FA4D1e08C5da3244C39F10D4F14",
+        block_number: 9_065_059,
+        data:
+          "0x0000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+        first_topic: "0x4a39dc06d4c0dbc64b70af90fd698a233a518aa5d07e595d983b8c0526c8f7fb",
+        secon_topic: "0x81D0caF80E9bFfD9bF9c641ab964feB9ef69069e",
+        third_topic: "0x598AF04C88122FA4D1e08C5da3244C39F10D4F14",
+        fourth_topic: "0x0000000000000000000000000000000000000000",
+        index: 6,
+        transaction_hash: "0xa6ad6588edb4abd8ca45f30d2f026ba20b68a3002a5870dbd30cc3752568483b",
+        block_hash: "0x61b720e40f8c521edd77a52cabce556c18b18b198f78e361f310003386ff1f02",
+        type: "mined"
+      }
+
+      assert TokenTransfers.parse([log]) == %{
+               token_transfers: [],
+               tokens: []
+             }
+    end
+
     test "logs error with unrecognized token transfer format" do
       log = %{
         address_hash: "0x58Ab73CB79c8275628E0213742a85B163fE0A9Fb",

From 0e2b4cb384d2de58eef32994adfc93d996662dc0 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 25 Sep 2023 18:11:58 +0000
Subject: [PATCH 436/909] Bump ex_cldr_units from 3.16.2 to 3.16.3

Bumps [ex_cldr_units](https://github.com/elixir-cldr/cldr_units) from 3.16.2 to 3.16.3.
- [Release notes](https://github.com/elixir-cldr/cldr_units/releases)
- [Changelog](https://github.com/elixir-cldr/cldr_units/blob/main/CHANGELOG.md)
- [Commits](https://github.com/elixir-cldr/cldr_units/commits/v3.16.3)

---
updated-dependencies:
- dependency-name: ex_cldr_units
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 mix.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/mix.lock b/mix.lock
index 2ed2ed4fa812..d68e1450d98b 100644
--- a/mix.lock
+++ b/mix.lock
@@ -36,7 +36,7 @@
   "deep_merge": {:hex, :deep_merge, "1.0.0", "b4aa1a0d1acac393bdf38b2291af38cb1d4a52806cf7a4906f718e1feb5ee961", [:mix], [], "hexpm", "ce708e5f094b9cd4e8f2be4f00d2f4250c4095be93f8cd6d018c753894885430"},
   "dialyxir": {:hex, :dialyxir, "1.4.1", "a22ed1e7bd3a3e3f197b68d806ef66acb61ee8f57b3ac85fc5d57354c5482a93", [:mix], [{:erlex, ">= 0.2.6", [hex: :erlex, repo: "hexpm", optional: false]}], "hexpm", "84b795d6d7796297cca5a3118444b80c7d94f7ce247d49886e7c291e1ae49801"},
   "digital_token": {:hex, :digital_token, "0.6.0", "13e6de581f0b1f6c686f7c7d12ab11a84a7b22fa79adeb4b50eec1a2d278d258", [:mix], [{:cldr_utils, "~> 2.17", [hex: :cldr_utils, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}], "hexpm", "2455d626e7c61a128b02a4a8caddb092548c3eb613ac6f6a85e4cbb6caddc4d1"},
-  "earmark_parser": {:hex, :earmark_parser, "1.4.33", "3c3fd9673bb5dcc9edc28dd90f50c87ce506d1f71b70e3de69aa8154bc695d44", [:mix], [], "hexpm", "2d526833729b59b9fdb85785078697c72ac5e5066350663e5be6a1182da61b8f"},
+  "earmark_parser": {:hex, :earmark_parser, "1.4.36", "487ea8ef9bdc659f085e6e654f3c3feea1d36ac3943edf9d2ef6c98de9174c13", [:mix], [], "hexpm", "a524e395634bdcf60a616efe77fd79561bec2e930d8b82745df06ab4e844400a"},
   "ecto": {:hex, :ecto, "3.10.3", "eb2ae2eecd210b4eb8bece1217b297ad4ff824b4384c0e3fdd28aaf96edd6135", [:mix], [{:decimal, "~> 1.6 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}, {:telemetry, "~> 0.4 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "44bec74e2364d491d70f7e42cd0d690922659d329f6465e89feb8a34e8cd3433"},
   "ecto_sql": {:hex, :ecto_sql, "3.10.2", "6b98b46534b5c2f8b8b5f03f126e75e2a73c64f3c071149d32987a5378b0fdbd", [:mix], [{:db_connection, "~> 2.5 or ~> 2.4.1", [hex: :db_connection, repo: "hexpm", optional: false]}, {:ecto, "~> 3.10.0", [hex: :ecto, repo: "hexpm", optional: false]}, {:myxql, "~> 0.6.0", [hex: :myxql, repo: "hexpm", optional: true]}, {:postgrex, "~> 0.16.0 or ~> 0.17.0 or ~> 1.0", [hex: :postgrex, repo: "hexpm", optional: true]}, {:tds, "~> 2.1.1 or ~> 2.2", [hex: :tds, repo: "hexpm", optional: true]}, {:telemetry, "~> 0.4.0 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "68c018debca57cb9235e3889affdaec7a10616a4e3a80c99fa1d01fdafaa9007"},
   "elixir_make": {:hex, :elixir_make, "0.7.7", "7128c60c2476019ed978210c245badf08b03dbec4f24d05790ef791da11aa17c", [:mix], [{:castore, "~> 0.1 or ~> 1.0", [hex: :castore, repo: "hexpm", optional: true]}], "hexpm", "5bc19fff950fad52bbe5f211b12db9ec82c6b34a9647da0c2224b8b8464c7e6c"},
@@ -44,9 +44,9 @@
   "ex_abi": {:hex, :ex_abi, "0.6.2", "a33d0df94efd54d6879d20ab8cb6561432f13cbb1e912801d2e97ef50f795e9d", [:mix], [{:ex_keccak, "~> 0.7.3", [hex: :ex_keccak, repo: "hexpm", optional: false]}, {:jason, "~> 1.4", [hex: :jason, repo: "hexpm", optional: false]}], "hexpm", "e901c580a2491b19a6c27891c6d40cd8fe41d996c8c2ec02d5dd4c5a86239bc6"},
   "ex_cldr": {:hex, :ex_cldr, "2.37.2", "c45041534ec60af367c4c1af02a608576118044fe3c441c782fd424061d6b517", [:mix], [{:cldr_utils, "~> 2.21", [hex: :cldr_utils, repo: "hexpm", optional: false]}, {:decimal, "~> 1.6 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: false]}, {:gettext, "~> 0.19", [hex: :gettext, repo: "hexpm", optional: true]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}, {:nimble_parsec, "~> 0.5 or ~> 1.0", [hex: :nimble_parsec, repo: "hexpm", optional: true]}], "hexpm", "c8467b1d5080716ace6621703b6656cb2f9545572a54b341da900791a0cf92ba"},
   "ex_cldr_currencies": {:hex, :ex_cldr_currencies, "2.15.0", "aadd34e91cfac7ef6b03fe8f47f8c6fa8c5daf3f89b5d9fee64ec545ded839cf", [:mix], [{:ex_cldr, "~> 2.34", [hex: :ex_cldr, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}], "hexpm", "0521316396c66877a2d636219767560bb2397c583341fcb154ecf9f3000e6ff8"},
-  "ex_cldr_lists": {:hex, :ex_cldr_lists, "2.10.0", "4d4c9877da2d0417fd832907d69974e8328969f75fafc79b05ccf85f549f6281", [:mix], [{:ex_cldr_numbers, "~> 2.25", [hex: :ex_cldr_numbers, repo: "hexpm", optional: false]}, {:ex_doc, "~> 0.18", [hex: :ex_doc, repo: "hexpm", optional: true]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}], "hexpm", "adc040cde7b97f7fd7c0b35dd69ddb6fcf607303ae6355bb1851deae1f8b0652"},
+  "ex_cldr_lists": {:hex, :ex_cldr_lists, "2.10.1", "67795eb28f8534a36cbdfeeaea6d3ee587eeac7eafff71968dd046c215d4ec42", [:mix], [{:ex_cldr_numbers, "~> 2.25", [hex: :ex_cldr_numbers, repo: "hexpm", optional: false]}, {:ex_doc, "~> 0.18", [hex: :ex_doc, repo: "hexpm", optional: true]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}], "hexpm", "da826148d95c7a1889fd847ae5704c141747bad43a5a44431ae97bced57b0f93"},
   "ex_cldr_numbers": {:hex, :ex_cldr_numbers, "2.32.2", "5e0e3031d3f54b51fe7078a7a94592987b70b06d631bdc88813b222dc5a8b1bd", [:mix], [{:decimal, "~> 1.6 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: false]}, {:digital_token, "~> 0.3 or ~> 1.0", [hex: :digital_token, repo: "hexpm", optional: false]}, {:ex_cldr, "~> 2.37", [hex: :ex_cldr, repo: "hexpm", optional: false]}, {:ex_cldr_currencies, ">= 2.14.2", [hex: :ex_cldr_currencies, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}], "hexpm", "91257684a9c4d6abdf738f0cc5671837de876e69552e8bd4bc5fa1bfd5817713"},
-  "ex_cldr_units": {:hex, :ex_cldr_units, "3.16.2", "dbad303fba819981c578234e2aaf19d72efca16ea8b1c6ee46b26232cb45e232", [:mix], [{:cldr_utils, "~> 2.24", [hex: :cldr_utils, repo: "hexpm", optional: false]}, {:decimal, "~> 1.6 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: false]}, {:ex_cldr_lists, "~> 2.10", [hex: :ex_cldr_lists, repo: "hexpm", optional: false]}, {:ex_cldr_numbers, "~> 2.31", [hex: :ex_cldr_numbers, repo: "hexpm", optional: false]}, {:ex_doc, "~> 0.18", [hex: :ex_doc, repo: "hexpm", optional: true]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}], "hexpm", "851095319fb3205c1549619da742cd53a2804c1d9c204cf84014021e2a6ea7e5"},
+  "ex_cldr_units": {:hex, :ex_cldr_units, "3.16.3", "41344ed9f6d5c69baeb4d13dadc80310ca511626f738af2e69ae53dd40fb28a5", [:mix], [{:cldr_utils, "~> 2.24", [hex: :cldr_utils, repo: "hexpm", optional: false]}, {:decimal, "~> 1.6 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: false]}, {:ex_cldr_lists, "~> 2.10", [hex: :ex_cldr_lists, repo: "hexpm", optional: false]}, {:ex_cldr_numbers, "~> 2.31", [hex: :ex_cldr_numbers, repo: "hexpm", optional: false]}, {:ex_doc, "~> 0.18", [hex: :ex_doc, repo: "hexpm", optional: true]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}], "hexpm", "889dd56084821723ce82c4639d62cfc3513a9ca1ffb9063bcc83e7b3de5bc35b"},
   "ex_doc": {:hex, :ex_doc, "0.30.6", "5f8b54854b240a2b55c9734c4b1d0dd7bdd41f71a095d42a70445c03cf05a281", [:mix], [{:earmark_parser, "~> 1.4.31", [hex: :earmark_parser, repo: "hexpm", optional: false]}, {:makeup_elixir, "~> 0.14", [hex: :makeup_elixir, repo: "hexpm", optional: false]}, {:makeup_erlang, "~> 0.1", [hex: :makeup_erlang, repo: "hexpm", optional: false]}], "hexpm", "bd48f2ddacf4e482c727f9293d9498e0881597eae6ddc3d9562bd7923375109f"},
   "ex_json_schema": {:hex, :ex_json_schema, "0.10.1", "e03b746b6675a750c0bb1a5cc919f61353f7ab8450977e11ceede20e6180c560", [:mix], [{:decimal, "~> 2.0", [hex: :decimal, repo: "hexpm", optional: false]}], "hexpm", "66a64e60dadad89914d92f89c7e7906c57de75a8b79ac2480d0d53e1b8096fb0"},
   "ex_keccak": {:hex, :ex_keccak, "0.7.3", "33298f97159f6b0acd28f6e96ce5ea975a0f4a19f85fe615b4f4579b88b24d06", [:mix], [{:rustler, ">= 0.0.0", [hex: :rustler, repo: "hexpm", optional: true]}, {:rustler_precompiled, "~> 0.6.1", [hex: :rustler_precompiled, repo: "hexpm", optional: false]}], "hexpm", "4c5e6d9d5f77b64ab48769a0166a9814180d40ced68ed74ce60a5174ab55b3fc"},

From 35cd3cbb37d89f1e24ad3248943349ed9c9e83f5 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 25 Sep 2023 18:46:09 +0000
Subject: [PATCH 437/909] Bump eslint from 8.49.0 to 8.50.0 in
 /apps/block_scout_web/assets

Bumps [eslint](https://github.com/eslint/eslint) from 8.49.0 to 8.50.0.
- [Release notes](https://github.com/eslint/eslint/releases)
- [Changelog](https://github.com/eslint/eslint/blob/main/CHANGELOG.md)
- [Commits](https://github.com/eslint/eslint/compare/v8.49.0...v8.50.0)

---
updated-dependencies:
- dependency-name: eslint
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 apps/block_scout_web/assets/package-lock.json | 30 +++++++++----------
 apps/block_scout_web/assets/package.json      |  2 +-
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/apps/block_scout_web/assets/package-lock.json b/apps/block_scout_web/assets/package-lock.json
index 5a24c565ee7a..9def044259bc 100644
--- a/apps/block_scout_web/assets/package-lock.json
+++ b/apps/block_scout_web/assets/package-lock.json
@@ -78,7 +78,7 @@
         "copy-webpack-plugin": "^11.0.0",
         "css-loader": "^5.2.7",
         "css-minimizer-webpack-plugin": "^5.0.1",
-        "eslint": "^8.49.0",
+        "eslint": "^8.50.0",
         "eslint-config-standard": "^17.1.0",
         "eslint-plugin-import": "^2.28.1",
         "eslint-plugin-node": "^11.1.0",
@@ -2101,9 +2101,9 @@
       }
     },
     "node_modules/@eslint/js": {
-      "version": "8.49.0",
-      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.49.0.tgz",
-      "integrity": "sha512-1S8uAY/MTJqVx0SC4epBq+N2yhuwtNwLbJYNZyhL2pO1ZVKn5HFXav5T41Ryzy9K9V7ZId2JB2oy/W4aCd9/2w==",
+      "version": "8.50.0",
+      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.50.0.tgz",
+      "integrity": "sha512-NCC3zz2+nvYd+Ckfh87rA47zfu2QsQpvc6k1yzTk+b9KzRj0wkGa8LSoGOXN6Zv4lRf/EIoZ80biDh9HOI+RNQ==",
       "dev": true,
       "engines": {
         "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
@@ -7190,15 +7190,15 @@
       }
     },
     "node_modules/eslint": {
-      "version": "8.49.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.49.0.tgz",
-      "integrity": "sha512-jw03ENfm6VJI0jA9U+8H5zfl5b+FvuU3YYvZRdZHOlU2ggJkxrlkJH4HcDrZpj6YwD8kuYqvQM8LyesoazrSOQ==",
+      "version": "8.50.0",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.50.0.tgz",
+      "integrity": "sha512-FOnOGSuFuFLv/Sa+FDVRZl4GGVAAFFi8LecRsI5a1tMO5HIE8nCm4ivAlzt4dT3ol/PaaGC0rJEEXQmHJBGoOg==",
       "dev": true,
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.2.0",
         "@eslint-community/regexpp": "^4.6.1",
         "@eslint/eslintrc": "^2.1.2",
-        "@eslint/js": "8.49.0",
+        "@eslint/js": "8.50.0",
         "@humanwhocodes/config-array": "^0.11.11",
         "@humanwhocodes/module-importer": "^1.0.1",
         "@nodelib/fs.walk": "^1.2.8",
@@ -19112,9 +19112,9 @@
       }
     },
     "@eslint/js": {
-      "version": "8.49.0",
-      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.49.0.tgz",
-      "integrity": "sha512-1S8uAY/MTJqVx0SC4epBq+N2yhuwtNwLbJYNZyhL2pO1ZVKn5HFXav5T41Ryzy9K9V7ZId2JB2oy/W4aCd9/2w==",
+      "version": "8.50.0",
+      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.50.0.tgz",
+      "integrity": "sha512-NCC3zz2+nvYd+Ckfh87rA47zfu2QsQpvc6k1yzTk+b9KzRj0wkGa8LSoGOXN6Zv4lRf/EIoZ80biDh9HOI+RNQ==",
       "dev": true
     },
     "@ethereumjs/common": {
@@ -23001,15 +23001,15 @@
       }
     },
     "eslint": {
-      "version": "8.49.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.49.0.tgz",
-      "integrity": "sha512-jw03ENfm6VJI0jA9U+8H5zfl5b+FvuU3YYvZRdZHOlU2ggJkxrlkJH4HcDrZpj6YwD8kuYqvQM8LyesoazrSOQ==",
+      "version": "8.50.0",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.50.0.tgz",
+      "integrity": "sha512-FOnOGSuFuFLv/Sa+FDVRZl4GGVAAFFi8LecRsI5a1tMO5HIE8nCm4ivAlzt4dT3ol/PaaGC0rJEEXQmHJBGoOg==",
       "dev": true,
       "requires": {
         "@eslint-community/eslint-utils": "^4.2.0",
         "@eslint-community/regexpp": "^4.6.1",
         "@eslint/eslintrc": "^2.1.2",
-        "@eslint/js": "8.49.0",
+        "@eslint/js": "8.50.0",
         "@humanwhocodes/config-array": "^0.11.11",
         "@humanwhocodes/module-importer": "^1.0.1",
         "@nodelib/fs.walk": "^1.2.8",
diff --git a/apps/block_scout_web/assets/package.json b/apps/block_scout_web/assets/package.json
index 3f5de715aafd..fc5678e9ebc2 100644
--- a/apps/block_scout_web/assets/package.json
+++ b/apps/block_scout_web/assets/package.json
@@ -90,7 +90,7 @@
     "copy-webpack-plugin": "^11.0.0",
     "css-loader": "^5.2.7",
     "css-minimizer-webpack-plugin": "^5.0.1",
-    "eslint": "^8.49.0",
+    "eslint": "^8.50.0",
     "eslint-config-standard": "^17.1.0",
     "eslint-plugin-import": "^2.28.1",
     "eslint-plugin-node": "^11.1.0",

From 194bfbf7e93a3a6167031487f4532b94c1ab95e9 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 25 Sep 2023 18:46:48 +0000
Subject: [PATCH 438/909] Bump sweetalert2 from 11.7.28 to 11.7.29 in
 /apps/block_scout_web/assets

Bumps [sweetalert2](https://github.com/sweetalert2/sweetalert2) from 11.7.28 to 11.7.29.
- [Release notes](https://github.com/sweetalert2/sweetalert2/releases)
- [Changelog](https://github.com/sweetalert2/sweetalert2/blob/main/CHANGELOG.md)
- [Commits](https://github.com/sweetalert2/sweetalert2/compare/v11.7.28...v11.7.29)

---
updated-dependencies:
- dependency-name: sweetalert2
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 apps/block_scout_web/assets/package-lock.json | 14 +++++++-------
 apps/block_scout_web/assets/package.json      |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/apps/block_scout_web/assets/package-lock.json b/apps/block_scout_web/assets/package-lock.json
index 5a24c565ee7a..f75b0982ae12 100644
--- a/apps/block_scout_web/assets/package-lock.json
+++ b/apps/block_scout_web/assets/package-lock.json
@@ -61,7 +61,7 @@
         "redux": "^4.2.1",
         "stream-browserify": "^3.0.0",
         "stream-http": "^3.1.1",
-        "sweetalert2": "^11.7.28",
+        "sweetalert2": "^11.7.29",
         "urijs": "^1.19.11",
         "url": "^0.11.3",
         "util": "^0.12.5",
@@ -15937,9 +15937,9 @@
       }
     },
     "node_modules/sweetalert2": {
-      "version": "11.7.28",
-      "resolved": "https://registry.npmjs.org/sweetalert2/-/sweetalert2-11.7.28.tgz",
-      "integrity": "sha512-9895DVuYTDlV4Hx4IJablFKMdSqzwpy0PKycztbO4cXnOeVMmw55weOq4gcZAh3/tAyunCKjApFDrlSAcswwcA==",
+      "version": "11.7.29",
+      "resolved": "https://registry.npmjs.org/sweetalert2/-/sweetalert2-11.7.29.tgz",
+      "integrity": "sha512-oXl//RcQGDWUZqU3fB6zq4qjHQYelIQ9FaJWucsH2tNkN9YGfk0XCAa836rfnV9mNOsaI18gWgIn0NFp0iXAcw==",
       "funding": {
         "type": "individual",
         "url": "https://github.com/sponsors/limonte"
@@ -29614,9 +29614,9 @@
       }
     },
     "sweetalert2": {
-      "version": "11.7.28",
-      "resolved": "https://registry.npmjs.org/sweetalert2/-/sweetalert2-11.7.28.tgz",
-      "integrity": "sha512-9895DVuYTDlV4Hx4IJablFKMdSqzwpy0PKycztbO4cXnOeVMmw55weOq4gcZAh3/tAyunCKjApFDrlSAcswwcA=="
+      "version": "11.7.29",
+      "resolved": "https://registry.npmjs.org/sweetalert2/-/sweetalert2-11.7.29.tgz",
+      "integrity": "sha512-oXl//RcQGDWUZqU3fB6zq4qjHQYelIQ9FaJWucsH2tNkN9YGfk0XCAa836rfnV9mNOsaI18gWgIn0NFp0iXAcw=="
     },
     "symbol-tree": {
       "version": "3.2.4",
diff --git a/apps/block_scout_web/assets/package.json b/apps/block_scout_web/assets/package.json
index 3f5de715aafd..2858c9bc631f 100644
--- a/apps/block_scout_web/assets/package.json
+++ b/apps/block_scout_web/assets/package.json
@@ -73,7 +73,7 @@
     "redux": "^4.2.1",
     "stream-browserify": "^3.0.0",
     "stream-http": "^3.1.1",
-    "sweetalert2": "^11.7.28",
+    "sweetalert2": "^11.7.29",
     "urijs": "^1.19.11",
     "url": "^0.11.3",
     "util": "^0.12.5",

From f8a1ff96232448cfacc8d4c18d0fc3b94edc9f32 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 25 Sep 2023 18:47:14 +0000
Subject: [PATCH 439/909] Bump @babel/core from 7.22.20 to 7.23.0 in
 /apps/block_scout_web/assets

Bumps [@babel/core](https://github.com/babel/babel/tree/HEAD/packages/babel-core) from 7.22.20 to 7.23.0.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/commits/v7.23.0/packages/babel-core)

---
updated-dependencies:
- dependency-name: "@babel/core"
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 apps/block_scout_web/assets/package-lock.json | 180 ++++++++++--------
 apps/block_scout_web/assets/package.json      |   2 +-
 2 files changed, 98 insertions(+), 84 deletions(-)

diff --git a/apps/block_scout_web/assets/package-lock.json b/apps/block_scout_web/assets/package-lock.json
index 5a24c565ee7a..c3fd23dd559c 100644
--- a/apps/block_scout_web/assets/package-lock.json
+++ b/apps/block_scout_web/assets/package-lock.json
@@ -71,7 +71,7 @@
         "xss": "^1.0.14"
       },
       "devDependencies": {
-        "@babel/core": "^7.22.20",
+        "@babel/core": "^7.23.0",
         "@babel/preset-env": "^7.22.20",
         "autoprefixer": "^10.4.16",
         "babel-loader": "^9.1.3",
@@ -249,21 +249,21 @@
       }
     },
     "node_modules/@babel/core": {
-      "version": "7.22.20",
-      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.22.20.tgz",
-      "integrity": "sha512-Y6jd1ahLubuYweD/zJH+vvOY141v4f9igNQAQ+MBgq9JlHS2iTsZKn1aMsb3vGccZsXI16VzTBw52Xx0DWmtnA==",
+      "version": "7.23.0",
+      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.23.0.tgz",
+      "integrity": "sha512-97z/ju/Jy1rZmDxybphrBuI+jtJjFVoz7Mr9yUQVVVi+DNZE333uFQeMOqcCIy1x3WYBIbWftUSLmbNXNT7qFQ==",
       "dependencies": {
         "@ampproject/remapping": "^2.2.0",
         "@babel/code-frame": "^7.22.13",
-        "@babel/generator": "^7.22.15",
+        "@babel/generator": "^7.23.0",
         "@babel/helper-compilation-targets": "^7.22.15",
-        "@babel/helper-module-transforms": "^7.22.20",
-        "@babel/helpers": "^7.22.15",
-        "@babel/parser": "^7.22.16",
+        "@babel/helper-module-transforms": "^7.23.0",
+        "@babel/helpers": "^7.23.0",
+        "@babel/parser": "^7.23.0",
         "@babel/template": "^7.22.15",
-        "@babel/traverse": "^7.22.20",
-        "@babel/types": "^7.22.19",
-        "convert-source-map": "^1.7.0",
+        "@babel/traverse": "^7.23.0",
+        "@babel/types": "^7.23.0",
+        "convert-source-map": "^2.0.0",
         "debug": "^4.1.0",
         "gensync": "^1.0.0-beta.2",
         "json5": "^2.2.3",
@@ -277,12 +277,17 @@
         "url": "https://opencollective.com/babel"
       }
     },
+    "node_modules/@babel/core/node_modules/convert-source-map": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-2.0.0.tgz",
+      "integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg=="
+    },
     "node_modules/@babel/generator": {
-      "version": "7.22.15",
-      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.22.15.tgz",
-      "integrity": "sha512-Zu9oWARBqeVOW0dZOjXc3JObrzuqothQ3y/n1kUtrjCoCPLkXUwMvOo/F/TCfoHMbWIFlWwpZtkZVb9ga4U2pA==",
+      "version": "7.23.0",
+      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.23.0.tgz",
+      "integrity": "sha512-lN85QRR+5IbYrMWM6Y4pE/noaQtg4pNiqeNGX60eqOfo6gtEj6uw/JagelB8vVztSd7R6M5n1+PQkDbHbBRU4g==",
       "dependencies": {
-        "@babel/types": "^7.22.15",
+        "@babel/types": "^7.23.0",
         "@jridgewell/gen-mapping": "^0.3.2",
         "@jridgewell/trace-mapping": "^0.3.17",
         "jsesc": "^2.5.1"
@@ -407,12 +412,12 @@
       }
     },
     "node_modules/@babel/helper-function-name": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.22.5.tgz",
-      "integrity": "sha512-wtHSq6jMRE3uF2otvfuD3DIvVhOsSNshQl0Qrd7qC9oQJzHvOL4qQXlQn2916+CXGywIjpGuIkoyZRRxHPiNQQ==",
+      "version": "7.23.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.23.0.tgz",
+      "integrity": "sha512-OErEqsrxjZTJciZ4Oo+eoZqeW9UIiOcuYKRJA4ZAgV9myA+pOXhhmpfNCKjEH/auVfEYVFJ6y1Tc4r0eIApqiw==",
       "dependencies": {
-        "@babel/template": "^7.22.5",
-        "@babel/types": "^7.22.5"
+        "@babel/template": "^7.22.15",
+        "@babel/types": "^7.23.0"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -453,9 +458,9 @@
       }
     },
     "node_modules/@babel/helper-module-transforms": {
-      "version": "7.22.20",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.22.20.tgz",
-      "integrity": "sha512-dLT7JVWIUUxKOs1UnJUBR3S70YK+pKX6AbJgB2vMIvEkZkrfJDbYDJesnPshtKV4LhDOR3Oc5YULeDizRek+5A==",
+      "version": "7.23.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.23.0.tgz",
+      "integrity": "sha512-WhDWw1tdrlT0gMgUJSlX0IQvoO1eN279zrAUbVB+KpV2c3Tylz8+GnKOLllCS6Z/iZQEyVYxhZVUdPTqs2YYPw==",
       "dependencies": {
         "@babel/helper-environment-visitor": "^7.22.20",
         "@babel/helper-module-imports": "^7.22.15",
@@ -597,13 +602,13 @@
       }
     },
     "node_modules/@babel/helpers": {
-      "version": "7.22.15",
-      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.22.15.tgz",
-      "integrity": "sha512-7pAjK0aSdxOwR+CcYAqgWOGy5dcfvzsTIfFTb2odQqW47MDfv14UaJDY6eng8ylM2EaeKXdxaSWESbkmaQHTmw==",
+      "version": "7.23.1",
+      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.23.1.tgz",
+      "integrity": "sha512-chNpneuK18yW5Oxsr+t553UZzzAs3aZnFm4bxhebsNTeshrC95yA7l5yl7GBAG+JG1rF0F7zzD2EixK9mWSDoA==",
       "dependencies": {
         "@babel/template": "^7.22.15",
-        "@babel/traverse": "^7.22.15",
-        "@babel/types": "^7.22.15"
+        "@babel/traverse": "^7.23.0",
+        "@babel/types": "^7.23.0"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -623,9 +628,9 @@
       }
     },
     "node_modules/@babel/parser": {
-      "version": "7.22.16",
-      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.22.16.tgz",
-      "integrity": "sha512-+gPfKv8UWeKKeJTUxe59+OobVcrYHETCsORl61EmSkmgymguYk/X5bp7GuUIXaFsc6y++v8ZxPsLSSuujqDphA==",
+      "version": "7.23.0",
+      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.23.0.tgz",
+      "integrity": "sha512-vvPKKdMemU85V9WE/l5wZEmImpCtLqbnTvqDS2U1fJ96KrxoW7KrXhNsNCblQlg8Ck4b85yxdTyelsMUgFUXiw==",
       "bin": {
         "parser": "bin/babel-parser.js"
       },
@@ -1938,18 +1943,18 @@
       }
     },
     "node_modules/@babel/traverse": {
-      "version": "7.22.20",
-      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.22.20.tgz",
-      "integrity": "sha512-eU260mPZbU7mZ0N+X10pxXhQFMGTeLb9eFS0mxehS8HZp9o1uSnFeWQuG1UPrlxgA7QoUzFhOnilHDp0AXCyHw==",
+      "version": "7.23.0",
+      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.23.0.tgz",
+      "integrity": "sha512-t/QaEvyIoIkwzpiZ7aoSKK8kObQYeF7T2v+dazAYCb8SXtp58zEVkWW7zAnju8FNKNdr4ScAOEDmMItbyOmEYw==",
       "dependencies": {
         "@babel/code-frame": "^7.22.13",
-        "@babel/generator": "^7.22.15",
+        "@babel/generator": "^7.23.0",
         "@babel/helper-environment-visitor": "^7.22.20",
-        "@babel/helper-function-name": "^7.22.5",
+        "@babel/helper-function-name": "^7.23.0",
         "@babel/helper-hoist-variables": "^7.22.5",
         "@babel/helper-split-export-declaration": "^7.22.6",
-        "@babel/parser": "^7.22.16",
-        "@babel/types": "^7.22.19",
+        "@babel/parser": "^7.23.0",
+        "@babel/types": "^7.23.0",
         "debug": "^4.1.0",
         "globals": "^11.1.0"
       },
@@ -1958,12 +1963,12 @@
       }
     },
     "node_modules/@babel/types": {
-      "version": "7.22.19",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.22.19.tgz",
-      "integrity": "sha512-P7LAw/LbojPzkgp5oznjE6tQEIWbp4PkkfrZDINTro9zgBRtI324/EYsiSI7lhPbpIQ+DCeR2NNmMWANGGfZsg==",
+      "version": "7.23.0",
+      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.23.0.tgz",
+      "integrity": "sha512-0oIyUfKoI3mSqMvsxBdclDwxXKXAUA8v/apZbc+iSyARYou1o8ZGDxbUYyLFoW2arqS2jDGqJuZvv1d/io1axg==",
       "dependencies": {
         "@babel/helper-string-parser": "^7.22.5",
-        "@babel/helper-validator-identifier": "^7.22.19",
+        "@babel/helper-validator-identifier": "^7.22.20",
         "to-fast-properties": "^2.0.0"
       },
       "engines": {
@@ -5759,6 +5764,7 @@
       "version": "1.8.0",
       "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.8.0.tgz",
       "integrity": "sha512-+OQdjP49zViI/6i7nIJpA8rAl4sV/JdPfU9nZs3VqOwGIgizICvuN2ru6fMd+4llL0tar18UYJXfZ/TWtmhUjA==",
+      "dev": true,
       "dependencies": {
         "safe-buffer": "~5.1.1"
       }
@@ -17822,33 +17828,40 @@
       "integrity": "sha512-BQYjKbpXjoXwFW5jGqiizJQQT/aC7pFm9Ok1OWssonuguICi264lbgMzRp2ZMmRSlfkX6DsWDDcsrctK8Rwfiw=="
     },
     "@babel/core": {
-      "version": "7.22.20",
-      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.22.20.tgz",
-      "integrity": "sha512-Y6jd1ahLubuYweD/zJH+vvOY141v4f9igNQAQ+MBgq9JlHS2iTsZKn1aMsb3vGccZsXI16VzTBw52Xx0DWmtnA==",
+      "version": "7.23.0",
+      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.23.0.tgz",
+      "integrity": "sha512-97z/ju/Jy1rZmDxybphrBuI+jtJjFVoz7Mr9yUQVVVi+DNZE333uFQeMOqcCIy1x3WYBIbWftUSLmbNXNT7qFQ==",
       "requires": {
         "@ampproject/remapping": "^2.2.0",
         "@babel/code-frame": "^7.22.13",
-        "@babel/generator": "^7.22.15",
+        "@babel/generator": "^7.23.0",
         "@babel/helper-compilation-targets": "^7.22.15",
-        "@babel/helper-module-transforms": "^7.22.20",
-        "@babel/helpers": "^7.22.15",
-        "@babel/parser": "^7.22.16",
+        "@babel/helper-module-transforms": "^7.23.0",
+        "@babel/helpers": "^7.23.0",
+        "@babel/parser": "^7.23.0",
         "@babel/template": "^7.22.15",
-        "@babel/traverse": "^7.22.20",
-        "@babel/types": "^7.22.19",
-        "convert-source-map": "^1.7.0",
+        "@babel/traverse": "^7.23.0",
+        "@babel/types": "^7.23.0",
+        "convert-source-map": "^2.0.0",
         "debug": "^4.1.0",
         "gensync": "^1.0.0-beta.2",
         "json5": "^2.2.3",
         "semver": "^6.3.1"
+      },
+      "dependencies": {
+        "convert-source-map": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-2.0.0.tgz",
+          "integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg=="
+        }
       }
     },
     "@babel/generator": {
-      "version": "7.22.15",
-      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.22.15.tgz",
-      "integrity": "sha512-Zu9oWARBqeVOW0dZOjXc3JObrzuqothQ3y/n1kUtrjCoCPLkXUwMvOo/F/TCfoHMbWIFlWwpZtkZVb9ga4U2pA==",
+      "version": "7.23.0",
+      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.23.0.tgz",
+      "integrity": "sha512-lN85QRR+5IbYrMWM6Y4pE/noaQtg4pNiqeNGX60eqOfo6gtEj6uw/JagelB8vVztSd7R6M5n1+PQkDbHbBRU4g==",
       "requires": {
-        "@babel/types": "^7.22.15",
+        "@babel/types": "^7.23.0",
         "@jridgewell/gen-mapping": "^0.3.2",
         "@jridgewell/trace-mapping": "^0.3.17",
         "jsesc": "^2.5.1"
@@ -17945,12 +17958,12 @@
       "integrity": "sha512-zfedSIzFhat/gFhWfHtgWvlec0nqB9YEIVrpuwjruLlXfUSnA8cJB0miHKwqDnQ7d32aKo2xt88/xZptwxbfhA=="
     },
     "@babel/helper-function-name": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.22.5.tgz",
-      "integrity": "sha512-wtHSq6jMRE3uF2otvfuD3DIvVhOsSNshQl0Qrd7qC9oQJzHvOL4qQXlQn2916+CXGywIjpGuIkoyZRRxHPiNQQ==",
+      "version": "7.23.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.23.0.tgz",
+      "integrity": "sha512-OErEqsrxjZTJciZ4Oo+eoZqeW9UIiOcuYKRJA4ZAgV9myA+pOXhhmpfNCKjEH/auVfEYVFJ6y1Tc4r0eIApqiw==",
       "requires": {
-        "@babel/template": "^7.22.5",
-        "@babel/types": "^7.22.5"
+        "@babel/template": "^7.22.15",
+        "@babel/types": "^7.23.0"
       }
     },
     "@babel/helper-hoist-variables": {
@@ -17979,9 +17992,9 @@
       }
     },
     "@babel/helper-module-transforms": {
-      "version": "7.22.20",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.22.20.tgz",
-      "integrity": "sha512-dLT7JVWIUUxKOs1UnJUBR3S70YK+pKX6AbJgB2vMIvEkZkrfJDbYDJesnPshtKV4LhDOR3Oc5YULeDizRek+5A==",
+      "version": "7.23.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.23.0.tgz",
+      "integrity": "sha512-WhDWw1tdrlT0gMgUJSlX0IQvoO1eN279zrAUbVB+KpV2c3Tylz8+GnKOLllCS6Z/iZQEyVYxhZVUdPTqs2YYPw==",
       "requires": {
         "@babel/helper-environment-visitor": "^7.22.20",
         "@babel/helper-module-imports": "^7.22.15",
@@ -18078,13 +18091,13 @@
       }
     },
     "@babel/helpers": {
-      "version": "7.22.15",
-      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.22.15.tgz",
-      "integrity": "sha512-7pAjK0aSdxOwR+CcYAqgWOGy5dcfvzsTIfFTb2odQqW47MDfv14UaJDY6eng8ylM2EaeKXdxaSWESbkmaQHTmw==",
+      "version": "7.23.1",
+      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.23.1.tgz",
+      "integrity": "sha512-chNpneuK18yW5Oxsr+t553UZzzAs3aZnFm4bxhebsNTeshrC95yA7l5yl7GBAG+JG1rF0F7zzD2EixK9mWSDoA==",
       "requires": {
         "@babel/template": "^7.22.15",
-        "@babel/traverse": "^7.22.15",
-        "@babel/types": "^7.22.15"
+        "@babel/traverse": "^7.23.0",
+        "@babel/types": "^7.23.0"
       }
     },
     "@babel/highlight": {
@@ -18098,9 +18111,9 @@
       }
     },
     "@babel/parser": {
-      "version": "7.22.16",
-      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.22.16.tgz",
-      "integrity": "sha512-+gPfKv8UWeKKeJTUxe59+OobVcrYHETCsORl61EmSkmgymguYk/X5bp7GuUIXaFsc6y++v8ZxPsLSSuujqDphA=="
+      "version": "7.23.0",
+      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.23.0.tgz",
+      "integrity": "sha512-vvPKKdMemU85V9WE/l5wZEmImpCtLqbnTvqDS2U1fJ96KrxoW7KrXhNsNCblQlg8Ck4b85yxdTyelsMUgFUXiw=="
     },
     "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": {
       "version": "7.22.15",
@@ -18986,29 +18999,29 @@
       }
     },
     "@babel/traverse": {
-      "version": "7.22.20",
-      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.22.20.tgz",
-      "integrity": "sha512-eU260mPZbU7mZ0N+X10pxXhQFMGTeLb9eFS0mxehS8HZp9o1uSnFeWQuG1UPrlxgA7QoUzFhOnilHDp0AXCyHw==",
+      "version": "7.23.0",
+      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.23.0.tgz",
+      "integrity": "sha512-t/QaEvyIoIkwzpiZ7aoSKK8kObQYeF7T2v+dazAYCb8SXtp58zEVkWW7zAnju8FNKNdr4ScAOEDmMItbyOmEYw==",
       "requires": {
         "@babel/code-frame": "^7.22.13",
-        "@babel/generator": "^7.22.15",
+        "@babel/generator": "^7.23.0",
         "@babel/helper-environment-visitor": "^7.22.20",
-        "@babel/helper-function-name": "^7.22.5",
+        "@babel/helper-function-name": "^7.23.0",
         "@babel/helper-hoist-variables": "^7.22.5",
         "@babel/helper-split-export-declaration": "^7.22.6",
-        "@babel/parser": "^7.22.16",
-        "@babel/types": "^7.22.19",
+        "@babel/parser": "^7.23.0",
+        "@babel/types": "^7.23.0",
         "debug": "^4.1.0",
         "globals": "^11.1.0"
       }
     },
     "@babel/types": {
-      "version": "7.22.19",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.22.19.tgz",
-      "integrity": "sha512-P7LAw/LbojPzkgp5oznjE6tQEIWbp4PkkfrZDINTro9zgBRtI324/EYsiSI7lhPbpIQ+DCeR2NNmMWANGGfZsg==",
+      "version": "7.23.0",
+      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.23.0.tgz",
+      "integrity": "sha512-0oIyUfKoI3mSqMvsxBdclDwxXKXAUA8v/apZbc+iSyARYou1o8ZGDxbUYyLFoW2arqS2jDGqJuZvv1d/io1axg==",
       "requires": {
         "@babel/helper-string-parser": "^7.22.5",
-        "@babel/helper-validator-identifier": "^7.22.19",
+        "@babel/helper-validator-identifier": "^7.22.20",
         "to-fast-properties": "^2.0.0"
       }
     },
@@ -21921,6 +21934,7 @@
       "version": "1.8.0",
       "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.8.0.tgz",
       "integrity": "sha512-+OQdjP49zViI/6i7nIJpA8rAl4sV/JdPfU9nZs3VqOwGIgizICvuN2ru6fMd+4llL0tar18UYJXfZ/TWtmhUjA==",
+      "dev": true,
       "requires": {
         "safe-buffer": "~5.1.1"
       }
diff --git a/apps/block_scout_web/assets/package.json b/apps/block_scout_web/assets/package.json
index 3f5de715aafd..2b1ae390193f 100644
--- a/apps/block_scout_web/assets/package.json
+++ b/apps/block_scout_web/assets/package.json
@@ -83,7 +83,7 @@
     "xss": "^1.0.14"
   },
   "devDependencies": {
-    "@babel/core": "^7.22.20",
+    "@babel/core": "^7.23.0",
     "@babel/preset-env": "^7.22.20",
     "autoprefixer": "^10.4.16",
     "babel-loader": "^9.1.3",

From ceb9bab651a921f7691de050602df45d23b6aee4 Mon Sep 17 00:00:00 2001
From: Nikita Pozdniakov <nikitosing4@mail.ru>
Date: Fri, 22 Sep 2023 14:29:43 +0300
Subject: [PATCH 440/909] Handle ':error.types/0 is undefined' error

---
 apps/explorer/lib/explorer/chain/transaction.ex | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/apps/explorer/lib/explorer/chain/transaction.ex b/apps/explorer/lib/explorer/chain/transaction.ex
index c40d87769f14..82967c0c0634 100644
--- a/apps/explorer/lib/explorer/chain/transaction.ex
+++ b/apps/explorer/lib/explorer/chain/transaction.ex
@@ -756,12 +756,12 @@ defmodule Explorer.Chain.Transaction do
   end
 
   defp find_and_decode(abi, data, hash) do
-    result =
-      abi
-      |> ABI.parse_specification()
-      |> ABI.find_and_decode(data)
-
-    {:ok, result}
+    with {%FunctionSelector{}, _mapping} = result <-
+           abi
+           |> ABI.parse_specification()
+           |> ABI.find_and_decode(data) do
+      {:ok, result}
+    end
   rescue
     e ->
       Logger.warn(fn ->

From 3d483fcdab61b01bfce8b1ef7a81ab0ea1d7647b Mon Sep 17 00:00:00 2001
From: Nikita Pozdniakov <nikitosing4@mail.ru>
Date: Fri, 22 Sep 2023 14:33:11 +0300
Subject: [PATCH 441/909] Changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 890e43e8a61e..12b41373fb44 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,7 @@
 
 ### Fixes
 
+- [#8515](https://github.com/blockscout/blockscout/pull/8515) - Fix `:error.types/0 is undefined` warning
 - [#7959](https://github.com/blockscout/blockscout/pull/7959) - Fix empty batch transfers handling
 - [#8513](https://github.com/blockscout/blockscout/pull/8513) - Don't override transaction status
 

From 71d5ab847768a05847013d006fbc884f11ac0721 Mon Sep 17 00:00:00 2001
From: Viktor Baranov <baranov.viktor.27@gmail.com>
Date: Tue, 26 Sep 2023 12:26:58 +0300
Subject: [PATCH 442/909] New issue template

---
 .github/ISSUE_TEMPLATE/bug_report.yml | 115 ++++++++++++++++++++++++++
 .github/ISSUE_TEMPLATE/config.yml     |  11 +++
 CHANGELOG.md                          |   1 +
 3 files changed, 127 insertions(+)
 create mode 100644 .github/ISSUE_TEMPLATE/bug_report.yml
 create mode 100644 .github/ISSUE_TEMPLATE/config.yml

diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
new file mode 100644
index 000000000000..f3545b6d54da
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -0,0 +1,115 @@
+name: Bug Report
+description: File a bug report
+labels: [ "triage" ]
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Thanks for reporting a bug 🐛!
+
+        Please search open/closed issues before submitting. Someone might have had the similar problem before 😉!
+
+  - type: textarea
+    id: description
+    attributes:
+      label: Description
+      description: A brief description of the issue.
+    validations:
+      required: true
+
+  - type: dropdown
+    id: installation-type
+    attributes:
+      label: Type of the installation
+      description: How the application has been deployed.
+    options:
+        - Docker-compose
+        - Manual from the source code
+        - Helm charts
+        - Docker
+    validations:
+      required: true
+
+  - type: dropdown
+    id: archive-node-type
+    attributes:
+      label: Type of the JSON RPC archive node
+      description: Which type of archive node is used.
+    options:
+        - Erigon
+        - Geth
+        - Nethermind
+        - Reth
+        - PolygonEdge
+        - Besu
+        - OpenEthereum
+        - Other
+    validations:
+      required: true
+
+  - type: dropdown
+    id: chain-type
+    attributes:
+      label: Type of the chain
+      description: Type of the chain.
+    options:
+        - L1
+        - L2
+        - Other
+
+  - type: input
+    id: link
+    attributes:
+      label: Link to the page
+      description: The link to the page where the issue occurs.
+      placeholder: https://eth.blockscout.com
+  
+  - type: textarea
+    id: steps
+    attributes:
+      label: Steps to reproduce
+      description: |
+        Explain how to reproduce the issue in the development environment.
+
+  - type: input
+    id: backend-version
+    attributes:
+      label: Backend version
+      description: The release version of the backend or branch/commit.
+      placeholder: v5.2.3
+    validations:
+      required: true
+
+  - type: input
+    id: frontend-version
+    attributes:
+      label: Frontend version
+      description: The release version of the frontend or branch/commit.
+      placeholder: v1.11.1
+
+  - type: input
+    id: elixir-version
+    attributes:
+      label: Elixir & Erlang/OTP versions
+      description: Elixir & Erlang/OTP versions.
+      placeholder: Elixir 1.14.5 (compiled with Erlang/OTP 25)
+    validations:
+      required: true
+
+  - type: dropdown
+    id: operating-system
+    attributes:
+      label: Operating system
+      description: The operating system this issue occurred with.
+      options:
+        - macOS
+        - Windows
+        - Linux
+        - Other
+
+  - type: textarea
+    id: additional-information
+    attributes:
+      label: Additional information
+      description: |
+        Use this section to provide any additional information you might have (e.g screenshots or screencasts).
\ No newline at end of file
diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
new file mode 100644
index 000000000000..e72f610f24bb
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -0,0 +1,11 @@
+blank_issues_enabled: true
+contact_links:
+  - name: Feature Request
+    url: https://blockscout.canny.io/feature-requests
+    about: Request a feature or enhancement
+  - name: Ask a question
+    url: https://github.com/orgs/blockscout/discussions
+    about: Ask questions and discuss topics with other community members
+  - name: Join our Discord Server
+    url: https://discord.gg/blockscout
+    about: The official Blockscout Discord community
\ No newline at end of file
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 12b41373fb44..a2264c17d3a0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -15,6 +15,7 @@
 
 ### Chore
 
+- [#8536](https://github.com/blockscout/blockscout/pull/8536) - New issue template
 - [#8529](https://github.com/blockscout/blockscout/pull/8529) - Move PolygonEdge-related migration to the corresponding ecto repository
 - [#8504](https://github.com/blockscout/blockscout/pull/8504) - Deploy new UI through Makefile
 - [#8501](https://github.com/blockscout/blockscout/pull/8501) - Conceal secondary ports in docker compose setup

From 1d43bb7dc2e5fa8078e60091c231034e16daed33 Mon Sep 17 00:00:00 2001
From: Viktor Baranov <baranov.viktor.27@gmail.com>
Date: Tue, 26 Sep 2023 13:11:56 +0300
Subject: [PATCH 443/909] Fix issue template

---
 .github/ISSUE_TEMPLATE/bug_report.yml | 36 +++++++++++++--------------
 CHANGELOG.md                          |  2 +-
 ISSUE_TEMPLATE.md                     | 22 ----------------
 3 files changed, 19 insertions(+), 41 deletions(-)
 delete mode 100644 ISSUE_TEMPLATE.md

diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
index f3545b6d54da..8f563f127a40 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -22,11 +22,11 @@ body:
     attributes:
       label: Type of the installation
       description: How the application has been deployed.
-    options:
-        - Docker-compose
-        - Manual from the source code
-        - Helm charts
-        - Docker
+      options:
+          - Docker-compose
+          - Manual from the source code
+          - Helm charts
+          - Docker
     validations:
       required: true
 
@@ -35,15 +35,15 @@ body:
     attributes:
       label: Type of the JSON RPC archive node
       description: Which type of archive node is used.
-    options:
-        - Erigon
-        - Geth
-        - Nethermind
-        - Reth
-        - PolygonEdge
-        - Besu
-        - OpenEthereum
-        - Other
+      options:
+          - Erigon
+          - Geth
+          - Nethermind
+          - Reth
+          - PolygonEdge
+          - Besu
+          - OpenEthereum
+          - Other
     validations:
       required: true
 
@@ -52,10 +52,10 @@ body:
     attributes:
       label: Type of the chain
       description: Type of the chain.
-    options:
-        - L1
-        - L2
-        - Other
+      options:
+          - L1
+          - L2
+          - Other
 
   - type: input
     id: link
diff --git a/CHANGELOG.md b/CHANGELOG.md
index a2264c17d3a0..20262f45c04f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -15,7 +15,7 @@
 
 ### Chore
 
-- [#8536](https://github.com/blockscout/blockscout/pull/8536) - New issue template
+- [#8536](https://github.com/blockscout/blockscout/pull/8536), [#8537](https://github.com/blockscout/blockscout/pull/8537) - New issue template
 - [#8529](https://github.com/blockscout/blockscout/pull/8529) - Move PolygonEdge-related migration to the corresponding ecto repository
 - [#8504](https://github.com/blockscout/blockscout/pull/8504) - Deploy new UI through Makefile
 - [#8501](https://github.com/blockscout/blockscout/pull/8501) - Conceal secondary ports in docker compose setup
diff --git a/ISSUE_TEMPLATE.md b/ISSUE_TEMPLATE.md
deleted file mode 100644
index 1e5bff013634..000000000000
--- a/ISSUE_TEMPLATE.md
+++ /dev/null
@@ -1,22 +0,0 @@
-*Describe your issue here.*
-
-### Environment
-
-* Deployment type (Manual/Docker/Docker-compose):
-* Elixir & Erlang/OTP versions (`elixir -version`):
-* Node JS version (`node -v`):
-* Operating System:
-* Blockscout Version/branch/commit:
-* Archive node type && version (Erigon/Geth/Nethermind/Ganache/?):
-
-### Steps to reproduce
-
-*Tell us how to reproduce this issue.  ❤️ if you can push up a branch to your fork with a regression test we can run to reproduce locally.*
-
-### Expected behaviour
-
-*Tell us what should happen.*
-
-### Actual behaviour
-
-*Tell us what happens instead.*

From ab05ca165b4fcab95c3b9e6c20699100919bf088 Mon Sep 17 00:00:00 2001
From: Viktor Baranov <baranov.viktor.27@gmail.com>
Date: Tue, 26 Sep 2023 13:59:13 +0300
Subject: [PATCH 444/909] Disable blank issues creation

---
 .github/ISSUE_TEMPLATE/config.yml | 2 +-
 CHANGELOG.md                      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
index e72f610f24bb..439bca677db3 100644
--- a/.github/ISSUE_TEMPLATE/config.yml
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -1,4 +1,4 @@
-blank_issues_enabled: true
+blank_issues_enabled: false
 contact_links:
   - name: Feature Request
     url: https://blockscout.canny.io/feature-requests
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 20262f45c04f..1ce93962006f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -15,7 +15,7 @@
 
 ### Chore
 
-- [#8536](https://github.com/blockscout/blockscout/pull/8536), [#8537](https://github.com/blockscout/blockscout/pull/8537) - New issue template
+- [#8536](https://github.com/blockscout/blockscout/pull/8536), [#8537](https://github.com/blockscout/blockscout/pull/8537), [#8540](https://github.com/blockscout/blockscout/pull/8540) - New issue template
 - [#8529](https://github.com/blockscout/blockscout/pull/8529) - Move PolygonEdge-related migration to the corresponding ecto repository
 - [#8504](https://github.com/blockscout/blockscout/pull/8504) - Deploy new UI through Makefile
 - [#8501](https://github.com/blockscout/blockscout/pull/8501) - Conceal secondary ports in docker compose setup

From f854ebab43188a63514183831b5ded521af8f849 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 26 Sep 2023 18:24:55 +0000
Subject: [PATCH 445/909] Bump sweetalert2 from 11.7.29 to 11.7.31 in
 /apps/block_scout_web/assets

Bumps [sweetalert2](https://github.com/sweetalert2/sweetalert2) from 11.7.29 to 11.7.31.
- [Release notes](https://github.com/sweetalert2/sweetalert2/releases)
- [Changelog](https://github.com/sweetalert2/sweetalert2/blob/main/CHANGELOG.md)
- [Commits](https://github.com/sweetalert2/sweetalert2/compare/v11.7.29...v11.7.31)

---
updated-dependencies:
- dependency-name: sweetalert2
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 apps/block_scout_web/assets/package-lock.json | 14 +++++++-------
 apps/block_scout_web/assets/package.json      |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/apps/block_scout_web/assets/package-lock.json b/apps/block_scout_web/assets/package-lock.json
index 169345582b10..4a7e289372d2 100644
--- a/apps/block_scout_web/assets/package-lock.json
+++ b/apps/block_scout_web/assets/package-lock.json
@@ -61,7 +61,7 @@
         "redux": "^4.2.1",
         "stream-browserify": "^3.0.0",
         "stream-http": "^3.1.1",
-        "sweetalert2": "^11.7.29",
+        "sweetalert2": "^11.7.31",
         "urijs": "^1.19.11",
         "url": "^0.11.3",
         "util": "^0.12.5",
@@ -15943,9 +15943,9 @@
       }
     },
     "node_modules/sweetalert2": {
-      "version": "11.7.29",
-      "resolved": "https://registry.npmjs.org/sweetalert2/-/sweetalert2-11.7.29.tgz",
-      "integrity": "sha512-oXl//RcQGDWUZqU3fB6zq4qjHQYelIQ9FaJWucsH2tNkN9YGfk0XCAa836rfnV9mNOsaI18gWgIn0NFp0iXAcw==",
+      "version": "11.7.31",
+      "resolved": "https://registry.npmjs.org/sweetalert2/-/sweetalert2-11.7.31.tgz",
+      "integrity": "sha512-AVNODg41LqhC241UHTanW2ZQdh0ziiw+Gc3Dmy1EuCFP+g09P3mBEhvauU88J3JLEX6UpTfhp7iok9t8uhEdQQ==",
       "funding": {
         "type": "individual",
         "url": "https://github.com/sponsors/limonte"
@@ -29628,9 +29628,9 @@
       }
     },
     "sweetalert2": {
-      "version": "11.7.29",
-      "resolved": "https://registry.npmjs.org/sweetalert2/-/sweetalert2-11.7.29.tgz",
-      "integrity": "sha512-oXl//RcQGDWUZqU3fB6zq4qjHQYelIQ9FaJWucsH2tNkN9YGfk0XCAa836rfnV9mNOsaI18gWgIn0NFp0iXAcw=="
+      "version": "11.7.31",
+      "resolved": "https://registry.npmjs.org/sweetalert2/-/sweetalert2-11.7.31.tgz",
+      "integrity": "sha512-AVNODg41LqhC241UHTanW2ZQdh0ziiw+Gc3Dmy1EuCFP+g09P3mBEhvauU88J3JLEX6UpTfhp7iok9t8uhEdQQ=="
     },
     "symbol-tree": {
       "version": "3.2.4",
diff --git a/apps/block_scout_web/assets/package.json b/apps/block_scout_web/assets/package.json
index 9f2a5e9f0ad8..beeae5ef9b42 100644
--- a/apps/block_scout_web/assets/package.json
+++ b/apps/block_scout_web/assets/package.json
@@ -73,7 +73,7 @@
     "redux": "^4.2.1",
     "stream-browserify": "^3.0.0",
     "stream-http": "^3.1.1",
-    "sweetalert2": "^11.7.29",
+    "sweetalert2": "^11.7.31",
     "urijs": "^1.19.11",
     "url": "^0.11.3",
     "util": "^0.12.5",

From 1f0c46d97bc9525a72731eeced84eb347db88127 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 26 Sep 2023 19:03:44 +0000
Subject: [PATCH 446/909] Bump briefly from `678a376` to `51dfe7f`

Bumps [briefly](https://github.com/CargoSense/briefly) from `678a376` to `51dfe7f`.
- [Release notes](https://github.com/CargoSense/briefly/releases)
- [Commits](https://github.com/CargoSense/briefly/compare/678a3763e72a7d1f23ac71b209b96bd199bffbbb...51dfe7fbe0f897ea2a921d9af120762392aca6a1)

---
updated-dependencies:
- dependency-name: briefly
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 mix.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mix.lock b/mix.lock
index d68e1450d98b..58711856c2ce 100644
--- a/mix.lock
+++ b/mix.lock
@@ -8,7 +8,7 @@
   "bcrypt_elixir": {:hex, :bcrypt_elixir, "3.1.0", "0b110a9a6c619b19a7f73fa3004aa11d6e719a67e672d1633dc36b6b2290a0f7", [:make, :mix], [{:comeonin, "~> 5.3", [hex: :comeonin, repo: "hexpm", optional: false]}, {:elixir_make, "~> 0.6", [hex: :elixir_make, repo: "hexpm", optional: false]}], "hexpm", "2ad2acb5a8bc049e8d5aa267802631912bb80d5f4110a178ae7999e69dca1bf7"},
   "benchee": {:hex, :benchee, "1.1.0", "f3a43817209a92a1fade36ef36b86e1052627fd8934a8b937ac9ab3a76c43062", [:mix], [{:deep_merge, "~> 1.0", [hex: :deep_merge, repo: "hexpm", optional: false]}, {:statistex, "~> 1.0", [hex: :statistex, repo: "hexpm", optional: false]}], "hexpm", "7da57d545003165a012b587077f6ba90b89210fd88074ce3c60ce239eb5e6d93"},
   "benchee_csv": {:hex, :benchee_csv, "1.0.0", "0b3b9223290bfcb8003552705bec9bcf1a89b4a83b70bd686e45295c264f3d16", [:mix], [{:benchee, ">= 0.99.0 and < 2.0.0", [hex: :benchee, repo: "hexpm", optional: false]}, {:csv, "~> 2.0", [hex: :csv, repo: "hexpm", optional: false]}], "hexpm", "cdefb804c021dcf7a99199492026584be9b5a21d6644ac0d01c81c5d97c520d5"},
-  "briefly": {:git, "https://github.com/CargoSense/briefly.git", "678a3763e72a7d1f23ac71b209b96bd199bffbbb", []},
+  "briefly": {:git, "https://github.com/CargoSense/briefly.git", "51dfe7fbe0f897ea2a921d9af120762392aca6a1", []},
   "bunt": {:hex, :bunt, "0.2.1", "e2d4792f7bc0ced7583ab54922808919518d0e57ee162901a16a1b6664ef3b14", [:mix], [], "hexpm", "a330bfb4245239787b15005e66ae6845c9cd524a288f0d141c148b02603777a5"},
   "bureaucrat": {:hex, :bureaucrat, "0.2.9", "d98e4d2b9bdbf22e4a45c2113ce8b38b5b63278506c6ff918e3b943a4355d85b", [:mix], [{:inflex, ">= 1.10.0", [hex: :inflex, repo: "hexpm", optional: false]}, {:phoenix, ">= 1.2.0", [hex: :phoenix, repo: "hexpm", optional: true]}, {:plug, ">= 1.0.0", [hex: :plug, repo: "hexpm", optional: false]}, {:poison, "~> 1.5 or ~> 2.0 or ~> 3.0 or ~> 4.0", [hex: :poison, repo: "hexpm", optional: true]}], "hexpm", "111c8dd84382a62e1026ae011d592ceee918553e5203fe8448d9ba6ccbdfff7d"},
   "bypass": {:hex, :bypass, "2.1.0", "909782781bf8e20ee86a9cabde36b259d44af8b9f38756173e8f5e2e1fabb9b1", [:mix], [{:plug, "~> 1.7", [hex: :plug, repo: "hexpm", optional: false]}, {:plug_cowboy, "~> 2.0", [hex: :plug_cowboy, repo: "hexpm", optional: false]}, {:ranch, "~> 1.3", [hex: :ranch, repo: "hexpm", optional: false]}], "hexpm", "d9b5df8fa5b7a6efa08384e9bbecfe4ce61c77d28a4282f79e02f1ef78d96b80"},

From 2e8d9060c5dd9a6522d64c9eb6c165df392a3a9b Mon Sep 17 00:00:00 2001
From: nikitosing <32202610+nikitosing@users.noreply.github.com>
Date: Wed, 27 Sep 2023 14:19:17 +0300
Subject: [PATCH 447/909] Add block_type to search results (#8530)

* Add block_type to search results

* Changelog
---
 CHANGELOG.md                                  |  1 +
 .../views/api/v2/search_view.ex               | 22 ++++++++++--
 .../api/v2/search_controller_test.exs         | 36 +++++++++++++++++++
 3 files changed, 57 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1ce93962006f..120b6f856d56 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,7 @@
 
 ### Features
 
+- [#8530](https://github.com/blockscout/blockscout/pull/8530) - Add `block_type` to search results
 - [#8180](https://github.com/blockscout/blockscout/pull/8180) - Deposits and Withdrawals for Polygon Edge
 - [#7996](https://github.com/blockscout/blockscout/pull/7996) - Add CoinBalance fetcher init query limit
 
diff --git a/apps/block_scout_web/lib/block_scout_web/views/api/v2/search_view.ex b/apps/block_scout_web/lib/block_scout_web/views/api/v2/search_view.ex
index 3663e2f96e80..0376e04f423e 100644
--- a/apps/block_scout_web/lib/block_scout_web/views/api/v2/search_view.ex
+++ b/apps/block_scout_web/lib/block_scout_web/views/api/v2/search_view.ex
@@ -1,7 +1,8 @@
 defmodule BlockScoutWeb.API.V2.SearchView do
   use BlockScoutWeb, :view
 
-  alias BlockScoutWeb.Endpoint
+  alias BlockScoutWeb.{BlockView, Endpoint}
+  alias Explorer.Chain
   alias Explorer.Chain.{Address, Block, Hash, Transaction}
 
   def render("search_results.json", %{search_results: search_results, next_page_params: next_page_params}) do
@@ -53,12 +54,21 @@ defmodule BlockScoutWeb.API.V2.SearchView do
   def prepare_search_result(%{type: "block"} = search_result) do
     block_hash = hash_to_string(search_result.block_hash)
 
+    {:ok, block} =
+      Chain.hash_to_block(hash(search_result.block_hash),
+        necessity_by_association: %{
+          :nephews => :optional
+        },
+        api?: true
+      )
+
     %{
       "type" => search_result.type,
       "block_number" => search_result.block_number,
       "block_hash" => block_hash,
       "url" => block_path(Endpoint, :show, block_hash),
-      "timestamp" => search_result.timestamp
+      "timestamp" => search_result.timestamp,
+      "block_type" => block |> BlockView.block_type() |> String.downcase()
     }
   end
 
@@ -76,6 +86,14 @@ defmodule BlockScoutWeb.API.V2.SearchView do
   defp hash_to_string(%Hash{bytes: bytes}), do: hash_to_string(bytes)
   defp hash_to_string(hash), do: "0x" <> Base.encode16(hash, case: :lower)
 
+  defp hash(%Hash{} = hash), do: hash
+
+  defp hash(bytes),
+    do: %Hash{
+      byte_count: 32,
+      bytes: bytes
+    }
+
   defp redirect_search_results(%Address{} = item) do
     %{"type" => "address", "parameter" => Address.checksum(item.hash)}
   end
diff --git a/apps/block_scout_web/test/block_scout_web/controllers/api/v2/search_controller_test.exs b/apps/block_scout_web/test/block_scout_web/controllers/api/v2/search_controller_test.exs
index 145963c99d32..6804f778f0f7 100644
--- a/apps/block_scout_web/test/block_scout_web/controllers/api/v2/search_controller_test.exs
+++ b/apps/block_scout_web/test/block_scout_web/controllers/api/v2/search_controller_test.exs
@@ -28,6 +28,7 @@ defmodule BlockScoutWeb.API.V2.SearchControllerTest do
       item = Enum.at(response["items"], 0)
 
       assert item["type"] == "block"
+      assert item["block_type"] == "block"
       assert item["block_number"] == block.number
       assert item["block_hash"] == to_string(block.hash)
       assert item["url"] =~ to_string(block.hash)
@@ -47,6 +48,38 @@ defmodule BlockScoutWeb.API.V2.SearchControllerTest do
       assert item["timestamp"] == block.timestamp |> to_string() |> String.replace(" ", "T")
     end
 
+    test "search reorg", %{conn: conn} do
+      block = insert(:block, consensus: false)
+
+      request = get(conn, "/api/v2/search?q=#{block.hash}")
+      assert response = json_response(request, 200)
+
+      assert Enum.count(response["items"]) == 1
+      assert response["next_page_params"] == nil
+
+      item = Enum.at(response["items"], 0)
+
+      assert item["type"] == "block"
+      assert item["block_type"] == "reorg"
+      assert item["block_number"] == block.number
+      assert item["block_hash"] == to_string(block.hash)
+      assert item["url"] =~ to_string(block.hash)
+
+      request = get(conn, "/api/v2/search?q=#{block.number}")
+      assert response = json_response(request, 200)
+
+      assert Enum.count(response["items"]) == 1
+      assert response["next_page_params"] == nil
+
+      item = Enum.at(response["items"], 0)
+
+      assert item["type"] == "block"
+      assert item["block_type"] == "reorg"
+      assert item["block_number"] == block.number
+      assert item["block_hash"] == to_string(block.hash)
+      assert item["url"] =~ to_string(block.hash)
+    end
+
     test "search address", %{conn: conn} do
       address = insert(:address)
       name = insert(:unique_address_name, address: address)
@@ -326,6 +359,9 @@ defmodule BlockScoutWeb.API.V2.SearchControllerTest do
 
       assert block_hashes == blocks |> Enum.reverse() |> Enum.map(fn block -> to_string(block.hash) end) ||
                block_hashes == blocks |> Enum.map(fn block -> to_string(block.hash) end)
+
+      assert response |> Enum.filter(fn x -> x["block_type"] == "block" end) |> Enum.count() == 1
+      assert response |> Enum.filter(fn x -> x["block_type"] == "reorg" end) |> Enum.count() == 1
     end
 
     test "returns empty list and don't crash", %{conn: conn} do

From daed959d8f75fe5a663fbf37e4d57c58f454de14 Mon Sep 17 00:00:00 2001
From: nikitosing <32202610+nikitosing@users.noreply.github.com>
Date: Wed, 27 Sep 2023 14:54:42 +0300
Subject: [PATCH 448/909] =?UTF-8?q?Add=20owner=5Faddress=5Fhash=20and=20ot?=
 =?UTF-8?q?her=20fields=20to=20token=5Finstances;=20Move=20toke=E2=80=A6?=
 =?UTF-8?q?=20(#8386)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Add owner_address_hash and other fields to token_instances; Move token instances' insert into synchronous block import stage

* Add TokenInstanceOwnerAddressMigration process

* Add TokenInstanceOwnerAddressMigration.Helper tests

* Add envs to Makefile and .env file

* Process review comments

* Process review comments
---
 CHANGELOG.md                                  |   1 +
 apps/explorer/config/config.exs               |   2 +
 apps/explorer/config/runtime/test.exs         |   2 +
 apps/explorer/lib/explorer/application.ex     |   1 +
 apps/explorer/lib/explorer/chain.ex           |  61 ++++++-
 .../explorer/chain/import/runner/blocks.ex    | 172 +++++++++++++++++-
 .../chain/import/runner/token_instances.ex    | 106 +++++++++++
 .../chain/import/stage/block_following.ex     |   3 +-
 .../lib/explorer/chain/token/instance.ex      |  21 ++-
 .../lib/explorer/chain/token_transfer.ex      |  10 +-
 .../helper.ex                                 |  77 ++++++++
 .../supervisor.ex                             |  26 +++
 .../worker.ex                                 |  51 ++++++
 ...dd_token_ids_to_address_token_balances.exs |  13 ++
 .../chain/import/runner/blocks_test.exs       | 160 ++++++++++++++++
 apps/explorer/test/explorer/chain_test.exs    |  35 +---
 .../helper_test.exs                           | 121 ++++++++++++
 apps/explorer/test/support/factory.ex         |   6 +
 apps/indexer/lib/indexer/block/fetcher.ex     |   5 +-
 .../fetcher/token_instance/legacy_sanitize.ex |  58 ++++++
 .../fetcher/token_instance/realtime.ex        |   2 +-
 .../fetcher/token_instance/sanitize.ex        |   4 +-
 apps/indexer/lib/indexer/supervisor.ex        |   2 +
 .../transform/address_token_balances.ex       |  13 --
 .../lib/indexer/transform/token_instances.ex  |  88 +++++++++
 .../transform/address_token_balances_test.exs |  16 +-
 config/runtime.exs                            |  11 ++
 docker-compose/envs/common-blockscout.env     |   7 +-
 28 files changed, 1011 insertions(+), 63 deletions(-)
 create mode 100644 apps/explorer/lib/explorer/chain/import/runner/token_instances.ex
 create mode 100644 apps/explorer/lib/explorer/token_instance_owner_address_migration/helper.ex
 create mode 100644 apps/explorer/lib/explorer/token_instance_owner_address_migration/supervisor.ex
 create mode 100644 apps/explorer/lib/explorer/token_instance_owner_address_migration/worker.ex
 create mode 100644 apps/explorer/priv/repo/migrations/20230818094455_add_token_ids_to_address_token_balances.exs
 create mode 100644 apps/explorer/test/explorer/token_instance_owner_address_migration/helper_test.exs
 create mode 100644 apps/indexer/lib/indexer/fetcher/token_instance/legacy_sanitize.ex
 create mode 100644 apps/indexer/lib/indexer/transform/token_instances.ex

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 120b6f856d56..0696b53b234f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,7 @@
 
 ### Features
 
+- [#8386](https://github.com/blockscout/blockscout/pull/8386) - Add `owner_address_hash` to the `token_instances`
 - [#8530](https://github.com/blockscout/blockscout/pull/8530) - Add `block_type` to search results
 - [#8180](https://github.com/blockscout/blockscout/pull/8180) - Deposits and Withdrawals for Polygon Edge
 - [#7996](https://github.com/blockscout/blockscout/pull/7996) - Add CoinBalance fetcher init query limit
diff --git a/apps/explorer/config/config.exs b/apps/explorer/config/config.exs
index 8bfc263b536d..feb7ca93e8b3 100644
--- a/apps/explorer/config/config.exs
+++ b/apps/explorer/config/config.exs
@@ -110,6 +110,8 @@ config :explorer, Explorer.Counters.BlockPriorityFeeCounter,
 
 config :explorer, Explorer.TokenTransferTokenIdMigration.Supervisor, enabled: true
 
+config :explorer, Explorer.TokenInstanceOwnerAddressMigration.Supervisor, enabled: true
+
 config :explorer, Explorer.Chain.Fetcher.CheckBytecodeMatchingOnDemand, enabled: true
 
 config :explorer, Explorer.Chain.Fetcher.FetchValidatorInfoOnDemand, enabled: true
diff --git a/apps/explorer/config/runtime/test.exs b/apps/explorer/config/runtime/test.exs
index 0afa030023b1..bef121b2c1be 100644
--- a/apps/explorer/config/runtime/test.exs
+++ b/apps/explorer/config/runtime/test.exs
@@ -30,6 +30,8 @@ config :explorer, Explorer.Tracer, disabled?: false
 
 config :explorer, Explorer.TokenTransferTokenIdMigration.Supervisor, enabled: false
 
+config :explorer, Explorer.TokenInstanceOwnerAddressMigration.Supervisor, enabled: false
+
 config :explorer,
   realtime_events_sender: Explorer.Chain.Events.SimpleSender
 
diff --git a/apps/explorer/lib/explorer/application.ex b/apps/explorer/lib/explorer/application.ex
index beb6f4082408..23c5f2548f18 100644
--- a/apps/explorer/lib/explorer/application.ex
+++ b/apps/explorer/lib/explorer/application.ex
@@ -119,6 +119,7 @@ defmodule Explorer.Application do
       configure(TokenTransferTokenIdMigration.Supervisor),
       configure(Explorer.Chain.Fetcher.CheckBytecodeMatchingOnDemand),
       configure(Explorer.Chain.Fetcher.FetchValidatorInfoOnDemand),
+      configure(Explorer.TokenInstanceOwnerAddressMigration.Supervisor),
       sc_microservice_configure(Explorer.Chain.Fetcher.LookUpSmartContractSourcesOnDemand)
     ]
     |> List.flatten()
diff --git a/apps/explorer/lib/explorer/chain.ex b/apps/explorer/lib/explorer/chain.ex
index 6aa532de03e1..e7e493c80386 100644
--- a/apps/explorer/lib/explorer/chain.ex
+++ b/apps/explorer/lib/explorer/chain.ex
@@ -567,7 +567,7 @@ defmodule Explorer.Chain do
         select: log,
         inner_join: block in Block,
         on: block.hash == log.block_hash,
-        where: block.consensus
+        where: block.consensus == true
       )
 
     preloaded_query =
@@ -4391,12 +4391,15 @@ defmodule Explorer.Chain do
     |> Repo.stream_reduce(initial, reducer)
   end
 
-  @spec stream_unfetched_token_instances(
+  @doc """
+    Finds all token instances (pairs of contract_address_hash and token_id) which was met in token transfers but has no corresponding entry in token_instances table
+  """
+  @spec stream_not_inserted_token_instances(
           initial :: accumulator,
           reducer :: (entry :: map(), accumulator -> accumulator)
         ) :: {:ok, accumulator}
         when accumulator: term()
-  def stream_unfetched_token_instances(initial, reducer) when is_function(reducer, 2) do
+  def stream_not_inserted_token_instances(initial, reducer) when is_function(reducer, 2) do
     nft_tokens =
       from(
         token in Token,
@@ -4438,6 +4441,24 @@ defmodule Explorer.Chain do
     Repo.stream_reduce(distinct_query, initial, reducer)
   end
 
+  @doc """
+    Finds all token instances where metadata never tried to fetch
+  """
+  @spec stream_token_instances_with_unfetched_metadata(
+          initial :: accumulator,
+          reducer :: (entry :: map(), accumulator -> accumulator)
+        ) :: {:ok, accumulator}
+        when accumulator: term()
+  def stream_token_instances_with_unfetched_metadata(initial, reducer) when is_function(reducer, 2) do
+    Instance
+    |> where([instance], is_nil(instance.error) and is_nil(instance.metadata))
+    |> select([instance], %{
+      contract_address_hash: instance.token_contract_address_hash,
+      token_id: instance.token_id
+    })
+    |> Repo.stream_reduce(initial, reducer)
+  end
+
   @spec stream_token_instances_with_error(
           initial :: accumulator,
           reducer :: (entry :: map(), accumulator -> accumulator),
@@ -4696,18 +4717,37 @@ defmodule Explorer.Chain do
   end
 
   @doc """
-    Expects map of change params. Inserts using on_conflict: :replace_all
+    Expects map of change params. Inserts using on_conflict: `token_instance_metadata_on_conflict/0`
+    !!! Supposed to be used ONLY for import of `metadata` or `error`.
   """
   @spec upsert_token_instance(map()) :: {:ok, Instance.t()} | {:error, Ecto.Changeset.t()}
   def upsert_token_instance(params) do
     changeset = Instance.changeset(%Instance{}, params)
 
     Repo.insert(changeset,
-      on_conflict: :replace_all,
+      on_conflict: token_instance_metadata_on_conflict(),
       conflict_target: [:token_id, :token_contract_address_hash]
     )
   end
 
+  defp token_instance_metadata_on_conflict do
+    from(
+      token_instance in Instance,
+      update: [
+        set: [
+          metadata: fragment("EXCLUDED.metadata"),
+          error: fragment("EXCLUDED.error"),
+          owner_updated_at_block: token_instance.owner_updated_at_block,
+          owner_updated_at_log_index: token_instance.owner_updated_at_log_index,
+          owner_address_hash: token_instance.owner_address_hash,
+          inserted_at: fragment("LEAST(?, EXCLUDED.inserted_at)", token_instance.inserted_at),
+          updated_at: fragment("GREATEST(?, EXCLUDED.updated_at)", token_instance.updated_at)
+        ]
+      ],
+      where: is_nil(token_instance.metadata)
+    )
+  end
+
   @doc """
     Inserts list of token instances via upsert_token_instance/1.
   """
@@ -4809,6 +4849,17 @@ defmodule Explorer.Chain do
     select_repo(options).exists?(query)
   end
 
+  @spec token_instance_with_unfetched_metadata?(non_neg_integer, Hash.Address.t(), [api?]) :: boolean
+  def token_instance_with_unfetched_metadata?(token_id, token_contract_address, options \\ []) do
+    Instance
+    |> where([instance], is_nil(instance.error) and is_nil(instance.metadata))
+    |> where(
+      [instance],
+      instance.token_id == ^token_id and instance.token_contract_address_hash == ^token_contract_address
+    )
+    |> select_repo(options).exists?()
+  end
+
   defp fetch_coin_balances(address, paging_options) do
     address.hash
     |> CoinBalance.fetch_coin_balances(paging_options)
diff --git a/apps/explorer/lib/explorer/chain/import/runner/blocks.ex b/apps/explorer/lib/explorer/chain/import/runner/blocks.ex
index ea533119015e..57fc87602367 100644
--- a/apps/explorer/lib/explorer/chain/import/runner/blocks.ex
+++ b/apps/explorer/lib/explorer/chain/import/runner/blocks.ex
@@ -8,11 +8,22 @@ defmodule Explorer.Chain.Import.Runner.Blocks do
   import Ecto.Query, only: [from: 2, where: 3, subquery: 1]
 
   alias Ecto.{Changeset, Multi, Repo}
-  alias Explorer.Chain.{Address, Block, Import, PendingBlockOperation, Transaction}
+
+  alias Explorer.Chain.{
+    Address,
+    Block,
+    Import,
+    PendingBlockOperation,
+    Token,
+    Token.Instance,
+    TokenTransfer,
+    Transaction
+  }
+
   alias Explorer.Chain.Block.Reward
   alias Explorer.Chain.Import.Runner
   alias Explorer.Chain.Import.Runner.Address.CurrentTokenBalances
-  alias Explorer.Chain.Import.Runner.Tokens
+  alias Explorer.Chain.Import.Runner.{TokenInstances, Tokens}
   alias Explorer.Prometheus.Instrumenter
   alias Explorer.Repo, as: ExplorerRepo
   alias Explorer.Utility.MissingRangesManipulator
@@ -177,6 +188,14 @@ defmodule Explorer.Chain.Import.Runner.Blocks do
         :derive_address_current_token_balances
       )
     end)
+    |> Multi.run(:update_token_instances_owner, fn repo, %{derive_transaction_forks: transactions} ->
+      Instrumenter.block_import_stage_runner(
+        fn -> update_token_instances_owner(repo, transactions, insert_options) end,
+        :address_referencing,
+        :blocks,
+        :update_token_instances_owner
+      )
+    end)
     |> Multi.run(:blocks_update_token_holder_counts, fn repo,
                                                         %{
                                                           delete_address_current_token_balances: deleted,
@@ -577,6 +596,155 @@ defmodule Explorer.Chain.Import.Runner.Blocks do
     {:ok, derived_address_current_token_balances}
   end
 
+  defp update_token_instances_owner(_, [], _), do: {:ok, []}
+
+  defp update_token_instances_owner(repo, forked_transaction_hashes, options) do
+    forked_transaction_hashes
+    |> forked_token_transfers_query()
+    |> repo.all()
+    |> process_forked_token_transfers(repo, options)
+  end
+
+  defp process_forked_token_transfers([], _, _), do: {:ok, []}
+
+  defp process_forked_token_transfers(token_transfers, repo, options) do
+    changes_initial =
+      Enum.reduce(token_transfers, %{}, fn tt, acc ->
+        Map.put_new(acc, {tt.token_contract_address_hash, tt.token_id}, %{
+          token_contract_address_hash: tt.token_contract_address_hash,
+          token_id: tt.token_id,
+          owner_address_hash: tt.from,
+          owner_updated_at_block: -1,
+          owner_updated_at_log_index: -1
+        })
+      end)
+
+    non_consensus_block_numbers = token_transfers |> Enum.map(fn tt -> tt.block_number end) |> Enum.uniq()
+
+    filtered_query = TokenTransfer.only_consensus_transfers_query()
+
+    base_query =
+      from(token_transfer in subquery(filtered_query),
+        select: %{
+          token_contract_address_hash: token_transfer.token_contract_address_hash,
+          token_id: fragment("(?)[1]", token_transfer.token_ids),
+          block_number: max(token_transfer.block_number)
+        },
+        group_by: [token_transfer.token_contract_address_hash, fragment("(?)[1]", token_transfer.token_ids)]
+      )
+
+    historical_token_transfers_query =
+      Enum.reduce(token_transfers, base_query, fn tt, acc ->
+        from(token_transfer in acc,
+          or_where:
+            token_transfer.token_contract_address_hash == ^tt.token_contract_address_hash and
+              fragment("? @> ARRAY[?::decimal]", token_transfer.token_ids, ^tt.token_id) and
+              token_transfer.block_number < ^tt.block_number and
+              token_transfer.block_number not in ^non_consensus_block_numbers
+        )
+      end)
+
+    refs_to_token_transfers =
+      from(historical_tt in subquery(historical_token_transfers_query),
+        inner_join: tt in subquery(filtered_query),
+        on:
+          tt.token_contract_address_hash == historical_tt.token_contract_address_hash and
+            tt.block_number == historical_tt.block_number and
+            fragment("? @> ARRAY[?::decimal]", tt.token_ids, historical_tt.token_id),
+        select: %{
+          token_contract_address_hash: tt.token_contract_address_hash,
+          token_id: historical_tt.token_id,
+          log_index: max(tt.log_index),
+          block_number: tt.block_number
+        },
+        group_by: [tt.token_contract_address_hash, historical_tt.token_id, tt.block_number]
+      )
+
+    derived_token_transfers_query =
+      from(tt in filtered_query,
+        inner_join: tt_1 in subquery(refs_to_token_transfers),
+        on: tt_1.log_index == tt.log_index and tt_1.block_number == tt.block_number
+      )
+
+    changes =
+      derived_token_transfers_query
+      |> repo.all()
+      |> Enum.reduce(changes_initial, fn tt, acc ->
+        token_id = List.first(tt.token_ids)
+        current_key = {tt.token_contract_address_hash, token_id}
+
+        params = %{
+          token_contract_address_hash: tt.token_contract_address_hash,
+          token_id: token_id,
+          owner_address_hash: tt.to_address_hash,
+          owner_updated_at_block: tt.block_number,
+          owner_updated_at_log_index: tt.log_index
+        }
+
+        Map.put(
+          acc,
+          current_key,
+          Enum.max_by([acc[current_key], params], fn %{
+                                                       owner_updated_at_block: block_number,
+                                                       owner_updated_at_log_index: log_index
+                                                     } ->
+            {block_number, log_index}
+          end)
+        )
+      end)
+      |> Map.values()
+
+    TokenInstances.insert(
+      repo,
+      changes,
+      options
+      |> Map.put(:timestamps, Import.timestamps())
+      |> Map.put(:on_conflict, token_instances_on_conflict())
+    )
+  end
+
+  defp forked_token_transfers_query(forked_transaction_hashes) do
+    from(token_transfer in TokenTransfer,
+      where: token_transfer.transaction_hash in ^forked_transaction_hashes,
+      inner_join: token in Token,
+      on: token.contract_address_hash == token_transfer.token_contract_address_hash,
+      where: token.type == "ERC-721",
+      inner_join: instance in Instance,
+      on:
+        fragment("? @> ARRAY[?::decimal]", token_transfer.token_ids, instance.token_id) and
+          instance.token_contract_address_hash == token_transfer.token_contract_address_hash,
+      # per one token instance we will have only one token transfer
+      where:
+        token_transfer.block_number == instance.owner_updated_at_block and
+          token_transfer.log_index == instance.owner_updated_at_log_index,
+      select: %{
+        from: token_transfer.from_address_hash,
+        to: token_transfer.to_address_hash,
+        token_id: instance.token_id,
+        token_contract_address_hash: token_transfer.token_contract_address_hash,
+        block_number: token_transfer.block_number,
+        log_index: token_transfer.log_index
+      }
+    )
+  end
+
+  defp token_instances_on_conflict do
+    from(
+      token_instance in Instance,
+      update: [
+        set: [
+          metadata: token_instance.metadata,
+          error: token_instance.error,
+          owner_updated_at_block: fragment("EXCLUDED.owner_updated_at_block"),
+          owner_updated_at_log_index: fragment("EXCLUDED.owner_updated_at_log_index"),
+          owner_address_hash: fragment("EXCLUDED.owner_address_hash"),
+          inserted_at: fragment("LEAST(?, EXCLUDED.inserted_at)", token_instance.inserted_at),
+          updated_at: fragment("GREATEST(?, EXCLUDED.updated_at)", token_instance.updated_at)
+        ]
+      ]
+    )
+  end
+
   defp derive_address_current_token_balances_grouped_query(deleted_address_current_token_balances) do
     initial_query =
       from(tb in Address.TokenBalance,
diff --git a/apps/explorer/lib/explorer/chain/import/runner/token_instances.ex b/apps/explorer/lib/explorer/chain/import/runner/token_instances.ex
new file mode 100644
index 000000000000..0fb38962a755
--- /dev/null
+++ b/apps/explorer/lib/explorer/chain/import/runner/token_instances.ex
@@ -0,0 +1,106 @@
+defmodule Explorer.Chain.Import.Runner.TokenInstances do
+  @moduledoc """
+  Bulk imports `t:Explorer.Chain.TokenInstances.t/0`.
+  """
+
+  require Ecto.Query
+
+  alias Ecto.{Changeset, Multi, Repo}
+  alias Explorer.Chain.Import
+  alias Explorer.Chain.Token.Instance, as: TokenInstance
+  alias Explorer.Prometheus.Instrumenter
+
+  import Ecto.Query, only: [from: 2]
+
+  @behaviour Import.Runner
+
+  # milliseconds
+  @timeout 60_000
+
+  @type imported :: [TokenInstance.t()]
+
+  @impl Import.Runner
+  def ecto_schema_module, do: TokenInstance
+
+  @impl Import.Runner
+  def option_key, do: :token_instances
+
+  @impl Import.Runner
+  def imported_table_row do
+    %{
+      value_type: "[#{ecto_schema_module()}.t()]",
+      value_description: "List of `t:#{ecto_schema_module()}.t/0`s"
+    }
+  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)
+
+    Multi.run(multi, :token_instances, fn repo, _ ->
+      Instrumenter.block_import_stage_runner(
+        fn -> insert(repo, changes_list, insert_options) end,
+        :block_referencing,
+        :token_instances,
+        :token_instances
+      )
+    end)
+  end
+
+  @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, [TokenInstance.t()]}
+          | {:error, [Changeset.t()]}
+  def 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)
+
+    # Guarantee the same import order to avoid deadlocks
+    ordered_changes_list = Enum.sort_by(changes_list, &{&1.token_contract_address_hash, &1.token_id})
+
+    {:ok, _} =
+      Import.insert_changes_list(
+        repo,
+        ordered_changes_list,
+        conflict_target: [:token_contract_address_hash, :token_id],
+        on_conflict: on_conflict,
+        for: TokenInstance,
+        returning: true,
+        timeout: timeout,
+        timestamps: timestamps
+      )
+  end
+
+  defp default_on_conflict do
+    from(
+      token_instance in TokenInstance,
+      update: [
+        set: [
+          metadata: token_instance.metadata,
+          error: token_instance.error,
+          owner_updated_at_block: fragment("EXCLUDED.owner_updated_at_block"),
+          owner_updated_at_log_index: fragment("EXCLUDED.owner_updated_at_log_index"),
+          owner_address_hash: fragment("EXCLUDED.owner_address_hash"),
+          inserted_at: fragment("LEAST(?, EXCLUDED.inserted_at)", token_instance.inserted_at),
+          updated_at: fragment("GREATEST(?, EXCLUDED.updated_at)", token_instance.updated_at)
+        ]
+      ],
+      where:
+        fragment("EXCLUDED.owner_address_hash IS NOT NULL") and fragment("EXCLUDED.owner_updated_at_block IS NOT NULL") and
+          (fragment("EXCLUDED.owner_updated_at_block > ?", token_instance.owner_updated_at_block) or
+             (fragment("EXCLUDED.owner_updated_at_block = ?", token_instance.owner_updated_at_block) and
+                fragment("EXCLUDED.owner_updated_at_log_index >= ?", token_instance.owner_updated_at_log_index)) or
+             is_nil(token_instance.owner_updated_at_block) or is_nil(token_instance.owner_address_hash))
+    )
+  end
+end
diff --git a/apps/explorer/lib/explorer/chain/import/stage/block_following.ex b/apps/explorer/lib/explorer/chain/import/stage/block_following.ex
index 65a7c076039c..8abbf9f79b7d 100644
--- a/apps/explorer/lib/explorer/chain/import/stage/block_following.ex
+++ b/apps/explorer/lib/explorer/chain/import/stage/block_following.ex
@@ -15,7 +15,8 @@ defmodule Explorer.Chain.Import.Stage.BlockFollowing do
     do: [
       Runner.Block.SecondDegreeRelations,
       Runner.Block.Rewards,
-      Runner.Address.CurrentTokenBalances
+      Runner.Address.CurrentTokenBalances,
+      Runner.TokenInstances
     ]
 
   @impl Stage
diff --git a/apps/explorer/lib/explorer/chain/token/instance.ex b/apps/explorer/lib/explorer/chain/token/instance.ex
index ea91796e3214..c1b5bcd5f4ff 100644
--- a/apps/explorer/lib/explorer/chain/token/instance.ex
+++ b/apps/explorer/lib/explorer/chain/token/instance.ex
@@ -5,7 +5,7 @@ defmodule Explorer.Chain.Token.Instance do
 
   use Explorer.Schema
 
-  alias Explorer.Chain.{Address, Hash, Token, TokenTransfer}
+  alias Explorer.Chain.{Address, Block, Hash, Token, TokenTransfer}
   alias Explorer.Chain.Token.Instance
   alias Explorer.PagingOptions
 
@@ -20,7 +20,10 @@ defmodule Explorer.Chain.Token.Instance do
           token_id: non_neg_integer(),
           token_contract_address_hash: Hash.Address.t(),
           metadata: map() | nil,
-          error: String.t()
+          error: String.t(),
+          owner_address_hash: Hash.Address.t(),
+          owner_updated_at_block: Block.block_number(),
+          owner_updated_at_log_index: non_neg_integer()
         }
 
   @primary_key false
@@ -28,8 +31,10 @@ defmodule Explorer.Chain.Token.Instance do
     field(:token_id, :decimal, primary_key: true)
     field(:metadata, :map)
     field(:error, :string)
+    field(:owner_updated_at_block, :integer)
+    field(:owner_updated_at_log_index, :integer)
 
-    belongs_to(:owner, Address, references: :hash, define_field: false)
+    belongs_to(:owner, Address, foreign_key: :owner_address_hash, references: :hash, type: Hash.Address)
 
     belongs_to(
       :token,
@@ -45,7 +50,15 @@ defmodule Explorer.Chain.Token.Instance do
 
   def changeset(%Instance{} = instance, params \\ %{}) do
     instance
-    |> cast(params, [:token_id, :metadata, :token_contract_address_hash, :error])
+    |> cast(params, [
+      :token_id,
+      :metadata,
+      :token_contract_address_hash,
+      :error,
+      :owner_address_hash,
+      :owner_updated_at_block,
+      :owner_updated_at_log_index
+    ])
     |> validate_required([:token_id, :token_contract_address_hash])
     |> foreign_key_constraint(:token_contract_address_hash)
   end
diff --git a/apps/explorer/lib/explorer/chain/token_transfer.ex b/apps/explorer/lib/explorer/chain/token_transfer.ex
index ff17c0f768cb..1c5a15123f51 100644
--- a/apps/explorer/lib/explorer/chain/token_transfer.ex
+++ b/apps/explorer/lib/explorer/chain/token_transfer.ex
@@ -47,7 +47,7 @@ defmodule Explorer.Chain.TokenTransfer do
   * `:token_id` - ID of the token (applicable to ERC-721 tokens)
   * `:transaction` - The `t:Explorer.Chain.Transaction.t/0` ledger
   * `:transaction_hash` - Transaction foreign key
-  * `:log_index` - Index of the corresponding `t:Explorer.Chain.Log.t/0` in the transaction.
+  * `:log_index` - Index of the corresponding `t:Explorer.Chain.Log.t/0` in the block.
   * `:amounts` - Tokens transferred amounts in case of batched transfer in ERC-1155
   * `:token_ids` - IDs of the tokens (applicable to ERC-1155 tokens)
   """
@@ -360,4 +360,12 @@ defmodule Explorer.Chain.TokenTransfer do
   end
 
   def filter_by_type(query, _), do: query
+
+  def only_consensus_transfers_query do
+    from(token_transfer in __MODULE__,
+      inner_join: block in Block,
+      on: token_transfer.block_hash == block.hash,
+      where: block.consensus == true
+    )
+  end
 end
diff --git a/apps/explorer/lib/explorer/token_instance_owner_address_migration/helper.ex b/apps/explorer/lib/explorer/token_instance_owner_address_migration/helper.ex
new file mode 100644
index 000000000000..7b0a092245f0
--- /dev/null
+++ b/apps/explorer/lib/explorer/token_instance_owner_address_migration/helper.ex
@@ -0,0 +1,77 @@
+defmodule Explorer.TokenInstanceOwnerAddressMigration.Helper do
+  @moduledoc """
+    Auxiliary functions for TokenInstanceOwnerAddressMigration.{Worker and Supervisor}
+  """
+  import Ecto.Query,
+    only: [
+      from: 2
+    ]
+
+  alias Explorer.{Chain, Repo}
+  alias Explorer.Chain.Token.Instance
+  alias Explorer.Chain.{SmartContract, TokenTransfer}
+
+  {:ok, burn_address_hash} = Chain.string_to_address_hash(SmartContract.burn_address_hash_string())
+  @burn_address_hash burn_address_hash
+
+  @spec filtered_token_instances_query(non_neg_integer()) :: Ecto.Query.t()
+  def filtered_token_instances_query(limit) do
+    from(instance in Instance,
+      where: is_nil(instance.owner_address_hash),
+      inner_join: token in assoc(instance, :token),
+      where: token.type == "ERC-721",
+      limit: ^limit,
+      select: %{token_id: instance.token_id, token_contract_address_hash: instance.token_contract_address_hash}
+    )
+  end
+
+  @spec fetch_and_insert([map]) ::
+          {:error, :timeout | [map]}
+          | {:ok,
+             %{
+               :token_instances => [Instance.t()]
+             }}
+          | {:error, any, any, map}
+  def fetch_and_insert(batch) do
+    changes =
+      Enum.map(batch, fn %{token_id: token_id, token_contract_address_hash: token_contract_address_hash} ->
+        token_transfer_query =
+          from(tt in TokenTransfer.only_consensus_transfers_query(),
+            where:
+              tt.token_contract_address_hash == ^token_contract_address_hash and
+                fragment("? @> ARRAY[?::decimal]", tt.token_ids, ^token_id),
+            order_by: [desc: tt.block_number, desc: tt.log_index],
+            limit: 1,
+            select: %{
+              token_contract_address_hash: tt.token_contract_address_hash,
+              token_ids: tt.token_ids,
+              to_address_hash: tt.to_address_hash,
+              block_number: tt.block_number,
+              log_index: tt.log_index
+            }
+          )
+
+        token_transfer =
+          Repo.one(token_transfer_query) ||
+            %{to_address_hash: @burn_address_hash, block_number: -1, log_index: -1}
+
+        %{
+          token_contract_address_hash: token_contract_address_hash,
+          token_id: token_id,
+          token_type: "ERC-721",
+          owner_address_hash: token_transfer.to_address_hash,
+          owner_updated_at_block: token_transfer.block_number,
+          owner_updated_at_log_index: token_transfer.log_index
+        }
+      end)
+
+    Chain.import(%{token_instances: %{params: changes}})
+  end
+
+  @spec unfilled_token_instances_exists? :: boolean
+  def unfilled_token_instances_exists? do
+    1
+    |> filtered_token_instances_query()
+    |> Repo.exists?()
+  end
+end
diff --git a/apps/explorer/lib/explorer/token_instance_owner_address_migration/supervisor.ex b/apps/explorer/lib/explorer/token_instance_owner_address_migration/supervisor.ex
new file mode 100644
index 000000000000..5bb8532fdf5a
--- /dev/null
+++ b/apps/explorer/lib/explorer/token_instance_owner_address_migration/supervisor.ex
@@ -0,0 +1,26 @@
+defmodule Explorer.TokenInstanceOwnerAddressMigration.Supervisor do
+  @moduledoc """
+    Supervisor for Explorer.TokenInstanceOwnerAddressMigration.Worker
+  """
+
+  use Supervisor
+
+  alias Explorer.TokenInstanceOwnerAddressMigration.{Helper, Worker}
+
+  def start_link(init_arg) do
+    Supervisor.start_link(__MODULE__, init_arg, name: __MODULE__)
+  end
+
+  @impl true
+  def init(_init_arg) do
+    if Helper.unfilled_token_instances_exists?() do
+      children = [
+        {Worker, Application.get_env(:explorer, Explorer.TokenInstanceOwnerAddressMigration)}
+      ]
+
+      Supervisor.init(children, strategy: :one_for_one)
+    else
+      :ignore
+    end
+  end
+end
diff --git a/apps/explorer/lib/explorer/token_instance_owner_address_migration/worker.ex b/apps/explorer/lib/explorer/token_instance_owner_address_migration/worker.ex
new file mode 100644
index 000000000000..c0ad7c487997
--- /dev/null
+++ b/apps/explorer/lib/explorer/token_instance_owner_address_migration/worker.ex
@@ -0,0 +1,51 @@
+defmodule Explorer.TokenInstanceOwnerAddressMigration.Worker do
+  @moduledoc """
+    GenServer for filling  owner_address_hash, owner_updated_at_block and owner_updated_at_log_index
+    for ERC-721 token instances. Works in the following way
+    1. Checks if there are some unprocessed nfts.
+      - if yes, then go to 2 stage
+      - if no, then shutdown
+    2. Fetch `(concurrency * batch_size)` token instances, process them in `concurrency` tasks.
+    3. Go to step 1
+  """
+
+  use GenServer, restart: :transient
+
+  alias Explorer.Repo
+  alias Explorer.TokenInstanceOwnerAddressMigration.Helper
+
+  def start_link(concurrency: concurrency, batch_size: batch_size) do
+    GenServer.start_link(__MODULE__, %{concurrency: concurrency, batch_size: batch_size}, name: __MODULE__)
+  end
+
+  @impl true
+  def init(opts) do
+    GenServer.cast(__MODULE__, :check_necessity)
+
+    {:ok, opts}
+  end
+
+  @impl true
+  def handle_cast(:check_necessity, state) do
+    if Helper.unfilled_token_instances_exists?() do
+      GenServer.cast(__MODULE__, :backfill)
+      {:noreply, state}
+    else
+      {:stop, :normal, state}
+    end
+  end
+
+  @impl true
+  def handle_cast(:backfill, %{concurrency: concurrency, batch_size: batch_size} = state) do
+    (concurrency * batch_size)
+    |> Helper.filtered_token_instances_query()
+    |> Repo.all()
+    |> Enum.chunk_every(batch_size)
+    |> Enum.map(fn batch -> Task.async(fn -> Helper.fetch_and_insert(batch) end) end)
+    |> Task.await_many(:infinity)
+
+    GenServer.cast(__MODULE__, :check_necessity)
+
+    {:noreply, state}
+  end
+end
diff --git a/apps/explorer/priv/repo/migrations/20230818094455_add_token_ids_to_address_token_balances.exs b/apps/explorer/priv/repo/migrations/20230818094455_add_token_ids_to_address_token_balances.exs
new file mode 100644
index 000000000000..a141276ab529
--- /dev/null
+++ b/apps/explorer/priv/repo/migrations/20230818094455_add_token_ids_to_address_token_balances.exs
@@ -0,0 +1,13 @@
+defmodule Explorer.Repo.Migrations.AddTokenIdsToAddressTokenBalances do
+  use Ecto.Migration
+
+  def change do
+    alter table(:token_instances) do
+      add(:owner_address_hash, :bytea, null: true)
+      add(:owner_updated_at_block, :bigint, null: true)
+      add(:owner_updated_at_log_index, :integer, null: true)
+    end
+
+    create(index(:token_instances, [:owner_address_hash]))
+  end
+end
diff --git a/apps/explorer/test/explorer/chain/import/runner/blocks_test.exs b/apps/explorer/test/explorer/chain/import/runner/blocks_test.exs
index ab2d5bc46493..7e79c20916f3 100644
--- a/apps/explorer/test/explorer/chain/import/runner/blocks_test.exs
+++ b/apps/explorer/test/explorer/chain/import/runner/blocks_test.exs
@@ -368,6 +368,166 @@ defmodule Explorer.Chain.Import.Runner.BlocksTest do
 
       assert %{block_number: ^number, block_hash: ^hash} = Repo.one(PendingBlockOperation)
     end
+
+    test "change instance owner if was token transfer in older blocks",
+         %{consensus_block: %{hash: block_hash, miner_hash: miner_hash, number: block_number}, options: options} do
+      block_number = block_number + 2
+      consensus_block = insert(:block, %{hash: block_hash, number: block_number})
+
+      transaction =
+        :transaction
+        |> insert()
+        |> with_block(consensus_block)
+
+      token_address = insert(:contract_address)
+      insert(:token, contract_address: token_address, type: "ERC-721")
+      id = Decimal.new(1)
+
+      tt =
+        insert(:token_transfer,
+          token_ids: [id],
+          transaction: transaction,
+          token_contract_address: token_address,
+          block_number: block_number,
+          block: consensus_block,
+          log_index: 123
+        )
+
+      %{hash: hash_1} = params_for(:block, consensus: true, miner_hash: miner_hash)
+      consensus_block_1 = insert(:block, %{hash: hash_1, number: block_number - 1})
+
+      transaction =
+        :transaction
+        |> insert()
+        |> with_block(consensus_block_1)
+
+      for _ <- 0..10 do
+        insert(:token_transfer,
+          token_ids: [id],
+          transaction: transaction,
+          token_contract_address: tt.token_contract_address,
+          block_number: consensus_block_1.number,
+          block: consensus_block_1
+        )
+      end
+
+      tt_1 =
+        insert(:token_transfer,
+          token_ids: [id],
+          transaction: transaction,
+          token_contract_address: tt.token_contract_address,
+          block_number: consensus_block_1.number,
+          block: consensus_block_1
+        )
+
+      %{hash: hash_2} = params_for(:block, consensus: true, miner_hash: miner_hash)
+      consensus_block_2 = insert(:block, %{hash: hash_2, number: block_number - 2})
+
+      for _ <- 0..10 do
+        tx =
+          :transaction
+          |> insert()
+          |> with_block(consensus_block_2)
+
+        insert(:token_transfer,
+          token_ids: [id],
+          transaction: tx,
+          token_contract_address: tt.token_contract_address,
+          block_number: consensus_block_2.number,
+          block: consensus_block_2
+        )
+      end
+
+      instance =
+        insert(:token_instance,
+          token_contract_address_hash: token_address.hash,
+          token_id: id,
+          owner_updated_at_block: tt.block_number,
+          owner_updated_at_log_index: tt.log_index,
+          owner_address_hash: insert(:address).hash
+        )
+
+      block_params =
+        params_for(:block, hash: block_hash, miner_hash: miner_hash, number: block_number, consensus: false)
+
+      %Ecto.Changeset{valid?: true, changes: block_changes} = Block.changeset(%Block{}, block_params)
+      changes_list = [block_changes]
+      error = instance.error
+      block_number = tt_1.block_number
+      log_index = tt_1.log_index
+      owner_address_hash = tt_1.to_address_hash
+      token_address_hash = token_address.hash
+
+      assert {:ok,
+              %{
+                update_token_instances_owner: [
+                  %Explorer.Chain.Token.Instance{
+                    token_id: ^id,
+                    error: ^error,
+                    owner_updated_at_block: ^block_number,
+                    owner_updated_at_log_index: ^log_index,
+                    owner_address_hash: ^owner_address_hash,
+                    token_contract_address_hash: ^token_address_hash
+                  }
+                ]
+              }} = Multi.new() |> Blocks.run(changes_list, options) |> Repo.transaction()
+    end
+
+    test "change instance owner if there was no more token transfers",
+         %{consensus_block: %{hash: block_hash, miner_hash: miner_hash, number: block_number}, options: options} do
+      block_number = block_number + 1
+      consensus_block = insert(:block, %{hash: block_hash, number: block_number})
+
+      transaction =
+        :transaction
+        |> insert()
+        |> with_block(consensus_block)
+
+      token_address = insert(:contract_address)
+      insert(:token, contract_address: token_address, type: "ERC-721")
+      id = Decimal.new(1)
+
+      tt =
+        insert(:token_transfer,
+          token_ids: [id],
+          transaction: transaction,
+          token_contract_address: token_address,
+          block_number: block_number,
+          block: consensus_block
+        )
+
+      instance =
+        insert(:token_instance,
+          token_contract_address_hash: token_address.hash,
+          token_id: id,
+          owner_updated_at_block: tt.block_number,
+          owner_updated_at_log_index: tt.log_index,
+          owner_address_hash: insert(:address).hash
+        )
+
+      block_params =
+        params_for(:block, hash: block_hash, miner_hash: miner_hash, number: block_number, consensus: false)
+
+      %Ecto.Changeset{valid?: true, changes: block_changes} = Block.changeset(%Block{}, block_params)
+      changes_list = [block_changes]
+      error = instance.error
+      owner_address_hash = tt.from_address_hash
+      token_address_hash = token_address.hash
+
+      assert {:ok,
+              %{
+                update_token_instances_owner: [
+                  %Explorer.Chain.Token.Instance{
+                    token_id: ^id,
+                    error: ^error,
+                    owner_updated_at_block: -1,
+                    owner_updated_at_log_index: -1,
+                    owner_address_hash: ^owner_address_hash,
+                    token_contract_address_hash: ^token_address_hash
+                  }
+                ]
+              }} = Multi.new() |> Blocks.run(changes_list, options) |> Repo.transaction()
+    end
   end
 
   describe "lose_consensus/5" do
diff --git a/apps/explorer/test/explorer/chain_test.exs b/apps/explorer/test/explorer/chain_test.exs
index 728d7adc2971..b7472db7120d 100644
--- a/apps/explorer/test/explorer/chain_test.exs
+++ b/apps/explorer/test/explorer/chain_test.exs
@@ -183,30 +183,6 @@ defmodule Explorer.ChainTest do
       assert result.token_contract_address_hash == token.contract_address_hash
     end
 
-    test "replaces existing token instance record" do
-      token = insert(:token)
-
-      params = %{
-        token_id: 1,
-        token_contract_address_hash: token.contract_address_hash,
-        metadata: %{uri: "http://example.com"}
-      }
-
-      {:ok, _} = Chain.upsert_token_instance(params)
-
-      params1 = %{
-        token_id: 1,
-        token_contract_address_hash: token.contract_address_hash,
-        metadata: %{uri: "http://example1.com"}
-      }
-
-      {:ok, result} = Chain.upsert_token_instance(params1)
-
-      assert result.token_id == Decimal.new(1)
-      assert result.metadata == params1.metadata
-      assert result.token_contract_address_hash == token.contract_address_hash
-    end
-
     test "fails to import with invalid params" do
       params = %{
         token_id: 1,
@@ -243,7 +219,8 @@ defmodule Explorer.ChainTest do
       insert(:token_instance,
         token_id: 1,
         token_contract_address_hash: token.contract_address_hash,
-        error: "no uri"
+        error: "no uri",
+        metadata: nil
       )
 
       params = %{
@@ -4903,7 +4880,7 @@ defmodule Explorer.ChainTest do
     end
   end
 
-  describe "stream_unfetched_token_instances/2" do
+  describe "stream_not_inserted_token_instances/2" do
     test "reduces with given reducer and accumulator for ERC-721 token" do
       token_contract_address = insert(:contract_address)
       token = insert(:token, contract_address: token_contract_address, type: "ERC-721")
@@ -4924,7 +4901,7 @@ defmodule Explorer.ChainTest do
           token_ids: [11]
         )
 
-      assert {:ok, [result]} = Chain.stream_unfetched_token_instances([], &[&1 | &2])
+      assert {:ok, [result]} = Chain.stream_not_inserted_token_instances([], &[&1 | &2])
       assert result.token_id == List.first(token_transfer.token_ids)
       assert result.contract_address_hash == token_transfer.token_contract_address_hash
     end
@@ -4948,7 +4925,7 @@ defmodule Explorer.ChainTest do
         token_ids: nil
       )
 
-      assert {:ok, []} = Chain.stream_unfetched_token_instances([], &[&1 | &2])
+      assert {:ok, []} = Chain.stream_not_inserted_token_instances([], &[&1 | &2])
     end
 
     test "do not fetch records with token instances" do
@@ -4976,7 +4953,7 @@ defmodule Explorer.ChainTest do
         token_contract_address_hash: token_transfer.token_contract_address_hash
       )
 
-      assert {:ok, []} = Chain.stream_unfetched_token_instances([], &[&1 | &2])
+      assert {:ok, []} = Chain.stream_not_inserted_token_instances([], &[&1 | &2])
     end
   end
 
diff --git a/apps/explorer/test/explorer/token_instance_owner_address_migration/helper_test.exs b/apps/explorer/test/explorer/token_instance_owner_address_migration/helper_test.exs
new file mode 100644
index 000000000000..355d161259bb
--- /dev/null
+++ b/apps/explorer/test/explorer/token_instance_owner_address_migration/helper_test.exs
@@ -0,0 +1,121 @@
+defmodule Explorer.TokenInstanceOwnerAddressMigration.HelperTest do
+  use Explorer.DataCase
+
+  alias Explorer.{Chain, Repo}
+  alias Explorer.Chain.Token.Instance
+  alias Explorer.TokenInstanceOwnerAddressMigration.Helper
+
+  {:ok, burn_address_hash} = Chain.string_to_address_hash("0x0000000000000000000000000000000000000000")
+  @burn_address_hash burn_address_hash
+
+  describe "fetch_and_insert/2" do
+    test "successfully update owner of single token instance" do
+      token_address = insert(:contract_address)
+      insert(:token, contract_address: token_address, type: "ERC-721")
+
+      instance = insert(:token_instance, token_contract_address_hash: token_address.hash)
+
+      transaction =
+        :transaction
+        |> insert()
+        |> with_block()
+
+      tt_1 =
+        insert(:token_transfer,
+          token_ids: [instance.token_id],
+          transaction: transaction,
+          token_contract_address: token_address
+        )
+
+      Helper.fetch_and_insert([
+        %{token_id: instance.token_id, token_contract_address_hash: instance.token_contract_address_hash}
+      ])
+
+      owner_address = tt_1.to_address_hash
+      block_number = tt_1.block_number
+      log_index = tt_1.log_index
+
+      assert %Instance{
+               owner_address_hash: ^owner_address,
+               owner_updated_at_block: ^block_number,
+               owner_updated_at_log_index: ^log_index
+             } =
+               Repo.get_by(Instance,
+                 token_id: instance.token_id,
+                 token_contract_address_hash: instance.token_contract_address_hash
+               )
+    end
+
+    test "put placeholder value if tt absent in db" do
+      instance = insert(:token_instance)
+
+      Helper.fetch_and_insert([
+        %{token_id: instance.token_id, token_contract_address_hash: instance.token_contract_address_hash}
+      ])
+
+      assert %Instance{
+               owner_address_hash: @burn_address_hash,
+               owner_updated_at_block: -1,
+               owner_updated_at_log_index: -1
+             } =
+               Repo.get_by(Instance,
+                 token_id: instance.token_id,
+                 token_contract_address_hash: instance.token_contract_address_hash
+               )
+    end
+
+    test "update owners of token instances batch" do
+      instances =
+        for _ <- 0..5 do
+          token_address = insert(:contract_address)
+          insert(:token, contract_address: token_address, type: "ERC-721")
+
+          instance = insert(:token_instance, token_contract_address_hash: token_address.hash)
+
+          tt =
+            for _ <- 0..5 do
+              transaction =
+                :transaction
+                |> insert()
+                |> with_block()
+
+              for _ <- 0..5 do
+                insert(:token_transfer,
+                  token_ids: [instance.token_id],
+                  transaction: transaction,
+                  token_contract_address: token_address
+                )
+              end
+            end
+            |> Enum.concat()
+            |> Enum.max_by(fn tt -> {tt.block_number, tt.log_index} end)
+
+          %{
+            token_id: instance.token_id,
+            token_contract_address_hash: instance.token_contract_address_hash,
+            owner_address_hash: tt.to_address_hash,
+            owner_updated_at_block: tt.block_number,
+            owner_updated_at_log_index: tt.log_index
+          }
+        end
+
+      Helper.fetch_and_insert(instances)
+
+      for ti <- instances do
+        owner_address = ti.owner_address_hash
+        block_number = ti.owner_updated_at_block
+        log_index = ti.owner_updated_at_log_index
+
+        assert %Instance{
+                 owner_address_hash: ^owner_address,
+                 owner_updated_at_block: ^block_number,
+                 owner_updated_at_log_index: ^log_index
+               } =
+                 Repo.get_by(Instance,
+                   token_id: ti.token_id,
+                   token_contract_address_hash: ti.token_contract_address_hash
+                 )
+      end
+    end
+  end
+end
diff --git a/apps/explorer/test/support/factory.ex b/apps/explorer/test/support/factory.ex
index da2e13f6669d..b85a0fff6d82 100644
--- a/apps/explorer/test/support/factory.ex
+++ b/apps/explorer/test/support/factory.ex
@@ -863,6 +863,12 @@ defmodule Explorer.Factory do
     }
   end
 
+  def log_index_factory do
+    %{
+      log_index: sequence("token_id", & &1)
+    }
+  end
+
   def token_balance_factory do
     %TokenBalance{
       address: build(:address),
diff --git a/apps/indexer/lib/indexer/block/fetcher.ex b/apps/indexer/lib/indexer/block/fetcher.ex
index 4b0cf3aaa00b..5b5eaf0b8902 100644
--- a/apps/indexer/lib/indexer/block/fetcher.ex
+++ b/apps/indexer/lib/indexer/block/fetcher.ex
@@ -37,6 +37,7 @@ defmodule Indexer.Block.Fetcher do
     Addresses,
     AddressTokenBalances,
     MintTransfers,
+    TokenInstances,
     TokenTransfers,
     TransactionActions
   }
@@ -183,6 +184,7 @@ defmodule Indexer.Block.Fetcher do
          address_token_balances = AddressTokenBalances.params_set(%{token_transfers_params: token_transfers}),
          transaction_actions =
            Enum.map(transaction_actions, fn action -> Map.put(action, :data, Map.delete(action.data, :block_number)) end),
+         token_instances = TokenInstances.params_set(%{token_transfers_params: token_transfers}),
          basic_import_options = %{
            addresses: %{params: addresses},
            address_coin_balances: %{params: coin_balances_params_set},
@@ -198,7 +200,8 @@ defmodule Indexer.Block.Fetcher do
            token_transfers: %{params: token_transfers},
            tokens: %{on_conflict: :nothing, params: tokens},
            transactions: %{params: transactions_with_receipts},
-           withdrawals: %{params: withdrawals_params}
+           withdrawals: %{params: withdrawals_params},
+           token_instances: %{params: token_instances}
          },
          import_options =
            (if Application.get_env(:explorer, :chain_type) == "polygon_edge" do
diff --git a/apps/indexer/lib/indexer/fetcher/token_instance/legacy_sanitize.ex b/apps/indexer/lib/indexer/fetcher/token_instance/legacy_sanitize.ex
new file mode 100644
index 000000000000..1fe11e1d90dc
--- /dev/null
+++ b/apps/indexer/lib/indexer/fetcher/token_instance/legacy_sanitize.ex
@@ -0,0 +1,58 @@
+defmodule Indexer.Fetcher.TokenInstance.LegacySanitize do
+  @moduledoc """
+    This fetcher is stands for creating token instances which wasn't inserted yet and index meta for them. Legacy is because now we token instances inserted on block import and this fetcher is only for historical and unfetched for some reasons data
+  """
+
+  use Indexer.Fetcher, restart: :permanent
+  use Spandex.Decorators
+
+  import Indexer.Fetcher.TokenInstance.Helper
+
+  alias Explorer.Chain
+  alias Indexer.BufferedTask
+
+  @behaviour BufferedTask
+
+  @default_max_batch_size 10
+  @default_max_concurrency 10
+  @doc false
+  def child_spec([init_options, gen_server_options]) do
+    merged_init_opts =
+      defaults()
+      |> Keyword.merge(init_options)
+      |> Keyword.merge(state: [])
+
+    Supervisor.child_spec({BufferedTask, [{__MODULE__, merged_init_opts}, gen_server_options]}, id: __MODULE__)
+  end
+
+  @impl BufferedTask
+  def init(initial_acc, reducer, _) do
+    {:ok, acc} =
+      Chain.stream_not_inserted_token_instances(initial_acc, fn data, acc ->
+        reducer.(data, acc)
+      end)
+
+    acc
+  end
+
+  @impl BufferedTask
+  def run(token_instances, _) when is_list(token_instances) do
+    token_instances
+    |> Enum.filter(fn %{contract_address_hash: hash, token_id: token_id} ->
+      not Chain.token_instance_exists?(token_id, hash)
+    end)
+    |> batch_fetch_instances()
+
+    :ok
+  end
+
+  defp defaults do
+    [
+      flush_interval: :infinity,
+      max_concurrency: Application.get_env(:indexer, __MODULE__)[:concurrency] || @default_max_concurrency,
+      max_batch_size: Application.get_env(:indexer, __MODULE__)[:batch_size] || @default_max_batch_size,
+      poll: false,
+      task_supervisor: __MODULE__.TaskSupervisor
+    ]
+  end
+end
diff --git a/apps/indexer/lib/indexer/fetcher/token_instance/realtime.ex b/apps/indexer/lib/indexer/fetcher/token_instance/realtime.ex
index 804c9258c851..14375b16018a 100644
--- a/apps/indexer/lib/indexer/fetcher/token_instance/realtime.ex
+++ b/apps/indexer/lib/indexer/fetcher/token_instance/realtime.ex
@@ -35,7 +35,7 @@ defmodule Indexer.Fetcher.TokenInstance.Realtime do
   def run(token_instances, _) when is_list(token_instances) do
     token_instances
     |> Enum.filter(fn %{contract_address_hash: hash, token_id: token_id} ->
-      not Chain.token_instance_exists?(token_id, hash)
+      Chain.token_instance_with_unfetched_metadata?(token_id, hash)
     end)
     |> batch_fetch_instances()
 
diff --git a/apps/indexer/lib/indexer/fetcher/token_instance/sanitize.ex b/apps/indexer/lib/indexer/fetcher/token_instance/sanitize.ex
index 1bc3a70bd1f1..f2cc5fa71d96 100644
--- a/apps/indexer/lib/indexer/fetcher/token_instance/sanitize.ex
+++ b/apps/indexer/lib/indexer/fetcher/token_instance/sanitize.ex
@@ -28,7 +28,7 @@ defmodule Indexer.Fetcher.TokenInstance.Sanitize do
   @impl BufferedTask
   def init(initial_acc, reducer, _) do
     {:ok, acc} =
-      Chain.stream_unfetched_token_instances(initial_acc, fn data, acc ->
+      Chain.stream_token_instances_with_unfetched_metadata(initial_acc, fn data, acc ->
         reducer.(data, acc)
       end)
 
@@ -39,7 +39,7 @@ defmodule Indexer.Fetcher.TokenInstance.Sanitize do
   def run(token_instances, _) when is_list(token_instances) do
     token_instances
     |> Enum.filter(fn %{contract_address_hash: hash, token_id: token_id} ->
-      not Chain.token_instance_exists?(token_id, hash)
+      Chain.token_instance_with_unfetched_metadata?(token_id, hash)
     end)
     |> batch_fetch_instances()
 
diff --git a/apps/indexer/lib/indexer/supervisor.ex b/apps/indexer/lib/indexer/supervisor.ex
index ccbeddca5045..732c71727a71 100644
--- a/apps/indexer/lib/indexer/supervisor.ex
+++ b/apps/indexer/lib/indexer/supervisor.ex
@@ -13,6 +13,7 @@ defmodule Indexer.Supervisor do
 
   alias Indexer.Block.Catchup, as: BlockCatchup
   alias Indexer.Block.Realtime, as: BlockRealtime
+  alias Indexer.Fetcher.TokenInstance.LegacySanitize, as: TokenInstanceLegacySanitize
   alias Indexer.Fetcher.TokenInstance.Realtime, as: TokenInstanceRealtime
   alias Indexer.Fetcher.TokenInstance.Retry, as: TokenInstanceRetry
   alias Indexer.Fetcher.TokenInstance.Sanitize, as: TokenInstanceSanitize
@@ -115,6 +116,7 @@ defmodule Indexer.Supervisor do
         {TokenInstanceRealtime.Supervisor, [[memory_monitor: memory_monitor]]},
         {TokenInstanceRetry.Supervisor, [[memory_monitor: memory_monitor]]},
         {TokenInstanceSanitize.Supervisor, [[memory_monitor: memory_monitor]]},
+        {TokenInstanceLegacySanitize.Supervisor, [[memory_monitor: memory_monitor]]},
         configure(TransactionAction.Supervisor, [[memory_monitor: memory_monitor]]),
         {ContractCode.Supervisor,
          [[json_rpc_named_arguments: json_rpc_named_arguments, memory_monitor: memory_monitor]]},
diff --git a/apps/indexer/lib/indexer/transform/address_token_balances.ex b/apps/indexer/lib/indexer/transform/address_token_balances.ex
index cae8b2cbac7b..291783f6a2ba 100644
--- a/apps/indexer/lib/indexer/transform/address_token_balances.ex
+++ b/apps/indexer/lib/indexer/transform/address_token_balances.ex
@@ -11,7 +11,6 @@ defmodule Indexer.Transform.AddressTokenBalances do
 
   defp reducer({:token_transfers_params, token_transfers_params}, initial) when is_list(token_transfers_params) do
     token_transfers_params
-    |> ignore_burn_address_transfers_for_token_erc_721()
     |> Enum.reduce(initial, fn %{
                                  block_number: block_number,
                                  from_address_hash: from_address_hash,
@@ -31,10 +30,6 @@ defmodule Indexer.Transform.AddressTokenBalances do
     end)
   end
 
-  defp ignore_burn_address_transfers_for_token_erc_721(token_transfers_params) do
-    Enum.filter(token_transfers_params, &do_filter_burn_address/1)
-  end
-
   defp add_token_balance_address(map_set, unquote(burn_address_hash_string()), _, _, _, _), do: map_set
 
   defp add_token_balance_address(map_set, address, token_contract_address, token_id, token_type, block_number) do
@@ -46,12 +41,4 @@ defmodule Indexer.Transform.AddressTokenBalances do
       token_type: token_type
     })
   end
-
-  def do_filter_burn_address(%{to_address_hash: unquote(burn_address_hash_string()), token_type: "ERC-721"}) do
-    false
-  end
-
-  def do_filter_burn_address(_token_balance_param) do
-    true
-  end
 end
diff --git a/apps/indexer/lib/indexer/transform/token_instances.ex b/apps/indexer/lib/indexer/transform/token_instances.ex
new file mode 100644
index 000000000000..a9fb4372d2fd
--- /dev/null
+++ b/apps/indexer/lib/indexer/transform/token_instances.ex
@@ -0,0 +1,88 @@
+defmodule Indexer.Transform.TokenInstances do
+  @moduledoc """
+    Module extracts token instances from token transfers
+  """
+
+  def params_set(%{} = import_options) do
+    Enum.reduce(import_options, %{}, &reducer/2)
+  end
+
+  defp reducer({:token_transfers_params, token_transfers_params}, initial) when is_list(token_transfers_params) do
+    token_transfers_params
+    |> Enum.reduce(initial, fn
+      %{
+        block_number: block_number,
+        from_address_hash: from_address_hash,
+        to_address_hash: to_address_hash,
+        token_contract_address_hash: token_contract_address_hash,
+        token_ids: [_ | _]
+      } = tt,
+      acc
+      when is_integer(block_number) and
+             is_binary(from_address_hash) and
+             is_binary(to_address_hash) and is_binary(token_contract_address_hash) ->
+        transfer_to_instances(tt, acc)
+
+      _, acc ->
+        acc
+    end)
+    |> Map.values()
+  end
+
+  defp transfer_to_instances(
+         %{
+           token_type: "ERC-721" = token_type,
+           to_address_hash: to_address_hash,
+           token_ids: [token_id],
+           token_contract_address_hash: token_contract_address_hash,
+           block_number: block_number,
+           log_index: log_index
+         },
+         acc
+       ) do
+    params = %{
+      token_contract_address_hash: token_contract_address_hash,
+      token_id: token_id,
+      token_type: token_type,
+      owner_address_hash: to_address_hash,
+      owner_updated_at_block: block_number,
+      owner_updated_at_log_index: log_index
+    }
+
+    current_key = {token_contract_address_hash, token_id}
+
+    Map.put(
+      acc,
+      current_key,
+      Enum.max_by(
+        [
+          params,
+          acc[current_key] || params
+        ],
+        fn %{
+             owner_updated_at_block: owner_updated_at_block,
+             owner_updated_at_log_index: owner_updated_at_log_index
+           } ->
+          {owner_updated_at_block, owner_updated_at_log_index}
+        end
+      )
+    )
+  end
+
+  defp transfer_to_instances(
+         %{
+           token_type: _token_type,
+           token_ids: [_ | _] = token_ids,
+           token_contract_address_hash: token_contract_address_hash
+         },
+         acc
+       ) do
+    Enum.reduce(token_ids, acc, fn id, sub_acc ->
+      Map.put(sub_acc, {token_contract_address_hash, id}, %{
+        token_contract_address_hash: token_contract_address_hash,
+        token_id: id,
+        token_type: "ERC-1155"
+      })
+    end)
+  end
+end
diff --git a/apps/indexer/test/indexer/transform/address_token_balances_test.exs b/apps/indexer/test/indexer/transform/address_token_balances_test.exs
index 04111ff26215..b70e2f84fe09 100644
--- a/apps/indexer/test/indexer/transform/address_token_balances_test.exs
+++ b/apps/indexer/test/indexer/transform/address_token_balances_test.exs
@@ -66,7 +66,7 @@ defmodule Indexer.Transform.AddressTokenBalancesTest do
                ])
     end
 
-    test "does not set params when the to_address_hash is the burn address for the Token ERC-721" do
+    test "does set params when the to_address_hash is the burn address for the Token ERC-721" do
       block_number = 1
       from_address_hash = "0x5b8410f67eb8040bb1cd1e8a4ff9d5f6ce678a15"
       to_address_hash = "0x0000000000000000000000000000000000000000"
@@ -77,12 +77,22 @@ defmodule Indexer.Transform.AddressTokenBalancesTest do
         from_address_hash: from_address_hash,
         to_address_hash: to_address_hash,
         token_contract_address_hash: token_contract_address_hash,
-        token_type: "ERC-721"
+        token_type: "ERC-721",
+        token_ids: [1]
       }
 
       params_set = AddressTokenBalances.params_set(%{token_transfers_params: [token_transfer_params]})
 
-      assert MapSet.size(params_set) == 0
+      assert params_set ==
+               MapSet.new([
+                 %{
+                   address_hash: "0x5b8410f67eb8040bb1cd1e8a4ff9d5f6ce678a15",
+                   block_number: 1,
+                   token_contract_address_hash: "0xe18035bf8712672935fdb4e5e431b1a0183d2dfc",
+                   token_id: 1,
+                   token_type: "ERC-721"
+                 }
+               ])
     end
   end
 end
diff --git a/config/runtime.exs b/config/runtime.exs
index 2d51abb6198b..e83d0489d833 100644
--- a/config/runtime.exs
+++ b/config/runtime.exs
@@ -412,6 +412,10 @@ config :explorer, Explorer.Chain.Fetcher.LookUpSmartContractSourcesOnDemand,
 config :explorer, Explorer.Chain.Cache.MinMissingBlockNumber,
   enabled: !ConfigHelper.parse_bool_env_var("DISABLE_INDEXER")
 
+config :explorer, Explorer.TokenInstanceOwnerAddressMigration,
+  concurrency: ConfigHelper.parse_integer_env_var("TOKEN_INSTANCE_OWNER_MIGRATION_CONCURRENCY", 5),
+  batch_size: ConfigHelper.parse_integer_env_var("TOKEN_INSTANCE_OWNER_MIGRATION_BATCH_SIZE", 50)
+
 ###############
 ### Indexer ###
 ###############
@@ -502,6 +506,9 @@ config :indexer, Indexer.Fetcher.TokenInstance.Retry.Supervisor,
 config :indexer, Indexer.Fetcher.TokenInstance.Sanitize.Supervisor,
   disabled?: ConfigHelper.parse_bool_env_var("INDEXER_DISABLE_TOKEN_INSTANCE_SANITIZE_FETCHER")
 
+config :indexer, Indexer.Fetcher.TokenInstance.LegacySanitize.Supervisor,
+  disabled?: ConfigHelper.parse_bool_env_var("INDEXER_DISABLE_TOKEN_INSTANCE_LEGACY_SANITIZE_FETCHER", "true")
+
 config :indexer, Indexer.Fetcher.EmptyBlocksSanitizer,
   batch_size: ConfigHelper.parse_integer_env_var("INDEXER_EMPTY_BLOCKS_SANITIZER_BATCH_SIZE", 100)
 
@@ -532,6 +539,10 @@ config :indexer, Indexer.Fetcher.TokenInstance.Sanitize,
   concurrency: ConfigHelper.parse_integer_env_var("INDEXER_TOKEN_INSTANCE_SANITIZE_CONCURRENCY", 10),
   batch_size: ConfigHelper.parse_integer_env_var("INDEXER_TOKEN_INSTANCE_SANITIZE_BATCH_SIZE", 10)
 
+config :indexer, Indexer.Fetcher.TokenInstance.LegacySanitize,
+  concurrency: ConfigHelper.parse_integer_env_var("INDEXER_TOKEN_INSTANCE_LEGACY_SANITIZE_CONCURRENCY", 10),
+  batch_size: ConfigHelper.parse_integer_env_var("INDEXER_TOKEN_INSTANCE_LEGACY_SANITIZE_BATCH_SIZE", 10)
+
 config :indexer, Indexer.Fetcher.InternalTransaction,
   batch_size: ConfigHelper.parse_integer_env_var("INDEXER_INTERNAL_TRANSACTIONS_BATCH_SIZE", 10),
   concurrency: ConfigHelper.parse_integer_env_var("INDEXER_INTERNAL_TRANSACTIONS_CONCURRENCY", 4),
diff --git a/docker-compose/envs/common-blockscout.env b/docker-compose/envs/common-blockscout.env
index 5d8c29b3c563..6211113d22f6 100644
--- a/docker-compose/envs/common-blockscout.env
+++ b/docker-compose/envs/common-blockscout.env
@@ -100,6 +100,7 @@ DISABLE_REALTIME_INDEXER=false
 INDEXER_DISABLE_TOKEN_INSTANCE_REALTIME_FETCHER=false
 INDEXER_DISABLE_TOKEN_INSTANCE_RETRY_FETCHER=false
 INDEXER_DISABLE_TOKEN_INSTANCE_SANITIZE_FETCHER=false
+INDEXER_DISABLE_TOKEN_INSTANCE_LEGACY_SANITIZE_FETCHER=false
 INDEXER_DISABLE_PENDING_TRANSACTIONS_FETCHER=false
 INDEXER_DISABLE_INTERNAL_TRANSACTIONS_FETCHER=false
 # INDEXER_CATCHUP_BLOCKS_BATCH_SIZE=
@@ -113,6 +114,7 @@ INDEXER_DISABLE_INTERNAL_TRANSACTIONS_FETCHER=false
 # INDEXER_TOKEN_INSTANCE_RETRY_CONCURRENCY=
 # INDEXER_TOKEN_INSTANCE_REALTIME_CONCURRENCY=
 # INDEXER_TOKEN_INSTANCE_SANITIZE_CONCURRENCY=
+# INDEXER_TOKEN_INSTANCE_LEGACY_SANITIZE_CONCURRENCY=10
 # INDEXER_COIN_BALANCES_BATCH_SIZE=
 # INDEXER_COIN_BALANCES_CONCURRENCY=
 # INDEXER_RECEIPTS_BATCH_SIZE=
@@ -230,4 +232,7 @@ EIP_1559_ELASTICITY_MULTIPLIER=2
 # INDEXER_TOKEN_INSTANCE_RETRY_BATCH_SIZE=10
 # INDEXER_TOKEN_INSTANCE_REALTIME_BATCH_SIZE=1
 # INDEXER_TOKEN_INSTANCE_SANITIZE_BATCH_SIZE=10
-API_V2_ENABLED=true
\ No newline at end of file
+API_V2_ENABLED=true
+# INDEXER_TOKEN_INSTANCE_LEGACY_SANITIZE_BATCH_SIZE=10
+# TOKEN_INSTANCE_OWNER_MIGRATION_CONCURRENCY=5
+# TOKEN_INSTANCE_OWNER_MIGRATION_BATCH_SIZE=50

From 5adcca011cc82858e848da4aa7bd490610df06ca Mon Sep 17 00:00:00 2001
From: Viktor Baranov <baranov.viktor.27@gmail.com>
Date: Wed, 27 Sep 2023 17:17:43 +0300
Subject: [PATCH 449/909] Add CHAIN_TYPE build arg to Dockerfile

---
 CHANGELOG.md      | 1 +
 docker/Dockerfile | 4 ++++
 2 files changed, 5 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0696b53b234f..9394771c1a57 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,6 +11,7 @@
 
 ### Fixes
 
+- [#8552](https://github.com/blockscout/blockscout/pull/8552) - Add CHAIN_TYPE build arg to Dockerfile
 - [#8515](https://github.com/blockscout/blockscout/pull/8515) - Fix `:error.types/0 is undefined` warning
 - [#7959](https://github.com/blockscout/blockscout/pull/7959) - Fix empty batch transfers handling
 - [#8513](https://github.com/blockscout/blockscout/pull/8513) - Don't override transaction status
diff --git a/docker/Dockerfile b/docker/Dockerfile
index aba6de879ff1..ba1ccd8f85d6 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -18,6 +18,8 @@ ARG MIXPANEL_TOKEN
 ARG MIXPANEL_URL
 ARG AMPLITUDE_API_KEY
 ARG AMPLITUDE_URL
+ARG CHAIN_TYPE
+ENV CHAIN_TYPE=${CHAIN_TYPE}
 
 # Cache elixir deps
 ADD mix.exs mix.lock ./
@@ -59,6 +61,8 @@ FROM bitwalker/alpine-elixir-phoenix:1.14
 
 ARG RELEASE_VERSION
 ENV RELEASE_VERSION=${RELEASE_VERSION}
+ARG CHAIN_TYPE
+ENV CHAIN_TYPE=${CHAIN_TYPE}
 ARG BLOCKSCOUT_VERSION
 ENV BLOCKSCOUT_VERSION=${BLOCKSCOUT_VERSION}
 

From 88a618d7c0599ef1b87e9fdbe56b58a6a119e2f2 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 27 Sep 2023 18:29:22 +0000
Subject: [PATCH 450/909] Bump @amplitude/analytics-browser in
 /apps/block_scout_web/assets

Bumps [@amplitude/analytics-browser](https://github.com/amplitude/Amplitude-TypeScript) from 2.3.1 to 2.3.2.
- [Release notes](https://github.com/amplitude/Amplitude-TypeScript/releases)
- [Commits](https://github.com/amplitude/Amplitude-TypeScript/compare/@amplitude/analytics-browser@2.3.1...@amplitude/analytics-browser@2.3.2)

---
updated-dependencies:
- dependency-name: "@amplitude/analytics-browser"
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 apps/block_scout_web/assets/package-lock.json | 46 +++++++++----------
 apps/block_scout_web/assets/package.json      |  2 +-
 2 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/apps/block_scout_web/assets/package-lock.json b/apps/block_scout_web/assets/package-lock.json
index 4a7e289372d2..50f5ff5e635f 100644
--- a/apps/block_scout_web/assets/package-lock.json
+++ b/apps/block_scout_web/assets/package-lock.json
@@ -7,7 +7,7 @@
       "name": "blockscout",
       "license": "GPL-3.0",
       "dependencies": {
-        "@amplitude/analytics-browser": "^2.3.1",
+        "@amplitude/analytics-browser": "^2.3.2",
         "@fortawesome/fontawesome-free": "^6.4.2",
         "@tarekraafat/autocomplete.js": "^10.2.7",
         "@walletconnect/web3-provider": "^1.8.0",
@@ -116,15 +116,15 @@
       }
     },
     "node_modules/@amplitude/analytics-browser": {
-      "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/@amplitude/analytics-browser/-/analytics-browser-2.3.1.tgz",
-      "integrity": "sha512-sDX6Nupw6SSsTfaCYrrIwRys4Ins/H7TzmJimEqM4bEoKmM9ONkKFAAF+E9sQz9XvMr5iBBqbmb5Sd+u3f7SRA==",
+      "version": "2.3.2",
+      "resolved": "https://registry.npmjs.org/@amplitude/analytics-browser/-/analytics-browser-2.3.2.tgz",
+      "integrity": "sha512-Zjk/PeCc0PZuzWlsGaf/i6qkkofqJvToh41tPhkOIFvLJlv/3cHtB2WXEod9vj20m+XcNoBATbcFAQgl2ubTeA==",
       "dependencies": {
         "@amplitude/analytics-client-common": "^2.0.6",
         "@amplitude/analytics-core": "^2.0.5",
         "@amplitude/analytics-types": "^2.2.0",
-        "@amplitude/plugin-page-view-tracking-browser": "^2.0.11",
-        "@amplitude/plugin-web-attribution-browser": "^2.0.11",
+        "@amplitude/plugin-page-view-tracking-browser": "^2.0.12",
+        "@amplitude/plugin-web-attribution-browser": "^2.0.12",
         "tslib": "^2.4.1"
       }
     },
@@ -174,9 +174,9 @@
       "integrity": "sha512-HThPlsX5KnxCorQnPVNQR8WZy0/PdgAzlT5n8bubjSmzPEWQgvn8bQzD48wYXoAkEZxlfYlaSnx7IxD5j3N1Dw=="
     },
     "node_modules/@amplitude/plugin-page-view-tracking-browser": {
-      "version": "2.0.11",
-      "resolved": "https://registry.npmjs.org/@amplitude/plugin-page-view-tracking-browser/-/plugin-page-view-tracking-browser-2.0.11.tgz",
-      "integrity": "sha512-GZ5JpyZOX6Ejif+m9vE/H8XbB41OkPOLDzIudd52vVlZN/o5Pmovb5UyDW+C9osNP7mra7YeB28vrJwqN18IbQ==",
+      "version": "2.0.12",
+      "resolved": "https://registry.npmjs.org/@amplitude/plugin-page-view-tracking-browser/-/plugin-page-view-tracking-browser-2.0.12.tgz",
+      "integrity": "sha512-0QJJZocqQ+MltQcI4BkshQJcUOM9mIOiud0BnDPcwAbUjlzGVG+xm4KuOA3bjfGGcSF7I6mpnOnG3nPkX5k47A==",
       "dependencies": {
         "@amplitude/analytics-client-common": "^2.0.6",
         "@amplitude/analytics-types": "^2.2.0",
@@ -189,9 +189,9 @@
       "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q=="
     },
     "node_modules/@amplitude/plugin-web-attribution-browser": {
-      "version": "2.0.11",
-      "resolved": "https://registry.npmjs.org/@amplitude/plugin-web-attribution-browser/-/plugin-web-attribution-browser-2.0.11.tgz",
-      "integrity": "sha512-5NyjGq6FaNCU2ZBuaViaqf3/x9JQOghA40gjNoGSpsogeZZbxdpZDDMWbE3Zq5+ruTGbwed6IqlrFkT3NUQyZw==",
+      "version": "2.0.12",
+      "resolved": "https://registry.npmjs.org/@amplitude/plugin-web-attribution-browser/-/plugin-web-attribution-browser-2.0.12.tgz",
+      "integrity": "sha512-Ii5lzsixf+2E9f+K2Knk3q/O9tYkoFDm0E9KfPhvkNM27mRLtJ1/YTfvmW4otaYrnPwcvl2Y5E9tzATVrmIelw==",
       "dependencies": {
         "@amplitude/analytics-client-common": "^2.0.6",
         "@amplitude/analytics-core": "^2.0.5",
@@ -17695,15 +17695,15 @@
       "dev": true
     },
     "@amplitude/analytics-browser": {
-      "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/@amplitude/analytics-browser/-/analytics-browser-2.3.1.tgz",
-      "integrity": "sha512-sDX6Nupw6SSsTfaCYrrIwRys4Ins/H7TzmJimEqM4bEoKmM9ONkKFAAF+E9sQz9XvMr5iBBqbmb5Sd+u3f7SRA==",
+      "version": "2.3.2",
+      "resolved": "https://registry.npmjs.org/@amplitude/analytics-browser/-/analytics-browser-2.3.2.tgz",
+      "integrity": "sha512-Zjk/PeCc0PZuzWlsGaf/i6qkkofqJvToh41tPhkOIFvLJlv/3cHtB2WXEod9vj20m+XcNoBATbcFAQgl2ubTeA==",
       "requires": {
         "@amplitude/analytics-client-common": "^2.0.6",
         "@amplitude/analytics-core": "^2.0.5",
         "@amplitude/analytics-types": "^2.2.0",
-        "@amplitude/plugin-page-view-tracking-browser": "^2.0.11",
-        "@amplitude/plugin-web-attribution-browser": "^2.0.11",
+        "@amplitude/plugin-page-view-tracking-browser": "^2.0.12",
+        "@amplitude/plugin-web-attribution-browser": "^2.0.12",
         "tslib": "^2.4.1"
       },
       "dependencies": {
@@ -17759,9 +17759,9 @@
       "integrity": "sha512-HThPlsX5KnxCorQnPVNQR8WZy0/PdgAzlT5n8bubjSmzPEWQgvn8bQzD48wYXoAkEZxlfYlaSnx7IxD5j3N1Dw=="
     },
     "@amplitude/plugin-page-view-tracking-browser": {
-      "version": "2.0.11",
-      "resolved": "https://registry.npmjs.org/@amplitude/plugin-page-view-tracking-browser/-/plugin-page-view-tracking-browser-2.0.11.tgz",
-      "integrity": "sha512-GZ5JpyZOX6Ejif+m9vE/H8XbB41OkPOLDzIudd52vVlZN/o5Pmovb5UyDW+C9osNP7mra7YeB28vrJwqN18IbQ==",
+      "version": "2.0.12",
+      "resolved": "https://registry.npmjs.org/@amplitude/plugin-page-view-tracking-browser/-/plugin-page-view-tracking-browser-2.0.12.tgz",
+      "integrity": "sha512-0QJJZocqQ+MltQcI4BkshQJcUOM9mIOiud0BnDPcwAbUjlzGVG+xm4KuOA3bjfGGcSF7I6mpnOnG3nPkX5k47A==",
       "requires": {
         "@amplitude/analytics-client-common": "^2.0.6",
         "@amplitude/analytics-types": "^2.2.0",
@@ -17776,9 +17776,9 @@
       }
     },
     "@amplitude/plugin-web-attribution-browser": {
-      "version": "2.0.11",
-      "resolved": "https://registry.npmjs.org/@amplitude/plugin-web-attribution-browser/-/plugin-web-attribution-browser-2.0.11.tgz",
-      "integrity": "sha512-5NyjGq6FaNCU2ZBuaViaqf3/x9JQOghA40gjNoGSpsogeZZbxdpZDDMWbE3Zq5+ruTGbwed6IqlrFkT3NUQyZw==",
+      "version": "2.0.12",
+      "resolved": "https://registry.npmjs.org/@amplitude/plugin-web-attribution-browser/-/plugin-web-attribution-browser-2.0.12.tgz",
+      "integrity": "sha512-Ii5lzsixf+2E9f+K2Knk3q/O9tYkoFDm0E9KfPhvkNM27mRLtJ1/YTfvmW4otaYrnPwcvl2Y5E9tzATVrmIelw==",
       "requires": {
         "@amplitude/analytics-client-common": "^2.0.6",
         "@amplitude/analytics-core": "^2.0.5",
diff --git a/apps/block_scout_web/assets/package.json b/apps/block_scout_web/assets/package.json
index beeae5ef9b42..398e36537eca 100644
--- a/apps/block_scout_web/assets/package.json
+++ b/apps/block_scout_web/assets/package.json
@@ -20,7 +20,7 @@
   },
   "dependencies": {
     "@fortawesome/fontawesome-free": "^6.4.2",
-    "@amplitude/analytics-browser": "^2.3.1",
+    "@amplitude/analytics-browser": "^2.3.2",
     "@tarekraafat/autocomplete.js": "^10.2.7",
     "@walletconnect/web3-provider": "^1.8.0",
     "assert": "^2.1.0",

From 394de45bdc1108f4e7c4a6e8964e076808e464f3 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 27 Sep 2023 21:42:11 +0000
Subject: [PATCH 451/909] Bump get-func-name from 2.0.0 to 2.0.2 in
 /apps/block_scout_web/assets

Bumps [get-func-name](https://github.com/chaijs/get-func-name) from 2.0.0 to 2.0.2.
- [Release notes](https://github.com/chaijs/get-func-name/releases)
- [Commits](https://github.com/chaijs/get-func-name/commits/v2.0.2)

---
updated-dependencies:
- dependency-name: get-func-name
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 apps/block_scout_web/assets/package-lock.json | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/apps/block_scout_web/assets/package-lock.json b/apps/block_scout_web/assets/package-lock.json
index 50f5ff5e635f..273257e62ab4 100644
--- a/apps/block_scout_web/assets/package-lock.json
+++ b/apps/block_scout_web/assets/package-lock.json
@@ -8969,9 +8969,9 @@
       }
     },
     "node_modules/get-func-name": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/get-func-name/-/get-func-name-2.0.0.tgz",
-      "integrity": "sha1-6td0q+5y4gQJQzoGY2YCPdaIekE=",
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/get-func-name/-/get-func-name-2.0.2.tgz",
+      "integrity": "sha512-8vXOvuE167CtIc3OyItco7N/dpRtBbYOsPsXCz7X/PMnlGjYjSGuZJgM1Y7mmew7BKf9BqvLX2tnOVy1BBUsxQ==",
       "engines": {
         "node": "*"
       }
@@ -24457,9 +24457,9 @@
       "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg=="
     },
     "get-func-name": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/get-func-name/-/get-func-name-2.0.0.tgz",
-      "integrity": "sha1-6td0q+5y4gQJQzoGY2YCPdaIekE="
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/get-func-name/-/get-func-name-2.0.2.tgz",
+      "integrity": "sha512-8vXOvuE167CtIc3OyItco7N/dpRtBbYOsPsXCz7X/PMnlGjYjSGuZJgM1Y7mmew7BKf9BqvLX2tnOVy1BBUsxQ=="
     },
     "get-intrinsic": {
       "version": "1.2.1",

From 4167926ed3d2a9a1d82755c5067059aebe63aee6 Mon Sep 17 00:00:00 2001
From: Viktor Baranov <baranov.viktor.27@gmail.com>
Date: Thu, 28 Sep 2023 11:42:11 +0300
Subject: [PATCH 452/909] Apply new issue template to the footer

---
 .github/ISSUE_TEMPLATE/bug_report.yml         | 29 +++--------
 CHANGELOG.md                                  |  2 +-
 .../templates/layout/_footer.html.eex         |  2 +-
 .../lib/block_scout_web/views/layout_view.ex  | 52 ++++++-------------
 4 files changed, 24 insertions(+), 61 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
index 8f563f127a40..bcd36c1e76b6 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -30,32 +30,21 @@ body:
     validations:
       required: true
 
-  - type: dropdown
+  - type: input
     id: archive-node-type
     attributes:
       label: Type of the JSON RPC archive node
       description: Which type of archive node is used.
-      options:
-          - Erigon
-          - Geth
-          - Nethermind
-          - Reth
-          - PolygonEdge
-          - Besu
-          - OpenEthereum
-          - Other
+      placeholder: "Erigon/Geth/Nethermind/Reth/PolygonEdge/Besu/OpenEthereum/..."
     validations:
       required: true
 
-  - type: dropdown
+  - type: input
     id: chain-type
     attributes:
       label: Type of the chain
       description: Type of the chain.
-      options:
-          - L1
-          - L2
-          - Other
+      placeholder: L1/L2/... 
 
   - type: input
     id: link
@@ -96,16 +85,12 @@ body:
     validations:
       required: true
 
-  - type: dropdown
-    id: operating-system
+  - type: input
+    id: os-version
     attributes:
       label: Operating system
       description: The operating system this issue occurred with.
-      options:
-        - macOS
-        - Windows
-        - Linux
-        - Other
+      placeholder: Linux/macOS/Windows
 
   - type: textarea
     id: additional-information
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9394771c1a57..cf2d1373cfc2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -18,7 +18,7 @@
 
 ### Chore
 
-- [#8536](https://github.com/blockscout/blockscout/pull/8536), [#8537](https://github.com/blockscout/blockscout/pull/8537), [#8540](https://github.com/blockscout/blockscout/pull/8540) - New issue template
+- [#8536](https://github.com/blockscout/blockscout/pull/8536), [#8537](https://github.com/blockscout/blockscout/pull/8537), [#8540](https://github.com/blockscout/blockscout/pull/8540), [#8557](https://github.com/blockscout/blockscout/pull/8557) - New issue template
 - [#8529](https://github.com/blockscout/blockscout/pull/8529) - Move PolygonEdge-related migration to the corresponding ecto repository
 - [#8504](https://github.com/blockscout/blockscout/pull/8504) - Deploy new UI through Makefile
 - [#8501](https://github.com/blockscout/blockscout/pull/8501) - Conceal secondary ports in docker compose setup
diff --git a/apps/block_scout_web/lib/block_scout_web/templates/layout/_footer.html.eex b/apps/block_scout_web/lib/block_scout_web/templates/layout/_footer.html.eex
index 0f82cf278d16..ff88dd8c8fdc 100644
--- a/apps/block_scout_web/lib/block_scout_web/templates/layout/_footer.html.eex
+++ b/apps/block_scout_web/lib/block_scout_web/templates/layout/_footer.html.eex
@@ -38,7 +38,7 @@
       <div class="col-xs-12 col-md-4 col-lg-<%= col_size %> footer-list">
         <h3>BlockScout</h3>
         <ul>
-          <li><a href="<%= issue_link(@conn) %>" rel="noreferrer" class="footer-link" target="_blank"><%= gettext("Submit an Issue") %></a></li>
+          <li><a href="<%= issue_link() %>" rel="noreferrer" class="footer-link" target="_blank"><%= gettext("Submit an Issue") %></a></li>
           <li><a href="<%= Application.get_env(:block_scout_web, :footer)[:github_link] %>" rel="noreferrer" class="footer-link"><%= gettext("Contribute") %></a></li>
           <li><a href="<%= Application.get_env(:block_scout_web, :footer)[:chat_link] %>" rel="noreferrer" class="footer-link"><%= gettext("Chat (#blockscout)") %></a></li>
           <%= if Application.get_env(:block_scout_web, :footer)[:forum_link_enabled] && Application.get_env(:block_scout_web, :footer)[:forum_link] do %>
diff --git a/apps/block_scout_web/lib/block_scout_web/views/layout_view.ex b/apps/block_scout_web/lib/block_scout_web/views/layout_view.ex
index 5fc7f022b634..087281480eb1 100644
--- a/apps/block_scout_web/lib/block_scout_web/views/layout_view.ex
+++ b/apps/block_scout_web/lib/block_scout_web/views/layout_view.ex
@@ -1,8 +1,8 @@
 defmodule BlockScoutWeb.LayoutView do
   use BlockScoutWeb, :view
 
+  alias EthereumJSONRPC.Variant
   alias Explorer.Chain
-  alias Plug.Conn
   alias Poison.Parser
 
   import BlockScoutWeb.APIDocsView, only: [blockscout_url: 1]
@@ -63,11 +63,21 @@ defmodule BlockScoutWeb.LayoutView do
     SocialMedia.links()
   end
 
-  def issue_link(conn) do
+  @doc """
+  Generates URL for new issue creation on Github
+  """
+  @spec issue_link() :: [term()]
+  def issue_link do
+    {os_family, os_name} = :os.type()
+
     params = [
-      labels: "BlockScout",
-      body: issue_body(conn),
-      title: subnetwork_title() <> ": <Issue Title>"
+      template: "bug_report.yml",
+      labels: "triage",
+      "backend-version": "Elixir #{version()} Erlang/OTP #{System.otp_release()}",
+      "elixir-version": System.version(),
+      "os-version": "#{os_family} #{os_name}",
+      "archive-node-type": Variant.get(),
+      "additional-information": "The issue happened at #{subnetwork_title()} Blockscout instance"
     ]
 
     issue_url = "#{Application.get_env(:block_scout_web, :footer)[:github_link]}/issues/new"
@@ -75,38 +85,6 @@ defmodule BlockScoutWeb.LayoutView do
     [issue_url, "?", URI.encode_query(params)]
   end
 
-  defp issue_body(conn) do
-    user_agent =
-      case Conn.get_req_header(conn, "user-agent") do
-        [] -> "unknown"
-        [user_agent] -> if String.valid?(user_agent), do: user_agent, else: "unknown"
-        _other -> "unknown"
-      end
-
-    """
-    *Describe your issue here.*
-
-    ### Environment
-    * Elixir Version: #{System.version()}
-    * Erlang Version: #{System.otp_release()}
-    * BlockScout Version: #{version()}
-
-    * User Agent: `#{user_agent}`
-
-    ### Steps to reproduce
-
-    *Tell us how to reproduce this issue. If possible, push up a branch to your fork with a regression test we can run to reproduce locally.*
-
-    ### Expected Behaviour
-
-    *Tell us what should happen.*
-
-    ### Actual Behaviour
-
-    *Tell us what happens instead.*
-    """
-  end
-
   def version do
     BlockScoutWeb.version()
   end

From 8dd47e42b22d38a8057cebf9a4f8ac19d6c4732a Mon Sep 17 00:00:00 2001
From: Viktor Baranov <baranov.viktor.27@gmail.com>
Date: Thu, 28 Sep 2023 13:01:24 +0300
Subject: [PATCH 453/909] Fix issue template filling

---
 apps/block_scout_web/lib/block_scout_web/views/layout_view.ex | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/block_scout_web/lib/block_scout_web/views/layout_view.ex b/apps/block_scout_web/lib/block_scout_web/views/layout_view.ex
index 087281480eb1..9cff33b73249 100644
--- a/apps/block_scout_web/lib/block_scout_web/views/layout_view.ex
+++ b/apps/block_scout_web/lib/block_scout_web/views/layout_view.ex
@@ -73,8 +73,8 @@ defmodule BlockScoutWeb.LayoutView do
     params = [
       template: "bug_report.yml",
       labels: "triage",
-      "backend-version": "Elixir #{version()} Erlang/OTP #{System.otp_release()}",
-      "elixir-version": System.version(),
+      "backend-version": version(),
+      "elixir-version": "Elixir #{System.version()} Erlang/OTP #{System.otp_release()}",
       "os-version": "#{os_family} #{os_name}",
       "archive-node-type": Variant.get(),
       "additional-information": "The issue happened at #{subnetwork_title()} Blockscout instance"

From 6039408cb0dd63eefbf776c1f16c30a01ca3e1cf Mon Sep 17 00:00:00 2001
From: Viktor Baranov <baranov.viktor.27@gmail.com>
Date: Fri, 29 Sep 2023 12:20:19 +0300
Subject: [PATCH 454/909] Get historical market cap data from CoinGecko

---
 CHANGELOG.md                                  |  1 +
 .../exchange_rates/source/coin_gecko.ex       | 10 ++++
 .../lib/explorer/market/history/cataloger.ex  | 49 ++++++-----------
 .../market/history/source/market_cap.ex       |  2 +-
 .../history/source/market_cap/coin_gecko.ex   | 46 ++++++++--------
 .../source/market_cap/coin_market_cap.ex      | 12 ++--
 .../market/history/source/price/coin_gecko.ex | 55 +++++++------------
 .../history/source/price/crypto_compare.ex    |  2 +-
 .../market/history/cataloger_test.exs         | 10 ++--
 9 files changed, 86 insertions(+), 101 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index cf2d1373cfc2..db8f60268356 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,7 @@
 
 ### Features
 
+- [#8561](https://github.com/blockscout/blockscout/pull/8561) - Get historical market cap data from CoinGecko
 - [#8386](https://github.com/blockscout/blockscout/pull/8386) - Add `owner_address_hash` to the `token_instances`
 - [#8530](https://github.com/blockscout/blockscout/pull/8530) - Add `block_type` to search results
 - [#8180](https://github.com/blockscout/blockscout/pull/8180) - Deposits and Withdrawals for Polygon Edge
diff --git a/apps/explorer/lib/explorer/exchange_rates/source/coin_gecko.ex b/apps/explorer/lib/explorer/exchange_rates/source/coin_gecko.ex
index d9ce085dee93..1806d792c74e 100644
--- a/apps/explorer/lib/explorer/exchange_rates/source/coin_gecko.ex
+++ b/apps/explorer/lib/explorer/exchange_rates/source/coin_gecko.ex
@@ -108,6 +108,16 @@ defmodule Explorer.ExchangeRates.Source.CoinGecko do
     if id, do: "#{base_url()}/coins/#{id}", else: nil
   end
 
+  @spec history_url(non_neg_integer()) :: String.t()
+  def history_url(previous_days) do
+    query_params = %{
+      "days" => previous_days,
+      "vs_currency" => "usd"
+    }
+
+    "#{source_url()}/market_chart?#{URI.encode_query(query_params)}"
+  end
+
   @impl Source
   def source_url(:coins_list) do
     "#{base_url()}/coins/list?include_platform=true"
diff --git a/apps/explorer/lib/explorer/market/history/cataloger.ex b/apps/explorer/lib/explorer/market/history/cataloger.ex
index a6bb33604bdd..e37f1554c2cf 100644
--- a/apps/explorer/lib/explorer/market/history/cataloger.ex
+++ b/apps/explorer/lib/explorer/market/history/cataloger.ex
@@ -35,8 +35,8 @@ defmodule Explorer.Market.History.Cataloger do
   end
 
   @impl GenServer
-  def handle_info(:fetch_market_cap_history, state) do
-    fetch_market_cap_history()
+  def handle_info({:fetch_market_cap_history, day_count}, state) do
+    fetch_market_cap_history(day_count)
 
     {:noreply, state}
   end
@@ -44,7 +44,7 @@ defmodule Explorer.Market.History.Cataloger do
   @impl GenServer
   # Record fetch successful.
   def handle_info({_ref, {:price_history, {_, _, {:ok, records}}}}, state) do
-    Process.send(self(), :fetch_market_cap_history, [])
+    Process.send(self(), {:fetch_market_cap_history, 365}, [])
     state = state |> Map.put_new(:price_records, records)
 
     {:noreply, state |> Map.put_new(:price_records, state)}
@@ -52,14 +52,14 @@ defmodule Explorer.Market.History.Cataloger do
 
   @impl GenServer
   # Record fetch successful.
-  def handle_info({_ref, {:market_cap_history, {_, {:ok, nil}}}}, state) do
+  def handle_info({_ref, {:market_cap_history, {_, _, {:ok, nil}}}}, state) do
     market_cap_history(state.price_records, state)
   end
 
   @impl GenServer
   # Record fetch successful.
-  def handle_info({_ref, {:market_cap_history, {_, {:ok, market_cap_record}}}}, state) do
-    records = compile_records(state.price_records, market_cap_record)
+  def handle_info({_ref, {:market_cap_history, {_, _, {:ok, market_cap_records}}}}, state) do
+    records = compile_records(state.price_records, market_cap_records)
     market_cap_history(records, state)
   end
 
@@ -75,10 +75,10 @@ defmodule Explorer.Market.History.Cataloger do
 
   # Failed to get records. Try again.
   @impl GenServer
-  def handle_info({_ref, {:market_cap_history, {failed_attempts, :error}}}, state) do
+  def handle_info({_ref, {:market_cap_history, {day_count, failed_attempts, :error}}}, state) do
     Logger.warn(fn -> "Failed to fetch market cap history. Trying again." end)
 
-    fetch_market_cap_history(failed_attempts + 1)
+    fetch_market_cap_history(day_count, failed_attempts + 1)
 
     {:noreply, state}
   end
@@ -145,38 +145,23 @@ defmodule Explorer.Market.History.Cataloger do
   end
 
   @spec fetch_market_cap_history(non_neg_integer()) :: Task.t()
-  defp fetch_market_cap_history(failed_attempts \\ 0) do
+  defp fetch_market_cap_history(day_count, failed_attempts \\ 0) do
     Task.Supervisor.async_nolink(Explorer.MarketTaskSupervisor, fn ->
       Process.sleep(HistoryProcess.delay(failed_attempts))
 
       if failed_attempts < @market_cap_failed_attempts do
-        {:market_cap_history, {failed_attempts, source_market_cap().fetch_market_cap()}}
+        {:market_cap_history, {day_count, failed_attempts, source_market_cap().fetch_market_cap(day_count)}}
       else
-        {:market_cap_history, {failed_attempts, {:ok, nil}}}
+        {:market_cap_history, {day_count, failed_attempts, {:ok, nil}}}
       end
     end)
   end
 
-  defp compile_records(price_records, market_cap_record) do
-    if market_cap_record do
-      if Enum.empty?(price_records) do
-        [market_cap_record]
-      else
-        today_index =
-          Enum.find_index(price_records, fn price ->
-            price.date == market_cap_record.date
-          end)
-
-        today =
-          price_records
-          |> Enum.at(today_index)
-          |> Map.put(:market_cap, market_cap_record.market_cap)
-
-        price_records
-        |> List.replace_at(today_index, today)
-      end
-    else
-      price_records
-    end
+  defp compile_records(price_records, market_cap_records) do
+    price_records
+    |> Enum.zip(market_cap_records)
+    |> Enum.map(fn {price_map, market_cap_map} ->
+      Map.merge(price_map, market_cap_map)
+    end)
   end
 end
diff --git a/apps/explorer/lib/explorer/market/history/source/market_cap.ex b/apps/explorer/lib/explorer/market/history/source/market_cap.ex
index f79e2d12c035..0a1de2beb7da 100644
--- a/apps/explorer/lib/explorer/market/history/source/market_cap.ex
+++ b/apps/explorer/lib/explorer/market/history/source/market_cap.ex
@@ -14,5 +14,5 @@ defmodule Explorer.Market.History.Source.MarketCap do
   @doc """
   Fetch history for a specified amount of days in the past.
   """
-  @callback fetch_market_cap() :: {:ok, [record()]} | :error
+  @callback fetch_market_cap(previous_days :: non_neg_integer()) :: {:ok, [record()]} | :error
 end
diff --git a/apps/explorer/lib/explorer/market/history/source/market_cap/coin_gecko.ex b/apps/explorer/lib/explorer/market/history/source/market_cap/coin_gecko.ex
index fee23a9b9cd3..fcc3bc262eaf 100644
--- a/apps/explorer/lib/explorer/market/history/source/market_cap/coin_gecko.ex
+++ b/apps/explorer/lib/explorer/market/history/source/market_cap/coin_gecko.ex
@@ -13,27 +13,24 @@ defmodule Explorer.Market.History.Source.MarketCap.CoinGecko do
   alias Explorer.ExchangeRates.Source
   alias Explorer.ExchangeRates.Source.CoinGecko, as: ExchangeRatesSourceCoinGecko
   alias Explorer.Market.History.Source.MarketCap, as: SourceMarketCap
+  alias Explorer.Market.History.Source.Price.CryptoCompare
 
   @behaviour SourceMarketCap
 
   @impl SourceMarketCap
-  def fetch_market_cap do
-    url = ExchangeRatesSourceCoinGecko.source_url()
-
-    if url do
-      case Source.http_request(url, ExchangeRatesSourceCoinGecko.headers()) do
-        {:ok, data} ->
-          result =
-            data
-            |> format_data()
-
-          {:ok, result}
-
-        _ ->
-          :error
-      end
-    else
-      :error
+  def fetch_market_cap(previous_days) do
+    url = ExchangeRatesSourceCoinGecko.history_url(previous_days)
+
+    case Source.http_request(url, ExchangeRatesSourceCoinGecko.headers()) do
+      {:ok, data} ->
+        result =
+          data
+          |> format_data()
+
+        {:ok, result}
+
+      _ ->
+        :error
     end
   end
 
@@ -41,12 +38,15 @@ defmodule Explorer.Market.History.Source.MarketCap.CoinGecko do
   defp format_data(nil), do: nil
 
   defp format_data(data) do
-    market_data = data["market_data"]
-    market_cap = market_data["market_cap"]
+    market_caps = data["market_caps"]
 
-    %{
-      market_cap: Decimal.new(to_string(market_cap["usd"])),
-      date: ExchangeRatesSourceCoinGecko.date(data["last_updated"])
-    }
+    for [date, market_cap] <- market_caps do
+      date = Decimal.to_integer(Decimal.round(Decimal.from_float(date / 1000)))
+
+      %{
+        market_cap: Decimal.new(to_string(market_cap)),
+        date: CryptoCompare.date(date)
+      }
+    end
   end
 end
diff --git a/apps/explorer/lib/explorer/market/history/source/market_cap/coin_market_cap.ex b/apps/explorer/lib/explorer/market/history/source/market_cap/coin_market_cap.ex
index 9a95ed1e73dd..5cf49fd4b85c 100644
--- a/apps/explorer/lib/explorer/market/history/source/market_cap/coin_market_cap.ex
+++ b/apps/explorer/lib/explorer/market/history/source/market_cap/coin_market_cap.ex
@@ -12,7 +12,7 @@ defmodule Explorer.Market.History.Source.MarketCap.CoinMarketCap do
   @behaviour SourceMarketCap
 
   @impl SourceMarketCap
-  def fetch_market_cap do
+  def fetch_market_cap(_previous_days) do
     url = ExchangeRatesSourceCoinMarketCap.source_url()
 
     if url do
@@ -46,9 +46,11 @@ defmodule Explorer.Market.History.Source.MarketCap.CoinMarketCap do
 
     market_cap_data_usd = ExchangeRatesSourceCoinMarketCap.get_market_cap_data_usd(token_properties)
 
-    %{
-      market_cap: to_decimal(market_cap_data_usd),
-      date: last_updated
-    }
+    [
+      %{
+        market_cap: to_decimal(market_cap_data_usd),
+        date: last_updated
+      }
+    ]
   end
 end
diff --git a/apps/explorer/lib/explorer/market/history/source/price/coin_gecko.ex b/apps/explorer/lib/explorer/market/history/source/price/coin_gecko.ex
index e4cf9dfa15a3..ef49d1f19cdf 100644
--- a/apps/explorer/lib/explorer/market/history/source/price/coin_gecko.ex
+++ b/apps/explorer/lib/explorer/market/history/source/price/coin_gecko.ex
@@ -6,27 +6,24 @@ defmodule Explorer.Market.History.Source.Price.CoinGecko do
   alias Explorer.ExchangeRates.Source
   alias Explorer.ExchangeRates.Source.CoinGecko, as: ExchangeRatesSourceCoinGecko
   alias Explorer.Market.History.Source.Price, as: SourcePrice
+  alias Explorer.Market.History.Source.Price.CryptoCompare
 
   @behaviour SourcePrice
 
   @impl SourcePrice
-  def fetch_price_history(_previous_days \\ nil) do
-    url = ExchangeRatesSourceCoinGecko.source_url()
-
-    if url do
-      case Source.http_request(url, ExchangeRatesSourceCoinGecko.headers()) do
-        {:ok, data} ->
-          result =
-            data
-            |> format_data()
-
-          {:ok, result}
-
-        _ ->
-          :error
-      end
-    else
-      :error
+  def fetch_price_history(previous_days) do
+    url = ExchangeRatesSourceCoinGecko.history_url(previous_days)
+
+    case Source.http_request(url, ExchangeRatesSourceCoinGecko.headers()) do
+      {:ok, data} ->
+        result =
+          data
+          |> format_data()
+
+        {:ok, result}
+
+      _ ->
+        :error
     end
   end
 
@@ -34,26 +31,16 @@ defmodule Explorer.Market.History.Source.Price.CoinGecko do
   defp format_data(nil), do: nil
 
   defp format_data(data) do
-    market_data = data["market_data"]
-    current_price = market_data["current_price"]
-    current_price_usd = Decimal.new(to_string(current_price["usd"]))
-    price_change_percentage_24h_in_currency = market_data["price_change_percentage_24h_in_currency"]
+    prices = data["prices"]
 
-    delta_perc = Decimal.new(to_string(price_change_percentage_24h_in_currency["usd"]))
+    for [date, price] <- prices do
+      date = Decimal.to_integer(Decimal.round(Decimal.from_float(date / 1000)))
 
-    delta =
-      current_price_usd
-      |> Decimal.mult(delta_perc)
-      |> Decimal.div(100)
-
-    opening_price = Decimal.add(current_price_usd, delta)
-
-    [
       %{
-        closing_price: current_price_usd,
-        date: ExchangeRatesSourceCoinGecko.date(data["last_updated"]),
-        opening_price: opening_price
+        closing_price: Decimal.new(to_string(price)),
+        date: CryptoCompare.date(date),
+        opening_price: Decimal.new(to_string(price))
       }
-    ]
+    end
   end
 end
diff --git a/apps/explorer/lib/explorer/market/history/source/price/crypto_compare.ex b/apps/explorer/lib/explorer/market/history/source/price/crypto_compare.ex
index 76693d37063d..e1b31f03cc2f 100644
--- a/apps/explorer/lib/explorer/market/history/source/price/crypto_compare.ex
+++ b/apps/explorer/lib/explorer/market/history/source/price/crypto_compare.ex
@@ -43,7 +43,7 @@ defmodule Explorer.Market.History.Source.Price.CryptoCompare do
   end
 
   @spec date(unix_timestamp()) :: Date.t()
-  defp date(unix_timestamp) do
+  def date(unix_timestamp) do
     unix_timestamp
     |> DateTime.from_unix!()
     |> DateTime.to_date()
diff --git a/apps/explorer/test/explorer/market/history/cataloger_test.exs b/apps/explorer/test/explorer/market/history/cataloger_test.exs
index 68f2aa9779cc..f7faa058e35e 100644
--- a/apps/explorer/test/explorer/market/history/cataloger_test.exs
+++ b/apps/explorer/test/explorer/market/history/cataloger_test.exs
@@ -65,7 +65,7 @@ defmodule Explorer.Market.History.CatalogerTest do
   test "handle_info with successful tasks (price and market cap)" do
     Application.put_env(:explorer, Cataloger, history_fetch_interval: 1)
     record_price = %{date: ~D[2018-04-01], closing_price: Decimal.new(10), opening_price: Decimal.new(5)}
-    record_market_cap = %{date: ~D[2018-04-01], market_cap: Decimal.new(100_500)}
+    record_market_caps = [%{date: ~D[2018-04-01], market_cap: Decimal.new(100_500)}]
 
     state = %{
       price_records: [
@@ -74,10 +74,10 @@ defmodule Explorer.Market.History.CatalogerTest do
     }
 
     assert {:noreply, state} == Cataloger.handle_info({nil, {:price_history, {1, 0, {:ok, [record_price]}}}}, state)
-    assert_receive :fetch_market_cap_history
+    assert_receive {:fetch_market_cap_history, 365}
 
     assert {:noreply, state} ==
-             Cataloger.handle_info({nil, {:market_cap_history, {0, {:ok, record_market_cap}}}}, state)
+             Cataloger.handle_info({nil, {:market_cap_history, {0, 3, {:ok, record_market_caps}}}}, state)
 
     assert Repo.get_by(MarketHistory, date: record_price.date)
   end
@@ -94,10 +94,10 @@ defmodule Explorer.Market.History.CatalogerTest do
     }
 
     assert {:noreply, state} == Cataloger.handle_info({nil, {:price_history, {1, 0, {:ok, [record_price]}}}}, state)
-    assert_receive :fetch_market_cap_history
+    assert_receive {:fetch_market_cap_history, 365}
 
     assert {:noreply, state} ==
-             Cataloger.handle_info({nil, {:market_cap_history, {0, {:ok, record_market_cap}}}}, state)
+             Cataloger.handle_info({nil, {:market_cap_history, {0, 3, {:ok, record_market_cap}}}}, state)
 
     assert record = Repo.get_by(MarketHistory, date: record_price.date)
     assert record.market_cap == nil

From 2fcf7d405a0331569067ed1d83db1e1b1ea75c8d Mon Sep 17 00:00:00 2001
From: Viktor Baranov <baranov.viktor.27@gmail.com>
Date: Fri, 29 Sep 2023 15:17:37 +0300
Subject: [PATCH 455/909] Coin id definition fix

---
 CHANGELOG.md                                  |  2 +-
 .../exchange_rates/source/coin_gecko.ex       | 48 +++++++------------
 .../exchange_rates/source/coin_gecko_test.exs | 20 --------
 3 files changed, 18 insertions(+), 52 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index db8f60268356..2f0c63e97b04 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,7 +4,7 @@
 
 ### Features
 
-- [#8561](https://github.com/blockscout/blockscout/pull/8561) - Get historical market cap data from CoinGecko
+- [#8561](https://github.com/blockscout/blockscout/pull/8561), [#8564](https://github.com/blockscout/blockscout/pull/8564) - Get historical market cap data from CoinGecko
 - [#8386](https://github.com/blockscout/blockscout/pull/8386) - Add `owner_address_hash` to the `token_instances`
 - [#8530](https://github.com/blockscout/blockscout/pull/8530) - Add `block_type` to search results
 - [#8180](https://github.com/blockscout/blockscout/pull/8180) - Deposits and Withdrawals for Polygon Edge
diff --git a/apps/explorer/lib/explorer/exchange_rates/source/coin_gecko.ex b/apps/explorer/lib/explorer/exchange_rates/source/coin_gecko.ex
index 1806d792c74e..e45427adf191 100644
--- a/apps/explorer/lib/explorer/exchange_rates/source/coin_gecko.ex
+++ b/apps/explorer/lib/explorer/exchange_rates/source/coin_gecko.ex
@@ -88,6 +88,16 @@ defmodule Explorer.ExchangeRates.Source.CoinGecko do
   @impl Source
   def format_data(_), do: []
 
+  @spec history_url(non_neg_integer()) :: String.t()
+  def history_url(previous_days) do
+    query_params = %{
+      "days" => previous_days,
+      "vs_currency" => "usd"
+    }
+
+    "#{source_url()}/market_chart?#{URI.encode_query(query_params)}"
+  end
+
   @impl Source
   def source_url do
     explicit_coin_id = config(:coin_id)
@@ -108,16 +118,6 @@ defmodule Explorer.ExchangeRates.Source.CoinGecko do
     if id, do: "#{base_url()}/coins/#{id}", else: nil
   end
 
-  @spec history_url(non_neg_integer()) :: String.t()
-  def history_url(previous_days) do
-    query_params = %{
-      "days" => previous_days,
-      "vs_currency" => "usd"
-    }
-
-    "#{source_url()}/market_chart?#{URI.encode_query(query_params)}"
-  end
-
   @impl Source
   def source_url(:coins_list) do
     "#{base_url()}/coins/list?include_platform=true"
@@ -184,22 +184,16 @@ defmodule Explorer.ExchangeRates.Source.CoinGecko do
   end
 
   def coin_id(symbol) do
-    id_mapping = token_symbol_to_id_mapping_to_get_price(symbol)
-
-    if id_mapping do
-      {:ok, id_mapping}
-    else
-      url = "#{base_url()}/coins/list"
+    url = "#{base_url()}/coins/list"
 
-      symbol_downcase = String.downcase(symbol)
+    symbol_downcase = String.downcase(symbol)
 
-      case Source.http_request(url, headers()) do
-        {:ok, data} ->
-          get_symbol_data(data, symbol_downcase)
+    case Source.http_request(url, headers()) do
+      {:ok, data} ->
+        get_symbol_data(data, symbol_downcase)
 
-        resp ->
-          resp
-      end
+      _ ->
+        {:ok, symbol_downcase}
     end
   end
 
@@ -309,12 +303,4 @@ defmodule Explorer.ExchangeRates.Source.CoinGecko do
   defp config(key) do
     Application.get_env(:explorer, __MODULE__, [])[key]
   end
-
-  defp token_symbol_to_id_mapping_to_get_price(symbol) do
-    case symbol do
-      "UNI" -> "uniswap"
-      "SURF" -> "surf-finance"
-      _symbol -> nil
-    end
-  end
 end
diff --git a/apps/explorer/test/explorer/exchange_rates/source/coin_gecko_test.exs b/apps/explorer/test/explorer/exchange_rates/source/coin_gecko_test.exs
index cd5148c4fbeb..152efd5ef27b 100644
--- a/apps/explorer/test/explorer/exchange_rates/source/coin_gecko_test.exs
+++ b/apps/explorer/test/explorer/exchange_rates/source/coin_gecko_test.exs
@@ -196,25 +196,5 @@ defmodule Explorer.ExchangeRates.Source.CoinGeckoTest do
 
       assert CoinGecko.coin_id() == {:ok, "callisto"}
     end
-
-    test "returns redirect on fetching", %{bypass: bypass} do
-      Application.put_env(:explorer, :coin, "DAI")
-
-      Bypass.expect(bypass, "GET", "/coins/list", fn conn ->
-        Conn.resp(conn, 302, "Request redirected...")
-      end)
-
-      assert CoinGecko.coin_id() == {:error, "Source redirected"}
-    end
-
-    test "returns error on fetching", %{bypass: bypass} do
-      Application.put_env(:explorer, :coin, "DAI")
-
-      Bypass.expect(bypass, "GET", "/coins/list", fn conn ->
-        Conn.resp(conn, 503, "Internal server error...")
-      end)
-
-      assert CoinGecko.coin_id() == {:error, "Internal server error..."}
-    end
   end
 end

From 0613155f7be19df91d68d829f4b407efdeb0d0a7 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 29 Sep 2023 18:17:26 +0000
Subject: [PATCH 456/909] Bump postcss from 8.4.30 to 8.4.31 in
 /apps/block_scout_web/assets

Bumps [postcss](https://github.com/postcss/postcss) from 8.4.30 to 8.4.31.
- [Release notes](https://github.com/postcss/postcss/releases)
- [Changelog](https://github.com/postcss/postcss/blob/main/CHANGELOG.md)
- [Commits](https://github.com/postcss/postcss/compare/8.4.30...8.4.31)

---
updated-dependencies:
- dependency-name: postcss
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 apps/block_scout_web/assets/package-lock.json | 14 +++++++-------
 apps/block_scout_web/assets/package.json      |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/apps/block_scout_web/assets/package-lock.json b/apps/block_scout_web/assets/package-lock.json
index 273257e62ab4..440dfc629254 100644
--- a/apps/block_scout_web/assets/package-lock.json
+++ b/apps/block_scout_web/assets/package-lock.json
@@ -87,7 +87,7 @@
         "jest": "^29.7.0",
         "jest-environment-jsdom": "^29.7.0",
         "mini-css-extract-plugin": "^2.7.6",
-        "postcss": "^8.4.30",
+        "postcss": "^8.4.31",
         "postcss-loader": "^7.3.3",
         "sass": "^1.68.0",
         "sass-loader": "^13.3.2",
@@ -13619,9 +13619,9 @@
       }
     },
     "node_modules/postcss": {
-      "version": "8.4.30",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.30.tgz",
-      "integrity": "sha512-7ZEao1g4kd68l97aWG/etQKPKq07us0ieSZ2TnFDk11i0ZfDW2AwKHYU8qv4MZKqN2fdBfg+7q0ES06UA73C1g==",
+      "version": "8.4.31",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.31.tgz",
+      "integrity": "sha512-PS08Iboia9mts/2ygV3eLpY5ghnUcfLV/EXTOW1E2qYxJKGGBUtNjN76FYHnMs36RmARn41bC0AZmn+rR0OVpQ==",
       "dev": true,
       "funding": [
         {
@@ -27969,9 +27969,9 @@
       "integrity": "sha512-Wb4p1J4zyFTbM+u6WuO4XstYx4Ky9Cewe4DWrel7B0w6VVICvPwdOpotjzcf6eD8TsckVnIMNONQyPIUFOUbCQ=="
     },
     "postcss": {
-      "version": "8.4.30",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.30.tgz",
-      "integrity": "sha512-7ZEao1g4kd68l97aWG/etQKPKq07us0ieSZ2TnFDk11i0ZfDW2AwKHYU8qv4MZKqN2fdBfg+7q0ES06UA73C1g==",
+      "version": "8.4.31",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.31.tgz",
+      "integrity": "sha512-PS08Iboia9mts/2ygV3eLpY5ghnUcfLV/EXTOW1E2qYxJKGGBUtNjN76FYHnMs36RmARn41bC0AZmn+rR0OVpQ==",
       "dev": true,
       "requires": {
         "nanoid": "^3.3.6",
diff --git a/apps/block_scout_web/assets/package.json b/apps/block_scout_web/assets/package.json
index 398e36537eca..a0fc307de5e1 100644
--- a/apps/block_scout_web/assets/package.json
+++ b/apps/block_scout_web/assets/package.json
@@ -99,7 +99,7 @@
     "jest": "^29.7.0",
     "jest-environment-jsdom": "^29.7.0",
     "mini-css-extract-plugin": "^2.7.6",
-    "postcss": "^8.4.30",
+    "postcss": "^8.4.31",
     "postcss-loader": "^7.3.3",
     "sass": "^1.68.0",
     "sass-loader": "^13.3.2",

From b46ee58eda0abe5941b6f98e36bf8e2b8362c8a4 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 29 Sep 2023 18:17:48 +0000
Subject: [PATCH 457/909] Bump photoswipe from 5.4.1 to 5.4.2 in
 /apps/block_scout_web/assets

Bumps [photoswipe](https://github.com/dimsemenov/Photoswipe) from 5.4.1 to 5.4.2.
- [Release notes](https://github.com/dimsemenov/Photoswipe/releases)
- [Commits](https://github.com/dimsemenov/Photoswipe/compare/v5.4.1...v5.4.2)

---
updated-dependencies:
- dependency-name: photoswipe
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 apps/block_scout_web/assets/package-lock.json | 14 +++++++-------
 apps/block_scout_web/assets/package.json      |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/apps/block_scout_web/assets/package-lock.json b/apps/block_scout_web/assets/package-lock.json
index 273257e62ab4..ddca53d80418 100644
--- a/apps/block_scout_web/assets/package-lock.json
+++ b/apps/block_scout_web/assets/package-lock.json
@@ -54,7 +54,7 @@
         "path-parser": "^6.1.0",
         "phoenix": "file:../../../deps/phoenix",
         "phoenix_html": "file:../../../deps/phoenix_html",
-        "photoswipe": "^5.4.1",
+        "photoswipe": "^5.4.2",
         "pikaday": "^1.8.2",
         "popper.js": "^1.14.7",
         "reduce-reducers": "^1.0.4",
@@ -13457,9 +13457,9 @@
       "link": true
     },
     "node_modules/photoswipe": {
-      "version": "5.4.1",
-      "resolved": "https://registry.npmjs.org/photoswipe/-/photoswipe-5.4.1.tgz",
-      "integrity": "sha512-iauO0fP4oMdZvjlXzeIe8um1fZatkGE0bqdoIwpb65jlo/KK1KhfD7Z51+0YhS2tC4FOoOtE1p0c4o/HbY1s2Q==",
+      "version": "5.4.2",
+      "resolved": "https://registry.npmjs.org/photoswipe/-/photoswipe-5.4.2.tgz",
+      "integrity": "sha512-z5hr36nAIPOZbHJPbCJ/mQ3+ZlizttF9za5gKXKH/us1k4KNHaRbC63K1Px5sVVKUtGb/2+ixHpKqtwl0WAwvA==",
       "engines": {
         "node": ">= 0.12.0"
       }
@@ -27867,9 +27867,9 @@
       "version": "file:../../../deps/phoenix_html"
     },
     "photoswipe": {
-      "version": "5.4.1",
-      "resolved": "https://registry.npmjs.org/photoswipe/-/photoswipe-5.4.1.tgz",
-      "integrity": "sha512-iauO0fP4oMdZvjlXzeIe8um1fZatkGE0bqdoIwpb65jlo/KK1KhfD7Z51+0YhS2tC4FOoOtE1p0c4o/HbY1s2Q=="
+      "version": "5.4.2",
+      "resolved": "https://registry.npmjs.org/photoswipe/-/photoswipe-5.4.2.tgz",
+      "integrity": "sha512-z5hr36nAIPOZbHJPbCJ/mQ3+ZlizttF9za5gKXKH/us1k4KNHaRbC63K1Px5sVVKUtGb/2+ixHpKqtwl0WAwvA=="
     },
     "picocolors": {
       "version": "1.0.0",
diff --git a/apps/block_scout_web/assets/package.json b/apps/block_scout_web/assets/package.json
index 398e36537eca..65d55025201b 100644
--- a/apps/block_scout_web/assets/package.json
+++ b/apps/block_scout_web/assets/package.json
@@ -66,7 +66,7 @@
     "path-parser": "^6.1.0",
     "phoenix": "file:../../../deps/phoenix",
     "phoenix_html": "file:../../../deps/phoenix_html",
-    "photoswipe": "^5.4.1",
+    "photoswipe": "^5.4.2",
     "pikaday": "^1.8.2",
     "popper.js": "^1.14.7",
     "reduce-reducers": "^1.0.4",

From 8dd011c77e8ba04ea43e1172182f2661e7f5b431 Mon Sep 17 00:00:00 2001
From: Viktor Baranov <baranov.viktor.27@gmail.com>
Date: Thu, 24 Aug 2023 16:08:41 +0300
Subject: [PATCH 458/909] Actualize Chromedriver version

---
 CHANGELOG.md                   | 1 +
 bin/install_chrome_headless.sh | 6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2f0c63e97b04..55f5bb209a53 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -19,6 +19,7 @@
 
 ### Chore
 
+- [#8290](https://github.com/blockscout/blockscout/pull/8290) - Update Chromedriver version
 - [#8536](https://github.com/blockscout/blockscout/pull/8536), [#8537](https://github.com/blockscout/blockscout/pull/8537), [#8540](https://github.com/blockscout/blockscout/pull/8540), [#8557](https://github.com/blockscout/blockscout/pull/8557) - New issue template
 - [#8529](https://github.com/blockscout/blockscout/pull/8529) - Move PolygonEdge-related migration to the corresponding ecto repository
 - [#8504](https://github.com/blockscout/blockscout/pull/8504) - Deploy new UI through Makefile
diff --git a/bin/install_chrome_headless.sh b/bin/install_chrome_headless.sh
index a19902c42c35..731ee458c8be 100755
--- a/bin/install_chrome_headless.sh
+++ b/bin/install_chrome_headless.sh
@@ -1,8 +1,8 @@
 export DISPLAY=:99.0
 sh -e /etc/init.d/xvfb start
-# export CHROMEDRIVER_VERSION=`curl -s http://chromedriver.storage.googleapis.com/LATEST_RELEASE`
-export CHROMEDRIVER_VERSION=`104.0.5112.79`
-curl -L -O "http://chromedriver.storage.googleapis.com/${CHROMEDRIVER_VERSION}/chromedriver_linux64.zip"
+
+export CHROMEDRIVER_VERSION=$(curl -s "https://googlechromelabs.github.io/chrome-for-testing/last-known-good-versions.json" | jq -r '.channels' | jq -r '.Stable' | jq -r '.version')
+curl -L -O "https://edgedl.me.gvt1.com/edgedl/chrome/chrome-for-testing/${CHROMEDRIVER_VERSION}/linux64/chrome-linux64.zip"
 unzip chromedriver_linux64.zip
 sudo chmod +x chromedriver
 sudo mv chromedriver /usr/local/bin

From 90f453ca368a643ac6eb8beebe892a9e5d6762f4 Mon Sep 17 00:00:00 2001
From: Viktor Baranov <baranov.viktor.27@gmail.com>
Date: Wed, 27 Sep 2023 12:30:58 +0300
Subject: [PATCH 459/909] Sanitize paging params

---
 CHANGELOG.md                                  |   1 +
 .../lib/block_scout_web/chain.ex              | 105 ++++++++++--------
 2 files changed, 62 insertions(+), 44 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2f0c63e97b04..c98999dbd549 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,6 +13,7 @@
 ### Fixes
 
 - [#8552](https://github.com/blockscout/blockscout/pull/8552) - Add CHAIN_TYPE build arg to Dockerfile
+- [#8550](https://github.com/blockscout/blockscout/pull/8550) - Sanitize paging params
 - [#8515](https://github.com/blockscout/blockscout/pull/8515) - Fix `:error.types/0 is undefined` warning
 - [#7959](https://github.com/blockscout/blockscout/pull/7959) - Fix empty batch transfers handling
 - [#8513](https://github.com/blockscout/blockscout/pull/8513) - Don't override transaction status
diff --git a/apps/block_scout_web/lib/block_scout_web/chain.ex b/apps/block_scout_web/lib/block_scout_web/chain.ex
index 8e8c2b465dcb..33f5bbd573c0 100644
--- a/apps/block_scout_web/lib/block_scout_web/chain.ex
+++ b/apps/block_scout_web/lib/block_scout_web/chain.ex
@@ -110,12 +110,16 @@ defmodule BlockScoutWeb.Chain do
         else: paging_params(List.last(list))
 
     next_page_params = Map.merge(params, paging_params)
-    current_items_count_str = Map.get(next_page_params, "items_count")
+    current_items_count_string = Map.get(next_page_params, "items_count")
 
     items_count =
-      if current_items_count_str do
-        {current_items_count, _} = Integer.parse(current_items_count_str)
-        current_items_count + Enum.count(list)
+      if is_binary(current_items_count_string) do
+        if current_items_count_string do
+          {current_items_count, _} = Integer.parse(current_items_count_string)
+          current_items_count + Enum.count(list)
+        else
+          Enum.count(list)
+        end
       else
         Enum.count(list)
       end
@@ -123,9 +127,10 @@ defmodule BlockScoutWeb.Chain do
     Map.put(next_page_params, "items_count", items_count)
   end
 
-  def paging_options(%{"hash" => hash, "fetched_coin_balance" => fetched_coin_balance}) do
-    with {coin_balance, ""} <- Integer.parse(fetched_coin_balance),
-         {:ok, address_hash} <- string_to_address_hash(hash) do
+  def paging_options(%{"hash" => hash_string, "fetched_coin_balance" => fetched_coin_balance_string})
+      when is_binary(hash_string) and is_binary(fetched_coin_balance_string) do
+    with {coin_balance, ""} <- Integer.parse(fetched_coin_balance_string),
+         {:ok, address_hash} <- string_to_address_hash(hash_string) do
       [paging_options: %{@default_paging_options | key: {%Wei{value: Decimal.new(coin_balance)}, address_hash}}]
     else
       _ ->
@@ -134,47 +139,43 @@ defmodule BlockScoutWeb.Chain do
   end
 
   def paging_options(%{
-        "address_hash" => address_hash,
-        "tx_hash" => tx_hash,
-        "block_hash" => block_hash,
-        "holder_count" => holder_count,
-        "name" => name,
-        "inserted_at" => inserted_at,
-        "item_type" => item_type
+        "address_hash" => address_hash_string,
+        "tx_hash" => tx_hash_string,
+        "block_hash" => block_hash_string,
+        "holder_count" => holder_count_string,
+        "name" => name_string,
+        "inserted_at" => inserted_at_string,
+        "item_type" => item_type_string
       }) do
     [
       paging_options: %{
         @default_paging_options
-        | key: {address_hash, tx_hash, block_hash, holder_count, name, inserted_at, item_type}
+        | key:
+            {address_hash_string, tx_hash_string, block_hash_string, holder_count_string, name_string,
+             inserted_at_string, item_type_string}
       }
     ]
   end
 
   def paging_options(
         %{
-          "market_cap" => market_cap,
-          "holder_count" => holder_count_str,
-          "name" => name,
-          "contract_address_hash" => contract_address_hash_str,
-          "is_name_null" => is_name_null
+          "market_cap" => market_cap_string,
+          "holder_count" => holder_count_string,
+          "name" => name_string,
+          "contract_address_hash" => contract_address_hash_string,
+          "is_name_null" => is_name_null_string
         } = params
-      ) do
-    market_cap_decimal =
-      case Decimal.parse(market_cap) do
-        {decimal, ""} -> decimal
-        _ -> nil
-      end
+      )
+      when is_binary(market_cap_string) and is_binary(holder_count_string) and is_binary(name_string) and
+             is_binary(contract_address_hash_string) and is_binary(is_name_null_string) do
+    market_cap_decimal = decimal_parse(market_cap_string)
 
-    fiat_value_decimal =
-      case Decimal.parse(params["fiat_value"]) do
-        {decimal, ""} -> decimal
-        _ -> nil
-      end
+    fiat_value_decimal = decimal_parse(params["fiat_value"])
 
-    holder_count = parse_integer(holder_count_str)
-    token_name = if is_name_null == "true", do: nil, else: name
+    holder_count = parse_integer(holder_count_string)
+    token_name = if is_name_null_string == "true", do: nil, else: name_string
 
-    case Hash.Address.cast(contract_address_hash_str) do
+    case Hash.Address.cast(contract_address_hash_string) do
       {:ok, contract_address_hash} ->
         [
           paging_options: %{
@@ -198,7 +199,8 @@ defmodule BlockScoutWeb.Chain do
         "block_number" => block_number_string,
         "transaction_index" => transaction_index_string,
         "index" => index_string
-      }) do
+      })
+      when is_binary(block_number_string) and is_binary(transaction_index_string) and is_binary(index_string) do
     with {block_number, ""} <- Integer.parse(block_number_string),
          {transaction_index, ""} <- Integer.parse(transaction_index_string),
          {index, ""} <- Integer.parse(index_string) do
@@ -216,7 +218,10 @@ defmodule BlockScoutWeb.Chain do
         "batch_block_hash" => batch_block_hash_string,
         "batch_transaction_hash" => batch_transaction_hash_string,
         "index_in_batch" => index_in_batch_string
-      }) do
+      })
+      when is_binary(block_number_string) and is_binary(index_string) and is_binary(batch_log_index_string) and
+             is_binary(batch_transaction_hash_string) and is_binary(index_in_batch_string) and
+             is_binary(index_in_batch_string) do
     with {block_number, ""} <- Integer.parse(block_number_string),
          {index, ""} <- Integer.parse(index_string),
          {index_in_batch, ""} <- Integer.parse(index_in_batch_string),
@@ -241,7 +246,9 @@ defmodule BlockScoutWeb.Chain do
         "batch_block_hash" => batch_block_hash_string,
         "batch_transaction_hash" => batch_transaction_hash_string,
         "index_in_batch" => index_in_batch_string
-      }) do
+      })
+      when is_binary(batch_log_index_string) and is_binary(batch_block_hash_string) and
+             is_binary(batch_transaction_hash_string) and is_binary(index_in_batch_string) do
     with {index_in_batch, ""} <- Integer.parse(index_in_batch_string),
          {:ok, batch_transaction_hash} <- string_to_transaction_hash(batch_transaction_hash_string),
          {:ok, batch_block_hash} <- string_to_block_hash(batch_block_hash_string),
@@ -258,7 +265,8 @@ defmodule BlockScoutWeb.Chain do
     end
   end
 
-  def paging_options(%{"block_number" => block_number_string, "index" => index_string}) do
+  def paging_options(%{"block_number" => block_number_string, "index" => index_string})
+      when is_binary(block_number_string) and is_binary(index_string) do
     with {block_number, ""} <- Integer.parse(block_number_string),
          {index, ""} <- Integer.parse(index_string) do
       [paging_options: %{@default_paging_options | key: {block_number, index}}]
@@ -268,7 +276,7 @@ defmodule BlockScoutWeb.Chain do
     end
   end
 
-  def paging_options(%{"block_number" => block_number_string}) do
+  def paging_options(%{"block_number" => block_number_string}) when is_binary(block_number_string) do
     case Integer.parse(block_number_string) do
       {block_number, ""} ->
         [paging_options: %{@default_paging_options | key: {block_number}}]
@@ -292,7 +300,8 @@ defmodule BlockScoutWeb.Chain do
     [paging_options: %{@default_paging_options | key: {index}}]
   end
 
-  def paging_options(%{"inserted_at" => inserted_at_string, "hash" => hash_string}) do
+  def paging_options(%{"inserted_at" => inserted_at_string, "hash" => hash_string})
+      when is_binary(inserted_at_string) and is_binary(hash_string) do
     with {:ok, inserted_at, _} <- DateTime.from_iso8601(inserted_at_string),
          {:ok, hash} <- string_to_transaction_hash(hash_string) do
       [paging_options: %{@default_paging_options | key: {inserted_at, hash}, is_pending_tx: true}]
@@ -309,9 +318,10 @@ defmodule BlockScoutWeb.Chain do
     [paging_options: %{@default_paging_options | key: {value, address_hash}}]
   end
 
-  def paging_options(%{"fiat_value" => fiat_value_string, "value" => value, "id" => id_string}) do
+  def paging_options(%{"fiat_value" => fiat_value_string, "value" => value_string, "id" => id_string})
+      when is_binary(fiat_value_string) and is_binary(value_string) and is_binary(id_string) do
     with {id, ""} <- Integer.parse(id_string),
-         {value, ""} <- Decimal.parse(value),
+         {value, ""} <- Decimal.parse(value_string),
          {_id, _value, {fiat_value, ""}} <- {id, value, Decimal.parse(fiat_value_string)} do
       [paging_options: %{@default_paging_options | key: {fiat_value, value, id}}]
     else
@@ -327,8 +337,8 @@ defmodule BlockScoutWeb.Chain do
     [paging_options: %{@default_paging_options | key: {id}}]
   end
 
-  def paging_options(%{"items_count" => items_count, "state_changes" => _}) do
-    case Integer.parse(items_count) do
+  def paging_options(%{"items_count" => items_count_string, "state_changes" => _}) when is_binary(items_count_string) do
+    case Integer.parse(items_count_string) do
       {count, ""} -> [paging_options: %{@default_paging_options | key: {count}}]
       _ -> @default_paging_options
     end
@@ -408,6 +418,13 @@ defmodule BlockScoutWeb.Chain do
 
   def split_list_by_page(list_plus_one), do: Enum.split(list_plus_one, @page_size)
 
+  defp decimal_parse(input_string) do
+    case Decimal.parse(input_string) do
+      {decimal, ""} -> decimal
+      _ -> nil
+    end
+  end
+
   defp address_from_param(param) do
     case string_to_address_hash(param) do
       {:ok, hash} ->

From 6d3a0377e64085e6d8816b5534165a39020022ea Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 1 Oct 2023 18:09:47 +0000
Subject: [PATCH 460/909] Bump hackney from 1.18.1 to 1.19.1

Bumps [hackney](https://github.com/benoitc/hackney) from 1.18.1 to 1.19.1.
- [Release notes](https://github.com/benoitc/hackney/releases)
- [Changelog](https://github.com/benoitc/hackney/blob/master/NEWS.md)
- [Commits](https://github.com/benoitc/hackney/compare/1.18.1...1.19.1)

---
updated-dependencies:
- dependency-name: hackney
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 mix.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/mix.lock b/mix.lock
index 58711856c2ce..2b19ed68e8e3 100644
--- a/mix.lock
+++ b/mix.lock
@@ -14,7 +14,7 @@
   "bypass": {:hex, :bypass, "2.1.0", "909782781bf8e20ee86a9cabde36b259d44af8b9f38756173e8f5e2e1fabb9b1", [:mix], [{:plug, "~> 1.7", [hex: :plug, repo: "hexpm", optional: false]}, {:plug_cowboy, "~> 2.0", [hex: :plug_cowboy, repo: "hexpm", optional: false]}, {:ranch, "~> 1.3", [hex: :ranch, repo: "hexpm", optional: false]}], "hexpm", "d9b5df8fa5b7a6efa08384e9bbecfe4ce61c77d28a4282f79e02f1ef78d96b80"},
   "castore": {:hex, :castore, "1.0.3", "7130ba6d24c8424014194676d608cb989f62ef8039efd50ff4b3f33286d06db8", [:mix], [], "hexpm", "680ab01ef5d15b161ed6a95449fac5c6b8f60055677a8e79acf01b27baa4390b"},
   "cbor": {:hex, :cbor, "1.0.1", "39511158e8ea5a57c1fcb9639aaa7efde67129678fee49ebbda780f6f24959b0", [:mix], [], "hexpm", "5431acbe7a7908f17f6a9cd43311002836a34a8ab01876918d8cfb709cd8b6a2"},
-  "certifi": {:hex, :certifi, "2.9.0", "6f2a475689dd47f19fb74334859d460a2dc4e3252a3324bd2111b8f0429e7e21", [:rebar3], [], "hexpm", "266da46bdb06d6c6d35fde799bcb28d36d985d424ad7c08b5bb48f5b5cdd4641"},
+  "certifi": {:hex, :certifi, "2.12.0", "2d1cca2ec95f59643862af91f001478c9863c2ac9cb6e2f89780bfd8de987329", [:rebar3], [], "hexpm", "ee68d85df22e554040cdb4be100f33873ac6051387baf6a8f6ce82272340ff1c"},
   "cldr_utils": {:hex, :cldr_utils, "2.24.1", "5ff8c8c55f96666228827bcf85a23d632022def200566346545d01d15e4c30dc", [:mix], [{:castore, "~> 0.1 or ~> 1.0", [hex: :castore, repo: "hexpm", optional: true]}, {:certifi, "~> 2.5", [hex: :certifi, repo: "hexpm", optional: true]}, {:decimal, "~> 1.9 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: false]}], "hexpm", "1820300531b5b849d0bc468e5a87cd64f8f2c5191916f548cbe69b2efc203780"},
   "cloak": {:hex, :cloak, "1.1.2", "7e0006c2b0b98d976d4f559080fabefd81f0e0a50a3c4b621f85ceeb563e80bb", [:mix], [{:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}], "hexpm", "940d5ac4fcd51b252930fd112e319ea5ae6ab540b722f3ca60a85666759b9585"},
   "cloak_ecto": {:hex, :cloak_ecto, "1.2.0", "e86a3df3bf0dc8980f70406bcb0af2858bac247d55494d40bc58a152590bd402", [:mix], [{:cloak, "~> 1.1.1", [hex: :cloak, repo: "hexpm", optional: false]}, {:ecto, "~> 3.0", [hex: :ecto, repo: "hexpm", optional: false]}], "hexpm", "8bcc677185c813fe64b786618bd6689b1707b35cd95acaae0834557b15a0c62f"},
@@ -64,7 +64,7 @@
   "flow": {:hex, :flow, "1.2.4", "1dd58918287eb286656008777cb32714b5123d3855956f29aa141ebae456922d", [:mix], [{:gen_stage, "~> 1.0", [hex: :gen_stage, repo: "hexpm", optional: false]}], "hexpm", "874adde96368e71870f3510b91e35bc31652291858c86c0e75359cbdd35eb211"},
   "gen_stage": {:hex, :gen_stage, "1.2.1", "19d8b5e9a5996d813b8245338a28246307fd8b9c99d1237de199d21efc4c76a1", [:mix], [], "hexpm", "83e8be657fa05b992ffa6ac1e3af6d57aa50aace8f691fcf696ff02f8335b001"},
   "gettext": {:hex, :gettext, "0.23.1", "821e619a240e6000db2fc16a574ef68b3bd7fe0167ccc264a81563cc93e67a31", [:mix], [{:expo, "~> 0.4.0", [hex: :expo, repo: "hexpm", optional: false]}], "hexpm", "19d744a36b809d810d610b57c27b934425859d158ebd56561bc41f7eeb8795db"},
-  "hackney": {:hex, :hackney, "1.18.1", "f48bf88f521f2a229fc7bae88cf4f85adc9cd9bcf23b5dc8eb6a1788c662c4f6", [:rebar3], [{:certifi, "~>2.9.0", [hex: :certifi, repo: "hexpm", optional: false]}, {:idna, "~>6.1.0", [hex: :idna, repo: "hexpm", optional: false]}, {:metrics, "~>1.0.0", [hex: :metrics, repo: "hexpm", optional: false]}, {:mimerl, "~>1.1", [hex: :mimerl, repo: "hexpm", optional: false]}, {:parse_trans, "3.3.1", [hex: :parse_trans, repo: "hexpm", optional: false]}, {:ssl_verify_fun, "~>1.1.0", [hex: :ssl_verify_fun, repo: "hexpm", optional: false]}, {:unicode_util_compat, "~>0.7.0", [hex: :unicode_util_compat, repo: "hexpm", optional: false]}], "hexpm", "a4ecdaff44297e9b5894ae499e9a070ea1888c84afdd1fd9b7b2bc384950128e"},
+  "hackney": {:hex, :hackney, "1.19.1", "59de4716e985dd2b5cbd4954fa1ae187e2b610a9c4520ffcb0b1653c3d6e5559", [:rebar3], [{:certifi, "~>2.12.0", [hex: :certifi, repo: "hexpm", optional: false]}, {:idna, "~>6.1.0", [hex: :idna, repo: "hexpm", optional: false]}, {:metrics, "~>1.0.0", [hex: :metrics, repo: "hexpm", optional: false]}, {:mimerl, "~>1.1", [hex: :mimerl, repo: "hexpm", optional: false]}, {:parse_trans, "3.4.1", [hex: :parse_trans, repo: "hexpm", optional: false]}, {:ssl_verify_fun, "~>1.1.0", [hex: :ssl_verify_fun, repo: "hexpm", optional: false]}, {:unicode_util_compat, "~>0.7.0", [hex: :unicode_util_compat, repo: "hexpm", optional: false]}], "hexpm", "8aa08234bdefc269995c63c2282cf3cd0e36febe3a6bfab11b610572fdd1cad0"},
   "hammer": {:hex, :hammer, "6.1.0", "f263e3c3e9946bd410ea0336b2abe0cb6260af4afb3a221e1027540706e76c55", [:make, :mix], [{:poolboy, "~> 1.5", [hex: :poolboy, repo: "hexpm", optional: false]}], "hexpm", "b47e415a562a6d072392deabcd58090d8a41182cf9044cdd6b0d0faaaf68ba57"},
   "hammer_backend_redis": {:hex, :hammer_backend_redis, "6.1.2", "eb296bb4924928e24135308b2afc189201fd09411c870c6bbadea444a49b2f2c", [:mix], [{:hammer, "~> 6.0", [hex: :hammer, repo: "hexpm", optional: false]}, {:redix, "~> 1.1", [hex: :redix, repo: "hexpm", optional: false]}], "hexpm", "217ea066278910543a5e9b577d5bf2425419446b94fe76bdd9f255f39feec9fa"},
   "html_entities": {:hex, :html_entities, "0.5.2", "9e47e70598da7de2a9ff6af8758399251db6dbb7eebe2b013f2bbd2515895c3c", [:mix], [], "hexpm", "c53ba390403485615623b9531e97696f076ed415e8d8058b1dbaa28181f4fdcc"},
@@ -97,7 +97,7 @@
   "oauth2": {:hex, :oauth2, "2.0.1", "70729503e05378697b958919bb2d65b002ba6b28c8112328063648a9348aaa3f", [:mix], [{:hackney, "~> 1.13", [hex: :hackney, repo: "hexpm", optional: false]}], "hexpm", "c64e20d4d105bcdbcbe03170fb530d0eddc3a3e6b135a87528a22c8aecf74c52"},
   "optimal": {:hex, :optimal, "0.3.6", "46bbf52fbbbd238cda81e02560caa84f93a53c75620f1fe19e81e4ae7b07d1dd", [:mix], [], "hexpm", "1a06ea6a653120226b35b283a1cd10039550f2c566edcdec22b29316d73640fd"},
   "parallel_stream": {:hex, :parallel_stream, "1.1.0", "f52f73eb344bc22de335992377413138405796e0d0ad99d995d9977ac29f1ca9", [:mix], [], "hexpm", "684fd19191aedfaf387bbabbeb8ff3c752f0220c8112eb907d797f4592d6e871"},
-  "parse_trans": {:hex, :parse_trans, "3.3.1", "16328ab840cc09919bd10dab29e431da3af9e9e7e7e6f0089dd5a2d2820011d8", [:rebar3], [], "hexpm", "07cd9577885f56362d414e8c4c4e6bdf10d43a8767abb92d24cbe8b24c54888b"},
+  "parse_trans": {:hex, :parse_trans, "3.4.1", "6e6aa8167cb44cc8f39441d05193be6e6f4e7c2946cb2759f015f8c56b76e5ff", [:rebar3], [], "hexpm", "620a406ce75dada827b82e453c19cf06776be266f5a67cff34e1ef2cbb60e49a"},
   "phoenix": {:hex, :phoenix, "1.5.14", "2d5db884be496eefa5157505ec0134e66187cb416c072272420c5509d67bf808", [:mix], [{:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}, {:phoenix_html, "~> 2.13 or ~> 3.0", [hex: :phoenix_html, repo: "hexpm", optional: true]}, {:phoenix_pubsub, "~> 2.0", [hex: :phoenix_pubsub, repo: "hexpm", optional: false]}, {:plug, "~> 1.10", [hex: :plug, repo: "hexpm", optional: false]}, {:plug_cowboy, "~> 1.0 or ~> 2.2", [hex: :plug_cowboy, repo: "hexpm", optional: true]}, {:plug_crypto, "~> 1.1.2 or ~> 1.2", [hex: :plug_crypto, repo: "hexpm", optional: false]}, {:telemetry, "~> 0.4 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "207f1aa5520320cbb7940d7ff2dde2342162cf513875848f88249ea0ba02fef7"},
   "phoenix_ecto": {:hex, :phoenix_ecto, "4.4.2", "b21bd01fdeffcfe2fab49e4942aa938b6d3e89e93a480d4aee58085560a0bc0d", [:mix], [{:ecto, "~> 3.5", [hex: :ecto, repo: "hexpm", optional: false]}, {:phoenix_html, "~> 2.14.2 or ~> 3.0", [hex: :phoenix_html, repo: "hexpm", optional: true]}, {:plug, "~> 1.9", [hex: :plug, repo: "hexpm", optional: false]}], "hexpm", "70242edd4601d50b69273b057ecf7b684644c19ee750989fd555625ae4ce8f5d"},
   "phoenix_html": {:hex, :phoenix_html, "3.0.4", "232d41884fe6a9c42d09f48397c175cd6f0d443aaa34c7424da47604201df2e1", [:mix], [{:plug, "~> 1.5", [hex: :plug, repo: "hexpm", optional: true]}], "hexpm", "ce17fd3cf815b2ed874114073e743507704b1f5288bb03c304a77458485efc8b"},

From d316782c0c1725d0672bfa4fa435f3fb2656ada8 Mon Sep 17 00:00:00 2001
From: Viktor Baranov <baranov.viktor.27@gmail.com>
Date: Sun, 1 Oct 2023 21:22:23 +0300
Subject: [PATCH 461/909] Dependabot: ignore bootstrap updates, interval update
 from daily to weekly

---
 .github/dependabot.yml | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index b6a9ec46bde4..5b5b518571b3 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -4,16 +4,18 @@ updates:
     directory: "/"
     open-pull-requests-limit: 20
     schedule:
-      interval: "daily"
+      interval: "weekly"
       
   - package-ecosystem: "npm"
     directory: "/apps/block_scout_web/assets"
     open-pull-requests-limit: 10
     schedule:
-      interval: "daily"
+      interval: "weekly"
       
   - package-ecosystem: "npm"
     directory: "/apps/explorer"
     open-pull-requests-limit: 10
     schedule:
-      interval: "daily"
+      interval: "weekly"
+    ignore:
+      - dependency-name: "bootstrap"

From 917555f092b786bd3e36e048a727247d40f0627a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 1 Oct 2023 18:26:05 +0000
Subject: [PATCH 462/909] Bump css-loader from 5.2.7 to 6.8.1 in
 /apps/block_scout_web/assets

Bumps [css-loader](https://github.com/webpack-contrib/css-loader) from 5.2.7 to 6.8.1.
- [Release notes](https://github.com/webpack-contrib/css-loader/releases)
- [Changelog](https://github.com/webpack-contrib/css-loader/blob/master/CHANGELOG.md)
- [Commits](https://github.com/webpack-contrib/css-loader/compare/v5.2.7...v6.8.1)

---
updated-dependencies:
- dependency-name: css-loader
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 apps/block_scout_web/assets/package-lock.json | 91 ++++++-------------
 apps/block_scout_web/assets/package.json      |  2 +-
 2 files changed, 30 insertions(+), 63 deletions(-)

diff --git a/apps/block_scout_web/assets/package-lock.json b/apps/block_scout_web/assets/package-lock.json
index d2a0a612ef3a..694443677242 100644
--- a/apps/block_scout_web/assets/package-lock.json
+++ b/apps/block_scout_web/assets/package-lock.json
@@ -76,7 +76,7 @@
         "autoprefixer": "^10.4.16",
         "babel-loader": "^9.1.3",
         "copy-webpack-plugin": "^11.0.0",
-        "css-loader": "^5.2.7",
+        "css-loader": "^6.8.1",
         "css-minimizer-webpack-plugin": "^5.0.1",
         "eslint": "^8.50.0",
         "eslint-config-standard": "^17.1.0",
@@ -6100,55 +6100,35 @@
       }
     },
     "node_modules/css-loader": {
-      "version": "5.2.7",
-      "resolved": "https://registry.npmjs.org/css-loader/-/css-loader-5.2.7.tgz",
-      "integrity": "sha512-Q7mOvpBNBG7YrVGMxRxcBJZFL75o+cH2abNASdibkj/fffYD8qWbInZrD0S9ccI6vZclF3DsHE7njGlLtaHbhg==",
+      "version": "6.8.1",
+      "resolved": "https://registry.npmjs.org/css-loader/-/css-loader-6.8.1.tgz",
+      "integrity": "sha512-xDAXtEVGlD0gJ07iclwWVkLoZOpEvAWaSyf6W18S2pOC//K8+qUDIx8IIT3D+HjnmkJPQeesOPv5aiUaJsCM2g==",
       "dev": true,
       "dependencies": {
         "icss-utils": "^5.1.0",
-        "loader-utils": "^2.0.0",
-        "postcss": "^8.2.15",
+        "postcss": "^8.4.21",
         "postcss-modules-extract-imports": "^3.0.0",
-        "postcss-modules-local-by-default": "^4.0.0",
+        "postcss-modules-local-by-default": "^4.0.3",
         "postcss-modules-scope": "^3.0.0",
         "postcss-modules-values": "^4.0.0",
-        "postcss-value-parser": "^4.1.0",
-        "schema-utils": "^3.0.0",
-        "semver": "^7.3.5"
+        "postcss-value-parser": "^4.2.0",
+        "semver": "^7.3.8"
       },
       "engines": {
-        "node": ">= 10.13.0"
+        "node": ">= 12.13.0"
       },
       "funding": {
         "type": "opencollective",
         "url": "https://opencollective.com/webpack"
       },
       "peerDependencies": {
-        "webpack": "^4.27.0 || ^5.0.0"
-      }
-    },
-    "node_modules/css-loader/node_modules/schema-utils": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.1.tgz",
-      "integrity": "sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw==",
-      "dev": true,
-      "dependencies": {
-        "@types/json-schema": "^7.0.8",
-        "ajv": "^6.12.5",
-        "ajv-keywords": "^3.5.2"
-      },
-      "engines": {
-        "node": ">= 10.13.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/webpack"
+        "webpack": "^5.0.0"
       }
     },
     "node_modules/css-loader/node_modules/semver": {
-      "version": "7.3.5",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz",
-      "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==",
+      "version": "7.5.4",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz",
+      "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==",
       "dev": true,
       "dependencies": {
         "lru-cache": "^6.0.0"
@@ -13892,9 +13872,9 @@
       }
     },
     "node_modules/postcss-modules-local-by-default": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-modules-local-by-default/-/postcss-modules-local-by-default-4.0.0.tgz",
-      "integrity": "sha512-sT7ihtmGSF9yhm6ggikHdV0hlziDTX7oFoXtuVWeDd3hHObNkcHRo9V3yg7vCAY7cONyxJC/XXCmmiHHcvX7bQ==",
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/postcss-modules-local-by-default/-/postcss-modules-local-by-default-4.0.3.tgz",
+      "integrity": "sha512-2/u2zraspoACtrbFRnTijMiQtb4GW4BvatjaG/bCjYQo8kLTdevCUlwuBHx2sCnSyrI3x3qj4ZK1j5LQBgzmwA==",
       "dev": true,
       "dependencies": {
         "icss-utils": "^5.0.0",
@@ -22195,38 +22175,25 @@
       "requires": {}
     },
     "css-loader": {
-      "version": "5.2.7",
-      "resolved": "https://registry.npmjs.org/css-loader/-/css-loader-5.2.7.tgz",
-      "integrity": "sha512-Q7mOvpBNBG7YrVGMxRxcBJZFL75o+cH2abNASdibkj/fffYD8qWbInZrD0S9ccI6vZclF3DsHE7njGlLtaHbhg==",
+      "version": "6.8.1",
+      "resolved": "https://registry.npmjs.org/css-loader/-/css-loader-6.8.1.tgz",
+      "integrity": "sha512-xDAXtEVGlD0gJ07iclwWVkLoZOpEvAWaSyf6W18S2pOC//K8+qUDIx8IIT3D+HjnmkJPQeesOPv5aiUaJsCM2g==",
       "dev": true,
       "requires": {
         "icss-utils": "^5.1.0",
-        "loader-utils": "^2.0.0",
-        "postcss": "^8.2.15",
+        "postcss": "^8.4.21",
         "postcss-modules-extract-imports": "^3.0.0",
-        "postcss-modules-local-by-default": "^4.0.0",
+        "postcss-modules-local-by-default": "^4.0.3",
         "postcss-modules-scope": "^3.0.0",
         "postcss-modules-values": "^4.0.0",
-        "postcss-value-parser": "^4.1.0",
-        "schema-utils": "^3.0.0",
-        "semver": "^7.3.5"
+        "postcss-value-parser": "^4.2.0",
+        "semver": "^7.3.8"
       },
       "dependencies": {
-        "schema-utils": {
-          "version": "3.1.1",
-          "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.1.tgz",
-          "integrity": "sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw==",
-          "dev": true,
-          "requires": {
-            "@types/json-schema": "^7.0.8",
-            "ajv": "^6.12.5",
-            "ajv-keywords": "^3.5.2"
-          }
-        },
         "semver": {
-          "version": "7.3.5",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz",
-          "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==",
+          "version": "7.5.4",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz",
+          "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==",
           "dev": true,
           "requires": {
             "lru-cache": "^6.0.0"
@@ -28131,9 +28098,9 @@
       "requires": {}
     },
     "postcss-modules-local-by-default": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-modules-local-by-default/-/postcss-modules-local-by-default-4.0.0.tgz",
-      "integrity": "sha512-sT7ihtmGSF9yhm6ggikHdV0hlziDTX7oFoXtuVWeDd3hHObNkcHRo9V3yg7vCAY7cONyxJC/XXCmmiHHcvX7bQ==",
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/postcss-modules-local-by-default/-/postcss-modules-local-by-default-4.0.3.tgz",
+      "integrity": "sha512-2/u2zraspoACtrbFRnTijMiQtb4GW4BvatjaG/bCjYQo8kLTdevCUlwuBHx2sCnSyrI3x3qj4ZK1j5LQBgzmwA==",
       "dev": true,
       "requires": {
         "icss-utils": "^5.0.0",
diff --git a/apps/block_scout_web/assets/package.json b/apps/block_scout_web/assets/package.json
index 86d8f31006c1..d9f1f7eb33c8 100644
--- a/apps/block_scout_web/assets/package.json
+++ b/apps/block_scout_web/assets/package.json
@@ -88,7 +88,7 @@
     "autoprefixer": "^10.4.16",
     "babel-loader": "^9.1.3",
     "copy-webpack-plugin": "^11.0.0",
-    "css-loader": "^5.2.7",
+    "css-loader": "^6.8.1",
     "css-minimizer-webpack-plugin": "^5.0.1",
     "eslint": "^8.50.0",
     "eslint-config-standard": "^17.1.0",

From 452f909e365689952d0fcc8f79a55650ddbc3e0c Mon Sep 17 00:00:00 2001
From: Viktor Baranov <baranov.viktor.27@gmail.com>
Date: Sun, 1 Oct 2023 21:47:40 +0300
Subject: [PATCH 463/909] dependabot: ignore web3 4.x

---
 .github/dependabot.yml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index 5b5b518571b3..b5eaa004db36 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -11,11 +11,13 @@ updates:
     open-pull-requests-limit: 10
     schedule:
       interval: "weekly"
+    ignore:
+      - dependency-name: "bootstrap"
+      - dependency-name: "web3"
+        versions: ["4.x"]
       
   - package-ecosystem: "npm"
     directory: "/apps/explorer"
     open-pull-requests-limit: 10
     schedule:
       interval: "weekly"
-    ignore:
-      - dependency-name: "bootstrap"

From 5622b2e16ad27326c357cd15d6d09ecb6a857f29 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 1 Oct 2023 18:48:45 +0000
Subject: [PATCH 464/909] Bump web3 from 1.10.0 to 1.10.2 in
 /apps/block_scout_web/assets

Bumps [web3](https://github.com/ChainSafe/web3.js) from 1.10.0 to 1.10.2.
- [Release notes](https://github.com/ChainSafe/web3.js/releases)
- [Changelog](https://github.com/web3/web3.js/blob/v1.10.2/CHANGELOG.md)
- [Commits](https://github.com/ChainSafe/web3.js/compare/v1.10.0...v1.10.2)

---
updated-dependencies:
- dependency-name: web3
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 apps/block_scout_web/assets/package-lock.json | 865 +++++++++++-------
 apps/block_scout_web/assets/package.json      |   2 +-
 2 files changed, 531 insertions(+), 336 deletions(-)

diff --git a/apps/block_scout_web/assets/package-lock.json b/apps/block_scout_web/assets/package-lock.json
index d2a0a612ef3a..473256c0e126 100644
--- a/apps/block_scout_web/assets/package-lock.json
+++ b/apps/block_scout_web/assets/package-lock.json
@@ -66,7 +66,7 @@
         "url": "^0.11.3",
         "util": "^0.12.5",
         "viewerjs": "^1.11.6",
-        "web3": "^1.10.0",
+        "web3": "^1.10.2",
         "web3modal": "^1.9.12",
         "xss": "^1.0.14"
       },
@@ -2123,6 +2123,17 @@
         "ethereumjs-util": "^7.1.1"
       }
     },
+    "node_modules/@ethereumjs/rlp": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/@ethereumjs/rlp/-/rlp-4.0.1.tgz",
+      "integrity": "sha512-tqsQiBQDQdmPWE1xkkBq4rlSW5QZpLOUJ5RJh2/9fug+q9tnUhuZoVLk7s0scUIKTOzEtR72DFBXI4WiZcMpvw==",
+      "bin": {
+        "rlp": "bin/rlp"
+      },
+      "engines": {
+        "node": ">=14"
+      }
+    },
     "node_modules/@ethereumjs/tx": {
       "version": "3.3.2",
       "resolved": "https://registry.npmjs.org/@ethereumjs/tx/-/tx-3.3.2.tgz",
@@ -2132,6 +2143,30 @@
         "ethereumjs-util": "^7.1.2"
       }
     },
+    "node_modules/@ethereumjs/util": {
+      "version": "8.1.0",
+      "resolved": "https://registry.npmjs.org/@ethereumjs/util/-/util-8.1.0.tgz",
+      "integrity": "sha512-zQ0IqbdX8FZ9aw11vP+dZkKDkS+kgIvQPHnSAXzP9pLu+Rfu3D3XEeLbicvoXJTYnhZiPmsZUxgdzXwNKxRPbA==",
+      "dependencies": {
+        "@ethereumjs/rlp": "^4.0.1",
+        "ethereum-cryptography": "^2.0.0",
+        "micro-ftch": "^0.3.1"
+      },
+      "engines": {
+        "node": ">=14"
+      }
+    },
+    "node_modules/@ethereumjs/util/node_modules/ethereum-cryptography": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/ethereum-cryptography/-/ethereum-cryptography-2.1.2.tgz",
+      "integrity": "sha512-Z5Ba0T0ImZ8fqXrJbpHcbpAvIswRte2wGNR/KePnu8GbbvgJ47lMxT/ZZPG6i9Jaht4azPDop4HaM00J0J59ug==",
+      "dependencies": {
+        "@noble/curves": "1.1.0",
+        "@noble/hashes": "1.3.1",
+        "@scure/bip32": "1.3.1",
+        "@scure/bip39": "1.2.1"
+      }
+    },
     "node_modules/@ethersproject/abi": {
       "version": "5.7.0",
       "resolved": "https://registry.npmjs.org/@ethersproject/abi/-/abi-5.7.0.tgz",
@@ -3309,6 +3344,28 @@
       "resolved": "https://registry.npmjs.org/@metamask/safe-event-emitter/-/safe-event-emitter-2.0.0.tgz",
       "integrity": "sha512-/kSXhY692qiV1MXu6EeOZvg5nECLclxNXcKCxJ3cXQgYuRymRHpdx/t7JXfsK+JLjwA1e1c1/SBrlQYpusC29Q=="
     },
+    "node_modules/@noble/curves": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/@noble/curves/-/curves-1.1.0.tgz",
+      "integrity": "sha512-091oBExgENk/kGj3AZmtBDMpxQPDtxQABR2B9lb1JbVTs6ytdzZNwvhxQ4MWasRNEzlbEH8jCWFCwhF/Obj5AA==",
+      "dependencies": {
+        "@noble/hashes": "1.3.1"
+      },
+      "funding": {
+        "url": "https://paulmillr.com/funding/"
+      }
+    },
+    "node_modules/@noble/hashes": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/@noble/hashes/-/hashes-1.3.1.tgz",
+      "integrity": "sha512-EbqwksQwz9xDRGfDST86whPBgM65E0OH/pCgqW0GBVzO22bNE+NuIbeTb714+IfSjU3aRk47EUvXIb5bTsenKA==",
+      "engines": {
+        "node": ">= 16"
+      },
+      "funding": {
+        "url": "https://paulmillr.com/funding/"
+      }
+    },
     "node_modules/@nodelib/fs.scandir": {
       "version": "2.1.5",
       "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
@@ -3344,6 +3401,39 @@
         "node": ">= 8"
       }
     },
+    "node_modules/@scure/base": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/@scure/base/-/base-1.1.3.tgz",
+      "integrity": "sha512-/+SgoRjLq7Xlf0CWuLHq2LUZeL/w65kfzAPG5NH9pcmBhs+nunQTn4gvdwgMTIXnt9b2C/1SeL2XiysZEyIC9Q==",
+      "funding": {
+        "url": "https://paulmillr.com/funding/"
+      }
+    },
+    "node_modules/@scure/bip32": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/@scure/bip32/-/bip32-1.3.1.tgz",
+      "integrity": "sha512-osvveYtyzdEVbt3OfwwXFr4P2iVBL5u1Q3q4ONBfDY/UpOuXmOlbgwc1xECEboY8wIays8Yt6onaWMUdUbfl0A==",
+      "dependencies": {
+        "@noble/curves": "~1.1.0",
+        "@noble/hashes": "~1.3.1",
+        "@scure/base": "~1.1.0"
+      },
+      "funding": {
+        "url": "https://paulmillr.com/funding/"
+      }
+    },
+    "node_modules/@scure/bip39": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/@scure/bip39/-/bip39-1.2.1.tgz",
+      "integrity": "sha512-Z3/Fsz1yr904dduJD0NpiyRHhRYHdcnyh73FZWiV+/qhWi83wNJ3NWolYqCEN+ZWsUz2TWwajJggcRE9r1zUYg==",
+      "dependencies": {
+        "@noble/hashes": "~1.3.0",
+        "@scure/base": "~1.1.0"
+      },
+      "funding": {
+        "url": "https://paulmillr.com/funding/"
+      }
+    },
     "node_modules/@sinclair/typebox": {
       "version": "0.27.8",
       "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.27.8.tgz",
@@ -3514,9 +3604,9 @@
       }
     },
     "node_modules/@types/http-cache-semantics": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/@types/http-cache-semantics/-/http-cache-semantics-4.0.1.tgz",
-      "integrity": "sha512-SZs7ekbP8CN0txVG2xVRH6EgKmEm31BOxA07vkFaETzZz1xh+cbt8BcI0slpymvwhx5dlFnQG2rTlPVQn+iRPQ=="
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/@types/http-cache-semantics/-/http-cache-semantics-4.0.2.tgz",
+      "integrity": "sha512-FD+nQWA2zJjh4L9+pFXqWOi0Hs1ryBCfI+985NjluQ1p8EYtoLvjLOKidXBtZ4/IcxDX4o8/E8qDS3540tNliw=="
     },
     "node_modules/@types/istanbul-lib-coverage": {
       "version": "2.0.4",
@@ -3587,9 +3677,9 @@
       }
     },
     "node_modules/@types/responselike": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/@types/responselike/-/responselike-1.0.0.tgz",
-      "integrity": "sha512-85Y2BjiufFzaMIlvJDvTTB8Fxl2xfLo4HgmHzVBz08w4wDePCTjYw66PdrolO0kzli3yam/YCgRufyo1DdQVTA==",
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/@types/responselike/-/responselike-1.0.1.tgz",
+      "integrity": "sha512-TiGnitEDxj2X0j+98Eqk5lv/Cij8oHd32bU4D/Yw6AOq7vvTk0gSD2GPj0G/HkvhMoVsdlhYF4yqqlyPBTM6Sg==",
       "dependencies": {
         "@types/node": "*"
       }
@@ -5294,9 +5384,9 @@
       }
     },
     "node_modules/cacheable-request": {
-      "version": "7.0.2",
-      "resolved": "https://registry.npmjs.org/cacheable-request/-/cacheable-request-7.0.2.tgz",
-      "integrity": "sha512-pouW8/FmiPQbuGpkXQ9BAPv/Mo5xDGANgSNXzTzJ8DrKGuXOssM4wIQRjfanNRh3Yu5cfYPvcorqbhg2KIJtew==",
+      "version": "7.0.4",
+      "resolved": "https://registry.npmjs.org/cacheable-request/-/cacheable-request-7.0.4.tgz",
+      "integrity": "sha512-v+p6ongsrp0yTGbJXjgxPow2+DL93DASP4kXCDKb8/bwRtt9OEF3whggkkDkGNzgcWy2XaF4a8nZglC7uElscg==",
       "dependencies": {
         "clone-response": "^1.0.2",
         "get-stream": "^5.1.0",
@@ -8251,9 +8341,9 @@
       }
     },
     "node_modules/ethereumjs-util/node_modules/@types/bn.js": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/@types/bn.js/-/bn.js-5.1.1.tgz",
-      "integrity": "sha512-qNrYbZqMx0uJAfKnKclPh+dTwK33KfLHYqtyODwd5HnXOjnkhc4qgn3BrK6RWyGZm5+sIFE7Q7Vz6QQtJB7w7g==",
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/@types/bn.js/-/bn.js-5.1.2.tgz",
+      "integrity": "sha512-dkpZu0szUtn9UXTmw+e0AJFd4D2XAxDnsCLdc05SfqpqzPEBft8eQr8uaFitfo/dUUOZERaLec2hHMG87A4Dxg==",
       "dependencies": {
         "@types/node": "*"
       }
@@ -12066,9 +12156,9 @@
       }
     },
     "node_modules/keyv": {
-      "version": "4.5.2",
-      "resolved": "https://registry.npmjs.org/keyv/-/keyv-4.5.2.tgz",
-      "integrity": "sha512-5MHbFaKn8cNSmVW7BYnijeAVlE4cYA/SVkifVgrh7yotnfhKmjuXpDKjrABLnT0SfHWV21P8ow07OGfRrNDg8g==",
+      "version": "4.5.3",
+      "resolved": "https://registry.npmjs.org/keyv/-/keyv-4.5.3.tgz",
+      "integrity": "sha512-QCiSav9WaX1PgETJ+SpNnx2PRRapJ/oRSXM4VO5OGYGSjrxbKPVFVhB3l2OCbLCk329N8qyAtsJjSjvVBWzEug==",
       "dependencies": {
         "json-buffer": "3.0.1"
       }
@@ -12616,6 +12706,11 @@
         "node": ">= 0.6"
       }
     },
+    "node_modules/micro-ftch": {
+      "version": "0.3.1",
+      "resolved": "https://registry.npmjs.org/micro-ftch/-/micro-ftch-0.3.1.tgz",
+      "integrity": "sha512-/0LLxhzP0tfiR5hcQebtudP56gUurs2CLkGarnCiB/OqEyUFQ6U3paQi/tgLv0hBJYt2rnr9MNpxz4fiiugstg=="
+    },
     "node_modules/micromatch": {
       "version": "4.0.4",
       "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.4.tgz",
@@ -12924,9 +13019,9 @@
       "integrity": "sha512-Ntyt4AIXyaLIuMHF6IOoTakB3K+RWxwtsHNRxllEoA6vPwP9o4866g6YWDLUdnucilZhmkxiHwHr11gAENw+QA=="
     },
     "node_modules/node-fetch": {
-      "version": "2.6.7",
-      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.7.tgz",
-      "integrity": "sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==",
+      "version": "2.7.0",
+      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.7.0.tgz",
+      "integrity": "sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A==",
       "dependencies": {
         "whatwg-url": "^5.0.0"
       },
@@ -16679,27 +16774,27 @@
       }
     },
     "node_modules/web3": {
-      "version": "1.10.0",
-      "resolved": "https://registry.npmjs.org/web3/-/web3-1.10.0.tgz",
-      "integrity": "sha512-YfKY9wSkGcM8seO+daR89oVTcbu18NsVfvOngzqMYGUU0pPSQmE57qQDvQzUeoIOHAnXEBNzrhjQJmm8ER0rng==",
+      "version": "1.10.2",
+      "resolved": "https://registry.npmjs.org/web3/-/web3-1.10.2.tgz",
+      "integrity": "sha512-DAtZ3a3ruPziE80uZ3Ob0YDZxt6Vk2un/F5BcBrxO70owJ9Z1Y2+loZmbh1MoAmoLGjA/SUSHeUtid3fYmBaog==",
       "hasInstallScript": true,
       "dependencies": {
-        "web3-bzz": "1.10.0",
-        "web3-core": "1.10.0",
-        "web3-eth": "1.10.0",
-        "web3-eth-personal": "1.10.0",
-        "web3-net": "1.10.0",
-        "web3-shh": "1.10.0",
-        "web3-utils": "1.10.0"
+        "web3-bzz": "1.10.2",
+        "web3-core": "1.10.2",
+        "web3-eth": "1.10.2",
+        "web3-eth-personal": "1.10.2",
+        "web3-net": "1.10.2",
+        "web3-shh": "1.10.2",
+        "web3-utils": "1.10.2"
       },
       "engines": {
         "node": ">=8.0.0"
       }
     },
     "node_modules/web3-bzz": {
-      "version": "1.10.0",
-      "resolved": "https://registry.npmjs.org/web3-bzz/-/web3-bzz-1.10.0.tgz",
-      "integrity": "sha512-o9IR59io3pDUsXTsps5pO5hW1D5zBmg46iNc2t4j2DkaYHNdDLwk2IP9ukoM2wg47QILfPEJYzhTfkS/CcX0KA==",
+      "version": "1.10.2",
+      "resolved": "https://registry.npmjs.org/web3-bzz/-/web3-bzz-1.10.2.tgz",
+      "integrity": "sha512-vLOfDCj6198Qc7esDrCKeFA/M3ZLbowsaHQ0hIL4NmIHoq7lU8aSRTa5AI+JBh8cKN1gVryJsuW2ZCc5bM4I4Q==",
       "hasInstallScript": true,
       "dependencies": {
         "@types/node": "^12.12.6",
@@ -16716,53 +16811,53 @@
       "integrity": "sha512-J8xLz7q2OFulZ2cyGTLE1TbbZcjpno7FaN6zdJNrgAdrJ+DZzh/uFR6YrTb4C+nXakvud8Q4+rbhoIWlYQbUFQ=="
     },
     "node_modules/web3-core": {
-      "version": "1.10.0",
-      "resolved": "https://registry.npmjs.org/web3-core/-/web3-core-1.10.0.tgz",
-      "integrity": "sha512-fWySwqy2hn3TL89w5TM8wXF1Z2Q6frQTKHWmP0ppRQorEK8NcHJRfeMiv/mQlSKoTS1F6n/nv2uyZsixFycjYQ==",
+      "version": "1.10.2",
+      "resolved": "https://registry.npmjs.org/web3-core/-/web3-core-1.10.2.tgz",
+      "integrity": "sha512-qTn2UmtE8tvwMRsC5pXVdHxrQ4uZ6jiLgF5DRUVtdi7dPUmX18Dp9uxKfIfhGcA011EAn8P6+X7r3pvi2YRxBw==",
       "dependencies": {
         "@types/bn.js": "^5.1.1",
         "@types/node": "^12.12.6",
         "bignumber.js": "^9.0.0",
-        "web3-core-helpers": "1.10.0",
-        "web3-core-method": "1.10.0",
-        "web3-core-requestmanager": "1.10.0",
-        "web3-utils": "1.10.0"
+        "web3-core-helpers": "1.10.2",
+        "web3-core-method": "1.10.2",
+        "web3-core-requestmanager": "1.10.2",
+        "web3-utils": "1.10.2"
       },
       "engines": {
         "node": ">=8.0.0"
       }
     },
     "node_modules/web3-core-helpers": {
-      "version": "1.10.0",
-      "resolved": "https://registry.npmjs.org/web3-core-helpers/-/web3-core-helpers-1.10.0.tgz",
-      "integrity": "sha512-pIxAzFDS5vnbXvfvLSpaA1tfRykAe9adw43YCKsEYQwH0gCLL0kMLkaCX3q+Q8EVmAh+e1jWL/nl9U0de1+++g==",
+      "version": "1.10.2",
+      "resolved": "https://registry.npmjs.org/web3-core-helpers/-/web3-core-helpers-1.10.2.tgz",
+      "integrity": "sha512-1JfaNtox6/ZYJHNoI+QVc2ObgwEPeGF+YdxHZQ7aF5605BmlwM1Bk3A8xv6mg64jIRvEq1xX6k9oG6x7p1WgXQ==",
       "dependencies": {
-        "web3-eth-iban": "1.10.0",
-        "web3-utils": "1.10.0"
+        "web3-eth-iban": "1.10.2",
+        "web3-utils": "1.10.2"
       },
       "engines": {
         "node": ">=8.0.0"
       }
     },
     "node_modules/web3-core-method": {
-      "version": "1.10.0",
-      "resolved": "https://registry.npmjs.org/web3-core-method/-/web3-core-method-1.10.0.tgz",
-      "integrity": "sha512-4R700jTLAMKDMhQ+nsVfIXvH6IGJlJzGisIfMKWAIswH31h5AZz7uDUW2YctI+HrYd+5uOAlS4OJeeT9bIpvkA==",
+      "version": "1.10.2",
+      "resolved": "https://registry.npmjs.org/web3-core-method/-/web3-core-method-1.10.2.tgz",
+      "integrity": "sha512-gG6ES+LOuo01MJHML4gnEt702M8lcPGMYZoX8UjZzmEebGrPYOY9XccpCrsFgCeKgQzM12SVnlwwpMod1+lcLg==",
       "dependencies": {
         "@ethersproject/transactions": "^5.6.2",
-        "web3-core-helpers": "1.10.0",
-        "web3-core-promievent": "1.10.0",
-        "web3-core-subscriptions": "1.10.0",
-        "web3-utils": "1.10.0"
+        "web3-core-helpers": "1.10.2",
+        "web3-core-promievent": "1.10.2",
+        "web3-core-subscriptions": "1.10.2",
+        "web3-utils": "1.10.2"
       },
       "engines": {
         "node": ">=8.0.0"
       }
     },
     "node_modules/web3-core-promievent": {
-      "version": "1.10.0",
-      "resolved": "https://registry.npmjs.org/web3-core-promievent/-/web3-core-promievent-1.10.0.tgz",
-      "integrity": "sha512-68N7k5LWL5R38xRaKFrTFT2pm2jBNFaM4GioS00YjAKXRQ3KjmhijOMG3TICz6Aa5+6GDWYelDNx21YAeZ4YTg==",
+      "version": "1.10.2",
+      "resolved": "https://registry.npmjs.org/web3-core-promievent/-/web3-core-promievent-1.10.2.tgz",
+      "integrity": "sha512-Qkkb1dCDOU8dZeORkcwJBQRAX+mdsjx8LqFBB+P4W9QgwMqyJ6LXda+y1XgyeEVeKEmY1RCeTq9Y94q1v62Sfw==",
       "dependencies": {
         "eventemitter3": "4.0.4"
       },
@@ -16771,36 +16866,36 @@
       }
     },
     "node_modules/web3-core-requestmanager": {
-      "version": "1.10.0",
-      "resolved": "https://registry.npmjs.org/web3-core-requestmanager/-/web3-core-requestmanager-1.10.0.tgz",
-      "integrity": "sha512-3z/JKE++Os62APml4dvBM+GAuId4h3L9ckUrj7ebEtS2AR0ixyQPbrBodgL91Sv7j7cQ3Y+hllaluqjguxvSaQ==",
+      "version": "1.10.2",
+      "resolved": "https://registry.npmjs.org/web3-core-requestmanager/-/web3-core-requestmanager-1.10.2.tgz",
+      "integrity": "sha512-nlLeNJUu6fR+ZbJr2k9Du/nN3VWwB4AJPY4r6nxUODAmykgJq57T21cLP/BEk6mbiFQYGE9TrrPhh4qWxQEtAw==",
       "dependencies": {
         "util": "^0.12.5",
-        "web3-core-helpers": "1.10.0",
-        "web3-providers-http": "1.10.0",
-        "web3-providers-ipc": "1.10.0",
-        "web3-providers-ws": "1.10.0"
+        "web3-core-helpers": "1.10.2",
+        "web3-providers-http": "1.10.2",
+        "web3-providers-ipc": "1.10.2",
+        "web3-providers-ws": "1.10.2"
       },
       "engines": {
         "node": ">=8.0.0"
       }
     },
     "node_modules/web3-core-subscriptions": {
-      "version": "1.10.0",
-      "resolved": "https://registry.npmjs.org/web3-core-subscriptions/-/web3-core-subscriptions-1.10.0.tgz",
-      "integrity": "sha512-HGm1PbDqsxejI075gxBc5OSkwymilRWZufIy9zEpnWKNmfbuv5FfHgW1/chtJP6aP3Uq2vHkvTDl3smQBb8l+g==",
+      "version": "1.10.2",
+      "resolved": "https://registry.npmjs.org/web3-core-subscriptions/-/web3-core-subscriptions-1.10.2.tgz",
+      "integrity": "sha512-MiWcKjz4tco793EPPPLc/YOJmYUV3zAfxeQH/UVTfBejMfnNvmfwKa2SBKfPIvKQHz/xI5bV2TF15uvJEucU7w==",
       "dependencies": {
         "eventemitter3": "4.0.4",
-        "web3-core-helpers": "1.10.0"
+        "web3-core-helpers": "1.10.2"
       },
       "engines": {
         "node": ">=8.0.0"
       }
     },
     "node_modules/web3-core/node_modules/@types/bn.js": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/@types/bn.js/-/bn.js-5.1.1.tgz",
-      "integrity": "sha512-qNrYbZqMx0uJAfKnKclPh+dTwK33KfLHYqtyODwd5HnXOjnkhc4qgn3BrK6RWyGZm5+sIFE7Q7Vz6QQtJB7w7g==",
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/@types/bn.js/-/bn.js-5.1.2.tgz",
+      "integrity": "sha512-dkpZu0szUtn9UXTmw+e0AJFd4D2XAxDnsCLdc05SfqpqzPEBft8eQr8uaFitfo/dUUOZERaLec2hHMG87A4Dxg==",
       "dependencies": {
         "@types/node": "*"
       }
@@ -16811,54 +16906,54 @@
       "integrity": "sha512-J8xLz7q2OFulZ2cyGTLE1TbbZcjpno7FaN6zdJNrgAdrJ+DZzh/uFR6YrTb4C+nXakvud8Q4+rbhoIWlYQbUFQ=="
     },
     "node_modules/web3-eth": {
-      "version": "1.10.0",
-      "resolved": "https://registry.npmjs.org/web3-eth/-/web3-eth-1.10.0.tgz",
-      "integrity": "sha512-Z5vT6slNMLPKuwRyKGbqeGYC87OAy8bOblaqRTgg94CXcn/mmqU7iPIlG4506YdcdK3x6cfEDG7B6w+jRxypKA==",
-      "dependencies": {
-        "web3-core": "1.10.0",
-        "web3-core-helpers": "1.10.0",
-        "web3-core-method": "1.10.0",
-        "web3-core-subscriptions": "1.10.0",
-        "web3-eth-abi": "1.10.0",
-        "web3-eth-accounts": "1.10.0",
-        "web3-eth-contract": "1.10.0",
-        "web3-eth-ens": "1.10.0",
-        "web3-eth-iban": "1.10.0",
-        "web3-eth-personal": "1.10.0",
-        "web3-net": "1.10.0",
-        "web3-utils": "1.10.0"
+      "version": "1.10.2",
+      "resolved": "https://registry.npmjs.org/web3-eth/-/web3-eth-1.10.2.tgz",
+      "integrity": "sha512-s38rhrntyhGShmXC4R/aQtfkpcmev9c7iZwgb9CDIBFo7K8nrEJvqIOyajeZTxnDIiGzTJmrHxiKSadii5qTRg==",
+      "dependencies": {
+        "web3-core": "1.10.2",
+        "web3-core-helpers": "1.10.2",
+        "web3-core-method": "1.10.2",
+        "web3-core-subscriptions": "1.10.2",
+        "web3-eth-abi": "1.10.2",
+        "web3-eth-accounts": "1.10.2",
+        "web3-eth-contract": "1.10.2",
+        "web3-eth-ens": "1.10.2",
+        "web3-eth-iban": "1.10.2",
+        "web3-eth-personal": "1.10.2",
+        "web3-net": "1.10.2",
+        "web3-utils": "1.10.2"
       },
       "engines": {
         "node": ">=8.0.0"
       }
     },
     "node_modules/web3-eth-abi": {
-      "version": "1.10.0",
-      "resolved": "https://registry.npmjs.org/web3-eth-abi/-/web3-eth-abi-1.10.0.tgz",
-      "integrity": "sha512-cwS+qRBWpJ43aI9L3JS88QYPfFcSJJ3XapxOQ4j40v6mk7ATpA8CVK1vGTzpihNlOfMVRBkR95oAj7oL6aiDOg==",
+      "version": "1.10.2",
+      "resolved": "https://registry.npmjs.org/web3-eth-abi/-/web3-eth-abi-1.10.2.tgz",
+      "integrity": "sha512-pY4fQUio7W7ZRSLf+vsYkaxJqaT/jHcALZjIxy+uBQaYAJ3t6zpQqMZkJB3Dw7HUODRJ1yI0NPEFGTnkYf/17A==",
       "dependencies": {
         "@ethersproject/abi": "^5.6.3",
-        "web3-utils": "1.10.0"
+        "web3-utils": "1.10.2"
       },
       "engines": {
         "node": ">=8.0.0"
       }
     },
     "node_modules/web3-eth-accounts": {
-      "version": "1.10.0",
-      "resolved": "https://registry.npmjs.org/web3-eth-accounts/-/web3-eth-accounts-1.10.0.tgz",
-      "integrity": "sha512-wiq39Uc3mOI8rw24wE2n15hboLE0E9BsQLdlmsL4Zua9diDS6B5abXG0XhFcoNsXIGMWXVZz4TOq3u4EdpXF/Q==",
+      "version": "1.10.2",
+      "resolved": "https://registry.npmjs.org/web3-eth-accounts/-/web3-eth-accounts-1.10.2.tgz",
+      "integrity": "sha512-6/HhCBYAXN/f553/SyxS9gY62NbLgpD1zJpENcvRTDpJN3Znvli1cmpl5Q3ZIUJkvHnG//48EWfWh0cbb3fbKQ==",
       "dependencies": {
         "@ethereumjs/common": "2.5.0",
         "@ethereumjs/tx": "3.3.2",
+        "@ethereumjs/util": "^8.1.0",
         "eth-lib": "0.2.8",
-        "ethereumjs-util": "^7.1.5",
         "scrypt-js": "^3.0.1",
         "uuid": "^9.0.0",
-        "web3-core": "1.10.0",
-        "web3-core-helpers": "1.10.0",
-        "web3-core-method": "1.10.0",
-        "web3-utils": "1.10.0"
+        "web3-core": "1.10.2",
+        "web3-core-helpers": "1.10.2",
+        "web3-core-method": "1.10.2",
+        "web3-utils": "1.10.2"
       },
       "engines": {
         "node": ">=8.0.0"
@@ -16880,80 +16975,84 @@
       }
     },
     "node_modules/web3-eth-accounts/node_modules/uuid": {
-      "version": "9.0.0",
-      "resolved": "https://registry.npmjs.org/uuid/-/uuid-9.0.0.tgz",
-      "integrity": "sha512-MXcSTerfPa4uqyzStbRoTgt5XIe3x5+42+q1sDuy3R5MDk66URdLMOZe5aPX/SQd+kuYAh0FdP/pO28IkQyTeg==",
+      "version": "9.0.1",
+      "resolved": "https://registry.npmjs.org/uuid/-/uuid-9.0.1.tgz",
+      "integrity": "sha512-b+1eJOlsR9K8HJpow9Ok3fiWOWSIcIzXodvv0rQjVoOVNpWMpxf1wZNpt4y9h10odCNrqnYp1OBzRktckBe3sA==",
+      "funding": [
+        "https://github.com/sponsors/broofa",
+        "https://github.com/sponsors/ctavan"
+      ],
       "bin": {
         "uuid": "dist/bin/uuid"
       }
     },
     "node_modules/web3-eth-contract": {
-      "version": "1.10.0",
-      "resolved": "https://registry.npmjs.org/web3-eth-contract/-/web3-eth-contract-1.10.0.tgz",
-      "integrity": "sha512-MIC5FOzP/+2evDksQQ/dpcXhSqa/2hFNytdl/x61IeWxhh6vlFeSjq0YVTAyIzdjwnL7nEmZpjfI6y6/Ufhy7w==",
+      "version": "1.10.2",
+      "resolved": "https://registry.npmjs.org/web3-eth-contract/-/web3-eth-contract-1.10.2.tgz",
+      "integrity": "sha512-CZLKPQRmupP/+OZ5A/CBwWWkBiz5B/foOpARz0upMh1yjb0dEud4YzRW2gJaeNu0eGxDLsWVaXhUimJVGYprQw==",
       "dependencies": {
         "@types/bn.js": "^5.1.1",
-        "web3-core": "1.10.0",
-        "web3-core-helpers": "1.10.0",
-        "web3-core-method": "1.10.0",
-        "web3-core-promievent": "1.10.0",
-        "web3-core-subscriptions": "1.10.0",
-        "web3-eth-abi": "1.10.0",
-        "web3-utils": "1.10.0"
+        "web3-core": "1.10.2",
+        "web3-core-helpers": "1.10.2",
+        "web3-core-method": "1.10.2",
+        "web3-core-promievent": "1.10.2",
+        "web3-core-subscriptions": "1.10.2",
+        "web3-eth-abi": "1.10.2",
+        "web3-utils": "1.10.2"
       },
       "engines": {
         "node": ">=8.0.0"
       }
     },
     "node_modules/web3-eth-contract/node_modules/@types/bn.js": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/@types/bn.js/-/bn.js-5.1.1.tgz",
-      "integrity": "sha512-qNrYbZqMx0uJAfKnKclPh+dTwK33KfLHYqtyODwd5HnXOjnkhc4qgn3BrK6RWyGZm5+sIFE7Q7Vz6QQtJB7w7g==",
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/@types/bn.js/-/bn.js-5.1.2.tgz",
+      "integrity": "sha512-dkpZu0szUtn9UXTmw+e0AJFd4D2XAxDnsCLdc05SfqpqzPEBft8eQr8uaFitfo/dUUOZERaLec2hHMG87A4Dxg==",
       "dependencies": {
         "@types/node": "*"
       }
     },
     "node_modules/web3-eth-ens": {
-      "version": "1.10.0",
-      "resolved": "https://registry.npmjs.org/web3-eth-ens/-/web3-eth-ens-1.10.0.tgz",
-      "integrity": "sha512-3hpGgzX3qjgxNAmqdrC2YUQMTfnZbs4GeLEmy8aCWziVwogbuqQZ+Gzdfrym45eOZodk+lmXyLuAdqkNlvkc1g==",
+      "version": "1.10.2",
+      "resolved": "https://registry.npmjs.org/web3-eth-ens/-/web3-eth-ens-1.10.2.tgz",
+      "integrity": "sha512-kTQ42UdNHy4BQJHgWe97bHNMkc3zCMBKKY7t636XOMxdI/lkRdIjdE5nQzt97VjQvSVasgIWYKRAtd8aRaiZiQ==",
       "dependencies": {
         "content-hash": "^2.5.2",
         "eth-ens-namehash": "2.0.8",
-        "web3-core": "1.10.0",
-        "web3-core-helpers": "1.10.0",
-        "web3-core-promievent": "1.10.0",
-        "web3-eth-abi": "1.10.0",
-        "web3-eth-contract": "1.10.0",
-        "web3-utils": "1.10.0"
+        "web3-core": "1.10.2",
+        "web3-core-helpers": "1.10.2",
+        "web3-core-promievent": "1.10.2",
+        "web3-eth-abi": "1.10.2",
+        "web3-eth-contract": "1.10.2",
+        "web3-utils": "1.10.2"
       },
       "engines": {
         "node": ">=8.0.0"
       }
     },
     "node_modules/web3-eth-iban": {
-      "version": "1.10.0",
-      "resolved": "https://registry.npmjs.org/web3-eth-iban/-/web3-eth-iban-1.10.0.tgz",
-      "integrity": "sha512-0l+SP3IGhInw7Q20LY3IVafYEuufo4Dn75jAHT7c2aDJsIolvf2Lc6ugHkBajlwUneGfbRQs/ccYPQ9JeMUbrg==",
+      "version": "1.10.2",
+      "resolved": "https://registry.npmjs.org/web3-eth-iban/-/web3-eth-iban-1.10.2.tgz",
+      "integrity": "sha512-y8+Ii2XXdyHQMFNL2NWpBnXe+TVJ4ryvPlzNhObRRnIo4O4nLIXS010olLDMayozDzoUlmzCmBZJYc9Eev1g7A==",
       "dependencies": {
         "bn.js": "^5.2.1",
-        "web3-utils": "1.10.0"
+        "web3-utils": "1.10.2"
       },
       "engines": {
         "node": ">=8.0.0"
       }
     },
     "node_modules/web3-eth-personal": {
-      "version": "1.10.0",
-      "resolved": "https://registry.npmjs.org/web3-eth-personal/-/web3-eth-personal-1.10.0.tgz",
-      "integrity": "sha512-anseKn98w/d703eWq52uNuZi7GhQeVjTC5/svrBWEKob0WZ5kPdo+EZoFN0sp5a5ubbrk/E0xSl1/M5yORMtpg==",
+      "version": "1.10.2",
+      "resolved": "https://registry.npmjs.org/web3-eth-personal/-/web3-eth-personal-1.10.2.tgz",
+      "integrity": "sha512-+vEbJsPUJc5J683y0c2aN645vXC+gPVlFVCQu4IjPvXzJrAtUfz26+IZ6AUOth4fDJPT0f1uSLS5W2yrUdw9BQ==",
       "dependencies": {
         "@types/node": "^12.12.6",
-        "web3-core": "1.10.0",
-        "web3-core-helpers": "1.10.0",
-        "web3-core-method": "1.10.0",
-        "web3-net": "1.10.0",
-        "web3-utils": "1.10.0"
+        "web3-core": "1.10.2",
+        "web3-core-helpers": "1.10.2",
+        "web3-core-method": "1.10.2",
+        "web3-net": "1.10.2",
+        "web3-utils": "1.10.2"
       },
       "engines": {
         "node": ">=8.0.0"
@@ -16965,13 +17064,13 @@
       "integrity": "sha512-J8xLz7q2OFulZ2cyGTLE1TbbZcjpno7FaN6zdJNrgAdrJ+DZzh/uFR6YrTb4C+nXakvud8Q4+rbhoIWlYQbUFQ=="
     },
     "node_modules/web3-net": {
-      "version": "1.10.0",
-      "resolved": "https://registry.npmjs.org/web3-net/-/web3-net-1.10.0.tgz",
-      "integrity": "sha512-NLH/N3IshYWASpxk4/18Ge6n60GEvWBVeM8inx2dmZJVmRI6SJIlUxbL8jySgiTn3MMZlhbdvrGo8fpUW7a1GA==",
+      "version": "1.10.2",
+      "resolved": "https://registry.npmjs.org/web3-net/-/web3-net-1.10.2.tgz",
+      "integrity": "sha512-w9i1t2z7dItagfskhaCKwpp6W3ylUR88gs68u820y5f8yfK5EbPmHc6c2lD8X9ZrTnmDoeOpIRCN/RFPtZCp+g==",
       "dependencies": {
-        "web3-core": "1.10.0",
-        "web3-core-method": "1.10.0",
-        "web3-utils": "1.10.0"
+        "web3-core": "1.10.2",
+        "web3-core-method": "1.10.2",
+        "web3-utils": "1.10.2"
       },
       "engines": {
         "node": ">=8.0.0"
@@ -17056,46 +17155,46 @@
       }
     },
     "node_modules/web3-providers-http": {
-      "version": "1.10.0",
-      "resolved": "https://registry.npmjs.org/web3-providers-http/-/web3-providers-http-1.10.0.tgz",
-      "integrity": "sha512-eNr965YB8a9mLiNrkjAWNAPXgmQWfpBfkkn7tpEFlghfww0u3I0tktMZiaToJVcL2+Xq+81cxbkpeWJ5XQDwOA==",
+      "version": "1.10.2",
+      "resolved": "https://registry.npmjs.org/web3-providers-http/-/web3-providers-http-1.10.2.tgz",
+      "integrity": "sha512-G8abKtpkyKGpRVKvfjIF3I4O/epHP7mxXWN8mNMQLkQj1cjMFiZBZ13f+qI77lNJN7QOf6+LtNdKrhsTGU72TA==",
       "dependencies": {
-        "abortcontroller-polyfill": "^1.7.3",
-        "cross-fetch": "^3.1.4",
+        "abortcontroller-polyfill": "^1.7.5",
+        "cross-fetch": "^4.0.0",
         "es6-promise": "^4.2.8",
-        "web3-core-helpers": "1.10.0"
+        "web3-core-helpers": "1.10.2"
       },
       "engines": {
         "node": ">=8.0.0"
       }
     },
     "node_modules/web3-providers-http/node_modules/cross-fetch": {
-      "version": "3.1.5",
-      "resolved": "https://registry.npmjs.org/cross-fetch/-/cross-fetch-3.1.5.tgz",
-      "integrity": "sha512-lvb1SBsI0Z7GDwmuid+mU3kWVBwTVUbe7S0H52yaaAdQOXq2YktTCZdlAcNKFzE6QtRz0snpw9bNiPeOIkkQvw==",
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/cross-fetch/-/cross-fetch-4.0.0.tgz",
+      "integrity": "sha512-e4a5N8lVvuLgAWgnCrLr2PP0YyDOTHa9H/Rj54dirp61qXnNq46m82bRhNqIA5VccJtWBvPTFRV3TtvHUKPB1g==",
       "dependencies": {
-        "node-fetch": "2.6.7"
+        "node-fetch": "^2.6.12"
       }
     },
     "node_modules/web3-providers-ipc": {
-      "version": "1.10.0",
-      "resolved": "https://registry.npmjs.org/web3-providers-ipc/-/web3-providers-ipc-1.10.0.tgz",
-      "integrity": "sha512-OfXG1aWN8L1OUqppshzq8YISkWrYHaATW9H8eh0p89TlWMc1KZOL9vttBuaBEi96D/n0eYDn2trzt22bqHWfXA==",
+      "version": "1.10.2",
+      "resolved": "https://registry.npmjs.org/web3-providers-ipc/-/web3-providers-ipc-1.10.2.tgz",
+      "integrity": "sha512-lWbn6c+SgvhLymU8u4Ea/WOVC0Gqs7OJUvauejWz+iLycxeF0xFNyXnHVAi42ZJDPVI3vnfZotafoxcNNL7Sug==",
       "dependencies": {
         "oboe": "2.1.5",
-        "web3-core-helpers": "1.10.0"
+        "web3-core-helpers": "1.10.2"
       },
       "engines": {
         "node": ">=8.0.0"
       }
     },
     "node_modules/web3-providers-ws": {
-      "version": "1.10.0",
-      "resolved": "https://registry.npmjs.org/web3-providers-ws/-/web3-providers-ws-1.10.0.tgz",
-      "integrity": "sha512-sK0fNcglW36yD5xjnjtSGBnEtf59cbw4vZzJ+CmOWIKGIR96mP5l684g0WD0Eo+f4NQc2anWWXG74lRc9OVMCQ==",
+      "version": "1.10.2",
+      "resolved": "https://registry.npmjs.org/web3-providers-ws/-/web3-providers-ws-1.10.2.tgz",
+      "integrity": "sha512-3nYSiP6grI5GvpkSoehctSywfCTodU21VY8bUtXyFHK/IVfDooNtMpd5lVIMvXVAlaxwwrCfjebokaJtKH2Iag==",
       "dependencies": {
         "eventemitter3": "4.0.4",
-        "web3-core-helpers": "1.10.0",
+        "web3-core-helpers": "1.10.2",
         "websocket": "^1.0.32"
       },
       "engines": {
@@ -17103,28 +17202,29 @@
       }
     },
     "node_modules/web3-shh": {
-      "version": "1.10.0",
-      "resolved": "https://registry.npmjs.org/web3-shh/-/web3-shh-1.10.0.tgz",
-      "integrity": "sha512-uNUUuNsO2AjX41GJARV9zJibs11eq6HtOe6Wr0FtRUcj8SN6nHeYIzwstAvJ4fXA53gRqFMTxdntHEt9aXVjpg==",
+      "version": "1.10.2",
+      "resolved": "https://registry.npmjs.org/web3-shh/-/web3-shh-1.10.2.tgz",
+      "integrity": "sha512-UP0Kc3pHv9uULFu0+LOVfPwKBSJ6B+sJ5KflF7NyBk6TvNRxlpF3hUhuaVDCjjB/dDUR6T0EQeg25FA2uzJbag==",
       "hasInstallScript": true,
       "dependencies": {
-        "web3-core": "1.10.0",
-        "web3-core-method": "1.10.0",
-        "web3-core-subscriptions": "1.10.0",
-        "web3-net": "1.10.0"
+        "web3-core": "1.10.2",
+        "web3-core-method": "1.10.2",
+        "web3-core-subscriptions": "1.10.2",
+        "web3-net": "1.10.2"
       },
       "engines": {
         "node": ">=8.0.0"
       }
     },
     "node_modules/web3-utils": {
-      "version": "1.10.0",
-      "resolved": "https://registry.npmjs.org/web3-utils/-/web3-utils-1.10.0.tgz",
-      "integrity": "sha512-kSaCM0uMcZTNUSmn5vMEhlo02RObGNRRCkdX0V9UTAU0+lrvn0HSaudyCo6CQzuXUsnuY2ERJGCGPfeWmv19Rg==",
+      "version": "1.10.2",
+      "resolved": "https://registry.npmjs.org/web3-utils/-/web3-utils-1.10.2.tgz",
+      "integrity": "sha512-TdApdzdse5YR+5GCX/b/vQnhhbj1KSAtfrDtRW7YS0kcWp1gkJsN62gw6GzCaNTeXookB7UrLtmDUuMv65qgow==",
       "dependencies": {
+        "@ethereumjs/util": "^8.1.0",
         "bn.js": "^5.2.1",
         "ethereum-bloom-filters": "^1.0.6",
-        "ethereumjs-util": "^7.1.0",
+        "ethereum-cryptography": "^2.1.2",
         "ethjs-unit": "0.1.6",
         "number-to-bn": "1.7.0",
         "randombytes": "^2.1.0",
@@ -17134,6 +17234,17 @@
         "node": ">=8.0.0"
       }
     },
+    "node_modules/web3-utils/node_modules/ethereum-cryptography": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/ethereum-cryptography/-/ethereum-cryptography-2.1.2.tgz",
+      "integrity": "sha512-Z5Ba0T0ImZ8fqXrJbpHcbpAvIswRte2wGNR/KePnu8GbbvgJ47lMxT/ZZPG6i9Jaht4azPDop4HaM00J0J59ug==",
+      "dependencies": {
+        "@noble/curves": "1.1.0",
+        "@noble/hashes": "1.3.1",
+        "@scure/bip32": "1.3.1",
+        "@scure/bip39": "1.2.1"
+      }
+    },
     "node_modules/web3modal": {
       "version": "1.9.12",
       "resolved": "https://registry.npmjs.org/web3modal/-/web3modal-1.9.12.tgz",
@@ -19139,6 +19250,11 @@
         "ethereumjs-util": "^7.1.1"
       }
     },
+    "@ethereumjs/rlp": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/@ethereumjs/rlp/-/rlp-4.0.1.tgz",
+      "integrity": "sha512-tqsQiBQDQdmPWE1xkkBq4rlSW5QZpLOUJ5RJh2/9fug+q9tnUhuZoVLk7s0scUIKTOzEtR72DFBXI4WiZcMpvw=="
+    },
     "@ethereumjs/tx": {
       "version": "3.3.2",
       "resolved": "https://registry.npmjs.org/@ethereumjs/tx/-/tx-3.3.2.tgz",
@@ -19148,6 +19264,29 @@
         "ethereumjs-util": "^7.1.2"
       }
     },
+    "@ethereumjs/util": {
+      "version": "8.1.0",
+      "resolved": "https://registry.npmjs.org/@ethereumjs/util/-/util-8.1.0.tgz",
+      "integrity": "sha512-zQ0IqbdX8FZ9aw11vP+dZkKDkS+kgIvQPHnSAXzP9pLu+Rfu3D3XEeLbicvoXJTYnhZiPmsZUxgdzXwNKxRPbA==",
+      "requires": {
+        "@ethereumjs/rlp": "^4.0.1",
+        "ethereum-cryptography": "^2.0.0",
+        "micro-ftch": "^0.3.1"
+      },
+      "dependencies": {
+        "ethereum-cryptography": {
+          "version": "2.1.2",
+          "resolved": "https://registry.npmjs.org/ethereum-cryptography/-/ethereum-cryptography-2.1.2.tgz",
+          "integrity": "sha512-Z5Ba0T0ImZ8fqXrJbpHcbpAvIswRte2wGNR/KePnu8GbbvgJ47lMxT/ZZPG6i9Jaht4azPDop4HaM00J0J59ug==",
+          "requires": {
+            "@noble/curves": "1.1.0",
+            "@noble/hashes": "1.3.1",
+            "@scure/bip32": "1.3.1",
+            "@scure/bip39": "1.2.1"
+          }
+        }
+      }
+    },
     "@ethersproject/abi": {
       "version": "5.7.0",
       "resolved": "https://registry.npmjs.org/@ethersproject/abi/-/abi-5.7.0.tgz",
@@ -19955,6 +20094,19 @@
       "resolved": "https://registry.npmjs.org/@metamask/safe-event-emitter/-/safe-event-emitter-2.0.0.tgz",
       "integrity": "sha512-/kSXhY692qiV1MXu6EeOZvg5nECLclxNXcKCxJ3cXQgYuRymRHpdx/t7JXfsK+JLjwA1e1c1/SBrlQYpusC29Q=="
     },
+    "@noble/curves": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/@noble/curves/-/curves-1.1.0.tgz",
+      "integrity": "sha512-091oBExgENk/kGj3AZmtBDMpxQPDtxQABR2B9lb1JbVTs6ytdzZNwvhxQ4MWasRNEzlbEH8jCWFCwhF/Obj5AA==",
+      "requires": {
+        "@noble/hashes": "1.3.1"
+      }
+    },
+    "@noble/hashes": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/@noble/hashes/-/hashes-1.3.1.tgz",
+      "integrity": "sha512-EbqwksQwz9xDRGfDST86whPBgM65E0OH/pCgqW0GBVzO22bNE+NuIbeTb714+IfSjU3aRk47EUvXIb5bTsenKA=="
+    },
     "@nodelib/fs.scandir": {
       "version": "2.1.5",
       "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
@@ -19981,6 +20133,30 @@
         "fastq": "^1.6.0"
       }
     },
+    "@scure/base": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/@scure/base/-/base-1.1.3.tgz",
+      "integrity": "sha512-/+SgoRjLq7Xlf0CWuLHq2LUZeL/w65kfzAPG5NH9pcmBhs+nunQTn4gvdwgMTIXnt9b2C/1SeL2XiysZEyIC9Q=="
+    },
+    "@scure/bip32": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/@scure/bip32/-/bip32-1.3.1.tgz",
+      "integrity": "sha512-osvveYtyzdEVbt3OfwwXFr4P2iVBL5u1Q3q4ONBfDY/UpOuXmOlbgwc1xECEboY8wIays8Yt6onaWMUdUbfl0A==",
+      "requires": {
+        "@noble/curves": "~1.1.0",
+        "@noble/hashes": "~1.3.1",
+        "@scure/base": "~1.1.0"
+      }
+    },
+    "@scure/bip39": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/@scure/bip39/-/bip39-1.2.1.tgz",
+      "integrity": "sha512-Z3/Fsz1yr904dduJD0NpiyRHhRYHdcnyh73FZWiV+/qhWi83wNJ3NWolYqCEN+ZWsUz2TWwajJggcRE9r1zUYg==",
+      "requires": {
+        "@noble/hashes": "~1.3.0",
+        "@scure/base": "~1.1.0"
+      }
+    },
     "@sinclair/typebox": {
       "version": "0.27.8",
       "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.27.8.tgz",
@@ -20125,9 +20301,9 @@
       }
     },
     "@types/http-cache-semantics": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/@types/http-cache-semantics/-/http-cache-semantics-4.0.1.tgz",
-      "integrity": "sha512-SZs7ekbP8CN0txVG2xVRH6EgKmEm31BOxA07vkFaETzZz1xh+cbt8BcI0slpymvwhx5dlFnQG2rTlPVQn+iRPQ=="
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/@types/http-cache-semantics/-/http-cache-semantics-4.0.2.tgz",
+      "integrity": "sha512-FD+nQWA2zJjh4L9+pFXqWOi0Hs1ryBCfI+985NjluQ1p8EYtoLvjLOKidXBtZ4/IcxDX4o8/E8qDS3540tNliw=="
     },
     "@types/istanbul-lib-coverage": {
       "version": "2.0.4",
@@ -20198,9 +20374,9 @@
       }
     },
     "@types/responselike": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/@types/responselike/-/responselike-1.0.0.tgz",
-      "integrity": "sha512-85Y2BjiufFzaMIlvJDvTTB8Fxl2xfLo4HgmHzVBz08w4wDePCTjYw66PdrolO0kzli3yam/YCgRufyo1DdQVTA==",
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/@types/responselike/-/responselike-1.0.1.tgz",
+      "integrity": "sha512-TiGnitEDxj2X0j+98Eqk5lv/Cij8oHd32bU4D/Yw6AOq7vvTk0gSD2GPj0G/HkvhMoVsdlhYF4yqqlyPBTM6Sg==",
       "requires": {
         "@types/node": "*"
       }
@@ -21574,9 +21750,9 @@
       "integrity": "sha512-KJ/Dmo1lDDhmW2XDPMo+9oiy/CeqosPguPCrgcVzKyZrL6pM1gU2GmPY/xo6OQPTUaA/c0kwHuywB4E6nmT9ww=="
     },
     "cacheable-request": {
-      "version": "7.0.2",
-      "resolved": "https://registry.npmjs.org/cacheable-request/-/cacheable-request-7.0.2.tgz",
-      "integrity": "sha512-pouW8/FmiPQbuGpkXQ9BAPv/Mo5xDGANgSNXzTzJ8DrKGuXOssM4wIQRjfanNRh3Yu5cfYPvcorqbhg2KIJtew==",
+      "version": "7.0.4",
+      "resolved": "https://registry.npmjs.org/cacheable-request/-/cacheable-request-7.0.4.tgz",
+      "integrity": "sha512-v+p6ongsrp0yTGbJXjgxPow2+DL93DASP4kXCDKb8/bwRtt9OEF3whggkkDkGNzgcWy2XaF4a8nZglC7uElscg==",
       "requires": {
         "clone-response": "^1.0.2",
         "get-stream": "^5.1.0",
@@ -23866,9 +24042,9 @@
       },
       "dependencies": {
         "@types/bn.js": {
-          "version": "5.1.1",
-          "resolved": "https://registry.npmjs.org/@types/bn.js/-/bn.js-5.1.1.tgz",
-          "integrity": "sha512-qNrYbZqMx0uJAfKnKclPh+dTwK33KfLHYqtyODwd5HnXOjnkhc4qgn3BrK6RWyGZm5+sIFE7Q7Vz6QQtJB7w7g==",
+          "version": "5.1.2",
+          "resolved": "https://registry.npmjs.org/@types/bn.js/-/bn.js-5.1.2.tgz",
+          "integrity": "sha512-dkpZu0szUtn9UXTmw+e0AJFd4D2XAxDnsCLdc05SfqpqzPEBft8eQr8uaFitfo/dUUOZERaLec2hHMG87A4Dxg==",
           "requires": {
             "@types/node": "*"
           }
@@ -26734,9 +26910,9 @@
       }
     },
     "keyv": {
-      "version": "4.5.2",
-      "resolved": "https://registry.npmjs.org/keyv/-/keyv-4.5.2.tgz",
-      "integrity": "sha512-5MHbFaKn8cNSmVW7BYnijeAVlE4cYA/SVkifVgrh7yotnfhKmjuXpDKjrABLnT0SfHWV21P8ow07OGfRrNDg8g==",
+      "version": "4.5.3",
+      "resolved": "https://registry.npmjs.org/keyv/-/keyv-4.5.3.tgz",
+      "integrity": "sha512-QCiSav9WaX1PgETJ+SpNnx2PRRapJ/oRSXM4VO5OGYGSjrxbKPVFVhB3l2OCbLCk329N8qyAtsJjSjvVBWzEug==",
       "requires": {
         "json-buffer": "3.0.1"
       }
@@ -27230,6 +27406,11 @@
       "resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz",
       "integrity": "sha512-iclAHeNqNm68zFtnZ0e+1L2yUIdvzNoauKU4WBA3VvH/vPFieF7qfRlwUZU+DA9P9bPXIS90ulxoUoCH23sV2w=="
     },
+    "micro-ftch": {
+      "version": "0.3.1",
+      "resolved": "https://registry.npmjs.org/micro-ftch/-/micro-ftch-0.3.1.tgz",
+      "integrity": "sha512-/0LLxhzP0tfiR5hcQebtudP56gUurs2CLkGarnCiB/OqEyUFQ6U3paQi/tgLv0hBJYt2rnr9MNpxz4fiiugstg=="
+    },
     "micromatch": {
       "version": "4.0.4",
       "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.4.tgz",
@@ -27473,9 +27654,9 @@
       "integrity": "sha512-Ntyt4AIXyaLIuMHF6IOoTakB3K+RWxwtsHNRxllEoA6vPwP9o4866g6YWDLUdnucilZhmkxiHwHr11gAENw+QA=="
     },
     "node-fetch": {
-      "version": "2.6.7",
-      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.7.tgz",
-      "integrity": "sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==",
+      "version": "2.7.0",
+      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.7.0.tgz",
+      "integrity": "sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A==",
       "requires": {
         "whatwg-url": "^5.0.0"
       },
@@ -30176,23 +30357,23 @@
       }
     },
     "web3": {
-      "version": "1.10.0",
-      "resolved": "https://registry.npmjs.org/web3/-/web3-1.10.0.tgz",
-      "integrity": "sha512-YfKY9wSkGcM8seO+daR89oVTcbu18NsVfvOngzqMYGUU0pPSQmE57qQDvQzUeoIOHAnXEBNzrhjQJmm8ER0rng==",
+      "version": "1.10.2",
+      "resolved": "https://registry.npmjs.org/web3/-/web3-1.10.2.tgz",
+      "integrity": "sha512-DAtZ3a3ruPziE80uZ3Ob0YDZxt6Vk2un/F5BcBrxO70owJ9Z1Y2+loZmbh1MoAmoLGjA/SUSHeUtid3fYmBaog==",
       "requires": {
-        "web3-bzz": "1.10.0",
-        "web3-core": "1.10.0",
-        "web3-eth": "1.10.0",
-        "web3-eth-personal": "1.10.0",
-        "web3-net": "1.10.0",
-        "web3-shh": "1.10.0",
-        "web3-utils": "1.10.0"
+        "web3-bzz": "1.10.2",
+        "web3-core": "1.10.2",
+        "web3-eth": "1.10.2",
+        "web3-eth-personal": "1.10.2",
+        "web3-net": "1.10.2",
+        "web3-shh": "1.10.2",
+        "web3-utils": "1.10.2"
       }
     },
     "web3-bzz": {
-      "version": "1.10.0",
-      "resolved": "https://registry.npmjs.org/web3-bzz/-/web3-bzz-1.10.0.tgz",
-      "integrity": "sha512-o9IR59io3pDUsXTsps5pO5hW1D5zBmg46iNc2t4j2DkaYHNdDLwk2IP9ukoM2wg47QILfPEJYzhTfkS/CcX0KA==",
+      "version": "1.10.2",
+      "resolved": "https://registry.npmjs.org/web3-bzz/-/web3-bzz-1.10.2.tgz",
+      "integrity": "sha512-vLOfDCj6198Qc7esDrCKeFA/M3ZLbowsaHQ0hIL4NmIHoq7lU8aSRTa5AI+JBh8cKN1gVryJsuW2ZCc5bM4I4Q==",
       "requires": {
         "@types/node": "^12.12.6",
         "got": "12.1.0",
@@ -30207,23 +30388,23 @@
       }
     },
     "web3-core": {
-      "version": "1.10.0",
-      "resolved": "https://registry.npmjs.org/web3-core/-/web3-core-1.10.0.tgz",
-      "integrity": "sha512-fWySwqy2hn3TL89w5TM8wXF1Z2Q6frQTKHWmP0ppRQorEK8NcHJRfeMiv/mQlSKoTS1F6n/nv2uyZsixFycjYQ==",
+      "version": "1.10.2",
+      "resolved": "https://registry.npmjs.org/web3-core/-/web3-core-1.10.2.tgz",
+      "integrity": "sha512-qTn2UmtE8tvwMRsC5pXVdHxrQ4uZ6jiLgF5DRUVtdi7dPUmX18Dp9uxKfIfhGcA011EAn8P6+X7r3pvi2YRxBw==",
       "requires": {
         "@types/bn.js": "^5.1.1",
         "@types/node": "^12.12.6",
         "bignumber.js": "^9.0.0",
-        "web3-core-helpers": "1.10.0",
-        "web3-core-method": "1.10.0",
-        "web3-core-requestmanager": "1.10.0",
-        "web3-utils": "1.10.0"
+        "web3-core-helpers": "1.10.2",
+        "web3-core-method": "1.10.2",
+        "web3-core-requestmanager": "1.10.2",
+        "web3-utils": "1.10.2"
       },
       "dependencies": {
         "@types/bn.js": {
-          "version": "5.1.1",
-          "resolved": "https://registry.npmjs.org/@types/bn.js/-/bn.js-5.1.1.tgz",
-          "integrity": "sha512-qNrYbZqMx0uJAfKnKclPh+dTwK33KfLHYqtyODwd5HnXOjnkhc4qgn3BrK6RWyGZm5+sIFE7Q7Vz6QQtJB7w7g==",
+          "version": "5.1.2",
+          "resolved": "https://registry.npmjs.org/@types/bn.js/-/bn.js-5.1.2.tgz",
+          "integrity": "sha512-dkpZu0szUtn9UXTmw+e0AJFd4D2XAxDnsCLdc05SfqpqzPEBft8eQr8uaFitfo/dUUOZERaLec2hHMG87A4Dxg==",
           "requires": {
             "@types/node": "*"
           }
@@ -30236,98 +30417,98 @@
       }
     },
     "web3-core-helpers": {
-      "version": "1.10.0",
-      "resolved": "https://registry.npmjs.org/web3-core-helpers/-/web3-core-helpers-1.10.0.tgz",
-      "integrity": "sha512-pIxAzFDS5vnbXvfvLSpaA1tfRykAe9adw43YCKsEYQwH0gCLL0kMLkaCX3q+Q8EVmAh+e1jWL/nl9U0de1+++g==",
+      "version": "1.10.2",
+      "resolved": "https://registry.npmjs.org/web3-core-helpers/-/web3-core-helpers-1.10.2.tgz",
+      "integrity": "sha512-1JfaNtox6/ZYJHNoI+QVc2ObgwEPeGF+YdxHZQ7aF5605BmlwM1Bk3A8xv6mg64jIRvEq1xX6k9oG6x7p1WgXQ==",
       "requires": {
-        "web3-eth-iban": "1.10.0",
-        "web3-utils": "1.10.0"
+        "web3-eth-iban": "1.10.2",
+        "web3-utils": "1.10.2"
       }
     },
     "web3-core-method": {
-      "version": "1.10.0",
-      "resolved": "https://registry.npmjs.org/web3-core-method/-/web3-core-method-1.10.0.tgz",
-      "integrity": "sha512-4R700jTLAMKDMhQ+nsVfIXvH6IGJlJzGisIfMKWAIswH31h5AZz7uDUW2YctI+HrYd+5uOAlS4OJeeT9bIpvkA==",
+      "version": "1.10.2",
+      "resolved": "https://registry.npmjs.org/web3-core-method/-/web3-core-method-1.10.2.tgz",
+      "integrity": "sha512-gG6ES+LOuo01MJHML4gnEt702M8lcPGMYZoX8UjZzmEebGrPYOY9XccpCrsFgCeKgQzM12SVnlwwpMod1+lcLg==",
       "requires": {
         "@ethersproject/transactions": "^5.6.2",
-        "web3-core-helpers": "1.10.0",
-        "web3-core-promievent": "1.10.0",
-        "web3-core-subscriptions": "1.10.0",
-        "web3-utils": "1.10.0"
+        "web3-core-helpers": "1.10.2",
+        "web3-core-promievent": "1.10.2",
+        "web3-core-subscriptions": "1.10.2",
+        "web3-utils": "1.10.2"
       }
     },
     "web3-core-promievent": {
-      "version": "1.10.0",
-      "resolved": "https://registry.npmjs.org/web3-core-promievent/-/web3-core-promievent-1.10.0.tgz",
-      "integrity": "sha512-68N7k5LWL5R38xRaKFrTFT2pm2jBNFaM4GioS00YjAKXRQ3KjmhijOMG3TICz6Aa5+6GDWYelDNx21YAeZ4YTg==",
+      "version": "1.10.2",
+      "resolved": "https://registry.npmjs.org/web3-core-promievent/-/web3-core-promievent-1.10.2.tgz",
+      "integrity": "sha512-Qkkb1dCDOU8dZeORkcwJBQRAX+mdsjx8LqFBB+P4W9QgwMqyJ6LXda+y1XgyeEVeKEmY1RCeTq9Y94q1v62Sfw==",
       "requires": {
         "eventemitter3": "4.0.4"
       }
     },
     "web3-core-requestmanager": {
-      "version": "1.10.0",
-      "resolved": "https://registry.npmjs.org/web3-core-requestmanager/-/web3-core-requestmanager-1.10.0.tgz",
-      "integrity": "sha512-3z/JKE++Os62APml4dvBM+GAuId4h3L9ckUrj7ebEtS2AR0ixyQPbrBodgL91Sv7j7cQ3Y+hllaluqjguxvSaQ==",
+      "version": "1.10.2",
+      "resolved": "https://registry.npmjs.org/web3-core-requestmanager/-/web3-core-requestmanager-1.10.2.tgz",
+      "integrity": "sha512-nlLeNJUu6fR+ZbJr2k9Du/nN3VWwB4AJPY4r6nxUODAmykgJq57T21cLP/BEk6mbiFQYGE9TrrPhh4qWxQEtAw==",
       "requires": {
         "util": "^0.12.5",
-        "web3-core-helpers": "1.10.0",
-        "web3-providers-http": "1.10.0",
-        "web3-providers-ipc": "1.10.0",
-        "web3-providers-ws": "1.10.0"
+        "web3-core-helpers": "1.10.2",
+        "web3-providers-http": "1.10.2",
+        "web3-providers-ipc": "1.10.2",
+        "web3-providers-ws": "1.10.2"
       }
     },
     "web3-core-subscriptions": {
-      "version": "1.10.0",
-      "resolved": "https://registry.npmjs.org/web3-core-subscriptions/-/web3-core-subscriptions-1.10.0.tgz",
-      "integrity": "sha512-HGm1PbDqsxejI075gxBc5OSkwymilRWZufIy9zEpnWKNmfbuv5FfHgW1/chtJP6aP3Uq2vHkvTDl3smQBb8l+g==",
+      "version": "1.10.2",
+      "resolved": "https://registry.npmjs.org/web3-core-subscriptions/-/web3-core-subscriptions-1.10.2.tgz",
+      "integrity": "sha512-MiWcKjz4tco793EPPPLc/YOJmYUV3zAfxeQH/UVTfBejMfnNvmfwKa2SBKfPIvKQHz/xI5bV2TF15uvJEucU7w==",
       "requires": {
         "eventemitter3": "4.0.4",
-        "web3-core-helpers": "1.10.0"
+        "web3-core-helpers": "1.10.2"
       }
     },
     "web3-eth": {
-      "version": "1.10.0",
-      "resolved": "https://registry.npmjs.org/web3-eth/-/web3-eth-1.10.0.tgz",
-      "integrity": "sha512-Z5vT6slNMLPKuwRyKGbqeGYC87OAy8bOblaqRTgg94CXcn/mmqU7iPIlG4506YdcdK3x6cfEDG7B6w+jRxypKA==",
-      "requires": {
-        "web3-core": "1.10.0",
-        "web3-core-helpers": "1.10.0",
-        "web3-core-method": "1.10.0",
-        "web3-core-subscriptions": "1.10.0",
-        "web3-eth-abi": "1.10.0",
-        "web3-eth-accounts": "1.10.0",
-        "web3-eth-contract": "1.10.0",
-        "web3-eth-ens": "1.10.0",
-        "web3-eth-iban": "1.10.0",
-        "web3-eth-personal": "1.10.0",
-        "web3-net": "1.10.0",
-        "web3-utils": "1.10.0"
+      "version": "1.10.2",
+      "resolved": "https://registry.npmjs.org/web3-eth/-/web3-eth-1.10.2.tgz",
+      "integrity": "sha512-s38rhrntyhGShmXC4R/aQtfkpcmev9c7iZwgb9CDIBFo7K8nrEJvqIOyajeZTxnDIiGzTJmrHxiKSadii5qTRg==",
+      "requires": {
+        "web3-core": "1.10.2",
+        "web3-core-helpers": "1.10.2",
+        "web3-core-method": "1.10.2",
+        "web3-core-subscriptions": "1.10.2",
+        "web3-eth-abi": "1.10.2",
+        "web3-eth-accounts": "1.10.2",
+        "web3-eth-contract": "1.10.2",
+        "web3-eth-ens": "1.10.2",
+        "web3-eth-iban": "1.10.2",
+        "web3-eth-personal": "1.10.2",
+        "web3-net": "1.10.2",
+        "web3-utils": "1.10.2"
       }
     },
     "web3-eth-abi": {
-      "version": "1.10.0",
-      "resolved": "https://registry.npmjs.org/web3-eth-abi/-/web3-eth-abi-1.10.0.tgz",
-      "integrity": "sha512-cwS+qRBWpJ43aI9L3JS88QYPfFcSJJ3XapxOQ4j40v6mk7ATpA8CVK1vGTzpihNlOfMVRBkR95oAj7oL6aiDOg==",
+      "version": "1.10.2",
+      "resolved": "https://registry.npmjs.org/web3-eth-abi/-/web3-eth-abi-1.10.2.tgz",
+      "integrity": "sha512-pY4fQUio7W7ZRSLf+vsYkaxJqaT/jHcALZjIxy+uBQaYAJ3t6zpQqMZkJB3Dw7HUODRJ1yI0NPEFGTnkYf/17A==",
       "requires": {
         "@ethersproject/abi": "^5.6.3",
-        "web3-utils": "1.10.0"
+        "web3-utils": "1.10.2"
       }
     },
     "web3-eth-accounts": {
-      "version": "1.10.0",
-      "resolved": "https://registry.npmjs.org/web3-eth-accounts/-/web3-eth-accounts-1.10.0.tgz",
-      "integrity": "sha512-wiq39Uc3mOI8rw24wE2n15hboLE0E9BsQLdlmsL4Zua9diDS6B5abXG0XhFcoNsXIGMWXVZz4TOq3u4EdpXF/Q==",
+      "version": "1.10.2",
+      "resolved": "https://registry.npmjs.org/web3-eth-accounts/-/web3-eth-accounts-1.10.2.tgz",
+      "integrity": "sha512-6/HhCBYAXN/f553/SyxS9gY62NbLgpD1zJpENcvRTDpJN3Znvli1cmpl5Q3ZIUJkvHnG//48EWfWh0cbb3fbKQ==",
       "requires": {
         "@ethereumjs/common": "2.5.0",
         "@ethereumjs/tx": "3.3.2",
+        "@ethereumjs/util": "^8.1.0",
         "eth-lib": "0.2.8",
-        "ethereumjs-util": "^7.1.5",
         "scrypt-js": "^3.0.1",
         "uuid": "^9.0.0",
-        "web3-core": "1.10.0",
-        "web3-core-helpers": "1.10.0",
-        "web3-core-method": "1.10.0",
-        "web3-utils": "1.10.0"
+        "web3-core": "1.10.2",
+        "web3-core-helpers": "1.10.2",
+        "web3-core-method": "1.10.2",
+        "web3-utils": "1.10.2"
       },
       "dependencies": {
         "bn.js": {
@@ -30346,31 +30527,31 @@
           }
         },
         "uuid": {
-          "version": "9.0.0",
-          "resolved": "https://registry.npmjs.org/uuid/-/uuid-9.0.0.tgz",
-          "integrity": "sha512-MXcSTerfPa4uqyzStbRoTgt5XIe3x5+42+q1sDuy3R5MDk66URdLMOZe5aPX/SQd+kuYAh0FdP/pO28IkQyTeg=="
+          "version": "9.0.1",
+          "resolved": "https://registry.npmjs.org/uuid/-/uuid-9.0.1.tgz",
+          "integrity": "sha512-b+1eJOlsR9K8HJpow9Ok3fiWOWSIcIzXodvv0rQjVoOVNpWMpxf1wZNpt4y9h10odCNrqnYp1OBzRktckBe3sA=="
         }
       }
     },
     "web3-eth-contract": {
-      "version": "1.10.0",
-      "resolved": "https://registry.npmjs.org/web3-eth-contract/-/web3-eth-contract-1.10.0.tgz",
-      "integrity": "sha512-MIC5FOzP/+2evDksQQ/dpcXhSqa/2hFNytdl/x61IeWxhh6vlFeSjq0YVTAyIzdjwnL7nEmZpjfI6y6/Ufhy7w==",
+      "version": "1.10.2",
+      "resolved": "https://registry.npmjs.org/web3-eth-contract/-/web3-eth-contract-1.10.2.tgz",
+      "integrity": "sha512-CZLKPQRmupP/+OZ5A/CBwWWkBiz5B/foOpARz0upMh1yjb0dEud4YzRW2gJaeNu0eGxDLsWVaXhUimJVGYprQw==",
       "requires": {
         "@types/bn.js": "^5.1.1",
-        "web3-core": "1.10.0",
-        "web3-core-helpers": "1.10.0",
-        "web3-core-method": "1.10.0",
-        "web3-core-promievent": "1.10.0",
-        "web3-core-subscriptions": "1.10.0",
-        "web3-eth-abi": "1.10.0",
-        "web3-utils": "1.10.0"
+        "web3-core": "1.10.2",
+        "web3-core-helpers": "1.10.2",
+        "web3-core-method": "1.10.2",
+        "web3-core-promievent": "1.10.2",
+        "web3-core-subscriptions": "1.10.2",
+        "web3-eth-abi": "1.10.2",
+        "web3-utils": "1.10.2"
       },
       "dependencies": {
         "@types/bn.js": {
-          "version": "5.1.1",
-          "resolved": "https://registry.npmjs.org/@types/bn.js/-/bn.js-5.1.1.tgz",
-          "integrity": "sha512-qNrYbZqMx0uJAfKnKclPh+dTwK33KfLHYqtyODwd5HnXOjnkhc4qgn3BrK6RWyGZm5+sIFE7Q7Vz6QQtJB7w7g==",
+          "version": "5.1.2",
+          "resolved": "https://registry.npmjs.org/@types/bn.js/-/bn.js-5.1.2.tgz",
+          "integrity": "sha512-dkpZu0szUtn9UXTmw+e0AJFd4D2XAxDnsCLdc05SfqpqzPEBft8eQr8uaFitfo/dUUOZERaLec2hHMG87A4Dxg==",
           "requires": {
             "@types/node": "*"
           }
@@ -30378,40 +30559,40 @@
       }
     },
     "web3-eth-ens": {
-      "version": "1.10.0",
-      "resolved": "https://registry.npmjs.org/web3-eth-ens/-/web3-eth-ens-1.10.0.tgz",
-      "integrity": "sha512-3hpGgzX3qjgxNAmqdrC2YUQMTfnZbs4GeLEmy8aCWziVwogbuqQZ+Gzdfrym45eOZodk+lmXyLuAdqkNlvkc1g==",
+      "version": "1.10.2",
+      "resolved": "https://registry.npmjs.org/web3-eth-ens/-/web3-eth-ens-1.10.2.tgz",
+      "integrity": "sha512-kTQ42UdNHy4BQJHgWe97bHNMkc3zCMBKKY7t636XOMxdI/lkRdIjdE5nQzt97VjQvSVasgIWYKRAtd8aRaiZiQ==",
       "requires": {
         "content-hash": "^2.5.2",
         "eth-ens-namehash": "2.0.8",
-        "web3-core": "1.10.0",
-        "web3-core-helpers": "1.10.0",
-        "web3-core-promievent": "1.10.0",
-        "web3-eth-abi": "1.10.0",
-        "web3-eth-contract": "1.10.0",
-        "web3-utils": "1.10.0"
+        "web3-core": "1.10.2",
+        "web3-core-helpers": "1.10.2",
+        "web3-core-promievent": "1.10.2",
+        "web3-eth-abi": "1.10.2",
+        "web3-eth-contract": "1.10.2",
+        "web3-utils": "1.10.2"
       }
     },
     "web3-eth-iban": {
-      "version": "1.10.0",
-      "resolved": "https://registry.npmjs.org/web3-eth-iban/-/web3-eth-iban-1.10.0.tgz",
-      "integrity": "sha512-0l+SP3IGhInw7Q20LY3IVafYEuufo4Dn75jAHT7c2aDJsIolvf2Lc6ugHkBajlwUneGfbRQs/ccYPQ9JeMUbrg==",
+      "version": "1.10.2",
+      "resolved": "https://registry.npmjs.org/web3-eth-iban/-/web3-eth-iban-1.10.2.tgz",
+      "integrity": "sha512-y8+Ii2XXdyHQMFNL2NWpBnXe+TVJ4ryvPlzNhObRRnIo4O4nLIXS010olLDMayozDzoUlmzCmBZJYc9Eev1g7A==",
       "requires": {
         "bn.js": "^5.2.1",
-        "web3-utils": "1.10.0"
+        "web3-utils": "1.10.2"
       }
     },
     "web3-eth-personal": {
-      "version": "1.10.0",
-      "resolved": "https://registry.npmjs.org/web3-eth-personal/-/web3-eth-personal-1.10.0.tgz",
-      "integrity": "sha512-anseKn98w/d703eWq52uNuZi7GhQeVjTC5/svrBWEKob0WZ5kPdo+EZoFN0sp5a5ubbrk/E0xSl1/M5yORMtpg==",
+      "version": "1.10.2",
+      "resolved": "https://registry.npmjs.org/web3-eth-personal/-/web3-eth-personal-1.10.2.tgz",
+      "integrity": "sha512-+vEbJsPUJc5J683y0c2aN645vXC+gPVlFVCQu4IjPvXzJrAtUfz26+IZ6AUOth4fDJPT0f1uSLS5W2yrUdw9BQ==",
       "requires": {
         "@types/node": "^12.12.6",
-        "web3-core": "1.10.0",
-        "web3-core-helpers": "1.10.0",
-        "web3-core-method": "1.10.0",
-        "web3-net": "1.10.0",
-        "web3-utils": "1.10.0"
+        "web3-core": "1.10.2",
+        "web3-core-helpers": "1.10.2",
+        "web3-core-method": "1.10.2",
+        "web3-net": "1.10.2",
+        "web3-utils": "1.10.2"
       },
       "dependencies": {
         "@types/node": {
@@ -30422,13 +30603,13 @@
       }
     },
     "web3-net": {
-      "version": "1.10.0",
-      "resolved": "https://registry.npmjs.org/web3-net/-/web3-net-1.10.0.tgz",
-      "integrity": "sha512-NLH/N3IshYWASpxk4/18Ge6n60GEvWBVeM8inx2dmZJVmRI6SJIlUxbL8jySgiTn3MMZlhbdvrGo8fpUW7a1GA==",
+      "version": "1.10.2",
+      "resolved": "https://registry.npmjs.org/web3-net/-/web3-net-1.10.2.tgz",
+      "integrity": "sha512-w9i1t2z7dItagfskhaCKwpp6W3ylUR88gs68u820y5f8yfK5EbPmHc6c2lD8X9ZrTnmDoeOpIRCN/RFPtZCp+g==",
       "requires": {
-        "web3-core": "1.10.0",
-        "web3-core-method": "1.10.0",
-        "web3-utils": "1.10.0"
+        "web3-core": "1.10.2",
+        "web3-core-method": "1.10.2",
+        "web3-utils": "1.10.2"
       }
     },
     "web3-provider-engine": {
@@ -30512,68 +30693,82 @@
       }
     },
     "web3-providers-http": {
-      "version": "1.10.0",
-      "resolved": "https://registry.npmjs.org/web3-providers-http/-/web3-providers-http-1.10.0.tgz",
-      "integrity": "sha512-eNr965YB8a9mLiNrkjAWNAPXgmQWfpBfkkn7tpEFlghfww0u3I0tktMZiaToJVcL2+Xq+81cxbkpeWJ5XQDwOA==",
+      "version": "1.10.2",
+      "resolved": "https://registry.npmjs.org/web3-providers-http/-/web3-providers-http-1.10.2.tgz",
+      "integrity": "sha512-G8abKtpkyKGpRVKvfjIF3I4O/epHP7mxXWN8mNMQLkQj1cjMFiZBZ13f+qI77lNJN7QOf6+LtNdKrhsTGU72TA==",
       "requires": {
-        "abortcontroller-polyfill": "^1.7.3",
-        "cross-fetch": "^3.1.4",
+        "abortcontroller-polyfill": "^1.7.5",
+        "cross-fetch": "^4.0.0",
         "es6-promise": "^4.2.8",
-        "web3-core-helpers": "1.10.0"
+        "web3-core-helpers": "1.10.2"
       },
       "dependencies": {
         "cross-fetch": {
-          "version": "3.1.5",
-          "resolved": "https://registry.npmjs.org/cross-fetch/-/cross-fetch-3.1.5.tgz",
-          "integrity": "sha512-lvb1SBsI0Z7GDwmuid+mU3kWVBwTVUbe7S0H52yaaAdQOXq2YktTCZdlAcNKFzE6QtRz0snpw9bNiPeOIkkQvw==",
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/cross-fetch/-/cross-fetch-4.0.0.tgz",
+          "integrity": "sha512-e4a5N8lVvuLgAWgnCrLr2PP0YyDOTHa9H/Rj54dirp61qXnNq46m82bRhNqIA5VccJtWBvPTFRV3TtvHUKPB1g==",
           "requires": {
-            "node-fetch": "2.6.7"
+            "node-fetch": "^2.6.12"
           }
         }
       }
     },
     "web3-providers-ipc": {
-      "version": "1.10.0",
-      "resolved": "https://registry.npmjs.org/web3-providers-ipc/-/web3-providers-ipc-1.10.0.tgz",
-      "integrity": "sha512-OfXG1aWN8L1OUqppshzq8YISkWrYHaATW9H8eh0p89TlWMc1KZOL9vttBuaBEi96D/n0eYDn2trzt22bqHWfXA==",
+      "version": "1.10.2",
+      "resolved": "https://registry.npmjs.org/web3-providers-ipc/-/web3-providers-ipc-1.10.2.tgz",
+      "integrity": "sha512-lWbn6c+SgvhLymU8u4Ea/WOVC0Gqs7OJUvauejWz+iLycxeF0xFNyXnHVAi42ZJDPVI3vnfZotafoxcNNL7Sug==",
       "requires": {
         "oboe": "2.1.5",
-        "web3-core-helpers": "1.10.0"
+        "web3-core-helpers": "1.10.2"
       }
     },
     "web3-providers-ws": {
-      "version": "1.10.0",
-      "resolved": "https://registry.npmjs.org/web3-providers-ws/-/web3-providers-ws-1.10.0.tgz",
-      "integrity": "sha512-sK0fNcglW36yD5xjnjtSGBnEtf59cbw4vZzJ+CmOWIKGIR96mP5l684g0WD0Eo+f4NQc2anWWXG74lRc9OVMCQ==",
+      "version": "1.10.2",
+      "resolved": "https://registry.npmjs.org/web3-providers-ws/-/web3-providers-ws-1.10.2.tgz",
+      "integrity": "sha512-3nYSiP6grI5GvpkSoehctSywfCTodU21VY8bUtXyFHK/IVfDooNtMpd5lVIMvXVAlaxwwrCfjebokaJtKH2Iag==",
       "requires": {
         "eventemitter3": "4.0.4",
-        "web3-core-helpers": "1.10.0",
+        "web3-core-helpers": "1.10.2",
         "websocket": "^1.0.32"
       }
     },
     "web3-shh": {
-      "version": "1.10.0",
-      "resolved": "https://registry.npmjs.org/web3-shh/-/web3-shh-1.10.0.tgz",
-      "integrity": "sha512-uNUUuNsO2AjX41GJARV9zJibs11eq6HtOe6Wr0FtRUcj8SN6nHeYIzwstAvJ4fXA53gRqFMTxdntHEt9aXVjpg==",
+      "version": "1.10.2",
+      "resolved": "https://registry.npmjs.org/web3-shh/-/web3-shh-1.10.2.tgz",
+      "integrity": "sha512-UP0Kc3pHv9uULFu0+LOVfPwKBSJ6B+sJ5KflF7NyBk6TvNRxlpF3hUhuaVDCjjB/dDUR6T0EQeg25FA2uzJbag==",
       "requires": {
-        "web3-core": "1.10.0",
-        "web3-core-method": "1.10.0",
-        "web3-core-subscriptions": "1.10.0",
-        "web3-net": "1.10.0"
+        "web3-core": "1.10.2",
+        "web3-core-method": "1.10.2",
+        "web3-core-subscriptions": "1.10.2",
+        "web3-net": "1.10.2"
       }
     },
     "web3-utils": {
-      "version": "1.10.0",
-      "resolved": "https://registry.npmjs.org/web3-utils/-/web3-utils-1.10.0.tgz",
-      "integrity": "sha512-kSaCM0uMcZTNUSmn5vMEhlo02RObGNRRCkdX0V9UTAU0+lrvn0HSaudyCo6CQzuXUsnuY2ERJGCGPfeWmv19Rg==",
+      "version": "1.10.2",
+      "resolved": "https://registry.npmjs.org/web3-utils/-/web3-utils-1.10.2.tgz",
+      "integrity": "sha512-TdApdzdse5YR+5GCX/b/vQnhhbj1KSAtfrDtRW7YS0kcWp1gkJsN62gw6GzCaNTeXookB7UrLtmDUuMv65qgow==",
       "requires": {
+        "@ethereumjs/util": "^8.1.0",
         "bn.js": "^5.2.1",
         "ethereum-bloom-filters": "^1.0.6",
-        "ethereumjs-util": "^7.1.0",
+        "ethereum-cryptography": "^2.1.2",
         "ethjs-unit": "0.1.6",
         "number-to-bn": "1.7.0",
         "randombytes": "^2.1.0",
         "utf8": "3.0.0"
+      },
+      "dependencies": {
+        "ethereum-cryptography": {
+          "version": "2.1.2",
+          "resolved": "https://registry.npmjs.org/ethereum-cryptography/-/ethereum-cryptography-2.1.2.tgz",
+          "integrity": "sha512-Z5Ba0T0ImZ8fqXrJbpHcbpAvIswRte2wGNR/KePnu8GbbvgJ47lMxT/ZZPG6i9Jaht4azPDop4HaM00J0J59ug==",
+          "requires": {
+            "@noble/curves": "1.1.0",
+            "@noble/hashes": "1.3.1",
+            "@scure/bip32": "1.3.1",
+            "@scure/bip39": "1.2.1"
+          }
+        }
       }
     },
     "web3modal": {
diff --git a/apps/block_scout_web/assets/package.json b/apps/block_scout_web/assets/package.json
index 86d8f31006c1..4d5a646f623b 100644
--- a/apps/block_scout_web/assets/package.json
+++ b/apps/block_scout_web/assets/package.json
@@ -78,7 +78,7 @@
     "url": "^0.11.3",
     "util": "^0.12.5",
     "viewerjs": "^1.11.6",
-    "web3": "^1.10.0",
+    "web3": "^1.10.2",
     "web3modal": "^1.9.12",
     "xss": "^1.0.14"
   },

From dd7d131c1b2c7f75ca5f6ab284b8cf1af8832c7b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 1 Oct 2023 18:49:23 +0000
Subject: [PATCH 465/909] Bump core-js from 3.32.2 to 3.33.0 in
 /apps/block_scout_web/assets

Bumps [core-js](https://github.com/zloirock/core-js/tree/HEAD/packages/core-js) from 3.32.2 to 3.33.0.
- [Release notes](https://github.com/zloirock/core-js/releases)
- [Changelog](https://github.com/zloirock/core-js/blob/master/CHANGELOG.md)
- [Commits](https://github.com/zloirock/core-js/commits/v3.33.0/packages/core-js)

---
updated-dependencies:
- dependency-name: core-js
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 apps/block_scout_web/assets/package-lock.json | 14 +++++++-------
 apps/block_scout_web/assets/package.json      |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/apps/block_scout_web/assets/package-lock.json b/apps/block_scout_web/assets/package-lock.json
index d2a0a612ef3a..46bed3c377b6 100644
--- a/apps/block_scout_web/assets/package-lock.json
+++ b/apps/block_scout_web/assets/package-lock.json
@@ -17,7 +17,7 @@
         "chart.js": "^4.4.0",
         "chartjs-adapter-luxon": "^1.3.1",
         "clipboard": "^2.0.11",
-        "core-js": "^3.32.2",
+        "core-js": "^3.33.0",
         "crypto-browserify": "^3.12.0",
         "dropzone": "^5.9.3",
         "eth-net-props": "^1.0.41",
@@ -5820,9 +5820,9 @@
       }
     },
     "node_modules/core-js": {
-      "version": "3.32.2",
-      "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.32.2.tgz",
-      "integrity": "sha512-pxXSw1mYZPDGvTQqEc5vgIb83jGQKFGYWY76z4a7weZXUolw3G+OvpZqSRcfYOoOVUQJYEPsWeQK8pKEnUtWxQ==",
+      "version": "3.33.0",
+      "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.33.0.tgz",
+      "integrity": "sha512-HoZr92+ZjFEKar5HS6MC776gYslNOKHt75mEBKWKnPeFDpZ6nH5OeF3S6HFT1mUAUZKrzkez05VboaX8myjSuw==",
       "hasInstallScript": true,
       "funding": {
         "type": "opencollective",
@@ -21977,9 +21977,9 @@
       }
     },
     "core-js": {
-      "version": "3.32.2",
-      "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.32.2.tgz",
-      "integrity": "sha512-pxXSw1mYZPDGvTQqEc5vgIb83jGQKFGYWY76z4a7weZXUolw3G+OvpZqSRcfYOoOVUQJYEPsWeQK8pKEnUtWxQ=="
+      "version": "3.33.0",
+      "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.33.0.tgz",
+      "integrity": "sha512-HoZr92+ZjFEKar5HS6MC776gYslNOKHt75mEBKWKnPeFDpZ6nH5OeF3S6HFT1mUAUZKrzkez05VboaX8myjSuw=="
     },
     "core-js-compat": {
       "version": "3.31.0",
diff --git a/apps/block_scout_web/assets/package.json b/apps/block_scout_web/assets/package.json
index 86d8f31006c1..bc609d35cdcf 100644
--- a/apps/block_scout_web/assets/package.json
+++ b/apps/block_scout_web/assets/package.json
@@ -29,7 +29,7 @@
     "chart.js": "^4.4.0",
     "chartjs-adapter-luxon": "^1.3.1",
     "clipboard": "^2.0.11",
-    "core-js": "^3.32.2",
+    "core-js": "^3.33.0",
     "crypto-browserify": "^3.12.0",
     "dropzone": "^5.9.3",
     "eth-net-props": "^1.0.41",

From e4c275206a69513871e300195b8bc65f6e360945 Mon Sep 17 00:00:00 2001
From: Viktor Baranov <baranov.viktor.27@gmail.com>
Date: Mon, 2 Oct 2023 10:53:59 +0300
Subject: [PATCH 466/909] Process reviewer comment

---
 .../block_scout_web/lib/block_scout_web/chain.ex | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/apps/block_scout_web/lib/block_scout_web/chain.ex b/apps/block_scout_web/lib/block_scout_web/chain.ex
index 33f5bbd573c0..1c4323226251 100644
--- a/apps/block_scout_web/lib/block_scout_web/chain.ex
+++ b/apps/block_scout_web/lib/block_scout_web/chain.ex
@@ -99,6 +99,7 @@ defmodule BlockScoutWeb.Chain do
     end
   end
 
+  @spec next_page_params(any, any, any, any) :: nil | map
   def next_page_params(next_page, list, params, is_ctb_with_fiat_value \\ false)
 
   def next_page_params([], _list, _params, _), do: nil
@@ -114,12 +115,8 @@ defmodule BlockScoutWeb.Chain do
 
     items_count =
       if is_binary(current_items_count_string) do
-        if current_items_count_string do
-          {current_items_count, _} = Integer.parse(current_items_count_string)
-          current_items_count + Enum.count(list)
-        else
-          Enum.count(list)
-        end
+        {current_items_count, _} = Integer.parse(current_items_count_string)
+        current_items_count + Enum.count(list)
       else
         Enum.count(list)
       end
@@ -127,6 +124,8 @@ defmodule BlockScoutWeb.Chain do
     Map.put(next_page_params, "items_count", items_count)
   end
 
+  @spec paging_options(any) ::
+          [{:paging_options, Explorer.PagingOptions.t()}, ...] | Explorer.PagingOptions.t()
   def paging_options(%{"hash" => hash_string, "fetched_coin_balance" => fetched_coin_balance_string})
       when is_binary(hash_string) and is_binary(fetched_coin_balance_string) do
     with {coin_balance, ""} <- Integer.parse(fetched_coin_balance_string),
@@ -146,7 +145,10 @@ defmodule BlockScoutWeb.Chain do
         "name" => name_string,
         "inserted_at" => inserted_at_string,
         "item_type" => item_type_string
-      }) do
+      })
+      when is_binary(address_hash_string) and is_binary(tx_hash_string) and is_binary(block_hash_string) and
+             is_binary(holder_count_string) and is_binary(name_string) and is_binary(inserted_at_string) and
+             is_binary(item_type_string) do
     [
       paging_options: %{
         @default_paging_options

From abf7476a379fe911f6aa79d6a6b95d6e99257ea2 Mon Sep 17 00:00:00 2001
From: Viktor Baranov <baranov.viktor.27@gmail.com>
Date: Mon, 2 Oct 2023 07:50:55 +0300
Subject: [PATCH 467/909] Refactor docker-compose config: add DB healthcheck,
 run DB via non-root user

---
 CHANGELOG.md                                  |  1 +
 .../docker-compose-no-build-erigon.yml        | 45 +++++++++++++++++--
 ...cker-compose-no-build-external-backend.yml | 12 ++++-
 ...ker-compose-no-build-external-frontend.yml | 15 +++++--
 .../docker-compose-no-build-ganache.yml       | 14 ++++--
 ...compose-no-build-geth-clique-consensus.yml | 15 +++++--
 .../docker-compose-no-build-geth.yml          | 15 +++++--
 ...ocker-compose-no-build-hardhat-network.yml | 14 ++++--
 .../docker-compose-no-build-nethermind.yml    | 15 +++++--
 ...ocker-compose-no-build-no-db-container.yml |  9 ++--
 docker-compose/docker-compose.yml             | 13 +++++-
 docker-compose/envs/common-blockscout.env     |  2 +-
 .../services/docker-compose-backend.yml       |  2 +-
 docker-compose/services/docker-compose-db.yml | 32 ++++++++++---
 .../services/docker-compose-frontend.yml      |  2 +-
 .../services/docker-compose-nginx.yml         |  2 +-
 .../services/docker-compose-redis.yml         |  2 +-
 .../services/docker-compose-sig-provider.yml  |  2 +-
 ...docker-compose-smart-contract-verifier.yml |  2 +-
 .../services/docker-compose-stats.yml         | 36 ++++++++++++---
 .../services/docker-compose-visualizer.yml    |  2 +-
 21 files changed, 199 insertions(+), 53 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 55f5bb209a53..7943f43f7f80 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,6 +12,7 @@
 
 ### Fixes
 
+- [#8572](https://github.com/blockscout/blockscout/pull/8572) - Refactor docker-compose config
 - [#8552](https://github.com/blockscout/blockscout/pull/8552) - Add CHAIN_TYPE build arg to Dockerfile
 - [#8515](https://github.com/blockscout/blockscout/pull/8515) - Fix `:error.types/0 is undefined` warning
 - [#7959](https://github.com/blockscout/blockscout/pull/7959) - Fix empty batch transfers handling
diff --git a/docker-compose/docker-compose-no-build-erigon.yml b/docker-compose/docker-compose-no-build-erigon.yml
index bd8fb304b1d1..44e8f0441b78 100644
--- a/docker-compose/docker-compose-no-build-erigon.yml
+++ b/docker-compose/docker-compose-no-build-erigon.yml
@@ -1,4 +1,4 @@
-version: '3.8'
+version: '3.9'
 
 services:
   redis_db:
@@ -6,6 +6,11 @@ services:
       file: ./services/docker-compose-redis.yml
       service: redis_db
 
+  db-init:
+    extends:
+      file: ./services/docker-compose-db.yml
+      service: db-init
+
   db:
     extends:
       file: ./services/docker-compose-db.yml
@@ -22,9 +27,6 @@ services:
       - db:database
     environment:
         ETHEREUM_JSONRPC_VARIANT: 'erigon'
-        ETHEREUM_JSONRPC_HTTP_URL: http://host.docker.internal:8545/
-        ETHEREUM_JSONRPC_TRACE_URL: http://host.docker.internal:8545/
-        DATABASE_URL: postgresql://postgres:@host.docker.internal:7432/blockscout?ssl=false
 
   visualizer:
     extends:
@@ -35,3 +37,38 @@ services:
     extends:
       file: ./services/docker-compose-sig-provider.yml
       service: sig-provider
+
+  frontend:
+    depends_on:
+      - backend
+    extends:
+      file: ./services/docker-compose-frontend.yml
+      service: frontend
+
+  stats-db-init:
+    extends:
+      file: ./services/docker-compose-stats.yml
+      service: stats-db-init
+
+  stats-db:
+    depends_on:
+      - backend
+    extends:
+      file: ./services/docker-compose-stats.yml
+      service: stats-db
+
+  stats:
+    depends_on:
+      - stats-db
+    extends:
+      file: ./services/docker-compose-stats.yml
+      service: stats
+
+  proxy:
+    depends_on:
+      - backend
+      - frontend
+      - stats
+    extends:
+      file: ./services/docker-compose-nginx.yml
+      service: proxy
diff --git a/docker-compose/docker-compose-no-build-external-backend.yml b/docker-compose/docker-compose-no-build-external-backend.yml
index 8520f2000a4e..bd6acb24d8ee 100644
--- a/docker-compose/docker-compose-no-build-external-backend.yml
+++ b/docker-compose/docker-compose-no-build-external-backend.yml
@@ -1,4 +1,4 @@
-version: '3.8'
+version: '3.9'
 
 services:
   redis_db:
@@ -6,6 +6,11 @@ services:
       file: ./services/docker-compose-redis.yml
       service: redis_db
 
+  db-init:
+    extends:
+      file: ./services/docker-compose-db.yml
+      service: db-init
+
   db:
     extends:
       file: ./services/docker-compose-db.yml
@@ -26,6 +31,11 @@ services:
       file: ./services/docker-compose-frontend.yml
       service: frontend
 
+  stats-db-init:
+    extends:
+      file: ./services/docker-compose-stats.yml
+      service: stats-db-init
+
   stats-db:
     extends:
       file: ./services/docker-compose-stats.yml
diff --git a/docker-compose/docker-compose-no-build-external-frontend.yml b/docker-compose/docker-compose-no-build-external-frontend.yml
index d7bef3f12f7a..71804ffeae73 100644
--- a/docker-compose/docker-compose-no-build-external-frontend.yml
+++ b/docker-compose/docker-compose-no-build-external-frontend.yml
@@ -1,4 +1,4 @@
-version: '3.8'
+version: '3.9'
 
 services:
   redis_db:
@@ -6,6 +6,11 @@ services:
       file: ./services/docker-compose-redis.yml
       service: redis_db
 
+  db-init:
+    extends:
+      file: ./services/docker-compose-db.yml
+      service: db-init
+
   db:
     extends:
       file: ./services/docker-compose-db.yml
@@ -22,12 +27,9 @@ services:
       - db:database
     environment:
         ETHEREUM_JSONRPC_VARIANT: 'ganache'
-        ETHEREUM_JSONRPC_HTTP_URL: http://host.docker.internal:8545/
-        ETHEREUM_JSONRPC_TRACE_URL: http://host.docker.internal:8545/
         ETHEREUM_JSONRPC_WS_URL: ws://host.docker.internal:8545/
         INDEXER_DISABLE_INTERNAL_TRANSACTIONS_FETCHER: 'true'
         INDEXER_DISABLE_PENDING_TRANSACTIONS_FETCHER: 'true'
-        DATABASE_URL: postgresql://postgres:@host.docker.internal:7432/blockscout?ssl=false
         CHAIN_ID: '1337'
 
   visualizer:
@@ -40,6 +42,11 @@ services:
       file: ./services/docker-compose-sig-provider.yml
       service: sig-provider
 
+  stats-db-init:
+    extends:
+      file: ./services/docker-compose-stats.yml
+      service: stats-db-init
+
   stats-db:
     depends_on:
       - backend
diff --git a/docker-compose/docker-compose-no-build-ganache.yml b/docker-compose/docker-compose-no-build-ganache.yml
index 291913e36bc3..f86be323868b 100644
--- a/docker-compose/docker-compose-no-build-ganache.yml
+++ b/docker-compose/docker-compose-no-build-ganache.yml
@@ -1,4 +1,4 @@
-version: '3.8'
+version: '3.9'
 
 services:
   redis_db:
@@ -6,6 +6,11 @@ services:
       file: ./services/docker-compose-redis.yml
       service: redis_db
 
+  db-init:
+    extends:
+      file: ./services/docker-compose-db.yml
+      service: db-init
+
   db:
     extends:
       file: ./services/docker-compose-db.yml
@@ -22,11 +27,9 @@ services:
       - db:database
     environment:
         ETHEREUM_JSONRPC_VARIANT: 'ganache'
-        ETHEREUM_JSONRPC_HTTP_URL: http://host.docker.internal:8545/
         ETHEREUM_JSONRPC_WS_URL: ws://host.docker.internal:8545/
         INDEXER_DISABLE_INTERNAL_TRANSACTIONS_FETCHER: 'true'
         INDEXER_DISABLE_PENDING_TRANSACTIONS_FETCHER: 'true'
-        DATABASE_URL: postgresql://postgres:@host.docker.internal:7432/blockscout?ssl=false
         CHAIN_ID: '1337'
 
   visualizer:
@@ -46,6 +49,11 @@ services:
       file: ./services/docker-compose-frontend.yml
       service: frontend
 
+  stats-db-init:
+    extends:
+      file: ./services/docker-compose-stats.yml
+      service: stats-db-init
+
   stats-db:
     depends_on:
       - backend
diff --git a/docker-compose/docker-compose-no-build-geth-clique-consensus.yml b/docker-compose/docker-compose-no-build-geth-clique-consensus.yml
index ec01bd0c687e..4f605567e431 100644
--- a/docker-compose/docker-compose-no-build-geth-clique-consensus.yml
+++ b/docker-compose/docker-compose-no-build-geth-clique-consensus.yml
@@ -1,4 +1,4 @@
-version: '3.8'
+version: '3.9'
 
 services:
   redis_db:
@@ -6,6 +6,11 @@ services:
       file: ./services/docker-compose-redis.yml
       service: redis_db
 
+  db-init:
+    extends:
+      file: ./services/docker-compose-db.yml
+      service: db-init
+
   db:
     extends:
       file: ./services/docker-compose-db.yml
@@ -23,9 +28,6 @@ services:
     environment:
         ETHEREUM_JSONRPC_VARIANT: 'geth'
         BLOCK_TRANSFORMER: 'clique'
-        ETHEREUM_JSONRPC_HTTP_URL: http://host.docker.internal:8545/
-        ETHEREUM_JSONRPC_TRACE_URL: http://host.docker.internal:8545/
-        DATABASE_URL: postgresql://postgres:@host.docker.internal:7432/blockscout?ssl=false
 
   visualizer:
     extends:
@@ -44,6 +46,11 @@ services:
       file: ./services/docker-compose-frontend.yml
       service: frontend
 
+  stats-db-init:
+    extends:
+      file: ./services/docker-compose-stats.yml
+      service: stats-db-init
+
   stats-db:
     depends_on:
       - backend
diff --git a/docker-compose/docker-compose-no-build-geth.yml b/docker-compose/docker-compose-no-build-geth.yml
index 430f2d0d75a2..94ccea912a2a 100644
--- a/docker-compose/docker-compose-no-build-geth.yml
+++ b/docker-compose/docker-compose-no-build-geth.yml
@@ -1,4 +1,4 @@
-version: '3.8'
+version: '3.9'
 
 services:
   redis_db:
@@ -6,6 +6,11 @@ services:
       file: ./services/docker-compose-redis.yml
       service: redis_db
 
+  db-init:
+    extends:
+      file: ./services/docker-compose-db.yml
+      service: db-init
+
   db:
     extends:
       file: ./services/docker-compose-db.yml
@@ -22,9 +27,6 @@ services:
       - db:database
     environment:
         ETHEREUM_JSONRPC_VARIANT: 'geth'
-        ETHEREUM_JSONRPC_HTTP_URL: http://host.docker.internal:8545/
-        ETHEREUM_JSONRPC_TRACE_URL: http://host.docker.internal:8545/
-        DATABASE_URL: postgresql://postgres:@host.docker.internal:7432/blockscout?ssl=false
 
   visualizer:
     extends:
@@ -43,6 +45,11 @@ services:
       file: ./services/docker-compose-frontend.yml
       service: frontend
 
+  stats-db-init:
+    extends:
+      file: ./services/docker-compose-stats.yml
+      service: stats-db-init
+
   stats-db:
     depends_on:
       - backend
diff --git a/docker-compose/docker-compose-no-build-hardhat-network.yml b/docker-compose/docker-compose-no-build-hardhat-network.yml
index fcf3b74afbde..defe8e7b35ff 100644
--- a/docker-compose/docker-compose-no-build-hardhat-network.yml
+++ b/docker-compose/docker-compose-no-build-hardhat-network.yml
@@ -1,4 +1,4 @@
-version: '3.8'
+version: '3.9'
 
 services:
   redis_db:
@@ -6,6 +6,11 @@ services:
       file: ./services/docker-compose-redis.yml
       service: redis_db
 
+  db-init:
+    extends:
+      file: ./services/docker-compose-db.yml
+      service: db-init
+
   db:
     extends:
       file: ./services/docker-compose-db.yml
@@ -22,10 +27,8 @@ services:
       - db:database
     environment:
         ETHEREUM_JSONRPC_VARIANT: 'geth'
-        ETHEREUM_JSONRPC_HTTP_URL: http://host.docker.internal:8545/
         ETHEREUM_JSONRPC_WS_URL: ws://host.docker.internal:8545/
         INDEXER_DISABLE_PENDING_TRANSACTIONS_FETCHER: 'true'
-        DATABASE_URL: postgresql://postgres:@host.docker.internal:7432/blockscout?ssl=false
 
   visualizer:
     extends:
@@ -44,6 +47,11 @@ services:
       file: ./services/docker-compose-frontend.yml
       service: frontend
 
+  stats-db-init:
+    extends:
+      file: ./services/docker-compose-stats.yml
+      service: stats-db-init
+
   stats-db:
     depends_on:
       - backend
diff --git a/docker-compose/docker-compose-no-build-nethermind.yml b/docker-compose/docker-compose-no-build-nethermind.yml
index a8daf005fd83..77c5e5eef9b7 100644
--- a/docker-compose/docker-compose-no-build-nethermind.yml
+++ b/docker-compose/docker-compose-no-build-nethermind.yml
@@ -1,4 +1,4 @@
-version: '3.8'
+version: '3.9'
 
 services:
   redis_db:
@@ -6,6 +6,11 @@ services:
       file: ./services/docker-compose-redis.yml
       service: redis_db
 
+  db-init:
+    extends:
+      file: ./services/docker-compose-db.yml
+      service: db-init
+
   db:
     extends:
       file: ./services/docker-compose-db.yml
@@ -22,9 +27,6 @@ services:
       - db:database
     environment:
         ETHEREUM_JSONRPC_VARIANT: 'nethermind'
-        ETHEREUM_JSONRPC_HTTP_URL: http://host.docker.internal:8545/
-        ETHEREUM_JSONRPC_TRACE_URL: http://host.docker.internal:8545/
-        DATABASE_URL: postgresql://postgres:@host.docker.internal:7432/blockscout?ssl=false
 
   visualizer:
     extends:
@@ -43,6 +45,11 @@ services:
       file: ./services/docker-compose-frontend.yml
       service: frontend
 
+  stats-db-init:
+    extends:
+      file: ./services/docker-compose-stats.yml
+      service: stats-db-init
+
   stats-db:
     depends_on:
       - backend
diff --git a/docker-compose/docker-compose-no-build-no-db-container.yml b/docker-compose/docker-compose-no-build-no-db-container.yml
index f86808690881..a9a95c458b88 100644
--- a/docker-compose/docker-compose-no-build-no-db-container.yml
+++ b/docker-compose/docker-compose-no-build-no-db-container.yml
@@ -1,4 +1,4 @@
-version: '3.8'
+version: '3.9'
 
 services:
   redis_db:
@@ -14,8 +14,6 @@ services:
       service: backend
     environment:
         ETHEREUM_JSONRPC_VARIANT: 'geth'
-        ETHEREUM_JSONRPC_HTTP_URL: http://host.docker.internal:8545/
-        DATABASE_URL: postgresql://postgres:@host.docker.internal:5432/blockscout?ssl=false
 
   visualizer:
     extends:
@@ -34,6 +32,11 @@ services:
       file: ./services/docker-compose-frontend.yml
       service: frontend
 
+  stats-db-init:
+    extends:
+      file: ./services/docker-compose-stats.yml
+      service: stats-db-init
+
   stats-db:
     depends_on:
       - backend
diff --git a/docker-compose/docker-compose.yml b/docker-compose/docker-compose.yml
index 5359ab6e623e..4010c8cd0e9d 100644
--- a/docker-compose/docker-compose.yml
+++ b/docker-compose/docker-compose.yml
@@ -1,4 +1,4 @@
-version: '3.8'
+version: '3.9'
 
 services:
   redis_db:
@@ -6,6 +6,11 @@ services:
       file: ./services/docker-compose-redis.yml
       service: redis_db
 
+  db-init:
+    extends:
+      file: ./services/docker-compose-db.yml
+      service: db-init
+
   db:
     extends:
       file: ./services/docker-compose-db.yml
@@ -36,7 +41,6 @@ services:
         ETHEREUM_JSONRPC_HTTP_URL: http://host.docker.internal:8545/
         ETHEREUM_JSONRPC_TRACE_URL: http://host.docker.internal:8545/
         ETHEREUM_JSONRPC_WS_URL: ws://host.docker.internal:8545/
-        DATABASE_URL: postgresql://postgres:@host.docker.internal:7432/blockscout?ssl=false
         CHAIN_ID: '1337'
 
   visualizer:
@@ -56,6 +60,11 @@ services:
       file: ./services/docker-compose-frontend.yml
       service: frontend
 
+  stats-db-init:
+    extends:
+      file: ./services/docker-compose-stats.yml
+      service: stats-db-init
+
   stats-db:
     depends_on:
       - backend
diff --git a/docker-compose/envs/common-blockscout.env b/docker-compose/envs/common-blockscout.env
index 6211113d22f6..0d9f9ef254da 100644
--- a/docker-compose/envs/common-blockscout.env
+++ b/docker-compose/envs/common-blockscout.env
@@ -2,7 +2,7 @@
 ETHEREUM_JSONRPC_VARIANT=geth
 ETHEREUM_JSONRPC_HTTP_URL=http://host.docker.internal:8545/
 # ETHEREUM_JSONRPC_FALLBACK_HTTP_URL=
-DATABASE_URL=postgresql://postgres:@host.docker.internal:7432/blockscout?ssl=false
+DATABASE_URL=postgresql://blockscout:ceWb1MeLBEeOIfk65gU8EjF8@db:5432/blockscout
 ETHEREUM_JSONRPC_TRACE_URL=http://host.docker.internal:8545/
 # ETHEREUM_JSONRPC_FALLBACK_TRACE_URL=
 # ETHEREUM_JSONRPC_HTTP_TIMEOUT=
diff --git a/docker-compose/services/docker-compose-backend.yml b/docker-compose/services/docker-compose-backend.yml
index f73af4dab12f..d5f934fb653f 100644
--- a/docker-compose/services/docker-compose-backend.yml
+++ b/docker-compose/services/docker-compose-backend.yml
@@ -1,4 +1,4 @@
-version: '3.8'
+version: '3.9'
 
 services:
   backend:
diff --git a/docker-compose/services/docker-compose-db.yml b/docker-compose/services/docker-compose-db.yml
index 51a139dff4d8..131d90bb931c 100644
--- a/docker-compose/services/docker-compose-db.yml
+++ b/docker-compose/services/docker-compose-db.yml
@@ -1,16 +1,36 @@
-version: '3.8'
+version: '3.9'
 
 services:
+  db-init:
+    image: postgres:14
+    volumes:
+      - ./blockscout-db-data:/var/lib/postgresql/data
+    entrypoint:
+      - sh
+      - -c
+      - |
+        chown -R 2000:2000 /var/lib/postgresql/data
+
   db:
+    depends_on:
+      db-init:
+        condition: service_completed_successfully
     image: postgres:14
+    user: 2000:2000
     restart: always
-    container_name: 'postgres'
+    container_name: 'db'
     command: postgres -c 'max_connections=200'
     environment:
-        POSTGRES_PASSWORD: ''
-        POSTGRES_USER: 'postgres'
-        POSTGRES_HOST_AUTH_METHOD: 'trust'
+        POSTGRES_DB: 'blockscout'
+        POSTGRES_USER: 'blockscout'
+        POSTGRES_PASSWORD: 'ceWb1MeLBEeOIfk65gU8EjF8'
     ports:
       - 7432:5432
     volumes:
-      - ./blockscout-db-data:/var/lib/postgresql/data/
+      - ./blockscout-db-data:/var/lib/postgresql/data
+    healthcheck:
+      test: ["CMD-SHELL", "pg_isready -U blockscout -d blockscout"]
+      interval: 10s
+      timeout: 5s
+      retries: 5
+      start_period: 10s
diff --git a/docker-compose/services/docker-compose-frontend.yml b/docker-compose/services/docker-compose-frontend.yml
index 2c0210ebf8ec..2dba9b2856ff 100644
--- a/docker-compose/services/docker-compose-frontend.yml
+++ b/docker-compose/services/docker-compose-frontend.yml
@@ -1,4 +1,4 @@
-version: '3.8'
+version: '3.9'
 
 services:
   frontend:
diff --git a/docker-compose/services/docker-compose-nginx.yml b/docker-compose/services/docker-compose-nginx.yml
index e54401d3f5ae..27c0a0a6a662 100644
--- a/docker-compose/services/docker-compose-nginx.yml
+++ b/docker-compose/services/docker-compose-nginx.yml
@@ -1,4 +1,4 @@
-version: '3.8'
+version: '3.9'
 
 services:
   proxy:
diff --git a/docker-compose/services/docker-compose-redis.yml b/docker-compose/services/docker-compose-redis.yml
index c4b425509dea..9760137f5bb5 100644
--- a/docker-compose/services/docker-compose-redis.yml
+++ b/docker-compose/services/docker-compose-redis.yml
@@ -1,4 +1,4 @@
-version: '3.8'
+version: '3.9'
 
 services:
   redis_db:
diff --git a/docker-compose/services/docker-compose-sig-provider.yml b/docker-compose/services/docker-compose-sig-provider.yml
index df508404f752..8c0cb33337c9 100644
--- a/docker-compose/services/docker-compose-sig-provider.yml
+++ b/docker-compose/services/docker-compose-sig-provider.yml
@@ -1,4 +1,4 @@
-version: '3.8'
+version: '3.9'
 
 services:
   sig-provider:
diff --git a/docker-compose/services/docker-compose-smart-contract-verifier.yml b/docker-compose/services/docker-compose-smart-contract-verifier.yml
index baa98f2157a7..03e633c6958a 100644
--- a/docker-compose/services/docker-compose-smart-contract-verifier.yml
+++ b/docker-compose/services/docker-compose-smart-contract-verifier.yml
@@ -1,4 +1,4 @@
-version: '3.8'
+version: '3.9'
 
 services:
   smart-contract-verifier:
diff --git a/docker-compose/services/docker-compose-stats.yml b/docker-compose/services/docker-compose-stats.yml
index 5dde5bbad13b..5077a5d893c2 100644
--- a/docker-compose/services/docker-compose-stats.yml
+++ b/docker-compose/services/docker-compose-stats.yml
@@ -1,19 +1,39 @@
-version: '3.8'
+version: '3.9'
 
 services:
+  stats-db-init:
+    image: postgres:14
+    volumes:
+      - ./stats-db-data:/var/lib/postgresql/data
+    entrypoint:
+      - sh
+      - -c
+      - |
+        chown -R 2000:2000 /var/lib/postgresql/data
+
   stats-db:
+    depends_on:
+      stats-db-init:
+        condition: service_completed_successfully
     image: postgres:14
+    user: 2000:2000
     restart: always
     container_name: 'stats-postgres'
     command: postgres -c 'max_connections=200'
     environment:
-        POSTGRES_PASSWORD: ''
-        POSTGRES_USER: 'postgres'
-        POSTGRES_HOST_AUTH_METHOD: 'trust'
+        POSTGRES_DB: 'stats'
+        POSTGRES_USER: 'stats'
+        POSTGRES_PASSWORD: 'n0uejXPl61ci6ldCuE2gQU5Y'
     ports:
       - 7433:5432
     volumes:
-      - ./stats-db-data:/var/lib/postgresql/data/
+      - ./stats-db-data:/var/lib/postgresql/data
+    healthcheck:
+      test: ["CMD-SHELL", "pg_isready -U stats -d stats"]
+      interval: 10s
+      timeout: 5s
+      retries: 5
+      start_period: 10s
 
   stats:
     image: ghcr.io/blockscout/stats:${STATS_DOCKER_TAG:-latest}
@@ -21,12 +41,14 @@ services:
     platform: linux/amd64
     restart: always
     container_name: 'stats'
+    depends_on:
+      - "stats-db"
     extra_hosts:
       - 'host.docker.internal:host-gateway'
     env_file:
       -  ../envs/common-stats.env
     environment:
-      - STATS__DB_URL=postgres://postgres:@stats-db:5432/stats
-      - STATS__BLOCKSCOUT_DB_URL=postgresql://postgres:@host.docker.internal:7432/blockscout?ssl=false
+      - STATS__DB_URL=postgres://stats:n0uejXPl61ci6ldCuE2gQU5Y@stats-db:5432/stats
+      - STATS__BLOCKSCOUT_DB_URL=postgresql://blockscout:ceWb1MeLBEeOIfk65gU8EjF8@db:5432/blockscout
       - STATS__CREATE_DATABASE=true
       - STATS__RUN_MIGRATIONS=true
diff --git a/docker-compose/services/docker-compose-visualizer.yml b/docker-compose/services/docker-compose-visualizer.yml
index 39dbfaf440e9..37a4aaad880b 100644
--- a/docker-compose/services/docker-compose-visualizer.yml
+++ b/docker-compose/services/docker-compose-visualizer.yml
@@ -1,4 +1,4 @@
-version: '3.8'
+version: '3.9'
 
 services:
   visualizer:

From f71397fe19868022faef908fc0a778274257db28 Mon Sep 17 00:00:00 2001
From: Viktor Baranov <baranov.viktor.27@gmail.com>
Date: Mon, 2 Oct 2023 12:49:49 +0300
Subject: [PATCH 468/909] Update Nginx proxy to open all frontend paths

---
 CHANGELOG.md                               |  1 +
 docker-compose/proxy/default.conf.template | 15 ++-------------
 2 files changed, 3 insertions(+), 13 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3d77262704c6..9051cff38e7e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -21,6 +21,7 @@
 
 ### Chore
 
+- [#8573](https://github.com/blockscout/blockscout/pull/8573) - Update Nginx to proxy all frontend paths
 - [#8290](https://github.com/blockscout/blockscout/pull/8290) - Update Chromedriver version
 - [#8536](https://github.com/blockscout/blockscout/pull/8536), [#8537](https://github.com/blockscout/blockscout/pull/8537), [#8540](https://github.com/blockscout/blockscout/pull/8540), [#8557](https://github.com/blockscout/blockscout/pull/8557) - New issue template
 - [#8529](https://github.com/blockscout/blockscout/pull/8529) - Move PolygonEdge-related migration to the corresponding ecto repository
diff --git a/docker-compose/proxy/default.conf.template b/docker-compose/proxy/default.conf.template
index 0ea0e3bf9fb2..dbd5180d10b1 100644
--- a/docker-compose/proxy/default.conf.template
+++ b/docker-compose/proxy/default.conf.template
@@ -9,7 +9,7 @@ server {
     server_name  localhost;
     proxy_http_version 1.1;
 
-    location / {
+    location ~ ^/(api|socket|sitemap.xml|auth/auth0|auth/auth0/callback|auth/logout) {
         proxy_pass            ${BACK_PROXY_PASS};
         proxy_http_version    1.1;
         proxy_set_header      Host "$host";
@@ -20,18 +20,7 @@ server {
         proxy_set_header      Connection $connection_upgrade;
         proxy_cache_bypass    $http_upgrade;
     }
-    location = / {
-        proxy_pass            ${FRONT_PROXY_PASS};
-        proxy_http_version    1.1;
-        proxy_set_header      Host "$host";
-        proxy_set_header      X-Real-IP "$remote_addr";
-        proxy_set_header      X-Forwarded-For "$proxy_add_x_forwarded_for";
-        proxy_set_header      X-Forwarded-Proto "$scheme";
-        proxy_set_header      Upgrade "$http_upgrade";
-        proxy_set_header      Connection $connection_upgrade;
-        proxy_cache_bypass    $http_upgrade;
-    }
-    location ~ ^/(_next|node-api|apps|account|accounts|favicon|static|auth/profile|auth/unverified-email|txs|tx|blocks|block|login|address|stats|search-results|token|tokens|visualize|api-docs|csv-export|verified-contracts|graphiql|withdrawals) {
+    location / {
         proxy_pass            ${FRONT_PROXY_PASS};
         proxy_http_version    1.1;
         proxy_set_header      Host "$host";

From 4e9ec06168f5348c20a458553beb7d8889184c2f Mon Sep 17 00:00:00 2001
From: ulyanas <2fizzy@gmail.com>
Date: Mon, 2 Oct 2023 13:27:39 +0300
Subject: [PATCH 469/909] Update README.md

Updated Blockscout brand name in Readme.
---
 README.md | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index 0a59692f9704..91130f13aaec 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-<h1 align="center">BlockScout</h1>
+<h1 align="center">Blockscout</h1>
 <p align="center">Blockchain Explorer for inspecting and analyzing EVM Chains.</p>
 <div align="center">
 
@@ -8,21 +8,21 @@
 </div>
 
 
-BlockScout provides a comprehensive, easy-to-use interface for users to view, confirm, and inspect transactions on EVM (Ethereum Virtual Machine) blockchains. This includes Ethereum Mainnet, Ethereum Classic, Optimism, Gnosis Chain and many other **Ethereum testnets, private networks, L2s and sidechains**.
+Blockscout provides a comprehensive, easy-to-use interface for users to view, confirm, and inspect transactions on EVM (Ethereum Virtual Machine) blockchains. This includes Ethereum Mainnet, Ethereum Classic, Optimism, Gnosis Chain and many other **Ethereum testnets, private networks, L2s and sidechains**.
 
 See our [project documentation](https://docs.blockscout.com/) for detailed information and setup instructions.
 
 For questions, comments and feature requests see the [discussions section](https://github.com/blockscout/blockscout/discussions) or via [Discord](https://discord.com/invite/blockscout).
 
-## About BlockScout
+## About Blockscout
 
-BlockScout allows users to search transactions, view accounts and balances, verify and interact with smart contracts and view and interact with applications on the Ethereum network including many forks, sidechains, L2s and testnets.
+Blockscout allows users to search transactions, view accounts and balances, verify and interact with smart contracts and view and interact with applications on the Ethereum network including many forks, sidechains, L2s and testnets.
 
 Blockscout is an open-source alternative to centralized, closed source block explorers such as Etherscan, Etherchain and others.  As Ethereum sidechains and L2s continue to proliferate in both private and public settings, transparent, open-source tools are needed to analyze and validate all transactions.
 
 ## Supported Projects
 
-BlockScout currently supports several hundred chains and rollups throughout the greater blockchain ecosystem. Ethereum, Cosmos, Polkadot, Avalanche, Near and many others include Blockscout integrations. [A comprehensive list is available here](https://docs.blockscout.com/about/projects). If your project is not listed, please submit a PR or [contact the team in Discord](https://discord.com/invite/blockscout).
+Blockscout currently supports several hundred chains and rollups throughout the greater blockchain ecosystem. Ethereum, Cosmos, Polkadot, Avalanche, Near and many others include Blockscout integrations. [A comprehensive list is available here](https://docs.blockscout.com/about/projects). If your project is not listed, please submit a PR or [contact the team in Discord](https://discord.com/invite/blockscout).
 
 ## Getting Started
 

From 8b6f24328cfd8b758ab801331ebd7a976ba08477 Mon Sep 17 00:00:00 2001
From: Maxim Filonov <53992153+sl1depengwyn@users.noreply.github.com>
Date: Tue, 26 Sep 2023 14:09:17 +0300
Subject: [PATCH 470/909] Fix nil structLogs

---
 CHANGELOG.md                                       |  1 +
 apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/geth.ex | 14 +++++++++-----
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9051cff38e7e..bdba20c840ed 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,7 @@
 
 ### Features
 
+- [#8544](https://github.com/blockscout/blockscout/pull/8544) - Fix `nil` `"structLogs"`
 - [#8561](https://github.com/blockscout/blockscout/pull/8561), [#8564](https://github.com/blockscout/blockscout/pull/8564) - Get historical market cap data from CoinGecko
 - [#8386](https://github.com/blockscout/blockscout/pull/8386) - Add `owner_address_hash` to the `token_instances`
 - [#8530](https://github.com/blockscout/blockscout/pull/8530) - Add `block_type` to search results
diff --git a/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/geth.ex b/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/geth.ex
index cfa5c8c511fa..afed3883f412 100644
--- a/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/geth.ex
+++ b/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/geth.ex
@@ -143,11 +143,15 @@ defmodule EthereumJSONRPC.Geth do
           else: Tracer
 
       responses
-      |> Enum.map(fn %{id: id, result: %{"structLogs" => _} = result} ->
-        debug_trace_transaction_response_to_internal_transactions_params(
-          %{id: id, result: tracer.replay(result, Map.fetch!(receipts_map, id), Map.fetch!(txs_map, id))},
-          id_to_params
-        )
+      |> Enum.map(fn
+        %{result: %{"structLogs" => nil}} ->
+          []
+
+        %{id: id, result: %{"structLogs" => _} = result} ->
+          debug_trace_transaction_response_to_internal_transactions_params(
+            %{id: id, result: tracer.replay(result, Map.fetch!(receipts_map, id), Map.fetch!(txs_map, id))},
+            id_to_params
+          )
       end)
       |> reduce_internal_transactions_params()
       |> fetch_missing_data(json_rpc_named_arguments)

From 3421d84c93f426f07eaf07ec9f3a2de7ecafa856 Mon Sep 17 00:00:00 2001
From: Victor Baranov <baranov.viktor.27@gmail.com>
Date: Mon, 21 Aug 2023 22:20:18 +0300
Subject: [PATCH 471/909] Merge pull request #8252 from
 blockscout/mf-rootstock-tx-types

Add remasc and bridge tx types
---
 .../views/api/v2/transaction_view.ex          | 28 +++++++++++++++++--
 .../lib/explorer/chain/transaction.ex         | 22 +++++++++++++++
 config/runtime.exs                            |  4 +++
 cspell.json                                   |  6 ++++
 docker-compose/envs/common-blockscout.env     |  7 +++++
 5 files changed, 64 insertions(+), 3 deletions(-)

diff --git a/apps/block_scout_web/lib/block_scout_web/views/api/v2/transaction_view.ex b/apps/block_scout_web/lib/block_scout_web/views/api/v2/transaction_view.ex
index 24ecda93570c..d46e8784c882 100644
--- a/apps/block_scout_web/lib/block_scout_web/views/api/v2/transaction_view.ex
+++ b/apps/block_scout_web/lib/block_scout_web/views/api/v2/transaction_view.ex
@@ -629,9 +629,31 @@ defmodule BlockScoutWeb.API.V2.TransactionView do
     tx_types(tx, types, :coin_transfer)
   end
 
-  defp tx_types(%Transaction{value: value}, types, :coin_transfer) do
-    if Decimal.compare(value.value, 0) == :gt do
-      [:coin_transfer | types]
+  defp tx_types(%Transaction{value: value} = tx, types, :coin_transfer) do
+    types =
+      if Decimal.compare(value.value, 0) == :gt do
+        [:coin_transfer | types]
+      else
+        types
+      end
+
+    tx_types(tx, types, :rootstock_remasc)
+  end
+
+  defp tx_types(%Transaction{to_address_hash: to_address_hash} = tx, types, :rootstock_remasc) do
+    types =
+      if to_address_hash && to_address_hash == Transaction.rootstock_remasc_address_hash() do
+        [:rootstock_remasc | types]
+      else
+        types
+      end
+
+    tx_types(tx, types, :rootstock_bridge)
+  end
+
+  defp tx_types(%Transaction{to_address_hash: to_address_hash}, types, :rootstock_bridge) do
+    if to_address_hash && to_address_hash == Transaction.rootstock_bridge_address_hash() do
+      [:rootstock_bridge | types]
     else
       types
     end
diff --git a/apps/explorer/lib/explorer/chain/transaction.ex b/apps/explorer/lib/explorer/chain/transaction.ex
index 82967c0c0634..5636f38414e5 100644
--- a/apps/explorer/lib/explorer/chain/transaction.ex
+++ b/apps/explorer/lib/explorer/chain/transaction.ex
@@ -1002,4 +1002,26 @@ defmodule Explorer.Chain.Transaction do
       limit: 1
     )
   end
+
+  @doc """
+  Get rootstock REMASC address if env is set and valid, nil otherwise.
+  """
+  @spec rootstock_remasc_address_hash :: nil | Explorer.Chain.Hash.t()
+  def rootstock_remasc_address_hash do
+    case Hash.Address.cast(Application.get_env(:explorer, __MODULE__)[:rootstock_remasc_address]) do
+      {:ok, address} -> address
+      _ -> nil
+    end
+  end
+
+  @doc """
+  Get rootstock bridge address if env is set and valid, nil otherwise.
+  """
+  @spec rootstock_bridge_address_hash :: nil | Explorer.Chain.Hash.t()
+  def rootstock_bridge_address_hash do
+    case Hash.Address.cast(Application.get_env(:explorer, __MODULE__)[:rootstock_bridge_address]) do
+      {:ok, address} -> address
+      _ -> nil
+    end
+  end
 end
diff --git a/config/runtime.exs b/config/runtime.exs
index e83d0489d833..9aaa1ed47eba 100644
--- a/config/runtime.exs
+++ b/config/runtime.exs
@@ -416,6 +416,10 @@ config :explorer, Explorer.TokenInstanceOwnerAddressMigration,
   concurrency: ConfigHelper.parse_integer_env_var("TOKEN_INSTANCE_OWNER_MIGRATION_CONCURRENCY", 5),
   batch_size: ConfigHelper.parse_integer_env_var("TOKEN_INSTANCE_OWNER_MIGRATION_BATCH_SIZE", 50)
 
+config :explorer, Explorer.Chain.Transaction,
+  rootstock_remasc_address: System.get_env("ROOTSTOCK_REMASC_ADDRESS"),
+  rootstock_bridge_address: System.get_env("ROOTSTOCK_BRIDGE_ADDRESS")
+
 ###############
 ### Indexer ###
 ###############
diff --git a/cspell.json b/cspell.json
index 0338069e35c2..f1e42ee869f6 100644
--- a/cspell.json
+++ b/cspell.json
@@ -25,6 +25,7 @@
         "ARGMAX",
         "arounds",
         "asda",
+        "Asfpp",
         "atoken",
         "autodetectfalse",
         "Autodetection",
@@ -147,6 +148,7 @@
         "Erigon",
         "errora",
         "errorb",
+        "erts",
         "Ethash",
         "etherchain",
         "ethsupply",
@@ -285,6 +287,7 @@
         "mydep",
         "nanomorph",
         "nbsp",
+        "Nerg",
         "Nethermind",
         "Neue",
         "newkey",
@@ -351,6 +354,7 @@
         "questiona",
         "questionb",
         "qwertyufhgkhiop",
+        "qwertyuioiuytrewertyuioiuytrertyuio",
         "racecar",
         "raisedbrow",
         "rangeright",
@@ -366,6 +370,7 @@
         "REINDEX",
         "relname",
         "reltuples",
+        "remasc",
         "removedfile",
         "repayer",
         "reqs",
@@ -378,6 +383,7 @@
         "safelow",
         "savechives",
         "Secon",
+        "secp",
         "Segoe",
         "seindexed",
         "selfdestruct",
diff --git a/docker-compose/envs/common-blockscout.env b/docker-compose/envs/common-blockscout.env
index 0d9f9ef254da..f56c4de54aa3 100644
--- a/docker-compose/envs/common-blockscout.env
+++ b/docker-compose/envs/common-blockscout.env
@@ -144,6 +144,13 @@ INDEXER_DISABLE_INTERNAL_TRANSACTIONS_FETCHER=false
 # INDEXER_COIN_BALANCES_FETCHER_INIT_QUERY_LIMIT=
 # INDEXER_DISABLE_WITHDRAWALS_FETCHER=
 # WITHDRAWALS_FIRST_BLOCK=
+# INDEXER_DISABLE_ROOTSTOCK_DATA_FETCHER=
+# INDEXER_ROOTSTOCK_DATA_FETCHER_INTERVAL=
+# INDEXER_ROOTSTOCK_DATA_FETCHER_BATCH_SIZE=
+# INDEXER_ROOTSTOCK_DATA_FETCHER_CONCURRENCY=
+# INDEXER_ROOTSTOCK_DATA_FETCHER_DB_BATCH_SIZE=
+# ROOTSTOCK_REMASC_ADDRESS=
+# ROOTSTOCK_BRIDGE_ADDRESS=
 # TOKEN_ID_MIGRATION_FIRST_BLOCK=
 # TOKEN_ID_MIGRATION_CONCURRENCY=
 # TOKEN_ID_MIGRATION_BATCH_SIZE=

From a000c747fdb4093e0bdbde8decd06379b02e0a8c Mon Sep 17 00:00:00 2001
From: Viktor Baranov <baranov.viktor.27@gmail.com>
Date: Mon, 2 Oct 2023 15:28:31 +0300
Subject: [PATCH 472/909] IPFS gateway URL env var

---
 CHANGELOG.md                                       |  1 +
 .../lib/block_scout_web/views/nft_helper.ex        |  8 +++++++-
 .../fetcher/token_instance/metadata_retriever.ex   | 14 +++++++++++---
 config/runtime.exs                                 |  3 ++-
 docker-compose/envs/common-blockscout.env          |  3 ++-
 5 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index bdba20c840ed..bfff52565c75 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -22,6 +22,7 @@
 
 ### Chore
 
+- [#8579](https://github.com/blockscout/blockscout/pull/8579) - IPFS gateway URL runtime env variable
 - [#8573](https://github.com/blockscout/blockscout/pull/8573) - Update Nginx to proxy all frontend paths
 - [#8290](https://github.com/blockscout/blockscout/pull/8290) - Update Chromedriver version
 - [#8536](https://github.com/blockscout/blockscout/pull/8536), [#8537](https://github.com/blockscout/blockscout/pull/8537), [#8540](https://github.com/blockscout/blockscout/pull/8540), [#8557](https://github.com/blockscout/blockscout/pull/8557) - New issue template
diff --git a/apps/block_scout_web/lib/block_scout_web/views/nft_helper.ex b/apps/block_scout_web/lib/block_scout_web/views/nft_helper.ex
index aa3e528bbf35..ac4de5f378f7 100644
--- a/apps/block_scout_web/lib/block_scout_web/views/nft_helper.ex
+++ b/apps/block_scout_web/lib/block_scout_web/views/nft_helper.ex
@@ -81,6 +81,12 @@ defmodule BlockScoutWeb.NFTHelper do
 
   defp ipfs_link(image_url, prefix) do
     ipfs_uid = String.slice(image_url, String.length(prefix)..-1)
-    "https://ipfs.io/ipfs/" <> ipfs_uid
+
+    ipfs_gateway_url =
+      :indexer
+      |> Application.get_env(:ipfs_gateway_url)
+      |> String.trim_trailing("/")
+
+    ipfs_gateway_url <> "/" <> ipfs_uid
   end
 end
diff --git a/apps/indexer/lib/indexer/fetcher/token_instance/metadata_retriever.ex b/apps/indexer/lib/indexer/fetcher/token_instance/metadata_retriever.ex
index 89c383f5a5d0..975b7bed5f87 100644
--- a/apps/indexer/lib/indexer/fetcher/token_instance/metadata_retriever.ex
+++ b/apps/indexer/lib/indexer/fetcher/token_instance/metadata_retriever.ex
@@ -11,7 +11,6 @@ defmodule Indexer.Fetcher.TokenInstance.MetadataRetriever do
   @no_uri_error "no uri"
   @vm_execution_error "VM execution error"
   @ipfs_protocol "ipfs://"
-  @ipfs_link "https://ipfs.io/ipfs/"
 
   # https://eips.ethereum.org/EIPS/eip-1155#metadata
   @erc1155_token_id_placeholder "{id}"
@@ -20,6 +19,15 @@ defmodule Indexer.Fetcher.TokenInstance.MetadataRetriever do
 
   @ignored_hosts ["localhost", "127.0.0.1", "0.0.0.0", "", nil]
 
+  defp ipfs_link do
+    link =
+      :indexer
+      |> Application.get_env(:ipfs_gateway_url)
+      |> String.trim_trailing("/")
+
+    link <> "/"
+  end
+
   def query_contract(contract_address_hash, contract_functions, abi) do
     Reader.query_contract(contract_address_hash, abi, contract_functions, false)
   end
@@ -54,7 +62,7 @@ defmodule Indexer.Fetcher.TokenInstance.MetadataRetriever do
   # CIDv0 IPFS links # https://docs.ipfs.tech/concepts/content-addressing/#version-0-v0
   defp fetch_json_from_uri({:ok, ["Qm" <> _ = result]}, hex_token_id) do
     if String.length(result) == 46 do
-      fetch_json_from_uri({:ok, [@ipfs_link <> result]}, hex_token_id)
+      fetch_json_from_uri({:ok, [ipfs_link() <> result]}, hex_token_id)
     else
       Logger.debug(["Unknown metadata format result #{inspect(result)}."], fetcher: :token_instances)
 
@@ -141,7 +149,7 @@ defmodule Indexer.Fetcher.TokenInstance.MetadataRetriever do
   end
 
   defp fetch_from_ipfs(ipfs_uid, hex_token_id) do
-    ipfs_url = @ipfs_link <> ipfs_uid
+    ipfs_url = ipfs_link() <> ipfs_uid
     fetch_metadata_inner(ipfs_url, hex_token_id)
   end
 
diff --git a/config/runtime.exs b/config/runtime.exs
index e83d0489d833..a80e8b88a3e4 100644
--- a/config/runtime.exs
+++ b/config/runtime.exs
@@ -437,7 +437,8 @@ config :indexer,
   token_balances_fetcher_init_limit:
     ConfigHelper.parse_integer_env_var("INDEXER_TOKEN_BALANCES_FETCHER_INIT_QUERY_LIMIT", 100_000),
   coin_balances_fetcher_init_limit:
-    ConfigHelper.parse_integer_env_var("INDEXER_COIN_BALANCES_FETCHER_INIT_QUERY_LIMIT", 2000)
+    ConfigHelper.parse_integer_env_var("INDEXER_COIN_BALANCES_FETCHER_INIT_QUERY_LIMIT", 2000),
+  ipfs_gateway_url: System.get_env("IPFS_GATEWAY_URL", "https://ipfs.io/ipfs")
 
 config :indexer, Indexer.Supervisor, enabled: !ConfigHelper.parse_bool_env_var("DISABLE_INDEXER")
 
diff --git a/docker-compose/envs/common-blockscout.env b/docker-compose/envs/common-blockscout.env
index 0d9f9ef254da..38a13619728d 100644
--- a/docker-compose/envs/common-blockscout.env
+++ b/docker-compose/envs/common-blockscout.env
@@ -232,7 +232,8 @@ EIP_1559_ELASTICITY_MULTIPLIER=2
 # INDEXER_TOKEN_INSTANCE_RETRY_BATCH_SIZE=10
 # INDEXER_TOKEN_INSTANCE_REALTIME_BATCH_SIZE=1
 # INDEXER_TOKEN_INSTANCE_SANITIZE_BATCH_SIZE=10
-API_V2_ENABLED=true
 # INDEXER_TOKEN_INSTANCE_LEGACY_SANITIZE_BATCH_SIZE=10
 # TOKEN_INSTANCE_OWNER_MIGRATION_CONCURRENCY=5
 # TOKEN_INSTANCE_OWNER_MIGRATION_BATCH_SIZE=50
+# IPFS_GATEWAY_URL=
+API_V2_ENABLED=true
\ No newline at end of file

From d1c847c5b300acb941f8ed3f45beb58be527f8c1 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 2 Oct 2023 19:01:51 +0000
Subject: [PATCH 473/909] Bump credo from 1.7.0 to 1.7.1

Bumps [credo](https://github.com/rrrene/credo) from 1.7.0 to 1.7.1.
- [Changelog](https://github.com/rrrene/credo/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rrrene/credo/commits)

---
updated-dependencies:
- dependency-name: credo
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 mix.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mix.lock b/mix.lock
index 58711856c2ce..8d0dfd9f5ede 100644
--- a/mix.lock
+++ b/mix.lock
@@ -27,7 +27,7 @@
   "cowboy": {:hex, :cowboy, "2.10.0", "ff9ffeff91dae4ae270dd975642997afe2a1179d94b1887863e43f681a203e26", [:make, :rebar3], [{:cowlib, "2.12.1", [hex: :cowlib, repo: "hexpm", optional: false]}, {:ranch, "1.8.0", [hex: :ranch, repo: "hexpm", optional: false]}], "hexpm", "3afdccb7183cc6f143cb14d3cf51fa00e53db9ec80cdcd525482f5e99bc41d6b"},
   "cowboy_telemetry": {:hex, :cowboy_telemetry, "0.3.1", "ebd1a1d7aff97f27c66654e78ece187abdc646992714164380d8a041eda16754", [:rebar3], [{:cowboy, "~> 2.7", [hex: :cowboy, repo: "hexpm", optional: false]}, {:telemetry, "~> 0.4", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "3a6efd3366130eab84ca372cbd4a7d3c3a97bdfcfb4911233b035d117063f0af"},
   "cowlib": {:hex, :cowlib, "2.12.1", "a9fa9a625f1d2025fe6b462cb865881329b5caff8f1854d1cbc9f9533f00e1e1", [:make, :rebar3], [], "hexpm", "163b73f6367a7341b33c794c4e88e7dbfe6498ac42dcd69ef44c5bc5507c8db0"},
-  "credo": {:hex, :credo, "1.7.0", "6119bee47272e85995598ee04f2ebbed3e947678dee048d10b5feca139435f75", [:mix], [{:bunt, "~> 0.2.1", [hex: :bunt, repo: "hexpm", optional: false]}, {:file_system, "~> 0.2.8", [hex: :file_system, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: false]}], "hexpm", "6839fcf63d1f0d1c0f450abc8564a57c43d644077ab96f2934563e68b8a769d7"},
+  "credo": {:hex, :credo, "1.7.1", "6e26bbcc9e22eefbff7e43188e69924e78818e2fe6282487d0703652bc20fd62", [:mix], [{:bunt, "~> 0.2.1", [hex: :bunt, repo: "hexpm", optional: false]}, {:file_system, "~> 0.2.8", [hex: :file_system, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: false]}], "hexpm", "e9871c6095a4c0381c89b6aa98bc6260a8ba6addccf7f6a53da8849c748a58a2"},
   "csv": {:hex, :csv, "2.5.0", "c47b5a5221bf2e56d6e8eb79e77884046d7fd516280dc7d9b674251e0ae46246", [:mix], [{:parallel_stream, "~> 1.0.4 or ~> 1.1.0", [hex: :parallel_stream, repo: "hexpm", optional: false]}], "hexpm", "e821f541487045c7591a1963eeb42afff0dfa99bdcdbeb3410795a2f59c77d34"},
   "dataloader": {:hex, :dataloader, "1.0.11", "49bbfc7dd8a1990423c51000b869b1fecaab9e3ccd6b29eab51616ae8ad0a2f5", [:mix], [{:ecto, ">= 3.4.3 and < 4.0.0", [hex: :ecto, repo: "hexpm", optional: true]}, {:telemetry, "~> 1.0 or ~> 0.4", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "ba0b0ec532ec68e9d033d03553561d693129bd7cbd5c649dc7903f07ffba08fe"},
   "db_connection": {:hex, :db_connection, "2.5.0", "bb6d4f30d35ded97b29fe80d8bd6f928a1912ca1ff110831edcd238a1973652c", [:mix], [{:telemetry, "~> 0.4 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "c92d5ba26cd69ead1ff7582dbb860adeedfff39774105a4f1c92cbb654b55aa2"},

From 1abcea52807f7b2eeb77c5941b5abb01ba90b7ff Mon Sep 17 00:00:00 2001
From: Viktor Baranov <baranov.viktor.27@gmail.com>
Date: Mon, 2 Oct 2023 23:44:52 +0300
Subject: [PATCH 474/909] Store chain together with in Redis cookie

---
 CHANGELOG.md                                  |  1 +
 .../lib/block_scout_web/plug/redis_cookie.ex  | 23 ++++++++++++++++---
 .../third_party_integrations/auth0.ex         |  7 ++++--
 3 files changed, 26 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index bfff52565c75..9c5d3c45157f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -22,6 +22,7 @@
 
 ### Chore
 
+- [#8584](https://github.com/blockscout/blockscout/pull/8584) - Store chain together with cookie hash in Redis
 - [#8579](https://github.com/blockscout/blockscout/pull/8579) - IPFS gateway URL runtime env variable
 - [#8573](https://github.com/blockscout/blockscout/pull/8573) - Update Nginx to proxy all frontend paths
 - [#8290](https://github.com/blockscout/blockscout/pull/8290) - Update Chromedriver version
diff --git a/apps/block_scout_web/lib/block_scout_web/plug/redis_cookie.ex b/apps/block_scout_web/lib/block_scout_web/plug/redis_cookie.ex
index 53248d6ba810..4d6e9c144199 100644
--- a/apps/block_scout_web/lib/block_scout_web/plug/redis_cookie.ex
+++ b/apps/block_scout_web/lib/block_scout_web/plug/redis_cookie.ex
@@ -192,21 +192,28 @@ defmodule BlockScoutWeb.Plug.RedisCookie do
   defp build_rotating_opts(opts, _), do: Map.put(opts, :rotating_options, [])
 
   defp store_to_redis(cookie) do
-    Redix.command(:redix, ["SET", hash(cookie), 1, "EX", Application.get_env(:block_scout_web, :session_cookie_ttl)])
+    Redix.command(:redix, [
+      "SET",
+      cookie_key(hash(cookie)),
+      1,
+      "EX",
+      Application.get_env(:block_scout_web, :session_cookie_ttl)
+    ])
 
     cookie
   end
 
   defp remove_from_redis(sid) do
-    Redix.command(:redix, ["DEL", sid])
+    Redix.command(:redix, ["DEL", cookie_key(sid)])
   end
 
   defp check_in_redis({sid, map}, _cookie) when is_nil(sid) or map == %{}, do: {nil, %{}}
 
   defp check_in_redis({_sid, session}, cookie) do
     hash = hash(cookie)
+    key = cookie_key(hash)
 
-    case Redix.command(:redix, ["GET", hash]) do
+    case Redix.command(:redix, ["GET", key]) do
       {:ok, one} when one in [1, "1"] ->
         {hash, session}
 
@@ -220,4 +227,14 @@ defmodule BlockScoutWeb.Plug.RedisCookie do
     |> :crypto.hash(cookie)
     |> Base.encode16()
   end
+
+  defp cookie_key(hash) do
+    chain_id = Application.get_env(:block_scout_web, :chain_id)
+
+    if chain_id do
+      chain_id <> "_" <> hash
+    else
+      hash
+    end
+  end
 end
diff --git a/apps/explorer/lib/explorer/third_party_integrations/auth0.ex b/apps/explorer/lib/explorer/third_party_integrations/auth0.ex
index 4afad8845fb0..73385d1e8423 100644
--- a/apps/explorer/lib/explorer/third_party_integrations/auth0.ex
+++ b/apps/explorer/lib/explorer/third_party_integrations/auth0.ex
@@ -1,6 +1,6 @@
 defmodule Explorer.ThirdPartyIntegrations.Auth0 do
   @moduledoc """
-    Module for fetching jwt auth0 Management API (https://auth0.com/docs/api/management/v2) jwt
+    Module for fetching jwt Auth0 Management API (https://auth0.com/docs/api/management/v2) jwt
   """
   @redis_key "auth0"
 
@@ -9,7 +9,10 @@ defmodule Explorer.ThirdPartyIntegrations.Auth0 do
     Firstly it tries to access cached token and if there is no cached one, token will be requested from Auth0
   """
   @spec get_m2m_jwt() :: nil | String.t()
-  def get_m2m_jwt, do: get_m2m_jwt_inner(Redix.command(:redix, ["GET", @redis_key]))
+  def get_m2m_jwt do
+    chain_id = Application.get_env(:block_scout_web, :chain_id)
+    get_m2m_jwt_inner(Redix.command(:redix, ["GET", "#{chain_id}_#{@redis_key}"]))
+  end
 
   def get_m2m_jwt_inner({:ok, token}) when not is_nil(token), do: token
 

From 6dcbc01d4f35c55843e8aee2884f77a6f32ede6b Mon Sep 17 00:00:00 2001
From: Viktor Baranov <baranov.viktor.27@gmail.com>
Date: Tue, 3 Oct 2023 10:30:09 +0300
Subject: [PATCH 475/909] Make cookie_key public function

---
 .../lib/block_scout_web/plug/redis_cookie.ex  | 12 ++---------
 .../third_party_integrations/auth0.ex         | 20 +++++++++++++++----
 2 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/apps/block_scout_web/lib/block_scout_web/plug/redis_cookie.ex b/apps/block_scout_web/lib/block_scout_web/plug/redis_cookie.ex
index 4d6e9c144199..9b42d551d7d1 100644
--- a/apps/block_scout_web/lib/block_scout_web/plug/redis_cookie.ex
+++ b/apps/block_scout_web/lib/block_scout_web/plug/redis_cookie.ex
@@ -7,6 +7,8 @@ defmodule BlockScoutWeb.Plug.RedisCookie do
   require Logger
   @behaviour Plug.Session.Store
 
+  import Explorer.ThirdPartyIntegrations.Auth0, only: [cookie_key: 1]
+
   alias Plug.Crypto
   alias Plug.Crypto.{KeyGenerator, MessageEncryptor, MessageVerifier}
 
@@ -227,14 +229,4 @@ defmodule BlockScoutWeb.Plug.RedisCookie do
     |> :crypto.hash(cookie)
     |> Base.encode16()
   end
-
-  defp cookie_key(hash) do
-    chain_id = Application.get_env(:block_scout_web, :chain_id)
-
-    if chain_id do
-      chain_id <> "_" <> hash
-    else
-      hash
-    end
-  end
 end
diff --git a/apps/explorer/lib/explorer/third_party_integrations/auth0.ex b/apps/explorer/lib/explorer/third_party_integrations/auth0.ex
index 73385d1e8423..2b5c6c67a6c5 100644
--- a/apps/explorer/lib/explorer/third_party_integrations/auth0.ex
+++ b/apps/explorer/lib/explorer/third_party_integrations/auth0.ex
@@ -10,8 +10,7 @@ defmodule Explorer.ThirdPartyIntegrations.Auth0 do
   """
   @spec get_m2m_jwt() :: nil | String.t()
   def get_m2m_jwt do
-    chain_id = Application.get_env(:block_scout_web, :chain_id)
-    get_m2m_jwt_inner(Redix.command(:redix, ["GET", "#{chain_id}_#{@redis_key}"]))
+    get_m2m_jwt_inner(Redix.command(:redix, ["GET", cookie_key(@redis_key)]))
   end
 
   def get_m2m_jwt_inner({:ok, token}) when not is_nil(token), do: token
@@ -43,9 +42,22 @@ defmodule Explorer.ThirdPartyIntegrations.Auth0 do
     end
   end
 
-  defp cache_token(token, ttl) do
+  @doc """
+    Generates key from chain_id and cookie hash for storing in Redis
+  """
+  @spec cookie_key(binary) :: String.t()
+  def cookie_key(hash) do
     chain_id = Application.get_env(:block_scout_web, :chain_id)
-    Redix.command(:redix, ["SET", "#{chain_id}_#{@redis_key}", token, "EX", ttl])
+
+    if chain_id do
+      chain_id <> "_" <> hash
+    else
+      hash
+    end
+  end
+
+  defp cache_token(token, ttl) do
+    Redix.command(:redix, ["SET", cookie_key(@redis_key), token, "EX", ttl])
     token
   end
 end

From 905f1e728e3fac3793eee2ca60c61664269e6665 Mon Sep 17 00:00:00 2001
From: Maxim Filonov <53992153+sl1depengwyn@users.noreply.github.com>
Date: Tue, 26 Sep 2023 00:29:12 +0300
Subject: [PATCH 476/909] Add RSK tracing

---
 CHANGELOG.md                                  |  1 +
 .../views/api/v2/transaction_view.ex          |  8 +-
 apps/ethereum_jsonrpc/lib/ethereum_jsonrpc.ex |  2 +-
 .../lib/ethereum_jsonrpc/geth.ex              | 22 +++--
 .../lib/{ => ethereum_jsonrpc}/rsk.ex         | 12 ++-
 .../lib/ethereum_jsonrpc/rsk/trace.ex         | 21 +++++
 .../lib/ethereum_jsonrpc/rsk/traces.ex        | 16 ++++
 .../lib/ethereum_jsonrpc/trace_block.ex       | 88 +++++++++++++++++++
 .../lib/explorer/chain/transaction.ex         | 20 ++---
 .../indexer/fetcher/internal_transaction.ex   |  3 +-
 docker-compose/envs/common-blockscout.env     |  5 --
 11 files changed, 169 insertions(+), 29 deletions(-)
 rename apps/ethereum_jsonrpc/lib/{ => ethereum_jsonrpc}/rsk.ex (50%)
 create mode 100644 apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/rsk/trace.ex
 create mode 100644 apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/rsk/traces.ex
 create mode 100644 apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/trace_block.ex

diff --git a/CHANGELOG.md b/CHANGELOG.md
index bdba20c840ed..4db84e0032dc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,7 @@
 ### Features
 
 - [#8544](https://github.com/blockscout/blockscout/pull/8544) - Fix `nil` `"structLogs"`
+- [#8542](https://github.com/blockscout/blockscout/pull/8542) - Add tracing for rootstock
 - [#8561](https://github.com/blockscout/blockscout/pull/8561), [#8564](https://github.com/blockscout/blockscout/pull/8564) - Get historical market cap data from CoinGecko
 - [#8386](https://github.com/blockscout/blockscout/pull/8386) - Add `owner_address_hash` to the `token_instances`
 - [#8530](https://github.com/blockscout/blockscout/pull/8530) - Add `block_type` to search results
diff --git a/apps/block_scout_web/lib/block_scout_web/views/api/v2/transaction_view.ex b/apps/block_scout_web/lib/block_scout_web/views/api/v2/transaction_view.ex
index d46e8784c882..6c411e890b86 100644
--- a/apps/block_scout_web/lib/block_scout_web/views/api/v2/transaction_view.ex
+++ b/apps/block_scout_web/lib/block_scout_web/views/api/v2/transaction_view.ex
@@ -640,9 +640,9 @@ defmodule BlockScoutWeb.API.V2.TransactionView do
     tx_types(tx, types, :rootstock_remasc)
   end
 
-  defp tx_types(%Transaction{to_address_hash: to_address_hash} = tx, types, :rootstock_remasc) do
+  defp tx_types(tx, types, :rootstock_remasc) do
     types =
-      if to_address_hash && to_address_hash == Transaction.rootstock_remasc_address_hash() do
+      if Transaction.is_rootstock_remasc_transaction(tx) do
         [:rootstock_remasc | types]
       else
         types
@@ -651,8 +651,8 @@ defmodule BlockScoutWeb.API.V2.TransactionView do
     tx_types(tx, types, :rootstock_bridge)
   end
 
-  defp tx_types(%Transaction{to_address_hash: to_address_hash}, types, :rootstock_bridge) do
-    if to_address_hash && to_address_hash == Transaction.rootstock_bridge_address_hash() do
+  defp tx_types(tx, types, :rootstock_bridge) do
+    if Transaction.is_rootstock_bridge_transaction(tx) do
       [:rootstock_bridge | types]
     else
       types
diff --git a/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc.ex b/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc.ex
index 6695c41b8618..062a85e41aca 100644
--- a/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc.ex
+++ b/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc.ex
@@ -386,7 +386,7 @@ defmodule EthereumJSONRPC do
   @doc """
   Assigns an id to each set of params in `params_list` for batch request-response correlation
   """
-  @spec id_to_params([params]) :: %{id => params} when id: non_neg_integer(), params: map()
+  @spec id_to_params([params]) :: %{id => params} when id: non_neg_integer(), params: any()
   def id_to_params(params_list) do
     params_list
     |> Stream.with_index()
diff --git a/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/geth.ex b/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/geth.ex
index afed3883f412..4d864336f50c 100644
--- a/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/geth.ex
+++ b/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/geth.ex
@@ -93,20 +93,20 @@ defmodule EthereumJSONRPC.Geth do
       Application.get_env(:ethereum_jsonrpc, __MODULE__)[:debug_trace_transaction_timeout]
 
     tracer =
-      case Application.get_env(:ethereum_jsonrpc, __MODULE__)[:tracer] do
-        "js" ->
+      cond do
+        tracer_type() == "js" ->
           %{"tracer" => @tracer}
 
-        "call_tracer" ->
-          %{"tracer" => "callTracer"}
-
-        _ ->
+        tracer_type() in ~w(opcode polygon_edge) ->
           %{
             "enableMemory" => true,
             "disableStack" => false,
             "disableStorage" => true,
             "enableReturnData" => false
           }
+
+        true ->
+          %{"tracer" => "callTracer"}
       end
 
     request(%{
@@ -122,6 +122,12 @@ defmodule EthereumJSONRPC.Geth do
          json_rpc_named_arguments
        )
        when is_map(id_to_params) do
+    if tracer_type() not in ["opcode", "polygon_edge"] do
+      Logger.warning(
+        "structLogs found in debug_traceTransaction response, you should probably change your INDEXER_INTERNAL_TRANSACTIONS_TRACER_TYPE env value"
+      )
+    end
+
     with {:ok, receipts} <-
            id_to_params
            |> Enum.map(fn {id, %{hash_data: hash_data}} ->
@@ -362,4 +368,8 @@ defmodule EthereumJSONRPC.Geth do
   defp finalize_internal_transactions_params({:error, acc_reasons}) do
     {:error, Enum.reverse(acc_reasons)}
   end
+
+  defp tracer_type do
+    Application.get_env(:ethereum_jsonrpc, __MODULE__)[:tracer]
+  end
 end
diff --git a/apps/ethereum_jsonrpc/lib/rsk.ex b/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/rsk.ex
similarity index 50%
rename from apps/ethereum_jsonrpc/lib/rsk.ex
rename to apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/rsk.ex
index 85d8267d0438..e0d1eeda0fce 100644
--- a/apps/ethereum_jsonrpc/lib/rsk.ex
+++ b/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/rsk.ex
@@ -3,11 +3,19 @@ defmodule EthereumJSONRPC.RSK do
   Ethereum JSONRPC methods that are/are not supported by [RSK](https://www.rsk.co/).
   """
 
+  alias EthereumJSONRPC.RSK.Traces
+  alias EthereumJSONRPC.TraceBlock
+
   @behaviour EthereumJSONRPC.Variant
 
-  def fetch_internal_transactions(_, _), do: :ignore
+  def fetch_internal_transactions(_transaction_params, _json_rpc_named_arguments), do: :ignore
+
   def fetch_pending_transactions(_), do: :ignore
-  def fetch_block_internal_transactions(_block_numbers, _json_rpc_named_arguments), do: :ignore
+
+  def fetch_block_internal_transactions(block_numbers, json_rpc_named_arguments) do
+    TraceBlock.fetch_block_internal_transactions(block_numbers, json_rpc_named_arguments, Traces)
+  end
+
   def fetch_beneficiaries(_, _), do: :ignore
   def fetch_first_trace(_transactions_params, _json_rpc_named_arguments), do: :ignore
 end
diff --git a/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/rsk/trace.ex b/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/rsk/trace.ex
new file mode 100644
index 000000000000..3a765132493e
--- /dev/null
+++ b/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/rsk/trace.ex
@@ -0,0 +1,21 @@
+defmodule EthereumJSONRPC.RSK.Trace do
+  @moduledoc """
+  Trace returned by
+  [`trace_block`](https://dev.rootstock.io/rsk/node/architecture/json-rpc/#json-rpc-supported).
+  """
+
+  alias EthereumJSONRPC.Besu.Trace, as: BesuTrace
+  alias EthereumJSONRPC.Nethermind.Trace, as: NethermindTrace
+
+  def elixir_to_params(elixir) do
+    NethermindTrace.elixir_to_params(elixir)
+  end
+
+  def to_elixir(trace) do
+    {transaction_index, trace_no_tp} = Map.pop(trace, "transactionPosition")
+
+    trace_no_tp
+    |> Map.put("transactionIndex", transaction_index)
+    |> BesuTrace.to_elixir()
+  end
+end
diff --git a/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/rsk/traces.ex b/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/rsk/traces.ex
new file mode 100644
index 000000000000..f74eef343c58
--- /dev/null
+++ b/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/rsk/traces.ex
@@ -0,0 +1,16 @@
+defmodule EthereumJSONRPC.RSK.Traces do
+  @moduledoc """
+  Traces returned by
+  [`trace_block`](https://dev.rootstock.io/rsk/node/architecture/json-rpc/#json-rpc-supported).
+  """
+
+  alias EthereumJSONRPC.RSK.Trace
+
+  def elixir_to_params(elixir) when is_list(elixir) do
+    Enum.map(elixir, &Trace.elixir_to_params/1)
+  end
+
+  def to_elixir(traces) when is_list(traces) do
+    Enum.map(traces, &Trace.to_elixir/1)
+  end
+end
diff --git a/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/trace_block.ex b/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/trace_block.ex
new file mode 100644
index 000000000000..afda8dc6ff25
--- /dev/null
+++ b/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/trace_block.ex
@@ -0,0 +1,88 @@
+defmodule EthereumJSONRPC.TraceBlock do
+  @moduledoc """
+  Functions for processing the data from `trace_block` JSON RPC method.
+  """
+
+  import EthereumJSONRPC, only: [id_to_params: 1, integer_to_quantity: 1, json_rpc: 2, request: 1]
+
+  @spec fetch_block_internal_transactions(
+          [non_neg_integer()],
+          EthereumJSONRPC.json_rpc_named_arguments(),
+          EthereumJSONRPC.RSK.Traces
+        ) :: {:error, any} | {:ok, any}
+  def fetch_block_internal_transactions(block_numbers, json_rpc_named_arguments, traces_module) do
+    id_to_params = id_to_params(block_numbers)
+
+    with {:ok, responses} <-
+           id_to_params
+           |> trace_block_requests()
+           |> json_rpc(json_rpc_named_arguments) do
+      trace_block_responses_to_internal_transactions_params(responses, id_to_params, traces_module)
+    end
+  end
+
+  defp trace_block_requests(id_to_params) when is_map(id_to_params) do
+    Enum.map(id_to_params, fn {id, block_number} ->
+      trace_block_request(%{id: id, block_number: block_number})
+    end)
+  end
+
+  defp trace_block_request(%{id: id, block_number: block_number}) do
+    request(%{id: id, method: "trace_block", params: [integer_to_quantity(block_number)]})
+  end
+
+  defp trace_block_responses_to_internal_transactions_params(responses, id_to_params, traces_module) do
+    with {:ok, traces} <- trace_block_responses_to_traces(responses, id_to_params) do
+      params =
+        traces
+        |> traces_module.to_elixir()
+        |> traces_module.elixir_to_params()
+
+      {:ok, params}
+    end
+  end
+
+  defp trace_block_responses_to_traces(responses, id_to_params) do
+    responses
+    |> EthereumJSONRPC.sanitize_responses(id_to_params)
+    |> Enum.map(&trace_block_response_to_traces(&1, id_to_params))
+    |> Enum.group_by(&elem(&1, 0), &elem(&1, 1))
+    |> case do
+      %{error: reasons} ->
+        {:error, reasons}
+
+      %{ok: traces_list} ->
+        traces =
+          traces_list
+          |> List.flatten()
+
+        {:ok, traces}
+    end
+  end
+
+  defp trace_block_response_to_traces(%{result: results}, _id_to_params)
+       when is_list(results) do
+    annotated_traces =
+      results
+      |> Enum.scan(%{"index" => -1}, fn trace, %{"index" => internal_transaction_index} ->
+        internal_transaction_index = if trace["traceAddress"] == [], do: 0, else: internal_transaction_index + 1
+
+        trace
+        |> Map.put("index", internal_transaction_index)
+      end)
+
+    {:ok, annotated_traces}
+  end
+
+  defp trace_block_response_to_traces(%{id: id, error: error}, id_to_params)
+       when is_map(id_to_params) do
+    block_number = Map.fetch!(id_to_params, id)
+
+    annotated_error =
+      Map.put(error, :data, %{
+        "blockNumber" => block_number
+      })
+
+    {:error, annotated_error}
+  end
+end
diff --git a/apps/explorer/lib/explorer/chain/transaction.ex b/apps/explorer/lib/explorer/chain/transaction.ex
index 5636f38414e5..6547a5add0bc 100644
--- a/apps/explorer/lib/explorer/chain/transaction.ex
+++ b/apps/explorer/lib/explorer/chain/transaction.ex
@@ -1004,24 +1004,24 @@ defmodule Explorer.Chain.Transaction do
   end
 
   @doc """
-  Get rootstock REMASC address if env is set and valid, nil otherwise.
+  Returns true if the transaction is a Rootstock REMASC transaction.
   """
-  @spec rootstock_remasc_address_hash :: nil | Explorer.Chain.Hash.t()
-  def rootstock_remasc_address_hash do
+  @spec is_rootstock_remasc_transaction(Explorer.Chain.Transaction.t()) :: boolean
+  def is_rootstock_remasc_transaction(%__MODULE__{to_address_hash: to_address_hash}) do
     case Hash.Address.cast(Application.get_env(:explorer, __MODULE__)[:rootstock_remasc_address]) do
-      {:ok, address} -> address
-      _ -> nil
+      {:ok, address} -> address == to_address_hash
+      _ -> false
     end
   end
 
   @doc """
-  Get rootstock bridge address if env is set and valid, nil otherwise.
+  Returns true if the transaction is a Rootstock bridge transaction.
   """
-  @spec rootstock_bridge_address_hash :: nil | Explorer.Chain.Hash.t()
-  def rootstock_bridge_address_hash do
+  @spec is_rootstock_bridge_transaction(Explorer.Chain.Transaction.t()) :: boolean
+  def is_rootstock_bridge_transaction(%__MODULE__{to_address_hash: to_address_hash}) do
     case Hash.Address.cast(Application.get_env(:explorer, __MODULE__)[:rootstock_bridge_address]) do
-      {:ok, address} -> address
-      _ -> nil
+      {:ok, address} -> address == to_address_hash
+      _ -> false
     end
   end
 end
diff --git a/apps/indexer/lib/indexer/fetcher/internal_transaction.ex b/apps/indexer/lib/indexer/fetcher/internal_transaction.ex
index 3f3afcf07f52..32aa6483f116 100644
--- a/apps/indexer/lib/indexer/fetcher/internal_transaction.ex
+++ b/apps/indexer/lib/indexer/fetcher/internal_transaction.ex
@@ -111,7 +111,8 @@ defmodule Indexer.Fetcher.InternalTransaction do
     json_rpc_named_arguments
     |> Keyword.fetch!(:variant)
     |> case do
-      variant when variant in [EthereumJSONRPC.Nethermind, EthereumJSONRPC.Erigon, EthereumJSONRPC.Besu] ->
+      variant
+      when variant in [EthereumJSONRPC.Nethermind, EthereumJSONRPC.Erigon, EthereumJSONRPC.Besu, EthereumJSONRPC.RSK] ->
         EthereumJSONRPC.fetch_block_internal_transactions(filtered_unique_numbers, json_rpc_named_arguments)
 
       _ ->
diff --git a/docker-compose/envs/common-blockscout.env b/docker-compose/envs/common-blockscout.env
index f56c4de54aa3..673a6a7af635 100644
--- a/docker-compose/envs/common-blockscout.env
+++ b/docker-compose/envs/common-blockscout.env
@@ -144,11 +144,6 @@ INDEXER_DISABLE_INTERNAL_TRANSACTIONS_FETCHER=false
 # INDEXER_COIN_BALANCES_FETCHER_INIT_QUERY_LIMIT=
 # INDEXER_DISABLE_WITHDRAWALS_FETCHER=
 # WITHDRAWALS_FIRST_BLOCK=
-# INDEXER_DISABLE_ROOTSTOCK_DATA_FETCHER=
-# INDEXER_ROOTSTOCK_DATA_FETCHER_INTERVAL=
-# INDEXER_ROOTSTOCK_DATA_FETCHER_BATCH_SIZE=
-# INDEXER_ROOTSTOCK_DATA_FETCHER_CONCURRENCY=
-# INDEXER_ROOTSTOCK_DATA_FETCHER_DB_BATCH_SIZE=
 # ROOTSTOCK_REMASC_ADDRESS=
 # ROOTSTOCK_BRIDGE_ADDRESS=
 # TOKEN_ID_MIGRATION_FIRST_BLOCK=

From 95583bf8af96df48ee29750bc958bd4376e0e391 Mon Sep 17 00:00:00 2001
From: Viktor Baranov <baranov.viktor.27@gmail.com>
Date: Wed, 4 Oct 2023 11:54:52 +0300
Subject: [PATCH 477/909] Public IPFS gateway URL for frontend

---
 CHANGELOG.md                                               | 2 +-
 .../lib/block_scout_web/views/nft_helper.ex                | 7 +------
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9c5d3c45157f..84566d651870 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -23,7 +23,7 @@
 ### Chore
 
 - [#8584](https://github.com/blockscout/blockscout/pull/8584) - Store chain together with cookie hash in Redis
-- [#8579](https://github.com/blockscout/blockscout/pull/8579) - IPFS gateway URL runtime env variable
+- [#8579](https://github.com/blockscout/blockscout/pull/8579), [#8590](https://github.com/blockscout/blockscout/pull/8590) - IPFS gateway URL runtime env variable
 - [#8573](https://github.com/blockscout/blockscout/pull/8573) - Update Nginx to proxy all frontend paths
 - [#8290](https://github.com/blockscout/blockscout/pull/8290) - Update Chromedriver version
 - [#8536](https://github.com/blockscout/blockscout/pull/8536), [#8537](https://github.com/blockscout/blockscout/pull/8537), [#8540](https://github.com/blockscout/blockscout/pull/8540), [#8557](https://github.com/blockscout/blockscout/pull/8557) - New issue template
diff --git a/apps/block_scout_web/lib/block_scout_web/views/nft_helper.ex b/apps/block_scout_web/lib/block_scout_web/views/nft_helper.ex
index ac4de5f378f7..a998729ebbd7 100644
--- a/apps/block_scout_web/lib/block_scout_web/views/nft_helper.ex
+++ b/apps/block_scout_web/lib/block_scout_web/views/nft_helper.ex
@@ -82,11 +82,6 @@ defmodule BlockScoutWeb.NFTHelper do
   defp ipfs_link(image_url, prefix) do
     ipfs_uid = String.slice(image_url, String.length(prefix)..-1)
 
-    ipfs_gateway_url =
-      :indexer
-      |> Application.get_env(:ipfs_gateway_url)
-      |> String.trim_trailing("/")
-
-    ipfs_gateway_url <> "/" <> ipfs_uid
+    "https://ipfs.io/ipfs/" <> ipfs_uid
   end
 end

From ae8c7f8914fa2d1ce62ef9558b3b5d251542f2a6 Mon Sep 17 00:00:00 2001
From: Nikita Pozdniakov <nikitosing4@mail.ru>
Date: Sun, 17 Sep 2023 14:12:13 +0300
Subject: [PATCH 478/909] Integrate /api/v2/bytecodes/sources:search-all of
 eth_bytecode_db

---
 CHANGELOG.md                                  |   1 +
 .../api/v2/smart_contract_controller.ex       |   4 +-
 .../api/v2/smart_contract_controller_test.exs | 311 +++++++++++++++++-
 ..._db_search_all_local_sources_response.json |  59 ++++
 ..._search_all_sourcify_sources_response.json |  30 ++
 ...l_sourcify_sources_with_libs_response.json |  47 +++
 apps/explorer/lib/explorer/application.ex     |   7 +-
 ...ook_up_smart_contract_sources_on_demand.ex |  97 ++++--
 .../lib/explorer/chain/smart_contract.ex      |  12 +
 .../eth_bytecode_db_interface.ex              |  44 ++-
 .../lib/explorer/smart_contract/helper.ex     |  12 +-
 .../rust_verifier_interface_behaviour.ex      |   2 +-
 .../smart_contract/solidity/publish_helper.ex |  33 +-
 .../smart_contract/solidity/publisher.ex      |   3 +-
 apps/explorer/test/explorer/chain_test.exs    |   8 +-
 config/runtime.exs                            |  13 +-
 docker-compose/envs/common-blockscout.env     |   1 +
 17 files changed, 620 insertions(+), 64 deletions(-)
 create mode 100644 apps/block_scout_web/test/support/fixture/smart_contract/eth_bytecode_db_search_all_local_sources_response.json
 create mode 100644 apps/block_scout_web/test/support/fixture/smart_contract/eth_bytecode_db_search_all_sourcify_sources_response.json
 create mode 100644 apps/block_scout_web/test/support/fixture/smart_contract/eth_bytecode_db_search_all_sourcify_sources_with_libs_response.json

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 84566d651870..3b126b20ce56 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,7 @@
 
 ### Features
 
+- [#8472](https://github.com/blockscout/blockscout/pull/8472) - Integrate `/api/v2/bytecodes/sources:search-all` of `eth_bytecode_db`
 - [#8544](https://github.com/blockscout/blockscout/pull/8544) - Fix `nil` `"structLogs"`
 - [#8561](https://github.com/blockscout/blockscout/pull/8561), [#8564](https://github.com/blockscout/blockscout/pull/8564) - Get historical market cap data from CoinGecko
 - [#8386](https://github.com/blockscout/blockscout/pull/8386) - Add `owner_address_hash` to the `token_instances`
diff --git a/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/smart_contract_controller.ex b/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/smart_contract_controller.ex
index 7002858350ba..fa4b48b5d7f8 100644
--- a/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/smart_contract_controller.ex
+++ b/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/smart_contract_controller.ex
@@ -14,7 +14,6 @@ defmodule BlockScoutWeb.API.V2.SmartContractController do
   alias Explorer.Chain
   alias Explorer.Chain.SmartContract
   alias Explorer.SmartContract.{Reader, Writer}
-  alias Explorer.SmartContract.Solidity.PublishHelper
 
   @smart_contract_address_options [
     necessity_by_association: %{
@@ -32,9 +31,8 @@ defmodule BlockScoutWeb.API.V2.SmartContractController do
   def smart_contract(conn, %{"address_hash" => address_hash_string} = params) do
     with {:format, {:ok, address_hash}} <- {:format, Chain.string_to_address_hash(address_hash_string)},
          {:ok, false} <- AccessHelper.restricted_access?(address_hash_string, params),
-         _ <- PublishHelper.check_and_verify(address_hash_string),
          {:not_found, {:ok, address}} <-
-           {:not_found, Chain.find_contract_address(address_hash, @smart_contract_address_options, true)} do
+           {:not_found, Chain.find_contract_address(address_hash, @smart_contract_address_options, false)} do
       conn
       |> put_status(200)
       |> render(:smart_contract, %{address: address})
diff --git a/apps/block_scout_web/test/block_scout_web/controllers/api/v2/smart_contract_controller_test.exs b/apps/block_scout_web/test/block_scout_web/controllers/api/v2/smart_contract_controller_test.exs
index 6799c10396db..e93544ea64c8 100644
--- a/apps/block_scout_web/test/block_scout_web/controllers/api/v2/smart_contract_controller_test.exs
+++ b/apps/block_scout_web/test/block_scout_web/controllers/api/v2/smart_contract_controller_test.exs
@@ -303,9 +303,14 @@ defmodule BlockScoutWeb.API.V2.SmartContractControllerTest do
 
       assert correct_response == response
     end
+  end
 
-    test "automatically verify contract via Eth Bytecode Interface", %{conn: conn} do
+  describe "/smart-contracts/{address_hash} <> eth_bytecode_db" do
+    test "automatically verify contract", %{conn: conn} do
       {:ok, pid} = Explorer.Chain.Fetcher.LookUpSmartContractSourcesOnDemand.start_link([])
+      old_chain_id = Application.get_env(:block_scout_web, :chain_id)
+
+      Application.put_env(:block_scout_web, :chain_id, 5)
 
       bypass = Bypass.open()
       eth_bytecode_response = File.read!("./test/support/fixture/smart_contract/eth_bytecode_db_search_response.json")
@@ -333,7 +338,77 @@ defmodule BlockScoutWeb.API.V2.SmartContractControllerTest do
         |> socket("no_id", %{})
         |> subscribe_and_join(topic)
 
-      Bypass.expect_once(bypass, "POST", "/api/v2/bytecodes/sources:search", fn conn ->
+      Bypass.expect_once(bypass, "POST", "/api/v2/bytecodes/sources_search_all", fn conn ->
+        Conn.resp(conn, 200, eth_bytecode_response)
+      end)
+
+      request = get(conn, "/api/v2/smart-contracts/#{Address.checksum(address.hash)}")
+
+      assert_receive %Phoenix.Socket.Message{
+                       payload: %{},
+                       event: "smart_contract_was_verified",
+                       topic: ^topic
+                     },
+                     :timer.seconds(1)
+
+      response = json_response(request, 200)
+
+      assert response ==
+               %{
+                 "is_self_destructed" => false,
+                 "deployed_bytecode" => to_string(address.contract_code),
+                 "creation_bytecode" =>
+                   "0x608060405234801561001057600080fd5b5060df8061001f6000396000f3006080604052600436106049576000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff16806360fe47b114604e5780636d4ce63c146078575b600080fd5b348015605957600080fd5b5060766004803603810190808035906020019092919050505060a0565b005b348015608357600080fd5b50608a60aa565b6040518082815260200191505060405180910390f35b8060008190555050565b600080549050905600a165627a7a7230582061b7676067d537e410bb704932a9984739a959416170ea17bda192ac1218d2790029"
+               }
+
+      request = get(conn, "/api/v2/smart-contracts/#{Address.checksum(address.hash)}")
+      assert response = json_response(request, 200)
+      assert %{"is_verified" => true} = response
+      assert %{"is_verified_via_eth_bytecode_db" => true} = response
+      assert %{"is_partially_verified" => true} = response
+      assert %{"is_fully_verified" => false} = response
+
+      Application.put_env(:block_scout_web, :chain_id, old_chain_id)
+      Application.put_env(:explorer, Explorer.SmartContract.RustVerifierInterfaceBehaviour, old_env)
+      Bypass.down(bypass)
+      GenServer.stop(pid)
+    end
+
+    test "automatically verify contract using search-all (ethBytecodeDbSources) endpoint", %{conn: conn} do
+      {:ok, pid} = Explorer.Chain.Fetcher.LookUpSmartContractSourcesOnDemand.start_link([])
+      old_chain_id = Application.get_env(:block_scout_web, :chain_id)
+
+      Application.put_env(:block_scout_web, :chain_id, 5)
+
+      bypass = Bypass.open()
+
+      eth_bytecode_response =
+        File.read!("./test/support/fixture/smart_contract/eth_bytecode_db_search_all_local_sources_response.json")
+
+      old_env = Application.get_env(:explorer, Explorer.SmartContract.RustVerifierInterfaceBehaviour)
+
+      Application.put_env(:explorer, Explorer.SmartContract.RustVerifierInterfaceBehaviour,
+        service_url: "http://localhost:#{bypass.port}",
+        enabled: true
+      )
+
+      address = insert(:contract_address)
+
+      insert(:transaction,
+        created_contract_address_hash: address.hash,
+        input:
+          "0x608060405234801561001057600080fd5b5060df8061001f6000396000f3006080604052600436106049576000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff16806360fe47b114604e5780636d4ce63c146078575b600080fd5b348015605957600080fd5b5060766004803603810190808035906020019092919050505060a0565b005b348015608357600080fd5b50608a60aa565b6040518082815260200191505060405180910390f35b8060008190555050565b600080549050905600a165627a7a7230582061b7676067d537e410bb704932a9984739a959416170ea17bda192ac1218d2790029"
+      )
+      |> with_block()
+
+      topic = "addresses:#{address.hash}"
+
+      {:ok, _reply, _socket} =
+        BlockScoutWeb.UserSocketV2
+        |> socket("no_id", %{})
+        |> subscribe_and_join(topic)
+
+      Bypass.expect_once(bypass, "POST", "/api/v2/bytecodes/sources_search_all", fn conn ->
         Conn.resp(conn, 200, eth_bytecode_response)
       end)
 
@@ -363,13 +438,236 @@ defmodule BlockScoutWeb.API.V2.SmartContractControllerTest do
       assert %{"is_partially_verified" => true} = response
       assert %{"is_fully_verified" => false} = response
 
+      smart_contract = Jason.decode!(eth_bytecode_response)["ethBytecodeDbSources"] |> List.first()
+      assert response["compiler_settings"] == Jason.decode!(smart_contract["compilerSettings"])
+      assert response["name"] == smart_contract["contractName"]
+      assert response["compiler_version"] == smart_contract["compilerVersion"]
+      assert response["file_path"] == smart_contract["fileName"]
+      assert response["constructor_args"] == smart_contract["constructorArguments"]
+      assert response["abi"] == Jason.decode!(smart_contract["abi"])
+
+      assert response["decoded_constructor_args"] == [
+               [
+                 "0xc35dadb65012ec5796536bd9864ed8773abc74c4",
+                 %{
+                   "internalType" => "address",
+                   "name" => "_factory",
+                   "type" => "address"
+                 }
+               ],
+               [
+                 "0xb4fbf271143f4fbf7b91a5ded31805e42b2208d6",
+                 %{
+                   "internalType" => "address",
+                   "name" => "_WETH",
+                   "type" => "address"
+                 }
+               ]
+             ]
+
+      assert response["source_code"] == smart_contract["sourceFiles"][smart_contract["fileName"]]
+
+      assert response["external_libraries"] == [
+               %{
+                 "address_hash" => "0x00000000D41867734BBee4C6863D9255b2b06aC1",
+                 "name" => "__CACHE_BREAKER__"
+               }
+             ]
+
+      additional_sources =
+        for file_name <- Map.keys(smart_contract["sourceFiles"]), smart_contract["fileName"] != file_name do
+          %{
+            "source_code" => smart_contract["sourceFiles"][file_name],
+            "file_path" => file_name
+          }
+        end
+
+      assert response["additional_sources"] |> Enum.sort_by(fn x -> x["file_path"] end) ==
+               additional_sources |> Enum.sort_by(fn x -> x["file_path"] end)
+
+      Application.put_env(:block_scout_web, :chain_id, old_chain_id)
       Application.put_env(:explorer, Explorer.SmartContract.RustVerifierInterfaceBehaviour, old_env)
       Bypass.down(bypass)
       GenServer.stop(pid)
     end
 
-    test "check fetch interval for LookUpSmartContractSourcesOnDemand", %{conn: conn} do
+    test "automatically verify contract using search-all (sourcifySources) endpoint", %{conn: conn} do
       {:ok, pid} = Explorer.Chain.Fetcher.LookUpSmartContractSourcesOnDemand.start_link([])
+      old_chain_id = Application.get_env(:block_scout_web, :chain_id)
+
+      Application.put_env(:block_scout_web, :chain_id, 5)
+
+      bypass = Bypass.open()
+
+      eth_bytecode_response =
+        File.read!("./test/support/fixture/smart_contract/eth_bytecode_db_search_all_sourcify_sources_response.json")
+
+      old_env = Application.get_env(:explorer, Explorer.SmartContract.RustVerifierInterfaceBehaviour)
+
+      Application.put_env(:explorer, Explorer.SmartContract.RustVerifierInterfaceBehaviour,
+        service_url: "http://localhost:#{bypass.port}",
+        enabled: true
+      )
+
+      address = insert(:contract_address)
+
+      insert(:transaction,
+        created_contract_address_hash: address.hash,
+        input:
+          "0x608060405234801561001057600080fd5b5060df8061001f6000396000f3006080604052600436106049576000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff16806360fe47b114604e5780636d4ce63c146078575b600080fd5b348015605957600080fd5b5060766004803603810190808035906020019092919050505060a0565b005b348015608357600080fd5b50608a60aa565b6040518082815260200191505060405180910390f35b8060008190555050565b600080549050905600a165627a7a7230582061b7676067d537e410bb704932a9984739a959416170ea17bda192ac1218d2790029"
+      )
+      |> with_block()
+
+      topic = "addresses:#{address.hash}"
+
+      {:ok, _reply, _socket} =
+        BlockScoutWeb.UserSocketV2
+        |> socket("no_id", %{})
+        |> subscribe_and_join(topic)
+
+      Bypass.expect_once(bypass, "POST", "/api/v2/bytecodes/sources_search_all", fn conn ->
+        Conn.resp(conn, 200, eth_bytecode_response)
+      end)
+
+      request = get(conn, "/api/v2/smart-contracts/#{Address.checksum(address.hash)}")
+
+      assert_receive %Phoenix.Socket.Message{
+                       payload: %{},
+                       event: "smart_contract_was_verified",
+                       topic: ^topic
+                     },
+                     :timer.seconds(1)
+
+      response = json_response(request, 200)
+
+      assert response ==
+               %{
+                 "is_self_destructed" => false,
+                 "deployed_bytecode" => to_string(address.contract_code),
+                 "creation_bytecode" =>
+                   "0x608060405234801561001057600080fd5b5060df8061001f6000396000f3006080604052600436106049576000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff16806360fe47b114604e5780636d4ce63c146078575b600080fd5b348015605957600080fd5b5060766004803603810190808035906020019092919050505060a0565b005b348015608357600080fd5b50608a60aa565b6040518082815260200191505060405180910390f35b8060008190555050565b600080549050905600a165627a7a7230582061b7676067d537e410bb704932a9984739a959416170ea17bda192ac1218d2790029"
+               }
+
+      request = get(conn, "/api/v2/smart-contracts/#{Address.checksum(address.hash)}")
+      assert response = json_response(request, 200)
+      assert %{"is_verified" => true} = response
+      assert %{"is_verified_via_eth_bytecode_db" => true} = response
+      assert %{"is_verified_via_sourcify" => true} = response
+      assert %{"is_partially_verified" => true} = response
+      assert %{"is_fully_verified" => false} = response
+      assert response["file_path"] == "Test.sol"
+
+      Application.put_env(:block_scout_web, :chain_id, old_chain_id)
+      Application.put_env(:explorer, Explorer.SmartContract.RustVerifierInterfaceBehaviour, old_env)
+      Bypass.down(bypass)
+      GenServer.stop(pid)
+    end
+
+    test "automatically verify contract using search-all (sourcifySources with libraries) endpoint", %{conn: conn} do
+      {:ok, pid} = Explorer.Chain.Fetcher.LookUpSmartContractSourcesOnDemand.start_link([])
+      old_chain_id = Application.get_env(:block_scout_web, :chain_id)
+
+      Application.put_env(:block_scout_web, :chain_id, 5)
+
+      bypass = Bypass.open()
+
+      eth_bytecode_response =
+        File.read!(
+          "./test/support/fixture/smart_contract/eth_bytecode_db_search_all_sourcify_sources_with_libs_response.json"
+        )
+
+      old_env = Application.get_env(:explorer, Explorer.SmartContract.RustVerifierInterfaceBehaviour)
+
+      Application.put_env(:explorer, Explorer.SmartContract.RustVerifierInterfaceBehaviour,
+        service_url: "http://localhost:#{bypass.port}",
+        enabled: true
+      )
+
+      address = insert(:contract_address)
+
+      insert(:transaction,
+        created_contract_address_hash: address.hash,
+        input:
+          "0x608060405234801561001057600080fd5b5060df8061001f6000396000f3006080604052600436106049576000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff16806360fe47b114604e5780636d4ce63c146078575b600080fd5b348015605957600080fd5b5060766004803603810190808035906020019092919050505060a0565b005b348015608357600080fd5b50608a60aa565b6040518082815260200191505060405180910390f35b8060008190555050565b600080549050905600a165627a7a7230582061b7676067d537e410bb704932a9984739a959416170ea17bda192ac1218d2790029"
+      )
+      |> with_block()
+
+      topic = "addresses:#{address.hash}"
+
+      {:ok, _reply, _socket} =
+        BlockScoutWeb.UserSocketV2
+        |> socket("no_id", %{})
+        |> subscribe_and_join(topic)
+
+      Bypass.expect_once(bypass, "POST", "/api/v2/bytecodes/sources_search_all", fn conn ->
+        Conn.resp(conn, 200, eth_bytecode_response)
+      end)
+
+      request = get(conn, "/api/v2/smart-contracts/#{Address.checksum(address.hash)}")
+
+      assert_receive %Phoenix.Socket.Message{
+                       payload: %{},
+                       event: "smart_contract_was_verified",
+                       topic: ^topic
+                     },
+                     :timer.seconds(1)
+
+      response = json_response(request, 200)
+
+      assert response ==
+               %{
+                 "is_self_destructed" => false,
+                 "deployed_bytecode" => to_string(address.contract_code),
+                 "creation_bytecode" =>
+                   "0x608060405234801561001057600080fd5b5060df8061001f6000396000f3006080604052600436106049576000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff16806360fe47b114604e5780636d4ce63c146078575b600080fd5b348015605957600080fd5b5060766004803603810190808035906020019092919050505060a0565b005b348015608357600080fd5b50608a60aa565b6040518082815260200191505060405180910390f35b8060008190555050565b600080549050905600a165627a7a7230582061b7676067d537e410bb704932a9984739a959416170ea17bda192ac1218d2790029"
+               }
+
+      request = get(conn, "/api/v2/smart-contracts/#{Address.checksum(address.hash)}")
+      assert response = json_response(request, 200)
+
+      smart_contract = Jason.decode!(eth_bytecode_response)["sourcifySources"] |> List.first()
+
+      assert %{"is_verified" => true} = response
+      assert %{"is_verified_via_eth_bytecode_db" => true} = response
+      assert %{"is_verified_via_sourcify" => true} = response
+      assert %{"is_partially_verified" => true} = response
+      assert %{"is_fully_verified" => false} = response
+      assert response["file_path"] == "src/zkbob/ZkBobPool.sol"
+
+      assert response["external_libraries"] == [
+               %{
+                 "address_hash" => "0x22DE6B06544Ee5Cd907813a04bcdEd149A2f49D2",
+                 "name" => "lib/base58-solidity/contracts/Base58.sol:Base58"
+               },
+               %{
+                 "address_hash" => "0x019d3788F00a7087234f3844CB1ceCe1F9982B7A",
+                 "name" => "src/libraries/ZkAddress.sol:ZkAddress"
+               }
+             ]
+
+      additional_sources =
+        for file_name <- Map.keys(smart_contract["sourceFiles"]), smart_contract["fileName"] != file_name do
+          %{
+            "source_code" => smart_contract["sourceFiles"][file_name],
+            "file_path" => file_name
+          }
+        end
+
+      assert response["additional_sources"] |> Enum.sort_by(fn x -> x["file_path"] end) ==
+               additional_sources |> Enum.sort_by(fn x -> x["file_path"] end)
+
+      Application.put_env(:block_scout_web, :chain_id, old_chain_id)
+      Application.put_env(:explorer, Explorer.SmartContract.RustVerifierInterfaceBehaviour, old_env)
+      Bypass.down(bypass)
+      GenServer.stop(pid)
+    end
+
+    test "check fetch interval for LookUpSmartContractSourcesOnDemand and use sources:search endpoint since chain_id is unset",
+         %{conn: conn} do
+      {:ok, pid} = Explorer.Chain.Fetcher.LookUpSmartContractSourcesOnDemand.start_link([])
+      old_chain_id = Application.get_env(:block_scout_web, :chain_id)
+
+      Application.put_env(:block_scout_web, :chain_id, nil)
 
       bypass = Bypass.open()
       address = insert(:contract_address)
@@ -392,7 +690,7 @@ defmodule BlockScoutWeb.API.V2.SmartContractControllerTest do
 
       Application.put_env(:explorer, Explorer.Chain.Fetcher.LookUpSmartContractSourcesOnDemand, fetch_interval: 0)
 
-      Bypass.expect_once(bypass, "POST", "/api/v2/bytecodes/sources:search", fn conn ->
+      Bypass.expect_once(bypass, "POST", "/api/v2/bytecodes/sources_search", fn conn ->
         Conn.resp(conn, 200, "{\"sources\": []}")
       end)
 
@@ -400,7 +698,7 @@ defmodule BlockScoutWeb.API.V2.SmartContractControllerTest do
 
       :timer.sleep(10)
 
-      Bypass.expect_once(bypass, "POST", "/api/v2/bytecodes/sources:search", fn conn ->
+      Bypass.expect_once(bypass, "POST", "/api/v2/bytecodes/sources_search", fn conn ->
         Conn.resp(conn, 200, "{\"sources\": []}")
       end)
 
@@ -408,7 +706,7 @@ defmodule BlockScoutWeb.API.V2.SmartContractControllerTest do
 
       :timer.sleep(10)
 
-      Bypass.expect_once(bypass, "POST", "/api/v2/bytecodes/sources:search", fn conn ->
+      Bypass.expect_once(bypass, "POST", "/api/v2/bytecodes/sources_search", fn conn ->
         Conn.resp(conn, 200, "{\"sources\": []}")
       end)
 
@@ -420,6 +718,7 @@ defmodule BlockScoutWeb.API.V2.SmartContractControllerTest do
 
       _request = get(conn, "/api/v2/smart-contracts/#{Address.checksum(address.hash)}")
 
+      Application.put_env(:block_scout_web, :chain_id, old_chain_id)
       Application.put_env(:explorer, Explorer.Chain.Fetcher.LookUpSmartContractSourcesOnDemand, old_interval_env)
       Application.put_env(:explorer, Explorer.SmartContract.RustVerifierInterfaceBehaviour, old_env)
       Bypass.down(bypass)
diff --git a/apps/block_scout_web/test/support/fixture/smart_contract/eth_bytecode_db_search_all_local_sources_response.json b/apps/block_scout_web/test/support/fixture/smart_contract/eth_bytecode_db_search_all_local_sources_response.json
new file mode 100644
index 000000000000..69d1e1876b84
--- /dev/null
+++ b/apps/block_scout_web/test/support/fixture/smart_contract/eth_bytecode_db_search_all_local_sources_response.json
@@ -0,0 +1,59 @@
+{
+  "ethBytecodeDbSources": [
+    {
+        "fileName": "contracts/uniswapv2/UniswapV2Router02.sol",
+        "contractName": "UniswapV2Router02",
+        "compilerVersion": "v0.6.12+commit.27d51765",
+        "compilerSettings": "{\"libraries\":{\"\":{\"__CACHE_BREAKER__\":\"0x00000000d41867734bbee4c6863d9255b2b06ac1\"}},\"metadata\":{\"useLiteralContent\":true},\"optimizer\":{\"enabled\":true,\"runs\":200},\"outputSelection\":{\"*\":{\"*\":[\"abi\",\"evm.bytecode\",\"evm.deployedBytecode\",\"evm.methodIdentifiers\"]}}}",
+        "sourceType": "SOLIDITY",
+        "sourceFiles": {
+            "@openzeppelin/contracts/access/Ownable.sol": "// SPDX-License-Identifier: MIT\n\npragma solidity >=0.6.0 <0.8.0;\n\nimport \"../utils/Context.sol\";\n/**\n * @dev Contract module which provides a basic access control mechanism, where\n * there is an account (an owner) that can be granted exclusive access to\n * specific functions.\n *\n * By default, the owner account will be the one that deploys the contract. This\n * can later be changed with {transferOwnership}.\n *\n * This module is used through inheritance. It will make available the modifier\n * `onlyOwner`, which can be applied to your functions to restrict their use to\n * the owner.\n */\nabstract contract Ownable is Context {\n    address private _owner;\n\n    event OwnershipTransferred(address indexed previousOwner, address indexed newOwner);\n\n    /**\n     * @dev Initializes the contract setting the deployer as the initial owner.\n     */\n    constructor () internal {\n        address msgSender = _msgSender();\n        _owner = msgSender;\n        emit OwnershipTransferred(address(0), msgSender);\n    }\n\n    /**\n     * @dev Returns the address of the current owner.\n     */\n    function owner() public view virtual returns (address) {\n        return _owner;\n    }\n\n    /**\n     * @dev Throws if called by any account other than the owner.\n     */\n    modifier onlyOwner() {\n        require(owner() == _msgSender(), \"Ownable: caller is not the owner\");\n        _;\n    }\n\n    /**\n     * @dev Leaves the contract without owner. It will not be possible to call\n     * `onlyOwner` functions anymore. Can only be called by the current owner.\n     *\n     * NOTE: Renouncing ownership will leave the contract without an owner,\n     * thereby removing any functionality that is only available to the owner.\n     */\n    function renounceOwnership() public virtual onlyOwner {\n        emit OwnershipTransferred(_owner, address(0));\n        _owner = address(0);\n    }\n\n    /**\n     * @dev Transfers ownership of the contract to a new account (`newOwner`).\n     * Can only be called by the current owner.\n     */\n    function transferOwnership(address newOwner) public virtual onlyOwner {\n        require(newOwner != address(0), \"Ownable: new owner is the zero address\");\n        emit OwnershipTransferred(_owner, newOwner);\n        _owner = newOwner;\n    }\n}\n",
+            "@openzeppelin/contracts/math/SafeMath.sol": "// SPDX-License-Identifier: MIT\n\npragma solidity >=0.6.0 <0.8.0;\n\n/**\n * @dev Wrappers over Solidity's arithmetic operations with added overflow\n * checks.\n *\n * Arithmetic operations in Solidity wrap on overflow. This can easily result\n * in bugs, because programmers usually assume that an overflow raises an\n * error, which is the standard behavior in high level programming languages.\n * `SafeMath` restores this intuition by reverting the transaction when an\n * operation overflows.\n *\n * Using this library instead of the unchecked operations eliminates an entire\n * class of bugs, so it's recommended to use it always.\n */\nlibrary SafeMath {\n    /**\n     * @dev Returns the addition of two unsigned integers, with an overflow flag.\n     *\n     * _Available since v3.4._\n     */\n    function tryAdd(uint256 a, uint256 b) internal pure returns (bool, uint256) {\n        uint256 c = a + b;\n        if (c < a) return (false, 0);\n        return (true, c);\n    }\n\n    /**\n     * @dev Returns the substraction of two unsigned integers, with an overflow flag.\n     *\n     * _Available since v3.4._\n     */\n    function trySub(uint256 a, uint256 b) internal pure returns (bool, uint256) {\n        if (b > a) return (false, 0);\n        return (true, a - b);\n    }\n\n    /**\n     * @dev Returns the multiplication of two unsigned integers, with an overflow flag.\n     *\n     * _Available since v3.4._\n     */\n    function tryMul(uint256 a, uint256 b) internal pure returns (bool, uint256) {\n        // Gas optimization: this is cheaper than requiring 'a' not being zero, but the\n        // benefit is lost if 'b' is also tested.\n        // See: https://github.com/OpenZeppelin/openzeppelin-contracts/pull/522\n        if (a == 0) return (true, 0);\n        uint256 c = a * b;\n        if (c / a != b) return (false, 0);\n        return (true, c);\n    }\n\n    /**\n     * @dev Returns the division of two unsigned integers, with a division by zero flag.\n     *\n     * _Available since v3.4._\n     */\n    function tryDiv(uint256 a, uint256 b) internal pure returns (bool, uint256) {\n        if (b == 0) return (false, 0);\n        return (true, a / b);\n    }\n\n    /**\n     * @dev Returns the remainder of dividing two unsigned integers, with a division by zero flag.\n     *\n     * _Available since v3.4._\n     */\n    function tryMod(uint256 a, uint256 b) internal pure returns (bool, uint256) {\n        if (b == 0) return (false, 0);\n        return (true, a % b);\n    }\n\n    /**\n     * @dev Returns the addition of two unsigned integers, reverting on\n     * overflow.\n     *\n     * Counterpart to Solidity's `+` operator.\n     *\n     * Requirements:\n     *\n     * - Addition cannot overflow.\n     */\n    function add(uint256 a, uint256 b) internal pure returns (uint256) {\n        uint256 c = a + b;\n        require(c >= a, \"SafeMath: addition overflow\");\n        return c;\n    }\n\n    /**\n     * @dev Returns the subtraction of two unsigned integers, reverting on\n     * overflow (when the result is negative).\n     *\n     * Counterpart to Solidity's `-` operator.\n     *\n     * Requirements:\n     *\n     * - Subtraction cannot overflow.\n     */\n    function sub(uint256 a, uint256 b) internal pure returns (uint256) {\n        require(b <= a, \"SafeMath: subtraction overflow\");\n        return a - b;\n    }\n\n    /**\n     * @dev Returns the multiplication of two unsigned integers, reverting on\n     * overflow.\n     *\n     * Counterpart to Solidity's `*` operator.\n     *\n     * Requirements:\n     *\n     * - Multiplication cannot overflow.\n     */\n    function mul(uint256 a, uint256 b) internal pure returns (uint256) {\n        if (a == 0) return 0;\n        uint256 c = a * b;\n        require(c / a == b, \"SafeMath: multiplication overflow\");\n        return c;\n    }\n\n    /**\n     * @dev Returns the integer division of two unsigned integers, reverting on\n     * division by zero. The result is rounded towards zero.\n     *\n     * Counterpart to Solidity's `/` operator. Note: this function uses a\n     * `revert` opcode (which leaves remaining gas untouched) while Solidity\n     * uses an invalid opcode to revert (consuming all remaining gas).\n     *\n     * Requirements:\n     *\n     * - The divisor cannot be zero.\n     */\n    function div(uint256 a, uint256 b) internal pure returns (uint256) {\n        require(b > 0, \"SafeMath: division by zero\");\n        return a / b;\n    }\n\n    /**\n     * @dev Returns the remainder of dividing two unsigned integers. (unsigned integer modulo),\n     * reverting when dividing by zero.\n     *\n     * Counterpart to Solidity's `%` operator. This function uses a `revert`\n     * opcode (which leaves remaining gas untouched) while Solidity uses an\n     * invalid opcode to revert (consuming all remaining gas).\n     *\n     * Requirements:\n     *\n     * - The divisor cannot be zero.\n     */\n    function mod(uint256 a, uint256 b) internal pure returns (uint256) {\n        require(b > 0, \"SafeMath: modulo by zero\");\n        return a % b;\n    }\n\n    /**\n     * @dev Returns the subtraction of two unsigned integers, reverting with custom message on\n     * overflow (when the result is negative).\n     *\n     * CAUTION: This function is deprecated because it requires allocating memory for the error\n     * message unnecessarily. For custom revert reasons use {trySub}.\n     *\n     * Counterpart to Solidity's `-` operator.\n     *\n     * Requirements:\n     *\n     * - Subtraction cannot overflow.\n     */\n    function sub(uint256 a, uint256 b, string memory errorMessage) internal pure returns (uint256) {\n        require(b <= a, errorMessage);\n        return a - b;\n    }\n\n    /**\n     * @dev Returns the integer division of two unsigned integers, reverting with custom message on\n     * division by zero. The result is rounded towards zero.\n     *\n     * CAUTION: This function is deprecated because it requires allocating memory for the error\n     * message unnecessarily. For custom revert reasons use {tryDiv}.\n     *\n     * Counterpart to Solidity's `/` operator. Note: this function uses a\n     * `revert` opcode (which leaves remaining gas untouched) while Solidity\n     * uses an invalid opcode to revert (consuming all remaining gas).\n     *\n     * Requirements:\n     *\n     * - The divisor cannot be zero.\n     */\n    function div(uint256 a, uint256 b, string memory errorMessage) internal pure returns (uint256) {\n        require(b > 0, errorMessage);\n        return a / b;\n    }\n\n    /**\n     * @dev Returns the remainder of dividing two unsigned integers. (unsigned integer modulo),\n     * reverting with custom message when dividing by zero.\n     *\n     * CAUTION: This function is deprecated because it requires allocating memory for the error\n     * message unnecessarily. For custom revert reasons use {tryMod}.\n     *\n     * Counterpart to Solidity's `%` operator. This function uses a `revert`\n     * opcode (which leaves remaining gas untouched) while Solidity uses an\n     * invalid opcode to revert (consuming all remaining gas).\n     *\n     * Requirements:\n     *\n     * - The divisor cannot be zero.\n     */\n    function mod(uint256 a, uint256 b, string memory errorMessage) internal pure returns (uint256) {\n        require(b > 0, errorMessage);\n        return a % b;\n    }\n}\n",
+            "@openzeppelin/contracts/token/ERC20/ERC20.sol": "// SPDX-License-Identifier: MIT\n\npragma solidity >=0.6.0 <0.8.0;\n\nimport \"../../utils/Context.sol\";\nimport \"./IERC20.sol\";\nimport \"../../math/SafeMath.sol\";\n\n/**\n * @dev Implementation of the {IERC20} interface.\n *\n * This implementation is agnostic to the way tokens are created. This means\n * that a supply mechanism has to be added in a derived contract using {_mint}.\n * For a generic mechanism see {ERC20PresetMinterPauser}.\n *\n * TIP: For a detailed writeup see our guide\n * https://forum.zeppelin.solutions/t/how-to-implement-erc20-supply-mechanisms/226[How\n * to implement supply mechanisms].\n *\n * We have followed general OpenZeppelin guidelines: functions revert instead\n * of returning `false` on failure. This behavior is nonetheless conventional\n * and does not conflict with the expectations of ERC20 applications.\n *\n * Additionally, an {Approval} event is emitted on calls to {transferFrom}.\n * This allows applications to reconstruct the allowance for all accounts just\n * by listening to said events. Other implementations of the EIP may not emit\n * these events, as it isn't required by the specification.\n *\n * Finally, the non-standard {decreaseAllowance} and {increaseAllowance}\n * functions have been added to mitigate the well-known issues around setting\n * allowances. See {IERC20-approve}.\n */\ncontract ERC20 is Context, IERC20 {\n    using SafeMath for uint256;\n\n    mapping (address => uint256) private _balances;\n\n    mapping (address => mapping (address => uint256)) private _allowances;\n\n    uint256 private _totalSupply;\n\n    string private _name;\n    string private _symbol;\n    uint8 private _decimals;\n\n    /**\n     * @dev Sets the values for {name} and {symbol}, initializes {decimals} with\n     * a default value of 18.\n     *\n     * To select a different value for {decimals}, use {_setupDecimals}.\n     *\n     * All three of these values are immutable: they can only be set once during\n     * construction.\n     */\n    constructor (string memory name_, string memory symbol_) public {\n        _name = name_;\n        _symbol = symbol_;\n        _decimals = 18;\n    }\n\n    /**\n     * @dev Returns the name of the token.\n     */\n    function name() public view virtual returns (string memory) {\n        return _name;\n    }\n\n    /**\n     * @dev Returns the symbol of the token, usually a shorter version of the\n     * name.\n     */\n    function symbol() public view virtual returns (string memory) {\n        return _symbol;\n    }\n\n    /**\n     * @dev Returns the number of decimals used to get its user representation.\n     * For example, if `decimals` equals `2`, a balance of `505` tokens should\n     * be displayed to a user as `5,05` (`505 / 10 ** 2`).\n     *\n     * Tokens usually opt for a value of 18, imitating the relationship between\n     * Ether and Wei. This is the value {ERC20} uses, unless {_setupDecimals} is\n     * called.\n     *\n     * NOTE: This information is only used for _display_ purposes: it in\n     * no way affects any of the arithmetic of the contract, including\n     * {IERC20-balanceOf} and {IERC20-transfer}.\n     */\n    function decimals() public view virtual returns (uint8) {\n        return _decimals;\n    }\n\n    /**\n     * @dev See {IERC20-totalSupply}.\n     */\n    function totalSupply() public view virtual override returns (uint256) {\n        return _totalSupply;\n    }\n\n    /**\n     * @dev See {IERC20-balanceOf}.\n     */\n    function balanceOf(address account) public view virtual override returns (uint256) {\n        return _balances[account];\n    }\n\n    /**\n     * @dev See {IERC20-transfer}.\n     *\n     * Requirements:\n     *\n     * - `recipient` cannot be the zero address.\n     * - the caller must have a balance of at least `amount`.\n     */\n    function transfer(address recipient, uint256 amount) public virtual override returns (bool) {\n        _transfer(_msgSender(), recipient, amount);\n        return true;\n    }\n\n    /**\n     * @dev See {IERC20-allowance}.\n     */\n    function allowance(address owner, address spender) public view virtual override returns (uint256) {\n        return _allowances[owner][spender];\n    }\n\n    /**\n     * @dev See {IERC20-approve}.\n     *\n     * Requirements:\n     *\n     * - `spender` cannot be the zero address.\n     */\n    function approve(address spender, uint256 amount) public virtual override returns (bool) {\n        _approve(_msgSender(), spender, amount);\n        return true;\n    }\n\n    /**\n     * @dev See {IERC20-transferFrom}.\n     *\n     * Emits an {Approval} event indicating the updated allowance. This is not\n     * required by the EIP. See the note at the beginning of {ERC20}.\n     *\n     * Requirements:\n     *\n     * - `sender` and `recipient` cannot be the zero address.\n     * - `sender` must have a balance of at least `amount`.\n     * - the caller must have allowance for ``sender``'s tokens of at least\n     * `amount`.\n     */\n    function transferFrom(address sender, address recipient, uint256 amount) public virtual override returns (bool) {\n        _transfer(sender, recipient, amount);\n        _approve(sender, _msgSender(), _allowances[sender][_msgSender()].sub(amount, \"ERC20: transfer amount exceeds allowance\"));\n        return true;\n    }\n\n    /**\n     * @dev Atomically increases the allowance granted to `spender` by the caller.\n     *\n     * This is an alternative to {approve} that can be used as a mitigation for\n     * problems described in {IERC20-approve}.\n     *\n     * Emits an {Approval} event indicating the updated allowance.\n     *\n     * Requirements:\n     *\n     * - `spender` cannot be the zero address.\n     */\n    function increaseAllowance(address spender, uint256 addedValue) public virtual returns (bool) {\n        _approve(_msgSender(), spender, _allowances[_msgSender()][spender].add(addedValue));\n        return true;\n    }\n\n    /**\n     * @dev Atomically decreases the allowance granted to `spender` by the caller.\n     *\n     * This is an alternative to {approve} that can be used as a mitigation for\n     * problems described in {IERC20-approve}.\n     *\n     * Emits an {Approval} event indicating the updated allowance.\n     *\n     * Requirements:\n     *\n     * - `spender` cannot be the zero address.\n     * - `spender` must have allowance for the caller of at least\n     * `subtractedValue`.\n     */\n    function decreaseAllowance(address spender, uint256 subtractedValue) public virtual returns (bool) {\n        _approve(_msgSender(), spender, _allowances[_msgSender()][spender].sub(subtractedValue, \"ERC20: decreased allowance below zero\"));\n        return true;\n    }\n\n    /**\n     * @dev Moves tokens `amount` from `sender` to `recipient`.\n     *\n     * This is internal function is equivalent to {transfer}, and can be used to\n     * e.g. implement automatic token fees, slashing mechanisms, etc.\n     *\n     * Emits a {Transfer} event.\n     *\n     * Requirements:\n     *\n     * - `sender` cannot be the zero address.\n     * - `recipient` cannot be the zero address.\n     * - `sender` must have a balance of at least `amount`.\n     */\n    function _transfer(address sender, address recipient, uint256 amount) internal virtual {\n        require(sender != address(0), \"ERC20: transfer from the zero address\");\n        require(recipient != address(0), \"ERC20: transfer to the zero address\");\n\n        _beforeTokenTransfer(sender, recipient, amount);\n\n        _balances[sender] = _balances[sender].sub(amount, \"ERC20: transfer amount exceeds balance\");\n        _balances[recipient] = _balances[recipient].add(amount);\n        emit Transfer(sender, recipient, amount);\n    }\n\n    /** @dev Creates `amount` tokens and assigns them to `account`, increasing\n     * the total supply.\n     *\n     * Emits a {Transfer} event with `from` set to the zero address.\n     *\n     * Requirements:\n     *\n     * - `to` cannot be the zero address.\n     */\n    function _mint(address account, uint256 amount) internal virtual {\n        require(account != address(0), \"ERC20: mint to the zero address\");\n\n        _beforeTokenTransfer(address(0), account, amount);\n\n        _totalSupply = _totalSupply.add(amount);\n        _balances[account] = _balances[account].add(amount);\n        emit Transfer(address(0), account, amount);\n    }\n\n    /**\n     * @dev Destroys `amount` tokens from `account`, reducing the\n     * total supply.\n     *\n     * Emits a {Transfer} event with `to` set to the zero address.\n     *\n     * Requirements:\n     *\n     * - `account` cannot be the zero address.\n     * - `account` must have at least `amount` tokens.\n     */\n    function _burn(address account, uint256 amount) internal virtual {\n        require(account != address(0), \"ERC20: burn from the zero address\");\n\n        _beforeTokenTransfer(account, address(0), amount);\n\n        _balances[account] = _balances[account].sub(amount, \"ERC20: burn amount exceeds balance\");\n        _totalSupply = _totalSupply.sub(amount);\n        emit Transfer(account, address(0), amount);\n    }\n\n    /**\n     * @dev Sets `amount` as the allowance of `spender` over the `owner` s tokens.\n     *\n     * This internal function is equivalent to `approve`, and can be used to\n     * e.g. set automatic allowances for certain subsystems, etc.\n     *\n     * Emits an {Approval} event.\n     *\n     * Requirements:\n     *\n     * - `owner` cannot be the zero address.\n     * - `spender` cannot be the zero address.\n     */\n    function _approve(address owner, address spender, uint256 amount) internal virtual {\n        require(owner != address(0), \"ERC20: approve from the zero address\");\n        require(spender != address(0), \"ERC20: approve to the zero address\");\n\n        _allowances[owner][spender] = amount;\n        emit Approval(owner, spender, amount);\n    }\n\n    /**\n     * @dev Sets {decimals} to a value other than the default one of 18.\n     *\n     * WARNING: This function should only be called from the constructor. Most\n     * applications that interact with token contracts will not expect\n     * {decimals} to ever change, and may work incorrectly if it does.\n     */\n    function _setupDecimals(uint8 decimals_) internal virtual {\n        _decimals = decimals_;\n    }\n\n    /**\n     * @dev Hook that is called before any transfer of tokens. This includes\n     * minting and burning.\n     *\n     * Calling conditions:\n     *\n     * - when `from` and `to` are both non-zero, `amount` of ``from``'s tokens\n     * will be to transferred to `to`.\n     * - when `from` is zero, `amount` tokens will be minted for `to`.\n     * - when `to` is zero, `amount` of ``from``'s tokens will be burned.\n     * - `from` and `to` are never both zero.\n     *\n     * To learn more about hooks, head to xref:ROOT:extending-contracts.adoc#using-hooks[Using Hooks].\n     */\n    function _beforeTokenTransfer(address from, address to, uint256 amount) internal virtual { }\n}\n",
+            "@openzeppelin/contracts/token/ERC20/IERC20.sol": "// SPDX-License-Identifier: MIT\n\npragma solidity >=0.6.0 <0.8.0;\n\n/**\n * @dev Interface of the ERC20 standard as defined in the EIP.\n */\ninterface IERC20 {\n    /**\n     * @dev Returns the amount of tokens in existence.\n     */\n    function totalSupply() external view returns (uint256);\n\n    /**\n     * @dev Returns the amount of tokens owned by `account`.\n     */\n    function balanceOf(address account) external view returns (uint256);\n\n    /**\n     * @dev Moves `amount` tokens from the caller's account to `recipient`.\n     *\n     * Returns a boolean value indicating whether the operation succeeded.\n     *\n     * Emits a {Transfer} event.\n     */\n    function transfer(address recipient, uint256 amount) external returns (bool);\n\n    /**\n     * @dev Returns the remaining number of tokens that `spender` will be\n     * allowed to spend on behalf of `owner` through {transferFrom}. This is\n     * zero by default.\n     *\n     * This value changes when {approve} or {transferFrom} are called.\n     */\n    function allowance(address owner, address spender) external view returns (uint256);\n\n    /**\n     * @dev Sets `amount` as the allowance of `spender` over the caller's tokens.\n     *\n     * Returns a boolean value indicating whether the operation succeeded.\n     *\n     * IMPORTANT: Beware that changing an allowance with this method brings the risk\n     * that someone may use both the old and the new allowance by unfortunate\n     * transaction ordering. One possible solution to mitigate this race\n     * condition is to first reduce the spender's allowance to 0 and set the\n     * desired value afterwards:\n     * https://github.com/ethereum/EIPs/issues/20#issuecomment-263524729\n     *\n     * Emits an {Approval} event.\n     */\n    function approve(address spender, uint256 amount) external returns (bool);\n\n    /**\n     * @dev Moves `amount` tokens from `sender` to `recipient` using the\n     * allowance mechanism. `amount` is then deducted from the caller's\n     * allowance.\n     *\n     * Returns a boolean value indicating whether the operation succeeded.\n     *\n     * Emits a {Transfer} event.\n     */\n    function transferFrom(address sender, address recipient, uint256 amount) external returns (bool);\n\n    /**\n     * @dev Emitted when `value` tokens are moved from one account (`from`) to\n     * another (`to`).\n     *\n     * Note that `value` may be zero.\n     */\n    event Transfer(address indexed from, address indexed to, uint256 value);\n\n    /**\n     * @dev Emitted when the allowance of a `spender` for an `owner` is set by\n     * a call to {approve}. `value` is the new allowance.\n     */\n    event Approval(address indexed owner, address indexed spender, uint256 value);\n}\n",
+            "@openzeppelin/contracts/token/ERC20/SafeERC20.sol": "// SPDX-License-Identifier: MIT\n\npragma solidity >=0.6.0 <0.8.0;\n\nimport \"./IERC20.sol\";\nimport \"../../math/SafeMath.sol\";\nimport \"../../utils/Address.sol\";\n\n/**\n * @title SafeERC20\n * @dev Wrappers around ERC20 operations that throw on failure (when the token\n * contract returns false). Tokens that return no value (and instead revert or\n * throw on failure) are also supported, non-reverting calls are assumed to be\n * successful.\n * To use this library you can add a `using SafeERC20 for IERC20;` statement to your contract,\n * which allows you to call the safe operations as `token.safeTransfer(...)`, etc.\n */\nlibrary SafeERC20 {\n    using SafeMath for uint256;\n    using Address for address;\n\n    function safeTransfer(IERC20 token, address to, uint256 value) internal {\n        _callOptionalReturn(token, abi.encodeWithSelector(token.transfer.selector, to, value));\n    }\n\n    function safeTransferFrom(IERC20 token, address from, address to, uint256 value) internal {\n        _callOptionalReturn(token, abi.encodeWithSelector(token.transferFrom.selector, from, to, value));\n    }\n\n    /**\n     * @dev Deprecated. This function has issues similar to the ones found in\n     * {IERC20-approve}, and its usage is discouraged.\n     *\n     * Whenever possible, use {safeIncreaseAllowance} and\n     * {safeDecreaseAllowance} instead.\n     */\n    function safeApprove(IERC20 token, address spender, uint256 value) internal {\n        // safeApprove should only be called when setting an initial allowance,\n        // or when resetting it to zero. To increase and decrease it, use\n        // 'safeIncreaseAllowance' and 'safeDecreaseAllowance'\n        // solhint-disable-next-line max-line-length\n        require((value == 0) || (token.allowance(address(this), spender) == 0),\n            \"SafeERC20: approve from non-zero to non-zero allowance\"\n        );\n        _callOptionalReturn(token, abi.encodeWithSelector(token.approve.selector, spender, value));\n    }\n\n    function safeIncreaseAllowance(IERC20 token, address spender, uint256 value) internal {\n        uint256 newAllowance = token.allowance(address(this), spender).add(value);\n        _callOptionalReturn(token, abi.encodeWithSelector(token.approve.selector, spender, newAllowance));\n    }\n\n    function safeDecreaseAllowance(IERC20 token, address spender, uint256 value) internal {\n        uint256 newAllowance = token.allowance(address(this), spender).sub(value, \"SafeERC20: decreased allowance below zero\");\n        _callOptionalReturn(token, abi.encodeWithSelector(token.approve.selector, spender, newAllowance));\n    }\n\n    /**\n     * @dev Imitates a Solidity high-level call (i.e. a regular function call to a contract), relaxing the requirement\n     * on the return value: the return value is optional (but if data is returned, it must not be false).\n     * @param token The token targeted by the call.\n     * @param data The call data (encoded using abi.encode or one of its variants).\n     */\n    function _callOptionalReturn(IERC20 token, bytes memory data) private {\n        // We need to perform a low level call here, to bypass Solidity's return data size checking mechanism, since\n        // we're implementing it ourselves. We use {Address.functionCall} to perform this call, which verifies that\n        // the target address contains contract code and also asserts for success in the low-level call.\n\n        bytes memory returndata = address(token).functionCall(data, \"SafeERC20: low-level call failed\");\n        if (returndata.length > 0) { // Return data is optional\n            // solhint-disable-next-line max-line-length\n            require(abi.decode(returndata, (bool)), \"SafeERC20: ERC20 operation did not succeed\");\n        }\n    }\n}\n",
+            "@openzeppelin/contracts/utils/Address.sol": "// SPDX-License-Identifier: MIT\n\npragma solidity >=0.6.2 <0.8.0;\n\n/**\n * @dev Collection of functions related to the address type\n */\nlibrary Address {\n    /**\n     * @dev Returns true if `account` is a contract.\n     *\n     * [IMPORTANT]\n     * ====\n     * It is unsafe to assume that an address for which this function returns\n     * false is an externally-owned account (EOA) and not a contract.\n     *\n     * Among others, `isContract` will return false for the following\n     * types of addresses:\n     *\n     *  - an externally-owned account\n     *  - a contract in construction\n     *  - an address where a contract will be created\n     *  - an address where a contract lived, but was destroyed\n     * ====\n     */\n    function isContract(address account) internal view returns (bool) {\n        // This method relies on extcodesize, which returns 0 for contracts in\n        // construction, since the code is only stored at the end of the\n        // constructor execution.\n\n        uint256 size;\n        // solhint-disable-next-line no-inline-assembly\n        assembly { size := extcodesize(account) }\n        return size > 0;\n    }\n\n    /**\n     * @dev Replacement for Solidity's `transfer`: sends `amount` wei to\n     * `recipient`, forwarding all available gas and reverting on errors.\n     *\n     * https://eips.ethereum.org/EIPS/eip-1884[EIP1884] increases the gas cost\n     * of certain opcodes, possibly making contracts go over the 2300 gas limit\n     * imposed by `transfer`, making them unable to receive funds via\n     * `transfer`. {sendValue} removes this limitation.\n     *\n     * https://diligence.consensys.net/posts/2019/09/stop-using-soliditys-transfer-now/[Learn more].\n     *\n     * IMPORTANT: because control is transferred to `recipient`, care must be\n     * taken to not create reentrancy vulnerabilities. Consider using\n     * {ReentrancyGuard} or the\n     * https://solidity.readthedocs.io/en/v0.5.11/security-considerations.html#use-the-checks-effects-interactions-pattern[checks-effects-interactions pattern].\n     */\n    function sendValue(address payable recipient, uint256 amount) internal {\n        require(address(this).balance >= amount, \"Address: insufficient balance\");\n\n        // solhint-disable-next-line avoid-low-level-calls, avoid-call-value\n        (bool success, ) = recipient.call{ value: amount }(\"\");\n        require(success, \"Address: unable to send value, recipient may have reverted\");\n    }\n\n    /**\n     * @dev Performs a Solidity function call using a low level `call`. A\n     * plain`call` is an unsafe replacement for a function call: use this\n     * function instead.\n     *\n     * If `target` reverts with a revert reason, it is bubbled up by this\n     * function (like regular Solidity function calls).\n     *\n     * Returns the raw returned data. To convert to the expected return value,\n     * use https://solidity.readthedocs.io/en/latest/units-and-global-variables.html?highlight=abi.decode#abi-encoding-and-decoding-functions[`abi.decode`].\n     *\n     * Requirements:\n     *\n     * - `target` must be a contract.\n     * - calling `target` with `data` must not revert.\n     *\n     * _Available since v3.1._\n     */\n    function functionCall(address target, bytes memory data) internal returns (bytes memory) {\n      return functionCall(target, data, \"Address: low-level call failed\");\n    }\n\n    /**\n     * @dev Same as {xref-Address-functionCall-address-bytes-}[`functionCall`], but with\n     * `errorMessage` as a fallback revert reason when `target` reverts.\n     *\n     * _Available since v3.1._\n     */\n    function functionCall(address target, bytes memory data, string memory errorMessage) internal returns (bytes memory) {\n        return functionCallWithValue(target, data, 0, errorMessage);\n    }\n\n    /**\n     * @dev Same as {xref-Address-functionCall-address-bytes-}[`functionCall`],\n     * but also transferring `value` wei to `target`.\n     *\n     * Requirements:\n     *\n     * - the calling contract must have an ETH balance of at least `value`.\n     * - the called Solidity function must be `payable`.\n     *\n     * _Available since v3.1._\n     */\n    function functionCallWithValue(address target, bytes memory data, uint256 value) internal returns (bytes memory) {\n        return functionCallWithValue(target, data, value, \"Address: low-level call with value failed\");\n    }\n\n    /**\n     * @dev Same as {xref-Address-functionCallWithValue-address-bytes-uint256-}[`functionCallWithValue`], but\n     * with `errorMessage` as a fallback revert reason when `target` reverts.\n     *\n     * _Available since v3.1._\n     */\n    function functionCallWithValue(address target, bytes memory data, uint256 value, string memory errorMessage) internal returns (bytes memory) {\n        require(address(this).balance >= value, \"Address: insufficient balance for call\");\n        require(isContract(target), \"Address: call to non-contract\");\n\n        // solhint-disable-next-line avoid-low-level-calls\n        (bool success, bytes memory returndata) = target.call{ value: value }(data);\n        return _verifyCallResult(success, returndata, errorMessage);\n    }\n\n    /**\n     * @dev Same as {xref-Address-functionCall-address-bytes-}[`functionCall`],\n     * but performing a static call.\n     *\n     * _Available since v3.3._\n     */\n    function functionStaticCall(address target, bytes memory data) internal view returns (bytes memory) {\n        return functionStaticCall(target, data, \"Address: low-level static call failed\");\n    }\n\n    /**\n     * @dev Same as {xref-Address-functionCall-address-bytes-string-}[`functionCall`],\n     * but performing a static call.\n     *\n     * _Available since v3.3._\n     */\n    function functionStaticCall(address target, bytes memory data, string memory errorMessage) internal view returns (bytes memory) {\n        require(isContract(target), \"Address: static call to non-contract\");\n\n        // solhint-disable-next-line avoid-low-level-calls\n        (bool success, bytes memory returndata) = target.staticcall(data);\n        return _verifyCallResult(success, returndata, errorMessage);\n    }\n\n    /**\n     * @dev Same as {xref-Address-functionCall-address-bytes-}[`functionCall`],\n     * but performing a delegate call.\n     *\n     * _Available since v3.4._\n     */\n    function functionDelegateCall(address target, bytes memory data) internal returns (bytes memory) {\n        return functionDelegateCall(target, data, \"Address: low-level delegate call failed\");\n    }\n\n    /**\n     * @dev Same as {xref-Address-functionCall-address-bytes-string-}[`functionCall`],\n     * but performing a delegate call.\n     *\n     * _Available since v3.4._\n     */\n    function functionDelegateCall(address target, bytes memory data, string memory errorMessage) internal returns (bytes memory) {\n        require(isContract(target), \"Address: delegate call to non-contract\");\n\n        // solhint-disable-next-line avoid-low-level-calls\n        (bool success, bytes memory returndata) = target.delegatecall(data);\n        return _verifyCallResult(success, returndata, errorMessage);\n    }\n\n    function _verifyCallResult(bool success, bytes memory returndata, string memory errorMessage) private pure returns(bytes memory) {\n        if (success) {\n            return returndata;\n        } else {\n            // Look for revert reason and bubble it up if present\n            if (returndata.length > 0) {\n                // The easiest way to bubble the revert reason is using memory via assembly\n\n                // solhint-disable-next-line no-inline-assembly\n                assembly {\n                    let returndata_size := mload(returndata)\n                    revert(add(32, returndata), returndata_size)\n                }\n            } else {\n                revert(errorMessage);\n            }\n        }\n    }\n}\n",
+            "@openzeppelin/contracts/utils/Context.sol": "// SPDX-License-Identifier: MIT\n\npragma solidity >=0.6.0 <0.8.0;\n\n/*\n * @dev Provides information about the current execution context, including the\n * sender of the transaction and its data. While these are generally available\n * via msg.sender and msg.data, they should not be accessed in such a direct\n * manner, since when dealing with GSN meta-transactions the account sending and\n * paying for execution may not be the actual sender (as far as an application\n * is concerned).\n *\n * This contract is only required for intermediate, library-like contracts.\n */\nabstract contract Context {\n    function _msgSender() internal view virtual returns (address payable) {\n        return msg.sender;\n    }\n\n    function _msgData() internal view virtual returns (bytes memory) {\n        this; // silence state mutability warning without generating bytecode - see https://github.com/ethereum/solidity/issues/2691\n        return msg.data;\n    }\n}\n",
+            "@openzeppelin/contracts/utils/EnumerableSet.sol": "// SPDX-License-Identifier: MIT\n\npragma solidity >=0.6.0 <0.8.0;\n\n/**\n * @dev Library for managing\n * https://en.wikipedia.org/wiki/Set_(abstract_data_type)[sets] of primitive\n * types.\n *\n * Sets have the following properties:\n *\n * - Elements are added, removed, and checked for existence in constant time\n * (O(1)).\n * - Elements are enumerated in O(n). No guarantees are made on the ordering.\n *\n * ```\n * contract Example {\n *     // Add the library methods\n *     using EnumerableSet for EnumerableSet.AddressSet;\n *\n *     // Declare a set state variable\n *     EnumerableSet.AddressSet private mySet;\n * }\n * ```\n *\n * As of v3.3.0, sets of type `bytes32` (`Bytes32Set`), `address` (`AddressSet`)\n * and `uint256` (`UintSet`) are supported.\n */\nlibrary EnumerableSet {\n    // To implement this library for multiple types with as little code\n    // repetition as possible, we write it in terms of a generic Set type with\n    // bytes32 values.\n    // The Set implementation uses private functions, and user-facing\n    // implementations (such as AddressSet) are just wrappers around the\n    // underlying Set.\n    // This means that we can only create new EnumerableSets for types that fit\n    // in bytes32.\n\n    struct Set {\n        // Storage of set values\n        bytes32[] _values;\n\n        // Position of the value in the `values` array, plus 1 because index 0\n        // means a value is not in the set.\n        mapping (bytes32 => uint256) _indexes;\n    }\n\n    /**\n     * @dev Add a value to a set. O(1).\n     *\n     * Returns true if the value was added to the set, that is if it was not\n     * already present.\n     */\n    function _add(Set storage set, bytes32 value) private returns (bool) {\n        if (!_contains(set, value)) {\n            set._values.push(value);\n            // The value is stored at length-1, but we add 1 to all indexes\n            // and use 0 as a sentinel value\n            set._indexes[value] = set._values.length;\n            return true;\n        } else {\n            return false;\n        }\n    }\n\n    /**\n     * @dev Removes a value from a set. O(1).\n     *\n     * Returns true if the value was removed from the set, that is if it was\n     * present.\n     */\n    function _remove(Set storage set, bytes32 value) private returns (bool) {\n        // We read and store the value's index to prevent multiple reads from the same storage slot\n        uint256 valueIndex = set._indexes[value];\n\n        if (valueIndex != 0) { // Equivalent to contains(set, value)\n            // To delete an element from the _values array in O(1), we swap the element to delete with the last one in\n            // the array, and then remove the last element (sometimes called as 'swap and pop').\n            // This modifies the order of the array, as noted in {at}.\n\n            uint256 toDeleteIndex = valueIndex - 1;\n            uint256 lastIndex = set._values.length - 1;\n\n            // When the value to delete is the last one, the swap operation is unnecessary. However, since this occurs\n            // so rarely, we still do the swap anyway to avoid the gas cost of adding an 'if' statement.\n\n            bytes32 lastvalue = set._values[lastIndex];\n\n            // Move the last value to the index where the value to delete is\n            set._values[toDeleteIndex] = lastvalue;\n            // Update the index for the moved value\n            set._indexes[lastvalue] = toDeleteIndex + 1; // All indexes are 1-based\n\n            // Delete the slot where the moved value was stored\n            set._values.pop();\n\n            // Delete the index for the deleted slot\n            delete set._indexes[value];\n\n            return true;\n        } else {\n            return false;\n        }\n    }\n\n    /**\n     * @dev Returns true if the value is in the set. O(1).\n     */\n    function _contains(Set storage set, bytes32 value) private view returns (bool) {\n        return set._indexes[value] != 0;\n    }\n\n    /**\n     * @dev Returns the number of values on the set. O(1).\n     */\n    function _length(Set storage set) private view returns (uint256) {\n        return set._values.length;\n    }\n\n   /**\n    * @dev Returns the value stored at position `index` in the set. O(1).\n    *\n    * Note that there are no guarantees on the ordering of values inside the\n    * array, and it may change when more values are added or removed.\n    *\n    * Requirements:\n    *\n    * - `index` must be strictly less than {length}.\n    */\n    function _at(Set storage set, uint256 index) private view returns (bytes32) {\n        require(set._values.length > index, \"EnumerableSet: index out of bounds\");\n        return set._values[index];\n    }\n\n    // Bytes32Set\n\n    struct Bytes32Set {\n        Set _inner;\n    }\n\n    /**\n     * @dev Add a value to a set. O(1).\n     *\n     * Returns true if the value was added to the set, that is if it was not\n     * already present.\n     */\n    function add(Bytes32Set storage set, bytes32 value) internal returns (bool) {\n        return _add(set._inner, value);\n    }\n\n    /**\n     * @dev Removes a value from a set. O(1).\n     *\n     * Returns true if the value was removed from the set, that is if it was\n     * present.\n     */\n    function remove(Bytes32Set storage set, bytes32 value) internal returns (bool) {\n        return _remove(set._inner, value);\n    }\n\n    /**\n     * @dev Returns true if the value is in the set. O(1).\n     */\n    function contains(Bytes32Set storage set, bytes32 value) internal view returns (bool) {\n        return _contains(set._inner, value);\n    }\n\n    /**\n     * @dev Returns the number of values in the set. O(1).\n     */\n    function length(Bytes32Set storage set) internal view returns (uint256) {\n        return _length(set._inner);\n    }\n\n   /**\n    * @dev Returns the value stored at position `index` in the set. O(1).\n    *\n    * Note that there are no guarantees on the ordering of values inside the\n    * array, and it may change when more values are added or removed.\n    *\n    * Requirements:\n    *\n    * - `index` must be strictly less than {length}.\n    */\n    function at(Bytes32Set storage set, uint256 index) internal view returns (bytes32) {\n        return _at(set._inner, index);\n    }\n\n    // AddressSet\n\n    struct AddressSet {\n        Set _inner;\n    }\n\n    /**\n     * @dev Add a value to a set. O(1).\n     *\n     * Returns true if the value was added to the set, that is if it was not\n     * already present.\n     */\n    function add(AddressSet storage set, address value) internal returns (bool) {\n        return _add(set._inner, bytes32(uint256(uint160(value))));\n    }\n\n    /**\n     * @dev Removes a value from a set. O(1).\n     *\n     * Returns true if the value was removed from the set, that is if it was\n     * present.\n     */\n    function remove(AddressSet storage set, address value) internal returns (bool) {\n        return _remove(set._inner, bytes32(uint256(uint160(value))));\n    }\n\n    /**\n     * @dev Returns true if the value is in the set. O(1).\n     */\n    function contains(AddressSet storage set, address value) internal view returns (bool) {\n        return _contains(set._inner, bytes32(uint256(uint160(value))));\n    }\n\n    /**\n     * @dev Returns the number of values in the set. O(1).\n     */\n    function length(AddressSet storage set) internal view returns (uint256) {\n        return _length(set._inner);\n    }\n\n   /**\n    * @dev Returns the value stored at position `index` in the set. O(1).\n    *\n    * Note that there are no guarantees on the ordering of values inside the\n    * array, and it may change when more values are added or removed.\n    *\n    * Requirements:\n    *\n    * - `index` must be strictly less than {length}.\n    */\n    function at(AddressSet storage set, uint256 index) internal view returns (address) {\n        return address(uint160(uint256(_at(set._inner, index))));\n    }\n\n\n    // UintSet\n\n    struct UintSet {\n        Set _inner;\n    }\n\n    /**\n     * @dev Add a value to a set. O(1).\n     *\n     * Returns true if the value was added to the set, that is if it was not\n     * already present.\n     */\n    function add(UintSet storage set, uint256 value) internal returns (bool) {\n        return _add(set._inner, bytes32(value));\n    }\n\n    /**\n     * @dev Removes a value from a set. O(1).\n     *\n     * Returns true if the value was removed from the set, that is if it was\n     * present.\n     */\n    function remove(UintSet storage set, uint256 value) internal returns (bool) {\n        return _remove(set._inner, bytes32(value));\n    }\n\n    /**\n     * @dev Returns true if the value is in the set. O(1).\n     */\n    function contains(UintSet storage set, uint256 value) internal view returns (bool) {\n        return _contains(set._inner, bytes32(value));\n    }\n\n    /**\n     * @dev Returns the number of values on the set. O(1).\n     */\n    function length(UintSet storage set) internal view returns (uint256) {\n        return _length(set._inner);\n    }\n\n   /**\n    * @dev Returns the value stored at position `index` in the set. O(1).\n    *\n    * Note that there are no guarantees on the ordering of values inside the\n    * array, and it may change when more values are added or removed.\n    *\n    * Requirements:\n    *\n    * - `index` must be strictly less than {length}.\n    */\n    function at(UintSet storage set, uint256 index) internal view returns (uint256) {\n        return uint256(_at(set._inner, index));\n    }\n}\n",
+            "contracts/MasterChef.sol": "// SPDX-License-Identifier: MIT\n\npragma solidity 0.6.12;\n\nimport \"@openzeppelin/contracts/token/ERC20/IERC20.sol\";\nimport \"@openzeppelin/contracts/token/ERC20/SafeERC20.sol\";\nimport \"@openzeppelin/contracts/utils/EnumerableSet.sol\";\nimport \"@openzeppelin/contracts/math/SafeMath.sol\";\nimport \"@openzeppelin/contracts/access/Ownable.sol\";\nimport \"./SushiToken.sol\";\n\ninterface IMigratorChef {\n    // Perform LP token migration from legacy UniswapV2 to SushiSwap.\n    // Take the current LP token address and return the new LP token address.\n    // Migrator should have full access to the caller's LP token.\n    // Return the new LP token address.\n    //\n    // XXX Migrator must have allowance access to UniswapV2 LP tokens.\n    // SushiSwap must mint EXACTLY the same amount of SushiSwap LP tokens or\n    // else something bad will happen. Traditional UniswapV2 does not\n    // do that so be careful!\n    function migrate(IERC20 token) external returns (IERC20);\n}\n\n// MasterChef is the master of Sushi. He can make Sushi and he is a fair guy.\n//\n// Note that it's ownable and the owner wields tremendous power. The ownership\n// will be transferred to a governance smart contract once SUSHI is sufficiently\n// distributed and the community can show to govern itself.\n//\n// Have fun reading it. Hopefully it's bug-free. God bless.\ncontract MasterChef is Ownable {\n    using SafeMath for uint256;\n    using SafeERC20 for IERC20;\n    // Info of each user.\n    struct UserInfo {\n        uint256 amount; // How many LP tokens the user has provided.\n        uint256 rewardDebt; // Reward debt. See explanation below.\n        //\n        // We do some fancy math here. Basically, any point in time, the amount of SUSHIs\n        // entitled to a user but is pending to be distributed is:\n        //\n        //   pending reward = (user.amount * pool.accSushiPerShare) - user.rewardDebt\n        //\n        // Whenever a user deposits or withdraws LP tokens to a pool. Here's what happens:\n        //   1. The pool's `accSushiPerShare` (and `lastRewardBlock`) gets updated.\n        //   2. User receives the pending reward sent to his/her address.\n        //   3. User's `amount` gets updated.\n        //   4. User's `rewardDebt` gets updated.\n    }\n    // Info of each pool.\n    struct PoolInfo {\n        IERC20 lpToken; // Address of LP token contract.\n        uint256 allocPoint; // How many allocation points assigned to this pool. SUSHIs to distribute per block.\n        uint256 lastRewardBlock; // Last block number that SUSHIs distribution occurs.\n        uint256 accSushiPerShare; // Accumulated SUSHIs per share, times 1e12. See below.\n    }\n    // The SUSHI TOKEN!\n    SushiToken public sushi;\n    // Dev address.\n    address public devaddr;\n    // Block number when bonus SUSHI period ends.\n    uint256 public bonusEndBlock;\n    // SUSHI tokens created per block.\n    uint256 public sushiPerBlock;\n    // Bonus muliplier for early sushi makers.\n    uint256 public constant BONUS_MULTIPLIER = 10;\n    // The migrator contract. It has a lot of power. Can only be set through governance (owner).\n    IMigratorChef public migrator;\n    // Info of each pool.\n    PoolInfo[] public poolInfo;\n    // Info of each user that stakes LP tokens.\n    mapping(uint256 => mapping(address => UserInfo)) public userInfo;\n    // Total allocation poitns. Must be the sum of all allocation points in all pools.\n    uint256 public totalAllocPoint = 0;\n    // The block number when SUSHI mining starts.\n    uint256 public startBlock;\n    event Deposit(address indexed user, uint256 indexed pid, uint256 amount);\n    event Withdraw(address indexed user, uint256 indexed pid, uint256 amount);\n    event EmergencyWithdraw(\n        address indexed user,\n        uint256 indexed pid,\n        uint256 amount\n    );\n\n    constructor(\n        SushiToken _sushi,\n        address _devaddr,\n        uint256 _sushiPerBlock,\n        uint256 _startBlock,\n        uint256 _bonusEndBlock\n    ) public {\n        sushi = _sushi;\n        devaddr = _devaddr;\n        sushiPerBlock = _sushiPerBlock;\n        bonusEndBlock = _bonusEndBlock;\n        startBlock = _startBlock;\n    }\n\n    function poolLength() external view returns (uint256) {\n        return poolInfo.length;\n    }\n\n    // Add a new lp to the pool. Can only be called by the owner.\n    // XXX DO NOT add the same LP token more than once. Rewards will be messed up if you do.\n    function add(\n        uint256 _allocPoint,\n        IERC20 _lpToken,\n        bool _withUpdate\n    ) public onlyOwner {\n        if (_withUpdate) {\n            massUpdatePools();\n        }\n        uint256 lastRewardBlock =\n            block.number > startBlock ? block.number : startBlock;\n        totalAllocPoint = totalAllocPoint.add(_allocPoint);\n        poolInfo.push(\n            PoolInfo({\n                lpToken: _lpToken,\n                allocPoint: _allocPoint,\n                lastRewardBlock: lastRewardBlock,\n                accSushiPerShare: 0\n            })\n        );\n    }\n\n    // Update the given pool's SUSHI allocation point. Can only be called by the owner.\n    function set(\n        uint256 _pid,\n        uint256 _allocPoint,\n        bool _withUpdate\n    ) public onlyOwner {\n        if (_withUpdate) {\n            massUpdatePools();\n        }\n        totalAllocPoint = totalAllocPoint.sub(poolInfo[_pid].allocPoint).add(\n            _allocPoint\n        );\n        poolInfo[_pid].allocPoint = _allocPoint;\n    }\n\n    // Set the migrator contract. Can only be called by the owner.\n    function setMigrator(IMigratorChef _migrator) public onlyOwner {\n        migrator = _migrator;\n    }\n\n    // Migrate lp token to another lp contract. Can be called by anyone. We trust that migrator contract is good.\n    function migrate(uint256 _pid) public {\n        require(address(migrator) != address(0), \"migrate: no migrator\");\n        PoolInfo storage pool = poolInfo[_pid];\n        IERC20 lpToken = pool.lpToken;\n        uint256 bal = lpToken.balanceOf(address(this));\n        lpToken.safeApprove(address(migrator), bal);\n        IERC20 newLpToken = migrator.migrate(lpToken);\n        require(bal == newLpToken.balanceOf(address(this)), \"migrate: bad\");\n        pool.lpToken = newLpToken;\n    }\n\n    // Return reward multiplier over the given _from to _to block.\n    function getMultiplier(uint256 _from, uint256 _to)\n        public\n        view\n        returns (uint256)\n    {\n        if (_to <= bonusEndBlock) {\n            return _to.sub(_from).mul(BONUS_MULTIPLIER);\n        } else if (_from >= bonusEndBlock) {\n            return _to.sub(_from);\n        } else {\n            return\n                bonusEndBlock.sub(_from).mul(BONUS_MULTIPLIER).add(\n                    _to.sub(bonusEndBlock)\n                );\n        }\n    }\n\n    // View function to see pending SUSHIs on frontend.\n    function pendingSushi(uint256 _pid, address _user)\n        external\n        view\n        returns (uint256)\n    {\n        PoolInfo storage pool = poolInfo[_pid];\n        UserInfo storage user = userInfo[_pid][_user];\n        uint256 accSushiPerShare = pool.accSushiPerShare;\n        uint256 lpSupply = pool.lpToken.balanceOf(address(this));\n        if (block.number > pool.lastRewardBlock && lpSupply != 0) {\n            uint256 multiplier =\n                getMultiplier(pool.lastRewardBlock, block.number);\n            uint256 sushiReward =\n                multiplier.mul(sushiPerBlock).mul(pool.allocPoint).div(\n                    totalAllocPoint\n                );\n            accSushiPerShare = accSushiPerShare.add(\n                sushiReward.mul(1e12).div(lpSupply)\n            );\n        }\n        return user.amount.mul(accSushiPerShare).div(1e12).sub(user.rewardDebt);\n    }\n\n    // Update reward vairables for all pools. Be careful of gas spending!\n    function massUpdatePools() public {\n        uint256 length = poolInfo.length;\n        for (uint256 pid = 0; pid < length; ++pid) {\n            updatePool(pid);\n        }\n    }\n\n    // Update reward variables of the given pool to be up-to-date.\n    function updatePool(uint256 _pid) public {\n        PoolInfo storage pool = poolInfo[_pid];\n        if (block.number <= pool.lastRewardBlock) {\n            return;\n        }\n        uint256 lpSupply = pool.lpToken.balanceOf(address(this));\n        if (lpSupply == 0) {\n            pool.lastRewardBlock = block.number;\n            return;\n        }\n        uint256 multiplier = getMultiplier(pool.lastRewardBlock, block.number);\n        uint256 sushiReward =\n            multiplier.mul(sushiPerBlock).mul(pool.allocPoint).div(\n                totalAllocPoint\n            );\n        sushi.mint(devaddr, sushiReward.div(10));\n        sushi.mint(address(this), sushiReward);\n        pool.accSushiPerShare = pool.accSushiPerShare.add(\n            sushiReward.mul(1e12).div(lpSupply)\n        );\n        pool.lastRewardBlock = block.number;\n    }\n\n    // Deposit LP tokens to MasterChef for SUSHI allocation.\n    function deposit(uint256 _pid, uint256 _amount) public {\n        PoolInfo storage pool = poolInfo[_pid];\n        UserInfo storage user = userInfo[_pid][msg.sender];\n        updatePool(_pid);\n        if (user.amount > 0) {\n            uint256 pending =\n                user.amount.mul(pool.accSushiPerShare).div(1e12).sub(\n                    user.rewardDebt\n                );\n            safeSushiTransfer(msg.sender, pending);\n        }\n        pool.lpToken.safeTransferFrom(\n            address(msg.sender),\n            address(this),\n            _amount\n        );\n        user.amount = user.amount.add(_amount);\n        user.rewardDebt = user.amount.mul(pool.accSushiPerShare).div(1e12);\n        emit Deposit(msg.sender, _pid, _amount);\n    }\n\n    // Withdraw LP tokens from MasterChef.\n    function withdraw(uint256 _pid, uint256 _amount) public {\n        PoolInfo storage pool = poolInfo[_pid];\n        UserInfo storage user = userInfo[_pid][msg.sender];\n        require(user.amount >= _amount, \"withdraw: not good\");\n        updatePool(_pid);\n        uint256 pending =\n            user.amount.mul(pool.accSushiPerShare).div(1e12).sub(\n                user.rewardDebt\n            );\n        safeSushiTransfer(msg.sender, pending);\n        user.amount = user.amount.sub(_amount);\n        user.rewardDebt = user.amount.mul(pool.accSushiPerShare).div(1e12);\n        pool.lpToken.safeTransfer(address(msg.sender), _amount);\n        emit Withdraw(msg.sender, _pid, _amount);\n    }\n\n    // Withdraw without caring about rewards. EMERGENCY ONLY.\n    function emergencyWithdraw(uint256 _pid) public {\n        PoolInfo storage pool = poolInfo[_pid];\n        UserInfo storage user = userInfo[_pid][msg.sender];\n        pool.lpToken.safeTransfer(address(msg.sender), user.amount);\n        emit EmergencyWithdraw(msg.sender, _pid, user.amount);\n        user.amount = 0;\n        user.rewardDebt = 0;\n    }\n\n    // Safe sushi transfer function, just in case if rounding error causes pool to not have enough SUSHIs.\n    function safeSushiTransfer(address _to, uint256 _amount) internal {\n        uint256 sushiBal = sushi.balanceOf(address(this));\n        if (_amount > sushiBal) {\n            sushi.transfer(_to, sushiBal);\n        } else {\n            sushi.transfer(_to, _amount);\n        }\n    }\n\n    // Update dev address by the previous dev.\n    function dev(address _devaddr) public {\n        require(msg.sender == devaddr, \"dev: wut?\");\n        devaddr = _devaddr;\n    }\n\n    // Update bonus end block\n    function updateBonusEndBlock(uint256 _bonusEndBlock) public onlyOwner {\n        bonusEndBlock = _bonusEndBlock;\n    }\n}\n",
+            "contracts/Migrator.sol": "// SPDX-License-Identifier: MIT\n\npragma solidity 0.6.12;\n\nimport \"./uniswapv2/interfaces/IUniswapV2Pair.sol\";\nimport \"./uniswapv2/interfaces/IUniswapV2Factory.sol\";\n\n\ncontract Migrator {\n    address public chef;\n    address public oldFactory;\n    IUniswapV2Factory public factory;\n    uint256 public notBeforeBlock;\n    uint256 public desiredLiquidity = uint256(-1);\n\n    constructor(\n        address _chef,\n        address _oldFactory,\n        IUniswapV2Factory _factory,\n        uint256 _notBeforeBlock\n    ) public {\n        chef = _chef;\n        oldFactory = _oldFactory;\n        factory = _factory;\n        notBeforeBlock = _notBeforeBlock;\n    }\n\n    function migrate(IUniswapV2Pair orig) public returns (IUniswapV2Pair) {\n        require(msg.sender == chef, \"not from master chef\");\n        require(block.number >= notBeforeBlock, \"too early to migrate\");\n        require(orig.factory() == oldFactory, \"not from old factory\");\n        address token0 = orig.token0();\n        address token1 = orig.token1();\n        IUniswapV2Pair pair = IUniswapV2Pair(factory.getPair(token0, token1));\n        if (pair == IUniswapV2Pair(address(0))) {\n            pair = IUniswapV2Pair(factory.createPair(token0, token1));\n        }\n        uint256 lp = orig.balanceOf(msg.sender);\n        if (lp == 0) return pair;\n        desiredLiquidity = lp;\n        orig.transferFrom(msg.sender, address(orig), lp);\n        orig.burn(address(pair));\n        pair.mint(msg.sender);\n        desiredLiquidity = uint256(-1);\n        return pair;\n    }\n}",
+            "contracts/Ownable.sol": "// SPDX-License-Identifier: MIT\n// Audit on 5-Jan-2021 by Keno and BoringCrypto\n\n// P1 - P3: OK\npragma solidity 0.6.12;\n\n// Source: https://github.com/OpenZeppelin/openzeppelin-contracts/blob/master/contracts/access/Ownable.sol + Claimable.sol\n// Edited by BoringCrypto\n\n// T1 - T4: OK\ncontract OwnableData {\n    // V1 - V5: OK\n    address public owner;\n    // V1 - V5: OK\n    address public pendingOwner;\n}\n\n// T1 - T4: OK\ncontract Ownable is OwnableData {\n    // E1: OK\n    event OwnershipTransferred(address indexed previousOwner, address indexed newOwner);\n\n    constructor () internal {\n        owner = msg.sender;\n        emit OwnershipTransferred(address(0), msg.sender);\n    }\n\n    // F1 - F9: OK\n    // C1 - C21: OK\n    function transferOwnership(address newOwner, bool direct, bool renounce) public onlyOwner {\n        if (direct) {\n            // Checks\n            require(newOwner != address(0) || renounce, \"Ownable: zero address\");\n\n            // Effects\n            emit OwnershipTransferred(owner, newOwner);\n            owner = newOwner;\n        } else {\n            // Effects\n            pendingOwner = newOwner;\n        }\n    }\n\n    // F1 - F9: OK\n    // C1 - C21: OK\n    function claimOwnership() public {\n        address _pendingOwner = pendingOwner;\n\n        // Checks\n        require(msg.sender == _pendingOwner, \"Ownable: caller != pending owner\");\n\n        // Effects\n        emit OwnershipTransferred(owner, _pendingOwner);\n        owner = _pendingOwner;\n        pendingOwner = address(0);\n    }\n\n    // M1 - M5: OK\n    // C1 - C21: OK\n    modifier onlyOwner() {\n        require(msg.sender == owner, \"Ownable: caller is not the owner\");\n        _;\n    }\n}\n",
+            "contracts/SushiBar.sol": "// SPDX-License-Identifier: MIT\n\npragma solidity 0.6.12;\n\nimport \"@openzeppelin/contracts/token/ERC20/IERC20.sol\";\nimport \"@openzeppelin/contracts/token/ERC20/ERC20.sol\";\nimport \"@openzeppelin/contracts/math/SafeMath.sol\";\n\n// SushiBar is the coolest bar in town. You come in with some Sushi, and leave with more! The longer you stay, the more Sushi you get.\n//\n// This contract handles swapping to and from xSushi, SushiSwap's staking token.\ncontract SushiBar is ERC20(\"SushiBar\", \"xSUSHI\"){\n    using SafeMath for uint256;\n    IERC20 public sushi;\n\n    // Define the Sushi token contract\n    constructor(IERC20 _sushi) public {\n        sushi = _sushi;\n    }\n\n    // Enter the bar. Pay some SUSHIs. Earn some shares.\n    // Locks Sushi and mints xSushi\n    function enter(uint256 _amount) public {\n        // Gets the amount of Sushi locked in the contract\n        uint256 totalSushi = sushi.balanceOf(address(this));\n        // Gets the amount of xSushi in existence\n        uint256 totalShares = totalSupply();\n        // If no xSushi exists, mint it 1:1 to the amount put in\n        if (totalShares == 0 || totalSushi == 0) {\n            _mint(msg.sender, _amount);\n        } \n        // Calculate and mint the amount of xSushi the Sushi is worth. The ratio will change overtime, as xSushi is burned/minted and Sushi deposited + gained from fees / withdrawn.\n        else {\n            uint256 what = _amount.mul(totalShares).div(totalSushi);\n            _mint(msg.sender, what);\n        }\n        // Lock the Sushi in the contract\n        sushi.transferFrom(msg.sender, address(this), _amount);\n    }\n\n    // Leave the bar. Claim back your SUSHIs.\n    // Unlocks the staked + gained Sushi and burns xSushi\n    function leave(uint256 _share) public {\n        // Gets the amount of xSushi in existence\n        uint256 totalShares = totalSupply();\n        // Calculates the amount of Sushi the xSushi is worth\n        uint256 what = _share.mul(sushi.balanceOf(address(this))).div(totalShares);\n        _burn(msg.sender, _share);\n        sushi.transfer(msg.sender, what);\n    }\n}\n",
+            "contracts/SushiMaker.sol": "// SPDX-License-Identifier: MIT\n\n// P1 - P3: OK\npragma solidity 0.6.12;\nimport \"./libraries/SafeMath.sol\";\nimport \"./libraries/SafeERC20.sol\";\n\nimport \"./uniswapv2/interfaces/IUniswapV2ERC20.sol\";\nimport \"./uniswapv2/interfaces/IUniswapV2Pair.sol\";\nimport \"./uniswapv2/interfaces/IUniswapV2Factory.sol\";\n\nimport \"./Ownable.sol\";\n\n// SushiMaker is MasterChef's left hand and kinda a wizard. He can cook up Sushi from pretty much anything!\n// This contract handles \"serving up\" rewards for xSushi holders by trading tokens collected from fees for Sushi.\n\n// T1 - T4: OK\ncontract SushiMaker is Ownable {\n    using SafeMath for uint256;\n    using SafeERC20 for IERC20;\n\n    // V1 - V5: OK\n    IUniswapV2Factory public immutable factory;\n    //0xC0AEe478e3658e2610c5F7A4A2E1777cE9e4f2Ac\n    // V1 - V5: OK\n    address public immutable bar;\n    //0x8798249c2E607446EfB7Ad49eC89dD1865Ff4272\n    // V1 - V5: OK\n    address private immutable sushi;\n    //0x6B3595068778DD592e39A122f4f5a5cF09C90fE2\n    // V1 - V5: OK\n    address private immutable weth;\n    //0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2\n\n    // V1 - V5: OK\n    mapping(address => address) internal _bridges;\n\n    // E1: OK\n    event LogBridgeSet(address indexed token, address indexed bridge);\n    // E1: OK\n    event LogConvert(\n        address indexed server,\n        address indexed token0,\n        address indexed token1,\n        uint256 amount0,\n        uint256 amount1,\n        uint256 amountSUSHI\n    );\n\n    constructor(\n        address _factory,\n        address _bar,\n        address _sushi,\n        address _weth\n    ) public {\n        factory = IUniswapV2Factory(_factory);\n        bar = _bar;\n        sushi = _sushi;\n        weth = _weth;\n    }\n\n    // F1 - F10: OK\n    // C1 - C24: OK\n    function bridgeFor(address token) public view returns (address bridge) {\n        bridge = _bridges[token];\n        if (bridge == address(0)) {\n            bridge = weth;\n        }\n    }\n\n    // F1 - F10: OK\n    // C1 - C24: OK\n    function setBridge(address token, address bridge) external onlyOwner {\n        // Checks\n        require(\n            token != sushi && token != weth && token != bridge,\n            \"SushiMaker: Invalid bridge\"\n        );\n\n        // Effects\n        _bridges[token] = bridge;\n        emit LogBridgeSet(token, bridge);\n    }\n\n    // M1 - M5: OK\n    // C1 - C24: OK\n    // C6: It's not a fool proof solution, but it prevents flash loans, so here it's ok to use tx.origin\n    modifier onlyEOA() {\n        // Try to make flash-loan exploit harder to do by only allowing externally owned addresses.\n        require(msg.sender == tx.origin, \"SushiMaker: must use EOA\");\n        _;\n    }\n\n    // F1 - F10: OK\n    // F3: _convert is separate to save gas by only checking the 'onlyEOA' modifier once in case of convertMultiple\n    // F6: There is an exploit to add lots of SUSHI to the bar, run convert, then remove the SUSHI again.\n    //     As the size of the SushiBar has grown, this requires large amounts of funds and isn't super profitable anymore\n    //     The onlyEOA modifier prevents this being done with a flash loan.\n    // C1 - C24: OK\n    function convert(address token0, address token1) external onlyEOA() {\n        _convert(token0, token1);\n    }\n\n    // F1 - F10: OK, see convert\n    // C1 - C24: OK\n    // C3: Loop is under control of the caller\n    function convertMultiple(\n        address[] calldata token0,\n        address[] calldata token1\n    ) external onlyEOA() {\n        // TODO: This can be optimized a fair bit, but this is safer and simpler for now\n        uint256 len = token0.length;\n        for (uint256 i = 0; i < len; i++) {\n            _convert(token0[i], token1[i]);\n        }\n    }\n\n    // F1 - F10: OK\n    // C1- C24: OK\n    function _convert(address token0, address token1) internal {\n        // Interactions\n        // S1 - S4: OK\n        IUniswapV2Pair pair = IUniswapV2Pair(factory.getPair(token0, token1));\n        require(address(pair) != address(0), \"SushiMaker: Invalid pair\");\n        // balanceOf: S1 - S4: OK\n        // transfer: X1 - X5: OK\n        IERC20(address(pair)).safeTransfer(\n            address(pair),\n            pair.balanceOf(address(this))\n        );\n        // X1 - X5: OK\n        (uint256 amount0, uint256 amount1) = pair.burn(address(this));\n        if (token0 != pair.token0()) {\n            (amount0, amount1) = (amount1, amount0);\n        }\n        emit LogConvert(\n            msg.sender,\n            token0,\n            token1,\n            amount0,\n            amount1,\n            _convertStep(token0, token1, amount0, amount1)\n        );\n    }\n\n    // F1 - F10: OK\n    // C1 - C24: OK\n    // All safeTransfer, _swap, _toSUSHI, _convertStep: X1 - X5: OK\n    function _convertStep(\n        address token0,\n        address token1,\n        uint256 amount0,\n        uint256 amount1\n    ) internal returns (uint256 sushiOut) {\n        // Interactions\n        if (token0 == token1) {\n            uint256 amount = amount0.add(amount1);\n            if (token0 == sushi) {\n                IERC20(sushi).safeTransfer(bar, amount);\n                sushiOut = amount;\n            } else if (token0 == weth) {\n                sushiOut = _toSUSHI(weth, amount);\n            } else {\n                address bridge = bridgeFor(token0);\n                amount = _swap(token0, bridge, amount, address(this));\n                sushiOut = _convertStep(bridge, bridge, amount, 0);\n            }\n        } else if (token0 == sushi) {\n            // eg. SUSHI - ETH\n            IERC20(sushi).safeTransfer(bar, amount0);\n            sushiOut = _toSUSHI(token1, amount1).add(amount0);\n        } else if (token1 == sushi) {\n            // eg. USDT - SUSHI\n            IERC20(sushi).safeTransfer(bar, amount1);\n            sushiOut = _toSUSHI(token0, amount0).add(amount1);\n        } else if (token0 == weth) {\n            // eg. ETH - USDC\n            sushiOut = _toSUSHI(\n                weth,\n                _swap(token1, weth, amount1, address(this)).add(amount0)\n            );\n        } else if (token1 == weth) {\n            // eg. USDT - ETH\n            sushiOut = _toSUSHI(\n                weth,\n                _swap(token0, weth, amount0, address(this)).add(amount1)\n            );\n        } else {\n            // eg. MIC - USDT\n            address bridge0 = bridgeFor(token0);\n            address bridge1 = bridgeFor(token1);\n            if (bridge0 == token1) {\n                // eg. MIC - USDT - and bridgeFor(MIC) = USDT\n                sushiOut = _convertStep(\n                    bridge0,\n                    token1,\n                    _swap(token0, bridge0, amount0, address(this)),\n                    amount1\n                );\n            } else if (bridge1 == token0) {\n                // eg. WBTC - DSD - and bridgeFor(DSD) = WBTC\n                sushiOut = _convertStep(\n                    token0,\n                    bridge1,\n                    amount0,\n                    _swap(token1, bridge1, amount1, address(this))\n                );\n            } else {\n                sushiOut = _convertStep(\n                    bridge0,\n                    bridge1, // eg. USDT - DSD - and bridgeFor(DSD) = WBTC\n                    _swap(token0, bridge0, amount0, address(this)),\n                    _swap(token1, bridge1, amount1, address(this))\n                );\n            }\n        }\n    }\n\n    // F1 - F10: OK\n    // C1 - C24: OK\n    // All safeTransfer, swap: X1 - X5: OK\n    function _swap(\n        address fromToken,\n        address toToken,\n        uint256 amountIn,\n        address to\n    ) internal returns (uint256 amountOut) {\n        // Checks\n        // X1 - X5: OK\n        IUniswapV2Pair pair =\n            IUniswapV2Pair(factory.getPair(fromToken, toToken));\n        require(address(pair) != address(0), \"SushiMaker: Cannot convert\");\n\n        // Interactions\n        // X1 - X5: OK\n        (uint256 reserve0, uint256 reserve1, ) = pair.getReserves();\n        uint256 amountInWithFee = amountIn.mul(997);\n        if (fromToken == pair.token0()) {\n            amountOut =\n                amountInWithFee.mul(reserve1) /\n                reserve0.mul(1000).add(amountInWithFee);\n            IERC20(fromToken).safeTransfer(address(pair), amountIn);\n            pair.swap(0, amountOut, to, new bytes(0));\n            // TODO: Add maximum slippage?\n        } else {\n            amountOut =\n                amountInWithFee.mul(reserve0) /\n                reserve1.mul(1000).add(amountInWithFee);\n            IERC20(fromToken).safeTransfer(address(pair), amountIn);\n            pair.swap(amountOut, 0, to, new bytes(0));\n            // TODO: Add maximum slippage?\n        }\n    }\n\n    // F1 - F10: OK\n    // C1 - C24: OK\n    function _toSUSHI(address token, uint256 amountIn)\n        internal\n        returns (uint256 amountOut)\n    {\n        // X1 - X5: OK\n        amountOut = _swap(token, sushi, amountIn, bar);\n    }\n}\n",
+            "contracts/SushiMakerKashi.sol": "// SPDX-License-Identifier: MIT\n\npragma solidity 0.6.12;\nimport \"./libraries/SafeMath.sol\";\nimport \"./libraries/SafeERC20.sol\";\n\nimport \"./uniswapv2/interfaces/IUniswapV2Pair.sol\";\nimport \"./uniswapv2/interfaces/IUniswapV2Factory.sol\";\n\nimport \"./Ownable.sol\";\n\ninterface IBentoBoxWithdraw {\n    function withdraw(\n        IERC20 token_,\n        address from,\n        address to,\n        uint256 amount,\n        uint256 share\n    ) external returns (uint256 amountOut, uint256 shareOut);\n}\n\ninterface IKashiWithdrawFee {\n    function asset() external view returns (address);\n    function balanceOf(address account) external view returns (uint256);\n    function withdrawFees() external;\n    function removeAsset(address to, uint256 fraction) external returns (uint256 share);\n}\n\n// SushiMakerKashi is MasterChef's left hand and kinda a wizard. He can cook up Sushi from pretty much anything!\n// This contract handles \"serving up\" rewards for xSushi holders by trading tokens collected from Kashi fees for Sushi.\ncontract SushiMakerKashi is Ownable {\n    using SafeMath for uint256;\n    using SafeERC20 for IERC20;\n\n    IUniswapV2Factory private immutable factory;\n    //0xC0AEe478e3658e2610c5F7A4A2E1777cE9e4f2Ac\n    address private immutable bar;\n    //0x8798249c2E607446EfB7Ad49eC89dD1865Ff4272\n    IBentoBoxWithdraw private immutable bentoBox;\n    //0xF5BCE5077908a1b7370B9ae04AdC565EBd643966 \n    address private immutable sushi;\n    //0x6B3595068778DD592e39A122f4f5a5cF09C90fE2\n    address private immutable weth;\n    //0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2\n    bytes32 private immutable pairCodeHash;\n    //0xe18a34eb0e04b04f7a0ac29a6e80748dca96319b42c54d679cb821dca90c6303\n\n    mapping(address => address) private _bridges;\n\n    event LogBridgeSet(address indexed token, address indexed bridge);\n    event LogConvert(\n        address indexed server,\n        address indexed token0,\n        uint256 amount0,\n        uint256 amountBENTO,\n        uint256 amountSUSHI\n    );\n\n    constructor(\n        IUniswapV2Factory _factory,\n        address _bar,\n        IBentoBoxWithdraw _bentoBox,\n        address _sushi,\n        address _weth,\n        bytes32 _pairCodeHash\n    ) public {\n        factory = _factory;\n        bar = _bar;\n        bentoBox = _bentoBox;\n        sushi = _sushi;\n        weth = _weth;\n        pairCodeHash = _pairCodeHash;\n    }\n\n    function setBridge(address token, address bridge) external onlyOwner {\n        // Checks\n        require(\n            token != sushi && token != weth && token != bridge,\n            \"Maker: Invalid bridge\"\n        );\n        // Effects\n        _bridges[token] = bridge;\n        emit LogBridgeSet(token, bridge);\n    }\n\n    modifier onlyEOA() {\n        // Try to make flash-loan exploit harder to do by only allowing externally-owned addresses.\n        require(msg.sender == tx.origin, \"Maker: Must use EOA\");\n        _;\n    }\n\n    function convert(IKashiWithdrawFee kashiPair) external onlyEOA {\n        _convert(kashiPair);\n    }\n\n    function convertMultiple(IKashiWithdrawFee[] calldata kashiPair) external onlyEOA {\n        for (uint256 i = 0; i < kashiPair.length; i++) {\n            _convert(kashiPair[i]);\n        }\n    }\n\n    function _convert(IKashiWithdrawFee kashiPair) private {\n        // update Kashi fees for this Maker contract (`feeTo`)\n        kashiPair.withdrawFees();\n\n        // convert updated Kashi balance to Bento shares\n        uint256 bentoShares = kashiPair.removeAsset(address(this), kashiPair.balanceOf(address(this)));\n\n        // convert Bento shares to underlying Kashi asset (`token0`) balance (`amount0`) for Maker\n        address token0 = kashiPair.asset();\n        (uint256 amount0, ) = bentoBox.withdraw(IERC20(token0), address(this), address(this), 0, bentoShares);\n\n        emit LogConvert(\n            msg.sender,\n            token0,\n            amount0,\n            bentoShares,\n            _convertStep(token0, amount0)\n        );\n    }\n\n    function _convertStep(address token0, uint256 amount0) private returns (uint256 sushiOut) {\n        if (token0 == sushi) {\n            IERC20(token0).safeTransfer(bar, amount0);\n            sushiOut = amount0;\n        } else if (token0 == weth) {\n            sushiOut = _swap(token0, sushi, amount0, bar);\n        } else {\n            address bridge = _bridges[token0];\n            if (bridge == address(0)) {\n                bridge = weth;\n            }\n            uint256 amountOut = _swap(token0, bridge, amount0, address(this));\n            sushiOut = _convertStep(bridge, amountOut);\n        }\n    }\n\n    function _swap(\n        address fromToken,\n        address toToken,\n        uint256 amountIn,\n        address to\n    ) private returns (uint256 amountOut) {\n        (address token0, address token1) = fromToken < toToken ? (fromToken, toToken) : (toToken, fromToken);\n        IUniswapV2Pair pair =\n            IUniswapV2Pair(\n                uint256(\n                    keccak256(abi.encodePacked(hex\"ff\", factory, keccak256(abi.encodePacked(token0, token1)), pairCodeHash))\n                )\n            );\n        \n        (uint256 reserve0, uint256 reserve1, ) = pair.getReserves();\n        uint256 amountInWithFee = amountIn.mul(997);\n        \n        if (toToken > fromToken) {\n            amountOut =\n                amountInWithFee.mul(reserve1) /\n                reserve0.mul(1000).add(amountInWithFee);\n            IERC20(fromToken).safeTransfer(address(pair), amountIn);\n            pair.swap(0, amountOut, to, \"\");\n        } else {\n            amountOut =\n                amountInWithFee.mul(reserve0) /\n                reserve1.mul(1000).add(amountInWithFee);\n            IERC20(fromToken).safeTransfer(address(pair), amountIn);\n            pair.swap(amountOut, 0, to, \"\");\n        }\n    }\n}\n",
+            "contracts/SushiRoll.sol": "// SPDX-License-Identifier: MIT\n\npragma solidity 0.6.12;\n\nimport \"@openzeppelin/contracts/token/ERC20/IERC20.sol\";\nimport \"@openzeppelin/contracts/token/ERC20/SafeERC20.sol\";\nimport \"./uniswapv2/interfaces/IUniswapV2Pair.sol\";\nimport \"./uniswapv2/interfaces/IUniswapV2Router01.sol\";\nimport \"./uniswapv2/interfaces/IUniswapV2Factory.sol\";\nimport \"./uniswapv2/libraries/UniswapV2Library.sol\";\n\n// SushiRoll helps your migrate your existing Uniswap LP tokens to SushiSwap LP ones\ncontract SushiRoll {\n    using SafeERC20 for IERC20;\n\n    IUniswapV2Router01 public oldRouter;\n    IUniswapV2Router01 public router;\n\n    constructor(IUniswapV2Router01 _oldRouter, IUniswapV2Router01 _router) public {\n        oldRouter = _oldRouter;\n        router = _router;\n    }\n\n    function migrateWithPermit(\n        address tokenA,\n        address tokenB,\n        uint256 liquidity,\n        uint256 amountAMin,\n        uint256 amountBMin,\n        uint256 deadline,\n        uint8 v,\n        bytes32 r,\n        bytes32 s\n    ) public {\n        IUniswapV2Pair pair = IUniswapV2Pair(pairForOldRouter(tokenA, tokenB));\n        pair.permit(msg.sender, address(this), liquidity, deadline, v, r, s);\n\n        migrate(tokenA, tokenB, liquidity, amountAMin, amountBMin, deadline);\n    }\n\n    // msg.sender should have approved 'liquidity' amount of LP token of 'tokenA' and 'tokenB'\n    function migrate(\n        address tokenA,\n        address tokenB,\n        uint256 liquidity,\n        uint256 amountAMin,\n        uint256 amountBMin,\n        uint256 deadline\n    ) public {\n        require(deadline >= block.timestamp, 'SushiSwap: EXPIRED');\n\n        // Remove liquidity from the old router with permit\n        (uint256 amountA, uint256 amountB) = removeLiquidity(\n            tokenA,\n            tokenB,\n            liquidity,\n            amountAMin,\n            amountBMin,\n            deadline\n        );\n\n        // Add liquidity to the new router\n        (uint256 pooledAmountA, uint256 pooledAmountB) = addLiquidity(tokenA, tokenB, amountA, amountB);\n\n        // Send remaining tokens to msg.sender\n        if (amountA > pooledAmountA) {\n            IERC20(tokenA).safeTransfer(msg.sender, amountA - pooledAmountA);\n        }\n        if (amountB > pooledAmountB) {\n            IERC20(tokenB).safeTransfer(msg.sender, amountB - pooledAmountB);\n        }\n    }\n\n    function removeLiquidity(\n        address tokenA,\n        address tokenB,\n        uint256 liquidity,\n        uint256 amountAMin,\n        uint256 amountBMin,\n        uint256 deadline\n    ) internal returns (uint256 amountA, uint256 amountB) {\n        IUniswapV2Pair pair = IUniswapV2Pair(pairForOldRouter(tokenA, tokenB));\n        pair.transferFrom(msg.sender, address(pair), liquidity);\n        (uint256 amount0, uint256 amount1) = pair.burn(address(this));\n        (address token0,) = UniswapV2Library.sortTokens(tokenA, tokenB);\n        (amountA, amountB) = tokenA == token0 ? (amount0, amount1) : (amount1, amount0);\n        require(amountA >= amountAMin, 'SushiRoll: INSUFFICIENT_A_AMOUNT');\n        require(amountB >= amountBMin, 'SushiRoll: INSUFFICIENT_B_AMOUNT');\n    }\n\n    // calculates the CREATE2 address for a pair without making any external calls\n    function pairForOldRouter(address tokenA, address tokenB) internal view returns (address pair) {\n        (address token0, address token1) = UniswapV2Library.sortTokens(tokenA, tokenB);\n        pair = address(uint(keccak256(abi.encodePacked(\n                hex'ff',\n                oldRouter.factory(),\n                keccak256(abi.encodePacked(token0, token1)),\n                hex'96e8ac4277198ff8b6f785478aa9a39f403cb768dd02cbee326c3e7da348845f' // init code hash\n            ))));\n    }\n\n    function addLiquidity(\n        address tokenA,\n        address tokenB,\n        uint256 amountADesired,\n        uint256 amountBDesired\n    ) internal returns (uint amountA, uint amountB) {\n        (amountA, amountB) = _addLiquidity(tokenA, tokenB, amountADesired, amountBDesired);\n        address pair = UniswapV2Library.pairFor(router.factory(), tokenA, tokenB);\n        IERC20(tokenA).safeTransfer(pair, amountA);\n        IERC20(tokenB).safeTransfer(pair, amountB);\n        IUniswapV2Pair(pair).mint(msg.sender);\n    }\n\n    function _addLiquidity(\n        address tokenA,\n        address tokenB,\n        uint256 amountADesired,\n        uint256 amountBDesired\n    ) internal returns (uint256 amountA, uint256 amountB) {\n        // create the pair if it doesn't exist yet\n        IUniswapV2Factory factory = IUniswapV2Factory(router.factory());\n        if (factory.getPair(tokenA, tokenB) == address(0)) {\n            factory.createPair(tokenA, tokenB);\n        }\n        (uint256 reserveA, uint256 reserveB) = UniswapV2Library.getReserves(address(factory), tokenA, tokenB);\n        if (reserveA == 0 && reserveB == 0) {\n            (amountA, amountB) = (amountADesired, amountBDesired);\n        } else {\n            uint256 amountBOptimal = UniswapV2Library.quote(amountADesired, reserveA, reserveB);\n            if (amountBOptimal <= amountBDesired) {\n                (amountA, amountB) = (amountADesired, amountBOptimal);\n            } else {\n                uint256 amountAOptimal = UniswapV2Library.quote(amountBDesired, reserveB, reserveA);\n                assert(amountAOptimal <= amountADesired);\n                (amountA, amountB) = (amountAOptimal, amountBDesired);\n            }\n        }\n    }\n}\n",
+            "contracts/SushiToken.sol": "// SPDX-License-Identifier: MIT\n\npragma solidity 0.6.12;\n\nimport \"@openzeppelin/contracts/token/ERC20/ERC20.sol\";\nimport \"@openzeppelin/contracts/access/Ownable.sol\";\n\n// WARNING: There is a known vuln contained within this contract related to vote delegation, \n// it's NOT recommmended to use this in production.  \n\n// SushiToken with Governance.\ncontract SushiToken is ERC20(\"Powswap\", \"POW\"), Ownable {\n    /// @notice Creates `_amount` token to `_to`. Must only be called by the owner (MasterChef).\n    function mint(address _to, uint256 _amount) public onlyOwner {\n        _mint(_to, _amount);\n        _moveDelegates(address(0), _delegates[_to], _amount);\n    }\n\n    // Copied and modified from YAM code:\n    // https://github.com/yam-finance/yam-protocol/blob/master/contracts/token/YAMGovernanceStorage.sol\n    // https://github.com/yam-finance/yam-protocol/blob/master/contracts/token/YAMGovernance.sol\n    // Which is copied and modified from COMPOUND:\n    // https://github.com/compound-finance/compound-protocol/blob/master/contracts/Governance/Comp.sol\n\n    /// @notice A record of each accounts delegate\n    mapping (address => address) internal _delegates;\n\n    /// @notice A checkpoint for marking number of votes from a given block\n    struct Checkpoint {\n        uint32 fromBlock;\n        uint256 votes;\n    }\n\n    /// @notice A record of votes checkpoints for each account, by index\n    mapping (address => mapping (uint32 => Checkpoint)) public checkpoints;\n\n    /// @notice The number of checkpoints for each account\n    mapping (address => uint32) public numCheckpoints;\n\n    /// @notice The EIP-712 typehash for the contract's domain\n    bytes32 public constant DOMAIN_TYPEHASH = keccak256(\"EIP712Domain(string name,uint256 chainId,address verifyingContract)\");\n\n    /// @notice The EIP-712 typehash for the delegation struct used by the contract\n    bytes32 public constant DELEGATION_TYPEHASH = keccak256(\"Delegation(address delegatee,uint256 nonce,uint256 expiry)\");\n\n    /// @notice A record of states for signing / validating signatures\n    mapping (address => uint) public nonces;\n\n      /// @notice An event thats emitted when an account changes its delegate\n    event DelegateChanged(address indexed delegator, address indexed fromDelegate, address indexed toDelegate);\n\n    /// @notice An event thats emitted when a delegate account's vote balance changes\n    event DelegateVotesChanged(address indexed delegate, uint previousBalance, uint newBalance);\n\n    /**\n     * @notice Delegate votes from `msg.sender` to `delegatee`\n     * @param delegator The address to get delegatee for\n     */\n    function delegates(address delegator)\n        external\n        view\n        returns (address)\n    {\n        return _delegates[delegator];\n    }\n\n   /**\n    * @notice Delegate votes from `msg.sender` to `delegatee`\n    * @param delegatee The address to delegate votes to\n    */\n    function delegate(address delegatee) external {\n        return _delegate(msg.sender, delegatee);\n    }\n\n    /**\n     * @notice Delegates votes from signatory to `delegatee`\n     * @param delegatee The address to delegate votes to\n     * @param nonce The contract state required to match the signature\n     * @param expiry The time at which to expire the signature\n     * @param v The recovery byte of the signature\n     * @param r Half of the ECDSA signature pair\n     * @param s Half of the ECDSA signature pair\n     */\n    function delegateBySig(\n        address delegatee,\n        uint nonce,\n        uint expiry,\n        uint8 v,\n        bytes32 r,\n        bytes32 s\n    )\n        external\n    {\n        bytes32 domainSeparator = keccak256(\n            abi.encode(\n                DOMAIN_TYPEHASH,\n                keccak256(bytes(name())),\n                getChainId(),\n                address(this)\n            )\n        );\n\n        bytes32 structHash = keccak256(\n            abi.encode(\n                DELEGATION_TYPEHASH,\n                delegatee,\n                nonce,\n                expiry\n            )\n        );\n\n        bytes32 digest = keccak256(\n            abi.encodePacked(\n                \"\\x19\\x01\",\n                domainSeparator,\n                structHash\n            )\n        );\n\n        address signatory = ecrecover(digest, v, r, s);\n        require(signatory != address(0), \"SUSHI::delegateBySig: invalid signature\");\n        require(nonce == nonces[signatory]++, \"SUSHI::delegateBySig: invalid nonce\");\n        require(now <= expiry, \"SUSHI::delegateBySig: signature expired\");\n        return _delegate(signatory, delegatee);\n    }\n\n    /**\n     * @notice Gets the current votes balance for `account`\n     * @param account The address to get votes balance\n     * @return The number of current votes for `account`\n     */\n    function getCurrentVotes(address account)\n        external\n        view\n        returns (uint256)\n    {\n        uint32 nCheckpoints = numCheckpoints[account];\n        return nCheckpoints > 0 ? checkpoints[account][nCheckpoints - 1].votes : 0;\n    }\n\n    /**\n     * @notice Determine the prior number of votes for an account as of a block number\n     * @dev Block number must be a finalized block or else this function will revert to prevent misinformation.\n     * @param account The address of the account to check\n     * @param blockNumber The block number to get the vote balance at\n     * @return The number of votes the account had as of the given block\n     */\n    function getPriorVotes(address account, uint blockNumber)\n        external\n        view\n        returns (uint256)\n    {\n        require(blockNumber < block.number, \"SUSHI::getPriorVotes: not yet determined\");\n\n        uint32 nCheckpoints = numCheckpoints[account];\n        if (nCheckpoints == 0) {\n            return 0;\n        }\n\n        // First check most recent balance\n        if (checkpoints[account][nCheckpoints - 1].fromBlock <= blockNumber) {\n            return checkpoints[account][nCheckpoints - 1].votes;\n        }\n\n        // Next check implicit zero balance\n        if (checkpoints[account][0].fromBlock > blockNumber) {\n            return 0;\n        }\n\n        uint32 lower = 0;\n        uint32 upper = nCheckpoints - 1;\n        while (upper > lower) {\n            uint32 center = upper - (upper - lower) / 2; // ceil, avoiding overflow\n            Checkpoint memory cp = checkpoints[account][center];\n            if (cp.fromBlock == blockNumber) {\n                return cp.votes;\n            } else if (cp.fromBlock < blockNumber) {\n                lower = center;\n            } else {\n                upper = center - 1;\n            }\n        }\n        return checkpoints[account][lower].votes;\n    }\n\n    function _delegate(address delegator, address delegatee)\n        internal\n    {\n        address currentDelegate = _delegates[delegator];\n        uint256 delegatorBalance = balanceOf(delegator); // balance of underlying SUSHIs (not scaled);\n        _delegates[delegator] = delegatee;\n\n        emit DelegateChanged(delegator, currentDelegate, delegatee);\n\n        _moveDelegates(currentDelegate, delegatee, delegatorBalance);\n    }\n\n    function _moveDelegates(address srcRep, address dstRep, uint256 amount) internal {\n        if (srcRep != dstRep && amount > 0) {\n            if (srcRep != address(0)) {\n                // decrease old representative\n                uint32 srcRepNum = numCheckpoints[srcRep];\n                uint256 srcRepOld = srcRepNum > 0 ? checkpoints[srcRep][srcRepNum - 1].votes : 0;\n                uint256 srcRepNew = srcRepOld.sub(amount);\n                _writeCheckpoint(srcRep, srcRepNum, srcRepOld, srcRepNew);\n            }\n\n            if (dstRep != address(0)) {\n                // increase new representative\n                uint32 dstRepNum = numCheckpoints[dstRep];\n                uint256 dstRepOld = dstRepNum > 0 ? checkpoints[dstRep][dstRepNum - 1].votes : 0;\n                uint256 dstRepNew = dstRepOld.add(amount);\n                _writeCheckpoint(dstRep, dstRepNum, dstRepOld, dstRepNew);\n            }\n        }\n    }\n\n    function _writeCheckpoint(\n        address delegatee,\n        uint32 nCheckpoints,\n        uint256 oldVotes,\n        uint256 newVotes\n    )\n        internal\n    {\n        uint32 blockNumber = safe32(block.number, \"SUSHI::_writeCheckpoint: block number exceeds 32 bits\");\n\n        if (nCheckpoints > 0 && checkpoints[delegatee][nCheckpoints - 1].fromBlock == blockNumber) {\n            checkpoints[delegatee][nCheckpoints - 1].votes = newVotes;\n        } else {\n            checkpoints[delegatee][nCheckpoints] = Checkpoint(blockNumber, newVotes);\n            numCheckpoints[delegatee] = nCheckpoints + 1;\n        }\n\n        emit DelegateVotesChanged(delegatee, oldVotes, newVotes);\n    }\n\n    function safe32(uint n, string memory errorMessage) internal pure returns (uint32) {\n        require(n < 2**32, errorMessage);\n        return uint32(n);\n    }\n\n    function getChainId() internal pure returns (uint) {\n        uint256 chainId;\n        assembly { chainId := chainid() }\n        return chainId;\n    }\n}",
+            "contracts/governance/Timelock.sol": "// SPDX-License-Identifier: MIT\n\n// COPIED FROM https://github.com/compound-finance/compound-protocol/blob/master/contracts/Governance/GovernorAlpha.sol\n// Copyright 2020 Compound Labs, Inc.\n// Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:\n// 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.\n// 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.\n// 3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.\n// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS \"AS IS\" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\n//\n// Ctrl+f for XXX to see all the modifications.\n\n// XXX: pragma solidity ^0.5.16;\npragma solidity 0.6.12;\n\n// XXX: import \"./SafeMath.sol\";\nimport \"@openzeppelin/contracts/math/SafeMath.sol\";\n\ncontract Timelock {\n    using SafeMath for uint;\n\n    event NewAdmin(address indexed newAdmin);\n    event NewPendingAdmin(address indexed newPendingAdmin);\n    event NewDelay(uint indexed newDelay);\n    event CancelTransaction(bytes32 indexed txHash, address indexed target, uint value, string signature,  bytes data, uint eta);\n    event ExecuteTransaction(bytes32 indexed txHash, address indexed target, uint value, string signature,  bytes data, uint eta);\n    event QueueTransaction(bytes32 indexed txHash, address indexed target, uint value, string signature, bytes data, uint eta);\n\n    uint public constant GRACE_PERIOD = 14 days;\n    uint public constant MINIMUM_DELAY = 2 days;\n    uint public constant MAXIMUM_DELAY = 30 days;\n\n    address public admin;\n    address public pendingAdmin;\n    uint public delay;\n    bool public admin_initialized;\n\n    mapping (bytes32 => bool) public queuedTransactions;\n\n\n    constructor(address admin_, uint delay_) public {\n        require(delay_ >= MINIMUM_DELAY, \"Timelock::constructor: Delay must exceed minimum delay.\");\n        require(delay_ <= MAXIMUM_DELAY, \"Timelock::constructor: Delay must not exceed maximum delay.\");\n\n        admin = admin_;\n        delay = delay_;\n        admin_initialized = false;\n    }\n\n    // XXX: function() external payable { }\n    receive() external payable { }\n\n    function setDelay(uint delay_) public {\n        require(msg.sender == address(this), \"Timelock::setDelay: Call must come from Timelock.\");\n        require(delay_ >= MINIMUM_DELAY, \"Timelock::setDelay: Delay must exceed minimum delay.\");\n        require(delay_ <= MAXIMUM_DELAY, \"Timelock::setDelay: Delay must not exceed maximum delay.\");\n        delay = delay_;\n\n        emit NewDelay(delay);\n    }\n\n    function acceptAdmin() public {\n        require(msg.sender == pendingAdmin, \"Timelock::acceptAdmin: Call must come from pendingAdmin.\");\n        admin = msg.sender;\n        pendingAdmin = address(0);\n\n        emit NewAdmin(admin);\n    }\n\n    function setPendingAdmin(address pendingAdmin_) public {\n        // allows one time setting of admin for deployment purposes\n        if (admin_initialized) {\n            require(msg.sender == address(this), \"Timelock::setPendingAdmin: Call must come from Timelock.\");\n        } else {\n            require(msg.sender == admin, \"Timelock::setPendingAdmin: First call must come from admin.\");\n            admin_initialized = true;\n        }\n        pendingAdmin = pendingAdmin_;\n\n        emit NewPendingAdmin(pendingAdmin);\n    }\n\n    function queueTransaction(address target, uint value, string memory signature, bytes memory data, uint eta) public returns (bytes32) {\n        require(msg.sender == admin, \"Timelock::queueTransaction: Call must come from admin.\");\n        require(eta >= getBlockTimestamp().add(delay), \"Timelock::queueTransaction: Estimated execution block must satisfy delay.\");\n\n        bytes32 txHash = keccak256(abi.encode(target, value, signature, data, eta));\n        queuedTransactions[txHash] = true;\n\n        emit QueueTransaction(txHash, target, value, signature, data, eta);\n        return txHash;\n    }\n\n    function cancelTransaction(address target, uint value, string memory signature, bytes memory data, uint eta) public {\n        require(msg.sender == admin, \"Timelock::cancelTransaction: Call must come from admin.\");\n\n        bytes32 txHash = keccak256(abi.encode(target, value, signature, data, eta));\n        queuedTransactions[txHash] = false;\n\n        emit CancelTransaction(txHash, target, value, signature, data, eta);\n    }\n\n    function executeTransaction(address target, uint value, string memory signature, bytes memory data, uint eta) public payable returns (bytes memory) {\n        require(msg.sender == admin, \"Timelock::executeTransaction: Call must come from admin.\");\n\n        bytes32 txHash = keccak256(abi.encode(target, value, signature, data, eta));\n        require(queuedTransactions[txHash], \"Timelock::executeTransaction: Transaction hasn't been queued.\");\n        require(getBlockTimestamp() >= eta, \"Timelock::executeTransaction: Transaction hasn't surpassed time lock.\");\n        require(getBlockTimestamp() <= eta.add(GRACE_PERIOD), \"Timelock::executeTransaction: Transaction is stale.\");\n\n        queuedTransactions[txHash] = false;\n\n        bytes memory callData;\n\n        if (bytes(signature).length == 0) {\n            callData = data;\n        } else {\n            callData = abi.encodePacked(bytes4(keccak256(bytes(signature))), data);\n        }\n\n        // solium-disable-next-line security/no-call-value\n        (bool success, bytes memory returnData) = target.call.value(value)(callData);\n        require(success, \"Timelock::executeTransaction: Transaction execution reverted.\");\n\n        emit ExecuteTransaction(txHash, target, value, signature, data, eta);\n\n        return returnData;\n    }\n\n    function getBlockTimestamp() internal view returns (uint) {\n        // solium-disable-next-line security/no-block-members\n        return block.timestamp;\n    }\n}",
+            "contracts/interfaces/IERC20.sol": "// SPDX-License-Identifier: MIT\npragma solidity 0.6.12;\n\ninterface IERC20 {\n    function totalSupply() external view returns (uint256);\n    function balanceOf(address account) external view returns (uint256);\n    function allowance(address owner, address spender) external view returns (uint256);\n    function approve(address spender, uint256 amount) external returns (bool);\n    event Transfer(address indexed from, address indexed to, uint256 value);\n    event Approval(address indexed owner, address indexed spender, uint256 value);\n\n    // EIP 2612\n    function permit(address owner, address spender, uint256 value, uint256 deadline, uint8 v, bytes32 r, bytes32 s) external;\n}",
+            "contracts/libraries/SafeERC20.sol": "// SPDX-License-Identifier: MIT\npragma solidity 0.6.12;\n\nimport \"../interfaces/IERC20.sol\";\n\nlibrary SafeERC20 {\n    function safeSymbol(IERC20 token) internal view returns(string memory) {\n        (bool success, bytes memory data) = address(token).staticcall(abi.encodeWithSelector(0x95d89b41));\n        return success && data.length > 0 ? abi.decode(data, (string)) : \"???\";\n    }\n\n    function safeName(IERC20 token) internal view returns(string memory) {\n        (bool success, bytes memory data) = address(token).staticcall(abi.encodeWithSelector(0x06fdde03));\n        return success && data.length > 0 ? abi.decode(data, (string)) : \"???\";\n    }\n\n    function safeDecimals(IERC20 token) public view returns (uint8) {\n        (bool success, bytes memory data) = address(token).staticcall(abi.encodeWithSelector(0x313ce567));\n        return success && data.length == 32 ? abi.decode(data, (uint8)) : 18;\n    }\n\n    function safeTransfer(IERC20 token, address to, uint256 amount) internal {\n        (bool success, bytes memory data) = address(token).call(abi.encodeWithSelector(0xa9059cbb, to, amount));\n        require(success && (data.length == 0 || abi.decode(data, (bool))), \"SafeERC20: Transfer failed\");\n    }\n\n    function safeTransferFrom(IERC20 token, address from, uint256 amount) internal {\n        (bool success, bytes memory data) = address(token).call(abi.encodeWithSelector(0x23b872dd, from, address(this), amount));\n        require(success && (data.length == 0 || abi.decode(data, (bool))), \"SafeERC20: TransferFrom failed\");\n    }\n}\n",
+            "contracts/libraries/SafeMath.sol": "// SPDX-License-Identifier: MIT\npragma solidity 0.6.12;\n// a library for performing overflow-safe math, updated with awesomeness from of DappHub (https://github.com/dapphub/ds-math)\nlibrary SafeMath {\n    function add(uint256 a, uint256 b) internal pure returns (uint256 c) {require((c = a + b) >= b, \"SafeMath: Add Overflow\");}\n    function sub(uint256 a, uint256 b) internal pure returns (uint256 c) {require((c = a - b) <= a, \"SafeMath: Underflow\");}\n    function mul(uint256 a, uint256 b) internal pure returns (uint256 c) {require(b == 0 || (c = a * b)/b == a, \"SafeMath: Mul Overflow\");}\n    function to128(uint256 a) internal pure returns (uint128 c) {\n        require(a <= uint128(-1), \"SafeMath: uint128 Overflow\");\n        c = uint128(a);\n    }\n}\n\nlibrary SafeMath128 {\n    function add(uint128 a, uint128 b) internal pure returns (uint128 c) {require((c = a + b) >= b, \"SafeMath: Add Overflow\");}\n    function sub(uint128 a, uint128 b) internal pure returns (uint128 c) {require((c = a - b) <= a, \"SafeMath: Underflow\");}\n}\n",
+            "contracts/mocks/ERC20Mock.sol": "// SPDX-License-Identifier: MIT\n\npragma solidity 0.6.12;\n\nimport \"@openzeppelin/contracts/token/ERC20/ERC20.sol\";\n\ncontract ERC20Mock is ERC20 {\n    constructor(\n        string memory name,\n        string memory symbol,\n        uint256 supply\n    ) public ERC20(name, symbol) {\n        _mint(msg.sender, supply);\n    }\n}",
+            "contracts/mocks/SushiMakerExploitMock.sol": "// SPDX-License-Identifier: MIT\n\npragma solidity 0.6.12;\n\nimport \"../SushiMaker.sol\";\n\ncontract SushiMakerExploitMock {\n    SushiMaker public immutable sushiMaker;\n    constructor (address _sushiMaker) public{\n        sushiMaker = SushiMaker(_sushiMaker);\n    } \n    function convert(address token0, address token1) external {\n        sushiMaker.convert(token0, token1);\n    }\n}",
+            "contracts/mocks/SushiMakerKashiExploitMock.sol": "// SPDX-License-Identifier: MIT\n\npragma solidity 0.6.12;\n\nimport \"../SushiMakerKashi.sol\";\n\ncontract SushiMakerKashiExploitMock {\n    SushiMakerKashi public immutable sushiMaker;\n    \n    constructor(address _sushiMaker) public {\n        sushiMaker = SushiMakerKashi(_sushiMaker);\n    } \n  \n    function convert(IKashiWithdrawFee kashiPair) external {\n        sushiMaker.convert(kashiPair);\n    }\n}\n",
+            "contracts/mocks/SushiSwapFactoryMock.sol": "// SPDX-License-Identifier: MIT\n\npragma solidity 0.6.12;\n\nimport \"../uniswapv2/UniswapV2Factory.sol\";\n\ncontract SushiSwapFactoryMock is UniswapV2Factory {\n    constructor(address _feeToSetter) public UniswapV2Factory(_feeToSetter) {}\n}",
+            "contracts/mocks/SushiSwapPairMock.sol": "// SPDX-License-Identifier: MIT\n\npragma solidity 0.6.12;\n\nimport \"../uniswapv2/UniswapV2Pair.sol\";\n\ncontract SushiSwapPairMock is UniswapV2Pair {\n    constructor() public UniswapV2Pair() {}\n}",
+            "contracts/uniswapv2/UniswapV2ERC20.sol": "// SPDX-License-Identifier: GPL-3.0\n\npragma solidity =0.6.12;\n\nimport './libraries/SafeMath.sol';\n\ncontract UniswapV2ERC20 {\n    using SafeMathUniswap for uint;\n\n    string public constant name = 'SushiSwap LP Token';\n    string public constant symbol = 'SLP';\n    uint8 public constant decimals = 18;\n    uint  public totalSupply;\n    mapping(address => uint) public balanceOf;\n    mapping(address => mapping(address => uint)) public allowance;\n\n    bytes32 public DOMAIN_SEPARATOR;\n    // keccak256(\"Permit(address owner,address spender,uint256 value,uint256 nonce,uint256 deadline)\");\n    bytes32 public constant PERMIT_TYPEHASH = 0x6e71edae12b1b97f4d1f60370fef10105fa2faae0126114a169c64845d6126c9;\n    mapping(address => uint) public nonces;\n\n    event Approval(address indexed owner, address indexed spender, uint value);\n    event Transfer(address indexed from, address indexed to, uint value);\n\n    constructor() public {\n        uint chainId;\n        assembly {\n            chainId := chainid()\n        }\n        DOMAIN_SEPARATOR = keccak256(\n            abi.encode(\n                keccak256('EIP712Domain(string name,string version,uint256 chainId,address verifyingContract)'),\n                keccak256(bytes(name)),\n                keccak256(bytes('1')),\n                chainId,\n                address(this)\n            )\n        );\n    }\n\n    function _mint(address to, uint value) internal {\n        totalSupply = totalSupply.add(value);\n        balanceOf[to] = balanceOf[to].add(value);\n        emit Transfer(address(0), to, value);\n    }\n\n    function _burn(address from, uint value) internal {\n        balanceOf[from] = balanceOf[from].sub(value);\n        totalSupply = totalSupply.sub(value);\n        emit Transfer(from, address(0), value);\n    }\n\n    function _approve(address owner, address spender, uint value) private {\n        allowance[owner][spender] = value;\n        emit Approval(owner, spender, value);\n    }\n\n    function _transfer(address from, address to, uint value) private {\n        balanceOf[from] = balanceOf[from].sub(value);\n        balanceOf[to] = balanceOf[to].add(value);\n        emit Transfer(from, to, value);\n    }\n\n    function approve(address spender, uint value) external returns (bool) {\n        _approve(msg.sender, spender, value);\n        return true;\n    }\n\n    function transfer(address to, uint value) external returns (bool) {\n        _transfer(msg.sender, to, value);\n        return true;\n    }\n\n    function transferFrom(address from, address to, uint value) external returns (bool) {\n        if (allowance[from][msg.sender] != uint(-1)) {\n            allowance[from][msg.sender] = allowance[from][msg.sender].sub(value);\n        }\n        _transfer(from, to, value);\n        return true;\n    }\n\n    function permit(address owner, address spender, uint value, uint deadline, uint8 v, bytes32 r, bytes32 s) external {\n        require(deadline >= block.timestamp, 'UniswapV2: EXPIRED');\n        bytes32 digest = keccak256(\n            abi.encodePacked(\n                '\\x19\\x01',\n                DOMAIN_SEPARATOR,\n                keccak256(abi.encode(PERMIT_TYPEHASH, owner, spender, value, nonces[owner]++, deadline))\n            )\n        );\n        address recoveredAddress = ecrecover(digest, v, r, s);\n        require(recoveredAddress != address(0) && recoveredAddress == owner, 'UniswapV2: INVALID_SIGNATURE');\n        _approve(owner, spender, value);\n    }\n}\n",
+            "contracts/uniswapv2/UniswapV2Factory.sol": "// SPDX-License-Identifier: GPL-3.0\n\npragma solidity =0.6.12;\n\nimport './interfaces/IUniswapV2Factory.sol';\nimport './UniswapV2Pair.sol';\n\ncontract UniswapV2Factory is IUniswapV2Factory {\n    address public override feeTo;\n    address public override feeToSetter;\n    address public override migrator;\n\n    mapping(address => mapping(address => address)) public override getPair;\n    address[] public override allPairs;\n\n    event PairCreated(address indexed token0, address indexed token1, address pair, uint);\n\n    constructor(address _feeToSetter) public {\n        feeToSetter = _feeToSetter;\n    }\n\n    function allPairsLength() external override view returns (uint) {\n        return allPairs.length;\n    }\n\n    function pairCodeHash() external pure returns (bytes32) {\n        return keccak256(type(UniswapV2Pair).creationCode);\n    }\n\n    function createPair(address tokenA, address tokenB) external override returns (address pair) {\n        require(tokenA != tokenB, 'UniswapV2: IDENTICAL_ADDRESSES');\n        (address token0, address token1) = tokenA < tokenB ? (tokenA, tokenB) : (tokenB, tokenA);\n        require(token0 != address(0), 'UniswapV2: ZERO_ADDRESS');\n        require(getPair[token0][token1] == address(0), 'UniswapV2: PAIR_EXISTS'); // single check is sufficient\n        bytes memory bytecode = type(UniswapV2Pair).creationCode;\n        bytes32 salt = keccak256(abi.encodePacked(token0, token1));\n        assembly {\n            pair := create2(0, add(bytecode, 32), mload(bytecode), salt)\n        }\n        UniswapV2Pair(pair).initialize(token0, token1);\n        getPair[token0][token1] = pair;\n        getPair[token1][token0] = pair; // populate mapping in the reverse direction\n        allPairs.push(pair);\n        emit PairCreated(token0, token1, pair, allPairs.length);\n    }\n\n    function setFeeTo(address _feeTo) external override {\n        require(msg.sender == feeToSetter, 'UniswapV2: FORBIDDEN');\n        feeTo = _feeTo;\n    }\n\n    function setMigrator(address _migrator) external override {\n        require(msg.sender == feeToSetter, 'UniswapV2: FORBIDDEN');\n        migrator = _migrator;\n    }\n\n    function setFeeToSetter(address _feeToSetter) external override {\n        require(msg.sender == feeToSetter, 'UniswapV2: FORBIDDEN');\n        feeToSetter = _feeToSetter;\n    }\n\n}\n",
+            "contracts/uniswapv2/UniswapV2Pair.sol": "// SPDX-License-Identifier: GPL-3.0\n\npragma solidity =0.6.12;\n\nimport './UniswapV2ERC20.sol';\nimport './libraries/Math.sol';\nimport './libraries/UQ112x112.sol';\nimport './interfaces/IERC20.sol';\nimport './interfaces/IUniswapV2Factory.sol';\nimport './interfaces/IUniswapV2Callee.sol';\n\ninterface IMigrator {\n    // Return the desired amount of liquidity token that the migrator wants.\n    function desiredLiquidity() external view returns (uint256);\n}\n\ncontract UniswapV2Pair is UniswapV2ERC20 {\n    using SafeMathUniswap  for uint;\n    using UQ112x112 for uint224;\n\n    uint public constant MINIMUM_LIQUIDITY = 10**3;\n    bytes4 private constant SELECTOR = bytes4(keccak256(bytes('transfer(address,uint256)')));\n\n    address public factory;\n    address public token0;\n    address public token1;\n\n    uint112 private reserve0;           // uses single storage slot, accessible via getReserves\n    uint112 private reserve1;           // uses single storage slot, accessible via getReserves\n    uint32  private blockTimestampLast; // uses single storage slot, accessible via getReserves\n\n    uint public price0CumulativeLast;\n    uint public price1CumulativeLast;\n    uint public kLast; // reserve0 * reserve1, as of immediately after the most recent liquidity event\n\n    uint private unlocked = 1;\n    modifier lock() {\n        require(unlocked == 1, 'UniswapV2: LOCKED');\n        unlocked = 0;\n        _;\n        unlocked = 1;\n    }\n\n    function getReserves() public view returns (uint112 _reserve0, uint112 _reserve1, uint32 _blockTimestampLast) {\n        _reserve0 = reserve0;\n        _reserve1 = reserve1;\n        _blockTimestampLast = blockTimestampLast;\n    }\n\n    function _safeTransfer(address token, address to, uint value) private {\n        (bool success, bytes memory data) = token.call(abi.encodeWithSelector(SELECTOR, to, value));\n        require(success && (data.length == 0 || abi.decode(data, (bool))), 'UniswapV2: TRANSFER_FAILED');\n    }\n\n    event Mint(address indexed sender, uint amount0, uint amount1);\n    event Burn(address indexed sender, uint amount0, uint amount1, address indexed to);\n    event Swap(\n        address indexed sender,\n        uint amount0In,\n        uint amount1In,\n        uint amount0Out,\n        uint amount1Out,\n        address indexed to\n    );\n    event Sync(uint112 reserve0, uint112 reserve1);\n\n    constructor() public {\n        factory = msg.sender;\n    }\n\n    // called once by the factory at time of deployment\n    function initialize(address _token0, address _token1) external {\n        require(msg.sender == factory, 'UniswapV2: FORBIDDEN'); // sufficient check\n        token0 = _token0;\n        token1 = _token1;\n    }\n\n    // update reserves and, on the first call per block, price accumulators\n    function _update(uint balance0, uint balance1, uint112 _reserve0, uint112 _reserve1) private {\n        require(balance0 <= uint112(-1) && balance1 <= uint112(-1), 'UniswapV2: OVERFLOW');\n        uint32 blockTimestamp = uint32(block.timestamp % 2**32);\n        uint32 timeElapsed = blockTimestamp - blockTimestampLast; // overflow is desired\n        if (timeElapsed > 0 && _reserve0 != 0 && _reserve1 != 0) {\n            // * never overflows, and + overflow is desired\n            price0CumulativeLast += uint(UQ112x112.encode(_reserve1).uqdiv(_reserve0)) * timeElapsed;\n            price1CumulativeLast += uint(UQ112x112.encode(_reserve0).uqdiv(_reserve1)) * timeElapsed;\n        }\n        reserve0 = uint112(balance0);\n        reserve1 = uint112(balance1);\n        blockTimestampLast = blockTimestamp;\n        emit Sync(reserve0, reserve1);\n    }\n\n    // if fee is on, mint liquidity equivalent to 1/6th of the growth in sqrt(k)\n    function _mintFee(uint112 _reserve0, uint112 _reserve1) private returns (bool feeOn) {\n        address feeTo = IUniswapV2Factory(factory).feeTo();\n        feeOn = feeTo != address(0);\n        uint _kLast = kLast; // gas savings\n        if (feeOn) {\n            if (_kLast != 0) {\n                uint rootK = Math.sqrt(uint(_reserve0).mul(_reserve1));\n                uint rootKLast = Math.sqrt(_kLast);\n                if (rootK > rootKLast) {\n                    uint numerator = totalSupply.mul(rootK.sub(rootKLast));\n                    uint denominator = rootK.mul(5).add(rootKLast);\n                    uint liquidity = numerator / denominator;\n                    if (liquidity > 0) _mint(feeTo, liquidity);\n                }\n            }\n        } else if (_kLast != 0) {\n            kLast = 0;\n        }\n    }\n\n    // this low-level function should be called from a contract which performs important safety checks\n    function mint(address to) external lock returns (uint liquidity) {\n        (uint112 _reserve0, uint112 _reserve1,) = getReserves(); // gas savings\n        uint balance0 = IERC20Uniswap(token0).balanceOf(address(this));\n        uint balance1 = IERC20Uniswap(token1).balanceOf(address(this));\n        uint amount0 = balance0.sub(_reserve0);\n        uint amount1 = balance1.sub(_reserve1);\n\n        bool feeOn = _mintFee(_reserve0, _reserve1);\n        uint _totalSupply = totalSupply; // gas savings, must be defined here since totalSupply can update in _mintFee\n        if (_totalSupply == 0) {\n            address migrator = IUniswapV2Factory(factory).migrator();\n            if (msg.sender == migrator) {\n                liquidity = IMigrator(migrator).desiredLiquidity();\n                require(liquidity > 0 && liquidity != uint256(-1), \"Bad desired liquidity\");\n            } else {\n                require(migrator == address(0), \"Must not have migrator\");\n                liquidity = Math.sqrt(amount0.mul(amount1)).sub(MINIMUM_LIQUIDITY);\n                _mint(address(0), MINIMUM_LIQUIDITY); // permanently lock the first MINIMUM_LIQUIDITY tokens\n            }\n        } else {\n            liquidity = Math.min(amount0.mul(_totalSupply) / _reserve0, amount1.mul(_totalSupply) / _reserve1);\n        }\n        require(liquidity > 0, 'UniswapV2: INSUFFICIENT_LIQUIDITY_MINTED');\n        _mint(to, liquidity);\n\n        _update(balance0, balance1, _reserve0, _reserve1);\n        if (feeOn) kLast = uint(reserve0).mul(reserve1); // reserve0 and reserve1 are up-to-date\n        emit Mint(msg.sender, amount0, amount1);\n    }\n\n    // this low-level function should be called from a contract which performs important safety checks\n    function burn(address to) external lock returns (uint amount0, uint amount1) {\n        (uint112 _reserve0, uint112 _reserve1,) = getReserves(); // gas savings\n        address _token0 = token0;                                // gas savings\n        address _token1 = token1;                                // gas savings\n        uint balance0 = IERC20Uniswap(_token0).balanceOf(address(this));\n        uint balance1 = IERC20Uniswap(_token1).balanceOf(address(this));\n        uint liquidity = balanceOf[address(this)];\n\n        bool feeOn = _mintFee(_reserve0, _reserve1);\n        uint _totalSupply = totalSupply; // gas savings, must be defined here since totalSupply can update in _mintFee\n        amount0 = liquidity.mul(balance0) / _totalSupply; // using balances ensures pro-rata distribution\n        amount1 = liquidity.mul(balance1) / _totalSupply; // using balances ensures pro-rata distribution\n        require(amount0 > 0 && amount1 > 0, 'UniswapV2: INSUFFICIENT_LIQUIDITY_BURNED');\n        _burn(address(this), liquidity);\n        _safeTransfer(_token0, to, amount0);\n        _safeTransfer(_token1, to, amount1);\n        balance0 = IERC20Uniswap(_token0).balanceOf(address(this));\n        balance1 = IERC20Uniswap(_token1).balanceOf(address(this));\n\n        _update(balance0, balance1, _reserve0, _reserve1);\n        if (feeOn) kLast = uint(reserve0).mul(reserve1); // reserve0 and reserve1 are up-to-date\n        emit Burn(msg.sender, amount0, amount1, to);\n    }\n\n    // this low-level function should be called from a contract which performs important safety checks\n    function swap(uint amount0Out, uint amount1Out, address to, bytes calldata data) external lock {\n        require(amount0Out > 0 || amount1Out > 0, 'UniswapV2: INSUFFICIENT_OUTPUT_AMOUNT');\n        (uint112 _reserve0, uint112 _reserve1,) = getReserves(); // gas savings\n        require(amount0Out < _reserve0 && amount1Out < _reserve1, 'UniswapV2: INSUFFICIENT_LIQUIDITY');\n\n        uint balance0;\n        uint balance1;\n        { // scope for _token{0,1}, avoids stack too deep errors\n        address _token0 = token0;\n        address _token1 = token1;\n        require(to != _token0 && to != _token1, 'UniswapV2: INVALID_TO');\n        if (amount0Out > 0) _safeTransfer(_token0, to, amount0Out); // optimistically transfer tokens\n        if (amount1Out > 0) _safeTransfer(_token1, to, amount1Out); // optimistically transfer tokens\n        if (data.length > 0) IUniswapV2Callee(to).uniswapV2Call(msg.sender, amount0Out, amount1Out, data);\n        balance0 = IERC20Uniswap(_token0).balanceOf(address(this));\n        balance1 = IERC20Uniswap(_token1).balanceOf(address(this));\n        }\n        uint amount0In = balance0 > _reserve0 - amount0Out ? balance0 - (_reserve0 - amount0Out) : 0;\n        uint amount1In = balance1 > _reserve1 - amount1Out ? balance1 - (_reserve1 - amount1Out) : 0;\n        require(amount0In > 0 || amount1In > 0, 'UniswapV2: INSUFFICIENT_INPUT_AMOUNT');\n        { // scope for reserve{0,1}Adjusted, avoids stack too deep errors\n        uint balance0Adjusted = balance0.mul(1000).sub(amount0In.mul(3));\n        uint balance1Adjusted = balance1.mul(1000).sub(amount1In.mul(3));\n        require(balance0Adjusted.mul(balance1Adjusted) >= uint(_reserve0).mul(_reserve1).mul(1000**2), 'UniswapV2: K');\n        }\n\n        _update(balance0, balance1, _reserve0, _reserve1);\n        emit Swap(msg.sender, amount0In, amount1In, amount0Out, amount1Out, to);\n    }\n\n    // force balances to match reserves\n    function skim(address to) external lock {\n        address _token0 = token0; // gas savings\n        address _token1 = token1; // gas savings\n        _safeTransfer(_token0, to, IERC20Uniswap(_token0).balanceOf(address(this)).sub(reserve0));\n        _safeTransfer(_token1, to, IERC20Uniswap(_token1).balanceOf(address(this)).sub(reserve1));\n    }\n\n    // force reserves to match balances\n    function sync() external lock {\n        _update(IERC20Uniswap(token0).balanceOf(address(this)), IERC20Uniswap(token1).balanceOf(address(this)), reserve0, reserve1);\n    }\n}\n",
+            "contracts/uniswapv2/UniswapV2Router02.sol": "// SPDX-License-Identifier: GPL-3.0\n\npragma solidity =0.6.12;\n\nimport './libraries/UniswapV2Library.sol';\nimport './libraries/SafeMath.sol';\nimport './libraries/TransferHelper.sol';\nimport './interfaces/IUniswapV2Router02.sol';\nimport './interfaces/IUniswapV2Factory.sol';\nimport './interfaces/IERC20.sol';\nimport './interfaces/IWETH.sol';\n\ncontract UniswapV2Router02 is IUniswapV2Router02 {\n    using SafeMathUniswap for uint;\n\n    address public immutable override factory;\n    address public immutable override WETH;\n\n    modifier ensure(uint deadline) {\n        require(deadline >= block.timestamp, 'UniswapV2Router: EXPIRED');\n        _;\n    }\n\n    constructor(address _factory, address _WETH) public {\n        factory = _factory;\n        WETH = _WETH;\n    }\n\n    receive() external payable {\n        assert(msg.sender == WETH); // only accept ETH via fallback from the WETH contract\n    }\n\n    // **** ADD LIQUIDITY ****\n    function _addLiquidity(\n        address tokenA,\n        address tokenB,\n        uint amountADesired,\n        uint amountBDesired,\n        uint amountAMin,\n        uint amountBMin\n    ) internal virtual returns (uint amountA, uint amountB) {\n        // create the pair if it doesn't exist yet\n        if (IUniswapV2Factory(factory).getPair(tokenA, tokenB) == address(0)) {\n            IUniswapV2Factory(factory).createPair(tokenA, tokenB);\n        }\n        (uint reserveA, uint reserveB) = UniswapV2Library.getReserves(factory, tokenA, tokenB);\n        if (reserveA == 0 && reserveB == 0) {\n            (amountA, amountB) = (amountADesired, amountBDesired);\n        } else {\n            uint amountBOptimal = UniswapV2Library.quote(amountADesired, reserveA, reserveB);\n            if (amountBOptimal <= amountBDesired) {\n                require(amountBOptimal >= amountBMin, 'UniswapV2Router: INSUFFICIENT_B_AMOUNT');\n                (amountA, amountB) = (amountADesired, amountBOptimal);\n            } else {\n                uint amountAOptimal = UniswapV2Library.quote(amountBDesired, reserveB, reserveA);\n                assert(amountAOptimal <= amountADesired);\n                require(amountAOptimal >= amountAMin, 'UniswapV2Router: INSUFFICIENT_A_AMOUNT');\n                (amountA, amountB) = (amountAOptimal, amountBDesired);\n            }\n        }\n    }\n    function addLiquidity(\n        address tokenA,\n        address tokenB,\n        uint amountADesired,\n        uint amountBDesired,\n        uint amountAMin,\n        uint amountBMin,\n        address to,\n        uint deadline\n    ) external virtual override ensure(deadline) returns (uint amountA, uint amountB, uint liquidity) {\n        (amountA, amountB) = _addLiquidity(tokenA, tokenB, amountADesired, amountBDesired, amountAMin, amountBMin);\n        address pair = UniswapV2Library.pairFor(factory, tokenA, tokenB);\n        TransferHelper.safeTransferFrom(tokenA, msg.sender, pair, amountA);\n        TransferHelper.safeTransferFrom(tokenB, msg.sender, pair, amountB);\n        liquidity = IUniswapV2Pair(pair).mint(to);\n    }\n    function addLiquidityETH(\n        address token,\n        uint amountTokenDesired,\n        uint amountTokenMin,\n        uint amountETHMin,\n        address to,\n        uint deadline\n    ) external virtual override payable ensure(deadline) returns (uint amountToken, uint amountETH, uint liquidity) {\n        (amountToken, amountETH) = _addLiquidity(\n            token,\n            WETH,\n            amountTokenDesired,\n            msg.value,\n            amountTokenMin,\n            amountETHMin\n        );\n        address pair = UniswapV2Library.pairFor(factory, token, WETH);\n        TransferHelper.safeTransferFrom(token, msg.sender, pair, amountToken);\n        IWETH(WETH).deposit{value: amountETH}();\n        assert(IWETH(WETH).transfer(pair, amountETH));\n        liquidity = IUniswapV2Pair(pair).mint(to);\n        // refund dust eth, if any\n        if (msg.value > amountETH) TransferHelper.safeTransferETH(msg.sender, msg.value - amountETH);\n    }\n\n    // **** REMOVE LIQUIDITY ****\n    function removeLiquidity(\n        address tokenA,\n        address tokenB,\n        uint liquidity,\n        uint amountAMin,\n        uint amountBMin,\n        address to,\n        uint deadline\n    ) public virtual override ensure(deadline) returns (uint amountA, uint amountB) {\n        address pair = UniswapV2Library.pairFor(factory, tokenA, tokenB);\n        IUniswapV2Pair(pair).transferFrom(msg.sender, pair, liquidity); // send liquidity to pair\n        (uint amount0, uint amount1) = IUniswapV2Pair(pair).burn(to);\n        (address token0,) = UniswapV2Library.sortTokens(tokenA, tokenB);\n        (amountA, amountB) = tokenA == token0 ? (amount0, amount1) : (amount1, amount0);\n        require(amountA >= amountAMin, 'UniswapV2Router: INSUFFICIENT_A_AMOUNT');\n        require(amountB >= amountBMin, 'UniswapV2Router: INSUFFICIENT_B_AMOUNT');\n    }\n    function removeLiquidityETH(\n        address token,\n        uint liquidity,\n        uint amountTokenMin,\n        uint amountETHMin,\n        address to,\n        uint deadline\n    ) public virtual override ensure(deadline) returns (uint amountToken, uint amountETH) {\n        (amountToken, amountETH) = removeLiquidity(\n            token,\n            WETH,\n            liquidity,\n            amountTokenMin,\n            amountETHMin,\n            address(this),\n            deadline\n        );\n        TransferHelper.safeTransfer(token, to, amountToken);\n        IWETH(WETH).withdraw(amountETH);\n        TransferHelper.safeTransferETH(to, amountETH);\n    }\n    function removeLiquidityWithPermit(\n        address tokenA,\n        address tokenB,\n        uint liquidity,\n        uint amountAMin,\n        uint amountBMin,\n        address to,\n        uint deadline,\n        bool approveMax, uint8 v, bytes32 r, bytes32 s\n    ) external virtual override returns (uint amountA, uint amountB) {\n        address pair = UniswapV2Library.pairFor(factory, tokenA, tokenB);\n        uint value = approveMax ? uint(-1) : liquidity;\n        IUniswapV2Pair(pair).permit(msg.sender, address(this), value, deadline, v, r, s);\n        (amountA, amountB) = removeLiquidity(tokenA, tokenB, liquidity, amountAMin, amountBMin, to, deadline);\n    }\n    function removeLiquidityETHWithPermit(\n        address token,\n        uint liquidity,\n        uint amountTokenMin,\n        uint amountETHMin,\n        address to,\n        uint deadline,\n        bool approveMax, uint8 v, bytes32 r, bytes32 s\n    ) external virtual override returns (uint amountToken, uint amountETH) {\n        address pair = UniswapV2Library.pairFor(factory, token, WETH);\n        uint value = approveMax ? uint(-1) : liquidity;\n        IUniswapV2Pair(pair).permit(msg.sender, address(this), value, deadline, v, r, s);\n        (amountToken, amountETH) = removeLiquidityETH(token, liquidity, amountTokenMin, amountETHMin, to, deadline);\n    }\n\n    // **** REMOVE LIQUIDITY (supporting fee-on-transfer tokens) ****\n    function removeLiquidityETHSupportingFeeOnTransferTokens(\n        address token,\n        uint liquidity,\n        uint amountTokenMin,\n        uint amountETHMin,\n        address to,\n        uint deadline\n    ) public virtual override ensure(deadline) returns (uint amountETH) {\n        (, amountETH) = removeLiquidity(\n            token,\n            WETH,\n            liquidity,\n            amountTokenMin,\n            amountETHMin,\n            address(this),\n            deadline\n        );\n        TransferHelper.safeTransfer(token, to, IERC20Uniswap(token).balanceOf(address(this)));\n        IWETH(WETH).withdraw(amountETH);\n        TransferHelper.safeTransferETH(to, amountETH);\n    }\n    function removeLiquidityETHWithPermitSupportingFeeOnTransferTokens(\n        address token,\n        uint liquidity,\n        uint amountTokenMin,\n        uint amountETHMin,\n        address to,\n        uint deadline,\n        bool approveMax, uint8 v, bytes32 r, bytes32 s\n    ) external virtual override returns (uint amountETH) {\n        address pair = UniswapV2Library.pairFor(factory, token, WETH);\n        uint value = approveMax ? uint(-1) : liquidity;\n        IUniswapV2Pair(pair).permit(msg.sender, address(this), value, deadline, v, r, s);\n        amountETH = removeLiquidityETHSupportingFeeOnTransferTokens(\n            token, liquidity, amountTokenMin, amountETHMin, to, deadline\n        );\n    }\n\n    // **** SWAP ****\n    // requires the initial amount to have already been sent to the first pair\n    function _swap(uint[] memory amounts, address[] memory path, address _to) internal virtual {\n        for (uint i; i < path.length - 1; i++) {\n            (address input, address output) = (path[i], path[i + 1]);\n            (address token0,) = UniswapV2Library.sortTokens(input, output);\n            uint amountOut = amounts[i + 1];\n            (uint amount0Out, uint amount1Out) = input == token0 ? (uint(0), amountOut) : (amountOut, uint(0));\n            address to = i < path.length - 2 ? UniswapV2Library.pairFor(factory, output, path[i + 2]) : _to;\n            IUniswapV2Pair(UniswapV2Library.pairFor(factory, input, output)).swap(\n                amount0Out, amount1Out, to, new bytes(0)\n            );\n        }\n    }\n    function swapExactTokensForTokens(\n        uint amountIn,\n        uint amountOutMin,\n        address[] calldata path,\n        address to,\n        uint deadline\n    ) external virtual override ensure(deadline) returns (uint[] memory amounts) {\n        amounts = UniswapV2Library.getAmountsOut(factory, amountIn, path);\n        require(amounts[amounts.length - 1] >= amountOutMin, 'UniswapV2Router: INSUFFICIENT_OUTPUT_AMOUNT');\n        TransferHelper.safeTransferFrom(\n            path[0], msg.sender, UniswapV2Library.pairFor(factory, path[0], path[1]), amounts[0]\n        );\n        _swap(amounts, path, to);\n    }\n    function swapTokensForExactTokens(\n        uint amountOut,\n        uint amountInMax,\n        address[] calldata path,\n        address to,\n        uint deadline\n    ) external virtual override ensure(deadline) returns (uint[] memory amounts) {\n        amounts = UniswapV2Library.getAmountsIn(factory, amountOut, path);\n        require(amounts[0] <= amountInMax, 'UniswapV2Router: EXCESSIVE_INPUT_AMOUNT');\n        TransferHelper.safeTransferFrom(\n            path[0], msg.sender, UniswapV2Library.pairFor(factory, path[0], path[1]), amounts[0]\n        );\n        _swap(amounts, path, to);\n    }\n    function swapExactETHForTokens(uint amountOutMin, address[] calldata path, address to, uint deadline)\n        external\n        virtual\n        override\n        payable\n        ensure(deadline)\n        returns (uint[] memory amounts)\n    {\n        require(path[0] == WETH, 'UniswapV2Router: INVALID_PATH');\n        amounts = UniswapV2Library.getAmountsOut(factory, msg.value, path);\n        require(amounts[amounts.length - 1] >= amountOutMin, 'UniswapV2Router: INSUFFICIENT_OUTPUT_AMOUNT');\n        IWETH(WETH).deposit{value: amounts[0]}();\n        assert(IWETH(WETH).transfer(UniswapV2Library.pairFor(factory, path[0], path[1]), amounts[0]));\n        _swap(amounts, path, to);\n    }\n    function swapTokensForExactETH(uint amountOut, uint amountInMax, address[] calldata path, address to, uint deadline)\n        external\n        virtual\n        override\n        ensure(deadline)\n        returns (uint[] memory amounts)\n    {\n        require(path[path.length - 1] == WETH, 'UniswapV2Router: INVALID_PATH');\n        amounts = UniswapV2Library.getAmountsIn(factory, amountOut, path);\n        require(amounts[0] <= amountInMax, 'UniswapV2Router: EXCESSIVE_INPUT_AMOUNT');\n        TransferHelper.safeTransferFrom(\n            path[0], msg.sender, UniswapV2Library.pairFor(factory, path[0], path[1]), amounts[0]\n        );\n        _swap(amounts, path, address(this));\n        IWETH(WETH).withdraw(amounts[amounts.length - 1]);\n        TransferHelper.safeTransferETH(to, amounts[amounts.length - 1]);\n    }\n    function swapExactTokensForETH(uint amountIn, uint amountOutMin, address[] calldata path, address to, uint deadline)\n        external\n        virtual\n        override\n        ensure(deadline)\n        returns (uint[] memory amounts)\n    {\n        require(path[path.length - 1] == WETH, 'UniswapV2Router: INVALID_PATH');\n        amounts = UniswapV2Library.getAmountsOut(factory, amountIn, path);\n        require(amounts[amounts.length - 1] >= amountOutMin, 'UniswapV2Router: INSUFFICIENT_OUTPUT_AMOUNT');\n        TransferHelper.safeTransferFrom(\n            path[0], msg.sender, UniswapV2Library.pairFor(factory, path[0], path[1]), amounts[0]\n        );\n        _swap(amounts, path, address(this));\n        IWETH(WETH).withdraw(amounts[amounts.length - 1]);\n        TransferHelper.safeTransferETH(to, amounts[amounts.length - 1]);\n    }\n    function swapETHForExactTokens(uint amountOut, address[] calldata path, address to, uint deadline)\n        external\n        virtual\n        override\n        payable\n        ensure(deadline)\n        returns (uint[] memory amounts)\n    {\n        require(path[0] == WETH, 'UniswapV2Router: INVALID_PATH');\n        amounts = UniswapV2Library.getAmountsIn(factory, amountOut, path);\n        require(amounts[0] <= msg.value, 'UniswapV2Router: EXCESSIVE_INPUT_AMOUNT');\n        IWETH(WETH).deposit{value: amounts[0]}();\n        assert(IWETH(WETH).transfer(UniswapV2Library.pairFor(factory, path[0], path[1]), amounts[0]));\n        _swap(amounts, path, to);\n        // refund dust eth, if any\n        if (msg.value > amounts[0]) TransferHelper.safeTransferETH(msg.sender, msg.value - amounts[0]);\n    }\n\n    // **** SWAP (supporting fee-on-transfer tokens) ****\n    // requires the initial amount to have already been sent to the first pair\n    function _swapSupportingFeeOnTransferTokens(address[] memory path, address _to) internal virtual {\n        for (uint i; i < path.length - 1; i++) {\n            (address input, address output) = (path[i], path[i + 1]);\n            (address token0,) = UniswapV2Library.sortTokens(input, output);\n            IUniswapV2Pair pair = IUniswapV2Pair(UniswapV2Library.pairFor(factory, input, output));\n            uint amountInput;\n            uint amountOutput;\n            { // scope to avoid stack too deep errors\n            (uint reserve0, uint reserve1,) = pair.getReserves();\n            (uint reserveInput, uint reserveOutput) = input == token0 ? (reserve0, reserve1) : (reserve1, reserve0);\n            amountInput = IERC20Uniswap(input).balanceOf(address(pair)).sub(reserveInput);\n            amountOutput = UniswapV2Library.getAmountOut(amountInput, reserveInput, reserveOutput);\n            }\n            (uint amount0Out, uint amount1Out) = input == token0 ? (uint(0), amountOutput) : (amountOutput, uint(0));\n            address to = i < path.length - 2 ? UniswapV2Library.pairFor(factory, output, path[i + 2]) : _to;\n            pair.swap(amount0Out, amount1Out, to, new bytes(0));\n        }\n    }\n    function swapExactTokensForTokensSupportingFeeOnTransferTokens(\n        uint amountIn,\n        uint amountOutMin,\n        address[] calldata path,\n        address to,\n        uint deadline\n    ) external virtual override ensure(deadline) {\n        TransferHelper.safeTransferFrom(\n            path[0], msg.sender, UniswapV2Library.pairFor(factory, path[0], path[1]), amountIn\n        );\n        uint balanceBefore = IERC20Uniswap(path[path.length - 1]).balanceOf(to);\n        _swapSupportingFeeOnTransferTokens(path, to);\n        require(\n            IERC20Uniswap(path[path.length - 1]).balanceOf(to).sub(balanceBefore) >= amountOutMin,\n            'UniswapV2Router: INSUFFICIENT_OUTPUT_AMOUNT'\n        );\n    }\n    function swapExactETHForTokensSupportingFeeOnTransferTokens(\n        uint amountOutMin,\n        address[] calldata path,\n        address to,\n        uint deadline\n    )\n        external\n        virtual\n        override\n        payable\n        ensure(deadline)\n    {\n        require(path[0] == WETH, 'UniswapV2Router: INVALID_PATH');\n        uint amountIn = msg.value;\n        IWETH(WETH).deposit{value: amountIn}();\n        assert(IWETH(WETH).transfer(UniswapV2Library.pairFor(factory, path[0], path[1]), amountIn));\n        uint balanceBefore = IERC20Uniswap(path[path.length - 1]).balanceOf(to);\n        _swapSupportingFeeOnTransferTokens(path, to);\n        require(\n            IERC20Uniswap(path[path.length - 1]).balanceOf(to).sub(balanceBefore) >= amountOutMin,\n            'UniswapV2Router: INSUFFICIENT_OUTPUT_AMOUNT'\n        );\n    }\n    function swapExactTokensForETHSupportingFeeOnTransferTokens(\n        uint amountIn,\n        uint amountOutMin,\n        address[] calldata path,\n        address to,\n        uint deadline\n    )\n        external\n        virtual\n        override\n        ensure(deadline)\n    {\n        require(path[path.length - 1] == WETH, 'UniswapV2Router: INVALID_PATH');\n        TransferHelper.safeTransferFrom(\n            path[0], msg.sender, UniswapV2Library.pairFor(factory, path[0], path[1]), amountIn\n        );\n        _swapSupportingFeeOnTransferTokens(path, address(this));\n        uint amountOut = IERC20Uniswap(WETH).balanceOf(address(this));\n        require(amountOut >= amountOutMin, 'UniswapV2Router: INSUFFICIENT_OUTPUT_AMOUNT');\n        IWETH(WETH).withdraw(amountOut);\n        TransferHelper.safeTransferETH(to, amountOut);\n    }\n\n    // **** LIBRARY FUNCTIONS ****\n    function quote(uint amountA, uint reserveA, uint reserveB) public pure virtual override returns (uint amountB) {\n        return UniswapV2Library.quote(amountA, reserveA, reserveB);\n    }\n\n    function getAmountOut(uint amountIn, uint reserveIn, uint reserveOut)\n        public\n        pure\n        virtual\n        override\n        returns (uint amountOut)\n    {\n        return UniswapV2Library.getAmountOut(amountIn, reserveIn, reserveOut);\n    }\n\n    function getAmountIn(uint amountOut, uint reserveIn, uint reserveOut)\n        public\n        pure\n        virtual\n        override\n        returns (uint amountIn)\n    {\n        return UniswapV2Library.getAmountIn(amountOut, reserveIn, reserveOut);\n    }\n\n    function getAmountsOut(uint amountIn, address[] memory path)\n        public\n        view\n        virtual\n        override\n        returns (uint[] memory amounts)\n    {\n        return UniswapV2Library.getAmountsOut(factory, amountIn, path);\n    }\n\n    function getAmountsIn(uint amountOut, address[] memory path)\n        public\n        view\n        virtual\n        override\n        returns (uint[] memory amounts)\n    {\n        return UniswapV2Library.getAmountsIn(factory, amountOut, path);\n    }\n}\n",
+            "contracts/uniswapv2/interfaces/IERC20.sol": "// SPDX-License-Identifier: GPL-3.0\n\npragma solidity >=0.5.0;\n\ninterface IERC20Uniswap {\n    event Approval(address indexed owner, address indexed spender, uint value);\n    event Transfer(address indexed from, address indexed to, uint value);\n\n    function name() external view returns (string memory);\n    function symbol() external view returns (string memory);\n    function decimals() external view returns (uint8);\n    function totalSupply() external view returns (uint);\n    function balanceOf(address owner) external view returns (uint);\n    function allowance(address owner, address spender) external view returns (uint);\n\n    function approve(address spender, uint value) external returns (bool);\n    function transfer(address to, uint value) external returns (bool);\n    function transferFrom(address from, address to, uint value) external returns (bool);\n}\n",
+            "contracts/uniswapv2/interfaces/IUniswapV2Callee.sol": "// SPDX-License-Identifier: GPL-3.0\n\npragma solidity >=0.5.0;\n\ninterface IUniswapV2Callee {\n    function uniswapV2Call(address sender, uint amount0, uint amount1, bytes calldata data) external;\n}\n",
+            "contracts/uniswapv2/interfaces/IUniswapV2ERC20.sol": "// SPDX-License-Identifier: GPL-3.0\n\npragma solidity >=0.5.0;\n\ninterface IUniswapV2ERC20 {\n    event Approval(address indexed owner, address indexed spender, uint value);\n    event Transfer(address indexed from, address indexed to, uint value);\n\n    function name() external pure returns (string memory);\n    function symbol() external pure returns (string memory);\n    function decimals() external pure returns (uint8);\n    function totalSupply() external view returns (uint);\n    function balanceOf(address owner) external view returns (uint);\n    function allowance(address owner, address spender) external view returns (uint);\n\n    function approve(address spender, uint value) external returns (bool);\n    function transfer(address to, uint value) external returns (bool);\n    function transferFrom(address from, address to, uint value) external returns (bool);\n\n    function DOMAIN_SEPARATOR() external view returns (bytes32);\n    function PERMIT_TYPEHASH() external pure returns (bytes32);\n    function nonces(address owner) external view returns (uint);\n\n    function permit(address owner, address spender, uint value, uint deadline, uint8 v, bytes32 r, bytes32 s) external;\n}",
+            "contracts/uniswapv2/interfaces/IUniswapV2Factory.sol": "// SPDX-License-Identifier: GPL-3.0\n\npragma solidity >=0.5.0;\n\ninterface IUniswapV2Factory {\n    event PairCreated(address indexed token0, address indexed token1, address pair, uint);\n\n    function feeTo() external view returns (address);\n    function feeToSetter() external view returns (address);\n    function migrator() external view returns (address);\n\n    function getPair(address tokenA, address tokenB) external view returns (address pair);\n    function allPairs(uint) external view returns (address pair);\n    function allPairsLength() external view returns (uint);\n\n    function createPair(address tokenA, address tokenB) external returns (address pair);\n\n    function setFeeTo(address) external;\n    function setFeeToSetter(address) external;\n    function setMigrator(address) external;\n}\n",
+            "contracts/uniswapv2/interfaces/IUniswapV2Pair.sol": "// SPDX-License-Identifier: GPL-3.0\n\npragma solidity >=0.5.0;\n\ninterface IUniswapV2Pair {\n    event Approval(address indexed owner, address indexed spender, uint value);\n    event Transfer(address indexed from, address indexed to, uint value);\n\n    function name() external pure returns (string memory);\n    function symbol() external pure returns (string memory);\n    function decimals() external pure returns (uint8);\n    function totalSupply() external view returns (uint);\n    function balanceOf(address owner) external view returns (uint);\n    function allowance(address owner, address spender) external view returns (uint);\n\n    function approve(address spender, uint value) external returns (bool);\n    function transfer(address to, uint value) external returns (bool);\n    function transferFrom(address from, address to, uint value) external returns (bool);\n\n    function DOMAIN_SEPARATOR() external view returns (bytes32);\n    function PERMIT_TYPEHASH() external pure returns (bytes32);\n    function nonces(address owner) external view returns (uint);\n\n    function permit(address owner, address spender, uint value, uint deadline, uint8 v, bytes32 r, bytes32 s) external;\n\n    event Mint(address indexed sender, uint amount0, uint amount1);\n    event Burn(address indexed sender, uint amount0, uint amount1, address indexed to);\n    event Swap(\n        address indexed sender,\n        uint amount0In,\n        uint amount1In,\n        uint amount0Out,\n        uint amount1Out,\n        address indexed to\n    );\n    event Sync(uint112 reserve0, uint112 reserve1);\n\n    function MINIMUM_LIQUIDITY() external pure returns (uint);\n    function factory() external view returns (address);\n    function token0() external view returns (address);\n    function token1() external view returns (address);\n    function getReserves() external view returns (uint112 reserve0, uint112 reserve1, uint32 blockTimestampLast);\n    function price0CumulativeLast() external view returns (uint);\n    function price1CumulativeLast() external view returns (uint);\n    function kLast() external view returns (uint);\n\n    function mint(address to) external returns (uint liquidity);\n    function burn(address to) external returns (uint amount0, uint amount1);\n    function swap(uint amount0Out, uint amount1Out, address to, bytes calldata data) external;\n    function skim(address to) external;\n    function sync() external;\n\n    function initialize(address, address) external;\n}",
+            "contracts/uniswapv2/interfaces/IUniswapV2Router01.sol": "// SPDX-License-Identifier: GPL-3.0\n\npragma solidity >=0.6.2;\n\ninterface IUniswapV2Router01 {\n    function factory() external pure returns (address);\n    function WETH() external pure returns (address);\n\n    function addLiquidity(\n        address tokenA,\n        address tokenB,\n        uint amountADesired,\n        uint amountBDesired,\n        uint amountAMin,\n        uint amountBMin,\n        address to,\n        uint deadline\n    ) external returns (uint amountA, uint amountB, uint liquidity);\n    function addLiquidityETH(\n        address token,\n        uint amountTokenDesired,\n        uint amountTokenMin,\n        uint amountETHMin,\n        address to,\n        uint deadline\n    ) external payable returns (uint amountToken, uint amountETH, uint liquidity);\n    function removeLiquidity(\n        address tokenA,\n        address tokenB,\n        uint liquidity,\n        uint amountAMin,\n        uint amountBMin,\n        address to,\n        uint deadline\n    ) external returns (uint amountA, uint amountB);\n    function removeLiquidityETH(\n        address token,\n        uint liquidity,\n        uint amountTokenMin,\n        uint amountETHMin,\n        address to,\n        uint deadline\n    ) external returns (uint amountToken, uint amountETH);\n    function removeLiquidityWithPermit(\n        address tokenA,\n        address tokenB,\n        uint liquidity,\n        uint amountAMin,\n        uint amountBMin,\n        address to,\n        uint deadline,\n        bool approveMax, uint8 v, bytes32 r, bytes32 s\n    ) external returns (uint amountA, uint amountB);\n    function removeLiquidityETHWithPermit(\n        address token,\n        uint liquidity,\n        uint amountTokenMin,\n        uint amountETHMin,\n        address to,\n        uint deadline,\n        bool approveMax, uint8 v, bytes32 r, bytes32 s\n    ) external returns (uint amountToken, uint amountETH);\n    function swapExactTokensForTokens(\n        uint amountIn,\n        uint amountOutMin,\n        address[] calldata path,\n        address to,\n        uint deadline\n    ) external returns (uint[] memory amounts);\n    function swapTokensForExactTokens(\n        uint amountOut,\n        uint amountInMax,\n        address[] calldata path,\n        address to,\n        uint deadline\n    ) external returns (uint[] memory amounts);\n    function swapExactETHForTokens(uint amountOutMin, address[] calldata path, address to, uint deadline)\n        external\n        payable\n        returns (uint[] memory amounts);\n    function swapTokensForExactETH(uint amountOut, uint amountInMax, address[] calldata path, address to, uint deadline)\n        external\n        returns (uint[] memory amounts);\n    function swapExactTokensForETH(uint amountIn, uint amountOutMin, address[] calldata path, address to, uint deadline)\n        external\n        returns (uint[] memory amounts);\n    function swapETHForExactTokens(uint amountOut, address[] calldata path, address to, uint deadline)\n        external\n        payable\n        returns (uint[] memory amounts);\n\n    function quote(uint amountA, uint reserveA, uint reserveB) external pure returns (uint amountB);\n    function getAmountOut(uint amountIn, uint reserveIn, uint reserveOut) external pure returns (uint amountOut);\n    function getAmountIn(uint amountOut, uint reserveIn, uint reserveOut) external pure returns (uint amountIn);\n    function getAmountsOut(uint amountIn, address[] calldata path) external view returns (uint[] memory amounts);\n    function getAmountsIn(uint amountOut, address[] calldata path) external view returns (uint[] memory amounts);\n}",
+            "contracts/uniswapv2/interfaces/IUniswapV2Router02.sol": "// SPDX-License-Identifier: GPL-3.0\n\npragma solidity >=0.6.2;\n\nimport './IUniswapV2Router01.sol';\n\ninterface IUniswapV2Router02 is IUniswapV2Router01 {\n    function removeLiquidityETHSupportingFeeOnTransferTokens(\n        address token,\n        uint liquidity,\n        uint amountTokenMin,\n        uint amountETHMin,\n        address to,\n        uint deadline\n    ) external returns (uint amountETH);\n    function removeLiquidityETHWithPermitSupportingFeeOnTransferTokens(\n        address token,\n        uint liquidity,\n        uint amountTokenMin,\n        uint amountETHMin,\n        address to,\n        uint deadline,\n        bool approveMax, uint8 v, bytes32 r, bytes32 s\n    ) external returns (uint amountETH);\n\n    function swapExactTokensForTokensSupportingFeeOnTransferTokens(\n        uint amountIn,\n        uint amountOutMin,\n        address[] calldata path,\n        address to,\n        uint deadline\n    ) external;\n    function swapExactETHForTokensSupportingFeeOnTransferTokens(\n        uint amountOutMin,\n        address[] calldata path,\n        address to,\n        uint deadline\n    ) external payable;\n    function swapExactTokensForETHSupportingFeeOnTransferTokens(\n        uint amountIn,\n        uint amountOutMin,\n        address[] calldata path,\n        address to,\n        uint deadline\n    ) external;\n}",
+            "contracts/uniswapv2/interfaces/IWETH.sol": "// SPDX-License-Identifier: GPL-3.0\n\npragma solidity >=0.5.0;\n\ninterface IWETH {\n    function deposit() external payable;\n    function transfer(address to, uint value) external returns (bool);\n    function withdraw(uint) external;\n}",
+            "contracts/uniswapv2/libraries/Math.sol": "// SPDX-License-Identifier: GPL-3.0\n\npragma solidity =0.6.12;\n\n// a library for performing various math operations\n\nlibrary Math {\n    function min(uint x, uint y) internal pure returns (uint z) {\n        z = x < y ? x : y;\n    }\n\n    // babylonian method (https://en.wikipedia.org/wiki/Methods_of_computing_square_roots#Babylonian_method)\n    function sqrt(uint y) internal pure returns (uint z) {\n        if (y > 3) {\n            z = y;\n            uint x = y / 2 + 1;\n            while (x < z) {\n                z = x;\n                x = (y / x + x) / 2;\n            }\n        } else if (y != 0) {\n            z = 1;\n        }\n    }\n}\n",
+            "contracts/uniswapv2/libraries/SafeMath.sol": "// SPDX-License-Identifier: GPL-3.0\n\npragma solidity =0.6.12;\n\n// a library for performing overflow-safe math, courtesy of DappHub (https://github.com/dapphub/ds-math)\n\nlibrary SafeMathUniswap {\n    function add(uint x, uint y) internal pure returns (uint z) {\n        require((z = x + y) >= x, 'ds-math-add-overflow');\n    }\n\n    function sub(uint x, uint y) internal pure returns (uint z) {\n        require((z = x - y) <= x, 'ds-math-sub-underflow');\n    }\n\n    function mul(uint x, uint y) internal pure returns (uint z) {\n        require(y == 0 || (z = x * y) / y == x, 'ds-math-mul-overflow');\n    }\n}\n",
+            "contracts/uniswapv2/libraries/TransferHelper.sol": "// SPDX-License-Identifier: GPL-3.0\n\npragma solidity >=0.6.0;\n\n// helper methods for interacting with ERC20 tokens and sending ETH that do not consistently return true/false\nlibrary TransferHelper {\n    function safeApprove(address token, address to, uint value) internal {\n        // bytes4(keccak256(bytes('approve(address,uint256)')));\n        (bool success, bytes memory data) = token.call(abi.encodeWithSelector(0x095ea7b3, to, value));\n        require(success && (data.length == 0 || abi.decode(data, (bool))), 'TransferHelper: APPROVE_FAILED');\n    }\n\n    function safeTransfer(address token, address to, uint value) internal {\n        // bytes4(keccak256(bytes('transfer(address,uint256)')));\n        (bool success, bytes memory data) = token.call(abi.encodeWithSelector(0xa9059cbb, to, value));\n        require(success && (data.length == 0 || abi.decode(data, (bool))), 'TransferHelper: TRANSFER_FAILED');\n    }\n\n    function safeTransferFrom(address token, address from, address to, uint value) internal {\n        // bytes4(keccak256(bytes('transferFrom(address,address,uint256)')));\n        (bool success, bytes memory data) = token.call(abi.encodeWithSelector(0x23b872dd, from, to, value));\n        require(success && (data.length == 0 || abi.decode(data, (bool))), 'TransferHelper: TRANSFER_FROM_FAILED');\n    }\n\n    function safeTransferETH(address to, uint value) internal {\n        (bool success,) = to.call{value:value}(new bytes(0));\n        require(success, 'TransferHelper: ETH_TRANSFER_FAILED');\n    }\n}\n",
+            "contracts/uniswapv2/libraries/UQ112x112.sol": "// SPDX-License-Identifier: GPL-3.0\n\npragma solidity =0.6.12;\n\n// a library for handling binary fixed point numbers (https://en.wikipedia.org/wiki/Q_(number_format))\n\n// range: [0, 2**112 - 1]\n// resolution: 1 / 2**112\n\nlibrary UQ112x112 {\n    uint224 constant Q112 = 2**112;\n\n    // encode a uint112 as a UQ112x112\n    function encode(uint112 y) internal pure returns (uint224 z) {\n        z = uint224(y) * Q112; // never overflows\n    }\n\n    // divide a UQ112x112 by a uint112, returning a UQ112x112\n    function uqdiv(uint224 x, uint112 y) internal pure returns (uint224 z) {\n        z = x / uint224(y);\n    }\n}\n",
+            "contracts/uniswapv2/libraries/UniswapV2Library.sol": "// SPDX-License-Identifier: GPL-3.0\n\npragma solidity >=0.5.0;\n\nimport '../interfaces/IUniswapV2Pair.sol';\n\nimport \"./SafeMath.sol\";\n\nlibrary UniswapV2Library {\n    using SafeMathUniswap for uint;\n\n    // returns sorted token addresses, used to handle return values from pairs sorted in this order\n    function sortTokens(address tokenA, address tokenB) internal pure returns (address token0, address token1) {\n        require(tokenA != tokenB, 'UniswapV2Library: IDENTICAL_ADDRESSES');\n        (token0, token1) = tokenA < tokenB ? (tokenA, tokenB) : (tokenB, tokenA);\n        require(token0 != address(0), 'UniswapV2Library: ZERO_ADDRESS');\n    }\n\n    // calculates the CREATE2 address for a pair without making any external calls\n    function pairFor(address factory, address tokenA, address tokenB) internal pure returns (address pair) {\n        (address token0, address token1) = sortTokens(tokenA, tokenB);\n        pair = address(uint(keccak256(abi.encodePacked(\n                hex'ff',\n                factory,\n                keccak256(abi.encodePacked(token0, token1)),\n                hex'e18a34eb0e04b04f7a0ac29a6e80748dca96319b42c54d679cb821dca90c6303' // init code hash\n            ))));\n    }\n\n    // fetches and sorts the reserves for a pair\n    function getReserves(address factory, address tokenA, address tokenB) internal view returns (uint reserveA, uint reserveB) {\n        (address token0,) = sortTokens(tokenA, tokenB);\n        (uint reserve0, uint reserve1,) = IUniswapV2Pair(pairFor(factory, tokenA, tokenB)).getReserves();\n        (reserveA, reserveB) = tokenA == token0 ? (reserve0, reserve1) : (reserve1, reserve0);\n    }\n\n    // given some amount of an asset and pair reserves, returns an equivalent amount of the other asset\n    function quote(uint amountA, uint reserveA, uint reserveB) internal pure returns (uint amountB) {\n        require(amountA > 0, 'UniswapV2Library: INSUFFICIENT_AMOUNT');\n        require(reserveA > 0 && reserveB > 0, 'UniswapV2Library: INSUFFICIENT_LIQUIDITY');\n        amountB = amountA.mul(reserveB) / reserveA;\n    }\n\n    // given an input amount of an asset and pair reserves, returns the maximum output amount of the other asset\n    function getAmountOut(uint amountIn, uint reserveIn, uint reserveOut) internal pure returns (uint amountOut) {\n        require(amountIn > 0, 'UniswapV2Library: INSUFFICIENT_INPUT_AMOUNT');\n        require(reserveIn > 0 && reserveOut > 0, 'UniswapV2Library: INSUFFICIENT_LIQUIDITY');\n        uint amountInWithFee = amountIn.mul(997);\n        uint numerator = amountInWithFee.mul(reserveOut);\n        uint denominator = reserveIn.mul(1000).add(amountInWithFee);\n        amountOut = numerator / denominator;\n    }\n\n    // given an output amount of an asset and pair reserves, returns a required input amount of the other asset\n    function getAmountIn(uint amountOut, uint reserveIn, uint reserveOut) internal pure returns (uint amountIn) {\n        require(amountOut > 0, 'UniswapV2Library: INSUFFICIENT_OUTPUT_AMOUNT');\n        require(reserveIn > 0 && reserveOut > 0, 'UniswapV2Library: INSUFFICIENT_LIQUIDITY');\n        uint numerator = reserveIn.mul(amountOut).mul(1000);\n        uint denominator = reserveOut.sub(amountOut).mul(997);\n        amountIn = (numerator / denominator).add(1);\n    }\n\n    // performs chained getAmountOut calculations on any number of pairs\n    function getAmountsOut(address factory, uint amountIn, address[] memory path) internal view returns (uint[] memory amounts) {\n        require(path.length >= 2, 'UniswapV2Library: INVALID_PATH');\n        amounts = new uint[](path.length);\n        amounts[0] = amountIn;\n        for (uint i; i < path.length - 1; i++) {\n            (uint reserveIn, uint reserveOut) = getReserves(factory, path[i], path[i + 1]);\n            amounts[i + 1] = getAmountOut(amounts[i], reserveIn, reserveOut);\n        }\n    }\n\n    // performs chained getAmountIn calculations on any number of pairs\n    function getAmountsIn(address factory, uint amountOut, address[] memory path) internal view returns (uint[] memory amounts) {\n        require(path.length >= 2, 'UniswapV2Library: INVALID_PATH');\n        amounts = new uint[](path.length);\n        amounts[amounts.length - 1] = amountOut;\n        for (uint i = path.length - 1; i > 0; i--) {\n            (uint reserveIn, uint reserveOut) = getReserves(factory, path[i - 1], path[i]);\n            amounts[i - 1] = getAmountIn(amounts[i], reserveIn, reserveOut);\n        }\n    }\n}\n"
+        },
+        "abi": "[{\"inputs\":[{\"internalType\":\"address\",\"name\":\"_factory\",\"type\":\"address\"},{\"internalType\":\"address\",\"name\":\"_WETH\",\"type\":\"address\"}],\"type\":\"constructor\"},{\"inputs\":[],\"name\":\"WETH\",\"outputs\":[{\"internalType\":\"address\",\"name\":\"\",\"type\":\"address\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"address\",\"name\":\"tokenA\",\"type\":\"address\"},{\"internalType\":\"address\",\"name\":\"tokenB\",\"type\":\"address\"},{\"internalType\":\"uint256\",\"name\":\"amountADesired\",\"type\":\"uint256\"},{\"internalType\":\"uint256\",\"name\":\"amountBDesired\",\"type\":\"uint256\"},{\"internalType\":\"uint256\",\"name\":\"amountAMin\",\"type\":\"uint256\"},{\"internalType\":\"uint256\",\"name\":\"amountBMin\",\"type\":\"uint256\"},{\"internalType\":\"address\",\"name\":\"to\",\"type\":\"address\"},{\"internalType\":\"uint256\",\"name\":\"deadline\",\"type\":\"uint256\"}],\"name\":\"addLiquidity\",\"outputs\":[{\"internalType\":\"uint256\",\"name\":\"amountA\",\"type\":\"uint256\"},{\"internalType\":\"uint256\",\"name\":\"amountB\",\"type\":\"uint256\"},{\"internalType\":\"uint256\",\"name\":\"liquidity\",\"type\":\"uint256\"}],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"address\",\"name\":\"token\",\"type\":\"address\"},{\"internalType\":\"uint256\",\"name\":\"amountTokenDesired\",\"type\":\"uint256\"},{\"internalType\":\"uint256\",\"name\":\"amountTokenMin\",\"type\":\"uint256\"},{\"internalType\":\"uint256\",\"name\":\"amountETHMin\",\"type\":\"uint256\"},{\"internalType\":\"address\",\"name\":\"to\",\"type\":\"address\"},{\"internalType\":\"uint256\",\"name\":\"deadline\",\"type\":\"uint256\"}],\"name\":\"addLiquidityETH\",\"outputs\":[{\"internalType\":\"uint256\",\"name\":\"amountToken\",\"type\":\"uint256\"},{\"internalType\":\"uint256\",\"name\":\"amountETH\",\"type\":\"uint256\"},{\"internalType\":\"uint256\",\"name\":\"liquidity\",\"type\":\"uint256\"}],\"stateMutability\":\"payable\",\"type\":\"function\"},{\"inputs\":[],\"name\":\"factory\",\"outputs\":[{\"internalType\":\"address\",\"name\":\"\",\"type\":\"address\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"uint256\",\"name\":\"amountOut\",\"type\":\"uint256\"},{\"internalType\":\"uint256\",\"name\":\"reserveIn\",\"type\":\"uint256\"},{\"internalType\":\"uint256\",\"name\":\"reserveOut\",\"type\":\"uint256\"}],\"name\":\"getAmountIn\",\"outputs\":[{\"internalType\":\"uint256\",\"name\":\"amountIn\",\"type\":\"uint256\"}],\"stateMutability\":\"pure\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"uint256\",\"name\":\"amountIn\",\"type\":\"uint256\"},{\"internalType\":\"uint256\",\"name\":\"reserveIn\",\"type\":\"uint256\"},{\"internalType\":\"uint256\",\"name\":\"reserveOut\",\"type\":\"uint256\"}],\"name\":\"getAmountOut\",\"outputs\":[{\"internalType\":\"uint256\",\"name\":\"amountOut\",\"type\":\"uint256\"}],\"stateMutability\":\"pure\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"uint256\",\"name\":\"amountOut\",\"type\":\"uint256\"},{\"internalType\":\"address[]\",\"name\":\"path\",\"type\":\"address[]\"}],\"name\":\"getAmountsIn\",\"outputs\":[{\"internalType\":\"uint256[]\",\"name\":\"amounts\",\"type\":\"uint256[]\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"uint256\",\"name\":\"amountIn\",\"type\":\"uint256\"},{\"internalType\":\"address[]\",\"name\":\"path\",\"type\":\"address[]\"}],\"name\":\"getAmountsOut\",\"outputs\":[{\"internalType\":\"uint256[]\",\"name\":\"amounts\",\"type\":\"uint256[]\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"uint256\",\"name\":\"amountA\",\"type\":\"uint256\"},{\"internalType\":\"uint256\",\"name\":\"reserveA\",\"type\":\"uint256\"},{\"internalType\":\"uint256\",\"name\":\"reserveB\",\"type\":\"uint256\"}],\"name\":\"quote\",\"outputs\":[{\"internalType\":\"uint256\",\"name\":\"amountB\",\"type\":\"uint256\"}],\"stateMutability\":\"pure\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"address\",\"name\":\"tokenA\",\"type\":\"address\"},{\"internalType\":\"address\",\"name\":\"tokenB\",\"type\":\"address\"},{\"internalType\":\"uint256\",\"name\":\"liquidity\",\"type\":\"uint256\"},{\"internalType\":\"uint256\",\"name\":\"amountAMin\",\"type\":\"uint256\"},{\"internalType\":\"uint256\",\"name\":\"amountBMin\",\"type\":\"uint256\"},{\"internalType\":\"address\",\"name\":\"to\",\"type\":\"address\"},{\"internalType\":\"uint256\",\"name\":\"deadline\",\"type\":\"uint256\"}],\"name\":\"removeLiquidity\",\"outputs\":[{\"internalType\":\"uint256\",\"name\":\"amountA\",\"type\":\"uint256\"},{\"internalType\":\"uint256\",\"name\":\"amountB\",\"type\":\"uint256\"}],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"address\",\"name\":\"token\",\"type\":\"address\"},{\"internalType\":\"uint256\",\"name\":\"liquidity\",\"type\":\"uint256\"},{\"internalType\":\"uint256\",\"name\":\"amountTokenMin\",\"type\":\"uint256\"},{\"internalType\":\"uint256\",\"name\":\"amountETHMin\",\"type\":\"uint256\"},{\"internalType\":\"address\",\"name\":\"to\",\"type\":\"address\"},{\"internalType\":\"uint256\",\"name\":\"deadline\",\"type\":\"uint256\"}],\"name\":\"removeLiquidityETH\",\"outputs\":[{\"internalType\":\"uint256\",\"name\":\"amountToken\",\"type\":\"uint256\"},{\"internalType\":\"uint256\",\"name\":\"amountETH\",\"type\":\"uint256\"}],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"address\",\"name\":\"token\",\"type\":\"address\"},{\"internalType\":\"uint256\",\"name\":\"liquidity\",\"type\":\"uint256\"},{\"internalType\":\"uint256\",\"name\":\"amountTokenMin\",\"type\":\"uint256\"},{\"internalType\":\"uint256\",\"name\":\"amountETHMin\",\"type\":\"uint256\"},{\"internalType\":\"address\",\"name\":\"to\",\"type\":\"address\"},{\"internalType\":\"uint256\",\"name\":\"deadline\",\"type\":\"uint256\"}],\"name\":\"removeLiquidityETHSupportingFeeOnTransferTokens\",\"outputs\":[{\"internalType\":\"uint256\",\"name\":\"amountETH\",\"type\":\"uint256\"}],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"address\",\"name\":\"token\",\"type\":\"address\"},{\"internalType\":\"uint256\",\"name\":\"liquidity\",\"type\":\"uint256\"},{\"internalType\":\"uint256\",\"name\":\"amountTokenMin\",\"type\":\"uint256\"},{\"internalType\":\"uint256\",\"name\":\"amountETHMin\",\"type\":\"uint256\"},{\"internalType\":\"address\",\"name\":\"to\",\"type\":\"address\"},{\"internalType\":\"uint256\",\"name\":\"deadline\",\"type\":\"uint256\"},{\"internalType\":\"bool\",\"name\":\"approveMax\",\"type\":\"bool\"},{\"internalType\":\"uint8\",\"name\":\"v\",\"type\":\"uint8\"},{\"internalType\":\"bytes32\",\"name\":\"r\",\"type\":\"bytes32\"},{\"internalType\":\"bytes32\",\"name\":\"s\",\"type\":\"bytes32\"}],\"name\":\"removeLiquidityETHWithPermit\",\"outputs\":[{\"internalType\":\"uint256\",\"name\":\"amountToken\",\"type\":\"uint256\"},{\"internalType\":\"uint256\",\"name\":\"amountETH\",\"type\":\"uint256\"}],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"address\",\"name\":\"token\",\"type\":\"address\"},{\"internalType\":\"uint256\",\"name\":\"liquidity\",\"type\":\"uint256\"},{\"internalType\":\"uint256\",\"name\":\"amountTokenMin\",\"type\":\"uint256\"},{\"internalType\":\"uint256\",\"name\":\"amountETHMin\",\"type\":\"uint256\"},{\"internalType\":\"address\",\"name\":\"to\",\"type\":\"address\"},{\"internalType\":\"uint256\",\"name\":\"deadline\",\"type\":\"uint256\"},{\"internalType\":\"bool\",\"name\":\"approveMax\",\"type\":\"bool\"},{\"internalType\":\"uint8\",\"name\":\"v\",\"type\":\"uint8\"},{\"internalType\":\"bytes32\",\"name\":\"r\",\"type\":\"bytes32\"},{\"internalType\":\"bytes32\",\"name\":\"s\",\"type\":\"bytes32\"}],\"name\":\"removeLiquidityETHWithPermitSupportingFeeOnTransferTokens\",\"outputs\":[{\"internalType\":\"uint256\",\"name\":\"amountETH\",\"type\":\"uint256\"}],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"address\",\"name\":\"tokenA\",\"type\":\"address\"},{\"internalType\":\"address\",\"name\":\"tokenB\",\"type\":\"address\"},{\"internalType\":\"uint256\",\"name\":\"liquidity\",\"type\":\"uint256\"},{\"internalType\":\"uint256\",\"name\":\"amountAMin\",\"type\":\"uint256\"},{\"internalType\":\"uint256\",\"name\":\"amountBMin\",\"type\":\"uint256\"},{\"internalType\":\"address\",\"name\":\"to\",\"type\":\"address\"},{\"internalType\":\"uint256\",\"name\":\"deadline\",\"type\":\"uint256\"},{\"internalType\":\"bool\",\"name\":\"approveMax\",\"type\":\"bool\"},{\"internalType\":\"uint8\",\"name\":\"v\",\"type\":\"uint8\"},{\"internalType\":\"bytes32\",\"name\":\"r\",\"type\":\"bytes32\"},{\"internalType\":\"bytes32\",\"name\":\"s\",\"type\":\"bytes32\"}],\"name\":\"removeLiquidityWithPermit\",\"outputs\":[{\"internalType\":\"uint256\",\"name\":\"amountA\",\"type\":\"uint256\"},{\"internalType\":\"uint256\",\"name\":\"amountB\",\"type\":\"uint256\"}],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"uint256\",\"name\":\"amountOut\",\"type\":\"uint256\"},{\"internalType\":\"address[]\",\"name\":\"path\",\"type\":\"address[]\"},{\"internalType\":\"address\",\"name\":\"to\",\"type\":\"address\"},{\"internalType\":\"uint256\",\"name\":\"deadline\",\"type\":\"uint256\"}],\"name\":\"swapETHForExactTokens\",\"outputs\":[{\"internalType\":\"uint256[]\",\"name\":\"amounts\",\"type\":\"uint256[]\"}],\"stateMutability\":\"payable\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"uint256\",\"name\":\"amountOutMin\",\"type\":\"uint256\"},{\"internalType\":\"address[]\",\"name\":\"path\",\"type\":\"address[]\"},{\"internalType\":\"address\",\"name\":\"to\",\"type\":\"address\"},{\"internalType\":\"uint256\",\"name\":\"deadline\",\"type\":\"uint256\"}],\"name\":\"swapExactETHForTokens\",\"outputs\":[{\"internalType\":\"uint256[]\",\"name\":\"amounts\",\"type\":\"uint256[]\"}],\"stateMutability\":\"payable\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"uint256\",\"name\":\"amountOutMin\",\"type\":\"uint256\"},{\"internalType\":\"address[]\",\"name\":\"path\",\"type\":\"address[]\"},{\"internalType\":\"address\",\"name\":\"to\",\"type\":\"address\"},{\"internalType\":\"uint256\",\"name\":\"deadline\",\"type\":\"uint256\"}],\"name\":\"swapExactETHForTokensSupportingFeeOnTransferTokens\",\"outputs\":[],\"stateMutability\":\"payable\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"uint256\",\"name\":\"amountIn\",\"type\":\"uint256\"},{\"internalType\":\"uint256\",\"name\":\"amountOutMin\",\"type\":\"uint256\"},{\"internalType\":\"address[]\",\"name\":\"path\",\"type\":\"address[]\"},{\"internalType\":\"address\",\"name\":\"to\",\"type\":\"address\"},{\"internalType\":\"uint256\",\"name\":\"deadline\",\"type\":\"uint256\"}],\"name\":\"swapExactTokensForETH\",\"outputs\":[{\"internalType\":\"uint256[]\",\"name\":\"amounts\",\"type\":\"uint256[]\"}],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"uint256\",\"name\":\"amountIn\",\"type\":\"uint256\"},{\"internalType\":\"uint256\",\"name\":\"amountOutMin\",\"type\":\"uint256\"},{\"internalType\":\"address[]\",\"name\":\"path\",\"type\":\"address[]\"},{\"internalType\":\"address\",\"name\":\"to\",\"type\":\"address\"},{\"internalType\":\"uint256\",\"name\":\"deadline\",\"type\":\"uint256\"}],\"name\":\"swapExactTokensForETHSupportingFeeOnTransferTokens\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"uint256\",\"name\":\"amountIn\",\"type\":\"uint256\"},{\"internalType\":\"uint256\",\"name\":\"amountOutMin\",\"type\":\"uint256\"},{\"internalType\":\"address[]\",\"name\":\"path\",\"type\":\"address[]\"},{\"internalType\":\"address\",\"name\":\"to\",\"type\":\"address\"},{\"internalType\":\"uint256\",\"name\":\"deadline\",\"type\":\"uint256\"}],\"name\":\"swapExactTokensForTokens\",\"outputs\":[{\"internalType\":\"uint256[]\",\"name\":\"amounts\",\"type\":\"uint256[]\"}],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"uint256\",\"name\":\"amountIn\",\"type\":\"uint256\"},{\"internalType\":\"uint256\",\"name\":\"amountOutMin\",\"type\":\"uint256\"},{\"internalType\":\"address[]\",\"name\":\"path\",\"type\":\"address[]\"},{\"internalType\":\"address\",\"name\":\"to\",\"type\":\"address\"},{\"internalType\":\"uint256\",\"name\":\"deadline\",\"type\":\"uint256\"}],\"name\":\"swapExactTokensForTokensSupportingFeeOnTransferTokens\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"uint256\",\"name\":\"amountOut\",\"type\":\"uint256\"},{\"internalType\":\"uint256\",\"name\":\"amountInMax\",\"type\":\"uint256\"},{\"internalType\":\"address[]\",\"name\":\"path\",\"type\":\"address[]\"},{\"internalType\":\"address\",\"name\":\"to\",\"type\":\"address\"},{\"internalType\":\"uint256\",\"name\":\"deadline\",\"type\":\"uint256\"}],\"name\":\"swapTokensForExactETH\",\"outputs\":[{\"internalType\":\"uint256[]\",\"name\":\"amounts\",\"type\":\"uint256[]\"}],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"uint256\",\"name\":\"amountOut\",\"type\":\"uint256\"},{\"internalType\":\"uint256\",\"name\":\"amountInMax\",\"type\":\"uint256\"},{\"internalType\":\"address[]\",\"name\":\"path\",\"type\":\"address[]\"},{\"internalType\":\"address\",\"name\":\"to\",\"type\":\"address\"},{\"internalType\":\"uint256\",\"name\":\"deadline\",\"type\":\"uint256\"}],\"name\":\"swapTokensForExactTokens\",\"outputs\":[{\"internalType\":\"uint256[]\",\"name\":\"amounts\",\"type\":\"uint256[]\"}],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"type\":\"receive\"}]",
+        "constructorArguments": "000000000000000000000000c35dadb65012ec5796536bd9864ed8773abc74c4000000000000000000000000b4fbf271143f4fbf7b91a5ded31805e42b2208d6",
+        "matchType": "PARTIAL"
+    }
+  ],
+  "sourcifySources": []
+}
\ No newline at end of file
diff --git a/apps/block_scout_web/test/support/fixture/smart_contract/eth_bytecode_db_search_all_sourcify_sources_response.json b/apps/block_scout_web/test/support/fixture/smart_contract/eth_bytecode_db_search_all_sourcify_sources_response.json
new file mode 100644
index 000000000000..8456169ebd33
--- /dev/null
+++ b/apps/block_scout_web/test/support/fixture/smart_contract/eth_bytecode_db_search_all_sourcify_sources_response.json
@@ -0,0 +1,30 @@
+{
+    "ethBytecodeDbSources": [
+        {
+            "fileName": "Test_eth.sol",
+            "contractName": "Test",
+            "compilerVersion": "v0.8.17+commit.8df45f5f",
+            "compilerSettings": "{\"libraries\":{\"Test.sol\":{}},\"metadata\":{\"bytecodeHash\":\"ipfs\"},\"optimizer\":{\"enabled\":true,\"runs\":199},\"outputSelection\":{\"*\":{\"\":[\"ast\"],\"*\":[\"abi\",\"evm.bytecode\",\"evm.deployedBytecode\",\"evm.methodIdentifiers\"]}}}",
+            "sourceType": "SOLIDITY",
+            "sourceFiles": {
+                "Test.sol": "// SPDX-License-Identifier: MIT\r\n\r\npragma solidity 0.8.17;\r\n\r\ncontract Test {\r\n    enum E {\r\n        V1, V2, V3, V4\r\n    }\r\n    struct A {\r\n        E a;\r\n        uint256[] b;\r\n        B[] c;\r\n    }\r\n\r\n    struct B {\r\n        uint256 d;\r\n        uint256 e;\r\n    }\r\n\r\n    function get(uint256 x) external pure returns (A memory) {\r\n        uint256[] memory b = new uint256[](3);\r\n        b[0] = 1;\r\n        b[1] = 2;\r\n        b[2] = 3;\r\n        B[] memory c = new B[](3);\r\n        c[0] = B(1, 2);\r\n        c[1] = B(3, 4);\r\n        c[2] = B(5, 6);\r\n        return A(E.V3, b, c);\r\n    }\r\n}"
+            },
+            "abi": "[{\"inputs\":[{\"internalType\":\"uint256\",\"name\":\"x\",\"type\":\"uint256\"}],\"name\":\"get\",\"outputs\":[{\"components\":[{\"type\":\"uint8\"},{\"type\":\"uint256[]\"},{\"components\":[{\"type\":\"uint256\"},{\"type\":\"uint256\"}],\"type\":\"tuple[]\"}],\"internalType\":\"struct Test.A\",\"name\":\"\",\"type\":\"tuple\"}],\"stateMutability\":\"pure\",\"type\":\"function\"}]",
+            "constructorArguments": "0x0000000000000000000000003e5c63644e683549055b9be8653de26e0b4cd36e",
+            "matchType": "PARTIAL"
+        }
+    ],
+    "sourcifySources": [{
+        "fileName": "Test.sol",
+        "contractName": "Test",
+        "compilerVersion": "v0.8.17+commit.8df45f5f",
+        "compilerSettings": "{\"libraries\":{\"Test.sol\":{}},\"metadata\":{\"bytecodeHash\":\"ipfs\"},\"optimizer\":{\"enabled\":true,\"runs\":199},\"outputSelection\":{\"*\":{\"\":[\"ast\"],\"*\":[\"abi\",\"evm.bytecode\",\"evm.deployedBytecode\",\"evm.methodIdentifiers\"]}}}",
+        "sourceType": "SOLIDITY",
+        "sourceFiles": {
+            "Test.sol": "// SPDX-License-Identifier: MIT\r\n\r\npragma solidity 0.8.17;\r\n\r\ncontract Test {\r\n    enum E {\r\n        V1, V2, V3, V4\r\n    }\r\n    struct A {\r\n        E a;\r\n        uint256[] b;\r\n        B[] c;\r\n    }\r\n\r\n    struct B {\r\n        uint256 d;\r\n        uint256 e;\r\n    }\r\n\r\n    function get(uint256 x) external pure returns (A memory) {\r\n        uint256[] memory b = new uint256[](3);\r\n        b[0] = 1;\r\n        b[1] = 2;\r\n        b[2] = 3;\r\n        B[] memory c = new B[](3);\r\n        c[0] = B(1, 2);\r\n        c[1] = B(3, 4);\r\n        c[2] = B(5, 6);\r\n        return A(E.V3, b, c);\r\n    }\r\n}"
+        },
+        "abi": "[{\"inputs\":[{\"internalType\":\"uint256\",\"name\":\"x\",\"type\":\"uint256\"}],\"name\":\"get\",\"outputs\":[{\"components\":[{\"type\":\"uint8\"},{\"type\":\"uint256[]\"},{\"components\":[{\"type\":\"uint256\"},{\"type\":\"uint256\"}],\"type\":\"tuple[]\"}],\"internalType\":\"struct Test.A\",\"name\":\"\",\"type\":\"tuple\"}],\"stateMutability\":\"pure\",\"type\":\"function\"}]",
+        "constructorArguments": "0x0000000000000000000000003e5c63644e683549055b9be8653de26e0b4cd36e",
+        "matchType": "PARTIAL"
+    }]
+  }
\ No newline at end of file
diff --git a/apps/block_scout_web/test/support/fixture/smart_contract/eth_bytecode_db_search_all_sourcify_sources_with_libs_response.json b/apps/block_scout_web/test/support/fixture/smart_contract/eth_bytecode_db_search_all_sourcify_sources_with_libs_response.json
new file mode 100644
index 000000000000..494c7897b819
--- /dev/null
+++ b/apps/block_scout_web/test/support/fixture/smart_contract/eth_bytecode_db_search_all_sourcify_sources_with_libs_response.json
@@ -0,0 +1,47 @@
+{
+    "ethBytecodeDbSources": [],
+    "sourcifySources": [
+        {
+            "fileName": "src/zkbob/ZkBobPool.sol",
+            "contractName": "ZkBobPool",
+            "compilerVersion": "0.8.15+commit.e14f2714",
+            "compilerSettings": "{\"evmVersion\":\"london\",\"libraries\":{\"lib/base58-solidity/contracts/Base58.sol:Base58\":\"0x22de6b06544ee5cd907813a04bcded149a2f49d2\",\"src/libraries/ZkAddress.sol:ZkAddress\":\"0x019d3788f00a7087234f3844cb1cece1f9982b7a\"},\"metadata\":{\"bytecodeHash\":\"ipfs\"},\"optimizer\":{\"enabled\":true,\"runs\":200},\"remappings\":[\":@base58-solidity/=lib/base58-solidity/contracts/\",\":@gnosis/=lib/@gnosis/\",\":@gnosis/auction/=lib/@gnosis/auction/contracts/\",\":@openzeppelin/=lib/@openzeppelin/contracts/\",\":@openzeppelin/contracts/=lib/@openzeppelin/contracts/contracts/\",\":@uniswap/=lib/@uniswap/\",\":base58-solidity/=lib/base58-solidity/contracts/\",\":ds-test/=lib/forge-std/lib/ds-test/src/\",\":forge-std/=lib/forge-std/src/\"]}",
+            "sourceType": "SOLIDITY",
+            "sourceFiles": {
+                "lib/_openzeppelin/contracts/contracts/access/Ownable.sol": "// SPDX-License-Identifier: MIT\n// OpenZeppelin Contracts (last updated v4.7.0) (access/Ownable.sol)\n\npragma solidity ^0.8.0;\n\nimport \"../utils/Context.sol\";\n\n/**\n * @dev Contract module which provides a basic access control mechanism, where\n * there is an account (an owner) that can be granted exclusive access to\n * specific functions.\n *\n * By default, the owner account will be the one that deploys the contract. This\n * can later be changed with {transferOwnership}.\n *\n * This module is used through inheritance. It will make available the modifier\n * `onlyOwner`, which can be applied to your functions to restrict their use to\n * the owner.\n */\nabstract contract Ownable is Context {\n    address private _owner;\n\n    event OwnershipTransferred(address indexed previousOwner, address indexed newOwner);\n\n    /**\n     * @dev Initializes the contract setting the deployer as the initial owner.\n     */\n    constructor() {\n        _transferOwnership(_msgSender());\n    }\n\n    /**\n     * @dev Throws if called by any account other than the owner.\n     */\n    modifier onlyOwner() {\n        _checkOwner();\n        _;\n    }\n\n    /**\n     * @dev Returns the address of the current owner.\n     */\n    function owner() public view virtual returns (address) {\n        return _owner;\n    }\n\n    /**\n     * @dev Throws if the sender is not the owner.\n     */\n    function _checkOwner() internal view virtual {\n        require(owner() == _msgSender(), \"Ownable: caller is not the owner\");\n    }\n\n    /**\n     * @dev Leaves the contract without owner. It will not be possible to call\n     * `onlyOwner` functions anymore. Can only be called by the current owner.\n     *\n     * NOTE: Renouncing ownership will leave the contract without an owner,\n     * thereby removing any functionality that is only available to the owner.\n     */\n    function renounceOwnership() public virtual onlyOwner {\n        _transferOwnership(address(0));\n    }\n\n    /**\n     * @dev Transfers ownership of the contract to a new account (`newOwner`).\n     * Can only be called by the current owner.\n     */\n    function transferOwnership(address newOwner) public virtual onlyOwner {\n        require(newOwner != address(0), \"Ownable: new owner is the zero address\");\n        _transferOwnership(newOwner);\n    }\n\n    /**\n     * @dev Transfers ownership of the contract to a new account (`newOwner`).\n     * Internal function without access restriction.\n     */\n    function _transferOwnership(address newOwner) internal virtual {\n        address oldOwner = _owner;\n        _owner = newOwner;\n        emit OwnershipTransferred(oldOwner, newOwner);\n    }\n}\n",
+                "lib/_openzeppelin/contracts/contracts/token/ERC20/IERC20.sol": "// SPDX-License-Identifier: MIT\n// OpenZeppelin Contracts (last updated v4.6.0) (token/ERC20/IERC20.sol)\n\npragma solidity ^0.8.0;\n\n/**\n * @dev Interface of the ERC20 standard as defined in the EIP.\n */\ninterface IERC20 {\n    /**\n     * @dev Emitted when `value` tokens are moved from one account (`from`) to\n     * another (`to`).\n     *\n     * Note that `value` may be zero.\n     */\n    event Transfer(address indexed from, address indexed to, uint256 value);\n\n    /**\n     * @dev Emitted when the allowance of a `spender` for an `owner` is set by\n     * a call to {approve}. `value` is the new allowance.\n     */\n    event Approval(address indexed owner, address indexed spender, uint256 value);\n\n    /**\n     * @dev Returns the amount of tokens in existence.\n     */\n    function totalSupply() external view returns (uint256);\n\n    /**\n     * @dev Returns the amount of tokens owned by `account`.\n     */\n    function balanceOf(address account) external view returns (uint256);\n\n    /**\n     * @dev Moves `amount` tokens from the caller's account to `to`.\n     *\n     * Returns a boolean value indicating whether the operation succeeded.\n     *\n     * Emits a {Transfer} event.\n     */\n    function transfer(address to, uint256 amount) external returns (bool);\n\n    /**\n     * @dev Returns the remaining number of tokens that `spender` will be\n     * allowed to spend on behalf of `owner` through {transferFrom}. This is\n     * zero by default.\n     *\n     * This value changes when {approve} or {transferFrom} are called.\n     */\n    function allowance(address owner, address spender) external view returns (uint256);\n\n    /**\n     * @dev Sets `amount` as the allowance of `spender` over the caller's tokens.\n     *\n     * Returns a boolean value indicating whether the operation succeeded.\n     *\n     * IMPORTANT: Beware that changing an allowance with this method brings the risk\n     * that someone may use both the old and the new allowance by unfortunate\n     * transaction ordering. One possible solution to mitigate this race\n     * condition is to first reduce the spender's allowance to 0 and set the\n     * desired value afterwards:\n     * https://github.com/ethereum/EIPs/issues/20#issuecomment-263524729\n     *\n     * Emits an {Approval} event.\n     */\n    function approve(address spender, uint256 amount) external returns (bool);\n\n    /**\n     * @dev Moves `amount` tokens from `from` to `to` using the\n     * allowance mechanism. `amount` is then deducted from the caller's\n     * allowance.\n     *\n     * Returns a boolean value indicating whether the operation succeeded.\n     *\n     * Emits a {Transfer} event.\n     */\n    function transferFrom(\n        address from,\n        address to,\n        uint256 amount\n    ) external returns (bool);\n}\n",
+                "lib/_openzeppelin/contracts/contracts/token/ERC20/extensions/draft-IERC20Permit.sol": "// SPDX-License-Identifier: MIT\n// OpenZeppelin Contracts v4.4.1 (token/ERC20/extensions/draft-IERC20Permit.sol)\n\npragma solidity ^0.8.0;\n\n/**\n * @dev Interface of the ERC20 Permit extension allowing approvals to be made via signatures, as defined in\n * https://eips.ethereum.org/EIPS/eip-2612[EIP-2612].\n *\n * Adds the {permit} method, which can be used to change an account's ERC20 allowance (see {IERC20-allowance}) by\n * presenting a message signed by the account. By not relying on {IERC20-approve}, the token holder account doesn't\n * need to send a transaction, and thus is not required to hold Ether at all.\n */\ninterface IERC20Permit {\n    /**\n     * @dev Sets `value` as the allowance of `spender` over ``owner``'s tokens,\n     * given ``owner``'s signed approval.\n     *\n     * IMPORTANT: The same issues {IERC20-approve} has related to transaction\n     * ordering also apply here.\n     *\n     * Emits an {Approval} event.\n     *\n     * Requirements:\n     *\n     * - `spender` cannot be the zero address.\n     * - `deadline` must be a timestamp in the future.\n     * - `v`, `r` and `s` must be a valid `secp256k1` signature from `owner`\n     * over the EIP712-formatted function arguments.\n     * - the signature must use ``owner``'s current nonce (see {nonces}).\n     *\n     * For more information on the signature format, see the\n     * https://eips.ethereum.org/EIPS/eip-2612#specification[relevant EIP\n     * section].\n     */\n    function permit(\n        address owner,\n        address spender,\n        uint256 value,\n        uint256 deadline,\n        uint8 v,\n        bytes32 r,\n        bytes32 s\n    ) external;\n\n    /**\n     * @dev Returns the current nonce for `owner`. This value must be\n     * included whenever a signature is generated for {permit}.\n     *\n     * Every successful call to {permit} increases ``owner``'s nonce by one. This\n     * prevents a signature from being used multiple times.\n     */\n    function nonces(address owner) external view returns (uint256);\n\n    /**\n     * @dev Returns the domain separator used in the encoding of the signature for {permit}, as defined by {EIP712}.\n     */\n    // solhint-disable-next-line func-name-mixedcase\n    function DOMAIN_SEPARATOR() external view returns (bytes32);\n}\n",
+                "lib/_openzeppelin/contracts/contracts/token/ERC20/utils/SafeERC20.sol": "// SPDX-License-Identifier: MIT\n// OpenZeppelin Contracts (last updated v4.7.0) (token/ERC20/utils/SafeERC20.sol)\n\npragma solidity ^0.8.0;\n\nimport \"../IERC20.sol\";\nimport \"../extensions/draft-IERC20Permit.sol\";\nimport \"../../../utils/Address.sol\";\n\n/**\n * @title SafeERC20\n * @dev Wrappers around ERC20 operations that throw on failure (when the token\n * contract returns false). Tokens that return no value (and instead revert or\n * throw on failure) are also supported, non-reverting calls are assumed to be\n * successful.\n * To use this library you can add a `using SafeERC20 for IERC20;` statement to your contract,\n * which allows you to call the safe operations as `token.safeTransfer(...)`, etc.\n */\nlibrary SafeERC20 {\n    using Address for address;\n\n    function safeTransfer(\n        IERC20 token,\n        address to,\n        uint256 value\n    ) internal {\n        _callOptionalReturn(token, abi.encodeWithSelector(token.transfer.selector, to, value));\n    }\n\n    function safeTransferFrom(\n        IERC20 token,\n        address from,\n        address to,\n        uint256 value\n    ) internal {\n        _callOptionalReturn(token, abi.encodeWithSelector(token.transferFrom.selector, from, to, value));\n    }\n\n    /**\n     * @dev Deprecated. This function has issues similar to the ones found in\n     * {IERC20-approve}, and its usage is discouraged.\n     *\n     * Whenever possible, use {safeIncreaseAllowance} and\n     * {safeDecreaseAllowance} instead.\n     */\n    function safeApprove(\n        IERC20 token,\n        address spender,\n        uint256 value\n    ) internal {\n        // safeApprove should only be called when setting an initial allowance,\n        // or when resetting it to zero. To increase and decrease it, use\n        // 'safeIncreaseAllowance' and 'safeDecreaseAllowance'\n        require(\n            (value == 0) || (token.allowance(address(this), spender) == 0),\n            \"SafeERC20: approve from non-zero to non-zero allowance\"\n        );\n        _callOptionalReturn(token, abi.encodeWithSelector(token.approve.selector, spender, value));\n    }\n\n    function safeIncreaseAllowance(\n        IERC20 token,\n        address spender,\n        uint256 value\n    ) internal {\n        uint256 newAllowance = token.allowance(address(this), spender) + value;\n        _callOptionalReturn(token, abi.encodeWithSelector(token.approve.selector, spender, newAllowance));\n    }\n\n    function safeDecreaseAllowance(\n        IERC20 token,\n        address spender,\n        uint256 value\n    ) internal {\n        unchecked {\n            uint256 oldAllowance = token.allowance(address(this), spender);\n            require(oldAllowance >= value, \"SafeERC20: decreased allowance below zero\");\n            uint256 newAllowance = oldAllowance - value;\n            _callOptionalReturn(token, abi.encodeWithSelector(token.approve.selector, spender, newAllowance));\n        }\n    }\n\n    function safePermit(\n        IERC20Permit token,\n        address owner,\n        address spender,\n        uint256 value,\n        uint256 deadline,\n        uint8 v,\n        bytes32 r,\n        bytes32 s\n    ) internal {\n        uint256 nonceBefore = token.nonces(owner);\n        token.permit(owner, spender, value, deadline, v, r, s);\n        uint256 nonceAfter = token.nonces(owner);\n        require(nonceAfter == nonceBefore + 1, \"SafeERC20: permit did not succeed\");\n    }\n\n    /**\n     * @dev Imitates a Solidity high-level call (i.e. a regular function call to a contract), relaxing the requirement\n     * on the return value: the return value is optional (but if data is returned, it must not be false).\n     * @param token The token targeted by the call.\n     * @param data The call data (encoded using abi.encode or one of its variants).\n     */\n    function _callOptionalReturn(IERC20 token, bytes memory data) private {\n        // We need to perform a low level call here, to bypass Solidity's return data size checking mechanism, since\n        // we're implementing it ourselves. We use {Address.functionCall} to perform this call, which verifies that\n        // the target address contains contract code and also asserts for success in the low-level call.\n\n        bytes memory returndata = address(token).functionCall(data, \"SafeERC20: low-level call failed\");\n        if (returndata.length > 0) {\n            // Return data is optional\n            require(abi.decode(returndata, (bool)), \"SafeERC20: ERC20 operation did not succeed\");\n        }\n    }\n}\n",
+                "lib/_openzeppelin/contracts/contracts/utils/Address.sol": "// SPDX-License-Identifier: MIT\n// OpenZeppelin Contracts (last updated v4.7.0) (utils/Address.sol)\n\npragma solidity ^0.8.1;\n\n/**\n * @dev Collection of functions related to the address type\n */\nlibrary Address {\n    /**\n     * @dev Returns true if `account` is a contract.\n     *\n     * [IMPORTANT]\n     * ====\n     * It is unsafe to assume that an address for which this function returns\n     * false is an externally-owned account (EOA) and not a contract.\n     *\n     * Among others, `isContract` will return false for the following\n     * types of addresses:\n     *\n     *  - an externally-owned account\n     *  - a contract in construction\n     *  - an address where a contract will be created\n     *  - an address where a contract lived, but was destroyed\n     * ====\n     *\n     * [IMPORTANT]\n     * ====\n     * You shouldn't rely on `isContract` to protect against flash loan attacks!\n     *\n     * Preventing calls from contracts is highly discouraged. It breaks composability, breaks support for smart wallets\n     * like Gnosis Safe, and does not provide security since it can be circumvented by calling from a contract\n     * constructor.\n     * ====\n     */\n    function isContract(address account) internal view returns (bool) {\n        // This method relies on extcodesize/address.code.length, which returns 0\n        // for contracts in construction, since the code is only stored at the end\n        // of the constructor execution.\n\n        return account.code.length > 0;\n    }\n\n    /**\n     * @dev Replacement for Solidity's `transfer`: sends `amount` wei to\n     * `recipient`, forwarding all available gas and reverting on errors.\n     *\n     * https://eips.ethereum.org/EIPS/eip-1884[EIP1884] increases the gas cost\n     * of certain opcodes, possibly making contracts go over the 2300 gas limit\n     * imposed by `transfer`, making them unable to receive funds via\n     * `transfer`. {sendValue} removes this limitation.\n     *\n     * https://diligence.consensys.net/posts/2019/09/stop-using-soliditys-transfer-now/[Learn more].\n     *\n     * IMPORTANT: because control is transferred to `recipient`, care must be\n     * taken to not create reentrancy vulnerabilities. Consider using\n     * {ReentrancyGuard} or the\n     * https://solidity.readthedocs.io/en/v0.5.11/security-considerations.html#use-the-checks-effects-interactions-pattern[checks-effects-interactions pattern].\n     */\n    function sendValue(address payable recipient, uint256 amount) internal {\n        require(address(this).balance >= amount, \"Address: insufficient balance\");\n\n        (bool success, ) = recipient.call{value: amount}(\"\");\n        require(success, \"Address: unable to send value, recipient may have reverted\");\n    }\n\n    /**\n     * @dev Performs a Solidity function call using a low level `call`. A\n     * plain `call` is an unsafe replacement for a function call: use this\n     * function instead.\n     *\n     * If `target` reverts with a revert reason, it is bubbled up by this\n     * function (like regular Solidity function calls).\n     *\n     * Returns the raw returned data. To convert to the expected return value,\n     * use https://solidity.readthedocs.io/en/latest/units-and-global-variables.html?highlight=abi.decode#abi-encoding-and-decoding-functions[`abi.decode`].\n     *\n     * Requirements:\n     *\n     * - `target` must be a contract.\n     * - calling `target` with `data` must not revert.\n     *\n     * _Available since v3.1._\n     */\n    function functionCall(address target, bytes memory data) internal returns (bytes memory) {\n        return functionCallWithValue(target, data, 0, \"Address: low-level call failed\");\n    }\n\n    /**\n     * @dev Same as {xref-Address-functionCall-address-bytes-}[`functionCall`], but with\n     * `errorMessage` as a fallback revert reason when `target` reverts.\n     *\n     * _Available since v3.1._\n     */\n    function functionCall(\n        address target,\n        bytes memory data,\n        string memory errorMessage\n    ) internal returns (bytes memory) {\n        return functionCallWithValue(target, data, 0, errorMessage);\n    }\n\n    /**\n     * @dev Same as {xref-Address-functionCall-address-bytes-}[`functionCall`],\n     * but also transferring `value` wei to `target`.\n     *\n     * Requirements:\n     *\n     * - the calling contract must have an ETH balance of at least `value`.\n     * - the called Solidity function must be `payable`.\n     *\n     * _Available since v3.1._\n     */\n    function functionCallWithValue(\n        address target,\n        bytes memory data,\n        uint256 value\n    ) internal returns (bytes memory) {\n        return functionCallWithValue(target, data, value, \"Address: low-level call with value failed\");\n    }\n\n    /**\n     * @dev Same as {xref-Address-functionCallWithValue-address-bytes-uint256-}[`functionCallWithValue`], but\n     * with `errorMessage` as a fallback revert reason when `target` reverts.\n     *\n     * _Available since v3.1._\n     */\n    function functionCallWithValue(\n        address target,\n        bytes memory data,\n        uint256 value,\n        string memory errorMessage\n    ) internal returns (bytes memory) {\n        require(address(this).balance >= value, \"Address: insufficient balance for call\");\n        (bool success, bytes memory returndata) = target.call{value: value}(data);\n        return verifyCallResultFromTarget(target, success, returndata, errorMessage);\n    }\n\n    /**\n     * @dev Same as {xref-Address-functionCall-address-bytes-}[`functionCall`],\n     * but performing a static call.\n     *\n     * _Available since v3.3._\n     */\n    function functionStaticCall(address target, bytes memory data) internal view returns (bytes memory) {\n        return functionStaticCall(target, data, \"Address: low-level static call failed\");\n    }\n\n    /**\n     * @dev Same as {xref-Address-functionCall-address-bytes-string-}[`functionCall`],\n     * but performing a static call.\n     *\n     * _Available since v3.3._\n     */\n    function functionStaticCall(\n        address target,\n        bytes memory data,\n        string memory errorMessage\n    ) internal view returns (bytes memory) {\n        (bool success, bytes memory returndata) = target.staticcall(data);\n        return verifyCallResultFromTarget(target, success, returndata, errorMessage);\n    }\n\n    /**\n     * @dev Same as {xref-Address-functionCall-address-bytes-}[`functionCall`],\n     * but performing a delegate call.\n     *\n     * _Available since v3.4._\n     */\n    function functionDelegateCall(address target, bytes memory data) internal returns (bytes memory) {\n        return functionDelegateCall(target, data, \"Address: low-level delegate call failed\");\n    }\n\n    /**\n     * @dev Same as {xref-Address-functionCall-address-bytes-string-}[`functionCall`],\n     * but performing a delegate call.\n     *\n     * _Available since v3.4._\n     */\n    function functionDelegateCall(\n        address target,\n        bytes memory data,\n        string memory errorMessage\n    ) internal returns (bytes memory) {\n        (bool success, bytes memory returndata) = target.delegatecall(data);\n        return verifyCallResultFromTarget(target, success, returndata, errorMessage);\n    }\n\n    /**\n     * @dev Tool to verify that a low level call to smart-contract was successful, and revert (either by bubbling\n     * the revert reason or using the provided one) in case of unsuccessful call or if target was not a contract.\n     *\n     * _Available since v4.8._\n     */\n    function verifyCallResultFromTarget(\n        address target,\n        bool success,\n        bytes memory returndata,\n        string memory errorMessage\n    ) internal view returns (bytes memory) {\n        if (success) {\n            if (returndata.length == 0) {\n                // only check isContract if the call was successful and the return data is empty\n                // otherwise we already know that it was a contract\n                require(isContract(target), \"Address: call to non-contract\");\n            }\n            return returndata;\n        } else {\n            _revert(returndata, errorMessage);\n        }\n    }\n\n    /**\n     * @dev Tool to verify that a low level call was successful, and revert if it wasn't, either by bubbling the\n     * revert reason or using the provided one.\n     *\n     * _Available since v4.3._\n     */\n    function verifyCallResult(\n        bool success,\n        bytes memory returndata,\n        string memory errorMessage\n    ) internal pure returns (bytes memory) {\n        if (success) {\n            return returndata;\n        } else {\n            _revert(returndata, errorMessage);\n        }\n    }\n\n    function _revert(bytes memory returndata, string memory errorMessage) private pure {\n        // Look for revert reason and bubble it up if present\n        if (returndata.length > 0) {\n            // The easiest way to bubble the revert reason is using memory via assembly\n            /// @solidity memory-safe-assembly\n            assembly {\n                let returndata_size := mload(returndata)\n                revert(add(32, returndata), returndata_size)\n            }\n        } else {\n            revert(errorMessage);\n        }\n    }\n}\n",
+                "lib/_openzeppelin/contracts/contracts/utils/Context.sol": "// SPDX-License-Identifier: MIT\n// OpenZeppelin Contracts v4.4.1 (utils/Context.sol)\n\npragma solidity ^0.8.0;\n\n/**\n * @dev Provides information about the current execution context, including the\n * sender of the transaction and its data. While these are generally available\n * via msg.sender and msg.data, they should not be accessed in such a direct\n * manner, since when dealing with meta-transactions the account sending and\n * paying for execution may not be the actual sender (as far as an application\n * is concerned).\n *\n * This contract is only required for intermediate, library-like contracts.\n */\nabstract contract Context {\n    function _msgSender() internal view virtual returns (address) {\n        return msg.sender;\n    }\n\n    function _msgData() internal view virtual returns (bytes calldata) {\n        return msg.data;\n    }\n}\n",
+                "lib/_openzeppelin/contracts/contracts/utils/Strings.sol": "// SPDX-License-Identifier: MIT\n// OpenZeppelin Contracts (last updated v4.7.0) (utils/Strings.sol)\n\npragma solidity ^0.8.0;\n\n/**\n * @dev String operations.\n */\nlibrary Strings {\n    bytes16 private constant _HEX_SYMBOLS = \"0123456789abcdef\";\n    uint8 private constant _ADDRESS_LENGTH = 20;\n\n    /**\n     * @dev Converts a `uint256` to its ASCII `string` decimal representation.\n     */\n    function toString(uint256 value) internal pure returns (string memory) {\n        // Inspired by OraclizeAPI's implementation - MIT licence\n        // https://github.com/oraclize/ethereum-api/blob/b42146b063c7d6ee1358846c198246239e9360e8/oraclizeAPI_0.4.25.sol\n\n        if (value == 0) {\n            return \"0\";\n        }\n        uint256 temp = value;\n        uint256 digits;\n        while (temp != 0) {\n            digits++;\n            temp /= 10;\n        }\n        bytes memory buffer = new bytes(digits);\n        while (value != 0) {\n            digits -= 1;\n            buffer[digits] = bytes1(uint8(48 + uint256(value % 10)));\n            value /= 10;\n        }\n        return string(buffer);\n    }\n\n    /**\n     * @dev Converts a `uint256` to its ASCII `string` hexadecimal representation.\n     */\n    function toHexString(uint256 value) internal pure returns (string memory) {\n        if (value == 0) {\n            return \"0x00\";\n        }\n        uint256 temp = value;\n        uint256 length = 0;\n        while (temp != 0) {\n            length++;\n            temp >>= 8;\n        }\n        return toHexString(value, length);\n    }\n\n    /**\n     * @dev Converts a `uint256` to its ASCII `string` hexadecimal representation with fixed length.\n     */\n    function toHexString(uint256 value, uint256 length) internal pure returns (string memory) {\n        bytes memory buffer = new bytes(2 * length + 2);\n        buffer[0] = \"0\";\n        buffer[1] = \"x\";\n        for (uint256 i = 2 * length + 1; i > 1; --i) {\n            buffer[i] = _HEX_SYMBOLS[value & 0xf];\n            value >>= 4;\n        }\n        require(value == 0, \"Strings: hex length insufficient\");\n        return string(buffer);\n    }\n\n    /**\n     * @dev Converts an `address` with fixed length of 20 bytes to its not checksummed ASCII `string` hexadecimal representation.\n     */\n    function toHexString(address addr) internal pure returns (string memory) {\n        return toHexString(uint256(uint160(addr)), _ADDRESS_LENGTH);\n    }\n}\n",
+                "lib/_openzeppelin/contracts/contracts/utils/cryptography/ECDSA.sol": "// SPDX-License-Identifier: MIT\n// OpenZeppelin Contracts (last updated v4.7.0) (utils/cryptography/ECDSA.sol)\n\npragma solidity ^0.8.0;\n\nimport \"../Strings.sol\";\n\n/**\n * @dev Elliptic Curve Digital Signature Algorithm (ECDSA) operations.\n *\n * These functions can be used to verify that a message was signed by the holder\n * of the private keys of a given address.\n */\nlibrary ECDSA {\n    enum RecoverError {\n        NoError,\n        InvalidSignature,\n        InvalidSignatureLength,\n        InvalidSignatureS,\n        InvalidSignatureV\n    }\n\n    function _throwError(RecoverError error) private pure {\n        if (error == RecoverError.NoError) {\n            return; // no error: do nothing\n        } else if (error == RecoverError.InvalidSignature) {\n            revert(\"ECDSA: invalid signature\");\n        } else if (error == RecoverError.InvalidSignatureLength) {\n            revert(\"ECDSA: invalid signature length\");\n        } else if (error == RecoverError.InvalidSignatureS) {\n            revert(\"ECDSA: invalid signature 's' value\");\n        } else if (error == RecoverError.InvalidSignatureV) {\n            revert(\"ECDSA: invalid signature 'v' value\");\n        }\n    }\n\n    /**\n     * @dev Returns the address that signed a hashed message (`hash`) with\n     * `signature` or error string. This address can then be used for verification purposes.\n     *\n     * The `ecrecover` EVM opcode allows for malleable (non-unique) signatures:\n     * this function rejects them by requiring the `s` value to be in the lower\n     * half order, and the `v` value to be either 27 or 28.\n     *\n     * IMPORTANT: `hash` _must_ be the result of a hash operation for the\n     * verification to be secure: it is possible to craft signatures that\n     * recover to arbitrary addresses for non-hashed data. A safe way to ensure\n     * this is by receiving a hash of the original message (which may otherwise\n     * be too long), and then calling {toEthSignedMessageHash} on it.\n     *\n     * Documentation for signature generation:\n     * - with https://web3js.readthedocs.io/en/v1.3.4/web3-eth-accounts.html#sign[Web3.js]\n     * - with https://docs.ethers.io/v5/api/signer/#Signer-signMessage[ethers]\n     *\n     * _Available since v4.3._\n     */\n    function tryRecover(bytes32 hash, bytes memory signature) internal pure returns (address, RecoverError) {\n        // Check the signature length\n        // - case 65: r,s,v signature (standard)\n        // - case 64: r,vs signature (cf https://eips.ethereum.org/EIPS/eip-2098) _Available since v4.1._\n        if (signature.length == 65) {\n            bytes32 r;\n            bytes32 s;\n            uint8 v;\n            // ecrecover takes the signature parameters, and the only way to get them\n            // currently is to use assembly.\n            /// @solidity memory-safe-assembly\n            assembly {\n                r := mload(add(signature, 0x20))\n                s := mload(add(signature, 0x40))\n                v := byte(0, mload(add(signature, 0x60)))\n            }\n            return tryRecover(hash, v, r, s);\n        } else if (signature.length == 64) {\n            bytes32 r;\n            bytes32 vs;\n            // ecrecover takes the signature parameters, and the only way to get them\n            // currently is to use assembly.\n            /// @solidity memory-safe-assembly\n            assembly {\n                r := mload(add(signature, 0x20))\n                vs := mload(add(signature, 0x40))\n            }\n            return tryRecover(hash, r, vs);\n        } else {\n            return (address(0), RecoverError.InvalidSignatureLength);\n        }\n    }\n\n    /**\n     * @dev Returns the address that signed a hashed message (`hash`) with\n     * `signature`. This address can then be used for verification purposes.\n     *\n     * The `ecrecover` EVM opcode allows for malleable (non-unique) signatures:\n     * this function rejects them by requiring the `s` value to be in the lower\n     * half order, and the `v` value to be either 27 or 28.\n     *\n     * IMPORTANT: `hash` _must_ be the result of a hash operation for the\n     * verification to be secure: it is possible to craft signatures that\n     * recover to arbitrary addresses for non-hashed data. A safe way to ensure\n     * this is by receiving a hash of the original message (which may otherwise\n     * be too long), and then calling {toEthSignedMessageHash} on it.\n     */\n    function recover(bytes32 hash, bytes memory signature) internal pure returns (address) {\n        (address recovered, RecoverError error) = tryRecover(hash, signature);\n        _throwError(error);\n        return recovered;\n    }\n\n    /**\n     * @dev Overload of {ECDSA-tryRecover} that receives the `r` and `vs` short-signature fields separately.\n     *\n     * See https://eips.ethereum.org/EIPS/eip-2098[EIP-2098 short signatures]\n     *\n     * _Available since v4.3._\n     */\n    function tryRecover(\n        bytes32 hash,\n        bytes32 r,\n        bytes32 vs\n    ) internal pure returns (address, RecoverError) {\n        bytes32 s = vs & bytes32(0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff);\n        uint8 v = uint8((uint256(vs) >> 255) + 27);\n        return tryRecover(hash, v, r, s);\n    }\n\n    /**\n     * @dev Overload of {ECDSA-recover} that receives the `r and `vs` short-signature fields separately.\n     *\n     * _Available since v4.2._\n     */\n    function recover(\n        bytes32 hash,\n        bytes32 r,\n        bytes32 vs\n    ) internal pure returns (address) {\n        (address recovered, RecoverError error) = tryRecover(hash, r, vs);\n        _throwError(error);\n        return recovered;\n    }\n\n    /**\n     * @dev Overload of {ECDSA-tryRecover} that receives the `v`,\n     * `r` and `s` signature fields separately.\n     *\n     * _Available since v4.3._\n     */\n    function tryRecover(\n        bytes32 hash,\n        uint8 v,\n        bytes32 r,\n        bytes32 s\n    ) internal pure returns (address, RecoverError) {\n        // EIP-2 still allows signature malleability for ecrecover(). Remove this possibility and make the signature\n        // unique. Appendix F in the Ethereum Yellow paper (https://ethereum.github.io/yellowpaper/paper.pdf), defines\n        // the valid range for s in (301): 0 < s < secp256k1n ÷ 2 + 1, and for v in (302): v ∈ {27, 28}. Most\n        // signatures from current libraries generate a unique signature with an s-value in the lower half order.\n        //\n        // If your library generates malleable signatures, such as s-values in the upper range, calculate a new s-value\n        // with 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEBAAEDCE6AF48A03BBFD25E8CD0364141 - s1 and flip v from 27 to 28 or\n        // vice versa. If your library also generates signatures with 0/1 for v instead 27/28, add 27 to v to accept\n        // these malleable signatures as well.\n        if (uint256(s) > 0x7FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF5D576E7357A4501DDFE92F46681B20A0) {\n            return (address(0), RecoverError.InvalidSignatureS);\n        }\n        if (v != 27 && v != 28) {\n            return (address(0), RecoverError.InvalidSignatureV);\n        }\n\n        // If the signature is valid (and not malleable), return the signer address\n        address signer = ecrecover(hash, v, r, s);\n        if (signer == address(0)) {\n            return (address(0), RecoverError.InvalidSignature);\n        }\n\n        return (signer, RecoverError.NoError);\n    }\n\n    /**\n     * @dev Overload of {ECDSA-recover} that receives the `v`,\n     * `r` and `s` signature fields separately.\n     */\n    function recover(\n        bytes32 hash,\n        uint8 v,\n        bytes32 r,\n        bytes32 s\n    ) internal pure returns (address) {\n        (address recovered, RecoverError error) = tryRecover(hash, v, r, s);\n        _throwError(error);\n        return recovered;\n    }\n\n    /**\n     * @dev Returns an Ethereum Signed Message, created from a `hash`. This\n     * produces hash corresponding to the one signed with the\n     * https://eth.wiki/json-rpc/API#eth_sign[`eth_sign`]\n     * JSON-RPC method as part of EIP-191.\n     *\n     * See {recover}.\n     */\n    function toEthSignedMessageHash(bytes32 hash) internal pure returns (bytes32) {\n        // 32 is the length in bytes of hash,\n        // enforced by the type signature above\n        return keccak256(abi.encodePacked(\"\\x19Ethereum Signed Message:\\n32\", hash));\n    }\n\n    /**\n     * @dev Returns an Ethereum Signed Message, created from `s`. This\n     * produces hash corresponding to the one signed with the\n     * https://eth.wiki/json-rpc/API#eth_sign[`eth_sign`]\n     * JSON-RPC method as part of EIP-191.\n     *\n     * See {recover}.\n     */\n    function toEthSignedMessageHash(bytes memory s) internal pure returns (bytes32) {\n        return keccak256(abi.encodePacked(\"\\x19Ethereum Signed Message:\\n\", Strings.toString(s.length), s));\n    }\n\n    /**\n     * @dev Returns an Ethereum Signed Typed Data, created from a\n     * `domainSeparator` and a `structHash`. This produces hash corresponding\n     * to the one signed with the\n     * https://eips.ethereum.org/EIPS/eip-712[`eth_signTypedData`]\n     * JSON-RPC method as part of EIP-712.\n     *\n     * See {recover}.\n     */\n    function toTypedDataHash(bytes32 domainSeparator, bytes32 structHash) internal pure returns (bytes32) {\n        return keccak256(abi.encodePacked(\"\\x19\\x01\", domainSeparator, structHash));\n    }\n}\n",
+                "lib/_uniswap/v3-core/contracts/interfaces/callback/IUniswapV3SwapCallback.sol": "// SPDX-License-Identifier: GPL-2.0-or-later\npragma solidity >=0.5.0;\n\n/// @title Callback for IUniswapV3PoolActions#swap\n/// @notice Any contract that calls IUniswapV3PoolActions#swap must implement this interface\ninterface IUniswapV3SwapCallback {\n    /// @notice Called to `msg.sender` after executing a swap via IUniswapV3Pool#swap.\n    /// @dev In the implementation you must pay the pool tokens owed for the swap.\n    /// The caller of this method must be checked to be a UniswapV3Pool deployed by the canonical UniswapV3Factory.\n    /// amount0Delta and amount1Delta can both be 0 if no tokens were swapped.\n    /// @param amount0Delta The amount of token0 that was sent (negative) or must be received (positive) by the pool by\n    /// the end of the swap. If positive, the callback must send that amount of token0 to the pool.\n    /// @param amount1Delta The amount of token1 that was sent (negative) or must be received (positive) by the pool by\n    /// the end of the swap. If positive, the callback must send that amount of token1 to the pool.\n    /// @param data Any data passed through by the caller via the IUniswapV3PoolActions#swap call\n    function uniswapV3SwapCallback(\n        int256 amount0Delta,\n        int256 amount1Delta,\n        bytes calldata data\n    ) external;\n}\n",
+                "lib/_uniswap/v3-periphery/contracts/interfaces/IPeripheryImmutableState.sol": "// SPDX-License-Identifier: GPL-2.0-or-later\npragma solidity >=0.5.0;\n\n/// @title Immutable state\n/// @notice Functions that return immutable state of the router\ninterface IPeripheryImmutableState {\n    /// @return Returns the address of the Uniswap V3 factory\n    function factory() external view returns (address);\n\n    /// @return Returns the address of WETH9\n    function WETH9() external view returns (address);\n}\n",
+                "lib/_uniswap/v3-periphery/contracts/interfaces/ISwapRouter.sol": "// SPDX-License-Identifier: GPL-2.0-or-later\npragma solidity >=0.7.5;\npragma abicoder v2;\n\nimport '@uniswap/v3-core/contracts/interfaces/callback/IUniswapV3SwapCallback.sol';\n\n/// @title Router token swapping functionality\n/// @notice Functions for swapping tokens via Uniswap V3\ninterface ISwapRouter is IUniswapV3SwapCallback {\n    struct ExactInputSingleParams {\n        address tokenIn;\n        address tokenOut;\n        uint24 fee;\n        address recipient;\n        uint256 deadline;\n        uint256 amountIn;\n        uint256 amountOutMinimum;\n        uint160 sqrtPriceLimitX96;\n    }\n\n    /// @notice Swaps `amountIn` of one token for as much as possible of another token\n    /// @param params The parameters necessary for the swap, encoded as `ExactInputSingleParams` in calldata\n    /// @return amountOut The amount of the received token\n    function exactInputSingle(ExactInputSingleParams calldata params) external payable returns (uint256 amountOut);\n\n    struct ExactInputParams {\n        bytes path;\n        address recipient;\n        uint256 deadline;\n        uint256 amountIn;\n        uint256 amountOutMinimum;\n    }\n\n    /// @notice Swaps `amountIn` of one token for as much as possible of another along the specified path\n    /// @param params The parameters necessary for the multi-hop swap, encoded as `ExactInputParams` in calldata\n    /// @return amountOut The amount of the received token\n    function exactInput(ExactInputParams calldata params) external payable returns (uint256 amountOut);\n\n    struct ExactOutputSingleParams {\n        address tokenIn;\n        address tokenOut;\n        uint24 fee;\n        address recipient;\n        uint256 deadline;\n        uint256 amountOut;\n        uint256 amountInMaximum;\n        uint160 sqrtPriceLimitX96;\n    }\n\n    /// @notice Swaps as little as possible of one token for `amountOut` of another token\n    /// @param params The parameters necessary for the swap, encoded as `ExactOutputSingleParams` in calldata\n    /// @return amountIn The amount of the input token\n    function exactOutputSingle(ExactOutputSingleParams calldata params) external payable returns (uint256 amountIn);\n\n    struct ExactOutputParams {\n        bytes path;\n        address recipient;\n        uint256 deadline;\n        uint256 amountOut;\n        uint256 amountInMaximum;\n    }\n\n    /// @notice Swaps as little as possible of one token for `amountOut` of another along the specified path (reversed)\n    /// @param params The parameters necessary for the multi-hop swap, encoded as `ExactOutputParams` in calldata\n    /// @return amountIn The amount of the input token\n    function exactOutput(ExactOutputParams calldata params) external payable returns (uint256 amountIn);\n}\n",
+                "lib/_uniswap/v3-periphery/contracts/interfaces/external/IWETH9.sol": "// SPDX-License-Identifier: GPL-2.0-or-later\npragma solidity =0.8.15;\n\nimport '@openzeppelin/contracts/token/ERC20/IERC20.sol';\n\n/// @title Interface for WETH9\ninterface IWETH9 is IERC20 {\n    /// @notice Deposit ether to get wrapped ether\n    function deposit() external payable;\n\n    /// @notice Withdraw wrapped ether to get ether\n    function withdraw(uint256) external;\n}\n",
+                "src/interfaces/IBatchDepositVerifier.sol": "// SPDX-License-Identifier: MIT\n\npragma solidity 0.8.15;\n\ninterface IBatchDepositVerifier {\n    function verifyProof(uint256[1] memory input, uint256[8] memory p) external view returns (bool);\n}\n",
+                "src/interfaces/IERC20Permit.sol": "// SPDX-License-Identifier: CC0-1.0\n\npragma solidity 0.8.15;\n\ninterface IERC20Permit {\n    function permit(\n        address owner,\n        address spender,\n        uint256 value,\n        uint256 deadline,\n        uint8 v,\n        bytes32 r,\n        bytes32 s\n    )\n        external;\n\n    function nonces(address owner) external view returns (uint256);\n\n    function DOMAIN_SEPARATOR() external view returns (bytes32);\n\n    function PERMIT_TYPEHASH() external view returns (bytes32);\n\n    function SALTED_PERMIT_TYPEHASH() external view returns (bytes32);\n\n    function receiveWithPermit(\n        address _holder,\n        uint256 _value,\n        uint256 _deadline,\n        uint8 _v,\n        bytes32 _r,\n        bytes32 _s\n    )\n        external;\n\n    function receiveWithSaltedPermit(\n        address _holder,\n        uint256 _value,\n        uint256 _deadline,\n        bytes32 _salt,\n        uint8 _v,\n        bytes32 _r,\n        bytes32 _s\n    )\n        external;\n}\n",
+                "src/interfaces/IMintableERC20.sol": "// SPDX-License-Identifier: CC0-1.0\n\npragma solidity 0.8.15;\n\ninterface IMintableERC20 {\n    function mint(address to, uint256 amount) external;\n}\n",
+                "src/interfaces/IOperatorManager.sol": "// SPDX-License-Identifier: MIT\n\npragma solidity 0.8.15;\n\ninterface IOperatorManager {\n    function isOperator(address _addr) external view returns (bool);\n\n    function isOperatorFeeReceiver(address _operator, address _addr) external view returns (bool);\n\n    function operatorURI() external view returns (string memory);\n}\n",
+                "src/interfaces/ITokenSeller.sol": "// SPDX-License-Identifier: CC0-1.0\n\npragma solidity 0.8.15;\n\ninterface ITokenSeller {\n    /**\n     * @dev Sells tokens for ETH.\n     * Prior to calling this function, contract balance of token0 should be greater than or equal to the sold amount.\n     * @param _receiver native ETH receiver.\n     * @param _amount amount of tokens to sell.\n     * @return (received eth amount, refunded token amount).\n     */\n    function sellForETH(address _receiver, uint256 _amount) external returns (uint256, uint256);\n\n    /**\n     * @dev Estimates amount of received ETH, when selling given amount of tokens via sellForETH function.\n     * @param _amount amount of tokens to sell.\n     * @return received eth amount.\n     */\n    function quoteSellForETH(uint256 _amount) external returns (uint256);\n}\n",
+                "src/interfaces/ITransferVerifier.sol": "// SPDX-License-Identifier: MIT\n\npragma solidity 0.8.15;\n\ninterface ITransferVerifier {\n    function verifyProof(uint256[5] memory input, uint256[8] memory p) external view returns (bool);\n}\n",
+                "src/interfaces/ITreeVerifier.sol": "// SPDX-License-Identifier: MIT\n\npragma solidity 0.8.15;\n\ninterface ITreeVerifier {\n    function verifyProof(uint256[3] memory input, uint256[8] memory p) external view returns (bool);\n}\n",
+                "src/interfaces/IZkBobDirectDepositQueue.sol": "// SPDX-License-Identifier: CC0-1.0\n\npragma solidity ^0.8.0;\n\ninterface IZkBobDirectDepositQueue {\n    function collect(\n        uint256[] calldata _indices,\n        uint256 _out_commit\n    )\n        external\n        returns (uint256 total, uint256 totalFee, uint256 hashsum, bytes memory message);\n}\n",
+                "src/interfaces/IZkBobPool.sol": "// SPDX-License-Identifier: CC0-1.0\n\npragma solidity ^0.8.0;\n\ninterface IZkBobPool {\n    function pool_id() external view returns (uint256);\n\n    function recordDirectDeposit(address _sender, uint256 _amount) external;\n}\n",
+                "src/proxy/EIP1967Admin.sol": "// SPDX-License-Identifier: CC0-1.0\n\npragma solidity 0.8.15;\n\n/**\n * @title EIP1967Admin\n * @dev Upgradeable proxy pattern implementation according to minimalistic EIP1967.\n */\ncontract EIP1967Admin {\n    // EIP 1967\n    // bytes32(uint256(keccak256('eip1967.proxy.admin')) - 1)\n    uint256 internal constant EIP1967_ADMIN_STORAGE = 0xb53127684a568b3173ae13b9f8a6016e243e63b6e8ee1178d6a717850b5d6103;\n\n    modifier onlyAdmin() {\n        require(msg.sender == _admin(), \"EIP1967Admin: not an admin\");\n        _;\n    }\n\n    function _admin() internal view returns (address res) {\n        assembly {\n            res := sload(EIP1967_ADMIN_STORAGE)\n        }\n    }\n}\n",
+                "src/utils/Ownable.sol": "// SPDX-License-Identifier: CC0-1.0\n\npragma solidity 0.8.15;\n\nimport \"@openzeppelin/contracts/access/Ownable.sol\" as OZOwnable;\n\n/**\n * @title Ownable\n */\ncontract Ownable is OZOwnable.Ownable {\n    /**\n     * @dev Throws if the sender is not the owner.\n     */\n    function _checkOwner() internal view override {\n        require(_isOwner(), \"Ownable: caller is not the owner\");\n    }\n\n    /**\n     * @dev Tells if caller is the contract owner.\n     * @return true, if caller is the contract owner.\n     */\n    function _isOwner() internal view virtual returns (bool) {\n        return owner() == _msgSender();\n    }\n}\n",
+                "src/zkbob/ZkBobPool.sol": "// SPDX-License-Identifier: MIT\n\npragma solidity 0.8.15;\n\nimport \"@openzeppelin/contracts/utils/Address.sol\";\nimport \"@openzeppelin/contracts/token/ERC20/IERC20.sol\";\nimport {SafeERC20} from \"@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol\";\nimport \"@uniswap/v3-periphery/contracts/interfaces/ISwapRouter.sol\";\nimport \"@uniswap/v3-periphery/contracts/interfaces/IPeripheryImmutableState.sol\";\nimport \"@uniswap/v3-periphery/contracts/interfaces/external/IWETH9.sol\";\nimport \"../interfaces/ITransferVerifier.sol\";\nimport \"../interfaces/ITreeVerifier.sol\";\nimport \"../interfaces/IBatchDepositVerifier.sol\";\nimport \"../interfaces/IMintableERC20.sol\";\nimport \"../interfaces/IOperatorManager.sol\";\nimport \"../interfaces/IERC20Permit.sol\";\nimport \"../interfaces/ITokenSeller.sol\";\nimport \"../interfaces/IZkBobDirectDepositQueue.sol\";\nimport \"../interfaces/IZkBobPool.sol\";\nimport \"./utils/Parameters.sol\";\nimport \"./utils/ZkBobAccounting.sol\";\nimport \"../utils/Ownable.sol\";\nimport \"../proxy/EIP1967Admin.sol\";\n\n/**\n * @title ZkBobPool\n * Shielded transactions pool for BOB tokens.\n */\ncontract ZkBobPool is IZkBobPool, EIP1967Admin, Ownable, Parameters, ZkBobAccounting {\n    using SafeERC20 for IERC20;\n\n    uint256 internal constant MAX_POOL_ID = 0xffffff;\n    uint256 internal constant TOKEN_DENOMINATOR = 1_000_000_000;\n    bytes4 internal constant MESSAGE_PREFIX_COMMON_V1 = 0x00000000;\n//    bytes4 internal constant MESSAGE_PREFIX_DIRECT_DEPOSIT_V1 = 0x00000001;\n//    uint256 internal constant MAX_NUMBER_OF_DIRECT_DEPOSITS = 16;\n\n    uint256 public immutable pool_id;\n    ITransferVerifier public immutable transfer_verifier;\n    ITreeVerifier public immutable tree_verifier;\n    IBatchDepositVerifier public immutable batch_deposit_verifier;\n    address public immutable token;\n    IZkBobDirectDepositQueue public immutable direct_deposit_queue;\n\n    IOperatorManager public operatorManager;\n\n    mapping(uint256 => uint256) public nullifiers;\n    mapping(uint256 => uint256) public roots;\n    bytes32 public all_messages_hash;\n\n    mapping(address => uint256) public accumulatedFee;\n\n    ITokenSeller public tokenSeller;\n\n    event UpdateTokenSeller(address seller);\n    event UpdateOperatorManager(address manager);\n    event WithdrawFee(address indexed operator, uint256 fee);\n\n    event Message(uint256 indexed index, bytes32 indexed hash, bytes message);\n\n    constructor(\n        uint256 __pool_id,\n        address _token,\n        ITransferVerifier _transfer_verifier,\n        ITreeVerifier _tree_verifier,\n        IBatchDepositVerifier _batch_deposit_verifier,\n        address _direct_deposit_queue\n    ) {\n        require(__pool_id <= MAX_POOL_ID, \"ZkBobPool: exceeds max pool id\");\n        require(Address.isContract(_token), \"ZkBobPool: not a contract\");\n        require(Address.isContract(address(_transfer_verifier)), \"ZkBobPool: not a contract\");\n        require(Address.isContract(address(_tree_verifier)), \"ZkBobPool: not a contract\");\n        require(Address.isContract(_direct_deposit_queue), \"ZkBobPool: not a contract\");\n        pool_id = __pool_id;\n        token = _token;\n        transfer_verifier = _transfer_verifier;\n        tree_verifier = _tree_verifier;\n        batch_deposit_verifier = _batch_deposit_verifier;\n        direct_deposit_queue = IZkBobDirectDepositQueue(_direct_deposit_queue);\n    }\n\n    /**\n     * @dev Throws if called by any account other than the current relayer operator.\n     */\n    modifier onlyOperator() {\n        require(operatorManager.isOperator(_msgSender()), \"ZkBobPool: not an operator\");\n        _;\n    }\n\n    /**\n     * @dev Initializes pool proxy storage.\n     * Callable only once and only through EIP1967Proxy constructor / upgradeToAndCall.\n     * @param _root initial empty merkle tree root.\n     * @param _tvlCap initial upper cap on the entire pool tvl, 18 decimals.\n     * @param _dailyDepositCap initial daily limit on the sum of all deposits, 18 decimals.\n     * @param _dailyWithdrawalCap initial daily limit on the sum of all withdrawals, 18 decimals.\n     * @param _dailyUserDepositCap initial daily limit on the sum of all per-address deposits, 18 decimals.\n     * @param _depositCap initial limit on the amount of a single deposit, 18 decimals.\n     * @param _dailyUserDirectDepositCap initial daily limit on the sum of all per-address direct deposits, 18 decimals.\n     * @param _directDepositCap initial limit on the amount of a single direct deposit, 18 decimals.\n     */\n    function initialize(\n        uint256 _root,\n        uint256 _tvlCap,\n        uint256 _dailyDepositCap,\n        uint256 _dailyWithdrawalCap,\n        uint256 _dailyUserDepositCap,\n        uint256 _depositCap,\n        uint256 _dailyUserDirectDepositCap,\n        uint256 _directDepositCap\n    )\n        external\n    {\n        require(msg.sender == address(this), \"ZkBobPool: not initializer\");\n        require(roots[0] == 0, \"ZkBobPool: already initialized\");\n        require(_root != 0, \"ZkBobPool: zero root\");\n        roots[0] = _root;\n        _setLimits(\n            0,\n            _tvlCap / TOKEN_DENOMINATOR,\n            _dailyDepositCap / TOKEN_DENOMINATOR,\n            _dailyWithdrawalCap / TOKEN_DENOMINATOR,\n            _dailyUserDepositCap / TOKEN_DENOMINATOR,\n            _depositCap / TOKEN_DENOMINATOR,\n            _dailyUserDirectDepositCap / TOKEN_DENOMINATOR,\n            _directDepositCap / TOKEN_DENOMINATOR\n        );\n    }\n\n    /**\n     * @dev Updates token seller contract used for native coin withdrawals.\n     * Callable only by the contract owner / proxy admin.\n     * @param _seller new token seller contract implementation. address(0) will deactivate native withdrawals.\n     */\n    function setTokenSeller(address _seller) external onlyOwner {\n        tokenSeller = ITokenSeller(_seller);\n        emit UpdateTokenSeller(_seller);\n    }\n\n    /**\n     * @dev Updates used operator manager contract.\n     * Callable only by the contract owner / proxy admin.\n     * @param _operatorManager new operator manager implementation.\n     */\n    function setOperatorManager(IOperatorManager _operatorManager) external onlyOwner {\n        require(address(_operatorManager) != address(0), \"ZkBobPool: manager is zero address\");\n        operatorManager = _operatorManager;\n        emit UpdateOperatorManager(address(_operatorManager));\n    }\n\n    /**\n     * @dev Tells the denominator for converting BOB into zkBOB units.\n     * 1e18 BOB units = 1e9 zkBOB units.\n     */\n    function denominator() external pure returns (uint256) {\n        return TOKEN_DENOMINATOR;\n    }\n\n    /**\n     * @dev Tells the current merkle tree index, which will be used for the next operation.\n     * Each operation increases merkle tree size by 128, so index is equal to the total number of seen operations, multiplied by 128.\n     * @return next operator merkle index.\n     */\n    function pool_index() external view returns (uint256) {\n        return _txCount() << 7;\n    }\n\n    function _root() internal view override returns (uint256) {\n        return roots[_transfer_index()];\n    }\n\n    function _pool_id() internal view override returns (uint256) {\n        return pool_id;\n    }\n\n    /**\n     * @dev Perform a zkBob pool transaction.\n     * Callable only by the current operator.\n     * Method uses a custom ABI encoding scheme described in CustomABIDecoder.\n     * Single transact() call performs either deposit, withdrawal or shielded transfer operation.\n     */\n    function transact() external onlyOperator {\n        address user;\n        uint256 txType = _tx_type();\n        if (txType == 0) {\n            user = _deposit_spender();\n        } else if (txType == 2) {\n            user = _memo_receiver();\n        } else if (txType == 3) {\n            user = _memo_permit_holder();\n        }\n        int256 transfer_token_delta = _transfer_token_amount();\n        (,, uint256 txCount) = _recordOperation(user, transfer_token_delta);\n\n        uint256 nullifier = _transfer_nullifier();\n        {\n            uint256 _pool_index = txCount << 7;\n\n            require(nullifiers[nullifier] == 0, \"ZkBobPool: doublespend detected\");\n            require(_transfer_index() <= _pool_index, \"ZkBobPool: transfer index out of bounds\");\n            require(transfer_verifier.verifyProof(_transfer_pub(), _transfer_proof()), \"ZkBobPool: bad transfer proof\");\n            require(\n                tree_verifier.verifyProof(_tree_pub(roots[_pool_index]), _tree_proof()), \"ZkBobPool: bad tree proof\"\n            );\n\n            nullifiers[nullifier] = uint256(keccak256(abi.encodePacked(_transfer_out_commit(), _transfer_delta())));\n            _pool_index += 128;\n            roots[_pool_index] = _tree_root_after();\n            bytes memory message = _memo_message();\n            // restrict memo message prefix (items count in little endian) to be < 2**16\n            require(bytes4(message) & 0x0000ffff == MESSAGE_PREFIX_COMMON_V1, \"ZkBobPool: bad message prefix\");\n            bytes32 message_hash = keccak256(message);\n            bytes32 _all_messages_hash = keccak256(abi.encodePacked(all_messages_hash, message_hash));\n            all_messages_hash = _all_messages_hash;\n            emit Message(_pool_index, _all_messages_hash, message);\n        }\n\n        uint256 fee = _memo_fee();\n        int256 token_amount = transfer_token_delta + int256(fee);\n        int256 energy_amount = _transfer_energy_amount();\n\n        if (txType == 0) {\n            // Deposit\n            require(transfer_token_delta > 0 && energy_amount == 0, \"ZkBobPool: incorrect deposit amounts\");\n            IERC20(token).safeTransferFrom(user, address(this), uint256(token_amount) * TOKEN_DENOMINATOR);\n        } else if (txType == 1) {\n            // Transfer\n            require(token_amount == 0 && energy_amount == 0, \"ZkBobPool: incorrect transfer amounts\");\n        } else if (txType == 2) {\n            // Withdraw\n            require(token_amount <= 0 && energy_amount <= 0, \"ZkBobPool: incorrect withdraw amounts\");\n\n            uint256 native_amount = _memo_native_amount() * TOKEN_DENOMINATOR;\n            uint256 withdraw_amount = uint256(-token_amount) * TOKEN_DENOMINATOR;\n\n            if (native_amount > 0) {\n                ITokenSeller seller = tokenSeller;\n                if (address(seller) != address(0)) {\n                    IERC20(token).safeTransfer(address(seller), native_amount);\n                    (, uint256 refunded) = seller.sellForETH(user, native_amount);\n                    withdraw_amount = withdraw_amount - native_amount + refunded;\n                }\n            }\n\n            if (withdraw_amount > 0) {\n                IERC20(token).safeTransfer(user, withdraw_amount);\n            }\n\n            // energy withdrawals are not yet implemented, any transaction with non-zero energy_amount will revert\n            // future version of the protocol will support energy withdrawals through negative energy_amount\n            if (energy_amount < 0) {\n                revert(\"ZkBobPool: XP claiming is not yet enabled\");\n            }\n        } else if (txType == 3) {\n            // Permittable token deposit\n            require(transfer_token_delta > 0 && energy_amount == 0, \"ZkBobPool: incorrect deposit amounts\");\n            (uint8 v, bytes32 r, bytes32 s) = _permittable_deposit_signature();\n            IERC20Permit(token).receiveWithSaltedPermit(\n                user, uint256(token_amount) * TOKEN_DENOMINATOR, _memo_permit_deadline(), bytes32(nullifier), v, r, s\n            );\n        } else {\n            revert(\"ZkBobPool: Incorrect transaction type\");\n        }\n\n        if (fee > 0) {\n            accumulatedFee[msg.sender] += fee;\n        }\n    }\n\n    function appendDirectDeposits(\n        uint256 _root_after,\n        uint256[] calldata _indices,\n        uint256 _out_commit,\n        uint256[8] memory _batch_deposit_proof,\n        uint256[8] memory _tree_proof\n    )\n        external\n        onlyOperator\n    {\n        (uint256 total, uint256 totalFee, uint256 hashsum, bytes memory message) =\n            direct_deposit_queue.collect(_indices, _out_commit);\n\n        uint256 txCount = _processDirectDepositBatch(total);\n        uint256 _pool_index = txCount << 7;\n\n        // verify that _out_commit corresponds to zero output account + 16 chosen notes + 111 empty notes\n        require(\n            batch_deposit_verifier.verifyProof([hashsum], _batch_deposit_proof), \"ZkBobPool: bad batch deposit proof\"\n        );\n\n        uint256[3] memory tree_pub = [roots[_pool_index], _root_after, _out_commit];\n        require(tree_verifier.verifyProof(tree_pub, _tree_proof), \"ZkBobPool: bad tree proof\");\n\n        _pool_index += 128;\n        roots[_pool_index] = _root_after;\n        bytes32 message_hash = keccak256(message);\n        bytes32 _all_messages_hash = keccak256(abi.encodePacked(all_messages_hash, message_hash));\n        all_messages_hash = _all_messages_hash;\n\n        if (totalFee > 0) {\n            accumulatedFee[msg.sender] += totalFee;\n        }\n\n        emit Message(_pool_index, _all_messages_hash, message);\n    }\n\n    function recordDirectDeposit(address _sender, uint256 _amount) external {\n        require(msg.sender == address(direct_deposit_queue),\"ZkBobPool: not authorized\");\n        _checkDirectDepositLimits(_sender, _amount);\n    }\n\n    /**\n     * @dev Withdraws accumulated fee on behalf of an operator.\n     * Callable only by the operator itself, or by a pre-configured operator fee receiver address.\n     * @param _operator address of an operator account to withdraw fee from.\n     * @param _to address of the accumulated fee tokens receiver.\n     */\n    function withdrawFee(address _operator, address _to) external {\n        require(\n            _operator == msg.sender || operatorManager.isOperatorFeeReceiver(_operator, msg.sender),\n            \"ZkBobPool: not authorized\"\n        );\n        uint256 fee = accumulatedFee[_operator] * TOKEN_DENOMINATOR;\n        require(fee > 0, \"ZkBobPool: no fee to withdraw\");\n        IERC20(token).safeTransfer(_to, fee);\n        accumulatedFee[_operator] = 0;\n        emit WithdrawFee(_operator, fee);\n    }\n\n    /**\n     * @dev Updates pool usage limits.\n     * Callable only by the contract owner / proxy admin.\n     * @param _tier pool limits tier (0-254).\n     * @param _tvlCap new upper cap on the entire pool tvl, 18 decimals.\n     * @param _dailyDepositCap new daily limit on the sum of all deposits, 18 decimals.\n     * @param _dailyWithdrawalCap new daily limit on the sum of all withdrawals, 18 decimals.\n     * @param _dailyUserDepositCap new daily limit on the sum of all per-address deposits, 18 decimals.\n     * @param _depositCap new limit on the amount of a single deposit, 18 decimals.\n     * @param _dailyUserDirectDepositCap new daily limit on the sum of all per-address direct deposits, 18 decimals.\n     * @param _directDepositCap new limit on the amount of a single direct deposit, 18 decimals.\n     */\n    function setLimits(\n        uint8 _tier,\n        uint256 _tvlCap,\n        uint256 _dailyDepositCap,\n        uint256 _dailyWithdrawalCap,\n        uint256 _dailyUserDepositCap,\n        uint256 _depositCap,\n        uint256 _dailyUserDirectDepositCap,\n        uint256 _directDepositCap\n    )\n        external\n        onlyOwner\n    {\n        _setLimits(\n            _tier,\n            _tvlCap / TOKEN_DENOMINATOR,\n            _dailyDepositCap / TOKEN_DENOMINATOR,\n            _dailyWithdrawalCap / TOKEN_DENOMINATOR,\n            _dailyUserDepositCap / TOKEN_DENOMINATOR,\n            _depositCap / TOKEN_DENOMINATOR,\n            _dailyUserDirectDepositCap / TOKEN_DENOMINATOR,\n            _directDepositCap / TOKEN_DENOMINATOR\n        );\n    }\n\n    /**\n     * @dev Resets daily limit usage for the current day.\n     * Callable only by the contract owner / proxy admin.\n     * @param _tier tier id to reset daily limits for.\n     */\n    function resetDailyLimits(uint8 _tier) external onlyOwner {\n        _resetDailyLimits(_tier);\n    }\n\n    /**\n     * @dev Updates users limit tiers.\n     * Callable only by the contract owner / proxy admin.\n     * @param _tier pool limits tier (0-255).\n     * 0 is the default tier.\n     * 1-254 are custom pool limit tiers, configured at runtime.\n     * 255 is the special tier with zero limits, used to effectively prevent some address from accessing the pool.\n     * @param _users list of user account addresses to assign a tier for.\n     */\n    function setUsersTier(uint8 _tier, address[] memory _users) external onlyOwner {\n        _setUsersTier(_tier, _users);\n    }\n\n    /**\n     * @dev Tells if caller is the contract owner.\n     * Gives ownership rights to the proxy admin as well.\n     * @return true, if caller is the contract owner or proxy admin.\n     */\n    function _isOwner() internal view override returns (bool) {\n        return super._isOwner() || _admin() == _msgSender();\n    }\n}\n",
+                "src/zkbob/utils/CustomABIDecoder.sol": "// SPDX-License-Identifier: MIT\n\npragma solidity 0.8.15;\n\ncontract CustomABIDecoder {\n    uint256 constant transfer_nullifier_pos = 4;\n    uint256 constant transfer_nullifier_size = 32;\n    uint256 constant uint256_size = 32;\n\n    function _loaduint256(uint256 pos) internal pure returns (uint256 r) {\n        assembly {\n            r := calldataload(pos)\n        }\n    }\n\n    function _transfer_nullifier() internal pure returns (uint256 r) {\n        r = _loaduint256(transfer_nullifier_pos);\n    }\n\n    uint256 constant transfer_out_commit_pos = transfer_nullifier_pos + transfer_nullifier_size;\n    uint256 constant transfer_out_commit_size = 32;\n\n    function _transfer_out_commit() internal pure returns (uint256 r) {\n        r = _loaduint256(transfer_out_commit_pos);\n    }\n\n    uint256 constant transfer_index_pos = transfer_out_commit_pos + transfer_out_commit_size;\n    uint256 constant transfer_index_size = 6;\n\n    function _transfer_index() internal pure returns (uint48 r) {\n        r = uint48(_loaduint256(transfer_index_pos + transfer_index_size - uint256_size));\n    }\n\n    uint256 constant transfer_energy_amount_pos = transfer_index_pos + transfer_index_size;\n    uint256 constant transfer_energy_amount_size = 14;\n\n    function _transfer_energy_amount() internal pure returns (int112 r) {\n        r = int112(uint112(_loaduint256(transfer_energy_amount_pos + transfer_energy_amount_size - uint256_size)));\n    }\n\n    uint256 constant transfer_token_amount_pos = transfer_energy_amount_pos + transfer_energy_amount_size;\n    uint256 constant transfer_token_amount_size = 8;\n\n    function _transfer_token_amount() internal pure returns (int64 r) {\n        r = int64(uint64(_loaduint256(transfer_token_amount_pos + transfer_token_amount_size - uint256_size)));\n    }\n\n    uint256 constant transfer_proof_pos = transfer_token_amount_pos + transfer_token_amount_size;\n    uint256 constant transfer_proof_size = 256;\n\n    function _transfer_proof() internal pure returns (uint256[8] calldata r) {\n        uint256 pos = transfer_proof_pos;\n        assembly {\n            r := pos\n        }\n    }\n\n    uint256 constant tree_root_after_pos = transfer_proof_pos + transfer_proof_size;\n    uint256 constant tree_root_after_size = 32;\n\n    function _tree_root_after() internal pure returns (uint256 r) {\n        r = _loaduint256(tree_root_after_pos);\n    }\n\n    uint256 constant tree_proof_pos = tree_root_after_pos + tree_root_after_size;\n    uint256 constant tree_proof_size = 256;\n\n    function _tree_proof() internal pure returns (uint256[8] calldata r) {\n        uint256 pos = tree_proof_pos;\n        assembly {\n            r := pos\n        }\n    }\n\n    uint256 constant tx_type_pos = tree_proof_pos + tree_proof_size;\n    uint256 constant tx_type_size = 2;\n    uint256 constant tx_type_mask = (1 << (tx_type_size * 8)) - 1;\n\n    function _tx_type() internal pure returns (uint256 r) {\n        r = _loaduint256(tx_type_pos + tx_type_size - uint256_size) & tx_type_mask;\n    }\n\n    uint256 constant memo_data_size_pos = tx_type_pos + tx_type_size;\n    uint256 constant memo_data_size_size = 2;\n    uint256 constant memo_data_size_mask = (1 << (memo_data_size_size * 8)) - 1;\n\n    uint256 constant memo_data_pos = memo_data_size_pos + memo_data_size_size;\n\n    function _memo_data_size() internal pure returns (uint256 r) {\n        r = _loaduint256(memo_data_size_pos + memo_data_size_size - uint256_size) & memo_data_size_mask;\n    }\n\n    function _memo_data() internal pure returns (bytes calldata r) {\n        uint256 offset = memo_data_pos;\n        uint256 length = _memo_data_size();\n        assembly {\n            r.offset := offset\n            r.length := length\n        }\n    }\n\n    function _sign_r_vs_pos() internal pure returns (uint256) {\n        return memo_data_pos + _memo_data_size();\n    }\n\n    uint256 constant sign_r_vs_size = 64;\n\n    function _sign_r_vs() internal pure returns (bytes32 r, bytes32 vs) {\n        uint256 offset = _sign_r_vs_pos();\n        assembly {\n            r := calldataload(offset)\n            vs := calldataload(add(offset, 32))\n        }\n    }\n\n    uint256 constant transfer_delta_size =\n        transfer_index_size + transfer_energy_amount_size + transfer_token_amount_size;\n    uint256 constant transfer_delta_mask = (1 << (transfer_delta_size * 8)) - 1;\n\n    function _transfer_delta() internal pure returns (uint256 r) {\n        r = _loaduint256(transfer_index_pos + transfer_delta_size - uint256_size) & transfer_delta_mask;\n    }\n\n    function _memo_fixed_size() internal pure returns (uint256 r) {\n        uint256 t = _tx_type();\n        if (t == 0 || t == 1) {\n            // fee\n            // 8\n            r = 8;\n        } else if (t == 2) {\n            // fee + native amount + recipient\n            // 8 + 8 + 20\n            r = 36;\n        } else if (t == 3) {\n            // fee + deadline + address\n            // 8 + 8 + 20\n            r = 36;\n        } else {\n            revert();\n        }\n    }\n\n    function _memo_message() internal pure returns (bytes calldata r) {\n        uint256 memo_fixed_size = _memo_fixed_size();\n        uint256 offset = memo_data_pos + memo_fixed_size;\n        uint256 length = _memo_data_size() - memo_fixed_size;\n        assembly {\n            r.offset := offset\n            r.length := length\n        }\n    }\n\n    uint256 constant memo_fee_pos = memo_data_pos;\n    uint256 constant memo_fee_size = 8;\n    uint256 constant memo_fee_mask = (1 << (memo_fee_size * 8)) - 1;\n\n    function _memo_fee() internal pure returns (uint256 r) {\n        r = _loaduint256(memo_fee_pos + memo_fee_size - uint256_size) & memo_fee_mask;\n    }\n\n    // Withdraw specific data\n\n    uint256 constant memo_native_amount_pos = memo_fee_pos + memo_fee_size;\n    uint256 constant memo_native_amount_size = 8;\n    uint256 constant memo_native_amount_mask = (1 << (memo_native_amount_size * 8)) - 1;\n\n    function _memo_native_amount() internal pure returns (uint256 r) {\n        r = _loaduint256(memo_native_amount_pos + memo_native_amount_size - uint256_size) & memo_native_amount_mask;\n    }\n\n    uint256 constant memo_receiver_pos = memo_native_amount_pos + memo_native_amount_size;\n    uint256 constant memo_receiver_size = 20;\n\n    function _memo_receiver() internal pure returns (address r) {\n        r = address(uint160(_loaduint256(memo_receiver_pos + memo_receiver_size - uint256_size)));\n    }\n\n    // Permittable token deposit specific data\n\n    uint256 constant memo_permit_deadline_pos = memo_fee_pos + memo_fee_size;\n    uint256 constant memo_permit_deadline_size = 8;\n\n    function _memo_permit_deadline() internal pure returns (uint64 r) {\n        r = uint64(_loaduint256(memo_permit_deadline_pos + memo_permit_deadline_size - uint256_size));\n    }\n\n    uint256 constant memo_permit_holder_pos = memo_permit_deadline_pos + memo_permit_deadline_size;\n    uint256 constant memo_permit_holder_size = 20;\n\n    function _memo_permit_holder() internal pure returns (address r) {\n        r = address(uint160(_loaduint256(memo_permit_holder_pos + memo_permit_holder_size - uint256_size)));\n    }\n}\n",
+                "src/zkbob/utils/Parameters.sol": "// SPDX-License-Identifier: MIT\n\npragma solidity 0.8.15;\n\nimport \"@openzeppelin/contracts/utils/cryptography/ECDSA.sol\";\nimport \"./CustomABIDecoder.sol\";\n\nabstract contract Parameters is CustomABIDecoder {\n    uint256 constant R = 21888242871839275222246405745257275088548364400416034343698204186575808495617;\n    bytes32 constant S_MASK = 0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff;\n\n    function _root() internal view virtual returns (uint256);\n    function _pool_id() internal view virtual returns (uint256);\n\n    function _transfer_pub() internal view returns (uint256[5] memory r) {\n        r[0] = _root();\n        r[1] = _transfer_nullifier();\n        r[2] = _transfer_out_commit();\n        r[3] = _transfer_delta() + (_pool_id() << (transfer_delta_size * 8));\n        r[4] = uint256(keccak256(_memo_data())) % R;\n    }\n\n    function _tree_pub(uint256 _root_before) internal view returns (uint256[3] memory r) {\n        r[0] = _root_before;\n        r[1] = _tree_root_after();\n        r[2] = _transfer_out_commit();\n    }\n\n    // NOTE only valid in the context of normal deposit (tx_type=0)\n    function _deposit_spender() internal pure returns (address) {\n        (bytes32 r, bytes32 vs) = _sign_r_vs();\n        return ECDSA.recover(ECDSA.toEthSignedMessageHash(bytes32(_transfer_nullifier())), r, vs);\n    }\n\n    // NOTE only valid in the context of permittable token deposit (tx_type=3)\n    function _permittable_deposit_signature() internal pure returns (uint8, bytes32, bytes32) {\n        (bytes32 r, bytes32 vs) = _sign_r_vs();\n        return (uint8((uint256(vs) >> 255) + 27), r, vs & S_MASK);\n    }\n}\n",
+                "src/zkbob/utils/ZkBobAccounting.sol": "// SPDX-License-Identifier: CC0-1.0\n\npragma solidity 0.8.15;\n\n/**\n * @title ZkBobAccounting\n * @dev On chain accounting for zkBob operations, limits and stats.\n * Units: 1 BOB = 1e18 wei = 1e9 zkBOB units\n * Limitations: Contract will only work correctly as long as pool tvl does not exceed 4.7e12 BOB (4.7 trillion)\n * and overall transaction count does not exceed 4.3e9 (4.3 billion). Pool usage limits cannot exceed 4.3e9 BOB (4.3 billion) per day.\n */\ncontract ZkBobAccounting {\n    uint256 internal constant PRECISION = 1_000_000_000;\n    uint256 internal constant SLOT_DURATION = 1 hours;\n    uint256 internal constant DAY_SLOTS = 1 days / SLOT_DURATION;\n    uint256 internal constant WEEK_SLOTS = 1 weeks / SLOT_DURATION;\n\n    struct Slot0 {\n        // max seen average tvl over period of at least 1 week (granularity of 1e9), might not be precise\n        // max possible tvl - type(uint56).max * 1e9 zkBOB units ~= 7.2e16 BOB\n        uint56 maxWeeklyAvgTvl;\n        // max number of pool interactions over 1 week, might not be precise\n        // max possible tx count - type(uint32).max ~= 4.3e9 transactions\n        uint32 maxWeeklyTxCount;\n        // 1 week behind snapshot time slot (granularity of 1 hour)\n        // max possible timestamp - Dec 08 3883\n        uint24 tailSlot;\n        // active snapshot time slot (granularity of 1 hour)\n        // max possible timestamp - Dec 08 3883\n        uint24 headSlot;\n        // cumulative sum of tvl over txCount interactions (granularity of 1e9)\n        // max possible cumulative tvl ~= type(uint32).max * type(uint56).max = 4.3e9 transactions * 7.2e16 BOB\n        uint88 cumTvl;\n        // number of successful pool interactions since launch\n        // max possible tx count - type(uint32).max ~= 4.3e9 transactions\n        uint32 txCount;\n    }\n\n    struct Slot1 {\n        // current pool tvl (granularity of 1)\n        // max possible tvl - type(uint72).max * 1 zkBOB units ~= 4.7e21 zkBOB units ~= 4.7e12 BOB\n        uint72 tvl;\n    }\n\n    struct Tier {\n        TierLimits limits;\n        TierStats stats;\n    }\n\n    struct TierLimits {\n        // max cap on the entire pool tvl (granularity of 1e9)\n        // max possible cap - type(uint56).max * 1e9 zkBOB units ~= 7.2e16 BOB\n        uint56 tvlCap;\n        // max cap on the daily deposits sum (granularity of 1e9)\n        // max possible cap - type(uint32).max * 1e9 zkBOB units ~= 4.3e9 BOB\n        uint32 dailyDepositCap;\n        // max cap on the daily withdrawal sum (granularity of 1e9)\n        // max possible cap - type(uint32).max * 1e9 zkBOB units ~= 4.3e9 BOB\n        uint32 dailyWithdrawalCap;\n        // max cap on the daily deposits sum for single user (granularity of 1e9)\n        // max possible cap - type(uint32).max * 1e9 zkBOB units ~= 4.3e9 BOB\n        uint32 dailyUserDepositCap;\n        // max cap on a single deposit (granularity of 1e9)\n        // max possible cap - type(uint32).max * 1e9 zkBOB units ~= 4.3e9 BOB\n        uint32 depositCap;\n        // max cap on a single direct deposit (granularity of 1e9)\n        // max possible cap - type(uint32).max * 1e9 zkBOB units ~= 4.3e9 BOB\n        uint32 directDepositCap;\n        // max cap on the daily direct deposits sum for single user (granularity of 1e9)\n        // max possible cap - type(uint32).max * 1e9 zkBOB units ~= 4.3e9 BOB\n        uint32 dailyUserDirectDepositCap;\n    }\n\n    struct TierStats {\n        uint16 day; // last update day number\n        uint72 dailyDeposit; // sum of all deposits during given day\n        uint72 dailyWithdrawal; // sum of all withdrawals during given day\n    }\n\n    struct Snapshot {\n        uint24 nextSlot; // next slot to from the queue\n        uint32 txCount; // number of successful pool interactions since launch at the time of the snapshot\n        uint88 cumTvl; // cumulative sum of tvl over txCount interactions (granularity of 1e9)\n    }\n\n    struct UserStats {\n        uint16 day; // last update day number\n        uint72 dailyDeposit; // sum of user deposits during given day\n        uint8 tier; // user limits tier, 0 being the default tier\n        uint72 dailyDirectDeposit; // sum of user direct deposits during given day\n    }\n\n    struct Limits {\n        uint256 tvlCap;\n        uint256 tvl;\n        uint256 dailyDepositCap;\n        uint256 dailyDepositCapUsage;\n        uint256 dailyWithdrawalCap;\n        uint256 dailyWithdrawalCapUsage;\n        uint256 dailyUserDepositCap;\n        uint256 dailyUserDepositCapUsage;\n        uint256 depositCap;\n        uint8 tier;\n        uint256 dailyUserDirectDepositCap;\n        uint256 dailyUserDirectDepositCapUsage;\n        uint256 directDepositCap;\n    }\n\n    Slot0 private slot0;\n    Slot1 private slot1;\n    mapping(uint256 => Tier) private tiers; // pool limits and usage per tier\n    mapping(uint256 => Snapshot) private snapshots; // single linked list of hourly snapshots\n    mapping(address => UserStats) private userStats;\n\n    event UpdateLimits(uint8 indexed tier, TierLimits limits);\n    event UpdateTier(address user, uint8 tier);\n\n    /**\n     * @dev Returns currently configured limits and remaining quotas for the given user as of the current block.\n     * @param _user user for which to retrieve limits.\n     * @return limits (denominated in zkBOB units = 1e-9 BOB)\n     */\n    function getLimitsFor(address _user) external view returns (Limits memory) {\n        Slot1 memory s1 = slot1;\n        UserStats memory us = userStats[_user];\n        Tier storage t = tiers[uint256(us.tier)];\n        TierLimits memory tl = t.limits;\n        TierStats memory ts = t.stats;\n        uint24 curSlot = uint24(block.timestamp / SLOT_DURATION);\n        uint24 today = curSlot / uint24(DAY_SLOTS);\n        return Limits({\n            tvlCap: tl.tvlCap * PRECISION,\n            tvl: s1.tvl,\n            dailyDepositCap: tl.dailyDepositCap * PRECISION,\n            dailyDepositCapUsage: (ts.day == today) ? ts.dailyDeposit : 0,\n            dailyWithdrawalCap: tl.dailyWithdrawalCap * PRECISION,\n            dailyWithdrawalCapUsage: (ts.day == today) ? ts.dailyWithdrawal : 0,\n            dailyUserDepositCap: tl.dailyUserDepositCap * PRECISION,\n            dailyUserDepositCapUsage: (us.day == today) ? us.dailyDeposit : 0,\n            depositCap: tl.depositCap * PRECISION,\n            tier: us.tier,\n            dailyUserDirectDepositCap: tl.dailyUserDirectDepositCap * PRECISION,\n            dailyUserDirectDepositCapUsage: (us.day == today) ? us.dailyDirectDeposit : 0,\n            directDepositCap: tl.directDepositCap * PRECISION\n        });\n    }\n\n    function _recordOperation(\n        address _user,\n        int256 _txAmount\n    )\n        internal\n        returns (uint56 maxWeeklyAvgTvl, uint32 maxWeeklyTxCount, uint256 txCount)\n    {\n        Slot0 memory s0 = slot0;\n        Slot1 memory s1 = slot1;\n        uint24 curSlot = uint24(block.timestamp / SLOT_DURATION);\n        txCount = uint256(s0.txCount);\n\n        // for full correctness, next line should use \"while\" instead of \"if\"\n        // however, in order to keep constant gas usage, \"if\" is being used\n        // this can lead to a longer sliding window (> 1 week) in some cases,\n        // but eventually it will converge back to the 1 week target\n        if (s0.txCount > 0 && curSlot - s0.tailSlot > WEEK_SLOTS) {\n            // if tail is more than 1 week behind, we move tail pointer to the next snapshot\n            Snapshot memory sn = snapshots[s0.tailSlot];\n            delete snapshots[s0.tailSlot];\n            s0.tailSlot = sn.nextSlot;\n            uint32 weeklyTxCount = s0.txCount - sn.txCount;\n            if (weeklyTxCount > s0.maxWeeklyTxCount) {\n                s0.maxWeeklyTxCount = weeklyTxCount;\n            }\n            uint56 avgTvl = uint56((s0.cumTvl - sn.cumTvl) / weeklyTxCount);\n            if (avgTvl > s0.maxWeeklyAvgTvl) {\n                s0.maxWeeklyAvgTvl = avgTvl;\n            }\n        }\n\n        if (s0.headSlot < curSlot) {\n            snapshots[s0.headSlot] = Snapshot(curSlot, s0.txCount, s0.cumTvl);\n            s0.headSlot = curSlot;\n        }\n\n        // update head stats\n        s0.cumTvl += s1.tvl / uint72(PRECISION);\n        s0.txCount++;\n\n        _processTVLChange(s1, _user, _txAmount);\n\n        slot0 = s0;\n        return (s0.maxWeeklyAvgTvl, s0.maxWeeklyTxCount, txCount);\n    }\n\n    function _processTVLChange(Slot1 memory s1, address _user, int256 _txAmount) internal {\n        uint16 curDay = uint16(block.timestamp / SLOT_DURATION / DAY_SLOTS);\n\n        if (_txAmount == 0) {\n            return;\n        }\n\n        UserStats memory us = userStats[_user];\n        Tier storage t = tiers[us.tier];\n        TierLimits memory tl = t.limits;\n        TierStats memory ts = t.stats;\n\n        if (_txAmount > 0) {\n            uint256 depositAmount = uint256(_txAmount);\n            s1.tvl += uint72(depositAmount);\n\n            // check all sorts of limits when processing a deposit\n            require(depositAmount <= uint256(tl.depositCap) * PRECISION, \"ZkBobAccounting: single deposit cap exceeded\");\n            require(uint256(s1.tvl) <= uint256(tl.tvlCap) * PRECISION, \"ZkBobAccounting: tvl cap exceeded\");\n\n            if (curDay > us.day) {\n                // user snapshot is outdated, day number and daily sum could be reset\n                userStats[_user] =\n                    UserStats({day: curDay, dailyDeposit: uint72(depositAmount), tier: us.tier, dailyDirectDeposit: 0});\n            } else {\n                us.dailyDeposit += uint72(depositAmount);\n                require(\n                    uint256(us.dailyDeposit) <= uint256(tl.dailyUserDepositCap) * PRECISION,\n                    \"ZkBobAccounting: daily user deposit cap exceeded\"\n                );\n                userStats[_user] = us;\n            }\n\n            if (curDay > ts.day) {\n                // latest deposit was on an earlier day, reset daily withdrawal sum\n                ts = TierStats({day: curDay, dailyDeposit: uint72(depositAmount), dailyWithdrawal: 0});\n            } else {\n                ts.dailyDeposit += uint72(depositAmount);\n                require(\n                    uint256(ts.dailyDeposit) <= uint256(tl.dailyDepositCap) * PRECISION,\n                    \"ZkBobAccounting: daily deposit cap exceeded\"\n                );\n            }\n        } else {\n            uint256 withdrawAmount = uint256(-_txAmount);\n            require(withdrawAmount <= type(uint32).max * PRECISION, \"ZkBobAccounting: withdrawal amount too large\");\n            s1.tvl -= uint72(withdrawAmount);\n\n            if (curDay > ts.day) {\n                // latest withdrawal was on an earlier day, reset daily deposit sum\n                ts = TierStats({day: curDay, dailyDeposit: 0, dailyWithdrawal: uint72(withdrawAmount)});\n            } else {\n                ts.dailyWithdrawal += uint72(withdrawAmount);\n                require(\n                    uint256(ts.dailyWithdrawal) <= uint256(tl.dailyWithdrawalCap) * PRECISION,\n                    \"ZkBobAccounting: daily withdrawal cap exceeded\"\n                );\n            }\n        }\n\n        slot1 = s1;\n        t.stats = ts;\n    }\n\n    function _checkDirectDepositLimits(address _user, uint256 _amount) internal {\n        uint16 curDay = uint16(block.timestamp / SLOT_DURATION / DAY_SLOTS);\n\n        UserStats memory us = userStats[_user];\n        TierLimits memory tl = tiers[us.tier].limits;\n\n        // check all sorts of limits when processing a deposit\n        require(\n            _amount <= uint256(tl.directDepositCap) * PRECISION, \"ZkBobAccounting: single direct deposit cap exceeded\"\n        );\n\n        if (curDay > us.day) {\n            // user snapshot is outdated, day number and daily sum could be reset\n            us = UserStats({day: curDay, dailyDeposit: 0, tier: us.tier, dailyDirectDeposit: uint72(_amount)});\n        } else {\n            us.dailyDirectDeposit += uint72(_amount);\n            require(\n                uint256(us.dailyDirectDeposit) <= uint256(tl.dailyUserDirectDepositCap) * PRECISION,\n                \"ZkBobAccounting: daily user direct deposit cap exceeded\"\n            );\n        }\n        userStats[_user] = us;\n    }\n\n    function _processDirectDepositBatch(uint256 _totalAmount) internal returns (uint256) {\n        slot1.tvl += uint72(_totalAmount);\n        return slot0.txCount++;\n    }\n\n    function _resetDailyLimits(uint8 _tier) internal {\n        delete tiers[_tier].stats;\n    }\n\n    function _setLimits(\n        uint8 _tier,\n        uint256 _tvlCap,\n        uint256 _dailyDepositCap,\n        uint256 _dailyWithdrawalCap,\n        uint256 _dailyUserDepositCap,\n        uint256 _depositCap,\n        uint256 _dailyUserDirectDepositCap,\n        uint256 _directDepositCap\n    )\n        internal\n    {\n        require(_tier < 255, \"ZkBobAccounting: invalid limit tier\");\n        require(_depositCap > 0, \"ZkBobAccounting: zero deposit cap\");\n        require(_tvlCap <= type(uint56).max * PRECISION, \"ZkBobAccounting: tvl cap too large\");\n        require(_dailyDepositCap <= type(uint32).max * PRECISION, \"ZkBobAccounting: daily deposit cap too large\");\n        require(_dailyWithdrawalCap <= type(uint32).max * PRECISION, \"ZkBobAccounting: daily withdrawal cap too large\");\n        require(_dailyUserDepositCap >= _depositCap, \"ZkBobAccounting: daily user deposit cap too low\");\n        require(_dailyDepositCap >= _dailyUserDepositCap, \"ZkBobAccounting: daily deposit cap too low\");\n        require(_tvlCap >= _dailyDepositCap, \"ZkBobAccounting: tvl cap too low\");\n        require(_dailyWithdrawalCap > 0, \"ZkBobAccounting: zero daily withdrawal cap\");\n        require(\n            _dailyUserDirectDepositCap >= _directDepositCap, \"ZkBobAccounting: daily user direct deposit cap too low\"\n        );\n        TierLimits memory tl = TierLimits({\n            tvlCap: uint56(_tvlCap / PRECISION),\n            dailyDepositCap: uint32(_dailyDepositCap / PRECISION),\n            dailyWithdrawalCap: uint32(_dailyWithdrawalCap / PRECISION),\n            dailyUserDepositCap: uint32(_dailyUserDepositCap / PRECISION),\n            depositCap: uint32(_depositCap / PRECISION),\n            dailyUserDirectDepositCap: uint32(_dailyUserDirectDepositCap / PRECISION),\n            directDepositCap: uint32(_directDepositCap / PRECISION)\n        });\n        tiers[_tier].limits = tl;\n        emit UpdateLimits(_tier, tl);\n    }\n\n    function _setUsersTier(uint8 _tier, address[] memory _users) internal {\n        require(\n            _tier == 255 || tiers[uint256(_tier)].limits.tvlCap > 0, \"ZkBobAccounting: non-existing pool limits tier\"\n        );\n        for (uint256 i = 0; i < _users.length; i++) {\n            address user = _users[i];\n            userStats[user].tier = _tier;\n            emit UpdateTier(user, _tier);\n        }\n    }\n\n    function _txCount() internal view returns (uint256) {\n        return slot0.txCount;\n    }\n}\n"
+            },
+            "abi": "[{\"inputs\":[{\"internalType\":\"uint256\",\"name\":\"__pool_id\",\"type\":\"uint256\"},{\"internalType\":\"address\",\"name\":\"_token\",\"type\":\"address\"},{\"internalType\":\"contract ITransferVerifier\",\"name\":\"_transfer_verifier\",\"type\":\"address\"},{\"internalType\":\"contract ITreeVerifier\",\"name\":\"_tree_verifier\",\"type\":\"address\"},{\"internalType\":\"contract IBatchDepositVerifier\",\"name\":\"_batch_deposit_verifier\",\"type\":\"address\"},{\"internalType\":\"address\",\"name\":\"_direct_deposit_queue\",\"type\":\"address\"}],\"stateMutability\":\"nonpayable\",\"type\":\"constructor\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":true,\"internalType\":\"uint256\",\"name\":\"index\",\"type\":\"uint256\"},{\"indexed\":true,\"internalType\":\"bytes32\",\"name\":\"hash\",\"type\":\"bytes32\"},{\"indexed\":false,\"internalType\":\"bytes\",\"name\":\"message\",\"type\":\"bytes\"}],\"name\":\"Message\",\"type\":\"event\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":true,\"internalType\":\"address\",\"name\":\"previousOwner\",\"type\":\"address\"},{\"indexed\":true,\"internalType\":\"address\",\"name\":\"newOwner\",\"type\":\"address\"}],\"name\":\"OwnershipTransferred\",\"type\":\"event\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":true,\"internalType\":\"uint8\",\"name\":\"tier\",\"type\":\"uint8\"},{\"components\":[{\"internalType\":\"uint56\",\"name\":\"tvlCap\",\"type\":\"uint56\"},{\"internalType\":\"uint32\",\"name\":\"dailyDepositCap\",\"type\":\"uint32\"},{\"internalType\":\"uint32\",\"name\":\"dailyWithdrawalCap\",\"type\":\"uint32\"},{\"internalType\":\"uint32\",\"name\":\"dailyUserDepositCap\",\"type\":\"uint32\"},{\"internalType\":\"uint32\",\"name\":\"depositCap\",\"type\":\"uint32\"},{\"internalType\":\"uint32\",\"name\":\"directDepositCap\",\"type\":\"uint32\"},{\"internalType\":\"uint32\",\"name\":\"dailyUserDirectDepositCap\",\"type\":\"uint32\"}],\"indexed\":false,\"internalType\":\"struct ZkBobAccounting.TierLimits\",\"name\":\"limits\",\"type\":\"tuple\"}],\"name\":\"UpdateLimits\",\"type\":\"event\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":false,\"internalType\":\"address\",\"name\":\"manager\",\"type\":\"address\"}],\"name\":\"UpdateOperatorManager\",\"type\":\"event\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":false,\"internalType\":\"address\",\"name\":\"user\",\"type\":\"address\"},{\"indexed\":false,\"internalType\":\"uint8\",\"name\":\"tier\",\"type\":\"uint8\"}],\"name\":\"UpdateTier\",\"type\":\"event\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":false,\"internalType\":\"address\",\"name\":\"seller\",\"type\":\"address\"}],\"name\":\"UpdateTokenSeller\",\"type\":\"event\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":true,\"internalType\":\"address\",\"name\":\"operator\",\"type\":\"address\"},{\"indexed\":false,\"internalType\":\"uint256\",\"name\":\"fee\",\"type\":\"uint256\"}],\"name\":\"WithdrawFee\",\"type\":\"event\"},{\"inputs\":[{\"internalType\":\"address\",\"name\":\"\",\"type\":\"address\"}],\"name\":\"accumulatedFee\",\"outputs\":[{\"internalType\":\"uint256\",\"name\":\"\",\"type\":\"uint256\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[],\"name\":\"all_messages_hash\",\"outputs\":[{\"internalType\":\"bytes32\",\"name\":\"\",\"type\":\"bytes32\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"uint256\",\"name\":\"_root_after\",\"type\":\"uint256\"},{\"internalType\":\"uint256[]\",\"name\":\"_indices\",\"type\":\"uint256[]\"},{\"internalType\":\"uint256\",\"name\":\"_out_commit\",\"type\":\"uint256\"},{\"internalType\":\"uint256[8]\",\"name\":\"_batch_deposit_proof\",\"type\":\"uint256[8]\"},{\"internalType\":\"uint256[8]\",\"name\":\"_tree_proof\",\"type\":\"uint256[8]\"}],\"name\":\"appendDirectDeposits\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[],\"name\":\"batch_deposit_verifier\",\"outputs\":[{\"internalType\":\"contract IBatchDepositVerifier\",\"name\":\"\",\"type\":\"address\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[],\"name\":\"denominator\",\"outputs\":[{\"internalType\":\"uint256\",\"name\":\"\",\"type\":\"uint256\"}],\"stateMutability\":\"pure\",\"type\":\"function\"},{\"inputs\":[],\"name\":\"direct_deposit_queue\",\"outputs\":[{\"internalType\":\"contract IZkBobDirectDepositQueue\",\"name\":\"\",\"type\":\"address\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"address\",\"name\":\"_user\",\"type\":\"address\"}],\"name\":\"getLimitsFor\",\"outputs\":[{\"components\":[{\"internalType\":\"uint256\",\"name\":\"tvlCap\",\"type\":\"uint256\"},{\"internalType\":\"uint256\",\"name\":\"tvl\",\"type\":\"uint256\"},{\"internalType\":\"uint256\",\"name\":\"dailyDepositCap\",\"type\":\"uint256\"},{\"internalType\":\"uint256\",\"name\":\"dailyDepositCapUsage\",\"type\":\"uint256\"},{\"internalType\":\"uint256\",\"name\":\"dailyWithdrawalCap\",\"type\":\"uint256\"},{\"internalType\":\"uint256\",\"name\":\"dailyWithdrawalCapUsage\",\"type\":\"uint256\"},{\"internalType\":\"uint256\",\"name\":\"dailyUserDepositCap\",\"type\":\"uint256\"},{\"internalType\":\"uint256\",\"name\":\"dailyUserDepositCapUsage\",\"type\":\"uint256\"},{\"internalType\":\"uint256\",\"name\":\"depositCap\",\"type\":\"uint256\"},{\"internalType\":\"uint8\",\"name\":\"tier\",\"type\":\"uint8\"},{\"internalType\":\"uint256\",\"name\":\"dailyUserDirectDepositCap\",\"type\":\"uint256\"},{\"internalType\":\"uint256\",\"name\":\"dailyUserDirectDepositCapUsage\",\"type\":\"uint256\"},{\"internalType\":\"uint256\",\"name\":\"directDepositCap\",\"type\":\"uint256\"}],\"internalType\":\"struct ZkBobAccounting.Limits\",\"name\":\"\",\"type\":\"tuple\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"uint256\",\"name\":\"_root\",\"type\":\"uint256\"},{\"internalType\":\"uint256\",\"name\":\"_tvlCap\",\"type\":\"uint256\"},{\"internalType\":\"uint256\",\"name\":\"_dailyDepositCap\",\"type\":\"uint256\"},{\"internalType\":\"uint256\",\"name\":\"_dailyWithdrawalCap\",\"type\":\"uint256\"},{\"internalType\":\"uint256\",\"name\":\"_dailyUserDepositCap\",\"type\":\"uint256\"},{\"internalType\":\"uint256\",\"name\":\"_depositCap\",\"type\":\"uint256\"},{\"internalType\":\"uint256\",\"name\":\"_dailyUserDirectDepositCap\",\"type\":\"uint256\"},{\"internalType\":\"uint256\",\"name\":\"_directDepositCap\",\"type\":\"uint256\"}],\"name\":\"initialize\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"uint256\",\"name\":\"\",\"type\":\"uint256\"}],\"name\":\"nullifiers\",\"outputs\":[{\"internalType\":\"uint256\",\"name\":\"\",\"type\":\"uint256\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[],\"name\":\"operatorManager\",\"outputs\":[{\"internalType\":\"contract IOperatorManager\",\"name\":\"\",\"type\":\"address\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[],\"name\":\"owner\",\"outputs\":[{\"internalType\":\"address\",\"name\":\"\",\"type\":\"address\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[],\"name\":\"pool_id\",\"outputs\":[{\"internalType\":\"uint256\",\"name\":\"\",\"type\":\"uint256\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[],\"name\":\"pool_index\",\"outputs\":[{\"internalType\":\"uint256\",\"name\":\"\",\"type\":\"uint256\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"address\",\"name\":\"_sender\",\"type\":\"address\"},{\"internalType\":\"uint256\",\"name\":\"_amount\",\"type\":\"uint256\"}],\"name\":\"recordDirectDeposit\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[],\"name\":\"renounceOwnership\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"uint8\",\"name\":\"_tier\",\"type\":\"uint8\"}],\"name\":\"resetDailyLimits\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"uint256\",\"name\":\"\",\"type\":\"uint256\"}],\"name\":\"roots\",\"outputs\":[{\"internalType\":\"uint256\",\"name\":\"\",\"type\":\"uint256\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"uint8\",\"name\":\"_tier\",\"type\":\"uint8\"},{\"internalType\":\"uint256\",\"name\":\"_tvlCap\",\"type\":\"uint256\"},{\"internalType\":\"uint256\",\"name\":\"_dailyDepositCap\",\"type\":\"uint256\"},{\"internalType\":\"uint256\",\"name\":\"_dailyWithdrawalCap\",\"type\":\"uint256\"},{\"internalType\":\"uint256\",\"name\":\"_dailyUserDepositCap\",\"type\":\"uint256\"},{\"internalType\":\"uint256\",\"name\":\"_depositCap\",\"type\":\"uint256\"},{\"internalType\":\"uint256\",\"name\":\"_dailyUserDirectDepositCap\",\"type\":\"uint256\"},{\"internalType\":\"uint256\",\"name\":\"_directDepositCap\",\"type\":\"uint256\"}],\"name\":\"setLimits\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"contract IOperatorManager\",\"name\":\"_operatorManager\",\"type\":\"address\"}],\"name\":\"setOperatorManager\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"address\",\"name\":\"_seller\",\"type\":\"address\"}],\"name\":\"setTokenSeller\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"uint8\",\"name\":\"_tier\",\"type\":\"uint8\"},{\"internalType\":\"address[]\",\"name\":\"_users\",\"type\":\"address[]\"}],\"name\":\"setUsersTier\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[],\"name\":\"token\",\"outputs\":[{\"internalType\":\"address\",\"name\":\"\",\"type\":\"address\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[],\"name\":\"tokenSeller\",\"outputs\":[{\"internalType\":\"contract ITokenSeller\",\"name\":\"\",\"type\":\"address\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[],\"name\":\"transact\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"address\",\"name\":\"newOwner\",\"type\":\"address\"}],\"name\":\"transferOwnership\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[],\"name\":\"transfer_verifier\",\"outputs\":[{\"internalType\":\"contract ITransferVerifier\",\"name\":\"\",\"type\":\"address\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[],\"name\":\"tree_verifier\",\"outputs\":[{\"internalType\":\"contract ITreeVerifier\",\"name\":\"\",\"type\":\"address\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"address\",\"name\":\"_operator\",\"type\":\"address\"},{\"internalType\":\"address\",\"name\":\"_to\",\"type\":\"address\"}],\"name\":\"withdrawFee\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"}]",
+            "constructorArguments": null,
+            "matchType": "PARTIAL",
+            "compilationArtifacts": null,
+            "creationInputArtifacts": null,
+            "deployedBytecodeArtifacts": null
+        }
+    ]
+}
\ No newline at end of file
diff --git a/apps/explorer/lib/explorer/application.ex b/apps/explorer/lib/explorer/application.ex
index 23c5f2548f18..55fbd296a6af 100644
--- a/apps/explorer/lib/explorer/application.ex
+++ b/apps/explorer/lib/explorer/application.ex
@@ -54,6 +54,9 @@ defmodule Explorer.Application do
       Supervisor.child_spec({Task.Supervisor, name: Explorer.MarketTaskSupervisor}, id: Explorer.MarketTaskSupervisor),
       Supervisor.child_spec({Task.Supervisor, name: Explorer.GenesisDataTaskSupervisor}, id: GenesisDataTaskSupervisor),
       Supervisor.child_spec({Task.Supervisor, name: Explorer.TaskSupervisor}, id: Explorer.TaskSupervisor),
+      Supervisor.child_spec({Task.Supervisor, name: Explorer.LookUpSmartContractSourcesTaskSupervisor},
+        id: LookUpSmartContractSourcesTaskSupervisor
+      ),
       Explorer.SmartContract.SolcDownloader,
       Explorer.SmartContract.VyperDownloader,
       {Registry, keys: :duplicate, name: Registry.ChainEvents, id: Registry.ChainEvents},
@@ -138,9 +141,7 @@ defmodule Explorer.Application do
   end
 
   defp sc_microservice_configure(process) do
-    config = Application.get_env(:explorer, Explorer.SmartContract.RustVerifierInterfaceBehaviour, [])
-
-    if config[:enabled] && config[:type] == "eth_bytecode_db" do
+    if Application.get_env(:explorer, Explorer.SmartContract.RustVerifierInterfaceBehaviour)[:eth_bytecode_db?] do
       process
     else
       []
diff --git a/apps/explorer/lib/explorer/chain/fetcher/look_up_smart_contract_sources_on_demand.ex b/apps/explorer/lib/explorer/chain/fetcher/look_up_smart_contract_sources_on_demand.ex
index 32bf7bde6241..1e6bd9e6eb68 100644
--- a/apps/explorer/lib/explorer/chain/fetcher/look_up_smart_contract_sources_on_demand.ex
+++ b/apps/explorer/lib/explorer/chain/fetcher/look_up_smart_contract_sources_on_demand.ex
@@ -5,7 +5,6 @@ defmodule Explorer.Chain.Fetcher.LookUpSmartContractSourcesOnDemand do
 
   use GenServer
 
-  alias Explorer.Chain
   alias Explorer.Chain.{Address, Data, SmartContract}
   alias Explorer.Chain.Events.Publisher
   alias Explorer.SmartContract.EthBytecodeDBInterface
@@ -16,10 +15,16 @@ defmodule Explorer.Chain.Fetcher.LookUpSmartContractSourcesOnDemand do
 
   @cache_name :smart_contracts_sources_fetching
 
+  @cooldown_timeout 500
+
   def trigger_fetch(nil, _) do
     :ignore
   end
 
+  def trigger_fetch(address, %SmartContract{partially_verified: true}) do
+    GenServer.cast(__MODULE__, {:fetch, address})
+  end
+
   def trigger_fetch(_address, %SmartContract{}) do
     :ignore
   end
@@ -28,21 +33,20 @@ defmodule Explorer.Chain.Fetcher.LookUpSmartContractSourcesOnDemand do
     GenServer.cast(__MODULE__, {:fetch, address})
   end
 
-  defp fetch_sources(address) do
+  defp fetch_sources(address, only_full?) do
     creation_tx_input = contract_creation_input(address.hash)
 
-    with {:ok, %{"sourceType" => type} = source} <-
+    with {:ok, %{"sourceType" => type, "matchType" => match_type} = source} <-
            %{}
            |> prepare_bytecode_for_microservice(creation_tx_input, Data.to_string(address.contract_code))
-           |> EthBytecodeDBInterface.search_contract(),
+           |> EthBytecodeDBInterface.search_contract(address.hash),
+         :ok <- check_match_type(match_type, only_full?),
          {:ok, _} <- process_contract_source(type, source, address.hash) do
       Publisher.broadcast(%{smart_contract_was_verified: [address.hash]}, :on_demand)
     else
       _ ->
         false
     end
-
-    :ets.insert(@cache_name, {to_string(address.hash), DateTime.utc_now()})
   end
 
   def start_link(_) do
@@ -50,35 +54,61 @@ defmodule Explorer.Chain.Fetcher.LookUpSmartContractSourcesOnDemand do
   end
 
   @impl true
-  def init(opts) do
+  def init(_) do
     :ets.new(@cache_name, [
       :set,
       :named_table,
       :public
     ])
 
-    {:ok, opts}
+    {:ok,
+     %{
+       current_concurrency: 0,
+       max_concurrency:
+         Application.get_env(:explorer, Explorer.Chain.Fetcher.LookUpSmartContractSourcesOnDemand)[:max_concurrency]
+     }}
   end
 
   @impl true
-  def handle_cast({:fetch, address}, state) do
-    if need_to_fetch_sources?(address) && check_interval(to_string(address.hash)) do
-      fetch_sources(address)
-    end
+  def handle_cast({:fetch, address}, %{current_concurrency: counter, max_concurrency: max_concurrency} = state)
+      when counter < max_concurrency do
+    handle_fetch_request(address, state)
+  end
+
+  @impl true
+  def handle_cast({:fetch, _address} = request, %{current_concurrency: _counter} = state) do
+    Process.send_after(self(), request, @cooldown_timeout)
 
     {:noreply, state}
   end
 
-  defp need_to_fetch_sources?(%Address{smart_contract: nil}), do: true
+  @impl true
+  def handle_info({:fetch, address}, %{current_concurrency: counter, max_concurrency: max_concurrency} = state)
+      when counter < max_concurrency do
+    handle_fetch_request(address, state)
+  end
 
-  defp need_to_fetch_sources?(%Address{hash: hash}) do
-    case Chain.address_hash_to_one_smart_contract(hash) do
-      nil ->
-        true
+  @impl true
+  def handle_info({:fetch, _address} = request, state) do
+    Process.send_after(self(), request, @cooldown_timeout)
+    {:noreply, state}
+  end
 
-      _ ->
-        false
-    end
+  @impl true
+  def handle_info({ref, _answer}, %{current_concurrency: counter} = state) do
+    Process.demonitor(ref, [:flush])
+    {:noreply, %{state | current_concurrency: counter - 1}}
+  end
+
+  @impl true
+  def handle_info({:DOWN, _ref, :process, _pid, _reason}, %{current_concurrency: counter} = state) do
+    {:noreply, %{state | current_concurrency: counter - 1}}
+  end
+
+  defp partially_verified?(%Address{smart_contract: nil}), do: nil
+
+  defp partially_verified?(%Address{hash: hash}) do
+    SmartContract.select_partially_verified_by_address_hash(hash)
   end
 
   defp check_interval(address_string) do
@@ -101,7 +131,7 @@ defmodule Explorer.Chain.Fetcher.LookUpSmartContractSourcesOnDemand do
   end
 
   def process_contract_source("VYPER", source, address_hash) do
-    VyperPublisher.process_rust_verifier_response(source, address_hash, true, true)
+    VyperPublisher.process_rust_verifier_response(source, address_hash, true, true, true)
   end
 
   def process_contract_source("YUL", source, address_hash) do
@@ -109,4 +139,29 @@ defmodule Explorer.Chain.Fetcher.LookUpSmartContractSourcesOnDemand do
   end
 
   def process_contract_source(_, _source, _address_hash), do: false
+
+  defp check_match_type("PARTIAL", true), do: :full_match_required
+  defp check_match_type(_, _), do: :ok
+
+  defp handle_fetch_request(address, %{current_concurrency: counter} = state) do
+    need_to_check_and_partially_verified? =
+      check_interval(to_lowercase_string(address.hash)) && partially_verified?(address)
+
+    diff =
+      if is_nil(need_to_check_and_partially_verified?) || need_to_check_and_partially_verified? do
+        Task.Supervisor.async_nolink(Explorer.GenesisDataTaskSupervisor, fn ->
+          fetch_sources(address, need_to_check_and_partially_verified?)
+        end)
+
+        :ets.insert(@cache_name, {to_lowercase_string(address.hash), DateTime.utc_now()})
+
+        1
+      else
+        0
+      end
+
+    {:noreply, %{state | current_concurrency: counter + diff}}
+  end
+
+  defp to_lowercase_string(hash), do: hash |> to_string() |> String.downcase()
 end
diff --git a/apps/explorer/lib/explorer/chain/smart_contract.ex b/apps/explorer/lib/explorer/chain/smart_contract.ex
index adb743d34773..18590460e672 100644
--- a/apps/explorer/lib/explorer/chain/smart_contract.ex
+++ b/apps/explorer/lib/explorer/chain/smart_contract.ex
@@ -953,4 +953,16 @@ defmodule Explorer.Chain.SmartContract do
   end
 
   defp abi_decode_address_output(_), do: nil
+
+  @spec select_partially_verified_by_address_hash(binary() | Hash.t(), keyword) :: boolean() | nil
+  def select_partially_verified_by_address_hash(address_hash, options \\ []) do
+    query =
+      from(
+        smart_contract in __MODULE__,
+        where: smart_contract.address_hash == ^address_hash,
+        select: smart_contract.partially_verified
+      )
+
+    Chain.select_repo(options).one(query)
+  end
 end
diff --git a/apps/explorer/lib/explorer/smart_contract/eth_bytecode_db_interface.ex b/apps/explorer/lib/explorer/smart_contract/eth_bytecode_db_interface.ex
index 51656f766883..b4ffab08328c 100644
--- a/apps/explorer/lib/explorer/smart_contract/eth_bytecode_db_interface.ex
+++ b/apps/explorer/lib/explorer/smart_contract/eth_bytecode_db_interface.ex
@@ -3,8 +3,30 @@ defmodule Explorer.SmartContract.EthBytecodeDBInterface do
     Adapter for interaction with https://github.com/blockscout/blockscout-rs/tree/main/eth-bytecode-db
   """
 
-  def search_contract(%{"bytecode" => _, "bytecodeType" => _} = body) do
-    http_post_request(bytecode_search_sources_url(), body)
+  def search_contract(%{"bytecode" => _, "bytecodeType" => _} = body, address_hash) do
+    if chain_id = Application.get_env(:block_scout_web, :chain_id) do
+      http_post_request(
+        bytecode_search_all_sources_url(),
+        Map.merge(body, %{
+          "chain" => to_string(chain_id),
+          "address" => to_string(address_hash)
+        })
+      )
+    else
+      http_post_request(bytecode_search_sources_url(), body)
+    end
+  end
+
+  def process_verifier_response(%{"sourcifySources" => [src | _]}) do
+    {:ok, Map.put(src, "sourcify?", true)}
+  end
+
+  def process_verifier_response(%{"ethBytecodeDbSources" => [src | _]}) do
+    {:ok, src}
+  end
+
+  def process_verifier_response(%{"ethBytecodeDbSources" => [], "sourcifySources" => []}) do
+    {:error, :no_matched_sources}
   end
 
   def process_verifier_response(%{"sources" => [src | _]}) do
@@ -15,7 +37,23 @@ defmodule Explorer.SmartContract.EthBytecodeDBInterface do
     {:ok, nil}
   end
 
-  def bytecode_search_sources_url, do: "#{base_api_url()}" <> "/bytecodes/sources:search"
+  def bytecode_search_sources_url do
+    # workaround because of https://github.com/PSPDFKit-labs/bypass/issues/122
+    if Mix.env() == :test do
+      "#{base_api_url()}" <> "/bytecodes/sources_search"
+    else
+      "#{base_api_url()}" <> "/bytecodes/sources:search"
+    end
+  end
+
+  def bytecode_search_all_sources_url do
+    # workaround because of https://github.com/PSPDFKit-labs/bypass/issues/122
+    if Mix.env() == :test do
+      "#{base_api_url()}" <> "/bytecodes/sources_search_all"
+    else
+      "#{base_api_url()}" <> "/bytecodes/sources:search-all"
+    end
+  end
 
   use Explorer.SmartContract.RustVerifierInterfaceBehaviour
 end
diff --git a/apps/explorer/lib/explorer/smart_contract/helper.ex b/apps/explorer/lib/explorer/smart_contract/helper.ex
index 047f80a3e7bd..c73ea123b919 100644
--- a/apps/explorer/lib/explorer/smart_contract/helper.ex
+++ b/apps/explorer/lib/explorer/smart_contract/helper.ex
@@ -115,11 +115,17 @@ defmodule Explorer.SmartContract.Helper do
   end
 
   def cast_libraries(map) do
-    map
-    |> Map.values()
-    |> Enum.reduce(%{}, fn map, acc -> Map.merge(acc, map) end)
+    map |> Map.values() |> List.first() |> cast_libraries(map)
   end
 
+  def cast_libraries(value, map) when is_map(value),
+    do:
+      map
+      |> Map.values()
+      |> Enum.reduce(%{}, fn map, acc -> Map.merge(acc, map) end)
+
+  def cast_libraries(_value, map), do: map
+
   def contract_creation_input(address_hash) do
     case Chain.smart_contract_creation_tx_bytecode(address_hash) do
       %{init: init, created_contract_code: _created_contract_code} ->
diff --git a/apps/explorer/lib/explorer/smart_contract/rust_verifier_interface_behaviour.ex b/apps/explorer/lib/explorer/smart_contract/rust_verifier_interface_behaviour.ex
index b96f7eca3425..799fd7bd0e0a 100644
--- a/apps/explorer/lib/explorer/smart_contract/rust_verifier_interface_behaviour.ex
+++ b/apps/explorer/lib/explorer/smart_contract/rust_verifier_interface_behaviour.ex
@@ -9,7 +9,7 @@ defmodule Explorer.SmartContract.RustVerifierInterfaceBehaviour do
       alias HTTPoison.Response
       require Logger
 
-      @post_timeout :timer.seconds(120)
+      @post_timeout :timer.minutes(5)
       @request_error_msg "Error while sending request to verification microservice"
 
       def verify_multi_part(
diff --git a/apps/explorer/lib/explorer/smart_contract/solidity/publish_helper.ex b/apps/explorer/lib/explorer/smart_contract/solidity/publish_helper.ex
index dfa4dfb120d5..fa53ae86814f 100644
--- a/apps/explorer/lib/explorer/smart_contract/solidity/publish_helper.ex
+++ b/apps/explorer/lib/explorer/smart_contract/solidity/publish_helper.ex
@@ -4,9 +4,9 @@ defmodule Explorer.SmartContract.Solidity.PublishHelper do
   """
 
   alias Ecto.Changeset
-  alias Explorer.Chain
+  alias Explorer.Chain.{Address, SmartContract}
   alias Explorer.Chain.Events.Publisher, as: EventsPublisher
-  alias Explorer.Chain.SmartContract
+  alias Explorer.Chain.Fetcher.LookUpSmartContractSourcesOnDemand
   alias Explorer.SmartContract.Solidity.Publisher
   alias Explorer.ThirdPartyIntegrations.Sourcify
 
@@ -148,26 +148,25 @@ defmodule Explorer.SmartContract.Solidity.PublishHelper do
   end
 
   def check_and_verify(address_hash_string) do
-    if Chain.smart_contract_fully_verified?(address_hash_string) do
-      {:ok, :already_fully_verified}
+    if Application.get_env(:explorer, Explorer.SmartContract.RustVerifierInterfaceBehaviour)[:eth_bytecode_db?] do
+      LookUpSmartContractSourcesOnDemand.trigger_fetch(%Address{hash: address_hash_string}, nil)
     else
-      check_and_verify_inner(address_hash_string)
-    end
-  end
-
-  defp check_and_verify_inner(address_hash_string) do
-    if Application.get_env(:explorer, Explorer.ThirdPartyIntegrations.Sourcify)[:enabled] do
-      if Chain.smart_contract_verified?(address_hash_string) do
-        check_by_address_in_sourcify_if_contract_verified(address_hash_string)
+      if Application.get_env(:explorer, Explorer.ThirdPartyIntegrations.Sourcify)[:enabled] do
+        {:error, :sourcify_disabled}
       else
-        check_by_address_in_sourcify_else(address_hash_string)
+        check_by_address_in_sourcify(
+          SmartContract.select_partially_verified_by_address_hash(address_hash_string),
+          address_hash_string
+        )
       end
-    else
-      {:error, :sourcify_disabled}
     end
   end
 
-  defp check_by_address_in_sourcify_if_contract_verified(address_hash_string) do
+  defp check_by_address_in_sourcify(false, _address_hash_string) do
+    {:ok, :already_fully_verified}
+  end
+
+  defp check_by_address_in_sourcify(true, address_hash_string) do
     case Sourcify.check_by_address(address_hash_string) do
       {:ok, _verified_status} ->
         get_metadata_and_publish(address_hash_string, nil)
@@ -177,7 +176,7 @@ defmodule Explorer.SmartContract.Solidity.PublishHelper do
     end
   end
 
-  defp check_by_address_in_sourcify_else(address_hash_string) do
+  defp check_by_address_in_sourcify(nil, address_hash_string) do
     case Sourcify.check_by_address_any(address_hash_string) do
       {:ok, "full", metadata} ->
         process_metadata_and_publish(address_hash_string, metadata, false, false)
diff --git a/apps/explorer/lib/explorer/smart_contract/solidity/publisher.ex b/apps/explorer/lib/explorer/smart_contract/solidity/publisher.ex
index 045766198150..cee27ad6c942 100644
--- a/apps/explorer/lib/explorer/smart_contract/solidity/publisher.ex
+++ b/apps/explorer/lib/explorer/smart_contract/solidity/publisher.ex
@@ -145,7 +145,7 @@ defmodule Explorer.SmartContract.Solidity.Publisher do
           "sourceFiles" => sources,
           "compilerSettings" => compiler_settings_string,
           "matchType" => match_type
-        },
+        } = source,
         address_hash,
         is_standard_json?,
         save_file_path?,
@@ -177,6 +177,7 @@ defmodule Explorer.SmartContract.Solidity.Publisher do
       |> Map.put("compiler_settings", if(is_standard_json?, do: compiler_settings))
       |> Map.put("partially_verified", match_type == "PARTIAL")
       |> Map.put("verified_via_eth_bytecode_db", automatically_verified?)
+      |> Map.put("verified_via_sourcify", source["sourcify?"])
 
     publish_smart_contract(address_hash, prepared_params, Jason.decode!(abi_string || "null"))
   end
diff --git a/apps/explorer/test/explorer/chain_test.exs b/apps/explorer/test/explorer/chain_test.exs
index b7472db7120d..83821fea4aed 100644
--- a/apps/explorer/test/explorer/chain_test.exs
+++ b/apps/explorer/test/explorer/chain_test.exs
@@ -4242,14 +4242,18 @@ defmodule Explorer.ChainTest do
       assert sc_before_call.partially_verified == Map.get(valid_attrs, :partially_verified)
 
       assert {:ok, %SmartContract{}} =
-               Chain.update_smart_contract(%{address_hash: address.hash, partially_verified: false})
+               Chain.update_smart_contract(%{
+                 address_hash: address.hash,
+                 partially_verified: false,
+                 contract_source_code: "new code"
+               })
 
       sc_after_call = Repo.get_by(SmartContract, address_hash: address.hash)
       assert sc_after_call.name == Map.get(valid_attrs, :name)
       assert sc_after_call.partially_verified == false
       assert sc_after_call.compiler_version == Map.get(valid_attrs, :compiler_version)
       assert sc_after_call.optimization == Map.get(valid_attrs, :optimization)
-      assert sc_after_call.contract_source_code == Map.get(valid_attrs, :contract_source_code)
+      assert sc_after_call.contract_source_code == "new code"
     end
 
     test "check nothing changed", %{valid_attrs: valid_attrs, address: address} do
diff --git a/config/runtime.exs b/config/runtime.exs
index a80e8b88a3e4..17ab3d507fac 100644
--- a/config/runtime.exs
+++ b/config/runtime.exs
@@ -359,11 +359,15 @@ config :explorer, Explorer.ThirdPartyIntegrations.Sourcify,
   chain_id: System.get_env("CHAIN_ID"),
   repo_url: System.get_env("SOURCIFY_REPO_URL") || "https://repo.sourcify.dev/contracts"
 
+enabled? = ConfigHelper.parse_bool_env_var("MICROSERVICE_SC_VERIFIER_ENABLED")
+# or "eth_bytecode_db"
+type = System.get_env("MICROSERVICE_SC_VERIFIER_TYPE", "sc_verifier")
+
 config :explorer, Explorer.SmartContract.RustVerifierInterfaceBehaviour,
   service_url: System.get_env("MICROSERVICE_SC_VERIFIER_URL") || "https://eth-bytecode-db.services.blockscout.com/",
-  enabled: ConfigHelper.parse_bool_env_var("MICROSERVICE_SC_VERIFIER_ENABLED"),
-  # or "eth_bytecode_db"
-  type: System.get_env("MICROSERVICE_SC_VERIFIER_TYPE", "eth_bytecode_db")
+  enabled: enabled?,
+  type: type,
+  eth_bytecode_db?: enabled? && type == "eth_bytecode_db"
 
 config :explorer, Explorer.Visualize.Sol2uml,
   service_url: System.get_env("MICROSERVICE_VISUALIZE_SOL2UML_URL"),
@@ -407,7 +411,8 @@ config :explorer, Explorer.Chain.Cache.TransactionActionTokensData,
   max_cache_size: ConfigHelper.parse_integer_env_var("INDEXER_TX_ACTIONS_MAX_TOKEN_CACHE_SIZE", 100_000)
 
 config :explorer, Explorer.Chain.Fetcher.LookUpSmartContractSourcesOnDemand,
-  fetch_interval: ConfigHelper.parse_time_env_var("MICROSERVICE_ETH_BYTECODE_DB_INTERVAL_BETWEEN_LOOKUPS", "10m")
+  fetch_interval: ConfigHelper.parse_time_env_var("MICROSERVICE_ETH_BYTECODE_DB_INTERVAL_BETWEEN_LOOKUPS", "10m"),
+  max_concurrency: ConfigHelper.parse_integer_env_var("MICROSERVICE_ETH_BYTECODE_DB_MAX_LOOKUPS_CONCURRENCY", 10)
 
 config :explorer, Explorer.Chain.Cache.MinMissingBlockNumber,
   enabled: !ConfigHelper.parse_bool_env_var("DISABLE_INDEXER")
diff --git a/docker-compose/envs/common-blockscout.env b/docker-compose/envs/common-blockscout.env
index 38a13619728d..c20e65a313bf 100644
--- a/docker-compose/envs/common-blockscout.env
+++ b/docker-compose/envs/common-blockscout.env
@@ -203,6 +203,7 @@ MICROSERVICE_SC_VERIFIER_ENABLED=true
 MICROSERVICE_SC_VERIFIER_URL=https://eth-bytecode-db.services.blockscout.com/
 MICROSERVICE_SC_VERIFIER_TYPE=eth_bytecode_db
 MICROSERVICE_ETH_BYTECODE_DB_INTERVAL_BETWEEN_LOOKUPS=10m
+MICROSERVICE_ETH_BYTECODE_DB_MAX_LOOKUPS_CONCURRENCY=10
 MICROSERVICE_VISUALIZE_SOL2UML_ENABLED=true
 MICROSERVICE_VISUALIZE_SOL2UML_URL=http://visualizer:8050/
 MICROSERVICE_SIG_PROVIDER_ENABLED=true

From f495283b0a389db0fdf8500ca0cd1d6443f96ff7 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 9 Oct 2023 18:50:25 +0000
Subject: [PATCH 479/909] Bump eslint from 8.50.0 to 8.51.0 in
 /apps/block_scout_web/assets

Bumps [eslint](https://github.com/eslint/eslint) from 8.50.0 to 8.51.0.
- [Release notes](https://github.com/eslint/eslint/releases)
- [Changelog](https://github.com/eslint/eslint/blob/main/CHANGELOG.md)
- [Commits](https://github.com/eslint/eslint/compare/v8.50.0...v8.51.0)

---
updated-dependencies:
- dependency-name: eslint
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 apps/block_scout_web/assets/package-lock.json | 30 +++++++++----------
 apps/block_scout_web/assets/package.json      |  2 +-
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/apps/block_scout_web/assets/package-lock.json b/apps/block_scout_web/assets/package-lock.json
index 2f9bb3b93f2f..d5e8c0e6a9ae 100644
--- a/apps/block_scout_web/assets/package-lock.json
+++ b/apps/block_scout_web/assets/package-lock.json
@@ -78,7 +78,7 @@
         "copy-webpack-plugin": "^11.0.0",
         "css-loader": "^6.8.1",
         "css-minimizer-webpack-plugin": "^5.0.1",
-        "eslint": "^8.50.0",
+        "eslint": "^8.51.0",
         "eslint-config-standard": "^17.1.0",
         "eslint-plugin-import": "^2.28.1",
         "eslint-plugin-node": "^11.1.0",
@@ -2106,9 +2106,9 @@
       }
     },
     "node_modules/@eslint/js": {
-      "version": "8.50.0",
-      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.50.0.tgz",
-      "integrity": "sha512-NCC3zz2+nvYd+Ckfh87rA47zfu2QsQpvc6k1yzTk+b9KzRj0wkGa8LSoGOXN6Zv4lRf/EIoZ80biDh9HOI+RNQ==",
+      "version": "8.51.0",
+      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.51.0.tgz",
+      "integrity": "sha512-HxjQ8Qn+4SI3/AFv6sOrDB+g6PpUTDwSJiQqOrnneEk8L71161srI9gjzzZvYVbzHiVg/BvcH95+cK/zfIt4pg==",
       "dev": true,
       "engines": {
         "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
@@ -7266,15 +7266,15 @@
       }
     },
     "node_modules/eslint": {
-      "version": "8.50.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.50.0.tgz",
-      "integrity": "sha512-FOnOGSuFuFLv/Sa+FDVRZl4GGVAAFFi8LecRsI5a1tMO5HIE8nCm4ivAlzt4dT3ol/PaaGC0rJEEXQmHJBGoOg==",
+      "version": "8.51.0",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.51.0.tgz",
+      "integrity": "sha512-2WuxRZBrlwnXi+/vFSJyjMqrNjtJqiasMzehF0shoLaW7DzS3/9Yvrmq5JiT66+pNjiX4UBnLDiKHcWAr/OInA==",
       "dev": true,
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.2.0",
         "@eslint-community/regexpp": "^4.6.1",
         "@eslint/eslintrc": "^2.1.2",
-        "@eslint/js": "8.50.0",
+        "@eslint/js": "8.51.0",
         "@humanwhocodes/config-array": "^0.11.11",
         "@humanwhocodes/module-importer": "^1.0.1",
         "@nodelib/fs.walk": "^1.2.8",
@@ -19216,9 +19216,9 @@
       }
     },
     "@eslint/js": {
-      "version": "8.50.0",
-      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.50.0.tgz",
-      "integrity": "sha512-NCC3zz2+nvYd+Ckfh87rA47zfu2QsQpvc6k1yzTk+b9KzRj0wkGa8LSoGOXN6Zv4lRf/EIoZ80biDh9HOI+RNQ==",
+      "version": "8.51.0",
+      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.51.0.tgz",
+      "integrity": "sha512-HxjQ8Qn+4SI3/AFv6sOrDB+g6PpUTDwSJiQqOrnneEk8L71161srI9gjzzZvYVbzHiVg/BvcH95+cK/zfIt4pg==",
       "dev": true
     },
     "@ethereumjs/common": {
@@ -23158,15 +23158,15 @@
       }
     },
     "eslint": {
-      "version": "8.50.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.50.0.tgz",
-      "integrity": "sha512-FOnOGSuFuFLv/Sa+FDVRZl4GGVAAFFi8LecRsI5a1tMO5HIE8nCm4ivAlzt4dT3ol/PaaGC0rJEEXQmHJBGoOg==",
+      "version": "8.51.0",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.51.0.tgz",
+      "integrity": "sha512-2WuxRZBrlwnXi+/vFSJyjMqrNjtJqiasMzehF0shoLaW7DzS3/9Yvrmq5JiT66+pNjiX4UBnLDiKHcWAr/OInA==",
       "dev": true,
       "requires": {
         "@eslint-community/eslint-utils": "^4.2.0",
         "@eslint-community/regexpp": "^4.6.1",
         "@eslint/eslintrc": "^2.1.2",
-        "@eslint/js": "8.50.0",
+        "@eslint/js": "8.51.0",
         "@humanwhocodes/config-array": "^0.11.11",
         "@humanwhocodes/module-importer": "^1.0.1",
         "@nodelib/fs.walk": "^1.2.8",
diff --git a/apps/block_scout_web/assets/package.json b/apps/block_scout_web/assets/package.json
index f9719e8f2223..edeb7e942ae4 100644
--- a/apps/block_scout_web/assets/package.json
+++ b/apps/block_scout_web/assets/package.json
@@ -90,7 +90,7 @@
     "copy-webpack-plugin": "^11.0.0",
     "css-loader": "^6.8.1",
     "css-minimizer-webpack-plugin": "^5.0.1",
-    "eslint": "^8.50.0",
+    "eslint": "^8.51.0",
     "eslint-config-standard": "^17.1.0",
     "eslint-plugin-import": "^2.28.1",
     "eslint-plugin-node": "^11.1.0",

From 1e25c68a9ae5dedc9677eb4fc1462ae87697bf4c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 9 Oct 2023 18:51:42 +0000
Subject: [PATCH 480/909] Bump highlight.js from 11.8.0 to 11.9.0 in
 /apps/block_scout_web/assets

Bumps [highlight.js](https://github.com/highlightjs/highlight.js) from 11.8.0 to 11.9.0.
- [Release notes](https://github.com/highlightjs/highlight.js/releases)
- [Changelog](https://github.com/highlightjs/highlight.js/blob/main/CHANGES.md)
- [Commits](https://github.com/highlightjs/highlight.js/compare/11.8.0...11.9.0)

---
updated-dependencies:
- dependency-name: highlight.js
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 apps/block_scout_web/assets/package-lock.json | 14 +++++++-------
 apps/block_scout_web/assets/package.json      |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/apps/block_scout_web/assets/package-lock.json b/apps/block_scout_web/assets/package-lock.json
index 2f9bb3b93f2f..f51514fae14d 100644
--- a/apps/block_scout_web/assets/package-lock.json
+++ b/apps/block_scout_web/assets/package-lock.json
@@ -21,7 +21,7 @@
         "crypto-browserify": "^3.12.0",
         "dropzone": "^5.9.3",
         "eth-net-props": "^1.0.41",
-        "highlight.js": "^11.8.0",
+        "highlight.js": "^11.9.0",
         "https-browserify": "^1.0.0",
         "humps": "^2.0.1",
         "jquery": "^3.7.1",
@@ -9399,9 +9399,9 @@
       }
     },
     "node_modules/highlight.js": {
-      "version": "11.8.0",
-      "resolved": "https://registry.npmjs.org/highlight.js/-/highlight.js-11.8.0.tgz",
-      "integrity": "sha512-MedQhoqVdr0U6SSnWPzfiadUcDHfN/Wzq25AkXiQv9oiOO/sG0S7XkvpFIqWBl9Yq1UYyYOOVORs5UW2XlPyzg==",
+      "version": "11.9.0",
+      "resolved": "https://registry.npmjs.org/highlight.js/-/highlight.js-11.9.0.tgz",
+      "integrity": "sha512-fJ7cW7fQGCYAkgv4CPfwFHrfd/cLS4Hau96JuJ+ZTOWhjnhoeN1ub1tFmALm/+lW5z4WCAuAV9bm05AP0mS6Gw==",
       "engines": {
         "node": ">=12.0.0"
       }
@@ -24850,9 +24850,9 @@
       }
     },
     "highlight.js": {
-      "version": "11.8.0",
-      "resolved": "https://registry.npmjs.org/highlight.js/-/highlight.js-11.8.0.tgz",
-      "integrity": "sha512-MedQhoqVdr0U6SSnWPzfiadUcDHfN/Wzq25AkXiQv9oiOO/sG0S7XkvpFIqWBl9Yq1UYyYOOVORs5UW2XlPyzg=="
+      "version": "11.9.0",
+      "resolved": "https://registry.npmjs.org/highlight.js/-/highlight.js-11.9.0.tgz",
+      "integrity": "sha512-fJ7cW7fQGCYAkgv4CPfwFHrfd/cLS4Hau96JuJ+ZTOWhjnhoeN1ub1tFmALm/+lW5z4WCAuAV9bm05AP0mS6Gw=="
     },
     "hmac-drbg": {
       "version": "1.0.1",
diff --git a/apps/block_scout_web/assets/package.json b/apps/block_scout_web/assets/package.json
index f9719e8f2223..744cb0b7742c 100644
--- a/apps/block_scout_web/assets/package.json
+++ b/apps/block_scout_web/assets/package.json
@@ -33,7 +33,7 @@
     "crypto-browserify": "^3.12.0",
     "dropzone": "^5.9.3",
     "eth-net-props": "^1.0.41",
-    "highlight.js": "^11.8.0",
+    "highlight.js": "^11.9.0",
     "https-browserify": "^1.0.0",
     "humps": "^2.0.1",
     "jquery": "^3.7.1",

From 26d090b2bf9ec094e0475609685fcbd55fa07ad2 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 9 Oct 2023 18:52:58 +0000
Subject: [PATCH 481/909] Bump sass from 1.68.0 to 1.69.0 in
 /apps/block_scout_web/assets

Bumps [sass](https://github.com/sass/dart-sass) from 1.68.0 to 1.69.0.
- [Release notes](https://github.com/sass/dart-sass/releases)
- [Changelog](https://github.com/sass/dart-sass/blob/main/CHANGELOG.md)
- [Commits](https://github.com/sass/dart-sass/compare/1.68.0...1.69.0)

---
updated-dependencies:
- dependency-name: sass
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 apps/block_scout_web/assets/package-lock.json | 14 +++++++-------
 apps/block_scout_web/assets/package.json      |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/apps/block_scout_web/assets/package-lock.json b/apps/block_scout_web/assets/package-lock.json
index 2f9bb3b93f2f..9670c7a9c0cf 100644
--- a/apps/block_scout_web/assets/package-lock.json
+++ b/apps/block_scout_web/assets/package-lock.json
@@ -89,7 +89,7 @@
         "mini-css-extract-plugin": "^2.7.6",
         "postcss": "^8.4.31",
         "postcss-loader": "^7.3.3",
-        "sass": "^1.68.0",
+        "sass": "^1.69.0",
         "sass-loader": "^13.3.2",
         "style-loader": "^3.3.3",
         "webpack": "^5.88.2",
@@ -15147,9 +15147,9 @@
       "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
     },
     "node_modules/sass": {
-      "version": "1.68.0",
-      "resolved": "https://registry.npmjs.org/sass/-/sass-1.68.0.tgz",
-      "integrity": "sha512-Lmj9lM/fef0nQswm1J2HJcEsBUba4wgNx2fea6yJHODREoMFnwRpZydBnX/RjyXw2REIwdkbqE4hrTo4qfDBUA==",
+      "version": "1.69.0",
+      "resolved": "https://registry.npmjs.org/sass/-/sass-1.69.0.tgz",
+      "integrity": "sha512-l3bbFpfTOGgQZCLU/gvm1lbsQ5mC/WnLz3djL2v4WCJBDrWm58PO+jgngcGRNnKUh6wSsdm50YaovTqskZ0xDQ==",
       "dev": true,
       "dependencies": {
         "chokidar": ">=3.0.0 <4.0.0",
@@ -29146,9 +29146,9 @@
       "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
     },
     "sass": {
-      "version": "1.68.0",
-      "resolved": "https://registry.npmjs.org/sass/-/sass-1.68.0.tgz",
-      "integrity": "sha512-Lmj9lM/fef0nQswm1J2HJcEsBUba4wgNx2fea6yJHODREoMFnwRpZydBnX/RjyXw2REIwdkbqE4hrTo4qfDBUA==",
+      "version": "1.69.0",
+      "resolved": "https://registry.npmjs.org/sass/-/sass-1.69.0.tgz",
+      "integrity": "sha512-l3bbFpfTOGgQZCLU/gvm1lbsQ5mC/WnLz3djL2v4WCJBDrWm58PO+jgngcGRNnKUh6wSsdm50YaovTqskZ0xDQ==",
       "dev": true,
       "requires": {
         "chokidar": ">=3.0.0 <4.0.0",
diff --git a/apps/block_scout_web/assets/package.json b/apps/block_scout_web/assets/package.json
index f9719e8f2223..a5d562234248 100644
--- a/apps/block_scout_web/assets/package.json
+++ b/apps/block_scout_web/assets/package.json
@@ -101,7 +101,7 @@
     "mini-css-extract-plugin": "^2.7.6",
     "postcss": "^8.4.31",
     "postcss-loader": "^7.3.3",
-    "sass": "^1.68.0",
+    "sass": "^1.69.0",
     "sass-loader": "^13.3.2",
     "style-loader": "^3.3.3",
     "webpack": "^5.88.2",

From d9523f33d448168397ecad0b9f3730447c538efa Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 10 Oct 2023 07:18:37 +0000
Subject: [PATCH 482/909] Bump sweetalert2 from 11.7.31 to 11.7.32 in
 /apps/block_scout_web/assets

Bumps [sweetalert2](https://github.com/sweetalert2/sweetalert2) from 11.7.31 to 11.7.32.
- [Release notes](https://github.com/sweetalert2/sweetalert2/releases)
- [Changelog](https://github.com/sweetalert2/sweetalert2/blob/main/CHANGELOG.md)
- [Commits](https://github.com/sweetalert2/sweetalert2/compare/v11.7.31...v11.7.32)

---
updated-dependencies:
- dependency-name: sweetalert2
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 apps/block_scout_web/assets/package-lock.json | 14 +++++++-------
 apps/block_scout_web/assets/package.json      |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/apps/block_scout_web/assets/package-lock.json b/apps/block_scout_web/assets/package-lock.json
index caea5ebbb3e9..7c5970b31d23 100644
--- a/apps/block_scout_web/assets/package-lock.json
+++ b/apps/block_scout_web/assets/package-lock.json
@@ -61,7 +61,7 @@
         "redux": "^4.2.1",
         "stream-browserify": "^3.0.0",
         "stream-http": "^3.1.1",
-        "sweetalert2": "^11.7.31",
+        "sweetalert2": "^11.7.32",
         "urijs": "^1.19.11",
         "url": "^0.11.3",
         "util": "^0.12.5",
@@ -16018,9 +16018,9 @@
       }
     },
     "node_modules/sweetalert2": {
-      "version": "11.7.31",
-      "resolved": "https://registry.npmjs.org/sweetalert2/-/sweetalert2-11.7.31.tgz",
-      "integrity": "sha512-AVNODg41LqhC241UHTanW2ZQdh0ziiw+Gc3Dmy1EuCFP+g09P3mBEhvauU88J3JLEX6UpTfhp7iok9t8uhEdQQ==",
+      "version": "11.7.32",
+      "resolved": "https://registry.npmjs.org/sweetalert2/-/sweetalert2-11.7.32.tgz",
+      "integrity": "sha512-44tNNe2oLe7T94mT6dus4hc9G7qg6jZU/K5qZzpNS6e5HGPrSF6Kie6oZ7B5puIJydB34V2h/8f5EhIFivYo4A==",
       "funding": {
         "type": "individual",
         "url": "https://github.com/sponsors/limonte"
@@ -29776,9 +29776,9 @@
       }
     },
     "sweetalert2": {
-      "version": "11.7.31",
-      "resolved": "https://registry.npmjs.org/sweetalert2/-/sweetalert2-11.7.31.tgz",
-      "integrity": "sha512-AVNODg41LqhC241UHTanW2ZQdh0ziiw+Gc3Dmy1EuCFP+g09P3mBEhvauU88J3JLEX6UpTfhp7iok9t8uhEdQQ=="
+      "version": "11.7.32",
+      "resolved": "https://registry.npmjs.org/sweetalert2/-/sweetalert2-11.7.32.tgz",
+      "integrity": "sha512-44tNNe2oLe7T94mT6dus4hc9G7qg6jZU/K5qZzpNS6e5HGPrSF6Kie6oZ7B5puIJydB34V2h/8f5EhIFivYo4A=="
     },
     "symbol-tree": {
       "version": "3.2.4",
diff --git a/apps/block_scout_web/assets/package.json b/apps/block_scout_web/assets/package.json
index fb37f5d97914..648673ded592 100644
--- a/apps/block_scout_web/assets/package.json
+++ b/apps/block_scout_web/assets/package.json
@@ -73,7 +73,7 @@
     "redux": "^4.2.1",
     "stream-browserify": "^3.0.0",
     "stream-http": "^3.1.1",
-    "sweetalert2": "^11.7.31",
+    "sweetalert2": "^11.7.32",
     "urijs": "^1.19.11",
     "url": "^0.11.3",
     "util": "^0.12.5",

From 80c99447ddd1eb2cee39e13d604e5ca236b48e9f Mon Sep 17 00:00:00 2001
From: Maxim Filonov <53992153+sl1depengwyn@users.noreply.github.com>
Date: Wed, 4 Oct 2023 13:40:56 +0300
Subject: [PATCH 483/909] Add RSK chain type

---
 .../publish-docker-image-for-rsk.yml          |  3 +-
 apps/block_scout_web/test/test_helper.exs     |  1 +
 .../lib/ethereum_jsonrpc/trace_block.ex       |  3 ++
 apps/explorer/config/dev.exs                  |  2 +
 apps/explorer/config/prod.exs                 |  4 ++
 apps/explorer/config/test.exs                 | 18 ++++----
 apps/explorer/lib/explorer/application.ex     |  1 +
 .../explorer/chain/import/runner/blocks.ex    | 42 +++++++++----------
 apps/explorer/lib/explorer/repo.ex            | 24 +++++++++++
 apps/explorer/lib/release_tasks.ex            |  2 +-
 ...pending_block_ops_with_historic_blocks.exs | 16 +++++++
 apps/explorer/test/support/data_case.ex       |  2 +
 apps/explorer/test/test_helper.exs            |  1 +
 config/config_helper.exs                      | 10 +++--
 config/runtime/dev.exs                        |  7 ++++
 config/runtime/prod.exs                       |  6 +++
 16 files changed, 105 insertions(+), 37 deletions(-)
 create mode 100644 apps/explorer/priv/rsk/migrations/20231004101922_populate_pending_block_ops_with_historic_blocks.exs

diff --git a/.github/workflows/publish-docker-image-for-rsk.yml b/.github/workflows/publish-docker-image-for-rsk.yml
index a596128b8731..979e240761ba 100644
--- a/.github/workflows/publish-docker-image-for-rsk.yml
+++ b/.github/workflows/publish-docker-image-for-rsk.yml
@@ -51,4 +51,5 @@ jobs:
             ADMIN_PANEL_ENABLED=false
             CACHE_ADDRESS_WITH_BALANCES_UPDATE_INTERVAL=
             BLOCKSCOUT_VERSION=v${{ env.RELEASE_VERSION }}-beta.+commit.${{ env.SHORT_SHA }}
-            RELEASE_VERSION=${{ env.RELEASE_VERSION }}
\ No newline at end of file
+            RELEASE_VERSION=${{ env.RELEASE_VERSION }}
+            CHAIN_TYPE=rsk
\ No newline at end of file
diff --git a/apps/block_scout_web/test/test_helper.exs b/apps/block_scout_web/test/test_helper.exs
index d923caa304a4..c50797a055bb 100644
--- a/apps/block_scout_web/test/test_helper.exs
+++ b/apps/block_scout_web/test/test_helper.exs
@@ -27,6 +27,7 @@ Mox.defmock(Explorer.ExchangeRates.Source.TestSource, for: Explorer.ExchangeRate
 Ecto.Adapters.SQL.Sandbox.mode(Explorer.Repo, :manual)
 Ecto.Adapters.SQL.Sandbox.mode(Explorer.Repo.Account, :manual)
 Ecto.Adapters.SQL.Sandbox.mode(Explorer.Repo.PolygonEdge, :manual)
+Ecto.Adapters.SQL.Sandbox.mode(Explorer.Repo.RSK, :manual)
 
 Absinthe.Test.prime(BlockScoutWeb.Schema)
 
diff --git a/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/trace_block.ex b/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/trace_block.ex
index afda8dc6ff25..2192962c0ffb 100644
--- a/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/trace_block.ex
+++ b/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/trace_block.ex
@@ -57,6 +57,9 @@ defmodule EthereumJSONRPC.TraceBlock do
           |> List.flatten()
 
         {:ok, traces}
+
+      %{} ->
+        {:ok, []}
     end
   end
 
diff --git a/apps/explorer/config/dev.exs b/apps/explorer/config/dev.exs
index 57bb58ebf0f6..b8a8c81c94e2 100644
--- a/apps/explorer/config/dev.exs
+++ b/apps/explorer/config/dev.exs
@@ -13,6 +13,8 @@ config :explorer, Explorer.Repo.Account, timeout: :timer.seconds(80)
 
 config :explorer, Explorer.Repo.PolygonEdge, timeout: :timer.seconds(80)
 
+config :explorer, Explorer.Repo.RSK, timeout: :timer.seconds(80)
+
 config :explorer, Explorer.Tracer, env: "dev", disabled?: true
 
 config :logger, :explorer,
diff --git a/apps/explorer/config/prod.exs b/apps/explorer/config/prod.exs
index 620a4c440231..1d5670c9200b 100644
--- a/apps/explorer/config/prod.exs
+++ b/apps/explorer/config/prod.exs
@@ -20,6 +20,10 @@ config :explorer, Explorer.Repo.PolygonEdge,
   prepare: :unnamed,
   timeout: :timer.seconds(60)
 
+config :explorer, Explorer.Repo.RSK,
+  prepare: :unnamed,
+  timeout: :timer.seconds(60)
+
 config :explorer, Explorer.Tracer, env: "production", disabled?: true
 
 config :logger, :explorer,
diff --git a/apps/explorer/config/test.exs b/apps/explorer/config/test.exs
index b7a989dd9963..498eac10794e 100644
--- a/apps/explorer/config/test.exs
+++ b/apps/explorer/config/test.exs
@@ -38,14 +38,16 @@ config :explorer, Explorer.Repo.Account,
   timeout: :timer.seconds(60),
   queue_target: 1000
 
-config :explorer, Explorer.Repo.PolygonEdge,
-  database: "explorer_test",
-  hostname: "localhost",
-  pool: Ecto.Adapters.SQL.Sandbox,
-  # Default of `5_000` was too low for `BlockFetcher` test
-  ownership_timeout: :timer.minutes(1),
-  timeout: :timer.seconds(60),
-  queue_target: 1000
+for repo <- [Explorer.Repo.PolygonEdge, Explorer.Repo.RSK] do
+  config :explorer, repo,
+    database: "explorer_test",
+    hostname: "localhost",
+    pool: Ecto.Adapters.SQL.Sandbox,
+    # Default of `5_000` was too low for `BlockFetcher` test
+    ownership_timeout: :timer.minutes(1),
+    timeout: :timer.seconds(60),
+    queue_target: 1000
+end
 
 config :logger, :explorer,
   level: :warn,
diff --git a/apps/explorer/lib/explorer/application.ex b/apps/explorer/lib/explorer/application.ex
index 23c5f2548f18..676bf104040e 100644
--- a/apps/explorer/lib/explorer/application.ex
+++ b/apps/explorer/lib/explorer/application.ex
@@ -48,6 +48,7 @@ defmodule Explorer.Application do
       Explorer.Repo.Replica1,
       Explorer.Repo.Account,
       Explorer.Repo.PolygonEdge,
+      Explorer.Repo.RSK,
       Explorer.Vault,
       Supervisor.child_spec({SpandexDatadog.ApiServer, datadog_opts()}, id: SpandexDatadog.ApiServer),
       Supervisor.child_spec({Task.Supervisor, name: Explorer.HistoryTaskSupervisor}, id: Explorer.HistoryTaskSupervisor),
diff --git a/apps/explorer/lib/explorer/chain/import/runner/blocks.ex b/apps/explorer/lib/explorer/chain/import/runner/blocks.ex
index 57fc87602367..956022cb61d3 100644
--- a/apps/explorer/lib/explorer/chain/import/runner/blocks.ex
+++ b/apps/explorer/lib/explorer/chain/import/runner/blocks.ex
@@ -422,29 +422,25 @@ defmodule Explorer.Chain.Import.Runner.Blocks do
          timeout: timeout,
          timestamps: timestamps
        }) do
-    if Application.get_env(:explorer, :json_rpc_named_arguments)[:variant] == EthereumJSONRPC.RSK do
-      {:ok, []}
-    else
-      sorted_pending_ops =
-        items
-        |> MapSet.new()
-        |> MapSet.difference(MapSet.new(nonconsensus_items))
-        |> Enum.sort()
-        |> Enum.map(fn {number, hash} ->
-          %{block_hash: hash, block_number: number}
-        end)
-
-      Import.insert_changes_list(
-        repo,
-        sorted_pending_ops,
-        conflict_target: :block_hash,
-        on_conflict: :nothing,
-        for: PendingBlockOperation,
-        returning: true,
-        timeout: timeout,
-        timestamps: timestamps
-      )
-    end
+    sorted_pending_ops =
+      items
+      |> MapSet.new()
+      |> MapSet.difference(MapSet.new(nonconsensus_items))
+      |> Enum.sort()
+      |> Enum.map(fn {number, hash} ->
+        %{block_hash: hash, block_number: number}
+      end)
+
+    Import.insert_changes_list(
+      repo,
+      sorted_pending_ops,
+      conflict_target: :block_hash,
+      on_conflict: :nothing,
+      for: PendingBlockOperation,
+      returning: true,
+      timeout: timeout,
+      timestamps: timestamps
+    )
   end
 
   defp delete_address_token_balances(_, [], _), do: {:ok, []}
diff --git a/apps/explorer/lib/explorer/repo.ex b/apps/explorer/lib/explorer/repo.ex
index d4029f04fa5b..7cad910047ab 100644
--- a/apps/explorer/lib/explorer/repo.ex
+++ b/apps/explorer/lib/explorer/repo.ex
@@ -202,4 +202,28 @@ defmodule Explorer.Repo do
       {:ok, Keyword.put(opts, :url, db_url)}
     end
   end
+
+  defmodule RSK do
+    use Ecto.Repo,
+      otp_app: :explorer,
+      adapter: Ecto.Adapters.Postgres
+
+    def init(_, opts) do
+      db_url = Application.get_env(:explorer, __MODULE__)[:url]
+      repo_conf = Application.get_env(:explorer, __MODULE__)
+
+      merged =
+        %{url: db_url}
+        |> ConfigHelper.get_db_config()
+        |> Keyword.merge(repo_conf, fn
+          _key, v1, nil -> v1
+          _key, nil, v2 -> v2
+          _, _, v2 -> v2
+        end)
+
+      Application.put_env(:explorer, __MODULE__, merged)
+
+      {:ok, Keyword.put(opts, :url, db_url)}
+    end
+  end
 end
diff --git a/apps/explorer/lib/release_tasks.ex b/apps/explorer/lib/release_tasks.ex
index 50050f379187..6ab45f3d3018 100644
--- a/apps/explorer/lib/release_tasks.ex
+++ b/apps/explorer/lib/release_tasks.ex
@@ -27,7 +27,7 @@ defmodule Explorer.ReleaseTasks do
         base_repos_list
       end
 
-    Application.get_env(:blockscout, :ecto_repos, repos_list)
+    Application.get_env(:explorer, :ecto_repos, repos_list)
   end
 
   def create_and_migrate do
diff --git a/apps/explorer/priv/rsk/migrations/20231004101922_populate_pending_block_ops_with_historic_blocks.exs b/apps/explorer/priv/rsk/migrations/20231004101922_populate_pending_block_ops_with_historic_blocks.exs
new file mode 100644
index 000000000000..cef3c3968be8
--- /dev/null
+++ b/apps/explorer/priv/rsk/migrations/20231004101922_populate_pending_block_ops_with_historic_blocks.exs
@@ -0,0 +1,16 @@
+defmodule Explorer.Repo.RSK.Migrations.PopulatePendingBlockOpsWithHistoricBlocks do
+  use Ecto.Migration
+
+  def change do
+    execute("""
+      INSERT INTO pending_block_operations
+      SELECT b.hash, NOW(), NOW(), b.number
+      FROM blocks b
+              LEFT JOIN pending_block_operations pbo
+                        ON b.hash = pbo.block_hash
+      WHERE consensus IS TRUE
+        and b.hash IS NOT NULL
+        and pbo.block_hash IS NULL;
+    """)
+  end
+end
diff --git a/apps/explorer/test/support/data_case.ex b/apps/explorer/test/support/data_case.ex
index 9ee9bb4893d6..1fe4819b29d1 100644
--- a/apps/explorer/test/support/data_case.ex
+++ b/apps/explorer/test/support/data_case.ex
@@ -36,11 +36,13 @@ defmodule Explorer.DataCase do
     :ok = Ecto.Adapters.SQL.Sandbox.checkout(Explorer.Repo)
     :ok = Ecto.Adapters.SQL.Sandbox.checkout(Explorer.Repo.Account)
     :ok = Ecto.Adapters.SQL.Sandbox.checkout(Explorer.Repo.PolygonEdge)
+    :ok = Ecto.Adapters.SQL.Sandbox.checkout(Explorer.Repo.RSK)
 
     unless tags[:async] do
       Ecto.Adapters.SQL.Sandbox.mode(Explorer.Repo, {:shared, self()})
       Ecto.Adapters.SQL.Sandbox.mode(Explorer.Repo.Account, {:shared, self()})
       Ecto.Adapters.SQL.Sandbox.mode(Explorer.Repo.PolygonEdge, {:shared, self()})
+      Ecto.Adapters.SQL.Sandbox.mode(Explorer.Repo.RSK, {:shared, self()})
     end
 
     Supervisor.terminate_child(Explorer.Supervisor, Explorer.Chain.Cache.BlockNumber.child_id())
diff --git a/apps/explorer/test/test_helper.exs b/apps/explorer/test/test_helper.exs
index 75155d62bad8..210faa3cc62e 100644
--- a/apps/explorer/test/test_helper.exs
+++ b/apps/explorer/test/test_helper.exs
@@ -14,6 +14,7 @@ ExUnit.start()
 Ecto.Adapters.SQL.Sandbox.mode(Explorer.Repo, :auto)
 Ecto.Adapters.SQL.Sandbox.mode(Explorer.Repo.Account, :auto)
 Ecto.Adapters.SQL.Sandbox.mode(Explorer.Repo.PolygonEdge, :auto)
+Ecto.Adapters.SQL.Sandbox.mode(Explorer.Repo.RSK, :auto)
 
 Mox.defmock(Explorer.ExchangeRates.Source.TestSource, for: Explorer.ExchangeRates.Source)
 Mox.defmock(Explorer.Market.History.Source.Price.TestSource, for: Explorer.Market.History.Source.Price)
diff --git a/config/config_helper.exs b/config/config_helper.exs
index 709b6455b2cc..db9abab893f2 100644
--- a/config/config_helper.exs
+++ b/config/config_helper.exs
@@ -5,10 +5,12 @@ defmodule ConfigHelper do
   alias Indexer.Transform.Blocks
 
   def repos do
-    if System.get_env("CHAIN_TYPE") == "polygon_edge" do
-      [Explorer.Repo, Explorer.Repo.Account, Explorer.Repo.PolygonEdge]
-    else
-      [Explorer.Repo, Explorer.Repo.Account]
+    base_repos = [Explorer.Repo, Explorer.Repo.Account]
+
+    case System.get_env("CHAIN_TYPE") do
+      "polygon_edge" -> base_repos ++ [Explorer.Repo.PolygonEdge]
+      "rsk" -> base_repos ++ [Explorer.Repo.RSK]
+      _ -> base_repos
     end
   end
 
diff --git a/config/runtime/dev.exs b/config/runtime/dev.exs
index 891e2c204afc..567d38d79328 100644
--- a/config/runtime/dev.exs
+++ b/config/runtime/dev.exs
@@ -76,6 +76,13 @@ config :explorer, Explorer.Repo.PolygonEdge,
   url: System.get_env("DATABASE_URL"),
   pool_size: ConfigHelper.parse_integer_env_var("POLYGON_EDGE_POOL_SIZE", 10)
 
+# Configure Rootstock database
+config :explorer, Explorer.Repo.RSK,
+  database: database,
+  hostname: hostname,
+  url: System.get_env("DATABASE_URL"),
+  pool_size: pool_size
+
 variant = Variant.get()
 
 Code.require_file("#{variant}.exs", "apps/explorer/config/dev")
diff --git a/config/runtime/prod.exs b/config/runtime/prod.exs
index 15f3e7168357..cbbc1af52bb5 100644
--- a/config/runtime/prod.exs
+++ b/config/runtime/prod.exs
@@ -61,6 +61,12 @@ config :explorer, Explorer.Repo.PolygonEdge,
   pool_size: ConfigHelper.parse_integer_env_var("POLYGON_EDGE_POOL_SIZE", 50),
   ssl: ExplorerConfigHelper.ssl_enabled?()
 
+# Configures Rootstock database
+config :explorer, Explorer.Repo.RSK,
+  url: System.get_env("DATABASE_URL"),
+  pool_size: pool_size,
+  ssl: ExplorerConfigHelper.ssl_enabled?()
+
 variant = Variant.get()
 
 Code.require_file("#{variant}.exs", "apps/explorer/config/prod")

From d735945fae4604218b29e632dbbd17753cba8389 Mon Sep 17 00:00:00 2001
From: Viktor Baranov <baranov.viktor.27@gmail.com>
Date: Tue, 10 Oct 2023 23:44:12 +0300
Subject: [PATCH 484/909] Disable market history cataloger when exchange rates
 are disabled

---
 CHANGELOG.md                                              | 1 +
 apps/explorer/lib/explorer/market/history/cataloger.ex    | 8 ++++++--
 .../test/explorer/market/history/cataloger_test.exs       | 1 +
 config/runtime.exs                                        | 5 +++--
 4 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3b126b20ce56..0de07ac14439 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -14,6 +14,7 @@
 
 ### Fixes
 
+- [#8614](https://github.com/blockscout/blockscout/pull/8614) - Disable market history cataloger fetcher when exchange rates are disabled
 - [#8572](https://github.com/blockscout/blockscout/pull/8572) - Refactor docker-compose config
 - [#8552](https://github.com/blockscout/blockscout/pull/8552) - Add CHAIN_TYPE build arg to Dockerfile
 - [#8550](https://github.com/blockscout/blockscout/pull/8550) - Sanitize paging params
diff --git a/apps/explorer/lib/explorer/market/history/cataloger.ex b/apps/explorer/lib/explorer/market/history/cataloger.ex
index e37f1554c2cf..9e93b7a9ce5c 100644
--- a/apps/explorer/lib/explorer/market/history/cataloger.ex
+++ b/apps/explorer/lib/explorer/market/history/cataloger.ex
@@ -22,9 +22,13 @@ defmodule Explorer.Market.History.Cataloger do
 
   @impl GenServer
   def init(:ok) do
-    send(self(), {:fetch_price_history, 365})
+    if Application.get_env(:explorer, __MODULE__)[:enabled] do
+      send(self(), {:fetch_price_history, 365})
 
-    {:ok, %{}}
+      {:ok, %{}}
+    else
+      :ignore
+    end
   end
 
   @impl GenServer
diff --git a/apps/explorer/test/explorer/market/history/cataloger_test.exs b/apps/explorer/test/explorer/market/history/cataloger_test.exs
index f7faa058e35e..7ffe2de63f30 100644
--- a/apps/explorer/test/explorer/market/history/cataloger_test.exs
+++ b/apps/explorer/test/explorer/market/history/cataloger_test.exs
@@ -12,6 +12,7 @@ defmodule Explorer.Market.History.CatalogerTest do
 
   setup do
     Application.put_env(:explorer, Cataloger, source: TestSource)
+    Application.put_env(:explorer, Cataloger, enabled: true)
     :ok
   end
 
diff --git a/config/runtime.exs b/config/runtime.exs
index 17ab3d507fac..f709fce6ed50 100644
--- a/config/runtime.exs
+++ b/config/runtime.exs
@@ -178,6 +178,7 @@ config :ethereum_jsonrpc, EthereumJSONRPC.RequestCoordinator,
 
 disable_indexer? = ConfigHelper.parse_bool_env_var("DISABLE_INDEXER")
 disable_webapp? = ConfigHelper.parse_bool_env_var("DISABLE_WEBAPP")
+disable_exchange_rates? = ConfigHelper.parse_bool_env_var("DISABLE_EXCHANGE_RATES")
 
 checksum_function = System.get_env("CHECKSUM_FUNCTION")
 exchange_rates_coin = System.get_env("EXCHANGE_RATES_COIN")
@@ -273,7 +274,7 @@ config :explorer, Explorer.Counters.AddressTokenTransfersCounter,
 
 config :explorer, Explorer.ExchangeRates,
   store: :ets,
-  enabled: !ConfigHelper.parse_bool_env_var("DISABLE_EXCHANGE_RATES"),
+  enabled: !disable_exchange_rates?,
   fetch_btc_value: ConfigHelper.parse_bool_env_var("EXCHANGE_RATES_FETCH_BTC_VALUE")
 
 config :explorer, Explorer.ExchangeRates.Source,
@@ -296,7 +297,7 @@ config :explorer, Explorer.ExchangeRates.TokenExchangeRates,
   refetch_interval: ConfigHelper.parse_time_env_var("TOKEN_EXCHANGE_RATE_REFETCH_INTERVAL", "1h"),
   max_batch_size: ConfigHelper.parse_integer_env_var("TOKEN_EXCHANGE_RATE_MAX_BATCH_SIZE", 150)
 
-config :explorer, Explorer.Market.History.Cataloger, enabled: !disable_indexer?
+config :explorer, Explorer.Market.History.Cataloger, enabled: !disable_indexer? && !disable_exchange_rates?
 
 config :explorer, Explorer.Chain.Transaction.History.Historian,
   enabled: ConfigHelper.parse_bool_env_var("TXS_STATS_ENABLED", "true"),

From 2e0acd54711e8975bd8217dc845f0e3d8c9aa9ae Mon Sep 17 00:00:00 2001
From: Viktor Baranov <baranov.viktor.27@gmail.com>
Date: Tue, 10 Oct 2023 22:37:42 +0300
Subject: [PATCH 485/909] Refactor parsing of FIRST_BLOCK, LAST_BLOCK,
 TRACE_FIRST_BLOCK, TRACE_LAST_BLOCK env variables

---
 CHANGELOG.md                                  |  1 +
 apps/ethereum_jsonrpc/lib/ethereum_jsonrpc.ex | 36 ++++++++++++-------
 apps/explorer/lib/explorer/chain.ex           | 35 +++++++++---------
 .../explorer/chain/import/runner/blocks.ex    | 21 +++++------
 .../import/runner/internal_transactions.ex    |  8 +++--
 apps/explorer/test/explorer/chain_test.exs    |  8 ++---
 .../block/catchup/missing_ranges_collector.ex | 33 ++++++++---------
 .../lib/indexer/fetcher/coin_balance.ex       |  5 ++-
 .../indexer/fetcher/internal_transaction.ex   |  2 +-
 .../indexer/block/catchup/fetcher_test.exs    |  2 +-
 .../catchup/missing_ranges_collector_test.exs |  4 +--
 config/config_helper.exs                      | 11 ++++++
 config/runtime.exs                            |  8 ++---
 13 files changed, 102 insertions(+), 72 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0de07ac14439..fd15b1185b35 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -15,6 +15,7 @@
 ### Fixes
 
 - [#8614](https://github.com/blockscout/blockscout/pull/8614) - Disable market history cataloger fetcher when exchange rates are disabled
+- [#8613](https://github.com/blockscout/blockscout/pull/8613) - Refactor parsing of FIRST_BLOCK, LAST_BLOCK, TRACE_FIRST_BLOCK, TRACE_LAST_BLOCK env variables
 - [#8572](https://github.com/blockscout/blockscout/pull/8572) - Refactor docker-compose config
 - [#8552](https://github.com/blockscout/blockscout/pull/8552) - Add CHAIN_TYPE build arg to Dockerfile
 - [#8550](https://github.com/blockscout/blockscout/pull/8550) - Sanitize paging params
diff --git a/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc.ex b/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc.ex
index 6695c41b8618..bc9f7da55972 100644
--- a/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc.ex
+++ b/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc.ex
@@ -198,7 +198,13 @@ defmodule EthereumJSONRPC do
         params_list
       end
 
-    id_to_params = id_to_params(filtered_params)
+    filtered_params_in_range =
+      filtered_params
+      |> Enum.filter(fn
+        %{block_quantity: block_quantity} -> block_number_in_range(block_quantity)
+      end)
+
+    id_to_params = id_to_params(filtered_params_in_range)
 
     with {:ok, responses} <-
            id_to_params
@@ -348,11 +354,12 @@ defmodule EthereumJSONRPC do
   end
 
   def block_numbers_in_range(block_numbers) do
-    min_block = first_block_to_fetch(:trace_first_block)
+    min_block = Application.get_env(:indexer, :trace_first_block)
+    max_block = Application.get_env(:indexer, :trace_last_block)
 
     block_numbers
     |> Enum.filter(fn block_number ->
-      block_number >= min_block
+      block_number >= min_block && if max_block, do: block_number <= max_block, else: true
     end)
   end
 
@@ -448,6 +455,20 @@ defmodule EthereumJSONRPC do
     end
   end
 
+  @spec block_number_in_range(quantity) :: boolean()
+  defp block_number_in_range(block_quantity) do
+    min_block = Application.get_env(:indexer, :trace_first_block)
+    max_block = Application.get_env(:indexer, :trace_last_block)
+    block_number = quantity_to_integer(block_quantity)
+
+    if !block_number ||
+         (block_number && block_number >= min_block && if(max_block, do: block_number <= max_block, else: true)) do
+      true
+    else
+      false
+    end
+  end
+
   defp maybe_replace_url(url, _replace_url, EthereumJSONRPC.HTTP), do: url
   defp maybe_replace_url(url, replace_url, _), do: EndpointAvailabilityObserver.maybe_replace_url(url, replace_url)
 
@@ -562,13 +583,4 @@ defmodule EthereumJSONRPC do
 
   defp chunk_requests(requests, nil), do: requests
   defp chunk_requests(requests, chunk_size), do: Enum.chunk_every(requests, chunk_size)
-
-  def first_block_to_fetch(config) do
-    string_value = Application.get_env(:indexer, config)
-
-    case Integer.parse(string_value) do
-      {integer, ""} -> integer
-      _ -> 0
-    end
-  end
 end
diff --git a/apps/explorer/lib/explorer/chain.ex b/apps/explorer/lib/explorer/chain.ex
index e7e493c80386..7e08b59792f3 100644
--- a/apps/explorer/lib/explorer/chain.ex
+++ b/apps/explorer/lib/explorer/chain.ex
@@ -1151,7 +1151,7 @@ defmodule Explorer.Chain do
            select_repo(options).aggregate(Transaction, :min, :block_number) do
       min_block_number =
         min_block_number
-        |> Decimal.max(EthereumJSONRPC.first_block_to_fetch(:trace_first_block))
+        |> Decimal.max(Application.get_env(:indexer, :trace_first_block))
         |> Decimal.to_integer()
 
       query =
@@ -1778,15 +1778,18 @@ defmodule Explorer.Chain do
     if Application.get_env(:indexer, Indexer.Supervisor)[:enabled] do
       %{min: min_saved_block_number, max: max_saved_block_number} = BlockNumber.get_all()
 
-      min_blockchain_block_number = min_block_number_from_config(:first_block)
+      min_blockchain_block_number = Application.get_env(:indexer, :first_block)
 
       case {min_saved_block_number, max_saved_block_number} do
         {0, 0} ->
           Decimal.new(0)
 
         _ ->
-          BlockCache.estimated_count()
-          |> Decimal.div(max_saved_block_number - min_blockchain_block_number + 1)
+          divisor = max_saved_block_number - min_blockchain_block_number + 1
+
+          ratio = get_ratio(BlockCache.estimated_count(), divisor)
+
+          ratio
           |> (&if(
                 greater_or_equal_0_99(&1) &&
                   min_saved_block_number <= min_blockchain_block_number,
@@ -1807,7 +1810,7 @@ defmodule Explorer.Chain do
       %{max: max_saved_block_number} = BlockNumber.get_all()
       pbo_count = PendingBlockOperationCache.estimated_count()
 
-      min_blockchain_trace_block_number = min_block_number_from_config(:trace_first_block)
+      min_blockchain_trace_block_number = Application.get_env(:indexer, :trace_first_block)
 
       case max_saved_block_number do
         0 ->
@@ -1815,10 +1818,11 @@ defmodule Explorer.Chain do
 
         _ ->
           full_blocks_range = max_saved_block_number - min_blockchain_trace_block_number + 1
-          processed_int_txs_for_blocks_count = full_blocks_range - pbo_count
+          processed_int_txs_for_blocks_count = max(0, full_blocks_range - pbo_count)
 
-          processed_int_txs_for_blocks_count
-          |> Decimal.div(full_blocks_range)
+          ratio = get_ratio(processed_int_txs_for_blocks_count, full_blocks_range)
+
+          ratio
           |> (&if(
                 greater_or_equal_0_99(&1),
                 do: Decimal.new(1),
@@ -1831,20 +1835,19 @@ defmodule Explorer.Chain do
     end
   end
 
+  @spec get_ratio(non_neg_integer(), non_neg_integer()) :: Decimal.t()
+  defp get_ratio(dividend, divisor) do
+    if divisor > 0,
+      do: dividend |> Decimal.div(divisor),
+      else: Decimal.new(1)
+  end
+
   @spec greater_or_equal_0_99(Decimal.t()) :: boolean()
   defp greater_or_equal_0_99(value) do
     Decimal.compare(value, Decimal.from_float(0.99)) == :gt ||
       Decimal.compare(value, Decimal.from_float(0.99)) == :eq
   end
 
-  @spec min_block_number_from_config(atom()) :: integer()
-  defp min_block_number_from_config(block_type) do
-    case Integer.parse(Application.get_env(:indexer, block_type)) do
-      {block_number, _} -> block_number
-      _ -> 0
-    end
-  end
-
   @spec format_indexed_ratio(Decimal.t()) :: Decimal.t()
   defp format_indexed_ratio(raw_ratio) do
     raw_ratio
diff --git a/apps/explorer/lib/explorer/chain/import/runner/blocks.ex b/apps/explorer/lib/explorer/chain/import/runner/blocks.ex
index 57fc87602367..b92a466b9efe 100644
--- a/apps/explorer/lib/explorer/chain/import/runner/blocks.ex
+++ b/apps/explorer/lib/explorer/chain/import/runner/blocks.ex
@@ -60,11 +60,15 @@ defmodule Explorer.Chain.Import.Runner.Blocks do
 
     hashes = Enum.map(changes_list, & &1.hash)
 
-    minimal_block_height = trace_minimal_block_height()
+    minimal_block_height = Application.get_env(:indexer, :trace_first_block)
+    maximal_block_height = Application.get_env(:indexer, :trace_last_block)
 
     items_for_pending_ops =
       changes_list
-      |> filter_by_min_height(&(&1.number >= minimal_block_height))
+      |> filter_by_height_range(
+        &(&1.number >= minimal_block_height &&
+            if(maximal_block_height, do: &1.number <= maximal_block_height, else: true))
+      )
       |> Enum.filter(& &1.consensus)
       |> Enum.map(&{&1.number, &1.hash})
 
@@ -74,7 +78,7 @@ defmodule Explorer.Chain.Import.Runner.Blocks do
     run_func = fn repo ->
       {:ok, nonconsensus_items} = lose_consensus(repo, hashes, consensus_block_numbers, changes_list, insert_options)
 
-      {:ok, filter_by_min_height(nonconsensus_items, fn {number, _hash} -> number >= minimal_block_height end)}
+      {:ok, filter_by_height_range(nonconsensus_items, fn {number, _hash} -> number >= minimal_block_height end)}
     end
 
     multi
@@ -414,10 +418,6 @@ defmodule Explorer.Chain.Import.Runner.Blocks do
     lose_consensus(ExplorerRepo, [], block_numbers, [], opts)
   end
 
-  defp trace_minimal_block_height do
-    EthereumJSONRPC.first_block_to_fetch(:trace_first_block)
-  end
-
   defp new_pending_operations(repo, nonconsensus_items, items, %{
          timeout: timeout,
          timestamps: timestamps
@@ -893,10 +893,11 @@ defmodule Explorer.Chain.Import.Runner.Blocks do
     where(invalid_neighbors_query, [block], block.consensus)
   end
 
-  defp filter_by_min_height(blocks, filter_func) do
-    minimal_block_height = trace_minimal_block_height()
+  defp filter_by_height_range(blocks, filter_func) do
+    minimal_block_height = Application.get_env(:indexer, :trace_first_block)
+    maximal_block_height = Application.get_env(:indexer, :trace_last_block)
 
-    if minimal_block_height > 0 do
+    if minimal_block_height > 0 || maximal_block_height do
       Enum.filter(blocks, &filter_func.(&1))
     else
       blocks
diff --git a/apps/explorer/lib/explorer/chain/import/runner/internal_transactions.ex b/apps/explorer/lib/explorer/chain/import/runner/internal_transactions.ex
index 5ca6ef92c67a..0763d86ebdf2 100644
--- a/apps/explorer/lib/explorer/chain/import/runner/internal_transactions.ex
+++ b/apps/explorer/lib/explorer/chain/import/runner/internal_transactions.ex
@@ -15,7 +15,7 @@ defmodule Explorer.Chain.Import.Runner.InternalTransactions do
   alias Explorer.Repo, as: ExplorerRepo
   alias Explorer.Utility.MissingRangesManipulator
 
-  import Ecto.Query, only: [from: 2]
+  import Ecto.Query, only: [from: 2, where: 3]
 
   @behaviour Runner
 
@@ -691,7 +691,8 @@ defmodule Explorer.Chain.Import.Runner.InternalTransactions do
   end
 
   defp remove_consensus_of_invalid_blocks(repo, invalid_block_numbers) do
-    minimal_block = EthereumJSONRPC.first_block_to_fetch(:trace_first_block)
+    minimal_block = Application.get_env(:indexer, :trace_first_block)
+    maximal_block = Application.get_env(:indexer, :trace_last_block)
 
     if Enum.count(invalid_block_numbers) > 0 do
       update_query =
@@ -704,6 +705,9 @@ defmodule Explorer.Chain.Import.Runner.InternalTransactions do
           update: [set: [consensus: false]]
         )
 
+      update_query =
+        if maximal_block, do: update_query |> where([block], block.number < ^maximal_block), else: update_query
+
       try do
         {_num, result} = repo.update_all(update_query, [])
 
diff --git a/apps/explorer/test/explorer/chain_test.exs b/apps/explorer/test/explorer/chain_test.exs
index 83821fea4aed..d5756d0688b8 100644
--- a/apps/explorer/test/explorer/chain_test.exs
+++ b/apps/explorer/test/explorer/chain_test.exs
@@ -1478,7 +1478,7 @@ defmodule Explorer.ChainTest do
       Supervisor.restart_child(Explorer.Supervisor, Explorer.Chain.Cache.Block.child_id())
 
       on_exit(fn ->
-        Application.put_env(:indexer, :first_block, "")
+        Application.put_env(:indexer, :first_block, 0)
       end)
     end
 
@@ -1508,7 +1508,7 @@ defmodule Explorer.ChainTest do
     end
 
     test "returns 1.0 if fully indexed blocks starting from given FIRST_BLOCK" do
-      Application.put_env(:indexer, :first_block, "5")
+      Application.put_env(:indexer, :first_block, 5)
 
       for index <- 5..9 do
         insert(:block, number: index, consensus: true)
@@ -1527,7 +1527,7 @@ defmodule Explorer.ChainTest do
       Supervisor.restart_child(Explorer.Supervisor, PendingBlockOperationCache.child_id())
 
       on_exit(fn ->
-        Application.put_env(:indexer, :trace_first_block, "")
+        Application.put_env(:indexer, :trace_first_block, 0)
         Supervisor.terminate_child(Explorer.Supervisor, PendingBlockOperationCache.child_id())
       end)
     end
@@ -1559,7 +1559,7 @@ defmodule Explorer.ChainTest do
     end
 
     test "returns 1.0 if fully indexed blocks with internal transactions starting from given TRACE_FIRST_BLOCK" do
-      Application.put_env(:indexer, :trace_first_block, "5")
+      Application.put_env(:indexer, :trace_first_block, 5)
 
       for index <- 5..9 do
         insert(:block, number: index)
diff --git a/apps/indexer/lib/indexer/block/catchup/missing_ranges_collector.ex b/apps/indexer/lib/indexer/block/catchup/missing_ranges_collector.ex
index 1fc3788404f0..31d067217d8d 100644
--- a/apps/indexer/lib/indexer/block/catchup/missing_ranges_collector.ex
+++ b/apps/indexer/lib/indexer/block/catchup/missing_ranges_collector.ex
@@ -182,27 +182,19 @@ defmodule Indexer.Block.Catchup.MissingRangesCollector do
   end
 
   defp first_block do
-    string_value = Application.get_env(:indexer, :first_block)
+    first_block_from_config = Application.get_env(:indexer, :first_block)
 
-    case Integer.parse(string_value) do
-      {integer, ""} ->
-        integer
+    min_missing_block_number =
+      "min_missing_block_number"
+      |> Chain.get_last_fetched_counter()
+      |> Decimal.to_integer()
 
-      _ ->
-        min_missing_block_number =
-          "min_missing_block_number"
-          |> Chain.get_last_fetched_counter()
-          |> Decimal.to_integer()
-
-        min_missing_block_number
-    end
+    max(first_block_from_config, min_missing_block_number)
   end
 
   defp last_block do
-    case Integer.parse(Application.get_env(:indexer, :last_block)) do
-      {block, ""} -> block + 1
-      _ -> fetch_max_block_number()
-    end
+    last_block = Application.get_env(:indexer, :last_block)
+    if last_block, do: last_block + 1, else: fetch_max_block_number()
   end
 
   defp fetch_max_block_number do
@@ -221,9 +213,12 @@ defmodule Indexer.Block.Catchup.MissingRangesCollector do
   end
 
   defp continue_future_updating?(max_fetched_block_number) do
-    case Integer.parse(Application.get_env(:indexer, :last_block)) do
-      {block, ""} -> max_fetched_block_number < block
-      _ -> true
+    last_block = Application.get_env(:indexer, :last_block)
+
+    if last_block do
+      max_fetched_block_number < last_block
+    else
+      true
     end
   end
 
diff --git a/apps/indexer/lib/indexer/fetcher/coin_balance.ex b/apps/indexer/lib/indexer/fetcher/coin_balance.ex
index 26d5d399624a..18de40eaaf16 100644
--- a/apps/indexer/lib/indexer/fetcher/coin_balance.ex
+++ b/apps/indexer/lib/indexer/fetcher/coin_balance.ex
@@ -83,9 +83,12 @@ defmodule Indexer.Fetcher.CoinBalance do
     # `{address, block}`, so take unique params only
     unique_entries = Enum.uniq(entries)
 
+    min_block = Application.get_env(:indexer, :trace_first_block)
+    max_block = Application.get_env(:indexer, :trace_last_block)
+
     unique_filtered_entries =
       Enum.filter(unique_entries, fn {_hash, block_number} ->
-        block_number >= EthereumJSONRPC.first_block_to_fetch(:trace_first_block)
+        block_number >= min_block && if max_block, do: block_number <= max_block, else: true
       end)
 
     unique_entry_count = Enum.count(unique_filtered_entries)
diff --git a/apps/indexer/lib/indexer/fetcher/internal_transaction.ex b/apps/indexer/lib/indexer/fetcher/internal_transaction.ex
index 3f3afcf07f52..7c43589c1da8 100644
--- a/apps/indexer/lib/indexer/fetcher/internal_transaction.ex
+++ b/apps/indexer/lib/indexer/fetcher/internal_transaction.ex
@@ -158,7 +158,7 @@ defmodule Indexer.Fetcher.InternalTransaction do
   end
 
   defp drop_genesis(block_numbers, json_rpc_named_arguments) do
-    first_block = EthereumJSONRPC.first_block_to_fetch(:trace_first_block)
+    first_block = Application.get_env(:indexer, :trace_first_block)
 
     if first_block in block_numbers do
       case EthereumJSONRPC.fetch_blocks_by_numbers([first_block], json_rpc_named_arguments) do
diff --git a/apps/indexer/test/indexer/block/catchup/fetcher_test.exs b/apps/indexer/test/indexer/block/catchup/fetcher_test.exs
index 68324aa7cf47..93f687907ca0 100644
--- a/apps/indexer/test/indexer/block/catchup/fetcher_test.exs
+++ b/apps/indexer/test/indexer/block/catchup/fetcher_test.exs
@@ -38,7 +38,7 @@ defmodule Indexer.Block.Catchup.FetcherTest do
   describe "import/1" do
     setup do
       configuration = Application.get_env(:indexer, :last_block)
-      Application.put_env(:indexer, :last_block, "0")
+      Application.put_env(:indexer, :last_block, 0)
 
       on_exit(fn ->
         Application.put_env(:indexer, :last_block, configuration)
diff --git a/apps/indexer/test/indexer/block/catchup/missing_ranges_collector_test.exs b/apps/indexer/test/indexer/block/catchup/missing_ranges_collector_test.exs
index d099be7063fc..dd36cd1e9ec9 100644
--- a/apps/indexer/test/indexer/block/catchup/missing_ranges_collector_test.exs
+++ b/apps/indexer/test/indexer/block/catchup/missing_ranges_collector_test.exs
@@ -36,8 +36,8 @@ defmodule Indexer.Block.Catchup.MissingRangesCollectorTest do
     end
 
     test "FIRST_BLOCK and LAST_BLOCK envs" do
-      Application.put_env(:indexer, :first_block, "100")
-      Application.put_env(:indexer, :last_block, "200")
+      Application.put_env(:indexer, :first_block, 100)
+      Application.put_env(:indexer, :last_block, 200)
 
       insert(:missing_block_range, from_number: 250, to_number: 220)
       insert(:missing_block_range, from_number: 220, to_number: 190)
diff --git a/config/config_helper.exs b/config/config_helper.exs
index 709b6455b2cc..6e7a8e577b16 100644
--- a/config/config_helper.exs
+++ b/config/config_helper.exs
@@ -45,6 +45,17 @@ defmodule ConfigHelper do
     end
   end
 
+  @spec parse_integer_or_nil_env_var(String.t()) :: non_neg_integer() | nil
+  def parse_integer_or_nil_env_var(env_var) do
+    env_var
+    |> System.get_env("")
+    |> Integer.parse()
+    |> case do
+      {integer, _} -> integer
+      _ -> nil
+    end
+  end
+
   @spec parse_time_env_var(String.t(), String.t() | nil) :: non_neg_integer()
   def parse_time_env_var(env_var, default_value) do
     case env_var |> safe_get_env(default_value) |> String.downcase() |> Integer.parse() do
diff --git a/config/runtime.exs b/config/runtime.exs
index f709fce6ed50..1a8eae02c9f2 100644
--- a/config/runtime.exs
+++ b/config/runtime.exs
@@ -430,10 +430,10 @@ config :indexer,
   block_transformer: ConfigHelper.block_transformer(),
   metadata_updater_milliseconds_interval: ConfigHelper.parse_time_env_var("TOKEN_METADATA_UPDATE_INTERVAL", "48h"),
   block_ranges: System.get_env("BLOCK_RANGES"),
-  first_block: System.get_env("FIRST_BLOCK") || "",
-  last_block: System.get_env("LAST_BLOCK") || "",
-  trace_first_block: System.get_env("TRACE_FIRST_BLOCK") || "",
-  trace_last_block: System.get_env("TRACE_LAST_BLOCK") || "",
+  first_block: ConfigHelper.parse_integer_env_var("FIRST_BLOCK", 0),
+  last_block: ConfigHelper.parse_integer_or_nil_env_var("LAST_BLOCK"),
+  trace_first_block: ConfigHelper.parse_integer_env_var("TRACE_FIRST_BLOCK", 0),
+  trace_last_block: ConfigHelper.parse_integer_or_nil_env_var("TRACE_LAST_BLOCK"),
   fetch_rewards_way: System.get_env("FETCH_REWARDS_WAY", "trace_block"),
   memory_limit: ConfigHelper.indexer_memory_limit(),
   receipts_batch_size: ConfigHelper.parse_integer_env_var("INDEXER_RECEIPTS_BATCH_SIZE", 250),

From dbca83177c44dd6a440db26e5babb9a2cca46eb1 Mon Sep 17 00:00:00 2001
From: Pavel Pustovalov <pustovalov.pavel@gmail.com>
Date: Fri, 13 Oct 2023 01:42:11 +0200
Subject: [PATCH 486/909] Fix css-loader

---
 CHANGELOG.md                                  | 1 +
 apps/block_scout_web/assets/webpack.config.js | 5 ++++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0de07ac14439..369e57cad44d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -21,6 +21,7 @@
 - [#8515](https://github.com/blockscout/blockscout/pull/8515) - Fix `:error.types/0 is undefined` warning
 - [#7959](https://github.com/blockscout/blockscout/pull/7959) - Fix empty batch transfers handling
 - [#8513](https://github.com/blockscout/blockscout/pull/8513) - Don't override transaction status
+- [#8620](https://github.com/blockscout/blockscout/pull/8620) - Fix the display of icons
 
 ### Chore
 
diff --git a/apps/block_scout_web/assets/webpack.config.js b/apps/block_scout_web/assets/webpack.config.js
index 3978ca45f1a1..3b90aeec8e33 100644
--- a/apps/block_scout_web/assets/webpack.config.js
+++ b/apps/block_scout_web/assets/webpack.config.js
@@ -108,7 +108,10 @@ const appJs =
                 esModule: false,
               },
             }, {
-              loader: 'css-loader'
+              loader: 'css-loader',
+              options: {
+                esModule: false,
+              },
             }, {
               loader: 'postcss-loader'
             }, {

From 0371d2acd6cb8ce0c4bffa6f4c83d3ab61928bf0 Mon Sep 17 00:00:00 2001
From: Viktor Baranov <baranov.viktor.27@gmail.com>
Date: Fri, 13 Oct 2023 17:28:51 +0300
Subject: [PATCH 487/909] Fix NEXT_PUBLIC_API_SPEC_URL in common-frontend.env

---
 docker-compose/envs/common-frontend.env | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker-compose/envs/common-frontend.env b/docker-compose/envs/common-frontend.env
index c3fac7dcd6a7..a3dcded7638c 100644
--- a/docker-compose/envs/common-frontend.env
+++ b/docker-compose/envs/common-frontend.env
@@ -14,4 +14,4 @@ NEXT_PUBLIC_HOMEPAGE_CHARTS=['daily_txs']
 NEXT_PUBLIC_VISUALIZE_API_HOST=http://localhost:8081
 NEXT_PUBLIC_IS_TESTNET=true
 NEXT_PUBLIC_API_WEBSOCKET_PROTOCOL=ws
-NEXT_PUBLIC_API_SPEC_URL: https://raw.githubusercontent.com/blockscout/blockscout-api-v2-swagger/main/swagger.yaml
\ No newline at end of file
+NEXT_PUBLIC_API_SPEC_URL=https://raw.githubusercontent.com/blockscout/blockscout-api-v2-swagger/main/swagger.yaml
\ No newline at end of file

From e485c1d7d959eca596b707619e79f213b6b9a371 Mon Sep 17 00:00:00 2001
From: Viktor Baranov <baranov.viktor.27@gmail.com>
Date: Tue, 3 Oct 2023 19:45:35 +0300
Subject: [PATCH 488/909] DefiLlama TVL source

---
 CHANGELOG.md                                  |  1 +
 .../controllers/api/v2/stats_controller.ex    |  2 +-
 .../chain/market_history_chart_controller.ex  |  2 +-
 .../exchange_rates/source/defillama.ex        | 46 +++++++++
 .../lib/explorer/market/history/cataloger.ex  | 95 ++++++++++++++++---
 .../lib/explorer/market/history/source/tvl.ex | 18 ++++
 .../market/history/source/tvl/defillama.ex    | 49 ++++++++++
 .../lib/explorer/market/market_history.ex     |  5 +-
 ...093553_add_tvl_to_market_history_table.exs |  9 ++
 .../market/history/cataloger_test.exs         | 91 ++++++++++++++----
 config/config_helper.exs                      | 10 +-
 config/runtime.exs                            |  5 +-
 cspell.json                                   |  1 +
 docker-compose/envs/common-blockscout.env     |  1 +
 14 files changed, 299 insertions(+), 36 deletions(-)
 create mode 100644 apps/explorer/lib/explorer/exchange_rates/source/defillama.ex
 create mode 100644 apps/explorer/lib/explorer/market/history/source/tvl.ex
 create mode 100644 apps/explorer/lib/explorer/market/history/source/tvl/defillama.ex
 create mode 100644 apps/explorer/priv/repo/migrations/20231003093553_add_tvl_to_market_history_table.exs

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 369e57cad44d..6671ea021c5e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,7 @@
 ### Features
 
 - [#8472](https://github.com/blockscout/blockscout/pull/8472) - Integrate `/api/v2/bytecodes/sources:search-all` of `eth_bytecode_db`
+- [#8589](https://github.com/blockscout/blockscout/pull/8589) - DefiLlama TVL source
 - [#8544](https://github.com/blockscout/blockscout/pull/8544) - Fix `nil` `"structLogs"`
 - [#8561](https://github.com/blockscout/blockscout/pull/8561), [#8564](https://github.com/blockscout/blockscout/pull/8564) - Get historical market cap data from CoinGecko
 - [#8386](https://github.com/blockscout/blockscout/pull/8386) - Add `owner_address_hash` to the `token_instances`
diff --git a/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/stats_controller.ex b/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/stats_controller.ex
index 098b05f7e9c8..80408045cfff 100644
--- a/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/stats_controller.ex
+++ b/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/stats_controller.ex
@@ -112,7 +112,7 @@ defmodule BlockScoutWeb.API.V2.StatsController do
         data ->
           data
       end
-      |> Enum.map(fn day -> Map.take(day, [:closing_price, :market_cap, :date]) end)
+      |> Enum.map(fn day -> Map.take(day, [:closing_price, :market_cap, :tvl, :date]) end)
 
     market_history_data =
       MarketHistoryChartController.encode_market_history_data(price_history_data, current_total_supply)
diff --git a/apps/block_scout_web/lib/block_scout_web/controllers/chain/market_history_chart_controller.ex b/apps/block_scout_web/lib/block_scout_web/controllers/chain/market_history_chart_controller.ex
index a9816adcbd04..194d865e2252 100644
--- a/apps/block_scout_web/lib/block_scout_web/controllers/chain/market_history_chart_controller.ex
+++ b/apps/block_scout_web/lib/block_scout_web/controllers/chain/market_history_chart_controller.ex
@@ -59,7 +59,7 @@ defmodule BlockScoutWeb.Chain.MarketHistoryChartController do
 
       day
       |> Map.put(:market_cap, market_cap)
-      |> Map.take([:closing_price, :market_cap, :date])
+      |> Map.take([:closing_price, :market_cap, :tvl, :date])
     end)
     |> Jason.encode()
     |> case do
diff --git a/apps/explorer/lib/explorer/exchange_rates/source/defillama.ex b/apps/explorer/lib/explorer/exchange_rates/source/defillama.ex
new file mode 100644
index 000000000000..e7cae25e0292
--- /dev/null
+++ b/apps/explorer/lib/explorer/exchange_rates/source/defillama.ex
@@ -0,0 +1,46 @@
+defmodule Explorer.ExchangeRates.Source.DefiLlama do
+  @moduledoc """
+  Adapter for fetching exchange rates from https://defillama.com/
+
+  """
+
+  alias Explorer.ExchangeRates.Source
+
+  @behaviour Source
+
+  @impl Source
+  def format_data(_), do: []
+
+  @spec history_url(non_neg_integer()) :: String.t()
+  def history_url(_previous_days) do
+    "#{base_url()}/historicalChainTvl"
+  end
+
+  @impl Source
+  def source_url do
+    ""
+  end
+
+  @impl Source
+  def source_url(_) do
+    ""
+  end
+
+  @impl Source
+  def headers do
+    []
+  end
+
+  defp base_url do
+    base_free_url()
+  end
+
+  defp base_free_url do
+    config(:base_url) || "https://api.llama.fi/v2"
+  end
+
+  @spec config(atom()) :: term
+  defp config(key) do
+    Application.get_env(:explorer, __MODULE__, [])[key]
+  end
+end
diff --git a/apps/explorer/lib/explorer/market/history/cataloger.ex b/apps/explorer/lib/explorer/market/history/cataloger.ex
index 9e93b7a9ce5c..f3c73de23d57 100644
--- a/apps/explorer/lib/explorer/market/history/cataloger.ex
+++ b/apps/explorer/lib/explorer/market/history/cataloger.ex
@@ -19,6 +19,7 @@ defmodule Explorer.Market.History.Cataloger do
 
   @price_failed_attempts 10
   @market_cap_failed_attempts 3
+  @tvl_failed_attempts 3
 
   @impl GenServer
   def init(:ok) do
@@ -38,32 +39,61 @@ defmodule Explorer.Market.History.Cataloger do
     {:noreply, state}
   end
 
+  @impl GenServer
+  # Record fetch successful.
+  def handle_info({_ref, {:price_history, {_, _, {:ok, records}}}}, state) do
+    Process.send(self(), {:fetch_market_cap_history, 365}, [])
+    state = state |> Map.put_new(:price_records, records)
+
+    {:noreply, state}
+  end
+
   @impl GenServer
   def handle_info({:fetch_market_cap_history, day_count}, state) do
     fetch_market_cap_history(day_count)
+    state = state |> Map.put_new(:price_records, [])
 
     {:noreply, state}
   end
 
   @impl GenServer
   # Record fetch successful.
-  def handle_info({_ref, {:price_history, {_, _, {:ok, records}}}}, state) do
-    Process.send(self(), {:fetch_market_cap_history, 365}, [])
-    state = state |> Map.put_new(:price_records, records)
+  def handle_info({_ref, {:market_cap_history, {_, _, {:ok, nil}}}}, state) do
+    Process.send(self(), {:fetch_tvl_history, 365}, [])
+    state = state |> Map.put_new(:market_cap_records, [])
 
-    {:noreply, state |> Map.put_new(:price_records, state)}
+    {:noreply, state}
   end
 
   @impl GenServer
   # Record fetch successful.
-  def handle_info({_ref, {:market_cap_history, {_, _, {:ok, nil}}}}, state) do
-    market_cap_history(state.price_records, state)
+  def handle_info({_ref, {:market_cap_history, {_, _, {:ok, market_cap_records}}}}, state) do
+    Process.send(self(), {:fetch_tvl_history, 365}, [])
+    state = state |> Map.put_new(:market_cap_records, market_cap_records)
+
+    {:noreply, state}
+  end
+
+  @impl GenServer
+  def handle_info({:fetch_tvl_history, day_count}, state) do
+    fetch_tvl_history(day_count)
+
+    {:noreply, state}
   end
 
   @impl GenServer
   # Record fetch successful.
-  def handle_info({_ref, {:market_cap_history, {_, _, {:ok, market_cap_records}}}}, state) do
-    records = compile_records(state.price_records, market_cap_records)
+  def handle_info({_ref, {:tvl_history, {_, _, {:ok, nil}}}}, state) do
+    state = state |> Map.put_new(:tvl_records, [])
+    records = compile_records(state)
+    market_cap_history(records, state)
+  end
+
+  @impl GenServer
+  # Record fetch successful.
+  def handle_info({_ref, {:tvl_history, {_, _, {:ok, tvl_records}}}}, state) do
+    state = state |> Map.put_new(:tvl_records, tvl_records)
+    records = compile_records(state)
     market_cap_history(records, state)
   end
 
@@ -87,6 +117,16 @@ defmodule Explorer.Market.History.Cataloger do
     {:noreply, state}
   end
 
+  # Failed to get records. Try again.
+  @impl GenServer
+  def handle_info({_ref, {:tvl_history, {day_count, failed_attempts, :error}}}, state) do
+    Logger.warn(fn -> "Failed to fetch market cap history. Trying again." end)
+
+    fetch_tvl_history(day_count, failed_attempts + 1)
+
+    {:noreply, state}
+  end
+
   # Callback that a monitored process has shutdown.
   @impl GenServer
   def handle_info({:DOWN, _, :process, _, _}, state) do
@@ -135,6 +175,15 @@ defmodule Explorer.Market.History.Cataloger do
     )
   end
 
+  @spec source_tvl() :: module()
+  defp source_tvl do
+    config_or_default(
+      :tvl_source,
+      Explorer.ExchangeRates.Source,
+      Explorer.Market.History.Source.TVL.DefiLlama
+    )
+  end
+
   @spec fetch_price_history(non_neg_integer(), non_neg_integer()) :: Task.t()
   defp fetch_price_history(day_count, failed_attempts \\ 0) do
     Task.Supervisor.async_nolink(Explorer.MarketTaskSupervisor, fn ->
@@ -161,11 +210,31 @@ defmodule Explorer.Market.History.Cataloger do
     end)
   end
 
-  defp compile_records(price_records, market_cap_records) do
-    price_records
-    |> Enum.zip(market_cap_records)
-    |> Enum.map(fn {price_map, market_cap_map} ->
-      Map.merge(price_map, market_cap_map)
+  @spec fetch_tvl_history(non_neg_integer()) :: Task.t()
+  defp fetch_tvl_history(day_count, failed_attempts \\ 0) do
+    Task.Supervisor.async_nolink(Explorer.MarketTaskSupervisor, fn ->
+      Process.sleep(HistoryProcess.delay(failed_attempts))
+
+      if failed_attempts < @tvl_failed_attempts do
+        {:tvl_history, {day_count, failed_attempts, source_tvl().fetch_tvl(day_count)}}
+      else
+        {:tvl_history, {day_count, failed_attempts, {:ok, nil}}}
+      end
+    end)
+  end
+
+  defp compile_records(state) do
+    price_records = state.price_records
+    market_cap_records = state.market_cap_records
+    tvl_records = state.tvl_records
+
+    all_records = price_records ++ market_cap_records ++ tvl_records
+
+    all_records
+    |> Enum.group_by(fn %{date: date} -> date end)
+    |> Map.values()
+    |> Enum.map(fn a ->
+      Enum.reduce(a, %{}, fn x, acc -> Map.merge(x, acc) end)
     end)
   end
 end
diff --git a/apps/explorer/lib/explorer/market/history/source/tvl.ex b/apps/explorer/lib/explorer/market/history/source/tvl.ex
new file mode 100644
index 000000000000..19e7da498eb1
--- /dev/null
+++ b/apps/explorer/lib/explorer/market/history/source/tvl.ex
@@ -0,0 +1,18 @@
+defmodule Explorer.Market.History.Source.TVL do
+  @moduledoc """
+  Interface for a source that allows for fetching of TVL history.
+  """
+
+  @typedoc """
+  Record of market values for a specific date.
+  """
+  @type record :: %{
+          date: Date.t(),
+          tvl: Decimal.t()
+        }
+
+  @doc """
+  Fetch history for a specified amount of days in the past.
+  """
+  @callback fetch_tvl(previous_days :: non_neg_integer()) :: {:ok, [record()]} | :error
+end
diff --git a/apps/explorer/lib/explorer/market/history/source/tvl/defillama.ex b/apps/explorer/lib/explorer/market/history/source/tvl/defillama.ex
new file mode 100644
index 000000000000..9fcf29186d5f
--- /dev/null
+++ b/apps/explorer/lib/explorer/market/history/source/tvl/defillama.ex
@@ -0,0 +1,49 @@
+defmodule Explorer.Market.History.Source.TVL.DefiLlama do
+  @moduledoc """
+  Adapter for fetching current market from DefiLlama.
+  """
+
+  alias Explorer.ExchangeRates.Source
+  alias Explorer.ExchangeRates.Source.DefiLlama, as: ExchangeRatesSourceDefiLlama
+  alias Explorer.Market.History.Source.Price.CryptoCompare
+  alias Explorer.Market.History.Source.TVL, as: SourceTVL
+
+  @behaviour SourceTVL
+
+  @impl SourceTVL
+  def fetch_tvl(previous_days) do
+    coin_id = Application.get_env(:explorer, Explorer.ExchangeRates.Source.DefiLlama, [])[:coin_id]
+
+    if coin_id do
+      url =
+        ExchangeRatesSourceDefiLlama.history_url(previous_days) <>
+          "/" <> coin_id
+
+      case Source.http_request(url, ExchangeRatesSourceDefiLlama.headers()) do
+        {:ok, data} ->
+          result =
+            data
+            |> format_data()
+
+          {:ok, result}
+
+        _ ->
+          :error
+      end
+    else
+      {:ok, []}
+    end
+  end
+
+  @spec format_data(term()) :: SourceTVL.record() | nil
+  defp format_data(nil), do: nil
+
+  defp format_data(data) do
+    Enum.map(data, fn %{"date" => date, "tvl" => tvl} ->
+      %{
+        tvl: Decimal.new(to_string(tvl)),
+        date: CryptoCompare.date(date)
+      }
+    end)
+  end
+end
diff --git a/apps/explorer/lib/explorer/market/market_history.ex b/apps/explorer/lib/explorer/market/market_history.ex
index aca309062540..0fabaf0e305c 100644
--- a/apps/explorer/lib/explorer/market/market_history.ex
+++ b/apps/explorer/lib/explorer/market/market_history.ex
@@ -10,6 +10,7 @@ defmodule Explorer.Market.MarketHistory do
     field(:date, :date)
     field(:opening_price, :decimal)
     field(:market_cap, :decimal)
+    field(:tvl, :decimal)
   end
 
   @typedoc """
@@ -19,11 +20,13 @@ defmodule Explorer.Market.MarketHistory do
    * `:date` - The date in UTC.
    * `:opening_price` - Opening price in USD.
    * `:market_cap` - Market cap in USD.
+   * `:market_cap` - TVL in USD.
   """
   @type t :: %__MODULE__{
           closing_price: Decimal.t(),
           date: Date.t(),
           opening_price: Decimal.t(),
-          market_cap: Decimal.t()
+          market_cap: Decimal.t(),
+          tvl: Decimal.t()
         }
 end
diff --git a/apps/explorer/priv/repo/migrations/20231003093553_add_tvl_to_market_history_table.exs b/apps/explorer/priv/repo/migrations/20231003093553_add_tvl_to_market_history_table.exs
new file mode 100644
index 000000000000..5ff8dd795a3f
--- /dev/null
+++ b/apps/explorer/priv/repo/migrations/20231003093553_add_tvl_to_market_history_table.exs
@@ -0,0 +1,9 @@
+defmodule Explorer.Repo.Migrations.AddTvlToMarketHistoryTable do
+  use Ecto.Migration
+
+  def change do
+    alter table(:market_history) do
+      add(:tvl, :decimal)
+    end
+  end
+end
diff --git a/apps/explorer/test/explorer/market/history/cataloger_test.exs b/apps/explorer/test/explorer/market/history/cataloger_test.exs
index 7ffe2de63f30..f7a86a960e2c 100644
--- a/apps/explorer/test/explorer/market/history/cataloger_test.exs
+++ b/apps/explorer/test/explorer/market/history/cataloger_test.exs
@@ -63,45 +63,100 @@ defmodule Explorer.Market.History.CatalogerTest do
     assert_receive {_ref, {:price_history, {1, 0, {:ok, ^records}}}}
   end
 
+  test "handle_info with successful tasks (price, market cap and tvl)" do
+    Application.put_env(:explorer, Cataloger, history_fetch_interval: 1)
+
+    price_records = [
+      %{date: ~D[2018-04-01], closing_price: Decimal.new(10), opening_price: Decimal.new(5)},
+      %{date: ~D[2018-04-02], closing_price: Decimal.new(6), opening_price: Decimal.new(2)}
+    ]
+
+    market_cap_records = [%{date: ~D[2018-04-01], market_cap: Decimal.new(100_500)}]
+    tvl_records = [%{date: ~D[2018-04-01], tvl: Decimal.new(200_500)}]
+
+    state = %{
+      price_records: price_records
+    }
+
+    state2 = Map.put(state, :market_cap_records, market_cap_records)
+
+    state3 = Map.put(state2, :tvl_records, tvl_records)
+
+    assert {:noreply, state} == Cataloger.handle_info({nil, {:price_history, {1, 0, {:ok, price_records}}}}, state)
+    assert_receive {:fetch_market_cap_history, 365}
+
+    assert {:noreply, state2} ==
+             Cataloger.handle_info({nil, {:market_cap_history, {0, 3, {:ok, market_cap_records}}}}, state)
+
+    assert {:noreply, state3} ==
+             Cataloger.handle_info({nil, {:tvl_history, {0, 3, {:ok, tvl_records}}}}, state2)
+
+    assert record2 = Repo.get_by(MarketHistory, date: Enum.at(price_records, 1).date)
+    assert record1 = Repo.get_by(MarketHistory, date: Enum.at(price_records, 0).date)
+    assert record2.closing_price == Decimal.new(6)
+    assert record2.market_cap == nil
+    assert record2.tvl == nil
+    assert record1.closing_price == Decimal.new(10)
+    assert record1.market_cap == Decimal.new(100_500)
+    assert record1.tvl == Decimal.new(200_500)
+  end
+
   test "handle_info with successful tasks (price and market cap)" do
     Application.put_env(:explorer, Cataloger, history_fetch_interval: 1)
-    record_price = %{date: ~D[2018-04-01], closing_price: Decimal.new(10), opening_price: Decimal.new(5)}
-    record_market_caps = [%{date: ~D[2018-04-01], market_cap: Decimal.new(100_500)}]
+    price_records = [%{date: ~D[2018-04-01], closing_price: Decimal.new(10), opening_price: Decimal.new(5)}]
+    market_cap_records = [%{date: ~D[2018-04-01], market_cap: Decimal.new(100_500)}]
+    tvl_records = []
 
     state = %{
-      price_records: [
-        record_price
-      ]
+      price_records: price_records
     }
 
-    assert {:noreply, state} == Cataloger.handle_info({nil, {:price_history, {1, 0, {:ok, [record_price]}}}}, state)
+    state2 = Map.put(state, :market_cap_records, market_cap_records)
+
+    state3 = Map.put(state2, :tvl_records, [])
+
+    assert {:noreply, state} == Cataloger.handle_info({nil, {:price_history, {1, 0, {:ok, price_records}}}}, state)
     assert_receive {:fetch_market_cap_history, 365}
 
-    assert {:noreply, state} ==
-             Cataloger.handle_info({nil, {:market_cap_history, {0, 3, {:ok, record_market_caps}}}}, state)
+    assert {:noreply, state2} ==
+             Cataloger.handle_info({nil, {:market_cap_history, {0, 3, {:ok, market_cap_records}}}}, state)
+
+    assert {:noreply, state3} ==
+             Cataloger.handle_info({nil, {:tvl_history, {0, 3, {:ok, tvl_records}}}}, state2)
 
-    assert Repo.get_by(MarketHistory, date: record_price.date)
+    assert record = Repo.get_by(MarketHistory, date: Enum.at(price_records, 0).date)
+    assert record.opening_price == Decimal.new(5)
+    assert record.market_cap == Decimal.new(100_500)
+    assert record.tvl == nil
   end
 
   test "handle_info with successful price task" do
     Application.put_env(:explorer, Cataloger, history_fetch_interval: 1)
-    record_price = %{date: ~D[2018-04-01], closing_price: Decimal.new(10), opening_price: Decimal.new(5)}
-    record_market_cap = nil
+    price_records = [%{date: ~D[2018-04-01], closing_price: Decimal.new(10), opening_price: Decimal.new(5)}]
+    market_cap_records = []
+    tvl_records = []
 
     state = %{
-      price_records: [
-        record_price
-      ]
+      price_records: price_records
     }
 
-    assert {:noreply, state} == Cataloger.handle_info({nil, {:price_history, {1, 0, {:ok, [record_price]}}}}, state)
+    state2 = Map.put(state, :market_cap_records, market_cap_records)
+
+    state3 = Map.put(state2, :tvl_records, tvl_records)
+
+    assert {:noreply, state} == Cataloger.handle_info({nil, {:price_history, {1, 0, {:ok, price_records}}}}, state)
     assert_receive {:fetch_market_cap_history, 365}
 
-    assert {:noreply, state} ==
-             Cataloger.handle_info({nil, {:market_cap_history, {0, 3, {:ok, record_market_cap}}}}, state)
+    assert {:noreply, state2} ==
+             Cataloger.handle_info({nil, {:market_cap_history, {0, 3, {:ok, market_cap_records}}}}, state)
+
+    assert {:noreply, state3} ==
+             Cataloger.handle_info({nil, {:tvl_history, {0, 3, {:ok, tvl_records}}}}, state2)
 
-    assert record = Repo.get_by(MarketHistory, date: record_price.date)
+    assert record = Repo.get_by(MarketHistory, date: Enum.at(price_records, 0).date)
+    assert record.closing_price == Decimal.new(10)
     assert record.market_cap == nil
+    assert record.tvl == nil
   end
 
   test "handle info for DOWN message" do
diff --git a/config/config_helper.exs b/config/config_helper.exs
index 709b6455b2cc..9d4e91eb5f5b 100644
--- a/config/config_helper.exs
+++ b/config/config_helper.exs
@@ -1,7 +1,7 @@
 defmodule ConfigHelper do
   import Bitwise
   alias Explorer.ExchangeRates.Source
-  alias Explorer.Market.History.Source.{MarketCap, Price}
+  alias Explorer.Market.History.Source.{MarketCap, Price, TVL}
   alias Indexer.Transform.Blocks
 
   def repos do
@@ -113,6 +113,14 @@ defmodule ConfigHelper do
     end
   end
 
+  @spec exchange_rates_tvl_source() :: TVL.DefiLlama
+  def exchange_rates_tvl_source do
+    case System.get_env("EXCHANGE_RATES_TVL_SOURCE") do
+      "defillama" -> TVL.DefiLlama
+      _ -> TVL.DefiLlama
+    end
+  end
+
   @spec exchange_rates_price_source() :: Price.CoinGecko | Price.CoinMarketCap | Price.CryptoCompare
   def exchange_rates_price_source do
     case System.get_env("EXCHANGE_RATES_PRICE_SOURCE") do
diff --git a/config/runtime.exs b/config/runtime.exs
index f709fce6ed50..1edf64b8501b 100644
--- a/config/runtime.exs
+++ b/config/runtime.exs
@@ -280,7 +280,8 @@ config :explorer, Explorer.ExchangeRates,
 config :explorer, Explorer.ExchangeRates.Source,
   source: ConfigHelper.exchange_rates_source(),
   price_source: ConfigHelper.exchange_rates_price_source(),
-  market_cap_source: ConfigHelper.exchange_rates_market_cap_source()
+  market_cap_source: ConfigHelper.exchange_rates_market_cap_source(),
+  tvl_source: ConfigHelper.exchange_rates_tvl_source()
 
 config :explorer, Explorer.ExchangeRates.Source.CoinMarketCap,
   api_key: System.get_env("EXCHANGE_RATES_COINMARKETCAP_API_KEY"),
@@ -291,6 +292,8 @@ config :explorer, Explorer.ExchangeRates.Source.CoinGecko,
   api_key: System.get_env("EXCHANGE_RATES_COINGECKO_API_KEY"),
   coin_id: System.get_env("EXCHANGE_RATES_COINGECKO_COIN_ID")
 
+config :explorer, Explorer.ExchangeRates.Source.DefiLlama, coin_id: System.get_env("EXCHANGE_RATES_DEFILLAMA_COIN_ID")
+
 config :explorer, Explorer.ExchangeRates.TokenExchangeRates,
   enabled: !ConfigHelper.parse_bool_env_var("DISABLE_TOKEN_EXCHANGE_RATE", "true"),
   interval: ConfigHelper.parse_time_env_var("TOKEN_EXCHANGE_RATE_INTERVAL", "5s"),
diff --git a/cspell.json b/cspell.json
index 0338069e35c2..94b5f9744495 100644
--- a/cspell.json
+++ b/cspell.json
@@ -526,6 +526,7 @@
         "lastmod",
         "qitmeer",
         "meer",
+        "DefiLlama"
     ],
     "enableFiletypes": [
         "dotenv",
diff --git a/docker-compose/envs/common-blockscout.env b/docker-compose/envs/common-blockscout.env
index c20e65a313bf..f5edaabfea0f 100644
--- a/docker-compose/envs/common-blockscout.env
+++ b/docker-compose/envs/common-blockscout.env
@@ -34,6 +34,7 @@ EMISSION_FORMAT=DEFAULT
 COIN=
 EXCHANGE_RATES_COIN=
 # EXCHANGE_RATES_MARKET_CAP_SOURCE=
+# EXCHANGE_RATES_TVL_SOURCE=
 # EXCHANGE_RATES_PRICE_SOURCE=
 # EXCHANGE_RATES_COINGECKO_COIN_ID=
 # EXCHANGE_RATES_COINGECKO_API_KEY=

From 159c4cbcd0f62727e415e9eaa71f646ecce01753 Mon Sep 17 00:00:00 2001
From: Viktor Baranov <baranov.viktor.27@gmail.com>
Date: Fri, 13 Oct 2023 18:22:49 +0300
Subject: [PATCH 489/909] Add tvl prop to /stats API

---
 .../controllers/api/v2/stats_controller.ex      |  1 +
 .../channels/exchange_rate_channel_test.exs     |  1 +
 .../api/rpc/stats_controller_test.exs           |  1 +
 .../exchange_rates/source/coin_gecko.ex         |  1 +
 .../exchange_rates/source/coin_market_cap.ex    |  1 +
 .../lib/explorer/exchange_rates/token.ex        | 17 +++++++++++------
 apps/explorer/lib/explorer/market/market.ex     |  1 +
 .../exchange_rates/exchange_rates_test.exs      |  1 +
 .../exchange_rates/source/coin_gecko_test.exs   |  1 +
 .../test/support/fakes/one_coin_source.ex       |  1 +
 10 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/stats_controller.ex b/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/stats_controller.ex
index 80408045cfff..966d4e8f736e 100644
--- a/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/stats_controller.ex
+++ b/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/stats_controller.ex
@@ -54,6 +54,7 @@ defmodule BlockScoutWeb.API.V2.StatsController do
         "gas_prices" => gas_prices,
         "static_gas_price" => gas_price,
         "market_cap" => Helper.market_cap(market_cap_type, exchange_rate),
+        "tvl" => exchange_rate.tvl_usd,
         "network_utilization_percentage" => network_utilization_percentage()
       }
     )
diff --git a/apps/block_scout_web/test/block_scout_web/channels/exchange_rate_channel_test.exs b/apps/block_scout_web/test/block_scout_web/channels/exchange_rate_channel_test.exs
index bac3c7271832..34f26785694d 100644
--- a/apps/block_scout_web/test/block_scout_web/channels/exchange_rate_channel_test.exs
+++ b/apps/block_scout_web/test/block_scout_web/channels/exchange_rate_channel_test.exs
@@ -27,6 +27,7 @@ defmodule BlockScoutWeb.ExchangeRateChannelTest do
       id: "test",
       last_updated: DateTime.utc_now(),
       market_cap_usd: Decimal.new("1000000.0"),
+      tvl_usd: Decimal.new("2000000.0"),
       name: "test",
       symbol: Explorer.coin(),
       usd_value: Decimal.new("2.5"),
diff --git a/apps/block_scout_web/test/block_scout_web/controllers/api/rpc/stats_controller_test.exs b/apps/block_scout_web/test/block_scout_web/controllers/api/rpc/stats_controller_test.exs
index 5722cab5bcba..5731311f11b7 100644
--- a/apps/block_scout_web/test/block_scout_web/controllers/api/rpc/stats_controller_test.exs
+++ b/apps/block_scout_web/test/block_scout_web/controllers/api/rpc/stats_controller_test.exs
@@ -169,6 +169,7 @@ defmodule BlockScoutWeb.API.RPC.StatsControllerTest do
         id: "test",
         last_updated: DateTime.utc_now(),
         market_cap_usd: Decimal.new("1000000.0"),
+        tvl_usd: Decimal.new("2000000.0"),
         name: "test",
         symbol: symbol,
         usd_value: Decimal.new("1.0"),
diff --git a/apps/explorer/lib/explorer/exchange_rates/source/coin_gecko.ex b/apps/explorer/lib/explorer/exchange_rates/source/coin_gecko.ex
index e45427adf191..1499e20e834b 100644
--- a/apps/explorer/lib/explorer/exchange_rates/source/coin_gecko.ex
+++ b/apps/explorer/lib/explorer/exchange_rates/source/coin_gecko.ex
@@ -35,6 +35,7 @@ defmodule Explorer.ExchangeRates.Source.CoinGecko do
         id: id,
         last_updated: last_updated,
         market_cap_usd: to_decimal(market_cap_data_usd),
+        tvl_usd: nil,
         name: json_data["name"],
         symbol: String.upcase(json_data["symbol"]),
         usd_value: current_price,
diff --git a/apps/explorer/lib/explorer/exchange_rates/source/coin_market_cap.ex b/apps/explorer/lib/explorer/exchange_rates/source/coin_market_cap.ex
index 0ef28b6c395b..3f13d25ba464 100644
--- a/apps/explorer/lib/explorer/exchange_rates/source/coin_market_cap.ex
+++ b/apps/explorer/lib/explorer/exchange_rates/source/coin_market_cap.ex
@@ -40,6 +40,7 @@ defmodule Explorer.ExchangeRates.Source.CoinMarketCap do
         id: id,
         last_updated: last_updated,
         market_cap_usd: to_decimal(market_cap_data_usd),
+        tvl_usd: nil,
         name: token_properties["name"],
         symbol: String.upcase(token_properties["symbol"]),
         usd_value: current_price,
diff --git a/apps/explorer/lib/explorer/exchange_rates/token.ex b/apps/explorer/lib/explorer/exchange_rates/token.ex
index 1e26d3267e8a..07405701e8cc 100644
--- a/apps/explorer/lib/explorer/exchange_rates/token.ex
+++ b/apps/explorer/lib/explorer/exchange_rates/token.ex
@@ -11,7 +11,8 @@ defmodule Explorer.ExchangeRates.Token do
    * `:btc_value` - The Bitcoin value of the currency
    * `:id` - ID of a currency
    * `:last_updated` - Timestamp of when the value was last updated
-   * `:market_cap_usd` - Market capitalization of the currency
+   * `:market_cap_usd` - Market capitalization of the currency in USD
+   * `:tvl_usd` - Token value locked of the currency in USD
    * `:name` - Human-readable name of a ticker
    * `:symbol` - Trading symbol used to represent a currency
    * `:usd_value` - The USD value of the currency
@@ -24,6 +25,7 @@ defmodule Explorer.ExchangeRates.Token do
           id: String.t() | nil,
           last_updated: DateTime.t() | nil,
           market_cap_usd: Decimal.t() | nil,
+          tvl_usd: Decimal.t() | nil,
           name: String.t() | nil,
           symbol: String.t() | nil,
           usd_value: Decimal.t() | nil,
@@ -31,8 +33,8 @@ defmodule Explorer.ExchangeRates.Token do
         }
 
   @derive Jason.Encoder
-  @enforce_keys ~w(available_supply total_supply btc_value id last_updated market_cap_usd name symbol usd_value volume_24h_usd)a
-  defstruct ~w(available_supply total_supply btc_value id last_updated market_cap_usd name symbol usd_value volume_24h_usd)a
+  @enforce_keys ~w(available_supply total_supply btc_value id last_updated market_cap_usd tvl_usd name symbol usd_value volume_24h_usd)a
+  defstruct ~w(available_supply total_supply btc_value id last_updated market_cap_usd tvl_usd name symbol usd_value volume_24h_usd)a
 
   def null,
     do: %__MODULE__{
@@ -44,6 +46,7 @@ defmodule Explorer.ExchangeRates.Token do
       usd_value: nil,
       volume_24h_usd: nil,
       market_cap_usd: nil,
+      tvl_usd: nil,
       btc_value: nil,
       last_updated: nil
     }
@@ -59,17 +62,18 @@ defmodule Explorer.ExchangeRates.Token do
         usd_value: usd_value,
         volume_24h_usd: volume_24h_usd,
         market_cap_usd: market_cap_usd,
+        tvl_usd: tvl_usd,
         btc_value: btc_value,
         last_updated: last_updated
       }) do
     # symbol is first because it is the key used for lookup in `Explorer.ExchangeRates`'s ETS table
-    {symbol, id, name, available_supply, total_supply, usd_value, volume_24h_usd, market_cap_usd, btc_value,
+    {symbol, id, name, available_supply, total_supply, usd_value, volume_24h_usd, market_cap_usd, tvl_usd, btc_value,
      last_updated}
   end
 
   def from_tuple(
-        {symbol, id, name, available_supply, total_supply, usd_value, volume_24h_usd, market_cap_usd, btc_value,
-         last_updated}
+        {symbol, id, name, available_supply, total_supply, usd_value, volume_24h_usd, market_cap_usd, tvl_usd,
+         btc_value, last_updated}
       ) do
     %__MODULE__{
       symbol: symbol,
@@ -80,6 +84,7 @@ defmodule Explorer.ExchangeRates.Token do
       usd_value: usd_value,
       volume_24h_usd: volume_24h_usd,
       market_cap_usd: market_cap_usd,
+      tvl_usd: tvl_usd,
       btc_value: btc_value,
       last_updated: last_updated
     }
diff --git a/apps/explorer/lib/explorer/market/market.ex b/apps/explorer/lib/explorer/market/market.ex
index 083f39403c94..571f837e0fe7 100644
--- a/apps/explorer/lib/explorer/market/market.ex
+++ b/apps/explorer/lib/explorer/market/market.ex
@@ -32,6 +32,7 @@ defmodule Explorer.Market do
       %Token{
         usd_value: Map.get(today, :closing_price),
         market_cap_usd: Map.get(today, :market_cap),
+        tvl_usd: Map.get(today, :tvl),
         available_supply: nil,
         total_supply: nil,
         btc_value: nil,
diff --git a/apps/explorer/test/explorer/exchange_rates/exchange_rates_test.exs b/apps/explorer/test/explorer/exchange_rates/exchange_rates_test.exs
index 3558c6d2a577..953a5b5a1640 100644
--- a/apps/explorer/test/explorer/exchange_rates/exchange_rates_test.exs
+++ b/apps/explorer/test/explorer/exchange_rates/exchange_rates_test.exs
@@ -75,6 +75,7 @@ defmodule Explorer.ExchangeRatesTest do
         id: "test_id",
         last_updated: DateTime.utc_now(),
         market_cap_usd: Decimal.new("1000000.0"),
+        tvl_usd: Decimal.new("2000000.0"),
         name: "test_name",
         symbol: "test_symbol",
         usd_value: Decimal.new("1.0"),
diff --git a/apps/explorer/test/explorer/exchange_rates/source/coin_gecko_test.exs b/apps/explorer/test/explorer/exchange_rates/source/coin_gecko_test.exs
index 152efd5ef27b..044c84553f3e 100644
--- a/apps/explorer/test/explorer/exchange_rates/source/coin_gecko_test.exs
+++ b/apps/explorer/test/explorer/exchange_rates/source/coin_gecko_test.exs
@@ -116,6 +116,7 @@ defmodule Explorer.ExchangeRates.Source.CoinGeckoTest do
           id: "poa-network",
           last_updated: ~U[2019-08-21 08:36:49.371Z],
           market_cap_usd: Decimal.new("2962791"),
+          tvl_usd: nil,
           name: "POA Network",
           symbol: "POA",
           usd_value: Decimal.new("0.01345698"),
diff --git a/apps/explorer/test/support/fakes/one_coin_source.ex b/apps/explorer/test/support/fakes/one_coin_source.ex
index 4efe5d486e6c..4301f24635f1 100644
--- a/apps/explorer/test/support/fakes/one_coin_source.ex
+++ b/apps/explorer/test/support/fakes/one_coin_source.ex
@@ -16,6 +16,7 @@ defmodule Explorer.ExchangeRates.Source.OneCoinSource do
       last_updated: Timex.now(),
       name: "",
       market_cap_usd: Decimal.new(10_000_000),
+      tvl_usd: Decimal.new(100_500_000),
       symbol: Explorer.coin(),
       usd_value: Decimal.new(1),
       volume_24h_usd: Decimal.new(1)

From 99b4ff11c866e25b0dd1bf490d8d5f03e9c47f90 Mon Sep 17 00:00:00 2001
From: GoodDaisy <90915921+GoodDaisy@users.noreply.github.com>
Date: Sun, 15 Oct 2023 23:04:42 +0800
Subject: [PATCH 490/909] Fix typos

---
 .../test/support/fixture/smart_contract/issue_4758.sol        | 2 +-
 .../test/support/fixture/smart_contract/issue_5114.sol        | 4 ++--
 .../fixture/smart_contract/issue_with_constructor_args.sol    | 4 ++--
 bin/deploy                                                    | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/apps/explorer/test/support/fixture/smart_contract/issue_4758.sol b/apps/explorer/test/support/fixture/smart_contract/issue_4758.sol
index 7c56446e505d..75c7dd5312b8 100644
--- a/apps/explorer/test/support/fixture/smart_contract/issue_4758.sol
+++ b/apps/explorer/test/support/fixture/smart_contract/issue_4758.sol
@@ -294,7 +294,7 @@ interface IERC721Enumerable is IERC721 {
  *
  * Use this as follows (registryAddress is the address of the ENS registry to use):
  * -----
- * // This hex value is caclulated by namehash('addr.reverse')
+ * // This hex value is calculated by namehash('addr.reverse')
  * bytes32 public constant ENS_ADDR_REVERSE_NODE = 0x91d1777781884d03a6757a803996e38de2a42967fb37eeaca72729271025a9e2;
  * function registerReverseENS(address registryAddress, string memory calldata) external {
  *     require(registryAddress != address(0), "need a valid registry");
diff --git a/apps/explorer/test/support/fixture/smart_contract/issue_5114.sol b/apps/explorer/test/support/fixture/smart_contract/issue_5114.sol
index 942bf82fbd21..0c5458210089 100644
--- a/apps/explorer/test/support/fixture/smart_contract/issue_5114.sol
+++ b/apps/explorer/test/support/fixture/smart_contract/issue_5114.sol
@@ -41,7 +41,7 @@ abstract contract Proxy {
     }
 
     /**
-     * @dev This is a virtual function that should be overriden so it returns the address to which the fallback function
+     * @dev This is a virtual function that should be overridden so it returns the address to which the fallback function
      * and {_fallback} should delegate.
      */
     function _implementation() internal view virtual returns (address);
@@ -76,7 +76,7 @@ abstract contract Proxy {
      * @dev Hook that is called before falling back to the implementation. Can happen as part of a manual `_fallback`
      * call, or as part of the Solidity `fallback` or `receive` functions.
      *
-     * If overriden should call `super._beforeFallback()`.
+     * If overridden should call `super._beforeFallback()`.
      */
     function _beforeFallback() internal virtual {
     }
diff --git a/apps/explorer/test/support/fixture/smart_contract/issue_with_constructor_args.sol b/apps/explorer/test/support/fixture/smart_contract/issue_with_constructor_args.sol
index 58ab19969526..d17247212c07 100644
--- a/apps/explorer/test/support/fixture/smart_contract/issue_with_constructor_args.sol
+++ b/apps/explorer/test/support/fixture/smart_contract/issue_with_constructor_args.sol
@@ -317,7 +317,7 @@ abstract contract Proxy {
     }
 
     /**
-     * @dev This is a virtual function that should be overriden so it returns the address to which the fallback function
+     * @dev This is a virtual function that should be overridden so it returns the address to which the fallback function
      * and {_fallback} should delegate.
      */
     function _implementation() internal view virtual returns (address);
@@ -352,7 +352,7 @@ abstract contract Proxy {
      * @dev Hook that is called before falling back to the implementation. Can happen as part of a manual `_fallback`
      * call, or as part of the Solidity `fallback` or `receive` functions.
      *
-     * If overriden should call `super._beforeFallback()`.
+     * If overridden should call `super._beforeFallback()`.
      */
     function _beforeFallback() internal virtual {
     }
diff --git a/bin/deploy b/bin/deploy
index f346f52f99e0..acb9750618ca 100755
--- a/bin/deploy
+++ b/bin/deploy
@@ -120,5 +120,5 @@ for chain in $CHAINS; do
     i=$((i+1))
 done
 
-log "Deployment task has succesfully completed!"
+log "Deployment task has successfully completed!"
 exit 0

From a5abcebe3bdd5582a648a7d71bd31516f183f588 Mon Sep 17 00:00:00 2001
From: Viktor Baranov <baranov.viktor.27@gmail.com>
Date: Mon, 16 Oct 2023 11:51:18 +0300
Subject: [PATCH 491/909] Add Fuse branch to CI

---
 .../publish-docker-image-for-fuse.yml         | 63 +++++++++++++++++++
 1 file changed, 63 insertions(+)
 create mode 100644 .github/workflows/publish-docker-image-for-fuse.yml

diff --git a/.github/workflows/publish-docker-image-for-fuse.yml b/.github/workflows/publish-docker-image-for-fuse.yml
new file mode 100644
index 000000000000..6550cc508fdf
--- /dev/null
+++ b/.github/workflows/publish-docker-image-for-fuse.yml
@@ -0,0 +1,63 @@
+# This workflow uses actions that are not certified by GitHub.
+# They are provided by a third-party and are governed by
+# separate terms of service, privacy policy, and support
+# documentation.
+
+name: Publish Docker image for specific chain branches
+
+on:
+  push:
+    branches:
+      - production-fuse-stg
+env:
+  OTP_VERSION: '24.3.4.1'
+  ELIXIR_VERSION: '1.13.4'
+jobs:
+  push_to_registry:
+    name: Push Docker image to Docker Hub
+    runs-on: ubuntu-latest
+    env:
+      RELEASE_VERSION: 5.2.3
+      DOCKER_CHAIN_NAME: fuse
+    steps:
+      - name: Check out the repo
+        uses: actions/checkout@v3
+
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v2
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2
+      
+      - name: Log in to Docker Hub
+        uses: docker/login-action@v2
+        with:
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
+      
+      - name: Extract metadata (tags, labels) for Docker
+        id: meta
+        uses: docker/metadata-action@v4
+        with:
+          images: blockscout/blockscout
+
+      - name: Add SHORT_SHA env property with commit short sha
+        run: echo "SHORT_SHA=`echo ${GITHUB_SHA} | cut -c1-8`" >> $GITHUB_ENV
+      
+      - name: Build and push Docker image
+        uses: docker/build-push-action@v3
+        with:
+          context: .
+          file: ./docker/Dockerfile
+          push: true
+          tags: blockscout/blockscout-${{ env.DOCKER_CHAIN_NAME }}:latest, blockscout/blockscout-${{ env.DOCKER_CHAIN_NAME }}:${{ env.RELEASE_VERSION }}-postrelease-${{ env.SHORT_SHA }}
+          build-args: |
+            CACHE_EXCHANGE_RATES_PERIOD=
+            API_V1_READ_METHODS_DISABLED=false
+            DISABLE_WEBAPP=false
+            API_V1_WRITE_METHODS_DISABLED=false
+            CACHE_TOTAL_GAS_USAGE_COUNTER_ENABLED=
+            ADMIN_PANEL_ENABLED=false
+            CACHE_ADDRESS_WITH_BALANCES_UPDATE_INTERVAL=
+            BLOCKSCOUT_VERSION=v${{ env.RELEASE_VERSION }}-beta.+commit.${{ env.SHORT_SHA }}
+            RELEASE_VERSION=${{ env.RELEASE_VERSION }}
\ No newline at end of file

From 1bb6a7d28cb9f4a42902fa887122b33321bc4f52 Mon Sep 17 00:00:00 2001
From: Viktor Baranov <baranov.viktor.27@gmail.com>
Date: Mon, 16 Oct 2023 12:20:27 +0300
Subject: [PATCH 492/909] New branches to CI

---
 .github/workflows/config.yml | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/config.yml b/.github/workflows/config.yml
index 6893d0ef319b..beedf8eb63ea 100644
--- a/.github/workflows/config.yml
+++ b/.github/workflows/config.yml
@@ -4,15 +4,20 @@ on:
   push:
     branches:
       - master
-      - production-optimism-stg
+      - production-core-stg
       - production-eth-stg-experimental
       - production-eth-goerli-stg
-      - production-xdai-stg
-      - production-core-stg
-      - production-sokol-stg
-      - production-rsk-stg
-      - production-lukso-stg
+      - production-eth-sepolia-stg
+      - production-fuse-stg
+      - production-optimism-stg
       - production-immutable-stg
+      - production-iota-stg
+      - production-lukso-stg
+      - production-rsk-stg
+      - production-sokol-stg
+      - production-suave-stg
+      - production-xdai-stg
+      - production-zkevm-stg
       - production-zksync-stg
       - staging-l2
   pull_request:

From 15f7985a1d1cdd83598d4e9592c12d10e9d4e378 Mon Sep 17 00:00:00 2001
From: Viktor Baranov <baranov.viktor.27@gmail.com>
Date: Mon, 16 Oct 2023 13:54:51 +0300
Subject: [PATCH 493/909] Increase ELIXIR_VERSION and OTP_VERSION in GA configs

---
 .github/workflows/config.yml                             | 2 +-
 .github/workflows/publish-docker-image-every-push.yml    | 2 +-
 .github/workflows/publish-docker-image-for-fuse.yml      | 3 ---
 .github/workflows/publish-docker-image-for-immutable.yml | 3 ---
 .github/workflows/publish-docker-image-for-xdai.yml      | 3 ---
 .github/workflows/publish-docker-image-release.yml       | 2 +-
 6 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/config.yml b/.github/workflows/config.yml
index beedf8eb63ea..83ce784bdbcd 100644
--- a/.github/workflows/config.yml
+++ b/.github/workflows/config.yml
@@ -27,7 +27,7 @@ on:
 env:
   MIX_ENV: test
   OTP_VERSION: '25.2.1'
-  ELIXIR_VERSION: '1.14.3'
+  ELIXIR_VERSION: '1.14.5'
   ACCOUNT_AUTH0_DOMAIN: 'blockscoutcom.us.auth0.com'
 
 jobs:
diff --git a/.github/workflows/publish-docker-image-every-push.yml b/.github/workflows/publish-docker-image-every-push.yml
index 0548205deae1..4923e93a0caa 100644
--- a/.github/workflows/publish-docker-image-every-push.yml
+++ b/.github/workflows/publish-docker-image-every-push.yml
@@ -6,7 +6,7 @@ on:
       - master
 env:
   OTP_VERSION: '25.2.1'
-  ELIXIR_VERSION: '1.14.3'
+  ELIXIR_VERSION: '1.14.5'
   RELEASE_VERSION: 5.2.3
 
 jobs:
diff --git a/.github/workflows/publish-docker-image-for-fuse.yml b/.github/workflows/publish-docker-image-for-fuse.yml
index 6550cc508fdf..f54355fa4cdd 100644
--- a/.github/workflows/publish-docker-image-for-fuse.yml
+++ b/.github/workflows/publish-docker-image-for-fuse.yml
@@ -9,9 +9,6 @@ on:
   push:
     branches:
       - production-fuse-stg
-env:
-  OTP_VERSION: '24.3.4.1'
-  ELIXIR_VERSION: '1.13.4'
 jobs:
   push_to_registry:
     name: Push Docker image to Docker Hub
diff --git a/.github/workflows/publish-docker-image-for-immutable.yml b/.github/workflows/publish-docker-image-for-immutable.yml
index 4a21d0f9a86a..3b91f64ca5cf 100644
--- a/.github/workflows/publish-docker-image-for-immutable.yml
+++ b/.github/workflows/publish-docker-image-for-immutable.yml
@@ -9,9 +9,6 @@ on:
   push:
     branches:
       - production-immutable-stg
-env:
-  OTP_VERSION: '24.3.4.1'
-  ELIXIR_VERSION: '1.13.4'
 jobs:
   push_to_registry:
     name: Push Docker image to Docker Hub
diff --git a/.github/workflows/publish-docker-image-for-xdai.yml b/.github/workflows/publish-docker-image-for-xdai.yml
index 0129b45997f3..2cd054c3b7ae 100644
--- a/.github/workflows/publish-docker-image-for-xdai.yml
+++ b/.github/workflows/publish-docker-image-for-xdai.yml
@@ -9,9 +9,6 @@ on:
   push:
     branches:
       - production-xdai-stg
-env:
-  OTP_VERSION: '24.3.4.1'
-  ELIXIR_VERSION: '1.13.4'
 jobs:
   push_to_registry:
     name: Push Docker image to Docker Hub
diff --git a/.github/workflows/publish-docker-image-release.yml b/.github/workflows/publish-docker-image-release.yml
index c7e993defcaf..124af71187d1 100644
--- a/.github/workflows/publish-docker-image-release.yml
+++ b/.github/workflows/publish-docker-image-release.yml
@@ -11,7 +11,7 @@ on:
 
 env:
   OTP_VERSION: '25.2.1'
-  ELIXIR_VERSION: '1.14.3'
+  ELIXIR_VERSION: '1.14.5'
 
 jobs:
   push_to_registry:

From 7508b2fe14ab21d8d3a09fdc7940f43e0aa4d053 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 16 Oct 2023 18:08:06 +0000
Subject: [PATCH 494/909] Bump @babel/preset-env in
 /apps/block_scout_web/assets

Bumps [@babel/preset-env](https://github.com/babel/babel/tree/HEAD/packages/babel-preset-env) from 7.22.20 to 7.23.2.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/commits/v7.23.2/packages/babel-preset-env)

---
updated-dependencies:
- dependency-name: "@babel/preset-env"
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 apps/block_scout_web/assets/package-lock.json | 374 +++++++++---------
 apps/block_scout_web/assets/package.json      |   2 +-
 2 files changed, 188 insertions(+), 188 deletions(-)

diff --git a/apps/block_scout_web/assets/package-lock.json b/apps/block_scout_web/assets/package-lock.json
index 7c5970b31d23..73d212c68b71 100644
--- a/apps/block_scout_web/assets/package-lock.json
+++ b/apps/block_scout_web/assets/package-lock.json
@@ -72,7 +72,7 @@
       },
       "devDependencies": {
         "@babel/core": "^7.23.0",
-        "@babel/preset-env": "^7.22.20",
+        "@babel/preset-env": "^7.23.2",
         "autoprefixer": "^10.4.16",
         "babel-loader": "^9.1.3",
         "copy-webpack-plugin": "^11.0.0",
@@ -241,9 +241,9 @@
       }
     },
     "node_modules/@babel/compat-data": {
-      "version": "7.22.20",
-      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.22.20.tgz",
-      "integrity": "sha512-BQYjKbpXjoXwFW5jGqiizJQQT/aC7pFm9Ok1OWssonuguICi264lbgMzRp2ZMmRSlfkX6DsWDDcsrctK8Rwfiw==",
+      "version": "7.23.2",
+      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.23.2.tgz",
+      "integrity": "sha512-0S9TQMmDHlqAZ2ITT95irXKfxN9bncq8ZCoJhun3nHL/lLUxd2NKBJYoNGWH7S0hz6fRQwWlAWn/ILM0C70KZQ==",
       "engines": {
         "node": ">=6.9.0"
       }
@@ -496,14 +496,14 @@
       }
     },
     "node_modules/@babel/helper-remap-async-to-generator": {
-      "version": "7.22.9",
-      "resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.22.9.tgz",
-      "integrity": "sha512-8WWC4oR4Px+tr+Fp0X3RHDVfINGpF3ad1HIbrc8A77epiR6eMMc6jsgozkzT2uDiOOdoS9cLIQ+XD2XvI2WSmQ==",
+      "version": "7.22.20",
+      "resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.22.20.tgz",
+      "integrity": "sha512-pBGyV4uBqOns+0UvhsTO8qgl8hO89PmiDYv+/COyp1aeMcmfrfruz+/nCMFiYyFF/Knn0yfrC85ZzNFjembFTw==",
       "dev": true,
       "dependencies": {
         "@babel/helper-annotate-as-pure": "^7.22.5",
-        "@babel/helper-environment-visitor": "^7.22.5",
-        "@babel/helper-wrap-function": "^7.22.9"
+        "@babel/helper-environment-visitor": "^7.22.20",
+        "@babel/helper-wrap-function": "^7.22.20"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -588,14 +588,14 @@
       }
     },
     "node_modules/@babel/helper-wrap-function": {
-      "version": "7.22.10",
-      "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.22.10.tgz",
-      "integrity": "sha512-OnMhjWjuGYtdoO3FmsEFWvBStBAe2QOgwOLsLNDjN+aaiMD8InJk1/O3HSD8lkqTjCgg5YI34Tz15KNNA3p+nQ==",
+      "version": "7.22.20",
+      "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.22.20.tgz",
+      "integrity": "sha512-pms/UwkOpnQe/PDAEdV/d7dVCoBbB+R4FvYoHGZz+4VPcg7RtYy2KP7S2lbuWM6FCSgob5wshfGESbC/hzNXZw==",
       "dev": true,
       "dependencies": {
         "@babel/helper-function-name": "^7.22.5",
-        "@babel/template": "^7.22.5",
-        "@babel/types": "^7.22.10"
+        "@babel/template": "^7.22.15",
+        "@babel/types": "^7.22.19"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -975,14 +975,14 @@
       }
     },
     "node_modules/@babel/plugin-transform-async-generator-functions": {
-      "version": "7.22.15",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-generator-functions/-/plugin-transform-async-generator-functions-7.22.15.tgz",
-      "integrity": "sha512-jBm1Es25Y+tVoTi5rfd5t1KLmL8ogLKpXszboWOTTtGFGz2RKnQe2yn7HbZ+kb/B8N0FVSGQo874NSlOU1T4+w==",
+      "version": "7.23.2",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-generator-functions/-/plugin-transform-async-generator-functions-7.23.2.tgz",
+      "integrity": "sha512-BBYVGxbDVHfoeXbOwcagAkOQAm9NxoTdMGfTqghu1GrvadSaw6iW3Je6IcL5PNOw8VwjxqBECXy50/iCQSY/lQ==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-environment-visitor": "^7.22.5",
+        "@babel/helper-environment-visitor": "^7.22.20",
         "@babel/helper-plugin-utils": "^7.22.5",
-        "@babel/helper-remap-async-to-generator": "^7.22.9",
+        "@babel/helper-remap-async-to-generator": "^7.22.20",
         "@babel/plugin-syntax-async-generators": "^7.8.4"
       },
       "engines": {
@@ -1025,9 +1025,9 @@
       }
     },
     "node_modules/@babel/plugin-transform-block-scoping": {
-      "version": "7.22.15",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.22.15.tgz",
-      "integrity": "sha512-G1czpdJBZCtngoK1sJgloLiOHUnkb/bLZwqVZD8kXmq0ZnVfTTWUcs9OWtp0mBtYJ+4LQY1fllqBkOIPhXmFmw==",
+      "version": "7.23.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.23.0.tgz",
+      "integrity": "sha512-cOsrbmIOXmf+5YbL99/S49Y3j46k/T16b9ml8bm9lP6N9US5iQ2yBK7gpui1pg0V/WMcXdkfKbTb7HXq9u+v4g==",
       "dev": true,
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.22.5"
@@ -1112,9 +1112,9 @@
       }
     },
     "node_modules/@babel/plugin-transform-destructuring": {
-      "version": "7.22.15",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.22.15.tgz",
-      "integrity": "sha512-HzG8sFl1ZVGTme74Nw+X01XsUTqERVQ6/RLHo3XjGRzm7XD6QTtfS3NJotVgCGy8BzkDqRjRBD8dAyJn5TuvSQ==",
+      "version": "7.23.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.23.0.tgz",
+      "integrity": "sha512-vaMdgNXFkYrB+8lbgniSYWHsgqK5gjaMNcc84bMIOMRLH0L9AqYq3hwMdvnyqj1OPqea8UtjPEuS/DCenah1wg==",
       "dev": true,
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.22.5"
@@ -1300,12 +1300,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-modules-amd": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.22.5.tgz",
-      "integrity": "sha512-R+PTfLTcYEmb1+kK7FNkhQ1gP4KgjpSO6HfH9+f8/yfp2Nt3ggBjiVpRwmwTlfqZLafYKJACy36yDXlEmI9HjQ==",
+      "version": "7.23.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.23.0.tgz",
+      "integrity": "sha512-xWT5gefv2HGSm4QHtgc1sYPbseOyf+FFDo2JbpE25GWl5BqTGO9IMwTYJRoIdjsF85GE+VegHxSCUt5EvoYTAw==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-module-transforms": "^7.22.5",
+        "@babel/helper-module-transforms": "^7.23.0",
         "@babel/helper-plugin-utils": "^7.22.5"
       },
       "engines": {
@@ -1316,12 +1316,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-modules-commonjs": {
-      "version": "7.22.15",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.22.15.tgz",
-      "integrity": "sha512-jWL4eh90w0HQOTKP2MoXXUpVxilxsB2Vl4ji69rSjS3EcZ/v4sBmn+A3NpepuJzBhOaEBbR7udonlHHn5DWidg==",
+      "version": "7.23.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.23.0.tgz",
+      "integrity": "sha512-32Xzss14/UVc7k9g775yMIvkVK8xwKE0DPdP5JTapr3+Z9w4tzeOuLNY6BXDQR6BdnzIlXnCGAzsk/ICHBLVWQ==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-module-transforms": "^7.22.15",
+        "@babel/helper-module-transforms": "^7.23.0",
         "@babel/helper-plugin-utils": "^7.22.5",
         "@babel/helper-simple-access": "^7.22.5"
       },
@@ -1333,15 +1333,15 @@
       }
     },
     "node_modules/@babel/plugin-transform-modules-systemjs": {
-      "version": "7.22.11",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.22.11.tgz",
-      "integrity": "sha512-rIqHmHoMEOhI3VkVf5jQ15l539KrwhzqcBO6wdCNWPWc/JWt9ILNYNUssbRpeq0qWns8svuw8LnMNCvWBIJ8wA==",
+      "version": "7.23.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.23.0.tgz",
+      "integrity": "sha512-qBej6ctXZD2f+DhlOC9yO47yEYgUh5CZNz/aBoH4j/3NOlRfJXJbY7xDQCqQVf9KbrqGzIWER1f23doHGrIHFg==",
       "dev": true,
       "dependencies": {
         "@babel/helper-hoist-variables": "^7.22.5",
-        "@babel/helper-module-transforms": "^7.22.9",
+        "@babel/helper-module-transforms": "^7.23.0",
         "@babel/helper-plugin-utils": "^7.22.5",
-        "@babel/helper-validator-identifier": "^7.22.5"
+        "@babel/helper-validator-identifier": "^7.22.20"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1481,9 +1481,9 @@
       }
     },
     "node_modules/@babel/plugin-transform-optional-chaining": {
-      "version": "7.22.15",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-optional-chaining/-/plugin-transform-optional-chaining-7.22.15.tgz",
-      "integrity": "sha512-ngQ2tBhq5vvSJw2Q2Z9i7ealNkpDMU0rGWnHPKqRZO0tzZ5tlaoz4hDvhXioOoaE0X2vfNss1djwg0DXlfu30A==",
+      "version": "7.23.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-optional-chaining/-/plugin-transform-optional-chaining-7.23.0.tgz",
+      "integrity": "sha512-sBBGXbLJjxTzLBF5rFWaikMnOGOk/BmK6vVByIdEggZ7Vn6CvWXZyRkkLFK6WE0IF8jSliyOkUN6SScFgzCM0g==",
       "dev": true,
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.22.5",
@@ -1763,12 +1763,12 @@
       }
     },
     "node_modules/@babel/preset-env": {
-      "version": "7.22.20",
-      "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.22.20.tgz",
-      "integrity": "sha512-11MY04gGC4kSzlPHRfvVkNAZhUxOvm7DCJ37hPDnUENwe06npjIRAfInEMTGSb4LZK5ZgDFkv5hw0lGebHeTyg==",
+      "version": "7.23.2",
+      "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.23.2.tgz",
+      "integrity": "sha512-BW3gsuDD+rvHL2VO2SjAUNTBe5YrjsTiDyqamPDWY723na3/yPQ65X5oQkFVJZ0o50/2d+svm1rkPoJeR1KxVQ==",
       "dev": true,
       "dependencies": {
-        "@babel/compat-data": "^7.22.20",
+        "@babel/compat-data": "^7.23.2",
         "@babel/helper-compilation-targets": "^7.22.15",
         "@babel/helper-plugin-utils": "^7.22.5",
         "@babel/helper-validator-option": "^7.22.15",
@@ -1794,15 +1794,15 @@
         "@babel/plugin-syntax-top-level-await": "^7.14.5",
         "@babel/plugin-syntax-unicode-sets-regex": "^7.18.6",
         "@babel/plugin-transform-arrow-functions": "^7.22.5",
-        "@babel/plugin-transform-async-generator-functions": "^7.22.15",
+        "@babel/plugin-transform-async-generator-functions": "^7.23.2",
         "@babel/plugin-transform-async-to-generator": "^7.22.5",
         "@babel/plugin-transform-block-scoped-functions": "^7.22.5",
-        "@babel/plugin-transform-block-scoping": "^7.22.15",
+        "@babel/plugin-transform-block-scoping": "^7.23.0",
         "@babel/plugin-transform-class-properties": "^7.22.5",
         "@babel/plugin-transform-class-static-block": "^7.22.11",
         "@babel/plugin-transform-classes": "^7.22.15",
         "@babel/plugin-transform-computed-properties": "^7.22.5",
-        "@babel/plugin-transform-destructuring": "^7.22.15",
+        "@babel/plugin-transform-destructuring": "^7.23.0",
         "@babel/plugin-transform-dotall-regex": "^7.22.5",
         "@babel/plugin-transform-duplicate-keys": "^7.22.5",
         "@babel/plugin-transform-dynamic-import": "^7.22.11",
@@ -1814,9 +1814,9 @@
         "@babel/plugin-transform-literals": "^7.22.5",
         "@babel/plugin-transform-logical-assignment-operators": "^7.22.11",
         "@babel/plugin-transform-member-expression-literals": "^7.22.5",
-        "@babel/plugin-transform-modules-amd": "^7.22.5",
-        "@babel/plugin-transform-modules-commonjs": "^7.22.15",
-        "@babel/plugin-transform-modules-systemjs": "^7.22.11",
+        "@babel/plugin-transform-modules-amd": "^7.23.0",
+        "@babel/plugin-transform-modules-commonjs": "^7.23.0",
+        "@babel/plugin-transform-modules-systemjs": "^7.23.0",
         "@babel/plugin-transform-modules-umd": "^7.22.5",
         "@babel/plugin-transform-named-capturing-groups-regex": "^7.22.5",
         "@babel/plugin-transform-new-target": "^7.22.5",
@@ -1825,7 +1825,7 @@
         "@babel/plugin-transform-object-rest-spread": "^7.22.15",
         "@babel/plugin-transform-object-super": "^7.22.5",
         "@babel/plugin-transform-optional-catch-binding": "^7.22.11",
-        "@babel/plugin-transform-optional-chaining": "^7.22.15",
+        "@babel/plugin-transform-optional-chaining": "^7.23.0",
         "@babel/plugin-transform-parameters": "^7.22.15",
         "@babel/plugin-transform-private-methods": "^7.22.5",
         "@babel/plugin-transform-private-property-in-object": "^7.22.11",
@@ -1842,10 +1842,10 @@
         "@babel/plugin-transform-unicode-regex": "^7.22.5",
         "@babel/plugin-transform-unicode-sets-regex": "^7.22.5",
         "@babel/preset-modules": "0.1.6-no-external-plugins",
-        "@babel/types": "^7.22.19",
-        "babel-plugin-polyfill-corejs2": "^0.4.5",
-        "babel-plugin-polyfill-corejs3": "^0.8.3",
-        "babel-plugin-polyfill-regenerator": "^0.5.2",
+        "@babel/types": "^7.23.0",
+        "babel-plugin-polyfill-corejs2": "^0.4.6",
+        "babel-plugin-polyfill-corejs3": "^0.8.5",
+        "babel-plugin-polyfill-regenerator": "^0.5.3",
         "core-js-compat": "^3.31.0",
         "semver": "^6.3.1"
       },
@@ -1857,9 +1857,9 @@
       }
     },
     "node_modules/@babel/preset-env/node_modules/@babel/helper-define-polyfill-provider": {
-      "version": "0.4.2",
-      "resolved": "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.4.2.tgz",
-      "integrity": "sha512-k0qnnOqHn5dK9pZpfD5XXZ9SojAITdCKRn2Lp6rnDGzIbaP0rHyMPk/4wsSxVBVz4RfN0q6VpXWP2pDGIoQ7hw==",
+      "version": "0.4.3",
+      "resolved": "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.4.3.tgz",
+      "integrity": "sha512-WBrLmuPP47n7PNwsZ57pqam6G/RGo1vw/87b0Blc53tZNGZ4x7YvZ6HgQe2vo1W/FR20OgjeZuGXzudPiXHFug==",
       "dev": true,
       "dependencies": {
         "@babel/helper-compilation-targets": "^7.22.6",
@@ -1873,13 +1873,13 @@
       }
     },
     "node_modules/@babel/preset-env/node_modules/babel-plugin-polyfill-corejs2": {
-      "version": "0.4.5",
-      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.4.5.tgz",
-      "integrity": "sha512-19hwUH5FKl49JEsvyTcoHakh6BE0wgXLLptIyKZ3PijHc/Ci521wygORCUCCred+E/twuqRyAkE02BAWPmsHOg==",
+      "version": "0.4.6",
+      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.4.6.tgz",
+      "integrity": "sha512-jhHiWVZIlnPbEUKSSNb9YoWcQGdlTLq7z1GHL4AjFxaoOUMuuEVJ+Y4pAaQUGOGk93YsVCKPbqbfw3m0SM6H8Q==",
       "dev": true,
       "dependencies": {
         "@babel/compat-data": "^7.22.6",
-        "@babel/helper-define-polyfill-provider": "^0.4.2",
+        "@babel/helper-define-polyfill-provider": "^0.4.3",
         "semver": "^6.3.1"
       },
       "peerDependencies": {
@@ -1887,12 +1887,12 @@
       }
     },
     "node_modules/@babel/preset-env/node_modules/babel-plugin-polyfill-regenerator": {
-      "version": "0.5.2",
-      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.5.2.tgz",
-      "integrity": "sha512-tAlOptU0Xj34V1Y2PNTL4Y0FOJMDB6bZmoW39FeCQIhigGLkqu3Fj6uiXpxIf6Ij274ENdYx64y6Au+ZKlb1IA==",
+      "version": "0.5.3",
+      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.5.3.tgz",
+      "integrity": "sha512-8sHeDOmXC8csczMrYEOf0UTNa4yE2SxV5JGeT/LP1n0OYVDUUFPxG9vdk2AlDlIit4t+Kf0xCtpgXPBwnn/9pw==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-define-polyfill-provider": "^0.4.2"
+        "@babel/helper-define-polyfill-provider": "^0.4.3"
       },
       "peerDependencies": {
         "@babel/core": "^7.4.0 || ^8.0.0-0 <8.0.0"
@@ -4828,22 +4828,22 @@
       }
     },
     "node_modules/babel-plugin-polyfill-corejs3": {
-      "version": "0.8.3",
-      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.8.3.tgz",
-      "integrity": "sha512-z41XaniZL26WLrvjy7soabMXrfPWARN25PZoriDEiLMxAp50AUW3t35BGQUMg5xK3UrpVTtagIDklxYa+MhiNA==",
+      "version": "0.8.5",
+      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.8.5.tgz",
+      "integrity": "sha512-Q6CdATeAvbScWPNLB8lzSO7fgUVBkQt6zLgNlfyeCr/EQaEQR+bWiBYYPYAFyE528BMjRhL+1QBMOI4jc/c5TA==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-define-polyfill-provider": "^0.4.2",
-        "core-js-compat": "^3.31.0"
+        "@babel/helper-define-polyfill-provider": "^0.4.3",
+        "core-js-compat": "^3.32.2"
       },
       "peerDependencies": {
         "@babel/core": "^7.4.0 || ^8.0.0-0 <8.0.0"
       }
     },
     "node_modules/babel-plugin-polyfill-corejs3/node_modules/@babel/helper-define-polyfill-provider": {
-      "version": "0.4.2",
-      "resolved": "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.4.2.tgz",
-      "integrity": "sha512-k0qnnOqHn5dK9pZpfD5XXZ9SojAITdCKRn2Lp6rnDGzIbaP0rHyMPk/4wsSxVBVz4RfN0q6VpXWP2pDGIoQ7hw==",
+      "version": "0.4.3",
+      "resolved": "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.4.3.tgz",
+      "integrity": "sha512-WBrLmuPP47n7PNwsZ57pqam6G/RGo1vw/87b0Blc53tZNGZ4x7YvZ6HgQe2vo1W/FR20OgjeZuGXzudPiXHFug==",
       "dev": true,
       "dependencies": {
         "@babel/helper-compilation-targets": "^7.22.6",
@@ -5199,9 +5199,9 @@
       ]
     },
     "node_modules/browserslist": {
-      "version": "4.21.10",
-      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.21.10.tgz",
-      "integrity": "sha512-bipEBdZfVH5/pwrvqc+Ub0kUPVfGUhlKxbvfD+z1BDnPEO/X98ruXGA1WP5ASpAFKan7Qr6j736IacbZQuAlKQ==",
+      "version": "4.22.1",
+      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.22.1.tgz",
+      "integrity": "sha512-FEVc202+2iuClEhZhrWy6ZiAcRLvNMyYcxZ8raemul1DYVOVdFsbqckWLdsixQZCpJlwe77Z3UTalE7jsjnKfQ==",
       "funding": [
         {
           "type": "opencollective",
@@ -5217,10 +5217,10 @@
         }
       ],
       "dependencies": {
-        "caniuse-lite": "^1.0.30001517",
-        "electron-to-chromium": "^1.4.477",
+        "caniuse-lite": "^1.0.30001541",
+        "electron-to-chromium": "^1.4.535",
         "node-releases": "^2.0.13",
-        "update-browserslist-db": "^1.0.11"
+        "update-browserslist-db": "^1.0.13"
       },
       "bin": {
         "browserslist": "cli.js"
@@ -5469,9 +5469,9 @@
       }
     },
     "node_modules/caniuse-lite": {
-      "version": "1.0.30001538",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001538.tgz",
-      "integrity": "sha512-HWJnhnID+0YMtGlzcp3T9drmBJUVDchPJ08tpUGFLs9CYlwWPH2uLgpHn8fND5pCgXVtnGS3H4QR9XLMHVNkHw==",
+      "version": "1.0.30001549",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001549.tgz",
+      "integrity": "sha512-qRp48dPYSCYaP+KurZLhDYdVE+yEyht/3NlmcJgVQ2VMGt6JL36ndQ/7rgspdZsJuxDPFIo/OzBT2+GmIJ53BA==",
       "funding": [
         {
           "type": "opencollective",
@@ -5920,11 +5920,11 @@
       }
     },
     "node_modules/core-js-compat": {
-      "version": "3.31.0",
-      "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.31.0.tgz",
-      "integrity": "sha512-hM7YCu1cU6Opx7MXNu0NuumM0ezNeAeRKadixyiQELWY3vT3De9S4J5ZBMraWV2vZnrE1Cirl0GtFtDtMUXzPw==",
+      "version": "3.33.0",
+      "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.33.0.tgz",
+      "integrity": "sha512-0w4LcLXsVEuNkIqwjjf9rjCoPhK8uqA4tMRh4Ge26vfLtUutshn+aRJU21I9LCJlh2QQHfisNToLjw1XEJLTWw==",
       "dependencies": {
-        "browserslist": "^4.21.5"
+        "browserslist": "^4.22.1"
       },
       "funding": {
         "type": "opencollective",
@@ -6879,9 +6879,9 @@
       "integrity": "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow=="
     },
     "node_modules/electron-to-chromium": {
-      "version": "1.4.490",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.490.tgz",
-      "integrity": "sha512-6s7NVJz+sATdYnIwhdshx/N/9O6rvMxmhVoDSDFdj6iA45gHR8EQje70+RYsF4GeB+k0IeNSBnP7yG9ZXJFr7A=="
+      "version": "1.4.555",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.555.tgz",
+      "integrity": "sha512-k1wGC7UXDTyCWcONkEMRG/w6Jvrxi+SVEU+IeqUKUKjv2lGJ1b+jf1mqrloyxVTG5WYYjNQ+F6+Cb1fGrLvNcA=="
     },
     "node_modules/elliptic": {
       "version": "6.5.4",
@@ -16530,9 +16530,9 @@
       }
     },
     "node_modules/update-browserslist-db": {
-      "version": "1.0.11",
-      "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.11.tgz",
-      "integrity": "sha512-dCwEFf0/oT85M1fHBg4F0jtLwJrutGoHSQXCh7u4o2t1drG+c0a9Flnqww6XUKSfQMPpJBRjU8d4RXB09qtvaA==",
+      "version": "1.0.13",
+      "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.13.tgz",
+      "integrity": "sha512-xebP81SNcPuNpPP3uzeW1NYXxI3rxyJzF3pD6sH4jE7o/IX+WtSpwnVU+qIsDPyk0d3hmFQ7mjqc6AtV604hbg==",
       "funding": [
         {
           "type": "opencollective",
@@ -17914,9 +17914,9 @@
       }
     },
     "@babel/compat-data": {
-      "version": "7.22.20",
-      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.22.20.tgz",
-      "integrity": "sha512-BQYjKbpXjoXwFW5jGqiizJQQT/aC7pFm9Ok1OWssonuguICi264lbgMzRp2ZMmRSlfkX6DsWDDcsrctK8Rwfiw=="
+      "version": "7.23.2",
+      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.23.2.tgz",
+      "integrity": "sha512-0S9TQMmDHlqAZ2ITT95irXKfxN9bncq8ZCoJhun3nHL/lLUxd2NKBJYoNGWH7S0hz6fRQwWlAWn/ILM0C70KZQ=="
     },
     "@babel/core": {
       "version": "7.23.0",
@@ -18109,14 +18109,14 @@
       "integrity": "sha512-uLls06UVKgFG9QD4OeFYLEGteMIAa5kpTPcFL28yuCIIzsf6ZyKZMllKVOCZFhiZ5ptnwX4mtKdWCBE/uT4amg=="
     },
     "@babel/helper-remap-async-to-generator": {
-      "version": "7.22.9",
-      "resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.22.9.tgz",
-      "integrity": "sha512-8WWC4oR4Px+tr+Fp0X3RHDVfINGpF3ad1HIbrc8A77epiR6eMMc6jsgozkzT2uDiOOdoS9cLIQ+XD2XvI2WSmQ==",
+      "version": "7.22.20",
+      "resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.22.20.tgz",
+      "integrity": "sha512-pBGyV4uBqOns+0UvhsTO8qgl8hO89PmiDYv+/COyp1aeMcmfrfruz+/nCMFiYyFF/Knn0yfrC85ZzNFjembFTw==",
       "dev": true,
       "requires": {
         "@babel/helper-annotate-as-pure": "^7.22.5",
-        "@babel/helper-environment-visitor": "^7.22.5",
-        "@babel/helper-wrap-function": "^7.22.9"
+        "@babel/helper-environment-visitor": "^7.22.20",
+        "@babel/helper-wrap-function": "^7.22.20"
       }
     },
     "@babel/helper-replace-supers": {
@@ -18171,14 +18171,14 @@
       "integrity": "sha512-bMn7RmyFjY/mdECUbgn9eoSY4vqvacUnS9i9vGAGttgFWesO6B4CYWA7XlpbWgBt71iv/hfbPlynohStqnu5hA=="
     },
     "@babel/helper-wrap-function": {
-      "version": "7.22.10",
-      "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.22.10.tgz",
-      "integrity": "sha512-OnMhjWjuGYtdoO3FmsEFWvBStBAe2QOgwOLsLNDjN+aaiMD8InJk1/O3HSD8lkqTjCgg5YI34Tz15KNNA3p+nQ==",
+      "version": "7.22.20",
+      "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.22.20.tgz",
+      "integrity": "sha512-pms/UwkOpnQe/PDAEdV/d7dVCoBbB+R4FvYoHGZz+4VPcg7RtYy2KP7S2lbuWM6FCSgob5wshfGESbC/hzNXZw==",
       "dev": true,
       "requires": {
         "@babel/helper-function-name": "^7.22.5",
-        "@babel/template": "^7.22.5",
-        "@babel/types": "^7.22.10"
+        "@babel/template": "^7.22.15",
+        "@babel/types": "^7.22.19"
       }
     },
     "@babel/helpers": {
@@ -18433,14 +18433,14 @@
       }
     },
     "@babel/plugin-transform-async-generator-functions": {
-      "version": "7.22.15",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-generator-functions/-/plugin-transform-async-generator-functions-7.22.15.tgz",
-      "integrity": "sha512-jBm1Es25Y+tVoTi5rfd5t1KLmL8ogLKpXszboWOTTtGFGz2RKnQe2yn7HbZ+kb/B8N0FVSGQo874NSlOU1T4+w==",
+      "version": "7.23.2",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-generator-functions/-/plugin-transform-async-generator-functions-7.23.2.tgz",
+      "integrity": "sha512-BBYVGxbDVHfoeXbOwcagAkOQAm9NxoTdMGfTqghu1GrvadSaw6iW3Je6IcL5PNOw8VwjxqBECXy50/iCQSY/lQ==",
       "dev": true,
       "requires": {
-        "@babel/helper-environment-visitor": "^7.22.5",
+        "@babel/helper-environment-visitor": "^7.22.20",
         "@babel/helper-plugin-utils": "^7.22.5",
-        "@babel/helper-remap-async-to-generator": "^7.22.9",
+        "@babel/helper-remap-async-to-generator": "^7.22.20",
         "@babel/plugin-syntax-async-generators": "^7.8.4"
       }
     },
@@ -18465,9 +18465,9 @@
       }
     },
     "@babel/plugin-transform-block-scoping": {
-      "version": "7.22.15",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.22.15.tgz",
-      "integrity": "sha512-G1czpdJBZCtngoK1sJgloLiOHUnkb/bLZwqVZD8kXmq0ZnVfTTWUcs9OWtp0mBtYJ+4LQY1fllqBkOIPhXmFmw==",
+      "version": "7.23.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.23.0.tgz",
+      "integrity": "sha512-cOsrbmIOXmf+5YbL99/S49Y3j46k/T16b9ml8bm9lP6N9US5iQ2yBK7gpui1pg0V/WMcXdkfKbTb7HXq9u+v4g==",
       "dev": true,
       "requires": {
         "@babel/helper-plugin-utils": "^7.22.5"
@@ -18522,9 +18522,9 @@
       }
     },
     "@babel/plugin-transform-destructuring": {
-      "version": "7.22.15",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.22.15.tgz",
-      "integrity": "sha512-HzG8sFl1ZVGTme74Nw+X01XsUTqERVQ6/RLHo3XjGRzm7XD6QTtfS3NJotVgCGy8BzkDqRjRBD8dAyJn5TuvSQ==",
+      "version": "7.23.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.23.0.tgz",
+      "integrity": "sha512-vaMdgNXFkYrB+8lbgniSYWHsgqK5gjaMNcc84bMIOMRLH0L9AqYq3hwMdvnyqj1OPqea8UtjPEuS/DCenah1wg==",
       "dev": true,
       "requires": {
         "@babel/helper-plugin-utils": "^7.22.5"
@@ -18638,36 +18638,36 @@
       }
     },
     "@babel/plugin-transform-modules-amd": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.22.5.tgz",
-      "integrity": "sha512-R+PTfLTcYEmb1+kK7FNkhQ1gP4KgjpSO6HfH9+f8/yfp2Nt3ggBjiVpRwmwTlfqZLafYKJACy36yDXlEmI9HjQ==",
+      "version": "7.23.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.23.0.tgz",
+      "integrity": "sha512-xWT5gefv2HGSm4QHtgc1sYPbseOyf+FFDo2JbpE25GWl5BqTGO9IMwTYJRoIdjsF85GE+VegHxSCUt5EvoYTAw==",
       "dev": true,
       "requires": {
-        "@babel/helper-module-transforms": "^7.22.5",
+        "@babel/helper-module-transforms": "^7.23.0",
         "@babel/helper-plugin-utils": "^7.22.5"
       }
     },
     "@babel/plugin-transform-modules-commonjs": {
-      "version": "7.22.15",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.22.15.tgz",
-      "integrity": "sha512-jWL4eh90w0HQOTKP2MoXXUpVxilxsB2Vl4ji69rSjS3EcZ/v4sBmn+A3NpepuJzBhOaEBbR7udonlHHn5DWidg==",
+      "version": "7.23.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.23.0.tgz",
+      "integrity": "sha512-32Xzss14/UVc7k9g775yMIvkVK8xwKE0DPdP5JTapr3+Z9w4tzeOuLNY6BXDQR6BdnzIlXnCGAzsk/ICHBLVWQ==",
       "dev": true,
       "requires": {
-        "@babel/helper-module-transforms": "^7.22.15",
+        "@babel/helper-module-transforms": "^7.23.0",
         "@babel/helper-plugin-utils": "^7.22.5",
         "@babel/helper-simple-access": "^7.22.5"
       }
     },
     "@babel/plugin-transform-modules-systemjs": {
-      "version": "7.22.11",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.22.11.tgz",
-      "integrity": "sha512-rIqHmHoMEOhI3VkVf5jQ15l539KrwhzqcBO6wdCNWPWc/JWt9ILNYNUssbRpeq0qWns8svuw8LnMNCvWBIJ8wA==",
+      "version": "7.23.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.23.0.tgz",
+      "integrity": "sha512-qBej6ctXZD2f+DhlOC9yO47yEYgUh5CZNz/aBoH4j/3NOlRfJXJbY7xDQCqQVf9KbrqGzIWER1f23doHGrIHFg==",
       "dev": true,
       "requires": {
         "@babel/helper-hoist-variables": "^7.22.5",
-        "@babel/helper-module-transforms": "^7.22.9",
+        "@babel/helper-module-transforms": "^7.23.0",
         "@babel/helper-plugin-utils": "^7.22.5",
-        "@babel/helper-validator-identifier": "^7.22.5"
+        "@babel/helper-validator-identifier": "^7.22.20"
       }
     },
     "@babel/plugin-transform-modules-umd": {
@@ -18753,9 +18753,9 @@
       }
     },
     "@babel/plugin-transform-optional-chaining": {
-      "version": "7.22.15",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-optional-chaining/-/plugin-transform-optional-chaining-7.22.15.tgz",
-      "integrity": "sha512-ngQ2tBhq5vvSJw2Q2Z9i7ealNkpDMU0rGWnHPKqRZO0tzZ5tlaoz4hDvhXioOoaE0X2vfNss1djwg0DXlfu30A==",
+      "version": "7.23.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-optional-chaining/-/plugin-transform-optional-chaining-7.23.0.tgz",
+      "integrity": "sha512-sBBGXbLJjxTzLBF5rFWaikMnOGOk/BmK6vVByIdEggZ7Vn6CvWXZyRkkLFK6WE0IF8jSliyOkUN6SScFgzCM0g==",
       "dev": true,
       "requires": {
         "@babel/helper-plugin-utils": "^7.22.5",
@@ -18932,12 +18932,12 @@
       }
     },
     "@babel/preset-env": {
-      "version": "7.22.20",
-      "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.22.20.tgz",
-      "integrity": "sha512-11MY04gGC4kSzlPHRfvVkNAZhUxOvm7DCJ37hPDnUENwe06npjIRAfInEMTGSb4LZK5ZgDFkv5hw0lGebHeTyg==",
+      "version": "7.23.2",
+      "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.23.2.tgz",
+      "integrity": "sha512-BW3gsuDD+rvHL2VO2SjAUNTBe5YrjsTiDyqamPDWY723na3/yPQ65X5oQkFVJZ0o50/2d+svm1rkPoJeR1KxVQ==",
       "dev": true,
       "requires": {
-        "@babel/compat-data": "^7.22.20",
+        "@babel/compat-data": "^7.23.2",
         "@babel/helper-compilation-targets": "^7.22.15",
         "@babel/helper-plugin-utils": "^7.22.5",
         "@babel/helper-validator-option": "^7.22.15",
@@ -18963,15 +18963,15 @@
         "@babel/plugin-syntax-top-level-await": "^7.14.5",
         "@babel/plugin-syntax-unicode-sets-regex": "^7.18.6",
         "@babel/plugin-transform-arrow-functions": "^7.22.5",
-        "@babel/plugin-transform-async-generator-functions": "^7.22.15",
+        "@babel/plugin-transform-async-generator-functions": "^7.23.2",
         "@babel/plugin-transform-async-to-generator": "^7.22.5",
         "@babel/plugin-transform-block-scoped-functions": "^7.22.5",
-        "@babel/plugin-transform-block-scoping": "^7.22.15",
+        "@babel/plugin-transform-block-scoping": "^7.23.0",
         "@babel/plugin-transform-class-properties": "^7.22.5",
         "@babel/plugin-transform-class-static-block": "^7.22.11",
         "@babel/plugin-transform-classes": "^7.22.15",
         "@babel/plugin-transform-computed-properties": "^7.22.5",
-        "@babel/plugin-transform-destructuring": "^7.22.15",
+        "@babel/plugin-transform-destructuring": "^7.23.0",
         "@babel/plugin-transform-dotall-regex": "^7.22.5",
         "@babel/plugin-transform-duplicate-keys": "^7.22.5",
         "@babel/plugin-transform-dynamic-import": "^7.22.11",
@@ -18983,9 +18983,9 @@
         "@babel/plugin-transform-literals": "^7.22.5",
         "@babel/plugin-transform-logical-assignment-operators": "^7.22.11",
         "@babel/plugin-transform-member-expression-literals": "^7.22.5",
-        "@babel/plugin-transform-modules-amd": "^7.22.5",
-        "@babel/plugin-transform-modules-commonjs": "^7.22.15",
-        "@babel/plugin-transform-modules-systemjs": "^7.22.11",
+        "@babel/plugin-transform-modules-amd": "^7.23.0",
+        "@babel/plugin-transform-modules-commonjs": "^7.23.0",
+        "@babel/plugin-transform-modules-systemjs": "^7.23.0",
         "@babel/plugin-transform-modules-umd": "^7.22.5",
         "@babel/plugin-transform-named-capturing-groups-regex": "^7.22.5",
         "@babel/plugin-transform-new-target": "^7.22.5",
@@ -18994,7 +18994,7 @@
         "@babel/plugin-transform-object-rest-spread": "^7.22.15",
         "@babel/plugin-transform-object-super": "^7.22.5",
         "@babel/plugin-transform-optional-catch-binding": "^7.22.11",
-        "@babel/plugin-transform-optional-chaining": "^7.22.15",
+        "@babel/plugin-transform-optional-chaining": "^7.23.0",
         "@babel/plugin-transform-parameters": "^7.22.15",
         "@babel/plugin-transform-private-methods": "^7.22.5",
         "@babel/plugin-transform-private-property-in-object": "^7.22.11",
@@ -19011,18 +19011,18 @@
         "@babel/plugin-transform-unicode-regex": "^7.22.5",
         "@babel/plugin-transform-unicode-sets-regex": "^7.22.5",
         "@babel/preset-modules": "0.1.6-no-external-plugins",
-        "@babel/types": "^7.22.19",
-        "babel-plugin-polyfill-corejs2": "^0.4.5",
-        "babel-plugin-polyfill-corejs3": "^0.8.3",
-        "babel-plugin-polyfill-regenerator": "^0.5.2",
+        "@babel/types": "^7.23.0",
+        "babel-plugin-polyfill-corejs2": "^0.4.6",
+        "babel-plugin-polyfill-corejs3": "^0.8.5",
+        "babel-plugin-polyfill-regenerator": "^0.5.3",
         "core-js-compat": "^3.31.0",
         "semver": "^6.3.1"
       },
       "dependencies": {
         "@babel/helper-define-polyfill-provider": {
-          "version": "0.4.2",
-          "resolved": "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.4.2.tgz",
-          "integrity": "sha512-k0qnnOqHn5dK9pZpfD5XXZ9SojAITdCKRn2Lp6rnDGzIbaP0rHyMPk/4wsSxVBVz4RfN0q6VpXWP2pDGIoQ7hw==",
+          "version": "0.4.3",
+          "resolved": "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.4.3.tgz",
+          "integrity": "sha512-WBrLmuPP47n7PNwsZ57pqam6G/RGo1vw/87b0Blc53tZNGZ4x7YvZ6HgQe2vo1W/FR20OgjeZuGXzudPiXHFug==",
           "dev": true,
           "requires": {
             "@babel/helper-compilation-targets": "^7.22.6",
@@ -19033,23 +19033,23 @@
           }
         },
         "babel-plugin-polyfill-corejs2": {
-          "version": "0.4.5",
-          "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.4.5.tgz",
-          "integrity": "sha512-19hwUH5FKl49JEsvyTcoHakh6BE0wgXLLptIyKZ3PijHc/Ci521wygORCUCCred+E/twuqRyAkE02BAWPmsHOg==",
+          "version": "0.4.6",
+          "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.4.6.tgz",
+          "integrity": "sha512-jhHiWVZIlnPbEUKSSNb9YoWcQGdlTLq7z1GHL4AjFxaoOUMuuEVJ+Y4pAaQUGOGk93YsVCKPbqbfw3m0SM6H8Q==",
           "dev": true,
           "requires": {
             "@babel/compat-data": "^7.22.6",
-            "@babel/helper-define-polyfill-provider": "^0.4.2",
+            "@babel/helper-define-polyfill-provider": "^0.4.3",
             "semver": "^6.3.1"
           }
         },
         "babel-plugin-polyfill-regenerator": {
-          "version": "0.5.2",
-          "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.5.2.tgz",
-          "integrity": "sha512-tAlOptU0Xj34V1Y2PNTL4Y0FOJMDB6bZmoW39FeCQIhigGLkqu3Fj6uiXpxIf6Ij274ENdYx64y6Au+ZKlb1IA==",
+          "version": "0.5.3",
+          "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.5.3.tgz",
+          "integrity": "sha512-8sHeDOmXC8csczMrYEOf0UTNa4yE2SxV5JGeT/LP1n0OYVDUUFPxG9vdk2AlDlIit4t+Kf0xCtpgXPBwnn/9pw==",
           "dev": true,
           "requires": {
-            "@babel/helper-define-polyfill-provider": "^0.4.2"
+            "@babel/helper-define-polyfill-provider": "^0.4.3"
           }
         }
       }
@@ -21303,19 +21303,19 @@
       }
     },
     "babel-plugin-polyfill-corejs3": {
-      "version": "0.8.3",
-      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.8.3.tgz",
-      "integrity": "sha512-z41XaniZL26WLrvjy7soabMXrfPWARN25PZoriDEiLMxAp50AUW3t35BGQUMg5xK3UrpVTtagIDklxYa+MhiNA==",
+      "version": "0.8.5",
+      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.8.5.tgz",
+      "integrity": "sha512-Q6CdATeAvbScWPNLB8lzSO7fgUVBkQt6zLgNlfyeCr/EQaEQR+bWiBYYPYAFyE528BMjRhL+1QBMOI4jc/c5TA==",
       "dev": true,
       "requires": {
-        "@babel/helper-define-polyfill-provider": "^0.4.2",
-        "core-js-compat": "^3.31.0"
+        "@babel/helper-define-polyfill-provider": "^0.4.3",
+        "core-js-compat": "^3.32.2"
       },
       "dependencies": {
         "@babel/helper-define-polyfill-provider": {
-          "version": "0.4.2",
-          "resolved": "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.4.2.tgz",
-          "integrity": "sha512-k0qnnOqHn5dK9pZpfD5XXZ9SojAITdCKRn2Lp6rnDGzIbaP0rHyMPk/4wsSxVBVz4RfN0q6VpXWP2pDGIoQ7hw==",
+          "version": "0.4.3",
+          "resolved": "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.4.3.tgz",
+          "integrity": "sha512-WBrLmuPP47n7PNwsZ57pqam6G/RGo1vw/87b0Blc53tZNGZ4x7YvZ6HgQe2vo1W/FR20OgjeZuGXzudPiXHFug==",
           "dev": true,
           "requires": {
             "@babel/helper-compilation-targets": "^7.22.6",
@@ -21599,14 +21599,14 @@
       }
     },
     "browserslist": {
-      "version": "4.21.10",
-      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.21.10.tgz",
-      "integrity": "sha512-bipEBdZfVH5/pwrvqc+Ub0kUPVfGUhlKxbvfD+z1BDnPEO/X98ruXGA1WP5ASpAFKan7Qr6j736IacbZQuAlKQ==",
+      "version": "4.22.1",
+      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.22.1.tgz",
+      "integrity": "sha512-FEVc202+2iuClEhZhrWy6ZiAcRLvNMyYcxZ8raemul1DYVOVdFsbqckWLdsixQZCpJlwe77Z3UTalE7jsjnKfQ==",
       "requires": {
-        "caniuse-lite": "^1.0.30001517",
-        "electron-to-chromium": "^1.4.477",
+        "caniuse-lite": "^1.0.30001541",
+        "electron-to-chromium": "^1.4.535",
         "node-releases": "^2.0.13",
-        "update-browserslist-db": "^1.0.11"
+        "update-browserslist-db": "^1.0.13"
       }
     },
     "bs58": {
@@ -21796,9 +21796,9 @@
       }
     },
     "caniuse-lite": {
-      "version": "1.0.30001538",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001538.tgz",
-      "integrity": "sha512-HWJnhnID+0YMtGlzcp3T9drmBJUVDchPJ08tpUGFLs9CYlwWPH2uLgpHn8fND5pCgXVtnGS3H4QR9XLMHVNkHw=="
+      "version": "1.0.30001549",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001549.tgz",
+      "integrity": "sha512-qRp48dPYSCYaP+KurZLhDYdVE+yEyht/3NlmcJgVQ2VMGt6JL36ndQ/7rgspdZsJuxDPFIo/OzBT2+GmIJ53BA=="
     },
     "caseless": {
       "version": "0.12.0",
@@ -22138,11 +22138,11 @@
       "integrity": "sha512-HoZr92+ZjFEKar5HS6MC776gYslNOKHt75mEBKWKnPeFDpZ6nH5OeF3S6HFT1mUAUZKrzkez05VboaX8myjSuw=="
     },
     "core-js-compat": {
-      "version": "3.31.0",
-      "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.31.0.tgz",
-      "integrity": "sha512-hM7YCu1cU6Opx7MXNu0NuumM0ezNeAeRKadixyiQELWY3vT3De9S4J5ZBMraWV2vZnrE1Cirl0GtFtDtMUXzPw==",
+      "version": "3.33.0",
+      "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.33.0.tgz",
+      "integrity": "sha512-0w4LcLXsVEuNkIqwjjf9rjCoPhK8uqA4tMRh4Ge26vfLtUutshn+aRJU21I9LCJlh2QQHfisNToLjw1XEJLTWw==",
       "requires": {
-        "browserslist": "^4.21.5"
+        "browserslist": "^4.22.1"
       }
     },
     "core-util-is": {
@@ -22847,9 +22847,9 @@
       "integrity": "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow=="
     },
     "electron-to-chromium": {
-      "version": "1.4.490",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.490.tgz",
-      "integrity": "sha512-6s7NVJz+sATdYnIwhdshx/N/9O6rvMxmhVoDSDFdj6iA45gHR8EQje70+RYsF4GeB+k0IeNSBnP7yG9ZXJFr7A=="
+      "version": "1.4.555",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.555.tgz",
+      "integrity": "sha512-k1wGC7UXDTyCWcONkEMRG/w6Jvrxi+SVEU+IeqUKUKjv2lGJ1b+jf1mqrloyxVTG5WYYjNQ+F6+Cb1fGrLvNcA=="
     },
     "elliptic": {
       "version": "6.5.4",
@@ -30150,9 +30150,9 @@
       "integrity": "sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ=="
     },
     "update-browserslist-db": {
-      "version": "1.0.11",
-      "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.11.tgz",
-      "integrity": "sha512-dCwEFf0/oT85M1fHBg4F0jtLwJrutGoHSQXCh7u4o2t1drG+c0a9Flnqww6XUKSfQMPpJBRjU8d4RXB09qtvaA==",
+      "version": "1.0.13",
+      "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.13.tgz",
+      "integrity": "sha512-xebP81SNcPuNpPP3uzeW1NYXxI3rxyJzF3pD6sH4jE7o/IX+WtSpwnVU+qIsDPyk0d3hmFQ7mjqc6AtV604hbg==",
       "requires": {
         "escalade": "^3.1.1",
         "picocolors": "^1.0.0"
diff --git a/apps/block_scout_web/assets/package.json b/apps/block_scout_web/assets/package.json
index 648673ded592..b387c7e8a252 100644
--- a/apps/block_scout_web/assets/package.json
+++ b/apps/block_scout_web/assets/package.json
@@ -84,7 +84,7 @@
   },
   "devDependencies": {
     "@babel/core": "^7.23.0",
-    "@babel/preset-env": "^7.22.20",
+    "@babel/preset-env": "^7.23.2",
     "autoprefixer": "^10.4.16",
     "babel-loader": "^9.1.3",
     "copy-webpack-plugin": "^11.0.0",

From 23b83ff80cbf29ef5dd788a93762523f6c42ece7 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 16 Oct 2023 18:09:09 +0000
Subject: [PATCH 495/909] Bump sass from 1.69.0 to 1.69.3 in
 /apps/block_scout_web/assets

Bumps [sass](https://github.com/sass/dart-sass) from 1.69.0 to 1.69.3.
- [Release notes](https://github.com/sass/dart-sass/releases)
- [Changelog](https://github.com/sass/dart-sass/blob/main/CHANGELOG.md)
- [Commits](https://github.com/sass/dart-sass/compare/1.69.0...1.69.3)

---
updated-dependencies:
- dependency-name: sass
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 apps/block_scout_web/assets/package-lock.json | 14 +++++++-------
 apps/block_scout_web/assets/package.json      |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/apps/block_scout_web/assets/package-lock.json b/apps/block_scout_web/assets/package-lock.json
index 7c5970b31d23..4106e7dc33a7 100644
--- a/apps/block_scout_web/assets/package-lock.json
+++ b/apps/block_scout_web/assets/package-lock.json
@@ -89,7 +89,7 @@
         "mini-css-extract-plugin": "^2.7.6",
         "postcss": "^8.4.31",
         "postcss-loader": "^7.3.3",
-        "sass": "^1.69.0",
+        "sass": "^1.69.3",
         "sass-loader": "^13.3.2",
         "style-loader": "^3.3.3",
         "webpack": "^5.88.2",
@@ -15147,9 +15147,9 @@
       "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
     },
     "node_modules/sass": {
-      "version": "1.69.0",
-      "resolved": "https://registry.npmjs.org/sass/-/sass-1.69.0.tgz",
-      "integrity": "sha512-l3bbFpfTOGgQZCLU/gvm1lbsQ5mC/WnLz3djL2v4WCJBDrWm58PO+jgngcGRNnKUh6wSsdm50YaovTqskZ0xDQ==",
+      "version": "1.69.3",
+      "resolved": "https://registry.npmjs.org/sass/-/sass-1.69.3.tgz",
+      "integrity": "sha512-X99+a2iGdXkdWn1akFPs0ZmelUzyAQfvqYc2P/MPTrJRuIRoTffGzT9W9nFqG00S+c8hXzVmgxhUuHFdrwxkhQ==",
       "dev": true,
       "dependencies": {
         "chokidar": ">=3.0.0 <4.0.0",
@@ -29146,9 +29146,9 @@
       "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
     },
     "sass": {
-      "version": "1.69.0",
-      "resolved": "https://registry.npmjs.org/sass/-/sass-1.69.0.tgz",
-      "integrity": "sha512-l3bbFpfTOGgQZCLU/gvm1lbsQ5mC/WnLz3djL2v4WCJBDrWm58PO+jgngcGRNnKUh6wSsdm50YaovTqskZ0xDQ==",
+      "version": "1.69.3",
+      "resolved": "https://registry.npmjs.org/sass/-/sass-1.69.3.tgz",
+      "integrity": "sha512-X99+a2iGdXkdWn1akFPs0ZmelUzyAQfvqYc2P/MPTrJRuIRoTffGzT9W9nFqG00S+c8hXzVmgxhUuHFdrwxkhQ==",
       "dev": true,
       "requires": {
         "chokidar": ">=3.0.0 <4.0.0",
diff --git a/apps/block_scout_web/assets/package.json b/apps/block_scout_web/assets/package.json
index 648673ded592..208d61e4ae89 100644
--- a/apps/block_scout_web/assets/package.json
+++ b/apps/block_scout_web/assets/package.json
@@ -101,7 +101,7 @@
     "mini-css-extract-plugin": "^2.7.6",
     "postcss": "^8.4.31",
     "postcss-loader": "^7.3.3",
-    "sass": "^1.69.0",
+    "sass": "^1.69.3",
     "sass-loader": "^13.3.2",
     "style-loader": "^3.3.3",
     "webpack": "^5.88.2",

From d65efab7953f44ad5c7ac687eec23b6b1953e1de Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 16 Oct 2023 18:11:26 +0000
Subject: [PATCH 496/909] Bump hackney from 1.19.1 to 1.20.1

Bumps [hackney](https://github.com/benoitc/hackney) from 1.19.1 to 1.20.1.
- [Release notes](https://github.com/benoitc/hackney/releases)
- [Changelog](https://github.com/benoitc/hackney/blob/master/NEWS.md)
- [Commits](https://github.com/benoitc/hackney/compare/1.19.1...1.20.1)

---
updated-dependencies:
- dependency-name: hackney
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 mix.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mix.lock b/mix.lock
index af7683c09575..bddcbb429173 100644
--- a/mix.lock
+++ b/mix.lock
@@ -64,7 +64,7 @@
   "flow": {:hex, :flow, "1.2.4", "1dd58918287eb286656008777cb32714b5123d3855956f29aa141ebae456922d", [:mix], [{:gen_stage, "~> 1.0", [hex: :gen_stage, repo: "hexpm", optional: false]}], "hexpm", "874adde96368e71870f3510b91e35bc31652291858c86c0e75359cbdd35eb211"},
   "gen_stage": {:hex, :gen_stage, "1.2.1", "19d8b5e9a5996d813b8245338a28246307fd8b9c99d1237de199d21efc4c76a1", [:mix], [], "hexpm", "83e8be657fa05b992ffa6ac1e3af6d57aa50aace8f691fcf696ff02f8335b001"},
   "gettext": {:hex, :gettext, "0.23.1", "821e619a240e6000db2fc16a574ef68b3bd7fe0167ccc264a81563cc93e67a31", [:mix], [{:expo, "~> 0.4.0", [hex: :expo, repo: "hexpm", optional: false]}], "hexpm", "19d744a36b809d810d610b57c27b934425859d158ebd56561bc41f7eeb8795db"},
-  "hackney": {:hex, :hackney, "1.19.1", "59de4716e985dd2b5cbd4954fa1ae187e2b610a9c4520ffcb0b1653c3d6e5559", [:rebar3], [{:certifi, "~>2.12.0", [hex: :certifi, repo: "hexpm", optional: false]}, {:idna, "~>6.1.0", [hex: :idna, repo: "hexpm", optional: false]}, {:metrics, "~>1.0.0", [hex: :metrics, repo: "hexpm", optional: false]}, {:mimerl, "~>1.1", [hex: :mimerl, repo: "hexpm", optional: false]}, {:parse_trans, "3.4.1", [hex: :parse_trans, repo: "hexpm", optional: false]}, {:ssl_verify_fun, "~>1.1.0", [hex: :ssl_verify_fun, repo: "hexpm", optional: false]}, {:unicode_util_compat, "~>0.7.0", [hex: :unicode_util_compat, repo: "hexpm", optional: false]}], "hexpm", "8aa08234bdefc269995c63c2282cf3cd0e36febe3a6bfab11b610572fdd1cad0"},
+  "hackney": {:hex, :hackney, "1.20.1", "8d97aec62ddddd757d128bfd1df6c5861093419f8f7a4223823537bad5d064e2", [:rebar3], [{:certifi, "~>2.12.0", [hex: :certifi, repo: "hexpm", optional: false]}, {:idna, "~>6.1.0", [hex: :idna, repo: "hexpm", optional: false]}, {:metrics, "~>1.0.0", [hex: :metrics, repo: "hexpm", optional: false]}, {:mimerl, "~>1.1", [hex: :mimerl, repo: "hexpm", optional: false]}, {:parse_trans, "3.4.1", [hex: :parse_trans, repo: "hexpm", optional: false]}, {:ssl_verify_fun, "~>1.1.0", [hex: :ssl_verify_fun, repo: "hexpm", optional: false]}, {:unicode_util_compat, "~>0.7.0", [hex: :unicode_util_compat, repo: "hexpm", optional: false]}], "hexpm", "fe9094e5f1a2a2c0a7d10918fee36bfec0ec2a979994cff8cfe8058cd9af38e3"},
   "hammer": {:hex, :hammer, "6.1.0", "f263e3c3e9946bd410ea0336b2abe0cb6260af4afb3a221e1027540706e76c55", [:make, :mix], [{:poolboy, "~> 1.5", [hex: :poolboy, repo: "hexpm", optional: false]}], "hexpm", "b47e415a562a6d072392deabcd58090d8a41182cf9044cdd6b0d0faaaf68ba57"},
   "hammer_backend_redis": {:hex, :hammer_backend_redis, "6.1.2", "eb296bb4924928e24135308b2afc189201fd09411c870c6bbadea444a49b2f2c", [:mix], [{:hammer, "~> 6.0", [hex: :hammer, repo: "hexpm", optional: false]}, {:redix, "~> 1.1", [hex: :redix, repo: "hexpm", optional: false]}], "hexpm", "217ea066278910543a5e9b577d5bf2425419446b94fe76bdd9f255f39feec9fa"},
   "html_entities": {:hex, :html_entities, "0.5.2", "9e47e70598da7de2a9ff6af8758399251db6dbb7eebe2b013f2bbd2515895c3c", [:mix], [], "hexpm", "c53ba390403485615623b9531e97696f076ed415e8d8058b1dbaa28181f4fdcc"},

From 8ec4172d89ad98d903605c1f4a2faeaf4734bc71 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 16 Oct 2023 18:11:50 +0000
Subject: [PATCH 497/909] Bump ex_cldr from 2.37.2 to 2.37.4

Bumps [ex_cldr](https://github.com/elixir-cldr/cldr) from 2.37.2 to 2.37.4.
- [Release notes](https://github.com/elixir-cldr/cldr/releases)
- [Changelog](https://github.com/elixir-cldr/cldr/blob/main/CHANGELOG.md)
- [Commits](https://github.com/elixir-cldr/cldr/compare/v2.37.2...v2.37.4)

---
updated-dependencies:
- dependency-name: ex_cldr
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 mix.lock | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/mix.lock b/mix.lock
index af7683c09575..ee3dff60666b 100644
--- a/mix.lock
+++ b/mix.lock
@@ -12,7 +12,7 @@
   "bunt": {:hex, :bunt, "0.2.1", "e2d4792f7bc0ced7583ab54922808919518d0e57ee162901a16a1b6664ef3b14", [:mix], [], "hexpm", "a330bfb4245239787b15005e66ae6845c9cd524a288f0d141c148b02603777a5"},
   "bureaucrat": {:hex, :bureaucrat, "0.2.9", "d98e4d2b9bdbf22e4a45c2113ce8b38b5b63278506c6ff918e3b943a4355d85b", [:mix], [{:inflex, ">= 1.10.0", [hex: :inflex, repo: "hexpm", optional: false]}, {:phoenix, ">= 1.2.0", [hex: :phoenix, repo: "hexpm", optional: true]}, {:plug, ">= 1.0.0", [hex: :plug, repo: "hexpm", optional: false]}, {:poison, "~> 1.5 or ~> 2.0 or ~> 3.0 or ~> 4.0", [hex: :poison, repo: "hexpm", optional: true]}], "hexpm", "111c8dd84382a62e1026ae011d592ceee918553e5203fe8448d9ba6ccbdfff7d"},
   "bypass": {:hex, :bypass, "2.1.0", "909782781bf8e20ee86a9cabde36b259d44af8b9f38756173e8f5e2e1fabb9b1", [:mix], [{:plug, "~> 1.7", [hex: :plug, repo: "hexpm", optional: false]}, {:plug_cowboy, "~> 2.0", [hex: :plug_cowboy, repo: "hexpm", optional: false]}, {:ranch, "~> 1.3", [hex: :ranch, repo: "hexpm", optional: false]}], "hexpm", "d9b5df8fa5b7a6efa08384e9bbecfe4ce61c77d28a4282f79e02f1ef78d96b80"},
-  "castore": {:hex, :castore, "1.0.3", "7130ba6d24c8424014194676d608cb989f62ef8039efd50ff4b3f33286d06db8", [:mix], [], "hexpm", "680ab01ef5d15b161ed6a95449fac5c6b8f60055677a8e79acf01b27baa4390b"},
+  "castore": {:hex, :castore, "1.0.4", "ff4d0fb2e6411c0479b1d965a814ea6d00e51eb2f58697446e9c41a97d940b28", [:mix], [], "hexpm", "9418c1b8144e11656f0be99943db4caf04612e3eaecefb5dae9a2a87565584f8"},
   "cbor": {:hex, :cbor, "1.0.1", "39511158e8ea5a57c1fcb9639aaa7efde67129678fee49ebbda780f6f24959b0", [:mix], [], "hexpm", "5431acbe7a7908f17f6a9cd43311002836a34a8ab01876918d8cfb709cd8b6a2"},
   "certifi": {:hex, :certifi, "2.12.0", "2d1cca2ec95f59643862af91f001478c9863c2ac9cb6e2f89780bfd8de987329", [:rebar3], [], "hexpm", "ee68d85df22e554040cdb4be100f33873ac6051387baf6a8f6ce82272340ff1c"},
   "cldr_utils": {:hex, :cldr_utils, "2.24.1", "5ff8c8c55f96666228827bcf85a23d632022def200566346545d01d15e4c30dc", [:mix], [{:castore, "~> 0.1 or ~> 1.0", [hex: :castore, repo: "hexpm", optional: true]}, {:certifi, "~> 2.5", [hex: :certifi, repo: "hexpm", optional: true]}, {:decimal, "~> 1.9 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: false]}], "hexpm", "1820300531b5b849d0bc468e5a87cd64f8f2c5191916f548cbe69b2efc203780"},
@@ -42,7 +42,7 @@
   "elixir_make": {:hex, :elixir_make, "0.7.7", "7128c60c2476019ed978210c245badf08b03dbec4f24d05790ef791da11aa17c", [:mix], [{:castore, "~> 0.1 or ~> 1.0", [hex: :castore, repo: "hexpm", optional: true]}], "hexpm", "5bc19fff950fad52bbe5f211b12db9ec82c6b34a9647da0c2224b8b8464c7e6c"},
   "erlex": {:hex, :erlex, "0.2.6", "c7987d15e899c7a2f34f5420d2a2ea0d659682c06ac607572df55a43753aa12e", [:mix], [], "hexpm", "2ed2e25711feb44d52b17d2780eabf998452f6efda104877a3881c2f8c0c0c75"},
   "ex_abi": {:hex, :ex_abi, "0.6.2", "a33d0df94efd54d6879d20ab8cb6561432f13cbb1e912801d2e97ef50f795e9d", [:mix], [{:ex_keccak, "~> 0.7.3", [hex: :ex_keccak, repo: "hexpm", optional: false]}, {:jason, "~> 1.4", [hex: :jason, repo: "hexpm", optional: false]}], "hexpm", "e901c580a2491b19a6c27891c6d40cd8fe41d996c8c2ec02d5dd4c5a86239bc6"},
-  "ex_cldr": {:hex, :ex_cldr, "2.37.2", "c45041534ec60af367c4c1af02a608576118044fe3c441c782fd424061d6b517", [:mix], [{:cldr_utils, "~> 2.21", [hex: :cldr_utils, repo: "hexpm", optional: false]}, {:decimal, "~> 1.6 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: false]}, {:gettext, "~> 0.19", [hex: :gettext, repo: "hexpm", optional: true]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}, {:nimble_parsec, "~> 0.5 or ~> 1.0", [hex: :nimble_parsec, repo: "hexpm", optional: true]}], "hexpm", "c8467b1d5080716ace6621703b6656cb2f9545572a54b341da900791a0cf92ba"},
+  "ex_cldr": {:hex, :ex_cldr, "2.37.4", "3e2c04d9c691a75a8b7e808dfcbacedb9cdf3e73f819d1b4174f8f065e5f29c1", [:mix], [{:cldr_utils, "~> 2.21", [hex: :cldr_utils, repo: "hexpm", optional: false]}, {:decimal, "~> 1.6 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: false]}, {:gettext, "~> 0.19", [hex: :gettext, repo: "hexpm", optional: true]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}, {:nimble_parsec, "~> 0.5 or ~> 1.0", [hex: :nimble_parsec, repo: "hexpm", optional: true]}], "hexpm", "2bcb5de0095324ba645b4e156bf346add156d8b928f0ffd985c61664d981ad3d"},
   "ex_cldr_currencies": {:hex, :ex_cldr_currencies, "2.15.0", "aadd34e91cfac7ef6b03fe8f47f8c6fa8c5daf3f89b5d9fee64ec545ded839cf", [:mix], [{:ex_cldr, "~> 2.34", [hex: :ex_cldr, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}], "hexpm", "0521316396c66877a2d636219767560bb2397c583341fcb154ecf9f3000e6ff8"},
   "ex_cldr_lists": {:hex, :ex_cldr_lists, "2.10.1", "67795eb28f8534a36cbdfeeaea6d3ee587eeac7eafff71968dd046c215d4ec42", [:mix], [{:ex_cldr_numbers, "~> 2.25", [hex: :ex_cldr_numbers, repo: "hexpm", optional: false]}, {:ex_doc, "~> 0.18", [hex: :ex_doc, repo: "hexpm", optional: true]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}], "hexpm", "da826148d95c7a1889fd847ae5704c141747bad43a5a44431ae97bced57b0f93"},
   "ex_cldr_numbers": {:hex, :ex_cldr_numbers, "2.32.2", "5e0e3031d3f54b51fe7078a7a94592987b70b06d631bdc88813b222dc5a8b1bd", [:mix], [{:decimal, "~> 1.6 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: false]}, {:digital_token, "~> 0.3 or ~> 1.0", [hex: :digital_token, repo: "hexpm", optional: false]}, {:ex_cldr, "~> 2.37", [hex: :ex_cldr, repo: "hexpm", optional: false]}, {:ex_cldr_currencies, ">= 2.14.2", [hex: :ex_cldr_currencies, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}], "hexpm", "91257684a9c4d6abdf738f0cc5671837de876e69552e8bd4bc5fa1bfd5817713"},

From 491b5ba414832d29affb1b2e39393038fa00de60 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 16 Oct 2023 18:12:33 +0000
Subject: [PATCH 498/909] Bump floki from 0.34.3 to 0.35.0

Bumps [floki](https://github.com/philss/floki) from 0.34.3 to 0.35.0.
- [Release notes](https://github.com/philss/floki/releases)
- [Changelog](https://github.com/philss/floki/blob/main/CHANGELOG.md)
- [Commits](https://github.com/philss/floki/compare/v0.34.3...v0.35.0)

---
updated-dependencies:
- dependency-name: floki
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 mix.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mix.lock b/mix.lock
index af7683c09575..26d404ba269c 100644
--- a/mix.lock
+++ b/mix.lock
@@ -60,7 +60,7 @@
   "exvcr": {:hex, :exvcr, "0.14.4", "1aa5fe7d3f10b117251c158f8d28b39f7fc73d0a7628b2d0b75bf8cfb1111576", [:mix], [{:exactor, "~> 2.2", [hex: :exactor, repo: "hexpm", optional: false]}, {:exjsx, "~> 4.0", [hex: :exjsx, repo: "hexpm", optional: false]}, {:finch, "~> 0.16", [hex: :finch, repo: "hexpm", optional: true]}, {:httpoison, "~> 1.0 or ~> 2.0", [hex: :httpoison, repo: "hexpm", optional: true]}, {:httpotion, "~> 3.1", [hex: :httpotion, repo: "hexpm", optional: true]}, {:ibrowse, "4.4.0", [hex: :ibrowse, repo: "hexpm", optional: true]}, {:meck, "~> 0.8", [hex: :meck, repo: "hexpm", optional: false]}], "hexpm", "4e600568c02ed29d46bc2e2c74927d172ba06658aa8b14705c0207363c44cc94"},
   "file_info": {:hex, :file_info, "0.0.4", "2e0e77f211e833f38ead22cb29ce53761d457d80b3ffe0ffe0eb93880b0963b2", [:mix], [{:mimetype_parser, "~> 0.1.2", [hex: :mimetype_parser, repo: "hexpm", optional: false]}], "hexpm", "50e7ad01c2c8b9339010675fe4dc4a113b8d6ca7eddce24d1d74fd0e762781a5"},
   "file_system": {:hex, :file_system, "0.2.10", "fb082005a9cd1711c05b5248710f8826b02d7d1784e7c3451f9c1231d4fc162d", [:mix], [], "hexpm", "41195edbfb562a593726eda3b3e8b103a309b733ad25f3d642ba49696bf715dc"},
-  "floki": {:hex, :floki, "0.34.3", "5e2dcaec5d7c228ce5b1d3501502e308b2d79eb655e4191751a1fe491c37feac", [:mix], [], "hexpm", "9577440eea5b97924b4bf3c7ea55f7b8b6dce589f9b28b096cc294a8dc342341"},
+  "floki": {:hex, :floki, "0.35.0", "b24a4f416738d08e468531fe2950305a2c0582f555992dfbefc925462d24e2ea", [:mix], [], "hexpm", "381d8030f708be55380de1202872172600b00d65a62072f0e5eda5976b9de7b4"},
   "flow": {:hex, :flow, "1.2.4", "1dd58918287eb286656008777cb32714b5123d3855956f29aa141ebae456922d", [:mix], [{:gen_stage, "~> 1.0", [hex: :gen_stage, repo: "hexpm", optional: false]}], "hexpm", "874adde96368e71870f3510b91e35bc31652291858c86c0e75359cbdd35eb211"},
   "gen_stage": {:hex, :gen_stage, "1.2.1", "19d8b5e9a5996d813b8245338a28246307fd8b9c99d1237de199d21efc4c76a1", [:mix], [], "hexpm", "83e8be657fa05b992ffa6ac1e3af6d57aa50aace8f691fcf696ff02f8335b001"},
   "gettext": {:hex, :gettext, "0.23.1", "821e619a240e6000db2fc16a574ef68b3bd7fe0167ccc264a81563cc93e67a31", [:mix], [{:expo, "~> 0.4.0", [hex: :expo, repo: "hexpm", optional: false]}], "hexpm", "19d744a36b809d810d610b57c27b934425859d158ebd56561bc41f7eeb8795db"},

From 8bc007acac3980a5236fef59df201884e67f51ea Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 16 Oct 2023 18:48:01 +0000
Subject: [PATCH 499/909] Bump @babel/traverse in /apps/block_scout_web/assets

Bumps [@babel/traverse](https://github.com/babel/babel/tree/HEAD/packages/babel-traverse) from 7.23.0 to 7.23.2.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/commits/v7.23.2/packages/babel-traverse)

---
updated-dependencies:
- dependency-name: "@babel/traverse"
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 apps/block_scout_web/assets/package-lock.json | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/apps/block_scout_web/assets/package-lock.json b/apps/block_scout_web/assets/package-lock.json
index 73d212c68b71..d9e71d3c9ec8 100644
--- a/apps/block_scout_web/assets/package-lock.json
+++ b/apps/block_scout_web/assets/package-lock.json
@@ -1943,9 +1943,9 @@
       }
     },
     "node_modules/@babel/traverse": {
-      "version": "7.23.0",
-      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.23.0.tgz",
-      "integrity": "sha512-t/QaEvyIoIkwzpiZ7aoSKK8kObQYeF7T2v+dazAYCb8SXtp58zEVkWW7zAnju8FNKNdr4ScAOEDmMItbyOmEYw==",
+      "version": "7.23.2",
+      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.23.2.tgz",
+      "integrity": "sha512-azpe59SQ48qG6nu2CzcMLbxUudtN+dOM9kDbUqGq3HXUJRlo7i8fvPoxQUzYgLZ4cMVmuZgm8vvBpNeRhd6XSw==",
       "dependencies": {
         "@babel/code-frame": "^7.22.13",
         "@babel/generator": "^7.23.0",
@@ -19090,9 +19090,9 @@
       }
     },
     "@babel/traverse": {
-      "version": "7.23.0",
-      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.23.0.tgz",
-      "integrity": "sha512-t/QaEvyIoIkwzpiZ7aoSKK8kObQYeF7T2v+dazAYCb8SXtp58zEVkWW7zAnju8FNKNdr4ScAOEDmMItbyOmEYw==",
+      "version": "7.23.2",
+      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.23.2.tgz",
+      "integrity": "sha512-azpe59SQ48qG6nu2CzcMLbxUudtN+dOM9kDbUqGq3HXUJRlo7i8fvPoxQUzYgLZ4cMVmuZgm8vvBpNeRhd6XSw==",
       "requires": {
         "@babel/code-frame": "^7.22.13",
         "@babel/generator": "^7.23.0",

From e1f333367903ce51d73fa0dd515a1e38219ee6dc Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 16 Oct 2023 18:48:12 +0000
Subject: [PATCH 500/909] Bump @babel/core from 7.23.0 to 7.23.2 in
 /apps/block_scout_web/assets

Bumps [@babel/core](https://github.com/babel/babel/tree/HEAD/packages/babel-core) from 7.23.0 to 7.23.2.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/commits/@babel/core@7.23.2/packages/babel-core)

---
updated-dependencies:
- dependency-name: "@babel/core"
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 apps/block_scout_web/assets/package-lock.json | 50 +++++++++----------
 apps/block_scout_web/assets/package.json      |  2 +-
 2 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/apps/block_scout_web/assets/package-lock.json b/apps/block_scout_web/assets/package-lock.json
index 73d212c68b71..d09657d58931 100644
--- a/apps/block_scout_web/assets/package-lock.json
+++ b/apps/block_scout_web/assets/package-lock.json
@@ -71,7 +71,7 @@
         "xss": "^1.0.14"
       },
       "devDependencies": {
-        "@babel/core": "^7.23.0",
+        "@babel/core": "^7.23.2",
         "@babel/preset-env": "^7.23.2",
         "autoprefixer": "^10.4.16",
         "babel-loader": "^9.1.3",
@@ -249,19 +249,19 @@
       }
     },
     "node_modules/@babel/core": {
-      "version": "7.23.0",
-      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.23.0.tgz",
-      "integrity": "sha512-97z/ju/Jy1rZmDxybphrBuI+jtJjFVoz7Mr9yUQVVVi+DNZE333uFQeMOqcCIy1x3WYBIbWftUSLmbNXNT7qFQ==",
+      "version": "7.23.2",
+      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.23.2.tgz",
+      "integrity": "sha512-n7s51eWdaWZ3vGT2tD4T7J6eJs3QoBXydv7vkUM06Bf1cbVD2Kc2UrkzhiQwobfV7NwOnQXYL7UBJ5VPU+RGoQ==",
       "dependencies": {
         "@ampproject/remapping": "^2.2.0",
         "@babel/code-frame": "^7.22.13",
         "@babel/generator": "^7.23.0",
         "@babel/helper-compilation-targets": "^7.22.15",
         "@babel/helper-module-transforms": "^7.23.0",
-        "@babel/helpers": "^7.23.0",
+        "@babel/helpers": "^7.23.2",
         "@babel/parser": "^7.23.0",
         "@babel/template": "^7.22.15",
-        "@babel/traverse": "^7.23.0",
+        "@babel/traverse": "^7.23.2",
         "@babel/types": "^7.23.0",
         "convert-source-map": "^2.0.0",
         "debug": "^4.1.0",
@@ -602,12 +602,12 @@
       }
     },
     "node_modules/@babel/helpers": {
-      "version": "7.23.1",
-      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.23.1.tgz",
-      "integrity": "sha512-chNpneuK18yW5Oxsr+t553UZzzAs3aZnFm4bxhebsNTeshrC95yA7l5yl7GBAG+JG1rF0F7zzD2EixK9mWSDoA==",
+      "version": "7.23.2",
+      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.23.2.tgz",
+      "integrity": "sha512-lzchcp8SjTSVe/fPmLwtWVBFC7+Tbn8LGHDVfDp9JGxpAY5opSaEFgt8UQvrnECWOTdji2mOWMz1rOhkHscmGQ==",
       "dependencies": {
         "@babel/template": "^7.22.15",
-        "@babel/traverse": "^7.23.0",
+        "@babel/traverse": "^7.23.2",
         "@babel/types": "^7.23.0"
       },
       "engines": {
@@ -1943,9 +1943,9 @@
       }
     },
     "node_modules/@babel/traverse": {
-      "version": "7.23.0",
-      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.23.0.tgz",
-      "integrity": "sha512-t/QaEvyIoIkwzpiZ7aoSKK8kObQYeF7T2v+dazAYCb8SXtp58zEVkWW7zAnju8FNKNdr4ScAOEDmMItbyOmEYw==",
+      "version": "7.23.2",
+      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.23.2.tgz",
+      "integrity": "sha512-azpe59SQ48qG6nu2CzcMLbxUudtN+dOM9kDbUqGq3HXUJRlo7i8fvPoxQUzYgLZ4cMVmuZgm8vvBpNeRhd6XSw==",
       "dependencies": {
         "@babel/code-frame": "^7.22.13",
         "@babel/generator": "^7.23.0",
@@ -17919,19 +17919,19 @@
       "integrity": "sha512-0S9TQMmDHlqAZ2ITT95irXKfxN9bncq8ZCoJhun3nHL/lLUxd2NKBJYoNGWH7S0hz6fRQwWlAWn/ILM0C70KZQ=="
     },
     "@babel/core": {
-      "version": "7.23.0",
-      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.23.0.tgz",
-      "integrity": "sha512-97z/ju/Jy1rZmDxybphrBuI+jtJjFVoz7Mr9yUQVVVi+DNZE333uFQeMOqcCIy1x3WYBIbWftUSLmbNXNT7qFQ==",
+      "version": "7.23.2",
+      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.23.2.tgz",
+      "integrity": "sha512-n7s51eWdaWZ3vGT2tD4T7J6eJs3QoBXydv7vkUM06Bf1cbVD2Kc2UrkzhiQwobfV7NwOnQXYL7UBJ5VPU+RGoQ==",
       "requires": {
         "@ampproject/remapping": "^2.2.0",
         "@babel/code-frame": "^7.22.13",
         "@babel/generator": "^7.23.0",
         "@babel/helper-compilation-targets": "^7.22.15",
         "@babel/helper-module-transforms": "^7.23.0",
-        "@babel/helpers": "^7.23.0",
+        "@babel/helpers": "^7.23.2",
         "@babel/parser": "^7.23.0",
         "@babel/template": "^7.22.15",
-        "@babel/traverse": "^7.23.0",
+        "@babel/traverse": "^7.23.2",
         "@babel/types": "^7.23.0",
         "convert-source-map": "^2.0.0",
         "debug": "^4.1.0",
@@ -18182,12 +18182,12 @@
       }
     },
     "@babel/helpers": {
-      "version": "7.23.1",
-      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.23.1.tgz",
-      "integrity": "sha512-chNpneuK18yW5Oxsr+t553UZzzAs3aZnFm4bxhebsNTeshrC95yA7l5yl7GBAG+JG1rF0F7zzD2EixK9mWSDoA==",
+      "version": "7.23.2",
+      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.23.2.tgz",
+      "integrity": "sha512-lzchcp8SjTSVe/fPmLwtWVBFC7+Tbn8LGHDVfDp9JGxpAY5opSaEFgt8UQvrnECWOTdji2mOWMz1rOhkHscmGQ==",
       "requires": {
         "@babel/template": "^7.22.15",
-        "@babel/traverse": "^7.23.0",
+        "@babel/traverse": "^7.23.2",
         "@babel/types": "^7.23.0"
       }
     },
@@ -19090,9 +19090,9 @@
       }
     },
     "@babel/traverse": {
-      "version": "7.23.0",
-      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.23.0.tgz",
-      "integrity": "sha512-t/QaEvyIoIkwzpiZ7aoSKK8kObQYeF7T2v+dazAYCb8SXtp58zEVkWW7zAnju8FNKNdr4ScAOEDmMItbyOmEYw==",
+      "version": "7.23.2",
+      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.23.2.tgz",
+      "integrity": "sha512-azpe59SQ48qG6nu2CzcMLbxUudtN+dOM9kDbUqGq3HXUJRlo7i8fvPoxQUzYgLZ4cMVmuZgm8vvBpNeRhd6XSw==",
       "requires": {
         "@babel/code-frame": "^7.22.13",
         "@babel/generator": "^7.23.0",
diff --git a/apps/block_scout_web/assets/package.json b/apps/block_scout_web/assets/package.json
index b387c7e8a252..71da78866dfd 100644
--- a/apps/block_scout_web/assets/package.json
+++ b/apps/block_scout_web/assets/package.json
@@ -83,7 +83,7 @@
     "xss": "^1.0.14"
   },
   "devDependencies": {
-    "@babel/core": "^7.23.0",
+    "@babel/core": "^7.23.2",
     "@babel/preset-env": "^7.23.2",
     "autoprefixer": "^10.4.16",
     "babel-loader": "^9.1.3",

From dea9ac34cffb6f6f13bd80f62306fb1d47470578 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 16 Oct 2023 18:48:52 +0000
Subject: [PATCH 501/909] Bump webpack from 5.88.2 to 5.89.0 in
 /apps/block_scout_web/assets

Bumps [webpack](https://github.com/webpack/webpack) from 5.88.2 to 5.89.0.
- [Release notes](https://github.com/webpack/webpack/releases)
- [Commits](https://github.com/webpack/webpack/compare/v5.88.2...v5.89.0)

---
updated-dependencies:
- dependency-name: webpack
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 apps/block_scout_web/assets/package-lock.json | 14 +++++++-------
 apps/block_scout_web/assets/package.json      |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/apps/block_scout_web/assets/package-lock.json b/apps/block_scout_web/assets/package-lock.json
index 49ebd8c12472..6b0eb38cb11c 100644
--- a/apps/block_scout_web/assets/package-lock.json
+++ b/apps/block_scout_web/assets/package-lock.json
@@ -92,7 +92,7 @@
         "sass": "^1.69.3",
         "sass-loader": "^13.3.2",
         "style-loader": "^3.3.3",
-        "webpack": "^5.88.2",
+        "webpack": "^5.89.0",
         "webpack-cli": "^5.1.4"
       },
       "engines": {
@@ -17248,9 +17248,9 @@
       }
     },
     "node_modules/webpack": {
-      "version": "5.88.2",
-      "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.88.2.tgz",
-      "integrity": "sha512-JmcgNZ1iKj+aiR0OvTYtWQqJwq37Pf683dY9bVORwVbUrDhLhdn/PlO2sHsFHPkj7sHNQF3JwaAkp49V+Sq1tQ==",
+      "version": "5.89.0",
+      "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.89.0.tgz",
+      "integrity": "sha512-qyfIC10pOr70V+jkmud8tMfajraGCZMBWJtrmuBymQKCrLTRejBI8STDp1MCyZu/QTdZSeacCQYpYNQVOzX5kw==",
       "dev": true,
       "dependencies": {
         "@types/eslint-scope": "^3.7.3",
@@ -30758,9 +30758,9 @@
       "dev": true
     },
     "webpack": {
-      "version": "5.88.2",
-      "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.88.2.tgz",
-      "integrity": "sha512-JmcgNZ1iKj+aiR0OvTYtWQqJwq37Pf683dY9bVORwVbUrDhLhdn/PlO2sHsFHPkj7sHNQF3JwaAkp49V+Sq1tQ==",
+      "version": "5.89.0",
+      "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.89.0.tgz",
+      "integrity": "sha512-qyfIC10pOr70V+jkmud8tMfajraGCZMBWJtrmuBymQKCrLTRejBI8STDp1MCyZu/QTdZSeacCQYpYNQVOzX5kw==",
       "dev": true,
       "requires": {
         "@types/eslint-scope": "^3.7.3",
diff --git a/apps/block_scout_web/assets/package.json b/apps/block_scout_web/assets/package.json
index 43097bbb292e..bc1d5142456f 100644
--- a/apps/block_scout_web/assets/package.json
+++ b/apps/block_scout_web/assets/package.json
@@ -104,7 +104,7 @@
     "sass": "^1.69.3",
     "sass-loader": "^13.3.2",
     "style-loader": "^3.3.3",
-    "webpack": "^5.88.2",
+    "webpack": "^5.89.0",
     "webpack-cli": "^5.1.4"
   },
   "jest": {

From 629ee4be1b1cfb6d1601e518fe8501880d1baa26 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 16 Oct 2023 18:49:43 +0000
Subject: [PATCH 502/909] Bump ex_doc from 0.30.6 to 0.30.7

Bumps [ex_doc](https://github.com/elixir-lang/ex_doc) from 0.30.6 to 0.30.7.
- [Changelog](https://github.com/elixir-lang/ex_doc/blob/main/CHANGELOG.md)
- [Commits](https://github.com/elixir-lang/ex_doc/compare/v0.30.6...v0.30.7)

---
updated-dependencies:
- dependency-name: ex_doc
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 mix.lock | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/mix.lock b/mix.lock
index 08cdc834f040..063aa0f443f7 100644
--- a/mix.lock
+++ b/mix.lock
@@ -36,7 +36,7 @@
   "deep_merge": {:hex, :deep_merge, "1.0.0", "b4aa1a0d1acac393bdf38b2291af38cb1d4a52806cf7a4906f718e1feb5ee961", [:mix], [], "hexpm", "ce708e5f094b9cd4e8f2be4f00d2f4250c4095be93f8cd6d018c753894885430"},
   "dialyxir": {:hex, :dialyxir, "1.4.1", "a22ed1e7bd3a3e3f197b68d806ef66acb61ee8f57b3ac85fc5d57354c5482a93", [:mix], [{:erlex, ">= 0.2.6", [hex: :erlex, repo: "hexpm", optional: false]}], "hexpm", "84b795d6d7796297cca5a3118444b80c7d94f7ce247d49886e7c291e1ae49801"},
   "digital_token": {:hex, :digital_token, "0.6.0", "13e6de581f0b1f6c686f7c7d12ab11a84a7b22fa79adeb4b50eec1a2d278d258", [:mix], [{:cldr_utils, "~> 2.17", [hex: :cldr_utils, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}], "hexpm", "2455d626e7c61a128b02a4a8caddb092548c3eb613ac6f6a85e4cbb6caddc4d1"},
-  "earmark_parser": {:hex, :earmark_parser, "1.4.36", "487ea8ef9bdc659f085e6e654f3c3feea1d36ac3943edf9d2ef6c98de9174c13", [:mix], [], "hexpm", "a524e395634bdcf60a616efe77fd79561bec2e930d8b82745df06ab4e844400a"},
+  "earmark_parser": {:hex, :earmark_parser, "1.4.37", "2ad73550e27c8946648b06905a57e4d454e4d7229c2dafa72a0348c99d8be5f7", [:mix], [], "hexpm", "6b19783f2802f039806f375610faa22da130b8edc21209d0bff47918bb48360e"},
   "ecto": {:hex, :ecto, "3.10.3", "eb2ae2eecd210b4eb8bece1217b297ad4ff824b4384c0e3fdd28aaf96edd6135", [:mix], [{:decimal, "~> 1.6 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}, {:telemetry, "~> 0.4 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "44bec74e2364d491d70f7e42cd0d690922659d329f6465e89feb8a34e8cd3433"},
   "ecto_sql": {:hex, :ecto_sql, "3.10.2", "6b98b46534b5c2f8b8b5f03f126e75e2a73c64f3c071149d32987a5378b0fdbd", [:mix], [{:db_connection, "~> 2.5 or ~> 2.4.1", [hex: :db_connection, repo: "hexpm", optional: false]}, {:ecto, "~> 3.10.0", [hex: :ecto, repo: "hexpm", optional: false]}, {:myxql, "~> 0.6.0", [hex: :myxql, repo: "hexpm", optional: true]}, {:postgrex, "~> 0.16.0 or ~> 0.17.0 or ~> 1.0", [hex: :postgrex, repo: "hexpm", optional: true]}, {:tds, "~> 2.1.1 or ~> 2.2", [hex: :tds, repo: "hexpm", optional: true]}, {:telemetry, "~> 0.4.0 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "68c018debca57cb9235e3889affdaec7a10616a4e3a80c99fa1d01fdafaa9007"},
   "elixir_make": {:hex, :elixir_make, "0.7.7", "7128c60c2476019ed978210c245badf08b03dbec4f24d05790ef791da11aa17c", [:mix], [{:castore, "~> 0.1 or ~> 1.0", [hex: :castore, repo: "hexpm", optional: true]}], "hexpm", "5bc19fff950fad52bbe5f211b12db9ec82c6b34a9647da0c2224b8b8464c7e6c"},
@@ -47,7 +47,7 @@
   "ex_cldr_lists": {:hex, :ex_cldr_lists, "2.10.1", "67795eb28f8534a36cbdfeeaea6d3ee587eeac7eafff71968dd046c215d4ec42", [:mix], [{:ex_cldr_numbers, "~> 2.25", [hex: :ex_cldr_numbers, repo: "hexpm", optional: false]}, {:ex_doc, "~> 0.18", [hex: :ex_doc, repo: "hexpm", optional: true]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}], "hexpm", "da826148d95c7a1889fd847ae5704c141747bad43a5a44431ae97bced57b0f93"},
   "ex_cldr_numbers": {:hex, :ex_cldr_numbers, "2.32.2", "5e0e3031d3f54b51fe7078a7a94592987b70b06d631bdc88813b222dc5a8b1bd", [:mix], [{:decimal, "~> 1.6 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: false]}, {:digital_token, "~> 0.3 or ~> 1.0", [hex: :digital_token, repo: "hexpm", optional: false]}, {:ex_cldr, "~> 2.37", [hex: :ex_cldr, repo: "hexpm", optional: false]}, {:ex_cldr_currencies, ">= 2.14.2", [hex: :ex_cldr_currencies, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}], "hexpm", "91257684a9c4d6abdf738f0cc5671837de876e69552e8bd4bc5fa1bfd5817713"},
   "ex_cldr_units": {:hex, :ex_cldr_units, "3.16.3", "41344ed9f6d5c69baeb4d13dadc80310ca511626f738af2e69ae53dd40fb28a5", [:mix], [{:cldr_utils, "~> 2.24", [hex: :cldr_utils, repo: "hexpm", optional: false]}, {:decimal, "~> 1.6 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: false]}, {:ex_cldr_lists, "~> 2.10", [hex: :ex_cldr_lists, repo: "hexpm", optional: false]}, {:ex_cldr_numbers, "~> 2.31", [hex: :ex_cldr_numbers, repo: "hexpm", optional: false]}, {:ex_doc, "~> 0.18", [hex: :ex_doc, repo: "hexpm", optional: true]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}], "hexpm", "889dd56084821723ce82c4639d62cfc3513a9ca1ffb9063bcc83e7b3de5bc35b"},
-  "ex_doc": {:hex, :ex_doc, "0.30.6", "5f8b54854b240a2b55c9734c4b1d0dd7bdd41f71a095d42a70445c03cf05a281", [:mix], [{:earmark_parser, "~> 1.4.31", [hex: :earmark_parser, repo: "hexpm", optional: false]}, {:makeup_elixir, "~> 0.14", [hex: :makeup_elixir, repo: "hexpm", optional: false]}, {:makeup_erlang, "~> 0.1", [hex: :makeup_erlang, repo: "hexpm", optional: false]}], "hexpm", "bd48f2ddacf4e482c727f9293d9498e0881597eae6ddc3d9562bd7923375109f"},
+  "ex_doc": {:hex, :ex_doc, "0.30.7", "dc7247091aec738ab781f71cbebfc07979d1040c98c7ee67dbde99b7829b743d", [:mix], [{:earmark_parser, "~> 1.4.31", [hex: :earmark_parser, repo: "hexpm", optional: false]}, {:makeup_elixir, "~> 0.14", [hex: :makeup_elixir, repo: "hexpm", optional: false]}, {:makeup_erlang, "~> 0.1", [hex: :makeup_erlang, repo: "hexpm", optional: false]}], "hexpm", "868ff1c7a44c462741853840d1e7ef19a07906e7467cb8da070c158ea6a42a51"},
   "ex_json_schema": {:hex, :ex_json_schema, "0.10.1", "e03b746b6675a750c0bb1a5cc919f61353f7ab8450977e11ceede20e6180c560", [:mix], [{:decimal, "~> 2.0", [hex: :decimal, repo: "hexpm", optional: false]}], "hexpm", "66a64e60dadad89914d92f89c7e7906c57de75a8b79ac2480d0d53e1b8096fb0"},
   "ex_keccak": {:hex, :ex_keccak, "0.7.3", "33298f97159f6b0acd28f6e96ce5ea975a0f4a19f85fe615b4f4579b88b24d06", [:mix], [{:rustler, ">= 0.0.0", [hex: :rustler, repo: "hexpm", optional: true]}, {:rustler_precompiled, "~> 0.6.1", [hex: :rustler_precompiled, repo: "hexpm", optional: false]}], "hexpm", "4c5e6d9d5f77b64ab48769a0166a9814180d40ced68ed74ce60a5174ab55b3fc"},
   "ex_machina": {:hex, :ex_machina, "2.7.0", "b792cc3127fd0680fecdb6299235b4727a4944a09ff0fa904cc639272cd92dc7", [:mix], [{:ecto, "~> 2.2 or ~> 3.0", [hex: :ecto, repo: "hexpm", optional: true]}, {:ecto_sql, "~> 3.0", [hex: :ecto_sql, repo: "hexpm", optional: true]}], "hexpm", "419aa7a39bde11894c87a615c4ecaa52d8f107bbdd81d810465186f783245bf8"},

From 8efd23eb3dac75c02415c2aa2e0856b10005e70a Mon Sep 17 00:00:00 2001
From: Viktor Baranov <baranov.viktor.27@gmail.com>
Date: Tue, 17 Oct 2023 20:20:45 +0300
Subject: [PATCH 503/909] Fix empty tvl in /stats page

---
 .../controllers/api/v2/stats_controller.ex                | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/stats_controller.ex b/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/stats_controller.ex
index 966d4e8f736e..1f1d87302e1f 100644
--- a/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/stats_controller.ex
+++ b/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/stats_controller.ex
@@ -25,7 +25,7 @@ defmodule BlockScoutWeb.API.V2.StatsController do
           :standard
       end
 
-    exchange_rate = Market.get_coin_exchange_rate()
+    exchange_rate_from_db = Market.get_native_coin_exchange_rate_from_db()
 
     transaction_stats = Helper.get_transaction_stats()
 
@@ -47,14 +47,14 @@ defmodule BlockScoutWeb.API.V2.StatsController do
         "total_addresses" => @api_true |> Counters.address_estimated_count() |> to_string(),
         "total_transactions" => TransactionCache.estimated_count() |> to_string(),
         "average_block_time" => AverageBlockTime.average_block_time() |> Duration.to_milliseconds(),
-        "coin_price" => exchange_rate.usd_value,
+        "coin_price" => exchange_rate_from_db.usd_value,
         "total_gas_used" => GasUsage.total() |> to_string(),
         "transactions_today" => Enum.at(transaction_stats, 0).number_of_transactions |> to_string(),
         "gas_used_today" => Enum.at(transaction_stats, 0).gas_used,
         "gas_prices" => gas_prices,
         "static_gas_price" => gas_price,
-        "market_cap" => Helper.market_cap(market_cap_type, exchange_rate),
-        "tvl" => exchange_rate.tvl_usd,
+        "market_cap" => Helper.market_cap(market_cap_type, exchange_rate_from_db),
+        "tvl" => exchange_rate_from_db.tvl_usd,
         "network_utilization_percentage" => network_utilization_percentage()
       }
     )

From c5ed2de1990b9050f13717e6b2bbfd35b9baddb5 Mon Sep 17 00:00:00 2001
From: Viktor Baranov <baranov.viktor.27@gmail.com>
Date: Wed, 18 Oct 2023 10:45:56 +0300
Subject: [PATCH 504/909] Fix polygon tracer

---
 CHANGELOG.md                                                | 1 +
 .../lib/ethereum_jsonrpc/geth/polygon_tracer.ex             | 6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 842b940b8e93..d86d997effff 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,7 @@
 - [#8544](https://github.com/blockscout/blockscout/pull/8544) - Fix `nil` `"structLogs"`
 - [#8542](https://github.com/blockscout/blockscout/pull/8542) - Add tracing for rootstock
 - [#8561](https://github.com/blockscout/blockscout/pull/8561), [#8564](https://github.com/blockscout/blockscout/pull/8564) - Get historical market cap data from CoinGecko
+- [#8543](https://github.com/blockscout/blockscout/pull/8543) - Fix polygon tracer
 - [#8386](https://github.com/blockscout/blockscout/pull/8386) - Add `owner_address_hash` to the `token_instances`
 - [#8530](https://github.com/blockscout/blockscout/pull/8530) - Add `block_type` to search results
 - [#8180](https://github.com/blockscout/blockscout/pull/8180) - Deposits and Withdrawals for Polygon Edge
diff --git a/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/geth/polygon_tracer.ex b/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/geth/polygon_tracer.ex
index ce08951bc7f4..edc16207c961 100644
--- a/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/geth/polygon_tracer.ex
+++ b/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/geth/polygon_tracer.ex
@@ -287,7 +287,7 @@ defmodule EthereumJSONRPC.Geth.PolygonTracer do
            calls: calls
          } = ctx
        ) do
-    log_stack = Enum.reverse(log_stack)
+    [_, to | log_stack] = Enum.reverse(log_stack)
 
     {value, [input_length, output_length | _]} =
       case call_type do
@@ -305,13 +305,13 @@ defmodule EthereumJSONRPC.Geth.PolygonTracer do
     input =
       log_memory
       |> IO.iodata_to_binary()
-      |> String.slice(0, quantity_to_integer(input_length) * 2)
+      |> String.slice(0, quantity_to_integer(input_length || 0) * 2)
 
     call = %{
       "type" => "call",
       "callType" => call_type,
       "from" => nil,
-      "to" => @burn_address,
+      "to" => to,
       "traceAddress" => Enum.reverse(trace_address),
       "input" => "0x" <> input,
       "output" => "0x",

From 3309b6a27e9d0afeae96fc17e90fc0715ff09376 Mon Sep 17 00:00:00 2001
From: Viktor Baranov <baranov.viktor.27@gmail.com>
Date: Wed, 18 Oct 2023 13:44:52 +0300
Subject: [PATCH 505/909] Set max 30sec JSON RPC poll frequency for realtime
 fetcher when WS is disabled

---
 CHANGELOG.md                                       | 1 +
 apps/indexer/lib/indexer/block/realtime/fetcher.ex | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d86d997effff..6854061e899a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -17,6 +17,7 @@
 
 ### Fixes
 
+- [#8649](https://github.com/blockscout/blockscout/pull/8649) - Set max 30sec JSON RPC poll frequency for realtime fetcher when WS is disabled
 - [#8614](https://github.com/blockscout/blockscout/pull/8614) - Disable market history cataloger fetcher when exchange rates are disabled
 - [#8572](https://github.com/blockscout/blockscout/pull/8572) - Refactor docker-compose config
 - [#8552](https://github.com/blockscout/blockscout/pull/8552) - Add CHAIN_TYPE build arg to Dockerfile
diff --git a/apps/indexer/lib/indexer/block/realtime/fetcher.ex b/apps/indexer/lib/indexer/block/realtime/fetcher.ex
index 3093aa142378..b78688b85e18 100644
--- a/apps/indexer/lib/indexer/block/realtime/fetcher.ex
+++ b/apps/indexer/lib/indexer/block/realtime/fetcher.ex
@@ -180,7 +180,7 @@ defmodule Indexer.Block.Realtime.Fetcher do
     polling_period =
       case AverageBlockTime.average_block_time() do
         {:error, :disabled} -> 2_000
-        block_time -> round(Duration.to_milliseconds(block_time) / 2)
+        block_time -> min(round(Duration.to_milliseconds(block_time) / 2), 30_000)
       end
 
     safe_polling_period = max(polling_period, @minimum_safe_polling_period)

From 94a76bf9822df525f7600560a05d4da95f77854b Mon Sep 17 00:00:00 2001
From: Maxim Filonov <53992153+sl1depengwyn@users.noreply.github.com>
Date: Tue, 26 Sep 2023 00:29:12 +0300
Subject: [PATCH 506/909] Add RSK tracing

---
 apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/geth.ex | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/geth.ex b/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/geth.ex
index 4d864336f50c..3ce105f57698 100644
--- a/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/geth.ex
+++ b/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/geth.ex
@@ -102,7 +102,7 @@ defmodule EthereumJSONRPC.Geth do
             "enableMemory" => true,
             "disableStack" => false,
             "disableStorage" => true,
-            "enableReturnData" => false
+            "enableReturnData" => true
           }
 
         true ->

From 843430cf33266f4deef3a63307487075674fa6eb Mon Sep 17 00:00:00 2001
From: Maxim Filonov <53992153+sl1depengwyn@users.noreply.github.com>
Date: Mon, 2 Oct 2023 23:16:56 +0300
Subject: [PATCH 507/909] Add rootstock locked widget in stats

---
 .github/workflows/config.yml                  | 28 +++++++-------
 CHANGELOG.md                                  |  1 +
 .../controllers/api/v2/stats_controller.ex    | 13 ++++++-
 .../lib/ethereum_jsonrpc/geth.ex              |  2 +-
 apps/explorer/config/runtime/test.exs         |  5 +++
 apps/explorer/lib/explorer/application.ex     |  3 +-
 .../chain/cache/rootstock_locked_btc.ex       | 31 +++++++++++++++
 .../chain/cache/rootstock_locked_btc_test.exs | 38 +++++++++++++++++++
 config/config_helper.exs                      |  2 +-
 config/runtime.exs                            |  5 +++
 docker-compose/envs/common-blockscout.env     |  2 +
 11 files changed, 112 insertions(+), 18 deletions(-)
 create mode 100644 apps/explorer/lib/explorer/chain/cache/rootstock_locked_btc.ex
 create mode 100644 apps/explorer/test/explorer/chain/cache/rootstock_locked_btc_test.exs

diff --git a/.github/workflows/config.yml b/.github/workflows/config.yml
index 83ce784bdbcd..dba4d2392a95 100644
--- a/.github/workflows/config.yml
+++ b/.github/workflows/config.yml
@@ -54,7 +54,7 @@ jobs:
           path: |
             deps
             _build
-          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_23-${{ hashFiles('mix.lock') }}
+          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_24-${{ hashFiles('mix.lock') }}
           restore-keys: |
             ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-
 
@@ -112,7 +112,7 @@ jobs:
           path: |
             deps
             _build
-          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_23-${{ hashFiles('mix.lock') }}
+          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_24-${{ hashFiles('mix.lock') }}
           restore-keys: |
             ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-"
 
@@ -136,7 +136,7 @@ jobs:
           path: |
             deps
             _build
-          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_23-${{ hashFiles('mix.lock') }}
+          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_24-${{ hashFiles('mix.lock') }}
           restore-keys: |
             ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-"
 
@@ -159,7 +159,7 @@ jobs:
           path: |
             deps
             _build
-          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_23-${{ hashFiles('mix.lock') }}
+          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_24-${{ hashFiles('mix.lock') }}
           restore-keys: |
             ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-"
 
@@ -168,7 +168,7 @@ jobs:
         id: dialyzer-cache
         with:
           path: priv/plts
-          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-dialyzer-mixlockhash_23-${{ hashFiles('mix.lock') }}
+          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-dialyzer-mixlockhash_24-${{ hashFiles('mix.lock') }}
           restore-keys: |
             ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-dialyzer-"
 
@@ -199,7 +199,7 @@ jobs:
           path: |
             deps
             _build
-          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_23-${{ hashFiles('mix.lock') }}
+          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_24-${{ hashFiles('mix.lock') }}
           restore-keys: |
             ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-"
 
@@ -225,7 +225,7 @@ jobs:
           path: |
             deps
             _build
-          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_23-${{ hashFiles('mix.lock') }}
+          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_24-${{ hashFiles('mix.lock') }}
           restore-keys: |
             ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-"
 
@@ -254,7 +254,7 @@ jobs:
           path: |
             deps
             _build
-          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_23-${{ hashFiles('mix.lock') }}
+          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_24-${{ hashFiles('mix.lock') }}
           restore-keys: |
             ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-"
 
@@ -302,7 +302,7 @@ jobs:
           path: |
             deps
             _build
-          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_23-${{ hashFiles('mix.lock') }}
+          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_24-${{ hashFiles('mix.lock') }}
           restore-keys: |
             ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-"
 
@@ -348,7 +348,7 @@ jobs:
           path: |
             deps
             _build
-          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_23-${{ hashFiles('mix.lock') }}
+          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_24-${{ hashFiles('mix.lock') }}
           restore-keys: |
             ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-"
 
@@ -405,7 +405,7 @@ jobs:
           path: |
             deps
             _build
-          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_23-${{ hashFiles('mix.lock') }}
+          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_24-${{ hashFiles('mix.lock') }}
           restore-keys: |
             ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-"
 
@@ -459,7 +459,7 @@ jobs:
           path: |
             deps
             _build
-          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_23-${{ hashFiles('mix.lock') }}
+          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_24-${{ hashFiles('mix.lock') }}
           restore-keys: |
             ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-"
 
@@ -524,7 +524,7 @@ jobs:
           path: |
             deps
             _build
-          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_23-${{ hashFiles('mix.lock') }}
+          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_24-${{ hashFiles('mix.lock') }}
           restore-keys: |
             ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-"
 
@@ -588,7 +588,7 @@ jobs:
           path: |
             deps
             _build
-          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_23-${{ hashFiles('mix.lock') }}
+          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_24-${{ hashFiles('mix.lock') }}
           restore-keys: |
             ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-"
 
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6854061e899a..59475dbf5d99 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,7 @@
 - [#8472](https://github.com/blockscout/blockscout/pull/8472) - Integrate `/api/v2/bytecodes/sources:search-all` of `eth_bytecode_db`
 - [#8589](https://github.com/blockscout/blockscout/pull/8589) - DefiLlama TVL source
 - [#8544](https://github.com/blockscout/blockscout/pull/8544) - Fix `nil` `"structLogs"`
+- [#8583](https://github.com/blockscout/blockscout/pull/8583) - Add stats widget for rootstock
 - [#8542](https://github.com/blockscout/blockscout/pull/8542) - Add tracing for rootstock
 - [#8561](https://github.com/blockscout/blockscout/pull/8561), [#8564](https://github.com/blockscout/blockscout/pull/8564) - Get historical market cap data from CoinGecko
 - [#8543](https://github.com/blockscout/blockscout/pull/8543) - Fix polygon tracer
diff --git a/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/stats_controller.ex b/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/stats_controller.ex
index 1f1d87302e1f..825d9f1b2575 100644
--- a/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/stats_controller.ex
+++ b/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/stats_controller.ex
@@ -3,10 +3,11 @@ defmodule BlockScoutWeb.API.V2.StatsController do
 
   alias BlockScoutWeb.API.V2.Helper
   alias BlockScoutWeb.Chain.MarketHistoryChartController
+  alias EthereumJSONRPC.Variant
   alias Explorer.{Chain, Market}
   alias Explorer.Chain.Address.Counters
   alias Explorer.Chain.Cache.Block, as: BlockCache
-  alias Explorer.Chain.Cache.{GasPriceOracle, GasUsage}
+  alias Explorer.Chain.Cache.{GasPriceOracle, GasUsage, RootstockLockedBTC}
   alias Explorer.Chain.Cache.Transaction, as: TransactionCache
   alias Explorer.Chain.Supply.RSK
   alias Explorer.Chain.Transaction.History.TransactionStats
@@ -57,6 +58,7 @@ defmodule BlockScoutWeb.API.V2.StatsController do
         "tvl" => exchange_rate_from_db.tvl_usd,
         "network_utilization_percentage" => network_utilization_percentage()
       }
+      |> add_rootstock_locked_btc()
     )
   end
 
@@ -124,4 +126,13 @@ defmodule BlockScoutWeb.API.V2.StatsController do
       available_supply: current_total_supply
     })
   end
+
+  defp add_rootstock_locked_btc(stats) do
+    with "rsk" <- Variant.get(),
+         rootstock_locked_btc when not is_nil(rootstock_locked_btc) <- RootstockLockedBTC.get_locked_value() do
+      stats |> Map.put("rootstock_locked_btc", rootstock_locked_btc)
+    else
+      _ -> stats
+    end
+  end
 end
diff --git a/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/geth.ex b/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/geth.ex
index 3ce105f57698..4d864336f50c 100644
--- a/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/geth.ex
+++ b/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/geth.ex
@@ -102,7 +102,7 @@ defmodule EthereumJSONRPC.Geth do
             "enableMemory" => true,
             "disableStack" => false,
             "disableStorage" => true,
-            "enableReturnData" => true
+            "enableReturnData" => false
           }
 
         true ->
diff --git a/apps/explorer/config/runtime/test.exs b/apps/explorer/config/runtime/test.exs
index bef121b2c1be..9449463a5b9b 100644
--- a/apps/explorer/config/runtime/test.exs
+++ b/apps/explorer/config/runtime/test.exs
@@ -24,6 +24,11 @@ config :explorer, Explorer.Chain.Cache.VerifiedContractsCounter, enabled: false,
 config :explorer, Explorer.Chain.Cache.NewVerifiedContractsCounter, enabled: false, enable_consolidation: false
 config :explorer, Explorer.Chain.Cache.WithdrawalsSum, enabled: false, enable_consolidation: false
 
+config :explorer, Explorer.Chain.Cache.RootstockLockedBTC,
+  enabled: true,
+  global_ttl: :timer.minutes(10),
+  locking_cap: 21_000_000
+
 config :explorer, Explorer.Market.History.Cataloger, enabled: false
 
 config :explorer, Explorer.Tracer, disabled?: false
diff --git a/apps/explorer/lib/explorer/application.ex b/apps/explorer/lib/explorer/application.ex
index 1799fc28828d..21b292fb11a2 100644
--- a/apps/explorer/lib/explorer/application.ex
+++ b/apps/explorer/lib/explorer/application.ex
@@ -124,7 +124,8 @@ defmodule Explorer.Application do
       configure(Explorer.Chain.Fetcher.CheckBytecodeMatchingOnDemand),
       configure(Explorer.Chain.Fetcher.FetchValidatorInfoOnDemand),
       configure(Explorer.TokenInstanceOwnerAddressMigration.Supervisor),
-      sc_microservice_configure(Explorer.Chain.Fetcher.LookUpSmartContractSourcesOnDemand)
+      sc_microservice_configure(Explorer.Chain.Fetcher.LookUpSmartContractSourcesOnDemand),
+      configure(Explorer.Chain.Cache.RootstockLockedBTC)
     ]
     |> List.flatten()
   end
diff --git a/apps/explorer/lib/explorer/chain/cache/rootstock_locked_btc.ex b/apps/explorer/lib/explorer/chain/cache/rootstock_locked_btc.ex
new file mode 100644
index 000000000000..e4bf1519787b
--- /dev/null
+++ b/apps/explorer/lib/explorer/chain/cache/rootstock_locked_btc.ex
@@ -0,0 +1,31 @@
+defmodule Explorer.Chain.Cache.RootstockLockedBTC do
+  @moduledoc """
+  Caches the number of BTC locked in 2WP on Rootstock chain.
+  """
+
+  require Logger
+  alias Explorer.Chain
+  alias Explorer.Chain.{Address, Wei}
+
+  use Explorer.Chain.MapCache,
+    name: :locked_rsk,
+    key: :locked_value,
+    global_ttl: Application.get_env(:explorer, __MODULE__)[:global_ttl],
+    ttl_check_interval: :timer.seconds(1)
+
+  defp handle_fallback(:locked_value) do
+    rootstock_bridge_address_str = Application.get_env(:explorer, Explorer.Chain.Transaction)[:rootstock_bridge_address]
+    rootstock_locking_cap = Application.get_env(:explorer, __MODULE__)[:locking_cap] |> Decimal.new()
+
+    with {:ok, rootstock_bridge_address_hash} <- Chain.string_to_address_hash(rootstock_bridge_address_str),
+         {:ok, %Address{fetched_coin_balance: balance}} when not is_nil(balance) <-
+           Chain.hash_to_address(rootstock_bridge_address_hash) do
+      {:update, rootstock_locking_cap |> Wei.from(:ether) |> Wei.sub(balance)}
+    else
+      _ ->
+        {:return, nil}
+    end
+  end
+
+  defp handle_fallback(_key), do: {:return, nil}
+end
diff --git a/apps/explorer/test/explorer/chain/cache/rootstock_locked_btc_test.exs b/apps/explorer/test/explorer/chain/cache/rootstock_locked_btc_test.exs
new file mode 100644
index 000000000000..46d0d033f30f
--- /dev/null
+++ b/apps/explorer/test/explorer/chain/cache/rootstock_locked_btc_test.exs
@@ -0,0 +1,38 @@
+defmodule Explorer.Chain.Cache.RootstockLockedBTCTest do
+  use Explorer.DataCase
+
+  alias Explorer.Chain.Cache.RootstockLockedBTC
+  alias Explorer.Chain.{Transaction, Wei}
+
+  @bridge_address "0x0000000000000000000000000000000001000006"
+
+  setup do
+    transaction_configuration = Application.get_env(:explorer, Transaction)
+    Application.put_env(:explorer, Transaction, rootstock_bridge_address: @bridge_address)
+
+    :ok
+
+    Supervisor.terminate_child(Explorer.Supervisor, RootstockLockedBTC.child_id())
+    Supervisor.restart_child(Explorer.Supervisor, RootstockLockedBTC.child_id())
+
+    on_exit(fn ->
+      Application.put_env(:explorer, Transaction, transaction_configuration)
+    end)
+
+    :ok
+  end
+
+  test "returns nil in case if there is no bridged address in the database" do
+    result = RootstockLockedBTC.get_locked_value()
+
+    assert is_nil(result)
+  end
+
+  test "updates cache if initial value is zero and returns converted wei" do
+    insert(:address, hash: @bridge_address, fetched_coin_balance: 42_000_000_000_000_000_000)
+
+    result = RootstockLockedBTC.get_locked_value()
+
+    assert result == Wei.from(Decimal.new(21_000_000), :ether) |> Wei.sub(Wei.from(Decimal.new(42), :ether))
+  end
+end
diff --git a/config/config_helper.exs b/config/config_helper.exs
index 9e481014d862..911430cdb11f 100644
--- a/config/config_helper.exs
+++ b/config/config_helper.exs
@@ -36,7 +36,7 @@ defmodule ConfigHelper do
     |> :timer.seconds()
   end
 
-  @spec parse_integer_env_var(String.t(), String.t()) :: non_neg_integer()
+  @spec parse_integer_env_var(String.t(), integer()) :: non_neg_integer()
   def parse_integer_env_var(env_var, default_value) do
     env_var
     |> safe_get_env(to_string(default_value))
diff --git a/config/runtime.exs b/config/runtime.exs
index 0fe6e7377ec1..2a339e458e18 100644
--- a/config/runtime.exs
+++ b/config/runtime.exs
@@ -246,6 +246,11 @@ config :explorer, Explorer.Chain.Cache.GasPriceOracle,
   average_percentile: ConfigHelper.parse_integer_env_var("GAS_PRICE_ORACLE_AVERAGE_PERCENTILE", 60),
   fast_percentile: ConfigHelper.parse_integer_env_var("GAS_PRICE_ORACLE_FAST_PERCENTILE", 90)
 
+config :explorer, Explorer.Chain.Cache.RootstockLockedBTC,
+  enabled: System.get_env("ETHEREUM_JSONRPC_VARIANT") == "rsk",
+  global_ttl: ConfigHelper.parse_time_env_var("ROOTSTOCK_LOCKED_BTC_CACHE_PERIOD", "10m"),
+  locking_cap: ConfigHelper.parse_integer_env_var("ROOTSTOCK_LOCKING_CAP", 21_000_000)
+
 config :explorer, Explorer.Counters.AddressTransactionsGasUsageCounter,
   cache_period: ConfigHelper.parse_time_env_var("CACHE_ADDRESS_TRANSACTIONS_GAS_USAGE_COUNTER_PERIOD", "30m")
 
diff --git a/docker-compose/envs/common-blockscout.env b/docker-compose/envs/common-blockscout.env
index bc1a0811991f..edd08011ed54 100644
--- a/docker-compose/envs/common-blockscout.env
+++ b/docker-compose/envs/common-blockscout.env
@@ -147,6 +147,8 @@ INDEXER_DISABLE_INTERNAL_TRANSACTIONS_FETCHER=false
 # WITHDRAWALS_FIRST_BLOCK=
 # ROOTSTOCK_REMASC_ADDRESS=
 # ROOTSTOCK_BRIDGE_ADDRESS=
+# ROOTSTOCK_LOCKED_BTC_CACHE_PERIOD=
+# ROOTSTOCK_LOCKING_CAP=
 # TOKEN_ID_MIGRATION_FIRST_BLOCK=
 # TOKEN_ID_MIGRATION_CONCURRENCY=
 # TOKEN_ID_MIGRATION_BATCH_SIZE=

From bc10429611a82f181c226b84a91849b0587efaa9 Mon Sep 17 00:00:00 2001
From: Qwerty5Uiop <alex000010@bk.ru>
Date: Thu, 19 Oct 2023 13:40:43 +0600
Subject: [PATCH 508/909] Remove block consensus on import fail

---
 CHANGELOG.md                                  |  1 +
 apps/explorer/lib/explorer/chain/import.ex    | 21 +++++++++++++++++++
 .../test/explorer/chain/import_test.exs       | 13 ++++++++++++
 .../indexer/fetcher/empty_blocks_sanitizer.ex |  4 +++-
 config/runtime.exs                            |  3 ++-
 docker-compose/envs/common-blockscout.env     |  1 +
 6 files changed, 41 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6854061e899a..e4bdf914bc51 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -14,6 +14,7 @@
 - [#8530](https://github.com/blockscout/blockscout/pull/8530) - Add `block_type` to search results
 - [#8180](https://github.com/blockscout/blockscout/pull/8180) - Deposits and Withdrawals for Polygon Edge
 - [#7996](https://github.com/blockscout/blockscout/pull/7996) - Add CoinBalance fetcher init query limit
+- [#8658](https://github.com/blockscout/blockscout/pull/8658) - Remove block consensus on import fail
 
 ### Fixes
 
diff --git a/apps/explorer/lib/explorer/chain/import.ex b/apps/explorer/lib/explorer/chain/import.ex
index 8640d47e3a05..138db2c676fa 100644
--- a/apps/explorer/lib/explorer/chain/import.ex
+++ b/apps/explorer/lib/explorer/chain/import.ex
@@ -321,6 +321,18 @@ defmodule Explorer.Chain.Import do
     runner_to_changes_list
     |> runner_to_changes_list_to_multis(options)
     |> logged_import(options)
+    |> case do
+      {:ok, result} ->
+        {:ok, result}
+
+      error ->
+        remove_consensus_from_partially_imported_blocks(options)
+        error
+    end
+  rescue
+    exception ->
+      remove_consensus_from_partially_imported_blocks(options)
+      reraise exception, __STACKTRACE__
   end
 
   defp logged_import(multis, options) when is_list(multis) and is_map(options) do
@@ -348,6 +360,15 @@ defmodule Explorer.Chain.Import do
     Repo.logged_transaction(multi, timeout: Map.get(options, :timeout, @transaction_timeout))
   end
 
+  defp remove_consensus_from_partially_imported_blocks(%{blocks: %{params: blocks_params}}) do
+    block_numbers = Enum.map(blocks_params, & &1.number)
+    Import.Runner.Blocks.invalidate_consensus_blocks(block_numbers)
+
+    Logger.warning("Consensus removed from partially imported block because of error: #{inspect(block_numbers)}")
+  end
+
+  defp remove_consensus_from_partially_imported_blocks(_options), do: :ok
+
   @spec timestamps() :: timestamps
   def timestamps do
     now = DateTime.utc_now()
diff --git a/apps/explorer/test/explorer/chain/import_test.exs b/apps/explorer/test/explorer/chain/import_test.exs
index 8078cb33dd9f..322ca7a7ff80 100644
--- a/apps/explorer/test/explorer/chain/import_test.exs
+++ b/apps/explorer/test/explorer/chain/import_test.exs
@@ -350,6 +350,19 @@ defmodule Explorer.Chain.ImportTest do
               }} = Import.all(@import_data)
     end
 
+    test "block consensus removed if there was an exception in further steps" do
+      not_existing_block_hash = "0xf6b4b8c88df3ebd252ec476328334dc026cf66606a84fb769b3d3cbccc8471db"
+
+      incorrect_data =
+        update_in(@import_data, [:transactions, :params], fn params ->
+          [params |> Enum.at(0) |> Map.put(:block_hash, not_existing_block_hash)]
+        end)
+
+      assert_raise(Postgrex.Error, fn -> Import.all(incorrect_data) end)
+      assert [] = Repo.all(Transaction)
+      assert %{consensus: false} = Repo.one(Block)
+    end
+
     test "inserts a token_balance" do
       params = %{
         addresses: %{
diff --git a/apps/indexer/lib/indexer/fetcher/empty_blocks_sanitizer.ex b/apps/indexer/lib/indexer/fetcher/empty_blocks_sanitizer.ex
index 7f3d3dc721fb..013ace680c34 100644
--- a/apps/indexer/lib/indexer/fetcher/empty_blocks_sanitizer.ex
+++ b/apps/indexer/lib/indexer/fetcher/empty_blocks_sanitizer.ex
@@ -41,9 +41,11 @@ defmodule Indexer.Fetcher.EmptyBlocksSanitizer do
 
   @impl GenServer
   def init(opts) when is_list(opts) do
+    interval = Application.get_env(:indexer, __MODULE__)[:interval]
+
     state = %__MODULE__{
       json_rpc_named_arguments: Keyword.fetch!(opts, :json_rpc_named_arguments),
-      interval: opts[:interval] || @interval
+      interval: interval || @interval
     }
 
     Process.send_after(self(), :sanitize_empty_blocks, state.interval)
diff --git a/config/runtime.exs b/config/runtime.exs
index 0fe6e7377ec1..536f8bd4410c 100644
--- a/config/runtime.exs
+++ b/config/runtime.exs
@@ -524,7 +524,8 @@ config :indexer, Indexer.Fetcher.TokenInstance.LegacySanitize.Supervisor,
   disabled?: ConfigHelper.parse_bool_env_var("INDEXER_DISABLE_TOKEN_INSTANCE_LEGACY_SANITIZE_FETCHER", "true")
 
 config :indexer, Indexer.Fetcher.EmptyBlocksSanitizer,
-  batch_size: ConfigHelper.parse_integer_env_var("INDEXER_EMPTY_BLOCKS_SANITIZER_BATCH_SIZE", 100)
+  batch_size: ConfigHelper.parse_integer_env_var("INDEXER_EMPTY_BLOCKS_SANITIZER_BATCH_SIZE", 100),
+  interval: ConfigHelper.parse_time_env_var("INDEXER_EMPTY_BLOCKS_SANITIZER_INTERVAL", "5m")
 
 config :indexer, Indexer.Block.Realtime.Fetcher,
   max_gap: ConfigHelper.parse_integer_env_var("INDEXER_REALTIME_FETCHER_MAX_GAP", 1000)
diff --git a/docker-compose/envs/common-blockscout.env b/docker-compose/envs/common-blockscout.env
index bc1a0811991f..f6d38168eefc 100644
--- a/docker-compose/envs/common-blockscout.env
+++ b/docker-compose/envs/common-blockscout.env
@@ -107,6 +107,7 @@ INDEXER_DISABLE_INTERNAL_TRANSACTIONS_FETCHER=false
 # INDEXER_CATCHUP_BLOCKS_BATCH_SIZE=
 # INDEXER_CATCHUP_BLOCKS_CONCURRENCY=
 # INDEXER_CATCHUP_BLOCK_INTERVAL=
+# INDEXER_EMPTY_BLOCKS_SANITIZER_INTERVAL=
 # INDEXER_INTERNAL_TRANSACTIONS_BATCH_SIZE=
 # INDEXER_INTERNAL_TRANSACTIONS_CONCURRENCY=
 # INDEXER_BLOCK_REWARD_BATCH_SIZE=

From b6278b1a03c88968ab599d9daf9783f29c249451 Mon Sep 17 00:00:00 2001
From: Viktor Baranov <baranov.viktor.27@gmail.com>
Date: Thu, 19 Oct 2023 12:56:39 +0300
Subject: [PATCH 509/909] arm64-compatible docker image

---
 .github/workflows/codeql-analysis.yml         |  2 +-
 .github/workflows/config.yml                  | 26 +++++++++----------
 .../publish-docker-image-every-push.yml       | 15 +++++------
 .../publish-docker-image-for-core.yml         |  8 +++---
 .../publish-docker-image-for-eth-goerli.yml   |  8 +++---
 .../publish-docker-image-for-eth.yml          |  8 +++---
 .../publish-docker-image-for-fuse.yml         | 13 ++++------
 .../publish-docker-image-for-immutable.yml    | 11 +++-----
 .../publish-docker-image-for-l2-staging.yml   |  6 ++---
 .../publish-docker-image-for-lukso.yml        |  6 ++---
 .../publish-docker-image-for-optimism.yml     |  9 ++++---
 .../publish-docker-image-for-rsk.yml          |  4 +--
 .../publish-docker-image-for-xdai.yml         | 11 +++-----
 .../publish-docker-image-for-zksync.yml       |  6 ++---
 .../publish-docker-image-release.yml          | 15 +++++------
 CHANGELOG.md                                  |  1 +
 docker/Dockerfile                             | 17 ++++++++----
 17 files changed, 81 insertions(+), 85 deletions(-)

diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index 9b8a5cf42ab2..8a4cf36f5bb4 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -38,7 +38,7 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
diff --git a/.github/workflows/config.yml b/.github/workflows/config.yml
index 83ce784bdbcd..4fd201d65736 100644
--- a/.github/workflows/config.yml
+++ b/.github/workflows/config.yml
@@ -35,7 +35,7 @@ jobs:
     name: Build and Cache deps
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - uses: erlef/setup-beam@v1
         with:
           otp-version: ${{ env.OTP_VERSION }}
@@ -99,7 +99,7 @@ jobs:
     runs-on: ubuntu-latest
     needs: build-and-cache
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - uses: erlef/setup-beam@v1
         with:
           otp-version: ${{ env.OTP_VERSION }}
@@ -123,7 +123,7 @@ jobs:
     runs-on: ubuntu-latest
     needs: build-and-cache
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - uses: erlef/setup-beam@v1
         with:
           otp-version: ${{ env.OTP_VERSION }}
@@ -146,7 +146,7 @@ jobs:
     runs-on: ubuntu-latest
     needs: build-and-cache
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - uses: erlef/setup-beam@v1
         with:
           otp-version: ${{ env.OTP_VERSION }}
@@ -186,7 +186,7 @@ jobs:
     runs-on: ubuntu-latest
     needs: build-and-cache
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - uses: erlef/setup-beam@v1
         with:
           otp-version: ${{ env.OTP_VERSION }}
@@ -212,7 +212,7 @@ jobs:
     runs-on: ubuntu-latest
     needs: build-and-cache
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - uses: erlef/setup-beam@v1
         with:
           otp-version: ${{ env.OTP_VERSION }}
@@ -241,7 +241,7 @@ jobs:
     runs-on: ubuntu-latest
     needs: build-and-cache
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - uses: erlef/setup-beam@v1
         with:
           otp-version: ${{ env.OTP_VERSION }}
@@ -289,7 +289,7 @@ jobs:
     runs-on: ubuntu-latest
     needs: build-and-cache
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - uses: erlef/setup-beam@v1
         with:
           otp-version: ${{ env.OTP_VERSION }}
@@ -335,7 +335,7 @@ jobs:
     runs-on: ubuntu-latest
     needs: build-and-cache
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - uses: erlef/setup-beam@v1
         with:
           otp-version: ${{ env.OTP_VERSION }}
@@ -392,7 +392,7 @@ jobs:
           # Maps tcp port 5432 on service container to the host
           - 5432:5432
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - uses: erlef/setup-beam@v1
         with:
           otp-version: ${{ env.OTP_VERSION }}
@@ -446,7 +446,7 @@ jobs:
           # Maps tcp port 5432 on service container to the host
           - 5432:5432
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - uses: erlef/setup-beam@v1
         with:
           otp-version: ${{ env.OTP_VERSION }}
@@ -511,7 +511,7 @@ jobs:
           # Maps tcp port 5432 on service container to the host
           - 5432:5432
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - uses: erlef/setup-beam@v1
         with:
           otp-version: ${{ env.OTP_VERSION }}
@@ -575,7 +575,7 @@ jobs:
           # Maps tcp port 5432 on service container to the host
           - 5432:5432
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - uses: erlef/setup-beam@v1
         with:
           otp-version: ${{ env.OTP_VERSION }}
diff --git a/.github/workflows/publish-docker-image-every-push.yml b/.github/workflows/publish-docker-image-every-push.yml
index 4923e93a0caa..97fd753c1bdd 100644
--- a/.github/workflows/publish-docker-image-every-push.yml
+++ b/.github/workflows/publish-docker-image-every-push.yml
@@ -18,23 +18,20 @@ jobs:
       short-sha: ${{ steps.output-step.outputs.short-sha }}
     steps:
       - name: Check out the repo
-        uses: actions/checkout@v3
-
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v2
+        uses: actions/checkout@v4
 
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
+        uses: docker/setup-buildx-action@v3
 
       - name: Log in to Docker Hub
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         with:
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_PASSWORD }}
 
       - name: Extract metadata (tags, labels) for Docker
         id: meta
-        uses: docker/metadata-action@v4
+        uses: docker/metadata-action@v5
         with:
           images: blockscout/blockscout
 
@@ -48,7 +45,7 @@ jobs:
         id: output-step
 
       - name: Build and push Docker image
-        uses: docker/build-push-action@v3
+        uses: docker/build-push-action@v5
         with:
           context: .
           file: ./docker/Dockerfile
@@ -73,7 +70,7 @@ jobs:
             RELEASE_VERSION=${{ env.RELEASE_VERSION }}
 
       - name: Build and push Docker image for frontend
-        uses: docker/build-push-action@v3
+        uses: docker/build-push-action@v5
         with:
           context: .
           file: ./docker/Dockerfile
diff --git a/.github/workflows/publish-docker-image-for-core.yml b/.github/workflows/publish-docker-image-for-core.yml
index 52f5e4645762..f0d836f941ec 100644
--- a/.github/workflows/publish-docker-image-for-core.yml
+++ b/.github/workflows/publish-docker-image-for-core.yml
@@ -18,17 +18,17 @@ jobs:
       DOCKER_CHAIN_NAME: poa
     steps:
       - name: Check out the repo
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       
       - name: Log in to Docker Hub
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         with:
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_PASSWORD }}
       
       - name: Extract metadata (tags, labels) for Docker
         id: meta
-        uses: docker/metadata-action@v4
+        uses: docker/metadata-action@v5
         with:
           images: blockscout/blockscout
 
@@ -36,7 +36,7 @@ jobs:
         run: echo "SHORT_SHA=`echo ${GITHUB_SHA} | cut -c1-8`" >> $GITHUB_ENV
       
       - name: Build and push Docker image
-        uses: docker/build-push-action@v3
+        uses: docker/build-push-action@v5
         with:
           context: .
           file: ./docker/Dockerfile
diff --git a/.github/workflows/publish-docker-image-for-eth-goerli.yml b/.github/workflows/publish-docker-image-for-eth-goerli.yml
index bb79109025b6..bd25b221e5bc 100644
--- a/.github/workflows/publish-docker-image-for-eth-goerli.yml
+++ b/.github/workflows/publish-docker-image-for-eth-goerli.yml
@@ -18,17 +18,17 @@ jobs:
       DOCKER_CHAIN_NAME: eth-goerli
     steps:
       - name: Check out the repo
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       
       - name: Log in to Docker Hub
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         with:
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_PASSWORD }}
       
       - name: Extract metadata (tags, labels) for Docker
         id: meta
-        uses: docker/metadata-action@v4
+        uses: docker/metadata-action@v5
         with:
           images: blockscout/blockscout
 
@@ -36,7 +36,7 @@ jobs:
         run: echo "SHORT_SHA=`echo ${GITHUB_SHA} | cut -c1-8`" >> $GITHUB_ENV
       
       - name: Build and push Docker image
-        uses: docker/build-push-action@v3
+        uses: docker/build-push-action@v5
         with:
           context: .
           file: ./docker/Dockerfile
diff --git a/.github/workflows/publish-docker-image-for-eth.yml b/.github/workflows/publish-docker-image-for-eth.yml
index 9095a49265c3..7ab5a54f4a7f 100644
--- a/.github/workflows/publish-docker-image-for-eth.yml
+++ b/.github/workflows/publish-docker-image-for-eth.yml
@@ -18,17 +18,17 @@ jobs:
       DOCKER_CHAIN_NAME: mainnet
     steps:
       - name: Check out the repo
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       
       - name: Log in to Docker Hub
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         with:
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_PASSWORD }}
       
       - name: Extract metadata (tags, labels) for Docker
         id: meta
-        uses: docker/metadata-action@v4
+        uses: docker/metadata-action@v5
         with:
           images: blockscout/blockscout
 
@@ -36,7 +36,7 @@ jobs:
         run: echo "SHORT_SHA=`echo ${GITHUB_SHA} | cut -c1-8`" >> $GITHUB_ENV
       
       - name: Build and push Docker image
-        uses: docker/build-push-action@v3
+        uses: docker/build-push-action@v5
         with:
           context: .
           file: ./docker/Dockerfile
diff --git a/.github/workflows/publish-docker-image-for-fuse.yml b/.github/workflows/publish-docker-image-for-fuse.yml
index f54355fa4cdd..d3548c38666e 100644
--- a/.github/workflows/publish-docker-image-for-fuse.yml
+++ b/.github/workflows/publish-docker-image-for-fuse.yml
@@ -18,23 +18,20 @@ jobs:
       DOCKER_CHAIN_NAME: fuse
     steps:
       - name: Check out the repo
-        uses: actions/checkout@v3
-
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v2
+        uses: actions/checkout@v4
 
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
+        uses: docker/setup-buildx-action@v3
       
       - name: Log in to Docker Hub
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         with:
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_PASSWORD }}
       
       - name: Extract metadata (tags, labels) for Docker
         id: meta
-        uses: docker/metadata-action@v4
+        uses: docker/metadata-action@v5
         with:
           images: blockscout/blockscout
 
@@ -42,7 +39,7 @@ jobs:
         run: echo "SHORT_SHA=`echo ${GITHUB_SHA} | cut -c1-8`" >> $GITHUB_ENV
       
       - name: Build and push Docker image
-        uses: docker/build-push-action@v3
+        uses: docker/build-push-action@v5
         with:
           context: .
           file: ./docker/Dockerfile
diff --git a/.github/workflows/publish-docker-image-for-immutable.yml b/.github/workflows/publish-docker-image-for-immutable.yml
index 3b91f64ca5cf..1a266332ee77 100644
--- a/.github/workflows/publish-docker-image-for-immutable.yml
+++ b/.github/workflows/publish-docker-image-for-immutable.yml
@@ -18,13 +18,10 @@ jobs:
       DOCKER_CHAIN_NAME: immutable
     steps:
       - name: Check out the repo
-        uses: actions/checkout@v3
-
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v2
+        uses: actions/checkout@v4
 
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
+        uses: docker/setup-buildx-action@v3
       
       - name: Log in to Docker Hub
         uses: docker/login-action@v2
@@ -34,7 +31,7 @@ jobs:
       
       - name: Extract metadata (tags, labels) for Docker
         id: meta
-        uses: docker/metadata-action@v4
+        uses: docker/metadata-action@v5
         with:
           images: blockscout/blockscout
 
@@ -42,7 +39,7 @@ jobs:
         run: echo "SHORT_SHA=`echo ${GITHUB_SHA} | cut -c1-8`" >> $GITHUB_ENV
       
       - name: Build and push Docker image
-        uses: docker/build-push-action@v3
+        uses: docker/build-push-action@v5
         with:
           context: .
           file: ./docker/Dockerfile
diff --git a/.github/workflows/publish-docker-image-for-l2-staging.yml b/.github/workflows/publish-docker-image-for-l2-staging.yml
index f05ff42df5b4..305fc1d100d6 100644
--- a/.github/workflows/publish-docker-image-for-l2-staging.yml
+++ b/.github/workflows/publish-docker-image-for-l2-staging.yml
@@ -18,7 +18,7 @@ jobs:
       DOCKER_CHAIN_NAME: optimism-l2-advanced
     steps:
       - name: Check out the repo
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       
       - name: Log in to Docker Hub
         uses: docker/login-action@v2
@@ -28,7 +28,7 @@ jobs:
       
       - name: Extract metadata (tags, labels) for Docker
         id: meta
-        uses: docker/metadata-action@v4
+        uses: docker/metadata-action@v5
         with:
           images: blockscout/blockscout
 
@@ -36,7 +36,7 @@ jobs:
         run: echo "SHORT_SHA=`echo ${GITHUB_SHA} | cut -c1-8`" >> $GITHUB_ENV
       
       - name: Build and push Docker image
-        uses: docker/build-push-action@v3
+        uses: docker/build-push-action@v5
         with:
           context: .
           file: ./docker/Dockerfile
diff --git a/.github/workflows/publish-docker-image-for-lukso.yml b/.github/workflows/publish-docker-image-for-lukso.yml
index 0775d2b59bf5..75a25b54dfc7 100644
--- a/.github/workflows/publish-docker-image-for-lukso.yml
+++ b/.github/workflows/publish-docker-image-for-lukso.yml
@@ -18,7 +18,7 @@ jobs:
       DOCKER_CHAIN_NAME: lukso
     steps:
       - name: Check out the repo
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       
       - name: Log in to Docker Hub
         uses: docker/login-action@v2
@@ -28,7 +28,7 @@ jobs:
       
       - name: Extract metadata (tags, labels) for Docker
         id: meta
-        uses: docker/metadata-action@v4
+        uses: docker/metadata-action@v5
         with:
           images: blockscout/blockscout
 
@@ -36,7 +36,7 @@ jobs:
         run: echo "SHORT_SHA=`echo ${GITHUB_SHA} | cut -c1-8`" >> $GITHUB_ENV
       
       - name: Build and push Docker image
-        uses: docker/build-push-action@v3
+        uses: docker/build-push-action@v5
         with:
           context: .
           file: ./docker/Dockerfile
diff --git a/.github/workflows/publish-docker-image-for-optimism.yml b/.github/workflows/publish-docker-image-for-optimism.yml
index 3601cff8ae7e..a005e6bba223 100644
--- a/.github/workflows/publish-docker-image-for-optimism.yml
+++ b/.github/workflows/publish-docker-image-for-optimism.yml
@@ -18,7 +18,7 @@ jobs:
       DOCKER_CHAIN_NAME: optimism
     steps:
       - name: Check out the repo
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       
       - name: Log in to Docker Hub
         uses: docker/login-action@v2
@@ -28,7 +28,7 @@ jobs:
       
       - name: Extract metadata (tags, labels) for Docker
         id: meta
-        uses: docker/metadata-action@v4
+        uses: docker/metadata-action@v5
         with:
           images: blockscout/blockscout
 
@@ -36,12 +36,15 @@ jobs:
         run: echo "SHORT_SHA=`echo ${GITHUB_SHA} | cut -c1-8`" >> $GITHUB_ENV
       
       - name: Build and push Docker image
-        uses: docker/build-push-action@v3
+        uses: docker/build-push-action@v5
         with:
           context: .
           file: ./docker/Dockerfile
           push: true
           tags: blockscout/blockscout-${{ env.DOCKER_CHAIN_NAME }}:latest, blockscout/blockscout-${{ env.DOCKER_CHAIN_NAME }}:${{ env.RELEASE_VERSION }}-postrelease-${{ env.SHORT_SHA }}
+          platforms: |
+            linux/amd64
+            linux/arm64/v8
           build-args: |
             CACHE_EXCHANGE_RATES_PERIOD=
             API_V1_READ_METHODS_DISABLED=false
diff --git a/.github/workflows/publish-docker-image-for-rsk.yml b/.github/workflows/publish-docker-image-for-rsk.yml
index 979e240761ba..45ee47226408 100644
--- a/.github/workflows/publish-docker-image-for-rsk.yml
+++ b/.github/workflows/publish-docker-image-for-rsk.yml
@@ -18,7 +18,7 @@ jobs:
       DOCKER_CHAIN_NAME: rsk
     steps:
       - name: Check out the repo
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       
       - name: Log in to Docker Hub
         uses: docker/login-action@v2
@@ -28,7 +28,7 @@ jobs:
       
       - name: Extract metadata (tags, labels) for Docker
         id: meta
-        uses: docker/metadata-action@v4
+        uses: docker/metadata-action@v5
         with:
           images: blockscout/blockscout
 
diff --git a/.github/workflows/publish-docker-image-for-xdai.yml b/.github/workflows/publish-docker-image-for-xdai.yml
index 2cd054c3b7ae..2c6d7836afbf 100644
--- a/.github/workflows/publish-docker-image-for-xdai.yml
+++ b/.github/workflows/publish-docker-image-for-xdai.yml
@@ -18,13 +18,10 @@ jobs:
       DOCKER_CHAIN_NAME: xdai
     steps:
       - name: Check out the repo
-        uses: actions/checkout@v3
-
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v2
+        uses: actions/checkout@v4
 
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
+        uses: docker/setup-buildx-action@v3
       
       - name: Log in to Docker Hub
         uses: docker/login-action@v2
@@ -34,7 +31,7 @@ jobs:
       
       - name: Extract metadata (tags, labels) for Docker
         id: meta
-        uses: docker/metadata-action@v4
+        uses: docker/metadata-action@v5
         with:
           images: blockscout/blockscout
 
@@ -42,7 +39,7 @@ jobs:
         run: echo "SHORT_SHA=`echo ${GITHUB_SHA} | cut -c1-8`" >> $GITHUB_ENV
       
       - name: Build and push Docker image
-        uses: docker/build-push-action@v3
+        uses: docker/build-push-action@v5
         with:
           context: .
           file: ./docker/Dockerfile
diff --git a/.github/workflows/publish-docker-image-for-zksync.yml b/.github/workflows/publish-docker-image-for-zksync.yml
index dbd13e3b3237..1c0e5a5bea16 100644
--- a/.github/workflows/publish-docker-image-for-zksync.yml
+++ b/.github/workflows/publish-docker-image-for-zksync.yml
@@ -18,7 +18,7 @@ jobs:
       DOCKER_CHAIN_NAME: zksync
     steps:
       - name: Check out the repo
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       
       - name: Log in to Docker Hub
         uses: docker/login-action@v2
@@ -28,7 +28,7 @@ jobs:
       
       - name: Extract metadata (tags, labels) for Docker
         id: meta
-        uses: docker/metadata-action@v4
+        uses: docker/metadata-action@v5
         with:
           images: blockscout/blockscout
 
@@ -36,7 +36,7 @@ jobs:
         run: echo "SHORT_SHA=`echo ${GITHUB_SHA} | cut -c1-8`" >> $GITHUB_ENV
       
       - name: Build and push Docker image
-        uses: docker/build-push-action@v3
+        uses: docker/build-push-action@v5
         with:
           context: .
           file: ./docker/Dockerfile
diff --git a/.github/workflows/publish-docker-image-release.yml b/.github/workflows/publish-docker-image-release.yml
index 124af71187d1..5bb00c992690 100644
--- a/.github/workflows/publish-docker-image-release.yml
+++ b/.github/workflows/publish-docker-image-release.yml
@@ -21,13 +21,10 @@ jobs:
       RELEASE_VERSION: 5.2.3
     steps:
       - name: Check out the repo
-        uses: actions/checkout@v3
-
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v2
+        uses: actions/checkout@v4
 
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
+        uses: docker/setup-buildx-action@v3
 
       - name: Log in to Docker Hub
         uses: docker/login-action@v2
@@ -37,12 +34,12 @@ jobs:
 
       - name: Extract metadata (tags, labels) for Docker
         id: meta
-        uses: docker/metadata-action@v4
+        uses: docker/metadata-action@v5
         with:
           images: blockscout/blockscout
 
       - name: Build & Push Docker image
-        uses: docker/build-push-action@v3
+        uses: docker/build-push-action@v5
         with:
           context: .
           file: ./docker/Dockerfile
@@ -51,8 +48,8 @@ jobs:
           cache-to: type=registry,ref=blockscout/blockscout:buildcache,mode=max
           tags: blockscout/blockscout:latest, blockscout/blockscout:${{ env.RELEASE_VERSION }}
           platforms: |
-            linux/arm64
             linux/amd64
+            linux/arm64/v8
           build-args: |
             CACHE_EXCHANGE_RATES_PERIOD=
             API_V1_READ_METHODS_DISABLED=false
@@ -96,7 +93,7 @@ jobs:
   #       production-rsk-stg
   #       production-immutable-stg
   #   steps:
-  #   - uses: actions/checkout@v2
+  #   - uses: actions/checkout@v4
   #   - name: Set Git config
   #     run: |
   #         git config --local user.email "actions@github.com"
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6854061e899a..58f26fe6820d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -17,6 +17,7 @@
 
 ### Fixes
 
+- [#8661](https://github.com/blockscout/blockscout/pull/8661) - arm64-compatible docker image
 - [#8649](https://github.com/blockscout/blockscout/pull/8649) - Set max 30sec JSON RPC poll frequency for realtime fetcher when WS is disabled
 - [#8614](https://github.com/blockscout/blockscout/pull/8614) - Disable market history cataloger fetcher when exchange rates are disabled
 - [#8572](https://github.com/blockscout/blockscout/pull/8572) - Refactor docker-compose config
diff --git a/docker/Dockerfile b/docker/Dockerfile
index ba1ccd8f85d6..bc8bb581b4b8 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -1,10 +1,13 @@
-FROM bitwalker/alpine-elixir-phoenix:1.14 AS builder
+FROM hexpm/elixir:1.14.5-erlang-24.2.2-alpine-3.18.2 AS builder
 
 WORKDIR /app
 
 ENV MIX_ENV="prod"
 
-RUN apk --no-cache --update add alpine-sdk gmp-dev automake libtool inotify-tools autoconf python3 file libstdc++ curl ca-certificates
+RUN apk --no-cache --update add alpine-sdk gmp-dev automake libtool inotify-tools autoconf python3 file gcompat
+
+RUN set -ex && \
+    apk --update add libstdc++ curl ca-certificates gcompat
 
 ARG CACHE_EXCHANGE_RATES_PERIOD
 ARG API_V1_READ_METHODS_DISABLED
@@ -47,9 +50,13 @@ RUN cd apps/block_scout_web/assets/ && \
     npm install && \
     npm run deploy && \
     cd /app/apps/explorer/ && \
-    npm install
+    npm install && \
+    apk update && \
+    apk del --force-broken-world alpine-sdk gmp-dev automake libtool inotify-tools autoconf python3
+
+
+RUN apk add --update git make 
 
-RUN export "CFLAGS=-I/usr/local/include -L/usr/local/lib" && cd deps/ex_secp256k1 && mix deps.get && mix compile
 RUN mix phx.digest
 
 RUN mkdir -p /opt/release \
@@ -57,7 +64,7 @@ RUN mkdir -p /opt/release \
   && mv _build/${MIX_ENV}/rel/blockscout /opt/release
 
 ##############################################################
-FROM bitwalker/alpine-elixir-phoenix:1.14
+FROM hexpm/elixir:1.14.5-erlang-24.2.2-alpine-3.18.2
 
 ARG RELEASE_VERSION
 ENV RELEASE_VERSION=${RELEASE_VERSION}

From 2f4db2e9aa1d72132fea23a3bbed9dbcf5c86402 Mon Sep 17 00:00:00 2001
From: Nikita Pozdniakov <nikitosing4@mail.ru>
Date: Wed, 4 Oct 2023 14:00:53 +0300
Subject: [PATCH 510/909] Improve `/tabs-counters` and add cache

---
 CHANGELOG.md                                  |   1 +
 .../controllers/api/v2/address_controller.ex  |   7 +-
 .../api/v2/address_controller_test.exs        | 233 ++++++++++++
 apps/explorer/lib/explorer/application.ex     |   2 +
 .../lib/explorer/chain/address/counters.ex    | 358 ++++++++++--------
 .../chain/cache/addresses_tabs_counters.ex    | 131 +++++++
 apps/explorer/lib/explorer/counters/helper.ex |   4 +-
 config/runtime.exs                            |   3 +
 8 files changed, 568 insertions(+), 171 deletions(-)
 create mode 100644 apps/explorer/lib/explorer/chain/cache/addresses_tabs_counters.ex

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 58f26fe6820d..fe51760c572c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,7 @@
 
 ### Features
 
+- [#8512](https://github.com/blockscout/blockscout/pull/8512) - Add caching and improve `/tabs-counters` performance
 - [#8472](https://github.com/blockscout/blockscout/pull/8472) - Integrate `/api/v2/bytecodes/sources:search-all` of `eth_bytecode_db`
 - [#8589](https://github.com/blockscout/blockscout/pull/8589) - DefiLlama TVL source
 - [#8544](https://github.com/blockscout/blockscout/pull/8544) - Fix `nil` `"structLogs"`
diff --git a/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/address_controller.ex b/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/address_controller.ex
index 160fd28cf60d..5512f086f133 100644
--- a/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/address_controller.ex
+++ b/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/address_controller.ex
@@ -414,8 +414,8 @@ defmodule BlockScoutWeb.API.V2.AddressController do
     with {:format, {:ok, address_hash}} <- {:format, Chain.string_to_address_hash(address_hash_string)},
          {:ok, false} <- AccessHelper.restricted_access?(address_hash_string, params),
          {:not_found, {:ok, _address}} <- {:not_found, Chain.hash_to_address(address_hash, @api_true, false)} do
-      {validations, transactions, token_transfers, token_balances, logs, withdrawals, internal_txs, coin_balances} =
-        Counters.address_limited_counters(address_hash_string, @api_true)
+      {validations, transactions, token_transfers, token_balances, logs, withdrawals, internal_txs} =
+        Counters.address_limited_counters(address_hash, @api_true)
 
       conn
       |> put_status(200)
@@ -426,8 +426,7 @@ defmodule BlockScoutWeb.API.V2.AddressController do
         token_balances_count: token_balances,
         logs_count: logs,
         withdrawals_count: withdrawals,
-        internal_txs_count: internal_txs,
-        coin_balances_count: coin_balances
+        internal_txs_count: internal_txs
       })
     end
   end
diff --git a/apps/block_scout_web/test/block_scout_web/controllers/api/v2/address_controller_test.exs b/apps/block_scout_web/test/block_scout_web/controllers/api/v2/address_controller_test.exs
index ee6f156fa525..06013076b2d1 100644
--- a/apps/block_scout_web/test/block_scout_web/controllers/api/v2/address_controller_test.exs
+++ b/apps/block_scout_web/test/block_scout_web/controllers/api/v2/address_controller_test.exs
@@ -1670,6 +1670,239 @@ defmodule BlockScoutWeb.API.V2.AddressControllerTest do
     end
   end
 
+  describe "/addresses/{address_hash}/tabs-counters" do
+    test "get 404 on non existing address", %{conn: conn} do
+      address = build(:address)
+
+      request = get(conn, "/api/v2/addresses/#{address.hash}/tabs-counters")
+
+      assert %{"message" => "Not found"} = json_response(request, 404)
+    end
+
+    test "get 422 on invalid address", %{conn: conn} do
+      request = get(conn, "/api/v2/addresses/0x/tabs-counters")
+
+      assert %{"message" => "Invalid parameter(s)"} = json_response(request, 422)
+    end
+
+    test "get counters with 0s", %{conn: conn} do
+      address = insert(:address)
+
+      request = get(conn, "/api/v2/addresses/#{address.hash}/tabs-counters")
+
+      assert %{
+               "validations_count" => 0,
+               "transactions_count" => 0,
+               "token_transfers_count" => 0,
+               "token_balances_count" => 0,
+               "logs_count" => 0,
+               "withdrawals_count" => 0,
+               "internal_txs_count" => 0
+             } = json_response(request, 200)
+    end
+
+    test "get counters and check that cache works", %{conn: conn} do
+      address = insert(:address, withdrawals: insert_list(60, :withdrawal))
+
+      insert(:transaction, from_address: address) |> with_block()
+      insert(:transaction, to_address: address) |> with_block()
+      another_tx = insert(:transaction) |> with_block()
+
+      insert(:token_transfer,
+        from_address: address,
+        transaction: another_tx,
+        block: another_tx.block,
+        block_number: another_tx.block_number
+      )
+
+      insert(:token_transfer,
+        to_address: address,
+        transaction: another_tx,
+        block: another_tx.block,
+        block_number: another_tx.block_number
+      )
+
+      insert(:block, miner: address)
+
+      tx =
+        :transaction
+        |> insert()
+        |> with_block()
+
+      for x <- 1..2 do
+        insert(:internal_transaction,
+          transaction: tx,
+          index: x,
+          block_number: tx.block_number,
+          transaction_index: tx.index,
+          block_hash: tx.block_hash,
+          block_index: x,
+          from_address: address
+        )
+      end
+
+      for _ <- 0..60 do
+        insert(:address_current_token_balance_with_token_id, address: address)
+      end
+
+      for x <- 0..60 do
+        tx =
+          :transaction
+          |> insert()
+          |> with_block()
+
+        insert(:log,
+          transaction: tx,
+          index: x,
+          block: tx.block,
+          block_number: tx.block_number,
+          address: address
+        )
+      end
+
+      request = get(conn, "/api/v2/addresses/#{address.hash}/tabs-counters")
+
+      assert %{
+               "validations_count" => 1,
+               "transactions_count" => 2,
+               "token_transfers_count" => 2,
+               "token_balances_count" => 51,
+               "logs_count" => 51,
+               "withdrawals_count" => 51,
+               "internal_txs_count" => 2
+             } = json_response(request, 200)
+
+      for x <- 3..4 do
+        insert(:internal_transaction,
+          transaction: tx,
+          index: x,
+          block_number: tx.block_number,
+          transaction_index: tx.index,
+          block_hash: tx.block_hash,
+          block_index: x,
+          from_address: address
+        )
+      end
+
+      request = get(conn, "/api/v2/addresses/#{address.hash}/tabs-counters")
+
+      assert %{
+               "validations_count" => 1,
+               "transactions_count" => 2,
+               "token_transfers_count" => 2,
+               "token_balances_count" => 51,
+               "logs_count" => 51,
+               "withdrawals_count" => 51,
+               "internal_txs_count" => 2
+             } = json_response(request, 200)
+    end
+
+    test "check counters cache ttl", %{conn: conn} do
+      address = insert(:address, withdrawals: insert_list(60, :withdrawal))
+
+      insert(:transaction, from_address: address) |> with_block()
+      insert(:transaction, to_address: address) |> with_block()
+      another_tx = insert(:transaction) |> with_block()
+
+      insert(:token_transfer,
+        from_address: address,
+        transaction: another_tx,
+        block: another_tx.block,
+        block_number: another_tx.block_number
+      )
+
+      insert(:token_transfer,
+        to_address: address,
+        transaction: another_tx,
+        block: another_tx.block,
+        block_number: another_tx.block_number
+      )
+
+      insert(:block, miner: address)
+
+      tx =
+        :transaction
+        |> insert()
+        |> with_block()
+
+      for x <- 1..2 do
+        insert(:internal_transaction,
+          transaction: tx,
+          index: x,
+          block_number: tx.block_number,
+          transaction_index: tx.index,
+          block_hash: tx.block_hash,
+          block_index: x,
+          from_address: address
+        )
+      end
+
+      for _ <- 0..60 do
+        insert(:address_current_token_balance_with_token_id, address: address)
+      end
+
+      for x <- 0..60 do
+        tx =
+          :transaction
+          |> insert()
+          |> with_block()
+
+        insert(:log,
+          transaction: tx,
+          index: x,
+          block: tx.block,
+          block_number: tx.block_number,
+          address: address
+        )
+      end
+
+      request = get(conn, "/api/v2/addresses/#{address.hash}/tabs-counters")
+
+      assert %{
+               "validations_count" => 1,
+               "transactions_count" => 2,
+               "token_transfers_count" => 2,
+               "token_balances_count" => 51,
+               "logs_count" => 51,
+               "withdrawals_count" => 51,
+               "internal_txs_count" => 2
+             } = json_response(request, 200)
+
+      old_env = Application.get_env(:explorer, Explorer.Chain.Cache.AddressesTabsCounters)
+      Application.put_env(:explorer, Explorer.Chain.Cache.AddressesTabsCounters, ttl: 200)
+      :timer.sleep(200)
+
+      for x <- 3..4 do
+        insert(:internal_transaction,
+          transaction: tx,
+          index: x,
+          block_number: tx.block_number,
+          transaction_index: tx.index,
+          block_hash: tx.block_hash,
+          block_index: x,
+          from_address: address
+        )
+      end
+
+      insert(:transaction, from_address: address) |> with_block()
+      insert(:transaction, to_address: address) |> with_block()
+
+      request = get(conn, "/api/v2/addresses/#{address.hash}/tabs-counters")
+
+      assert %{
+               "validations_count" => 1,
+               "transactions_count" => 4,
+               "token_transfers_count" => 2,
+               "token_balances_count" => 51,
+               "logs_count" => 51,
+               "withdrawals_count" => 51,
+               "internal_txs_count" => 4
+             } = json_response(request, 200)
+
+      Application.put_env(:explorer, Explorer.Chain.Cache.AddressesTabsCounters, old_env)
+    end
+  end
+
   defp compare_item(%Address{} = address, json) do
     assert Address.checksum(address.hash) == json["hash"]
     assert to_string(address.nonce + 1) == json["tx_count"]
diff --git a/apps/explorer/lib/explorer/application.ex b/apps/explorer/lib/explorer/application.ex
index 1799fc28828d..b46894d80ce7 100644
--- a/apps/explorer/lib/explorer/application.ex
+++ b/apps/explorer/lib/explorer/application.ex
@@ -9,6 +9,7 @@ defmodule Explorer.Application do
 
   alias Explorer.Chain.Cache.{
     Accounts,
+    AddressesTabsCounters,
     AddressSum,
     AddressSumMinusBurnt,
     Block,
@@ -77,6 +78,7 @@ defmodule Explorer.Application do
       Transactions,
       TransactionsApiV2,
       Uncles,
+      AddressesTabsCounters,
       con_cache_child_spec(MarketHistoryCache.cache_name()),
       con_cache_child_spec(RSK.cache_name(), ttl_check_interval: :timer.minutes(1), global_ttl: :timer.minutes(30)),
       {Redix, redix_opts()},
diff --git a/apps/explorer/lib/explorer/chain/address/counters.ex b/apps/explorer/lib/explorer/chain/address/counters.ex
index a8d2b78b6d69..3538f062dc4a 100644
--- a/apps/explorer/lib/explorer/chain/address/counters.ex
+++ b/apps/explorer/lib/explorer/chain/address/counters.ex
@@ -2,7 +2,7 @@ defmodule Explorer.Chain.Address.Counters do
   @moduledoc """
     Functions related to Explorer.Chain.Address counters
   """
-  import Ecto.Query, only: [from: 2, limit: 2, select: 3, subquery: 1, union: 2, where: 3]
+  import Ecto.Query, only: [from: 2, limit: 2, select: 3, union: 2, where: 3]
 
   import Explorer.Chain,
     only: [select_repo: 1, wrapped_union_subquery: 1]
@@ -19,7 +19,6 @@ defmodule Explorer.Chain.Address.Counters do
 
   alias Explorer.Chain.{
     Address,
-    Address.CoinBalance,
     Address.CurrentTokenBalance,
     Block,
     Hash,
@@ -30,10 +29,17 @@ defmodule Explorer.Chain.Address.Counters do
     Withdrawal
   }
 
+  alias Explorer.Chain.Cache.AddressesTabsCounters
   alias Explorer.Chain.Cache.Helper, as: CacheHelper
 
   require Logger
 
+  @typep counter :: non_neg_integer() | nil
+
+  @counters_limit 51
+  @types [:validations, :txs, :token_transfers, :token_balances, :logs, :withdrawals, :internal_txs]
+  @txs_types [:txs_from, :txs_to, :txs_contract]
+
   defp address_hash_to_logs_query(address_hash) do
     from(l in Log, where: l.address_hash == ^address_hash)
   end
@@ -50,22 +56,6 @@ defmodule Explorer.Chain.Address.Counters do
     select_repo(options).exists?(address_hash_to_logs_query(address_hash))
   end
 
-  defp address_hash_to_coin_balances(address_hash) do
-    query =
-      from(
-        cb in CoinBalance,
-        where: cb.address_hash == ^address_hash,
-        where: not is_nil(cb.value),
-        select_merge: %{
-          delta: fragment("? - coalesce(lead(?, 1) over (order by ? desc), 0)", cb.value, cb.value, cb.block_number)
-        }
-      )
-
-    from(balance in subquery(query),
-      where: balance.delta != 0
-    )
-  end
-
   def check_if_token_transfers_at_address(address_hash, options \\ []) do
     select_repo(options).exists?(from(tt in TokenTransfer, where: tt.from_address_hash == ^address_hash)) ||
       select_repo(options).exists?(from(tt in TokenTransfer, where: tt.to_address_hash == ^address_hash))
@@ -255,6 +245,39 @@ defmodule Explorer.Chain.Address.Counters do
     end
   end
 
+  def address_hash_to_internal_txs_limited_count_query(address_hash) do
+    query_to_address_hash_wrapped =
+      InternalTransaction
+      |> InternalTransaction.where_nonpending_block()
+      |> InternalTransaction.where_address_fields_match(address_hash, :to_address_hash)
+      |> InternalTransaction.where_is_different_from_parent_transaction()
+      |> limit(@counters_limit)
+      |> wrapped_union_subquery()
+
+    query_from_address_hash_wrapped =
+      InternalTransaction
+      |> InternalTransaction.where_nonpending_block()
+      |> InternalTransaction.where_address_fields_match(address_hash, :from_address_hash)
+      |> InternalTransaction.where_is_different_from_parent_transaction()
+      |> limit(@counters_limit)
+      |> wrapped_union_subquery()
+
+    query_created_contract_address_hash_wrapped =
+      InternalTransaction
+      |> InternalTransaction.where_nonpending_block()
+      |> InternalTransaction.where_address_fields_match(address_hash, :created_contract_address_hash)
+      |> InternalTransaction.where_is_different_from_parent_transaction()
+      |> limit(@counters_limit)
+      |> wrapped_union_subquery()
+
+    query_to_address_hash_wrapped
+    |> union(^query_from_address_hash_wrapped)
+    |> union(^query_created_contract_address_hash_wrapped)
+    |> wrapped_union_subquery()
+    |> InternalTransaction.where_is_different_from_parent_transaction()
+    |> limit(@counters_limit)
+  end
+
   def address_counters(address, options \\ []) do
     validation_count_task =
       Task.async(fn ->
@@ -304,28 +327,33 @@ defmodule Explorer.Chain.Address.Counters do
     AddressTransactionsGasUsageCounter.fetch(address)
   end
 
-  @counters_limit 51
-
+  @spec address_limited_counters(Hash.t(), Keyword.t()) ::
+          {counter(), counter(), counter(), counter(), counter(), counter(), counter()}
   def address_limited_counters(address_hash, options) do
+    cached_counters =
+      Enum.reduce(@types, %{}, fn type, acc ->
+        case AddressesTabsCounters.get_counter(type, address_hash) do
+          {_datetime, counter, status} ->
+            Map.put(acc, type, {status, counter})
+
+          _ ->
+            acc
+        end
+      end)
+
     start = Time.utc_now()
 
     validations_count_task =
-      Task.async(fn ->
-        result =
-          address_hash
-          |> address_hash_to_validated_blocks_query()
-          |> limit(@counters_limit)
-          |> select_repo(options).aggregate(:count)
-
-        Logger.info(
-          "Time consumed for validations_count_task for #{address_hash} is #{Time.diff(Time.utc_now(), start, :millisecond)}ms"
-        )
-
-        result
-      end)
+      configure_task(
+        :validations,
+        cached_counters,
+        address_hash_to_validated_blocks_query(address_hash),
+        address_hash,
+        options
+      )
 
     transactions_from_count_task =
-      Task.async(fn ->
+      run_or_ignore(cached_counters[:txs], :txs_from, address_hash, fn ->
         result =
           Transaction
           |> where([t], t.from_address_hash == ^address_hash)
@@ -338,11 +366,14 @@ defmodule Explorer.Chain.Address.Counters do
           "Time consumed for transactions_from_count_task for #{address_hash} is #{Time.diff(Time.utc_now(), start, :millisecond)}ms"
         )
 
-        result
+        AddressesTabsCounters.save_txs_counter_progress(address_hash, %{txs_types: [:txs_from], txs_from: result})
+        AddressesTabsCounters.drop_task(:txs_from, address_hash)
+
+        {:txs_from, result}
       end)
 
     transactions_to_count_task =
-      Task.async(fn ->
+      run_or_ignore(cached_counters[:txs], :txs_to, address_hash, fn ->
         result =
           Transaction
           |> where([t], t.to_address_hash == ^address_hash)
@@ -355,11 +386,14 @@ defmodule Explorer.Chain.Address.Counters do
           "Time consumed for transactions_to_count_task for #{address_hash} is #{Time.diff(Time.utc_now(), start, :millisecond)}ms"
         )
 
-        result
+        AddressesTabsCounters.save_txs_counter_progress(address_hash, %{txs_types: [:txs_to], txs_to: result})
+        AddressesTabsCounters.drop_task(:txs_to, address_hash)
+
+        {:txs_to, result}
       end)
 
     transactions_created_contract_count_task =
-      Task.async(fn ->
+      run_or_ignore(cached_counters[:txs], :txs_contract, address_hash, fn ->
         result =
           Transaction
           |> where([t], t.created_contract_address_hash == ^address_hash)
@@ -372,172 +406,166 @@ defmodule Explorer.Chain.Address.Counters do
           "Time consumed for transactions_created_contract_count_task for #{address_hash} is #{Time.diff(Time.utc_now(), start, :millisecond)}ms"
         )
 
-        result
-      end)
-
-    token_transfer_count_task =
-      Task.async(fn ->
-        result =
-          address_hash
-          |> address_to_token_transfer_count_query()
-          |> limit(@counters_limit)
-          |> select_repo(options).aggregate(:count)
+        AddressesTabsCounters.save_txs_counter_progress(address_hash, %{
+          txs_types: [:txs_contract],
+          txs_contract: result
+        })
 
-        Logger.info(
-          "Time consumed for token_transfer_count_task for #{address_hash} is #{Time.diff(Time.utc_now(), start, :millisecond)}ms"
-        )
+        AddressesTabsCounters.drop_task(:txs_contract, address_hash)
 
-        result
+        {:txs_contract, result}
       end)
 
-    token_balances_count_task =
-      Task.async(fn ->
-        result =
-          address_hash
-          |> address_hash_to_token_balances_query()
-          |> limit(@counters_limit)
-          |> select_repo(options).aggregate(:count)
-
-        Logger.info(
-          "Time consumed for token_balances_count_task for #{address_hash} is #{Time.diff(Time.utc_now(), start, :millisecond)}ms"
-        )
+    token_transfers_count_task =
+      configure_task(
+        :token_transfers,
+        cached_counters,
+        address_to_token_transfer_count_query(address_hash),
+        address_hash,
+        options
+      )
 
-        result
-      end)
+    token_balances_count_task =
+      configure_task(
+        :token_balances,
+        cached_counters,
+        address_hash_to_token_balances_query(address_hash),
+        address_hash,
+        options
+      )
 
     logs_count_task =
-      Task.async(fn ->
-        result =
-          address_hash
-          |> address_hash_to_logs_query()
-          |> limit(@counters_limit)
-          |> select_repo(options).aggregate(:count)
-
-        Logger.info(
-          "Time consumed for logs_count_task for #{address_hash} is #{Time.diff(Time.utc_now(), start, :millisecond)}ms"
-        )
-
-        result
-      end)
+      configure_task(
+        :logs,
+        cached_counters,
+        address_hash_to_logs_query(address_hash),
+        address_hash,
+        options
+      )
 
     withdrawals_count_task =
-      Task.async(fn ->
-        result =
-          address_hash
-          |> Withdrawal.address_hash_to_withdrawals_unordered_query()
-          |> limit(@counters_limit)
-          |> select_repo(options).aggregate(:count)
-
-        Logger.info(
-          "Time consumed for withdrawals_count_task for #{address_hash} is #{Time.diff(Time.utc_now(), start, :millisecond)}ms"
-        )
-
-        result
-      end)
+      configure_task(
+        :withdrawals,
+        cached_counters,
+        Withdrawal.address_hash_to_withdrawals_unordered_query(address_hash),
+        address_hash,
+        options
+      )
 
     internal_txs_count_task =
-      Task.async(fn ->
-        query_to_address_hash_wrapped =
-          InternalTransaction
-          |> InternalTransaction.where_nonpending_block()
-          |> InternalTransaction.where_address_fields_match(address_hash, :to_address_hash)
-          |> InternalTransaction.where_is_different_from_parent_transaction()
-          |> limit(@counters_limit)
-          |> wrapped_union_subquery()
-
-        query_from_address_hash_wrapped =
-          InternalTransaction
-          |> InternalTransaction.where_nonpending_block()
-          |> InternalTransaction.where_address_fields_match(address_hash, :from_address_hash)
-          |> InternalTransaction.where_is_different_from_parent_transaction()
-          |> limit(@counters_limit)
-          |> wrapped_union_subquery()
-
-        query_created_contract_address_hash_wrapped =
-          InternalTransaction
-          |> InternalTransaction.where_nonpending_block()
-          |> InternalTransaction.where_address_fields_match(address_hash, :created_contract_address_hash)
-          |> InternalTransaction.where_is_different_from_parent_transaction()
-          |> limit(@counters_limit)
-          |> wrapped_union_subquery()
-
-        result =
-          query_to_address_hash_wrapped
-          |> union(^query_from_address_hash_wrapped)
-          |> union(^query_created_contract_address_hash_wrapped)
-          |> wrapped_union_subquery()
-          |> InternalTransaction.where_is_different_from_parent_transaction()
-          |> limit(@counters_limit)
-          |> select_repo(options).aggregate(:count)
-
-        Logger.info(
-          "Time consumed for internal_txs_count_task for #{address_hash} is #{Time.diff(Time.utc_now(), start, :millisecond)}ms"
-        )
-
-        result
-      end)
-
-    coin_balances_count_task =
-      Task.async(fn ->
-        result =
-          address_hash
-          |> address_hash_to_coin_balances()
-          |> limit(@counters_limit)
-          |> select_repo(options).aggregate(:count)
-
-        Logger.info(
-          "Time consumed for coin_balances_count_task for #{address_hash} is #{Time.diff(Time.utc_now(), start, :millisecond)}ms"
-        )
-
-        result
-      end)
+      configure_task(
+        :internal_txs,
+        cached_counters,
+        address_hash_to_internal_txs_limited_count_query(address_hash),
+        address_hash,
+        options
+      )
 
-    {validations, txs_from, txs_to, txs_contract, token_transfers, token_balances, logs, withdrawals, internal_txs,
-     coin_balances} =
+    map =
       [
         validations_count_task,
         transactions_from_count_task,
         transactions_to_count_task,
         transactions_created_contract_count_task,
-        token_transfer_count_task,
+        token_transfers_count_task,
         token_balances_count_task,
         logs_count_task,
         withdrawals_count_task,
-        internal_txs_count_task,
-        coin_balances_count_task
+        internal_txs_count_task
       ]
-      |> Task.yield_many(:timer.seconds(30))
-      |> Enum.map(fn {_task, res} ->
+      |> Enum.reject(&is_nil/1)
+      |> Task.yield_many(:timer.seconds(1))
+      |> Enum.reduce(Map.merge(prepare_cache_values(cached_counters), %{txs_types: [], txs_hashes: []}), fn {task, res},
+                                                                                                            acc ->
         case res do
-          {:ok, result} ->
-            result
+          {:ok, {txs_type, txs_hashes}} when txs_type in @txs_types ->
+            acc
+            |> (&Map.put(&1, :txs_types, [txs_type | &1[:txs_types] || []])).()
+            |> (&Map.put(&1, :txs_hashes, &1[:txs_hashes] ++ txs_hashes)).()
+
+          {:ok, {type, counter}} ->
+            Map.put(acc, type, counter)
 
           {:exit, reason} ->
             Logger.warn(fn ->
               [
-                "Query fetching address counters terminated: #{inspect(reason)}"
+                "Query fetching address counters for #{address_hash} terminated: #{inspect(reason)}"
               ]
             end)
 
-            nil
+            acc
 
           nil ->
             Logger.warn(fn ->
               [
-                "Query fetching address counters timed out."
+                "Query fetching address counters for #{address_hash} timed out."
               ]
             end)
 
-            nil
+            Task.ignore(task)
+
+            acc
         end
       end)
-      |> List.to_tuple()
+      |> process_txs_counter()
+
+    {map[:validations], map[:txs], map[:token_transfers], map[:token_balances], map[:logs], map[:withdrawals],
+     map[:internal_txs]}
+  end
+
+  defp run_or_ignore({ok, _counter}, _type, _address_hash, _fun) when ok in [:up_to_date, :limit_value], do: nil
+
+  defp run_or_ignore(_, type, address_hash, fun) do
+    if !AddressesTabsCounters.get_task(type, address_hash) do
+      AddressesTabsCounters.set_task(type, address_hash)
+
+      Task.async(fun)
+    end
+  end
+
+  defp configure_task(counter_type, cache, query, address_hash, options) do
+    address_hash = to_string(address_hash)
+    start = Time.utc_now()
+
+    run_or_ignore(cache[counter_type], counter_type, address_hash, fn ->
+      result =
+        query
+        |> limit(@counters_limit)
+        |> select_repo(options).aggregate(:count)
 
-    {validations,
-     (sanitize_list(txs_from) ++ sanitize_list(txs_to) ++ sanitize_list(txs_contract)) |> Enum.dedup() |> Enum.count(),
-     token_transfers, token_balances, logs, withdrawals, internal_txs, coin_balances}
+      Logger.info(
+        "Time consumed for #{counter_type} counter task for #{address_hash} is #{Time.diff(Time.utc_now(), start, :millisecond)}ms"
+      )
+
+      AddressesTabsCounters.set_counter(counter_type, address_hash, result)
+      AddressesTabsCounters.drop_task(counter_type, address_hash)
+
+      {counter_type, result}
+    end)
+  end
+
+  defp process_txs_counter(%{txs_types: [_ | _] = txs_types, txs_hashes: hashes} = map) do
+    counter = hashes |> Enum.uniq() |> Enum.count() |> min(@counters_limit)
+
+    if Enum.count(txs_types) == 3 || counter == @counters_limit do
+      map |> Map.put(:txs, counter)
+    else
+      map
+    end
+  end
+
+  defp process_txs_counter(map), do: map
+
+  defp prepare_cache_values(cached_counters) do
+    Enum.reduce(cached_counters, %{}, fn
+      {k, {_, counter}}, acc ->
+        Map.put(acc, k, counter)
+
+      {k, v}, acc ->
+        Map.put(acc, k, v)
+    end)
   end
 
-  defp sanitize_list(nil), do: []
-  defp sanitize_list(other), do: other
+  def txs_types, do: @txs_types
+  def counters_limit, do: @counters_limit
 end
diff --git a/apps/explorer/lib/explorer/chain/cache/addresses_tabs_counters.ex b/apps/explorer/lib/explorer/chain/cache/addresses_tabs_counters.ex
new file mode 100644
index 000000000000..00aaf5c64fea
--- /dev/null
+++ b/apps/explorer/lib/explorer/chain/cache/addresses_tabs_counters.ex
@@ -0,0 +1,131 @@
+defmodule Explorer.Chain.Cache.AddressesTabsCounters do
+  @moduledoc """
+    Cache for tabs counters on address
+  """
+
+  use GenServer
+
+  import Explorer.Counters.Helper, only: [fetch_from_cache: 3]
+
+  alias Explorer.Chain.Address.Counters
+
+  @cache_name :addresses_tabs_counters
+
+  @typep counter_type :: :validations | :txs | :token_transfers | :token_balances | :logs | :withdrawals | :internal_txs
+  @typep response_status :: :limit_value | :stale | :up_to_date
+
+  @spec get_counter(counter_type, String.t()) :: {DateTime.t(), non_neg_integer(), response_status} | nil
+  def get_counter(counter_type, address_hash) do
+    address_hash |> cache_key(counter_type) |> fetch_from_cache(@cache_name, nil) |> check_staleness()
+  end
+
+  @spec set_counter(counter_type, String.t(), non_neg_integer()) :: :ok
+  def set_counter(counter_type, address_hash, counter, need_to_modify_state? \\ true) do
+    :ets.insert(@cache_name, {cache_key(address_hash, counter_type), {DateTime.utc_now(), counter}})
+    if need_to_modify_state?, do: ignore_txs(counter_type, address_hash)
+
+    :ok
+  end
+
+  def set_task(counter_type, address_hash) do
+    :ets.insert(@cache_name, {task_cache_key(address_hash, counter_type), true})
+  end
+
+  def drop_task(counter_type, address_hash) do
+    :ets.delete(@cache_name, task_cache_key(address_hash, counter_type))
+  end
+
+  def get_task(counter_type, address_hash) do
+    address_hash |> task_cache_key(counter_type) |> fetch_from_cache(@cache_name, nil)
+  end
+
+  def ignore_txs(:txs, address_hash), do: GenServer.cast(__MODULE__, {:ignore_txs, address_hash})
+  def ignore_txs(_counter_type, _address_hash), do: :ignore
+
+  def save_txs_counter_progress(address_hash, results) do
+    GenServer.cast(__MODULE__, {:set_txs_state, address_hash, results})
+  end
+
+  def start_link(_) do
+    GenServer.start_link(__MODULE__, :ok, name: __MODULE__)
+  end
+
+  @impl true
+  def init(_opts) do
+    :ets.new(@cache_name, [
+      :set,
+      :named_table,
+      :public,
+      read_concurrency: true,
+      write_concurrency: true
+    ])
+
+    {:ok, %{}}
+  end
+
+  @impl true
+  def handle_cast({:ignore_txs, address_hash}, state) do
+    {:noreply, Map.put(state, lowercased_string(address_hash), {:updated, DateTime.utc_now()})}
+  end
+
+  @impl true
+  def handle_cast({:set_txs_state, address_hash, %{txs_types: txs_types} = results}, state) do
+    address_hash = lowercased_string(address_hash)
+
+    if is_ignored?(state[address_hash]) do
+      {:noreply, state}
+    else
+      address_state =
+        txs_types
+        |> Enum.reduce(state[address_hash] || %{}, fn tx_type, acc ->
+          Map.put(acc, tx_type, results[tx_type])
+        end)
+        |> (&Map.put(&1, :txs_types, (txs_types ++ (&1[:txs_types] || [])) |> Enum.uniq())).()
+
+      counter =
+        Counters.txs_types()
+        |> Enum.reduce([], fn type, acc ->
+          (address_state[type] || []) ++ acc
+        end)
+        |> Enum.uniq()
+        |> Enum.count()
+        |> min(Counters.counters_limit())
+
+      if counter == Counters.counters_limit() || Enum.count(address_state[:txs_types]) == 3 do
+        set_counter(:txs, address_hash, counter, false)
+        {:noreply, Map.put(state, address_hash, {:updated, DateTime.utc_now()})}
+      else
+        {:noreply, Map.put(state, address_hash, address_state)}
+      end
+    end
+  end
+
+  defp is_ignored?({:updated, datetime}), do: is_up_to_date?(datetime, ttl())
+  defp is_ignored?(_), do: false
+
+  def check_staleness(nil), do: nil
+  def check_staleness({datetime, counter}) when counter > 50, do: {datetime, counter, :limit_value}
+
+  def check_staleness({datetime, counter}) do
+    status =
+      if is_up_to_date?(datetime, ttl()) do
+        :up_to_date
+      else
+        :stale
+      end
+
+    {datetime, counter, status}
+  end
+
+  defp is_up_to_date?(datetime, ttl) do
+    datetime
+    |> DateTime.add(ttl, :millisecond)
+    |> DateTime.compare(DateTime.utc_now()) != :lt
+  end
+
+  defp ttl, do: Application.get_env(:explorer, Explorer.Chain.Cache.AddressesTabsCounters)[:ttl]
+  defp lowercased_string(str), do: str |> to_string() |> String.downcase()
+
+  defp cache_key(address_hash, counter_type), do: {lowercased_string(address_hash), counter_type}
+  defp task_cache_key(address_hash, counter_type), do: {:task, lowercased_string(address_hash), counter_type}
+end
diff --git a/apps/explorer/lib/explorer/counters/helper.ex b/apps/explorer/lib/explorer/counters/helper.ex
index 4b202f42426f..fbcccf037adf 100644
--- a/apps/explorer/lib/explorer/counters/helper.ex
+++ b/apps/explorer/lib/explorer/counters/helper.ex
@@ -16,13 +16,13 @@ defmodule Explorer.Counters.Helper do
     DateTime.to_unix(utc_now, :millisecond)
   end
 
-  def fetch_from_cache(key, cache_name) do
+  def fetch_from_cache(key, cache_name, default \\ 0) do
     case :ets.lookup(cache_name, key) do
       [{_, value}] ->
         value
 
       [] ->
-        0
+        default
     end
   end
 
diff --git a/config/runtime.exs b/config/runtime.exs
index 0fe6e7377ec1..5d767b6e295b 100644
--- a/config/runtime.exs
+++ b/config/runtime.exs
@@ -429,6 +429,9 @@ config :explorer, Explorer.Chain.Transaction,
   rootstock_remasc_address: System.get_env("ROOTSTOCK_REMASC_ADDRESS"),
   rootstock_bridge_address: System.get_env("ROOTSTOCK_BRIDGE_ADDRESS")
 
+config :explorer, Explorer.Chain.Cache.AddressesTabsCounters,
+  ttl: ConfigHelper.parse_time_env_var("ADDRESSES_TABS_COUNTERS_TTL", "10m")
+
 ###############
 ### Indexer ###
 ###############

From 6896b092dfc5f2c354387e96adc321083b1bc787 Mon Sep 17 00:00:00 2001
From: Nikita Pozdniakov <nikitosing4@mail.ru>
Date: Thu, 19 Oct 2023 14:51:49 +0300
Subject: [PATCH 511/909] Change counting time function

---
 .../lib/explorer/chain/address/counters.ex    | 32 +++++++++++--------
 docker-compose/envs/common-blockscout.env     |  3 +-
 2 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/apps/explorer/lib/explorer/chain/address/counters.ex b/apps/explorer/lib/explorer/chain/address/counters.ex
index 3538f062dc4a..71b11b078dc1 100644
--- a/apps/explorer/lib/explorer/chain/address/counters.ex
+++ b/apps/explorer/lib/explorer/chain/address/counters.ex
@@ -341,7 +341,7 @@ defmodule Explorer.Chain.Address.Counters do
         end
       end)
 
-    start = Time.utc_now()
+    start = System.monotonic_time()
 
     validations_count_task =
       configure_task(
@@ -362,9 +362,10 @@ defmodule Explorer.Chain.Address.Counters do
           |> limit(@counters_limit)
           |> select_repo(options).all()
 
-        Logger.info(
-          "Time consumed for transactions_from_count_task for #{address_hash} is #{Time.diff(Time.utc_now(), start, :millisecond)}ms"
-        )
+        stop = System.monotonic_time()
+        diff = System.convert_time_unit(stop - start, :native, :millisecond)
+
+        Logger.info("Time consumed for transactions_from_count_task for #{address_hash} is #{diff}ms")
 
         AddressesTabsCounters.save_txs_counter_progress(address_hash, %{txs_types: [:txs_from], txs_from: result})
         AddressesTabsCounters.drop_task(:txs_from, address_hash)
@@ -382,9 +383,10 @@ defmodule Explorer.Chain.Address.Counters do
           |> limit(@counters_limit)
           |> select_repo(options).all()
 
-        Logger.info(
-          "Time consumed for transactions_to_count_task for #{address_hash} is #{Time.diff(Time.utc_now(), start, :millisecond)}ms"
-        )
+        stop = System.monotonic_time()
+        diff = System.convert_time_unit(stop - start, :native, :millisecond)
+
+        Logger.info("Time consumed for transactions_to_count_task for #{address_hash} is #{diff}ms")
 
         AddressesTabsCounters.save_txs_counter_progress(address_hash, %{txs_types: [:txs_to], txs_to: result})
         AddressesTabsCounters.drop_task(:txs_to, address_hash)
@@ -402,9 +404,10 @@ defmodule Explorer.Chain.Address.Counters do
           |> limit(@counters_limit)
           |> select_repo(options).all()
 
-        Logger.info(
-          "Time consumed for transactions_created_contract_count_task for #{address_hash} is #{Time.diff(Time.utc_now(), start, :millisecond)}ms"
-        )
+        stop = System.monotonic_time()
+        diff = System.convert_time_unit(stop - start, :native, :millisecond)
+
+        Logger.info("Time consumed for transactions_created_contract_count_task for #{address_hash} is #{diff}ms")
 
         AddressesTabsCounters.save_txs_counter_progress(address_hash, %{
           txs_types: [:txs_contract],
@@ -525,7 +528,7 @@ defmodule Explorer.Chain.Address.Counters do
 
   defp configure_task(counter_type, cache, query, address_hash, options) do
     address_hash = to_string(address_hash)
-    start = Time.utc_now()
+    start = System.monotonic_time()
 
     run_or_ignore(cache[counter_type], counter_type, address_hash, fn ->
       result =
@@ -533,9 +536,10 @@ defmodule Explorer.Chain.Address.Counters do
         |> limit(@counters_limit)
         |> select_repo(options).aggregate(:count)
 
-      Logger.info(
-        "Time consumed for #{counter_type} counter task for #{address_hash} is #{Time.diff(Time.utc_now(), start, :millisecond)}ms"
-      )
+      stop = System.monotonic_time()
+      diff = System.convert_time_unit(stop - start, :native, :millisecond)
+
+      Logger.info("Time consumed for #{counter_type} counter task for #{address_hash} is #{diff}ms")
 
       AddressesTabsCounters.set_counter(counter_type, address_hash, result)
       AddressesTabsCounters.drop_task(counter_type, address_hash)
diff --git a/docker-compose/envs/common-blockscout.env b/docker-compose/envs/common-blockscout.env
index bc1a0811991f..3124347c8025 100644
--- a/docker-compose/envs/common-blockscout.env
+++ b/docker-compose/envs/common-blockscout.env
@@ -240,4 +240,5 @@ EIP_1559_ELASTICITY_MULTIPLIER=2
 # TOKEN_INSTANCE_OWNER_MIGRATION_CONCURRENCY=5
 # TOKEN_INSTANCE_OWNER_MIGRATION_BATCH_SIZE=50
 # IPFS_GATEWAY_URL=
-API_V2_ENABLED=true
\ No newline at end of file
+API_V2_ENABLED=true
+# ADDRESSES_TABS_COUNTERS_TTL=10m
\ No newline at end of file

From 4614878507f523746fc9d1ab304e896a6f5b655c Mon Sep 17 00:00:00 2001
From: Nikita Pozdniakov <nikitosing4@mail.ru>
Date: Fri, 20 Oct 2023 12:23:44 +0300
Subject: [PATCH 512/909] Process review comments

---
 apps/explorer/lib/explorer/chain/address/counters.ex  | 11 ++++++++++-
 .../explorer/chain/cache/addresses_tabs_counters.ex   | 10 +++++++---
 2 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/apps/explorer/lib/explorer/chain/address/counters.ex b/apps/explorer/lib/explorer/chain/address/counters.ex
index 71b11b078dc1..9f0aea47d855 100644
--- a/apps/explorer/lib/explorer/chain/address/counters.ex
+++ b/apps/explorer/lib/explorer/chain/address/counters.ex
@@ -245,7 +245,7 @@ defmodule Explorer.Chain.Address.Counters do
     end
   end
 
-  def address_hash_to_internal_txs_limited_count_query(address_hash) do
+  defp address_hash_to_internal_txs_limited_count_query(address_hash) do
     query_to_address_hash_wrapped =
       InternalTransaction
       |> InternalTransaction.where_nonpending_block()
@@ -570,6 +570,15 @@ defmodule Explorer.Chain.Address.Counters do
     end)
   end
 
+  @doc """
+    Returns all possible transactions type
+  """
+  @spec txs_types :: list(atom)
   def txs_types, do: @txs_types
+
+  @doc """
+    Returns max counter value
+  """
+  @spec counters_limit :: integer()
   def counters_limit, do: @counters_limit
 end
diff --git a/apps/explorer/lib/explorer/chain/cache/addresses_tabs_counters.ex b/apps/explorer/lib/explorer/chain/cache/addresses_tabs_counters.ex
index 00aaf5c64fea..ab79fbf0a5f2 100644
--- a/apps/explorer/lib/explorer/chain/cache/addresses_tabs_counters.ex
+++ b/apps/explorer/lib/explorer/chain/cache/addresses_tabs_counters.ex
@@ -27,18 +27,22 @@ defmodule Explorer.Chain.Cache.AddressesTabsCounters do
     :ok
   end
 
+  @spec set_task(atom, String.t()) :: true
   def set_task(counter_type, address_hash) do
     :ets.insert(@cache_name, {task_cache_key(address_hash, counter_type), true})
   end
 
+  @spec drop_task(atom, String.t()) :: true
   def drop_task(counter_type, address_hash) do
     :ets.delete(@cache_name, task_cache_key(address_hash, counter_type))
   end
 
+  @spec get_task(atom, String.t()) :: true | nil
   def get_task(counter_type, address_hash) do
     address_hash |> task_cache_key(counter_type) |> fetch_from_cache(@cache_name, nil)
   end
 
+  @spec ignore_txs(atom, String.t()) :: :ignore | :ok
   def ignore_txs(:txs, address_hash), do: GenServer.cast(__MODULE__, {:ignore_txs, address_hash})
   def ignore_txs(_counter_type, _address_hash), do: :ignore
 
@@ -103,10 +107,10 @@ defmodule Explorer.Chain.Cache.AddressesTabsCounters do
   defp is_ignored?({:updated, datetime}), do: is_up_to_date?(datetime, ttl())
   defp is_ignored?(_), do: false
 
-  def check_staleness(nil), do: nil
-  def check_staleness({datetime, counter}) when counter > 50, do: {datetime, counter, :limit_value}
+  defp check_staleness(nil), do: nil
+  defp check_staleness({datetime, counter}) when counter > 50, do: {datetime, counter, :limit_value}
 
-  def check_staleness({datetime, counter}) do
+  defp check_staleness({datetime, counter}) do
     status =
       if is_up_to_date?(datetime, ttl()) do
         :up_to_date

From d8da722a1452df5e1dd41e727fe4ed2dfeac75ad Mon Sep 17 00:00:00 2001
From: Viktor Baranov <baranov.viktor.27@gmail.com>
Date: Fri, 20 Oct 2023 12:36:57 +0300
Subject: [PATCH 513/909] Process review comment

---
 apps/ethereum_jsonrpc/lib/ethereum_jsonrpc.ex    | 12 ++++++------
 apps/explorer/lib/explorer/chain.ex              |  2 +-
 .../lib/explorer/chain/import/runner/blocks.ex   | 16 ++++++++--------
 .../lib/indexer/fetcher/internal_transaction.ex  |  2 +-
 4 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc.ex b/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc.ex
index bc9f7da55972..515e66a82213 100644
--- a/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc.ex
+++ b/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc.ex
@@ -201,7 +201,7 @@ defmodule EthereumJSONRPC do
     filtered_params_in_range =
       filtered_params
       |> Enum.filter(fn
-        %{block_quantity: block_quantity} -> block_number_in_range(block_quantity)
+        %{block_quantity: block_quantity} -> is_block_number_in_range?(block_quantity)
       end)
 
     id_to_params = id_to_params(filtered_params_in_range)
@@ -240,7 +240,7 @@ defmodule EthereumJSONRPC do
   @spec fetch_beneficiaries([block_number], json_rpc_named_arguments) ::
           {:ok, FetchedBeneficiaries.t()} | {:error, reason :: term} | :ignore
   def fetch_beneficiaries(block_numbers, json_rpc_named_arguments) when is_list(block_numbers) do
-    filtered_block_numbers = block_numbers_in_range(block_numbers)
+    filtered_block_numbers = are_block_numbers_in_range?(block_numbers)
 
     Keyword.fetch!(json_rpc_named_arguments, :variant).fetch_beneficiaries(
       filtered_block_numbers,
@@ -345,7 +345,7 @@ defmodule EthereumJSONRPC do
   Fetches internal transactions for entire blocks from variant API.
   """
   def fetch_block_internal_transactions(block_numbers, json_rpc_named_arguments) when is_list(block_numbers) do
-    filtered_block_numbers = block_numbers_in_range(block_numbers)
+    filtered_block_numbers = are_block_numbers_in_range?(block_numbers)
 
     Keyword.fetch!(json_rpc_named_arguments, :variant).fetch_block_internal_transactions(
       filtered_block_numbers,
@@ -353,7 +353,7 @@ defmodule EthereumJSONRPC do
     )
   end
 
-  def block_numbers_in_range(block_numbers) do
+  def are_block_numbers_in_range?(block_numbers) do
     min_block = Application.get_env(:indexer, :trace_first_block)
     max_block = Application.get_env(:indexer, :trace_last_block)
 
@@ -455,8 +455,8 @@ defmodule EthereumJSONRPC do
     end
   end
 
-  @spec block_number_in_range(quantity) :: boolean()
-  defp block_number_in_range(block_quantity) do
+  @spec is_block_number_in_range?(quantity) :: boolean()
+  defp is_block_number_in_range?(block_quantity) do
     min_block = Application.get_env(:indexer, :trace_first_block)
     max_block = Application.get_env(:indexer, :trace_last_block)
     block_number = quantity_to_integer(block_quantity)
diff --git a/apps/explorer/lib/explorer/chain.ex b/apps/explorer/lib/explorer/chain.ex
index 7e08b59792f3..9e013ec9a721 100644
--- a/apps/explorer/lib/explorer/chain.ex
+++ b/apps/explorer/lib/explorer/chain.ex
@@ -5828,7 +5828,7 @@ defmodule Explorer.Chain do
     if transaction_index == 0 do
       0
     else
-      filtered_block_numbers = EthereumJSONRPC.block_numbers_in_range([block_number])
+      filtered_block_numbers = EthereumJSONRPC.are_block_numbers_in_range?([block_number])
       {:ok, traces} = fetch_block_internal_transactions(filtered_block_numbers, json_rpc_named_arguments)
 
       sorted_traces =
diff --git a/apps/explorer/lib/explorer/chain/import/runner/blocks.ex b/apps/explorer/lib/explorer/chain/import/runner/blocks.ex
index b92a466b9efe..223e23359348 100644
--- a/apps/explorer/lib/explorer/chain/import/runner/blocks.ex
+++ b/apps/explorer/lib/explorer/chain/import/runner/blocks.ex
@@ -60,15 +60,9 @@ defmodule Explorer.Chain.Import.Runner.Blocks do
 
     hashes = Enum.map(changes_list, & &1.hash)
 
-    minimal_block_height = Application.get_env(:indexer, :trace_first_block)
-    maximal_block_height = Application.get_env(:indexer, :trace_last_block)
-
     items_for_pending_ops =
       changes_list
-      |> filter_by_height_range(
-        &(&1.number >= minimal_block_height &&
-            if(maximal_block_height, do: &1.number <= maximal_block_height, else: true))
-      )
+      |> filter_by_height_range(&is_block_in_range?(&1.number))
       |> Enum.filter(& &1.consensus)
       |> Enum.map(&{&1.number, &1.hash})
 
@@ -78,7 +72,7 @@ defmodule Explorer.Chain.Import.Runner.Blocks do
     run_func = fn repo ->
       {:ok, nonconsensus_items} = lose_consensus(repo, hashes, consensus_block_numbers, changes_list, insert_options)
 
-      {:ok, filter_by_height_range(nonconsensus_items, fn {number, _hash} -> number >= minimal_block_height end)}
+      {:ok, filter_by_height_range(nonconsensus_items, fn {number, _hash} -> is_block_in_range?(number) end)}
     end
 
     multi
@@ -220,6 +214,12 @@ defmodule Explorer.Chain.Import.Runner.Blocks do
   @impl Runner
   def timeout, do: @timeout
 
+  defp is_block_in_range?(number) do
+    minimal_block_height = Application.get_env(:indexer, :trace_first_block)
+    maximal_block_height = Application.get_env(:indexer, :trace_last_block)
+    number >= minimal_block_height && if(maximal_block_height, do: number <= maximal_block_height, else: true)
+  end
+
   defp fork_transactions(%{
          repo: repo,
          timeout: timeout,
diff --git a/apps/indexer/lib/indexer/fetcher/internal_transaction.ex b/apps/indexer/lib/indexer/fetcher/internal_transaction.ex
index 7c43589c1da8..b219e01d4f67 100644
--- a/apps/indexer/lib/indexer/fetcher/internal_transaction.ex
+++ b/apps/indexer/lib/indexer/fetcher/internal_transaction.ex
@@ -100,7 +100,7 @@ defmodule Indexer.Fetcher.InternalTransaction do
 
     filtered_unique_numbers =
       unique_numbers
-      |> EthereumJSONRPC.block_numbers_in_range()
+      |> EthereumJSONRPC.are_block_numbers_in_range?()
       |> drop_genesis(json_rpc_named_arguments)
 
     filtered_unique_numbers_count = Enum.count(filtered_unique_numbers)

From 0173d3d7f104825f0a038a0812e6c8c6423dc7a1 Mon Sep 17 00:00:00 2001
From: Qwerty5Uiop <alex000010@bk.ru>
Date: Thu, 19 Oct 2023 17:35:14 +0600
Subject: [PATCH 514/909] Add head offset for empty blocks sanitizer

---
 .../indexer/lib/indexer/fetcher/empty_blocks_sanitizer.ex | 8 ++++++--
 config/runtime.exs                                        | 2 +-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/apps/indexer/lib/indexer/fetcher/empty_blocks_sanitizer.ex b/apps/indexer/lib/indexer/fetcher/empty_blocks_sanitizer.ex
index 013ace680c34..8d92ccdc57a8 100644
--- a/apps/indexer/lib/indexer/fetcher/empty_blocks_sanitizer.ex
+++ b/apps/indexer/lib/indexer/fetcher/empty_blocks_sanitizer.ex
@@ -15,6 +15,7 @@ defmodule Indexer.Fetcher.EmptyBlocksSanitizer do
   alias Ecto.Changeset
   alias Explorer.{Chain, Repo}
   alias Explorer.Chain.{Block, PendingBlockOperation, Transaction}
+  alias Explorer.Chain.Cache.BlockNumber
   alias Explorer.Chain.Import.Runner.Blocks
 
   @interval :timer.seconds(10)
@@ -133,13 +134,16 @@ defmodule Indexer.Fetcher.EmptyBlocksSanitizer do
       {:error, %{exception: postgrex_error}}
   end
 
+  @head_offset 1000
   defp consensus_blocks_with_nil_is_empty_query(limit) do
+    safe_block_number = BlockNumber.get_max() - @head_offset
+
     from(block in Block,
       where: is_nil(block.is_empty),
+      where: block.number <= ^safe_block_number,
       where: block.consensus == true,
       order_by: [asc: block.hash],
-      limit: ^limit,
-      offset: 1000
+      limit: ^limit
     )
   end
 
diff --git a/config/runtime.exs b/config/runtime.exs
index 536f8bd4410c..ab0f0d9ea668 100644
--- a/config/runtime.exs
+++ b/config/runtime.exs
@@ -525,7 +525,7 @@ config :indexer, Indexer.Fetcher.TokenInstance.LegacySanitize.Supervisor,
 
 config :indexer, Indexer.Fetcher.EmptyBlocksSanitizer,
   batch_size: ConfigHelper.parse_integer_env_var("INDEXER_EMPTY_BLOCKS_SANITIZER_BATCH_SIZE", 100),
-  interval: ConfigHelper.parse_time_env_var("INDEXER_EMPTY_BLOCKS_SANITIZER_INTERVAL", "5m")
+  interval: ConfigHelper.parse_time_env_var("INDEXER_EMPTY_BLOCKS_SANITIZER_INTERVAL", "10s")
 
 config :indexer, Indexer.Block.Realtime.Fetcher,
   max_gap: ConfigHelper.parse_integer_env_var("INDEXER_REALTIME_FETCHER_MAX_GAP", 1000)

From 067d06d11c46edd3d824683c5a9aae64cab29e22 Mon Sep 17 00:00:00 2001
From: Qwerty5Uiop <alex000010@bk.ru>
Date: Thu, 5 Oct 2023 19:13:34 +0600
Subject: [PATCH 515/909] Fix TokenBalance fetcher retry logic

---
 CHANGELOG.md                                      |  1 +
 apps/indexer/lib/indexer/fetcher/token_balance.ex | 14 +++++++++-----
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 89323a315597..ef1e0f2f503a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -30,6 +30,7 @@
 - [#7959](https://github.com/blockscout/blockscout/pull/7959) - Fix empty batch transfers handling
 - [#8513](https://github.com/blockscout/blockscout/pull/8513) - Don't override transaction status
 - [#8620](https://github.com/blockscout/blockscout/pull/8620) - Fix the display of icons
+- [#8594](https://github.com/blockscout/blockscout/pull/8594) - Fix TokenBalance fetcher retry logic
 
 ### Chore
 
diff --git a/apps/indexer/lib/indexer/fetcher/token_balance.ex b/apps/indexer/lib/indexer/fetcher/token_balance.ex
index b313a37da866..c9507315bc16 100644
--- a/apps/indexer/lib/indexer/fetcher/token_balance.ex
+++ b/apps/indexer/lib/indexer/fetcher/token_balance.ex
@@ -117,17 +117,21 @@ defmodule Indexer.Fetcher.TokenBalance do
     %{fetched_token_balances: fetched_token_balances, failed_token_balances: _failed_token_balances} =
       1..@max_retries
       |> Enum.reduce_while(%{fetched_token_balances: [], failed_token_balances: retryable_params_list}, fn _x, acc ->
-        {:ok,
-         %{fetched_token_balances: _fetched_token_balances, failed_token_balances: failed_token_balances} =
-           token_balances} = TokenBalances.fetch_token_balances_from_blockchain(acc.failed_token_balances)
+        {:ok, %{fetched_token_balances: fetched_token_balances, failed_token_balances: failed_token_balances}} =
+          TokenBalances.fetch_token_balances_from_blockchain(acc.failed_token_balances)
+
+        all_token_balances = %{
+          fetched_token_balances: acc.fetched_token_balances ++ fetched_token_balances,
+          failed_token_balances: failed_token_balances
+        }
 
         if Enum.empty?(failed_token_balances) do
-          {:halt, token_balances}
+          {:halt, all_token_balances}
         else
           failed_token_balances = increase_retries_count(failed_token_balances)
 
           token_balances_updated_retries_count =
-            token_balances
+            all_token_balances
             |> Map.put(:failed_token_balances, failed_token_balances)
 
           {:cont, token_balances_updated_retries_count}

From da6e63e071cf8c16601025fa0cc65926579a436c Mon Sep 17 00:00:00 2001
From: Qwerty5Uiop <alex000010@bk.ru>
Date: Mon, 2 Oct 2023 13:07:12 +0300
Subject: [PATCH 516/909] Filter token transfers on coin balances updates

---
 CHANGELOG.md                                                   | 1 +
 apps/indexer/lib/indexer/transform/address_coin_balances.ex    | 3 +++
 .../test/indexer/transform/address_coin_balances_test.exs      | 3 +++
 3 files changed, 7 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index cb8ed51bedb3..9e7c0fa84c56 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -17,6 +17,7 @@
 - [#8180](https://github.com/blockscout/blockscout/pull/8180) - Deposits and Withdrawals for Polygon Edge
 - [#7996](https://github.com/blockscout/blockscout/pull/7996) - Add CoinBalance fetcher init query limit
 - [#8658](https://github.com/blockscout/blockscout/pull/8658) - Remove block consensus on import fail
+- [#8575](https://github.com/blockscout/blockscout/pull/8575) - Filter token transfers on coin balances updates
 
 ### Fixes
 
diff --git a/apps/indexer/lib/indexer/transform/address_coin_balances.ex b/apps/indexer/lib/indexer/transform/address_coin_balances.ex
index 03319b0dec35..4c7a20ca66ea 100644
--- a/apps/indexer/lib/indexer/transform/address_coin_balances.ex
+++ b/apps/indexer/lib/indexer/transform/address_coin_balances.ex
@@ -3,6 +3,8 @@ defmodule Indexer.Transform.AddressCoinBalances do
   Extracts `Explorer.Chain.Address.CoinBalance` params from other schema's params.
   """
 
+  alias Explorer.Chain.TokenTransfer
+
   def params_set(%{} = import_options) do
     Enum.reduce(import_options, MapSet.new(), &reducer/2)
   end
@@ -30,6 +32,7 @@ defmodule Indexer.Transform.AddressCoinBalances do
   defp reducer({:logs_params, logs_params}, acc) when is_list(logs_params) do
     # a log MUST have address_hash and block_number
     logs_params
+    |> Enum.reject(&(&1.first_topic == TokenTransfer.constant()))
     |> Enum.into(acc, fn
       %{address_hash: address_hash, block_number: block_number}
       when is_binary(address_hash) and is_integer(block_number) ->
diff --git a/apps/indexer/test/indexer/transform/address_coin_balances_test.exs b/apps/indexer/test/indexer/transform/address_coin_balances_test.exs
index 6a6627dda70e..ae2889b07b95 100644
--- a/apps/indexer/test/indexer/transform/address_coin_balances_test.exs
+++ b/apps/indexer/test/indexer/transform/address_coin_balances_test.exs
@@ -110,6 +110,7 @@ defmodule Indexer.Transform.AddressCoinBalancesTest do
         |> Factory.params_for()
         |> Map.put(:block_number, block_number)
         |> Map.put(:address_hash, address_hash)
+        |> Map.put(:first_topic, nil)
 
       params_set = AddressCoinBalances.params_set(%{logs_params: [log_params]})
 
@@ -129,6 +130,7 @@ defmodule Indexer.Transform.AddressCoinBalancesTest do
         |> Factory.params_for()
         |> Map.put(:block_number, nil)
         |> Map.put(:address_hash, address_hash)
+        |> Map.put(:first_topic, nil)
         |> Map.put(:type, "pending")
 
       log_params2 =
@@ -136,6 +138,7 @@ defmodule Indexer.Transform.AddressCoinBalancesTest do
         |> Factory.params_for()
         |> Map.put(:block_number, block_number)
         |> Map.put(:address_hash, address_hash)
+        |> Map.put(:first_topic, nil)
 
       params_set = AddressCoinBalances.params_set(%{logs_params: [log_params1, log_params2]})
 

From 45178dc7ed68e9796da28ffdce32ab493a829eb3 Mon Sep 17 00:00:00 2001
From: Viktor Baranov <baranov.viktor.27@gmail.com>
Date: Fri, 20 Oct 2023 16:46:16 +0300
Subject: [PATCH 517/909] v5.3.0

---
 .github/ISSUE_TEMPLATE/bug_report.yml         |  2 +-
 .../publish-docker-image-every-push.yml       |  2 +-
 .../publish-docker-image-for-core.yml         |  2 +-
 .../publish-docker-image-for-eth-goerli.yml   |  2 +-
 .../publish-docker-image-for-eth.yml          |  2 +-
 .../publish-docker-image-for-fuse.yml         |  2 +-
 .../publish-docker-image-for-immutable.yml    |  2 +-
 .../publish-docker-image-for-l2-staging.yml   |  2 +-
 .../publish-docker-image-for-lukso.yml        |  2 +-
 .../publish-docker-image-for-optimism.yml     |  2 +-
 .../publish-docker-image-for-rsk.yml          |  2 +-
 .../publish-docker-image-for-xdai.yml         |  2 +-
 .../publish-docker-image-for-zksync.yml       |  2 +-
 .../publish-docker-image-release.yml          |  2 +-
 CHANGELOG.md                                  | 47 +++++++++++++++++++
 apps/block_scout_web/mix.exs                  |  2 +-
 apps/ethereum_jsonrpc/mix.exs                 |  2 +-
 apps/explorer/mix.exs                         |  2 +-
 apps/indexer/mix.exs                          |  2 +-
 docker-compose/docker-compose.yml             |  2 +-
 docker/Makefile                               |  2 +-
 mix.exs                                       |  2 +-
 rel/config.exs                                |  2 +-
 23 files changed, 69 insertions(+), 22 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
index bcd36c1e76b6..cd31b2868153 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -65,7 +65,7 @@ body:
     attributes:
       label: Backend version
       description: The release version of the backend or branch/commit.
-      placeholder: v5.2.3
+      placeholder: v5.3.0
     validations:
       required: true
 
diff --git a/.github/workflows/publish-docker-image-every-push.yml b/.github/workflows/publish-docker-image-every-push.yml
index 97fd753c1bdd..e4c9f0a2bbd8 100644
--- a/.github/workflows/publish-docker-image-every-push.yml
+++ b/.github/workflows/publish-docker-image-every-push.yml
@@ -7,7 +7,7 @@ on:
 env:
   OTP_VERSION: '25.2.1'
   ELIXIR_VERSION: '1.14.5'
-  RELEASE_VERSION: 5.2.3
+  RELEASE_VERSION: 5.3.0
 
 jobs:
   push_to_registry:
diff --git a/.github/workflows/publish-docker-image-for-core.yml b/.github/workflows/publish-docker-image-for-core.yml
index f0d836f941ec..e3671929d0b0 100644
--- a/.github/workflows/publish-docker-image-for-core.yml
+++ b/.github/workflows/publish-docker-image-for-core.yml
@@ -14,7 +14,7 @@ jobs:
     name: Push Docker image to Docker Hub
     runs-on: ubuntu-latest
     env:
-      RELEASE_VERSION: 5.2.3
+      RELEASE_VERSION: 5.3.0
       DOCKER_CHAIN_NAME: poa
     steps:
       - name: Check out the repo
diff --git a/.github/workflows/publish-docker-image-for-eth-goerli.yml b/.github/workflows/publish-docker-image-for-eth-goerli.yml
index bd25b221e5bc..c11684d4c499 100644
--- a/.github/workflows/publish-docker-image-for-eth-goerli.yml
+++ b/.github/workflows/publish-docker-image-for-eth-goerli.yml
@@ -14,7 +14,7 @@ jobs:
     name: Push Docker image to Docker Hub
     runs-on: ubuntu-latest
     env:
-      RELEASE_VERSION: 5.2.3
+      RELEASE_VERSION: 5.3.0
       DOCKER_CHAIN_NAME: eth-goerli
     steps:
       - name: Check out the repo
diff --git a/.github/workflows/publish-docker-image-for-eth.yml b/.github/workflows/publish-docker-image-for-eth.yml
index 7ab5a54f4a7f..d4d630f754e4 100644
--- a/.github/workflows/publish-docker-image-for-eth.yml
+++ b/.github/workflows/publish-docker-image-for-eth.yml
@@ -14,7 +14,7 @@ jobs:
     name: Push Docker image to Docker Hub
     runs-on: ubuntu-latest
     env:
-      RELEASE_VERSION: 5.2.3
+      RELEASE_VERSION: 5.3.0
       DOCKER_CHAIN_NAME: mainnet
     steps:
       - name: Check out the repo
diff --git a/.github/workflows/publish-docker-image-for-fuse.yml b/.github/workflows/publish-docker-image-for-fuse.yml
index d3548c38666e..839798299a88 100644
--- a/.github/workflows/publish-docker-image-for-fuse.yml
+++ b/.github/workflows/publish-docker-image-for-fuse.yml
@@ -14,7 +14,7 @@ jobs:
     name: Push Docker image to Docker Hub
     runs-on: ubuntu-latest
     env:
-      RELEASE_VERSION: 5.2.3
+      RELEASE_VERSION: 5.3.0
       DOCKER_CHAIN_NAME: fuse
     steps:
       - name: Check out the repo
diff --git a/.github/workflows/publish-docker-image-for-immutable.yml b/.github/workflows/publish-docker-image-for-immutable.yml
index 1a266332ee77..11d36f828481 100644
--- a/.github/workflows/publish-docker-image-for-immutable.yml
+++ b/.github/workflows/publish-docker-image-for-immutable.yml
@@ -14,7 +14,7 @@ jobs:
     name: Push Docker image to Docker Hub
     runs-on: ubuntu-latest
     env:
-      RELEASE_VERSION: 5.2.3
+      RELEASE_VERSION: 5.3.0
       DOCKER_CHAIN_NAME: immutable
     steps:
       - name: Check out the repo
diff --git a/.github/workflows/publish-docker-image-for-l2-staging.yml b/.github/workflows/publish-docker-image-for-l2-staging.yml
index 305fc1d100d6..131a180e59ca 100644
--- a/.github/workflows/publish-docker-image-for-l2-staging.yml
+++ b/.github/workflows/publish-docker-image-for-l2-staging.yml
@@ -14,7 +14,7 @@ jobs:
     name: Push Docker image to Docker Hub
     runs-on: ubuntu-latest
     env:
-      RELEASE_VERSION: 5.2.3
+      RELEASE_VERSION: 5.3.0
       DOCKER_CHAIN_NAME: optimism-l2-advanced
     steps:
       - name: Check out the repo
diff --git a/.github/workflows/publish-docker-image-for-lukso.yml b/.github/workflows/publish-docker-image-for-lukso.yml
index 75a25b54dfc7..fbc6d5578733 100644
--- a/.github/workflows/publish-docker-image-for-lukso.yml
+++ b/.github/workflows/publish-docker-image-for-lukso.yml
@@ -14,7 +14,7 @@ jobs:
     name: Push Docker image to Docker Hub
     runs-on: ubuntu-latest
     env:
-      RELEASE_VERSION: 5.2.3
+      RELEASE_VERSION: 5.3.0
       DOCKER_CHAIN_NAME: lukso
     steps:
       - name: Check out the repo
diff --git a/.github/workflows/publish-docker-image-for-optimism.yml b/.github/workflows/publish-docker-image-for-optimism.yml
index a005e6bba223..749e39474fb5 100644
--- a/.github/workflows/publish-docker-image-for-optimism.yml
+++ b/.github/workflows/publish-docker-image-for-optimism.yml
@@ -14,7 +14,7 @@ jobs:
     name: Push Docker image to Docker Hub
     runs-on: ubuntu-latest
     env:
-      RELEASE_VERSION: 5.2.3
+      RELEASE_VERSION: 5.3.0
       DOCKER_CHAIN_NAME: optimism
     steps:
       - name: Check out the repo
diff --git a/.github/workflows/publish-docker-image-for-rsk.yml b/.github/workflows/publish-docker-image-for-rsk.yml
index 45ee47226408..209cbf090197 100644
--- a/.github/workflows/publish-docker-image-for-rsk.yml
+++ b/.github/workflows/publish-docker-image-for-rsk.yml
@@ -14,7 +14,7 @@ jobs:
     name: Push Docker image to Docker Hub
     runs-on: ubuntu-latest
     env:
-      RELEASE_VERSION: 5.2.3
+      RELEASE_VERSION: 5.3.0
       DOCKER_CHAIN_NAME: rsk
     steps:
       - name: Check out the repo
diff --git a/.github/workflows/publish-docker-image-for-xdai.yml b/.github/workflows/publish-docker-image-for-xdai.yml
index 2c6d7836afbf..fdbd3b2909b8 100644
--- a/.github/workflows/publish-docker-image-for-xdai.yml
+++ b/.github/workflows/publish-docker-image-for-xdai.yml
@@ -14,7 +14,7 @@ jobs:
     name: Push Docker image to Docker Hub
     runs-on: ubuntu-latest
     env:
-      RELEASE_VERSION: 5.2.3
+      RELEASE_VERSION: 5.3.0
       DOCKER_CHAIN_NAME: xdai
     steps:
       - name: Check out the repo
diff --git a/.github/workflows/publish-docker-image-for-zksync.yml b/.github/workflows/publish-docker-image-for-zksync.yml
index 1c0e5a5bea16..6be789c13059 100644
--- a/.github/workflows/publish-docker-image-for-zksync.yml
+++ b/.github/workflows/publish-docker-image-for-zksync.yml
@@ -14,7 +14,7 @@ jobs:
     name: Push Docker image to Docker Hub
     runs-on: ubuntu-latest
     env:
-      RELEASE_VERSION: 5.2.3
+      RELEASE_VERSION: 5.3.0
       DOCKER_CHAIN_NAME: zksync
     steps:
       - name: Check out the repo
diff --git a/.github/workflows/publish-docker-image-release.yml b/.github/workflows/publish-docker-image-release.yml
index 5bb00c992690..9d2d59aaa183 100644
--- a/.github/workflows/publish-docker-image-release.yml
+++ b/.github/workflows/publish-docker-image-release.yml
@@ -18,7 +18,7 @@ jobs:
     name: Push Docker image to Docker Hub
     runs-on: ubuntu-latest
     env:
-      RELEASE_VERSION: 5.2.3
+      RELEASE_VERSION: 5.3.0
     steps:
       - name: Check out the repo
         uses: actions/checkout@v4
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9e7c0fa84c56..dfe214a2b397 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,18 @@
 
 ### Features
 
+### Fixes
+
+### Chore
+
+<details>
+  <summary>Dependencies version bumps</summary>
+</details>
+
+## 5.3.0-beta
+
+### Features
+
 - [#8512](https://github.com/blockscout/blockscout/pull/8512) - Add caching and improve `/tabs-counters` performance
 - [#8472](https://github.com/blockscout/blockscout/pull/8472) - Integrate `/api/v2/bytecodes/sources:search-all` of `eth_bytecode_db`
 - [#8589](https://github.com/blockscout/blockscout/pull/8589) - DefiLlama TVL source
@@ -45,6 +57,41 @@
 - [#8504](https://github.com/blockscout/blockscout/pull/8504) - Deploy new UI through Makefile
 - [#8501](https://github.com/blockscout/blockscout/pull/8501) - Conceal secondary ports in docker compose setup
 
+<details>
+  <summary>Dependencies version bumps</summary>
+- [#8508](https://github.com/blockscout/blockscout/pull/8508) - https://github.com/blockscout/blockscout/pull/8508
+- [#8509](https://github.com/blockscout/blockscout/pull/8509) - https://github.com/blockscout/blockscout/pull/8509
+- [#8511](https://github.com/blockscout/blockscout/pull/8511) - https://github.com/blockscout/blockscout/pull/8511
+- [#8532](https://github.com/blockscout/blockscout/pull/8532) - https://github.com/blockscout/blockscout/pull/8532
+- [#8533](https://github.com/blockscout/blockscout/pull/8533) - https://github.com/blockscout/blockscout/pull/8533
+- [#8531](https://github.com/blockscout/blockscout/pull/8531) - https://github.com/blockscout/blockscout/pull/8531
+- [#8534](https://github.com/blockscout/blockscout/pull/8534) - https://github.com/blockscout/blockscout/pull/8534
+- [#8546](https://github.com/blockscout/blockscout/pull/8546) - https://github.com/blockscout/blockscout/pull/8546
+- [#8553](https://github.com/blockscout/blockscout/pull/8553) - https://github.com/blockscout/blockscout/pull/8553
+- [#8554](https://github.com/blockscout/blockscout/pull/8554) - https://github.com/blockscout/blockscout/pull/8554
+- [#8547](https://github.com/blockscout/blockscout/pull/8547) - https://github.com/blockscout/blockscout/pull/8547
+- [#8567](https://github.com/blockscout/blockscout/pull/8567) - https://github.com/blockscout/blockscout/pull/8567
+- [#8566](https://github.com/blockscout/blockscout/pull/8566) - https://github.com/blockscout/blockscout/pull/8566
+- [#7575](https://github.com/blockscout/blockscout/pull/7575) - https://github.com/blockscout/blockscout/pull/7575
+- [#8569](https://github.com/blockscout/blockscout/pull/8569) - https://github.com/blockscout/blockscout/pull/8569
+- [#8570](https://github.com/blockscout/blockscout/pull/8570) - https://github.com/blockscout/blockscout/pull/8570
+- [#8581](https://github.com/blockscout/blockscout/pull/8581) - https://github.com/blockscout/blockscout/pull/8581
+- [#8607](https://github.com/blockscout/blockscout/pull/8607) - https://github.com/blockscout/blockscout/pull/8607
+- [#8606](https://github.com/blockscout/blockscout/pull/8606) - https://github.com/blockscout/blockscout/pull/8606
+- [#8605](https://github.com/blockscout/blockscout/pull/8605) - https://github.com/blockscout/blockscout/pull/8605
+- [#8608](https://github.com/blockscout/blockscout/pull/8608) - https://github.com/blockscout/blockscout/pull/8608
+- [#8510](https://github.com/blockscout/blockscout/pull/8510) - https://github.com/blockscout/blockscout/pull/8510
+- [#8637](https://github.com/blockscout/blockscout/pull/8637) - https://github.com/blockscout/blockscout/pull/8637
+- [#8639](https://github.com/blockscout/blockscout/pull/8639) - https://github.com/blockscout/blockscout/pull/8639
+- [#8643](https://github.com/blockscout/blockscout/pull/8643) - https://github.com/blockscout/blockscout/pull/8643
+- [#8641](https://github.com/blockscout/blockscout/pull/8641) - https://github.com/blockscout/blockscout/pull/8641
+- [#8646](https://github.com/blockscout/blockscout/pull/8646) - https://github.com/blockscout/blockscout/pull/8646
+- [#8636](https://github.com/blockscout/blockscout/pull/8636) - https://github.com/blockscout/blockscout/pull/8636
+- [#8645](https://github.com/blockscout/blockscout/pull/8645) - https://github.com/blockscout/blockscout/pull/8645
+- [#8638](https://github.com/blockscout/blockscout/pull/8638) - https://github.com/blockscout/blockscout/pull/8638
+- [#8640](https://github.com/blockscout/blockscout/pull/8640) - https://github.com/blockscout/blockscout/pull/8640
+</details>
+
 ## 5.2.3-beta
 
 ### Features
diff --git a/apps/block_scout_web/mix.exs b/apps/block_scout_web/mix.exs
index 58acfaa8e402..5102c48e89d3 100644
--- a/apps/block_scout_web/mix.exs
+++ b/apps/block_scout_web/mix.exs
@@ -23,7 +23,7 @@ defmodule BlockScoutWeb.Mixfile do
         dialyzer: :test
       ],
       start_permanent: Mix.env() == :prod,
-      version: "5.2.3"
+      version: "5.3.0"
     ]
   end
 
diff --git a/apps/ethereum_jsonrpc/mix.exs b/apps/ethereum_jsonrpc/mix.exs
index c72ae2a9a707..b4c9b7034e32 100644
--- a/apps/ethereum_jsonrpc/mix.exs
+++ b/apps/ethereum_jsonrpc/mix.exs
@@ -23,7 +23,7 @@ defmodule EthereumJsonrpc.MixProject do
         dialyzer: :test
       ],
       start_permanent: Mix.env() == :prod,
-      version: "5.2.3"
+      version: "5.3.0"
     ]
   end
 
diff --git a/apps/explorer/mix.exs b/apps/explorer/mix.exs
index 387b6e5f4342..9940539ecd63 100644
--- a/apps/explorer/mix.exs
+++ b/apps/explorer/mix.exs
@@ -24,7 +24,7 @@ defmodule Explorer.Mixfile do
         dialyzer: :test
       ],
       start_permanent: Mix.env() == :prod,
-      version: "5.2.3",
+      version: "5.3.0",
       xref: [exclude: [BlockScoutWeb.WebRouter.Helpers]]
     ]
   end
diff --git a/apps/indexer/mix.exs b/apps/indexer/mix.exs
index d0555486a0c0..5375cfeebf4e 100644
--- a/apps/indexer/mix.exs
+++ b/apps/indexer/mix.exs
@@ -14,7 +14,7 @@ defmodule Indexer.MixProject do
       elixirc_paths: elixirc_paths(Mix.env()),
       lockfile: "../../mix.lock",
       start_permanent: Mix.env() == :prod,
-      version: "5.2.3"
+      version: "5.3.0"
     ]
   end
 
diff --git a/docker-compose/docker-compose.yml b/docker-compose/docker-compose.yml
index 4010c8cd0e9d..7e2bf80bb6b0 100644
--- a/docker-compose/docker-compose.yml
+++ b/docker-compose/docker-compose.yml
@@ -34,7 +34,7 @@ services:
         CACHE_TOTAL_GAS_USAGE_COUNTER_ENABLED: ""
         CACHE_ADDRESS_WITH_BALANCES_UPDATE_INTERVAL: ""
         ADMIN_PANEL_ENABLED: ""
-        RELEASE_VERSION: 5.2.3
+        RELEASE_VERSION: 5.3.0
     links:
       - db:database
     environment:
diff --git a/docker/Makefile b/docker/Makefile
index 7e585865e92d..2a3fd6217c88 100644
--- a/docker/Makefile
+++ b/docker/Makefile
@@ -10,7 +10,7 @@ STATS_CONTAINER_NAME := stats
 STATS_DB_CONTAINER_NAME := stats-postgres
 PROXY_CONTAINER_NAME := proxy
 PG_CONTAINER_NAME := postgres
-RELEASE_VERSION ?= '5.2.3'
+RELEASE_VERSION ?= '5.3.0'
 TAG := $(RELEASE_VERSION)-commit-$(shell git log -1 --pretty=format:"%h")
 STABLE_TAG := $(RELEASE_VERSION)
 
diff --git a/mix.exs b/mix.exs
index bcd86c8316ea..25ca05dd8013 100644
--- a/mix.exs
+++ b/mix.exs
@@ -7,7 +7,7 @@ defmodule BlockScout.Mixfile do
     [
       # app: :block_scout,
       # aliases: aliases(config_env()),
-      version: "5.2.3",
+      version: "5.3.0",
       apps_path: "apps",
       deps: deps(),
       dialyzer: dialyzer(),
diff --git a/rel/config.exs b/rel/config.exs
index 3754ba0c5de4..d8dfb6d94e06 100644
--- a/rel/config.exs
+++ b/rel/config.exs
@@ -71,7 +71,7 @@ end
 # will be used by default
 
 release :blockscout do
-  set version: "5.2.3-beta"
+  set version: "5.3.0-beta"
   set applications: [
     :runtime_tools,
     block_scout_web: :permanent,

From 4369728cb78940a76df44aa3e85e852b60647b8a Mon Sep 17 00:00:00 2001
From: Viktor Baranov <baranov.viktor.27@gmail.com>
Date: Fri, 20 Oct 2023 17:39:05 +0300
Subject: [PATCH 518/909] Update CHANGELOG

---
 CHANGELOG.md | 60 ++++++++++++++++++++++++++--------------------------
 1 file changed, 30 insertions(+), 30 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index dfe214a2b397..25082d68b296 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -59,37 +59,37 @@
 
 <details>
   <summary>Dependencies version bumps</summary>
-- [#8508](https://github.com/blockscout/blockscout/pull/8508) - https://github.com/blockscout/blockscout/pull/8508
-- [#8509](https://github.com/blockscout/blockscout/pull/8509) - https://github.com/blockscout/blockscout/pull/8509
-- [#8511](https://github.com/blockscout/blockscout/pull/8511) - https://github.com/blockscout/blockscout/pull/8511
-- [#8532](https://github.com/blockscout/blockscout/pull/8532) - https://github.com/blockscout/blockscout/pull/8532
-- [#8533](https://github.com/blockscout/blockscout/pull/8533) - https://github.com/blockscout/blockscout/pull/8533
-- [#8531](https://github.com/blockscout/blockscout/pull/8531) - https://github.com/blockscout/blockscout/pull/8531
-- [#8534](https://github.com/blockscout/blockscout/pull/8534) - https://github.com/blockscout/blockscout/pull/8534
-- [#8546](https://github.com/blockscout/blockscout/pull/8546) - https://github.com/blockscout/blockscout/pull/8546
-- [#8553](https://github.com/blockscout/blockscout/pull/8553) - https://github.com/blockscout/blockscout/pull/8553
+- [#8508](https://github.com/blockscout/blockscout/pull/8508) - Bump sass from 1.67.0 to 1.68.0 in /apps/block_scout_web/assets
+- [#8509](https://github.com/blockscout/blockscout/pull/8509) - Bump autoprefixer from 10.4.15 to 10.4.16 in /apps/block_scout_web/assets
+- [#8511](https://github.com/blockscout/blockscout/pull/8511) - Bump mox from 1.0.2 to 1.1.0
+- [#8532](https://github.com/blockscout/blockscout/pull/8532) - Bump eslint from 8.49.0 to 8.50.0 in /apps/block_scout_web/assets
+- [#8533](https://github.com/blockscout/blockscout/pull/8533) - Bump sweetalert2 from 11.7.28 to 11.7.29 in /apps/block_scout_web/assets
+- [#8531](https://github.com/blockscout/blockscout/pull/8531) - Bump ex_cldr_units from 3.16.2 to 3.16.3
+- [#8534](https://github.com/blockscout/blockscout/pull/8534) - Bump @babel/core from 7.22.20 to 7.23.0 in /apps/block_scout_web/assets
+- [#8546](https://github.com/blockscout/blockscout/pull/8546) - Bump sweetalert2 from 11.7.29 to 11.7.31 in /apps/block_scout_web/assets
+- [#8553](https://github.com/blockscout/blockscout/pull/8553) - Bump @amplitude/analytics-browser from 2.3.1 to 2.3.2 in /apps/block_scout_web/assets
 - [#8554](https://github.com/blockscout/blockscout/pull/8554) - https://github.com/blockscout/blockscout/pull/8554
-- [#8547](https://github.com/blockscout/blockscout/pull/8547) - https://github.com/blockscout/blockscout/pull/8547
-- [#8567](https://github.com/blockscout/blockscout/pull/8567) - https://github.com/blockscout/blockscout/pull/8567
-- [#8566](https://github.com/blockscout/blockscout/pull/8566) - https://github.com/blockscout/blockscout/pull/8566
-- [#7575](https://github.com/blockscout/blockscout/pull/7575) - https://github.com/blockscout/blockscout/pull/7575
-- [#8569](https://github.com/blockscout/blockscout/pull/8569) - https://github.com/blockscout/blockscout/pull/8569
-- [#8570](https://github.com/blockscout/blockscout/pull/8570) - https://github.com/blockscout/blockscout/pull/8570
-- [#8581](https://github.com/blockscout/blockscout/pull/8581) - https://github.com/blockscout/blockscout/pull/8581
-- [#8607](https://github.com/blockscout/blockscout/pull/8607) - https://github.com/blockscout/blockscout/pull/8607
-- [#8606](https://github.com/blockscout/blockscout/pull/8606) - https://github.com/blockscout/blockscout/pull/8606
-- [#8605](https://github.com/blockscout/blockscout/pull/8605) - https://github.com/blockscout/blockscout/pull/8605
-- [#8608](https://github.com/blockscout/blockscout/pull/8608) - https://github.com/blockscout/blockscout/pull/8608
-- [#8510](https://github.com/blockscout/blockscout/pull/8510) - https://github.com/blockscout/blockscout/pull/8510
-- [#8637](https://github.com/blockscout/blockscout/pull/8637) - https://github.com/blockscout/blockscout/pull/8637
-- [#8639](https://github.com/blockscout/blockscout/pull/8639) - https://github.com/blockscout/blockscout/pull/8639
-- [#8643](https://github.com/blockscout/blockscout/pull/8643) - https://github.com/blockscout/blockscout/pull/8643
-- [#8641](https://github.com/blockscout/blockscout/pull/8641) - https://github.com/blockscout/blockscout/pull/8641
-- [#8646](https://github.com/blockscout/blockscout/pull/8646) - https://github.com/blockscout/blockscout/pull/8646
-- [#8636](https://github.com/blockscout/blockscout/pull/8636) - https://github.com/blockscout/blockscout/pull/8636
-- [#8645](https://github.com/blockscout/blockscout/pull/8645) - https://github.com/blockscout/blockscout/pull/8645
-- [#8638](https://github.com/blockscout/blockscout/pull/8638) - https://github.com/blockscout/blockscout/pull/8638
-- [#8640](https://github.com/blockscout/blockscout/pull/8640) - https://github.com/blockscout/blockscout/pull/8640
+- [#8547](https://github.com/blockscout/blockscout/pull/8547) - Bump briefly from 678a376 to 51dfe7f
+- [#8567](https://github.com/blockscout/blockscout/pull/8567) - Bump photoswipe from 5.4.1 to 5.4.2 in /apps/block_scout_web/assets
+- [#8566](https://github.com/blockscout/blockscout/pull/8566) - Bump postcss from 8.4.30 to 8.4.31 in /apps/block_scout_web/assets
+- [#7575](https://github.com/blockscout/blockscout/pull/7575) - Bump css-loader from 5.2.7 to 6.8.1 in /apps/block_scout_web/assets
+- [#8569](https://github.com/blockscout/blockscout/pull/8569) - Bump web3 from 1.10.0 to 1.10.2 in /apps/block_scout_web/assets
+- [#8570](https://github.com/blockscout/blockscout/pull/8570) - Bump core-js from 3.32.2 to 3.33.0 in /apps/block_scout_web/assets
+- [#8581](https://github.com/blockscout/blockscout/pull/8581) - Bump credo from 1.7.0 to 1.7.1
+- [#8607](https://github.com/blockscout/blockscout/pull/8607) - Bump sass from 1.68.0 to 1.69.0 in /apps/block_scout_web/assets
+- [#8606](https://github.com/blockscout/blockscout/pull/8606) - Bump highlight.js from 11.8.0 to 11.9.0 in /apps/block_scout_web/assets
+- [#8605](https://github.com/blockscout/blockscout/pull/8605) - Bump eslint from 8.50.0 to 8.51.0 in /apps/block_scout_web/assets
+- [#8608](https://github.com/blockscout/blockscout/pull/8608) - Bump sweetalert2 from 11.7.31 to 11.7.32 in /apps/block_scout_web/assets
+- [#8510](https://github.com/blockscout/blockscout/pull/8510) - Bump hackney from 1.18.1 to 1.19.1
+- [#8637](https://github.com/blockscout/blockscout/pull/8637) - Bump @babel/preset-env from 7.22.20 to 7.23.2 in /apps/block_scout_web/assets
+- [#8639](https://github.com/blockscout/blockscout/pull/8639) - Bump sass from 1.69.0 to 1.69.3 in /apps/block_scout_web/assets
+- [#8643](https://github.com/blockscout/blockscout/pull/8643) - Bump floki from 0.34.3 to 0.35.0
+- [#8641](https://github.com/blockscout/blockscout/pull/8641) - Bump ex_cldr from 2.37.2 to 2.37.4
+- [#8646](https://github.com/blockscout/blockscout/pull/8646) - Bump @babel/traverse from 7.23.0 to 7.23.2 in /apps/block_scout_web/assets
+- [#8636](https://github.com/blockscout/blockscout/pull/8636) - Bump @babel/core from 7.23.0 to 7.23.2 in /apps/block_scout_web/assets
+- [#8645](https://github.com/blockscout/blockscout/pull/8645) - Bump ex_doc from 0.30.6 to 0.30.7
+- [#8638](https://github.com/blockscout/blockscout/pull/8638) - Bump webpack from 5.88.2 to 5.89.0 in /apps/block_scout_web/assets
+- [#8640](https://github.com/blockscout/blockscout/pull/8640) - Bump hackney from 1.19.1 to 1.20.1
 </details>
 
 ## 5.2.3-beta

From 85b1dacdcd9856bba46a32a636dc4a960e10f1a0 Mon Sep 17 00:00:00 2001
From: Viktor Baranov <baranov.viktor.27@gmail.com>
Date: Fri, 20 Oct 2023 18:41:44 +0300
Subject: [PATCH 519/909] Configure Buildx for Optimism

---
 .github/workflows/publish-docker-image-for-optimism.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.github/workflows/publish-docker-image-for-optimism.yml b/.github/workflows/publish-docker-image-for-optimism.yml
index 749e39474fb5..8bc5c2a785bc 100644
--- a/.github/workflows/publish-docker-image-for-optimism.yml
+++ b/.github/workflows/publish-docker-image-for-optimism.yml
@@ -19,6 +19,9 @@ jobs:
     steps:
       - name: Check out the repo
         uses: actions/checkout@v4
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
       
       - name: Log in to Docker Hub
         uses: docker/login-action@v2

From fd020a49ea3aa222fc4aed3e90aed887be2db040 Mon Sep 17 00:00:00 2001
From: Viktor Baranov <baranov.viktor.27@gmail.com>
Date: Mon, 23 Oct 2023 12:24:19 +0300
Subject: [PATCH 520/909] Workflow for image generation for zkevm

---
 .../publish-docker-image-for-zkevm.yml        | 55 +++++++++++++++++++
 1 file changed, 55 insertions(+)
 create mode 100644 .github/workflows/publish-docker-image-for-zkevm.yml

diff --git a/.github/workflows/publish-docker-image-for-zkevm.yml b/.github/workflows/publish-docker-image-for-zkevm.yml
new file mode 100644
index 000000000000..cb313b6ea081
--- /dev/null
+++ b/.github/workflows/publish-docker-image-for-zkevm.yml
@@ -0,0 +1,55 @@
+# This workflow uses actions that are not certified by GitHub.
+# They are provided by a third-party and are governed by
+# separate terms of service, privacy policy, and support
+# documentation.
+
+name: Publish Docker image for specific chain branches
+
+on:
+  push:
+    branches:
+      - production-zkevm-stg
+jobs:
+  push_to_registry:
+    name: Push Docker image to Docker Hub
+    runs-on: ubuntu-latest
+    env:
+      RELEASE_VERSION: 5.3.0
+      DOCKER_CHAIN_NAME: zkevm
+    steps:
+      - name: Check out the repo
+        uses: actions/checkout@v3
+      
+      - name: Log in to Docker Hub
+        uses: docker/login-action@v2
+        with:
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
+      
+      - name: Extract metadata (tags, labels) for Docker
+        id: meta
+        uses: docker/metadata-action@v4
+        with:
+          images: blockscout/blockscout
+
+      - name: Add SHORT_SHA env property with commit short sha
+        run: echo "SHORT_SHA=`echo ${GITHUB_SHA} | cut -c1-8`" >> $GITHUB_ENV
+      
+      - name: Build and push Docker image
+        uses: docker/build-push-action@v3
+        with:
+          context: .
+          file: ./docker/Dockerfile
+          push: true
+          tags: blockscout/blockscout-${{ env.DOCKER_CHAIN_NAME }}:latest, blockscout/blockscout-${{ env.DOCKER_CHAIN_NAME }}:${{ env.RELEASE_VERSION }}-postrelease-${{ env.SHORT_SHA }}
+          build-args: |
+            CACHE_EXCHANGE_RATES_PERIOD=
+            API_V1_READ_METHODS_DISABLED=false
+            DISABLE_WEBAPP=false
+            API_V1_WRITE_METHODS_DISABLED=false
+            CACHE_TOTAL_GAS_USAGE_COUNTER_ENABLED=
+            ADMIN_PANEL_ENABLED=false
+            CACHE_ADDRESS_WITH_BALANCES_UPDATE_INTERVAL=
+            BLOCKSCOUT_VERSION=v${{ env.RELEASE_VERSION }}-beta.+commit.${{ env.SHORT_SHA }}
+            RELEASE_VERSION=${{ env.RELEASE_VERSION }}
+            CHAIN_TYPE=polygon_zkevm
\ No newline at end of file

From 57c595e3baa70e738bd6ff5cdff3b2f725b656c8 Mon Sep 17 00:00:00 2001
From: Qwerty5Uiop <alex000010@bk.ru>
Date: Mon, 23 Oct 2023 18:14:19 +0600
Subject: [PATCH 521/909] Add a window for balances fetching from non-archive
 node

---
 CHANGELOG.md                                  |  2 +
 apps/ethereum_jsonrpc/lib/ethereum_jsonrpc.ex |  4 +
 .../test/ethereum_jsonrpc_test.exs            | 73 ++++++++++++++++---
 config/runtime.exs                            |  3 +-
 docker-compose/envs/common-blockscout.env     |  1 +
 5 files changed, 71 insertions(+), 12 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 25082d68b296..bf819c2ba9f0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,8 @@
 
 ### Features
 
+- [#8673](https://github.com/blockscout/blockscout/pull/8673) - Add a window for balances fetching from non-archive node
+
 ### Fixes
 
 ### Chore
diff --git a/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc.ex b/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc.ex
index 24579b642a53..3b67a4dd7f5a 100644
--- a/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc.ex
+++ b/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc.ex
@@ -189,9 +189,13 @@ defmodule EthereumJSONRPC do
       when is_list(params_list) and is_list(json_rpc_named_arguments) do
     filtered_params =
       if Application.get_env(:ethereum_jsonrpc, :disable_archive_balances?) do
+        {:ok, max_block_number} = fetch_block_number_by_tag("latest", json_rpc_named_arguments)
+        window = Application.get_env(:ethereum_jsonrpc, :archive_balances_window)
+
         params_list
         |> Enum.filter(fn
           %{block_quantity: "latest"} -> true
+          %{block_quantity: block_quantity} -> quantity_to_integer(block_quantity) > max_block_number - window
           _ -> false
         end)
       else
diff --git a/apps/ethereum_jsonrpc/test/ethereum_jsonrpc_test.exs b/apps/ethereum_jsonrpc/test/ethereum_jsonrpc_test.exs
index 7299d48478fb..0409dc1c6492 100644
--- a/apps/ethereum_jsonrpc/test/ethereum_jsonrpc_test.exs
+++ b/apps/ethereum_jsonrpc/test/ethereum_jsonrpc_test.exs
@@ -994,26 +994,72 @@ defmodule EthereumJSONRPCSyncTest do
       on_exit(fn -> Application.put_all_env([{:indexer, initial_env}]) end)
     end
 
-    test "ignores all request with block_quantity != latest when env ETHEREUM_JSONRPC_DISABLE_ARCHIVE_BALANCES is true",
+    test "ignores all request with block_quantity != latest or lower than window when env ETHEREUM_JSONRPC_DISABLE_ARCHIVE_BALANCES is true",
          %{
            json_rpc_named_arguments: json_rpc_named_arguments
          } do
       hash = "0x8bf38d4764929064f2d4d3a56520a76ab3df415b"
       expected_fetched_balance = 1
 
-      expect(EthereumJSONRPC.Mox, :json_rpc, 1, fn [
-                                                     %{
-                                                       id: 0,
-                                                       jsonrpc: "2.0",
-                                                       method: "eth_getBalance",
-                                                       params: [^hash, "latest"]
-                                                     }
-                                                   ],
-                                                   _options ->
-        {:ok, [%{id: 0, result: EthereumJSONRPC.integer_to_quantity(expected_fetched_balance)}]}
+      expect(EthereumJSONRPC.Mox, :json_rpc, 2, fn
+        [
+          %{
+            id: 0,
+            jsonrpc: "2.0",
+            method: "eth_getBalance",
+            params: [^hash, "0x4"]
+          },
+          %{
+            id: 1,
+            jsonrpc: "2.0",
+            method: "eth_getBalance",
+            params: [^hash, "latest"]
+          }
+        ],
+        _options ->
+          {:ok,
+           [
+             %{id: 0, result: EthereumJSONRPC.integer_to_quantity(expected_fetched_balance)},
+             %{id: 1, result: EthereumJSONRPC.integer_to_quantity(expected_fetched_balance)}
+           ]}
+
+        [
+          %{
+            id: id,
+            method: "eth_getBlockByNumber"
+          }
+        ],
+        _options ->
+          {:ok,
+           [
+             %{
+               id: id,
+               result: %{
+                 "difficulty" => "0x0",
+                 "gasLimit" => "0x0",
+                 "gasUsed" => "0x0",
+                 "hash" => "0x29c850324e357f3c0c836d79860c5af55f7b651e5d7ee253c1af1b14908af49c",
+                 "extraData" => "0x0",
+                 "logsBloom" => "0x0",
+                 "miner" => "0x0",
+                 "number" => "0x4",
+                 "parentHash" => "0x0",
+                 "receiptsRoot" => "0x0",
+                 "size" => "0x0",
+                 "sha3Uncles" => "0x0",
+                 "stateRoot" => "0x0",
+                 "timestamp" => "0x0",
+                 "totalDifficulty" => "0x0",
+                 "transactions" => ["0xa2e81bb56b55ba3dab2daf76501b50dfaad240cccb905dbf89d65c7a84a4a48e"],
+                 "transactionsRoot" => "0x0",
+                 "uncles" => []
+               }
+             }
+           ]}
       end)
 
       Application.put_env(:ethereum_jsonrpc, :disable_archive_balances?, "true")
+      Application.put_env(:ethereum_jsonrpc, :archive_balances_window, 1)
 
       assert EthereumJSONRPC.fetch_balances(
                [
@@ -1032,6 +1078,11 @@ defmodule EthereumJSONRPCSyncTest do
                       address_hash: hash,
                       block_number: nil,
                       value: expected_fetched_balance
+                    },
+                    %{
+                      address_hash: hash,
+                      block_number: 4,
+                      value: expected_fetched_balance
                     }
                   ]
                 }}
diff --git a/config/runtime.exs b/config/runtime.exs
index 2133d2ee1a93..8af8e6f70f36 100644
--- a/config/runtime.exs
+++ b/config/runtime.exs
@@ -150,7 +150,8 @@ config :ueberauth, Ueberauth, logout_url: "https://#{System.get_env("ACCOUNT_AUT
 config :ethereum_jsonrpc,
   rpc_transport: if(System.get_env("ETHEREUM_JSONRPC_TRANSPORT", "http") == "http", do: :http, else: :ipc),
   ipc_path: System.get_env("IPC_PATH"),
-  disable_archive_balances?: ConfigHelper.parse_bool_env_var("ETHEREUM_JSONRPC_DISABLE_ARCHIVE_BALANCES")
+  disable_archive_balances?: ConfigHelper.parse_bool_env_var("ETHEREUM_JSONRPC_DISABLE_ARCHIVE_BALANCES"),
+  archive_balances_window: ConfigHelper.parse_integer_env_var("ETHEREUM_JSONRPC_ARCHIVE_BALANCES_WINDOW", 200)
 
 config :ethereum_jsonrpc, EthereumJSONRPC.HTTP,
   headers:
diff --git a/docker-compose/envs/common-blockscout.env b/docker-compose/envs/common-blockscout.env
index 08ae57c7a97a..d2bbf877ff3c 100644
--- a/docker-compose/envs/common-blockscout.env
+++ b/docker-compose/envs/common-blockscout.env
@@ -13,6 +13,7 @@ LOGO=/images/blockscout_logo.svg
 # ETHEREUM_JSONRPC_WS_URL=
 ETHEREUM_JSONRPC_TRANSPORT=http
 ETHEREUM_JSONRPC_DISABLE_ARCHIVE_BALANCES=false
+#ETHEREUM_JSONRPC_ARCHIVE_BALANCES_WINDOW=200
 # ETHEREUM_JSONRPC_HTTP_HEADERS=
 # ETHEREUM_JSONRPC_WAIT_PER_TIMEOUT=
 IPC_PATH=

From fdbffc77e7118f6596c039cdf4079aee407afee4 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 23 Oct 2023 18:28:18 +0000
Subject: [PATCH 522/909] Bump sass from 1.69.3 to 1.69.4 in
 /apps/block_scout_web/assets

Bumps [sass](https://github.com/sass/dart-sass) from 1.69.3 to 1.69.4.
- [Release notes](https://github.com/sass/dart-sass/releases)
- [Changelog](https://github.com/sass/dart-sass/blob/main/CHANGELOG.md)
- [Commits](https://github.com/sass/dart-sass/compare/1.69.3...1.69.4)

---
updated-dependencies:
- dependency-name: sass
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 apps/block_scout_web/assets/package-lock.json | 14 +++++++-------
 apps/block_scout_web/assets/package.json      |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/apps/block_scout_web/assets/package-lock.json b/apps/block_scout_web/assets/package-lock.json
index 680f70a76f57..916b86fb8597 100644
--- a/apps/block_scout_web/assets/package-lock.json
+++ b/apps/block_scout_web/assets/package-lock.json
@@ -89,7 +89,7 @@
         "mini-css-extract-plugin": "^2.7.6",
         "postcss": "^8.4.31",
         "postcss-loader": "^7.3.3",
-        "sass": "^1.69.3",
+        "sass": "^1.69.4",
         "sass-loader": "^13.3.2",
         "style-loader": "^3.3.3",
         "webpack": "^5.89.0",
@@ -15147,9 +15147,9 @@
       "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
     },
     "node_modules/sass": {
-      "version": "1.69.3",
-      "resolved": "https://registry.npmjs.org/sass/-/sass-1.69.3.tgz",
-      "integrity": "sha512-X99+a2iGdXkdWn1akFPs0ZmelUzyAQfvqYc2P/MPTrJRuIRoTffGzT9W9nFqG00S+c8hXzVmgxhUuHFdrwxkhQ==",
+      "version": "1.69.4",
+      "resolved": "https://registry.npmjs.org/sass/-/sass-1.69.4.tgz",
+      "integrity": "sha512-+qEreVhqAy8o++aQfCJwp0sklr2xyEzkm9Pp/Igu9wNPoe7EZEQ8X/MBvvXggI2ql607cxKg/RKOwDj6pp2XDA==",
       "dev": true,
       "dependencies": {
         "chokidar": ">=3.0.0 <4.0.0",
@@ -29146,9 +29146,9 @@
       "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
     },
     "sass": {
-      "version": "1.69.3",
-      "resolved": "https://registry.npmjs.org/sass/-/sass-1.69.3.tgz",
-      "integrity": "sha512-X99+a2iGdXkdWn1akFPs0ZmelUzyAQfvqYc2P/MPTrJRuIRoTffGzT9W9nFqG00S+c8hXzVmgxhUuHFdrwxkhQ==",
+      "version": "1.69.4",
+      "resolved": "https://registry.npmjs.org/sass/-/sass-1.69.4.tgz",
+      "integrity": "sha512-+qEreVhqAy8o++aQfCJwp0sklr2xyEzkm9Pp/Igu9wNPoe7EZEQ8X/MBvvXggI2ql607cxKg/RKOwDj6pp2XDA==",
       "dev": true,
       "requires": {
         "chokidar": ">=3.0.0 <4.0.0",
diff --git a/apps/block_scout_web/assets/package.json b/apps/block_scout_web/assets/package.json
index dac5208241d7..58a0870e550d 100644
--- a/apps/block_scout_web/assets/package.json
+++ b/apps/block_scout_web/assets/package.json
@@ -101,7 +101,7 @@
     "mini-css-extract-plugin": "^2.7.6",
     "postcss": "^8.4.31",
     "postcss-loader": "^7.3.3",
-    "sass": "^1.69.3",
+    "sass": "^1.69.4",
     "sass-loader": "^13.3.2",
     "style-loader": "^3.3.3",
     "webpack": "^5.89.0",

From d4aa49c514a992f3c0f69b8c28c5921a9c12d881 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 23 Oct 2023 18:28:43 +0000
Subject: [PATCH 523/909] Bump web3 from 1.10.2 to 1.10.3 in
 /apps/block_scout_web/assets

Bumps [web3](https://github.com/ChainSafe/web3.js) from 1.10.2 to 1.10.3.
- [Release notes](https://github.com/ChainSafe/web3.js/releases)
- [Changelog](https://github.com/web3/web3.js/blob/4.x/CHANGELOG.md)
- [Commits](https://github.com/ChainSafe/web3.js/compare/v1.10.2...v1.10.3)

---
updated-dependencies:
- dependency-name: web3
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 apps/block_scout_web/assets/package-lock.json | 646 +++++++++---------
 apps/block_scout_web/assets/package.json      |   2 +-
 2 files changed, 324 insertions(+), 324 deletions(-)

diff --git a/apps/block_scout_web/assets/package-lock.json b/apps/block_scout_web/assets/package-lock.json
index 680f70a76f57..923bcbd40865 100644
--- a/apps/block_scout_web/assets/package-lock.json
+++ b/apps/block_scout_web/assets/package-lock.json
@@ -66,7 +66,7 @@
         "url": "^0.11.3",
         "util": "^0.12.5",
         "viewerjs": "^1.11.6",
-        "web3": "^1.10.2",
+        "web3": "^1.10.3",
         "web3modal": "^1.9.12",
         "xss": "^1.0.14"
       },
@@ -2115,12 +2115,12 @@
       }
     },
     "node_modules/@ethereumjs/common": {
-      "version": "2.5.0",
-      "resolved": "https://registry.npmjs.org/@ethereumjs/common/-/common-2.5.0.tgz",
-      "integrity": "sha512-DEHjW6e38o+JmB/NO3GZBpW4lpaiBpkFgXF6jLcJ6gETBYpEyaA5nTimsWBUJR3Vmtm/didUEbNjajskugZORg==",
+      "version": "2.6.5",
+      "resolved": "https://registry.npmjs.org/@ethereumjs/common/-/common-2.6.5.tgz",
+      "integrity": "sha512-lRyVQOeCDaIVtgfbowla32pzeDv2Obr8oR8Put5RdUBNRGr1VGPGQNGP6elWIpgK3YdpzqTOh4GyUGOureVeeA==",
       "dependencies": {
         "crc-32": "^1.2.0",
-        "ethereumjs-util": "^7.1.1"
+        "ethereumjs-util": "^7.1.5"
       }
     },
     "node_modules/@ethereumjs/rlp": {
@@ -2135,12 +2135,12 @@
       }
     },
     "node_modules/@ethereumjs/tx": {
-      "version": "3.3.2",
-      "resolved": "https://registry.npmjs.org/@ethereumjs/tx/-/tx-3.3.2.tgz",
-      "integrity": "sha512-6AaJhwg4ucmwTvw/1qLaZUX5miWrwZ4nLOUsKyb/HtzS3BMw/CasKhdi1ims9mBKeK9sOJCH4qGKOBGyJCeeog==",
+      "version": "3.5.2",
+      "resolved": "https://registry.npmjs.org/@ethereumjs/tx/-/tx-3.5.2.tgz",
+      "integrity": "sha512-gQDNJWKrSDGu2w7w0PzVXVBNMzb7wwdDOmOqczmhNjqFxFuIbhVJDwiGEnxFNC2/b8ifcZzY7MLcluizohRzNw==",
       "dependencies": {
-        "@ethereumjs/common": "^2.5.0",
-        "ethereumjs-util": "^7.1.2"
+        "@ethereumjs/common": "^2.6.4",
+        "ethereumjs-util": "^7.1.5"
       }
     },
     "node_modules/@ethereumjs/util": {
@@ -3604,9 +3604,9 @@
       }
     },
     "node_modules/@types/http-cache-semantics": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/@types/http-cache-semantics/-/http-cache-semantics-4.0.2.tgz",
-      "integrity": "sha512-FD+nQWA2zJjh4L9+pFXqWOi0Hs1ryBCfI+985NjluQ1p8EYtoLvjLOKidXBtZ4/IcxDX4o8/E8qDS3540tNliw=="
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/@types/http-cache-semantics/-/http-cache-semantics-4.0.3.tgz",
+      "integrity": "sha512-V46MYLFp08Wf2mmaBhvgjStM3tPa+2GAdy/iqoX+noX1//zje2x4XmrIU0cAwyClATsTmahbtoQ2EwP7I5WSiA=="
     },
     "node_modules/@types/istanbul-lib-coverage": {
       "version": "2.0.4",
@@ -3677,9 +3677,9 @@
       }
     },
     "node_modules/@types/responselike": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/@types/responselike/-/responselike-1.0.1.tgz",
-      "integrity": "sha512-TiGnitEDxj2X0j+98Eqk5lv/Cij8oHd32bU4D/Yw6AOq7vvTk0gSD2GPj0G/HkvhMoVsdlhYF4yqqlyPBTM6Sg==",
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/@types/responselike/-/responselike-1.0.2.tgz",
+      "integrity": "sha512-/4YQT5Kp6HxUDb4yhRkm0bJ7TbjvTddqX7PZ5hz6qV3pxSo72f/6YPRo+Mu2DU307tm9IioO69l7uAwn5XNcFA==",
       "dependencies": {
         "@types/node": "*"
       }
@@ -8321,9 +8321,9 @@
       }
     },
     "node_modules/ethereumjs-util/node_modules/@types/bn.js": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/@types/bn.js/-/bn.js-5.1.2.tgz",
-      "integrity": "sha512-dkpZu0szUtn9UXTmw+e0AJFd4D2XAxDnsCLdc05SfqpqzPEBft8eQr8uaFitfo/dUUOZERaLec2hHMG87A4Dxg==",
+      "version": "5.1.3",
+      "resolved": "https://registry.npmjs.org/@types/bn.js/-/bn.js-5.1.3.tgz",
+      "integrity": "sha512-wT1B4iIO82ecXkdN6waCK8Ou7E71WU+mP1osDA5Q8c6Ur+ozU2vIKUIhSpUr6uE5L2YHocKS1Z2jG2fBC1YVeg==",
       "dependencies": {
         "@types/node": "*"
       }
@@ -12136,9 +12136,9 @@
       }
     },
     "node_modules/keyv": {
-      "version": "4.5.3",
-      "resolved": "https://registry.npmjs.org/keyv/-/keyv-4.5.3.tgz",
-      "integrity": "sha512-QCiSav9WaX1PgETJ+SpNnx2PRRapJ/oRSXM4VO5OGYGSjrxbKPVFVhB3l2OCbLCk329N8qyAtsJjSjvVBWzEug==",
+      "version": "4.5.4",
+      "resolved": "https://registry.npmjs.org/keyv/-/keyv-4.5.4.tgz",
+      "integrity": "sha512-oxVHkHR/EJf2CNXnWxRLW6mg7JyCCUcG0DtEGmL2ctUo1PNTin1PUil+r/+4r5MpVgC/fn1kjsx7mjSujKqIpw==",
       "dependencies": {
         "json-buffer": "3.0.1"
       }
@@ -16754,27 +16754,27 @@
       }
     },
     "node_modules/web3": {
-      "version": "1.10.2",
-      "resolved": "https://registry.npmjs.org/web3/-/web3-1.10.2.tgz",
-      "integrity": "sha512-DAtZ3a3ruPziE80uZ3Ob0YDZxt6Vk2un/F5BcBrxO70owJ9Z1Y2+loZmbh1MoAmoLGjA/SUSHeUtid3fYmBaog==",
+      "version": "1.10.3",
+      "resolved": "https://registry.npmjs.org/web3/-/web3-1.10.3.tgz",
+      "integrity": "sha512-DgUdOOqC/gTqW+VQl1EdPxrVRPB66xVNtuZ5KD4adVBtko87hkgM8BTZ0lZ8IbUfnQk6DyjcDujMiH3oszllAw==",
       "hasInstallScript": true,
       "dependencies": {
-        "web3-bzz": "1.10.2",
-        "web3-core": "1.10.2",
-        "web3-eth": "1.10.2",
-        "web3-eth-personal": "1.10.2",
-        "web3-net": "1.10.2",
-        "web3-shh": "1.10.2",
-        "web3-utils": "1.10.2"
+        "web3-bzz": "1.10.3",
+        "web3-core": "1.10.3",
+        "web3-eth": "1.10.3",
+        "web3-eth-personal": "1.10.3",
+        "web3-net": "1.10.3",
+        "web3-shh": "1.10.3",
+        "web3-utils": "1.10.3"
       },
       "engines": {
         "node": ">=8.0.0"
       }
     },
     "node_modules/web3-bzz": {
-      "version": "1.10.2",
-      "resolved": "https://registry.npmjs.org/web3-bzz/-/web3-bzz-1.10.2.tgz",
-      "integrity": "sha512-vLOfDCj6198Qc7esDrCKeFA/M3ZLbowsaHQ0hIL4NmIHoq7lU8aSRTa5AI+JBh8cKN1gVryJsuW2ZCc5bM4I4Q==",
+      "version": "1.10.3",
+      "resolved": "https://registry.npmjs.org/web3-bzz/-/web3-bzz-1.10.3.tgz",
+      "integrity": "sha512-XDIRsTwekdBXtFytMpHBuun4cK4x0ZMIDXSoo1UVYp+oMyZj07c7gf7tNQY5qZ/sN+CJIas4ilhN25VJcjSijQ==",
       "hasInstallScript": true,
       "dependencies": {
         "@types/node": "^12.12.6",
@@ -16791,53 +16791,53 @@
       "integrity": "sha512-J8xLz7q2OFulZ2cyGTLE1TbbZcjpno7FaN6zdJNrgAdrJ+DZzh/uFR6YrTb4C+nXakvud8Q4+rbhoIWlYQbUFQ=="
     },
     "node_modules/web3-core": {
-      "version": "1.10.2",
-      "resolved": "https://registry.npmjs.org/web3-core/-/web3-core-1.10.2.tgz",
-      "integrity": "sha512-qTn2UmtE8tvwMRsC5pXVdHxrQ4uZ6jiLgF5DRUVtdi7dPUmX18Dp9uxKfIfhGcA011EAn8P6+X7r3pvi2YRxBw==",
+      "version": "1.10.3",
+      "resolved": "https://registry.npmjs.org/web3-core/-/web3-core-1.10.3.tgz",
+      "integrity": "sha512-Vbk0/vUNZxJlz3RFjAhNNt7qTpX8yE3dn3uFxfX5OHbuon5u65YEOd3civ/aQNW745N0vGUlHFNxxmn+sG9DIw==",
       "dependencies": {
         "@types/bn.js": "^5.1.1",
         "@types/node": "^12.12.6",
         "bignumber.js": "^9.0.0",
-        "web3-core-helpers": "1.10.2",
-        "web3-core-method": "1.10.2",
-        "web3-core-requestmanager": "1.10.2",
-        "web3-utils": "1.10.2"
+        "web3-core-helpers": "1.10.3",
+        "web3-core-method": "1.10.3",
+        "web3-core-requestmanager": "1.10.3",
+        "web3-utils": "1.10.3"
       },
       "engines": {
         "node": ">=8.0.0"
       }
     },
     "node_modules/web3-core-helpers": {
-      "version": "1.10.2",
-      "resolved": "https://registry.npmjs.org/web3-core-helpers/-/web3-core-helpers-1.10.2.tgz",
-      "integrity": "sha512-1JfaNtox6/ZYJHNoI+QVc2ObgwEPeGF+YdxHZQ7aF5605BmlwM1Bk3A8xv6mg64jIRvEq1xX6k9oG6x7p1WgXQ==",
+      "version": "1.10.3",
+      "resolved": "https://registry.npmjs.org/web3-core-helpers/-/web3-core-helpers-1.10.3.tgz",
+      "integrity": "sha512-Yv7dQC3B9ipOc5sWm3VAz1ys70Izfzb8n9rSiQYIPjpqtJM+3V4EeK6ghzNR6CO2es0+Yu9CtCkw0h8gQhrTxA==",
       "dependencies": {
-        "web3-eth-iban": "1.10.2",
-        "web3-utils": "1.10.2"
+        "web3-eth-iban": "1.10.3",
+        "web3-utils": "1.10.3"
       },
       "engines": {
         "node": ">=8.0.0"
       }
     },
     "node_modules/web3-core-method": {
-      "version": "1.10.2",
-      "resolved": "https://registry.npmjs.org/web3-core-method/-/web3-core-method-1.10.2.tgz",
-      "integrity": "sha512-gG6ES+LOuo01MJHML4gnEt702M8lcPGMYZoX8UjZzmEebGrPYOY9XccpCrsFgCeKgQzM12SVnlwwpMod1+lcLg==",
+      "version": "1.10.3",
+      "resolved": "https://registry.npmjs.org/web3-core-method/-/web3-core-method-1.10.3.tgz",
+      "integrity": "sha512-VZ/Dmml4NBmb0ep5PTSg9oqKoBtG0/YoMPei/bq/tUdlhB2dMB79sbeJPwx592uaV0Vpk7VltrrrBv5hTM1y4Q==",
       "dependencies": {
         "@ethersproject/transactions": "^5.6.2",
-        "web3-core-helpers": "1.10.2",
-        "web3-core-promievent": "1.10.2",
-        "web3-core-subscriptions": "1.10.2",
-        "web3-utils": "1.10.2"
+        "web3-core-helpers": "1.10.3",
+        "web3-core-promievent": "1.10.3",
+        "web3-core-subscriptions": "1.10.3",
+        "web3-utils": "1.10.3"
       },
       "engines": {
         "node": ">=8.0.0"
       }
     },
     "node_modules/web3-core-promievent": {
-      "version": "1.10.2",
-      "resolved": "https://registry.npmjs.org/web3-core-promievent/-/web3-core-promievent-1.10.2.tgz",
-      "integrity": "sha512-Qkkb1dCDOU8dZeORkcwJBQRAX+mdsjx8LqFBB+P4W9QgwMqyJ6LXda+y1XgyeEVeKEmY1RCeTq9Y94q1v62Sfw==",
+      "version": "1.10.3",
+      "resolved": "https://registry.npmjs.org/web3-core-promievent/-/web3-core-promievent-1.10.3.tgz",
+      "integrity": "sha512-HgjY+TkuLm5uTwUtaAfkTgRx/NzMxvVradCi02gy17NxDVdg/p6svBHcp037vcNpkuGeFznFJgULP+s2hdVgUQ==",
       "dependencies": {
         "eventemitter3": "4.0.4"
       },
@@ -16846,36 +16846,36 @@
       }
     },
     "node_modules/web3-core-requestmanager": {
-      "version": "1.10.2",
-      "resolved": "https://registry.npmjs.org/web3-core-requestmanager/-/web3-core-requestmanager-1.10.2.tgz",
-      "integrity": "sha512-nlLeNJUu6fR+ZbJr2k9Du/nN3VWwB4AJPY4r6nxUODAmykgJq57T21cLP/BEk6mbiFQYGE9TrrPhh4qWxQEtAw==",
+      "version": "1.10.3",
+      "resolved": "https://registry.npmjs.org/web3-core-requestmanager/-/web3-core-requestmanager-1.10.3.tgz",
+      "integrity": "sha512-VT9sKJfgM2yBOIxOXeXiDuFMP4pxzF6FT+y8KTLqhDFHkbG3XRe42Vm97mB/IvLQCJOmokEjl3ps8yP1kbggyw==",
       "dependencies": {
         "util": "^0.12.5",
-        "web3-core-helpers": "1.10.2",
-        "web3-providers-http": "1.10.2",
-        "web3-providers-ipc": "1.10.2",
-        "web3-providers-ws": "1.10.2"
+        "web3-core-helpers": "1.10.3",
+        "web3-providers-http": "1.10.3",
+        "web3-providers-ipc": "1.10.3",
+        "web3-providers-ws": "1.10.3"
       },
       "engines": {
         "node": ">=8.0.0"
       }
     },
     "node_modules/web3-core-subscriptions": {
-      "version": "1.10.2",
-      "resolved": "https://registry.npmjs.org/web3-core-subscriptions/-/web3-core-subscriptions-1.10.2.tgz",
-      "integrity": "sha512-MiWcKjz4tco793EPPPLc/YOJmYUV3zAfxeQH/UVTfBejMfnNvmfwKa2SBKfPIvKQHz/xI5bV2TF15uvJEucU7w==",
+      "version": "1.10.3",
+      "resolved": "https://registry.npmjs.org/web3-core-subscriptions/-/web3-core-subscriptions-1.10.3.tgz",
+      "integrity": "sha512-KW0Mc8sgn70WadZu7RjQ4H5sNDJ5Lx8JMI3BWos+f2rW0foegOCyWhRu33W1s6ntXnqeBUw5rRCXZRlA3z+HNA==",
       "dependencies": {
         "eventemitter3": "4.0.4",
-        "web3-core-helpers": "1.10.2"
+        "web3-core-helpers": "1.10.3"
       },
       "engines": {
         "node": ">=8.0.0"
       }
     },
     "node_modules/web3-core/node_modules/@types/bn.js": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/@types/bn.js/-/bn.js-5.1.2.tgz",
-      "integrity": "sha512-dkpZu0szUtn9UXTmw+e0AJFd4D2XAxDnsCLdc05SfqpqzPEBft8eQr8uaFitfo/dUUOZERaLec2hHMG87A4Dxg==",
+      "version": "5.1.3",
+      "resolved": "https://registry.npmjs.org/@types/bn.js/-/bn.js-5.1.3.tgz",
+      "integrity": "sha512-wT1B4iIO82ecXkdN6waCK8Ou7E71WU+mP1osDA5Q8c6Ur+ozU2vIKUIhSpUr6uE5L2YHocKS1Z2jG2fBC1YVeg==",
       "dependencies": {
         "@types/node": "*"
       }
@@ -16886,54 +16886,54 @@
       "integrity": "sha512-J8xLz7q2OFulZ2cyGTLE1TbbZcjpno7FaN6zdJNrgAdrJ+DZzh/uFR6YrTb4C+nXakvud8Q4+rbhoIWlYQbUFQ=="
     },
     "node_modules/web3-eth": {
-      "version": "1.10.2",
-      "resolved": "https://registry.npmjs.org/web3-eth/-/web3-eth-1.10.2.tgz",
-      "integrity": "sha512-s38rhrntyhGShmXC4R/aQtfkpcmev9c7iZwgb9CDIBFo7K8nrEJvqIOyajeZTxnDIiGzTJmrHxiKSadii5qTRg==",
-      "dependencies": {
-        "web3-core": "1.10.2",
-        "web3-core-helpers": "1.10.2",
-        "web3-core-method": "1.10.2",
-        "web3-core-subscriptions": "1.10.2",
-        "web3-eth-abi": "1.10.2",
-        "web3-eth-accounts": "1.10.2",
-        "web3-eth-contract": "1.10.2",
-        "web3-eth-ens": "1.10.2",
-        "web3-eth-iban": "1.10.2",
-        "web3-eth-personal": "1.10.2",
-        "web3-net": "1.10.2",
-        "web3-utils": "1.10.2"
+      "version": "1.10.3",
+      "resolved": "https://registry.npmjs.org/web3-eth/-/web3-eth-1.10.3.tgz",
+      "integrity": "sha512-Uk1U2qGiif2mIG8iKu23/EQJ2ksB1BQXy3wF3RvFuyxt8Ft9OEpmGlO7wOtAyJdoKzD5vcul19bJpPcWSAYZhA==",
+      "dependencies": {
+        "web3-core": "1.10.3",
+        "web3-core-helpers": "1.10.3",
+        "web3-core-method": "1.10.3",
+        "web3-core-subscriptions": "1.10.3",
+        "web3-eth-abi": "1.10.3",
+        "web3-eth-accounts": "1.10.3",
+        "web3-eth-contract": "1.10.3",
+        "web3-eth-ens": "1.10.3",
+        "web3-eth-iban": "1.10.3",
+        "web3-eth-personal": "1.10.3",
+        "web3-net": "1.10.3",
+        "web3-utils": "1.10.3"
       },
       "engines": {
         "node": ">=8.0.0"
       }
     },
     "node_modules/web3-eth-abi": {
-      "version": "1.10.2",
-      "resolved": "https://registry.npmjs.org/web3-eth-abi/-/web3-eth-abi-1.10.2.tgz",
-      "integrity": "sha512-pY4fQUio7W7ZRSLf+vsYkaxJqaT/jHcALZjIxy+uBQaYAJ3t6zpQqMZkJB3Dw7HUODRJ1yI0NPEFGTnkYf/17A==",
+      "version": "1.10.3",
+      "resolved": "https://registry.npmjs.org/web3-eth-abi/-/web3-eth-abi-1.10.3.tgz",
+      "integrity": "sha512-O8EvV67uhq0OiCMekqYsDtb6FzfYzMXT7VMHowF8HV6qLZXCGTdB/NH4nJrEh2mFtEwVdS6AmLFJAQd2kVyoMQ==",
       "dependencies": {
         "@ethersproject/abi": "^5.6.3",
-        "web3-utils": "1.10.2"
+        "web3-utils": "1.10.3"
       },
       "engines": {
         "node": ">=8.0.0"
       }
     },
     "node_modules/web3-eth-accounts": {
-      "version": "1.10.2",
-      "resolved": "https://registry.npmjs.org/web3-eth-accounts/-/web3-eth-accounts-1.10.2.tgz",
-      "integrity": "sha512-6/HhCBYAXN/f553/SyxS9gY62NbLgpD1zJpENcvRTDpJN3Znvli1cmpl5Q3ZIUJkvHnG//48EWfWh0cbb3fbKQ==",
+      "version": "1.10.3",
+      "resolved": "https://registry.npmjs.org/web3-eth-accounts/-/web3-eth-accounts-1.10.3.tgz",
+      "integrity": "sha512-8MipGgwusDVgn7NwKOmpeo3gxzzd+SmwcWeBdpXknuyDiZSQy9tXe+E9LeFGrmys/8mLLYP79n3jSbiTyv+6pQ==",
       "dependencies": {
-        "@ethereumjs/common": "2.5.0",
-        "@ethereumjs/tx": "3.3.2",
+        "@ethereumjs/common": "2.6.5",
+        "@ethereumjs/tx": "3.5.2",
         "@ethereumjs/util": "^8.1.0",
         "eth-lib": "0.2.8",
         "scrypt-js": "^3.0.1",
         "uuid": "^9.0.0",
-        "web3-core": "1.10.2",
-        "web3-core-helpers": "1.10.2",
-        "web3-core-method": "1.10.2",
-        "web3-utils": "1.10.2"
+        "web3-core": "1.10.3",
+        "web3-core-helpers": "1.10.3",
+        "web3-core-method": "1.10.3",
+        "web3-utils": "1.10.3"
       },
       "engines": {
         "node": ">=8.0.0"
@@ -16967,72 +16967,72 @@
       }
     },
     "node_modules/web3-eth-contract": {
-      "version": "1.10.2",
-      "resolved": "https://registry.npmjs.org/web3-eth-contract/-/web3-eth-contract-1.10.2.tgz",
-      "integrity": "sha512-CZLKPQRmupP/+OZ5A/CBwWWkBiz5B/foOpARz0upMh1yjb0dEud4YzRW2gJaeNu0eGxDLsWVaXhUimJVGYprQw==",
+      "version": "1.10.3",
+      "resolved": "https://registry.npmjs.org/web3-eth-contract/-/web3-eth-contract-1.10.3.tgz",
+      "integrity": "sha512-Y2CW61dCCyY4IoUMD4JsEQWrILX4FJWDWC/Txx/pr3K/+fGsBGvS9kWQN5EsVXOp4g7HoFOfVh9Lf7BmVVSRmg==",
       "dependencies": {
         "@types/bn.js": "^5.1.1",
-        "web3-core": "1.10.2",
-        "web3-core-helpers": "1.10.2",
-        "web3-core-method": "1.10.2",
-        "web3-core-promievent": "1.10.2",
-        "web3-core-subscriptions": "1.10.2",
-        "web3-eth-abi": "1.10.2",
-        "web3-utils": "1.10.2"
+        "web3-core": "1.10.3",
+        "web3-core-helpers": "1.10.3",
+        "web3-core-method": "1.10.3",
+        "web3-core-promievent": "1.10.3",
+        "web3-core-subscriptions": "1.10.3",
+        "web3-eth-abi": "1.10.3",
+        "web3-utils": "1.10.3"
       },
       "engines": {
         "node": ">=8.0.0"
       }
     },
     "node_modules/web3-eth-contract/node_modules/@types/bn.js": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/@types/bn.js/-/bn.js-5.1.2.tgz",
-      "integrity": "sha512-dkpZu0szUtn9UXTmw+e0AJFd4D2XAxDnsCLdc05SfqpqzPEBft8eQr8uaFitfo/dUUOZERaLec2hHMG87A4Dxg==",
+      "version": "5.1.3",
+      "resolved": "https://registry.npmjs.org/@types/bn.js/-/bn.js-5.1.3.tgz",
+      "integrity": "sha512-wT1B4iIO82ecXkdN6waCK8Ou7E71WU+mP1osDA5Q8c6Ur+ozU2vIKUIhSpUr6uE5L2YHocKS1Z2jG2fBC1YVeg==",
       "dependencies": {
         "@types/node": "*"
       }
     },
     "node_modules/web3-eth-ens": {
-      "version": "1.10.2",
-      "resolved": "https://registry.npmjs.org/web3-eth-ens/-/web3-eth-ens-1.10.2.tgz",
-      "integrity": "sha512-kTQ42UdNHy4BQJHgWe97bHNMkc3zCMBKKY7t636XOMxdI/lkRdIjdE5nQzt97VjQvSVasgIWYKRAtd8aRaiZiQ==",
+      "version": "1.10.3",
+      "resolved": "https://registry.npmjs.org/web3-eth-ens/-/web3-eth-ens-1.10.3.tgz",
+      "integrity": "sha512-hR+odRDXGqKemw1GFniKBEXpjYwLgttTES+bc7BfTeoUyUZXbyDHe5ifC+h+vpzxh4oS0TnfcIoarK0Z9tFSiQ==",
       "dependencies": {
         "content-hash": "^2.5.2",
         "eth-ens-namehash": "2.0.8",
-        "web3-core": "1.10.2",
-        "web3-core-helpers": "1.10.2",
-        "web3-core-promievent": "1.10.2",
-        "web3-eth-abi": "1.10.2",
-        "web3-eth-contract": "1.10.2",
-        "web3-utils": "1.10.2"
+        "web3-core": "1.10.3",
+        "web3-core-helpers": "1.10.3",
+        "web3-core-promievent": "1.10.3",
+        "web3-eth-abi": "1.10.3",
+        "web3-eth-contract": "1.10.3",
+        "web3-utils": "1.10.3"
       },
       "engines": {
         "node": ">=8.0.0"
       }
     },
     "node_modules/web3-eth-iban": {
-      "version": "1.10.2",
-      "resolved": "https://registry.npmjs.org/web3-eth-iban/-/web3-eth-iban-1.10.2.tgz",
-      "integrity": "sha512-y8+Ii2XXdyHQMFNL2NWpBnXe+TVJ4ryvPlzNhObRRnIo4O4nLIXS010olLDMayozDzoUlmzCmBZJYc9Eev1g7A==",
+      "version": "1.10.3",
+      "resolved": "https://registry.npmjs.org/web3-eth-iban/-/web3-eth-iban-1.10.3.tgz",
+      "integrity": "sha512-ZCfOjYKAjaX2TGI8uif5ah+J3BYFuo+47JOIV1RIz2l7kD9VfnxvRH5UiQDRyMALQC7KFd2hUqIEtHklapNyKA==",
       "dependencies": {
         "bn.js": "^5.2.1",
-        "web3-utils": "1.10.2"
+        "web3-utils": "1.10.3"
       },
       "engines": {
         "node": ">=8.0.0"
       }
     },
     "node_modules/web3-eth-personal": {
-      "version": "1.10.2",
-      "resolved": "https://registry.npmjs.org/web3-eth-personal/-/web3-eth-personal-1.10.2.tgz",
-      "integrity": "sha512-+vEbJsPUJc5J683y0c2aN645vXC+gPVlFVCQu4IjPvXzJrAtUfz26+IZ6AUOth4fDJPT0f1uSLS5W2yrUdw9BQ==",
+      "version": "1.10.3",
+      "resolved": "https://registry.npmjs.org/web3-eth-personal/-/web3-eth-personal-1.10.3.tgz",
+      "integrity": "sha512-avrQ6yWdADIvuNQcFZXmGLCEzulQa76hUOuVywN7O3cklB4nFc/Gp3yTvD3bOAaE7DhjLQfhUTCzXL7WMxVTsw==",
       "dependencies": {
         "@types/node": "^12.12.6",
-        "web3-core": "1.10.2",
-        "web3-core-helpers": "1.10.2",
-        "web3-core-method": "1.10.2",
-        "web3-net": "1.10.2",
-        "web3-utils": "1.10.2"
+        "web3-core": "1.10.3",
+        "web3-core-helpers": "1.10.3",
+        "web3-core-method": "1.10.3",
+        "web3-net": "1.10.3",
+        "web3-utils": "1.10.3"
       },
       "engines": {
         "node": ">=8.0.0"
@@ -17044,13 +17044,13 @@
       "integrity": "sha512-J8xLz7q2OFulZ2cyGTLE1TbbZcjpno7FaN6zdJNrgAdrJ+DZzh/uFR6YrTb4C+nXakvud8Q4+rbhoIWlYQbUFQ=="
     },
     "node_modules/web3-net": {
-      "version": "1.10.2",
-      "resolved": "https://registry.npmjs.org/web3-net/-/web3-net-1.10.2.tgz",
-      "integrity": "sha512-w9i1t2z7dItagfskhaCKwpp6W3ylUR88gs68u820y5f8yfK5EbPmHc6c2lD8X9ZrTnmDoeOpIRCN/RFPtZCp+g==",
+      "version": "1.10.3",
+      "resolved": "https://registry.npmjs.org/web3-net/-/web3-net-1.10.3.tgz",
+      "integrity": "sha512-IoSr33235qVoI1vtKssPUigJU9Fc/Ph0T9CgRi15sx+itysmvtlmXMNoyd6Xrgm9LuM4CIhxz7yDzH93B79IFg==",
       "dependencies": {
-        "web3-core": "1.10.2",
-        "web3-core-method": "1.10.2",
-        "web3-utils": "1.10.2"
+        "web3-core": "1.10.3",
+        "web3-core-method": "1.10.3",
+        "web3-utils": "1.10.3"
       },
       "engines": {
         "node": ">=8.0.0"
@@ -17135,14 +17135,14 @@
       }
     },
     "node_modules/web3-providers-http": {
-      "version": "1.10.2",
-      "resolved": "https://registry.npmjs.org/web3-providers-http/-/web3-providers-http-1.10.2.tgz",
-      "integrity": "sha512-G8abKtpkyKGpRVKvfjIF3I4O/epHP7mxXWN8mNMQLkQj1cjMFiZBZ13f+qI77lNJN7QOf6+LtNdKrhsTGU72TA==",
+      "version": "1.10.3",
+      "resolved": "https://registry.npmjs.org/web3-providers-http/-/web3-providers-http-1.10.3.tgz",
+      "integrity": "sha512-6dAgsHR3MxJ0Qyu3QLFlQEelTapVfWNTu5F45FYh8t7Y03T1/o+YAkVxsbY5AdmD+y5bXG/XPJ4q8tjL6MgZHw==",
       "dependencies": {
         "abortcontroller-polyfill": "^1.7.5",
         "cross-fetch": "^4.0.0",
         "es6-promise": "^4.2.8",
-        "web3-core-helpers": "1.10.2"
+        "web3-core-helpers": "1.10.3"
       },
       "engines": {
         "node": ">=8.0.0"
@@ -17157,24 +17157,24 @@
       }
     },
     "node_modules/web3-providers-ipc": {
-      "version": "1.10.2",
-      "resolved": "https://registry.npmjs.org/web3-providers-ipc/-/web3-providers-ipc-1.10.2.tgz",
-      "integrity": "sha512-lWbn6c+SgvhLymU8u4Ea/WOVC0Gqs7OJUvauejWz+iLycxeF0xFNyXnHVAi42ZJDPVI3vnfZotafoxcNNL7Sug==",
+      "version": "1.10.3",
+      "resolved": "https://registry.npmjs.org/web3-providers-ipc/-/web3-providers-ipc-1.10.3.tgz",
+      "integrity": "sha512-vP5WIGT8FLnGRfswTxNs9rMfS1vCbMezj/zHbBe/zB9GauBRTYVrUo2H/hVrhLg8Ut7AbsKZ+tCJ4mAwpKi2hA==",
       "dependencies": {
         "oboe": "2.1.5",
-        "web3-core-helpers": "1.10.2"
+        "web3-core-helpers": "1.10.3"
       },
       "engines": {
         "node": ">=8.0.0"
       }
     },
     "node_modules/web3-providers-ws": {
-      "version": "1.10.2",
-      "resolved": "https://registry.npmjs.org/web3-providers-ws/-/web3-providers-ws-1.10.2.tgz",
-      "integrity": "sha512-3nYSiP6grI5GvpkSoehctSywfCTodU21VY8bUtXyFHK/IVfDooNtMpd5lVIMvXVAlaxwwrCfjebokaJtKH2Iag==",
+      "version": "1.10.3",
+      "resolved": "https://registry.npmjs.org/web3-providers-ws/-/web3-providers-ws-1.10.3.tgz",
+      "integrity": "sha512-/filBXRl48INxsh6AuCcsy4v5ndnTZ/p6bl67kmO9aK1wffv7CT++DrtclDtVMeDGCgB3van+hEf9xTAVXur7Q==",
       "dependencies": {
         "eventemitter3": "4.0.4",
-        "web3-core-helpers": "1.10.2",
+        "web3-core-helpers": "1.10.3",
         "websocket": "^1.0.32"
       },
       "engines": {
@@ -17182,24 +17182,24 @@
       }
     },
     "node_modules/web3-shh": {
-      "version": "1.10.2",
-      "resolved": "https://registry.npmjs.org/web3-shh/-/web3-shh-1.10.2.tgz",
-      "integrity": "sha512-UP0Kc3pHv9uULFu0+LOVfPwKBSJ6B+sJ5KflF7NyBk6TvNRxlpF3hUhuaVDCjjB/dDUR6T0EQeg25FA2uzJbag==",
+      "version": "1.10.3",
+      "resolved": "https://registry.npmjs.org/web3-shh/-/web3-shh-1.10.3.tgz",
+      "integrity": "sha512-cAZ60CPvs9azdwMSQ/PSUdyV4PEtaW5edAZhu3rCXf6XxQRliBboic+AvwUvB6j3eswY50VGa5FygfVmJ1JVng==",
       "hasInstallScript": true,
       "dependencies": {
-        "web3-core": "1.10.2",
-        "web3-core-method": "1.10.2",
-        "web3-core-subscriptions": "1.10.2",
-        "web3-net": "1.10.2"
+        "web3-core": "1.10.3",
+        "web3-core-method": "1.10.3",
+        "web3-core-subscriptions": "1.10.3",
+        "web3-net": "1.10.3"
       },
       "engines": {
         "node": ">=8.0.0"
       }
     },
     "node_modules/web3-utils": {
-      "version": "1.10.2",
-      "resolved": "https://registry.npmjs.org/web3-utils/-/web3-utils-1.10.2.tgz",
-      "integrity": "sha512-TdApdzdse5YR+5GCX/b/vQnhhbj1KSAtfrDtRW7YS0kcWp1gkJsN62gw6GzCaNTeXookB7UrLtmDUuMv65qgow==",
+      "version": "1.10.3",
+      "resolved": "https://registry.npmjs.org/web3-utils/-/web3-utils-1.10.3.tgz",
+      "integrity": "sha512-OqcUrEE16fDBbGoQtZXWdavsPzbGIDc5v3VrRTZ0XrIpefC/viZ1ZU9bGEemazyS0catk/3rkOOxpzTfY+XsyQ==",
       "dependencies": {
         "@ethereumjs/util": "^8.1.0",
         "bn.js": "^5.2.1",
@@ -19222,12 +19222,12 @@
       "dev": true
     },
     "@ethereumjs/common": {
-      "version": "2.5.0",
-      "resolved": "https://registry.npmjs.org/@ethereumjs/common/-/common-2.5.0.tgz",
-      "integrity": "sha512-DEHjW6e38o+JmB/NO3GZBpW4lpaiBpkFgXF6jLcJ6gETBYpEyaA5nTimsWBUJR3Vmtm/didUEbNjajskugZORg==",
+      "version": "2.6.5",
+      "resolved": "https://registry.npmjs.org/@ethereumjs/common/-/common-2.6.5.tgz",
+      "integrity": "sha512-lRyVQOeCDaIVtgfbowla32pzeDv2Obr8oR8Put5RdUBNRGr1VGPGQNGP6elWIpgK3YdpzqTOh4GyUGOureVeeA==",
       "requires": {
         "crc-32": "^1.2.0",
-        "ethereumjs-util": "^7.1.1"
+        "ethereumjs-util": "^7.1.5"
       }
     },
     "@ethereumjs/rlp": {
@@ -19236,12 +19236,12 @@
       "integrity": "sha512-tqsQiBQDQdmPWE1xkkBq4rlSW5QZpLOUJ5RJh2/9fug+q9tnUhuZoVLk7s0scUIKTOzEtR72DFBXI4WiZcMpvw=="
     },
     "@ethereumjs/tx": {
-      "version": "3.3.2",
-      "resolved": "https://registry.npmjs.org/@ethereumjs/tx/-/tx-3.3.2.tgz",
-      "integrity": "sha512-6AaJhwg4ucmwTvw/1qLaZUX5miWrwZ4nLOUsKyb/HtzS3BMw/CasKhdi1ims9mBKeK9sOJCH4qGKOBGyJCeeog==",
+      "version": "3.5.2",
+      "resolved": "https://registry.npmjs.org/@ethereumjs/tx/-/tx-3.5.2.tgz",
+      "integrity": "sha512-gQDNJWKrSDGu2w7w0PzVXVBNMzb7wwdDOmOqczmhNjqFxFuIbhVJDwiGEnxFNC2/b8ifcZzY7MLcluizohRzNw==",
       "requires": {
-        "@ethereumjs/common": "^2.5.0",
-        "ethereumjs-util": "^7.1.2"
+        "@ethereumjs/common": "^2.6.4",
+        "ethereumjs-util": "^7.1.5"
       }
     },
     "@ethereumjs/util": {
@@ -20281,9 +20281,9 @@
       }
     },
     "@types/http-cache-semantics": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/@types/http-cache-semantics/-/http-cache-semantics-4.0.2.tgz",
-      "integrity": "sha512-FD+nQWA2zJjh4L9+pFXqWOi0Hs1ryBCfI+985NjluQ1p8EYtoLvjLOKidXBtZ4/IcxDX4o8/E8qDS3540tNliw=="
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/@types/http-cache-semantics/-/http-cache-semantics-4.0.3.tgz",
+      "integrity": "sha512-V46MYLFp08Wf2mmaBhvgjStM3tPa+2GAdy/iqoX+noX1//zje2x4XmrIU0cAwyClATsTmahbtoQ2EwP7I5WSiA=="
     },
     "@types/istanbul-lib-coverage": {
       "version": "2.0.4",
@@ -20354,9 +20354,9 @@
       }
     },
     "@types/responselike": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/@types/responselike/-/responselike-1.0.1.tgz",
-      "integrity": "sha512-TiGnitEDxj2X0j+98Eqk5lv/Cij8oHd32bU4D/Yw6AOq7vvTk0gSD2GPj0G/HkvhMoVsdlhYF4yqqlyPBTM6Sg==",
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/@types/responselike/-/responselike-1.0.2.tgz",
+      "integrity": "sha512-/4YQT5Kp6HxUDb4yhRkm0bJ7TbjvTddqX7PZ5hz6qV3pxSo72f/6YPRo+Mu2DU307tm9IioO69l7uAwn5XNcFA==",
       "requires": {
         "@types/node": "*"
       }
@@ -24009,9 +24009,9 @@
       },
       "dependencies": {
         "@types/bn.js": {
-          "version": "5.1.2",
-          "resolved": "https://registry.npmjs.org/@types/bn.js/-/bn.js-5.1.2.tgz",
-          "integrity": "sha512-dkpZu0szUtn9UXTmw+e0AJFd4D2XAxDnsCLdc05SfqpqzPEBft8eQr8uaFitfo/dUUOZERaLec2hHMG87A4Dxg==",
+          "version": "5.1.3",
+          "resolved": "https://registry.npmjs.org/@types/bn.js/-/bn.js-5.1.3.tgz",
+          "integrity": "sha512-wT1B4iIO82ecXkdN6waCK8Ou7E71WU+mP1osDA5Q8c6Ur+ozU2vIKUIhSpUr6uE5L2YHocKS1Z2jG2fBC1YVeg==",
           "requires": {
             "@types/node": "*"
           }
@@ -26877,9 +26877,9 @@
       }
     },
     "keyv": {
-      "version": "4.5.3",
-      "resolved": "https://registry.npmjs.org/keyv/-/keyv-4.5.3.tgz",
-      "integrity": "sha512-QCiSav9WaX1PgETJ+SpNnx2PRRapJ/oRSXM4VO5OGYGSjrxbKPVFVhB3l2OCbLCk329N8qyAtsJjSjvVBWzEug==",
+      "version": "4.5.4",
+      "resolved": "https://registry.npmjs.org/keyv/-/keyv-4.5.4.tgz",
+      "integrity": "sha512-oxVHkHR/EJf2CNXnWxRLW6mg7JyCCUcG0DtEGmL2ctUo1PNTin1PUil+r/+4r5MpVgC/fn1kjsx7mjSujKqIpw==",
       "requires": {
         "json-buffer": "3.0.1"
       }
@@ -30324,23 +30324,23 @@
       }
     },
     "web3": {
-      "version": "1.10.2",
-      "resolved": "https://registry.npmjs.org/web3/-/web3-1.10.2.tgz",
-      "integrity": "sha512-DAtZ3a3ruPziE80uZ3Ob0YDZxt6Vk2un/F5BcBrxO70owJ9Z1Y2+loZmbh1MoAmoLGjA/SUSHeUtid3fYmBaog==",
+      "version": "1.10.3",
+      "resolved": "https://registry.npmjs.org/web3/-/web3-1.10.3.tgz",
+      "integrity": "sha512-DgUdOOqC/gTqW+VQl1EdPxrVRPB66xVNtuZ5KD4adVBtko87hkgM8BTZ0lZ8IbUfnQk6DyjcDujMiH3oszllAw==",
       "requires": {
-        "web3-bzz": "1.10.2",
-        "web3-core": "1.10.2",
-        "web3-eth": "1.10.2",
-        "web3-eth-personal": "1.10.2",
-        "web3-net": "1.10.2",
-        "web3-shh": "1.10.2",
-        "web3-utils": "1.10.2"
+        "web3-bzz": "1.10.3",
+        "web3-core": "1.10.3",
+        "web3-eth": "1.10.3",
+        "web3-eth-personal": "1.10.3",
+        "web3-net": "1.10.3",
+        "web3-shh": "1.10.3",
+        "web3-utils": "1.10.3"
       }
     },
     "web3-bzz": {
-      "version": "1.10.2",
-      "resolved": "https://registry.npmjs.org/web3-bzz/-/web3-bzz-1.10.2.tgz",
-      "integrity": "sha512-vLOfDCj6198Qc7esDrCKeFA/M3ZLbowsaHQ0hIL4NmIHoq7lU8aSRTa5AI+JBh8cKN1gVryJsuW2ZCc5bM4I4Q==",
+      "version": "1.10.3",
+      "resolved": "https://registry.npmjs.org/web3-bzz/-/web3-bzz-1.10.3.tgz",
+      "integrity": "sha512-XDIRsTwekdBXtFytMpHBuun4cK4x0ZMIDXSoo1UVYp+oMyZj07c7gf7tNQY5qZ/sN+CJIas4ilhN25VJcjSijQ==",
       "requires": {
         "@types/node": "^12.12.6",
         "got": "12.1.0",
@@ -30355,23 +30355,23 @@
       }
     },
     "web3-core": {
-      "version": "1.10.2",
-      "resolved": "https://registry.npmjs.org/web3-core/-/web3-core-1.10.2.tgz",
-      "integrity": "sha512-qTn2UmtE8tvwMRsC5pXVdHxrQ4uZ6jiLgF5DRUVtdi7dPUmX18Dp9uxKfIfhGcA011EAn8P6+X7r3pvi2YRxBw==",
+      "version": "1.10.3",
+      "resolved": "https://registry.npmjs.org/web3-core/-/web3-core-1.10.3.tgz",
+      "integrity": "sha512-Vbk0/vUNZxJlz3RFjAhNNt7qTpX8yE3dn3uFxfX5OHbuon5u65YEOd3civ/aQNW745N0vGUlHFNxxmn+sG9DIw==",
       "requires": {
         "@types/bn.js": "^5.1.1",
         "@types/node": "^12.12.6",
         "bignumber.js": "^9.0.0",
-        "web3-core-helpers": "1.10.2",
-        "web3-core-method": "1.10.2",
-        "web3-core-requestmanager": "1.10.2",
-        "web3-utils": "1.10.2"
+        "web3-core-helpers": "1.10.3",
+        "web3-core-method": "1.10.3",
+        "web3-core-requestmanager": "1.10.3",
+        "web3-utils": "1.10.3"
       },
       "dependencies": {
         "@types/bn.js": {
-          "version": "5.1.2",
-          "resolved": "https://registry.npmjs.org/@types/bn.js/-/bn.js-5.1.2.tgz",
-          "integrity": "sha512-dkpZu0szUtn9UXTmw+e0AJFd4D2XAxDnsCLdc05SfqpqzPEBft8eQr8uaFitfo/dUUOZERaLec2hHMG87A4Dxg==",
+          "version": "5.1.3",
+          "resolved": "https://registry.npmjs.org/@types/bn.js/-/bn.js-5.1.3.tgz",
+          "integrity": "sha512-wT1B4iIO82ecXkdN6waCK8Ou7E71WU+mP1osDA5Q8c6Ur+ozU2vIKUIhSpUr6uE5L2YHocKS1Z2jG2fBC1YVeg==",
           "requires": {
             "@types/node": "*"
           }
@@ -30384,98 +30384,98 @@
       }
     },
     "web3-core-helpers": {
-      "version": "1.10.2",
-      "resolved": "https://registry.npmjs.org/web3-core-helpers/-/web3-core-helpers-1.10.2.tgz",
-      "integrity": "sha512-1JfaNtox6/ZYJHNoI+QVc2ObgwEPeGF+YdxHZQ7aF5605BmlwM1Bk3A8xv6mg64jIRvEq1xX6k9oG6x7p1WgXQ==",
+      "version": "1.10.3",
+      "resolved": "https://registry.npmjs.org/web3-core-helpers/-/web3-core-helpers-1.10.3.tgz",
+      "integrity": "sha512-Yv7dQC3B9ipOc5sWm3VAz1ys70Izfzb8n9rSiQYIPjpqtJM+3V4EeK6ghzNR6CO2es0+Yu9CtCkw0h8gQhrTxA==",
       "requires": {
-        "web3-eth-iban": "1.10.2",
-        "web3-utils": "1.10.2"
+        "web3-eth-iban": "1.10.3",
+        "web3-utils": "1.10.3"
       }
     },
     "web3-core-method": {
-      "version": "1.10.2",
-      "resolved": "https://registry.npmjs.org/web3-core-method/-/web3-core-method-1.10.2.tgz",
-      "integrity": "sha512-gG6ES+LOuo01MJHML4gnEt702M8lcPGMYZoX8UjZzmEebGrPYOY9XccpCrsFgCeKgQzM12SVnlwwpMod1+lcLg==",
+      "version": "1.10.3",
+      "resolved": "https://registry.npmjs.org/web3-core-method/-/web3-core-method-1.10.3.tgz",
+      "integrity": "sha512-VZ/Dmml4NBmb0ep5PTSg9oqKoBtG0/YoMPei/bq/tUdlhB2dMB79sbeJPwx592uaV0Vpk7VltrrrBv5hTM1y4Q==",
       "requires": {
         "@ethersproject/transactions": "^5.6.2",
-        "web3-core-helpers": "1.10.2",
-        "web3-core-promievent": "1.10.2",
-        "web3-core-subscriptions": "1.10.2",
-        "web3-utils": "1.10.2"
+        "web3-core-helpers": "1.10.3",
+        "web3-core-promievent": "1.10.3",
+        "web3-core-subscriptions": "1.10.3",
+        "web3-utils": "1.10.3"
       }
     },
     "web3-core-promievent": {
-      "version": "1.10.2",
-      "resolved": "https://registry.npmjs.org/web3-core-promievent/-/web3-core-promievent-1.10.2.tgz",
-      "integrity": "sha512-Qkkb1dCDOU8dZeORkcwJBQRAX+mdsjx8LqFBB+P4W9QgwMqyJ6LXda+y1XgyeEVeKEmY1RCeTq9Y94q1v62Sfw==",
+      "version": "1.10.3",
+      "resolved": "https://registry.npmjs.org/web3-core-promievent/-/web3-core-promievent-1.10.3.tgz",
+      "integrity": "sha512-HgjY+TkuLm5uTwUtaAfkTgRx/NzMxvVradCi02gy17NxDVdg/p6svBHcp037vcNpkuGeFznFJgULP+s2hdVgUQ==",
       "requires": {
         "eventemitter3": "4.0.4"
       }
     },
     "web3-core-requestmanager": {
-      "version": "1.10.2",
-      "resolved": "https://registry.npmjs.org/web3-core-requestmanager/-/web3-core-requestmanager-1.10.2.tgz",
-      "integrity": "sha512-nlLeNJUu6fR+ZbJr2k9Du/nN3VWwB4AJPY4r6nxUODAmykgJq57T21cLP/BEk6mbiFQYGE9TrrPhh4qWxQEtAw==",
+      "version": "1.10.3",
+      "resolved": "https://registry.npmjs.org/web3-core-requestmanager/-/web3-core-requestmanager-1.10.3.tgz",
+      "integrity": "sha512-VT9sKJfgM2yBOIxOXeXiDuFMP4pxzF6FT+y8KTLqhDFHkbG3XRe42Vm97mB/IvLQCJOmokEjl3ps8yP1kbggyw==",
       "requires": {
         "util": "^0.12.5",
-        "web3-core-helpers": "1.10.2",
-        "web3-providers-http": "1.10.2",
-        "web3-providers-ipc": "1.10.2",
-        "web3-providers-ws": "1.10.2"
+        "web3-core-helpers": "1.10.3",
+        "web3-providers-http": "1.10.3",
+        "web3-providers-ipc": "1.10.3",
+        "web3-providers-ws": "1.10.3"
       }
     },
     "web3-core-subscriptions": {
-      "version": "1.10.2",
-      "resolved": "https://registry.npmjs.org/web3-core-subscriptions/-/web3-core-subscriptions-1.10.2.tgz",
-      "integrity": "sha512-MiWcKjz4tco793EPPPLc/YOJmYUV3zAfxeQH/UVTfBejMfnNvmfwKa2SBKfPIvKQHz/xI5bV2TF15uvJEucU7w==",
+      "version": "1.10.3",
+      "resolved": "https://registry.npmjs.org/web3-core-subscriptions/-/web3-core-subscriptions-1.10.3.tgz",
+      "integrity": "sha512-KW0Mc8sgn70WadZu7RjQ4H5sNDJ5Lx8JMI3BWos+f2rW0foegOCyWhRu33W1s6ntXnqeBUw5rRCXZRlA3z+HNA==",
       "requires": {
         "eventemitter3": "4.0.4",
-        "web3-core-helpers": "1.10.2"
+        "web3-core-helpers": "1.10.3"
       }
     },
     "web3-eth": {
-      "version": "1.10.2",
-      "resolved": "https://registry.npmjs.org/web3-eth/-/web3-eth-1.10.2.tgz",
-      "integrity": "sha512-s38rhrntyhGShmXC4R/aQtfkpcmev9c7iZwgb9CDIBFo7K8nrEJvqIOyajeZTxnDIiGzTJmrHxiKSadii5qTRg==",
-      "requires": {
-        "web3-core": "1.10.2",
-        "web3-core-helpers": "1.10.2",
-        "web3-core-method": "1.10.2",
-        "web3-core-subscriptions": "1.10.2",
-        "web3-eth-abi": "1.10.2",
-        "web3-eth-accounts": "1.10.2",
-        "web3-eth-contract": "1.10.2",
-        "web3-eth-ens": "1.10.2",
-        "web3-eth-iban": "1.10.2",
-        "web3-eth-personal": "1.10.2",
-        "web3-net": "1.10.2",
-        "web3-utils": "1.10.2"
+      "version": "1.10.3",
+      "resolved": "https://registry.npmjs.org/web3-eth/-/web3-eth-1.10.3.tgz",
+      "integrity": "sha512-Uk1U2qGiif2mIG8iKu23/EQJ2ksB1BQXy3wF3RvFuyxt8Ft9OEpmGlO7wOtAyJdoKzD5vcul19bJpPcWSAYZhA==",
+      "requires": {
+        "web3-core": "1.10.3",
+        "web3-core-helpers": "1.10.3",
+        "web3-core-method": "1.10.3",
+        "web3-core-subscriptions": "1.10.3",
+        "web3-eth-abi": "1.10.3",
+        "web3-eth-accounts": "1.10.3",
+        "web3-eth-contract": "1.10.3",
+        "web3-eth-ens": "1.10.3",
+        "web3-eth-iban": "1.10.3",
+        "web3-eth-personal": "1.10.3",
+        "web3-net": "1.10.3",
+        "web3-utils": "1.10.3"
       }
     },
     "web3-eth-abi": {
-      "version": "1.10.2",
-      "resolved": "https://registry.npmjs.org/web3-eth-abi/-/web3-eth-abi-1.10.2.tgz",
-      "integrity": "sha512-pY4fQUio7W7ZRSLf+vsYkaxJqaT/jHcALZjIxy+uBQaYAJ3t6zpQqMZkJB3Dw7HUODRJ1yI0NPEFGTnkYf/17A==",
+      "version": "1.10.3",
+      "resolved": "https://registry.npmjs.org/web3-eth-abi/-/web3-eth-abi-1.10.3.tgz",
+      "integrity": "sha512-O8EvV67uhq0OiCMekqYsDtb6FzfYzMXT7VMHowF8HV6qLZXCGTdB/NH4nJrEh2mFtEwVdS6AmLFJAQd2kVyoMQ==",
       "requires": {
         "@ethersproject/abi": "^5.6.3",
-        "web3-utils": "1.10.2"
+        "web3-utils": "1.10.3"
       }
     },
     "web3-eth-accounts": {
-      "version": "1.10.2",
-      "resolved": "https://registry.npmjs.org/web3-eth-accounts/-/web3-eth-accounts-1.10.2.tgz",
-      "integrity": "sha512-6/HhCBYAXN/f553/SyxS9gY62NbLgpD1zJpENcvRTDpJN3Znvli1cmpl5Q3ZIUJkvHnG//48EWfWh0cbb3fbKQ==",
+      "version": "1.10.3",
+      "resolved": "https://registry.npmjs.org/web3-eth-accounts/-/web3-eth-accounts-1.10.3.tgz",
+      "integrity": "sha512-8MipGgwusDVgn7NwKOmpeo3gxzzd+SmwcWeBdpXknuyDiZSQy9tXe+E9LeFGrmys/8mLLYP79n3jSbiTyv+6pQ==",
       "requires": {
-        "@ethereumjs/common": "2.5.0",
-        "@ethereumjs/tx": "3.3.2",
+        "@ethereumjs/common": "2.6.5",
+        "@ethereumjs/tx": "3.5.2",
         "@ethereumjs/util": "^8.1.0",
         "eth-lib": "0.2.8",
         "scrypt-js": "^3.0.1",
         "uuid": "^9.0.0",
-        "web3-core": "1.10.2",
-        "web3-core-helpers": "1.10.2",
-        "web3-core-method": "1.10.2",
-        "web3-utils": "1.10.2"
+        "web3-core": "1.10.3",
+        "web3-core-helpers": "1.10.3",
+        "web3-core-method": "1.10.3",
+        "web3-utils": "1.10.3"
       },
       "dependencies": {
         "bn.js": {
@@ -30501,24 +30501,24 @@
       }
     },
     "web3-eth-contract": {
-      "version": "1.10.2",
-      "resolved": "https://registry.npmjs.org/web3-eth-contract/-/web3-eth-contract-1.10.2.tgz",
-      "integrity": "sha512-CZLKPQRmupP/+OZ5A/CBwWWkBiz5B/foOpARz0upMh1yjb0dEud4YzRW2gJaeNu0eGxDLsWVaXhUimJVGYprQw==",
+      "version": "1.10.3",
+      "resolved": "https://registry.npmjs.org/web3-eth-contract/-/web3-eth-contract-1.10.3.tgz",
+      "integrity": "sha512-Y2CW61dCCyY4IoUMD4JsEQWrILX4FJWDWC/Txx/pr3K/+fGsBGvS9kWQN5EsVXOp4g7HoFOfVh9Lf7BmVVSRmg==",
       "requires": {
         "@types/bn.js": "^5.1.1",
-        "web3-core": "1.10.2",
-        "web3-core-helpers": "1.10.2",
-        "web3-core-method": "1.10.2",
-        "web3-core-promievent": "1.10.2",
-        "web3-core-subscriptions": "1.10.2",
-        "web3-eth-abi": "1.10.2",
-        "web3-utils": "1.10.2"
+        "web3-core": "1.10.3",
+        "web3-core-helpers": "1.10.3",
+        "web3-core-method": "1.10.3",
+        "web3-core-promievent": "1.10.3",
+        "web3-core-subscriptions": "1.10.3",
+        "web3-eth-abi": "1.10.3",
+        "web3-utils": "1.10.3"
       },
       "dependencies": {
         "@types/bn.js": {
-          "version": "5.1.2",
-          "resolved": "https://registry.npmjs.org/@types/bn.js/-/bn.js-5.1.2.tgz",
-          "integrity": "sha512-dkpZu0szUtn9UXTmw+e0AJFd4D2XAxDnsCLdc05SfqpqzPEBft8eQr8uaFitfo/dUUOZERaLec2hHMG87A4Dxg==",
+          "version": "5.1.3",
+          "resolved": "https://registry.npmjs.org/@types/bn.js/-/bn.js-5.1.3.tgz",
+          "integrity": "sha512-wT1B4iIO82ecXkdN6waCK8Ou7E71WU+mP1osDA5Q8c6Ur+ozU2vIKUIhSpUr6uE5L2YHocKS1Z2jG2fBC1YVeg==",
           "requires": {
             "@types/node": "*"
           }
@@ -30526,40 +30526,40 @@
       }
     },
     "web3-eth-ens": {
-      "version": "1.10.2",
-      "resolved": "https://registry.npmjs.org/web3-eth-ens/-/web3-eth-ens-1.10.2.tgz",
-      "integrity": "sha512-kTQ42UdNHy4BQJHgWe97bHNMkc3zCMBKKY7t636XOMxdI/lkRdIjdE5nQzt97VjQvSVasgIWYKRAtd8aRaiZiQ==",
+      "version": "1.10.3",
+      "resolved": "https://registry.npmjs.org/web3-eth-ens/-/web3-eth-ens-1.10.3.tgz",
+      "integrity": "sha512-hR+odRDXGqKemw1GFniKBEXpjYwLgttTES+bc7BfTeoUyUZXbyDHe5ifC+h+vpzxh4oS0TnfcIoarK0Z9tFSiQ==",
       "requires": {
         "content-hash": "^2.5.2",
         "eth-ens-namehash": "2.0.8",
-        "web3-core": "1.10.2",
-        "web3-core-helpers": "1.10.2",
-        "web3-core-promievent": "1.10.2",
-        "web3-eth-abi": "1.10.2",
-        "web3-eth-contract": "1.10.2",
-        "web3-utils": "1.10.2"
+        "web3-core": "1.10.3",
+        "web3-core-helpers": "1.10.3",
+        "web3-core-promievent": "1.10.3",
+        "web3-eth-abi": "1.10.3",
+        "web3-eth-contract": "1.10.3",
+        "web3-utils": "1.10.3"
       }
     },
     "web3-eth-iban": {
-      "version": "1.10.2",
-      "resolved": "https://registry.npmjs.org/web3-eth-iban/-/web3-eth-iban-1.10.2.tgz",
-      "integrity": "sha512-y8+Ii2XXdyHQMFNL2NWpBnXe+TVJ4ryvPlzNhObRRnIo4O4nLIXS010olLDMayozDzoUlmzCmBZJYc9Eev1g7A==",
+      "version": "1.10.3",
+      "resolved": "https://registry.npmjs.org/web3-eth-iban/-/web3-eth-iban-1.10.3.tgz",
+      "integrity": "sha512-ZCfOjYKAjaX2TGI8uif5ah+J3BYFuo+47JOIV1RIz2l7kD9VfnxvRH5UiQDRyMALQC7KFd2hUqIEtHklapNyKA==",
       "requires": {
         "bn.js": "^5.2.1",
-        "web3-utils": "1.10.2"
+        "web3-utils": "1.10.3"
       }
     },
     "web3-eth-personal": {
-      "version": "1.10.2",
-      "resolved": "https://registry.npmjs.org/web3-eth-personal/-/web3-eth-personal-1.10.2.tgz",
-      "integrity": "sha512-+vEbJsPUJc5J683y0c2aN645vXC+gPVlFVCQu4IjPvXzJrAtUfz26+IZ6AUOth4fDJPT0f1uSLS5W2yrUdw9BQ==",
+      "version": "1.10.3",
+      "resolved": "https://registry.npmjs.org/web3-eth-personal/-/web3-eth-personal-1.10.3.tgz",
+      "integrity": "sha512-avrQ6yWdADIvuNQcFZXmGLCEzulQa76hUOuVywN7O3cklB4nFc/Gp3yTvD3bOAaE7DhjLQfhUTCzXL7WMxVTsw==",
       "requires": {
         "@types/node": "^12.12.6",
-        "web3-core": "1.10.2",
-        "web3-core-helpers": "1.10.2",
-        "web3-core-method": "1.10.2",
-        "web3-net": "1.10.2",
-        "web3-utils": "1.10.2"
+        "web3-core": "1.10.3",
+        "web3-core-helpers": "1.10.3",
+        "web3-core-method": "1.10.3",
+        "web3-net": "1.10.3",
+        "web3-utils": "1.10.3"
       },
       "dependencies": {
         "@types/node": {
@@ -30570,13 +30570,13 @@
       }
     },
     "web3-net": {
-      "version": "1.10.2",
-      "resolved": "https://registry.npmjs.org/web3-net/-/web3-net-1.10.2.tgz",
-      "integrity": "sha512-w9i1t2z7dItagfskhaCKwpp6W3ylUR88gs68u820y5f8yfK5EbPmHc6c2lD8X9ZrTnmDoeOpIRCN/RFPtZCp+g==",
+      "version": "1.10.3",
+      "resolved": "https://registry.npmjs.org/web3-net/-/web3-net-1.10.3.tgz",
+      "integrity": "sha512-IoSr33235qVoI1vtKssPUigJU9Fc/Ph0T9CgRi15sx+itysmvtlmXMNoyd6Xrgm9LuM4CIhxz7yDzH93B79IFg==",
       "requires": {
-        "web3-core": "1.10.2",
-        "web3-core-method": "1.10.2",
-        "web3-utils": "1.10.2"
+        "web3-core": "1.10.3",
+        "web3-core-method": "1.10.3",
+        "web3-utils": "1.10.3"
       }
     },
     "web3-provider-engine": {
@@ -30660,14 +30660,14 @@
       }
     },
     "web3-providers-http": {
-      "version": "1.10.2",
-      "resolved": "https://registry.npmjs.org/web3-providers-http/-/web3-providers-http-1.10.2.tgz",
-      "integrity": "sha512-G8abKtpkyKGpRVKvfjIF3I4O/epHP7mxXWN8mNMQLkQj1cjMFiZBZ13f+qI77lNJN7QOf6+LtNdKrhsTGU72TA==",
+      "version": "1.10.3",
+      "resolved": "https://registry.npmjs.org/web3-providers-http/-/web3-providers-http-1.10.3.tgz",
+      "integrity": "sha512-6dAgsHR3MxJ0Qyu3QLFlQEelTapVfWNTu5F45FYh8t7Y03T1/o+YAkVxsbY5AdmD+y5bXG/XPJ4q8tjL6MgZHw==",
       "requires": {
         "abortcontroller-polyfill": "^1.7.5",
         "cross-fetch": "^4.0.0",
         "es6-promise": "^4.2.8",
-        "web3-core-helpers": "1.10.2"
+        "web3-core-helpers": "1.10.3"
       },
       "dependencies": {
         "cross-fetch": {
@@ -30681,39 +30681,39 @@
       }
     },
     "web3-providers-ipc": {
-      "version": "1.10.2",
-      "resolved": "https://registry.npmjs.org/web3-providers-ipc/-/web3-providers-ipc-1.10.2.tgz",
-      "integrity": "sha512-lWbn6c+SgvhLymU8u4Ea/WOVC0Gqs7OJUvauejWz+iLycxeF0xFNyXnHVAi42ZJDPVI3vnfZotafoxcNNL7Sug==",
+      "version": "1.10.3",
+      "resolved": "https://registry.npmjs.org/web3-providers-ipc/-/web3-providers-ipc-1.10.3.tgz",
+      "integrity": "sha512-vP5WIGT8FLnGRfswTxNs9rMfS1vCbMezj/zHbBe/zB9GauBRTYVrUo2H/hVrhLg8Ut7AbsKZ+tCJ4mAwpKi2hA==",
       "requires": {
         "oboe": "2.1.5",
-        "web3-core-helpers": "1.10.2"
+        "web3-core-helpers": "1.10.3"
       }
     },
     "web3-providers-ws": {
-      "version": "1.10.2",
-      "resolved": "https://registry.npmjs.org/web3-providers-ws/-/web3-providers-ws-1.10.2.tgz",
-      "integrity": "sha512-3nYSiP6grI5GvpkSoehctSywfCTodU21VY8bUtXyFHK/IVfDooNtMpd5lVIMvXVAlaxwwrCfjebokaJtKH2Iag==",
+      "version": "1.10.3",
+      "resolved": "https://registry.npmjs.org/web3-providers-ws/-/web3-providers-ws-1.10.3.tgz",
+      "integrity": "sha512-/filBXRl48INxsh6AuCcsy4v5ndnTZ/p6bl67kmO9aK1wffv7CT++DrtclDtVMeDGCgB3van+hEf9xTAVXur7Q==",
       "requires": {
         "eventemitter3": "4.0.4",
-        "web3-core-helpers": "1.10.2",
+        "web3-core-helpers": "1.10.3",
         "websocket": "^1.0.32"
       }
     },
     "web3-shh": {
-      "version": "1.10.2",
-      "resolved": "https://registry.npmjs.org/web3-shh/-/web3-shh-1.10.2.tgz",
-      "integrity": "sha512-UP0Kc3pHv9uULFu0+LOVfPwKBSJ6B+sJ5KflF7NyBk6TvNRxlpF3hUhuaVDCjjB/dDUR6T0EQeg25FA2uzJbag==",
+      "version": "1.10.3",
+      "resolved": "https://registry.npmjs.org/web3-shh/-/web3-shh-1.10.3.tgz",
+      "integrity": "sha512-cAZ60CPvs9azdwMSQ/PSUdyV4PEtaW5edAZhu3rCXf6XxQRliBboic+AvwUvB6j3eswY50VGa5FygfVmJ1JVng==",
       "requires": {
-        "web3-core": "1.10.2",
-        "web3-core-method": "1.10.2",
-        "web3-core-subscriptions": "1.10.2",
-        "web3-net": "1.10.2"
+        "web3-core": "1.10.3",
+        "web3-core-method": "1.10.3",
+        "web3-core-subscriptions": "1.10.3",
+        "web3-net": "1.10.3"
       }
     },
     "web3-utils": {
-      "version": "1.10.2",
-      "resolved": "https://registry.npmjs.org/web3-utils/-/web3-utils-1.10.2.tgz",
-      "integrity": "sha512-TdApdzdse5YR+5GCX/b/vQnhhbj1KSAtfrDtRW7YS0kcWp1gkJsN62gw6GzCaNTeXookB7UrLtmDUuMv65qgow==",
+      "version": "1.10.3",
+      "resolved": "https://registry.npmjs.org/web3-utils/-/web3-utils-1.10.3.tgz",
+      "integrity": "sha512-OqcUrEE16fDBbGoQtZXWdavsPzbGIDc5v3VrRTZ0XrIpefC/viZ1ZU9bGEemazyS0catk/3rkOOxpzTfY+XsyQ==",
       "requires": {
         "@ethereumjs/util": "^8.1.0",
         "bn.js": "^5.2.1",
diff --git a/apps/block_scout_web/assets/package.json b/apps/block_scout_web/assets/package.json
index dac5208241d7..334b1c775e03 100644
--- a/apps/block_scout_web/assets/package.json
+++ b/apps/block_scout_web/assets/package.json
@@ -78,7 +78,7 @@
     "url": "^0.11.3",
     "util": "^0.12.5",
     "viewerjs": "^1.11.6",
-    "web3": "^1.10.2",
+    "web3": "^1.10.3",
     "web3modal": "^1.9.12",
     "xss": "^1.0.14"
   },

From d257e2ddc34b7f6abd143158b41ef14920351039 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 23 Oct 2023 18:29:14 +0000
Subject: [PATCH 524/909] Bump core-js from 3.33.0 to 3.33.1 in
 /apps/block_scout_web/assets

Bumps [core-js](https://github.com/zloirock/core-js/tree/HEAD/packages/core-js) from 3.33.0 to 3.33.1.
- [Release notes](https://github.com/zloirock/core-js/releases)
- [Changelog](https://github.com/zloirock/core-js/blob/master/CHANGELOG.md)
- [Commits](https://github.com/zloirock/core-js/commits/v3.33.1/packages/core-js)

---
updated-dependencies:
- dependency-name: core-js
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 apps/block_scout_web/assets/package-lock.json | 14 +++++++-------
 apps/block_scout_web/assets/package.json      |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/apps/block_scout_web/assets/package-lock.json b/apps/block_scout_web/assets/package-lock.json
index 680f70a76f57..b73b616bbb58 100644
--- a/apps/block_scout_web/assets/package-lock.json
+++ b/apps/block_scout_web/assets/package-lock.json
@@ -17,7 +17,7 @@
         "chart.js": "^4.4.0",
         "chartjs-adapter-luxon": "^1.3.1",
         "clipboard": "^2.0.11",
-        "core-js": "^3.33.0",
+        "core-js": "^3.33.1",
         "crypto-browserify": "^3.12.0",
         "dropzone": "^5.9.3",
         "eth-net-props": "^1.0.41",
@@ -5910,9 +5910,9 @@
       }
     },
     "node_modules/core-js": {
-      "version": "3.33.0",
-      "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.33.0.tgz",
-      "integrity": "sha512-HoZr92+ZjFEKar5HS6MC776gYslNOKHt75mEBKWKnPeFDpZ6nH5OeF3S6HFT1mUAUZKrzkez05VboaX8myjSuw==",
+      "version": "3.33.1",
+      "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.33.1.tgz",
+      "integrity": "sha512-qVSq3s+d4+GsqN0teRCJtM6tdEEXyWxjzbhVrCHmBS5ZTM0FS2MOS0D13dUXAWDUN6a+lHI/N1hF9Ytz6iLl9Q==",
       "hasInstallScript": true,
       "funding": {
         "type": "opencollective",
@@ -22133,9 +22133,9 @@
       }
     },
     "core-js": {
-      "version": "3.33.0",
-      "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.33.0.tgz",
-      "integrity": "sha512-HoZr92+ZjFEKar5HS6MC776gYslNOKHt75mEBKWKnPeFDpZ6nH5OeF3S6HFT1mUAUZKrzkez05VboaX8myjSuw=="
+      "version": "3.33.1",
+      "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.33.1.tgz",
+      "integrity": "sha512-qVSq3s+d4+GsqN0teRCJtM6tdEEXyWxjzbhVrCHmBS5ZTM0FS2MOS0D13dUXAWDUN6a+lHI/N1hF9Ytz6iLl9Q=="
     },
     "core-js-compat": {
       "version": "3.33.0",
diff --git a/apps/block_scout_web/assets/package.json b/apps/block_scout_web/assets/package.json
index dac5208241d7..0f3fc10cd6a5 100644
--- a/apps/block_scout_web/assets/package.json
+++ b/apps/block_scout_web/assets/package.json
@@ -29,7 +29,7 @@
     "chart.js": "^4.4.0",
     "chartjs-adapter-luxon": "^1.3.1",
     "clipboard": "^2.0.11",
-    "core-js": "^3.33.0",
+    "core-js": "^3.33.1",
     "crypto-browserify": "^3.12.0",
     "dropzone": "^5.9.3",
     "eth-net-props": "^1.0.41",

From 39b29d7e19384724e9c78bb60ff4ed571805486d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 23 Oct 2023 18:29:48 +0000
Subject: [PATCH 525/909] Bump eslint from 8.51.0 to 8.52.0 in
 /apps/block_scout_web/assets

Bumps [eslint](https://github.com/eslint/eslint) from 8.51.0 to 8.52.0.
- [Release notes](https://github.com/eslint/eslint/releases)
- [Changelog](https://github.com/eslint/eslint/blob/main/CHANGELOG.md)
- [Commits](https://github.com/eslint/eslint/compare/v8.51.0...v8.52.0)

---
updated-dependencies:
- dependency-name: eslint
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 apps/block_scout_web/assets/package-lock.json | 76 +++++++++++--------
 apps/block_scout_web/assets/package.json      |  2 +-
 2 files changed, 46 insertions(+), 32 deletions(-)

diff --git a/apps/block_scout_web/assets/package-lock.json b/apps/block_scout_web/assets/package-lock.json
index 680f70a76f57..fb3a4fea8492 100644
--- a/apps/block_scout_web/assets/package-lock.json
+++ b/apps/block_scout_web/assets/package-lock.json
@@ -78,7 +78,7 @@
         "copy-webpack-plugin": "^11.0.0",
         "css-loader": "^6.8.1",
         "css-minimizer-webpack-plugin": "^5.0.1",
-        "eslint": "^8.51.0",
+        "eslint": "^8.52.0",
         "eslint-config-standard": "^17.1.0",
         "eslint-plugin-import": "^2.28.1",
         "eslint-plugin-node": "^11.1.0",
@@ -2106,9 +2106,9 @@
       }
     },
     "node_modules/@eslint/js": {
-      "version": "8.51.0",
-      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.51.0.tgz",
-      "integrity": "sha512-HxjQ8Qn+4SI3/AFv6sOrDB+g6PpUTDwSJiQqOrnneEk8L71161srI9gjzzZvYVbzHiVg/BvcH95+cK/zfIt4pg==",
+      "version": "8.52.0",
+      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.52.0.tgz",
+      "integrity": "sha512-mjZVbpaeMZludF2fsWLD0Z9gCref1Tk4i9+wddjRvpUNqqcndPkBD09N/Mapey0b3jaXbLm2kICwFv2E64QinA==",
       "dev": true,
       "engines": {
         "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
@@ -2551,12 +2551,12 @@
       }
     },
     "node_modules/@humanwhocodes/config-array": {
-      "version": "0.11.11",
-      "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.11.tgz",
-      "integrity": "sha512-N2brEuAadi0CcdeMXUkhbZB84eskAc8MEX1By6qEchoVywSgXPIjou4rYsl0V3Hj0ZnuGycGCjdNgockbzeWNA==",
+      "version": "0.11.13",
+      "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.13.tgz",
+      "integrity": "sha512-JSBDMiDKSzQVngfRjOdFXgFfklaXI4K9nLF49Auh21lmBWRLIK3+xTErTWD4KU54pb6coM6ESE7Awz/FNU3zgQ==",
       "dev": true,
       "dependencies": {
-        "@humanwhocodes/object-schema": "^1.2.1",
+        "@humanwhocodes/object-schema": "^2.0.1",
         "debug": "^4.1.1",
         "minimatch": "^3.0.5"
       },
@@ -2578,9 +2578,9 @@
       }
     },
     "node_modules/@humanwhocodes/object-schema": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz",
-      "integrity": "sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==",
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-2.0.1.tgz",
+      "integrity": "sha512-dvuCeX5fC9dXgJn9t+X5atfmgQAzUOWqS1254Gh0m6i8wKd10ebXkfNKiRK+1GWi/yTvvLDHpoxLr0xxxeslWw==",
       "dev": true
     },
     "node_modules/@istanbuljs/load-nyc-config": {
@@ -3719,6 +3719,12 @@
       "integrity": "sha512-iO9ZQHkZxHn4mSakYV0vFHAVDyEOIJQrV2uZ06HxEPcx+mt8swXoZHIbaaJ2crJYFfErySgktuTZ3BeLz+XmFA==",
       "dev": true
     },
+    "node_modules/@ungap/structured-clone": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/@ungap/structured-clone/-/structured-clone-1.2.0.tgz",
+      "integrity": "sha512-zuVdFrMJiuCDQUMCzQaD6KL28MjnqqN8XnAqiEq9PNm/hCPTSGfrXCOfwj1ow4LFb/tNymJPwsNbVePc1xFqrQ==",
+      "dev": true
+    },
     "node_modules/@walletconnect/browser-utils": {
       "version": "1.8.0",
       "resolved": "https://registry.npmjs.org/@walletconnect/browser-utils/-/browser-utils-1.8.0.tgz",
@@ -7266,18 +7272,19 @@
       }
     },
     "node_modules/eslint": {
-      "version": "8.51.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.51.0.tgz",
-      "integrity": "sha512-2WuxRZBrlwnXi+/vFSJyjMqrNjtJqiasMzehF0shoLaW7DzS3/9Yvrmq5JiT66+pNjiX4UBnLDiKHcWAr/OInA==",
+      "version": "8.52.0",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.52.0.tgz",
+      "integrity": "sha512-zh/JHnaixqHZsolRB/w9/02akBk9EPrOs9JwcTP2ek7yL5bVvXuRariiaAjjoJ5DvuwQ1WAE/HsMz+w17YgBCg==",
       "dev": true,
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.2.0",
         "@eslint-community/regexpp": "^4.6.1",
         "@eslint/eslintrc": "^2.1.2",
-        "@eslint/js": "8.51.0",
-        "@humanwhocodes/config-array": "^0.11.11",
+        "@eslint/js": "8.52.0",
+        "@humanwhocodes/config-array": "^0.11.13",
         "@humanwhocodes/module-importer": "^1.0.1",
         "@nodelib/fs.walk": "^1.2.8",
+        "@ungap/structured-clone": "^1.2.0",
         "ajv": "^6.12.4",
         "chalk": "^4.0.0",
         "cross-spawn": "^7.0.2",
@@ -19216,9 +19223,9 @@
       }
     },
     "@eslint/js": {
-      "version": "8.51.0",
-      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.51.0.tgz",
-      "integrity": "sha512-HxjQ8Qn+4SI3/AFv6sOrDB+g6PpUTDwSJiQqOrnneEk8L71161srI9gjzzZvYVbzHiVg/BvcH95+cK/zfIt4pg==",
+      "version": "8.52.0",
+      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.52.0.tgz",
+      "integrity": "sha512-mjZVbpaeMZludF2fsWLD0Z9gCref1Tk4i9+wddjRvpUNqqcndPkBD09N/Mapey0b3jaXbLm2kICwFv2E64QinA==",
       "dev": true
     },
     "@ethereumjs/common": {
@@ -19467,12 +19474,12 @@
       "integrity": "sha512-m5cPn3e2+FDCOgi1mz0RexTUvvQibBebOUlUlW0+YrMjDTPkiJ6VTKukA1GRsvRw+12KyJndNjj0O4AgTxm2Pg=="
     },
     "@humanwhocodes/config-array": {
-      "version": "0.11.11",
-      "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.11.tgz",
-      "integrity": "sha512-N2brEuAadi0CcdeMXUkhbZB84eskAc8MEX1By6qEchoVywSgXPIjou4rYsl0V3Hj0ZnuGycGCjdNgockbzeWNA==",
+      "version": "0.11.13",
+      "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.13.tgz",
+      "integrity": "sha512-JSBDMiDKSzQVngfRjOdFXgFfklaXI4K9nLF49Auh21lmBWRLIK3+xTErTWD4KU54pb6coM6ESE7Awz/FNU3zgQ==",
       "dev": true,
       "requires": {
-        "@humanwhocodes/object-schema": "^1.2.1",
+        "@humanwhocodes/object-schema": "^2.0.1",
         "debug": "^4.1.1",
         "minimatch": "^3.0.5"
       }
@@ -19484,9 +19491,9 @@
       "dev": true
     },
     "@humanwhocodes/object-schema": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz",
-      "integrity": "sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==",
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-2.0.1.tgz",
+      "integrity": "sha512-dvuCeX5fC9dXgJn9t+X5atfmgQAzUOWqS1254Gh0m6i8wKd10ebXkfNKiRK+1GWi/yTvvLDHpoxLr0xxxeslWw==",
       "dev": true
     },
     "@istanbuljs/load-nyc-config": {
@@ -20396,6 +20403,12 @@
       "integrity": "sha512-iO9ZQHkZxHn4mSakYV0vFHAVDyEOIJQrV2uZ06HxEPcx+mt8swXoZHIbaaJ2crJYFfErySgktuTZ3BeLz+XmFA==",
       "dev": true
     },
+    "@ungap/structured-clone": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/@ungap/structured-clone/-/structured-clone-1.2.0.tgz",
+      "integrity": "sha512-zuVdFrMJiuCDQUMCzQaD6KL28MjnqqN8XnAqiEq9PNm/hCPTSGfrXCOfwj1ow4LFb/tNymJPwsNbVePc1xFqrQ==",
+      "dev": true
+    },
     "@walletconnect/browser-utils": {
       "version": "1.8.0",
       "resolved": "https://registry.npmjs.org/@walletconnect/browser-utils/-/browser-utils-1.8.0.tgz",
@@ -23158,18 +23171,19 @@
       }
     },
     "eslint": {
-      "version": "8.51.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.51.0.tgz",
-      "integrity": "sha512-2WuxRZBrlwnXi+/vFSJyjMqrNjtJqiasMzehF0shoLaW7DzS3/9Yvrmq5JiT66+pNjiX4UBnLDiKHcWAr/OInA==",
+      "version": "8.52.0",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.52.0.tgz",
+      "integrity": "sha512-zh/JHnaixqHZsolRB/w9/02akBk9EPrOs9JwcTP2ek7yL5bVvXuRariiaAjjoJ5DvuwQ1WAE/HsMz+w17YgBCg==",
       "dev": true,
       "requires": {
         "@eslint-community/eslint-utils": "^4.2.0",
         "@eslint-community/regexpp": "^4.6.1",
         "@eslint/eslintrc": "^2.1.2",
-        "@eslint/js": "8.51.0",
-        "@humanwhocodes/config-array": "^0.11.11",
+        "@eslint/js": "8.52.0",
+        "@humanwhocodes/config-array": "^0.11.13",
         "@humanwhocodes/module-importer": "^1.0.1",
         "@nodelib/fs.walk": "^1.2.8",
+        "@ungap/structured-clone": "^1.2.0",
         "ajv": "^6.12.4",
         "chalk": "^4.0.0",
         "cross-spawn": "^7.0.2",
diff --git a/apps/block_scout_web/assets/package.json b/apps/block_scout_web/assets/package.json
index dac5208241d7..8be1198295e6 100644
--- a/apps/block_scout_web/assets/package.json
+++ b/apps/block_scout_web/assets/package.json
@@ -90,7 +90,7 @@
     "copy-webpack-plugin": "^11.0.0",
     "css-loader": "^6.8.1",
     "css-minimizer-webpack-plugin": "^5.0.1",
-    "eslint": "^8.51.0",
+    "eslint": "^8.52.0",
     "eslint-config-standard": "^17.1.0",
     "eslint-plugin-import": "^2.28.1",
     "eslint-plugin-node": "^11.1.0",

From 5d62a2d9ff64b749ae53cad198f036e448a31292 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 23 Oct 2023 18:30:10 +0000
Subject: [PATCH 526/909] Bump @amplitude/analytics-browser in
 /apps/block_scout_web/assets

Bumps [@amplitude/analytics-browser](https://github.com/amplitude/Amplitude-TypeScript) from 2.3.2 to 2.3.3.
- [Release notes](https://github.com/amplitude/Amplitude-TypeScript/releases)
- [Commits](https://github.com/amplitude/Amplitude-TypeScript/compare/@amplitude/analytics-browser@2.3.2...@amplitude/analytics-browser@2.3.3)

---
updated-dependencies:
- dependency-name: "@amplitude/analytics-browser"
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 apps/block_scout_web/assets/package-lock.json | 130 +++++++++---------
 apps/block_scout_web/assets/package.json      |   2 +-
 2 files changed, 66 insertions(+), 66 deletions(-)

diff --git a/apps/block_scout_web/assets/package-lock.json b/apps/block_scout_web/assets/package-lock.json
index 680f70a76f57..c73289a776e9 100644
--- a/apps/block_scout_web/assets/package-lock.json
+++ b/apps/block_scout_web/assets/package-lock.json
@@ -7,7 +7,7 @@
       "name": "blockscout",
       "license": "GPL-3.0",
       "dependencies": {
-        "@amplitude/analytics-browser": "^2.3.2",
+        "@amplitude/analytics-browser": "^2.3.3",
         "@fortawesome/fontawesome-free": "^6.4.2",
         "@tarekraafat/autocomplete.js": "^10.2.7",
         "@walletconnect/web3-provider": "^1.8.0",
@@ -116,15 +116,15 @@
       }
     },
     "node_modules/@amplitude/analytics-browser": {
-      "version": "2.3.2",
-      "resolved": "https://registry.npmjs.org/@amplitude/analytics-browser/-/analytics-browser-2.3.2.tgz",
-      "integrity": "sha512-Zjk/PeCc0PZuzWlsGaf/i6qkkofqJvToh41tPhkOIFvLJlv/3cHtB2WXEod9vj20m+XcNoBATbcFAQgl2ubTeA==",
-      "dependencies": {
-        "@amplitude/analytics-client-common": "^2.0.6",
-        "@amplitude/analytics-core": "^2.0.5",
-        "@amplitude/analytics-types": "^2.2.0",
-        "@amplitude/plugin-page-view-tracking-browser": "^2.0.12",
-        "@amplitude/plugin-web-attribution-browser": "^2.0.12",
+      "version": "2.3.3",
+      "resolved": "https://registry.npmjs.org/@amplitude/analytics-browser/-/analytics-browser-2.3.3.tgz",
+      "integrity": "sha512-we1tw7fn+yyf2waAyw/XqBOTEwIEY19qXJ5B9d1Xc1SKNxb6HzU5IpD3zbTKwZLlCGKbkVY6wI3JxuuoYIAI2w==",
+      "dependencies": {
+        "@amplitude/analytics-client-common": "^2.0.7",
+        "@amplitude/analytics-core": "^2.1.0",
+        "@amplitude/analytics-types": "^2.3.0",
+        "@amplitude/plugin-page-view-tracking-browser": "^2.0.13",
+        "@amplitude/plugin-web-attribution-browser": "^2.0.13",
         "tslib": "^2.4.1"
       }
     },
@@ -134,13 +134,13 @@
       "integrity": "sha512-tGyy4dAjRIEwI7BzsB0lynWgOpfqjUdq91XXAlIWD2OwKBH7oCl/GZG/HT4BOHrTlPMOASlMQ7veyTqpmRcrNA=="
     },
     "node_modules/@amplitude/analytics-client-common": {
-      "version": "2.0.6",
-      "resolved": "https://registry.npmjs.org/@amplitude/analytics-client-common/-/analytics-client-common-2.0.6.tgz",
-      "integrity": "sha512-jnDh0uJXztVisAOUATCOmS+tlocqJgKbaPsA0PfUmhpsjipTlp8hqrQh20wopp/A5PT0vZ91Cw4CJqkLuEAwvw==",
+      "version": "2.0.7",
+      "resolved": "https://registry.npmjs.org/@amplitude/analytics-client-common/-/analytics-client-common-2.0.7.tgz",
+      "integrity": "sha512-2LqPMsY6ksS1OTda0EFPLUDFmIVTwU0bDN17+uY9WvpWTEWCAL616X2oNCQ6FTB9zWfCTr8X2I5jSS0y4rzPkw==",
       "dependencies": {
         "@amplitude/analytics-connector": "^1.4.8",
-        "@amplitude/analytics-core": "^2.0.5",
-        "@amplitude/analytics-types": "^2.2.0",
+        "@amplitude/analytics-core": "^2.1.0",
+        "@amplitude/analytics-types": "^2.3.0",
         "tslib": "^2.4.1"
       }
     },
@@ -155,11 +155,11 @@
       "integrity": "sha512-T8mOYzB9RRxckzhL0NTHwdge9xuFxXEOplC8B1Y3UX3NHa3BLh7DlBUZlCOwQgMc2nxDfnSweDL5S3bhC+W90g=="
     },
     "node_modules/@amplitude/analytics-core": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/@amplitude/analytics-core/-/analytics-core-2.0.5.tgz",
-      "integrity": "sha512-ke937QKOHFeUuQxwu5fQ5X9x9KUJoe+5XnJ589Fuz0VStWwqQZl7AkgSe85cX45z0bMUdbG7q8u9y/9uaqf2SQ==",
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/@amplitude/analytics-core/-/analytics-core-2.1.0.tgz",
+      "integrity": "sha512-a7/WUacF+R6J8NTYf93gaVd3OjOyF0db2K9Y6+uSZp/xIbsGyR/47WN1R3CYPm4IC9Y9/ukBAHd/p4FsNJbsNg==",
       "dependencies": {
-        "@amplitude/analytics-types": "^2.2.0",
+        "@amplitude/analytics-types": "^2.3.0",
         "tslib": "^2.4.1"
       }
     },
@@ -169,17 +169,17 @@
       "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q=="
     },
     "node_modules/@amplitude/analytics-types": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/@amplitude/analytics-types/-/analytics-types-2.2.0.tgz",
-      "integrity": "sha512-HThPlsX5KnxCorQnPVNQR8WZy0/PdgAzlT5n8bubjSmzPEWQgvn8bQzD48wYXoAkEZxlfYlaSnx7IxD5j3N1Dw=="
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/@amplitude/analytics-types/-/analytics-types-2.3.0.tgz",
+      "integrity": "sha512-/sMCgimMzDjGZDh5ekHUrwKVi4IJc8/AFUXIxEuJn4wd9QVmThWNeKfszA36z6Ue+UOHhEUEZwruXo3PwXWz/g=="
     },
     "node_modules/@amplitude/plugin-page-view-tracking-browser": {
-      "version": "2.0.12",
-      "resolved": "https://registry.npmjs.org/@amplitude/plugin-page-view-tracking-browser/-/plugin-page-view-tracking-browser-2.0.12.tgz",
-      "integrity": "sha512-0QJJZocqQ+MltQcI4BkshQJcUOM9mIOiud0BnDPcwAbUjlzGVG+xm4KuOA3bjfGGcSF7I6mpnOnG3nPkX5k47A==",
+      "version": "2.0.13",
+      "resolved": "https://registry.npmjs.org/@amplitude/plugin-page-view-tracking-browser/-/plugin-page-view-tracking-browser-2.0.13.tgz",
+      "integrity": "sha512-23X7tEublqLx6cs7o7KXyQ9UdfX0lSVNHDgurhuGdAV8yEeTdg9bRvVHGZETZtnbQj31avD7M2U31nXXaopX3A==",
       "dependencies": {
-        "@amplitude/analytics-client-common": "^2.0.6",
-        "@amplitude/analytics-types": "^2.2.0",
+        "@amplitude/analytics-client-common": "^2.0.7",
+        "@amplitude/analytics-types": "^2.3.0",
         "tslib": "^2.4.1"
       }
     },
@@ -189,13 +189,13 @@
       "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q=="
     },
     "node_modules/@amplitude/plugin-web-attribution-browser": {
-      "version": "2.0.12",
-      "resolved": "https://registry.npmjs.org/@amplitude/plugin-web-attribution-browser/-/plugin-web-attribution-browser-2.0.12.tgz",
-      "integrity": "sha512-Ii5lzsixf+2E9f+K2Knk3q/O9tYkoFDm0E9KfPhvkNM27mRLtJ1/YTfvmW4otaYrnPwcvl2Y5E9tzATVrmIelw==",
+      "version": "2.0.13",
+      "resolved": "https://registry.npmjs.org/@amplitude/plugin-web-attribution-browser/-/plugin-web-attribution-browser-2.0.13.tgz",
+      "integrity": "sha512-oVsVxNk/twdcE5r5v+ALX3C443Q1NQGTaKNvbxyO/k3DiEGmKpgC8hSj9S5O7ZdrII63cS+u0IHevRXgmEnplg==",
       "dependencies": {
-        "@amplitude/analytics-client-common": "^2.0.6",
-        "@amplitude/analytics-core": "^2.0.5",
-        "@amplitude/analytics-types": "^2.2.0",
+        "@amplitude/analytics-client-common": "^2.0.7",
+        "@amplitude/analytics-core": "^2.1.0",
+        "@amplitude/analytics-types": "^2.3.0",
         "tslib": "^2.4.1"
       }
     },
@@ -17786,15 +17786,15 @@
       "dev": true
     },
     "@amplitude/analytics-browser": {
-      "version": "2.3.2",
-      "resolved": "https://registry.npmjs.org/@amplitude/analytics-browser/-/analytics-browser-2.3.2.tgz",
-      "integrity": "sha512-Zjk/PeCc0PZuzWlsGaf/i6qkkofqJvToh41tPhkOIFvLJlv/3cHtB2WXEod9vj20m+XcNoBATbcFAQgl2ubTeA==",
-      "requires": {
-        "@amplitude/analytics-client-common": "^2.0.6",
-        "@amplitude/analytics-core": "^2.0.5",
-        "@amplitude/analytics-types": "^2.2.0",
-        "@amplitude/plugin-page-view-tracking-browser": "^2.0.12",
-        "@amplitude/plugin-web-attribution-browser": "^2.0.12",
+      "version": "2.3.3",
+      "resolved": "https://registry.npmjs.org/@amplitude/analytics-browser/-/analytics-browser-2.3.3.tgz",
+      "integrity": "sha512-we1tw7fn+yyf2waAyw/XqBOTEwIEY19qXJ5B9d1Xc1SKNxb6HzU5IpD3zbTKwZLlCGKbkVY6wI3JxuuoYIAI2w==",
+      "requires": {
+        "@amplitude/analytics-client-common": "^2.0.7",
+        "@amplitude/analytics-core": "^2.1.0",
+        "@amplitude/analytics-types": "^2.3.0",
+        "@amplitude/plugin-page-view-tracking-browser": "^2.0.13",
+        "@amplitude/plugin-web-attribution-browser": "^2.0.13",
         "tslib": "^2.4.1"
       },
       "dependencies": {
@@ -17806,13 +17806,13 @@
       }
     },
     "@amplitude/analytics-client-common": {
-      "version": "2.0.6",
-      "resolved": "https://registry.npmjs.org/@amplitude/analytics-client-common/-/analytics-client-common-2.0.6.tgz",
-      "integrity": "sha512-jnDh0uJXztVisAOUATCOmS+tlocqJgKbaPsA0PfUmhpsjipTlp8hqrQh20wopp/A5PT0vZ91Cw4CJqkLuEAwvw==",
+      "version": "2.0.7",
+      "resolved": "https://registry.npmjs.org/@amplitude/analytics-client-common/-/analytics-client-common-2.0.7.tgz",
+      "integrity": "sha512-2LqPMsY6ksS1OTda0EFPLUDFmIVTwU0bDN17+uY9WvpWTEWCAL616X2oNCQ6FTB9zWfCTr8X2I5jSS0y4rzPkw==",
       "requires": {
         "@amplitude/analytics-connector": "^1.4.8",
-        "@amplitude/analytics-core": "^2.0.5",
-        "@amplitude/analytics-types": "^2.2.0",
+        "@amplitude/analytics-core": "^2.1.0",
+        "@amplitude/analytics-types": "^2.3.0",
         "tslib": "^2.4.1"
       },
       "dependencies": {
@@ -17829,11 +17829,11 @@
       "integrity": "sha512-T8mOYzB9RRxckzhL0NTHwdge9xuFxXEOplC8B1Y3UX3NHa3BLh7DlBUZlCOwQgMc2nxDfnSweDL5S3bhC+W90g=="
     },
     "@amplitude/analytics-core": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/@amplitude/analytics-core/-/analytics-core-2.0.5.tgz",
-      "integrity": "sha512-ke937QKOHFeUuQxwu5fQ5X9x9KUJoe+5XnJ589Fuz0VStWwqQZl7AkgSe85cX45z0bMUdbG7q8u9y/9uaqf2SQ==",
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/@amplitude/analytics-core/-/analytics-core-2.1.0.tgz",
+      "integrity": "sha512-a7/WUacF+R6J8NTYf93gaVd3OjOyF0db2K9Y6+uSZp/xIbsGyR/47WN1R3CYPm4IC9Y9/ukBAHd/p4FsNJbsNg==",
       "requires": {
-        "@amplitude/analytics-types": "^2.2.0",
+        "@amplitude/analytics-types": "^2.3.0",
         "tslib": "^2.4.1"
       },
       "dependencies": {
@@ -17845,17 +17845,17 @@
       }
     },
     "@amplitude/analytics-types": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/@amplitude/analytics-types/-/analytics-types-2.2.0.tgz",
-      "integrity": "sha512-HThPlsX5KnxCorQnPVNQR8WZy0/PdgAzlT5n8bubjSmzPEWQgvn8bQzD48wYXoAkEZxlfYlaSnx7IxD5j3N1Dw=="
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/@amplitude/analytics-types/-/analytics-types-2.3.0.tgz",
+      "integrity": "sha512-/sMCgimMzDjGZDh5ekHUrwKVi4IJc8/AFUXIxEuJn4wd9QVmThWNeKfszA36z6Ue+UOHhEUEZwruXo3PwXWz/g=="
     },
     "@amplitude/plugin-page-view-tracking-browser": {
-      "version": "2.0.12",
-      "resolved": "https://registry.npmjs.org/@amplitude/plugin-page-view-tracking-browser/-/plugin-page-view-tracking-browser-2.0.12.tgz",
-      "integrity": "sha512-0QJJZocqQ+MltQcI4BkshQJcUOM9mIOiud0BnDPcwAbUjlzGVG+xm4KuOA3bjfGGcSF7I6mpnOnG3nPkX5k47A==",
+      "version": "2.0.13",
+      "resolved": "https://registry.npmjs.org/@amplitude/plugin-page-view-tracking-browser/-/plugin-page-view-tracking-browser-2.0.13.tgz",
+      "integrity": "sha512-23X7tEublqLx6cs7o7KXyQ9UdfX0lSVNHDgurhuGdAV8yEeTdg9bRvVHGZETZtnbQj31avD7M2U31nXXaopX3A==",
       "requires": {
-        "@amplitude/analytics-client-common": "^2.0.6",
-        "@amplitude/analytics-types": "^2.2.0",
+        "@amplitude/analytics-client-common": "^2.0.7",
+        "@amplitude/analytics-types": "^2.3.0",
         "tslib": "^2.4.1"
       },
       "dependencies": {
@@ -17867,13 +17867,13 @@
       }
     },
     "@amplitude/plugin-web-attribution-browser": {
-      "version": "2.0.12",
-      "resolved": "https://registry.npmjs.org/@amplitude/plugin-web-attribution-browser/-/plugin-web-attribution-browser-2.0.12.tgz",
-      "integrity": "sha512-Ii5lzsixf+2E9f+K2Knk3q/O9tYkoFDm0E9KfPhvkNM27mRLtJ1/YTfvmW4otaYrnPwcvl2Y5E9tzATVrmIelw==",
+      "version": "2.0.13",
+      "resolved": "https://registry.npmjs.org/@amplitude/plugin-web-attribution-browser/-/plugin-web-attribution-browser-2.0.13.tgz",
+      "integrity": "sha512-oVsVxNk/twdcE5r5v+ALX3C443Q1NQGTaKNvbxyO/k3DiEGmKpgC8hSj9S5O7ZdrII63cS+u0IHevRXgmEnplg==",
       "requires": {
-        "@amplitude/analytics-client-common": "^2.0.6",
-        "@amplitude/analytics-core": "^2.0.5",
-        "@amplitude/analytics-types": "^2.2.0",
+        "@amplitude/analytics-client-common": "^2.0.7",
+        "@amplitude/analytics-core": "^2.1.0",
+        "@amplitude/analytics-types": "^2.3.0",
         "tslib": "^2.4.1"
       },
       "dependencies": {
diff --git a/apps/block_scout_web/assets/package.json b/apps/block_scout_web/assets/package.json
index dac5208241d7..43171e13a51d 100644
--- a/apps/block_scout_web/assets/package.json
+++ b/apps/block_scout_web/assets/package.json
@@ -20,7 +20,7 @@
   },
   "dependencies": {
     "@fortawesome/fontawesome-free": "^6.4.2",
-    "@amplitude/analytics-browser": "^2.3.2",
+    "@amplitude/analytics-browser": "^2.3.3",
     "@tarekraafat/autocomplete.js": "^10.2.7",
     "@walletconnect/web3-provider": "^1.8.0",
     "assert": "^2.1.0",

From f7ab2da9c9422330d8ffb0b6b76e9e4cdfd84891 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 23 Oct 2023 19:03:34 +0000
Subject: [PATCH 527/909] Bump floki from 0.35.0 to 0.35.1

Bumps [floki](https://github.com/philss/floki) from 0.35.0 to 0.35.1.
- [Release notes](https://github.com/philss/floki/releases)
- [Changelog](https://github.com/philss/floki/blob/main/CHANGELOG.md)
- [Commits](https://github.com/philss/floki/compare/v0.35.0...v0.35.1)

---
updated-dependencies:
- dependency-name: floki
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 mix.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mix.lock b/mix.lock
index 7dc463685b6a..002632eaf1ca 100644
--- a/mix.lock
+++ b/mix.lock
@@ -60,7 +60,7 @@
   "exvcr": {:hex, :exvcr, "0.14.4", "1aa5fe7d3f10b117251c158f8d28b39f7fc73d0a7628b2d0b75bf8cfb1111576", [:mix], [{:exactor, "~> 2.2", [hex: :exactor, repo: "hexpm", optional: false]}, {:exjsx, "~> 4.0", [hex: :exjsx, repo: "hexpm", optional: false]}, {:finch, "~> 0.16", [hex: :finch, repo: "hexpm", optional: true]}, {:httpoison, "~> 1.0 or ~> 2.0", [hex: :httpoison, repo: "hexpm", optional: true]}, {:httpotion, "~> 3.1", [hex: :httpotion, repo: "hexpm", optional: true]}, {:ibrowse, "4.4.0", [hex: :ibrowse, repo: "hexpm", optional: true]}, {:meck, "~> 0.8", [hex: :meck, repo: "hexpm", optional: false]}], "hexpm", "4e600568c02ed29d46bc2e2c74927d172ba06658aa8b14705c0207363c44cc94"},
   "file_info": {:hex, :file_info, "0.0.4", "2e0e77f211e833f38ead22cb29ce53761d457d80b3ffe0ffe0eb93880b0963b2", [:mix], [{:mimetype_parser, "~> 0.1.2", [hex: :mimetype_parser, repo: "hexpm", optional: false]}], "hexpm", "50e7ad01c2c8b9339010675fe4dc4a113b8d6ca7eddce24d1d74fd0e762781a5"},
   "file_system": {:hex, :file_system, "0.2.10", "fb082005a9cd1711c05b5248710f8826b02d7d1784e7c3451f9c1231d4fc162d", [:mix], [], "hexpm", "41195edbfb562a593726eda3b3e8b103a309b733ad25f3d642ba49696bf715dc"},
-  "floki": {:hex, :floki, "0.35.0", "b24a4f416738d08e468531fe2950305a2c0582f555992dfbefc925462d24e2ea", [:mix], [], "hexpm", "381d8030f708be55380de1202872172600b00d65a62072f0e5eda5976b9de7b4"},
+  "floki": {:hex, :floki, "0.35.1", "b21cf592ed38c1207c5ea52120a2e81d6ecba11337a633a3f29ec17a64033178", [:mix], [], "hexpm", "f126e3eb814f131c21befeeeb773d2c4e2331ce05214c1a9844a3edde5c69003"},
   "flow": {:hex, :flow, "1.2.4", "1dd58918287eb286656008777cb32714b5123d3855956f29aa141ebae456922d", [:mix], [{:gen_stage, "~> 1.0", [hex: :gen_stage, repo: "hexpm", optional: false]}], "hexpm", "874adde96368e71870f3510b91e35bc31652291858c86c0e75359cbdd35eb211"},
   "gen_stage": {:hex, :gen_stage, "1.2.1", "19d8b5e9a5996d813b8245338a28246307fd8b9c99d1237de199d21efc4c76a1", [:mix], [], "hexpm", "83e8be657fa05b992ffa6ac1e3af6d57aa50aace8f691fcf696ff02f8335b001"},
   "gettext": {:hex, :gettext, "0.23.1", "821e619a240e6000db2fc16a574ef68b3bd7fe0167ccc264a81563cc93e67a31", [:mix], [{:expo, "~> 0.4.0", [hex: :expo, repo: "hexpm", optional: false]}], "hexpm", "19d744a36b809d810d610b57c27b934425859d158ebd56561bc41f7eeb8795db"},

From 8d1a389e8f05d2d9d1f2d99660e82c573f847b41 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 23 Oct 2023 19:04:46 +0000
Subject: [PATCH 528/909] Bump ex_abi from 0.6.2 to 0.6.3

Bumps [ex_abi](https://github.com/poanetwork/ex_abi) from 0.6.2 to 0.6.3.
- [Release notes](https://github.com/poanetwork/ex_abi/releases)
- [Changelog](https://github.com/poanetwork/ex_abi/blob/master/CHANGELOG.md)
- [Commits](https://github.com/poanetwork/ex_abi/compare/0.6.2...0.6.3)

---
updated-dependencies:
- dependency-name: ex_abi
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 mix.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mix.lock b/mix.lock
index 7dc463685b6a..e845df91adc5 100644
--- a/mix.lock
+++ b/mix.lock
@@ -41,7 +41,7 @@
   "ecto_sql": {:hex, :ecto_sql, "3.10.2", "6b98b46534b5c2f8b8b5f03f126e75e2a73c64f3c071149d32987a5378b0fdbd", [:mix], [{:db_connection, "~> 2.5 or ~> 2.4.1", [hex: :db_connection, repo: "hexpm", optional: false]}, {:ecto, "~> 3.10.0", [hex: :ecto, repo: "hexpm", optional: false]}, {:myxql, "~> 0.6.0", [hex: :myxql, repo: "hexpm", optional: true]}, {:postgrex, "~> 0.16.0 or ~> 0.17.0 or ~> 1.0", [hex: :postgrex, repo: "hexpm", optional: true]}, {:tds, "~> 2.1.1 or ~> 2.2", [hex: :tds, repo: "hexpm", optional: true]}, {:telemetry, "~> 0.4.0 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "68c018debca57cb9235e3889affdaec7a10616a4e3a80c99fa1d01fdafaa9007"},
   "elixir_make": {:hex, :elixir_make, "0.7.7", "7128c60c2476019ed978210c245badf08b03dbec4f24d05790ef791da11aa17c", [:mix], [{:castore, "~> 0.1 or ~> 1.0", [hex: :castore, repo: "hexpm", optional: true]}], "hexpm", "5bc19fff950fad52bbe5f211b12db9ec82c6b34a9647da0c2224b8b8464c7e6c"},
   "erlex": {:hex, :erlex, "0.2.6", "c7987d15e899c7a2f34f5420d2a2ea0d659682c06ac607572df55a43753aa12e", [:mix], [], "hexpm", "2ed2e25711feb44d52b17d2780eabf998452f6efda104877a3881c2f8c0c0c75"},
-  "ex_abi": {:hex, :ex_abi, "0.6.2", "a33d0df94efd54d6879d20ab8cb6561432f13cbb1e912801d2e97ef50f795e9d", [:mix], [{:ex_keccak, "~> 0.7.3", [hex: :ex_keccak, repo: "hexpm", optional: false]}, {:jason, "~> 1.4", [hex: :jason, repo: "hexpm", optional: false]}], "hexpm", "e901c580a2491b19a6c27891c6d40cd8fe41d996c8c2ec02d5dd4c5a86239bc6"},
+  "ex_abi": {:hex, :ex_abi, "0.6.3", "e16f232346badc9f03a459cea7113ad4cff28dd2faf36f5635eaa01d5e903d7c", [:mix], [{:ex_keccak, "~> 0.7.3", [hex: :ex_keccak, repo: "hexpm", optional: false]}, {:jason, "~> 1.4", [hex: :jason, repo: "hexpm", optional: false]}], "hexpm", "bd1bcbe1d4fac14b90aa132fa54690b36d26e11e3777b755623bf32e66caef85"},
   "ex_cldr": {:hex, :ex_cldr, "2.37.4", "3e2c04d9c691a75a8b7e808dfcbacedb9cdf3e73f819d1b4174f8f065e5f29c1", [:mix], [{:cldr_utils, "~> 2.21", [hex: :cldr_utils, repo: "hexpm", optional: false]}, {:decimal, "~> 1.6 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: false]}, {:gettext, "~> 0.19", [hex: :gettext, repo: "hexpm", optional: true]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}, {:nimble_parsec, "~> 0.5 or ~> 1.0", [hex: :nimble_parsec, repo: "hexpm", optional: true]}], "hexpm", "2bcb5de0095324ba645b4e156bf346add156d8b928f0ffd985c61664d981ad3d"},
   "ex_cldr_currencies": {:hex, :ex_cldr_currencies, "2.15.0", "aadd34e91cfac7ef6b03fe8f47f8c6fa8c5daf3f89b5d9fee64ec545ded839cf", [:mix], [{:ex_cldr, "~> 2.34", [hex: :ex_cldr, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}], "hexpm", "0521316396c66877a2d636219767560bb2397c583341fcb154ecf9f3000e6ff8"},
   "ex_cldr_lists": {:hex, :ex_cldr_lists, "2.10.1", "67795eb28f8534a36cbdfeeaea6d3ee587eeac7eafff71968dd046c215d4ec42", [:mix], [{:ex_cldr_numbers, "~> 2.25", [hex: :ex_cldr_numbers, repo: "hexpm", optional: false]}, {:ex_doc, "~> 0.18", [hex: :ex_doc, repo: "hexpm", optional: true]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}], "hexpm", "da826148d95c7a1889fd847ae5704c141747bad43a5a44431ae97bced57b0f93"},

From a96ccf4f938bebaabc7af97ba7168b69bef31e60 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 24 Oct 2023 07:20:52 +0000
Subject: [PATCH 529/909] Bump eslint-plugin-import in
 /apps/block_scout_web/assets

Bumps [eslint-plugin-import](https://github.com/import-js/eslint-plugin-import) from 2.28.1 to 2.29.0.
- [Release notes](https://github.com/import-js/eslint-plugin-import/releases)
- [Changelog](https://github.com/import-js/eslint-plugin-import/blob/main/CHANGELOG.md)
- [Commits](https://github.com/import-js/eslint-plugin-import/compare/v2.28.1...v2.29.0)

---
updated-dependencies:
- dependency-name: eslint-plugin-import
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 apps/block_scout_web/assets/package-lock.json | 728 ++++++++++--------
 apps/block_scout_web/assets/package.json      |   2 +-
 2 files changed, 401 insertions(+), 329 deletions(-)

diff --git a/apps/block_scout_web/assets/package-lock.json b/apps/block_scout_web/assets/package-lock.json
index ebf93d19c114..fd04b6e11b03 100644
--- a/apps/block_scout_web/assets/package-lock.json
+++ b/apps/block_scout_web/assets/package-lock.json
@@ -80,7 +80,7 @@
         "css-minimizer-webpack-plugin": "^5.0.1",
         "eslint": "^8.52.0",
         "eslint-config-standard": "^17.1.0",
-        "eslint-plugin-import": "^2.28.1",
+        "eslint-plugin-import": "^2.29.0",
         "eslint-plugin-node": "^11.1.0",
         "eslint-plugin-promise": "^6.1.1",
         "file-loader": "^6.2.0",
@@ -4420,15 +4420,15 @@
       "integrity": "sha512-PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg=="
     },
     "node_modules/array-includes": {
-      "version": "3.1.6",
-      "resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.1.6.tgz",
-      "integrity": "sha512-sgTbLvL6cNnw24FnbaDyjmvddQ2ML8arZsgaJhoABMoplz/4QRhtrYS+alr1BUM1Bwp6dhx8vVCBSLG+StwOFw==",
+      "version": "3.1.7",
+      "resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.1.7.tgz",
+      "integrity": "sha512-dlcsNBIiWhPkHdOEEKnehA+RNUWDc4UqFtnIXU4uuYDPtA4LDkr7qip2p0VvFAEXNDr0yWZ9PJyIRiGjRLQzwQ==",
       "dev": true,
       "dependencies": {
         "call-bind": "^1.0.2",
-        "define-properties": "^1.1.4",
-        "es-abstract": "^1.20.4",
-        "get-intrinsic": "^1.1.3",
+        "define-properties": "^1.2.0",
+        "es-abstract": "^1.22.1",
+        "get-intrinsic": "^1.2.1",
         "is-string": "^1.0.7"
       },
       "engines": {
@@ -4439,16 +4439,16 @@
       }
     },
     "node_modules/array.prototype.findlastindex": {
-      "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/array.prototype.findlastindex/-/array.prototype.findlastindex-1.2.2.tgz",
-      "integrity": "sha512-tb5thFFlUcp7NdNF6/MpDk/1r/4awWG1FIz3YqDf+/zJSTezBb+/5WViH41obXULHVpDzoiCLpJ/ZO9YbJMsdw==",
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/array.prototype.findlastindex/-/array.prototype.findlastindex-1.2.3.tgz",
+      "integrity": "sha512-LzLoiOMAxvy+Gd3BAq3B7VeIgPdo+Q8hthvKtXybMvRV0jrXfJM/t8mw7nNlpEcVlVUnCnM2KSX4XU5HmpodOA==",
       "dev": true,
       "dependencies": {
         "call-bind": "^1.0.2",
-        "define-properties": "^1.1.4",
-        "es-abstract": "^1.20.4",
+        "define-properties": "^1.2.0",
+        "es-abstract": "^1.22.1",
         "es-shim-unscopables": "^1.0.0",
-        "get-intrinsic": "^1.1.3"
+        "get-intrinsic": "^1.2.1"
       },
       "engines": {
         "node": ">= 0.4"
@@ -4458,14 +4458,14 @@
       }
     },
     "node_modules/array.prototype.flat": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.3.1.tgz",
-      "integrity": "sha512-roTU0KWIOmJ4DRLmwKd19Otg0/mT3qPNt0Qb3GWW8iObuZXxrjB/pzn0R3hqpRSWg4HCwqx+0vwOnWnvlOyeIA==",
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.3.2.tgz",
+      "integrity": "sha512-djYB+Zx2vLewY8RWlNCUdHjDXs2XOgm602S9E7P/UpHgfeHL00cRiIF+IN/G/aUJ7kGPb6yO/ErDI5V2s8iycA==",
       "dev": true,
       "dependencies": {
         "call-bind": "^1.0.2",
-        "define-properties": "^1.1.4",
-        "es-abstract": "^1.20.4",
+        "define-properties": "^1.2.0",
+        "es-abstract": "^1.22.1",
         "es-shim-unscopables": "^1.0.0"
       },
       "engines": {
@@ -4476,14 +4476,14 @@
       }
     },
     "node_modules/array.prototype.flatmap": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/array.prototype.flatmap/-/array.prototype.flatmap-1.3.1.tgz",
-      "integrity": "sha512-8UGn9O1FDVvMNB0UlLv4voxRMze7+FpHyF5mSMRjWHUMlpoDViniy05870VlxhfgTnLbpuwTzvD76MTtWxB/mQ==",
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/array.prototype.flatmap/-/array.prototype.flatmap-1.3.2.tgz",
+      "integrity": "sha512-Ewyx0c9PmpcsByhSW4r+9zDU7sGjFc86qf/kKtuSCRdhfbk0SNLLkaT5qvcHnRGgc5NP/ly/y+qkXkqONX54CQ==",
       "dev": true,
       "dependencies": {
         "call-bind": "^1.0.2",
-        "define-properties": "^1.1.4",
-        "es-abstract": "^1.20.4",
+        "define-properties": "^1.2.0",
+        "es-abstract": "^1.22.1",
         "es-shim-unscopables": "^1.0.0"
       },
       "engines": {
@@ -4494,14 +4494,15 @@
       }
     },
     "node_modules/arraybuffer.prototype.slice": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/arraybuffer.prototype.slice/-/arraybuffer.prototype.slice-1.0.1.tgz",
-      "integrity": "sha512-09x0ZWFEjj4WD8PDbykUwo3t9arLn8NIzmmYEJFpYekOAQjpkGSyrQhNoRTcwwcFRu+ycWF78QZ63oWTqSjBcw==",
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/arraybuffer.prototype.slice/-/arraybuffer.prototype.slice-1.0.2.tgz",
+      "integrity": "sha512-yMBKppFur/fbHu9/6USUe03bZ4knMYiwFBcyiaXB8Go0qNehwX6inYPzK9U0NeQvGxKthcmHcaR8P5MStSRBAw==",
       "dev": true,
       "dependencies": {
         "array-buffer-byte-length": "^1.0.0",
         "call-bind": "^1.0.2",
         "define-properties": "^1.2.0",
+        "es-abstract": "^1.22.1",
         "get-intrinsic": "^1.2.1",
         "is-array-buffer": "^3.0.2",
         "is-shared-array-buffer": "^1.0.2"
@@ -5429,12 +5430,13 @@
       }
     },
     "node_modules/call-bind": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz",
-      "integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==",
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.5.tgz",
+      "integrity": "sha512-C3nQxfFZxFRVoJoGKKI8y3MOEo129NQ+FgQ08iye+Mk4zNZZGdjfs06bVTr+DBSlA66Q2VEcMki/cUCP4SercQ==",
       "dependencies": {
-        "function-bind": "^1.1.1",
-        "get-intrinsic": "^1.0.2"
+        "function-bind": "^1.1.2",
+        "get-intrinsic": "^1.2.1",
+        "set-function-length": "^1.1.1"
       },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
@@ -6672,6 +6674,19 @@
         "abstract-leveldown": "~2.6.0"
       }
     },
+    "node_modules/define-data-property": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.1.tgz",
+      "integrity": "sha512-E7uGkTzkk1d0ByLeSc6ZsFS79Axg+m1P/VsgYsxHgiuc3tFSj+MjMIwe90FC4lOAZzNBdY7kkO2P2wKdsQ1vgQ==",
+      "dependencies": {
+        "get-intrinsic": "^1.2.1",
+        "gopd": "^1.0.1",
+        "has-property-descriptors": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
     "node_modules/define-properties": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.2.0.tgz",
@@ -7032,26 +7047,26 @@
       }
     },
     "node_modules/es-abstract": {
-      "version": "1.22.1",
-      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.22.1.tgz",
-      "integrity": "sha512-ioRRcXMO6OFyRpyzV3kE1IIBd4WG5/kltnzdxSCqoP8CMGs/Li+M1uF5o7lOkZVFjDs+NLesthnF66Pg/0q0Lw==",
+      "version": "1.22.3",
+      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.22.3.tgz",
+      "integrity": "sha512-eiiY8HQeYfYH2Con2berK+To6GrK2RxbPawDkGq4UiCQQfZHb6wX9qQqkbpPqaxQFcl8d9QzZqo0tGE0VcrdwA==",
       "dev": true,
       "dependencies": {
         "array-buffer-byte-length": "^1.0.0",
-        "arraybuffer.prototype.slice": "^1.0.1",
+        "arraybuffer.prototype.slice": "^1.0.2",
         "available-typed-arrays": "^1.0.5",
-        "call-bind": "^1.0.2",
+        "call-bind": "^1.0.5",
         "es-set-tostringtag": "^2.0.1",
         "es-to-primitive": "^1.2.1",
-        "function.prototype.name": "^1.1.5",
-        "get-intrinsic": "^1.2.1",
+        "function.prototype.name": "^1.1.6",
+        "get-intrinsic": "^1.2.2",
         "get-symbol-description": "^1.0.0",
         "globalthis": "^1.0.3",
         "gopd": "^1.0.1",
-        "has": "^1.0.3",
         "has-property-descriptors": "^1.0.0",
         "has-proto": "^1.0.1",
         "has-symbols": "^1.0.3",
+        "hasown": "^2.0.0",
         "internal-slot": "^1.0.5",
         "is-array-buffer": "^3.0.2",
         "is-callable": "^1.2.7",
@@ -7059,23 +7074,23 @@
         "is-regex": "^1.1.4",
         "is-shared-array-buffer": "^1.0.2",
         "is-string": "^1.0.7",
-        "is-typed-array": "^1.1.10",
+        "is-typed-array": "^1.1.12",
         "is-weakref": "^1.0.2",
-        "object-inspect": "^1.12.3",
+        "object-inspect": "^1.13.1",
         "object-keys": "^1.1.1",
         "object.assign": "^4.1.4",
-        "regexp.prototype.flags": "^1.5.0",
-        "safe-array-concat": "^1.0.0",
+        "regexp.prototype.flags": "^1.5.1",
+        "safe-array-concat": "^1.0.1",
         "safe-regex-test": "^1.0.0",
-        "string.prototype.trim": "^1.2.7",
-        "string.prototype.trimend": "^1.0.6",
-        "string.prototype.trimstart": "^1.0.6",
+        "string.prototype.trim": "^1.2.8",
+        "string.prototype.trimend": "^1.0.7",
+        "string.prototype.trimstart": "^1.0.7",
         "typed-array-buffer": "^1.0.0",
         "typed-array-byte-length": "^1.0.0",
         "typed-array-byte-offset": "^1.0.0",
         "typed-array-length": "^1.0.4",
         "unbox-primitive": "^1.0.2",
-        "which-typed-array": "^1.1.10"
+        "which-typed-array": "^1.1.13"
       },
       "engines": {
         "node": ">= 0.4"
@@ -7091,26 +7106,26 @@
       "dev": true
     },
     "node_modules/es-set-tostringtag": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/es-set-tostringtag/-/es-set-tostringtag-2.0.1.tgz",
-      "integrity": "sha512-g3OMbtlwY3QewlqAiMLI47KywjWZoEytKr8pf6iTC8uJq5bIAH52Z9pnQ8pVL6whrCto53JZDuUIsifGeLorTg==",
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/es-set-tostringtag/-/es-set-tostringtag-2.0.2.tgz",
+      "integrity": "sha512-BuDyupZt65P9D2D2vA/zqcI3G5xRsklm5N3xCwuiy+/vKy8i0ifdsQP1sLgO4tZDSCaQUSnmC48khknGMV3D2Q==",
       "dev": true,
       "dependencies": {
-        "get-intrinsic": "^1.1.3",
-        "has": "^1.0.3",
-        "has-tostringtag": "^1.0.0"
+        "get-intrinsic": "^1.2.2",
+        "has-tostringtag": "^1.0.0",
+        "hasown": "^2.0.0"
       },
       "engines": {
         "node": ">= 0.4"
       }
     },
     "node_modules/es-shim-unscopables": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/es-shim-unscopables/-/es-shim-unscopables-1.0.0.tgz",
-      "integrity": "sha512-Jm6GPcCdC30eMLbZ2x8z2WuRwAws3zTBBKuusffYVUrNj/GVSUAZ+xKMaUpfNDR5IbyNA5LJbaecoUVbmUcB1w==",
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/es-shim-unscopables/-/es-shim-unscopables-1.0.2.tgz",
+      "integrity": "sha512-J3yBRXCzDu4ULnQwxyToo/OjdMx6akgVC7K6few0a7F/0wLtmKKN7I73AH5T2836UuXRqN7Qg+IIUw/+YJksRw==",
       "dev": true,
       "dependencies": {
-        "has": "^1.0.3"
+        "hasown": "^2.0.0"
       }
     },
     "node_modules/es-to-primitive": {
@@ -7356,14 +7371,14 @@
       }
     },
     "node_modules/eslint-import-resolver-node": {
-      "version": "0.3.7",
-      "resolved": "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.7.tgz",
-      "integrity": "sha512-gozW2blMLJCeFpBwugLTGyvVjNoeo1knonXAcatC6bjPBZitotxdWf7Gimr25N4c0AAOo4eOUfaG82IJPDpqCA==",
+      "version": "0.3.9",
+      "resolved": "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.9.tgz",
+      "integrity": "sha512-WFj2isz22JahUv+B788TlO3N6zL3nNJGU8CcZbPZvVEkBPaJdCV4vy5wyghty5ROFbCRnm132v8BScu5/1BQ8g==",
       "dev": true,
       "dependencies": {
         "debug": "^3.2.7",
-        "is-core-module": "^2.11.0",
-        "resolve": "^1.22.1"
+        "is-core-module": "^2.13.0",
+        "resolve": "^1.22.4"
       }
     },
     "node_modules/eslint-import-resolver-node/node_modules/debug": {
@@ -7422,26 +7437,26 @@
       }
     },
     "node_modules/eslint-plugin-import": {
-      "version": "2.28.1",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.28.1.tgz",
-      "integrity": "sha512-9I9hFlITvOV55alzoKBI+K9q74kv0iKMeY6av5+umsNwayt59fz692daGyjR+oStBQgx6nwR9rXldDev3Clw+A==",
+      "version": "2.29.0",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.29.0.tgz",
+      "integrity": "sha512-QPOO5NO6Odv5lpoTkddtutccQjysJuFxoPS7fAHO+9m9udNHvTCPSAMW9zGAYj8lAIdr40I8yPCdUYrncXtrwg==",
       "dev": true,
       "dependencies": {
-        "array-includes": "^3.1.6",
-        "array.prototype.findlastindex": "^1.2.2",
-        "array.prototype.flat": "^1.3.1",
-        "array.prototype.flatmap": "^1.3.1",
+        "array-includes": "^3.1.7",
+        "array.prototype.findlastindex": "^1.2.3",
+        "array.prototype.flat": "^1.3.2",
+        "array.prototype.flatmap": "^1.3.2",
         "debug": "^3.2.7",
         "doctrine": "^2.1.0",
-        "eslint-import-resolver-node": "^0.3.7",
+        "eslint-import-resolver-node": "^0.3.9",
         "eslint-module-utils": "^2.8.0",
-        "has": "^1.0.3",
-        "is-core-module": "^2.13.0",
+        "hasown": "^2.0.0",
+        "is-core-module": "^2.13.1",
         "is-glob": "^4.0.3",
         "minimatch": "^3.1.2",
-        "object.fromentries": "^2.0.6",
-        "object.groupby": "^1.0.0",
-        "object.values": "^1.1.6",
+        "object.fromentries": "^2.0.7",
+        "object.groupby": "^1.0.1",
+        "object.values": "^1.1.7",
         "semver": "^6.3.1",
         "tsconfig-paths": "^3.14.2"
       },
@@ -8993,20 +9008,23 @@
       }
     },
     "node_modules/function-bind": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
-      "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A=="
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz",
+      "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==",
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
     },
     "node_modules/function.prototype.name": {
-      "version": "1.1.5",
-      "resolved": "https://registry.npmjs.org/function.prototype.name/-/function.prototype.name-1.1.5.tgz",
-      "integrity": "sha512-uN7m/BzVKQnCUF/iW8jYea67v++2u7m5UgENbHRtdDVclOUP+FMPlCNdmk0h/ysGyo2tavMJEDqJAkJdRa1vMA==",
+      "version": "1.1.6",
+      "resolved": "https://registry.npmjs.org/function.prototype.name/-/function.prototype.name-1.1.6.tgz",
+      "integrity": "sha512-Z5kx79swU5P27WEayXM1tBi5Ze/lbIyiNgU3qyXUOf9b2rgXYyF9Dy9Cx+IQv/Lc8WCG6L82zwUPpSS9hGehIg==",
       "dev": true,
       "dependencies": {
         "call-bind": "^1.0.2",
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.19.0",
-        "functions-have-names": "^1.2.2"
+        "define-properties": "^1.2.0",
+        "es-abstract": "^1.22.1",
+        "functions-have-names": "^1.2.3"
       },
       "engines": {
         "node": ">= 0.4"
@@ -9054,14 +9072,14 @@
       }
     },
     "node_modules/get-intrinsic": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.1.tgz",
-      "integrity": "sha512-2DcsyfABl+gVHEfCOaTrWgyt+tb6MSEGmKq+kI5HwLbIYgjgmMcV8KQ41uaKz1xxUcn9tJtgFbQUEVcEbd0FYw==",
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.2.tgz",
+      "integrity": "sha512-0gSo4ml/0j98Y3lngkFEot/zhiCeWsbYIlZ+uZOVgzLyLaUw7wxUL+nCTP0XJvJg1AXulJRI3UJi8GsbDuxdGA==",
       "dependencies": {
-        "function-bind": "^1.1.1",
-        "has": "^1.0.3",
+        "function-bind": "^1.1.2",
         "has-proto": "^1.0.1",
-        "has-symbols": "^1.0.3"
+        "has-symbols": "^1.0.3",
+        "hasown": "^2.0.0"
       },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
@@ -9289,17 +9307,6 @@
         "node": ">=6"
       }
     },
-    "node_modules/has": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
-      "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
-      "dependencies": {
-        "function-bind": "^1.1.1"
-      },
-      "engines": {
-        "node": ">= 0.4.0"
-      }
-    },
     "node_modules/has-bigints": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.2.tgz",
@@ -9405,6 +9412,17 @@
         "minimalistic-assert": "^1.0.1"
       }
     },
+    "node_modules/hasown": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.0.tgz",
+      "integrity": "sha512-vUptKVTpIJhcczKBbgnS+RtcuYMB8+oNzPK2/Hp3hanz8JmpATdmmgLgSaadVREkDm+e2giHwY3ZRkyjSIDDFA==",
+      "dependencies": {
+        "function-bind": "^1.1.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
     "node_modules/highlight.js": {
       "version": "11.9.0",
       "resolved": "https://registry.npmjs.org/highlight.js/-/highlight.js-11.9.0.tgz",
@@ -9682,13 +9700,13 @@
       "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="
     },
     "node_modules/internal-slot": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.5.tgz",
-      "integrity": "sha512-Y+R5hJrzs52QCG2laLn4udYVnxsfny9CpOhNhUvk/SSSVyF6T27FzRbF0sroPidSu3X8oEAkOn2K804mjpt6UQ==",
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.6.tgz",
+      "integrity": "sha512-Xj6dv+PsbtwyPpEflsejS+oIZxmMlV44zAhG479uYu89MsjcYOhCFnNyKrkJrihbsiasQyY0afoCl/9BLR65bg==",
       "dev": true,
       "dependencies": {
-        "get-intrinsic": "^1.2.0",
-        "has": "^1.0.3",
+        "get-intrinsic": "^1.2.2",
+        "hasown": "^2.0.0",
         "side-channel": "^1.0.4"
       },
       "engines": {
@@ -9799,11 +9817,11 @@
       }
     },
     "node_modules/is-core-module": {
-      "version": "2.13.0",
-      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.13.0.tgz",
-      "integrity": "sha512-Z7dk6Qo8pOCp3l4tsX2C5ZVas4V+UxwQodwZhLopL91TX8UyyHEXafPcyoeeWuLrwzHcr3igO78wNLwHJHsMCQ==",
+      "version": "2.13.1",
+      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.13.1.tgz",
+      "integrity": "sha512-hHrIjvZsftOsvKSn2TRYl63zvxsgE0K+0mYMoH6gD4omR5IWB2KynivBQczo3+wF1cCkjzvptnI9Q0sPU66ilw==",
       "dependencies": {
-        "has": "^1.0.3"
+        "hasown": "^2.0.0"
       },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
@@ -10048,15 +10066,11 @@
       }
     },
     "node_modules/is-typed-array": {
-      "version": "1.1.10",
-      "resolved": "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.10.tgz",
-      "integrity": "sha512-PJqgEHiWZvMpaFZ3uTc8kHPM4+4ADTlDniuQL7cU/UDA0Ql7F70yGfHph3cLNe+c9toaigv+DFzTJKhc2CtO6A==",
+      "version": "1.1.12",
+      "resolved": "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.12.tgz",
+      "integrity": "sha512-Z14TF2JNG8Lss5/HMqt0//T9JeHXttXy5pH/DBU4vi98ozO2btxzq9MwYDZYnKwU8nRsz/+GVFVRDq3DkVuSPg==",
       "dependencies": {
-        "available-typed-arrays": "^1.0.5",
-        "call-bind": "^1.0.2",
-        "for-each": "^0.3.3",
-        "gopd": "^1.0.1",
-        "has-tostringtag": "^1.0.0"
+        "which-typed-array": "^1.1.11"
       },
       "engines": {
         "node": ">= 0.4"
@@ -13166,9 +13180,9 @@
       }
     },
     "node_modules/object-inspect": {
-      "version": "1.12.3",
-      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.3.tgz",
-      "integrity": "sha512-geUvdk7c+eizMNUDkRpW1wJwgfOiOeHbxBR/hLXK1aT6zmVSO0jsQcs7fj6MGw89jC/cjGfLcNOrtMYtGqm81g==",
+      "version": "1.13.1",
+      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.1.tgz",
+      "integrity": "sha512-5qoj1RUiKOMsCCNLV1CBiPYE10sziTsnmNxkAI/rZhiD63CF7IqdFGC/XzjWjpSgLf0LxXX3bDFIh0E18f6UhQ==",
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
       }
@@ -13214,14 +13228,14 @@
       }
     },
     "node_modules/object.fromentries": {
-      "version": "2.0.6",
-      "resolved": "https://registry.npmjs.org/object.fromentries/-/object.fromentries-2.0.6.tgz",
-      "integrity": "sha512-VciD13dswC4j1Xt5394WR4MzmAQmlgN72phd/riNp9vtD7tp4QQWJ0R4wvclXcafgcYK8veHRed2W6XeGBvcfg==",
+      "version": "2.0.7",
+      "resolved": "https://registry.npmjs.org/object.fromentries/-/object.fromentries-2.0.7.tgz",
+      "integrity": "sha512-UPbPHML6sL8PI/mOqPwsH4G6iyXcCGzLin8KvEPenOZN5lpCNBZZQ+V62vdjB1mQHrmqGQt5/OJzemUA+KJmEA==",
       "dev": true,
       "dependencies": {
         "call-bind": "^1.0.2",
-        "define-properties": "^1.1.4",
-        "es-abstract": "^1.20.4"
+        "define-properties": "^1.2.0",
+        "es-abstract": "^1.22.1"
       },
       "engines": {
         "node": ">= 0.4"
@@ -13231,26 +13245,26 @@
       }
     },
     "node_modules/object.groupby": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/object.groupby/-/object.groupby-1.0.0.tgz",
-      "integrity": "sha512-70MWG6NfRH9GnbZOikuhPPYzpUpof9iW2J9E4dW7FXTqPNb6rllE6u39SKwwiNh8lCwX3DDb5OgcKGiEBrTTyw==",
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/object.groupby/-/object.groupby-1.0.1.tgz",
+      "integrity": "sha512-HqaQtqLnp/8Bn4GL16cj+CUYbnpe1bh0TtEaWvybszDG4tgxCJuRpV8VGuvNaI1fAnI4lUJzDG55MXcOH4JZcQ==",
       "dev": true,
       "dependencies": {
         "call-bind": "^1.0.2",
         "define-properties": "^1.2.0",
-        "es-abstract": "^1.21.2",
+        "es-abstract": "^1.22.1",
         "get-intrinsic": "^1.2.1"
       }
     },
     "node_modules/object.values": {
-      "version": "1.1.6",
-      "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.1.6.tgz",
-      "integrity": "sha512-FVVTkD1vENCsAcwNs9k6jea2uHC/X0+JcjG8YA60FN5CMaJmG95wT9jek/xX9nornqGRrBkKtzuAu2wuHpKqvw==",
+      "version": "1.1.7",
+      "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.1.7.tgz",
+      "integrity": "sha512-aU6xnDFYT3x17e/f0IiiwlGPTy2jzMySGfUB4fq6z7CV8l85CWHDk5ErhyhpfDHhrOMwGFhSQkhMGHaIotA6Ng==",
       "dev": true,
       "dependencies": {
         "call-bind": "^1.0.2",
-        "define-properties": "^1.1.4",
-        "es-abstract": "^1.20.4"
+        "define-properties": "^1.2.0",
+        "es-abstract": "^1.22.1"
       },
       "engines": {
         "node": ">= 0.4"
@@ -14807,14 +14821,14 @@
       }
     },
     "node_modules/regexp.prototype.flags": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.5.0.tgz",
-      "integrity": "sha512-0SutC3pNudRKgquxGoRGIz946MZVHqbNfPjBdxeOhBrdgDKlRoXmYLQN9xRbrR09ZXWeGAdPuif7egofn6v5LA==",
+      "version": "1.5.1",
+      "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.5.1.tgz",
+      "integrity": "sha512-sy6TXMN+hnP/wMy+ISxg3krXx7BAtWVO4UouuCN/ziM9UEne0euamVNafDfvC83bRNr95y0V5iijeDQFUNpvrg==",
       "dev": true,
       "dependencies": {
         "call-bind": "^1.0.2",
         "define-properties": "^1.2.0",
-        "functions-have-names": "^1.2.3"
+        "set-function-name": "^2.0.0"
       },
       "engines": {
         "node": ">= 0.4"
@@ -14945,11 +14959,11 @@
       "dev": true
     },
     "node_modules/resolve": {
-      "version": "1.22.3",
-      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.3.tgz",
-      "integrity": "sha512-P8ur/gp/AmbEzjr729bZnLjXK5Z+4P0zhIJgBgzqRih7hL7BOukHGtSTA3ACMY467GRFz3duQsi0bDZdR7DKdw==",
+      "version": "1.22.8",
+      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.8.tgz",
+      "integrity": "sha512-oKWePCxqpd6FlLvGV1VU0x7bkPmmCNolxzjMf4NczoDnQcIWrAF+cPtZn5i6n+RfD2d9i0tzpKnG6Yk168yIyw==",
       "dependencies": {
-        "is-core-module": "^2.12.0",
+        "is-core-module": "^2.13.0",
         "path-parse": "^1.0.7",
         "supports-preserve-symlinks-flag": "^1.0.0"
       },
@@ -15097,13 +15111,13 @@
       "integrity": "sha512-4VlvkRUuCJvr2J6Y0ImW7NvTCriMi7ErOAqWk1y69vAdoNIzCF3yPmgeNzx+RQTLEDFq5sHfscn1MwHxP9hNfA=="
     },
     "node_modules/safe-array-concat": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/safe-array-concat/-/safe-array-concat-1.0.0.tgz",
-      "integrity": "sha512-9dVEFruWIsnie89yym+xWTAYASdpw3CJV7Li/6zBewGf9z2i1j31rP6jnY0pHEO4QZh6N0K11bFjWmdR8UGdPQ==",
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/safe-array-concat/-/safe-array-concat-1.0.1.tgz",
+      "integrity": "sha512-6XbUAseYE2KtOuGueyeobCySj9L4+66Tn6KQMOPQJrAJEowYKW/YR/MGJZl7FdydUdaFu4LYyDZjxf4/Nmo23Q==",
       "dev": true,
       "dependencies": {
         "call-bind": "^1.0.2",
-        "get-intrinsic": "^1.2.0",
+        "get-intrinsic": "^1.2.1",
         "has-symbols": "^1.0.3",
         "isarray": "^2.0.5"
       },
@@ -15410,6 +15424,34 @@
       "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz",
       "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc="
     },
+    "node_modules/set-function-length": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/set-function-length/-/set-function-length-1.1.1.tgz",
+      "integrity": "sha512-VoaqjbBJKiWtg4yRcKBQ7g7wnGnLV3M8oLvVWwOk2PdYY6PEFegR1vezXR0tw6fZGF9csVakIRjrJiy2veSBFQ==",
+      "dependencies": {
+        "define-data-property": "^1.1.1",
+        "get-intrinsic": "^1.2.1",
+        "gopd": "^1.0.1",
+        "has-property-descriptors": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/set-function-name": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/set-function-name/-/set-function-name-2.0.1.tgz",
+      "integrity": "sha512-tMNCiqYVkXIZgc2Hnoy2IvC/f8ezc5koaRFkCjrpWzGpCd3qbZXPzVy9MAZzK1ch/X0jvSkojys3oqJN0qCmdA==",
+      "dev": true,
+      "dependencies": {
+        "define-data-property": "^1.0.1",
+        "functions-have-names": "^1.2.3",
+        "has-property-descriptors": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
     "node_modules/set-immediate-shim": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/set-immediate-shim/-/set-immediate-shim-1.0.1.tgz",
@@ -15730,14 +15772,14 @@
       }
     },
     "node_modules/string.prototype.trim": {
-      "version": "1.2.7",
-      "resolved": "https://registry.npmjs.org/string.prototype.trim/-/string.prototype.trim-1.2.7.tgz",
-      "integrity": "sha512-p6TmeT1T3411M8Cgg9wBTMRtY2q9+PNy9EV1i2lIXUN/btt763oIfxwN3RR8VU6wHX8j/1CFy0L+YuThm6bgOg==",
+      "version": "1.2.8",
+      "resolved": "https://registry.npmjs.org/string.prototype.trim/-/string.prototype.trim-1.2.8.tgz",
+      "integrity": "sha512-lfjY4HcixfQXOfaqCvcBuOIapyaroTXhbkfJN3gcB1OtyupngWK4sEET9Knd0cXd28kTUqu/kHoV4HKSJdnjiQ==",
       "dev": true,
       "dependencies": {
         "call-bind": "^1.0.2",
-        "define-properties": "^1.1.4",
-        "es-abstract": "^1.20.4"
+        "define-properties": "^1.2.0",
+        "es-abstract": "^1.22.1"
       },
       "engines": {
         "node": ">= 0.4"
@@ -15747,28 +15789,28 @@
       }
     },
     "node_modules/string.prototype.trimend": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.6.tgz",
-      "integrity": "sha512-JySq+4mrPf9EsDBEDYMOb/lM7XQLulwg5R/m1r0PXEFqrV0qHvl58sdTilSXtKOflCsK2E8jxf+GKC0T07RWwQ==",
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.7.tgz",
+      "integrity": "sha512-Ni79DqeB72ZFq1uH/L6zJ+DKZTkOtPIHovb3YZHQViE+HDouuU4mBrLOLDn5Dde3RF8qw5qVETEjhu9locMLvA==",
       "dev": true,
       "dependencies": {
         "call-bind": "^1.0.2",
-        "define-properties": "^1.1.4",
-        "es-abstract": "^1.20.4"
+        "define-properties": "^1.2.0",
+        "es-abstract": "^1.22.1"
       },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
       }
     },
     "node_modules/string.prototype.trimstart": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.6.tgz",
-      "integrity": "sha512-omqjMDaY92pbn5HOX7f9IccLA+U1tA9GvtU4JrodiXFfYB7jPzzHpRzpglLAjtUV6bB557zwClJezTqnAiYnQA==",
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.7.tgz",
+      "integrity": "sha512-NGhtDFu3jCEm7B4Fy0DpLewdJQOZcQ0rGbwQ/+stjnrp2i+rlKeCvos9hOIeCmqwratM47OBxY7uFZzjxHXmrg==",
       "dev": true,
       "dependencies": {
         "call-bind": "^1.0.2",
-        "define-properties": "^1.1.4",
-        "es-abstract": "^1.20.4"
+        "define-properties": "^1.2.0",
+        "es-abstract": "^1.22.1"
       },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
@@ -17512,12 +17554,12 @@
       "integrity": "sha512-B+enWhmw6cjfVC7kS8Pj9pCrKSc5txArRyaYGe088shv/FGWH+0Rjx/xPgtsWfsUtS27FkP697E4DDhgrgoc0Q=="
     },
     "node_modules/which-typed-array": {
-      "version": "1.1.11",
-      "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.11.tgz",
-      "integrity": "sha512-qe9UWWpkeG5yzZ0tNYxDmd7vo58HDBc39mZ0xWWpolAGADdFOzkfamWLDxkOWcvHQKVmdTyQdLD4NOfjLWTKew==",
+      "version": "1.1.13",
+      "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.13.tgz",
+      "integrity": "sha512-P5Nra0qjSncduVPEAr7xhoF5guty49ArDTwzJ/yNuPIbZppyRxFQsRCWrocxIY+CnMVG+qfbU2FmDKyvSGClow==",
       "dependencies": {
         "available-typed-arrays": "^1.0.5",
-        "call-bind": "^1.0.2",
+        "call-bind": "^1.0.4",
         "for-each": "^0.3.3",
         "gopd": "^1.0.1",
         "has-tostringtag": "^1.0.0"
@@ -21008,64 +21050,65 @@
       "integrity": "sha512-PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg=="
     },
     "array-includes": {
-      "version": "3.1.6",
-      "resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.1.6.tgz",
-      "integrity": "sha512-sgTbLvL6cNnw24FnbaDyjmvddQ2ML8arZsgaJhoABMoplz/4QRhtrYS+alr1BUM1Bwp6dhx8vVCBSLG+StwOFw==",
+      "version": "3.1.7",
+      "resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.1.7.tgz",
+      "integrity": "sha512-dlcsNBIiWhPkHdOEEKnehA+RNUWDc4UqFtnIXU4uuYDPtA4LDkr7qip2p0VvFAEXNDr0yWZ9PJyIRiGjRLQzwQ==",
       "dev": true,
       "requires": {
         "call-bind": "^1.0.2",
-        "define-properties": "^1.1.4",
-        "es-abstract": "^1.20.4",
-        "get-intrinsic": "^1.1.3",
+        "define-properties": "^1.2.0",
+        "es-abstract": "^1.22.1",
+        "get-intrinsic": "^1.2.1",
         "is-string": "^1.0.7"
       }
     },
     "array.prototype.findlastindex": {
-      "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/array.prototype.findlastindex/-/array.prototype.findlastindex-1.2.2.tgz",
-      "integrity": "sha512-tb5thFFlUcp7NdNF6/MpDk/1r/4awWG1FIz3YqDf+/zJSTezBb+/5WViH41obXULHVpDzoiCLpJ/ZO9YbJMsdw==",
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/array.prototype.findlastindex/-/array.prototype.findlastindex-1.2.3.tgz",
+      "integrity": "sha512-LzLoiOMAxvy+Gd3BAq3B7VeIgPdo+Q8hthvKtXybMvRV0jrXfJM/t8mw7nNlpEcVlVUnCnM2KSX4XU5HmpodOA==",
       "dev": true,
       "requires": {
         "call-bind": "^1.0.2",
-        "define-properties": "^1.1.4",
-        "es-abstract": "^1.20.4",
+        "define-properties": "^1.2.0",
+        "es-abstract": "^1.22.1",
         "es-shim-unscopables": "^1.0.0",
-        "get-intrinsic": "^1.1.3"
+        "get-intrinsic": "^1.2.1"
       }
     },
     "array.prototype.flat": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.3.1.tgz",
-      "integrity": "sha512-roTU0KWIOmJ4DRLmwKd19Otg0/mT3qPNt0Qb3GWW8iObuZXxrjB/pzn0R3hqpRSWg4HCwqx+0vwOnWnvlOyeIA==",
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.3.2.tgz",
+      "integrity": "sha512-djYB+Zx2vLewY8RWlNCUdHjDXs2XOgm602S9E7P/UpHgfeHL00cRiIF+IN/G/aUJ7kGPb6yO/ErDI5V2s8iycA==",
       "dev": true,
       "requires": {
         "call-bind": "^1.0.2",
-        "define-properties": "^1.1.4",
-        "es-abstract": "^1.20.4",
+        "define-properties": "^1.2.0",
+        "es-abstract": "^1.22.1",
         "es-shim-unscopables": "^1.0.0"
       }
     },
     "array.prototype.flatmap": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/array.prototype.flatmap/-/array.prototype.flatmap-1.3.1.tgz",
-      "integrity": "sha512-8UGn9O1FDVvMNB0UlLv4voxRMze7+FpHyF5mSMRjWHUMlpoDViniy05870VlxhfgTnLbpuwTzvD76MTtWxB/mQ==",
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/array.prototype.flatmap/-/array.prototype.flatmap-1.3.2.tgz",
+      "integrity": "sha512-Ewyx0c9PmpcsByhSW4r+9zDU7sGjFc86qf/kKtuSCRdhfbk0SNLLkaT5qvcHnRGgc5NP/ly/y+qkXkqONX54CQ==",
       "dev": true,
       "requires": {
         "call-bind": "^1.0.2",
-        "define-properties": "^1.1.4",
-        "es-abstract": "^1.20.4",
+        "define-properties": "^1.2.0",
+        "es-abstract": "^1.22.1",
         "es-shim-unscopables": "^1.0.0"
       }
     },
     "arraybuffer.prototype.slice": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/arraybuffer.prototype.slice/-/arraybuffer.prototype.slice-1.0.1.tgz",
-      "integrity": "sha512-09x0ZWFEjj4WD8PDbykUwo3t9arLn8NIzmmYEJFpYekOAQjpkGSyrQhNoRTcwwcFRu+ycWF78QZ63oWTqSjBcw==",
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/arraybuffer.prototype.slice/-/arraybuffer.prototype.slice-1.0.2.tgz",
+      "integrity": "sha512-yMBKppFur/fbHu9/6USUe03bZ4knMYiwFBcyiaXB8Go0qNehwX6inYPzK9U0NeQvGxKthcmHcaR8P5MStSRBAw==",
       "dev": true,
       "requires": {
         "array-buffer-byte-length": "^1.0.0",
         "call-bind": "^1.0.2",
         "define-properties": "^1.2.0",
+        "es-abstract": "^1.22.1",
         "get-intrinsic": "^1.2.1",
         "is-array-buffer": "^3.0.2",
         "is-shared-array-buffer": "^1.0.2"
@@ -21772,12 +21815,13 @@
       }
     },
     "call-bind": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz",
-      "integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==",
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.5.tgz",
+      "integrity": "sha512-C3nQxfFZxFRVoJoGKKI8y3MOEo129NQ+FgQ08iye+Mk4zNZZGdjfs06bVTr+DBSlA66Q2VEcMki/cUCP4SercQ==",
       "requires": {
-        "function-bind": "^1.1.1",
-        "get-intrinsic": "^1.0.2"
+        "function-bind": "^1.1.2",
+        "get-intrinsic": "^1.2.1",
+        "set-function-length": "^1.1.1"
       }
     },
     "callsites": {
@@ -22694,6 +22738,16 @@
         "abstract-leveldown": "~2.6.0"
       }
     },
+    "define-data-property": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.1.tgz",
+      "integrity": "sha512-E7uGkTzkk1d0ByLeSc6ZsFS79Axg+m1P/VsgYsxHgiuc3tFSj+MjMIwe90FC4lOAZzNBdY7kkO2P2wKdsQ1vgQ==",
+      "requires": {
+        "get-intrinsic": "^1.2.1",
+        "gopd": "^1.0.1",
+        "has-property-descriptors": "^1.0.0"
+      }
+    },
     "define-properties": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.2.0.tgz",
@@ -22978,26 +23032,26 @@
       }
     },
     "es-abstract": {
-      "version": "1.22.1",
-      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.22.1.tgz",
-      "integrity": "sha512-ioRRcXMO6OFyRpyzV3kE1IIBd4WG5/kltnzdxSCqoP8CMGs/Li+M1uF5o7lOkZVFjDs+NLesthnF66Pg/0q0Lw==",
+      "version": "1.22.3",
+      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.22.3.tgz",
+      "integrity": "sha512-eiiY8HQeYfYH2Con2berK+To6GrK2RxbPawDkGq4UiCQQfZHb6wX9qQqkbpPqaxQFcl8d9QzZqo0tGE0VcrdwA==",
       "dev": true,
       "requires": {
         "array-buffer-byte-length": "^1.0.0",
-        "arraybuffer.prototype.slice": "^1.0.1",
+        "arraybuffer.prototype.slice": "^1.0.2",
         "available-typed-arrays": "^1.0.5",
-        "call-bind": "^1.0.2",
+        "call-bind": "^1.0.5",
         "es-set-tostringtag": "^2.0.1",
         "es-to-primitive": "^1.2.1",
-        "function.prototype.name": "^1.1.5",
-        "get-intrinsic": "^1.2.1",
+        "function.prototype.name": "^1.1.6",
+        "get-intrinsic": "^1.2.2",
         "get-symbol-description": "^1.0.0",
         "globalthis": "^1.0.3",
         "gopd": "^1.0.1",
-        "has": "^1.0.3",
         "has-property-descriptors": "^1.0.0",
         "has-proto": "^1.0.1",
         "has-symbols": "^1.0.3",
+        "hasown": "^2.0.0",
         "internal-slot": "^1.0.5",
         "is-array-buffer": "^3.0.2",
         "is-callable": "^1.2.7",
@@ -23005,23 +23059,23 @@
         "is-regex": "^1.1.4",
         "is-shared-array-buffer": "^1.0.2",
         "is-string": "^1.0.7",
-        "is-typed-array": "^1.1.10",
+        "is-typed-array": "^1.1.12",
         "is-weakref": "^1.0.2",
-        "object-inspect": "^1.12.3",
+        "object-inspect": "^1.13.1",
         "object-keys": "^1.1.1",
         "object.assign": "^4.1.4",
-        "regexp.prototype.flags": "^1.5.0",
-        "safe-array-concat": "^1.0.0",
+        "regexp.prototype.flags": "^1.5.1",
+        "safe-array-concat": "^1.0.1",
         "safe-regex-test": "^1.0.0",
-        "string.prototype.trim": "^1.2.7",
-        "string.prototype.trimend": "^1.0.6",
-        "string.prototype.trimstart": "^1.0.6",
+        "string.prototype.trim": "^1.2.8",
+        "string.prototype.trimend": "^1.0.7",
+        "string.prototype.trimstart": "^1.0.7",
         "typed-array-buffer": "^1.0.0",
         "typed-array-byte-length": "^1.0.0",
         "typed-array-byte-offset": "^1.0.0",
         "typed-array-length": "^1.0.4",
         "unbox-primitive": "^1.0.2",
-        "which-typed-array": "^1.1.10"
+        "which-typed-array": "^1.1.13"
       }
     },
     "es-module-lexer": {
@@ -23031,23 +23085,23 @@
       "dev": true
     },
     "es-set-tostringtag": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/es-set-tostringtag/-/es-set-tostringtag-2.0.1.tgz",
-      "integrity": "sha512-g3OMbtlwY3QewlqAiMLI47KywjWZoEytKr8pf6iTC8uJq5bIAH52Z9pnQ8pVL6whrCto53JZDuUIsifGeLorTg==",
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/es-set-tostringtag/-/es-set-tostringtag-2.0.2.tgz",
+      "integrity": "sha512-BuDyupZt65P9D2D2vA/zqcI3G5xRsklm5N3xCwuiy+/vKy8i0ifdsQP1sLgO4tZDSCaQUSnmC48khknGMV3D2Q==",
       "dev": true,
       "requires": {
-        "get-intrinsic": "^1.1.3",
-        "has": "^1.0.3",
-        "has-tostringtag": "^1.0.0"
+        "get-intrinsic": "^1.2.2",
+        "has-tostringtag": "^1.0.0",
+        "hasown": "^2.0.0"
       }
     },
     "es-shim-unscopables": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/es-shim-unscopables/-/es-shim-unscopables-1.0.0.tgz",
-      "integrity": "sha512-Jm6GPcCdC30eMLbZ2x8z2WuRwAws3zTBBKuusffYVUrNj/GVSUAZ+xKMaUpfNDR5IbyNA5LJbaecoUVbmUcB1w==",
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/es-shim-unscopables/-/es-shim-unscopables-1.0.2.tgz",
+      "integrity": "sha512-J3yBRXCzDu4ULnQwxyToo/OjdMx6akgVC7K6few0a7F/0wLtmKKN7I73AH5T2836UuXRqN7Qg+IIUw/+YJksRw==",
       "dev": true,
       "requires": {
-        "has": "^1.0.3"
+        "hasown": "^2.0.0"
       }
     },
     "es-to-primitive": {
@@ -23361,14 +23415,14 @@
       "requires": {}
     },
     "eslint-import-resolver-node": {
-      "version": "0.3.7",
-      "resolved": "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.7.tgz",
-      "integrity": "sha512-gozW2blMLJCeFpBwugLTGyvVjNoeo1knonXAcatC6bjPBZitotxdWf7Gimr25N4c0AAOo4eOUfaG82IJPDpqCA==",
+      "version": "0.3.9",
+      "resolved": "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.9.tgz",
+      "integrity": "sha512-WFj2isz22JahUv+B788TlO3N6zL3nNJGU8CcZbPZvVEkBPaJdCV4vy5wyghty5ROFbCRnm132v8BScu5/1BQ8g==",
       "dev": true,
       "requires": {
         "debug": "^3.2.7",
-        "is-core-module": "^2.11.0",
-        "resolve": "^1.22.1"
+        "is-core-module": "^2.13.0",
+        "resolve": "^1.22.4"
       },
       "dependencies": {
         "debug": {
@@ -23414,26 +23468,26 @@
       }
     },
     "eslint-plugin-import": {
-      "version": "2.28.1",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.28.1.tgz",
-      "integrity": "sha512-9I9hFlITvOV55alzoKBI+K9q74kv0iKMeY6av5+umsNwayt59fz692daGyjR+oStBQgx6nwR9rXldDev3Clw+A==",
+      "version": "2.29.0",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.29.0.tgz",
+      "integrity": "sha512-QPOO5NO6Odv5lpoTkddtutccQjysJuFxoPS7fAHO+9m9udNHvTCPSAMW9zGAYj8lAIdr40I8yPCdUYrncXtrwg==",
       "dev": true,
       "requires": {
-        "array-includes": "^3.1.6",
-        "array.prototype.findlastindex": "^1.2.2",
-        "array.prototype.flat": "^1.3.1",
-        "array.prototype.flatmap": "^1.3.1",
+        "array-includes": "^3.1.7",
+        "array.prototype.findlastindex": "^1.2.3",
+        "array.prototype.flat": "^1.3.2",
+        "array.prototype.flatmap": "^1.3.2",
         "debug": "^3.2.7",
         "doctrine": "^2.1.0",
-        "eslint-import-resolver-node": "^0.3.7",
+        "eslint-import-resolver-node": "^0.3.9",
         "eslint-module-utils": "^2.8.0",
-        "has": "^1.0.3",
-        "is-core-module": "^2.13.0",
+        "hasown": "^2.0.0",
+        "is-core-module": "^2.13.1",
         "is-glob": "^4.0.3",
         "minimatch": "^3.1.2",
-        "object.fromentries": "^2.0.6",
-        "object.groupby": "^1.0.0",
-        "object.values": "^1.1.6",
+        "object.fromentries": "^2.0.7",
+        "object.groupby": "^1.0.1",
+        "object.values": "^1.1.7",
         "semver": "^6.3.1",
         "tsconfig-paths": "^3.14.2"
       },
@@ -24576,20 +24630,20 @@
       "optional": true
     },
     "function-bind": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
-      "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A=="
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz",
+      "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA=="
     },
     "function.prototype.name": {
-      "version": "1.1.5",
-      "resolved": "https://registry.npmjs.org/function.prototype.name/-/function.prototype.name-1.1.5.tgz",
-      "integrity": "sha512-uN7m/BzVKQnCUF/iW8jYea67v++2u7m5UgENbHRtdDVclOUP+FMPlCNdmk0h/ysGyo2tavMJEDqJAkJdRa1vMA==",
+      "version": "1.1.6",
+      "resolved": "https://registry.npmjs.org/function.prototype.name/-/function.prototype.name-1.1.6.tgz",
+      "integrity": "sha512-Z5kx79swU5P27WEayXM1tBi5Ze/lbIyiNgU3qyXUOf9b2rgXYyF9Dy9Cx+IQv/Lc8WCG6L82zwUPpSS9hGehIg==",
       "dev": true,
       "requires": {
         "call-bind": "^1.0.2",
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.19.0",
-        "functions-have-names": "^1.2.2"
+        "define-properties": "^1.2.0",
+        "es-abstract": "^1.22.1",
+        "functions-have-names": "^1.2.3"
       }
     },
     "functional-red-black-tree": {
@@ -24619,14 +24673,14 @@
       "integrity": "sha512-8vXOvuE167CtIc3OyItco7N/dpRtBbYOsPsXCz7X/PMnlGjYjSGuZJgM1Y7mmew7BKf9BqvLX2tnOVy1BBUsxQ=="
     },
     "get-intrinsic": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.1.tgz",
-      "integrity": "sha512-2DcsyfABl+gVHEfCOaTrWgyt+tb6MSEGmKq+kI5HwLbIYgjgmMcV8KQ41uaKz1xxUcn9tJtgFbQUEVcEbd0FYw==",
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.2.tgz",
+      "integrity": "sha512-0gSo4ml/0j98Y3lngkFEot/zhiCeWsbYIlZ+uZOVgzLyLaUw7wxUL+nCTP0XJvJg1AXulJRI3UJi8GsbDuxdGA==",
       "requires": {
-        "function-bind": "^1.1.1",
-        "has": "^1.0.3",
+        "function-bind": "^1.1.2",
         "has-proto": "^1.0.1",
-        "has-symbols": "^1.0.3"
+        "has-symbols": "^1.0.3",
+        "hasown": "^2.0.0"
       }
     },
     "get-package-type": {
@@ -24792,14 +24846,6 @@
         "har-schema": "^2.0.0"
       }
     },
-    "has": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
-      "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
-      "requires": {
-        "function-bind": "^1.1.1"
-      }
-    },
     "has-bigints": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.2.tgz",
@@ -24863,6 +24909,14 @@
         "minimalistic-assert": "^1.0.1"
       }
     },
+    "hasown": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.0.tgz",
+      "integrity": "sha512-vUptKVTpIJhcczKBbgnS+RtcuYMB8+oNzPK2/Hp3hanz8JmpATdmmgLgSaadVREkDm+e2giHwY3ZRkyjSIDDFA==",
+      "requires": {
+        "function-bind": "^1.1.2"
+      }
+    },
     "highlight.js": {
       "version": "11.9.0",
       "resolved": "https://registry.npmjs.org/highlight.js/-/highlight.js-11.9.0.tgz",
@@ -25073,13 +25127,13 @@
       "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="
     },
     "internal-slot": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.5.tgz",
-      "integrity": "sha512-Y+R5hJrzs52QCG2laLn4udYVnxsfny9CpOhNhUvk/SSSVyF6T27FzRbF0sroPidSu3X8oEAkOn2K804mjpt6UQ==",
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.6.tgz",
+      "integrity": "sha512-Xj6dv+PsbtwyPpEflsejS+oIZxmMlV44zAhG479uYu89MsjcYOhCFnNyKrkJrihbsiasQyY0afoCl/9BLR65bg==",
       "dev": true,
       "requires": {
-        "get-intrinsic": "^1.2.0",
-        "has": "^1.0.3",
+        "get-intrinsic": "^1.2.2",
+        "hasown": "^2.0.0",
         "side-channel": "^1.0.4"
       }
     },
@@ -25154,11 +25208,11 @@
       "integrity": "sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA=="
     },
     "is-core-module": {
-      "version": "2.13.0",
-      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.13.0.tgz",
-      "integrity": "sha512-Z7dk6Qo8pOCp3l4tsX2C5ZVas4V+UxwQodwZhLopL91TX8UyyHEXafPcyoeeWuLrwzHcr3igO78wNLwHJHsMCQ==",
+      "version": "2.13.1",
+      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.13.1.tgz",
+      "integrity": "sha512-hHrIjvZsftOsvKSn2TRYl63zvxsgE0K+0mYMoH6gD4omR5IWB2KynivBQczo3+wF1cCkjzvptnI9Q0sPU66ilw==",
       "requires": {
-        "has": "^1.0.3"
+        "hasown": "^2.0.0"
       }
     },
     "is-date-object": {
@@ -25315,15 +25369,11 @@
       }
     },
     "is-typed-array": {
-      "version": "1.1.10",
-      "resolved": "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.10.tgz",
-      "integrity": "sha512-PJqgEHiWZvMpaFZ3uTc8kHPM4+4ADTlDniuQL7cU/UDA0Ql7F70yGfHph3cLNe+c9toaigv+DFzTJKhc2CtO6A==",
+      "version": "1.1.12",
+      "resolved": "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.12.tgz",
+      "integrity": "sha512-Z14TF2JNG8Lss5/HMqt0//T9JeHXttXy5pH/DBU4vi98ozO2btxzq9MwYDZYnKwU8nRsz/+GVFVRDq3DkVuSPg==",
       "requires": {
-        "available-typed-arrays": "^1.0.5",
-        "call-bind": "^1.0.2",
-        "for-each": "^0.3.3",
-        "gopd": "^1.0.1",
-        "has-tostringtag": "^1.0.0"
+        "which-typed-array": "^1.1.11"
       }
     },
     "is-typedarray": {
@@ -27752,9 +27802,9 @@
       "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM="
     },
     "object-inspect": {
-      "version": "1.12.3",
-      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.3.tgz",
-      "integrity": "sha512-geUvdk7c+eizMNUDkRpW1wJwgfOiOeHbxBR/hLXK1aT6zmVSO0jsQcs7fj6MGw89jC/cjGfLcNOrtMYtGqm81g=="
+      "version": "1.13.1",
+      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.1.tgz",
+      "integrity": "sha512-5qoj1RUiKOMsCCNLV1CBiPYE10sziTsnmNxkAI/rZhiD63CF7IqdFGC/XzjWjpSgLf0LxXX3bDFIh0E18f6UhQ=="
     },
     "object-is": {
       "version": "1.1.5",
@@ -27782,37 +27832,37 @@
       }
     },
     "object.fromentries": {
-      "version": "2.0.6",
-      "resolved": "https://registry.npmjs.org/object.fromentries/-/object.fromentries-2.0.6.tgz",
-      "integrity": "sha512-VciD13dswC4j1Xt5394WR4MzmAQmlgN72phd/riNp9vtD7tp4QQWJ0R4wvclXcafgcYK8veHRed2W6XeGBvcfg==",
+      "version": "2.0.7",
+      "resolved": "https://registry.npmjs.org/object.fromentries/-/object.fromentries-2.0.7.tgz",
+      "integrity": "sha512-UPbPHML6sL8PI/mOqPwsH4G6iyXcCGzLin8KvEPenOZN5lpCNBZZQ+V62vdjB1mQHrmqGQt5/OJzemUA+KJmEA==",
       "dev": true,
       "requires": {
         "call-bind": "^1.0.2",
-        "define-properties": "^1.1.4",
-        "es-abstract": "^1.20.4"
+        "define-properties": "^1.2.0",
+        "es-abstract": "^1.22.1"
       }
     },
     "object.groupby": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/object.groupby/-/object.groupby-1.0.0.tgz",
-      "integrity": "sha512-70MWG6NfRH9GnbZOikuhPPYzpUpof9iW2J9E4dW7FXTqPNb6rllE6u39SKwwiNh8lCwX3DDb5OgcKGiEBrTTyw==",
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/object.groupby/-/object.groupby-1.0.1.tgz",
+      "integrity": "sha512-HqaQtqLnp/8Bn4GL16cj+CUYbnpe1bh0TtEaWvybszDG4tgxCJuRpV8VGuvNaI1fAnI4lUJzDG55MXcOH4JZcQ==",
       "dev": true,
       "requires": {
         "call-bind": "^1.0.2",
         "define-properties": "^1.2.0",
-        "es-abstract": "^1.21.2",
+        "es-abstract": "^1.22.1",
         "get-intrinsic": "^1.2.1"
       }
     },
     "object.values": {
-      "version": "1.1.6",
-      "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.1.6.tgz",
-      "integrity": "sha512-FVVTkD1vENCsAcwNs9k6jea2uHC/X0+JcjG8YA60FN5CMaJmG95wT9jek/xX9nornqGRrBkKtzuAu2wuHpKqvw==",
+      "version": "1.1.7",
+      "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.1.7.tgz",
+      "integrity": "sha512-aU6xnDFYT3x17e/f0IiiwlGPTy2jzMySGfUB4fq6z7CV8l85CWHDk5ErhyhpfDHhrOMwGFhSQkhMGHaIotA6Ng==",
       "dev": true,
       "requires": {
         "call-bind": "^1.0.2",
-        "define-properties": "^1.1.4",
-        "es-abstract": "^1.20.4"
+        "define-properties": "^1.2.0",
+        "es-abstract": "^1.22.1"
       }
     },
     "oboe": {
@@ -28898,14 +28948,14 @@
       }
     },
     "regexp.prototype.flags": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.5.0.tgz",
-      "integrity": "sha512-0SutC3pNudRKgquxGoRGIz946MZVHqbNfPjBdxeOhBrdgDKlRoXmYLQN9xRbrR09ZXWeGAdPuif7egofn6v5LA==",
+      "version": "1.5.1",
+      "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.5.1.tgz",
+      "integrity": "sha512-sy6TXMN+hnP/wMy+ISxg3krXx7BAtWVO4UouuCN/ziM9UEne0euamVNafDfvC83bRNr95y0V5iijeDQFUNpvrg==",
       "dev": true,
       "requires": {
         "call-bind": "^1.0.2",
         "define-properties": "^1.2.0",
-        "functions-have-names": "^1.2.3"
+        "set-function-name": "^2.0.0"
       }
     },
     "regexpp": {
@@ -29006,11 +29056,11 @@
       "dev": true
     },
     "resolve": {
-      "version": "1.22.3",
-      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.3.tgz",
-      "integrity": "sha512-P8ur/gp/AmbEzjr729bZnLjXK5Z+4P0zhIJgBgzqRih7hL7BOukHGtSTA3ACMY467GRFz3duQsi0bDZdR7DKdw==",
+      "version": "1.22.8",
+      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.8.tgz",
+      "integrity": "sha512-oKWePCxqpd6FlLvGV1VU0x7bkPmmCNolxzjMf4NczoDnQcIWrAF+cPtZn5i6n+RfD2d9i0tzpKnG6Yk168yIyw==",
       "requires": {
-        "is-core-module": "^2.12.0",
+        "is-core-module": "^2.13.0",
         "path-parse": "^1.0.7",
         "supports-preserve-symlinks-flag": "^1.0.0"
       }
@@ -29111,13 +29161,13 @@
       "integrity": "sha512-4VlvkRUuCJvr2J6Y0ImW7NvTCriMi7ErOAqWk1y69vAdoNIzCF3yPmgeNzx+RQTLEDFq5sHfscn1MwHxP9hNfA=="
     },
     "safe-array-concat": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/safe-array-concat/-/safe-array-concat-1.0.0.tgz",
-      "integrity": "sha512-9dVEFruWIsnie89yym+xWTAYASdpw3CJV7Li/6zBewGf9z2i1j31rP6jnY0pHEO4QZh6N0K11bFjWmdR8UGdPQ==",
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/safe-array-concat/-/safe-array-concat-1.0.1.tgz",
+      "integrity": "sha512-6XbUAseYE2KtOuGueyeobCySj9L4+66Tn6KQMOPQJrAJEowYKW/YR/MGJZl7FdydUdaFu4LYyDZjxf4/Nmo23Q==",
       "dev": true,
       "requires": {
         "call-bind": "^1.0.2",
-        "get-intrinsic": "^1.2.0",
+        "get-intrinsic": "^1.2.1",
         "has-symbols": "^1.0.3",
         "isarray": "^2.0.5"
       },
@@ -29352,6 +29402,28 @@
       "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz",
       "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc="
     },
+    "set-function-length": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/set-function-length/-/set-function-length-1.1.1.tgz",
+      "integrity": "sha512-VoaqjbBJKiWtg4yRcKBQ7g7wnGnLV3M8oLvVWwOk2PdYY6PEFegR1vezXR0tw6fZGF9csVakIRjrJiy2veSBFQ==",
+      "requires": {
+        "define-data-property": "^1.1.1",
+        "get-intrinsic": "^1.2.1",
+        "gopd": "^1.0.1",
+        "has-property-descriptors": "^1.0.0"
+      }
+    },
+    "set-function-name": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/set-function-name/-/set-function-name-2.0.1.tgz",
+      "integrity": "sha512-tMNCiqYVkXIZgc2Hnoy2IvC/f8ezc5koaRFkCjrpWzGpCd3qbZXPzVy9MAZzK1ch/X0jvSkojys3oqJN0qCmdA==",
+      "dev": true,
+      "requires": {
+        "define-data-property": "^1.0.1",
+        "functions-have-names": "^1.2.3",
+        "has-property-descriptors": "^1.0.0"
+      }
+    },
     "set-immediate-shim": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/set-immediate-shim/-/set-immediate-shim-1.0.1.tgz",
@@ -29591,36 +29663,36 @@
       }
     },
     "string.prototype.trim": {
-      "version": "1.2.7",
-      "resolved": "https://registry.npmjs.org/string.prototype.trim/-/string.prototype.trim-1.2.7.tgz",
-      "integrity": "sha512-p6TmeT1T3411M8Cgg9wBTMRtY2q9+PNy9EV1i2lIXUN/btt763oIfxwN3RR8VU6wHX8j/1CFy0L+YuThm6bgOg==",
+      "version": "1.2.8",
+      "resolved": "https://registry.npmjs.org/string.prototype.trim/-/string.prototype.trim-1.2.8.tgz",
+      "integrity": "sha512-lfjY4HcixfQXOfaqCvcBuOIapyaroTXhbkfJN3gcB1OtyupngWK4sEET9Knd0cXd28kTUqu/kHoV4HKSJdnjiQ==",
       "dev": true,
       "requires": {
         "call-bind": "^1.0.2",
-        "define-properties": "^1.1.4",
-        "es-abstract": "^1.20.4"
+        "define-properties": "^1.2.0",
+        "es-abstract": "^1.22.1"
       }
     },
     "string.prototype.trimend": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.6.tgz",
-      "integrity": "sha512-JySq+4mrPf9EsDBEDYMOb/lM7XQLulwg5R/m1r0PXEFqrV0qHvl58sdTilSXtKOflCsK2E8jxf+GKC0T07RWwQ==",
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.7.tgz",
+      "integrity": "sha512-Ni79DqeB72ZFq1uH/L6zJ+DKZTkOtPIHovb3YZHQViE+HDouuU4mBrLOLDn5Dde3RF8qw5qVETEjhu9locMLvA==",
       "dev": true,
       "requires": {
         "call-bind": "^1.0.2",
-        "define-properties": "^1.1.4",
-        "es-abstract": "^1.20.4"
+        "define-properties": "^1.2.0",
+        "es-abstract": "^1.22.1"
       }
     },
     "string.prototype.trimstart": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.6.tgz",
-      "integrity": "sha512-omqjMDaY92pbn5HOX7f9IccLA+U1tA9GvtU4JrodiXFfYB7jPzzHpRzpglLAjtUV6bB557zwClJezTqnAiYnQA==",
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.7.tgz",
+      "integrity": "sha512-NGhtDFu3jCEm7B4Fy0DpLewdJQOZcQ0rGbwQ/+stjnrp2i+rlKeCvos9hOIeCmqwratM47OBxY7uFZzjxHXmrg==",
       "dev": true,
       "requires": {
         "call-bind": "^1.0.2",
-        "define-properties": "^1.1.4",
-        "es-abstract": "^1.20.4"
+        "define-properties": "^1.2.0",
+        "es-abstract": "^1.22.1"
       }
     },
     "strip-ansi": {
@@ -30958,12 +31030,12 @@
       "integrity": "sha512-B+enWhmw6cjfVC7kS8Pj9pCrKSc5txArRyaYGe088shv/FGWH+0Rjx/xPgtsWfsUtS27FkP697E4DDhgrgoc0Q=="
     },
     "which-typed-array": {
-      "version": "1.1.11",
-      "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.11.tgz",
-      "integrity": "sha512-qe9UWWpkeG5yzZ0tNYxDmd7vo58HDBc39mZ0xWWpolAGADdFOzkfamWLDxkOWcvHQKVmdTyQdLD4NOfjLWTKew==",
+      "version": "1.1.13",
+      "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.13.tgz",
+      "integrity": "sha512-P5Nra0qjSncduVPEAr7xhoF5guty49ArDTwzJ/yNuPIbZppyRxFQsRCWrocxIY+CnMVG+qfbU2FmDKyvSGClow==",
       "requires": {
         "available-typed-arrays": "^1.0.5",
-        "call-bind": "^1.0.2",
+        "call-bind": "^1.0.4",
         "for-each": "^0.3.3",
         "gopd": "^1.0.1",
         "has-tostringtag": "^1.0.0"
diff --git a/apps/block_scout_web/assets/package.json b/apps/block_scout_web/assets/package.json
index e14b60e8d336..46245f67409d 100644
--- a/apps/block_scout_web/assets/package.json
+++ b/apps/block_scout_web/assets/package.json
@@ -92,7 +92,7 @@
     "css-minimizer-webpack-plugin": "^5.0.1",
     "eslint": "^8.52.0",
     "eslint-config-standard": "^17.1.0",
-    "eslint-plugin-import": "^2.28.1",
+    "eslint-plugin-import": "^2.29.0",
     "eslint-plugin-node": "^11.1.0",
     "eslint-plugin-promise": "^6.1.1",
     "file-loader": "^6.2.0",

From b4f95ce0b4ae2579902231c7f6dca7ba7b0b032c Mon Sep 17 00:00:00 2001
From: Viktor Baranov <baranov.viktor.27@gmail.com>
Date: Tue, 24 Oct 2023 11:43:55 +0300
Subject: [PATCH 530/909] Set CHAIN_TYPE=polygon_edge for Immutable

---
 .github/workflows/publish-docker-image-for-immutable.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/publish-docker-image-for-immutable.yml b/.github/workflows/publish-docker-image-for-immutable.yml
index 11d36f828481..2936312ba855 100644
--- a/.github/workflows/publish-docker-image-for-immutable.yml
+++ b/.github/workflows/publish-docker-image-for-immutable.yml
@@ -54,4 +54,5 @@ jobs:
             ADMIN_PANEL_ENABLED=false
             CACHE_ADDRESS_WITH_BALANCES_UPDATE_INTERVAL=
             BLOCKSCOUT_VERSION=v${{ env.RELEASE_VERSION }}-beta.+commit.${{ env.SHORT_SHA }}
-            RELEASE_VERSION=${{ env.RELEASE_VERSION }}
\ No newline at end of file
+            RELEASE_VERSION=${{ env.RELEASE_VERSION }}
+            CHAIN_TYPE=polygon_edge
\ No newline at end of file

From 458648e3a80e8af9621c9952625d9d7321ab7eb3 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 24 Oct 2023 09:23:45 +0000
Subject: [PATCH 531/909] Bump ex_doc from 0.30.7 to 0.30.9

Bumps [ex_doc](https://github.com/elixir-lang/ex_doc) from 0.30.7 to 0.30.9.
- [Changelog](https://github.com/elixir-lang/ex_doc/blob/main/CHANGELOG.md)
- [Commits](https://github.com/elixir-lang/ex_doc/compare/v0.30.7...v0.30.9)

---
updated-dependencies:
- dependency-name: ex_doc
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 mix.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mix.lock b/mix.lock
index 81089fa3312c..f9fe8955f04d 100644
--- a/mix.lock
+++ b/mix.lock
@@ -47,7 +47,7 @@
   "ex_cldr_lists": {:hex, :ex_cldr_lists, "2.10.1", "67795eb28f8534a36cbdfeeaea6d3ee587eeac7eafff71968dd046c215d4ec42", [:mix], [{:ex_cldr_numbers, "~> 2.25", [hex: :ex_cldr_numbers, repo: "hexpm", optional: false]}, {:ex_doc, "~> 0.18", [hex: :ex_doc, repo: "hexpm", optional: true]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}], "hexpm", "da826148d95c7a1889fd847ae5704c141747bad43a5a44431ae97bced57b0f93"},
   "ex_cldr_numbers": {:hex, :ex_cldr_numbers, "2.32.2", "5e0e3031d3f54b51fe7078a7a94592987b70b06d631bdc88813b222dc5a8b1bd", [:mix], [{:decimal, "~> 1.6 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: false]}, {:digital_token, "~> 0.3 or ~> 1.0", [hex: :digital_token, repo: "hexpm", optional: false]}, {:ex_cldr, "~> 2.37", [hex: :ex_cldr, repo: "hexpm", optional: false]}, {:ex_cldr_currencies, ">= 2.14.2", [hex: :ex_cldr_currencies, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}], "hexpm", "91257684a9c4d6abdf738f0cc5671837de876e69552e8bd4bc5fa1bfd5817713"},
   "ex_cldr_units": {:hex, :ex_cldr_units, "3.16.3", "41344ed9f6d5c69baeb4d13dadc80310ca511626f738af2e69ae53dd40fb28a5", [:mix], [{:cldr_utils, "~> 2.24", [hex: :cldr_utils, repo: "hexpm", optional: false]}, {:decimal, "~> 1.6 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: false]}, {:ex_cldr_lists, "~> 2.10", [hex: :ex_cldr_lists, repo: "hexpm", optional: false]}, {:ex_cldr_numbers, "~> 2.31", [hex: :ex_cldr_numbers, repo: "hexpm", optional: false]}, {:ex_doc, "~> 0.18", [hex: :ex_doc, repo: "hexpm", optional: true]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}], "hexpm", "889dd56084821723ce82c4639d62cfc3513a9ca1ffb9063bcc83e7b3de5bc35b"},
-  "ex_doc": {:hex, :ex_doc, "0.30.7", "dc7247091aec738ab781f71cbebfc07979d1040c98c7ee67dbde99b7829b743d", [:mix], [{:earmark_parser, "~> 1.4.31", [hex: :earmark_parser, repo: "hexpm", optional: false]}, {:makeup_elixir, "~> 0.14", [hex: :makeup_elixir, repo: "hexpm", optional: false]}, {:makeup_erlang, "~> 0.1", [hex: :makeup_erlang, repo: "hexpm", optional: false]}], "hexpm", "868ff1c7a44c462741853840d1e7ef19a07906e7467cb8da070c158ea6a42a51"},
+  "ex_doc": {:hex, :ex_doc, "0.30.9", "d691453495c47434c0f2052b08dd91cc32bc4e1a218f86884563448ee2502dd2", [:mix], [{:earmark_parser, "~> 1.4.31", [hex: :earmark_parser, repo: "hexpm", optional: false]}, {:makeup_elixir, "~> 0.14", [hex: :makeup_elixir, repo: "hexpm", optional: false]}, {:makeup_erlang, "~> 0.1", [hex: :makeup_erlang, repo: "hexpm", optional: false]}], "hexpm", "d7aaaf21e95dc5cddabf89063327e96867d00013963eadf2c6ad135506a8bc10"},
   "ex_json_schema": {:hex, :ex_json_schema, "0.10.1", "e03b746b6675a750c0bb1a5cc919f61353f7ab8450977e11ceede20e6180c560", [:mix], [{:decimal, "~> 2.0", [hex: :decimal, repo: "hexpm", optional: false]}], "hexpm", "66a64e60dadad89914d92f89c7e7906c57de75a8b79ac2480d0d53e1b8096fb0"},
   "ex_keccak": {:hex, :ex_keccak, "0.7.3", "33298f97159f6b0acd28f6e96ce5ea975a0f4a19f85fe615b4f4579b88b24d06", [:mix], [{:rustler, ">= 0.0.0", [hex: :rustler, repo: "hexpm", optional: true]}, {:rustler_precompiled, "~> 0.6.1", [hex: :rustler_precompiled, repo: "hexpm", optional: false]}], "hexpm", "4c5e6d9d5f77b64ab48769a0166a9814180d40ced68ed74ce60a5174ab55b3fc"},
   "ex_machina": {:hex, :ex_machina, "2.7.0", "b792cc3127fd0680fecdb6299235b4727a4944a09ff0fa904cc639272cd92dc7", [:mix], [{:ecto, "~> 2.2 or ~> 3.0", [hex: :ecto, repo: "hexpm", optional: true]}, {:ecto_sql, "~> 3.0", [hex: :ecto_sql, repo: "hexpm", optional: true]}], "hexpm", "419aa7a39bde11894c87a615c4ecaa52d8f107bbdd81d810465186f783245bf8"},

From c18b929b9eead5172511f959c3c234d037ff7740 Mon Sep 17 00:00:00 2001
From: Viktor Baranov <baranov.viktor.27@gmail.com>
Date: Mon, 23 Oct 2023 21:45:06 +0300
Subject: [PATCH 532/909] Fix db pool size exceeds Postgres max connections

---
 CHANGELOG.md                              |   2 +
 apps/explorer/lib/explorer/application.ex | 105 +++++++++++++---------
 config/runtime/dev.exs                    |   8 +-
 config/runtime/prod.exs                   |  20 ++---
 4 files changed, 80 insertions(+), 55 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 25082d68b296..2d4a83a229c2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,8 @@
 
 ### Fixes
 
+- [#8685](https://github.com/blockscout/blockscout/pull/8685) - Fix db pool size exceeds Postgres max connections
+
 ### Chore
 
 <details>
diff --git a/apps/explorer/lib/explorer/application.ex b/apps/explorer/lib/explorer/application.ex
index c80c66922949..adc04a9d0d0c 100644
--- a/apps/explorer/lib/explorer/application.ex
+++ b/apps/explorer/lib/explorer/application.ex
@@ -46,10 +46,6 @@ defmodule Explorer.Application do
     # Children to start in all environments
     base_children = [
       Explorer.Repo,
-      Explorer.Repo.Replica1,
-      Explorer.Repo.Account,
-      Explorer.Repo.PolygonEdge,
-      Explorer.Repo.RSK,
       Explorer.Vault,
       Supervisor.child_spec({SpandexDatadog.ApiServer, datadog_opts()}, id: SpandexDatadog.ApiServer),
       Supervisor.child_spec({Task.Supervisor, name: Explorer.HistoryTaskSupervisor}, id: Explorer.HistoryTaskSupervisor),
@@ -93,43 +89,70 @@ defmodule Explorer.Application do
   end
 
   defp configurable_children do
-    [
-      configure(Explorer.ExchangeRates),
-      configure(Explorer.ExchangeRates.TokenExchangeRates),
-      configure(Explorer.ChainSpec.GenesisData),
-      configure(Explorer.Market.History.Cataloger),
-      configure(Explorer.Chain.Cache.ContractsCounter),
-      configure(Explorer.Chain.Cache.NewContractsCounter),
-      configure(Explorer.Chain.Cache.VerifiedContractsCounter),
-      configure(Explorer.Chain.Cache.NewVerifiedContractsCounter),
-      configure(Explorer.Chain.Cache.TransactionActionTokensData),
-      configure(Explorer.Chain.Cache.TransactionActionUniswapPools),
-      configure(Explorer.Chain.Cache.WithdrawalsSum),
-      configure(Explorer.Chain.Transaction.History.Historian),
-      configure(Explorer.Chain.Events.Listener),
-      configure(Explorer.Counters.AddressesWithBalanceCounter),
-      configure(Explorer.Counters.AddressesCounter),
-      configure(Explorer.Counters.AddressTransactionsCounter),
-      configure(Explorer.Counters.AddressTokenTransfersCounter),
-      configure(Explorer.Counters.AddressTransactionsGasUsageCounter),
-      configure(Explorer.Counters.AddressTokenUsdSum),
-      configure(Explorer.Counters.TokenHoldersCounter),
-      configure(Explorer.Counters.TokenTransfersCounter),
-      configure(Explorer.Counters.BlockBurnedFeeCounter),
-      configure(Explorer.Counters.BlockPriorityFeeCounter),
-      configure(Explorer.Counters.AverageBlockTime),
-      configure(Explorer.Counters.Bridge),
-      configure(Explorer.Validator.MetadataProcessor),
-      configure(Explorer.Tags.AddressTag.Cataloger),
-      configure(MinMissingBlockNumber),
-      configure(TokenTransferTokenIdMigration.Supervisor),
-      configure(Explorer.Chain.Fetcher.CheckBytecodeMatchingOnDemand),
-      configure(Explorer.Chain.Fetcher.FetchValidatorInfoOnDemand),
-      configure(Explorer.TokenInstanceOwnerAddressMigration.Supervisor),
-      sc_microservice_configure(Explorer.Chain.Fetcher.LookUpSmartContractSourcesOnDemand),
-      configure(Explorer.Chain.Cache.RootstockLockedBTC)
-    ]
-    |> List.flatten()
+    configurable_children_set =
+      [
+        configure(Explorer.ExchangeRates),
+        configure(Explorer.ExchangeRates.TokenExchangeRates),
+        configure(Explorer.ChainSpec.GenesisData),
+        configure(Explorer.Market.History.Cataloger),
+        configure(Explorer.Chain.Cache.ContractsCounter),
+        configure(Explorer.Chain.Cache.NewContractsCounter),
+        configure(Explorer.Chain.Cache.VerifiedContractsCounter),
+        configure(Explorer.Chain.Cache.NewVerifiedContractsCounter),
+        configure(Explorer.Chain.Cache.TransactionActionTokensData),
+        configure(Explorer.Chain.Cache.TransactionActionUniswapPools),
+        configure(Explorer.Chain.Cache.WithdrawalsSum),
+        configure(Explorer.Chain.Transaction.History.Historian),
+        configure(Explorer.Chain.Events.Listener),
+        configure(Explorer.Counters.AddressesWithBalanceCounter),
+        configure(Explorer.Counters.AddressesCounter),
+        configure(Explorer.Counters.AddressTransactionsCounter),
+        configure(Explorer.Counters.AddressTokenTransfersCounter),
+        configure(Explorer.Counters.AddressTransactionsGasUsageCounter),
+        configure(Explorer.Counters.AddressTokenUsdSum),
+        configure(Explorer.Counters.TokenHoldersCounter),
+        configure(Explorer.Counters.TokenTransfersCounter),
+        configure(Explorer.Counters.BlockBurnedFeeCounter),
+        configure(Explorer.Counters.BlockPriorityFeeCounter),
+        configure(Explorer.Counters.AverageBlockTime),
+        configure(Explorer.Counters.Bridge),
+        configure(Explorer.Validator.MetadataProcessor),
+        configure(Explorer.Tags.AddressTag.Cataloger),
+        configure(MinMissingBlockNumber),
+        configure(TokenTransferTokenIdMigration.Supervisor),
+        configure(Explorer.Chain.Fetcher.CheckBytecodeMatchingOnDemand),
+        configure(Explorer.Chain.Fetcher.FetchValidatorInfoOnDemand),
+        configure(Explorer.TokenInstanceOwnerAddressMigration.Supervisor),
+        sc_microservice_configure(Explorer.Chain.Fetcher.LookUpSmartContractSourcesOnDemand),
+        configure(Explorer.Chain.Cache.RootstockLockedBTC)
+      ]
+      |> List.flatten()
+
+    repos_by_chain_type() ++ account_repo() ++ replica_repo() ++ configurable_children_set
+  end
+
+  defp repos_by_chain_type do
+    if Mix.env() == :test do
+      [Explorer.Repo.PolygonEdge, Explorer.Repo.RSK]
+    else
+      []
+    end
+  end
+
+  defp account_repo do
+    if System.get_env("ACCOUNT_DATABASE_URL") || Mix.env() == :test do
+      [Explorer.Repo.Account]
+    else
+      []
+    end
+  end
+
+  defp replica_repo do
+    if System.get_env("DATABASE_READ_ONLY_API_URL") do
+      [Explorer.Repo.Replica1]
+    else
+      []
+    end
   end
 
   defp should_start?(process) do
diff --git a/config/runtime/dev.exs b/config/runtime/dev.exs
index 567d38d79328..09a67485fad6 100644
--- a/config/runtime/dev.exs
+++ b/config/runtime/dev.exs
@@ -74,14 +74,18 @@ config :explorer, Explorer.Repo.PolygonEdge,
   database: database,
   hostname: hostname,
   url: System.get_env("DATABASE_URL"),
-  pool_size: ConfigHelper.parse_integer_env_var("POLYGON_EDGE_POOL_SIZE", 10)
+  # actually this repo is not started, and its pool size remains unused.
+  # separating repos for different CHAIN_TYPE is implemented only for the sake of keeping DB schema update relevant to the current chain type
+  pool_size: 1
 
 # Configure Rootstock database
 config :explorer, Explorer.Repo.RSK,
   database: database,
   hostname: hostname,
   url: System.get_env("DATABASE_URL"),
-  pool_size: pool_size
+  # actually this repo is not started, and its pool size remains unused.
+  # separating repos for different CHAIN_TYPE is implemented only for the sake of keeping DB schema update relevant to the current chain type
+  pool_size: 1
 
 variant = Variant.get()
 
diff --git a/config/runtime/prod.exs b/config/runtime/prod.exs
index cbbc1af52bb5..a2acffc385b1 100644
--- a/config/runtime/prod.exs
+++ b/config/runtime/prod.exs
@@ -27,10 +27,7 @@ config :block_scout_web, BlockScoutWeb.Endpoint,
 ### Explorer ###
 ################
 
-pool_size =
-  if System.get_env("DATABASE_READ_ONLY_API_URL"),
-    do: ConfigHelper.parse_integer_env_var("POOL_SIZE", 50),
-    else: ConfigHelper.parse_integer_env_var("POOL_SIZE", 40)
+pool_size = ConfigHelper.parse_integer_env_var("POOL_SIZE", 50)
 
 # Configures the database
 config :explorer, Explorer.Repo,
@@ -38,15 +35,10 @@ config :explorer, Explorer.Repo,
   pool_size: pool_size,
   ssl: ExplorerConfigHelper.ssl_enabled?()
 
-pool_size_api =
-  if System.get_env("DATABASE_READ_ONLY_API_URL"),
-    do: ConfigHelper.parse_integer_env_var("POOL_SIZE_API", 50),
-    else: ConfigHelper.parse_integer_env_var("POOL_SIZE_API", 10)
-
 # Configures API the database
 config :explorer, Explorer.Repo.Replica1,
   url: ExplorerConfigHelper.get_api_db_url(),
-  pool_size: pool_size_api,
+  pool_size: ConfigHelper.parse_integer_env_var("POOL_SIZE_API", 50),
   ssl: ExplorerConfigHelper.ssl_enabled?()
 
 # Configures Account database
@@ -58,13 +50,17 @@ config :explorer, Explorer.Repo.Account,
 # Configures PolygonEdge database
 config :explorer, Explorer.Repo.PolygonEdge,
   url: System.get_env("DATABASE_URL"),
-  pool_size: ConfigHelper.parse_integer_env_var("POLYGON_EDGE_POOL_SIZE", 50),
+  # actually this repo is not started, and its pool size remains unused.
+  # separating repos for different CHAIN_TYPE is implemented only for the sake of keeping DB schema update relevant to the current chain type
+  pool_size: 1,
   ssl: ExplorerConfigHelper.ssl_enabled?()
 
 # Configures Rootstock database
 config :explorer, Explorer.Repo.RSK,
   url: System.get_env("DATABASE_URL"),
-  pool_size: pool_size,
+  # actually this repo is not started, and its pool size remains unused.
+  # separating repos for different CHAIN_TYPE is implemented only for the sake of keeping DB schema update relevant to the current chain type
+  pool_size: 1,
   ssl: ExplorerConfigHelper.ssl_enabled?()
 
 variant = Variant.get()

From ef73a3f89e6686db40cc30e023c4dae0ea43c893 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 24 Oct 2023 09:25:15 +0000
Subject: [PATCH 533/909] Bump redix from 1.2.3 to 1.3.0

Bumps [redix](https://github.com/whatyouhide/redix) from 1.2.3 to 1.3.0.
- [Changelog](https://github.com/whatyouhide/redix/blob/main/CHANGELOG.md)
- [Commits](https://github.com/whatyouhide/redix/compare/v1.2.3...v1.3.0)

---
updated-dependencies:
- dependency-name: redix
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 mix.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mix.lock b/mix.lock
index 81089fa3312c..a0ca15c46a69 100644
--- a/mix.lock
+++ b/mix.lock
@@ -120,7 +120,7 @@
   "que": {:hex, :que, "0.10.1", "788ed0ec92ed69bdf9cfb29bf41a94ca6355b8d44959bd0669cf706e557ac891", [:mix], [{:ex_utils, "~> 0.1.6", [hex: :ex_utils, repo: "hexpm", optional: false]}, {:memento, "~> 0.3.0", [hex: :memento, repo: "hexpm", optional: false]}], "hexpm", "a737b365253e75dbd24b2d51acc1d851049e87baae08cd0c94e2bc5cd65088d5"},
   "ranch": {:hex, :ranch, "1.8.0", "8c7a100a139fd57f17327b6413e4167ac559fbc04ca7448e9be9057311597a1d", [:make, :rebar3], [], "hexpm", "49fbcfd3682fab1f5d109351b61257676da1a2fdbe295904176d5e521a2ddfe5"},
   "ratio": {:hex, :ratio, "2.4.2", "c8518f3536d49b1b00d88dd20d49f8b11abb7819638093314a6348139f14f9f9", [:mix], [{:decimal, "~> 1.6 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: true]}, {:numbers, "~> 5.2.0", [hex: :numbers, repo: "hexpm", optional: false]}], "hexpm", "441ef6f73172a3503de65ccf1769030997b0d533b1039422f1e5e0e0b4cbf89e"},
-  "redix": {:hex, :redix, "1.2.3", "3036e7c6080c42e1bbaa9168d1e28e367b01e8960a640a899b8ef8067273cb5e", [:mix], [{:castore, "~> 0.1.0 or ~> 1.0", [hex: :castore, repo: "hexpm", optional: true]}, {:nimble_options, "~> 0.5.0 or ~> 1.0", [hex: :nimble_options, repo: "hexpm", optional: false]}, {:telemetry, "~> 0.4.0 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "14e2bca8a03fad297a78a3d201032df260ee5f0e0ef9c173c0f9ca5b3e0331b7"},
+  "redix": {:hex, :redix, "1.3.0", "f4121163ff9d73bf72157539ff23b13e38422284520bb58c05e014b19d6f0577", [:mix], [{:castore, "~> 0.1.0 or ~> 1.0", [hex: :castore, repo: "hexpm", optional: true]}, {:nimble_options, "~> 0.5.0 or ~> 1.0", [hex: :nimble_options, repo: "hexpm", optional: false]}, {:telemetry, "~> 0.4.0 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "60d483d320c77329c8cbd3df73007e51b23f3fae75b7693bc31120d83ab26131"},
   "remote_ip": {:hex, :remote_ip, "1.1.0", "cb308841595d15df3f9073b7c39243a1dd6ca56e5020295cb012c76fbec50f2d", [:mix], [{:combine, "~> 0.10", [hex: :combine, repo: "hexpm", optional: false]}, {:plug, "~> 1.14", [hex: :plug, repo: "hexpm", optional: false]}], "hexpm", "616ffdf66aaad6a72fc546dabf42eed87e2a99e97b09cbd92b10cc180d02ed74"},
   "rustler_precompiled": {:hex, :rustler_precompiled, "0.6.3", "f838d94bc35e1844973ee7266127b156fdc962e9e8b7ff666c8fb4fed7964d23", [:mix], [{:castore, "~> 0.1 or ~> 1.0", [hex: :castore, repo: "hexpm", optional: false]}, {:rustler, "~> 0.23", [hex: :rustler, repo: "hexpm", optional: true]}], "hexpm", "e18ecca3669a7454b3a2be75ae6c3ef01d550bc9a8cf5fbddcfff843b881d7c6"},
   "sobelow": {:hex, :sobelow, "0.13.0", "218afe9075904793f5c64b8837cc356e493d88fddde126a463839351870b8d1e", [:mix], [{:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: false]}], "hexpm", "cd6e9026b85fc35d7529da14f95e85a078d9dd1907a9097b3ba6ac7ebbe34a0d"},

From 38e4aa93da58cdac7837cf5b59dea131d506b955 Mon Sep 17 00:00:00 2001
From: Viktor Baranov <baranov.viktor.27@gmail.com>
Date: Tue, 24 Oct 2023 14:11:21 +0300
Subject: [PATCH 534/909] Rollback changes for Explorer.Repo.Replica1

---
 apps/explorer/lib/explorer/application.ex | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/apps/explorer/lib/explorer/application.ex b/apps/explorer/lib/explorer/application.ex
index adc04a9d0d0c..c6575c29e54b 100644
--- a/apps/explorer/lib/explorer/application.ex
+++ b/apps/explorer/lib/explorer/application.ex
@@ -46,6 +46,7 @@ defmodule Explorer.Application do
     # Children to start in all environments
     base_children = [
       Explorer.Repo,
+      Explorer.Repo.Replica1,
       Explorer.Vault,
       Supervisor.child_spec({SpandexDatadog.ApiServer, datadog_opts()}, id: SpandexDatadog.ApiServer),
       Supervisor.child_spec({Task.Supervisor, name: Explorer.HistoryTaskSupervisor}, id: Explorer.HistoryTaskSupervisor),
@@ -128,7 +129,7 @@ defmodule Explorer.Application do
       ]
       |> List.flatten()
 
-    repos_by_chain_type() ++ account_repo() ++ replica_repo() ++ configurable_children_set
+    repos_by_chain_type() ++ account_repo() ++ configurable_children_set
   end
 
   defp repos_by_chain_type do
@@ -147,14 +148,6 @@ defmodule Explorer.Application do
     end
   end
 
-  defp replica_repo do
-    if System.get_env("DATABASE_READ_ONLY_API_URL") do
-      [Explorer.Repo.Replica1]
-    else
-      []
-    end
-  end
-
   defp should_start?(process) do
     Application.get_env(:explorer, process, [])[:enabled] == true
   end

From 7cb58ecf15eafa42a82ea2519a95723c23be1241 Mon Sep 17 00:00:00 2001
From: Nikita Pozdniakov <nikitosing4@mail.ru>
Date: Mon, 23 Oct 2023 20:23:39 +0300
Subject: [PATCH 535/909] Fix is_verified for /addresses and /smart-contracts

---
 .../views/api/v2/smart_contract_view.ex               |  8 +++++++-
 .../controllers/api/v2/address_controller_test.exs    | 11 +++++++++++
 .../api/v2/smart_contract_controller_test.exs         |  2 ++
 apps/explorer/lib/explorer/chain.ex                   |  2 +-
 4 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/apps/block_scout_web/lib/block_scout_web/views/api/v2/smart_contract_view.ex b/apps/block_scout_web/lib/block_scout_web/views/api/v2/smart_contract_view.ex
index f62dffc9697b..08fa9377b0d9 100644
--- a/apps/block_scout_web/lib/block_scout_web/views/api/v2/smart_contract_view.ex
+++ b/apps/block_scout_web/lib/block_scout_web/views/api/v2/smart_contract_view.ex
@@ -257,7 +257,13 @@ defmodule BlockScoutWeb.API.V2.SmartContractView do
     token = smart_contract.address.token
 
     %{
-      "address" => Helper.address_with_info(nil, smart_contract.address, smart_contract.address.hash, false),
+      "address" =>
+        Helper.address_with_info(
+          nil,
+          %Address{smart_contract.address | smart_contract: smart_contract},
+          smart_contract.address.hash,
+          false
+        ),
       "compiler_version" => smart_contract.compiler_version,
       "optimization_enabled" => smart_contract.optimization,
       "tx_count" => smart_contract.address.transactions_count,
diff --git a/apps/block_scout_web/test/block_scout_web/controllers/api/v2/address_controller_test.exs b/apps/block_scout_web/test/block_scout_web/controllers/api/v2/address_controller_test.exs
index 06013076b2d1..962be40cafc0 100644
--- a/apps/block_scout_web/test/block_scout_web/controllers/api/v2/address_controller_test.exs
+++ b/apps/block_scout_web/test/block_scout_web/controllers/api/v2/address_controller_test.exs
@@ -1668,6 +1668,17 @@ defmodule BlockScoutWeb.API.V2.AddressControllerTest do
 
       compare_item(address, address_json)
     end
+
+    test "check smart contract preload", %{conn: conn} do
+      smart_contract = insert(:smart_contract, address_hash: insert(:contract_address, fetched_coin_balance: 1).hash)
+
+      request = get(conn, "/api/v2/addresses")
+      assert %{"items" => [address]} = json_response(request, 200)
+
+      assert String.downcase(address["hash"]) == to_string(smart_contract.address_hash)
+      assert address["is_contract"] == true
+      assert address["is_verified"] == true
+    end
   end
 
   describe "/addresses/{address_hash}/tabs-counters" do
diff --git a/apps/block_scout_web/test/block_scout_web/controllers/api/v2/smart_contract_controller_test.exs b/apps/block_scout_web/test/block_scout_web/controllers/api/v2/smart_contract_controller_test.exs
index e93544ea64c8..9c3a1f63254e 100644
--- a/apps/block_scout_web/test/block_scout_web/controllers/api/v2/smart_contract_controller_test.exs
+++ b/apps/block_scout_web/test/block_scout_web/controllers/api/v2/smart_contract_controller_test.exs
@@ -2375,6 +2375,8 @@ defmodule BlockScoutWeb.API.V2.SmartContractControllerTest do
 
       assert %{"items" => [sc], "next_page_params" => nil} = json_response(request, 200)
       compare_item(smart_contract, sc)
+      assert sc["address"]["is_verified"] == true
+      assert sc["address"]["is_contract"] == true
     end
 
     test "check pagination", %{conn: conn} do
diff --git a/apps/explorer/lib/explorer/chain.ex b/apps/explorer/lib/explorer/chain.ex
index 9e013ec9a721..4bdef66924cc 100644
--- a/apps/explorer/lib/explorer/chain.ex
+++ b/apps/explorer/lib/explorer/chain.ex
@@ -2062,7 +2062,7 @@ defmodule Explorer.Chain do
       from(a in Address,
         where: a.fetched_coin_balance > ^0,
         order_by: [desc: a.fetched_coin_balance, asc: a.hash],
-        preload: [:names],
+        preload: [:names, :smart_contract],
         select: {a, fragment("coalesce(1 + ?, 0)", a.nonce)}
       )
 

From b63d35ad573b29ece02c0e98019c6e1d9f6ca62a Mon Sep 17 00:00:00 2001
From: Nikita Pozdniakov <nikitosing4@mail.ru>
Date: Mon, 23 Oct 2023 20:25:36 +0300
Subject: [PATCH 536/909] Changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e0eb3000a6d0..426ff04df2ab 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,7 @@
 
 ### Fixes
 
+- [#8678](https://github.com/blockscout/blockscout/pull/8678) - Fix `is_verified` for `/addresses` and `/smart-contracts`
 - [#8685](https://github.com/blockscout/blockscout/pull/8685) - Fix db pool size exceeds Postgres max connections
 
 ### Chore

From 63b023f5e58786ab626bab16aacab1cc9a02ebe8 Mon Sep 17 00:00:00 2001
From: POA <33550681+poa@users.noreply.github.com>
Date: Thu, 20 Apr 2023 15:44:40 +0300
Subject: [PATCH 537/909] Create zkEVM tables

---
 .../lib/explorer/chain/zkevm_lifecycle_txn.ex | 32 +++++++++++++
 .../lib/explorer/chain/zkevm_txn_batch.ex     | 45 +++++++++++++++++++
 .../20230420110800_create_zkevm_tables.exs    | 35 +++++++++++++++
 3 files changed, 112 insertions(+)
 create mode 100644 apps/explorer/lib/explorer/chain/zkevm_lifecycle_txn.ex
 create mode 100644 apps/explorer/lib/explorer/chain/zkevm_txn_batch.ex
 create mode 100644 apps/explorer/priv/repo/migrations/20230420110800_create_zkevm_tables.exs

diff --git a/apps/explorer/lib/explorer/chain/zkevm_lifecycle_txn.ex b/apps/explorer/lib/explorer/chain/zkevm_lifecycle_txn.ex
new file mode 100644
index 000000000000..2ab3ed9b171f
--- /dev/null
+++ b/apps/explorer/lib/explorer/chain/zkevm_lifecycle_txn.ex
@@ -0,0 +1,32 @@
+defmodule Explorer.Chain.ZkevmLifecycleTxn do
+  @moduledoc "Models an L1 lifecycle transaction for zkEVM."
+
+  use Explorer.Schema
+
+  alias Explorer.Chain.{Hash, ZkevmTxnBatch}
+
+  @required_attrs ~w(id hash is_verify)a
+
+  @type t :: %__MODULE__{
+          hash: Hash.t(),
+          is_verify: boolean()
+        }
+
+  @primary_key {:id, :integer, autogenerate: false}
+  schema "zkevm_lifecycle_l1_transactions" do
+    field(:hash, Hash.Full)
+    field(:is_verify, :boolean)
+
+    has_many(:sequenced_batches, ZkevmTxnBatch, foreign_key: :sequence_id)
+    has_many(:verified_batches, ZkevmTxnBatch, foreign_key: :verify_id)
+
+    timestamps()
+  end
+
+  def changeset(%__MODULE__{} = txn, attrs \\ %{}) do
+    txn
+    |> cast(attrs, @required_attrs)
+    |> validate_required(@required_attrs)
+    |> unique_constraint(:id)
+  end
+end
diff --git a/apps/explorer/lib/explorer/chain/zkevm_txn_batch.ex b/apps/explorer/lib/explorer/chain/zkevm_txn_batch.ex
new file mode 100644
index 000000000000..e5359bac62d5
--- /dev/null
+++ b/apps/explorer/lib/explorer/chain/zkevm_txn_batch.ex
@@ -0,0 +1,45 @@
+defmodule Explorer.Chain.ZkevmTxnBatch do
+  @moduledoc "Models a batch of transactions for zkEVM."
+
+  use Explorer.Schema
+
+  alias Explorer.Chain.{Hash, ZkevmLifecycleTxn}
+
+  @required_attrs ~w(number timestamp l2_transaction_hashes global_exit_root acc_input_hash state_root sequence_id verify_id)a
+
+  @type t :: %__MODULE__{
+          number: non_neg_integer(),
+          timestamp: DateTime.t(),
+          l2_transaction_hashes: [Hash.t()],
+          global_exit_root: Hash.t(),
+          acc_input_hash: Hash.t(),
+          state_root: Hash.t(),
+          sequence_id: non_neg_integer() | nil,
+          sequence_transaction: %Ecto.Association.NotLoaded{} | ZkevmLifecycleTxn.t() | nil,
+          verify_id: non_neg_integer() | nil,
+          verify_transaction: %Ecto.Association.NotLoaded{} | ZkevmLifecycleTxn.t() | nil
+        }
+
+  @primary_key false
+  schema "zkevm_transaction_batches" do
+    field(:number, :integer, primary_key: true)
+    field(:timestamp, :utc_datetime_usec)
+    field(:l2_transaction_hashes, {:array, Hash.Full})
+    field(:global_exit_root, Hash.Full)
+    field(:acc_input_hash, Hash.Full)
+    field(:state_root, Hash.Full)
+
+    belongs_to(:sequence_transaction, ZkevmLifecycleTxn, foreign_key: :sequence_id, references: :id, type: :integer)
+    belongs_to(:verify_transaction, ZkevmLifecycleTxn, foreign_key: :verify_id, references: :id, type: :integer)
+
+    timestamps()
+  end
+
+  def changeset(%__MODULE__{} = batches, attrs \\ %{}) do
+    batches
+    |> cast(attrs, @required_attrs)
+    |> validate_required(@required_attrs)
+    |> foreign_key_constraint(:sequence_id)
+    |> foreign_key_constraint(:verify_id)
+  end
+end
diff --git a/apps/explorer/priv/repo/migrations/20230420110800_create_zkevm_tables.exs b/apps/explorer/priv/repo/migrations/20230420110800_create_zkevm_tables.exs
new file mode 100644
index 000000000000..4604d671305a
--- /dev/null
+++ b/apps/explorer/priv/repo/migrations/20230420110800_create_zkevm_tables.exs
@@ -0,0 +1,35 @@
+defmodule Explorer.Repo.Migrations.CreateZkevmTables do
+  use Ecto.Migration
+
+  def change do
+    create table(:zkevm_lifecycle_l1_transactions, primary_key: false) do
+      add(:id, :integer, null: false, primary_key: true)
+      add(:hash, :bytea, null: false)
+      add(:is_verify, :boolean, null: false)
+      timestamps(null: false, type: :utc_datetime_usec)
+    end
+
+    create table(:zkevm_transaction_batches, primary_key: false) do
+      add(:number, :integer, null: false, primary_key: true)
+      add(:timestamp, :"timestamp without time zone", null: false)
+      add(:l2_transaction_hashes, {:array, :bytea}, null: false)
+      add(:global_exit_root, :bytea, null: false)
+      add(:acc_input_hash, :bytea, null: false)
+      add(:state_root, :bytea, null: false)
+
+      add(
+        :sequence_id,
+        references(:zkevm_lifecycle_l1_transactions, on_delete: :restrict, on_update: :update_all, type: :integer),
+        null: true
+      )
+
+      add(
+        :verify_id,
+        references(:zkevm_lifecycle_l1_transactions, on_delete: :restrict, on_update: :update_all, type: :integer),
+        null: true
+      )
+
+      timestamps(null: false, type: :utc_datetime_usec)
+    end
+  end
+end

From 27d923266dbef5a78d1c6f138ea5e4f367c90ff7 Mon Sep 17 00:00:00 2001
From: POA <33550681+poa@users.noreply.github.com>
Date: Fri, 21 Apr 2023 16:04:07 +0300
Subject: [PATCH 538/909] Add runners for zkEVM tables

---
 .../import/runner/zkevm_lifecycle_txns.ex     | 101 ++++++++++++++++
 .../chain/import/runner/zkevm_txn_batches.ex  | 111 ++++++++++++++++++
 2 files changed, 212 insertions(+)
 create mode 100644 apps/explorer/lib/explorer/chain/import/runner/zkevm_lifecycle_txns.ex
 create mode 100644 apps/explorer/lib/explorer/chain/import/runner/zkevm_txn_batches.ex

diff --git a/apps/explorer/lib/explorer/chain/import/runner/zkevm_lifecycle_txns.ex b/apps/explorer/lib/explorer/chain/import/runner/zkevm_lifecycle_txns.ex
new file mode 100644
index 000000000000..d2348b854bcb
--- /dev/null
+++ b/apps/explorer/lib/explorer/chain/import/runner/zkevm_lifecycle_txns.ex
@@ -0,0 +1,101 @@
+defmodule Explorer.Chain.Import.Runner.ZkevmLifecycleTxns do
+  @moduledoc """
+  Bulk imports `t:Explorer.Chain.ZkevmLifecycleTxn.t/0`.
+  """
+
+  require Ecto.Query
+
+  alias Ecto.{Changeset, Multi, Repo}
+  alias Explorer.Chain.{Import, ZkevmLifecycleTxn}
+  alias Explorer.Prometheus.Instrumenter
+
+  import Ecto.Query, only: [from: 2]
+
+  @behaviour Import.Runner
+
+  # milliseconds
+  @timeout 60_000
+
+  @type imported :: [ZkevmLifecycleTxn.t()]
+
+  @impl Import.Runner
+  def ecto_schema_module, do: ZkevmLifecycleTxn
+
+  @impl Import.Runner
+  def option_key, do: :zkevm_lifecycle_txns
+
+  @impl Import.Runner
+  def imported_table_row do
+    %{
+      value_type: "[#{ecto_schema_module()}.t()]",
+      value_description: "List of `t:#{ecto_schema_module()}.t/0`s"
+    }
+  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)
+
+    Multi.run(multi, :insert_zkevm_lifecycle_txns, fn repo, _ ->
+      Instrumenter.block_import_stage_runner(
+        fn -> insert(repo, changes_list, insert_options) end,
+        :block_referencing,
+        :zkevm_lifecycle_txns,
+        :zkevm_lifecycle_txns
+      )
+    end)
+  end
+
+  @impl Import.Runner
+  def timeout, do: @timeout
+
+  @spec insert(Repo.t(), [map()], %{required(:timeout) => timeout(), required(:timestamps) => Import.timestamps()}) ::
+          {:ok, [ZkevmLifecycleTxn.t()]}
+          | {:error, [Changeset.t()]}
+  def 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 ZkevmLifecycleTxn ShareLocks order (see docs: sharelock.md)
+    ordered_changes_list = Enum.sort_by(changes_list, & &1.id)
+
+    {:ok, inserted} =
+      Import.insert_changes_list(
+        repo,
+        ordered_changes_list,
+        for: ZkevmLifecycleTxn,
+        returning: true,
+        timeout: timeout,
+        timestamps: timestamps,
+        conflict_target: :id,
+        on_conflict: on_conflict
+      )
+
+    {:ok, inserted}
+  end
+
+  defp default_on_conflict do
+    from(
+      tx in ZkevmLifecycleTxn,
+      update: [
+        set: [
+          # don't update `id` as it is a primary key and used for the conflict target
+          hash: fragment("EXCLUDED.hash"),
+          is_verify: fragment("EXCLUDED.is_verify"),
+          inserted_at: fragment("LEAST(?, EXCLUDED.inserted_at)", tx.inserted_at),
+          updated_at: fragment("GREATEST(?, EXCLUDED.updated_at)", tx.updated_at)
+        ]
+      ],
+      where:
+        fragment(
+          "(EXCLUDED.hash, EXCLUDED.is_verify) IS DISTINCT FROM (?, ?)",
+          tx.hash,
+          tx.is_verify
+        )
+    )
+  end
+end
diff --git a/apps/explorer/lib/explorer/chain/import/runner/zkevm_txn_batches.ex b/apps/explorer/lib/explorer/chain/import/runner/zkevm_txn_batches.ex
new file mode 100644
index 000000000000..3d3b27aebfe6
--- /dev/null
+++ b/apps/explorer/lib/explorer/chain/import/runner/zkevm_txn_batches.ex
@@ -0,0 +1,111 @@
+defmodule Explorer.Chain.Import.Runner.ZkevmTxnBatches do
+  @moduledoc """
+  Bulk imports `t:Explorer.Chain.ZkevmTxnBatch.t/0`.
+  """
+
+  require Ecto.Query
+
+  alias Ecto.{Changeset, Multi, Repo}
+  alias Explorer.Chain.{Import, ZkevmTxnBatch}
+  alias Explorer.Prometheus.Instrumenter
+
+  import Ecto.Query, only: [from: 2]
+
+  @behaviour Import.Runner
+
+  # milliseconds
+  @timeout 60_000
+
+  @type imported :: [ZkevmTxnBatch.t()]
+
+  @impl Import.Runner
+  def ecto_schema_module, do: ZkevmTxnBatch
+
+  @impl Import.Runner
+  def option_key, do: :zkevm_txn_batches
+
+  @impl Import.Runner
+  def imported_table_row do
+    %{
+      value_type: "[#{ecto_schema_module()}.t()]",
+      value_description: "List of `t:#{ecto_schema_module()}.t/0`s"
+    }
+  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)
+
+    Multi.run(multi, :insert_zkevm_txn_batches, fn repo, _ ->
+      Instrumenter.block_import_stage_runner(
+        fn -> insert(repo, changes_list, insert_options) end,
+        :block_referencing,
+        :zkevm_txn_batches,
+        :zkevm_txn_batches
+      )
+    end)
+  end
+
+  @impl Import.Runner
+  def timeout, do: @timeout
+
+  @spec insert(Repo.t(), [map()], %{required(:timeout) => timeout(), required(:timestamps) => Import.timestamps()}) ::
+          {:ok, [ZkevmTxnBatch.t()]}
+          | {:error, [Changeset.t()]}
+  def 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 ZkevmTxnBatch ShareLocks order (see docs: sharelock.md)
+    ordered_changes_list = Enum.sort_by(changes_list, & &1.number)
+
+    {:ok, inserted} =
+      Import.insert_changes_list(
+        repo,
+        ordered_changes_list,
+        for: ZkevmTxnBatch,
+        returning: true,
+        timeout: timeout,
+        timestamps: timestamps,
+        conflict_target: :number,
+        on_conflict: on_conflict
+      )
+
+    {:ok, inserted}
+  end
+
+  defp default_on_conflict do
+    from(
+      tb in ZkevmTxnBatch,
+      update: [
+        set: [
+          # don't update `number` as it is a primary key and used for the conflict target
+          timestamp: fragment("EXCLUDED.timestamp"),
+          l2_transaction_hashes: fragment("EXCLUDED.l2_transaction_hashes"),
+          global_exit_root: fragment("EXCLUDED.global_exit_root"),
+          acc_input_hash: fragment("EXCLUDED.acc_input_hash"),
+          state_root: fragment("EXCLUDED.state_root"),
+          sequence_id: fragment("EXCLUDED.sequence_id"),
+          verify_id: fragment("EXCLUDED.verify_id"),
+          inserted_at: fragment("LEAST(?, EXCLUDED.inserted_at)", tb.inserted_at),
+          updated_at: fragment("GREATEST(?, EXCLUDED.updated_at)", tb.updated_at)
+        ]
+      ],
+      where:
+        fragment(
+          "(EXCLUDED.timestamp, EXCLUDED.l2_transaction_hashes, EXCLUDED.global_exit_root, EXCLUDED.acc_input_hash, EXCLUDED.state_root, EXCLUDED.sequence_id, EXCLUDED.verify_id) IS DISTINCT FROM (?, ?, ?, ?, ?, ?, ?)",
+          tb.timestamp,
+          tb.l2_transaction_hashes,
+          tb.global_exit_root,
+          tb.acc_input_hash,
+          tb.state_root,
+          tb.sequence_id,
+          tb.verify_id
+        )
+    )
+  end
+end

From e630e51939bed7ae920019cc6a06d89a30437a37 Mon Sep 17 00:00:00 2001
From: POA <33550681+poa@users.noreply.github.com>
Date: Mon, 1 May 2023 16:27:10 +0300
Subject: [PATCH 539/909] Draft zkEVM indexer implementation

---
 .../import/runner/zkevm_lifecycle_txns.ex     |   9 +-
 .../chain/import/stage/block_referencing.ex   |  26 +-
 .../20230420110800_create_zkevm_tables.exs    |   2 +
 .../lib/indexer/fetcher/zkevm_txn_batch.ex    | 267 ++++++++++++++++++
 apps/indexer/lib/indexer/supervisor.ex        |   4 +-
 5 files changed, 292 insertions(+), 16 deletions(-)
 create mode 100644 apps/indexer/lib/indexer/fetcher/zkevm_txn_batch.ex

diff --git a/apps/explorer/lib/explorer/chain/import/runner/zkevm_lifecycle_txns.ex b/apps/explorer/lib/explorer/chain/import/runner/zkevm_lifecycle_txns.ex
index d2348b854bcb..55c79cbdfeb4 100644
--- a/apps/explorer/lib/explorer/chain/import/runner/zkevm_lifecycle_txns.ex
+++ b/apps/explorer/lib/explorer/chain/import/runner/zkevm_lifecycle_txns.ex
@@ -71,7 +71,7 @@ defmodule Explorer.Chain.Import.Runner.ZkevmLifecycleTxns do
         returning: true,
         timeout: timeout,
         timestamps: timestamps,
-        conflict_target: :id,
+        conflict_target: :hash,
         on_conflict: on_conflict
       )
 
@@ -83,8 +83,8 @@ defmodule Explorer.Chain.Import.Runner.ZkevmLifecycleTxns do
       tx in ZkevmLifecycleTxn,
       update: [
         set: [
-          # don't update `id` as it is a primary key and used for the conflict target
-          hash: fragment("EXCLUDED.hash"),
+          # don't update `id` as it is a primary key 
+          # don't update `hash` as it is a unique index and used for the conflict target
           is_verify: fragment("EXCLUDED.is_verify"),
           inserted_at: fragment("LEAST(?, EXCLUDED.inserted_at)", tx.inserted_at),
           updated_at: fragment("GREATEST(?, EXCLUDED.updated_at)", tx.updated_at)
@@ -92,8 +92,7 @@ defmodule Explorer.Chain.Import.Runner.ZkevmLifecycleTxns do
       ],
       where:
         fragment(
-          "(EXCLUDED.hash, EXCLUDED.is_verify) IS DISTINCT FROM (?, ?)",
-          tx.hash,
+          "(EXCLUDED.is_verify) IS DISTINCT FROM (?)",
           tx.is_verify
         )
     )
diff --git a/apps/explorer/lib/explorer/chain/import/stage/block_referencing.ex b/apps/explorer/lib/explorer/chain/import/stage/block_referencing.ex
index 7f0434e35880..3330e99359a3 100644
--- a/apps/explorer/lib/explorer/chain/import/stage/block_referencing.ex
+++ b/apps/explorer/lib/explorer/chain/import/stage/block_referencing.ex
@@ -21,16 +21,22 @@ defmodule Explorer.Chain.Import.Stage.BlockReferencing do
 
   @impl Stage
   def runners do
-    if System.get_env("CHAIN_TYPE") == "polygon_edge" do
-      @default_runners ++
-        [
-          Runner.PolygonEdge.Deposits,
-          Runner.PolygonEdge.DepositExecutes,
-          Runner.PolygonEdge.Withdrawals,
-          Runner.PolygonEdge.WithdrawalExits
-        ]
-    else
-      @default_runners
+    case System.get_env("CHAIN_TYPE") do
+      "polygon_edge" ->
+        @default_runners ++
+          [
+            Runner.PolygonEdge.Deposits,
+            Runner.PolygonEdge.DepositExecutes,
+            Runner.PolygonEdge.Withdrawals,
+            Runner.PolygonEdge.WithdrawalExits
+          ]
+      "polygon_zkevm" ->
+        @default_runners ++
+          [
+            Runner.ZkevmLifecycleTxns,
+            Runner.ZkevmTxnBatches
+          ]
+      _ -> @default_runners
     end
   end
 
diff --git a/apps/explorer/priv/repo/migrations/20230420110800_create_zkevm_tables.exs b/apps/explorer/priv/repo/migrations/20230420110800_create_zkevm_tables.exs
index 4604d671305a..73c8e41534a9 100644
--- a/apps/explorer/priv/repo/migrations/20230420110800_create_zkevm_tables.exs
+++ b/apps/explorer/priv/repo/migrations/20230420110800_create_zkevm_tables.exs
@@ -9,6 +9,8 @@ defmodule Explorer.Repo.Migrations.CreateZkevmTables do
       timestamps(null: false, type: :utc_datetime_usec)
     end
 
+    create(unique_index(:zkevm_lifecycle_l1_transactions, :hash))
+
     create table(:zkevm_transaction_batches, primary_key: false) do
       add(:number, :integer, null: false, primary_key: true)
       add(:timestamp, :"timestamp without time zone", null: false)
diff --git a/apps/indexer/lib/indexer/fetcher/zkevm_txn_batch.ex b/apps/indexer/lib/indexer/fetcher/zkevm_txn_batch.ex
new file mode 100644
index 000000000000..3484e45ce2ed
--- /dev/null
+++ b/apps/indexer/lib/indexer/fetcher/zkevm_txn_batch.ex
@@ -0,0 +1,267 @@
+defmodule Indexer.Fetcher.ZkevmTxnBatch do
+  @moduledoc """
+  Fills zkevm_transaction_batches DB table.
+  """
+
+  use GenServer
+  use Indexer.Fetcher
+
+  require Logger
+
+  import Ecto.Query
+
+  import EthereumJSONRPC, only: [integer_to_quantity: 1, json_rpc: 2, quantity_to_integer: 1]
+
+  alias Explorer.{Chain, Repo}
+  alias Explorer.Chain.{ZkevmLifecycleTxn, ZkevmTxnBatch}
+
+  @batch_range_size 20
+  @recheck_latest_batch_interval 1
+
+  def child_spec(start_link_arguments) do
+    spec = %{
+      id: __MODULE__,
+      start: {__MODULE__, :start_link, start_link_arguments},
+      restart: :transient,
+      type: :worker
+    }
+
+    Supervisor.child_spec(spec, [])
+  end
+
+  def start_link(args, gen_server_options \\ []) do
+    GenServer.start_link(__MODULE__, args, Keyword.put_new(gen_server_options, :name, __MODULE__))
+  end
+
+  @impl GenServer
+  def init(args) do
+    Logger.metadata(fetcher: :zkevm_txn_batches)
+
+    #Logger.configure(truncate: :infinity)
+
+    #enabled = Application.get_all_env(:indexer)[Indexer.Fetcher.ZkevmTxnBatch][:enabled]
+
+    Process.send(self(), :continue, [])
+
+    {:ok,
+     %{
+       json_rpc_named_arguments: args[:json_rpc_named_arguments],
+       prev_latest_batch_number: 0
+     }}
+  end
+
+  @impl GenServer
+  def handle_info(
+        :continue,
+        %{
+          json_rpc_named_arguments: json_rpc_named_arguments,
+          prev_latest_batch_number: prev_latest_batch_number
+        } = state
+      ) do
+    latest_batch_number = fetch_latest_batch_number(json_rpc_named_arguments)
+
+    if latest_batch_number > prev_latest_batch_number do
+      start_batch_number = get_last_verified_batch_number() + 1
+      end_batch_number = latest_batch_number
+
+      handle_batch_range(start_batch_number, end_batch_number, json_rpc_named_arguments)
+
+      Process.send_after(self(), :continue, :timer.minutes(@recheck_latest_batch_interval))
+
+      {:noreply, %{state | prev_latest_batch_number: latest_batch_number}}
+    else
+      Process.send_after(self(), :continue, :timer.minutes(@recheck_latest_batch_interval))
+      {:noreply, state}
+    end
+  end
+
+  defp get_last_verified_batch_number do
+    query =
+      from(tb in ZkevmTxnBatch,
+        select: tb.number,
+        where: not is_nil(tb.verify_id),
+        order_by: [desc: tb.number],
+        limit: 1
+      )
+
+    query
+    |> Repo.one()
+    |> Kernel.||(0)
+  end
+
+  defp get_next_id do
+    query =
+      from(lt in ZkevmLifecycleTxn,
+        select: lt.id,
+        order_by: [desc: lt.id],
+        limit: 1
+      )
+
+    last_id =
+      query
+      |> Repo.one()
+      |> Kernel.||(0)
+
+    last_id + 1
+  end
+
+  defp handle_batch_range(start_batch_number, end_batch_number, json_rpc_named_arguments) do
+    chunks_number = ceil((end_batch_number - start_batch_number + 1) / @batch_range_size)
+
+    chunk_range = Range.new(0, max(chunks_number - 1, 0), 1)
+
+    Enum.each(chunk_range, fn current_chunk ->
+      chunk_start = start_batch_number + @batch_range_size * current_chunk
+      chunk_end = min(chunk_start + @batch_range_size - 1, end_batch_number)
+
+      fetch_and_save_batches(chunk_start, chunk_end, json_rpc_named_arguments)
+    end)
+  end
+
+  defp fetch_and_save_batches(batch_start, batch_end, json_rpc_named_arguments) do
+    requests =
+      batch_start
+      |> Range.new(batch_end, 1)
+      |> Enum.map(fn batch_number ->
+        EthereumJSONRPC.request(%{id: batch_number, method: "zkevm_getBatchByNumber", params: [integer_to_quantity(batch_number), false]})
+      end)
+
+    error_message = &"Cannot call zkevm_getBatchByNumber for the batch range #{batch_start}..#{batch_end}. Error: #{inspect(&1)}"
+
+    {:ok, responses} = repeated_call(&json_rpc/2, [requests, json_rpc_named_arguments], error_message, 3)
+
+    #Logger.warn("Hashes for the batch range #{batch_start}..#{batch_end}:")
+
+    {sequence_hashes, verify_hashes} =
+      responses
+      |> Enum.reduce({[], []}, fn res, {sequences, verifies} = _acc ->
+        "0x" <> send_sequences_tx_hash = Map.get(res.result, "sendSequencesTxHash")
+        "0x" <> verify_batch_tx_hash = Map.get(res.result, "verifyBatchTxHash")
+
+        sequences =
+          if send_sequences_tx_hash != "0000000000000000000000000000000000000000000000000000000000000000" do
+            [Base.decode16!(send_sequences_tx_hash, case: :mixed) | sequences]
+          else
+            sequences
+          end
+
+        verifies =
+          if verify_batch_tx_hash != "0000000000000000000000000000000000000000000000000000000000000000" do
+            [Base.decode16!(verify_batch_tx_hash, case: :mixed) | verifies]
+          else
+            verifies
+          end
+
+        {sequences, verifies}
+      end)
+
+    l1_tx_hashes = Enum.uniq(sequence_hashes ++ verify_hashes)
+
+    query =
+      from(
+        lt in ZkevmLifecycleTxn,
+        select: {lt.hash, lt.id},
+        where: lt.hash in ^l1_tx_hashes
+      )
+
+    hash_to_id =
+      query
+      |> Repo.all(timeout: :infinity)
+      |> Enum.reduce(%{}, fn {hash, id}, acc ->
+        Map.put(acc, hash.bytes, id)
+      end)
+
+    {batches_to_import, l1_txs_to_import, _, _} =
+      responses
+      |> Enum.reduce({[], [], get_next_id(), hash_to_id}, fn res, {batches, l1_txs, next_id, hash_to_id} = _acc ->
+        number = quantity_to_integer(Map.get(res.result, "number"))
+        {:ok, timestamp} = DateTime.from_unix(quantity_to_integer(Map.get(res.result, "timestamp")))
+        l2_transaction_hashes = Map.get(res.result, "transactions")
+        global_exit_root = Map.get(res.result, "globalExitRoot")
+        acc_input_hash = Map.get(res.result, "accInputHash")
+        state_root = Map.get(res.result, "stateRoot")
+
+        "0x" <> send_sequences_tx_hash = Map.get(res.result, "sendSequencesTxHash")
+        "0x" <> verify_batch_tx_hash = Map.get(res.result, "verifyBatchTxHash")
+
+        {sequence_id, l1_txs, next_id, hash_to_id} =
+          if send_sequences_tx_hash != "0000000000000000000000000000000000000000000000000000000000000000" do
+            sequence_tx_hash = Base.decode16!(send_sequences_tx_hash, case: :mixed)
+            
+            id = Map.get(hash_to_id, sequence_tx_hash)
+
+            if is_nil(id) do
+              {next_id, l1_txs ++ [%{id: next_id, hash: sequence_tx_hash, is_verify: false}], next_id + 1, Map.put(hash_to_id, sequence_tx_hash, next_id)}
+            else
+              {id, l1_txs, next_id, hash_to_id}
+            end
+          else
+            {nil, l1_txs, next_id, hash_to_id}
+          end
+
+        {verify_id, l1_txs, next_id, hash_to_id} =
+          if verify_batch_tx_hash != "0000000000000000000000000000000000000000000000000000000000000000" do
+            verify_tx_hash = Base.decode16!(verify_batch_tx_hash, case: :mixed)
+            
+            id = Map.get(hash_to_id, verify_tx_hash)
+
+            if is_nil(id) do
+              {next_id, l1_txs ++ [%{id: next_id, hash: verify_tx_hash, is_verify: true}], next_id + 1, Map.put(hash_to_id, verify_tx_hash, next_id)}
+            else
+              {id, l1_txs, next_id, hash_to_id}
+            end
+          else
+            {nil, l1_txs, next_id, hash_to_id}
+          end
+
+        batch = %{
+          number: number,
+          timestamp: timestamp,
+          l2_transaction_hashes: l2_transaction_hashes || [],
+          global_exit_root: global_exit_root,
+          acc_input_hash: acc_input_hash,
+          state_root: state_root,
+          sequence_id: sequence_id,
+          verify_id: verify_id
+        }
+
+        {batches ++ [batch], l1_txs, next_id, hash_to_id}
+      end)
+
+    {:ok, _} =
+      Chain.import(%{
+        zkevm_lifecycle_txns: %{params: l1_txs_to_import},
+        zkevm_txn_batches: %{params: batches_to_import},
+        timeout: :infinity
+      })
+  end
+
+  defp fetch_latest_batch_number(json_rpc_named_arguments) do
+    req = EthereumJSONRPC.request(%{id: 0, method: "zkevm_batchNumber", params: []})
+
+    error_message = &"Cannot call zkevm_batchNumber. Error: #{inspect(&1)}"
+
+    {:ok, latest_batch_number} = repeated_call(&json_rpc/2, [req, json_rpc_named_arguments], error_message, 3)
+
+    quantity_to_integer(latest_batch_number)
+  end
+
+  defp repeated_call(func, args, error_message, retries_left) do
+    case apply(func, args) do
+      {:ok, _} = res ->
+        res
+
+      {:error, message} = err ->
+        retries_left = retries_left - 1
+
+        if retries_left <= 0 do
+          Logger.error(error_message.(message))
+          err
+        else
+          Logger.error("#{error_message.(message)} Retrying...")
+          :timer.sleep(3000)
+          repeated_call(func, args, error_message, retries_left)
+        end
+    end
+  end
+end
diff --git a/apps/indexer/lib/indexer/supervisor.ex b/apps/indexer/lib/indexer/supervisor.ex
index 732c71727a71..0a16c674b613 100644
--- a/apps/indexer/lib/indexer/supervisor.ex
+++ b/apps/indexer/lib/indexer/supervisor.ex
@@ -34,7 +34,8 @@ defmodule Indexer.Supervisor do
     TokenUpdater,
     TransactionAction,
     UncleBlock,
-    Withdrawal
+    Withdrawal,
+    ZkevmTxnBatch
   }
 
   alias Indexer.Temporary.{
@@ -132,6 +133,7 @@ defmodule Indexer.Supervisor do
         {Indexer.Fetcher.PolygonEdge.Withdrawal.Supervisor,
          [[memory_monitor: memory_monitor, json_rpc_named_arguments: json_rpc_named_arguments]]},
         {Indexer.Fetcher.PolygonEdge.WithdrawalExit.Supervisor, [[memory_monitor: memory_monitor]]},
+        {ZkevmTxnBatch.Supervisor, [[json_rpc_named_arguments: json_rpc_named_arguments, memory_monitor: memory_monitor]]},
 
         # Out-of-band fetchers
         {EmptyBlocksSanitizer.Supervisor, [[json_rpc_named_arguments: json_rpc_named_arguments]]},

From 6673b1cee17be0dab699d3cf1d48bda4dbedc912 Mon Sep 17 00:00:00 2001
From: POA <33550681+poa@users.noreply.github.com>
Date: Wed, 3 May 2023 17:14:16 +0300
Subject: [PATCH 540/909] Extend zkEVM batches indexer

---
 .../chain/import/runner/zkevm_batch_txns.ex   | 76 +++++++++++++++++++
 .../chain/import/runner/zkevm_txn_batches.ex  |  4 +-
 .../chain/import/stage/block_referencing.ex   |  3 +-
 .../lib/explorer/chain/zkevm_batch_txn.ex     | 32 ++++++++
 .../lib/explorer/chain/zkevm_txn_batch.ex     | 19 +++--
 .../20230420110800_create_zkevm_tables.exs    | 19 ++++-
 .../lib/indexer/fetcher/zkevm_txn_batch.ex    | 76 ++++++++++++++-----
 apps/indexer/lib/indexer/supervisor.ex        |  3 +-
 8 files changed, 201 insertions(+), 31 deletions(-)
 create mode 100644 apps/explorer/lib/explorer/chain/import/runner/zkevm_batch_txns.ex
 create mode 100644 apps/explorer/lib/explorer/chain/zkevm_batch_txn.ex

diff --git a/apps/explorer/lib/explorer/chain/import/runner/zkevm_batch_txns.ex b/apps/explorer/lib/explorer/chain/import/runner/zkevm_batch_txns.ex
new file mode 100644
index 000000000000..f7ac950e0c19
--- /dev/null
+++ b/apps/explorer/lib/explorer/chain/import/runner/zkevm_batch_txns.ex
@@ -0,0 +1,76 @@
+defmodule Explorer.Chain.Import.Runner.ZkevmBatchTxns do
+  @moduledoc """
+  Bulk imports `t:Explorer.Chain.ZkevmBatchTxn.t/0`.
+  """
+
+  require Ecto.Query
+
+  alias Ecto.{Changeset, Multi, Repo}
+  alias Explorer.Chain.{Import, ZkevmBatchTxn}
+  alias Explorer.Prometheus.Instrumenter
+
+  @behaviour Import.Runner
+
+  # milliseconds
+  @timeout 60_000
+
+  @type imported :: [ZkevmBatchTxn.t()]
+
+  @impl Import.Runner
+  def ecto_schema_module, do: ZkevmBatchTxn
+
+  @impl Import.Runner
+  def option_key, do: :zkevm_batch_txns
+
+  @impl Import.Runner
+  def imported_table_row do
+    %{
+      value_type: "[#{ecto_schema_module()}.t()]",
+      value_description: "List of `t:#{ecto_schema_module()}.t/0`s"
+    }
+  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)
+
+    Multi.run(multi, :insert_zkevm_batch_txns, fn repo, _ ->
+      Instrumenter.block_import_stage_runner(
+        fn -> insert(repo, changes_list, insert_options) end,
+        :block_referencing,
+        :zkevm_batch_txns,
+        :zkevm_batch_txns
+      )
+    end)
+  end
+
+  @impl Import.Runner
+  def timeout, do: @timeout
+
+  @spec insert(Repo.t(), [map()], %{required(:timeout) => timeout(), required(:timestamps) => Import.timestamps()}) ::
+          {:ok, [ZkevmBatchTxn.t()]}
+          | {:error, [Changeset.t()]}
+  def insert(repo, changes_list, %{timeout: timeout, timestamps: timestamps} = _options) when is_list(changes_list) do
+    # Enforce ZkevmBatchTxn ShareLocks order (see docs: sharelock.md)
+    ordered_changes_list = Enum.sort_by(changes_list, & &1.hash)
+
+    {:ok, inserted} =
+      Import.insert_changes_list(
+        repo,
+        ordered_changes_list,
+        for: ZkevmBatchTxn,
+        returning: true,
+        timeout: timeout,
+        timestamps: timestamps,
+        conflict_target: :hash,
+        on_conflict: :nothing
+      )
+
+    {:ok, inserted}
+  end
+end
diff --git a/apps/explorer/lib/explorer/chain/import/runner/zkevm_txn_batches.ex b/apps/explorer/lib/explorer/chain/import/runner/zkevm_txn_batches.ex
index 3d3b27aebfe6..ed1e5f1d8f76 100644
--- a/apps/explorer/lib/explorer/chain/import/runner/zkevm_txn_batches.ex
+++ b/apps/explorer/lib/explorer/chain/import/runner/zkevm_txn_batches.ex
@@ -85,7 +85,6 @@ defmodule Explorer.Chain.Import.Runner.ZkevmTxnBatches do
         set: [
           # don't update `number` as it is a primary key and used for the conflict target
           timestamp: fragment("EXCLUDED.timestamp"),
-          l2_transaction_hashes: fragment("EXCLUDED.l2_transaction_hashes"),
           global_exit_root: fragment("EXCLUDED.global_exit_root"),
           acc_input_hash: fragment("EXCLUDED.acc_input_hash"),
           state_root: fragment("EXCLUDED.state_root"),
@@ -97,9 +96,8 @@ defmodule Explorer.Chain.Import.Runner.ZkevmTxnBatches do
       ],
       where:
         fragment(
-          "(EXCLUDED.timestamp, EXCLUDED.l2_transaction_hashes, EXCLUDED.global_exit_root, EXCLUDED.acc_input_hash, EXCLUDED.state_root, EXCLUDED.sequence_id, EXCLUDED.verify_id) IS DISTINCT FROM (?, ?, ?, ?, ?, ?, ?)",
+          "(EXCLUDED.timestamp, EXCLUDED.global_exit_root, EXCLUDED.acc_input_hash, EXCLUDED.state_root, EXCLUDED.sequence_id, EXCLUDED.verify_id) IS DISTINCT FROM (?, ?, ?, ?, ?, ?)",
           tb.timestamp,
-          tb.l2_transaction_hashes,
           tb.global_exit_root,
           tb.acc_input_hash,
           tb.state_root,
diff --git a/apps/explorer/lib/explorer/chain/import/stage/block_referencing.ex b/apps/explorer/lib/explorer/chain/import/stage/block_referencing.ex
index 3330e99359a3..99ae4be58fa7 100644
--- a/apps/explorer/lib/explorer/chain/import/stage/block_referencing.ex
+++ b/apps/explorer/lib/explorer/chain/import/stage/block_referencing.ex
@@ -34,7 +34,8 @@ defmodule Explorer.Chain.Import.Stage.BlockReferencing do
         @default_runners ++
           [
             Runner.ZkevmLifecycleTxns,
-            Runner.ZkevmTxnBatches
+            Runner.ZkevmTxnBatches,
+            Runner.ZkevmBatchTxns
           ]
       _ -> @default_runners
     end
diff --git a/apps/explorer/lib/explorer/chain/zkevm_batch_txn.ex b/apps/explorer/lib/explorer/chain/zkevm_batch_txn.ex
new file mode 100644
index 000000000000..8a30661a3eaa
--- /dev/null
+++ b/apps/explorer/lib/explorer/chain/zkevm_batch_txn.ex
@@ -0,0 +1,32 @@
+defmodule Explorer.Chain.ZkevmBatchTxn do
+  @moduledoc "Models a list of transactions related to a batch for zkEVM."
+
+  use Explorer.Schema
+
+  alias Explorer.Chain.{Hash, Transaction, ZkevmTxnBatch}
+
+  @required_attrs ~w(batch_number hash)a
+
+  @type t :: %__MODULE__{
+          batch_number: non_neg_integer(),
+          batch: %Ecto.Association.NotLoaded{} | ZkevmTxnBatch.t() | nil,
+          hash: Hash.t(),
+          l2_transaction: %Ecto.Association.NotLoaded{} | Transaction.t() | nil
+        }
+
+  @primary_key false
+  schema "zkevm_batch_l2_transactions" do
+    belongs_to(:batch, ZkevmTxnBatch, foreign_key: :batch_number, references: :number, type: :integer)
+    belongs_to(:l2_transaction, Transaction, foreign_key: :hash, references: :hash, type: Hash.Full)
+
+    timestamps()
+  end
+
+  def changeset(%__MODULE__{} = transactions, attrs \\ %{}) do
+    transactions
+    |> cast(attrs, @required_attrs)
+    |> validate_required(@required_attrs)
+    |> foreign_key_constraint(:batch_number)
+    |> unique_constraint(:hash)
+  end
+end
diff --git a/apps/explorer/lib/explorer/chain/zkevm_txn_batch.ex b/apps/explorer/lib/explorer/chain/zkevm_txn_batch.ex
index e5359bac62d5..7cd380af1ece 100644
--- a/apps/explorer/lib/explorer/chain/zkevm_txn_batch.ex
+++ b/apps/explorer/lib/explorer/chain/zkevm_txn_batch.ex
@@ -3,28 +3,28 @@ defmodule Explorer.Chain.ZkevmTxnBatch do
 
   use Explorer.Schema
 
-  alias Explorer.Chain.{Hash, ZkevmLifecycleTxn}
+  alias Explorer.Chain.{Hash, ZkevmBatchTxn, ZkevmLifecycleTxn}
 
-  @required_attrs ~w(number timestamp l2_transaction_hashes global_exit_root acc_input_hash state_root sequence_id verify_id)a
+  @optional_attrs ~w(sequence_id verify_id)a
+
+  @required_attrs ~w(number timestamp global_exit_root acc_input_hash state_root)a
 
   @type t :: %__MODULE__{
           number: non_neg_integer(),
           timestamp: DateTime.t(),
-          l2_transaction_hashes: [Hash.t()],
           global_exit_root: Hash.t(),
           acc_input_hash: Hash.t(),
           state_root: Hash.t(),
           sequence_id: non_neg_integer() | nil,
           sequence_transaction: %Ecto.Association.NotLoaded{} | ZkevmLifecycleTxn.t() | nil,
           verify_id: non_neg_integer() | nil,
-          verify_transaction: %Ecto.Association.NotLoaded{} | ZkevmLifecycleTxn.t() | nil
+          verify_transaction: %Ecto.Association.NotLoaded{} | ZkevmLifecycleTxn.t() | nil,
+          l2_transactions: %Ecto.Association.NotLoaded{} | [ZkevmBatchTxn.t()]
         }
 
-  @primary_key false
+  @primary_key {:number, :integer, autogenerate: false}
   schema "zkevm_transaction_batches" do
-    field(:number, :integer, primary_key: true)
     field(:timestamp, :utc_datetime_usec)
-    field(:l2_transaction_hashes, {:array, Hash.Full})
     field(:global_exit_root, Hash.Full)
     field(:acc_input_hash, Hash.Full)
     field(:state_root, Hash.Full)
@@ -32,14 +32,17 @@ defmodule Explorer.Chain.ZkevmTxnBatch do
     belongs_to(:sequence_transaction, ZkevmLifecycleTxn, foreign_key: :sequence_id, references: :id, type: :integer)
     belongs_to(:verify_transaction, ZkevmLifecycleTxn, foreign_key: :verify_id, references: :id, type: :integer)
 
+    has_many(:l2_transactions, ZkevmBatchTxn, foreign_key: :batch_number)
+
     timestamps()
   end
 
   def changeset(%__MODULE__{} = batches, attrs \\ %{}) do
     batches
-    |> cast(attrs, @required_attrs)
+    |> cast(attrs, @required_attrs ++ @optional_attrs)
     |> validate_required(@required_attrs)
     |> foreign_key_constraint(:sequence_id)
     |> foreign_key_constraint(:verify_id)
+    |> unique_constraint(:number)
   end
 end
diff --git a/apps/explorer/priv/repo/migrations/20230420110800_create_zkevm_tables.exs b/apps/explorer/priv/repo/migrations/20230420110800_create_zkevm_tables.exs
index 73c8e41534a9..eeb9d1d6e2cc 100644
--- a/apps/explorer/priv/repo/migrations/20230420110800_create_zkevm_tables.exs
+++ b/apps/explorer/priv/repo/migrations/20230420110800_create_zkevm_tables.exs
@@ -14,7 +14,6 @@ defmodule Explorer.Repo.Migrations.CreateZkevmTables do
     create table(:zkevm_transaction_batches, primary_key: false) do
       add(:number, :integer, null: false, primary_key: true)
       add(:timestamp, :"timestamp without time zone", null: false)
-      add(:l2_transaction_hashes, {:array, :bytea}, null: false)
       add(:global_exit_root, :bytea, null: false)
       add(:acc_input_hash, :bytea, null: false)
       add(:state_root, :bytea, null: false)
@@ -33,5 +32,23 @@ defmodule Explorer.Repo.Migrations.CreateZkevmTables do
 
       timestamps(null: false, type: :utc_datetime_usec)
     end
+
+    create table(:zkevm_batch_l2_transactions, primary_key: false) do
+      add(
+        :batch_number,
+        references(:zkevm_transaction_batches,
+          column: :number,
+          on_delete: :delete_all,
+          on_update: :update_all,
+          type: :integer
+        ),
+        null: false
+      )
+
+      add(:hash, :bytea, null: false)
+      timestamps(null: false, type: :utc_datetime_usec)
+    end
+
+    create(unique_index(:zkevm_batch_l2_transactions, :hash))
   end
 end
diff --git a/apps/indexer/lib/indexer/fetcher/zkevm_txn_batch.ex b/apps/indexer/lib/indexer/fetcher/zkevm_txn_batch.ex
index 3484e45ce2ed..a15310fb25a7 100644
--- a/apps/indexer/lib/indexer/fetcher/zkevm_txn_batch.ex
+++ b/apps/indexer/lib/indexer/fetcher/zkevm_txn_batch.ex
@@ -37,9 +37,9 @@ defmodule Indexer.Fetcher.ZkevmTxnBatch do
   def init(args) do
     Logger.metadata(fetcher: :zkevm_txn_batches)
 
-    #Logger.configure(truncate: :infinity)
+    # Logger.configure(truncate: :infinity)
 
-    #enabled = Application.get_all_env(:indexer)[Indexer.Fetcher.ZkevmTxnBatch][:enabled]
+    # enabled = Application.get_all_env(:indexer)[Indexer.Fetcher.ZkevmTxnBatch][:enabled]
 
     Process.send(self(), :continue, [])
 
@@ -75,6 +75,12 @@ defmodule Indexer.Fetcher.ZkevmTxnBatch do
     end
   end
 
+  @impl GenServer
+  def handle_info({ref, _result}, state) do
+    Process.demonitor(ref, [:flush])
+    {:noreply, state}
+  end
+
   defp get_last_verified_batch_number do
     query =
       from(tb in ZkevmTxnBatch,
@@ -123,20 +129,34 @@ defmodule Indexer.Fetcher.ZkevmTxnBatch do
       batch_start
       |> Range.new(batch_end, 1)
       |> Enum.map(fn batch_number ->
-        EthereumJSONRPC.request(%{id: batch_number, method: "zkevm_getBatchByNumber", params: [integer_to_quantity(batch_number), false]})
+        EthereumJSONRPC.request(%{
+          id: batch_number,
+          method: "zkevm_getBatchByNumber",
+          params: [integer_to_quantity(batch_number), false]
+        })
       end)
 
-    error_message = &"Cannot call zkevm_getBatchByNumber for the batch range #{batch_start}..#{batch_end}. Error: #{inspect(&1)}"
+    error_message =
+      &"Cannot call zkevm_getBatchByNumber for the batch range #{batch_start}..#{batch_end}. Error: #{inspect(&1)}"
 
     {:ok, responses} = repeated_call(&json_rpc/2, [requests, json_rpc_named_arguments], error_message, 3)
 
-    #Logger.warn("Hashes for the batch range #{batch_start}..#{batch_end}:")
+    # Logger.warn("Hashes for the batch range #{batch_start}..#{batch_end}:")
 
     {sequence_hashes, verify_hashes} =
       responses
       |> Enum.reduce({[], []}, fn res, {sequences, verifies} = _acc ->
-        "0x" <> send_sequences_tx_hash = Map.get(res.result, "sendSequencesTxHash")
-        "0x" <> verify_batch_tx_hash = Map.get(res.result, "verifyBatchTxHash")
+        send_sequences_tx_hash =
+          case Map.get(res.result, "sendSequencesTxHash") do
+            "0x" <> send_sequences_tx_hash -> send_sequences_tx_hash
+            nil -> "0000000000000000000000000000000000000000000000000000000000000000"
+          end
+
+        verify_batch_tx_hash =
+          case Map.get(res.result, "verifyBatchTxHash") do
+            "0x" <> verify_batch_tx_hash -> verify_batch_tx_hash
+            nil -> "0000000000000000000000000000000000000000000000000000000000000000"
+          end
 
         sequences =
           if send_sequences_tx_hash != "0000000000000000000000000000000000000000000000000000000000000000" do
@@ -171,9 +191,10 @@ defmodule Indexer.Fetcher.ZkevmTxnBatch do
         Map.put(acc, hash.bytes, id)
       end)
 
-    {batches_to_import, l1_txs_to_import, _, _} =
+    {batches_to_import, l2_txs_to_import, l1_txs_to_import, _, _} =
       responses
-      |> Enum.reduce({[], [], get_next_id(), hash_to_id}, fn res, {batches, l1_txs, next_id, hash_to_id} = _acc ->
+      |> Enum.reduce({[], [], [], get_next_id(), hash_to_id}, fn res,
+                                                                 {batches, l2_txs, l1_txs, next_id, hash_to_id} = _acc ->
         number = quantity_to_integer(Map.get(res.result, "number"))
         {:ok, timestamp} = DateTime.from_unix(quantity_to_integer(Map.get(res.result, "timestamp")))
         l2_transaction_hashes = Map.get(res.result, "transactions")
@@ -181,17 +202,27 @@ defmodule Indexer.Fetcher.ZkevmTxnBatch do
         acc_input_hash = Map.get(res.result, "accInputHash")
         state_root = Map.get(res.result, "stateRoot")
 
-        "0x" <> send_sequences_tx_hash = Map.get(res.result, "sendSequencesTxHash")
-        "0x" <> verify_batch_tx_hash = Map.get(res.result, "verifyBatchTxHash")
+        send_sequences_tx_hash =
+          case Map.get(res.result, "sendSequencesTxHash") do
+            "0x" <> send_sequences_tx_hash -> send_sequences_tx_hash
+            nil -> "0000000000000000000000000000000000000000000000000000000000000000"
+          end
+
+        verify_batch_tx_hash =
+          case Map.get(res.result, "verifyBatchTxHash") do
+            "0x" <> verify_batch_tx_hash -> verify_batch_tx_hash
+            nil -> "0000000000000000000000000000000000000000000000000000000000000000"
+          end
 
         {sequence_id, l1_txs, next_id, hash_to_id} =
           if send_sequences_tx_hash != "0000000000000000000000000000000000000000000000000000000000000000" do
             sequence_tx_hash = Base.decode16!(send_sequences_tx_hash, case: :mixed)
-            
+
             id = Map.get(hash_to_id, sequence_tx_hash)
 
             if is_nil(id) do
-              {next_id, l1_txs ++ [%{id: next_id, hash: sequence_tx_hash, is_verify: false}], next_id + 1, Map.put(hash_to_id, sequence_tx_hash, next_id)}
+              {next_id, l1_txs ++ [%{id: next_id, hash: sequence_tx_hash, is_verify: false}], next_id + 1,
+               Map.put(hash_to_id, sequence_tx_hash, next_id)}
             else
               {id, l1_txs, next_id, hash_to_id}
             end
@@ -202,11 +233,12 @@ defmodule Indexer.Fetcher.ZkevmTxnBatch do
         {verify_id, l1_txs, next_id, hash_to_id} =
           if verify_batch_tx_hash != "0000000000000000000000000000000000000000000000000000000000000000" do
             verify_tx_hash = Base.decode16!(verify_batch_tx_hash, case: :mixed)
-            
+
             id = Map.get(hash_to_id, verify_tx_hash)
 
             if is_nil(id) do
-              {next_id, l1_txs ++ [%{id: next_id, hash: verify_tx_hash, is_verify: true}], next_id + 1, Map.put(hash_to_id, verify_tx_hash, next_id)}
+              {next_id, l1_txs ++ [%{id: next_id, hash: verify_tx_hash, is_verify: true}], next_id + 1,
+               Map.put(hash_to_id, verify_tx_hash, next_id)}
             else
               {id, l1_txs, next_id, hash_to_id}
             end
@@ -217,7 +249,6 @@ defmodule Indexer.Fetcher.ZkevmTxnBatch do
         batch = %{
           number: number,
           timestamp: timestamp,
-          l2_transaction_hashes: l2_transaction_hashes || [],
           global_exit_root: global_exit_root,
           acc_input_hash: acc_input_hash,
           state_root: state_root,
@@ -225,13 +256,24 @@ defmodule Indexer.Fetcher.ZkevmTxnBatch do
           verify_id: verify_id
         }
 
-        {batches ++ [batch], l1_txs, next_id, hash_to_id}
+        l2_txs_append =
+          l2_transaction_hashes
+          |> Kernel.||([])
+          |> Enum.map(fn l2_tx_hash ->
+            %{
+              batch_number: number,
+              hash: l2_tx_hash
+            }
+          end)
+
+        {batches ++ [batch], l2_txs ++ l2_txs_append, l1_txs, next_id, hash_to_id}
       end)
 
     {:ok, _} =
       Chain.import(%{
         zkevm_lifecycle_txns: %{params: l1_txs_to_import},
         zkevm_txn_batches: %{params: batches_to_import},
+        zkevm_batch_txns: %{params: l2_txs_to_import},
         timeout: :infinity
       })
   end
diff --git a/apps/indexer/lib/indexer/supervisor.ex b/apps/indexer/lib/indexer/supervisor.ex
index 0a16c674b613..14ae27a23c59 100644
--- a/apps/indexer/lib/indexer/supervisor.ex
+++ b/apps/indexer/lib/indexer/supervisor.ex
@@ -133,7 +133,8 @@ defmodule Indexer.Supervisor do
         {Indexer.Fetcher.PolygonEdge.Withdrawal.Supervisor,
          [[memory_monitor: memory_monitor, json_rpc_named_arguments: json_rpc_named_arguments]]},
         {Indexer.Fetcher.PolygonEdge.WithdrawalExit.Supervisor, [[memory_monitor: memory_monitor]]},
-        {ZkevmTxnBatch.Supervisor, [[json_rpc_named_arguments: json_rpc_named_arguments, memory_monitor: memory_monitor]]},
+        {ZkevmTxnBatch.Supervisor,
+         [[json_rpc_named_arguments: json_rpc_named_arguments, memory_monitor: memory_monitor]]},
 
         # Out-of-band fetchers
         {EmptyBlocksSanitizer.Supervisor, [[json_rpc_named_arguments: json_rpc_named_arguments]]},

From f3dd999aca6eefa3add7d2e74a0a87b5a27354eb Mon Sep 17 00:00:00 2001
From: POA <33550681+poa@users.noreply.github.com>
Date: Mon, 8 May 2023 14:34:23 +0300
Subject: [PATCH 541/909] Improve detecting a new zkEVM batch

---
 .../lib/indexer/fetcher/zkevm_txn_batch.ex    | 80 ++++++++++++++-----
 1 file changed, 59 insertions(+), 21 deletions(-)

diff --git a/apps/indexer/lib/indexer/fetcher/zkevm_txn_batch.ex b/apps/indexer/lib/indexer/fetcher/zkevm_txn_batch.ex
index a15310fb25a7..d85f2bbd6fe3 100644
--- a/apps/indexer/lib/indexer/fetcher/zkevm_txn_batch.ex
+++ b/apps/indexer/lib/indexer/fetcher/zkevm_txn_batch.ex
@@ -16,7 +16,7 @@ defmodule Indexer.Fetcher.ZkevmTxnBatch do
   alias Explorer.Chain.{ZkevmLifecycleTxn, ZkevmTxnBatch}
 
   @batch_range_size 20
-  @recheck_latest_batch_interval 1
+  @recheck_latest_batch_interval 60
 
   def child_spec(start_link_arguments) do
     spec = %{
@@ -36,9 +36,9 @@ defmodule Indexer.Fetcher.ZkevmTxnBatch do
   @impl GenServer
   def init(args) do
     Logger.metadata(fetcher: :zkevm_txn_batches)
-
     # Logger.configure(truncate: :infinity)
 
+    # todo
     # enabled = Application.get_all_env(:indexer)[Indexer.Fetcher.ZkevmTxnBatch][:enabled]
 
     Process.send(self(), :continue, [])
@@ -46,7 +46,9 @@ defmodule Indexer.Fetcher.ZkevmTxnBatch do
     {:ok,
      %{
        json_rpc_named_arguments: args[:json_rpc_named_arguments],
-       prev_latest_batch_number: 0
+       prev_latest_batch_number: 0,
+       prev_virtual_batch_number: 0,
+       prev_verified_batch_number: 0
      }}
   end
 
@@ -55,24 +57,54 @@ defmodule Indexer.Fetcher.ZkevmTxnBatch do
         :continue,
         %{
           json_rpc_named_arguments: json_rpc_named_arguments,
-          prev_latest_batch_number: prev_latest_batch_number
+          prev_latest_batch_number: prev_latest_batch_number,
+          prev_virtual_batch_number: prev_virtual_batch_number,
+          prev_verified_batch_number: prev_verified_batch_number
         } = state
       ) do
-    latest_batch_number = fetch_latest_batch_number(json_rpc_named_arguments)
+    {latest_batch_number, virtual_batch_number, verified_batch_number} = fetch_latest_batch_numbers(json_rpc_named_arguments)
 
-    if latest_batch_number > prev_latest_batch_number do
-      start_batch_number = get_last_verified_batch_number() + 1
-      end_batch_number = latest_batch_number
+    {new_state, handle_duration} = 
+      if latest_batch_number > prev_latest_batch_number or virtual_batch_number > prev_virtual_batch_number or verified_batch_number > prev_verified_batch_number do
+        start_batch_number = get_last_verified_batch_number() + 1
+        end_batch_number = latest_batch_number
 
-      handle_batch_range(start_batch_number, end_batch_number, json_rpc_named_arguments)
+        log_message =
+          if latest_batch_number > prev_latest_batch_number do
+            "Found a new latest batch number #{latest_batch_number}. Previous batch number is #{prev_latest_batch_number}. "
+          else
+            ""
+          end
 
-      Process.send_after(self(), :continue, :timer.minutes(@recheck_latest_batch_interval))
+        log_message =
+          if virtual_batch_number > prev_virtual_batch_number do
+            log_message <> "Found a new virtual batch number #{virtual_batch_number}. Previous virtual batch number is #{prev_virtual_batch_number}. "
+          else
+            log_message
+          end
 
-      {:noreply, %{state | prev_latest_batch_number: latest_batch_number}}
-    else
-      Process.send_after(self(), :continue, :timer.minutes(@recheck_latest_batch_interval))
-      {:noreply, state}
-    end
+        log_message =
+          if verified_batch_number > prev_verified_batch_number do
+            log_message <> "Found a new verified batch number #{verified_batch_number}. Previous verified batch number is #{prev_verified_batch_number}. "
+          else
+            log_message
+          end
+
+        Logger.info(log_message <> "Handling the batch range #{start_batch_number}..#{end_batch_number}.")
+
+        {handle_duration, _} = :timer.tc(fn -> handle_batch_range(start_batch_number, end_batch_number, json_rpc_named_arguments) end)
+
+        {
+          %{state | prev_latest_batch_number: latest_batch_number, prev_virtual_batch_number: virtual_batch_number, prev_verified_batch_number: verified_batch_number},
+          div(handle_duration, 1000)
+        }
+      else
+        {state, 0}
+      end
+
+    Process.send_after(self(), :continue, :timer.seconds(@recheck_latest_batch_interval) - handle_duration)
+
+    {:noreply, new_state}
   end
 
   @impl GenServer
@@ -141,8 +173,6 @@ defmodule Indexer.Fetcher.ZkevmTxnBatch do
 
     {:ok, responses} = repeated_call(&json_rpc/2, [requests, json_rpc_named_arguments], error_message, 3)
 
-    # Logger.warn("Hashes for the batch range #{batch_start}..#{batch_end}:")
-
     {sequence_hashes, verify_hashes} =
       responses
       |> Enum.reduce({[], []}, fn res, {sequences, verifies} = _acc ->
@@ -278,14 +308,22 @@ defmodule Indexer.Fetcher.ZkevmTxnBatch do
       })
   end
 
-  defp fetch_latest_batch_number(json_rpc_named_arguments) do
-    req = EthereumJSONRPC.request(%{id: 0, method: "zkevm_batchNumber", params: []})
+  defp fetch_latest_batch_numbers(json_rpc_named_arguments) do
+    requests = [
+      EthereumJSONRPC.request(%{id: 0, method: "zkevm_batchNumber", params: []}),
+      EthereumJSONRPC.request(%{id: 1, method: "zkevm_virtualBatchNumber", params: []}),
+      EthereumJSONRPC.request(%{id: 2, method: "zkevm_verifiedBatchNumber", params: []})
+    ]
 
     error_message = &"Cannot call zkevm_batchNumber. Error: #{inspect(&1)}"
 
-    {:ok, latest_batch_number} = repeated_call(&json_rpc/2, [req, json_rpc_named_arguments], error_message, 3)
+    {:ok, responses} = repeated_call(&json_rpc/2, [requests, json_rpc_named_arguments], error_message, 3)
+
+    latest_batch_number = Enum.find_value(responses, fn resp -> if resp.id == 0, do: quantity_to_integer(resp.result) end)
+    virtual_batch_number = Enum.find_value(responses, fn resp -> if resp.id == 1, do: quantity_to_integer(resp.result) end)
+    verified_batch_number = Enum.find_value(responses, fn resp -> if resp.id == 2, do: quantity_to_integer(resp.result) end)
 
-    quantity_to_integer(latest_batch_number)
+    {latest_batch_number, virtual_batch_number, verified_batch_number}
   end
 
   defp repeated_call(func, args, error_message, retries_left) do

From 6b5a353317cf406ad40c4a112e49f1d0a6c3aebc Mon Sep 17 00:00:00 2001
From: POA <33550681+poa@users.noreply.github.com>
Date: Mon, 8 May 2023 15:57:10 +0300
Subject: [PATCH 542/909] Add INDEXER_ZKEVM_BATCHES_ENABLED env var

---
 .../lib/indexer/fetcher/zkevm_txn_batch.ex    | 38 ++++++++++++-------
 apps/indexer/lib/indexer/supervisor.ex        |  5 ++-
 config/runtime.exs                            |  3 ++
 3 files changed, 31 insertions(+), 15 deletions(-)

diff --git a/apps/indexer/lib/indexer/fetcher/zkevm_txn_batch.ex b/apps/indexer/lib/indexer/fetcher/zkevm_txn_batch.ex
index d85f2bbd6fe3..272edc83bbb7 100644
--- a/apps/indexer/lib/indexer/fetcher/zkevm_txn_batch.ex
+++ b/apps/indexer/lib/indexer/fetcher/zkevm_txn_batch.ex
@@ -38,9 +38,6 @@ defmodule Indexer.Fetcher.ZkevmTxnBatch do
     Logger.metadata(fetcher: :zkevm_txn_batches)
     # Logger.configure(truncate: :infinity)
 
-    # todo
-    # enabled = Application.get_all_env(:indexer)[Indexer.Fetcher.ZkevmTxnBatch][:enabled]
-
     Process.send(self(), :continue, [])
 
     {:ok,
@@ -62,10 +59,12 @@ defmodule Indexer.Fetcher.ZkevmTxnBatch do
           prev_verified_batch_number: prev_verified_batch_number
         } = state
       ) do
-    {latest_batch_number, virtual_batch_number, verified_batch_number} = fetch_latest_batch_numbers(json_rpc_named_arguments)
+    {latest_batch_number, virtual_batch_number, verified_batch_number} =
+      fetch_latest_batch_numbers(json_rpc_named_arguments)
 
-    {new_state, handle_duration} = 
-      if latest_batch_number > prev_latest_batch_number or virtual_batch_number > prev_virtual_batch_number or verified_batch_number > prev_verified_batch_number do
+    {new_state, handle_duration} =
+      if latest_batch_number > prev_latest_batch_number or virtual_batch_number > prev_virtual_batch_number or
+           verified_batch_number > prev_verified_batch_number do
         start_batch_number = get_last_verified_batch_number() + 1
         end_batch_number = latest_batch_number
 
@@ -78,24 +77,32 @@ defmodule Indexer.Fetcher.ZkevmTxnBatch do
 
         log_message =
           if virtual_batch_number > prev_virtual_batch_number do
-            log_message <> "Found a new virtual batch number #{virtual_batch_number}. Previous virtual batch number is #{prev_virtual_batch_number}. "
+            log_message <>
+              "Found a new virtual batch number #{virtual_batch_number}. Previous virtual batch number is #{prev_virtual_batch_number}. "
           else
             log_message
           end
 
         log_message =
           if verified_batch_number > prev_verified_batch_number do
-            log_message <> "Found a new verified batch number #{verified_batch_number}. Previous verified batch number is #{prev_verified_batch_number}. "
+            log_message <>
+              "Found a new verified batch number #{verified_batch_number}. Previous verified batch number is #{prev_verified_batch_number}. "
           else
             log_message
           end
 
         Logger.info(log_message <> "Handling the batch range #{start_batch_number}..#{end_batch_number}.")
 
-        {handle_duration, _} = :timer.tc(fn -> handle_batch_range(start_batch_number, end_batch_number, json_rpc_named_arguments) end)
+        {handle_duration, _} =
+          :timer.tc(fn -> handle_batch_range(start_batch_number, end_batch_number, json_rpc_named_arguments) end)
 
         {
-          %{state | prev_latest_batch_number: latest_batch_number, prev_virtual_batch_number: virtual_batch_number, prev_verified_batch_number: verified_batch_number},
+          %{
+            state
+            | prev_latest_batch_number: latest_batch_number,
+              prev_virtual_batch_number: virtual_batch_number,
+              prev_verified_batch_number: verified_batch_number
+          },
           div(handle_duration, 1000)
         }
       else
@@ -319,9 +326,14 @@ defmodule Indexer.Fetcher.ZkevmTxnBatch do
 
     {:ok, responses} = repeated_call(&json_rpc/2, [requests, json_rpc_named_arguments], error_message, 3)
 
-    latest_batch_number = Enum.find_value(responses, fn resp -> if resp.id == 0, do: quantity_to_integer(resp.result) end)
-    virtual_batch_number = Enum.find_value(responses, fn resp -> if resp.id == 1, do: quantity_to_integer(resp.result) end)
-    verified_batch_number = Enum.find_value(responses, fn resp -> if resp.id == 2, do: quantity_to_integer(resp.result) end)
+    latest_batch_number =
+      Enum.find_value(responses, fn resp -> if resp.id == 0, do: quantity_to_integer(resp.result) end)
+
+    virtual_batch_number =
+      Enum.find_value(responses, fn resp -> if resp.id == 1, do: quantity_to_integer(resp.result) end)
+
+    verified_batch_number =
+      Enum.find_value(responses, fn resp -> if resp.id == 2, do: quantity_to_integer(resp.result) end)
 
     {latest_batch_number, virtual_batch_number, verified_batch_number}
   end
diff --git a/apps/indexer/lib/indexer/supervisor.ex b/apps/indexer/lib/indexer/supervisor.ex
index 14ae27a23c59..ea631014735f 100644
--- a/apps/indexer/lib/indexer/supervisor.ex
+++ b/apps/indexer/lib/indexer/supervisor.ex
@@ -133,8 +133,9 @@ defmodule Indexer.Supervisor do
         {Indexer.Fetcher.PolygonEdge.Withdrawal.Supervisor,
          [[memory_monitor: memory_monitor, json_rpc_named_arguments: json_rpc_named_arguments]]},
         {Indexer.Fetcher.PolygonEdge.WithdrawalExit.Supervisor, [[memory_monitor: memory_monitor]]},
-        {ZkevmTxnBatch.Supervisor,
-         [[json_rpc_named_arguments: json_rpc_named_arguments, memory_monitor: memory_monitor]]},
+        configure(ZkevmTxnBatch.Supervisor, [
+          [json_rpc_named_arguments: json_rpc_named_arguments, memory_monitor: memory_monitor]
+        ]),
 
         # Out-of-band fetchers
         {EmptyBlocksSanitizer.Supervisor, [[json_rpc_named_arguments: json_rpc_named_arguments]]},
diff --git a/config/runtime.exs b/config/runtime.exs
index 8af8e6f70f36..fdc5fb80d242 100644
--- a/config/runtime.exs
+++ b/config/runtime.exs
@@ -613,6 +613,9 @@ config :indexer, Indexer.Fetcher.PolygonEdge.WithdrawalExit,
   start_block_l1: System.get_env("INDEXER_POLYGON_EDGE_L1_WITHDRAWALS_START_BLOCK"),
   exit_helper: System.get_env("INDEXER_POLYGON_EDGE_L1_EXIT_HELPER_CONTRACT")
 
+config :indexer, Indexer.Fetcher.ZkevmTxnBatch.Supervisor,
+  enabled: ConfigHelper.parse_bool_env_var("INDEXER_ZKEVM_BATCHES_ENABLED")
+
 Code.require_file("#{config_env()}.exs", "config/runtime")
 
 for config <- "../apps/*/config/runtime/#{config_env()}.exs" |> Path.expand(__DIR__) |> Path.wildcard() do

From 8c145ef1da8d2999e045c04ee23f2eece8dc4d8f Mon Sep 17 00:00:00 2001
From: POA <33550681+poa@users.noreply.github.com>
Date: Mon, 15 May 2023 10:40:12 +0300
Subject: [PATCH 543/909] Add logging to Indexer.Fetcher.ZkevmTxnBatch

---
 .../lib/indexer/fetcher/zkevm_txn_batch.ex    | 26 ++++++++++++++++++-
 1 file changed, 25 insertions(+), 1 deletion(-)

diff --git a/apps/indexer/lib/indexer/fetcher/zkevm_txn_batch.ex b/apps/indexer/lib/indexer/fetcher/zkevm_txn_batch.ex
index 272edc83bbb7..a34f9ab2aa24 100644
--- a/apps/indexer/lib/indexer/fetcher/zkevm_txn_batch.ex
+++ b/apps/indexer/lib/indexer/fetcher/zkevm_txn_batch.ex
@@ -109,7 +109,7 @@ defmodule Indexer.Fetcher.ZkevmTxnBatch do
         {state, 0}
       end
 
-    Process.send_after(self(), :continue, :timer.seconds(@recheck_latest_batch_interval) - handle_duration)
+    Process.send_after(self(), :continue, max(:timer.seconds(@recheck_latest_batch_interval) - handle_duration, 0))
 
     {:noreply, new_state}
   end
@@ -159,10 +159,34 @@ defmodule Indexer.Fetcher.ZkevmTxnBatch do
       chunk_start = start_batch_number + @batch_range_size * current_chunk
       chunk_end = min(chunk_start + @batch_range_size - 1, end_batch_number)
 
+      log_batches_chunk_handling(chunk_start, chunk_end, start_batch_number, end_batch_number)
+
       fetch_and_save_batches(chunk_start, chunk_end, json_rpc_named_arguments)
     end)
   end
 
+  defp log_batches_chunk_handling(chunk_start, chunk_end, start_block, end_block) do
+    target_range =
+      if chunk_start != start_block or chunk_end != end_block do
+        percentage =
+          (chunk_end - start_block + 1)
+          |> Decimal.div(end_block - start_block + 1)
+          |> Decimal.mult(100)
+          |> Decimal.round(2)
+          |> Decimal.to_string()
+
+        " Target range: #{start_block}..#{end_block}. Progress: #{percentage}%"
+      else
+        ""
+      end
+
+    if chunk_start == chunk_end do
+      Logger.info("Handling batch ##{chunk_start}.#{target_range}")
+    else
+      Logger.info("Handling batch range #{chunk_start}..#{chunk_end}.#{target_range}")
+    end
+  end
+
   defp fetch_and_save_batches(batch_start, batch_end, json_rpc_named_arguments) do
     requests =
       batch_start

From 6efe1e58c04e4d41a6404a3e32d457707c4704e7 Mon Sep 17 00:00:00 2001
From: POA <33550681+poa@users.noreply.github.com>
Date: Mon, 15 May 2023 11:03:54 +0300
Subject: [PATCH 544/909] Refactor Indexer.Fetcher.ZkevmTxnBatch

---
 .../lib/indexer/fetcher/zkevm_txn_batch.ex    | 88 ++++++++-----------
 1 file changed, 35 insertions(+), 53 deletions(-)

diff --git a/apps/indexer/lib/indexer/fetcher/zkevm_txn_batch.ex b/apps/indexer/lib/indexer/fetcher/zkevm_txn_batch.ex
index a34f9ab2aa24..3c663172d7eb 100644
--- a/apps/indexer/lib/indexer/fetcher/zkevm_txn_batch.ex
+++ b/apps/indexer/lib/indexer/fetcher/zkevm_txn_batch.ex
@@ -17,6 +17,7 @@ defmodule Indexer.Fetcher.ZkevmTxnBatch do
 
   @batch_range_size 20
   @recheck_latest_batch_interval 60
+  @zero_hash "0000000000000000000000000000000000000000000000000000000000000000"
 
   def child_spec(start_link_arguments) do
     spec = %{
@@ -207,27 +208,18 @@ defmodule Indexer.Fetcher.ZkevmTxnBatch do
     {sequence_hashes, verify_hashes} =
       responses
       |> Enum.reduce({[], []}, fn res, {sequences, verifies} = _acc ->
-        send_sequences_tx_hash =
-          case Map.get(res.result, "sendSequencesTxHash") do
-            "0x" <> send_sequences_tx_hash -> send_sequences_tx_hash
-            nil -> "0000000000000000000000000000000000000000000000000000000000000000"
-          end
-
-        verify_batch_tx_hash =
-          case Map.get(res.result, "verifyBatchTxHash") do
-            "0x" <> verify_batch_tx_hash -> verify_batch_tx_hash
-            nil -> "0000000000000000000000000000000000000000000000000000000000000000"
-          end
+        send_sequences_tx_hash = get_tx_hash(res.result, "sendSequencesTxHash")
+        verify_batch_tx_hash = get_tx_hash(res.result, "verifyBatchTxHash")
 
         sequences =
-          if send_sequences_tx_hash != "0000000000000000000000000000000000000000000000000000000000000000" do
+          if send_sequences_tx_hash != @zero_hash do
             [Base.decode16!(send_sequences_tx_hash, case: :mixed) | sequences]
           else
             sequences
           end
 
         verifies =
-          if verify_batch_tx_hash != "0000000000000000000000000000000000000000000000000000000000000000" do
+          if verify_batch_tx_hash != @zero_hash do
             [Base.decode16!(verify_batch_tx_hash, case: :mixed) | verifies]
           else
             verifies
@@ -263,49 +255,15 @@ defmodule Indexer.Fetcher.ZkevmTxnBatch do
         acc_input_hash = Map.get(res.result, "accInputHash")
         state_root = Map.get(res.result, "stateRoot")
 
-        send_sequences_tx_hash =
-          case Map.get(res.result, "sendSequencesTxHash") do
-            "0x" <> send_sequences_tx_hash -> send_sequences_tx_hash
-            nil -> "0000000000000000000000000000000000000000000000000000000000000000"
-          end
-
-        verify_batch_tx_hash =
-          case Map.get(res.result, "verifyBatchTxHash") do
-            "0x" <> verify_batch_tx_hash -> verify_batch_tx_hash
-            nil -> "0000000000000000000000000000000000000000000000000000000000000000"
-          end
-
         {sequence_id, l1_txs, next_id, hash_to_id} =
-          if send_sequences_tx_hash != "0000000000000000000000000000000000000000000000000000000000000000" do
-            sequence_tx_hash = Base.decode16!(send_sequences_tx_hash, case: :mixed)
-
-            id = Map.get(hash_to_id, sequence_tx_hash)
-
-            if is_nil(id) do
-              {next_id, l1_txs ++ [%{id: next_id, hash: sequence_tx_hash, is_verify: false}], next_id + 1,
-               Map.put(hash_to_id, sequence_tx_hash, next_id)}
-            else
-              {id, l1_txs, next_id, hash_to_id}
-            end
-          else
-            {nil, l1_txs, next_id, hash_to_id}
-          end
+          res.result
+          |> get_tx_hash("sendSequencesTxHash")
+          |> handle_tx_hash(hash_to_id, next_id, l1_txs, false)
 
         {verify_id, l1_txs, next_id, hash_to_id} =
-          if verify_batch_tx_hash != "0000000000000000000000000000000000000000000000000000000000000000" do
-            verify_tx_hash = Base.decode16!(verify_batch_tx_hash, case: :mixed)
-
-            id = Map.get(hash_to_id, verify_tx_hash)
-
-            if is_nil(id) do
-              {next_id, l1_txs ++ [%{id: next_id, hash: verify_tx_hash, is_verify: true}], next_id + 1,
-               Map.put(hash_to_id, verify_tx_hash, next_id)}
-            else
-              {id, l1_txs, next_id, hash_to_id}
-            end
-          else
-            {nil, l1_txs, next_id, hash_to_id}
-          end
+          res.result
+          |> get_tx_hash("verifyBatchTxHash")
+          |> handle_tx_hash(hash_to_id, next_id, l1_txs, true)
 
         batch = %{
           number: number,
@@ -362,6 +320,30 @@ defmodule Indexer.Fetcher.ZkevmTxnBatch do
     {latest_batch_number, virtual_batch_number, verified_batch_number}
   end
 
+  defp get_tx_hash(result, type) do
+    case Map.get(result, type) do
+      "0x" <> tx_hash -> tx_hash
+      nil -> "0000000000000000000000000000000000000000000000000000000000000000"
+    end
+  end
+
+  defp handle_tx_hash(encoded_tx_hash, hash_to_id, next_id, l1_txs, is_verify) do
+    if encoded_tx_hash != @zero_hash do
+      tx_hash = Base.decode16!(encoded_tx_hash, case: :mixed)
+
+      id = Map.get(hash_to_id, tx_hash)
+
+      if is_nil(id) do
+        {next_id, l1_txs ++ [%{id: next_id, hash: tx_hash, is_verify: is_verify}], next_id + 1,
+         Map.put(hash_to_id, tx_hash, next_id)}
+      else
+        {id, l1_txs, next_id, hash_to_id}
+      end
+    else
+      {nil, l1_txs, next_id, hash_to_id}
+    end
+  end
+
   defp repeated_call(func, args, error_message, retries_left) do
     case apply(func, args) do
       {:ok, _} = res ->

From 7cf6202bc5a2c1ea9529faa5c11547b81c21fd7a Mon Sep 17 00:00:00 2001
From: POA <33550681+poa@users.noreply.github.com>
Date: Tue, 16 May 2023 12:54:35 +0300
Subject: [PATCH 545/909] Small refactoring of Indexer.Fetcher.ZkevmTxnBatch

---
 apps/indexer/lib/indexer/fetcher/zkevm_txn_batch.ex | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/apps/indexer/lib/indexer/fetcher/zkevm_txn_batch.ex b/apps/indexer/lib/indexer/fetcher/zkevm_txn_batch.ex
index 3c663172d7eb..7aa3f074ab0f 100644
--- a/apps/indexer/lib/indexer/fetcher/zkevm_txn_batch.ex
+++ b/apps/indexer/lib/indexer/fetcher/zkevm_txn_batch.ex
@@ -285,7 +285,7 @@ defmodule Indexer.Fetcher.ZkevmTxnBatch do
             }
           end)
 
-        {batches ++ [batch], l2_txs ++ l2_txs_append, l1_txs, next_id, hash_to_id}
+        {[batch | batches], l2_txs ++ l2_txs_append, l1_txs, next_id, hash_to_id}
       end)
 
     {:ok, _} =
@@ -323,7 +323,7 @@ defmodule Indexer.Fetcher.ZkevmTxnBatch do
   defp get_tx_hash(result, type) do
     case Map.get(result, type) do
       "0x" <> tx_hash -> tx_hash
-      nil -> "0000000000000000000000000000000000000000000000000000000000000000"
+      nil -> @zero_hash
     end
   end
 
@@ -334,7 +334,7 @@ defmodule Indexer.Fetcher.ZkevmTxnBatch do
       id = Map.get(hash_to_id, tx_hash)
 
       if is_nil(id) do
-        {next_id, l1_txs ++ [%{id: next_id, hash: tx_hash, is_verify: is_verify}], next_id + 1,
+        {next_id, [%{id: next_id, hash: tx_hash, is_verify: is_verify} | l1_txs], next_id + 1,
          Map.put(hash_to_id, tx_hash, next_id)}
       else
         {id, l1_txs, next_id, hash_to_id}

From 9b50f4d79653b51b88756b658d742975e39db60e Mon Sep 17 00:00:00 2001
From: POA <33550681+poa@users.noreply.github.com>
Date: Tue, 16 May 2023 17:03:00 +0300
Subject: [PATCH 546/909] Add zkEVM fields to API v2 response for transaction
 page

---
 .../api/v2/transaction_controller.ex          |  9 ++++++-
 .../views/api/v2/transaction_view.ex          | 26 ++++++++++++++-----
 .../lib/explorer/chain/transaction.ex         |  8 +++++-
 .../lib/explorer/chain/zkevm_batch_txn.ex     |  2 +-
 .../20230420110800_create_zkevm_tables.exs    |  4 +--
 5 files changed, 37 insertions(+), 12 deletions(-)

diff --git a/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/transaction_controller.ex b/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/transaction_controller.ex
index 973fdc7094dd..a7b5e9b3afe7 100644
--- a/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/transaction_controller.ex
+++ b/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/transaction_controller.ex
@@ -63,12 +63,19 @@ defmodule BlockScoutWeb.API.V2.TransactionController do
   @api_true [api?: true]
 
   def transaction(conn, %{"transaction_hash_param" => transaction_hash_string} = params) do
+    necessity_by_association =
+      @transaction_necessity_by_association
+      |> Map.put(:transaction_actions, :optional)
+      |> Map.put(:zkevm_batch, :optional)
+      |> Map.put(:zkevm_sequence_txn, :optional)
+      |> Map.put(:zkevm_verify_txn, :optional)
+
     with {:format, {:ok, transaction_hash}} <- {:format, Chain.string_to_transaction_hash(transaction_hash_string)},
          {:not_found, {:ok, transaction}} <-
            {:not_found,
             Chain.hash_to_transaction(
               transaction_hash,
-              necessity_by_association: Map.put(@transaction_necessity_by_association, :transaction_actions, :optional),
+              necessity_by_association: necessity_by_association,
               api?: true
             )},
          {:ok, false} <- AccessHelper.restricted_access?(to_string(transaction.from_address_hash), params),
diff --git a/apps/block_scout_web/lib/block_scout_web/views/api/v2/transaction_view.ex b/apps/block_scout_web/lib/block_scout_web/views/api/v2/transaction_view.ex
index 6c411e890b86..5dc621424711 100644
--- a/apps/block_scout_web/lib/block_scout_web/views/api/v2/transaction_view.ex
+++ b/apps/block_scout_web/lib/block_scout_web/views/api/v2/transaction_view.ex
@@ -408,12 +408,26 @@ defmodule BlockScoutWeb.API.V2.TransactionView do
       "has_error_in_internal_txs" => transaction.has_error_in_internal_txs
     }
 
-    if Application.get_env(:explorer, :chain_type) == "polygon_edge" && single_tx? do
-      result
-      |> Map.put("polygon_edge_deposit", polygon_edge_deposit(transaction.hash, conn))
-      |> Map.put("polygon_edge_withdrawal", polygon_edge_withdrawal(transaction.hash, conn))
-    else
-      result
+    case single_tx? && Application.get_env(:explorer, :chain_type) do
+      "polygon_edge" ->
+        result
+        |> Map.put("polygon_edge_deposit", polygon_edge_deposit(transaction.hash, conn))
+        |> Map.put("polygon_edge_withdrawal", polygon_edge_withdrawal(transaction.hash, conn))
+
+      "polygon_zkevm" ->
+        result
+        |> add_optional_transaction_field(transaction, "zkevm_batch_number", :zkevm_batch, :number)
+        |> add_optional_transaction_field(transaction, "zkevm_sequence_hash", :zkevm_sequence_txn, :hash)
+        |> add_optional_transaction_field(transaction, "zkevm_verify_hash", :zkevm_verify_txn, :hash)
+
+      _ -> result
+    end
+  end
+
+  defp add_optional_transaction_field(result, transaction, field_name, assoc_name, assoc_field) do
+    case Map.get(transaction, assoc_name) do
+      nil -> result
+      item -> Map.put(result, field_name, Map.get(item, assoc_field))
     end
   end
 
diff --git a/apps/explorer/lib/explorer/chain/transaction.ex b/apps/explorer/lib/explorer/chain/transaction.ex
index 6547a5add0bc..cf4c2730ba33 100644
--- a/apps/explorer/lib/explorer/chain/transaction.ex
+++ b/apps/explorer/lib/explorer/chain/transaction.ex
@@ -27,7 +27,8 @@ defmodule Explorer.Chain.Transaction do
     TokenTransfer,
     Transaction,
     TransactionAction,
-    Wei
+    Wei,
+    ZkevmBatchTxn
   }
 
   alias Explorer.Chain.Transaction.{Fork, Status}
@@ -275,6 +276,11 @@ defmodule Explorer.Chain.Transaction do
 
     has_many(:uncles, through: [:forks, :uncle])
 
+    has_one(:zkevm_batch_txn, ZkevmBatchTxn, foreign_key: :hash)
+    has_one(:zkevm_batch, through: [:zkevm_batch_txn, :batch])
+    has_one(:zkevm_sequence_txn, through: [:zkevm_batch, :sequence_transaction])
+    has_one(:zkevm_verify_txn, through: [:zkevm_batch, :verify_transaction])
+
     belongs_to(
       :created_contract_address,
       Address,
diff --git a/apps/explorer/lib/explorer/chain/zkevm_batch_txn.ex b/apps/explorer/lib/explorer/chain/zkevm_batch_txn.ex
index 8a30661a3eaa..609c1261d571 100644
--- a/apps/explorer/lib/explorer/chain/zkevm_batch_txn.ex
+++ b/apps/explorer/lib/explorer/chain/zkevm_batch_txn.ex
@@ -17,7 +17,7 @@ defmodule Explorer.Chain.ZkevmBatchTxn do
   @primary_key false
   schema "zkevm_batch_l2_transactions" do
     belongs_to(:batch, ZkevmTxnBatch, foreign_key: :batch_number, references: :number, type: :integer)
-    belongs_to(:l2_transaction, Transaction, foreign_key: :hash, references: :hash, type: Hash.Full)
+    belongs_to(:l2_transaction, Transaction, foreign_key: :hash, primary_key: true, references: :hash, type: Hash.Full)
 
     timestamps()
   end
diff --git a/apps/explorer/priv/repo/migrations/20230420110800_create_zkevm_tables.exs b/apps/explorer/priv/repo/migrations/20230420110800_create_zkevm_tables.exs
index eeb9d1d6e2cc..6b25fd694802 100644
--- a/apps/explorer/priv/repo/migrations/20230420110800_create_zkevm_tables.exs
+++ b/apps/explorer/priv/repo/migrations/20230420110800_create_zkevm_tables.exs
@@ -45,10 +45,8 @@ defmodule Explorer.Repo.Migrations.CreateZkevmTables do
         null: false
       )
 
-      add(:hash, :bytea, null: false)
+      add(:hash, :bytea, null: false, primary_key: true)
       timestamps(null: false, type: :utc_datetime_usec)
     end
-
-    create(unique_index(:zkevm_batch_l2_transactions, :hash))
   end
 end

From ec5240edd4b84aa9ed7916ad707e6b7717fd8caf Mon Sep 17 00:00:00 2001
From: POA <33550681+poa@users.noreply.github.com>
Date: Wed, 17 May 2023 11:50:34 +0300
Subject: [PATCH 547/909] Add zkEVM transaction status to API v2 response for
 transaction page

---
 .../views/api/v2/transaction_view.ex          | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/apps/block_scout_web/lib/block_scout_web/views/api/v2/transaction_view.ex b/apps/block_scout_web/lib/block_scout_web/views/api/v2/transaction_view.ex
index 5dc621424711..8d8a13a46f1d 100644
--- a/apps/block_scout_web/lib/block_scout_web/views/api/v2/transaction_view.ex
+++ b/apps/block_scout_web/lib/block_scout_web/views/api/v2/transaction_view.ex
@@ -415,10 +415,13 @@ defmodule BlockScoutWeb.API.V2.TransactionView do
         |> Map.put("polygon_edge_withdrawal", polygon_edge_withdrawal(transaction.hash, conn))
 
       "polygon_zkevm" ->
-        result
-        |> add_optional_transaction_field(transaction, "zkevm_batch_number", :zkevm_batch, :number)
-        |> add_optional_transaction_field(transaction, "zkevm_sequence_hash", :zkevm_sequence_txn, :hash)
-        |> add_optional_transaction_field(transaction, "zkevm_verify_hash", :zkevm_verify_txn, :hash)
+        extended_result =
+          result
+          |> add_optional_transaction_field(transaction, "zkevm_batch_number", :zkevm_batch, :number)
+          |> add_optional_transaction_field(transaction, "zkevm_sequence_hash", :zkevm_sequence_txn, :hash)
+          |> add_optional_transaction_field(transaction, "zkevm_verify_hash", :zkevm_verify_txn, :hash)
+
+        Map.put(extended_result, "zkevm_status", zkevm_status(extended_result))
 
       _ -> result
     end
@@ -431,6 +434,14 @@ defmodule BlockScoutWeb.API.V2.TransactionView do
     end
   end
 
+  defp zkevm_status(result_map) do
+    if is_nil(Map.get(result_map, "zkevm_sequence_hash")) do
+      "Confirmed by Sequencer"
+    else
+      "L1 Confirmed"
+    end
+  end
+
   def token_transfers(_, _conn, false), do: nil
   def token_transfers(%NotLoaded{}, _conn, _), do: nil
 

From dbc3921a975ff2df5342c54590ac89cf11b1185e Mon Sep 17 00:00:00 2001
From: POA <33550681+poa@users.noreply.github.com>
Date: Wed, 17 May 2023 14:09:45 +0300
Subject: [PATCH 548/909] Add API v2 response for zkEVM batch page (partially)

---
 .../lib/block_scout_web/api_router.ex         |  4 +++
 .../controllers/api/v2/zkevm_controller.ex    | 26 +++++++++++++++++++
 .../views/api/v2/zkevm_view.ex                | 22 ++++++++++++++++
 apps/explorer/lib/explorer/chain.ex           | 15 ++++++++++-
 4 files changed, 66 insertions(+), 1 deletion(-)
 create mode 100644 apps/block_scout_web/lib/block_scout_web/controllers/api/v2/zkevm_controller.ex
 create mode 100644 apps/block_scout_web/lib/block_scout_web/views/api/v2/zkevm_view.ex

diff --git a/apps/block_scout_web/lib/block_scout_web/api_router.ex b/apps/block_scout_web/lib/block_scout_web/api_router.ex
index 7cd8dfb601ba..167c848ee005 100644
--- a/apps/block_scout_web/lib/block_scout_web/api_router.ex
+++ b/apps/block_scout_web/lib/block_scout_web/api_router.ex
@@ -209,6 +209,10 @@ defmodule BlockScoutWeb.ApiRouter do
       get("/", V2.WithdrawalController, :withdrawals_list)
       get("/counters", V2.WithdrawalController, :withdrawals_counters)
     end
+
+    scope "/zkevm" do
+      get("/batches/:batch_number", V2.ZkevmController, :batch)
+    end
   end
 
   scope "/v1", as: :api_v1 do
diff --git a/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/zkevm_controller.ex b/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/zkevm_controller.ex
new file mode 100644
index 000000000000..119be3e00448
--- /dev/null
+++ b/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/zkevm_controller.ex
@@ -0,0 +1,26 @@
+defmodule BlockScoutWeb.API.V2.ZkevmController do
+  use BlockScoutWeb, :controller
+
+  alias Explorer.Chain
+
+  action_fallback(BlockScoutWeb.API.V2.FallbackController)
+
+  @batch_necessity_by_association %{
+    :sequence_transaction => :optional,
+    :verify_transaction => :optional,
+    :l2_transactions => :required
+  }
+
+  def batch(conn, %{"batch_number" => batch_number} = _params) do
+    {:ok, batch} =
+      Chain.zkevm_batch(
+        batch_number,
+        necessity_by_association: @batch_necessity_by_association,
+        api?: true
+      )
+
+    conn
+    |> put_status(200)
+    |> render(:zkevm_batch, %{batch: batch})
+  end
+end
diff --git a/apps/block_scout_web/lib/block_scout_web/views/api/v2/zkevm_view.ex b/apps/block_scout_web/lib/block_scout_web/views/api/v2/zkevm_view.ex
new file mode 100644
index 000000000000..f1207d15274c
--- /dev/null
+++ b/apps/block_scout_web/lib/block_scout_web/views/api/v2/zkevm_view.ex
@@ -0,0 +1,22 @@
+defmodule BlockScoutWeb.API.V2.ZkevmView do
+  use BlockScoutWeb, :view
+
+  def render("zkevm_batch.json", %{batch: batch}) do
+    %{
+      "number" => batch.number,
+      "status" => batch_status(batch),
+      "timestamp" => batch.timestamp
+    }
+  end
+
+  defp batch_status(batch) do
+    sequence_id = Map.get(batch, :sequence_id)
+    verify_id = Map.get(batch, :verify_id)
+
+    cond do
+      is_nil(sequence_id) && is_nil(verify_id) -> "Unfinalized"
+      !is_nil(sequence_id) && is_nil(verify_id) -> "L1 Sequence Confirmed"
+      !is_nil(verify_id) -> "Finalized"
+    end
+  end
+end
diff --git a/apps/explorer/lib/explorer/chain.ex b/apps/explorer/lib/explorer/chain.ex
index 9e013ec9a721..a61ad88d54a5 100644
--- a/apps/explorer/lib/explorer/chain.ex
+++ b/apps/explorer/lib/explorer/chain.ex
@@ -64,7 +64,8 @@ defmodule Explorer.Chain do
     TokenTransfer,
     Transaction,
     Wei,
-    Withdrawal
+    Withdrawal,
+    ZkevmTxnBatch
   }
 
   alias Explorer.Chain.Block.{EmissionReward, Reward}
@@ -6389,6 +6390,18 @@ defmodule Explorer.Chain do
           )
       }
     )
+
+  def zkevm_batch(number, options \\ []) when is_list(options) do
+    necessity_by_association = Keyword.get(options, :necessity_by_association, %{})
+
+    ZkevmTxnBatch
+    |> where(number: ^number)
+    |> join_associations(necessity_by_association)
+    |> select_repo(options).one()
+    |> case do
+      nil -> {:error, :not_found}
+      batch -> {:ok, batch}
+    end
   end
 
   @spec verified_contracts_top(non_neg_integer()) :: [Hash.Address.t()]

From eadef3c01d09ac9cd1649a78abecc915f9ae22fb Mon Sep 17 00:00:00 2001
From: POA <33550681+poa@users.noreply.github.com>
Date: Tue, 23 May 2023 12:18:00 +0300
Subject: [PATCH 549/909] Add API v2 response for zkEVM batch page

---
 .../block_scout_web/views/api/v2/zkevm_view.ex | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/apps/block_scout_web/lib/block_scout_web/views/api/v2/zkevm_view.ex b/apps/block_scout_web/lib/block_scout_web/views/api/v2/zkevm_view.ex
index f1207d15274c..476b0576bf55 100644
--- a/apps/block_scout_web/lib/block_scout_web/views/api/v2/zkevm_view.ex
+++ b/apps/block_scout_web/lib/block_scout_web/views/api/v2/zkevm_view.ex
@@ -2,10 +2,26 @@ defmodule BlockScoutWeb.API.V2.ZkevmView do
   use BlockScoutWeb, :view
 
   def render("zkevm_batch.json", %{batch: batch}) do
+    sequence_tx_hash =
+      if not is_nil(batch.sequence_transaction) do
+        batch.sequence_transaction.hash
+      end
+
+    verify_tx_hash =
+      if not is_nil(batch.verify_transaction) do
+        batch.verify_transaction.hash
+      end
+
     %{
       "number" => batch.number,
       "status" => batch_status(batch),
-      "timestamp" => batch.timestamp
+      "timestamp" => batch.timestamp,
+      "transactions" => Enum.map(batch.l2_transactions, fn tx -> tx.hash end),
+      "global_exit_root" => batch.global_exit_root,
+      "acc_input_hash" => batch.acc_input_hash,
+      "sequence_tx_hash" => sequence_tx_hash,
+      "verify_tx_hash" => verify_tx_hash,
+      "state_root" => batch.state_root
     }
   end
 

From b4e7a12c6dfccbc4d262271f758c2ceb3a4922a9 Mon Sep 17 00:00:00 2001
From: POA <33550681+poa@users.noreply.github.com>
Date: Tue, 23 May 2023 14:01:26 +0300
Subject: [PATCH 550/909] Add API v2 response for zkEVM list of batches page

---
 .../lib/block_scout_web/api_router.ex         |  2 +
 .../lib/block_scout_web/chain.ex              | 23 ++++++++-
 .../controllers/api/v2/zkevm_controller.ex    | 41 +++++++++++++++-
 .../views/api/v2/zkevm_view.ex                | 49 +++++++++++++++++++
 apps/explorer/lib/explorer/chain.ex           | 22 +++++++++
 5 files changed, 134 insertions(+), 3 deletions(-)

diff --git a/apps/block_scout_web/lib/block_scout_web/api_router.ex b/apps/block_scout_web/lib/block_scout_web/api_router.ex
index 167c848ee005..ac5e8e2fccd8 100644
--- a/apps/block_scout_web/lib/block_scout_web/api_router.ex
+++ b/apps/block_scout_web/lib/block_scout_web/api_router.ex
@@ -211,6 +211,8 @@ defmodule BlockScoutWeb.ApiRouter do
     end
 
     scope "/zkevm" do
+      get("/batches", V2.ZkevmController, :batches)
+      get("/batches/count", V2.ZkevmController, :batches_count)
       get("/batches/:batch_number", V2.ZkevmController, :batch)
     end
   end
diff --git a/apps/block_scout_web/lib/block_scout_web/chain.ex b/apps/block_scout_web/lib/block_scout_web/chain.ex
index 1c4323226251..8af63dbc4e62 100644
--- a/apps/block_scout_web/lib/block_scout_web/chain.ex
+++ b/apps/block_scout_web/lib/block_scout_web/chain.ex
@@ -34,7 +34,8 @@ defmodule BlockScoutWeb.Chain do
     Transaction,
     Transaction.StateChange,
     Wei,
-    Withdrawal
+    Withdrawal,
+    ZkevmTxnBatch
   }
 
   alias Explorer.PagingOptions
@@ -302,8 +303,22 @@ defmodule BlockScoutWeb.Chain do
     [paging_options: %{@default_paging_options | key: {index}}]
   end
 
+  def paging_options(%{"number" => number_string}) when is_binary(number_string) do
+    case Integer.parse(number_string) do
+      {number, ""} ->
+        [paging_options: %{@default_paging_options | key: {number}}]
+
+      _ ->
+        [paging_options: @default_paging_options]
+    end
+  end
+
+  def paging_options(%{"number" => number}) when is_integer(number) do
+    [paging_options: %{@default_paging_options | key: {number}}]
+  end
+
   def paging_options(%{"inserted_at" => inserted_at_string, "hash" => hash_string})
-      when is_binary(inserted_at_string) and is_binary(hash_string) do
+    when is_binary(inserted_at_string) and is_binary(hash_string) do
     with {:ok, inserted_at, _} <- DateTime.from_iso8601(inserted_at_string),
          {:ok, hash} <- string_to_transaction_hash(hash_string) do
       [paging_options: %{@default_paging_options | key: {inserted_at, hash}, is_pending_tx: true}]
@@ -520,6 +535,10 @@ defmodule BlockScoutWeb.Chain do
     %{"index" => index}
   end
 
+  defp paging_params(%ZkevmTxnBatch{number: number}) do
+    %{"number" => number}
+  end
+
   # clause for search results pagination
   defp paging_params(%{
          address_hash: address_hash,
diff --git a/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/zkevm_controller.ex b/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/zkevm_controller.ex
index 119be3e00448..deb98bf41a13 100644
--- a/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/zkevm_controller.ex
+++ b/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/zkevm_controller.ex
@@ -1,7 +1,15 @@
 defmodule BlockScoutWeb.API.V2.ZkevmController do
   use BlockScoutWeb, :controller
 
-  alias Explorer.Chain
+  import BlockScoutWeb.Chain,
+    only: [
+      next_page_params: 3,
+      paging_options: 1,
+      split_list_by_page: 1
+    ]
+
+  alias Explorer.{Chain, Repo}
+  alias Explorer.Chain.ZkevmTxnBatch
 
   action_fallback(BlockScoutWeb.API.V2.FallbackController)
 
@@ -11,6 +19,10 @@ defmodule BlockScoutWeb.API.V2.ZkevmController do
     :l2_transactions => :required
   }
 
+  @batches_necessity_by_association %{
+    :sequence_transaction => :optional
+  }
+
   def batch(conn, %{"batch_number" => batch_number} = _params) do
     {:ok, batch} =
       Chain.zkevm_batch(
@@ -23,4 +35,31 @@ defmodule BlockScoutWeb.API.V2.ZkevmController do
     |> put_status(200)
     |> render(:zkevm_batch, %{batch: batch})
   end
+
+  def batches(conn, params) do
+    {batches, next_page} =
+      params
+      |> paging_options()
+      |> Keyword.put(:necessity_by_association, @batches_necessity_by_association)
+      |> Keyword.put(:api?, true)
+      |> Chain.zkevm_batches()
+      |> split_list_by_page()
+
+    next_page_params = next_page_params(next_page, batches, params)
+
+    conn
+    |> put_status(200)
+    |> render(:zkevm_batches, %{
+      batches: batches,
+      next_page_params: next_page_params
+    })
+  end
+
+  def batches_count(conn, _params) do
+    count = Repo.replica().aggregate(ZkevmTxnBatch, :count, timeout: :infinity)
+
+    conn
+    |> put_status(200)
+    |> render(:zkevm_batches_count, %{count: count})
+  end
 end
diff --git a/apps/block_scout_web/lib/block_scout_web/views/api/v2/zkevm_view.ex b/apps/block_scout_web/lib/block_scout_web/views/api/v2/zkevm_view.ex
index 476b0576bf55..64253205026c 100644
--- a/apps/block_scout_web/lib/block_scout_web/views/api/v2/zkevm_view.ex
+++ b/apps/block_scout_web/lib/block_scout_web/views/api/v2/zkevm_view.ex
@@ -1,6 +1,11 @@
 defmodule BlockScoutWeb.API.V2.ZkevmView do
   use BlockScoutWeb, :view
 
+  import Ecto.Query, only: [from: 2]
+
+  alias Explorer.Chain.ZkevmBatchTxn
+  alias Explorer.Repo
+
   def render("zkevm_batch.json", %{batch: batch}) do
     sequence_tx_hash =
       if not is_nil(batch.sequence_transaction) do
@@ -25,6 +30,50 @@ defmodule BlockScoutWeb.API.V2.ZkevmView do
     }
   end
 
+  def render("zkevm_batches.json", %{
+        batches: batches,
+        next_page_params: next_page_params
+      }) do
+    items =
+      batches
+      |> Enum.map(fn batch ->
+        Task.async(fn ->
+          tx_count =
+            Repo.replica().aggregate(
+              from(
+                t in ZkevmBatchTxn,
+                where: t.batch_number == ^batch.number
+              ),
+              :count,
+              timeout: :infinity
+            )
+
+          sequence_tx_hash =
+            if not is_nil(batch.sequence_transaction) do
+              batch.sequence_transaction.hash
+            end
+
+          %{
+            "number" => batch.number,
+            "timestamp" => batch.timestamp,
+            "tx_count" => tx_count,
+            "sequence_tx_hash" => sequence_tx_hash
+          }
+        end)
+      end)
+      |> Task.yield_many(:infinity)
+      |> Enum.map(fn {_task, {:ok, item}} -> item end)
+
+    %{
+      items: items,
+      next_page_params: next_page_params
+    }
+  end
+
+  def render("zkevm_batches_count.json", %{count: count}) do
+    count
+  end
+
   defp batch_status(batch) do
     sequence_id = Map.get(batch, :sequence_id)
     verify_id = Map.get(batch, :verify_id)
diff --git a/apps/explorer/lib/explorer/chain.ex b/apps/explorer/lib/explorer/chain.ex
index a61ad88d54a5..2c9c124d4356 100644
--- a/apps/explorer/lib/explorer/chain.ex
+++ b/apps/explorer/lib/explorer/chain.ex
@@ -6422,4 +6422,26 @@ defmodule Explorer.Chain do
   def default_paging_options do
     @default_paging_options
   end
+
+  def zkevm_batches(options \\ []) do
+    paging_options = Keyword.get(options, :paging_options, @default_paging_options)
+    necessity_by_association = Keyword.get(options, :necessity_by_association, %{})
+
+    base_query =
+      from(tb in ZkevmTxnBatch,
+        order_by: [desc: tb.number]
+      )
+
+    base_query
+    |> join_associations(necessity_by_association)
+    |> page_zkevm_batches(paging_options)
+    |> limit(^paging_options.page_size)
+    |> select_repo(options).all()
+  end
+
+  defp page_zkevm_batches(query, %PagingOptions{key: nil}), do: query
+
+  defp page_zkevm_batches(query, %PagingOptions{key: {number}}) do
+    from(tb in query, where: tb.number < ^number)
+  end
 end

From c445cdb290fe4eec4996ca6eee56445c286c688a Mon Sep 17 00:00:00 2001
From: POA <33550681+poa@users.noreply.github.com>
Date: Wed, 24 May 2023 11:12:35 +0300
Subject: [PATCH 551/909] Add API v2 output for Latest Confirmed Batches
 homepage section

---
 .../lib/block_scout_web/api_router.ex         |  1 +
 .../controllers/api/v2/zkevm_controller.ex    | 13 ++++
 .../views/api/v2/zkevm_view.ex                | 67 ++++++++++---------
 apps/explorer/lib/explorer/chain.ex           | 22 ++++--
 4 files changed, 66 insertions(+), 37 deletions(-)

diff --git a/apps/block_scout_web/lib/block_scout_web/api_router.ex b/apps/block_scout_web/lib/block_scout_web/api_router.ex
index ac5e8e2fccd8..14dd39c20560 100644
--- a/apps/block_scout_web/lib/block_scout_web/api_router.ex
+++ b/apps/block_scout_web/lib/block_scout_web/api_router.ex
@@ -185,6 +185,7 @@ defmodule BlockScoutWeb.ApiRouter do
       get("/transactions", V2.MainPageController, :transactions)
       get("/transactions/watchlist", V2.MainPageController, :watchlist_transactions)
       get("/indexing-status", V2.MainPageController, :indexing_status)
+      get("/zkevm-confirmed-batches", V2.ZkevmController, :batches_confirmed)
     end
 
     scope "/stats" do
diff --git a/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/zkevm_controller.ex b/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/zkevm_controller.ex
index deb98bf41a13..573c31e82672 100644
--- a/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/zkevm_controller.ex
+++ b/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/zkevm_controller.ex
@@ -62,4 +62,17 @@ defmodule BlockScoutWeb.API.V2.ZkevmController do
     |> put_status(200)
     |> render(:zkevm_batches_count, %{count: count})
   end
+
+  def batches_confirmed(conn, _params) do
+    batches =
+      []
+      |> Keyword.put(:necessity_by_association, @batches_necessity_by_association)
+      |> Keyword.put(:api?, true)
+      |> Keyword.put(:confirmed?, true)
+      |> Chain.zkevm_batches()
+
+    conn
+    |> put_status(200)
+    |> render(:zkevm_batches, %{batches: batches})
+  end
 end
diff --git a/apps/block_scout_web/lib/block_scout_web/views/api/v2/zkevm_view.ex b/apps/block_scout_web/lib/block_scout_web/views/api/v2/zkevm_view.ex
index 64253205026c..b971b5e3504c 100644
--- a/apps/block_scout_web/lib/block_scout_web/views/api/v2/zkevm_view.ex
+++ b/apps/block_scout_web/lib/block_scout_web/views/api/v2/zkevm_view.ex
@@ -34,42 +34,16 @@ defmodule BlockScoutWeb.API.V2.ZkevmView do
         batches: batches,
         next_page_params: next_page_params
       }) do
-    items =
-      batches
-      |> Enum.map(fn batch ->
-        Task.async(fn ->
-          tx_count =
-            Repo.replica().aggregate(
-              from(
-                t in ZkevmBatchTxn,
-                where: t.batch_number == ^batch.number
-              ),
-              :count,
-              timeout: :infinity
-            )
-
-          sequence_tx_hash =
-            if not is_nil(batch.sequence_transaction) do
-              batch.sequence_transaction.hash
-            end
-
-          %{
-            "number" => batch.number,
-            "timestamp" => batch.timestamp,
-            "tx_count" => tx_count,
-            "sequence_tx_hash" => sequence_tx_hash
-          }
-        end)
-      end)
-      |> Task.yield_many(:infinity)
-      |> Enum.map(fn {_task, {:ok, item}} -> item end)
-
     %{
-      items: items,
+      items: render_zkevm_batches(batches),
       next_page_params: next_page_params
     }
   end
 
+  def render("zkevm_batches.json", %{batches: batches}) do
+    %{items: render_zkevm_batches(batches)}
+  end
+
   def render("zkevm_batches_count.json", %{count: count}) do
     count
   end
@@ -84,4 +58,35 @@ defmodule BlockScoutWeb.API.V2.ZkevmView do
       !is_nil(verify_id) -> "Finalized"
     end
   end
+
+  defp render_zkevm_batches(batches) do
+    batches
+    |> Enum.map(fn batch ->
+      Task.async(fn ->
+        tx_count =
+          Repo.replica().aggregate(
+            from(
+              t in ZkevmBatchTxn,
+              where: t.batch_number == ^batch.number
+            ),
+            :count,
+            timeout: :infinity
+          )
+
+        sequence_tx_hash =
+          if not is_nil(batch.sequence_transaction) do
+            batch.sequence_transaction.hash
+          end
+
+        %{
+          "number" => batch.number,
+          "timestamp" => batch.timestamp,
+          "tx_count" => tx_count,
+          "sequence_tx_hash" => sequence_tx_hash
+        }
+      end)
+    end)
+    |> Task.yield_many(:infinity)
+    |> Enum.map(fn {_task, {:ok, item}} -> item end)
+  end
 end
diff --git a/apps/explorer/lib/explorer/chain.ex b/apps/explorer/lib/explorer/chain.ex
index 2c9c124d4356..547dfc305bc9 100644
--- a/apps/explorer/lib/explorer/chain.ex
+++ b/apps/explorer/lib/explorer/chain.ex
@@ -6424,7 +6424,6 @@ defmodule Explorer.Chain do
   end
 
   def zkevm_batches(options \\ []) do
-    paging_options = Keyword.get(options, :paging_options, @default_paging_options)
     necessity_by_association = Keyword.get(options, :necessity_by_association, %{})
 
     base_query =
@@ -6432,11 +6431,22 @@ defmodule Explorer.Chain do
         order_by: [desc: tb.number]
       )
 
-    base_query
-    |> join_associations(necessity_by_association)
-    |> page_zkevm_batches(paging_options)
-    |> limit(^paging_options.page_size)
-    |> select_repo(options).all()
+    query =
+      if Keyword.get(options, :confirmed?, false) do
+        base_query
+        |> join_associations(necessity_by_association)
+        |> where([tb], not is_nil(tb.sequence_id) and tb.sequence_id > 0)
+        |> limit(10)
+      else
+        paging_options = Keyword.get(options, :paging_options, @default_paging_options)
+
+        base_query
+        |> join_associations(necessity_by_association)
+        |> page_zkevm_batches(paging_options)
+        |> limit(^paging_options.page_size)
+      end
+
+    select_repo(options).all(query)
   end
 
   defp page_zkevm_batches(query, %PagingOptions{key: nil}), do: query

From 5d990c941ccbc4527b85c8dbec1d1cdcdf4ca3b9 Mon Sep 17 00:00:00 2001
From: POA <33550681+poa@users.noreply.github.com>
Date: Wed, 24 May 2023 11:28:28 +0300
Subject: [PATCH 552/909] Add API v2 output for Latest Batch homepage section

---
 .../lib/block_scout_web/api_router.ex             |  1 +
 .../controllers/api/v2/zkevm_controller.ex        | 12 ++++++++++++
 .../block_scout_web/views/api/v2/zkevm_view.ex    |  4 ++++
 apps/explorer/lib/explorer/chain.ex               | 15 ++++++++++++++-
 4 files changed, 31 insertions(+), 1 deletion(-)

diff --git a/apps/block_scout_web/lib/block_scout_web/api_router.ex b/apps/block_scout_web/lib/block_scout_web/api_router.ex
index 14dd39c20560..5e75ec04c597 100644
--- a/apps/block_scout_web/lib/block_scout_web/api_router.ex
+++ b/apps/block_scout_web/lib/block_scout_web/api_router.ex
@@ -186,6 +186,7 @@ defmodule BlockScoutWeb.ApiRouter do
       get("/transactions/watchlist", V2.MainPageController, :watchlist_transactions)
       get("/indexing-status", V2.MainPageController, :indexing_status)
       get("/zkevm-confirmed-batches", V2.ZkevmController, :batches_confirmed)
+      get("/zkevm-latest-batch-number", V2.ZkevmController, :batch_latest_number)
     end
 
     scope "/stats" do
diff --git a/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/zkevm_controller.ex b/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/zkevm_controller.ex
index 573c31e82672..dcd5ad0a717f 100644
--- a/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/zkevm_controller.ex
+++ b/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/zkevm_controller.ex
@@ -36,6 +36,18 @@ defmodule BlockScoutWeb.API.V2.ZkevmController do
     |> render(:zkevm_batch, %{batch: batch})
   end
 
+  def batch_latest_number(conn, _params) do
+    number =
+      case Chain.zkevm_batch(:latest, api?: true) do
+        {:ok, batch} -> batch.number
+        {:error, :not_found} -> 0
+      end
+
+    conn
+    |> put_status(200)
+    |> render(:zkevm_batch_latest_number, %{number: number})
+  end
+
   def batches(conn, params) do
     {batches, next_page} =
       params
diff --git a/apps/block_scout_web/lib/block_scout_web/views/api/v2/zkevm_view.ex b/apps/block_scout_web/lib/block_scout_web/views/api/v2/zkevm_view.ex
index b971b5e3504c..10ae9e8f4755 100644
--- a/apps/block_scout_web/lib/block_scout_web/views/api/v2/zkevm_view.ex
+++ b/apps/block_scout_web/lib/block_scout_web/views/api/v2/zkevm_view.ex
@@ -48,6 +48,10 @@ defmodule BlockScoutWeb.API.V2.ZkevmView do
     count
   end
 
+  def render("zkevm_batch_latest_number.json", %{number: number}) do
+    number
+  end
+
   defp batch_status(batch) do
     sequence_id = Map.get(batch, :sequence_id)
     verify_id = Map.get(batch, :verify_id)
diff --git a/apps/explorer/lib/explorer/chain.ex b/apps/explorer/lib/explorer/chain.ex
index 547dfc305bc9..1194ab31dd15 100644
--- a/apps/explorer/lib/explorer/chain.ex
+++ b/apps/explorer/lib/explorer/chain.ex
@@ -6391,7 +6391,20 @@ defmodule Explorer.Chain do
       }
     )
 
-  def zkevm_batch(number, options \\ []) when is_list(options) do
+  def zkevm_batch(number, options \\ [])
+
+  def zkevm_batch(:latest, options) when is_list(options) do
+    ZkevmTxnBatch
+    |> order_by(desc: :number)
+    |> limit(1)
+    |> select_repo(options).one()
+    |> case do
+      nil -> {:error, :not_found}
+      batch -> {:ok, batch}
+    end
+  end
+
+  def zkevm_batch(number, options) when is_list(options) do
     necessity_by_association = Keyword.get(options, :necessity_by_association, %{})
 
     ZkevmTxnBatch

From c87e64fa3a43a00ed0da28ad3701b4b15a305091 Mon Sep 17 00:00:00 2001
From: POA <33550681+poa@users.noreply.github.com>
Date: Thu, 25 May 2023 14:22:52 +0300
Subject: [PATCH 553/909] Add API v2 output for transaction list of the
 specified batch

---
 .../lib/block_scout_web/api_router.ex                |  1 +
 .../controllers/api/v2/transaction_controller.ex     | 12 ++++++++++++
 .../block_scout_web/views/api/v2/transaction_view.ex |  1 +
 apps/explorer/lib/explorer/chain.ex                  |  9 ++++++++-
 .../20230420110800_create_zkevm_tables.exs           |  2 ++
 5 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/apps/block_scout_web/lib/block_scout_web/api_router.ex b/apps/block_scout_web/lib/block_scout_web/api_router.ex
index 5e75ec04c597..2bc1cc08a252 100644
--- a/apps/block_scout_web/lib/block_scout_web/api_router.ex
+++ b/apps/block_scout_web/lib/block_scout_web/api_router.ex
@@ -135,6 +135,7 @@ defmodule BlockScoutWeb.ApiRouter do
     scope "/transactions" do
       get("/", V2.TransactionController, :transactions)
       get("/watchlist", V2.TransactionController, :watchlist_transactions)
+      get("/zkevm-batch/:batch_number", V2.TransactionController, :zkevm_batch)
       get("/:transaction_hash_param", V2.TransactionController, :transaction)
       get("/:transaction_hash_param/token-transfers", V2.TransactionController, :token_transfers)
       get("/:transaction_hash_param/internal-transactions", V2.TransactionController, :internal_transactions)
diff --git a/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/transaction_controller.ex b/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/transaction_controller.ex
index a7b5e9b3afe7..16b881793f95 100644
--- a/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/transaction_controller.ex
+++ b/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/transaction_controller.ex
@@ -111,6 +111,18 @@ defmodule BlockScoutWeb.API.V2.TransactionController do
     |> render(:transactions, %{transactions: transactions, next_page_params: next_page_params})
   end
 
+  def zkevm_batch(conn, %{"batch_number" => batch_number} = _params) do
+    transactions =
+      batch_number
+      |> Chain.zkevm_batch_transactions(api?: true)
+      |> Enum.map(fn tx -> tx.hash end)
+      |> Chain.hashes_to_transactions(api?: true, necessity_by_association: @transaction_necessity_by_association)
+
+    conn
+    |> put_status(200)
+    |> render(:transactions, %{transactions: transactions})
+  end
+
   def raw_trace(conn, %{"transaction_hash_param" => transaction_hash_string} = params) do
     with {:format, {:ok, transaction_hash}} <- {:format, Chain.string_to_transaction_hash(transaction_hash_string)},
          {:not_found, {:ok, transaction}} <-
diff --git a/apps/block_scout_web/lib/block_scout_web/views/api/v2/transaction_view.ex b/apps/block_scout_web/lib/block_scout_web/views/api/v2/transaction_view.ex
index 8d8a13a46f1d..d16281dde8e8 100644
--- a/apps/block_scout_web/lib/block_scout_web/views/api/v2/transaction_view.ex
+++ b/apps/block_scout_web/lib/block_scout_web/views/api/v2/transaction_view.ex
@@ -430,6 +430,7 @@ defmodule BlockScoutWeb.API.V2.TransactionView do
   defp add_optional_transaction_field(result, transaction, field_name, assoc_name, assoc_field) do
     case Map.get(transaction, assoc_name) do
       nil -> result
+      %Ecto.Association.NotLoaded{} -> result
       item -> Map.put(result, field_name, Map.get(item, assoc_field))
     end
   end
diff --git a/apps/explorer/lib/explorer/chain.ex b/apps/explorer/lib/explorer/chain.ex
index 1194ab31dd15..a476675e00cd 100644
--- a/apps/explorer/lib/explorer/chain.ex
+++ b/apps/explorer/lib/explorer/chain.ex
@@ -65,6 +65,7 @@ defmodule Explorer.Chain do
     Transaction,
     Wei,
     Withdrawal,
+    ZkevmBatchTxn,
     ZkevmTxnBatch
   }
 
@@ -1752,7 +1753,7 @@ defmodule Explorer.Chain do
     |> where([transaction], transaction.hash in ^hashes)
     |> join_associations(necessity_by_association)
     |> preload([{:token_transfers, [:token, :from_address, :to_address]}])
-    |> Repo.all()
+    |> select_repo(options).all()
   end
 
   @doc """
@@ -6462,6 +6463,12 @@ defmodule Explorer.Chain do
     select_repo(options).all(query)
   end
 
+  def zkevm_batch_transactions(batch_number, options \\ []) do
+    query = from(bts in ZkevmBatchTxn, where: bts.batch_number == ^batch_number)
+
+    select_repo(options).all(query)
+  end
+
   defp page_zkevm_batches(query, %PagingOptions{key: nil}), do: query
 
   defp page_zkevm_batches(query, %PagingOptions{key: {number}}) do
diff --git a/apps/explorer/priv/repo/migrations/20230420110800_create_zkevm_tables.exs b/apps/explorer/priv/repo/migrations/20230420110800_create_zkevm_tables.exs
index 6b25fd694802..d8c5a0293aaf 100644
--- a/apps/explorer/priv/repo/migrations/20230420110800_create_zkevm_tables.exs
+++ b/apps/explorer/priv/repo/migrations/20230420110800_create_zkevm_tables.exs
@@ -48,5 +48,7 @@ defmodule Explorer.Repo.Migrations.CreateZkevmTables do
       add(:hash, :bytea, null: false, primary_key: true)
       timestamps(null: false, type: :utc_datetime_usec)
     end
+
+    create(index(:zkevm_batch_l2_transactions, :batch_number))
   end
 end

From beafb4aa7105da954fb5c4be42137840d725d12d Mon Sep 17 00:00:00 2001
From: POA <33550681+poa@users.noreply.github.com>
Date: Thu, 25 May 2023 14:35:06 +0300
Subject: [PATCH 554/909] Rename some routes in API v2

---
 apps/block_scout_web/lib/block_scout_web/api_router.ex | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/block_scout_web/lib/block_scout_web/api_router.ex b/apps/block_scout_web/lib/block_scout_web/api_router.ex
index 2bc1cc08a252..289bc723ccf5 100644
--- a/apps/block_scout_web/lib/block_scout_web/api_router.ex
+++ b/apps/block_scout_web/lib/block_scout_web/api_router.ex
@@ -186,8 +186,8 @@ defmodule BlockScoutWeb.ApiRouter do
       get("/transactions", V2.MainPageController, :transactions)
       get("/transactions/watchlist", V2.MainPageController, :watchlist_transactions)
       get("/indexing-status", V2.MainPageController, :indexing_status)
-      get("/zkevm-confirmed-batches", V2.ZkevmController, :batches_confirmed)
-      get("/zkevm-latest-batch-number", V2.ZkevmController, :batch_latest_number)
+      get("/zkevm-batches-confirmed", V2.ZkevmController, :batches_confirmed)
+      get("/zkevm-batch-latest-number", V2.ZkevmController, :batch_latest_number)
     end
 
     scope "/stats" do

From 242cac2b4e38eb48ba58f8fa325f2cc91cf3a62c Mon Sep 17 00:00:00 2001
From: POA <33550681+poa@users.noreply.github.com>
Date: Tue, 30 May 2023 09:10:10 +0300
Subject: [PATCH 555/909] Update changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e0eb3000a6d0..6134e938eb9b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -391,6 +391,7 @@
 - [#7585](https://github.com/blockscout/blockscout/pull/7585) - Store and display native coin market cap from the DB
 - [#7513](https://github.com/blockscout/blockscout/pull/7513) - Add Polygon Edge support
 - [#7532](https://github.com/blockscout/blockscout/pull/7532) - Handle empty id in json rpc responses
+- [#7584](https://github.com/blockscout/blockscout/pull/7584) - Add Polygon zkEVM batches fetcher
 - [#7544](https://github.com/blockscout/blockscout/pull/7544) - Add ERC-1155 signatures to uncataloged_token_transfer_block_numbers
 - [#7363](https://github.com/blockscout/blockscout/pull/7363) - CSV export filters
 - [#7697](https://github.com/blockscout/blockscout/pull/7697) - Limit fetchers init tasks

From a920650c7bf349818ae805990442719ecb9b3367 Mon Sep 17 00:00:00 2001
From: POA <33550681+poa@users.noreply.github.com>
Date: Thu, 1 Jun 2023 16:23:19 +0300
Subject: [PATCH 556/909] Fix for dialyzer

---
 apps/explorer/lib/explorer/chain.ex | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/explorer/lib/explorer/chain.ex b/apps/explorer/lib/explorer/chain.ex
index a476675e00cd..500cae7a0e5a 100644
--- a/apps/explorer/lib/explorer/chain.ex
+++ b/apps/explorer/lib/explorer/chain.ex
@@ -1745,7 +1745,7 @@ defmodule Explorer.Chain do
       `:required`, and the `t:Explorer.Chain.Transaction.t/0` has no associated record for that association, then the
       `t:Explorer.Chain.Transaction.t/0` will not be included in the page `entries`.
   """
-  @spec hashes_to_transactions([Hash.Full.t()], [necessity_by_association_option]) :: [Transaction.t()] | []
+  @spec hashes_to_transactions([Hash.Full.t()], [necessity_by_association_option | api?]) :: [Transaction.t()] | []
   def hashes_to_transactions(hashes, options \\ []) when is_list(hashes) and is_list(options) do
     necessity_by_association = Keyword.get(options, :necessity_by_association, %{})
 

From 977c653503c74d0ee3668903bbc2a461a449aeb1 Mon Sep 17 00:00:00 2001
From: POA <33550681+poa@users.noreply.github.com>
Date: Mon, 5 Jun 2023 16:40:02 +0300
Subject: [PATCH 557/909] Add new words to cspell.json

---
 cspell.json | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/cspell.json b/cspell.json
index 9c86e41a9d63..63694d741c37 100644
--- a/cspell.json
+++ b/cspell.json
@@ -470,6 +470,7 @@
         "uncatalog",
         "unclosable",
         "unfetched",
+        "unfinalized",
         "Unitarion",
         "Unitorius",
         "Unitorus",
@@ -523,6 +524,7 @@
         "zindex",
         "zipcode",
         "zkbob",
+        "zkevm",
         "erts",
         "Asfpp",
         "Nerg",

From 1d05035aaa7c14d3b9d95bdc207b9db7d96dd15e Mon Sep 17 00:00:00 2001
From: POA <33550681+poa@users.noreply.github.com>
Date: Fri, 9 Jun 2023 10:41:02 +0300
Subject: [PATCH 558/909] Use latest batch number instead of aggregated count

---
 .../controllers/api/v2/zkevm_controller.ex    | 22 +++++++++----------
 1 file changed, 10 insertions(+), 12 deletions(-)

diff --git a/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/zkevm_controller.ex b/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/zkevm_controller.ex
index dcd5ad0a717f..bbda1deaa595 100644
--- a/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/zkevm_controller.ex
+++ b/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/zkevm_controller.ex
@@ -8,8 +8,7 @@ defmodule BlockScoutWeb.API.V2.ZkevmController do
       split_list_by_page: 1
     ]
 
-  alias Explorer.{Chain, Repo}
-  alias Explorer.Chain.ZkevmTxnBatch
+  alias Explorer.Chain
 
   action_fallback(BlockScoutWeb.API.V2.FallbackController)
 
@@ -37,15 +36,9 @@ defmodule BlockScoutWeb.API.V2.ZkevmController do
   end
 
   def batch_latest_number(conn, _params) do
-    number =
-      case Chain.zkevm_batch(:latest, api?: true) do
-        {:ok, batch} -> batch.number
-        {:error, :not_found} -> 0
-      end
-
     conn
     |> put_status(200)
-    |> render(:zkevm_batch_latest_number, %{number: number})
+    |> render(:zkevm_batch_latest_number, %{number: batch_latest_number()})
   end
 
   def batches(conn, params) do
@@ -68,11 +61,9 @@ defmodule BlockScoutWeb.API.V2.ZkevmController do
   end
 
   def batches_count(conn, _params) do
-    count = Repo.replica().aggregate(ZkevmTxnBatch, :count, timeout: :infinity)
-
     conn
     |> put_status(200)
-    |> render(:zkevm_batches_count, %{count: count})
+    |> render(:zkevm_batches_count, %{count: batch_latest_number()})
   end
 
   def batches_confirmed(conn, _params) do
@@ -87,4 +78,11 @@ defmodule BlockScoutWeb.API.V2.ZkevmController do
     |> put_status(200)
     |> render(:zkevm_batches, %{batches: batches})
   end
+
+  defp batch_latest_number do
+    case Chain.zkevm_batch(:latest, api?: true) do
+      {:ok, batch} -> batch.number
+      {:error, :not_found} -> 0
+    end
+  end
 end

From 06ce6d7088c5943a75937b4cfa768dc3d0ce1c9d Mon Sep 17 00:00:00 2001
From: POA <33550681+poa@users.noreply.github.com>
Date: Fri, 9 Jun 2023 11:02:11 +0300
Subject: [PATCH 559/909] Simplify batches chunking

---
 apps/indexer/lib/indexer/fetcher/zkevm_txn_batch.ex | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/apps/indexer/lib/indexer/fetcher/zkevm_txn_batch.ex b/apps/indexer/lib/indexer/fetcher/zkevm_txn_batch.ex
index 7aa3f074ab0f..c6c61d575b93 100644
--- a/apps/indexer/lib/indexer/fetcher/zkevm_txn_batch.ex
+++ b/apps/indexer/lib/indexer/fetcher/zkevm_txn_batch.ex
@@ -152,16 +152,13 @@ defmodule Indexer.Fetcher.ZkevmTxnBatch do
   end
 
   defp handle_batch_range(start_batch_number, end_batch_number, json_rpc_named_arguments) do
-    chunks_number = ceil((end_batch_number - start_batch_number + 1) / @batch_range_size)
-
-    chunk_range = Range.new(0, max(chunks_number - 1, 0), 1)
-
-    Enum.each(chunk_range, fn current_chunk ->
-      chunk_start = start_batch_number + @batch_range_size * current_chunk
-      chunk_end = min(chunk_start + @batch_range_size - 1, end_batch_number)
+    start_batch_number..end_batch_number
+    |> Enum.chunk_every(@batch_range_size)
+    |> Enum.each(fn chunk ->
+      chunk_start = List.first(chunk)
+      chunk_end = List.last(chunk)
 
       log_batches_chunk_handling(chunk_start, chunk_end, start_batch_number, end_batch_number)
-
       fetch_and_save_batches(chunk_start, chunk_end, json_rpc_named_arguments)
     end)
   end

From 03566d53b5ec2d318443861078219f18926ce952 Mon Sep 17 00:00:00 2001
From: POA <33550681+poa@users.noreply.github.com>
Date: Fri, 9 Jun 2023 11:29:12 +0300
Subject: [PATCH 560/909] Store l2 transactions count in the batch table

---
 .../views/api/v2/zkevm_view.ex                | 42 +++++--------------
 .../chain/import/runner/zkevm_txn_batches.ex  |  4 +-
 .../lib/explorer/chain/zkevm_txn_batch.ex     |  4 +-
 .../20230420110800_create_zkevm_tables.exs    |  1 +
 .../lib/indexer/fetcher/zkevm_txn_batch.ex    | 21 +++++-----
 5 files changed, 29 insertions(+), 43 deletions(-)

diff --git a/apps/block_scout_web/lib/block_scout_web/views/api/v2/zkevm_view.ex b/apps/block_scout_web/lib/block_scout_web/views/api/v2/zkevm_view.ex
index 10ae9e8f4755..a504f72d4801 100644
--- a/apps/block_scout_web/lib/block_scout_web/views/api/v2/zkevm_view.ex
+++ b/apps/block_scout_web/lib/block_scout_web/views/api/v2/zkevm_view.ex
@@ -1,11 +1,6 @@
 defmodule BlockScoutWeb.API.V2.ZkevmView do
   use BlockScoutWeb, :view
 
-  import Ecto.Query, only: [from: 2]
-
-  alias Explorer.Chain.ZkevmBatchTxn
-  alias Explorer.Repo
-
   def render("zkevm_batch.json", %{batch: batch}) do
     sequence_tx_hash =
       if not is_nil(batch.sequence_transaction) do
@@ -64,33 +59,18 @@ defmodule BlockScoutWeb.API.V2.ZkevmView do
   end
 
   defp render_zkevm_batches(batches) do
-    batches
-    |> Enum.map(fn batch ->
-      Task.async(fn ->
-        tx_count =
-          Repo.replica().aggregate(
-            from(
-              t in ZkevmBatchTxn,
-              where: t.batch_number == ^batch.number
-            ),
-            :count,
-            timeout: :infinity
-          )
-
-        sequence_tx_hash =
-          if not is_nil(batch.sequence_transaction) do
-            batch.sequence_transaction.hash
-          end
+    Enum.map(batches, fn batch ->
+      sequence_tx_hash =
+        if not is_nil(batch.sequence_transaction) do
+          batch.sequence_transaction.hash
+        end
 
-        %{
-          "number" => batch.number,
-          "timestamp" => batch.timestamp,
-          "tx_count" => tx_count,
-          "sequence_tx_hash" => sequence_tx_hash
-        }
-      end)
+      %{
+        "number" => batch.number,
+        "timestamp" => batch.timestamp,
+        "tx_count" => batch.l2_transactions_count,
+        "sequence_tx_hash" => sequence_tx_hash
+      }
     end)
-    |> Task.yield_many(:infinity)
-    |> Enum.map(fn {_task, {:ok, item}} -> item end)
   end
 end
diff --git a/apps/explorer/lib/explorer/chain/import/runner/zkevm_txn_batches.ex b/apps/explorer/lib/explorer/chain/import/runner/zkevm_txn_batches.ex
index ed1e5f1d8f76..50bc93195db5 100644
--- a/apps/explorer/lib/explorer/chain/import/runner/zkevm_txn_batches.ex
+++ b/apps/explorer/lib/explorer/chain/import/runner/zkevm_txn_batches.ex
@@ -85,6 +85,7 @@ defmodule Explorer.Chain.Import.Runner.ZkevmTxnBatches do
         set: [
           # don't update `number` as it is a primary key and used for the conflict target
           timestamp: fragment("EXCLUDED.timestamp"),
+          l2_transactions_count: fragment("EXCLUDED.l2_transactions_count"),
           global_exit_root: fragment("EXCLUDED.global_exit_root"),
           acc_input_hash: fragment("EXCLUDED.acc_input_hash"),
           state_root: fragment("EXCLUDED.state_root"),
@@ -96,8 +97,9 @@ defmodule Explorer.Chain.Import.Runner.ZkevmTxnBatches do
       ],
       where:
         fragment(
-          "(EXCLUDED.timestamp, EXCLUDED.global_exit_root, EXCLUDED.acc_input_hash, EXCLUDED.state_root, EXCLUDED.sequence_id, EXCLUDED.verify_id) IS DISTINCT FROM (?, ?, ?, ?, ?, ?)",
+          "(EXCLUDED.timestamp, EXCLUDED.l2_transactions_count, EXCLUDED.global_exit_root, EXCLUDED.acc_input_hash, EXCLUDED.state_root, EXCLUDED.sequence_id, EXCLUDED.verify_id) IS DISTINCT FROM (?, ?, ?, ?, ?, ?, ?)",
           tb.timestamp,
+          tb.l2_transactions_count,
           tb.global_exit_root,
           tb.acc_input_hash,
           tb.state_root,
diff --git a/apps/explorer/lib/explorer/chain/zkevm_txn_batch.ex b/apps/explorer/lib/explorer/chain/zkevm_txn_batch.ex
index 7cd380af1ece..77c50c1c0ff0 100644
--- a/apps/explorer/lib/explorer/chain/zkevm_txn_batch.ex
+++ b/apps/explorer/lib/explorer/chain/zkevm_txn_batch.ex
@@ -7,11 +7,12 @@ defmodule Explorer.Chain.ZkevmTxnBatch do
 
   @optional_attrs ~w(sequence_id verify_id)a
 
-  @required_attrs ~w(number timestamp global_exit_root acc_input_hash state_root)a
+  @required_attrs ~w(number timestamp l2_transactions_count global_exit_root acc_input_hash state_root)a
 
   @type t :: %__MODULE__{
           number: non_neg_integer(),
           timestamp: DateTime.t(),
+          l2_transactions_count: non_neg_integer(),
           global_exit_root: Hash.t(),
           acc_input_hash: Hash.t(),
           state_root: Hash.t(),
@@ -25,6 +26,7 @@ defmodule Explorer.Chain.ZkevmTxnBatch do
   @primary_key {:number, :integer, autogenerate: false}
   schema "zkevm_transaction_batches" do
     field(:timestamp, :utc_datetime_usec)
+    field(:l2_transactions_count, :integer)
     field(:global_exit_root, Hash.Full)
     field(:acc_input_hash, Hash.Full)
     field(:state_root, Hash.Full)
diff --git a/apps/explorer/priv/repo/migrations/20230420110800_create_zkevm_tables.exs b/apps/explorer/priv/repo/migrations/20230420110800_create_zkevm_tables.exs
index d8c5a0293aaf..6115a034dce7 100644
--- a/apps/explorer/priv/repo/migrations/20230420110800_create_zkevm_tables.exs
+++ b/apps/explorer/priv/repo/migrations/20230420110800_create_zkevm_tables.exs
@@ -14,6 +14,7 @@ defmodule Explorer.Repo.Migrations.CreateZkevmTables do
     create table(:zkevm_transaction_batches, primary_key: false) do
       add(:number, :integer, null: false, primary_key: true)
       add(:timestamp, :"timestamp without time zone", null: false)
+      add(:l2_transactions_count, :integer, null: false)
       add(:global_exit_root, :bytea, null: false)
       add(:acc_input_hash, :bytea, null: false)
       add(:state_root, :bytea, null: false)
diff --git a/apps/indexer/lib/indexer/fetcher/zkevm_txn_batch.ex b/apps/indexer/lib/indexer/fetcher/zkevm_txn_batch.ex
index c6c61d575b93..d93b8ce36ca3 100644
--- a/apps/indexer/lib/indexer/fetcher/zkevm_txn_batch.ex
+++ b/apps/indexer/lib/indexer/fetcher/zkevm_txn_batch.ex
@@ -262,16 +262,6 @@ defmodule Indexer.Fetcher.ZkevmTxnBatch do
           |> get_tx_hash("verifyBatchTxHash")
           |> handle_tx_hash(hash_to_id, next_id, l1_txs, true)
 
-        batch = %{
-          number: number,
-          timestamp: timestamp,
-          global_exit_root: global_exit_root,
-          acc_input_hash: acc_input_hash,
-          state_root: state_root,
-          sequence_id: sequence_id,
-          verify_id: verify_id
-        }
-
         l2_txs_append =
           l2_transaction_hashes
           |> Kernel.||([])
@@ -282,6 +272,17 @@ defmodule Indexer.Fetcher.ZkevmTxnBatch do
             }
           end)
 
+        batch = %{
+          number: number,
+          timestamp: timestamp,
+          l2_transactions_count: Enum.count(l2_txs_append),
+          global_exit_root: global_exit_root,
+          acc_input_hash: acc_input_hash,
+          state_root: state_root,
+          sequence_id: sequence_id,
+          verify_id: verify_id
+        }
+
         {[batch | batches], l2_txs ++ l2_txs_append, l1_txs, next_id, hash_to_id}
       end)
 

From f30a4d4decb5c015147f95ca7486e9aff00307c8 Mon Sep 17 00:00:00 2001
From: POA <33550681+poa@users.noreply.github.com>
Date: Mon, 4 Sep 2023 12:55:44 +0300
Subject: [PATCH 561/909] Fix syntax

---
 apps/explorer/lib/explorer/chain.ex | 1 +
 1 file changed, 1 insertion(+)

diff --git a/apps/explorer/lib/explorer/chain.ex b/apps/explorer/lib/explorer/chain.ex
index 500cae7a0e5a..fbd791edb7ed 100644
--- a/apps/explorer/lib/explorer/chain.ex
+++ b/apps/explorer/lib/explorer/chain.ex
@@ -6391,6 +6391,7 @@ defmodule Explorer.Chain do
           )
       }
     )
+  end
 
   def zkevm_batch(number, options \\ [])
 

From bc411f545dc501f72317c0ac9225ae50da598709 Mon Sep 17 00:00:00 2001
From: POA <33550681+poa@users.noreply.github.com>
Date: Mon, 11 Sep 2023 11:06:01 +0300
Subject: [PATCH 562/909] Minor changes

---
 CHANGELOG.md                              | 2 +-
 docker-compose/envs/common-blockscout.env | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6134e938eb9b..b663cb052eef 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -30,6 +30,7 @@
 - [#8543](https://github.com/blockscout/blockscout/pull/8543) - Fix polygon tracer
 - [#8386](https://github.com/blockscout/blockscout/pull/8386) - Add `owner_address_hash` to the `token_instances`
 - [#8530](https://github.com/blockscout/blockscout/pull/8530) - Add `block_type` to search results
+- [#7584](https://github.com/blockscout/blockscout/pull/7584) - Add Polygon zkEVM batches fetcher
 - [#8180](https://github.com/blockscout/blockscout/pull/8180) - Deposits and Withdrawals for Polygon Edge
 - [#7996](https://github.com/blockscout/blockscout/pull/7996) - Add CoinBalance fetcher init query limit
 - [#8658](https://github.com/blockscout/blockscout/pull/8658) - Remove block consensus on import fail
@@ -391,7 +392,6 @@
 - [#7585](https://github.com/blockscout/blockscout/pull/7585) - Store and display native coin market cap from the DB
 - [#7513](https://github.com/blockscout/blockscout/pull/7513) - Add Polygon Edge support
 - [#7532](https://github.com/blockscout/blockscout/pull/7532) - Handle empty id in json rpc responses
-- [#7584](https://github.com/blockscout/blockscout/pull/7584) - Add Polygon zkEVM batches fetcher
 - [#7544](https://github.com/blockscout/blockscout/pull/7544) - Add ERC-1155 signatures to uncataloged_token_transfer_block_numbers
 - [#7363](https://github.com/blockscout/blockscout/pull/7363) - CSV export filters
 - [#7697](https://github.com/blockscout/blockscout/pull/7697) - Limit fetchers init tasks
diff --git a/docker-compose/envs/common-blockscout.env b/docker-compose/envs/common-blockscout.env
index d2bbf877ff3c..7cfdefc7e920 100644
--- a/docker-compose/envs/common-blockscout.env
+++ b/docker-compose/envs/common-blockscout.env
@@ -141,6 +141,7 @@ INDEXER_DISABLE_INTERNAL_TRANSACTIONS_FETCHER=false
 # INDEXER_POLYGON_EDGE_L2_STATE_RECEIVER_CONTRACT=
 # INDEXER_POLYGON_EDGE_L2_DEPOSITS_START_BLOCK=
 # INDEXER_POLYGON_EDGE_ETH_GET_LOGS_RANGE_SIZE=
+# INDEXER_ZKEVM_BATCHES_ENABLED=
 # INDEXER_REALTIME_FETCHER_MAX_GAP=
 # INDEXER_FETCHER_INIT_QUERY_LIMIT=
 # INDEXER_TOKEN_BALANCES_FETCHER_INIT_QUERY_LIMIT=

From 841fd7be7022d4f00dcc7b6f8bbbd7b3a8174efa Mon Sep 17 00:00:00 2001
From: POA <33550681+poa@users.noreply.github.com>
Date: Mon, 11 Sep 2023 11:23:10 +0300
Subject: [PATCH 563/909] Add INDEXER_ZKEVM_BATCHES_CHUNK_SIZE env variable

---
 apps/indexer/lib/indexer/fetcher/zkevm_txn_batch.ex | 13 +++++++++----
 config/runtime.exs                                  |  3 +++
 docker-compose/envs/common-blockscout.env           |  1 +
 3 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/apps/indexer/lib/indexer/fetcher/zkevm_txn_batch.ex b/apps/indexer/lib/indexer/fetcher/zkevm_txn_batch.ex
index d93b8ce36ca3..41f419ff2221 100644
--- a/apps/indexer/lib/indexer/fetcher/zkevm_txn_batch.ex
+++ b/apps/indexer/lib/indexer/fetcher/zkevm_txn_batch.ex
@@ -15,7 +15,6 @@ defmodule Indexer.Fetcher.ZkevmTxnBatch do
   alias Explorer.{Chain, Repo}
   alias Explorer.Chain.{ZkevmLifecycleTxn, ZkevmTxnBatch}
 
-  @batch_range_size 20
   @recheck_latest_batch_interval 60
   @zero_hash "0000000000000000000000000000000000000000000000000000000000000000"
 
@@ -39,10 +38,13 @@ defmodule Indexer.Fetcher.ZkevmTxnBatch do
     Logger.metadata(fetcher: :zkevm_txn_batches)
     # Logger.configure(truncate: :infinity)
 
+    chunk_size = Application.get_all_env(:indexer)[Indexer.Fetcher.ZkevmTxnBatch][:chunk_size]
+
     Process.send(self(), :continue, [])
 
     {:ok,
      %{
+       chunk_size: chunk_size,
        json_rpc_named_arguments: args[:json_rpc_named_arguments],
        prev_latest_batch_number: 0,
        prev_virtual_batch_number: 0,
@@ -54,6 +56,7 @@ defmodule Indexer.Fetcher.ZkevmTxnBatch do
   def handle_info(
         :continue,
         %{
+          chunk_size: chunk_size,
           json_rpc_named_arguments: json_rpc_named_arguments,
           prev_latest_batch_number: prev_latest_batch_number,
           prev_virtual_batch_number: prev_virtual_batch_number,
@@ -95,7 +98,9 @@ defmodule Indexer.Fetcher.ZkevmTxnBatch do
         Logger.info(log_message <> "Handling the batch range #{start_batch_number}..#{end_batch_number}.")
 
         {handle_duration, _} =
-          :timer.tc(fn -> handle_batch_range(start_batch_number, end_batch_number, json_rpc_named_arguments) end)
+          :timer.tc(fn ->
+            handle_batch_range(start_batch_number, end_batch_number, json_rpc_named_arguments, chunk_size)
+          end)
 
         {
           %{
@@ -151,9 +156,9 @@ defmodule Indexer.Fetcher.ZkevmTxnBatch do
     last_id + 1
   end
 
-  defp handle_batch_range(start_batch_number, end_batch_number, json_rpc_named_arguments) do
+  defp handle_batch_range(start_batch_number, end_batch_number, json_rpc_named_arguments, chunk_size) do
     start_batch_number..end_batch_number
-    |> Enum.chunk_every(@batch_range_size)
+    |> Enum.chunk_every(chunk_size)
     |> Enum.each(fn chunk ->
       chunk_start = List.first(chunk)
       chunk_end = List.last(chunk)
diff --git a/config/runtime.exs b/config/runtime.exs
index fdc5fb80d242..7e2411a11bb5 100644
--- a/config/runtime.exs
+++ b/config/runtime.exs
@@ -613,6 +613,9 @@ config :indexer, Indexer.Fetcher.PolygonEdge.WithdrawalExit,
   start_block_l1: System.get_env("INDEXER_POLYGON_EDGE_L1_WITHDRAWALS_START_BLOCK"),
   exit_helper: System.get_env("INDEXER_POLYGON_EDGE_L1_EXIT_HELPER_CONTRACT")
 
+config :indexer, Indexer.Fetcher.ZkevmTxnBatch,
+  chunk_size: ConfigHelper.parse_integer_env_var("INDEXER_ZKEVM_BATCHES_CHUNK_SIZE", 20)
+
 config :indexer, Indexer.Fetcher.ZkevmTxnBatch.Supervisor,
   enabled: ConfigHelper.parse_bool_env_var("INDEXER_ZKEVM_BATCHES_ENABLED")
 
diff --git a/docker-compose/envs/common-blockscout.env b/docker-compose/envs/common-blockscout.env
index 7cfdefc7e920..5dc9bcda8c4e 100644
--- a/docker-compose/envs/common-blockscout.env
+++ b/docker-compose/envs/common-blockscout.env
@@ -142,6 +142,7 @@ INDEXER_DISABLE_INTERNAL_TRANSACTIONS_FETCHER=false
 # INDEXER_POLYGON_EDGE_L2_DEPOSITS_START_BLOCK=
 # INDEXER_POLYGON_EDGE_ETH_GET_LOGS_RANGE_SIZE=
 # INDEXER_ZKEVM_BATCHES_ENABLED=
+# INDEXER_ZKEVM_BATCHES_CHUNK_SIZE=
 # INDEXER_REALTIME_FETCHER_MAX_GAP=
 # INDEXER_FETCHER_INIT_QUERY_LIMIT=
 # INDEXER_TOKEN_BALANCES_FETCHER_INIT_QUERY_LIMIT=

From 3fe3c5c2cb02f67015f884e04c5935f2e35585cf Mon Sep 17 00:00:00 2001
From: POA <33550681+poa@users.noreply.github.com>
Date: Mon, 11 Sep 2023 12:48:25 +0300
Subject: [PATCH 564/909] Add INDEXER_ZKEVM_BATCHES_RECHECK_INTERVAL env
 variable

---
 apps/indexer/lib/indexer/fetcher/zkevm_txn_batch.ex | 13 ++++++++-----
 config/runtime.exs                                  |  3 ++-
 docker-compose/envs/common-blockscout.env           |  1 +
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/apps/indexer/lib/indexer/fetcher/zkevm_txn_batch.ex b/apps/indexer/lib/indexer/fetcher/zkevm_txn_batch.ex
index 41f419ff2221..b23a49ade4aa 100644
--- a/apps/indexer/lib/indexer/fetcher/zkevm_txn_batch.ex
+++ b/apps/indexer/lib/indexer/fetcher/zkevm_txn_batch.ex
@@ -15,7 +15,6 @@ defmodule Indexer.Fetcher.ZkevmTxnBatch do
   alias Explorer.{Chain, Repo}
   alias Explorer.Chain.{ZkevmLifecycleTxn, ZkevmTxnBatch}
 
-  @recheck_latest_batch_interval 60
   @zero_hash "0000000000000000000000000000000000000000000000000000000000000000"
 
   def child_spec(start_link_arguments) do
@@ -38,7 +37,9 @@ defmodule Indexer.Fetcher.ZkevmTxnBatch do
     Logger.metadata(fetcher: :zkevm_txn_batches)
     # Logger.configure(truncate: :infinity)
 
-    chunk_size = Application.get_all_env(:indexer)[Indexer.Fetcher.ZkevmTxnBatch][:chunk_size]
+    config = Application.get_all_env(:indexer)[Indexer.Fetcher.ZkevmTxnBatch]
+    chunk_size = config[:chunk_size]
+    recheck_interval = config[:recheck_interval]
 
     Process.send(self(), :continue, [])
 
@@ -48,7 +49,8 @@ defmodule Indexer.Fetcher.ZkevmTxnBatch do
        json_rpc_named_arguments: args[:json_rpc_named_arguments],
        prev_latest_batch_number: 0,
        prev_virtual_batch_number: 0,
-       prev_verified_batch_number: 0
+       prev_verified_batch_number: 0,
+       recheck_interval: recheck_interval
      }}
   end
 
@@ -60,7 +62,8 @@ defmodule Indexer.Fetcher.ZkevmTxnBatch do
           json_rpc_named_arguments: json_rpc_named_arguments,
           prev_latest_batch_number: prev_latest_batch_number,
           prev_virtual_batch_number: prev_virtual_batch_number,
-          prev_verified_batch_number: prev_verified_batch_number
+          prev_verified_batch_number: prev_verified_batch_number,
+          recheck_interval: recheck_interval
         } = state
       ) do
     {latest_batch_number, virtual_batch_number, verified_batch_number} =
@@ -115,7 +118,7 @@ defmodule Indexer.Fetcher.ZkevmTxnBatch do
         {state, 0}
       end
 
-    Process.send_after(self(), :continue, max(:timer.seconds(@recheck_latest_batch_interval) - handle_duration, 0))
+    Process.send_after(self(), :continue, max(:timer.seconds(recheck_interval) - handle_duration, 0))
 
     {:noreply, new_state}
   end
diff --git a/config/runtime.exs b/config/runtime.exs
index 7e2411a11bb5..a8bdf8141009 100644
--- a/config/runtime.exs
+++ b/config/runtime.exs
@@ -614,7 +614,8 @@ config :indexer, Indexer.Fetcher.PolygonEdge.WithdrawalExit,
   exit_helper: System.get_env("INDEXER_POLYGON_EDGE_L1_EXIT_HELPER_CONTRACT")
 
 config :indexer, Indexer.Fetcher.ZkevmTxnBatch,
-  chunk_size: ConfigHelper.parse_integer_env_var("INDEXER_ZKEVM_BATCHES_CHUNK_SIZE", 20)
+  chunk_size: ConfigHelper.parse_integer_env_var("INDEXER_ZKEVM_BATCHES_CHUNK_SIZE", 20),
+  recheck_interval: ConfigHelper.parse_integer_env_var("INDEXER_ZKEVM_BATCHES_RECHECK_INTERVAL", 60)
 
 config :indexer, Indexer.Fetcher.ZkevmTxnBatch.Supervisor,
   enabled: ConfigHelper.parse_bool_env_var("INDEXER_ZKEVM_BATCHES_ENABLED")
diff --git a/docker-compose/envs/common-blockscout.env b/docker-compose/envs/common-blockscout.env
index 5dc9bcda8c4e..3a3724eec651 100644
--- a/docker-compose/envs/common-blockscout.env
+++ b/docker-compose/envs/common-blockscout.env
@@ -143,6 +143,7 @@ INDEXER_DISABLE_INTERNAL_TRANSACTIONS_FETCHER=false
 # INDEXER_POLYGON_EDGE_ETH_GET_LOGS_RANGE_SIZE=
 # INDEXER_ZKEVM_BATCHES_ENABLED=
 # INDEXER_ZKEVM_BATCHES_CHUNK_SIZE=
+# INDEXER_ZKEVM_BATCHES_RECHECK_INTERVAL=
 # INDEXER_REALTIME_FETCHER_MAX_GAP=
 # INDEXER_FETCHER_INIT_QUERY_LIMIT=
 # INDEXER_TOKEN_BALANCES_FETCHER_INIT_QUERY_LIMIT=

From 00f71d31493fe4d2eeb35dcf53a7f3a281deebdf Mon Sep 17 00:00:00 2001
From: POA <33550681+poa@users.noreply.github.com>
Date: Mon, 11 Sep 2023 12:55:56 +0300
Subject: [PATCH 565/909] Remove redundant line

---
 apps/indexer/lib/indexer/fetcher/zkevm_txn_batch.ex | 1 -
 1 file changed, 1 deletion(-)

diff --git a/apps/indexer/lib/indexer/fetcher/zkevm_txn_batch.ex b/apps/indexer/lib/indexer/fetcher/zkevm_txn_batch.ex
index b23a49ade4aa..d3e63570f162 100644
--- a/apps/indexer/lib/indexer/fetcher/zkevm_txn_batch.ex
+++ b/apps/indexer/lib/indexer/fetcher/zkevm_txn_batch.ex
@@ -35,7 +35,6 @@ defmodule Indexer.Fetcher.ZkevmTxnBatch do
   @impl GenServer
   def init(args) do
     Logger.metadata(fetcher: :zkevm_txn_batches)
-    # Logger.configure(truncate: :infinity)
 
     config = Application.get_all_env(:indexer)[Indexer.Fetcher.ZkevmTxnBatch]
     chunk_size = config[:chunk_size]

From 8b70c29bac3c9403dc1569b51cbb47568fafd2d5 Mon Sep 17 00:00:00 2001
From: POA <33550681+poa@users.noreply.github.com>
Date: Mon, 11 Sep 2023 13:22:44 +0300
Subject: [PATCH 566/909] Small refactoring

---
 .../lib/indexer/fetcher/zkevm_txn_batch.ex    | 34 +++++++------------
 1 file changed, 13 insertions(+), 21 deletions(-)

diff --git a/apps/indexer/lib/indexer/fetcher/zkevm_txn_batch.ex b/apps/indexer/lib/indexer/fetcher/zkevm_txn_batch.ex
index d3e63570f162..10316acfd7ea 100644
--- a/apps/indexer/lib/indexer/fetcher/zkevm_txn_batch.ex
+++ b/apps/indexer/lib/indexer/fetcher/zkevm_txn_batch.ex
@@ -75,27 +75,10 @@ defmodule Indexer.Fetcher.ZkevmTxnBatch do
         end_batch_number = latest_batch_number
 
         log_message =
-          if latest_batch_number > prev_latest_batch_number do
-            "Found a new latest batch number #{latest_batch_number}. Previous batch number is #{prev_latest_batch_number}. "
-          else
-            ""
-          end
-
-        log_message =
-          if virtual_batch_number > prev_virtual_batch_number do
-            log_message <>
-              "Found a new virtual batch number #{virtual_batch_number}. Previous virtual batch number is #{prev_virtual_batch_number}. "
-          else
-            log_message
-          end
-
-        log_message =
-          if verified_batch_number > prev_verified_batch_number do
-            log_message <>
-              "Found a new verified batch number #{verified_batch_number}. Previous verified batch number is #{prev_verified_batch_number}. "
-          else
-            log_message
-          end
+          ""
+          |> make_log_message(latest_batch_number, prev_latest_batch_number, "latest")
+          |> make_log_message(virtual_batch_number, prev_virtual_batch_number, "virtual")
+          |> make_log_message(verified_batch_number, prev_verified_batch_number, "verified")
 
         Logger.info(log_message <> "Handling the batch range #{start_batch_number}..#{end_batch_number}.")
 
@@ -192,6 +175,15 @@ defmodule Indexer.Fetcher.ZkevmTxnBatch do
     end
   end
 
+  defp make_log_message(prev_message, batch_number, prev_batch_number, type) do
+    if batch_number > prev_batch_number do
+      prev_message <>
+        "Found a new #{type} batch number #{batch_number}. Previous #{type} batch number is #{prev_batch_number}. "
+    else
+      prev_message
+    end
+  end
+
   defp fetch_and_save_batches(batch_start, batch_end, json_rpc_named_arguments) do
     requests =
       batch_start

From 126c59a30d40095af886d41331aecf84adfd72b3 Mon Sep 17 00:00:00 2001
From: POA <33550681+poa@users.noreply.github.com>
Date: Mon, 11 Sep 2023 14:30:30 +0300
Subject: [PATCH 567/909] Txn -> Transaction

---
 .../lib/block_scout_web/chain.ex              |  4 +--
 apps/explorer/lib/explorer/chain.ex           | 12 ++++-----
 ...ch_txns.ex => zkevm_batch_transactions.ex} | 24 ++++++++---------
 ...xns.ex => zkevm_lifecycle_transactions.ex} | 26 +++++++++----------
 ...atches.ex => zkevm_transaction_batches.ex} | 26 +++++++++----------
 .../chain/import/stage/block_referencing.ex   |  6 ++---
 .../lib/explorer/chain/transaction.ex         |  6 ++---
 ...atch_txn.ex => zkevm_batch_transaction.ex} |  8 +++---
 ..._txn.ex => zkevm_lifecycle_transaction.ex} |  8 +++---
 ...xn_batch.ex => zkevm_transaction_batch.ex} | 21 +++++++++------
 ...xn_batch.ex => zkevm_transaction_batch.ex} | 20 +++++++-------
 apps/indexer/lib/indexer/supervisor.ex        |  4 +--
 12 files changed, 85 insertions(+), 80 deletions(-)
 rename apps/explorer/lib/explorer/chain/import/runner/{zkevm_batch_txns.ex => zkevm_batch_transactions.ex} (71%)
 rename apps/explorer/lib/explorer/chain/import/runner/{zkevm_lifecycle_txns.ex => zkevm_lifecycle_transactions.ex} (76%)
 rename apps/explorer/lib/explorer/chain/import/runner/{zkevm_txn_batches.ex => zkevm_transaction_batches.ex} (81%)
 rename apps/explorer/lib/explorer/chain/{zkevm_batch_txn.ex => zkevm_batch_transaction.ex} (71%)
 rename apps/explorer/lib/explorer/chain/{zkevm_lifecycle_txn.ex => zkevm_lifecycle_transaction.ex} (68%)
 rename apps/explorer/lib/explorer/chain/{zkevm_txn_batch.ex => zkevm_transaction_batch.ex} (70%)
 rename apps/indexer/lib/indexer/fetcher/{zkevm_txn_batch.ex => zkevm_transaction_batch.ex} (95%)

diff --git a/apps/block_scout_web/lib/block_scout_web/chain.ex b/apps/block_scout_web/lib/block_scout_web/chain.ex
index 8af63dbc4e62..d29350f37b2d 100644
--- a/apps/block_scout_web/lib/block_scout_web/chain.ex
+++ b/apps/block_scout_web/lib/block_scout_web/chain.ex
@@ -35,7 +35,7 @@ defmodule BlockScoutWeb.Chain do
     Transaction.StateChange,
     Wei,
     Withdrawal,
-    ZkevmTxnBatch
+    ZkevmTransactionBatch
   }
 
   alias Explorer.PagingOptions
@@ -535,7 +535,7 @@ defmodule BlockScoutWeb.Chain do
     %{"index" => index}
   end
 
-  defp paging_params(%ZkevmTxnBatch{number: number}) do
+  defp paging_params(%ZkevmTransactionBatch{number: number}) do
     %{"number" => number}
   end
 
diff --git a/apps/explorer/lib/explorer/chain.ex b/apps/explorer/lib/explorer/chain.ex
index fbd791edb7ed..55f2afec5e09 100644
--- a/apps/explorer/lib/explorer/chain.ex
+++ b/apps/explorer/lib/explorer/chain.ex
@@ -65,8 +65,8 @@ defmodule Explorer.Chain do
     Transaction,
     Wei,
     Withdrawal,
-    ZkevmBatchTxn,
-    ZkevmTxnBatch
+    ZkevmBatchTransaction,
+    ZkevmTransactionBatch
   }
 
   alias Explorer.Chain.Block.{EmissionReward, Reward}
@@ -6396,7 +6396,7 @@ defmodule Explorer.Chain do
   def zkevm_batch(number, options \\ [])
 
   def zkevm_batch(:latest, options) when is_list(options) do
-    ZkevmTxnBatch
+    ZkevmTransactionBatch
     |> order_by(desc: :number)
     |> limit(1)
     |> select_repo(options).one()
@@ -6409,7 +6409,7 @@ defmodule Explorer.Chain do
   def zkevm_batch(number, options) when is_list(options) do
     necessity_by_association = Keyword.get(options, :necessity_by_association, %{})
 
-    ZkevmTxnBatch
+    ZkevmTransactionBatch
     |> where(number: ^number)
     |> join_associations(necessity_by_association)
     |> select_repo(options).one()
@@ -6442,7 +6442,7 @@ defmodule Explorer.Chain do
     necessity_by_association = Keyword.get(options, :necessity_by_association, %{})
 
     base_query =
-      from(tb in ZkevmTxnBatch,
+      from(tb in ZkevmTransactionBatch,
         order_by: [desc: tb.number]
       )
 
@@ -6465,7 +6465,7 @@ defmodule Explorer.Chain do
   end
 
   def zkevm_batch_transactions(batch_number, options \\ []) do
-    query = from(bts in ZkevmBatchTxn, where: bts.batch_number == ^batch_number)
+    query = from(bts in ZkevmBatchTransaction, where: bts.batch_number == ^batch_number)
 
     select_repo(options).all(query)
   end
diff --git a/apps/explorer/lib/explorer/chain/import/runner/zkevm_batch_txns.ex b/apps/explorer/lib/explorer/chain/import/runner/zkevm_batch_transactions.ex
similarity index 71%
rename from apps/explorer/lib/explorer/chain/import/runner/zkevm_batch_txns.ex
rename to apps/explorer/lib/explorer/chain/import/runner/zkevm_batch_transactions.ex
index f7ac950e0c19..858c6aa2b96c 100644
--- a/apps/explorer/lib/explorer/chain/import/runner/zkevm_batch_txns.ex
+++ b/apps/explorer/lib/explorer/chain/import/runner/zkevm_batch_transactions.ex
@@ -1,12 +1,12 @@
-defmodule Explorer.Chain.Import.Runner.ZkevmBatchTxns do
+defmodule Explorer.Chain.Import.Runner.ZkevmBatchTransactions do
   @moduledoc """
-  Bulk imports `t:Explorer.Chain.ZkevmBatchTxn.t/0`.
+  Bulk imports `t:Explorer.Chain.ZkevmBatchTransaction.t/0`.
   """
 
   require Ecto.Query
 
   alias Ecto.{Changeset, Multi, Repo}
-  alias Explorer.Chain.{Import, ZkevmBatchTxn}
+  alias Explorer.Chain.{Import, ZkevmBatchTransaction}
   alias Explorer.Prometheus.Instrumenter
 
   @behaviour Import.Runner
@@ -14,13 +14,13 @@ defmodule Explorer.Chain.Import.Runner.ZkevmBatchTxns do
   # milliseconds
   @timeout 60_000
 
-  @type imported :: [ZkevmBatchTxn.t()]
+  @type imported :: [ZkevmBatchTransaction.t()]
 
   @impl Import.Runner
-  def ecto_schema_module, do: ZkevmBatchTxn
+  def ecto_schema_module, do: ZkevmBatchTransaction
 
   @impl Import.Runner
-  def option_key, do: :zkevm_batch_txns
+  def option_key, do: :zkevm_batch_transactions
 
   @impl Import.Runner
   def imported_table_row do
@@ -39,12 +39,12 @@ defmodule Explorer.Chain.Import.Runner.ZkevmBatchTxns do
       |> Map.put_new(:timeout, @timeout)
       |> Map.put(:timestamps, timestamps)
 
-    Multi.run(multi, :insert_zkevm_batch_txns, fn repo, _ ->
+    Multi.run(multi, :insert_zkevm_batch_transactions, fn repo, _ ->
       Instrumenter.block_import_stage_runner(
         fn -> insert(repo, changes_list, insert_options) end,
         :block_referencing,
-        :zkevm_batch_txns,
-        :zkevm_batch_txns
+        :zkevm_batch_transactions,
+        :zkevm_batch_transactions
       )
     end)
   end
@@ -53,17 +53,17 @@ defmodule Explorer.Chain.Import.Runner.ZkevmBatchTxns do
   def timeout, do: @timeout
 
   @spec insert(Repo.t(), [map()], %{required(:timeout) => timeout(), required(:timestamps) => Import.timestamps()}) ::
-          {:ok, [ZkevmBatchTxn.t()]}
+          {:ok, [ZkevmBatchTransaction.t()]}
           | {:error, [Changeset.t()]}
   def insert(repo, changes_list, %{timeout: timeout, timestamps: timestamps} = _options) when is_list(changes_list) do
-    # Enforce ZkevmBatchTxn ShareLocks order (see docs: sharelock.md)
+    # Enforce ZkevmBatchTransaction ShareLocks order (see docs: sharelock.md)
     ordered_changes_list = Enum.sort_by(changes_list, & &1.hash)
 
     {:ok, inserted} =
       Import.insert_changes_list(
         repo,
         ordered_changes_list,
-        for: ZkevmBatchTxn,
+        for: ZkevmBatchTransaction,
         returning: true,
         timeout: timeout,
         timestamps: timestamps,
diff --git a/apps/explorer/lib/explorer/chain/import/runner/zkevm_lifecycle_txns.ex b/apps/explorer/lib/explorer/chain/import/runner/zkevm_lifecycle_transactions.ex
similarity index 76%
rename from apps/explorer/lib/explorer/chain/import/runner/zkevm_lifecycle_txns.ex
rename to apps/explorer/lib/explorer/chain/import/runner/zkevm_lifecycle_transactions.ex
index 55c79cbdfeb4..54ec73817295 100644
--- a/apps/explorer/lib/explorer/chain/import/runner/zkevm_lifecycle_txns.ex
+++ b/apps/explorer/lib/explorer/chain/import/runner/zkevm_lifecycle_transactions.ex
@@ -1,12 +1,12 @@
-defmodule Explorer.Chain.Import.Runner.ZkevmLifecycleTxns do
+defmodule Explorer.Chain.Import.Runner.ZkevmLifecycleTransactions do
   @moduledoc """
-  Bulk imports `t:Explorer.Chain.ZkevmLifecycleTxn.t/0`.
+  Bulk imports `t:Explorer.Chain.ZkevmLifecycleTransaction.t/0`.
   """
 
   require Ecto.Query
 
   alias Ecto.{Changeset, Multi, Repo}
-  alias Explorer.Chain.{Import, ZkevmLifecycleTxn}
+  alias Explorer.Chain.{Import, ZkevmLifecycleTransaction}
   alias Explorer.Prometheus.Instrumenter
 
   import Ecto.Query, only: [from: 2]
@@ -16,13 +16,13 @@ defmodule Explorer.Chain.Import.Runner.ZkevmLifecycleTxns do
   # milliseconds
   @timeout 60_000
 
-  @type imported :: [ZkevmLifecycleTxn.t()]
+  @type imported :: [ZkevmLifecycleTransaction.t()]
 
   @impl Import.Runner
-  def ecto_schema_module, do: ZkevmLifecycleTxn
+  def ecto_schema_module, do: ZkevmLifecycleTransaction
 
   @impl Import.Runner
-  def option_key, do: :zkevm_lifecycle_txns
+  def option_key, do: :zkevm_lifecycle_transactions
 
   @impl Import.Runner
   def imported_table_row do
@@ -41,12 +41,12 @@ defmodule Explorer.Chain.Import.Runner.ZkevmLifecycleTxns do
       |> Map.put_new(:timeout, @timeout)
       |> Map.put(:timestamps, timestamps)
 
-    Multi.run(multi, :insert_zkevm_lifecycle_txns, fn repo, _ ->
+    Multi.run(multi, :insert_zkevm_lifecycle_transactions, fn repo, _ ->
       Instrumenter.block_import_stage_runner(
         fn -> insert(repo, changes_list, insert_options) end,
         :block_referencing,
-        :zkevm_lifecycle_txns,
-        :zkevm_lifecycle_txns
+        :zkevm_lifecycle_transactions,
+        :zkevm_lifecycle_transactions
       )
     end)
   end
@@ -55,19 +55,19 @@ defmodule Explorer.Chain.Import.Runner.ZkevmLifecycleTxns do
   def timeout, do: @timeout
 
   @spec insert(Repo.t(), [map()], %{required(:timeout) => timeout(), required(:timestamps) => Import.timestamps()}) ::
-          {:ok, [ZkevmLifecycleTxn.t()]}
+          {:ok, [ZkevmLifecycleTransaction.t()]}
           | {:error, [Changeset.t()]}
   def 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 ZkevmLifecycleTxn ShareLocks order (see docs: sharelock.md)
+    # Enforce ZkevmLifecycleTransaction ShareLocks order (see docs: sharelock.md)
     ordered_changes_list = Enum.sort_by(changes_list, & &1.id)
 
     {:ok, inserted} =
       Import.insert_changes_list(
         repo,
         ordered_changes_list,
-        for: ZkevmLifecycleTxn,
+        for: ZkevmLifecycleTransaction,
         returning: true,
         timeout: timeout,
         timestamps: timestamps,
@@ -80,7 +80,7 @@ defmodule Explorer.Chain.Import.Runner.ZkevmLifecycleTxns do
 
   defp default_on_conflict do
     from(
-      tx in ZkevmLifecycleTxn,
+      tx in ZkevmLifecycleTransaction,
       update: [
         set: [
           # don't update `id` as it is a primary key 
diff --git a/apps/explorer/lib/explorer/chain/import/runner/zkevm_txn_batches.ex b/apps/explorer/lib/explorer/chain/import/runner/zkevm_transaction_batches.ex
similarity index 81%
rename from apps/explorer/lib/explorer/chain/import/runner/zkevm_txn_batches.ex
rename to apps/explorer/lib/explorer/chain/import/runner/zkevm_transaction_batches.ex
index 50bc93195db5..7844bce28326 100644
--- a/apps/explorer/lib/explorer/chain/import/runner/zkevm_txn_batches.ex
+++ b/apps/explorer/lib/explorer/chain/import/runner/zkevm_transaction_batches.ex
@@ -1,12 +1,12 @@
-defmodule Explorer.Chain.Import.Runner.ZkevmTxnBatches do
+defmodule Explorer.Chain.Import.Runner.ZkevmTransactionBatches do
   @moduledoc """
-  Bulk imports `t:Explorer.Chain.ZkevmTxnBatch.t/0`.
+  Bulk imports `t:Explorer.Chain.ZkevmTransactionBatch.t/0`.
   """
 
   require Ecto.Query
 
   alias Ecto.{Changeset, Multi, Repo}
-  alias Explorer.Chain.{Import, ZkevmTxnBatch}
+  alias Explorer.Chain.{Import, ZkevmTransactionBatch}
   alias Explorer.Prometheus.Instrumenter
 
   import Ecto.Query, only: [from: 2]
@@ -16,13 +16,13 @@ defmodule Explorer.Chain.Import.Runner.ZkevmTxnBatches do
   # milliseconds
   @timeout 60_000
 
-  @type imported :: [ZkevmTxnBatch.t()]
+  @type imported :: [ZkevmTransactionBatch.t()]
 
   @impl Import.Runner
-  def ecto_schema_module, do: ZkevmTxnBatch
+  def ecto_schema_module, do: ZkevmTransactionBatch
 
   @impl Import.Runner
-  def option_key, do: :zkevm_txn_batches
+  def option_key, do: :zkevm_transaction_batches
 
   @impl Import.Runner
   def imported_table_row do
@@ -41,12 +41,12 @@ defmodule Explorer.Chain.Import.Runner.ZkevmTxnBatches do
       |> Map.put_new(:timeout, @timeout)
       |> Map.put(:timestamps, timestamps)
 
-    Multi.run(multi, :insert_zkevm_txn_batches, fn repo, _ ->
+    Multi.run(multi, :insert_zkevm_transaction_batches, fn repo, _ ->
       Instrumenter.block_import_stage_runner(
         fn -> insert(repo, changes_list, insert_options) end,
         :block_referencing,
-        :zkevm_txn_batches,
-        :zkevm_txn_batches
+        :zkevm_transaction_batches,
+        :zkevm_transaction_batches
       )
     end)
   end
@@ -55,19 +55,19 @@ defmodule Explorer.Chain.Import.Runner.ZkevmTxnBatches do
   def timeout, do: @timeout
 
   @spec insert(Repo.t(), [map()], %{required(:timeout) => timeout(), required(:timestamps) => Import.timestamps()}) ::
-          {:ok, [ZkevmTxnBatch.t()]}
+          {:ok, [ZkevmTransactionBatch.t()]}
           | {:error, [Changeset.t()]}
   def 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 ZkevmTxnBatch ShareLocks order (see docs: sharelock.md)
+    # Enforce ZkevmTransactionBatch ShareLocks order (see docs: sharelock.md)
     ordered_changes_list = Enum.sort_by(changes_list, & &1.number)
 
     {:ok, inserted} =
       Import.insert_changes_list(
         repo,
         ordered_changes_list,
-        for: ZkevmTxnBatch,
+        for: ZkevmTransactionBatch,
         returning: true,
         timeout: timeout,
         timestamps: timestamps,
@@ -80,7 +80,7 @@ defmodule Explorer.Chain.Import.Runner.ZkevmTxnBatches do
 
   defp default_on_conflict do
     from(
-      tb in ZkevmTxnBatch,
+      tb in ZkevmTransactionBatch,
       update: [
         set: [
           # don't update `number` as it is a primary key and used for the conflict target
diff --git a/apps/explorer/lib/explorer/chain/import/stage/block_referencing.ex b/apps/explorer/lib/explorer/chain/import/stage/block_referencing.ex
index 99ae4be58fa7..1e1540b9e29d 100644
--- a/apps/explorer/lib/explorer/chain/import/stage/block_referencing.ex
+++ b/apps/explorer/lib/explorer/chain/import/stage/block_referencing.ex
@@ -33,9 +33,9 @@ defmodule Explorer.Chain.Import.Stage.BlockReferencing do
       "polygon_zkevm" ->
         @default_runners ++
           [
-            Runner.ZkevmLifecycleTxns,
-            Runner.ZkevmTxnBatches,
-            Runner.ZkevmBatchTxns
+            Runner.ZkevmLifecycleTransactions,
+            Runner.ZkevmTransactionBatches,
+            Runner.ZkevmBatchTransactions
           ]
       _ -> @default_runners
     end
diff --git a/apps/explorer/lib/explorer/chain/transaction.ex b/apps/explorer/lib/explorer/chain/transaction.ex
index cf4c2730ba33..d88d19527ead 100644
--- a/apps/explorer/lib/explorer/chain/transaction.ex
+++ b/apps/explorer/lib/explorer/chain/transaction.ex
@@ -28,7 +28,7 @@ defmodule Explorer.Chain.Transaction do
     Transaction,
     TransactionAction,
     Wei,
-    ZkevmBatchTxn
+    ZkevmBatchTransaction
   }
 
   alias Explorer.Chain.Transaction.{Fork, Status}
@@ -276,8 +276,8 @@ defmodule Explorer.Chain.Transaction do
 
     has_many(:uncles, through: [:forks, :uncle])
 
-    has_one(:zkevm_batch_txn, ZkevmBatchTxn, foreign_key: :hash)
-    has_one(:zkevm_batch, through: [:zkevm_batch_txn, :batch])
+    has_one(:zkevm_batch_transaction, ZkevmBatchTransaction, foreign_key: :hash)
+    has_one(:zkevm_batch, through: [:zkevm_batch_transaction, :batch])
     has_one(:zkevm_sequence_txn, through: [:zkevm_batch, :sequence_transaction])
     has_one(:zkevm_verify_txn, through: [:zkevm_batch, :verify_transaction])
 
diff --git a/apps/explorer/lib/explorer/chain/zkevm_batch_txn.ex b/apps/explorer/lib/explorer/chain/zkevm_batch_transaction.ex
similarity index 71%
rename from apps/explorer/lib/explorer/chain/zkevm_batch_txn.ex
rename to apps/explorer/lib/explorer/chain/zkevm_batch_transaction.ex
index 609c1261d571..273ea39300ac 100644
--- a/apps/explorer/lib/explorer/chain/zkevm_batch_txn.ex
+++ b/apps/explorer/lib/explorer/chain/zkevm_batch_transaction.ex
@@ -1,22 +1,22 @@
-defmodule Explorer.Chain.ZkevmBatchTxn do
+defmodule Explorer.Chain.ZkevmBatchTransaction do
   @moduledoc "Models a list of transactions related to a batch for zkEVM."
 
   use Explorer.Schema
 
-  alias Explorer.Chain.{Hash, Transaction, ZkevmTxnBatch}
+  alias Explorer.Chain.{Hash, Transaction, ZkevmTransactionBatch}
 
   @required_attrs ~w(batch_number hash)a
 
   @type t :: %__MODULE__{
           batch_number: non_neg_integer(),
-          batch: %Ecto.Association.NotLoaded{} | ZkevmTxnBatch.t() | nil,
+          batch: %Ecto.Association.NotLoaded{} | ZkevmTransactionBatch.t() | nil,
           hash: Hash.t(),
           l2_transaction: %Ecto.Association.NotLoaded{} | Transaction.t() | nil
         }
 
   @primary_key false
   schema "zkevm_batch_l2_transactions" do
-    belongs_to(:batch, ZkevmTxnBatch, foreign_key: :batch_number, references: :number, type: :integer)
+    belongs_to(:batch, ZkevmTransactionBatch, foreign_key: :batch_number, references: :number, type: :integer)
     belongs_to(:l2_transaction, Transaction, foreign_key: :hash, primary_key: true, references: :hash, type: Hash.Full)
 
     timestamps()
diff --git a/apps/explorer/lib/explorer/chain/zkevm_lifecycle_txn.ex b/apps/explorer/lib/explorer/chain/zkevm_lifecycle_transaction.ex
similarity index 68%
rename from apps/explorer/lib/explorer/chain/zkevm_lifecycle_txn.ex
rename to apps/explorer/lib/explorer/chain/zkevm_lifecycle_transaction.ex
index 2ab3ed9b171f..d8472ccf7e6a 100644
--- a/apps/explorer/lib/explorer/chain/zkevm_lifecycle_txn.ex
+++ b/apps/explorer/lib/explorer/chain/zkevm_lifecycle_transaction.ex
@@ -1,9 +1,9 @@
-defmodule Explorer.Chain.ZkevmLifecycleTxn do
+defmodule Explorer.Chain.ZkevmLifecycleTransaction do
   @moduledoc "Models an L1 lifecycle transaction for zkEVM."
 
   use Explorer.Schema
 
-  alias Explorer.Chain.{Hash, ZkevmTxnBatch}
+  alias Explorer.Chain.{Hash, ZkevmTransactionBatch}
 
   @required_attrs ~w(id hash is_verify)a
 
@@ -17,8 +17,8 @@ defmodule Explorer.Chain.ZkevmLifecycleTxn do
     field(:hash, Hash.Full)
     field(:is_verify, :boolean)
 
-    has_many(:sequenced_batches, ZkevmTxnBatch, foreign_key: :sequence_id)
-    has_many(:verified_batches, ZkevmTxnBatch, foreign_key: :verify_id)
+    has_many(:sequenced_batches, ZkevmTransactionBatch, foreign_key: :sequence_id)
+    has_many(:verified_batches, ZkevmTransactionBatch, foreign_key: :verify_id)
 
     timestamps()
   end
diff --git a/apps/explorer/lib/explorer/chain/zkevm_txn_batch.ex b/apps/explorer/lib/explorer/chain/zkevm_transaction_batch.ex
similarity index 70%
rename from apps/explorer/lib/explorer/chain/zkevm_txn_batch.ex
rename to apps/explorer/lib/explorer/chain/zkevm_transaction_batch.ex
index 77c50c1c0ff0..c98bcb548c55 100644
--- a/apps/explorer/lib/explorer/chain/zkevm_txn_batch.ex
+++ b/apps/explorer/lib/explorer/chain/zkevm_transaction_batch.ex
@@ -1,9 +1,9 @@
-defmodule Explorer.Chain.ZkevmTxnBatch do
+defmodule Explorer.Chain.ZkevmTransactionBatch do
   @moduledoc "Models a batch of transactions for zkEVM."
 
   use Explorer.Schema
 
-  alias Explorer.Chain.{Hash, ZkevmBatchTxn, ZkevmLifecycleTxn}
+  alias Explorer.Chain.{Hash, ZkevmBatchTransaction, ZkevmLifecycleTransaction}
 
   @optional_attrs ~w(sequence_id verify_id)a
 
@@ -17,10 +17,10 @@ defmodule Explorer.Chain.ZkevmTxnBatch do
           acc_input_hash: Hash.t(),
           state_root: Hash.t(),
           sequence_id: non_neg_integer() | nil,
-          sequence_transaction: %Ecto.Association.NotLoaded{} | ZkevmLifecycleTxn.t() | nil,
+          sequence_transaction: %Ecto.Association.NotLoaded{} | ZkevmLifecycleTransaction.t() | nil,
           verify_id: non_neg_integer() | nil,
-          verify_transaction: %Ecto.Association.NotLoaded{} | ZkevmLifecycleTxn.t() | nil,
-          l2_transactions: %Ecto.Association.NotLoaded{} | [ZkevmBatchTxn.t()]
+          verify_transaction: %Ecto.Association.NotLoaded{} | ZkevmLifecycleTransaction.t() | nil,
+          l2_transactions: %Ecto.Association.NotLoaded{} | [ZkevmBatchTransaction.t()]
         }
 
   @primary_key {:number, :integer, autogenerate: false}
@@ -31,10 +31,15 @@ defmodule Explorer.Chain.ZkevmTxnBatch do
     field(:acc_input_hash, Hash.Full)
     field(:state_root, Hash.Full)
 
-    belongs_to(:sequence_transaction, ZkevmLifecycleTxn, foreign_key: :sequence_id, references: :id, type: :integer)
-    belongs_to(:verify_transaction, ZkevmLifecycleTxn, foreign_key: :verify_id, references: :id, type: :integer)
+    belongs_to(:sequence_transaction, ZkevmLifecycleTransaction,
+      foreign_key: :sequence_id,
+      references: :id,
+      type: :integer
+    )
 
-    has_many(:l2_transactions, ZkevmBatchTxn, foreign_key: :batch_number)
+    belongs_to(:verify_transaction, ZkevmLifecycleTransaction, foreign_key: :verify_id, references: :id, type: :integer)
+
+    has_many(:l2_transactions, ZkevmBatchTransaction, foreign_key: :batch_number)
 
     timestamps()
   end
diff --git a/apps/indexer/lib/indexer/fetcher/zkevm_txn_batch.ex b/apps/indexer/lib/indexer/fetcher/zkevm_transaction_batch.ex
similarity index 95%
rename from apps/indexer/lib/indexer/fetcher/zkevm_txn_batch.ex
rename to apps/indexer/lib/indexer/fetcher/zkevm_transaction_batch.ex
index 10316acfd7ea..8cde602aa187 100644
--- a/apps/indexer/lib/indexer/fetcher/zkevm_txn_batch.ex
+++ b/apps/indexer/lib/indexer/fetcher/zkevm_transaction_batch.ex
@@ -1,4 +1,4 @@
-defmodule Indexer.Fetcher.ZkevmTxnBatch do
+defmodule Indexer.Fetcher.ZkevmTransactionBatch do
   @moduledoc """
   Fills zkevm_transaction_batches DB table.
   """
@@ -13,7 +13,7 @@ defmodule Indexer.Fetcher.ZkevmTxnBatch do
   import EthereumJSONRPC, only: [integer_to_quantity: 1, json_rpc: 2, quantity_to_integer: 1]
 
   alias Explorer.{Chain, Repo}
-  alias Explorer.Chain.{ZkevmLifecycleTxn, ZkevmTxnBatch}
+  alias Explorer.Chain.{ZkevmLifecycleTransaction, ZkevmTransactionBatch}
 
   @zero_hash "0000000000000000000000000000000000000000000000000000000000000000"
 
@@ -34,9 +34,9 @@ defmodule Indexer.Fetcher.ZkevmTxnBatch do
 
   @impl GenServer
   def init(args) do
-    Logger.metadata(fetcher: :zkevm_txn_batches)
+    Logger.metadata(fetcher: :zkevm_transaction_batches)
 
-    config = Application.get_all_env(:indexer)[Indexer.Fetcher.ZkevmTxnBatch]
+    config = Application.get_all_env(:indexer)[Indexer.Fetcher.ZkevmTransactionBatch]
     chunk_size = config[:chunk_size]
     recheck_interval = config[:recheck_interval]
 
@@ -113,7 +113,7 @@ defmodule Indexer.Fetcher.ZkevmTxnBatch do
 
   defp get_last_verified_batch_number do
     query =
-      from(tb in ZkevmTxnBatch,
+      from(tb in ZkevmTransactionBatch,
         select: tb.number,
         where: not is_nil(tb.verify_id),
         order_by: [desc: tb.number],
@@ -127,7 +127,7 @@ defmodule Indexer.Fetcher.ZkevmTxnBatch do
 
   defp get_next_id do
     query =
-      from(lt in ZkevmLifecycleTxn,
+      from(lt in ZkevmLifecycleTransaction,
         select: lt.id,
         order_by: [desc: lt.id],
         limit: 1
@@ -228,7 +228,7 @@ defmodule Indexer.Fetcher.ZkevmTxnBatch do
 
     query =
       from(
-        lt in ZkevmLifecycleTxn,
+        lt in ZkevmLifecycleTransaction,
         select: {lt.hash, lt.id},
         where: lt.hash in ^l1_tx_hashes
       )
@@ -287,9 +287,9 @@ defmodule Indexer.Fetcher.ZkevmTxnBatch do
 
     {:ok, _} =
       Chain.import(%{
-        zkevm_lifecycle_txns: %{params: l1_txs_to_import},
-        zkevm_txn_batches: %{params: batches_to_import},
-        zkevm_batch_txns: %{params: l2_txs_to_import},
+        zkevm_lifecycle_transactions: %{params: l1_txs_to_import},
+        zkevm_transaction_batches: %{params: batches_to_import},
+        zkevm_batch_transactions: %{params: l2_txs_to_import},
         timeout: :infinity
       })
   end
diff --git a/apps/indexer/lib/indexer/supervisor.ex b/apps/indexer/lib/indexer/supervisor.ex
index ea631014735f..33da436938ad 100644
--- a/apps/indexer/lib/indexer/supervisor.ex
+++ b/apps/indexer/lib/indexer/supervisor.ex
@@ -35,7 +35,7 @@ defmodule Indexer.Supervisor do
     TransactionAction,
     UncleBlock,
     Withdrawal,
-    ZkevmTxnBatch
+    ZkevmTransactionBatch
   }
 
   alias Indexer.Temporary.{
@@ -133,7 +133,7 @@ defmodule Indexer.Supervisor do
         {Indexer.Fetcher.PolygonEdge.Withdrawal.Supervisor,
          [[memory_monitor: memory_monitor, json_rpc_named_arguments: json_rpc_named_arguments]]},
         {Indexer.Fetcher.PolygonEdge.WithdrawalExit.Supervisor, [[memory_monitor: memory_monitor]]},
-        configure(ZkevmTxnBatch.Supervisor, [
+        configure(ZkevmTransactionBatch.Supervisor, [
           [json_rpc_named_arguments: json_rpc_named_arguments, memory_monitor: memory_monitor]
         ]),
 

From a82c8bd2a378f62ed6a40bf19878a402ba36ab58 Mon Sep 17 00:00:00 2001
From: POA <33550681+poa@users.noreply.github.com>
Date: Tue, 12 Sep 2023 11:06:23 +0300
Subject: [PATCH 568/909] Move zkevm_* files into a separate folder

---
 .../lib/block_scout_web/chain.ex              |  6 +++---
 apps/explorer/lib/explorer/chain.ex           | 14 +++++++-------
 .../batch_transactions.ex}                    | 17 +++++++++--------
 .../lifecycle_transactions.ex}                | 19 ++++++++++---------
 .../transaction_batches.ex}                   | 19 ++++++++++---------
 .../chain/import/stage/block_referencing.ex   |  6 +++---
 .../lib/explorer/chain/transaction.ex         |  6 +++---
 .../batch_transaction.ex}                     |  9 +++++----
 .../lifecycle_transaction.ex}                 |  9 +++++----
 .../transaction_batch.ex}                     | 17 +++++++++--------
 .../transaction_batch.ex}                     | 12 ++++++------
 apps/indexer/lib/indexer/supervisor.ex        |  7 ++++---
 12 files changed, 74 insertions(+), 67 deletions(-)
 rename apps/explorer/lib/explorer/chain/import/runner/{zkevm_batch_transactions.ex => zkevm/batch_transactions.ex} (79%)
 rename apps/explorer/lib/explorer/chain/import/runner/{zkevm_lifecycle_transactions.ex => zkevm/lifecycle_transactions.ex} (82%)
 rename apps/explorer/lib/explorer/chain/import/runner/{zkevm_transaction_batches.ex => zkevm/transaction_batches.ex} (86%)
 rename apps/explorer/lib/explorer/chain/{zkevm_batch_transaction.ex => zkevm/batch_transaction.ex} (70%)
 rename apps/explorer/lib/explorer/chain/{zkevm_lifecycle_transaction.ex => zkevm/lifecycle_transaction.ex} (67%)
 rename apps/explorer/lib/explorer/chain/{zkevm_transaction_batch.ex => zkevm/transaction_batch.ex} (68%)
 rename apps/indexer/lib/indexer/fetcher/{zkevm_transaction_batch.ex => zkevm/transaction_batch.ex} (97%)

diff --git a/apps/block_scout_web/lib/block_scout_web/chain.ex b/apps/block_scout_web/lib/block_scout_web/chain.ex
index d29350f37b2d..9098743075ff 100644
--- a/apps/block_scout_web/lib/block_scout_web/chain.ex
+++ b/apps/block_scout_web/lib/block_scout_web/chain.ex
@@ -34,10 +34,10 @@ defmodule BlockScoutWeb.Chain do
     Transaction,
     Transaction.StateChange,
     Wei,
-    Withdrawal,
-    ZkevmTransactionBatch
+    Withdrawal
   }
 
+  alias Explorer.Chain.Zkevm.TransactionBatch
   alias Explorer.PagingOptions
 
   defimpl Poison.Encoder, for: Decimal do
@@ -535,7 +535,7 @@ defmodule BlockScoutWeb.Chain do
     %{"index" => index}
   end
 
-  defp paging_params(%ZkevmTransactionBatch{number: number}) do
+  defp paging_params(%TransactionBatch{number: number}) do
     %{"number" => number}
   end
 
diff --git a/apps/explorer/lib/explorer/chain.ex b/apps/explorer/lib/explorer/chain.ex
index 55f2afec5e09..44ce782e7f94 100644
--- a/apps/explorer/lib/explorer/chain.ex
+++ b/apps/explorer/lib/explorer/chain.ex
@@ -64,11 +64,11 @@ defmodule Explorer.Chain do
     TokenTransfer,
     Transaction,
     Wei,
-    Withdrawal,
-    ZkevmBatchTransaction,
-    ZkevmTransactionBatch
+    Withdrawal
   }
 
+  alias Explorer.Chain.Zkevm.{BatchTransaction, TransactionBatch}
+
   alias Explorer.Chain.Block.{EmissionReward, Reward}
 
   alias Explorer.Chain.Cache.{
@@ -6396,7 +6396,7 @@ defmodule Explorer.Chain do
   def zkevm_batch(number, options \\ [])
 
   def zkevm_batch(:latest, options) when is_list(options) do
-    ZkevmTransactionBatch
+    TransactionBatch
     |> order_by(desc: :number)
     |> limit(1)
     |> select_repo(options).one()
@@ -6409,7 +6409,7 @@ defmodule Explorer.Chain do
   def zkevm_batch(number, options) when is_list(options) do
     necessity_by_association = Keyword.get(options, :necessity_by_association, %{})
 
-    ZkevmTransactionBatch
+    TransactionBatch
     |> where(number: ^number)
     |> join_associations(necessity_by_association)
     |> select_repo(options).one()
@@ -6442,7 +6442,7 @@ defmodule Explorer.Chain do
     necessity_by_association = Keyword.get(options, :necessity_by_association, %{})
 
     base_query =
-      from(tb in ZkevmTransactionBatch,
+      from(tb in TransactionBatch,
         order_by: [desc: tb.number]
       )
 
@@ -6465,7 +6465,7 @@ defmodule Explorer.Chain do
   end
 
   def zkevm_batch_transactions(batch_number, options \\ []) do
-    query = from(bts in ZkevmBatchTransaction, where: bts.batch_number == ^batch_number)
+    query = from(bts in BatchTransaction, where: bts.batch_number == ^batch_number)
 
     select_repo(options).all(query)
   end
diff --git a/apps/explorer/lib/explorer/chain/import/runner/zkevm_batch_transactions.ex b/apps/explorer/lib/explorer/chain/import/runner/zkevm/batch_transactions.ex
similarity index 79%
rename from apps/explorer/lib/explorer/chain/import/runner/zkevm_batch_transactions.ex
rename to apps/explorer/lib/explorer/chain/import/runner/zkevm/batch_transactions.ex
index 858c6aa2b96c..997f53a51705 100644
--- a/apps/explorer/lib/explorer/chain/import/runner/zkevm_batch_transactions.ex
+++ b/apps/explorer/lib/explorer/chain/import/runner/zkevm/batch_transactions.ex
@@ -1,12 +1,13 @@
-defmodule Explorer.Chain.Import.Runner.ZkevmBatchTransactions do
+defmodule Explorer.Chain.Import.Runner.Zkevm.BatchTransactions do
   @moduledoc """
-  Bulk imports `t:Explorer.Chain.ZkevmBatchTransaction.t/0`.
+  Bulk imports `t:Explorer.Chain.Zkevm.BatchTransaction.t/0`.
   """
 
   require Ecto.Query
 
   alias Ecto.{Changeset, Multi, Repo}
-  alias Explorer.Chain.{Import, ZkevmBatchTransaction}
+  alias Explorer.Chain.Import
+  alias Explorer.Chain.Zkevm.BatchTransaction
   alias Explorer.Prometheus.Instrumenter
 
   @behaviour Import.Runner
@@ -14,10 +15,10 @@ defmodule Explorer.Chain.Import.Runner.ZkevmBatchTransactions do
   # milliseconds
   @timeout 60_000
 
-  @type imported :: [ZkevmBatchTransaction.t()]
+  @type imported :: [BatchTransaction.t()]
 
   @impl Import.Runner
-  def ecto_schema_module, do: ZkevmBatchTransaction
+  def ecto_schema_module, do: BatchTransaction
 
   @impl Import.Runner
   def option_key, do: :zkevm_batch_transactions
@@ -53,17 +54,17 @@ defmodule Explorer.Chain.Import.Runner.ZkevmBatchTransactions do
   def timeout, do: @timeout
 
   @spec insert(Repo.t(), [map()], %{required(:timeout) => timeout(), required(:timestamps) => Import.timestamps()}) ::
-          {:ok, [ZkevmBatchTransaction.t()]}
+          {:ok, [BatchTransaction.t()]}
           | {:error, [Changeset.t()]}
   def insert(repo, changes_list, %{timeout: timeout, timestamps: timestamps} = _options) when is_list(changes_list) do
-    # Enforce ZkevmBatchTransaction ShareLocks order (see docs: sharelock.md)
+    # Enforce Zkevm.BatchTransaction ShareLocks order (see docs: sharelock.md)
     ordered_changes_list = Enum.sort_by(changes_list, & &1.hash)
 
     {:ok, inserted} =
       Import.insert_changes_list(
         repo,
         ordered_changes_list,
-        for: ZkevmBatchTransaction,
+        for: BatchTransaction,
         returning: true,
         timeout: timeout,
         timestamps: timestamps,
diff --git a/apps/explorer/lib/explorer/chain/import/runner/zkevm_lifecycle_transactions.ex b/apps/explorer/lib/explorer/chain/import/runner/zkevm/lifecycle_transactions.ex
similarity index 82%
rename from apps/explorer/lib/explorer/chain/import/runner/zkevm_lifecycle_transactions.ex
rename to apps/explorer/lib/explorer/chain/import/runner/zkevm/lifecycle_transactions.ex
index 54ec73817295..504b5e609afd 100644
--- a/apps/explorer/lib/explorer/chain/import/runner/zkevm_lifecycle_transactions.ex
+++ b/apps/explorer/lib/explorer/chain/import/runner/zkevm/lifecycle_transactions.ex
@@ -1,12 +1,13 @@
-defmodule Explorer.Chain.Import.Runner.ZkevmLifecycleTransactions do
+defmodule Explorer.Chain.Import.Runner.Zkevm.LifecycleTransactions do
   @moduledoc """
-  Bulk imports `t:Explorer.Chain.ZkevmLifecycleTransaction.t/0`.
+  Bulk imports `t:Explorer.Chain.Zkevm.LifecycleTransaction.t/0`.
   """
 
   require Ecto.Query
 
   alias Ecto.{Changeset, Multi, Repo}
-  alias Explorer.Chain.{Import, ZkevmLifecycleTransaction}
+  alias Explorer.Chain.Import
+  alias Explorer.Chain.Zkevm.LifecycleTransaction
   alias Explorer.Prometheus.Instrumenter
 
   import Ecto.Query, only: [from: 2]
@@ -16,10 +17,10 @@ defmodule Explorer.Chain.Import.Runner.ZkevmLifecycleTransactions do
   # milliseconds
   @timeout 60_000
 
-  @type imported :: [ZkevmLifecycleTransaction.t()]
+  @type imported :: [LifecycleTransaction.t()]
 
   @impl Import.Runner
-  def ecto_schema_module, do: ZkevmLifecycleTransaction
+  def ecto_schema_module, do: LifecycleTransaction
 
   @impl Import.Runner
   def option_key, do: :zkevm_lifecycle_transactions
@@ -55,19 +56,19 @@ defmodule Explorer.Chain.Import.Runner.ZkevmLifecycleTransactions do
   def timeout, do: @timeout
 
   @spec insert(Repo.t(), [map()], %{required(:timeout) => timeout(), required(:timestamps) => Import.timestamps()}) ::
-          {:ok, [ZkevmLifecycleTransaction.t()]}
+          {:ok, [LifecycleTransaction.t()]}
           | {:error, [Changeset.t()]}
   def 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 ZkevmLifecycleTransaction ShareLocks order (see docs: sharelock.md)
+    # Enforce Zkevm.LifecycleTransaction ShareLocks order (see docs: sharelock.md)
     ordered_changes_list = Enum.sort_by(changes_list, & &1.id)
 
     {:ok, inserted} =
       Import.insert_changes_list(
         repo,
         ordered_changes_list,
-        for: ZkevmLifecycleTransaction,
+        for: LifecycleTransaction,
         returning: true,
         timeout: timeout,
         timestamps: timestamps,
@@ -80,7 +81,7 @@ defmodule Explorer.Chain.Import.Runner.ZkevmLifecycleTransactions do
 
   defp default_on_conflict do
     from(
-      tx in ZkevmLifecycleTransaction,
+      tx in LifecycleTransaction,
       update: [
         set: [
           # don't update `id` as it is a primary key 
diff --git a/apps/explorer/lib/explorer/chain/import/runner/zkevm_transaction_batches.ex b/apps/explorer/lib/explorer/chain/import/runner/zkevm/transaction_batches.ex
similarity index 86%
rename from apps/explorer/lib/explorer/chain/import/runner/zkevm_transaction_batches.ex
rename to apps/explorer/lib/explorer/chain/import/runner/zkevm/transaction_batches.ex
index 7844bce28326..37404436584a 100644
--- a/apps/explorer/lib/explorer/chain/import/runner/zkevm_transaction_batches.ex
+++ b/apps/explorer/lib/explorer/chain/import/runner/zkevm/transaction_batches.ex
@@ -1,12 +1,13 @@
-defmodule Explorer.Chain.Import.Runner.ZkevmTransactionBatches do
+defmodule Explorer.Chain.Import.Runner.Zkevm.TransactionBatches do
   @moduledoc """
-  Bulk imports `t:Explorer.Chain.ZkevmTransactionBatch.t/0`.
+  Bulk imports `t:Explorer.Chain.Zkevm.TransactionBatch.t/0`.
   """
 
   require Ecto.Query
 
   alias Ecto.{Changeset, Multi, Repo}
-  alias Explorer.Chain.{Import, ZkevmTransactionBatch}
+  alias Explorer.Chain.Import
+  alias Explorer.Chain.Zkevm.TransactionBatch
   alias Explorer.Prometheus.Instrumenter
 
   import Ecto.Query, only: [from: 2]
@@ -16,10 +17,10 @@ defmodule Explorer.Chain.Import.Runner.ZkevmTransactionBatches do
   # milliseconds
   @timeout 60_000
 
-  @type imported :: [ZkevmTransactionBatch.t()]
+  @type imported :: [TransactionBatch.t()]
 
   @impl Import.Runner
-  def ecto_schema_module, do: ZkevmTransactionBatch
+  def ecto_schema_module, do: TransactionBatch
 
   @impl Import.Runner
   def option_key, do: :zkevm_transaction_batches
@@ -55,19 +56,19 @@ defmodule Explorer.Chain.Import.Runner.ZkevmTransactionBatches do
   def timeout, do: @timeout
 
   @spec insert(Repo.t(), [map()], %{required(:timeout) => timeout(), required(:timestamps) => Import.timestamps()}) ::
-          {:ok, [ZkevmTransactionBatch.t()]}
+          {:ok, [TransactionBatch.t()]}
           | {:error, [Changeset.t()]}
   def 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 ZkevmTransactionBatch ShareLocks order (see docs: sharelock.md)
+    # Enforce Zkevm.TransactionBatch ShareLocks order (see docs: sharelock.md)
     ordered_changes_list = Enum.sort_by(changes_list, & &1.number)
 
     {:ok, inserted} =
       Import.insert_changes_list(
         repo,
         ordered_changes_list,
-        for: ZkevmTransactionBatch,
+        for: TransactionBatch,
         returning: true,
         timeout: timeout,
         timestamps: timestamps,
@@ -80,7 +81,7 @@ defmodule Explorer.Chain.Import.Runner.ZkevmTransactionBatches do
 
   defp default_on_conflict do
     from(
-      tb in ZkevmTransactionBatch,
+      tb in TransactionBatch,
       update: [
         set: [
           # don't update `number` as it is a primary key and used for the conflict target
diff --git a/apps/explorer/lib/explorer/chain/import/stage/block_referencing.ex b/apps/explorer/lib/explorer/chain/import/stage/block_referencing.ex
index 1e1540b9e29d..4c3f27e412ba 100644
--- a/apps/explorer/lib/explorer/chain/import/stage/block_referencing.ex
+++ b/apps/explorer/lib/explorer/chain/import/stage/block_referencing.ex
@@ -33,9 +33,9 @@ defmodule Explorer.Chain.Import.Stage.BlockReferencing do
       "polygon_zkevm" ->
         @default_runners ++
           [
-            Runner.ZkevmLifecycleTransactions,
-            Runner.ZkevmTransactionBatches,
-            Runner.ZkevmBatchTransactions
+            Runner.Zkevm.LifecycleTransactions,
+            Runner.Zkevm.TransactionBatches,
+            Runner.Zkevm.BatchTransactions
           ]
       _ -> @default_runners
     end
diff --git a/apps/explorer/lib/explorer/chain/transaction.ex b/apps/explorer/lib/explorer/chain/transaction.ex
index d88d19527ead..197721cf3b7b 100644
--- a/apps/explorer/lib/explorer/chain/transaction.ex
+++ b/apps/explorer/lib/explorer/chain/transaction.ex
@@ -27,11 +27,11 @@ defmodule Explorer.Chain.Transaction do
     TokenTransfer,
     Transaction,
     TransactionAction,
-    Wei,
-    ZkevmBatchTransaction
+    Wei
   }
 
   alias Explorer.Chain.Transaction.{Fork, Status}
+  alias Explorer.Chain.Zkevm.BatchTransaction
   alias Explorer.SmartContract.SigProviderInterface
 
   @optional_attrs ~w(max_priority_fee_per_gas max_fee_per_gas block_hash block_number created_contract_address_hash cumulative_gas_used earliest_processing_start
@@ -276,7 +276,7 @@ defmodule Explorer.Chain.Transaction do
 
     has_many(:uncles, through: [:forks, :uncle])
 
-    has_one(:zkevm_batch_transaction, ZkevmBatchTransaction, foreign_key: :hash)
+    has_one(:zkevm_batch_transaction, BatchTransaction, foreign_key: :hash)
     has_one(:zkevm_batch, through: [:zkevm_batch_transaction, :batch])
     has_one(:zkevm_sequence_txn, through: [:zkevm_batch, :sequence_transaction])
     has_one(:zkevm_verify_txn, through: [:zkevm_batch, :verify_transaction])
diff --git a/apps/explorer/lib/explorer/chain/zkevm_batch_transaction.ex b/apps/explorer/lib/explorer/chain/zkevm/batch_transaction.ex
similarity index 70%
rename from apps/explorer/lib/explorer/chain/zkevm_batch_transaction.ex
rename to apps/explorer/lib/explorer/chain/zkevm/batch_transaction.ex
index 273ea39300ac..1dc780ebf264 100644
--- a/apps/explorer/lib/explorer/chain/zkevm_batch_transaction.ex
+++ b/apps/explorer/lib/explorer/chain/zkevm/batch_transaction.ex
@@ -1,22 +1,23 @@
-defmodule Explorer.Chain.ZkevmBatchTransaction do
+defmodule Explorer.Chain.Zkevm.BatchTransaction do
   @moduledoc "Models a list of transactions related to a batch for zkEVM."
 
   use Explorer.Schema
 
-  alias Explorer.Chain.{Hash, Transaction, ZkevmTransactionBatch}
+  alias Explorer.Chain.{Hash, Transaction}
+  alias Explorer.Chain.Zkevm.TransactionBatch
 
   @required_attrs ~w(batch_number hash)a
 
   @type t :: %__MODULE__{
           batch_number: non_neg_integer(),
-          batch: %Ecto.Association.NotLoaded{} | ZkevmTransactionBatch.t() | nil,
+          batch: %Ecto.Association.NotLoaded{} | TransactionBatch.t() | nil,
           hash: Hash.t(),
           l2_transaction: %Ecto.Association.NotLoaded{} | Transaction.t() | nil
         }
 
   @primary_key false
   schema "zkevm_batch_l2_transactions" do
-    belongs_to(:batch, ZkevmTransactionBatch, foreign_key: :batch_number, references: :number, type: :integer)
+    belongs_to(:batch, TransactionBatch, foreign_key: :batch_number, references: :number, type: :integer)
     belongs_to(:l2_transaction, Transaction, foreign_key: :hash, primary_key: true, references: :hash, type: Hash.Full)
 
     timestamps()
diff --git a/apps/explorer/lib/explorer/chain/zkevm_lifecycle_transaction.ex b/apps/explorer/lib/explorer/chain/zkevm/lifecycle_transaction.ex
similarity index 67%
rename from apps/explorer/lib/explorer/chain/zkevm_lifecycle_transaction.ex
rename to apps/explorer/lib/explorer/chain/zkevm/lifecycle_transaction.ex
index d8472ccf7e6a..dc81b4a81bc1 100644
--- a/apps/explorer/lib/explorer/chain/zkevm_lifecycle_transaction.ex
+++ b/apps/explorer/lib/explorer/chain/zkevm/lifecycle_transaction.ex
@@ -1,9 +1,10 @@
-defmodule Explorer.Chain.ZkevmLifecycleTransaction do
+defmodule Explorer.Chain.Zkevm.LifecycleTransaction do
   @moduledoc "Models an L1 lifecycle transaction for zkEVM."
 
   use Explorer.Schema
 
-  alias Explorer.Chain.{Hash, ZkevmTransactionBatch}
+  alias Explorer.Chain.Hash
+  alias Explorer.Chain.Zkevm.TransactionBatch
 
   @required_attrs ~w(id hash is_verify)a
 
@@ -17,8 +18,8 @@ defmodule Explorer.Chain.ZkevmLifecycleTransaction do
     field(:hash, Hash.Full)
     field(:is_verify, :boolean)
 
-    has_many(:sequenced_batches, ZkevmTransactionBatch, foreign_key: :sequence_id)
-    has_many(:verified_batches, ZkevmTransactionBatch, foreign_key: :verify_id)
+    has_many(:sequenced_batches, TransactionBatch, foreign_key: :sequence_id)
+    has_many(:verified_batches, TransactionBatch, foreign_key: :verify_id)
 
     timestamps()
   end
diff --git a/apps/explorer/lib/explorer/chain/zkevm_transaction_batch.ex b/apps/explorer/lib/explorer/chain/zkevm/transaction_batch.ex
similarity index 68%
rename from apps/explorer/lib/explorer/chain/zkevm_transaction_batch.ex
rename to apps/explorer/lib/explorer/chain/zkevm/transaction_batch.ex
index c98bcb548c55..683daf9c1e5d 100644
--- a/apps/explorer/lib/explorer/chain/zkevm_transaction_batch.ex
+++ b/apps/explorer/lib/explorer/chain/zkevm/transaction_batch.ex
@@ -1,9 +1,10 @@
-defmodule Explorer.Chain.ZkevmTransactionBatch do
+defmodule Explorer.Chain.Zkevm.TransactionBatch do
   @moduledoc "Models a batch of transactions for zkEVM."
 
   use Explorer.Schema
 
-  alias Explorer.Chain.{Hash, ZkevmBatchTransaction, ZkevmLifecycleTransaction}
+  alias Explorer.Chain.Hash
+  alias Explorer.Chain.Zkevm.{BatchTransaction, LifecycleTransaction}
 
   @optional_attrs ~w(sequence_id verify_id)a
 
@@ -17,10 +18,10 @@ defmodule Explorer.Chain.ZkevmTransactionBatch do
           acc_input_hash: Hash.t(),
           state_root: Hash.t(),
           sequence_id: non_neg_integer() | nil,
-          sequence_transaction: %Ecto.Association.NotLoaded{} | ZkevmLifecycleTransaction.t() | nil,
+          sequence_transaction: %Ecto.Association.NotLoaded{} | LifecycleTransaction.t() | nil,
           verify_id: non_neg_integer() | nil,
-          verify_transaction: %Ecto.Association.NotLoaded{} | ZkevmLifecycleTransaction.t() | nil,
-          l2_transactions: %Ecto.Association.NotLoaded{} | [ZkevmBatchTransaction.t()]
+          verify_transaction: %Ecto.Association.NotLoaded{} | LifecycleTransaction.t() | nil,
+          l2_transactions: %Ecto.Association.NotLoaded{} | [BatchTransaction.t()]
         }
 
   @primary_key {:number, :integer, autogenerate: false}
@@ -31,15 +32,15 @@ defmodule Explorer.Chain.ZkevmTransactionBatch do
     field(:acc_input_hash, Hash.Full)
     field(:state_root, Hash.Full)
 
-    belongs_to(:sequence_transaction, ZkevmLifecycleTransaction,
+    belongs_to(:sequence_transaction, LifecycleTransaction,
       foreign_key: :sequence_id,
       references: :id,
       type: :integer
     )
 
-    belongs_to(:verify_transaction, ZkevmLifecycleTransaction, foreign_key: :verify_id, references: :id, type: :integer)
+    belongs_to(:verify_transaction, LifecycleTransaction, foreign_key: :verify_id, references: :id, type: :integer)
 
-    has_many(:l2_transactions, ZkevmBatchTransaction, foreign_key: :batch_number)
+    has_many(:l2_transactions, BatchTransaction, foreign_key: :batch_number)
 
     timestamps()
   end
diff --git a/apps/indexer/lib/indexer/fetcher/zkevm_transaction_batch.ex b/apps/indexer/lib/indexer/fetcher/zkevm/transaction_batch.ex
similarity index 97%
rename from apps/indexer/lib/indexer/fetcher/zkevm_transaction_batch.ex
rename to apps/indexer/lib/indexer/fetcher/zkevm/transaction_batch.ex
index 8cde602aa187..e259c9313f30 100644
--- a/apps/indexer/lib/indexer/fetcher/zkevm_transaction_batch.ex
+++ b/apps/indexer/lib/indexer/fetcher/zkevm/transaction_batch.ex
@@ -1,4 +1,4 @@
-defmodule Indexer.Fetcher.ZkevmTransactionBatch do
+defmodule Indexer.Fetcher.Zkevm.TransactionBatch do
   @moduledoc """
   Fills zkevm_transaction_batches DB table.
   """
@@ -13,7 +13,7 @@ defmodule Indexer.Fetcher.ZkevmTransactionBatch do
   import EthereumJSONRPC, only: [integer_to_quantity: 1, json_rpc: 2, quantity_to_integer: 1]
 
   alias Explorer.{Chain, Repo}
-  alias Explorer.Chain.{ZkevmLifecycleTransaction, ZkevmTransactionBatch}
+  alias Explorer.Chain.Zkevm.{LifecycleTransaction, TransactionBatch}
 
   @zero_hash "0000000000000000000000000000000000000000000000000000000000000000"
 
@@ -36,7 +36,7 @@ defmodule Indexer.Fetcher.ZkevmTransactionBatch do
   def init(args) do
     Logger.metadata(fetcher: :zkevm_transaction_batches)
 
-    config = Application.get_all_env(:indexer)[Indexer.Fetcher.ZkevmTransactionBatch]
+    config = Application.get_all_env(:indexer)[Indexer.Fetcher.Zkevm.TransactionBatch]
     chunk_size = config[:chunk_size]
     recheck_interval = config[:recheck_interval]
 
@@ -113,7 +113,7 @@ defmodule Indexer.Fetcher.ZkevmTransactionBatch do
 
   defp get_last_verified_batch_number do
     query =
-      from(tb in ZkevmTransactionBatch,
+      from(tb in TransactionBatch,
         select: tb.number,
         where: not is_nil(tb.verify_id),
         order_by: [desc: tb.number],
@@ -127,7 +127,7 @@ defmodule Indexer.Fetcher.ZkevmTransactionBatch do
 
   defp get_next_id do
     query =
-      from(lt in ZkevmLifecycleTransaction,
+      from(lt in LifecycleTransaction,
         select: lt.id,
         order_by: [desc: lt.id],
         limit: 1
@@ -228,7 +228,7 @@ defmodule Indexer.Fetcher.ZkevmTransactionBatch do
 
     query =
       from(
-        lt in ZkevmLifecycleTransaction,
+        lt in LifecycleTransaction,
         select: {lt.hash, lt.id},
         where: lt.hash in ^l1_tx_hashes
       )
diff --git a/apps/indexer/lib/indexer/supervisor.ex b/apps/indexer/lib/indexer/supervisor.ex
index 33da436938ad..5fce739019ca 100644
--- a/apps/indexer/lib/indexer/supervisor.ex
+++ b/apps/indexer/lib/indexer/supervisor.ex
@@ -34,10 +34,11 @@ defmodule Indexer.Supervisor do
     TokenUpdater,
     TransactionAction,
     UncleBlock,
-    Withdrawal,
-    ZkevmTransactionBatch
+    Withdrawal
   }
 
+  alias Indexer.Fetcher.Zkevm.TransactionBatch
+
   alias Indexer.Temporary.{
     BlocksTransactionsMismatch,
     UncatalogedTokenTransfers,
@@ -133,7 +134,7 @@ defmodule Indexer.Supervisor do
         {Indexer.Fetcher.PolygonEdge.Withdrawal.Supervisor,
          [[memory_monitor: memory_monitor, json_rpc_named_arguments: json_rpc_named_arguments]]},
         {Indexer.Fetcher.PolygonEdge.WithdrawalExit.Supervisor, [[memory_monitor: memory_monitor]]},
-        configure(ZkevmTransactionBatch.Supervisor, [
+        configure(TransactionBatch.Supervisor, [
           [json_rpc_named_arguments: json_rpc_named_arguments, memory_monitor: memory_monitor]
         ]),
 

From 54fb9a3f2008157a98c629e393a1fb8bd9304d4b Mon Sep 17 00:00:00 2001
From: POA <33550681+poa@users.noreply.github.com>
Date: Tue, 12 Sep 2023 13:53:44 +0300
Subject: [PATCH 569/909] Add Explorer.Chain.Zkevm.Reader module

---
 .../api/v2/transaction_controller.ex          |   3 +-
 .../controllers/api/v2/zkevm_controller.ex    |   9 +-
 apps/explorer/lib/explorer/chain.ex           |  30 +----
 .../lib/explorer/chain/zkevm/reader.ex        | 122 ++++++++++++++++++
 .../fetcher/zkevm/transaction_batch.ex        |  54 ++------
 5 files changed, 138 insertions(+), 80 deletions(-)
 create mode 100644 apps/explorer/lib/explorer/chain/zkevm/reader.ex

diff --git a/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/transaction_controller.ex b/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/transaction_controller.ex
index 16b881793f95..5917b953bbf9 100644
--- a/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/transaction_controller.ex
+++ b/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/transaction_controller.ex
@@ -19,6 +19,7 @@ defmodule BlockScoutWeb.API.V2.TransactionController do
   alias BlockScoutWeb.AccessHelper
   alias BlockScoutWeb.Models.TransactionStateHelper
   alias Explorer.Chain
+  alias Explorer.Chain.Zkevm.Reader
   alias Indexer.Fetcher.FirstTraceOnDemand
 
   action_fallback(BlockScoutWeb.API.V2.FallbackController)
@@ -114,7 +115,7 @@ defmodule BlockScoutWeb.API.V2.TransactionController do
   def zkevm_batch(conn, %{"batch_number" => batch_number} = _params) do
     transactions =
       batch_number
-      |> Chain.zkevm_batch_transactions(api?: true)
+      |> Reader.batch_transactions(api?: true)
       |> Enum.map(fn tx -> tx.hash end)
       |> Chain.hashes_to_transactions(api?: true, necessity_by_association: @transaction_necessity_by_association)
 
diff --git a/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/zkevm_controller.ex b/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/zkevm_controller.ex
index bbda1deaa595..b81cdea24baf 100644
--- a/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/zkevm_controller.ex
+++ b/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/zkevm_controller.ex
@@ -9,6 +9,7 @@ defmodule BlockScoutWeb.API.V2.ZkevmController do
     ]
 
   alias Explorer.Chain
+  alias Explorer.Chain.Zkevm.Reader
 
   action_fallback(BlockScoutWeb.API.V2.FallbackController)
 
@@ -24,7 +25,7 @@ defmodule BlockScoutWeb.API.V2.ZkevmController do
 
   def batch(conn, %{"batch_number" => batch_number} = _params) do
     {:ok, batch} =
-      Chain.zkevm_batch(
+      Reader.batch(
         batch_number,
         necessity_by_association: @batch_necessity_by_association,
         api?: true
@@ -47,7 +48,7 @@ defmodule BlockScoutWeb.API.V2.ZkevmController do
       |> paging_options()
       |> Keyword.put(:necessity_by_association, @batches_necessity_by_association)
       |> Keyword.put(:api?, true)
-      |> Chain.zkevm_batches()
+      |> Reader.batches()
       |> split_list_by_page()
 
     next_page_params = next_page_params(next_page, batches, params)
@@ -72,7 +73,7 @@ defmodule BlockScoutWeb.API.V2.ZkevmController do
       |> Keyword.put(:necessity_by_association, @batches_necessity_by_association)
       |> Keyword.put(:api?, true)
       |> Keyword.put(:confirmed?, true)
-      |> Chain.zkevm_batches()
+      |> Reader.batches()
 
     conn
     |> put_status(200)
@@ -80,7 +81,7 @@ defmodule BlockScoutWeb.API.V2.ZkevmController do
   end
 
   defp batch_latest_number do
-    case Chain.zkevm_batch(:latest, api?: true) do
+    case Reader.batch(:latest, api?: true) do
       {:ok, batch} -> batch.number
       {:error, :not_found} -> 0
     end
diff --git a/apps/explorer/lib/explorer/chain.ex b/apps/explorer/lib/explorer/chain.ex
index 44ce782e7f94..3bba8d9649de 100644
--- a/apps/explorer/lib/explorer/chain.ex
+++ b/apps/explorer/lib/explorer/chain.ex
@@ -67,8 +67,6 @@ defmodule Explorer.Chain do
     Withdrawal
   }
 
-  alias Explorer.Chain.Zkevm.{BatchTransaction, TransactionBatch}
-
   alias Explorer.Chain.Block.{EmissionReward, Reward}
 
   alias Explorer.Chain.Cache.{
@@ -4118,7 +4116,7 @@ defmodule Explorer.Chain do
     end
   end
 
-  defp join_associations(query, necessity_by_association) when is_map(necessity_by_association) do
+  def join_associations(query, necessity_by_association) when is_map(necessity_by_association) do
     Enum.reduce(necessity_by_association, query, fn {association, join}, acc_query ->
       join_association(acc_query, association, join)
     end)
@@ -6393,32 +6391,6 @@ defmodule Explorer.Chain do
     )
   end
 
-  def zkevm_batch(number, options \\ [])
-
-  def zkevm_batch(:latest, options) when is_list(options) do
-    TransactionBatch
-    |> order_by(desc: :number)
-    |> limit(1)
-    |> select_repo(options).one()
-    |> case do
-      nil -> {:error, :not_found}
-      batch -> {:ok, batch}
-    end
-  end
-
-  def zkevm_batch(number, options) when is_list(options) do
-    necessity_by_association = Keyword.get(options, :necessity_by_association, %{})
-
-    TransactionBatch
-    |> where(number: ^number)
-    |> join_associations(necessity_by_association)
-    |> select_repo(options).one()
-    |> case do
-      nil -> {:error, :not_found}
-      batch -> {:ok, batch}
-    end
-  end
-
   @spec verified_contracts_top(non_neg_integer()) :: [Hash.Address.t()]
   def verified_contracts_top(limit) do
     query =
diff --git a/apps/explorer/lib/explorer/chain/zkevm/reader.ex b/apps/explorer/lib/explorer/chain/zkevm/reader.ex
new file mode 100644
index 000000000000..782cf3f94a03
--- /dev/null
+++ b/apps/explorer/lib/explorer/chain/zkevm/reader.ex
@@ -0,0 +1,122 @@
+defmodule Explorer.Chain.Zkevm.Reader do
+  @moduledoc "Contains read functions for zkevm modules."
+
+  import Ecto.Query,
+    only: [
+      from: 2,
+      limit: 2,
+      order_by: 2,
+      where: 2,
+      where: 3
+    ]
+
+  import Explorer.Chain, only: [select_repo: 1]
+
+  alias Explorer.Chain.Zkevm.{BatchTransaction, LifecycleTransaction, TransactionBatch}
+  alias Explorer.{Chain, PagingOptions, Repo}
+
+  def batch(number, options \\ [])
+
+  def batch(:latest, options) when is_list(options) do
+    TransactionBatch
+    |> order_by(desc: :number)
+    |> limit(1)
+    |> select_repo(options).one()
+    |> case do
+      nil -> {:error, :not_found}
+      batch -> {:ok, batch}
+    end
+  end
+
+  def batch(number, options) when is_list(options) do
+    necessity_by_association = Keyword.get(options, :necessity_by_association, %{})
+
+    TransactionBatch
+    |> where(number: ^number)
+    |> Chain.join_associations(necessity_by_association)
+    |> select_repo(options).one()
+    |> case do
+      nil -> {:error, :not_found}
+      batch -> {:ok, batch}
+    end
+  end
+
+  def batches(options \\ []) do
+    necessity_by_association = Keyword.get(options, :necessity_by_association, %{})
+
+    base_query =
+      from(tb in TransactionBatch,
+        order_by: [desc: tb.number]
+      )
+
+    query =
+      if Keyword.get(options, :confirmed?, false) do
+        base_query
+        |> Chain.join_associations(necessity_by_association)
+        |> where([tb], not is_nil(tb.sequence_id) and tb.sequence_id > 0)
+        |> limit(10)
+      else
+        paging_options = Keyword.get(options, :paging_options, Chain.default_paging_options())
+
+        base_query
+        |> Chain.join_associations(necessity_by_association)
+        |> page_batches(paging_options)
+        |> limit(^paging_options.page_size)
+      end
+
+    select_repo(options).all(query)
+  end
+
+  def batch_transactions(batch_number, options \\ []) do
+    query = from(bts in BatchTransaction, where: bts.batch_number == ^batch_number)
+
+    select_repo(options).all(query)
+  end
+
+  def last_verified_batch_number do
+    query =
+      from(tb in TransactionBatch,
+        select: tb.number,
+        where: not is_nil(tb.verify_id),
+        order_by: [desc: tb.number],
+        limit: 1
+      )
+
+    query
+    |> Repo.one()
+    |> Kernel.||(0)
+  end
+
+  def lifecycle_transactions(l1_tx_hashes) do
+    query =
+      from(
+        lt in LifecycleTransaction,
+        select: {lt.hash, lt.id},
+        where: lt.hash in ^l1_tx_hashes
+      )
+
+    Repo.all(query, timeout: :infinity)
+  end
+
+  def next_id do
+    query =
+      from(lt in LifecycleTransaction,
+        select: lt.id,
+        order_by: [desc: lt.id],
+        limit: 1
+      )
+
+    last_id =
+      query
+      |> Repo.one()
+      |> Kernel.||(0)
+
+    last_id + 1
+  end
+
+  defp page_batches(query, %PagingOptions{key: nil}), do: query
+
+  defp page_batches(query, %PagingOptions{key: {number}}) do
+    from(tb in query, where: tb.number < ^number)
+  end
+end
diff --git a/apps/indexer/lib/indexer/fetcher/zkevm/transaction_batch.ex b/apps/indexer/lib/indexer/fetcher/zkevm/transaction_batch.ex
index e259c9313f30..c396b64ea623 100644
--- a/apps/indexer/lib/indexer/fetcher/zkevm/transaction_batch.ex
+++ b/apps/indexer/lib/indexer/fetcher/zkevm/transaction_batch.ex
@@ -8,12 +8,10 @@ defmodule Indexer.Fetcher.Zkevm.TransactionBatch do
 
   require Logger
 
-  import Ecto.Query
-
   import EthereumJSONRPC, only: [integer_to_quantity: 1, json_rpc: 2, quantity_to_integer: 1]
 
-  alias Explorer.{Chain, Repo}
-  alias Explorer.Chain.Zkevm.{LifecycleTransaction, TransactionBatch}
+  alias Explorer.Chain
+  alias Explorer.Chain.Zkevm.Reader
 
   @zero_hash "0000000000000000000000000000000000000000000000000000000000000000"
 
@@ -71,7 +69,7 @@ defmodule Indexer.Fetcher.Zkevm.TransactionBatch do
     {new_state, handle_duration} =
       if latest_batch_number > prev_latest_batch_number or virtual_batch_number > prev_virtual_batch_number or
            verified_batch_number > prev_verified_batch_number do
-        start_batch_number = get_last_verified_batch_number() + 1
+        start_batch_number = Reader.last_verified_batch_number() + 1
         end_batch_number = latest_batch_number
 
         log_message =
@@ -111,36 +109,6 @@ defmodule Indexer.Fetcher.Zkevm.TransactionBatch do
     {:noreply, state}
   end
 
-  defp get_last_verified_batch_number do
-    query =
-      from(tb in TransactionBatch,
-        select: tb.number,
-        where: not is_nil(tb.verify_id),
-        order_by: [desc: tb.number],
-        limit: 1
-      )
-
-    query
-    |> Repo.one()
-    |> Kernel.||(0)
-  end
-
-  defp get_next_id do
-    query =
-      from(lt in LifecycleTransaction,
-        select: lt.id,
-        order_by: [desc: lt.id],
-        limit: 1
-      )
-
-    last_id =
-      query
-      |> Repo.one()
-      |> Kernel.||(0)
-
-    last_id + 1
-  end
-
   defp handle_batch_range(start_batch_number, end_batch_number, json_rpc_named_arguments, chunk_size) do
     start_batch_number..end_batch_number
     |> Enum.chunk_every(chunk_size)
@@ -226,24 +194,18 @@ defmodule Indexer.Fetcher.Zkevm.TransactionBatch do
 
     l1_tx_hashes = Enum.uniq(sequence_hashes ++ verify_hashes)
 
-    query =
-      from(
-        lt in LifecycleTransaction,
-        select: {lt.hash, lt.id},
-        where: lt.hash in ^l1_tx_hashes
-      )
-
     hash_to_id =
-      query
-      |> Repo.all(timeout: :infinity)
+      l1_tx_hashes
+      |> Reader.lifecycle_transactions()
       |> Enum.reduce(%{}, fn {hash, id}, acc ->
         Map.put(acc, hash.bytes, id)
       end)
 
     {batches_to_import, l2_txs_to_import, l1_txs_to_import, _, _} =
       responses
-      |> Enum.reduce({[], [], [], get_next_id(), hash_to_id}, fn res,
-                                                                 {batches, l2_txs, l1_txs, next_id, hash_to_id} = _acc ->
+      |> Enum.reduce({[], [], [], Reader.next_id(), hash_to_id}, fn res,
+                                                                    {batches, l2_txs, l1_txs, next_id, hash_to_id} =
+                                                                      _acc ->
         number = quantity_to_integer(Map.get(res.result, "number"))
         {:ok, timestamp} = DateTime.from_unix(quantity_to_integer(Map.get(res.result, "timestamp")))
         l2_transaction_hashes = Map.get(res.result, "transactions")

From 332062e14abd3ce64e1d639ce9ed5abdd6d031e2 Mon Sep 17 00:00:00 2001
From: POA <33550681+poa@users.noreply.github.com>
Date: Wed, 13 Sep 2023 10:41:45 +0300
Subject: [PATCH 570/909] Change some API routes

---
 apps/block_scout_web/lib/block_scout_web/api_router.ex | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/block_scout_web/lib/block_scout_web/api_router.ex b/apps/block_scout_web/lib/block_scout_web/api_router.ex
index 289bc723ccf5..1beffafdf23c 100644
--- a/apps/block_scout_web/lib/block_scout_web/api_router.ex
+++ b/apps/block_scout_web/lib/block_scout_web/api_router.ex
@@ -186,8 +186,8 @@ defmodule BlockScoutWeb.ApiRouter do
       get("/transactions", V2.MainPageController, :transactions)
       get("/transactions/watchlist", V2.MainPageController, :watchlist_transactions)
       get("/indexing-status", V2.MainPageController, :indexing_status)
-      get("/zkevm-batches-confirmed", V2.ZkevmController, :batches_confirmed)
-      get("/zkevm-batch-latest-number", V2.ZkevmController, :batch_latest_number)
+      get("/zkevm/batches/confirmed", V2.ZkevmController, :batches_confirmed)
+      get("/zkevm/batches/latest-number", V2.ZkevmController, :batch_latest_number)
     end
 
     scope "/stats" do

From f563170d5b75b5b1babc5f94057859cfd5927c5d Mon Sep 17 00:00:00 2001
From: POA <33550681+poa@users.noreply.github.com>
Date: Wed, 13 Sep 2023 11:33:17 +0300
Subject: [PATCH 571/909] Add small comment

---
 apps/block_scout_web/lib/block_scout_web/chain.ex | 1 +
 1 file changed, 1 insertion(+)

diff --git a/apps/block_scout_web/lib/block_scout_web/chain.ex b/apps/block_scout_web/lib/block_scout_web/chain.ex
index 9098743075ff..415b42cc1b6e 100644
--- a/apps/block_scout_web/lib/block_scout_web/chain.ex
+++ b/apps/block_scout_web/lib/block_scout_web/chain.ex
@@ -535,6 +535,7 @@ defmodule BlockScoutWeb.Chain do
     %{"index" => index}
   end
 
+  # clause for zkEVM batches pagination
   defp paging_params(%TransactionBatch{number: number}) do
     %{"number" => number}
   end

From d77f3f5ae7cb8888a61d91be15545cf3dd65ff51 Mon Sep 17 00:00:00 2001
From: POA <33550681+poa@users.noreply.github.com>
Date: Wed, 13 Sep 2023 13:19:32 +0300
Subject: [PATCH 572/909] Add specs for public functions

---
 .../controllers/api/v2/transaction_controller.ex         | 9 +++++++++
 .../controllers/api/v2/zkevm_controller.ex               | 6 +++++-
 .../lib/block_scout_web/views/api/v2/zkevm_view.ex       | 1 +
 .../chain/import/runner/zkevm/batch_transactions.ex      | 2 ++
 .../chain/import/runner/zkevm/lifecycle_transactions.ex  | 2 ++
 .../chain/import/runner/zkevm/transaction_batches.ex     | 2 ++
 .../lib/explorer/chain/zkevm/batch_transaction.ex        | 1 +
 .../lib/explorer/chain/zkevm/lifecycle_transaction.ex    | 1 +
 apps/explorer/lib/explorer/chain/zkevm/reader.ex         | 1 +
 .../lib/explorer/chain/zkevm/transaction_batch.ex        | 1 +
 10 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/transaction_controller.ex b/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/transaction_controller.ex
index 5917b953bbf9..635451c9bc72 100644
--- a/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/transaction_controller.ex
+++ b/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/transaction_controller.ex
@@ -63,6 +63,7 @@ defmodule BlockScoutWeb.API.V2.TransactionController do
 
   @api_true [api?: true]
 
+  @spec transaction(Plug.Conn.t(), map()) :: Plug.Conn.t()
   def transaction(conn, %{"transaction_hash_param" => transaction_hash_string} = params) do
     necessity_by_association =
       @transaction_necessity_by_association
@@ -89,6 +90,7 @@ defmodule BlockScoutWeb.API.V2.TransactionController do
     end
   end
 
+  @spec transactions(Plug.Conn.t(), map()) :: Plug.Conn.t()
   def transactions(conn, params) do
     filter_options = filter_options(params, :validated)
 
@@ -112,6 +114,7 @@ defmodule BlockScoutWeb.API.V2.TransactionController do
     |> render(:transactions, %{transactions: transactions, next_page_params: next_page_params})
   end
 
+  @spec zkevm_batch(Plug.Conn.t(), map()) :: Plug.Conn.t()
   def zkevm_batch(conn, %{"batch_number" => batch_number} = _params) do
     transactions =
       batch_number
@@ -124,6 +127,7 @@ defmodule BlockScoutWeb.API.V2.TransactionController do
     |> render(:transactions, %{transactions: transactions})
   end
 
+  @spec raw_trace(Plug.Conn.t(), map()) :: Plug.Conn.t()
   def raw_trace(conn, %{"transaction_hash_param" => transaction_hash_string} = params) do
     with {:format, {:ok, transaction_hash}} <- {:format, Chain.string_to_transaction_hash(transaction_hash_string)},
          {:not_found, {:ok, transaction}} <-
@@ -153,6 +157,7 @@ defmodule BlockScoutWeb.API.V2.TransactionController do
     end
   end
 
+  @spec token_transfers(Plug.Conn.t(), map()) :: Plug.Conn.t() | {atom(), any()}
   def token_transfers(conn, %{"transaction_hash_param" => transaction_hash_string} = params) do
     with {:format, {:ok, transaction_hash}} <- {:format, Chain.string_to_transaction_hash(transaction_hash_string)},
          {:not_found, {:ok, transaction}} <-
@@ -185,6 +190,7 @@ defmodule BlockScoutWeb.API.V2.TransactionController do
     end
   end
 
+  @spec internal_transactions(Plug.Conn.t(), map()) :: Plug.Conn.t() | {atom(), any()}
   def internal_transactions(conn, %{"transaction_hash_param" => transaction_hash_string} = params) do
     with {:format, {:ok, transaction_hash}} <- {:format, Chain.string_to_transaction_hash(transaction_hash_string)},
          {:not_found, {:ok, transaction}} <-
@@ -213,6 +219,7 @@ defmodule BlockScoutWeb.API.V2.TransactionController do
     end
   end
 
+  @spec logs(Plug.Conn.t(), map()) :: Plug.Conn.t() | {atom(), any()}
   def logs(conn, %{"transaction_hash_param" => transaction_hash_string} = params) do
     with {:format, {:ok, transaction_hash}} <- {:format, Chain.string_to_transaction_hash(transaction_hash_string)},
          {:not_found, {:ok, transaction}} <-
@@ -248,6 +255,7 @@ defmodule BlockScoutWeb.API.V2.TransactionController do
     end
   end
 
+  @spec state_changes(Plug.Conn.t(), map()) :: Plug.Conn.t() | {atom(), any()}
   def state_changes(conn, %{"transaction_hash_param" => transaction_hash_string} = params) do
     with {:format, {:ok, transaction_hash}} <- {:format, Chain.string_to_transaction_hash(transaction_hash_string)},
          {:not_found, {:ok, transaction}} <-
@@ -274,6 +282,7 @@ defmodule BlockScoutWeb.API.V2.TransactionController do
     end
   end
 
+  @spec watchlist_transactions(Plug.Conn.t(), map()) :: Plug.Conn.t() | {atom(), any()}
   def watchlist_transactions(conn, params) do
     with {:auth, %{watchlist_id: watchlist_id}} <- {:auth, current_user(conn)} do
       full_options =
diff --git a/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/zkevm_controller.ex b/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/zkevm_controller.ex
index b81cdea24baf..a03cc0359cc2 100644
--- a/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/zkevm_controller.ex
+++ b/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/zkevm_controller.ex
@@ -8,7 +8,6 @@ defmodule BlockScoutWeb.API.V2.ZkevmController do
       split_list_by_page: 1
     ]
 
-  alias Explorer.Chain
   alias Explorer.Chain.Zkevm.Reader
 
   action_fallback(BlockScoutWeb.API.V2.FallbackController)
@@ -23,6 +22,7 @@ defmodule BlockScoutWeb.API.V2.ZkevmController do
     :sequence_transaction => :optional
   }
 
+  @spec batch(Plug.Conn.t(), map()) :: Plug.Conn.t()
   def batch(conn, %{"batch_number" => batch_number} = _params) do
     {:ok, batch} =
       Reader.batch(
@@ -36,12 +36,14 @@ defmodule BlockScoutWeb.API.V2.ZkevmController do
     |> render(:zkevm_batch, %{batch: batch})
   end
 
+  @spec batch_latest_number(Plug.Conn.t(), map()) :: Plug.Conn.t()
   def batch_latest_number(conn, _params) do
     conn
     |> put_status(200)
     |> render(:zkevm_batch_latest_number, %{number: batch_latest_number()})
   end
 
+  @spec batches(Plug.Conn.t(), map()) :: Plug.Conn.t()
   def batches(conn, params) do
     {batches, next_page} =
       params
@@ -61,12 +63,14 @@ defmodule BlockScoutWeb.API.V2.ZkevmController do
     })
   end
 
+  @spec batches_count(Plug.Conn.t(), map()) :: Plug.Conn.t()
   def batches_count(conn, _params) do
     conn
     |> put_status(200)
     |> render(:zkevm_batches_count, %{count: batch_latest_number()})
   end
 
+  @spec batches_confirmed(Plug.Conn.t(), map()) :: Plug.Conn.t()
   def batches_confirmed(conn, _params) do
     batches =
       []
diff --git a/apps/block_scout_web/lib/block_scout_web/views/api/v2/zkevm_view.ex b/apps/block_scout_web/lib/block_scout_web/views/api/v2/zkevm_view.ex
index a504f72d4801..e0bc5b4355b7 100644
--- a/apps/block_scout_web/lib/block_scout_web/views/api/v2/zkevm_view.ex
+++ b/apps/block_scout_web/lib/block_scout_web/views/api/v2/zkevm_view.ex
@@ -1,6 +1,7 @@
 defmodule BlockScoutWeb.API.V2.ZkevmView do
   use BlockScoutWeb, :view
 
+  @spec render(binary(), map()) :: map() | non_neg_integer()
   def render("zkevm_batch.json", %{batch: batch}) do
     sequence_tx_hash =
       if not is_nil(batch.sequence_transaction) do
diff --git a/apps/explorer/lib/explorer/chain/import/runner/zkevm/batch_transactions.ex b/apps/explorer/lib/explorer/chain/import/runner/zkevm/batch_transactions.ex
index 997f53a51705..2df1223945a1 100644
--- a/apps/explorer/lib/explorer/chain/import/runner/zkevm/batch_transactions.ex
+++ b/apps/explorer/lib/explorer/chain/import/runner/zkevm/batch_transactions.ex
@@ -24,6 +24,7 @@ defmodule Explorer.Chain.Import.Runner.Zkevm.BatchTransactions do
   def option_key, do: :zkevm_batch_transactions
 
   @impl Import.Runner
+  @spec imported_table_row() :: %{:value_description => binary(), :value_type => binary()}
   def imported_table_row do
     %{
       value_type: "[#{ecto_schema_module()}.t()]",
@@ -32,6 +33,7 @@ defmodule Explorer.Chain.Import.Runner.Zkevm.BatchTransactions do
   end
 
   @impl Import.Runner
+  @spec run(Multi.t(), list(), map()) :: Multi.t()
   def run(multi, changes_list, %{timestamps: timestamps} = options) do
     insert_options =
       options
diff --git a/apps/explorer/lib/explorer/chain/import/runner/zkevm/lifecycle_transactions.ex b/apps/explorer/lib/explorer/chain/import/runner/zkevm/lifecycle_transactions.ex
index 504b5e609afd..7a5e4c132735 100644
--- a/apps/explorer/lib/explorer/chain/import/runner/zkevm/lifecycle_transactions.ex
+++ b/apps/explorer/lib/explorer/chain/import/runner/zkevm/lifecycle_transactions.ex
@@ -26,6 +26,7 @@ defmodule Explorer.Chain.Import.Runner.Zkevm.LifecycleTransactions do
   def option_key, do: :zkevm_lifecycle_transactions
 
   @impl Import.Runner
+  @spec imported_table_row() :: %{:value_description => binary(), :value_type => binary()}
   def imported_table_row do
     %{
       value_type: "[#{ecto_schema_module()}.t()]",
@@ -34,6 +35,7 @@ defmodule Explorer.Chain.Import.Runner.Zkevm.LifecycleTransactions do
   end
 
   @impl Import.Runner
+  @spec run(Multi.t(), list(), map()) :: Multi.t()
   def run(multi, changes_list, %{timestamps: timestamps} = options) do
     insert_options =
       options
diff --git a/apps/explorer/lib/explorer/chain/import/runner/zkevm/transaction_batches.ex b/apps/explorer/lib/explorer/chain/import/runner/zkevm/transaction_batches.ex
index 37404436584a..db9f2771ea40 100644
--- a/apps/explorer/lib/explorer/chain/import/runner/zkevm/transaction_batches.ex
+++ b/apps/explorer/lib/explorer/chain/import/runner/zkevm/transaction_batches.ex
@@ -26,6 +26,7 @@ defmodule Explorer.Chain.Import.Runner.Zkevm.TransactionBatches do
   def option_key, do: :zkevm_transaction_batches
 
   @impl Import.Runner
+  @spec imported_table_row() :: %{:value_description => binary(), :value_type => binary()}
   def imported_table_row do
     %{
       value_type: "[#{ecto_schema_module()}.t()]",
@@ -34,6 +35,7 @@ defmodule Explorer.Chain.Import.Runner.Zkevm.TransactionBatches do
   end
 
   @impl Import.Runner
+  @spec run(Multi.t(), list(), map()) :: Multi.t()
   def run(multi, changes_list, %{timestamps: timestamps} = options) do
     insert_options =
       options
diff --git a/apps/explorer/lib/explorer/chain/zkevm/batch_transaction.ex b/apps/explorer/lib/explorer/chain/zkevm/batch_transaction.ex
index 1dc780ebf264..64993ad2bf85 100644
--- a/apps/explorer/lib/explorer/chain/zkevm/batch_transaction.ex
+++ b/apps/explorer/lib/explorer/chain/zkevm/batch_transaction.ex
@@ -23,6 +23,7 @@ defmodule Explorer.Chain.Zkevm.BatchTransaction do
     timestamps()
   end
 
+  @spec changeset(Ecto.Schema.t(), map()) :: Ecto.Schema.t()
   def changeset(%__MODULE__{} = transactions, attrs \\ %{}) do
     transactions
     |> cast(attrs, @required_attrs)
diff --git a/apps/explorer/lib/explorer/chain/zkevm/lifecycle_transaction.ex b/apps/explorer/lib/explorer/chain/zkevm/lifecycle_transaction.ex
index dc81b4a81bc1..83ddcfa29625 100644
--- a/apps/explorer/lib/explorer/chain/zkevm/lifecycle_transaction.ex
+++ b/apps/explorer/lib/explorer/chain/zkevm/lifecycle_transaction.ex
@@ -24,6 +24,7 @@ defmodule Explorer.Chain.Zkevm.LifecycleTransaction do
     timestamps()
   end
 
+  @spec changeset(Ecto.Schema.t(), map()) :: Ecto.Schema.t()
   def changeset(%__MODULE__{} = txn, attrs \\ %{}) do
     txn
     |> cast(attrs, @required_attrs)
diff --git a/apps/explorer/lib/explorer/chain/zkevm/reader.ex b/apps/explorer/lib/explorer/chain/zkevm/reader.ex
index 782cf3f94a03..436ae787e820 100644
--- a/apps/explorer/lib/explorer/chain/zkevm/reader.ex
+++ b/apps/explorer/lib/explorer/chain/zkevm/reader.ex
@@ -15,6 +15,7 @@ defmodule Explorer.Chain.Zkevm.Reader do
   alias Explorer.Chain.Zkevm.{BatchTransaction, LifecycleTransaction, TransactionBatch}
   alias Explorer.{Chain, PagingOptions, Repo}
 
+  @spec batch(non_neg_integer() | :latest, list()) :: {:ok, map()} | {:error, :not_found}
   def batch(number, options \\ [])
 
   def batch(:latest, options) when is_list(options) do
diff --git a/apps/explorer/lib/explorer/chain/zkevm/transaction_batch.ex b/apps/explorer/lib/explorer/chain/zkevm/transaction_batch.ex
index 683daf9c1e5d..1b4aa046dc88 100644
--- a/apps/explorer/lib/explorer/chain/zkevm/transaction_batch.ex
+++ b/apps/explorer/lib/explorer/chain/zkevm/transaction_batch.ex
@@ -45,6 +45,7 @@ defmodule Explorer.Chain.Zkevm.TransactionBatch do
     timestamps()
   end
 
+  @spec changeset(Ecto.Schema.t(), map()) :: Ecto.Schema.t()
   def changeset(%__MODULE__{} = batches, attrs \\ %{}) do
     batches
     |> cast(attrs, @required_attrs ++ @optional_attrs)

From 397df46528ac020e10de4cebc1de93af261bf888 Mon Sep 17 00:00:00 2001
From: POA <33550681+poa@users.noreply.github.com>
Date: Fri, 15 Sep 2023 08:47:42 +0300
Subject: [PATCH 573/909] Fix config/runtime.exs

---
 config/runtime.exs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/config/runtime.exs b/config/runtime.exs
index a8bdf8141009..89c42611bd3c 100644
--- a/config/runtime.exs
+++ b/config/runtime.exs
@@ -613,11 +613,11 @@ config :indexer, Indexer.Fetcher.PolygonEdge.WithdrawalExit,
   start_block_l1: System.get_env("INDEXER_POLYGON_EDGE_L1_WITHDRAWALS_START_BLOCK"),
   exit_helper: System.get_env("INDEXER_POLYGON_EDGE_L1_EXIT_HELPER_CONTRACT")
 
-config :indexer, Indexer.Fetcher.ZkevmTxnBatch,
+config :indexer, Indexer.Fetcher.Zkevm.TransactionBatch,
   chunk_size: ConfigHelper.parse_integer_env_var("INDEXER_ZKEVM_BATCHES_CHUNK_SIZE", 20),
   recheck_interval: ConfigHelper.parse_integer_env_var("INDEXER_ZKEVM_BATCHES_RECHECK_INTERVAL", 60)
 
-config :indexer, Indexer.Fetcher.ZkevmTxnBatch.Supervisor,
+config :indexer, Indexer.Fetcher.Zkevm.TransactionBatch.Supervisor,
   enabled: ConfigHelper.parse_bool_env_var("INDEXER_ZKEVM_BATCHES_ENABLED")
 
 Code.require_file("#{config_env()}.exs", "config/runtime")

From a7d39c8113485352c8d640ac12416c90b1df3497 Mon Sep 17 00:00:00 2001
From: POA <33550681+poa@users.noreply.github.com>
Date: Fri, 15 Sep 2023 10:34:34 +0300
Subject: [PATCH 574/909] Extend zkevm batch info in API

---
 .../controllers/api/v2/zkevm_controller.ex               | 3 ++-
 .../lib/block_scout_web/views/api/v2/zkevm_view.ex       | 9 ++++++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/zkevm_controller.ex b/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/zkevm_controller.ex
index a03cc0359cc2..5aee41db88ca 100644
--- a/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/zkevm_controller.ex
+++ b/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/zkevm_controller.ex
@@ -19,7 +19,8 @@ defmodule BlockScoutWeb.API.V2.ZkevmController do
   }
 
   @batches_necessity_by_association %{
-    :sequence_transaction => :optional
+    :sequence_transaction => :optional,
+    :verify_transaction => :optional
   }
 
   @spec batch(Plug.Conn.t(), map()) :: Plug.Conn.t()
diff --git a/apps/block_scout_web/lib/block_scout_web/views/api/v2/zkevm_view.ex b/apps/block_scout_web/lib/block_scout_web/views/api/v2/zkevm_view.ex
index e0bc5b4355b7..db4926588020 100644
--- a/apps/block_scout_web/lib/block_scout_web/views/api/v2/zkevm_view.ex
+++ b/apps/block_scout_web/lib/block_scout_web/views/api/v2/zkevm_view.ex
@@ -66,11 +66,18 @@ defmodule BlockScoutWeb.API.V2.ZkevmView do
           batch.sequence_transaction.hash
         end
 
+      verify_tx_hash =
+        if not is_nil(batch.verify_transaction) do
+          batch.verify_transaction.hash
+        end
+
       %{
         "number" => batch.number,
+        "status" => batch_status(batch),
         "timestamp" => batch.timestamp,
         "tx_count" => batch.l2_transactions_count,
-        "sequence_tx_hash" => sequence_tx_hash
+        "sequence_tx_hash" => sequence_tx_hash,
+        "verify_tx_hash" => verify_tx_hash
       }
     end)
   end

From 5ea5da2ba460ce332a242df7ff18aaaaabe03407 Mon Sep 17 00:00:00 2001
From: POA <33550681+poa@users.noreply.github.com>
Date: Fri, 15 Sep 2023 13:22:03 +0300
Subject: [PATCH 575/909] Define chain type

---
 .dialyzer-ignore                              |  3 +++
 .../lib/block_scout_web/api_router.ex         | 21 +++++++++++-----
 apps/block_scout_web/test/test_helper.exs     |  1 +
 apps/explorer/config/dev.exs                  |  4 ++++
 apps/explorer/config/prod.exs                 |  4 ++++
 apps/explorer/config/test.exs                 |  9 +++++++
 apps/explorer/lib/explorer/application.ex     |  2 +-
 apps/explorer/lib/explorer/repo.ex            | 24 +++++++++++++++++++
 apps/explorer/lib/release_tasks.ex            |  8 +++----
 .../20230420110800_create_zkevm_tables.exs    |  2 +-
 apps/explorer/test/support/data_case.ex       |  2 ++
 apps/explorer/test/test_helper.exs            |  1 +
 config/config_helper.exs                      |  1 +
 config/runtime.exs                            |  4 +++-
 config/runtime/dev.exs                        |  7 ++++++
 config/runtime/prod.exs                       |  6 +++++
 docker-compose/envs/common-blockscout.env     |  1 +
 17 files changed, 87 insertions(+), 13 deletions(-)
 rename apps/explorer/priv/{repo => polygon_zkevm}/migrations/20230420110800_create_zkevm_tables.exs (96%)

diff --git a/.dialyzer-ignore b/.dialyzer-ignore
index d7825ac3f477..a84bef2d4308 100644
--- a/.dialyzer-ignore
+++ b/.dialyzer-ignore
@@ -20,3 +20,6 @@ lib/indexer/fetcher/polygon_edge/deposit_execute.ex:140
 lib/indexer/fetcher/polygon_edge/deposit_execute.ex:184
 lib/indexer/fetcher/polygon_edge/withdrawal.ex:160
 lib/indexer/fetcher/polygon_edge/withdrawal.ex:204
+lib/indexer/fetcher/zkevm/transaction_batch.ex:115
+lib/indexer/fetcher/zkevm/transaction_batch.ex:155
+lib/indexer/fetcher/zkevm/transaction_batch.ex:251
diff --git a/apps/block_scout_web/lib/block_scout_web/api_router.ex b/apps/block_scout_web/lib/block_scout_web/api_router.ex
index 1beffafdf23c..b1b1faa048bc 100644
--- a/apps/block_scout_web/lib/block_scout_web/api_router.ex
+++ b/apps/block_scout_web/lib/block_scout_web/api_router.ex
@@ -135,7 +135,11 @@ defmodule BlockScoutWeb.ApiRouter do
     scope "/transactions" do
       get("/", V2.TransactionController, :transactions)
       get("/watchlist", V2.TransactionController, :watchlist_transactions)
-      get("/zkevm-batch/:batch_number", V2.TransactionController, :zkevm_batch)
+
+      if System.get_env("CHAIN_TYPE") == "polygon_zkevm" do
+        get("/zkevm-batch/:batch_number", V2.TransactionController, :zkevm_batch)
+      end
+
       get("/:transaction_hash_param", V2.TransactionController, :transaction)
       get("/:transaction_hash_param/token-transfers", V2.TransactionController, :token_transfers)
       get("/:transaction_hash_param/internal-transactions", V2.TransactionController, :internal_transactions)
@@ -186,8 +190,11 @@ defmodule BlockScoutWeb.ApiRouter do
       get("/transactions", V2.MainPageController, :transactions)
       get("/transactions/watchlist", V2.MainPageController, :watchlist_transactions)
       get("/indexing-status", V2.MainPageController, :indexing_status)
-      get("/zkevm/batches/confirmed", V2.ZkevmController, :batches_confirmed)
-      get("/zkevm/batches/latest-number", V2.ZkevmController, :batch_latest_number)
+
+      if System.get_env("CHAIN_TYPE") == "polygon_zkevm" do
+        get("/zkevm/batches/confirmed", V2.ZkevmController, :batches_confirmed)
+        get("/zkevm/batches/latest-number", V2.ZkevmController, :batch_latest_number)
+      end
     end
 
     scope "/stats" do
@@ -214,9 +221,11 @@ defmodule BlockScoutWeb.ApiRouter do
     end
 
     scope "/zkevm" do
-      get("/batches", V2.ZkevmController, :batches)
-      get("/batches/count", V2.ZkevmController, :batches_count)
-      get("/batches/:batch_number", V2.ZkevmController, :batch)
+      if System.get_env("CHAIN_TYPE") == "polygon_zkevm" do
+        get("/batches", V2.ZkevmController, :batches)
+        get("/batches/count", V2.ZkevmController, :batches_count)
+        get("/batches/:batch_number", V2.ZkevmController, :batch)
+      end
     end
   end
 
diff --git a/apps/block_scout_web/test/test_helper.exs b/apps/block_scout_web/test/test_helper.exs
index c50797a055bb..f29322600dc3 100644
--- a/apps/block_scout_web/test/test_helper.exs
+++ b/apps/block_scout_web/test/test_helper.exs
@@ -27,6 +27,7 @@ Mox.defmock(Explorer.ExchangeRates.Source.TestSource, for: Explorer.ExchangeRate
 Ecto.Adapters.SQL.Sandbox.mode(Explorer.Repo, :manual)
 Ecto.Adapters.SQL.Sandbox.mode(Explorer.Repo.Account, :manual)
 Ecto.Adapters.SQL.Sandbox.mode(Explorer.Repo.PolygonEdge, :manual)
+Ecto.Adapters.SQL.Sandbox.mode(Explorer.Repo.PolygonZkevm, :manual)
 Ecto.Adapters.SQL.Sandbox.mode(Explorer.Repo.RSK, :manual)
 
 Absinthe.Test.prime(BlockScoutWeb.Schema)
diff --git a/apps/explorer/config/dev.exs b/apps/explorer/config/dev.exs
index b8a8c81c94e2..abc65423669b 100644
--- a/apps/explorer/config/dev.exs
+++ b/apps/explorer/config/dev.exs
@@ -11,8 +11,12 @@ config :explorer, Explorer.Repo.Replica1, timeout: :timer.seconds(80)
 # Configure Account database
 config :explorer, Explorer.Repo.Account, timeout: :timer.seconds(80)
 
+# Configure Polygon Edge database
 config :explorer, Explorer.Repo.PolygonEdge, timeout: :timer.seconds(80)
 
+# Configure Polygon zkEVM database
+config :explorer, Explorer.Repo.PolygonZkevm, timeout: :timer.seconds(80)
+
 config :explorer, Explorer.Repo.RSK, timeout: :timer.seconds(80)
 
 config :explorer, Explorer.Tracer, env: "dev", disabled?: true
diff --git a/apps/explorer/config/prod.exs b/apps/explorer/config/prod.exs
index 1d5670c9200b..d195a017b224 100644
--- a/apps/explorer/config/prod.exs
+++ b/apps/explorer/config/prod.exs
@@ -20,6 +20,10 @@ config :explorer, Explorer.Repo.PolygonEdge,
   prepare: :unnamed,
   timeout: :timer.seconds(60)
 
+config :explorer, Explorer.Repo.PolygonZkevm,
+  prepare: :unnamed,
+  timeout: :timer.seconds(60)
+
 config :explorer, Explorer.Repo.RSK,
   prepare: :unnamed,
   timeout: :timer.seconds(60)
diff --git a/apps/explorer/config/test.exs b/apps/explorer/config/test.exs
index 498eac10794e..1e0050cff646 100644
--- a/apps/explorer/config/test.exs
+++ b/apps/explorer/config/test.exs
@@ -49,6 +49,15 @@ for repo <- [Explorer.Repo.PolygonEdge, Explorer.Repo.RSK] do
     queue_target: 1000
 end
 
+config :explorer, Explorer.Repo.PolygonZkevm,
+  database: "explorer_test",
+  hostname: "localhost",
+  pool: Ecto.Adapters.SQL.Sandbox,
+  # Default of `5_000` was too low for `BlockFetcher` test
+  ownership_timeout: :timer.minutes(1),
+  timeout: :timer.seconds(60),
+  queue_target: 1000
+
 config :logger, :explorer,
   level: :warn,
   path: Path.absname("logs/test/explorer.log")
diff --git a/apps/explorer/lib/explorer/application.ex b/apps/explorer/lib/explorer/application.ex
index c6575c29e54b..205e54940931 100644
--- a/apps/explorer/lib/explorer/application.ex
+++ b/apps/explorer/lib/explorer/application.ex
@@ -134,7 +134,7 @@ defmodule Explorer.Application do
 
   defp repos_by_chain_type do
     if Mix.env() == :test do
-      [Explorer.Repo.PolygonEdge, Explorer.Repo.RSK]
+      [Explorer.Repo.PolygonEdge, Explorer.Repo.PolygonZkevm, Explorer.Repo.RSK]
     else
       []
     end
diff --git a/apps/explorer/lib/explorer/repo.ex b/apps/explorer/lib/explorer/repo.ex
index 7cad910047ab..31fc787343a0 100644
--- a/apps/explorer/lib/explorer/repo.ex
+++ b/apps/explorer/lib/explorer/repo.ex
@@ -203,6 +203,30 @@ defmodule Explorer.Repo do
     end
   end
 
+  defmodule PolygonZkevm do
+    use Ecto.Repo,
+      otp_app: :explorer,
+      adapter: Ecto.Adapters.Postgres
+
+    def init(_, opts) do
+      db_url = Application.get_env(:explorer, __MODULE__)[:url]
+      repo_conf = Application.get_env(:explorer, __MODULE__)
+
+      merged =
+        %{url: db_url}
+        |> ConfigHelper.get_db_config()
+        |> Keyword.merge(repo_conf, fn
+          _key, v1, nil -> v1
+          _key, nil, v2 -> v2
+          _, _, v2 -> v2
+        end)
+
+      Application.put_env(:explorer, __MODULE__, merged)
+
+      {:ok, Keyword.put(opts, :url, db_url)}
+    end
+  end
+
   defmodule RSK do
     use Ecto.Repo,
       otp_app: :explorer,
diff --git a/apps/explorer/lib/release_tasks.ex b/apps/explorer/lib/release_tasks.ex
index 6ab45f3d3018..6b97dc6d665f 100644
--- a/apps/explorer/lib/release_tasks.ex
+++ b/apps/explorer/lib/release_tasks.ex
@@ -21,10 +21,10 @@ defmodule Explorer.ReleaseTasks do
     ]
 
     repos_list =
-      if System.get_env("CHAIN_TYPE") == "polygon_edge" do
-        [Explorer.Repo.PolygonEdge | base_repos_list]
-      else
-        base_repos_list
+      case System.get_env("CHAIN_TYPE") do
+        "polygon_edge" -> [Explorer.Repo.PolygonEdge | base_repos_list]
+        "polygon_zkevm" -> [Explorer.Repo.PolygonZkevm | base_repos_list]
+        _ -> base_repos_list
       end
 
     Application.get_env(:explorer, :ecto_repos, repos_list)
diff --git a/apps/explorer/priv/repo/migrations/20230420110800_create_zkevm_tables.exs b/apps/explorer/priv/polygon_zkevm/migrations/20230420110800_create_zkevm_tables.exs
similarity index 96%
rename from apps/explorer/priv/repo/migrations/20230420110800_create_zkevm_tables.exs
rename to apps/explorer/priv/polygon_zkevm/migrations/20230420110800_create_zkevm_tables.exs
index 6115a034dce7..1c242e3b8ec4 100644
--- a/apps/explorer/priv/repo/migrations/20230420110800_create_zkevm_tables.exs
+++ b/apps/explorer/priv/polygon_zkevm/migrations/20230420110800_create_zkevm_tables.exs
@@ -1,4 +1,4 @@
-defmodule Explorer.Repo.Migrations.CreateZkevmTables do
+defmodule Explorer.Repo.PolygonZkevm.Migrations.CreateZkevmTables do
   use Ecto.Migration
 
   def change do
diff --git a/apps/explorer/test/support/data_case.ex b/apps/explorer/test/support/data_case.ex
index 1fe4819b29d1..71d60c49695b 100644
--- a/apps/explorer/test/support/data_case.ex
+++ b/apps/explorer/test/support/data_case.ex
@@ -36,12 +36,14 @@ defmodule Explorer.DataCase do
     :ok = Ecto.Adapters.SQL.Sandbox.checkout(Explorer.Repo)
     :ok = Ecto.Adapters.SQL.Sandbox.checkout(Explorer.Repo.Account)
     :ok = Ecto.Adapters.SQL.Sandbox.checkout(Explorer.Repo.PolygonEdge)
+    :ok = Ecto.Adapters.SQL.Sandbox.checkout(Explorer.Repo.PolygonZkevm)
     :ok = Ecto.Adapters.SQL.Sandbox.checkout(Explorer.Repo.RSK)
 
     unless tags[:async] do
       Ecto.Adapters.SQL.Sandbox.mode(Explorer.Repo, {:shared, self()})
       Ecto.Adapters.SQL.Sandbox.mode(Explorer.Repo.Account, {:shared, self()})
       Ecto.Adapters.SQL.Sandbox.mode(Explorer.Repo.PolygonEdge, {:shared, self()})
+      Ecto.Adapters.SQL.Sandbox.mode(Explorer.Repo.PolygonZkevm, {:shared, self()})
       Ecto.Adapters.SQL.Sandbox.mode(Explorer.Repo.RSK, {:shared, self()})
     end
 
diff --git a/apps/explorer/test/test_helper.exs b/apps/explorer/test/test_helper.exs
index 210faa3cc62e..0f973e0b4429 100644
--- a/apps/explorer/test/test_helper.exs
+++ b/apps/explorer/test/test_helper.exs
@@ -14,6 +14,7 @@ ExUnit.start()
 Ecto.Adapters.SQL.Sandbox.mode(Explorer.Repo, :auto)
 Ecto.Adapters.SQL.Sandbox.mode(Explorer.Repo.Account, :auto)
 Ecto.Adapters.SQL.Sandbox.mode(Explorer.Repo.PolygonEdge, :auto)
+Ecto.Adapters.SQL.Sandbox.mode(Explorer.Repo.PolygonZkevm, :auto)
 Ecto.Adapters.SQL.Sandbox.mode(Explorer.Repo.RSK, :auto)
 
 Mox.defmock(Explorer.ExchangeRates.Source.TestSource, for: Explorer.ExchangeRates.Source)
diff --git a/config/config_helper.exs b/config/config_helper.exs
index 26d9161de7ea..6533002e154f 100644
--- a/config/config_helper.exs
+++ b/config/config_helper.exs
@@ -9,6 +9,7 @@ defmodule ConfigHelper do
 
     case System.get_env("CHAIN_TYPE") do
       "polygon_edge" -> base_repos ++ [Explorer.Repo.PolygonEdge]
+      "polygon_zkevm" -> base_repos ++ [Explorer.Repo.PolygonZkevm]
       "rsk" -> base_repos ++ [Explorer.Repo.RSK]
       _ -> base_repos
     end
diff --git a/config/runtime.exs b/config/runtime.exs
index 89c42611bd3c..aafccbbf2d3f 100644
--- a/config/runtime.exs
+++ b/config/runtime.exs
@@ -618,7 +618,9 @@ config :indexer, Indexer.Fetcher.Zkevm.TransactionBatch,
   recheck_interval: ConfigHelper.parse_integer_env_var("INDEXER_ZKEVM_BATCHES_RECHECK_INTERVAL", 60)
 
 config :indexer, Indexer.Fetcher.Zkevm.TransactionBatch.Supervisor,
-  enabled: ConfigHelper.parse_bool_env_var("INDEXER_ZKEVM_BATCHES_ENABLED")
+  enabled:
+    System.get_env("CHAIN_TYPE", "ethereum") == "polygon_zkevm" &&
+      ConfigHelper.parse_bool_env_var("INDEXER_ZKEVM_BATCHES_ENABLED")
 
 Code.require_file("#{config_env()}.exs", "config/runtime")
 
diff --git a/config/runtime/dev.exs b/config/runtime/dev.exs
index 09a67485fad6..63c967a6d186 100644
--- a/config/runtime/dev.exs
+++ b/config/runtime/dev.exs
@@ -78,6 +78,13 @@ config :explorer, Explorer.Repo.PolygonEdge,
   # separating repos for different CHAIN_TYPE is implemented only for the sake of keeping DB schema update relevant to the current chain type
   pool_size: 1
 
+# Configure PolygonZkevm database
+config :explorer, Explorer.Repo.PolygonZkevm,
+  database: database,
+  hostname: hostname,
+  url: System.get_env("DATABASE_URL"),
+  pool_size: ConfigHelper.parse_integer_env_var("POLYGON_ZKEVM_POOL_SIZE", 10)
+
 # Configure Rootstock database
 config :explorer, Explorer.Repo.RSK,
   database: database,
diff --git a/config/runtime/prod.exs b/config/runtime/prod.exs
index a2acffc385b1..5bb1286c5697 100644
--- a/config/runtime/prod.exs
+++ b/config/runtime/prod.exs
@@ -55,6 +55,12 @@ config :explorer, Explorer.Repo.PolygonEdge,
   pool_size: 1,
   ssl: ExplorerConfigHelper.ssl_enabled?()
 
+# Configures PolygonZkevm database
+config :explorer, Explorer.Repo.PolygonZkevm,
+  url: System.get_env("DATABASE_URL"),
+  pool_size: ConfigHelper.parse_integer_env_var("POLYGON_ZKEVM_POOL_SIZE", 50),
+  ssl: ExplorerConfigHelper.ssl_enabled?()
+
 # Configures Rootstock database
 config :explorer, Explorer.Repo.RSK,
   url: System.get_env("DATABASE_URL"),
diff --git a/docker-compose/envs/common-blockscout.env b/docker-compose/envs/common-blockscout.env
index 3a3724eec651..5b16944ddd97 100644
--- a/docker-compose/envs/common-blockscout.env
+++ b/docker-compose/envs/common-blockscout.env
@@ -1,4 +1,5 @@
 # DOCKER_TAG=
+CHAIN_TYPE=ethereum
 ETHEREUM_JSONRPC_VARIANT=geth
 ETHEREUM_JSONRPC_HTTP_URL=http://host.docker.internal:8545/
 # ETHEREUM_JSONRPC_FALLBACK_HTTP_URL=

From 1d36bd83f28480b19d809a174f4d93fbe3814da4 Mon Sep 17 00:00:00 2001
From: POA <33550681+poa@users.noreply.github.com>
Date: Mon, 18 Sep 2023 14:21:35 +0300
Subject: [PATCH 576/909] Add @doc for public functions

---
 .../lib/block_scout_web/chain.ex              |  4 +++
 .../api/v2/transaction_controller.ex          | 34 +++++++++++++++++--
 .../controllers/api/v2/zkevm_controller.ex    | 15 ++++++++
 .../views/api/v2/zkevm_view.ex                | 15 ++++++++
 .../explorer/chain/zkevm/batch_transaction.ex |  3 ++
 .../chain/zkevm/lifecycle_transaction.ex      |  3 ++
 .../lib/explorer/chain/zkevm/reader.ex        | 26 ++++++++++++++
 .../explorer/chain/zkevm/transaction_batch.ex |  3 ++
 8 files changed, 100 insertions(+), 3 deletions(-)

diff --git a/apps/block_scout_web/lib/block_scout_web/chain.ex b/apps/block_scout_web/lib/block_scout_web/chain.ex
index 415b42cc1b6e..cebe723571f5 100644
--- a/apps/block_scout_web/lib/block_scout_web/chain.ex
+++ b/apps/block_scout_web/lib/block_scout_web/chain.ex
@@ -125,6 +125,10 @@ defmodule BlockScoutWeb.Chain do
     Map.put(next_page_params, "items_count", items_count)
   end
 
+  @doc """
+    Makes Explorer.PagingOptions map. Overloaded by different params in the input map
+    for different modules using this function.
+  """
   @spec paging_options(any) ::
           [{:paging_options, Explorer.PagingOptions.t()}, ...] | Explorer.PagingOptions.t()
   def paging_options(%{"hash" => hash_string, "fetched_coin_balance" => fetched_coin_balance_string})
diff --git a/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/transaction_controller.ex b/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/transaction_controller.ex
index 635451c9bc72..e8794f58427e 100644
--- a/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/transaction_controller.ex
+++ b/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/transaction_controller.ex
@@ -63,7 +63,10 @@ defmodule BlockScoutWeb.API.V2.TransactionController do
 
   @api_true [api?: true]
 
-  @spec transaction(Plug.Conn.t(), map()) :: Plug.Conn.t()
+  @doc """
+    Function to handle GET requests to `/api/v2/transactions/:transaction_hash_param` endpoint.
+  """
+  @spec transaction(Plug.Conn.t(), map()) :: Plug.Conn.t() | {atom(), any()}
   def transaction(conn, %{"transaction_hash_param" => transaction_hash_string} = params) do
     necessity_by_association =
       @transaction_necessity_by_association
@@ -90,6 +93,9 @@ defmodule BlockScoutWeb.API.V2.TransactionController do
     end
   end
 
+  @doc """
+    Function to handle GET requests to `/api/v2/transactions` endpoint.
+  """
   @spec transactions(Plug.Conn.t(), map()) :: Plug.Conn.t()
   def transactions(conn, params) do
     filter_options = filter_options(params, :validated)
@@ -114,6 +120,10 @@ defmodule BlockScoutWeb.API.V2.TransactionController do
     |> render(:transactions, %{transactions: transactions, next_page_params: next_page_params})
   end
 
+  @doc """
+    Function to handle GET requests to `/api/v2/transactions/zkevm-batch/:batch_number` endpoint.
+    It renders the list of L2 transactions bound to the specified batch.
+  """
   @spec zkevm_batch(Plug.Conn.t(), map()) :: Plug.Conn.t()
   def zkevm_batch(conn, %{"batch_number" => batch_number} = _params) do
     transactions =
@@ -127,7 +137,10 @@ defmodule BlockScoutWeb.API.V2.TransactionController do
     |> render(:transactions, %{transactions: transactions})
   end
 
-  @spec raw_trace(Plug.Conn.t(), map()) :: Plug.Conn.t()
+  @doc """
+    Function to handle GET requests to `/api/v2/transactions/:transaction_hash_param/raw-trace` endpoint.
+  """
+  @spec raw_trace(Plug.Conn.t(), map()) :: Plug.Conn.t() | {atom(), any()}
   def raw_trace(conn, %{"transaction_hash_param" => transaction_hash_string} = params) do
     with {:format, {:ok, transaction_hash}} <- {:format, Chain.string_to_transaction_hash(transaction_hash_string)},
          {:not_found, {:ok, transaction}} <-
@@ -157,6 +170,9 @@ defmodule BlockScoutWeb.API.V2.TransactionController do
     end
   end
 
+  @doc """
+    Function to handle GET requests to `/api/v2/transactions/:transaction_hash_param/token-transfers` endpoint.
+  """
   @spec token_transfers(Plug.Conn.t(), map()) :: Plug.Conn.t() | {atom(), any()}
   def token_transfers(conn, %{"transaction_hash_param" => transaction_hash_string} = params) do
     with {:format, {:ok, transaction_hash}} <- {:format, Chain.string_to_transaction_hash(transaction_hash_string)},
@@ -190,6 +206,9 @@ defmodule BlockScoutWeb.API.V2.TransactionController do
     end
   end
 
+  @doc """
+    Function to handle GET requests to `/api/v2/transactions/:transaction_hash_param/internal-transactions` endpoint.
+  """
   @spec internal_transactions(Plug.Conn.t(), map()) :: Plug.Conn.t() | {atom(), any()}
   def internal_transactions(conn, %{"transaction_hash_param" => transaction_hash_string} = params) do
     with {:format, {:ok, transaction_hash}} <- {:format, Chain.string_to_transaction_hash(transaction_hash_string)},
@@ -219,6 +238,9 @@ defmodule BlockScoutWeb.API.V2.TransactionController do
     end
   end
 
+  @doc """
+    Function to handle GET requests to `/api/v2/transactions/:transaction_hash_param/logs` endpoint.
+  """
   @spec logs(Plug.Conn.t(), map()) :: Plug.Conn.t() | {atom(), any()}
   def logs(conn, %{"transaction_hash_param" => transaction_hash_string} = params) do
     with {:format, {:ok, transaction_hash}} <- {:format, Chain.string_to_transaction_hash(transaction_hash_string)},
@@ -255,6 +277,9 @@ defmodule BlockScoutWeb.API.V2.TransactionController do
     end
   end
 
+  @doc """
+    Function to handle GET requests to `/api/v2/transactions/:transaction_hash_param/state-changes` endpoint.
+  """
   @spec state_changes(Plug.Conn.t(), map()) :: Plug.Conn.t() | {atom(), any()}
   def state_changes(conn, %{"transaction_hash_param" => transaction_hash_string} = params) do
     with {:format, {:ok, transaction_hash}} <- {:format, Chain.string_to_transaction_hash(transaction_hash_string)},
@@ -282,7 +307,10 @@ defmodule BlockScoutWeb.API.V2.TransactionController do
     end
   end
 
-  @spec watchlist_transactions(Plug.Conn.t(), map()) :: Plug.Conn.t() | {atom(), any()}
+  @doc """
+    Function to handle GET requests to `/api/v2/transactions/watchlist` endpoint.
+  """
+  @spec watchlist_transactions(Plug.Conn.t(), map()) :: Plug.Conn.t() | {:auth, any()}
   def watchlist_transactions(conn, params) do
     with {:auth, %{watchlist_id: watchlist_id}} <- {:auth, current_user(conn)} do
       full_options =
diff --git a/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/zkevm_controller.ex b/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/zkevm_controller.ex
index 5aee41db88ca..a92589e029c4 100644
--- a/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/zkevm_controller.ex
+++ b/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/zkevm_controller.ex
@@ -23,6 +23,9 @@ defmodule BlockScoutWeb.API.V2.ZkevmController do
     :verify_transaction => :optional
   }
 
+  @doc """
+    Function to handle GET requests to `/api/v2/zkevm/batches/:batch_number` endpoint.
+  """
   @spec batch(Plug.Conn.t(), map()) :: Plug.Conn.t()
   def batch(conn, %{"batch_number" => batch_number} = _params) do
     {:ok, batch} =
@@ -37,6 +40,9 @@ defmodule BlockScoutWeb.API.V2.ZkevmController do
     |> render(:zkevm_batch, %{batch: batch})
   end
 
+  @doc """
+    Function to handle GET requests to `/api/v2/main-page/zkevm/batches/latest-number` endpoint.
+  """
   @spec batch_latest_number(Plug.Conn.t(), map()) :: Plug.Conn.t()
   def batch_latest_number(conn, _params) do
     conn
@@ -44,6 +50,9 @@ defmodule BlockScoutWeb.API.V2.ZkevmController do
     |> render(:zkevm_batch_latest_number, %{number: batch_latest_number()})
   end
 
+  @doc """
+    Function to handle GET requests to `/api/v2/zkevm/batches` endpoint.
+  """
   @spec batches(Plug.Conn.t(), map()) :: Plug.Conn.t()
   def batches(conn, params) do
     {batches, next_page} =
@@ -64,6 +73,9 @@ defmodule BlockScoutWeb.API.V2.ZkevmController do
     })
   end
 
+  @doc """
+    Function to handle GET requests to `/api/v2/zkevm/batches/count` endpoint.
+  """
   @spec batches_count(Plug.Conn.t(), map()) :: Plug.Conn.t()
   def batches_count(conn, _params) do
     conn
@@ -71,6 +83,9 @@ defmodule BlockScoutWeb.API.V2.ZkevmController do
     |> render(:zkevm_batches_count, %{count: batch_latest_number()})
   end
 
+  @doc """
+    Function to handle GET requests to `/api/v2/main-page/zkevm/batches/confirmed` endpoint.
+  """
   @spec batches_confirmed(Plug.Conn.t(), map()) :: Plug.Conn.t()
   def batches_confirmed(conn, _params) do
     batches =
diff --git a/apps/block_scout_web/lib/block_scout_web/views/api/v2/zkevm_view.ex b/apps/block_scout_web/lib/block_scout_web/views/api/v2/zkevm_view.ex
index db4926588020..9a71ef647bda 100644
--- a/apps/block_scout_web/lib/block_scout_web/views/api/v2/zkevm_view.ex
+++ b/apps/block_scout_web/lib/block_scout_web/views/api/v2/zkevm_view.ex
@@ -1,6 +1,9 @@
 defmodule BlockScoutWeb.API.V2.ZkevmView do
   use BlockScoutWeb, :view
 
+  @doc """
+    Function to render GET requests to `/api/v2/zkevm/batches/:batch_number` endpoint.
+  """
   @spec render(binary(), map()) :: map() | non_neg_integer()
   def render("zkevm_batch.json", %{batch: batch}) do
     sequence_tx_hash =
@@ -26,6 +29,9 @@ defmodule BlockScoutWeb.API.V2.ZkevmView do
     }
   end
 
+  @doc """
+    Function to render GET requests to `/api/v2/zkevm/batches` endpoint.
+  """
   def render("zkevm_batches.json", %{
         batches: batches,
         next_page_params: next_page_params
@@ -36,14 +42,23 @@ defmodule BlockScoutWeb.API.V2.ZkevmView do
     }
   end
 
+  @doc """
+    Function to render GET requests to `/api/v2/main-page/zkevm/batches/confirmed` endpoint.
+  """
   def render("zkevm_batches.json", %{batches: batches}) do
     %{items: render_zkevm_batches(batches)}
   end
 
+  @doc """
+    Function to render GET requests to `/api/v2/zkevm/batches/count` endpoint.
+  """
   def render("zkevm_batches_count.json", %{count: count}) do
     count
   end
 
+  @doc """
+    Function to render GET requests to `/api/v2/main-page/zkevm/batches/latest-number` endpoint.
+  """
   def render("zkevm_batch_latest_number.json", %{number: number}) do
     number
   end
diff --git a/apps/explorer/lib/explorer/chain/zkevm/batch_transaction.ex b/apps/explorer/lib/explorer/chain/zkevm/batch_transaction.ex
index 64993ad2bf85..74f5fb9b9f86 100644
--- a/apps/explorer/lib/explorer/chain/zkevm/batch_transaction.ex
+++ b/apps/explorer/lib/explorer/chain/zkevm/batch_transaction.ex
@@ -23,6 +23,9 @@ defmodule Explorer.Chain.Zkevm.BatchTransaction do
     timestamps()
   end
 
+  @doc """
+    Validates that the `attrs` are valid.
+  """
   @spec changeset(Ecto.Schema.t(), map()) :: Ecto.Schema.t()
   def changeset(%__MODULE__{} = transactions, attrs \\ %{}) do
     transactions
diff --git a/apps/explorer/lib/explorer/chain/zkevm/lifecycle_transaction.ex b/apps/explorer/lib/explorer/chain/zkevm/lifecycle_transaction.ex
index 83ddcfa29625..480b0c0c80fa 100644
--- a/apps/explorer/lib/explorer/chain/zkevm/lifecycle_transaction.ex
+++ b/apps/explorer/lib/explorer/chain/zkevm/lifecycle_transaction.ex
@@ -24,6 +24,9 @@ defmodule Explorer.Chain.Zkevm.LifecycleTransaction do
     timestamps()
   end
 
+  @doc """
+    Validates that the `attrs` are valid.
+  """
   @spec changeset(Ecto.Schema.t(), map()) :: Ecto.Schema.t()
   def changeset(%__MODULE__{} = txn, attrs \\ %{}) do
     txn
diff --git a/apps/explorer/lib/explorer/chain/zkevm/reader.ex b/apps/explorer/lib/explorer/chain/zkevm/reader.ex
index 436ae787e820..49f69eaa0d46 100644
--- a/apps/explorer/lib/explorer/chain/zkevm/reader.ex
+++ b/apps/explorer/lib/explorer/chain/zkevm/reader.ex
@@ -15,6 +15,11 @@ defmodule Explorer.Chain.Zkevm.Reader do
   alias Explorer.Chain.Zkevm.{BatchTransaction, LifecycleTransaction, TransactionBatch}
   alias Explorer.{Chain, PagingOptions, Repo}
 
+  @doc """
+    Reads a batch by its number from database.
+    If the number is :latest, gets the latest batch from `zkevm_transaction_batches` table.
+    Returns {:error, :not_found} in case the batch is not found.
+  """
   @spec batch(non_neg_integer() | :latest, list()) :: {:ok, map()} | {:error, :not_found}
   def batch(number, options \\ [])
 
@@ -42,6 +47,10 @@ defmodule Explorer.Chain.Zkevm.Reader do
     end
   end
 
+  @doc """
+    Reads a list of batches from `zkevm_transaction_batches` table.
+  """
+  @spec batches(list()) :: list()
   def batches(options \\ []) do
     necessity_by_association = Keyword.get(options, :necessity_by_association, %{})
 
@@ -68,12 +77,21 @@ defmodule Explorer.Chain.Zkevm.Reader do
     select_repo(options).all(query)
   end
 
+  @doc """
+    Reads a list of L2 transaction hashes from `zkevm_batch_l2_transactions` table.
+  """
+  @spec batch_transactions(non_neg_integer(), list()) :: list()
   def batch_transactions(batch_number, options \\ []) do
     query = from(bts in BatchTransaction, where: bts.batch_number == ^batch_number)
 
     select_repo(options).all(query)
   end
 
+  @doc """
+    Gets the number of the latest batch with defined verify_id from `zkevm_transaction_batches` table.
+    Returns 0 if not found.
+  """
+  @spec last_verified_batch_number() :: non_neg_integer()
   def last_verified_batch_number do
     query =
       from(tb in TransactionBatch,
@@ -88,6 +106,10 @@ defmodule Explorer.Chain.Zkevm.Reader do
     |> Kernel.||(0)
   end
 
+  @doc """
+    Reads a list of L1 transactions by their hashes from `zkevm_lifecycle_l1_transactions` table.
+  """
+  @spec lifecycle_transactions(list()) :: list()
   def lifecycle_transactions(l1_tx_hashes) do
     query =
       from(
@@ -99,6 +121,10 @@ defmodule Explorer.Chain.Zkevm.Reader do
     Repo.all(query, timeout: :infinity)
   end
 
+  @doc """
+    Determines ID of the future lifecycle transaction by reading `zkevm_lifecycle_l1_transactions` table.
+  """
+  @spec next_id() :: non_neg_integer()
   def next_id do
     query =
       from(lt in LifecycleTransaction,
diff --git a/apps/explorer/lib/explorer/chain/zkevm/transaction_batch.ex b/apps/explorer/lib/explorer/chain/zkevm/transaction_batch.ex
index 1b4aa046dc88..eda97e1d403c 100644
--- a/apps/explorer/lib/explorer/chain/zkevm/transaction_batch.ex
+++ b/apps/explorer/lib/explorer/chain/zkevm/transaction_batch.ex
@@ -45,6 +45,9 @@ defmodule Explorer.Chain.Zkevm.TransactionBatch do
     timestamps()
   end
 
+  @doc """
+    Validates that the `attrs` are valid.
+  """
   @spec changeset(Ecto.Schema.t(), map()) :: Ecto.Schema.t()
   def changeset(%__MODULE__{} = batches, attrs \\ %{}) do
     batches

From 921e01dc9ad57aa443bf44354c46c8f8283a338a Mon Sep 17 00:00:00 2001
From: POA <33550681+poa@users.noreply.github.com>
Date: Fri, 22 Sep 2023 14:07:43 +0300
Subject: [PATCH 577/909] Fix repos list definition in releases_tasks

---
 docker-compose/envs/common-blockscout.env | 1 -
 1 file changed, 1 deletion(-)

diff --git a/docker-compose/envs/common-blockscout.env b/docker-compose/envs/common-blockscout.env
index 5b16944ddd97..3a3724eec651 100644
--- a/docker-compose/envs/common-blockscout.env
+++ b/docker-compose/envs/common-blockscout.env
@@ -1,5 +1,4 @@
 # DOCKER_TAG=
-CHAIN_TYPE=ethereum
 ETHEREUM_JSONRPC_VARIANT=geth
 ETHEREUM_JSONRPC_HTTP_URL=http://host.docker.internal:8545/
 # ETHEREUM_JSONRPC_FALLBACK_HTTP_URL=

From bea348df48d4971ed8f273b7127cbe00f01e0441 Mon Sep 17 00:00:00 2001
From: POA <33550681+poa@users.noreply.github.com>
Date: Tue, 26 Sep 2023 08:53:36 +0300
Subject: [PATCH 578/909] Throw not_found error in API v2 when a batch is not
 found

---
 .../controllers/api/v2/zkevm_controller.ex    | 21 +++++++++++--------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/zkevm_controller.ex b/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/zkevm_controller.ex
index a92589e029c4..171a63d57ac5 100644
--- a/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/zkevm_controller.ex
+++ b/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/zkevm_controller.ex
@@ -28,16 +28,19 @@ defmodule BlockScoutWeb.API.V2.ZkevmController do
   """
   @spec batch(Plug.Conn.t(), map()) :: Plug.Conn.t()
   def batch(conn, %{"batch_number" => batch_number} = _params) do
-    {:ok, batch} =
-      Reader.batch(
-        batch_number,
-        necessity_by_association: @batch_necessity_by_association,
-        api?: true
-      )
+    case Reader.batch(
+           batch_number,
+           necessity_by_association: @batch_necessity_by_association,
+           api?: true
+         ) do
+      {:ok, batch} ->
+        conn
+        |> put_status(200)
+        |> render(:zkevm_batch, %{batch: batch})
 
-    conn
-    |> put_status(200)
-    |> render(:zkevm_batch, %{batch: batch})
+      {:error, :not_found} = res ->
+        res
+    end
   end
 
   @doc """

From 07c3dbf42d54a236373de88911bbbe0bd0b05341 Mon Sep 17 00:00:00 2001
From: POA <33550681+poa@users.noreply.github.com>
Date: Wed, 27 Sep 2023 11:02:05 +0300
Subject: [PATCH 579/909] Fixes after rebase

---
 .../views/api/v2/transaction_view.ex          |  7 +++-
 apps/explorer/lib/explorer/chain.ex           | 38 -------------------
 .../chain/import/stage/block_referencing.ex   |  5 ++-
 3 files changed, 10 insertions(+), 40 deletions(-)

diff --git a/apps/block_scout_web/lib/block_scout_web/views/api/v2/transaction_view.ex b/apps/block_scout_web/lib/block_scout_web/views/api/v2/transaction_view.ex
index d16281dde8e8..fa169125fb26 100644
--- a/apps/block_scout_web/lib/block_scout_web/views/api/v2/transaction_view.ex
+++ b/apps/block_scout_web/lib/block_scout_web/views/api/v2/transaction_view.ex
@@ -408,6 +408,10 @@ defmodule BlockScoutWeb.API.V2.TransactionView do
       "has_error_in_internal_txs" => transaction.has_error_in_internal_txs
     }
 
+    chain_type_fields(result, transaction, single_tx?, conn)
+  end
+
+  defp chain_type_fields(result, transaction, single_tx?, conn) do
     case single_tx? && Application.get_env(:explorer, :chain_type) do
       "polygon_edge" ->
         result
@@ -423,7 +427,8 @@ defmodule BlockScoutWeb.API.V2.TransactionView do
 
         Map.put(extended_result, "zkevm_status", zkevm_status(extended_result))
 
-      _ -> result
+      _ ->
+        result
     end
   end
 
diff --git a/apps/explorer/lib/explorer/chain.ex b/apps/explorer/lib/explorer/chain.ex
index 3bba8d9649de..59c2ed85890e 100644
--- a/apps/explorer/lib/explorer/chain.ex
+++ b/apps/explorer/lib/explorer/chain.ex
@@ -6409,42 +6409,4 @@ defmodule Explorer.Chain do
   def default_paging_options do
     @default_paging_options
   end
-
-  def zkevm_batches(options \\ []) do
-    necessity_by_association = Keyword.get(options, :necessity_by_association, %{})
-
-    base_query =
-      from(tb in TransactionBatch,
-        order_by: [desc: tb.number]
-      )
-
-    query =
-      if Keyword.get(options, :confirmed?, false) do
-        base_query
-        |> join_associations(necessity_by_association)
-        |> where([tb], not is_nil(tb.sequence_id) and tb.sequence_id > 0)
-        |> limit(10)
-      else
-        paging_options = Keyword.get(options, :paging_options, @default_paging_options)
-
-        base_query
-        |> join_associations(necessity_by_association)
-        |> page_zkevm_batches(paging_options)
-        |> limit(^paging_options.page_size)
-      end
-
-    select_repo(options).all(query)
-  end
-
-  def zkevm_batch_transactions(batch_number, options \\ []) do
-    query = from(bts in BatchTransaction, where: bts.batch_number == ^batch_number)
-
-    select_repo(options).all(query)
-  end
-
-  defp page_zkevm_batches(query, %PagingOptions{key: nil}), do: query
-
-  defp page_zkevm_batches(query, %PagingOptions{key: {number}}) do
-    from(tb in query, where: tb.number < ^number)
-  end
 end
diff --git a/apps/explorer/lib/explorer/chain/import/stage/block_referencing.ex b/apps/explorer/lib/explorer/chain/import/stage/block_referencing.ex
index 4c3f27e412ba..1589c95a38cb 100644
--- a/apps/explorer/lib/explorer/chain/import/stage/block_referencing.ex
+++ b/apps/explorer/lib/explorer/chain/import/stage/block_referencing.ex
@@ -30,6 +30,7 @@ defmodule Explorer.Chain.Import.Stage.BlockReferencing do
             Runner.PolygonEdge.Withdrawals,
             Runner.PolygonEdge.WithdrawalExits
           ]
+
       "polygon_zkevm" ->
         @default_runners ++
           [
@@ -37,7 +38,9 @@ defmodule Explorer.Chain.Import.Stage.BlockReferencing do
             Runner.Zkevm.TransactionBatches,
             Runner.Zkevm.BatchTransactions
           ]
-      _ -> @default_runners
+
+      _ ->
+        @default_runners
     end
   end
 

From 8928bd384bb6de59cf23ebc70a8ecc6655e38810 Mon Sep 17 00:00:00 2001
From: POA <33550681+poa@users.noreply.github.com>
Date: Mon, 2 Oct 2023 12:55:13 +0300
Subject: [PATCH 580/909] Make transactions list in a batch optional

---
 .../lib/block_scout_web/controllers/api/v2/zkevm_controller.ex  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/zkevm_controller.ex b/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/zkevm_controller.ex
index 171a63d57ac5..cd45dab110b7 100644
--- a/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/zkevm_controller.ex
+++ b/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/zkevm_controller.ex
@@ -15,7 +15,7 @@ defmodule BlockScoutWeb.API.V2.ZkevmController do
   @batch_necessity_by_association %{
     :sequence_transaction => :optional,
     :verify_transaction => :optional,
-    :l2_transactions => :required
+    :l2_transactions => :optional
   }
 
   @batches_necessity_by_association %{

From f0fcf7ae8361c8964bdb4e75304c7ae598e9b7fd Mon Sep 17 00:00:00 2001
From: Viktor Baranov <baranov.viktor.27@gmail.com>
Date: Thu, 14 Sep 2023 11:59:32 +0300
Subject: [PATCH 581/909] Handle 0 gas limit

---
 .../block_scout_web/views/api/v2/block_view.ex   | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/apps/block_scout_web/lib/block_scout_web/views/api/v2/block_view.ex b/apps/block_scout_web/lib/block_scout_web/views/api/v2/block_view.ex
index 8da05d3b686a..c4793dbacedf 100644
--- a/apps/block_scout_web/lib/block_scout_web/views/api/v2/block_view.ex
+++ b/apps/block_scout_web/lib/block_scout_web/views/api/v2/block_view.ex
@@ -85,13 +85,21 @@ defmodule BlockScoutWeb.API.V2.BlockView do
   end
 
   def gas_target(block) do
-    elasticity_multiplier = Application.get_env(:explorer, :elasticity_multiplier)
-    ratio = Decimal.div(block.gas_used, Decimal.div(block.gas_limit, elasticity_multiplier))
-    ratio |> Decimal.sub(1) |> Decimal.mult(100) |> Decimal.to_float()
+    if Decimal.compare(block.gas_limit, 0) == :gt do
+      elasticity_multiplier = Application.get_env(:explorer, :elasticity_multiplier)
+      ratio = Decimal.div(block.gas_used, Decimal.div(block.gas_limit, elasticity_multiplier))
+      ratio |> Decimal.sub(1) |> Decimal.mult(100) |> Decimal.to_float()
+    else
+      Decimal.new(0)
+    end
   end
 
   def gas_used_percentage(block) do
-    block.gas_used |> Decimal.div(block.gas_limit) |> Decimal.mult(100) |> Decimal.to_float()
+    if Decimal.compare(block.gas_limit, 0) == :gt do
+      block.gas_used |> Decimal.div(block.gas_limit) |> Decimal.mult(100) |> Decimal.to_float()
+    else
+      Decimal.new(0)
+    end
   end
 
   def burnt_fees_percentage(_, %Decimal{coef: 0}), do: nil

From adc277ec2231f0aa41252e2b86e8f0277a2307d2 Mon Sep 17 00:00:00 2001
From: POA <33550681+poa@users.noreply.github.com>
Date: Mon, 2 Oct 2023 14:04:01 +0300
Subject: [PATCH 582/909] mix format

---
 apps/block_scout_web/lib/block_scout_web/chain.ex | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/block_scout_web/lib/block_scout_web/chain.ex b/apps/block_scout_web/lib/block_scout_web/chain.ex
index cebe723571f5..97f291feaec4 100644
--- a/apps/block_scout_web/lib/block_scout_web/chain.ex
+++ b/apps/block_scout_web/lib/block_scout_web/chain.ex
@@ -322,7 +322,7 @@ defmodule BlockScoutWeb.Chain do
   end
 
   def paging_options(%{"inserted_at" => inserted_at_string, "hash" => hash_string})
-    when is_binary(inserted_at_string) and is_binary(hash_string) do
+      when is_binary(inserted_at_string) and is_binary(hash_string) do
     with {:ok, inserted_at, _} <- DateTime.from_iso8601(inserted_at_string),
          {:ok, hash} <- string_to_transaction_hash(hash_string) do
       [paging_options: %{@default_paging_options | key: {inserted_at, hash}, is_pending_tx: true}]

From bd7a7837a3be3ab2088b25d37e6e6efea868d5af Mon Sep 17 00:00:00 2001
From: POA <33550681+poa@users.noreply.github.com>
Date: Thu, 5 Oct 2023 13:32:02 +0300
Subject: [PATCH 583/909] Add socket for confirmed batches list on the main
 page

---
 .dialyzer-ignore                              |  6 ++--
 .../channels/user_socket_v2.ex                |  1 +
 .../channels/zkevm_confirmed_batch_channel.ex | 31 +++++++++++++++++++
 .../api/v2/transaction_controller.ex          |  2 +-
 .../lib/block_scout_web/notifier.ex           | 10 ++++++
 .../block_scout_web/realtime_event_handler.ex |  1 +
 .../views/api/v2/transaction_view.ex          |  6 ++++
 .../lib/explorer/chain/events/publisher.ex    |  2 +-
 .../lib/explorer/chain/events/subscriber.ex   |  2 +-
 .../fetcher/zkevm/transaction_batch.ex        |  8 +++++
 10 files changed, 63 insertions(+), 6 deletions(-)
 create mode 100644 apps/block_scout_web/lib/block_scout_web/channels/zkevm_confirmed_batch_channel.ex

diff --git a/.dialyzer-ignore b/.dialyzer-ignore
index a84bef2d4308..a718f6654ded 100644
--- a/.dialyzer-ignore
+++ b/.dialyzer-ignore
@@ -20,6 +20,6 @@ lib/indexer/fetcher/polygon_edge/deposit_execute.ex:140
 lib/indexer/fetcher/polygon_edge/deposit_execute.ex:184
 lib/indexer/fetcher/polygon_edge/withdrawal.ex:160
 lib/indexer/fetcher/polygon_edge/withdrawal.ex:204
-lib/indexer/fetcher/zkevm/transaction_batch.ex:115
-lib/indexer/fetcher/zkevm/transaction_batch.ex:155
-lib/indexer/fetcher/zkevm/transaction_batch.ex:251
+lib/indexer/fetcher/zkevm/transaction_batch.ex:116
+lib/indexer/fetcher/zkevm/transaction_batch.ex:156
+lib/indexer/fetcher/zkevm/transaction_batch.ex:252
diff --git a/apps/block_scout_web/lib/block_scout_web/channels/user_socket_v2.ex b/apps/block_scout_web/lib/block_scout_web/channels/user_socket_v2.ex
index b012b8db2a9f..159993433e35 100644
--- a/apps/block_scout_web/lib/block_scout_web/channels/user_socket_v2.ex
+++ b/apps/block_scout_web/lib/block_scout_web/channels/user_socket_v2.ex
@@ -10,6 +10,7 @@ defmodule BlockScoutWeb.UserSocketV2 do
   channel("rewards:*", BlockScoutWeb.RewardChannel)
   channel("transactions:*", BlockScoutWeb.TransactionChannel)
   channel("tokens:*", BlockScoutWeb.TokenChannel)
+  channel("zkevm_batches:*", BlockScoutWeb.ZkevmConfirmedBatchChannel)
 
   def connect(_params, socket) do
     {:ok, socket}
diff --git a/apps/block_scout_web/lib/block_scout_web/channels/zkevm_confirmed_batch_channel.ex b/apps/block_scout_web/lib/block_scout_web/channels/zkevm_confirmed_batch_channel.ex
new file mode 100644
index 000000000000..37b805205c82
--- /dev/null
+++ b/apps/block_scout_web/lib/block_scout_web/channels/zkevm_confirmed_batch_channel.ex
@@ -0,0 +1,31 @@
+defmodule BlockScoutWeb.ZkevmConfirmedBatchChannel do
+  @moduledoc """
+  Establishes pub/sub channel for live updates of zkEVM confirmed batch events.
+  """
+  use BlockScoutWeb, :channel
+
+  alias BlockScoutWeb.API.V2.ZkevmView
+
+  intercept(["new_zkevm_confirmed_batch"])
+
+  def join("zkevm_batches:new_zkevm_confirmed_batch", _params, socket) do
+    require Logger
+    Logger.warn("zkevm_batches:new_zkevm_confirmed_batch")
+
+    {:ok, %{}, socket}
+  end
+
+  def handle_out(
+        "new_zkevm_confirmed_batch",
+        %{batch: batch},
+        %Phoenix.Socket{handler: BlockScoutWeb.UserSocketV2} = socket
+      ) do
+    rendered_batch = ZkevmView.render("zkevm_batch.json", %{batch: batch, socket: nil})
+
+    push(socket, "new_zkevm_confirmed_batch", %{
+      batch: rendered_batch
+    })
+
+    {:noreply, socket}
+  end
+end
diff --git a/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/transaction_controller.ex b/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/transaction_controller.ex
index e8794f58427e..704c8b5e28bd 100644
--- a/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/transaction_controller.ex
+++ b/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/transaction_controller.ex
@@ -134,7 +134,7 @@ defmodule BlockScoutWeb.API.V2.TransactionController do
 
     conn
     |> put_status(200)
-    |> render(:transactions, %{transactions: transactions})
+    |> render(:transactions, %{transactions: transactions, items: true})
   end
 
   @doc """
diff --git a/apps/block_scout_web/lib/block_scout_web/notifier.ex b/apps/block_scout_web/lib/block_scout_web/notifier.ex
index a82202c4acdc..cb1cdf70be02 100644
--- a/apps/block_scout_web/lib/block_scout_web/notifier.ex
+++ b/apps/block_scout_web/lib/block_scout_web/notifier.ex
@@ -114,6 +114,16 @@ defmodule BlockScoutWeb.Notifier do
     end)
   end
 
+  def handle_event({:chain_event, :zkevm_confirmed_batches, :realtime, batches}) do
+    batches
+    |> Enum.sort_by(& &1.number, :asc)
+    |> Enum.each(fn confirmed_batch ->
+      Endpoint.broadcast("zkevm_batches:new_zkevm_confirmed_batch", "new_zkevm_confirmed_batch", %{
+        batch: confirmed_batch
+      })
+    end)
+  end
+
   def handle_event({:chain_event, :exchange_rate}) do
     exchange_rate = Market.get_coin_exchange_rate()
 
diff --git a/apps/block_scout_web/lib/block_scout_web/realtime_event_handler.ex b/apps/block_scout_web/lib/block_scout_web/realtime_event_handler.ex
index 47c9289f8301..e7b590876380 100644
--- a/apps/block_scout_web/lib/block_scout_web/realtime_event_handler.ex
+++ b/apps/block_scout_web/lib/block_scout_web/realtime_event_handler.ex
@@ -32,6 +32,7 @@ defmodule BlockScoutWeb.RealtimeEventHandler do
     Subscriber.to(:token_total_supply, :on_demand)
     Subscriber.to(:changed_bytecode, :on_demand)
     Subscriber.to(:smart_contract_was_verified, :on_demand)
+    Subscriber.to(:zkevm_confirmed_batches, :realtime)
     # Does not come from the indexer
     Subscriber.to(:exchange_rate)
     Subscriber.to(:transaction_stats)
diff --git a/apps/block_scout_web/lib/block_scout_web/views/api/v2/transaction_view.ex b/apps/block_scout_web/lib/block_scout_web/views/api/v2/transaction_view.ex
index fa169125fb26..68d0f5b1f1a7 100644
--- a/apps/block_scout_web/lib/block_scout_web/views/api/v2/transaction_view.ex
+++ b/apps/block_scout_web/lib/block_scout_web/views/api/v2/transaction_view.ex
@@ -71,6 +71,12 @@ defmodule BlockScoutWeb.API.V2.TransactionView do
     }
   end
 
+  def render("transactions.json", %{transactions: transactions, items: true, conn: conn}) do
+    %{
+      "items" => render("transactions.json", %{transactions: transactions, conn: conn})
+    }
+  end
+
   def render("transactions.json", %{transactions: transactions, conn: conn}) do
     block_height = Chain.block_height(@api_true)
     {decoded_transactions, _, _} = decode_transactions(transactions, true)
diff --git a/apps/explorer/lib/explorer/chain/events/publisher.ex b/apps/explorer/lib/explorer/chain/events/publisher.ex
index a02951290059..21b8d168af92 100644
--- a/apps/explorer/lib/explorer/chain/events/publisher.ex
+++ b/apps/explorer/lib/explorer/chain/events/publisher.ex
@@ -3,7 +3,7 @@ defmodule Explorer.Chain.Events.Publisher do
   Publishes events related to the Chain context.
   """
 
-  @allowed_events ~w(addresses address_coin_balances address_token_balances address_current_token_balances blocks block_rewards internal_transactions last_block_number polygon_edge_reorg_block token_transfers transactions contract_verification_result token_total_supply changed_bytecode smart_contract_was_verified)a
+  @allowed_events ~w(addresses address_coin_balances address_token_balances address_current_token_balances blocks block_rewards internal_transactions last_block_number polygon_edge_reorg_block token_transfers transactions contract_verification_result token_total_supply changed_bytecode smart_contract_was_verified zkevm_confirmed_batches)a
 
   def broadcast(_data, false), do: :ok
 
diff --git a/apps/explorer/lib/explorer/chain/events/subscriber.ex b/apps/explorer/lib/explorer/chain/events/subscriber.ex
index bc028df157ed..9d049758ec56 100644
--- a/apps/explorer/lib/explorer/chain/events/subscriber.ex
+++ b/apps/explorer/lib/explorer/chain/events/subscriber.ex
@@ -3,7 +3,7 @@ defmodule Explorer.Chain.Events.Subscriber do
   Subscribes to events related to the Chain context.
   """
 
-  @allowed_broadcast_events ~w(addresses address_coin_balances address_token_balances address_current_token_balances blocks block_rewards internal_transactions last_block_number polygon_edge_reorg_block token_transfers transactions contract_verification_result token_total_supply changed_bytecode smart_contract_was_verified)a
+  @allowed_broadcast_events ~w(addresses address_coin_balances address_token_balances address_current_token_balances blocks block_rewards internal_transactions last_block_number polygon_edge_reorg_block token_transfers transactions contract_verification_result token_total_supply changed_bytecode smart_contract_was_verified zkevm_confirmed_batches)a
 
   @allowed_broadcast_types ~w(catchup realtime on_demand contract_verification_result)a
 
diff --git a/apps/indexer/lib/indexer/fetcher/zkevm/transaction_batch.ex b/apps/indexer/lib/indexer/fetcher/zkevm/transaction_batch.ex
index c396b64ea623..d59da1203e63 100644
--- a/apps/indexer/lib/indexer/fetcher/zkevm/transaction_batch.ex
+++ b/apps/indexer/lib/indexer/fetcher/zkevm/transaction_batch.ex
@@ -11,6 +11,7 @@ defmodule Indexer.Fetcher.Zkevm.TransactionBatch do
   import EthereumJSONRPC, only: [integer_to_quantity: 1, json_rpc: 2, quantity_to_integer: 1]
 
   alias Explorer.Chain
+  alias Explorer.Chain.Events.Publisher
   alias Explorer.Chain.Zkevm.Reader
 
   @zero_hash "0000000000000000000000000000000000000000000000000000000000000000"
@@ -254,6 +255,13 @@ defmodule Indexer.Fetcher.Zkevm.TransactionBatch do
         zkevm_batch_transactions: %{params: l2_txs_to_import},
         timeout: :infinity
       })
+
+    confirmed_batches =
+      Enum.filter(batches_to_import, fn batch -> not is_nil(batch.sequence_id) and batch.sequence_id > 0 end)
+
+    if not Enum.empty?(confirmed_batches) do
+      Publisher.broadcast([{:zkevm_confirmed_batches, confirmed_batches}], :realtime)
+    end
   end
 
   defp fetch_latest_batch_numbers(json_rpc_named_arguments) do

From 158e64f332b3b3b3ed0f8e127819d209cc24a17d Mon Sep 17 00:00:00 2001
From: POA <33550681+poa@users.noreply.github.com>
Date: Mon, 23 Oct 2023 16:45:04 +0300
Subject: [PATCH 584/909] Fix for zkEVM websocket connection

---
 .../channels/zkevm_confirmed_batch_channel.ex         |  3 ---
 .../lib/block_scout_web/views/api/v2/zkevm_view.ex    | 11 ++++++++---
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/apps/block_scout_web/lib/block_scout_web/channels/zkevm_confirmed_batch_channel.ex b/apps/block_scout_web/lib/block_scout_web/channels/zkevm_confirmed_batch_channel.ex
index 37b805205c82..9007f1176412 100644
--- a/apps/block_scout_web/lib/block_scout_web/channels/zkevm_confirmed_batch_channel.ex
+++ b/apps/block_scout_web/lib/block_scout_web/channels/zkevm_confirmed_batch_channel.ex
@@ -9,9 +9,6 @@ defmodule BlockScoutWeb.ZkevmConfirmedBatchChannel do
   intercept(["new_zkevm_confirmed_batch"])
 
   def join("zkevm_batches:new_zkevm_confirmed_batch", _params, socket) do
-    require Logger
-    Logger.warn("zkevm_batches:new_zkevm_confirmed_batch")
-
     {:ok, %{}, socket}
   end
 
diff --git a/apps/block_scout_web/lib/block_scout_web/views/api/v2/zkevm_view.ex b/apps/block_scout_web/lib/block_scout_web/views/api/v2/zkevm_view.ex
index 9a71ef647bda..a4b0eb2b0c50 100644
--- a/apps/block_scout_web/lib/block_scout_web/views/api/v2/zkevm_view.ex
+++ b/apps/block_scout_web/lib/block_scout_web/views/api/v2/zkevm_view.ex
@@ -7,20 +7,25 @@ defmodule BlockScoutWeb.API.V2.ZkevmView do
   @spec render(binary(), map()) :: map() | non_neg_integer()
   def render("zkevm_batch.json", %{batch: batch}) do
     sequence_tx_hash =
-      if not is_nil(batch.sequence_transaction) do
+      if Map.has_key?(batch, :sequence_transaction) and not is_nil(batch.sequence_transaction) do
         batch.sequence_transaction.hash
       end
 
     verify_tx_hash =
-      if not is_nil(batch.verify_transaction) do
+      if Map.has_key?(batch, :verify_transaction) and not is_nil(batch.verify_transaction) do
         batch.verify_transaction.hash
       end
 
+    l2_transactions =
+      if Map.has_key?(batch, :l2_transactions) do
+        Enum.map(batch.l2_transactions, fn tx -> tx.hash end)
+      end
+
     %{
       "number" => batch.number,
       "status" => batch_status(batch),
       "timestamp" => batch.timestamp,
-      "transactions" => Enum.map(batch.l2_transactions, fn tx -> tx.hash end),
+      "transactions" => l2_transactions,
       "global_exit_root" => batch.global_exit_root,
       "acc_input_hash" => batch.acc_input_hash,
       "sequence_tx_hash" => sequence_tx_hash,

From 45cb6d217497dbe8fb923a5c53f131bac612a6cf Mon Sep 17 00:00:00 2001
From: POA <33550681+poa@users.noreply.github.com>
Date: Tue, 24 Oct 2023 07:25:44 +0300
Subject: [PATCH 585/909] Minor fixes

---
 CHANGELOG.md                 | 2 +-
 apps/block_scout_web/mix.exs | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b663cb052eef..9ca1d95616a9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,7 @@
 ### Features
 
 - [#8673](https://github.com/blockscout/blockscout/pull/8673) - Add a window for balances fetching from non-archive node
+- [#7584](https://github.com/blockscout/blockscout/pull/7584) - Add Polygon zkEVM batches fetcher
 
 ### Fixes
 
@@ -30,7 +31,6 @@
 - [#8543](https://github.com/blockscout/blockscout/pull/8543) - Fix polygon tracer
 - [#8386](https://github.com/blockscout/blockscout/pull/8386) - Add `owner_address_hash` to the `token_instances`
 - [#8530](https://github.com/blockscout/blockscout/pull/8530) - Add `block_type` to search results
-- [#7584](https://github.com/blockscout/blockscout/pull/7584) - Add Polygon zkEVM batches fetcher
 - [#8180](https://github.com/blockscout/blockscout/pull/8180) - Deposits and Withdrawals for Polygon Edge
 - [#7996](https://github.com/blockscout/blockscout/pull/7996) - Add CoinBalance fetcher init query limit
 - [#8658](https://github.com/blockscout/blockscout/pull/8658) - Remove block consensus on import fail
diff --git a/apps/block_scout_web/mix.exs b/apps/block_scout_web/mix.exs
index 5102c48e89d3..8bad9756ac81 100644
--- a/apps/block_scout_web/mix.exs
+++ b/apps/block_scout_web/mix.exs
@@ -23,7 +23,8 @@ defmodule BlockScoutWeb.Mixfile do
         dialyzer: :test
       ],
       start_permanent: Mix.env() == :prod,
-      version: "5.3.0"
+      version: "5.3.0",
+      xref: [exclude: [Explorer.Chain.Zkevm.Reader]]
     ]
   end
 

From e7bad40bc1605278db22e64ce705acbb13420e39 Mon Sep 17 00:00:00 2001
From: POA <33550681+poa@users.noreply.github.com>
Date: Tue, 24 Oct 2023 07:59:13 +0300
Subject: [PATCH 586/909] Fix transaction_controller.ex

---
 .../controllers/api/v2/transaction_controller.ex | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/transaction_controller.ex b/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/transaction_controller.ex
index 704c8b5e28bd..47d8404d4b83 100644
--- a/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/transaction_controller.ex
+++ b/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/transaction_controller.ex
@@ -68,12 +68,18 @@ defmodule BlockScoutWeb.API.V2.TransactionController do
   """
   @spec transaction(Plug.Conn.t(), map()) :: Plug.Conn.t() | {atom(), any()}
   def transaction(conn, %{"transaction_hash_param" => transaction_hash_string} = params) do
+    necessity_by_association_with_actions =
+      Map.put(@transaction_necessity_by_association, :transaction_actions, :optional)
+
     necessity_by_association =
-      @transaction_necessity_by_association
-      |> Map.put(:transaction_actions, :optional)
-      |> Map.put(:zkevm_batch, :optional)
-      |> Map.put(:zkevm_sequence_txn, :optional)
-      |> Map.put(:zkevm_verify_txn, :optional)
+      if Application.get_env(:explorer, :chain_type) == "polygon_zkevm" do
+        necessity_by_association_with_actions
+        |> Map.put(:zkevm_batch, :optional)
+        |> Map.put(:zkevm_sequence_txn, :optional)
+        |> Map.put(:zkevm_verify_txn, :optional)
+      else
+        necessity_by_association_with_actions
+      end
 
     with {:format, {:ok, transaction_hash}} <- {:format, Chain.string_to_transaction_hash(transaction_hash_string)},
          {:not_found, {:ok, transaction}} <-

From 5e3a8cb5be3f9048839aa44e2df87561eb1b7ce1 Mon Sep 17 00:00:00 2001
From: POA <33550681+poa@users.noreply.github.com>
Date: Wed, 25 Oct 2023 08:04:25 +0300
Subject: [PATCH 587/909] Set pool_size to 1 for polygon_zkevm

---
 config/runtime/dev.exs  | 4 +++-
 config/runtime/prod.exs | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/config/runtime/dev.exs b/config/runtime/dev.exs
index 63c967a6d186..b946598a3815 100644
--- a/config/runtime/dev.exs
+++ b/config/runtime/dev.exs
@@ -83,7 +83,9 @@ config :explorer, Explorer.Repo.PolygonZkevm,
   database: database,
   hostname: hostname,
   url: System.get_env("DATABASE_URL"),
-  pool_size: ConfigHelper.parse_integer_env_var("POLYGON_ZKEVM_POOL_SIZE", 10)
+  # actually this repo is not started, and its pool size remains unused.
+  # separating repos for different CHAIN_TYPE is implemented only for the sake of keeping DB schema update relevant to the current chain type
+  pool_size: 1
 
 # Configure Rootstock database
 config :explorer, Explorer.Repo.RSK,
diff --git a/config/runtime/prod.exs b/config/runtime/prod.exs
index 5bb1286c5697..a2c6569d37e1 100644
--- a/config/runtime/prod.exs
+++ b/config/runtime/prod.exs
@@ -58,7 +58,9 @@ config :explorer, Explorer.Repo.PolygonEdge,
 # Configures PolygonZkevm database
 config :explorer, Explorer.Repo.PolygonZkevm,
   url: System.get_env("DATABASE_URL"),
-  pool_size: ConfigHelper.parse_integer_env_var("POLYGON_ZKEVM_POOL_SIZE", 50),
+  # actually this repo is not started, and its pool size remains unused.
+  # separating repos for different CHAIN_TYPE is implemented only for the sake of keeping DB schema update relevant to the current chain type
+  pool_size: 1,
   ssl: ExplorerConfigHelper.ssl_enabled?()
 
 # Configures Rootstock database

From 2836ccf017d614fc0e6932f57fbe890e52c92356 Mon Sep 17 00:00:00 2001
From: POA <33550681+poa@users.noreply.github.com>
Date: Wed, 25 Oct 2023 12:27:16 +0300
Subject: [PATCH 588/909] Small refactoring

---
 .../controllers/api/v2/transaction_controller.ex      |  4 ++--
 .../block_scout_web/views/api/v2/transaction_view.ex  |  4 ++--
 apps/explorer/config/test.exs                         | 11 +----------
 apps/explorer/lib/explorer/chain/transaction.ex       |  4 ++--
 4 files changed, 7 insertions(+), 16 deletions(-)

diff --git a/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/transaction_controller.ex b/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/transaction_controller.ex
index 47d8404d4b83..ea833e30c2ae 100644
--- a/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/transaction_controller.ex
+++ b/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/transaction_controller.ex
@@ -75,8 +75,8 @@ defmodule BlockScoutWeb.API.V2.TransactionController do
       if Application.get_env(:explorer, :chain_type) == "polygon_zkevm" do
         necessity_by_association_with_actions
         |> Map.put(:zkevm_batch, :optional)
-        |> Map.put(:zkevm_sequence_txn, :optional)
-        |> Map.put(:zkevm_verify_txn, :optional)
+        |> Map.put(:zkevm_sequence_transaction, :optional)
+        |> Map.put(:zkevm_verify_transaction, :optional)
       else
         necessity_by_association_with_actions
       end
diff --git a/apps/block_scout_web/lib/block_scout_web/views/api/v2/transaction_view.ex b/apps/block_scout_web/lib/block_scout_web/views/api/v2/transaction_view.ex
index 68d0f5b1f1a7..9094eb0a0890 100644
--- a/apps/block_scout_web/lib/block_scout_web/views/api/v2/transaction_view.ex
+++ b/apps/block_scout_web/lib/block_scout_web/views/api/v2/transaction_view.ex
@@ -428,8 +428,8 @@ defmodule BlockScoutWeb.API.V2.TransactionView do
         extended_result =
           result
           |> add_optional_transaction_field(transaction, "zkevm_batch_number", :zkevm_batch, :number)
-          |> add_optional_transaction_field(transaction, "zkevm_sequence_hash", :zkevm_sequence_txn, :hash)
-          |> add_optional_transaction_field(transaction, "zkevm_verify_hash", :zkevm_verify_txn, :hash)
+          |> add_optional_transaction_field(transaction, "zkevm_sequence_hash", :zkevm_sequence_transaction, :hash)
+          |> add_optional_transaction_field(transaction, "zkevm_verify_hash", :zkevm_verify_transaction, :hash)
 
         Map.put(extended_result, "zkevm_status", zkevm_status(extended_result))
 
diff --git a/apps/explorer/config/test.exs b/apps/explorer/config/test.exs
index 1e0050cff646..339b3cb9bd37 100644
--- a/apps/explorer/config/test.exs
+++ b/apps/explorer/config/test.exs
@@ -38,7 +38,7 @@ config :explorer, Explorer.Repo.Account,
   timeout: :timer.seconds(60),
   queue_target: 1000
 
-for repo <- [Explorer.Repo.PolygonEdge, Explorer.Repo.RSK] do
+for repo <- [Explorer.Repo.PolygonEdge, Explorer.Repo.PolygonZkevm, Explorer.Repo.RSK] do
   config :explorer, repo,
     database: "explorer_test",
     hostname: "localhost",
@@ -49,15 +49,6 @@ for repo <- [Explorer.Repo.PolygonEdge, Explorer.Repo.RSK] do
     queue_target: 1000
 end
 
-config :explorer, Explorer.Repo.PolygonZkevm,
-  database: "explorer_test",
-  hostname: "localhost",
-  pool: Ecto.Adapters.SQL.Sandbox,
-  # Default of `5_000` was too low for `BlockFetcher` test
-  ownership_timeout: :timer.minutes(1),
-  timeout: :timer.seconds(60),
-  queue_target: 1000
-
 config :logger, :explorer,
   level: :warn,
   path: Path.absname("logs/test/explorer.log")
diff --git a/apps/explorer/lib/explorer/chain/transaction.ex b/apps/explorer/lib/explorer/chain/transaction.ex
index 197721cf3b7b..a4e233da0416 100644
--- a/apps/explorer/lib/explorer/chain/transaction.ex
+++ b/apps/explorer/lib/explorer/chain/transaction.ex
@@ -278,8 +278,8 @@ defmodule Explorer.Chain.Transaction do
 
     has_one(:zkevm_batch_transaction, BatchTransaction, foreign_key: :hash)
     has_one(:zkevm_batch, through: [:zkevm_batch_transaction, :batch])
-    has_one(:zkevm_sequence_txn, through: [:zkevm_batch, :sequence_transaction])
-    has_one(:zkevm_verify_txn, through: [:zkevm_batch, :verify_transaction])
+    has_one(:zkevm_sequence_transaction, through: [:zkevm_batch, :sequence_transaction])
+    has_one(:zkevm_verify_transaction, through: [:zkevm_batch, :verify_transaction])
 
     belongs_to(
       :created_contract_address,

From 30a0bb5987030daf8426c7a0bc49caa7d281861a Mon Sep 17 00:00:00 2001
From: Qwerty5Uiop <alex000010@bk.ru>
Date: Tue, 24 Oct 2023 16:24:43 +0600
Subject: [PATCH 589/909] Don't override internal transaction error if it's
 present already

---
 CHANGELOG.md                                             | 3 ++-
 apps/indexer/lib/indexer/fetcher/internal_transaction.ex | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 426ff04df2ab..00d5c4060087 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,8 +8,9 @@
 
 ### Fixes
 
-- [#8678](https://github.com/blockscout/blockscout/pull/8678) - Fix `is_verified` for `/addresses` and `/smart-contracts`
+- [#8695](https://github.com/blockscout/blockscout/pull/8695) - Don't override internal transaction error if it's present already
 - [#8685](https://github.com/blockscout/blockscout/pull/8685) - Fix db pool size exceeds Postgres max connections
+- [#8678](https://github.com/blockscout/blockscout/pull/8678) - Fix `is_verified` for `/addresses` and `/smart-contracts`
 
 ### Chore
 
diff --git a/apps/indexer/lib/indexer/fetcher/internal_transaction.ex b/apps/indexer/lib/indexer/fetcher/internal_transaction.ex
index 2e75dfb6f2c7..7fefb5b4400b 100644
--- a/apps/indexer/lib/indexer/fetcher/internal_transaction.ex
+++ b/apps/indexer/lib/indexer/fetcher/internal_transaction.ex
@@ -306,7 +306,7 @@ defmodule Indexer.Fetcher.InternalTransaction do
         |> Map.delete(:created_contract_code)
         |> Map.delete(:gas_used)
         |> Map.delete(:output)
-        |> Map.put(:error, failed_parent[:error])
+        |> Map.put_new(:error, failed_parent[:error])
       else
         internal_transaction_param
       end

From 0560fa899090c6fbf8e751ddfcd4e9e48784a919 Mon Sep 17 00:00:00 2001
From: nikitosing <32202610+nikitosing@users.noreply.github.com>
Date: Wed, 25 Oct 2023 13:43:26 +0300
Subject: [PATCH 590/909] Account: add pagination + envs for limits (#8528)

* Account: Add pagination + increase limits

* Add tests

* Add specs and docs

* Add TODO

* Dupliacte all the account endpoints + new paginated to /api/account/v2
---
 CHANGELOG.md                                  |   1 +
 .../lib/block_scout_web/api_router.ex         |  67 +++++-
 .../lib/block_scout_web/chain.ex              |  17 +-
 .../account/api/v1/user_controller.ex         |  91 +++++++-
 .../views/account/api/v1/user_view.ex         |  19 ++
 .../account/api/v1/user_controller_test.exs   | 196 +++++++++++++++++-
 .../lib/explorer/account/tag_address.ex       |  37 +++-
 .../lib/explorer/account/tag_transaction.ex   |  37 +++-
 .../lib/explorer/account/watchlist_address.ex |  41 +++-
 apps/explorer/lib/explorer/chain.ex           |   2 +-
 apps/explorer/test/support/factory.ex         |  48 ++++-
 config/runtime.exs                            |   4 +-
 docker-compose/envs/common-blockscout.env     |   4 +-
 13 files changed, 514 insertions(+), 50 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7b4c4b58a9a4..886337c4ba8a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,7 @@
 ### Features
 
 - [#8673](https://github.com/blockscout/blockscout/pull/8673) - Add a window for balances fetching from non-archive node
+- [#8528](https://github.com/blockscout/blockscout/pull/8528) - Account: add pagination + envs for limits
 - [#7584](https://github.com/blockscout/blockscout/pull/7584) - Add Polygon zkEVM batches fetcher
 
 ### Fixes
diff --git a/apps/block_scout_web/lib/block_scout_web/api_router.ex b/apps/block_scout_web/lib/block_scout_web/api_router.ex
index b1b1faa048bc..64ac1d99c7ae 100644
--- a/apps/block_scout_web/lib/block_scout_web/api_router.ex
+++ b/apps/block_scout_web/lib/block_scout_web/api_router.ex
@@ -49,6 +49,7 @@ defmodule BlockScoutWeb.ApiRouter do
   alias BlockScoutWeb.Account.Api.V1.{AuthenticateController, EmailController, TagsController, UserController}
   alias BlockScoutWeb.API.V2
 
+  # TODO: Remove /account/v1 paths
   scope "/account/v1", as: :account_v1 do
     pipe_through(:api)
     pipe_through(:account_api)
@@ -62,6 +63,70 @@ defmodule BlockScoutWeb.ApiRouter do
       get("/resend", EmailController, :resend_email)
     end
 
+    scope "/user" do
+      get("/info", UserController, :info)
+
+      get("/watchlist", UserController, :watchlist_old)
+      delete("/watchlist/:id", UserController, :delete_watchlist)
+      post("/watchlist", UserController, :create_watchlist)
+      put("/watchlist/:id", UserController, :update_watchlist)
+
+      get("/api_keys", UserController, :api_keys)
+      delete("/api_keys/:api_key", UserController, :delete_api_key)
+      post("/api_keys", UserController, :create_api_key)
+      put("/api_keys/:api_key", UserController, :update_api_key)
+
+      get("/custom_abis", UserController, :custom_abis)
+      delete("/custom_abis/:id", UserController, :delete_custom_abi)
+      post("/custom_abis", UserController, :create_custom_abi)
+      put("/custom_abis/:id", UserController, :update_custom_abi)
+
+      get("/public_tags", UserController, :public_tags_requests)
+      delete("/public_tags/:id", UserController, :delete_public_tags_request)
+      post("/public_tags", UserController, :create_public_tags_request)
+      put("/public_tags/:id", UserController, :update_public_tags_request)
+
+      scope "/tags" do
+        get("/address/", UserController, :tags_address_old)
+        get("/address/:id", UserController, :tags_address)
+        delete("/address/:id", UserController, :delete_tag_address)
+        post("/address/", UserController, :create_tag_address)
+        put("/address/:id", UserController, :update_tag_address)
+
+        get("/transaction/", UserController, :tags_transaction_old)
+        get("/transaction/:id", UserController, :tags_transaction)
+        delete("/transaction/:id", UserController, :delete_tag_transaction)
+        post("/transaction/", UserController, :create_tag_transaction)
+        put("/transaction/:id", UserController, :update_tag_transaction)
+      end
+    end
+  end
+
+  # TODO: Remove /account/v1 paths
+  scope "/account/v1" do
+    pipe_through(:api)
+    pipe_through(:account_api)
+
+    scope "/tags" do
+      get("/address/:address_hash", TagsController, :tags_address)
+
+      get("/transaction/:transaction_hash", TagsController, :tags_transaction)
+    end
+  end
+
+  scope "/account/v2", as: :account_v2 do
+    pipe_through(:api)
+    pipe_through(:account_api)
+
+    get("/authenticate", AuthenticateController, :authenticate_get)
+    post("/authenticate", AuthenticateController, :authenticate_post)
+
+    get("/get_csrf", UserController, :get_csrf)
+
+    scope "/email" do
+      get("/resend", EmailController, :resend_email)
+    end
+
     scope "/user" do
       get("/info", UserController, :info)
 
@@ -101,7 +166,7 @@ defmodule BlockScoutWeb.ApiRouter do
     end
   end
 
-  scope "/account/v1" do
+  scope "/account/v2" do
     pipe_through(:api)
     pipe_through(:account_api)
 
diff --git a/apps/block_scout_web/lib/block_scout_web/chain.ex b/apps/block_scout_web/lib/block_scout_web/chain.ex
index 97f291feaec4..dc3bcbe83780 100644
--- a/apps/block_scout_web/lib/block_scout_web/chain.ex
+++ b/apps/block_scout_web/lib/block_scout_web/chain.ex
@@ -17,6 +17,7 @@ defmodule BlockScoutWeb.Chain do
 
   import Explorer.Helper, only: [parse_integer: 1]
 
+  alias Explorer.Account.{TagAddress, TagTransaction, WatchlistAddress}
   alias Explorer.Chain.Block.Reward
 
   alias Explorer.Chain.{
@@ -365,7 +366,7 @@ defmodule BlockScoutWeb.Chain do
     end
   end
 
-  # clause for Polygon Edge Deposits and Withdrawals
+  # clause for Polygon Edge Deposits and Withdrawals and for account's entities pagination
   def paging_options(%{"id" => id_string}) when is_binary(id_string) do
     case Integer.parse(id_string) do
       {id, ""} ->
@@ -376,7 +377,7 @@ defmodule BlockScoutWeb.Chain do
     end
   end
 
-  # clause for Polygon Edge Deposits and Withdrawals
+  # clause for Polygon Edge Deposits and Withdrawals and for account's entities pagination
   def paging_options(%{"id" => id}) when is_integer(id) do
     [paging_options: %{@default_paging_options | key: {id}}]
   end
@@ -484,6 +485,18 @@ defmodule BlockScoutWeb.Chain do
     }
   end
 
+  defp paging_params(%TagAddress{id: id}) do
+    %{"id" => id}
+  end
+
+  defp paging_params(%TagTransaction{id: id}) do
+    %{"id" => id}
+  end
+
+  defp paging_params(%WatchlistAddress{id: id}) do
+    %{"id" => id}
+  end
+
   defp paging_params([%Token{} = token, _]) do
     paging_params(token)
   end
diff --git a/apps/block_scout_web/lib/block_scout_web/controllers/account/api/v1/user_controller.ex b/apps/block_scout_web/lib/block_scout_web/controllers/account/api/v1/user_controller.ex
index 544e2a1c5231..724378cc69d6 100644
--- a/apps/block_scout_web/lib/block_scout_web/controllers/account/api/v1/user_controller.ex
+++ b/apps/block_scout_web/lib/block_scout_web/controllers/account/api/v1/user_controller.ex
@@ -2,6 +2,16 @@ defmodule BlockScoutWeb.Account.Api.V1.UserController do
   use BlockScoutWeb, :controller
 
   import BlockScoutWeb.Account.AuthController, only: [current_user: 1]
+
+  import BlockScoutWeb.Chain,
+    only: [
+      next_page_params: 3,
+      paging_options: 1,
+      split_list_by_page: 1
+    ]
+
+  import BlockScoutWeb.PagingHelper, only: [delete_parameters_from_next_page_params: 1]
+
   import Ecto.Query, only: [from: 2]
 
   alias BlockScoutWeb.Models.UserFromAuth
@@ -25,7 +35,7 @@ defmodule BlockScoutWeb.Account.Api.V1.UserController do
     end
   end
 
-  def watchlist(conn, _params) do
+  def watchlist_old(conn, _params) do
     with {:auth, %{id: uid}} <- {:auth, current_user(conn)},
          {:identity, %Identity{} = identity} <- {:identity, UserFromAuth.find_identity(uid)},
          {:watchlist, %{watchlists: [watchlist | _]}} <-
@@ -63,6 +73,51 @@ defmodule BlockScoutWeb.Account.Api.V1.UserController do
     end
   end
 
+  def watchlist(conn, params) do
+    with {:auth, %{id: uid}} <- {:auth, current_user(conn)},
+         {:identity, %Identity{} = identity} <- {:identity, UserFromAuth.find_identity(uid)},
+         {:watchlist, %{watchlists: [watchlist | _]}} <-
+           {:watchlist, Repo.account_repo().preload(identity, :watchlists)} do
+      results_plus_one = WatchlistAddress.get_watchlist_addresses_by_watchlist_id(watchlist.id, paging_options(params))
+
+      {watchlist_addresses, next_page} = split_list_by_page(results_plus_one)
+
+      next_page_params =
+        next_page |> next_page_params(watchlist_addresses, delete_parameters_from_next_page_params(params))
+
+      watchlist_addresses_prepared =
+        Enum.map(watchlist_addresses, fn wa ->
+          balances =
+            Chain.fetch_paginated_last_token_balances(wa.address_hash,
+              paging_options: %PagingOptions{page_size: @token_balances_amount + 1}
+            )
+
+          count = Enum.count(balances)
+          overflow? = count > @token_balances_amount
+
+          fiat_sum =
+            balances
+            |> Enum.take(@token_balances_amount)
+            |> Enum.reduce(Decimal.new(0), fn tb, acc -> Decimal.add(acc, tb.fiat_value || 0) end)
+
+          %WatchlistAddress{
+            wa
+            | tokens_fiat_value: fiat_sum,
+              tokens_count: min(count, @token_balances_amount),
+              tokens_overflow: overflow?
+          }
+        end)
+
+      conn
+      |> put_status(200)
+      |> render(:watchlist_addresses, %{
+        exchange_rate: Market.get_coin_exchange_rate(),
+        watchlist_addresses: watchlist_addresses_prepared,
+        next_page_params: next_page_params
+      })
+    end
+  end
+
   def delete_watchlist(conn, %{"id" => watchlist_address_id}) do
     with {:auth, %{id: uid}} <- {:auth, current_user(conn)},
          {:identity, %Identity{} = identity} <- {:identity, UserFromAuth.find_identity(uid)},
@@ -188,7 +243,7 @@ defmodule BlockScoutWeb.Account.Api.V1.UserController do
     end
   end
 
-  def tags_address(conn, _params) do
+  def tags_address_old(conn, _params) do
     with {:auth, %{id: uid}} <- {:auth, current_user(conn)},
          {:identity, %Identity{} = identity} <- {:identity, UserFromAuth.find_identity(uid)},
          address_tags <- TagAddress.get_tags_address_by_identity_id(identity.id) do
@@ -198,6 +253,21 @@ defmodule BlockScoutWeb.Account.Api.V1.UserController do
     end
   end
 
+  def tags_address(conn, params) do
+    with {:auth, %{id: uid}} <- {:auth, current_user(conn)},
+         {:identity, %Identity{} = identity} <- {:identity, UserFromAuth.find_identity(uid)} do
+      results_plus_one = TagAddress.get_tags_address_by_identity_id(identity.id, paging_options(params))
+
+      {tags, next_page} = split_list_by_page(results_plus_one)
+
+      next_page_params = next_page |> next_page_params(tags, delete_parameters_from_next_page_params(params))
+
+      conn
+      |> put_status(200)
+      |> render(:address_tags, %{address_tags: tags, next_page_params: next_page_params})
+    end
+  end
+
   def delete_tag_address(conn, %{"id" => tag_id}) do
     with {:auth, %{id: uid}} <- {:auth, current_user(conn)},
          {:identity, %Identity{} = identity} <- {:identity, UserFromAuth.find_identity(uid)},
@@ -242,7 +312,7 @@ defmodule BlockScoutWeb.Account.Api.V1.UserController do
     end
   end
 
-  def tags_transaction(conn, _params) do
+  def tags_transaction_old(conn, _params) do
     with {:auth, %{id: uid}} <- {:auth, current_user(conn)},
          {:identity, %Identity{} = identity} <- {:identity, UserFromAuth.find_identity(uid)},
          transaction_tags <- TagTransaction.get_tags_transaction_by_identity_id(identity.id) do
@@ -252,6 +322,21 @@ defmodule BlockScoutWeb.Account.Api.V1.UserController do
     end
   end
 
+  def tags_transaction(conn, params) do
+    with {:auth, %{id: uid}} <- {:auth, current_user(conn)},
+         {:identity, %Identity{} = identity} <- {:identity, UserFromAuth.find_identity(uid)} do
+      results_plus_one = TagTransaction.get_tags_transaction_by_identity_id(identity.id, paging_options(params))
+
+      {tags, next_page} = split_list_by_page(results_plus_one)
+
+      next_page_params = next_page |> next_page_params(tags, delete_parameters_from_next_page_params(params))
+
+      conn
+      |> put_status(200)
+      |> render(:transaction_tags, %{transaction_tags: tags, next_page_params: next_page_params})
+    end
+  end
+
   def delete_tag_transaction(conn, %{"id" => tag_id}) do
     with {:auth, %{id: uid}} <- {:auth, current_user(conn)},
          {:identity, %Identity{} = identity} <- {:identity, UserFromAuth.find_identity(uid)},
diff --git a/apps/block_scout_web/lib/block_scout_web/views/account/api/v1/user_view.ex b/apps/block_scout_web/lib/block_scout_web/views/account/api/v1/user_view.ex
index 1dd819166a27..26c8d7c8295b 100644
--- a/apps/block_scout_web/lib/block_scout_web/views/account/api/v1/user_view.ex
+++ b/apps/block_scout_web/lib/block_scout_web/views/account/api/v1/user_view.ex
@@ -12,6 +12,17 @@ defmodule BlockScoutWeb.Account.Api.V1.UserView do
     %{"name" => identity.name, "email" => identity.email, "avatar" => identity.avatar, "nickname" => identity.nickname}
   end
 
+  def render("watchlist_addresses.json", %{
+        watchlist_addresses: watchlist_addresses,
+        exchange_rate: exchange_rate,
+        next_page_params: next_page_params
+      }) do
+    %{
+      "items" => Enum.map(watchlist_addresses, &prepare_watchlist_address(&1, exchange_rate)),
+      "next_page_params" => next_page_params
+    }
+  end
+
   def render("watchlist_addresses.json", %{watchlist_addresses: watchlist_addresses, exchange_rate: exchange_rate}) do
     Enum.map(watchlist_addresses, &prepare_watchlist_address(&1, exchange_rate))
   end
@@ -20,6 +31,10 @@ defmodule BlockScoutWeb.Account.Api.V1.UserView do
     prepare_watchlist_address(watchlist_address, exchange_rate)
   end
 
+  def render("address_tags.json", %{address_tags: address_tags, next_page_params: next_page_params}) do
+    %{"items" => Enum.map(address_tags, &prepare_address_tag/1), "next_page_params" => next_page_params}
+  end
+
   def render("address_tags.json", %{address_tags: address_tags}) do
     Enum.map(address_tags, &prepare_address_tag/1)
   end
@@ -28,6 +43,10 @@ defmodule BlockScoutWeb.Account.Api.V1.UserView do
     prepare_address_tag(address_tag)
   end
 
+  def render("transaction_tags.json", %{transaction_tags: transaction_tags, next_page_params: next_page_params}) do
+    %{"items" => Enum.map(transaction_tags, &prepare_transaction_tag/1), "next_page_params" => next_page_params}
+  end
+
   def render("transaction_tags.json", %{transaction_tags: transaction_tags}) do
     Enum.map(transaction_tags, &prepare_transaction_tag/1)
   end
diff --git a/apps/block_scout_web/test/block_scout_web/controllers/account/api/v1/user_controller_test.exs b/apps/block_scout_web/test/block_scout_web/controllers/account/api/v1/user_controller_test.exs
index 810751d6ff0c..2a8639bfdc62 100644
--- a/apps/block_scout_web/test/block_scout_web/controllers/account/api/v1/user_controller_test.exs
+++ b/apps/block_scout_web/test/block_scout_web/controllers/account/api/v1/user_controller_test.exs
@@ -1,8 +1,14 @@
 defmodule BlockScoutWeb.Account.Api.V1.UserControllerTest do
   use BlockScoutWeb.ConnCase
 
-  alias Explorer.Repo
+  alias Explorer.Account.{
+    TagAddress,
+    TagTransaction,
+    WatchlistAddress
+  }
+
   alias Explorer.Chain.Address
+  alias Explorer.Repo
   alias BlockScoutWeb.Models.UserFromAuth
 
   setup %{conn: conn} do
@@ -48,6 +54,50 @@ defmodule BlockScoutWeb.Account.Api.V1.UserControllerTest do
       assert tag_address_response["id"]
     end
 
+    test "can't insert private address tags more than limit", %{conn: conn, user: user} do
+      old_env = Application.get_env(:explorer, Explorer.Account)
+
+      new_env =
+        old_env
+        |> Keyword.replace(:private_tags_limit, 5)
+        |> Keyword.replace(:watchlist_addresses_limit, 5)
+
+      Application.put_env(:explorer, Explorer.Account, new_env)
+
+      for _ <- 0..3 do
+        build(:tag_address_db, user: user) |> Repo.account_repo().insert()
+      end
+
+      assert conn
+             |> post("/api/account/v1/user/tags/address", build(:tag_address))
+             |> json_response(200)
+
+      assert conn
+             |> post("/api/account/v1/user/tags/address", build(:tag_address))
+             |> json_response(422)
+
+      Application.put_env(:explorer, Explorer.Account, old_env)
+    end
+
+    test "check address tags pagination", %{conn: conn, user: user} do
+      tags_address =
+        for _ <- 0..50 do
+          build(:tag_address_db, user: user) |> Repo.account_repo().insert!()
+        end
+
+      assert response =
+               conn
+               |> get("/api/account/v2/user/tags/address")
+               |> json_response(200)
+
+      response_1 =
+        conn
+        |> get("/api/account/v2/user/tags/address", response["next_page_params"])
+        |> json_response(200)
+
+      check_paginated_response(response, response_1, tags_address)
+    end
+
     test "edit private address tag", %{conn: conn} do
       address_tag = build(:tag_address)
 
@@ -236,6 +286,50 @@ defmodule BlockScoutWeb.Account.Api.V1.UserControllerTest do
       assert tag_transaction_response["id"]
     end
 
+    test "can't insert private transaction tags more than limit", %{conn: conn, user: user} do
+      old_env = Application.get_env(:explorer, Explorer.Account)
+
+      new_env =
+        old_env
+        |> Keyword.replace(:private_tags_limit, 5)
+        |> Keyword.replace(:watchlist_addresses_limit, 5)
+
+      Application.put_env(:explorer, Explorer.Account, new_env)
+
+      for _ <- 0..3 do
+        build(:tag_transaction_db, user: user) |> Repo.account_repo().insert()
+      end
+
+      assert conn
+             |> post("/api/account/v1/user/tags/transaction", build(:tag_transaction))
+             |> json_response(200)
+
+      assert conn
+             |> post("/api/account/v1/user/tags/transaction", build(:tag_transaction))
+             |> json_response(422)
+
+      Application.put_env(:explorer, Explorer.Account, old_env)
+    end
+
+    test "check transaction tags pagination", %{conn: conn, user: user} do
+      tags_address =
+        for _ <- 0..50 do
+          build(:tag_transaction_db, user: user) |> Repo.account_repo().insert!()
+        end
+
+      assert response =
+               conn
+               |> get("/api/account/v2/user/tags/transaction")
+               |> json_response(200)
+
+      response_1 =
+        conn
+        |> get("/api/account/v2/user/tags/transaction", response["next_page_params"])
+        |> json_response(200)
+
+      check_paginated_response(response, response_1, tags_address)
+    end
+
     test "edit private transaction tag", %{conn: conn} do
       tx_tag = build(:tag_transaction)
 
@@ -422,6 +516,50 @@ defmodule BlockScoutWeb.Account.Api.V1.UserControllerTest do
       assert get_watchlist_address_response_1_1["id"] == post_watchlist_address_response_1["id"]
     end
 
+    test "can't insert watchlist addresses more than limit", %{conn: conn, user: user} do
+      old_env = Application.get_env(:explorer, Explorer.Account)
+
+      new_env =
+        old_env
+        |> Keyword.replace(:private_tags_limit, 5)
+        |> Keyword.replace(:watchlist_addresses_limit, 5)
+
+      Application.put_env(:explorer, Explorer.Account, new_env)
+
+      for _ <- 0..3 do
+        build(:watchlist_address_db, wl_id: user.watchlist_id) |> Repo.account_repo().insert()
+      end
+
+      assert conn
+             |> post("/api/account/v1/user/watchlist", build(:watchlist_address))
+             |> json_response(200)
+
+      assert conn
+             |> post("/api/account/v1/user/watchlist", build(:watchlist_address))
+             |> json_response(422)
+
+      Application.put_env(:explorer, Explorer.Account, old_env)
+    end
+
+    test "check watchlist tags pagination", %{conn: conn, user: user} do
+      tags_address =
+        for _ <- 0..50 do
+          build(:watchlist_address_db, wl_id: user.watchlist_id) |> Repo.account_repo().insert!()
+        end
+
+      assert response =
+               conn
+               |> get("/api/account/v2/user/watchlist")
+               |> json_response(200)
+
+      response_1 =
+        conn
+        |> get("/api/account/v2/user/watchlist", response["next_page_params"] |> dbg())
+        |> json_response(200)
+
+      check_paginated_response(response, response_1, tags_address)
+    end
+
     test "delete watchlist address", %{conn: conn} do
       watchlist_address_map = build(:watchlist_address)
 
@@ -625,14 +763,14 @@ defmodule BlockScoutWeb.Account.Api.V1.UserControllerTest do
 
       [wa2, wa1] = conn |> get("/api/account/v1/user/watchlist") |> json_response(200)
 
-      assert wa1["tokens_fiat_value"] |> Decimal.new() |> Decimal.round(14) ==
-               values |> Enum.reduce(Decimal.new(0), fn x, acc -> Decimal.add(x, acc) end) |> Decimal.round(14)
+      assert wa1["tokens_fiat_value"] |> Decimal.new() |> Decimal.round(13) ==
+               values |> Enum.reduce(Decimal.new(0), fn x, acc -> Decimal.add(x, acc) end) |> Decimal.round(13)
 
       assert wa1["tokens_count"] == 150
       assert wa1["tokens_overflow"] == false
 
-      assert wa2["tokens_fiat_value"] |> Decimal.new() |> Decimal.round(14) ==
-               values_1 |> Enum.reduce(Decimal.new(0), fn x, acc -> Decimal.add(x, acc) end) |> Decimal.round(14)
+      assert wa2["tokens_fiat_value"] |> Decimal.new() |> Decimal.round(13) ==
+               values_1 |> Enum.reduce(Decimal.new(0), fn x, acc -> Decimal.add(x, acc) end) |> Decimal.round(13)
 
       assert wa2["tokens_count"] == 150
       assert wa2["tokens_overflow"] == true
@@ -1051,4 +1189,52 @@ defmodule BlockScoutWeb.Account.Api.V1.UserControllerTest do
     {:ok, time, _} = DateTime.from_iso8601(request["submission_date"])
     %{request | "submission_date" => Calendar.strftime(time, "%b %d, %Y")}
   end
+
+  defp compare_item(%TagAddress{} = tag_address, json) do
+    assert json["address_hash"] == to_string(tag_address.address_hash)
+    assert json["name"] == tag_address.name
+    assert json["id"] == tag_address.id
+    assert json["address"]["hash"] == Address.checksum(tag_address.address_hash)
+  end
+
+  defp compare_item(%TagTransaction{} = tag_transaction, json) do
+    assert json["transaction_hash"] == to_string(tag_transaction.tx_hash)
+    assert json["name"] == tag_transaction.name
+    assert json["id"] == tag_transaction.id
+  end
+
+  defp compare_item(%WatchlistAddress{} = watchlist, json) do
+    notification_settings = %{
+      "native" => %{
+        "incoming" => watchlist.watch_coin_input,
+        "outcoming" => watchlist.watch_coin_output
+      },
+      "ERC-20" => %{
+        "incoming" => watchlist.watch_erc_20_input,
+        "outcoming" => watchlist.watch_erc_20_output
+      },
+      "ERC-721" => %{
+        "incoming" => watchlist.watch_erc_721_input,
+        "outcoming" => watchlist.watch_erc_721_output
+      }
+    }
+
+    assert json["address_hash"] == to_string(watchlist.address_hash)
+    assert json["name"] == watchlist.name
+    assert json["id"] == watchlist.id
+    assert json["address"]["hash"] == Address.checksum(watchlist.address_hash)
+    assert json["notification_methods"]["email"] == watchlist.notify_email
+    assert json["notification_settings"] == notification_settings
+  end
+
+  defp check_paginated_response(first_page_resp, second_page_resp, list) do
+    assert Enum.count(first_page_resp["items"]) == 50
+    assert first_page_resp["next_page_params"] != nil
+    compare_item(Enum.at(list, 50), Enum.at(first_page_resp["items"], 0))
+    compare_item(Enum.at(list, 1), Enum.at(first_page_resp["items"], 49))
+
+    assert Enum.count(second_page_resp["items"]) == 1
+    assert second_page_resp["next_page_params"] == nil
+    compare_item(Enum.at(list, 0), Enum.at(second_page_resp["items"], 0))
+  end
 end
diff --git a/apps/explorer/lib/explorer/account/tag_address.ex b/apps/explorer/lib/explorer/account/tag_address.ex
index 546632773ea4..5d38db529a6d 100644
--- a/apps/explorer/lib/explorer/account/tag_address.ex
+++ b/apps/explorer/lib/explorer/account/tag_address.ex
@@ -9,13 +9,11 @@ defmodule Explorer.Account.TagAddress do
 
   alias Ecto.Changeset
   alias Explorer.Account.Identity
-  alias Explorer.{Chain, Repo}
+  alias Explorer.{Chain, PagingOptions, Repo}
   alias Explorer.Chain.{Address, Hash}
 
   import Explorer.Chain, only: [hash_to_lower_case_string: 1]
 
-  @max_tag_address_per_account 15
-
   schema "account_tag_addresses" do
     field(:address_hash_hash, Cloak.Ecto.SHA256)
     field(:name, Explorer.Encrypted.Binary)
@@ -70,12 +68,14 @@ defmodule Explorer.Account.TagAddress do
   end
 
   def tag_address_count_constraint(%Changeset{changes: %{identity_id: identity_id}} = tag_address) do
+    max_tags_count = get_max_tags_count()
+
     if identity_id
        |> tags_address_by_identity_id_query()
-       |> limit(@max_tag_address_per_account)
-       |> Repo.account_repo().aggregate(:count, :id) >= @max_tag_address_per_account do
+       |> limit(^max_tags_count)
+       |> Repo.account_repo().aggregate(:count, :id) >= max_tags_count do
       tag_address
-      |> add_error(:name, "Max #{@max_tag_address_per_account} tags per account")
+      |> add_error(:name, "Max #{max_tags_count} tags per account")
     else
       tag_address
     end
@@ -86,18 +86,35 @@ defmodule Explorer.Account.TagAddress do
   def tags_address_by_identity_id_query(id) when not is_nil(id) do
     __MODULE__
     |> where([tag], tag.identity_id == ^id)
-    |> order_by([tag], desc: tag.id)
   end
 
   def tags_address_by_identity_id_query(_), do: nil
 
-  def get_tags_address_by_identity_id(id) when not is_nil(id) do
+  @doc """
+    Query paginated private address tags by identity id
+  """
+  @spec get_tags_address_by_identity_id(integer(), [Chain.paging_options()]) :: [__MODULE__]
+  def get_tags_address_by_identity_id(id, options \\ [])
+
+  def get_tags_address_by_identity_id(id, options) when not is_nil(id) do
+    paging_options = Keyword.get(options, :paging_options, Chain.default_paging_options())
+
     id
     |> tags_address_by_identity_id_query()
+    |> order_by([tag], desc: tag.id)
+    |> page_address_tags(paging_options)
+    |> limit(^paging_options.page_size)
     |> Repo.account_repo().all()
   end
 
-  def get_tags_address_by_identity_id(_), do: nil
+  def get_tags_address_by_identity_id(_, _), do: []
+
+  defp page_address_tags(query, %PagingOptions{key: {id}}) do
+    query
+    |> where([tag], tag.id < ^id)
+  end
+
+  defp page_address_tags(query, _), do: query
 
   def tag_address_by_address_hash_and_identity_id_query(address_hash, identity_id)
       when not is_nil(address_hash) and not is_nil(identity_id) do
@@ -152,5 +169,5 @@ defmodule Explorer.Account.TagAddress do
     end
   end
 
-  def get_max_tags_count, do: @max_tag_address_per_account
+  def get_max_tags_count, do: Application.get_env(:explorer, Explorer.Account)[:private_tags_limit]
 end
diff --git a/apps/explorer/lib/explorer/account/tag_transaction.ex b/apps/explorer/lib/explorer/account/tag_transaction.ex
index 086488ab2341..b821fffcf9a0 100644
--- a/apps/explorer/lib/explorer/account/tag_transaction.ex
+++ b/apps/explorer/lib/explorer/account/tag_transaction.ex
@@ -9,11 +9,9 @@ defmodule Explorer.Account.TagTransaction do
 
   alias Ecto.Changeset
   alias Explorer.Account.Identity
-  alias Explorer.{Chain, Repo}
+  alias Explorer.{Chain, PagingOptions, Repo}
   import Explorer.Chain, only: [hash_to_lower_case_string: 1]
 
-  @max_tag_transaction_per_account 15
-
   schema "account_tag_transactions" do
     field(:tx_hash_hash, Cloak.Ecto.SHA256)
     field(:name, Explorer.Encrypted.Binary)
@@ -69,12 +67,14 @@ defmodule Explorer.Account.TagTransaction do
   end
 
   def tag_transaction_count_constraint(%Changeset{changes: %{identity_id: identity_id}} = tag_transaction) do
+    max_tags_count = get_max_tags_count()
+
     if identity_id
        |> tags_transaction_by_identity_id_query()
-       |> limit(@max_tag_transaction_per_account)
-       |> Repo.account_repo().aggregate(:count, :id) >= @max_tag_transaction_per_account do
+       |> limit(^max_tags_count)
+       |> Repo.account_repo().aggregate(:count, :id) >= max_tags_count do
       tag_transaction
-      |> add_error(:name, "Max #{@max_tag_transaction_per_account} tags per account")
+      |> add_error(:name, "Max #{max_tags_count} tags per account")
     else
       tag_transaction
     end
@@ -85,18 +85,35 @@ defmodule Explorer.Account.TagTransaction do
   def tags_transaction_by_identity_id_query(id) when not is_nil(id) do
     __MODULE__
     |> where([tag], tag.identity_id == ^id)
-    |> order_by([tag], desc: tag.id)
   end
 
   def tags_transaction_by_identity_id_query(_), do: nil
 
-  def get_tags_transaction_by_identity_id(id) when not is_nil(id) do
+  @doc """
+    Query paginated private transaction tags by identity id
+  """
+  @spec get_tags_transaction_by_identity_id(integer(), [Chain.paging_options()]) :: [__MODULE__]
+  def get_tags_transaction_by_identity_id(id, options \\ [])
+
+  def get_tags_transaction_by_identity_id(id, options) when not is_nil(id) do
+    paging_options = Keyword.get(options, :paging_options, Chain.default_paging_options())
+
     id
     |> tags_transaction_by_identity_id_query()
+    |> order_by([tag], desc: tag.id)
+    |> page_transaction_tags(paging_options)
+    |> limit(^paging_options.page_size)
     |> Repo.account_repo().all()
   end
 
-  def get_tags_transaction_by_identity_id(_), do: nil
+  def get_tags_transaction_by_identity_id(_, _), do: []
+
+  defp page_transaction_tags(query, %PagingOptions{key: {id}}) do
+    query
+    |> where([tag], tag.id < ^id)
+  end
+
+  defp page_transaction_tags(query, _), do: query
 
   def tag_transaction_by_transaction_hash_and_identity_id_query(tx_hash, identity_id)
       when not is_nil(tx_hash) and not is_nil(identity_id) do
@@ -151,7 +168,7 @@ defmodule Explorer.Account.TagTransaction do
     end
   end
 
-  def get_max_tags_count, do: @max_tag_transaction_per_account
+  def get_max_tags_count, do: Application.get_env(:explorer, Explorer.Account)[:private_tags_limit]
 end
 
 defimpl Jason.Encoder, for: Explorer.Account.TagTransaction do
diff --git a/apps/explorer/lib/explorer/account/watchlist_address.ex b/apps/explorer/lib/explorer/account/watchlist_address.ex
index aab74b457948..e488ac758e13 100644
--- a/apps/explorer/lib/explorer/account/watchlist_address.ex
+++ b/apps/explorer/lib/explorer/account/watchlist_address.ex
@@ -10,13 +10,11 @@ defmodule Explorer.Account.WatchlistAddress do
   alias Ecto.Changeset
   alias Explorer.Account.Notifier.ForbiddenAddress
   alias Explorer.Account.Watchlist
-  alias Explorer.{Chain, Repo}
+  alias Explorer.{Chain, PagingOptions, Repo}
   alias Explorer.Chain.{Address, Wei}
 
   import Explorer.Chain, only: [hash_to_lower_case_string: 1]
 
-  @max_watchlist_addresses_per_account 10
-
   schema "account_watchlist_addresses" do
     field(:address_hash_hash, Cloak.Ecto.SHA256)
     field(:name, Explorer.Encrypted.Binary)
@@ -79,12 +77,14 @@ defmodule Explorer.Account.WatchlistAddress do
   end
 
   def watchlist_address_count_constraint(%Changeset{changes: %{watchlist_id: watchlist_id}} = watchlist_address) do
+    max_watchlist_addresses_count = get_max_watchlist_addresses_count()
+
     if watchlist_id
        |> watchlist_addresses_by_watchlist_id_query()
-       |> limit(@max_watchlist_addresses_per_account)
-       |> Repo.account_repo().aggregate(:count, :id) >= @max_watchlist_addresses_per_account do
+       |> limit(^max_watchlist_addresses_count)
+       |> Repo.account_repo().aggregate(:count, :id) >= max_watchlist_addresses_count do
       watchlist_address
-      |> add_error(:name, "Max #{@max_watchlist_addresses_per_account} watch list addresses per account")
+      |> add_error(:name, "Max #{max_watchlist_addresses_count} watch list addresses per account")
     else
       watchlist_address
     end
@@ -122,6 +122,32 @@ defmodule Explorer.Account.WatchlistAddress do
 
   def watchlist_addresses_by_watchlist_id_query(_), do: nil
 
+  @doc """
+    Query paginated watchlist addresses by watchlist id
+  """
+  @spec get_watchlist_addresses_by_watchlist_id(integer(), [Chain.paging_options()]) :: [__MODULE__]
+  def get_watchlist_addresses_by_watchlist_id(watchlist_id, options \\ [])
+
+  def get_watchlist_addresses_by_watchlist_id(watchlist_id, options) when not is_nil(watchlist_id) do
+    paging_options = Keyword.get(options, :paging_options, Chain.default_paging_options())
+
+    watchlist_id
+    |> watchlist_addresses_by_watchlist_id_query()
+    |> order_by([wla], desc: wla.id)
+    |> page_watchlist_address(paging_options)
+    |> limit(^paging_options.page_size)
+    |> Repo.account_repo().all()
+  end
+
+  def get_watchlist_addresses_by_watchlist_id(_, _), do: []
+
+  defp page_watchlist_address(query, %PagingOptions{key: {id}}) do
+    query
+    |> where([wla], wla.id < ^id)
+  end
+
+  defp page_watchlist_address(query, _), do: query
+
   def watchlist_address_by_id_and_watchlist_id_query(watchlist_address_id, watchlist_id)
       when not is_nil(watchlist_address_id) and not is_nil(watchlist_id) do
     __MODULE__
@@ -160,7 +186,8 @@ defmodule Explorer.Account.WatchlistAddress do
     end
   end
 
-  def get_max_watchlist_addresses_count, do: @max_watchlist_addresses_per_account
+  def get_max_watchlist_addresses_count,
+    do: Application.get_env(:explorer, Explorer.Account)[:watchlist_addresses_limit]
 
   def preload_address_fetched_coin_balance(%Watchlist{watchlist_addresses: watchlist_addresses} = watchlist) do
     w_addresses =
diff --git a/apps/explorer/lib/explorer/chain.ex b/apps/explorer/lib/explorer/chain.ex
index 422f1dabf1f2..fa2d966024e3 100644
--- a/apps/explorer/lib/explorer/chain.ex
+++ b/apps/explorer/lib/explorer/chain.ex
@@ -165,7 +165,7 @@ defmodule Explorer.Chain do
   @type necessity_by_association :: %{association => necessity}
 
   @typep necessity_by_association_option :: {:necessity_by_association, necessity_by_association}
-  @typep paging_options :: {:paging_options, PagingOptions.t()}
+  @type paging_options :: {:paging_options, PagingOptions.t()}
   @typep balance_by_day :: %{date: String.t(), value: Wei.t()}
   @type api? :: {:api?, true | false}
 
diff --git a/apps/explorer/test/support/factory.ex b/apps/explorer/test/support/factory.ex
index b85a0fff6d82..33c9f6347796 100644
--- a/apps/explorer/test/support/factory.ex
+++ b/apps/explorer/test/support/factory.ex
@@ -9,6 +9,8 @@ defmodule Explorer.Factory do
 
   alias Explorer.Account.{
     Identity,
+    TagAddress,
+    TagTransaction,
     Watchlist,
     WatchlistAddress
   }
@@ -107,6 +109,26 @@ defmodule Explorer.Factory do
     }
   end
 
+  def watchlist_address_db_factory(%{wl_id: id}) do
+    hash = build(:address).hash
+
+    %WatchlistAddress{
+      name: sequence("test"),
+      watchlist_id: id,
+      address_hash: hash,
+      address_hash_hash: hash_to_lower_case_string(hash),
+      watch_coin_input: random_bool(),
+      watch_coin_output: random_bool(),
+      watch_erc_20_input: random_bool(),
+      watch_erc_20_output: random_bool(),
+      watch_erc_721_input: random_bool(),
+      watch_erc_721_output: random_bool(),
+      watch_erc_1155_input: random_bool(),
+      watch_erc_1155_output: random_bool(),
+      notify_email: random_bool()
+    }
+  end
+
   def custom_abi_factory do
     contract_address_hash = to_string(insert(:contract_address).hash)
 
@@ -140,6 +162,14 @@ defmodule Explorer.Factory do
     %{"name" => sequence("name"), "transaction_hash" => to_string(insert(:transaction).hash)}
   end
 
+  def tag_address_db_factory(%{user: user}) do
+    %TagAddress{name: sequence("name"), address_hash: build(:address).hash, identity_id: user.id}
+  end
+
+  def tag_transaction_db_factory(%{user: user}) do
+    %TagTransaction{name: sequence("name"), tx_hash: insert(:transaction).hash, identity_id: user.id}
+  end
+
   def address_to_tag_factory do
     %AddressToTag{
       tag: build(:address_tag),
@@ -162,15 +192,15 @@ defmodule Explorer.Factory do
       watchlist: build(:account_watchlist),
       address_hash: hash,
       address_hash_hash: hash_to_lower_case_string(hash),
-      watch_coin_input: true,
-      watch_coin_output: true,
-      watch_erc_20_input: true,
-      watch_erc_20_output: true,
-      watch_erc_721_input: true,
-      watch_erc_721_output: true,
-      watch_erc_1155_input: true,
-      watch_erc_1155_output: true,
-      notify_email: true
+      watch_coin_input: random_bool(),
+      watch_coin_output: random_bool(),
+      watch_erc_20_input: random_bool(),
+      watch_erc_20_output: random_bool(),
+      watch_erc_721_input: random_bool(),
+      watch_erc_721_output: random_bool(),
+      watch_erc_1155_input: random_bool(),
+      watch_erc_1155_output: random_bool(),
+      notify_email: random_bool()
     }
   end
 
diff --git a/config/runtime.exs b/config/runtime.exs
index aafccbbf2d3f..4d0650988cbe 100644
--- a/config/runtime.exs
+++ b/config/runtime.exs
@@ -401,7 +401,9 @@ config :explorer, Explorer.Account,
     sender: System.get_env("ACCOUNT_SENDGRID_SENDER"),
     template: System.get_env("ACCOUNT_SENDGRID_TEMPLATE")
   ],
-  resend_interval: ConfigHelper.parse_time_env_var("ACCOUNT_VERIFICATION_EMAIL_RESEND_INTERVAL", "5m")
+  resend_interval: ConfigHelper.parse_time_env_var("ACCOUNT_VERIFICATION_EMAIL_RESEND_INTERVAL", "5m"),
+  private_tags_limit: ConfigHelper.parse_integer_env_var("ACCOUNT_PRIVATE_TAGS_LIMIT", 2000),
+  watchlist_addresses_limit: ConfigHelper.parse_integer_env_var("ACCOUNT_WATCHLIST_ADDRESSES_LIMIT", 15)
 
 config :explorer, :token_id_migration,
   first_block: ConfigHelper.parse_integer_env_var("TOKEN_ID_MIGRATION_FIRST_BLOCK", 0),
diff --git a/docker-compose/envs/common-blockscout.env b/docker-compose/envs/common-blockscout.env
index 3a3724eec651..3b5ae9a7d212 100644
--- a/docker-compose/envs/common-blockscout.env
+++ b/docker-compose/envs/common-blockscout.env
@@ -248,4 +248,6 @@ EIP_1559_ELASTICITY_MULTIPLIER=2
 # TOKEN_INSTANCE_OWNER_MIGRATION_BATCH_SIZE=50
 # IPFS_GATEWAY_URL=
 API_V2_ENABLED=true
-# ADDRESSES_TABS_COUNTERS_TTL=10m
\ No newline at end of file
+# ADDRESSES_TABS_COUNTERS_TTL=10m
+# ACCOUNT_PRIVATE_TAGS_LIMIT=2000
+# ACCOUNT_WATCHLIST_ADDRESSES_LIMIT=15

From e9522deb1ef5766f22357dd830c52483fa544294 Mon Sep 17 00:00:00 2001
From: varasev <33550681+varasev@users.noreply.github.com>
Date: Wed, 25 Oct 2023 15:00:20 +0300
Subject: [PATCH 591/909] Suave functional (#8556)

* Add execution_node field indexing

* Add `wrapped` field (and its subfields) indexing

* Add allowed_peekers field for transaction to API v2 response

* Add execution_node field for transaction to API v2 response

* Add Suave fields for regular transaction to API v2 response

* Add API v2 endpoint for transactions filtered by execution node

* Add index for execution_node field

* Small fixes

* Update changelog

* Fix for CHAIN_TYPE, backward compatibility

* Update spelling

* Fix for dyalizer

* Fix default_on_conflict

* Fix test.exs

* Fix view for Suave transaction

* Add Suave-specific comments

* mix format

* Set pool_size to 1 for suave

* Small refactoring for repo

* mix format, mix dialyzer

---------

Co-authored-by: POA <33550681+poa@users.noreply.github.com>
---
 .dialyzer-ignore                              |   3 +
 CHANGELOG.md                                  |   1 +
 .../lib/block_scout_web/api_router.ex         |   4 +
 .../api/v2/transaction_controller.ex          |  51 +++-
 .../views/api/v2/transaction_view.ex          | 102 +++++++-
 apps/block_scout_web/test/test_helper.exs     |   1 +
 .../lib/ethereum_jsonrpc/transaction.ex       | 166 +++++++++++++-
 apps/explorer/config/dev.exs                  |   2 +
 apps/explorer/config/prod.exs                 |   4 +
 apps/explorer/config/test.exs                 |   2 +-
 apps/explorer/lib/explorer/application.ex     |   2 +-
 apps/explorer/lib/explorer/chain.ex           |  29 ++-
 .../chain/import/runner/transactions.ex       | 217 +++++++++++++-----
 .../lib/explorer/chain/transaction.ex         | 155 ++++++++++---
 apps/explorer/lib/explorer/repo.ex            |  24 ++
 .../lib/explorer/repo/config_helper.ex        |   2 +
 apps/explorer/lib/release_tasks.ex            |   1 +
 ...921120210_add_suave_transaction_fields.exs |  24 ++
 apps/explorer/test/support/data_case.ex       |   2 +
 apps/explorer/test/test_helper.exs            |   1 +
 .../lib/indexer/transform/addresses.ex        |   8 +-
 config/config_helper.exs                      |   1 +
 config/runtime.exs                            |   2 +
 config/runtime/dev.exs                        |   7 +
 config/runtime/prod.exs                       |   6 +
 cspell.json                                   |   2 +
 26 files changed, 697 insertions(+), 122 deletions(-)
 create mode 100644 apps/explorer/priv/suave/migrations/20230921120210_add_suave_transaction_fields.exs

diff --git a/.dialyzer-ignore b/.dialyzer-ignore
index a718f6654ded..eff92c43ffab 100644
--- a/.dialyzer-ignore
+++ b/.dialyzer-ignore
@@ -23,3 +23,6 @@ lib/indexer/fetcher/polygon_edge/withdrawal.ex:204
 lib/indexer/fetcher/zkevm/transaction_batch.ex:116
 lib/indexer/fetcher/zkevm/transaction_batch.ex:156
 lib/indexer/fetcher/zkevm/transaction_batch.ex:252
+lib/block_scout_web/views/api/v2/transaction_view.ex:431
+lib/block_scout_web/views/api/v2/transaction_view.ex:472
+lib/explorer/chain/transaction.ex:165
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 886337c4ba8a..4945287c36f1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,7 @@
 ### Features
 
 - [#8673](https://github.com/blockscout/blockscout/pull/8673) - Add a window for balances fetching from non-archive node
+- [#8556](https://github.com/blockscout/blockscout/pull/8556) - Suave functional
 - [#8528](https://github.com/blockscout/blockscout/pull/8528) - Account: add pagination + envs for limits
 - [#7584](https://github.com/blockscout/blockscout/pull/7584) - Add Polygon zkEVM batches fetcher
 
diff --git a/apps/block_scout_web/lib/block_scout_web/api_router.ex b/apps/block_scout_web/lib/block_scout_web/api_router.ex
index 64ac1d99c7ae..0ab24f48cd5a 100644
--- a/apps/block_scout_web/lib/block_scout_web/api_router.ex
+++ b/apps/block_scout_web/lib/block_scout_web/api_router.ex
@@ -205,6 +205,10 @@ defmodule BlockScoutWeb.ApiRouter do
         get("/zkevm-batch/:batch_number", V2.TransactionController, :zkevm_batch)
       end
 
+      if System.get_env("CHAIN_TYPE") == "suave" do
+        get("/execution-node/:execution_node_hash_param", V2.TransactionController, :execution_node)
+      end
+
       get("/:transaction_hash_param", V2.TransactionController, :transaction)
       get("/:transaction_hash_param/token-transfers", V2.TransactionController, :token_transfers)
       get("/:transaction_hash_param/internal-transactions", V2.TransactionController, :internal_transactions)
diff --git a/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/transaction_controller.ex b/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/transaction_controller.ex
index ea833e30c2ae..43b63b6f693d 100644
--- a/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/transaction_controller.ex
+++ b/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/transaction_controller.ex
@@ -4,7 +4,13 @@ defmodule BlockScoutWeb.API.V2.TransactionController do
   import BlockScoutWeb.Account.AuthController, only: [current_user: 1]
 
   import BlockScoutWeb.Chain,
-    only: [next_page_params: 3, token_transfers_next_page_params: 3, paging_options: 1, split_list_by_page: 1]
+    only: [
+      next_page_params: 3,
+      put_key_value_to_paging_options: 3,
+      token_transfers_next_page_params: 3,
+      paging_options: 1,
+      split_list_by_page: 1
+    ]
 
   import BlockScoutWeb.PagingHelper,
     only: [
@@ -72,13 +78,21 @@ defmodule BlockScoutWeb.API.V2.TransactionController do
       Map.put(@transaction_necessity_by_association, :transaction_actions, :optional)
 
     necessity_by_association =
-      if Application.get_env(:explorer, :chain_type) == "polygon_zkevm" do
-        necessity_by_association_with_actions
-        |> Map.put(:zkevm_batch, :optional)
-        |> Map.put(:zkevm_sequence_transaction, :optional)
-        |> Map.put(:zkevm_verify_transaction, :optional)
-      else
-        necessity_by_association_with_actions
+      case Application.get_env(:explorer, :chain_type) do
+        "polygon_zkevm" ->
+          necessity_by_association_with_actions
+          |> Map.put(:zkevm_batch, :optional)
+          |> Map.put(:zkevm_sequence_transaction, :optional)
+          |> Map.put(:zkevm_verify_transaction, :optional)
+
+        "suave" ->
+          necessity_by_association_with_actions
+          |> Map.put(:logs, :optional)
+          |> Map.put([execution_node: :names], :optional)
+          |> Map.put([wrapped_to_address: :names], :optional)
+
+        _ ->
+          necessity_by_association_with_actions
       end
 
     with {:format, {:ok, transaction_hash}} <- {:format, Chain.string_to_transaction_hash(transaction_hash_string)},
@@ -143,6 +157,27 @@ defmodule BlockScoutWeb.API.V2.TransactionController do
     |> render(:transactions, %{transactions: transactions, items: true})
   end
 
+  def execution_node(conn, %{"execution_node_hash_param" => execution_node_hash_string} = params) do
+    with {:format, {:ok, execution_node_hash}} <- {:format, Chain.string_to_address_hash(execution_node_hash_string)} do
+      full_options =
+        [necessity_by_association: @transaction_necessity_by_association]
+        |> Keyword.merge(put_key_value_to_paging_options(paging_options(params), :is_index_in_asc_order, true))
+        |> Keyword.merge(@api_true)
+
+      transactions_plus_one = Chain.execution_node_to_transactions(execution_node_hash, full_options)
+
+      {transactions, next_page} = split_list_by_page(transactions_plus_one)
+
+      next_page_params =
+        next_page
+        |> next_page_params(transactions, delete_parameters_from_next_page_params(params))
+
+      conn
+      |> put_status(200)
+      |> render(:transactions, %{transactions: transactions, next_page_params: next_page_params})
+    end
+  end
+
   @doc """
     Function to handle GET requests to `/api/v2/transactions/:transaction_hash_param/raw-trace` endpoint.
   """
diff --git a/apps/block_scout_web/lib/block_scout_web/views/api/v2/transaction_view.ex b/apps/block_scout_web/lib/block_scout_web/views/api/v2/transaction_view.ex
index 9094eb0a0890..a2c76b5e5b56 100644
--- a/apps/block_scout_web/lib/block_scout_web/views/api/v2/transaction_view.ex
+++ b/apps/block_scout_web/lib/block_scout_web/views/api/v2/transaction_view.ex
@@ -8,7 +8,7 @@ defmodule BlockScoutWeb.API.V2.TransactionView do
   alias BlockScoutWeb.TransactionStateView
   alias Ecto.Association.NotLoaded
   alias Explorer.{Chain, Market}
-  alias Explorer.Chain.{Address, Block, InternalTransaction, Log, Token, Transaction, Wei}
+  alias Explorer.Chain.{Address, Block, Hash, InternalTransaction, Log, Token, Transaction, Wei}
   alias Explorer.Chain.Block.Reward
   alias Explorer.Chain.PolygonEdge.Reader
   alias Explorer.Chain.Transaction.StateChange
@@ -16,8 +16,10 @@ defmodule BlockScoutWeb.API.V2.TransactionView do
   alias Timex.Duration
 
   import BlockScoutWeb.Account.AuthController, only: [current_user: 1]
+  import Explorer.Helper, only: [decode_data: 2]
 
   @api_true [api?: true]
+  @suave_bid_event "0x83481d5b04dea534715acad673a8177a46fc93882760f36bdc16ccac439d504e"
 
   def render("message.json", assigns) do
     ApiView.render("message.json", assigns)
@@ -414,10 +416,10 @@ defmodule BlockScoutWeb.API.V2.TransactionView do
       "has_error_in_internal_txs" => transaction.has_error_in_internal_txs
     }
 
-    chain_type_fields(result, transaction, single_tx?, conn)
+    chain_type_fields(result, transaction, single_tx?, conn, watchlist_names)
   end
 
-  defp chain_type_fields(result, transaction, single_tx?, conn) do
+  defp chain_type_fields(result, transaction, single_tx?, conn, watchlist_names) do
     case single_tx? && Application.get_env(:explorer, :chain_type) do
       "polygon_edge" ->
         result
@@ -433,6 +435,9 @@ defmodule BlockScoutWeb.API.V2.TransactionView do
 
         Map.put(extended_result, "zkevm_status", zkevm_status(extended_result))
 
+      "suave" ->
+        suave_fields(transaction, result, single_tx?, conn, watchlist_names)
+
       _ ->
         result
     end
@@ -454,6 +459,97 @@ defmodule BlockScoutWeb.API.V2.TransactionView do
     end
   end
 
+  defp suave_fields(transaction, result, single_tx?, conn, watchlist_names) do
+    if is_nil(transaction.execution_node_hash) do
+      result
+    else
+      {[wrapped_decoded_input], _, _} =
+        decode_transactions(
+          [
+            %Transaction{
+              to_address: transaction.wrapped_to_address,
+              input: transaction.wrapped_input,
+              hash: transaction.wrapped_hash
+            }
+          ],
+          false
+        )
+
+      result
+      |> Map.put("allowed_peekers", suave_parse_allowed_peekers(transaction.logs))
+      |> Map.put(
+        "execution_node",
+        Helper.address_with_info(
+          single_tx? && conn,
+          transaction.execution_node,
+          transaction.execution_node_hash,
+          single_tx?,
+          watchlist_names
+        )
+      )
+      |> Map.put("wrapped", %{
+        "type" => transaction.wrapped_type,
+        "nonce" => transaction.wrapped_nonce,
+        "to" =>
+          Helper.address_with_info(
+            single_tx? && conn,
+            transaction.wrapped_to_address,
+            transaction.wrapped_to_address_hash,
+            single_tx?,
+            watchlist_names
+          ),
+        "gas_limit" => transaction.wrapped_gas,
+        "gas_price" => transaction.wrapped_gas_price,
+        "fee" =>
+          format_fee(
+            Chain.fee(
+              %Transaction{gas: transaction.wrapped_gas, gas_price: transaction.wrapped_gas_price, gas_used: nil},
+              :wei
+            )
+          ),
+        "max_priority_fee_per_gas" => transaction.wrapped_max_priority_fee_per_gas,
+        "max_fee_per_gas" => transaction.wrapped_max_fee_per_gas,
+        "value" => transaction.wrapped_value,
+        "hash" => transaction.wrapped_hash,
+        "method" =>
+          method_name(
+            %Transaction{to_address: transaction.wrapped_to_address, input: transaction.wrapped_input},
+            wrapped_decoded_input
+          ),
+        "decoded_input" => decoded_input(wrapped_decoded_input),
+        "raw_input" => transaction.wrapped_input
+      })
+    end
+  end
+
+  defp suave_parse_allowed_peekers(logs) do
+    suave_bid_contracts =
+      Application.get_all_env(:explorer)[Transaction][:suave_bid_contracts]
+      |> String.split(",")
+      |> Enum.map(fn sbc -> String.downcase(String.trim(sbc)) end)
+
+    bid_event =
+      Enum.find(logs, fn log ->
+        sanitize_log_first_topic(log.first_topic) == @suave_bid_event &&
+          Enum.member?(suave_bid_contracts, String.downcase(Hash.to_string(log.address_hash)))
+      end)
+
+    if is_nil(bid_event) do
+      []
+    else
+      [_bid_id, _decryption_condition, allowed_peekers] =
+        decode_data(bid_event.data, [{:bytes, 16}, {:uint, 64}, {:array, :address}])
+
+      Enum.map(allowed_peekers, fn peeker ->
+        "0x" <> Base.encode16(peeker, case: :lower)
+      end)
+    end
+  end
+
+  defp sanitize_log_first_topic(first_topic) do
+    if is_nil(first_topic), do: "", else: String.downcase(first_topic)
+  end
+
   def token_transfers(_, _conn, false), do: nil
   def token_transfers(%NotLoaded{}, _conn, _), do: nil
 
diff --git a/apps/block_scout_web/test/test_helper.exs b/apps/block_scout_web/test/test_helper.exs
index f29322600dc3..b92840d3a20c 100644
--- a/apps/block_scout_web/test/test_helper.exs
+++ b/apps/block_scout_web/test/test_helper.exs
@@ -29,6 +29,7 @@ Ecto.Adapters.SQL.Sandbox.mode(Explorer.Repo.Account, :manual)
 Ecto.Adapters.SQL.Sandbox.mode(Explorer.Repo.PolygonEdge, :manual)
 Ecto.Adapters.SQL.Sandbox.mode(Explorer.Repo.PolygonZkevm, :manual)
 Ecto.Adapters.SQL.Sandbox.mode(Explorer.Repo.RSK, :manual)
+Ecto.Adapters.SQL.Sandbox.mode(Explorer.Repo.Suave, :manual)
 
 Absinthe.Test.prime(BlockScoutWeb.Schema)
 
diff --git a/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/transaction.ex b/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/transaction.ex
index d9689a07cd94..6eb996d08080 100644
--- a/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/transaction.ex
+++ b/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/transaction.ex
@@ -42,6 +42,8 @@ defmodule EthereumJSONRPC.Transaction do
    * `"maxPriorityFeePerGas"` - `t:EthereumJSONRPC.quantity/0` of wei to denote max priority fee per unit of gas used. Introduced in [EIP-1559](https://github.com/ethereum/EIPs/blob/master/EIPS/eip-1559.md)
    * `"maxFeePerGas"` - `t:EthereumJSONRPC.quantity/0` of wei to denote max fee per unit of gas used. Introduced in [EIP-1559](https://github.com/ethereum/EIPs/blob/master/EIPS/eip-1559.md)
    * `"type"` - `t:EthereumJSONRPC.quantity/0` denotes transaction type. Introduced in [EIP-1559](https://github.com/ethereum/EIPs/blob/master/EIPS/eip-1559.md)
+   * `"executionNode"` - `t:EthereumJSONRPC.address/0` of execution node (used by Suave).
+   * `"wrapped"` - map of wrapped transaction data (used by Suave).
   """
   @type t :: %{
           String.t() =>
@@ -66,7 +68,21 @@ defmodule EthereumJSONRPC.Transaction do
           transaction_index: non_neg_integer(),
           max_priority_fee_per_gas: non_neg_integer(),
           max_fee_per_gas: non_neg_integer(),
-          type: non_neg_integer()
+          type: non_neg_integer(),
+          execution_node_hash: EthereumJSONRPC.address(),
+          wrapped_type: non_neg_integer(),
+          wrapped_nonce: non_neg_integer(),
+          wrapped_to_address_hash: EthereumJSONRPC.address(),
+          wrapped_gas: non_neg_integer(),
+          wrapped_gas_price: non_neg_integer(),
+          wrapped_max_priority_fee_per_gas: non_neg_integer(),
+          wrapped_max_fee_per_gas: non_neg_integer(),
+          wrapped_value: non_neg_integer(),
+          wrapped_input: String.t(),
+          wrapped_v: non_neg_integer(),
+          wrapped_r: non_neg_integer(),
+          wrapped_s: non_neg_integer(),
+          wrapped_hash: EthereumJSONRPC.hash()
         }
 
   @doc """
@@ -153,6 +169,81 @@ defmodule EthereumJSONRPC.Transaction do
   """
   @spec elixir_to_params(elixir) :: params
 
+  # this is for Suave chain (handles `executionNode` and `wrapped` fields along with EIP-1559 fields)
+  def elixir_to_params(
+        %{
+          "blockHash" => block_hash,
+          "blockNumber" => block_number,
+          "from" => from_address_hash,
+          "gas" => gas,
+          "gasPrice" => gas_price,
+          "hash" => hash,
+          "input" => input,
+          "nonce" => nonce,
+          "r" => r,
+          "s" => s,
+          "to" => to_address_hash,
+          "transactionIndex" => index,
+          "v" => v,
+          "value" => value,
+          "type" => type,
+          "maxPriorityFeePerGas" => max_priority_fee_per_gas,
+          "maxFeePerGas" => max_fee_per_gas,
+          "executionNode" => execution_node_hash,
+          "wrapped" => wrapped
+        } = transaction
+      ) do
+    result = %{
+      block_hash: block_hash,
+      block_number: block_number,
+      from_address_hash: from_address_hash,
+      gas: gas,
+      gas_price: gas_price,
+      hash: hash,
+      index: index,
+      input: input,
+      nonce: nonce,
+      r: r,
+      s: s,
+      to_address_hash: to_address_hash,
+      v: v,
+      value: value,
+      transaction_index: index,
+      type: type,
+      max_priority_fee_per_gas: max_priority_fee_per_gas,
+      max_fee_per_gas: max_fee_per_gas
+    }
+
+    # credo:disable-for-next-line
+    result =
+      if Application.get_env(:explorer, :chain_type) == "suave" do
+        Map.merge(result, %{
+          execution_node_hash: execution_node_hash,
+          wrapped_type: quantity_to_integer(Map.get(wrapped, "type")),
+          wrapped_nonce: quantity_to_integer(Map.get(wrapped, "nonce")),
+          wrapped_to_address_hash: Map.get(wrapped, "to"),
+          wrapped_gas: quantity_to_integer(Map.get(wrapped, "gas")),
+          wrapped_gas_price: quantity_to_integer(Map.get(wrapped, "gasPrice")),
+          wrapped_max_priority_fee_per_gas: quantity_to_integer(Map.get(wrapped, "maxPriorityFeePerGas")),
+          wrapped_max_fee_per_gas: quantity_to_integer(Map.get(wrapped, "maxFeePerGas")),
+          wrapped_value: quantity_to_integer(Map.get(wrapped, "value")),
+          wrapped_input: Map.get(wrapped, "input"),
+          wrapped_v: quantity_to_integer(Map.get(wrapped, "v")),
+          wrapped_r: quantity_to_integer(Map.get(wrapped, "r")),
+          wrapped_s: quantity_to_integer(Map.get(wrapped, "s")),
+          wrapped_hash: Map.get(wrapped, "hash")
+        })
+      else
+        result
+      end
+
+    if transaction["creates"] do
+      Map.put(result, :created_contract_address_hash, transaction["creates"])
+    else
+      result
+    end
+  end
+
   def elixir_to_params(
         %{
           "blockHash" => block_hash,
@@ -252,6 +343,77 @@ defmodule EthereumJSONRPC.Transaction do
     end
   end
 
+  # this is for Suave chain (handles `executionNode` and `wrapped` fields without EIP-1559 fields)
+  def elixir_to_params(
+        %{
+          "blockHash" => block_hash,
+          "blockNumber" => block_number,
+          "from" => from_address_hash,
+          "gas" => gas,
+          "gasPrice" => gas_price,
+          "hash" => hash,
+          "input" => input,
+          "nonce" => nonce,
+          "r" => r,
+          "s" => s,
+          "to" => to_address_hash,
+          "transactionIndex" => index,
+          "v" => v,
+          "value" => value,
+          "type" => type,
+          "executionNode" => execution_node_hash,
+          "wrapped" => wrapped
+        } = transaction
+      ) do
+    result = %{
+      block_hash: block_hash,
+      block_number: block_number,
+      from_address_hash: from_address_hash,
+      gas: gas,
+      gas_price: gas_price,
+      hash: hash,
+      index: index,
+      input: input,
+      nonce: nonce,
+      r: r,
+      s: s,
+      to_address_hash: to_address_hash,
+      v: v,
+      value: value,
+      transaction_index: index,
+      type: type
+    }
+
+    # credo:disable-for-next-line
+    result =
+      if Application.get_env(:explorer, :chain_type) == "suave" do
+        Map.merge(result, %{
+          execution_node_hash: execution_node_hash,
+          wrapped_type: quantity_to_integer(Map.get(wrapped, "type")),
+          wrapped_nonce: quantity_to_integer(Map.get(wrapped, "nonce")),
+          wrapped_to_address_hash: Map.get(wrapped, "to"),
+          wrapped_gas: quantity_to_integer(Map.get(wrapped, "gas")),
+          wrapped_gas_price: quantity_to_integer(Map.get(wrapped, "gasPrice")),
+          wrapped_max_priority_fee_per_gas: quantity_to_integer(Map.get(wrapped, "maxPriorityFeePerGas")),
+          wrapped_max_fee_per_gas: quantity_to_integer(Map.get(wrapped, "maxFeePerGas")),
+          wrapped_value: quantity_to_integer(Map.get(wrapped, "value")),
+          wrapped_input: Map.get(wrapped, "input"),
+          wrapped_v: quantity_to_integer(Map.get(wrapped, "v")),
+          wrapped_r: quantity_to_integer(Map.get(wrapped, "r")),
+          wrapped_s: quantity_to_integer(Map.get(wrapped, "s")),
+          wrapped_hash: Map.get(wrapped, "hash")
+        })
+      else
+        result
+      end
+
+    if transaction["creates"] do
+      Map.put(result, :created_contract_address_hash, transaction["creates"])
+    else
+      result
+    end
+  end
+
   def elixir_to_params(
         %{
           "blockHash" => block_hash,
@@ -446,7 +608,7 @@ defmodule EthereumJSONRPC.Transaction do
   #
   # "txType": to avoid FunctionClauseError when indexing Wanchain
   defp entry_to_elixir({key, value})
-       when key in ~w(blockHash condition creates from hash input jsonrpc publicKey raw to txType),
+       when key in ~w(blockHash condition creates from hash input jsonrpc publicKey raw to txType executionNode wrapped),
        do: {key, value}
 
   # specific to Nethermind client
diff --git a/apps/explorer/config/dev.exs b/apps/explorer/config/dev.exs
index abc65423669b..0aa303a2bfab 100644
--- a/apps/explorer/config/dev.exs
+++ b/apps/explorer/config/dev.exs
@@ -19,6 +19,8 @@ config :explorer, Explorer.Repo.PolygonZkevm, timeout: :timer.seconds(80)
 
 config :explorer, Explorer.Repo.RSK, timeout: :timer.seconds(80)
 
+config :explorer, Explorer.Repo.Suave, timeout: :timer.seconds(80)
+
 config :explorer, Explorer.Tracer, env: "dev", disabled?: true
 
 config :logger, :explorer,
diff --git a/apps/explorer/config/prod.exs b/apps/explorer/config/prod.exs
index d195a017b224..e14afe322c04 100644
--- a/apps/explorer/config/prod.exs
+++ b/apps/explorer/config/prod.exs
@@ -28,6 +28,10 @@ config :explorer, Explorer.Repo.RSK,
   prepare: :unnamed,
   timeout: :timer.seconds(60)
 
+config :explorer, Explorer.Repo.Suave,
+  prepare: :unnamed,
+  timeout: :timer.seconds(60)
+
 config :explorer, Explorer.Tracer, env: "production", disabled?: true
 
 config :logger, :explorer,
diff --git a/apps/explorer/config/test.exs b/apps/explorer/config/test.exs
index 339b3cb9bd37..8a08ee60acf5 100644
--- a/apps/explorer/config/test.exs
+++ b/apps/explorer/config/test.exs
@@ -38,7 +38,7 @@ config :explorer, Explorer.Repo.Account,
   timeout: :timer.seconds(60),
   queue_target: 1000
 
-for repo <- [Explorer.Repo.PolygonEdge, Explorer.Repo.PolygonZkevm, Explorer.Repo.RSK] do
+for repo <- [Explorer.Repo.PolygonEdge, Explorer.Repo.PolygonZkevm, Explorer.Repo.RSK, Explorer.Repo.Suave] do
   config :explorer, repo,
     database: "explorer_test",
     hostname: "localhost",
diff --git a/apps/explorer/lib/explorer/application.ex b/apps/explorer/lib/explorer/application.ex
index 205e54940931..f59e56903bc5 100644
--- a/apps/explorer/lib/explorer/application.ex
+++ b/apps/explorer/lib/explorer/application.ex
@@ -134,7 +134,7 @@ defmodule Explorer.Application do
 
   defp repos_by_chain_type do
     if Mix.env() == :test do
-      [Explorer.Repo.PolygonEdge, Explorer.Repo.PolygonZkevm, Explorer.Repo.RSK]
+      [Explorer.Repo.PolygonEdge, Explorer.Repo.PolygonZkevm, Explorer.Repo.RSK, Explorer.Repo.Suave]
     else
       []
     end
diff --git a/apps/explorer/lib/explorer/chain.ex b/apps/explorer/lib/explorer/chain.ex
index fa2d966024e3..09a01377cd05 100644
--- a/apps/explorer/lib/explorer/chain.ex
+++ b/apps/explorer/lib/explorer/chain.ex
@@ -850,6 +850,22 @@ defmodule Explorer.Chain do
         )).()
   end
 
+  @spec execution_node_to_transactions(Hash.Address.t(), [paging_options | necessity_by_association_option | api?()]) ::
+          [Transaction.t()]
+  def execution_node_to_transactions(execution_node_hash, options \\ []) when is_list(options) do
+    necessity_by_association = Keyword.get(options, :necessity_by_association, %{})
+
+    options
+    |> Keyword.get(:paging_options, @default_paging_options)
+    |> fetch_transactions_in_descending_order_by_block_and_index()
+    |> where(execution_node_hash: ^execution_node_hash)
+    |> join_associations(necessity_by_association)
+    |> put_has_token_transfers_to_tx(false)
+    |> (& &1).()
+    |> select_repo(options).all()
+    |> (&Enum.map(&1, fn tx -> preload_token_transfers(tx, @token_transfers_necessity_by_association, options) end)).()
+  end
+
   @spec block_to_withdrawals(
           Hash.Full.t(),
           [paging_options | necessity_by_association_option]
@@ -3407,12 +3423,7 @@ defmodule Explorer.Chain do
   The `t:Explorer.Chain.Transaction.t/0` or `t:Explorer.Chain.InternalTransaction.t/0` `value` of the `transaction` in
   `unit`.
   """
-  @spec value(InternalTransaction.t(), :wei) :: Wei.wei()
-  @spec value(InternalTransaction.t(), :gwei) :: Wei.gwei()
-  @spec value(InternalTransaction.t(), :ether) :: Wei.ether()
-  @spec value(Transaction.t(), :wei) :: Wei.wei()
-  @spec value(Transaction.t(), :gwei) :: Wei.gwei()
-  @spec value(Transaction.t(), :ether) :: Wei.ether()
+  @spec value(InternalTransaction.t() | Transaction.t(), :wei | :gwei | :ether) :: Wei.wei() | Wei.gwei() | Wei.ether()
   def value(%type{value: value}, unit) when type in [InternalTransaction, Transaction] do
     Wei.to(value, unit)
   end
@@ -3996,6 +4007,12 @@ defmodule Explorer.Chain do
     |> handle_block_paging_options(paging_options)
   end
 
+  defp fetch_transactions_in_descending_order_by_block_and_index(paging_options) do
+    Transaction
+    |> order_by([transaction], desc: transaction.block_number, asc: transaction.index)
+    |> handle_block_paging_options(paging_options)
+  end
+
   defp for_parent_transaction(query, %Hash{byte_count: unquote(Hash.Full.byte_count())} = hash) do
     from(
       child in query,
diff --git a/apps/explorer/lib/explorer/chain/import/runner/transactions.ex b/apps/explorer/lib/explorer/chain/import/runner/transactions.ex
index 65eeba1f2ddb..077bc41a286d 100644
--- a/apps/explorer/lib/explorer/chain/import/runner/transactions.ex
+++ b/apps/explorer/lib/explorer/chain/import/runner/transactions.ex
@@ -108,68 +108,161 @@ defmodule Explorer.Chain.Import.Runner.Transactions do
   end
 
   defp default_on_conflict do
-    from(
-      transaction in Transaction,
-      update: [
-        set: [
-          block_hash: fragment("EXCLUDED.block_hash"),
-          old_block_hash: transaction.block_hash,
-          block_number: fragment("EXCLUDED.block_number"),
-          created_contract_address_hash: fragment("EXCLUDED.created_contract_address_hash"),
-          created_contract_code_indexed_at: fragment("EXCLUDED.created_contract_code_indexed_at"),
-          cumulative_gas_used: fragment("EXCLUDED.cumulative_gas_used"),
-          error: fragment("EXCLUDED.error"),
-          from_address_hash: fragment("EXCLUDED.from_address_hash"),
-          gas: fragment("EXCLUDED.gas"),
-          gas_price: fragment("EXCLUDED.gas_price"),
-          gas_used: fragment("EXCLUDED.gas_used"),
-          index: fragment("EXCLUDED.index"),
-          input: fragment("EXCLUDED.input"),
-          nonce: fragment("EXCLUDED.nonce"),
-          r: fragment("EXCLUDED.r"),
-          s: fragment("EXCLUDED.s"),
-          status: fragment("EXCLUDED.status"),
-          to_address_hash: fragment("EXCLUDED.to_address_hash"),
-          v: fragment("EXCLUDED.v"),
-          value: fragment("EXCLUDED.value"),
-          earliest_processing_start: fragment("EXCLUDED.earliest_processing_start"),
-          revert_reason: fragment("EXCLUDED.revert_reason"),
-          max_priority_fee_per_gas: fragment("EXCLUDED.max_priority_fee_per_gas"),
-          max_fee_per_gas: fragment("EXCLUDED.max_fee_per_gas"),
-          type: fragment("EXCLUDED.type"),
-          # Don't update `hash` as it is part of the primary key and used for the conflict target
-          inserted_at: fragment("LEAST(?, EXCLUDED.inserted_at)", transaction.inserted_at),
-          updated_at: fragment("GREATEST(?, EXCLUDED.updated_at)", transaction.updated_at)
-        ]
-      ],
-      where:
-        fragment(
-          "(EXCLUDED.block_hash, EXCLUDED.block_number, EXCLUDED.created_contract_address_hash, EXCLUDED.created_contract_code_indexed_at, EXCLUDED.cumulative_gas_used, EXCLUDED.from_address_hash, EXCLUDED.gas, EXCLUDED.gas_price, EXCLUDED.gas_used, EXCLUDED.index, EXCLUDED.input, EXCLUDED.nonce, EXCLUDED.r, EXCLUDED.s, EXCLUDED.status, EXCLUDED.to_address_hash, EXCLUDED.v, EXCLUDED.value, EXCLUDED.earliest_processing_start, EXCLUDED.revert_reason, EXCLUDED.max_priority_fee_per_gas, EXCLUDED.max_fee_per_gas, EXCLUDED.type) IS DISTINCT FROM (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)",
-          transaction.block_hash,
-          transaction.block_number,
-          transaction.created_contract_address_hash,
-          transaction.created_contract_code_indexed_at,
-          transaction.cumulative_gas_used,
-          transaction.from_address_hash,
-          transaction.gas,
-          transaction.gas_price,
-          transaction.gas_used,
-          transaction.index,
-          transaction.input,
-          transaction.nonce,
-          transaction.r,
-          transaction.s,
-          transaction.status,
-          transaction.to_address_hash,
-          transaction.v,
-          transaction.value,
-          transaction.earliest_processing_start,
-          transaction.revert_reason,
-          transaction.max_priority_fee_per_gas,
-          transaction.max_fee_per_gas,
-          transaction.type
-        )
-    )
+    if System.get_env("CHAIN_TYPE") == "suave" do
+      from(
+        transaction in Transaction,
+        update: [
+          set: [
+            block_hash: fragment("EXCLUDED.block_hash"),
+            old_block_hash: transaction.block_hash,
+            block_number: fragment("EXCLUDED.block_number"),
+            created_contract_address_hash: fragment("EXCLUDED.created_contract_address_hash"),
+            created_contract_code_indexed_at: fragment("EXCLUDED.created_contract_code_indexed_at"),
+            cumulative_gas_used: fragment("EXCLUDED.cumulative_gas_used"),
+            error: fragment("EXCLUDED.error"),
+            from_address_hash: fragment("EXCLUDED.from_address_hash"),
+            gas: fragment("EXCLUDED.gas"),
+            gas_price: fragment("EXCLUDED.gas_price"),
+            gas_used: fragment("EXCLUDED.gas_used"),
+            index: fragment("EXCLUDED.index"),
+            input: fragment("EXCLUDED.input"),
+            nonce: fragment("EXCLUDED.nonce"),
+            r: fragment("EXCLUDED.r"),
+            s: fragment("EXCLUDED.s"),
+            status: fragment("EXCLUDED.status"),
+            to_address_hash: fragment("EXCLUDED.to_address_hash"),
+            v: fragment("EXCLUDED.v"),
+            value: fragment("EXCLUDED.value"),
+            earliest_processing_start: fragment("EXCLUDED.earliest_processing_start"),
+            revert_reason: fragment("EXCLUDED.revert_reason"),
+            max_priority_fee_per_gas: fragment("EXCLUDED.max_priority_fee_per_gas"),
+            max_fee_per_gas: fragment("EXCLUDED.max_fee_per_gas"),
+            type: fragment("EXCLUDED.type"),
+            execution_node_hash: fragment("EXCLUDED.execution_node_hash"),
+            wrapped_type: fragment("EXCLUDED.wrapped_type"),
+            wrapped_nonce: fragment("EXCLUDED.wrapped_nonce"),
+            wrapped_to_address_hash: fragment("EXCLUDED.wrapped_to_address_hash"),
+            wrapped_gas: fragment("EXCLUDED.wrapped_gas"),
+            wrapped_gas_price: fragment("EXCLUDED.wrapped_gas_price"),
+            wrapped_max_priority_fee_per_gas: fragment("EXCLUDED.wrapped_max_priority_fee_per_gas"),
+            wrapped_max_fee_per_gas: fragment("EXCLUDED.wrapped_max_fee_per_gas"),
+            wrapped_value: fragment("EXCLUDED.wrapped_value"),
+            wrapped_input: fragment("EXCLUDED.wrapped_input"),
+            wrapped_v: fragment("EXCLUDED.wrapped_v"),
+            wrapped_r: fragment("EXCLUDED.wrapped_r"),
+            wrapped_s: fragment("EXCLUDED.wrapped_s"),
+            wrapped_hash: fragment("EXCLUDED.wrapped_hash"),
+            # Don't update `hash` as it is part of the primary key and used for the conflict target
+            inserted_at: fragment("LEAST(?, EXCLUDED.inserted_at)", transaction.inserted_at),
+            updated_at: fragment("GREATEST(?, EXCLUDED.updated_at)", transaction.updated_at)
+          ]
+        ],
+        where:
+          fragment(
+            "(EXCLUDED.block_hash, EXCLUDED.block_number, EXCLUDED.created_contract_address_hash, EXCLUDED.created_contract_code_indexed_at, EXCLUDED.cumulative_gas_used, EXCLUDED.from_address_hash, EXCLUDED.gas, EXCLUDED.gas_price, EXCLUDED.gas_used, EXCLUDED.index, EXCLUDED.input, EXCLUDED.nonce, EXCLUDED.r, EXCLUDED.s, EXCLUDED.status, EXCLUDED.to_address_hash, EXCLUDED.v, EXCLUDED.value, EXCLUDED.earliest_processing_start, EXCLUDED.revert_reason, EXCLUDED.max_priority_fee_per_gas, EXCLUDED.max_fee_per_gas, EXCLUDED.type, EXCLUDED.execution_node_hash, EXCLUDED.wrapped_type, EXCLUDED.wrapped_nonce, EXCLUDED.wrapped_to_address_hash, EXCLUDED.wrapped_gas, EXCLUDED.wrapped_gas_price, EXCLUDED.wrapped_max_priority_fee_per_gas, EXCLUDED.wrapped_max_fee_per_gas, EXCLUDED.wrapped_value, EXCLUDED.wrapped_input, EXCLUDED.wrapped_v, EXCLUDED.wrapped_r, EXCLUDED.wrapped_s, EXCLUDED.wrapped_hash) IS DISTINCT FROM (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)",
+            transaction.block_hash,
+            transaction.block_number,
+            transaction.created_contract_address_hash,
+            transaction.created_contract_code_indexed_at,
+            transaction.cumulative_gas_used,
+            transaction.from_address_hash,
+            transaction.gas,
+            transaction.gas_price,
+            transaction.gas_used,
+            transaction.index,
+            transaction.input,
+            transaction.nonce,
+            transaction.r,
+            transaction.s,
+            transaction.status,
+            transaction.to_address_hash,
+            transaction.v,
+            transaction.value,
+            transaction.earliest_processing_start,
+            transaction.revert_reason,
+            transaction.max_priority_fee_per_gas,
+            transaction.max_fee_per_gas,
+            transaction.type,
+            transaction.execution_node_hash,
+            transaction.wrapped_type,
+            transaction.wrapped_nonce,
+            transaction.wrapped_to_address_hash,
+            transaction.wrapped_gas,
+            transaction.wrapped_gas_price,
+            transaction.wrapped_max_priority_fee_per_gas,
+            transaction.wrapped_max_fee_per_gas,
+            transaction.wrapped_value,
+            transaction.wrapped_input,
+            transaction.wrapped_v,
+            transaction.wrapped_r,
+            transaction.wrapped_s,
+            transaction.wrapped_hash
+          )
+      )
+    else
+      from(
+        transaction in Transaction,
+        update: [
+          set: [
+            block_hash: fragment("EXCLUDED.block_hash"),
+            old_block_hash: transaction.block_hash,
+            block_number: fragment("EXCLUDED.block_number"),
+            created_contract_address_hash: fragment("EXCLUDED.created_contract_address_hash"),
+            created_contract_code_indexed_at: fragment("EXCLUDED.created_contract_code_indexed_at"),
+            cumulative_gas_used: fragment("EXCLUDED.cumulative_gas_used"),
+            error: fragment("EXCLUDED.error"),
+            from_address_hash: fragment("EXCLUDED.from_address_hash"),
+            gas: fragment("EXCLUDED.gas"),
+            gas_price: fragment("EXCLUDED.gas_price"),
+            gas_used: fragment("EXCLUDED.gas_used"),
+            index: fragment("EXCLUDED.index"),
+            input: fragment("EXCLUDED.input"),
+            nonce: fragment("EXCLUDED.nonce"),
+            r: fragment("EXCLUDED.r"),
+            s: fragment("EXCLUDED.s"),
+            status: fragment("EXCLUDED.status"),
+            to_address_hash: fragment("EXCLUDED.to_address_hash"),
+            v: fragment("EXCLUDED.v"),
+            value: fragment("EXCLUDED.value"),
+            earliest_processing_start: fragment("EXCLUDED.earliest_processing_start"),
+            revert_reason: fragment("EXCLUDED.revert_reason"),
+            max_priority_fee_per_gas: fragment("EXCLUDED.max_priority_fee_per_gas"),
+            max_fee_per_gas: fragment("EXCLUDED.max_fee_per_gas"),
+            type: fragment("EXCLUDED.type"),
+            # Don't update `hash` as it is part of the primary key and used for the conflict target
+            inserted_at: fragment("LEAST(?, EXCLUDED.inserted_at)", transaction.inserted_at),
+            updated_at: fragment("GREATEST(?, EXCLUDED.updated_at)", transaction.updated_at)
+          ]
+        ],
+        where:
+          fragment(
+            "(EXCLUDED.block_hash, EXCLUDED.block_number, EXCLUDED.created_contract_address_hash, EXCLUDED.created_contract_code_indexed_at, EXCLUDED.cumulative_gas_used, EXCLUDED.from_address_hash, EXCLUDED.gas, EXCLUDED.gas_price, EXCLUDED.gas_used, EXCLUDED.index, EXCLUDED.input, EXCLUDED.nonce, EXCLUDED.r, EXCLUDED.s, EXCLUDED.status, EXCLUDED.to_address_hash, EXCLUDED.v, EXCLUDED.value, EXCLUDED.earliest_processing_start, EXCLUDED.revert_reason, EXCLUDED.max_priority_fee_per_gas, EXCLUDED.max_fee_per_gas, EXCLUDED.type) IS DISTINCT FROM (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)",
+            transaction.block_hash,
+            transaction.block_number,
+            transaction.created_contract_address_hash,
+            transaction.created_contract_code_indexed_at,
+            transaction.cumulative_gas_used,
+            transaction.from_address_hash,
+            transaction.gas,
+            transaction.gas_price,
+            transaction.gas_used,
+            transaction.index,
+            transaction.input,
+            transaction.nonce,
+            transaction.r,
+            transaction.s,
+            transaction.status,
+            transaction.to_address_hash,
+            transaction.v,
+            transaction.value,
+            transaction.earliest_processing_start,
+            transaction.revert_reason,
+            transaction.max_priority_fee_per_gas,
+            transaction.max_fee_per_gas,
+            transaction.type
+          )
+      )
+    end
   end
 
   defp discard_blocks_for_recollated_transactions(repo, changes_list, %{
diff --git a/apps/explorer/lib/explorer/chain/transaction.ex b/apps/explorer/lib/explorer/chain/transaction.ex
index a4e233da0416..e91a6f5a0049 100644
--- a/apps/explorer/lib/explorer/chain/transaction.ex
+++ b/apps/explorer/lib/explorer/chain/transaction.ex
@@ -37,8 +37,12 @@ defmodule Explorer.Chain.Transaction do
   @optional_attrs ~w(max_priority_fee_per_gas max_fee_per_gas block_hash block_number created_contract_address_hash cumulative_gas_used earliest_processing_start
                      error gas_price gas_used index created_contract_code_indexed_at status to_address_hash revert_reason type has_error_in_internal_txs)a
 
+  @suave_optional_attrs ~w(execution_node_hash wrapped_type wrapped_nonce wrapped_to_address_hash wrapped_gas wrapped_gas_price wrapped_max_priority_fee_per_gas wrapped_max_fee_per_gas wrapped_value wrapped_input wrapped_v wrapped_r wrapped_s wrapped_hash)a
+
   @required_attrs ~w(from_address_hash gas hash input nonce r s v value)a
 
+  @empty_attrs ~w()a
+
   @typedoc """
   X coordinate module n in
   [Elliptic Curve Digital Signature Algorithm](https://en.wikipedia.org/wiki/Elliptic_Curve_Digital_Signature_Algorithm)
@@ -140,43 +144,86 @@ defmodule Explorer.Chain.Transaction do
    * `max_fee_per_gas` - Maximum total amount per unit of gas a user is willing to pay for a transaction, including base fee and priority fee.
    * `type` - New transaction type identifier introduced in EIP 2718 (Berlin HF)
    * `has_error_in_internal_txs` - shows if the internal transactions related to transaction have errors
+   * `execution_node` - execution node address (used by Suave)
+   * `execution_node_hash` - foreign key of `execution_node` (used by Suave)
+   * `wrapped_type` - transaction type from the `wrapped` field (used by Suave)
+   * `wrapped_nonce` - nonce from the `wrapped` field (used by Suave)
+   * `wrapped_to_address` - target address from the `wrapped` field (used by Suave)
+   * `wrapped_to_address_hash` - `wrapped_to_address` foreign key (used by Suave)
+   * `wrapped_gas` - gas from the `wrapped` field (used by Suave)
+   * `wrapped_gas_price` - gas_price from the `wrapped` field (used by Suave)
+   * `wrapped_max_priority_fee_per_gas` - max_priority_fee_per_gas from the `wrapped` field (used by Suave)
+   * `wrapped_max_fee_per_gas` - max_fee_per_gas from the `wrapped` field (used by Suave)
+   * `wrapped_value` - value from the `wrapped` field (used by Suave)
+   * `wrapped_input` - data from the `wrapped` field (used by Suave)
+   * `wrapped_v` - V field of the signature from the `wrapped` field (used by Suave)
+   * `wrapped_r` - R field of the signature from the `wrapped` field (used by Suave)
+   * `wrapped_s` - S field of the signature from the `wrapped` field (used by Suave)
+   * `wrapped_hash` - hash from the `wrapped` field (used by Suave)
   """
-  @type t :: %__MODULE__{
-          block: %Ecto.Association.NotLoaded{} | Block.t() | nil,
-          block_hash: Hash.t() | nil,
-          block_number: Block.block_number() | nil,
-          created_contract_address: %Ecto.Association.NotLoaded{} | Address.t() | nil,
-          created_contract_address_hash: Hash.Address.t() | nil,
-          created_contract_code_indexed_at: DateTime.t() | nil,
-          cumulative_gas_used: Gas.t() | nil,
-          earliest_processing_start: DateTime.t() | nil,
-          error: String.t() | nil,
-          forks: %Ecto.Association.NotLoaded{} | [Fork.t()],
-          from_address: %Ecto.Association.NotLoaded{} | Address.t(),
-          from_address_hash: Hash.Address.t(),
-          gas: Gas.t(),
-          gas_price: wei_per_gas | nil,
-          gas_used: Gas.t() | nil,
-          hash: Hash.t(),
-          index: transaction_index | nil,
-          input: Data.t(),
-          internal_transactions: %Ecto.Association.NotLoaded{} | [InternalTransaction.t()],
-          logs: %Ecto.Association.NotLoaded{} | [Log.t()],
-          nonce: non_neg_integer(),
-          r: r(),
-          s: s(),
-          status: Status.t() | nil,
-          to_address: %Ecto.Association.NotLoaded{} | Address.t() | nil,
-          to_address_hash: Hash.Address.t() | nil,
-          uncles: %Ecto.Association.NotLoaded{} | [Block.t()],
-          v: v(),
-          value: Wei.t(),
-          revert_reason: String.t() | nil,
-          max_priority_fee_per_gas: wei_per_gas | nil,
-          max_fee_per_gas: wei_per_gas | nil,
-          type: non_neg_integer() | nil,
-          has_error_in_internal_txs: boolean()
-        }
+  @type t ::
+          Map.merge(
+            %__MODULE__{
+              block: %Ecto.Association.NotLoaded{} | Block.t() | nil,
+              block_hash: Hash.t() | nil,
+              block_number: Block.block_number() | nil,
+              created_contract_address: %Ecto.Association.NotLoaded{} | Address.t() | nil,
+              created_contract_address_hash: Hash.Address.t() | nil,
+              created_contract_code_indexed_at: DateTime.t() | nil,
+              cumulative_gas_used: Gas.t() | nil,
+              earliest_processing_start: DateTime.t() | nil,
+              error: String.t() | nil,
+              forks: %Ecto.Association.NotLoaded{} | [Fork.t()],
+              from_address: %Ecto.Association.NotLoaded{} | Address.t(),
+              from_address_hash: Hash.Address.t(),
+              gas: Gas.t(),
+              gas_price: wei_per_gas | nil,
+              gas_used: Gas.t() | nil,
+              hash: Hash.t(),
+              index: transaction_index | nil,
+              input: Data.t(),
+              internal_transactions: %Ecto.Association.NotLoaded{} | [InternalTransaction.t()],
+              logs: %Ecto.Association.NotLoaded{} | [Log.t()],
+              nonce: non_neg_integer(),
+              r: r(),
+              s: s(),
+              status: Status.t() | nil,
+              to_address: %Ecto.Association.NotLoaded{} | Address.t() | nil,
+              to_address_hash: Hash.Address.t() | nil,
+              uncles: %Ecto.Association.NotLoaded{} | [Block.t()],
+              v: v(),
+              value: Wei.t(),
+              revert_reason: String.t() | nil,
+              max_priority_fee_per_gas: wei_per_gas | nil,
+              max_fee_per_gas: wei_per_gas | nil,
+              type: non_neg_integer() | nil,
+              has_error_in_internal_txs: boolean()
+            },
+            suave
+          )
+
+  if Application.compile_env(:explorer, :chain_type) == "suave" do
+    @type suave :: %{
+            execution_node: %Ecto.Association.NotLoaded{} | Address.t() | nil,
+            execution_node_hash: Hash.Address.t() | nil,
+            wrapped_type: non_neg_integer() | nil,
+            wrapped_nonce: non_neg_integer() | nil,
+            wrapped_to_address: %Ecto.Association.NotLoaded{} | Address.t() | nil,
+            wrapped_to_address_hash: Hash.Address.t() | nil,
+            wrapped_gas: Gas.t() | nil,
+            wrapped_gas_price: wei_per_gas | nil,
+            wrapped_max_priority_fee_per_gas: wei_per_gas | nil,
+            wrapped_max_fee_per_gas: wei_per_gas | nil,
+            wrapped_value: Wei.t() | nil,
+            wrapped_input: Data.t() | nil,
+            wrapped_v: v() | nil,
+            wrapped_r: r() | nil,
+            wrapped_s: s() | nil,
+            wrapped_hash: Hash.t() | nil
+          }
+  else
+    @type suave :: %{}
+  end
 
   @derive {Poison.Encoder,
            only: [
@@ -288,6 +335,37 @@ defmodule Explorer.Chain.Transaction do
       references: :hash,
       type: Hash.Address
     )
+
+    if System.get_env("CHAIN_TYPE") == "suave" do
+      belongs_to(
+        :execution_node,
+        Address,
+        foreign_key: :execution_node_hash,
+        references: :hash,
+        type: Hash.Address
+      )
+
+      field(:wrapped_type, :integer)
+      field(:wrapped_nonce, :integer)
+      field(:wrapped_gas, :decimal)
+      field(:wrapped_gas_price, Wei)
+      field(:wrapped_max_priority_fee_per_gas, Wei)
+      field(:wrapped_max_fee_per_gas, Wei)
+      field(:wrapped_value, Wei)
+      field(:wrapped_input, Data)
+      field(:wrapped_v, :decimal)
+      field(:wrapped_r, :decimal)
+      field(:wrapped_s, :decimal)
+      field(:wrapped_hash, Hash.Full)
+
+      belongs_to(
+        :wrapped_to_address,
+        Address,
+        foreign_key: :wrapped_to_address_hash,
+        references: :hash,
+        type: Hash.Address
+      )
+    end
   end
 
   @doc """
@@ -440,7 +518,10 @@ defmodule Explorer.Chain.Transaction do
 
   """
   def changeset(%__MODULE__{} = transaction, attrs \\ %{}) do
-    attrs_to_cast = @required_attrs ++ @optional_attrs
+    attrs_to_cast =
+      @required_attrs ++
+        @optional_attrs ++
+        if Application.get_env(:explorer, :chain_type) == "suave", do: @suave_optional_attrs, else: @empty_attrs
 
     transaction
     |> cast(attrs, attrs_to_cast)
diff --git a/apps/explorer/lib/explorer/repo.ex b/apps/explorer/lib/explorer/repo.ex
index 31fc787343a0..c4d0c8f3f489 100644
--- a/apps/explorer/lib/explorer/repo.ex
+++ b/apps/explorer/lib/explorer/repo.ex
@@ -250,4 +250,28 @@ defmodule Explorer.Repo do
       {:ok, Keyword.put(opts, :url, db_url)}
     end
   end
+
+  defmodule Suave do
+    use Ecto.Repo,
+      otp_app: :explorer,
+      adapter: Ecto.Adapters.Postgres
+
+    def init(_, opts) do
+      db_url = Application.get_env(:explorer, __MODULE__)[:url]
+      repo_conf = Application.get_env(:explorer, __MODULE__)
+
+      merged =
+        %{url: db_url}
+        |> ConfigHelper.get_db_config()
+        |> Keyword.merge(repo_conf, fn
+          _key, v1, nil -> v1
+          _key, nil, v2 -> v2
+          _, _, v2 -> v2
+        end)
+
+      Application.put_env(:explorer, __MODULE__, merged)
+
+      {:ok, Keyword.put(opts, :url, db_url)}
+    end
+  end
 end
diff --git a/apps/explorer/lib/explorer/repo/config_helper.ex b/apps/explorer/lib/explorer/repo/config_helper.ex
index e269bbd77aaf..abfe46c958ef 100644
--- a/apps/explorer/lib/explorer/repo/config_helper.ex
+++ b/apps/explorer/lib/explorer/repo/config_helper.ex
@@ -28,6 +28,8 @@ defmodule Explorer.Repo.ConfigHelper do
 
   def get_account_db_url, do: System.get_env("ACCOUNT_DATABASE_URL") || System.get_env("DATABASE_URL")
 
+  def get_suave_db_url, do: System.get_env("SUAVE_DATABASE_URL") || System.get_env("DATABASE_URL")
+
   def get_api_db_url, do: System.get_env("DATABASE_READ_ONLY_API_URL") || System.get_env("DATABASE_URL")
 
   def ssl_enabled?, do: String.equivalent?(System.get_env("ECTO_USE_SSL") || "true", "true")
diff --git a/apps/explorer/lib/release_tasks.ex b/apps/explorer/lib/release_tasks.ex
index 6b97dc6d665f..248f69fa89d3 100644
--- a/apps/explorer/lib/release_tasks.ex
+++ b/apps/explorer/lib/release_tasks.ex
@@ -24,6 +24,7 @@ defmodule Explorer.ReleaseTasks do
       case System.get_env("CHAIN_TYPE") do
         "polygon_edge" -> [Explorer.Repo.PolygonEdge | base_repos_list]
         "polygon_zkevm" -> [Explorer.Repo.PolygonZkevm | base_repos_list]
+        "suave" -> [Explorer.Repo.Suave | base_repos_list]
         _ -> base_repos_list
       end
 
diff --git a/apps/explorer/priv/suave/migrations/20230921120210_add_suave_transaction_fields.exs b/apps/explorer/priv/suave/migrations/20230921120210_add_suave_transaction_fields.exs
new file mode 100644
index 000000000000..2476d0b42fab
--- /dev/null
+++ b/apps/explorer/priv/suave/migrations/20230921120210_add_suave_transaction_fields.exs
@@ -0,0 +1,24 @@
+defmodule Explorer.Repo.Suave.Migrations.AddSuaveTransactionFields do
+  use Ecto.Migration
+
+  def change do
+    alter table(:transactions) do
+      add(:execution_node_hash, :bytea, null: true)
+      add(:wrapped_type, :integer, null: true)
+      add(:wrapped_nonce, :integer, null: true)
+      add(:wrapped_to_address_hash, :bytea, null: true)
+      add(:wrapped_gas, :numeric, precision: 100, null: true)
+      add(:wrapped_gas_price, :numeric, precision: 100, null: true)
+      add(:wrapped_max_priority_fee_per_gas, :numeric, precision: 100, null: true)
+      add(:wrapped_max_fee_per_gas, :numeric, precision: 100, null: true)
+      add(:wrapped_value, :numeric, precision: 100, null: true)
+      add(:wrapped_input, :bytea, null: true)
+      add(:wrapped_v, :numeric, precision: 100, null: true)
+      add(:wrapped_r, :numeric, precision: 100, null: true)
+      add(:wrapped_s, :numeric, precision: 100, null: true)
+      add(:wrapped_hash, :bytea, null: true)
+    end
+
+    create(index(:transactions, :execution_node_hash))
+  end
+end
diff --git a/apps/explorer/test/support/data_case.ex b/apps/explorer/test/support/data_case.ex
index 71d60c49695b..f93e1bcf7aa7 100644
--- a/apps/explorer/test/support/data_case.ex
+++ b/apps/explorer/test/support/data_case.ex
@@ -38,6 +38,7 @@ defmodule Explorer.DataCase do
     :ok = Ecto.Adapters.SQL.Sandbox.checkout(Explorer.Repo.PolygonEdge)
     :ok = Ecto.Adapters.SQL.Sandbox.checkout(Explorer.Repo.PolygonZkevm)
     :ok = Ecto.Adapters.SQL.Sandbox.checkout(Explorer.Repo.RSK)
+    :ok = Ecto.Adapters.SQL.Sandbox.checkout(Explorer.Repo.Suave)
 
     unless tags[:async] do
       Ecto.Adapters.SQL.Sandbox.mode(Explorer.Repo, {:shared, self()})
@@ -45,6 +46,7 @@ defmodule Explorer.DataCase do
       Ecto.Adapters.SQL.Sandbox.mode(Explorer.Repo.PolygonEdge, {:shared, self()})
       Ecto.Adapters.SQL.Sandbox.mode(Explorer.Repo.PolygonZkevm, {:shared, self()})
       Ecto.Adapters.SQL.Sandbox.mode(Explorer.Repo.RSK, {:shared, self()})
+      Ecto.Adapters.SQL.Sandbox.mode(Explorer.Repo.Suave, {:shared, self()})
     end
 
     Supervisor.terminate_child(Explorer.Supervisor, Explorer.Chain.Cache.BlockNumber.child_id())
diff --git a/apps/explorer/test/test_helper.exs b/apps/explorer/test/test_helper.exs
index 0f973e0b4429..938420e729a0 100644
--- a/apps/explorer/test/test_helper.exs
+++ b/apps/explorer/test/test_helper.exs
@@ -16,6 +16,7 @@ Ecto.Adapters.SQL.Sandbox.mode(Explorer.Repo.Account, :auto)
 Ecto.Adapters.SQL.Sandbox.mode(Explorer.Repo.PolygonEdge, :auto)
 Ecto.Adapters.SQL.Sandbox.mode(Explorer.Repo.PolygonZkevm, :auto)
 Ecto.Adapters.SQL.Sandbox.mode(Explorer.Repo.RSK, :auto)
+Ecto.Adapters.SQL.Sandbox.mode(Explorer.Repo.Suave, :auto)
 
 Mox.defmock(Explorer.ExchangeRates.Source.TestSource, for: Explorer.ExchangeRates.Source)
 Mox.defmock(Explorer.Market.History.Source.Price.TestSource, for: Explorer.Market.History.Source.Price)
diff --git a/apps/indexer/lib/indexer/transform/addresses.ex b/apps/indexer/lib/indexer/transform/addresses.ex
index 5787cc62bb06..bd31681200da 100644
--- a/apps/indexer/lib/indexer/transform/addresses.ex
+++ b/apps/indexer/lib/indexer/transform/addresses.ex
@@ -95,7 +95,9 @@ defmodule Indexer.Transform.Addresses do
       ],
       [
         %{from: :block_number, to: :fetched_coin_balance_block_number},
-        %{from: :to_address_hash, to: :hash}
+        %{from: :to_address_hash, to: :hash},
+        %{from: :execution_node_hash, to: :hash},
+        %{from: :wrapped_to_address_hash, to: :hash}
       ]
     ],
     logs: [
@@ -399,7 +401,9 @@ defmodule Indexer.Transform.Addresses do
               required(:from_address_hash) => String.t(),
               required(:nonce) => non_neg_integer(),
               optional(:to_address_hash) => String.t(),
-              optional(:created_contract_address_hash) => String.t()
+              optional(:created_contract_address_hash) => String.t(),
+              optional(:execution_node_hash) => String.t(),
+              optional(:wrapped_to_address_hash) => String.t()
             }
           ],
           optional(:logs) => [
diff --git a/config/config_helper.exs b/config/config_helper.exs
index 6533002e154f..af4e8de6aefe 100644
--- a/config/config_helper.exs
+++ b/config/config_helper.exs
@@ -11,6 +11,7 @@ defmodule ConfigHelper do
       "polygon_edge" -> base_repos ++ [Explorer.Repo.PolygonEdge]
       "polygon_zkevm" -> base_repos ++ [Explorer.Repo.PolygonZkevm]
       "rsk" -> base_repos ++ [Explorer.Repo.RSK]
+      "suave" -> base_repos ++ [Explorer.Repo.Suave]
       _ -> base_repos
     end
   end
diff --git a/config/runtime.exs b/config/runtime.exs
index 4d0650988cbe..6332d618d0c8 100644
--- a/config/runtime.exs
+++ b/config/runtime.exs
@@ -308,6 +308,8 @@ config :explorer, Explorer.ExchangeRates.TokenExchangeRates,
 
 config :explorer, Explorer.Market.History.Cataloger, enabled: !disable_indexer? && !disable_exchange_rates?
 
+config :explorer, Explorer.Chain.Transaction, suave_bid_contracts: System.get_env("SUAVE_BID_CONTRACTS", "")
+
 config :explorer, Explorer.Chain.Transaction.History.Historian,
   enabled: ConfigHelper.parse_bool_env_var("TXS_STATS_ENABLED", "true"),
   init_lag_milliseconds: ConfigHelper.parse_time_env_var("TXS_HISTORIAN_INIT_LAG", "0"),
diff --git a/config/runtime/dev.exs b/config/runtime/dev.exs
index b946598a3815..c10a0b752a5c 100644
--- a/config/runtime/dev.exs
+++ b/config/runtime/dev.exs
@@ -96,6 +96,13 @@ config :explorer, Explorer.Repo.RSK,
   # separating repos for different CHAIN_TYPE is implemented only for the sake of keeping DB schema update relevant to the current chain type
   pool_size: 1
 
+# Configure Suave database
+config :explorer, Explorer.Repo.Suave,
+  database: database,
+  hostname: hostname,
+  url: ExplorerConfigHelper.get_suave_db_url(),
+  pool_size: 1
+
 variant = Variant.get()
 
 Code.require_file("#{variant}.exs", "apps/explorer/config/dev")
diff --git a/config/runtime/prod.exs b/config/runtime/prod.exs
index a2c6569d37e1..a8692d8c540e 100644
--- a/config/runtime/prod.exs
+++ b/config/runtime/prod.exs
@@ -71,6 +71,12 @@ config :explorer, Explorer.Repo.RSK,
   pool_size: 1,
   ssl: ExplorerConfigHelper.ssl_enabled?()
 
+# Configures Suave database
+config :explorer, Explorer.Repo.Suave,
+  url: ExplorerConfigHelper.get_suave_db_url(),
+  pool_size: 1,
+  ssl: ExplorerConfigHelper.ssl_enabled?()
+
 variant = Variant.get()
 
 Code.require_file("#{variant}.exs", "apps/explorer/config/prod")
diff --git a/cspell.json b/cspell.json
index 63694d741c37..2ef306d4e72d 100644
--- a/cspell.json
+++ b/cspell.json
@@ -318,6 +318,8 @@
         "outcoming",
         "pawesome",
         "pbcopy",
+        "peeker",
+        "peekers",
         "pendingtxlist",
         "perc",
         "persistable",

From 9828c926d4b70fcedb8e163beae1735e95d3e6d7 Mon Sep 17 00:00:00 2001
From: nikitosing <32202610+nikitosing@users.noreply.github.com>
Date: Wed, 25 Oct 2023 15:01:24 +0300
Subject: [PATCH 592/909] Support tokenSymbol and tokenName in
 /api/v2/import/token-info (#8696)

* Support tokenSymbol and tokenName in /api/v2/import/token-info

* Changelog
---
 CHANGELOG.md                                  |  1 +
 .../controllers/api/v2/import_controller.ex   | 43 +++++++++++++++++--
 .../api/v2/import_controller_test.exs         | 33 ++++++++++----
 3 files changed, 65 insertions(+), 12 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4945287c36f1..5fbde9fb0d30 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,7 @@
 
 ### Features
 
+- [#8696](https://github.com/blockscout/blockscout/pull/8696) - Support tokenSymbol and tokenName in `/api/v2/import/token-info`
 - [#8673](https://github.com/blockscout/blockscout/pull/8673) - Add a window for balances fetching from non-archive node
 - [#8556](https://github.com/blockscout/blockscout/pull/8556) - Suave functional
 - [#8528](https://github.com/blockscout/blockscout/pull/8528) - Account: add pagination + envs for limits
diff --git a/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/import_controller.ex b/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/import_controller.ex
index a89cbb323e74..bf5ebe6f3280 100644
--- a/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/import_controller.ex
+++ b/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/import_controller.ex
@@ -10,15 +10,28 @@ defmodule BlockScoutWeb.API.V2.ImportController do
 
   action_fallback(BlockScoutWeb.API.V2.FallbackController)
 
-  def import_token_info(conn, %{"iconUrl" => icon_url, "tokenAddress" => token_address_hash_string} = params) do
+  def import_token_info(
+        conn,
+        %{
+          "iconUrl" => icon_url,
+          "tokenAddress" => token_address_hash_string,
+          "tokenSymbol" => token_symbol,
+          "tokenName" => token_name
+        } = params
+      ) do
     with {:sensitive_endpoints_api_key, api_key} when not is_nil(api_key) <-
            {:sensitive_endpoints_api_key, Application.get_env(:block_scout_web, :sensitive_endpoints_api_key)},
          {:api_key, ^api_key} <- {:api_key, params["api_key"]},
          {:format_address, {:ok, address_hash}} <-
            {:format_address, Chain.string_to_address_hash(token_address_hash_string)},
-         {:not_found, {:ok, token}} <- {:not_found, Chain.token_from_address_hash(address_hash, @api_true)},
-         {:format_url, true} <- {:format_url, valid_url?(icon_url)} do
-      case token |> Token.changeset(%{icon_url: icon_url, is_verified_via_admin_panel: true}) |> Repo.update() do
+         {:not_found, {:ok, token}} <- {:not_found, Chain.token_from_address_hash(address_hash, @api_true)} do
+      changeset =
+        %{is_verified_via_admin_panel: true}
+        |> put_icon_url(icon_url)
+        |> put_token_string_field(token_symbol, :symbol)
+        |> put_token_string_field(token_name, :name)
+
+      case token |> Token.changeset(changeset) |> Repo.update() do
         {:ok, _} ->
           conn
           |> put_view(ApiView)
@@ -39,4 +52,26 @@ defmodule BlockScoutWeb.API.V2.ImportController do
     uri = URI.parse(url)
     uri.scheme != nil && uri.host =~ "."
   end
+
+  defp valid_url?(_url), do: false
+
+  defp put_icon_url(changeset, icon_url) do
+    if valid_url?(icon_url) do
+      Map.put(changeset, :icon_url, icon_url)
+    else
+      changeset
+    end
+  end
+
+  defp put_token_string_field(changeset, token_symbol, field) when is_binary(token_symbol) do
+    token_symbol = String.trim(token_symbol)
+
+    if token_symbol !== "" do
+      Map.put(changeset, field, token_symbol)
+    else
+      changeset
+    end
+  end
+
+  defp put_token_string_field(changeset, _token_symbol, _field), do: changeset
 end
diff --git a/apps/block_scout_web/test/block_scout_web/controllers/api/v2/import_controller_test.exs b/apps/block_scout_web/test/block_scout_web/controllers/api/v2/import_controller_test.exs
index db3b99b5dafa..52ea55071b61 100644
--- a/apps/block_scout_web/test/block_scout_web/controllers/api/v2/import_controller_test.exs
+++ b/apps/block_scout_web/test/block_scout_web/controllers/api/v2/import_controller_test.exs
@@ -3,14 +3,20 @@ defmodule BlockScoutWeb.API.V2.ImportControllerTest do
 
   describe "/import/token-info" do
     test "return error on misconfigured api key", %{conn: conn} do
-      request = post(conn, "/api/v2/import/token-info", %{"iconUrl" => "abc", "tokenAddress" => build(:address).hash})
+      request =
+        post(conn, "/api/v2/import/token-info", %{
+          "iconUrl" => "abc",
+          "tokenAddress" => build(:address).hash,
+          "tokenSymbol" => "",
+          "tokenName" => ""
+        })
 
       assert %{"message" => "API key not configured on the server"} = json_response(request, 403)
     end
 
     test "return error on wrong api key", %{conn: conn} do
       Application.put_env(:block_scout_web, :sensitive_endpoints_api_key, "abc")
-      body = %{"iconUrl" => "abc", "tokenAddress" => build(:address).hash}
+      body = %{"iconUrl" => "abc", "tokenAddress" => build(:address).hash, "tokenSymbol" => "", "tokenName" => ""}
       request = post(conn, "/api/v2/import/token-info", Map.merge(body, %{"api_key" => "123"}))
 
       assert %{"message" => "Wrong API key"} = json_response(request, 401)
@@ -24,15 +30,19 @@ defmodule BlockScoutWeb.API.V2.ImportControllerTest do
 
       Application.put_env(:block_scout_web, :sensitive_endpoints_api_key, api_key)
 
-      token_address = to_string(insert(:token, icon_url: nil).contract_address_hash)
+      token = insert(:token, icon_url: nil)
+      token_address = to_string(token.contract_address_hash)
 
-      body = %{"iconUrl" => icon_url, "tokenAddress" => token_address}
+      body = %{"iconUrl" => icon_url, "tokenAddress" => token_address, "tokenSymbol" => "", "tokenName" => ""}
 
       request = post(conn, "/api/v2/import/token-info", Map.merge(body, %{"api_key" => api_key}))
-      assert %{"message" => "Invalid URL"} = json_response(request, 422)
+      assert %{"message" => "Success"} = json_response(request, 200)
 
       request = get(conn, "/api/v2/tokens/#{token_address}")
-      assert %{"icon_url" => nil} = json_response(request, 200)
+
+      name = token.name
+      symbol = token.symbol
+      assert %{"icon_url" => nil, "name" => ^name, "symbol" => ^symbol} = json_response(request, 200)
 
       Application.put_env(:block_scout_web, :sensitive_endpoints_api_key, nil)
     end
@@ -40,18 +50,25 @@ defmodule BlockScoutWeb.API.V2.ImportControllerTest do
     test "success import token info", %{conn: conn} do
       api_key = "abc123"
       icon_url = "http://example.com/image?a=0&b=1"
+      token_symbol = "UPD"
+      token_name = "UPDATED"
 
       Application.put_env(:block_scout_web, :sensitive_endpoints_api_key, api_key)
 
       token_address = to_string(insert(:token).contract_address_hash)
 
-      body = %{"iconUrl" => icon_url, "tokenAddress" => token_address}
+      body = %{
+        "iconUrl" => icon_url,
+        "tokenAddress" => token_address,
+        "tokenSymbol" => token_symbol,
+        "tokenName" => token_name
+      }
 
       request = post(conn, "/api/v2/import/token-info", Map.merge(body, %{"api_key" => api_key}))
       assert %{"message" => "Success"} = json_response(request, 200)
 
       request = get(conn, "/api/v2/tokens/#{token_address}")
-      assert %{"icon_url" => ^icon_url} = json_response(request, 200)
+      assert %{"icon_url" => ^icon_url, "name" => ^token_name, "symbol" => ^token_symbol} = json_response(request, 200)
 
       Application.put_env(:block_scout_web, :sensitive_endpoints_api_key, nil)
     end

From 5d9cba1468828edaa858246a3c7f986a5f382f4f Mon Sep 17 00:00:00 2001
From: Viktor Baranov <baranov.viktor.27@gmail.com>
Date: Wed, 25 Oct 2023 15:37:21 +0300
Subject: [PATCH 593/909] Update more Docker images on release

---
 .../publish-docker-image-for-immutable.yml    |  3 +
 .../publish-docker-image-for-rsk.yml          |  2 +-
 .../publish-docker-image-for-suave.yml        | 64 ++++++++++++++
 .../publish-docker-image-for-zkevm.yml        |  2 +-
 .../publish-docker-image-release.yml          | 88 +++++++++++++++++++
 5 files changed, 157 insertions(+), 2 deletions(-)
 create mode 100644 .github/workflows/publish-docker-image-for-suave.yml

diff --git a/.github/workflows/publish-docker-image-for-immutable.yml b/.github/workflows/publish-docker-image-for-immutable.yml
index 2936312ba855..cca4ba6edc55 100644
--- a/.github/workflows/publish-docker-image-for-immutable.yml
+++ b/.github/workflows/publish-docker-image-for-immutable.yml
@@ -45,6 +45,9 @@ jobs:
           file: ./docker/Dockerfile
           push: true
           tags: blockscout/blockscout-${{ env.DOCKER_CHAIN_NAME }}:latest, blockscout/blockscout-${{ env.DOCKER_CHAIN_NAME }}:${{ env.RELEASE_VERSION }}-postrelease-${{ env.SHORT_SHA }}
+          platforms: |
+            linux/amd64
+            linux/arm64/v8
           build-args: |
             CACHE_EXCHANGE_RATES_PERIOD=
             API_V1_READ_METHODS_DISABLED=false
diff --git a/.github/workflows/publish-docker-image-for-rsk.yml b/.github/workflows/publish-docker-image-for-rsk.yml
index 209cbf090197..c8f1e3d39bfa 100644
--- a/.github/workflows/publish-docker-image-for-rsk.yml
+++ b/.github/workflows/publish-docker-image-for-rsk.yml
@@ -36,7 +36,7 @@ jobs:
         run: echo "SHORT_SHA=`echo ${GITHUB_SHA} | cut -c1-8`" >> $GITHUB_ENV
       
       - name: Build and push Docker image
-        uses: docker/build-push-action@ad44023a93711e3deb337508980b4b5e9bcdc5dc
+        uses: docker/build-push-action@5
         with:
           context: .
           file: ./docker/Dockerfile
diff --git a/.github/workflows/publish-docker-image-for-suave.yml b/.github/workflows/publish-docker-image-for-suave.yml
new file mode 100644
index 000000000000..04f9c117f9d3
--- /dev/null
+++ b/.github/workflows/publish-docker-image-for-suave.yml
@@ -0,0 +1,64 @@
+# This workflow uses actions that are not certified by GitHub.
+# They are provided by a third-party and are governed by
+# separate terms of service, privacy policy, and support
+# documentation.
+
+name: Publish Docker image for specific chain branches
+
+on:
+  push:
+    branches:
+      - production-suave-stg
+env:
+  OTP_VERSION: '25.2.1'
+  ELIXIR_VERSION: '1.14.5'
+jobs:
+  push_to_registry:
+    name: Push Docker image to Docker Hub
+    runs-on: ubuntu-latest
+    env:
+      RELEASE_VERSION: 5.3.0
+      DOCKER_CHAIN_NAME: suave
+    steps:
+      - name: Check out the repo
+        uses: actions/checkout@v4
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+      
+      - name: Log in to Docker Hub
+        uses: docker/login-action@v3
+        with:
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
+      
+      - name: Extract metadata (tags, labels) for Docker
+        id: meta
+        uses: docker/metadata-action@v5
+        with:
+          images: blockscout/blockscout
+
+      - name: Add SHORT_SHA env property with commit short sha
+        run: echo "SHORT_SHA=`echo ${GITHUB_SHA} | cut -c1-8`" >> $GITHUB_ENV
+      
+      - name: Build and push Docker image
+        uses: docker/build-push-action@v5
+        with:
+          context: .
+          file: ./docker/Dockerfile
+          push: true
+          tags: blockscout/blockscout-${{ env.DOCKER_CHAIN_NAME }}:latest, blockscout/blockscout-${{ env.DOCKER_CHAIN_NAME }}:${{ env.RELEASE_VERSION }}-postrelease-${{ env.SHORT_SHA }}
+          platforms: |
+            linux/amd64
+            linux/arm64/v8
+          build-args: |
+            CACHE_EXCHANGE_RATES_PERIOD=
+            API_V1_READ_METHODS_DISABLED=false
+            DISABLE_WEBAPP=false
+            API_V1_WRITE_METHODS_DISABLED=false
+            CACHE_TOTAL_GAS_USAGE_COUNTER_ENABLED=
+            ADMIN_PANEL_ENABLED=false
+            CACHE_ADDRESS_WITH_BALANCES_UPDATE_INTERVAL=
+            BLOCKSCOUT_VERSION=v${{ env.RELEASE_VERSION }}-beta.+commit.${{ env.SHORT_SHA }}
+            RELEASE_VERSION=${{ env.RELEASE_VERSION }}
+            CHAIN_TYPE=suave
\ No newline at end of file
diff --git a/.github/workflows/publish-docker-image-for-zkevm.yml b/.github/workflows/publish-docker-image-for-zkevm.yml
index cb313b6ea081..192c54845b0c 100644
--- a/.github/workflows/publish-docker-image-for-zkevm.yml
+++ b/.github/workflows/publish-docker-image-for-zkevm.yml
@@ -36,7 +36,7 @@ jobs:
         run: echo "SHORT_SHA=`echo ${GITHUB_SHA} | cut -c1-8`" >> $GITHUB_ENV
       
       - name: Build and push Docker image
-        uses: docker/build-push-action@v3
+        uses: docker/build-push-action@v5
         with:
           context: .
           file: ./docker/Dockerfile
diff --git a/.github/workflows/publish-docker-image-release.yml b/.github/workflows/publish-docker-image-release.yml
index 9d2d59aaa183..04982620a674 100644
--- a/.github/workflows/publish-docker-image-release.yml
+++ b/.github/workflows/publish-docker-image-release.yml
@@ -66,6 +66,94 @@ jobs:
             BLOCKSCOUT_VERSION=v${{ env.RELEASE_VERSION }}-beta
             RELEASE_VERSION=${{ env.RELEASE_VERSION }}
 
+      - name: Build and push Docker image for zkEVM
+        uses: docker/build-push-action@v5
+        with:
+          context: .
+          file: ./docker/Dockerfile
+          push: true
+          tags: blockscout/blockscout-zkevm:latest, blockscout/blockscout-zkevm:${{ env.RELEASE_VERSION }}
+          platforms: |
+            linux/amd64
+            linux/arm64/v8
+          build-args: |
+            CACHE_EXCHANGE_RATES_PERIOD=
+            API_V1_READ_METHODS_DISABLED=false
+            DISABLE_WEBAPP=false
+            API_V1_WRITE_METHODS_DISABLED=false
+            CACHE_TOTAL_GAS_USAGE_COUNTER_ENABLED=
+            ADMIN_PANEL_ENABLED=false
+            CACHE_ADDRESS_WITH_BALANCES_UPDATE_INTERVAL=
+            BLOCKSCOUT_VERSION=v${{ env.RELEASE_VERSION }}-beta
+            RELEASE_VERSION=${{ env.RELEASE_VERSION }}
+            CHAIN_TYPE=polygon_zkevm
+
+      - name: Build and push Docker image for SUAVE
+        uses: docker/build-push-action@v5
+        with:
+          context: .
+          file: ./docker/Dockerfile
+          push: true
+          tags: blockscout/blockscout-suave:latest, blockscout/blockscout-suave:${{ env.RELEASE_VERSION }}
+          platforms: |
+            linux/amd64
+            linux/arm64/v8
+          build-args: |
+            CACHE_EXCHANGE_RATES_PERIOD=
+            API_V1_READ_METHODS_DISABLED=false
+            DISABLE_WEBAPP=false
+            API_V1_WRITE_METHODS_DISABLED=false
+            CACHE_TOTAL_GAS_USAGE_COUNTER_ENABLED=
+            ADMIN_PANEL_ENABLED=false
+            CACHE_ADDRESS_WITH_BALANCES_UPDATE_INTERVAL=
+            BLOCKSCOUT_VERSION=v${{ env.RELEASE_VERSION }}-beta
+            RELEASE_VERSION=${{ env.RELEASE_VERSION }}
+            CHAIN_TYPE=suave
+
+      - name: Build and push Docker image for Rootstock
+        uses: docker/build-push-action@5
+        with:
+          context: .
+          file: ./docker/Dockerfile
+          push: true
+          tags: blockscout/blockscout-rsk:latest, blockscout/blockscout-rsk:${{ env.RELEASE_VERSION }}
+          platforms: |
+            linux/amd64
+            linux/arm64/v8
+          build-args: |
+            CACHE_EXCHANGE_RATES_PERIOD=
+            API_V1_READ_METHODS_DISABLED=false
+            DISABLE_WEBAPP=false
+            API_V1_WRITE_METHODS_DISABLED=false
+            CACHE_TOTAL_GAS_USAGE_COUNTER_ENABLED=
+            ADMIN_PANEL_ENABLED=false
+            CACHE_ADDRESS_WITH_BALANCES_UPDATE_INTERVAL=
+            BLOCKSCOUT_VERSION=v${{ env.RELEASE_VERSION }}-beta
+            RELEASE_VERSION=${{ env.RELEASE_VERSION }}
+            CHAIN_TYPE=rsk
+
+      - name: Build and push Docker image for Polygon Edge
+        uses: docker/build-push-action@v5
+        with:
+          context: .
+          file: ./docker/Dockerfile
+          push: true
+          tags: blockscout/blockscout-polygon-edge:latest, blockscout/blockscout-polygon-edge:${{ env.RELEASE_VERSION }}
+          platforms: |
+            linux/amd64
+            linux/arm64/v8
+          build-args: |
+            CACHE_EXCHANGE_RATES_PERIOD=
+            API_V1_READ_METHODS_DISABLED=false
+            DISABLE_WEBAPP=false
+            API_V1_WRITE_METHODS_DISABLED=false
+            CACHE_TOTAL_GAS_USAGE_COUNTER_ENABLED=
+            ADMIN_PANEL_ENABLED=false
+            CACHE_ADDRESS_WITH_BALANCES_UPDATE_INTERVAL=
+            BLOCKSCOUT_VERSION=v${{ env.RELEASE_VERSION }}-beta
+            RELEASE_VERSION=${{ env.RELEASE_VERSION }}
+            CHAIN_TYPE=polygon_edge
+
       - name: Send release announcement to Slack workflow
         id: slack
         uses: slackapi/slack-github-action@v1.24.0

From 15efaac428b14da293eb1bb9b25f730138a13d89 Mon Sep 17 00:00:00 2001
From: nikitosing <32202610+nikitosing@users.noreply.github.com>
Date: Wed, 25 Oct 2023 15:38:55 +0300
Subject: [PATCH 594/909] Fix sourcify enabled flag (#8705)

* Fix sourcify enabled flag

* Changelog
---
 CHANGELOG.md                                                  | 1 +
 .../lib/explorer/smart_contract/solidity/publish_helper.ex    | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5fbde9fb0d30..bd9c5e0a2017 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,6 +12,7 @@
 
 ### Fixes
 
+- [#8705](https://github.com/blockscout/blockscout/pull/8705) - Fix sourcify enabled flag
 - [#8695](https://github.com/blockscout/blockscout/pull/8695) - Don't override internal transaction error if it's present already
 - [#8685](https://github.com/blockscout/blockscout/pull/8685) - Fix db pool size exceeds Postgres max connections
 - [#8678](https://github.com/blockscout/blockscout/pull/8678) - Fix `is_verified` for `/addresses` and `/smart-contracts`
diff --git a/apps/explorer/lib/explorer/smart_contract/solidity/publish_helper.ex b/apps/explorer/lib/explorer/smart_contract/solidity/publish_helper.ex
index fa53ae86814f..99378a0bb911 100644
--- a/apps/explorer/lib/explorer/smart_contract/solidity/publish_helper.ex
+++ b/apps/explorer/lib/explorer/smart_contract/solidity/publish_helper.ex
@@ -152,12 +152,12 @@ defmodule Explorer.SmartContract.Solidity.PublishHelper do
       LookUpSmartContractSourcesOnDemand.trigger_fetch(%Address{hash: address_hash_string}, nil)
     else
       if Application.get_env(:explorer, Explorer.ThirdPartyIntegrations.Sourcify)[:enabled] do
-        {:error, :sourcify_disabled}
-      else
         check_by_address_in_sourcify(
           SmartContract.select_partially_verified_by_address_hash(address_hash_string),
           address_hash_string
         )
+      else
+        {:error, :sourcify_disabled}
       end
     end
   end

From 533eb26329a83ad35dff77c22df2f05cd35ec5d3 Mon Sep 17 00:00:00 2001
From: nikitosing <32202610+nikitosing@users.noreply.github.com>
Date: Thu, 26 Oct 2023 12:33:53 +0300
Subject: [PATCH 595/909] Add stability_fee for CHAIN_TYPE=stability (#8651)

* Add stability_fee for CHAIN_TYPE=stability

* Changelog

* Optimize token fee requests

* Remove unused function

* Process review comments

* Fixes after rebase
---
 .dialyzer-ignore                              |   2 +-
 CHANGELOG.md                                  |   1 +
 .../views/api/v2/token_view.ex                |  15 ++
 .../views/api/v2/transaction_view.ex          |  42 +++++-
 .../api/v2/transaction_controller_test.exs    | 139 ++++++++++++++++++
 apps/explorer/lib/explorer/chain/log.ex       |  11 +-
 apps/explorer/lib/explorer/chain/token.ex     |   6 +-
 .../lib/explorer/chain/transaction.ex         | 103 ++++++++++++-
 8 files changed, 313 insertions(+), 6 deletions(-)

diff --git a/.dialyzer-ignore b/.dialyzer-ignore
index eff92c43ffab..c36e55ab7ae5 100644
--- a/.dialyzer-ignore
+++ b/.dialyzer-ignore
@@ -25,4 +25,4 @@ lib/indexer/fetcher/zkevm/transaction_batch.ex:156
 lib/indexer/fetcher/zkevm/transaction_batch.ex:252
 lib/block_scout_web/views/api/v2/transaction_view.ex:431
 lib/block_scout_web/views/api/v2/transaction_view.ex:472
-lib/explorer/chain/transaction.ex:165
+lib/explorer/chain/transaction.ex:166
diff --git a/CHANGELOG.md b/CHANGELOG.md
index bd9c5e0a2017..2f517dfb632e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,7 @@
 
 - [#8696](https://github.com/blockscout/blockscout/pull/8696) - Support tokenSymbol and tokenName in `/api/v2/import/token-info`
 - [#8673](https://github.com/blockscout/blockscout/pull/8673) - Add a window for balances fetching from non-archive node
+- [#8651](https://github.com/blockscout/blockscout/pull/8651) - Add `stability_fee` for CHAIN_TYPE=stability
 - [#8556](https://github.com/blockscout/blockscout/pull/8556) - Suave functional
 - [#8528](https://github.com/blockscout/blockscout/pull/8528) - Account: add pagination + envs for limits
 - [#7584](https://github.com/blockscout/blockscout/pull/7584) - Add Polygon zkEVM batches fetcher
diff --git a/apps/block_scout_web/lib/block_scout_web/views/api/v2/token_view.ex b/apps/block_scout_web/lib/block_scout_web/views/api/v2/token_view.ex
index 7f983ed84b56..f78a3340d31b 100644
--- a/apps/block_scout_web/lib/block_scout_web/views/api/v2/token_view.ex
+++ b/apps/block_scout_web/lib/block_scout_web/views/api/v2/token_view.ex
@@ -6,6 +6,21 @@ defmodule BlockScoutWeb.API.V2.TokenView do
 
   @api_true [api?: true]
 
+  def render("token.json", %{token: nil, contract_address_hash: contract_address_hash}) do
+    %{
+      "address" => Address.checksum(contract_address_hash),
+      "symbol" => nil,
+      "name" => nil,
+      "decimals" => nil,
+      "type" => nil,
+      "holders" => nil,
+      "exchange_rate" => nil,
+      "total_supply" => nil,
+      "icon_url" => nil,
+      "circulating_market_cap" => nil
+    }
+  end
+
   def render("token.json", %{token: token}) do
     %{
       "address" => Address.checksum(token.contract_address_hash),
diff --git a/apps/block_scout_web/lib/block_scout_web/views/api/v2/transaction_view.ex b/apps/block_scout_web/lib/block_scout_web/views/api/v2/transaction_view.ex
index a2c76b5e5b56..c3e4d8288740 100644
--- a/apps/block_scout_web/lib/block_scout_web/views/api/v2/transaction_view.ex
+++ b/apps/block_scout_web/lib/block_scout_web/views/api/v2/transaction_view.ex
@@ -16,6 +16,7 @@ defmodule BlockScoutWeb.API.V2.TransactionView do
   alias Timex.Duration
 
   import BlockScoutWeb.Account.AuthController, only: [current_user: 1]
+  import Explorer.Chain.Transaction, only: [maybe_prepare_stability_fees: 1, bytes_to_address_hash: 1]
   import Explorer.Helper, only: [decode_data: 2]
 
   @api_true [api?: true]
@@ -37,6 +38,7 @@ defmodule BlockScoutWeb.API.V2.TransactionView do
     %{
       "items" =>
         transactions
+        |> maybe_prepare_stability_fees()
         |> Enum.zip(decoded_transactions)
         |> Enum.map(fn {tx, decoded_input} ->
           prepare_transaction(tx, conn, false, block_height, watchlist_names, decoded_input)
@@ -54,6 +56,7 @@ defmodule BlockScoutWeb.API.V2.TransactionView do
     {decoded_transactions, _, _} = decode_transactions(transactions, true)
 
     transactions
+    |> maybe_prepare_stability_fees()
     |> Enum.zip(decoded_transactions)
     |> Enum.map(fn {tx, decoded_input} ->
       prepare_transaction(tx, conn, false, block_height, watchlist_names, decoded_input)
@@ -67,6 +70,7 @@ defmodule BlockScoutWeb.API.V2.TransactionView do
     %{
       "items" =>
         transactions
+        |> maybe_prepare_stability_fees()
         |> Enum.zip(decoded_transactions)
         |> Enum.map(fn {tx, decoded_input} -> prepare_transaction(tx, conn, false, block_height, decoded_input) end),
       "next_page_params" => next_page_params
@@ -84,6 +88,7 @@ defmodule BlockScoutWeb.API.V2.TransactionView do
     {decoded_transactions, _, _} = decode_transactions(transactions, true)
 
     transactions
+    |> maybe_prepare_stability_fees()
     |> Enum.zip(decoded_transactions)
     |> Enum.map(fn {tx, decoded_input} -> prepare_transaction(tx, conn, false, block_height, decoded_input) end)
   end
@@ -91,7 +96,7 @@ defmodule BlockScoutWeb.API.V2.TransactionView do
   def render("transaction.json", %{transaction: transaction, conn: conn}) do
     block_height = Chain.block_height(@api_true)
     {[decoded_input], _, _} = decode_transactions([transaction], false)
-    prepare_transaction(transaction, conn, true, block_height, decoded_input)
+    prepare_transaction(transaction |> maybe_prepare_stability_fees(), conn, true, block_height, decoded_input)
   end
 
   def render("raw_trace.json", %{internal_transactions: internal_transactions}) do
@@ -416,7 +421,9 @@ defmodule BlockScoutWeb.API.V2.TransactionView do
       "has_error_in_internal_txs" => transaction.has_error_in_internal_txs
     }
 
-    chain_type_fields(result, transaction, single_tx?, conn, watchlist_names)
+    result
+    |> chain_type_fields(transaction, single_tx?, conn, watchlist_names)
+    |> maybe_put_stability_fee(transaction)
   end
 
   defp chain_type_fields(result, transaction, single_tx?, conn, watchlist_names) do
@@ -882,4 +889,35 @@ defmodule BlockScoutWeb.API.V2.TransactionView do
       _ -> {nil, nil}
     end
   end
+
+  defp maybe_put_stability_fee(body, transaction) do
+    with "stability" <- Application.get_env(:explorer, :chain_type),
+         [
+           {"token", "address", false, token_address_hash},
+           {"totalFee", "uint256", false, total_fee},
+           {"validator", "address", false, validator_address_hash},
+           {"validatorFee", "uint256", false, validator_fee},
+           {"dapp", "address", false, dapp_address_hash},
+           {"dappFee", "uint256", false, dapp_fee}
+         ] <- transaction.transaction_fee_log do
+      stability_fee = %{
+        "token" =>
+          TokenView.render("token.json", %{
+            token: transaction.transaction_fee_token,
+            contract_address_hash: bytes_to_address_hash(token_address_hash)
+          }),
+        "validator_address" => Helper.address_with_info(nil, nil, bytes_to_address_hash(validator_address_hash), false),
+        "dapp_address" => Helper.address_with_info(nil, nil, bytes_to_address_hash(dapp_address_hash), false),
+        "total_fee" => to_string(total_fee),
+        "dapp_fee" => to_string(dapp_fee),
+        "validator_fee" => to_string(validator_fee)
+      }
+
+      body
+      |> Map.put("stability_fee", stability_fee)
+    else
+      _ ->
+        body
+    end
+  end
 end
diff --git a/apps/block_scout_web/test/block_scout_web/controllers/api/v2/transaction_controller_test.exs b/apps/block_scout_web/test/block_scout_web/controllers/api/v2/transaction_controller_test.exs
index eb110bf87dd2..f718a35b4770 100644
--- a/apps/block_scout_web/test/block_scout_web/controllers/api/v2/transaction_controller_test.exs
+++ b/apps/block_scout_web/test/block_scout_web/controllers/api/v2/transaction_controller_test.exs
@@ -954,6 +954,145 @@ defmodule BlockScoutWeb.API.V2.TransactionControllerTest do
     end
   end
 
+  describe "stability fees" do
+    setup %{conn: conn} do
+      old_env = Application.get_env(:explorer, :chain_type)
+
+      Application.put_env(:explorer, :chain_type, "stability")
+
+      on_exit(fn ->
+        Application.put_env(:explorer, :chain_type, old_env)
+      end)
+
+      %{conn: conn}
+    end
+
+    test "check stability fees", %{conn: conn} do
+      tx = insert(:transaction) |> with_block()
+
+      log =
+        insert(:log,
+          transaction: tx,
+          index: 1,
+          block: tx.block,
+          block_number: tx.block_number,
+          first_topic: "0x99e7b0ba56da2819c37c047f0511fd2bf6c9b4e27b4a979a19d6da0f74be8155",
+          data:
+            "0x000000000000000000000000dc2b93f3291030f3f7a6d9363ac37757f7ad5c4300000000000000000000000000000000000000000000000000002824369a100000000000000000000000000046b555cb3962bf9533c437cbd04a2f702dfdb999000000000000000000000000000000000000000000000000000014121b4d0800000000000000000000000000faf7a981360c2fab3a5ab7b3d6d8d0cf97a91eb9000000000000000000000000000000000000000000000000000014121b4d0800"
+        )
+
+      insert(:token, contract_address: build(:address, hash: "0xDc2B93f3291030F3F7a6D9363ac37757f7AD5C43"))
+      request = get(conn, "/api/v2/transactions")
+
+      assert %{
+               "items" => [
+                 %{
+                   "stability_fee" => %{
+                     "token" => %{"address" => "0xDc2B93f3291030F3F7a6D9363ac37757f7AD5C43"},
+                     "validator_address" => %{"hash" => "0x46B555CB3962bF9533c437cBD04A2f702dfdB999"},
+                     "dapp_address" => %{"hash" => "0xFAf7a981360c2FAb3a5Ab7b3D6d8D0Cf97a91Eb9"},
+                     "total_fee" => "44136000000000",
+                     "dapp_fee" => "22068000000000",
+                     "validator_fee" => "22068000000000"
+                   }
+                 }
+               ]
+             } = json_response(request, 200)
+
+      request = get(conn, "/api/v2/transactions/#{to_string(tx.hash)}")
+
+      assert %{
+               "stability_fee" => %{
+                 "token" => %{"address" => "0xDc2B93f3291030F3F7a6D9363ac37757f7AD5C43"},
+                 "validator_address" => %{"hash" => "0x46B555CB3962bF9533c437cBD04A2f702dfdB999"},
+                 "dapp_address" => %{"hash" => "0xFAf7a981360c2FAb3a5Ab7b3D6d8D0Cf97a91Eb9"},
+                 "total_fee" => "44136000000000",
+                 "dapp_fee" => "22068000000000",
+                 "validator_fee" => "22068000000000"
+               }
+             } = json_response(request, 200)
+
+      request = get(conn, "/api/v2/addresses/#{to_string(tx.from_address_hash)}/transactions")
+
+      assert %{
+               "items" => [
+                 %{
+                   "stability_fee" => %{
+                     "token" => %{"address" => "0xDc2B93f3291030F3F7a6D9363ac37757f7AD5C43"},
+                     "validator_address" => %{"hash" => "0x46B555CB3962bF9533c437cBD04A2f702dfdB999"},
+                     "dapp_address" => %{"hash" => "0xFAf7a981360c2FAb3a5Ab7b3D6d8D0Cf97a91Eb9"},
+                     "total_fee" => "44136000000000",
+                     "dapp_fee" => "22068000000000",
+                     "validator_fee" => "22068000000000"
+                   }
+                 }
+               ]
+             } = json_response(request, 200)
+    end
+
+    test "check stability if token absent in DB", %{conn: conn} do
+      tx = insert(:transaction) |> with_block()
+
+      log =
+        insert(:log,
+          transaction: tx,
+          index: 1,
+          block: tx.block,
+          block_number: tx.block_number,
+          first_topic: "0x99e7b0ba56da2819c37c047f0511fd2bf6c9b4e27b4a979a19d6da0f74be8155",
+          data:
+            "0x000000000000000000000000dc2b93f3291030f3f7a6d9363ac37757f7ad5c4300000000000000000000000000000000000000000000000000002824369a100000000000000000000000000046b555cb3962bf9533c437cbd04a2f702dfdb999000000000000000000000000000000000000000000000000000014121b4d0800000000000000000000000000faf7a981360c2fab3a5ab7b3d6d8d0cf97a91eb9000000000000000000000000000000000000000000000000000014121b4d0800"
+        )
+
+      request = get(conn, "/api/v2/transactions")
+
+      assert %{
+               "items" => [
+                 %{
+                   "stability_fee" => %{
+                     "token" => %{"address" => "0xDc2B93f3291030F3F7a6D9363ac37757f7AD5C43"},
+                     "validator_address" => %{"hash" => "0x46B555CB3962bF9533c437cBD04A2f702dfdB999"},
+                     "dapp_address" => %{"hash" => "0xFAf7a981360c2FAb3a5Ab7b3D6d8D0Cf97a91Eb9"},
+                     "total_fee" => "44136000000000",
+                     "dapp_fee" => "22068000000000",
+                     "validator_fee" => "22068000000000"
+                   }
+                 }
+               ]
+             } = json_response(request, 200)
+
+      request = get(conn, "/api/v2/transactions/#{to_string(tx.hash)}")
+
+      assert %{
+               "stability_fee" => %{
+                 "token" => %{"address" => "0xDc2B93f3291030F3F7a6D9363ac37757f7AD5C43"},
+                 "validator_address" => %{"hash" => "0x46B555CB3962bF9533c437cBD04A2f702dfdB999"},
+                 "dapp_address" => %{"hash" => "0xFAf7a981360c2FAb3a5Ab7b3D6d8D0Cf97a91Eb9"},
+                 "total_fee" => "44136000000000",
+                 "dapp_fee" => "22068000000000",
+                 "validator_fee" => "22068000000000"
+               }
+             } = json_response(request, 200)
+
+      request = get(conn, "/api/v2/addresses/#{to_string(tx.from_address_hash)}/transactions")
+
+      assert %{
+               "items" => [
+                 %{
+                   "stability_fee" => %{
+                     "token" => %{"address" => "0xDc2B93f3291030F3F7a6D9363ac37757f7AD5C43"},
+                     "validator_address" => %{"hash" => "0x46B555CB3962bF9533c437cBD04A2f702dfdB999"},
+                     "dapp_address" => %{"hash" => "0xFAf7a981360c2FAb3a5Ab7b3D6d8D0Cf97a91Eb9"},
+                     "total_fee" => "44136000000000",
+                     "dapp_fee" => "22068000000000",
+                     "validator_fee" => "22068000000000"
+                   }
+                 }
+               ]
+             } = json_response(request, 200)
+    end
+  end
+
   defp compare_item(%Transaction{} = transaction, json) do
     assert to_string(transaction.hash) == json["hash"]
     assert transaction.block_number == json["block"]
diff --git a/apps/explorer/lib/explorer/chain/log.ex b/apps/explorer/lib/explorer/chain/log.ex
index 71b109cfbce1..3ee92d04240b 100644
--- a/apps/explorer/lib/explorer/chain/log.ex
+++ b/apps/explorer/lib/explorer/chain/log.ex
@@ -229,7 +229,9 @@ defmodule Explorer.Chain.Log do
     end
   end
 
-  defp find_and_decode(abi, log, transaction) do
+  @spec find_and_decode([map()], __MODULE__.t(), Transaction.t()) ::
+          {:error, any} | {:ok, ABI.FunctionSelector.t(), any}
+  def find_and_decode(abi, log, transaction) do
     with {%FunctionSelector{} = selector, mapping} <-
            abi
            |> ABI.parse_specification(include_events?: true)
@@ -314,4 +316,11 @@ defmodule Explorer.Chain.Log do
     |> String.trim_leading("0x")
     |> Base.decode16!(case: :lower)
   end
+
+  def fetch_log_by_tx_hash_and_first_topic(tx_hash, first_topic, options \\ []) do
+    __MODULE__
+    |> where([l], l.transaction_hash == ^tx_hash and l.first_topic == ^first_topic)
+    |> limit(1)
+    |> Chain.select_repo(options).one()
+  end
 end
diff --git a/apps/explorer/lib/explorer/chain/token.ex b/apps/explorer/lib/explorer/chain/token.ex
index 3b9eb2e95e18..fc12af368a0d 100644
--- a/apps/explorer/lib/explorer/chain/token.ex
+++ b/apps/explorer/lib/explorer/chain/token.ex
@@ -23,8 +23,8 @@ defmodule Explorer.Chain.Token do
   import Ecto.{Changeset, Query}
 
   alias Ecto.Changeset
+  alias Explorer.{Chain, PagingOptions}
   alias Explorer.Chain.{Address, Hash, Token}
-  alias Explorer.PagingOptions
   alias Explorer.SmartContract.Helper
 
   @typedoc """
@@ -333,4 +333,8 @@ defmodule Explorer.Chain.Token do
   defp page_tokens_by_column(%{contract_address_hash: contract_address_hash}, :contract_address_hash, :asc, nil) do
     dynamic([t], t.contract_address_hash > ^contract_address_hash)
   end
+
+  def get_by_contract_address_hash(hash, options) do
+    Chain.select_repo(options).get_by(__MODULE__, contract_address_hash: hash)
+  end
 end
diff --git a/apps/explorer/lib/explorer/chain/transaction.ex b/apps/explorer/lib/explorer/chain/transaction.ex
index e91a6f5a0049..60e9cb3d2c4f 100644
--- a/apps/explorer/lib/explorer/chain/transaction.ex
+++ b/apps/explorer/lib/explorer/chain/transaction.ex
@@ -24,6 +24,7 @@ defmodule Explorer.Chain.Transaction do
     InternalTransaction,
     Log,
     SmartContract,
+    Token,
     TokenTransfer,
     Transaction,
     TransactionAction,
@@ -197,7 +198,9 @@ defmodule Explorer.Chain.Transaction do
               max_priority_fee_per_gas: wei_per_gas | nil,
               max_fee_per_gas: wei_per_gas | nil,
               type: non_neg_integer() | nil,
-              has_error_in_internal_txs: boolean()
+              has_error_in_internal_txs: boolean(),
+              transaction_fee_log: any(),
+              transaction_fee_token: any()
             },
             suave
           )
@@ -290,6 +293,10 @@ defmodule Explorer.Chain.Transaction do
     field(:has_error_in_internal_txs, :boolean)
     field(:has_token_transfers, :boolean, virtual: true)
 
+    # stability virtual fields
+    field(:transaction_fee_log, :any, virtual: true)
+    field(:transaction_fee_token, :any, virtual: true)
+
     # A transient field for deriving old block hash during transaction upserts.
     # Used to force refetch of a block in case a transaction is re-collated
     # in a different block. See: https://github.com/blockscout/blockscout/issues/1911
@@ -1111,4 +1118,98 @@ defmodule Explorer.Chain.Transaction do
       _ -> false
     end
   end
+
+  @api_true [api?: true]
+  @transaction_fee_event_signature "0x99e7b0ba56da2819c37c047f0511fd2bf6c9b4e27b4a979a19d6da0f74be8155"
+  @transaction_fee_event_abi [
+    %{
+      "anonymous" => false,
+      "inputs" => [
+        %{
+          "indexed" => false,
+          "internalType" => "address",
+          "name" => "token",
+          "type" => "address"
+        },
+        %{
+          "indexed" => false,
+          "internalType" => "uint256",
+          "name" => "totalFee",
+          "type" => "uint256"
+        },
+        %{
+          "indexed" => false,
+          "internalType" => "address",
+          "name" => "validator",
+          "type" => "address"
+        },
+        %{
+          "indexed" => false,
+          "internalType" => "uint256",
+          "name" => "validatorFee",
+          "type" => "uint256"
+        },
+        %{
+          "indexed" => false,
+          "internalType" => "address",
+          "name" => "dapp",
+          "type" => "address"
+        },
+        %{
+          "indexed" => false,
+          "internalType" => "uint256",
+          "name" => "dappFee",
+          "type" => "uint256"
+        }
+      ],
+      "name" => "TransactionFee",
+      "type" => "event"
+    }
+  ]
+
+  def maybe_prepare_stability_fees(transactions) do
+    if Application.get_env(:explorer, :chain_type) == "stability" do
+      maybe_prepare_stability_fees_inner(transactions)
+    else
+      transactions
+    end
+  end
+
+  defp maybe_prepare_stability_fees_inner(transactions) when is_list(transactions) do
+    {transactions, _tokens_acc} =
+      Enum.map_reduce(transactions, %{}, fn transaction, tokens_acc ->
+        case Log.fetch_log_by_tx_hash_and_first_topic(transaction.hash, @transaction_fee_event_signature, @api_true) do
+          fee_log when not is_nil(fee_log) ->
+            {:ok, _selector, mapping} = Log.find_and_decode(@transaction_fee_event_abi, fee_log, transaction)
+
+            [{"token", "address", false, token_address_hash}, _, _, _, _, _] = mapping
+
+            {token, new_tokens_acc} = check_tokens_acc(bytes_to_address_hash(token_address_hash), tokens_acc)
+
+            {%Transaction{transaction | transaction_fee_log: mapping, transaction_fee_token: token}, new_tokens_acc}
+
+          _ ->
+            {transaction, tokens_acc}
+        end
+      end)
+
+    transactions
+  end
+
+  defp maybe_prepare_stability_fees_inner(transaction) do
+    [transaction] = maybe_prepare_stability_fees_inner([transaction])
+    transaction
+  end
+
+  defp check_tokens_acc(token_address_hash, tokens_acc) do
+    if Map.has_key?(tokens_acc, token_address_hash) do
+      {tokens_acc[token_address_hash], tokens_acc}
+    else
+      token = Token.get_by_contract_address_hash(token_address_hash, @api_true)
+
+      {token, Map.put(tokens_acc, token_address_hash, token)}
+    end
+  end
+
+  def bytes_to_address_hash(bytes), do: %Hash{byte_count: 20, bytes: bytes}
 end

From 9132b29f29969083ab4be07647859a4bc66298fb Mon Sep 17 00:00:00 2001
From: nikitosing <32202610+nikitosing@users.noreply.github.com>
Date: Thu, 26 Oct 2023 13:24:18 +0300
Subject: [PATCH 596/909] Fix sourcify check (#8714)

* Fix sourcify check

* Changelog
---
 CHANGELOG.md                                     |  1 +
 .../controllers/address_contract_controller.ex   |  2 +-
 .../api/v2/smart_contract_controller.ex          |  2 ++
 .../smart_contract/solidity/publish_helper.ex    | 16 ++++++++++++++++
 4 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2f517dfb632e..9b03eaf4c861 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,6 +13,7 @@
 
 ### Fixes
 
+- [#8714](https://github.com/blockscout/blockscout/pull/8714) - Fix sourcify check 
 - [#8705](https://github.com/blockscout/blockscout/pull/8705) - Fix sourcify enabled flag
 - [#8695](https://github.com/blockscout/blockscout/pull/8695) - Don't override internal transaction error if it's present already
 - [#8685](https://github.com/blockscout/blockscout/pull/8685) - Fix db pool size exceeds Postgres max connections
diff --git a/apps/block_scout_web/lib/block_scout_web/controllers/address_contract_controller.ex b/apps/block_scout_web/lib/block_scout_web/controllers/address_contract_controller.ex
index d049ce1511ed..445b7ca48679 100644
--- a/apps/block_scout_web/lib/block_scout_web/controllers/address_contract_controller.ex
+++ b/apps/block_scout_web/lib/block_scout_web/controllers/address_contract_controller.ex
@@ -23,7 +23,7 @@ defmodule BlockScoutWeb.AddressContractController do
 
     with {:ok, address_hash} <- Chain.string_to_address_hash(address_hash_string),
          {:ok, false} <- AccessHelper.restricted_access?(address_hash_string, params),
-         _ <- PublishHelper.check_and_verify(address_hash_string),
+         _ <- PublishHelper.sourcify_check(address_hash_string),
          {:ok, address} <- Chain.find_contract_address(address_hash, address_options, true) do
       render(
         conn,
diff --git a/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/smart_contract_controller.ex b/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/smart_contract_controller.ex
index fa4b48b5d7f8..d9c60969a48c 100644
--- a/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/smart_contract_controller.ex
+++ b/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/smart_contract_controller.ex
@@ -14,6 +14,7 @@ defmodule BlockScoutWeb.API.V2.SmartContractController do
   alias Explorer.Chain
   alias Explorer.Chain.SmartContract
   alias Explorer.SmartContract.{Reader, Writer}
+  alias Explorer.SmartContract.Solidity.PublishHelper
 
   @smart_contract_address_options [
     necessity_by_association: %{
@@ -31,6 +32,7 @@ defmodule BlockScoutWeb.API.V2.SmartContractController do
   def smart_contract(conn, %{"address_hash" => address_hash_string} = params) do
     with {:format, {:ok, address_hash}} <- {:format, Chain.string_to_address_hash(address_hash_string)},
          {:ok, false} <- AccessHelper.restricted_access?(address_hash_string, params),
+         _ <- PublishHelper.sourcify_check(address_hash_string),
          {:not_found, {:ok, address}} <-
            {:not_found, Chain.find_contract_address(address_hash, @smart_contract_address_options, false)} do
       conn
diff --git a/apps/explorer/lib/explorer/smart_contract/solidity/publish_helper.ex b/apps/explorer/lib/explorer/smart_contract/solidity/publish_helper.ex
index 99378a0bb911..4af55016fc73 100644
--- a/apps/explorer/lib/explorer/smart_contract/solidity/publish_helper.ex
+++ b/apps/explorer/lib/explorer/smart_contract/solidity/publish_helper.ex
@@ -162,6 +162,22 @@ defmodule Explorer.SmartContract.Solidity.PublishHelper do
     end
   end
 
+  def sourcify_check(address_hash_string) do
+    cond do
+      Application.get_env(:explorer, Explorer.SmartContract.RustVerifierInterfaceBehaviour)[:eth_bytecode_db?] ->
+        {:error, :eth_bytecode_db_enabled}
+
+      Application.get_env(:explorer, Explorer.ThirdPartyIntegrations.Sourcify)[:enabled] ->
+        check_by_address_in_sourcify(
+          SmartContract.select_partially_verified_by_address_hash(address_hash_string),
+          address_hash_string
+        )
+
+      true ->
+        {:error, :sourcify_disabled}
+    end
+  end
+
   defp check_by_address_in_sourcify(false, _address_hash_string) do
     {:ok, :already_fully_verified}
   end

From 6852a99248f13da7bcc61e301630384e77fbef21 Mon Sep 17 00:00:00 2001
From: nikitosing <32202610+nikitosing@users.noreply.github.com>
Date: Thu, 26 Oct 2023 13:27:04 +0300
Subject: [PATCH 597/909] Add address name updating on contract re-verification
 (#8706)

* Add address name updating on contract re-verification

* Changelog
---
 CHANGELOG.md                        | 1 +
 apps/explorer/lib/explorer/chain.ex | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9b03eaf4c861..183d82e4f5d5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -14,6 +14,7 @@
 ### Fixes
 
 - [#8714](https://github.com/blockscout/blockscout/pull/8714) - Fix sourcify check 
+- [#8706](https://github.com/blockscout/blockscout/pull/8706) - Add address name updating on contract re-verification
 - [#8705](https://github.com/blockscout/blockscout/pull/8705) - Fix sourcify enabled flag
 - [#8695](https://github.com/blockscout/blockscout/pull/8695) - Don't override internal transaction error if it's present already
 - [#8685](https://github.com/blockscout/blockscout/pull/8685) - Fix db pool size exceeds Postgres max connections
diff --git a/apps/explorer/lib/explorer/chain.ex b/apps/explorer/lib/explorer/chain.ex
index 09a01377cd05..bc0dde821ba8 100644
--- a/apps/explorer/lib/explorer/chain.ex
+++ b/apps/explorer/lib/explorer/chain.ex
@@ -3683,6 +3683,7 @@ defmodule Explorer.Chain do
     # Enforce ShareLocks tables order (see docs: sharelocks.md)
     insert_contract_query =
       Multi.new()
+      |> Multi.run(:clear_primary_address_names, fn repo, _ -> clear_primary_address_names(repo, address_hash) end)
       |> Multi.update(:smart_contract, smart_contract_changeset)
 
     insert_contract_query_with_additional_sources =
@@ -3696,6 +3697,8 @@ defmodule Explorer.Chain do
       insert_contract_query_with_additional_sources
       |> Repo.transaction()
 
+    create_address_name(Repo, Changeset.get_field(smart_contract_changeset, :name), address_hash)
+
     case insert_result do
       {:ok, %{smart_contract: smart_contract}} ->
         {:ok, smart_contract}

From 5d7c3fe227bf653325d4b31ee1fa22d7e501b4db Mon Sep 17 00:00:00 2001
From: varasev <33550681+varasev@users.noreply.github.com>
Date: Thu, 26 Oct 2023 15:35:28 +0300
Subject: [PATCH 598/909] Rename `wrapped` field to `requestRecord` for Suave
 (#8715)

* Rename `wrapped` field to `requestRecord` for Suave

* Update changelog

---------

Co-authored-by: POA <33550681+poa@users.noreply.github.com>
---
 CHANGELOG.md                                         |  2 ++
 .../lib/ethereum_jsonrpc/transaction.ex              | 12 ++++++------
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 183d82e4f5d5..c345d1fa833e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -22,6 +22,8 @@
 
 ### Chore
 
+- [#8715](https://github.com/blockscout/blockscout/pull/8715) - Rename `wrapped` field to `requestRecord` for Suave
+
 <details>
   <summary>Dependencies version bumps</summary>
 </details>
diff --git a/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/transaction.ex b/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/transaction.ex
index 6eb996d08080..1e3f8f1cf954 100644
--- a/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/transaction.ex
+++ b/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/transaction.ex
@@ -43,7 +43,7 @@ defmodule EthereumJSONRPC.Transaction do
    * `"maxFeePerGas"` - `t:EthereumJSONRPC.quantity/0` of wei to denote max fee per unit of gas used. Introduced in [EIP-1559](https://github.com/ethereum/EIPs/blob/master/EIPS/eip-1559.md)
    * `"type"` - `t:EthereumJSONRPC.quantity/0` denotes transaction type. Introduced in [EIP-1559](https://github.com/ethereum/EIPs/blob/master/EIPS/eip-1559.md)
    * `"executionNode"` - `t:EthereumJSONRPC.address/0` of execution node (used by Suave).
-   * `"wrapped"` - map of wrapped transaction data (used by Suave).
+   * `"requestRecord"` - map of wrapped transaction data (used by Suave).
   """
   @type t :: %{
           String.t() =>
@@ -169,7 +169,7 @@ defmodule EthereumJSONRPC.Transaction do
   """
   @spec elixir_to_params(elixir) :: params
 
-  # this is for Suave chain (handles `executionNode` and `wrapped` fields along with EIP-1559 fields)
+  # this is for Suave chain (handles `executionNode` and `requestRecord` fields along with EIP-1559 fields)
   def elixir_to_params(
         %{
           "blockHash" => block_hash,
@@ -190,7 +190,7 @@ defmodule EthereumJSONRPC.Transaction do
           "maxPriorityFeePerGas" => max_priority_fee_per_gas,
           "maxFeePerGas" => max_fee_per_gas,
           "executionNode" => execution_node_hash,
-          "wrapped" => wrapped
+          "requestRecord" => wrapped
         } = transaction
       ) do
     result = %{
@@ -343,7 +343,7 @@ defmodule EthereumJSONRPC.Transaction do
     end
   end
 
-  # this is for Suave chain (handles `executionNode` and `wrapped` fields without EIP-1559 fields)
+  # this is for Suave chain (handles `executionNode` and `requestRecord` fields without EIP-1559 fields)
   def elixir_to_params(
         %{
           "blockHash" => block_hash,
@@ -362,7 +362,7 @@ defmodule EthereumJSONRPC.Transaction do
           "value" => value,
           "type" => type,
           "executionNode" => execution_node_hash,
-          "wrapped" => wrapped
+          "requestRecord" => wrapped
         } = transaction
       ) do
     result = %{
@@ -608,7 +608,7 @@ defmodule EthereumJSONRPC.Transaction do
   #
   # "txType": to avoid FunctionClauseError when indexing Wanchain
   defp entry_to_elixir({key, value})
-       when key in ~w(blockHash condition creates from hash input jsonrpc publicKey raw to txType executionNode wrapped),
+       when key in ~w(blockHash condition creates from hash input jsonrpc publicKey raw to txType executionNode requestRecord),
        do: {key, value}
 
   # specific to Nethermind client

From 68d449d970f13bfb017bc8d963c9077aa97f1f62 Mon Sep 17 00:00:00 2001
From: nikitosing <32202610+nikitosing@users.noreply.github.com>
Date: Thu, 26 Oct 2023 15:35:52 +0300
Subject: [PATCH 599/909] CoinBalanceHistory tab: show also tx with gasPrice &
 gasUsed > 0 (#8708)

* CoinBalanceHistory tab: show also tx with gasPrice & gasUsed > 0

* Changelog
---
 CHANGELOG.md                        | 1 +
 apps/explorer/lib/explorer/chain.ex | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c345d1fa833e..cdecb34d8ab7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -14,6 +14,7 @@
 ### Fixes
 
 - [#8714](https://github.com/blockscout/blockscout/pull/8714) - Fix sourcify check 
+- [#8708](https://github.com/blockscout/blockscout/pull/8708) - CoinBalanceHistory tab: show also tx with gasPrice & gasUsed > 0
 - [#8706](https://github.com/blockscout/blockscout/pull/8706) - Add address name updating on contract re-verification
 - [#8705](https://github.com/blockscout/blockscout/pull/8705) - Fix sourcify enabled flag
 - [#8695](https://github.com/blockscout/blockscout/pull/8695) - Don't override internal transaction error if it's present already
diff --git a/apps/explorer/lib/explorer/chain.ex b/apps/explorer/lib/explorer/chain.ex
index bc0dde821ba8..498de42328c6 100644
--- a/apps/explorer/lib/explorer/chain.ex
+++ b/apps/explorer/lib/explorer/chain.ex
@@ -4975,7 +4975,7 @@ defmodule Explorer.Chain do
           Transaction
           |> where(
             [tx],
-            tx.block_number == ^balance.block_number and tx.value > ^0 and
+            tx.block_number == ^balance.block_number and (tx.value > ^0 or (tx.gas_price > ^0 and tx.gas_used > ^0)) and
               (tx.to_address_hash == ^balance.address_hash or tx.from_address_hash == ^balance.address_hash)
           )
           |> select([tx], tx.hash)

From 963d0a82c02600b3e3df48f2b954f6d78007c1e1 Mon Sep 17 00:00:00 2001
From: Qwerty5Uiop <alex000010@bk.ru>
Date: Thu, 26 Oct 2023 18:45:14 +0600
Subject: [PATCH 600/909] Save GasPriceOracle old prices as a fallback

---
 CHANGELOG.md                                         |  1 +
 .../lib/explorer/chain/cache/gas_price_oracle.ex     | 12 +++++++++---
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 183d82e4f5d5..0321d1a304a7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,7 @@
 
 ### Features
 
+- [#8717](https://github.com/blockscout/blockscout/pull/8717) - Save GasPriceOracle old prices as a fallback
 - [#8696](https://github.com/blockscout/blockscout/pull/8696) - Support tokenSymbol and tokenName in `/api/v2/import/token-info`
 - [#8673](https://github.com/blockscout/blockscout/pull/8673) - Add a window for balances fetching from non-archive node
 - [#8651](https://github.com/blockscout/blockscout/pull/8651) - Add `stability_fee` for CHAIN_TYPE=stability
diff --git a/apps/explorer/lib/explorer/chain/cache/gas_price_oracle.ex b/apps/explorer/lib/explorer/chain/cache/gas_price_oracle.ex
index 60111725e142..e147c9c0c782 100644
--- a/apps/explorer/lib/explorer/chain/cache/gas_price_oracle.ex
+++ b/apps/explorer/lib/explorer/chain/cache/gas_price_oracle.ex
@@ -22,6 +22,7 @@ defmodule Explorer.Chain.Cache.GasPriceOracle do
   use Explorer.Chain.MapCache,
     name: :gas_price,
     key: :gas_prices,
+    key: :old_gas_prices,
     key: :async_task,
     global_ttl: Application.get_env(:explorer, __MODULE__)[:global_ttl],
     ttl_check_interval: :timer.seconds(1),
@@ -171,7 +172,7 @@ defmodule Explorer.Chain.Cache.GasPriceOracle do
     # See next `handle_fallback` definition
     get_async_task()
 
-    {:return, nil}
+    {:return, get_old_gas_prices()}
   end
 
   defp handle_fallback(:async_task) do
@@ -182,7 +183,7 @@ defmodule Explorer.Chain.Cache.GasPriceOracle do
         try do
           result = get_average_gas_price(num_of_blocks(), safelow(), average(), fast())
 
-          set_all(result)
+          set_gas_prices(result)
         rescue
           e ->
             Logger.debug([
@@ -197,9 +198,14 @@ defmodule Explorer.Chain.Cache.GasPriceOracle do
     {:update, task}
   end
 
+  defp handle_fallback(_), do: {:return, nil}
+
   # By setting this as a `callback` an async task will be started each time the
   # `gas_prices` expires (unless there is one already running)
-  defp async_task_on_deletion({:delete, _, :gas_prices}), do: get_async_task()
+  defp async_task_on_deletion({:delete, _, :gas_prices}) do
+    set_old_gas_prices(get_gas_prices())
+    get_async_task()
+  end
 
   defp async_task_on_deletion(_data), do: nil
 end

From efd4d2f0b50994a13a49933416c32b4f4a0d25bb Mon Sep 17 00:00:00 2001
From: Viktor Baranov <baranov.viktor.27@gmail.com>
Date: Thu, 26 Oct 2023 16:18:07 +0300
Subject: [PATCH 601/909] 5.3.1

---
 .github/ISSUE_TEMPLATE/bug_report.yml         |  2 +-
 .../publish-docker-image-every-push.yml       |  2 +-
 .../publish-docker-image-for-core.yml         |  2 +-
 .../publish-docker-image-for-eth-goerli.yml   |  2 +-
 .../publish-docker-image-for-eth.yml          |  2 +-
 .../publish-docker-image-for-fuse.yml         |  2 +-
 .../publish-docker-image-for-immutable.yml    |  2 +-
 .../publish-docker-image-for-l2-staging.yml   |  2 +-
 .../publish-docker-image-for-lukso.yml        |  2 +-
 .../publish-docker-image-for-optimism.yml     |  2 +-
 .../publish-docker-image-for-rsk.yml          |  2 +-
 .../publish-docker-image-for-suave.yml        |  2 +-
 .../publish-docker-image-for-xdai.yml         |  2 +-
 .../publish-docker-image-for-zkevm.yml        |  2 +-
 .../publish-docker-image-for-zksync.yml       |  2 +-
 .../publish-docker-image-release.yml          |  2 +-
 CHANGELOG.md                                  | 22 +++++++++++++++++++
 apps/block_scout_web/mix.exs                  |  2 +-
 apps/ethereum_jsonrpc/mix.exs                 |  2 +-
 apps/explorer/mix.exs                         |  2 +-
 apps/indexer/mix.exs                          |  2 +-
 docker-compose/docker-compose.yml             |  2 +-
 docker/Makefile                               |  2 +-
 mix.exs                                       |  2 +-
 rel/config.exs                                |  2 +-
 25 files changed, 46 insertions(+), 24 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
index cd31b2868153..d8441328e0cc 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -65,7 +65,7 @@ body:
     attributes:
       label: Backend version
       description: The release version of the backend or branch/commit.
-      placeholder: v5.3.0
+      placeholder: v5.3.1
     validations:
       required: true
 
diff --git a/.github/workflows/publish-docker-image-every-push.yml b/.github/workflows/publish-docker-image-every-push.yml
index e4c9f0a2bbd8..25d5b90e1470 100644
--- a/.github/workflows/publish-docker-image-every-push.yml
+++ b/.github/workflows/publish-docker-image-every-push.yml
@@ -7,7 +7,7 @@ on:
 env:
   OTP_VERSION: '25.2.1'
   ELIXIR_VERSION: '1.14.5'
-  RELEASE_VERSION: 5.3.0
+  RELEASE_VERSION: 5.3.1
 
 jobs:
   push_to_registry:
diff --git a/.github/workflows/publish-docker-image-for-core.yml b/.github/workflows/publish-docker-image-for-core.yml
index e3671929d0b0..25bb973ee358 100644
--- a/.github/workflows/publish-docker-image-for-core.yml
+++ b/.github/workflows/publish-docker-image-for-core.yml
@@ -14,7 +14,7 @@ jobs:
     name: Push Docker image to Docker Hub
     runs-on: ubuntu-latest
     env:
-      RELEASE_VERSION: 5.3.0
+      RELEASE_VERSION: 5.3.1
       DOCKER_CHAIN_NAME: poa
     steps:
       - name: Check out the repo
diff --git a/.github/workflows/publish-docker-image-for-eth-goerli.yml b/.github/workflows/publish-docker-image-for-eth-goerli.yml
index c11684d4c499..f871e4fa0b3b 100644
--- a/.github/workflows/publish-docker-image-for-eth-goerli.yml
+++ b/.github/workflows/publish-docker-image-for-eth-goerli.yml
@@ -14,7 +14,7 @@ jobs:
     name: Push Docker image to Docker Hub
     runs-on: ubuntu-latest
     env:
-      RELEASE_VERSION: 5.3.0
+      RELEASE_VERSION: 5.3.1
       DOCKER_CHAIN_NAME: eth-goerli
     steps:
       - name: Check out the repo
diff --git a/.github/workflows/publish-docker-image-for-eth.yml b/.github/workflows/publish-docker-image-for-eth.yml
index d4d630f754e4..5ea173e78ae7 100644
--- a/.github/workflows/publish-docker-image-for-eth.yml
+++ b/.github/workflows/publish-docker-image-for-eth.yml
@@ -14,7 +14,7 @@ jobs:
     name: Push Docker image to Docker Hub
     runs-on: ubuntu-latest
     env:
-      RELEASE_VERSION: 5.3.0
+      RELEASE_VERSION: 5.3.1
       DOCKER_CHAIN_NAME: mainnet
     steps:
       - name: Check out the repo
diff --git a/.github/workflows/publish-docker-image-for-fuse.yml b/.github/workflows/publish-docker-image-for-fuse.yml
index 839798299a88..1f7501eab860 100644
--- a/.github/workflows/publish-docker-image-for-fuse.yml
+++ b/.github/workflows/publish-docker-image-for-fuse.yml
@@ -14,7 +14,7 @@ jobs:
     name: Push Docker image to Docker Hub
     runs-on: ubuntu-latest
     env:
-      RELEASE_VERSION: 5.3.0
+      RELEASE_VERSION: 5.3.1
       DOCKER_CHAIN_NAME: fuse
     steps:
       - name: Check out the repo
diff --git a/.github/workflows/publish-docker-image-for-immutable.yml b/.github/workflows/publish-docker-image-for-immutable.yml
index cca4ba6edc55..67b0a7b70974 100644
--- a/.github/workflows/publish-docker-image-for-immutable.yml
+++ b/.github/workflows/publish-docker-image-for-immutable.yml
@@ -14,7 +14,7 @@ jobs:
     name: Push Docker image to Docker Hub
     runs-on: ubuntu-latest
     env:
-      RELEASE_VERSION: 5.3.0
+      RELEASE_VERSION: 5.3.1
       DOCKER_CHAIN_NAME: immutable
     steps:
       - name: Check out the repo
diff --git a/.github/workflows/publish-docker-image-for-l2-staging.yml b/.github/workflows/publish-docker-image-for-l2-staging.yml
index 131a180e59ca..21d2641d1d00 100644
--- a/.github/workflows/publish-docker-image-for-l2-staging.yml
+++ b/.github/workflows/publish-docker-image-for-l2-staging.yml
@@ -14,7 +14,7 @@ jobs:
     name: Push Docker image to Docker Hub
     runs-on: ubuntu-latest
     env:
-      RELEASE_VERSION: 5.3.0
+      RELEASE_VERSION: 5.3.1
       DOCKER_CHAIN_NAME: optimism-l2-advanced
     steps:
       - name: Check out the repo
diff --git a/.github/workflows/publish-docker-image-for-lukso.yml b/.github/workflows/publish-docker-image-for-lukso.yml
index fbc6d5578733..bc601f4bd280 100644
--- a/.github/workflows/publish-docker-image-for-lukso.yml
+++ b/.github/workflows/publish-docker-image-for-lukso.yml
@@ -14,7 +14,7 @@ jobs:
     name: Push Docker image to Docker Hub
     runs-on: ubuntu-latest
     env:
-      RELEASE_VERSION: 5.3.0
+      RELEASE_VERSION: 5.3.1
       DOCKER_CHAIN_NAME: lukso
     steps:
       - name: Check out the repo
diff --git a/.github/workflows/publish-docker-image-for-optimism.yml b/.github/workflows/publish-docker-image-for-optimism.yml
index 8bc5c2a785bc..e352d4c7353e 100644
--- a/.github/workflows/publish-docker-image-for-optimism.yml
+++ b/.github/workflows/publish-docker-image-for-optimism.yml
@@ -14,7 +14,7 @@ jobs:
     name: Push Docker image to Docker Hub
     runs-on: ubuntu-latest
     env:
-      RELEASE_VERSION: 5.3.0
+      RELEASE_VERSION: 5.3.1
       DOCKER_CHAIN_NAME: optimism
     steps:
       - name: Check out the repo
diff --git a/.github/workflows/publish-docker-image-for-rsk.yml b/.github/workflows/publish-docker-image-for-rsk.yml
index c8f1e3d39bfa..3eb3ff0c3a07 100644
--- a/.github/workflows/publish-docker-image-for-rsk.yml
+++ b/.github/workflows/publish-docker-image-for-rsk.yml
@@ -14,7 +14,7 @@ jobs:
     name: Push Docker image to Docker Hub
     runs-on: ubuntu-latest
     env:
-      RELEASE_VERSION: 5.3.0
+      RELEASE_VERSION: 5.3.1
       DOCKER_CHAIN_NAME: rsk
     steps:
       - name: Check out the repo
diff --git a/.github/workflows/publish-docker-image-for-suave.yml b/.github/workflows/publish-docker-image-for-suave.yml
index 04f9c117f9d3..0b65a41f729a 100644
--- a/.github/workflows/publish-docker-image-for-suave.yml
+++ b/.github/workflows/publish-docker-image-for-suave.yml
@@ -17,7 +17,7 @@ jobs:
     name: Push Docker image to Docker Hub
     runs-on: ubuntu-latest
     env:
-      RELEASE_VERSION: 5.3.0
+      RELEASE_VERSION: 5.3.1
       DOCKER_CHAIN_NAME: suave
     steps:
       - name: Check out the repo
diff --git a/.github/workflows/publish-docker-image-for-xdai.yml b/.github/workflows/publish-docker-image-for-xdai.yml
index fdbd3b2909b8..6706ec927eb3 100644
--- a/.github/workflows/publish-docker-image-for-xdai.yml
+++ b/.github/workflows/publish-docker-image-for-xdai.yml
@@ -14,7 +14,7 @@ jobs:
     name: Push Docker image to Docker Hub
     runs-on: ubuntu-latest
     env:
-      RELEASE_VERSION: 5.3.0
+      RELEASE_VERSION: 5.3.1
       DOCKER_CHAIN_NAME: xdai
     steps:
       - name: Check out the repo
diff --git a/.github/workflows/publish-docker-image-for-zkevm.yml b/.github/workflows/publish-docker-image-for-zkevm.yml
index 192c54845b0c..878fd1c3e1a6 100644
--- a/.github/workflows/publish-docker-image-for-zkevm.yml
+++ b/.github/workflows/publish-docker-image-for-zkevm.yml
@@ -14,7 +14,7 @@ jobs:
     name: Push Docker image to Docker Hub
     runs-on: ubuntu-latest
     env:
-      RELEASE_VERSION: 5.3.0
+      RELEASE_VERSION: 5.3.1
       DOCKER_CHAIN_NAME: zkevm
     steps:
       - name: Check out the repo
diff --git a/.github/workflows/publish-docker-image-for-zksync.yml b/.github/workflows/publish-docker-image-for-zksync.yml
index 6be789c13059..aee2f7f70a90 100644
--- a/.github/workflows/publish-docker-image-for-zksync.yml
+++ b/.github/workflows/publish-docker-image-for-zksync.yml
@@ -14,7 +14,7 @@ jobs:
     name: Push Docker image to Docker Hub
     runs-on: ubuntu-latest
     env:
-      RELEASE_VERSION: 5.3.0
+      RELEASE_VERSION: 5.3.1
       DOCKER_CHAIN_NAME: zksync
     steps:
       - name: Check out the repo
diff --git a/.github/workflows/publish-docker-image-release.yml b/.github/workflows/publish-docker-image-release.yml
index 04982620a674..60ae07be67f8 100644
--- a/.github/workflows/publish-docker-image-release.yml
+++ b/.github/workflows/publish-docker-image-release.yml
@@ -18,7 +18,7 @@ jobs:
     name: Push Docker image to Docker Hub
     runs-on: ubuntu-latest
     env:
-      RELEASE_VERSION: 5.3.0
+      RELEASE_VERSION: 5.3.1
     steps:
       - name: Check out the repo
         uses: actions/checkout@v4
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 973c4f7230b4..a3c660c22e17 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,18 @@
 
 ### Features
 
+### Fixes
+
+### Chore
+
+<details>
+  <summary>Dependencies version bumps</summary>
+</details>
+
+## 5.3.1-beta
+
+### Features
+
 - [#8717](https://github.com/blockscout/blockscout/pull/8717) - Save GasPriceOracle old prices as a fallback
 - [#8696](https://github.com/blockscout/blockscout/pull/8696) - Support tokenSymbol and tokenName in `/api/v2/import/token-info`
 - [#8673](https://github.com/blockscout/blockscout/pull/8673) - Add a window for balances fetching from non-archive node
@@ -28,6 +40,16 @@
 
 <details>
   <summary>Dependencies version bumps</summary>
+- [#8683](https://github.com/blockscout/blockscout/pull/8683) - Bump ex_abi from 0.6.2 to 0.6.3
+- [#8689](https://github.com/blockscout/blockscout/pull/8689) - Bump ex_abi from 0.6.2 to 0.6.3
+- [#8682](https://github.com/blockscout/blockscout/pull/8682) - Bump core-js from 3.33.0 to 3.33.1 in /apps/block_scout_web/assets
+- [#8680](https://github.com/blockscout/blockscout/pull/8680) - Bump web3 from 1.10.2 to 1.10.3 in /apps/block_scout_web/assets
+- [#8681](https://github.com/blockscout/blockscout/pull/8681) - Bump eslint-plugin-import from 2.28.1 to 2.29.0 in /apps/block_scout_web/assets
+- [#8684](https://github.com/blockscout/blockscout/pull/8684) - Bump @amplitude/analytics-browser from 2.3.2 to 2.3.3 in /apps/block_scout_web/assets
+- [#8679](https://github.com/blockscout/blockscout/pull/8679) - Bump sass from 1.69.3 to 1.69.4 in /apps/block_scout_web/assets
+- [#8687](https://github.com/blockscout/blockscout/pull/8687) - Bump floki from 0.35.0 to 0.35.1
+- [#8693](https://github.com/blockscout/blockscout/pull/8693) - Bump redix from 1.2.3 to 1.3.0
+- [#8688](https://github.com/blockscout/blockscout/pull/8688) - Bump ex_doc from 0.30.7 to 0.30.9
 </details>
 
 ## 5.3.0-beta
diff --git a/apps/block_scout_web/mix.exs b/apps/block_scout_web/mix.exs
index 8bad9756ac81..e0283df5a7a5 100644
--- a/apps/block_scout_web/mix.exs
+++ b/apps/block_scout_web/mix.exs
@@ -23,7 +23,7 @@ defmodule BlockScoutWeb.Mixfile do
         dialyzer: :test
       ],
       start_permanent: Mix.env() == :prod,
-      version: "5.3.0",
+      version: "5.3.1",
       xref: [exclude: [Explorer.Chain.Zkevm.Reader]]
     ]
   end
diff --git a/apps/ethereum_jsonrpc/mix.exs b/apps/ethereum_jsonrpc/mix.exs
index b4c9b7034e32..9159a8c9852b 100644
--- a/apps/ethereum_jsonrpc/mix.exs
+++ b/apps/ethereum_jsonrpc/mix.exs
@@ -23,7 +23,7 @@ defmodule EthereumJsonrpc.MixProject do
         dialyzer: :test
       ],
       start_permanent: Mix.env() == :prod,
-      version: "5.3.0"
+      version: "5.3.1"
     ]
   end
 
diff --git a/apps/explorer/mix.exs b/apps/explorer/mix.exs
index 9940539ecd63..6a508204f336 100644
--- a/apps/explorer/mix.exs
+++ b/apps/explorer/mix.exs
@@ -24,7 +24,7 @@ defmodule Explorer.Mixfile do
         dialyzer: :test
       ],
       start_permanent: Mix.env() == :prod,
-      version: "5.3.0",
+      version: "5.3.1",
       xref: [exclude: [BlockScoutWeb.WebRouter.Helpers]]
     ]
   end
diff --git a/apps/indexer/mix.exs b/apps/indexer/mix.exs
index 5375cfeebf4e..f388f635319c 100644
--- a/apps/indexer/mix.exs
+++ b/apps/indexer/mix.exs
@@ -14,7 +14,7 @@ defmodule Indexer.MixProject do
       elixirc_paths: elixirc_paths(Mix.env()),
       lockfile: "../../mix.lock",
       start_permanent: Mix.env() == :prod,
-      version: "5.3.0"
+      version: "5.3.1"
     ]
   end
 
diff --git a/docker-compose/docker-compose.yml b/docker-compose/docker-compose.yml
index 7e2bf80bb6b0..c5f140a31263 100644
--- a/docker-compose/docker-compose.yml
+++ b/docker-compose/docker-compose.yml
@@ -34,7 +34,7 @@ services:
         CACHE_TOTAL_GAS_USAGE_COUNTER_ENABLED: ""
         CACHE_ADDRESS_WITH_BALANCES_UPDATE_INTERVAL: ""
         ADMIN_PANEL_ENABLED: ""
-        RELEASE_VERSION: 5.3.0
+        RELEASE_VERSION: 5.3.1
     links:
       - db:database
     environment:
diff --git a/docker/Makefile b/docker/Makefile
index 2a3fd6217c88..c6e874b4682c 100644
--- a/docker/Makefile
+++ b/docker/Makefile
@@ -10,7 +10,7 @@ STATS_CONTAINER_NAME := stats
 STATS_DB_CONTAINER_NAME := stats-postgres
 PROXY_CONTAINER_NAME := proxy
 PG_CONTAINER_NAME := postgres
-RELEASE_VERSION ?= '5.3.0'
+RELEASE_VERSION ?= '5.3.1'
 TAG := $(RELEASE_VERSION)-commit-$(shell git log -1 --pretty=format:"%h")
 STABLE_TAG := $(RELEASE_VERSION)
 
diff --git a/mix.exs b/mix.exs
index 25ca05dd8013..9dac495b0b1e 100644
--- a/mix.exs
+++ b/mix.exs
@@ -7,7 +7,7 @@ defmodule BlockScout.Mixfile do
     [
       # app: :block_scout,
       # aliases: aliases(config_env()),
-      version: "5.3.0",
+      version: "5.3.1",
       apps_path: "apps",
       deps: deps(),
       dialyzer: dialyzer(),
diff --git a/rel/config.exs b/rel/config.exs
index d8dfb6d94e06..a0584a8168b3 100644
--- a/rel/config.exs
+++ b/rel/config.exs
@@ -71,7 +71,7 @@ end
 # will be used by default
 
 release :blockscout do
-  set version: "5.3.0-beta"
+  set version: "5.3.1-beta"
   set applications: [
     :runtime_tools,
     block_scout_web: :permanent,

From aecc6c8426b7a013a9e49db004d8522e852963e9 Mon Sep 17 00:00:00 2001
From: Viktor Baranov <baranov.viktor.27@gmail.com>
Date: Thu, 26 Oct 2023 16:26:54 +0300
Subject: [PATCH 602/909] Update CHANGELOG

---
 CHANGELOG.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a3c660c22e17..25f1d867e1a1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -40,6 +40,7 @@
 
 <details>
   <summary>Dependencies version bumps</summary>
+
 - [#8683](https://github.com/blockscout/blockscout/pull/8683) - Bump ex_abi from 0.6.2 to 0.6.3
 - [#8689](https://github.com/blockscout/blockscout/pull/8689) - Bump ex_abi from 0.6.2 to 0.6.3
 - [#8682](https://github.com/blockscout/blockscout/pull/8682) - Bump core-js from 3.33.0 to 3.33.1 in /apps/block_scout_web/assets
@@ -50,6 +51,7 @@
 - [#8687](https://github.com/blockscout/blockscout/pull/8687) - Bump floki from 0.35.0 to 0.35.1
 - [#8693](https://github.com/blockscout/blockscout/pull/8693) - Bump redix from 1.2.3 to 1.3.0
 - [#8688](https://github.com/blockscout/blockscout/pull/8688) - Bump ex_doc from 0.30.7 to 0.30.9
+
 </details>
 
 ## 5.3.0-beta
@@ -99,6 +101,7 @@
 
 <details>
   <summary>Dependencies version bumps</summary>
+
 - [#8508](https://github.com/blockscout/blockscout/pull/8508) - Bump sass from 1.67.0 to 1.68.0 in /apps/block_scout_web/assets
 - [#8509](https://github.com/blockscout/blockscout/pull/8509) - Bump autoprefixer from 10.4.15 to 10.4.16 in /apps/block_scout_web/assets
 - [#8511](https://github.com/blockscout/blockscout/pull/8511) - Bump mox from 1.0.2 to 1.1.0
@@ -130,6 +133,7 @@
 - [#8645](https://github.com/blockscout/blockscout/pull/8645) - Bump ex_doc from 0.30.6 to 0.30.7
 - [#8638](https://github.com/blockscout/blockscout/pull/8638) - Bump webpack from 5.88.2 to 5.89.0 in /apps/block_scout_web/assets
 - [#8640](https://github.com/blockscout/blockscout/pull/8640) - Bump hackney from 1.19.1 to 1.20.1
+
 </details>
 
 ## 5.2.3-beta
@@ -173,6 +177,7 @@
 
 <details>
   <summary>Dependencies version bumps</summary>
+
 - [#8244](https://github.com/blockscout/blockscout/pull/8244) - Bump core-js from 3.32.0 to 3.32.1 in /apps/block_scout_web/assets
 - [#8243](https://github.com/blockscout/blockscout/pull/8243) - Bump sass from 1.65.1 to 1.66.0 in /apps/block_scout_web/assets
 - [#8259](https://github.com/blockscout/blockscout/pull/8259) - Bump sweetalert2 from 11.7.23 to 11.7.27 in /apps/block_scout_web/assets
@@ -233,6 +238,7 @@
 - [#8480](https://github.com/blockscout/blockscout/pull/8480) - Bump @babel/core from 7.22.19 to 7.22.20 in /apps/block_scout_web/assets
 - [#8482](https://github.com/blockscout/blockscout/pull/8482) - Bump viewerjs from 1.11.5 to 1.11.6 in /apps/block_scout_web/assets
 - [#8489](https://github.com/blockscout/blockscout/pull/8489) - Bump postcss from 8.4.29 to 8.4.30 in /apps/block_scout_web/assets
+
 </details>
 
 ## 5.2.2-beta

From 232b6090d7815b5144131cecf3242cf4f7b3cd98 Mon Sep 17 00:00:00 2001
From: Viktor Baranov <baranov.viktor.27@gmail.com>
Date: Thu, 26 Oct 2023 16:40:13 +0300
Subject: [PATCH 603/909] Update GA workflows

---
 .github/workflows/publish-docker-image-for-rsk.yml | 2 +-
 .github/workflows/publish-docker-image-release.yml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/publish-docker-image-for-rsk.yml b/.github/workflows/publish-docker-image-for-rsk.yml
index 3eb3ff0c3a07..084b6785333e 100644
--- a/.github/workflows/publish-docker-image-for-rsk.yml
+++ b/.github/workflows/publish-docker-image-for-rsk.yml
@@ -36,7 +36,7 @@ jobs:
         run: echo "SHORT_SHA=`echo ${GITHUB_SHA} | cut -c1-8`" >> $GITHUB_ENV
       
       - name: Build and push Docker image
-        uses: docker/build-push-action@5
+        uses: docker/build-push-action@v5
         with:
           context: .
           file: ./docker/Dockerfile
diff --git a/.github/workflows/publish-docker-image-release.yml b/.github/workflows/publish-docker-image-release.yml
index 60ae07be67f8..2bf136930c8a 100644
--- a/.github/workflows/publish-docker-image-release.yml
+++ b/.github/workflows/publish-docker-image-release.yml
@@ -111,7 +111,7 @@ jobs:
             CHAIN_TYPE=suave
 
       - name: Build and push Docker image for Rootstock
-        uses: docker/build-push-action@5
+        uses: docker/build-push-action@v5
         with:
           context: .
           file: ./docker/Dockerfile

From dee90119073d11f58a577f84528d48f370c4d12e Mon Sep 17 00:00:00 2001
From: Viktor Baranov <baranov.viktor.27@gmail.com>
Date: Thu, 26 Oct 2023 17:58:57 +0300
Subject: [PATCH 604/909] Fix CHANGELOG

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 25f1d867e1a1..1d8e5ece63b1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -41,7 +41,7 @@
 <details>
   <summary>Dependencies version bumps</summary>
 
-- [#8683](https://github.com/blockscout/blockscout/pull/8683) - Bump ex_abi from 0.6.2 to 0.6.3
+- [#8683](https://github.com/blockscout/blockscout/pull/8683) - Bump eslint from 8.51.0 to 8.52.0 in /apps/block_scout_web/assets
 - [#8689](https://github.com/blockscout/blockscout/pull/8689) - Bump ex_abi from 0.6.2 to 0.6.3
 - [#8682](https://github.com/blockscout/blockscout/pull/8682) - Bump core-js from 3.33.0 to 3.33.1 in /apps/block_scout_web/assets
 - [#8680](https://github.com/blockscout/blockscout/pull/8680) - Bump web3 from 1.10.2 to 1.10.3 in /apps/block_scout_web/assets

From d8dbd0875d551cbc4fb9f3e17fd32fef111cd812 Mon Sep 17 00:00:00 2001
From: Viktor Baranov <baranov.viktor.27@gmail.com>
Date: Thu, 26 Oct 2023 21:47:24 +0300
Subject: [PATCH 605/909] GA Workflow for Stability

---
 .../publish-docker-image-for-stability.yml    | 61 +++++++++++++++++++
 .../publish-docker-image-release.yml          | 22 +++++++
 2 files changed, 83 insertions(+)
 create mode 100644 .github/workflows/publish-docker-image-for-stability.yml

diff --git a/.github/workflows/publish-docker-image-for-stability.yml b/.github/workflows/publish-docker-image-for-stability.yml
new file mode 100644
index 000000000000..1107f9fb64f0
--- /dev/null
+++ b/.github/workflows/publish-docker-image-for-stability.yml
@@ -0,0 +1,61 @@
+# This workflow uses actions that are not certified by GitHub.
+# They are provided by a third-party and are governed by
+# separate terms of service, privacy policy, and support
+# documentation.
+
+name: Publish Docker image for specific chain branches
+
+on:
+  push:
+    branches:
+      - production-stability-stg
+env:
+  OTP_VERSION: '25.2.1'
+  ELIXIR_VERSION: '1.14.5'
+jobs:
+  push_to_registry:
+    name: Push Docker image to Docker Hub
+    runs-on: ubuntu-latest
+    env:
+      RELEASE_VERSION: 5.3.1
+      DOCKER_CHAIN_NAME: stability
+    steps:
+      - name: Check out the repo
+        uses: actions/checkout@v4
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+      
+      - name: Log in to Docker Hub
+        uses: docker/login-action@v3
+        with:
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
+      
+      - name: Extract metadata (tags, labels) for Docker
+        id: meta
+        uses: docker/metadata-action@v5
+        with:
+          images: blockscout/blockscout
+
+      - name: Add SHORT_SHA env property with commit short sha
+        run: echo "SHORT_SHA=`echo ${GITHUB_SHA} | cut -c1-8`" >> $GITHUB_ENV
+      
+      - name: Build and push Docker image
+        uses: docker/build-push-action@v5
+        with:
+          context: .
+          file: ./docker/Dockerfile
+          push: true
+          tags: blockscout/blockscout-${{ env.DOCKER_CHAIN_NAME }}:latest, blockscout/blockscout-${{ env.DOCKER_CHAIN_NAME }}:${{ env.RELEASE_VERSION }}-postrelease-${{ env.SHORT_SHA }}
+          build-args: |
+            CACHE_EXCHANGE_RATES_PERIOD=
+            API_V1_READ_METHODS_DISABLED=false
+            DISABLE_WEBAPP=false
+            API_V1_WRITE_METHODS_DISABLED=false
+            CACHE_TOTAL_GAS_USAGE_COUNTER_ENABLED=
+            ADMIN_PANEL_ENABLED=false
+            CACHE_ADDRESS_WITH_BALANCES_UPDATE_INTERVAL=
+            BLOCKSCOUT_VERSION=v${{ env.RELEASE_VERSION }}-beta.+commit.${{ env.SHORT_SHA }}
+            RELEASE_VERSION=${{ env.RELEASE_VERSION }}
+            CHAIN_TYPE=stability
\ No newline at end of file
diff --git a/.github/workflows/publish-docker-image-release.yml b/.github/workflows/publish-docker-image-release.yml
index 2bf136930c8a..5a52059254fd 100644
--- a/.github/workflows/publish-docker-image-release.yml
+++ b/.github/workflows/publish-docker-image-release.yml
@@ -154,6 +154,28 @@ jobs:
             RELEASE_VERSION=${{ env.RELEASE_VERSION }}
             CHAIN_TYPE=polygon_edge
 
+      - name: Build and push Docker image
+        uses: docker/build-push-action@v5
+        with:
+          context: .
+          file: ./docker/Dockerfile
+          push: true
+          tags: blockscout/blockscout-stability:latest, blockscout/blockscout-stability:${{ env.RELEASE_VERSION }}
+          platforms: |
+            linux/amd64
+            linux/arm64/v8
+          build-args: |
+            CACHE_EXCHANGE_RATES_PERIOD=
+            API_V1_READ_METHODS_DISABLED=false
+            DISABLE_WEBAPP=false
+            API_V1_WRITE_METHODS_DISABLED=false
+            CACHE_TOTAL_GAS_USAGE_COUNTER_ENABLED=
+            ADMIN_PANEL_ENABLED=false
+            CACHE_ADDRESS_WITH_BALANCES_UPDATE_INTERVAL=
+            BLOCKSCOUT_VERSION=v${{ env.RELEASE_VERSION }}-beta
+            RELEASE_VERSION=${{ env.RELEASE_VERSION }}
+            CHAIN_TYPE=stability
+
       - name: Send release announcement to Slack workflow
         id: slack
         uses: slackapi/slack-github-action@v1.24.0

From cbdb98c1bd459d425ba3dcf644b3782a6fc868fd Mon Sep 17 00:00:00 2001
From: Viktor Baranov <baranov.viktor.27@gmail.com>
Date: Fri, 27 Oct 2023 10:02:15 +0300
Subject: [PATCH 606/909] Split release workflow into 2

---
 ...ublish-docker-image-release-additional.yml | 105 ++++++++++++++++++
 .../publish-docker-image-release.yml          |  66 -----------
 2 files changed, 105 insertions(+), 66 deletions(-)
 create mode 100644 .github/workflows/publish-docker-image-release-additional.yml

diff --git a/.github/workflows/publish-docker-image-release-additional.yml b/.github/workflows/publish-docker-image-release-additional.yml
new file mode 100644
index 000000000000..9877068bff23
--- /dev/null
+++ b/.github/workflows/publish-docker-image-release-additional.yml
@@ -0,0 +1,105 @@
+# This workflow uses actions that are not certified by GitHub.
+# They are provided by a third-party and are governed by
+# separate terms of service, privacy policy, and support
+# documentation.
+
+name: Publish Docker image for some custom chains
+
+on:
+  release:
+    types: [published]
+
+env:
+  OTP_VERSION: '25.2.1'
+  ELIXIR_VERSION: '1.14.5'
+
+jobs:
+  push_to_registry:
+    name: Push Docker image to Docker Hub
+    runs-on: ubuntu-latest
+    env:
+      RELEASE_VERSION: 5.3.1
+    steps:
+      - name: Check out the repo
+        uses: actions/checkout@v4
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Log in to Docker Hub
+        uses: docker/login-action@v2
+        with:
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
+
+      - name: Extract metadata (tags, labels) for Docker
+        id: meta
+        uses: docker/metadata-action@v5
+        with:
+          images: blockscout/blockscout
+
+      - name: Build and push Docker image for Rootstock
+        uses: docker/build-push-action@v5
+        with:
+          context: .
+          file: ./docker/Dockerfile
+          push: true
+          tags: blockscout/blockscout-rsk:latest, blockscout/blockscout-rsk:${{ env.RELEASE_VERSION }}
+          platforms: |
+            linux/amd64
+            linux/arm64/v8
+          build-args: |
+            CACHE_EXCHANGE_RATES_PERIOD=
+            API_V1_READ_METHODS_DISABLED=false
+            DISABLE_WEBAPP=false
+            API_V1_WRITE_METHODS_DISABLED=false
+            CACHE_TOTAL_GAS_USAGE_COUNTER_ENABLED=
+            ADMIN_PANEL_ENABLED=false
+            CACHE_ADDRESS_WITH_BALANCES_UPDATE_INTERVAL=
+            BLOCKSCOUT_VERSION=v${{ env.RELEASE_VERSION }}-beta
+            RELEASE_VERSION=${{ env.RELEASE_VERSION }}
+            CHAIN_TYPE=rsk
+
+      - name: Build and push Docker image for Polygon Edge
+        uses: docker/build-push-action@v5
+        with:
+          context: .
+          file: ./docker/Dockerfile
+          push: true
+          tags: blockscout/blockscout-polygon-edge:latest, blockscout/blockscout-polygon-edge:${{ env.RELEASE_VERSION }}
+          platforms: |
+            linux/amd64
+            linux/arm64/v8
+          build-args: |
+            CACHE_EXCHANGE_RATES_PERIOD=
+            API_V1_READ_METHODS_DISABLED=false
+            DISABLE_WEBAPP=false
+            API_V1_WRITE_METHODS_DISABLED=false
+            CACHE_TOTAL_GAS_USAGE_COUNTER_ENABLED=
+            ADMIN_PANEL_ENABLED=false
+            CACHE_ADDRESS_WITH_BALANCES_UPDATE_INTERVAL=
+            BLOCKSCOUT_VERSION=v${{ env.RELEASE_VERSION }}-beta
+            RELEASE_VERSION=${{ env.RELEASE_VERSION }}
+            CHAIN_TYPE=polygon_edge
+
+      - name: Build and push Docker image
+        uses: docker/build-push-action@v5
+        with:
+          context: .
+          file: ./docker/Dockerfile
+          push: true
+          tags: blockscout/blockscout-stability:latest, blockscout/blockscout-stability:${{ env.RELEASE_VERSION }}
+          platforms: |
+            linux/amd64
+            linux/arm64/v8
+          build-args: |
+            CACHE_EXCHANGE_RATES_PERIOD=
+            API_V1_READ_METHODS_DISABLED=false
+            DISABLE_WEBAPP=false
+            API_V1_WRITE_METHODS_DISABLED=false
+            CACHE_TOTAL_GAS_USAGE_COUNTER_ENABLED=
+            ADMIN_PANEL_ENABLED=false
+            CACHE_ADDRESS_WITH_BALANCES_UPDATE_INTERVAL=
+            BLOCKSCOUT_VERSION=v${{ env.RELEASE_VERSION }}-beta
+            RELEASE_VERSION=${{ env.RELEASE_VERSION }}
+            CHAIN_TYPE=stability
\ No newline at end of file
diff --git a/.github/workflows/publish-docker-image-release.yml b/.github/workflows/publish-docker-image-release.yml
index 5a52059254fd..df9aa7d44a9f 100644
--- a/.github/workflows/publish-docker-image-release.yml
+++ b/.github/workflows/publish-docker-image-release.yml
@@ -110,72 +110,6 @@ jobs:
             RELEASE_VERSION=${{ env.RELEASE_VERSION }}
             CHAIN_TYPE=suave
 
-      - name: Build and push Docker image for Rootstock
-        uses: docker/build-push-action@v5
-        with:
-          context: .
-          file: ./docker/Dockerfile
-          push: true
-          tags: blockscout/blockscout-rsk:latest, blockscout/blockscout-rsk:${{ env.RELEASE_VERSION }}
-          platforms: |
-            linux/amd64
-            linux/arm64/v8
-          build-args: |
-            CACHE_EXCHANGE_RATES_PERIOD=
-            API_V1_READ_METHODS_DISABLED=false
-            DISABLE_WEBAPP=false
-            API_V1_WRITE_METHODS_DISABLED=false
-            CACHE_TOTAL_GAS_USAGE_COUNTER_ENABLED=
-            ADMIN_PANEL_ENABLED=false
-            CACHE_ADDRESS_WITH_BALANCES_UPDATE_INTERVAL=
-            BLOCKSCOUT_VERSION=v${{ env.RELEASE_VERSION }}-beta
-            RELEASE_VERSION=${{ env.RELEASE_VERSION }}
-            CHAIN_TYPE=rsk
-
-      - name: Build and push Docker image for Polygon Edge
-        uses: docker/build-push-action@v5
-        with:
-          context: .
-          file: ./docker/Dockerfile
-          push: true
-          tags: blockscout/blockscout-polygon-edge:latest, blockscout/blockscout-polygon-edge:${{ env.RELEASE_VERSION }}
-          platforms: |
-            linux/amd64
-            linux/arm64/v8
-          build-args: |
-            CACHE_EXCHANGE_RATES_PERIOD=
-            API_V1_READ_METHODS_DISABLED=false
-            DISABLE_WEBAPP=false
-            API_V1_WRITE_METHODS_DISABLED=false
-            CACHE_TOTAL_GAS_USAGE_COUNTER_ENABLED=
-            ADMIN_PANEL_ENABLED=false
-            CACHE_ADDRESS_WITH_BALANCES_UPDATE_INTERVAL=
-            BLOCKSCOUT_VERSION=v${{ env.RELEASE_VERSION }}-beta
-            RELEASE_VERSION=${{ env.RELEASE_VERSION }}
-            CHAIN_TYPE=polygon_edge
-
-      - name: Build and push Docker image
-        uses: docker/build-push-action@v5
-        with:
-          context: .
-          file: ./docker/Dockerfile
-          push: true
-          tags: blockscout/blockscout-stability:latest, blockscout/blockscout-stability:${{ env.RELEASE_VERSION }}
-          platforms: |
-            linux/amd64
-            linux/arm64/v8
-          build-args: |
-            CACHE_EXCHANGE_RATES_PERIOD=
-            API_V1_READ_METHODS_DISABLED=false
-            DISABLE_WEBAPP=false
-            API_V1_WRITE_METHODS_DISABLED=false
-            CACHE_TOTAL_GAS_USAGE_COUNTER_ENABLED=
-            ADMIN_PANEL_ENABLED=false
-            CACHE_ADDRESS_WITH_BALANCES_UPDATE_INTERVAL=
-            BLOCKSCOUT_VERSION=v${{ env.RELEASE_VERSION }}-beta
-            RELEASE_VERSION=${{ env.RELEASE_VERSION }}
-            CHAIN_TYPE=stability
-
       - name: Send release announcement to Slack workflow
         id: slack
         uses: slackapi/slack-github-action@v1.24.0

From 0e79ee5f81b4a3bfb98eae818f0af4f7fecbf6b8 Mon Sep 17 00:00:00 2001
From: Viktor Baranov <baranov.viktor.27@gmail.com>
Date: Fri, 27 Oct 2023 10:06:56 +0300
Subject: [PATCH 607/909] Adjust docker image build workflows: remove updating
 latest tag from push to custom branches, polygon-edge image workflow

---
 .../publish-docker-image-for-polygon-edge.yml | 55 +++++++++++++++++++
 .../publish-docker-image-for-rsk.yml          |  2 +-
 .../publish-docker-image-for-stability.yml    |  2 +-
 .../publish-docker-image-for-suave.yml        |  2 +-
 .../publish-docker-image-for-zkevm.yml        |  2 +-
 5 files changed, 59 insertions(+), 4 deletions(-)
 create mode 100644 .github/workflows/publish-docker-image-for-polygon-edge.yml

diff --git a/.github/workflows/publish-docker-image-for-polygon-edge.yml b/.github/workflows/publish-docker-image-for-polygon-edge.yml
new file mode 100644
index 000000000000..a4de66bcfcd1
--- /dev/null
+++ b/.github/workflows/publish-docker-image-for-polygon-edge.yml
@@ -0,0 +1,55 @@
+# This workflow uses actions that are not certified by GitHub.
+# They are provided by a third-party and are governed by
+# separate terms of service, privacy policy, and support
+# documentation.
+
+name: Publish Docker image for specific chain branches
+
+on:
+  push:
+    branches:
+      - production-polygon-edge-stg
+jobs:
+  push_to_registry:
+    name: Push Docker image to Docker Hub
+    runs-on: ubuntu-latest
+    env:
+      RELEASE_VERSION: 5.3.1
+      DOCKER_CHAIN_NAME: polygon-edge
+    steps:
+      - name: Check out the repo
+        uses: actions/checkout@v3
+      
+      - name: Log in to Docker Hub
+        uses: docker/login-action@v2
+        with:
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
+      
+      - name: Extract metadata (tags, labels) for Docker
+        id: meta
+        uses: docker/metadata-action@v4
+        with:
+          images: blockscout/blockscout
+
+      - name: Add SHORT_SHA env property with commit short sha
+        run: echo "SHORT_SHA=`echo ${GITHUB_SHA} | cut -c1-8`" >> $GITHUB_ENV
+      
+      - name: Build and push Docker image
+        uses: docker/build-push-action@v5
+        with:
+          context: .
+          file: ./docker/Dockerfile
+          push: true
+          tags: blockscout/blockscout-${{ env.DOCKER_CHAIN_NAME }}:${{ env.RELEASE_VERSION }}-postrelease-${{ env.SHORT_SHA }}
+          build-args: |
+            CACHE_EXCHANGE_RATES_PERIOD=
+            API_V1_READ_METHODS_DISABLED=false
+            DISABLE_WEBAPP=false
+            API_V1_WRITE_METHODS_DISABLED=false
+            CACHE_TOTAL_GAS_USAGE_COUNTER_ENABLED=
+            ADMIN_PANEL_ENABLED=false
+            CACHE_ADDRESS_WITH_BALANCES_UPDATE_INTERVAL=
+            BLOCKSCOUT_VERSION=v${{ env.RELEASE_VERSION }}-beta.+commit.${{ env.SHORT_SHA }}
+            RELEASE_VERSION=${{ env.RELEASE_VERSION }}
+            CHAIN_TYPE=polygon_edge
\ No newline at end of file
diff --git a/.github/workflows/publish-docker-image-for-rsk.yml b/.github/workflows/publish-docker-image-for-rsk.yml
index 084b6785333e..424aece44e8b 100644
--- a/.github/workflows/publish-docker-image-for-rsk.yml
+++ b/.github/workflows/publish-docker-image-for-rsk.yml
@@ -41,7 +41,7 @@ jobs:
           context: .
           file: ./docker/Dockerfile
           push: true
-          tags: blockscout/blockscout-${{ env.DOCKER_CHAIN_NAME }}:latest, blockscout/blockscout-${{ env.DOCKER_CHAIN_NAME }}:${{ env.RELEASE_VERSION }}-postrelease-${{ env.SHORT_SHA }}
+          tags: blockscout/blockscout-${{ env.DOCKER_CHAIN_NAME }}:${{ env.RELEASE_VERSION }}-postrelease-${{ env.SHORT_SHA }}
           build-args: |
             CACHE_EXCHANGE_RATES_PERIOD=
             API_V1_READ_METHODS_DISABLED=false
diff --git a/.github/workflows/publish-docker-image-for-stability.yml b/.github/workflows/publish-docker-image-for-stability.yml
index 1107f9fb64f0..57fd1e0fcb7c 100644
--- a/.github/workflows/publish-docker-image-for-stability.yml
+++ b/.github/workflows/publish-docker-image-for-stability.yml
@@ -47,7 +47,7 @@ jobs:
           context: .
           file: ./docker/Dockerfile
           push: true
-          tags: blockscout/blockscout-${{ env.DOCKER_CHAIN_NAME }}:latest, blockscout/blockscout-${{ env.DOCKER_CHAIN_NAME }}:${{ env.RELEASE_VERSION }}-postrelease-${{ env.SHORT_SHA }}
+          tags: blockscout/blockscout-${{ env.DOCKER_CHAIN_NAME }}:${{ env.RELEASE_VERSION }}-postrelease-${{ env.SHORT_SHA }}
           build-args: |
             CACHE_EXCHANGE_RATES_PERIOD=
             API_V1_READ_METHODS_DISABLED=false
diff --git a/.github/workflows/publish-docker-image-for-suave.yml b/.github/workflows/publish-docker-image-for-suave.yml
index 0b65a41f729a..3e66ed92dc2b 100644
--- a/.github/workflows/publish-docker-image-for-suave.yml
+++ b/.github/workflows/publish-docker-image-for-suave.yml
@@ -47,7 +47,7 @@ jobs:
           context: .
           file: ./docker/Dockerfile
           push: true
-          tags: blockscout/blockscout-${{ env.DOCKER_CHAIN_NAME }}:latest, blockscout/blockscout-${{ env.DOCKER_CHAIN_NAME }}:${{ env.RELEASE_VERSION }}-postrelease-${{ env.SHORT_SHA }}
+          tags: blockscout/blockscout-${{ env.DOCKER_CHAIN_NAME }}:${{ env.RELEASE_VERSION }}-postrelease-${{ env.SHORT_SHA }}
           platforms: |
             linux/amd64
             linux/arm64/v8
diff --git a/.github/workflows/publish-docker-image-for-zkevm.yml b/.github/workflows/publish-docker-image-for-zkevm.yml
index 878fd1c3e1a6..374cae48a909 100644
--- a/.github/workflows/publish-docker-image-for-zkevm.yml
+++ b/.github/workflows/publish-docker-image-for-zkevm.yml
@@ -41,7 +41,7 @@ jobs:
           context: .
           file: ./docker/Dockerfile
           push: true
-          tags: blockscout/blockscout-${{ env.DOCKER_CHAIN_NAME }}:latest, blockscout/blockscout-${{ env.DOCKER_CHAIN_NAME }}:${{ env.RELEASE_VERSION }}-postrelease-${{ env.SHORT_SHA }}
+          tags: blockscout/blockscout-${{ env.DOCKER_CHAIN_NAME }}:${{ env.RELEASE_VERSION }}-postrelease-${{ env.SHORT_SHA }}
           build-args: |
             CACHE_EXCHANGE_RATES_PERIOD=
             API_V1_READ_METHODS_DISABLED=false

From cc5b2d81353486737b63bf37110d816503269fe6 Mon Sep 17 00:00:00 2001
From: Victor Baranov <baranov.viktor.27@gmail.com>
Date: Fri, 27 Oct 2023 18:26:02 +0300
Subject: [PATCH 608/909] Remove repos_list (default value for ecto repos) from
 Explorer.ReleaseTasks (#8728)

* Remove repos_list (default value for repos, which are defined anyways) from Explorer.ReleaseTasks

* Add CHANGELOG entry
---
 CHANGELOG.md                       |  2 ++
 apps/explorer/lib/release_tasks.ex | 15 +--------------
 2 files changed, 3 insertions(+), 14 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1d8e5ece63b1..9f6de46493b1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,8 @@
 
 ### Chore
 
+- [#8728](https://github.com/blockscout/blockscout/pull/8728) - Remove repos_list (default value for ecto repos) from Explorer.ReleaseTasks
+
 <details>
   <summary>Dependencies version bumps</summary>
 </details>
diff --git a/apps/explorer/lib/release_tasks.ex b/apps/explorer/lib/release_tasks.ex
index 248f69fa89d3..a55174738421 100644
--- a/apps/explorer/lib/release_tasks.ex
+++ b/apps/explorer/lib/release_tasks.ex
@@ -15,20 +15,7 @@ defmodule Explorer.ReleaseTasks do
   ]
 
   def repos do
-    base_repos_list = [
-      Explorer.Repo,
-      Explorer.Repo.Account
-    ]
-
-    repos_list =
-      case System.get_env("CHAIN_TYPE") do
-        "polygon_edge" -> [Explorer.Repo.PolygonEdge | base_repos_list]
-        "polygon_zkevm" -> [Explorer.Repo.PolygonZkevm | base_repos_list]
-        "suave" -> [Explorer.Repo.Suave | base_repos_list]
-        _ -> base_repos_list
-      end
-
-    Application.get_env(:explorer, :ecto_repos, repos_list)
+    Application.get_env(:explorer, :ecto_repos)
   end
 
   def create_and_migrate do

From 743c90e6d3c478d1550267db409963424e1b1925 Mon Sep 17 00:00:00 2001
From: Maxim Filonov <53992153+sl1depengwyn@users.noreply.github.com>
Date: Fri, 27 Oct 2023 19:10:45 +0300
Subject: [PATCH 609/909] Fix flaky account notifier test (#8724)

* Fix flaky account notifier test

* Update CHANGELOG.md
---
 CHANGELOG.md                                                 | 2 ++
 apps/explorer/test/explorer/account/notifier/notify_test.exs | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9f6de46493b1..9d5c3f8edf61 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,8 @@
 
 ### Fixes
 
+- [#8724](https://github.com/blockscout/blockscout/pull/8724) - Fix flaky account notifier test
+
 ### Chore
 
 - [#8728](https://github.com/blockscout/blockscout/pull/8728) - Remove repos_list (default value for ecto repos) from Explorer.ReleaseTasks
diff --git a/apps/explorer/test/explorer/account/notifier/notify_test.exs b/apps/explorer/test/explorer/account/notifier/notify_test.exs
index adde2c2569b2..bc7480cc3ec2 100644
--- a/apps/explorer/test/explorer/account/notifier/notify_test.exs
+++ b/apps/explorer/test/explorer/account/notifier/notify_test.exs
@@ -55,7 +55,7 @@ defmodule Explorer.Account.Notifier.NotifyTest do
     test "when address appears in watchlist" do
       wa =
         %WatchlistAddress{address_hash: address_hash} =
-        build(:account_watchlist_address)
+        build(:account_watchlist_address, watch_coin_input: true)
         |> Repo.account_repo().insert!()
 
       _watchlist_address = Repo.preload(wa, watchlist: :identity)

From 919d79f4a077ebc73bcb816da3a3bcd1872543a5 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 30 Oct 2023 09:27:32 +0000
Subject: [PATCH 610/909] Bump browserify-sign from 4.2.1 to 4.2.2 in
 /apps/block_scout_web/assets

Bumps [browserify-sign](https://github.com/crypto-browserify/browserify-sign) from 4.2.1 to 4.2.2.
- [Changelog](https://github.com/browserify/browserify-sign/blob/main/CHANGELOG.md)
- [Commits](https://github.com/crypto-browserify/browserify-sign/compare/v4.2.1...v4.2.2)

---
updated-dependencies:
- dependency-name: browserify-sign
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 apps/block_scout_web/assets/package-lock.json | 51 ++++++++++---------
 1 file changed, 27 insertions(+), 24 deletions(-)

diff --git a/apps/block_scout_web/assets/package-lock.json b/apps/block_scout_web/assets/package-lock.json
index ea97af7238fa..7d5001bb3ec5 100644
--- a/apps/block_scout_web/assets/package-lock.json
+++ b/apps/block_scout_web/assets/package-lock.json
@@ -5171,19 +5171,22 @@
       }
     },
     "node_modules/browserify-sign": {
-      "version": "4.2.1",
-      "resolved": "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.2.1.tgz",
-      "integrity": "sha512-/vrA5fguVAKKAVTNJjgSm1tRQDHUU6DbwO9IROu/0WAzC8PKhucDSh18J0RMvVeHAn5puMd+QHC2erPRNf8lmg==",
+      "version": "4.2.2",
+      "resolved": "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.2.2.tgz",
+      "integrity": "sha512-1rudGyeYY42Dk6texmv7c4VcQ0EsvVbLwZkA+AQB7SxvXxmcD93jcHie8bzecJ+ChDlmAm2Qyu0+Ccg5uhZXCg==",
       "dependencies": {
-        "bn.js": "^5.1.1",
-        "browserify-rsa": "^4.0.1",
+        "bn.js": "^5.2.1",
+        "browserify-rsa": "^4.1.0",
         "create-hash": "^1.2.0",
         "create-hmac": "^1.1.7",
-        "elliptic": "^6.5.3",
+        "elliptic": "^6.5.4",
         "inherits": "^2.0.4",
-        "parse-asn1": "^5.1.5",
-        "readable-stream": "^3.6.0",
-        "safe-buffer": "^5.2.0"
+        "parse-asn1": "^5.1.6",
+        "readable-stream": "^3.6.2",
+        "safe-buffer": "^5.2.1"
+      },
+      "engines": {
+        "node": ">= 4"
       }
     },
     "node_modules/browserify-sign/node_modules/safe-buffer": {
@@ -14739,9 +14742,9 @@
       "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ=="
     },
     "node_modules/readable-stream": {
-      "version": "3.6.0",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
-      "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
+      "version": "3.6.2",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz",
+      "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==",
       "dependencies": {
         "inherits": "^2.0.3",
         "string_decoder": "^1.1.1",
@@ -21632,19 +21635,19 @@
       }
     },
     "browserify-sign": {
-      "version": "4.2.1",
-      "resolved": "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.2.1.tgz",
-      "integrity": "sha512-/vrA5fguVAKKAVTNJjgSm1tRQDHUU6DbwO9IROu/0WAzC8PKhucDSh18J0RMvVeHAn5puMd+QHC2erPRNf8lmg==",
+      "version": "4.2.2",
+      "resolved": "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.2.2.tgz",
+      "integrity": "sha512-1rudGyeYY42Dk6texmv7c4VcQ0EsvVbLwZkA+AQB7SxvXxmcD93jcHie8bzecJ+ChDlmAm2Qyu0+Ccg5uhZXCg==",
       "requires": {
-        "bn.js": "^5.1.1",
-        "browserify-rsa": "^4.0.1",
+        "bn.js": "^5.2.1",
+        "browserify-rsa": "^4.1.0",
         "create-hash": "^1.2.0",
         "create-hmac": "^1.1.7",
-        "elliptic": "^6.5.3",
+        "elliptic": "^6.5.4",
         "inherits": "^2.0.4",
-        "parse-asn1": "^5.1.5",
-        "readable-stream": "^3.6.0",
-        "safe-buffer": "^5.2.0"
+        "parse-asn1": "^5.1.6",
+        "readable-stream": "^3.6.2",
+        "safe-buffer": "^5.2.1"
       },
       "dependencies": {
         "safe-buffer": {
@@ -28878,9 +28881,9 @@
       "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ=="
     },
     "readable-stream": {
-      "version": "3.6.0",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
-      "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
+      "version": "3.6.2",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz",
+      "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==",
       "requires": {
         "inherits": "^2.0.3",
         "string_decoder": "^1.1.1",

From 39fd80c55b56d57e7d07fd3f2478ddcf5a77b459 Mon Sep 17 00:00:00 2001
From: Viktor Baranov <baranov.viktor.27@gmail.com>
Date: Mon, 30 Oct 2023 15:42:19 +0300
Subject: [PATCH 611/909] Add CI to PR creation production-optimism-stg

---
 .github/workflows/config.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/config.yml b/.github/workflows/config.yml
index cdec5e8f23c2..497c5005104d 100644
--- a/.github/workflows/config.yml
+++ b/.github/workflows/config.yml
@@ -23,6 +23,7 @@ on:
   pull_request:
     branches:
       - master
+      - production-optimism-stg
 
 env:
   MIX_ENV: test

From c2d4a2d2719774d032b50c27a8f671aef2bbefd4 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 30 Oct 2023 18:14:55 +0000
Subject: [PATCH 612/909] Bump solc from 0.8.21 to 0.8.22 in /apps/explorer

Bumps [solc](https://github.com/ethereum/solc-js) from 0.8.21 to 0.8.22.
- [Commits](https://github.com/ethereum/solc-js/compare/v0.8.21...v0.8.22)

---
updated-dependencies:
- dependency-name: solc
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 apps/explorer/package-lock.json | 14 +++++++-------
 apps/explorer/package.json      |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/apps/explorer/package-lock.json b/apps/explorer/package-lock.json
index cc7eb92d7148..9a78d3dd8dde 100644
--- a/apps/explorer/package-lock.json
+++ b/apps/explorer/package-lock.json
@@ -7,7 +7,7 @@
       "name": "blockscout",
       "license": "GPL-3.0",
       "dependencies": {
-        "solc": "0.8.21"
+        "solc": "0.8.22"
       },
       "engines": {
         "node": "18.x",
@@ -76,9 +76,9 @@
       }
     },
     "node_modules/solc": {
-      "version": "0.8.21",
-      "resolved": "https://registry.npmjs.org/solc/-/solc-0.8.21.tgz",
-      "integrity": "sha512-N55ogy2dkTRwiONbj4e6wMZqUNaLZkiRcjGyeafjLYzo/tf/IvhHY5P5wpe+H3Fubh9idu071i8eOGO31s1ylg==",
+      "version": "0.8.22",
+      "resolved": "https://registry.npmjs.org/solc/-/solc-0.8.22.tgz",
+      "integrity": "sha512-bA2tMZXx93R8L5LUH7TlB/f+QhkVyxrrY6LmgJnFFZlRknrhYVlBK1e3uHIdKybwoFabOFSzeaZjPeL/GIpFGQ==",
       "dependencies": {
         "command-exists": "^1.2.8",
         "commander": "^8.1.0",
@@ -144,9 +144,9 @@
       "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g=="
     },
     "solc": {
-      "version": "0.8.21",
-      "resolved": "https://registry.npmjs.org/solc/-/solc-0.8.21.tgz",
-      "integrity": "sha512-N55ogy2dkTRwiONbj4e6wMZqUNaLZkiRcjGyeafjLYzo/tf/IvhHY5P5wpe+H3Fubh9idu071i8eOGO31s1ylg==",
+      "version": "0.8.22",
+      "resolved": "https://registry.npmjs.org/solc/-/solc-0.8.22.tgz",
+      "integrity": "sha512-bA2tMZXx93R8L5LUH7TlB/f+QhkVyxrrY6LmgJnFFZlRknrhYVlBK1e3uHIdKybwoFabOFSzeaZjPeL/GIpFGQ==",
       "requires": {
         "command-exists": "^1.2.8",
         "commander": "^8.1.0",
diff --git a/apps/explorer/package.json b/apps/explorer/package.json
index 680ab2b5d43d..366fdd199b1e 100644
--- a/apps/explorer/package.json
+++ b/apps/explorer/package.json
@@ -13,6 +13,6 @@
   },
   "scripts": {},
   "dependencies": {
-    "solc": "0.8.21"
+    "solc": "0.8.22"
   }
 }

From bb64998a9ee2d9d3281ebc19e6ff4dff33b69042 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 30 Oct 2023 18:35:54 +0000
Subject: [PATCH 613/909] Bump phoenix_ecto from 4.4.2 to 4.4.3

Bumps [phoenix_ecto](https://github.com/phoenixframework/phoenix_ecto) from 4.4.2 to 4.4.3.
- [Changelog](https://github.com/phoenixframework/phoenix_ecto/blob/main/CHANGELOG.md)
- [Commits](https://github.com/phoenixframework/phoenix_ecto/compare/v4.4.2...v4.4.3)

---
updated-dependencies:
- dependency-name: phoenix_ecto
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 mix.lock | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/mix.lock b/mix.lock
index 2ea41a9490b5..d6d590c1fcb8 100644
--- a/mix.lock
+++ b/mix.lock
@@ -99,11 +99,11 @@
   "parallel_stream": {:hex, :parallel_stream, "1.1.0", "f52f73eb344bc22de335992377413138405796e0d0ad99d995d9977ac29f1ca9", [:mix], [], "hexpm", "684fd19191aedfaf387bbabbeb8ff3c752f0220c8112eb907d797f4592d6e871"},
   "parse_trans": {:hex, :parse_trans, "3.4.1", "6e6aa8167cb44cc8f39441d05193be6e6f4e7c2946cb2759f015f8c56b76e5ff", [:rebar3], [], "hexpm", "620a406ce75dada827b82e453c19cf06776be266f5a67cff34e1ef2cbb60e49a"},
   "phoenix": {:hex, :phoenix, "1.5.14", "2d5db884be496eefa5157505ec0134e66187cb416c072272420c5509d67bf808", [:mix], [{:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}, {:phoenix_html, "~> 2.13 or ~> 3.0", [hex: :phoenix_html, repo: "hexpm", optional: true]}, {:phoenix_pubsub, "~> 2.0", [hex: :phoenix_pubsub, repo: "hexpm", optional: false]}, {:plug, "~> 1.10", [hex: :plug, repo: "hexpm", optional: false]}, {:plug_cowboy, "~> 1.0 or ~> 2.2", [hex: :plug_cowboy, repo: "hexpm", optional: true]}, {:plug_crypto, "~> 1.1.2 or ~> 1.2", [hex: :plug_crypto, repo: "hexpm", optional: false]}, {:telemetry, "~> 0.4 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "207f1aa5520320cbb7940d7ff2dde2342162cf513875848f88249ea0ba02fef7"},
-  "phoenix_ecto": {:hex, :phoenix_ecto, "4.4.2", "b21bd01fdeffcfe2fab49e4942aa938b6d3e89e93a480d4aee58085560a0bc0d", [:mix], [{:ecto, "~> 3.5", [hex: :ecto, repo: "hexpm", optional: false]}, {:phoenix_html, "~> 2.14.2 or ~> 3.0", [hex: :phoenix_html, repo: "hexpm", optional: true]}, {:plug, "~> 1.9", [hex: :plug, repo: "hexpm", optional: false]}], "hexpm", "70242edd4601d50b69273b057ecf7b684644c19ee750989fd555625ae4ce8f5d"},
+  "phoenix_ecto": {:hex, :phoenix_ecto, "4.4.3", "86e9878f833829c3f66da03d75254c155d91d72a201eb56ae83482328dc7ca93", [:mix], [{:ecto, "~> 3.5", [hex: :ecto, repo: "hexpm", optional: false]}, {:phoenix_html, "~> 2.14.2 or ~> 3.0 or ~> 4.0", [hex: :phoenix_html, repo: "hexpm", optional: true]}, {:plug, "~> 1.9", [hex: :plug, repo: "hexpm", optional: false]}], "hexpm", "d36c401206f3011fefd63d04e8ef626ec8791975d9d107f9a0817d426f61ac07"},
   "phoenix_html": {:hex, :phoenix_html, "3.0.4", "232d41884fe6a9c42d09f48397c175cd6f0d443aaa34c7424da47604201df2e1", [:mix], [{:plug, "~> 1.5", [hex: :plug, repo: "hexpm", optional: true]}], "hexpm", "ce17fd3cf815b2ed874114073e743507704b1f5288bb03c304a77458485efc8b"},
   "phoenix_live_reload": {:hex, :phoenix_live_reload, "1.3.3", "3a53772a6118d5679bf50fc1670505a290e32a1d195df9e069d8c53ab040c054", [:mix], [{:file_system, "~> 0.2.1 or ~> 0.3", [hex: :file_system, repo: "hexpm", optional: false]}, {:phoenix, "~> 1.4", [hex: :phoenix, repo: "hexpm", optional: false]}], "hexpm", "766796676e5f558dbae5d1bdb066849673e956005e3730dfd5affd7a6da4abac"},
   "phoenix_pubsub": {:hex, :phoenix_pubsub, "2.1.3", "3168d78ba41835aecad272d5e8cd51aa87a7ac9eb836eabc42f6e57538e3731d", [:mix], [], "hexpm", "bba06bc1dcfd8cb086759f0edc94a8ba2bc8896d5331a1e2c2902bf8e36ee502"},
-  "plug": {:hex, :plug, "1.14.2", "cff7d4ec45b4ae176a227acd94a7ab536d9b37b942c8e8fa6dfc0fff98ff4d80", [:mix], [{:mime, "~> 1.0 or ~> 2.0", [hex: :mime, repo: "hexpm", optional: false]}, {:plug_crypto, "~> 1.1.1 or ~> 1.2", [hex: :plug_crypto, repo: "hexpm", optional: false]}, {:telemetry, "~> 0.4.3 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "842fc50187e13cf4ac3b253d47d9474ed6c296a8732752835ce4a86acdf68d13"},
+  "plug": {:hex, :plug, "1.15.1", "b7efd81c1a1286f13efb3f769de343236bd8b7d23b4a9f40d3002fc39ad8f74c", [:mix], [{:mime, "~> 1.0 or ~> 2.0", [hex: :mime, repo: "hexpm", optional: false]}, {:plug_crypto, "~> 1.1.1 or ~> 1.2 or ~> 2.0", [hex: :plug_crypto, repo: "hexpm", optional: false]}, {:telemetry, "~> 0.4.3 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "459497bd94d041d98d948054ec6c0b76feacd28eec38b219ca04c0de13c79d30"},
   "plug_cowboy": {:hex, :plug_cowboy, "2.6.1", "9a3bbfceeb65eff5f39dab529e5cd79137ac36e913c02067dba3963a26efe9b2", [:mix], [{:cowboy, "~> 2.7", [hex: :cowboy, repo: "hexpm", optional: false]}, {:cowboy_telemetry, "~> 0.3", [hex: :cowboy_telemetry, repo: "hexpm", optional: false]}, {:plug, "~> 1.14", [hex: :plug, repo: "hexpm", optional: false]}], "hexpm", "de36e1a21f451a18b790f37765db198075c25875c64834bcc82d90b309eb6613"},
   "plug_crypto": {:hex, :plug_crypto, "1.2.5", "918772575e48e81e455818229bf719d4ab4181fcbf7f85b68a35620f78d89ced", [:mix], [], "hexpm", "26549a1d6345e2172eb1c233866756ae44a9609bd33ee6f99147ab3fd87fd842"},
   "poison": {:hex, :poison, "4.0.1", "bcb755a16fac91cad79bfe9fc3585bb07b9331e50cfe3420a24bcc2d735709ae", [:mix], [], "hexpm", "ba8836feea4b394bb718a161fc59a288fe0109b5006d6bdf97b6badfcf6f0f25"},

From 51a42a3fa84c541872994f29eeb5bc508a870ecd Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 30 Oct 2023 18:36:18 +0000
Subject: [PATCH 614/909] Bump tesla from 1.7.0 to 1.8.0

Bumps [tesla](https://github.com/teamon/tesla) from 1.7.0 to 1.8.0.
- [Release notes](https://github.com/teamon/tesla/releases)
- [Commits](https://github.com/teamon/tesla/compare/v1.7.0...v1.8.0)

---
updated-dependencies:
- dependency-name: tesla
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 apps/explorer/mix.exs | 2 +-
 mix.exs               | 2 +-
 mix.lock              | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/apps/explorer/mix.exs b/apps/explorer/mix.exs
index 6a508204f336..1a43393fa626 100644
--- a/apps/explorer/mix.exs
+++ b/apps/explorer/mix.exs
@@ -113,7 +113,7 @@ defmodule Explorer.Mixfile do
       # `Timex.Duration` for `Explorer.Counters.AverageBlockTime.average_block_time/0`
       {:timex, "~> 3.7.1"},
       {:con_cache, "~> 1.0"},
-      {:tesla, "~> 1.7.0"},
+      {:tesla, "~> 1.8.0"},
       {:cbor, "~> 1.0"},
       {:cloak_ecto, "~> 1.2.0"},
       {:redix, "~> 1.1"},
diff --git a/mix.exs b/mix.exs
index 9dac495b0b1e..12ddf19b66ee 100644
--- a/mix.exs
+++ b/mix.exs
@@ -94,7 +94,7 @@ defmodule BlockScout.Mixfile do
     [
       {:prometheus_ex, git: "https://github.com/lanodan/prometheus.ex", branch: "fix/elixir-1.14", override: true},
       {:absinthe_plug, git: "https://github.com/blockscout/absinthe_plug.git", tag: "1.5.3", override: true},
-      {:tesla, "~> 1.7.0"},
+      {:tesla, "~> 1.8.0"},
       # Documentation
       {:ex_doc, "~> 0.30.1", only: :dev, runtime: false},
       {:number, "~> 1.0.3"}
diff --git a/mix.lock b/mix.lock
index 2ea41a9490b5..66bd9364d984 100644
--- a/mix.lock
+++ b/mix.lock
@@ -103,7 +103,7 @@
   "phoenix_html": {:hex, :phoenix_html, "3.0.4", "232d41884fe6a9c42d09f48397c175cd6f0d443aaa34c7424da47604201df2e1", [:mix], [{:plug, "~> 1.5", [hex: :plug, repo: "hexpm", optional: true]}], "hexpm", "ce17fd3cf815b2ed874114073e743507704b1f5288bb03c304a77458485efc8b"},
   "phoenix_live_reload": {:hex, :phoenix_live_reload, "1.3.3", "3a53772a6118d5679bf50fc1670505a290e32a1d195df9e069d8c53ab040c054", [:mix], [{:file_system, "~> 0.2.1 or ~> 0.3", [hex: :file_system, repo: "hexpm", optional: false]}, {:phoenix, "~> 1.4", [hex: :phoenix, repo: "hexpm", optional: false]}], "hexpm", "766796676e5f558dbae5d1bdb066849673e956005e3730dfd5affd7a6da4abac"},
   "phoenix_pubsub": {:hex, :phoenix_pubsub, "2.1.3", "3168d78ba41835aecad272d5e8cd51aa87a7ac9eb836eabc42f6e57538e3731d", [:mix], [], "hexpm", "bba06bc1dcfd8cb086759f0edc94a8ba2bc8896d5331a1e2c2902bf8e36ee502"},
-  "plug": {:hex, :plug, "1.14.2", "cff7d4ec45b4ae176a227acd94a7ab536d9b37b942c8e8fa6dfc0fff98ff4d80", [:mix], [{:mime, "~> 1.0 or ~> 2.0", [hex: :mime, repo: "hexpm", optional: false]}, {:plug_crypto, "~> 1.1.1 or ~> 1.2", [hex: :plug_crypto, repo: "hexpm", optional: false]}, {:telemetry, "~> 0.4.3 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "842fc50187e13cf4ac3b253d47d9474ed6c296a8732752835ce4a86acdf68d13"},
+  "plug": {:hex, :plug, "1.15.1", "b7efd81c1a1286f13efb3f769de343236bd8b7d23b4a9f40d3002fc39ad8f74c", [:mix], [{:mime, "~> 1.0 or ~> 2.0", [hex: :mime, repo: "hexpm", optional: false]}, {:plug_crypto, "~> 1.1.1 or ~> 1.2 or ~> 2.0", [hex: :plug_crypto, repo: "hexpm", optional: false]}, {:telemetry, "~> 0.4.3 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "459497bd94d041d98d948054ec6c0b76feacd28eec38b219ca04c0de13c79d30"},
   "plug_cowboy": {:hex, :plug_cowboy, "2.6.1", "9a3bbfceeb65eff5f39dab529e5cd79137ac36e913c02067dba3963a26efe9b2", [:mix], [{:cowboy, "~> 2.7", [hex: :cowboy, repo: "hexpm", optional: false]}, {:cowboy_telemetry, "~> 0.3", [hex: :cowboy_telemetry, repo: "hexpm", optional: false]}, {:plug, "~> 1.14", [hex: :plug, repo: "hexpm", optional: false]}], "hexpm", "de36e1a21f451a18b790f37765db198075c25875c64834bcc82d90b309eb6613"},
   "plug_crypto": {:hex, :plug_crypto, "1.2.5", "918772575e48e81e455818229bf719d4ab4181fcbf7f85b68a35620f78d89ced", [:mix], [], "hexpm", "26549a1d6345e2172eb1c233866756ae44a9609bd33ee6f99147ab3fd87fd842"},
   "poison": {:hex, :poison, "4.0.1", "bcb755a16fac91cad79bfe9fc3585bb07b9331e50cfe3420a24bcc2d735709ae", [:mix], [], "hexpm", "ba8836feea4b394bb718a161fc59a288fe0109b5006d6bdf97b6badfcf6f0f25"},
@@ -131,7 +131,7 @@
   "ssl_verify_fun": {:hex, :ssl_verify_fun, "1.1.7", "354c321cf377240c7b8716899e182ce4890c5938111a1296add3ec74cf1715df", [:make, :mix, :rebar3], [], "hexpm", "fe4c190e8f37401d30167c8c405eda19469f34577987c76dde613e838bbc67f8"},
   "statistex": {:hex, :statistex, "1.0.0", "f3dc93f3c0c6c92e5f291704cf62b99b553253d7969e9a5fa713e5481cd858a5", [:mix], [], "hexpm", "ff9d8bee7035028ab4742ff52fc80a2aa35cece833cf5319009b52f1b5a86c27"},
   "telemetry": {:hex, :telemetry, "0.4.3", "a06428a514bdbc63293cd9a6263aad00ddeb66f608163bdec7c8995784080818", [:rebar3], [], "hexpm", "eb72b8365ffda5bed68a620d1da88525e326cb82a75ee61354fc24b844768041"},
-  "tesla": {:hex, :tesla, "1.7.0", "a62dda2f80d4f8a925eb7b8c5b78c461e0eb996672719fe1a63b26321a5f8b4e", [:mix], [{:castore, "~> 0.1 or ~> 1.0", [hex: :castore, repo: "hexpm", optional: true]}, {:exjsx, ">= 3.0.0", [hex: :exjsx, repo: "hexpm", optional: true]}, {:finch, "~> 0.13", [hex: :finch, repo: "hexpm", optional: true]}, {:fuse, "~> 2.4", [hex: :fuse, repo: "hexpm", optional: true]}, {:gun, "~> 1.3", [hex: :gun, repo: "hexpm", optional: true]}, {:hackney, "~> 1.6", [hex: :hackney, repo: "hexpm", optional: true]}, {:ibrowse, "4.4.0", [hex: :ibrowse, repo: "hexpm", optional: true]}, {:jason, ">= 1.0.0", [hex: :jason, repo: "hexpm", optional: true]}, {:mime, "~> 1.0 or ~> 2.0", [hex: :mime, repo: "hexpm", optional: false]}, {:mint, "~> 1.0", [hex: :mint, repo: "hexpm", optional: true]}, {:msgpax, "~> 2.3", [hex: :msgpax, repo: "hexpm", optional: true]}, {:poison, ">= 1.0.0", [hex: :poison, repo: "hexpm", optional: true]}, {:telemetry, "~> 0.4 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: true]}], "hexpm", "2e64f01ebfdb026209b47bc651a0e65203fcff4ae79c11efb73c4852b00dc313"},
+  "tesla": {:hex, :tesla, "1.8.0", "d511a4f5c5e42538d97eef7c40ec4f3e44effdc5068206f42ed859e09e51d1fd", [:mix], [{:castore, "~> 0.1 or ~> 1.0", [hex: :castore, repo: "hexpm", optional: true]}, {:exjsx, ">= 3.0.0", [hex: :exjsx, repo: "hexpm", optional: true]}, {:finch, "~> 0.13", [hex: :finch, repo: "hexpm", optional: true]}, {:fuse, "~> 2.4", [hex: :fuse, repo: "hexpm", optional: true]}, {:gun, ">= 1.0.0", [hex: :gun, repo: "hexpm", optional: true]}, {:hackney, "~> 1.6", [hex: :hackney, repo: "hexpm", optional: true]}, {:ibrowse, "4.4.2", [hex: :ibrowse, repo: "hexpm", optional: true]}, {:jason, ">= 1.0.0", [hex: :jason, repo: "hexpm", optional: true]}, {:mime, "~> 1.0 or ~> 2.0", [hex: :mime, repo: "hexpm", optional: false]}, {:mint, "~> 1.0", [hex: :mint, repo: "hexpm", optional: true]}, {:msgpax, "~> 2.3", [hex: :msgpax, repo: "hexpm", optional: true]}, {:poison, ">= 1.0.0", [hex: :poison, repo: "hexpm", optional: true]}, {:telemetry, "~> 0.4 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: true]}], "hexpm", "10501f360cd926a309501287470372af1a6e1cbed0f43949203a4c13300bc79f"},
   "timex": {:hex, :timex, "3.7.11", "bb95cb4eb1d06e27346325de506bcc6c30f9c6dea40d1ebe390b262fad1862d1", [:mix], [{:combine, "~> 0.10", [hex: :combine, repo: "hexpm", optional: false]}, {:gettext, "~> 0.20", [hex: :gettext, repo: "hexpm", optional: false]}, {:tzdata, "~> 1.1", [hex: :tzdata, repo: "hexpm", optional: false]}], "hexpm", "8b9024f7efbabaf9bd7aa04f65cf8dcd7c9818ca5737677c7b76acbc6a94d1aa"},
   "toml": {:hex, :toml, "0.6.2", "38f445df384a17e5d382befe30e3489112a48d3ba4c459e543f748c2f25dd4d1", [:mix], [], "hexpm", "d013e45126d74c0c26a38d31f5e8e9b83ea19fc752470feb9a86071ca5a672fa"},
   "tzdata": {:hex, :tzdata, "1.1.1", "20c8043476dfda8504952d00adac41c6eda23912278add38edc140ae0c5bcc46", [:mix], [{:hackney, "~> 1.17", [hex: :hackney, repo: "hexpm", optional: false]}], "hexpm", "a69cec8352eafcd2e198dea28a34113b60fdc6cb57eb5ad65c10292a6ba89787"},

From 7b0b873b1f58011992ba3cc1e95be6f6df7c4e12 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 30 Oct 2023 18:36:54 +0000
Subject: [PATCH 615/909] Bump floki from 0.35.1 to 0.35.2

Bumps [floki](https://github.com/philss/floki) from 0.35.1 to 0.35.2.
- [Release notes](https://github.com/philss/floki/releases)
- [Changelog](https://github.com/philss/floki/blob/main/CHANGELOG.md)
- [Commits](https://github.com/philss/floki/compare/v0.35.1...v0.35.2)

---
updated-dependencies:
- dependency-name: floki
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 mix.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mix.lock b/mix.lock
index 2ea41a9490b5..52c7f73b4882 100644
--- a/mix.lock
+++ b/mix.lock
@@ -60,7 +60,7 @@
   "exvcr": {:hex, :exvcr, "0.14.4", "1aa5fe7d3f10b117251c158f8d28b39f7fc73d0a7628b2d0b75bf8cfb1111576", [:mix], [{:exactor, "~> 2.2", [hex: :exactor, repo: "hexpm", optional: false]}, {:exjsx, "~> 4.0", [hex: :exjsx, repo: "hexpm", optional: false]}, {:finch, "~> 0.16", [hex: :finch, repo: "hexpm", optional: true]}, {:httpoison, "~> 1.0 or ~> 2.0", [hex: :httpoison, repo: "hexpm", optional: true]}, {:httpotion, "~> 3.1", [hex: :httpotion, repo: "hexpm", optional: true]}, {:ibrowse, "4.4.0", [hex: :ibrowse, repo: "hexpm", optional: true]}, {:meck, "~> 0.8", [hex: :meck, repo: "hexpm", optional: false]}], "hexpm", "4e600568c02ed29d46bc2e2c74927d172ba06658aa8b14705c0207363c44cc94"},
   "file_info": {:hex, :file_info, "0.0.4", "2e0e77f211e833f38ead22cb29ce53761d457d80b3ffe0ffe0eb93880b0963b2", [:mix], [{:mimetype_parser, "~> 0.1.2", [hex: :mimetype_parser, repo: "hexpm", optional: false]}], "hexpm", "50e7ad01c2c8b9339010675fe4dc4a113b8d6ca7eddce24d1d74fd0e762781a5"},
   "file_system": {:hex, :file_system, "0.2.10", "fb082005a9cd1711c05b5248710f8826b02d7d1784e7c3451f9c1231d4fc162d", [:mix], [], "hexpm", "41195edbfb562a593726eda3b3e8b103a309b733ad25f3d642ba49696bf715dc"},
-  "floki": {:hex, :floki, "0.35.1", "b21cf592ed38c1207c5ea52120a2e81d6ecba11337a633a3f29ec17a64033178", [:mix], [], "hexpm", "f126e3eb814f131c21befeeeb773d2c4e2331ce05214c1a9844a3edde5c69003"},
+  "floki": {:hex, :floki, "0.35.2", "87f8c75ed8654b9635b311774308b2760b47e9a579dabf2e4d5f1e1d42c39e0b", [:mix], [], "hexpm", "6b05289a8e9eac475f644f09c2e4ba7e19201fd002b89c28c1293e7bd16773d9"},
   "flow": {:hex, :flow, "1.2.4", "1dd58918287eb286656008777cb32714b5123d3855956f29aa141ebae456922d", [:mix], [{:gen_stage, "~> 1.0", [hex: :gen_stage, repo: "hexpm", optional: false]}], "hexpm", "874adde96368e71870f3510b91e35bc31652291858c86c0e75359cbdd35eb211"},
   "gen_stage": {:hex, :gen_stage, "1.2.1", "19d8b5e9a5996d813b8245338a28246307fd8b9c99d1237de199d21efc4c76a1", [:mix], [], "hexpm", "83e8be657fa05b992ffa6ac1e3af6d57aa50aace8f691fcf696ff02f8335b001"},
   "gettext": {:hex, :gettext, "0.23.1", "821e619a240e6000db2fc16a574ef68b3bd7fe0167ccc264a81563cc93e67a31", [:mix], [{:expo, "~> 0.4.0", [hex: :expo, repo: "hexpm", optional: false]}], "hexpm", "19d744a36b809d810d610b57c27b934425859d158ebd56561bc41f7eeb8795db"},

From 0f40aa21d5bd739d86e1491d8ad42acd28f0080a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 30 Oct 2023 18:53:56 +0000
Subject: [PATCH 616/909] Bump core-js from 3.33.1 to 3.33.2 in
 /apps/block_scout_web/assets

Bumps [core-js](https://github.com/zloirock/core-js/tree/HEAD/packages/core-js) from 3.33.1 to 3.33.2.
- [Release notes](https://github.com/zloirock/core-js/releases)
- [Changelog](https://github.com/zloirock/core-js/blob/master/CHANGELOG.md)
- [Commits](https://github.com/zloirock/core-js/commits/v3.33.2/packages/core-js)

---
updated-dependencies:
- dependency-name: core-js
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 apps/block_scout_web/assets/package-lock.json | 14 +++++++-------
 apps/block_scout_web/assets/package.json      |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/apps/block_scout_web/assets/package-lock.json b/apps/block_scout_web/assets/package-lock.json
index 7d5001bb3ec5..bd6f8b0c01c0 100644
--- a/apps/block_scout_web/assets/package-lock.json
+++ b/apps/block_scout_web/assets/package-lock.json
@@ -17,7 +17,7 @@
         "chart.js": "^4.4.0",
         "chartjs-adapter-luxon": "^1.3.1",
         "clipboard": "^2.0.11",
-        "core-js": "^3.33.1",
+        "core-js": "^3.33.2",
         "crypto-browserify": "^3.12.0",
         "dropzone": "^5.9.3",
         "eth-net-props": "^1.0.41",
@@ -5921,9 +5921,9 @@
       }
     },
     "node_modules/core-js": {
-      "version": "3.33.1",
-      "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.33.1.tgz",
-      "integrity": "sha512-qVSq3s+d4+GsqN0teRCJtM6tdEEXyWxjzbhVrCHmBS5ZTM0FS2MOS0D13dUXAWDUN6a+lHI/N1hF9Ytz6iLl9Q==",
+      "version": "3.33.2",
+      "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.33.2.tgz",
+      "integrity": "sha512-XeBzWI6QL3nJQiHmdzbAOiMYqjrb7hwU7A39Qhvd/POSa/t9E1AeZyEZx3fNvp/vtM8zXwhoL0FsiS0hD0pruQ==",
       "hasInstallScript": true,
       "funding": {
         "type": "opencollective",
@@ -22193,9 +22193,9 @@
       }
     },
     "core-js": {
-      "version": "3.33.1",
-      "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.33.1.tgz",
-      "integrity": "sha512-qVSq3s+d4+GsqN0teRCJtM6tdEEXyWxjzbhVrCHmBS5ZTM0FS2MOS0D13dUXAWDUN6a+lHI/N1hF9Ytz6iLl9Q=="
+      "version": "3.33.2",
+      "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.33.2.tgz",
+      "integrity": "sha512-XeBzWI6QL3nJQiHmdzbAOiMYqjrb7hwU7A39Qhvd/POSa/t9E1AeZyEZx3fNvp/vtM8zXwhoL0FsiS0hD0pruQ=="
     },
     "core-js-compat": {
       "version": "3.33.0",
diff --git a/apps/block_scout_web/assets/package.json b/apps/block_scout_web/assets/package.json
index 12b69fa399fa..821fb364600f 100644
--- a/apps/block_scout_web/assets/package.json
+++ b/apps/block_scout_web/assets/package.json
@@ -29,7 +29,7 @@
     "chart.js": "^4.4.0",
     "chartjs-adapter-luxon": "^1.3.1",
     "clipboard": "^2.0.11",
-    "core-js": "^3.33.1",
+    "core-js": "^3.33.2",
     "crypto-browserify": "^3.12.0",
     "dropzone": "^5.9.3",
     "eth-net-props": "^1.0.41",

From 45a956135b99b0f0f4eb4c2fb08168566909765d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 30 Oct 2023 18:54:17 +0000
Subject: [PATCH 617/909] Bump sweetalert2 from 11.7.32 to 11.9.0 in
 /apps/block_scout_web/assets

Bumps [sweetalert2](https://github.com/sweetalert2/sweetalert2) from 11.7.32 to 11.9.0.
- [Release notes](https://github.com/sweetalert2/sweetalert2/releases)
- [Changelog](https://github.com/sweetalert2/sweetalert2/blob/main/CHANGELOG.md)
- [Commits](https://github.com/sweetalert2/sweetalert2/compare/v11.7.32...v11.9.0)

---
updated-dependencies:
- dependency-name: sweetalert2
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 apps/block_scout_web/assets/package-lock.json | 14 +++++++-------
 apps/block_scout_web/assets/package.json      |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/apps/block_scout_web/assets/package-lock.json b/apps/block_scout_web/assets/package-lock.json
index 7d5001bb3ec5..ef820aee355e 100644
--- a/apps/block_scout_web/assets/package-lock.json
+++ b/apps/block_scout_web/assets/package-lock.json
@@ -61,7 +61,7 @@
         "redux": "^4.2.1",
         "stream-browserify": "^3.0.0",
         "stream-http": "^3.1.1",
-        "sweetalert2": "^11.7.32",
+        "sweetalert2": "^11.9.0",
         "urijs": "^1.19.11",
         "url": "^0.11.3",
         "util": "^0.12.5",
@@ -16070,9 +16070,9 @@
       }
     },
     "node_modules/sweetalert2": {
-      "version": "11.7.32",
-      "resolved": "https://registry.npmjs.org/sweetalert2/-/sweetalert2-11.7.32.tgz",
-      "integrity": "sha512-44tNNe2oLe7T94mT6dus4hc9G7qg6jZU/K5qZzpNS6e5HGPrSF6Kie6oZ7B5puIJydB34V2h/8f5EhIFivYo4A==",
+      "version": "11.9.0",
+      "resolved": "https://registry.npmjs.org/sweetalert2/-/sweetalert2-11.9.0.tgz",
+      "integrity": "sha512-PA3qinKZMNGAhA+AUu2wU7yQOpeZCgOaYWRcg26f4cZN6f7M9iPBuobsxOhR9EHs7ihUIxT6vhAMiB4kcmk1SA==",
       "funding": {
         "type": "individual",
         "url": "https://github.com/sponsors/limonte"
@@ -29865,9 +29865,9 @@
       }
     },
     "sweetalert2": {
-      "version": "11.7.32",
-      "resolved": "https://registry.npmjs.org/sweetalert2/-/sweetalert2-11.7.32.tgz",
-      "integrity": "sha512-44tNNe2oLe7T94mT6dus4hc9G7qg6jZU/K5qZzpNS6e5HGPrSF6Kie6oZ7B5puIJydB34V2h/8f5EhIFivYo4A=="
+      "version": "11.9.0",
+      "resolved": "https://registry.npmjs.org/sweetalert2/-/sweetalert2-11.9.0.tgz",
+      "integrity": "sha512-PA3qinKZMNGAhA+AUu2wU7yQOpeZCgOaYWRcg26f4cZN6f7M9iPBuobsxOhR9EHs7ihUIxT6vhAMiB4kcmk1SA=="
     },
     "symbol-tree": {
       "version": "3.2.4",
diff --git a/apps/block_scout_web/assets/package.json b/apps/block_scout_web/assets/package.json
index 12b69fa399fa..f08e5894ef78 100644
--- a/apps/block_scout_web/assets/package.json
+++ b/apps/block_scout_web/assets/package.json
@@ -73,7 +73,7 @@
     "redux": "^4.2.1",
     "stream-browserify": "^3.0.0",
     "stream-http": "^3.1.1",
-    "sweetalert2": "^11.7.32",
+    "sweetalert2": "^11.9.0",
     "urijs": "^1.19.11",
     "url": "^0.11.3",
     "util": "^0.12.5",

From 38e38be6c49063960eae94abe9b361df9a830acf Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 30 Oct 2023 18:54:41 +0000
Subject: [PATCH 618/909] Bump sass from 1.69.4 to 1.69.5 in
 /apps/block_scout_web/assets

Bumps [sass](https://github.com/sass/dart-sass) from 1.69.4 to 1.69.5.
- [Release notes](https://github.com/sass/dart-sass/releases)
- [Changelog](https://github.com/sass/dart-sass/blob/main/CHANGELOG.md)
- [Commits](https://github.com/sass/dart-sass/compare/1.69.4...1.69.5)

---
updated-dependencies:
- dependency-name: sass
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 apps/block_scout_web/assets/package-lock.json | 14 +++++++-------
 apps/block_scout_web/assets/package.json      |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/apps/block_scout_web/assets/package-lock.json b/apps/block_scout_web/assets/package-lock.json
index 7d5001bb3ec5..6ee4ba7fcbdf 100644
--- a/apps/block_scout_web/assets/package-lock.json
+++ b/apps/block_scout_web/assets/package-lock.json
@@ -89,7 +89,7 @@
         "mini-css-extract-plugin": "^2.7.6",
         "postcss": "^8.4.31",
         "postcss-loader": "^7.3.3",
-        "sass": "^1.69.4",
+        "sass": "^1.69.5",
         "sass-loader": "^13.3.2",
         "style-loader": "^3.3.3",
         "webpack": "^5.89.0",
@@ -15171,9 +15171,9 @@
       "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
     },
     "node_modules/sass": {
-      "version": "1.69.4",
-      "resolved": "https://registry.npmjs.org/sass/-/sass-1.69.4.tgz",
-      "integrity": "sha512-+qEreVhqAy8o++aQfCJwp0sklr2xyEzkm9Pp/Igu9wNPoe7EZEQ8X/MBvvXggI2ql607cxKg/RKOwDj6pp2XDA==",
+      "version": "1.69.5",
+      "resolved": "https://registry.npmjs.org/sass/-/sass-1.69.5.tgz",
+      "integrity": "sha512-qg2+UCJibLr2LCVOt3OlPhr/dqVHWOa9XtZf2OjbLs/T4VPSJ00udtgJxH3neXZm+QqX8B+3cU7RaLqp1iVfcQ==",
       "dev": true,
       "dependencies": {
         "chokidar": ">=3.0.0 <4.0.0",
@@ -29213,9 +29213,9 @@
       "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
     },
     "sass": {
-      "version": "1.69.4",
-      "resolved": "https://registry.npmjs.org/sass/-/sass-1.69.4.tgz",
-      "integrity": "sha512-+qEreVhqAy8o++aQfCJwp0sklr2xyEzkm9Pp/Igu9wNPoe7EZEQ8X/MBvvXggI2ql607cxKg/RKOwDj6pp2XDA==",
+      "version": "1.69.5",
+      "resolved": "https://registry.npmjs.org/sass/-/sass-1.69.5.tgz",
+      "integrity": "sha512-qg2+UCJibLr2LCVOt3OlPhr/dqVHWOa9XtZf2OjbLs/T4VPSJ00udtgJxH3neXZm+QqX8B+3cU7RaLqp1iVfcQ==",
       "dev": true,
       "requires": {
         "chokidar": ">=3.0.0 <4.0.0",
diff --git a/apps/block_scout_web/assets/package.json b/apps/block_scout_web/assets/package.json
index 12b69fa399fa..286210941942 100644
--- a/apps/block_scout_web/assets/package.json
+++ b/apps/block_scout_web/assets/package.json
@@ -101,7 +101,7 @@
     "mini-css-extract-plugin": "^2.7.6",
     "postcss": "^8.4.31",
     "postcss-loader": "^7.3.3",
-    "sass": "^1.69.4",
+    "sass": "^1.69.5",
     "sass-loader": "^13.3.2",
     "style-loader": "^3.3.3",
     "webpack": "^5.89.0",

From 240376b9eb592a342a49c4c01d99c90d0587e316 Mon Sep 17 00:00:00 2001
From: Nikita Pozdniakov <nikitosing4@mail.ru>
Date: Mon, 30 Oct 2023 23:30:28 +0300
Subject: [PATCH 619/909] Add TOKEN_INSTANCE_OWNER_MIGRATION_ENABLED env

---
 .../token_instance_owner_address_migration/supervisor.ex  | 8 +++++---
 .../token_instance_owner_address_migration/worker.ex      | 2 +-
 config/runtime.exs                                        | 3 ++-
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/apps/explorer/lib/explorer/token_instance_owner_address_migration/supervisor.ex b/apps/explorer/lib/explorer/token_instance_owner_address_migration/supervisor.ex
index 5bb8532fdf5a..01ca324f5f2d 100644
--- a/apps/explorer/lib/explorer/token_instance_owner_address_migration/supervisor.ex
+++ b/apps/explorer/lib/explorer/token_instance_owner_address_migration/supervisor.ex
@@ -5,7 +5,7 @@ defmodule Explorer.TokenInstanceOwnerAddressMigration.Supervisor do
 
   use Supervisor
 
-  alias Explorer.TokenInstanceOwnerAddressMigration.{Helper, Worker}
+  alias Explorer.TokenInstanceOwnerAddressMigration.Worker
 
   def start_link(init_arg) do
     Supervisor.start_link(__MODULE__, init_arg, name: __MODULE__)
@@ -13,9 +13,11 @@ defmodule Explorer.TokenInstanceOwnerAddressMigration.Supervisor do
 
   @impl true
   def init(_init_arg) do
-    if Helper.unfilled_token_instances_exists?() do
+    params = Application.get_env(:explorer, Explorer.TokenInstanceOwnerAddressMigration)
+
+    if params[:enabled] do
       children = [
-        {Worker, Application.get_env(:explorer, Explorer.TokenInstanceOwnerAddressMigration)}
+        {Worker, params}
       ]
 
       Supervisor.init(children, strategy: :one_for_one)
diff --git a/apps/explorer/lib/explorer/token_instance_owner_address_migration/worker.ex b/apps/explorer/lib/explorer/token_instance_owner_address_migration/worker.ex
index c0ad7c487997..c9cfabc9d2ca 100644
--- a/apps/explorer/lib/explorer/token_instance_owner_address_migration/worker.ex
+++ b/apps/explorer/lib/explorer/token_instance_owner_address_migration/worker.ex
@@ -14,7 +14,7 @@ defmodule Explorer.TokenInstanceOwnerAddressMigration.Worker do
   alias Explorer.Repo
   alias Explorer.TokenInstanceOwnerAddressMigration.Helper
 
-  def start_link(concurrency: concurrency, batch_size: batch_size) do
+  def start_link(concurrency: concurrency, batch_size: batch_size, enabled: _) do
     GenServer.start_link(__MODULE__, %{concurrency: concurrency, batch_size: batch_size}, name: __MODULE__)
   end
 
diff --git a/config/runtime.exs b/config/runtime.exs
index 6332d618d0c8..3bc5336b441e 100644
--- a/config/runtime.exs
+++ b/config/runtime.exs
@@ -433,7 +433,8 @@ config :explorer, Explorer.Chain.Cache.MinMissingBlockNumber,
 
 config :explorer, Explorer.TokenInstanceOwnerAddressMigration,
   concurrency: ConfigHelper.parse_integer_env_var("TOKEN_INSTANCE_OWNER_MIGRATION_CONCURRENCY", 5),
-  batch_size: ConfigHelper.parse_integer_env_var("TOKEN_INSTANCE_OWNER_MIGRATION_BATCH_SIZE", 50)
+  batch_size: ConfigHelper.parse_integer_env_var("TOKEN_INSTANCE_OWNER_MIGRATION_BATCH_SIZE", 50),
+  enabled: ConfigHelper.parse_bool_env_var("TOKEN_INSTANCE_OWNER_MIGRATION_ENABLED")
 
 config :explorer, Explorer.Chain.Transaction,
   rootstock_remasc_address: System.get_env("ROOTSTOCK_REMASC_ADDRESS"),

From 96743ee022abf94201c98b4277bb2dde1c2c862f Mon Sep 17 00:00:00 2001
From: Qwerty5Uiop <alex000010@bk.ru>
Date: Tue, 31 Oct 2023 12:32:17 +0600
Subject: [PATCH 620/909] Fix internal transaction error

---
 CHANGELOG.md                                             | 2 +-
 apps/indexer/lib/indexer/fetcher/internal_transaction.ex | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9d5c3f8edf61..66d9259aa873 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -34,7 +34,7 @@
 - [#8708](https://github.com/blockscout/blockscout/pull/8708) - CoinBalanceHistory tab: show also tx with gasPrice & gasUsed > 0
 - [#8706](https://github.com/blockscout/blockscout/pull/8706) - Add address name updating on contract re-verification
 - [#8705](https://github.com/blockscout/blockscout/pull/8705) - Fix sourcify enabled flag
-- [#8695](https://github.com/blockscout/blockscout/pull/8695) - Don't override internal transaction error if it's present already
+- [#8695](https://github.com/blockscout/blockscout/pull/8695), [#8755](https://github.com/blockscout/blockscout/pull/8755) - Don't override internal transaction error if it's present already
 - [#8685](https://github.com/blockscout/blockscout/pull/8685) - Fix db pool size exceeds Postgres max connections
 - [#8678](https://github.com/blockscout/blockscout/pull/8678) - Fix `is_verified` for `/addresses` and `/smart-contracts`
 
diff --git a/apps/indexer/lib/indexer/fetcher/internal_transaction.ex b/apps/indexer/lib/indexer/fetcher/internal_transaction.ex
index 7fefb5b4400b..e4726d5a3c7a 100644
--- a/apps/indexer/lib/indexer/fetcher/internal_transaction.ex
+++ b/apps/indexer/lib/indexer/fetcher/internal_transaction.ex
@@ -306,7 +306,7 @@ defmodule Indexer.Fetcher.InternalTransaction do
         |> Map.delete(:created_contract_code)
         |> Map.delete(:gas_used)
         |> Map.delete(:output)
-        |> Map.put_new(:error, failed_parent[:error])
+        |> Map.put(:error, internal_transaction_param[:error] || failed_parent[:error])
       else
         internal_transaction_param
       end

From 2d9112cff0072d6446cc5322c4db0960753f57cc Mon Sep 17 00:00:00 2001
From: Nikita Pozdniakov <nikitosing4@mail.ru>
Date: Tue, 31 Oct 2023 10:13:15 +0300
Subject: [PATCH 621/909] Changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9d5c3f8edf61..548491649a1b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,7 @@
 
 ### Fixes
 
+- [#8752](https://github.com/blockscout/blockscout/pull/8752) - Add `TOKEN_INSTANCE_OWNER_MIGRATION_ENABLED` env
 - [#8724](https://github.com/blockscout/blockscout/pull/8724) - Fix flaky account notifier test
 
 ### Chore

From 3c58526b50c108bbdb31fe696c8e71f4e6275499 Mon Sep 17 00:00:00 2001
From: Viktor Baranov <baranov.viktor.27@gmail.com>
Date: Tue, 31 Oct 2023 12:16:23 +0300
Subject: [PATCH 622/909] Gnosis safe proxy via singleton

---
 CHANGELOG.md                        | 1 +
 apps/explorer/lib/explorer/chain.ex | 9 ++++++++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 61e19994c174..bf7408a11cfd 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,7 @@
 
 ### Fixes
 
+- [#8759](https://github.com/blockscout/blockscout/pull/8759) - Gnosis safe proxy via singleton input
 - [#8752](https://github.com/blockscout/blockscout/pull/8752) - Add `TOKEN_INSTANCE_OWNER_MIGRATION_ENABLED` env
 - [#8724](https://github.com/blockscout/blockscout/pull/8724) - Fix flaky account notifier test
 
diff --git a/apps/explorer/lib/explorer/chain.ex b/apps/explorer/lib/explorer/chain.ex
index 498de42328c6..6cc7bc80a227 100644
--- a/apps/explorer/lib/explorer/chain.ex
+++ b/apps/explorer/lib/explorer/chain.ex
@@ -5700,7 +5700,7 @@ defmodule Explorer.Chain do
       |> Enum.find(fn item ->
         case item do
           {"inputs", inputs} ->
-            master_copy_input?(inputs)
+            master_copy_input?(inputs) || singleton_input?(inputs)
 
           _ ->
             false
@@ -5715,6 +5715,13 @@ defmodule Explorer.Chain do
     end)
   end
 
+  defp singleton_input?(inputs) do
+    inputs
+    |> Enum.find(fn input ->
+      Map.get(input, "name") == "_singleton"
+    end)
+  end
+
   def get_implementation_abi(implementation_address_hash_string, options \\ [])
 
   def get_implementation_abi(implementation_address_hash_string, options)

From 64309ed808cc3146d248369e948efefb56bff6e2 Mon Sep 17 00:00:00 2001
From: Viktor Baranov <baranov.viktor.27@gmail.com>
Date: Wed, 1 Nov 2023 12:31:41 +0300
Subject: [PATCH 623/909] Fix for tvl update in market history when row already
 exists

---
 CHANGELOG.md                                |  1 +
 apps/explorer/lib/explorer/market/market.ex | 70 ++++++++++++++++++++-
 2 files changed, 70 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index bf7408a11cfd..4163b44323f9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,7 @@
 
 ### Fixes
 
+- [#8765](https://github.com/blockscout/blockscout/pull/8765) - Fix for tvl update in market history when row already exists
 - [#8759](https://github.com/blockscout/blockscout/pull/8759) - Gnosis safe proxy via singleton input
 - [#8752](https://github.com/blockscout/blockscout/pull/8752) - Add `TOKEN_INSTANCE_OWNER_MIGRATION_ENABLED` env
 - [#8724](https://github.com/blockscout/blockscout/pull/8724) - Fix flaky account notifier test
diff --git a/apps/explorer/lib/explorer/market/market.ex b/apps/explorer/lib/explorer/market/market.ex
index 571f837e0fe7..5e99a147c387 100644
--- a/apps/explorer/lib/explorer/market/market.ex
+++ b/apps/explorer/lib/explorer/market/market.ex
@@ -7,6 +7,8 @@ defmodule Explorer.Market do
   alias Explorer.Market.{MarketHistory, MarketHistoryCache}
   alias Explorer.{ExchangeRates, Repo}
 
+  import Ecto.Query, only: [from: 2]
+
   @doc """
   Retrieves the history for the recent specified amount of days.
 
@@ -67,7 +69,73 @@ defmodule Explorer.Market do
       # Enforce MarketHistory ShareLocks order (see docs: sharelocks.md)
       |> Enum.sort_by(& &1.date)
 
-    Repo.insert_all(MarketHistory, records_without_zeroes, on_conflict: :nothing, conflict_target: [:date])
+    Repo.insert_all(MarketHistory, records_without_zeroes,
+      on_conflict: market_history_on_conflict(),
+      conflict_target: [:date]
+    )
+  end
+
+  defp market_history_on_conflict do
+    from(
+      market_history in MarketHistory,
+      update: [
+        set: [
+          opening_price:
+            fragment(
+              """
+              CASE WHEN (? IS NULL OR ? = 0) AND EXCLUDED.opening_price IS NOT NULL AND EXCLUDED.opening_price > 0
+              THEN EXCLUDED.opening_price
+              ELSE ?
+              END
+              """,
+              market_history.opening_price,
+              market_history.opening_price,
+              market_history.opening_price
+            ),
+          closing_price:
+            fragment(
+              """
+              CASE WHEN (? IS NULL OR ? = 0) AND EXCLUDED.closing_price IS NOT NULL AND EXCLUDED.closing_price > 0
+              THEN EXCLUDED.closing_price
+              ELSE ?
+              END
+              """,
+              market_history.closing_price,
+              market_history.closing_price,
+              market_history.closing_price
+            ),
+          market_cap:
+            fragment(
+              """
+              CASE WHEN (? IS NULL OR ? = 0) AND EXCLUDED.market_cap IS NOT NULL AND EXCLUDED.market_cap > 0
+              THEN EXCLUDED.market_cap
+              ELSE ?
+              END
+              """,
+              market_history.market_cap,
+              market_history.market_cap,
+              market_history.market_cap
+            ),
+          tvl:
+            fragment(
+              """
+              CASE WHEN (? IS NULL OR ? = 0) AND EXCLUDED.tvl IS NOT NULL AND EXCLUDED.tvl > 0
+              THEN EXCLUDED.tvl
+              ELSE ?
+              END
+              """,
+              market_history.tvl,
+              market_history.tvl,
+              market_history.tvl
+            )
+        ]
+      ],
+      where:
+        is_nil(market_history.tvl) or market_history.tvl == 0 or is_nil(market_history.market_cap) or
+          market_history.market_cap == 0 or is_nil(market_history.opening_price) or
+          market_history.opening_price == 0 or is_nil(market_history.closing_price) or
+          market_history.closing_price == 0
+    )
   end
 
   @spec get_exchange_rate(String.t()) :: Token.t() | nil

From fbbf53cd524bb22f6fa6383a2e9ddb8eed743000 Mon Sep 17 00:00:00 2001
From: Qwerty5Uiop <alex000010@bk.ru>
Date: Tue, 7 Nov 2023 17:01:17 +0600
Subject: [PATCH 624/909] Disable catchup indexer by env

---
 CHANGELOG.md                              |  2 ++
 apps/indexer/lib/indexer/supervisor.ex    | 12 +++++++-----
 config/runtime.exs                        |  2 ++
 docker-compose/envs/common-blockscout.env |  1 +
 4 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4163b44323f9..eafd2ff4dfbd 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,8 @@
 
 ### Features
 
+- [#8795](https://github.com/blockscout/blockscout/pull/8795) - Disable catchup indexer by env
+
 ### Fixes
 
 - [#8765](https://github.com/blockscout/blockscout/pull/8765) - Fix for tvl update in market history when row already exists
diff --git a/apps/indexer/lib/indexer/supervisor.ex b/apps/indexer/lib/indexer/supervisor.ex
index 5fce739019ca..c7afebbbcee0 100644
--- a/apps/indexer/lib/indexer/supervisor.ex
+++ b/apps/indexer/lib/indexer/supervisor.ex
@@ -157,11 +157,13 @@ defmodule Indexer.Supervisor do
           %{block_fetcher: realtime_block_fetcher, subscribe_named_arguments: realtime_subscribe_named_arguments},
           [name: BlockRealtime.Supervisor]
         ]),
-        {BlockCatchup.Supervisor,
-         [
-           %{block_fetcher: block_fetcher, block_interval: block_interval, memory_monitor: memory_monitor},
-           [name: BlockCatchup.Supervisor]
-         ]},
+        configure(
+          BlockCatchup.Supervisor,
+          [
+            %{block_fetcher: block_fetcher, block_interval: block_interval, memory_monitor: memory_monitor},
+            [name: BlockCatchup.Supervisor]
+          ]
+        ),
         {Withdrawal.Supervisor, [[json_rpc_named_arguments: json_rpc_named_arguments]]}
       ]
       |> List.flatten()
diff --git a/config/runtime.exs b/config/runtime.exs
index 3bc5336b441e..2b3f4d44fcda 100644
--- a/config/runtime.exs
+++ b/config/runtime.exs
@@ -525,6 +525,8 @@ config :indexer, Indexer.Fetcher.EmptyBlocksSanitizer.Supervisor,
 config :indexer, Indexer.Block.Realtime.Supervisor,
   enabled: !ConfigHelper.parse_bool_env_var("DISABLE_REALTIME_INDEXER")
 
+config :indexer, Indexer.Block.Catchup.Supervisor, enabled: !ConfigHelper.parse_bool_env_var("DISABLE_CATCHUP_INDEXER")
+
 config :indexer, Indexer.Fetcher.TokenInstance.Realtime.Supervisor,
   disabled?: ConfigHelper.parse_bool_env_var("INDEXER_DISABLE_TOKEN_INSTANCE_REALTIME_FETCHER")
 
diff --git a/docker-compose/envs/common-blockscout.env b/docker-compose/envs/common-blockscout.env
index 3b5ae9a7d212..7bf3c41a56ca 100644
--- a/docker-compose/envs/common-blockscout.env
+++ b/docker-compose/envs/common-blockscout.env
@@ -99,6 +99,7 @@ API_V1_READ_METHODS_DISABLED=false
 API_V1_WRITE_METHODS_DISABLED=false
 DISABLE_INDEXER=false
 DISABLE_REALTIME_INDEXER=false
+DISABLE_CATCHUP_INDEXER=false
 INDEXER_DISABLE_TOKEN_INSTANCE_REALTIME_FETCHER=false
 INDEXER_DISABLE_TOKEN_INSTANCE_RETRY_FETCHER=false
 INDEXER_DISABLE_TOKEN_INSTANCE_SANITIZE_FETCHER=false

From f89d29b478dc68f82512f81c4828cf0a11249b61 Mon Sep 17 00:00:00 2001
From: varasev <33550681+varasev@users.noreply.github.com>
Date: Wed, 8 Nov 2023 09:56:45 +0300
Subject: [PATCH 625/909] Fix Indexer.Transform.Addresses for non-Suave setup
 (#8784)

* Fix Indexer.Transform.Addresses for non-Suave setup

* Update changelog

* Fix bin/install_chrome_headless.sh

* Fix bin/install_chrome_headless.sh

* Rename Explorer.Token.MetadataRetrieverTest

* Reset GA cache

* Fix test in InstanceMetadataRetrieverTest

---------

Co-authored-by: POA <33550681+poa@users.noreply.github.com>
Co-authored-by: Viktor Baranov <baranov.viktor.27@gmail.com>
---
 .github/workflows/config.yml                  | 28 +++++++++----------
 CHANGELOG.md                                  |  1 +
 .../instance_metadata_retriever_test.exs      |  4 +--
 .../lib/indexer/transform/addresses.ex        |  4 ++-
 bin/install_chrome_headless.sh                |  4 +--
 5 files changed, 22 insertions(+), 19 deletions(-)

diff --git a/.github/workflows/config.yml b/.github/workflows/config.yml
index 497c5005104d..75e35d9df679 100644
--- a/.github/workflows/config.yml
+++ b/.github/workflows/config.yml
@@ -55,7 +55,7 @@ jobs:
           path: |
             deps
             _build
-          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_24-${{ hashFiles('mix.lock') }}
+          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_25-${{ hashFiles('mix.lock') }}
           restore-keys: |
             ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-
 
@@ -113,7 +113,7 @@ jobs:
           path: |
             deps
             _build
-          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_24-${{ hashFiles('mix.lock') }}
+          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_25-${{ hashFiles('mix.lock') }}
           restore-keys: |
             ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-"
 
@@ -137,7 +137,7 @@ jobs:
           path: |
             deps
             _build
-          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_24-${{ hashFiles('mix.lock') }}
+          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_25-${{ hashFiles('mix.lock') }}
           restore-keys: |
             ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-"
 
@@ -160,7 +160,7 @@ jobs:
           path: |
             deps
             _build
-          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_24-${{ hashFiles('mix.lock') }}
+          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_25-${{ hashFiles('mix.lock') }}
           restore-keys: |
             ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-"
 
@@ -169,7 +169,7 @@ jobs:
         id: dialyzer-cache
         with:
           path: priv/plts
-          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-dialyzer-mixlockhash_24-${{ hashFiles('mix.lock') }}
+          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-dialyzer-mixlockhash_25-${{ hashFiles('mix.lock') }}
           restore-keys: |
             ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-dialyzer-"
 
@@ -200,7 +200,7 @@ jobs:
           path: |
             deps
             _build
-          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_24-${{ hashFiles('mix.lock') }}
+          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_25-${{ hashFiles('mix.lock') }}
           restore-keys: |
             ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-"
 
@@ -226,7 +226,7 @@ jobs:
           path: |
             deps
             _build
-          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_24-${{ hashFiles('mix.lock') }}
+          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_25-${{ hashFiles('mix.lock') }}
           restore-keys: |
             ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-"
 
@@ -255,7 +255,7 @@ jobs:
           path: |
             deps
             _build
-          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_24-${{ hashFiles('mix.lock') }}
+          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_25-${{ hashFiles('mix.lock') }}
           restore-keys: |
             ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-"
 
@@ -303,7 +303,7 @@ jobs:
           path: |
             deps
             _build
-          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_24-${{ hashFiles('mix.lock') }}
+          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_25-${{ hashFiles('mix.lock') }}
           restore-keys: |
             ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-"
 
@@ -349,7 +349,7 @@ jobs:
           path: |
             deps
             _build
-          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_24-${{ hashFiles('mix.lock') }}
+          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_25-${{ hashFiles('mix.lock') }}
           restore-keys: |
             ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-"
 
@@ -406,7 +406,7 @@ jobs:
           path: |
             deps
             _build
-          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_24-${{ hashFiles('mix.lock') }}
+          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_25-${{ hashFiles('mix.lock') }}
           restore-keys: |
             ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-"
 
@@ -460,7 +460,7 @@ jobs:
           path: |
             deps
             _build
-          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_24-${{ hashFiles('mix.lock') }}
+          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_25-${{ hashFiles('mix.lock') }}
           restore-keys: |
             ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-"
 
@@ -525,7 +525,7 @@ jobs:
           path: |
             deps
             _build
-          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_24-${{ hashFiles('mix.lock') }}
+          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_25-${{ hashFiles('mix.lock') }}
           restore-keys: |
             ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-"
 
@@ -589,7 +589,7 @@ jobs:
           path: |
             deps
             _build
-          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_24-${{ hashFiles('mix.lock') }}
+          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_25-${{ hashFiles('mix.lock') }}
           restore-keys: |
             ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-"
 
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4163b44323f9..0f832e0e733b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,7 @@
 
 ### Fixes
 
+- [#8784](https://github.com/blockscout/blockscout/pull/8784) - Fix Indexer.Transform.Addresses for non-Suave setup
 - [#8765](https://github.com/blockscout/blockscout/pull/8765) - Fix for tvl update in market history when row already exists
 - [#8759](https://github.com/blockscout/blockscout/pull/8759) - Gnosis safe proxy via singleton input
 - [#8752](https://github.com/blockscout/blockscout/pull/8752) - Add `TOKEN_INSTANCE_OWNER_MIGRATION_ENABLED` env
diff --git a/apps/explorer/test/explorer/token/instance_metadata_retriever_test.exs b/apps/explorer/test/explorer/token/instance_metadata_retriever_test.exs
index a9255d04c796..d1d48cc65452 100644
--- a/apps/explorer/test/explorer/token/instance_metadata_retriever_test.exs
+++ b/apps/explorer/test/explorer/token/instance_metadata_retriever_test.exs
@@ -1,4 +1,4 @@
-defmodule Explorer.Token.MetadataRetrieverTest do
+defmodule Explorer.Token.InstanceMetadataRetrieverTest do
   use EthereumJSONRPC.Case
 
   alias Indexer.Fetcher.TokenInstance.MetadataRetriever
@@ -342,7 +342,7 @@ defmodule Explorer.Token.MetadataRetrieverTest do
         {:error,
          "(3) execution reverted: Nonexistent token (0x08c379a0000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000114e6f6e6578697374656e7420746f6b656e000000000000000000000000000000)"}
 
-      assert {:ok, %{error: "VM execution error"}} == MetadataRetriever.fetch_json(data)
+      assert {:error, "VM execution error"} == MetadataRetriever.fetch_json(data)
     end
 
     test "Process CIDv0 IPFS links" do
diff --git a/apps/indexer/lib/indexer/transform/addresses.ex b/apps/indexer/lib/indexer/transform/addresses.ex
index bd31681200da..5e3a0e227999 100644
--- a/apps/indexer/lib/indexer/transform/addresses.ex
+++ b/apps/indexer/lib/indexer/transform/addresses.ex
@@ -95,7 +95,9 @@ defmodule Indexer.Transform.Addresses do
       ],
       [
         %{from: :block_number, to: :fetched_coin_balance_block_number},
-        %{from: :to_address_hash, to: :hash},
+        %{from: :to_address_hash, to: :hash}
+      ],
+      [
         %{from: :execution_node_hash, to: :hash},
         %{from: :wrapped_to_address_hash, to: :hash}
       ]
diff --git a/bin/install_chrome_headless.sh b/bin/install_chrome_headless.sh
index 731ee458c8be..63f2d98a2493 100755
--- a/bin/install_chrome_headless.sh
+++ b/bin/install_chrome_headless.sh
@@ -2,8 +2,8 @@ export DISPLAY=:99.0
 sh -e /etc/init.d/xvfb start
 
 export CHROMEDRIVER_VERSION=$(curl -s "https://googlechromelabs.github.io/chrome-for-testing/last-known-good-versions.json" | jq -r '.channels' | jq -r '.Stable' | jq -r '.version')
-curl -L -O "https://edgedl.me.gvt1.com/edgedl/chrome/chrome-for-testing/${CHROMEDRIVER_VERSION}/linux64/chrome-linux64.zip"
-unzip chromedriver_linux64.zip
+curl -L -O "https://edgedl.me.gvt1.com/edgedl/chrome/chrome-for-testing/${CHROMEDRIVER_VERSION}/linux64/chromedriver-linux64.zip"
+unzip -j chromedriver-linux64.zip
 sudo chmod +x chromedriver
 sudo mv chromedriver /usr/local/bin
 wget https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb

From b2e458a6931af27cf461a184711b0ea14946d509 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 8 Nov 2023 06:58:30 +0000
Subject: [PATCH 626/909] Bump cldr_utils from 2.24.1 to 2.24.2

Bumps [cldr_utils](https://github.com/elixir-cldr/cldr_utils) from 2.24.1 to 2.24.2.
- [Release notes](https://github.com/elixir-cldr/cldr_utils/releases)
- [Changelog](https://github.com/elixir-cldr/cldr_utils/blob/master/CHANGELOG.md)
- [Commits](https://github.com/elixir-cldr/cldr_utils/compare/v2.24.1...v2.24.2)

---
updated-dependencies:
- dependency-name: cldr_utils
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 mix.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mix.lock b/mix.lock
index 542e0271a23c..0a65fac3f9f5 100644
--- a/mix.lock
+++ b/mix.lock
@@ -15,7 +15,7 @@
   "castore": {:hex, :castore, "1.0.4", "ff4d0fb2e6411c0479b1d965a814ea6d00e51eb2f58697446e9c41a97d940b28", [:mix], [], "hexpm", "9418c1b8144e11656f0be99943db4caf04612e3eaecefb5dae9a2a87565584f8"},
   "cbor": {:hex, :cbor, "1.0.1", "39511158e8ea5a57c1fcb9639aaa7efde67129678fee49ebbda780f6f24959b0", [:mix], [], "hexpm", "5431acbe7a7908f17f6a9cd43311002836a34a8ab01876918d8cfb709cd8b6a2"},
   "certifi": {:hex, :certifi, "2.12.0", "2d1cca2ec95f59643862af91f001478c9863c2ac9cb6e2f89780bfd8de987329", [:rebar3], [], "hexpm", "ee68d85df22e554040cdb4be100f33873ac6051387baf6a8f6ce82272340ff1c"},
-  "cldr_utils": {:hex, :cldr_utils, "2.24.1", "5ff8c8c55f96666228827bcf85a23d632022def200566346545d01d15e4c30dc", [:mix], [{:castore, "~> 0.1 or ~> 1.0", [hex: :castore, repo: "hexpm", optional: true]}, {:certifi, "~> 2.5", [hex: :certifi, repo: "hexpm", optional: true]}, {:decimal, "~> 1.9 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: false]}], "hexpm", "1820300531b5b849d0bc468e5a87cd64f8f2c5191916f548cbe69b2efc203780"},
+  "cldr_utils": {:hex, :cldr_utils, "2.24.2", "364fa30be55d328e704629568d431eb74cd2f085752b27f8025520b566352859", [:mix], [{:castore, "~> 0.1 or ~> 1.0", [hex: :castore, repo: "hexpm", optional: true]}, {:certifi, "~> 2.5", [hex: :certifi, repo: "hexpm", optional: true]}, {:decimal, "~> 1.9 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: false]}], "hexpm", "3362b838836a9f0fa309de09a7127e36e67310e797d556db92f71b548832c7cf"},
   "cloak": {:hex, :cloak, "1.1.2", "7e0006c2b0b98d976d4f559080fabefd81f0e0a50a3c4b621f85ceeb563e80bb", [:mix], [{:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}], "hexpm", "940d5ac4fcd51b252930fd112e319ea5ae6ab540b722f3ca60a85666759b9585"},
   "cloak_ecto": {:hex, :cloak_ecto, "1.2.0", "e86a3df3bf0dc8980f70406bcb0af2858bac247d55494d40bc58a152590bd402", [:mix], [{:cloak, "~> 1.1.1", [hex: :cloak, repo: "hexpm", optional: false]}, {:ecto, "~> 3.0", [hex: :ecto, repo: "hexpm", optional: false]}], "hexpm", "8bcc677185c813fe64b786618bd6689b1707b35cd95acaae0834557b15a0c62f"},
   "coerce": {:hex, :coerce, "1.0.1", "211c27386315dc2894ac11bc1f413a0e38505d808153367bd5c6e75a4003d096", [:mix], [], "hexpm", "b44a691700f7a1a15b4b7e2ff1fa30bebd669929ac8aa43cffe9e2f8bf051cf1"},

From 4bb4552c0cd44ebafa987a53997ed47e1c43d4bd Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 8 Nov 2023 06:59:13 +0000
Subject: [PATCH 627/909] Bump eslint from 8.52.0 to 8.53.0 in
 /apps/block_scout_web/assets

Bumps [eslint](https://github.com/eslint/eslint) from 8.52.0 to 8.53.0.
- [Release notes](https://github.com/eslint/eslint/releases)
- [Changelog](https://github.com/eslint/eslint/blob/main/CHANGELOG.md)
- [Commits](https://github.com/eslint/eslint/compare/v8.52.0...v8.53.0)

---
updated-dependencies:
- dependency-name: eslint
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 apps/block_scout_web/assets/package-lock.json | 58 +++++++++----------
 apps/block_scout_web/assets/package.json      |  2 +-
 2 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/apps/block_scout_web/assets/package-lock.json b/apps/block_scout_web/assets/package-lock.json
index 859a02067788..182812353e9b 100644
--- a/apps/block_scout_web/assets/package-lock.json
+++ b/apps/block_scout_web/assets/package-lock.json
@@ -78,7 +78,7 @@
         "copy-webpack-plugin": "^11.0.0",
         "css-loader": "^6.8.1",
         "css-minimizer-webpack-plugin": "^5.0.1",
-        "eslint": "^8.52.0",
+        "eslint": "^8.53.0",
         "eslint-config-standard": "^17.1.0",
         "eslint-plugin-import": "^2.29.0",
         "eslint-plugin-node": "^11.1.0",
@@ -2038,9 +2038,9 @@
       }
     },
     "node_modules/@eslint/eslintrc": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.1.2.tgz",
-      "integrity": "sha512-+wvgpDsrB1YqAMdEUCcnTlpfVBH7Vqn6A/NT3D8WVXFIaKMlErPIZT3oCIAVCOtarRpMtelZLqJeU3t7WY6X6g==",
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.1.3.tgz",
+      "integrity": "sha512-yZzuIG+jnVu6hNSzFEN07e8BxF3uAzYtQb6uDkaYZLo6oYZDCq454c5kB8zxnzfCYyP4MIuyBn10L0DqwujTmA==",
       "dev": true,
       "dependencies": {
         "ajv": "^6.12.4",
@@ -2067,9 +2067,9 @@
       "dev": true
     },
     "node_modules/@eslint/eslintrc/node_modules/globals": {
-      "version": "13.21.0",
-      "resolved": "https://registry.npmjs.org/globals/-/globals-13.21.0.tgz",
-      "integrity": "sha512-ybyme3s4yy/t/3s35bewwXKOf7cvzfreG2lH0lZl0JB7I4GxRP2ghxOK/Nb9EkRXdbBXZLfq/p/0W2JUONB/Gg==",
+      "version": "13.23.0",
+      "resolved": "https://registry.npmjs.org/globals/-/globals-13.23.0.tgz",
+      "integrity": "sha512-XAmF0RjlrjY23MA51q3HltdlGxUpXPvg0GioKiD9X6HD28iMjo2dKC8Vqwm7lne4GNr78+RHTfliktR6ZH09wA==",
       "dev": true,
       "dependencies": {
         "type-fest": "^0.20.2"
@@ -2106,9 +2106,9 @@
       }
     },
     "node_modules/@eslint/js": {
-      "version": "8.52.0",
-      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.52.0.tgz",
-      "integrity": "sha512-mjZVbpaeMZludF2fsWLD0Z9gCref1Tk4i9+wddjRvpUNqqcndPkBD09N/Mapey0b3jaXbLm2kICwFv2E64QinA==",
+      "version": "8.53.0",
+      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.53.0.tgz",
+      "integrity": "sha512-Kn7K8dx/5U6+cT1yEhpX1w4PCSg0M+XyRILPgvwcEBjerFWCwQj5sbr3/VmxqV0JGHCBCzyd6LxypEuehypY1w==",
       "dev": true,
       "engines": {
         "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
@@ -7290,15 +7290,15 @@
       }
     },
     "node_modules/eslint": {
-      "version": "8.52.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.52.0.tgz",
-      "integrity": "sha512-zh/JHnaixqHZsolRB/w9/02akBk9EPrOs9JwcTP2ek7yL5bVvXuRariiaAjjoJ5DvuwQ1WAE/HsMz+w17YgBCg==",
+      "version": "8.53.0",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.53.0.tgz",
+      "integrity": "sha512-N4VuiPjXDUa4xVeV/GC/RV3hQW9Nw+Y463lkWaKKXKYMvmRiRDAtfpuPFLN+E1/6ZhyR8J2ig+eVREnYgUsiag==",
       "dev": true,
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.2.0",
         "@eslint-community/regexpp": "^4.6.1",
-        "@eslint/eslintrc": "^2.1.2",
-        "@eslint/js": "8.52.0",
+        "@eslint/eslintrc": "^2.1.3",
+        "@eslint/js": "8.53.0",
         "@humanwhocodes/config-array": "^0.11.13",
         "@humanwhocodes/module-importer": "^1.0.1",
         "@nodelib/fs.walk": "^1.2.8",
@@ -19219,9 +19219,9 @@
       "dev": true
     },
     "@eslint/eslintrc": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.1.2.tgz",
-      "integrity": "sha512-+wvgpDsrB1YqAMdEUCcnTlpfVBH7Vqn6A/NT3D8WVXFIaKMlErPIZT3oCIAVCOtarRpMtelZLqJeU3t7WY6X6g==",
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.1.3.tgz",
+      "integrity": "sha512-yZzuIG+jnVu6hNSzFEN07e8BxF3uAzYtQb6uDkaYZLo6oYZDCq454c5kB8zxnzfCYyP4MIuyBn10L0DqwujTmA==",
       "dev": true,
       "requires": {
         "ajv": "^6.12.4",
@@ -19242,9 +19242,9 @@
           "dev": true
         },
         "globals": {
-          "version": "13.21.0",
-          "resolved": "https://registry.npmjs.org/globals/-/globals-13.21.0.tgz",
-          "integrity": "sha512-ybyme3s4yy/t/3s35bewwXKOf7cvzfreG2lH0lZl0JB7I4GxRP2ghxOK/Nb9EkRXdbBXZLfq/p/0W2JUONB/Gg==",
+          "version": "13.23.0",
+          "resolved": "https://registry.npmjs.org/globals/-/globals-13.23.0.tgz",
+          "integrity": "sha512-XAmF0RjlrjY23MA51q3HltdlGxUpXPvg0GioKiD9X6HD28iMjo2dKC8Vqwm7lne4GNr78+RHTfliktR6ZH09wA==",
           "dev": true,
           "requires": {
             "type-fest": "^0.20.2"
@@ -19268,9 +19268,9 @@
       }
     },
     "@eslint/js": {
-      "version": "8.52.0",
-      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.52.0.tgz",
-      "integrity": "sha512-mjZVbpaeMZludF2fsWLD0Z9gCref1Tk4i9+wddjRvpUNqqcndPkBD09N/Mapey0b3jaXbLm2kICwFv2E64QinA==",
+      "version": "8.53.0",
+      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.53.0.tgz",
+      "integrity": "sha512-Kn7K8dx/5U6+cT1yEhpX1w4PCSg0M+XyRILPgvwcEBjerFWCwQj5sbr3/VmxqV0JGHCBCzyd6LxypEuehypY1w==",
       "dev": true
     },
     "@ethereumjs/common": {
@@ -23228,15 +23228,15 @@
       }
     },
     "eslint": {
-      "version": "8.52.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.52.0.tgz",
-      "integrity": "sha512-zh/JHnaixqHZsolRB/w9/02akBk9EPrOs9JwcTP2ek7yL5bVvXuRariiaAjjoJ5DvuwQ1WAE/HsMz+w17YgBCg==",
+      "version": "8.53.0",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.53.0.tgz",
+      "integrity": "sha512-N4VuiPjXDUa4xVeV/GC/RV3hQW9Nw+Y463lkWaKKXKYMvmRiRDAtfpuPFLN+E1/6ZhyR8J2ig+eVREnYgUsiag==",
       "dev": true,
       "requires": {
         "@eslint-community/eslint-utils": "^4.2.0",
         "@eslint-community/regexpp": "^4.6.1",
-        "@eslint/eslintrc": "^2.1.2",
-        "@eslint/js": "8.52.0",
+        "@eslint/eslintrc": "^2.1.3",
+        "@eslint/js": "8.53.0",
         "@humanwhocodes/config-array": "^0.11.13",
         "@humanwhocodes/module-importer": "^1.0.1",
         "@nodelib/fs.walk": "^1.2.8",
diff --git a/apps/block_scout_web/assets/package.json b/apps/block_scout_web/assets/package.json
index b2ad77b9301e..34655e1073c2 100644
--- a/apps/block_scout_web/assets/package.json
+++ b/apps/block_scout_web/assets/package.json
@@ -90,7 +90,7 @@
     "copy-webpack-plugin": "^11.0.0",
     "css-loader": "^6.8.1",
     "css-minimizer-webpack-plugin": "^5.0.1",
-    "eslint": "^8.52.0",
+    "eslint": "^8.53.0",
     "eslint-config-standard": "^17.1.0",
     "eslint-plugin-import": "^2.29.0",
     "eslint-plugin-node": "^11.1.0",

From 9d8d8a28b56883ea92ac03b8ae1fa10ce6ccd95f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 8 Nov 2023 06:59:33 +0000
Subject: [PATCH 628/909] Bump ex_cldr_numbers from 2.32.2 to 2.32.3

Bumps [ex_cldr_numbers](https://github.com/elixir-cldr/cldr_numbers) from 2.32.2 to 2.32.3.
- [Release notes](https://github.com/elixir-cldr/cldr_numbers/releases)
- [Changelog](https://github.com/elixir-cldr/cldr_numbers/blob/main/CHANGELOG.md)
- [Commits](https://github.com/elixir-cldr/cldr_numbers/compare/v2.32.2...v2.32.3)

---
updated-dependencies:
- dependency-name: ex_cldr_numbers
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 mix.lock | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/mix.lock b/mix.lock
index 542e0271a23c..5e57591e369c 100644
--- a/mix.lock
+++ b/mix.lock
@@ -15,7 +15,7 @@
   "castore": {:hex, :castore, "1.0.4", "ff4d0fb2e6411c0479b1d965a814ea6d00e51eb2f58697446e9c41a97d940b28", [:mix], [], "hexpm", "9418c1b8144e11656f0be99943db4caf04612e3eaecefb5dae9a2a87565584f8"},
   "cbor": {:hex, :cbor, "1.0.1", "39511158e8ea5a57c1fcb9639aaa7efde67129678fee49ebbda780f6f24959b0", [:mix], [], "hexpm", "5431acbe7a7908f17f6a9cd43311002836a34a8ab01876918d8cfb709cd8b6a2"},
   "certifi": {:hex, :certifi, "2.12.0", "2d1cca2ec95f59643862af91f001478c9863c2ac9cb6e2f89780bfd8de987329", [:rebar3], [], "hexpm", "ee68d85df22e554040cdb4be100f33873ac6051387baf6a8f6ce82272340ff1c"},
-  "cldr_utils": {:hex, :cldr_utils, "2.24.1", "5ff8c8c55f96666228827bcf85a23d632022def200566346545d01d15e4c30dc", [:mix], [{:castore, "~> 0.1 or ~> 1.0", [hex: :castore, repo: "hexpm", optional: true]}, {:certifi, "~> 2.5", [hex: :certifi, repo: "hexpm", optional: true]}, {:decimal, "~> 1.9 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: false]}], "hexpm", "1820300531b5b849d0bc468e5a87cd64f8f2c5191916f548cbe69b2efc203780"},
+  "cldr_utils": {:hex, :cldr_utils, "2.24.2", "364fa30be55d328e704629568d431eb74cd2f085752b27f8025520b566352859", [:mix], [{:castore, "~> 0.1 or ~> 1.0", [hex: :castore, repo: "hexpm", optional: true]}, {:certifi, "~> 2.5", [hex: :certifi, repo: "hexpm", optional: true]}, {:decimal, "~> 1.9 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: false]}], "hexpm", "3362b838836a9f0fa309de09a7127e36e67310e797d556db92f71b548832c7cf"},
   "cloak": {:hex, :cloak, "1.1.2", "7e0006c2b0b98d976d4f559080fabefd81f0e0a50a3c4b621f85ceeb563e80bb", [:mix], [{:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}], "hexpm", "940d5ac4fcd51b252930fd112e319ea5ae6ab540b722f3ca60a85666759b9585"},
   "cloak_ecto": {:hex, :cloak_ecto, "1.2.0", "e86a3df3bf0dc8980f70406bcb0af2858bac247d55494d40bc58a152590bd402", [:mix], [{:cloak, "~> 1.1.1", [hex: :cloak, repo: "hexpm", optional: false]}, {:ecto, "~> 3.0", [hex: :ecto, repo: "hexpm", optional: false]}], "hexpm", "8bcc677185c813fe64b786618bd6689b1707b35cd95acaae0834557b15a0c62f"},
   "coerce": {:hex, :coerce, "1.0.1", "211c27386315dc2894ac11bc1f413a0e38505d808153367bd5c6e75a4003d096", [:mix], [], "hexpm", "b44a691700f7a1a15b4b7e2ff1fa30bebd669929ac8aa43cffe9e2f8bf051cf1"},
@@ -42,10 +42,10 @@
   "elixir_make": {:hex, :elixir_make, "0.7.7", "7128c60c2476019ed978210c245badf08b03dbec4f24d05790ef791da11aa17c", [:mix], [{:castore, "~> 0.1 or ~> 1.0", [hex: :castore, repo: "hexpm", optional: true]}], "hexpm", "5bc19fff950fad52bbe5f211b12db9ec82c6b34a9647da0c2224b8b8464c7e6c"},
   "erlex": {:hex, :erlex, "0.2.6", "c7987d15e899c7a2f34f5420d2a2ea0d659682c06ac607572df55a43753aa12e", [:mix], [], "hexpm", "2ed2e25711feb44d52b17d2780eabf998452f6efda104877a3881c2f8c0c0c75"},
   "ex_abi": {:hex, :ex_abi, "0.6.3", "e16f232346badc9f03a459cea7113ad4cff28dd2faf36f5635eaa01d5e903d7c", [:mix], [{:ex_keccak, "~> 0.7.3", [hex: :ex_keccak, repo: "hexpm", optional: false]}, {:jason, "~> 1.4", [hex: :jason, repo: "hexpm", optional: false]}], "hexpm", "bd1bcbe1d4fac14b90aa132fa54690b36d26e11e3777b755623bf32e66caef85"},
-  "ex_cldr": {:hex, :ex_cldr, "2.37.4", "3e2c04d9c691a75a8b7e808dfcbacedb9cdf3e73f819d1b4174f8f065e5f29c1", [:mix], [{:cldr_utils, "~> 2.21", [hex: :cldr_utils, repo: "hexpm", optional: false]}, {:decimal, "~> 1.6 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: false]}, {:gettext, "~> 0.19", [hex: :gettext, repo: "hexpm", optional: true]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}, {:nimble_parsec, "~> 0.5 or ~> 1.0", [hex: :nimble_parsec, repo: "hexpm", optional: true]}], "hexpm", "2bcb5de0095324ba645b4e156bf346add156d8b928f0ffd985c61664d981ad3d"},
-  "ex_cldr_currencies": {:hex, :ex_cldr_currencies, "2.15.0", "aadd34e91cfac7ef6b03fe8f47f8c6fa8c5daf3f89b5d9fee64ec545ded839cf", [:mix], [{:ex_cldr, "~> 2.34", [hex: :ex_cldr, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}], "hexpm", "0521316396c66877a2d636219767560bb2397c583341fcb154ecf9f3000e6ff8"},
+  "ex_cldr": {:hex, :ex_cldr, "2.37.5", "9da6d97334035b961d2c2de167dc6af8cd3e09859301a5b8f49f90bd8b034593", [:mix], [{:cldr_utils, "~> 2.21", [hex: :cldr_utils, repo: "hexpm", optional: false]}, {:decimal, "~> 1.6 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: false]}, {:gettext, "~> 0.19", [hex: :gettext, repo: "hexpm", optional: true]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}, {:nimble_parsec, "~> 0.5 or ~> 1.0", [hex: :nimble_parsec, repo: "hexpm", optional: true]}], "hexpm", "74ad5ddff791112ce4156382e171a5f5d3766af9d5c4675e0571f081fe136479"},
+  "ex_cldr_currencies": {:hex, :ex_cldr_currencies, "2.15.1", "e92ba17c41e7405b7784e0e65f406b5f17cfe313e0e70de9befd653e12854822", [:mix], [{:ex_cldr, "~> 2.34", [hex: :ex_cldr, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}], "hexpm", "31df8bd37688340f8819bdd770eb17d659652078d34db632b85d4a32864d6a25"},
   "ex_cldr_lists": {:hex, :ex_cldr_lists, "2.10.1", "67795eb28f8534a36cbdfeeaea6d3ee587eeac7eafff71968dd046c215d4ec42", [:mix], [{:ex_cldr_numbers, "~> 2.25", [hex: :ex_cldr_numbers, repo: "hexpm", optional: false]}, {:ex_doc, "~> 0.18", [hex: :ex_doc, repo: "hexpm", optional: true]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}], "hexpm", "da826148d95c7a1889fd847ae5704c141747bad43a5a44431ae97bced57b0f93"},
-  "ex_cldr_numbers": {:hex, :ex_cldr_numbers, "2.32.2", "5e0e3031d3f54b51fe7078a7a94592987b70b06d631bdc88813b222dc5a8b1bd", [:mix], [{:decimal, "~> 1.6 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: false]}, {:digital_token, "~> 0.3 or ~> 1.0", [hex: :digital_token, repo: "hexpm", optional: false]}, {:ex_cldr, "~> 2.37", [hex: :ex_cldr, repo: "hexpm", optional: false]}, {:ex_cldr_currencies, ">= 2.14.2", [hex: :ex_cldr_currencies, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}], "hexpm", "91257684a9c4d6abdf738f0cc5671837de876e69552e8bd4bc5fa1bfd5817713"},
+  "ex_cldr_numbers": {:hex, :ex_cldr_numbers, "2.32.3", "b631ff94c982ec518e46bf4736000a30a33d6b58facc085d5f240305f512ad4a", [:mix], [{:decimal, "~> 1.6 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: false]}, {:digital_token, "~> 0.3 or ~> 1.0", [hex: :digital_token, repo: "hexpm", optional: false]}, {:ex_cldr, "~> 2.37", [hex: :ex_cldr, repo: "hexpm", optional: false]}, {:ex_cldr_currencies, ">= 2.14.2", [hex: :ex_cldr_currencies, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}], "hexpm", "7b626ff1e59a0ec9c3c5db5ce9ca91a6995e2ab56426b71f3cbf67181ea225f5"},
   "ex_cldr_units": {:hex, :ex_cldr_units, "3.16.3", "41344ed9f6d5c69baeb4d13dadc80310ca511626f738af2e69ae53dd40fb28a5", [:mix], [{:cldr_utils, "~> 2.24", [hex: :cldr_utils, repo: "hexpm", optional: false]}, {:decimal, "~> 1.6 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: false]}, {:ex_cldr_lists, "~> 2.10", [hex: :ex_cldr_lists, repo: "hexpm", optional: false]}, {:ex_cldr_numbers, "~> 2.31", [hex: :ex_cldr_numbers, repo: "hexpm", optional: false]}, {:ex_doc, "~> 0.18", [hex: :ex_doc, repo: "hexpm", optional: true]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}], "hexpm", "889dd56084821723ce82c4639d62cfc3513a9ca1ffb9063bcc83e7b3de5bc35b"},
   "ex_doc": {:hex, :ex_doc, "0.30.9", "d691453495c47434c0f2052b08dd91cc32bc4e1a218f86884563448ee2502dd2", [:mix], [{:earmark_parser, "~> 1.4.31", [hex: :earmark_parser, repo: "hexpm", optional: false]}, {:makeup_elixir, "~> 0.14", [hex: :makeup_elixir, repo: "hexpm", optional: false]}, {:makeup_erlang, "~> 0.1", [hex: :makeup_erlang, repo: "hexpm", optional: false]}], "hexpm", "d7aaaf21e95dc5cddabf89063327e96867d00013963eadf2c6ad135506a8bc10"},
   "ex_json_schema": {:hex, :ex_json_schema, "0.10.1", "e03b746b6675a750c0bb1a5cc919f61353f7ab8450977e11ceede20e6180c560", [:mix], [{:decimal, "~> 2.0", [hex: :decimal, repo: "hexpm", optional: false]}], "hexpm", "66a64e60dadad89914d92f89c7e7906c57de75a8b79ac2480d0d53e1b8096fb0"},

From dadb52ec7dabe9da759077393ff738df94fda2bc Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 8 Nov 2023 07:16:25 +0000
Subject: [PATCH 629/909] Bump ex_abi from 0.6.3 to 0.6.4

Bumps [ex_abi](https://github.com/poanetwork/ex_abi) from 0.6.3 to 0.6.4.
- [Release notes](https://github.com/poanetwork/ex_abi/releases)
- [Changelog](https://github.com/poanetwork/ex_abi/blob/master/CHANGELOG.md)
- [Commits](https://github.com/poanetwork/ex_abi/compare/0.6.3...0.6.4)

---
updated-dependencies:
- dependency-name: ex_abi
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 mix.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mix.lock b/mix.lock
index 5e57591e369c..bdec56fbac9a 100644
--- a/mix.lock
+++ b/mix.lock
@@ -41,7 +41,7 @@
   "ecto_sql": {:hex, :ecto_sql, "3.10.2", "6b98b46534b5c2f8b8b5f03f126e75e2a73c64f3c071149d32987a5378b0fdbd", [:mix], [{:db_connection, "~> 2.5 or ~> 2.4.1", [hex: :db_connection, repo: "hexpm", optional: false]}, {:ecto, "~> 3.10.0", [hex: :ecto, repo: "hexpm", optional: false]}, {:myxql, "~> 0.6.0", [hex: :myxql, repo: "hexpm", optional: true]}, {:postgrex, "~> 0.16.0 or ~> 0.17.0 or ~> 1.0", [hex: :postgrex, repo: "hexpm", optional: true]}, {:tds, "~> 2.1.1 or ~> 2.2", [hex: :tds, repo: "hexpm", optional: true]}, {:telemetry, "~> 0.4.0 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "68c018debca57cb9235e3889affdaec7a10616a4e3a80c99fa1d01fdafaa9007"},
   "elixir_make": {:hex, :elixir_make, "0.7.7", "7128c60c2476019ed978210c245badf08b03dbec4f24d05790ef791da11aa17c", [:mix], [{:castore, "~> 0.1 or ~> 1.0", [hex: :castore, repo: "hexpm", optional: true]}], "hexpm", "5bc19fff950fad52bbe5f211b12db9ec82c6b34a9647da0c2224b8b8464c7e6c"},
   "erlex": {:hex, :erlex, "0.2.6", "c7987d15e899c7a2f34f5420d2a2ea0d659682c06ac607572df55a43753aa12e", [:mix], [], "hexpm", "2ed2e25711feb44d52b17d2780eabf998452f6efda104877a3881c2f8c0c0c75"},
-  "ex_abi": {:hex, :ex_abi, "0.6.3", "e16f232346badc9f03a459cea7113ad4cff28dd2faf36f5635eaa01d5e903d7c", [:mix], [{:ex_keccak, "~> 0.7.3", [hex: :ex_keccak, repo: "hexpm", optional: false]}, {:jason, "~> 1.4", [hex: :jason, repo: "hexpm", optional: false]}], "hexpm", "bd1bcbe1d4fac14b90aa132fa54690b36d26e11e3777b755623bf32e66caef85"},
+  "ex_abi": {:hex, :ex_abi, "0.6.4", "f722a38298f176dab511cf94627b2815282669255bc2eb834674f23ca71f5cfb", [:mix], [{:ex_keccak, "~> 0.7.3", [hex: :ex_keccak, repo: "hexpm", optional: false]}, {:jason, "~> 1.4", [hex: :jason, repo: "hexpm", optional: false]}], "hexpm", "07eaf39b70dd3beac1286c10368d27091a9a64844830eb26a38f1c8d8b19dfbb"},
   "ex_cldr": {:hex, :ex_cldr, "2.37.5", "9da6d97334035b961d2c2de167dc6af8cd3e09859301a5b8f49f90bd8b034593", [:mix], [{:cldr_utils, "~> 2.21", [hex: :cldr_utils, repo: "hexpm", optional: false]}, {:decimal, "~> 1.6 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: false]}, {:gettext, "~> 0.19", [hex: :gettext, repo: "hexpm", optional: true]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}, {:nimble_parsec, "~> 0.5 or ~> 1.0", [hex: :nimble_parsec, repo: "hexpm", optional: true]}], "hexpm", "74ad5ddff791112ce4156382e171a5f5d3766af9d5c4675e0571f081fe136479"},
   "ex_cldr_currencies": {:hex, :ex_cldr_currencies, "2.15.1", "e92ba17c41e7405b7784e0e65f406b5f17cfe313e0e70de9befd653e12854822", [:mix], [{:ex_cldr, "~> 2.34", [hex: :ex_cldr, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}], "hexpm", "31df8bd37688340f8819bdd770eb17d659652078d34db632b85d4a32864d6a25"},
   "ex_cldr_lists": {:hex, :ex_cldr_lists, "2.10.1", "67795eb28f8534a36cbdfeeaea6d3ee587eeac7eafff71968dd046c215d4ec42", [:mix], [{:ex_cldr_numbers, "~> 2.25", [hex: :ex_cldr_numbers, repo: "hexpm", optional: false]}, {:ex_doc, "~> 0.18", [hex: :ex_doc, repo: "hexpm", optional: true]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}], "hexpm", "da826148d95c7a1889fd847ae5704c141747bad43a5a44431ae97bced57b0f93"},

From af39e8955632c914615a3907b1b0cfe90964778a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 8 Nov 2023 07:28:48 +0000
Subject: [PATCH 630/909] Bump ex_cldr_units from 3.16.3 to 3.16.4

Bumps [ex_cldr_units](https://github.com/elixir-cldr/cldr_units) from 3.16.3 to 3.16.4.
- [Release notes](https://github.com/elixir-cldr/cldr_units/releases)
- [Changelog](https://github.com/elixir-cldr/cldr_units/blob/main/CHANGELOG.md)
- [Commits](https://github.com/elixir-cldr/cldr_units/compare/v3.16.3...v3.16.4)

---
updated-dependencies:
- dependency-name: ex_cldr_units
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 mix.lock | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/mix.lock b/mix.lock
index 5e57591e369c..866ba117b4f0 100644
--- a/mix.lock
+++ b/mix.lock
@@ -44,9 +44,9 @@
   "ex_abi": {:hex, :ex_abi, "0.6.3", "e16f232346badc9f03a459cea7113ad4cff28dd2faf36f5635eaa01d5e903d7c", [:mix], [{:ex_keccak, "~> 0.7.3", [hex: :ex_keccak, repo: "hexpm", optional: false]}, {:jason, "~> 1.4", [hex: :jason, repo: "hexpm", optional: false]}], "hexpm", "bd1bcbe1d4fac14b90aa132fa54690b36d26e11e3777b755623bf32e66caef85"},
   "ex_cldr": {:hex, :ex_cldr, "2.37.5", "9da6d97334035b961d2c2de167dc6af8cd3e09859301a5b8f49f90bd8b034593", [:mix], [{:cldr_utils, "~> 2.21", [hex: :cldr_utils, repo: "hexpm", optional: false]}, {:decimal, "~> 1.6 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: false]}, {:gettext, "~> 0.19", [hex: :gettext, repo: "hexpm", optional: true]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}, {:nimble_parsec, "~> 0.5 or ~> 1.0", [hex: :nimble_parsec, repo: "hexpm", optional: true]}], "hexpm", "74ad5ddff791112ce4156382e171a5f5d3766af9d5c4675e0571f081fe136479"},
   "ex_cldr_currencies": {:hex, :ex_cldr_currencies, "2.15.1", "e92ba17c41e7405b7784e0e65f406b5f17cfe313e0e70de9befd653e12854822", [:mix], [{:ex_cldr, "~> 2.34", [hex: :ex_cldr, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}], "hexpm", "31df8bd37688340f8819bdd770eb17d659652078d34db632b85d4a32864d6a25"},
-  "ex_cldr_lists": {:hex, :ex_cldr_lists, "2.10.1", "67795eb28f8534a36cbdfeeaea6d3ee587eeac7eafff71968dd046c215d4ec42", [:mix], [{:ex_cldr_numbers, "~> 2.25", [hex: :ex_cldr_numbers, repo: "hexpm", optional: false]}, {:ex_doc, "~> 0.18", [hex: :ex_doc, repo: "hexpm", optional: true]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}], "hexpm", "da826148d95c7a1889fd847ae5704c141747bad43a5a44431ae97bced57b0f93"},
+  "ex_cldr_lists": {:hex, :ex_cldr_lists, "2.10.2", "c8dbb3324ca35cea3679a96f4c774cdf4bdd425786a44c4f52aacb57a0cee446", [:mix], [{:ex_cldr_numbers, "~> 2.25", [hex: :ex_cldr_numbers, repo: "hexpm", optional: false]}, {:ex_doc, "~> 0.18", [hex: :ex_doc, repo: "hexpm", optional: true]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}], "hexpm", "0cc2124eccffa5438045c2504dd3365490b64065131f58ecc27f344db1edb4b8"},
   "ex_cldr_numbers": {:hex, :ex_cldr_numbers, "2.32.3", "b631ff94c982ec518e46bf4736000a30a33d6b58facc085d5f240305f512ad4a", [:mix], [{:decimal, "~> 1.6 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: false]}, {:digital_token, "~> 0.3 or ~> 1.0", [hex: :digital_token, repo: "hexpm", optional: false]}, {:ex_cldr, "~> 2.37", [hex: :ex_cldr, repo: "hexpm", optional: false]}, {:ex_cldr_currencies, ">= 2.14.2", [hex: :ex_cldr_currencies, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}], "hexpm", "7b626ff1e59a0ec9c3c5db5ce9ca91a6995e2ab56426b71f3cbf67181ea225f5"},
-  "ex_cldr_units": {:hex, :ex_cldr_units, "3.16.3", "41344ed9f6d5c69baeb4d13dadc80310ca511626f738af2e69ae53dd40fb28a5", [:mix], [{:cldr_utils, "~> 2.24", [hex: :cldr_utils, repo: "hexpm", optional: false]}, {:decimal, "~> 1.6 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: false]}, {:ex_cldr_lists, "~> 2.10", [hex: :ex_cldr_lists, repo: "hexpm", optional: false]}, {:ex_cldr_numbers, "~> 2.31", [hex: :ex_cldr_numbers, repo: "hexpm", optional: false]}, {:ex_doc, "~> 0.18", [hex: :ex_doc, repo: "hexpm", optional: true]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}], "hexpm", "889dd56084821723ce82c4639d62cfc3513a9ca1ffb9063bcc83e7b3de5bc35b"},
+  "ex_cldr_units": {:hex, :ex_cldr_units, "3.16.4", "fee054e9ebed40ef05cbb405cb0c7e7c9fda201f8f03ec0d1e54e879af413246", [:mix], [{:cldr_utils, "~> 2.24", [hex: :cldr_utils, repo: "hexpm", optional: false]}, {:decimal, "~> 1.6 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: false]}, {:ex_cldr_lists, "~> 2.10", [hex: :ex_cldr_lists, repo: "hexpm", optional: false]}, {:ex_cldr_numbers, "~> 2.31", [hex: :ex_cldr_numbers, repo: "hexpm", optional: false]}, {:ex_doc, "~> 0.18", [hex: :ex_doc, repo: "hexpm", optional: true]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}], "hexpm", "7c15c6357dd555a5bc6c72fdeb243e4706a04065753dbd2f40150f062ca996c7"},
   "ex_doc": {:hex, :ex_doc, "0.30.9", "d691453495c47434c0f2052b08dd91cc32bc4e1a218f86884563448ee2502dd2", [:mix], [{:earmark_parser, "~> 1.4.31", [hex: :earmark_parser, repo: "hexpm", optional: false]}, {:makeup_elixir, "~> 0.14", [hex: :makeup_elixir, repo: "hexpm", optional: false]}, {:makeup_erlang, "~> 0.1", [hex: :makeup_erlang, repo: "hexpm", optional: false]}], "hexpm", "d7aaaf21e95dc5cddabf89063327e96867d00013963eadf2c6ad135506a8bc10"},
   "ex_json_schema": {:hex, :ex_json_schema, "0.10.1", "e03b746b6675a750c0bb1a5cc919f61353f7ab8450977e11ceede20e6180c560", [:mix], [{:decimal, "~> 2.0", [hex: :decimal, repo: "hexpm", optional: false]}], "hexpm", "66a64e60dadad89914d92f89c7e7906c57de75a8b79ac2480d0d53e1b8096fb0"},
   "ex_keccak": {:hex, :ex_keccak, "0.7.3", "33298f97159f6b0acd28f6e96ce5ea975a0f4a19f85fe615b4f4579b88b24d06", [:mix], [{:rustler, ">= 0.0.0", [hex: :rustler, repo: "hexpm", optional: true]}, {:rustler_precompiled, "~> 0.6.1", [hex: :rustler_precompiled, repo: "hexpm", optional: false]}], "hexpm", "4c5e6d9d5f77b64ab48769a0166a9814180d40ced68ed74ce60a5174ab55b3fc"},

From e8ccfbbffea8ed597e3bf59772e82570b9b25419 Mon Sep 17 00:00:00 2001
From: Viktor Baranov <baranov.viktor.27@gmail.com>
Date: Wed, 1 Nov 2023 18:24:09 +0300
Subject: [PATCH 631/909] Fix for eth_getbalance API v1 endpoint when
 requesting latest tag

---
 CHANGELOG.md                                     |  1 +
 .../controllers/api/rpc/eth_controller_test.exs  |  4 +---
 apps/explorer/lib/explorer/etherscan/blocks.ex   | 16 ++++++++++------
 3 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7f9b370d63b2..05efb03eeb0b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,7 @@
 ### Fixes
 
 - [#8784](https://github.com/blockscout/blockscout/pull/8784) - Fix Indexer.Transform.Addresses for non-Suave setup
+- [#8770](https://github.com/blockscout/blockscout/pull/8770) - Fix for eth_getbalance API v1 endpoint when requesting latest tag
 - [#8765](https://github.com/blockscout/blockscout/pull/8765) - Fix for tvl update in market history when row already exists
 - [#8759](https://github.com/blockscout/blockscout/pull/8759) - Gnosis safe proxy via singleton input
 - [#8752](https://github.com/blockscout/blockscout/pull/8752) - Add `TOKEN_INSTANCE_OWNER_MIGRATION_ENABLED` env
diff --git a/apps/block_scout_web/test/block_scout_web/controllers/api/rpc/eth_controller_test.exs b/apps/block_scout_web/test/block_scout_web/controllers/api/rpc/eth_controller_test.exs
index e80a8bbc7c92..f441a173b1e2 100644
--- a/apps/block_scout_web/test/block_scout_web/controllers/api/rpc/eth_controller_test.exs
+++ b/apps/block_scout_web/test/block_scout_web/controllers/api/rpc/eth_controller_test.exs
@@ -400,9 +400,7 @@ defmodule BlockScoutWeb.API.RPC.EthControllerTest do
 
     test "with a valid address that has a balance", %{conn: conn, api_params: api_params} do
       block = insert(:block)
-      address = insert(:address)
-
-      insert(:fetched_balance, block_number: block.number, address_hash: address.hash, value: 1)
+      address = insert(:address, fetched_coin_balance: 1, fetched_coin_balance_block_number: block.number)
 
       assert response =
                conn
diff --git a/apps/explorer/lib/explorer/etherscan/blocks.ex b/apps/explorer/lib/explorer/etherscan/blocks.ex
index d7238fb7a20f..0249f46743d3 100644
--- a/apps/explorer/lib/explorer/etherscan/blocks.ex
+++ b/apps/explorer/lib/explorer/etherscan/blocks.ex
@@ -11,7 +11,7 @@ defmodule Explorer.Etherscan.Blocks do
     ]
 
   alias Explorer.{Chain, Repo}
-  alias Explorer.Chain.{Address.CoinBalance, Block, Hash, Wei}
+  alias Explorer.Chain.{Address, Address.CoinBalance, Block, Hash, Wei}
 
   @doc """
   Returns the balance of the given address and block combination.
@@ -39,12 +39,16 @@ defmodule Explorer.Etherscan.Blocks do
   end
 
   def get_balance_as_of_block(address, :latest) do
-    case Chain.max_consensus_block_number() do
-      {:ok, latest_block_number} ->
-        get_balance_as_of_block(address, latest_block_number)
+    latest_coin_balance_query =
+      from(
+        a in Address,
+        select: a.fetched_coin_balance,
+        where: a.hash == ^address
+      )
 
-      {:error, :not_found} ->
-        {:error, :not_found}
+    case Repo.replica().one(latest_coin_balance_query) do
+      nil -> {:error, :not_found}
+      coin_balance -> {:ok, coin_balance}
     end
   end
 

From 84a58de713e9ea09a419a72d96651c317bd87660 Mon Sep 17 00:00:00 2001
From: nikitosing <32202610+nikitosing@users.noreply.github.com>
Date: Thu, 9 Nov 2023 10:48:45 +0300
Subject: [PATCH 632/909] =?UTF-8?q?Add=20new=20metadata=20fields=20and=20a?=
 =?UTF-8?q?dd=20x-api-key=20header=20to=20eth-bytecode-db=20r=E2=80=A6=20(?=
 =?UTF-8?q?#8750)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Add new metadata fields and add x-api-key header to eth-bytecode-db request

* Add /api/v2/import/smart-contracts/{address_hash} endpoint
---
 CHANGELOG.md                                  |  1 +
 .../lib/block_scout_web/api_router.ex         |  1 +
 .../controllers/api/v2/fallback_controller.ex |  2 +-
 .../controllers/api/v2/import_controller.ex   | 57 +++++++++++++++++-
 .../lib/explorer/chain/smart_contract.ex      | 46 ++++++++++++++-
 .../eth_bytecode_db_interface.ex              |  9 +++
 .../lib/explorer/smart_contract/helper.ex     | 58 +++++++++++++++++++
 .../rust_verifier_interface_behaviour.ex      | 41 ++++++++-----
 .../smart_contract/solidity/verifier.ex       | 25 ++++----
 .../explorer/smart_contract/vyper/verifier.ex | 35 ++++++-----
 config/runtime.exs                            |  3 +-
 11 files changed, 227 insertions(+), 51 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 05efb03eeb0b..2bfd041e2778 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,7 @@
 ### Features
 
 - [#8795](https://github.com/blockscout/blockscout/pull/8795) - Disable catchup indexer by env
+- [#8750](https://github.com/blockscout/blockscout/pull/8750) - Support new eth-bytecode-db request metadata fields
 
 ### Fixes
 
diff --git a/apps/block_scout_web/lib/block_scout_web/api_router.ex b/apps/block_scout_web/lib/block_scout_web/api_router.ex
index 0ab24f48cd5a..8d500a2a49cb 100644
--- a/apps/block_scout_web/lib/block_scout_web/api_router.ex
+++ b/apps/block_scout_web/lib/block_scout_web/api_router.ex
@@ -181,6 +181,7 @@ defmodule BlockScoutWeb.ApiRouter do
     pipe_through(:api_v2_no_session)
 
     post("/token-info", V2.ImportController, :import_token_info)
+    get("/smart-contracts/:address_hash_param", V2.ImportController, :try_to_search_contract)
   end
 
   scope "/v2", as: :api_v2 do
diff --git a/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/fallback_controller.ex b/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/fallback_controller.ex
index 79cad2ebffed..56e66c7d0a44 100644
--- a/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/fallback_controller.ex
+++ b/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/fallback_controller.ex
@@ -130,7 +130,7 @@ defmodule BlockScoutWeb.API.V2.FallbackController do
     |> render(:message, %{message: @restricted_access})
   end
 
-  def call(conn, {:already_verified, true}) do
+  def call(conn, {:already_verified, _}) do
     Logger.error(fn ->
       ["#{@verification_failed}: #{@already_verified}"]
     end)
diff --git a/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/import_controller.ex b/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/import_controller.ex
index bf5ebe6f3280..7c6b59c3bf99 100644
--- a/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/import_controller.ex
+++ b/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/import_controller.ex
@@ -3,7 +3,11 @@ defmodule BlockScoutWeb.API.V2.ImportController do
 
   alias BlockScoutWeb.API.V2.ApiView
   alias Explorer.{Chain, Repo}
-  alias Explorer.Chain.Token
+  alias Explorer.Chain.{Data, Token}
+  alias Explorer.Chain.Fetcher.LookUpSmartContractSourcesOnDemand
+  alias Explorer.SmartContract.EthBytecodeDBInterface
+
+  import Explorer.SmartContract.Helper, only: [prepare_bytecode_for_microservice: 3, contract_creation_input: 1]
 
   require Logger
   @api_true [api?: true]
@@ -48,6 +52,47 @@ defmodule BlockScoutWeb.API.V2.ImportController do
     end
   end
 
+  @doc """
+    Function to handle request at:
+      `/api/v2/smart-contracts/{address_hash_param}`
+
+    Needed to try to import unverified smart contracts via eth-bytecode-db (`/api/v2/bytecodes/sources:search` method).
+    Protected by `x-api-key` header.
+  """
+  @spec try_to_search_contract(Plug.Conn.t(), map()) ::
+          {:already_verified, nil | Explorer.Chain.SmartContract.t()}
+          | {:api_key, nil | binary()}
+          | {:format, :error}
+          | {:not_found, {:error, :not_found}}
+          | {:sensitive_endpoints_api_key, any()}
+          | Plug.Conn.t()
+  def try_to_search_contract(conn, %{"address_hash_param" => address_hash_string}) do
+    with {:sensitive_endpoints_api_key, api_key} when not is_nil(api_key) <-
+           {:sensitive_endpoints_api_key, Application.get_env(:block_scout_web, :sensitive_endpoints_api_key)},
+         {:api_key, ^api_key} <- {:api_key, get_api_key_header(conn)},
+         {:format, {:ok, address_hash}} <- {:format, Chain.string_to_address_hash(address_hash_string)},
+         {:not_found, {:ok, address}} <- {:not_found, Chain.hash_to_address(address_hash, @api_true, false)},
+         {:already_verified, smart_contract} when is_nil(smart_contract) <-
+           {:already_verified, Chain.address_hash_to_smart_contract(address_hash, @api_true)} do
+      creation_tx_input = contract_creation_input(address.hash)
+
+      with {:ok, %{"sourceType" => type} = source} <-
+             %{}
+             |> prepare_bytecode_for_microservice(creation_tx_input, Data.to_string(address.contract_code))
+             |> EthBytecodeDBInterface.search_contract_in_eth_bytecode_internal_db(),
+           {:ok, _} <- LookUpSmartContractSourcesOnDemand.process_contract_source(type, source, address.hash) do
+        conn
+        |> put_view(ApiView)
+        |> render(:message, %{message: "Success"})
+      else
+        _ ->
+          conn
+          |> put_view(ApiView)
+          |> render(:message, %{message: "Contract was not imported"})
+      end
+    end
+  end
+
   defp valid_url?(url) when is_binary(url) do
     uri = URI.parse(url)
     uri.scheme != nil && uri.host =~ "."
@@ -74,4 +119,14 @@ defmodule BlockScoutWeb.API.V2.ImportController do
   end
 
   defp put_token_string_field(changeset, _token_symbol, _field), do: changeset
+
+  defp get_api_key_header(conn) do
+    case get_req_header(conn, "x-api-key") do
+      [api_key] ->
+        api_key
+
+      _ ->
+        nil
+    end
+  end
 end
diff --git a/apps/explorer/lib/explorer/chain/smart_contract.ex b/apps/explorer/lib/explorer/chain/smart_contract.ex
index 18590460e672..5391349acf09 100644
--- a/apps/explorer/lib/explorer/chain/smart_contract.ex
+++ b/apps/explorer/lib/explorer/chain/smart_contract.ex
@@ -16,7 +16,7 @@ defmodule Explorer.Chain.SmartContract do
   alias EthereumJSONRPC.Contract
   alias Explorer.Counters.AverageBlockTime
   alias Explorer.{Chain, Repo}
-  alias Explorer.Chain.{Address, ContractMethod, DecompiledSmartContract, Hash}
+  alias Explorer.Chain.{Address, ContractMethod, Data, DecompiledSmartContract, Hash, InternalTransaction, Transaction}
   alias Explorer.Chain.SmartContract.ExternalLibrary
   alias Explorer.SmartContract.Reader
   alias Timex.Duration
@@ -965,4 +965,48 @@ defmodule Explorer.Chain.SmartContract do
 
     Chain.select_repo(options).one(query)
   end
+
+  @doc """
+    Extracts creation bytecode (`init`) and transaction (`tx`) or
+      internal transaction (`internal_tx`) where the contract was created.
+  """
+  @spec creation_tx_with_bytecode(binary() | Hash.t()) ::
+          %{init: binary(), tx: Transaction.t()} | %{init: binary(), internal_tx: InternalTransaction.t()} | nil
+  def creation_tx_with_bytecode(address_hash) do
+    creation_tx_query =
+      from(
+        tx in Transaction,
+        where: tx.created_contract_address_hash == ^address_hash,
+        where: tx.status == ^1
+      )
+
+    tx =
+      creation_tx_query
+      |> Repo.one()
+
+    if tx do
+      with %{input: input} <- tx do
+        %{init: Data.to_string(input), tx: tx}
+      end
+    else
+      creation_int_tx_query =
+        from(
+          itx in InternalTransaction,
+          join: t in assoc(itx, :transaction),
+          where: itx.created_contract_address_hash == ^address_hash,
+          where: t.status == ^1
+        )
+
+      internal_tx = creation_int_tx_query |> Repo.one()
+
+      case internal_tx do
+        %{init: init} ->
+          init_str = Data.to_string(init)
+          %{init: init_str, internal_tx: internal_tx}
+
+        _ ->
+          nil
+      end
+    end
+  end
 end
diff --git a/apps/explorer/lib/explorer/smart_contract/eth_bytecode_db_interface.ex b/apps/explorer/lib/explorer/smart_contract/eth_bytecode_db_interface.ex
index b4ffab08328c..82b83c053c7d 100644
--- a/apps/explorer/lib/explorer/smart_contract/eth_bytecode_db_interface.ex
+++ b/apps/explorer/lib/explorer/smart_contract/eth_bytecode_db_interface.ex
@@ -17,6 +17,15 @@ defmodule Explorer.SmartContract.EthBytecodeDBInterface do
     end
   end
 
+  @doc """
+    Function to search smart contracts in eth-bytecode-db, similar to `search_contract/2` but
+      this function uses only `/api/v2/bytecodes/sources:search` method
+  """
+  @spec search_contract_in_eth_bytecode_internal_db(map()) :: {:error, any} | {:ok, any}
+  def search_contract_in_eth_bytecode_internal_db(%{"bytecode" => _, "bytecodeType" => _} = body) do
+    http_post_request(bytecode_search_sources_url(), body)
+  end
+
   def process_verifier_response(%{"sourcifySources" => [src | _]}) do
     {:ok, Map.put(src, "sourcify?", true)}
   end
diff --git a/apps/explorer/lib/explorer/smart_contract/helper.ex b/apps/explorer/lib/explorer/smart_contract/helper.ex
index c73ea123b919..544cb7c19e77 100644
--- a/apps/explorer/lib/explorer/smart_contract/helper.ex
+++ b/apps/explorer/lib/explorer/smart_contract/helper.ex
@@ -4,6 +4,7 @@ defmodule Explorer.SmartContract.Helper do
   """
 
   alias Explorer.Chain
+  alias Explorer.Chain.{Hash, SmartContract}
   alias Phoenix.HTML
 
   def queriable_method?(method) do
@@ -135,4 +136,61 @@ defmodule Explorer.SmartContract.Helper do
         nil
     end
   end
+
+  @doc """
+    Returns a tuple: `{creation_bytecode, deployed_bytecode, metadata}` where `metadata` is a map:
+      {
+        "blockNumber": "string",
+        "chainId": "string",
+        "contractAddress": "string",
+        "creationCode": "string",
+        "deployer": "string",
+        "runtimeCode": "string",
+        "transactionHash": "string",
+        "transactionIndex": "string"
+      }
+
+    Metadata will be sent to a verifier microservice
+  """
+  @spec fetch_data_for_verification(binary() | Hash.t()) :: {binary() | nil, binary(), map()}
+  def fetch_data_for_verification(address_hash) do
+    deployed_bytecode = Chain.smart_contract_bytecode(address_hash)
+
+    metadata = %{
+      "contractAddress" => to_string(address_hash),
+      "runtimeCode" => to_string(deployed_bytecode),
+      "chainId" => Application.get_env(:block_scout_web, :chain_id)
+    }
+
+    case SmartContract.creation_tx_with_bytecode(address_hash) do
+      %{init: init, tx: tx} ->
+        {init, deployed_bytecode, tx |> tx_to_metadata(init) |> Map.merge(metadata)}
+
+      %{init: init, internal_tx: internal_tx} ->
+        {init, deployed_bytecode, internal_tx |> internal_tx_to_metadata(init) |> Map.merge(metadata)}
+
+      _ ->
+        {nil, deployed_bytecode, metadata}
+    end
+  end
+
+  defp tx_to_metadata(tx, init) do
+    %{
+      "blockNumber" => to_string(tx.block_number),
+      "transactionHash" => to_string(tx.hash),
+      "transactionIndex" => to_string(tx.index),
+      "deployer" => to_string(tx.from_address_hash),
+      "creationCode" => to_string(init)
+    }
+  end
+
+  defp internal_tx_to_metadata(internal_tx, init) do
+    %{
+      "blockNumber" => to_string(internal_tx.block_number),
+      "transactionHash" => to_string(internal_tx.transaction_hash),
+      "transactionIndex" => to_string(internal_tx.transaction_index),
+      "deployer" => to_string(internal_tx.from_address_hash),
+      "creationCode" => to_string(init)
+    }
+  end
 end
diff --git a/apps/explorer/lib/explorer/smart_contract/rust_verifier_interface_behaviour.ex b/apps/explorer/lib/explorer/smart_contract/rust_verifier_interface_behaviour.ex
index 799fd7bd0e0a..2466e6e1d572 100644
--- a/apps/explorer/lib/explorer/smart_contract/rust_verifier_interface_behaviour.ex
+++ b/apps/explorer/lib/explorer/smart_contract/rust_verifier_interface_behaviour.ex
@@ -22,9 +22,9 @@ defmodule Explorer.SmartContract.RustVerifierInterfaceBehaviour do
               "optimizationRuns" => _,
               "libraries" => _
             } = body,
-            address_hash
+            metadata
           ) do
-        http_post_request(solidity_multiple_files_verification_url(), append_metadata(body, address_hash))
+        http_post_request(solidity_multiple_files_verification_url(), append_metadata(body, metadata), true)
       end
 
       def verify_standard_json_input(
@@ -34,9 +34,9 @@ defmodule Explorer.SmartContract.RustVerifierInterfaceBehaviour do
               "compilerVersion" => _,
               "input" => _
             } = body,
-            address_hash
+            metadata
           ) do
-        http_post_request(solidity_standard_json_verification_url(), append_metadata(body, address_hash))
+        http_post_request(solidity_standard_json_verification_url(), append_metadata(body, metadata), true)
       end
 
       def vyper_verify_multipart(
@@ -46,9 +46,9 @@ defmodule Explorer.SmartContract.RustVerifierInterfaceBehaviour do
               "compilerVersion" => _,
               "sourceFiles" => _
             } = body,
-            address_hash
+            metadata
           ) do
-        http_post_request(vyper_multiple_files_verification_url(), append_metadata(body, address_hash))
+        http_post_request(vyper_multiple_files_verification_url(), append_metadata(body, metadata), true)
       end
 
       def vyper_verify_standard_json(
@@ -58,15 +58,17 @@ defmodule Explorer.SmartContract.RustVerifierInterfaceBehaviour do
               "compilerVersion" => _,
               "input" => _
             } = body,
-            address_hash
+            metadata
           ) do
-        http_post_request(vyper_standard_json_verification_url(), append_metadata(body, address_hash))
+        http_post_request(vyper_standard_json_verification_url(), append_metadata(body, metadata), true)
       end
 
-      def http_post_request(url, body) do
+      def http_post_request(url, body, is_verification_request? \\ false) do
         headers = [{"Content-Type", "application/json"}]
 
-        case HTTPoison.post(url, Jason.encode!(body), headers, recv_timeout: @post_timeout) do
+        case HTTPoison.post(url, Jason.encode!(body), maybe_put_api_key_header(headers, is_verification_request?),
+               recv_timeout: @post_timeout
+             ) do
           {:ok, %Response{body: body, status_code: _}} ->
             process_verifier_response(body)
 
@@ -86,6 +88,18 @@ defmodule Explorer.SmartContract.RustVerifierInterfaceBehaviour do
         end
       end
 
+      defp maybe_put_api_key_header(headers, false), do: headers
+
+      defp maybe_put_api_key_header(headers, true) do
+        api_key = Application.get_env(:explorer, Explorer.SmartContract.RustVerifierInterfaceBehaviour)[:api_key]
+
+        if api_key do
+          [{"x-api-key", api_key} | headers]
+        else
+          headers
+        end
+      end
+
       def http_get_request(url) do
         case HTTPoison.get(url) do
           {:ok, %Response{body: body, status_code: 200}} ->
@@ -163,12 +177,9 @@ defmodule Explorer.SmartContract.RustVerifierInterfaceBehaviour do
 
       def enabled?, do: Application.get_env(:explorer, Explorer.SmartContract.RustVerifierInterfaceBehaviour)[:enabled]
 
-      defp append_metadata(body, address_hash) when is_map(body) do
+      defp append_metadata(body, metadata) when is_map(body) do
         body
-        |> Map.put("metadata", %{
-          "chainId" => Application.get_env(:block_scout_web, :chain_id),
-          "contractAddress" => to_string(address_hash)
-        })
+        |> Map.put("metadata", metadata)
       end
     end
   end
diff --git a/apps/explorer/lib/explorer/smart_contract/solidity/verifier.ex b/apps/explorer/lib/explorer/smart_contract/solidity/verifier.ex
index ee5554a0361d..8eb602ba3559 100644
--- a/apps/explorer/lib/explorer/smart_contract/solidity/verifier.ex
+++ b/apps/explorer/lib/explorer/smart_contract/solidity/verifier.ex
@@ -9,9 +9,12 @@ defmodule Explorer.SmartContract.Solidity.Verifier do
   """
 
   import Explorer.SmartContract.Helper,
-    only: [cast_libraries: 1, prepare_bytecode_for_microservice: 3, contract_creation_input: 1]
+    only: [
+      cast_libraries: 1,
+      fetch_data_for_verification: 1,
+      prepare_bytecode_for_microservice: 3
+    ]
 
-  # import  Explorer.Chain.SmartContract, only: [:function_description]
   alias ABI.{FunctionSelector, TypeDecoder}
   alias Explorer.Chain
   alias Explorer.Chain.{Data, Hash, SmartContract}
@@ -40,9 +43,7 @@ defmodule Explorer.SmartContract.Solidity.Verifier do
   end
 
   defp evaluate_authenticity_inner(true, address_hash, params) do
-    deployed_bytecode = Chain.smart_contract_bytecode(address_hash)
-
-    creation_tx_input = contract_creation_input(address_hash)
+    {creation_tx_input, deployed_bytecode, verifier_metadata} = fetch_data_for_verification(address_hash)
 
     %{}
     |> prepare_bytecode_for_microservice(creation_tx_input, deployed_bytecode)
@@ -54,7 +55,7 @@ defmodule Explorer.SmartContract.Solidity.Verifier do
     |> Map.put("optimizationRuns", prepare_optimization_runs(params["optimization"], params["optimization_runs"]))
     |> Map.put("evmVersion", Map.get(params, "evm_version", "default"))
     |> Map.put("compilerVersion", params["compiler_version"])
-    |> RustVerifierInterface.verify_multi_part(address_hash)
+    |> RustVerifierInterface.verify_multi_part(verifier_metadata)
   end
 
   defp evaluate_authenticity_inner(false, address_hash, params) do
@@ -124,14 +125,12 @@ defmodule Explorer.SmartContract.Solidity.Verifier do
   end
 
   def evaluate_authenticity_via_standard_json_input_inner(true, address_hash, params, json_input) do
-    deployed_bytecode = Chain.smart_contract_bytecode(address_hash)
-
-    creation_tx_input = contract_creation_input(address_hash)
+    {creation_tx_input, deployed_bytecode, verifier_metadata} = fetch_data_for_verification(address_hash)
 
     %{"compilerVersion" => params["compiler_version"]}
     |> prepare_bytecode_for_microservice(creation_tx_input, deployed_bytecode)
     |> Map.put("input", json_input)
-    |> RustVerifierInterface.verify_standard_json_input(address_hash)
+    |> RustVerifierInterface.verify_standard_json_input(verifier_metadata)
   end
 
   def evaluate_authenticity_via_standard_json_input_inner(false, address_hash, params, json_input) do
@@ -139,9 +138,7 @@ defmodule Explorer.SmartContract.Solidity.Verifier do
   end
 
   def evaluate_authenticity_via_multi_part_files(address_hash, params, files) do
-    deployed_bytecode = Chain.smart_contract_bytecode(address_hash)
-
-    creation_tx_input = contract_creation_input(address_hash)
+    {creation_tx_input, deployed_bytecode, verifier_metadata} = fetch_data_for_verification(address_hash)
 
     %{}
     |> prepare_bytecode_for_microservice(creation_tx_input, deployed_bytecode)
@@ -150,7 +147,7 @@ defmodule Explorer.SmartContract.Solidity.Verifier do
     |> Map.put("optimizationRuns", prepare_optimization_runs(params["optimization"], params["optimization_runs"]))
     |> Map.put("evmVersion", Map.get(params, "evm_version", "default"))
     |> Map.put("compilerVersion", params["compiler_version"])
-    |> RustVerifierInterface.verify_multi_part(address_hash)
+    |> RustVerifierInterface.verify_multi_part(verifier_metadata)
   end
 
   defp verify(address_hash, params, json_input) do
diff --git a/apps/explorer/lib/explorer/smart_contract/vyper/verifier.ex b/apps/explorer/lib/explorer/smart_contract/vyper/verifier.ex
index 3d66e1539a01..3ca5ac90994c 100644
--- a/apps/explorer/lib/explorer/smart_contract/vyper/verifier.ex
+++ b/apps/explorer/lib/explorer/smart_contract/vyper/verifier.ex
@@ -9,10 +9,11 @@ defmodule Explorer.SmartContract.Vyper.Verifier do
   """
   require Logger
 
-  alias Explorer.Chain
   alias Explorer.SmartContract.Vyper.CodeCompiler
   alias Explorer.SmartContract.RustVerifierInterface
-  import Explorer.SmartContract.Helper, only: [prepare_bytecode_for_microservice: 3, contract_creation_input: 1]
+
+  import Explorer.SmartContract.Helper,
+    only: [fetch_data_for_verification: 1, prepare_bytecode_for_microservice: 3, contract_creation_input: 1]
 
   def evaluate_authenticity(_, %{"contract_source_code" => ""}),
     do: {:error, :contract_source_code}
@@ -34,7 +35,7 @@ defmodule Explorer.SmartContract.Vyper.Verifier do
   def evaluate_authenticity(address_hash, params, files) do
     try do
       if RustVerifierInterface.enabled?() do
-        vyper_verify_multipart(params, fetch_bytecode(address_hash), params["evm_version"], files, address_hash)
+        vyper_verify_multipart(params, params["evm_version"], files, address_hash)
       end
     rescue
       exception ->
@@ -50,7 +51,7 @@ defmodule Explorer.SmartContract.Vyper.Verifier do
   def evaluate_authenticity_standard_json(%{"address_hash" => address_hash} = params) do
     try do
       if RustVerifierInterface.enabled?() do
-        vyper_verify_standard_json(params, fetch_bytecode(address_hash), address_hash)
+        vyper_verify_standard_json(params, address_hash)
       end
     rescue
       exception ->
@@ -66,7 +67,6 @@ defmodule Explorer.SmartContract.Vyper.Verifier do
   defp evaluate_authenticity_inner(true, address_hash, params) do
     vyper_verify_multipart(
       params,
-      fetch_bytecode(address_hash),
       params["evm_version"],
       %{
         "#{params["name"]}.vy" => params["contract_source_code"]
@@ -79,13 +79,6 @@ defmodule Explorer.SmartContract.Vyper.Verifier do
     verify(address_hash, params)
   end
 
-  def fetch_bytecode(address_hash) do
-    deployed_bytecode = Chain.smart_contract_bytecode(address_hash)
-    creation_tx_input = contract_creation_input(address_hash)
-
-    prepare_bytecode_for_microservice(%{}, creation_tx_input, deployed_bytecode)
-  end
-
   defp verify(address_hash, params) do
     contract_source_code = Map.fetch!(params, "contract_source_code")
     compiler_version = Map.fetch!(params, "compiler_version")
@@ -123,19 +116,25 @@ defmodule Explorer.SmartContract.Vyper.Verifier do
     end
   end
 
-  defp vyper_verify_multipart(params, bytecode_map, evm_version, files, address_hash) do
-    bytecode_map
+  defp vyper_verify_multipart(params, evm_version, files, address_hash) do
+    {creation_tx_input, deployed_bytecode, verifier_metadata} = fetch_data_for_verification(address_hash)
+
+    %{}
+    |> prepare_bytecode_for_microservice(creation_tx_input, deployed_bytecode)
     |> Map.put("evmVersion", evm_version)
     |> Map.put("sourceFiles", files)
     |> Map.put("compilerVersion", params["compiler_version"])
     |> Map.put("interfaces", params["interfaces"] || %{})
-    |> RustVerifierInterface.vyper_verify_multipart(address_hash)
+    |> RustVerifierInterface.vyper_verify_multipart(verifier_metadata)
   end
 
-  defp vyper_verify_standard_json(params, bytecode_map, address_hash) do
-    bytecode_map
+  defp vyper_verify_standard_json(params, address_hash) do
+    {creation_tx_input, deployed_bytecode, verifier_metadata} = fetch_data_for_verification(address_hash)
+
+    %{}
+    |> prepare_bytecode_for_microservice(creation_tx_input, deployed_bytecode)
     |> Map.put("compilerVersion", params["compiler_version"])
     |> Map.put("input", params["input"])
-    |> RustVerifierInterface.vyper_verify_standard_json(address_hash)
+    |> RustVerifierInterface.vyper_verify_standard_json(verifier_metadata)
   end
 end
diff --git a/config/runtime.exs b/config/runtime.exs
index 2b3f4d44fcda..8c8baee4fa63 100644
--- a/config/runtime.exs
+++ b/config/runtime.exs
@@ -379,7 +379,8 @@ config :explorer, Explorer.SmartContract.RustVerifierInterfaceBehaviour,
   service_url: System.get_env("MICROSERVICE_SC_VERIFIER_URL") || "https://eth-bytecode-db.services.blockscout.com/",
   enabled: enabled?,
   type: type,
-  eth_bytecode_db?: enabled? && type == "eth_bytecode_db"
+  eth_bytecode_db?: enabled? && type == "eth_bytecode_db",
+  api_key: System.get_env("MICROSERVICE_SC_VERIFIER_API_KEY")
 
 config :explorer, Explorer.Visualize.Sol2uml,
   service_url: System.get_env("MICROSERVICE_VISUALIZE_SOL2UML_URL"),

From f9d5377e64d2c6bfb16c7298be448fddc3e0477a Mon Sep 17 00:00:00 2001
From: nikitosing <32202610+nikitosing@users.noreply.github.com>
Date: Thu, 9 Nov 2023 11:09:38 +0300
Subject: [PATCH 633/909] Add endpoint url to the block_scout_web logging
 (#8609)

* Replace :console logger backend with LoggerJSON; Add endpoint url to the block_scout_web logging

* Move logger_json dependency

* Turn json logs only for prod environment

* Disable debug ecto logs for test environment

* Return HTTP method to logs
---
 CHANGELOG.md                                  |  1 +
 .../lib/block_scout_web/plug/logger.ex        | 47 +++++++------------
 apps/block_scout_web/mix.exs                  |  3 +-
 apps/ethereum_jsonrpc/mix.exs                 |  3 +-
 apps/explorer/config/test.exs                 | 12 +++--
 apps/explorer/mix.exs                         |  3 +-
 apps/indexer/mix.exs                          |  3 +-
 config/config.exs                             | 10 +++-
 config/dev.exs                                |  2 +
 config/prod.exs                               |  4 +-
 config/test.exs                               |  2 +
 mix.lock                                      |  1 +
 12 files changed, 51 insertions(+), 40 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2bfd041e2778..bac2acc94790 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,7 @@
 
 - [#8795](https://github.com/blockscout/blockscout/pull/8795) - Disable catchup indexer by env
 - [#8750](https://github.com/blockscout/blockscout/pull/8750) - Support new eth-bytecode-db request metadata fields
+- [#8609](https://github.com/blockscout/blockscout/pull/8609) - Change logs format to JSON; Add endpoint url to the block_scout_web logging
 
 ### Fixes
 
diff --git a/apps/block_scout_web/lib/block_scout_web/plug/logger.ex b/apps/block_scout_web/lib/block_scout_web/plug/logger.ex
index 883dd95ef3f8..b61c9cafe4c6 100644
--- a/apps/block_scout_web/lib/block_scout_web/plug/logger.ex
+++ b/apps/block_scout_web/lib/block_scout_web/plug/logger.ex
@@ -19,53 +19,40 @@ defmodule BlockScoutWeb.Plug.Logger do
   @impl true
   def call(conn, opts) do
     level = Keyword.get(opts, :log, :info)
-    application = Keyword.get(opts, :application, :block_scout_web)
-
-    log(application, conn, level, opts)
 
     start = System.monotonic_time()
 
     Conn.register_before_send(conn, fn conn ->
+      stop = System.monotonic_time()
+      diff = System.convert_time_unit(stop - start, :native, :microsecond)
+      status = Integer.to_string(conn.status)
+
       Logger.log(
         level,
         fn ->
-          stop = System.monotonic_time()
-          diff = System.convert_time_unit(stop - start, :native, :microsecond)
-          status = Integer.to_string(conn.status)
-
-          [connection_type(conn), ?\s, status, " in ", formatted_diff(diff)]
+          [connection_type(conn), ?\s, status, " in ", formatted_diff(diff), " on ", conn.method, ?\s, endpoint(conn)]
         end,
-        opts
+        Keyword.merge(
+          [duration: diff, status: status, unit: "microsecond", endpoint: endpoint(conn), method: conn.method],
+          opts
+        )
       )
 
       conn
     end)
   end
 
-  defp log(:api, conn, level, opts) do
-    endpoint =
-      if conn.query_string do
-        "#{conn.request_path}?#{conn.query_string}"
-      else
-        conn.request_path
-      end
-
-    Logger.log(level, endpoint, opts)
-  end
-
-  defp log(_application, conn, level, opts) do
-    Logger.log(
-      level,
-      fn ->
-        [conn.method, ?\s, conn.request_path]
-      end,
-      opts
-    )
-  end
-
   defp formatted_diff(diff) when diff > 1000, do: [diff |> div(1000) |> Integer.to_string(), "ms"]
   defp formatted_diff(diff), do: [Integer.to_string(diff), "µs"]
 
   defp connection_type(%{state: :set_chunked}), do: "Chunked"
   defp connection_type(_), do: "Sent"
+
+  defp endpoint(conn) do
+    if conn.query_string do
+      "#{conn.request_path}?#{conn.query_string}"
+    else
+      conn.request_path
+    end
+  end
 end
diff --git a/apps/block_scout_web/mix.exs b/apps/block_scout_web/mix.exs
index e0283df5a7a5..17b4a79de407 100644
--- a/apps/block_scout_web/mix.exs
+++ b/apps/block_scout_web/mix.exs
@@ -132,7 +132,8 @@ defmodule BlockScoutWeb.Mixfile do
       {:ex_json_schema, "~> 0.10.1"},
       {:ueberauth, "~> 0.7"},
       {:ueberauth_auth0, "~> 2.0"},
-      {:bureaucrat, "~> 0.2.9", only: :test}
+      {:bureaucrat, "~> 0.2.9", only: :test},
+      {:logger_json, "~> 5.1"}
     ]
   end
 
diff --git a/apps/ethereum_jsonrpc/mix.exs b/apps/ethereum_jsonrpc/mix.exs
index 9159a8c9852b..d4496a620da3 100644
--- a/apps/ethereum_jsonrpc/mix.exs
+++ b/apps/ethereum_jsonrpc/mix.exs
@@ -85,7 +85,8 @@ defmodule EthereumJsonrpc.MixProject do
       {:decimal, "~> 2.0"},
       {:decorator, "~> 1.4"},
       {:hackney, "~> 1.18"},
-      {:poolboy, "~> 1.5.2"}
+      {:poolboy, "~> 1.5.2"},
+      {:logger_json, "~> 5.1"}
     ]
   end
 end
diff --git a/apps/explorer/config/test.exs b/apps/explorer/config/test.exs
index 8a08ee60acf5..955f9df84267 100644
--- a/apps/explorer/config/test.exs
+++ b/apps/explorer/config/test.exs
@@ -12,7 +12,8 @@ config :explorer, Explorer.Repo,
   ownership_timeout: :timer.minutes(7),
   timeout: :timer.seconds(60),
   queue_target: 1000,
-  migration_lock: nil
+  migration_lock: nil,
+  log: false
 
 # Configure API database
 config :explorer, Explorer.Repo.Replica1,
@@ -26,7 +27,8 @@ config :explorer, Explorer.Repo.Replica1,
   enable_caching_implementation_data_of_proxy: true,
   avg_block_time_as_ttl_cached_implementation_data_of_proxy: false,
   fallback_ttl_cached_implementation_data_of_proxy: :timer.seconds(20),
-  implementation_data_fetching_timeout: :timer.seconds(20)
+  implementation_data_fetching_timeout: :timer.seconds(20),
+  log: false
 
 # Configure API database
 config :explorer, Explorer.Repo.Account,
@@ -36,7 +38,8 @@ config :explorer, Explorer.Repo.Account,
   # Default of `5_000` was too low for `BlockFetcher` test
   ownership_timeout: :timer.minutes(1),
   timeout: :timer.seconds(60),
-  queue_target: 1000
+  queue_target: 1000,
+  log: false
 
 for repo <- [Explorer.Repo.PolygonEdge, Explorer.Repo.PolygonZkevm, Explorer.Repo.RSK, Explorer.Repo.Suave] do
   config :explorer, repo,
@@ -46,7 +49,8 @@ for repo <- [Explorer.Repo.PolygonEdge, Explorer.Repo.PolygonZkevm, Explorer.Rep
     # Default of `5_000` was too low for `BlockFetcher` test
     ownership_timeout: :timer.minutes(1),
     timeout: :timer.seconds(60),
-    queue_target: 1000
+    queue_target: 1000,
+    log: false
 end
 
 config :logger, :explorer,
diff --git a/apps/explorer/mix.exs b/apps/explorer/mix.exs
index 1a43393fa626..e976d63ce455 100644
--- a/apps/explorer/mix.exs
+++ b/apps/explorer/mix.exs
@@ -117,7 +117,8 @@ defmodule Explorer.Mixfile do
       {:cbor, "~> 1.0"},
       {:cloak_ecto, "~> 1.2.0"},
       {:redix, "~> 1.1"},
-      {:hammer_backend_redis, "~> 6.1"}
+      {:hammer_backend_redis, "~> 6.1"},
+      {:logger_json, "~> 5.1"}
     ]
   end
 
diff --git a/apps/indexer/mix.exs b/apps/indexer/mix.exs
index f388f635319c..6444e6596182 100644
--- a/apps/indexer/mix.exs
+++ b/apps/indexer/mix.exs
@@ -55,7 +55,8 @@ defmodule Indexer.MixProject do
       # Tracing
       {:spandex, "~> 3.0"},
       # `:spandex` integration with Datadog
-      {:spandex_datadog, "~> 1.0"}
+      {:spandex_datadog, "~> 1.0"},
+      {:logger_json, "~> 5.1"}
     ]
   end
 
diff --git a/config/config.exs b/config/config.exs
index 554d3ae557b1..f09d21a3f065 100644
--- a/config/config.exs
+++ b/config/config.exs
@@ -38,9 +38,17 @@ config :logger,
     {LoggerFileBackend, :api},
     {LoggerFileBackend, :block_import_timings},
     {LoggerFileBackend, :account},
-    {LoggerFileBackend, :api_v2}
+    {LoggerFileBackend, :api_v2},
+    LoggerJSON
   ]
 
+config :logger_json, :backend,
+  metadata:
+    ~w(application fetcher request_id first_block_number last_block_number missing_block_range_count missing_block_count
+  block_number step count error_count shrunk import_id transaction_id duration status unit endpoint method)a,
+  json_encoder: Jason,
+  formatter: LoggerJSON.Formatters.BasicLogger
+
 config :logger, :console,
   # Use same format for all loggers, even though the level should only ever be `:error` for `:error` backend
   format: "$dateT$time $metadata[$level] $message\n",
diff --git a/config/dev.exs b/config/dev.exs
index 323212e107f7..27154824a939 100644
--- a/config/dev.exs
+++ b/config/dev.exs
@@ -3,6 +3,8 @@ import Config
 # DO NOT make it `:debug` or all Ecto logs will be shown for indexer
 config :logger, :console, level: :info
 
+config :logger_json, :backend, level: :none
+
 config :logger, :ecto,
   level: :debug,
   path: Path.absname("logs/dev/ecto.log")
diff --git a/config/prod.exs b/config/prod.exs
index 1d9be54e3fc6..2e8c9db24d97 100644
--- a/config/prod.exs
+++ b/config/prod.exs
@@ -2,7 +2,9 @@ import Config
 
 # Do not print debug messages in production
 
-config :logger, :console, level: :info
+config :logger, :console, level: :none
+
+config :logger_json, :backend, level: :info
 
 config :logger, :ecto,
   level: :info,
diff --git a/config/test.exs b/config/test.exs
index 92ddca6a93a0..c979cd834877 100644
--- a/config/test.exs
+++ b/config/test.exs
@@ -4,6 +4,8 @@ import Config
 
 config :logger, :console, level: :warn
 
+config :logger_json, :backend, level: :none
+
 config :logger, :ecto,
   level: :warn,
   path: Path.absname("logs/test/ecto.log")
diff --git a/mix.lock b/mix.lock
index 03e579b8ae39..605ac6bec0ec 100644
--- a/mix.lock
+++ b/mix.lock
@@ -75,6 +75,7 @@
   "jsx": {:hex, :jsx, "2.8.3", "a05252d381885240744d955fbe3cf810504eb2567164824e19303ea59eef62cf", [:mix, :rebar3], [], "hexpm", "fc3499fed7a726995aa659143a248534adc754ebd16ccd437cd93b649a95091f"},
   "junit_formatter": {:hex, :junit_formatter, "3.3.1", "c729befb848f1b9571f317d2fefa648e9d4869befc4b2980daca7c1edc468e40", [:mix], [], "hexpm", "761fc5be4b4c15d8ba91a6dafde0b2c2ae6db9da7b8832a55b5a1deb524da72b"},
   "logger_file_backend": {:hex, :logger_file_backend, "0.0.13", "df07b14970e9ac1f57362985d76e6f24e3e1ab05c248055b7d223976881977c2", [:mix], [], "hexpm", "71a453a7e6e899ae4549fb147b1c6621f4233f8f48f58ca10a64ec67b6c50018"},
+  "logger_json": {:hex, :logger_json, "5.1.2", "7dde5f6dff814aba033f045a3af9408f5459bac72357dc533276b47045371ecf", [:mix], [{:ecto, "~> 2.1 or ~> 3.0", [hex: :ecto, repo: "hexpm", optional: true]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: false]}, {:phoenix, ">= 1.5.0", [hex: :phoenix, repo: "hexpm", optional: true]}, {:plug, "~> 1.0", [hex: :plug, repo: "hexpm", optional: true]}, {:telemetry, "~> 0.4.0 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: true]}], "hexpm", "ed42047e5c57a60d0fa1450aef36bc016d0f9a5e6c0807ebb0c03d8895fb6ebc"},
   "makeup": {:hex, :makeup, "1.1.0", "6b67c8bc2882a6b6a445859952a602afc1a41c2e08379ca057c0f525366fc3ca", [:mix], [{:nimble_parsec, "~> 1.2.2 or ~> 1.3", [hex: :nimble_parsec, repo: "hexpm", optional: false]}], "hexpm", "0a45ed501f4a8897f580eabf99a2e5234ea3e75a4373c8a52824f6e873be57a6"},
   "makeup_elixir": {:hex, :makeup_elixir, "0.16.1", "cc9e3ca312f1cfeccc572b37a09980287e243648108384b97ff2b76e505c3555", [:mix], [{:makeup, "~> 1.0", [hex: :makeup, repo: "hexpm", optional: false]}, {:nimble_parsec, "~> 1.2.3 or ~> 1.3", [hex: :nimble_parsec, repo: "hexpm", optional: false]}], "hexpm", "e127a341ad1b209bd80f7bd1620a15693a9908ed780c3b763bccf7d200c767c6"},
   "makeup_erlang": {:hex, :makeup_erlang, "0.1.2", "ad87296a092a46e03b7e9b0be7631ddcf64c790fa68a9ef5323b6cbb36affc72", [:mix], [{:makeup, "~> 1.0", [hex: :makeup, repo: "hexpm", optional: false]}], "hexpm", "f3f5a1ca93ce6e092d92b6d9c049bcda58a3b617a8d888f8e7231c85630e8108"},

From 150533e5b846e3266a15f346c5ab6ba02a90b9c9 Mon Sep 17 00:00:00 2001
From: nikitosing <32202610+nikitosing@users.noreply.github.com>
Date: Thu, 9 Nov 2023 13:28:12 +0300
Subject: [PATCH 634/909] Add possibility to search tokens by address hash
 (#8768)

* Add possibility to search tokens by address hash

* Changelog + remove dbg calls

* Refactor searching queries set of selected fields

* Final polishing

---------

Co-authored-by: Viktor Baranov <baranov.viktor.27@gmail.com>
---
 CHANGELOG.md                                  |   1 +
 .../account/api/v1/user_controller_test.exs   |   2 +-
 .../api/v2/search_controller_test.exs         |  50 +++
 apps/explorer/lib/explorer/chain/search.ex    | 303 +++++++++---------
 4 files changed, 206 insertions(+), 150 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index bac2acc94790..bbd2315d761a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,7 @@
 ### Features
 
 - [#8795](https://github.com/blockscout/blockscout/pull/8795) - Disable catchup indexer by env
+- [#8768](https://github.com/blockscout/blockscout/pull/8768) - Add possibility to search tokens by address hash
 - [#8750](https://github.com/blockscout/blockscout/pull/8750) - Support new eth-bytecode-db request metadata fields
 - [#8609](https://github.com/blockscout/blockscout/pull/8609) - Change logs format to JSON; Add endpoint url to the block_scout_web logging
 
diff --git a/apps/block_scout_web/test/block_scout_web/controllers/account/api/v1/user_controller_test.exs b/apps/block_scout_web/test/block_scout_web/controllers/account/api/v1/user_controller_test.exs
index 2a8639bfdc62..f32b5727e727 100644
--- a/apps/block_scout_web/test/block_scout_web/controllers/account/api/v1/user_controller_test.exs
+++ b/apps/block_scout_web/test/block_scout_web/controllers/account/api/v1/user_controller_test.exs
@@ -554,7 +554,7 @@ defmodule BlockScoutWeb.Account.Api.V1.UserControllerTest do
 
       response_1 =
         conn
-        |> get("/api/account/v2/user/watchlist", response["next_page_params"] |> dbg())
+        |> get("/api/account/v2/user/watchlist", response["next_page_params"])
         |> json_response(200)
 
       check_paginated_response(response, response_1, tags_address)
diff --git a/apps/block_scout_web/test/block_scout_web/controllers/api/v2/search_controller_test.exs b/apps/block_scout_web/test/block_scout_web/controllers/api/v2/search_controller_test.exs
index 6804f778f0f7..ee9ee43a0371 100644
--- a/apps/block_scout_web/test/block_scout_web/controllers/api/v2/search_controller_test.exs
+++ b/apps/block_scout_web/test/block_scout_web/controllers/api/v2/search_controller_test.exs
@@ -3,6 +3,7 @@ defmodule BlockScoutWeb.API.V2.SearchControllerTest do
 
   alias Explorer.Chain.{Address, Block}
   alias Explorer.Repo
+  alias Explorer.Tags.AddressTag
 
   setup do
     insert(:block)
@@ -171,6 +172,35 @@ defmodule BlockScoutWeb.API.V2.SearchControllerTest do
       assert item["is_verified_via_admin_panel"] == token.is_verified_via_admin_panel
     end
 
+    test "search token by hash", %{conn: conn} do
+      token = insert(:unique_token)
+
+      request = get(conn, "/api/v2/search?q=#{token.contract_address_hash}")
+      assert response = json_response(request, 200)
+
+      assert Enum.count(response["items"]) == 2
+      assert response["next_page_params"] == nil
+
+      item = Enum.at(response["items"], 0)
+
+      assert item["type"] == "token"
+      assert item["name"] == token.name
+      assert item["symbol"] == token.symbol
+      assert item["address"] == Address.checksum(token.contract_address_hash)
+      assert item["token_url"] =~ Address.checksum(token.contract_address_hash)
+      assert item["address_url"] =~ Address.checksum(token.contract_address_hash)
+      assert item["token_type"] == token.type
+      assert item["is_smart_contract_verified"] == token.contract_address.verified
+      assert item["exchange_rate"] == (token.fiat_value && to_string(token.fiat_value))
+      assert item["total_supply"] == to_string(token.total_supply)
+      assert item["icon_url"] == token.icon_url
+      assert item["is_verified_via_admin_panel"] == token.is_verified_via_admin_panel
+
+      item_1 = Enum.at(response["items"], 1)
+
+      assert item_1["type"] == "address"
+    end
+
     test "search transaction", %{conn: conn} do
       tx = insert(:transaction)
 
@@ -222,6 +252,26 @@ defmodule BlockScoutWeb.API.V2.SearchControllerTest do
       assert item["url"] =~ Address.checksum(tag.address.hash)
       assert item["is_smart_contract_verified"] == tag.address.verified
     end
+
+    test "check that simultaneous search of ", %{conn: conn} do
+      block = insert(:block)
+
+      insert(:smart_contract, name: to_string(block.number))
+      insert(:token, name: to_string(block.number))
+
+      insert(:address_to_tag,
+        tag: %AddressTag{
+          label: "qwerty",
+          display_name: to_string(block.number)
+        }
+      )
+
+      request = get(conn, "/api/v2/search?q=#{block.number}")
+      assert response = json_response(request, 200)
+
+      assert Enum.count(response["items"]) == 4
+      assert response["next_page_params"] == nil
+    end
   end
 
   describe "/search/check-redirect" do
diff --git a/apps/explorer/lib/explorer/chain/search.ex b/apps/explorer/lib/explorer/chain/search.ex
index b2439545a424..64e8c1640645 100644
--- a/apps/explorer/lib/explorer/chain/search.ex
+++ b/apps/explorer/lib/explorer/chain/search.ex
@@ -4,6 +4,7 @@ defmodule Explorer.Chain.Search do
   """
   import Ecto.Query,
     only: [
+      dynamic: 2,
       from: 2,
       limit: 2,
       order_by: 3,
@@ -34,7 +35,7 @@ defmodule Explorer.Chain.Search do
 
     case prepare_search_term(string) do
       {:some, term} ->
-        tokens_query = search_token_query(term)
+        tokens_query = search_token_query(string, term)
         contracts_query = search_contract_query(term)
         labels_query = search_label_query(term)
         tx_query = search_tx_query(string)
@@ -114,8 +115,8 @@ defmodule Explorer.Chain.Search do
     case prepare_search_term(search_query) do
       {:some, term} ->
         tokens_result =
-          term
-          |> search_token_query()
+          search_query
+          |> search_token_query(term)
           |> order_by([token],
             desc_nulls_last: token.circulating_market_cap,
             desc_nulls_last: token.fiat_value,
@@ -204,6 +205,27 @@ defmodule Explorer.Chain.Search do
   end
 
   defp search_label_query(term) do
+    label_search_fields = %{
+      address_hash: dynamic([att, _, _], att.address_hash),
+      tx_hash: dynamic([_, _, _], type(^nil, :binary)),
+      block_hash: dynamic([_, _, _], type(^nil, :binary)),
+      type: "label",
+      name: dynamic([_, at, _], at.display_name),
+      symbol: nil,
+      holder_count: nil,
+      inserted_at: dynamic([att, _, _], att.inserted_at),
+      block_number: 0,
+      icon_url: nil,
+      token_type: nil,
+      timestamp: dynamic([_, _, _], type(^nil, :utc_datetime_usec)),
+      verified: dynamic([_, _, smart_contract], not is_nil(smart_contract)),
+      exchange_rate: nil,
+      total_supply: nil,
+      circulating_market_cap: nil,
+      priority: 1,
+      is_verified_via_admin_panel: nil
+    }
+
     inner_query =
       from(tag in AddressTag,
         where: fragment("to_tsvector('english', ?) @@ to_tsquery(?)", tag.display_name, ^term),
@@ -215,88 +237,105 @@ defmodule Explorer.Chain.Search do
       on: att.tag_id == at.id,
       left_join: smart_contract in SmartContract,
       on: att.address_hash == smart_contract.address_hash,
-      select: %{
-        address_hash: att.address_hash,
-        tx_hash: fragment("CAST(NULL AS bytea)"),
-        block_hash: fragment("CAST(NULL AS bytea)"),
-        type: "label",
-        name: at.display_name,
-        symbol: ^nil,
-        holder_count: ^nil,
-        inserted_at: att.inserted_at,
-        block_number: 0,
-        icon_url: nil,
-        token_type: nil,
-        timestamp: fragment("NULL::timestamp without time zone"),
-        verified: not is_nil(smart_contract),
-        exchange_rate: nil,
-        total_supply: nil,
-        circulating_market_cap: nil,
-        priority: 1,
-        is_verified_via_admin_panel: nil
-      }
+      select: ^label_search_fields
     )
   end
 
-  defp search_token_query(term) do
-    from(token in Token,
-      left_join: smart_contract in SmartContract,
-      on: token.contract_address_hash == smart_contract.address_hash,
-      where: fragment("to_tsvector('english', ? || ' ' || ?) @@ to_tsquery(?)", token.symbol, token.name, ^term),
-      select: %{
-        address_hash: token.contract_address_hash,
-        tx_hash: fragment("CAST(NULL AS bytea)"),
-        block_hash: fragment("CAST(NULL AS bytea)"),
-        type: "token",
-        name: token.name,
-        symbol: token.symbol,
-        holder_count: token.holder_count,
-        inserted_at: token.inserted_at,
-        block_number: 0,
-        icon_url: token.icon_url,
-        token_type: token.type,
-        timestamp: fragment("NULL::timestamp without time zone"),
-        verified: not is_nil(smart_contract),
-        exchange_rate: token.fiat_value,
-        total_supply: token.total_supply,
-        circulating_market_cap: token.circulating_market_cap,
-        priority: 0,
-        is_verified_via_admin_panel: token.is_verified_via_admin_panel
-      }
-    )
+  defp search_token_query(string, term) do
+    token_search_fields = %{
+      address_hash: dynamic([token, _], token.contract_address_hash),
+      tx_hash: dynamic([_, _], type(^nil, :binary)),
+      block_hash: dynamic([_, _], type(^nil, :binary)),
+      type: "token",
+      name: dynamic([token, _], token.name),
+      symbol: dynamic([token, _], token.symbol),
+      holder_count: dynamic([token, _], token.holder_count),
+      inserted_at: dynamic([token, _], token.inserted_at),
+      block_number: 0,
+      icon_url: dynamic([token, _], token.icon_url),
+      token_type: dynamic([token, _], token.type),
+      timestamp: dynamic([_, _], type(^nil, :utc_datetime_usec)),
+      verified: dynamic([_, smart_contract], not is_nil(smart_contract)),
+      exchange_rate: dynamic([token, _], token.fiat_value),
+      total_supply: dynamic([token, _], token.total_supply),
+      circulating_market_cap: dynamic([token, _], token.circulating_market_cap),
+      priority: 0,
+      is_verified_via_admin_panel: dynamic([token, _], token.is_verified_via_admin_panel)
+    }
+
+    case Chain.string_to_address_hash(string) do
+      {:ok, address_hash} ->
+        from(token in Token,
+          left_join: smart_contract in SmartContract,
+          on: token.contract_address_hash == smart_contract.address_hash,
+          where: token.contract_address_hash == ^address_hash,
+          select: ^token_search_fields
+        )
+
+      _ ->
+        from(token in Token,
+          left_join: smart_contract in SmartContract,
+          on: token.contract_address_hash == smart_contract.address_hash,
+          where: fragment("to_tsvector('english', ? || ' ' || ?) @@ to_tsquery(?)", token.symbol, token.name, ^term),
+          select: ^token_search_fields
+        )
+    end
   end
 
   defp search_contract_query(term) do
+    contract_search_fields = %{
+      address_hash: dynamic([smart_contract, _], smart_contract.address_hash),
+      tx_hash: dynamic([_, _], type(^nil, :binary)),
+      block_hash: dynamic([_, _], type(^nil, :binary)),
+      type: "contract",
+      name: dynamic([smart_contract, _], smart_contract.name),
+      symbol: nil,
+      holder_count: nil,
+      inserted_at: dynamic([_, address], address.inserted_at),
+      block_number: 0,
+      icon_url: nil,
+      token_type: nil,
+      timestamp: dynamic([_, _], type(^nil, :utc_datetime_usec)),
+      verified: true,
+      exchange_rate: nil,
+      total_supply: nil,
+      circulating_market_cap: nil,
+      priority: 0,
+      is_verified_via_admin_panel: nil
+    }
+
     from(smart_contract in SmartContract,
       left_join: address in Address,
       on: smart_contract.address_hash == address.hash,
       where: fragment("to_tsvector('english', ?) @@ to_tsquery(?)", smart_contract.name, ^term),
-      select: %{
-        address_hash: smart_contract.address_hash,
-        tx_hash: fragment("CAST(NULL AS bytea)"),
-        block_hash: fragment("CAST(NULL AS bytea)"),
-        type: "contract",
-        name: smart_contract.name,
-        symbol: ^nil,
-        holder_count: ^nil,
-        inserted_at: address.inserted_at,
-        block_number: 0,
-        icon_url: nil,
-        token_type: nil,
-        timestamp: fragment("NULL::timestamp without time zone"),
-        verified: true,
-        exchange_rate: nil,
-        total_supply: nil,
-        circulating_market_cap: nil,
-        priority: 0,
-        is_verified_via_admin_panel: nil
-      }
+      select: ^contract_search_fields
     )
   end
 
   defp search_address_query(term) do
     case Chain.string_to_address_hash(term) do
       {:ok, address_hash} ->
+        address_search_fields = %{
+          address_hash: dynamic([address, _], address.hash),
+          block_hash: dynamic([_, _], type(^nil, :binary)),
+          tx_hash: dynamic([_, _], type(^nil, :binary)),
+          type: "address",
+          name: dynamic([_, address_name], address_name.name),
+          symbol: nil,
+          holder_count: nil,
+          inserted_at: dynamic([address, _], address.inserted_at),
+          block_number: 0,
+          icon_url: nil,
+          token_type: nil,
+          timestamp: dynamic([_, _], type(^nil, :utc_datetime_usec)),
+          verified: dynamic([address, _], address.verified),
+          exchange_rate: nil,
+          total_supply: nil,
+          circulating_market_cap: nil,
+          priority: 0,
+          is_verified_via_admin_panel: nil
+        }
+
         from(address in Address,
           left_join:
             address_name in subquery(
@@ -308,26 +347,7 @@ defmodule Explorer.Chain.Search do
             ),
           on: address.hash == address_name.address_hash,
           where: address.hash == ^address_hash,
-          select: %{
-            address_hash: address.hash,
-            tx_hash: fragment("CAST(NULL AS bytea)"),
-            block_hash: fragment("CAST(NULL AS bytea)"),
-            type: "address",
-            name: address_name.name,
-            symbol: ^nil,
-            holder_count: ^nil,
-            inserted_at: address.inserted_at,
-            block_number: 0,
-            icon_url: nil,
-            token_type: nil,
-            timestamp: fragment("NULL::timestamp without time zone"),
-            verified: address.verified,
-            exchange_rate: nil,
-            total_supply: nil,
-            circulating_market_cap: nil,
-            priority: 0,
-            is_verified_via_admin_panel: nil
-          }
+          select: ^address_search_fields
         )
 
       _ ->
@@ -338,30 +358,32 @@ defmodule Explorer.Chain.Search do
   defp search_tx_query(term) do
     case Chain.string_to_transaction_hash(term) do
       {:ok, tx_hash} ->
+        transaction_search_fields = %{
+          address_hash: dynamic([_, _], type(^nil, :binary)),
+          tx_hash: dynamic([transaction, _], transaction.hash),
+          block_hash: dynamic([_, _], type(^nil, :binary)),
+          type: "transaction",
+          name: nil,
+          symbol: nil,
+          holder_count: nil,
+          inserted_at: dynamic([transaction, _], transaction.inserted_at),
+          block_number: 0,
+          icon_url: nil,
+          token_type: nil,
+          timestamp: dynamic([_, block], block.timestamp),
+          verified: nil,
+          exchange_rate: nil,
+          total_supply: nil,
+          circulating_market_cap: nil,
+          priority: 0,
+          is_verified_via_admin_panel: nil
+        }
+
         from(transaction in Transaction,
           left_join: block in Block,
           on: transaction.block_hash == block.hash,
           where: transaction.hash == ^tx_hash,
-          select: %{
-            address_hash: fragment("CAST(NULL AS bytea)"),
-            tx_hash: transaction.hash,
-            block_hash: fragment("CAST(NULL AS bytea)"),
-            type: "transaction",
-            name: ^nil,
-            symbol: ^nil,
-            holder_count: ^nil,
-            inserted_at: transaction.inserted_at,
-            block_number: 0,
-            icon_url: nil,
-            token_type: nil,
-            timestamp: block.timestamp,
-            verified: nil,
-            exchange_rate: nil,
-            total_supply: nil,
-            circulating_market_cap: nil,
-            priority: 0,
-            is_verified_via_admin_panel: nil
-          }
+          select: ^transaction_search_fields
         )
 
       _ ->
@@ -370,30 +392,32 @@ defmodule Explorer.Chain.Search do
   end
 
   defp search_block_query(term) do
+    block_search_fields = %{
+      address_hash: dynamic([_], type(^nil, :binary)),
+      tx_hash: dynamic([_], type(^nil, :binary)),
+      block_hash: dynamic([block], block.hash),
+      type: "block",
+      name: nil,
+      symbol: nil,
+      holder_count: nil,
+      inserted_at: dynamic([block], block.inserted_at),
+      block_number: dynamic([block], block.number),
+      icon_url: nil,
+      token_type: nil,
+      timestamp: dynamic([block], block.timestamp),
+      verified: nil,
+      exchange_rate: nil,
+      total_supply: nil,
+      circulating_market_cap: nil,
+      priority: 0,
+      is_verified_via_admin_panel: nil
+    }
+
     case Chain.string_to_block_hash(term) do
       {:ok, block_hash} ->
         from(block in Block,
           where: block.hash == ^block_hash,
-          select: %{
-            address_hash: fragment("CAST(NULL AS bytea)"),
-            tx_hash: fragment("CAST(NULL AS bytea)"),
-            block_hash: block.hash,
-            type: "block",
-            name: ^nil,
-            symbol: ^nil,
-            holder_count: ^nil,
-            inserted_at: block.inserted_at,
-            block_number: block.number,
-            icon_url: nil,
-            token_type: nil,
-            timestamp: block.timestamp,
-            verified: nil,
-            exchange_rate: nil,
-            total_supply: nil,
-            circulating_market_cap: nil,
-            priority: 0,
-            is_verified_via_admin_panel: nil
-          }
+          select: ^block_search_fields
         )
 
       _ ->
@@ -401,26 +425,7 @@ defmodule Explorer.Chain.Search do
           {block_number, ""} ->
             from(block in Block,
               where: block.number == ^block_number,
-              select: %{
-                address_hash: fragment("CAST(NULL AS bytea)"),
-                tx_hash: fragment("CAST(NULL AS bytea)"),
-                block_hash: block.hash,
-                type: "block",
-                name: ^nil,
-                symbol: ^nil,
-                holder_count: ^nil,
-                inserted_at: block.inserted_at,
-                block_number: block.number,
-                icon_url: nil,
-                token_type: nil,
-                timestamp: block.timestamp,
-                verified: nil,
-                exchange_rate: nil,
-                total_supply: nil,
-                circulating_market_cap: nil,
-                priority: 0,
-                is_verified_via_admin_panel: nil
-              }
+              select: ^block_search_fields
             )
 
           _ ->

From 13e9ccec3804d4d618cfc0402fdbe715afc85165 Mon Sep 17 00:00:00 2001
From: nikitosing <32202610+nikitosing@users.noreply.github.com>
Date: Thu, 9 Nov 2023 15:19:27 +0300
Subject: [PATCH 635/909] Enable API v2 by default (#8802)

* Enable API v2 by default

* Changelog
---
 .github/workflows/config.yml | 1 -
 CHANGELOG.md                 | 1 +
 config/runtime.exs           | 2 +-
 3 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/config.yml b/.github/workflows/config.yml
index 75e35d9df679..0b7346dc7b11 100644
--- a/.github/workflows/config.yml
+++ b/.github/workflows/config.yml
@@ -637,5 +637,4 @@ jobs:
           ADMIN_PANEL_ENABLED: "true"
           ACCOUNT_ENABLED: "true"
           ACCOUNT_REDIS_URL: "redis://localhost:6379"
-          API_V2_ENABLED: "true"
           SOURCIFY_INTEGRATION_ENABLED: "true"
diff --git a/CHANGELOG.md b/CHANGELOG.md
index bbd2315d761a..7422a7055f45 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -20,6 +20,7 @@
 
 ### Chore
 
+- [#8802](https://github.com/blockscout/blockscout/pull/8802) - Enable API v2 by default
 - [#8728](https://github.com/blockscout/blockscout/pull/8728) - Remove repos_list (default value for ecto repos) from Explorer.ReleaseTasks
 
 <details>
diff --git a/config/runtime.exs b/config/runtime.exs
index 8c8baee4fa63..1d1a7341e72b 100644
--- a/config/runtime.exs
+++ b/config/runtime.exs
@@ -132,7 +132,7 @@ config :block_scout_web, :chart,
 config :block_scout_web, BlockScoutWeb.Chain.Address.CoinBalance,
   coin_balance_history_days: ConfigHelper.parse_integer_env_var("COIN_BALANCE_HISTORY_DAYS", 10)
 
-config :block_scout_web, BlockScoutWeb.API.V2, enabled: ConfigHelper.parse_bool_env_var("API_V2_ENABLED")
+config :block_scout_web, BlockScoutWeb.API.V2, enabled: ConfigHelper.parse_bool_env_var("API_V2_ENABLED", "true")
 
 # Configures Ueberauth's Auth0 auth provider
 config :ueberauth, Ueberauth.Strategy.Auth0.OAuth,

From aec92611784ea05ffa138b26edf1893ee8023e8a Mon Sep 17 00:00:00 2001
From: Maxim Filonov <53992153+sl1depengwyn@users.noreply.github.com>
Date: Tue, 1 Aug 2023 17:46:42 +0300
Subject: [PATCH 636/909] Add rootstock specific fields (#8076)

* Add rootstock fields to block structere

* Add rootstock fetcher
---
 .../views/api/v2/block_view.ex                |  12 ++
 apps/ethereum_jsonrpc/lib/ethereum_jsonrpc.ex |   6 +-
 .../lib/ethereum_jsonrpc/block.ex             |  65 +++++--
 .../lib/ethereum_jsonrpc/blocks.ex            |   7 +-
 .../test/ethereum_jsonrpc/block_test.exs      |   7 +-
 apps/explorer/lib/explorer/chain/block.ex     |  34 +++-
 ...4094744_add_rootstock_fields_to_blocks.exs |  13 ++
 .../lib/indexer/fetcher/rootstock_data.ex     | 168 ++++++++++++++++++
 apps/indexer/lib/indexer/supervisor.ex        |   2 +
 .../indexer/fetcher/rootstock_data_test.exs   | 134 ++++++++++++++
 .../fetcher/rootstock_data_supervisor_case.ex |  17 ++
 config/runtime.exs                            |   9 +
 docker-compose/envs/common-blockscout.env     |   5 +
 13 files changed, 462 insertions(+), 17 deletions(-)
 create mode 100644 apps/explorer/priv/repo/migrations/20230724094744_add_rootstock_fields_to_blocks.exs
 create mode 100644 apps/indexer/lib/indexer/fetcher/rootstock_data.ex
 create mode 100644 apps/indexer/test/indexer/fetcher/rootstock_data_test.exs
 create mode 100644 apps/indexer/test/support/indexer/fetcher/rootstock_data_supervisor_case.ex

diff --git a/apps/block_scout_web/lib/block_scout_web/views/api/v2/block_view.ex b/apps/block_scout_web/lib/block_scout_web/views/api/v2/block_view.ex
index c4793dbacedf..3d6e3f57f004 100644
--- a/apps/block_scout_web/lib/block_scout_web/views/api/v2/block_view.ex
+++ b/apps/block_scout_web/lib/block_scout_web/views/api/v2/block_view.ex
@@ -61,6 +61,7 @@ defmodule BlockScoutWeb.API.V2.BlockView do
       "tx_fees" => tx_fees,
       "withdrawals_count" => count_withdrawals(block)
     }
+    |> add_rootstock_fields(block, single_block?)
   end
 
   def prepare_rewards(rewards, block, single_block?) do
@@ -115,4 +116,15 @@ defmodule BlockScoutWeb.API.V2.BlockView do
 
   def count_withdrawals(%Block{withdrawals: withdrawals}) when is_list(withdrawals), do: Enum.count(withdrawals)
   def count_withdrawals(_), do: nil
+
+  defp add_rootstock_fields(prepared_block, _block, false), do: prepared_block
+
+  defp add_rootstock_fields(prepared_block, block, true) do
+    prepared_block
+    |> Map.put("minimum_gas_price", block.minimum_gas_price)
+    |> Map.put("bitcoin_merged_mining_header", block.bitcoin_merged_mining_header)
+    |> Map.put("bitcoin_merged_mining_coinbase_transaction", block.bitcoin_merged_mining_coinbase_transaction)
+    |> Map.put("bitcoin_merged_mining_merkle_proof", block.bitcoin_merged_mining_merkle_proof)
+    |> Map.put("hash_for_merged_mining", block.hash_for_merged_mining)
+  end
 end
diff --git a/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc.ex b/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc.ex
index 3b67a4dd7f5a..abad4cdfb3cd 100644
--- a/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc.ex
+++ b/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc.ex
@@ -277,12 +277,12 @@ defmodule EthereumJSONRPC do
   @doc """
   Fetches blocks by block number list.
   """
-  @spec fetch_blocks_by_numbers([block_number()], json_rpc_named_arguments) ::
+  @spec fetch_blocks_by_numbers([block_number()], json_rpc_named_arguments, boolean()) ::
           {:ok, Blocks.t()} | {:error, reason :: term}
-  def fetch_blocks_by_numbers(block_numbers, json_rpc_named_arguments) do
+  def fetch_blocks_by_numbers(block_numbers, json_rpc_named_arguments, with_transactions? \\ true) do
     block_numbers
     |> Enum.map(fn number -> %{number: number} end)
-    |> fetch_blocks_by_params(&Block.ByNumber.request/1, json_rpc_named_arguments)
+    |> fetch_blocks_by_params(&Block.ByNumber.request(&1, with_transactions?), json_rpc_named_arguments)
   end
 
   @doc """
diff --git a/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/block.ex b/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/block.ex
index 5737aa909651..ea841f483d06 100644
--- a/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/block.ex
+++ b/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/block.ex
@@ -30,7 +30,12 @@ defmodule EthereumJSONRPC.Block do
           transactions_root: EthereumJSONRPC.hash(),
           uncles: [EthereumJSONRPC.hash()],
           base_fee_per_gas: non_neg_integer(),
-          withdrawals_root: EthereumJSONRPC.hash()
+          withdrawals_root: EthereumJSONRPC.hash(),
+          minimum_gas_price: non_neg_integer(),
+          bitcoin_merged_mining_header: EthereumJSONRPC.data(),
+          bitcoin_merged_mining_coinbase_transaction: EthereumJSONRPC.data(),
+          bitcoin_merged_mining_merkle_proof: EthereumJSONRPC.data(),
+          hash_for_merged_mining: EthereumJSONRPC.data()
         }
 
   @typedoc """
@@ -69,6 +74,11 @@ defmodule EthereumJSONRPC.Block do
      `t:EthereumJSONRPC.hash/0`.
    * `"baseFeePerGas"` - `t:EthereumJSONRPC.quantity/0` of wei to denote amount of fee burned per unit gas used. Introduced in [EIP-1559](https://github.com/ethereum/EIPs/blob/master/EIPS/eip-1559.md)
    * `"withdrawalsRoot"` - `t:EthereumJSONRPC.hash/0` of the root of the withdrawals.
+   * `"minimumGasPrice"` - `t:EthereumJSONRPC.quantity/0` of the minimum gas price for this block.
+   * `"bitcoinMergedMiningHeader"` - `t:EthereumJSONRPC.data/0` of the Bitcoin merged mining header.
+   * `"bitcoinMergedMiningCoinbaseTransaction"` - `t:EthereumJSONRPC.data/0` of the Bitcoin merged mining coinbase transaction.
+   * `"bitcoinMergedMiningMerkleProof"` - `t:EthereumJSONRPC.data/0` of the Bitcoin merged mining merkle proof.
+   * `"hashForMergedMining"` - `t:EthereumJSONRPC.data/0` of the hash for merged mining.
   """
   @type t :: %{String.t() => EthereumJSONRPC.data() | EthereumJSONRPC.hash() | EthereumJSONRPC.quantity() | nil}
 
@@ -120,7 +130,12 @@ defmodule EthereumJSONRPC.Block do
       ...>     "totalDifficulty" => 340282366920938463463374607431465668165,
       ...>     "transactions" => [],
       ...>     "transactionsRoot" => "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-      ...>     "uncles" => []
+      ...>     "uncles" => [],
+      ...>     "minimumGasPrice" => 345786,
+      ...>     "bitcoinMergedMiningHeader" => "0x00006d20ffd048280094a6ea0851d854036aacaa25ee0f23f0040200000000000000000078d2638fe0b4477c54601e6449051afba8228e0a88ff06b0c91f091fd34d5da57487c76402610517372c2fe9",
+      ...>     "bitcoinMergedMiningCoinbaseTransaction" => "0x00000000000000805bf0dc9203da49a3b4e3ec913806e43102cc07db991272dc8b7018da57eb5abe59a32d070000ffffffff03449a4d26000000001976a914536ffa992491508dca0354e52f32a3a7a679a53a88ac00000000000000002b6a2952534b424c4f434b3ad2508d21d28c8f89d495923c0758ec3f64bd6755b4ec416f5601312600542a400000000000000000266a24aa21a9ed4ae42ea6dca2687aaed665714bf58b055c4e11f2fb038605930d630b49ad7b9d00000000",
+      ...>     "bitcoinMergedMiningMerkleProof" => "0x8e5a4ba74eb4eb2f9ad4cabc2913aeed380a5becf7cd4d513341617efb798002bd83a783c31c66a8a8f6cc56c071c2d471cb610e3dc13054b9d216021d8c7e9112f622564449ebedcedf7d4ccb6fe0ffac861b7ed1446c310813cdf712e1e6add28b1fe1c0ae5e916194ba4f285a9340aba41e91bf847bf31acf37a9623a04a2348a37ab9faa5908122db45596bbc03e9c3644b0d4589471c4ff30fc139f3ba50506e9136fa0df799b487494de3e2b3dec937338f1a2e18da057c1f60590a9723672a4355b9914b1d01af9f582d9e856f6e1744be00f268b0b01d559329f7e0685aa63ffeb7c28486d7462292021d1345cddbf7c920ca34bb7aa4c6cdbe068806e35d0db662e7fcda03cb4d779594638c62a1fdd7ec98d1fb6d240d853958abe57561d9b9d0465cf8b9d6ee3c58b0d8b07d6c4c5d8f348e43fe3c06011b6a0008db4e0b16c77ececc3981f9008201cea5939869d648e59a09bd2094b1196ff61126bffb626153deed2563e1745436247c94a85d2947756b606d67633781c99d7",
+      ...>     "hashForMergedMining" => "0xd2508d21d28c8f89d495923c0758ec3f64bd6755b4ec416f5601312600542a40",
       ...>   }
       ...> )
       %{
@@ -143,7 +158,12 @@ defmodule EthereumJSONRPC.Block do
         total_difficulty: 340282366920938463463374607431465668165,
         transactions_root: "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
         uncles: [],
-        withdrawals_root: "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421"
+        withdrawals_root: "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+        bitcoin_merged_mining_coinbase_transaction: "0x00000000000000805bf0dc9203da49a3b4e3ec913806e43102cc07db991272dc8b7018da57eb5abe59a32d070000ffffffff03449a4d26000000001976a914536ffa992491508dca0354e52f32a3a7a679a53a88ac00000000000000002b6a2952534b424c4f434b3ad2508d21d28c8f89d495923c0758ec3f64bd6755b4ec416f5601312600542a400000000000000000266a24aa21a9ed4ae42ea6dca2687aaed665714bf58b055c4e11f2fb038605930d630b49ad7b9d00000000",
+        bitcoin_merged_mining_header: "0x00006d20ffd048280094a6ea0851d854036aacaa25ee0f23f0040200000000000000000078d2638fe0b4477c54601e6449051afba8228e0a88ff06b0c91f091fd34d5da57487c76402610517372c2fe9",
+        bitcoin_merged_mining_merkle_proof: "0x8e5a4ba74eb4eb2f9ad4cabc2913aeed380a5becf7cd4d513341617efb798002bd83a783c31c66a8a8f6cc56c071c2d471cb610e3dc13054b9d216021d8c7e9112f622564449ebedcedf7d4ccb6fe0ffac861b7ed1446c310813cdf712e1e6add28b1fe1c0ae5e916194ba4f285a9340aba41e91bf847bf31acf37a9623a04a2348a37ab9faa5908122db45596bbc03e9c3644b0d4589471c4ff30fc139f3ba50506e9136fa0df799b487494de3e2b3dec937338f1a2e18da057c1f60590a9723672a4355b9914b1d01af9f582d9e856f6e1744be00f268b0b01d559329f7e0685aa63ffeb7c28486d7462292021d1345cddbf7c920ca34bb7aa4c6cdbe068806e35d0db662e7fcda03cb4d779594638c62a1fdd7ec98d1fb6d240d853958abe57561d9b9d0465cf8b9d6ee3c58b0d8b07d6c4c5d8f348e43fe3c06011b6a0008db4e0b16c77ececc3981f9008201cea5939869d648e59a09bd2094b1196ff61126bffb626153deed2563e1745436247c94a85d2947756b606d67633781c99d7",
+        hash_for_merged_mining: "0xd2508d21d28c8f89d495923c0758ec3f64bd6755b4ec416f5601312600542a40",
+        minimum_gas_price: 345786
       }
 
   [Geth] `elixir` can be converted to params
@@ -192,7 +212,12 @@ defmodule EthereumJSONRPC.Block do
         total_difficulty: 1039309006117,
         transactions_root: "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
         uncles: [],
-        withdrawals_root: "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421"
+        withdrawals_root: "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+        bitcoin_merged_mining_coinbase_transaction: nil,
+        bitcoin_merged_mining_header: nil,
+        bitcoin_merged_mining_merkle_proof: nil,
+        hash_for_merged_mining: nil,
+        minimum_gas_price: nil
       }
 
   """
@@ -241,7 +266,12 @@ defmodule EthereumJSONRPC.Block do
       uncles: uncles,
       base_fee_per_gas: base_fee_per_gas,
       withdrawals_root:
-        Map.get(elixir, "withdrawalsRoot", "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421")
+        Map.get(elixir, "withdrawalsRoot", "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421"),
+      minimum_gas_price: Map.get(elixir, "minimumGasPrice"),
+      bitcoin_merged_mining_header: Map.get(elixir, "bitcoinMergedMiningHeader"),
+      bitcoin_merged_mining_coinbase_transaction: Map.get(elixir, "bitcoinMergedMiningCoinbaseTransaction"),
+      bitcoin_merged_mining_merkle_proof: Map.get(elixir, "bitcoinMergedMiningMerkleProof"),
+      hash_for_merged_mining: Map.get(elixir, "hashForMergedMining")
     }
   end
 
@@ -287,7 +317,12 @@ defmodule EthereumJSONRPC.Block do
       uncles: uncles,
       base_fee_per_gas: base_fee_per_gas,
       withdrawals_root:
-        Map.get(elixir, "withdrawalsRoot", "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421")
+        Map.get(elixir, "withdrawalsRoot", "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421"),
+      minimum_gas_price: Map.get(elixir, "minimumGasPrice"),
+      bitcoin_merged_mining_header: Map.get(elixir, "bitcoinMergedMiningHeader"),
+      bitcoin_merged_mining_coinbase_transaction: Map.get(elixir, "bitcoinMergedMiningCoinbaseTransaction"),
+      bitcoin_merged_mining_merkle_proof: Map.get(elixir, "bitcoinMergedMiningMerkleProof"),
+      hash_for_merged_mining: Map.get(elixir, "hashForMergedMining")
     }
   end
 
@@ -333,7 +368,12 @@ defmodule EthereumJSONRPC.Block do
       transactions_root: transactions_root,
       uncles: uncles,
       withdrawals_root:
-        Map.get(elixir, "withdrawalsRoot", "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421")
+        Map.get(elixir, "withdrawalsRoot", "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421"),
+      minimum_gas_price: Map.get(elixir, "minimumGasPrice"),
+      bitcoin_merged_mining_header: Map.get(elixir, "bitcoinMergedMiningHeader"),
+      bitcoin_merged_mining_coinbase_transaction: Map.get(elixir, "bitcoinMergedMiningCoinbaseTransaction"),
+      bitcoin_merged_mining_merkle_proof: Map.get(elixir, "bitcoinMergedMiningMerkleProof"),
+      hash_for_merged_mining: Map.get(elixir, "hashForMergedMining")
     }
   end
 
@@ -378,7 +418,12 @@ defmodule EthereumJSONRPC.Block do
       transactions_root: transactions_root,
       uncles: uncles,
       withdrawals_root:
-        Map.get(elixir, "withdrawalsRoot", "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421")
+        Map.get(elixir, "withdrawalsRoot", "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421"),
+      minimum_gas_price: Map.get(elixir, "minimumGasPrice"),
+      bitcoin_merged_mining_header: Map.get(elixir, "bitcoinMergedMiningHeader"),
+      bitcoin_merged_mining_coinbase_transaction: Map.get(elixir, "bitcoinMergedMiningCoinbaseTransaction"),
+      bitcoin_merged_mining_merkle_proof: Map.get(elixir, "bitcoinMergedMiningMerkleProof"),
+      hash_for_merged_mining: Map.get(elixir, "hashForMergedMining")
     }
   end
 
@@ -685,7 +730,7 @@ defmodule EthereumJSONRPC.Block do
   end
 
   defp entry_to_elixir({key, quantity}, _block)
-       when key in ~w(difficulty gasLimit gasUsed minimumGasPrice baseFeePerGas number size cumulativeDifficulty totalDifficulty paidFees) and
+       when key in ~w(difficulty gasLimit gasUsed minimumGasPrice baseFeePerGas number size cumulativeDifficulty totalDifficulty paidFees minimumGasPrice) and
               not is_nil(quantity) do
     {key, quantity_to_integer(quantity)}
   end
@@ -700,7 +745,7 @@ defmodule EthereumJSONRPC.Block do
   # hash format
   defp entry_to_elixir({key, _} = entry, _block)
        when key in ~w(author extraData hash logsBloom miner mixHash nonce parentHash receiptsRoot sealFields sha3Uncles
-                     signature stateRoot step transactionsRoot uncles withdrawalsRoot),
+                     signature stateRoot step transactionsRoot uncles withdrawalsRoot bitcoinMergedMiningHeader bitcoinMergedMiningCoinbaseTransaction bitcoinMergedMiningMerkleProof hashForMergedMining),
        do: entry
 
   defp entry_to_elixir({"timestamp" = key, timestamp}, _block) do
diff --git a/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/blocks.ex b/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/blocks.ex
index a501a16bc817..4a79b51687f3 100644
--- a/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/blocks.ex
+++ b/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/blocks.ex
@@ -117,7 +117,12 @@ defmodule EthereumJSONRPC.Blocks do
           total_difficulty: 131072,
           transactions_root: "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
           uncles: ["0xe670ec64341771606e55d6b4ca35a1a6b75ee3d5145a99d05921026d15273311"],
-          withdrawals_root: "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421"
+          withdrawals_root: "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+          bitcoin_merged_mining_coinbase_transaction: nil,
+          bitcoin_merged_mining_header: nil,
+          bitcoin_merged_mining_merkle_proof: nil,
+          hash_for_merged_mining: nil,
+          minimum_gas_price: nil
         }
       ]
 
diff --git a/apps/ethereum_jsonrpc/test/ethereum_jsonrpc/block_test.exs b/apps/ethereum_jsonrpc/test/ethereum_jsonrpc/block_test.exs
index 4f59274e8533..5f0e59c91cd8 100644
--- a/apps/ethereum_jsonrpc/test/ethereum_jsonrpc/block_test.exs
+++ b/apps/ethereum_jsonrpc/test/ethereum_jsonrpc/block_test.exs
@@ -53,7 +53,12 @@ defmodule EthereumJSONRPC.BlockTest do
                total_difficulty: nil,
                transactions_root: "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
                uncles: [],
-               withdrawals_root: "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421"
+               withdrawals_root: "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+               bitcoin_merged_mining_coinbase_transaction: nil,
+               bitcoin_merged_mining_header: nil,
+               bitcoin_merged_mining_merkle_proof: nil,
+               hash_for_merged_mining: nil,
+               minimum_gas_price: nil
              }
     end
   end
diff --git a/apps/explorer/lib/explorer/chain/block.ex b/apps/explorer/lib/explorer/chain/block.ex
index a1ab2d19e6a8..6cef72ae5e07 100644
--- a/apps/explorer/lib/explorer/chain/block.ex
+++ b/apps/explorer/lib/explorer/chain/block.ex
@@ -10,7 +10,7 @@ defmodule Explorer.Chain.Block do
   alias Explorer.Chain.{Address, Block, Gas, Hash, PendingBlockOperation, Transaction, Wei, Withdrawal}
   alias Explorer.Chain.Block.{Reward, SecondDegreeRelation}
 
-  @optional_attrs ~w(size refetch_needed total_difficulty difficulty base_fee_per_gas)a
+  @optional_attrs ~w(size refetch_needed total_difficulty difficulty base_fee_per_gas minimum_gas_price bitcoin_merged_mining_header bitcoin_merged_mining_coinbase_transaction bitcoin_merged_mining_merkle_proof hash_for_merged_mining)a
 
   @required_attrs ~w(consensus gas_limit gas_used hash miner_hash nonce number parent_hash timestamp)a
 
@@ -65,7 +65,12 @@ defmodule Explorer.Chain.Block do
           transactions: %Ecto.Association.NotLoaded{} | [Transaction.t()],
           refetch_needed: boolean(),
           base_fee_per_gas: Wei.t(),
-          is_empty: boolean()
+          is_empty: boolean(),
+          minimum_gas_price: Decimal.t(),
+          bitcoin_merged_mining_header: binary(),
+          bitcoin_merged_mining_coinbase_transaction: binary(),
+          bitcoin_merged_mining_merkle_proof: binary(),
+          hash_for_merged_mining: binary()
         }
 
   @primary_key {:hash, Hash.Full, autogenerate: false}
@@ -82,6 +87,11 @@ defmodule Explorer.Chain.Block do
     field(:refetch_needed, :boolean)
     field(:base_fee_per_gas, Wei)
     field(:is_empty, :boolean)
+    field(:minimum_gas_price, :decimal)
+    field(:bitcoin_merged_mining_header, :binary)
+    field(:bitcoin_merged_mining_coinbase_transaction, :binary)
+    field(:bitcoin_merged_mining_merkle_proof, :binary)
+    field(:hash_for_merged_mining, :binary)
 
     timestamps()
 
@@ -159,4 +169,24 @@ defmodule Explorer.Chain.Block do
   end
 
   def block_type_filter(query, "Uncle"), do: where(query, [block], block.consensus == false)
+
+  @doc """
+  Returns query that fetches up to `limit` of consensus blocks
+  that are missing rootstock data ordered by number desc.
+  """
+  @spec blocks_without_rootstock_data_query(non_neg_integer()) :: Ecto.Query.t()
+  def blocks_without_rootstock_data_query(limit) do
+    from(
+      block in __MODULE__,
+      where:
+        is_nil(block.minimum_gas_price) or
+          is_nil(block.bitcoin_merged_mining_header) or
+          is_nil(block.bitcoin_merged_mining_coinbase_transaction) or
+          is_nil(block.bitcoin_merged_mining_merkle_proof) or
+          is_nil(block.hash_for_merged_mining),
+      where: block.consensus == true,
+      limit: ^limit,
+      order_by: [desc: block.number]
+    )
+  end
 end
diff --git a/apps/explorer/priv/repo/migrations/20230724094744_add_rootstock_fields_to_blocks.exs b/apps/explorer/priv/repo/migrations/20230724094744_add_rootstock_fields_to_blocks.exs
new file mode 100644
index 000000000000..a5ebc7c614b5
--- /dev/null
+++ b/apps/explorer/priv/repo/migrations/20230724094744_add_rootstock_fields_to_blocks.exs
@@ -0,0 +1,13 @@
+defmodule Explorer.Repo.Migrations.AddRootstockFieldsToBlocks do
+  use Ecto.Migration
+
+  def change do
+    alter table(:blocks) do
+      add(:minimum_gas_price, :decimal)
+      add(:bitcoin_merged_mining_header, :bytea)
+      add(:bitcoin_merged_mining_coinbase_transaction, :bytea)
+      add(:bitcoin_merged_mining_merkle_proof, :bytea)
+      add(:hash_for_merged_mining, :bytea)
+    end
+  end
+end
diff --git a/apps/indexer/lib/indexer/fetcher/rootstock_data.ex b/apps/indexer/lib/indexer/fetcher/rootstock_data.ex
new file mode 100644
index 000000000000..fc23769be4d1
--- /dev/null
+++ b/apps/indexer/lib/indexer/fetcher/rootstock_data.ex
@@ -0,0 +1,168 @@
+defmodule Indexer.Fetcher.RootstockData do
+  @moduledoc """
+  Refetch `minimum_gas_price`, `bitcoin_merged_mining_header`, `bitcoin_merged_mining_coinbase_transaction`,
+  `bitcoin_merged_mining_merkle_proof`, `hash_for_merged_mining` fields for blocks that were indexed before app update.
+  """
+
+  use GenServer
+  use Indexer.Fetcher
+
+  require Logger
+
+  alias EthereumJSONRPC.Blocks
+  alias Explorer.Chain.Block
+  alias Explorer.Repo
+
+  @interval :timer.seconds(3)
+  @batch_size 10
+  @concurrency 5
+  @db_batch_size 300
+
+  defstruct blocks_to_fetch: [],
+            interval: @interval,
+            json_rpc_named_arguments: [],
+            batch_size: @batch_size,
+            max_concurrency: @concurrency,
+            db_batch_size: @db_batch_size
+
+  def child_spec([init_arguments]) do
+    child_spec([init_arguments, []])
+  end
+
+  def child_spec([_init_arguments, _gen_server_options] = start_link_arguments) do
+    default = %{
+      id: __MODULE__,
+      start: {__MODULE__, :start_link, start_link_arguments}
+    }
+
+    Supervisor.child_spec(default, restart: :transient)
+  end
+
+  def start_link(arguments, gen_server_options \\ []) do
+    GenServer.start_link(__MODULE__, arguments, gen_server_options)
+  end
+
+  @impl GenServer
+  def init(opts) when is_list(opts) do
+    Logger.metadata(fetcher: :rootstock_data)
+
+    json_rpc_named_arguments = opts[:json_rpc_named_arguments]
+
+    unless json_rpc_named_arguments do
+      raise ArgumentError,
+            ":json_rpc_named_arguments must be provided to `#{__MODULE__}.init to allow for json_rpc calls when running."
+    end
+
+    state = %__MODULE__{
+      blocks_to_fetch: nil,
+      interval: Application.get_env(:indexer, __MODULE__)[:interval] || @interval,
+      json_rpc_named_arguments: json_rpc_named_arguments,
+      batch_size: Application.get_env(:indexer, __MODULE__)[:batch_size] || @batch_size,
+      max_concurrency: Application.get_env(:indexer, __MODULE__)[:max_concurrency] || @concurrency,
+      db_batch_size: Application.get_env(:indexer, __MODULE__)[:db_batch_size] || @db_batch_size
+    }
+
+    Process.send_after(self(), :fetch_rootstock_data, state.interval)
+
+    {:ok, state, {:continue, :fetch_blocks}}
+  end
+
+  @impl GenServer
+  def handle_continue(:fetch_blocks, state), do: fetch_blocks(state)
+
+  @impl GenServer
+  def handle_info(:fetch_blocks, state), do: fetch_blocks(state)
+
+  @impl GenServer
+  def handle_info(
+        :fetch_rootstock_data,
+        %__MODULE__{
+          blocks_to_fetch: blocks_to_fetch,
+          interval: interval,
+          json_rpc_named_arguments: json_rpc_named_arguments,
+          batch_size: batch_size,
+          max_concurrency: concurrency
+        } = state
+      ) do
+    if Enum.empty?(blocks_to_fetch) do
+      send(self(), :fetch_blocks)
+      {:noreply, state}
+    else
+      new_blocks_to_fetch =
+        blocks_to_fetch
+        |> Stream.chunk_every(batch_size)
+        |> Task.async_stream(
+          &{EthereumJSONRPC.fetch_blocks_by_numbers(
+             Enum.map(&1, fn b -> b.number end),
+             json_rpc_named_arguments,
+             false
+           ), &1},
+          max_concurrency: concurrency,
+          timeout: :infinity,
+          zip_input_on_exit: true
+        )
+        |> Enum.reduce([], &fetch_reducer/2)
+
+      Process.send_after(self(), :fetch_rootstock_data, interval)
+
+      {:noreply, %__MODULE__{state | blocks_to_fetch: new_blocks_to_fetch}}
+    end
+  end
+
+  def handle_info({ref, _result}, state) do
+    Process.demonitor(ref, [:flush])
+    {:noreply, state}
+  end
+
+  def handle_info(
+        {:DOWN, _ref, :process, _pid, reason},
+        state
+      ) do
+    if reason === :normal do
+      {:noreply, state}
+    else
+      Logger.error(fn -> "Rootstock data fetcher task exited due to #{inspect(reason)}." end)
+      {:noreply, state}
+    end
+  end
+
+  defp fetch_blocks(%__MODULE__{db_batch_size: db_batch_size} = state) do
+    blocks_to_fetch = db_batch_size |> Block.blocks_without_rootstock_data_query() |> Repo.all()
+
+    if Enum.empty?(blocks_to_fetch) do
+      Logger.info("Rootstock data from old blocks are fetched.")
+
+      {:stop, :normal, state}
+    else
+      [%Block{number: max_number} | _] = blocks_to_fetch
+
+      Logger.info(
+        "Rootstock data will now be fetched for #{Enum.count(blocks_to_fetch)} blocks starting from #{max_number}."
+      )
+
+      {:noreply, %__MODULE__{state | blocks_to_fetch: blocks_to_fetch}}
+    end
+  end
+
+  defp fetch_reducer({:ok, {{:ok, %Blocks{blocks_params: block_params}}, blocks}}, acc) do
+    blocks_map = Map.new(blocks, fn b -> {b.number, b} end)
+
+    for block_param <- block_params,
+        block = blocks_map[block_param.number],
+        block_param.hash == to_string(block.hash) do
+      block |> Block.changeset(block_param) |> Repo.update()
+    end
+
+    acc
+  end
+
+  defp fetch_reducer({:ok, {{:error, reason}, blocks}}, acc) do
+    Logger.error("failed to fetch: " <> inspect(reason) <> ". Retrying.")
+    [blocks | acc] |> List.flatten()
+  end
+
+  defp fetch_reducer({:exit, {blocks, reason}}, acc) do
+    Logger.error("failed to fetch: " <> inspect(reason) <> ". Retrying.")
+    [blocks | acc] |> List.flatten()
+  end
+end
diff --git a/apps/indexer/lib/indexer/supervisor.ex b/apps/indexer/lib/indexer/supervisor.ex
index c7afebbbcee0..97603fd0dfe5 100644
--- a/apps/indexer/lib/indexer/supervisor.ex
+++ b/apps/indexer/lib/indexer/supervisor.ex
@@ -28,6 +28,7 @@ defmodule Indexer.Supervisor do
     PendingTransaction,
     PolygonEdge,
     ReplacedTransaction,
+    RootstockData,
     Token,
     TokenBalance,
     TokenTotalSupplyUpdater,
@@ -151,6 +152,7 @@ defmodule Indexer.Supervisor do
          [[json_rpc_named_arguments: json_rpc_named_arguments, memory_monitor: memory_monitor]]},
         {PendingOpsCleaner, [[], []]},
         {PendingBlockOperationsSanitizer, [[]]},
+        {RootstockData.Supervisor, [[json_rpc_named_arguments: json_rpc_named_arguments]]},
 
         # Block fetchers
         configure(BlockRealtime.Supervisor, [
diff --git a/apps/indexer/test/indexer/fetcher/rootstock_data_test.exs b/apps/indexer/test/indexer/fetcher/rootstock_data_test.exs
new file mode 100644
index 000000000000..b3011a283421
--- /dev/null
+++ b/apps/indexer/test/indexer/fetcher/rootstock_data_test.exs
@@ -0,0 +1,134 @@
+defmodule Indexer.Fetcher.RootstockDataTest do
+  use EthereumJSONRPC.Case
+  use Explorer.DataCase
+
+  import Mox
+  import EthereumJSONRPC, only: [integer_to_quantity: 1]
+
+  alias Indexer.Fetcher.RootstockData
+
+  setup :verify_on_exit!
+  setup :set_mox_global
+
+  test "do not start when all old blocks are fetched", %{json_rpc_named_arguments: json_rpc_named_arguments} do
+    RootstockData.Supervisor.Case.start_supervised!(json_rpc_named_arguments: json_rpc_named_arguments)
+
+    :timer.sleep(300)
+
+    assert [{Indexer.Fetcher.RootstockData, :undefined, :worker, [Indexer.Fetcher.RootstockData]} | _] =
+             RootstockData.Supervisor |> Supervisor.which_children()
+  end
+
+  test "stops when all old blocks are fetched", %{json_rpc_named_arguments: json_rpc_named_arguments} do
+    block_a = insert(:block)
+    block_b = insert(:block)
+
+    block_a_number_string = integer_to_quantity(block_a.number)
+    block_b_number_string = integer_to_quantity(block_b.number)
+
+    EthereumJSONRPC.Mox
+    |> stub(:json_rpc, fn requests, _options ->
+      {:ok,
+       Enum.map(requests, fn
+         %{id: id, method: "eth_getBlockByNumber", params: [^block_a_number_string, false]} ->
+           %{
+             id: id,
+             result: %{
+               "author" => "0x5a0b54d5dc17e0aadc383d2db43b0a0d3e029c4c",
+               "difficulty" => "0x6bc767dd80781",
+               "extraData" => "0x5050594520737061726b706f6f6c2d6574682d7477",
+               "gasLimit" => "0x7a121d",
+               "gasUsed" => "0x79cbe9",
+               "hash" => to_string(block_a.hash),
+               "logsBloom" =>
+                 "0x044d42d008801488400e1809190200a80d06105bc0c4100b047895c0d518327048496108388040140010b8208006288102e206160e21052322440924002090c1c808a0817405ab238086d028211014058e949401012403210314896702d06880c815c3060a0f0809987c81044488292cc11d57882c912a808ca10471c84460460040000c0001012804022000a42106591881d34407420ba401e1c08a8d00a000a34c11821a80222818a4102152c8a0c044032080c6462644223104d618e0e544072008120104408205c60510542264808488220403000106281a0290404220112c10b080145028c8000300b18a2c8280701c882e702210b00410834840108084",
+               "miner" => to_string(block_a.miner),
+               "mixHash" => "0xda53ae7c2b3c529783d6cdacdb90587fd70eb651c0f04253e8ff17de97844010",
+               "nonce" => "0x0946e5f01fce12bc",
+               "number" => block_a_number_string,
+               "parentHash" => to_string(block_a.parent_hash),
+               "receiptsRoot" => "0xa7d2b82bd8526de11736c18bd5cc8cfe2692106c4364526f3310ad56d78669c4",
+               "sealFields" => [
+                 "0xa0da53ae7c2b3c529783d6cdacdb90587fd70eb651c0f04253e8ff17de97844010",
+                 "0x880946e5f01fce12bc"
+               ],
+               "sha3Uncles" => "0x483a8a21a5825ad270f358b3ea56e060bbb8b3082d9a92ec8fa17a5c7e6fc1b6",
+               "size" => "0x544c",
+               "stateRoot" => "0x85daa9cd528004c1609d4cb3520fd958e85983bb4183124a4a9f7137fd39c691",
+               "timestamp" => "0x5c8bc76e",
+               "totalDifficulty" => "0x201a42c35142ae94458",
+               "transactions" => [],
+               "transactionsRoot" => "0xcd6c12fa43cd4e92ad5c0bf232b30488bbcbfe273c5b4af0366fced0767d54db",
+               "uncles" => [],
+               "withdrawals" => [],
+               "minimumGasPrice" => "0x0",
+               "bitcoinMergedMiningHeader" =>
+                 "0x00006d20ffd048280094a6ea0851d854036aacaa25ee0f23f0040200000000000000000078d2638fe0b4477c54601e6449051afba8228e0a88ff06b0c91f091fd34d5da57487c76402610517372c2fe9",
+               "bitcoinMergedMiningCoinbaseTransaction" =>
+                 "0x00000000000000805bf0dc9203da49a3b4e3ec913806e43102cc07db991272dc8b7018da57eb5abe59a32d070000ffffffff03449a4d26000000001976a914536ffa992491508dca0354e52f32a3a7a679a53a88ac00000000000000002b6a2952534b424c4f434b3ad2508d21d28c8f89d495923c0758ec3f64bd6755b4ec416f5601312600542a400000000000000000266a24aa21a9ed4ae42ea6dca2687aaed665714bf58b055c4e11f2fb038605930d630b49ad7b9d00000000",
+               "bitcoinMergedMiningMerkleProof" =>
+                 "0x8e5a4ba74eb4eb2f9ad4cabc2913aeed380a5becf7cd4d513341617efb798002bd83a783c31c66a8a8f6cc56c071c2d471cb610e3dc13054b9d216021d8c7e9112f622564449ebedcedf7d4ccb6fe0ffac861b7ed1446c310813cdf712e1e6add28b1fe1c0ae5e916194ba4f285a9340aba41e91bf847bf31acf37a9623a04a2348a37ab9faa5908122db45596bbc03e9c3644b0d4589471c4ff30fc139f3ba50506e9136fa0df799b487494de3e2b3dec937338f1a2e18da057c1f60590a9723672a4355b9914b1d01af9f582d9e856f6e1744be00f268b0b01d559329f7e0685aa63ffeb7c28486d7462292021d1345cddbf7c920ca34bb7aa4c6cdbe068806e35d0db662e7fcda03cb4d779594638c62a1fdd7ec98d1fb6d240d853958abe57561d9b9d0465cf8b9d6ee3c58b0d8b07d6c4c5d8f348e43fe3c06011b6a0008db4e0b16c77ececc3981f9008201cea5939869d648e59a09bd2094b1196ff61126bffb626153deed2563e1745436247c94a85d2947756b606d67633781c99d7",
+               "hashForMergedMining" => "0xd2508d21d28c8f89d495923c0758ec3f64bd6755b4ec416f5601312600542a40"
+             }
+           }
+
+         %{id: id, method: "eth_getBlockByNumber", params: [^block_b_number_string, false]} ->
+           %{
+             id: id,
+             result: %{
+               "author" => "0x5a0b54d5dc17e0aadc383d2db43b0a0d3e029c4c",
+               "difficulty" => "0x6bc767dd80781",
+               "extraData" => "0x5050594520737061726b706f6f6c2d6574682d7477",
+               "gasLimit" => "0x7a121d",
+               "gasUsed" => "0x79cbe9",
+               "hash" => to_string(block_b.hash),
+               "logsBloom" =>
+                 "0x044d42d008801488400e1809190200a80d06105bc0c4100b047895c0d518327048496108388040140010b8208006288102e206160e21052322440924002090c1c808a0817405ab238086d028211014058e949401012403210314896702d06880c815c3060a0f0809987c81044488292cc11d57882c912a808ca10471c84460460040000c0001012804022000a42106591881d34407420ba401e1c08a8d00a000a34c11821a80222818a4102152c8a0c044032080c6462644223104d618e0e544072008120104408205c60510542264808488220403000106281a0290404220112c10b080145028c8000300b18a2c8280701c882e702210b00410834840108084",
+               "miner" => to_string(block_b.miner),
+               "mixHash" => "0xda53ae7c2b3c529783d6cdacdb90587fd70eb651c0f04253e8ff17de97844010",
+               "nonce" => "0x0946e5f01fce12bc",
+               "number" => block_b_number_string,
+               "parentHash" => to_string(block_b.parent_hash),
+               "receiptsRoot" => "0xa7d2b82bd8526de11736c18bd5cc8cfe2692106c4364526f3310ad56d78669c4",
+               "sealFields" => [
+                 "0xa0da53ae7c2b3c529783d6cdacdb90587fd70eb651c0f04253e8ff17de97844010",
+                 "0x880946e5f01fce12bc"
+               ],
+               "sha3Uncles" => "0x483a8a21a5825ad270f358b3ea56e060bbb8b3082d9a92ec8fa17a5c7e6fc1b6",
+               "size" => "0x544c",
+               "stateRoot" => "0x85daa9cd528004c1609d4cb3520fd958e85983bb4183124a4a9f7137fd39c691",
+               "timestamp" => "0x5c8bc76e",
+               "totalDifficulty" => "0x201a42c35142ae94458",
+               "transactions" => [],
+               "transactionsRoot" => "0xcd6c12fa43cd4e92ad5c0bf232b30488bbcbfe273c5b4af0366fced0767d54db",
+               "uncles" => [],
+               "withdrawals" => [],
+               "minimumGasPrice" => "0x1",
+               "bitcoinMergedMiningHeader" =>
+                 "0x00006d20ffd048280094a6ea0851d854036aacaa25ee0f23f0040200000000000000000078d2638fe0b4477c54601e6449051afba8228e0a88ff06b0c91f091fd34d5da57487c76402610517372c2fe9",
+               "bitcoinMergedMiningCoinbaseTransaction" =>
+                 "0x00000000000000805bf0dc9203da49a3b4e3ec913806e43102cc07db991272dc8b7018da57eb5abe59a32d070000ffffffff03449a4d26000000001976a914536ffa992491508dca0354e52f32a3a7a679a53a88ac00000000000000002b6a2952534b424c4f434b3ad2508d21d28c8f89d495923c0758ec3f64bd6755b4ec416f5601312600542a400000000000000000266a24aa21a9ed4ae42ea6dca2687aaed665714bf58b055c4e11f2fb038605930d630b49ad7b9d00000000",
+               "bitcoinMergedMiningMerkleProof" =>
+                 "0x8e5a4ba74eb4eb2f9ad4cabc2913aeed380a5becf7cd4d513341617efb798002bd83a783c31c66a8a8f6cc56c071c2d471cb610e3dc13054b9d216021d8c7e9112f622564449ebedcedf7d4ccb6fe0ffac861b7ed1446c310813cdf712e1e6add28b1fe1c0ae5e916194ba4f285a9340aba41e91bf847bf31acf37a9623a04a2348a37ab9faa5908122db45596bbc03e9c3644b0d4589471c4ff30fc139f3ba50506e9136fa0df799b487494de3e2b3dec937338f1a2e18da057c1f60590a9723672a4355b9914b1d01af9f582d9e856f6e1744be00f268b0b01d559329f7e0685aa63ffeb7c28486d7462292021d1345cddbf7c920ca34bb7aa4c6cdbe068806e35d0db662e7fcda03cb4d779594638c62a1fdd7ec98d1fb6d240d853958abe57561d9b9d0465cf8b9d6ee3c58b0d8b07d6c4c5d8f348e43fe3c06011b6a0008db4e0b16c77ececc3981f9008201cea5939869d648e59a09bd2094b1196ff61126bffb626153deed2563e1745436247c94a85d2947756b606d67633781c99d7",
+               "hashForMergedMining" => "0xd2508d21d28c8f89d495923c0758ec3f64bd6755b4ec416f5601312600542a40"
+             }
+           }
+       end)}
+    end)
+
+    pid = RootstockData.Supervisor.Case.start_supervised!(json_rpc_named_arguments: json_rpc_named_arguments)
+
+    assert [{Indexer.Fetcher.RootstockData, worker_pid, :worker, [Indexer.Fetcher.RootstockData]} | _] =
+             RootstockData.Supervisor |> Supervisor.which_children()
+
+    assert is_pid(worker_pid)
+
+    :timer.sleep(300)
+
+    assert [{Indexer.Fetcher.RootstockData, :undefined, :worker, [Indexer.Fetcher.RootstockData]} | _] =
+             RootstockData.Supervisor |> Supervisor.which_children()
+
+    # Terminates the process so it finishes all Ecto processes.
+    GenServer.stop(pid)
+  end
+end
diff --git a/apps/indexer/test/support/indexer/fetcher/rootstock_data_supervisor_case.ex b/apps/indexer/test/support/indexer/fetcher/rootstock_data_supervisor_case.ex
new file mode 100644
index 000000000000..d58f3c5f10cd
--- /dev/null
+++ b/apps/indexer/test/support/indexer/fetcher/rootstock_data_supervisor_case.ex
@@ -0,0 +1,17 @@
+defmodule Indexer.Fetcher.RootstockData.Supervisor.Case do
+  alias Indexer.Fetcher.RootstockData
+
+  def start_supervised!(fetcher_arguments \\ []) when is_list(fetcher_arguments) do
+    merged_fetcher_arguments =
+      Keyword.merge(
+        fetcher_arguments,
+        interval: 1,
+        batch_size: 1,
+        max_concurrency: 1
+      )
+
+    [merged_fetcher_arguments]
+    |> RootstockData.Supervisor.child_spec()
+    |> ExUnit.Callbacks.start_supervised!()
+  end
+end
diff --git a/config/runtime.exs b/config/runtime.exs
index 1d1a7341e72b..a7eaeaa0a36f 100644
--- a/config/runtime.exs
+++ b/config/runtime.exs
@@ -630,6 +630,15 @@ config :indexer, Indexer.Fetcher.Zkevm.TransactionBatch.Supervisor,
     System.get_env("CHAIN_TYPE", "ethereum") == "polygon_zkevm" &&
       ConfigHelper.parse_bool_env_var("INDEXER_ZKEVM_BATCHES_ENABLED")
 
+      config :indexer, Indexer.Fetcher.RootstockData.Supervisor,
+  disabled?: ConfigHelper.parse_bool_env_var("INDEXER_DISABLE_ROOTSTOCK_DATA_FETCHER")
+
+config :indexer, Indexer.Fetcher.RootstockData,
+  interval: ConfigHelper.parse_time_env_var("INDEXER_ROOTSTOCK_DATA_FETCHER_INTERVAL", "3s"),
+  batch_size: ConfigHelper.parse_integer_env_var("INDEXER_ROOTSTOCK_DATA_FETCHER_BATCH_SIZE", 10),
+  max_concurrency: ConfigHelper.parse_integer_env_var("INDEXER_ROOTSTOCK_DATA_FETCHER_CONCURRENCY", 5),
+  db_batch_size: ConfigHelper.parse_integer_env_var("INDEXER_ROOTSTOCK_DATA_FETCHER_DB_BATCH_SIZE", 300)
+
 Code.require_file("#{config_env()}.exs", "config/runtime")
 
 for config <- "../apps/*/config/runtime/#{config_env()}.exs" |> Path.expand(__DIR__) |> Path.wildcard() do
diff --git a/docker-compose/envs/common-blockscout.env b/docker-compose/envs/common-blockscout.env
index 7bf3c41a56ca..8ea2e9265dbe 100644
--- a/docker-compose/envs/common-blockscout.env
+++ b/docker-compose/envs/common-blockscout.env
@@ -155,6 +155,11 @@ INDEXER_DISABLE_INTERNAL_TRANSACTIONS_FETCHER=false
 # ROOTSTOCK_BRIDGE_ADDRESS=
 # ROOTSTOCK_LOCKED_BTC_CACHE_PERIOD=
 # ROOTSTOCK_LOCKING_CAP=
+# INDEXER_DISABLE_ROOTSTOCK_DATA_FETCHER=
+# INDEXER_ROOTSTOCK_DATA_FETCHER_INTERVAL=
+# INDEXER_ROOTSTOCK_DATA_FETCHER_BATCH_SIZE=
+# INDEXER_ROOTSTOCK_DATA_FETCHER_CONCURRENCY=
+# INDEXER_ROOTSTOCK_DATA_FETCHER_DB_BATCH_SIZE=
 # TOKEN_ID_MIGRATION_FIRST_BLOCK=
 # TOKEN_ID_MIGRATION_CONCURRENCY=
 # TOKEN_ID_MIGRATION_BATCH_SIZE=

From 940799b5f9b5b1d36a1def45203c5b65c8bd785a Mon Sep 17 00:00:00 2001
From: Maxim Filonov <53992153+sl1depengwyn@users.noreply.github.com>
Date: Wed, 2 Aug 2023 13:23:51 +0300
Subject: [PATCH 637/909] Fix cycle of rootstock fetcher

[no ci]
---
 apps/indexer/lib/indexer/fetcher/rootstock_data.ex | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/apps/indexer/lib/indexer/fetcher/rootstock_data.ex b/apps/indexer/lib/indexer/fetcher/rootstock_data.ex
index fc23769be4d1..dc6b0761be64 100644
--- a/apps/indexer/lib/indexer/fetcher/rootstock_data.ex
+++ b/apps/indexer/lib/indexer/fetcher/rootstock_data.ex
@@ -126,7 +126,7 @@ defmodule Indexer.Fetcher.RootstockData do
     end
   end
 
-  defp fetch_blocks(%__MODULE__{db_batch_size: db_batch_size} = state) do
+  defp fetch_blocks(%__MODULE__{db_batch_size: db_batch_size, interval: interval} = state) do
     blocks_to_fetch = db_batch_size |> Block.blocks_without_rootstock_data_query() |> Repo.all()
 
     if Enum.empty?(blocks_to_fetch) do
@@ -140,6 +140,8 @@ defmodule Indexer.Fetcher.RootstockData do
         "Rootstock data will now be fetched for #{Enum.count(blocks_to_fetch)} blocks starting from #{max_number}."
       )
 
+      Process.send_after(self(), :fetch_rootstock_data, interval)
+
       {:noreply, %__MODULE__{state | blocks_to_fetch: blocks_to_fetch}}
     end
   end

From 48bc9a16bd2179930526fa2f985db1cb5bcc7afb Mon Sep 17 00:00:00 2001
From: Maxim Filonov <53992153+sl1depengwyn@users.noreply.github.com>
Date: Tue, 7 Nov 2023 15:03:28 +0300
Subject: [PATCH 638/909] Take into account `CHAIN_TYPE` for RSK

---
 CHANGELOG.md                                  |   1 +
 .../views/api/v2/block_view.ex                |  24 +-
 .../lib/ethereum_jsonrpc/block.ex             | 313 ++++++++++--------
 .../lib/ethereum_jsonrpc/blocks.ex            |  19 +-
 .../test/ethereum_jsonrpc/block_test.exs      |  66 ++--
 apps/explorer/config/config.exs               |   1 +
 apps/explorer/lib/explorer/chain/block.ex     |  54 ++-
 ...4094744_add_rootstock_fields_to_blocks.exs |   0
 .../indexer/fetcher/rootstock_data_test.exs   | 226 ++++++-------
 config/config_helper.exs                      |   3 +
 config/runtime.exs                            |  24 +-
 11 files changed, 410 insertions(+), 321 deletions(-)
 rename apps/explorer/priv/{repo => rsk}/migrations/20230724094744_add_rootstock_fields_to_blocks.exs (100%)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7422a7055f45..541fd50a7359 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -21,6 +21,7 @@
 ### Chore
 
 - [#8802](https://github.com/blockscout/blockscout/pull/8802) - Enable API v2 by default
+- [#8742](https://github.com/blockscout/blockscout/pull/8742) - Merge rsk branch into the master branch
 - [#8728](https://github.com/blockscout/blockscout/pull/8728) - Remove repos_list (default value for ecto repos) from Explorer.ReleaseTasks
 
 <details>
diff --git a/apps/block_scout_web/lib/block_scout_web/views/api/v2/block_view.ex b/apps/block_scout_web/lib/block_scout_web/views/api/v2/block_view.ex
index 3d6e3f57f004..bc6b62d7c712 100644
--- a/apps/block_scout_web/lib/block_scout_web/views/api/v2/block_view.ex
+++ b/apps/block_scout_web/lib/block_scout_web/views/api/v2/block_view.ex
@@ -61,7 +61,7 @@ defmodule BlockScoutWeb.API.V2.BlockView do
       "tx_fees" => tx_fees,
       "withdrawals_count" => count_withdrawals(block)
     }
-    |> add_rootstock_fields(block, single_block?)
+    |> chain_type_fields(block, single_block?)
   end
 
   def prepare_rewards(rewards, block, single_block?) do
@@ -117,14 +117,18 @@ defmodule BlockScoutWeb.API.V2.BlockView do
   def count_withdrawals(%Block{withdrawals: withdrawals}) when is_list(withdrawals), do: Enum.count(withdrawals)
   def count_withdrawals(_), do: nil
 
-  defp add_rootstock_fields(prepared_block, _block, false), do: prepared_block
-
-  defp add_rootstock_fields(prepared_block, block, true) do
-    prepared_block
-    |> Map.put("minimum_gas_price", block.minimum_gas_price)
-    |> Map.put("bitcoin_merged_mining_header", block.bitcoin_merged_mining_header)
-    |> Map.put("bitcoin_merged_mining_coinbase_transaction", block.bitcoin_merged_mining_coinbase_transaction)
-    |> Map.put("bitcoin_merged_mining_merkle_proof", block.bitcoin_merged_mining_merkle_proof)
-    |> Map.put("hash_for_merged_mining", block.hash_for_merged_mining)
+  defp chain_type_fields(result, block, single_block?) do
+    case single_block? && Application.get_env(:explorer, :chain_type) do
+      "rsk" ->
+        result
+        |> Map.put("minimum_gas_price", block.minimum_gas_price)
+        |> Map.put("bitcoin_merged_mining_header", block.bitcoin_merged_mining_header)
+        |> Map.put("bitcoin_merged_mining_coinbase_transaction", block.bitcoin_merged_mining_coinbase_transaction)
+        |> Map.put("bitcoin_merged_mining_merkle_proof", block.bitcoin_merged_mining_merkle_proof)
+        |> Map.put("hash_for_merged_mining", block.hash_for_merged_mining)
+
+      _ ->
+        result
+    end
   end
 end
diff --git a/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/block.ex b/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/block.ex
index ea841f483d06..88f0213f98aa 100644
--- a/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/block.ex
+++ b/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/block.ex
@@ -8,8 +8,23 @@ defmodule EthereumJSONRPC.Block do
 
   alias EthereumJSONRPC.{Transactions, Uncles, Withdrawals}
 
+  if Application.compile_env(:explorer, :chain_type) == "rsk" do
+    @rootstock_fields quote(
+                        do: [
+                          bitcoin_merged_mining_header: EthereumJSONRPC.data(),
+                          bitcoin_merged_mining_coinbase_transaction: EthereumJSONRPC.data(),
+                          bitcoin_merged_mining_merkle_proof: EthereumJSONRPC.data(),
+                          hash_for_merged_mining: EthereumJSONRPC.data(),
+                          minimum_gas_price: non_neg_integer()
+                        ]
+                      )
+  else
+    @rootstock_fields quote(do: [])
+  end
+
   @type elixir :: %{String.t() => non_neg_integer | DateTime.t() | String.t() | nil}
   @type params :: %{
+          unquote_splicing(@rootstock_fields),
           difficulty: pos_integer(),
           extra_data: EthereumJSONRPC.hash(),
           gas_limit: non_neg_integer(),
@@ -30,12 +45,7 @@ defmodule EthereumJSONRPC.Block do
           transactions_root: EthereumJSONRPC.hash(),
           uncles: [EthereumJSONRPC.hash()],
           base_fee_per_gas: non_neg_integer(),
-          withdrawals_root: EthereumJSONRPC.hash(),
-          minimum_gas_price: non_neg_integer(),
-          bitcoin_merged_mining_header: EthereumJSONRPC.data(),
-          bitcoin_merged_mining_coinbase_transaction: EthereumJSONRPC.data(),
-          bitcoin_merged_mining_merkle_proof: EthereumJSONRPC.data(),
-          hash_for_merged_mining: EthereumJSONRPC.data()
+          withdrawals_root: EthereumJSONRPC.hash()
         }
 
   @typedoc """
@@ -74,11 +84,15 @@ defmodule EthereumJSONRPC.Block do
      `t:EthereumJSONRPC.hash/0`.
    * `"baseFeePerGas"` - `t:EthereumJSONRPC.quantity/0` of wei to denote amount of fee burned per unit gas used. Introduced in [EIP-1559](https://github.com/ethereum/EIPs/blob/master/EIPS/eip-1559.md)
    * `"withdrawalsRoot"` - `t:EthereumJSONRPC.hash/0` of the root of the withdrawals.
-   * `"minimumGasPrice"` - `t:EthereumJSONRPC.quantity/0` of the minimum gas price for this block.
-   * `"bitcoinMergedMiningHeader"` - `t:EthereumJSONRPC.data/0` of the Bitcoin merged mining header.
-   * `"bitcoinMergedMiningCoinbaseTransaction"` - `t:EthereumJSONRPC.data/0` of the Bitcoin merged mining coinbase transaction.
-   * `"bitcoinMergedMiningMerkleProof"` - `t:EthereumJSONRPC.data/0` of the Bitcoin merged mining merkle proof.
-   * `"hashForMergedMining"` - `t:EthereumJSONRPC.data/0` of the hash for merged mining.
+   #{if Application.compile_env(:explorer, :chain_type) == "rsk" do
+    """
+     * `"minimumGasPrice"` - `t:EthereumJSONRPC.quantity/0` of the minimum gas price for this block.
+     * `"bitcoinMergedMiningHeader"` - `t:EthereumJSONRPC.data/0` of the Bitcoin merged mining header.
+     * `"bitcoinMergedMiningCoinbaseTransaction"` - `t:EthereumJSONRPC.data/0` of the Bitcoin merged mining coinbase transaction.
+     * `"bitcoinMergedMiningMerkleProof"` - `t:EthereumJSONRPC.data/0` of the Bitcoin merged mining merkle proof.
+     * `"hashForMergedMining"` - `t:EthereumJSONRPC.data/0` of the hash for merged mining.
+    """
+  end}
   """
   @type t :: %{String.t() => EthereumJSONRPC.data() | EthereumJSONRPC.hash() | EthereumJSONRPC.quantity() | nil}
 
@@ -129,13 +143,18 @@ defmodule EthereumJSONRPC.Block do
       ...>     "timestamp" => Timex.parse!("2017-12-15T21:03:30Z", "{ISO:Extended:Z}"),
       ...>     "totalDifficulty" => 340282366920938463463374607431465668165,
       ...>     "transactions" => [],
-      ...>     "transactionsRoot" => "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-      ...>     "uncles" => [],
-      ...>     "minimumGasPrice" => 345786,
-      ...>     "bitcoinMergedMiningHeader" => "0x00006d20ffd048280094a6ea0851d854036aacaa25ee0f23f0040200000000000000000078d2638fe0b4477c54601e6449051afba8228e0a88ff06b0c91f091fd34d5da57487c76402610517372c2fe9",
-      ...>     "bitcoinMergedMiningCoinbaseTransaction" => "0x00000000000000805bf0dc9203da49a3b4e3ec913806e43102cc07db991272dc8b7018da57eb5abe59a32d070000ffffffff03449a4d26000000001976a914536ffa992491508dca0354e52f32a3a7a679a53a88ac00000000000000002b6a2952534b424c4f434b3ad2508d21d28c8f89d495923c0758ec3f64bd6755b4ec416f5601312600542a400000000000000000266a24aa21a9ed4ae42ea6dca2687aaed665714bf58b055c4e11f2fb038605930d630b49ad7b9d00000000",
-      ...>     "bitcoinMergedMiningMerkleProof" => "0x8e5a4ba74eb4eb2f9ad4cabc2913aeed380a5becf7cd4d513341617efb798002bd83a783c31c66a8a8f6cc56c071c2d471cb610e3dc13054b9d216021d8c7e9112f622564449ebedcedf7d4ccb6fe0ffac861b7ed1446c310813cdf712e1e6add28b1fe1c0ae5e916194ba4f285a9340aba41e91bf847bf31acf37a9623a04a2348a37ab9faa5908122db45596bbc03e9c3644b0d4589471c4ff30fc139f3ba50506e9136fa0df799b487494de3e2b3dec937338f1a2e18da057c1f60590a9723672a4355b9914b1d01af9f582d9e856f6e1744be00f268b0b01d559329f7e0685aa63ffeb7c28486d7462292021d1345cddbf7c920ca34bb7aa4c6cdbe068806e35d0db662e7fcda03cb4d779594638c62a1fdd7ec98d1fb6d240d853958abe57561d9b9d0465cf8b9d6ee3c58b0d8b07d6c4c5d8f348e43fe3c06011b6a0008db4e0b16c77ececc3981f9008201cea5939869d648e59a09bd2094b1196ff61126bffb626153deed2563e1745436247c94a85d2947756b606d67633781c99d7",
-      ...>     "hashForMergedMining" => "0xd2508d21d28c8f89d495923c0758ec3f64bd6755b4ec416f5601312600542a40",
+      ...>     "transactionsRoot" => "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",\
+  #{if Application.compile_env(:explorer, :chain_type) == "rsk" do
+    """
+
+        ...>     "minimumGasPrice" => 345786,
+        ...>     "bitcoinMergedMiningHeader" => "0x00006d20ffd048280094a6ea0851d854036aacaa25ee0f23f0040200000000000000000078d2638fe0b4477c54601e6449051afba8228e0a88ff06b0c91f091fd34d5da57487c76402610517372c2fe9",
+        ...>     "bitcoinMergedMiningCoinbaseTransaction" => "0x00000000000000805bf0dc9203da49a3b4e3ec913806e43102cc07db991272dc8b7018da57eb5abe59a32d070000ffffffff03449a4d26000000001976a914536ffa992491508dca0354e52f32a3a7a679a53a88ac00000000000000002b6a2952534b424c4f434b3ad2508d21d28c8f89d495923c0758ec3f64bd6755b4ec416f5601312600542a400000000000000000266a24aa21a9ed4ae42ea6dca2687aaed665714bf58b055c4e11f2fb038605930d630b49ad7b9d00000000",
+        ...>     "bitcoinMergedMiningMerkleProof" => "0x8e5a4ba74eb4eb2f9ad4cabc2913aeed380a5becf7cd4d513341617efb798002bd83a783c31c66a8a8f6cc56c071c2d471cb610e3dc13054b9d216021d8c7e9112f622564449ebedcedf7d4ccb6fe0ffac861b7ed1446c310813cdf712e1e6add28b1fe1c0ae5e916194ba4f285a9340aba41e91bf847bf31acf37a9623a04a2348a37ab9faa5908122db45596bbc03e9c3644b0d4589471c4ff30fc139f3ba50506e9136fa0df799b487494de3e2b3dec937338f1a2e18da057c1f60590a9723672a4355b9914b1d01af9f582d9e856f6e1744be00f268b0b01d559329f7e0685aa63ffeb7c28486d7462292021d1345cddbf7c920ca34bb7aa4c6cdbe068806e35d0db662e7fcda03cb4d779594638c62a1fdd7ec98d1fb6d240d853958abe57561d9b9d0465cf8b9d6ee3c58b0d8b07d6c4c5d8f348e43fe3c06011b6a0008db4e0b16c77ececc3981f9008201cea5939869d648e59a09bd2094b1196ff61126bffb626153deed2563e1745436247c94a85d2947756b606d67633781c99d7",
+        ...>     "hashForMergedMining" => "0xd2508d21d28c8f89d495923c0758ec3f64bd6755b4ec416f5601312600542a40",\
+    """
+  end}
+      ...>     "uncles" => []
       ...>   }
       ...> )
       %{
@@ -157,13 +176,18 @@ defmodule EthereumJSONRPC.Block do
         timestamp: Timex.parse!("2017-12-15T21:03:30Z", "{ISO:Extended:Z}"),
         total_difficulty: 340282366920938463463374607431465668165,
         transactions_root: "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-        uncles: [],
-        withdrawals_root: "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-        bitcoin_merged_mining_coinbase_transaction: "0x00000000000000805bf0dc9203da49a3b4e3ec913806e43102cc07db991272dc8b7018da57eb5abe59a32d070000ffffffff03449a4d26000000001976a914536ffa992491508dca0354e52f32a3a7a679a53a88ac00000000000000002b6a2952534b424c4f434b3ad2508d21d28c8f89d495923c0758ec3f64bd6755b4ec416f5601312600542a400000000000000000266a24aa21a9ed4ae42ea6dca2687aaed665714bf58b055c4e11f2fb038605930d630b49ad7b9d00000000",
-        bitcoin_merged_mining_header: "0x00006d20ffd048280094a6ea0851d854036aacaa25ee0f23f0040200000000000000000078d2638fe0b4477c54601e6449051afba8228e0a88ff06b0c91f091fd34d5da57487c76402610517372c2fe9",
-        bitcoin_merged_mining_merkle_proof: "0x8e5a4ba74eb4eb2f9ad4cabc2913aeed380a5becf7cd4d513341617efb798002bd83a783c31c66a8a8f6cc56c071c2d471cb610e3dc13054b9d216021d8c7e9112f622564449ebedcedf7d4ccb6fe0ffac861b7ed1446c310813cdf712e1e6add28b1fe1c0ae5e916194ba4f285a9340aba41e91bf847bf31acf37a9623a04a2348a37ab9faa5908122db45596bbc03e9c3644b0d4589471c4ff30fc139f3ba50506e9136fa0df799b487494de3e2b3dec937338f1a2e18da057c1f60590a9723672a4355b9914b1d01af9f582d9e856f6e1744be00f268b0b01d559329f7e0685aa63ffeb7c28486d7462292021d1345cddbf7c920ca34bb7aa4c6cdbe068806e35d0db662e7fcda03cb4d779594638c62a1fdd7ec98d1fb6d240d853958abe57561d9b9d0465cf8b9d6ee3c58b0d8b07d6c4c5d8f348e43fe3c06011b6a0008db4e0b16c77ececc3981f9008201cea5939869d648e59a09bd2094b1196ff61126bffb626153deed2563e1745436247c94a85d2947756b606d67633781c99d7",
-        hash_for_merged_mining: "0xd2508d21d28c8f89d495923c0758ec3f64bd6755b4ec416f5601312600542a40",
-        minimum_gas_price: 345786
+        uncles: [],\
+  #{if Application.compile_env(:explorer, :chain_type) == "rsk" do
+    """
+
+          bitcoin_merged_mining_coinbase_transaction: "0x00000000000000805bf0dc9203da49a3b4e3ec913806e43102cc07db991272dc8b7018da57eb5abe59a32d070000ffffffff03449a4d26000000001976a914536ffa992491508dca0354e52f32a3a7a679a53a88ac00000000000000002b6a2952534b424c4f434b3ad2508d21d28c8f89d495923c0758ec3f64bd6755b4ec416f5601312600542a400000000000000000266a24aa21a9ed4ae42ea6dca2687aaed665714bf58b055c4e11f2fb038605930d630b49ad7b9d00000000",
+          bitcoin_merged_mining_header: "0x00006d20ffd048280094a6ea0851d854036aacaa25ee0f23f0040200000000000000000078d2638fe0b4477c54601e6449051afba8228e0a88ff06b0c91f091fd34d5da57487c76402610517372c2fe9",
+          bitcoin_merged_mining_merkle_proof: "0x8e5a4ba74eb4eb2f9ad4cabc2913aeed380a5becf7cd4d513341617efb798002bd83a783c31c66a8a8f6cc56c071c2d471cb610e3dc13054b9d216021d8c7e9112f622564449ebedcedf7d4ccb6fe0ffac861b7ed1446c310813cdf712e1e6add28b1fe1c0ae5e916194ba4f285a9340aba41e91bf847bf31acf37a9623a04a2348a37ab9faa5908122db45596bbc03e9c3644b0d4589471c4ff30fc139f3ba50506e9136fa0df799b487494de3e2b3dec937338f1a2e18da057c1f60590a9723672a4355b9914b1d01af9f582d9e856f6e1744be00f268b0b01d559329f7e0685aa63ffeb7c28486d7462292021d1345cddbf7c920ca34bb7aa4c6cdbe068806e35d0db662e7fcda03cb4d779594638c62a1fdd7ec98d1fb6d240d853958abe57561d9b9d0465cf8b9d6ee3c58b0d8b07d6c4c5d8f348e43fe3c06011b6a0008db4e0b16c77ececc3981f9008201cea5939869d648e59a09bd2094b1196ff61126bffb626153deed2563e1745436247c94a85d2947756b606d67633781c99d7",
+          hash_for_merged_mining: "0xd2508d21d28c8f89d495923c0758ec3f64bd6755b4ec416f5601312600542a40",
+          minimum_gas_price: 345786,\
+    """
+  end}
+        withdrawals_root: "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421"
       }
 
   [Geth] `elixir` can be converted to params
@@ -211,39 +235,49 @@ defmodule EthereumJSONRPC.Block do
         timestamp: Timex.parse!("2015-07-30T15:32:07Z", "{ISO:Extended:Z}"),
         total_difficulty: 1039309006117,
         transactions_root: "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-        uncles: [],
-        withdrawals_root: "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-        bitcoin_merged_mining_coinbase_transaction: nil,
-        bitcoin_merged_mining_header: nil,
-        bitcoin_merged_mining_merkle_proof: nil,
-        hash_for_merged_mining: nil,
-        minimum_gas_price: nil
+        uncles: [],\
+  #{if Application.compile_env(:explorer, :chain_type) == "rsk" do
+    """
+
+          bitcoin_merged_mining_coinbase_transaction: nil,
+          bitcoin_merged_mining_header: nil,
+          bitcoin_merged_mining_merkle_proof: nil,
+          hash_for_merged_mining: nil,
+          minimum_gas_price: nil,\
+    """
+  end}
+        withdrawals_root: "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421"
       }
-
   """
   @spec elixir_to_params(elixir) :: params
-  def elixir_to_params(
-        %{
-          "difficulty" => difficulty,
-          "extraData" => extra_data,
-          "gasLimit" => gas_limit,
-          "gasUsed" => gas_used,
-          "hash" => hash,
-          "logsBloom" => logs_bloom,
-          "miner" => miner_hash,
-          "number" => number,
-          "parentHash" => parent_hash,
-          "receiptsRoot" => receipts_root,
-          "sha3Uncles" => sha3_uncles,
-          "size" => size,
-          "stateRoot" => state_root,
-          "timestamp" => timestamp,
-          "totalDifficulty" => total_difficulty,
-          "transactionsRoot" => transactions_root,
-          "uncles" => uncles,
-          "baseFeePerGas" => base_fee_per_gas
-        } = elixir
-      ) do
+  def elixir_to_params(elixir) do
+    elixir
+    |> do_elixir_to_params()
+    |> chain_type_fields(elixir)
+  end
+
+  defp do_elixir_to_params(
+         %{
+           "difficulty" => difficulty,
+           "extraData" => extra_data,
+           "gasLimit" => gas_limit,
+           "gasUsed" => gas_used,
+           "hash" => hash,
+           "logsBloom" => logs_bloom,
+           "miner" => miner_hash,
+           "number" => number,
+           "parentHash" => parent_hash,
+           "receiptsRoot" => receipts_root,
+           "sha3Uncles" => sha3_uncles,
+           "size" => size,
+           "stateRoot" => state_root,
+           "timestamp" => timestamp,
+           "totalDifficulty" => total_difficulty,
+           "transactionsRoot" => transactions_root,
+           "uncles" => uncles,
+           "baseFeePerGas" => base_fee_per_gas
+         } = elixir
+       ) do
     %{
       difficulty: difficulty,
       extra_data: extra_data,
@@ -266,36 +300,31 @@ defmodule EthereumJSONRPC.Block do
       uncles: uncles,
       base_fee_per_gas: base_fee_per_gas,
       withdrawals_root:
-        Map.get(elixir, "withdrawalsRoot", "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421"),
-      minimum_gas_price: Map.get(elixir, "minimumGasPrice"),
-      bitcoin_merged_mining_header: Map.get(elixir, "bitcoinMergedMiningHeader"),
-      bitcoin_merged_mining_coinbase_transaction: Map.get(elixir, "bitcoinMergedMiningCoinbaseTransaction"),
-      bitcoin_merged_mining_merkle_proof: Map.get(elixir, "bitcoinMergedMiningMerkleProof"),
-      hash_for_merged_mining: Map.get(elixir, "hashForMergedMining")
+        Map.get(elixir, "withdrawalsRoot", "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421")
     }
   end
 
-  def elixir_to_params(
-        %{
-          "difficulty" => difficulty,
-          "extraData" => extra_data,
-          "gasLimit" => gas_limit,
-          "gasUsed" => gas_used,
-          "hash" => hash,
-          "logsBloom" => logs_bloom,
-          "miner" => miner_hash,
-          "number" => number,
-          "parentHash" => parent_hash,
-          "receiptsRoot" => receipts_root,
-          "sha3Uncles" => sha3_uncles,
-          "size" => size,
-          "stateRoot" => state_root,
-          "timestamp" => timestamp,
-          "transactionsRoot" => transactions_root,
-          "uncles" => uncles,
-          "baseFeePerGas" => base_fee_per_gas
-        } = elixir
-      ) do
+  defp do_elixir_to_params(
+         %{
+           "difficulty" => difficulty,
+           "extraData" => extra_data,
+           "gasLimit" => gas_limit,
+           "gasUsed" => gas_used,
+           "hash" => hash,
+           "logsBloom" => logs_bloom,
+           "miner" => miner_hash,
+           "number" => number,
+           "parentHash" => parent_hash,
+           "receiptsRoot" => receipts_root,
+           "sha3Uncles" => sha3_uncles,
+           "size" => size,
+           "stateRoot" => state_root,
+           "timestamp" => timestamp,
+           "transactionsRoot" => transactions_root,
+           "uncles" => uncles,
+           "baseFeePerGas" => base_fee_per_gas
+         } = elixir
+       ) do
     %{
       difficulty: difficulty,
       extra_data: extra_data,
@@ -317,36 +346,31 @@ defmodule EthereumJSONRPC.Block do
       uncles: uncles,
       base_fee_per_gas: base_fee_per_gas,
       withdrawals_root:
-        Map.get(elixir, "withdrawalsRoot", "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421"),
-      minimum_gas_price: Map.get(elixir, "minimumGasPrice"),
-      bitcoin_merged_mining_header: Map.get(elixir, "bitcoinMergedMiningHeader"),
-      bitcoin_merged_mining_coinbase_transaction: Map.get(elixir, "bitcoinMergedMiningCoinbaseTransaction"),
-      bitcoin_merged_mining_merkle_proof: Map.get(elixir, "bitcoinMergedMiningMerkleProof"),
-      hash_for_merged_mining: Map.get(elixir, "hashForMergedMining")
+        Map.get(elixir, "withdrawalsRoot", "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421")
     }
   end
 
-  def elixir_to_params(
-        %{
-          "difficulty" => difficulty,
-          "extraData" => extra_data,
-          "gasLimit" => gas_limit,
-          "gasUsed" => gas_used,
-          "hash" => hash,
-          "logsBloom" => logs_bloom,
-          "miner" => miner_hash,
-          "number" => number,
-          "parentHash" => parent_hash,
-          "receiptsRoot" => receipts_root,
-          "sha3Uncles" => sha3_uncles,
-          "size" => size,
-          "stateRoot" => state_root,
-          "timestamp" => timestamp,
-          "totalDifficulty" => total_difficulty,
-          "transactionsRoot" => transactions_root,
-          "uncles" => uncles
-        } = elixir
-      ) do
+  defp do_elixir_to_params(
+         %{
+           "difficulty" => difficulty,
+           "extraData" => extra_data,
+           "gasLimit" => gas_limit,
+           "gasUsed" => gas_used,
+           "hash" => hash,
+           "logsBloom" => logs_bloom,
+           "miner" => miner_hash,
+           "number" => number,
+           "parentHash" => parent_hash,
+           "receiptsRoot" => receipts_root,
+           "sha3Uncles" => sha3_uncles,
+           "size" => size,
+           "stateRoot" => state_root,
+           "timestamp" => timestamp,
+           "totalDifficulty" => total_difficulty,
+           "transactionsRoot" => transactions_root,
+           "uncles" => uncles
+         } = elixir
+       ) do
     %{
       difficulty: difficulty,
       extra_data: extra_data,
@@ -368,36 +392,31 @@ defmodule EthereumJSONRPC.Block do
       transactions_root: transactions_root,
       uncles: uncles,
       withdrawals_root:
-        Map.get(elixir, "withdrawalsRoot", "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421"),
-      minimum_gas_price: Map.get(elixir, "minimumGasPrice"),
-      bitcoin_merged_mining_header: Map.get(elixir, "bitcoinMergedMiningHeader"),
-      bitcoin_merged_mining_coinbase_transaction: Map.get(elixir, "bitcoinMergedMiningCoinbaseTransaction"),
-      bitcoin_merged_mining_merkle_proof: Map.get(elixir, "bitcoinMergedMiningMerkleProof"),
-      hash_for_merged_mining: Map.get(elixir, "hashForMergedMining")
+        Map.get(elixir, "withdrawalsRoot", "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421")
     }
   end
 
   # Geth: a response from eth_getblockbyhash for uncle blocks is without `totalDifficulty` param
-  def elixir_to_params(
-        %{
-          "difficulty" => difficulty,
-          "extraData" => extra_data,
-          "gasLimit" => gas_limit,
-          "gasUsed" => gas_used,
-          "hash" => hash,
-          "logsBloom" => logs_bloom,
-          "miner" => miner_hash,
-          "number" => number,
-          "parentHash" => parent_hash,
-          "receiptsRoot" => receipts_root,
-          "sha3Uncles" => sha3_uncles,
-          "size" => size,
-          "stateRoot" => state_root,
-          "timestamp" => timestamp,
-          "transactionsRoot" => transactions_root,
-          "uncles" => uncles
-        } = elixir
-      ) do
+  defp do_elixir_to_params(
+         %{
+           "difficulty" => difficulty,
+           "extraData" => extra_data,
+           "gasLimit" => gas_limit,
+           "gasUsed" => gas_used,
+           "hash" => hash,
+           "logsBloom" => logs_bloom,
+           "miner" => miner_hash,
+           "number" => number,
+           "parentHash" => parent_hash,
+           "receiptsRoot" => receipts_root,
+           "sha3Uncles" => sha3_uncles,
+           "size" => size,
+           "stateRoot" => state_root,
+           "timestamp" => timestamp,
+           "transactionsRoot" => transactions_root,
+           "uncles" => uncles
+         } = elixir
+       ) do
     %{
       difficulty: difficulty,
       extra_data: extra_data,
@@ -418,15 +437,27 @@ defmodule EthereumJSONRPC.Block do
       transactions_root: transactions_root,
       uncles: uncles,
       withdrawals_root:
-        Map.get(elixir, "withdrawalsRoot", "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421"),
-      minimum_gas_price: Map.get(elixir, "minimumGasPrice"),
-      bitcoin_merged_mining_header: Map.get(elixir, "bitcoinMergedMiningHeader"),
-      bitcoin_merged_mining_coinbase_transaction: Map.get(elixir, "bitcoinMergedMiningCoinbaseTransaction"),
-      bitcoin_merged_mining_merkle_proof: Map.get(elixir, "bitcoinMergedMiningMerkleProof"),
-      hash_for_merged_mining: Map.get(elixir, "hashForMergedMining")
+        Map.get(elixir, "withdrawalsRoot", "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421")
     }
   end
 
+  defp chain_type_fields(params, elixir) do
+    case Application.get_env(:explorer, :chain_type) do
+      "rsk" ->
+        params
+        |> Map.merge(%{
+          minimum_gas_price: Map.get(elixir, "minimumGasPrice"),
+          bitcoin_merged_mining_header: Map.get(elixir, "bitcoinMergedMiningHeader"),
+          bitcoin_merged_mining_coinbase_transaction: Map.get(elixir, "bitcoinMergedMiningCoinbaseTransaction"),
+          bitcoin_merged_mining_merkle_proof: Map.get(elixir, "bitcoinMergedMiningMerkleProof"),
+          hash_for_merged_mining: Map.get(elixir, "hashForMergedMining")
+        })
+
+      _ ->
+        params
+    end
+  end
+
   @doc """
   Get `t:EthereumJSONRPC.Transactions.elixir/0` from `t:elixir/0`
 
diff --git a/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/blocks.ex b/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/blocks.ex
index 4a79b51687f3..d9a697c1acbd 100644
--- a/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/blocks.ex
+++ b/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/blocks.ex
@@ -116,13 +116,18 @@ defmodule EthereumJSONRPC.Blocks do
           timestamp: Timex.parse!("1970-01-01T00:00:00Z", "{ISO:Extended:Z}"),
           total_difficulty: 131072,
           transactions_root: "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-          uncles: ["0xe670ec64341771606e55d6b4ca35a1a6b75ee3d5145a99d05921026d15273311"],
-          withdrawals_root: "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-          bitcoin_merged_mining_coinbase_transaction: nil,
-          bitcoin_merged_mining_header: nil,
-          bitcoin_merged_mining_merkle_proof: nil,
-          hash_for_merged_mining: nil,
-          minimum_gas_price: nil
+          uncles: ["0xe670ec64341771606e55d6b4ca35a1a6b75ee3d5145a99d05921026d15273311"],\
+  #{if Application.compile_env(:explorer, :chain_type) == "rsk" do
+    """
+
+            bitcoin_merged_mining_coinbase_transaction: nil,
+            bitcoin_merged_mining_header: nil,
+            bitcoin_merged_mining_merkle_proof: nil,
+            hash_for_merged_mining: nil,
+            minimum_gas_price: nil,\
+    """
+  end}
+          withdrawals_root: "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421"
         }
       ]
 
diff --git a/apps/ethereum_jsonrpc/test/ethereum_jsonrpc/block_test.exs b/apps/ethereum_jsonrpc/test/ethereum_jsonrpc/block_test.exs
index 5f0e59c91cd8..f8d4ecd00172 100644
--- a/apps/ethereum_jsonrpc/test/ethereum_jsonrpc/block_test.exs
+++ b/apps/ethereum_jsonrpc/test/ethereum_jsonrpc/block_test.exs
@@ -32,34 +32,44 @@ defmodule EthereumJSONRPC.BlockTest do
           "uncles" => []
         })
 
-      assert result == %{
-               difficulty: 17_561_410_778,
-               extra_data: "0x476574682f4c5649562f76312e302e302f6c696e75782f676f312e342e32",
-               gas_limit: 5000,
-               gas_used: 0,
-               hash: "0x4d9423080290a650eaf6db19c87c76dff83d1b4ab64aefe6e5c5aa2d1f4b6623",
-               logs_bloom:
-                 "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-               mix_hash: "0xbbb93d610b2b0296a59f18474ac3d6086a9902aa7ca4b9a306692f7c3d496fdf",
-               miner_hash: "0xbb7b8287f3f0a933474a79eae42cbca977791171",
-               nonce: 5_539_500_215_739_777_653,
-               number: 59,
-               parent_hash: "0xcd5b5c4cecd7f18a13fe974255badffd58e737dc67596d56bc01f063dd282e9e",
-               receipts_root: "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-               sha3_uncles: "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347",
-               size: 542,
-               state_root: "0x6fd0a5d82ca77d9f38c3ebbde11b11d304a5fcf3854f291df64395ab38ed43ba",
-               timestamp: Timex.parse!("2015-07-30T15:32:07Z", "{ISO:Extended:Z}"),
-               total_difficulty: nil,
-               transactions_root: "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-               uncles: [],
-               withdrawals_root: "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-               bitcoin_merged_mining_coinbase_transaction: nil,
-               bitcoin_merged_mining_header: nil,
-               bitcoin_merged_mining_merkle_proof: nil,
-               hash_for_merged_mining: nil,
-               minimum_gas_price: nil
-             }
+      assert result ==
+               %{
+                 difficulty: 17_561_410_778,
+                 extra_data: "0x476574682f4c5649562f76312e302e302f6c696e75782f676f312e342e32",
+                 gas_limit: 5000,
+                 gas_used: 0,
+                 hash: "0x4d9423080290a650eaf6db19c87c76dff83d1b4ab64aefe6e5c5aa2d1f4b6623",
+                 logs_bloom:
+                   "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                 mix_hash: "0xbbb93d610b2b0296a59f18474ac3d6086a9902aa7ca4b9a306692f7c3d496fdf",
+                 miner_hash: "0xbb7b8287f3f0a933474a79eae42cbca977791171",
+                 nonce: 5_539_500_215_739_777_653,
+                 number: 59,
+                 parent_hash: "0xcd5b5c4cecd7f18a13fe974255badffd58e737dc67596d56bc01f063dd282e9e",
+                 receipts_root: "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+                 sha3_uncles: "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347",
+                 size: 542,
+                 state_root: "0x6fd0a5d82ca77d9f38c3ebbde11b11d304a5fcf3854f291df64395ab38ed43ba",
+                 timestamp: Timex.parse!("2015-07-30T15:32:07Z", "{ISO:Extended:Z}"),
+                 total_difficulty: nil,
+                 transactions_root: "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+                 uncles: [],
+                 withdrawals_root: "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421"
+               }
+               |> (&if(Application.get_env(:explorer, :chain_type) == "rsk",
+                     do:
+                       Map.merge(
+                         &1,
+                         %{
+                           bitcoin_merged_mining_coinbase_transaction: nil,
+                           bitcoin_merged_mining_header: nil,
+                           bitcoin_merged_mining_merkle_proof: nil,
+                           hash_for_merged_mining: nil,
+                           minimum_gas_price: nil
+                         }
+                       ),
+                     else: &1
+                   )).()
     end
   end
 
diff --git a/apps/explorer/config/config.exs b/apps/explorer/config/config.exs
index feb7ca93e8b3..e9d1eb627e9c 100644
--- a/apps/explorer/config/config.exs
+++ b/apps/explorer/config/config.exs
@@ -11,6 +11,7 @@ import Config
 
 # General application configuration
 config :explorer,
+  chain_type: ConfigHelper.chain_type(),
   ecto_repos: ConfigHelper.repos(),
   token_functions_reader_max_retries: 3,
   # for not fully indexed blockchains
diff --git a/apps/explorer/lib/explorer/chain/block.ex b/apps/explorer/lib/explorer/chain/block.ex
index 6cef72ae5e07..b2fa9d97f2a4 100644
--- a/apps/explorer/lib/explorer/chain/block.ex
+++ b/apps/explorer/lib/explorer/chain/block.ex
@@ -10,7 +10,15 @@ defmodule Explorer.Chain.Block do
   alias Explorer.Chain.{Address, Block, Gas, Hash, PendingBlockOperation, Transaction, Wei, Withdrawal}
   alias Explorer.Chain.Block.{Reward, SecondDegreeRelation}
 
-  @optional_attrs ~w(size refetch_needed total_difficulty difficulty base_fee_per_gas minimum_gas_price bitcoin_merged_mining_header bitcoin_merged_mining_coinbase_transaction bitcoin_merged_mining_merkle_proof hash_for_merged_mining)a
+  @optional_attrs ~w(size refetch_needed total_difficulty difficulty base_fee_per_gas)a
+                  |> (&(case Application.compile_env(:explorer, :chain_type) == "rsk" do
+                          "rsk" ->
+                            &1 ++
+                              ~w(minimum_gas_price bitcoin_merged_mining_header bitcoin_merged_mining_coinbase_transaction bitcoin_merged_mining_merkle_proof hash_for_merged_mining)a
+
+                          _ ->
+                            &1
+                        end)).()
 
   @required_attrs ~w(consensus gas_limit gas_used hash miner_hash nonce number parent_hash timestamp)a
 
@@ -26,6 +34,20 @@ defmodule Explorer.Chain.Block do
   """
   @type block_number :: non_neg_integer()
 
+  if Application.compile_env(:explorer, :chain_type) == "rsk" do
+    @rootstock_fields quote(
+                        do: [
+                          bitcoin_merged_mining_header: binary(),
+                          bitcoin_merged_mining_coinbase_transaction: binary(),
+                          bitcoin_merged_mining_merkle_proof: binary(),
+                          hash_for_merged_mining: binary(),
+                          minimum_gas_price: Decimal.t()
+                        ]
+                      )
+  else
+    @rootstock_fields quote(do: [])
+  end
+
   @typedoc """
    * `consensus`
      * `true` - this is a block on the longest consensus agreed upon chain.
@@ -47,8 +69,18 @@ defmodule Explorer.Chain.Block do
    * `total_difficulty` - the total `difficulty` of the chain until this block.
    * `transactions` - the `t:Explorer.Chain.Transaction.t/0` in this block.
    * `base_fee_per_gas` - Minimum fee required per unit of gas. Fee adjusts based on network congestion.
+  #{if Application.compile_env(:explorer, :chain_type) == "rsk" do
+    """
+     * `bitcoin_merged_mining_header` - Bitcoin merged mining header on Rootstock chains.
+     * `bitcoin_merged_mining_coinbase_transaction` - Bitcoin merged mining coinbase transaction on Rootstock chains.
+     * `bitcoin_merged_mining_merkle_proof` - Bitcoin merged mining merkle proof on Rootstock chains.
+     * `hash_for_merged_mining` - Hash for merged mining on Rootstock chains.
+     * `minimum_gas_price` - Minimum block gas price on Rootstock chains.
+    """
+  end}
   """
   @type t :: %__MODULE__{
+          unquote_splicing(@rootstock_fields),
           consensus: boolean(),
           difficulty: difficulty(),
           gas_limit: Gas.t(),
@@ -65,12 +97,7 @@ defmodule Explorer.Chain.Block do
           transactions: %Ecto.Association.NotLoaded{} | [Transaction.t()],
           refetch_needed: boolean(),
           base_fee_per_gas: Wei.t(),
-          is_empty: boolean(),
-          minimum_gas_price: Decimal.t(),
-          bitcoin_merged_mining_header: binary(),
-          bitcoin_merged_mining_coinbase_transaction: binary(),
-          bitcoin_merged_mining_merkle_proof: binary(),
-          hash_for_merged_mining: binary()
+          is_empty: boolean()
         }
 
   @primary_key {:hash, Hash.Full, autogenerate: false}
@@ -87,11 +114,14 @@ defmodule Explorer.Chain.Block do
     field(:refetch_needed, :boolean)
     field(:base_fee_per_gas, Wei)
     field(:is_empty, :boolean)
-    field(:minimum_gas_price, :decimal)
-    field(:bitcoin_merged_mining_header, :binary)
-    field(:bitcoin_merged_mining_coinbase_transaction, :binary)
-    field(:bitcoin_merged_mining_merkle_proof, :binary)
-    field(:hash_for_merged_mining, :binary)
+
+    if Application.compile_env(:explorer, :chain_type) == "rsk" do
+      field(:bitcoin_merged_mining_header, :binary)
+      field(:bitcoin_merged_mining_coinbase_transaction, :binary)
+      field(:bitcoin_merged_mining_merkle_proof, :binary)
+      field(:hash_for_merged_mining, :binary)
+      field(:minimum_gas_price, :decimal)
+    end
 
     timestamps()
 
diff --git a/apps/explorer/priv/repo/migrations/20230724094744_add_rootstock_fields_to_blocks.exs b/apps/explorer/priv/rsk/migrations/20230724094744_add_rootstock_fields_to_blocks.exs
similarity index 100%
rename from apps/explorer/priv/repo/migrations/20230724094744_add_rootstock_fields_to_blocks.exs
rename to apps/explorer/priv/rsk/migrations/20230724094744_add_rootstock_fields_to_blocks.exs
diff --git a/apps/indexer/test/indexer/fetcher/rootstock_data_test.exs b/apps/indexer/test/indexer/fetcher/rootstock_data_test.exs
index b3011a283421..d7954ce886b8 100644
--- a/apps/indexer/test/indexer/fetcher/rootstock_data_test.exs
+++ b/apps/indexer/test/indexer/fetcher/rootstock_data_test.exs
@@ -10,125 +10,127 @@ defmodule Indexer.Fetcher.RootstockDataTest do
   setup :verify_on_exit!
   setup :set_mox_global
 
-  test "do not start when all old blocks are fetched", %{json_rpc_named_arguments: json_rpc_named_arguments} do
-    RootstockData.Supervisor.Case.start_supervised!(json_rpc_named_arguments: json_rpc_named_arguments)
-
-    :timer.sleep(300)
-
-    assert [{Indexer.Fetcher.RootstockData, :undefined, :worker, [Indexer.Fetcher.RootstockData]} | _] =
-             RootstockData.Supervisor |> Supervisor.which_children()
-  end
-
-  test "stops when all old blocks are fetched", %{json_rpc_named_arguments: json_rpc_named_arguments} do
-    block_a = insert(:block)
-    block_b = insert(:block)
-
-    block_a_number_string = integer_to_quantity(block_a.number)
-    block_b_number_string = integer_to_quantity(block_b.number)
-
-    EthereumJSONRPC.Mox
-    |> stub(:json_rpc, fn requests, _options ->
-      {:ok,
-       Enum.map(requests, fn
-         %{id: id, method: "eth_getBlockByNumber", params: [^block_a_number_string, false]} ->
-           %{
-             id: id,
-             result: %{
-               "author" => "0x5a0b54d5dc17e0aadc383d2db43b0a0d3e029c4c",
-               "difficulty" => "0x6bc767dd80781",
-               "extraData" => "0x5050594520737061726b706f6f6c2d6574682d7477",
-               "gasLimit" => "0x7a121d",
-               "gasUsed" => "0x79cbe9",
-               "hash" => to_string(block_a.hash),
-               "logsBloom" =>
-                 "0x044d42d008801488400e1809190200a80d06105bc0c4100b047895c0d518327048496108388040140010b8208006288102e206160e21052322440924002090c1c808a0817405ab238086d028211014058e949401012403210314896702d06880c815c3060a0f0809987c81044488292cc11d57882c912a808ca10471c84460460040000c0001012804022000a42106591881d34407420ba401e1c08a8d00a000a34c11821a80222818a4102152c8a0c044032080c6462644223104d618e0e544072008120104408205c60510542264808488220403000106281a0290404220112c10b080145028c8000300b18a2c8280701c882e702210b00410834840108084",
-               "miner" => to_string(block_a.miner),
-               "mixHash" => "0xda53ae7c2b3c529783d6cdacdb90587fd70eb651c0f04253e8ff17de97844010",
-               "nonce" => "0x0946e5f01fce12bc",
-               "number" => block_a_number_string,
-               "parentHash" => to_string(block_a.parent_hash),
-               "receiptsRoot" => "0xa7d2b82bd8526de11736c18bd5cc8cfe2692106c4364526f3310ad56d78669c4",
-               "sealFields" => [
-                 "0xa0da53ae7c2b3c529783d6cdacdb90587fd70eb651c0f04253e8ff17de97844010",
-                 "0x880946e5f01fce12bc"
-               ],
-               "sha3Uncles" => "0x483a8a21a5825ad270f358b3ea56e060bbb8b3082d9a92ec8fa17a5c7e6fc1b6",
-               "size" => "0x544c",
-               "stateRoot" => "0x85daa9cd528004c1609d4cb3520fd958e85983bb4183124a4a9f7137fd39c691",
-               "timestamp" => "0x5c8bc76e",
-               "totalDifficulty" => "0x201a42c35142ae94458",
-               "transactions" => [],
-               "transactionsRoot" => "0xcd6c12fa43cd4e92ad5c0bf232b30488bbcbfe273c5b4af0366fced0767d54db",
-               "uncles" => [],
-               "withdrawals" => [],
-               "minimumGasPrice" => "0x0",
-               "bitcoinMergedMiningHeader" =>
-                 "0x00006d20ffd048280094a6ea0851d854036aacaa25ee0f23f0040200000000000000000078d2638fe0b4477c54601e6449051afba8228e0a88ff06b0c91f091fd34d5da57487c76402610517372c2fe9",
-               "bitcoinMergedMiningCoinbaseTransaction" =>
-                 "0x00000000000000805bf0dc9203da49a3b4e3ec913806e43102cc07db991272dc8b7018da57eb5abe59a32d070000ffffffff03449a4d26000000001976a914536ffa992491508dca0354e52f32a3a7a679a53a88ac00000000000000002b6a2952534b424c4f434b3ad2508d21d28c8f89d495923c0758ec3f64bd6755b4ec416f5601312600542a400000000000000000266a24aa21a9ed4ae42ea6dca2687aaed665714bf58b055c4e11f2fb038605930d630b49ad7b9d00000000",
-               "bitcoinMergedMiningMerkleProof" =>
-                 "0x8e5a4ba74eb4eb2f9ad4cabc2913aeed380a5becf7cd4d513341617efb798002bd83a783c31c66a8a8f6cc56c071c2d471cb610e3dc13054b9d216021d8c7e9112f622564449ebedcedf7d4ccb6fe0ffac861b7ed1446c310813cdf712e1e6add28b1fe1c0ae5e916194ba4f285a9340aba41e91bf847bf31acf37a9623a04a2348a37ab9faa5908122db45596bbc03e9c3644b0d4589471c4ff30fc139f3ba50506e9136fa0df799b487494de3e2b3dec937338f1a2e18da057c1f60590a9723672a4355b9914b1d01af9f582d9e856f6e1744be00f268b0b01d559329f7e0685aa63ffeb7c28486d7462292021d1345cddbf7c920ca34bb7aa4c6cdbe068806e35d0db662e7fcda03cb4d779594638c62a1fdd7ec98d1fb6d240d853958abe57561d9b9d0465cf8b9d6ee3c58b0d8b07d6c4c5d8f348e43fe3c06011b6a0008db4e0b16c77ececc3981f9008201cea5939869d648e59a09bd2094b1196ff61126bffb626153deed2563e1745436247c94a85d2947756b606d67633781c99d7",
-               "hashForMergedMining" => "0xd2508d21d28c8f89d495923c0758ec3f64bd6755b4ec416f5601312600542a40"
+  if Application.compile_env(:explorer, :chain_type) == "rsk" do
+    test "do not start when all old blocks are fetched", %{json_rpc_named_arguments: json_rpc_named_arguments} do
+      RootstockData.Supervisor.Case.start_supervised!(json_rpc_named_arguments: json_rpc_named_arguments)
+
+      :timer.sleep(300)
+
+      assert [{Indexer.Fetcher.RootstockData, :undefined, :worker, [Indexer.Fetcher.RootstockData]} | _] =
+               RootstockData.Supervisor |> Supervisor.which_children()
+    end
+
+    test "stops when all old blocks are fetched", %{json_rpc_named_arguments: json_rpc_named_arguments} do
+      block_a = insert(:block)
+      block_b = insert(:block)
+
+      block_a_number_string = integer_to_quantity(block_a.number)
+      block_b_number_string = integer_to_quantity(block_b.number)
+
+      EthereumJSONRPC.Mox
+      |> stub(:json_rpc, fn requests, _options ->
+        {:ok,
+         Enum.map(requests, fn
+           %{id: id, method: "eth_getBlockByNumber", params: [^block_a_number_string, false]} ->
+             %{
+               id: id,
+               result: %{
+                 "author" => "0x5a0b54d5dc17e0aadc383d2db43b0a0d3e029c4c",
+                 "difficulty" => "0x6bc767dd80781",
+                 "extraData" => "0x5050594520737061726b706f6f6c2d6574682d7477",
+                 "gasLimit" => "0x7a121d",
+                 "gasUsed" => "0x79cbe9",
+                 "hash" => to_string(block_a.hash),
+                 "logsBloom" =>
+                   "0x044d42d008801488400e1809190200a80d06105bc0c4100b047895c0d518327048496108388040140010b8208006288102e206160e21052322440924002090c1c808a0817405ab238086d028211014058e949401012403210314896702d06880c815c3060a0f0809987c81044488292cc11d57882c912a808ca10471c84460460040000c0001012804022000a42106591881d34407420ba401e1c08a8d00a000a34c11821a80222818a4102152c8a0c044032080c6462644223104d618e0e544072008120104408205c60510542264808488220403000106281a0290404220112c10b080145028c8000300b18a2c8280701c882e702210b00410834840108084",
+                 "miner" => to_string(block_a.miner),
+                 "mixHash" => "0xda53ae7c2b3c529783d6cdacdb90587fd70eb651c0f04253e8ff17de97844010",
+                 "nonce" => "0x0946e5f01fce12bc",
+                 "number" => block_a_number_string,
+                 "parentHash" => to_string(block_a.parent_hash),
+                 "receiptsRoot" => "0xa7d2b82bd8526de11736c18bd5cc8cfe2692106c4364526f3310ad56d78669c4",
+                 "sealFields" => [
+                   "0xa0da53ae7c2b3c529783d6cdacdb90587fd70eb651c0f04253e8ff17de97844010",
+                   "0x880946e5f01fce12bc"
+                 ],
+                 "sha3Uncles" => "0x483a8a21a5825ad270f358b3ea56e060bbb8b3082d9a92ec8fa17a5c7e6fc1b6",
+                 "size" => "0x544c",
+                 "stateRoot" => "0x85daa9cd528004c1609d4cb3520fd958e85983bb4183124a4a9f7137fd39c691",
+                 "timestamp" => "0x5c8bc76e",
+                 "totalDifficulty" => "0x201a42c35142ae94458",
+                 "transactions" => [],
+                 "transactionsRoot" => "0xcd6c12fa43cd4e92ad5c0bf232b30488bbcbfe273c5b4af0366fced0767d54db",
+                 "uncles" => [],
+                 "withdrawals" => [],
+                 "minimumGasPrice" => "0x0",
+                 "bitcoinMergedMiningHeader" =>
+                   "0x00006d20ffd048280094a6ea0851d854036aacaa25ee0f23f0040200000000000000000078d2638fe0b4477c54601e6449051afba8228e0a88ff06b0c91f091fd34d5da57487c76402610517372c2fe9",
+                 "bitcoinMergedMiningCoinbaseTransaction" =>
+                   "0x00000000000000805bf0dc9203da49a3b4e3ec913806e43102cc07db991272dc8b7018da57eb5abe59a32d070000ffffffff03449a4d26000000001976a914536ffa992491508dca0354e52f32a3a7a679a53a88ac00000000000000002b6a2952534b424c4f434b3ad2508d21d28c8f89d495923c0758ec3f64bd6755b4ec416f5601312600542a400000000000000000266a24aa21a9ed4ae42ea6dca2687aaed665714bf58b055c4e11f2fb038605930d630b49ad7b9d00000000",
+                 "bitcoinMergedMiningMerkleProof" =>
+                   "0x8e5a4ba74eb4eb2f9ad4cabc2913aeed380a5becf7cd4d513341617efb798002bd83a783c31c66a8a8f6cc56c071c2d471cb610e3dc13054b9d216021d8c7e9112f622564449ebedcedf7d4ccb6fe0ffac861b7ed1446c310813cdf712e1e6add28b1fe1c0ae5e916194ba4f285a9340aba41e91bf847bf31acf37a9623a04a2348a37ab9faa5908122db45596bbc03e9c3644b0d4589471c4ff30fc139f3ba50506e9136fa0df799b487494de3e2b3dec937338f1a2e18da057c1f60590a9723672a4355b9914b1d01af9f582d9e856f6e1744be00f268b0b01d559329f7e0685aa63ffeb7c28486d7462292021d1345cddbf7c920ca34bb7aa4c6cdbe068806e35d0db662e7fcda03cb4d779594638c62a1fdd7ec98d1fb6d240d853958abe57561d9b9d0465cf8b9d6ee3c58b0d8b07d6c4c5d8f348e43fe3c06011b6a0008db4e0b16c77ececc3981f9008201cea5939869d648e59a09bd2094b1196ff61126bffb626153deed2563e1745436247c94a85d2947756b606d67633781c99d7",
+                 "hashForMergedMining" => "0xd2508d21d28c8f89d495923c0758ec3f64bd6755b4ec416f5601312600542a40"
+               }
              }
-           }
-
-         %{id: id, method: "eth_getBlockByNumber", params: [^block_b_number_string, false]} ->
-           %{
-             id: id,
-             result: %{
-               "author" => "0x5a0b54d5dc17e0aadc383d2db43b0a0d3e029c4c",
-               "difficulty" => "0x6bc767dd80781",
-               "extraData" => "0x5050594520737061726b706f6f6c2d6574682d7477",
-               "gasLimit" => "0x7a121d",
-               "gasUsed" => "0x79cbe9",
-               "hash" => to_string(block_b.hash),
-               "logsBloom" =>
-                 "0x044d42d008801488400e1809190200a80d06105bc0c4100b047895c0d518327048496108388040140010b8208006288102e206160e21052322440924002090c1c808a0817405ab238086d028211014058e949401012403210314896702d06880c815c3060a0f0809987c81044488292cc11d57882c912a808ca10471c84460460040000c0001012804022000a42106591881d34407420ba401e1c08a8d00a000a34c11821a80222818a4102152c8a0c044032080c6462644223104d618e0e544072008120104408205c60510542264808488220403000106281a0290404220112c10b080145028c8000300b18a2c8280701c882e702210b00410834840108084",
-               "miner" => to_string(block_b.miner),
-               "mixHash" => "0xda53ae7c2b3c529783d6cdacdb90587fd70eb651c0f04253e8ff17de97844010",
-               "nonce" => "0x0946e5f01fce12bc",
-               "number" => block_b_number_string,
-               "parentHash" => to_string(block_b.parent_hash),
-               "receiptsRoot" => "0xa7d2b82bd8526de11736c18bd5cc8cfe2692106c4364526f3310ad56d78669c4",
-               "sealFields" => [
-                 "0xa0da53ae7c2b3c529783d6cdacdb90587fd70eb651c0f04253e8ff17de97844010",
-                 "0x880946e5f01fce12bc"
-               ],
-               "sha3Uncles" => "0x483a8a21a5825ad270f358b3ea56e060bbb8b3082d9a92ec8fa17a5c7e6fc1b6",
-               "size" => "0x544c",
-               "stateRoot" => "0x85daa9cd528004c1609d4cb3520fd958e85983bb4183124a4a9f7137fd39c691",
-               "timestamp" => "0x5c8bc76e",
-               "totalDifficulty" => "0x201a42c35142ae94458",
-               "transactions" => [],
-               "transactionsRoot" => "0xcd6c12fa43cd4e92ad5c0bf232b30488bbcbfe273c5b4af0366fced0767d54db",
-               "uncles" => [],
-               "withdrawals" => [],
-               "minimumGasPrice" => "0x1",
-               "bitcoinMergedMiningHeader" =>
-                 "0x00006d20ffd048280094a6ea0851d854036aacaa25ee0f23f0040200000000000000000078d2638fe0b4477c54601e6449051afba8228e0a88ff06b0c91f091fd34d5da57487c76402610517372c2fe9",
-               "bitcoinMergedMiningCoinbaseTransaction" =>
-                 "0x00000000000000805bf0dc9203da49a3b4e3ec913806e43102cc07db991272dc8b7018da57eb5abe59a32d070000ffffffff03449a4d26000000001976a914536ffa992491508dca0354e52f32a3a7a679a53a88ac00000000000000002b6a2952534b424c4f434b3ad2508d21d28c8f89d495923c0758ec3f64bd6755b4ec416f5601312600542a400000000000000000266a24aa21a9ed4ae42ea6dca2687aaed665714bf58b055c4e11f2fb038605930d630b49ad7b9d00000000",
-               "bitcoinMergedMiningMerkleProof" =>
-                 "0x8e5a4ba74eb4eb2f9ad4cabc2913aeed380a5becf7cd4d513341617efb798002bd83a783c31c66a8a8f6cc56c071c2d471cb610e3dc13054b9d216021d8c7e9112f622564449ebedcedf7d4ccb6fe0ffac861b7ed1446c310813cdf712e1e6add28b1fe1c0ae5e916194ba4f285a9340aba41e91bf847bf31acf37a9623a04a2348a37ab9faa5908122db45596bbc03e9c3644b0d4589471c4ff30fc139f3ba50506e9136fa0df799b487494de3e2b3dec937338f1a2e18da057c1f60590a9723672a4355b9914b1d01af9f582d9e856f6e1744be00f268b0b01d559329f7e0685aa63ffeb7c28486d7462292021d1345cddbf7c920ca34bb7aa4c6cdbe068806e35d0db662e7fcda03cb4d779594638c62a1fdd7ec98d1fb6d240d853958abe57561d9b9d0465cf8b9d6ee3c58b0d8b07d6c4c5d8f348e43fe3c06011b6a0008db4e0b16c77ececc3981f9008201cea5939869d648e59a09bd2094b1196ff61126bffb626153deed2563e1745436247c94a85d2947756b606d67633781c99d7",
-               "hashForMergedMining" => "0xd2508d21d28c8f89d495923c0758ec3f64bd6755b4ec416f5601312600542a40"
+
+           %{id: id, method: "eth_getBlockByNumber", params: [^block_b_number_string, false]} ->
+             %{
+               id: id,
+               result: %{
+                 "author" => "0x5a0b54d5dc17e0aadc383d2db43b0a0d3e029c4c",
+                 "difficulty" => "0x6bc767dd80781",
+                 "extraData" => "0x5050594520737061726b706f6f6c2d6574682d7477",
+                 "gasLimit" => "0x7a121d",
+                 "gasUsed" => "0x79cbe9",
+                 "hash" => to_string(block_b.hash),
+                 "logsBloom" =>
+                   "0x044d42d008801488400e1809190200a80d06105bc0c4100b047895c0d518327048496108388040140010b8208006288102e206160e21052322440924002090c1c808a0817405ab238086d028211014058e949401012403210314896702d06880c815c3060a0f0809987c81044488292cc11d57882c912a808ca10471c84460460040000c0001012804022000a42106591881d34407420ba401e1c08a8d00a000a34c11821a80222818a4102152c8a0c044032080c6462644223104d618e0e544072008120104408205c60510542264808488220403000106281a0290404220112c10b080145028c8000300b18a2c8280701c882e702210b00410834840108084",
+                 "miner" => to_string(block_b.miner),
+                 "mixHash" => "0xda53ae7c2b3c529783d6cdacdb90587fd70eb651c0f04253e8ff17de97844010",
+                 "nonce" => "0x0946e5f01fce12bc",
+                 "number" => block_b_number_string,
+                 "parentHash" => to_string(block_b.parent_hash),
+                 "receiptsRoot" => "0xa7d2b82bd8526de11736c18bd5cc8cfe2692106c4364526f3310ad56d78669c4",
+                 "sealFields" => [
+                   "0xa0da53ae7c2b3c529783d6cdacdb90587fd70eb651c0f04253e8ff17de97844010",
+                   "0x880946e5f01fce12bc"
+                 ],
+                 "sha3Uncles" => "0x483a8a21a5825ad270f358b3ea56e060bbb8b3082d9a92ec8fa17a5c7e6fc1b6",
+                 "size" => "0x544c",
+                 "stateRoot" => "0x85daa9cd528004c1609d4cb3520fd958e85983bb4183124a4a9f7137fd39c691",
+                 "timestamp" => "0x5c8bc76e",
+                 "totalDifficulty" => "0x201a42c35142ae94458",
+                 "transactions" => [],
+                 "transactionsRoot" => "0xcd6c12fa43cd4e92ad5c0bf232b30488bbcbfe273c5b4af0366fced0767d54db",
+                 "uncles" => [],
+                 "withdrawals" => [],
+                 "minimumGasPrice" => "0x1",
+                 "bitcoinMergedMiningHeader" =>
+                   "0x00006d20ffd048280094a6ea0851d854036aacaa25ee0f23f0040200000000000000000078d2638fe0b4477c54601e6449051afba8228e0a88ff06b0c91f091fd34d5da57487c76402610517372c2fe9",
+                 "bitcoinMergedMiningCoinbaseTransaction" =>
+                   "0x00000000000000805bf0dc9203da49a3b4e3ec913806e43102cc07db991272dc8b7018da57eb5abe59a32d070000ffffffff03449a4d26000000001976a914536ffa992491508dca0354e52f32a3a7a679a53a88ac00000000000000002b6a2952534b424c4f434b3ad2508d21d28c8f89d495923c0758ec3f64bd6755b4ec416f5601312600542a400000000000000000266a24aa21a9ed4ae42ea6dca2687aaed665714bf58b055c4e11f2fb038605930d630b49ad7b9d00000000",
+                 "bitcoinMergedMiningMerkleProof" =>
+                   "0x8e5a4ba74eb4eb2f9ad4cabc2913aeed380a5becf7cd4d513341617efb798002bd83a783c31c66a8a8f6cc56c071c2d471cb610e3dc13054b9d216021d8c7e9112f622564449ebedcedf7d4ccb6fe0ffac861b7ed1446c310813cdf712e1e6add28b1fe1c0ae5e916194ba4f285a9340aba41e91bf847bf31acf37a9623a04a2348a37ab9faa5908122db45596bbc03e9c3644b0d4589471c4ff30fc139f3ba50506e9136fa0df799b487494de3e2b3dec937338f1a2e18da057c1f60590a9723672a4355b9914b1d01af9f582d9e856f6e1744be00f268b0b01d559329f7e0685aa63ffeb7c28486d7462292021d1345cddbf7c920ca34bb7aa4c6cdbe068806e35d0db662e7fcda03cb4d779594638c62a1fdd7ec98d1fb6d240d853958abe57561d9b9d0465cf8b9d6ee3c58b0d8b07d6c4c5d8f348e43fe3c06011b6a0008db4e0b16c77ececc3981f9008201cea5939869d648e59a09bd2094b1196ff61126bffb626153deed2563e1745436247c94a85d2947756b606d67633781c99d7",
+                 "hashForMergedMining" => "0xd2508d21d28c8f89d495923c0758ec3f64bd6755b4ec416f5601312600542a40"
+               }
              }
-           }
-       end)}
-    end)
+         end)}
+      end)
 
-    pid = RootstockData.Supervisor.Case.start_supervised!(json_rpc_named_arguments: json_rpc_named_arguments)
+      pid = RootstockData.Supervisor.Case.start_supervised!(json_rpc_named_arguments: json_rpc_named_arguments)
 
-    assert [{Indexer.Fetcher.RootstockData, worker_pid, :worker, [Indexer.Fetcher.RootstockData]} | _] =
-             RootstockData.Supervisor |> Supervisor.which_children()
+      assert [{Indexer.Fetcher.RootstockData, worker_pid, :worker, [Indexer.Fetcher.RootstockData]} | _] =
+               RootstockData.Supervisor |> Supervisor.which_children()
 
-    assert is_pid(worker_pid)
+      assert is_pid(worker_pid)
 
-    :timer.sleep(300)
+      :timer.sleep(300)
 
-    assert [{Indexer.Fetcher.RootstockData, :undefined, :worker, [Indexer.Fetcher.RootstockData]} | _] =
-             RootstockData.Supervisor |> Supervisor.which_children()
+      assert [{Indexer.Fetcher.RootstockData, :undefined, :worker, [Indexer.Fetcher.RootstockData]} | _] =
+               RootstockData.Supervisor |> Supervisor.which_children()
 
-    # Terminates the process so it finishes all Ecto processes.
-    GenServer.stop(pid)
+      # Terminates the process so it finishes all Ecto processes.
+      GenServer.stop(pid)
+    end
   end
 end
diff --git a/config/config_helper.exs b/config/config_helper.exs
index af4e8de6aefe..8086279fc44e 100644
--- a/config/config_helper.exs
+++ b/config/config_helper.exs
@@ -179,4 +179,7 @@ defmodule ConfigHelper do
   rescue
     err -> raise "Invalid JSON in environment variable #{env_var}: #{inspect(err)}"
   end
+
+  @spec chain_type() :: String.t()
+  def chain_type, do: System.get_env("CHAIN_TYPE") || "ethereum"
 end
diff --git a/config/runtime.exs b/config/runtime.exs
index a7eaeaa0a36f..81459925ee18 100644
--- a/config/runtime.exs
+++ b/config/runtime.exs
@@ -4,8 +4,6 @@ import Config
 |> Path.join()
 |> Code.eval_file()
 
-chain_type = System.get_env("CHAIN_TYPE") || "ethereum"
-
 ######################
 ### BlockScout Web ###
 ######################
@@ -162,7 +160,7 @@ config :ethereum_jsonrpc, EthereumJSONRPC.HTTP,
 config :ethereum_jsonrpc, EthereumJSONRPC.Geth,
   debug_trace_transaction_timeout: System.get_env("ETHEREUM_JSONRPC_DEBUG_TRACE_TRANSACTION_TIMEOUT", "5s"),
   tracer:
-    if(chain_type == "polygon_edge",
+    if(ConfigHelper.chain_type() == "polygon_edge",
       do: "polygon_edge",
       else: System.get_env("INDEXER_INTERNAL_TRANSACTIONS_TRACER_TYPE", "call_tracer")
     )
@@ -185,7 +183,6 @@ checksum_function = System.get_env("CHECKSUM_FUNCTION")
 exchange_rates_coin = System.get_env("EXCHANGE_RATES_COIN")
 
 config :explorer,
-  chain_type: chain_type,
   coin: System.get_env("COIN") || exchange_rates_coin || "ETH",
   coin_name: System.get_env("COIN_NAME") || exchange_rates_coin || "ETH",
   allowed_solidity_evm_versions:
@@ -590,15 +587,19 @@ config :indexer, Indexer.Fetcher.Withdrawal.Supervisor,
 
 config :indexer, Indexer.Fetcher.Withdrawal, first_block: System.get_env("WITHDRAWALS_FIRST_BLOCK")
 
-config :indexer, Indexer.Fetcher.PolygonEdge.Supervisor, disabled?: !(chain_type == "polygon_edge")
+config :indexer, Indexer.Fetcher.PolygonEdge.Supervisor, disabled?: !(ConfigHelper.chain_type() == "polygon_edge")
 
-config :indexer, Indexer.Fetcher.PolygonEdge.Deposit.Supervisor, disabled?: !(chain_type == "polygon_edge")
+config :indexer, Indexer.Fetcher.PolygonEdge.Deposit.Supervisor,
+  disabled?: !(ConfigHelper.chain_type() == "polygon_edge")
 
-config :indexer, Indexer.Fetcher.PolygonEdge.DepositExecute.Supervisor, disabled?: !(chain_type == "polygon_edge")
+config :indexer, Indexer.Fetcher.PolygonEdge.DepositExecute.Supervisor,
+  disabled?: !(ConfigHelper.chain_type() == "polygon_edge")
 
-config :indexer, Indexer.Fetcher.PolygonEdge.Withdrawal.Supervisor, disabled?: !(chain_type == "polygon_edge")
+config :indexer, Indexer.Fetcher.PolygonEdge.Withdrawal.Supervisor,
+  disabled?: !(ConfigHelper.chain_type() == "polygon_edge")
 
-config :indexer, Indexer.Fetcher.PolygonEdge.WithdrawalExit.Supervisor, disabled?: !(chain_type == "polygon_edge")
+config :indexer, Indexer.Fetcher.PolygonEdge.WithdrawalExit.Supervisor,
+  disabled?: !(ConfigHelper.chain_type() == "polygon_edge")
 
 config :indexer, Indexer.Fetcher.PolygonEdge,
   polygon_edge_l1_rpc: System.get_env("INDEXER_POLYGON_EDGE_L1_RPC"),
@@ -630,8 +631,9 @@ config :indexer, Indexer.Fetcher.Zkevm.TransactionBatch.Supervisor,
     System.get_env("CHAIN_TYPE", "ethereum") == "polygon_zkevm" &&
       ConfigHelper.parse_bool_env_var("INDEXER_ZKEVM_BATCHES_ENABLED")
 
-      config :indexer, Indexer.Fetcher.RootstockData.Supervisor,
-  disabled?: ConfigHelper.parse_bool_env_var("INDEXER_DISABLE_ROOTSTOCK_DATA_FETCHER")
+config :indexer, Indexer.Fetcher.RootstockData.Supervisor,
+  disabled?:
+    ConfigHelper.chain_type() != "rsk" || ConfigHelper.parse_bool_env_var("INDEXER_DISABLE_ROOTSTOCK_DATA_FETCHER")
 
 config :indexer, Indexer.Fetcher.RootstockData,
   interval: ConfigHelper.parse_time_env_var("INDEXER_ROOTSTOCK_DATA_FETCHER_INTERVAL", "3s"),

From ae15ea5fdb24bc3850a9fbe02624652ebdec9fd2 Mon Sep 17 00:00:00 2001
From: Viktor Baranov <baranov.viktor.27@gmail.com>
Date: Thu, 9 Nov 2023 21:11:40 +0300
Subject: [PATCH 639/909] CI for ETH Sepolia

---
 .../publish-docker-image-for-eth-sepolia.yml  | 54 +++++++++++++++++++
 1 file changed, 54 insertions(+)
 create mode 100644 .github/workflows/publish-docker-image-for-eth-sepolia.yml

diff --git a/.github/workflows/publish-docker-image-for-eth-sepolia.yml b/.github/workflows/publish-docker-image-for-eth-sepolia.yml
new file mode 100644
index 000000000000..d53b987b0a1c
--- /dev/null
+++ b/.github/workflows/publish-docker-image-for-eth-sepolia.yml
@@ -0,0 +1,54 @@
+# This workflow uses actions that are not certified by GitHub.
+# They are provided by a third-party and are governed by
+# separate terms of service, privacy policy, and support
+# documentation.
+
+name: Publish Docker image for specific chain branches
+
+on:
+  push:
+    branches:
+      - production-eth-sepolia-stg
+jobs:
+  push_to_registry:
+    name: Push Docker image to Docker Hub
+    runs-on: ubuntu-latest
+    env:
+      RELEASE_VERSION: 5.3.1
+      DOCKER_CHAIN_NAME: eth-sepolia
+    steps:
+      - name: Check out the repo
+        uses: actions/checkout@v4
+      
+      - name: Log in to Docker Hub
+        uses: docker/login-action@v3
+        with:
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
+      
+      - name: Extract metadata (tags, labels) for Docker
+        id: meta
+        uses: docker/metadata-action@v5
+        with:
+          images: blockscout/blockscout
+
+      - name: Add SHORT_SHA env property with commit short sha
+        run: echo "SHORT_SHA=`echo ${GITHUB_SHA} | cut -c1-8`" >> $GITHUB_ENV
+      
+      - name: Build and push Docker image
+        uses: docker/build-push-action@v5
+        with:
+          context: .
+          file: ./docker/Dockerfile
+          push: true
+          tags: blockscout/blockscout-${{ env.DOCKER_CHAIN_NAME }}:latest, blockscout/blockscout-${{ env.DOCKER_CHAIN_NAME }}:${{ env.RELEASE_VERSION }}-postrelease-${{ env.SHORT_SHA }}
+          build-args: |
+            CACHE_EXCHANGE_RATES_PERIOD=
+            API_V1_READ_METHODS_DISABLED=false
+            DISABLE_WEBAPP=false
+            API_V1_WRITE_METHODS_DISABLED=false
+            CACHE_TOTAL_GAS_USAGE_COUNTER_ENABLED=
+            ADMIN_PANEL_ENABLED=false
+            CACHE_ADDRESS_WITH_BALANCES_UPDATE_INTERVAL=
+            BLOCKSCOUT_VERSION=v${{ env.RELEASE_VERSION }}-beta.+commit.${{ env.SHORT_SHA }}
+            RELEASE_VERSION=${{ env.RELEASE_VERSION }}
\ No newline at end of file

From ca1bd8314dfa6058083f57ff7840fcce3626d57a Mon Sep 17 00:00:00 2001
From: nikitosing <32202610+nikitosing@users.noreply.github.com>
Date: Thu, 9 Nov 2023 21:37:01 +0300
Subject: [PATCH 640/909] API v2: address nft (#8634)

* Add /api/v2/addresses/{address_hash}/nft and /api/v2/{address_hash}/nft/collections

* Add filter to /api/v2/tokens/{address_hash}/instances?holder_address_hash={holder_address}

* Changelog

* Revert log disabling

* Fix warn

* Add @spec and @doc

* Process review comments
---
 CHANGELOG.md                                  |   1 +
 .../lib/block_scout_web/api_router.ex         |   2 +
 .../lib/block_scout_web/chain.ex              |  26 +-
 .../controllers/address_token_controller.ex   |   2 +-
 .../controllers/api/v2/address_controller.ex  | 141 ++--
 .../controllers/api/v2/token_controller.ex    |  45 +-
 .../lib/block_scout_web/paging_helper.ex      |  18 +-
 .../views/api/v2/address_view.ex              |  64 +-
 .../views/api/v2/token_view.ex                |  56 +-
 .../api/v2/address_controller_test.exs        | 607 ++++++++++++++++++
 .../api/v2/token_controller_test.exs          | 118 ++++
 apps/explorer/config/test.exs                 |   6 +-
 apps/explorer/lib/explorer/chain.ex           |   4 +
 .../chain/address/current_token_balance.ex    |   8 +-
 .../lib/explorer/chain/token/instance.ex      | 309 ++++++++-
 apps/explorer/lib/explorer/helper.ex          |  22 +
 apps/explorer/test/support/factory.ex         |  45 +-
 17 files changed, 1396 insertions(+), 78 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7422a7055f45..998e0c642c10 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,7 @@
 - [#8795](https://github.com/blockscout/blockscout/pull/8795) - Disable catchup indexer by env
 - [#8768](https://github.com/blockscout/blockscout/pull/8768) - Add possibility to search tokens by address hash
 - [#8750](https://github.com/blockscout/blockscout/pull/8750) - Support new eth-bytecode-db request metadata fields
+- [#8634](https://github.com/blockscout/blockscout/pull/8634) - API v2: NFT for address
 - [#8609](https://github.com/blockscout/blockscout/pull/8609) - Change logs format to JSON; Add endpoint url to the block_scout_web logging
 
 ### Fixes
diff --git a/apps/block_scout_web/lib/block_scout_web/api_router.ex b/apps/block_scout_web/lib/block_scout_web/api_router.ex
index 8d500a2a49cb..dee973786cfe 100644
--- a/apps/block_scout_web/lib/block_scout_web/api_router.ex
+++ b/apps/block_scout_web/lib/block_scout_web/api_router.ex
@@ -240,6 +240,8 @@ defmodule BlockScoutWeb.ApiRouter do
       get("/:address_hash_param/coin-balance-history", V2.AddressController, :coin_balance_history)
       get("/:address_hash_param/coin-balance-history-by-day", V2.AddressController, :coin_balance_history_by_day)
       get("/:address_hash_param/withdrawals", V2.AddressController, :withdrawals)
+      get("/:address_hash_param/nft", V2.AddressController, :nft_list)
+      get("/:address_hash_param/nft/collections", V2.AddressController, :nft_collections)
     end
 
     scope "/tokens" do
diff --git a/apps/block_scout_web/lib/block_scout_web/chain.ex b/apps/block_scout_web/lib/block_scout_web/chain.ex
index dc3bcbe83780..c7a317956057 100644
--- a/apps/block_scout_web/lib/block_scout_web/chain.ex
+++ b/apps/block_scout_web/lib/block_scout_web/chain.ex
@@ -101,16 +101,13 @@ defmodule BlockScoutWeb.Chain do
     end
   end
 
-  @spec next_page_params(any, any, any, any) :: nil | map
-  def next_page_params(next_page, list, params, is_ctb_with_fiat_value \\ false)
+  @spec next_page_params(any, list(), map(), (any -> map())) :: nil | map
+  def next_page_params(next_page, list, params, paging_function \\ &paging_params/1)
 
   def next_page_params([], _list, _params, _), do: nil
 
-  def next_page_params(_, list, params, is_ctb_with_fiat_value) do
-    paging_params =
-      if is_ctb_with_fiat_value,
-        do: paging_params_with_fiat_value(List.last(list)),
-        else: paging_params(List.last(list))
+  def next_page_params(_, list, params, paging_function) do
+    paging_params = paging_function.(List.last(list))
 
     next_page_params = Map.merge(params, paging_params)
     current_items_count_string = Map.get(next_page_params, "items_count")
@@ -382,6 +379,18 @@ defmodule BlockScoutWeb.Chain do
     [paging_options: %{@default_paging_options | key: {id}}]
   end
 
+  def paging_options(%{
+        "token_contract_address_hash" => token_contract_address_hash,
+        "token_id" => token_id,
+        "token_type" => token_type
+      }) do
+    [paging_options: %{@default_paging_options | key: {token_contract_address_hash, token_id, token_type}}]
+  end
+
+  def paging_options(%{"token_contract_address_hash" => token_contract_address_hash, "token_type" => token_type}) do
+    [paging_options: %{@default_paging_options | key: {token_contract_address_hash, token_type}}]
+  end
+
   def paging_options(_params), do: [paging_options: @default_paging_options]
 
   def put_key_value_to_paging_options([paging_options: paging_options], key, value) do
@@ -593,7 +602,8 @@ defmodule BlockScoutWeb.Chain do
     %{"id" => msg_id}
   end
 
-  defp paging_params_with_fiat_value(%CurrentTokenBalance{id: id, value: value} = ctb) do
+  @spec paging_params_with_fiat_value(CurrentTokenBalance.t()) :: %{binary() => any}
+  def paging_params_with_fiat_value(%CurrentTokenBalance{id: id, value: value} = ctb) do
     %{"fiat_value" => ctb.fiat_value, "value" => value, "id" => id}
   end
 
diff --git a/apps/block_scout_web/lib/block_scout_web/controllers/address_token_controller.ex b/apps/block_scout_web/lib/block_scout_web/controllers/address_token_controller.ex
index 3fa058758e6d..8433e96be186 100644
--- a/apps/block_scout_web/lib/block_scout_web/controllers/address_token_controller.ex
+++ b/apps/block_scout_web/lib/block_scout_web/controllers/address_token_controller.ex
@@ -22,7 +22,7 @@ defmodule BlockScoutWeb.AddressTokenController do
       {tokens, next_page} = split_list_by_page(token_balances_plus_one)
 
       next_page_path =
-        case next_page_params(next_page, tokens, params, true) do
+        case next_page_params(next_page, tokens, params, &BlockScoutWeb.Chain.paging_params_with_fiat_value/1) do
           nil ->
             nil
 
diff --git a/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/address_controller.ex b/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/address_controller.ex
index 5512f086f133..1ca5db5dcdc2 100644
--- a/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/address_controller.ex
+++ b/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/address_controller.ex
@@ -12,12 +12,13 @@ defmodule BlockScoutWeb.API.V2.AddressController do
     ]
 
   import BlockScoutWeb.PagingHelper,
-    only: [delete_parameters_from_next_page_params: 1, token_transfers_types_options: 1]
+    only: [delete_parameters_from_next_page_params: 1, token_transfers_types_options: 1, nft_token_types_options: 1]
 
   alias BlockScoutWeb.AccessHelper
   alias BlockScoutWeb.API.V2.{BlockView, TransactionView, WithdrawalView}
   alias Explorer.{Chain, Market}
   alias Explorer.Chain.Address.Counters
+  alias Explorer.Chain.Token.Instance
   alias Indexer.Fetcher.{CoinBalanceOnDemand, TokenBalanceOnDemand}
 
   @transaction_necessity_by_association [
@@ -54,14 +55,18 @@ defmodule BlockScoutWeb.API.V2.AddressController do
     api?: true
   ]
 
+  @nft_necessity_by_association [
+    necessity_by_association: %{
+      :token => :optional
+    }
+  ]
+
   @api_true [api?: true]
 
   action_fallback(BlockScoutWeb.API.V2.FallbackController)
 
   def address(conn, %{"address_hash_param" => address_hash_string} = params) do
-    with {:format, {:ok, address_hash}} <- {:format, Chain.string_to_address_hash(address_hash_string)},
-         {:ok, false} <- AccessHelper.restricted_access?(address_hash_string, params),
-         {:not_found, {:ok, address}} <- {:not_found, Chain.hash_to_address(address_hash, @address_options)} do
+    with {:ok, _address_hash, address} <- validate_address(address_hash_string, params, @address_options) do
       CoinBalanceOnDemand.trigger_fetch(address)
 
       conn
@@ -71,9 +76,7 @@ defmodule BlockScoutWeb.API.V2.AddressController do
   end
 
   def counters(conn, %{"address_hash_param" => address_hash_string} = params) do
-    with {:format, {:ok, address_hash}} <- {:format, Chain.string_to_address_hash(address_hash_string)},
-         {:ok, false} <- AccessHelper.restricted_access?(address_hash_string, params),
-         {:not_found, {:ok, address}} <- {:not_found, Chain.hash_to_address(address_hash, @api_true, false)} do
+    with {:ok, _address_hash, address} <- validate_address(address_hash_string, params) do
       {validation_count} = Counters.address_counters(address, @api_true)
 
       transactions_from_db = address.transactions_count || 0
@@ -90,9 +93,7 @@ defmodule BlockScoutWeb.API.V2.AddressController do
   end
 
   def token_balances(conn, %{"address_hash_param" => address_hash_string} = params) do
-    with {:format, {:ok, address_hash}} <- {:format, Chain.string_to_address_hash(address_hash_string)},
-         {:ok, false} <- AccessHelper.restricted_access?(address_hash_string, params),
-         {:not_found, {:ok, _address}} <- {:not_found, Chain.hash_to_address(address_hash, @api_true, false)} do
+    with {:ok, address_hash, _address} <- validate_address(address_hash_string, params) do
       token_balances =
         address_hash
         |> Chain.fetch_last_token_balances(@api_true)
@@ -108,9 +109,7 @@ defmodule BlockScoutWeb.API.V2.AddressController do
   end
 
   def transactions(conn, %{"address_hash_param" => address_hash_string} = params) do
-    with {:format, {:ok, address_hash}} <- {:format, Chain.string_to_address_hash(address_hash_string)},
-         {:ok, false} <- AccessHelper.restricted_access?(address_hash_string, params),
-         {:not_found, {:ok, _address}} <- {:not_found, Chain.hash_to_address(address_hash, @api_true, false)} do
+    with {:ok, address_hash, _address} <- validate_address(address_hash_string, params) do
       options =
         @transaction_necessity_by_association
         |> Keyword.merge(paging_options(params))
@@ -132,12 +131,8 @@ defmodule BlockScoutWeb.API.V2.AddressController do
         conn,
         %{"address_hash_param" => address_hash_string, "token" => token_address_hash_string} = params
       ) do
-    with {:format, {:ok, address_hash}} <- {:format, Chain.string_to_address_hash(address_hash_string)},
-         {:format, {:ok, token_address_hash}} <- {:format, Chain.string_to_address_hash(token_address_hash_string)},
-         {:ok, false} <- AccessHelper.restricted_access?(address_hash_string, params),
-         {:ok, false} <- AccessHelper.restricted_access?(token_address_hash_string, params),
-         {:not_found, {:ok, _address}} <- {:not_found, Chain.hash_to_address(address_hash, @api_true, false)},
-         {:not_found, {:ok, _}} <- {:not_found, Chain.token_from_address_hash(token_address_hash, @api_true)} do
+    with {:ok, address_hash, _address} <- validate_address(address_hash_string, params),
+         {:ok, token_address_hash, _token_address} <- validate_address(token_address_hash_string, params) do
       paging_options = paging_options(params)
 
       options =
@@ -176,9 +171,7 @@ defmodule BlockScoutWeb.API.V2.AddressController do
   end
 
   def token_transfers(conn, %{"address_hash_param" => address_hash_string} = params) do
-    with {:format, {:ok, address_hash}} <- {:format, Chain.string_to_address_hash(address_hash_string)},
-         {:ok, false} <- AccessHelper.restricted_access?(address_hash_string, params),
-         {:not_found, {:ok, _address}} <- {:not_found, Chain.hash_to_address(address_hash, @api_true, false)} do
+    with {:ok, address_hash, _address} <- validate_address(address_hash_string, params) do
       paging_options = paging_options(params)
 
       options =
@@ -207,9 +200,7 @@ defmodule BlockScoutWeb.API.V2.AddressController do
   end
 
   def internal_transactions(conn, %{"address_hash_param" => address_hash_string} = params) do
-    with {:format, {:ok, address_hash}} <- {:format, Chain.string_to_address_hash(address_hash_string)},
-         {:ok, false} <- AccessHelper.restricted_access?(address_hash_string, params),
-         {:not_found, {:ok, _address}} <- {:not_found, Chain.hash_to_address(address_hash, @api_true, false)} do
+    with {:ok, address_hash, _address} <- validate_address(address_hash_string, params) do
       full_options =
         [
           necessity_by_association: %{
@@ -242,9 +233,7 @@ defmodule BlockScoutWeb.API.V2.AddressController do
   end
 
   def logs(conn, %{"address_hash_param" => address_hash_string, "topic" => topic} = params) do
-    with {:format, {:ok, address_hash}} <- {:format, Chain.string_to_address_hash(address_hash_string)},
-         {:ok, false} <- AccessHelper.restricted_access?(address_hash_string, params),
-         {:not_found, {:ok, _address}} <- {:not_found, Chain.hash_to_address(address_hash, @api_true, false)} do
+    with {:ok, address_hash, _address} <- validate_address(address_hash_string, params) do
       prepared_topic = String.trim(topic)
 
       formatted_topic = if String.starts_with?(prepared_topic, "0x"), do: prepared_topic, else: "0x" <> prepared_topic
@@ -265,9 +254,7 @@ defmodule BlockScoutWeb.API.V2.AddressController do
   end
 
   def logs(conn, %{"address_hash_param" => address_hash_string} = params) do
-    with {:format, {:ok, address_hash}} <- {:format, Chain.string_to_address_hash(address_hash_string)},
-         {:ok, false} <- AccessHelper.restricted_access?(address_hash_string, params),
-         {:not_found, {:ok, _address}} <- {:not_found, Chain.hash_to_address(address_hash, @api_true, false)} do
+    with {:ok, address_hash, _address} <- validate_address(address_hash_string, params) do
       options = params |> paging_options() |> Keyword.merge(@api_true)
 
       results_plus_one = Chain.address_to_logs(address_hash, false, options)
@@ -284,9 +271,7 @@ defmodule BlockScoutWeb.API.V2.AddressController do
   end
 
   def blocks_validated(conn, %{"address_hash_param" => address_hash_string} = params) do
-    with {:format, {:ok, address_hash}} <- {:format, Chain.string_to_address_hash(address_hash_string)},
-         {:ok, false} <- AccessHelper.restricted_access?(address_hash_string, params),
-         {:not_found, {:ok, _address}} <- {:not_found, Chain.hash_to_address(address_hash, @api_true, false)} do
+    with {:ok, address_hash, _address} <- validate_address(address_hash_string, params) do
       full_options =
         [
           necessity_by_association: %{
@@ -330,9 +315,7 @@ defmodule BlockScoutWeb.API.V2.AddressController do
   end
 
   def coin_balance_history_by_day(conn, %{"address_hash_param" => address_hash_string} = params) do
-    with {:format, {:ok, address_hash}} <- {:format, Chain.string_to_address_hash(address_hash_string)},
-         {:ok, false} <- AccessHelper.restricted_access?(address_hash_string, params),
-         {:not_found, {:ok, _address}} <- {:not_found, Chain.hash_to_address(address_hash, @api_true, false)} do
+    with {:ok, address_hash, _address} <- validate_address(address_hash_string, params) do
       balances_by_day =
         address_hash
         |> Chain.address_to_balances_by_day(@api_true)
@@ -344,9 +327,7 @@ defmodule BlockScoutWeb.API.V2.AddressController do
   end
 
   def tokens(conn, %{"address_hash_param" => address_hash_string} = params) do
-    with {:format, {:ok, address_hash}} <- {:format, Chain.string_to_address_hash(address_hash_string)},
-         {:ok, false} <- AccessHelper.restricted_access?(address_hash_string, params),
-         {:not_found, {:ok, _address}} <- {:not_found, Chain.hash_to_address(address_hash, @api_true, false)} do
+    with {:ok, address_hash, _address} <- validate_address(address_hash_string, params) do
       results_plus_one =
         address_hash
         |> Chain.fetch_paginated_last_token_balances(
@@ -362,7 +343,13 @@ defmodule BlockScoutWeb.API.V2.AddressController do
 
       {tokens, next_page} = split_list_by_page(results_plus_one)
 
-      next_page_params = next_page |> next_page_params(tokens, delete_parameters_from_next_page_params(params), true)
+      next_page_params =
+        next_page
+        |> next_page_params(
+          tokens,
+          delete_parameters_from_next_page_params(params),
+          &BlockScoutWeb.Chain.paging_params_with_fiat_value/1
+        )
 
       conn
       |> put_status(200)
@@ -371,9 +358,7 @@ defmodule BlockScoutWeb.API.V2.AddressController do
   end
 
   def withdrawals(conn, %{"address_hash_param" => address_hash_string} = params) do
-    with {:format, {:ok, address_hash}} <- {:format, Chain.string_to_address_hash(address_hash_string)},
-         {:ok, false} <- AccessHelper.restricted_access?(address_hash_string, params),
-         {:not_found, {:ok, _address}} <- {:not_found, Chain.hash_to_address(address_hash, @api_true, false)} do
+    with {:ok, address_hash, _address} <- validate_address(address_hash_string, params) do
       options = @api_true |> Keyword.merge(paging_options(params))
       withdrawals_plus_one = address_hash |> Chain.address_hash_to_withdrawals(options)
       {withdrawals, next_page} = split_list_by_page(withdrawals_plus_one)
@@ -411,9 +396,7 @@ defmodule BlockScoutWeb.API.V2.AddressController do
   end
 
   def tabs_counters(conn, %{"address_hash_param" => address_hash_string} = params) do
-    with {:format, {:ok, address_hash}} <- {:format, Chain.string_to_address_hash(address_hash_string)},
-         {:ok, false} <- AccessHelper.restricted_access?(address_hash_string, params),
-         {:not_found, {:ok, _address}} <- {:not_found, Chain.hash_to_address(address_hash, @api_true, false)} do
+    with {:ok, address_hash, _address} <- validate_address(address_hash_string, params) do
       {validations, transactions, token_transfers, token_balances, logs, withdrawals, internal_txs} =
         Counters.address_limited_counters(address_hash, @api_true)
 
@@ -430,4 +413,68 @@ defmodule BlockScoutWeb.API.V2.AddressController do
       })
     end
   end
+
+  def nft_list(conn, %{"address_hash_param" => address_hash_string} = params) do
+    with {:ok, address_hash, _address} <- validate_address(address_hash_string, params) do
+      results_plus_one =
+        Instance.nft_list(
+          address_hash,
+          params
+          |> paging_options()
+          |> Keyword.merge(nft_token_types_options(params))
+          |> Keyword.merge(@api_true)
+          |> Keyword.merge(@nft_necessity_by_association)
+        )
+
+      {nfts, next_page} = split_list_by_page(results_plus_one)
+
+      next_page_params =
+        next_page
+        |> next_page_params(
+          nfts,
+          delete_parameters_from_next_page_params(params),
+          &Instance.nft_list_next_page_params/1
+        )
+
+      conn
+      |> put_status(200)
+      |> render(:nft_list, %{token_instances: nfts, next_page_params: next_page_params})
+    end
+  end
+
+  def nft_collections(conn, %{"address_hash_param" => address_hash_string} = params) do
+    with {:ok, address_hash, _address} <- validate_address(address_hash_string, params) do
+      results_plus_one =
+        Instance.nft_collections(
+          address_hash,
+          params
+          |> paging_options()
+          |> Keyword.merge(nft_token_types_options(params))
+          |> Keyword.merge(@api_true)
+          |> Keyword.merge(@nft_necessity_by_association)
+        )
+
+      {collections, next_page} = split_list_by_page(results_plus_one)
+
+      next_page_params =
+        next_page
+        |> next_page_params(
+          collections,
+          delete_parameters_from_next_page_params(params),
+          &Instance.nft_collections_next_page_params/1
+        )
+
+      conn
+      |> put_status(200)
+      |> render(:nft_collections, %{collections: collections, next_page_params: next_page_params})
+    end
+  end
+
+  defp validate_address(address_hash_string, params, options \\ @api_true) do
+    with {:format, {:ok, address_hash}} <- {:format, Chain.string_to_address_hash(address_hash_string)},
+         {:ok, false} <- AccessHelper.restricted_access?(address_hash_string, params),
+         {:not_found, {:ok, address}} <- {:not_found, Chain.hash_to_address(address_hash, options, false)} do
+      {:ok, address_hash, address}
+    end
+  end
 end
diff --git a/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/token_controller.ex b/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/token_controller.ex
index 1ec2a32a3e0b..14852429ab61 100644
--- a/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/token_controller.ex
+++ b/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/token_controller.ex
@@ -2,8 +2,9 @@ defmodule BlockScoutWeb.API.V2.TokenController do
   use BlockScoutWeb, :controller
 
   alias BlockScoutWeb.AccessHelper
-  alias BlockScoutWeb.API.V2.TransactionView
-  alias Explorer.Chain
+  alias BlockScoutWeb.API.V2.{AddressView, TransactionView}
+  alias Explorer.{Chain, Repo}
+  alias Explorer.Chain.{Address, Token.Instance}
   alias Indexer.Fetcher.TokenTotalSupplyOnDemand
 
   import BlockScoutWeb.Chain,
@@ -87,6 +88,43 @@ defmodule BlockScoutWeb.API.V2.TokenController do
     end
   end
 
+  def instances(
+        conn,
+        %{"address_hash_param" => address_hash_string, "holder_address_hash" => holder_address_hash_string} = params
+      ) do
+    with {:format, {:ok, address_hash}} <- {:format, Chain.string_to_address_hash(address_hash_string)},
+         {:ok, false} <- AccessHelper.restricted_access?(address_hash_string, params),
+         {:not_found, {:ok, token}} <- {:not_found, Chain.token_from_address_hash(address_hash, @api_true)},
+         {:not_found, false} <- {:not_found, Chain.is_erc_20_token?(token)},
+         {:format, {:ok, holder_address_hash}} <- {:format, Chain.string_to_address_hash(holder_address_hash_string)},
+         {:ok, false} <- AccessHelper.restricted_access?(holder_address_hash_string, params) do
+      holder_address = Repo.get_by(Address, hash: holder_address_hash)
+
+      results_plus_one =
+        Instance.token_instances_by_holder_address_hash(
+          token,
+          holder_address_hash,
+          params
+          |> unique_tokens_paging_options()
+          |> Keyword.merge(@api_true)
+        )
+
+      {token_instances, next_page} = split_list_by_page(results_plus_one)
+
+      next_page_params =
+        next_page |> unique_tokens_next_page(token_instances, delete_parameters_from_next_page_params(params))
+
+      conn
+      |> put_status(200)
+      |> put_view(AddressView)
+      |> render(:nft_list, %{
+        token_instances: token_instances |> put_owner(holder_address),
+        next_page_params: next_page_params,
+        token: token
+      })
+    end
+  end
+
   def instances(conn, %{"address_hash_param" => address_hash_string} = params) do
     with {:format, {:ok, address_hash}} <- {:format, Chain.string_to_address_hash(address_hash_string)},
          {:ok, false} <- AccessHelper.restricted_access?(address_hash_string, params),
@@ -218,4 +256,7 @@ defmodule BlockScoutWeb.API.V2.TokenController do
     |> put_status(200)
     |> render(:tokens, %{tokens: tokens, next_page_params: next_page_params})
   end
+
+  defp put_owner(token_instances, holder_address),
+    do: Enum.map(token_instances, fn token_instance -> %Instance{token_instance | owner: holder_address} end)
 end
diff --git a/apps/block_scout_web/lib/block_scout_web/paging_helper.ex b/apps/block_scout_web/lib/block_scout_web/paging_helper.ex
index 860a8f7d4a15..c9a3472c850f 100644
--- a/apps/block_scout_web/lib/block_scout_web/paging_helper.ex
+++ b/apps/block_scout_web/lib/block_scout_web/paging_helper.ex
@@ -10,6 +10,7 @@ defmodule BlockScoutWeb.PagingHelper do
   @allowed_filter_labels ["validated", "pending"]
   @allowed_type_labels ["coin_transfer", "contract_call", "contract_creation", "token_transfer", "token_creation"]
   @allowed_token_transfer_type_labels ["ERC-20", "ERC-721", "ERC-1155"]
+  @allowed_nft_token_type_labels ["ERC-721", "ERC-1155"]
 
   def paging_options(%{"block_number" => block_number_string, "index" => index_string}, [:validated | _]) do
     with {block_number, ""} <- Integer.parse(block_number_string),
@@ -33,14 +34,29 @@ defmodule BlockScoutWeb.PagingHelper do
 
   def paging_options(_params, _filter), do: [paging_options: @default_paging_options]
 
+  @spec token_transfers_types_options(map()) :: [{:token_type, list}]
   def token_transfers_types_options(%{"type" => filters}) do
     [
-      token_type: filters |> String.upcase() |> parse_filter(@allowed_token_transfer_type_labels)
+      token_type: filters_to_list(filters, @allowed_token_transfer_type_labels)
     ]
   end
 
   def token_transfers_types_options(_), do: [token_type: []]
 
+  @doc """
+    Parse 'type' query parameter from request option map
+  """
+  @spec nft_token_types_options(map()) :: [{:token_type, list}]
+  def nft_token_types_options(%{"type" => filters}) do
+    [
+      token_type: filters_to_list(filters, @allowed_nft_token_type_labels)
+    ]
+  end
+
+  def nft_token_types_options(_), do: [token_type: []]
+
+  defp filters_to_list(filters, allowed), do: filters |> String.upcase() |> parse_filter(allowed)
+
   # sobelow_skip ["DOS.StringToAtom"]
   def filter_options(%{"filter" => filter}, fallback) do
     filter = filter |> parse_filter(@allowed_filter_labels) |> Enum.map(&String.to_atom/1)
diff --git a/apps/block_scout_web/lib/block_scout_web/views/api/v2/address_view.ex b/apps/block_scout_web/lib/block_scout_web/views/api/v2/address_view.ex
index 9cdf88abb2f9..33a3cc601a7f 100644
--- a/apps/block_scout_web/lib/block_scout_web/views/api/v2/address_view.ex
+++ b/apps/block_scout_web/lib/block_scout_web/views/api/v2/address_view.ex
@@ -9,6 +9,7 @@ defmodule BlockScoutWeb.API.V2.AddressView do
   alias Explorer.{Chain, Market}
   alias Explorer.Chain.Address.Counters
   alias Explorer.Chain.{Address, SmartContract}
+  alias Explorer.Chain.Token.Instance
 
   @api_true [api?: true]
 
@@ -54,6 +55,18 @@ defmodule BlockScoutWeb.API.V2.AddressView do
     }
   end
 
+  def render("nft_list.json", %{token_instances: token_instances, token: token, next_page_params: next_page_params}) do
+    %{"items" => Enum.map(token_instances, &prepare_nft(&1, token, true)), "next_page_params" => next_page_params}
+  end
+
+  def render("nft_list.json", %{token_instances: token_instances, next_page_params: next_page_params}) do
+    %{"items" => Enum.map(token_instances, &prepare_nft(&1)), "next_page_params" => next_page_params}
+  end
+
+  def render("nft_collections.json", %{collections: nft_collections, next_page_params: next_page_params}) do
+    %{"items" => Enum.map(nft_collections, &prepare_nft_collection(&1)), "next_page_params" => next_page_params}
+  end
+
   def prepare_address({address, nonce}) do
     nil
     |> Helper.address_with_info(address, address.hash, true)
@@ -123,7 +136,8 @@ defmodule BlockScoutWeb.API.V2.AddressView do
             fetch_and_render_token_instance(
               token_balance.token_id,
               token_balance.token,
-              token_balance.address_hash
+              token_balance.address_hash,
+              token_balance
             )
         )
     }
@@ -156,7 +170,44 @@ defmodule BlockScoutWeb.API.V2.AddressView do
     end
   end
 
-  def fetch_and_render_token_instance(token_id, token, address_hash) do
+  defp prepare_nft(nft) do
+    prepare_nft(nft, nft.token, false)
+  end
+
+  defp prepare_nft(nft, token, need_uniqueness?) do
+    Map.merge(
+      %{"token_type" => token.type, "value" => value(token.type, nft)},
+      TokenView.prepare_token_instance(nft, token, need_uniqueness?)
+    )
+  end
+
+  defp prepare_nft_collection(collection) do
+    %{
+      "token" => TokenView.render("token.json", token: collection.token),
+      "amount" => string_or_null(collection.distinct_token_instances_count || collection.value),
+      "token_instances" =>
+        Enum.map(collection.preloaded_token_instances, fn instance ->
+          prepare_nft_for_collection(collection.token.type, instance)
+        end)
+    }
+  end
+
+  defp prepare_nft_for_collection(token_type, instance) do
+    Map.merge(
+      %{"token_type" => token_type, "value" => value(token_type, instance)},
+      TokenView.prepare_token_instance(instance, nil, false)
+    )
+  end
+
+  defp value("ERC-721", _), do: "1"
+  defp value(_, nft), do: nft.current_token_balance && to_string(nft.current_token_balance.value)
+
+  defp string_or_null(nil), do: nil
+  defp string_or_null(other), do: to_string(other)
+
+  # TODO think about this approach mb refactor or mark deprecated for example.
+  # Suggested solution: batch preload
+  def fetch_and_render_token_instance(token_id, token, address_hash, token_balance) do
     token_instance =
       case Chain.erc721_or_erc1155_token_instance_from_token_id_and_token_address(
              token_id,
@@ -164,10 +215,13 @@ defmodule BlockScoutWeb.API.V2.AddressView do
              @api_true
            ) do
         # `%{hash: address_hash}` will match with `address_with_info(_, address_hash)` clause in `BlockScoutWeb.API.V2.Helper`
-        {:ok, token_instance} -> %{token_instance | owner: %{hash: address_hash}}
-        {:error, :not_found} -> %{token_id: token_id, metadata: nil, owner: %{hash: address_hash}}
+        {:ok, token_instance} -> %Instance{token_instance | owner: %{hash: address_hash}}
+        {:error, :not_found} -> %Instance{token_id: token_id, metadata: nil, owner: %{hash: address_hash}}
       end
 
-    TokenView.render("token_instance.json", %{token_instance: token_instance, token: token})
+    TokenView.render("token_instance.json", %{
+      token_instance: %Instance{token_instance | current_token_balance: token_balance},
+      token: token
+    })
   end
 end
diff --git a/apps/block_scout_web/lib/block_scout_web/views/api/v2/token_view.ex b/apps/block_scout_web/lib/block_scout_web/views/api/v2/token_view.ex
index f78a3340d31b..681c5fa3418e 100644
--- a/apps/block_scout_web/lib/block_scout_web/views/api/v2/token_view.ex
+++ b/apps/block_scout_web/lib/block_scout_web/views/api/v2/token_view.ex
@@ -1,8 +1,13 @@
 defmodule BlockScoutWeb.API.V2.TokenView do
+  use BlockScoutWeb, :view
+
   alias BlockScoutWeb.API.V2.Helper
   alias BlockScoutWeb.NFTHelper
+  alias Ecto.Association.NotLoaded
   alias Explorer.Chain
   alias Explorer.Chain.Address
+  alias Explorer.Chain.Address.CurrentTokenBalance
+  alias Explorer.Chain.Token.Instance
 
   @api_true [api?: true]
 
@@ -21,6 +26,10 @@ defmodule BlockScoutWeb.API.V2.TokenView do
     }
   end
 
+  def render("token.json", %{token: nil}) do
+    nil
+  end
+
   def render("token.json", %{token: token}) do
     %{
       "address" => Address.checksum(token.contract_address_hash),
@@ -78,16 +87,16 @@ defmodule BlockScoutWeb.API.V2.TokenView do
     }
   end
 
-  def prepare_token_instance(instance, token) do
-    is_unique =
-      not (token.type == "ERC-1155") or
-        Chain.token_id_1155_is_unique?(token.contract_address_hash, instance.token_id, @api_true)
+  @doc """
+    Internal json rendering function
+  """
+  def prepare_token_instance(instance, token, need_uniqueness_and_owner? \\ true) do
+    is_unique = is_unique?(need_uniqueness_and_owner?, instance, token)
 
     %{
       "id" => instance.token_id,
       "metadata" => instance.metadata,
-      "owner" =>
-        if(is_unique, do: instance.owner && Helper.address_with_info(nil, instance.owner, instance.owner.hash, false)),
+      "owner" => token_instance_owner(is_unique, instance),
       "token" => render("token.json", %{token: token}),
       "external_app_url" => NFTHelper.external_url(instance),
       "animation_url" => instance.metadata && NFTHelper.retrieve_image(instance.metadata["animation_url"]),
@@ -96,6 +105,41 @@ defmodule BlockScoutWeb.API.V2.TokenView do
     }
   end
 
+  defp token_instance_owner(false, _instance), do: nil
+  defp token_instance_owner(nil, _instance), do: nil
+
+  defp token_instance_owner(_is_unique, %Instance{owner: %NotLoaded{}} = instance),
+    do: Helper.address_with_info(nil, nil, instance.owner_address_hash, false)
+
+  defp token_instance_owner(_is_unique, %Instance{owner: nil} = instance),
+    do: Helper.address_with_info(nil, nil, instance.owner_address_hash, false)
+
+  defp token_instance_owner(_is_unique, instance),
+    do: instance.owner && Helper.address_with_info(nil, instance.owner, instance.owner.hash, false)
+
+  defp is_unique?(false, _instance, _token), do: nil
+
+  defp is_unique?(
+         not_ignore?,
+         %Instance{current_token_balance: %CurrentTokenBalance{value: %Decimal{} = value}} = instance,
+         token
+       ) do
+    if Decimal.compare(value, 1) == :gt do
+      false
+    else
+      is_unique?(not_ignore?, %Instance{instance | current_token_balance: nil}, token)
+    end
+  end
+
+  defp is_unique?(_not_ignore?, %Instance{current_token_balance: %CurrentTokenBalance{value: value}}, _token)
+       when value > 1,
+       do: false
+
+  defp is_unique?(_, instance, token),
+    do:
+      not (token.type == "ERC-1155") or
+        Chain.token_id_1155_is_unique?(token.contract_address_hash, instance.token_id, @api_true)
+
   defp prepare_holders_count(nil), do: nil
   defp prepare_holders_count(count) when count < 0, do: prepare_holders_count(0)
   defp prepare_holders_count(count), do: to_string(count)
diff --git a/apps/block_scout_web/test/block_scout_web/controllers/api/v2/address_controller_test.exs b/apps/block_scout_web/test/block_scout_web/controllers/api/v2/address_controller_test.exs
index 962be40cafc0..ebe923dff6d5 100644
--- a/apps/block_scout_web/test/block_scout_web/controllers/api/v2/address_controller_test.exs
+++ b/apps/block_scout_web/test/block_scout_web/controllers/api/v2/address_controller_test.exs
@@ -12,6 +12,7 @@ defmodule BlockScoutWeb.API.V2.AddressControllerTest do
     InternalTransaction,
     Log,
     Token,
+    Token.Instance,
     TokenTransfer,
     Transaction,
     Withdrawal
@@ -1914,6 +1915,519 @@ defmodule BlockScoutWeb.API.V2.AddressControllerTest do
     end
   end
 
+  describe "/addresses/{address_hash}/nft" do
+    setup do
+      {:ok, endpoint: &"/api/v2/addresses/#{&1}/nft"}
+    end
+
+    test "get 404 on non existing address", %{conn: conn, endpoint: endpoint} do
+      address = build(:address)
+
+      request = get(conn, endpoint.(address.hash))
+
+      assert %{"message" => "Not found"} = json_response(request, 404)
+    end
+
+    test "get 422 on invalid address", %{conn: conn, endpoint: endpoint} do
+      request = get(conn, endpoint.("0x"))
+
+      assert %{"message" => "Invalid parameter(s)"} = json_response(request, 422)
+    end
+
+    test "get paginated ERC-721 nft", %{conn: conn, endpoint: endpoint} do
+      address = insert(:address)
+
+      insert_list(51, :token_instance)
+
+      token_instances =
+        for _ <- 0..50 do
+          erc_721_token = insert(:token, type: "ERC-721")
+
+          insert(:token_instance,
+            owner_address_hash: address.hash,
+            token_contract_address_hash: erc_721_token.contract_address_hash
+          )
+          |> Repo.preload([:token])
+        end
+        # works because one token_id per token, despite ordering in DB: [asc: ti.token_contract_address_hash, desc: ti.token_id]
+        |> Enum.sort_by(&{&1.token_contract_address_hash, &1.token_id}, :desc)
+
+      request = get(conn, endpoint.(address.hash))
+      assert response = json_response(request, 200)
+
+      request_2nd_page = get(conn, endpoint.(address.hash), response["next_page_params"])
+      assert response_2nd_page = json_response(request_2nd_page, 200)
+
+      check_paginated_response(response, response_2nd_page, token_instances)
+    end
+
+    test "get paginated ERC-1155 nft", %{conn: conn, endpoint: endpoint} do
+      address = insert(:address)
+
+      insert_list(51, :address_current_token_balance_with_token_id)
+
+      token_instances =
+        for _ <- 0..50 do
+          token = insert(:token, type: "ERC-1155")
+
+          ti =
+            insert(:token_instance,
+              token_contract_address_hash: token.contract_address_hash
+            )
+            |> Repo.preload([:token])
+
+          current_token_balance =
+            insert(:address_current_token_balance_with_token_id_and_fixed_token_type,
+              address: address,
+              token_type: "ERC-1155",
+              token_id: ti.token_id,
+              token_contract_address_hash: token.contract_address_hash
+            )
+
+          %Instance{ti | current_token_balance: current_token_balance}
+        end
+        |> Enum.sort_by(&{&1.token_contract_address_hash, &1.token_id}, :desc)
+
+      request = get(conn, endpoint.(address.hash))
+      assert response = json_response(request, 200)
+
+      request_2nd_page = get(conn, endpoint.(address.hash), response["next_page_params"])
+      assert response_2nd_page = json_response(request_2nd_page, 200)
+
+      check_paginated_response(response, response_2nd_page, token_instances)
+    end
+
+    test "test filters", %{conn: conn, endpoint: endpoint} do
+      address = insert(:address)
+
+      insert_list(51, :token_instance)
+
+      token_instances_721 =
+        for _ <- 0..50 do
+          erc_721_token = insert(:token, type: "ERC-721")
+
+          insert(:token_instance,
+            owner_address_hash: address.hash,
+            token_contract_address_hash: erc_721_token.contract_address_hash
+          )
+          |> Repo.preload([:token])
+        end
+        |> Enum.sort_by(&{&1.token_contract_address_hash, &1.token_id}, :desc)
+
+      insert_list(51, :address_current_token_balance_with_token_id)
+
+      token_instances_1155 =
+        for _ <- 0..50 do
+          token = insert(:token, type: "ERC-1155")
+
+          ti =
+            insert(:token_instance,
+              token_contract_address_hash: token.contract_address_hash
+            )
+            |> Repo.preload([:token])
+
+          current_token_balance =
+            insert(:address_current_token_balance_with_token_id_and_fixed_token_type,
+              address: address,
+              token_type: "ERC-1155",
+              token_id: ti.token_id,
+              token_contract_address_hash: token.contract_address_hash
+            )
+
+          %Instance{ti | current_token_balance: current_token_balance}
+        end
+        |> Enum.sort_by(&{&1.token_contract_address_hash, &1.token_id}, :desc)
+
+      filter = %{"type" => "ERC-721"}
+      request = get(conn, endpoint.(address.hash), filter)
+      assert response = json_response(request, 200)
+
+      request_2nd_page = get(conn, endpoint.(address.hash), Map.merge(response["next_page_params"], filter))
+      assert response_2nd_page = json_response(request_2nd_page, 200)
+
+      check_paginated_response(response, response_2nd_page, token_instances_721)
+
+      filter = %{"type" => "ERC-1155"}
+      request = get(conn, endpoint.(address.hash), filter)
+      assert response = json_response(request, 200)
+
+      request_2nd_page = get(conn, endpoint.(address.hash), Map.merge(response["next_page_params"], filter))
+      assert response_2nd_page = json_response(request_2nd_page, 200)
+
+      check_paginated_response(response, response_2nd_page, token_instances_1155)
+    end
+
+    test "return all token instances", %{conn: conn, endpoint: endpoint} do
+      address = insert(:address)
+
+      insert_list(51, :token_instance)
+
+      token_instances_721 =
+        for _ <- 0..50 do
+          erc_721_token = insert(:token, type: "ERC-721")
+
+          insert(:token_instance,
+            owner_address_hash: address.hash,
+            token_contract_address_hash: erc_721_token.contract_address_hash
+          )
+          |> Repo.preload([:token])
+        end
+        |> Enum.sort_by(&{&1.token_contract_address_hash, &1.token_id}, :desc)
+
+      insert_list(51, :address_current_token_balance_with_token_id)
+
+      token_instances_1155 =
+        for _ <- 0..50 do
+          token = insert(:token, type: "ERC-1155")
+
+          ti =
+            insert(:token_instance,
+              token_contract_address_hash: token.contract_address_hash
+            )
+            |> Repo.preload([:token])
+
+          current_token_balance =
+            insert(:address_current_token_balance_with_token_id_and_fixed_token_type,
+              address: address,
+              token_type: "ERC-1155",
+              token_id: ti.token_id,
+              token_contract_address_hash: token.contract_address_hash
+            )
+
+          %Instance{ti | current_token_balance: current_token_balance}
+        end
+        |> Enum.sort_by(&{&1.token_contract_address_hash, &1.token_id}, :desc)
+
+      request = get(conn, endpoint.(address.hash))
+      assert response = json_response(request, 200)
+
+      request_2nd_page = get(conn, endpoint.(address.hash), response["next_page_params"])
+      assert response_2nd_page = json_response(request_2nd_page, 200)
+
+      request_3rd_page = get(conn, endpoint.(address.hash), response_2nd_page["next_page_params"])
+      assert response_3rd_page = json_response(request_3rd_page, 200)
+
+      assert response["next_page_params"] != nil
+      assert response_2nd_page["next_page_params"] != nil
+      assert response_3rd_page["next_page_params"] == nil
+
+      assert Enum.count(response["items"]) == 50
+      assert Enum.count(response_2nd_page["items"]) == 50
+      assert Enum.count(response_3rd_page["items"]) == 2
+
+      compare_item(Enum.at(token_instances_721, 50), Enum.at(response["items"], 0))
+      compare_item(Enum.at(token_instances_721, 1), Enum.at(response["items"], 49))
+
+      compare_item(Enum.at(token_instances_721, 0), Enum.at(response_2nd_page["items"], 0))
+      compare_item(Enum.at(token_instances_1155, 50), Enum.at(response_2nd_page["items"], 1))
+      compare_item(Enum.at(token_instances_1155, 2), Enum.at(response_2nd_page["items"], 49))
+
+      compare_item(Enum.at(token_instances_1155, 1), Enum.at(response_3rd_page["items"], 0))
+      compare_item(Enum.at(token_instances_1155, 0), Enum.at(response_3rd_page["items"], 1))
+    end
+  end
+
+  describe "/addresses/{address_hash}/nft/collections" do
+    setup do
+      {:ok, endpoint: &"/api/v2/addresses/#{&1}/nft/collections"}
+    end
+
+    test "get 404 on non existing address", %{conn: conn, endpoint: endpoint} do
+      address = build(:address)
+
+      request = get(conn, endpoint.(address.hash))
+
+      assert %{"message" => "Not found"} = json_response(request, 404)
+    end
+
+    test "get 422 on invalid address", %{conn: conn, endpoint: endpoint} do
+      request = get(conn, endpoint.("0x"))
+
+      assert %{"message" => "Invalid parameter(s)"} = json_response(request, 422)
+    end
+
+    test "get paginated erc-721 collection", %{conn: conn, endpoint: endpoint} do
+      address = insert(:address)
+
+      insert_list(51, :address_current_token_balance_with_token_id)
+      insert_list(51, :token_instance)
+
+      ctbs =
+        for _ <- 0..50 do
+          token = insert(:token, type: "ERC-721")
+          amount = Enum.random(16..50)
+
+          current_token_balance =
+            insert(:address_current_token_balance,
+              address: address,
+              token_type: "ERC-721",
+              token_id: nil,
+              token_contract_address_hash: token.contract_address_hash,
+              value: amount
+            )
+            |> Repo.preload([:token])
+
+          token_instances =
+            for _ <- 0..(amount - 1) do
+              ti =
+                insert(:token_instance,
+                  token_contract_address_hash: token.contract_address_hash,
+                  owner_address_hash: address.hash
+                )
+                |> Repo.preload([:token])
+
+              %Instance{ti | current_token_balance: current_token_balance}
+            end
+            |> Enum.sort_by(&{&1.token_contract_address_hash, &1.token_id}, :desc)
+
+          {current_token_balance, token_instances}
+        end
+        |> Enum.sort_by(&elem(&1, 0).token_contract_address_hash, :desc)
+
+      request = get(conn, endpoint.(address.hash))
+      assert response = json_response(request, 200)
+
+      request_2nd_page = get(conn, endpoint.(address.hash), response["next_page_params"])
+      assert response_2nd_page = json_response(request_2nd_page, 200)
+
+      check_paginated_response(response, response_2nd_page, ctbs)
+    end
+
+    test "get paginated erc-1155 collection", %{conn: conn, endpoint: endpoint} do
+      address = insert(:address)
+
+      insert_list(51, :address_current_token_balance_with_token_id)
+      insert_list(51, :token_instance)
+
+      collections =
+        for _ <- 0..50 do
+          token = insert(:token, type: "ERC-1155")
+          amount = Enum.random(16..50)
+
+          token_instances =
+            for _ <- 0..(amount - 1) do
+              ti =
+                insert(:token_instance,
+                  token_contract_address_hash: token.contract_address_hash,
+                  owner_address_hash: address.hash
+                )
+                |> Repo.preload([:token])
+
+              current_token_balance =
+                insert(:address_current_token_balance,
+                  address: address,
+                  token_type: "ERC-1155",
+                  token_id: ti.token_id,
+                  token_contract_address_hash: token.contract_address_hash,
+                  value: Enum.random(1..100_000)
+                )
+                |> Repo.preload([:token])
+
+              %Instance{ti | current_token_balance: current_token_balance}
+            end
+            |> Enum.sort_by(& &1.token_id, :desc)
+
+          {token, amount, token_instances}
+        end
+        |> Enum.sort_by(&elem(&1, 0).contract_address_hash, :desc)
+
+      request = get(conn, endpoint.(address.hash))
+      assert response = json_response(request, 200)
+
+      request_2nd_page = get(conn, endpoint.(address.hash), response["next_page_params"])
+      assert response_2nd_page = json_response(request_2nd_page, 200)
+
+      check_paginated_response(response, response_2nd_page, collections)
+    end
+
+    test "test filters", %{conn: conn, endpoint: endpoint} do
+      address = insert(:address)
+
+      insert_list(51, :address_current_token_balance_with_token_id)
+      insert_list(51, :token_instance)
+
+      ctbs =
+        for _ <- 0..50 do
+          token = insert(:token, type: "ERC-721")
+          amount = Enum.random(16..50)
+
+          current_token_balance =
+            insert(:address_current_token_balance,
+              address: address,
+              token_type: "ERC-721",
+              token_id: nil,
+              token_contract_address_hash: token.contract_address_hash,
+              value: amount
+            )
+            |> Repo.preload([:token])
+
+          token_instances =
+            for _ <- 0..(amount - 1) do
+              ti =
+                insert(:token_instance,
+                  token_contract_address_hash: token.contract_address_hash,
+                  owner_address_hash: address.hash
+                )
+                |> Repo.preload([:token])
+
+              %Instance{ti | current_token_balance: current_token_balance}
+            end
+            |> Enum.sort_by(& &1.token_id, :desc)
+
+          {current_token_balance, token_instances}
+        end
+        |> Enum.sort_by(&elem(&1, 0).token_contract_address_hash, :desc)
+
+      collections =
+        for _ <- 0..50 do
+          token = insert(:token, type: "ERC-1155")
+          amount = Enum.random(16..50)
+
+          token_instances =
+            for _ <- 0..(amount - 1) do
+              ti =
+                insert(:token_instance,
+                  token_contract_address_hash: token.contract_address_hash,
+                  owner_address_hash: address.hash
+                )
+                |> Repo.preload([:token])
+
+              current_token_balance =
+                insert(:address_current_token_balance,
+                  address: address,
+                  token_type: "ERC-1155",
+                  token_id: ti.token_id,
+                  token_contract_address_hash: token.contract_address_hash,
+                  value: Enum.random(1..100_000)
+                )
+                |> Repo.preload([:token])
+
+              %Instance{ti | current_token_balance: current_token_balance}
+            end
+            |> Enum.sort_by(& &1.token_id, :desc)
+
+          {token, amount, token_instances}
+        end
+        |> Enum.sort_by(&elem(&1, 0).contract_address_hash, :desc)
+
+      filter = %{"type" => "ERC-721"}
+      request = get(conn, endpoint.(address.hash), filter)
+      assert response = json_response(request, 200)
+
+      request_2nd_page = get(conn, endpoint.(address.hash), Map.merge(response["next_page_params"], filter))
+      assert response_2nd_page = json_response(request_2nd_page, 200)
+
+      check_paginated_response(response, response_2nd_page, ctbs)
+
+      filter = %{"type" => "ERC-1155"}
+      request = get(conn, endpoint.(address.hash), filter)
+      assert response = json_response(request, 200)
+
+      request_2nd_page = get(conn, endpoint.(address.hash), Map.merge(response["next_page_params"], filter))
+      assert response_2nd_page = json_response(request_2nd_page, 200)
+
+      check_paginated_response(response, response_2nd_page, collections)
+    end
+
+    test "return all collections", %{conn: conn, endpoint: endpoint} do
+      address = insert(:address)
+
+      insert_list(51, :address_current_token_balance_with_token_id)
+      insert_list(51, :token_instance)
+
+      collections_721 =
+        for _ <- 0..50 do
+          token = insert(:token, type: "ERC-721")
+          amount = Enum.random(16..50)
+
+          current_token_balance =
+            insert(:address_current_token_balance,
+              address: address,
+              token_type: "ERC-721",
+              token_id: nil,
+              token_contract_address_hash: token.contract_address_hash,
+              value: amount
+            )
+            |> Repo.preload([:token])
+
+          token_instances =
+            for _ <- 0..(amount - 1) do
+              ti =
+                insert(:token_instance,
+                  token_contract_address_hash: token.contract_address_hash,
+                  owner_address_hash: address.hash
+                )
+                |> Repo.preload([:token])
+
+              %Instance{ti | current_token_balance: current_token_balance}
+            end
+            |> Enum.sort_by(& &1.token_id, :desc)
+
+          {current_token_balance, token_instances}
+        end
+        |> Enum.sort_by(&elem(&1, 0).token_contract_address_hash, :desc)
+
+      collections_1155 =
+        for _ <- 0..50 do
+          token = insert(:token, type: "ERC-1155")
+          amount = Enum.random(16..50)
+
+          token_instances =
+            for _ <- 0..(amount - 1) do
+              ti =
+                insert(:token_instance,
+                  token_contract_address_hash: token.contract_address_hash,
+                  owner_address_hash: address.hash
+                )
+                |> Repo.preload([:token])
+
+              current_token_balance =
+                insert(:address_current_token_balance,
+                  address: address,
+                  token_type: "ERC-1155",
+                  token_id: ti.token_id,
+                  token_contract_address_hash: token.contract_address_hash,
+                  value: Enum.random(1..100_000)
+                )
+                |> Repo.preload([:token])
+
+              %Instance{ti | current_token_balance: current_token_balance}
+            end
+            |> Enum.sort_by(& &1.token_id, :desc)
+
+          {token, amount, token_instances}
+        end
+        |> Enum.sort_by(&elem(&1, 0).contract_address_hash, :desc)
+
+      request = get(conn, endpoint.(address.hash))
+      assert response = json_response(request, 200)
+
+      request_2nd_page = get(conn, endpoint.(address.hash), response["next_page_params"])
+      assert response_2nd_page = json_response(request_2nd_page, 200)
+
+      request_3rd_page = get(conn, endpoint.(address.hash), response_2nd_page["next_page_params"])
+      assert response_3rd_page = json_response(request_3rd_page, 200)
+
+      assert response["next_page_params"] != nil
+      assert response_2nd_page["next_page_params"] != nil
+      assert response_3rd_page["next_page_params"] == nil
+
+      assert Enum.count(response["items"]) == 50
+      assert Enum.count(response_2nd_page["items"]) == 50
+      assert Enum.count(response_3rd_page["items"]) == 2
+
+      compare_item(Enum.at(collections_721, 50), Enum.at(response["items"], 0))
+      compare_item(Enum.at(collections_721, 1), Enum.at(response["items"], 49))
+
+      compare_item(Enum.at(collections_721, 0), Enum.at(response_2nd_page["items"], 0))
+      compare_item(Enum.at(collections_1155, 50), Enum.at(response_2nd_page["items"], 1))
+      compare_item(Enum.at(collections_1155, 2), Enum.at(response_2nd_page["items"], 49))
+
+      compare_item(Enum.at(collections_1155, 1), Enum.at(response_3rd_page["items"], 0))
+      compare_item(Enum.at(collections_1155, 0), Enum.at(response_3rd_page["items"], 1))
+    end
+  end
+
   defp compare_item(%Address{} = address, json) do
     assert Address.checksum(address.hash) == json["hash"]
     assert to_string(address.nonce + 1) == json["tx_count"]
@@ -1989,6 +2503,99 @@ defmodule BlockScoutWeb.API.V2.AddressControllerTest do
     assert withdrawal.index == json["index"]
   end
 
+  defp compare_item(%Instance{token: %Token{} = token} = instance, json) do
+    token_type = token.type
+    value = to_string(value(token.type, instance))
+    id = to_string(instance.token_id)
+    metadata = instance.metadata
+    token_address_hash = Address.checksum(token.contract_address_hash)
+    app_url = instance.metadata["external_url"]
+    animation_url = instance.metadata["animation_url"]
+    image_url = instance.metadata["image_url"]
+    token_name = token.name
+
+    assert %{
+             "token_type" => ^token_type,
+             "value" => ^value,
+             "id" => ^id,
+             "metadata" => ^metadata,
+             "owner" => nil,
+             "token" => %{"address" => ^token_address_hash, "name" => ^token_name, "type" => ^token_type},
+             "external_app_url" => ^app_url,
+             "animation_url" => ^animation_url,
+             "image_url" => ^image_url,
+             "is_unique" => nil
+           } = json
+  end
+
+  defp compare_item({%CurrentTokenBalance{token: token} = ctb, token_instances}, json) do
+    token_type = token.type
+    token_address_hash = Address.checksum(token.contract_address_hash)
+    token_name = token.name
+    amount = to_string(ctb.distinct_token_instances_count || ctb.value)
+
+    assert Enum.count(json["token_instances"]) == 15
+
+    token_instances
+    |> Enum.take(15)
+    |> Enum.with_index()
+    |> Enum.each(fn {instance, index} ->
+      compare_token_instance_in_collection(instance, Enum.at(json["token_instances"], index))
+    end)
+
+    assert %{
+             "token" => %{"address" => ^token_address_hash, "name" => ^token_name, "type" => ^token_type},
+             "amount" => ^amount
+           } = json
+  end
+
+  defp compare_item({token, amount, token_instances}, json) do
+    token_type = token.type
+    token_address_hash = Address.checksum(token.contract_address_hash)
+    token_name = token.name
+    amount = to_string(amount)
+
+    assert Enum.count(json["token_instances"]) == 15
+
+    token_instances
+    |> Enum.take(15)
+    |> Enum.with_index()
+    |> Enum.each(fn {instance, index} ->
+      compare_token_instance_in_collection(instance, Enum.at(json["token_instances"], index))
+    end)
+
+    assert %{
+             "token" => %{"address" => ^token_address_hash, "name" => ^token_name, "type" => ^token_type},
+             "amount" => ^amount
+           } = json
+  end
+
+  defp compare_token_instance_in_collection(%Instance{token: %Token{} = token} = instance, json) do
+    token_type = token.type
+    value = to_string(value(token.type, instance))
+    id = to_string(instance.token_id)
+    metadata = instance.metadata
+    app_url = instance.metadata["external_url"]
+    animation_url = instance.metadata["animation_url"]
+    image_url = instance.metadata["image_url"]
+
+    assert %{
+             "token_type" => ^token_type,
+             "value" => ^value,
+             "id" => ^id,
+             "metadata" => ^metadata,
+             "owner" => nil,
+             "token" => nil,
+             "external_app_url" => ^app_url,
+             "animation_url" => ^animation_url,
+             "image_url" => ^image_url,
+             "is_unique" => nil
+           } = json
+  end
+
+  defp value("ERC-721", _), do: 1
+  defp value(_, nft), do: nft.current_token_balance.value
+
   defp check_paginated_response(first_page_resp, second_page_resp, list) do
     assert Enum.count(first_page_resp["items"]) == 50
     assert first_page_resp["next_page_params"] != nil
diff --git a/apps/block_scout_web/test/block_scout_web/controllers/api/v2/token_controller_test.exs b/apps/block_scout_web/test/block_scout_web/controllers/api/v2/token_controller_test.exs
index 05b7009487c4..d3506dbe5191 100644
--- a/apps/block_scout_web/test/block_scout_web/controllers/api/v2/token_controller_test.exs
+++ b/apps/block_scout_web/test/block_scout_web/controllers/api/v2/token_controller_test.exs
@@ -865,6 +865,87 @@ defmodule BlockScoutWeb.API.V2.TokenControllerTest do
 
       check_paginated_response(response, response_2nd_page, instances)
     end
+
+    test "get instances list by holder erc-721", %{conn: conn} do
+      token = insert(:token, type: "ERC-721")
+
+      insert_list(51, :token_instance, token_contract_address_hash: token.contract_address_hash)
+
+      address = insert(:address, contract_code: Enum.random([nil, "0x010101"]))
+
+      insert_list(51, :token_instance)
+
+      token_instances =
+        for _ <- 0..50 do
+          insert(:token_instance,
+            owner_address_hash: address.hash,
+            token_contract_address_hash: token.contract_address_hash
+          )
+          |> Repo.preload([:token, :owner])
+        end
+
+      filter = %{"holder_address_hash" => to_string(address.hash)}
+
+      request = get(conn, "/api/v2/tokens/#{token.contract_address_hash}/instances", filter)
+      assert response = json_response(request, 200)
+
+      request_2nd_page =
+        get(
+          conn,
+          "/api/v2/tokens/#{token.contract_address_hash}/instances",
+          Map.merge(response["next_page_params"], filter)
+        )
+
+      assert response_2nd_page = json_response(request_2nd_page, 200)
+
+      check_paginated_response(response, response_2nd_page, token_instances)
+    end
+
+    test "get instances list by holder erc-1155", %{conn: conn} do
+      token = insert(:token, type: "ERC-1155")
+
+      insert_list(51, :token_instance, token_contract_address_hash: token.contract_address_hash)
+
+      address = insert(:address, contract_code: Enum.random([nil, "0x010101"]))
+
+      insert_list(51, :token_instance)
+
+      token_instances =
+        for _ <- 0..50 do
+          ti =
+            insert(:token_instance,
+              token_contract_address_hash: token.contract_address_hash
+            )
+            |> Repo.preload([:token])
+
+          current_token_balance =
+            insert(:address_current_token_balance_with_token_id_and_fixed_token_type,
+              address: address,
+              token_type: "ERC-1155",
+              token_id: ti.token_id,
+              token_contract_address_hash: token.contract_address_hash,
+              value: Enum.random(1..2)
+            )
+
+          %Instance{ti | current_token_balance: current_token_balance, owner: address}
+        end
+
+      filter = %{"holder_address_hash" => to_string(address.hash)}
+
+      request = get(conn, "/api/v2/tokens/#{token.contract_address_hash}/instances", filter)
+      assert response = json_response(request, 200)
+
+      request_2nd_page =
+        get(
+          conn,
+          "/api/v2/tokens/#{token.contract_address_hash}/instances",
+          Map.merge(response["next_page_params"], filter)
+        )
+
+      assert response_2nd_page = json_response(request_2nd_page, 200)
+
+      check_paginated_response(response, response_2nd_page, token_instances)
+    end
   end
 
   describe "/tokens/{address_hash}/instances/{token_id}" do
@@ -1240,6 +1321,40 @@ defmodule BlockScoutWeb.API.V2.TokenControllerTest do
     compare_item(Repo.preload(ctb, [{:token, :contract_address}]).token, json["token"])
   end
 
+  def compare_item(%Instance{token: %Token{} = token} = instance, json) do
+    token_type = token.type
+    value = to_string(value(token.type, instance))
+    id = to_string(instance.token_id)
+    metadata = instance.metadata
+    token_address_hash = Address.checksum(token.contract_address_hash)
+    app_url = instance.metadata["external_url"]
+    animation_url = instance.metadata["animation_url"]
+    image_url = instance.metadata["image_url"]
+    token_name = token.name
+    owner_address_hash = Address.checksum(instance.owner.hash)
+    is_contract = !is_nil(instance.owner.contract_code)
+    is_unique = value == "1"
+
+    assert %{
+             "token_type" => ^token_type,
+             "value" => ^value,
+             "id" => ^id,
+             "metadata" => ^metadata,
+             "token" => %{"address" => ^token_address_hash, "name" => ^token_name, "type" => ^token_type},
+             "external_app_url" => ^app_url,
+             "animation_url" => ^animation_url,
+             "image_url" => ^image_url,
+             "is_unique" => ^is_unique
+           } = json
+
+    if is_unique do
+      assert owner_address_hash == json["owner"]["hash"]
+      assert is_contract == json["owner"]["is_contract"]
+    else
+      assert json["owner"] == nil
+    end
+  end
+
   def compare_item(%Instance{} = instance, json) do
     assert to_string(instance.token_id) == json["id"]
     assert Jason.decode!(Jason.encode!(instance.metadata)) == json["metadata"]
@@ -1247,6 +1362,9 @@ defmodule BlockScoutWeb.API.V2.TokenControllerTest do
     compare_item(Repo.preload(instance, [{:token, :contract_address}]).token, json["token"])
   end
 
+  defp value("ERC-721", _), do: 1
+  defp value(_, nft), do: nft.current_token_balance.value
+
   # with the current implementation no transfers should come with list in totals
   def check_total(%Token{type: nft}, json, _token_transfer) when nft in ["ERC-721", "ERC-1155"] and is_list(json) do
     false
diff --git a/apps/explorer/config/test.exs b/apps/explorer/config/test.exs
index 955f9df84267..f47e2413959b 100644
--- a/apps/explorer/config/test.exs
+++ b/apps/explorer/config/test.exs
@@ -12,8 +12,7 @@ config :explorer, Explorer.Repo,
   ownership_timeout: :timer.minutes(7),
   timeout: :timer.seconds(60),
   queue_target: 1000,
-  migration_lock: nil,
-  log: false
+  migration_lock: nil
 
 # Configure API database
 config :explorer, Explorer.Repo.Replica1,
@@ -27,8 +26,7 @@ config :explorer, Explorer.Repo.Replica1,
   enable_caching_implementation_data_of_proxy: true,
   avg_block_time_as_ttl_cached_implementation_data_of_proxy: false,
   fallback_ttl_cached_implementation_data_of_proxy: :timer.seconds(20),
-  implementation_data_fetching_timeout: :timer.seconds(20),
-  log: false
+  implementation_data_fetching_timeout: :timer.seconds(20)
 
 # Configure API database
 config :explorer, Explorer.Repo.Account,
diff --git a/apps/explorer/lib/explorer/chain.ex b/apps/explorer/lib/explorer/chain.ex
index 6cc7bc80a227..4f159d2d1635 100644
--- a/apps/explorer/lib/explorer/chain.ex
+++ b/apps/explorer/lib/explorer/chain.ex
@@ -4136,6 +4136,10 @@ defmodule Explorer.Chain do
     end
   end
 
+  @spec join_associations(atom() | Ecto.Query.t(), map) :: Ecto.Query.t()
+  @doc """
+    Function to preload entities associated with selected in provided query items
+  """
   def join_associations(query, necessity_by_association) when is_map(necessity_by_association) do
     Enum.reduce(necessity_by_association, query, fn {association, join}, acc_query ->
       join_association(acc_query, association, join)
diff --git a/apps/explorer/lib/explorer/chain/address/current_token_balance.ex b/apps/explorer/lib/explorer/chain/address/current_token_balance.ex
index 50af3af4dd5d..fe7f3070122c 100644
--- a/apps/explorer/lib/explorer/chain/address/current_token_balance.ex
+++ b/apps/explorer/lib/explorer/chain/address/current_token_balance.ex
@@ -38,7 +38,10 @@ defmodule Explorer.Chain.Address.CurrentTokenBalance do
           updated_at: DateTime.t(),
           value: Decimal.t() | nil,
           token_id: non_neg_integer() | nil,
-          token_type: String.t()
+          token_type: String.t(),
+          distinct_token_instances_count: non_neg_integer(),
+          token_ids: list(Decimal.t()),
+          preloaded_token_instances: list()
         }
 
   schema "address_current_token_balances" do
@@ -49,6 +52,9 @@ defmodule Explorer.Chain.Address.CurrentTokenBalance do
     field(:token_id, :decimal)
     field(:token_type, :string)
     field(:fiat_value, :decimal, virtual: true)
+    field(:distinct_token_instances_count, :integer, virtual: true)
+    field(:token_ids, {:array, :decimal}, virtual: true)
+    field(:preloaded_token_instances, {:array, :any}, virtual: true)
 
     # A transient field for deriving token holder count deltas during address_current_token_balances upserts
     field(:old_value, :decimal)
diff --git a/apps/explorer/lib/explorer/chain/token/instance.ex b/apps/explorer/lib/explorer/chain/token/instance.ex
index c1b5bcd5f4ff..608aec33193e 100644
--- a/apps/explorer/lib/explorer/chain/token/instance.ex
+++ b/apps/explorer/lib/explorer/chain/token/instance.ex
@@ -5,7 +5,9 @@ defmodule Explorer.Chain.Token.Instance do
 
   use Explorer.Schema
 
+  alias Explorer.{Chain, Helper}
   alias Explorer.Chain.{Address, Block, Hash, Token, TokenTransfer}
+  alias Explorer.Chain.Address.CurrentTokenBalance
   alias Explorer.Chain.Token.Instance
   alias Explorer.PagingOptions
 
@@ -23,7 +25,8 @@ defmodule Explorer.Chain.Token.Instance do
           error: String.t(),
           owner_address_hash: Hash.Address.t(),
           owner_updated_at_block: Block.block_number(),
-          owner_updated_at_log_index: non_neg_integer()
+          owner_updated_at_log_index: non_neg_integer(),
+          current_token_balance: any()
         }
 
   @primary_key false
@@ -33,6 +36,7 @@ defmodule Explorer.Chain.Token.Instance do
     field(:error, :string)
     field(:owner_updated_at_block, :integer)
     field(:owner_updated_at_log_index, :integer)
+    field(:current_token_balance, :any, virtual: true)
 
     belongs_to(:owner, Address, foreign_key: :owner_address_hash, references: :hash, type: Hash.Address)
 
@@ -106,4 +110,307 @@ defmodule Explorer.Chain.Token.Instance do
   @spec token_instance_query(non_neg_integer(), Hash.Address.t()) :: Ecto.Query.t()
   def token_instance_query(token_id, token_contract_address),
     do: from(i in Instance, where: i.token_contract_address_hash == ^token_contract_address and i.token_id == ^token_id)
+
+  @spec nft_list(binary() | Hash.Address.t(), keyword()) :: [Instance.t()]
+  def nft_list(address_hash, options \\ [])
+
+  def nft_list(address_hash, options) when is_list(options) do
+    nft_list(address_hash, Keyword.get(options, :token_type, []), options)
+  end
+
+  defp nft_list(address_hash, ["ERC-721"], options) do
+    erc_721_token_instances_by_owner_address_hash(address_hash, options)
+  end
+
+  defp nft_list(address_hash, ["ERC-1155"], options) do
+    erc_1155_token_instances_by_address_hash(address_hash, options)
+  end
+
+  defp nft_list(address_hash, _, options) do
+    paging_options = Keyword.get(options, :paging_options, Chain.default_paging_options())
+
+    case paging_options do
+      %PagingOptions{key: {_contract_address_hash, _token_id, "ERC-1155"}} ->
+        erc_1155_token_instances_by_address_hash(address_hash, options)
+
+      _ ->
+        erc_721 = erc_721_token_instances_by_owner_address_hash(address_hash, options)
+
+        if length(erc_721) == paging_options.page_size do
+          erc_721
+        else
+          erc_1155 = erc_1155_token_instances_by_address_hash(address_hash, options)
+
+          (erc_721 ++ erc_1155) |> Enum.take(paging_options.page_size)
+        end
+    end
+  end
+
+  @doc """
+    In this function used fact that only ERC-721 instances has NOT NULL owner_address_hash.
+  """
+  @spec erc_721_token_instances_by_owner_address_hash(binary() | Hash.Address.t(), keyword) :: [Instance.t()]
+  def erc_721_token_instances_by_owner_address_hash(address_hash, options \\ []) do
+    paging_options = Keyword.get(options, :paging_options, Chain.default_paging_options())
+    necessity_by_association = Keyword.get(options, :necessity_by_association, %{})
+
+    __MODULE__
+    |> where([ti], ti.owner_address_hash == ^address_hash)
+    |> order_by([ti], asc: ti.token_contract_address_hash, desc: ti.token_id)
+    |> limit(^paging_options.page_size)
+    |> page_erc_721_token_instances(paging_options)
+    |> Chain.join_associations(necessity_by_association)
+    |> Chain.select_repo(options).all()
+  end
+
+  defp page_erc_721_token_instances(query, %PagingOptions{key: {contract_address_hash, token_id, "ERC-721"}}) do
+    page_token_instance(query, contract_address_hash, token_id)
+  end
+
+  defp page_erc_721_token_instances(query, _), do: query
+
+  @spec erc_1155_token_instances_by_address_hash(binary() | Hash.Address.t(), keyword) :: [Instance.t()]
+  def erc_1155_token_instances_by_address_hash(address_hash, options \\ []) do
+    paging_options = Keyword.get(options, :paging_options, Chain.default_paging_options())
+    necessity_by_association = Keyword.get(options, :necessity_by_association, %{})
+
+    __MODULE__
+    |> join(:inner, [ti], ctb in CurrentTokenBalance,
+      as: :ctb,
+      on:
+        ctb.token_contract_address_hash == ti.token_contract_address_hash and ctb.token_id == ti.token_id and
+          ctb.address_hash == ^address_hash
+    )
+    |> where([ctb: ctb], ctb.value > 0 and ctb.token_type == "ERC-1155")
+    |> order_by([ti], asc: ti.token_contract_address_hash, desc: ti.token_id)
+    |> limit(^paging_options.page_size)
+    |> page_erc_1155_token_instances(paging_options)
+    |> select_merge([ctb: ctb], %{current_token_balance: ctb})
+    |> Chain.join_associations(necessity_by_association)
+    |> Chain.select_repo(options).all()
+  end
+
+  defp page_erc_1155_token_instances(query, %PagingOptions{key: {contract_address_hash, token_id, "ERC-1155"}}) do
+    page_token_instance(query, contract_address_hash, token_id)
+  end
+
+  defp page_erc_1155_token_instances(query, _), do: query
+
+  defp page_token_instance(query, contract_address_hash, token_id) do
+    query
+    |> where(
+      [ti],
+      ti.token_contract_address_hash > ^contract_address_hash or
+        (ti.token_contract_address_hash == ^contract_address_hash and ti.token_id < ^token_id)
+    )
+  end
+
+  @doc """
+    Function to be used in BlockScoutWeb.Chain.next_page_params/4
+  """
+  @spec nft_list_next_page_params(Explorer.Chain.Token.Instance.t()) :: %{binary() => any}
+  def nft_list_next_page_params(%__MODULE__{
+        current_token_balance: %CurrentTokenBalance{},
+        token_contract_address_hash: token_contract_address_hash,
+        token_id: token_id
+      }) do
+    %{"token_contract_address_hash" => token_contract_address_hash, "token_id" => token_id, "token_type" => "ERC-1155"}
+  end
+
+  def nft_list_next_page_params(%__MODULE__{
+        token_contract_address_hash: token_contract_address_hash,
+        token_id: token_id
+      }) do
+    %{"token_contract_address_hash" => token_contract_address_hash, "token_id" => token_id, "token_type" => "ERC-721"}
+  end
+
+  @preloaded_nfts_limit 15
+
+  @spec nft_collections(binary() | Hash.Address.t(), keyword) :: list
+  def nft_collections(address_hash, options \\ [])
+
+  def nft_collections(address_hash, options) when is_list(options) do
+    nft_collections(address_hash, Keyword.get(options, :token_type, []), options)
+  end
+
+  defp nft_collections(address_hash, ["ERC-721"], options) do
+    erc_721_collections_by_address_hash(address_hash, options)
+  end
+
+  defp nft_collections(address_hash, ["ERC-1155"], options) do
+    erc_1155_collections_by_address_hash(address_hash, options)
+  end
+
+  defp nft_collections(address_hash, _, options) do
+    paging_options = Keyword.get(options, :paging_options, Chain.default_paging_options())
+
+    case paging_options do
+      %PagingOptions{key: {_contract_address_hash, "ERC-1155"}} ->
+        erc_1155_collections_by_address_hash(address_hash, options)
+
+      _ ->
+        erc_721 = erc_721_collections_by_address_hash(address_hash, options)
+
+        if length(erc_721) == paging_options.page_size do
+          erc_721
+        else
+          erc_1155 = erc_1155_collections_by_address_hash(address_hash, options)
+
+          (erc_721 ++ erc_1155) |> Enum.take(paging_options.page_size)
+        end
+    end
+  end
+
+  @spec erc_721_collections_by_address_hash(binary() | Hash.Address.t(), keyword) :: [CurrentTokenBalance.t()]
+  def erc_721_collections_by_address_hash(address_hash, options) do
+    paging_options = Keyword.get(options, :paging_options, Chain.default_paging_options())
+    necessity_by_association = Keyword.get(options, :necessity_by_association, %{})
+
+    CurrentTokenBalance
+    |> where([ctb], ctb.address_hash == ^address_hash and ctb.value > 0 and ctb.token_type == "ERC-721")
+    |> order_by([ctb], asc: ctb.token_contract_address_hash)
+    |> page_erc_721_nft_collections(paging_options)
+    |> limit(^paging_options.page_size)
+    |> Chain.join_associations(necessity_by_association)
+    |> Chain.select_repo(options).all()
+    |> Enum.map(&erc_721_preload_nft(&1, options))
+  end
+
+  defp page_erc_721_nft_collections(query, %PagingOptions{key: {contract_address_hash, "ERC-721"}}) do
+    page_nft_collections(query, contract_address_hash)
+  end
+
+  defp page_erc_721_nft_collections(query, _), do: query
+
+  @spec erc_1155_collections_by_address_hash(binary() | Hash.Address.t(), keyword) :: [
+          %{
+            token_contract_address_hash: Hash.Address.t(),
+            distinct_token_instances_count: integer(),
+            token_ids: [integer()]
+          }
+        ]
+  def erc_1155_collections_by_address_hash(address_hash, options) do
+    paging_options = Keyword.get(options, :paging_options, Chain.default_paging_options())
+
+    CurrentTokenBalance
+    |> where([ctb], ctb.address_hash == ^address_hash and ctb.value > 0 and ctb.token_type == "ERC-1155")
+    |> group_by([ctb], ctb.token_contract_address_hash)
+    |> order_by([ctb], asc: ctb.token_contract_address_hash)
+    |> select([ctb], %{
+      token_contract_address_hash: ctb.token_contract_address_hash,
+      distinct_token_instances_count: fragment("COUNT(*)"),
+      token_ids: fragment("array_agg(?)", ctb.token_id)
+    })
+    |> page_erc_1155_nft_collections(paging_options)
+    |> limit(^paging_options.page_size)
+    |> Chain.select_repo(options).all()
+    |> Enum.map(&erc_1155_preload_nft(&1, address_hash, options))
+    |> Helper.custom_preload(options, Token, :token_contract_address_hash, :contract_address_hash, :token)
+  end
+
+  defp page_erc_1155_nft_collections(query, %PagingOptions{key: {contract_address_hash, "ERC-1155"}}) do
+    page_nft_collections(query, contract_address_hash)
+  end
+
+  defp page_erc_1155_nft_collections(query, _), do: query
+
+  defp page_nft_collections(query, token_contract_address_hash) do
+    query
+    |> where([ctb], ctb.token_contract_address_hash > ^token_contract_address_hash)
+  end
+
+  defp erc_721_preload_nft(
+         %CurrentTokenBalance{token_contract_address_hash: token_contract_address_hash, address_hash: address_hash} =
+           ctb,
+         options
+       ) do
+    instances =
+      Instance
+      |> where(
+        [ti],
+        ti.token_contract_address_hash == ^token_contract_address_hash and ti.owner_address_hash == ^address_hash
+      )
+      |> order_by([ti], desc: ti.token_id)
+      |> limit(^@preloaded_nfts_limit)
+      |> Chain.select_repo(options).all()
+
+    %CurrentTokenBalance{ctb | preloaded_token_instances: instances}
+  end
+
+  defp erc_1155_preload_nft(
+         %{token_contract_address_hash: token_contract_address_hash, token_ids: token_ids} = collection,
+         address_hash,
+         options
+       ) do
+    token_ids = token_ids |> Enum.sort(:desc) |> Enum.take(@preloaded_nfts_limit)
+
+    instances =
+      Instance
+      |> where([ti], ti.token_contract_address_hash == ^token_contract_address_hash and ti.token_id in ^token_ids)
+      |> join(:inner, [ti], ctb in CurrentTokenBalance,
+        as: :ctb,
+        on:
+          ctb.token_contract_address_hash == ti.token_contract_address_hash and ti.token_id == ctb.token_id and
+            ctb.address_hash == ^address_hash
+      )
+      |> limit(^@preloaded_nfts_limit)
+      |> select_merge([ctb: ctb], %{current_token_balance: ctb})
+      |> Chain.select_repo(options).all()
+      |> Enum.sort_by(& &1.token_id, :desc)
+
+    Map.put(collection, :preloaded_token_instances, instances)
+  end
+
+  @doc """
+    Function to be used in BlockScoutWeb.Chain.next_page_params/4
+  """
+  @spec nft_collections_next_page_params(%{:token_contract_address_hash => any, optional(any) => any}) :: %{
+          binary() => any
+        }
+  def nft_collections_next_page_params(%{
+        token_contract_address_hash: token_contract_address_hash,
+        token: %Token{type: token_type}
+      }) do
+    %{"token_contract_address_hash" => token_contract_address_hash, "token_type" => token_type}
+  end
+
+  def nft_collections_next_page_params(%{
+        token_contract_address_hash: token_contract_address_hash,
+        token_type: token_type
+      }) do
+    %{"token_contract_address_hash" => token_contract_address_hash, "token_type" => token_type}
+  end
+
+  @spec token_instances_by_holder_address_hash(Token.t(), binary() | Hash.Address.t(), keyword) :: [Instance.t()]
+  def token_instances_by_holder_address_hash(token, holder_address_hash, options \\ [])
+
+  def token_instances_by_holder_address_hash(%Token{type: "ERC-721"} = token, holder_address_hash, options) do
+    paging_options = Keyword.get(options, :paging_options, Chain.default_paging_options())
+
+    token.contract_address_hash
+    |> address_to_unique_token_instances()
+    |> where([ti], ti.owner_address_hash == ^holder_address_hash)
+    |> limit(^paging_options.page_size)
+    |> page_token_instance(paging_options)
+    |> Chain.select_repo(options).all()
+  end
+
+  def token_instances_by_holder_address_hash(%Token{} = token, holder_address_hash, options) do
+    paging_options = Keyword.get(options, :paging_options, Chain.default_paging_options())
+
+    __MODULE__
+    |> where([ti], ti.token_contract_address_hash == ^token.contract_address_hash)
+    |> join(:inner, [ti], ctb in CurrentTokenBalance,
+      as: :ctb,
+      on:
+        ctb.token_contract_address_hash == ti.token_contract_address_hash and ctb.token_id == ti.token_id and
+          ctb.address_hash == ^holder_address_hash
+    )
+    |> where([ctb: ctb], ctb.value > 0)
+    |> order_by([ti], desc: ti.token_id)
+    |> limit(^paging_options.page_size)
+    |> page_token_instance(paging_options)
+    |> select_merge([ctb: ctb], %{current_token_balance: ctb})
+    |> Chain.select_repo(options).all()
+  end
 end
diff --git a/apps/explorer/lib/explorer/helper.ex b/apps/explorer/lib/explorer/helper.ex
index 4b1dab59a392..5004b1f26702 100644
--- a/apps/explorer/lib/explorer/helper.ex
+++ b/apps/explorer/lib/explorer/helper.ex
@@ -4,8 +4,11 @@ defmodule Explorer.Helper do
   """
 
   alias ABI.TypeDecoder
+  alias Explorer.Chain
   alias Explorer.Chain.Data
 
+  import Ecto.Query, only: [where: 3]
+
   @spec decode_data(binary() | map(), list()) :: list() | nil
   def decode_data("0x", types) do
     for _ <- types, do: nil
@@ -36,4 +39,23 @@ defmodule Explorer.Helper do
       _ -> nil
     end
   end
+
+  @doc """
+    Function to preload a `struct` for each element of the `list`.
+    You should specify a primary key for a `struct` in `references_field`,
+    and the list element's foreign key in `foreign_key_field`.
+    Results will be placed to `preload_field`
+  """
+  @spec custom_preload(list(map()), keyword(), atom(), atom(), atom(), atom()) :: list()
+  def custom_preload(list, options, struct, foreign_key_field, references_field, preload_field) do
+    to_fetch_from_db = list |> Enum.map(& &1[foreign_key_field]) |> Enum.uniq()
+
+    associated_elements =
+      struct
+      |> where([t], field(t, ^references_field) in ^to_fetch_from_db)
+      |> Chain.select_repo(options).all()
+      |> Enum.reduce(%{}, fn el, acc -> Map.put(acc, Map.from_struct(el)[references_field], el) end)
+
+    Enum.map(list, fn el -> Map.put(el, preload_field, associated_elements[el[foreign_key_field]]) end)
+  end
 end
diff --git a/apps/explorer/test/support/factory.ex b/apps/explorer/test/support/factory.ex
index 33c9f6347796..89712c83e82e 100644
--- a/apps/explorer/test/support/factory.ex
+++ b/apps/explorer/test/support/factory.ex
@@ -888,8 +888,14 @@ defmodule Explorer.Factory do
     %Instance{
       token_contract_address_hash: insert(:token).contract_address_hash,
       token_id: sequence("token_id", & &1),
-      metadata: %{key: "value"},
-      error: nil
+      metadata: %{
+        "key" => sequence("value"),
+        "image_url" => sequence("image_url"),
+        "animation_url" => sequence("image_url"),
+        "external_url" => sequence("external_url")
+      },
+      error: nil,
+      owner_address_hash: insert(:address).hash
     }
   end
 
@@ -943,6 +949,41 @@ defmodule Explorer.Factory do
     }
   end
 
+  def address_current_token_balance_with_token_id_and_fixed_token_type_factory(%{
+        token_type: token_type,
+        address: address,
+        token_id: token_id,
+        token_contract_address_hash: token_contract_address_hash,
+        value: value
+      }) do
+    %CurrentTokenBalance{
+      address: address,
+      token_contract_address_hash: token_contract_address_hash,
+      block_number: block_number(),
+      value: value,
+      value_fetched_at: DateTime.utc_now(),
+      token_id: token_id,
+      token_type: token_type
+    }
+  end
+
+  def address_current_token_balance_with_token_id_and_fixed_token_type_factory(%{
+        token_type: token_type,
+        address: address,
+        token_id: token_id,
+        token_contract_address_hash: token_contract_address_hash
+      }) do
+    %CurrentTokenBalance{
+      address: address,
+      token_contract_address_hash: token_contract_address_hash,
+      block_number: block_number(),
+      value: Enum.random(1_000_000_000_000_000_000..10_000_000_000_000_000_000),
+      value_fetched_at: DateTime.utc_now(),
+      token_id: token_id,
+      token_type: token_type
+    }
+  end
+
   def address_current_token_balance_with_token_id_and_fixed_token_type_factory(%{
         token_type: token_type,
         address: address,

From 76b9e849d47130e8c9ef8765b6de40e868301870 Mon Sep 17 00:00:00 2001
From: 0xalex88 <113263502+0xalex88@users.noreply.github.com>
Date: Fri, 10 Nov 2023 11:58:22 -0800
Subject: [PATCH 641/909] Ignore depositReceiptVersion from optimism receipts

---
 apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/receipt.ex | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/receipt.ex b/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/receipt.ex
index 00ededb8d86c..f3cf67aab1d3 100644
--- a/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/receipt.ex
+++ b/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/receipt.ex
@@ -315,7 +315,7 @@ defmodule EthereumJSONRPC.Receipt do
   end
 
   # Optimism specific transaction receipt fields
-  defp entry_to_elixir({key, _}) when key in ~w(depositNonce) do
+  defp entry_to_elixir({key, _}) when key in ~w(depositNonce depositReceiptVersion) do
     :ignore
   end
 

From b70f95caa59cfcd2b36802106162c922fcd44b67 Mon Sep 17 00:00:00 2001
From: nikitosing <32202610+nikitosing@users.noreply.github.com>
Date: Mon, 13 Nov 2023 15:13:02 +0300
Subject: [PATCH 642/909] Do not ignore twin contracts on
 /api/v2/import/smart-contracts/{address_hash} (#8813)

* Ignore twin contracts on /api/v2/import/smart-contracts/{address_hash}

* Changelog
---
 CHANGELOG.md                                               | 1 +
 .../controllers/api/v2/import_controller.ex                | 4 ++--
 apps/explorer/lib/explorer/chain.ex                        | 7 -------
 3 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 998e0c642c10..73c76b48c4a0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,6 +12,7 @@
 
 ### Fixes
 
+- [#8813](https://github.com/blockscout/blockscout/pull/8813) - Force verify twin contracts on `/api/v2/import/smart-contracts/{address_hash}`
 - [#8784](https://github.com/blockscout/blockscout/pull/8784) - Fix Indexer.Transform.Addresses for non-Suave setup
 - [#8770](https://github.com/blockscout/blockscout/pull/8770) - Fix for eth_getbalance API v1 endpoint when requesting latest tag
 - [#8765](https://github.com/blockscout/blockscout/pull/8765) - Fix for tvl update in market history when row already exists
diff --git a/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/import_controller.ex b/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/import_controller.ex
index 7c6b59c3bf99..76aa988edfc7 100644
--- a/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/import_controller.ex
+++ b/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/import_controller.ex
@@ -54,7 +54,7 @@ defmodule BlockScoutWeb.API.V2.ImportController do
 
   @doc """
     Function to handle request at:
-      `/api/v2/smart-contracts/{address_hash_param}`
+      `/api/v2/import/smart-contracts/{address_hash_param}`
 
     Needed to try to import unverified smart contracts via eth-bytecode-db (`/api/v2/bytecodes/sources:search` method).
     Protected by `x-api-key` header.
@@ -73,7 +73,7 @@ defmodule BlockScoutWeb.API.V2.ImportController do
          {:format, {:ok, address_hash}} <- {:format, Chain.string_to_address_hash(address_hash_string)},
          {:not_found, {:ok, address}} <- {:not_found, Chain.hash_to_address(address_hash, @api_true, false)},
          {:already_verified, smart_contract} when is_nil(smart_contract) <-
-           {:already_verified, Chain.address_hash_to_smart_contract(address_hash, @api_true)} do
+           {:already_verified, Chain.address_hash_to_smart_contract_without_twin(address_hash, @api_true)} do
       creation_tx_input = contract_creation_input(address.hash)
 
       with {:ok, %{"sourceType" => type} = source} <-
diff --git a/apps/explorer/lib/explorer/chain.ex b/apps/explorer/lib/explorer/chain.ex
index 4f159d2d1635..9a1f114eae5c 100644
--- a/apps/explorer/lib/explorer/chain.ex
+++ b/apps/explorer/lib/explorer/chain.ex
@@ -3912,13 +3912,6 @@ defmodule Explorer.Chain do
     end
   end
 
-  @spec address_hash_to_smart_contract(Hash.Address.t()) :: SmartContract.t() | nil
-  def address_hash_to_one_smart_contract(hash) do
-    SmartContract
-    |> where([sc], sc.address_hash == ^hash)
-    |> Repo.one()
-  end
-
   @spec address_hash_to_smart_contract_without_twin(Hash.Address.t(), [api?]) :: SmartContract.t() | nil
   def address_hash_to_smart_contract_without_twin(address_hash, options) do
     query =

From 6377c978e1667f47dd4c80a390978cb3d2db5b3b Mon Sep 17 00:00:00 2001
From: Qwerty5Uiop <alex000010@bk.ru>
Date: Thu, 28 Sep 2023 12:34:25 +0300
Subject: [PATCH 643/909] Add CoinBalanceDailyUpdater

---
 CHANGELOG.md                                  |  1 +
 apps/indexer/lib/indexer/block/fetcher.ex     |  7 --
 .../lib/indexer/block/realtime/fetcher.ex     | 10 ++-
 .../lib/indexer/fetcher/block_reward.ex       |  5 +-
 .../fetcher/coin_balance_daily_updater.ex     | 68 +++++++++++++++++++
 apps/indexer/lib/indexer/supervisor.ex        |  2 +
 6 files changed, 78 insertions(+), 15 deletions(-)
 create mode 100644 apps/indexer/lib/indexer/fetcher/coin_balance_daily_updater.ex

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 73c76b48c4a0..39a7a802eb00 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,7 @@
 - [#8750](https://github.com/blockscout/blockscout/pull/8750) - Support new eth-bytecode-db request metadata fields
 - [#8634](https://github.com/blockscout/blockscout/pull/8634) - API v2: NFT for address
 - [#8609](https://github.com/blockscout/blockscout/pull/8609) - Change logs format to JSON; Add endpoint url to the block_scout_web logging
+- [#8558](https://github.com/blockscout/blockscout/pull/8558) - Add CoinBalanceDailyUpdater
 
 ### Fixes
 
diff --git a/apps/indexer/lib/indexer/block/fetcher.ex b/apps/indexer/lib/indexer/block/fetcher.ex
index 5b5eaf0b8902..7ceebb1009b5 100644
--- a/apps/indexer/lib/indexer/block/fetcher.ex
+++ b/apps/indexer/lib/indexer/block/fetcher.ex
@@ -173,12 +173,6 @@ defmodule Indexer.Block.Fetcher do
              withdrawals: withdrawals_params
            }
            |> AddressCoinBalances.params_set(),
-         coin_balances_params_daily_set =
-           %{
-             coin_balances_params: coin_balances_params_set,
-             blocks: blocks
-           }
-           |> AddressCoinBalancesDaily.params_set(),
          beneficiaries_with_gas_payment =
            beneficiaries_with_gas_payment(blocks, beneficiary_params_set, transactions_with_receipts),
          address_token_balances = AddressTokenBalances.params_set(%{token_transfers_params: token_transfers}),
@@ -188,7 +182,6 @@ defmodule Indexer.Block.Fetcher do
          basic_import_options = %{
            addresses: %{params: addresses},
            address_coin_balances: %{params: coin_balances_params_set},
-           address_coin_balances_daily: %{params: coin_balances_params_daily_set},
            address_token_balances: %{params: address_token_balances},
            address_current_token_balances: %{
              params: address_token_balances |> MapSet.to_list() |> TokenBalances.to_address_current_token_balances()
diff --git a/apps/indexer/lib/indexer/block/realtime/fetcher.ex b/apps/indexer/lib/indexer/block/realtime/fetcher.ex
index b78688b85e18..cb43857e1d0b 100644
--- a/apps/indexer/lib/indexer/block/realtime/fetcher.ex
+++ b/apps/indexer/lib/indexer/block/realtime/fetcher.ex
@@ -33,7 +33,7 @@ defmodule Indexer.Block.Realtime.Fetcher do
   alias Explorer.Utility.MissingRangesManipulator
   alias Indexer.{Block, Tracer}
   alias Indexer.Block.Realtime.TaskSupervisor
-  alias Indexer.Fetcher.CoinBalance
+  alias Indexer.Fetcher.{CoinBalance, CoinBalanceDailyUpdater}
   alias Indexer.Fetcher.PolygonEdge.{DepositExecute, Withdrawal}
   alias Indexer.Prometheus
   alias Indexer.Transform.Addresses
@@ -195,7 +195,6 @@ defmodule Indexer.Block.Realtime.Fetcher do
         block_fetcher,
         %{
           address_coin_balances: %{params: address_coin_balances_params},
-          address_coin_balances_daily: %{params: address_coin_balances_daily_params},
           address_hash_to_fetched_balance_block_number: address_hash_to_block_number,
           addresses: %{params: addresses_params},
           block_rewards: block_rewards
@@ -212,8 +211,7 @@ defmodule Indexer.Block.Realtime.Fetcher do
             balances(block_fetcher, %{
               address_hash_to_block_number: address_hash_to_block_number,
               addresses_params: addresses_params,
-              balances_params: address_coin_balances_params,
-              balances_daily_params: address_coin_balances_daily_params
+              balances_params: address_coin_balances_params
             })},
          {block_reward_errors, chain_import_block_rewards} = Map.pop(block_rewards, :errors),
          chain_import_options =
@@ -222,8 +220,8 @@ defmodule Indexer.Block.Realtime.Fetcher do
            |> put_in([:addresses, :params], balances_addresses_params)
            |> put_in([:blocks, :params, Access.all(), :consensus], true)
            |> put_in([:block_rewards], chain_import_block_rewards)
-           |> put_in([Access.key(:address_coin_balances, %{}), :params], balances_params)
-           |> put_in([Access.key(:address_coin_balances_daily, %{}), :params], balances_daily_params),
+           |> put_in([Access.key(:address_coin_balances, %{}), :params], balances_params),
+         CoinBalanceDailyUpdater.add_daily_balances_params(balances_daily_params),
          {:import, {:ok, imported} = ok} <- {:import, Chain.import(chain_import_options)} do
       async_import_remaining_block_data(
         imported,
diff --git a/apps/indexer/lib/indexer/fetcher/block_reward.ex b/apps/indexer/lib/indexer/fetcher/block_reward.ex
index f6825a5ffce6..2558b9510fee 100644
--- a/apps/indexer/lib/indexer/fetcher/block_reward.ex
+++ b/apps/indexer/lib/indexer/fetcher/block_reward.ex
@@ -20,7 +20,7 @@ defmodule Indexer.Fetcher.BlockReward do
   alias Explorer.Chain.Cache.Accounts
   alias Indexer.{BufferedTask, Tracer}
   alias Indexer.Fetcher.BlockReward.Supervisor, as: BlockRewardSupervisor
-  alias Indexer.Fetcher.CoinBalance
+  alias Indexer.Fetcher.{CoinBalance, CoinBalanceDailyUpdater}
   alias Indexer.Transform.{AddressCoinBalances, AddressCoinBalancesDaily, Addresses}
 
   @behaviour BufferedTask
@@ -292,10 +292,11 @@ defmodule Indexer.Fetcher.BlockReward do
     address_coin_balances_daily_params_set =
       AddressCoinBalancesDaily.params_set(address_coin_balances_params_with_block_timestamp_set)
 
+    CoinBalanceDailyUpdater.add_daily_balances_params(address_coin_balances_daily_params_set)
+
     Chain.import(%{
       addresses: %{params: addresses_params},
       address_coin_balances: %{params: address_coin_balances_params_set},
-      address_coin_balances_daily: %{params: address_coin_balances_daily_params_set},
       block_rewards: %{params: block_rewards_params}
     })
   end
diff --git a/apps/indexer/lib/indexer/fetcher/coin_balance_daily_updater.ex b/apps/indexer/lib/indexer/fetcher/coin_balance_daily_updater.ex
new file mode 100644
index 000000000000..101178630611
--- /dev/null
+++ b/apps/indexer/lib/indexer/fetcher/coin_balance_daily_updater.ex
@@ -0,0 +1,68 @@
+defmodule Indexer.Fetcher.CoinBalanceDailyUpdater do
+  @moduledoc """
+  Accumulates and periodically updates daily coin balances
+  """
+
+  use GenServer
+
+  alias Explorer.Chain
+  alias Explorer.Counters.AverageBlockTime
+  alias Timex.Duration
+
+  @default_update_interval :timer.seconds(10)
+
+  def start_link(_) do
+    GenServer.start_link(__MODULE__, :ok, name: __MODULE__)
+  end
+
+  @impl true
+  def init(_) do
+    schedule_next_update()
+
+    {:ok, %{}}
+  end
+
+  def add_daily_balances_params(daily_balances_params) do
+    GenServer.cast(__MODULE__, {:add_daily_balances_params, daily_balances_params})
+  end
+
+  @impl true
+  def handle_cast({:add_daily_balances_params, daily_balances_params}, state) do
+    {:noreply, Enum.reduce(daily_balances_params, state, &put_new_param/2)}
+  end
+
+  defp put_new_param(%{day: day, address_hash: address_hash, value: value} = param, acc) do
+    Map.update(acc, {address_hash, day}, param, fn %{value: old_value} = old_param ->
+      if is_nil(old_value) or value > old_value, do: param, else: old_param
+    end)
+  end
+
+  @impl true
+  def handle_info(:update, state) when state == %{} do
+    schedule_next_update()
+
+    {:noreply, %{}}
+  end
+
+  def handle_info(:update, state) do
+    Chain.import(%{address_coin_balances_daily: %{params: Map.values(state)}})
+
+    schedule_next_update()
+
+    {:noreply, %{}}
+  end
+
+  def handle_info(_, state) do
+    {:noreply, state}
+  end
+
+  defp schedule_next_update do
+    update_interval =
+      case AverageBlockTime.average_block_time() do
+        {:error, :disabled} -> @default_update_interval
+        block_time -> round(Duration.to_milliseconds(block_time))
+      end
+
+    Process.send_after(self(), :update, update_interval)
+  end
+end
diff --git a/apps/indexer/lib/indexer/supervisor.ex b/apps/indexer/lib/indexer/supervisor.ex
index c7afebbbcee0..832818cba5a7 100644
--- a/apps/indexer/lib/indexer/supervisor.ex
+++ b/apps/indexer/lib/indexer/supervisor.ex
@@ -21,6 +21,7 @@ defmodule Indexer.Supervisor do
   alias Indexer.Fetcher.{
     BlockReward,
     CoinBalance,
+    CoinBalanceDailyUpdater,
     ContractCode,
     EmptyBlocksSanitizer,
     InternalTransaction,
@@ -142,6 +143,7 @@ defmodule Indexer.Supervisor do
         {EmptyBlocksSanitizer.Supervisor, [[json_rpc_named_arguments: json_rpc_named_arguments]]},
         {PendingTransactionsSanitizer, [[json_rpc_named_arguments: json_rpc_named_arguments]]},
         {TokenTotalSupplyUpdater, [[]]},
+        {CoinBalanceDailyUpdater, [[]]},
 
         # Temporary workers
         {UncatalogedTokenTransfers.Supervisor, [[]]},

From 5209cdfc8444bfa12bb837784e65ba529916a485 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 13 Nov 2023 18:03:55 +0000
Subject: [PATCH 644/909] Bump benchee from 1.1.0 to 1.2.0

Bumps [benchee](https://github.com/bencheeorg/benchee) from 1.1.0 to 1.2.0.
- [Release notes](https://github.com/bencheeorg/benchee/releases)
- [Changelog](https://github.com/bencheeorg/benchee/blob/main/CHANGELOG.md)
- [Commits](https://github.com/bencheeorg/benchee/compare/1.1.0...1.2.0)

---
updated-dependencies:
- dependency-name: benchee
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 apps/explorer/mix.exs | 2 +-
 mix.lock              | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/explorer/mix.exs b/apps/explorer/mix.exs
index e976d63ce455..6d903ff853b6 100644
--- a/apps/explorer/mix.exs
+++ b/apps/explorer/mix.exs
@@ -61,7 +61,7 @@ defmodule Explorer.Mixfile do
       {:mime, "~> 2.0"},
       {:bcrypt_elixir, "~> 3.0"},
       # benchmark optimizations
-      {:benchee, "~> 1.1.0", only: :test},
+      {:benchee, "~> 1.2.0", only: :test},
       # CSV output for benchee
       {:benchee_csv, "~> 1.0.0", only: :test},
       {:bypass, "~> 2.1", only: :test},
diff --git a/mix.lock b/mix.lock
index 605ac6bec0ec..d75ce01e294f 100644
--- a/mix.lock
+++ b/mix.lock
@@ -6,7 +6,7 @@
   "accept": {:hex, :accept, "0.3.5", "b33b127abca7cc948bbe6caa4c263369abf1347cfa9d8e699c6d214660f10cd1", [:rebar3], [], "hexpm", "11b18c220bcc2eab63b5470c038ef10eb6783bcb1fcdb11aa4137defa5ac1bb8"},
   "bamboo": {:hex, :bamboo, "2.3.0", "d2392a2cabe91edf488553d3c70638b532e8db7b76b84b0a39e3dfe492ffd6fc", [:mix], [{:hackney, ">= 1.15.2", [hex: :hackney, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}, {:mime, "~> 1.4 or ~> 2.0", [hex: :mime, repo: "hexpm", optional: false]}, {:plug, "~> 1.0", [hex: :plug, repo: "hexpm", optional: false]}], "hexpm", "dd0037e68e108fd04d0e8773921512c940e35d981e097b5793543e3b2f9cd3f6"},
   "bcrypt_elixir": {:hex, :bcrypt_elixir, "3.1.0", "0b110a9a6c619b19a7f73fa3004aa11d6e719a67e672d1633dc36b6b2290a0f7", [:make, :mix], [{:comeonin, "~> 5.3", [hex: :comeonin, repo: "hexpm", optional: false]}, {:elixir_make, "~> 0.6", [hex: :elixir_make, repo: "hexpm", optional: false]}], "hexpm", "2ad2acb5a8bc049e8d5aa267802631912bb80d5f4110a178ae7999e69dca1bf7"},
-  "benchee": {:hex, :benchee, "1.1.0", "f3a43817209a92a1fade36ef36b86e1052627fd8934a8b937ac9ab3a76c43062", [:mix], [{:deep_merge, "~> 1.0", [hex: :deep_merge, repo: "hexpm", optional: false]}, {:statistex, "~> 1.0", [hex: :statistex, repo: "hexpm", optional: false]}], "hexpm", "7da57d545003165a012b587077f6ba90b89210fd88074ce3c60ce239eb5e6d93"},
+  "benchee": {:hex, :benchee, "1.2.0", "afd2f0caec06ce3a70d9c91c514c0b58114636db9d83c2dc6bfd416656618353", [:mix], [{:deep_merge, "~> 1.0", [hex: :deep_merge, repo: "hexpm", optional: false]}, {:statistex, "~> 1.0", [hex: :statistex, repo: "hexpm", optional: false]}, {:table, "~> 0.1.0", [hex: :table, repo: "hexpm", optional: true]}], "hexpm", "ee729e53217898b8fd30aaad3cce61973dab61574ae6f48229fe7ff42d5e4457"},
   "benchee_csv": {:hex, :benchee_csv, "1.0.0", "0b3b9223290bfcb8003552705bec9bcf1a89b4a83b70bd686e45295c264f3d16", [:mix], [{:benchee, ">= 0.99.0 and < 2.0.0", [hex: :benchee, repo: "hexpm", optional: false]}, {:csv, "~> 2.0", [hex: :csv, repo: "hexpm", optional: false]}], "hexpm", "cdefb804c021dcf7a99199492026584be9b5a21d6644ac0d01c81c5d97c520d5"},
   "briefly": {:git, "https://github.com/CargoSense/briefly.git", "51dfe7fbe0f897ea2a921d9af120762392aca6a1", []},
   "bunt": {:hex, :bunt, "0.2.1", "e2d4792f7bc0ced7583ab54922808919518d0e57ee162901a16a1b6664ef3b14", [:mix], [], "hexpm", "a330bfb4245239787b15005e66ae6845c9cd524a288f0d141c148b02603777a5"},

From 3a681ae1422a9526fc37f38cc1954694fc7dd646 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 13 Nov 2023 18:04:34 +0000
Subject: [PATCH 645/909] Bump httpoison from 2.1.0 to 2.2.0

Bumps [httpoison](https://github.com/edgurgel/httpoison) from 2.1.0 to 2.2.0.
- [Release notes](https://github.com/edgurgel/httpoison/releases)
- [Commits](https://github.com/edgurgel/httpoison/compare/v2.1.0...v2.2.0)

---
updated-dependencies:
- dependency-name: httpoison
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 mix.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mix.lock b/mix.lock
index 605ac6bec0ec..2cd2faaea95d 100644
--- a/mix.lock
+++ b/mix.lock
@@ -68,7 +68,7 @@
   "hammer": {:hex, :hammer, "6.1.0", "f263e3c3e9946bd410ea0336b2abe0cb6260af4afb3a221e1027540706e76c55", [:make, :mix], [{:poolboy, "~> 1.5", [hex: :poolboy, repo: "hexpm", optional: false]}], "hexpm", "b47e415a562a6d072392deabcd58090d8a41182cf9044cdd6b0d0faaaf68ba57"},
   "hammer_backend_redis": {:hex, :hammer_backend_redis, "6.1.2", "eb296bb4924928e24135308b2afc189201fd09411c870c6bbadea444a49b2f2c", [:mix], [{:hammer, "~> 6.0", [hex: :hammer, repo: "hexpm", optional: false]}, {:redix, "~> 1.1", [hex: :redix, repo: "hexpm", optional: false]}], "hexpm", "217ea066278910543a5e9b577d5bf2425419446b94fe76bdd9f255f39feec9fa"},
   "html_entities": {:hex, :html_entities, "0.5.2", "9e47e70598da7de2a9ff6af8758399251db6dbb7eebe2b013f2bbd2515895c3c", [:mix], [], "hexpm", "c53ba390403485615623b9531e97696f076ed415e8d8058b1dbaa28181f4fdcc"},
-  "httpoison": {:hex, :httpoison, "2.1.0", "655fd9a7b0b95ee3e9a3b535cf7ac8e08ef5229bab187fa86ac4208b122d934b", [:mix], [{:hackney, "~> 1.17", [hex: :hackney, repo: "hexpm", optional: false]}], "hexpm", "fc455cb4306b43827def4f57299b2d5ac8ac331cb23f517e734a4b78210a160c"},
+  "httpoison": {:hex, :httpoison, "2.2.0", "839298929243b872b3f53c3693fa369ac3dbe03102cefd0a126194738bf4bb0e", [:mix], [{:hackney, "~> 1.17", [hex: :hackney, repo: "hexpm", optional: false]}], "hexpm", "a49a9337c2b671464948a00cff6a882d271c1c8e3d25a6ca14d0532cbd23f65a"},
   "idna": {:hex, :idna, "6.1.1", "8a63070e9f7d0c62eb9d9fcb360a7de382448200fbbd1b106cc96d3d8099df8d", [:rebar3], [{:unicode_util_compat, "~>0.7.0", [hex: :unicode_util_compat, repo: "hexpm", optional: false]}], "hexpm", "92376eb7894412ed19ac475e4a86f7b413c1b9fbb5bd16dccd57934157944cea"},
   "inflex": {:hex, :inflex, "2.1.0", "a365cf0821a9dacb65067abd95008ca1b0bb7dcdd85ae59965deef2aa062924c", [:mix], [], "hexpm", "14c17d05db4ee9b6d319b0bff1bdf22aa389a25398d1952c7a0b5f3d93162dd8"},
   "jason": {:hex, :jason, "1.4.1", "af1504e35f629ddcdd6addb3513c3853991f694921b1b9368b0bd32beb9f1b63", [:mix], [{:decimal, "~> 1.0 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: true]}], "hexpm", "fbb01ecdfd565b56261302f7e1fcc27c4fb8f32d56eab74db621fc154604a7a1"},

From 97bd61577e716d5b918635e8209368183105db2d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 13 Nov 2023 18:51:12 +0000
Subject: [PATCH 646/909] Bump luxon from 3.4.3 to 3.4.4 in
 /apps/block_scout_web/assets

Bumps [luxon](https://github.com/moment/luxon) from 3.4.3 to 3.4.4.
- [Changelog](https://github.com/moment/luxon/blob/master/CHANGELOG.md)
- [Commits](https://github.com/moment/luxon/compare/3.4.3...3.4.4)

---
updated-dependencies:
- dependency-name: luxon
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 apps/block_scout_web/assets/package-lock.json | 14 +++++++-------
 apps/block_scout_web/assets/package.json      |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/apps/block_scout_web/assets/package-lock.json b/apps/block_scout_web/assets/package-lock.json
index 182812353e9b..95c1a67ce74d 100644
--- a/apps/block_scout_web/assets/package-lock.json
+++ b/apps/block_scout_web/assets/package-lock.json
@@ -44,7 +44,7 @@
         "lodash.omit": "^4.5.0",
         "lodash.rangeright": "^4.2.0",
         "lodash.reduce": "^4.6.0",
-        "luxon": "^3.4.3",
+        "luxon": "^3.4.4",
         "malihu-custom-scrollbar-plugin": "3.1.5",
         "mixpanel-browser": "^2.47.0",
         "moment": "^2.29.4",
@@ -12522,9 +12522,9 @@
       "integrity": "sha1-81ypHEk/e3PaDgdJUwTxezH4fuU="
     },
     "node_modules/luxon": {
-      "version": "3.4.3",
-      "resolved": "https://registry.npmjs.org/luxon/-/luxon-3.4.3.tgz",
-      "integrity": "sha512-tFWBiv3h7z+T/tDaoxA8rqTxy1CHV6gHS//QdaH4pulbq/JuBSGgQspQQqcgnwdAx6pNI7cmvz5Sv/addzHmUg==",
+      "version": "3.4.4",
+      "resolved": "https://registry.npmjs.org/luxon/-/luxon-3.4.4.tgz",
+      "integrity": "sha512-zobTr7akeGHnv7eBOXcRgMeCP6+uyYsczwmeRCauvpvaAltgNyTbLH/+VaEAPUeWBT+1GuNmz4wC/6jtQzbbVA==",
       "engines": {
         "node": ">=12"
       }
@@ -27270,9 +27270,9 @@
       "integrity": "sha1-81ypHEk/e3PaDgdJUwTxezH4fuU="
     },
     "luxon": {
-      "version": "3.4.3",
-      "resolved": "https://registry.npmjs.org/luxon/-/luxon-3.4.3.tgz",
-      "integrity": "sha512-tFWBiv3h7z+T/tDaoxA8rqTxy1CHV6gHS//QdaH4pulbq/JuBSGgQspQQqcgnwdAx6pNI7cmvz5Sv/addzHmUg=="
+      "version": "3.4.4",
+      "resolved": "https://registry.npmjs.org/luxon/-/luxon-3.4.4.tgz",
+      "integrity": "sha512-zobTr7akeGHnv7eBOXcRgMeCP6+uyYsczwmeRCauvpvaAltgNyTbLH/+VaEAPUeWBT+1GuNmz4wC/6jtQzbbVA=="
     },
     "make-dir": {
       "version": "4.0.0",
diff --git a/apps/block_scout_web/assets/package.json b/apps/block_scout_web/assets/package.json
index 34655e1073c2..bc19465225e8 100644
--- a/apps/block_scout_web/assets/package.json
+++ b/apps/block_scout_web/assets/package.json
@@ -56,7 +56,7 @@
     "lodash.omit": "^4.5.0",
     "lodash.rangeright": "^4.2.0",
     "lodash.reduce": "^4.6.0",
-    "luxon": "^3.4.3",
+    "luxon": "^3.4.4",
     "malihu-custom-scrollbar-plugin": "3.1.5",
     "mixpanel-browser": "^2.47.0",
     "moment": "^2.29.4",

From 874d72b9ba9f91a0e0c5025a4c9cac13e8966c30 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 13 Nov 2023 18:51:47 +0000
Subject: [PATCH 647/909] Bump @babel/core from 7.23.2 to 7.23.3 in
 /apps/block_scout_web/assets

Bumps [@babel/core](https://github.com/babel/babel/tree/HEAD/packages/babel-core) from 7.23.2 to 7.23.3.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/commits/v7.23.3/packages/babel-core)

---
updated-dependencies:
- dependency-name: "@babel/core"
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 apps/block_scout_web/assets/package-lock.json | 110 +++++++++---------
 apps/block_scout_web/assets/package.json      |   2 +-
 2 files changed, 56 insertions(+), 56 deletions(-)

diff --git a/apps/block_scout_web/assets/package-lock.json b/apps/block_scout_web/assets/package-lock.json
index 182812353e9b..a62f5f49d19f 100644
--- a/apps/block_scout_web/assets/package-lock.json
+++ b/apps/block_scout_web/assets/package-lock.json
@@ -71,7 +71,7 @@
         "xss": "^1.0.14"
       },
       "devDependencies": {
-        "@babel/core": "^7.23.2",
+        "@babel/core": "^7.23.3",
         "@babel/preset-env": "^7.23.2",
         "autoprefixer": "^10.4.16",
         "babel-loader": "^9.1.3",
@@ -249,20 +249,20 @@
       }
     },
     "node_modules/@babel/core": {
-      "version": "7.23.2",
-      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.23.2.tgz",
-      "integrity": "sha512-n7s51eWdaWZ3vGT2tD4T7J6eJs3QoBXydv7vkUM06Bf1cbVD2Kc2UrkzhiQwobfV7NwOnQXYL7UBJ5VPU+RGoQ==",
+      "version": "7.23.3",
+      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.23.3.tgz",
+      "integrity": "sha512-Jg+msLuNuCJDyBvFv5+OKOUjWMZgd85bKjbICd3zWrKAo+bJ49HJufi7CQE0q0uR8NGyO6xkCACScNqyjHSZew==",
       "dependencies": {
         "@ampproject/remapping": "^2.2.0",
         "@babel/code-frame": "^7.22.13",
-        "@babel/generator": "^7.23.0",
+        "@babel/generator": "^7.23.3",
         "@babel/helper-compilation-targets": "^7.22.15",
-        "@babel/helper-module-transforms": "^7.23.0",
+        "@babel/helper-module-transforms": "^7.23.3",
         "@babel/helpers": "^7.23.2",
-        "@babel/parser": "^7.23.0",
+        "@babel/parser": "^7.23.3",
         "@babel/template": "^7.22.15",
-        "@babel/traverse": "^7.23.2",
-        "@babel/types": "^7.23.0",
+        "@babel/traverse": "^7.23.3",
+        "@babel/types": "^7.23.3",
         "convert-source-map": "^2.0.0",
         "debug": "^4.1.0",
         "gensync": "^1.0.0-beta.2",
@@ -283,11 +283,11 @@
       "integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg=="
     },
     "node_modules/@babel/generator": {
-      "version": "7.23.0",
-      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.23.0.tgz",
-      "integrity": "sha512-lN85QRR+5IbYrMWM6Y4pE/noaQtg4pNiqeNGX60eqOfo6gtEj6uw/JagelB8vVztSd7R6M5n1+PQkDbHbBRU4g==",
+      "version": "7.23.3",
+      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.23.3.tgz",
+      "integrity": "sha512-keeZWAV4LU3tW0qRi19HRpabC/ilM0HRBBzf9/k8FFiG4KVpiv0FIy4hHfLfFQZNhziCTPTmd59zoyv6DNISzg==",
       "dependencies": {
-        "@babel/types": "^7.23.0",
+        "@babel/types": "^7.23.3",
         "@jridgewell/gen-mapping": "^0.3.2",
         "@jridgewell/trace-mapping": "^0.3.17",
         "jsesc": "^2.5.1"
@@ -458,9 +458,9 @@
       }
     },
     "node_modules/@babel/helper-module-transforms": {
-      "version": "7.23.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.23.0.tgz",
-      "integrity": "sha512-WhDWw1tdrlT0gMgUJSlX0IQvoO1eN279zrAUbVB+KpV2c3Tylz8+GnKOLllCS6Z/iZQEyVYxhZVUdPTqs2YYPw==",
+      "version": "7.23.3",
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.23.3.tgz",
+      "integrity": "sha512-7bBs4ED9OmswdfDzpz4MpWgSrV7FXlc3zIagvLFjS5H+Mk7Snr21vQ6QwrsoCGMfNC4e4LQPdoULEt4ykz0SRQ==",
       "dependencies": {
         "@babel/helper-environment-visitor": "^7.22.20",
         "@babel/helper-module-imports": "^7.22.15",
@@ -628,9 +628,9 @@
       }
     },
     "node_modules/@babel/parser": {
-      "version": "7.23.0",
-      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.23.0.tgz",
-      "integrity": "sha512-vvPKKdMemU85V9WE/l5wZEmImpCtLqbnTvqDS2U1fJ96KrxoW7KrXhNsNCblQlg8Ck4b85yxdTyelsMUgFUXiw==",
+      "version": "7.23.3",
+      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.23.3.tgz",
+      "integrity": "sha512-uVsWNvlVsIninV2prNz/3lHCb+5CJ+e+IUBfbjToAHODtfGYLfCFuY4AU7TskI+dAKk+njsPiBjq1gKTvZOBaw==",
       "bin": {
         "parser": "bin/babel-parser.js"
       },
@@ -1943,18 +1943,18 @@
       }
     },
     "node_modules/@babel/traverse": {
-      "version": "7.23.2",
-      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.23.2.tgz",
-      "integrity": "sha512-azpe59SQ48qG6nu2CzcMLbxUudtN+dOM9kDbUqGq3HXUJRlo7i8fvPoxQUzYgLZ4cMVmuZgm8vvBpNeRhd6XSw==",
+      "version": "7.23.3",
+      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.23.3.tgz",
+      "integrity": "sha512-+K0yF1/9yR0oHdE0StHuEj3uTPzwwbrLGfNOndVJVV2TqA5+j3oljJUb4nmB954FLGjNem976+B+eDuLIjesiQ==",
       "dependencies": {
         "@babel/code-frame": "^7.22.13",
-        "@babel/generator": "^7.23.0",
+        "@babel/generator": "^7.23.3",
         "@babel/helper-environment-visitor": "^7.22.20",
         "@babel/helper-function-name": "^7.23.0",
         "@babel/helper-hoist-variables": "^7.22.5",
         "@babel/helper-split-export-declaration": "^7.22.6",
-        "@babel/parser": "^7.23.0",
-        "@babel/types": "^7.23.0",
+        "@babel/parser": "^7.23.3",
+        "@babel/types": "^7.23.3",
         "debug": "^4.1.0",
         "globals": "^11.1.0"
       },
@@ -1963,9 +1963,9 @@
       }
     },
     "node_modules/@babel/types": {
-      "version": "7.23.0",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.23.0.tgz",
-      "integrity": "sha512-0oIyUfKoI3mSqMvsxBdclDwxXKXAUA8v/apZbc+iSyARYou1o8ZGDxbUYyLFoW2arqS2jDGqJuZvv1d/io1axg==",
+      "version": "7.23.3",
+      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.23.3.tgz",
+      "integrity": "sha512-OZnvoH2l8PK5eUvEcUyCt/sXgr/h+UWpVuBbOljwcrAgUl6lpchoQ++PHGyQy1AtYnVA6CEq3y5xeEI10brpXw==",
       "dependencies": {
         "@babel/helper-string-parser": "^7.22.5",
         "@babel/helper-validator-identifier": "^7.22.20",
@@ -17971,20 +17971,20 @@
       "integrity": "sha512-0S9TQMmDHlqAZ2ITT95irXKfxN9bncq8ZCoJhun3nHL/lLUxd2NKBJYoNGWH7S0hz6fRQwWlAWn/ILM0C70KZQ=="
     },
     "@babel/core": {
-      "version": "7.23.2",
-      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.23.2.tgz",
-      "integrity": "sha512-n7s51eWdaWZ3vGT2tD4T7J6eJs3QoBXydv7vkUM06Bf1cbVD2Kc2UrkzhiQwobfV7NwOnQXYL7UBJ5VPU+RGoQ==",
+      "version": "7.23.3",
+      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.23.3.tgz",
+      "integrity": "sha512-Jg+msLuNuCJDyBvFv5+OKOUjWMZgd85bKjbICd3zWrKAo+bJ49HJufi7CQE0q0uR8NGyO6xkCACScNqyjHSZew==",
       "requires": {
         "@ampproject/remapping": "^2.2.0",
         "@babel/code-frame": "^7.22.13",
-        "@babel/generator": "^7.23.0",
+        "@babel/generator": "^7.23.3",
         "@babel/helper-compilation-targets": "^7.22.15",
-        "@babel/helper-module-transforms": "^7.23.0",
+        "@babel/helper-module-transforms": "^7.23.3",
         "@babel/helpers": "^7.23.2",
-        "@babel/parser": "^7.23.0",
+        "@babel/parser": "^7.23.3",
         "@babel/template": "^7.22.15",
-        "@babel/traverse": "^7.23.2",
-        "@babel/types": "^7.23.0",
+        "@babel/traverse": "^7.23.3",
+        "@babel/types": "^7.23.3",
         "convert-source-map": "^2.0.0",
         "debug": "^4.1.0",
         "gensync": "^1.0.0-beta.2",
@@ -18000,11 +18000,11 @@
       }
     },
     "@babel/generator": {
-      "version": "7.23.0",
-      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.23.0.tgz",
-      "integrity": "sha512-lN85QRR+5IbYrMWM6Y4pE/noaQtg4pNiqeNGX60eqOfo6gtEj6uw/JagelB8vVztSd7R6M5n1+PQkDbHbBRU4g==",
+      "version": "7.23.3",
+      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.23.3.tgz",
+      "integrity": "sha512-keeZWAV4LU3tW0qRi19HRpabC/ilM0HRBBzf9/k8FFiG4KVpiv0FIy4hHfLfFQZNhziCTPTmd59zoyv6DNISzg==",
       "requires": {
-        "@babel/types": "^7.23.0",
+        "@babel/types": "^7.23.3",
         "@jridgewell/gen-mapping": "^0.3.2",
         "@jridgewell/trace-mapping": "^0.3.17",
         "jsesc": "^2.5.1"
@@ -18135,9 +18135,9 @@
       }
     },
     "@babel/helper-module-transforms": {
-      "version": "7.23.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.23.0.tgz",
-      "integrity": "sha512-WhDWw1tdrlT0gMgUJSlX0IQvoO1eN279zrAUbVB+KpV2c3Tylz8+GnKOLllCS6Z/iZQEyVYxhZVUdPTqs2YYPw==",
+      "version": "7.23.3",
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.23.3.tgz",
+      "integrity": "sha512-7bBs4ED9OmswdfDzpz4MpWgSrV7FXlc3zIagvLFjS5H+Mk7Snr21vQ6QwrsoCGMfNC4e4LQPdoULEt4ykz0SRQ==",
       "requires": {
         "@babel/helper-environment-visitor": "^7.22.20",
         "@babel/helper-module-imports": "^7.22.15",
@@ -18254,9 +18254,9 @@
       }
     },
     "@babel/parser": {
-      "version": "7.23.0",
-      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.23.0.tgz",
-      "integrity": "sha512-vvPKKdMemU85V9WE/l5wZEmImpCtLqbnTvqDS2U1fJ96KrxoW7KrXhNsNCblQlg8Ck4b85yxdTyelsMUgFUXiw=="
+      "version": "7.23.3",
+      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.23.3.tgz",
+      "integrity": "sha512-uVsWNvlVsIninV2prNz/3lHCb+5CJ+e+IUBfbjToAHODtfGYLfCFuY4AU7TskI+dAKk+njsPiBjq1gKTvZOBaw=="
     },
     "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": {
       "version": "7.22.15",
@@ -19142,26 +19142,26 @@
       }
     },
     "@babel/traverse": {
-      "version": "7.23.2",
-      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.23.2.tgz",
-      "integrity": "sha512-azpe59SQ48qG6nu2CzcMLbxUudtN+dOM9kDbUqGq3HXUJRlo7i8fvPoxQUzYgLZ4cMVmuZgm8vvBpNeRhd6XSw==",
+      "version": "7.23.3",
+      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.23.3.tgz",
+      "integrity": "sha512-+K0yF1/9yR0oHdE0StHuEj3uTPzwwbrLGfNOndVJVV2TqA5+j3oljJUb4nmB954FLGjNem976+B+eDuLIjesiQ==",
       "requires": {
         "@babel/code-frame": "^7.22.13",
-        "@babel/generator": "^7.23.0",
+        "@babel/generator": "^7.23.3",
         "@babel/helper-environment-visitor": "^7.22.20",
         "@babel/helper-function-name": "^7.23.0",
         "@babel/helper-hoist-variables": "^7.22.5",
         "@babel/helper-split-export-declaration": "^7.22.6",
-        "@babel/parser": "^7.23.0",
-        "@babel/types": "^7.23.0",
+        "@babel/parser": "^7.23.3",
+        "@babel/types": "^7.23.3",
         "debug": "^4.1.0",
         "globals": "^11.1.0"
       }
     },
     "@babel/types": {
-      "version": "7.23.0",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.23.0.tgz",
-      "integrity": "sha512-0oIyUfKoI3mSqMvsxBdclDwxXKXAUA8v/apZbc+iSyARYou1o8ZGDxbUYyLFoW2arqS2jDGqJuZvv1d/io1axg==",
+      "version": "7.23.3",
+      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.23.3.tgz",
+      "integrity": "sha512-OZnvoH2l8PK5eUvEcUyCt/sXgr/h+UWpVuBbOljwcrAgUl6lpchoQ++PHGyQy1AtYnVA6CEq3y5xeEI10brpXw==",
       "requires": {
         "@babel/helper-string-parser": "^7.22.5",
         "@babel/helper-validator-identifier": "^7.22.20",
diff --git a/apps/block_scout_web/assets/package.json b/apps/block_scout_web/assets/package.json
index 34655e1073c2..afb9419c1447 100644
--- a/apps/block_scout_web/assets/package.json
+++ b/apps/block_scout_web/assets/package.json
@@ -83,7 +83,7 @@
     "xss": "^1.0.14"
   },
   "devDependencies": {
-    "@babel/core": "^7.23.2",
+    "@babel/core": "^7.23.3",
     "@babel/preset-env": "^7.23.2",
     "autoprefixer": "^10.4.16",
     "babel-loader": "^9.1.3",

From 480adc964ac87988fb1e2110fa83d1541df01b11 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 14 Nov 2023 07:31:18 +0000
Subject: [PATCH 648/909] Bump @babel/preset-env in
 /apps/block_scout_web/assets

Bumps [@babel/preset-env](https://github.com/babel/babel/tree/HEAD/packages/babel-preset-env) from 7.23.2 to 7.23.3.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/commits/v7.23.3/packages/babel-preset-env)

---
updated-dependencies:
- dependency-name: "@babel/preset-env"
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 apps/block_scout_web/assets/package-lock.json | 1060 +++++++++--------
 apps/block_scout_web/assets/package.json      |    2 +-
 2 files changed, 544 insertions(+), 518 deletions(-)

diff --git a/apps/block_scout_web/assets/package-lock.json b/apps/block_scout_web/assets/package-lock.json
index c347760f4802..0fc330c2a4a0 100644
--- a/apps/block_scout_web/assets/package-lock.json
+++ b/apps/block_scout_web/assets/package-lock.json
@@ -72,7 +72,7 @@
       },
       "devDependencies": {
         "@babel/core": "^7.23.3",
-        "@babel/preset-env": "^7.23.2",
+        "@babel/preset-env": "^7.23.3",
         "autoprefixer": "^10.4.16",
         "babel-loader": "^9.1.3",
         "copy-webpack-plugin": "^11.0.0",
@@ -241,9 +241,9 @@
       }
     },
     "node_modules/@babel/compat-data": {
-      "version": "7.23.2",
-      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.23.2.tgz",
-      "integrity": "sha512-0S9TQMmDHlqAZ2ITT95irXKfxN9bncq8ZCoJhun3nHL/lLUxd2NKBJYoNGWH7S0hz6fRQwWlAWn/ILM0C70KZQ==",
+      "version": "7.23.3",
+      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.23.3.tgz",
+      "integrity": "sha512-BmR4bWbDIoFJmJ9z2cZ8Gmm2MXgEDgjdWgpKmKWUt54UGFJdlj31ECtbaDvCG/qVdG3AQ1SfpZEs01lUFbzLOQ==",
       "engines": {
         "node": ">=6.9.0"
       }
@@ -308,12 +308,12 @@
       }
     },
     "node_modules/@babel/helper-builder-binary-assignment-operator-visitor": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.22.5.tgz",
-      "integrity": "sha512-m1EP3lVOPptR+2DwD125gziZNcmoNSHGmJROKoy87loWUQyJaVXDgpmruWqDARZSmtYQ+Dl25okU8+qhVzuykw==",
+      "version": "7.22.15",
+      "resolved": "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.22.15.tgz",
+      "integrity": "sha512-QkBXwGgaoC2GtGZRoma6kv7Szfv06khvhFav67ZExau2RaXzy8MpHSMO2PNoP2XtmQphJQRHFfg77Bq731Yizw==",
       "dev": true,
       "dependencies": {
-        "@babel/types": "^7.22.5"
+        "@babel/types": "^7.22.15"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -348,15 +348,15 @@
       "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g=="
     },
     "node_modules/@babel/helper-create-class-features-plugin": {
-      "version": "7.22.11",
-      "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.22.11.tgz",
-      "integrity": "sha512-y1grdYL4WzmUDBRGK0pDbIoFd7UZKoDurDzWEoNMYoj1EL+foGRQNyPWDcC+YyegN5y1DUsFFmzjGijB3nSVAQ==",
+      "version": "7.22.15",
+      "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.22.15.tgz",
+      "integrity": "sha512-jKkwA59IXcvSaiK2UN45kKwSC9o+KuoXsBDvHvU/7BecYIp8GQ2UwrVvFgJASUT+hBnwJx6MhvMCuMzwZZ7jlg==",
       "dev": true,
       "dependencies": {
         "@babel/helper-annotate-as-pure": "^7.22.5",
         "@babel/helper-environment-visitor": "^7.22.5",
         "@babel/helper-function-name": "^7.22.5",
-        "@babel/helper-member-expression-to-functions": "^7.22.5",
+        "@babel/helper-member-expression-to-functions": "^7.22.15",
         "@babel/helper-optimise-call-expression": "^7.22.5",
         "@babel/helper-replace-supers": "^7.22.9",
         "@babel/helper-skip-transparent-expression-wrappers": "^7.22.5",
@@ -371,14 +371,14 @@
       }
     },
     "node_modules/@babel/helper-create-regexp-features-plugin": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.22.5.tgz",
-      "integrity": "sha512-1VpEFOIbMRaXyDeUwUfmTIxExLwQ+zkW+Bh5zXpApA3oQedBx9v/updixWxnx/bZpKw7u8VxWjb/qWpIcmPq8A==",
+      "version": "7.22.15",
+      "resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.22.15.tgz",
+      "integrity": "sha512-29FkPLFjn4TPEa3RE7GpW+qbE8tlsu3jntNYNfcGsc49LphF1PQIiD+vMZ1z1xVOKt+93khA9tc2JBs3kBjA7w==",
       "dev": true,
       "dependencies": {
         "@babel/helper-annotate-as-pure": "^7.22.5",
         "regexpu-core": "^5.3.1",
-        "semver": "^6.3.0"
+        "semver": "^6.3.1"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -435,12 +435,12 @@
       }
     },
     "node_modules/@babel/helper-member-expression-to-functions": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.22.5.tgz",
-      "integrity": "sha512-aBiH1NKMG0H2cGZqspNvsaBe6wNGjbJjuLy29aU+eDZjSbbN53BaxlpB02xm9v34pLTZ1nIQPFYn2qMZoa5BQQ==",
+      "version": "7.23.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.23.0.tgz",
+      "integrity": "sha512-6gfrPwh7OuT6gZyJZvd6WbTfrqAo7vm4xCzAXOusKqq/vWdKXphTpj5klHKNmRUU6/QRGlBsyU9mAIPaWHlqJA==",
       "dev": true,
       "dependencies": {
-        "@babel/types": "^7.22.5"
+        "@babel/types": "^7.23.0"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -513,13 +513,13 @@
       }
     },
     "node_modules/@babel/helper-replace-supers": {
-      "version": "7.22.9",
-      "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.22.9.tgz",
-      "integrity": "sha512-LJIKvvpgPOPUThdYqcX6IXRuIcTkcAub0IaDRGCZH0p5GPUp7PhRU9QVgFcDDd51BaPkk77ZjqFwh6DZTAEmGg==",
+      "version": "7.22.20",
+      "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.22.20.tgz",
+      "integrity": "sha512-qsW0In3dbwQUbK8kejJ4R7IHVGwHJlV6lpG6UA7a9hSa2YEiAib+N1T2kr6PEeUT+Fl7najmSOS6SmAwCHK6Tw==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-environment-visitor": "^7.22.5",
-        "@babel/helper-member-expression-to-functions": "^7.22.5",
+        "@babel/helper-environment-visitor": "^7.22.20",
+        "@babel/helper-member-expression-to-functions": "^7.22.15",
         "@babel/helper-optimise-call-expression": "^7.22.5"
       },
       "engines": {
@@ -639,9 +639,9 @@
       }
     },
     "node_modules/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": {
-      "version": "7.22.15",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.22.15.tgz",
-      "integrity": "sha512-FB9iYlz7rURmRJyXRKEnalYPPdn87H5no108cyuQQyMwlpJ2SJtpIUBI27kdTin956pz+LPypkPVPUTlxOmrsg==",
+      "version": "7.23.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.23.3.tgz",
+      "integrity": "sha512-iRkKcCqb7iGnq9+3G6rZ+Ciz5VywC4XNRHe57lKM+jOeYAoR0lVqdeeDRfh0tQcTfw/+vBhHn926FmQhLtlFLQ==",
       "dev": true,
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.22.5"
@@ -654,14 +654,14 @@
       }
     },
     "node_modules/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": {
-      "version": "7.22.15",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.22.15.tgz",
-      "integrity": "sha512-Hyph9LseGvAeeXzikV88bczhsrLrIZqDPxO+sSmAunMPaGrBGhfMWzCPYTtiW9t+HzSE2wtV8e5cc5P6r1xMDQ==",
+      "version": "7.23.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.23.3.tgz",
+      "integrity": "sha512-WwlxbfMNdVEpQjZmK5mhm7oSwD3dS6eU+Iwsi4Knl9wAletWem7kaRsGOG+8UEbRyqxY4SS5zvtfXwX+jMxUwQ==",
       "dev": true,
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.22.5",
         "@babel/helper-skip-transparent-expression-wrappers": "^7.22.5",
-        "@babel/plugin-transform-optional-chaining": "^7.22.15"
+        "@babel/plugin-transform-optional-chaining": "^7.23.3"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -670,6 +670,22 @@
         "@babel/core": "^7.13.0"
       }
     },
+    "node_modules/@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly": {
+      "version": "7.23.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly/-/plugin-bugfix-v8-static-class-fields-redefine-readonly-7.23.3.tgz",
+      "integrity": "sha512-XaJak1qcityzrX0/IU5nKHb34VaibwP3saKqG6a/tppelgllOH13LUann4ZCIBcVOeE6H18K4Vx9QKkVww3z/w==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-environment-visitor": "^7.22.20",
+        "@babel/helper-plugin-utils": "^7.22.5"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0"
+      }
+    },
     "node_modules/@babel/plugin-proposal-private-property-in-object": {
       "version": "7.21.0-placeholder-for-preset-env.2",
       "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.21.0-placeholder-for-preset-env.2.tgz",
@@ -758,9 +774,9 @@
       }
     },
     "node_modules/@babel/plugin-syntax-import-assertions": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.22.5.tgz",
-      "integrity": "sha512-rdV97N7KqsRzeNGoWUOK6yUsWarLjE5Su/Snk9IYPU9CwkWHs4t+rTGOvffTR8XGkJMTAdLfO0xVnXm8wugIJg==",
+      "version": "7.23.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.23.3.tgz",
+      "integrity": "sha512-lPgDSU+SJLK3xmFDTV2ZRQAiM7UuUjGidwBywFavObCiZc1BeAAcMtHJKUya92hPHO+at63JJPLygilZard8jw==",
       "dev": true,
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.22.5"
@@ -773,9 +789,9 @@
       }
     },
     "node_modules/@babel/plugin-syntax-import-attributes": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-attributes/-/plugin-syntax-import-attributes-7.22.5.tgz",
-      "integrity": "sha512-KwvoWDeNKPETmozyFE0P2rOLqh39EoQHNjqizrI5B8Vt0ZNS7M56s7dAiAqbYfiAYOuIzIh96z3iR2ktgu3tEg==",
+      "version": "7.23.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-attributes/-/plugin-syntax-import-attributes-7.23.3.tgz",
+      "integrity": "sha512-pawnE0P9g10xgoP7yKr6CK63K2FMsTE+FZidZO/1PwRdzmAPVs+HS1mAURUsgaoxammTJvULUdIkEK0gOcU2tA==",
       "dev": true,
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.22.5"
@@ -960,9 +976,9 @@
       }
     },
     "node_modules/@babel/plugin-transform-arrow-functions": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.22.5.tgz",
-      "integrity": "sha512-26lTNXoVRdAnsaDXPpvCNUq+OVWEVC6bx7Vvz9rC53F2bagUWW4u4ii2+h8Fejfh7RYqPxn+libeFBBck9muEw==",
+      "version": "7.23.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.23.3.tgz",
+      "integrity": "sha512-NzQcQrzaQPkaEwoTm4Mhyl8jI1huEL/WWIEvudjTCMJ9aBZNpsJbMASx7EQECtQQPS/DcnFpo0FIh3LvEO9cxQ==",
       "dev": true,
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.22.5"
@@ -975,9 +991,9 @@
       }
     },
     "node_modules/@babel/plugin-transform-async-generator-functions": {
-      "version": "7.23.2",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-generator-functions/-/plugin-transform-async-generator-functions-7.23.2.tgz",
-      "integrity": "sha512-BBYVGxbDVHfoeXbOwcagAkOQAm9NxoTdMGfTqghu1GrvadSaw6iW3Je6IcL5PNOw8VwjxqBECXy50/iCQSY/lQ==",
+      "version": "7.23.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-generator-functions/-/plugin-transform-async-generator-functions-7.23.3.tgz",
+      "integrity": "sha512-59GsVNavGxAXCDDbakWSMJhajASb4kBCqDjqJsv+p5nKdbz7istmZ3HrX3L2LuiI80+zsOADCvooqQH3qGCucQ==",
       "dev": true,
       "dependencies": {
         "@babel/helper-environment-visitor": "^7.22.20",
@@ -993,14 +1009,14 @@
       }
     },
     "node_modules/@babel/plugin-transform-async-to-generator": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.22.5.tgz",
-      "integrity": "sha512-b1A8D8ZzE/VhNDoV1MSJTnpKkCG5bJo+19R4o4oy03zM7ws8yEMK755j61Dc3EyvdysbqH5BOOTquJ7ZX9C6vQ==",
+      "version": "7.23.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.23.3.tgz",
+      "integrity": "sha512-A7LFsKi4U4fomjqXJlZg/u0ft/n8/7n7lpffUP/ZULx/DtV9SGlNKZolHH6PE8Xl1ngCc0M11OaeZptXVkfKSw==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-module-imports": "^7.22.5",
+        "@babel/helper-module-imports": "^7.22.15",
         "@babel/helper-plugin-utils": "^7.22.5",
-        "@babel/helper-remap-async-to-generator": "^7.22.5"
+        "@babel/helper-remap-async-to-generator": "^7.22.20"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1010,9 +1026,9 @@
       }
     },
     "node_modules/@babel/plugin-transform-block-scoped-functions": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.22.5.tgz",
-      "integrity": "sha512-tdXZ2UdknEKQWKJP1KMNmuF5Lx3MymtMN/pvA+p/VEkhK8jVcQ1fzSy8KM9qRYhAf2/lV33hoMPKI/xaI9sADA==",
+      "version": "7.23.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.23.3.tgz",
+      "integrity": "sha512-vI+0sIaPIO6CNuM9Kk5VmXcMVRiOpDh7w2zZt9GXzmE/9KD70CUEVhvPR/etAeNK/FAEkhxQtXOzVF3EuRL41A==",
       "dev": true,
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.22.5"
@@ -1025,9 +1041,9 @@
       }
     },
     "node_modules/@babel/plugin-transform-block-scoping": {
-      "version": "7.23.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.23.0.tgz",
-      "integrity": "sha512-cOsrbmIOXmf+5YbL99/S49Y3j46k/T16b9ml8bm9lP6N9US5iQ2yBK7gpui1pg0V/WMcXdkfKbTb7HXq9u+v4g==",
+      "version": "7.23.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.23.3.tgz",
+      "integrity": "sha512-QPZxHrThbQia7UdvfpaRRlq/J9ciz1J4go0k+lPBXbgaNeY7IQrBj/9ceWjvMMI07/ZBzHl/F0R/2K0qH7jCVw==",
       "dev": true,
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.22.5"
@@ -1040,12 +1056,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-class-properties": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-class-properties/-/plugin-transform-class-properties-7.22.5.tgz",
-      "integrity": "sha512-nDkQ0NfkOhPTq8YCLiWNxp1+f9fCobEjCb0n8WdbNUBc4IB5V7P1QnX9IjpSoquKrXF5SKojHleVNs2vGeHCHQ==",
+      "version": "7.23.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-class-properties/-/plugin-transform-class-properties-7.23.3.tgz",
+      "integrity": "sha512-uM+AN8yCIjDPccsKGlw271xjJtGii+xQIF/uMPS8H15L12jZTsLfF4o5vNO7d/oUguOyfdikHGc/yi9ge4SGIg==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-create-class-features-plugin": "^7.22.5",
+        "@babel/helper-create-class-features-plugin": "^7.22.15",
         "@babel/helper-plugin-utils": "^7.22.5"
       },
       "engines": {
@@ -1056,12 +1072,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-class-static-block": {
-      "version": "7.22.11",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-class-static-block/-/plugin-transform-class-static-block-7.22.11.tgz",
-      "integrity": "sha512-GMM8gGmqI7guS/llMFk1bJDkKfn3v3C4KHK9Yg1ey5qcHcOlKb0QvcMrgzvxo+T03/4szNh5lghY+fEC98Kq9g==",
+      "version": "7.23.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-class-static-block/-/plugin-transform-class-static-block-7.23.3.tgz",
+      "integrity": "sha512-PENDVxdr7ZxKPyi5Ffc0LjXdnJyrJxyqF5T5YjlVg4a0VFfQHW0r8iAtRiDXkfHlu1wwcvdtnndGYIeJLSuRMQ==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-create-class-features-plugin": "^7.22.11",
+        "@babel/helper-create-class-features-plugin": "^7.22.15",
         "@babel/helper-plugin-utils": "^7.22.5",
         "@babel/plugin-syntax-class-static-block": "^7.14.5"
       },
@@ -1073,18 +1089,18 @@
       }
     },
     "node_modules/@babel/plugin-transform-classes": {
-      "version": "7.22.15",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.22.15.tgz",
-      "integrity": "sha512-VbbC3PGjBdE0wAWDdHM9G8Gm977pnYI0XpqMd6LrKISj8/DJXEsWqgRuTYaNE9Bv0JGhTZUzHDlMk18IpOuoqw==",
+      "version": "7.23.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.23.3.tgz",
+      "integrity": "sha512-FGEQmugvAEu2QtgtU0uTASXevfLMFfBeVCIIdcQhn/uBQsMTjBajdnAtanQlOcuihWh10PZ7+HWvc7NtBwP74w==",
       "dev": true,
       "dependencies": {
         "@babel/helper-annotate-as-pure": "^7.22.5",
         "@babel/helper-compilation-targets": "^7.22.15",
-        "@babel/helper-environment-visitor": "^7.22.5",
-        "@babel/helper-function-name": "^7.22.5",
+        "@babel/helper-environment-visitor": "^7.22.20",
+        "@babel/helper-function-name": "^7.23.0",
         "@babel/helper-optimise-call-expression": "^7.22.5",
         "@babel/helper-plugin-utils": "^7.22.5",
-        "@babel/helper-replace-supers": "^7.22.9",
+        "@babel/helper-replace-supers": "^7.22.20",
         "@babel/helper-split-export-declaration": "^7.22.6",
         "globals": "^11.1.0"
       },
@@ -1096,13 +1112,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-computed-properties": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.22.5.tgz",
-      "integrity": "sha512-4GHWBgRf0krxPX+AaPtgBAlTgTeZmqDynokHOX7aqqAB4tHs3U2Y02zH6ETFdLZGcg9UQSD1WCmkVrE9ErHeOg==",
+      "version": "7.23.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.23.3.tgz",
+      "integrity": "sha512-dTj83UVTLw/+nbiHqQSFdwO9CbTtwq1DsDqm3CUEtDrZNET5rT5E6bIdTlOftDTDLMYxvxHNEYO4B9SLl8SLZw==",
       "dev": true,
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.22.5",
-        "@babel/template": "^7.22.5"
+        "@babel/template": "^7.22.15"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1112,9 +1128,9 @@
       }
     },
     "node_modules/@babel/plugin-transform-destructuring": {
-      "version": "7.23.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.23.0.tgz",
-      "integrity": "sha512-vaMdgNXFkYrB+8lbgniSYWHsgqK5gjaMNcc84bMIOMRLH0L9AqYq3hwMdvnyqj1OPqea8UtjPEuS/DCenah1wg==",
+      "version": "7.23.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.23.3.tgz",
+      "integrity": "sha512-n225npDqjDIr967cMScVKHXJs7rout1q+tt50inyBCPkyZ8KxeI6d+GIbSBTT/w/9WdlWDOej3V9HE5Lgk57gw==",
       "dev": true,
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.22.5"
@@ -1127,12 +1143,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-dotall-regex": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.22.5.tgz",
-      "integrity": "sha512-5/Yk9QxCQCl+sOIB1WelKnVRxTJDSAIxtJLL2/pqL14ZVlbH0fUQUZa/T5/UnQtBNgghR7mfB8ERBKyKPCi7Vw==",
+      "version": "7.23.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.23.3.tgz",
+      "integrity": "sha512-vgnFYDHAKzFaTVp+mneDsIEbnJ2Np/9ng9iviHw3P/KVcgONxpNULEW/51Z/BaFojG2GI2GwwXck5uV1+1NOYQ==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-create-regexp-features-plugin": "^7.22.5",
+        "@babel/helper-create-regexp-features-plugin": "^7.22.15",
         "@babel/helper-plugin-utils": "^7.22.5"
       },
       "engines": {
@@ -1143,9 +1159,9 @@
       }
     },
     "node_modules/@babel/plugin-transform-duplicate-keys": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.22.5.tgz",
-      "integrity": "sha512-dEnYD+9BBgld5VBXHnF/DbYGp3fqGMsyxKbtD1mDyIA7AkTSpKXFhCVuj/oQVOoALfBs77DudA0BE4d5mcpmqw==",
+      "version": "7.23.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.23.3.tgz",
+      "integrity": "sha512-RrqQ+BQmU3Oyav3J+7/myfvRCq7Tbz+kKLLshUmMwNlDHExbGL7ARhajvoBJEvc+fCguPPu887N+3RRXBVKZUA==",
       "dev": true,
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.22.5"
@@ -1158,9 +1174,9 @@
       }
     },
     "node_modules/@babel/plugin-transform-dynamic-import": {
-      "version": "7.22.11",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dynamic-import/-/plugin-transform-dynamic-import-7.22.11.tgz",
-      "integrity": "sha512-g/21plo58sfteWjaO0ZNVb+uEOkJNjAaHhbejrnBmu011l/eNDScmkbjCC3l4FKb10ViaGU4aOkFznSu2zRHgA==",
+      "version": "7.23.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dynamic-import/-/plugin-transform-dynamic-import-7.23.3.tgz",
+      "integrity": "sha512-vTG+cTGxPFou12Rj7ll+eD5yWeNl5/8xvQvF08y5Gv3v4mZQoyFf8/n9zg4q5vvCWt5jmgymfzMAldO7orBn7A==",
       "dev": true,
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.22.5",
@@ -1174,12 +1190,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-exponentiation-operator": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.22.5.tgz",
-      "integrity": "sha512-vIpJFNM/FjZ4rh1myqIya9jXwrwwgFRHPjT3DkUA9ZLHuzox8jiXkOLvwm1H+PQIP3CqfC++WPKeuDi0Sjdj1g==",
+      "version": "7.23.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.23.3.tgz",
+      "integrity": "sha512-5fhCsl1odX96u7ILKHBj4/Y8vipoqwsJMh4csSA8qFfxrZDEA4Ssku2DyNvMJSmZNOEBT750LfFPbtrnTP90BQ==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-builder-binary-assignment-operator-visitor": "^7.22.5",
+        "@babel/helper-builder-binary-assignment-operator-visitor": "^7.22.15",
         "@babel/helper-plugin-utils": "^7.22.5"
       },
       "engines": {
@@ -1190,9 +1206,9 @@
       }
     },
     "node_modules/@babel/plugin-transform-export-namespace-from": {
-      "version": "7.22.11",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-export-namespace-from/-/plugin-transform-export-namespace-from-7.22.11.tgz",
-      "integrity": "sha512-xa7aad7q7OiT8oNZ1mU7NrISjlSkVdMbNxn9IuLZyL9AJEhs1Apba3I+u5riX1dIkdptP5EKDG5XDPByWxtehw==",
+      "version": "7.23.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-export-namespace-from/-/plugin-transform-export-namespace-from-7.23.3.tgz",
+      "integrity": "sha512-yCLhW34wpJWRdTxxWtFZASJisihrfyMOTOQexhVzA78jlU+dH7Dw+zQgcPepQ5F3C6bAIiblZZ+qBggJdHiBAg==",
       "dev": true,
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.22.5",
@@ -1206,9 +1222,9 @@
       }
     },
     "node_modules/@babel/plugin-transform-for-of": {
-      "version": "7.22.15",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.22.15.tgz",
-      "integrity": "sha512-me6VGeHsx30+xh9fbDLLPi0J1HzmeIIyenoOQHuw2D4m2SAU3NrspX5XxJLBpqn5yrLzrlw2Iy3RA//Bx27iOA==",
+      "version": "7.23.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.23.3.tgz",
+      "integrity": "sha512-X8jSm8X1CMwxmK878qsUGJRmbysKNbdpTv/O1/v0LuY/ZkZrng5WYiekYSdg9m09OTmDDUWeEDsTE+17WYbAZw==",
       "dev": true,
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.22.5"
@@ -1221,13 +1237,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-function-name": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.22.5.tgz",
-      "integrity": "sha512-UIzQNMS0p0HHiQm3oelztj+ECwFnj+ZRV4KnguvlsD2of1whUeM6o7wGNj6oLwcDoAXQ8gEqfgC24D+VdIcevg==",
+      "version": "7.23.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.23.3.tgz",
+      "integrity": "sha512-I1QXp1LxIvt8yLaib49dRW5Okt7Q4oaxao6tFVKS/anCdEOMtYwWVKoiOA1p34GOWIZjUK0E+zCp7+l1pfQyiw==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-compilation-targets": "^7.22.5",
-        "@babel/helper-function-name": "^7.22.5",
+        "@babel/helper-compilation-targets": "^7.22.15",
+        "@babel/helper-function-name": "^7.23.0",
         "@babel/helper-plugin-utils": "^7.22.5"
       },
       "engines": {
@@ -1238,9 +1254,9 @@
       }
     },
     "node_modules/@babel/plugin-transform-json-strings": {
-      "version": "7.22.11",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-json-strings/-/plugin-transform-json-strings-7.22.11.tgz",
-      "integrity": "sha512-CxT5tCqpA9/jXFlme9xIBCc5RPtdDq3JpkkhgHQqtDdiTnTI0jtZ0QzXhr5DILeYifDPp2wvY2ad+7+hLMW5Pw==",
+      "version": "7.23.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-json-strings/-/plugin-transform-json-strings-7.23.3.tgz",
+      "integrity": "sha512-H9Ej2OiISIZowZHaBwF0tsJOih1PftXJtE8EWqlEIwpc7LMTGq0rPOrywKLQ4nefzx8/HMR0D3JGXoMHYvhi0A==",
       "dev": true,
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.22.5",
@@ -1254,9 +1270,9 @@
       }
     },
     "node_modules/@babel/plugin-transform-literals": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.22.5.tgz",
-      "integrity": "sha512-fTLj4D79M+mepcw3dgFBTIDYpbcB9Sm0bpm4ppXPaO+U+PKFFyV9MGRvS0gvGw62sd10kT5lRMKXAADb9pWy8g==",
+      "version": "7.23.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.23.3.tgz",
+      "integrity": "sha512-wZ0PIXRxnwZvl9AYpqNUxpZ5BiTGrYt7kueGQ+N5FiQ7RCOD4cm8iShd6S6ggfVIWaJf2EMk8eRzAh52RfP4rQ==",
       "dev": true,
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.22.5"
@@ -1269,9 +1285,9 @@
       }
     },
     "node_modules/@babel/plugin-transform-logical-assignment-operators": {
-      "version": "7.22.11",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-logical-assignment-operators/-/plugin-transform-logical-assignment-operators-7.22.11.tgz",
-      "integrity": "sha512-qQwRTP4+6xFCDV5k7gZBF3C31K34ut0tbEcTKxlX/0KXxm9GLcO14p570aWxFvVzx6QAfPgq7gaeIHXJC8LswQ==",
+      "version": "7.23.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-logical-assignment-operators/-/plugin-transform-logical-assignment-operators-7.23.3.tgz",
+      "integrity": "sha512-+pD5ZbxofyOygEp+zZAfujY2ShNCXRpDRIPOiBmTO693hhyOEteZgl876Xs9SAHPQpcV0vz8LvA/T+w8AzyX8A==",
       "dev": true,
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.22.5",
@@ -1285,9 +1301,9 @@
       }
     },
     "node_modules/@babel/plugin-transform-member-expression-literals": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.22.5.tgz",
-      "integrity": "sha512-RZEdkNtzzYCFl9SE9ATaUMTj2hqMb4StarOJLrZRbqqU4HSBE7UlBw9WBWQiDzrJZJdUWiMTVDI6Gv/8DPvfew==",
+      "version": "7.23.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.23.3.tgz",
+      "integrity": "sha512-sC3LdDBDi5x96LA+Ytekz2ZPk8i/Ck+DEuDbRAll5rknJ5XRTSaPKEYwomLcs1AA8wg9b3KjIQRsnApj+q51Ag==",
       "dev": true,
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.22.5"
@@ -1300,12 +1316,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-modules-amd": {
-      "version": "7.23.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.23.0.tgz",
-      "integrity": "sha512-xWT5gefv2HGSm4QHtgc1sYPbseOyf+FFDo2JbpE25GWl5BqTGO9IMwTYJRoIdjsF85GE+VegHxSCUt5EvoYTAw==",
+      "version": "7.23.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.23.3.tgz",
+      "integrity": "sha512-vJYQGxeKM4t8hYCKVBlZX/gtIY2I7mRGFNcm85sgXGMTBcoV3QdVtdpbcWEbzbfUIUZKwvgFT82mRvaQIebZzw==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-module-transforms": "^7.23.0",
+        "@babel/helper-module-transforms": "^7.23.3",
         "@babel/helper-plugin-utils": "^7.22.5"
       },
       "engines": {
@@ -1316,12 +1332,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-modules-commonjs": {
-      "version": "7.23.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.23.0.tgz",
-      "integrity": "sha512-32Xzss14/UVc7k9g775yMIvkVK8xwKE0DPdP5JTapr3+Z9w4tzeOuLNY6BXDQR6BdnzIlXnCGAzsk/ICHBLVWQ==",
+      "version": "7.23.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.23.3.tgz",
+      "integrity": "sha512-aVS0F65LKsdNOtcz6FRCpE4OgsP2OFnW46qNxNIX9h3wuzaNcSQsJysuMwqSibC98HPrf2vCgtxKNwS0DAlgcA==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-module-transforms": "^7.23.0",
+        "@babel/helper-module-transforms": "^7.23.3",
         "@babel/helper-plugin-utils": "^7.22.5",
         "@babel/helper-simple-access": "^7.22.5"
       },
@@ -1333,13 +1349,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-modules-systemjs": {
-      "version": "7.23.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.23.0.tgz",
-      "integrity": "sha512-qBej6ctXZD2f+DhlOC9yO47yEYgUh5CZNz/aBoH4j/3NOlRfJXJbY7xDQCqQVf9KbrqGzIWER1f23doHGrIHFg==",
+      "version": "7.23.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.23.3.tgz",
+      "integrity": "sha512-ZxyKGTkF9xT9YJuKQRo19ewf3pXpopuYQd8cDXqNzc3mUNbOME0RKMoZxviQk74hwzfQsEe66dE92MaZbdHKNQ==",
       "dev": true,
       "dependencies": {
         "@babel/helper-hoist-variables": "^7.22.5",
-        "@babel/helper-module-transforms": "^7.23.0",
+        "@babel/helper-module-transforms": "^7.23.3",
         "@babel/helper-plugin-utils": "^7.22.5",
         "@babel/helper-validator-identifier": "^7.22.20"
       },
@@ -1351,12 +1367,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-modules-umd": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.22.5.tgz",
-      "integrity": "sha512-+S6kzefN/E1vkSsKx8kmQuqeQsvCKCd1fraCM7zXm4SFoggI099Tr4G8U81+5gtMdUeMQ4ipdQffbKLX0/7dBQ==",
+      "version": "7.23.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.23.3.tgz",
+      "integrity": "sha512-zHsy9iXX2nIsCBFPud3jKn1IRPWg3Ing1qOZgeKV39m1ZgIdpJqvlWVeiHBZC6ITRG0MfskhYe9cLgntfSFPIg==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-module-transforms": "^7.22.5",
+        "@babel/helper-module-transforms": "^7.23.3",
         "@babel/helper-plugin-utils": "^7.22.5"
       },
       "engines": {
@@ -1383,9 +1399,9 @@
       }
     },
     "node_modules/@babel/plugin-transform-new-target": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.22.5.tgz",
-      "integrity": "sha512-AsF7K0Fx/cNKVyk3a+DW0JLo+Ua598/NxMRvxDnkpCIGFh43+h/v2xyhRUYf6oD8gE4QtL83C7zZVghMjHd+iw==",
+      "version": "7.23.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.23.3.tgz",
+      "integrity": "sha512-YJ3xKqtJMAT5/TIZnpAR3I+K+WaDowYbN3xyxI8zxx/Gsypwf9B9h0VB+1Nh6ACAAPRS5NSRje0uVv5i79HYGQ==",
       "dev": true,
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.22.5"
@@ -1398,9 +1414,9 @@
       }
     },
     "node_modules/@babel/plugin-transform-nullish-coalescing-operator": {
-      "version": "7.22.11",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-nullish-coalescing-operator/-/plugin-transform-nullish-coalescing-operator-7.22.11.tgz",
-      "integrity": "sha512-YZWOw4HxXrotb5xsjMJUDlLgcDXSfO9eCmdl1bgW4+/lAGdkjaEvOnQ4p5WKKdUgSzO39dgPl0pTnfxm0OAXcg==",
+      "version": "7.23.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-nullish-coalescing-operator/-/plugin-transform-nullish-coalescing-operator-7.23.3.tgz",
+      "integrity": "sha512-xzg24Lnld4DYIdysyf07zJ1P+iIfJpxtVFOzX4g+bsJ3Ng5Le7rXx9KwqKzuyaUeRnt+I1EICwQITqc0E2PmpA==",
       "dev": true,
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.22.5",
@@ -1414,9 +1430,9 @@
       }
     },
     "node_modules/@babel/plugin-transform-numeric-separator": {
-      "version": "7.22.11",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-numeric-separator/-/plugin-transform-numeric-separator-7.22.11.tgz",
-      "integrity": "sha512-3dzU4QGPsILdJbASKhF/V2TVP+gJya1PsueQCxIPCEcerqF21oEcrob4mzjsp2Py/1nLfF5m+xYNMDpmA8vffg==",
+      "version": "7.23.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-numeric-separator/-/plugin-transform-numeric-separator-7.23.3.tgz",
+      "integrity": "sha512-s9GO7fIBi/BLsZ0v3Rftr6Oe4t0ctJ8h4CCXfPoEJwmvAPMyNrfkOOJzm6b9PX9YXcCJWWQd/sBF/N26eBiMVw==",
       "dev": true,
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.22.5",
@@ -1430,16 +1446,16 @@
       }
     },
     "node_modules/@babel/plugin-transform-object-rest-spread": {
-      "version": "7.22.15",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-rest-spread/-/plugin-transform-object-rest-spread-7.22.15.tgz",
-      "integrity": "sha512-fEB+I1+gAmfAyxZcX1+ZUwLeAuuf8VIg67CTznZE0MqVFumWkh8xWtn58I4dxdVf080wn7gzWoF8vndOViJe9Q==",
+      "version": "7.23.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-rest-spread/-/plugin-transform-object-rest-spread-7.23.3.tgz",
+      "integrity": "sha512-VxHt0ANkDmu8TANdE9Kc0rndo/ccsmfe2Cx2y5sI4hu3AukHQ5wAu4cM7j3ba8B9548ijVyclBU+nuDQftZsog==",
       "dev": true,
       "dependencies": {
-        "@babel/compat-data": "^7.22.9",
+        "@babel/compat-data": "^7.23.3",
         "@babel/helper-compilation-targets": "^7.22.15",
         "@babel/helper-plugin-utils": "^7.22.5",
         "@babel/plugin-syntax-object-rest-spread": "^7.8.3",
-        "@babel/plugin-transform-parameters": "^7.22.15"
+        "@babel/plugin-transform-parameters": "^7.23.3"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1449,13 +1465,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-object-super": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.22.5.tgz",
-      "integrity": "sha512-klXqyaT9trSjIUrcsYIfETAzmOEZL3cBYqOYLJxBHfMFFggmXOv+NYSX/Jbs9mzMVESw/WycLFPRx8ba/b2Ipw==",
+      "version": "7.23.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.23.3.tgz",
+      "integrity": "sha512-BwQ8q0x2JG+3lxCVFohg+KbQM7plfpBwThdW9A6TMtWwLsbDA01Ek2Zb/AgDN39BiZsExm4qrXxjk+P1/fzGrA==",
       "dev": true,
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.22.5",
-        "@babel/helper-replace-supers": "^7.22.5"
+        "@babel/helper-replace-supers": "^7.22.20"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1465,9 +1481,9 @@
       }
     },
     "node_modules/@babel/plugin-transform-optional-catch-binding": {
-      "version": "7.22.11",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-optional-catch-binding/-/plugin-transform-optional-catch-binding-7.22.11.tgz",
-      "integrity": "sha512-rli0WxesXUeCJnMYhzAglEjLWVDF6ahb45HuprcmQuLidBJFWjNnOzssk2kuc6e33FlLaiZhG/kUIzUMWdBKaQ==",
+      "version": "7.23.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-optional-catch-binding/-/plugin-transform-optional-catch-binding-7.23.3.tgz",
+      "integrity": "sha512-LxYSb0iLjUamfm7f1D7GpiS4j0UAC8AOiehnsGAP8BEsIX8EOi3qV6bbctw8M7ZvLtcoZfZX5Z7rN9PlWk0m5A==",
       "dev": true,
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.22.5",
@@ -1481,9 +1497,9 @@
       }
     },
     "node_modules/@babel/plugin-transform-optional-chaining": {
-      "version": "7.23.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-optional-chaining/-/plugin-transform-optional-chaining-7.23.0.tgz",
-      "integrity": "sha512-sBBGXbLJjxTzLBF5rFWaikMnOGOk/BmK6vVByIdEggZ7Vn6CvWXZyRkkLFK6WE0IF8jSliyOkUN6SScFgzCM0g==",
+      "version": "7.23.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-optional-chaining/-/plugin-transform-optional-chaining-7.23.3.tgz",
+      "integrity": "sha512-zvL8vIfIUgMccIAK1lxjvNv572JHFJIKb4MWBz5OGdBQA0fB0Xluix5rmOby48exiJc987neOmP/m9Fnpkz3Tg==",
       "dev": true,
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.22.5",
@@ -1498,9 +1514,9 @@
       }
     },
     "node_modules/@babel/plugin-transform-parameters": {
-      "version": "7.22.15",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.22.15.tgz",
-      "integrity": "sha512-hjk7qKIqhyzhhUvRT683TYQOFa/4cQKwQy7ALvTpODswN40MljzNDa0YldevS6tGbxwaEKVn502JmY0dP7qEtQ==",
+      "version": "7.23.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.23.3.tgz",
+      "integrity": "sha512-09lMt6UsUb3/34BbECKVbVwrT9bO6lILWln237z7sLaWnMsTi7Yc9fhX5DLpkJzAGfaReXI22wP41SZmnAA3Vw==",
       "dev": true,
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.22.5"
@@ -1513,12 +1529,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-private-methods": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-private-methods/-/plugin-transform-private-methods-7.22.5.tgz",
-      "integrity": "sha512-PPjh4gyrQnGe97JTalgRGMuU4icsZFnWkzicB/fUtzlKUqvsWBKEpPPfr5a2JiyirZkHxnAqkQMO5Z5B2kK3fA==",
+      "version": "7.23.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-private-methods/-/plugin-transform-private-methods-7.23.3.tgz",
+      "integrity": "sha512-UzqRcRtWsDMTLrRWFvUBDwmw06tCQH9Rl1uAjfh6ijMSmGYQ+fpdB+cnqRC8EMh5tuuxSv0/TejGL+7vyj+50g==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-create-class-features-plugin": "^7.22.5",
+        "@babel/helper-create-class-features-plugin": "^7.22.15",
         "@babel/helper-plugin-utils": "^7.22.5"
       },
       "engines": {
@@ -1529,13 +1545,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-private-property-in-object": {
-      "version": "7.22.11",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-private-property-in-object/-/plugin-transform-private-property-in-object-7.22.11.tgz",
-      "integrity": "sha512-sSCbqZDBKHetvjSwpyWzhuHkmW5RummxJBVbYLkGkaiTOWGxml7SXt0iWa03bzxFIx7wOj3g/ILRd0RcJKBeSQ==",
+      "version": "7.23.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-private-property-in-object/-/plugin-transform-private-property-in-object-7.23.3.tgz",
+      "integrity": "sha512-a5m2oLNFyje2e/rGKjVfAELTVI5mbA0FeZpBnkOWWV7eSmKQ+T/XW0Vf+29ScLzSxX+rnsarvU0oie/4m6hkxA==",
       "dev": true,
       "dependencies": {
         "@babel/helper-annotate-as-pure": "^7.22.5",
-        "@babel/helper-create-class-features-plugin": "^7.22.11",
+        "@babel/helper-create-class-features-plugin": "^7.22.15",
         "@babel/helper-plugin-utils": "^7.22.5",
         "@babel/plugin-syntax-private-property-in-object": "^7.14.5"
       },
@@ -1547,9 +1563,9 @@
       }
     },
     "node_modules/@babel/plugin-transform-property-literals": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.22.5.tgz",
-      "integrity": "sha512-TiOArgddK3mK/x1Qwf5hay2pxI6wCZnvQqrFSqbtg1GLl2JcNMitVH/YnqjP+M31pLUeTfzY1HAXFDnUBV30rQ==",
+      "version": "7.23.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.23.3.tgz",
+      "integrity": "sha512-jR3Jn3y7cZp4oEWPFAlRsSWjxKe4PZILGBSd4nis1TsC5qeSpb+nrtihJuDhNI7QHiVbUaiXa0X2RZY3/TI6Nw==",
       "dev": true,
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.22.5"
@@ -1562,9 +1578,9 @@
       }
     },
     "node_modules/@babel/plugin-transform-regenerator": {
-      "version": "7.22.10",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.22.10.tgz",
-      "integrity": "sha512-F28b1mDt8KcT5bUyJc/U9nwzw6cV+UmTeRlXYIl2TNqMMJif0Jeey9/RQ3C4NOd2zp0/TRsDns9ttj2L523rsw==",
+      "version": "7.23.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.23.3.tgz",
+      "integrity": "sha512-KP+75h0KghBMcVpuKisx3XTu9Ncut8Q8TuvGO4IhY+9D5DFEckQefOuIsB/gQ2tG71lCke4NMrtIPS8pOj18BQ==",
       "dev": true,
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.22.5",
@@ -1578,9 +1594,9 @@
       }
     },
     "node_modules/@babel/plugin-transform-reserved-words": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.22.5.tgz",
-      "integrity": "sha512-DTtGKFRQUDm8svigJzZHzb/2xatPc6TzNvAIJ5GqOKDsGFYgAskjRulbR/vGsPKq3OPqtexnz327qYpP57RFyA==",
+      "version": "7.23.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.23.3.tgz",
+      "integrity": "sha512-QnNTazY54YqgGxwIexMZva9gqbPa15t/x9VS+0fsEFWplwVpXYZivtgl43Z1vMpc1bdPP2PP8siFeVcnFvA3Cg==",
       "dev": true,
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.22.5"
@@ -1624,9 +1640,9 @@
       }
     },
     "node_modules/@babel/plugin-transform-shorthand-properties": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.22.5.tgz",
-      "integrity": "sha512-vM4fq9IXHscXVKzDv5itkO1X52SmdFBFcMIBZ2FRn2nqVYqw6dBexUgMvAjHW+KXpPPViD/Yo3GrDEBaRC0QYA==",
+      "version": "7.23.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.23.3.tgz",
+      "integrity": "sha512-ED2fgqZLmexWiN+YNFX26fx4gh5qHDhn1O2gvEhreLW2iI63Sqm4llRLCXALKrCnbN4Jy0VcMQZl/SAzqug/jg==",
       "dev": true,
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.22.5"
@@ -1639,9 +1655,9 @@
       }
     },
     "node_modules/@babel/plugin-transform-spread": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.22.5.tgz",
-      "integrity": "sha512-5ZzDQIGyvN4w8+dMmpohL6MBo+l2G7tfC/O2Dg7/hjpgeWvUx8FzfeOKxGog9IimPa4YekaQ9PlDqTLOljkcxg==",
+      "version": "7.23.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.23.3.tgz",
+      "integrity": "sha512-VvfVYlrlBVu+77xVTOAoxQ6mZbnIq5FM0aGBSFEcIh03qHf+zNqA4DC/3XMUozTg7bZV3e3mZQ0i13VB6v5yUg==",
       "dev": true,
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.22.5",
@@ -1655,9 +1671,9 @@
       }
     },
     "node_modules/@babel/plugin-transform-sticky-regex": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.22.5.tgz",
-      "integrity": "sha512-zf7LuNpHG0iEeiyCNwX4j3gDg1jgt1k3ZdXBKbZSoA3BbGQGvMiSvfbZRR3Dr3aeJe3ooWFZxOOG3IRStYp2Bw==",
+      "version": "7.23.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.23.3.tgz",
+      "integrity": "sha512-HZOyN9g+rtvnOU3Yh7kSxXrKbzgrm5X4GncPY1QOquu7epga5MxKHVpYu2hvQnry/H+JjckSYRb93iNfsioAGg==",
       "dev": true,
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.22.5"
@@ -1670,9 +1686,9 @@
       }
     },
     "node_modules/@babel/plugin-transform-template-literals": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.22.5.tgz",
-      "integrity": "sha512-5ciOehRNf+EyUeewo8NkbQiUs4d6ZxiHo6BcBcnFlgiJfu16q0bQUw9Jvo0b0gBKFG1SMhDSjeKXSYuJLeFSMA==",
+      "version": "7.23.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.23.3.tgz",
+      "integrity": "sha512-Flok06AYNp7GV2oJPZZcP9vZdszev6vPBkHLwxwSpaIqx75wn6mUd3UFWsSsA0l8nXAKkyCmL/sR02m8RYGeHg==",
       "dev": true,
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.22.5"
@@ -1685,9 +1701,9 @@
       }
     },
     "node_modules/@babel/plugin-transform-typeof-symbol": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.22.5.tgz",
-      "integrity": "sha512-bYkI5lMzL4kPii4HHEEChkD0rkc+nvnlR6+o/qdqR6zrm0Sv/nodmyLhlq2DO0YKLUNd2VePmPRjJXSBh9OIdA==",
+      "version": "7.23.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.23.3.tgz",
+      "integrity": "sha512-4t15ViVnaFdrPC74be1gXBSMzXk3B4Us9lP7uLRQHTFpV5Dvt33pn+2MyyNxmN3VTTm3oTrZVMUmuw3oBnQ2oQ==",
       "dev": true,
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.22.5"
@@ -1700,9 +1716,9 @@
       }
     },
     "node_modules/@babel/plugin-transform-unicode-escapes": {
-      "version": "7.22.10",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.22.10.tgz",
-      "integrity": "sha512-lRfaRKGZCBqDlRU3UIFovdp9c9mEvlylmpod0/OatICsSfuQ9YFthRo1tpTkGsklEefZdqlEFdY4A2dwTb6ohg==",
+      "version": "7.23.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.23.3.tgz",
+      "integrity": "sha512-OMCUx/bU6ChE3r4+ZdylEqAjaQgHAgipgW8nsCfu5pGqDcFytVd91AwRvUJSBZDz0exPGgnjoqhgRYLRjFZc9Q==",
       "dev": true,
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.22.5"
@@ -1715,12 +1731,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-unicode-property-regex": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-property-regex/-/plugin-transform-unicode-property-regex-7.22.5.tgz",
-      "integrity": "sha512-HCCIb+CbJIAE6sXn5CjFQXMwkCClcOfPCzTlilJ8cUatfzwHlWQkbtV0zD338u9dZskwvuOYTuuaMaA8J5EI5A==",
+      "version": "7.23.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-property-regex/-/plugin-transform-unicode-property-regex-7.23.3.tgz",
+      "integrity": "sha512-KcLIm+pDZkWZQAFJ9pdfmh89EwVfmNovFBcXko8szpBeF8z68kWIPeKlmSOkT9BXJxs2C0uk+5LxoxIv62MROA==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-create-regexp-features-plugin": "^7.22.5",
+        "@babel/helper-create-regexp-features-plugin": "^7.22.15",
         "@babel/helper-plugin-utils": "^7.22.5"
       },
       "engines": {
@@ -1731,12 +1747,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-unicode-regex": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.22.5.tgz",
-      "integrity": "sha512-028laaOKptN5vHJf9/Arr/HiJekMd41hOEZYvNsrsXqJ7YPYuX2bQxh31fkZzGmq3YqHRJzYFFAVYvKfMPKqyg==",
+      "version": "7.23.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.23.3.tgz",
+      "integrity": "sha512-wMHpNA4x2cIA32b/ci3AfwNgheiva2W0WUKWTK7vBHBhDKfPsc5cFGNWm69WBqpwd86u1qwZ9PWevKqm1A3yAw==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-create-regexp-features-plugin": "^7.22.5",
+        "@babel/helper-create-regexp-features-plugin": "^7.22.15",
         "@babel/helper-plugin-utils": "^7.22.5"
       },
       "engines": {
@@ -1747,12 +1763,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-unicode-sets-regex": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-sets-regex/-/plugin-transform-unicode-sets-regex-7.22.5.tgz",
-      "integrity": "sha512-lhMfi4FC15j13eKrh3DnYHjpGj6UKQHtNKTbtc1igvAhRy4+kLhV07OpLcsN0VgDEw/MjAvJO4BdMJsHwMhzCg==",
+      "version": "7.23.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-sets-regex/-/plugin-transform-unicode-sets-regex-7.23.3.tgz",
+      "integrity": "sha512-W7lliA/v9bNR83Qc3q1ip9CQMZ09CcHDbHfbLRDNuAhn1Mvkr1ZNF7hPmztMQvtTGVLJ9m8IZqWsTkXOml8dbw==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-create-regexp-features-plugin": "^7.22.5",
+        "@babel/helper-create-regexp-features-plugin": "^7.22.15",
         "@babel/helper-plugin-utils": "^7.22.5"
       },
       "engines": {
@@ -1763,25 +1779,26 @@
       }
     },
     "node_modules/@babel/preset-env": {
-      "version": "7.23.2",
-      "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.23.2.tgz",
-      "integrity": "sha512-BW3gsuDD+rvHL2VO2SjAUNTBe5YrjsTiDyqamPDWY723na3/yPQ65X5oQkFVJZ0o50/2d+svm1rkPoJeR1KxVQ==",
+      "version": "7.23.3",
+      "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.23.3.tgz",
+      "integrity": "sha512-ovzGc2uuyNfNAs/jyjIGxS8arOHS5FENZaNn4rtE7UdKMMkqHCvboHfcuhWLZNX5cB44QfcGNWjaevxMzzMf+Q==",
       "dev": true,
       "dependencies": {
-        "@babel/compat-data": "^7.23.2",
+        "@babel/compat-data": "^7.23.3",
         "@babel/helper-compilation-targets": "^7.22.15",
         "@babel/helper-plugin-utils": "^7.22.5",
         "@babel/helper-validator-option": "^7.22.15",
-        "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": "^7.22.15",
-        "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": "^7.22.15",
+        "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": "^7.23.3",
+        "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": "^7.23.3",
+        "@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly": "^7.23.3",
         "@babel/plugin-proposal-private-property-in-object": "7.21.0-placeholder-for-preset-env.2",
         "@babel/plugin-syntax-async-generators": "^7.8.4",
         "@babel/plugin-syntax-class-properties": "^7.12.13",
         "@babel/plugin-syntax-class-static-block": "^7.14.5",
         "@babel/plugin-syntax-dynamic-import": "^7.8.3",
         "@babel/plugin-syntax-export-namespace-from": "^7.8.3",
-        "@babel/plugin-syntax-import-assertions": "^7.22.5",
-        "@babel/plugin-syntax-import-attributes": "^7.22.5",
+        "@babel/plugin-syntax-import-assertions": "^7.23.3",
+        "@babel/plugin-syntax-import-attributes": "^7.23.3",
         "@babel/plugin-syntax-import-meta": "^7.10.4",
         "@babel/plugin-syntax-json-strings": "^7.8.3",
         "@babel/plugin-syntax-logical-assignment-operators": "^7.10.4",
@@ -1793,56 +1810,55 @@
         "@babel/plugin-syntax-private-property-in-object": "^7.14.5",
         "@babel/plugin-syntax-top-level-await": "^7.14.5",
         "@babel/plugin-syntax-unicode-sets-regex": "^7.18.6",
-        "@babel/plugin-transform-arrow-functions": "^7.22.5",
-        "@babel/plugin-transform-async-generator-functions": "^7.23.2",
-        "@babel/plugin-transform-async-to-generator": "^7.22.5",
-        "@babel/plugin-transform-block-scoped-functions": "^7.22.5",
-        "@babel/plugin-transform-block-scoping": "^7.23.0",
-        "@babel/plugin-transform-class-properties": "^7.22.5",
-        "@babel/plugin-transform-class-static-block": "^7.22.11",
-        "@babel/plugin-transform-classes": "^7.22.15",
-        "@babel/plugin-transform-computed-properties": "^7.22.5",
-        "@babel/plugin-transform-destructuring": "^7.23.0",
-        "@babel/plugin-transform-dotall-regex": "^7.22.5",
-        "@babel/plugin-transform-duplicate-keys": "^7.22.5",
-        "@babel/plugin-transform-dynamic-import": "^7.22.11",
-        "@babel/plugin-transform-exponentiation-operator": "^7.22.5",
-        "@babel/plugin-transform-export-namespace-from": "^7.22.11",
-        "@babel/plugin-transform-for-of": "^7.22.15",
-        "@babel/plugin-transform-function-name": "^7.22.5",
-        "@babel/plugin-transform-json-strings": "^7.22.11",
-        "@babel/plugin-transform-literals": "^7.22.5",
-        "@babel/plugin-transform-logical-assignment-operators": "^7.22.11",
-        "@babel/plugin-transform-member-expression-literals": "^7.22.5",
-        "@babel/plugin-transform-modules-amd": "^7.23.0",
-        "@babel/plugin-transform-modules-commonjs": "^7.23.0",
-        "@babel/plugin-transform-modules-systemjs": "^7.23.0",
-        "@babel/plugin-transform-modules-umd": "^7.22.5",
+        "@babel/plugin-transform-arrow-functions": "^7.23.3",
+        "@babel/plugin-transform-async-generator-functions": "^7.23.3",
+        "@babel/plugin-transform-async-to-generator": "^7.23.3",
+        "@babel/plugin-transform-block-scoped-functions": "^7.23.3",
+        "@babel/plugin-transform-block-scoping": "^7.23.3",
+        "@babel/plugin-transform-class-properties": "^7.23.3",
+        "@babel/plugin-transform-class-static-block": "^7.23.3",
+        "@babel/plugin-transform-classes": "^7.23.3",
+        "@babel/plugin-transform-computed-properties": "^7.23.3",
+        "@babel/plugin-transform-destructuring": "^7.23.3",
+        "@babel/plugin-transform-dotall-regex": "^7.23.3",
+        "@babel/plugin-transform-duplicate-keys": "^7.23.3",
+        "@babel/plugin-transform-dynamic-import": "^7.23.3",
+        "@babel/plugin-transform-exponentiation-operator": "^7.23.3",
+        "@babel/plugin-transform-export-namespace-from": "^7.23.3",
+        "@babel/plugin-transform-for-of": "^7.23.3",
+        "@babel/plugin-transform-function-name": "^7.23.3",
+        "@babel/plugin-transform-json-strings": "^7.23.3",
+        "@babel/plugin-transform-literals": "^7.23.3",
+        "@babel/plugin-transform-logical-assignment-operators": "^7.23.3",
+        "@babel/plugin-transform-member-expression-literals": "^7.23.3",
+        "@babel/plugin-transform-modules-amd": "^7.23.3",
+        "@babel/plugin-transform-modules-commonjs": "^7.23.3",
+        "@babel/plugin-transform-modules-systemjs": "^7.23.3",
+        "@babel/plugin-transform-modules-umd": "^7.23.3",
         "@babel/plugin-transform-named-capturing-groups-regex": "^7.22.5",
-        "@babel/plugin-transform-new-target": "^7.22.5",
-        "@babel/plugin-transform-nullish-coalescing-operator": "^7.22.11",
-        "@babel/plugin-transform-numeric-separator": "^7.22.11",
-        "@babel/plugin-transform-object-rest-spread": "^7.22.15",
-        "@babel/plugin-transform-object-super": "^7.22.5",
-        "@babel/plugin-transform-optional-catch-binding": "^7.22.11",
-        "@babel/plugin-transform-optional-chaining": "^7.23.0",
-        "@babel/plugin-transform-parameters": "^7.22.15",
-        "@babel/plugin-transform-private-methods": "^7.22.5",
-        "@babel/plugin-transform-private-property-in-object": "^7.22.11",
-        "@babel/plugin-transform-property-literals": "^7.22.5",
-        "@babel/plugin-transform-regenerator": "^7.22.10",
-        "@babel/plugin-transform-reserved-words": "^7.22.5",
-        "@babel/plugin-transform-shorthand-properties": "^7.22.5",
-        "@babel/plugin-transform-spread": "^7.22.5",
-        "@babel/plugin-transform-sticky-regex": "^7.22.5",
-        "@babel/plugin-transform-template-literals": "^7.22.5",
-        "@babel/plugin-transform-typeof-symbol": "^7.22.5",
-        "@babel/plugin-transform-unicode-escapes": "^7.22.10",
-        "@babel/plugin-transform-unicode-property-regex": "^7.22.5",
-        "@babel/plugin-transform-unicode-regex": "^7.22.5",
-        "@babel/plugin-transform-unicode-sets-regex": "^7.22.5",
+        "@babel/plugin-transform-new-target": "^7.23.3",
+        "@babel/plugin-transform-nullish-coalescing-operator": "^7.23.3",
+        "@babel/plugin-transform-numeric-separator": "^7.23.3",
+        "@babel/plugin-transform-object-rest-spread": "^7.23.3",
+        "@babel/plugin-transform-object-super": "^7.23.3",
+        "@babel/plugin-transform-optional-catch-binding": "^7.23.3",
+        "@babel/plugin-transform-optional-chaining": "^7.23.3",
+        "@babel/plugin-transform-parameters": "^7.23.3",
+        "@babel/plugin-transform-private-methods": "^7.23.3",
+        "@babel/plugin-transform-private-property-in-object": "^7.23.3",
+        "@babel/plugin-transform-property-literals": "^7.23.3",
+        "@babel/plugin-transform-regenerator": "^7.23.3",
+        "@babel/plugin-transform-reserved-words": "^7.23.3",
+        "@babel/plugin-transform-shorthand-properties": "^7.23.3",
+        "@babel/plugin-transform-spread": "^7.23.3",
+        "@babel/plugin-transform-sticky-regex": "^7.23.3",
+        "@babel/plugin-transform-template-literals": "^7.23.3",
+        "@babel/plugin-transform-typeof-symbol": "^7.23.3",
+        "@babel/plugin-transform-unicode-escapes": "^7.23.3",
+        "@babel/plugin-transform-unicode-property-regex": "^7.23.3",
+        "@babel/plugin-transform-unicode-regex": "^7.23.3",
+        "@babel/plugin-transform-unicode-sets-regex": "^7.23.3",
         "@babel/preset-modules": "0.1.6-no-external-plugins",
-        "@babel/types": "^7.23.0",
         "babel-plugin-polyfill-corejs2": "^0.4.6",
         "babel-plugin-polyfill-corejs3": "^0.8.5",
         "babel-plugin-polyfill-regenerator": "^0.5.3",
@@ -17966,9 +17982,9 @@
       }
     },
     "@babel/compat-data": {
-      "version": "7.23.2",
-      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.23.2.tgz",
-      "integrity": "sha512-0S9TQMmDHlqAZ2ITT95irXKfxN9bncq8ZCoJhun3nHL/lLUxd2NKBJYoNGWH7S0hz6fRQwWlAWn/ILM0C70KZQ=="
+      "version": "7.23.3",
+      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.23.3.tgz",
+      "integrity": "sha512-BmR4bWbDIoFJmJ9z2cZ8Gmm2MXgEDgjdWgpKmKWUt54UGFJdlj31ECtbaDvCG/qVdG3AQ1SfpZEs01lUFbzLOQ=="
     },
     "@babel/core": {
       "version": "7.23.3",
@@ -18019,12 +18035,12 @@
       }
     },
     "@babel/helper-builder-binary-assignment-operator-visitor": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.22.5.tgz",
-      "integrity": "sha512-m1EP3lVOPptR+2DwD125gziZNcmoNSHGmJROKoy87loWUQyJaVXDgpmruWqDARZSmtYQ+Dl25okU8+qhVzuykw==",
+      "version": "7.22.15",
+      "resolved": "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.22.15.tgz",
+      "integrity": "sha512-QkBXwGgaoC2GtGZRoma6kv7Szfv06khvhFav67ZExau2RaXzy8MpHSMO2PNoP2XtmQphJQRHFfg77Bq731Yizw==",
       "dev": true,
       "requires": {
-        "@babel/types": "^7.22.5"
+        "@babel/types": "^7.22.15"
       }
     },
     "@babel/helper-compilation-targets": {
@@ -18055,15 +18071,15 @@
       }
     },
     "@babel/helper-create-class-features-plugin": {
-      "version": "7.22.11",
-      "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.22.11.tgz",
-      "integrity": "sha512-y1grdYL4WzmUDBRGK0pDbIoFd7UZKoDurDzWEoNMYoj1EL+foGRQNyPWDcC+YyegN5y1DUsFFmzjGijB3nSVAQ==",
+      "version": "7.22.15",
+      "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.22.15.tgz",
+      "integrity": "sha512-jKkwA59IXcvSaiK2UN45kKwSC9o+KuoXsBDvHvU/7BecYIp8GQ2UwrVvFgJASUT+hBnwJx6MhvMCuMzwZZ7jlg==",
       "dev": true,
       "requires": {
         "@babel/helper-annotate-as-pure": "^7.22.5",
         "@babel/helper-environment-visitor": "^7.22.5",
         "@babel/helper-function-name": "^7.22.5",
-        "@babel/helper-member-expression-to-functions": "^7.22.5",
+        "@babel/helper-member-expression-to-functions": "^7.22.15",
         "@babel/helper-optimise-call-expression": "^7.22.5",
         "@babel/helper-replace-supers": "^7.22.9",
         "@babel/helper-skip-transparent-expression-wrappers": "^7.22.5",
@@ -18072,14 +18088,14 @@
       }
     },
     "@babel/helper-create-regexp-features-plugin": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.22.5.tgz",
-      "integrity": "sha512-1VpEFOIbMRaXyDeUwUfmTIxExLwQ+zkW+Bh5zXpApA3oQedBx9v/updixWxnx/bZpKw7u8VxWjb/qWpIcmPq8A==",
+      "version": "7.22.15",
+      "resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.22.15.tgz",
+      "integrity": "sha512-29FkPLFjn4TPEa3RE7GpW+qbE8tlsu3jntNYNfcGsc49LphF1PQIiD+vMZ1z1xVOKt+93khA9tc2JBs3kBjA7w==",
       "dev": true,
       "requires": {
         "@babel/helper-annotate-as-pure": "^7.22.5",
         "regexpu-core": "^5.3.1",
-        "semver": "^6.3.0"
+        "semver": "^6.3.1"
       }
     },
     "@babel/helper-define-polyfill-provider": {
@@ -18118,12 +18134,12 @@
       }
     },
     "@babel/helper-member-expression-to-functions": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.22.5.tgz",
-      "integrity": "sha512-aBiH1NKMG0H2cGZqspNvsaBe6wNGjbJjuLy29aU+eDZjSbbN53BaxlpB02xm9v34pLTZ1nIQPFYn2qMZoa5BQQ==",
+      "version": "7.23.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.23.0.tgz",
+      "integrity": "sha512-6gfrPwh7OuT6gZyJZvd6WbTfrqAo7vm4xCzAXOusKqq/vWdKXphTpj5klHKNmRUU6/QRGlBsyU9mAIPaWHlqJA==",
       "dev": true,
       "requires": {
-        "@babel/types": "^7.22.5"
+        "@babel/types": "^7.23.0"
       }
     },
     "@babel/helper-module-imports": {
@@ -18172,13 +18188,13 @@
       }
     },
     "@babel/helper-replace-supers": {
-      "version": "7.22.9",
-      "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.22.9.tgz",
-      "integrity": "sha512-LJIKvvpgPOPUThdYqcX6IXRuIcTkcAub0IaDRGCZH0p5GPUp7PhRU9QVgFcDDd51BaPkk77ZjqFwh6DZTAEmGg==",
+      "version": "7.22.20",
+      "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.22.20.tgz",
+      "integrity": "sha512-qsW0In3dbwQUbK8kejJ4R7IHVGwHJlV6lpG6UA7a9hSa2YEiAib+N1T2kr6PEeUT+Fl7najmSOS6SmAwCHK6Tw==",
       "dev": true,
       "requires": {
-        "@babel/helper-environment-visitor": "^7.22.5",
-        "@babel/helper-member-expression-to-functions": "^7.22.5",
+        "@babel/helper-environment-visitor": "^7.22.20",
+        "@babel/helper-member-expression-to-functions": "^7.22.15",
         "@babel/helper-optimise-call-expression": "^7.22.5"
       }
     },
@@ -18259,23 +18275,33 @@
       "integrity": "sha512-uVsWNvlVsIninV2prNz/3lHCb+5CJ+e+IUBfbjToAHODtfGYLfCFuY4AU7TskI+dAKk+njsPiBjq1gKTvZOBaw=="
     },
     "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": {
-      "version": "7.22.15",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.22.15.tgz",
-      "integrity": "sha512-FB9iYlz7rURmRJyXRKEnalYPPdn87H5no108cyuQQyMwlpJ2SJtpIUBI27kdTin956pz+LPypkPVPUTlxOmrsg==",
+      "version": "7.23.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.23.3.tgz",
+      "integrity": "sha512-iRkKcCqb7iGnq9+3G6rZ+Ciz5VywC4XNRHe57lKM+jOeYAoR0lVqdeeDRfh0tQcTfw/+vBhHn926FmQhLtlFLQ==",
       "dev": true,
       "requires": {
         "@babel/helper-plugin-utils": "^7.22.5"
       }
     },
     "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": {
-      "version": "7.22.15",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.22.15.tgz",
-      "integrity": "sha512-Hyph9LseGvAeeXzikV88bczhsrLrIZqDPxO+sSmAunMPaGrBGhfMWzCPYTtiW9t+HzSE2wtV8e5cc5P6r1xMDQ==",
+      "version": "7.23.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.23.3.tgz",
+      "integrity": "sha512-WwlxbfMNdVEpQjZmK5mhm7oSwD3dS6eU+Iwsi4Knl9wAletWem7kaRsGOG+8UEbRyqxY4SS5zvtfXwX+jMxUwQ==",
       "dev": true,
       "requires": {
         "@babel/helper-plugin-utils": "^7.22.5",
         "@babel/helper-skip-transparent-expression-wrappers": "^7.22.5",
-        "@babel/plugin-transform-optional-chaining": "^7.22.15"
+        "@babel/plugin-transform-optional-chaining": "^7.23.3"
+      }
+    },
+    "@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly": {
+      "version": "7.23.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly/-/plugin-bugfix-v8-static-class-fields-redefine-readonly-7.23.3.tgz",
+      "integrity": "sha512-XaJak1qcityzrX0/IU5nKHb34VaibwP3saKqG6a/tppelgllOH13LUann4ZCIBcVOeE6H18K4Vx9QKkVww3z/w==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-environment-visitor": "^7.22.20",
+        "@babel/helper-plugin-utils": "^7.22.5"
       }
     },
     "@babel/plugin-proposal-private-property-in-object": {
@@ -18340,18 +18366,18 @@
       }
     },
     "@babel/plugin-syntax-import-assertions": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.22.5.tgz",
-      "integrity": "sha512-rdV97N7KqsRzeNGoWUOK6yUsWarLjE5Su/Snk9IYPU9CwkWHs4t+rTGOvffTR8XGkJMTAdLfO0xVnXm8wugIJg==",
+      "version": "7.23.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.23.3.tgz",
+      "integrity": "sha512-lPgDSU+SJLK3xmFDTV2ZRQAiM7UuUjGidwBywFavObCiZc1BeAAcMtHJKUya92hPHO+at63JJPLygilZard8jw==",
       "dev": true,
       "requires": {
         "@babel/helper-plugin-utils": "^7.22.5"
       }
     },
     "@babel/plugin-syntax-import-attributes": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-attributes/-/plugin-syntax-import-attributes-7.22.5.tgz",
-      "integrity": "sha512-KwvoWDeNKPETmozyFE0P2rOLqh39EoQHNjqizrI5B8Vt0ZNS7M56s7dAiAqbYfiAYOuIzIh96z3iR2ktgu3tEg==",
+      "version": "7.23.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-attributes/-/plugin-syntax-import-attributes-7.23.3.tgz",
+      "integrity": "sha512-pawnE0P9g10xgoP7yKr6CK63K2FMsTE+FZidZO/1PwRdzmAPVs+HS1mAURUsgaoxammTJvULUdIkEK0gOcU2tA==",
       "dev": true,
       "requires": {
         "@babel/helper-plugin-utils": "^7.22.5"
@@ -18476,18 +18502,18 @@
       }
     },
     "@babel/plugin-transform-arrow-functions": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.22.5.tgz",
-      "integrity": "sha512-26lTNXoVRdAnsaDXPpvCNUq+OVWEVC6bx7Vvz9rC53F2bagUWW4u4ii2+h8Fejfh7RYqPxn+libeFBBck9muEw==",
+      "version": "7.23.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.23.3.tgz",
+      "integrity": "sha512-NzQcQrzaQPkaEwoTm4Mhyl8jI1huEL/WWIEvudjTCMJ9aBZNpsJbMASx7EQECtQQPS/DcnFpo0FIh3LvEO9cxQ==",
       "dev": true,
       "requires": {
         "@babel/helper-plugin-utils": "^7.22.5"
       }
     },
     "@babel/plugin-transform-async-generator-functions": {
-      "version": "7.23.2",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-generator-functions/-/plugin-transform-async-generator-functions-7.23.2.tgz",
-      "integrity": "sha512-BBYVGxbDVHfoeXbOwcagAkOQAm9NxoTdMGfTqghu1GrvadSaw6iW3Je6IcL5PNOw8VwjxqBECXy50/iCQSY/lQ==",
+      "version": "7.23.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-generator-functions/-/plugin-transform-async-generator-functions-7.23.3.tgz",
+      "integrity": "sha512-59GsVNavGxAXCDDbakWSMJhajASb4kBCqDjqJsv+p5nKdbz7istmZ3HrX3L2LuiI80+zsOADCvooqQH3qGCucQ==",
       "dev": true,
       "requires": {
         "@babel/helper-environment-visitor": "^7.22.20",
@@ -18497,114 +18523,114 @@
       }
     },
     "@babel/plugin-transform-async-to-generator": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.22.5.tgz",
-      "integrity": "sha512-b1A8D8ZzE/VhNDoV1MSJTnpKkCG5bJo+19R4o4oy03zM7ws8yEMK755j61Dc3EyvdysbqH5BOOTquJ7ZX9C6vQ==",
+      "version": "7.23.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.23.3.tgz",
+      "integrity": "sha512-A7LFsKi4U4fomjqXJlZg/u0ft/n8/7n7lpffUP/ZULx/DtV9SGlNKZolHH6PE8Xl1ngCc0M11OaeZptXVkfKSw==",
       "dev": true,
       "requires": {
-        "@babel/helper-module-imports": "^7.22.5",
+        "@babel/helper-module-imports": "^7.22.15",
         "@babel/helper-plugin-utils": "^7.22.5",
-        "@babel/helper-remap-async-to-generator": "^7.22.5"
+        "@babel/helper-remap-async-to-generator": "^7.22.20"
       }
     },
     "@babel/plugin-transform-block-scoped-functions": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.22.5.tgz",
-      "integrity": "sha512-tdXZ2UdknEKQWKJP1KMNmuF5Lx3MymtMN/pvA+p/VEkhK8jVcQ1fzSy8KM9qRYhAf2/lV33hoMPKI/xaI9sADA==",
+      "version": "7.23.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.23.3.tgz",
+      "integrity": "sha512-vI+0sIaPIO6CNuM9Kk5VmXcMVRiOpDh7w2zZt9GXzmE/9KD70CUEVhvPR/etAeNK/FAEkhxQtXOzVF3EuRL41A==",
       "dev": true,
       "requires": {
         "@babel/helper-plugin-utils": "^7.22.5"
       }
     },
     "@babel/plugin-transform-block-scoping": {
-      "version": "7.23.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.23.0.tgz",
-      "integrity": "sha512-cOsrbmIOXmf+5YbL99/S49Y3j46k/T16b9ml8bm9lP6N9US5iQ2yBK7gpui1pg0V/WMcXdkfKbTb7HXq9u+v4g==",
+      "version": "7.23.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.23.3.tgz",
+      "integrity": "sha512-QPZxHrThbQia7UdvfpaRRlq/J9ciz1J4go0k+lPBXbgaNeY7IQrBj/9ceWjvMMI07/ZBzHl/F0R/2K0qH7jCVw==",
       "dev": true,
       "requires": {
         "@babel/helper-plugin-utils": "^7.22.5"
       }
     },
     "@babel/plugin-transform-class-properties": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-class-properties/-/plugin-transform-class-properties-7.22.5.tgz",
-      "integrity": "sha512-nDkQ0NfkOhPTq8YCLiWNxp1+f9fCobEjCb0n8WdbNUBc4IB5V7P1QnX9IjpSoquKrXF5SKojHleVNs2vGeHCHQ==",
+      "version": "7.23.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-class-properties/-/plugin-transform-class-properties-7.23.3.tgz",
+      "integrity": "sha512-uM+AN8yCIjDPccsKGlw271xjJtGii+xQIF/uMPS8H15L12jZTsLfF4o5vNO7d/oUguOyfdikHGc/yi9ge4SGIg==",
       "dev": true,
       "requires": {
-        "@babel/helper-create-class-features-plugin": "^7.22.5",
+        "@babel/helper-create-class-features-plugin": "^7.22.15",
         "@babel/helper-plugin-utils": "^7.22.5"
       }
     },
     "@babel/plugin-transform-class-static-block": {
-      "version": "7.22.11",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-class-static-block/-/plugin-transform-class-static-block-7.22.11.tgz",
-      "integrity": "sha512-GMM8gGmqI7guS/llMFk1bJDkKfn3v3C4KHK9Yg1ey5qcHcOlKb0QvcMrgzvxo+T03/4szNh5lghY+fEC98Kq9g==",
+      "version": "7.23.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-class-static-block/-/plugin-transform-class-static-block-7.23.3.tgz",
+      "integrity": "sha512-PENDVxdr7ZxKPyi5Ffc0LjXdnJyrJxyqF5T5YjlVg4a0VFfQHW0r8iAtRiDXkfHlu1wwcvdtnndGYIeJLSuRMQ==",
       "dev": true,
       "requires": {
-        "@babel/helper-create-class-features-plugin": "^7.22.11",
+        "@babel/helper-create-class-features-plugin": "^7.22.15",
         "@babel/helper-plugin-utils": "^7.22.5",
         "@babel/plugin-syntax-class-static-block": "^7.14.5"
       }
     },
     "@babel/plugin-transform-classes": {
-      "version": "7.22.15",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.22.15.tgz",
-      "integrity": "sha512-VbbC3PGjBdE0wAWDdHM9G8Gm977pnYI0XpqMd6LrKISj8/DJXEsWqgRuTYaNE9Bv0JGhTZUzHDlMk18IpOuoqw==",
+      "version": "7.23.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.23.3.tgz",
+      "integrity": "sha512-FGEQmugvAEu2QtgtU0uTASXevfLMFfBeVCIIdcQhn/uBQsMTjBajdnAtanQlOcuihWh10PZ7+HWvc7NtBwP74w==",
       "dev": true,
       "requires": {
         "@babel/helper-annotate-as-pure": "^7.22.5",
         "@babel/helper-compilation-targets": "^7.22.15",
-        "@babel/helper-environment-visitor": "^7.22.5",
-        "@babel/helper-function-name": "^7.22.5",
+        "@babel/helper-environment-visitor": "^7.22.20",
+        "@babel/helper-function-name": "^7.23.0",
         "@babel/helper-optimise-call-expression": "^7.22.5",
         "@babel/helper-plugin-utils": "^7.22.5",
-        "@babel/helper-replace-supers": "^7.22.9",
+        "@babel/helper-replace-supers": "^7.22.20",
         "@babel/helper-split-export-declaration": "^7.22.6",
         "globals": "^11.1.0"
       }
     },
     "@babel/plugin-transform-computed-properties": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.22.5.tgz",
-      "integrity": "sha512-4GHWBgRf0krxPX+AaPtgBAlTgTeZmqDynokHOX7aqqAB4tHs3U2Y02zH6ETFdLZGcg9UQSD1WCmkVrE9ErHeOg==",
+      "version": "7.23.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.23.3.tgz",
+      "integrity": "sha512-dTj83UVTLw/+nbiHqQSFdwO9CbTtwq1DsDqm3CUEtDrZNET5rT5E6bIdTlOftDTDLMYxvxHNEYO4B9SLl8SLZw==",
       "dev": true,
       "requires": {
         "@babel/helper-plugin-utils": "^7.22.5",
-        "@babel/template": "^7.22.5"
+        "@babel/template": "^7.22.15"
       }
     },
     "@babel/plugin-transform-destructuring": {
-      "version": "7.23.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.23.0.tgz",
-      "integrity": "sha512-vaMdgNXFkYrB+8lbgniSYWHsgqK5gjaMNcc84bMIOMRLH0L9AqYq3hwMdvnyqj1OPqea8UtjPEuS/DCenah1wg==",
+      "version": "7.23.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.23.3.tgz",
+      "integrity": "sha512-n225npDqjDIr967cMScVKHXJs7rout1q+tt50inyBCPkyZ8KxeI6d+GIbSBTT/w/9WdlWDOej3V9HE5Lgk57gw==",
       "dev": true,
       "requires": {
         "@babel/helper-plugin-utils": "^7.22.5"
       }
     },
     "@babel/plugin-transform-dotall-regex": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.22.5.tgz",
-      "integrity": "sha512-5/Yk9QxCQCl+sOIB1WelKnVRxTJDSAIxtJLL2/pqL14ZVlbH0fUQUZa/T5/UnQtBNgghR7mfB8ERBKyKPCi7Vw==",
+      "version": "7.23.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.23.3.tgz",
+      "integrity": "sha512-vgnFYDHAKzFaTVp+mneDsIEbnJ2Np/9ng9iviHw3P/KVcgONxpNULEW/51Z/BaFojG2GI2GwwXck5uV1+1NOYQ==",
       "dev": true,
       "requires": {
-        "@babel/helper-create-regexp-features-plugin": "^7.22.5",
+        "@babel/helper-create-regexp-features-plugin": "^7.22.15",
         "@babel/helper-plugin-utils": "^7.22.5"
       }
     },
     "@babel/plugin-transform-duplicate-keys": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.22.5.tgz",
-      "integrity": "sha512-dEnYD+9BBgld5VBXHnF/DbYGp3fqGMsyxKbtD1mDyIA7AkTSpKXFhCVuj/oQVOoALfBs77DudA0BE4d5mcpmqw==",
+      "version": "7.23.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.23.3.tgz",
+      "integrity": "sha512-RrqQ+BQmU3Oyav3J+7/myfvRCq7Tbz+kKLLshUmMwNlDHExbGL7ARhajvoBJEvc+fCguPPu887N+3RRXBVKZUA==",
       "dev": true,
       "requires": {
         "@babel/helper-plugin-utils": "^7.22.5"
       }
     },
     "@babel/plugin-transform-dynamic-import": {
-      "version": "7.22.11",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dynamic-import/-/plugin-transform-dynamic-import-7.22.11.tgz",
-      "integrity": "sha512-g/21plo58sfteWjaO0ZNVb+uEOkJNjAaHhbejrnBmu011l/eNDScmkbjCC3l4FKb10ViaGU4aOkFznSu2zRHgA==",
+      "version": "7.23.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dynamic-import/-/plugin-transform-dynamic-import-7.23.3.tgz",
+      "integrity": "sha512-vTG+cTGxPFou12Rj7ll+eD5yWeNl5/8xvQvF08y5Gv3v4mZQoyFf8/n9zg4q5vvCWt5jmgymfzMAldO7orBn7A==",
       "dev": true,
       "requires": {
         "@babel/helper-plugin-utils": "^7.22.5",
@@ -18612,19 +18638,19 @@
       }
     },
     "@babel/plugin-transform-exponentiation-operator": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.22.5.tgz",
-      "integrity": "sha512-vIpJFNM/FjZ4rh1myqIya9jXwrwwgFRHPjT3DkUA9ZLHuzox8jiXkOLvwm1H+PQIP3CqfC++WPKeuDi0Sjdj1g==",
+      "version": "7.23.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.23.3.tgz",
+      "integrity": "sha512-5fhCsl1odX96u7ILKHBj4/Y8vipoqwsJMh4csSA8qFfxrZDEA4Ssku2DyNvMJSmZNOEBT750LfFPbtrnTP90BQ==",
       "dev": true,
       "requires": {
-        "@babel/helper-builder-binary-assignment-operator-visitor": "^7.22.5",
+        "@babel/helper-builder-binary-assignment-operator-visitor": "^7.22.15",
         "@babel/helper-plugin-utils": "^7.22.5"
       }
     },
     "@babel/plugin-transform-export-namespace-from": {
-      "version": "7.22.11",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-export-namespace-from/-/plugin-transform-export-namespace-from-7.22.11.tgz",
-      "integrity": "sha512-xa7aad7q7OiT8oNZ1mU7NrISjlSkVdMbNxn9IuLZyL9AJEhs1Apba3I+u5riX1dIkdptP5EKDG5XDPByWxtehw==",
+      "version": "7.23.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-export-namespace-from/-/plugin-transform-export-namespace-from-7.23.3.tgz",
+      "integrity": "sha512-yCLhW34wpJWRdTxxWtFZASJisihrfyMOTOQexhVzA78jlU+dH7Dw+zQgcPepQ5F3C6bAIiblZZ+qBggJdHiBAg==",
       "dev": true,
       "requires": {
         "@babel/helper-plugin-utils": "^7.22.5",
@@ -18632,29 +18658,29 @@
       }
     },
     "@babel/plugin-transform-for-of": {
-      "version": "7.22.15",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.22.15.tgz",
-      "integrity": "sha512-me6VGeHsx30+xh9fbDLLPi0J1HzmeIIyenoOQHuw2D4m2SAU3NrspX5XxJLBpqn5yrLzrlw2Iy3RA//Bx27iOA==",
+      "version": "7.23.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.23.3.tgz",
+      "integrity": "sha512-X8jSm8X1CMwxmK878qsUGJRmbysKNbdpTv/O1/v0LuY/ZkZrng5WYiekYSdg9m09OTmDDUWeEDsTE+17WYbAZw==",
       "dev": true,
       "requires": {
         "@babel/helper-plugin-utils": "^7.22.5"
       }
     },
     "@babel/plugin-transform-function-name": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.22.5.tgz",
-      "integrity": "sha512-UIzQNMS0p0HHiQm3oelztj+ECwFnj+ZRV4KnguvlsD2of1whUeM6o7wGNj6oLwcDoAXQ8gEqfgC24D+VdIcevg==",
+      "version": "7.23.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.23.3.tgz",
+      "integrity": "sha512-I1QXp1LxIvt8yLaib49dRW5Okt7Q4oaxao6tFVKS/anCdEOMtYwWVKoiOA1p34GOWIZjUK0E+zCp7+l1pfQyiw==",
       "dev": true,
       "requires": {
-        "@babel/helper-compilation-targets": "^7.22.5",
-        "@babel/helper-function-name": "^7.22.5",
+        "@babel/helper-compilation-targets": "^7.22.15",
+        "@babel/helper-function-name": "^7.23.0",
         "@babel/helper-plugin-utils": "^7.22.5"
       }
     },
     "@babel/plugin-transform-json-strings": {
-      "version": "7.22.11",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-json-strings/-/plugin-transform-json-strings-7.22.11.tgz",
-      "integrity": "sha512-CxT5tCqpA9/jXFlme9xIBCc5RPtdDq3JpkkhgHQqtDdiTnTI0jtZ0QzXhr5DILeYifDPp2wvY2ad+7+hLMW5Pw==",
+      "version": "7.23.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-json-strings/-/plugin-transform-json-strings-7.23.3.tgz",
+      "integrity": "sha512-H9Ej2OiISIZowZHaBwF0tsJOih1PftXJtE8EWqlEIwpc7LMTGq0rPOrywKLQ4nefzx8/HMR0D3JGXoMHYvhi0A==",
       "dev": true,
       "requires": {
         "@babel/helper-plugin-utils": "^7.22.5",
@@ -18662,18 +18688,18 @@
       }
     },
     "@babel/plugin-transform-literals": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.22.5.tgz",
-      "integrity": "sha512-fTLj4D79M+mepcw3dgFBTIDYpbcB9Sm0bpm4ppXPaO+U+PKFFyV9MGRvS0gvGw62sd10kT5lRMKXAADb9pWy8g==",
+      "version": "7.23.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.23.3.tgz",
+      "integrity": "sha512-wZ0PIXRxnwZvl9AYpqNUxpZ5BiTGrYt7kueGQ+N5FiQ7RCOD4cm8iShd6S6ggfVIWaJf2EMk8eRzAh52RfP4rQ==",
       "dev": true,
       "requires": {
         "@babel/helper-plugin-utils": "^7.22.5"
       }
     },
     "@babel/plugin-transform-logical-assignment-operators": {
-      "version": "7.22.11",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-logical-assignment-operators/-/plugin-transform-logical-assignment-operators-7.22.11.tgz",
-      "integrity": "sha512-qQwRTP4+6xFCDV5k7gZBF3C31K34ut0tbEcTKxlX/0KXxm9GLcO14p570aWxFvVzx6QAfPgq7gaeIHXJC8LswQ==",
+      "version": "7.23.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-logical-assignment-operators/-/plugin-transform-logical-assignment-operators-7.23.3.tgz",
+      "integrity": "sha512-+pD5ZbxofyOygEp+zZAfujY2ShNCXRpDRIPOiBmTO693hhyOEteZgl876Xs9SAHPQpcV0vz8LvA/T+w8AzyX8A==",
       "dev": true,
       "requires": {
         "@babel/helper-plugin-utils": "^7.22.5",
@@ -18681,54 +18707,54 @@
       }
     },
     "@babel/plugin-transform-member-expression-literals": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.22.5.tgz",
-      "integrity": "sha512-RZEdkNtzzYCFl9SE9ATaUMTj2hqMb4StarOJLrZRbqqU4HSBE7UlBw9WBWQiDzrJZJdUWiMTVDI6Gv/8DPvfew==",
+      "version": "7.23.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.23.3.tgz",
+      "integrity": "sha512-sC3LdDBDi5x96LA+Ytekz2ZPk8i/Ck+DEuDbRAll5rknJ5XRTSaPKEYwomLcs1AA8wg9b3KjIQRsnApj+q51Ag==",
       "dev": true,
       "requires": {
         "@babel/helper-plugin-utils": "^7.22.5"
       }
     },
     "@babel/plugin-transform-modules-amd": {
-      "version": "7.23.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.23.0.tgz",
-      "integrity": "sha512-xWT5gefv2HGSm4QHtgc1sYPbseOyf+FFDo2JbpE25GWl5BqTGO9IMwTYJRoIdjsF85GE+VegHxSCUt5EvoYTAw==",
+      "version": "7.23.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.23.3.tgz",
+      "integrity": "sha512-vJYQGxeKM4t8hYCKVBlZX/gtIY2I7mRGFNcm85sgXGMTBcoV3QdVtdpbcWEbzbfUIUZKwvgFT82mRvaQIebZzw==",
       "dev": true,
       "requires": {
-        "@babel/helper-module-transforms": "^7.23.0",
+        "@babel/helper-module-transforms": "^7.23.3",
         "@babel/helper-plugin-utils": "^7.22.5"
       }
     },
     "@babel/plugin-transform-modules-commonjs": {
-      "version": "7.23.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.23.0.tgz",
-      "integrity": "sha512-32Xzss14/UVc7k9g775yMIvkVK8xwKE0DPdP5JTapr3+Z9w4tzeOuLNY6BXDQR6BdnzIlXnCGAzsk/ICHBLVWQ==",
+      "version": "7.23.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.23.3.tgz",
+      "integrity": "sha512-aVS0F65LKsdNOtcz6FRCpE4OgsP2OFnW46qNxNIX9h3wuzaNcSQsJysuMwqSibC98HPrf2vCgtxKNwS0DAlgcA==",
       "dev": true,
       "requires": {
-        "@babel/helper-module-transforms": "^7.23.0",
+        "@babel/helper-module-transforms": "^7.23.3",
         "@babel/helper-plugin-utils": "^7.22.5",
         "@babel/helper-simple-access": "^7.22.5"
       }
     },
     "@babel/plugin-transform-modules-systemjs": {
-      "version": "7.23.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.23.0.tgz",
-      "integrity": "sha512-qBej6ctXZD2f+DhlOC9yO47yEYgUh5CZNz/aBoH4j/3NOlRfJXJbY7xDQCqQVf9KbrqGzIWER1f23doHGrIHFg==",
+      "version": "7.23.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.23.3.tgz",
+      "integrity": "sha512-ZxyKGTkF9xT9YJuKQRo19ewf3pXpopuYQd8cDXqNzc3mUNbOME0RKMoZxviQk74hwzfQsEe66dE92MaZbdHKNQ==",
       "dev": true,
       "requires": {
         "@babel/helper-hoist-variables": "^7.22.5",
-        "@babel/helper-module-transforms": "^7.23.0",
+        "@babel/helper-module-transforms": "^7.23.3",
         "@babel/helper-plugin-utils": "^7.22.5",
         "@babel/helper-validator-identifier": "^7.22.20"
       }
     },
     "@babel/plugin-transform-modules-umd": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.22.5.tgz",
-      "integrity": "sha512-+S6kzefN/E1vkSsKx8kmQuqeQsvCKCd1fraCM7zXm4SFoggI099Tr4G8U81+5gtMdUeMQ4ipdQffbKLX0/7dBQ==",
+      "version": "7.23.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.23.3.tgz",
+      "integrity": "sha512-zHsy9iXX2nIsCBFPud3jKn1IRPWg3Ing1qOZgeKV39m1ZgIdpJqvlWVeiHBZC6ITRG0MfskhYe9cLgntfSFPIg==",
       "dev": true,
       "requires": {
-        "@babel/helper-module-transforms": "^7.22.5",
+        "@babel/helper-module-transforms": "^7.23.3",
         "@babel/helper-plugin-utils": "^7.22.5"
       }
     },
@@ -18743,18 +18769,18 @@
       }
     },
     "@babel/plugin-transform-new-target": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.22.5.tgz",
-      "integrity": "sha512-AsF7K0Fx/cNKVyk3a+DW0JLo+Ua598/NxMRvxDnkpCIGFh43+h/v2xyhRUYf6oD8gE4QtL83C7zZVghMjHd+iw==",
+      "version": "7.23.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.23.3.tgz",
+      "integrity": "sha512-YJ3xKqtJMAT5/TIZnpAR3I+K+WaDowYbN3xyxI8zxx/Gsypwf9B9h0VB+1Nh6ACAAPRS5NSRje0uVv5i79HYGQ==",
       "dev": true,
       "requires": {
         "@babel/helper-plugin-utils": "^7.22.5"
       }
     },
     "@babel/plugin-transform-nullish-coalescing-operator": {
-      "version": "7.22.11",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-nullish-coalescing-operator/-/plugin-transform-nullish-coalescing-operator-7.22.11.tgz",
-      "integrity": "sha512-YZWOw4HxXrotb5xsjMJUDlLgcDXSfO9eCmdl1bgW4+/lAGdkjaEvOnQ4p5WKKdUgSzO39dgPl0pTnfxm0OAXcg==",
+      "version": "7.23.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-nullish-coalescing-operator/-/plugin-transform-nullish-coalescing-operator-7.23.3.tgz",
+      "integrity": "sha512-xzg24Lnld4DYIdysyf07zJ1P+iIfJpxtVFOzX4g+bsJ3Ng5Le7rXx9KwqKzuyaUeRnt+I1EICwQITqc0E2PmpA==",
       "dev": true,
       "requires": {
         "@babel/helper-plugin-utils": "^7.22.5",
@@ -18762,9 +18788,9 @@
       }
     },
     "@babel/plugin-transform-numeric-separator": {
-      "version": "7.22.11",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-numeric-separator/-/plugin-transform-numeric-separator-7.22.11.tgz",
-      "integrity": "sha512-3dzU4QGPsILdJbASKhF/V2TVP+gJya1PsueQCxIPCEcerqF21oEcrob4mzjsp2Py/1nLfF5m+xYNMDpmA8vffg==",
+      "version": "7.23.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-numeric-separator/-/plugin-transform-numeric-separator-7.23.3.tgz",
+      "integrity": "sha512-s9GO7fIBi/BLsZ0v3Rftr6Oe4t0ctJ8h4CCXfPoEJwmvAPMyNrfkOOJzm6b9PX9YXcCJWWQd/sBF/N26eBiMVw==",
       "dev": true,
       "requires": {
         "@babel/helper-plugin-utils": "^7.22.5",
@@ -18772,32 +18798,32 @@
       }
     },
     "@babel/plugin-transform-object-rest-spread": {
-      "version": "7.22.15",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-rest-spread/-/plugin-transform-object-rest-spread-7.22.15.tgz",
-      "integrity": "sha512-fEB+I1+gAmfAyxZcX1+ZUwLeAuuf8VIg67CTznZE0MqVFumWkh8xWtn58I4dxdVf080wn7gzWoF8vndOViJe9Q==",
+      "version": "7.23.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-rest-spread/-/plugin-transform-object-rest-spread-7.23.3.tgz",
+      "integrity": "sha512-VxHt0ANkDmu8TANdE9Kc0rndo/ccsmfe2Cx2y5sI4hu3AukHQ5wAu4cM7j3ba8B9548ijVyclBU+nuDQftZsog==",
       "dev": true,
       "requires": {
-        "@babel/compat-data": "^7.22.9",
+        "@babel/compat-data": "^7.23.3",
         "@babel/helper-compilation-targets": "^7.22.15",
         "@babel/helper-plugin-utils": "^7.22.5",
         "@babel/plugin-syntax-object-rest-spread": "^7.8.3",
-        "@babel/plugin-transform-parameters": "^7.22.15"
+        "@babel/plugin-transform-parameters": "^7.23.3"
       }
     },
     "@babel/plugin-transform-object-super": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.22.5.tgz",
-      "integrity": "sha512-klXqyaT9trSjIUrcsYIfETAzmOEZL3cBYqOYLJxBHfMFFggmXOv+NYSX/Jbs9mzMVESw/WycLFPRx8ba/b2Ipw==",
+      "version": "7.23.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.23.3.tgz",
+      "integrity": "sha512-BwQ8q0x2JG+3lxCVFohg+KbQM7plfpBwThdW9A6TMtWwLsbDA01Ek2Zb/AgDN39BiZsExm4qrXxjk+P1/fzGrA==",
       "dev": true,
       "requires": {
         "@babel/helper-plugin-utils": "^7.22.5",
-        "@babel/helper-replace-supers": "^7.22.5"
+        "@babel/helper-replace-supers": "^7.22.20"
       }
     },
     "@babel/plugin-transform-optional-catch-binding": {
-      "version": "7.22.11",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-optional-catch-binding/-/plugin-transform-optional-catch-binding-7.22.11.tgz",
-      "integrity": "sha512-rli0WxesXUeCJnMYhzAglEjLWVDF6ahb45HuprcmQuLidBJFWjNnOzssk2kuc6e33FlLaiZhG/kUIzUMWdBKaQ==",
+      "version": "7.23.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-optional-catch-binding/-/plugin-transform-optional-catch-binding-7.23.3.tgz",
+      "integrity": "sha512-LxYSb0iLjUamfm7f1D7GpiS4j0UAC8AOiehnsGAP8BEsIX8EOi3qV6bbctw8M7ZvLtcoZfZX5Z7rN9PlWk0m5A==",
       "dev": true,
       "requires": {
         "@babel/helper-plugin-utils": "^7.22.5",
@@ -18805,9 +18831,9 @@
       }
     },
     "@babel/plugin-transform-optional-chaining": {
-      "version": "7.23.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-optional-chaining/-/plugin-transform-optional-chaining-7.23.0.tgz",
-      "integrity": "sha512-sBBGXbLJjxTzLBF5rFWaikMnOGOk/BmK6vVByIdEggZ7Vn6CvWXZyRkkLFK6WE0IF8jSliyOkUN6SScFgzCM0g==",
+      "version": "7.23.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-optional-chaining/-/plugin-transform-optional-chaining-7.23.3.tgz",
+      "integrity": "sha512-zvL8vIfIUgMccIAK1lxjvNv572JHFJIKb4MWBz5OGdBQA0fB0Xluix5rmOby48exiJc987neOmP/m9Fnpkz3Tg==",
       "dev": true,
       "requires": {
         "@babel/helper-plugin-utils": "^7.22.5",
@@ -18816,49 +18842,49 @@
       }
     },
     "@babel/plugin-transform-parameters": {
-      "version": "7.22.15",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.22.15.tgz",
-      "integrity": "sha512-hjk7qKIqhyzhhUvRT683TYQOFa/4cQKwQy7ALvTpODswN40MljzNDa0YldevS6tGbxwaEKVn502JmY0dP7qEtQ==",
+      "version": "7.23.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.23.3.tgz",
+      "integrity": "sha512-09lMt6UsUb3/34BbECKVbVwrT9bO6lILWln237z7sLaWnMsTi7Yc9fhX5DLpkJzAGfaReXI22wP41SZmnAA3Vw==",
       "dev": true,
       "requires": {
         "@babel/helper-plugin-utils": "^7.22.5"
       }
     },
     "@babel/plugin-transform-private-methods": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-private-methods/-/plugin-transform-private-methods-7.22.5.tgz",
-      "integrity": "sha512-PPjh4gyrQnGe97JTalgRGMuU4icsZFnWkzicB/fUtzlKUqvsWBKEpPPfr5a2JiyirZkHxnAqkQMO5Z5B2kK3fA==",
+      "version": "7.23.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-private-methods/-/plugin-transform-private-methods-7.23.3.tgz",
+      "integrity": "sha512-UzqRcRtWsDMTLrRWFvUBDwmw06tCQH9Rl1uAjfh6ijMSmGYQ+fpdB+cnqRC8EMh5tuuxSv0/TejGL+7vyj+50g==",
       "dev": true,
       "requires": {
-        "@babel/helper-create-class-features-plugin": "^7.22.5",
+        "@babel/helper-create-class-features-plugin": "^7.22.15",
         "@babel/helper-plugin-utils": "^7.22.5"
       }
     },
     "@babel/plugin-transform-private-property-in-object": {
-      "version": "7.22.11",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-private-property-in-object/-/plugin-transform-private-property-in-object-7.22.11.tgz",
-      "integrity": "sha512-sSCbqZDBKHetvjSwpyWzhuHkmW5RummxJBVbYLkGkaiTOWGxml7SXt0iWa03bzxFIx7wOj3g/ILRd0RcJKBeSQ==",
+      "version": "7.23.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-private-property-in-object/-/plugin-transform-private-property-in-object-7.23.3.tgz",
+      "integrity": "sha512-a5m2oLNFyje2e/rGKjVfAELTVI5mbA0FeZpBnkOWWV7eSmKQ+T/XW0Vf+29ScLzSxX+rnsarvU0oie/4m6hkxA==",
       "dev": true,
       "requires": {
         "@babel/helper-annotate-as-pure": "^7.22.5",
-        "@babel/helper-create-class-features-plugin": "^7.22.11",
+        "@babel/helper-create-class-features-plugin": "^7.22.15",
         "@babel/helper-plugin-utils": "^7.22.5",
         "@babel/plugin-syntax-private-property-in-object": "^7.14.5"
       }
     },
     "@babel/plugin-transform-property-literals": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.22.5.tgz",
-      "integrity": "sha512-TiOArgddK3mK/x1Qwf5hay2pxI6wCZnvQqrFSqbtg1GLl2JcNMitVH/YnqjP+M31pLUeTfzY1HAXFDnUBV30rQ==",
+      "version": "7.23.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.23.3.tgz",
+      "integrity": "sha512-jR3Jn3y7cZp4oEWPFAlRsSWjxKe4PZILGBSd4nis1TsC5qeSpb+nrtihJuDhNI7QHiVbUaiXa0X2RZY3/TI6Nw==",
       "dev": true,
       "requires": {
         "@babel/helper-plugin-utils": "^7.22.5"
       }
     },
     "@babel/plugin-transform-regenerator": {
-      "version": "7.22.10",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.22.10.tgz",
-      "integrity": "sha512-F28b1mDt8KcT5bUyJc/U9nwzw6cV+UmTeRlXYIl2TNqMMJif0Jeey9/RQ3C4NOd2zp0/TRsDns9ttj2L523rsw==",
+      "version": "7.23.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.23.3.tgz",
+      "integrity": "sha512-KP+75h0KghBMcVpuKisx3XTu9Ncut8Q8TuvGO4IhY+9D5DFEckQefOuIsB/gQ2tG71lCke4NMrtIPS8pOj18BQ==",
       "dev": true,
       "requires": {
         "@babel/helper-plugin-utils": "^7.22.5",
@@ -18866,9 +18892,9 @@
       }
     },
     "@babel/plugin-transform-reserved-words": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.22.5.tgz",
-      "integrity": "sha512-DTtGKFRQUDm8svigJzZHzb/2xatPc6TzNvAIJ5GqOKDsGFYgAskjRulbR/vGsPKq3OPqtexnz327qYpP57RFyA==",
+      "version": "7.23.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.23.3.tgz",
+      "integrity": "sha512-QnNTazY54YqgGxwIexMZva9gqbPa15t/x9VS+0fsEFWplwVpXYZivtgl43Z1vMpc1bdPP2PP8siFeVcnFvA3Cg==",
       "dev": true,
       "requires": {
         "@babel/helper-plugin-utils": "^7.22.5"
@@ -18899,18 +18925,18 @@
       }
     },
     "@babel/plugin-transform-shorthand-properties": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.22.5.tgz",
-      "integrity": "sha512-vM4fq9IXHscXVKzDv5itkO1X52SmdFBFcMIBZ2FRn2nqVYqw6dBexUgMvAjHW+KXpPPViD/Yo3GrDEBaRC0QYA==",
+      "version": "7.23.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.23.3.tgz",
+      "integrity": "sha512-ED2fgqZLmexWiN+YNFX26fx4gh5qHDhn1O2gvEhreLW2iI63Sqm4llRLCXALKrCnbN4Jy0VcMQZl/SAzqug/jg==",
       "dev": true,
       "requires": {
         "@babel/helper-plugin-utils": "^7.22.5"
       }
     },
     "@babel/plugin-transform-spread": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.22.5.tgz",
-      "integrity": "sha512-5ZzDQIGyvN4w8+dMmpohL6MBo+l2G7tfC/O2Dg7/hjpgeWvUx8FzfeOKxGog9IimPa4YekaQ9PlDqTLOljkcxg==",
+      "version": "7.23.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.23.3.tgz",
+      "integrity": "sha512-VvfVYlrlBVu+77xVTOAoxQ6mZbnIq5FM0aGBSFEcIh03qHf+zNqA4DC/3XMUozTg7bZV3e3mZQ0i13VB6v5yUg==",
       "dev": true,
       "requires": {
         "@babel/helper-plugin-utils": "^7.22.5",
@@ -18918,91 +18944,92 @@
       }
     },
     "@babel/plugin-transform-sticky-regex": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.22.5.tgz",
-      "integrity": "sha512-zf7LuNpHG0iEeiyCNwX4j3gDg1jgt1k3ZdXBKbZSoA3BbGQGvMiSvfbZRR3Dr3aeJe3ooWFZxOOG3IRStYp2Bw==",
+      "version": "7.23.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.23.3.tgz",
+      "integrity": "sha512-HZOyN9g+rtvnOU3Yh7kSxXrKbzgrm5X4GncPY1QOquu7epga5MxKHVpYu2hvQnry/H+JjckSYRb93iNfsioAGg==",
       "dev": true,
       "requires": {
         "@babel/helper-plugin-utils": "^7.22.5"
       }
     },
     "@babel/plugin-transform-template-literals": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.22.5.tgz",
-      "integrity": "sha512-5ciOehRNf+EyUeewo8NkbQiUs4d6ZxiHo6BcBcnFlgiJfu16q0bQUw9Jvo0b0gBKFG1SMhDSjeKXSYuJLeFSMA==",
+      "version": "7.23.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.23.3.tgz",
+      "integrity": "sha512-Flok06AYNp7GV2oJPZZcP9vZdszev6vPBkHLwxwSpaIqx75wn6mUd3UFWsSsA0l8nXAKkyCmL/sR02m8RYGeHg==",
       "dev": true,
       "requires": {
         "@babel/helper-plugin-utils": "^7.22.5"
       }
     },
     "@babel/plugin-transform-typeof-symbol": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.22.5.tgz",
-      "integrity": "sha512-bYkI5lMzL4kPii4HHEEChkD0rkc+nvnlR6+o/qdqR6zrm0Sv/nodmyLhlq2DO0YKLUNd2VePmPRjJXSBh9OIdA==",
+      "version": "7.23.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.23.3.tgz",
+      "integrity": "sha512-4t15ViVnaFdrPC74be1gXBSMzXk3B4Us9lP7uLRQHTFpV5Dvt33pn+2MyyNxmN3VTTm3oTrZVMUmuw3oBnQ2oQ==",
       "dev": true,
       "requires": {
         "@babel/helper-plugin-utils": "^7.22.5"
       }
     },
     "@babel/plugin-transform-unicode-escapes": {
-      "version": "7.22.10",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.22.10.tgz",
-      "integrity": "sha512-lRfaRKGZCBqDlRU3UIFovdp9c9mEvlylmpod0/OatICsSfuQ9YFthRo1tpTkGsklEefZdqlEFdY4A2dwTb6ohg==",
+      "version": "7.23.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.23.3.tgz",
+      "integrity": "sha512-OMCUx/bU6ChE3r4+ZdylEqAjaQgHAgipgW8nsCfu5pGqDcFytVd91AwRvUJSBZDz0exPGgnjoqhgRYLRjFZc9Q==",
       "dev": true,
       "requires": {
         "@babel/helper-plugin-utils": "^7.22.5"
       }
     },
     "@babel/plugin-transform-unicode-property-regex": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-property-regex/-/plugin-transform-unicode-property-regex-7.22.5.tgz",
-      "integrity": "sha512-HCCIb+CbJIAE6sXn5CjFQXMwkCClcOfPCzTlilJ8cUatfzwHlWQkbtV0zD338u9dZskwvuOYTuuaMaA8J5EI5A==",
+      "version": "7.23.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-property-regex/-/plugin-transform-unicode-property-regex-7.23.3.tgz",
+      "integrity": "sha512-KcLIm+pDZkWZQAFJ9pdfmh89EwVfmNovFBcXko8szpBeF8z68kWIPeKlmSOkT9BXJxs2C0uk+5LxoxIv62MROA==",
       "dev": true,
       "requires": {
-        "@babel/helper-create-regexp-features-plugin": "^7.22.5",
+        "@babel/helper-create-regexp-features-plugin": "^7.22.15",
         "@babel/helper-plugin-utils": "^7.22.5"
       }
     },
     "@babel/plugin-transform-unicode-regex": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.22.5.tgz",
-      "integrity": "sha512-028laaOKptN5vHJf9/Arr/HiJekMd41hOEZYvNsrsXqJ7YPYuX2bQxh31fkZzGmq3YqHRJzYFFAVYvKfMPKqyg==",
+      "version": "7.23.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.23.3.tgz",
+      "integrity": "sha512-wMHpNA4x2cIA32b/ci3AfwNgheiva2W0WUKWTK7vBHBhDKfPsc5cFGNWm69WBqpwd86u1qwZ9PWevKqm1A3yAw==",
       "dev": true,
       "requires": {
-        "@babel/helper-create-regexp-features-plugin": "^7.22.5",
+        "@babel/helper-create-regexp-features-plugin": "^7.22.15",
         "@babel/helper-plugin-utils": "^7.22.5"
       }
     },
     "@babel/plugin-transform-unicode-sets-regex": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-sets-regex/-/plugin-transform-unicode-sets-regex-7.22.5.tgz",
-      "integrity": "sha512-lhMfi4FC15j13eKrh3DnYHjpGj6UKQHtNKTbtc1igvAhRy4+kLhV07OpLcsN0VgDEw/MjAvJO4BdMJsHwMhzCg==",
+      "version": "7.23.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-sets-regex/-/plugin-transform-unicode-sets-regex-7.23.3.tgz",
+      "integrity": "sha512-W7lliA/v9bNR83Qc3q1ip9CQMZ09CcHDbHfbLRDNuAhn1Mvkr1ZNF7hPmztMQvtTGVLJ9m8IZqWsTkXOml8dbw==",
       "dev": true,
       "requires": {
-        "@babel/helper-create-regexp-features-plugin": "^7.22.5",
+        "@babel/helper-create-regexp-features-plugin": "^7.22.15",
         "@babel/helper-plugin-utils": "^7.22.5"
       }
     },
     "@babel/preset-env": {
-      "version": "7.23.2",
-      "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.23.2.tgz",
-      "integrity": "sha512-BW3gsuDD+rvHL2VO2SjAUNTBe5YrjsTiDyqamPDWY723na3/yPQ65X5oQkFVJZ0o50/2d+svm1rkPoJeR1KxVQ==",
+      "version": "7.23.3",
+      "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.23.3.tgz",
+      "integrity": "sha512-ovzGc2uuyNfNAs/jyjIGxS8arOHS5FENZaNn4rtE7UdKMMkqHCvboHfcuhWLZNX5cB44QfcGNWjaevxMzzMf+Q==",
       "dev": true,
       "requires": {
-        "@babel/compat-data": "^7.23.2",
+        "@babel/compat-data": "^7.23.3",
         "@babel/helper-compilation-targets": "^7.22.15",
         "@babel/helper-plugin-utils": "^7.22.5",
         "@babel/helper-validator-option": "^7.22.15",
-        "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": "^7.22.15",
-        "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": "^7.22.15",
+        "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": "^7.23.3",
+        "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": "^7.23.3",
+        "@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly": "^7.23.3",
         "@babel/plugin-proposal-private-property-in-object": "7.21.0-placeholder-for-preset-env.2",
         "@babel/plugin-syntax-async-generators": "^7.8.4",
         "@babel/plugin-syntax-class-properties": "^7.12.13",
         "@babel/plugin-syntax-class-static-block": "^7.14.5",
         "@babel/plugin-syntax-dynamic-import": "^7.8.3",
         "@babel/plugin-syntax-export-namespace-from": "^7.8.3",
-        "@babel/plugin-syntax-import-assertions": "^7.22.5",
-        "@babel/plugin-syntax-import-attributes": "^7.22.5",
+        "@babel/plugin-syntax-import-assertions": "^7.23.3",
+        "@babel/plugin-syntax-import-attributes": "^7.23.3",
         "@babel/plugin-syntax-import-meta": "^7.10.4",
         "@babel/plugin-syntax-json-strings": "^7.8.3",
         "@babel/plugin-syntax-logical-assignment-operators": "^7.10.4",
@@ -19014,56 +19041,55 @@
         "@babel/plugin-syntax-private-property-in-object": "^7.14.5",
         "@babel/plugin-syntax-top-level-await": "^7.14.5",
         "@babel/plugin-syntax-unicode-sets-regex": "^7.18.6",
-        "@babel/plugin-transform-arrow-functions": "^7.22.5",
-        "@babel/plugin-transform-async-generator-functions": "^7.23.2",
-        "@babel/plugin-transform-async-to-generator": "^7.22.5",
-        "@babel/plugin-transform-block-scoped-functions": "^7.22.5",
-        "@babel/plugin-transform-block-scoping": "^7.23.0",
-        "@babel/plugin-transform-class-properties": "^7.22.5",
-        "@babel/plugin-transform-class-static-block": "^7.22.11",
-        "@babel/plugin-transform-classes": "^7.22.15",
-        "@babel/plugin-transform-computed-properties": "^7.22.5",
-        "@babel/plugin-transform-destructuring": "^7.23.0",
-        "@babel/plugin-transform-dotall-regex": "^7.22.5",
-        "@babel/plugin-transform-duplicate-keys": "^7.22.5",
-        "@babel/plugin-transform-dynamic-import": "^7.22.11",
-        "@babel/plugin-transform-exponentiation-operator": "^7.22.5",
-        "@babel/plugin-transform-export-namespace-from": "^7.22.11",
-        "@babel/plugin-transform-for-of": "^7.22.15",
-        "@babel/plugin-transform-function-name": "^7.22.5",
-        "@babel/plugin-transform-json-strings": "^7.22.11",
-        "@babel/plugin-transform-literals": "^7.22.5",
-        "@babel/plugin-transform-logical-assignment-operators": "^7.22.11",
-        "@babel/plugin-transform-member-expression-literals": "^7.22.5",
-        "@babel/plugin-transform-modules-amd": "^7.23.0",
-        "@babel/plugin-transform-modules-commonjs": "^7.23.0",
-        "@babel/plugin-transform-modules-systemjs": "^7.23.0",
-        "@babel/plugin-transform-modules-umd": "^7.22.5",
+        "@babel/plugin-transform-arrow-functions": "^7.23.3",
+        "@babel/plugin-transform-async-generator-functions": "^7.23.3",
+        "@babel/plugin-transform-async-to-generator": "^7.23.3",
+        "@babel/plugin-transform-block-scoped-functions": "^7.23.3",
+        "@babel/plugin-transform-block-scoping": "^7.23.3",
+        "@babel/plugin-transform-class-properties": "^7.23.3",
+        "@babel/plugin-transform-class-static-block": "^7.23.3",
+        "@babel/plugin-transform-classes": "^7.23.3",
+        "@babel/plugin-transform-computed-properties": "^7.23.3",
+        "@babel/plugin-transform-destructuring": "^7.23.3",
+        "@babel/plugin-transform-dotall-regex": "^7.23.3",
+        "@babel/plugin-transform-duplicate-keys": "^7.23.3",
+        "@babel/plugin-transform-dynamic-import": "^7.23.3",
+        "@babel/plugin-transform-exponentiation-operator": "^7.23.3",
+        "@babel/plugin-transform-export-namespace-from": "^7.23.3",
+        "@babel/plugin-transform-for-of": "^7.23.3",
+        "@babel/plugin-transform-function-name": "^7.23.3",
+        "@babel/plugin-transform-json-strings": "^7.23.3",
+        "@babel/plugin-transform-literals": "^7.23.3",
+        "@babel/plugin-transform-logical-assignment-operators": "^7.23.3",
+        "@babel/plugin-transform-member-expression-literals": "^7.23.3",
+        "@babel/plugin-transform-modules-amd": "^7.23.3",
+        "@babel/plugin-transform-modules-commonjs": "^7.23.3",
+        "@babel/plugin-transform-modules-systemjs": "^7.23.3",
+        "@babel/plugin-transform-modules-umd": "^7.23.3",
         "@babel/plugin-transform-named-capturing-groups-regex": "^7.22.5",
-        "@babel/plugin-transform-new-target": "^7.22.5",
-        "@babel/plugin-transform-nullish-coalescing-operator": "^7.22.11",
-        "@babel/plugin-transform-numeric-separator": "^7.22.11",
-        "@babel/plugin-transform-object-rest-spread": "^7.22.15",
-        "@babel/plugin-transform-object-super": "^7.22.5",
-        "@babel/plugin-transform-optional-catch-binding": "^7.22.11",
-        "@babel/plugin-transform-optional-chaining": "^7.23.0",
-        "@babel/plugin-transform-parameters": "^7.22.15",
-        "@babel/plugin-transform-private-methods": "^7.22.5",
-        "@babel/plugin-transform-private-property-in-object": "^7.22.11",
-        "@babel/plugin-transform-property-literals": "^7.22.5",
-        "@babel/plugin-transform-regenerator": "^7.22.10",
-        "@babel/plugin-transform-reserved-words": "^7.22.5",
-        "@babel/plugin-transform-shorthand-properties": "^7.22.5",
-        "@babel/plugin-transform-spread": "^7.22.5",
-        "@babel/plugin-transform-sticky-regex": "^7.22.5",
-        "@babel/plugin-transform-template-literals": "^7.22.5",
-        "@babel/plugin-transform-typeof-symbol": "^7.22.5",
-        "@babel/plugin-transform-unicode-escapes": "^7.22.10",
-        "@babel/plugin-transform-unicode-property-regex": "^7.22.5",
-        "@babel/plugin-transform-unicode-regex": "^7.22.5",
-        "@babel/plugin-transform-unicode-sets-regex": "^7.22.5",
+        "@babel/plugin-transform-new-target": "^7.23.3",
+        "@babel/plugin-transform-nullish-coalescing-operator": "^7.23.3",
+        "@babel/plugin-transform-numeric-separator": "^7.23.3",
+        "@babel/plugin-transform-object-rest-spread": "^7.23.3",
+        "@babel/plugin-transform-object-super": "^7.23.3",
+        "@babel/plugin-transform-optional-catch-binding": "^7.23.3",
+        "@babel/plugin-transform-optional-chaining": "^7.23.3",
+        "@babel/plugin-transform-parameters": "^7.23.3",
+        "@babel/plugin-transform-private-methods": "^7.23.3",
+        "@babel/plugin-transform-private-property-in-object": "^7.23.3",
+        "@babel/plugin-transform-property-literals": "^7.23.3",
+        "@babel/plugin-transform-regenerator": "^7.23.3",
+        "@babel/plugin-transform-reserved-words": "^7.23.3",
+        "@babel/plugin-transform-shorthand-properties": "^7.23.3",
+        "@babel/plugin-transform-spread": "^7.23.3",
+        "@babel/plugin-transform-sticky-regex": "^7.23.3",
+        "@babel/plugin-transform-template-literals": "^7.23.3",
+        "@babel/plugin-transform-typeof-symbol": "^7.23.3",
+        "@babel/plugin-transform-unicode-escapes": "^7.23.3",
+        "@babel/plugin-transform-unicode-property-regex": "^7.23.3",
+        "@babel/plugin-transform-unicode-regex": "^7.23.3",
+        "@babel/plugin-transform-unicode-sets-regex": "^7.23.3",
         "@babel/preset-modules": "0.1.6-no-external-plugins",
-        "@babel/types": "^7.23.0",
         "babel-plugin-polyfill-corejs2": "^0.4.6",
         "babel-plugin-polyfill-corejs3": "^0.8.5",
         "babel-plugin-polyfill-regenerator": "^0.5.3",
diff --git a/apps/block_scout_web/assets/package.json b/apps/block_scout_web/assets/package.json
index 751f438fcfdd..b6d4b193cf2c 100644
--- a/apps/block_scout_web/assets/package.json
+++ b/apps/block_scout_web/assets/package.json
@@ -84,7 +84,7 @@
   },
   "devDependencies": {
     "@babel/core": "^7.23.3",
-    "@babel/preset-env": "^7.23.2",
+    "@babel/preset-env": "^7.23.3",
     "autoprefixer": "^10.4.16",
     "babel-loader": "^9.1.3",
     "copy-webpack-plugin": "^11.0.0",

From 3accea963190f5e8893a77020dce18284c1cca0a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 14 Nov 2023 07:33:06 +0000
Subject: [PATCH 649/909] Bump solc from 0.8.22 to 0.8.23 in /apps/explorer

Bumps [solc](https://github.com/ethereum/solc-js) from 0.8.22 to 0.8.23.
- [Commits](https://github.com/ethereum/solc-js/compare/v0.8.22...v0.8.23)

---
updated-dependencies:
- dependency-name: solc
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 apps/explorer/package-lock.json | 35 ++++++++++++++++++++++++++-------
 apps/explorer/package.json      |  2 +-
 2 files changed, 29 insertions(+), 8 deletions(-)

diff --git a/apps/explorer/package-lock.json b/apps/explorer/package-lock.json
index 9a78d3dd8dde..86af32e1175b 100644
--- a/apps/explorer/package-lock.json
+++ b/apps/explorer/package-lock.json
@@ -7,7 +7,7 @@
       "name": "blockscout",
       "license": "GPL-3.0",
       "dependencies": {
-        "solc": "0.8.22"
+        "solc": "0.8.23"
       },
       "engines": {
         "node": "18.x",
@@ -59,6 +59,20 @@
         "node": ">= 0.10.0"
       }
     },
+    "node_modules/n": {
+      "version": "9.2.0",
+      "resolved": "https://registry.npmjs.org/n/-/n-9.2.0.tgz",
+      "integrity": "sha512-R8mFN2OWwNVc+r1f9fDzcT34DnDwUIHskrpTesZ6SdluaXBBnRtTu5tlfaSPloBi1Z/eGJoPO9nhyawWPad5UQ==",
+      "os": [
+        "!win32"
+      ],
+      "bin": {
+        "n": "bin/n"
+      },
+      "engines": {
+        "node": "*"
+      }
+    },
     "node_modules/os-tmpdir": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz",
@@ -76,15 +90,16 @@
       }
     },
     "node_modules/solc": {
-      "version": "0.8.22",
-      "resolved": "https://registry.npmjs.org/solc/-/solc-0.8.22.tgz",
-      "integrity": "sha512-bA2tMZXx93R8L5LUH7TlB/f+QhkVyxrrY6LmgJnFFZlRknrhYVlBK1e3uHIdKybwoFabOFSzeaZjPeL/GIpFGQ==",
+      "version": "0.8.23",
+      "resolved": "https://registry.npmjs.org/solc/-/solc-0.8.23.tgz",
+      "integrity": "sha512-uqe69kFWfJc3cKdxj+Eg9CdW1CP3PLZDPeyJStQVWL8Q9jjjKD0VuRAKBFR8mrWiq5A7gJqERxJFYJsklrVsfA==",
       "dependencies": {
         "command-exists": "^1.2.8",
         "commander": "^8.1.0",
         "follow-redirects": "^1.12.1",
         "js-sha3": "0.8.0",
         "memorystream": "^0.3.1",
+        "n": "^9.2.0",
         "semver": "^5.5.0",
         "tmp": "0.0.33"
       },
@@ -133,6 +148,11 @@
       "resolved": "https://registry.npmjs.org/memorystream/-/memorystream-0.3.1.tgz",
       "integrity": "sha1-htcJCzDORV1j+64S3aUaR93K+bI="
     },
+    "n": {
+      "version": "9.2.0",
+      "resolved": "https://registry.npmjs.org/n/-/n-9.2.0.tgz",
+      "integrity": "sha512-R8mFN2OWwNVc+r1f9fDzcT34DnDwUIHskrpTesZ6SdluaXBBnRtTu5tlfaSPloBi1Z/eGJoPO9nhyawWPad5UQ=="
+    },
     "os-tmpdir": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz",
@@ -144,15 +164,16 @@
       "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g=="
     },
     "solc": {
-      "version": "0.8.22",
-      "resolved": "https://registry.npmjs.org/solc/-/solc-0.8.22.tgz",
-      "integrity": "sha512-bA2tMZXx93R8L5LUH7TlB/f+QhkVyxrrY6LmgJnFFZlRknrhYVlBK1e3uHIdKybwoFabOFSzeaZjPeL/GIpFGQ==",
+      "version": "0.8.23",
+      "resolved": "https://registry.npmjs.org/solc/-/solc-0.8.23.tgz",
+      "integrity": "sha512-uqe69kFWfJc3cKdxj+Eg9CdW1CP3PLZDPeyJStQVWL8Q9jjjKD0VuRAKBFR8mrWiq5A7gJqERxJFYJsklrVsfA==",
       "requires": {
         "command-exists": "^1.2.8",
         "commander": "^8.1.0",
         "follow-redirects": "^1.12.1",
         "js-sha3": "0.8.0",
         "memorystream": "^0.3.1",
+        "n": "^9.2.0",
         "semver": "^5.5.0",
         "tmp": "0.0.33"
       }
diff --git a/apps/explorer/package.json b/apps/explorer/package.json
index 366fdd199b1e..01333da43558 100644
--- a/apps/explorer/package.json
+++ b/apps/explorer/package.json
@@ -13,6 +13,6 @@
   },
   "scripts": {},
   "dependencies": {
-    "solc": "0.8.22"
+    "solc": "0.8.23"
   }
 }

From 668d5a288953866f0e38491e5592c6fd04cd2c0a Mon Sep 17 00:00:00 2001
From: Nikita Pozdniakov <nikitosing4@mail.ru>
Date: Mon, 13 Nov 2023 13:31:16 +0300
Subject: [PATCH 650/909] Do not preload smart contract info if address has no
 contract_code

---
 .../controllers/api/v2/address_controller.ex  | 26 +++++++++++++------
 .../lib/block_scout_web/views/address_view.ex |  6 ++---
 2 files changed, 21 insertions(+), 11 deletions(-)

diff --git a/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/address_controller.ex b/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/address_controller.ex
index 1ca5db5dcdc2..43418c135de7 100644
--- a/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/address_controller.ex
+++ b/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/address_controller.ex
@@ -16,7 +16,8 @@ defmodule BlockScoutWeb.API.V2.AddressController do
 
   alias BlockScoutWeb.AccessHelper
   alias BlockScoutWeb.API.V2.{BlockView, TransactionView, WithdrawalView}
-  alias Explorer.{Chain, Market}
+  alias Explorer.{Chain, Market, Repo}
+  alias Explorer.Chain.Address
   alias Explorer.Chain.Address.Counters
   alias Explorer.Chain.Token.Instance
   alias Indexer.Fetcher.{CoinBalanceOnDemand, TokenBalanceOnDemand}
@@ -46,15 +47,18 @@ defmodule BlockScoutWeb.API.V2.AddressController do
 
   @address_options [
     necessity_by_association: %{
-      :contracts_creation_internal_transaction => :optional,
       :names => :optional,
-      :smart_contract => :optional,
-      :token => :optional,
-      :contracts_creation_transaction => :optional
+      :token => :optional
     },
     api?: true
   ]
 
+  @contract_address_preloads [
+    :smart_contract,
+    :contracts_creation_internal_transaction,
+    :contracts_creation_transaction
+  ]
+
   @nft_necessity_by_association [
     necessity_by_association: %{
       :token => :optional
@@ -66,12 +70,13 @@ defmodule BlockScoutWeb.API.V2.AddressController do
   action_fallback(BlockScoutWeb.API.V2.FallbackController)
 
   def address(conn, %{"address_hash_param" => address_hash_string} = params) do
-    with {:ok, _address_hash, address} <- validate_address(address_hash_string, params, @address_options) do
-      CoinBalanceOnDemand.trigger_fetch(address)
+    with {:ok, _address_hash, address} <- validate_address(address_hash_string, params, @address_options),
+         fully_preloaded_address <- maybe_preload_smart_contract_associations(address) do
+      CoinBalanceOnDemand.trigger_fetch(fully_preloaded_address)
 
       conn
       |> put_status(200)
-      |> render(:address, %{address: address})
+      |> render(:address, %{address: fully_preloaded_address})
     end
   end
 
@@ -477,4 +482,9 @@ defmodule BlockScoutWeb.API.V2.AddressController do
       {:ok, address_hash, address}
     end
   end
+
+  defp maybe_preload_smart_contract_associations(%Address{contract_code: nil} = address), do: address
+
+  defp maybe_preload_smart_contract_associations(%Address{contract_code: _} = address),
+    do: Repo.replica().preload(address, @contract_address_preloads)
 end
diff --git a/apps/block_scout_web/lib/block_scout_web/views/address_view.ex b/apps/block_scout_web/lib/block_scout_web/views/address_view.ex
index 41ebf80976d6..3098dfc09692 100644
--- a/apps/block_scout_web/lib/block_scout_web/views/address_view.ex
+++ b/apps/block_scout_web/lib/block_scout_web/views/address_view.ex
@@ -258,7 +258,7 @@ defmodule BlockScoutWeb.AddressView do
     Enum.any?(address.smart_contract.abi || [], &is_read_function?(&1))
   end
 
-  def smart_contract_with_read_only_functions?(%Address{smart_contract: nil}), do: false
+  def smart_contract_with_read_only_functions?(%Address{smart_contract: _}), do: false
 
   def is_read_function?(function), do: Helper.queriable_method?(function) || Helper.read_with_wallet_method?(function)
 
@@ -268,7 +268,7 @@ defmodule BlockScoutWeb.AddressView do
     SmartContract.proxy_contract?(smart_contract, options)
   end
 
-  def smart_contract_is_proxy?(%Address{smart_contract: nil}, _), do: false
+  def smart_contract_is_proxy?(%Address{smart_contract: _}, _), do: false
 
   def smart_contract_with_write_functions?(%Address{smart_contract: %SmartContract{}} = address) do
     !contract_interaction_disabled?() &&
@@ -278,7 +278,7 @@ defmodule BlockScoutWeb.AddressView do
       )
   end
 
-  def smart_contract_with_write_functions?(%Address{smart_contract: nil}), do: false
+  def smart_contract_with_write_functions?(%Address{smart_contract: _}), do: false
 
   def has_decompiled_code?(address) do
     address.has_decompiled_code? ||

From aee725b151385e971c5e152f323cd96e900d9de8 Mon Sep 17 00:00:00 2001
From: Nikita Pozdniakov <nikitosing4@mail.ru>
Date: Mon, 13 Nov 2023 13:33:30 +0300
Subject: [PATCH 651/909] Changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 39a7a802eb00..72e480d8180e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,6 +13,7 @@
 
 ### Fixes
 
+- [#8814](https://github.com/blockscout/blockscout/pull/8814) - Improve performance for EOA addresses in `/api/v2/addresses/{address_hash}`
 - [#8813](https://github.com/blockscout/blockscout/pull/8813) - Force verify twin contracts on `/api/v2/import/smart-contracts/{address_hash}`
 - [#8784](https://github.com/blockscout/blockscout/pull/8784) - Fix Indexer.Transform.Addresses for non-Suave setup
 - [#8770](https://github.com/blockscout/blockscout/pull/8770) - Fix for eth_getbalance API v1 endpoint when requesting latest tag

From 98210e4bf133c9b95ce3e178163cccaa88f4ef6d Mon Sep 17 00:00:00 2001
From: Nikita Pozdniakov <nikitosing4@mail.ru>
Date: Tue, 14 Nov 2023 11:26:39 +0300
Subject: [PATCH 652/909] Fix after review; Add test

---
 .../controllers/api/v2/address_controller.ex  | 10 +--
 .../api/v2/address_controller_test.exs        | 62 ++++++++++++++++++-
 apps/explorer/lib/explorer/chain/address.ex   | 11 ++++
 3 files changed, 75 insertions(+), 8 deletions(-)

diff --git a/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/address_controller.ex b/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/address_controller.ex
index 43418c135de7..6d3c767a49e7 100644
--- a/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/address_controller.ex
+++ b/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/address_controller.ex
@@ -16,7 +16,7 @@ defmodule BlockScoutWeb.API.V2.AddressController do
 
   alias BlockScoutWeb.AccessHelper
   alias BlockScoutWeb.API.V2.{BlockView, TransactionView, WithdrawalView}
-  alias Explorer.{Chain, Market, Repo}
+  alias Explorer.{Chain, Market}
   alias Explorer.Chain.Address
   alias Explorer.Chain.Address.Counters
   alias Explorer.Chain.Token.Instance
@@ -71,7 +71,8 @@ defmodule BlockScoutWeb.API.V2.AddressController do
 
   def address(conn, %{"address_hash_param" => address_hash_string} = params) do
     with {:ok, _address_hash, address} <- validate_address(address_hash_string, params, @address_options),
-         fully_preloaded_address <- maybe_preload_smart_contract_associations(address) do
+         fully_preloaded_address <-
+           Address.maybe_preload_smart_contract_associations(address, @contract_address_preloads, @api_true) do
       CoinBalanceOnDemand.trigger_fetch(fully_preloaded_address)
 
       conn
@@ -482,9 +483,4 @@ defmodule BlockScoutWeb.API.V2.AddressController do
       {:ok, address_hash, address}
     end
   end
-
-  defp maybe_preload_smart_contract_associations(%Address{contract_code: nil} = address), do: address
-
-  defp maybe_preload_smart_contract_associations(%Address{contract_code: _} = address),
-    do: Repo.replica().preload(address, @contract_address_preloads)
 end
diff --git a/apps/block_scout_web/test/block_scout_web/controllers/api/v2/address_controller_test.exs b/apps/block_scout_web/test/block_scout_web/controllers/api/v2/address_controller_test.exs
index ebe923dff6d5..411803430cd0 100644
--- a/apps/block_scout_web/test/block_scout_web/controllers/api/v2/address_controller_test.exs
+++ b/apps/block_scout_web/test/block_scout_web/controllers/api/v2/address_controller_test.exs
@@ -1,5 +1,6 @@
 defmodule BlockScoutWeb.API.V2.AddressControllerTest do
   use BlockScoutWeb.ConnCase
+  use EthereumJSONRPC.Case, async: false
 
   alias BlockScoutWeb.Models.UserFromAuth
   alias Explorer.{Chain, Repo}
@@ -22,6 +23,9 @@ defmodule BlockScoutWeb.API.V2.AddressControllerTest do
   alias Explorer.Chain.Address.CurrentTokenBalance
 
   import Explorer.Chain, only: [hash_to_lower_case_string: 1]
+  import Mox
+
+  setup :set_mox_global
 
   describe "/addresses/{address_hash}" do
     test "get 404 on non existing address", %{conn: conn} do
@@ -44,7 +48,7 @@ defmodule BlockScoutWeb.API.V2.AddressControllerTest do
       correct_response = %{
         "hash" => Address.checksum(address.hash),
         "is_contract" => false,
-        "is_verified" => false,
+        "is_verified" => nil,
         "name" => nil,
         "private_tags" => [],
         "public_tags" => [],
@@ -79,6 +83,47 @@ defmodule BlockScoutWeb.API.V2.AddressControllerTest do
       assert ^correct_response = json_response(request, 200)
     end
 
+    test "get contract info", %{conn: conn} do
+      smart_contract = insert(:smart_contract)
+
+      tx =
+        insert(:transaction,
+          to_address_hash: nil,
+          to_address: nil,
+          created_contract_address_hash: smart_contract.address_hash,
+          created_contract_address: smart_contract.address
+        )
+
+      insert(:address_name,
+        address: smart_contract.address,
+        primary: true,
+        name: smart_contract.name,
+        address_hash: smart_contract.address_hash
+      )
+
+      name = smart_contract.name
+      from = Address.checksum(tx.from_address_hash)
+      tx_hash = to_string(tx.hash)
+      address_hash = Address.checksum(smart_contract.address_hash)
+
+      get_eip1967_implementation_non_zero_address()
+
+      request = get(conn, "/api/v2/addresses/#{Address.checksum(smart_contract.address_hash)}")
+
+      assert %{
+               "hash" => ^address_hash,
+               "is_contract" => true,
+               "is_verified" => true,
+               "name" => ^name,
+               "private_tags" => [],
+               "public_tags" => [],
+               "watchlist_names" => [],
+               "creator_address_hash" => ^from,
+               "creation_tx_hash" => ^tx_hash,
+               "implementation_address" => "0x0000000000000000000000000000000000000001"
+             } = json_response(request, 200)
+    end
+
     test "get watchlist id", %{conn: conn} do
       auth = build(:auth)
       address = insert(:address)
@@ -2622,4 +2667,19 @@ defmodule BlockScoutWeb.API.V2.AddressControllerTest do
   end
 
   def check_total(_, _, _), do: true
+
+  def get_eip1967_implementation_non_zero_address do
+    expect(EthereumJSONRPC.Mox, :json_rpc, fn %{
+                                                id: 0,
+                                                method: "eth_getStorageAt",
+                                                params: [
+                                                  _,
+                                                  "0x360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc",
+                                                  "latest"
+                                                ]
+                                              },
+                                              _options ->
+      {:ok, "0x0000000000000000000000000000000000000000000000000000000000000001"}
+    end)
+  end
 end
diff --git a/apps/explorer/lib/explorer/chain/address.ex b/apps/explorer/lib/explorer/chain/address.ex
index 0b38b0801448..5803f3573227 100644
--- a/apps/explorer/lib/explorer/chain/address.ex
+++ b/apps/explorer/lib/explorer/chain/address.ex
@@ -8,6 +8,7 @@ defmodule Explorer.Chain.Address do
   use Explorer.Schema
 
   alias Ecto.Changeset
+  alias Explorer.Chain
 
   alias Explorer.Chain.{
     Address,
@@ -252,6 +253,16 @@ defmodule Explorer.Chain.Address do
     end)
   end
 
+  @doc """
+    Preloads provided contracts associations if address has contract_code which is not nil
+  """
+  @spec maybe_preload_smart_contract_associations(Address.t(), list, list) :: Address.t()
+  def maybe_preload_smart_contract_associations(%Address{contract_code: nil} = address, _associations, _options),
+    do: address
+
+  def maybe_preload_smart_contract_associations(%Address{contract_code: _} = address, associations, options),
+    do: Chain.select_repo(options).preload(address, associations)
+
   @doc """
   Counts all the addresses where the `fetched_coin_balance` is > 0.
   """

From 8be0d92f5f981716f948f699d952d1381b4ef011 Mon Sep 17 00:00:00 2001
From: Viktor Baranov <baranov.viktor.27@gmail.com>
Date: Tue, 14 Nov 2023 14:28:04 +0300
Subject: [PATCH 653/909] Log more details in regards 413 error

---
 CHANGELOG.md                                       |  1 +
 apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/http.ex | 13 ++++++++++++-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 72e480d8180e..d75afb139956 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -24,6 +24,7 @@
 
 ### Chore
 
+- [#8832](https://github.com/blockscout/blockscout/pull/8832) - Log more details in regards 413 error
 - [#8802](https://github.com/blockscout/blockscout/pull/8802) - Enable API v2 by default
 - [#8728](https://github.com/blockscout/blockscout/pull/8728) - Remove repos_list (default value for ecto repos) from Explorer.ReleaseTasks
 
diff --git a/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/http.ex b/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/http.ex
index e7abd430391b..f7b607e77e8c 100644
--- a/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/http.ex
+++ b/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/http.ex
@@ -94,10 +94,21 @@ defmodule EthereumJSONRPC.HTTP do
     case length(batch) do
       # it can't be made any smaller
       1 ->
+        old_truncate = Application.get_env(:logger, :truncate)
+        Logger.configure(truncate: :infinity)
+
         Logger.error(fn ->
-          "413 Request Entity Too Large returned from single request batch.  Cannot shrink batch further."
+          [
+            "413 Request Entity Too Large returned from single request batch. Cannot shrink batch further. ",
+            "The actual batched request was ",
+            "#{inspect(batch)}. ",
+            "The actual response of the method was ",
+            "#{inspect(response)}."
+          ]
         end)
 
+        Logger.configure(truncate: old_truncate)
+
         {:error, response}
 
       batch_size ->

From d63a94056897785d048eded4974b536f7c75e96c Mon Sep 17 00:00:00 2001
From: Qwerty5Uiop <alex000010@bk.ru>
Date: Tue, 14 Nov 2023 22:17:38 +0600
Subject: [PATCH 654/909] Safe token update

---
 CHANGELOG.md                                       |  1 +
 .../lib/explorer/chain/import/runner/tokens.ex     | 14 +++++++-------
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 72e480d8180e..779767492b14 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,6 +13,7 @@
 
 ### Fixes
 
+- [#8836](https://github.com/blockscout/blockscout/pull/8836) - Safe token update
 - [#8814](https://github.com/blockscout/blockscout/pull/8814) - Improve performance for EOA addresses in `/api/v2/addresses/{address_hash}`
 - [#8813](https://github.com/blockscout/blockscout/pull/8813) - Force verify twin contracts on `/api/v2/import/smart-contracts/{address_hash}`
 - [#8784](https://github.com/blockscout/blockscout/pull/8784) - Fix Indexer.Transform.Addresses for non-Suave setup
diff --git a/apps/explorer/lib/explorer/chain/import/runner/tokens.ex b/apps/explorer/lib/explorer/chain/import/runner/tokens.ex
index d60afaee2d7a..791ee9daa2f5 100644
--- a/apps/explorer/lib/explorer/chain/import/runner/tokens.ex
+++ b/apps/explorer/lib/explorer/chain/import/runner/tokens.ex
@@ -141,13 +141,13 @@ defmodule Explorer.Chain.Import.Runner.Tokens do
       token in Token,
       update: [
         set: [
-          name: fragment("EXCLUDED.name"),
-          symbol: fragment("EXCLUDED.symbol"),
-          total_supply: fragment("EXCLUDED.total_supply"),
-          decimals: fragment("EXCLUDED.decimals"),
-          type: fragment("EXCLUDED.type"),
-          cataloged: fragment("EXCLUDED.cataloged"),
-          skip_metadata: fragment("EXCLUDED.skip_metadata"),
+          name: fragment("COALESCE(EXCLUDED.name, ?)", token.name),
+          symbol: fragment("COALESCE(EXCLUDED.symbol, ?)", token.symbol),
+          total_supply: fragment("COALESCE(EXCLUDED.total_supply, ?)", token.total_supply),
+          decimals: fragment("COALESCE(EXCLUDED.decimals, ?)", token.decimals),
+          type: fragment("COALESCE(EXCLUDED.type, ?)", token.type),
+          cataloged: fragment("COALESCE(EXCLUDED.cataloged, ?)", token.cataloged),
+          skip_metadata: fragment("COALESCE(EXCLUDED.skip_metadata, ?)", token.skip_metadata),
           # `holder_count` is not updated as a pre-existing token means the `holder_count` is already initialized OR
           #   need to be migrated with `priv/repo/migrations/scripts/update_new_tokens_holder_count_in_batches.sql.exs`
           # Don't update `contract_address_hash` as it is the primary key and used for the conflict target

From 95b3101483961437492f0193e83ffa9c0ebbea0e Mon Sep 17 00:00:00 2001
From: Viktor Baranov <baranov.viktor.27@gmail.com>
Date: Wed, 15 Nov 2023 15:21:15 +0300
Subject: [PATCH 655/909] Smart-contract proxy detection refactoring

---
 .dialyzer-ignore                              |   2 +-
 .github/workflows/config.yml                  |  26 +-
 CHANGELOG.md                                  |   1 +
 ...ddress_contract_verification_controller.ex |   5 +-
 ...ification_via_flattened_code_controller.ex |   3 +-
 ...ntract_verification_via_json_controller.ex |   3 +-
 ...ication_via_multi_part_files_controller.ex |   3 +-
 ...tion_via_standard_json_input_controller.ex |   3 +-
 ..._contract_verification_vyper_controller.ex |   3 +-
 .../api/rpc/contract_controller.ex            |   6 +-
 .../v1/verified_smart_contract_controller.ex  |   3 +-
 .../controllers/api/v2/import_controller.ex   |   6 +-
 .../api/v2/smart_contract_controller.ex       |   4 +-
 .../api/v2/verification_controller.ex         |   3 +-
 .../controllers/smart_contract_controller.ex  |   2 +-
 .../controllers/tokens/contract_controller.ex |   4 +-
 .../templates/address_contract/index.html.eex |  14 +-
 .../new.html.eex                              |   2 +-
 .../new.html.eex                              |   2 +-
 .../new.html.eex                              |   4 +-
 .../new.html.eex                              |   2 +-
 .../smart_contract/_functions.html.eex        |  22 +-
 .../templates/tokens/overview/_tabs.html.eex  |   4 +-
 ...ct_verification_via_flattened_code_view.ex |   1 -
 ..._verification_via_multi_part_files_view.ex |   1 -
 ...rification_via_standard_json_input_view.ex |   1 -
 ...ddress_contract_verification_vyper_view.ex |   1 -
 .../views/address_contract_view.ex            |   2 +
 .../lib/block_scout_web/views/address_view.ex |   9 +-
 .../views/api/rpc/contract_view.ex            |   3 +-
 .../views/api/v2/smart_contract_view.ex       |   7 +-
 .../views/smart_contract_view.ex              |   4 +-
 .../views/tokens/overview_view.ex             |   9 +-
 apps/block_scout_web/priv/gettext/default.pot |  48 +-
 .../priv/gettext/en/LC_MESSAGES/default.po    |  48 +-
 .../address_read_contract_controller_test.exs |  16 +-
 .../address_read_proxy_controller_test.exs    |  16 +-
 ...address_write_contract_controller_test.exs |  16 +-
 .../address_write_proxy_controller_test.exs   |  16 +-
 .../api/rpc/contract_controller_test.exs      |  20 +-
 .../api/v2/smart_contract_controller_test.exs |  40 +
 .../api/v2/transaction_controller_test.exs    |   4 +-
 .../smart_contract_controller_test.exs        |  54 +-
 .../tokens/read_contract_controller_test.exs  |  16 +-
 ...saction_token_transfer_controller_test.exs |  12 +
 apps/explorer/lib/explorer/chain.ex           | 655 +-----------
 .../lib/explorer/chain/address/name.ex        |  44 +-
 .../lib/explorer/chain/block/reward.ex        |   8 +-
 apps/explorer/lib/explorer/chain/hash/full.ex |   2 +-
 apps/explorer/lib/explorer/chain/log.ex       |   3 +-
 .../lib/explorer/chain/smart_contract.ex      | 963 +++++++++++-------
 .../explorer/chain/smart_contract/proxy.ex    | 230 +++++
 .../chain/smart_contract/proxy/basic.ex       |  44 +
 .../chain/smart_contract/proxy/eip_1167.ex    |  54 +
 .../chain/smart_contract/proxy/eip_1822.ex    |  32 +
 .../chain/smart_contract/proxy/eip_1967.ex    | 101 ++
 .../chain/smart_contract/proxy/eip_930.ex     |  31 +
 .../chain/smart_contract/proxy/master_copy.ex |  43 +
 .../smart_contract_additional_sources.ex      |  21 +
 .../lib/explorer/chain/transaction.ex         |   3 +-
 .../lib/explorer/etherscan/contracts.ex       |  10 +-
 .../lib/explorer/smart_contract/reader.ex     |  12 +-
 .../smart_contract/solidity/publisher.ex      |   7 +-
 .../smart_contract/vyper/publisher.ex         |   3 +-
 .../lib/explorer/smart_contract/writer.ex     |   3 +-
 .../explorer/test/explorer/chain/log_test.exs |  16 +-
 .../chain/smart_contract/proxy_test.exs       | 384 +++++++
 .../explorer/chain/smart_contract_test.exs    | 660 ++++++++++--
 .../test/explorer/chain/transaction_test.exs  |  19 +-
 apps/explorer/test/explorer/chain_test.exs    | 643 ------------
 apps/indexer/lib/indexer/block/fetcher.ex     |   1 -
 cspell.json                                   |   2 +
 72 files changed, 2547 insertions(+), 1918 deletions(-)
 create mode 100644 apps/explorer/lib/explorer/chain/smart_contract/proxy.ex
 create mode 100644 apps/explorer/lib/explorer/chain/smart_contract/proxy/basic.ex
 create mode 100644 apps/explorer/lib/explorer/chain/smart_contract/proxy/eip_1167.ex
 create mode 100644 apps/explorer/lib/explorer/chain/smart_contract/proxy/eip_1822.ex
 create mode 100644 apps/explorer/lib/explorer/chain/smart_contract/proxy/eip_1967.ex
 create mode 100644 apps/explorer/lib/explorer/chain/smart_contract/proxy/eip_930.ex
 create mode 100644 apps/explorer/lib/explorer/chain/smart_contract/proxy/master_copy.ex
 create mode 100644 apps/explorer/test/explorer/chain/smart_contract/proxy_test.exs

diff --git a/.dialyzer-ignore b/.dialyzer-ignore
index c36e55ab7ae5..7ee843f9190e 100644
--- a/.dialyzer-ignore
+++ b/.dialyzer-ignore
@@ -25,4 +25,4 @@ lib/indexer/fetcher/zkevm/transaction_batch.ex:156
 lib/indexer/fetcher/zkevm/transaction_batch.ex:252
 lib/block_scout_web/views/api/v2/transaction_view.ex:431
 lib/block_scout_web/views/api/v2/transaction_view.ex:472
-lib/explorer/chain/transaction.ex:166
+lib/explorer/chain/transaction.ex:167
diff --git a/.github/workflows/config.yml b/.github/workflows/config.yml
index 0b7346dc7b11..b286c178f161 100644
--- a/.github/workflows/config.yml
+++ b/.github/workflows/config.yml
@@ -55,7 +55,7 @@ jobs:
           path: |
             deps
             _build
-          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_25-${{ hashFiles('mix.lock') }}
+          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_26-${{ hashFiles('mix.lock') }}
           restore-keys: |
             ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-
 
@@ -113,7 +113,7 @@ jobs:
           path: |
             deps
             _build
-          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_25-${{ hashFiles('mix.lock') }}
+          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_26-${{ hashFiles('mix.lock') }}
           restore-keys: |
             ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-"
 
@@ -137,7 +137,7 @@ jobs:
           path: |
             deps
             _build
-          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_25-${{ hashFiles('mix.lock') }}
+          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_26-${{ hashFiles('mix.lock') }}
           restore-keys: |
             ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-"
 
@@ -160,7 +160,7 @@ jobs:
           path: |
             deps
             _build
-          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_25-${{ hashFiles('mix.lock') }}
+          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_26-${{ hashFiles('mix.lock') }}
           restore-keys: |
             ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-"
 
@@ -200,7 +200,7 @@ jobs:
           path: |
             deps
             _build
-          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_25-${{ hashFiles('mix.lock') }}
+          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_26-${{ hashFiles('mix.lock') }}
           restore-keys: |
             ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-"
 
@@ -226,7 +226,7 @@ jobs:
           path: |
             deps
             _build
-          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_25-${{ hashFiles('mix.lock') }}
+          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_26-${{ hashFiles('mix.lock') }}
           restore-keys: |
             ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-"
 
@@ -255,7 +255,7 @@ jobs:
           path: |
             deps
             _build
-          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_25-${{ hashFiles('mix.lock') }}
+          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_26-${{ hashFiles('mix.lock') }}
           restore-keys: |
             ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-"
 
@@ -303,7 +303,7 @@ jobs:
           path: |
             deps
             _build
-          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_25-${{ hashFiles('mix.lock') }}
+          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_26-${{ hashFiles('mix.lock') }}
           restore-keys: |
             ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-"
 
@@ -349,7 +349,7 @@ jobs:
           path: |
             deps
             _build
-          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_25-${{ hashFiles('mix.lock') }}
+          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_26-${{ hashFiles('mix.lock') }}
           restore-keys: |
             ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-"
 
@@ -406,7 +406,7 @@ jobs:
           path: |
             deps
             _build
-          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_25-${{ hashFiles('mix.lock') }}
+          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_26-${{ hashFiles('mix.lock') }}
           restore-keys: |
             ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-"
 
@@ -460,7 +460,7 @@ jobs:
           path: |
             deps
             _build
-          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_25-${{ hashFiles('mix.lock') }}
+          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_26-${{ hashFiles('mix.lock') }}
           restore-keys: |
             ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-"
 
@@ -525,7 +525,7 @@ jobs:
           path: |
             deps
             _build
-          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_25-${{ hashFiles('mix.lock') }}
+          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_26-${{ hashFiles('mix.lock') }}
           restore-keys: |
             ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-"
 
@@ -589,7 +589,7 @@ jobs:
           path: |
             deps
             _build
-          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_25-${{ hashFiles('mix.lock') }}
+          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_26-${{ hashFiles('mix.lock') }}
           restore-keys: |
             ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-"
 
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 84ecb8bef440..bdd5dbb4f823 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -26,6 +26,7 @@
 ### Chore
 
 - [#8832](https://github.com/blockscout/blockscout/pull/8832) - Log more details in regards 413 error
+- [#8807](https://github.com/blockscout/blockscout/pull/8807) - Smart-contract proxy detection refactoring
 - [#8802](https://github.com/blockscout/blockscout/pull/8802) - Enable API v2 by default
 - [#8728](https://github.com/blockscout/blockscout/pull/8728) - Remove repos_list (default value for ecto repos) from Explorer.ReleaseTasks
 
diff --git a/apps/block_scout_web/lib/block_scout_web/controllers/address_contract_verification_controller.ex b/apps/block_scout_web/lib/block_scout_web/controllers/address_contract_verification_controller.ex
index 5a00556fac09..60f4720aef37 100644
--- a/apps/block_scout_web/lib/block_scout_web/controllers/address_contract_verification_controller.ex
+++ b/apps/block_scout_web/lib/block_scout_web/controllers/address_contract_verification_controller.ex
@@ -2,7 +2,6 @@ defmodule BlockScoutWeb.AddressContractVerificationController do
   use BlockScoutWeb, :controller
 
   alias BlockScoutWeb.Controller
-  alias Explorer.Chain
   alias Explorer.Chain.Events.Publisher, as: EventsPublisher
   alias Explorer.Chain.SmartContract
   alias Explorer.SmartContract.{CompilerVersion, Solidity.CodeCompiler}
@@ -12,7 +11,7 @@ defmodule BlockScoutWeb.AddressContractVerificationController do
   alias Explorer.ThirdPartyIntegrations.Sourcify
 
   def new(conn, %{"address_id" => address_hash_string}) do
-    if Chain.smart_contract_fully_verified?(address_hash_string) do
+    if SmartContract.verified_with_full_match?(address_hash_string) do
       address_contract_path =
         conn
         |> address_contract_path(:index, address_hash_string)
@@ -122,7 +121,7 @@ defmodule BlockScoutWeb.AddressContractVerificationController do
     json_file = PublishHelper.get_one_json(files_array)
 
     if json_file do
-      if Chain.smart_contract_fully_verified?(address_hash_string) do
+      if SmartContract.verified_with_full_match?(address_hash_string) do
         EventsPublisher.broadcast(
           PublishHelper.prepare_verification_error(
             "This contract already verified in Blockscout.",
diff --git a/apps/block_scout_web/lib/block_scout_web/controllers/address_contract_verification_via_flattened_code_controller.ex b/apps/block_scout_web/lib/block_scout_web/controllers/address_contract_verification_via_flattened_code_controller.ex
index fab2192cfae0..72cd3aeb3bca 100644
--- a/apps/block_scout_web/lib/block_scout_web/controllers/address_contract_verification_via_flattened_code_controller.ex
+++ b/apps/block_scout_web/lib/block_scout_web/controllers/address_contract_verification_via_flattened_code_controller.ex
@@ -2,12 +2,11 @@ defmodule BlockScoutWeb.AddressContractVerificationViaFlattenedCodeController do
   use BlockScoutWeb, :controller
 
   alias BlockScoutWeb.Controller
-  alias Explorer.Chain
   alias Explorer.Chain.SmartContract
   alias Explorer.SmartContract.{CompilerVersion, Solidity.CodeCompiler, Solidity.PublisherWorker}
 
   def new(conn, %{"address_id" => address_hash_string}) do
-    if Chain.smart_contract_fully_verified?(address_hash_string) do
+    if SmartContract.verified_with_full_match?(address_hash_string) do
       address_contract_path =
         conn
         |> address_contract_path(:index, address_hash_string)
diff --git a/apps/block_scout_web/lib/block_scout_web/controllers/address_contract_verification_via_json_controller.ex b/apps/block_scout_web/lib/block_scout_web/controllers/address_contract_verification_via_json_controller.ex
index 87a75ac7cb7e..b41ae1517fdc 100644
--- a/apps/block_scout_web/lib/block_scout_web/controllers/address_contract_verification_via_json_controller.ex
+++ b/apps/block_scout_web/lib/block_scout_web/controllers/address_contract_verification_via_json_controller.ex
@@ -2,7 +2,6 @@ defmodule BlockScoutWeb.AddressContractVerificationViaJsonController do
   use BlockScoutWeb, :controller
 
   alias BlockScoutWeb.Controller
-  alias Explorer.Chain
   alias Explorer.Chain.SmartContract
   alias Explorer.SmartContract.Solidity.PublishHelper
   alias Explorer.ThirdPartyIntegrations.Sourcify
@@ -13,7 +12,7 @@ defmodule BlockScoutWeb.AddressContractVerificationViaJsonController do
       |> address_contract_path(:index, address_hash_string)
       |> Controller.full_path()
 
-    if Chain.smart_contract_fully_verified?(address_hash_string) do
+    if SmartContract.verified_with_full_match?(address_hash_string) do
       redirect(conn, to: address_contract_path)
     else
       case Sourcify.check_by_address(address_hash_string) do
diff --git a/apps/block_scout_web/lib/block_scout_web/controllers/address_contract_verification_via_multi_part_files_controller.ex b/apps/block_scout_web/lib/block_scout_web/controllers/address_contract_verification_via_multi_part_files_controller.ex
index 7d0f819e96e2..78f6ea6b99c4 100644
--- a/apps/block_scout_web/lib/block_scout_web/controllers/address_contract_verification_via_multi_part_files_controller.ex
+++ b/apps/block_scout_web/lib/block_scout_web/controllers/address_contract_verification_via_multi_part_files_controller.ex
@@ -2,12 +2,11 @@ defmodule BlockScoutWeb.AddressContractVerificationViaMultiPartFilesController d
   use BlockScoutWeb, :controller
 
   alias BlockScoutWeb.Controller
-  alias Explorer.Chain
   alias Explorer.Chain.SmartContract
   alias Explorer.SmartContract.{CompilerVersion, Solidity.CodeCompiler}
 
   def new(conn, %{"address_id" => address_hash_string}) do
-    if Chain.smart_contract_fully_verified?(address_hash_string) do
+    if SmartContract.verified_with_full_match?(address_hash_string) do
       address_contract_path =
         conn
         |> address_contract_path(:index, address_hash_string)
diff --git a/apps/block_scout_web/lib/block_scout_web/controllers/address_contract_verification_via_standard_json_input_controller.ex b/apps/block_scout_web/lib/block_scout_web/controllers/address_contract_verification_via_standard_json_input_controller.ex
index 1938269f79ef..37447acd8195 100644
--- a/apps/block_scout_web/lib/block_scout_web/controllers/address_contract_verification_via_standard_json_input_controller.ex
+++ b/apps/block_scout_web/lib/block_scout_web/controllers/address_contract_verification_via_standard_json_input_controller.ex
@@ -2,12 +2,11 @@ defmodule BlockScoutWeb.AddressContractVerificationViaStandardJsonInputControlle
   use BlockScoutWeb, :controller
 
   alias BlockScoutWeb.Controller
-  alias Explorer.Chain
   alias Explorer.Chain.SmartContract
   alias Explorer.SmartContract.CompilerVersion
 
   def new(conn, %{"address_id" => address_hash_string}) do
-    if Chain.smart_contract_fully_verified?(address_hash_string) do
+    if SmartContract.verified_with_full_match?(address_hash_string) do
       address_contract_path =
         conn
         |> address_contract_path(:index, address_hash_string)
diff --git a/apps/block_scout_web/lib/block_scout_web/controllers/address_contract_verification_vyper_controller.ex b/apps/block_scout_web/lib/block_scout_web/controllers/address_contract_verification_vyper_controller.ex
index 19123f940057..6c978901cd0a 100644
--- a/apps/block_scout_web/lib/block_scout_web/controllers/address_contract_verification_vyper_controller.ex
+++ b/apps/block_scout_web/lib/block_scout_web/controllers/address_contract_verification_vyper_controller.ex
@@ -2,12 +2,11 @@ defmodule BlockScoutWeb.AddressContractVerificationVyperController do
   use BlockScoutWeb, :controller
 
   alias BlockScoutWeb.Controller
-  alias Explorer.Chain
   alias Explorer.Chain.SmartContract
   alias Explorer.SmartContract.{CompilerVersion, Vyper.PublisherWorker}
 
   def new(conn, %{"address_id" => address_hash_string}) do
-    if Chain.smart_contract_fully_verified?(address_hash_string) do
+    if SmartContract.verified_with_full_match?(address_hash_string) do
       address_contract_path =
         conn
         |> address_contract_path(:index, address_hash_string)
diff --git a/apps/block_scout_web/lib/block_scout_web/controllers/api/rpc/contract_controller.ex b/apps/block_scout_web/lib/block_scout_web/controllers/api/rpc/contract_controller.ex
index fd80cf7ad77d..5939df0d2569 100644
--- a/apps/block_scout_web/lib/block_scout_web/controllers/api/rpc/contract_controller.ex
+++ b/apps/block_scout_web/lib/block_scout_web/controllers/api/rpc/contract_controller.ex
@@ -83,7 +83,7 @@ defmodule BlockScoutWeb.API.RPC.ContractController do
         []
       end
 
-    if Chain.smart_contract_fully_verified?(address_hash) do
+    if SmartContract.verified_with_full_match?(address_hash) do
       render(conn, :error, error: @verified)
     else
       case Sourcify.check_by_address(address_hash) do
@@ -114,7 +114,7 @@ defmodule BlockScoutWeb.API.RPC.ContractController do
         } = params
       ) do
     with {:check_verified_status, false} <-
-           {:check_verified_status, Chain.smart_contract_fully_verified?(address_hash)},
+           {:check_verified_status, SmartContract.verified_with_full_match?(address_hash)},
          {:format, {:ok, _casted_address_hash}} <- to_address_hash(address_hash),
          {:params, {:ok, fetched_params}} <- {:params, fetch_verifysourcecode_params(params)},
          uid <- VerificationStatus.generate_uid(address_hash) do
@@ -457,7 +457,7 @@ defmodule BlockScoutWeb.API.RPC.ContractController do
     _ = PublishHelper.check_and_verify(Hash.to_string(address_hash))
 
     result =
-      case Chain.address_hash_to_smart_contract(address_hash) do
+      case SmartContract.address_hash_to_smart_contract(address_hash) do
         nil ->
           :not_found
 
diff --git a/apps/block_scout_web/lib/block_scout_web/controllers/api/v1/verified_smart_contract_controller.ex b/apps/block_scout_web/lib/block_scout_web/controllers/api/v1/verified_smart_contract_controller.ex
index 6608c246d062..2edc07e8dec8 100644
--- a/apps/block_scout_web/lib/block_scout_web/controllers/api/v1/verified_smart_contract_controller.ex
+++ b/apps/block_scout_web/lib/block_scout_web/controllers/api/v1/verified_smart_contract_controller.ex
@@ -3,12 +3,13 @@ defmodule BlockScoutWeb.API.V1.VerifiedSmartContractController do
 
   alias Explorer.Chain
   alias Explorer.Chain.Hash.Address
+  alias Explorer.Chain.SmartContract
   alias Explorer.SmartContract.Solidity.Publisher
 
   def create(conn, params) do
     with {:ok, hash} <- validate_address_hash(params["address_hash"]),
          :ok <- Chain.check_address_exists(hash),
-         {:contract, :not_found} <- {:contract, Chain.check_verified_smart_contract_exists(hash)} do
+         {:contract, :not_found} <- {:contract, SmartContract.check_verified_smart_contract_exists(hash)} do
       external_libraries = fetch_external_libraries(params)
 
       case Publisher.publish(hash, params, external_libraries) do
diff --git a/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/import_controller.ex b/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/import_controller.ex
index 76aa988edfc7..d8fefb4f2b5c 100644
--- a/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/import_controller.ex
+++ b/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/import_controller.ex
@@ -3,7 +3,7 @@ defmodule BlockScoutWeb.API.V2.ImportController do
 
   alias BlockScoutWeb.API.V2.ApiView
   alias Explorer.{Chain, Repo}
-  alias Explorer.Chain.{Data, Token}
+  alias Explorer.Chain.{Data, SmartContract, Token}
   alias Explorer.Chain.Fetcher.LookUpSmartContractSourcesOnDemand
   alias Explorer.SmartContract.EthBytecodeDBInterface
 
@@ -60,7 +60,7 @@ defmodule BlockScoutWeb.API.V2.ImportController do
     Protected by `x-api-key` header.
   """
   @spec try_to_search_contract(Plug.Conn.t(), map()) ::
-          {:already_verified, nil | Explorer.Chain.SmartContract.t()}
+          {:already_verified, nil | SmartContract.t()}
           | {:api_key, nil | binary()}
           | {:format, :error}
           | {:not_found, {:error, :not_found}}
@@ -73,7 +73,7 @@ defmodule BlockScoutWeb.API.V2.ImportController do
          {:format, {:ok, address_hash}} <- {:format, Chain.string_to_address_hash(address_hash_string)},
          {:not_found, {:ok, address}} <- {:not_found, Chain.hash_to_address(address_hash, @api_true, false)},
          {:already_verified, smart_contract} when is_nil(smart_contract) <-
-           {:already_verified, Chain.address_hash_to_smart_contract_without_twin(address_hash, @api_true)} do
+           {:already_verified, SmartContract.address_hash_to_smart_contract_without_twin(address_hash, @api_true)} do
       creation_tx_input = contract_creation_input(address.hash)
 
       with {:ok, %{"sourceType" => type} = source} <-
diff --git a/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/smart_contract_controller.ex b/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/smart_contract_controller.ex
index d9c60969a48c..ab443c33571f 100644
--- a/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/smart_contract_controller.ex
+++ b/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/smart_contract_controller.ex
@@ -60,7 +60,7 @@ defmodule BlockScoutWeb.API.V2.SmartContractController do
   def methods_read(conn, %{"address_hash" => address_hash_string} = params) do
     with {:format, {:ok, address_hash}} <- {:format, Chain.string_to_address_hash(address_hash_string)},
          {:ok, false} <- AccessHelper.restricted_access?(address_hash_string, params),
-         smart_contract <- Chain.address_hash_to_smart_contract(address_hash, @api_true),
+         smart_contract <- SmartContract.address_hash_to_smart_contract(address_hash, @api_true),
          {:not_found, false} <- {:not_found, is_nil(smart_contract)} do
       read_only_functions_from_abi = Reader.read_only_functions(smart_contract, address_hash, params["from"])
 
@@ -90,7 +90,7 @@ defmodule BlockScoutWeb.API.V2.SmartContractController do
            {:contract_interaction_disabled, AddressView.contract_interaction_disabled?()},
          {:format, {:ok, address_hash}} <- {:format, Chain.string_to_address_hash(address_hash_string)},
          {:ok, false} <- AccessHelper.restricted_access?(address_hash_string, params),
-         smart_contract <- Chain.address_hash_to_smart_contract(address_hash, @api_true),
+         smart_contract <- SmartContract.address_hash_to_smart_contract(address_hash, @api_true),
          {:not_found, false} <- {:not_found, is_nil(smart_contract)} do
       conn
       |> put_status(200)
diff --git a/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/verification_controller.ex b/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/verification_controller.ex
index b2bbb07d3189..449630b14cad 100644
--- a/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/verification_controller.ex
+++ b/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/verification_controller.ex
@@ -8,6 +8,7 @@ defmodule BlockScoutWeb.API.V2.VerificationController do
   alias BlockScoutWeb.AccessHelper
   alias BlockScoutWeb.API.V2.ApiView
   alias Explorer.Chain
+  alias Explorer.Chain.SmartContract
   alias Explorer.SmartContract.Solidity.PublisherWorker, as: SolidityPublisherWorker
   alias Explorer.SmartContract.Solidity.PublishHelper
   alias Explorer.SmartContract.Vyper.PublisherWorker, as: VyperPublisherWorker
@@ -282,7 +283,7 @@ defmodule BlockScoutWeb.API.V2.VerificationController do
     with {:format, {:ok, address_hash}} <- {:format, Chain.string_to_address_hash(address_hash_string)},
          {:ok, false} <- AccessHelper.restricted_access?(address_hash_string, params),
          {:already_verified, false} <-
-           {:already_verified, Chain.smart_contract_fully_verified?(address_hash, @api_true)} do
+           {:already_verified, SmartContract.verified_with_full_match?(address_hash, @api_true)} do
       :validated
     end
   end
diff --git a/apps/block_scout_web/lib/block_scout_web/controllers/smart_contract_controller.ex b/apps/block_scout_web/lib/block_scout_web/controllers/smart_contract_controller.ex
index 30832eee4aae..acaee3f7bd4d 100644
--- a/apps/block_scout_web/lib/block_scout_web/controllers/smart_contract_controller.ex
+++ b/apps/block_scout_web/lib/block_scout_web/controllers/smart_contract_controller.ex
@@ -65,7 +65,7 @@ defmodule BlockScoutWeb.SmartContractController do
       implementation_abi =
         if contract_type == "proxy" do
           implementation_address_hash_string
-          |> Chain.get_implementation_abi()
+          |> SmartContract.get_smart_contract_abi()
           |> Poison.encode!()
         else
           []
diff --git a/apps/block_scout_web/lib/block_scout_web/controllers/tokens/contract_controller.ex b/apps/block_scout_web/lib/block_scout_web/controllers/tokens/contract_controller.ex
index f792297e3a3c..1e9828a4735d 100644
--- a/apps/block_scout_web/lib/block_scout_web/controllers/tokens/contract_controller.ex
+++ b/apps/block_scout_web/lib/block_scout_web/controllers/tokens/contract_controller.ex
@@ -6,13 +6,13 @@ defmodule BlockScoutWeb.Tokens.ContractController do
 
   alias BlockScoutWeb.{AccessHelper, TabHelper}
   alias Explorer.Chain
-  alias Explorer.Chain.Address
+  alias Explorer.Chain.{Address, SmartContract}
 
   def index(conn, %{"token_id" => address_hash_string} = params) do
     options = [necessity_by_association: %{[contract_address: :smart_contract] => :optional}]
 
     with {:ok, address_hash} <- Chain.string_to_address_hash(address_hash_string),
-         :ok <- Chain.check_verified_smart_contract_exists(address_hash),
+         :ok <- SmartContract.check_verified_smart_contract_exists(address_hash),
          {:ok, token} <- Chain.token_from_address_hash(address_hash, options),
          {:ok, false} <- AccessHelper.restricted_access?(address_hash_string, params) do
       %{type: type, action: action} =
diff --git a/apps/block_scout_web/lib/block_scout_web/templates/address_contract/index.html.eex b/apps/block_scout_web/lib/block_scout_web/templates/address_contract/index.html.eex
index 77c96739cb5d..1d6776ecf04d 100644
--- a/apps/block_scout_web/lib/block_scout_web/templates/address_contract/index.html.eex
+++ b/apps/block_scout_web/lib/block_scout_web/templates/address_contract/index.html.eex
@@ -1,9 +1,9 @@
 <% contract_creation_code = contract_creation_code(@address) %>
-<% minimal_proxy_template = Chain.get_minimal_proxy_template(@address.hash) %>
-<% metadata_for_verification = minimal_proxy_template || Chain.get_address_verified_twin_contract(@address.hash).verified_contract %>
+<% minimal_proxy_template = EIP1167.get_implementation_address(@address.hash) %>
+<% metadata_for_verification = minimal_proxy_template || SmartContract.get_address_verified_twin_contract(@address.hash).verified_contract %>
 <% smart_contract_verified = BlockScoutWeb.AddressView.smart_contract_verified?(@address) %>
-<% additional_sources_from_twin = Chain.get_address_verified_twin_contract(@address.hash).additional_sources %>
-<% fully_verified = Chain.smart_contract_fully_verified?(@address.hash)%>
+<% additional_sources_from_twin = SmartContract.get_address_verified_twin_contract(@address.hash).additional_sources %>
+<% fully_verified = SmartContract.verified_with_full_match?(@address.hash)%>
 <% additional_sources = if smart_contract_verified, do: @address.smart_contract_additional_sources, else: additional_sources_from_twin %>
 <% visualize_sol2uml_enabled = Explorer.Visualize.Sol2uml.enabled?() %>
 <section class="container">
@@ -43,16 +43,16 @@
       <% end %>
       <%= if smart_contract_verified || (!smart_contract_verified && metadata_for_verification) do %>
         <% target_contract = if smart_contract_verified, do: @address.smart_contract, else: metadata_for_verification %>
-        <%= if @address.smart_contract.verified_via_sourcify && @address.smart_contract.partially_verified && smart_contract_verified do %>
+        <%= if @address.smart_contract && @address.smart_contract.verified_via_sourcify && @address.smart_contract.partially_verified && smart_contract_verified do %>
           <div class="mb-4">
             <i style="color: #f7b32b;" class="fa fa-info-circle"></i><span> <%= gettext("This contract has been partially verified via Sourcify.") %>
         <% else %>
-          <%= if @address.smart_contract.verified_via_sourcify && smart_contract_verified do %>
+          <%= if @address.smart_contract && @address.smart_contract.verified_via_sourcify && smart_contract_verified do %>
             <div class="mb-4">
               <i style="color: #f7b32b;" class="fa fa-info-circle"></i><span> <%= gettext("This contract has been verified via Sourcify.") %>
           <% end %>
         <% end %>
-        <%= if @address.smart_contract.verified_via_sourcify && smart_contract_verified do %>
+        <%= if @address.smart_contract && @address.smart_contract.verified_via_sourcify && smart_contract_verified do %>
           <a data-test="external_url" href=<%= sourcify_repo_url(@address.hash, @address.smart_contract.partially_verified) %> target="_blank">
             View contract in Sourcify repository <span class="external-token-icon"><%= render BlockScoutWeb.IconsView, "_external_link.html" %></span>
           </a>
diff --git a/apps/block_scout_web/lib/block_scout_web/templates/address_contract_verification_via_flattened_code/new.html.eex b/apps/block_scout_web/lib/block_scout_web/templates/address_contract_verification_via_flattened_code/new.html.eex
index 383aa4584d4c..b0a22d4bace6 100644
--- a/apps/block_scout_web/lib/block_scout_web/templates/address_contract_verification_via_flattened_code/new.html.eex
+++ b/apps/block_scout_web/lib/block_scout_web/templates/address_contract_verification_via_flattened_code/new.html.eex
@@ -1,4 +1,4 @@
-<% metadata_for_verification = if assigns[:retrying], do: nil, else: Chain.get_address_verified_twin_contract(@address_hash).verified_contract %>
+<% metadata_for_verification = if assigns[:retrying], do: nil, else: SmartContract.get_address_verified_twin_contract(@address_hash).verified_contract %>
 <% changeset = (if assigns[:retrying], do: @changeset, else: SmartContract.merge_twin_contract_with_changeset(metadata_for_verification, @changeset)) |> SmartContract.address_to_checksum_address() %>
 <% fetch_constructor_arguments_automatically = if metadata_for_verification, do: true, else: changeset.changes[:autodetect_constructor_args] || true %>
 <% display_constructor_arguments_text_area = if fetch_constructor_arguments_automatically, do: "none", else: "block" %>
diff --git a/apps/block_scout_web/lib/block_scout_web/templates/address_contract_verification_via_multi_part_files/new.html.eex b/apps/block_scout_web/lib/block_scout_web/templates/address_contract_verification_via_multi_part_files/new.html.eex
index a3b772456f61..938631b3e1aa 100644
--- a/apps/block_scout_web/lib/block_scout_web/templates/address_contract_verification_via_multi_part_files/new.html.eex
+++ b/apps/block_scout_web/lib/block_scout_web/templates/address_contract_verification_via_multi_part_files/new.html.eex
@@ -1,4 +1,4 @@
-<% metadata_for_verification = if assigns[:retrying], do: nil, else: Chain.get_address_verified_twin_contract(@address_hash).verified_contract %>
+<% metadata_for_verification = if assigns[:retrying], do: nil, else: SmartContract.get_address_verified_twin_contract(@address_hash).verified_contract %>
 <% changeset = (if assigns[:retrying], do: @changeset, else: SmartContract.merge_twin_contract_with_changeset(metadata_for_verification, @changeset)) |> SmartContract.address_to_checksum_address() %>
 <section data-page="contract-verification" class="container new-smart-contract-container">
   <%= render BlockScoutWeb.CommonComponentsView, "_channel_disconnected_message.html", text: gettext("Connection Lost") %>
diff --git a/apps/block_scout_web/lib/block_scout_web/templates/address_contract_verification_via_standard_json_input/new.html.eex b/apps/block_scout_web/lib/block_scout_web/templates/address_contract_verification_via_standard_json_input/new.html.eex
index 34b8d06cfe9d..a1fb8db78646 100644
--- a/apps/block_scout_web/lib/block_scout_web/templates/address_contract_verification_via_standard_json_input/new.html.eex
+++ b/apps/block_scout_web/lib/block_scout_web/templates/address_contract_verification_via_standard_json_input/new.html.eex
@@ -1,4 +1,4 @@
-<% metadata_for_verification = Chain.get_address_verified_twin_contract(@address_hash).verified_contract %>
+<% metadata_for_verification = SmartContract.get_address_verified_twin_contract(@address_hash).verified_contract %>
 <% changeset = (if assigns[:retrying], do: @changeset, else: SmartContract.merge_twin_contract_with_changeset(metadata_for_verification, @changeset)) |> SmartContract.address_to_checksum_address() %>
 <% fetch_constructor_arguments_automatically = if metadata_for_verification, do: true, else: changeset.changes[:autodetect_constructor_args] || true %>
 <% display_constructor_arguments_text_area = if fetch_constructor_arguments_automatically, do: "none", else: "block" %>
@@ -10,7 +10,7 @@
       <%= form_for changeset,
                 address_contract_verification_path(@conn, :create),
                 [id: "standard-json-dropzone-form"],
-                fn f -> %>      
+                fn f -> %>
       <%= render BlockScoutWeb.AddressContractVerificationCommonFieldsView, "_contract_address_field.html", f: f %>
 
       <%= render BlockScoutWeb.AddressContractVerificationCommonFieldsView, "_contract_name_field.html", f: f, tooltip: "Must match the name specified in the code. For example, in <span class=\"tooltip-quote\">contract MyContract {..}</span> <strong>MyContract</strong> is the contract name. Also contract name could be: <span class=\"tooltip-quote\"><strong>path/to/file.sol:MyContract</strong></span>" %>
diff --git a/apps/block_scout_web/lib/block_scout_web/templates/address_contract_verification_vyper/new.html.eex b/apps/block_scout_web/lib/block_scout_web/templates/address_contract_verification_vyper/new.html.eex
index 4b07896c63a6..a98282193b15 100644
--- a/apps/block_scout_web/lib/block_scout_web/templates/address_contract_verification_vyper/new.html.eex
+++ b/apps/block_scout_web/lib/block_scout_web/templates/address_contract_verification_vyper/new.html.eex
@@ -1,4 +1,4 @@
-<% metadata_for_verification = Chain.get_address_verified_twin_contract(@address_hash).verified_contract %>
+<% metadata_for_verification = SmartContract.get_address_verified_twin_contract(@address_hash).verified_contract %>
 <% changeset = (if assigns[:retrying], do: @changeset, else: SmartContract.merge_twin_vyper_contract_with_changeset(metadata_for_verification, @changeset)) |> SmartContract.address_to_checksum_address() %>
 <section data-page="contract-verification" class="container new-smart-contract-container">
   <%= render BlockScoutWeb.CommonComponentsView, "_channel_disconnected_message.html", text: gettext("Connection Lost") %>
diff --git a/apps/block_scout_web/lib/block_scout_web/templates/smart_contract/_functions.html.eex b/apps/block_scout_web/lib/block_scout_web/templates/smart_contract/_functions.html.eex
index af6885a21160..9fc0998535ab 100644
--- a/apps/block_scout_web/lib/block_scout_web/templates/smart_contract/_functions.html.eex
+++ b/apps/block_scout_web/lib/block_scout_web/templates/smart_contract/_functions.html.eex
@@ -1,5 +1,5 @@
-<% minimal_proxy_template = if assigns[:custom_abi], do: nil, else: Chain.get_minimal_proxy_template(@address.hash) %>
-<% metadata_for_verification = if assigns[:custom_abi], do: nil, else: minimal_proxy_template || Chain.get_address_verified_twin_contract(@address.hash).verified_contract %>
+<% minimal_proxy_template = if assigns[:custom_abi], do: nil, else: EIP1167.get_implementation_address(@address.hash) %>
+<% metadata_for_verification = if assigns[:custom_abi], do: nil, else: minimal_proxy_template || SmartContract.get_address_verified_twin_contract(@address.hash).verified_contract %>
 <% smart_contract_verified = if assigns[:custom_abi], do: false, else: BlockScoutWeb.AddressView.smart_contract_verified?(@address) %>
 <%= unless smart_contract_verified do %>
   <%= if metadata_for_verification do %>
@@ -52,8 +52,8 @@
 
     <%= if queryable?(function["inputs"]) || writable?(function) || Helper.read_with_wallet_method?(function) do %>
       <div style="width: 100%; overflow: hidden;">
-        <% function_abi = 
-                    case Jason.encode([function]) do 
+        <% function_abi =
+                    case Jason.encode([function]) do
                       {:ok, abi_string} ->
                         abi_string
                       _ ->
@@ -61,7 +61,7 @@
                           @implementation_abi
                         else
                           @contract_abi
-                        end 
+                        end
                     end %>
         <form class="form-inline" data-function-form data-action="<%= if @action == "write", do: :write, else: :read %>" data-type="<%= @contract_type %>" data-url="<%= smart_contract_path(@conn, :show, Address.checksum(@address.hash)) %>" data-contract-address="<%= @address.hash %>" data-contract-abi="<%= function_abi %>" data-implementation-abi="<%= function_abi %>" data-chain-id="<%= Application.get_env(:block_scout_web, :chain_id) %>" data-custom-abi="<%= if assigns[:custom_abi], do: true, else: false %>">
           <input type="hidden" name="function_name" value='<%= function["name"] %>' />
@@ -78,17 +78,17 @@
                     <span class="button btn-line button-xs contract-plus-btn-container ml-1">
                       <i class="fa fa-plus contract-plus-btn"></i>
                     </span>
-                    <div class="dropdown-menu exponention-dropdown">  
+                    <div class="dropdown-menu exponention-dropdown">
                       <div class="dropdown-item contract-exponentiation-btn" data-power=6>10<sup>6</sup></div>
                       <div class="dropdown-item contract-exponentiation-btn" data-power=8>10<sup>8</sup></div>
                       <div class="dropdown-item contract-exponentiation-btn" data-power=18>10<sup>18</sup></div>
-                      <div class="dropdown-item contract-exponentiation-btn" data-power><input type="number" name="custom_power" class="form-control form-control-sm address-input-sm ml-1 custom-power-input" />10</div> 
+                      <div class="dropdown-item contract-exponentiation-btn" data-power><input type="number" name="custom_power" class="form-control form-control-sm address-input-sm ml-1 custom-power-input" />10</div>
                     </div>
                   </span>
 
                 <% else %>
-                  <input type="text" name="function_input" class="form-control form-control-sm address-input-sm" 
-                  placeholder='<%= input["name"] %>(<%= input["type"] %>)' 
+                  <input type="text" name="function_input" class="form-control form-control-sm address-input-sm"
+                  placeholder='<%= input["name"] %>(<%= input["type"] %>)'
                   size="<%= String.length(input["name"]) + String.length(input["type"]) + 2 %>" />
                 <% end %>
               </div>
@@ -143,7 +143,7 @@
                         <span class="d-none" data-conversion-text-eth><%= Explorer.coin_name() %></span>
                       </span>
                     </div>
-                  </div> 
+                  </div>
                 <% else %>
                   <div class="align-self-center function-output word-break-all <%= if not_last_element?(length, index), do: "mb-1" %>"><%= raw(values_with_type(output["value"], output["type"], fetch_name(function["names"], index), 0)) %></div>
                 <% end %>
@@ -158,4 +158,4 @@
       <% end %>
     <% end %>
   </div>
-<% end %>
\ No newline at end of file
+<% end %>
diff --git a/apps/block_scout_web/lib/block_scout_web/templates/tokens/overview/_tabs.html.eex b/apps/block_scout_web/lib/block_scout_web/templates/tokens/overview/_tabs.html.eex
index 0d92f45a146b..518c16191172 100644
--- a/apps/block_scout_web/lib/block_scout_web/templates/tokens/overview/_tabs.html.eex
+++ b/apps/block_scout_web/lib/block_scout_web/templates/tokens/overview/_tabs.html.eex
@@ -1,5 +1,5 @@
 <% address_hash = Address.checksum(@token.contract_address_hash) %>
-<% is_proxy = BlockScoutWeb.Tokens.OverviewView.smart_contract_is_proxy?(@token) %>
+<% is_proxy = BlockScoutWeb.Tokens.OverviewView.token_smart_contract_is_proxy?(@token) %>
 <div class="card-tabs js-card-tabs">
   <%= link(
         gettext("Token Transfers"),
@@ -50,4 +50,4 @@
         class: "card-tab #{tab_status("write-proxy", @conn.request_path)}")
         %>
   <% end %>
-</div>
\ No newline at end of file
+</div>
diff --git a/apps/block_scout_web/lib/block_scout_web/views/address_contract_verification_via_flattened_code_view.ex b/apps/block_scout_web/lib/block_scout_web/views/address_contract_verification_via_flattened_code_view.ex
index f6e676d7fcdf..e5adf9b9d4ae 100644
--- a/apps/block_scout_web/lib/block_scout_web/views/address_contract_verification_via_flattened_code_view.ex
+++ b/apps/block_scout_web/lib/block_scout_web/views/address_contract_verification_via_flattened_code_view.ex
@@ -1,7 +1,6 @@
 defmodule BlockScoutWeb.AddressContractVerificationViaFlattenedCodeView do
   use BlockScoutWeb, :view
 
-  alias Explorer.Chain
   alias Explorer.Chain.SmartContract
   alias Explorer.SmartContract.RustVerifierInterface
 end
diff --git a/apps/block_scout_web/lib/block_scout_web/views/address_contract_verification_via_multi_part_files_view.ex b/apps/block_scout_web/lib/block_scout_web/views/address_contract_verification_via_multi_part_files_view.ex
index 12a80e5eb282..76f88f059ac0 100644
--- a/apps/block_scout_web/lib/block_scout_web/views/address_contract_verification_via_multi_part_files_view.ex
+++ b/apps/block_scout_web/lib/block_scout_web/views/address_contract_verification_via_multi_part_files_view.ex
@@ -1,7 +1,6 @@
 defmodule BlockScoutWeb.AddressContractVerificationViaMultiPartFilesView do
   use BlockScoutWeb, :view
 
-  alias Explorer.Chain
   alias Explorer.Chain.SmartContract
   alias Explorer.SmartContract.RustVerifierInterface
 end
diff --git a/apps/block_scout_web/lib/block_scout_web/views/address_contract_verification_via_standard_json_input_view.ex b/apps/block_scout_web/lib/block_scout_web/views/address_contract_verification_via_standard_json_input_view.ex
index cf45efe96f0a..9a4298a01c4b 100644
--- a/apps/block_scout_web/lib/block_scout_web/views/address_contract_verification_via_standard_json_input_view.ex
+++ b/apps/block_scout_web/lib/block_scout_web/views/address_contract_verification_via_standard_json_input_view.ex
@@ -1,6 +1,5 @@
 defmodule BlockScoutWeb.AddressContractVerificationViaStandardJsonInputView do
   use BlockScoutWeb, :view
 
-  alias Explorer.Chain
   alias Explorer.Chain.SmartContract
 end
diff --git a/apps/block_scout_web/lib/block_scout_web/views/address_contract_verification_vyper_view.ex b/apps/block_scout_web/lib/block_scout_web/views/address_contract_verification_vyper_view.ex
index e0ebba9694a1..47da5eab9093 100644
--- a/apps/block_scout_web/lib/block_scout_web/views/address_contract_verification_vyper_view.ex
+++ b/apps/block_scout_web/lib/block_scout_web/views/address_contract_verification_vyper_view.ex
@@ -1,6 +1,5 @@
 defmodule BlockScoutWeb.AddressContractVerificationVyperView do
   use BlockScoutWeb, :view
 
-  alias Explorer.Chain
   alias Explorer.Chain.SmartContract
 end
diff --git a/apps/block_scout_web/lib/block_scout_web/views/address_contract_view.ex b/apps/block_scout_web/lib/block_scout_web/views/address_contract_view.ex
index 608971ec7af6..230f17c8ed60 100644
--- a/apps/block_scout_web/lib/block_scout_web/views/address_contract_view.ex
+++ b/apps/block_scout_web/lib/block_scout_web/views/address_contract_view.ex
@@ -6,6 +6,8 @@ defmodule BlockScoutWeb.AddressContractView do
   alias ABI.FunctionSelector
   alias Explorer.Chain
   alias Explorer.Chain.{Address, Data, InternalTransaction, Transaction}
+  alias Explorer.Chain.SmartContract
+  alias Explorer.Chain.SmartContract.Proxy.EIP1167
 
   def render("scripts.html", %{conn: conn}) do
     render_scripts(conn, "address_contract/code_highlighting.js")
diff --git a/apps/block_scout_web/lib/block_scout_web/views/address_view.ex b/apps/block_scout_web/lib/block_scout_web/views/address_view.ex
index 3098dfc09692..3884c86db8dd 100644
--- a/apps/block_scout_web/lib/block_scout_web/views/address_view.ex
+++ b/apps/block_scout_web/lib/block_scout_web/views/address_view.ex
@@ -9,6 +9,7 @@ defmodule BlockScoutWeb.AddressView do
   alias Explorer.Chain.Address.Counters
   alias Explorer.Chain.{Address, Hash, InternalTransaction, Log, SmartContract, Token, TokenTransfer, Transaction, Wei}
   alias Explorer.Chain.Block.Reward
+  alias Explorer.Chain.SmartContract.Proxy
   alias Explorer.ExchangeRates.Token, as: TokenExchangeRate
   alias Explorer.SmartContract.{Helper, Writer}
 
@@ -199,7 +200,7 @@ defmodule BlockScoutWeb.AddressView do
 
   def primary_name(%Address{names: _} = address) do
     with false <- is_nil(address.contract_code),
-         twin <- Chain.get_verified_twin_contract(address),
+         twin <- SmartContract.get_verified_twin_contract(address),
          false <- is_nil(twin) do
       twin.name
     else
@@ -264,8 +265,8 @@ defmodule BlockScoutWeb.AddressView do
 
   def smart_contract_is_proxy?(address, options \\ [])
 
-  def smart_contract_is_proxy?(%Address{smart_contract: %SmartContract{} = smart_contract}, options) do
-    SmartContract.proxy_contract?(smart_contract, options)
+  def smart_contract_is_proxy?(%Address{smart_contract: %SmartContract{} = smart_contract}, _options) do
+    Proxy.proxy_contract?(smart_contract)
   end
 
   def smart_contract_is_proxy?(%Address{smart_contract: _}, _), do: false
@@ -456,7 +457,7 @@ defmodule BlockScoutWeb.AddressView do
   end
 
   def smart_contract_is_gnosis_safe_proxy?(%Address{smart_contract: %SmartContract{}} = address) do
-    address.smart_contract.name == "GnosisSafeProxy" && Chain.gnosis_safe_contract?(address.smart_contract.abi)
+    address.smart_contract.name == "GnosisSafeProxy" && Proxy.gnosis_safe_contract?(address.smart_contract.abi)
   end
 
   def smart_contract_is_gnosis_safe_proxy?(_address), do: false
diff --git a/apps/block_scout_web/lib/block_scout_web/views/api/rpc/contract_view.ex b/apps/block_scout_web/lib/block_scout_web/views/api/rpc/contract_view.ex
index d1686cef1565..bc47f2bd85cc 100644
--- a/apps/block_scout_web/lib/block_scout_web/views/api/rpc/contract_view.ex
+++ b/apps/block_scout_web/lib/block_scout_web/views/api/rpc/contract_view.ex
@@ -4,7 +4,6 @@ defmodule BlockScoutWeb.API.RPC.ContractView do
   alias BlockScoutWeb.AddressView
   alias BlockScoutWeb.API.RPC.RPCView
   alias Ecto.Association.NotLoaded
-  alias Explorer.Chain
   alias Explorer.Chain.{Address, DecompiledSmartContract, SmartContract}
 
   defguardp is_empty_string(input) when input == "" or input == nil
@@ -168,7 +167,7 @@ defmodule BlockScoutWeb.API.RPC.ContractView do
   end
 
   defp insert_additional_sources(output, address) do
-    additional_sources_from_twin = Chain.get_address_verified_twin_contract(address.hash).additional_sources
+    additional_sources_from_twin = SmartContract.get_address_verified_twin_contract(address.hash).additional_sources
 
     additional_sources =
       if AddressView.smart_contract_verified?(address),
diff --git a/apps/block_scout_web/lib/block_scout_web/views/api/v2/smart_contract_view.ex b/apps/block_scout_web/lib/block_scout_web/views/api/v2/smart_contract_view.ex
index 08fa9377b0d9..868536acfbbe 100644
--- a/apps/block_scout_web/lib/block_scout_web/views/api/v2/smart_contract_view.ex
+++ b/apps/block_scout_web/lib/block_scout_web/views/api/v2/smart_contract_view.ex
@@ -11,6 +11,7 @@ defmodule BlockScoutWeb.API.V2.SmartContractView do
   alias Ecto.Changeset
   alias Explorer.Chain
   alias Explorer.Chain.{Address, SmartContract}
+  alias Explorer.Chain.SmartContract.Proxy.EIP1167
   alias Explorer.Visualize.Sol2uml
 
   require Logger
@@ -134,12 +135,12 @@ defmodule BlockScoutWeb.API.V2.SmartContractView do
 
   # credo:disable-for-next-line
   def prepare_smart_contract(%Address{smart_contract: %SmartContract{} = smart_contract} = address) do
-    minimal_proxy_template = Chain.get_minimal_proxy_template(address.hash, @api_true)
-    twin = Chain.get_address_verified_twin_contract(address.hash, @api_true)
+    minimal_proxy_template = EIP1167.get_implementation_address(address.hash, @api_true)
+    twin = SmartContract.get_address_verified_twin_contract(address.hash, @api_true)
     metadata_for_verification = minimal_proxy_template || twin.verified_contract
     smart_contract_verified = AddressView.smart_contract_verified?(address)
     additional_sources_from_twin = twin.additional_sources
-    fully_verified = Chain.smart_contract_fully_verified?(address.hash, @api_true)
+    fully_verified = SmartContract.verified_with_full_match?(address.hash, @api_true)
 
     additional_sources =
       if smart_contract_verified, do: address.smart_contract_additional_sources, else: additional_sources_from_twin
diff --git a/apps/block_scout_web/lib/block_scout_web/views/smart_contract_view.ex b/apps/block_scout_web/lib/block_scout_web/views/smart_contract_view.ex
index f0245adc2dfc..ad32647d14e0 100644
--- a/apps/block_scout_web/lib/block_scout_web/views/smart_contract_view.ex
+++ b/apps/block_scout_web/lib/block_scout_web/views/smart_contract_view.ex
@@ -6,6 +6,8 @@ defmodule BlockScoutWeb.SmartContractView do
   alias Explorer.Chain
   alias Explorer.Chain.{Address, Transaction}
   alias Explorer.Chain.Hash.Address, as: HashAddress
+  alias Explorer.Chain.SmartContract
+  alias Explorer.Chain.SmartContract.Proxy.EIP1167
   alias Explorer.SmartContract.Helper
 
   require Logger
@@ -210,7 +212,7 @@ defmodule BlockScoutWeb.SmartContractView do
   end
 
   def decode_revert_reason(to_address, revert_reason, options \\ []) do
-    smart_contract = Chain.address_hash_to_smart_contract(to_address, options)
+    smart_contract = SmartContract.address_hash_to_smart_contract(to_address, options)
 
     Transaction.decoded_revert_reason(
       %Transaction{to_address: %{smart_contract: smart_contract}, hash: to_address},
diff --git a/apps/block_scout_web/lib/block_scout_web/views/tokens/overview_view.ex b/apps/block_scout_web/lib/block_scout_web/views/tokens/overview_view.ex
index 9bc2dbfe45e6..441ac1a0a4f1 100644
--- a/apps/block_scout_web/lib/block_scout_web/views/tokens/overview_view.ex
+++ b/apps/block_scout_web/lib/block_scout_web/views/tokens/overview_view.ex
@@ -3,6 +3,7 @@ defmodule BlockScoutWeb.Tokens.OverviewView do
 
   alias Explorer.{Chain, CustomContractsHelper}
   alias Explorer.Chain.{Address, SmartContract, Token}
+  alias Explorer.Chain.SmartContract.Proxy
   alias Explorer.SmartContract.{Helper, Writer}
 
   alias BlockScoutWeb.{AccessHelper, CurrencyHelper, LayoutView}
@@ -53,11 +54,13 @@ defmodule BlockScoutWeb.Tokens.OverviewView do
 
   def smart_contract_with_read_only_functions?(%Token{contract_address: %Address{smart_contract: nil}}), do: false
 
-  def smart_contract_is_proxy?(%Token{contract_address: %Address{smart_contract: %SmartContract{} = smart_contract}}) do
-    SmartContract.proxy_contract?(smart_contract)
+  def token_smart_contract_is_proxy?(%Token{
+        contract_address: %Address{smart_contract: %SmartContract{} = smart_contract}
+      }) do
+    Proxy.proxy_contract?(smart_contract)
   end
 
-  def smart_contract_is_proxy?(%Token{contract_address: %Address{smart_contract: nil}}), do: false
+  def token_smart_contract_is_proxy?(%Token{contract_address: %Address{smart_contract: nil}}), do: false
 
   def smart_contract_with_write_functions?(%Token{
         contract_address: %Address{smart_contract: %SmartContract{}} = address
diff --git a/apps/block_scout_web/priv/gettext/default.pot b/apps/block_scout_web/priv/gettext/default.pot
index d15c1455abf1..aed1dc8afd75 100644
--- a/apps/block_scout_web/priv/gettext/default.pot
+++ b/apps/block_scout_web/priv/gettext/default.pot
@@ -265,7 +265,7 @@ msgstr ""
 #: lib/block_scout_web/templates/transaction_log/_logs.html.eex:20
 #: lib/block_scout_web/templates/transaction_state/index.html.eex:34
 #: lib/block_scout_web/templates/verified_contracts/index.html.eex:60
-#: lib/block_scout_web/views/address_view.ex:108
+#: lib/block_scout_web/views/address_view.ex:109
 #, elixir-autogen, elixir-format
 msgid "Address"
 msgstr ""
@@ -556,7 +556,7 @@ msgstr ""
 #: lib/block_scout_web/templates/address/_tabs.html.eex:56
 #: lib/block_scout_web/templates/address/overview.html.eex:275
 #: lib/block_scout_web/templates/address_validation/index.html.eex:11
-#: lib/block_scout_web/views/address_view.ex:385
+#: lib/block_scout_web/views/address_view.ex:386
 #, elixir-autogen, elixir-format
 msgid "Blocks Validated"
 msgstr ""
@@ -656,13 +656,13 @@ msgstr ""
 #: lib/block_scout_web/templates/api_docs/_action_tile.html.eex:187
 #: lib/block_scout_web/templates/api_docs/_eth_rpc_item.html.eex:126
 #: lib/block_scout_web/templates/api_docs/_eth_rpc_item.html.eex:149
-#: lib/block_scout_web/views/address_view.ex:378
+#: lib/block_scout_web/views/address_view.ex:379
 #, elixir-autogen, elixir-format
 msgid "Code"
 msgstr ""
 
 #: lib/block_scout_web/templates/address/_tabs.html.eex:42
-#: lib/block_scout_web/views/address_view.ex:384
+#: lib/block_scout_web/views/address_view.ex:385
 #, elixir-autogen, elixir-format
 msgid "Coin Balance History"
 msgstr ""
@@ -771,14 +771,14 @@ msgstr ""
 #: lib/block_scout_web/templates/account/custom_abi/form.html.eex:18
 #: lib/block_scout_web/templates/account/custom_abi/index.html.eex:29
 #: lib/block_scout_web/templates/address_contract_verification_common_fields/_contract_address_field.html.eex:3
-#: lib/block_scout_web/views/address_view.ex:106
+#: lib/block_scout_web/views/address_view.ex:107
 #, elixir-autogen, elixir-format
 msgid "Contract Address"
 msgstr ""
 
 #: lib/block_scout_web/templates/transaction/_pending_tile.html.eex:16
-#: lib/block_scout_web/views/address_view.ex:46
-#: lib/block_scout_web/views/address_view.ex:80
+#: lib/block_scout_web/views/address_view.ex:47
+#: lib/block_scout_web/views/address_view.ex:81
 #, elixir-autogen, elixir-format
 msgid "Contract Address Pending"
 msgstr ""
@@ -1084,7 +1084,7 @@ msgstr ""
 msgid "Decoded"
 msgstr ""
 
-#: lib/block_scout_web/views/address_view.ex:379
+#: lib/block_scout_web/views/address_view.ex:380
 #, elixir-autogen, elixir-format
 msgid "Decompiled Code"
 msgstr ""
@@ -1601,7 +1601,7 @@ msgstr ""
 #: lib/block_scout_web/templates/address_internal_transaction/index.html.eex:17
 #: lib/block_scout_web/templates/transaction/_tabs.html.eex:11
 #: lib/block_scout_web/templates/transaction_internal_transaction/index.html.eex:6
-#: lib/block_scout_web/views/address_view.ex:375
+#: lib/block_scout_web/views/address_view.ex:376
 #: lib/block_scout_web/views/transaction_view.ex:533
 #, elixir-autogen, elixir-format
 msgid "Internal Transactions"
@@ -1614,7 +1614,7 @@ msgstr ""
 
 #: lib/block_scout_web/templates/tokens/inventory/index.html.eex:16
 #: lib/block_scout_web/templates/tokens/overview/_tabs.html.eex:19
-#: lib/block_scout_web/views/tokens/overview_view.ex:42
+#: lib/block_scout_web/views/tokens/overview_view.ex:43
 #, elixir-autogen, elixir-format
 msgid "Inventory"
 msgstr ""
@@ -1718,7 +1718,7 @@ msgstr ""
 #: lib/block_scout_web/templates/address_logs/index.html.eex:10
 #: lib/block_scout_web/templates/transaction/_tabs.html.eex:17
 #: lib/block_scout_web/templates/transaction_log/index.html.eex:8
-#: lib/block_scout_web/views/address_view.ex:386
+#: lib/block_scout_web/views/address_view.ex:387
 #: lib/block_scout_web/views/transaction_view.ex:534
 #, elixir-autogen, elixir-format
 msgid "Logs"
@@ -1732,7 +1732,7 @@ msgstr ""
 #: lib/block_scout_web/templates/chain/show.html.eex:53
 #: lib/block_scout_web/templates/layout/app.html.eex:50
 #: lib/block_scout_web/templates/tokens/overview/_details.html.eex:85
-#: lib/block_scout_web/views/address_view.ex:146
+#: lib/block_scout_web/views/address_view.ex:147
 #, elixir-autogen, elixir-format
 msgid "Market Cap"
 msgstr ""
@@ -2208,15 +2208,15 @@ msgstr ""
 
 #: lib/block_scout_web/templates/address/_tabs.html.eex:89
 #: lib/block_scout_web/templates/tokens/overview/_tabs.html.eex:27
-#: lib/block_scout_web/views/address_view.ex:380
-#: lib/block_scout_web/views/tokens/overview_view.ex:41
+#: lib/block_scout_web/views/address_view.ex:381
+#: lib/block_scout_web/views/tokens/overview_view.ex:42
 #, elixir-autogen, elixir-format
 msgid "Read Contract"
 msgstr ""
 
 #: lib/block_scout_web/templates/address/_tabs.html.eex:96
 #: lib/block_scout_web/templates/tokens/overview/_tabs.html.eex:41
-#: lib/block_scout_web/views/address_view.ex:381
+#: lib/block_scout_web/views/address_view.ex:382
 #, elixir-autogen, elixir-format
 msgid "Read Proxy"
 msgstr ""
@@ -2870,7 +2870,7 @@ msgstr ""
 #: lib/block_scout_web/templates/tokens/instance/holder/index.html.eex:16
 #: lib/block_scout_web/templates/tokens/instance/overview/_tabs.html.eex:17
 #: lib/block_scout_web/templates/tokens/overview/_tabs.html.eex:11
-#: lib/block_scout_web/views/tokens/overview_view.ex:40
+#: lib/block_scout_web/views/tokens/overview_view.ex:41
 #, elixir-autogen, elixir-format
 msgid "Token Holders"
 msgstr ""
@@ -2903,9 +2903,9 @@ msgstr ""
 #: lib/block_scout_web/templates/tokens/transfer/index.html.eex:15
 #: lib/block_scout_web/templates/transaction/_tabs.html.eex:4
 #: lib/block_scout_web/templates/transaction_token_transfer/index.html.eex:7
-#: lib/block_scout_web/views/address_view.ex:377
+#: lib/block_scout_web/views/address_view.ex:378
 #: lib/block_scout_web/views/tokens/instance/overview_view.ex:114
-#: lib/block_scout_web/views/tokens/overview_view.ex:39
+#: lib/block_scout_web/views/tokens/overview_view.ex:40
 #: lib/block_scout_web/views/transaction_view.ex:532
 #, elixir-autogen, elixir-format
 msgid "Token Transfers"
@@ -2927,7 +2927,7 @@ msgstr ""
 #: lib/block_scout_web/templates/address_token_transfer/index.html.eex:13
 #: lib/block_scout_web/templates/layout/_topnav.html.eex:84
 #: lib/block_scout_web/templates/tokens/index.html.eex:10
-#: lib/block_scout_web/views/address_view.ex:374
+#: lib/block_scout_web/views/address_view.ex:375
 #, elixir-autogen, elixir-format
 msgid "Tokens"
 msgstr ""
@@ -3099,7 +3099,7 @@ msgstr ""
 #: lib/block_scout_web/templates/block/overview.html.eex:80
 #: lib/block_scout_web/templates/chain/show.html.eex:214
 #: lib/block_scout_web/templates/layout/_topnav.html.eex:49
-#: lib/block_scout_web/views/address_view.ex:376
+#: lib/block_scout_web/views/address_view.ex:377
 #, elixir-autogen, elixir-format
 msgid "Transactions"
 msgstr ""
@@ -3469,14 +3469,14 @@ msgstr ""
 
 #: lib/block_scout_web/templates/address/_tabs.html.eex:103
 #: lib/block_scout_web/templates/tokens/overview/_tabs.html.eex:34
-#: lib/block_scout_web/views/address_view.ex:382
+#: lib/block_scout_web/views/address_view.ex:383
 #, elixir-autogen, elixir-format
 msgid "Write Contract"
 msgstr ""
 
 #: lib/block_scout_web/templates/address/_tabs.html.eex:110
 #: lib/block_scout_web/templates/tokens/overview/_tabs.html.eex:48
-#: lib/block_scout_web/views/address_view.ex:383
+#: lib/block_scout_web/views/address_view.ex:384
 #, elixir-autogen, elixir-format
 msgid "Write Proxy"
 msgstr ""
@@ -3585,7 +3585,7 @@ msgstr ""
 msgid "fallback"
 msgstr ""
 
-#: lib/block_scout_web/views/address_contract_view.ex:26
+#: lib/block_scout_web/views/address_contract_view.ex:28
 #, elixir-autogen, elixir-format
 msgid "false"
 msgstr ""
@@ -3641,7 +3641,7 @@ msgstr ""
 msgid "string"
 msgstr ""
 
-#: lib/block_scout_web/views/address_contract_view.ex:25
+#: lib/block_scout_web/views/address_contract_view.ex:27
 #, elixir-autogen, elixir-format
 msgid "true"
 msgstr ""
diff --git a/apps/block_scout_web/priv/gettext/en/LC_MESSAGES/default.po b/apps/block_scout_web/priv/gettext/en/LC_MESSAGES/default.po
index d770bca3428d..4ed272ce9984 100644
--- a/apps/block_scout_web/priv/gettext/en/LC_MESSAGES/default.po
+++ b/apps/block_scout_web/priv/gettext/en/LC_MESSAGES/default.po
@@ -265,7 +265,7 @@ msgstr ""
 #: lib/block_scout_web/templates/transaction_log/_logs.html.eex:20
 #: lib/block_scout_web/templates/transaction_state/index.html.eex:34
 #: lib/block_scout_web/templates/verified_contracts/index.html.eex:60
-#: lib/block_scout_web/views/address_view.ex:108
+#: lib/block_scout_web/views/address_view.ex:109
 #, elixir-autogen, elixir-format
 msgid "Address"
 msgstr ""
@@ -556,7 +556,7 @@ msgstr ""
 #: lib/block_scout_web/templates/address/_tabs.html.eex:56
 #: lib/block_scout_web/templates/address/overview.html.eex:275
 #: lib/block_scout_web/templates/address_validation/index.html.eex:11
-#: lib/block_scout_web/views/address_view.ex:385
+#: lib/block_scout_web/views/address_view.ex:386
 #, elixir-autogen, elixir-format
 msgid "Blocks Validated"
 msgstr ""
@@ -656,13 +656,13 @@ msgstr ""
 #: lib/block_scout_web/templates/api_docs/_action_tile.html.eex:187
 #: lib/block_scout_web/templates/api_docs/_eth_rpc_item.html.eex:126
 #: lib/block_scout_web/templates/api_docs/_eth_rpc_item.html.eex:149
-#: lib/block_scout_web/views/address_view.ex:378
+#: lib/block_scout_web/views/address_view.ex:379
 #, elixir-autogen, elixir-format
 msgid "Code"
 msgstr ""
 
 #: lib/block_scout_web/templates/address/_tabs.html.eex:42
-#: lib/block_scout_web/views/address_view.ex:384
+#: lib/block_scout_web/views/address_view.ex:385
 #, elixir-autogen, elixir-format
 msgid "Coin Balance History"
 msgstr ""
@@ -771,14 +771,14 @@ msgstr ""
 #: lib/block_scout_web/templates/account/custom_abi/form.html.eex:18
 #: lib/block_scout_web/templates/account/custom_abi/index.html.eex:29
 #: lib/block_scout_web/templates/address_contract_verification_common_fields/_contract_address_field.html.eex:3
-#: lib/block_scout_web/views/address_view.ex:106
+#: lib/block_scout_web/views/address_view.ex:107
 #, elixir-autogen, elixir-format
 msgid "Contract Address"
 msgstr ""
 
 #: lib/block_scout_web/templates/transaction/_pending_tile.html.eex:16
-#: lib/block_scout_web/views/address_view.ex:46
-#: lib/block_scout_web/views/address_view.ex:80
+#: lib/block_scout_web/views/address_view.ex:47
+#: lib/block_scout_web/views/address_view.ex:81
 #, elixir-autogen, elixir-format
 msgid "Contract Address Pending"
 msgstr ""
@@ -1084,7 +1084,7 @@ msgstr ""
 msgid "Decoded"
 msgstr ""
 
-#: lib/block_scout_web/views/address_view.ex:379
+#: lib/block_scout_web/views/address_view.ex:380
 #, elixir-autogen, elixir-format
 msgid "Decompiled Code"
 msgstr ""
@@ -1601,7 +1601,7 @@ msgstr ""
 #: lib/block_scout_web/templates/address_internal_transaction/index.html.eex:17
 #: lib/block_scout_web/templates/transaction/_tabs.html.eex:11
 #: lib/block_scout_web/templates/transaction_internal_transaction/index.html.eex:6
-#: lib/block_scout_web/views/address_view.ex:375
+#: lib/block_scout_web/views/address_view.ex:376
 #: lib/block_scout_web/views/transaction_view.ex:533
 #, elixir-autogen, elixir-format
 msgid "Internal Transactions"
@@ -1614,7 +1614,7 @@ msgstr ""
 
 #: lib/block_scout_web/templates/tokens/inventory/index.html.eex:16
 #: lib/block_scout_web/templates/tokens/overview/_tabs.html.eex:19
-#: lib/block_scout_web/views/tokens/overview_view.ex:42
+#: lib/block_scout_web/views/tokens/overview_view.ex:43
 #, elixir-autogen, elixir-format
 msgid "Inventory"
 msgstr ""
@@ -1718,7 +1718,7 @@ msgstr ""
 #: lib/block_scout_web/templates/address_logs/index.html.eex:10
 #: lib/block_scout_web/templates/transaction/_tabs.html.eex:17
 #: lib/block_scout_web/templates/transaction_log/index.html.eex:8
-#: lib/block_scout_web/views/address_view.ex:386
+#: lib/block_scout_web/views/address_view.ex:387
 #: lib/block_scout_web/views/transaction_view.ex:534
 #, elixir-autogen, elixir-format
 msgid "Logs"
@@ -1732,7 +1732,7 @@ msgstr ""
 #: lib/block_scout_web/templates/chain/show.html.eex:53
 #: lib/block_scout_web/templates/layout/app.html.eex:50
 #: lib/block_scout_web/templates/tokens/overview/_details.html.eex:85
-#: lib/block_scout_web/views/address_view.ex:146
+#: lib/block_scout_web/views/address_view.ex:147
 #, elixir-autogen, elixir-format
 msgid "Market Cap"
 msgstr ""
@@ -2208,15 +2208,15 @@ msgstr ""
 
 #: lib/block_scout_web/templates/address/_tabs.html.eex:89
 #: lib/block_scout_web/templates/tokens/overview/_tabs.html.eex:27
-#: lib/block_scout_web/views/address_view.ex:380
-#: lib/block_scout_web/views/tokens/overview_view.ex:41
+#: lib/block_scout_web/views/address_view.ex:381
+#: lib/block_scout_web/views/tokens/overview_view.ex:42
 #, elixir-autogen, elixir-format
 msgid "Read Contract"
 msgstr ""
 
 #: lib/block_scout_web/templates/address/_tabs.html.eex:96
 #: lib/block_scout_web/templates/tokens/overview/_tabs.html.eex:41
-#: lib/block_scout_web/views/address_view.ex:381
+#: lib/block_scout_web/views/address_view.ex:382
 #, elixir-autogen, elixir-format
 msgid "Read Proxy"
 msgstr ""
@@ -2870,7 +2870,7 @@ msgstr ""
 #: lib/block_scout_web/templates/tokens/instance/holder/index.html.eex:16
 #: lib/block_scout_web/templates/tokens/instance/overview/_tabs.html.eex:17
 #: lib/block_scout_web/templates/tokens/overview/_tabs.html.eex:11
-#: lib/block_scout_web/views/tokens/overview_view.ex:40
+#: lib/block_scout_web/views/tokens/overview_view.ex:41
 #, elixir-autogen, elixir-format
 msgid "Token Holders"
 msgstr ""
@@ -2903,9 +2903,9 @@ msgstr ""
 #: lib/block_scout_web/templates/tokens/transfer/index.html.eex:15
 #: lib/block_scout_web/templates/transaction/_tabs.html.eex:4
 #: lib/block_scout_web/templates/transaction_token_transfer/index.html.eex:7
-#: lib/block_scout_web/views/address_view.ex:377
+#: lib/block_scout_web/views/address_view.ex:378
 #: lib/block_scout_web/views/tokens/instance/overview_view.ex:114
-#: lib/block_scout_web/views/tokens/overview_view.ex:39
+#: lib/block_scout_web/views/tokens/overview_view.ex:40
 #: lib/block_scout_web/views/transaction_view.ex:532
 #, elixir-autogen, elixir-format
 msgid "Token Transfers"
@@ -2927,7 +2927,7 @@ msgstr ""
 #: lib/block_scout_web/templates/address_token_transfer/index.html.eex:13
 #: lib/block_scout_web/templates/layout/_topnav.html.eex:84
 #: lib/block_scout_web/templates/tokens/index.html.eex:10
-#: lib/block_scout_web/views/address_view.ex:374
+#: lib/block_scout_web/views/address_view.ex:375
 #, elixir-autogen, elixir-format
 msgid "Tokens"
 msgstr ""
@@ -3099,7 +3099,7 @@ msgstr ""
 #: lib/block_scout_web/templates/block/overview.html.eex:80
 #: lib/block_scout_web/templates/chain/show.html.eex:214
 #: lib/block_scout_web/templates/layout/_topnav.html.eex:49
-#: lib/block_scout_web/views/address_view.ex:376
+#: lib/block_scout_web/views/address_view.ex:377
 #, elixir-autogen, elixir-format
 msgid "Transactions"
 msgstr ""
@@ -3469,14 +3469,14 @@ msgstr ""
 
 #: lib/block_scout_web/templates/address/_tabs.html.eex:103
 #: lib/block_scout_web/templates/tokens/overview/_tabs.html.eex:34
-#: lib/block_scout_web/views/address_view.ex:382
+#: lib/block_scout_web/views/address_view.ex:383
 #, elixir-autogen, elixir-format
 msgid "Write Contract"
 msgstr ""
 
 #: lib/block_scout_web/templates/address/_tabs.html.eex:110
 #: lib/block_scout_web/templates/tokens/overview/_tabs.html.eex:48
-#: lib/block_scout_web/views/address_view.ex:383
+#: lib/block_scout_web/views/address_view.ex:384
 #, elixir-autogen, elixir-format
 msgid "Write Proxy"
 msgstr ""
@@ -3585,7 +3585,7 @@ msgstr ""
 msgid "fallback"
 msgstr ""
 
-#: lib/block_scout_web/views/address_contract_view.ex:26
+#: lib/block_scout_web/views/address_contract_view.ex:28
 #, elixir-autogen, elixir-format
 msgid "false"
 msgstr ""
@@ -3641,7 +3641,7 @@ msgstr ""
 msgid "string"
 msgstr ""
 
-#: lib/block_scout_web/views/address_contract_view.ex:25
+#: lib/block_scout_web/views/address_contract_view.ex:27
 #, elixir-autogen, elixir-format
 msgid "true"
 msgstr ""
diff --git a/apps/block_scout_web/test/block_scout_web/controllers/address_read_contract_controller_test.exs b/apps/block_scout_web/test/block_scout_web/controllers/address_read_contract_controller_test.exs
index 2a05b0c65980..8537ecd4e7a3 100644
--- a/apps/block_scout_web/test/block_scout_web/controllers/address_read_contract_controller_test.exs
+++ b/apps/block_scout_web/test/block_scout_web/controllers/address_read_contract_controller_test.exs
@@ -51,7 +51,7 @@ defmodule BlockScoutWeb.AddressReadContractControllerTest do
 
       insert(:smart_contract, address_hash: contract_address.hash, contract_code_md5: "123")
 
-      get_eip1967_implementation()
+      request_zero_implementations()
 
       conn =
         get(conn, address_read_contract_path(BlockScoutWeb.Endpoint, :index, Address.checksum(contract_address.hash)))
@@ -82,7 +82,7 @@ defmodule BlockScoutWeb.AddressReadContractControllerTest do
     end
   end
 
-  def get_eip1967_implementation do
+  def request_zero_implementations do
     EthereumJSONRPC.Mox
     |> expect(:json_rpc, fn %{
                               id: 0,
@@ -120,5 +120,17 @@ defmodule BlockScoutWeb.AddressReadContractControllerTest do
                             _options ->
       {:ok, "0x0000000000000000000000000000000000000000000000000000000000000000"}
     end)
+    |> expect(:json_rpc, fn %{
+                              id: 0,
+                              method: "eth_getStorageAt",
+                              params: [
+                                _,
+                                "0xc5f16f0fcc639fa48a6947836d9850f504798523bf8c9a3a87d5876cf622bcf7",
+                                "latest"
+                              ]
+                            },
+                            _options ->
+      {:ok, "0x0000000000000000000000000000000000000000000000000000000000000000"}
+    end)
   end
 end
diff --git a/apps/block_scout_web/test/block_scout_web/controllers/address_read_proxy_controller_test.exs b/apps/block_scout_web/test/block_scout_web/controllers/address_read_proxy_controller_test.exs
index 77d5a8060f9e..1b49b35d3979 100644
--- a/apps/block_scout_web/test/block_scout_web/controllers/address_read_proxy_controller_test.exs
+++ b/apps/block_scout_web/test/block_scout_web/controllers/address_read_proxy_controller_test.exs
@@ -51,7 +51,7 @@ defmodule BlockScoutWeb.AddressReadProxyControllerTest do
 
       insert(:smart_contract, address_hash: contract_address.hash, contract_code_md5: "123")
 
-      get_eip1967_implementation()
+      request_zero_implementations()
 
       conn = get(conn, address_read_proxy_path(BlockScoutWeb.Endpoint, :index, Address.checksum(contract_address.hash)))
 
@@ -80,7 +80,7 @@ defmodule BlockScoutWeb.AddressReadProxyControllerTest do
     end
   end
 
-  def get_eip1967_implementation do
+  def request_zero_implementations do
     EthereumJSONRPC.Mox
     |> expect(:json_rpc, fn %{
                               id: 0,
@@ -118,5 +118,17 @@ defmodule BlockScoutWeb.AddressReadProxyControllerTest do
                             _options ->
       {:ok, "0x0000000000000000000000000000000000000000000000000000000000000000"}
     end)
+    |> expect(:json_rpc, fn %{
+                              id: 0,
+                              method: "eth_getStorageAt",
+                              params: [
+                                _,
+                                "0xc5f16f0fcc639fa48a6947836d9850f504798523bf8c9a3a87d5876cf622bcf7",
+                                "latest"
+                              ]
+                            },
+                            _options ->
+      {:ok, "0x0000000000000000000000000000000000000000000000000000000000000000"}
+    end)
   end
 end
diff --git a/apps/block_scout_web/test/block_scout_web/controllers/address_write_contract_controller_test.exs b/apps/block_scout_web/test/block_scout_web/controllers/address_write_contract_controller_test.exs
index b577be9c74e3..30caf25e7273 100644
--- a/apps/block_scout_web/test/block_scout_web/controllers/address_write_contract_controller_test.exs
+++ b/apps/block_scout_web/test/block_scout_web/controllers/address_write_contract_controller_test.exs
@@ -53,7 +53,7 @@ defmodule BlockScoutWeb.AddressWriteContractControllerTest do
 
       insert(:smart_contract, address_hash: contract_address.hash, contract_code_md5: "123")
 
-      get_eip1967_implementation()
+      request_zero_implementations()
 
       conn =
         get(conn, address_write_contract_path(BlockScoutWeb.Endpoint, :index, Address.checksum(contract_address.hash)))
@@ -84,7 +84,7 @@ defmodule BlockScoutWeb.AddressWriteContractControllerTest do
     end
   end
 
-  def get_eip1967_implementation do
+  def request_zero_implementations do
     EthereumJSONRPC.Mox
     |> expect(:json_rpc, fn %{
                               id: 0,
@@ -122,5 +122,17 @@ defmodule BlockScoutWeb.AddressWriteContractControllerTest do
                             _options ->
       {:ok, "0x0000000000000000000000000000000000000000000000000000000000000000"}
     end)
+    |> expect(:json_rpc, fn %{
+                              id: 0,
+                              method: "eth_getStorageAt",
+                              params: [
+                                _,
+                                "0xc5f16f0fcc639fa48a6947836d9850f504798523bf8c9a3a87d5876cf622bcf7",
+                                "latest"
+                              ]
+                            },
+                            _options ->
+      {:ok, "0x0000000000000000000000000000000000000000000000000000000000000000"}
+    end)
   end
 end
diff --git a/apps/block_scout_web/test/block_scout_web/controllers/address_write_proxy_controller_test.exs b/apps/block_scout_web/test/block_scout_web/controllers/address_write_proxy_controller_test.exs
index 01b1b931134a..7225e06e7b57 100644
--- a/apps/block_scout_web/test/block_scout_web/controllers/address_write_proxy_controller_test.exs
+++ b/apps/block_scout_web/test/block_scout_web/controllers/address_write_proxy_controller_test.exs
@@ -51,7 +51,7 @@ defmodule BlockScoutWeb.AddressWriteProxyControllerTest do
 
       insert(:smart_contract, address_hash: contract_address.hash, contract_code_md5: "123")
 
-      get_eip1967_implementation()
+      request_zero_implementations()
 
       conn =
         get(conn, address_write_proxy_path(BlockScoutWeb.Endpoint, :index, Address.checksum(contract_address.hash)))
@@ -82,7 +82,7 @@ defmodule BlockScoutWeb.AddressWriteProxyControllerTest do
     end
   end
 
-  def get_eip1967_implementation do
+  def request_zero_implementations do
     EthereumJSONRPC.Mox
     |> expect(:json_rpc, fn %{
                               id: 0,
@@ -120,5 +120,17 @@ defmodule BlockScoutWeb.AddressWriteProxyControllerTest do
                             _options ->
       {:ok, "0x0000000000000000000000000000000000000000000000000000000000000000"}
     end)
+    |> expect(:json_rpc, fn %{
+                              id: 0,
+                              method: "eth_getStorageAt",
+                              params: [
+                                _,
+                                "0xc5f16f0fcc639fa48a6947836d9850f504798523bf8c9a3a87d5876cf622bcf7",
+                                "latest"
+                              ]
+                            },
+                            _options ->
+      {:ok, "0x0000000000000000000000000000000000000000000000000000000000000000"}
+    end)
   end
 end
diff --git a/apps/block_scout_web/test/block_scout_web/controllers/api/rpc/contract_controller_test.exs b/apps/block_scout_web/test/block_scout_web/controllers/api/rpc/contract_controller_test.exs
index 752c393c4710..f715149a9961 100644
--- a/apps/block_scout_web/test/block_scout_web/controllers/api/rpc/contract_controller_test.exs
+++ b/apps/block_scout_web/test/block_scout_web/controllers/api/rpc/contract_controller_test.exs
@@ -1,8 +1,6 @@
 defmodule BlockScoutWeb.API.RPC.ContractControllerTest do
   use BlockScoutWeb.ConnCase
   alias Explorer.Chain.SmartContract
-  alias Explorer.Chain
-  # alias Explorer.{Chain, Factory}
 
   import Mox
 
@@ -649,7 +647,7 @@ defmodule BlockScoutWeb.API.RPC.ContractControllerTest do
         %SmartContract.ExternalLibrary{:address_hash => "0x283539e1b1daf24cdd58a3e934d55062ea663c3f", :name => "Test2"}
       ]
 
-      {:ok, %SmartContract{} = contract} = Chain.create_smart_contract(valid_attrs, external_libraries)
+      {:ok, %SmartContract{} = contract} = SmartContract.create_smart_contract(valid_attrs, external_libraries)
 
       params = %{
         "module" => "contract",
@@ -771,7 +769,7 @@ defmodule BlockScoutWeb.API.RPC.ContractControllerTest do
     #     |> get("/api", params)
     #     |> json_response(200)
 
-    #   verified_contract = Chain.address_hash_to_smart_contract(contract_address.hash)
+    #   verified_contract = SmartContract.address_hash_to_smart_contract(contract_address.hash)
 
     #   expected_result = %{
     #     "Address" => to_string(contract_address.hash),
@@ -844,7 +842,7 @@ defmodule BlockScoutWeb.API.RPC.ContractControllerTest do
 
     #   result = response["result"]
 
-    #   verified_contract = Chain.address_hash_to_smart_contract(contract_address.hash)
+    #   verified_contract = SmartContract.address_hash_to_smart_contract(contract_address.hash)
 
     #   assert result["Address"] == to_string(contract_address.hash)
 
@@ -967,5 +965,17 @@ defmodule BlockScoutWeb.API.RPC.ContractControllerTest do
                             _options ->
       {:ok, "0x0000000000000000000000000000000000000000000000000000000000000000"}
     end)
+    |> expect(:json_rpc, fn %{
+                              id: 0,
+                              method: "eth_getStorageAt",
+                              params: [
+                                _,
+                                "0xc5f16f0fcc639fa48a6947836d9850f504798523bf8c9a3a87d5876cf622bcf7",
+                                "latest"
+                              ]
+                            },
+                            _options ->
+      {:ok, "0x0000000000000000000000000000000000000000000000000000000000000000"}
+    end)
   end
 end
diff --git a/apps/block_scout_web/test/block_scout_web/controllers/api/v2/smart_contract_controller_test.exs b/apps/block_scout_web/test/block_scout_web/controllers/api/v2/smart_contract_controller_test.exs
index 9c3a1f63254e..87e2c0455dca 100644
--- a/apps/block_scout_web/test/block_scout_web/controllers/api/v2/smart_contract_controller_test.exs
+++ b/apps/block_scout_web/test/block_scout_web/controllers/api/v2/smart_contract_controller_test.exs
@@ -1920,6 +1920,8 @@ defmodule BlockScoutWeb.API.V2.SmartContractControllerTest do
         {:ok, "0x000000000000000000000000#{target_contract.address_hash |> to_string() |> String.replace("0x", "")}"}
       end)
 
+      request_zero_implementations()
+
       expect(
         EthereumJSONRPC.Mox,
         :json_rpc,
@@ -2030,6 +2032,8 @@ defmodule BlockScoutWeb.API.V2.SmartContractControllerTest do
         {:ok, "0x000000000000000000000000#{target_contract.address_hash |> to_string() |> String.replace("0x", "")}"}
       end)
 
+      request_zero_implementations()
+
       expect(
         EthereumJSONRPC.Mox,
         :json_rpc,
@@ -2115,6 +2119,8 @@ defmodule BlockScoutWeb.API.V2.SmartContractControllerTest do
         {:ok, "0x000000000000000000000000#{target_contract.address_hash |> to_string() |> String.replace("0x", "")}"}
       end)
 
+      request_zero_implementations()
+
       expect(
         EthereumJSONRPC.Mox,
         :json_rpc,
@@ -2184,6 +2190,8 @@ defmodule BlockScoutWeb.API.V2.SmartContractControllerTest do
         {:ok, "0x000000000000000000000000#{target_contract.address_hash |> to_string() |> String.replace("0x", "")}"}
       end)
 
+      request_zero_implementations()
+
       expect(
         EthereumJSONRPC.Mox,
         :json_rpc,
@@ -2252,6 +2260,8 @@ defmodule BlockScoutWeb.API.V2.SmartContractControllerTest do
         {:ok, "0x000000000000000000000000#{target_contract.address_hash |> to_string() |> String.replace("0x", "")}"}
       end)
 
+      request_zero_implementations()
+
       expect(
         EthereumJSONRPC.Mox,
         :json_rpc,
@@ -2344,6 +2354,8 @@ defmodule BlockScoutWeb.API.V2.SmartContractControllerTest do
         {:ok, "0x000000000000000000000000#{target_contract.address_hash |> to_string() |> String.replace("0x", "")}"}
       end)
 
+      request_zero_implementations()
+
       contract = insert(:smart_contract)
 
       request = get(conn, "/api/v2/smart-contracts/#{contract.address_hash}/methods-write-proxy")
@@ -2460,4 +2472,32 @@ defmodule BlockScoutWeb.API.V2.SmartContractControllerTest do
         "solidity"
     end
   end
+
+  defp request_zero_implementations do
+    EthereumJSONRPC.Mox
+    |> expect(:json_rpc, fn %{
+                              id: 0,
+                              method: "eth_getStorageAt",
+                              params: [
+                                _,
+                                "0xa3f0ad74e5423aebfd80d3ef4346578335a9a72aeaee59ff6cb3582b35133d50",
+                                "latest"
+                              ]
+                            },
+                            _options ->
+      {:ok, "0x0000000000000000000000000000000000000000000000000000000000000000"}
+    end)
+    |> expect(:json_rpc, fn %{
+                              id: 0,
+                              method: "eth_getStorageAt",
+                              params: [
+                                _,
+                                "0x7050c9e0f4ca769c69bd3a8ef740bc37934f8e2c036e5a723fd8ee048ed3f8c3",
+                                "latest"
+                              ]
+                            },
+                            _options ->
+      {:ok, "0x0000000000000000000000000000000000000000000000000000000000000000"}
+    end)
+  end
 end
diff --git a/apps/block_scout_web/test/block_scout_web/controllers/api/v2/transaction_controller_test.exs b/apps/block_scout_web/test/block_scout_web/controllers/api/v2/transaction_controller_test.exs
index f718a35b4770..ede7f16822d1 100644
--- a/apps/block_scout_web/test/block_scout_web/controllers/api/v2/transaction_controller_test.exs
+++ b/apps/block_scout_web/test/block_scout_web/controllers/api/v2/transaction_controller_test.exs
@@ -970,7 +970,7 @@ defmodule BlockScoutWeb.API.V2.TransactionControllerTest do
     test "check stability fees", %{conn: conn} do
       tx = insert(:transaction) |> with_block()
 
-      log =
+      _log =
         insert(:log,
           transaction: tx,
           index: 1,
@@ -1033,7 +1033,7 @@ defmodule BlockScoutWeb.API.V2.TransactionControllerTest do
     test "check stability if token absent in DB", %{conn: conn} do
       tx = insert(:transaction) |> with_block()
 
-      log =
+      _log =
         insert(:log,
           transaction: tx,
           index: 1,
diff --git a/apps/block_scout_web/test/block_scout_web/controllers/smart_contract_controller_test.exs b/apps/block_scout_web/test/block_scout_web/controllers/smart_contract_controller_test.exs
index 5a52e764a3cd..eb8c1973ef98 100644
--- a/apps/block_scout_web/test/block_scout_web/controllers/smart_contract_controller_test.exs
+++ b/apps/block_scout_web/test/block_scout_web/controllers/smart_contract_controller_test.exs
@@ -122,6 +122,8 @@ defmodule BlockScoutWeb.SmartContractControllerTest do
       )
 
       blockchain_get_implementation_mock()
+      blockchain_get_implementation_mock_empty()
+      blockchain_get_implementation_mock_empty()
 
       path =
         smart_contract_path(BlockScoutWeb.Endpoint, :index,
@@ -159,6 +161,8 @@ defmodule BlockScoutWeb.SmartContractControllerTest do
       )
 
       blockchain_get_implementation_mock_2()
+      blockchain_get_implementation_mock_empty()
+      blockchain_get_implementation_mock_empty()
 
       path =
         smart_contract_path(BlockScoutWeb.Endpoint, :index,
@@ -285,53 +289,23 @@ defmodule BlockScoutWeb.SmartContractControllerTest do
     )
   end
 
-  defp blockchain_get_implementation_mock_2 do
+  defp blockchain_get_implementation_mock_empty do
     expect(
       EthereumJSONRPC.Mox,
       :json_rpc,
       fn %{id: _, method: _, params: [_, _, _]}, _options ->
-        {:ok, "0x000000000000000000000000cebb2CCCFe291F0c442841cBE9C1D06EED61Ca02"}
+        {:ok, "0x"}
       end
     )
   end
 
-  def get_eip1967_implementation do
-    EthereumJSONRPC.Mox
-    |> expect(:json_rpc, fn %{
-                              id: 0,
-                              method: "eth_getStorageAt",
-                              params: [
-                                _,
-                                "0x360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc",
-                                "latest"
-                              ]
-                            },
-                            _options ->
-      {:ok, "0x0000000000000000000000000000000000000000000000000000000000000000"}
-    end)
-    |> expect(:json_rpc, fn %{
-                              id: 0,
-                              method: "eth_getStorageAt",
-                              params: [
-                                _,
-                                "0xa3f0ad74e5423aebfd80d3ef4346578335a9a72aeaee59ff6cb3582b35133d50",
-                                "latest"
-                              ]
-                            },
-                            _options ->
-      {:ok, "0x0000000000000000000000000000000000000000000000000000000000000000"}
-    end)
-    |> expect(:json_rpc, fn %{
-                              id: 0,
-                              method: "eth_getStorageAt",
-                              params: [
-                                _,
-                                "0x7050c9e0f4ca769c69bd3a8ef740bc37934f8e2c036e5a723fd8ee048ed3f8c3",
-                                "latest"
-                              ]
-                            },
-                            _options ->
-      {:ok, "0x0000000000000000000000000000000000000000000000000000000000000000"}
-    end)
+  defp blockchain_get_implementation_mock_2 do
+    expect(
+      EthereumJSONRPC.Mox,
+      :json_rpc,
+      fn %{id: _, method: _, params: [_, _, _]}, _options ->
+        {:ok, "0x000000000000000000000000cebb2CCCFe291F0c442841cBE9C1D06EED61Ca02"}
+      end
+    )
   end
 end
diff --git a/apps/block_scout_web/test/block_scout_web/controllers/tokens/read_contract_controller_test.exs b/apps/block_scout_web/test/block_scout_web/controllers/tokens/read_contract_controller_test.exs
index ab5ba16f9c5d..589d53a71664 100644
--- a/apps/block_scout_web/test/block_scout_web/controllers/tokens/read_contract_controller_test.exs
+++ b/apps/block_scout_web/test/block_scout_web/controllers/tokens/read_contract_controller_test.exs
@@ -53,7 +53,7 @@ defmodule BlockScoutWeb.Tokens.ContractControllerTest do
         token: token
       )
 
-      get_eip1967_implementation()
+      request_zero_implementations()
 
       conn = get(conn, token_read_contract_path(BlockScoutWeb.Endpoint, :index, token.contract_address_hash))
 
@@ -62,7 +62,7 @@ defmodule BlockScoutWeb.Tokens.ContractControllerTest do
     end
   end
 
-  def get_eip1967_implementation do
+  def request_zero_implementations do
     EthereumJSONRPC.Mox
     |> expect(:json_rpc, fn %{
                               id: 0,
@@ -100,5 +100,17 @@ defmodule BlockScoutWeb.Tokens.ContractControllerTest do
                             _options ->
       {:ok, "0x0000000000000000000000000000000000000000000000000000000000000000"}
     end)
+    |> expect(:json_rpc, fn %{
+                              id: 0,
+                              method: "eth_getStorageAt",
+                              params: [
+                                _,
+                                "0xc5f16f0fcc639fa48a6947836d9850f504798523bf8c9a3a87d5876cf622bcf7",
+                                "latest"
+                              ]
+                            },
+                            _options ->
+      {:ok, "0x0000000000000000000000000000000000000000000000000000000000000000"}
+    end)
   end
 end
diff --git a/apps/block_scout_web/test/block_scout_web/controllers/transaction_token_transfer_controller_test.exs b/apps/block_scout_web/test/block_scout_web/controllers/transaction_token_transfer_controller_test.exs
index 6b789a2d0f4c..273a53286d62 100644
--- a/apps/block_scout_web/test/block_scout_web/controllers/transaction_token_transfer_controller_test.exs
+++ b/apps/block_scout_web/test/block_scout_web/controllers/transaction_token_transfer_controller_test.exs
@@ -201,6 +201,18 @@ defmodule BlockScoutWeb.TransactionTokenTransferControllerTest do
                               _options ->
         {:ok, "0x0000000000000000000000000000000000000000000000000000000000000000"}
       end)
+      |> expect(:json_rpc, fn %{
+                                id: 0,
+                                method: "eth_getStorageAt",
+                                params: [
+                                  _,
+                                  "0xc5f16f0fcc639fa48a6947836d9850f504798523bf8c9a3a87d5876cf622bcf7",
+                                  "latest"
+                                ]
+                              },
+                              _options ->
+        {:ok, "0x0000000000000000000000000000000000000000000000000000000000000000"}
+      end)
       |> expect(:json_rpc, fn %{id: _id, method: "net_version", params: []}, _options ->
         {:ok, "100"}
       end)
diff --git a/apps/explorer/lib/explorer/chain.ex b/apps/explorer/lib/explorer/chain.ex
index 9a1f114eae5c..5717a4997e20 100644
--- a/apps/explorer/lib/explorer/chain.ex
+++ b/apps/explorer/lib/explorer/chain.ex
@@ -26,7 +26,6 @@ defmodule Explorer.Chain do
     ]
 
   import EthereumJSONRPC, only: [integer_to_quantity: 1, fetch_block_internal_transactions: 2]
-  import Explorer.Chain.SmartContract, only: [burn_address_hash_string: 0]
 
   require Logger
 
@@ -58,7 +57,6 @@ defmodule Explorer.Chain do
     PendingBlockOperation,
     Search,
     SmartContract,
-    SmartContractAdditionalSource,
     Token,
     Token.Instance,
     TokenTransfer,
@@ -87,11 +85,10 @@ defmodule Explorer.Chain do
   alias Explorer.Chain.Fetcher.{CheckBytecodeMatchingOnDemand, LookUpSmartContractSourcesOnDemand}
   alias Explorer.Chain.Import.Runner
   alias Explorer.Chain.InternalTransaction.{CallType, Type}
+  alias Explorer.Chain.SmartContract.Proxy.EIP1167
 
   alias Explorer.Market.MarketHistoryCache
   alias Explorer.{PagingOptions, Repo}
-  alias Explorer.SmartContract.Helper
-  alias Explorer.SmartContract.Solidity.Verifier
 
   alias Dataloader.Ecto, as: DataloaderEcto
 
@@ -1065,6 +1062,33 @@ defmodule Explorer.Chain do
     end
   end
 
+  defp set_address_decompiled(repo, address_hash) do
+    query =
+      from(
+        address in Address,
+        where: address.hash == ^address_hash
+      )
+
+    case repo.update_all(query, set: [decompiled: true]) do
+      {1, _} -> {:ok, []}
+      _ -> {:error, "There was an error annotating that the address has been decompiled."}
+    end
+  end
+
+  @spec verified_contracts_top(non_neg_integer()) :: [Hash.Address.t()]
+  def verified_contracts_top(limit) do
+    query =
+      from(contract in SmartContract,
+        inner_join: address in Address,
+        on: contract.address_hash == address.hash,
+        order_by: [desc: address.transactions_count],
+        limit: ^limit,
+        select: contract.address_hash
+      )
+
+    Repo.all(query)
+  end
+
   @doc """
   Converts the `Explorer.Chain.Data.t:t/0` to `iodata` representation that can be written to users efficiently.
 
@@ -1289,7 +1313,7 @@ defmodule Explorer.Chain do
           if smart_contract do
             address_result
           else
-            compose_smart_contract(address_result, hash, options)
+            SmartContract.compose_smart_contract(address_result, hash, options)
           end
 
         _ ->
@@ -1303,27 +1327,6 @@ defmodule Explorer.Chain do
     end
   end
 
-  defp compose_smart_contract(address_result, hash, options) do
-    address_verified_twin_contract =
-      get_minimal_proxy_template(hash, options) ||
-        get_address_verified_twin_contract(hash, options).verified_contract
-
-    if address_verified_twin_contract do
-      address_verified_twin_contract_updated =
-        address_verified_twin_contract
-        |> Map.put(:address_hash, hash)
-        |> Map.put(:metadata_from_verified_twin, true)
-        |> Map.put(:implementation_address_hash, nil)
-        |> Map.put(:implementation_name, nil)
-        |> Map.put(:implementation_fetched_at, nil)
-
-      address_result
-      |> Map.put(:smart_contract, address_verified_twin_contract_updated)
-    else
-      address_result
-    end
-  end
-
   def decompiled_code(address_hash, version) do
     query =
       from(contract in DecompiledSmartContract,
@@ -1481,15 +1484,15 @@ defmodule Explorer.Chain do
           if smart_contract do
             CheckBytecodeMatchingOnDemand.trigger_check(address_result, smart_contract)
             LookUpSmartContractSourcesOnDemand.trigger_fetch(address_result, smart_contract)
-            check_and_update_constructor_args(address_result)
+            SmartContract.check_and_update_constructor_args(address_result)
           else
             LookUpSmartContractSourcesOnDemand.trigger_fetch(address_result, nil)
 
             address_verified_twin_contract =
-              get_minimal_proxy_template(hash, options) ||
-                get_address_verified_twin_contract(hash, options).verified_contract
+              EIP1167.get_implementation_address(hash, options) ||
+                SmartContract.get_address_verified_twin_contract(hash, options).verified_contract
 
-            add_twin_info_to_contract(address_result, address_verified_twin_contract, hash)
+            SmartContract.add_twin_info_to_contract(address_result, address_verified_twin_contract, hash)
           end
 
         _ ->
@@ -1504,53 +1507,6 @@ defmodule Explorer.Chain do
     end
   end
 
-  defp check_and_update_constructor_args(
-         %SmartContract{address_hash: address_hash, constructor_arguments: nil, verified_via_sourcify: true} =
-           smart_contract
-       ) do
-    if args = Verifier.parse_constructor_arguments_for_sourcify_contract(address_hash, smart_contract.abi) do
-      smart_contract |> SmartContract.changeset(%{constructor_arguments: args}) |> Repo.update()
-      %SmartContract{smart_contract | constructor_arguments: args}
-    else
-      smart_contract
-    end
-  end
-
-  defp check_and_update_constructor_args(
-         %Address{
-           hash: address_hash,
-           contract_code: deployed_bytecode,
-           smart_contract: %SmartContract{constructor_arguments: nil, verified_via_sourcify: true} = smart_contract
-         } = address
-       ) do
-    if args =
-         Verifier.parse_constructor_arguments_for_sourcify_contract(address_hash, smart_contract.abi, deployed_bytecode) do
-      smart_contract |> SmartContract.changeset(%{constructor_arguments: args}) |> Repo.update()
-      %Address{address | smart_contract: %SmartContract{smart_contract | constructor_arguments: args}}
-    else
-      address
-    end
-  end
-
-  defp check_and_update_constructor_args(other), do: other
-
-  defp add_twin_info_to_contract(address_result, address_verified_twin_contract, _hash)
-       when is_nil(address_verified_twin_contract),
-       do: address_result
-
-  defp add_twin_info_to_contract(address_result, address_verified_twin_contract, hash) do
-    address_verified_twin_contract_updated =
-      address_verified_twin_contract
-      |> Map.put(:address_hash, hash)
-      |> Map.put(:metadata_from_verified_twin, true)
-      |> Map.put(:implementation_address_hash, nil)
-      |> Map.put(:implementation_name, nil)
-      |> Map.put(:implementation_fetched_at, nil)
-
-    address_result
-    |> Map.put(:smart_contract, address_verified_twin_contract_updated)
-  end
-
   @spec find_decompiled_contract_address(Hash.Address.t()) :: {:ok, Address.t()} | {:error, :not_found}
   def find_decompiled_contract_address(%Hash{byte_count: unquote(Hash.Address.byte_count())} = hash) do
     query =
@@ -3569,412 +3525,6 @@ defmodule Explorer.Chain do
     end
   end
 
-  @doc """
-  Inserts a `t:SmartContract.t/0`.
-
-  As part of inserting a new smart contract, an additional record is inserted for
-  naming the address for reference.
-  """
-  @spec create_smart_contract(map()) :: {:ok, SmartContract.t()} | {:error, Ecto.Changeset.t()}
-  def create_smart_contract(attrs \\ %{}, external_libraries \\ [], secondary_sources \\ []) do
-    new_contract = %SmartContract{}
-
-    attrs =
-      attrs
-      |> Helper.add_contract_code_md5()
-
-    smart_contract_changeset =
-      new_contract
-      |> SmartContract.changeset(attrs)
-      |> Changeset.put_change(:external_libraries, external_libraries)
-
-    new_contract_additional_source = %SmartContractAdditionalSource{}
-
-    smart_contract_additional_sources_changesets =
-      if secondary_sources do
-        secondary_sources
-        |> Enum.map(fn changeset ->
-          new_contract_additional_source
-          |> SmartContractAdditionalSource.changeset(changeset)
-        end)
-      else
-        []
-      end
-
-    address_hash = Changeset.get_field(smart_contract_changeset, :address_hash)
-
-    # Enforce ShareLocks tables order (see docs: sharelocks.md)
-    insert_contract_query =
-      Multi.new()
-      |> Multi.run(:set_address_verified, fn repo, _ -> set_address_verified(repo, address_hash) end)
-      |> Multi.run(:clear_primary_address_names, fn repo, _ -> clear_primary_address_names(repo, address_hash) end)
-      |> Multi.insert(:smart_contract, smart_contract_changeset)
-
-    insert_contract_query_with_additional_sources =
-      smart_contract_additional_sources_changesets
-      |> Enum.with_index()
-      |> Enum.reduce(insert_contract_query, fn {changeset, index}, multi ->
-        Multi.insert(multi, "smart_contract_additional_source_#{Integer.to_string(index)}", changeset)
-      end)
-
-    insert_result =
-      insert_contract_query_with_additional_sources
-      |> Repo.transaction()
-
-    create_address_name(Repo, Changeset.get_field(smart_contract_changeset, :name), address_hash)
-
-    case insert_result do
-      {:ok, %{smart_contract: smart_contract}} ->
-        {:ok, smart_contract}
-
-      {:error, :smart_contract, changeset, _} ->
-        {:error, changeset}
-
-      {:error, :set_address_verified, message, _} ->
-        {:error, message}
-    end
-  end
-
-  @doc """
-  Updates a `t:SmartContract.t/0`.
-
-  Has the similar logic as create_smart_contract/1.
-  Used in cases when you need to update row in DB contains SmartContract, e.g. in case of changing
-  status `partially verified` to `fully verified` (re-verify).
-  """
-  @spec update_smart_contract(map()) :: {:ok, SmartContract.t()} | {:error, Ecto.Changeset.t()}
-  def update_smart_contract(attrs \\ %{}, external_libraries \\ [], secondary_sources \\ []) do
-    address_hash = Map.get(attrs, :address_hash)
-
-    query =
-      from(
-        smart_contract in SmartContract,
-        where: smart_contract.address_hash == ^address_hash
-      )
-
-    query_sources =
-      from(
-        source in SmartContractAdditionalSource,
-        where: source.address_hash == ^address_hash
-      )
-
-    _delete_sources = Repo.delete_all(query_sources)
-
-    smart_contract = Repo.one(query)
-
-    smart_contract_changeset =
-      smart_contract
-      |> SmartContract.changeset(attrs)
-      |> Changeset.put_change(:external_libraries, external_libraries)
-
-    new_contract_additional_source = %SmartContractAdditionalSource{}
-
-    smart_contract_additional_sources_changesets =
-      if secondary_sources do
-        secondary_sources
-        |> Enum.map(fn changeset ->
-          new_contract_additional_source
-          |> SmartContractAdditionalSource.changeset(changeset)
-        end)
-      else
-        []
-      end
-
-    # Enforce ShareLocks tables order (see docs: sharelocks.md)
-    insert_contract_query =
-      Multi.new()
-      |> Multi.run(:clear_primary_address_names, fn repo, _ -> clear_primary_address_names(repo, address_hash) end)
-      |> Multi.update(:smart_contract, smart_contract_changeset)
-
-    insert_contract_query_with_additional_sources =
-      smart_contract_additional_sources_changesets
-      |> Enum.with_index()
-      |> Enum.reduce(insert_contract_query, fn {changeset, index}, multi ->
-        Multi.insert(multi, "smart_contract_additional_source_#{Integer.to_string(index)}", changeset)
-      end)
-
-    insert_result =
-      insert_contract_query_with_additional_sources
-      |> Repo.transaction()
-
-    create_address_name(Repo, Changeset.get_field(smart_contract_changeset, :name), address_hash)
-
-    case insert_result do
-      {:ok, %{smart_contract: smart_contract}} ->
-        {:ok, smart_contract}
-
-      {:error, :smart_contract, changeset, _} ->
-        {:error, changeset}
-
-      {:error, :set_address_verified, message, _} ->
-        {:error, message}
-    end
-  end
-
-  defp set_address_verified(repo, address_hash) do
-    query =
-      from(
-        address in Address,
-        where: address.hash == ^address_hash
-      )
-
-    case repo.update_all(query, set: [verified: true]) do
-      {1, _} -> {:ok, []}
-      _ -> {:error, "There was an error annotating that the address has been verified."}
-    end
-  end
-
-  defp set_address_decompiled(repo, address_hash) do
-    query =
-      from(
-        address in Address,
-        where: address.hash == ^address_hash
-      )
-
-    case repo.update_all(query, set: [decompiled: true]) do
-      {1, _} -> {:ok, []}
-      _ -> {:error, "There was an error annotating that the address has been decompiled."}
-    end
-  end
-
-  defp clear_primary_address_names(repo, address_hash) do
-    query =
-      from(
-        address_name in Address.Name,
-        where: address_name.address_hash == ^address_hash,
-        # Enforce Name ShareLocks order (see docs: sharelocks.md)
-        order_by: [asc: :address_hash, asc: :name],
-        lock: "FOR NO KEY UPDATE"
-      )
-
-    repo.update_all(
-      from(n in Address.Name, join: s in subquery(query), on: n.address_hash == s.address_hash and n.name == s.name),
-      set: [primary: false]
-    )
-
-    {:ok, []}
-  end
-
-  defp create_address_name(repo, name, address_hash) do
-    params = %{
-      address_hash: address_hash,
-      name: name,
-      primary: true
-    }
-
-    %Address.Name{}
-    |> Address.Name.changeset(params)
-    |> repo.insert(on_conflict: :nothing, conflict_target: [:address_hash, :name])
-  end
-
-  def get_verified_twin_contract(%Explorer.Chain.Address{} = target_address, options \\ []) do
-    case target_address do
-      %{contract_code: %Chain.Data{bytes: contract_code_bytes}} ->
-        target_address_hash = target_address.hash
-
-        contract_code_md5 = Helper.contract_code_md5(contract_code_bytes)
-
-        verified_contract_twin_query =
-          from(
-            smart_contract in SmartContract,
-            where: smart_contract.contract_code_md5 == ^contract_code_md5,
-            where: smart_contract.address_hash != ^target_address_hash,
-            select: smart_contract,
-            limit: 1
-          )
-
-        verified_contract_twin_query
-        |> select_repo(options).one(timeout: 10_000)
-
-      _ ->
-        nil
-    end
-  end
-
-  @doc """
-  Finds metadata for verification of a contract from verified twins: contracts with the same bytecode
-  which were verified previously, returns a single t:SmartContract.t/0
-  """
-  def get_address_verified_twin_contract(hash, options \\ [])
-
-  def get_address_verified_twin_contract(hash, options) when is_binary(hash) do
-    case string_to_address_hash(hash) do
-      {:ok, address_hash} -> get_address_verified_twin_contract(address_hash, options)
-      _ -> %{:verified_contract => nil, :additional_sources => nil}
-    end
-  end
-
-  def get_address_verified_twin_contract(%Explorer.Chain.Hash{} = address_hash, options) do
-    with target_address <- select_repo(options).get(Address, address_hash),
-         false <- is_nil(target_address) do
-      verified_contract_twin = get_verified_twin_contract(target_address, options)
-
-      verified_contract_twin_additional_sources = get_contract_additional_sources(verified_contract_twin, options)
-
-      %{
-        :verified_contract => check_and_update_constructor_args(verified_contract_twin),
-        :additional_sources => verified_contract_twin_additional_sources
-      }
-    else
-      _ ->
-        %{:verified_contract => nil, :additional_sources => nil}
-    end
-  end
-
-  def get_minimal_proxy_template(address_hash, options \\ []) do
-    minimal_proxy_template =
-      case select_repo(options).get(Address, address_hash) do
-        nil ->
-          nil
-
-        target_address ->
-          contract_code = target_address.contract_code
-
-          case contract_code do
-            %Chain.Data{bytes: contract_code_bytes} ->
-              contract_bytecode = Base.encode16(contract_code_bytes, case: :lower)
-
-              get_minimal_proxy_from_template_code(contract_bytecode, options)
-
-            _ ->
-              nil
-          end
-      end
-
-    minimal_proxy_template
-  end
-
-  defp get_minimal_proxy_from_template_code(contract_bytecode, options) do
-    case contract_bytecode do
-      "363d3d373d3d3d363d73" <> <<template_address::binary-size(40)>> <> _ ->
-        template_address = "0x" <> template_address
-
-        query =
-          from(
-            smart_contract in SmartContract,
-            where: smart_contract.address_hash == ^template_address,
-            select: smart_contract
-          )
-
-        template =
-          query
-          |> select_repo(options).one(timeout: 10_000)
-
-        template
-
-      _ ->
-        nil
-    end
-  end
-
-  defp get_contract_additional_sources(verified_contract_twin, options) do
-    if verified_contract_twin do
-      verified_contract_twin_additional_sources_query =
-        from(
-          s in SmartContractAdditionalSource,
-          where: s.address_hash == ^verified_contract_twin.address_hash
-        )
-
-      verified_contract_twin_additional_sources_query
-      |> select_repo(options).all()
-    else
-      []
-    end
-  end
-
-  @spec address_hash_to_smart_contract(Hash.Address.t(), [api?]) :: SmartContract.t() | nil
-  def address_hash_to_smart_contract(address_hash, options \\ []) do
-    query =
-      from(
-        smart_contract in SmartContract,
-        where: smart_contract.address_hash == ^address_hash
-      )
-
-    current_smart_contract = select_repo(options).one(query)
-
-    if current_smart_contract do
-      current_smart_contract
-    else
-      address_verified_twin_contract =
-        get_minimal_proxy_template(address_hash, options) ||
-          get_address_verified_twin_contract(address_hash, options).verified_contract
-
-      if address_verified_twin_contract do
-        address_verified_twin_contract
-        |> Map.put(:address_hash, address_hash)
-        |> Map.put(:metadata_from_verified_twin, true)
-        |> Map.put(:implementation_address_hash, nil)
-        |> Map.put(:implementation_name, nil)
-        |> Map.put(:implementation_fetched_at, nil)
-      else
-        current_smart_contract
-      end
-    end
-  end
-
-  @spec address_hash_to_smart_contract_without_twin(Hash.Address.t(), [api?]) :: SmartContract.t() | nil
-  def address_hash_to_smart_contract_without_twin(address_hash, options) do
-    query =
-      from(
-        smart_contract in SmartContract,
-        where: smart_contract.address_hash == ^address_hash
-      )
-
-    select_repo(options).one(query)
-  end
-
-  def smart_contract_fully_verified?(address_hash, options \\ [])
-
-  def smart_contract_fully_verified?(address_hash_str, options) when is_binary(address_hash_str) do
-    case string_to_address_hash(address_hash_str) do
-      {:ok, address_hash} ->
-        check_fully_verified(address_hash, options)
-
-      _ ->
-        false
-    end
-  end
-
-  def smart_contract_fully_verified?(address_hash, options) do
-    check_fully_verified(address_hash, options)
-  end
-
-  defp check_fully_verified(address_hash, options) do
-    query =
-      from(
-        smart_contract in SmartContract,
-        where: smart_contract.address_hash == ^address_hash
-      )
-
-    result = select_repo(options).one(query)
-
-    if result, do: !result.partially_verified, else: false
-  end
-
-  def smart_contract_verified?(address_hash_str) when is_binary(address_hash_str) do
-    case string_to_address_hash(address_hash_str) do
-      {:ok, address_hash} ->
-        check_verified(address_hash)
-
-      _ ->
-        false
-    end
-  end
-
-  def smart_contract_verified?(address_hash) do
-    check_verified(address_hash)
-  end
-
-  defp check_verified(address_hash) do
-    query =
-      from(
-        smart_contract in SmartContract,
-        where: smart_contract.address_hash == ^address_hash
-      )
-
-    if Repo.one(query), do: true, else: false
-  end
-
   defp fetch_transactions(paging_options \\ nil, from_block \\ nil, to_block \\ nil, with_pending? \\ false) do
     Transaction
     |> order_for_transactions(with_pending?)
@@ -5457,36 +5007,6 @@ defmodule Explorer.Chain do
     Repo.exists?(query)
   end
 
-  @doc """
-  Checks if it exists a verified `t:Explorer.Chain.SmartContract.t/0` for the
-  `t:Explorer.Chain.Address.t/0` with the provided `hash`.
-
-  Returns `:ok` if found and `:not_found` otherwise.
-  """
-  @spec check_verified_smart_contract_exists(Hash.Address.t()) :: :ok | :not_found
-  def check_verified_smart_contract_exists(address_hash) do
-    address_hash
-    |> verified_smart_contract_exists?()
-    |> boolean_to_check_result()
-  end
-
-  @doc """
-  Checks if it exists a verified `t:Explorer.Chain.SmartContract.t/0` for the
-  `t:Explorer.Chain.Address.t/0` with the provided `hash`.
-
-  Returns `true` if found and `false` otherwise.
-  """
-  @spec verified_smart_contract_exists?(Hash.Address.t()) :: boolean()
-  def verified_smart_contract_exists?(address_hash) do
-    query =
-      from(
-        smart_contract in SmartContract,
-        where: smart_contract.address_hash == ^address_hash
-      )
-
-    Repo.exists?(query)
-  end
-
   @doc """
   Checks if a `t:Explorer.Chain.Transaction.t/0` with the given `hash` exists.
 
@@ -5647,9 +5167,9 @@ defmodule Explorer.Chain do
     Repo.exists?(query)
   end
 
-  defp boolean_to_check_result(true), do: :ok
+  def boolean_to_check_result(true), do: :ok
 
-  defp boolean_to_check_result(false), do: :not_found
+  def boolean_to_check_result(false), do: :not_found
 
   @doc """
   Fetches the first trace from the Nethermind trace URL.
@@ -5667,95 +5187,6 @@ defmodule Explorer.Chain do
     end
   end
 
-  def combine_proxy_implementation_abi(smart_contract, options \\ [])
-
-  def combine_proxy_implementation_abi(%SmartContract{abi: abi} = smart_contract, options) when not is_nil(abi) do
-    implementation_abi = get_implementation_abi_from_proxy(smart_contract, options)
-
-    if Enum.empty?(implementation_abi), do: abi, else: implementation_abi ++ abi
-  end
-
-  def combine_proxy_implementation_abi(_, _) do
-    []
-  end
-
-  def gnosis_safe_contract?(abi) when not is_nil(abi) do
-    implementation_method_abi =
-      abi
-      |> Enum.find(fn method ->
-        master_copy_pattern?(method)
-      end)
-
-    if implementation_method_abi, do: true, else: false
-  end
-
-  def gnosis_safe_contract?(abi) when is_nil(abi), do: false
-
-  def master_copy_pattern?(method) do
-    Map.get(method, "type") == "constructor" &&
-      method
-      |> Enum.find(fn item ->
-        case item do
-          {"inputs", inputs} ->
-            master_copy_input?(inputs) || singleton_input?(inputs)
-
-          _ ->
-            false
-        end
-      end)
-  end
-
-  defp master_copy_input?(inputs) do
-    inputs
-    |> Enum.find(fn input ->
-      Map.get(input, "name") == "_masterCopy"
-    end)
-  end
-
-  defp singleton_input?(inputs) do
-    inputs
-    |> Enum.find(fn input ->
-      Map.get(input, "name") == "_singleton"
-    end)
-  end
-
-  def get_implementation_abi(implementation_address_hash_string, options \\ [])
-
-  def get_implementation_abi(implementation_address_hash_string, options)
-      when not is_nil(implementation_address_hash_string) do
-    case Chain.string_to_address_hash(implementation_address_hash_string) do
-      {:ok, implementation_address_hash} ->
-        implementation_smart_contract =
-          implementation_address_hash
-          |> address_hash_to_smart_contract(options)
-
-        if implementation_smart_contract do
-          implementation_smart_contract
-          |> Map.get(:abi)
-        else
-          []
-        end
-
-      _ ->
-        []
-    end
-  end
-
-  def get_implementation_abi(implementation_address_hash_string, _) when is_nil(implementation_address_hash_string) do
-    []
-  end
-
-  def get_implementation_abi_from_proxy(
-        %SmartContract{address_hash: proxy_address_hash, abi: abi} = smart_contract,
-        options
-      )
-      when not is_nil(proxy_address_hash) and not is_nil(abi) do
-    {implementation_address_hash_string, _name} = SmartContract.get_implementation_address_hash(smart_contract, options)
-    get_implementation_abi(implementation_address_hash_string)
-  end
-
-  def get_implementation_abi_from_proxy(_, _), do: []
-
   defp format_tx_first_trace(first_trace, block_hash, json_rpc_named_arguments) do
     {:ok, to_address_hash} =
       if Map.has_key?(first_trace, :to_address_hash) do
@@ -5882,7 +5313,7 @@ defmodule Explorer.Chain do
   @spec get_token_transfer_type(TokenTransfer.t()) ::
           :token_burning | :token_minting | :token_spawning | :token_transfer
   def get_token_transfer_type(transfer) do
-    {:ok, burn_address_hash} = Chain.string_to_address_hash(burn_address_hash_string())
+    {:ok, burn_address_hash} = Chain.string_to_address_hash(SmartContract.burn_address_hash_string())
 
     cond do
       transfer.to_address_hash == burn_address_hash && transfer.from_address_hash !== burn_address_hash ->
@@ -6415,20 +5846,6 @@ defmodule Explorer.Chain do
     )
   end
 
-  @spec verified_contracts_top(non_neg_integer()) :: [Hash.Address.t()]
-  def verified_contracts_top(limit) do
-    query =
-      from(contract in SmartContract,
-        inner_join: address in Address,
-        on: contract.address_hash == address.hash,
-        order_by: [desc: address.transactions_count],
-        limit: ^limit,
-        select: contract.address_hash
-      )
-
-    Repo.all(query)
-  end
-
   @spec default_paging_options() :: map()
   def default_paging_options do
     @default_paging_options
diff --git a/apps/explorer/lib/explorer/chain/address/name.ex b/apps/explorer/lib/explorer/chain/address/name.ex
index 4364adf98795..91382eff6648 100644
--- a/apps/explorer/lib/explorer/chain/address/name.ex
+++ b/apps/explorer/lib/explorer/chain/address/name.ex
@@ -7,9 +7,11 @@ defmodule Explorer.Chain.Address.Name do
 
   import Ecto.Changeset
 
-  alias Ecto.Changeset
+  alias Ecto.{Changeset, Repo}
   alias Explorer.Chain.{Address, Hash}
 
+  import Ecto.Query, only: [from: 2]
+
   @typedoc """
   * `address` - the `t:Explorer.Chain.Address.t/0` with `value` at end of `block_number`.
   * `address_hash` - foreign key for `address`.
@@ -46,6 +48,46 @@ defmodule Explorer.Chain.Address.Name do
     |> foreign_key_constraint(:address_hash)
   end
 
+  @doc """
+  Sets primary false for all primary names for the given address hash
+  """
+  @spec clear_primary_address_names(Repo.t(), Hash.Address.t()) :: {:ok, []}
+  def clear_primary_address_names(repo, address_hash) do
+    query =
+      from(
+        address_name in __MODULE__,
+        where: address_name.address_hash == ^address_hash,
+        where: address_name.primary == true,
+        # Enforce Name ShareLocks order (see docs: sharelocks.md)
+        order_by: [asc: :address_hash, asc: :name],
+        lock: "FOR NO KEY UPDATE"
+      )
+
+    repo.update_all(
+      from(n in __MODULE__, join: s in subquery(query), on: n.address_hash == s.address_hash and n.name == s.name),
+      set: [primary: false]
+    )
+
+    {:ok, []}
+  end
+
+  @doc """
+  Creates primary address name for the given address hash
+  """
+  @spec create_primary_address_name(Repo.t(), String.t(), Hash.Address.t()) ::
+          {:ok, [__MODULE__.t()]} | {:error, [Changeset.t()]}
+  def create_primary_address_name(repo, name, address_hash) do
+    params = %{
+      address_hash: address_hash,
+      name: name,
+      primary: true
+    }
+
+    %__MODULE__{}
+    |> __MODULE__.changeset(params)
+    |> repo.insert(on_conflict: :nothing, conflict_target: [:address_hash, :name])
+  end
+
   defp trim_name(%Changeset{valid?: false} = changeset), do: changeset
 
   defp trim_name(%Changeset{valid?: true} = changeset) do
diff --git a/apps/explorer/lib/explorer/chain/block/reward.ex b/apps/explorer/lib/explorer/chain/block/reward.ex
index fd6296a550ea..92897cd80848 100644
--- a/apps/explorer/lib/explorer/chain/block/reward.ex
+++ b/apps/explorer/lib/explorer/chain/block/reward.ex
@@ -5,8 +5,6 @@ defmodule Explorer.Chain.Block.Reward do
 
   use Explorer.Schema
 
-  import Explorer.Chain.SmartContract, only: [burn_address_hash_string: 0]
-
   alias Explorer.Application.Constants
   alias Explorer.{Chain, PagingOptions}
   alias Explorer.Chain.Block.Reward.AddressType
@@ -16,6 +14,8 @@ defmodule Explorer.Chain.Block.Reward do
 
   @required_attrs ~w(address_hash address_type block_hash reward)a
 
+  @burn_address_hash_string "0x0000000000000000000000000000000000000000"
+
   @get_payout_by_mining_abi %{
     "type" => "function",
     "stateMutability" => "view",
@@ -252,6 +252,10 @@ defmodule Explorer.Chain.Block.Reward do
     end
   end
 
+  defp burn_address_hash_string do
+    @burn_address_hash_string
+  end
+
   defp join_associations(query) do
     query
     |> preload(:address)
diff --git a/apps/explorer/lib/explorer/chain/hash/full.ex b/apps/explorer/lib/explorer/chain/hash/full.ex
index eb8ae148dd3a..db2a586bd770 100644
--- a/apps/explorer/lib/explorer/chain/hash/full.ex
+++ b/apps/explorer/lib/explorer/chain/hash/full.ex
@@ -90,7 +90,7 @@ defmodule Explorer.Chain.Hash.Full do
       ...> )
       {:ok, <<0x9fc76417374aa880d4449a1f7f31ec597f00b1f6f3dd2d66f4c9c6c445836d8b :: big-integer-size(32)-unit(8)>>}
 
-  If the field from the struct is an incorrect format such as `t:Explorer.Chain.Address.Hash.t/0`, `:error` is returned.
+  If the field from the struct is an incorrect format such as `t:Explorer.Chain.Hash.Address.t/0`, `:error` is returned.
 
       iex> Explorer.Chain.Hash.Full.dump(
       ...>   %Explorer.Chain.Hash{
diff --git a/apps/explorer/lib/explorer/chain/log.ex b/apps/explorer/lib/explorer/chain/log.ex
index 3ee92d04240b..3b04958fdcb7 100644
--- a/apps/explorer/lib/explorer/chain/log.ex
+++ b/apps/explorer/lib/explorer/chain/log.ex
@@ -8,6 +8,7 @@ defmodule Explorer.Chain.Log do
   alias ABI.{Event, FunctionSelector}
   alias Explorer.Chain
   alias Explorer.Chain.{Address, Block, ContractMethod, Data, Hash, Transaction}
+  alias Explorer.Chain.SmartContract.Proxy
   alias Explorer.SmartContract.SigProviderInterface
 
   @required_attrs ~w(address_hash data block_hash index transaction_hash)a
@@ -165,7 +166,7 @@ defmodule Explorer.Chain.Log do
     else
       case Chain.find_contract_address(address_hash, address_options, false) do
         {:ok, %{smart_contract: smart_contract}} ->
-          full_abi = Chain.combine_proxy_implementation_abi(smart_contract, options)
+          full_abi = Proxy.combine_proxy_implementation_abi(smart_contract, options)
           {full_abi, Map.put(acc, address_hash, full_abi)}
 
         _ ->
diff --git a/apps/explorer/lib/explorer/chain/smart_contract.ex b/apps/explorer/lib/explorer/chain/smart_contract.ex
index 5391349acf09..ea91857a1a83 100644
--- a/apps/explorer/lib/explorer/chain/smart_contract.ex
+++ b/apps/explorer/lib/explorer/chain/smart_contract.ex
@@ -12,26 +12,35 @@ defmodule Explorer.Chain.SmartContract do
 
   use Explorer.Schema
 
-  alias Ecto.Changeset
-  alias EthereumJSONRPC.Contract
+  alias Ecto.{Changeset, Multi}
   alias Explorer.Counters.AverageBlockTime
   alias Explorer.{Chain, Repo}
-  alias Explorer.Chain.{Address, ContractMethod, Data, DecompiledSmartContract, Hash, InternalTransaction, Transaction}
-  alias Explorer.Chain.SmartContract.ExternalLibrary
-  alias Explorer.SmartContract.Reader
+
+  alias Explorer.Chain.{
+    Address,
+    ContractMethod,
+    Data,
+    DecompiledSmartContract,
+    Hash,
+    InternalTransaction,
+    SmartContractAdditionalSource,
+    Transaction
+  }
+
+  alias Explorer.Chain.Address.Name, as: AddressName
+
+  alias Explorer.Chain.SmartContract.{ExternalLibrary, Proxy}
+  alias Explorer.Chain.SmartContract.Proxy.EIP1167
+  alias Explorer.SmartContract.Helper
+  alias Explorer.SmartContract.Solidity.Verifier
   alias Timex.Duration
 
-  # supported signatures:
-  # 5c60da1b = keccak256(implementation())
-  @implementation_signature "5c60da1b"
-  # aaf10f42 = keccak256(getImplementation())
-  @get_implementation_signature "aaf10f42"
+  @typep api? :: {:api?, true | false}
 
   @burn_address_hash_string "0x0000000000000000000000000000000000000000"
   @burn_address_hash_string_32 "0x0000000000000000000000000000000000000000000000000000000000000000"
 
   defguard is_burn_signature(term) when term in ["0x", "0x0", @burn_address_hash_string_32]
-  defguard is_burn_signature_or_nil(term) when is_burn_signature(term) or term == nil
   defguard is_burn_signature_extended(term) when is_burn_signature(term) or term == @burn_address_hash_string
 
   @doc """
@@ -42,8 +51,6 @@ defmodule Explorer.Chain.SmartContract do
     @burn_address_hash_string
   end
 
-  @typep api? :: {:api?, true | false}
-
   @typedoc """
   The name of a parameter to a function or event.
   """
@@ -427,79 +434,6 @@ defmodule Explorer.Chain.SmartContract do
     end
   end
 
-  defp upsert_contract_methods(%Changeset{changes: %{abi: abi}} = changeset) do
-    ContractMethod.upsert_from_abi(abi, get_field(changeset, :address_hash))
-
-    changeset
-  rescue
-    exception ->
-      message = Exception.format(:error, exception, __STACKTRACE__)
-
-      Logger.error(fn -> ["Error while upserting contract methods: ", message] end)
-
-      changeset
-  end
-
-  defp upsert_contract_methods(changeset), do: changeset
-
-  defp error_message(:compilation), do: error_message_with_log("There was an error compiling your contract.")
-
-  defp error_message(:compiler_version),
-    do: error_message_with_log("Compiler version does not match, please try again.")
-
-  defp error_message(:generated_bytecode), do: error_message_with_log("Bytecode does not match, please try again.")
-
-  defp error_message(:constructor_arguments),
-    do: error_message_with_log("Constructor arguments do not match, please try again.")
-
-  defp error_message(:name), do: error_message_with_log("Wrong contract name, please try again.")
-  defp error_message(:json), do: error_message_with_log("Invalid JSON file.")
-
-  defp error_message(:autodetect_constructor_arguments_failed),
-    do:
-      error_message_with_log(
-        "Autodetection of constructor arguments failed. Please try to input constructor arguments manually."
-      )
-
-  defp error_message(:no_creation_data),
-    do:
-      error_message_with_log(
-        "The contract creation transaction has not been indexed yet. Please wait a few minutes and try again."
-      )
-
-  defp error_message(:unknown_error), do: error_message_with_log("Unable to verify: unknown error.")
-
-  defp error_message(:deployed_bytecode),
-    do: error_message_with_log("Deployed bytecode does not correspond to contract creation code.")
-
-  defp error_message(:contract_source_code), do: error_message_with_log("Empty contract source code.")
-
-  defp error_message(string) when is_binary(string), do: error_message_with_log(string)
-  defp error_message(%{"message" => string} = error) when is_map(error), do: error_message_with_log(string)
-
-  defp error_message(error) do
-    Logger.warn(fn -> ["Unknown verifier error: ", inspect(error)] end)
-    "There was an error validating your contract, please try again."
-  end
-
-  defp error_message(:compilation, error_message),
-    do: error_message_with_log("There was an error compiling your contract: #{error_message}")
-
-  defp error_message_with_log(error_string) do
-    Logger.error("Smart-contract verification error: #{error_string}")
-    error_string
-  end
-
-  defp select_error_field(:no_creation_data), do: :address_hash
-  defp select_error_field(:compiler_version), do: :compiler_version
-
-  defp select_error_field(constructor_arguments)
-       when constructor_arguments in [:constructor_arguments, :autodetect_constructor_arguments_failed],
-       do: :constructor_arguments
-
-  defp select_error_field(:name), do: :name
-  defp select_error_field(_), do: :contract_source_code
-
   def merge_twin_contract_with_changeset(%__MODULE__{} = twin_contract, %Changeset{} = changeset) do
     %__MODULE__{}
     |> changeset(Map.from_struct(twin_contract))
@@ -544,6 +478,10 @@ defmodule Explorer.Chain.SmartContract do
     |> Changeset.put_change(:contract_source_code, "")
   end
 
+  @doc """
+  Returns smart-contract changeset with checksummed address hash
+  """
+  @spec address_to_checksum_address(Changeset.t()) :: Changeset.t()
   def address_to_checksum_address(changeset) do
     checksum_address =
       changeset
@@ -554,36 +492,10 @@ defmodule Explorer.Chain.SmartContract do
     Changeset.force_change(changeset, :address_hash, checksum_address)
   end
 
-  defp to_address_hash(string) when is_binary(string) do
-    {:ok, address_hash} = Chain.string_to_address_hash(string)
-    address_hash
-  end
-
-  defp to_address_hash(address_hash), do: address_hash
-
-  def proxy_contract?(smart_contract, options \\ [])
-
-  def proxy_contract?(%__MODULE__{abi: abi} = smart_contract, options) when not is_nil(abi) do
-    implementation_method_abi =
-      abi
-      |> Enum.find(fn method ->
-        Map.get(method, "name") == "implementation" ||
-          Chain.master_copy_pattern?(method)
-      end)
-
-    if implementation_method_abi ||
-         not is_nil(
-           smart_contract
-           |> get_implementation_address_hash(options)
-           |> Tuple.to_list()
-           |> List.first()
-         ),
-       do: true,
-       else: false
-  end
-
-  def proxy_contract?(_, _), do: false
-
+  @doc """
+  Returns implementation address and name of the given SmartContract by hash address
+  """
+  @spec get_implementation_address_hash(any(), any()) :: {any(), any()}
   def get_implementation_address_hash(smart_contract, options \\ [])
 
   def get_implementation_address_hash(%__MODULE__{abi: nil}, _), do: {nil, nil}
@@ -602,7 +514,7 @@ defmodule Explorer.Chain.SmartContract do
     updated_smart_contract =
       if Application.get_env(:explorer, :enable_caching_implementation_data_of_proxy) &&
            check_implementation_refetch_necessity(implementation_fetched_at) do
-        Chain.address_hash_to_smart_contract_without_twin(address_hash, options)
+        address_hash_to_smart_contract_without_twin(address_hash, options)
       else
         smart_contract
       end
@@ -624,7 +536,9 @@ defmodule Explorer.Chain.SmartContract do
       ) do
     if check_implementation_refetch_necessity(implementation_fetched_at) do
       get_implementation_address_hash_task =
-        Task.async(fn -> get_implementation_address_hash(address_hash, abi, metadata_from_verified_twin, options) end)
+        Task.async(fn ->
+          Proxy.fetch_implementation_address_hash(address_hash, abi, metadata_from_verified_twin, options)
+        end)
 
       timeout = Application.get_env(:explorer, :implementation_data_fetching_timeout)
 
@@ -648,236 +562,13 @@ defmodule Explorer.Chain.SmartContract do
 
   def get_implementation_address_hash(_, _), do: {nil, nil}
 
-  defp db_implementation_data_converter(nil), do: nil
-  defp db_implementation_data_converter(string) when is_binary(string), do: string
-  defp db_implementation_data_converter(other), do: to_string(other)
-
-  defp check_implementation_refetch_necessity(nil), do: true
-
-  defp check_implementation_refetch_necessity(timestamp) do
-    if Application.get_env(:explorer, :enable_caching_implementation_data_of_proxy) do
-      now = DateTime.utc_now()
-
-      average_block_time = get_average_block_time()
-
-      fresh_time_distance =
-        case average_block_time do
-          0 ->
-            Application.get_env(:explorer, :fallback_ttl_cached_implementation_data_of_proxy)
-
-          time ->
-            round(time)
-        end
-
-      timestamp
-      |> DateTime.add(fresh_time_distance, :millisecond)
-      |> DateTime.compare(now) != :gt
-    else
-      true
-    end
-  end
-
-  defp get_average_block_time do
-    if Application.get_env(:explorer, :avg_block_time_as_ttl_cached_implementation_data_of_proxy) do
-      case AverageBlockTime.average_block_time() do
-        {:error, :disabled} ->
-          0
-
-        duration ->
-          duration
-          |> Duration.to_milliseconds()
-      end
-    else
-      0
-    end
-  end
-
-  @spec get_implementation_address_hash(Hash.Address.t(), list(), boolean() | nil, [api?]) ::
-          {String.t() | nil, String.t() | nil}
-  defp get_implementation_address_hash(proxy_address_hash, abi, metadata_from_verified_twin, options)
-       when not is_nil(proxy_address_hash) and not is_nil(abi) do
-    implementation_method_abi =
-      abi
-      |> Enum.find(fn method ->
-        Map.get(method, "name") == "implementation" && Map.get(method, "stateMutability") == "view"
-      end)
-
-    get_implementation_method_abi =
-      abi
-      |> Enum.find(fn method ->
-        Map.get(method, "name") == "getImplementation" && Map.get(method, "stateMutability") == "view"
-      end)
-
-    master_copy_method_abi =
-      abi
-      |> Enum.find(fn method ->
-        Chain.master_copy_pattern?(method)
-      end)
-
-    implementation_address =
-      cond do
-        implementation_method_abi ->
-          get_implementation_address_hash_basic(@implementation_signature, proxy_address_hash, abi)
-
-        get_implementation_method_abi ->
-          get_implementation_address_hash_basic(@get_implementation_signature, proxy_address_hash, abi)
-
-        master_copy_method_abi ->
-          get_implementation_address_hash_from_master_copy_pattern(proxy_address_hash)
-
-        true ->
-          get_implementation_address_hash_eip_1967(proxy_address_hash)
-      end
-
-    save_implementation_data(implementation_address, proxy_address_hash, metadata_from_verified_twin, options)
-  end
-
-  defp get_implementation_address_hash(_proxy_address_hash, _abi, _, _) do
-    {nil, nil}
-  end
-
-  defp get_implementation_address_hash_eip_1967(proxy_address_hash) do
-    json_rpc_named_arguments = Application.get_env(:explorer, :json_rpc_named_arguments)
-
-    # https://eips.ethereum.org/EIPS/eip-1967
-    storage_slot_logic_contract_address = "0x360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc"
-
-    {_status, implementation_address} =
-      case Contract.eth_get_storage_at_request(
-             proxy_address_hash,
-             storage_slot_logic_contract_address,
-             nil,
-             json_rpc_named_arguments
-           ) do
-        {:ok, empty_address}
-        when is_burn_signature_or_nil(empty_address) ->
-          fetch_beacon_proxy_implementation(proxy_address_hash, json_rpc_named_arguments)
-
-        {:ok, implementation_logic_address} ->
-          {:ok, implementation_logic_address}
-
-        _ ->
-          {:ok, nil}
-      end
-
-    abi_decode_address_output(implementation_address)
-  end
-
-  # changes requested by https://github.com/blockscout/blockscout/issues/4770
-  # for support BeaconProxy pattern
-  defp fetch_beacon_proxy_implementation(proxy_address_hash, json_rpc_named_arguments) do
-    # https://eips.ethereum.org/EIPS/eip-1967
-    storage_slot_beacon_contract_address = "0xa3f0ad74e5423aebfd80d3ef4346578335a9a72aeaee59ff6cb3582b35133d50"
-
-    implementation_method_abi = [
-      %{
-        "type" => "function",
-        "stateMutability" => "view",
-        "outputs" => [%{"type" => "address", "name" => "", "internalType" => "address"}],
-        "name" => "implementation",
-        "inputs" => []
-      }
-    ]
-
-    case Contract.eth_get_storage_at_request(
-           proxy_address_hash,
-           storage_slot_beacon_contract_address,
-           nil,
-           json_rpc_named_arguments
-         ) do
-      {:ok, empty_address}
-      when is_burn_signature_or_nil(empty_address) ->
-        fetch_openzeppelin_proxy_implementation(proxy_address_hash, json_rpc_named_arguments)
-
-      {:ok, beacon_contract_address} ->
-        case beacon_contract_address
-             |> abi_decode_address_output()
-             |> get_implementation_address_hash_basic(@implementation_signature, implementation_method_abi) do
-          <<implementation_address::binary-size(42)>> ->
-            {:ok, implementation_address}
-
-          _ ->
-            {:ok, beacon_contract_address}
-        end
-
-      _ ->
-        {:ok, nil}
-    end
-  end
-
-  # changes requested by https://github.com/blockscout/blockscout/issues/5292
-  defp fetch_openzeppelin_proxy_implementation(proxy_address_hash, json_rpc_named_arguments) do
-    # This is the keccak-256 hash of "org.zeppelinos.proxy.implementation"
-    storage_slot_logic_contract_address = "0x7050c9e0f4ca769c69bd3a8ef740bc37934f8e2c036e5a723fd8ee048ed3f8c3"
-
-    case Contract.eth_get_storage_at_request(
-           proxy_address_hash,
-           storage_slot_logic_contract_address,
-           nil,
-           json_rpc_named_arguments
-         ) do
-      {:ok, empty_address}
-      when is_burn_signature(empty_address) ->
-        {:ok, "0x"}
-
-      {:ok, logic_contract_address} ->
-        {:ok, logic_contract_address}
-
-      _ ->
-        {:ok, nil}
-    end
-  end
-
-  defp get_implementation_address_hash_basic(signature, proxy_address_hash, abi) do
-    implementation_address =
-      case Reader.query_contract(
-             proxy_address_hash,
-             abi,
-             %{
-               "#{signature}" => []
-             },
-             false
-           ) do
-        %{^signature => {:ok, [result]}} -> result
-        _ -> nil
-      end
-
-    address_to_hex(implementation_address)
-  end
-
-  defp get_implementation_address_hash_from_master_copy_pattern(proxy_address_hash) do
-    json_rpc_named_arguments = Application.get_env(:explorer, :json_rpc_named_arguments)
+  def save_implementation_data(nil, _, _, _), do: {nil, nil}
 
-    master_copy_storage_pointer = "0x0"
-
-    {:ok, implementation_address} =
-      case Contract.eth_get_storage_at_request(
-             proxy_address_hash,
-             master_copy_storage_pointer,
-             nil,
-             json_rpc_named_arguments
-           ) do
-        {:ok, empty_address}
-        when is_burn_signature(empty_address) ->
-          {:ok, "0x"}
-
-        {:ok, logic_contract_address} ->
-          {:ok, logic_contract_address}
-
-        _ ->
-          {:ok, nil}
-      end
-
-    abi_decode_address_output(implementation_address)
-  end
-
-  defp save_implementation_data(nil, _, _, _), do: {nil, nil}
-
-  defp save_implementation_data(empty_address_hash_string, proxy_address_hash, metadata_from_verified_twin, options)
-       when is_burn_signature_extended(empty_address_hash_string) do
+  def save_implementation_data(empty_address_hash_string, proxy_address_hash, metadata_from_verified_twin, options)
+      when is_burn_signature_extended(empty_address_hash_string) do
     if is_nil(metadata_from_verified_twin) or !metadata_from_verified_twin do
       proxy_address_hash
-      |> Chain.address_hash_to_smart_contract_without_twin(options)
+      |> address_hash_to_smart_contract_without_twin(options)
       |> changeset(%{
         implementation_name: nil,
         implementation_address_hash: nil,
@@ -889,13 +580,13 @@ defmodule Explorer.Chain.SmartContract do
     {:empty, :empty}
   end
 
-  defp save_implementation_data(implementation_address_hash_string, proxy_address_hash, _, options)
-       when is_binary(implementation_address_hash_string) do
+  def save_implementation_data(implementation_address_hash_string, proxy_address_hash, _, options)
+      when is_binary(implementation_address_hash_string) do
     with {:ok, address_hash} <- Chain.string_to_address_hash(implementation_address_hash_string),
-         proxy_contract <- Chain.address_hash_to_smart_contract_without_twin(proxy_address_hash, options),
+         proxy_contract <- address_hash_to_smart_contract_without_twin(proxy_address_hash, options),
          false <- is_nil(proxy_contract),
          %{implementation: %__MODULE__{name: name}, proxy: proxy_contract} <- %{
-           implementation: Chain.address_hash_to_smart_contract(address_hash, options),
+           implementation: address_hash_to_smart_contract(address_hash, options),
            proxy: proxy_contract
          } do
       proxy_contract
@@ -921,7 +612,7 @@ defmodule Explorer.Chain.SmartContract do
 
       true ->
         {:ok, address_hash} = Chain.string_to_address_hash(implementation_address_hash_string)
-        smart_contract = Chain.address_hash_to_smart_contract(address_hash, options)
+        smart_contract = address_hash_to_smart_contract(address_hash, options)
 
         {implementation_address_hash_string, smart_contract && smart_contract.name}
 
@@ -930,30 +621,9 @@ defmodule Explorer.Chain.SmartContract do
     end
   end
 
-  defp address_to_hex(address) do
-    if address do
-      if String.starts_with?(address, "0x") do
-        address
-      else
-        "0x" <> Base.encode16(address, case: :lower)
-      end
-    end
-  end
-
-  defp abi_decode_address_output(nil), do: nil
-
-  defp abi_decode_address_output("0x"), do: burn_address_hash_string()
-
-  defp abi_decode_address_output(address) when is_binary(address) do
-    if String.length(address) > 42 do
-      "0x" <> String.slice(address, -40, 40)
-    else
-      address
-    end
-  end
-
-  defp abi_decode_address_output(_), do: nil
-
+  @doc """
+  Returns SmartContract by the given smart-contract address hash, if it is partially verified
+  """
   @spec select_partially_verified_by_address_hash(binary() | Hash.t(), keyword) :: boolean() | nil
   def select_partially_verified_by_address_hash(address_hash, options \\ []) do
     query =
@@ -1009,4 +679,549 @@ defmodule Explorer.Chain.SmartContract do
       end
     end
   end
+
+  @doc """
+  Composes address object for smart-contract
+  """
+  @spec compose_smart_contract(map(), Explorer.Chain.Hash.t(), any()) :: map()
+  def compose_smart_contract(address_result, hash, options) do
+    address_verified_twin_contract =
+      EIP1167.get_implementation_address(hash, options) ||
+        get_address_verified_twin_contract(hash, options).verified_contract
+
+    if address_verified_twin_contract do
+      address_verified_twin_contract_updated =
+        address_verified_twin_contract
+        |> Map.put(:address_hash, hash)
+        |> Map.put(:metadata_from_verified_twin, true)
+        |> Map.put(:implementation_address_hash, nil)
+        |> Map.put(:implementation_name, nil)
+        |> Map.put(:implementation_fetched_at, nil)
+
+      address_result
+      |> Map.put(:smart_contract, address_verified_twin_contract_updated)
+    else
+      address_result
+    end
+  end
+
+  @doc """
+  Finds metadata for verification of a contract from verified twins: contracts with the same bytecode
+  which were verified previously, returns a single t:SmartContract.t/0
+  """
+  def get_address_verified_twin_contract(hash, options \\ [])
+
+  def get_address_verified_twin_contract(hash, options) when is_binary(hash) do
+    case Chain.string_to_address_hash(hash) do
+      {:ok, address_hash} -> get_address_verified_twin_contract(address_hash, options)
+      _ -> %{:verified_contract => nil, :additional_sources => nil}
+    end
+  end
+
+  def get_address_verified_twin_contract(%Explorer.Chain.Hash{} = address_hash, options) do
+    with target_address <- Chain.select_repo(options).get(Address, address_hash),
+         false <- is_nil(target_address) do
+      verified_contract_twin = get_verified_twin_contract(target_address, options)
+
+      verified_contract_twin_additional_sources =
+        SmartContractAdditionalSource.get_contract_additional_sources(verified_contract_twin, options)
+
+      %{
+        :verified_contract => check_and_update_constructor_args(verified_contract_twin),
+        :additional_sources => verified_contract_twin_additional_sources
+      }
+    else
+      _ ->
+        %{:verified_contract => nil, :additional_sources => nil}
+    end
+  end
+
+  def get_verified_twin_contract(%Explorer.Chain.Address{} = target_address, options \\ []) do
+    case target_address do
+      %{contract_code: %Chain.Data{bytes: contract_code_bytes}} ->
+        target_address_hash = target_address.hash
+
+        contract_code_md5 = Helper.contract_code_md5(contract_code_bytes)
+
+        verified_contract_twin_query =
+          from(
+            smart_contract in __MODULE__,
+            where: smart_contract.contract_code_md5 == ^contract_code_md5,
+            where: smart_contract.address_hash != ^target_address_hash,
+            select: smart_contract,
+            limit: 1
+          )
+
+        verified_contract_twin_query
+        |> Chain.select_repo(options).one(timeout: 10_000)
+
+      _ ->
+        nil
+    end
+  end
+
+  def check_and_update_constructor_args(
+        %__MODULE__{address_hash: address_hash, constructor_arguments: nil, verified_via_sourcify: true} =
+          smart_contract
+      ) do
+    if args = Verifier.parse_constructor_arguments_for_sourcify_contract(address_hash, smart_contract.abi) do
+      smart_contract |> __MODULE__.changeset(%{constructor_arguments: args}) |> Repo.update()
+      %__MODULE__{smart_contract | constructor_arguments: args}
+    else
+      smart_contract
+    end
+  end
+
+  def check_and_update_constructor_args(
+        %Address{
+          hash: address_hash,
+          contract_code: deployed_bytecode,
+          smart_contract: %__MODULE__{constructor_arguments: nil, verified_via_sourcify: true} = smart_contract
+        } = address
+      ) do
+    if args =
+         Verifier.parse_constructor_arguments_for_sourcify_contract(address_hash, smart_contract.abi, deployed_bytecode) do
+      smart_contract |> __MODULE__.changeset(%{constructor_arguments: args}) |> Repo.update()
+      %Address{address | smart_contract: %__MODULE__{smart_contract | constructor_arguments: args}}
+    else
+      address
+    end
+  end
+
+  def check_and_update_constructor_args(other), do: other
+
+  @doc """
+  Adds verified metadata from bytecode twin smart-contract to the given smart-contract
+  """
+  @spec add_twin_info_to_contract(map(), Chain.Hash.t(), Chain.Hash.t()) :: map()
+  def add_twin_info_to_contract(address_result, address_verified_twin_contract, _hash)
+      when is_nil(address_verified_twin_contract),
+      do: address_result
+
+  def add_twin_info_to_contract(address_result, address_verified_twin_contract, hash) do
+    address_verified_twin_contract_updated =
+      address_verified_twin_contract
+      |> Map.put(:address_hash, hash)
+      |> Map.put(:metadata_from_verified_twin, true)
+      |> Map.put(:implementation_address_hash, nil)
+      |> Map.put(:implementation_name, nil)
+      |> Map.put(:implementation_fetched_at, nil)
+
+    address_result
+    |> Map.put(:smart_contract, address_verified_twin_contract_updated)
+  end
+
+  @doc """
+  Inserts a `t:SmartContract.t/0`.
+
+  As part of inserting a new smart contract, an additional record is inserted for
+  naming the address for reference.
+  """
+  @spec create_smart_contract(map()) :: {:ok, __MODULE__.t()} | {:error, Ecto.Changeset.t()}
+  def create_smart_contract(attrs \\ %{}, external_libraries \\ [], secondary_sources \\ []) do
+    new_contract = %__MODULE__{}
+
+    attrs =
+      attrs
+      |> Helper.add_contract_code_md5()
+
+    smart_contract_changeset =
+      new_contract
+      |> __MODULE__.changeset(attrs)
+      |> Changeset.put_change(:external_libraries, external_libraries)
+
+    new_contract_additional_source = %SmartContractAdditionalSource{}
+
+    smart_contract_additional_sources_changesets =
+      if secondary_sources do
+        secondary_sources
+        |> Enum.map(fn changeset ->
+          new_contract_additional_source
+          |> SmartContractAdditionalSource.changeset(changeset)
+        end)
+      else
+        []
+      end
+
+    address_hash = Changeset.get_field(smart_contract_changeset, :address_hash)
+
+    # Enforce ShareLocks tables order (see docs: sharelocks.md)
+    insert_contract_query =
+      Multi.new()
+      |> Multi.run(:set_address_verified, fn repo, _ -> set_address_verified(repo, address_hash) end)
+      |> Multi.run(:clear_primary_address_names, fn repo, _ ->
+        AddressName.clear_primary_address_names(repo, address_hash)
+      end)
+      |> Multi.insert(:smart_contract, smart_contract_changeset)
+
+    insert_contract_query_with_additional_sources =
+      smart_contract_additional_sources_changesets
+      |> Enum.with_index()
+      |> Enum.reduce(insert_contract_query, fn {changeset, index}, multi ->
+        Multi.insert(multi, "smart_contract_additional_source_#{Integer.to_string(index)}", changeset)
+      end)
+
+    insert_result =
+      insert_contract_query_with_additional_sources
+      |> Repo.transaction()
+
+    AddressName.create_primary_address_name(Repo, Changeset.get_field(smart_contract_changeset, :name), address_hash)
+
+    case insert_result do
+      {:ok, %{smart_contract: smart_contract}} ->
+        {:ok, smart_contract}
+
+      {:error, :smart_contract, changeset, _} ->
+        {:error, changeset}
+
+      {:error, :set_address_verified, message, _} ->
+        {:error, message}
+    end
+  end
+
+  @doc """
+  Updates a `t:SmartContract.t/0`.
+
+  Has the similar logic as create_smart_contract/1.
+  Used in cases when you need to update row in DB contains SmartContract, e.g. in case of changing
+  status `partially verified` to `fully verified` (re-verify).
+  """
+  @spec update_smart_contract(map()) :: {:ok, __MODULE__.t()} | {:error, Ecto.Changeset.t()}
+  def update_smart_contract(attrs \\ %{}, external_libraries \\ [], secondary_sources \\ []) do
+    address_hash = Map.get(attrs, :address_hash)
+
+    query_sources =
+      from(
+        source in SmartContractAdditionalSource,
+        where: source.address_hash == ^address_hash
+      )
+
+    _delete_sources = Repo.delete_all(query_sources)
+
+    query = get_smart_contract_query(address_hash)
+    smart_contract = Repo.one(query)
+
+    smart_contract_changeset =
+      smart_contract
+      |> __MODULE__.changeset(attrs)
+      |> Changeset.put_change(:external_libraries, external_libraries)
+
+    new_contract_additional_source = %SmartContractAdditionalSource{}
+
+    smart_contract_additional_sources_changesets =
+      if secondary_sources do
+        secondary_sources
+        |> Enum.map(fn changeset ->
+          new_contract_additional_source
+          |> SmartContractAdditionalSource.changeset(changeset)
+        end)
+      else
+        []
+      end
+
+    # Enforce ShareLocks tables order (see docs: sharelocks.md)
+    insert_contract_query =
+      Multi.new()
+      |> Multi.run(:clear_primary_address_names, fn repo, _ ->
+        AddressName.clear_primary_address_names(repo, address_hash)
+      end)
+      |> Multi.update(:smart_contract, smart_contract_changeset)
+
+    insert_contract_query_with_additional_sources =
+      smart_contract_additional_sources_changesets
+      |> Enum.with_index()
+      |> Enum.reduce(insert_contract_query, fn {changeset, index}, multi ->
+        Multi.insert(multi, "smart_contract_additional_source_#{Integer.to_string(index)}", changeset)
+      end)
+
+    insert_result =
+      insert_contract_query_with_additional_sources
+      |> Repo.transaction()
+
+    AddressName.create_primary_address_name(Repo, Changeset.get_field(smart_contract_changeset, :name), address_hash)
+
+    case insert_result do
+      {:ok, %{smart_contract: smart_contract}} ->
+        {:ok, smart_contract}
+
+      {:error, :smart_contract, changeset, _} ->
+        {:error, changeset}
+
+      {:error, :set_address_verified, message, _} ->
+        {:error, message}
+    end
+  end
+
+  @doc """
+  Converts address hash to smart-contract object
+  """
+  @spec address_hash_to_smart_contract_without_twin(Hash.Address.t(), [api?]) :: __MODULE__.t() | nil
+  def address_hash_to_smart_contract_without_twin(address_hash, options) do
+    query = get_smart_contract_query(address_hash)
+
+    Chain.select_repo(options).one(query)
+  end
+
+  @doc """
+  Converts address hash to smart-contract object with metadata_from_verified_twin=true
+  """
+  @spec address_hash_to_smart_contract(Hash.Address.t(), [api?]) :: __MODULE__.t() | nil
+  def address_hash_to_smart_contract(address_hash, options \\ []) do
+    current_smart_contract = address_hash_to_smart_contract_without_twin(address_hash, options)
+
+    with true <- is_nil(current_smart_contract),
+         address_verified_twin_contract =
+           EIP1167.get_implementation_address(address_hash, options) ||
+             get_address_verified_twin_contract(address_hash, options).verified_contract,
+         false <- is_nil(address_verified_twin_contract) do
+      address_verified_twin_contract
+      |> Map.put(:address_hash, address_hash)
+      |> Map.put(:metadata_from_verified_twin, true)
+      |> Map.put(:implementation_address_hash, nil)
+      |> Map.put(:implementation_name, nil)
+      |> Map.put(:implementation_fetched_at, nil)
+    else
+      _ ->
+        current_smart_contract
+    end
+  end
+
+  @doc """
+  Checks if it exists a verified `t:Explorer.Chain.SmartContract.t/0` for the
+  `t:Explorer.Chain.Address.t/0` with the provided `hash` and `partially_verified` property is not true.
+
+  Returns `true` if found and `false` otherwise.
+  """
+  @spec verified_with_full_match?(any()) :: boolean()
+  def verified_with_full_match?(address_hash, options \\ [])
+
+  def verified_with_full_match?(address_hash_str, options) when is_binary(address_hash_str) do
+    case Chain.string_to_address_hash(address_hash_str) do
+      {:ok, address_hash} ->
+        check_verified_with_full_match(address_hash, options)
+
+      _ ->
+        false
+    end
+  end
+
+  def verified_with_full_match?(address_hash, options) do
+    check_verified_with_full_match(address_hash, options)
+  end
+
+  @doc """
+  Checks if it exists a verified `t:Explorer.Chain.SmartContract.t/0` for the
+  `t:Explorer.Chain.Address.t/0` with the provided `hash`.
+
+  Returns `true` if found and `false` otherwise.
+  """
+  @spec verified?(any()) :: boolean()
+  def verified?(address_hash_str) when is_binary(address_hash_str) do
+    case Chain.string_to_address_hash(address_hash_str) do
+      {:ok, address_hash} ->
+        verified_smart_contract_exists?(address_hash)
+
+      _ ->
+        false
+    end
+  end
+
+  def verified?(address_hash) do
+    verified_smart_contract_exists?(address_hash)
+  end
+
+  @doc """
+  Checks if it exists a verified `t:Explorer.Chain.SmartContract.t/0` for the
+  `t:Explorer.Chain.Address.t/0` with the provided `hash`.
+
+  Returns `:ok` if found and `:not_found` otherwise.
+  """
+  @spec check_verified_smart_contract_exists(Hash.Address.t()) :: :ok | :not_found
+  def check_verified_smart_contract_exists(address_hash) do
+    address_hash
+    |> verified_smart_contract_exists?()
+    |> Chain.boolean_to_check_result()
+  end
+
+  @doc """
+  Gets smart-contract ABI from the DB for the given address hash of smart-contract
+  """
+  @spec get_smart_contract_abi(any(), any()) :: any()
+  def get_smart_contract_abi(address_hash_string, options \\ [])
+
+  def get_smart_contract_abi(address_hash_string, options)
+      when not is_nil(address_hash_string) do
+    with {:ok, implementation_address_hash} <- Chain.string_to_address_hash(address_hash_string),
+         implementation_smart_contract =
+           implementation_address_hash
+           |> __MODULE__.address_hash_to_smart_contract(options),
+         false <- is_nil(implementation_smart_contract) do
+      implementation_smart_contract
+      |> Map.get(:abi)
+    else
+      _ ->
+        []
+    end
+  end
+
+  def get_smart_contract_abi(address_hash_string, _) when is_nil(address_hash_string) do
+    []
+  end
+
+  defp upsert_contract_methods(%Changeset{changes: %{abi: abi}} = changeset) do
+    ContractMethod.upsert_from_abi(abi, get_field(changeset, :address_hash))
+
+    changeset
+  rescue
+    exception ->
+      message = Exception.format(:error, exception, __STACKTRACE__)
+
+      Logger.error(fn -> ["Error while upserting contract methods: ", message] end)
+
+      changeset
+  end
+
+  defp upsert_contract_methods(changeset), do: changeset
+
+  defp error_message(:compilation), do: error_message_with_log("There was an error compiling your contract.")
+
+  defp error_message(:compiler_version),
+    do: error_message_with_log("Compiler version does not match, please try again.")
+
+  defp error_message(:generated_bytecode), do: error_message_with_log("Bytecode does not match, please try again.")
+
+  defp error_message(:constructor_arguments),
+    do: error_message_with_log("Constructor arguments do not match, please try again.")
+
+  defp error_message(:name), do: error_message_with_log("Wrong contract name, please try again.")
+  defp error_message(:json), do: error_message_with_log("Invalid JSON file.")
+
+  defp error_message(:autodetect_constructor_arguments_failed),
+    do:
+      error_message_with_log(
+        "Autodetection of constructor arguments failed. Please try to input constructor arguments manually."
+      )
+
+  defp error_message(:no_creation_data),
+    do:
+      error_message_with_log(
+        "The contract creation transaction has not been indexed yet. Please wait a few minutes and try again."
+      )
+
+  defp error_message(:unknown_error), do: error_message_with_log("Unable to verify: unknown error.")
+
+  defp error_message(:deployed_bytecode),
+    do: error_message_with_log("Deployed bytecode does not correspond to contract creation code.")
+
+  defp error_message(:contract_source_code), do: error_message_with_log("Empty contract source code.")
+
+  defp error_message(string) when is_binary(string), do: error_message_with_log(string)
+  defp error_message(%{"message" => string} = error) when is_map(error), do: error_message_with_log(string)
+
+  defp error_message(error) do
+    Logger.warn(fn -> ["Unknown verifier error: ", inspect(error)] end)
+    "There was an error validating your contract, please try again."
+  end
+
+  defp error_message(:compilation, error_message),
+    do: error_message_with_log("There was an error compiling your contract: #{error_message}")
+
+  defp error_message_with_log(error_string) do
+    Logger.error("Smart-contract verification error: #{error_string}")
+    error_string
+  end
+
+  defp select_error_field(:no_creation_data), do: :address_hash
+  defp select_error_field(:compiler_version), do: :compiler_version
+
+  defp select_error_field(constructor_arguments)
+       when constructor_arguments in [:constructor_arguments, :autodetect_constructor_arguments_failed],
+       do: :constructor_arguments
+
+  defp select_error_field(:name), do: :name
+  defp select_error_field(_), do: :contract_source_code
+
+  defp to_address_hash(string) when is_binary(string) do
+    {:ok, address_hash} = Chain.string_to_address_hash(string)
+    address_hash
+  end
+
+  defp to_address_hash(address_hash), do: address_hash
+
+  defp db_implementation_data_converter(nil), do: nil
+  defp db_implementation_data_converter(string) when is_binary(string), do: string
+  defp db_implementation_data_converter(other), do: to_string(other)
+
+  defp check_implementation_refetch_necessity(nil), do: true
+
+  defp check_implementation_refetch_necessity(timestamp) do
+    if Application.get_env(:explorer, :enable_caching_implementation_data_of_proxy) do
+      now = DateTime.utc_now()
+
+      average_block_time = get_average_block_time()
+
+      fresh_time_distance =
+        case average_block_time do
+          0 ->
+            Application.get_env(:explorer, :fallback_ttl_cached_implementation_data_of_proxy)
+
+          time ->
+            round(time)
+        end
+
+      timestamp
+      |> DateTime.add(fresh_time_distance, :millisecond)
+      |> DateTime.compare(now) != :gt
+    else
+      true
+    end
+  end
+
+  defp get_average_block_time do
+    if Application.get_env(:explorer, :avg_block_time_as_ttl_cached_implementation_data_of_proxy) do
+      case AverageBlockTime.average_block_time() do
+        {:error, :disabled} ->
+          0
+
+        duration ->
+          duration
+          |> Duration.to_milliseconds()
+      end
+    else
+      0
+    end
+  end
+
+  @spec verified_smart_contract_exists?(Hash.Address.t()) :: boolean()
+  defp verified_smart_contract_exists?(address_hash) do
+    query = get_smart_contract_query(address_hash)
+
+    Repo.exists?(query)
+  end
+
+  defp set_address_verified(repo, address_hash) do
+    query =
+      from(
+        address in Address,
+        where: address.hash == ^address_hash
+      )
+
+    case repo.update_all(query, set: [verified: true]) do
+      {1, _} -> {:ok, []}
+      _ -> {:error, "There was an error annotating that the address has been verified."}
+    end
+  end
+
+  defp get_smart_contract_query(address_hash) do
+    from(
+      smart_contract in __MODULE__,
+      where: smart_contract.address_hash == ^address_hash
+    )
+  end
+
+  defp check_verified_with_full_match(address_hash, options) do
+    smart_contract = address_hash_to_smart_contract_without_twin(address_hash, options)
+
+    if smart_contract, do: !smart_contract.partially_verified, else: false
+  end
 end
diff --git a/apps/explorer/lib/explorer/chain/smart_contract/proxy.ex b/apps/explorer/lib/explorer/chain/smart_contract/proxy.ex
new file mode 100644
index 000000000000..fc694d8e5630
--- /dev/null
+++ b/apps/explorer/lib/explorer/chain/smart_contract/proxy.ex
@@ -0,0 +1,230 @@
+defmodule Explorer.Chain.SmartContract.Proxy do
+  @moduledoc """
+  Module for proxy smart-contract implementation detection
+  """
+
+  alias EthereumJSONRPC.Contract
+  alias Explorer.Chain.{Hash, SmartContract}
+  alias Explorer.Chain.SmartContract.Proxy
+  alias Explorer.Chain.SmartContract.Proxy.{Basic, EIP1167, EIP1822, EIP1967, EIP930, MasterCopy}
+
+  import Explorer.Chain,
+    only: [
+      string_to_address_hash: 1
+    ]
+
+  # supported signatures:
+  # 5c60da1b = keccak256(implementation())
+  @implementation_signature "5c60da1b"
+  # aaf10f42 = keccak256(getImplementation())
+  @get_implementation_signature "aaf10f42"
+  # aaf10f42 = keccak256(getAddress(bytes32))
+  @get_address_signature "21f8a721"
+
+  @burn_address_hash_string_32 "0x0000000000000000000000000000000000000000000000000000000000000000"
+
+  @typep api? :: {:api?, true | false}
+
+  defguard is_burn_signature(term) when term in ["0x", "0x0", @burn_address_hash_string_32]
+  defguard is_burn_signature_or_nil(term) when is_burn_signature(term) or term == nil
+
+  @doc """
+  Fetches into DB proxy contract implementation's address and name from different proxy patterns
+  """
+  @spec fetch_implementation_address_hash(Hash.Address.t(), list(), boolean() | nil, [api?]) ::
+          {String.t() | nil, String.t() | nil}
+  def fetch_implementation_address_hash(proxy_address_hash, proxy_abi, metadata_from_verified_twin, options)
+      when not is_nil(proxy_address_hash) and not is_nil(proxy_abi) do
+    implementation_address_hash_string = get_implementation_address_hash_string(proxy_address_hash, proxy_abi)
+
+    {:ok, burn_address_hash} = string_to_address_hash(SmartContract.burn_address_hash_string())
+
+    with false <- is_nil(implementation_address_hash_string),
+         {:ok, implementation_address_hash} <- string_to_address_hash(implementation_address_hash_string),
+         false <- implementation_address_hash.bytes == burn_address_hash.bytes do
+      SmartContract.save_implementation_data(
+        implementation_address_hash_string,
+        proxy_address_hash,
+        metadata_from_verified_twin,
+        options
+      )
+    else
+      _ ->
+        {nil, nil}
+    end
+  end
+
+  def fetch_implementation_address_hash(_, _, _, _) do
+    {nil, nil}
+  end
+
+  @doc """
+  Checks if smart-contract is proxy. Returns true/false.
+  """
+  @spec proxy_contract?(SmartContract.t()) :: boolean()
+  def proxy_contract?(smart_contract) do
+    {:ok, burn_address_hash} = string_to_address_hash(SmartContract.burn_address_hash_string())
+
+    if smart_contract.implementation_address_hash &&
+         smart_contract.implementation_address_hash.bytes !== burn_address_hash.bytes do
+      true
+    else
+      {implementation_address_hash_string, _} = SmartContract.get_implementation_address_hash(smart_contract, [])
+
+      with false <- is_nil(implementation_address_hash_string),
+           {:ok, implementation_address_hash} <- string_to_address_hash(implementation_address_hash_string),
+           false <- implementation_address_hash.bytes == burn_address_hash.bytes do
+        true
+      else
+        _ ->
+          false
+      end
+    end
+  end
+
+  @doc """
+  Decodes address output into 20 bytes address hash
+  """
+  @spec abi_decode_address_output(any()) :: nil | binary()
+  def abi_decode_address_output(nil), do: nil
+
+  def abi_decode_address_output("0x"), do: SmartContract.burn_address_hash_string()
+
+  def abi_decode_address_output(address) when is_binary(address) do
+    if String.length(address) > 42 do
+      "0x" <> String.slice(address, -40, 40)
+    else
+      address
+    end
+  end
+
+  def abi_decode_address_output(_), do: nil
+
+  @doc """
+  Gets implementation ABI for given proxy smart-contract
+  """
+  @spec get_implementation_abi_from_proxy(any(), any()) :: [map()]
+  def get_implementation_abi_from_proxy(
+        %SmartContract{address_hash: proxy_address_hash, abi: abi} = smart_contract,
+        options
+      )
+      when not is_nil(proxy_address_hash) and not is_nil(abi) do
+    {implementation_address_hash_string, _name} = SmartContract.get_implementation_address_hash(smart_contract, options)
+    SmartContract.get_smart_contract_abi(implementation_address_hash_string)
+  end
+
+  def get_implementation_abi_from_proxy(_, _), do: []
+
+  @doc """
+  Checks if the ABI of the smart-contract follows GnosisSafe proxy pattern
+  """
+  @spec gnosis_safe_contract?([map()]) :: boolean()
+  def gnosis_safe_contract?(abi) when not is_nil(abi) do
+    if get_master_copy_pattern(abi), do: true, else: false
+  end
+
+  def gnosis_safe_contract?(abi) when is_nil(abi), do: false
+
+  @doc """
+  Checks if the input of the smart-contract follows master-copy proxy pattern
+  """
+  @spec master_copy_pattern?(map()) :: any()
+  def master_copy_pattern?(method) do
+    Map.get(method, "type") == "constructor" &&
+      method
+      |> Enum.find(fn item ->
+        case item do
+          {"inputs", inputs} ->
+            find_input_by_name(inputs, "_masterCopy") || find_input_by_name(inputs, "_singleton")
+
+          _ ->
+            false
+        end
+      end)
+  end
+
+  @doc """
+  Gets implementation from proxy contract's specific storage
+  """
+  @spec get_implementation_from_storage(Hash.Address.t(), String.t(), any()) :: String.t() | nil
+  def get_implementation_from_storage(proxy_address_hash, storage_slot, json_rpc_named_arguments) do
+    case Contract.eth_get_storage_at_request(
+           proxy_address_hash,
+           storage_slot,
+           nil,
+           json_rpc_named_arguments
+         ) do
+      {:ok, empty_address_hash_string}
+      when is_burn_signature_or_nil(empty_address_hash_string) ->
+        nil
+
+      {:ok, implementation_logic_address_hash_string} ->
+        implementation_logic_address_hash_string
+
+      _ ->
+        nil
+    end
+  end
+
+  defp get_implementation_address_hash_string(proxy_address_hash, proxy_abi) do
+    implementation_method_abi = get_naive_implementation_abi(proxy_abi, "implementation")
+
+    get_implementation_method_abi = get_naive_implementation_abi(proxy_abi, "getImplementation")
+
+    master_copy_method_abi = get_master_copy_pattern(proxy_abi)
+
+    get_address_method_abi = get_naive_implementation_abi(proxy_abi, "getAddress")
+
+    cond do
+      implementation_method_abi ->
+        Basic.get_implementation_address(@implementation_signature, proxy_address_hash, proxy_abi)
+
+      get_implementation_method_abi ->
+        Basic.get_implementation_address(@get_implementation_signature, proxy_address_hash, proxy_abi)
+
+      master_copy_method_abi ->
+        MasterCopy.get_implementation_address(proxy_address_hash)
+
+      get_address_method_abi ->
+        EIP930.get_implementation_address(@get_address_signature, proxy_address_hash, proxy_abi)
+
+      true ->
+        EIP1967.get_implementation_address(proxy_address_hash) ||
+          EIP1167.get_implementation_address(proxy_address_hash) ||
+          EIP1822.get_implementation_address(proxy_address_hash)
+    end
+  end
+
+  defp get_naive_implementation_abi(abi, getter_name) do
+    abi
+    |> Enum.find(fn method ->
+      Map.get(method, "name") == getter_name && Map.get(method, "stateMutability") == "view"
+    end)
+  end
+
+  defp get_master_copy_pattern(abi) do
+    abi
+    |> Enum.find(fn method ->
+      master_copy_pattern?(method)
+    end)
+  end
+
+  def combine_proxy_implementation_abi(smart_contract, options \\ [])
+
+  def combine_proxy_implementation_abi(%SmartContract{abi: abi} = smart_contract, options) when not is_nil(abi) do
+    implementation_abi = Proxy.get_implementation_abi_from_proxy(smart_contract, options)
+
+    if Enum.empty?(implementation_abi), do: abi, else: implementation_abi ++ abi
+  end
+
+  def combine_proxy_implementation_abi(_, _) do
+    []
+  end
+
+  defp find_input_by_name(inputs, name) do
+    inputs
+    |> Enum.find(fn input ->
+      Map.get(input, "name") == name
+    end)
+  end
+end
diff --git a/apps/explorer/lib/explorer/chain/smart_contract/proxy/basic.ex b/apps/explorer/lib/explorer/chain/smart_contract/proxy/basic.ex
new file mode 100644
index 000000000000..ed793c662b93
--- /dev/null
+++ b/apps/explorer/lib/explorer/chain/smart_contract/proxy/basic.ex
@@ -0,0 +1,44 @@
+defmodule Explorer.Chain.SmartContract.Proxy.Basic do
+  @moduledoc """
+  Module for fetching proxy implementation from specific smart-contract getter
+  """
+
+  alias Explorer.SmartContract.Reader
+
+  @doc """
+  Gets implementation if proxy contract from getter.
+  """
+  @spec get_implementation_address(any(), binary(), any()) :: nil | binary()
+  def get_implementation_address(signature, proxy_address_hash, abi) do
+    implementation_address =
+      case Reader.query_contract(
+             proxy_address_hash,
+             abi,
+             %{
+               "#{signature}" => []
+             },
+             false
+           ) do
+        %{^signature => {:ok, [result]}} -> result
+        _ -> nil
+      end
+
+    adds_0x_to_address(implementation_address)
+  end
+
+  @doc """
+  Adds 0x to address at the beginning
+  """
+  @spec adds_0x_to_address(nil | binary()) :: nil | binary()
+  def adds_0x_to_address(nil), do: nil
+
+  def adds_0x_to_address(address) do
+    if address do
+      if String.starts_with?(address, "0x") do
+        address
+      else
+        "0x" <> Base.encode16(address, case: :lower)
+      end
+    end
+  end
+end
diff --git a/apps/explorer/lib/explorer/chain/smart_contract/proxy/eip_1167.ex b/apps/explorer/lib/explorer/chain/smart_contract/proxy/eip_1167.ex
new file mode 100644
index 000000000000..c76900ece45b
--- /dev/null
+++ b/apps/explorer/lib/explorer/chain/smart_contract/proxy/eip_1167.ex
@@ -0,0 +1,54 @@
+defmodule Explorer.Chain.SmartContract.Proxy.EIP1167 do
+  @moduledoc """
+  Module for fetching proxy implementation from https://eips.ethereum.org/EIPS/eip-1167 (Minimal Proxy Contract)
+  """
+
+  alias Explorer.Chain
+  alias Explorer.Chain.{Address, Hash, SmartContract}
+
+  import Ecto.Query, only: [from: 2]
+
+  @doc """
+  Get implementation address following EIP-1167
+  """
+  @spec get_implementation_address(Hash.Address.t(), Keyword.t()) :: SmartContract.t() | nil
+  def get_implementation_address(address_hash, options \\ []) do
+    case Chain.select_repo(options).get(Address, address_hash) do
+      nil ->
+        nil
+
+      target_address ->
+        contract_code = target_address.contract_code
+
+        case contract_code do
+          %Chain.Data{bytes: contract_code_bytes} ->
+            contract_bytecode = Base.encode16(contract_code_bytes, case: :lower)
+
+            get_proxy_eip_1167(contract_bytecode, options)
+
+          _ ->
+            nil
+        end
+    end
+  end
+
+  defp get_proxy_eip_1167(contract_bytecode, options) do
+    case contract_bytecode do
+      "363d3d373d3d3d363d73" <> <<template_address::binary-size(40)>> <> _ ->
+        template_address = "0x" <> template_address
+
+        query =
+          from(
+            smart_contract in SmartContract,
+            where: smart_contract.address_hash == ^template_address,
+            select: smart_contract
+          )
+
+        query
+        |> Chain.select_repo(options).one(timeout: 10_000)
+
+      _ ->
+        nil
+    end
+  end
+end
diff --git a/apps/explorer/lib/explorer/chain/smart_contract/proxy/eip_1822.ex b/apps/explorer/lib/explorer/chain/smart_contract/proxy/eip_1822.ex
new file mode 100644
index 000000000000..887dc50a0655
--- /dev/null
+++ b/apps/explorer/lib/explorer/chain/smart_contract/proxy/eip_1822.ex
@@ -0,0 +1,32 @@
+defmodule Explorer.Chain.SmartContract.Proxy.EIP1822 do
+  @moduledoc """
+  Module for fetching proxy implementation from https://eips.ethereum.org/EIPS/eip-1822 Universal Upgradeable Proxy Standard (UUPS)
+  """
+  alias Explorer.Chain.{Hash, SmartContract}
+  alias Explorer.Chain.SmartContract.Proxy
+
+  @burn_address_hash_string_32 "0x0000000000000000000000000000000000000000000000000000000000000000"
+
+  defguard is_burn_signature(term) when term in ["0x", "0x0", @burn_address_hash_string_32]
+  defguard is_burn_signature_or_nil(term) when is_burn_signature(term) or term == nil
+
+  # keccak256("PROXIABLE")
+  @storage_slot_proxiable "0xc5f16f0fcc639fa48a6947836d9850f504798523bf8c9a3a87d5876cf622bcf7"
+
+  @doc """
+  Get implementation address following EIP-1967
+  """
+  @spec get_implementation_address(Hash.Address.t()) :: SmartContract.t() | nil
+  def get_implementation_address(proxy_address_hash) do
+    json_rpc_named_arguments = Application.get_env(:explorer, :json_rpc_named_arguments)
+
+    proxiable_contract_address_hash_string =
+      Proxy.get_implementation_from_storage(
+        proxy_address_hash,
+        @storage_slot_proxiable,
+        json_rpc_named_arguments
+      )
+
+    Proxy.abi_decode_address_output(proxiable_contract_address_hash_string)
+  end
+end
diff --git a/apps/explorer/lib/explorer/chain/smart_contract/proxy/eip_1967.ex b/apps/explorer/lib/explorer/chain/smart_contract/proxy/eip_1967.ex
new file mode 100644
index 000000000000..c6f500492fa2
--- /dev/null
+++ b/apps/explorer/lib/explorer/chain/smart_contract/proxy/eip_1967.ex
@@ -0,0 +1,101 @@
+defmodule Explorer.Chain.SmartContract.Proxy.EIP1967 do
+  @moduledoc """
+  Module for fetching proxy implementation from https://eips.ethereum.org/EIPS/eip-1967 (Proxy Storage Slots)
+  """
+  alias EthereumJSONRPC.Contract
+  alias Explorer.Chain.{Hash, SmartContract}
+  alias Explorer.Chain.SmartContract.Proxy
+  alias Explorer.Chain.SmartContract.Proxy.Basic
+
+  # supported signatures:
+  # 5c60da1b = keccak256(implementation())
+  @implementation_signature "5c60da1b"
+
+  @burn_address_hash_string_32 "0x0000000000000000000000000000000000000000000000000000000000000000"
+
+  defguard is_burn_signature(term) when term in ["0x", "0x0", @burn_address_hash_string_32]
+  defguard is_burn_signature_or_nil(term) when is_burn_signature(term) or term == nil
+
+  @storage_slot_logic_contract_address "0x360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc"
+
+  # to be precise, it is not the part of the EIP-1967 standard, but still uses the same pattern
+  # changes requested by https://github.com/blockscout/blockscout/issues/5292
+  # This is the keccak-256 hash of "org.zeppelinos.proxy.implementation"
+  @storage_slot_openzeppelin_contract_address "0x7050c9e0f4ca769c69bd3a8ef740bc37934f8e2c036e5a723fd8ee048ed3f8c3"
+
+  @doc """
+  Get implementation address following EIP-1967
+  """
+  @spec get_implementation_address(Hash.Address.t()) :: SmartContract.t() | nil
+  def get_implementation_address(proxy_address_hash) do
+    json_rpc_named_arguments = Application.get_env(:explorer, :json_rpc_named_arguments)
+
+    logic_contract_address_hash_string =
+      Proxy.get_implementation_from_storage(
+        proxy_address_hash,
+        @storage_slot_logic_contract_address,
+        json_rpc_named_arguments
+      )
+
+    beacon_contract_address_hash_string =
+      fetch_beacon_proxy_implementation(proxy_address_hash, json_rpc_named_arguments)
+
+    openzeppelin_style_contract_address_hash_string =
+      Proxy.get_implementation_from_storage(
+        proxy_address_hash,
+        @storage_slot_openzeppelin_contract_address,
+        json_rpc_named_arguments
+      )
+
+    implementation_address_hash_string =
+      logic_contract_address_hash_string || beacon_contract_address_hash_string ||
+        openzeppelin_style_contract_address_hash_string
+
+    Proxy.abi_decode_address_output(implementation_address_hash_string)
+  end
+
+  # changes requested by https://github.com/blockscout/blockscout/issues/4770
+  # for support BeaconProxy pattern
+  defp fetch_beacon_proxy_implementation(proxy_address_hash, json_rpc_named_arguments) do
+    # https://eips.ethereum.org/EIPS/eip-1967
+    storage_slot_beacon_contract_address = "0xa3f0ad74e5423aebfd80d3ef4346578335a9a72aeaee59ff6cb3582b35133d50"
+
+    implementation_method_abi = [
+      %{
+        "type" => "function",
+        "stateMutability" => "view",
+        "outputs" => [%{"type" => "address", "name" => "", "internalType" => "address"}],
+        "name" => "implementation",
+        "inputs" => []
+      }
+    ]
+
+    case Contract.eth_get_storage_at_request(
+           proxy_address_hash,
+           storage_slot_beacon_contract_address,
+           nil,
+           json_rpc_named_arguments
+         ) do
+      {:ok, empty_address}
+      when is_burn_signature_or_nil(empty_address) ->
+        nil
+
+      {:ok, beacon_contract_address} ->
+        case beacon_contract_address
+             |> Proxy.abi_decode_address_output()
+             |> Basic.get_implementation_address(
+               @implementation_signature,
+               implementation_method_abi
+             ) do
+          <<implementation_address::binary-size(42)>> ->
+            implementation_address
+
+          _ ->
+            beacon_contract_address
+        end
+
+      _ ->
+        nil
+    end
+  end
+end
diff --git a/apps/explorer/lib/explorer/chain/smart_contract/proxy/eip_930.ex b/apps/explorer/lib/explorer/chain/smart_contract/proxy/eip_930.ex
new file mode 100644
index 000000000000..964346df37eb
--- /dev/null
+++ b/apps/explorer/lib/explorer/chain/smart_contract/proxy/eip_930.ex
@@ -0,0 +1,31 @@
+defmodule Explorer.Chain.SmartContract.Proxy.EIP930 do
+  @moduledoc """
+  Module for fetching proxy implementation from smart-contract getter following https://github.com/ethereum/EIPs/issues/930
+  """
+
+  alias Explorer.Chain.SmartContract.Proxy.Basic
+  alias Explorer.SmartContract.Reader
+
+  @storage_slot_logic_contract_address "0x360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc"
+
+  @doc """
+  Gets implementation if proxy contract from getter.
+  """
+  @spec get_implementation_address(any(), binary(), any()) :: nil | binary()
+  def get_implementation_address(signature, proxy_address_hash, abi) do
+    implementation_address =
+      case Reader.query_contract(
+             proxy_address_hash,
+             abi,
+             %{
+               "#{signature}" => [@storage_slot_logic_contract_address]
+             },
+             false
+           ) do
+        %{^signature => {:ok, [result]}} -> result
+        _ -> nil
+      end
+
+    Basic.adds_0x_to_address(implementation_address)
+  end
+end
diff --git a/apps/explorer/lib/explorer/chain/smart_contract/proxy/master_copy.ex b/apps/explorer/lib/explorer/chain/smart_contract/proxy/master_copy.ex
new file mode 100644
index 000000000000..fb0df17aaa3c
--- /dev/null
+++ b/apps/explorer/lib/explorer/chain/smart_contract/proxy/master_copy.ex
@@ -0,0 +1,43 @@
+defmodule Explorer.Chain.SmartContract.Proxy.MasterCopy do
+  @moduledoc """
+  Module for fetching master-copy proxy implementation
+  """
+
+  alias EthereumJSONRPC.Contract
+  alias Explorer.Chain.{Hash, SmartContract}
+  alias Explorer.Chain.SmartContract.Proxy
+
+  @burn_address_hash_string_32 "0x0000000000000000000000000000000000000000000000000000000000000000"
+
+  defguard is_burn_signature(term) when term in ["0x", "0x0", @burn_address_hash_string_32]
+
+  @doc """
+  Gets implementation address for proxy contract from master-copy pattern
+  """
+  @spec get_implementation_address(Hash.Address.t()) :: SmartContract.t() | nil
+  def get_implementation_address(proxy_address_hash) do
+    json_rpc_named_arguments = Application.get_env(:explorer, :json_rpc_named_arguments)
+
+    master_copy_storage_pointer = "0x0"
+
+    {:ok, implementation_address} =
+      case Contract.eth_get_storage_at_request(
+             proxy_address_hash,
+             master_copy_storage_pointer,
+             nil,
+             json_rpc_named_arguments
+           ) do
+        {:ok, empty_address}
+        when is_burn_signature(empty_address) ->
+          {:ok, "0x"}
+
+        {:ok, logic_contract_address} ->
+          {:ok, logic_contract_address}
+
+        _ ->
+          {:ok, nil}
+      end
+
+    Proxy.abi_decode_address_output(implementation_address)
+  end
+end
diff --git a/apps/explorer/lib/explorer/chain/smart_contract_additional_sources.ex b/apps/explorer/lib/explorer/chain/smart_contract_additional_sources.ex
index 850c28f4b678..a05e5f0a733b 100644
--- a/apps/explorer/lib/explorer/chain/smart_contract_additional_sources.ex
+++ b/apps/explorer/lib/explorer/chain/smart_contract_additional_sources.ex
@@ -8,6 +8,8 @@ defmodule Explorer.Chain.SmartContractAdditionalSource do
 
   use Explorer.Schema
 
+  import Explorer.Chain, only: [select_repo: 1]
+
   alias Explorer.Chain.{Hash, SmartContract}
 
   @typedoc """
@@ -59,5 +61,24 @@ defmodule Explorer.Chain.SmartContractAdditionalSource do
     add_error(validated, :contract_source_code, error_message(error))
   end
 
+  @doc """
+  Returns all additional sources for the given smart-contract address hash
+  """
+  @spec get_contract_additional_sources(SmartContract.t(), Keyword.t()) :: [__MODULE__.t()]
+  def get_contract_additional_sources(smart_contract, options) do
+    if smart_contract do
+      all_additional_sources_query =
+        from(
+          s in __MODULE__,
+          where: s.address_hash == ^smart_contract.address_hash
+        )
+
+      all_additional_sources_query
+      |> select_repo(options).all()
+    else
+      []
+    end
+  end
+
   defp error_message(_), do: "There was an error validating your contract, please try again."
 end
diff --git a/apps/explorer/lib/explorer/chain/transaction.ex b/apps/explorer/lib/explorer/chain/transaction.ex
index 60e9cb3d2c4f..32dc58105f1e 100644
--- a/apps/explorer/lib/explorer/chain/transaction.ex
+++ b/apps/explorer/lib/explorer/chain/transaction.ex
@@ -31,6 +31,7 @@ defmodule Explorer.Chain.Transaction do
     Wei
   }
 
+  alias Explorer.Chain.SmartContract.Proxy
   alias Explorer.Chain.Transaction.{Fork, Status}
   alias Explorer.Chain.Zkevm.BatchTransaction
   alias Explorer.SmartContract.SigProviderInterface
@@ -792,7 +793,7 @@ defmodule Explorer.Chain.Transaction do
     if !is_nil(address_hash) && Map.has_key?(full_abi_acc, address_hash) do
       {full_abi_acc[address_hash], full_abi_acc}
     else
-      full_abi = Chain.combine_proxy_implementation_abi(smart_contract, options)
+      full_abi = Proxy.combine_proxy_implementation_abi(smart_contract, options)
 
       {full_abi, Map.put(full_abi_acc, address_hash, full_abi)}
     end
diff --git a/apps/explorer/lib/explorer/etherscan/contracts.ex b/apps/explorer/lib/explorer/etherscan/contracts.ex
index 4985220bf64f..de63dc05af36 100644
--- a/apps/explorer/lib/explorer/etherscan/contracts.ex
+++ b/apps/explorer/lib/explorer/etherscan/contracts.ex
@@ -11,8 +11,10 @@ defmodule Explorer.Etherscan.Contracts do
       where: 3
     ]
 
-  alias Explorer.{Chain, Repo}
+  alias Explorer.Repo
   alias Explorer.Chain.{Address, Hash, SmartContract}
+  alias Explorer.Chain.SmartContract.Proxy
+  alias Explorer.Chain.SmartContract.Proxy.EIP1167
 
   @spec address_hash_to_address_with_source_code(Hash.Address.t()) :: Address.t() | nil
   def address_hash_to_address_with_source_code(address_hash) do
@@ -38,8 +40,8 @@ defmodule Explorer.Etherscan.Contracts do
             }
           else
             address_verified_twin_contract =
-              Chain.get_minimal_proxy_template(address_hash) ||
-                Chain.get_address_verified_twin_contract(address_hash).verified_contract
+              EIP1167.get_implementation_address(address_hash) ||
+                SmartContract.get_address_verified_twin_contract(address_hash).verified_contract
 
             compose_address_with_smart_contract(
               address_with_smart_contract,
@@ -67,7 +69,7 @@ defmodule Explorer.Etherscan.Contracts do
 
   def append_proxy_info(%Address{smart_contract: smart_contract} = address) when not is_nil(smart_contract) do
     updated_smart_contract =
-      if SmartContract.proxy_contract?(smart_contract) do
+      if Proxy.proxy_contract?(smart_contract) do
         smart_contract
         |> Map.put(:is_proxy, true)
         |> Map.put(
diff --git a/apps/explorer/lib/explorer/smart_contract/reader.ex b/apps/explorer/lib/explorer/smart_contract/reader.ex
index 19b8a86af152..cdfd2ca51c53 100644
--- a/apps/explorer/lib/explorer/smart_contract/reader.ex
+++ b/apps/explorer/lib/explorer/smart_contract/reader.ex
@@ -7,8 +7,8 @@ defmodule Explorer.SmartContract.Reader do
   """
 
   alias EthereumJSONRPC.{Contract, Encoder}
-  alias Explorer.Chain
   alias Explorer.Chain.{Hash, SmartContract}
+  alias Explorer.Chain.SmartContract.Proxy
   alias Explorer.SmartContract.Helper
 
   @typedoc """
@@ -92,7 +92,7 @@ defmodule Explorer.SmartContract.Reader do
 
   defp prepare_abi(nil, address_hash) do
     address_hash
-    |> Chain.address_hash_to_smart_contract()
+    |> SmartContract.address_hash_to_smart_contract()
     |> Map.get(:abi)
   end
 
@@ -222,7 +222,7 @@ defmodule Explorer.SmartContract.Reader do
   def read_only_functions(nil, _, _), do: []
 
   def read_only_functions_proxy(contract_address_hash, implementation_address_hash_string, from, options \\ []) do
-    implementation_abi = Chain.get_implementation_abi(implementation_address_hash_string, options)
+    implementation_abi = SmartContract.get_smart_contract_abi(implementation_address_hash_string, options)
 
     case implementation_abi do
       nil ->
@@ -238,7 +238,7 @@ defmodule Explorer.SmartContract.Reader do
   """
   @spec read_functions_required_wallet_proxy(String.t()) :: [%{}]
   def read_functions_required_wallet_proxy(implementation_address_hash_string) do
-    implementation_abi = Chain.get_implementation_abi(implementation_address_hash_string)
+    implementation_abi = SmartContract.get_smart_contract_abi(implementation_address_hash_string)
 
     case implementation_abi do
       nil ->
@@ -572,10 +572,10 @@ defmodule Explorer.SmartContract.Reader do
   end
 
   defp get_abi(contract_address_hash, type, options) do
-    contract = Chain.address_hash_to_smart_contract(contract_address_hash, options)
+    contract = SmartContract.address_hash_to_smart_contract(contract_address_hash, options)
 
     if type == :proxy do
-      Chain.get_implementation_abi_from_proxy(contract, options)
+      Proxy.get_implementation_abi_from_proxy(contract, options)
     else
       contract.abi
     end
diff --git a/apps/explorer/lib/explorer/smart_contract/solidity/publisher.ex b/apps/explorer/lib/explorer/smart_contract/solidity/publisher.ex
index cee27ad6c942..b83895a15e46 100644
--- a/apps/explorer/lib/explorer/smart_contract/solidity/publisher.ex
+++ b/apps/explorer/lib/explorer/smart_contract/solidity/publisher.ex
@@ -7,7 +7,6 @@ defmodule Explorer.SmartContract.Solidity.Publisher do
 
   import Explorer.SmartContract.Helper, only: [cast_libraries: 1]
 
-  alias Explorer.Chain
   alias Explorer.Chain.SmartContract
   alias Explorer.SmartContract.{CompilerVersion, Helper}
   alias Explorer.SmartContract.Solidity.Verifier
@@ -200,10 +199,10 @@ defmodule Explorer.SmartContract.Solidity.Publisher do
   defp create_or_update_smart_contract(address_hash, attrs) do
     Logger.info("Publish successfully verified Solidity smart-contract #{address_hash} into the DB")
 
-    if Chain.smart_contract_verified?(address_hash) do
-      Chain.update_smart_contract(attrs, attrs.external_libraries, attrs.secondary_sources)
+    if SmartContract.verified?(address_hash) do
+      SmartContract.update_smart_contract(attrs, attrs.external_libraries, attrs.secondary_sources)
     else
-      Chain.create_smart_contract(attrs, attrs.external_libraries, attrs.secondary_sources)
+      SmartContract.create_smart_contract(attrs, attrs.external_libraries, attrs.secondary_sources)
     end
   end
 
diff --git a/apps/explorer/lib/explorer/smart_contract/vyper/publisher.ex b/apps/explorer/lib/explorer/smart_contract/vyper/publisher.ex
index e5c38116d06f..7a6087d39063 100644
--- a/apps/explorer/lib/explorer/smart_contract/vyper/publisher.ex
+++ b/apps/explorer/lib/explorer/smart_contract/vyper/publisher.ex
@@ -7,7 +7,6 @@ defmodule Explorer.SmartContract.Vyper.Publisher do
 
   require Logger
 
-  alias Explorer.Chain
   alias Explorer.Chain.SmartContract
   alias Explorer.SmartContract.CompilerVersion
   alias Explorer.SmartContract.Vyper.Verifier
@@ -124,7 +123,7 @@ defmodule Explorer.SmartContract.Vyper.Publisher do
     Logger.info("Publish successfully verified Vyper smart-contract #{address_hash} into the DB")
     attrs = address_hash |> attributes(params, abi)
 
-    Chain.create_smart_contract(attrs, attrs.external_libraries, attrs.secondary_sources)
+    SmartContract.create_smart_contract(attrs, attrs.external_libraries, attrs.secondary_sources)
   end
 
   defp unverified_smart_contract(address_hash, params, error, error_message, verification_with_files? \\ false) do
diff --git a/apps/explorer/lib/explorer/smart_contract/writer.ex b/apps/explorer/lib/explorer/smart_contract/writer.ex
index 07b77abd627b..6aef776a1ca5 100644
--- a/apps/explorer/lib/explorer/smart_contract/writer.ex
+++ b/apps/explorer/lib/explorer/smart_contract/writer.ex
@@ -3,7 +3,6 @@ defmodule Explorer.SmartContract.Writer do
   Generates smart-contract transactions
   """
 
-  alias Explorer.Chain
   alias Explorer.Chain.{Hash, SmartContract}
   alias Explorer.SmartContract.Helper
 
@@ -21,7 +20,7 @@ defmodule Explorer.SmartContract.Writer do
 
   @spec write_functions_proxy(Hash.t() | String.t()) :: [%{}]
   def write_functions_proxy(implementation_address_hash_string, options \\ []) do
-    implementation_abi = Chain.get_implementation_abi(implementation_address_hash_string, options)
+    implementation_abi = SmartContract.get_smart_contract_abi(implementation_address_hash_string, options)
 
     case implementation_abi do
       nil ->
diff --git a/apps/explorer/test/explorer/chain/log_test.exs b/apps/explorer/test/explorer/chain/log_test.exs
index 1b5df9388e9c..6188903de08a 100644
--- a/apps/explorer/test/explorer/chain/log_test.exs
+++ b/apps/explorer/test/explorer/chain/log_test.exs
@@ -104,7 +104,7 @@ defmodule Explorer.Chain.LogTest do
           data: data
         )
 
-      get_eip1967_implementation()
+      request_zero_implementations()
 
       assert {{:ok, "eb9b3c4c", "WantsPets(string indexed _from_human, uint256 _number, bool indexed _belly)",
                [
@@ -173,7 +173,7 @@ defmodule Explorer.Chain.LogTest do
     end
   end
 
-  def get_eip1967_implementation do
+  def request_zero_implementations do
     EthereumJSONRPC.Mox
     |> expect(:json_rpc, fn %{
                               id: 0,
@@ -211,5 +211,17 @@ defmodule Explorer.Chain.LogTest do
                             _options ->
       {:ok, "0x0000000000000000000000000000000000000000000000000000000000000000"}
     end)
+    |> expect(:json_rpc, fn %{
+                              id: 0,
+                              method: "eth_getStorageAt",
+                              params: [
+                                _,
+                                "0xc5f16f0fcc639fa48a6947836d9850f504798523bf8c9a3a87d5876cf622bcf7",
+                                "latest"
+                              ]
+                            },
+                            _options ->
+      {:ok, "0x0000000000000000000000000000000000000000000000000000000000000000"}
+    end)
   end
 end
diff --git a/apps/explorer/test/explorer/chain/smart_contract/proxy_test.exs b/apps/explorer/test/explorer/chain/smart_contract/proxy_test.exs
new file mode 100644
index 000000000000..4c96a032c1e2
--- /dev/null
+++ b/apps/explorer/test/explorer/chain/smart_contract/proxy_test.exs
@@ -0,0 +1,384 @@
+defmodule Explorer.Chain.SmartContract.ProxyTest do
+  use Explorer.DataCase, async: false
+  import Mox
+  alias Explorer.Chain.SmartContract
+  alias Explorer.Chain.SmartContract.Proxy
+
+  setup :verify_on_exit!
+  setup :set_mox_global
+
+  describe "proxy contracts features" do
+    @proxy_abi [
+      %{
+        "type" => "function",
+        "stateMutability" => "nonpayable",
+        "payable" => false,
+        "outputs" => [%{"type" => "bool", "name" => ""}],
+        "name" => "upgradeTo",
+        "inputs" => [%{"type" => "address", "name" => "newImplementation"}],
+        "constant" => false
+      },
+      %{
+        "type" => "function",
+        "stateMutability" => "view",
+        "payable" => false,
+        "outputs" => [%{"type" => "uint256", "name" => ""}],
+        "name" => "version",
+        "inputs" => [],
+        "constant" => true
+      },
+      %{
+        "type" => "function",
+        "stateMutability" => "view",
+        "payable" => false,
+        "outputs" => [%{"type" => "address", "name" => ""}],
+        "name" => "implementation",
+        "inputs" => [],
+        "constant" => true
+      },
+      %{
+        "type" => "function",
+        "stateMutability" => "nonpayable",
+        "payable" => false,
+        "outputs" => [],
+        "name" => "renounceOwnership",
+        "inputs" => [],
+        "constant" => false
+      },
+      %{
+        "type" => "function",
+        "stateMutability" => "view",
+        "payable" => false,
+        "outputs" => [%{"type" => "address", "name" => ""}],
+        "name" => "getOwner",
+        "inputs" => [],
+        "constant" => true
+      },
+      %{
+        "type" => "function",
+        "stateMutability" => "view",
+        "payable" => false,
+        "outputs" => [%{"type" => "address", "name" => ""}],
+        "name" => "getProxyStorage",
+        "inputs" => [],
+        "constant" => true
+      },
+      %{
+        "type" => "function",
+        "stateMutability" => "nonpayable",
+        "payable" => false,
+        "outputs" => [],
+        "name" => "transferOwnership",
+        "inputs" => [%{"type" => "address", "name" => "_newOwner"}],
+        "constant" => false
+      },
+      %{
+        "type" => "constructor",
+        "stateMutability" => "nonpayable",
+        "payable" => false,
+        "inputs" => [
+          %{"type" => "address", "name" => "_proxyStorage"},
+          %{"type" => "address", "name" => "_implementationAddress"}
+        ]
+      },
+      %{"type" => "fallback", "stateMutability" => "nonpayable", "payable" => false},
+      %{
+        "type" => "event",
+        "name" => "Upgraded",
+        "inputs" => [
+          %{"type" => "uint256", "name" => "version", "indexed" => false},
+          %{"type" => "address", "name" => "implementation", "indexed" => true}
+        ],
+        "anonymous" => false
+      },
+      %{
+        "type" => "event",
+        "name" => "OwnershipRenounced",
+        "inputs" => [%{"type" => "address", "name" => "previousOwner", "indexed" => true}],
+        "anonymous" => false
+      },
+      %{
+        "type" => "event",
+        "name" => "OwnershipTransferred",
+        "inputs" => [
+          %{"type" => "address", "name" => "previousOwner", "indexed" => true},
+          %{"type" => "address", "name" => "newOwner", "indexed" => true}
+        ],
+        "anonymous" => false
+      }
+    ]
+
+    @implementation_abi [
+      %{
+        "constant" => false,
+        "inputs" => [%{"name" => "x", "type" => "uint256"}],
+        "name" => "set",
+        "outputs" => [],
+        "payable" => false,
+        "stateMutability" => "nonpayable",
+        "type" => "function"
+      },
+      %{
+        "constant" => true,
+        "inputs" => [],
+        "name" => "get",
+        "outputs" => [%{"name" => "", "type" => "uint256"}],
+        "payable" => false,
+        "stateMutability" => "view",
+        "type" => "function"
+      }
+    ]
+
+    # EIP-1967 + EIP-1822
+    defp request_zero_implementations do
+      EthereumJSONRPC.Mox
+      |> expect(:json_rpc, fn %{
+                                id: 0,
+                                method: "eth_getStorageAt",
+                                params: [
+                                  _,
+                                  "0x360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc",
+                                  "latest"
+                                ]
+                              },
+                              _options ->
+        {:ok, "0x0000000000000000000000000000000000000000000000000000000000000000"}
+      end)
+      |> expect(:json_rpc, fn %{
+                                id: 0,
+                                method: "eth_getStorageAt",
+                                params: [
+                                  _,
+                                  "0xa3f0ad74e5423aebfd80d3ef4346578335a9a72aeaee59ff6cb3582b35133d50",
+                                  "latest"
+                                ]
+                              },
+                              _options ->
+        {:ok, "0x0000000000000000000000000000000000000000000000000000000000000000"}
+      end)
+      |> expect(:json_rpc, fn %{
+                                id: 0,
+                                method: "eth_getStorageAt",
+                                params: [
+                                  _,
+                                  "0x7050c9e0f4ca769c69bd3a8ef740bc37934f8e2c036e5a723fd8ee048ed3f8c3",
+                                  "latest"
+                                ]
+                              },
+                              _options ->
+        {:ok, "0x0000000000000000000000000000000000000000000000000000000000000000"}
+      end)
+      |> expect(:json_rpc, fn %{
+                                id: 0,
+                                method: "eth_getStorageAt",
+                                params: [
+                                  _,
+                                  "0xc5f16f0fcc639fa48a6947836d9850f504798523bf8c9a3a87d5876cf622bcf7",
+                                  "latest"
+                                ]
+                              },
+                              _options ->
+        {:ok, "0x0000000000000000000000000000000000000000000000000000000000000000"}
+      end)
+    end
+
+    test "combine_proxy_implementation_abi/2 returns empty [] abi if proxy abi is null" do
+      proxy_contract_address = insert(:contract_address)
+
+      assert Proxy.combine_proxy_implementation_abi(%SmartContract{address_hash: proxy_contract_address.hash, abi: nil}) ==
+               []
+    end
+
+    test "combine_proxy_implementation_abi/2 returns [] abi for unverified proxy" do
+      proxy_contract_address = insert(:contract_address)
+
+      smart_contract =
+        insert(:smart_contract, address_hash: proxy_contract_address.hash, abi: [], contract_code_md5: "123")
+
+      request_zero_implementations()
+
+      assert Proxy.combine_proxy_implementation_abi(smart_contract) == []
+    end
+
+    test "combine_proxy_implementation_abi/2 returns proxy abi if implementation is not verified" do
+      proxy_contract_address = insert(:contract_address)
+
+      smart_contract =
+        insert(:smart_contract, address_hash: proxy_contract_address.hash, abi: @proxy_abi, contract_code_md5: "123")
+
+      assert Proxy.combine_proxy_implementation_abi(smart_contract) == @proxy_abi
+    end
+
+    test "combine_proxy_implementation_abi/2 returns proxy + implementation abi if implementation is verified" do
+      proxy_contract_address = insert(:contract_address)
+
+      smart_contract =
+        insert(:smart_contract, address_hash: proxy_contract_address.hash, abi: @proxy_abi, contract_code_md5: "123")
+
+      implementation_contract_address = insert(:contract_address)
+
+      insert(:smart_contract,
+        address_hash: implementation_contract_address.hash,
+        abi: @implementation_abi,
+        contract_code_md5: "123"
+      )
+
+      implementation_contract_address_hash_string =
+        Base.encode16(implementation_contract_address.hash.bytes, case: :lower)
+
+      expect(
+        EthereumJSONRPC.Mox,
+        :json_rpc,
+        fn [%{id: id, method: _, params: [%{data: _, to: _}, _]}], _options ->
+          {:ok,
+           [
+             %{
+               id: id,
+               jsonrpc: "2.0",
+               result: "0x000000000000000000000000" <> implementation_contract_address_hash_string
+             }
+           ]}
+        end
+      )
+
+      combined_abi = Proxy.combine_proxy_implementation_abi(smart_contract)
+
+      assert Enum.any?(@proxy_abi, fn el -> el == Enum.at(@implementation_abi, 0) end) == false
+      assert Enum.any?(@proxy_abi, fn el -> el == Enum.at(@implementation_abi, 1) end) == false
+      assert Enum.any?(combined_abi, fn el -> el == Enum.at(@implementation_abi, 0) end) == true
+      assert Enum.any?(combined_abi, fn el -> el == Enum.at(@implementation_abi, 1) end) == true
+    end
+
+    test "get_implementation_abi_from_proxy/2 returns empty [] abi if proxy abi is null" do
+      proxy_contract_address = insert(:contract_address)
+
+      assert Proxy.get_implementation_abi_from_proxy(
+               %SmartContract{address_hash: proxy_contract_address.hash, abi: nil},
+               []
+             ) ==
+               []
+    end
+
+    test "get_implementation_abi_from_proxy/2 returns [] abi for unverified proxy" do
+      proxy_contract_address = insert(:contract_address)
+
+      smart_contract =
+        insert(:smart_contract, address_hash: proxy_contract_address.hash, abi: [], contract_code_md5: "123")
+
+      request_zero_implementations()
+
+      assert Proxy.combine_proxy_implementation_abi(smart_contract) == []
+    end
+
+    test "get_implementation_abi_from_proxy/2 returns [] if implementation is not verified" do
+      proxy_contract_address = insert(:contract_address)
+
+      smart_contract =
+        insert(:smart_contract, address_hash: proxy_contract_address.hash, abi: @proxy_abi, contract_code_md5: "123")
+
+      assert Proxy.get_implementation_abi_from_proxy(smart_contract, []) == []
+    end
+
+    test "get_implementation_abi_from_proxy/2 returns implementation abi if implementation is verified" do
+      proxy_contract_address = insert(:contract_address)
+
+      smart_contract =
+        insert(:smart_contract, address_hash: proxy_contract_address.hash, abi: @proxy_abi, contract_code_md5: "123")
+
+      implementation_contract_address = insert(:contract_address)
+
+      insert(:smart_contract,
+        address_hash: implementation_contract_address.hash,
+        abi: @implementation_abi,
+        contract_code_md5: "123"
+      )
+
+      implementation_contract_address_hash_string =
+        Base.encode16(implementation_contract_address.hash.bytes, case: :lower)
+
+      expect(
+        EthereumJSONRPC.Mox,
+        :json_rpc,
+        fn [%{id: id, method: _, params: [%{data: _, to: _}, _]}], _options ->
+          {:ok,
+           [
+             %{
+               id: id,
+               jsonrpc: "2.0",
+               result: "0x000000000000000000000000" <> implementation_contract_address_hash_string
+             }
+           ]}
+        end
+      )
+
+      implementation_abi = Proxy.get_implementation_abi_from_proxy(smart_contract, [])
+
+      assert implementation_abi == @implementation_abi
+    end
+
+    test "get_implementation_abi_from_proxy/2 returns implementation abi in case of EIP-1967 proxy pattern" do
+      proxy_contract_address = insert(:contract_address)
+
+      smart_contract =
+        insert(:smart_contract, address_hash: proxy_contract_address.hash, abi: [], contract_code_md5: "123")
+
+      implementation_contract_address = insert(:contract_address)
+
+      insert(:smart_contract,
+        address_hash: implementation_contract_address.hash,
+        abi: @implementation_abi,
+        contract_code_md5: "123"
+      )
+
+      implementation_contract_address_hash_string =
+        Base.encode16(implementation_contract_address.hash.bytes, case: :lower)
+
+      expect(
+        EthereumJSONRPC.Mox,
+        :json_rpc,
+        fn %{
+             id: _id,
+             method: "eth_getStorageAt",
+             params: [
+               _,
+               "0x360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc",
+               "latest"
+             ]
+           },
+           _options ->
+          {:ok, "0x000000000000000000000000" <> implementation_contract_address_hash_string}
+        end
+      )
+
+      EthereumJSONRPC.Mox
+      |> expect(:json_rpc, fn %{
+                                id: 0,
+                                method: "eth_getStorageAt",
+                                params: [
+                                  _,
+                                  "0xa3f0ad74e5423aebfd80d3ef4346578335a9a72aeaee59ff6cb3582b35133d50",
+                                  "latest"
+                                ]
+                              },
+                              _options ->
+        {:ok, "0x0000000000000000000000000000000000000000000000000000000000000000"}
+      end)
+      |> expect(:json_rpc, fn %{
+                                id: 0,
+                                method: "eth_getStorageAt",
+                                params: [
+                                  _,
+                                  "0x7050c9e0f4ca769c69bd3a8ef740bc37934f8e2c036e5a723fd8ee048ed3f8c3",
+                                  "latest"
+                                ]
+                              },
+                              _options ->
+        {:ok, "0x0000000000000000000000000000000000000000000000000000000000000000"}
+      end)
+
+      implementation_abi = Proxy.get_implementation_abi_from_proxy(smart_contract, [])
+
+      assert implementation_abi == @implementation_abi
+    end
+  end
+end
diff --git a/apps/explorer/test/explorer/chain/smart_contract_test.exs b/apps/explorer/test/explorer/chain/smart_contract_test.exs
index aa2b90cec982..01ccba28002e 100644
--- a/apps/explorer/test/explorer/chain/smart_contract_test.exs
+++ b/apps/explorer/test/explorer/chain/smart_contract_test.exs
@@ -3,7 +3,8 @@ defmodule Explorer.Chain.SmartContractTest do
 
   import Mox
   alias Explorer.Chain
-  alias Explorer.Chain.SmartContract
+  alias Explorer.Chain.{Address, SmartContract}
+  alias Explorer.Chain.SmartContract.Proxy
 
   doctest Explorer.Chain.SmartContract
 
@@ -19,42 +20,38 @@ defmodule Explorer.Chain.SmartContractTest do
 
       refute smart_contract.implementation_fetched_at
 
-      # fetch nil implementation and save it to db
+      # fetch nil implementation and don't save it to db
       get_eip1967_implementation_zero_addresses()
-      refute SmartContract.proxy_contract?(smart_contract)
+      refute Proxy.proxy_contract?(smart_contract)
       verify!(EthereumJSONRPC.Mox)
-      assert_empty_implementation(smart_contract.address_hash)
-      # extract proxy info from db
-      refute SmartContract.proxy_contract?(smart_contract)
-      verify!(EthereumJSONRPC.Mox)
-      assert_empty_implementation(smart_contract.address_hash)
+      assert_implementation_never_fetched(smart_contract.address_hash)
 
       Application.put_env(:explorer, :fallback_ttl_cached_implementation_data_of_proxy, 0)
 
       get_eip1967_implementation_error_response()
-      refute SmartContract.proxy_contract?(smart_contract)
+      refute Proxy.proxy_contract?(smart_contract)
       verify!(EthereumJSONRPC.Mox)
 
       get_eip1967_implementation_non_zero_address()
-      assert SmartContract.proxy_contract?(smart_contract)
+      assert Proxy.proxy_contract?(smart_contract)
       verify!(EthereumJSONRPC.Mox)
       assert_implementation_address(smart_contract.address_hash)
 
       get_eip1967_implementation_non_zero_address()
-      assert SmartContract.proxy_contract?(smart_contract)
+      assert Proxy.proxy_contract?(smart_contract)
       verify!(EthereumJSONRPC.Mox)
       assert_implementation_address(smart_contract.address_hash)
 
       Application.put_env(:explorer, :fallback_ttl_cached_implementation_data_of_proxy, :timer.seconds(20))
-      assert SmartContract.proxy_contract?(smart_contract)
+      assert Proxy.proxy_contract?(smart_contract)
 
       Application.put_env(:explorer, :fallback_ttl_cached_implementation_data_of_proxy, 0)
       get_eip1967_implementation_non_zero_address()
-      assert SmartContract.proxy_contract?(smart_contract)
+      assert Proxy.proxy_contract?(smart_contract)
       verify!(EthereumJSONRPC.Mox)
 
       get_eip1967_implementation_error_response()
-      assert SmartContract.proxy_contract?(smart_contract)
+      assert Proxy.proxy_contract?(smart_contract)
       verify!(EthereumJSONRPC.Mox)
     end
 
@@ -67,16 +64,13 @@ defmodule Explorer.Chain.SmartContractTest do
 
       refute smart_contract.implementation_fetched_at
 
-      # fetch nil implementation and save it to db
+      # fetch nil implementation and don't save it to db
       get_eip1967_implementation_zero_addresses()
       assert {nil, nil} = SmartContract.get_implementation_address_hash(smart_contract)
       verify!(EthereumJSONRPC.Mox)
-      assert_empty_implementation(smart_contract.address_hash)
+      assert_implementation_never_fetched(smart_contract.address_hash)
 
       # extract proxy info from db
-      assert {nil, nil} = SmartContract.get_implementation_address_hash(smart_contract)
-      assert_empty_implementation(smart_contract.address_hash)
-
       Application.put_env(:explorer, :fallback_ttl_cached_implementation_data_of_proxy, 0)
 
       string_implementation_address_hash = to_string(implementation_smart_contract.address_hash)
@@ -93,6 +87,30 @@ defmodule Explorer.Chain.SmartContractTest do
                                                 _options ->
         {:ok, string_implementation_address_hash}
       end)
+      |> expect(:json_rpc, fn %{
+                                id: 0,
+                                method: "eth_getStorageAt",
+                                params: [
+                                  _,
+                                  "0xa3f0ad74e5423aebfd80d3ef4346578335a9a72aeaee59ff6cb3582b35133d50",
+                                  "latest"
+                                ]
+                              },
+                              _options ->
+        {:ok, "0x0000000000000000000000000000000000000000000000000000000000000000"}
+      end)
+      |> expect(:json_rpc, fn %{
+                                id: 0,
+                                method: "eth_getStorageAt",
+                                params: [
+                                  _,
+                                  "0x7050c9e0f4ca769c69bd3a8ef740bc37934f8e2c036e5a723fd8ee048ed3f8c3",
+                                  "latest"
+                                ]
+                              },
+                              _options ->
+        {:ok, "0x0000000000000000000000000000000000000000000000000000000000000000"}
+      end)
 
       assert {^string_implementation_address_hash, "proxy"} =
                SmartContract.get_implementation_address_hash(smart_contract)
@@ -118,23 +136,28 @@ defmodule Explorer.Chain.SmartContractTest do
         implementation_smart_contract.name
       )
 
-      contract_1 = Chain.address_hash_to_smart_contract(smart_contract.address_hash)
+      contract_1 = SmartContract.address_hash_to_smart_contract(smart_contract.address_hash)
 
       Application.put_env(:explorer, :fallback_ttl_cached_implementation_data_of_proxy, :timer.seconds(20))
 
       assert {^string_implementation_address_hash, "proxy"} =
                SmartContract.get_implementation_address_hash(smart_contract)
 
-      contract_2 = Chain.address_hash_to_smart_contract(smart_contract.address_hash)
+      contract_2 = SmartContract.address_hash_to_smart_contract(smart_contract.address_hash)
 
       assert contract_1.implementation_fetched_at == contract_2.implementation_fetched_at &&
                contract_1.updated_at == contract_2.updated_at
 
       Application.put_env(:explorer, :fallback_ttl_cached_implementation_data_of_proxy, 0)
       get_eip1967_implementation_zero_addresses()
-      assert {nil, nil} = SmartContract.get_implementation_address_hash(smart_contract)
+
+      assert {^string_implementation_address_hash, "proxy"} =
+               SmartContract.get_implementation_address_hash(smart_contract)
+
       verify!(EthereumJSONRPC.Mox)
-      assert_empty_implementation(smart_contract.address_hash)
+
+      assert contract_1.implementation_fetched_at == contract_2.implementation_fetched_at &&
+               contract_1.updated_at == contract_2.updated_at
     end
 
     test "test get_implementation_address_hash/1 for twins contract" do
@@ -143,7 +166,7 @@ defmodule Explorer.Chain.SmartContractTest do
       smart_contract = insert(:smart_contract)
       another_address = insert(:contract_address)
 
-      twin = Chain.address_hash_to_smart_contract(another_address.hash)
+      twin = SmartContract.address_hash_to_smart_contract(another_address.hash)
       implementation_smart_contract = insert(:smart_contract, name: "proxy")
 
       Application.put_env(:explorer, :fallback_ttl_cached_implementation_data_of_proxy, :timer.seconds(20))
@@ -162,18 +185,7 @@ defmodule Explorer.Chain.SmartContractTest do
 
       string_implementation_address_hash = to_string(implementation_smart_contract.address_hash)
 
-      expect(EthereumJSONRPC.Mox, :json_rpc, fn %{
-                                                  id: 0,
-                                                  method: "eth_getStorageAt",
-                                                  params: [
-                                                    _,
-                                                    "0x360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc",
-                                                    "latest"
-                                                  ]
-                                                },
-                                                _options ->
-        {:ok, string_implementation_address_hash}
-      end)
+      expect_address_in_response(string_implementation_address_hash)
 
       assert {^string_implementation_address_hash, "proxy"} = SmartContract.get_implementation_address_hash(twin)
 
@@ -210,18 +222,7 @@ defmodule Explorer.Chain.SmartContractTest do
 
       string_implementation_address_hash = to_string(implementation_smart_contract.address_hash)
 
-      expect(EthereumJSONRPC.Mox, :json_rpc, fn %{
-                                                  id: 0,
-                                                  method: "eth_getStorageAt",
-                                                  params: [
-                                                    _,
-                                                    "0x360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc",
-                                                    "latest"
-                                                  ]
-                                                },
-                                                _options ->
-        {:ok, string_implementation_address_hash}
-      end)
+      expect_address_in_response(string_implementation_address_hash)
 
       assert {^string_implementation_address_hash, "proxy"} = SmartContract.get_implementation_address_hash(twin)
 
@@ -268,18 +269,7 @@ defmodule Explorer.Chain.SmartContractTest do
 
       string_implementation_address_hash = to_string(implementation_smart_contract.address_hash)
 
-      expect(EthereumJSONRPC.Mox, :json_rpc, fn %{
-                                                  id: 0,
-                                                  method: "eth_getStorageAt",
-                                                  params: [
-                                                    _,
-                                                    "0x360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc",
-                                                    "latest"
-                                                  ]
-                                                },
-                                                _options ->
-        {:ok, string_implementation_address_hash}
-      end)
+      expect_address_in_response(string_implementation_address_hash)
 
       assert {^string_implementation_address_hash, "proxy"} = SmartContract.get_implementation_address_hash(twin)
 
@@ -297,6 +287,14 @@ defmodule Explorer.Chain.SmartContractTest do
     end
   end
 
+  describe "address_hash_to_smart_contract/1" do
+    test "fetches a smart contract" do
+      smart_contract = insert(:smart_contract, contract_code_md5: "123")
+
+      assert ^smart_contract = SmartContract.address_hash_to_smart_contract(smart_contract.address_hash)
+    end
+  end
+
   def get_eip1967_implementation_zero_addresses do
     EthereumJSONRPC.Mox
     |> expect(:json_rpc, fn %{
@@ -335,6 +333,18 @@ defmodule Explorer.Chain.SmartContractTest do
                             _options ->
       {:ok, "0x0000000000000000000000000000000000000000000000000000000000000000"}
     end)
+    |> expect(:json_rpc, fn %{
+                              id: 0,
+                              method: "eth_getStorageAt",
+                              params: [
+                                _,
+                                "0xc5f16f0fcc639fa48a6947836d9850f504798523bf8c9a3a87d5876cf622bcf7",
+                                "latest"
+                              ]
+                            },
+                            _options ->
+      {:ok, "0x0000000000000000000000000000000000000000000000000000000000000000"}
+    end)
   end
 
   def get_eip1967_implementation_non_zero_address do
@@ -350,6 +360,30 @@ defmodule Explorer.Chain.SmartContractTest do
                                               _options ->
       {:ok, "0x0000000000000000000000000000000000000000000000000000000000000001"}
     end)
+    |> expect(:json_rpc, fn %{
+                              id: 0,
+                              method: "eth_getStorageAt",
+                              params: [
+                                _,
+                                "0xa3f0ad74e5423aebfd80d3ef4346578335a9a72aeaee59ff6cb3582b35133d50",
+                                "latest"
+                              ]
+                            },
+                            _options ->
+      {:ok, "0x0000000000000000000000000000000000000000000000000000000000000000"}
+    end)
+    |> expect(:json_rpc, fn %{
+                              id: 0,
+                              method: "eth_getStorageAt",
+                              params: [
+                                _,
+                                "0x7050c9e0f4ca769c69bd3a8ef740bc37934f8e2c036e5a723fd8ee048ed3f8c3",
+                                "latest"
+                              ]
+                            },
+                            _options ->
+      {:ok, "0x0000000000000000000000000000000000000000000000000000000000000000"}
+    end)
   end
 
   def get_eip1967_implementation_error_response do
@@ -366,38 +400,534 @@ defmodule Explorer.Chain.SmartContractTest do
                             _options ->
       {:error, "error"}
     end)
+    |> expect(:json_rpc, fn %{
+                              id: 0,
+                              method: "eth_getStorageAt",
+                              params: [
+                                _,
+                                "0xa3f0ad74e5423aebfd80d3ef4346578335a9a72aeaee59ff6cb3582b35133d50",
+                                "latest"
+                              ]
+                            },
+                            _options ->
+      {:ok, "0x0000000000000000000000000000000000000000000000000000000000000000"}
+    end)
+    |> expect(:json_rpc, fn %{
+                              id: 0,
+                              method: "eth_getStorageAt",
+                              params: [
+                                _,
+                                "0x7050c9e0f4ca769c69bd3a8ef740bc37934f8e2c036e5a723fd8ee048ed3f8c3",
+                                "latest"
+                              ]
+                            },
+                            _options ->
+      {:ok, "0x0000000000000000000000000000000000000000000000000000000000000000"}
+    end)
+    |> expect(:json_rpc, fn %{
+                              id: 0,
+                              method: "eth_getStorageAt",
+                              params: [
+                                _,
+                                "0xc5f16f0fcc639fa48a6947836d9850f504798523bf8c9a3a87d5876cf622bcf7",
+                                "latest"
+                              ]
+                            },
+                            _options ->
+      {:ok, "0x0000000000000000000000000000000000000000000000000000000000000000"}
+    end)
   end
 
   def assert_empty_implementation(address_hash) do
-    contract = Chain.address_hash_to_smart_contract(address_hash)
+    contract = SmartContract.address_hash_to_smart_contract(address_hash)
     assert contract.implementation_fetched_at
     refute contract.implementation_name
     refute contract.implementation_address_hash
   end
 
   def assert_implementation_never_fetched(address_hash) do
-    contract = Chain.address_hash_to_smart_contract(address_hash)
+    contract = SmartContract.address_hash_to_smart_contract(address_hash)
     refute contract.implementation_fetched_at
     refute contract.implementation_name
     refute contract.implementation_address_hash
   end
 
   def assert_implementation_address(address_hash) do
-    contract = Chain.address_hash_to_smart_contract(address_hash)
+    contract = SmartContract.address_hash_to_smart_contract(address_hash)
     assert contract.implementation_fetched_at
     assert contract.implementation_address_hash
   end
 
   def assert_implementation_name(address_hash) do
-    contract = Chain.address_hash_to_smart_contract(address_hash)
+    contract = SmartContract.address_hash_to_smart_contract(address_hash)
     assert contract.implementation_fetched_at
     assert contract.implementation_name
   end
 
   def assert_exact_name_and_address(address_hash, implementation_address_hash, implementation_name) do
-    contract = Chain.address_hash_to_smart_contract(address_hash)
+    contract = SmartContract.address_hash_to_smart_contract(address_hash)
     assert contract.implementation_fetched_at
     assert contract.implementation_name == implementation_name
     assert to_string(contract.implementation_address_hash) == to_string(implementation_address_hash)
   end
+
+  describe "create_smart_contract/1" do
+    setup do
+      smart_contract_bytecode =
+        "0x608060405234801561001057600080fd5b5060df8061001f6000396000f3006080604052600436106049576000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff16806360fe47b114604e5780636d4ce63c146078575b600080fd5b348015605957600080fd5b5060766004803603810190808035906020019092919050505060a0565b005b348015608357600080fd5b50608a60aa565b6040518082815260200191505060405180910390f35b8060008190555050565b600080549050905600a165627a7a7230582040d82a7379b1ee1632ad4d8a239954fd940277b25628ead95259a85c5eddb2120029"
+
+      created_contract_address =
+        insert(
+          :address,
+          hash: "0x0f95fa9bc0383e699325f2658d04e8d96d87b90c",
+          contract_code: smart_contract_bytecode
+        )
+
+      transaction =
+        :transaction
+        |> insert()
+        |> with_block()
+
+      insert(
+        :internal_transaction_create,
+        transaction: transaction,
+        index: 0,
+        created_contract_address: created_contract_address,
+        created_contract_code: smart_contract_bytecode,
+        block_number: transaction.block_number,
+        block_hash: transaction.block_hash,
+        block_index: 0,
+        transaction_index: transaction.index
+      )
+
+      valid_attrs = %{
+        address_hash: "0x0f95fa9bc0383e699325f2658d04e8d96d87b90c",
+        name: "SimpleStorage",
+        compiler_version: "0.4.23",
+        optimization: false,
+        contract_source_code:
+          "pragma solidity ^0.4.23; contract SimpleStorage {uint storedData; function set(uint x) public {storedData = x; } function get() public constant returns (uint) {return storedData; } }",
+        abi: [
+          %{
+            "constant" => false,
+            "inputs" => [%{"name" => "x", "type" => "uint256"}],
+            "name" => "set",
+            "outputs" => [],
+            "payable" => false,
+            "stateMutability" => "nonpayable",
+            "type" => "function"
+          },
+          %{
+            "constant" => true,
+            "inputs" => [],
+            "name" => "get",
+            "outputs" => [%{"name" => "", "type" => "uint256"}],
+            "payable" => false,
+            "stateMutability" => "view",
+            "type" => "function"
+          }
+        ]
+      }
+
+      {:ok, valid_attrs: valid_attrs, address: created_contract_address}
+    end
+
+    test "with valid data creates a smart contract", %{valid_attrs: valid_attrs} do
+      assert {:ok, %SmartContract{} = smart_contract} = SmartContract.create_smart_contract(valid_attrs)
+      assert smart_contract.name == "SimpleStorage"
+      assert smart_contract.compiler_version == "0.4.23"
+      assert smart_contract.optimization == false
+      assert smart_contract.contract_source_code != ""
+      assert smart_contract.abi != ""
+
+      assert Repo.get_by(
+               Address.Name,
+               address_hash: smart_contract.address_hash,
+               name: smart_contract.name,
+               primary: true
+             )
+    end
+
+    test "clears an existing primary name and sets the new one", %{valid_attrs: valid_attrs, address: address} do
+      insert(:address_name, address: address, primary: true)
+      assert {:ok, %SmartContract{} = smart_contract} = SmartContract.create_smart_contract(valid_attrs)
+
+      assert Repo.get_by(
+               Address.Name,
+               address_hash: smart_contract.address_hash,
+               name: smart_contract.name,
+               primary: true
+             )
+    end
+
+    test "trims whitespace from address name", %{valid_attrs: valid_attrs} do
+      attrs = %{valid_attrs | name: "     SimpleStorage     "}
+      assert {:ok, _} = SmartContract.create_smart_contract(attrs)
+      assert Repo.get_by(Address.Name, name: "SimpleStorage")
+    end
+
+    test "sets the address verified field to true", %{valid_attrs: valid_attrs} do
+      assert {:ok, %SmartContract{} = smart_contract} = SmartContract.create_smart_contract(valid_attrs)
+
+      assert Repo.get_by(Address, hash: smart_contract.address_hash).verified == true
+    end
+  end
+
+  describe "update_smart_contract/1" do
+    setup do
+      smart_contract_bytecode =
+        "0x608060405234801561001057600080fd5b5060df8061001f6000396000f3006080604052600436106049576000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff16806360fe47b114604e5780636d4ce63c146078575b600080fd5b348015605957600080fd5b5060766004803603810190808035906020019092919050505060a0565b005b348015608357600080fd5b50608a60aa565b6040518082815260200191505060405180910390f35b8060008190555050565b600080549050905600a165627a7a7230582040d82a7379b1ee1632ad4d8a239954fd940277b25628ead95259a85c5eddb2120029"
+
+      created_contract_address =
+        insert(
+          :address,
+          hash: "0x0f95fa9bc0383e699325f2658d04e8d96d87b90c",
+          contract_code: smart_contract_bytecode
+        )
+
+      transaction =
+        :transaction
+        |> insert()
+        |> with_block()
+
+      insert(
+        :internal_transaction_create,
+        transaction: transaction,
+        index: 0,
+        created_contract_address: created_contract_address,
+        created_contract_code: smart_contract_bytecode,
+        block_number: transaction.block_number,
+        block_hash: transaction.block_hash,
+        block_index: 0,
+        transaction_index: transaction.index
+      )
+
+      valid_attrs = %{
+        address_hash: "0x0f95fa9bc0383e699325f2658d04e8d96d87b90c",
+        name: "SimpleStorage",
+        compiler_version: "0.4.23",
+        optimization: false,
+        contract_source_code:
+          "pragma solidity ^0.4.23; contract SimpleStorage {uint storedData; function set(uint x) public {storedData = x; } function get() public constant returns (uint) {return storedData; } }",
+        abi: [
+          %{
+            "constant" => false,
+            "inputs" => [%{"name" => "x", "type" => "uint256"}],
+            "name" => "set",
+            "outputs" => [],
+            "payable" => false,
+            "stateMutability" => "nonpayable",
+            "type" => "function"
+          },
+          %{
+            "constant" => true,
+            "inputs" => [],
+            "name" => "get",
+            "outputs" => [%{"name" => "", "type" => "uint256"}],
+            "payable" => false,
+            "stateMutability" => "view",
+            "type" => "function"
+          }
+        ],
+        partially_verified: true
+      }
+
+      secondary_sources = [
+        %{
+          file_name: "storage.sol",
+          contract_source_code:
+            "pragma solidity >=0.7.0 <0.9.0;contract Storage {uint256 number;function store(uint256 num) public {number = num;}function retrieve_() public view returns (uint256){return number;}}",
+          address_hash: "0x0f95fa9bc0383e699325f2658d04e8d96d87b90c"
+        },
+        %{
+          file_name: "storage_1.sol",
+          contract_source_code:
+            "pragma solidity >=0.7.0 <0.9.0;contract Storage_1 {uint256 number;function store(uint256 num) public {number = num;}function retrieve_() public view returns (uint256){return number;}}",
+          address_hash: "0x0f95fa9bc0383e699325f2658d04e8d96d87b90c"
+        }
+      ]
+
+      changed_sources = [
+        %{
+          file_name: "storage_2.sol",
+          contract_source_code:
+            "pragma solidity >=0.7.0 <0.9.0;contract Storage_2 {uint256 number;function store(uint256 num) public {number = num;}function retrieve_() public view returns (uint256){return number;}}",
+          address_hash: "0x0f95fa9bc0383e699325f2658d04e8d96d87b90c"
+        },
+        %{
+          file_name: "storage_3.sol",
+          contract_source_code:
+            "pragma solidity >=0.7.0 <0.9.0;contract Storage_3 {uint256 number;function store(uint256 num) public {number = num;}function retrieve_() public view returns (uint256){return number;}}",
+          address_hash: "0x0f95fa9bc0383e699325f2658d04e8d96d87b90c"
+        }
+      ]
+
+      _ = SmartContract.create_smart_contract(valid_attrs, [], secondary_sources)
+
+      {:ok,
+       valid_attrs: valid_attrs,
+       address: created_contract_address,
+       secondary_sources: secondary_sources,
+       changed_sources: changed_sources}
+    end
+
+    test "change partially_verified field", %{valid_attrs: valid_attrs, address: address} do
+      sc_before_call = Repo.get_by(SmartContract, address_hash: address.hash)
+      assert sc_before_call.name == Map.get(valid_attrs, :name)
+      assert sc_before_call.partially_verified == Map.get(valid_attrs, :partially_verified)
+
+      assert {:ok, %SmartContract{}} =
+               SmartContract.update_smart_contract(%{
+                 address_hash: address.hash,
+                 partially_verified: false,
+                 contract_source_code: "new code"
+               })
+
+      sc_after_call = Repo.get_by(SmartContract, address_hash: address.hash)
+      assert sc_after_call.name == Map.get(valid_attrs, :name)
+      assert sc_after_call.partially_verified == false
+      assert sc_after_call.compiler_version == Map.get(valid_attrs, :compiler_version)
+      assert sc_after_call.optimization == Map.get(valid_attrs, :optimization)
+      assert sc_after_call.contract_source_code == "new code"
+    end
+
+    test "check nothing changed", %{valid_attrs: valid_attrs, address: address} do
+      sc_before_call = Repo.get_by(SmartContract, address_hash: address.hash)
+      assert sc_before_call.name == Map.get(valid_attrs, :name)
+      assert sc_before_call.partially_verified == Map.get(valid_attrs, :partially_verified)
+
+      assert {:ok, %SmartContract{}} = SmartContract.update_smart_contract(%{address_hash: address.hash})
+
+      sc_after_call = Repo.get_by(SmartContract, address_hash: address.hash)
+      assert sc_after_call.name == Map.get(valid_attrs, :name)
+      assert sc_after_call.partially_verified == Map.get(valid_attrs, :partially_verified)
+      assert sc_after_call.compiler_version == Map.get(valid_attrs, :compiler_version)
+      assert sc_after_call.optimization == Map.get(valid_attrs, :optimization)
+      assert sc_after_call.contract_source_code == Map.get(valid_attrs, :contract_source_code)
+    end
+
+    test "check additional sources update", %{
+      address: address,
+      secondary_sources: secondary_sources,
+      changed_sources: changed_sources
+    } do
+      sc_before_call = Repo.get_by(Address, hash: address.hash) |> Repo.preload(:smart_contract_additional_sources)
+
+      assert sc_before_call.smart_contract_additional_sources
+             |> Enum.with_index()
+             |> Enum.all?(fn {el, ind} ->
+               {:ok, src} = Enum.fetch(secondary_sources, ind)
+
+               el.file_name == Map.get(src, :file_name) and
+                 el.contract_source_code == Map.get(src, :contract_source_code)
+             end)
+
+      assert {:ok, %SmartContract{}} =
+               SmartContract.update_smart_contract(%{address_hash: address.hash}, [], changed_sources)
+
+      sc_after_call = Repo.get_by(Address, hash: address.hash) |> Repo.preload(:smart_contract_additional_sources)
+
+      assert sc_after_call.smart_contract_additional_sources
+             |> Enum.with_index()
+             |> Enum.all?(fn {el, ind} ->
+               {:ok, src} = Enum.fetch(changed_sources, ind)
+
+               el.file_name == Map.get(src, :file_name) and
+                 el.contract_source_code == Map.get(src, :contract_source_code)
+             end)
+    end
+  end
+
+  test "get_smart_contract_abi/1 returns empty [] abi if implementation address is null" do
+    assert SmartContract.get_smart_contract_abi(nil) == []
+  end
+
+  test "get_smart_contract_abi/1 returns [] if implementation is not verified" do
+    implementation_contract_address = insert(:contract_address)
+
+    implementation_contract_address_hash_string =
+      Base.encode16(implementation_contract_address.hash.bytes, case: :lower)
+
+    assert SmartContract.get_smart_contract_abi("0x" <> implementation_contract_address_hash_string) == []
+  end
+
+  @abi [
+    %{
+      "constant" => false,
+      "inputs" => [%{"name" => "x", "type" => "uint256"}],
+      "name" => "set",
+      "outputs" => [],
+      "payable" => false,
+      "stateMutability" => "nonpayable",
+      "type" => "function"
+    },
+    %{
+      "constant" => true,
+      "inputs" => [],
+      "name" => "get",
+      "outputs" => [%{"name" => "", "type" => "uint256"}],
+      "payable" => false,
+      "stateMutability" => "view",
+      "type" => "function"
+    }
+  ]
+
+  @proxy_abi [
+    %{
+      "type" => "function",
+      "stateMutability" => "nonpayable",
+      "payable" => false,
+      "outputs" => [%{"type" => "bool", "name" => ""}],
+      "name" => "upgradeTo",
+      "inputs" => [%{"type" => "address", "name" => "newImplementation"}],
+      "constant" => false
+    },
+    %{
+      "type" => "function",
+      "stateMutability" => "view",
+      "payable" => false,
+      "outputs" => [%{"type" => "uint256", "name" => ""}],
+      "name" => "version",
+      "inputs" => [],
+      "constant" => true
+    },
+    %{
+      "type" => "function",
+      "stateMutability" => "view",
+      "payable" => false,
+      "outputs" => [%{"type" => "address", "name" => ""}],
+      "name" => "implementation",
+      "inputs" => [],
+      "constant" => true
+    },
+    %{
+      "type" => "function",
+      "stateMutability" => "nonpayable",
+      "payable" => false,
+      "outputs" => [],
+      "name" => "renounceOwnership",
+      "inputs" => [],
+      "constant" => false
+    },
+    %{
+      "type" => "function",
+      "stateMutability" => "view",
+      "payable" => false,
+      "outputs" => [%{"type" => "address", "name" => ""}],
+      "name" => "getOwner",
+      "inputs" => [],
+      "constant" => true
+    },
+    %{
+      "type" => "function",
+      "stateMutability" => "view",
+      "payable" => false,
+      "outputs" => [%{"type" => "address", "name" => ""}],
+      "name" => "getProxyStorage",
+      "inputs" => [],
+      "constant" => true
+    },
+    %{
+      "type" => "function",
+      "stateMutability" => "nonpayable",
+      "payable" => false,
+      "outputs" => [],
+      "name" => "transferOwnership",
+      "inputs" => [%{"type" => "address", "name" => "_newOwner"}],
+      "constant" => false
+    },
+    %{
+      "type" => "constructor",
+      "stateMutability" => "nonpayable",
+      "payable" => false,
+      "inputs" => [
+        %{"type" => "address", "name" => "_proxyStorage"},
+        %{"type" => "address", "name" => "_implementationAddress"}
+      ]
+    },
+    %{"type" => "fallback", "stateMutability" => "nonpayable", "payable" => false},
+    %{
+      "type" => "event",
+      "name" => "Upgraded",
+      "inputs" => [
+        %{"type" => "uint256", "name" => "version", "indexed" => false},
+        %{"type" => "address", "name" => "implementation", "indexed" => true}
+      ],
+      "anonymous" => false
+    },
+    %{
+      "type" => "event",
+      "name" => "OwnershipRenounced",
+      "inputs" => [%{"type" => "address", "name" => "previousOwner", "indexed" => true}],
+      "anonymous" => false
+    },
+    %{
+      "type" => "event",
+      "name" => "OwnershipTransferred",
+      "inputs" => [
+        %{"type" => "address", "name" => "previousOwner", "indexed" => true},
+        %{"type" => "address", "name" => "newOwner", "indexed" => true}
+      ],
+      "anonymous" => false
+    }
+  ]
+
+  test "get_smart_contract_abi/1 returns implementation abi if implementation is verified" do
+    proxy_contract_address = insert(:contract_address)
+    insert(:smart_contract, address_hash: proxy_contract_address.hash, abi: @proxy_abi, contract_code_md5: "123")
+
+    implementation_contract_address = insert(:contract_address)
+
+    insert(:smart_contract,
+      address_hash: implementation_contract_address.hash,
+      abi: @abi,
+      contract_code_md5: "123"
+    )
+
+    implementation_contract_address_hash_string =
+      Base.encode16(implementation_contract_address.hash.bytes, case: :lower)
+
+    implementation_abi = SmartContract.get_smart_contract_abi("0x" <> implementation_contract_address_hash_string)
+
+    assert implementation_abi == @abi
+  end
+
+  defp expect_address_in_response(string_implementation_address_hash) do
+    expect(EthereumJSONRPC.Mox, :json_rpc, fn %{
+                                                id: 0,
+                                                method: "eth_getStorageAt",
+                                                params: [
+                                                  _,
+                                                  "0x360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc",
+                                                  "latest"
+                                                ]
+                                              },
+                                              _options ->
+      {:ok, string_implementation_address_hash}
+    end)
+    |> expect(:json_rpc, fn %{
+                              id: 0,
+                              method: "eth_getStorageAt",
+                              params: [
+                                _,
+                                "0xa3f0ad74e5423aebfd80d3ef4346578335a9a72aeaee59ff6cb3582b35133d50",
+                                "latest"
+                              ]
+                            },
+                            _options ->
+      {:ok, "0x0000000000000000000000000000000000000000000000000000000000000000"}
+    end)
+    |> expect(:json_rpc, fn %{
+                              id: 0,
+                              method: "eth_getStorageAt",
+                              params: [
+                                _,
+                                "0x7050c9e0f4ca769c69bd3a8ef740bc37934f8e2c036e5a723fd8ee048ed3f8c3",
+                                "latest"
+                              ]
+                            },
+                            _options ->
+      {:ok, "0x0000000000000000000000000000000000000000000000000000000000000000"}
+    end)
+  end
 end
diff --git a/apps/explorer/test/explorer/chain/transaction_test.exs b/apps/explorer/test/explorer/chain/transaction_test.exs
index a517ac27d99e..db2823b47ef6 100644
--- a/apps/explorer/test/explorer/chain/transaction_test.exs
+++ b/apps/explorer/test/explorer/chain/transaction_test.exs
@@ -265,7 +265,7 @@ defmodule Explorer.Chain.TransactionTest do
         |> insert()
         |> Repo.preload(to_address: :smart_contract)
 
-      get_eip1967_implementation()
+      request_zero_implementations()
 
       assert {{:ok, "60fe47b1", "set(uint256 x)", [{"x", "uint256", 50}]}, _, _} =
                Transaction.decoded_input_data(transaction, [])
@@ -288,7 +288,7 @@ defmodule Explorer.Chain.TransactionTest do
         |> insert(to_address: contract.address, input: "0x" <> input_data)
         |> Repo.preload(to_address: :smart_contract)
 
-      get_eip1967_implementation()
+      request_zero_implementations()
 
       assert {{:ok, "60fe47b1", "set(uint256 x)", [{"x", "uint256", 10}]}, _, _} =
                Transaction.decoded_input_data(transaction, [])
@@ -309,7 +309,8 @@ defmodule Explorer.Chain.TransactionTest do
     end
   end
 
-  def get_eip1967_implementation do
+  # EIP-1967 + EIP-1822
+  defp request_zero_implementations do
     EthereumJSONRPC.Mox
     |> expect(:json_rpc, fn %{
                               id: 0,
@@ -347,5 +348,17 @@ defmodule Explorer.Chain.TransactionTest do
                             _options ->
       {:ok, "0x0000000000000000000000000000000000000000000000000000000000000000"}
     end)
+    |> expect(:json_rpc, fn %{
+                              id: 0,
+                              method: "eth_getStorageAt",
+                              params: [
+                                _,
+                                "0xc5f16f0fcc639fa48a6947836d9850f504798523bf8c9a3a87d5876cf622bcf7",
+                                "latest"
+                              ]
+                            },
+                            _options ->
+      {:ok, "0x0000000000000000000000000000000000000000000000000000000000000000"}
+    end)
   end
 end
diff --git a/apps/explorer/test/explorer/chain_test.exs b/apps/explorer/test/explorer/chain_test.exs
index d5756d0688b8..77f9030f0f95 100644
--- a/apps/explorer/test/explorer/chain_test.exs
+++ b/apps/explorer/test/explorer/chain_test.exs
@@ -4036,272 +4036,6 @@ defmodule Explorer.ChainTest do
     end
   end
 
-  describe "create_smart_contract/1" do
-    setup do
-      smart_contract_bytecode =
-        "0x608060405234801561001057600080fd5b5060df8061001f6000396000f3006080604052600436106049576000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff16806360fe47b114604e5780636d4ce63c146078575b600080fd5b348015605957600080fd5b5060766004803603810190808035906020019092919050505060a0565b005b348015608357600080fd5b50608a60aa565b6040518082815260200191505060405180910390f35b8060008190555050565b600080549050905600a165627a7a7230582040d82a7379b1ee1632ad4d8a239954fd940277b25628ead95259a85c5eddb2120029"
-
-      created_contract_address =
-        insert(
-          :address,
-          hash: "0x0f95fa9bc0383e699325f2658d04e8d96d87b90c",
-          contract_code: smart_contract_bytecode
-        )
-
-      transaction =
-        :transaction
-        |> insert()
-        |> with_block()
-
-      insert(
-        :internal_transaction_create,
-        transaction: transaction,
-        index: 0,
-        created_contract_address: created_contract_address,
-        created_contract_code: smart_contract_bytecode,
-        block_number: transaction.block_number,
-        block_hash: transaction.block_hash,
-        block_index: 0,
-        transaction_index: transaction.index
-      )
-
-      valid_attrs = %{
-        address_hash: "0x0f95fa9bc0383e699325f2658d04e8d96d87b90c",
-        name: "SimpleStorage",
-        compiler_version: "0.4.23",
-        optimization: false,
-        contract_source_code:
-          "pragma solidity ^0.4.23; contract SimpleStorage {uint storedData; function set(uint x) public {storedData = x; } function get() public constant returns (uint) {return storedData; } }",
-        abi: [
-          %{
-            "constant" => false,
-            "inputs" => [%{"name" => "x", "type" => "uint256"}],
-            "name" => "set",
-            "outputs" => [],
-            "payable" => false,
-            "stateMutability" => "nonpayable",
-            "type" => "function"
-          },
-          %{
-            "constant" => true,
-            "inputs" => [],
-            "name" => "get",
-            "outputs" => [%{"name" => "", "type" => "uint256"}],
-            "payable" => false,
-            "stateMutability" => "view",
-            "type" => "function"
-          }
-        ]
-      }
-
-      {:ok, valid_attrs: valid_attrs, address: created_contract_address}
-    end
-
-    test "with valid data creates a smart contract", %{valid_attrs: valid_attrs} do
-      assert {:ok, %SmartContract{} = smart_contract} = Chain.create_smart_contract(valid_attrs)
-      assert smart_contract.name == "SimpleStorage"
-      assert smart_contract.compiler_version == "0.4.23"
-      assert smart_contract.optimization == false
-      assert smart_contract.contract_source_code != ""
-      assert smart_contract.abi != ""
-
-      assert Repo.get_by(
-               Address.Name,
-               address_hash: smart_contract.address_hash,
-               name: smart_contract.name,
-               primary: true
-             )
-    end
-
-    test "clears an existing primary name and sets the new one", %{valid_attrs: valid_attrs, address: address} do
-      insert(:address_name, address: address, primary: true)
-      assert {:ok, %SmartContract{} = smart_contract} = Chain.create_smart_contract(valid_attrs)
-
-      assert Repo.get_by(
-               Address.Name,
-               address_hash: smart_contract.address_hash,
-               name: smart_contract.name,
-               primary: true
-             )
-    end
-
-    test "trims whitespace from address name", %{valid_attrs: valid_attrs} do
-      attrs = %{valid_attrs | name: "     SimpleStorage     "}
-      assert {:ok, _} = Chain.create_smart_contract(attrs)
-      assert Repo.get_by(Address.Name, name: "SimpleStorage")
-    end
-
-    test "sets the address verified field to true", %{valid_attrs: valid_attrs} do
-      assert {:ok, %SmartContract{} = smart_contract} = Chain.create_smart_contract(valid_attrs)
-
-      assert Repo.get_by(Address, hash: smart_contract.address_hash).verified == true
-    end
-  end
-
-  describe "update_smart_contract/1" do
-    setup do
-      smart_contract_bytecode =
-        "0x608060405234801561001057600080fd5b5060df8061001f6000396000f3006080604052600436106049576000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff16806360fe47b114604e5780636d4ce63c146078575b600080fd5b348015605957600080fd5b5060766004803603810190808035906020019092919050505060a0565b005b348015608357600080fd5b50608a60aa565b6040518082815260200191505060405180910390f35b8060008190555050565b600080549050905600a165627a7a7230582040d82a7379b1ee1632ad4d8a239954fd940277b25628ead95259a85c5eddb2120029"
-
-      created_contract_address =
-        insert(
-          :address,
-          hash: "0x0f95fa9bc0383e699325f2658d04e8d96d87b90c",
-          contract_code: smart_contract_bytecode
-        )
-
-      transaction =
-        :transaction
-        |> insert()
-        |> with_block()
-
-      insert(
-        :internal_transaction_create,
-        transaction: transaction,
-        index: 0,
-        created_contract_address: created_contract_address,
-        created_contract_code: smart_contract_bytecode,
-        block_number: transaction.block_number,
-        block_hash: transaction.block_hash,
-        block_index: 0,
-        transaction_index: transaction.index
-      )
-
-      valid_attrs = %{
-        address_hash: "0x0f95fa9bc0383e699325f2658d04e8d96d87b90c",
-        name: "SimpleStorage",
-        compiler_version: "0.4.23",
-        optimization: false,
-        contract_source_code:
-          "pragma solidity ^0.4.23; contract SimpleStorage {uint storedData; function set(uint x) public {storedData = x; } function get() public constant returns (uint) {return storedData; } }",
-        abi: [
-          %{
-            "constant" => false,
-            "inputs" => [%{"name" => "x", "type" => "uint256"}],
-            "name" => "set",
-            "outputs" => [],
-            "payable" => false,
-            "stateMutability" => "nonpayable",
-            "type" => "function"
-          },
-          %{
-            "constant" => true,
-            "inputs" => [],
-            "name" => "get",
-            "outputs" => [%{"name" => "", "type" => "uint256"}],
-            "payable" => false,
-            "stateMutability" => "view",
-            "type" => "function"
-          }
-        ],
-        partially_verified: true
-      }
-
-      secondary_sources = [
-        %{
-          file_name: "storage.sol",
-          contract_source_code:
-            "pragma solidity >=0.7.0 <0.9.0;contract Storage {uint256 number;function store(uint256 num) public {number = num;}function retrieve_() public view returns (uint256){return number;}}",
-          address_hash: "0x0f95fa9bc0383e699325f2658d04e8d96d87b90c"
-        },
-        %{
-          file_name: "storage_1.sol",
-          contract_source_code:
-            "pragma solidity >=0.7.0 <0.9.0;contract Storage_1 {uint256 number;function store(uint256 num) public {number = num;}function retrieve_() public view returns (uint256){return number;}}",
-          address_hash: "0x0f95fa9bc0383e699325f2658d04e8d96d87b90c"
-        }
-      ]
-
-      changed_sources = [
-        %{
-          file_name: "storage_2.sol",
-          contract_source_code:
-            "pragma solidity >=0.7.0 <0.9.0;contract Storage_2 {uint256 number;function store(uint256 num) public {number = num;}function retrieve_() public view returns (uint256){return number;}}",
-          address_hash: "0x0f95fa9bc0383e699325f2658d04e8d96d87b90c"
-        },
-        %{
-          file_name: "storage_3.sol",
-          contract_source_code:
-            "pragma solidity >=0.7.0 <0.9.0;contract Storage_3 {uint256 number;function store(uint256 num) public {number = num;}function retrieve_() public view returns (uint256){return number;}}",
-          address_hash: "0x0f95fa9bc0383e699325f2658d04e8d96d87b90c"
-        }
-      ]
-
-      _ = Chain.create_smart_contract(valid_attrs, [], secondary_sources)
-
-      {:ok,
-       valid_attrs: valid_attrs,
-       address: created_contract_address,
-       secondary_sources: secondary_sources,
-       changed_sources: changed_sources}
-    end
-
-    test "change partially_verified field", %{valid_attrs: valid_attrs, address: address} do
-      sc_before_call = Repo.get_by(SmartContract, address_hash: address.hash)
-      assert sc_before_call.name == Map.get(valid_attrs, :name)
-      assert sc_before_call.partially_verified == Map.get(valid_attrs, :partially_verified)
-
-      assert {:ok, %SmartContract{}} =
-               Chain.update_smart_contract(%{
-                 address_hash: address.hash,
-                 partially_verified: false,
-                 contract_source_code: "new code"
-               })
-
-      sc_after_call = Repo.get_by(SmartContract, address_hash: address.hash)
-      assert sc_after_call.name == Map.get(valid_attrs, :name)
-      assert sc_after_call.partially_verified == false
-      assert sc_after_call.compiler_version == Map.get(valid_attrs, :compiler_version)
-      assert sc_after_call.optimization == Map.get(valid_attrs, :optimization)
-      assert sc_after_call.contract_source_code == "new code"
-    end
-
-    test "check nothing changed", %{valid_attrs: valid_attrs, address: address} do
-      sc_before_call = Repo.get_by(SmartContract, address_hash: address.hash)
-      assert sc_before_call.name == Map.get(valid_attrs, :name)
-      assert sc_before_call.partially_verified == Map.get(valid_attrs, :partially_verified)
-
-      assert {:ok, %SmartContract{}} = Chain.update_smart_contract(%{address_hash: address.hash})
-
-      sc_after_call = Repo.get_by(SmartContract, address_hash: address.hash)
-      assert sc_after_call.name == Map.get(valid_attrs, :name)
-      assert sc_after_call.partially_verified == Map.get(valid_attrs, :partially_verified)
-      assert sc_after_call.compiler_version == Map.get(valid_attrs, :compiler_version)
-      assert sc_after_call.optimization == Map.get(valid_attrs, :optimization)
-      assert sc_after_call.contract_source_code == Map.get(valid_attrs, :contract_source_code)
-    end
-
-    test "check additional sources update", %{
-      address: address,
-      secondary_sources: secondary_sources,
-      changed_sources: changed_sources
-    } do
-      sc_before_call = Repo.get_by(Address, hash: address.hash) |> Repo.preload(:smart_contract_additional_sources)
-
-      assert sc_before_call.smart_contract_additional_sources
-             |> Enum.with_index()
-             |> Enum.all?(fn {el, ind} ->
-               {:ok, src} = Enum.fetch(secondary_sources, ind)
-
-               el.file_name == Map.get(src, :file_name) and
-                 el.contract_source_code == Map.get(src, :contract_source_code)
-             end)
-
-      assert {:ok, %SmartContract{}} = Chain.update_smart_contract(%{address_hash: address.hash}, [], changed_sources)
-
-      sc_after_call = Repo.get_by(Address, hash: address.hash) |> Repo.preload(:smart_contract_additional_sources)
-
-      assert sc_after_call.smart_contract_additional_sources
-             |> Enum.with_index()
-             |> Enum.all?(fn {el, ind} ->
-               {:ok, src} = Enum.fetch(changed_sources, ind)
-
-               el.file_name == Map.get(src, :file_name) and
-                 el.contract_source_code == Map.get(src, :contract_source_code)
-             end)
-    end
-  end
-
   describe "stream_unfetched_balances/2" do
     test "with `t:Explorer.Chain.Address.CoinBalance.t/0` with value_fetched_at with same `address_hash` and `block_number` " <>
            "does not return `t:Explorer.Chain.Block.t/0` `miner_hash`" do
@@ -4816,14 +4550,6 @@ defmodule Explorer.ChainTest do
     assert Chain.circulating_supply() == ProofOfAuthority.circulating()
   end
 
-  describe "address_hash_to_smart_contract/1" do
-    test "fetches a smart contract" do
-      smart_contract = insert(:smart_contract, contract_code_md5: "123")
-
-      assert ^smart_contract = Chain.address_hash_to_smart_contract(smart_contract.address_hash)
-    end
-  end
-
   describe "token_from_address_hash/1" do
     test "with valid hash" do
       token = insert(:token)
@@ -5797,373 +5523,4 @@ defmodule Explorer.ChainTest do
       assert [%SmartContract{address_hash: ^hash}] = Chain.verified_contracts(search: contract_name)
     end
   end
-
-  describe "proxy contracts features" do
-    @proxy_abi [
-      %{
-        "type" => "function",
-        "stateMutability" => "nonpayable",
-        "payable" => false,
-        "outputs" => [%{"type" => "bool", "name" => ""}],
-        "name" => "upgradeTo",
-        "inputs" => [%{"type" => "address", "name" => "newImplementation"}],
-        "constant" => false
-      },
-      %{
-        "type" => "function",
-        "stateMutability" => "view",
-        "payable" => false,
-        "outputs" => [%{"type" => "uint256", "name" => ""}],
-        "name" => "version",
-        "inputs" => [],
-        "constant" => true
-      },
-      %{
-        "type" => "function",
-        "stateMutability" => "view",
-        "payable" => false,
-        "outputs" => [%{"type" => "address", "name" => ""}],
-        "name" => "implementation",
-        "inputs" => [],
-        "constant" => true
-      },
-      %{
-        "type" => "function",
-        "stateMutability" => "nonpayable",
-        "payable" => false,
-        "outputs" => [],
-        "name" => "renounceOwnership",
-        "inputs" => [],
-        "constant" => false
-      },
-      %{
-        "type" => "function",
-        "stateMutability" => "view",
-        "payable" => false,
-        "outputs" => [%{"type" => "address", "name" => ""}],
-        "name" => "getOwner",
-        "inputs" => [],
-        "constant" => true
-      },
-      %{
-        "type" => "function",
-        "stateMutability" => "view",
-        "payable" => false,
-        "outputs" => [%{"type" => "address", "name" => ""}],
-        "name" => "getProxyStorage",
-        "inputs" => [],
-        "constant" => true
-      },
-      %{
-        "type" => "function",
-        "stateMutability" => "nonpayable",
-        "payable" => false,
-        "outputs" => [],
-        "name" => "transferOwnership",
-        "inputs" => [%{"type" => "address", "name" => "_newOwner"}],
-        "constant" => false
-      },
-      %{
-        "type" => "constructor",
-        "stateMutability" => "nonpayable",
-        "payable" => false,
-        "inputs" => [
-          %{"type" => "address", "name" => "_proxyStorage"},
-          %{"type" => "address", "name" => "_implementationAddress"}
-        ]
-      },
-      %{"type" => "fallback", "stateMutability" => "nonpayable", "payable" => false},
-      %{
-        "type" => "event",
-        "name" => "Upgraded",
-        "inputs" => [
-          %{"type" => "uint256", "name" => "version", "indexed" => false},
-          %{"type" => "address", "name" => "implementation", "indexed" => true}
-        ],
-        "anonymous" => false
-      },
-      %{
-        "type" => "event",
-        "name" => "OwnershipRenounced",
-        "inputs" => [%{"type" => "address", "name" => "previousOwner", "indexed" => true}],
-        "anonymous" => false
-      },
-      %{
-        "type" => "event",
-        "name" => "OwnershipTransferred",
-        "inputs" => [
-          %{"type" => "address", "name" => "previousOwner", "indexed" => true},
-          %{"type" => "address", "name" => "newOwner", "indexed" => true}
-        ],
-        "anonymous" => false
-      }
-    ]
-
-    @implementation_abi [
-      %{
-        "constant" => false,
-        "inputs" => [%{"name" => "x", "type" => "uint256"}],
-        "name" => "set",
-        "outputs" => [],
-        "payable" => false,
-        "stateMutability" => "nonpayable",
-        "type" => "function"
-      },
-      %{
-        "constant" => true,
-        "inputs" => [],
-        "name" => "get",
-        "outputs" => [%{"name" => "", "type" => "uint256"}],
-        "payable" => false,
-        "stateMutability" => "view",
-        "type" => "function"
-      }
-    ]
-
-    test "combine_proxy_implementation_abi/2 returns empty [] abi if proxy abi is null" do
-      proxy_contract_address = insert(:contract_address)
-
-      assert Chain.combine_proxy_implementation_abi(%SmartContract{address_hash: proxy_contract_address.hash, abi: nil}) ==
-               []
-    end
-
-    test "combine_proxy_implementation_abi/2 returns [] abi for unverified proxy" do
-      proxy_contract_address = insert(:contract_address)
-
-      smart_contract =
-        insert(:smart_contract, address_hash: proxy_contract_address.hash, abi: [], contract_code_md5: "123")
-
-      get_eip1967_implementation()
-
-      assert Chain.combine_proxy_implementation_abi(smart_contract) == []
-    end
-
-    test "combine_proxy_implementation_abi/2 returns proxy abi if implementation is not verified" do
-      proxy_contract_address = insert(:contract_address)
-
-      smart_contract =
-        insert(:smart_contract, address_hash: proxy_contract_address.hash, abi: @proxy_abi, contract_code_md5: "123")
-
-      assert Chain.combine_proxy_implementation_abi(smart_contract) == @proxy_abi
-    end
-
-    test "combine_proxy_implementation_abi/2 returns proxy + implementation abi if implementation is verified" do
-      proxy_contract_address = insert(:contract_address)
-
-      smart_contract =
-        insert(:smart_contract, address_hash: proxy_contract_address.hash, abi: @proxy_abi, contract_code_md5: "123")
-
-      implementation_contract_address = insert(:contract_address)
-
-      insert(:smart_contract,
-        address_hash: implementation_contract_address.hash,
-        abi: @implementation_abi,
-        contract_code_md5: "123"
-      )
-
-      implementation_contract_address_hash_string =
-        Base.encode16(implementation_contract_address.hash.bytes, case: :lower)
-
-      expect(
-        EthereumJSONRPC.Mox,
-        :json_rpc,
-        fn [%{id: id, method: _, params: [%{data: _, to: _}, _]}], _options ->
-          {:ok,
-           [
-             %{
-               id: id,
-               jsonrpc: "2.0",
-               result: "0x000000000000000000000000" <> implementation_contract_address_hash_string
-             }
-           ]}
-        end
-      )
-
-      combined_abi = Chain.combine_proxy_implementation_abi(smart_contract)
-
-      assert Enum.any?(@proxy_abi, fn el -> el == Enum.at(@implementation_abi, 0) end) == false
-      assert Enum.any?(@proxy_abi, fn el -> el == Enum.at(@implementation_abi, 1) end) == false
-      assert Enum.any?(combined_abi, fn el -> el == Enum.at(@implementation_abi, 0) end) == true
-      assert Enum.any?(combined_abi, fn el -> el == Enum.at(@implementation_abi, 1) end) == true
-    end
-
-    test "get_implementation_abi_from_proxy/2 returns empty [] abi if proxy abi is null" do
-      proxy_contract_address = insert(:contract_address)
-
-      assert Chain.get_implementation_abi_from_proxy(
-               %SmartContract{address_hash: proxy_contract_address.hash, abi: nil},
-               []
-             ) ==
-               []
-    end
-
-    test "get_implementation_abi_from_proxy/2 returns [] abi for unverified proxy" do
-      proxy_contract_address = insert(:contract_address)
-
-      smart_contract =
-        insert(:smart_contract, address_hash: proxy_contract_address.hash, abi: [], contract_code_md5: "123")
-
-      get_eip1967_implementation()
-
-      assert Chain.combine_proxy_implementation_abi(smart_contract) == []
-    end
-
-    test "get_implementation_abi_from_proxy/2 returns [] if implementation is not verified" do
-      proxy_contract_address = insert(:contract_address)
-
-      smart_contract =
-        insert(:smart_contract, address_hash: proxy_contract_address.hash, abi: @proxy_abi, contract_code_md5: "123")
-
-      assert Chain.get_implementation_abi_from_proxy(smart_contract, []) == []
-    end
-
-    test "get_implementation_abi_from_proxy/2 returns implementation abi if implementation is verified" do
-      proxy_contract_address = insert(:contract_address)
-
-      smart_contract =
-        insert(:smart_contract, address_hash: proxy_contract_address.hash, abi: @proxy_abi, contract_code_md5: "123")
-
-      implementation_contract_address = insert(:contract_address)
-
-      insert(:smart_contract,
-        address_hash: implementation_contract_address.hash,
-        abi: @implementation_abi,
-        contract_code_md5: "123"
-      )
-
-      implementation_contract_address_hash_string =
-        Base.encode16(implementation_contract_address.hash.bytes, case: :lower)
-
-      expect(
-        EthereumJSONRPC.Mox,
-        :json_rpc,
-        fn [%{id: id, method: _, params: [%{data: _, to: _}, _]}], _options ->
-          {:ok,
-           [
-             %{
-               id: id,
-               jsonrpc: "2.0",
-               result: "0x000000000000000000000000" <> implementation_contract_address_hash_string
-             }
-           ]}
-        end
-      )
-
-      implementation_abi = Chain.get_implementation_abi_from_proxy(smart_contract, [])
-
-      assert implementation_abi == @implementation_abi
-    end
-
-    test "get_implementation_abi_from_proxy/2 returns implementation abi in case of EIP-1967 proxy pattern" do
-      proxy_contract_address = insert(:contract_address)
-
-      smart_contract =
-        insert(:smart_contract, address_hash: proxy_contract_address.hash, abi: [], contract_code_md5: "123")
-
-      implementation_contract_address = insert(:contract_address)
-
-      insert(:smart_contract,
-        address_hash: implementation_contract_address.hash,
-        abi: @implementation_abi,
-        contract_code_md5: "123"
-      )
-
-      implementation_contract_address_hash_string =
-        Base.encode16(implementation_contract_address.hash.bytes, case: :lower)
-
-      expect(
-        EthereumJSONRPC.Mox,
-        :json_rpc,
-        fn %{
-             id: _id,
-             method: "eth_getStorageAt",
-             params: [
-               _,
-               "0x360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc",
-               "latest"
-             ]
-           },
-           _options ->
-          {:ok, "0x000000000000000000000000" <> implementation_contract_address_hash_string}
-        end
-      )
-
-      implementation_abi = Chain.get_implementation_abi_from_proxy(smart_contract, [])
-
-      assert implementation_abi == @implementation_abi
-    end
-
-    test "get_implementation_abi/1 returns empty [] abi if implementation address is null" do
-      assert Chain.get_implementation_abi(nil) == []
-    end
-
-    test "get_implementation_abi/1 returns [] if implementation is not verified" do
-      implementation_contract_address = insert(:contract_address)
-
-      implementation_contract_address_hash_string =
-        Base.encode16(implementation_contract_address.hash.bytes, case: :lower)
-
-      assert Chain.get_implementation_abi("0x" <> implementation_contract_address_hash_string) == []
-    end
-
-    test "get_implementation_abi/1 returns implementation abi if implementation is verified" do
-      proxy_contract_address = insert(:contract_address)
-      insert(:smart_contract, address_hash: proxy_contract_address.hash, abi: @proxy_abi, contract_code_md5: "123")
-
-      implementation_contract_address = insert(:contract_address)
-
-      insert(:smart_contract,
-        address_hash: implementation_contract_address.hash,
-        abi: @implementation_abi,
-        contract_code_md5: "123"
-      )
-
-      implementation_contract_address_hash_string =
-        Base.encode16(implementation_contract_address.hash.bytes, case: :lower)
-
-      implementation_abi = Chain.get_implementation_abi("0x" <> implementation_contract_address_hash_string)
-
-      assert implementation_abi == @implementation_abi
-    end
-  end
-
-  def get_eip1967_implementation do
-    EthereumJSONRPC.Mox
-    |> expect(:json_rpc, fn %{
-                              id: 0,
-                              method: "eth_getStorageAt",
-                              params: [
-                                _,
-                                "0x360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc",
-                                "latest"
-                              ]
-                            },
-                            _options ->
-      {:ok, "0x0000000000000000000000000000000000000000000000000000000000000000"}
-    end)
-    |> expect(:json_rpc, fn %{
-                              id: 0,
-                              method: "eth_getStorageAt",
-                              params: [
-                                _,
-                                "0xa3f0ad74e5423aebfd80d3ef4346578335a9a72aeaee59ff6cb3582b35133d50",
-                                "latest"
-                              ]
-                            },
-                            _options ->
-      {:ok, "0x0000000000000000000000000000000000000000000000000000000000000000"}
-    end)
-    |> expect(:json_rpc, fn %{
-                              id: 0,
-                              method: "eth_getStorageAt",
-                              params: [
-                                _,
-                                "0x7050c9e0f4ca769c69bd3a8ef740bc37934f8e2c036e5a723fd8ee048ed3f8c3",
-                                "latest"
-                              ]
-                            },
-                            _options ->
-      {:ok, "0x0000000000000000000000000000000000000000000000000000000000000000"}
-    end)
-  end
 end
diff --git a/apps/indexer/lib/indexer/block/fetcher.ex b/apps/indexer/lib/indexer/block/fetcher.ex
index 7ceebb1009b5..713880e401d2 100644
--- a/apps/indexer/lib/indexer/block/fetcher.ex
+++ b/apps/indexer/lib/indexer/block/fetcher.ex
@@ -33,7 +33,6 @@ defmodule Indexer.Block.Fetcher do
 
   alias Indexer.Transform.{
     AddressCoinBalances,
-    AddressCoinBalancesDaily,
     Addresses,
     AddressTokenBalances,
     MintTransfers,
diff --git a/cspell.json b/cspell.json
index 2ef306d4e72d..95077caf8ceb 100644
--- a/cspell.json
+++ b/cspell.json
@@ -346,6 +346,7 @@
         "prederive",
         "prederived",
         "progressbar",
+        "proxiable",
         "psql",
         "purrstige",
         "qdai",
@@ -490,6 +491,7 @@
         "upserts",
         "urijs",
         "Utqn",
+        "UUPS",
         "valign",
         "valuemax",
         "valuemin",

From e3f8734e0123cf7e8dce7b458b9eb6b84780cf7d Mon Sep 17 00:00:00 2001
From: Viktor Baranov <baranov.viktor.27@gmail.com>
Date: Tue, 14 Nov 2023 11:17:08 +0300
Subject: [PATCH 656/909] Change some specs, add missing spec and docs

---
 .../lib/explorer/chain/smart_contract.ex      | 33 +++++++++++++------
 .../chain/smart_contract/proxy/eip_1822.ex    |  5 ---
 .../smart_contract_additional_sources.ex      |  2 +-
 3 files changed, 24 insertions(+), 16 deletions(-)

diff --git a/apps/explorer/lib/explorer/chain/smart_contract.ex b/apps/explorer/lib/explorer/chain/smart_contract.ex
index ea91857a1a83..2d5a04863623 100644
--- a/apps/explorer/lib/explorer/chain/smart_contract.ex
+++ b/apps/explorer/lib/explorer/chain/smart_contract.ex
@@ -23,6 +23,7 @@ defmodule Explorer.Chain.SmartContract do
     DecompiledSmartContract,
     Hash,
     InternalTransaction,
+    SmartContract,
     SmartContractAdditionalSource,
     Transaction
   }
@@ -243,7 +244,7 @@ defmodule Explorer.Chain.SmartContract do
   * `verified_via_eth_bytecode_db` - whether contract automatically verified via eth-bytecode-db or not.
   """
 
-  @type t :: %Explorer.Chain.SmartContract{
+  @type t :: %SmartContract{
           name: String.t(),
           compiler_version: String.t(),
           optimization: boolean,
@@ -683,7 +684,7 @@ defmodule Explorer.Chain.SmartContract do
   @doc """
   Composes address object for smart-contract
   """
-  @spec compose_smart_contract(map(), Explorer.Chain.Hash.t(), any()) :: map()
+  @spec compose_smart_contract(map(), Hash.t(), any()) :: map()
   def compose_smart_contract(address_result, hash, options) do
     address_verified_twin_contract =
       EIP1167.get_implementation_address(hash, options) ||
@@ -709,6 +710,10 @@ defmodule Explorer.Chain.SmartContract do
   Finds metadata for verification of a contract from verified twins: contracts with the same bytecode
   which were verified previously, returns a single t:SmartContract.t/0
   """
+  @spec get_address_verified_twin_contract(Hash.t() | String.t(), any()) :: %{
+          :verified_contract => any(),
+          :additional_sources => SmartContractAdditionalSource.t() | nil
+        }
   def get_address_verified_twin_contract(hash, options \\ [])
 
   def get_address_verified_twin_contract(hash, options) when is_binary(hash) do
@@ -718,7 +723,7 @@ defmodule Explorer.Chain.SmartContract do
     end
   end
 
-  def get_address_verified_twin_contract(%Explorer.Chain.Hash{} = address_hash, options) do
+  def get_address_verified_twin_contract(%Hash{} = address_hash, options) do
     with target_address <- Chain.select_repo(options).get(Address, address_hash),
          false <- is_nil(target_address) do
       verified_contract_twin = get_verified_twin_contract(target_address, options)
@@ -736,7 +741,11 @@ defmodule Explorer.Chain.SmartContract do
     end
   end
 
-  def get_verified_twin_contract(%Explorer.Chain.Address{} = target_address, options \\ []) do
+  @doc """
+  Returns verified smart-contract with the same bytecode of the given smart-contract
+  """
+  @spec get_verified_twin_contract(Address.t(), any()) :: SmartContract.t() | nil
+  def get_verified_twin_contract(%Address{} = target_address, options \\ []) do
     case target_address do
       %{contract_code: %Chain.Data{bytes: contract_code_bytes}} ->
         target_address_hash = target_address.hash
@@ -760,6 +769,10 @@ defmodule Explorer.Chain.SmartContract do
     end
   end
 
+  @doc """
+  Returns address or smart_contract object with parsed constructor_arguments
+  """
+  @spec check_and_update_constructor_args(any()) :: any()
   def check_and_update_constructor_args(
         %__MODULE__{address_hash: address_hash, constructor_arguments: nil, verified_via_sourcify: true} =
           smart_contract
@@ -793,7 +806,7 @@ defmodule Explorer.Chain.SmartContract do
   @doc """
   Adds verified metadata from bytecode twin smart-contract to the given smart-contract
   """
-  @spec add_twin_info_to_contract(map(), Chain.Hash.t(), Chain.Hash.t()) :: map()
+  @spec add_twin_info_to_contract(map(), Chain.Hash.t(), Chain.Hash.t() | nil) :: map()
   def add_twin_info_to_contract(address_result, address_verified_twin_contract, _hash)
       when is_nil(address_verified_twin_contract),
       do: address_result
@@ -817,7 +830,7 @@ defmodule Explorer.Chain.SmartContract do
   As part of inserting a new smart contract, an additional record is inserted for
   naming the address for reference.
   """
-  @spec create_smart_contract(map()) :: {:ok, __MODULE__.t()} | {:error, Ecto.Changeset.t()}
+  @spec create_smart_contract(map(), list(), list()) :: {:ok, __MODULE__.t()} | {:error, Ecto.Changeset.t()}
   def create_smart_contract(attrs \\ %{}, external_libraries \\ [], secondary_sources \\ []) do
     new_contract = %__MODULE__{}
 
@@ -886,7 +899,7 @@ defmodule Explorer.Chain.SmartContract do
   Used in cases when you need to update row in DB contains SmartContract, e.g. in case of changing
   status `partially verified` to `fully verified` (re-verify).
   """
-  @spec update_smart_contract(map()) :: {:ok, __MODULE__.t()} | {:error, Ecto.Changeset.t()}
+  @spec update_smart_contract(map(), list(), list()) :: {:ok, __MODULE__.t()} | {:error, Ecto.Changeset.t()}
   def update_smart_contract(attrs \\ %{}, external_libraries \\ [], secondary_sources \\ []) do
     address_hash = Map.get(attrs, :address_hash)
 
@@ -992,7 +1005,7 @@ defmodule Explorer.Chain.SmartContract do
 
   Returns `true` if found and `false` otherwise.
   """
-  @spec verified_with_full_match?(any()) :: boolean()
+  @spec verified_with_full_match?(Hash.Address.t() | String.t()) :: boolean()
   def verified_with_full_match?(address_hash, options \\ [])
 
   def verified_with_full_match?(address_hash_str, options) when is_binary(address_hash_str) do
@@ -1015,7 +1028,7 @@ defmodule Explorer.Chain.SmartContract do
 
   Returns `true` if found and `false` otherwise.
   """
-  @spec verified?(any()) :: boolean()
+  @spec verified?(Hash.Address.t() | String.t()) :: boolean()
   def verified?(address_hash_str) when is_binary(address_hash_str) do
     case Chain.string_to_address_hash(address_hash_str) do
       {:ok, address_hash} ->
@@ -1046,7 +1059,7 @@ defmodule Explorer.Chain.SmartContract do
   @doc """
   Gets smart-contract ABI from the DB for the given address hash of smart-contract
   """
-  @spec get_smart_contract_abi(any(), any()) :: any()
+  @spec get_smart_contract_abi(String.t(), any()) :: any()
   def get_smart_contract_abi(address_hash_string, options \\ [])
 
   def get_smart_contract_abi(address_hash_string, options)
diff --git a/apps/explorer/lib/explorer/chain/smart_contract/proxy/eip_1822.ex b/apps/explorer/lib/explorer/chain/smart_contract/proxy/eip_1822.ex
index 887dc50a0655..c3da53ed8ea1 100644
--- a/apps/explorer/lib/explorer/chain/smart_contract/proxy/eip_1822.ex
+++ b/apps/explorer/lib/explorer/chain/smart_contract/proxy/eip_1822.ex
@@ -5,11 +5,6 @@ defmodule Explorer.Chain.SmartContract.Proxy.EIP1822 do
   alias Explorer.Chain.{Hash, SmartContract}
   alias Explorer.Chain.SmartContract.Proxy
 
-  @burn_address_hash_string_32 "0x0000000000000000000000000000000000000000000000000000000000000000"
-
-  defguard is_burn_signature(term) when term in ["0x", "0x0", @burn_address_hash_string_32]
-  defguard is_burn_signature_or_nil(term) when is_burn_signature(term) or term == nil
-
   # keccak256("PROXIABLE")
   @storage_slot_proxiable "0xc5f16f0fcc639fa48a6947836d9850f504798523bf8c9a3a87d5876cf622bcf7"
 
diff --git a/apps/explorer/lib/explorer/chain/smart_contract_additional_sources.ex b/apps/explorer/lib/explorer/chain/smart_contract_additional_sources.ex
index a05e5f0a733b..bdf2581becd0 100644
--- a/apps/explorer/lib/explorer/chain/smart_contract_additional_sources.ex
+++ b/apps/explorer/lib/explorer/chain/smart_contract_additional_sources.ex
@@ -64,7 +64,7 @@ defmodule Explorer.Chain.SmartContractAdditionalSource do
   @doc """
   Returns all additional sources for the given smart-contract address hash
   """
-  @spec get_contract_additional_sources(SmartContract.t(), Keyword.t()) :: [__MODULE__.t()]
+  @spec get_contract_additional_sources(SmartContract.t() | nil, Keyword.t()) :: [__MODULE__.t()]
   def get_contract_additional_sources(smart_contract, options) do
     if smart_contract do
       all_additional_sources_query =

From 8ebcb7dae7139df18963dfe32d83056c9529f26c Mon Sep 17 00:00:00 2001
From: Viktor Baranov <baranov.viktor.27@gmail.com>
Date: Tue, 14 Nov 2023 11:56:17 +0300
Subject: [PATCH 657/909] Define smart-contract guards in a single place

---
 apps/explorer/lib/explorer/chain/smart_contract.ex         | 1 +
 apps/explorer/lib/explorer/chain/smart_contract/proxy.ex   | 7 ++-----
 .../lib/explorer/chain/smart_contract/proxy/eip_1967.ex    | 7 ++-----
 .../lib/explorer/chain/smart_contract/proxy/master_copy.ex | 4 +---
 4 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/apps/explorer/lib/explorer/chain/smart_contract.ex b/apps/explorer/lib/explorer/chain/smart_contract.ex
index 2d5a04863623..f3c69decd3f8 100644
--- a/apps/explorer/lib/explorer/chain/smart_contract.ex
+++ b/apps/explorer/lib/explorer/chain/smart_contract.ex
@@ -42,6 +42,7 @@ defmodule Explorer.Chain.SmartContract do
   @burn_address_hash_string_32 "0x0000000000000000000000000000000000000000000000000000000000000000"
 
   defguard is_burn_signature(term) when term in ["0x", "0x0", @burn_address_hash_string_32]
+  defguard is_burn_signature_or_nil(term) when is_burn_signature(term) or term == nil
   defguard is_burn_signature_extended(term) when is_burn_signature(term) or term == @burn_address_hash_string
 
   @doc """
diff --git a/apps/explorer/lib/explorer/chain/smart_contract/proxy.ex b/apps/explorer/lib/explorer/chain/smart_contract/proxy.ex
index fc694d8e5630..5fd7489ccef4 100644
--- a/apps/explorer/lib/explorer/chain/smart_contract/proxy.ex
+++ b/apps/explorer/lib/explorer/chain/smart_contract/proxy.ex
@@ -13,6 +13,8 @@ defmodule Explorer.Chain.SmartContract.Proxy do
       string_to_address_hash: 1
     ]
 
+  import Explorer.Chain.SmartContract, only: [is_burn_signature_or_nil: 1]
+
   # supported signatures:
   # 5c60da1b = keccak256(implementation())
   @implementation_signature "5c60da1b"
@@ -21,13 +23,8 @@ defmodule Explorer.Chain.SmartContract.Proxy do
   # aaf10f42 = keccak256(getAddress(bytes32))
   @get_address_signature "21f8a721"
 
-  @burn_address_hash_string_32 "0x0000000000000000000000000000000000000000000000000000000000000000"
-
   @typep api? :: {:api?, true | false}
 
-  defguard is_burn_signature(term) when term in ["0x", "0x0", @burn_address_hash_string_32]
-  defguard is_burn_signature_or_nil(term) when is_burn_signature(term) or term == nil
-
   @doc """
   Fetches into DB proxy contract implementation's address and name from different proxy patterns
   """
diff --git a/apps/explorer/lib/explorer/chain/smart_contract/proxy/eip_1967.ex b/apps/explorer/lib/explorer/chain/smart_contract/proxy/eip_1967.ex
index c6f500492fa2..125f97be55be 100644
--- a/apps/explorer/lib/explorer/chain/smart_contract/proxy/eip_1967.ex
+++ b/apps/explorer/lib/explorer/chain/smart_contract/proxy/eip_1967.ex
@@ -7,15 +7,12 @@ defmodule Explorer.Chain.SmartContract.Proxy.EIP1967 do
   alias Explorer.Chain.SmartContract.Proxy
   alias Explorer.Chain.SmartContract.Proxy.Basic
 
+  import Explorer.Chain.SmartContract, only: [is_burn_signature_or_nil: 1]
+
   # supported signatures:
   # 5c60da1b = keccak256(implementation())
   @implementation_signature "5c60da1b"
 
-  @burn_address_hash_string_32 "0x0000000000000000000000000000000000000000000000000000000000000000"
-
-  defguard is_burn_signature(term) when term in ["0x", "0x0", @burn_address_hash_string_32]
-  defguard is_burn_signature_or_nil(term) when is_burn_signature(term) or term == nil
-
   @storage_slot_logic_contract_address "0x360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc"
 
   # to be precise, it is not the part of the EIP-1967 standard, but still uses the same pattern
diff --git a/apps/explorer/lib/explorer/chain/smart_contract/proxy/master_copy.ex b/apps/explorer/lib/explorer/chain/smart_contract/proxy/master_copy.ex
index fb0df17aaa3c..70966ef4bba5 100644
--- a/apps/explorer/lib/explorer/chain/smart_contract/proxy/master_copy.ex
+++ b/apps/explorer/lib/explorer/chain/smart_contract/proxy/master_copy.ex
@@ -7,9 +7,7 @@ defmodule Explorer.Chain.SmartContract.Proxy.MasterCopy do
   alias Explorer.Chain.{Hash, SmartContract}
   alias Explorer.Chain.SmartContract.Proxy
 
-  @burn_address_hash_string_32 "0x0000000000000000000000000000000000000000000000000000000000000000"
-
-  defguard is_burn_signature(term) when term in ["0x", "0x0", @burn_address_hash_string_32]
+  import Explorer.Chain.SmartContract, only: [is_burn_signature: 1]
 
   @doc """
   Gets implementation address for proxy contract from master-copy pattern

From 284b49dbf5ced38f908e2d3c9e10013002d95423 Mon Sep 17 00:00:00 2001
From: Viktor Baranov <baranov.viktor.27@gmail.com>
Date: Tue, 14 Nov 2023 12:47:14 +0300
Subject: [PATCH 658/909] Fix tests after rebasing

---
 .../api/v2/address_controller_test.exs        | 24 +++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/apps/block_scout_web/test/block_scout_web/controllers/api/v2/address_controller_test.exs b/apps/block_scout_web/test/block_scout_web/controllers/api/v2/address_controller_test.exs
index 411803430cd0..93ed6e65f722 100644
--- a/apps/block_scout_web/test/block_scout_web/controllers/api/v2/address_controller_test.exs
+++ b/apps/block_scout_web/test/block_scout_web/controllers/api/v2/address_controller_test.exs
@@ -2681,5 +2681,29 @@ defmodule BlockScoutWeb.API.V2.AddressControllerTest do
                                               _options ->
       {:ok, "0x0000000000000000000000000000000000000000000000000000000000000001"}
     end)
+    |> expect(:json_rpc, fn %{
+                              id: 0,
+                              method: "eth_getStorageAt",
+                              params: [
+                                _,
+                                "0xa3f0ad74e5423aebfd80d3ef4346578335a9a72aeaee59ff6cb3582b35133d50",
+                                "latest"
+                              ]
+                            },
+                            _options ->
+      {:ok, "0x0000000000000000000000000000000000000000000000000000000000000000"}
+    end)
+    |> expect(:json_rpc, fn %{
+                              id: 0,
+                              method: "eth_getStorageAt",
+                              params: [
+                                _,
+                                "0x7050c9e0f4ca769c69bd3a8ef740bc37934f8e2c036e5a723fd8ee048ed3f8c3",
+                                "latest"
+                              ]
+                            },
+                            _options ->
+      {:ok, "0x0000000000000000000000000000000000000000000000000000000000000000"}
+    end)
   end
 end

From f004e55767d5e71afbc016ed8aefd80af7601130 Mon Sep 17 00:00:00 2001
From: Nikita Pozdniakov <nikitosing4@mail.ru>
Date: Wed, 15 Nov 2023 15:08:10 +0300
Subject: [PATCH 659/909] Add setup :verify_on_exit! to all tests using
 json_rpc mox

---
 .../controllers/address_read_contract_controller_test.exs       | 2 ++
 .../controllers/address_read_proxy_controller_test.exs          | 2 ++
 .../controllers/address_write_contract_controller_test.exs      | 2 ++
 .../controllers/address_write_proxy_controller_test.exs         | 2 ++
 .../controllers/api/rpc/contract_controller_test.exs            | 2 ++
 .../controllers/api/rpc/transaction_controller_test.exs         | 2 ++
 .../controllers/api/v2/address_controller_test.exs              | 2 ++
 .../controllers/api/v2/smart_contract_controller_test.exs       | 2 ++
 .../controllers/tokens/read_contract_controller_test.exs        | 2 ++
 .../transaction_internal_transaction_controller_test.exs        | 2 ++
 .../controllers/transaction_log_controller_test.exs             | 2 ++
 .../controllers/transaction_token_transfer_controller_test.exs  | 2 ++
 .../test/block_scout_web/features/viewing_transactions_test.exs | 2 ++
 apps/ethereum_jsonrpc/test/ethereum_jsonrpc/contract_test.exs   | 2 ++
 apps/ethereum_jsonrpc/test/ethereum_jsonrpc/geth_test.exs       | 2 ++
 apps/explorer/test/explorer/chain/address_test.exs              | 2 ++
 .../test/explorer/chain/cache/gas_price_oracle_test.exs         | 2 ++
 apps/explorer/test/explorer/chain/log_test.exs                  | 2 ++
 apps/explorer/test/explorer/chain/supply/rsk_test.exs           | 2 ++
 apps/explorer/test/explorer/chain/transaction_test.exs          | 2 ++
 apps/explorer/test/explorer/chain_spec/geth/importer_test.exs   | 2 ++
 apps/explorer/test/explorer/chain_spec/parity/importer_test.exs | 2 ++
 22 files changed, 44 insertions(+)

diff --git a/apps/block_scout_web/test/block_scout_web/controllers/address_read_contract_controller_test.exs b/apps/block_scout_web/test/block_scout_web/controllers/address_read_contract_controller_test.exs
index 8537ecd4e7a3..37f279b32562 100644
--- a/apps/block_scout_web/test/block_scout_web/controllers/address_read_contract_controller_test.exs
+++ b/apps/block_scout_web/test/block_scout_web/controllers/address_read_contract_controller_test.exs
@@ -7,6 +7,8 @@ defmodule BlockScoutWeb.AddressReadContractControllerTest do
 
   import Mox
 
+  setup :verify_on_exit!
+
   describe "GET index/3" do
     setup :set_mox_global
 
diff --git a/apps/block_scout_web/test/block_scout_web/controllers/address_read_proxy_controller_test.exs b/apps/block_scout_web/test/block_scout_web/controllers/address_read_proxy_controller_test.exs
index 1b49b35d3979..14b42c6ae55f 100644
--- a/apps/block_scout_web/test/block_scout_web/controllers/address_read_proxy_controller_test.exs
+++ b/apps/block_scout_web/test/block_scout_web/controllers/address_read_proxy_controller_test.exs
@@ -7,6 +7,8 @@ defmodule BlockScoutWeb.AddressReadProxyControllerTest do
 
   import Mox
 
+  setup :verify_on_exit!
+
   describe "GET index/3" do
     setup :set_mox_global
 
diff --git a/apps/block_scout_web/test/block_scout_web/controllers/address_write_contract_controller_test.exs b/apps/block_scout_web/test/block_scout_web/controllers/address_write_contract_controller_test.exs
index 30caf25e7273..beb197b8b592 100644
--- a/apps/block_scout_web/test/block_scout_web/controllers/address_write_contract_controller_test.exs
+++ b/apps/block_scout_web/test/block_scout_web/controllers/address_write_contract_controller_test.exs
@@ -9,6 +9,8 @@ defmodule BlockScoutWeb.AddressWriteContractControllerTest do
 
   import Mox
 
+  setup :verify_on_exit!
+
   describe "GET index/3" do
     setup :set_mox_global
 
diff --git a/apps/block_scout_web/test/block_scout_web/controllers/address_write_proxy_controller_test.exs b/apps/block_scout_web/test/block_scout_web/controllers/address_write_proxy_controller_test.exs
index 7225e06e7b57..377f8f1a3881 100644
--- a/apps/block_scout_web/test/block_scout_web/controllers/address_write_proxy_controller_test.exs
+++ b/apps/block_scout_web/test/block_scout_web/controllers/address_write_proxy_controller_test.exs
@@ -7,6 +7,8 @@ defmodule BlockScoutWeb.AddressWriteProxyControllerTest do
 
   import Mox
 
+  setup :verify_on_exit!
+
   describe "GET index/3" do
     setup :set_mox_global
 
diff --git a/apps/block_scout_web/test/block_scout_web/controllers/api/rpc/contract_controller_test.exs b/apps/block_scout_web/test/block_scout_web/controllers/api/rpc/contract_controller_test.exs
index f715149a9961..89122b8369b4 100644
--- a/apps/block_scout_web/test/block_scout_web/controllers/api/rpc/contract_controller_test.exs
+++ b/apps/block_scout_web/test/block_scout_web/controllers/api/rpc/contract_controller_test.exs
@@ -4,6 +4,8 @@ defmodule BlockScoutWeb.API.RPC.ContractControllerTest do
 
   import Mox
 
+  setup :verify_on_exit!
+
   def prepare_contracts do
     insert(:contract_address)
     {:ok, dt_1, _} = DateTime.from_iso8601("2022-09-20 10:00:00Z")
diff --git a/apps/block_scout_web/test/block_scout_web/controllers/api/rpc/transaction_controller_test.exs b/apps/block_scout_web/test/block_scout_web/controllers/api/rpc/transaction_controller_test.exs
index e9e08b6a7127..4a828099ce6e 100644
--- a/apps/block_scout_web/test/block_scout_web/controllers/api/rpc/transaction_controller_test.exs
+++ b/apps/block_scout_web/test/block_scout_web/controllers/api/rpc/transaction_controller_test.exs
@@ -5,6 +5,8 @@ defmodule BlockScoutWeb.API.RPC.TransactionControllerTest do
 
   @moduletag capture_log: true
 
+  setup :verify_on_exit!
+
   describe "gettxreceiptstatus" do
     test "with missing txhash", %{conn: conn} do
       params = %{
diff --git a/apps/block_scout_web/test/block_scout_web/controllers/api/v2/address_controller_test.exs b/apps/block_scout_web/test/block_scout_web/controllers/api/v2/address_controller_test.exs
index 93ed6e65f722..186fd19b745f 100644
--- a/apps/block_scout_web/test/block_scout_web/controllers/api/v2/address_controller_test.exs
+++ b/apps/block_scout_web/test/block_scout_web/controllers/api/v2/address_controller_test.exs
@@ -27,6 +27,8 @@ defmodule BlockScoutWeb.API.V2.AddressControllerTest do
 
   setup :set_mox_global
 
+  setup :verify_on_exit!
+
   describe "/addresses/{address_hash}" do
     test "get 404 on non existing address", %{conn: conn} do
       address = build(:address)
diff --git a/apps/block_scout_web/test/block_scout_web/controllers/api/v2/smart_contract_controller_test.exs b/apps/block_scout_web/test/block_scout_web/controllers/api/v2/smart_contract_controller_test.exs
index 87e2c0455dca..c6c713b86aeb 100644
--- a/apps/block_scout_web/test/block_scout_web/controllers/api/v2/smart_contract_controller_test.exs
+++ b/apps/block_scout_web/test/block_scout_web/controllers/api/v2/smart_contract_controller_test.exs
@@ -11,6 +11,8 @@ defmodule BlockScoutWeb.API.V2.SmartContractControllerTest do
 
   setup :set_mox_from_context
 
+  setup :verify_on_exit!
+
   describe "/smart-contracts/{address_hash}" do
     test "get 404 on non existing SC", %{conn: conn} do
       address = build(:address)
diff --git a/apps/block_scout_web/test/block_scout_web/controllers/tokens/read_contract_controller_test.exs b/apps/block_scout_web/test/block_scout_web/controllers/tokens/read_contract_controller_test.exs
index 589d53a71664..7a03cfba35f7 100644
--- a/apps/block_scout_web/test/block_scout_web/controllers/tokens/read_contract_controller_test.exs
+++ b/apps/block_scout_web/test/block_scout_web/controllers/tokens/read_contract_controller_test.exs
@@ -3,6 +3,8 @@ defmodule BlockScoutWeb.Tokens.ContractControllerTest do
 
   import Mox
 
+  setup :verify_on_exit!
+
   describe "GET index/3" do
     test "with invalid address hash", %{conn: conn} do
       conn = get(conn, token_read_contract_path(BlockScoutWeb.Endpoint, :index, "invalid_address"))
diff --git a/apps/block_scout_web/test/block_scout_web/controllers/transaction_internal_transaction_controller_test.exs b/apps/block_scout_web/test/block_scout_web/controllers/transaction_internal_transaction_controller_test.exs
index 4969db368530..cd02afca2abb 100644
--- a/apps/block_scout_web/test/block_scout_web/controllers/transaction_internal_transaction_controller_test.exs
+++ b/apps/block_scout_web/test/block_scout_web/controllers/transaction_internal_transaction_controller_test.exs
@@ -8,6 +8,8 @@ defmodule BlockScoutWeb.TransactionInternalTransactionControllerTest do
   alias Explorer.Chain.InternalTransaction
   alias Explorer.ExchangeRates.Token
 
+  setup :verify_on_exit!
+
   describe "GET index/3" do
     test "with missing transaction", %{conn: conn} do
       hash = transaction_hash()
diff --git a/apps/block_scout_web/test/block_scout_web/controllers/transaction_log_controller_test.exs b/apps/block_scout_web/test/block_scout_web/controllers/transaction_log_controller_test.exs
index fc9ced3bba5f..8fd02a2bd08f 100644
--- a/apps/block_scout_web/test/block_scout_web/controllers/transaction_log_controller_test.exs
+++ b/apps/block_scout_web/test/block_scout_web/controllers/transaction_log_controller_test.exs
@@ -8,6 +8,8 @@ defmodule BlockScoutWeb.TransactionLogControllerTest do
   alias Explorer.Chain.Address
   alias Explorer.ExchangeRates.Token
 
+  setup :verify_on_exit!
+
   describe "GET index/2" do
     test "with invalid transaction hash", %{conn: conn} do
       conn = get(conn, transaction_log_path(conn, :index, "invalid_transaction_string"))
diff --git a/apps/block_scout_web/test/block_scout_web/controllers/transaction_token_transfer_controller_test.exs b/apps/block_scout_web/test/block_scout_web/controllers/transaction_token_transfer_controller_test.exs
index 273a53286d62..1a4dd9544731 100644
--- a/apps/block_scout_web/test/block_scout_web/controllers/transaction_token_transfer_controller_test.exs
+++ b/apps/block_scout_web/test/block_scout_web/controllers/transaction_token_transfer_controller_test.exs
@@ -7,6 +7,8 @@ defmodule BlockScoutWeb.TransactionTokenTransferControllerTest do
 
   alias Explorer.ExchangeRates.Token
 
+  setup :verify_on_exit!
+
   describe "GET index/3" do
     test "load token transfers", %{conn: conn} do
       EthereumJSONRPC.Mox
diff --git a/apps/block_scout_web/test/block_scout_web/features/viewing_transactions_test.exs b/apps/block_scout_web/test/block_scout_web/features/viewing_transactions_test.exs
index 2d6eb7158305..3048d057cdb7 100644
--- a/apps/block_scout_web/test/block_scout_web/features/viewing_transactions_test.exs
+++ b/apps/block_scout_web/test/block_scout_web/features/viewing_transactions_test.exs
@@ -10,6 +10,8 @@ defmodule BlockScoutWeb.ViewingTransactionsTest do
 
   setup :set_mox_global
 
+  setup :verify_on_exit!
+
   setup do
     block =
       insert(:block, %{
diff --git a/apps/ethereum_jsonrpc/test/ethereum_jsonrpc/contract_test.exs b/apps/ethereum_jsonrpc/test/ethereum_jsonrpc/contract_test.exs
index ef2f58ed4a37..76100d469b3c 100644
--- a/apps/ethereum_jsonrpc/test/ethereum_jsonrpc/contract_test.exs
+++ b/apps/ethereum_jsonrpc/test/ethereum_jsonrpc/contract_test.exs
@@ -5,6 +5,8 @@ defmodule EthereumJSONRPC.ContractTest do
 
   import Mox
 
+  setup :verify_on_exit!
+
   describe "execute_contract_functions/3" do
     test "executes the functions with and without the block_number, returns results in order" do
       json_rpc_named_arguments = Application.get_env(:explorer, :json_rpc_named_arguments)
diff --git a/apps/ethereum_jsonrpc/test/ethereum_jsonrpc/geth_test.exs b/apps/ethereum_jsonrpc/test/ethereum_jsonrpc/geth_test.exs
index 9f3620039ae2..853a5643ae02 100644
--- a/apps/ethereum_jsonrpc/test/ethereum_jsonrpc/geth_test.exs
+++ b/apps/ethereum_jsonrpc/test/ethereum_jsonrpc/geth_test.exs
@@ -7,6 +7,8 @@ defmodule EthereumJSONRPC.GethTest do
 
   @moduletag :no_nethermind
 
+  setup :verify_on_exit!
+
   describe "fetch_internal_transactions/2" do
     # Infura Mainnet does not support debug_traceTransaction, so this cannot be tested expect in Mox
     setup do
diff --git a/apps/explorer/test/explorer/chain/address_test.exs b/apps/explorer/test/explorer/chain/address_test.exs
index 213913c766a8..5b01b27ade3d 100644
--- a/apps/explorer/test/explorer/chain/address_test.exs
+++ b/apps/explorer/test/explorer/chain/address_test.exs
@@ -6,6 +6,8 @@ defmodule Explorer.Chain.AddressTest do
   alias Explorer.Chain.Address
   alias Explorer.Repo
 
+  setup :verify_on_exit!
+
   describe "changeset/2" do
     test "with valid attributes" do
       params = params_for(:address)
diff --git a/apps/explorer/test/explorer/chain/cache/gas_price_oracle_test.exs b/apps/explorer/test/explorer/chain/cache/gas_price_oracle_test.exs
index d7004d11d0ed..55678c045ac2 100644
--- a/apps/explorer/test/explorer/chain/cache/gas_price_oracle_test.exs
+++ b/apps/explorer/test/explorer/chain/cache/gas_price_oracle_test.exs
@@ -44,6 +44,8 @@ defmodule Explorer.Chain.Cache.GasPriceOracleTest do
     "uncles" => []
   }
 
+  setup :verify_on_exit!
+
   describe "get_average_gas_price/4" do
     test "returns nil percentile values if no blocks in the DB" do
       expect(EthereumJSONRPC.Mox, :json_rpc, fn [%{id: id}], _options -> {:ok, [%{id: id, result: @block}]} end)
diff --git a/apps/explorer/test/explorer/chain/log_test.exs b/apps/explorer/test/explorer/chain/log_test.exs
index 6188903de08a..6842a6b979fb 100644
--- a/apps/explorer/test/explorer/chain/log_test.exs
+++ b/apps/explorer/test/explorer/chain/log_test.exs
@@ -11,6 +11,8 @@ defmodule Explorer.Chain.LogTest do
 
   doctest Log
 
+  setup :verify_on_exit!
+
   describe "changeset/2" do
     test "accepts valid attributes" do
       params =
diff --git a/apps/explorer/test/explorer/chain/supply/rsk_test.exs b/apps/explorer/test/explorer/chain/supply/rsk_test.exs
index a2e59294d221..5592953d5f3e 100644
--- a/apps/explorer/test/explorer/chain/supply/rsk_test.exs
+++ b/apps/explorer/test/explorer/chain/supply/rsk_test.exs
@@ -9,6 +9,8 @@ defmodule Explorer.Chain.Supply.RSKTest do
   @coin_address "0x0000000000000000000000000000000001000006"
   @mult 1_000_000_000_000_000_000
 
+  setup :verify_on_exit!
+
   test "total is 21_000_000" do
     assert Decimal.equal?(RSK.total(), Decimal.new(21_000_000))
   end
diff --git a/apps/explorer/test/explorer/chain/transaction_test.exs b/apps/explorer/test/explorer/chain/transaction_test.exs
index db2823b47ef6..d204d2822325 100644
--- a/apps/explorer/test/explorer/chain/transaction_test.exs
+++ b/apps/explorer/test/explorer/chain/transaction_test.exs
@@ -8,6 +8,8 @@ defmodule Explorer.Chain.TransactionTest do
 
   doctest Transaction
 
+  setup :verify_on_exit!
+
   describe "changeset/2" do
     test "with valid attributes" do
       assert %Changeset{valid?: true} =
diff --git a/apps/explorer/test/explorer/chain_spec/geth/importer_test.exs b/apps/explorer/test/explorer/chain_spec/geth/importer_test.exs
index a2c66455df52..e8aa80eac1ea 100644
--- a/apps/explorer/test/explorer/chain_spec/geth/importer_test.exs
+++ b/apps/explorer/test/explorer/chain_spec/geth/importer_test.exs
@@ -11,6 +11,8 @@ defmodule Explorer.ChainSpec.Geth.ImporterTest do
 
   setup :set_mox_global
 
+  setup :verify_on_exit!
+
   @geth_genesis "#{File.cwd!()}/test/support/fixture/chain_spec/qdai_genesis.json"
                 |> File.read!()
                 |> Jason.decode!()
diff --git a/apps/explorer/test/explorer/chain_spec/parity/importer_test.exs b/apps/explorer/test/explorer/chain_spec/parity/importer_test.exs
index 3f74ea550b67..e610fd661dcd 100644
--- a/apps/explorer/test/explorer/chain_spec/parity/importer_test.exs
+++ b/apps/explorer/test/explorer/chain_spec/parity/importer_test.exs
@@ -12,6 +12,8 @@ defmodule Explorer.ChainSpec.Parity.ImporterTest do
 
   setup :set_mox_global
 
+  setup :verify_on_exit!
+
   @chain_spec "#{File.cwd!()}/test/support/fixture/chain_spec/foundation.json"
               |> File.read!()
               |> Jason.decode!()

From d419fd1461cce05a8f1afd96827fdf5a49007b2d Mon Sep 17 00:00:00 2001
From: Viktor Baranov <baranov.viktor.27@gmail.com>
Date: Wed, 15 Nov 2023 15:20:35 +0300
Subject: [PATCH 660/909] Process reviewer comment

---
 .../lib/block_scout_web/views/address_view.ex  |  4 ++--
 .../lib/explorer/chain/address/name.ex         |  7 ++-----
 .../lib/explorer/chain/smart_contract.ex       |  2 +-
 .../lib/explorer/chain/smart_contract/proxy.ex | 18 +++++++++---------
 .../chain/smart_contract/proxy/basic.ex        |  7 ++++---
 .../chain/smart_contract/proxy/eip_1167.ex     | 11 +++++++++++
 .../chain/smart_contract/proxy/eip_1822.ex     |  8 ++++----
 .../chain/smart_contract/proxy/eip_1967.ex     | 10 +++++-----
 .../chain/smart_contract/proxy/eip_930.ex      |  7 ++++---
 .../chain/smart_contract/proxy/master_copy.ex  |  8 ++++----
 10 files changed, 46 insertions(+), 36 deletions(-)

diff --git a/apps/block_scout_web/lib/block_scout_web/views/address_view.ex b/apps/block_scout_web/lib/block_scout_web/views/address_view.ex
index 3884c86db8dd..af46f31ca25c 100644
--- a/apps/block_scout_web/lib/block_scout_web/views/address_view.ex
+++ b/apps/block_scout_web/lib/block_scout_web/views/address_view.ex
@@ -265,8 +265,8 @@ defmodule BlockScoutWeb.AddressView do
 
   def smart_contract_is_proxy?(address, options \\ [])
 
-  def smart_contract_is_proxy?(%Address{smart_contract: %SmartContract{} = smart_contract}, _options) do
-    Proxy.proxy_contract?(smart_contract)
+  def smart_contract_is_proxy?(%Address{smart_contract: %SmartContract{} = smart_contract}, options) do
+    Proxy.proxy_contract?(smart_contract, options)
   end
 
   def smart_contract_is_proxy?(%Address{smart_contract: _}, _), do: false
diff --git a/apps/explorer/lib/explorer/chain/address/name.ex b/apps/explorer/lib/explorer/chain/address/name.ex
index 91382eff6648..2072ca3114e8 100644
--- a/apps/explorer/lib/explorer/chain/address/name.ex
+++ b/apps/explorer/lib/explorer/chain/address/name.ex
@@ -63,10 +63,7 @@ defmodule Explorer.Chain.Address.Name do
         lock: "FOR NO KEY UPDATE"
       )
 
-    repo.update_all(
-      from(n in __MODULE__, join: s in subquery(query), on: n.address_hash == s.address_hash and n.name == s.name),
-      set: [primary: false]
-    )
+    repo.update_all(query, set: [primary: false])
 
     {:ok, []}
   end
@@ -84,7 +81,7 @@ defmodule Explorer.Chain.Address.Name do
     }
 
     %__MODULE__{}
-    |> __MODULE__.changeset(params)
+    |> changeset(params)
     |> repo.insert(on_conflict: :nothing, conflict_target: [:address_hash, :name])
   end
 
diff --git a/apps/explorer/lib/explorer/chain/smart_contract.ex b/apps/explorer/lib/explorer/chain/smart_contract.ex
index f3c69decd3f8..3773ed94640f 100644
--- a/apps/explorer/lib/explorer/chain/smart_contract.ex
+++ b/apps/explorer/lib/explorer/chain/smart_contract.ex
@@ -1068,7 +1068,7 @@ defmodule Explorer.Chain.SmartContract do
     with {:ok, implementation_address_hash} <- Chain.string_to_address_hash(address_hash_string),
          implementation_smart_contract =
            implementation_address_hash
-           |> __MODULE__.address_hash_to_smart_contract(options),
+           |> address_hash_to_smart_contract(options),
          false <- is_nil(implementation_smart_contract) do
       implementation_smart_contract
       |> Map.get(:abi)
diff --git a/apps/explorer/lib/explorer/chain/smart_contract/proxy.ex b/apps/explorer/lib/explorer/chain/smart_contract/proxy.ex
index 5fd7489ccef4..87481d89d7b8 100644
--- a/apps/explorer/lib/explorer/chain/smart_contract/proxy.ex
+++ b/apps/explorer/lib/explorer/chain/smart_contract/proxy.ex
@@ -58,15 +58,15 @@ defmodule Explorer.Chain.SmartContract.Proxy do
   @doc """
   Checks if smart-contract is proxy. Returns true/false.
   """
-  @spec proxy_contract?(SmartContract.t()) :: boolean()
-  def proxy_contract?(smart_contract) do
+  @spec proxy_contract?(SmartContract.t(), any()) :: boolean()
+  def proxy_contract?(smart_contract, options \\ []) do
     {:ok, burn_address_hash} = string_to_address_hash(SmartContract.burn_address_hash_string())
 
     if smart_contract.implementation_address_hash &&
          smart_contract.implementation_address_hash.bytes !== burn_address_hash.bytes do
       true
     else
-      {implementation_address_hash_string, _} = SmartContract.get_implementation_address_hash(smart_contract, [])
+      {implementation_address_hash_string, _} = SmartContract.get_implementation_address_hash(smart_contract, options)
 
       with false <- is_nil(implementation_address_hash_string),
            {:ok, implementation_address_hash} <- string_to_address_hash(implementation_address_hash_string),
@@ -174,21 +174,21 @@ defmodule Explorer.Chain.SmartContract.Proxy do
 
     cond do
       implementation_method_abi ->
-        Basic.get_implementation_address(@implementation_signature, proxy_address_hash, proxy_abi)
+        Basic.get_implementation_address_hash_string(@implementation_signature, proxy_address_hash, proxy_abi)
 
       get_implementation_method_abi ->
-        Basic.get_implementation_address(@get_implementation_signature, proxy_address_hash, proxy_abi)
+        Basic.get_implementation_address_hash_string(@get_implementation_signature, proxy_address_hash, proxy_abi)
 
       master_copy_method_abi ->
-        MasterCopy.get_implementation_address(proxy_address_hash)
+        MasterCopy.get_implementation_address_hash_string(proxy_address_hash)
 
       get_address_method_abi ->
-        EIP930.get_implementation_address(@get_address_signature, proxy_address_hash, proxy_abi)
+        EIP930.get_implementation_address_hash_string(@get_address_signature, proxy_address_hash, proxy_abi)
 
       true ->
-        EIP1967.get_implementation_address(proxy_address_hash) ||
+        EIP1967.get_implementation_address_hash_string(proxy_address_hash) ||
           EIP1167.get_implementation_address(proxy_address_hash) ||
-          EIP1822.get_implementation_address(proxy_address_hash)
+          EIP1822.get_implementation_address_hash_string(proxy_address_hash)
     end
   end
 
diff --git a/apps/explorer/lib/explorer/chain/smart_contract/proxy/basic.ex b/apps/explorer/lib/explorer/chain/smart_contract/proxy/basic.ex
index ed793c662b93..dc4f305900ee 100644
--- a/apps/explorer/lib/explorer/chain/smart_contract/proxy/basic.ex
+++ b/apps/explorer/lib/explorer/chain/smart_contract/proxy/basic.ex
@@ -3,13 +3,14 @@ defmodule Explorer.Chain.SmartContract.Proxy.Basic do
   Module for fetching proxy implementation from specific smart-contract getter
   """
 
+  alias Explorer.Chain.SmartContract
   alias Explorer.SmartContract.Reader
 
   @doc """
-  Gets implementation if proxy contract from getter.
+  Gets implementation hash string of proxy contract from getter.
   """
-  @spec get_implementation_address(any(), binary(), any()) :: nil | binary()
-  def get_implementation_address(signature, proxy_address_hash, abi) do
+  @spec get_implementation_address_hash_string(binary, binary, SmartContract.abi()) :: nil | binary
+  def get_implementation_address_hash_string(signature, proxy_address_hash, abi) do
     implementation_address =
       case Reader.query_contract(
              proxy_address_hash,
diff --git a/apps/explorer/lib/explorer/chain/smart_contract/proxy/eip_1167.ex b/apps/explorer/lib/explorer/chain/smart_contract/proxy/eip_1167.ex
index c76900ece45b..b7b185612018 100644
--- a/apps/explorer/lib/explorer/chain/smart_contract/proxy/eip_1167.ex
+++ b/apps/explorer/lib/explorer/chain/smart_contract/proxy/eip_1167.ex
@@ -5,6 +5,7 @@ defmodule Explorer.Chain.SmartContract.Proxy.EIP1167 do
 
   alias Explorer.Chain
   alias Explorer.Chain.{Address, Hash, SmartContract}
+  alias Explorer.Chain.SmartContract.Proxy
 
   import Ecto.Query, only: [from: 2]
 
@@ -32,6 +33,16 @@ defmodule Explorer.Chain.SmartContract.Proxy.EIP1167 do
     end
   end
 
+  @doc """
+  Get implementation address hash string following EIP-1167
+  """
+  @spec get_implementation_address_hash_string(Hash.Address.t(), Keyword.t()) :: SmartContract.t() | nil
+  def get_implementation_address_hash_string(address_hash, options \\ []) do
+    get_implementation_address(address_hash, options)
+
+    Proxy.abi_decode_address_output(address_hash)
+  end
+
   defp get_proxy_eip_1167(contract_bytecode, options) do
     case contract_bytecode do
       "363d3d373d3d3d363d73" <> <<template_address::binary-size(40)>> <> _ ->
diff --git a/apps/explorer/lib/explorer/chain/smart_contract/proxy/eip_1822.ex b/apps/explorer/lib/explorer/chain/smart_contract/proxy/eip_1822.ex
index c3da53ed8ea1..be89f8080f5c 100644
--- a/apps/explorer/lib/explorer/chain/smart_contract/proxy/eip_1822.ex
+++ b/apps/explorer/lib/explorer/chain/smart_contract/proxy/eip_1822.ex
@@ -2,17 +2,17 @@ defmodule Explorer.Chain.SmartContract.Proxy.EIP1822 do
   @moduledoc """
   Module for fetching proxy implementation from https://eips.ethereum.org/EIPS/eip-1822 Universal Upgradeable Proxy Standard (UUPS)
   """
-  alias Explorer.Chain.{Hash, SmartContract}
+  alias Explorer.Chain.Hash
   alias Explorer.Chain.SmartContract.Proxy
 
   # keccak256("PROXIABLE")
   @storage_slot_proxiable "0xc5f16f0fcc639fa48a6947836d9850f504798523bf8c9a3a87d5876cf622bcf7"
 
   @doc """
-  Get implementation address following EIP-1967
+  Get implementation address hash string following EIP-1822
   """
-  @spec get_implementation_address(Hash.Address.t()) :: SmartContract.t() | nil
-  def get_implementation_address(proxy_address_hash) do
+  @spec get_implementation_address_hash_string(Hash.Address.t()) :: nil | binary
+  def get_implementation_address_hash_string(proxy_address_hash) do
     json_rpc_named_arguments = Application.get_env(:explorer, :json_rpc_named_arguments)
 
     proxiable_contract_address_hash_string =
diff --git a/apps/explorer/lib/explorer/chain/smart_contract/proxy/eip_1967.ex b/apps/explorer/lib/explorer/chain/smart_contract/proxy/eip_1967.ex
index 125f97be55be..e94cfdf3b00e 100644
--- a/apps/explorer/lib/explorer/chain/smart_contract/proxy/eip_1967.ex
+++ b/apps/explorer/lib/explorer/chain/smart_contract/proxy/eip_1967.ex
@@ -3,7 +3,7 @@ defmodule Explorer.Chain.SmartContract.Proxy.EIP1967 do
   Module for fetching proxy implementation from https://eips.ethereum.org/EIPS/eip-1967 (Proxy Storage Slots)
   """
   alias EthereumJSONRPC.Contract
-  alias Explorer.Chain.{Hash, SmartContract}
+  alias Explorer.Chain.Hash
   alias Explorer.Chain.SmartContract.Proxy
   alias Explorer.Chain.SmartContract.Proxy.Basic
 
@@ -21,10 +21,10 @@ defmodule Explorer.Chain.SmartContract.Proxy.EIP1967 do
   @storage_slot_openzeppelin_contract_address "0x7050c9e0f4ca769c69bd3a8ef740bc37934f8e2c036e5a723fd8ee048ed3f8c3"
 
   @doc """
-  Get implementation address following EIP-1967
+  Get implementation address hash string following EIP-1967
   """
-  @spec get_implementation_address(Hash.Address.t()) :: SmartContract.t() | nil
-  def get_implementation_address(proxy_address_hash) do
+  @spec get_implementation_address_hash_string(Hash.Address.t()) :: nil | binary
+  def get_implementation_address_hash_string(proxy_address_hash) do
     json_rpc_named_arguments = Application.get_env(:explorer, :json_rpc_named_arguments)
 
     logic_contract_address_hash_string =
@@ -80,7 +80,7 @@ defmodule Explorer.Chain.SmartContract.Proxy.EIP1967 do
       {:ok, beacon_contract_address} ->
         case beacon_contract_address
              |> Proxy.abi_decode_address_output()
-             |> Basic.get_implementation_address(
+             |> Basic.get_implementation_address_hash_string(
                @implementation_signature,
                implementation_method_abi
              ) do
diff --git a/apps/explorer/lib/explorer/chain/smart_contract/proxy/eip_930.ex b/apps/explorer/lib/explorer/chain/smart_contract/proxy/eip_930.ex
index 964346df37eb..600128191aed 100644
--- a/apps/explorer/lib/explorer/chain/smart_contract/proxy/eip_930.ex
+++ b/apps/explorer/lib/explorer/chain/smart_contract/proxy/eip_930.ex
@@ -3,16 +3,17 @@ defmodule Explorer.Chain.SmartContract.Proxy.EIP930 do
   Module for fetching proxy implementation from smart-contract getter following https://github.com/ethereum/EIPs/issues/930
   """
 
+  alias Explorer.Chain.SmartContract
   alias Explorer.Chain.SmartContract.Proxy.Basic
   alias Explorer.SmartContract.Reader
 
   @storage_slot_logic_contract_address "0x360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc"
 
   @doc """
-  Gets implementation if proxy contract from getter.
+  Gets implementation hash string of proxy contract from getter.
   """
-  @spec get_implementation_address(any(), binary(), any()) :: nil | binary()
-  def get_implementation_address(signature, proxy_address_hash, abi) do
+  @spec get_implementation_address_hash_string(binary, binary, SmartContract.abi()) :: nil | binary
+  def get_implementation_address_hash_string(signature, proxy_address_hash, abi) do
     implementation_address =
       case Reader.query_contract(
              proxy_address_hash,
diff --git a/apps/explorer/lib/explorer/chain/smart_contract/proxy/master_copy.ex b/apps/explorer/lib/explorer/chain/smart_contract/proxy/master_copy.ex
index 70966ef4bba5..97b927981392 100644
--- a/apps/explorer/lib/explorer/chain/smart_contract/proxy/master_copy.ex
+++ b/apps/explorer/lib/explorer/chain/smart_contract/proxy/master_copy.ex
@@ -4,16 +4,16 @@ defmodule Explorer.Chain.SmartContract.Proxy.MasterCopy do
   """
 
   alias EthereumJSONRPC.Contract
-  alias Explorer.Chain.{Hash, SmartContract}
+  alias Explorer.Chain.Hash
   alias Explorer.Chain.SmartContract.Proxy
 
   import Explorer.Chain.SmartContract, only: [is_burn_signature: 1]
 
   @doc """
-  Gets implementation address for proxy contract from master-copy pattern
+  Gets implementation address hash string for proxy contract from master-copy pattern
   """
-  @spec get_implementation_address(Hash.Address.t()) :: SmartContract.t() | nil
-  def get_implementation_address(proxy_address_hash) do
+  @spec get_implementation_address_hash_string(Hash.Address.t()) :: nil | binary
+  def get_implementation_address_hash_string(proxy_address_hash) do
     json_rpc_named_arguments = Application.get_env(:explorer, :json_rpc_named_arguments)
 
     master_copy_storage_pointer = "0x0"

From fff31fedfbe50ae900ad036963ad88806b83649d Mon Sep 17 00:00:00 2001
From: Viktor Baranov <baranov.viktor.27@gmail.com>
Date: Wed, 15 Nov 2023 15:42:05 +0300
Subject: [PATCH 661/909] Process last reviewer comment

---
 .../lib/explorer/chain/address/name.ex        |  5 +++-
 .../chain/smart_contract/proxy/eip_1967.ex    | 24 +++++++------------
 2 files changed, 12 insertions(+), 17 deletions(-)

diff --git a/apps/explorer/lib/explorer/chain/address/name.ex b/apps/explorer/lib/explorer/chain/address/name.ex
index 2072ca3114e8..533ef2878911 100644
--- a/apps/explorer/lib/explorer/chain/address/name.ex
+++ b/apps/explorer/lib/explorer/chain/address/name.ex
@@ -63,7 +63,10 @@ defmodule Explorer.Chain.Address.Name do
         lock: "FOR NO KEY UPDATE"
       )
 
-    repo.update_all(query, set: [primary: false])
+    repo.update_all(
+      from(n in __MODULE__, join: s in subquery(query), on: n.address_hash == s.address_hash and n.name == s.name),
+      set: [primary: false]
+    )
 
     {:ok, []}
   end
diff --git a/apps/explorer/lib/explorer/chain/smart_contract/proxy/eip_1967.ex b/apps/explorer/lib/explorer/chain/smart_contract/proxy/eip_1967.ex
index e94cfdf3b00e..aea3fa39be04 100644
--- a/apps/explorer/lib/explorer/chain/smart_contract/proxy/eip_1967.ex
+++ b/apps/explorer/lib/explorer/chain/smart_contract/proxy/eip_1967.ex
@@ -27,26 +27,18 @@ defmodule Explorer.Chain.SmartContract.Proxy.EIP1967 do
   def get_implementation_address_hash_string(proxy_address_hash) do
     json_rpc_named_arguments = Application.get_env(:explorer, :json_rpc_named_arguments)
 
-    logic_contract_address_hash_string =
+    implementation_address_hash_string =
       Proxy.get_implementation_from_storage(
         proxy_address_hash,
         @storage_slot_logic_contract_address,
         json_rpc_named_arguments
-      )
-
-    beacon_contract_address_hash_string =
-      fetch_beacon_proxy_implementation(proxy_address_hash, json_rpc_named_arguments)
-
-    openzeppelin_style_contract_address_hash_string =
-      Proxy.get_implementation_from_storage(
-        proxy_address_hash,
-        @storage_slot_openzeppelin_contract_address,
-        json_rpc_named_arguments
-      )
-
-    implementation_address_hash_string =
-      logic_contract_address_hash_string || beacon_contract_address_hash_string ||
-        openzeppelin_style_contract_address_hash_string
+      ) ||
+        fetch_beacon_proxy_implementation(proxy_address_hash, json_rpc_named_arguments) ||
+        Proxy.get_implementation_from_storage(
+          proxy_address_hash,
+          @storage_slot_openzeppelin_contract_address,
+          json_rpc_named_arguments
+        )
 
     Proxy.abi_decode_address_output(implementation_address_hash_string)
   end

From f8782d04ce3af08e2914b0290e46c91ea2efd72e Mon Sep 17 00:00:00 2001
From: Nikita Pozdniakov <nikitosing4@mail.ru>
Date: Wed, 15 Nov 2023 18:19:14 +0300
Subject: [PATCH 662/909] Fix tests

---
 .../api/v2/address_controller_test.exs        |  4 +-
 .../api/v2/smart_contract_controller_test.exs | 26 +++++-----
 .../smart_contract_controller_test.exs        | 52 +++++++++----------
 ...n_internal_transaction_controller_test.exs |  7 ---
 .../transaction_log_controller_test.exs       | 12 -----
 ...saction_token_transfer_controller_test.exs | 13 -----
 .../features/viewing_transactions_test.exs    |  2 -
 .../explorer/chain/smart_contract/proxy.ex    |  2 +-
 .../chain/smart_contract/proxy/eip_1167.ex    | 49 +++++++++--------
 .../chain/cache/gas_price_oracle_test.exs     |  2 -
 .../chain/smart_contract/proxy_test.exs       | 26 ----------
 .../explorer/chain/smart_contract_test.exs    | 12 ++---
 12 files changed, 72 insertions(+), 135 deletions(-)

diff --git a/apps/block_scout_web/test/block_scout_web/controllers/api/v2/address_controller_test.exs b/apps/block_scout_web/test/block_scout_web/controllers/api/v2/address_controller_test.exs
index 186fd19b745f..d194e233177b 100644
--- a/apps/block_scout_web/test/block_scout_web/controllers/api/v2/address_controller_test.exs
+++ b/apps/block_scout_web/test/block_scout_web/controllers/api/v2/address_controller_test.exs
@@ -2681,7 +2681,7 @@ defmodule BlockScoutWeb.API.V2.AddressControllerTest do
                                                 ]
                                               },
                                               _options ->
-      {:ok, "0x0000000000000000000000000000000000000000000000000000000000000001"}
+      {:ok, "0x0000000000000000000000000000000000000000000000000000000000000000"}
     end)
     |> expect(:json_rpc, fn %{
                               id: 0,
@@ -2705,7 +2705,7 @@ defmodule BlockScoutWeb.API.V2.AddressControllerTest do
                               ]
                             },
                             _options ->
-      {:ok, "0x0000000000000000000000000000000000000000000000000000000000000000"}
+      {:ok, "0x0000000000000000000000000000000000000000000000000000000000000001"}
     end)
   end
 end
diff --git a/apps/block_scout_web/test/block_scout_web/controllers/api/v2/smart_contract_controller_test.exs b/apps/block_scout_web/test/block_scout_web/controllers/api/v2/smart_contract_controller_test.exs
index c6c713b86aeb..067ae4b08c7f 100644
--- a/apps/block_scout_web/test/block_scout_web/controllers/api/v2/smart_contract_controller_test.exs
+++ b/apps/block_scout_web/test/block_scout_web/controllers/api/v2/smart_contract_controller_test.exs
@@ -1922,8 +1922,6 @@ defmodule BlockScoutWeb.API.V2.SmartContractControllerTest do
         {:ok, "0x000000000000000000000000#{target_contract.address_hash |> to_string() |> String.replace("0x", "")}"}
       end)
 
-      request_zero_implementations()
-
       expect(
         EthereumJSONRPC.Mox,
         :json_rpc,
@@ -2034,8 +2032,6 @@ defmodule BlockScoutWeb.API.V2.SmartContractControllerTest do
         {:ok, "0x000000000000000000000000#{target_contract.address_hash |> to_string() |> String.replace("0x", "")}"}
       end)
 
-      request_zero_implementations()
-
       expect(
         EthereumJSONRPC.Mox,
         :json_rpc,
@@ -2121,8 +2117,6 @@ defmodule BlockScoutWeb.API.V2.SmartContractControllerTest do
         {:ok, "0x000000000000000000000000#{target_contract.address_hash |> to_string() |> String.replace("0x", "")}"}
       end)
 
-      request_zero_implementations()
-
       expect(
         EthereumJSONRPC.Mox,
         :json_rpc,
@@ -2192,8 +2186,6 @@ defmodule BlockScoutWeb.API.V2.SmartContractControllerTest do
         {:ok, "0x000000000000000000000000#{target_contract.address_hash |> to_string() |> String.replace("0x", "")}"}
       end)
 
-      request_zero_implementations()
-
       expect(
         EthereumJSONRPC.Mox,
         :json_rpc,
@@ -2262,8 +2254,6 @@ defmodule BlockScoutWeb.API.V2.SmartContractControllerTest do
         {:ok, "0x000000000000000000000000#{target_contract.address_hash |> to_string() |> String.replace("0x", "")}"}
       end)
 
-      request_zero_implementations()
-
       expect(
         EthereumJSONRPC.Mox,
         :json_rpc,
@@ -2356,8 +2346,6 @@ defmodule BlockScoutWeb.API.V2.SmartContractControllerTest do
         {:ok, "0x000000000000000000000000#{target_contract.address_hash |> to_string() |> String.replace("0x", "")}"}
       end)
 
-      request_zero_implementations()
-
       contract = insert(:smart_contract)
 
       request = get(conn, "/api/v2/smart-contracts/#{contract.address_hash}/methods-write-proxy")
@@ -2477,6 +2465,18 @@ defmodule BlockScoutWeb.API.V2.SmartContractControllerTest do
 
   defp request_zero_implementations do
     EthereumJSONRPC.Mox
+    |> expect(:json_rpc, fn %{
+                              id: 0,
+                              method: "eth_getStorageAt",
+                              params: [
+                                _,
+                                "0x360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc",
+                                "latest"
+                              ]
+                            },
+                            _options ->
+      {:ok, "0x0000000000000000000000000000000000000000000000000000000000000000"}
+    end)
     |> expect(:json_rpc, fn %{
                               id: 0,
                               method: "eth_getStorageAt",
@@ -2499,7 +2499,7 @@ defmodule BlockScoutWeb.API.V2.SmartContractControllerTest do
                               ]
                             },
                             _options ->
-      {:ok, "0x0000000000000000000000000000000000000000000000000000000000000000"}
+      {:ok, "0x0000000000000000000000000000000000000000000000000000000000000001"}
     end)
   end
 end
diff --git a/apps/block_scout_web/test/block_scout_web/controllers/smart_contract_controller_test.exs b/apps/block_scout_web/test/block_scout_web/controllers/smart_contract_controller_test.exs
index eb8c1973ef98..aec5f0d1d327 100644
--- a/apps/block_scout_web/test/block_scout_web/controllers/smart_contract_controller_test.exs
+++ b/apps/block_scout_web/test/block_scout_web/controllers/smart_contract_controller_test.exs
@@ -122,8 +122,6 @@ defmodule BlockScoutWeb.SmartContractControllerTest do
       )
 
       blockchain_get_implementation_mock()
-      blockchain_get_implementation_mock_empty()
-      blockchain_get_implementation_mock_empty()
 
       path =
         smart_contract_path(BlockScoutWeb.Endpoint, :index,
@@ -161,8 +159,6 @@ defmodule BlockScoutWeb.SmartContractControllerTest do
       )
 
       blockchain_get_implementation_mock_2()
-      blockchain_get_implementation_mock_empty()
-      blockchain_get_implementation_mock_empty()
 
       path =
         smart_contract_path(BlockScoutWeb.Endpoint, :index,
@@ -280,32 +276,32 @@ defmodule BlockScoutWeb.SmartContractControllerTest do
   end
 
   defp blockchain_get_implementation_mock do
-    expect(
-      EthereumJSONRPC.Mox,
-      :json_rpc,
-      fn %{id: _, method: _, params: [_, _, _]}, _options ->
-        {:ok, "0xcebb2CCCFe291F0c442841cBE9C1D06EED61Ca02"}
-      end
-    )
-  end
-
-  defp blockchain_get_implementation_mock_empty do
-    expect(
-      EthereumJSONRPC.Mox,
-      :json_rpc,
-      fn %{id: _, method: _, params: [_, _, _]}, _options ->
-        {:ok, "0x"}
-      end
-    )
+    expect(EthereumJSONRPC.Mox, :json_rpc, fn %{
+                                                id: 0,
+                                                method: "eth_getStorageAt",
+                                                params: [
+                                                  _,
+                                                  "0x360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc",
+                                                  "latest"
+                                                ]
+                                              },
+                                              _options ->
+      {:ok, "0xcebb2CCCFe291F0c442841cBE9C1D06EED61Ca02"}
+    end)
   end
 
   defp blockchain_get_implementation_mock_2 do
-    expect(
-      EthereumJSONRPC.Mox,
-      :json_rpc,
-      fn %{id: _, method: _, params: [_, _, _]}, _options ->
-        {:ok, "0x000000000000000000000000cebb2CCCFe291F0c442841cBE9C1D06EED61Ca02"}
-      end
-    )
+    expect(EthereumJSONRPC.Mox, :json_rpc, fn %{
+                                                id: 0,
+                                                method: "eth_getStorageAt",
+                                                params: [
+                                                  _,
+                                                  "0x360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc",
+                                                  "latest"
+                                                ]
+                                              },
+                                              _options ->
+      {:ok, "0x000000000000000000000000cebb2CCCFe291F0c442841cBE9C1D06EED61Ca02"}
+    end)
   end
 end
diff --git a/apps/block_scout_web/test/block_scout_web/controllers/transaction_internal_transaction_controller_test.exs b/apps/block_scout_web/test/block_scout_web/controllers/transaction_internal_transaction_controller_test.exs
index cd02afca2abb..5354d84b3563 100644
--- a/apps/block_scout_web/test/block_scout_web/controllers/transaction_internal_transaction_controller_test.exs
+++ b/apps/block_scout_web/test/block_scout_web/controllers/transaction_internal_transaction_controller_test.exs
@@ -8,8 +8,6 @@ defmodule BlockScoutWeb.TransactionInternalTransactionControllerTest do
   alias Explorer.Chain.InternalTransaction
   alias Explorer.ExchangeRates.Token
 
-  setup :verify_on_exit!
-
   describe "GET index/3" do
     test "with missing transaction", %{conn: conn} do
       hash = transaction_hash()
@@ -77,11 +75,6 @@ defmodule BlockScoutWeb.TransactionInternalTransactionControllerTest do
     end
 
     test "includes USD exchange rate value for address in assigns", %{conn: conn} do
-      EthereumJSONRPC.Mox
-      |> expect(:json_rpc, fn %{id: _id, method: "net_version", params: []}, _options ->
-        {:ok, "100"}
-      end)
-
       transaction = insert(:transaction)
 
       conn = get(conn, transaction_internal_transaction_path(BlockScoutWeb.Endpoint, :index, transaction.hash))
diff --git a/apps/block_scout_web/test/block_scout_web/controllers/transaction_log_controller_test.exs b/apps/block_scout_web/test/block_scout_web/controllers/transaction_log_controller_test.exs
index 8fd02a2bd08f..d6f9654d7631 100644
--- a/apps/block_scout_web/test/block_scout_web/controllers/transaction_log_controller_test.exs
+++ b/apps/block_scout_web/test/block_scout_web/controllers/transaction_log_controller_test.exs
@@ -8,8 +8,6 @@ defmodule BlockScoutWeb.TransactionLogControllerTest do
   alias Explorer.Chain.Address
   alias Explorer.ExchangeRates.Token
 
-  setup :verify_on_exit!
-
   describe "GET index/2" do
     test "with invalid transaction hash", %{conn: conn} do
       conn = get(conn, transaction_log_path(conn, :index, "invalid_transaction_string"))
@@ -159,11 +157,6 @@ defmodule BlockScoutWeb.TransactionLogControllerTest do
   end
 
   test "includes USD exchange rate value for address in assigns", %{conn: conn} do
-    EthereumJSONRPC.Mox
-    |> expect(:json_rpc, fn %{id: _id, method: "net_version", params: []}, _options ->
-      {:ok, "100"}
-    end)
-
     transaction = insert(:transaction)
 
     conn = get(conn, transaction_log_path(BlockScoutWeb.Endpoint, :index, transaction.hash))
@@ -172,11 +165,6 @@ defmodule BlockScoutWeb.TransactionLogControllerTest do
   end
 
   test "loads for transactions that created a contract", %{conn: conn} do
-    EthereumJSONRPC.Mox
-    |> expect(:json_rpc, fn %{id: _id, method: "net_version", params: []}, _options ->
-      {:ok, "100"}
-    end)
-
     contract_address = insert(:contract_address)
 
     transaction =
diff --git a/apps/block_scout_web/test/block_scout_web/controllers/transaction_token_transfer_controller_test.exs b/apps/block_scout_web/test/block_scout_web/controllers/transaction_token_transfer_controller_test.exs
index 1a4dd9544731..398d84dd8acd 100644
--- a/apps/block_scout_web/test/block_scout_web/controllers/transaction_token_transfer_controller_test.exs
+++ b/apps/block_scout_web/test/block_scout_web/controllers/transaction_token_transfer_controller_test.exs
@@ -11,11 +11,6 @@ defmodule BlockScoutWeb.TransactionTokenTransferControllerTest do
 
   describe "GET index/3" do
     test "load token transfers", %{conn: conn} do
-      EthereumJSONRPC.Mox
-      |> expect(:json_rpc, fn %{id: _id, method: "net_version", params: []}, _options ->
-        {:ok, "100"}
-      end)
-
       transaction = insert(:transaction)
       token_transfer = insert(:token_transfer, transaction: transaction)
 
@@ -73,11 +68,6 @@ defmodule BlockScoutWeb.TransactionTokenTransferControllerTest do
     end
 
     test "includes USD exchange rate value for address in assigns", %{conn: conn} do
-      EthereumJSONRPC.Mox
-      |> expect(:json_rpc, fn %{id: _id, method: "net_version", params: []}, _options ->
-        {:ok, "100"}
-      end)
-
       transaction = insert(:transaction)
 
       conn = get(conn, transaction_token_transfer_path(BlockScoutWeb.Endpoint, :index, transaction.hash))
@@ -215,9 +205,6 @@ defmodule BlockScoutWeb.TransactionTokenTransferControllerTest do
                               _options ->
         {:ok, "0x0000000000000000000000000000000000000000000000000000000000000000"}
       end)
-      |> expect(:json_rpc, fn %{id: _id, method: "net_version", params: []}, _options ->
-        {:ok, "100"}
-      end)
 
       transaction = insert(:transaction_to_verified_contract)
 
diff --git a/apps/block_scout_web/test/block_scout_web/features/viewing_transactions_test.exs b/apps/block_scout_web/test/block_scout_web/features/viewing_transactions_test.exs
index 3048d057cdb7..2d6eb7158305 100644
--- a/apps/block_scout_web/test/block_scout_web/features/viewing_transactions_test.exs
+++ b/apps/block_scout_web/test/block_scout_web/features/viewing_transactions_test.exs
@@ -10,8 +10,6 @@ defmodule BlockScoutWeb.ViewingTransactionsTest do
 
   setup :set_mox_global
 
-  setup :verify_on_exit!
-
   setup do
     block =
       insert(:block, %{
diff --git a/apps/explorer/lib/explorer/chain/smart_contract/proxy.ex b/apps/explorer/lib/explorer/chain/smart_contract/proxy.ex
index 87481d89d7b8..3a541ab8e7ba 100644
--- a/apps/explorer/lib/explorer/chain/smart_contract/proxy.ex
+++ b/apps/explorer/lib/explorer/chain/smart_contract/proxy.ex
@@ -187,7 +187,7 @@ defmodule Explorer.Chain.SmartContract.Proxy do
 
       true ->
         EIP1967.get_implementation_address_hash_string(proxy_address_hash) ||
-          EIP1167.get_implementation_address(proxy_address_hash) ||
+          EIP1167.get_implementation_address_hash_string(proxy_address_hash) ||
           EIP1822.get_implementation_address_hash_string(proxy_address_hash)
     end
   end
diff --git a/apps/explorer/lib/explorer/chain/smart_contract/proxy/eip_1167.ex b/apps/explorer/lib/explorer/chain/smart_contract/proxy/eip_1167.ex
index b7b185612018..9bf1bd70e4e1 100644
--- a/apps/explorer/lib/explorer/chain/smart_contract/proxy/eip_1167.ex
+++ b/apps/explorer/lib/explorer/chain/smart_contract/proxy/eip_1167.ex
@@ -14,6 +14,16 @@ defmodule Explorer.Chain.SmartContract.Proxy.EIP1167 do
   """
   @spec get_implementation_address(Hash.Address.t(), Keyword.t()) :: SmartContract.t() | nil
   def get_implementation_address(address_hash, options \\ []) do
+    address_hash
+    |> get_implementation_address_hash_string(options)
+    |> implementation_to_smart_contract(options)
+  end
+
+  @doc """
+  Get implementation address hash string following EIP-1167
+  """
+  @spec get_implementation_address_hash_string(Hash.Address.t(), Keyword.t()) :: String.t() | nil
+  def get_implementation_address_hash_string(address_hash, options \\ []) do
     case Chain.select_repo(options).get(Address, address_hash) do
       nil ->
         nil
@@ -25,7 +35,7 @@ defmodule Explorer.Chain.SmartContract.Proxy.EIP1167 do
           %Chain.Data{bytes: contract_code_bytes} ->
             contract_bytecode = Base.encode16(contract_code_bytes, case: :lower)
 
-            get_proxy_eip_1167(contract_bytecode, options)
+            contract_bytecode |> get_proxy_eip_1167() |> Proxy.abi_decode_address_output()
 
           _ ->
             nil
@@ -33,33 +43,26 @@ defmodule Explorer.Chain.SmartContract.Proxy.EIP1167 do
     end
   end
 
-  @doc """
-  Get implementation address hash string following EIP-1167
-  """
-  @spec get_implementation_address_hash_string(Hash.Address.t(), Keyword.t()) :: SmartContract.t() | nil
-  def get_implementation_address_hash_string(address_hash, options \\ []) do
-    get_implementation_address(address_hash, options)
-
-    Proxy.abi_decode_address_output(address_hash)
-  end
-
-  defp get_proxy_eip_1167(contract_bytecode, options) do
+  defp get_proxy_eip_1167(contract_bytecode) do
     case contract_bytecode do
       "363d3d373d3d3d363d73" <> <<template_address::binary-size(40)>> <> _ ->
-        template_address = "0x" <> template_address
-
-        query =
-          from(
-            smart_contract in SmartContract,
-            where: smart_contract.address_hash == ^template_address,
-            select: smart_contract
-          )
-
-        query
-        |> Chain.select_repo(options).one(timeout: 10_000)
+        "0x" <> template_address
 
       _ ->
         nil
     end
   end
+
+  defp implementation_to_smart_contract(nil, _options), do: nil
+
+  defp implementation_to_smart_contract(address_hash, options) do
+    query =
+      from(
+        smart_contract in SmartContract,
+        where: smart_contract.address_hash == ^address_hash
+      )
+
+    query
+    |> Chain.select_repo(options).one(timeout: 10_000)
+  end
 end
diff --git a/apps/explorer/test/explorer/chain/cache/gas_price_oracle_test.exs b/apps/explorer/test/explorer/chain/cache/gas_price_oracle_test.exs
index 55678c045ac2..d7004d11d0ed 100644
--- a/apps/explorer/test/explorer/chain/cache/gas_price_oracle_test.exs
+++ b/apps/explorer/test/explorer/chain/cache/gas_price_oracle_test.exs
@@ -44,8 +44,6 @@ defmodule Explorer.Chain.Cache.GasPriceOracleTest do
     "uncles" => []
   }
 
-  setup :verify_on_exit!
-
   describe "get_average_gas_price/4" do
     test "returns nil percentile values if no blocks in the DB" do
       expect(EthereumJSONRPC.Mox, :json_rpc, fn [%{id: id}], _options -> {:ok, [%{id: id, result: @block}]} end)
diff --git a/apps/explorer/test/explorer/chain/smart_contract/proxy_test.exs b/apps/explorer/test/explorer/chain/smart_contract/proxy_test.exs
index 4c96a032c1e2..d636e8967cd9 100644
--- a/apps/explorer/test/explorer/chain/smart_contract/proxy_test.exs
+++ b/apps/explorer/test/explorer/chain/smart_contract/proxy_test.exs
@@ -350,32 +350,6 @@ defmodule Explorer.Chain.SmartContract.ProxyTest do
         end
       )
 
-      EthereumJSONRPC.Mox
-      |> expect(:json_rpc, fn %{
-                                id: 0,
-                                method: "eth_getStorageAt",
-                                params: [
-                                  _,
-                                  "0xa3f0ad74e5423aebfd80d3ef4346578335a9a72aeaee59ff6cb3582b35133d50",
-                                  "latest"
-                                ]
-                              },
-                              _options ->
-        {:ok, "0x0000000000000000000000000000000000000000000000000000000000000000"}
-      end)
-      |> expect(:json_rpc, fn %{
-                                id: 0,
-                                method: "eth_getStorageAt",
-                                params: [
-                                  _,
-                                  "0x7050c9e0f4ca769c69bd3a8ef740bc37934f8e2c036e5a723fd8ee048ed3f8c3",
-                                  "latest"
-                                ]
-                              },
-                              _options ->
-        {:ok, "0x0000000000000000000000000000000000000000000000000000000000000000"}
-      end)
-
       implementation_abi = Proxy.get_implementation_abi_from_proxy(smart_contract, [])
 
       assert implementation_abi == @implementation_abi
diff --git a/apps/explorer/test/explorer/chain/smart_contract_test.exs b/apps/explorer/test/explorer/chain/smart_contract_test.exs
index 01ccba28002e..631cffe3724d 100644
--- a/apps/explorer/test/explorer/chain/smart_contract_test.exs
+++ b/apps/explorer/test/explorer/chain/smart_contract_test.exs
@@ -85,7 +85,7 @@ defmodule Explorer.Chain.SmartContractTest do
                                                   ]
                                                 },
                                                 _options ->
-        {:ok, string_implementation_address_hash}
+        {:ok, "0x0000000000000000000000000000000000000000000000000000000000000000"}
       end)
       |> expect(:json_rpc, fn %{
                                 id: 0,
@@ -109,7 +109,7 @@ defmodule Explorer.Chain.SmartContractTest do
                                 ]
                               },
                               _options ->
-        {:ok, "0x0000000000000000000000000000000000000000000000000000000000000000"}
+        {:ok, string_implementation_address_hash}
       end)
 
       assert {^string_implementation_address_hash, "proxy"} =
@@ -358,7 +358,7 @@ defmodule Explorer.Chain.SmartContractTest do
                                                 ]
                                               },
                                               _options ->
-      {:ok, "0x0000000000000000000000000000000000000000000000000000000000000001"}
+      {:ok, "0x0000000000000000000000000000000000000000000000000000000000000000"}
     end)
     |> expect(:json_rpc, fn %{
                               id: 0,
@@ -382,7 +382,7 @@ defmodule Explorer.Chain.SmartContractTest do
                               ]
                             },
                             _options ->
-      {:ok, "0x0000000000000000000000000000000000000000000000000000000000000000"}
+      {:ok, "0x0000000000000000000000000000000000000000000000000000000000000001"}
     end)
   end
 
@@ -903,7 +903,7 @@ defmodule Explorer.Chain.SmartContractTest do
                                                 ]
                                               },
                                               _options ->
-      {:ok, string_implementation_address_hash}
+      {:ok, "0x0000000000000000000000000000000000000000000000000000000000000000"}
     end)
     |> expect(:json_rpc, fn %{
                               id: 0,
@@ -927,7 +927,7 @@ defmodule Explorer.Chain.SmartContractTest do
                               ]
                             },
                             _options ->
-      {:ok, "0x0000000000000000000000000000000000000000000000000000000000000000"}
+      {:ok, string_implementation_address_hash}
     end)
   end
 end

From f22c4b50d55c7383c1b7d08d9020089c10d64063 Mon Sep 17 00:00:00 2001
From: Maxim Filonov <53992153+sl1depengwyn@users.noreply.github.com>
Date: Fri, 10 Nov 2023 12:08:13 +0300
Subject: [PATCH 663/909] Add testing for all CHAIN_TYPEs

---
 .github/workflows/config.yml                  | 73 +++++++++++++++----
 apps/explorer/lib/explorer/chain/block.ex     |  2 +-
 ...4094744_add_rootstock_fields_to_blocks.exs |  2 +-
 .../lib/indexer/fetcher/rootstock_data.ex     |  8 +-
 4 files changed, 64 insertions(+), 21 deletions(-)

diff --git a/.github/workflows/config.yml b/.github/workflows/config.yml
index 0b7346dc7b11..2d84bccc474e 100644
--- a/.github/workflows/config.yml
+++ b/.github/workflows/config.yml
@@ -27,11 +27,23 @@ on:
 
 env:
   MIX_ENV: test
-  OTP_VERSION: '25.2.1'
-  ELIXIR_VERSION: '1.14.5'
-  ACCOUNT_AUTH0_DOMAIN: 'blockscoutcom.us.auth0.com'
+  OTP_VERSION: "25.2.1"
+  ELIXIR_VERSION: "1.14.5"
+  ACCOUNT_AUTH0_DOMAIN: "blockscoutcom.us.auth0.com"
 
 jobs:
+  matrix-builder:
+    name: Build matrix
+    runs-on: ubuntu-latest
+    outputs:
+      matrix: ${{ steps.set-matrix.outputs.matrix }}
+    steps:
+      - id: set-matrix
+        run: |
+          echo "matrix=$matrixStringifiedObject" >> $GITHUB_OUTPUT
+        env:
+          matrixStringifiedObject: '{"chain-type": ["ethereum", "polygon_edge", "polygon_zkevm", "rsk", "suave", "stability"]}'
+
   build-and-cache:
     name: Build and Cache deps
     runs-on: ubuntu-latest
@@ -142,10 +154,16 @@ jobs:
             ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-"
 
       - run: mix format --check-formatted
+
   dialyzer:
+    strategy:
+      fail-fast: false
+      matrix: ${{ fromJson(needs.matrix-builder.outputs.matrix) }}
     name: Dialyzer static analysis
     runs-on: ubuntu-latest
-    needs: build-and-cache
+    needs:
+      - build-and-cache
+      - matrix-builder
     steps:
       - uses: actions/checkout@v4
       - uses: erlef/setup-beam@v1
@@ -169,18 +187,22 @@ jobs:
         id: dialyzer-cache
         with:
           path: priv/plts
-          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-dialyzer-mixlockhash_25-${{ hashFiles('mix.lock') }}
+          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-${{ matrix.chain-type }}-dialyzer-mixlockhash_25-${{ hashFiles('mix.lock') }}
           restore-keys: |
-            ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-dialyzer-"
+            ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-${{ matrix.chain-type }}-dialyzer-"
 
       - name: Conditionally build Dialyzer Cache
         if: steps.dialyzer-cache.output.cache-hit != 'true'
         run: |
           mkdir -p priv/plts
           mix dialyzer --plt
+        env:
+          CHAIN_TYPE: ${{ matrix.chain-type }}
 
       - name: Run Dialyzer
         run: mix dialyzer --halt-exit-status
+        env:
+          CHAIN_TYPE: ${{ matrix.chain-type }}
 
   gettext:
     name: Missing translation keys check
@@ -370,9 +392,14 @@ jobs:
         working-directory: apps/block_scout_web/assets
 
   test_nethermind_mox_ethereum_jsonrpc:
+    strategy:
+      fail-fast: false
+      matrix: ${{ fromJson(needs.matrix-builder.outputs.matrix) }}
     name: EthereumJSONRPC Tests
     runs-on: ubuntu-latest
-    needs: build-and-cache
+    needs:
+      - build-and-cache
+      - matrix-builder
     services:
       postgres:
         image: postgres
@@ -423,10 +450,16 @@ jobs:
           PGUSER: postgres
           ETHEREUM_JSONRPC_CASE: "EthereumJSONRPC.Case.Nethermind.Mox"
           ETHEREUM_JSONRPC_WEB_SOCKET_CASE: "EthereumJSONRPC.WebSocket.Case.Mox"
+          CHAIN_TYPE: "${{ matrix.chain-type }}"
   test_nethermind_mox_explorer:
+    strategy:
+      fail-fast: false
+      matrix: ${{ fromJson(needs.matrix-builder.outputs.matrix) }}
     name: Explorer Tests
     runs-on: ubuntu-latest
-    needs: build-and-cache
+    needs:
+      - build-and-cache
+      - matrix-builder
     services:
       postgres:
         image: postgres
@@ -488,10 +521,16 @@ jobs:
           PGUSER: postgres
           ETHEREUM_JSONRPC_CASE: "EthereumJSONRPC.Case.Nethermind.Mox"
           ETHEREUM_JSONRPC_WEB_SOCKET_CASE: "EthereumJSONRPC.WebSocket.Case.Mox"
+          CHAIN_TYPE: "${{ matrix.chain-type }}"
   test_nethermind_mox_indexer:
+    strategy:
+      fail-fast: false
+      matrix: ${{ fromJson(needs.matrix-builder.outputs.matrix) }}
     name: Indexer Tests
     runs-on: ubuntu-latest
-    needs: build-and-cache
+    needs:
+      - build-and-cache
+      - matrix-builder
     services:
       postgres:
         image: postgres
@@ -529,7 +568,6 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-"
 
-
       - run: ./bin/install_chrome_headless.sh
 
       - name: mix test --exclude no_nethermind
@@ -546,15 +584,20 @@ jobs:
           PGUSER: postgres
           ETHEREUM_JSONRPC_CASE: "EthereumJSONRPC.Case.Nethermind.Mox"
           ETHEREUM_JSONRPC_WEB_SOCKET_CASE: "EthereumJSONRPC.WebSocket.Case.Mox"
-
+          CHAIN_TYPE: "${{ matrix.chain-type }}"
   test_nethermind_mox_block_scout_web:
+    strategy:
+      fail-fast: false
+      matrix: ${{ fromJson(needs.matrix-builder.outputs.matrix) }}
     name: Blockscout Web Tests
     runs-on: ubuntu-latest
-    needs: build-and-cache
+    needs:
+      - build-and-cache
+      - matrix-builder
     services:
       redis_db:
-        image: 'redis:alpine'
-        ports: 
+        image: "redis:alpine"
+        ports:
           - 6379:6379
 
       postgres:
@@ -593,7 +636,6 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-"
 
-
       - name: Restore Explorer NPM Cache
         uses: actions/cache@v2
         id: explorer-npm-cache
@@ -638,3 +680,4 @@ jobs:
           ACCOUNT_ENABLED: "true"
           ACCOUNT_REDIS_URL: "redis://localhost:6379"
           SOURCIFY_INTEGRATION_ENABLED: "true"
+          CHAIN_TYPE: "${{ matrix.chain-type }}"
diff --git a/apps/explorer/lib/explorer/chain/block.ex b/apps/explorer/lib/explorer/chain/block.ex
index b2fa9d97f2a4..b41941fdc91f 100644
--- a/apps/explorer/lib/explorer/chain/block.ex
+++ b/apps/explorer/lib/explorer/chain/block.ex
@@ -11,7 +11,7 @@ defmodule Explorer.Chain.Block do
   alias Explorer.Chain.Block.{Reward, SecondDegreeRelation}
 
   @optional_attrs ~w(size refetch_needed total_difficulty difficulty base_fee_per_gas)a
-                  |> (&(case Application.compile_env(:explorer, :chain_type) == "rsk" do
+                  |> (&(case Application.compile_env(:explorer, :chain_type) do
                           "rsk" ->
                             &1 ++
                               ~w(minimum_gas_price bitcoin_merged_mining_header bitcoin_merged_mining_coinbase_transaction bitcoin_merged_mining_merkle_proof hash_for_merged_mining)a
diff --git a/apps/explorer/priv/rsk/migrations/20230724094744_add_rootstock_fields_to_blocks.exs b/apps/explorer/priv/rsk/migrations/20230724094744_add_rootstock_fields_to_blocks.exs
index a5ebc7c614b5..40bbbc79793b 100644
--- a/apps/explorer/priv/rsk/migrations/20230724094744_add_rootstock_fields_to_blocks.exs
+++ b/apps/explorer/priv/rsk/migrations/20230724094744_add_rootstock_fields_to_blocks.exs
@@ -1,4 +1,4 @@
-defmodule Explorer.Repo.Migrations.AddRootstockFieldsToBlocks do
+defmodule Explorer.Repo.RSK.Migrations.AddRootstockFieldsToBlocks do
   use Ecto.Migration
 
   def change do
diff --git a/apps/indexer/lib/indexer/fetcher/rootstock_data.ex b/apps/indexer/lib/indexer/fetcher/rootstock_data.ex
index dc6b0761be64..09b683e6563a 100644
--- a/apps/indexer/lib/indexer/fetcher/rootstock_data.ex
+++ b/apps/indexer/lib/indexer/fetcher/rootstock_data.ex
@@ -55,11 +55,11 @@ defmodule Indexer.Fetcher.RootstockData do
 
     state = %__MODULE__{
       blocks_to_fetch: nil,
-      interval: Application.get_env(:indexer, __MODULE__)[:interval] || @interval,
+      interval: opts[:interval] || Application.get_env(:indexer, __MODULE__)[:interval],
       json_rpc_named_arguments: json_rpc_named_arguments,
-      batch_size: Application.get_env(:indexer, __MODULE__)[:batch_size] || @batch_size,
-      max_concurrency: Application.get_env(:indexer, __MODULE__)[:max_concurrency] || @concurrency,
-      db_batch_size: Application.get_env(:indexer, __MODULE__)[:db_batch_size] || @db_batch_size
+      batch_size: opts[:batch_size] || Application.get_env(:indexer, __MODULE__)[:batch_size],
+      max_concurrency: opts[:max_concurrency] || Application.get_env(:indexer, __MODULE__)[:max_concurrency],
+      db_batch_size: opts[:db_batch_size] || Application.get_env(:indexer, __MODULE__)[:db_batch_size]
     }
 
     Process.send_after(self(), :fetch_rootstock_data, state.interval)

From cb181284e3723cd4ea241778974df1f6fb08bd34 Mon Sep 17 00:00:00 2001
From: Viktor Baranov <baranov.viktor.27@gmail.com>
Date: Wed, 15 Nov 2023 19:54:54 +0300
Subject: [PATCH 664/909] use get_smart_contract_query

---
 .../lib/explorer/chain/smart_contract.ex       | 18 +++++++++++-------
 .../chain/smart_contract/proxy/eip_1167.ex     | 11 ++---------
 2 files changed, 13 insertions(+), 16 deletions(-)

diff --git a/apps/explorer/lib/explorer/chain/smart_contract.ex b/apps/explorer/lib/explorer/chain/smart_contract.ex
index 3773ed94640f..edf9dda5441e 100644
--- a/apps/explorer/lib/explorer/chain/smart_contract.ex
+++ b/apps/explorer/lib/explorer/chain/smart_contract.ex
@@ -1082,6 +1082,17 @@ defmodule Explorer.Chain.SmartContract do
     []
   end
 
+  @doc """
+  Gets smart-contract by address hash
+  """
+  @spec get_smart_contract_query(Hash.Address.t() | binary) :: Ecto.Query.t()
+  def get_smart_contract_query(address_hash) do
+    from(
+      smart_contract in __MODULE__,
+      where: smart_contract.address_hash == ^address_hash
+    )
+  end
+
   defp upsert_contract_methods(%Changeset{changes: %{abi: abi}} = changeset) do
     ContractMethod.upsert_from_abi(abi, get_field(changeset, :address_hash))
 
@@ -1226,13 +1237,6 @@ defmodule Explorer.Chain.SmartContract do
     end
   end
 
-  defp get_smart_contract_query(address_hash) do
-    from(
-      smart_contract in __MODULE__,
-      where: smart_contract.address_hash == ^address_hash
-    )
-  end
-
   defp check_verified_with_full_match(address_hash, options) do
     smart_contract = address_hash_to_smart_contract_without_twin(address_hash, options)
 
diff --git a/apps/explorer/lib/explorer/chain/smart_contract/proxy/eip_1167.ex b/apps/explorer/lib/explorer/chain/smart_contract/proxy/eip_1167.ex
index 9bf1bd70e4e1..5095c6b17c5e 100644
--- a/apps/explorer/lib/explorer/chain/smart_contract/proxy/eip_1167.ex
+++ b/apps/explorer/lib/explorer/chain/smart_contract/proxy/eip_1167.ex
@@ -7,8 +7,6 @@ defmodule Explorer.Chain.SmartContract.Proxy.EIP1167 do
   alias Explorer.Chain.{Address, Hash, SmartContract}
   alias Explorer.Chain.SmartContract.Proxy
 
-  import Ecto.Query, only: [from: 2]
-
   @doc """
   Get implementation address following EIP-1167
   """
@@ -56,13 +54,8 @@ defmodule Explorer.Chain.SmartContract.Proxy.EIP1167 do
   defp implementation_to_smart_contract(nil, _options), do: nil
 
   defp implementation_to_smart_contract(address_hash, options) do
-    query =
-      from(
-        smart_contract in SmartContract,
-        where: smart_contract.address_hash == ^address_hash
-      )
-
-    query
+    address_hash
+    |> SmartContract.get_smart_contract_query()
     |> Chain.select_repo(options).one(timeout: 10_000)
   end
 end

From e188d83aeccf01f06bdecbc4b73ad892d90ec18c Mon Sep 17 00:00:00 2001
From: Viktor Baranov <baranov.viktor.27@gmail.com>
Date: Wed, 15 Nov 2023 21:03:07 +0300
Subject: [PATCH 665/909] Remove unused imports

---
 .../api/v2/smart_contract_controller_test.exs | 40 -------------------
 .../transaction_log_controller_test.exs       |  2 -
 2 files changed, 42 deletions(-)

diff --git a/apps/block_scout_web/test/block_scout_web/controllers/api/v2/smart_contract_controller_test.exs b/apps/block_scout_web/test/block_scout_web/controllers/api/v2/smart_contract_controller_test.exs
index 067ae4b08c7f..2164911f25f6 100644
--- a/apps/block_scout_web/test/block_scout_web/controllers/api/v2/smart_contract_controller_test.exs
+++ b/apps/block_scout_web/test/block_scout_web/controllers/api/v2/smart_contract_controller_test.exs
@@ -2462,44 +2462,4 @@ defmodule BlockScoutWeb.API.V2.SmartContractControllerTest do
         "solidity"
     end
   end
-
-  defp request_zero_implementations do
-    EthereumJSONRPC.Mox
-    |> expect(:json_rpc, fn %{
-                              id: 0,
-                              method: "eth_getStorageAt",
-                              params: [
-                                _,
-                                "0x360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc",
-                                "latest"
-                              ]
-                            },
-                            _options ->
-      {:ok, "0x0000000000000000000000000000000000000000000000000000000000000000"}
-    end)
-    |> expect(:json_rpc, fn %{
-                              id: 0,
-                              method: "eth_getStorageAt",
-                              params: [
-                                _,
-                                "0xa3f0ad74e5423aebfd80d3ef4346578335a9a72aeaee59ff6cb3582b35133d50",
-                                "latest"
-                              ]
-                            },
-                            _options ->
-      {:ok, "0x0000000000000000000000000000000000000000000000000000000000000000"}
-    end)
-    |> expect(:json_rpc, fn %{
-                              id: 0,
-                              method: "eth_getStorageAt",
-                              params: [
-                                _,
-                                "0x7050c9e0f4ca769c69bd3a8ef740bc37934f8e2c036e5a723fd8ee048ed3f8c3",
-                                "latest"
-                              ]
-                            },
-                            _options ->
-      {:ok, "0x0000000000000000000000000000000000000000000000000000000000000001"}
-    end)
-  end
 end
diff --git a/apps/block_scout_web/test/block_scout_web/controllers/transaction_log_controller_test.exs b/apps/block_scout_web/test/block_scout_web/controllers/transaction_log_controller_test.exs
index d6f9654d7631..57f8933c243c 100644
--- a/apps/block_scout_web/test/block_scout_web/controllers/transaction_log_controller_test.exs
+++ b/apps/block_scout_web/test/block_scout_web/controllers/transaction_log_controller_test.exs
@@ -1,8 +1,6 @@
 defmodule BlockScoutWeb.TransactionLogControllerTest do
   use BlockScoutWeb.ConnCase
 
-  import Mox
-
   import BlockScoutWeb.WebRouter.Helpers, only: [transaction_log_path: 3]
 
   alias Explorer.Chain.Address

From 451a1ad4b9a05467bec2b80b66d1609ebd41f044 Mon Sep 17 00:00:00 2001
From: Viktor Baranov <baranov.viktor.27@gmail.com>
Date: Wed, 15 Nov 2023 21:30:02 +0300
Subject: [PATCH 666/909] Return filling of implementation_fetched_at

---
 .../explorer/chain/smart_contract/proxy.ex    | 21 ++++++-------------
 1 file changed, 6 insertions(+), 15 deletions(-)

diff --git a/apps/explorer/lib/explorer/chain/smart_contract/proxy.ex b/apps/explorer/lib/explorer/chain/smart_contract/proxy.ex
index 3a541ab8e7ba..7c086516059a 100644
--- a/apps/explorer/lib/explorer/chain/smart_contract/proxy.ex
+++ b/apps/explorer/lib/explorer/chain/smart_contract/proxy.ex
@@ -34,21 +34,12 @@ defmodule Explorer.Chain.SmartContract.Proxy do
       when not is_nil(proxy_address_hash) and not is_nil(proxy_abi) do
     implementation_address_hash_string = get_implementation_address_hash_string(proxy_address_hash, proxy_abi)
 
-    {:ok, burn_address_hash} = string_to_address_hash(SmartContract.burn_address_hash_string())
-
-    with false <- is_nil(implementation_address_hash_string),
-         {:ok, implementation_address_hash} <- string_to_address_hash(implementation_address_hash_string),
-         false <- implementation_address_hash.bytes == burn_address_hash.bytes do
-      SmartContract.save_implementation_data(
-        implementation_address_hash_string,
-        proxy_address_hash,
-        metadata_from_verified_twin,
-        options
-      )
-    else
-      _ ->
-        {nil, nil}
-    end
+    SmartContract.save_implementation_data(
+      implementation_address_hash_string,
+      proxy_address_hash,
+      metadata_from_verified_twin,
+      options
+    )
   end
 
   def fetch_implementation_address_hash(_, _, _, _) do

From 615da7f62fb0cbc9f16192b5d6f2bb683ef2d7c0 Mon Sep 17 00:00:00 2001
From: Viktor Baranov <baranov.viktor.27@gmail.com>
Date: Wed, 15 Nov 2023 21:34:40 +0300
Subject: [PATCH 667/909] Clear cache in GA

---
 .github/workflows/config.yml | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/config.yml b/.github/workflows/config.yml
index b286c178f161..0d77db10e9c4 100644
--- a/.github/workflows/config.yml
+++ b/.github/workflows/config.yml
@@ -55,7 +55,7 @@ jobs:
           path: |
             deps
             _build
-          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_26-${{ hashFiles('mix.lock') }}
+          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_27-${{ hashFiles('mix.lock') }}
           restore-keys: |
             ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-
 
@@ -113,7 +113,7 @@ jobs:
           path: |
             deps
             _build
-          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_26-${{ hashFiles('mix.lock') }}
+          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_27-${{ hashFiles('mix.lock') }}
           restore-keys: |
             ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-"
 
@@ -137,7 +137,7 @@ jobs:
           path: |
             deps
             _build
-          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_26-${{ hashFiles('mix.lock') }}
+          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_27-${{ hashFiles('mix.lock') }}
           restore-keys: |
             ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-"
 
@@ -160,7 +160,7 @@ jobs:
           path: |
             deps
             _build
-          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_26-${{ hashFiles('mix.lock') }}
+          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_27-${{ hashFiles('mix.lock') }}
           restore-keys: |
             ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-"
 
@@ -200,7 +200,7 @@ jobs:
           path: |
             deps
             _build
-          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_26-${{ hashFiles('mix.lock') }}
+          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_27-${{ hashFiles('mix.lock') }}
           restore-keys: |
             ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-"
 
@@ -226,7 +226,7 @@ jobs:
           path: |
             deps
             _build
-          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_26-${{ hashFiles('mix.lock') }}
+          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_27-${{ hashFiles('mix.lock') }}
           restore-keys: |
             ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-"
 
@@ -255,7 +255,7 @@ jobs:
           path: |
             deps
             _build
-          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_26-${{ hashFiles('mix.lock') }}
+          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_27-${{ hashFiles('mix.lock') }}
           restore-keys: |
             ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-"
 
@@ -303,7 +303,7 @@ jobs:
           path: |
             deps
             _build
-          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_26-${{ hashFiles('mix.lock') }}
+          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_27-${{ hashFiles('mix.lock') }}
           restore-keys: |
             ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-"
 
@@ -349,7 +349,7 @@ jobs:
           path: |
             deps
             _build
-          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_26-${{ hashFiles('mix.lock') }}
+          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_27-${{ hashFiles('mix.lock') }}
           restore-keys: |
             ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-"
 
@@ -406,7 +406,7 @@ jobs:
           path: |
             deps
             _build
-          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_26-${{ hashFiles('mix.lock') }}
+          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_27-${{ hashFiles('mix.lock') }}
           restore-keys: |
             ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-"
 
@@ -460,7 +460,7 @@ jobs:
           path: |
             deps
             _build
-          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_26-${{ hashFiles('mix.lock') }}
+          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_27-${{ hashFiles('mix.lock') }}
           restore-keys: |
             ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-"
 
@@ -525,7 +525,7 @@ jobs:
           path: |
             deps
             _build
-          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_26-${{ hashFiles('mix.lock') }}
+          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_27-${{ hashFiles('mix.lock') }}
           restore-keys: |
             ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-"
 
@@ -589,7 +589,7 @@ jobs:
           path: |
             deps
             _build
-          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_26-${{ hashFiles('mix.lock') }}
+          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_27-${{ hashFiles('mix.lock') }}
           restore-keys: |
             ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-"
 

From bfa96e7c3e14282a5645212ffa58293476217218 Mon Sep 17 00:00:00 2001
From: Viktor Baranov <baranov.viktor.27@gmail.com>
Date: Wed, 15 Nov 2023 22:17:38 +0300
Subject: [PATCH 668/909] Remove unused import Mox

---
 .../transaction_internal_transaction_controller_test.exs        | 2 --
 1 file changed, 2 deletions(-)

diff --git a/apps/block_scout_web/test/block_scout_web/controllers/transaction_internal_transaction_controller_test.exs b/apps/block_scout_web/test/block_scout_web/controllers/transaction_internal_transaction_controller_test.exs
index 5354d84b3563..71deea5dbf43 100644
--- a/apps/block_scout_web/test/block_scout_web/controllers/transaction_internal_transaction_controller_test.exs
+++ b/apps/block_scout_web/test/block_scout_web/controllers/transaction_internal_transaction_controller_test.exs
@@ -1,8 +1,6 @@
 defmodule BlockScoutWeb.TransactionInternalTransactionControllerTest do
   use BlockScoutWeb.ConnCase
 
-  import Mox
-
   import BlockScoutWeb.WebRouter.Helpers, only: [transaction_internal_transaction_path: 3]
 
   alias Explorer.Chain.InternalTransaction

From 9bdee6e1905b1ba3375723e861a3b1c916374ee7 Mon Sep 17 00:00:00 2001
From: Qwerty5Uiop <alex000010@bk.ru>
Date: Thu, 16 Nov 2023 18:51:39 +0600
Subject: [PATCH 669/909] Add MainPageRealtimeEventHandler

---
 CHANGELOG.md                                  |  1 +
 .../lib/block_scout_web/application.ex        |  3 +-
 .../main_page_realtime_event_handler.ex       | 29 +++++++++++++++++++
 .../block_scout_web/realtime_event_handler.ex |  4 ---
 4 files changed, 32 insertions(+), 5 deletions(-)
 create mode 100644 apps/block_scout_web/lib/block_scout_web/main_page_realtime_event_handler.ex

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 60d07b29f92a..5eca3033373e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,7 @@
 
 ### Features
 
+- [#8848](https://github.com/blockscout/blockscout/pull/8848) - Add MainPageRealtimeEventHandler
 - [#8795](https://github.com/blockscout/blockscout/pull/8795) - Disable catchup indexer by env
 - [#8768](https://github.com/blockscout/blockscout/pull/8768) - Add possibility to search tokens by address hash
 - [#8750](https://github.com/blockscout/blockscout/pull/8750) - Support new eth-bytecode-db request metadata fields
diff --git a/apps/block_scout_web/lib/block_scout_web/application.ex b/apps/block_scout_web/lib/block_scout_web/application.ex
index 2d84cc8b101b..cb46a885761c 100644
--- a/apps/block_scout_web/lib/block_scout_web/application.ex
+++ b/apps/block_scout_web/lib/block_scout_web/application.ex
@@ -8,7 +8,7 @@ defmodule BlockScoutWeb.Application do
   alias BlockScoutWeb.API.APILogger
   alias BlockScoutWeb.Counters.{BlocksIndexedCounter, InternalTransactionsIndexedCounter}
   alias BlockScoutWeb.{Endpoint, Prometheus}
-  alias BlockScoutWeb.RealtimeEventHandler
+  alias BlockScoutWeb.{MainPageRealtimeEventHandler, RealtimeEventHandler}
 
   def start(_type, _args) do
     import Supervisor
@@ -34,6 +34,7 @@ defmodule BlockScoutWeb.Application do
       {Phoenix.PubSub, name: BlockScoutWeb.PubSub},
       child_spec(Endpoint, []),
       {Absinthe.Subscription, Endpoint},
+      {MainPageRealtimeEventHandler, name: MainPageRealtimeEventHandler},
       {RealtimeEventHandler, name: RealtimeEventHandler},
       {BlocksIndexedCounter, name: BlocksIndexedCounter},
       {InternalTransactionsIndexedCounter, name: InternalTransactionsIndexedCounter}
diff --git a/apps/block_scout_web/lib/block_scout_web/main_page_realtime_event_handler.ex b/apps/block_scout_web/lib/block_scout_web/main_page_realtime_event_handler.ex
new file mode 100644
index 000000000000..8c34538f4751
--- /dev/null
+++ b/apps/block_scout_web/lib/block_scout_web/main_page_realtime_event_handler.ex
@@ -0,0 +1,29 @@
+defmodule BlockScoutWeb.MainPageRealtimeEventHandler do
+  @moduledoc """
+  Subscribing process for main page broadcast events from realtime.
+  """
+
+  use GenServer
+
+  alias BlockScoutWeb.Notifier
+  alias Explorer.Chain.Events.Subscriber
+  alias Explorer.Counters.Helper
+
+  def start_link(_) do
+    GenServer.start_link(__MODULE__, [], name: __MODULE__)
+  end
+
+  @impl true
+  def init([]) do
+    Helper.create_cache_table(:last_broadcasted_block)
+    Subscriber.to(:blocks, :realtime)
+    Subscriber.to(:transactions, :realtime)
+    {:ok, []}
+  end
+
+  @impl true
+  def handle_info(event, state) do
+    Notifier.handle_event(event)
+    {:noreply, state}
+  end
+end
diff --git a/apps/block_scout_web/lib/block_scout_web/realtime_event_handler.ex b/apps/block_scout_web/lib/block_scout_web/realtime_event_handler.ex
index e7b590876380..3f89f6762fd3 100644
--- a/apps/block_scout_web/lib/block_scout_web/realtime_event_handler.ex
+++ b/apps/block_scout_web/lib/block_scout_web/realtime_event_handler.ex
@@ -7,7 +7,6 @@ defmodule BlockScoutWeb.RealtimeEventHandler do
 
   alias BlockScoutWeb.Notifier
   alias Explorer.Chain.Events.Subscriber
-  alias Explorer.Counters.Helper
 
   def start_link(_) do
     GenServer.start_link(__MODULE__, [], name: __MODULE__)
@@ -15,15 +14,12 @@ defmodule BlockScoutWeb.RealtimeEventHandler do
 
   @impl true
   def init([]) do
-    Helper.create_cache_table(:last_broadcasted_block)
     Subscriber.to(:address_coin_balances, :realtime)
     Subscriber.to(:addresses, :realtime)
     Subscriber.to(:block_rewards, :realtime)
-    Subscriber.to(:blocks, :realtime)
     Subscriber.to(:internal_transactions, :realtime)
     Subscriber.to(:internal_transactions, :on_demand)
     Subscriber.to(:token_transfers, :realtime)
-    Subscriber.to(:transactions, :realtime)
     Subscriber.to(:addresses, :on_demand)
     Subscriber.to(:address_coin_balances, :on_demand)
     Subscriber.to(:address_current_token_balances, :on_demand)

From 4c412aa0236b2061f8c8161769e4899ef040f06d Mon Sep 17 00:00:00 2001
From: Viktor Baranov <baranov.viktor.27@gmail.com>
Date: Thu, 16 Nov 2023 18:48:27 +0300
Subject: [PATCH 670/909] Use SmartContract.burn_address_hash_string() in
 reward.ex

---
 apps/explorer/lib/explorer/chain/block/reward.ex | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/apps/explorer/lib/explorer/chain/block/reward.ex b/apps/explorer/lib/explorer/chain/block/reward.ex
index 92897cd80848..0ec4f05e881e 100644
--- a/apps/explorer/lib/explorer/chain/block/reward.ex
+++ b/apps/explorer/lib/explorer/chain/block/reward.ex
@@ -10,12 +10,11 @@ defmodule Explorer.Chain.Block.Reward do
   alias Explorer.Chain.Block.Reward.AddressType
   alias Explorer.Chain.{Address, Block, Hash, Validator, Wei}
   alias Explorer.Chain.Fetcher.FetchValidatorInfoOnDemand
+  alias Explorer.Chain.SmartContract
   alias Explorer.SmartContract.Reader
 
   @required_attrs ~w(address_hash address_type block_hash reward)a
 
-  @burn_address_hash_string "0x0000000000000000000000000000000000000000"
-
   @get_payout_by_mining_abi %{
     "type" => "function",
     "stateMutability" => "view",
@@ -218,7 +217,7 @@ defmodule Explorer.Chain.Block.Reward do
       payout_key_hash =
         call_contract(keys_manager_contract_address, @get_payout_by_mining_abi, get_payout_by_mining_params)
 
-      if payout_key_hash == burn_address_hash_string() do
+      if payout_key_hash == SmartContract.burn_address_hash_string() do
         mining_key
       else
         choose_key(payout_key_hash, mining_key)
@@ -248,14 +247,10 @@ defmodule Explorer.Chain.Block.Reward do
 
     case Reader.query_contract(address, abi, params, false) do
       %{^method_id => {:ok, [result]}} -> result
-      _ -> burn_address_hash_string()
+      _ -> SmartContract.burn_address_hash_string()
     end
   end
 
-  defp burn_address_hash_string do
-    @burn_address_hash_string
-  end
-
   defp join_associations(query) do
     query
     |> preload(:address)

From abaab828dd65823305f2088b304be2f907f3ebb8 Mon Sep 17 00:00:00 2001
From: Nikita Pozdniakov <nikitosing4@mail.ru>
Date: Wed, 15 Nov 2023 21:25:18 +0300
Subject: [PATCH 671/909] Complete account migration to v2 path

---
 CHANGELOG.md                                  |   1 +
 .../lib/block_scout_web/api_router.ex         |  67 +-----
 .../api/{v1 => v2}/authenticate_controller.ex |   2 +-
 .../api/{v1 => v2}/email_controller.ex        |   2 +-
 .../api/{v1 => v2}/fallback_controller.ex     |   4 +-
 .../account/api/{v1 => v2}/tags_controller.ex |   2 +-
 .../account/api/{v1 => v2}/user_controller.ex |   4 +-
 .../templates/layout/app.html.eex             |   2 +-
 .../account/api/{v1 => v2}/account_view.ex    |   2 +-
 .../views/account/api/{v1 => v2}/tags_view.ex |   2 +-
 .../views/account/api/{v1 => v2}/user_view.ex |   4 +-
 .../api/{v1 => v2}/user_controller_test.exs   | 211 +++++++++---------
 .../api/v2/smart_contract_controller_test.exs |   6 +-
 13 files changed, 125 insertions(+), 184 deletions(-)
 rename apps/block_scout_web/lib/block_scout_web/controllers/account/api/{v1 => v2}/authenticate_controller.ex (93%)
 rename apps/block_scout_web/lib/block_scout_web/controllers/account/api/{v1 => v2}/email_controller.ex (97%)
 rename apps/block_scout_web/lib/block_scout_web/controllers/account/api/{v1 => v2}/fallback_controller.ex (96%)
 rename apps/block_scout_web/lib/block_scout_web/controllers/account/api/{v1 => v2}/tags_controller.ex (98%)
 rename apps/block_scout_web/lib/block_scout_web/controllers/account/api/{v1 => v2}/user_controller.ex (99%)
 rename apps/block_scout_web/lib/block_scout_web/views/account/api/{v1 => v2}/account_view.ex (65%)
 rename apps/block_scout_web/lib/block_scout_web/views/account/api/{v1 => v2}/tags_view.ex (92%)
 rename apps/block_scout_web/lib/block_scout_web/views/account/api/{v1 => v2}/user_view.ex (98%)
 rename apps/block_scout_web/test/block_scout_web/controllers/account/api/{v1 => v2}/user_controller_test.exs (86%)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 109b2901d7de..85447850e000 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -26,6 +26,7 @@
 
 ### Chore
 
+- [#8843](https://github.com/blockscout/blockscout/pull/8843) - Remove /api/account/v1 path
 - [#8832](https://github.com/blockscout/blockscout/pull/8832) - Log more details in regards 413 error
 - [#8807](https://github.com/blockscout/blockscout/pull/8807) - Smart-contract proxy detection refactoring
 - [#8802](https://github.com/blockscout/blockscout/pull/8802) - Enable API v2 by default
diff --git a/apps/block_scout_web/lib/block_scout_web/api_router.ex b/apps/block_scout_web/lib/block_scout_web/api_router.ex
index dee973786cfe..a133568f62e5 100644
--- a/apps/block_scout_web/lib/block_scout_web/api_router.ex
+++ b/apps/block_scout_web/lib/block_scout_web/api_router.ex
@@ -46,74 +46,9 @@ defmodule BlockScoutWeb.ApiRouter do
     plug(RateLimit)
   end
 
-  alias BlockScoutWeb.Account.Api.V1.{AuthenticateController, EmailController, TagsController, UserController}
+  alias BlockScoutWeb.Account.Api.V2.{AuthenticateController, EmailController, TagsController, UserController}
   alias BlockScoutWeb.API.V2
 
-  # TODO: Remove /account/v1 paths
-  scope "/account/v1", as: :account_v1 do
-    pipe_through(:api)
-    pipe_through(:account_api)
-
-    get("/authenticate", AuthenticateController, :authenticate_get)
-    post("/authenticate", AuthenticateController, :authenticate_post)
-
-    get("/get_csrf", UserController, :get_csrf)
-
-    scope "/email" do
-      get("/resend", EmailController, :resend_email)
-    end
-
-    scope "/user" do
-      get("/info", UserController, :info)
-
-      get("/watchlist", UserController, :watchlist_old)
-      delete("/watchlist/:id", UserController, :delete_watchlist)
-      post("/watchlist", UserController, :create_watchlist)
-      put("/watchlist/:id", UserController, :update_watchlist)
-
-      get("/api_keys", UserController, :api_keys)
-      delete("/api_keys/:api_key", UserController, :delete_api_key)
-      post("/api_keys", UserController, :create_api_key)
-      put("/api_keys/:api_key", UserController, :update_api_key)
-
-      get("/custom_abis", UserController, :custom_abis)
-      delete("/custom_abis/:id", UserController, :delete_custom_abi)
-      post("/custom_abis", UserController, :create_custom_abi)
-      put("/custom_abis/:id", UserController, :update_custom_abi)
-
-      get("/public_tags", UserController, :public_tags_requests)
-      delete("/public_tags/:id", UserController, :delete_public_tags_request)
-      post("/public_tags", UserController, :create_public_tags_request)
-      put("/public_tags/:id", UserController, :update_public_tags_request)
-
-      scope "/tags" do
-        get("/address/", UserController, :tags_address_old)
-        get("/address/:id", UserController, :tags_address)
-        delete("/address/:id", UserController, :delete_tag_address)
-        post("/address/", UserController, :create_tag_address)
-        put("/address/:id", UserController, :update_tag_address)
-
-        get("/transaction/", UserController, :tags_transaction_old)
-        get("/transaction/:id", UserController, :tags_transaction)
-        delete("/transaction/:id", UserController, :delete_tag_transaction)
-        post("/transaction/", UserController, :create_tag_transaction)
-        put("/transaction/:id", UserController, :update_tag_transaction)
-      end
-    end
-  end
-
-  # TODO: Remove /account/v1 paths
-  scope "/account/v1" do
-    pipe_through(:api)
-    pipe_through(:account_api)
-
-    scope "/tags" do
-      get("/address/:address_hash", TagsController, :tags_address)
-
-      get("/transaction/:transaction_hash", TagsController, :tags_transaction)
-    end
-  end
-
   scope "/account/v2", as: :account_v2 do
     pipe_through(:api)
     pipe_through(:account_api)
diff --git a/apps/block_scout_web/lib/block_scout_web/controllers/account/api/v1/authenticate_controller.ex b/apps/block_scout_web/lib/block_scout_web/controllers/account/api/v2/authenticate_controller.ex
similarity index 93%
rename from apps/block_scout_web/lib/block_scout_web/controllers/account/api/v1/authenticate_controller.ex
rename to apps/block_scout_web/lib/block_scout_web/controllers/account/api/v2/authenticate_controller.ex
index 0c16034d0217..2358fdc2cef6 100644
--- a/apps/block_scout_web/lib/block_scout_web/controllers/account/api/v1/authenticate_controller.ex
+++ b/apps/block_scout_web/lib/block_scout_web/controllers/account/api/v2/authenticate_controller.ex
@@ -1,4 +1,4 @@
-defmodule BlockScoutWeb.Account.Api.V1.AuthenticateController do
+defmodule BlockScoutWeb.Account.Api.V2.AuthenticateController do
   use BlockScoutWeb, :controller
 
   import BlockScoutWeb.Account.AuthController, only: [current_user: 1]
diff --git a/apps/block_scout_web/lib/block_scout_web/controllers/account/api/v1/email_controller.ex b/apps/block_scout_web/lib/block_scout_web/controllers/account/api/v2/email_controller.ex
similarity index 97%
rename from apps/block_scout_web/lib/block_scout_web/controllers/account/api/v1/email_controller.ex
rename to apps/block_scout_web/lib/block_scout_web/controllers/account/api/v2/email_controller.ex
index 9e79c2d33645..f93315779bb6 100644
--- a/apps/block_scout_web/lib/block_scout_web/controllers/account/api/v1/email_controller.ex
+++ b/apps/block_scout_web/lib/block_scout_web/controllers/account/api/v2/email_controller.ex
@@ -1,4 +1,4 @@
-defmodule BlockScoutWeb.Account.Api.V1.EmailController do
+defmodule BlockScoutWeb.Account.Api.V2.EmailController do
   use BlockScoutWeb, :controller
 
   alias BlockScoutWeb.Models.UserFromAuth
diff --git a/apps/block_scout_web/lib/block_scout_web/controllers/account/api/v1/fallback_controller.ex b/apps/block_scout_web/lib/block_scout_web/controllers/account/api/v2/fallback_controller.ex
similarity index 96%
rename from apps/block_scout_web/lib/block_scout_web/controllers/account/api/v1/fallback_controller.ex
rename to apps/block_scout_web/lib/block_scout_web/controllers/account/api/v2/fallback_controller.ex
index 14d44fffb3c0..a4821b23e41f 100644
--- a/apps/block_scout_web/lib/block_scout_web/controllers/account/api/v1/fallback_controller.ex
+++ b/apps/block_scout_web/lib/block_scout_web/controllers/account/api/v2/fallback_controller.ex
@@ -1,7 +1,7 @@
-defmodule BlockScoutWeb.Account.Api.V1.FallbackController do
+defmodule BlockScoutWeb.Account.Api.V2.FallbackController do
   use Phoenix.Controller
 
-  alias BlockScoutWeb.Account.Api.V1.UserView
+  alias BlockScoutWeb.Account.Api.V2.UserView
   alias Ecto.Changeset
 
   def call(conn, {:identity, _}) do
diff --git a/apps/block_scout_web/lib/block_scout_web/controllers/account/api/v1/tags_controller.ex b/apps/block_scout_web/lib/block_scout_web/controllers/account/api/v2/tags_controller.ex
similarity index 98%
rename from apps/block_scout_web/lib/block_scout_web/controllers/account/api/v1/tags_controller.ex
rename to apps/block_scout_web/lib/block_scout_web/controllers/account/api/v2/tags_controller.ex
index 3549024f905c..18765be70c45 100644
--- a/apps/block_scout_web/lib/block_scout_web/controllers/account/api/v1/tags_controller.ex
+++ b/apps/block_scout_web/lib/block_scout_web/controllers/account/api/v2/tags_controller.ex
@@ -1,4 +1,4 @@
-defmodule BlockScoutWeb.Account.Api.V1.TagsController do
+defmodule BlockScoutWeb.Account.Api.V2.TagsController do
   use BlockScoutWeb, :controller
 
   import BlockScoutWeb.Account.AuthController, only: [current_user: 1]
diff --git a/apps/block_scout_web/lib/block_scout_web/controllers/account/api/v1/user_controller.ex b/apps/block_scout_web/lib/block_scout_web/controllers/account/api/v2/user_controller.ex
similarity index 99%
rename from apps/block_scout_web/lib/block_scout_web/controllers/account/api/v1/user_controller.ex
rename to apps/block_scout_web/lib/block_scout_web/controllers/account/api/v2/user_controller.ex
index 724378cc69d6..12e9e0ab3056 100644
--- a/apps/block_scout_web/lib/block_scout_web/controllers/account/api/v1/user_controller.ex
+++ b/apps/block_scout_web/lib/block_scout_web/controllers/account/api/v2/user_controller.ex
@@ -1,4 +1,4 @@
-defmodule BlockScoutWeb.Account.Api.V1.UserController do
+defmodule BlockScoutWeb.Account.Api.V2.UserController do
   use BlockScoutWeb, :controller
 
   import BlockScoutWeb.Account.AuthController, only: [current_user: 1]
@@ -21,7 +21,7 @@ defmodule BlockScoutWeb.Account.Api.V1.UserController do
   alias Explorer.{Chain, Market, PagingOptions, Repo}
   alias Plug.CSRFProtection
 
-  action_fallback(BlockScoutWeb.Account.Api.V1.FallbackController)
+  action_fallback(BlockScoutWeb.Account.Api.V2.FallbackController)
 
   @ok_message "OK"
   @token_balances_amount 150
diff --git a/apps/block_scout_web/lib/block_scout_web/templates/layout/app.html.eex b/apps/block_scout_web/lib/block_scout_web/templates/layout/app.html.eex
index d07b77ca9e14..2481992ea493 100644
--- a/apps/block_scout_web/lib/block_scout_web/templates/layout/app.html.eex
+++ b/apps/block_scout_web/lib/block_scout_web/templates/layout/app.html.eex
@@ -94,7 +94,7 @@
       <% session = Explorer.Account.enabled?() && Plug.Conn.get_session(@conn, :current_user) %>
       <%= render BlockScoutWeb.LayoutView, "_topnav.html", current_user: session, conn: @conn %>
       <%= if session && !session[:email_verified] do %>
-        <p class="alert alert-warning" role="alert" style="margin-bottom: 0"><%= gettext("Please confirm your email address to use the My Account feature.") %> <%= gettext("A confirmation email was sent to") %> <a href="mailto:<%= session[:email] %>"><%=session[:email] %></a> <%= gettext "on sign up. Didn’t receive?" %> <a href="/api/account/v1/email/resend" class="ajax"><%= gettext "Resend verification email" %></a>.</p>
+        <p class="alert alert-warning" role="alert" style="margin-bottom: 0"><%= gettext("Please confirm your email address to use the My Account feature.") %> <%= gettext("A confirmation email was sent to") %> <a href="mailto:<%= session[:email] %>"><%=session[:email] %></a> <%= gettext "on sign up. Didn’t receive?" %> <a href="/api/account/v2/email/resend" class="ajax"><%= gettext "Resend verification email" %></a>.</p>
       <% else %>
         <p class="alert alert-info" role="alert"><%= get_flash(@conn, :info) %></p>
       <% end %>
diff --git a/apps/block_scout_web/lib/block_scout_web/views/account/api/v1/account_view.ex b/apps/block_scout_web/lib/block_scout_web/views/account/api/v2/account_view.ex
similarity index 65%
rename from apps/block_scout_web/lib/block_scout_web/views/account/api/v1/account_view.ex
rename to apps/block_scout_web/lib/block_scout_web/views/account/api/v2/account_view.ex
index 0e3a65e61653..632b3109501f 100644
--- a/apps/block_scout_web/lib/block_scout_web/views/account/api/v1/account_view.ex
+++ b/apps/block_scout_web/lib/block_scout_web/views/account/api/v2/account_view.ex
@@ -1,4 +1,4 @@
-defmodule BlockScoutWeb.Account.Api.V1.AccountView do
+defmodule BlockScoutWeb.Account.Api.V2.AccountView do
   def render("message.json", %{message: message}) do
     %{
       "message" => message
diff --git a/apps/block_scout_web/lib/block_scout_web/views/account/api/v1/tags_view.ex b/apps/block_scout_web/lib/block_scout_web/views/account/api/v2/tags_view.ex
similarity index 92%
rename from apps/block_scout_web/lib/block_scout_web/views/account/api/v1/tags_view.ex
rename to apps/block_scout_web/lib/block_scout_web/views/account/api/v2/tags_view.ex
index d97e35f9145b..80670000d2e6 100644
--- a/apps/block_scout_web/lib/block_scout_web/views/account/api/v1/tags_view.ex
+++ b/apps/block_scout_web/lib/block_scout_web/views/account/api/v2/tags_view.ex
@@ -1,4 +1,4 @@
-defmodule BlockScoutWeb.Account.Api.V1.TagsView do
+defmodule BlockScoutWeb.Account.Api.V2.TagsView do
   def render("address_tags.json", %{tags_map: tags_map}) do
     tags_map
   end
diff --git a/apps/block_scout_web/lib/block_scout_web/views/account/api/v1/user_view.ex b/apps/block_scout_web/lib/block_scout_web/views/account/api/v2/user_view.ex
similarity index 98%
rename from apps/block_scout_web/lib/block_scout_web/views/account/api/v1/user_view.ex
rename to apps/block_scout_web/lib/block_scout_web/views/account/api/v2/user_view.ex
index 26c8d7c8295b..96974a909218 100644
--- a/apps/block_scout_web/lib/block_scout_web/views/account/api/v1/user_view.ex
+++ b/apps/block_scout_web/lib/block_scout_web/views/account/api/v2/user_view.ex
@@ -1,5 +1,5 @@
-defmodule BlockScoutWeb.Account.Api.V1.UserView do
-  alias BlockScoutWeb.Account.Api.V1.AccountView
+defmodule BlockScoutWeb.Account.Api.V2.UserView do
+  alias BlockScoutWeb.Account.Api.V2.AccountView
   alias BlockScoutWeb.API.V2.Helper
   alias Ecto.Changeset
   alias Explorer.Chain
diff --git a/apps/block_scout_web/test/block_scout_web/controllers/account/api/v1/user_controller_test.exs b/apps/block_scout_web/test/block_scout_web/controllers/account/api/v2/user_controller_test.exs
similarity index 86%
rename from apps/block_scout_web/test/block_scout_web/controllers/account/api/v1/user_controller_test.exs
rename to apps/block_scout_web/test/block_scout_web/controllers/account/api/v2/user_controller_test.exs
index f32b5727e727..a4bc4dffe4a9 100644
--- a/apps/block_scout_web/test/block_scout_web/controllers/account/api/v1/user_controller_test.exs
+++ b/apps/block_scout_web/test/block_scout_web/controllers/account/api/v2/user_controller_test.exs
@@ -1,4 +1,4 @@
-defmodule BlockScoutWeb.Account.Api.V1.UserControllerTest do
+defmodule BlockScoutWeb.Account.Api.V2.UserControllerTest do
   use BlockScoutWeb.ConnCase
 
   alias Explorer.Account.{
@@ -19,11 +19,11 @@ defmodule BlockScoutWeb.Account.Api.V1.UserControllerTest do
     {:ok, user: user, conn: Plug.Test.init_test_session(conn, current_user: user)}
   end
 
-  describe "Test account/api/v1/user" do
+  describe "Test account/api/v2/user" do
     test "get user info", %{conn: conn, user: user} do
       result_conn =
         conn
-        |> get("/api/account/v1/user/info")
+        |> get("/api/account/v2/user/info")
         |> doc(description: "Get info about user")
 
       assert json_response(result_conn, 200) == %{
@@ -37,7 +37,7 @@ defmodule BlockScoutWeb.Account.Api.V1.UserControllerTest do
     test "post private address tag", %{conn: conn} do
       tag_address_response =
         conn
-        |> post("/api/account/v1/user/tags/address", %{
+        |> post("/api/account/v2/user/tags/address", %{
           "address_hash" => "0x3e9ac8f16c92bc4f093357933b5befbf1e16987b",
           "name" => "MyName"
         })
@@ -45,7 +45,7 @@ defmodule BlockScoutWeb.Account.Api.V1.UserControllerTest do
         |> json_response(200)
 
       conn
-      |> get("/api/account/v1/tags/address/0x3e9ac8f16c92bc4f093357933b5befbf1e16987b")
+      |> get("/api/account/v2/tags/address/0x3e9ac8f16c92bc4f093357933b5befbf1e16987b")
       |> doc(description: "Get tags for address")
       |> json_response(200)
 
@@ -69,11 +69,11 @@ defmodule BlockScoutWeb.Account.Api.V1.UserControllerTest do
       end
 
       assert conn
-             |> post("/api/account/v1/user/tags/address", build(:tag_address))
+             |> post("/api/account/v2/user/tags/address", build(:tag_address))
              |> json_response(200)
 
       assert conn
-             |> post("/api/account/v1/user/tags/address", build(:tag_address))
+             |> post("/api/account/v2/user/tags/address", build(:tag_address))
              |> json_response(422)
 
       Application.put_env(:explorer, Explorer.Account, old_env)
@@ -103,12 +103,12 @@ defmodule BlockScoutWeb.Account.Api.V1.UserControllerTest do
 
       tag_address_response =
         conn
-        |> post("/api/account/v1/user/tags/address", address_tag)
+        |> post("/api/account/v2/user/tags/address", address_tag)
         |> json_response(200)
 
       _response =
         conn
-        |> get("/api/account/v1/user/tags/address")
+        |> get("/api/account/v2/user/tags/address")
         |> json_response(200) == [tag_address_response]
 
       assert tag_address_response["address_hash"] == address_tag["address_hash"]
@@ -119,7 +119,7 @@ defmodule BlockScoutWeb.Account.Api.V1.UserControllerTest do
 
       new_tag_address_response =
         conn
-        |> put("/api/account/v1/user/tags/address/#{tag_address_response["id"]}", new_address_tag)
+        |> put("/api/account/v2/user/tags/address/#{tag_address_response["id"]}", new_address_tag)
         |> doc(description: "Edit private address tag")
         |> json_response(200)
 
@@ -137,7 +137,7 @@ defmodule BlockScoutWeb.Account.Api.V1.UserControllerTest do
         Enum.map(zipped, fn {addr, name} ->
           id =
             (conn
-             |> post("/api/account/v1/user/tags/address", %{
+             |> post("/api/account/v2/user/tags/address", %{
                "address_hash" => addr,
                "name" => name
              })
@@ -164,7 +164,7 @@ defmodule BlockScoutWeb.Account.Api.V1.UserControllerTest do
       assert Enum.all?(created, fn {addr, map_tag, _} ->
                response =
                  conn
-                 |> get("/api/account/v1/tags/address/#{addr}")
+                 |> get("/api/account/v2/tags/address/#{addr}")
                  |> json_response(200)
 
                response["personal_tags"] == [map_tag]
@@ -172,9 +172,10 @@ defmodule BlockScoutWeb.Account.Api.V1.UserControllerTest do
 
       response =
         conn
-        |> get("/api/account/v1/user/tags/address")
+        |> get("/api/account/v2/user/tags/address")
         |> doc(description: "Get private addresses tags")
         |> json_response(200)
+        |> Map.get("items")
 
       assert Enum.all?(created, fn {_, _, map} -> map in response end)
     end
@@ -188,7 +189,7 @@ defmodule BlockScoutWeb.Account.Api.V1.UserControllerTest do
         Enum.map(zipped, fn {addr, name} ->
           id =
             (conn
-             |> post("/api/account/v1/user/tags/address", %{
+             |> post("/api/account/v2/user/tags/address", %{
                "address_hash" => addr,
                "name" => name
              })
@@ -215,7 +216,7 @@ defmodule BlockScoutWeb.Account.Api.V1.UserControllerTest do
       assert Enum.all?(created, fn {addr, map_tag, _} ->
                response =
                  conn
-                 |> get("/api/account/v1/tags/address/#{addr}")
+                 |> get("/api/account/v2/tags/address/#{addr}")
                  |> json_response(200)
 
                response["personal_tags"] == [map_tag]
@@ -223,32 +224,31 @@ defmodule BlockScoutWeb.Account.Api.V1.UserControllerTest do
 
       response =
         conn
-        |> get("/api/account/v1/user/tags/address")
+        |> get("/api/account/v2/user/tags/address")
         |> json_response(200)
+        |> Map.get("items")
 
       assert Enum.all?(created, fn {_, _, map} -> map in response end)
 
       {_, _, %{"id" => id}} = Enum.at(created, 0)
 
       assert conn
-             |> delete("/api/account/v1/user/tags/address/#{id}")
+             |> delete("/api/account/v2/user/tags/address/#{id}")
              |> doc("Delete private address tag")
              |> json_response(200) == %{"message" => "OK"}
 
       assert Enum.all?(Enum.drop(created, 1), fn {_, _, %{"id" => id}} ->
                conn
-               |> delete("/api/account/v1/user/tags/address/#{id}")
+               |> delete("/api/account/v2/user/tags/address/#{id}")
                |> json_response(200) == %{"message" => "OK"}
              end)
 
-      assert conn
-             |> get("/api/account/v1/user/tags/address")
-             |> json_response(200) == []
+      assert conn |> get("/api/account/v2/user/tags/address") |> json_response(200) |> Map.get("items") == []
 
       assert Enum.all?(created, fn {addr, _, _} ->
                response =
                  conn
-                 |> get("/api/account/v1/tags/address/#{addr}")
+                 |> get("/api/account/v2/tags/address/#{addr}")
                  |> json_response(200)
 
                response["personal_tags"] == []
@@ -260,7 +260,7 @@ defmodule BlockScoutWeb.Account.Api.V1.UserControllerTest do
       tx_hash = to_string(insert(:transaction).hash)
 
       assert conn
-             |> post("/api/account/v1/user/tags/transaction", %{
+             |> post("/api/account/v2/user/tags/transaction", %{
                "transaction_hash" => tx_hash_non_existing,
                "name" => "MyName"
              })
@@ -269,7 +269,7 @@ defmodule BlockScoutWeb.Account.Api.V1.UserControllerTest do
 
       tag_transaction_response =
         conn
-        |> post("/api/account/v1/user/tags/transaction", %{
+        |> post("/api/account/v2/user/tags/transaction", %{
           "transaction_hash" => tx_hash,
           "name" => "MyName"
         })
@@ -277,7 +277,7 @@ defmodule BlockScoutWeb.Account.Api.V1.UserControllerTest do
         |> json_response(200)
 
       conn
-      |> get("/api/account/v1/tags/transaction/#{tx_hash}")
+      |> get("/api/account/v2/tags/transaction/#{tx_hash}")
       |> doc(description: "Get tags for transaction")
       |> json_response(200)
 
@@ -301,11 +301,11 @@ defmodule BlockScoutWeb.Account.Api.V1.UserControllerTest do
       end
 
       assert conn
-             |> post("/api/account/v1/user/tags/transaction", build(:tag_transaction))
+             |> post("/api/account/v2/user/tags/transaction", build(:tag_transaction))
              |> json_response(200)
 
       assert conn
-             |> post("/api/account/v1/user/tags/transaction", build(:tag_transaction))
+             |> post("/api/account/v2/user/tags/transaction", build(:tag_transaction))
              |> json_response(422)
 
       Application.put_env(:explorer, Explorer.Account, old_env)
@@ -335,12 +335,12 @@ defmodule BlockScoutWeb.Account.Api.V1.UserControllerTest do
 
       tag_response =
         conn
-        |> post("/api/account/v1/user/tags/transaction", tx_tag)
+        |> post("/api/account/v2/user/tags/transaction", tx_tag)
         |> json_response(200)
 
       _response =
         conn
-        |> get("/api/account/v1/user/tags/transaction")
+        |> get("/api/account/v2/user/tags/transaction")
         |> json_response(200) == [tag_response]
 
       assert tag_response["address_hash"] == tx_tag["address_hash"]
@@ -351,7 +351,7 @@ defmodule BlockScoutWeb.Account.Api.V1.UserControllerTest do
 
       new_tag_response =
         conn
-        |> put("/api/account/v1/user/tags/transaction/#{tag_response["id"]}", new_tx_tag)
+        |> put("/api/account/v2/user/tags/transaction/#{tag_response["id"]}", new_tx_tag)
         |> doc(description: "Edit private transaction tag")
         |> json_response(200)
 
@@ -369,7 +369,7 @@ defmodule BlockScoutWeb.Account.Api.V1.UserControllerTest do
         Enum.map(zipped, fn {tx_hash, name} ->
           id =
             (conn
-             |> post("/api/account/v1/user/tags/transaction", %{
+             |> post("/api/account/v2/user/tags/transaction", %{
                "transaction_hash" => tx_hash,
                "name" => name
              })
@@ -381,7 +381,7 @@ defmodule BlockScoutWeb.Account.Api.V1.UserControllerTest do
       assert Enum.all?(created, fn {tx_hash, map_tag, _} ->
                response =
                  conn
-                 |> get("/api/account/v1/tags/transaction/#{tx_hash}")
+                 |> get("/api/account/v2/tags/transaction/#{tx_hash}")
                  |> json_response(200)
 
                response["personal_tx_tag"] == map_tag
@@ -389,9 +389,10 @@ defmodule BlockScoutWeb.Account.Api.V1.UserControllerTest do
 
       response =
         conn
-        |> get("/api/account/v1/user/tags/transaction")
+        |> get("/api/account/v2/user/tags/transaction")
         |> doc(description: "Get private transactions tags")
         |> json_response(200)
+        |> Map.get("items")
 
       assert Enum.all?(created, fn {_, _, map} -> map in response end)
     end
@@ -405,7 +406,7 @@ defmodule BlockScoutWeb.Account.Api.V1.UserControllerTest do
         Enum.map(zipped, fn {tx_hash, name} ->
           id =
             (conn
-             |> post("/api/account/v1/user/tags/transaction", %{
+             |> post("/api/account/v2/user/tags/transaction", %{
                "transaction_hash" => tx_hash,
                "name" => name
              })
@@ -417,15 +418,15 @@ defmodule BlockScoutWeb.Account.Api.V1.UserControllerTest do
       assert Enum.all?(created, fn {tx_hash, map_tag, _} ->
                response =
                  conn
-                 |> get("/api/account/v1/tags/transaction/#{tx_hash}")
+                 |> get("/api/account/v2/tags/transaction/#{tx_hash}")
                  |> json_response(200)
 
                response["personal_tx_tag"] == map_tag
              end)
 
-      response =
+      %{"items" => response, "next_page_params" => nil} =
         conn
-        |> get("/api/account/v1/user/tags/transaction")
+        |> get("/api/account/v2/user/tags/transaction")
         |> json_response(200)
 
       assert Enum.all?(created, fn {_, _, map} -> map in response end)
@@ -433,24 +434,24 @@ defmodule BlockScoutWeb.Account.Api.V1.UserControllerTest do
       {_, _, %{"id" => id}} = Enum.at(created, 0)
 
       assert conn
-             |> delete("/api/account/v1/user/tags/transaction/#{id}")
+             |> delete("/api/account/v2/user/tags/transaction/#{id}")
              |> doc("Delete private transaction tag")
              |> json_response(200) == %{"message" => "OK"}
 
       assert Enum.all?(Enum.drop(created, 1), fn {_, _, %{"id" => id}} ->
                conn
-               |> delete("/api/account/v1/user/tags/transaction/#{id}")
+               |> delete("/api/account/v2/user/tags/transaction/#{id}")
                |> json_response(200) == %{"message" => "OK"}
              end)
 
       assert conn
-             |> get("/api/account/v1/user/tags/transaction")
-             |> json_response(200) == []
+             |> get("/api/account/v2/user/tags/transaction")
+             |> json_response(200) == %{"items" => [], "next_page_params" => nil}
 
       assert Enum.all?(created, fn {addr, _, _} ->
                response =
                  conn
-                 |> get("/api/account/v1/tags/transaction/#{addr}")
+                 |> get("/api/account/v2/tags/transaction/#{addr}")
                  |> json_response(200)
 
                response["personal_tx_tag"] == nil
@@ -463,7 +464,7 @@ defmodule BlockScoutWeb.Account.Api.V1.UserControllerTest do
       post_watchlist_address_response =
         conn
         |> post(
-          "/api/account/v1/user/watchlist",
+          "/api/account/v2/user/watchlist",
           watchlist_address_map
         )
         |> doc(description: "Add address to watch list")
@@ -474,7 +475,8 @@ defmodule BlockScoutWeb.Account.Api.V1.UserControllerTest do
       assert post_watchlist_address_response["notification_methods"] == watchlist_address_map["notification_methods"]
       assert post_watchlist_address_response["address_hash"] == watchlist_address_map["address_hash"]
 
-      get_watchlist_address_response = conn |> get("/api/account/v1/user/watchlist") |> json_response(200) |> Enum.at(0)
+      get_watchlist_address_response =
+        conn |> get("/api/account/v2/user/watchlist") |> json_response(200) |> Map.get("items") |> Enum.at(0)
 
       assert get_watchlist_address_response["notification_settings"] == watchlist_address_map["notification_settings"]
       assert get_watchlist_address_response["name"] == watchlist_address_map["name"]
@@ -487,20 +489,21 @@ defmodule BlockScoutWeb.Account.Api.V1.UserControllerTest do
       post_watchlist_address_response_1 =
         conn
         |> post(
-          "/api/account/v1/user/watchlist",
+          "/api/account/v2/user/watchlist",
           watchlist_address_map_1
         )
         |> json_response(200)
 
       get_watchlist_address_response_1_0 =
         conn
-        |> get("/api/account/v1/user/watchlist")
+        |> get("/api/account/v2/user/watchlist")
         |> doc(description: "Get addresses from watchlists")
         |> json_response(200)
+        |> Map.get("items")
         |> Enum.at(1)
 
       get_watchlist_address_response_1_1 =
-        conn |> get("/api/account/v1/user/watchlist") |> json_response(200) |> Enum.at(0)
+        conn |> get("/api/account/v2/user/watchlist") |> json_response(200) |> Map.get("items") |> Enum.at(0)
 
       assert get_watchlist_address_response_1_0 == get_watchlist_address_response
 
@@ -531,11 +534,11 @@ defmodule BlockScoutWeb.Account.Api.V1.UserControllerTest do
       end
 
       assert conn
-             |> post("/api/account/v1/user/watchlist", build(:watchlist_address))
+             |> post("/api/account/v2/user/watchlist", build(:watchlist_address))
              |> json_response(200)
 
       assert conn
-             |> post("/api/account/v1/user/watchlist", build(:watchlist_address))
+             |> post("/api/account/v2/user/watchlist", build(:watchlist_address))
              |> json_response(422)
 
       Application.put_env(:explorer, Explorer.Account, old_env)
@@ -566,7 +569,7 @@ defmodule BlockScoutWeb.Account.Api.V1.UserControllerTest do
       post_watchlist_address_response =
         conn
         |> post(
-          "/api/account/v1/user/watchlist",
+          "/api/account/v2/user/watchlist",
           watchlist_address_map
         )
         |> json_response(200)
@@ -576,7 +579,8 @@ defmodule BlockScoutWeb.Account.Api.V1.UserControllerTest do
       assert post_watchlist_address_response["notification_methods"] == watchlist_address_map["notification_methods"]
       assert post_watchlist_address_response["address_hash"] == watchlist_address_map["address_hash"]
 
-      get_watchlist_address_response = conn |> get("/api/account/v1/user/watchlist") |> json_response(200) |> Enum.at(0)
+      get_watchlist_address_response =
+        conn |> get("/api/account/v2/user/watchlist") |> json_response(200) |> Map.get("items") |> Enum.at(0)
 
       assert get_watchlist_address_response["notification_settings"] == watchlist_address_map["notification_settings"]
       assert get_watchlist_address_response["name"] == watchlist_address_map["name"]
@@ -589,16 +593,16 @@ defmodule BlockScoutWeb.Account.Api.V1.UserControllerTest do
       post_watchlist_address_response_1 =
         conn
         |> post(
-          "/api/account/v1/user/watchlist",
+          "/api/account/v2/user/watchlist",
           watchlist_address_map_1
         )
         |> json_response(200)
 
       get_watchlist_address_response_1_0 =
-        conn |> get("/api/account/v1/user/watchlist") |> json_response(200) |> Enum.at(1)
+        conn |> get("/api/account/v2/user/watchlist") |> json_response(200) |> Map.get("items") |> Enum.at(1)
 
       get_watchlist_address_response_1_1 =
-        conn |> get("/api/account/v1/user/watchlist") |> json_response(200) |> Enum.at(0)
+        conn |> get("/api/account/v2/user/watchlist") |> json_response(200) |> Map.get("items") |> Enum.at(0)
 
       assert get_watchlist_address_response_1_0 == get_watchlist_address_response
 
@@ -614,15 +618,15 @@ defmodule BlockScoutWeb.Account.Api.V1.UserControllerTest do
       assert get_watchlist_address_response_1_1["id"] == post_watchlist_address_response_1["id"]
 
       assert conn
-             |> delete("/api/account/v1/user/watchlist/#{get_watchlist_address_response_1_1["id"]}")
+             |> delete("/api/account/v2/user/watchlist/#{get_watchlist_address_response_1_1["id"]}")
              |> doc(description: "Delete address from watchlist by id")
              |> json_response(200) == %{"message" => "OK"}
 
       assert conn
-             |> delete("/api/account/v1/user/watchlist/#{get_watchlist_address_response_1_0["id"]}")
+             |> delete("/api/account/v2/user/watchlist/#{get_watchlist_address_response_1_0["id"]}")
              |> json_response(200) == %{"message" => "OK"}
 
-      assert conn |> get("/api/account/v1/user/watchlist") |> json_response(200) == []
+      assert conn |> get("/api/account/v2/user/watchlist") |> json_response(200) |> Map.get("items") == []
     end
 
     test "put watchlist address", %{conn: conn} do
@@ -631,7 +635,7 @@ defmodule BlockScoutWeb.Account.Api.V1.UserControllerTest do
       post_watchlist_address_response =
         conn
         |> post(
-          "/api/account/v1/user/watchlist",
+          "/api/account/v2/user/watchlist",
           watchlist_address_map
         )
         |> json_response(200)
@@ -641,7 +645,8 @@ defmodule BlockScoutWeb.Account.Api.V1.UserControllerTest do
       assert post_watchlist_address_response["notification_methods"] == watchlist_address_map["notification_methods"]
       assert post_watchlist_address_response["address_hash"] == watchlist_address_map["address_hash"]
 
-      get_watchlist_address_response = conn |> get("/api/account/v1/user/watchlist") |> json_response(200) |> Enum.at(0)
+      get_watchlist_address_response =
+        conn |> get("/api/account/v2/user/watchlist") |> json_response(200) |> Map.get("items") |> Enum.at(0)
 
       assert get_watchlist_address_response["notification_settings"] == watchlist_address_map["notification_settings"]
       assert get_watchlist_address_response["name"] == watchlist_address_map["name"]
@@ -654,7 +659,7 @@ defmodule BlockScoutWeb.Account.Api.V1.UserControllerTest do
       put_watchlist_address_response =
         conn
         |> put(
-          "/api/account/v1/user/watchlist/#{post_watchlist_address_response["id"]}",
+          "/api/account/v2/user/watchlist/#{post_watchlist_address_response["id"]}",
           new_watchlist_address_map
         )
         |> doc(description: "Edit watchlist address")
@@ -675,7 +680,7 @@ defmodule BlockScoutWeb.Account.Api.V1.UserControllerTest do
       post_watchlist_address_response =
         conn
         |> post(
-          "/api/account/v1/user/watchlist",
+          "/api/account/v2/user/watchlist",
           watchlist_address_map
         )
         |> json_response(200)
@@ -687,7 +692,7 @@ defmodule BlockScoutWeb.Account.Api.V1.UserControllerTest do
 
       assert conn
              |> post(
-               "/api/account/v1/user/watchlist",
+               "/api/account/v2/user/watchlist",
                watchlist_address_map
              )
              |> doc(description: "Example of error on creating watchlist address")
@@ -698,14 +703,14 @@ defmodule BlockScoutWeb.Account.Api.V1.UserControllerTest do
       post_watchlist_address_response_1 =
         conn
         |> post(
-          "/api/account/v1/user/watchlist",
+          "/api/account/v2/user/watchlist",
           new_watchlist_address_map
         )
         |> json_response(200)
 
       assert conn
              |> put(
-               "/api/account/v1/user/watchlist/#{post_watchlist_address_response_1["id"]}",
+               "/api/account/v2/user/watchlist/#{post_watchlist_address_response_1["id"]}",
                watchlist_address_map
              )
              |> doc(description: "Example of error on editing watchlist address")
@@ -717,7 +722,7 @@ defmodule BlockScoutWeb.Account.Api.V1.UserControllerTest do
 
       conn
       |> post(
-        "/api/account/v1/user/watchlist",
+        "/api/account/v2/user/watchlist",
         watchlist_address_map
       )
       |> json_response(200)
@@ -726,7 +731,7 @@ defmodule BlockScoutWeb.Account.Api.V1.UserControllerTest do
 
       conn
       |> post(
-        "/api/account/v1/user/watchlist",
+        "/api/account/v2/user/watchlist",
         watchlist_address_map_1
       )
       |> json_response(200)
@@ -761,7 +766,7 @@ defmodule BlockScoutWeb.Account.Api.V1.UserControllerTest do
         |> Enum.sort(fn x1, x2 -> Decimal.compare(x1, x2) in [:gt, :eq] end)
         |> Enum.take(150)
 
-      [wa2, wa1] = conn |> get("/api/account/v1/user/watchlist") |> json_response(200)
+      [wa2, wa1] = conn |> get("/api/account/v2/user/watchlist") |> json_response(200) |> Map.get("items")
 
       assert wa1["tokens_fiat_value"] |> Decimal.new() |> Decimal.round(13) ==
                values |> Enum.reduce(Decimal.new(0), fn x, acc -> Decimal.add(x, acc) end) |> Decimal.round(13)
@@ -781,7 +786,7 @@ defmodule BlockScoutWeb.Account.Api.V1.UserControllerTest do
 
       conn
       |> post(
-        "/api/account/v1/user/watchlist",
+        "/api/account/v2/user/watchlist",
         watchlist_address_map
       )
       |> json_response(200)
@@ -808,7 +813,7 @@ defmodule BlockScoutWeb.Account.Api.V1.UserControllerTest do
         token_contract_address_hash: token.contract_address_hash
       )
 
-      [wa1] = conn |> get("/api/account/v1/user/watchlist") |> json_response(200)
+      [wa1] = conn |> get("/api/account/v2/user/watchlist") |> json_response(200) |> Map.get("items")
 
       assert wa1["tokens_fiat_value"] |> Decimal.new() |> Decimal.round(13) ==
                values |> Enum.reduce(Decimal.new(0), fn x, acc -> Decimal.add(x, acc) end) |> Decimal.round(13)
@@ -821,7 +826,7 @@ defmodule BlockScoutWeb.Account.Api.V1.UserControllerTest do
       post_api_key_response =
         conn
         |> post(
-          "/api/account/v1/user/api_keys",
+          "/api/account/v2/user/api_keys",
           %{"name" => "test"}
         )
         |> doc(description: "Add api key")
@@ -835,7 +840,7 @@ defmodule BlockScoutWeb.Account.Api.V1.UserControllerTest do
       Enum.each(0..2, fn _x ->
         conn
         |> post(
-          "/api/account/v1/user/api_keys",
+          "/api/account/v2/user/api_keys",
           %{"name" => "test"}
         )
         |> json_response(200)
@@ -843,14 +848,14 @@ defmodule BlockScoutWeb.Account.Api.V1.UserControllerTest do
 
       assert conn
              |> post(
-               "/api/account/v1/user/api_keys",
+               "/api/account/v2/user/api_keys",
                %{"name" => "test"}
              )
              |> doc(description: "Example of error on creating api key")
              |> json_response(422) == %{"errors" => %{"name" => ["Max 3 keys per account"]}}
 
       assert conn
-             |> get("/api/account/v1/user/api_keys")
+             |> get("/api/account/v2/user/api_keys")
              |> doc(description: "Get api keys list")
              |> json_response(200)
              |> Enum.count() == 3
@@ -860,7 +865,7 @@ defmodule BlockScoutWeb.Account.Api.V1.UserControllerTest do
       post_api_key_response =
         conn
         |> post(
-          "/api/account/v1/user/api_keys",
+          "/api/account/v2/user/api_keys",
           %{"name" => "test"}
         )
         |> json_response(200)
@@ -871,7 +876,7 @@ defmodule BlockScoutWeb.Account.Api.V1.UserControllerTest do
       put_api_key_response =
         conn
         |> put(
-          "/api/account/v1/user/api_keys/#{post_api_key_response["api_key"]}",
+          "/api/account/v2/user/api_keys/#{post_api_key_response["api_key"]}",
           %{"name" => "test_1"}
         )
         |> doc(description: "Edit api key")
@@ -881,7 +886,7 @@ defmodule BlockScoutWeb.Account.Api.V1.UserControllerTest do
       assert put_api_key_response["name"] == "test_1"
 
       assert conn
-             |> get("/api/account/v1/user/api_keys")
+             |> get("/api/account/v2/user/api_keys")
              |> json_response(200) == [put_api_key_response]
     end
 
@@ -889,7 +894,7 @@ defmodule BlockScoutWeb.Account.Api.V1.UserControllerTest do
       post_api_key_response =
         conn
         |> post(
-          "/api/account/v1/user/api_keys",
+          "/api/account/v2/user/api_keys",
           %{"name" => "test"}
         )
         |> json_response(200)
@@ -898,17 +903,17 @@ defmodule BlockScoutWeb.Account.Api.V1.UserControllerTest do
       assert post_api_key_response["api_key"]
 
       assert conn
-             |> get("/api/account/v1/user/api_keys")
+             |> get("/api/account/v2/user/api_keys")
              |> json_response(200)
              |> Enum.count() == 1
 
       assert conn
-             |> delete("/api/account/v1/user/api_keys/#{post_api_key_response["api_key"]}")
+             |> delete("/api/account/v2/user/api_keys/#{post_api_key_response["api_key"]}")
              |> doc(description: "Delete api key")
              |> json_response(200) == %{"message" => "OK"}
 
       assert conn
-             |> get("/api/account/v1/user/api_keys")
+             |> get("/api/account/v2/user/api_keys")
              |> json_response(200) == []
     end
 
@@ -918,7 +923,7 @@ defmodule BlockScoutWeb.Account.Api.V1.UserControllerTest do
       post_custom_abi_response =
         conn
         |> post(
-          "/api/account/v1/user/custom_abis",
+          "/api/account/v2/user/custom_abis",
           custom_abi
         )
         |> doc(description: "Add custom abi")
@@ -934,7 +939,7 @@ defmodule BlockScoutWeb.Account.Api.V1.UserControllerTest do
       Enum.each(0..14, fn _x ->
         conn
         |> post(
-          "/api/account/v1/user/custom_abis",
+          "/api/account/v2/user/custom_abis",
           build(:custom_abi)
         )
         |> json_response(200)
@@ -942,14 +947,14 @@ defmodule BlockScoutWeb.Account.Api.V1.UserControllerTest do
 
       assert conn
              |> post(
-               "/api/account/v1/user/custom_abis",
+               "/api/account/v2/user/custom_abis",
                build(:custom_abi)
              )
              |> doc(description: "Example of error on creating custom abi")
              |> json_response(422) == %{"errors" => %{"name" => ["Max 15 ABIs per account"]}}
 
       assert conn
-             |> get("/api/account/v1/user/custom_abis")
+             |> get("/api/account/v2/user/custom_abis")
              |> doc(description: "Get custom abis list")
              |> json_response(200)
              |> Enum.count() == 15
@@ -961,7 +966,7 @@ defmodule BlockScoutWeb.Account.Api.V1.UserControllerTest do
       post_custom_abi_response =
         conn
         |> post(
-          "/api/account/v1/user/custom_abis",
+          "/api/account/v2/user/custom_abis",
           custom_abi
         )
         |> json_response(200)
@@ -976,7 +981,7 @@ defmodule BlockScoutWeb.Account.Api.V1.UserControllerTest do
       put_custom_abi_response =
         conn
         |> put(
-          "/api/account/v1/user/custom_abis/#{post_custom_abi_response["id"]}",
+          "/api/account/v2/user/custom_abis/#{post_custom_abi_response["id"]}",
           custom_abi_1
         )
         |> doc(description: "Edit custom abi")
@@ -988,7 +993,7 @@ defmodule BlockScoutWeb.Account.Api.V1.UserControllerTest do
       assert put_custom_abi_response["abi"] == custom_abi_1["abi"]
 
       assert conn
-             |> get("/api/account/v1/user/custom_abis")
+             |> get("/api/account/v2/user/custom_abis")
              |> json_response(200) == [put_custom_abi_response]
     end
 
@@ -998,7 +1003,7 @@ defmodule BlockScoutWeb.Account.Api.V1.UserControllerTest do
       post_custom_abi_response =
         conn
         |> post(
-          "/api/account/v1/user/custom_abis",
+          "/api/account/v2/user/custom_abis",
           custom_abi
         )
         |> json_response(200)
@@ -1007,17 +1012,17 @@ defmodule BlockScoutWeb.Account.Api.V1.UserControllerTest do
       assert post_custom_abi_response["id"]
 
       assert conn
-             |> get("/api/account/v1/user/custom_abis")
+             |> get("/api/account/v2/user/custom_abis")
              |> json_response(200)
              |> Enum.count() == 1
 
       assert conn
-             |> delete("/api/account/v1/user/custom_abis/#{post_custom_abi_response["id"]}")
+             |> delete("/api/account/v2/user/custom_abis/#{post_custom_abi_response["id"]}")
              |> doc(description: "Delete custom abi")
              |> json_response(200) == %{"message" => "OK"}
 
       assert conn
-             |> get("/api/account/v1/user/custom_abis")
+             |> get("/api/account/v2/user/custom_abis")
              |> json_response(200) == []
     end
   end
@@ -1029,7 +1034,7 @@ defmodule BlockScoutWeb.Account.Api.V1.UserControllerTest do
       post_public_tags_request_response =
         conn
         |> post(
-          "/api/account/v1/user/public_tags",
+          "/api/account/v2/user/public_tags",
           public_tags_request
         )
         |> doc(description: "Submit request to add a public tag")
@@ -1052,7 +1057,7 @@ defmodule BlockScoutWeb.Account.Api.V1.UserControllerTest do
       post_public_tags_request_response =
         conn
         |> post(
-          "/api/account/v1/user/public_tags",
+          "/api/account/v2/user/public_tags",
           public_tags_request
         )
         |> json_response(200)
@@ -1068,7 +1073,7 @@ defmodule BlockScoutWeb.Account.Api.V1.UserControllerTest do
       assert post_public_tags_request_response["id"]
 
       assert conn
-             |> get("/api/account/v1/user/public_tags")
+             |> get("/api/account/v2/user/public_tags")
              |> json_response(200)
              |> Enum.map(&convert_date/1) ==
                [post_public_tags_request_response]
@@ -1084,7 +1089,7 @@ defmodule BlockScoutWeb.Account.Api.V1.UserControllerTest do
           response =
             conn
             |> post(
-              "/api/account/v1/user/public_tags",
+              "/api/account/v2/user/public_tags",
               request
             )
             |> json_response(200)
@@ -1104,7 +1109,7 @@ defmodule BlockScoutWeb.Account.Api.V1.UserControllerTest do
         |> Enum.reverse()
 
       assert conn
-             |> get("/api/account/v1/user/public_tags")
+             |> get("/api/account/v2/user/public_tags")
              |> doc(description: "Get list of requests to add a public tag")
              |> json_response(200)
              |> Enum.map(&convert_date/1) == final_list
@@ -1112,18 +1117,18 @@ defmodule BlockScoutWeb.Account.Api.V1.UserControllerTest do
       %{"id" => id} = Enum.at(final_list, 0)
 
       assert conn
-             |> delete("/api/account/v1/user/public_tags/#{id}", %{"remove_reason" => "reason"})
+             |> delete("/api/account/v2/user/public_tags/#{id}", %{"remove_reason" => "reason"})
              |> doc(description: "Delete public tags request")
              |> json_response(200) == %{"message" => "OK"}
 
       Enum.each(Enum.drop(final_list, 1), fn request ->
         assert conn
-               |> delete("/api/account/v1/user/public_tags/#{request["id"]}", %{"remove_reason" => "reason"})
+               |> delete("/api/account/v2/user/public_tags/#{request["id"]}", %{"remove_reason" => "reason"})
                |> json_response(200) == %{"message" => "OK"}
       end)
 
       assert conn
-             |> get("/api/account/v1/user/public_tags")
+             |> get("/api/account/v2/user/public_tags")
              |> json_response(200) == []
     end
 
@@ -1133,7 +1138,7 @@ defmodule BlockScoutWeb.Account.Api.V1.UserControllerTest do
       post_public_tags_request_response =
         conn
         |> post(
-          "/api/account/v1/user/public_tags",
+          "/api/account/v2/user/public_tags",
           public_tags_request
         )
         |> json_response(200)
@@ -1149,7 +1154,7 @@ defmodule BlockScoutWeb.Account.Api.V1.UserControllerTest do
       assert post_public_tags_request_response["id"]
 
       assert conn
-             |> get("/api/account/v1/user/public_tags")
+             |> get("/api/account/v2/user/public_tags")
              |> json_response(200)
              |> Enum.map(&convert_date/1) ==
                [post_public_tags_request_response]
@@ -1160,7 +1165,7 @@ defmodule BlockScoutWeb.Account.Api.V1.UserControllerTest do
       put_public_tags_request_response =
         conn
         |> put(
-          "/api/account/v1/user/public_tags/#{post_public_tags_request_response["id"]}",
+          "/api/account/v2/user/public_tags/#{post_public_tags_request_response["id"]}",
           new_public_tags_request
         )
         |> doc(description: "Edit request to add a public tag")
@@ -1177,7 +1182,7 @@ defmodule BlockScoutWeb.Account.Api.V1.UserControllerTest do
       assert put_public_tags_request_response["id"] == post_public_tags_request_response["id"]
 
       assert conn
-             |> get("/api/account/v1/user/public_tags")
+             |> get("/api/account/v2/user/public_tags")
              |> json_response(200)
              |> Enum.map(&convert_date/1) ==
                [put_public_tags_request_response]
diff --git a/apps/block_scout_web/test/block_scout_web/controllers/api/v2/smart_contract_controller_test.exs b/apps/block_scout_web/test/block_scout_web/controllers/api/v2/smart_contract_controller_test.exs
index 2164911f25f6..3f05fee8283b 100644
--- a/apps/block_scout_web/test/block_scout_web/controllers/api/v2/smart_contract_controller_test.exs
+++ b/apps/block_scout_web/test/block_scout_web/controllers/api/v2/smart_contract_controller_test.exs
@@ -1698,7 +1698,7 @@ defmodule BlockScoutWeb.API.V2.SmartContractControllerTest do
 
       conn
       |> post(
-        "/api/account/v1/user/custom_abis",
+        "/api/account/v2/user/custom_abis",
         custom_abi
       )
 
@@ -1750,7 +1750,7 @@ defmodule BlockScoutWeb.API.V2.SmartContractControllerTest do
 
       conn
       |> post(
-        "/api/account/v1/user/custom_abis",
+        "/api/account/v2/user/custom_abis",
         custom_abi
       )
 
@@ -1817,7 +1817,7 @@ defmodule BlockScoutWeb.API.V2.SmartContractControllerTest do
 
       conn
       |> post(
-        "/api/account/v1/user/custom_abis",
+        "/api/account/v2/user/custom_abis",
         custom_abi
       )
 

From 5615d01e46d96acf270ed67ea7c34ece340fc9d4 Mon Sep 17 00:00:00 2001
From: Nikita Pozdniakov <nikitosing4@mail.ru>
Date: Mon, 13 Nov 2023 18:41:10 +0300
Subject: [PATCH 672/909] Add new events to addresses channel:
 eth_bytecode_db_lookup_started and smart_contract_was_not_verified

---
 .../lib/block_scout_web/notifier.ex           |  22 ++-
 .../block_scout_web/realtime_event_handler.ex |   2 +
 .../api/v2/smart_contract_controller_test.exs | 129 +++++++++++++++++-
 apps/explorer/config/test.exs                 |   6 +-
 .../lib/explorer/chain/events/publisher.ex    |   2 +-
 .../lib/explorer/chain/events/subscriber.ex   |   2 +-
 ...ook_up_smart_contract_sources_on_demand.ex |   3 +
 7 files changed, 151 insertions(+), 15 deletions(-)

diff --git a/apps/block_scout_web/lib/block_scout_web/notifier.ex b/apps/block_scout_web/lib/block_scout_web/notifier.ex
index cb1cdf70be02..e340c4351df3 100644
--- a/apps/block_scout_web/lib/block_scout_web/notifier.ex
+++ b/apps/block_scout_web/lib/block_scout_web/notifier.ex
@@ -232,9 +232,16 @@ defmodule BlockScoutWeb.Notifier do
     Endpoint.broadcast("addresses:#{to_string(address_hash)}", "changed_bytecode", %{})
   end
 
-  def handle_event({:chain_event, :smart_contract_was_verified, :on_demand, [address_hash]}) do
-    log_broadcast_smart_contract_was_verified(address_hash)
-    Endpoint.broadcast("addresses:#{to_string(address_hash)}", "smart_contract_was_verified", %{})
+  def handle_event({:chain_event, :smart_contract_was_verified = event, :on_demand, [address_hash]}) do
+    broadcast_automatic_verification_events(event, address_hash)
+  end
+
+  def handle_event({:chain_event, :smart_contract_was_not_verified = event, :on_demand, [address_hash]}) do
+    broadcast_automatic_verification_events(event, address_hash)
+  end
+
+  def handle_event({:chain_event, :eth_bytecode_db_lookup_started = event, :on_demand, [address_hash]}) do
+    broadcast_automatic_verification_events(event, address_hash)
   end
 
   def handle_event({:chain_event, :address_current_token_balances, :on_demand, address_current_token_balances}) do
@@ -505,7 +512,12 @@ defmodule BlockScoutWeb.Notifier do
     Logger.info("Broadcast smart-contract #{address_hash} verification results")
   end
 
-  defp log_broadcast_smart_contract_was_verified(address_hash) do
-    Logger.info("Broadcast smart-contract #{address_hash} was verified")
+  defp log_broadcast_smart_contract_event(address_hash, event) do
+    Logger.info("Broadcast smart-contract #{address_hash}: #{event}")
+  end
+
+  defp broadcast_automatic_verification_events(event, address_hash) do
+    log_broadcast_smart_contract_event(address_hash, event)
+    Endpoint.broadcast("addresses:#{to_string(address_hash)}", to_string(event), %{})
   end
 end
diff --git a/apps/block_scout_web/lib/block_scout_web/realtime_event_handler.ex b/apps/block_scout_web/lib/block_scout_web/realtime_event_handler.ex
index 3f89f6762fd3..7d029f17f885 100644
--- a/apps/block_scout_web/lib/block_scout_web/realtime_event_handler.ex
+++ b/apps/block_scout_web/lib/block_scout_web/realtime_event_handler.ex
@@ -28,6 +28,8 @@ defmodule BlockScoutWeb.RealtimeEventHandler do
     Subscriber.to(:token_total_supply, :on_demand)
     Subscriber.to(:changed_bytecode, :on_demand)
     Subscriber.to(:smart_contract_was_verified, :on_demand)
+    Subscriber.to(:smart_contract_was_not_verified, :on_demand)
+    Subscriber.to(:eth_bytecode_db_lookup_started, :on_demand)
     Subscriber.to(:zkevm_confirmed_batches, :realtime)
     # Does not come from the indexer
     Subscriber.to(:exchange_rate)
diff --git a/apps/block_scout_web/test/block_scout_web/controllers/api/v2/smart_contract_controller_test.exs b/apps/block_scout_web/test/block_scout_web/controllers/api/v2/smart_contract_controller_test.exs
index 2164911f25f6..ad6eabf1f113 100644
--- a/apps/block_scout_web/test/block_scout_web/controllers/api/v2/smart_contract_controller_test.exs
+++ b/apps/block_scout_web/test/block_scout_web/controllers/api/v2/smart_contract_controller_test.exs
@@ -1,5 +1,5 @@
 defmodule BlockScoutWeb.API.V2.SmartContractControllerTest do
-  use BlockScoutWeb.ConnCase
+  use BlockScoutWeb.ConnCase, async: false
   use BlockScoutWeb.ChannelCase, async: false
 
   import Mox
@@ -308,6 +308,16 @@ defmodule BlockScoutWeb.API.V2.SmartContractControllerTest do
   end
 
   describe "/smart-contracts/{address_hash} <> eth_bytecode_db" do
+    setup do
+      old_interval_env = Application.get_env(:explorer, Explorer.Chain.Fetcher.LookUpSmartContractSourcesOnDemand)
+
+      :ok
+
+      on_exit(fn ->
+        Application.put_env(:explorer, Explorer.Chain.Fetcher.LookUpSmartContractSourcesOnDemand, old_interval_env)
+      end)
+    end
+
     test "automatically verify contract", %{conn: conn} do
       {:ok, pid} = Explorer.Chain.Fetcher.LookUpSmartContractSourcesOnDemand.start_link([])
       old_chain_id = Application.get_env(:block_scout_web, :chain_id)
@@ -321,7 +331,9 @@ defmodule BlockScoutWeb.API.V2.SmartContractControllerTest do
 
       Application.put_env(:explorer, Explorer.SmartContract.RustVerifierInterfaceBehaviour,
         service_url: "http://localhost:#{bypass.port}",
-        enabled: true
+        enabled: true,
+        type: "eth_bytecode_db",
+        eth_bytecode_db?: true
       )
 
       address = insert(:contract_address)
@@ -346,6 +358,13 @@ defmodule BlockScoutWeb.API.V2.SmartContractControllerTest do
 
       request = get(conn, "/api/v2/smart-contracts/#{Address.checksum(address.hash)}")
 
+      assert_receive %Phoenix.Socket.Message{
+                       payload: %{},
+                       event: "eth_bytecode_db_lookup_started",
+                       topic: ^topic
+                     },
+                     :timer.seconds(1)
+
       assert_receive %Phoenix.Socket.Message{
                        payload: %{},
                        event: "smart_contract_was_verified",
@@ -391,7 +410,9 @@ defmodule BlockScoutWeb.API.V2.SmartContractControllerTest do
 
       Application.put_env(:explorer, Explorer.SmartContract.RustVerifierInterfaceBehaviour,
         service_url: "http://localhost:#{bypass.port}",
-        enabled: true
+        enabled: true,
+        type: "eth_bytecode_db",
+        eth_bytecode_db?: true
       )
 
       address = insert(:contract_address)
@@ -416,6 +437,13 @@ defmodule BlockScoutWeb.API.V2.SmartContractControllerTest do
 
       request = get(conn, "/api/v2/smart-contracts/#{Address.checksum(address.hash)}")
 
+      assert_receive %Phoenix.Socket.Message{
+                       payload: %{},
+                       event: "eth_bytecode_db_lookup_started",
+                       topic: ^topic
+                     },
+                     :timer.seconds(1)
+
       assert_receive %Phoenix.Socket.Message{
                        payload: %{},
                        event: "smart_contract_was_verified",
@@ -508,7 +536,9 @@ defmodule BlockScoutWeb.API.V2.SmartContractControllerTest do
 
       Application.put_env(:explorer, Explorer.SmartContract.RustVerifierInterfaceBehaviour,
         service_url: "http://localhost:#{bypass.port}",
-        enabled: true
+        enabled: true,
+        type: "eth_bytecode_db",
+        eth_bytecode_db?: true
       )
 
       address = insert(:contract_address)
@@ -533,6 +563,13 @@ defmodule BlockScoutWeb.API.V2.SmartContractControllerTest do
 
       request = get(conn, "/api/v2/smart-contracts/#{Address.checksum(address.hash)}")
 
+      assert_receive %Phoenix.Socket.Message{
+                       payload: %{},
+                       event: "eth_bytecode_db_lookup_started",
+                       topic: ^topic
+                     },
+                     :timer.seconds(1)
+
       assert_receive %Phoenix.Socket.Message{
                        payload: %{},
                        event: "smart_contract_was_verified",
@@ -582,7 +619,9 @@ defmodule BlockScoutWeb.API.V2.SmartContractControllerTest do
 
       Application.put_env(:explorer, Explorer.SmartContract.RustVerifierInterfaceBehaviour,
         service_url: "http://localhost:#{bypass.port}",
-        enabled: true
+        enabled: true,
+        type: "eth_bytecode_db",
+        eth_bytecode_db?: true
       )
 
       address = insert(:contract_address)
@@ -607,6 +646,13 @@ defmodule BlockScoutWeb.API.V2.SmartContractControllerTest do
 
       request = get(conn, "/api/v2/smart-contracts/#{Address.checksum(address.hash)}")
 
+      assert_receive %Phoenix.Socket.Message{
+                       payload: %{},
+                       event: "eth_bytecode_db_lookup_started",
+                       topic: ^topic
+                     },
+                     :timer.seconds(1)
+
       assert_receive %Phoenix.Socket.Message{
                        payload: %{},
                        event: "smart_contract_was_verified",
@@ -673,6 +719,12 @@ defmodule BlockScoutWeb.API.V2.SmartContractControllerTest do
 
       bypass = Bypass.open()
       address = insert(:contract_address)
+      topic = "addresses:#{address.hash}"
+
+      {:ok, _reply, _socket} =
+        BlockScoutWeb.UserSocketV2
+        |> socket("no_id", %{})
+        |> subscribe_and_join(topic)
 
       insert(:transaction,
         created_contract_address_hash: address.hash,
@@ -685,7 +737,9 @@ defmodule BlockScoutWeb.API.V2.SmartContractControllerTest do
 
       Application.put_env(:explorer, Explorer.SmartContract.RustVerifierInterfaceBehaviour,
         service_url: "http://localhost:#{bypass.port}",
-        enabled: true
+        enabled: true,
+        type: "eth_bytecode_db",
+        eth_bytecode_db?: true
       )
 
       old_interval_env = Application.get_env(:explorer, Explorer.Chain.Fetcher.LookUpSmartContractSourcesOnDemand)
@@ -698,6 +752,20 @@ defmodule BlockScoutWeb.API.V2.SmartContractControllerTest do
 
       _request = get(conn, "/api/v2/smart-contracts/#{Address.checksum(address.hash)}")
 
+      assert_receive %Phoenix.Socket.Message{
+                       payload: %{},
+                       event: "eth_bytecode_db_lookup_started",
+                       topic: ^topic
+                     },
+                     :timer.seconds(1)
+
+      assert_receive %Phoenix.Socket.Message{
+                       payload: %{},
+                       event: "smart_contract_was_not_verified",
+                       topic: ^topic
+                     },
+                     :timer.seconds(1)
+
       :timer.sleep(10)
 
       Bypass.expect_once(bypass, "POST", "/api/v2/bytecodes/sources_search", fn conn ->
@@ -706,6 +774,20 @@ defmodule BlockScoutWeb.API.V2.SmartContractControllerTest do
 
       _request = get(conn, "/api/v2/smart-contracts/#{Address.checksum(address.hash)}")
 
+      assert_receive %Phoenix.Socket.Message{
+                       payload: %{},
+                       event: "eth_bytecode_db_lookup_started",
+                       topic: ^topic
+                     },
+                     :timer.seconds(1)
+
+      assert_receive %Phoenix.Socket.Message{
+                       payload: %{},
+                       event: "smart_contract_was_not_verified",
+                       topic: ^topic
+                     },
+                     :timer.seconds(1)
+
       :timer.sleep(10)
 
       Bypass.expect_once(bypass, "POST", "/api/v2/bytecodes/sources_search", fn conn ->
@@ -714,12 +796,47 @@ defmodule BlockScoutWeb.API.V2.SmartContractControllerTest do
 
       _request = get(conn, "/api/v2/smart-contracts/#{Address.checksum(address.hash)}")
 
+      assert_receive %Phoenix.Socket.Message{
+                       payload: %{},
+                       event: "eth_bytecode_db_lookup_started",
+                       topic: ^topic
+                     },
+                     :timer.seconds(1)
+
+      assert_receive %Phoenix.Socket.Message{
+                       payload: %{},
+                       event: "smart_contract_was_not_verified",
+                       topic: ^topic
+                     },
+                     :timer.seconds(1)
+
       :timer.sleep(10)
 
       Application.put_env(:explorer, Explorer.Chain.Fetcher.LookUpSmartContractSourcesOnDemand, fetch_interval: 10000)
 
       _request = get(conn, "/api/v2/smart-contracts/#{Address.checksum(address.hash)}")
 
+      refute_receive %Phoenix.Socket.Message{
+                       payload: %{},
+                       event: "eth_bytecode_db_lookup_started",
+                       topic: ^topic
+                     },
+                     :timer.seconds(1)
+
+      refute_receive %Phoenix.Socket.Message{
+                       payload: %{},
+                       event: "smart_contract_was_not_verified",
+                       topic: ^topic
+                     },
+                     :timer.seconds(1)
+
+      refute_receive %Phoenix.Socket.Message{
+                       payload: %{},
+                       event: "smart_contract_was_verified",
+                       topic: ^topic
+                     },
+                     :timer.seconds(1)
+
       Application.put_env(:block_scout_web, :chain_id, old_chain_id)
       Application.put_env(:explorer, Explorer.Chain.Fetcher.LookUpSmartContractSourcesOnDemand, old_interval_env)
       Application.put_env(:explorer, Explorer.SmartContract.RustVerifierInterfaceBehaviour, old_env)
diff --git a/apps/explorer/config/test.exs b/apps/explorer/config/test.exs
index f47e2413959b..955f9df84267 100644
--- a/apps/explorer/config/test.exs
+++ b/apps/explorer/config/test.exs
@@ -12,7 +12,8 @@ config :explorer, Explorer.Repo,
   ownership_timeout: :timer.minutes(7),
   timeout: :timer.seconds(60),
   queue_target: 1000,
-  migration_lock: nil
+  migration_lock: nil,
+  log: false
 
 # Configure API database
 config :explorer, Explorer.Repo.Replica1,
@@ -26,7 +27,8 @@ config :explorer, Explorer.Repo.Replica1,
   enable_caching_implementation_data_of_proxy: true,
   avg_block_time_as_ttl_cached_implementation_data_of_proxy: false,
   fallback_ttl_cached_implementation_data_of_proxy: :timer.seconds(20),
-  implementation_data_fetching_timeout: :timer.seconds(20)
+  implementation_data_fetching_timeout: :timer.seconds(20),
+  log: false
 
 # Configure API database
 config :explorer, Explorer.Repo.Account,
diff --git a/apps/explorer/lib/explorer/chain/events/publisher.ex b/apps/explorer/lib/explorer/chain/events/publisher.ex
index 21b8d168af92..3dca04f31f73 100644
--- a/apps/explorer/lib/explorer/chain/events/publisher.ex
+++ b/apps/explorer/lib/explorer/chain/events/publisher.ex
@@ -3,7 +3,7 @@ defmodule Explorer.Chain.Events.Publisher do
   Publishes events related to the Chain context.
   """
 
-  @allowed_events ~w(addresses address_coin_balances address_token_balances address_current_token_balances blocks block_rewards internal_transactions last_block_number polygon_edge_reorg_block token_transfers transactions contract_verification_result token_total_supply changed_bytecode smart_contract_was_verified zkevm_confirmed_batches)a
+  @allowed_events ~w(addresses address_coin_balances address_token_balances address_current_token_balances blocks block_rewards internal_transactions last_block_number polygon_edge_reorg_block token_transfers transactions contract_verification_result token_total_supply changed_bytecode smart_contract_was_verified zkevm_confirmed_batches eth_bytecode_db_lookup_started smart_contract_was_not_verified)a
 
   def broadcast(_data, false), do: :ok
 
diff --git a/apps/explorer/lib/explorer/chain/events/subscriber.ex b/apps/explorer/lib/explorer/chain/events/subscriber.ex
index 9d049758ec56..f2aa49f61fe3 100644
--- a/apps/explorer/lib/explorer/chain/events/subscriber.ex
+++ b/apps/explorer/lib/explorer/chain/events/subscriber.ex
@@ -3,7 +3,7 @@ defmodule Explorer.Chain.Events.Subscriber do
   Subscribes to events related to the Chain context.
   """
 
-  @allowed_broadcast_events ~w(addresses address_coin_balances address_token_balances address_current_token_balances blocks block_rewards internal_transactions last_block_number polygon_edge_reorg_block token_transfers transactions contract_verification_result token_total_supply changed_bytecode smart_contract_was_verified zkevm_confirmed_batches)a
+  @allowed_broadcast_events ~w(addresses address_coin_balances address_token_balances address_current_token_balances blocks block_rewards internal_transactions last_block_number polygon_edge_reorg_block token_transfers transactions contract_verification_result token_total_supply changed_bytecode smart_contract_was_verified zkevm_confirmed_batches eth_bytecode_db_lookup_started smart_contract_was_not_verified)a
 
   @allowed_broadcast_types ~w(catchup realtime on_demand contract_verification_result)a
 
diff --git a/apps/explorer/lib/explorer/chain/fetcher/look_up_smart_contract_sources_on_demand.ex b/apps/explorer/lib/explorer/chain/fetcher/look_up_smart_contract_sources_on_demand.ex
index 1e6bd9e6eb68..145b77368abb 100644
--- a/apps/explorer/lib/explorer/chain/fetcher/look_up_smart_contract_sources_on_demand.ex
+++ b/apps/explorer/lib/explorer/chain/fetcher/look_up_smart_contract_sources_on_demand.ex
@@ -34,6 +34,8 @@ defmodule Explorer.Chain.Fetcher.LookUpSmartContractSourcesOnDemand do
   end
 
   defp fetch_sources(address, only_full?) do
+    Publisher.broadcast(%{eth_bytecode_db_lookup_started: [address.hash]}, :on_demand)
+
     creation_tx_input = contract_creation_input(address.hash)
 
     with {:ok, %{"sourceType" => type, "matchType" => match_type} = source} <-
@@ -45,6 +47,7 @@ defmodule Explorer.Chain.Fetcher.LookUpSmartContractSourcesOnDemand do
       Publisher.broadcast(%{smart_contract_was_verified: [address.hash]}, :on_demand)
     else
       _ ->
+        Publisher.broadcast(%{smart_contract_was_not_verified: [address.hash]}, :on_demand)
         false
     end
   end

From d30d741215a2c21ea5d05ee989d01b4e2a3242bb Mon Sep 17 00:00:00 2001
From: Nikita Pozdniakov <nikitosing4@mail.ru>
Date: Mon, 13 Nov 2023 18:44:19 +0300
Subject: [PATCH 673/909] Changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 109b2901d7de..83089bc61523 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,7 @@
 ### Features
 
 - [#8848](https://github.com/blockscout/blockscout/pull/8848) - Add MainPageRealtimeEventHandler
+- [#8821](https://github.com/blockscout/blockscout/pull/8821) - Add new events to addresses channel: `eth_bytecode_db_lookup_started` and `smart_contract_was_not_verified`
 - [#8795](https://github.com/blockscout/blockscout/pull/8795) - Disable catchup indexer by env
 - [#8768](https://github.com/blockscout/blockscout/pull/8768) - Add possibility to search tokens by address hash
 - [#8750](https://github.com/blockscout/blockscout/pull/8750) - Support new eth-bytecode-db request metadata fields

From a26cdffa5fe6d87992a0cda68c008b2c9440cfab Mon Sep 17 00:00:00 2001
From: Viktor Baranov <baranov.viktor.27@gmail.com>
Date: Fri, 17 Nov 2023 12:07:36 +0300
Subject: [PATCH 674/909] all transactions count at top addresses page

---
 CHANGELOG.md                                  |  1 +
 .../controllers/address_controller.ex         |  4 +-
 .../controllers/api/v2/address_controller.ex  |  2 +-
 .../templates/address/_tile.html.eex          |  2 +-
 .../templates/robots/sitemap.xml.eex          |  2 +-
 .../views/api/v2/address_view.ex              |  8 ++-
 apps/block_scout_web/priv/gettext/default.pot |  6 +-
 .../priv/gettext/en/LC_MESSAGES/default.po    |  6 +-
 .../api/v2/address_controller_test.exs        |  4 +-
 apps/explorer/lib/explorer/chain.ex           | 69 ------------------
 apps/explorer/lib/explorer/chain/address.ex   | 68 +++++++++++++++++-
 .../test/explorer/chain/address_test.exs      | 70 +++++++++++++++++++
 apps/explorer/test/explorer/chain_test.exs    | 70 -------------------
 13 files changed, 152 insertions(+), 160 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 109b2901d7de..39f99df87095 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -14,6 +14,7 @@
 
 ### Fixes
 
+- [#8855](https://github.com/blockscout/blockscout/pull/8855) - All transactions count at top addresses page
 - [#8836](https://github.com/blockscout/blockscout/pull/8836) - Safe token update
 - [#8814](https://github.com/blockscout/blockscout/pull/8814) - Improve performance for EOA addresses in `/api/v2/addresses/{address_hash}`
 - [#8813](https://github.com/blockscout/blockscout/pull/8813) - Force verify twin contracts on `/api/v2/import/smart-contracts/{address_hash}`
diff --git a/apps/block_scout_web/lib/block_scout_web/controllers/address_controller.ex b/apps/block_scout_web/lib/block_scout_web/controllers/address_controller.ex
index c352cb8e783b..3e50dff92ba7 100644
--- a/apps/block_scout_web/lib/block_scout_web/controllers/address_controller.ex
+++ b/apps/block_scout_web/lib/block_scout_web/controllers/address_controller.ex
@@ -16,7 +16,7 @@ defmodule BlockScoutWeb.AddressController do
 
   alias Explorer.{Chain, Market}
   alias Explorer.Chain.Address.Counters
-  alias Explorer.Chain.Wei
+  alias Explorer.Chain.{Address, Wei}
   alias Indexer.Fetcher.CoinBalanceOnDemand
   alias Phoenix.View
 
@@ -24,7 +24,7 @@ defmodule BlockScoutWeb.AddressController do
     addresses =
       params
       |> paging_options()
-      |> Chain.list_top_addresses()
+      |> Address.list_top_addresses()
 
     {addresses_page, next_page} = split_list_by_page(addresses)
 
diff --git a/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/address_controller.ex b/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/address_controller.ex
index 6d3c767a49e7..b3008a00f5ba 100644
--- a/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/address_controller.ex
+++ b/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/address_controller.ex
@@ -383,7 +383,7 @@ defmodule BlockScoutWeb.API.V2.AddressController do
       params
       |> paging_options()
       |> Keyword.merge(@api_true)
-      |> Chain.list_top_addresses()
+      |> Address.list_top_addresses()
       |> split_list_by_page()
 
     next_page_params = next_page_params(next_page, addresses, params)
diff --git a/apps/block_scout_web/lib/block_scout_web/templates/address/_tile.html.eex b/apps/block_scout_web/lib/block_scout_web/templates/address/_tile.html.eex
index 368aa9f91e75..04cefd6cde58 100644
--- a/apps/block_scout_web/lib/block_scout_web/templates/address/_tile.html.eex
+++ b/apps/block_scout_web/lib/block_scout_web/templates/address/_tile.html.eex
@@ -28,7 +28,7 @@
     <span class="mr-4">
       <span data-test="transaction_count">
         <%= @tx_count %>
-      </span> <%= gettext "Transactions sent" %>
+      </span> <%= gettext "Transactions" %>
     </span>
   </td>
 </tr>
diff --git a/apps/block_scout_web/lib/block_scout_web/templates/robots/sitemap.xml.eex b/apps/block_scout_web/lib/block_scout_web/templates/robots/sitemap.xml.eex
index 0c5334f21aa4..9f3cbc669802 100644
--- a/apps/block_scout_web/lib/block_scout_web/templates/robots/sitemap.xml.eex
+++ b/apps/block_scout_web/lib/block_scout_web/templates/robots/sitemap.xml.eex
@@ -11,7 +11,7 @@
     </url>
   <% end %>
 
-  <% addresses = Chain.list_top_addresses(params) %>
+  <% addresses = Address.list_top_addresses(params) %>
   <%= for {address, _} <- addresses do %>
     <url>
       <loc><%= host %>/address/<%= to_string(address) %></loc>
diff --git a/apps/block_scout_web/lib/block_scout_web/views/api/v2/address_view.ex b/apps/block_scout_web/lib/block_scout_web/views/api/v2/address_view.ex
index 33a3cc601a7f..fec26f5d2325 100644
--- a/apps/block_scout_web/lib/block_scout_web/views/api/v2/address_view.ex
+++ b/apps/block_scout_web/lib/block_scout_web/views/api/v2/address_view.ex
@@ -67,10 +67,14 @@ defmodule BlockScoutWeb.API.V2.AddressView do
     %{"items" => Enum.map(nft_collections, &prepare_nft_collection(&1)), "next_page_params" => next_page_params}
   end
 
-  def prepare_address({address, nonce}) do
+  @spec prepare_address(
+          {atom() | %{:fetched_coin_balance => any(), :hash => any(), optional(any()) => any()}, any()}
+          | Explorer.Chain.Address.t()
+        ) :: %{optional(:coin_balance) => any(), optional(:tx_count) => binary(), optional(<<_::32, _::_*8>>) => any()}
+  def prepare_address({address, tx_count}) do
     nil
     |> Helper.address_with_info(address, address.hash, true)
-    |> Map.put(:tx_count, to_string(nonce))
+    |> Map.put(:tx_count, to_string(tx_count))
     |> Map.put(:coin_balance, if(address.fetched_coin_balance, do: address.fetched_coin_balance.value))
   end
 
diff --git a/apps/block_scout_web/priv/gettext/default.pot b/apps/block_scout_web/priv/gettext/default.pot
index aed1dc8afd75..d1902773008b 100644
--- a/apps/block_scout_web/priv/gettext/default.pot
+++ b/apps/block_scout_web/priv/gettext/default.pot
@@ -3091,6 +3091,7 @@ msgid "Transaction type, introduced in EIP-2718."
 msgstr ""
 
 #: lib/block_scout_web/templates/address/_tabs.html.eex:7
+#: lib/block_scout_web/templates/address/_tile.html.eex:31
 #: lib/block_scout_web/templates/address/overview.html.eex:186
 #: lib/block_scout_web/templates/address/overview.html.eex:192
 #: lib/block_scout_web/templates/address/overview.html.eex:200
@@ -3109,11 +3110,6 @@ msgstr ""
 msgid "Transactions and address of creation."
 msgstr ""
 
-#: lib/block_scout_web/templates/address/_tile.html.eex:31
-#, elixir-autogen, elixir-format
-msgid "Transactions sent"
-msgstr ""
-
 #: lib/block_scout_web/templates/address/overview.html.eex:213
 #: lib/block_scout_web/templates/address/overview.html.eex:219
 #: lib/block_scout_web/templates/address/overview.html.eex:227
diff --git a/apps/block_scout_web/priv/gettext/en/LC_MESSAGES/default.po b/apps/block_scout_web/priv/gettext/en/LC_MESSAGES/default.po
index 4ed272ce9984..c3c3d7628b7a 100644
--- a/apps/block_scout_web/priv/gettext/en/LC_MESSAGES/default.po
+++ b/apps/block_scout_web/priv/gettext/en/LC_MESSAGES/default.po
@@ -3091,6 +3091,7 @@ msgid "Transaction type, introduced in EIP-2718."
 msgstr ""
 
 #: lib/block_scout_web/templates/address/_tabs.html.eex:7
+#: lib/block_scout_web/templates/address/_tile.html.eex:31
 #: lib/block_scout_web/templates/address/overview.html.eex:186
 #: lib/block_scout_web/templates/address/overview.html.eex:192
 #: lib/block_scout_web/templates/address/overview.html.eex:200
@@ -3109,11 +3110,6 @@ msgstr ""
 msgid "Transactions and address of creation."
 msgstr ""
 
-#: lib/block_scout_web/templates/address/_tile.html.eex:31
-#, elixir-autogen, elixir-format
-msgid "Transactions sent"
-msgstr ""
-
 #: lib/block_scout_web/templates/address/overview.html.eex:213
 #: lib/block_scout_web/templates/address/overview.html.eex:219
 #: lib/block_scout_web/templates/address/overview.html.eex:227
diff --git a/apps/block_scout_web/test/block_scout_web/controllers/api/v2/address_controller_test.exs b/apps/block_scout_web/test/block_scout_web/controllers/api/v2/address_controller_test.exs
index d194e233177b..967c9cee5f1a 100644
--- a/apps/block_scout_web/test/block_scout_web/controllers/api/v2/address_controller_test.exs
+++ b/apps/block_scout_web/test/block_scout_web/controllers/api/v2/address_controller_test.exs
@@ -1708,7 +1708,7 @@ defmodule BlockScoutWeb.API.V2.AddressControllerTest do
     end
 
     test "check nil", %{conn: conn} do
-      address = insert(:address, nonce: 1, fetched_coin_balance: 1)
+      address = insert(:address, transactions_count: 2, fetched_coin_balance: 1)
 
       request = get(conn, "/api/v2/addresses")
 
@@ -2477,7 +2477,7 @@ defmodule BlockScoutWeb.API.V2.AddressControllerTest do
 
   defp compare_item(%Address{} = address, json) do
     assert Address.checksum(address.hash) == json["hash"]
-    assert to_string(address.nonce + 1) == json["tx_count"]
+    assert to_string(address.transactions_count) == json["tx_count"]
   end
 
   defp compare_item(%Transaction{} = transaction, json) do
diff --git a/apps/explorer/lib/explorer/chain.ex b/apps/explorer/lib/explorer/chain.ex
index 5717a4997e20..63d5935a3e6f 100644
--- a/apps/explorer/lib/explorer/chain.ex
+++ b/apps/explorer/lib/explorer/chain.ex
@@ -68,7 +68,6 @@ defmodule Explorer.Chain do
   alias Explorer.Chain.Block.{EmissionReward, Reward}
 
   alias Explorer.Chain.Cache.{
-    Accounts,
     BlockNumber,
     Blocks,
     ContractsCounter,
@@ -1986,64 +1985,6 @@ defmodule Explorer.Chain do
     |> Enum.into(%{})
   end
 
-  @doc """
-  Lists the top `t:Explorer.Chain.Address.t/0`'s' in descending order based on coin balance and address hash.
-
-  """
-  @spec list_top_addresses :: [{Address.t(), non_neg_integer()}]
-  def list_top_addresses(options \\ []) do
-    paging_options = Keyword.get(options, :paging_options, @default_paging_options)
-
-    if is_nil(paging_options.key) do
-      paging_options.page_size
-      |> Accounts.take_enough()
-      |> case do
-        nil ->
-          get_addresses(options)
-
-        accounts ->
-          Enum.map(
-            accounts,
-            &{&1,
-             if is_nil(&1.nonce) do
-               0
-             else
-               &1.nonce + 1
-             end}
-          )
-      end
-    else
-      fetch_top_addresses(options)
-    end
-  end
-
-  defp get_addresses(options) do
-    accounts_with_n = fetch_top_addresses(options)
-
-    accounts_with_n
-    |> Enum.map(fn {address, _n} -> address end)
-    |> Accounts.update()
-
-    accounts_with_n
-  end
-
-  defp fetch_top_addresses(options) do
-    paging_options = Keyword.get(options, :paging_options, @default_paging_options)
-
-    base_query =
-      from(a in Address,
-        where: a.fetched_coin_balance > ^0,
-        order_by: [desc: a.fetched_coin_balance, asc: a.hash],
-        preload: [:names, :smart_contract],
-        select: {a, fragment("coalesce(1 + ?, 0)", a.nonce)}
-      )
-
-    base_query
-    |> page_addresses(paging_options)
-    |> limit(^paging_options.page_size)
-    |> select_repo(options).all()
-  end
-
   @doc """
   Lists the top `t:Explorer.Chain.Token.t/0`'s'.
 
@@ -3689,16 +3630,6 @@ defmodule Explorer.Chain do
     end)
   end
 
-  defp page_addresses(query, %PagingOptions{key: nil}), do: query
-
-  defp page_addresses(query, %PagingOptions{key: {coin_balance, hash}}) do
-    from(address in query,
-      where:
-        (address.fetched_coin_balance == ^coin_balance and address.hash > ^hash) or
-          address.fetched_coin_balance < ^coin_balance
-    )
-  end
-
   defp page_blocks(query, %PagingOptions{key: nil}), do: query
 
   defp page_blocks(query, %PagingOptions{key: {block_number}}) do
diff --git a/apps/explorer/lib/explorer/chain/address.ex b/apps/explorer/lib/explorer/chain/address.ex
index 5803f3573227..e8ea2300590a 100644
--- a/apps/explorer/lib/explorer/chain/address.ex
+++ b/apps/explorer/lib/explorer/chain/address.ex
@@ -8,7 +8,7 @@ defmodule Explorer.Chain.Address do
   use Explorer.Schema
 
   alias Ecto.Changeset
-  alias Explorer.Chain
+  alias Explorer.{Chain, PagingOptions}
 
   alias Explorer.Chain.{
     Address,
@@ -25,7 +25,7 @@ defmodule Explorer.Chain.Address do
     Withdrawal
   }
 
-  alias Explorer.Chain.Cache.NetVersion
+  alias Explorer.Chain.Cache.{Accounts, NetVersion}
 
   @optional_attrs ~w(contract_code fetched_coin_balance fetched_coin_balance_block_number nonce decompiled verified gas_used transactions_count token_transfers_count)a
   @required_attrs ~w(hash)a
@@ -304,4 +304,68 @@ defmodule Explorer.Chain.Address do
       @for.checksum(address)
     end
   end
+
+  @default_paging_options %PagingOptions{page_size: 50}
+  @doc """
+  Lists the top `t:Explorer.Chain.Address.t/0`'s' in descending order based on coin balance and address hash.
+
+  """
+  @spec list_top_addresses :: [{Address.t(), non_neg_integer()}]
+  def list_top_addresses(options \\ []) do
+    paging_options = Keyword.get(options, :paging_options, @default_paging_options)
+
+    if is_nil(paging_options.key) do
+      paging_options.page_size
+      |> Accounts.take_enough()
+      |> case do
+        nil ->
+          get_addresses(options)
+
+        accounts ->
+          Enum.map(
+            accounts,
+            &{&1, &1.transactions_count || 0}
+          )
+      end
+    else
+      fetch_top_addresses(options)
+    end
+  end
+
+  defp get_addresses(options) do
+    accounts_with_n = fetch_top_addresses(options)
+
+    accounts_with_n
+    |> Enum.map(fn {address, _n} -> address end)
+    |> Accounts.update()
+
+    accounts_with_n
+  end
+
+  defp fetch_top_addresses(options) do
+    paging_options = Keyword.get(options, :paging_options, @default_paging_options)
+
+    base_query =
+      from(a in Address,
+        where: a.fetched_coin_balance > ^0,
+        order_by: [desc: a.fetched_coin_balance, asc: a.hash],
+        preload: [:names, :smart_contract],
+        select: {a, a.transactions_count}
+      )
+
+    base_query
+    |> page_addresses(paging_options)
+    |> limit(^paging_options.page_size)
+    |> Chain.select_repo(options).all()
+  end
+
+  defp page_addresses(query, %PagingOptions{key: nil}), do: query
+
+  defp page_addresses(query, %PagingOptions{key: {coin_balance, hash}}) do
+    from(address in query,
+      where:
+        (address.fetched_coin_balance == ^coin_balance and address.hash > ^hash) or
+          address.fetched_coin_balance < ^coin_balance
+    )
+  end
 end
diff --git a/apps/explorer/test/explorer/chain/address_test.exs b/apps/explorer/test/explorer/chain/address_test.exs
index 5b01b27ade3d..c6ca32494652 100644
--- a/apps/explorer/test/explorer/chain/address_test.exs
+++ b/apps/explorer/test/explorer/chain/address_test.exs
@@ -63,4 +63,74 @@ defmodule Explorer.Chain.AddressTest do
       assert str("0xd1220a0cf47c7b9be7a2e6ba89f429762e7b9adb") == "0xD1220A0Cf47c7B9BE7a2e6ba89F429762E7B9adB"
     end
   end
+
+  describe "list_top_addresses/0" do
+    test "without addresses with balance > 0" do
+      insert(:address, fetched_coin_balance: 0)
+      assert [] = Address.list_top_addresses()
+    end
+
+    test "with top addresses in order" do
+      address_hashes =
+        4..1
+        |> Enum.map(&insert(:address, fetched_coin_balance: &1))
+        |> Enum.map(& &1.hash)
+
+      assert address_hashes ==
+               Address.list_top_addresses()
+               |> Enum.map(fn {address, _transaction_count} -> address end)
+               |> Enum.map(& &1.hash)
+    end
+
+    # flaky test
+    # test "with top addresses in order with matching value" do
+    #   test_hashes =
+    #     4..0
+    #     |> Enum.map(&Explorer.Chain.Hash.cast(Explorer.Chain.Hash.Address, &1))
+    #     |> Enum.map(&elem(&1, 1))
+
+    #   tail =
+    #     4..1
+    #     |> Enum.map(&insert(:address, fetched_coin_balance: &1, hash: Enum.fetch!(test_hashes, &1 - 1)))
+    #     |> Enum.map(& &1.hash)
+
+    #   first_result_hash =
+    #     :address
+    #     |> insert(fetched_coin_balance: 4, hash: Enum.fetch!(test_hashes, 4))
+    #     |> Map.fetch!(:hash)
+
+    #   assert [first_result_hash | tail] ==
+    #            Address.list_top_addresses()
+    #            |> Enum.map(fn {address, _transaction_count} -> address end)
+    #            |> Enum.map(& &1.hash)
+    # end
+
+    # flaky test
+    # test "paginates addresses" do
+    #   test_hashes =
+    #     4..0
+    #     |> Enum.map(&Explorer.Chain.Hash.cast(Explorer.Chain.Hash.Address, &1))
+    #     |> Enum.map(&elem(&1, 1))
+
+    #   result =
+    #     4..1
+    #     |> Enum.map(&insert(:address, fetched_coin_balance: &1, hash: Enum.fetch!(test_hashes, &1 - 1)))
+    #     |> Enum.map(& &1.hash)
+
+    #   options = [paging_options: %PagingOptions{page_size: 1}]
+
+    #   [{top_address, _}] = Chain.list_top_addresses(options)
+    #   assert top_address.hash == List.first(result)
+
+    #   tail_options = [
+    #     paging_options: %PagingOptions{key: {top_address.fetched_coin_balance.value, top_address.hash}, page_size: 3}
+    #   ]
+
+    #   tail_result = tail_options |> Address.list_top_addresses() |> Enum.map(fn {address, _} -> address.hash end)
+
+    #   [_ | expected_tail] = result
+
+    #   assert tail_result == expected_tail
+    # end
+  end
 end
diff --git a/apps/explorer/test/explorer/chain_test.exs b/apps/explorer/test/explorer/chain_test.exs
index 77f9030f0f95..96a787543a8c 100644
--- a/apps/explorer/test/explorer/chain_test.exs
+++ b/apps/explorer/test/explorer/chain_test.exs
@@ -2058,76 +2058,6 @@ defmodule Explorer.ChainTest do
     end
   end
 
-  describe "list_top_addresses/0" do
-    test "without addresses with balance > 0" do
-      insert(:address, fetched_coin_balance: 0)
-      assert [] = Chain.list_top_addresses()
-    end
-
-    test "with top addresses in order" do
-      address_hashes =
-        4..1
-        |> Enum.map(&insert(:address, fetched_coin_balance: &1))
-        |> Enum.map(& &1.hash)
-
-      assert address_hashes ==
-               Chain.list_top_addresses()
-               |> Enum.map(fn {address, _transaction_count} -> address end)
-               |> Enum.map(& &1.hash)
-    end
-
-    # flaky test
-    # test "with top addresses in order with matching value" do
-    #   test_hashes =
-    #     4..0
-    #     |> Enum.map(&Explorer.Chain.Hash.cast(Explorer.Chain.Hash.Address, &1))
-    #     |> Enum.map(&elem(&1, 1))
-
-    #   tail =
-    #     4..1
-    #     |> Enum.map(&insert(:address, fetched_coin_balance: &1, hash: Enum.fetch!(test_hashes, &1 - 1)))
-    #     |> Enum.map(& &1.hash)
-
-    #   first_result_hash =
-    #     :address
-    #     |> insert(fetched_coin_balance: 4, hash: Enum.fetch!(test_hashes, 4))
-    #     |> Map.fetch!(:hash)
-
-    #   assert [first_result_hash | tail] ==
-    #            Chain.list_top_addresses()
-    #            |> Enum.map(fn {address, _transaction_count} -> address end)
-    #            |> Enum.map(& &1.hash)
-    # end
-
-    # flaky test
-    # test "paginates addresses" do
-    #   test_hashes =
-    #     4..0
-    #     |> Enum.map(&Explorer.Chain.Hash.cast(Explorer.Chain.Hash.Address, &1))
-    #     |> Enum.map(&elem(&1, 1))
-
-    #   result =
-    #     4..1
-    #     |> Enum.map(&insert(:address, fetched_coin_balance: &1, hash: Enum.fetch!(test_hashes, &1 - 1)))
-    #     |> Enum.map(& &1.hash)
-
-    #   options = [paging_options: %PagingOptions{page_size: 1}]
-
-    #   [{top_address, _}] = Chain.list_top_addresses(options)
-    #   assert top_address.hash == List.first(result)
-
-    #   tail_options = [
-    #     paging_options: %PagingOptions{key: {top_address.fetched_coin_balance.value, top_address.hash}, page_size: 3}
-    #   ]
-
-    #   tail_result = tail_options |> Chain.list_top_addresses() |> Enum.map(fn {address, _} -> address.hash end)
-
-    #   [_ | expected_tail] = result
-
-    #   assert tail_result == expected_tail
-    # end
-  end
-
   describe "stream_blocks_without_rewards/2" do
     test "includes consensus blocks" do
       %Block{hash: consensus_hash} = insert(:block, consensus: true)

From ef9aa010f27053831f1ab688a16c13a98a20f521 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 20 Nov 2023 18:07:31 +0000
Subject: [PATCH 675/909] Bump ecto_sql from 3.10.2 to 3.11.0

Bumps [ecto_sql](https://github.com/elixir-ecto/ecto_sql) from 3.10.2 to 3.11.0.
- [Changelog](https://github.com/elixir-ecto/ecto_sql/blob/master/CHANGELOG.md)
- [Commits](https://github.com/elixir-ecto/ecto_sql/compare/v3.10.2...v3.11.0)

---
updated-dependencies:
- dependency-name: ecto_sql
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 mix.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/mix.lock b/mix.lock
index b44a533985d3..aae1da0f115e 100644
--- a/mix.lock
+++ b/mix.lock
@@ -30,15 +30,15 @@
   "credo": {:hex, :credo, "1.7.1", "6e26bbcc9e22eefbff7e43188e69924e78818e2fe6282487d0703652bc20fd62", [:mix], [{:bunt, "~> 0.2.1", [hex: :bunt, repo: "hexpm", optional: false]}, {:file_system, "~> 0.2.8", [hex: :file_system, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: false]}], "hexpm", "e9871c6095a4c0381c89b6aa98bc6260a8ba6addccf7f6a53da8849c748a58a2"},
   "csv": {:hex, :csv, "2.5.0", "c47b5a5221bf2e56d6e8eb79e77884046d7fd516280dc7d9b674251e0ae46246", [:mix], [{:parallel_stream, "~> 1.0.4 or ~> 1.1.0", [hex: :parallel_stream, repo: "hexpm", optional: false]}], "hexpm", "e821f541487045c7591a1963eeb42afff0dfa99bdcdbeb3410795a2f59c77d34"},
   "dataloader": {:hex, :dataloader, "1.0.11", "49bbfc7dd8a1990423c51000b869b1fecaab9e3ccd6b29eab51616ae8ad0a2f5", [:mix], [{:ecto, ">= 3.4.3 and < 4.0.0", [hex: :ecto, repo: "hexpm", optional: true]}, {:telemetry, "~> 1.0 or ~> 0.4", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "ba0b0ec532ec68e9d033d03553561d693129bd7cbd5c649dc7903f07ffba08fe"},
-  "db_connection": {:hex, :db_connection, "2.5.0", "bb6d4f30d35ded97b29fe80d8bd6f928a1912ca1ff110831edcd238a1973652c", [:mix], [{:telemetry, "~> 0.4 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "c92d5ba26cd69ead1ff7582dbb860adeedfff39774105a4f1c92cbb654b55aa2"},
+  "db_connection": {:hex, :db_connection, "2.6.0", "77d835c472b5b67fc4f29556dee74bf511bbafecdcaf98c27d27fa5918152086", [:mix], [{:telemetry, "~> 0.4 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "c2f992d15725e721ec7fbc1189d4ecdb8afef76648c746a8e1cad35e3b8a35f3"},
   "decimal": {:hex, :decimal, "2.1.1", "5611dca5d4b2c3dd497dec8f68751f1f1a54755e8ed2a966c2633cf885973ad6", [:mix], [], "hexpm", "53cfe5f497ed0e7771ae1a475575603d77425099ba5faef9394932b35020ffcc"},
   "decorator": {:hex, :decorator, "1.4.0", "a57ac32c823ea7e4e67f5af56412d12b33274661bb7640ec7fc882f8d23ac419", [:mix], [], "hexpm", "0a07cedd9083da875c7418dea95b78361197cf2bf3211d743f6f7ce39656597f"},
   "deep_merge": {:hex, :deep_merge, "1.0.0", "b4aa1a0d1acac393bdf38b2291af38cb1d4a52806cf7a4906f718e1feb5ee961", [:mix], [], "hexpm", "ce708e5f094b9cd4e8f2be4f00d2f4250c4095be93f8cd6d018c753894885430"},
   "dialyxir": {:hex, :dialyxir, "1.4.1", "a22ed1e7bd3a3e3f197b68d806ef66acb61ee8f57b3ac85fc5d57354c5482a93", [:mix], [{:erlex, ">= 0.2.6", [hex: :erlex, repo: "hexpm", optional: false]}], "hexpm", "84b795d6d7796297cca5a3118444b80c7d94f7ce247d49886e7c291e1ae49801"},
   "digital_token": {:hex, :digital_token, "0.6.0", "13e6de581f0b1f6c686f7c7d12ab11a84a7b22fa79adeb4b50eec1a2d278d258", [:mix], [{:cldr_utils, "~> 2.17", [hex: :cldr_utils, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}], "hexpm", "2455d626e7c61a128b02a4a8caddb092548c3eb613ac6f6a85e4cbb6caddc4d1"},
   "earmark_parser": {:hex, :earmark_parser, "1.4.37", "2ad73550e27c8946648b06905a57e4d454e4d7229c2dafa72a0348c99d8be5f7", [:mix], [], "hexpm", "6b19783f2802f039806f375610faa22da130b8edc21209d0bff47918bb48360e"},
-  "ecto": {:hex, :ecto, "3.10.3", "eb2ae2eecd210b4eb8bece1217b297ad4ff824b4384c0e3fdd28aaf96edd6135", [:mix], [{:decimal, "~> 1.6 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}, {:telemetry, "~> 0.4 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "44bec74e2364d491d70f7e42cd0d690922659d329f6465e89feb8a34e8cd3433"},
-  "ecto_sql": {:hex, :ecto_sql, "3.10.2", "6b98b46534b5c2f8b8b5f03f126e75e2a73c64f3c071149d32987a5378b0fdbd", [:mix], [{:db_connection, "~> 2.5 or ~> 2.4.1", [hex: :db_connection, repo: "hexpm", optional: false]}, {:ecto, "~> 3.10.0", [hex: :ecto, repo: "hexpm", optional: false]}, {:myxql, "~> 0.6.0", [hex: :myxql, repo: "hexpm", optional: true]}, {:postgrex, "~> 0.16.0 or ~> 0.17.0 or ~> 1.0", [hex: :postgrex, repo: "hexpm", optional: true]}, {:tds, "~> 2.1.1 or ~> 2.2", [hex: :tds, repo: "hexpm", optional: true]}, {:telemetry, "~> 0.4.0 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "68c018debca57cb9235e3889affdaec7a10616a4e3a80c99fa1d01fdafaa9007"},
+  "ecto": {:hex, :ecto, "3.11.0", "ff8614b4e70a774f9d39af809c426def80852048440e8785d93a6e91f48fec00", [:mix], [{:decimal, "~> 2.0", [hex: :decimal, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}, {:telemetry, "~> 0.4 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "7769dad267ef967310d6e988e92d772659b11b09a0c015f101ce0fff81ce1f81"},
+  "ecto_sql": {:hex, :ecto_sql, "3.11.0", "c787b24b224942b69c9ff7ab9107f258ecdc68326be04815c6cce2941b6fad1c", [:mix], [{:db_connection, "~> 2.5 or ~> 2.4.1", [hex: :db_connection, repo: "hexpm", optional: false]}, {:ecto, "~> 3.11.0", [hex: :ecto, repo: "hexpm", optional: false]}, {:myxql, "~> 0.6.0", [hex: :myxql, repo: "hexpm", optional: true]}, {:postgrex, "~> 0.16.0 or ~> 0.17.0 or ~> 1.0", [hex: :postgrex, repo: "hexpm", optional: true]}, {:tds, "~> 2.1.1 or ~> 2.2", [hex: :tds, repo: "hexpm", optional: true]}, {:telemetry, "~> 0.4.0 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "77aa3677169f55c2714dda7352d563002d180eb33c0dc29cd36d39c0a1a971f5"},
   "elixir_make": {:hex, :elixir_make, "0.7.7", "7128c60c2476019ed978210c245badf08b03dbec4f24d05790ef791da11aa17c", [:mix], [{:castore, "~> 0.1 or ~> 1.0", [hex: :castore, repo: "hexpm", optional: true]}], "hexpm", "5bc19fff950fad52bbe5f211b12db9ec82c6b34a9647da0c2224b8b8464c7e6c"},
   "erlex": {:hex, :erlex, "0.2.6", "c7987d15e899c7a2f34f5420d2a2ea0d659682c06ac607572df55a43753aa12e", [:mix], [], "hexpm", "2ed2e25711feb44d52b17d2780eabf998452f6efda104877a3881c2f8c0c0c75"},
   "ex_abi": {:hex, :ex_abi, "0.6.4", "f722a38298f176dab511cf94627b2815282669255bc2eb834674f23ca71f5cfb", [:mix], [{:ex_keccak, "~> 0.7.3", [hex: :ex_keccak, repo: "hexpm", optional: false]}, {:jason, "~> 1.4", [hex: :jason, repo: "hexpm", optional: false]}], "hexpm", "07eaf39b70dd3beac1286c10368d27091a9a64844830eb26a38f1c8d8b19dfbb"},

From 213590215bebbcfa48dee145bcb584d99dc90e1f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 20 Nov 2023 18:49:14 +0000
Subject: [PATCH 676/909] Bump core-js from 3.33.2 to 3.33.3 in
 /apps/block_scout_web/assets

Bumps [core-js](https://github.com/zloirock/core-js/tree/HEAD/packages/core-js) from 3.33.2 to 3.33.3.
- [Release notes](https://github.com/zloirock/core-js/releases)
- [Changelog](https://github.com/zloirock/core-js/blob/master/CHANGELOG.md)
- [Commits](https://github.com/zloirock/core-js/commits/v3.33.3/packages/core-js)

---
updated-dependencies:
- dependency-name: core-js
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 apps/block_scout_web/assets/package-lock.json | 14 +++++++-------
 apps/block_scout_web/assets/package.json      |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/apps/block_scout_web/assets/package-lock.json b/apps/block_scout_web/assets/package-lock.json
index 0fc330c2a4a0..f30ccead9baf 100644
--- a/apps/block_scout_web/assets/package-lock.json
+++ b/apps/block_scout_web/assets/package-lock.json
@@ -17,7 +17,7 @@
         "chart.js": "^4.4.0",
         "chartjs-adapter-luxon": "^1.3.1",
         "clipboard": "^2.0.11",
-        "core-js": "^3.33.2",
+        "core-js": "^3.33.3",
         "crypto-browserify": "^3.12.0",
         "dropzone": "^5.9.3",
         "eth-net-props": "^1.0.41",
@@ -5937,9 +5937,9 @@
       }
     },
     "node_modules/core-js": {
-      "version": "3.33.2",
-      "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.33.2.tgz",
-      "integrity": "sha512-XeBzWI6QL3nJQiHmdzbAOiMYqjrb7hwU7A39Qhvd/POSa/t9E1AeZyEZx3fNvp/vtM8zXwhoL0FsiS0hD0pruQ==",
+      "version": "3.33.3",
+      "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.33.3.tgz",
+      "integrity": "sha512-lo0kOocUlLKmm6kv/FswQL8zbkH7mVsLJ/FULClOhv8WRVmKLVcs6XPNQAzstfeJTCHMyButEwG+z1kHxHoDZw==",
       "hasInstallScript": true,
       "funding": {
         "type": "opencollective",
@@ -22219,9 +22219,9 @@
       }
     },
     "core-js": {
-      "version": "3.33.2",
-      "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.33.2.tgz",
-      "integrity": "sha512-XeBzWI6QL3nJQiHmdzbAOiMYqjrb7hwU7A39Qhvd/POSa/t9E1AeZyEZx3fNvp/vtM8zXwhoL0FsiS0hD0pruQ=="
+      "version": "3.33.3",
+      "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.33.3.tgz",
+      "integrity": "sha512-lo0kOocUlLKmm6kv/FswQL8zbkH7mVsLJ/FULClOhv8WRVmKLVcs6XPNQAzstfeJTCHMyButEwG+z1kHxHoDZw=="
     },
     "core-js-compat": {
       "version": "3.33.0",
diff --git a/apps/block_scout_web/assets/package.json b/apps/block_scout_web/assets/package.json
index b6d4b193cf2c..fc6db5e6c5f7 100644
--- a/apps/block_scout_web/assets/package.json
+++ b/apps/block_scout_web/assets/package.json
@@ -29,7 +29,7 @@
     "chart.js": "^4.4.0",
     "chartjs-adapter-luxon": "^1.3.1",
     "clipboard": "^2.0.11",
-    "core-js": "^3.33.2",
+    "core-js": "^3.33.3",
     "crypto-browserify": "^3.12.0",
     "dropzone": "^5.9.3",
     "eth-net-props": "^1.0.41",

From d84ee9d747d834efff4faddd5025016a01d11336 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 20 Nov 2023 18:49:46 +0000
Subject: [PATCH 677/909] Bump @amplitude/analytics-browser in
 /apps/block_scout_web/assets

Bumps [@amplitude/analytics-browser](https://github.com/amplitude/Amplitude-TypeScript) from 2.3.3 to 2.3.5.
- [Release notes](https://github.com/amplitude/Amplitude-TypeScript/releases)
- [Commits](https://github.com/amplitude/Amplitude-TypeScript/compare/@amplitude/analytics-browser@2.3.3...@amplitude/analytics-browser@2.3.5)

---
updated-dependencies:
- dependency-name: "@amplitude/analytics-browser"
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 apps/block_scout_web/assets/package-lock.json | 130 +++++++++---------
 apps/block_scout_web/assets/package.json      |   2 +-
 2 files changed, 66 insertions(+), 66 deletions(-)

diff --git a/apps/block_scout_web/assets/package-lock.json b/apps/block_scout_web/assets/package-lock.json
index 0fc330c2a4a0..3b0167df6826 100644
--- a/apps/block_scout_web/assets/package-lock.json
+++ b/apps/block_scout_web/assets/package-lock.json
@@ -7,7 +7,7 @@
       "name": "blockscout",
       "license": "GPL-3.0",
       "dependencies": {
-        "@amplitude/analytics-browser": "^2.3.3",
+        "@amplitude/analytics-browser": "^2.3.5",
         "@fortawesome/fontawesome-free": "^6.4.2",
         "@tarekraafat/autocomplete.js": "^10.2.7",
         "@walletconnect/web3-provider": "^1.8.0",
@@ -116,15 +116,15 @@
       }
     },
     "node_modules/@amplitude/analytics-browser": {
-      "version": "2.3.3",
-      "resolved": "https://registry.npmjs.org/@amplitude/analytics-browser/-/analytics-browser-2.3.3.tgz",
-      "integrity": "sha512-we1tw7fn+yyf2waAyw/XqBOTEwIEY19qXJ5B9d1Xc1SKNxb6HzU5IpD3zbTKwZLlCGKbkVY6wI3JxuuoYIAI2w==",
-      "dependencies": {
-        "@amplitude/analytics-client-common": "^2.0.7",
-        "@amplitude/analytics-core": "^2.1.0",
-        "@amplitude/analytics-types": "^2.3.0",
-        "@amplitude/plugin-page-view-tracking-browser": "^2.0.13",
-        "@amplitude/plugin-web-attribution-browser": "^2.0.13",
+      "version": "2.3.5",
+      "resolved": "https://registry.npmjs.org/@amplitude/analytics-browser/-/analytics-browser-2.3.5.tgz",
+      "integrity": "sha512-KL9Yv0lXvCsWrCwwWAMB0kzTswBlTLxxyOAS//z0378ckQvszLYvQqje3K5t0AlXrG728cLvKcBFveZ/UgUWfg==",
+      "dependencies": {
+        "@amplitude/analytics-client-common": "^2.0.8",
+        "@amplitude/analytics-core": "^2.1.1",
+        "@amplitude/analytics-types": "^2.3.1",
+        "@amplitude/plugin-page-view-tracking-browser": "^2.0.15",
+        "@amplitude/plugin-web-attribution-browser": "^2.0.15",
         "tslib": "^2.4.1"
       }
     },
@@ -134,13 +134,13 @@
       "integrity": "sha512-tGyy4dAjRIEwI7BzsB0lynWgOpfqjUdq91XXAlIWD2OwKBH7oCl/GZG/HT4BOHrTlPMOASlMQ7veyTqpmRcrNA=="
     },
     "node_modules/@amplitude/analytics-client-common": {
-      "version": "2.0.7",
-      "resolved": "https://registry.npmjs.org/@amplitude/analytics-client-common/-/analytics-client-common-2.0.7.tgz",
-      "integrity": "sha512-2LqPMsY6ksS1OTda0EFPLUDFmIVTwU0bDN17+uY9WvpWTEWCAL616X2oNCQ6FTB9zWfCTr8X2I5jSS0y4rzPkw==",
+      "version": "2.0.8",
+      "resolved": "https://registry.npmjs.org/@amplitude/analytics-client-common/-/analytics-client-common-2.0.8.tgz",
+      "integrity": "sha512-zKD/txmMFPfSVtT2gdZw+Tf07pZQEcPcB6X39+a+Wh8PjIIADYIeq6zL/2pn/9uwMkVz66sbKABKbq69XxPfCA==",
       "dependencies": {
         "@amplitude/analytics-connector": "^1.4.8",
-        "@amplitude/analytics-core": "^2.1.0",
-        "@amplitude/analytics-types": "^2.3.0",
+        "@amplitude/analytics-core": "^2.1.1",
+        "@amplitude/analytics-types": "^2.3.1",
         "tslib": "^2.4.1"
       }
     },
@@ -155,11 +155,11 @@
       "integrity": "sha512-T8mOYzB9RRxckzhL0NTHwdge9xuFxXEOplC8B1Y3UX3NHa3BLh7DlBUZlCOwQgMc2nxDfnSweDL5S3bhC+W90g=="
     },
     "node_modules/@amplitude/analytics-core": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/@amplitude/analytics-core/-/analytics-core-2.1.0.tgz",
-      "integrity": "sha512-a7/WUacF+R6J8NTYf93gaVd3OjOyF0db2K9Y6+uSZp/xIbsGyR/47WN1R3CYPm4IC9Y9/ukBAHd/p4FsNJbsNg==",
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/@amplitude/analytics-core/-/analytics-core-2.1.1.tgz",
+      "integrity": "sha512-2dHHiOnK7J/0Uk3gqu70JEvCKSgNBAXIUvw6u7bEHCQHBBW3ulpsVRSQomBeruyBBLKjgarwgawGs3yJrjIDkA==",
       "dependencies": {
-        "@amplitude/analytics-types": "^2.3.0",
+        "@amplitude/analytics-types": "^2.3.1",
         "tslib": "^2.4.1"
       }
     },
@@ -169,17 +169,17 @@
       "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q=="
     },
     "node_modules/@amplitude/analytics-types": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/@amplitude/analytics-types/-/analytics-types-2.3.0.tgz",
-      "integrity": "sha512-/sMCgimMzDjGZDh5ekHUrwKVi4IJc8/AFUXIxEuJn4wd9QVmThWNeKfszA36z6Ue+UOHhEUEZwruXo3PwXWz/g=="
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/@amplitude/analytics-types/-/analytics-types-2.3.1.tgz",
+      "integrity": "sha512-yojBG20qvph0rpCJKb4i/FJa+otqLINEwv//hfzvjnCOcPPyS0YscI8oiRBM0rG7kZIDgaL9a6jPwkqK4ACmcw=="
     },
     "node_modules/@amplitude/plugin-page-view-tracking-browser": {
-      "version": "2.0.13",
-      "resolved": "https://registry.npmjs.org/@amplitude/plugin-page-view-tracking-browser/-/plugin-page-view-tracking-browser-2.0.13.tgz",
-      "integrity": "sha512-23X7tEublqLx6cs7o7KXyQ9UdfX0lSVNHDgurhuGdAV8yEeTdg9bRvVHGZETZtnbQj31avD7M2U31nXXaopX3A==",
+      "version": "2.0.15",
+      "resolved": "https://registry.npmjs.org/@amplitude/plugin-page-view-tracking-browser/-/plugin-page-view-tracking-browser-2.0.15.tgz",
+      "integrity": "sha512-iVviovZWROodoNs984dAslm3vCkMsl6bhIq5K0Tabt4ffi4ygIqlhdV8vj4Grr8u6mGtjgEzFchCkxdzb9TU1A==",
       "dependencies": {
-        "@amplitude/analytics-client-common": "^2.0.7",
-        "@amplitude/analytics-types": "^2.3.0",
+        "@amplitude/analytics-client-common": "^2.0.8",
+        "@amplitude/analytics-types": "^2.3.1",
         "tslib": "^2.4.1"
       }
     },
@@ -189,13 +189,13 @@
       "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q=="
     },
     "node_modules/@amplitude/plugin-web-attribution-browser": {
-      "version": "2.0.13",
-      "resolved": "https://registry.npmjs.org/@amplitude/plugin-web-attribution-browser/-/plugin-web-attribution-browser-2.0.13.tgz",
-      "integrity": "sha512-oVsVxNk/twdcE5r5v+ALX3C443Q1NQGTaKNvbxyO/k3DiEGmKpgC8hSj9S5O7ZdrII63cS+u0IHevRXgmEnplg==",
+      "version": "2.0.15",
+      "resolved": "https://registry.npmjs.org/@amplitude/plugin-web-attribution-browser/-/plugin-web-attribution-browser-2.0.15.tgz",
+      "integrity": "sha512-HSS6j2a40iSIKwug7ICzezXl6ag+cj7YU7cFbYiSF+cmNIVg4jPYgVCbTqq+IivOw+VW07pr0o+jz0ArL/Lyiw==",
       "dependencies": {
-        "@amplitude/analytics-client-common": "^2.0.7",
-        "@amplitude/analytics-core": "^2.1.0",
-        "@amplitude/analytics-types": "^2.3.0",
+        "@amplitude/analytics-client-common": "^2.0.8",
+        "@amplitude/analytics-core": "^2.1.1",
+        "@amplitude/analytics-types": "^2.3.1",
         "tslib": "^2.4.1"
       }
     },
@@ -17854,15 +17854,15 @@
       "dev": true
     },
     "@amplitude/analytics-browser": {
-      "version": "2.3.3",
-      "resolved": "https://registry.npmjs.org/@amplitude/analytics-browser/-/analytics-browser-2.3.3.tgz",
-      "integrity": "sha512-we1tw7fn+yyf2waAyw/XqBOTEwIEY19qXJ5B9d1Xc1SKNxb6HzU5IpD3zbTKwZLlCGKbkVY6wI3JxuuoYIAI2w==",
-      "requires": {
-        "@amplitude/analytics-client-common": "^2.0.7",
-        "@amplitude/analytics-core": "^2.1.0",
-        "@amplitude/analytics-types": "^2.3.0",
-        "@amplitude/plugin-page-view-tracking-browser": "^2.0.13",
-        "@amplitude/plugin-web-attribution-browser": "^2.0.13",
+      "version": "2.3.5",
+      "resolved": "https://registry.npmjs.org/@amplitude/analytics-browser/-/analytics-browser-2.3.5.tgz",
+      "integrity": "sha512-KL9Yv0lXvCsWrCwwWAMB0kzTswBlTLxxyOAS//z0378ckQvszLYvQqje3K5t0AlXrG728cLvKcBFveZ/UgUWfg==",
+      "requires": {
+        "@amplitude/analytics-client-common": "^2.0.8",
+        "@amplitude/analytics-core": "^2.1.1",
+        "@amplitude/analytics-types": "^2.3.1",
+        "@amplitude/plugin-page-view-tracking-browser": "^2.0.15",
+        "@amplitude/plugin-web-attribution-browser": "^2.0.15",
         "tslib": "^2.4.1"
       },
       "dependencies": {
@@ -17874,13 +17874,13 @@
       }
     },
     "@amplitude/analytics-client-common": {
-      "version": "2.0.7",
-      "resolved": "https://registry.npmjs.org/@amplitude/analytics-client-common/-/analytics-client-common-2.0.7.tgz",
-      "integrity": "sha512-2LqPMsY6ksS1OTda0EFPLUDFmIVTwU0bDN17+uY9WvpWTEWCAL616X2oNCQ6FTB9zWfCTr8X2I5jSS0y4rzPkw==",
+      "version": "2.0.8",
+      "resolved": "https://registry.npmjs.org/@amplitude/analytics-client-common/-/analytics-client-common-2.0.8.tgz",
+      "integrity": "sha512-zKD/txmMFPfSVtT2gdZw+Tf07pZQEcPcB6X39+a+Wh8PjIIADYIeq6zL/2pn/9uwMkVz66sbKABKbq69XxPfCA==",
       "requires": {
         "@amplitude/analytics-connector": "^1.4.8",
-        "@amplitude/analytics-core": "^2.1.0",
-        "@amplitude/analytics-types": "^2.3.0",
+        "@amplitude/analytics-core": "^2.1.1",
+        "@amplitude/analytics-types": "^2.3.1",
         "tslib": "^2.4.1"
       },
       "dependencies": {
@@ -17897,11 +17897,11 @@
       "integrity": "sha512-T8mOYzB9RRxckzhL0NTHwdge9xuFxXEOplC8B1Y3UX3NHa3BLh7DlBUZlCOwQgMc2nxDfnSweDL5S3bhC+W90g=="
     },
     "@amplitude/analytics-core": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/@amplitude/analytics-core/-/analytics-core-2.1.0.tgz",
-      "integrity": "sha512-a7/WUacF+R6J8NTYf93gaVd3OjOyF0db2K9Y6+uSZp/xIbsGyR/47WN1R3CYPm4IC9Y9/ukBAHd/p4FsNJbsNg==",
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/@amplitude/analytics-core/-/analytics-core-2.1.1.tgz",
+      "integrity": "sha512-2dHHiOnK7J/0Uk3gqu70JEvCKSgNBAXIUvw6u7bEHCQHBBW3ulpsVRSQomBeruyBBLKjgarwgawGs3yJrjIDkA==",
       "requires": {
-        "@amplitude/analytics-types": "^2.3.0",
+        "@amplitude/analytics-types": "^2.3.1",
         "tslib": "^2.4.1"
       },
       "dependencies": {
@@ -17913,17 +17913,17 @@
       }
     },
     "@amplitude/analytics-types": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/@amplitude/analytics-types/-/analytics-types-2.3.0.tgz",
-      "integrity": "sha512-/sMCgimMzDjGZDh5ekHUrwKVi4IJc8/AFUXIxEuJn4wd9QVmThWNeKfszA36z6Ue+UOHhEUEZwruXo3PwXWz/g=="
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/@amplitude/analytics-types/-/analytics-types-2.3.1.tgz",
+      "integrity": "sha512-yojBG20qvph0rpCJKb4i/FJa+otqLINEwv//hfzvjnCOcPPyS0YscI8oiRBM0rG7kZIDgaL9a6jPwkqK4ACmcw=="
     },
     "@amplitude/plugin-page-view-tracking-browser": {
-      "version": "2.0.13",
-      "resolved": "https://registry.npmjs.org/@amplitude/plugin-page-view-tracking-browser/-/plugin-page-view-tracking-browser-2.0.13.tgz",
-      "integrity": "sha512-23X7tEublqLx6cs7o7KXyQ9UdfX0lSVNHDgurhuGdAV8yEeTdg9bRvVHGZETZtnbQj31avD7M2U31nXXaopX3A==",
+      "version": "2.0.15",
+      "resolved": "https://registry.npmjs.org/@amplitude/plugin-page-view-tracking-browser/-/plugin-page-view-tracking-browser-2.0.15.tgz",
+      "integrity": "sha512-iVviovZWROodoNs984dAslm3vCkMsl6bhIq5K0Tabt4ffi4ygIqlhdV8vj4Grr8u6mGtjgEzFchCkxdzb9TU1A==",
       "requires": {
-        "@amplitude/analytics-client-common": "^2.0.7",
-        "@amplitude/analytics-types": "^2.3.0",
+        "@amplitude/analytics-client-common": "^2.0.8",
+        "@amplitude/analytics-types": "^2.3.1",
         "tslib": "^2.4.1"
       },
       "dependencies": {
@@ -17935,13 +17935,13 @@
       }
     },
     "@amplitude/plugin-web-attribution-browser": {
-      "version": "2.0.13",
-      "resolved": "https://registry.npmjs.org/@amplitude/plugin-web-attribution-browser/-/plugin-web-attribution-browser-2.0.13.tgz",
-      "integrity": "sha512-oVsVxNk/twdcE5r5v+ALX3C443Q1NQGTaKNvbxyO/k3DiEGmKpgC8hSj9S5O7ZdrII63cS+u0IHevRXgmEnplg==",
+      "version": "2.0.15",
+      "resolved": "https://registry.npmjs.org/@amplitude/plugin-web-attribution-browser/-/plugin-web-attribution-browser-2.0.15.tgz",
+      "integrity": "sha512-HSS6j2a40iSIKwug7ICzezXl6ag+cj7YU7cFbYiSF+cmNIVg4jPYgVCbTqq+IivOw+VW07pr0o+jz0ArL/Lyiw==",
       "requires": {
-        "@amplitude/analytics-client-common": "^2.0.7",
-        "@amplitude/analytics-core": "^2.1.0",
-        "@amplitude/analytics-types": "^2.3.0",
+        "@amplitude/analytics-client-common": "^2.0.8",
+        "@amplitude/analytics-core": "^2.1.1",
+        "@amplitude/analytics-types": "^2.3.1",
         "tslib": "^2.4.1"
       },
       "dependencies": {
diff --git a/apps/block_scout_web/assets/package.json b/apps/block_scout_web/assets/package.json
index b6d4b193cf2c..0ba88716bfc1 100644
--- a/apps/block_scout_web/assets/package.json
+++ b/apps/block_scout_web/assets/package.json
@@ -20,7 +20,7 @@
   },
   "dependencies": {
     "@fortawesome/fontawesome-free": "^6.4.2",
-    "@amplitude/analytics-browser": "^2.3.3",
+    "@amplitude/analytics-browser": "^2.3.5",
     "@tarekraafat/autocomplete.js": "^10.2.7",
     "@walletconnect/web3-provider": "^1.8.0",
     "assert": "^2.1.0",

From 7f5d6dd209e7552d9211fdf9193dd601d2c29b08 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 20 Nov 2023 18:50:18 +0000
Subject: [PATCH 678/909] Bump eslint from 8.53.0 to 8.54.0 in
 /apps/block_scout_web/assets

Bumps [eslint](https://github.com/eslint/eslint) from 8.53.0 to 8.54.0.
- [Release notes](https://github.com/eslint/eslint/releases)
- [Changelog](https://github.com/eslint/eslint/blob/main/CHANGELOG.md)
- [Commits](https://github.com/eslint/eslint/compare/v8.53.0...v8.54.0)

---
updated-dependencies:
- dependency-name: eslint
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 apps/block_scout_web/assets/package-lock.json | 30 +++++++++----------
 apps/block_scout_web/assets/package.json      |  2 +-
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/apps/block_scout_web/assets/package-lock.json b/apps/block_scout_web/assets/package-lock.json
index 0fc330c2a4a0..75bd49a4bfcc 100644
--- a/apps/block_scout_web/assets/package-lock.json
+++ b/apps/block_scout_web/assets/package-lock.json
@@ -78,7 +78,7 @@
         "copy-webpack-plugin": "^11.0.0",
         "css-loader": "^6.8.1",
         "css-minimizer-webpack-plugin": "^5.0.1",
-        "eslint": "^8.53.0",
+        "eslint": "^8.54.0",
         "eslint-config-standard": "^17.1.0",
         "eslint-plugin-import": "^2.29.0",
         "eslint-plugin-node": "^11.1.0",
@@ -2122,9 +2122,9 @@
       }
     },
     "node_modules/@eslint/js": {
-      "version": "8.53.0",
-      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.53.0.tgz",
-      "integrity": "sha512-Kn7K8dx/5U6+cT1yEhpX1w4PCSg0M+XyRILPgvwcEBjerFWCwQj5sbr3/VmxqV0JGHCBCzyd6LxypEuehypY1w==",
+      "version": "8.54.0",
+      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.54.0.tgz",
+      "integrity": "sha512-ut5V+D+fOoWPgGGNj83GGjnntO39xDy6DWxO0wb7Jp3DcMX0TfIqdzHF85VTQkerdyGmuuMD9AKAo5KiNlf/AQ==",
       "dev": true,
       "engines": {
         "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
@@ -7306,15 +7306,15 @@
       }
     },
     "node_modules/eslint": {
-      "version": "8.53.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.53.0.tgz",
-      "integrity": "sha512-N4VuiPjXDUa4xVeV/GC/RV3hQW9Nw+Y463lkWaKKXKYMvmRiRDAtfpuPFLN+E1/6ZhyR8J2ig+eVREnYgUsiag==",
+      "version": "8.54.0",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.54.0.tgz",
+      "integrity": "sha512-NY0DfAkM8BIZDVl6PgSa1ttZbx3xHgJzSNJKYcQglem6CppHyMhRIQkBVSSMaSRnLhig3jsDbEzOjwCVt4AmmA==",
       "dev": true,
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.2.0",
         "@eslint-community/regexpp": "^4.6.1",
         "@eslint/eslintrc": "^2.1.3",
-        "@eslint/js": "8.53.0",
+        "@eslint/js": "8.54.0",
         "@humanwhocodes/config-array": "^0.11.13",
         "@humanwhocodes/module-importer": "^1.0.1",
         "@nodelib/fs.walk": "^1.2.8",
@@ -19294,9 +19294,9 @@
       }
     },
     "@eslint/js": {
-      "version": "8.53.0",
-      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.53.0.tgz",
-      "integrity": "sha512-Kn7K8dx/5U6+cT1yEhpX1w4PCSg0M+XyRILPgvwcEBjerFWCwQj5sbr3/VmxqV0JGHCBCzyd6LxypEuehypY1w==",
+      "version": "8.54.0",
+      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.54.0.tgz",
+      "integrity": "sha512-ut5V+D+fOoWPgGGNj83GGjnntO39xDy6DWxO0wb7Jp3DcMX0TfIqdzHF85VTQkerdyGmuuMD9AKAo5KiNlf/AQ==",
       "dev": true
     },
     "@ethereumjs/common": {
@@ -23254,15 +23254,15 @@
       }
     },
     "eslint": {
-      "version": "8.53.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.53.0.tgz",
-      "integrity": "sha512-N4VuiPjXDUa4xVeV/GC/RV3hQW9Nw+Y463lkWaKKXKYMvmRiRDAtfpuPFLN+E1/6ZhyR8J2ig+eVREnYgUsiag==",
+      "version": "8.54.0",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.54.0.tgz",
+      "integrity": "sha512-NY0DfAkM8BIZDVl6PgSa1ttZbx3xHgJzSNJKYcQglem6CppHyMhRIQkBVSSMaSRnLhig3jsDbEzOjwCVt4AmmA==",
       "dev": true,
       "requires": {
         "@eslint-community/eslint-utils": "^4.2.0",
         "@eslint-community/regexpp": "^4.6.1",
         "@eslint/eslintrc": "^2.1.3",
-        "@eslint/js": "8.53.0",
+        "@eslint/js": "8.54.0",
         "@humanwhocodes/config-array": "^0.11.13",
         "@humanwhocodes/module-importer": "^1.0.1",
         "@nodelib/fs.walk": "^1.2.8",
diff --git a/apps/block_scout_web/assets/package.json b/apps/block_scout_web/assets/package.json
index b6d4b193cf2c..f249705bde14 100644
--- a/apps/block_scout_web/assets/package.json
+++ b/apps/block_scout_web/assets/package.json
@@ -90,7 +90,7 @@
     "copy-webpack-plugin": "^11.0.0",
     "css-loader": "^6.8.1",
     "css-minimizer-webpack-plugin": "^5.0.1",
-    "eslint": "^8.53.0",
+    "eslint": "^8.54.0",
     "eslint-config-standard": "^17.1.0",
     "eslint-plugin-import": "^2.29.0",
     "eslint-plugin-node": "^11.1.0",

From 98ded8ed2760a3b6f53824062fdac0142d128042 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 20 Nov 2023 18:50:40 +0000
Subject: [PATCH 679/909] Bump sweetalert2 from 11.9.0 to 11.10.1 in
 /apps/block_scout_web/assets

Bumps [sweetalert2](https://github.com/sweetalert2/sweetalert2) from 11.9.0 to 11.10.1.
- [Release notes](https://github.com/sweetalert2/sweetalert2/releases)
- [Changelog](https://github.com/sweetalert2/sweetalert2/blob/main/CHANGELOG.md)
- [Commits](https://github.com/sweetalert2/sweetalert2/compare/v11.9.0...v11.10.1)

---
updated-dependencies:
- dependency-name: sweetalert2
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 apps/block_scout_web/assets/package-lock.json | 14 +++++++-------
 apps/block_scout_web/assets/package.json      |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/apps/block_scout_web/assets/package-lock.json b/apps/block_scout_web/assets/package-lock.json
index 0fc330c2a4a0..d00970545f78 100644
--- a/apps/block_scout_web/assets/package-lock.json
+++ b/apps/block_scout_web/assets/package-lock.json
@@ -61,7 +61,7 @@
         "redux": "^4.2.1",
         "stream-browserify": "^3.0.0",
         "stream-http": "^3.1.1",
-        "sweetalert2": "^11.9.0",
+        "sweetalert2": "^11.10.1",
         "urijs": "^1.19.11",
         "url": "^0.11.3",
         "util": "^0.12.5",
@@ -16086,9 +16086,9 @@
       }
     },
     "node_modules/sweetalert2": {
-      "version": "11.9.0",
-      "resolved": "https://registry.npmjs.org/sweetalert2/-/sweetalert2-11.9.0.tgz",
-      "integrity": "sha512-PA3qinKZMNGAhA+AUu2wU7yQOpeZCgOaYWRcg26f4cZN6f7M9iPBuobsxOhR9EHs7ihUIxT6vhAMiB4kcmk1SA==",
+      "version": "11.10.1",
+      "resolved": "https://registry.npmjs.org/sweetalert2/-/sweetalert2-11.10.1.tgz",
+      "integrity": "sha512-qu145oBuFfjYr5yZW9OSdG6YmRxDf8CnkgT/sXMfrXGe+asFy2imC2vlaLQ/L/naZ/JZna1MPAY56G4qYM0VUQ==",
       "funding": {
         "type": "individual",
         "url": "https://github.com/sponsors/limonte"
@@ -29891,9 +29891,9 @@
       }
     },
     "sweetalert2": {
-      "version": "11.9.0",
-      "resolved": "https://registry.npmjs.org/sweetalert2/-/sweetalert2-11.9.0.tgz",
-      "integrity": "sha512-PA3qinKZMNGAhA+AUu2wU7yQOpeZCgOaYWRcg26f4cZN6f7M9iPBuobsxOhR9EHs7ihUIxT6vhAMiB4kcmk1SA=="
+      "version": "11.10.1",
+      "resolved": "https://registry.npmjs.org/sweetalert2/-/sweetalert2-11.10.1.tgz",
+      "integrity": "sha512-qu145oBuFfjYr5yZW9OSdG6YmRxDf8CnkgT/sXMfrXGe+asFy2imC2vlaLQ/L/naZ/JZna1MPAY56G4qYM0VUQ=="
     },
     "symbol-tree": {
       "version": "3.2.4",
diff --git a/apps/block_scout_web/assets/package.json b/apps/block_scout_web/assets/package.json
index b6d4b193cf2c..ecb236f04216 100644
--- a/apps/block_scout_web/assets/package.json
+++ b/apps/block_scout_web/assets/package.json
@@ -73,7 +73,7 @@
     "redux": "^4.2.1",
     "stream-browserify": "^3.0.0",
     "stream-http": "^3.1.1",
-    "sweetalert2": "^11.9.0",
+    "sweetalert2": "^11.10.1",
     "urijs": "^1.19.11",
     "url": "^0.11.3",
     "util": "^0.12.5",

From c1fdee0b5e5f89200e7c21bf74c898c505623953 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 20 Nov 2023 18:50:59 +0000
Subject: [PATCH 680/909] Bump mixpanel-browser in /apps/block_scout_web/assets

Bumps [mixpanel-browser](https://github.com/mixpanel/mixpanel-js) from 2.47.0 to 2.48.1.
- [Release notes](https://github.com/mixpanel/mixpanel-js/releases)
- [Changelog](https://github.com/mixpanel/mixpanel-js/blob/master/CHANGELOG.md)
- [Commits](https://github.com/mixpanel/mixpanel-js/compare/v2.47.0...v2.48.1)

---
updated-dependencies:
- dependency-name: mixpanel-browser
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 apps/block_scout_web/assets/package-lock.json | 14 +++++++-------
 apps/block_scout_web/assets/package.json      |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/apps/block_scout_web/assets/package-lock.json b/apps/block_scout_web/assets/package-lock.json
index 0fc330c2a4a0..e76404be8dc1 100644
--- a/apps/block_scout_web/assets/package-lock.json
+++ b/apps/block_scout_web/assets/package-lock.json
@@ -46,7 +46,7 @@
         "lodash.reduce": "^4.6.0",
         "luxon": "^3.4.4",
         "malihu-custom-scrollbar-plugin": "3.1.5",
-        "mixpanel-browser": "^2.47.0",
+        "mixpanel-browser": "^2.48.1",
         "moment": "^2.29.4",
         "nanomorph": "^5.4.0",
         "numeral": "^2.0.6",
@@ -12885,9 +12885,9 @@
       }
     },
     "node_modules/mixpanel-browser": {
-      "version": "2.47.0",
-      "resolved": "https://registry.npmjs.org/mixpanel-browser/-/mixpanel-browser-2.47.0.tgz",
-      "integrity": "sha512-Ldrva0fRBEIFWmEibBQO1PulfpJVF3pf28Guk09lDirDaSQqqU/xs9zQLwN2rL5VwVtsP1aD3JaCgaa98EjojQ=="
+      "version": "2.48.1",
+      "resolved": "https://registry.npmjs.org/mixpanel-browser/-/mixpanel-browser-2.48.1.tgz",
+      "integrity": "sha512-vXTuUzZMg+ht7sRqyjtc3dUDy/81Z/H6FLFgFkUZJqKFaAqcx1JSXmOdY/2kmsxCkUdy5JN5zW9m9TMCk+rxGQ=="
     },
     "node_modules/mkdirp": {
       "version": "3.0.1",
@@ -27592,9 +27592,9 @@
       }
     },
     "mixpanel-browser": {
-      "version": "2.47.0",
-      "resolved": "https://registry.npmjs.org/mixpanel-browser/-/mixpanel-browser-2.47.0.tgz",
-      "integrity": "sha512-Ldrva0fRBEIFWmEibBQO1PulfpJVF3pf28Guk09lDirDaSQqqU/xs9zQLwN2rL5VwVtsP1aD3JaCgaa98EjojQ=="
+      "version": "2.48.1",
+      "resolved": "https://registry.npmjs.org/mixpanel-browser/-/mixpanel-browser-2.48.1.tgz",
+      "integrity": "sha512-vXTuUzZMg+ht7sRqyjtc3dUDy/81Z/H6FLFgFkUZJqKFaAqcx1JSXmOdY/2kmsxCkUdy5JN5zW9m9TMCk+rxGQ=="
     },
     "mkdirp": {
       "version": "3.0.1",
diff --git a/apps/block_scout_web/assets/package.json b/apps/block_scout_web/assets/package.json
index b6d4b193cf2c..adbec7d51aa4 100644
--- a/apps/block_scout_web/assets/package.json
+++ b/apps/block_scout_web/assets/package.json
@@ -58,7 +58,7 @@
     "lodash.reduce": "^4.6.0",
     "luxon": "^3.4.4",
     "malihu-custom-scrollbar-plugin": "3.1.5",
-    "mixpanel-browser": "^2.47.0",
+    "mixpanel-browser": "^2.48.1",
     "moment": "^2.29.4",
     "nanomorph": "^5.4.0",
     "numeral": "^2.0.6",

From 32a8e811813ac079257775371a1550b64314bdfb Mon Sep 17 00:00:00 2001
From: Viktor Baranov <baranov.viktor.27@gmail.com>
Date: Tue, 21 Nov 2023 00:23:23 +0400
Subject: [PATCH 681/909] v5.3.2

---
 .github/ISSUE_TEMPLATE/bug_report.yml         |  2 +-
 .../publish-docker-image-every-push.yml       |  2 +-
 .../publish-docker-image-for-core.yml         |  2 +-
 .../publish-docker-image-for-eth-goerli.yml   |  2 +-
 .../publish-docker-image-for-eth-sepolia.yml  |  2 +-
 .../publish-docker-image-for-eth.yml          |  2 +-
 .../publish-docker-image-for-fuse.yml         |  2 +-
 .../publish-docker-image-for-immutable.yml    |  2 +-
 .../publish-docker-image-for-l2-staging.yml   |  2 +-
 .../publish-docker-image-for-lukso.yml        |  2 +-
 .../publish-docker-image-for-optimism.yml     |  2 +-
 .../publish-docker-image-for-polygon-edge.yml |  2 +-
 .../publish-docker-image-for-rsk.yml          |  2 +-
 .../publish-docker-image-for-stability.yml    |  2 +-
 .../publish-docker-image-for-suave.yml        |  2 +-
 .../publish-docker-image-for-xdai.yml         |  2 +-
 .../publish-docker-image-for-zkevm.yml        |  2 +-
 .../publish-docker-image-for-zksync.yml       |  2 +-
 ...ublish-docker-image-release-additional.yml |  2 +-
 .../publish-docker-image-release.yml          |  4 +--
 CHANGELOG.md                                  | 28 +++++++++++++++++++
 apps/block_scout_web/mix.exs                  |  2 +-
 apps/ethereum_jsonrpc/mix.exs                 |  2 +-
 apps/explorer/mix.exs                         |  2 +-
 apps/indexer/mix.exs                          |  2 +-
 docker-compose/docker-compose.yml             |  2 +-
 docker/Makefile                               |  2 +-
 mix.exs                                       |  2 +-
 rel/config.exs                                |  2 +-
 29 files changed, 57 insertions(+), 29 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
index d8441328e0cc..1888fe929049 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -65,7 +65,7 @@ body:
     attributes:
       label: Backend version
       description: The release version of the backend or branch/commit.
-      placeholder: v5.3.1
+      placeholder: v5.3.2
     validations:
       required: true
 
diff --git a/.github/workflows/publish-docker-image-every-push.yml b/.github/workflows/publish-docker-image-every-push.yml
index 25d5b90e1470..98fc8a4de88b 100644
--- a/.github/workflows/publish-docker-image-every-push.yml
+++ b/.github/workflows/publish-docker-image-every-push.yml
@@ -7,7 +7,7 @@ on:
 env:
   OTP_VERSION: '25.2.1'
   ELIXIR_VERSION: '1.14.5'
-  RELEASE_VERSION: 5.3.1
+  RELEASE_VERSION: 5.3.2
 
 jobs:
   push_to_registry:
diff --git a/.github/workflows/publish-docker-image-for-core.yml b/.github/workflows/publish-docker-image-for-core.yml
index 25bb973ee358..591a50a53f03 100644
--- a/.github/workflows/publish-docker-image-for-core.yml
+++ b/.github/workflows/publish-docker-image-for-core.yml
@@ -14,7 +14,7 @@ jobs:
     name: Push Docker image to Docker Hub
     runs-on: ubuntu-latest
     env:
-      RELEASE_VERSION: 5.3.1
+      RELEASE_VERSION: 5.3.2
       DOCKER_CHAIN_NAME: poa
     steps:
       - name: Check out the repo
diff --git a/.github/workflows/publish-docker-image-for-eth-goerli.yml b/.github/workflows/publish-docker-image-for-eth-goerli.yml
index f871e4fa0b3b..c4028b0cbbb0 100644
--- a/.github/workflows/publish-docker-image-for-eth-goerli.yml
+++ b/.github/workflows/publish-docker-image-for-eth-goerli.yml
@@ -14,7 +14,7 @@ jobs:
     name: Push Docker image to Docker Hub
     runs-on: ubuntu-latest
     env:
-      RELEASE_VERSION: 5.3.1
+      RELEASE_VERSION: 5.3.2
       DOCKER_CHAIN_NAME: eth-goerli
     steps:
       - name: Check out the repo
diff --git a/.github/workflows/publish-docker-image-for-eth-sepolia.yml b/.github/workflows/publish-docker-image-for-eth-sepolia.yml
index d53b987b0a1c..da11bfdfacbb 100644
--- a/.github/workflows/publish-docker-image-for-eth-sepolia.yml
+++ b/.github/workflows/publish-docker-image-for-eth-sepolia.yml
@@ -14,7 +14,7 @@ jobs:
     name: Push Docker image to Docker Hub
     runs-on: ubuntu-latest
     env:
-      RELEASE_VERSION: 5.3.1
+      RELEASE_VERSION: 5.3.2
       DOCKER_CHAIN_NAME: eth-sepolia
     steps:
       - name: Check out the repo
diff --git a/.github/workflows/publish-docker-image-for-eth.yml b/.github/workflows/publish-docker-image-for-eth.yml
index 5ea173e78ae7..a7286696a5e5 100644
--- a/.github/workflows/publish-docker-image-for-eth.yml
+++ b/.github/workflows/publish-docker-image-for-eth.yml
@@ -14,7 +14,7 @@ jobs:
     name: Push Docker image to Docker Hub
     runs-on: ubuntu-latest
     env:
-      RELEASE_VERSION: 5.3.1
+      RELEASE_VERSION: 5.3.2
       DOCKER_CHAIN_NAME: mainnet
     steps:
       - name: Check out the repo
diff --git a/.github/workflows/publish-docker-image-for-fuse.yml b/.github/workflows/publish-docker-image-for-fuse.yml
index 1f7501eab860..7aa400a5a715 100644
--- a/.github/workflows/publish-docker-image-for-fuse.yml
+++ b/.github/workflows/publish-docker-image-for-fuse.yml
@@ -14,7 +14,7 @@ jobs:
     name: Push Docker image to Docker Hub
     runs-on: ubuntu-latest
     env:
-      RELEASE_VERSION: 5.3.1
+      RELEASE_VERSION: 5.3.2
       DOCKER_CHAIN_NAME: fuse
     steps:
       - name: Check out the repo
diff --git a/.github/workflows/publish-docker-image-for-immutable.yml b/.github/workflows/publish-docker-image-for-immutable.yml
index 67b0a7b70974..3423d5161547 100644
--- a/.github/workflows/publish-docker-image-for-immutable.yml
+++ b/.github/workflows/publish-docker-image-for-immutable.yml
@@ -14,7 +14,7 @@ jobs:
     name: Push Docker image to Docker Hub
     runs-on: ubuntu-latest
     env:
-      RELEASE_VERSION: 5.3.1
+      RELEASE_VERSION: 5.3.2
       DOCKER_CHAIN_NAME: immutable
     steps:
       - name: Check out the repo
diff --git a/.github/workflows/publish-docker-image-for-l2-staging.yml b/.github/workflows/publish-docker-image-for-l2-staging.yml
index 21d2641d1d00..6fc944c70037 100644
--- a/.github/workflows/publish-docker-image-for-l2-staging.yml
+++ b/.github/workflows/publish-docker-image-for-l2-staging.yml
@@ -14,7 +14,7 @@ jobs:
     name: Push Docker image to Docker Hub
     runs-on: ubuntu-latest
     env:
-      RELEASE_VERSION: 5.3.1
+      RELEASE_VERSION: 5.3.2
       DOCKER_CHAIN_NAME: optimism-l2-advanced
     steps:
       - name: Check out the repo
diff --git a/.github/workflows/publish-docker-image-for-lukso.yml b/.github/workflows/publish-docker-image-for-lukso.yml
index bc601f4bd280..9b5f6eaf7a3d 100644
--- a/.github/workflows/publish-docker-image-for-lukso.yml
+++ b/.github/workflows/publish-docker-image-for-lukso.yml
@@ -14,7 +14,7 @@ jobs:
     name: Push Docker image to Docker Hub
     runs-on: ubuntu-latest
     env:
-      RELEASE_VERSION: 5.3.1
+      RELEASE_VERSION: 5.3.2
       DOCKER_CHAIN_NAME: lukso
     steps:
       - name: Check out the repo
diff --git a/.github/workflows/publish-docker-image-for-optimism.yml b/.github/workflows/publish-docker-image-for-optimism.yml
index e352d4c7353e..3a1f168fa02f 100644
--- a/.github/workflows/publish-docker-image-for-optimism.yml
+++ b/.github/workflows/publish-docker-image-for-optimism.yml
@@ -14,7 +14,7 @@ jobs:
     name: Push Docker image to Docker Hub
     runs-on: ubuntu-latest
     env:
-      RELEASE_VERSION: 5.3.1
+      RELEASE_VERSION: 5.3.2
       DOCKER_CHAIN_NAME: optimism
     steps:
       - name: Check out the repo
diff --git a/.github/workflows/publish-docker-image-for-polygon-edge.yml b/.github/workflows/publish-docker-image-for-polygon-edge.yml
index a4de66bcfcd1..6087012e4c25 100644
--- a/.github/workflows/publish-docker-image-for-polygon-edge.yml
+++ b/.github/workflows/publish-docker-image-for-polygon-edge.yml
@@ -14,7 +14,7 @@ jobs:
     name: Push Docker image to Docker Hub
     runs-on: ubuntu-latest
     env:
-      RELEASE_VERSION: 5.3.1
+      RELEASE_VERSION: 5.3.2
       DOCKER_CHAIN_NAME: polygon-edge
     steps:
       - name: Check out the repo
diff --git a/.github/workflows/publish-docker-image-for-rsk.yml b/.github/workflows/publish-docker-image-for-rsk.yml
index 424aece44e8b..5cf04ac303ba 100644
--- a/.github/workflows/publish-docker-image-for-rsk.yml
+++ b/.github/workflows/publish-docker-image-for-rsk.yml
@@ -14,7 +14,7 @@ jobs:
     name: Push Docker image to Docker Hub
     runs-on: ubuntu-latest
     env:
-      RELEASE_VERSION: 5.3.1
+      RELEASE_VERSION: 5.3.2
       DOCKER_CHAIN_NAME: rsk
     steps:
       - name: Check out the repo
diff --git a/.github/workflows/publish-docker-image-for-stability.yml b/.github/workflows/publish-docker-image-for-stability.yml
index 57fd1e0fcb7c..0c04104be197 100644
--- a/.github/workflows/publish-docker-image-for-stability.yml
+++ b/.github/workflows/publish-docker-image-for-stability.yml
@@ -17,7 +17,7 @@ jobs:
     name: Push Docker image to Docker Hub
     runs-on: ubuntu-latest
     env:
-      RELEASE_VERSION: 5.3.1
+      RELEASE_VERSION: 5.3.2
       DOCKER_CHAIN_NAME: stability
     steps:
       - name: Check out the repo
diff --git a/.github/workflows/publish-docker-image-for-suave.yml b/.github/workflows/publish-docker-image-for-suave.yml
index 3e66ed92dc2b..e84a0115f13c 100644
--- a/.github/workflows/publish-docker-image-for-suave.yml
+++ b/.github/workflows/publish-docker-image-for-suave.yml
@@ -17,7 +17,7 @@ jobs:
     name: Push Docker image to Docker Hub
     runs-on: ubuntu-latest
     env:
-      RELEASE_VERSION: 5.3.1
+      RELEASE_VERSION: 5.3.2
       DOCKER_CHAIN_NAME: suave
     steps:
       - name: Check out the repo
diff --git a/.github/workflows/publish-docker-image-for-xdai.yml b/.github/workflows/publish-docker-image-for-xdai.yml
index 6706ec927eb3..fca17ff2e083 100644
--- a/.github/workflows/publish-docker-image-for-xdai.yml
+++ b/.github/workflows/publish-docker-image-for-xdai.yml
@@ -14,7 +14,7 @@ jobs:
     name: Push Docker image to Docker Hub
     runs-on: ubuntu-latest
     env:
-      RELEASE_VERSION: 5.3.1
+      RELEASE_VERSION: 5.3.2
       DOCKER_CHAIN_NAME: xdai
     steps:
       - name: Check out the repo
diff --git a/.github/workflows/publish-docker-image-for-zkevm.yml b/.github/workflows/publish-docker-image-for-zkevm.yml
index 374cae48a909..a47940869663 100644
--- a/.github/workflows/publish-docker-image-for-zkevm.yml
+++ b/.github/workflows/publish-docker-image-for-zkevm.yml
@@ -14,7 +14,7 @@ jobs:
     name: Push Docker image to Docker Hub
     runs-on: ubuntu-latest
     env:
-      RELEASE_VERSION: 5.3.1
+      RELEASE_VERSION: 5.3.2
       DOCKER_CHAIN_NAME: zkevm
     steps:
       - name: Check out the repo
diff --git a/.github/workflows/publish-docker-image-for-zksync.yml b/.github/workflows/publish-docker-image-for-zksync.yml
index aee2f7f70a90..057112de2093 100644
--- a/.github/workflows/publish-docker-image-for-zksync.yml
+++ b/.github/workflows/publish-docker-image-for-zksync.yml
@@ -14,7 +14,7 @@ jobs:
     name: Push Docker image to Docker Hub
     runs-on: ubuntu-latest
     env:
-      RELEASE_VERSION: 5.3.1
+      RELEASE_VERSION: 5.3.2
       DOCKER_CHAIN_NAME: zksync
     steps:
       - name: Check out the repo
diff --git a/.github/workflows/publish-docker-image-release-additional.yml b/.github/workflows/publish-docker-image-release-additional.yml
index 9877068bff23..9e05afff6f4b 100644
--- a/.github/workflows/publish-docker-image-release-additional.yml
+++ b/.github/workflows/publish-docker-image-release-additional.yml
@@ -18,7 +18,7 @@ jobs:
     name: Push Docker image to Docker Hub
     runs-on: ubuntu-latest
     env:
-      RELEASE_VERSION: 5.3.1
+      RELEASE_VERSION: 5.3.2
     steps:
       - name: Check out the repo
         uses: actions/checkout@v4
diff --git a/.github/workflows/publish-docker-image-release.yml b/.github/workflows/publish-docker-image-release.yml
index df9aa7d44a9f..fe999a37f76b 100644
--- a/.github/workflows/publish-docker-image-release.yml
+++ b/.github/workflows/publish-docker-image-release.yml
@@ -18,7 +18,7 @@ jobs:
     name: Push Docker image to Docker Hub
     runs-on: ubuntu-latest
     env:
-      RELEASE_VERSION: 5.3.1
+      RELEASE_VERSION: 5.3.2
     steps:
       - name: Check out the repo
         uses: actions/checkout@v4
@@ -46,7 +46,7 @@ jobs:
           push: true
           cache-from: type=registry,ref=blockscout/blockscout:buildcache
           cache-to: type=registry,ref=blockscout/blockscout:buildcache,mode=max
-          tags: blockscout/blockscout:latest, blockscout/blockscout:${{ env.RELEASE_VERSION }}
+          tags: blockscout/blockscout:latest, blockscout/blockscout:${{ env.RELEASE_VERSION }}-alpha
           platforms: |
             linux/amd64
             linux/arm64/v8
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6a91a5afd53f..631a44486690 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,14 @@
 
 ### Features
 
+### Fixes
+
+### Chore
+
+## 5.3.2-beta
+
+### Features
+
 - [#8848](https://github.com/blockscout/blockscout/pull/8848) - Add MainPageRealtimeEventHandler
 - [#8821](https://github.com/blockscout/blockscout/pull/8821) - Add new events to addresses channel: `eth_bytecode_db_lookup_started` and `smart_contract_was_not_verified`
 - [#8795](https://github.com/blockscout/blockscout/pull/8795) - Disable catchup indexer by env
@@ -37,6 +45,26 @@
 
 <details>
   <summary>Dependencies version bumps</summary>
+
+- [#8727](https://github.com/blockscout/blockscout/pull/8727) - Bump browserify-sign from 4.2.1 to 4.2.2 in /apps/block_scout_web/assets
+- [#8748](https://github.com/blockscout/blockscout/pull/8748) - Bump sweetalert2 from 11.7.32 to 11.9.0 in /apps/block_scout_web/assets
+- [#8747](https://github.com/blockscout/blockscout/pull/8747) - Bump core-js from 3.33.1 to 3.33.2 in /apps/block_scout_web/assets
+- [#8743](https://github.com/blockscout/blockscout/pull/8743) - Bump solc from 0.8.21 to 0.8.22 in /apps/explorer
+- [#8745](https://github.com/blockscout/blockscout/pull/8745) - Bump tesla from 1.7.0 to 1.8.0
+- [#8749](https://github.com/blockscout/blockscout/pull/8749) - Bump sass from 1.69.4 to 1.69.5 in /apps/block_scout_web/assets
+- [#8744](https://github.com/blockscout/blockscout/pull/8744) - Bump phoenix_ecto from 4.4.2 to 4.4.3
+- [#8746](https://github.com/blockscout/blockscout/pull/8746) - Bump floki from 0.35.1 to 0.35.2
+- [#8793](https://github.com/blockscout/blockscout/pull/8793) - Bump eslint from 8.52.0 to 8.53.0 in /apps/block_scout_web/assets
+- [#8792](https://github.com/blockscout/blockscout/pull/8792) - Bump cldr_utils from 2.24.1 to 2.24.2
+- [#8787](https://github.com/blockscout/blockscout/pull/8787) - Bump ex_cldr_numbers from 2.32.2 to 2.32.3
+- [#8790](https://github.com/blockscout/blockscout/pull/8790) - Bump ex_abi from 0.6.3 to 0.6.4
+- [#8788](https://github.com/blockscout/blockscout/pull/8788) - Bump ex_cldr_units from 3.16.3 to 3.16.4
+- [#8827](https://github.com/blockscout/blockscout/pull/8827) - Bump @babel/core from 7.23.2 to 7.23.3 in /apps/block_scout_web/assets
+- [#8823](https://github.com/blockscout/blockscout/pull/8823) - Bump benchee from 1.1.0 to 1.2.0
+- [#8826](https://github.com/blockscout/blockscout/pull/8826) - Bump luxon from 3.4.3 to 3.4.4 in /apps/block_scout_web/assets
+- [#8824](https://github.com/blockscout/blockscout/pull/8824) - Bump httpoison from 2.1.0 to 2.2.0
+- [#8828](https://github.com/blockscout/blockscout/pull/8828) - Bump @babel/preset-env from 7.23.2 to 7.23.3 in /apps/block_scout_web/assets
+- [#8825](https://github.com/blockscout/blockscout/pull/8825) - Bump solc from 0.8.22 to 0.8.23 in /apps/explorer
 </details>
 
 ## 5.3.1-beta
diff --git a/apps/block_scout_web/mix.exs b/apps/block_scout_web/mix.exs
index 17b4a79de407..f134b2b3373f 100644
--- a/apps/block_scout_web/mix.exs
+++ b/apps/block_scout_web/mix.exs
@@ -23,7 +23,7 @@ defmodule BlockScoutWeb.Mixfile do
         dialyzer: :test
       ],
       start_permanent: Mix.env() == :prod,
-      version: "5.3.1",
+      version: "5.3.2",
       xref: [exclude: [Explorer.Chain.Zkevm.Reader]]
     ]
   end
diff --git a/apps/ethereum_jsonrpc/mix.exs b/apps/ethereum_jsonrpc/mix.exs
index d4496a620da3..608b2bb28b38 100644
--- a/apps/ethereum_jsonrpc/mix.exs
+++ b/apps/ethereum_jsonrpc/mix.exs
@@ -23,7 +23,7 @@ defmodule EthereumJsonrpc.MixProject do
         dialyzer: :test
       ],
       start_permanent: Mix.env() == :prod,
-      version: "5.3.1"
+      version: "5.3.2"
     ]
   end
 
diff --git a/apps/explorer/mix.exs b/apps/explorer/mix.exs
index 6d903ff853b6..fd91cf515e59 100644
--- a/apps/explorer/mix.exs
+++ b/apps/explorer/mix.exs
@@ -24,7 +24,7 @@ defmodule Explorer.Mixfile do
         dialyzer: :test
       ],
       start_permanent: Mix.env() == :prod,
-      version: "5.3.1",
+      version: "5.3.2",
       xref: [exclude: [BlockScoutWeb.WebRouter.Helpers]]
     ]
   end
diff --git a/apps/indexer/mix.exs b/apps/indexer/mix.exs
index 6444e6596182..e3454f3318eb 100644
--- a/apps/indexer/mix.exs
+++ b/apps/indexer/mix.exs
@@ -14,7 +14,7 @@ defmodule Indexer.MixProject do
       elixirc_paths: elixirc_paths(Mix.env()),
       lockfile: "../../mix.lock",
       start_permanent: Mix.env() == :prod,
-      version: "5.3.1"
+      version: "5.3.2"
     ]
   end
 
diff --git a/docker-compose/docker-compose.yml b/docker-compose/docker-compose.yml
index c5f140a31263..0ce792f80ded 100644
--- a/docker-compose/docker-compose.yml
+++ b/docker-compose/docker-compose.yml
@@ -34,7 +34,7 @@ services:
         CACHE_TOTAL_GAS_USAGE_COUNTER_ENABLED: ""
         CACHE_ADDRESS_WITH_BALANCES_UPDATE_INTERVAL: ""
         ADMIN_PANEL_ENABLED: ""
-        RELEASE_VERSION: 5.3.1
+        RELEASE_VERSION: 5.3.2
     links:
       - db:database
     environment:
diff --git a/docker/Makefile b/docker/Makefile
index c6e874b4682c..e320e4c98356 100644
--- a/docker/Makefile
+++ b/docker/Makefile
@@ -10,7 +10,7 @@ STATS_CONTAINER_NAME := stats
 STATS_DB_CONTAINER_NAME := stats-postgres
 PROXY_CONTAINER_NAME := proxy
 PG_CONTAINER_NAME := postgres
-RELEASE_VERSION ?= '5.3.1'
+RELEASE_VERSION ?= '5.3.2'
 TAG := $(RELEASE_VERSION)-commit-$(shell git log -1 --pretty=format:"%h")
 STABLE_TAG := $(RELEASE_VERSION)
 
diff --git a/mix.exs b/mix.exs
index 12ddf19b66ee..f3a4838a8b3d 100644
--- a/mix.exs
+++ b/mix.exs
@@ -7,7 +7,7 @@ defmodule BlockScout.Mixfile do
     [
       # app: :block_scout,
       # aliases: aliases(config_env()),
-      version: "5.3.1",
+      version: "5.3.2",
       apps_path: "apps",
       deps: deps(),
       dialyzer: dialyzer(),
diff --git a/rel/config.exs b/rel/config.exs
index a0584a8168b3..86844487f4aa 100644
--- a/rel/config.exs
+++ b/rel/config.exs
@@ -71,7 +71,7 @@ end
 # will be used by default
 
 release :blockscout do
-  set version: "5.3.1-beta"
+  set version: "5.3.2-beta"
   set applications: [
     :runtime_tools,
     block_scout_web: :permanent,

From 40a599134c971de5367e855d863cb0bbdbfb8734 Mon Sep 17 00:00:00 2001
From: Viktor Baranov <baranov.viktor.27@gmail.com>
Date: Tue, 21 Nov 2023 00:46:15 +0400
Subject: [PATCH 682/909] Configure prerelease workflows

---
 .../publish-docker-image-for-core.yml         |   3 +-
 .../publish-docker-image-for-eth-goerli.yml   |   3 +-
 .../publish-docker-image-for-eth-sepolia.yml  |   3 +-
 .../publish-docker-image-for-eth.yml          |   3 +-
 .../publish-docker-image-for-fuse.yml         |   3 +-
 .../publish-docker-image-for-immutable.yml    |   3 +-
 .../publish-docker-image-for-l2-staging.yml   |   3 +-
 .../publish-docker-image-for-lukso.yml        |   3 +-
 .../publish-docker-image-for-optimism.yml     |   3 +-
 .../publish-docker-image-for-polygon-edge.yml |   3 +-
 .../publish-docker-image-for-rsk.yml          |   3 +-
 .../publish-docker-image-for-stability.yml    |   3 +-
 .../publish-docker-image-for-suave.yml        |   3 +-
 .../publish-docker-image-for-xdai.yml         |   3 +-
 .../publish-docker-image-for-zkevm.yml        |   3 +-
 .../publish-docker-image-for-zksync.yml       |   3 +-
 ...ublish-docker-image-release-additional.yml | 105 -----------
 .../publish-docker-image-release.yml          | 165 ------------------
 18 files changed, 32 insertions(+), 286 deletions(-)
 delete mode 100644 .github/workflows/publish-docker-image-release-additional.yml
 delete mode 100644 .github/workflows/publish-docker-image-release.yml

diff --git a/.github/workflows/publish-docker-image-for-core.yml b/.github/workflows/publish-docker-image-for-core.yml
index 591a50a53f03..b90942317baf 100644
--- a/.github/workflows/publish-docker-image-for-core.yml
+++ b/.github/workflows/publish-docker-image-for-core.yml
@@ -3,9 +3,10 @@
 # separate terms of service, privacy policy, and support
 # documentation.
 
-name: Publish Docker image for specific chain branches
+name: POA Core Publish Docker image
 
 on:
+  workflow_dispatch:
   push:
     branches:
       - production-core-stg
diff --git a/.github/workflows/publish-docker-image-for-eth-goerli.yml b/.github/workflows/publish-docker-image-for-eth-goerli.yml
index c4028b0cbbb0..28b51f91c9ed 100644
--- a/.github/workflows/publish-docker-image-for-eth-goerli.yml
+++ b/.github/workflows/publish-docker-image-for-eth-goerli.yml
@@ -3,9 +3,10 @@
 # separate terms of service, privacy policy, and support
 # documentation.
 
-name: Publish Docker image for specific chain branches
+name: ETH Goerli Publish Docker image
 
 on:
+  workflow_dispatch:
   push:
     branches:
       - production-eth-goerli-stg
diff --git a/.github/workflows/publish-docker-image-for-eth-sepolia.yml b/.github/workflows/publish-docker-image-for-eth-sepolia.yml
index da11bfdfacbb..28bedb51ee75 100644
--- a/.github/workflows/publish-docker-image-for-eth-sepolia.yml
+++ b/.github/workflows/publish-docker-image-for-eth-sepolia.yml
@@ -3,9 +3,10 @@
 # separate terms of service, privacy policy, and support
 # documentation.
 
-name: Publish Docker image for specific chain branches
+name: ETH Sepolia Publish Docker image
 
 on:
+  workflow_dispatch:
   push:
     branches:
       - production-eth-sepolia-stg
diff --git a/.github/workflows/publish-docker-image-for-eth.yml b/.github/workflows/publish-docker-image-for-eth.yml
index a7286696a5e5..bfd8ae15198d 100644
--- a/.github/workflows/publish-docker-image-for-eth.yml
+++ b/.github/workflows/publish-docker-image-for-eth.yml
@@ -3,9 +3,10 @@
 # separate terms of service, privacy policy, and support
 # documentation.
 
-name: Publish Docker image for specific chain branches
+name: ETH Publish Docker image
 
 on:
+  workflow_dispatch:
   push:
     branches:
       - production-eth-stg-experimental
diff --git a/.github/workflows/publish-docker-image-for-fuse.yml b/.github/workflows/publish-docker-image-for-fuse.yml
index 7aa400a5a715..b0d1eb68ff1e 100644
--- a/.github/workflows/publish-docker-image-for-fuse.yml
+++ b/.github/workflows/publish-docker-image-for-fuse.yml
@@ -3,9 +3,10 @@
 # separate terms of service, privacy policy, and support
 # documentation.
 
-name: Publish Docker image for specific chain branches
+name: Fuse Publish Docker image
 
 on:
+  workflow_dispatch:
   push:
     branches:
       - production-fuse-stg
diff --git a/.github/workflows/publish-docker-image-for-immutable.yml b/.github/workflows/publish-docker-image-for-immutable.yml
index 3423d5161547..d86f7025cbc8 100644
--- a/.github/workflows/publish-docker-image-for-immutable.yml
+++ b/.github/workflows/publish-docker-image-for-immutable.yml
@@ -3,9 +3,10 @@
 # separate terms of service, privacy policy, and support
 # documentation.
 
-name: Publish Docker image for specific chain branches
+name: Immutable Publish Docker image
 
 on:
+  workflow_dispatch:
   push:
     branches:
       - production-immutable-stg
diff --git a/.github/workflows/publish-docker-image-for-l2-staging.yml b/.github/workflows/publish-docker-image-for-l2-staging.yml
index 6fc944c70037..a6227eaee50a 100644
--- a/.github/workflows/publish-docker-image-for-l2-staging.yml
+++ b/.github/workflows/publish-docker-image-for-l2-staging.yml
@@ -3,9 +3,10 @@
 # separate terms of service, privacy policy, and support
 # documentation.
 
-name: Publish Docker image for specific chain branches
+name: L2 staging Publish Docker image
 
 on:
+  workflow_dispatch:
   push:
     branches:
       - staging-l2
diff --git a/.github/workflows/publish-docker-image-for-lukso.yml b/.github/workflows/publish-docker-image-for-lukso.yml
index 9b5f6eaf7a3d..f294165468c7 100644
--- a/.github/workflows/publish-docker-image-for-lukso.yml
+++ b/.github/workflows/publish-docker-image-for-lukso.yml
@@ -3,9 +3,10 @@
 # separate terms of service, privacy policy, and support
 # documentation.
 
-name: Publish Docker image for specific chain branches
+name: LUKSO Publish Docker image
 
 on:
+  workflow_dispatch:
   push:
     branches:
       - production-lukso-stg
diff --git a/.github/workflows/publish-docker-image-for-optimism.yml b/.github/workflows/publish-docker-image-for-optimism.yml
index 3a1f168fa02f..c164e1b7d8eb 100644
--- a/.github/workflows/publish-docker-image-for-optimism.yml
+++ b/.github/workflows/publish-docker-image-for-optimism.yml
@@ -3,9 +3,10 @@
 # separate terms of service, privacy policy, and support
 # documentation.
 
-name: Publish Docker image for specific chain branches
+name: Optimism Publish Docker image
 
 on:
+  workflow_dispatch:
   push:
     branches:
       - production-optimism-stg
diff --git a/.github/workflows/publish-docker-image-for-polygon-edge.yml b/.github/workflows/publish-docker-image-for-polygon-edge.yml
index 6087012e4c25..3b3f7604ca6e 100644
--- a/.github/workflows/publish-docker-image-for-polygon-edge.yml
+++ b/.github/workflows/publish-docker-image-for-polygon-edge.yml
@@ -3,9 +3,10 @@
 # separate terms of service, privacy policy, and support
 # documentation.
 
-name: Publish Docker image for specific chain branches
+name: Polygon Edge Publish Docker image
 
 on:
+  workflow_dispatch:
   push:
     branches:
       - production-polygon-edge-stg
diff --git a/.github/workflows/publish-docker-image-for-rsk.yml b/.github/workflows/publish-docker-image-for-rsk.yml
index 5cf04ac303ba..d47134f2ae40 100644
--- a/.github/workflows/publish-docker-image-for-rsk.yml
+++ b/.github/workflows/publish-docker-image-for-rsk.yml
@@ -3,9 +3,10 @@
 # separate terms of service, privacy policy, and support
 # documentation.
 
-name: Publish Docker image for specific chain branches
+name: Rootstock Publish Docker image
 
 on:
+  workflow_dispatch:
   push:
     branches:
       - production-rsk-stg
diff --git a/.github/workflows/publish-docker-image-for-stability.yml b/.github/workflows/publish-docker-image-for-stability.yml
index 0c04104be197..089e5924e3d4 100644
--- a/.github/workflows/publish-docker-image-for-stability.yml
+++ b/.github/workflows/publish-docker-image-for-stability.yml
@@ -3,9 +3,10 @@
 # separate terms of service, privacy policy, and support
 # documentation.
 
-name: Publish Docker image for specific chain branches
+name: Stability Publish Docker image
 
 on:
+  workflow_dispatch:
   push:
     branches:
       - production-stability-stg
diff --git a/.github/workflows/publish-docker-image-for-suave.yml b/.github/workflows/publish-docker-image-for-suave.yml
index e84a0115f13c..b91bb91e546f 100644
--- a/.github/workflows/publish-docker-image-for-suave.yml
+++ b/.github/workflows/publish-docker-image-for-suave.yml
@@ -3,9 +3,10 @@
 # separate terms of service, privacy policy, and support
 # documentation.
 
-name: Publish Docker image for specific chain branches
+name: SUAVE Publish Docker image
 
 on:
+  workflow_dispatch:
   push:
     branches:
       - production-suave-stg
diff --git a/.github/workflows/publish-docker-image-for-xdai.yml b/.github/workflows/publish-docker-image-for-xdai.yml
index fca17ff2e083..947a675c57fe 100644
--- a/.github/workflows/publish-docker-image-for-xdai.yml
+++ b/.github/workflows/publish-docker-image-for-xdai.yml
@@ -3,9 +3,10 @@
 # separate terms of service, privacy policy, and support
 # documentation.
 
-name: Publish Docker image for specific chain branches
+name: Gnosis chain Publish Docker image
 
 on:
+  workflow_dispatch:
   push:
     branches:
       - production-xdai-stg
diff --git a/.github/workflows/publish-docker-image-for-zkevm.yml b/.github/workflows/publish-docker-image-for-zkevm.yml
index a47940869663..32a17480e8e5 100644
--- a/.github/workflows/publish-docker-image-for-zkevm.yml
+++ b/.github/workflows/publish-docker-image-for-zkevm.yml
@@ -3,9 +3,10 @@
 # separate terms of service, privacy policy, and support
 # documentation.
 
-name: Publish Docker image for specific chain branches
+name: Zkevm publish Docker image
 
 on:
+  workflow_dispatch:
   push:
     branches:
       - production-zkevm-stg
diff --git a/.github/workflows/publish-docker-image-for-zksync.yml b/.github/workflows/publish-docker-image-for-zksync.yml
index 057112de2093..8d02b444c17a 100644
--- a/.github/workflows/publish-docker-image-for-zksync.yml
+++ b/.github/workflows/publish-docker-image-for-zksync.yml
@@ -3,9 +3,10 @@
 # separate terms of service, privacy policy, and support
 # documentation.
 
-name: Publish Docker image for specific chain branches
+name: Zksync publish Docker image
 
 on:
+  workflow_dispatch:
   push:
     branches:
       - production-zksync-stg
diff --git a/.github/workflows/publish-docker-image-release-additional.yml b/.github/workflows/publish-docker-image-release-additional.yml
deleted file mode 100644
index 9e05afff6f4b..000000000000
--- a/.github/workflows/publish-docker-image-release-additional.yml
+++ /dev/null
@@ -1,105 +0,0 @@
-# This workflow uses actions that are not certified by GitHub.
-# They are provided by a third-party and are governed by
-# separate terms of service, privacy policy, and support
-# documentation.
-
-name: Publish Docker image for some custom chains
-
-on:
-  release:
-    types: [published]
-
-env:
-  OTP_VERSION: '25.2.1'
-  ELIXIR_VERSION: '1.14.5'
-
-jobs:
-  push_to_registry:
-    name: Push Docker image to Docker Hub
-    runs-on: ubuntu-latest
-    env:
-      RELEASE_VERSION: 5.3.2
-    steps:
-      - name: Check out the repo
-        uses: actions/checkout@v4
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-
-      - name: Log in to Docker Hub
-        uses: docker/login-action@v2
-        with:
-          username: ${{ secrets.DOCKER_USERNAME }}
-          password: ${{ secrets.DOCKER_PASSWORD }}
-
-      - name: Extract metadata (tags, labels) for Docker
-        id: meta
-        uses: docker/metadata-action@v5
-        with:
-          images: blockscout/blockscout
-
-      - name: Build and push Docker image for Rootstock
-        uses: docker/build-push-action@v5
-        with:
-          context: .
-          file: ./docker/Dockerfile
-          push: true
-          tags: blockscout/blockscout-rsk:latest, blockscout/blockscout-rsk:${{ env.RELEASE_VERSION }}
-          platforms: |
-            linux/amd64
-            linux/arm64/v8
-          build-args: |
-            CACHE_EXCHANGE_RATES_PERIOD=
-            API_V1_READ_METHODS_DISABLED=false
-            DISABLE_WEBAPP=false
-            API_V1_WRITE_METHODS_DISABLED=false
-            CACHE_TOTAL_GAS_USAGE_COUNTER_ENABLED=
-            ADMIN_PANEL_ENABLED=false
-            CACHE_ADDRESS_WITH_BALANCES_UPDATE_INTERVAL=
-            BLOCKSCOUT_VERSION=v${{ env.RELEASE_VERSION }}-beta
-            RELEASE_VERSION=${{ env.RELEASE_VERSION }}
-            CHAIN_TYPE=rsk
-
-      - name: Build and push Docker image for Polygon Edge
-        uses: docker/build-push-action@v5
-        with:
-          context: .
-          file: ./docker/Dockerfile
-          push: true
-          tags: blockscout/blockscout-polygon-edge:latest, blockscout/blockscout-polygon-edge:${{ env.RELEASE_VERSION }}
-          platforms: |
-            linux/amd64
-            linux/arm64/v8
-          build-args: |
-            CACHE_EXCHANGE_RATES_PERIOD=
-            API_V1_READ_METHODS_DISABLED=false
-            DISABLE_WEBAPP=false
-            API_V1_WRITE_METHODS_DISABLED=false
-            CACHE_TOTAL_GAS_USAGE_COUNTER_ENABLED=
-            ADMIN_PANEL_ENABLED=false
-            CACHE_ADDRESS_WITH_BALANCES_UPDATE_INTERVAL=
-            BLOCKSCOUT_VERSION=v${{ env.RELEASE_VERSION }}-beta
-            RELEASE_VERSION=${{ env.RELEASE_VERSION }}
-            CHAIN_TYPE=polygon_edge
-
-      - name: Build and push Docker image
-        uses: docker/build-push-action@v5
-        with:
-          context: .
-          file: ./docker/Dockerfile
-          push: true
-          tags: blockscout/blockscout-stability:latest, blockscout/blockscout-stability:${{ env.RELEASE_VERSION }}
-          platforms: |
-            linux/amd64
-            linux/arm64/v8
-          build-args: |
-            CACHE_EXCHANGE_RATES_PERIOD=
-            API_V1_READ_METHODS_DISABLED=false
-            DISABLE_WEBAPP=false
-            API_V1_WRITE_METHODS_DISABLED=false
-            CACHE_TOTAL_GAS_USAGE_COUNTER_ENABLED=
-            ADMIN_PANEL_ENABLED=false
-            CACHE_ADDRESS_WITH_BALANCES_UPDATE_INTERVAL=
-            BLOCKSCOUT_VERSION=v${{ env.RELEASE_VERSION }}-beta
-            RELEASE_VERSION=${{ env.RELEASE_VERSION }}
-            CHAIN_TYPE=stability
\ No newline at end of file
diff --git a/.github/workflows/publish-docker-image-release.yml b/.github/workflows/publish-docker-image-release.yml
deleted file mode 100644
index fe999a37f76b..000000000000
--- a/.github/workflows/publish-docker-image-release.yml
+++ /dev/null
@@ -1,165 +0,0 @@
-# This workflow uses actions that are not certified by GitHub.
-# They are provided by a third-party and are governed by
-# separate terms of service, privacy policy, and support
-# documentation.
-
-name: Publish Docker image
-
-on:
-  release:
-    types: [published]
-
-env:
-  OTP_VERSION: '25.2.1'
-  ELIXIR_VERSION: '1.14.5'
-
-jobs:
-  push_to_registry:
-    name: Push Docker image to Docker Hub
-    runs-on: ubuntu-latest
-    env:
-      RELEASE_VERSION: 5.3.2
-    steps:
-      - name: Check out the repo
-        uses: actions/checkout@v4
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-
-      - name: Log in to Docker Hub
-        uses: docker/login-action@v2
-        with:
-          username: ${{ secrets.DOCKER_USERNAME }}
-          password: ${{ secrets.DOCKER_PASSWORD }}
-
-      - name: Extract metadata (tags, labels) for Docker
-        id: meta
-        uses: docker/metadata-action@v5
-        with:
-          images: blockscout/blockscout
-
-      - name: Build & Push Docker image
-        uses: docker/build-push-action@v5
-        with:
-          context: .
-          file: ./docker/Dockerfile
-          push: true
-          cache-from: type=registry,ref=blockscout/blockscout:buildcache
-          cache-to: type=registry,ref=blockscout/blockscout:buildcache,mode=max
-          tags: blockscout/blockscout:latest, blockscout/blockscout:${{ env.RELEASE_VERSION }}-alpha
-          platforms: |
-            linux/amd64
-            linux/arm64/v8
-          build-args: |
-            CACHE_EXCHANGE_RATES_PERIOD=
-            API_V1_READ_METHODS_DISABLED=false
-            DISABLE_WEBAPP=false
-            API_V1_WRITE_METHODS_DISABLED=false
-            CACHE_TOTAL_GAS_USAGE_COUNTER_ENABLED=
-            ADMIN_PANEL_ENABLED=false
-            DECODE_NOT_A_CONTRACT_CALLS=false
-            MIXPANEL_URL=
-            MIXPANEL_TOKEN=
-            AMPLITUDE_URL=
-            AMPLITUDE_API_KEY=
-            CACHE_ADDRESS_WITH_BALANCES_UPDATE_INTERVAL=
-            BLOCKSCOUT_VERSION=v${{ env.RELEASE_VERSION }}-beta
-            RELEASE_VERSION=${{ env.RELEASE_VERSION }}
-
-      - name: Build and push Docker image for zkEVM
-        uses: docker/build-push-action@v5
-        with:
-          context: .
-          file: ./docker/Dockerfile
-          push: true
-          tags: blockscout/blockscout-zkevm:latest, blockscout/blockscout-zkevm:${{ env.RELEASE_VERSION }}
-          platforms: |
-            linux/amd64
-            linux/arm64/v8
-          build-args: |
-            CACHE_EXCHANGE_RATES_PERIOD=
-            API_V1_READ_METHODS_DISABLED=false
-            DISABLE_WEBAPP=false
-            API_V1_WRITE_METHODS_DISABLED=false
-            CACHE_TOTAL_GAS_USAGE_COUNTER_ENABLED=
-            ADMIN_PANEL_ENABLED=false
-            CACHE_ADDRESS_WITH_BALANCES_UPDATE_INTERVAL=
-            BLOCKSCOUT_VERSION=v${{ env.RELEASE_VERSION }}-beta
-            RELEASE_VERSION=${{ env.RELEASE_VERSION }}
-            CHAIN_TYPE=polygon_zkevm
-
-      - name: Build and push Docker image for SUAVE
-        uses: docker/build-push-action@v5
-        with:
-          context: .
-          file: ./docker/Dockerfile
-          push: true
-          tags: blockscout/blockscout-suave:latest, blockscout/blockscout-suave:${{ env.RELEASE_VERSION }}
-          platforms: |
-            linux/amd64
-            linux/arm64/v8
-          build-args: |
-            CACHE_EXCHANGE_RATES_PERIOD=
-            API_V1_READ_METHODS_DISABLED=false
-            DISABLE_WEBAPP=false
-            API_V1_WRITE_METHODS_DISABLED=false
-            CACHE_TOTAL_GAS_USAGE_COUNTER_ENABLED=
-            ADMIN_PANEL_ENABLED=false
-            CACHE_ADDRESS_WITH_BALANCES_UPDATE_INTERVAL=
-            BLOCKSCOUT_VERSION=v${{ env.RELEASE_VERSION }}-beta
-            RELEASE_VERSION=${{ env.RELEASE_VERSION }}
-            CHAIN_TYPE=suave
-
-      - name: Send release announcement to Slack workflow
-        id: slack
-        uses: slackapi/slack-github-action@v1.24.0
-        with:
-          payload: |
-            {
-              "release-version": "${{ env.RELEASE_VERSION }}",
-              "release-link": "https://github.com/blockscout/blockscout/releases/tag/v${{ env.RELEASE_VERSION }}-beta"
-            }
-        env:
-          SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}
-
-  # merge-master-after-release:
-  #   name: Merge 'master' to specific branch after release
-  #   runs-on: ubuntu-latest
-  #   env:
-  #     BRANCHES: |
-  #       production-core-stg
-  #       production-sokol-stg
-  #       production-eth-stg-experimental
-  #       production-eth-goerli-stg
-  #       production-lukso-stg
-  #       production-xdai-stg
-  #       production-polygon-supernets-stg
-  #       production-rsk-stg
-  #       production-immutable-stg
-  #   steps:
-  #   - uses: actions/checkout@v4
-  #   - name: Set Git config
-  #     run: |
-  #         git config --local user.email "actions@github.com"
-  #         git config --local user.name "Github Actions"
-  #   - name: Merge master back after release
-  #     run: |
-  #         git fetch --unshallow
-  #         touch errors.txt
-  #         for branch in $BRANCHES;
-  #         do
-  #           git reset --merge
-  #           git checkout master
-  #           git fetch origin
-  #           echo $branch
-  #           git ls-remote --exit-code --heads origin $branch || { echo $branch >> errors.txt; continue; }
-  #           echo "Merge 'master' to $branch"
-  #           git checkout $branch
-  #           git pull || { echo $branch >> errors.txt; continue; }
-  #           git merge --no-ff master -m "Auto-merge master back to $branch" || { echo $branch >> errors.txt; continue; }
-  #           git push || { echo $branch >> errors.txt; continue; }
-  #           git checkout master;
-  #         done
-  #         [ -s errors.txt ] && echo "There are problems with merging 'master' to branches:" || echo "Errors file is empty"
-  #         cat errors.txt
-  #         [ ! -s errors.txt ]

From a864ad3c08d005bec1b25be02c0cfd3017824e88 Mon Sep 17 00:00:00 2001
From: Viktor Baranov <baranov.viktor.27@gmail.com>
Date: Tue, 21 Nov 2023 00:48:18 +0400
Subject: [PATCH 683/909] Prerelease workflows

---
 .github/workflows/prerelease-main.yml    |  67 +++++++++
 .github/workflows/release-additional.yml | 106 +++++++++++++++
 .github/workflows/release-main.yml       | 166 +++++++++++++++++++++++
 3 files changed, 339 insertions(+)
 create mode 100644 .github/workflows/prerelease-main.yml
 create mode 100644 .github/workflows/release-additional.yml
 create mode 100644 .github/workflows/release-main.yml

diff --git a/.github/workflows/prerelease-main.yml b/.github/workflows/prerelease-main.yml
new file mode 100644
index 000000000000..69cd93909ae3
--- /dev/null
+++ b/.github/workflows/prerelease-main.yml
@@ -0,0 +1,67 @@
+# This workflow uses actions that are not certified by GitHub.
+# They are provided by a third-party and are governed by
+# separate terms of service, privacy policy, and support
+# documentation.
+
+name: Pre-release main
+
+on:
+  release:
+    types: [published]
+
+env:
+  OTP_VERSION: '25.2.1'
+  ELIXIR_VERSION: '1.14.5'
+
+jobs:
+  push_to_registry:
+    name: Push Docker image to Docker Hub
+    runs-on: ubuntu-latest
+    env:
+      RELEASE_VERSION: 5.3.2
+    steps:
+      - name: Check out the repo
+        uses: actions/checkout@v4
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Log in to Docker Hub
+        uses: docker/login-action@v2
+        with:
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
+
+      - name: Extract metadata (tags, labels) for Docker
+        id: meta
+        uses: docker/metadata-action@v5
+        with:
+          images: blockscout/blockscout
+
+      - name: Build & Push Docker image
+        uses: docker/build-push-action@v5
+        with:
+          context: .
+          file: ./docker/Dockerfile
+          push: true
+          cache-from: type=registry,ref=blockscout/blockscout:buildcache
+          cache-to: type=registry,ref=blockscout/blockscout:buildcache,mode=max
+          tags: blockscout/blockscout:latest, blockscout/blockscout:${{ env.RELEASE_VERSION }}-alpha
+          platforms: |
+            linux/amd64
+            linux/arm64/v8
+          build-args: |
+            CACHE_EXCHANGE_RATES_PERIOD=
+            API_V1_READ_METHODS_DISABLED=false
+            DISABLE_WEBAPP=false
+            API_V1_WRITE_METHODS_DISABLED=false
+            CACHE_TOTAL_GAS_USAGE_COUNTER_ENABLED=
+            ADMIN_PANEL_ENABLED=false
+            DECODE_NOT_A_CONTRACT_CALLS=false
+            MIXPANEL_URL=
+            MIXPANEL_TOKEN=
+            AMPLITUDE_URL=
+            AMPLITUDE_API_KEY=
+            CACHE_ADDRESS_WITH_BALANCES_UPDATE_INTERVAL=
+            BLOCKSCOUT_VERSION=v${{ env.RELEASE_VERSION }}-beta
+            RELEASE_VERSION=${{ env.RELEASE_VERSION }}
\ No newline at end of file
diff --git a/.github/workflows/release-additional.yml b/.github/workflows/release-additional.yml
new file mode 100644
index 000000000000..06617873ad2d
--- /dev/null
+++ b/.github/workflows/release-additional.yml
@@ -0,0 +1,106 @@
+# This workflow uses actions that are not certified by GitHub.
+# They are provided by a third-party and are governed by
+# separate terms of service, privacy policy, and support
+# documentation.
+
+name: Release additional
+
+on:
+  workflow_dispatch:
+  release:
+    types: [published]
+
+env:
+  OTP_VERSION: '25.2.1'
+  ELIXIR_VERSION: '1.14.5'
+
+jobs:
+  push_to_registry:
+    name: Push Docker image to Docker Hub
+    runs-on: ubuntu-latest
+    env:
+      RELEASE_VERSION: 5.3.2
+    steps:
+      - name: Check out the repo
+        uses: actions/checkout@v4
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Log in to Docker Hub
+        uses: docker/login-action@v2
+        with:
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
+
+      - name: Extract metadata (tags, labels) for Docker
+        id: meta
+        uses: docker/metadata-action@v5
+        with:
+          images: blockscout/blockscout
+
+      - name: Build and push Docker image for Rootstock
+        uses: docker/build-push-action@v5
+        with:
+          context: .
+          file: ./docker/Dockerfile
+          push: true
+          tags: blockscout/blockscout-rsk:latest, blockscout/blockscout-rsk:${{ env.RELEASE_VERSION }}
+          platforms: |
+            linux/amd64
+            linux/arm64/v8
+          build-args: |
+            CACHE_EXCHANGE_RATES_PERIOD=
+            API_V1_READ_METHODS_DISABLED=false
+            DISABLE_WEBAPP=false
+            API_V1_WRITE_METHODS_DISABLED=false
+            CACHE_TOTAL_GAS_USAGE_COUNTER_ENABLED=
+            ADMIN_PANEL_ENABLED=false
+            CACHE_ADDRESS_WITH_BALANCES_UPDATE_INTERVAL=
+            BLOCKSCOUT_VERSION=v${{ env.RELEASE_VERSION }}-beta
+            RELEASE_VERSION=${{ env.RELEASE_VERSION }}
+            CHAIN_TYPE=rsk
+
+      - name: Build and push Docker image for Polygon Edge
+        uses: docker/build-push-action@v5
+        with:
+          context: .
+          file: ./docker/Dockerfile
+          push: true
+          tags: blockscout/blockscout-polygon-edge:latest, blockscout/blockscout-polygon-edge:${{ env.RELEASE_VERSION }}
+          platforms: |
+            linux/amd64
+            linux/arm64/v8
+          build-args: |
+            CACHE_EXCHANGE_RATES_PERIOD=
+            API_V1_READ_METHODS_DISABLED=false
+            DISABLE_WEBAPP=false
+            API_V1_WRITE_METHODS_DISABLED=false
+            CACHE_TOTAL_GAS_USAGE_COUNTER_ENABLED=
+            ADMIN_PANEL_ENABLED=false
+            CACHE_ADDRESS_WITH_BALANCES_UPDATE_INTERVAL=
+            BLOCKSCOUT_VERSION=v${{ env.RELEASE_VERSION }}-beta
+            RELEASE_VERSION=${{ env.RELEASE_VERSION }}
+            CHAIN_TYPE=polygon_edge
+
+      - name: Build and push Docker image
+        uses: docker/build-push-action@v5
+        with:
+          context: .
+          file: ./docker/Dockerfile
+          push: true
+          tags: blockscout/blockscout-stability:latest, blockscout/blockscout-stability:${{ env.RELEASE_VERSION }}
+          platforms: |
+            linux/amd64
+            linux/arm64/v8
+          build-args: |
+            CACHE_EXCHANGE_RATES_PERIOD=
+            API_V1_READ_METHODS_DISABLED=false
+            DISABLE_WEBAPP=false
+            API_V1_WRITE_METHODS_DISABLED=false
+            CACHE_TOTAL_GAS_USAGE_COUNTER_ENABLED=
+            ADMIN_PANEL_ENABLED=false
+            CACHE_ADDRESS_WITH_BALANCES_UPDATE_INTERVAL=
+            BLOCKSCOUT_VERSION=v${{ env.RELEASE_VERSION }}-beta
+            RELEASE_VERSION=${{ env.RELEASE_VERSION }}
+            CHAIN_TYPE=stability
\ No newline at end of file
diff --git a/.github/workflows/release-main.yml b/.github/workflows/release-main.yml
new file mode 100644
index 000000000000..2cb018aef6c3
--- /dev/null
+++ b/.github/workflows/release-main.yml
@@ -0,0 +1,166 @@
+# This workflow uses actions that are not certified by GitHub.
+# They are provided by a third-party and are governed by
+# separate terms of service, privacy policy, and support
+# documentation.
+
+name: Release main
+
+on:
+  workflow_dispatch:
+  release:
+    types: [published]
+
+env:
+  OTP_VERSION: '25.2.1'
+  ELIXIR_VERSION: '1.14.5'
+
+jobs:
+  push_to_registry:
+    name: Push Docker image to Docker Hub
+    runs-on: ubuntu-latest
+    env:
+      RELEASE_VERSION: 5.3.2
+    steps:
+      - name: Check out the repo
+        uses: actions/checkout@v4
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Log in to Docker Hub
+        uses: docker/login-action@v2
+        with:
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
+
+      - name: Extract metadata (tags, labels) for Docker
+        id: meta
+        uses: docker/metadata-action@v5
+        with:
+          images: blockscout/blockscout
+
+      - name: Build & Push Docker image
+        uses: docker/build-push-action@v5
+        with:
+          context: .
+          file: ./docker/Dockerfile
+          push: true
+          cache-from: type=registry,ref=blockscout/blockscout:buildcache
+          cache-to: type=registry,ref=blockscout/blockscout:buildcache,mode=max
+          tags: blockscout/blockscout:latest, blockscout/blockscout:${{ env.RELEASE_VERSION }}
+          platforms: |
+            linux/amd64
+            linux/arm64/v8
+          build-args: |
+            CACHE_EXCHANGE_RATES_PERIOD=
+            API_V1_READ_METHODS_DISABLED=false
+            DISABLE_WEBAPP=false
+            API_V1_WRITE_METHODS_DISABLED=false
+            CACHE_TOTAL_GAS_USAGE_COUNTER_ENABLED=
+            ADMIN_PANEL_ENABLED=false
+            DECODE_NOT_A_CONTRACT_CALLS=false
+            MIXPANEL_URL=
+            MIXPANEL_TOKEN=
+            AMPLITUDE_URL=
+            AMPLITUDE_API_KEY=
+            CACHE_ADDRESS_WITH_BALANCES_UPDATE_INTERVAL=
+            BLOCKSCOUT_VERSION=v${{ env.RELEASE_VERSION }}-beta
+            RELEASE_VERSION=${{ env.RELEASE_VERSION }}
+
+      - name: Build and push Docker image for zkEVM
+        uses: docker/build-push-action@v5
+        with:
+          context: .
+          file: ./docker/Dockerfile
+          push: true
+          tags: blockscout/blockscout-zkevm:latest, blockscout/blockscout-zkevm:${{ env.RELEASE_VERSION }}
+          platforms: |
+            linux/amd64
+            linux/arm64/v8
+          build-args: |
+            CACHE_EXCHANGE_RATES_PERIOD=
+            API_V1_READ_METHODS_DISABLED=false
+            DISABLE_WEBAPP=false
+            API_V1_WRITE_METHODS_DISABLED=false
+            CACHE_TOTAL_GAS_USAGE_COUNTER_ENABLED=
+            ADMIN_PANEL_ENABLED=false
+            CACHE_ADDRESS_WITH_BALANCES_UPDATE_INTERVAL=
+            BLOCKSCOUT_VERSION=v${{ env.RELEASE_VERSION }}-beta
+            RELEASE_VERSION=${{ env.RELEASE_VERSION }}
+            CHAIN_TYPE=polygon_zkevm
+
+      - name: Build and push Docker image for SUAVE
+        uses: docker/build-push-action@v5
+        with:
+          context: .
+          file: ./docker/Dockerfile
+          push: true
+          tags: blockscout/blockscout-suave:latest, blockscout/blockscout-suave:${{ env.RELEASE_VERSION }}
+          platforms: |
+            linux/amd64
+            linux/arm64/v8
+          build-args: |
+            CACHE_EXCHANGE_RATES_PERIOD=
+            API_V1_READ_METHODS_DISABLED=false
+            DISABLE_WEBAPP=false
+            API_V1_WRITE_METHODS_DISABLED=false
+            CACHE_TOTAL_GAS_USAGE_COUNTER_ENABLED=
+            ADMIN_PANEL_ENABLED=false
+            CACHE_ADDRESS_WITH_BALANCES_UPDATE_INTERVAL=
+            BLOCKSCOUT_VERSION=v${{ env.RELEASE_VERSION }}-beta
+            RELEASE_VERSION=${{ env.RELEASE_VERSION }}
+            CHAIN_TYPE=suave
+
+      - name: Send release announcement to Slack workflow
+        id: slack
+        uses: slackapi/slack-github-action@v1.24.0
+        with:
+          payload: |
+            {
+              "release-version": "${{ env.RELEASE_VERSION }}",
+              "release-link": "https://github.com/blockscout/blockscout/releases/tag/v${{ env.RELEASE_VERSION }}-beta"
+            }
+        env:
+          SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}
+
+  # merge-master-after-release:
+  #   name: Merge 'master' to specific branch after release
+  #   runs-on: ubuntu-latest
+  #   env:
+  #     BRANCHES: |
+  #       production-core-stg
+  #       production-sokol-stg
+  #       production-eth-stg-experimental
+  #       production-eth-goerli-stg
+  #       production-lukso-stg
+  #       production-xdai-stg
+  #       production-polygon-supernets-stg
+  #       production-rsk-stg
+  #       production-immutable-stg
+  #   steps:
+  #   - uses: actions/checkout@v4
+  #   - name: Set Git config
+  #     run: |
+  #         git config --local user.email "actions@github.com"
+  #         git config --local user.name "Github Actions"
+  #   - name: Merge master back after release
+  #     run: |
+  #         git fetch --unshallow
+  #         touch errors.txt
+  #         for branch in $BRANCHES;
+  #         do
+  #           git reset --merge
+  #           git checkout master
+  #           git fetch origin
+  #           echo $branch
+  #           git ls-remote --exit-code --heads origin $branch || { echo $branch >> errors.txt; continue; }
+  #           echo "Merge 'master' to $branch"
+  #           git checkout $branch
+  #           git pull || { echo $branch >> errors.txt; continue; }
+  #           git merge --no-ff master -m "Auto-merge master back to $branch" || { echo $branch >> errors.txt; continue; }
+  #           git push || { echo $branch >> errors.txt; continue; }
+  #           git checkout master;
+  #         done
+  #         [ -s errors.txt ] && echo "There are problems with merging 'master' to branches:" || echo "Errors file is empty"
+  #         cat errors.txt
+  #         [ ! -s errors.txt ]

From f1ee56b2e0508eda1890cd45dbf00b8826dcd724 Mon Sep 17 00:00:00 2001
From: Viktor Baranov <baranov.viktor.27@gmail.com>
Date: Tue, 21 Nov 2023 00:57:09 +0400
Subject: [PATCH 684/909] Allow setting number of pre-release

---
 .github/workflows/prerelease-main.yml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/prerelease-main.yml b/.github/workflows/prerelease-main.yml
index 69cd93909ae3..369b1b1c2b73 100644
--- a/.github/workflows/prerelease-main.yml
+++ b/.github/workflows/prerelease-main.yml
@@ -1,11 +1,11 @@
-# This workflow uses actions that are not certified by GitHub.
-# They are provided by a third-party and are governed by
-# separate terms of service, privacy policy, and support
-# documentation.
-
 name: Pre-release main
 
 on:
+  workflow_dispatch:
+    inputs:
+      number:
+        type: number
+        required: true
   release:
     types: [published]
 
@@ -46,7 +46,7 @@ jobs:
           push: true
           cache-from: type=registry,ref=blockscout/blockscout:buildcache
           cache-to: type=registry,ref=blockscout/blockscout:buildcache,mode=max
-          tags: blockscout/blockscout:latest, blockscout/blockscout:${{ env.RELEASE_VERSION }}-alpha
+          tags: blockscout/blockscout:latest, blockscout/blockscout:${{ env.RELEASE_VERSION }}-alpha${{ inputs.number }}
           platforms: |
             linux/amd64
             linux/arm64/v8

From 0dfda3a9c7e0bdc35dfeb4d29964e9ad591b2594 Mon Sep 17 00:00:00 2001
From: Viktor Baranov <baranov.viktor.27@gmail.com>
Date: Tue, 21 Nov 2023 01:01:46 +0400
Subject: [PATCH 685/909] Enhance prerelease, release workflows

---
 .github/workflows/prerelease-main.yml    | 4 +---
 .github/workflows/release-additional.yml | 1 -
 .github/workflows/release-main.yml       | 1 -
 3 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/.github/workflows/prerelease-main.yml b/.github/workflows/prerelease-main.yml
index 369b1b1c2b73..57890b3ffb9b 100644
--- a/.github/workflows/prerelease-main.yml
+++ b/.github/workflows/prerelease-main.yml
@@ -6,8 +6,6 @@ on:
       number:
         type: number
         required: true
-  release:
-    types: [published]
 
 env:
   OTP_VERSION: '25.2.1'
@@ -46,7 +44,7 @@ jobs:
           push: true
           cache-from: type=registry,ref=blockscout/blockscout:buildcache
           cache-to: type=registry,ref=blockscout/blockscout:buildcache,mode=max
-          tags: blockscout/blockscout:latest, blockscout/blockscout:${{ env.RELEASE_VERSION }}-alpha${{ inputs.number }}
+          tags: blockscout/blockscout:latest, blockscout/blockscout:${{ env.RELEASE_VERSION }}-alpha.${{ inputs.number }}
           platforms: |
             linux/amd64
             linux/arm64/v8
diff --git a/.github/workflows/release-additional.yml b/.github/workflows/release-additional.yml
index 06617873ad2d..72c287e93730 100644
--- a/.github/workflows/release-additional.yml
+++ b/.github/workflows/release-additional.yml
@@ -6,7 +6,6 @@
 name: Release additional
 
 on:
-  workflow_dispatch:
   release:
     types: [published]
 
diff --git a/.github/workflows/release-main.yml b/.github/workflows/release-main.yml
index 2cb018aef6c3..60c840a7f70b 100644
--- a/.github/workflows/release-main.yml
+++ b/.github/workflows/release-main.yml
@@ -6,7 +6,6 @@
 name: Release main
 
 on:
-  workflow_dispatch:
   release:
     types: [published]
 

From 795b17032705f960070af2881d9dca50f60944bc Mon Sep 17 00:00:00 2001
From: Qwerty5Uiop <alex000010@bk.ru>
Date: Tue, 21 Nov 2023 12:33:03 +0400
Subject: [PATCH 686/909] Limit TokenBalance fetcher timeout

---
 CHANGELOG.md                                      | 1 +
 apps/indexer/lib/indexer/fetcher/token_balance.ex | 4 +++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6a91a5afd53f..54968cb8e23f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -15,6 +15,7 @@
 
 ### Fixes
 
+- [#8869](https://github.com/blockscout/blockscout/pull/8869) - Limit TokenBalance fetcher timeout
 - [#8855](https://github.com/blockscout/blockscout/pull/8855) - All transactions count at top addresses page
 - [#8836](https://github.com/blockscout/blockscout/pull/8836) - Safe token update
 - [#8814](https://github.com/blockscout/blockscout/pull/8814) - Improve performance for EOA addresses in `/api/v2/addresses/{address_hash}`
diff --git a/apps/indexer/lib/indexer/fetcher/token_balance.ex b/apps/indexer/lib/indexer/fetcher/token_balance.ex
index c9507315bc16..29b3bad04312 100644
--- a/apps/indexer/lib/indexer/fetcher/token_balance.ex
+++ b/apps/indexer/lib/indexer/fetcher/token_balance.ex
@@ -28,6 +28,8 @@ defmodule Indexer.Fetcher.TokenBalance do
   @default_max_batch_size 100
   @default_max_concurrency 10
 
+  @timeout :timer.minutes(10)
+
   @max_retries 3
 
   @spec async_fetch([
@@ -156,7 +158,7 @@ defmodule Indexer.Fetcher.TokenBalance do
       address_current_token_balances: %{
         params: TokenBalances.to_address_current_token_balances(formatted_token_balances_params)
       },
-      timeout: :infinity
+      timeout: @timeout
     }
 
     case Chain.import(import_params) do

From 35f1be02e7595e4ae21b31c2372d339af44aef7e Mon Sep 17 00:00:00 2001
From: Victor Baranov <baranov.viktor.27@gmail.com>
Date: Fri, 24 Nov 2023 12:09:12 +0300
Subject: [PATCH 687/909] Revert "Remove /api/account/v1 path"

---
 CHANGELOG.md                                  |   1 -
 .../lib/block_scout_web/api_router.ex         |  67 +++++-
 .../api/{v2 => v1}/authenticate_controller.ex |   2 +-
 .../api/{v2 => v1}/email_controller.ex        |   2 +-
 .../api/{v2 => v1}/fallback_controller.ex     |   4 +-
 .../account/api/{v2 => v1}/tags_controller.ex |   2 +-
 .../account/api/{v2 => v1}/user_controller.ex |   4 +-
 .../templates/layout/app.html.eex             |   2 +-
 .../account/api/{v2 => v1}/account_view.ex    |   2 +-
 .../views/account/api/{v2 => v1}/tags_view.ex |   2 +-
 .../views/account/api/{v2 => v1}/user_view.ex |   4 +-
 .../api/{v2 => v1}/user_controller_test.exs   | 211 +++++++++---------
 .../api/v2/smart_contract_controller_test.exs |   6 +-
 13 files changed, 184 insertions(+), 125 deletions(-)
 rename apps/block_scout_web/lib/block_scout_web/controllers/account/api/{v2 => v1}/authenticate_controller.ex (93%)
 rename apps/block_scout_web/lib/block_scout_web/controllers/account/api/{v2 => v1}/email_controller.ex (97%)
 rename apps/block_scout_web/lib/block_scout_web/controllers/account/api/{v2 => v1}/fallback_controller.ex (96%)
 rename apps/block_scout_web/lib/block_scout_web/controllers/account/api/{v2 => v1}/tags_controller.ex (98%)
 rename apps/block_scout_web/lib/block_scout_web/controllers/account/api/{v2 => v1}/user_controller.ex (99%)
 rename apps/block_scout_web/lib/block_scout_web/views/account/api/{v2 => v1}/account_view.ex (65%)
 rename apps/block_scout_web/lib/block_scout_web/views/account/api/{v2 => v1}/tags_view.ex (92%)
 rename apps/block_scout_web/lib/block_scout_web/views/account/api/{v2 => v1}/user_view.ex (98%)
 rename apps/block_scout_web/test/block_scout_web/controllers/account/api/{v2 => v1}/user_controller_test.exs (86%)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 39783a027e66..7bf4c4c7eeb4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -37,7 +37,6 @@
 
 ### Chore
 
-- [#8843](https://github.com/blockscout/blockscout/pull/8843) - Remove /api/account/v1 path
 - [#8832](https://github.com/blockscout/blockscout/pull/8832) - Log more details in regards 413 error
 - [#8807](https://github.com/blockscout/blockscout/pull/8807) - Smart-contract proxy detection refactoring
 - [#8802](https://github.com/blockscout/blockscout/pull/8802) - Enable API v2 by default
diff --git a/apps/block_scout_web/lib/block_scout_web/api_router.ex b/apps/block_scout_web/lib/block_scout_web/api_router.ex
index a133568f62e5..dee973786cfe 100644
--- a/apps/block_scout_web/lib/block_scout_web/api_router.ex
+++ b/apps/block_scout_web/lib/block_scout_web/api_router.ex
@@ -46,9 +46,74 @@ defmodule BlockScoutWeb.ApiRouter do
     plug(RateLimit)
   end
 
-  alias BlockScoutWeb.Account.Api.V2.{AuthenticateController, EmailController, TagsController, UserController}
+  alias BlockScoutWeb.Account.Api.V1.{AuthenticateController, EmailController, TagsController, UserController}
   alias BlockScoutWeb.API.V2
 
+  # TODO: Remove /account/v1 paths
+  scope "/account/v1", as: :account_v1 do
+    pipe_through(:api)
+    pipe_through(:account_api)
+
+    get("/authenticate", AuthenticateController, :authenticate_get)
+    post("/authenticate", AuthenticateController, :authenticate_post)
+
+    get("/get_csrf", UserController, :get_csrf)
+
+    scope "/email" do
+      get("/resend", EmailController, :resend_email)
+    end
+
+    scope "/user" do
+      get("/info", UserController, :info)
+
+      get("/watchlist", UserController, :watchlist_old)
+      delete("/watchlist/:id", UserController, :delete_watchlist)
+      post("/watchlist", UserController, :create_watchlist)
+      put("/watchlist/:id", UserController, :update_watchlist)
+
+      get("/api_keys", UserController, :api_keys)
+      delete("/api_keys/:api_key", UserController, :delete_api_key)
+      post("/api_keys", UserController, :create_api_key)
+      put("/api_keys/:api_key", UserController, :update_api_key)
+
+      get("/custom_abis", UserController, :custom_abis)
+      delete("/custom_abis/:id", UserController, :delete_custom_abi)
+      post("/custom_abis", UserController, :create_custom_abi)
+      put("/custom_abis/:id", UserController, :update_custom_abi)
+
+      get("/public_tags", UserController, :public_tags_requests)
+      delete("/public_tags/:id", UserController, :delete_public_tags_request)
+      post("/public_tags", UserController, :create_public_tags_request)
+      put("/public_tags/:id", UserController, :update_public_tags_request)
+
+      scope "/tags" do
+        get("/address/", UserController, :tags_address_old)
+        get("/address/:id", UserController, :tags_address)
+        delete("/address/:id", UserController, :delete_tag_address)
+        post("/address/", UserController, :create_tag_address)
+        put("/address/:id", UserController, :update_tag_address)
+
+        get("/transaction/", UserController, :tags_transaction_old)
+        get("/transaction/:id", UserController, :tags_transaction)
+        delete("/transaction/:id", UserController, :delete_tag_transaction)
+        post("/transaction/", UserController, :create_tag_transaction)
+        put("/transaction/:id", UserController, :update_tag_transaction)
+      end
+    end
+  end
+
+  # TODO: Remove /account/v1 paths
+  scope "/account/v1" do
+    pipe_through(:api)
+    pipe_through(:account_api)
+
+    scope "/tags" do
+      get("/address/:address_hash", TagsController, :tags_address)
+
+      get("/transaction/:transaction_hash", TagsController, :tags_transaction)
+    end
+  end
+
   scope "/account/v2", as: :account_v2 do
     pipe_through(:api)
     pipe_through(:account_api)
diff --git a/apps/block_scout_web/lib/block_scout_web/controllers/account/api/v2/authenticate_controller.ex b/apps/block_scout_web/lib/block_scout_web/controllers/account/api/v1/authenticate_controller.ex
similarity index 93%
rename from apps/block_scout_web/lib/block_scout_web/controllers/account/api/v2/authenticate_controller.ex
rename to apps/block_scout_web/lib/block_scout_web/controllers/account/api/v1/authenticate_controller.ex
index 2358fdc2cef6..0c16034d0217 100644
--- a/apps/block_scout_web/lib/block_scout_web/controllers/account/api/v2/authenticate_controller.ex
+++ b/apps/block_scout_web/lib/block_scout_web/controllers/account/api/v1/authenticate_controller.ex
@@ -1,4 +1,4 @@
-defmodule BlockScoutWeb.Account.Api.V2.AuthenticateController do
+defmodule BlockScoutWeb.Account.Api.V1.AuthenticateController do
   use BlockScoutWeb, :controller
 
   import BlockScoutWeb.Account.AuthController, only: [current_user: 1]
diff --git a/apps/block_scout_web/lib/block_scout_web/controllers/account/api/v2/email_controller.ex b/apps/block_scout_web/lib/block_scout_web/controllers/account/api/v1/email_controller.ex
similarity index 97%
rename from apps/block_scout_web/lib/block_scout_web/controllers/account/api/v2/email_controller.ex
rename to apps/block_scout_web/lib/block_scout_web/controllers/account/api/v1/email_controller.ex
index f93315779bb6..9e79c2d33645 100644
--- a/apps/block_scout_web/lib/block_scout_web/controllers/account/api/v2/email_controller.ex
+++ b/apps/block_scout_web/lib/block_scout_web/controllers/account/api/v1/email_controller.ex
@@ -1,4 +1,4 @@
-defmodule BlockScoutWeb.Account.Api.V2.EmailController do
+defmodule BlockScoutWeb.Account.Api.V1.EmailController do
   use BlockScoutWeb, :controller
 
   alias BlockScoutWeb.Models.UserFromAuth
diff --git a/apps/block_scout_web/lib/block_scout_web/controllers/account/api/v2/fallback_controller.ex b/apps/block_scout_web/lib/block_scout_web/controllers/account/api/v1/fallback_controller.ex
similarity index 96%
rename from apps/block_scout_web/lib/block_scout_web/controllers/account/api/v2/fallback_controller.ex
rename to apps/block_scout_web/lib/block_scout_web/controllers/account/api/v1/fallback_controller.ex
index a4821b23e41f..14d44fffb3c0 100644
--- a/apps/block_scout_web/lib/block_scout_web/controllers/account/api/v2/fallback_controller.ex
+++ b/apps/block_scout_web/lib/block_scout_web/controllers/account/api/v1/fallback_controller.ex
@@ -1,7 +1,7 @@
-defmodule BlockScoutWeb.Account.Api.V2.FallbackController do
+defmodule BlockScoutWeb.Account.Api.V1.FallbackController do
   use Phoenix.Controller
 
-  alias BlockScoutWeb.Account.Api.V2.UserView
+  alias BlockScoutWeb.Account.Api.V1.UserView
   alias Ecto.Changeset
 
   def call(conn, {:identity, _}) do
diff --git a/apps/block_scout_web/lib/block_scout_web/controllers/account/api/v2/tags_controller.ex b/apps/block_scout_web/lib/block_scout_web/controllers/account/api/v1/tags_controller.ex
similarity index 98%
rename from apps/block_scout_web/lib/block_scout_web/controllers/account/api/v2/tags_controller.ex
rename to apps/block_scout_web/lib/block_scout_web/controllers/account/api/v1/tags_controller.ex
index 18765be70c45..3549024f905c 100644
--- a/apps/block_scout_web/lib/block_scout_web/controllers/account/api/v2/tags_controller.ex
+++ b/apps/block_scout_web/lib/block_scout_web/controllers/account/api/v1/tags_controller.ex
@@ -1,4 +1,4 @@
-defmodule BlockScoutWeb.Account.Api.V2.TagsController do
+defmodule BlockScoutWeb.Account.Api.V1.TagsController do
   use BlockScoutWeb, :controller
 
   import BlockScoutWeb.Account.AuthController, only: [current_user: 1]
diff --git a/apps/block_scout_web/lib/block_scout_web/controllers/account/api/v2/user_controller.ex b/apps/block_scout_web/lib/block_scout_web/controllers/account/api/v1/user_controller.ex
similarity index 99%
rename from apps/block_scout_web/lib/block_scout_web/controllers/account/api/v2/user_controller.ex
rename to apps/block_scout_web/lib/block_scout_web/controllers/account/api/v1/user_controller.ex
index 12e9e0ab3056..724378cc69d6 100644
--- a/apps/block_scout_web/lib/block_scout_web/controllers/account/api/v2/user_controller.ex
+++ b/apps/block_scout_web/lib/block_scout_web/controllers/account/api/v1/user_controller.ex
@@ -1,4 +1,4 @@
-defmodule BlockScoutWeb.Account.Api.V2.UserController do
+defmodule BlockScoutWeb.Account.Api.V1.UserController do
   use BlockScoutWeb, :controller
 
   import BlockScoutWeb.Account.AuthController, only: [current_user: 1]
@@ -21,7 +21,7 @@ defmodule BlockScoutWeb.Account.Api.V2.UserController do
   alias Explorer.{Chain, Market, PagingOptions, Repo}
   alias Plug.CSRFProtection
 
-  action_fallback(BlockScoutWeb.Account.Api.V2.FallbackController)
+  action_fallback(BlockScoutWeb.Account.Api.V1.FallbackController)
 
   @ok_message "OK"
   @token_balances_amount 150
diff --git a/apps/block_scout_web/lib/block_scout_web/templates/layout/app.html.eex b/apps/block_scout_web/lib/block_scout_web/templates/layout/app.html.eex
index 2481992ea493..d07b77ca9e14 100644
--- a/apps/block_scout_web/lib/block_scout_web/templates/layout/app.html.eex
+++ b/apps/block_scout_web/lib/block_scout_web/templates/layout/app.html.eex
@@ -94,7 +94,7 @@
       <% session = Explorer.Account.enabled?() && Plug.Conn.get_session(@conn, :current_user) %>
       <%= render BlockScoutWeb.LayoutView, "_topnav.html", current_user: session, conn: @conn %>
       <%= if session && !session[:email_verified] do %>
-        <p class="alert alert-warning" role="alert" style="margin-bottom: 0"><%= gettext("Please confirm your email address to use the My Account feature.") %> <%= gettext("A confirmation email was sent to") %> <a href="mailto:<%= session[:email] %>"><%=session[:email] %></a> <%= gettext "on sign up. Didn’t receive?" %> <a href="/api/account/v2/email/resend" class="ajax"><%= gettext "Resend verification email" %></a>.</p>
+        <p class="alert alert-warning" role="alert" style="margin-bottom: 0"><%= gettext("Please confirm your email address to use the My Account feature.") %> <%= gettext("A confirmation email was sent to") %> <a href="mailto:<%= session[:email] %>"><%=session[:email] %></a> <%= gettext "on sign up. Didn’t receive?" %> <a href="/api/account/v1/email/resend" class="ajax"><%= gettext "Resend verification email" %></a>.</p>
       <% else %>
         <p class="alert alert-info" role="alert"><%= get_flash(@conn, :info) %></p>
       <% end %>
diff --git a/apps/block_scout_web/lib/block_scout_web/views/account/api/v2/account_view.ex b/apps/block_scout_web/lib/block_scout_web/views/account/api/v1/account_view.ex
similarity index 65%
rename from apps/block_scout_web/lib/block_scout_web/views/account/api/v2/account_view.ex
rename to apps/block_scout_web/lib/block_scout_web/views/account/api/v1/account_view.ex
index 632b3109501f..0e3a65e61653 100644
--- a/apps/block_scout_web/lib/block_scout_web/views/account/api/v2/account_view.ex
+++ b/apps/block_scout_web/lib/block_scout_web/views/account/api/v1/account_view.ex
@@ -1,4 +1,4 @@
-defmodule BlockScoutWeb.Account.Api.V2.AccountView do
+defmodule BlockScoutWeb.Account.Api.V1.AccountView do
   def render("message.json", %{message: message}) do
     %{
       "message" => message
diff --git a/apps/block_scout_web/lib/block_scout_web/views/account/api/v2/tags_view.ex b/apps/block_scout_web/lib/block_scout_web/views/account/api/v1/tags_view.ex
similarity index 92%
rename from apps/block_scout_web/lib/block_scout_web/views/account/api/v2/tags_view.ex
rename to apps/block_scout_web/lib/block_scout_web/views/account/api/v1/tags_view.ex
index 80670000d2e6..d97e35f9145b 100644
--- a/apps/block_scout_web/lib/block_scout_web/views/account/api/v2/tags_view.ex
+++ b/apps/block_scout_web/lib/block_scout_web/views/account/api/v1/tags_view.ex
@@ -1,4 +1,4 @@
-defmodule BlockScoutWeb.Account.Api.V2.TagsView do
+defmodule BlockScoutWeb.Account.Api.V1.TagsView do
   def render("address_tags.json", %{tags_map: tags_map}) do
     tags_map
   end
diff --git a/apps/block_scout_web/lib/block_scout_web/views/account/api/v2/user_view.ex b/apps/block_scout_web/lib/block_scout_web/views/account/api/v1/user_view.ex
similarity index 98%
rename from apps/block_scout_web/lib/block_scout_web/views/account/api/v2/user_view.ex
rename to apps/block_scout_web/lib/block_scout_web/views/account/api/v1/user_view.ex
index 96974a909218..26c8d7c8295b 100644
--- a/apps/block_scout_web/lib/block_scout_web/views/account/api/v2/user_view.ex
+++ b/apps/block_scout_web/lib/block_scout_web/views/account/api/v1/user_view.ex
@@ -1,5 +1,5 @@
-defmodule BlockScoutWeb.Account.Api.V2.UserView do
-  alias BlockScoutWeb.Account.Api.V2.AccountView
+defmodule BlockScoutWeb.Account.Api.V1.UserView do
+  alias BlockScoutWeb.Account.Api.V1.AccountView
   alias BlockScoutWeb.API.V2.Helper
   alias Ecto.Changeset
   alias Explorer.Chain
diff --git a/apps/block_scout_web/test/block_scout_web/controllers/account/api/v2/user_controller_test.exs b/apps/block_scout_web/test/block_scout_web/controllers/account/api/v1/user_controller_test.exs
similarity index 86%
rename from apps/block_scout_web/test/block_scout_web/controllers/account/api/v2/user_controller_test.exs
rename to apps/block_scout_web/test/block_scout_web/controllers/account/api/v1/user_controller_test.exs
index a4bc4dffe4a9..f32b5727e727 100644
--- a/apps/block_scout_web/test/block_scout_web/controllers/account/api/v2/user_controller_test.exs
+++ b/apps/block_scout_web/test/block_scout_web/controllers/account/api/v1/user_controller_test.exs
@@ -1,4 +1,4 @@
-defmodule BlockScoutWeb.Account.Api.V2.UserControllerTest do
+defmodule BlockScoutWeb.Account.Api.V1.UserControllerTest do
   use BlockScoutWeb.ConnCase
 
   alias Explorer.Account.{
@@ -19,11 +19,11 @@ defmodule BlockScoutWeb.Account.Api.V2.UserControllerTest do
     {:ok, user: user, conn: Plug.Test.init_test_session(conn, current_user: user)}
   end
 
-  describe "Test account/api/v2/user" do
+  describe "Test account/api/v1/user" do
     test "get user info", %{conn: conn, user: user} do
       result_conn =
         conn
-        |> get("/api/account/v2/user/info")
+        |> get("/api/account/v1/user/info")
         |> doc(description: "Get info about user")
 
       assert json_response(result_conn, 200) == %{
@@ -37,7 +37,7 @@ defmodule BlockScoutWeb.Account.Api.V2.UserControllerTest do
     test "post private address tag", %{conn: conn} do
       tag_address_response =
         conn
-        |> post("/api/account/v2/user/tags/address", %{
+        |> post("/api/account/v1/user/tags/address", %{
           "address_hash" => "0x3e9ac8f16c92bc4f093357933b5befbf1e16987b",
           "name" => "MyName"
         })
@@ -45,7 +45,7 @@ defmodule BlockScoutWeb.Account.Api.V2.UserControllerTest do
         |> json_response(200)
 
       conn
-      |> get("/api/account/v2/tags/address/0x3e9ac8f16c92bc4f093357933b5befbf1e16987b")
+      |> get("/api/account/v1/tags/address/0x3e9ac8f16c92bc4f093357933b5befbf1e16987b")
       |> doc(description: "Get tags for address")
       |> json_response(200)
 
@@ -69,11 +69,11 @@ defmodule BlockScoutWeb.Account.Api.V2.UserControllerTest do
       end
 
       assert conn
-             |> post("/api/account/v2/user/tags/address", build(:tag_address))
+             |> post("/api/account/v1/user/tags/address", build(:tag_address))
              |> json_response(200)
 
       assert conn
-             |> post("/api/account/v2/user/tags/address", build(:tag_address))
+             |> post("/api/account/v1/user/tags/address", build(:tag_address))
              |> json_response(422)
 
       Application.put_env(:explorer, Explorer.Account, old_env)
@@ -103,12 +103,12 @@ defmodule BlockScoutWeb.Account.Api.V2.UserControllerTest do
 
       tag_address_response =
         conn
-        |> post("/api/account/v2/user/tags/address", address_tag)
+        |> post("/api/account/v1/user/tags/address", address_tag)
         |> json_response(200)
 
       _response =
         conn
-        |> get("/api/account/v2/user/tags/address")
+        |> get("/api/account/v1/user/tags/address")
         |> json_response(200) == [tag_address_response]
 
       assert tag_address_response["address_hash"] == address_tag["address_hash"]
@@ -119,7 +119,7 @@ defmodule BlockScoutWeb.Account.Api.V2.UserControllerTest do
 
       new_tag_address_response =
         conn
-        |> put("/api/account/v2/user/tags/address/#{tag_address_response["id"]}", new_address_tag)
+        |> put("/api/account/v1/user/tags/address/#{tag_address_response["id"]}", new_address_tag)
         |> doc(description: "Edit private address tag")
         |> json_response(200)
 
@@ -137,7 +137,7 @@ defmodule BlockScoutWeb.Account.Api.V2.UserControllerTest do
         Enum.map(zipped, fn {addr, name} ->
           id =
             (conn
-             |> post("/api/account/v2/user/tags/address", %{
+             |> post("/api/account/v1/user/tags/address", %{
                "address_hash" => addr,
                "name" => name
              })
@@ -164,7 +164,7 @@ defmodule BlockScoutWeb.Account.Api.V2.UserControllerTest do
       assert Enum.all?(created, fn {addr, map_tag, _} ->
                response =
                  conn
-                 |> get("/api/account/v2/tags/address/#{addr}")
+                 |> get("/api/account/v1/tags/address/#{addr}")
                  |> json_response(200)
 
                response["personal_tags"] == [map_tag]
@@ -172,10 +172,9 @@ defmodule BlockScoutWeb.Account.Api.V2.UserControllerTest do
 
       response =
         conn
-        |> get("/api/account/v2/user/tags/address")
+        |> get("/api/account/v1/user/tags/address")
         |> doc(description: "Get private addresses tags")
         |> json_response(200)
-        |> Map.get("items")
 
       assert Enum.all?(created, fn {_, _, map} -> map in response end)
     end
@@ -189,7 +188,7 @@ defmodule BlockScoutWeb.Account.Api.V2.UserControllerTest do
         Enum.map(zipped, fn {addr, name} ->
           id =
             (conn
-             |> post("/api/account/v2/user/tags/address", %{
+             |> post("/api/account/v1/user/tags/address", %{
                "address_hash" => addr,
                "name" => name
              })
@@ -216,7 +215,7 @@ defmodule BlockScoutWeb.Account.Api.V2.UserControllerTest do
       assert Enum.all?(created, fn {addr, map_tag, _} ->
                response =
                  conn
-                 |> get("/api/account/v2/tags/address/#{addr}")
+                 |> get("/api/account/v1/tags/address/#{addr}")
                  |> json_response(200)
 
                response["personal_tags"] == [map_tag]
@@ -224,31 +223,32 @@ defmodule BlockScoutWeb.Account.Api.V2.UserControllerTest do
 
       response =
         conn
-        |> get("/api/account/v2/user/tags/address")
+        |> get("/api/account/v1/user/tags/address")
         |> json_response(200)
-        |> Map.get("items")
 
       assert Enum.all?(created, fn {_, _, map} -> map in response end)
 
       {_, _, %{"id" => id}} = Enum.at(created, 0)
 
       assert conn
-             |> delete("/api/account/v2/user/tags/address/#{id}")
+             |> delete("/api/account/v1/user/tags/address/#{id}")
              |> doc("Delete private address tag")
              |> json_response(200) == %{"message" => "OK"}
 
       assert Enum.all?(Enum.drop(created, 1), fn {_, _, %{"id" => id}} ->
                conn
-               |> delete("/api/account/v2/user/tags/address/#{id}")
+               |> delete("/api/account/v1/user/tags/address/#{id}")
                |> json_response(200) == %{"message" => "OK"}
              end)
 
-      assert conn |> get("/api/account/v2/user/tags/address") |> json_response(200) |> Map.get("items") == []
+      assert conn
+             |> get("/api/account/v1/user/tags/address")
+             |> json_response(200) == []
 
       assert Enum.all?(created, fn {addr, _, _} ->
                response =
                  conn
-                 |> get("/api/account/v2/tags/address/#{addr}")
+                 |> get("/api/account/v1/tags/address/#{addr}")
                  |> json_response(200)
 
                response["personal_tags"] == []
@@ -260,7 +260,7 @@ defmodule BlockScoutWeb.Account.Api.V2.UserControllerTest do
       tx_hash = to_string(insert(:transaction).hash)
 
       assert conn
-             |> post("/api/account/v2/user/tags/transaction", %{
+             |> post("/api/account/v1/user/tags/transaction", %{
                "transaction_hash" => tx_hash_non_existing,
                "name" => "MyName"
              })
@@ -269,7 +269,7 @@ defmodule BlockScoutWeb.Account.Api.V2.UserControllerTest do
 
       tag_transaction_response =
         conn
-        |> post("/api/account/v2/user/tags/transaction", %{
+        |> post("/api/account/v1/user/tags/transaction", %{
           "transaction_hash" => tx_hash,
           "name" => "MyName"
         })
@@ -277,7 +277,7 @@ defmodule BlockScoutWeb.Account.Api.V2.UserControllerTest do
         |> json_response(200)
 
       conn
-      |> get("/api/account/v2/tags/transaction/#{tx_hash}")
+      |> get("/api/account/v1/tags/transaction/#{tx_hash}")
       |> doc(description: "Get tags for transaction")
       |> json_response(200)
 
@@ -301,11 +301,11 @@ defmodule BlockScoutWeb.Account.Api.V2.UserControllerTest do
       end
 
       assert conn
-             |> post("/api/account/v2/user/tags/transaction", build(:tag_transaction))
+             |> post("/api/account/v1/user/tags/transaction", build(:tag_transaction))
              |> json_response(200)
 
       assert conn
-             |> post("/api/account/v2/user/tags/transaction", build(:tag_transaction))
+             |> post("/api/account/v1/user/tags/transaction", build(:tag_transaction))
              |> json_response(422)
 
       Application.put_env(:explorer, Explorer.Account, old_env)
@@ -335,12 +335,12 @@ defmodule BlockScoutWeb.Account.Api.V2.UserControllerTest do
 
       tag_response =
         conn
-        |> post("/api/account/v2/user/tags/transaction", tx_tag)
+        |> post("/api/account/v1/user/tags/transaction", tx_tag)
         |> json_response(200)
 
       _response =
         conn
-        |> get("/api/account/v2/user/tags/transaction")
+        |> get("/api/account/v1/user/tags/transaction")
         |> json_response(200) == [tag_response]
 
       assert tag_response["address_hash"] == tx_tag["address_hash"]
@@ -351,7 +351,7 @@ defmodule BlockScoutWeb.Account.Api.V2.UserControllerTest do
 
       new_tag_response =
         conn
-        |> put("/api/account/v2/user/tags/transaction/#{tag_response["id"]}", new_tx_tag)
+        |> put("/api/account/v1/user/tags/transaction/#{tag_response["id"]}", new_tx_tag)
         |> doc(description: "Edit private transaction tag")
         |> json_response(200)
 
@@ -369,7 +369,7 @@ defmodule BlockScoutWeb.Account.Api.V2.UserControllerTest do
         Enum.map(zipped, fn {tx_hash, name} ->
           id =
             (conn
-             |> post("/api/account/v2/user/tags/transaction", %{
+             |> post("/api/account/v1/user/tags/transaction", %{
                "transaction_hash" => tx_hash,
                "name" => name
              })
@@ -381,7 +381,7 @@ defmodule BlockScoutWeb.Account.Api.V2.UserControllerTest do
       assert Enum.all?(created, fn {tx_hash, map_tag, _} ->
                response =
                  conn
-                 |> get("/api/account/v2/tags/transaction/#{tx_hash}")
+                 |> get("/api/account/v1/tags/transaction/#{tx_hash}")
                  |> json_response(200)
 
                response["personal_tx_tag"] == map_tag
@@ -389,10 +389,9 @@ defmodule BlockScoutWeb.Account.Api.V2.UserControllerTest do
 
       response =
         conn
-        |> get("/api/account/v2/user/tags/transaction")
+        |> get("/api/account/v1/user/tags/transaction")
         |> doc(description: "Get private transactions tags")
         |> json_response(200)
-        |> Map.get("items")
 
       assert Enum.all?(created, fn {_, _, map} -> map in response end)
     end
@@ -406,7 +405,7 @@ defmodule BlockScoutWeb.Account.Api.V2.UserControllerTest do
         Enum.map(zipped, fn {tx_hash, name} ->
           id =
             (conn
-             |> post("/api/account/v2/user/tags/transaction", %{
+             |> post("/api/account/v1/user/tags/transaction", %{
                "transaction_hash" => tx_hash,
                "name" => name
              })
@@ -418,15 +417,15 @@ defmodule BlockScoutWeb.Account.Api.V2.UserControllerTest do
       assert Enum.all?(created, fn {tx_hash, map_tag, _} ->
                response =
                  conn
-                 |> get("/api/account/v2/tags/transaction/#{tx_hash}")
+                 |> get("/api/account/v1/tags/transaction/#{tx_hash}")
                  |> json_response(200)
 
                response["personal_tx_tag"] == map_tag
              end)
 
-      %{"items" => response, "next_page_params" => nil} =
+      response =
         conn
-        |> get("/api/account/v2/user/tags/transaction")
+        |> get("/api/account/v1/user/tags/transaction")
         |> json_response(200)
 
       assert Enum.all?(created, fn {_, _, map} -> map in response end)
@@ -434,24 +433,24 @@ defmodule BlockScoutWeb.Account.Api.V2.UserControllerTest do
       {_, _, %{"id" => id}} = Enum.at(created, 0)
 
       assert conn
-             |> delete("/api/account/v2/user/tags/transaction/#{id}")
+             |> delete("/api/account/v1/user/tags/transaction/#{id}")
              |> doc("Delete private transaction tag")
              |> json_response(200) == %{"message" => "OK"}
 
       assert Enum.all?(Enum.drop(created, 1), fn {_, _, %{"id" => id}} ->
                conn
-               |> delete("/api/account/v2/user/tags/transaction/#{id}")
+               |> delete("/api/account/v1/user/tags/transaction/#{id}")
                |> json_response(200) == %{"message" => "OK"}
              end)
 
       assert conn
-             |> get("/api/account/v2/user/tags/transaction")
-             |> json_response(200) == %{"items" => [], "next_page_params" => nil}
+             |> get("/api/account/v1/user/tags/transaction")
+             |> json_response(200) == []
 
       assert Enum.all?(created, fn {addr, _, _} ->
                response =
                  conn
-                 |> get("/api/account/v2/tags/transaction/#{addr}")
+                 |> get("/api/account/v1/tags/transaction/#{addr}")
                  |> json_response(200)
 
                response["personal_tx_tag"] == nil
@@ -464,7 +463,7 @@ defmodule BlockScoutWeb.Account.Api.V2.UserControllerTest do
       post_watchlist_address_response =
         conn
         |> post(
-          "/api/account/v2/user/watchlist",
+          "/api/account/v1/user/watchlist",
           watchlist_address_map
         )
         |> doc(description: "Add address to watch list")
@@ -475,8 +474,7 @@ defmodule BlockScoutWeb.Account.Api.V2.UserControllerTest do
       assert post_watchlist_address_response["notification_methods"] == watchlist_address_map["notification_methods"]
       assert post_watchlist_address_response["address_hash"] == watchlist_address_map["address_hash"]
 
-      get_watchlist_address_response =
-        conn |> get("/api/account/v2/user/watchlist") |> json_response(200) |> Map.get("items") |> Enum.at(0)
+      get_watchlist_address_response = conn |> get("/api/account/v1/user/watchlist") |> json_response(200) |> Enum.at(0)
 
       assert get_watchlist_address_response["notification_settings"] == watchlist_address_map["notification_settings"]
       assert get_watchlist_address_response["name"] == watchlist_address_map["name"]
@@ -489,21 +487,20 @@ defmodule BlockScoutWeb.Account.Api.V2.UserControllerTest do
       post_watchlist_address_response_1 =
         conn
         |> post(
-          "/api/account/v2/user/watchlist",
+          "/api/account/v1/user/watchlist",
           watchlist_address_map_1
         )
         |> json_response(200)
 
       get_watchlist_address_response_1_0 =
         conn
-        |> get("/api/account/v2/user/watchlist")
+        |> get("/api/account/v1/user/watchlist")
         |> doc(description: "Get addresses from watchlists")
         |> json_response(200)
-        |> Map.get("items")
         |> Enum.at(1)
 
       get_watchlist_address_response_1_1 =
-        conn |> get("/api/account/v2/user/watchlist") |> json_response(200) |> Map.get("items") |> Enum.at(0)
+        conn |> get("/api/account/v1/user/watchlist") |> json_response(200) |> Enum.at(0)
 
       assert get_watchlist_address_response_1_0 == get_watchlist_address_response
 
@@ -534,11 +531,11 @@ defmodule BlockScoutWeb.Account.Api.V2.UserControllerTest do
       end
 
       assert conn
-             |> post("/api/account/v2/user/watchlist", build(:watchlist_address))
+             |> post("/api/account/v1/user/watchlist", build(:watchlist_address))
              |> json_response(200)
 
       assert conn
-             |> post("/api/account/v2/user/watchlist", build(:watchlist_address))
+             |> post("/api/account/v1/user/watchlist", build(:watchlist_address))
              |> json_response(422)
 
       Application.put_env(:explorer, Explorer.Account, old_env)
@@ -569,7 +566,7 @@ defmodule BlockScoutWeb.Account.Api.V2.UserControllerTest do
       post_watchlist_address_response =
         conn
         |> post(
-          "/api/account/v2/user/watchlist",
+          "/api/account/v1/user/watchlist",
           watchlist_address_map
         )
         |> json_response(200)
@@ -579,8 +576,7 @@ defmodule BlockScoutWeb.Account.Api.V2.UserControllerTest do
       assert post_watchlist_address_response["notification_methods"] == watchlist_address_map["notification_methods"]
       assert post_watchlist_address_response["address_hash"] == watchlist_address_map["address_hash"]
 
-      get_watchlist_address_response =
-        conn |> get("/api/account/v2/user/watchlist") |> json_response(200) |> Map.get("items") |> Enum.at(0)
+      get_watchlist_address_response = conn |> get("/api/account/v1/user/watchlist") |> json_response(200) |> Enum.at(0)
 
       assert get_watchlist_address_response["notification_settings"] == watchlist_address_map["notification_settings"]
       assert get_watchlist_address_response["name"] == watchlist_address_map["name"]
@@ -593,16 +589,16 @@ defmodule BlockScoutWeb.Account.Api.V2.UserControllerTest do
       post_watchlist_address_response_1 =
         conn
         |> post(
-          "/api/account/v2/user/watchlist",
+          "/api/account/v1/user/watchlist",
           watchlist_address_map_1
         )
         |> json_response(200)
 
       get_watchlist_address_response_1_0 =
-        conn |> get("/api/account/v2/user/watchlist") |> json_response(200) |> Map.get("items") |> Enum.at(1)
+        conn |> get("/api/account/v1/user/watchlist") |> json_response(200) |> Enum.at(1)
 
       get_watchlist_address_response_1_1 =
-        conn |> get("/api/account/v2/user/watchlist") |> json_response(200) |> Map.get("items") |> Enum.at(0)
+        conn |> get("/api/account/v1/user/watchlist") |> json_response(200) |> Enum.at(0)
 
       assert get_watchlist_address_response_1_0 == get_watchlist_address_response
 
@@ -618,15 +614,15 @@ defmodule BlockScoutWeb.Account.Api.V2.UserControllerTest do
       assert get_watchlist_address_response_1_1["id"] == post_watchlist_address_response_1["id"]
 
       assert conn
-             |> delete("/api/account/v2/user/watchlist/#{get_watchlist_address_response_1_1["id"]}")
+             |> delete("/api/account/v1/user/watchlist/#{get_watchlist_address_response_1_1["id"]}")
              |> doc(description: "Delete address from watchlist by id")
              |> json_response(200) == %{"message" => "OK"}
 
       assert conn
-             |> delete("/api/account/v2/user/watchlist/#{get_watchlist_address_response_1_0["id"]}")
+             |> delete("/api/account/v1/user/watchlist/#{get_watchlist_address_response_1_0["id"]}")
              |> json_response(200) == %{"message" => "OK"}
 
-      assert conn |> get("/api/account/v2/user/watchlist") |> json_response(200) |> Map.get("items") == []
+      assert conn |> get("/api/account/v1/user/watchlist") |> json_response(200) == []
     end
 
     test "put watchlist address", %{conn: conn} do
@@ -635,7 +631,7 @@ defmodule BlockScoutWeb.Account.Api.V2.UserControllerTest do
       post_watchlist_address_response =
         conn
         |> post(
-          "/api/account/v2/user/watchlist",
+          "/api/account/v1/user/watchlist",
           watchlist_address_map
         )
         |> json_response(200)
@@ -645,8 +641,7 @@ defmodule BlockScoutWeb.Account.Api.V2.UserControllerTest do
       assert post_watchlist_address_response["notification_methods"] == watchlist_address_map["notification_methods"]
       assert post_watchlist_address_response["address_hash"] == watchlist_address_map["address_hash"]
 
-      get_watchlist_address_response =
-        conn |> get("/api/account/v2/user/watchlist") |> json_response(200) |> Map.get("items") |> Enum.at(0)
+      get_watchlist_address_response = conn |> get("/api/account/v1/user/watchlist") |> json_response(200) |> Enum.at(0)
 
       assert get_watchlist_address_response["notification_settings"] == watchlist_address_map["notification_settings"]
       assert get_watchlist_address_response["name"] == watchlist_address_map["name"]
@@ -659,7 +654,7 @@ defmodule BlockScoutWeb.Account.Api.V2.UserControllerTest do
       put_watchlist_address_response =
         conn
         |> put(
-          "/api/account/v2/user/watchlist/#{post_watchlist_address_response["id"]}",
+          "/api/account/v1/user/watchlist/#{post_watchlist_address_response["id"]}",
           new_watchlist_address_map
         )
         |> doc(description: "Edit watchlist address")
@@ -680,7 +675,7 @@ defmodule BlockScoutWeb.Account.Api.V2.UserControllerTest do
       post_watchlist_address_response =
         conn
         |> post(
-          "/api/account/v2/user/watchlist",
+          "/api/account/v1/user/watchlist",
           watchlist_address_map
         )
         |> json_response(200)
@@ -692,7 +687,7 @@ defmodule BlockScoutWeb.Account.Api.V2.UserControllerTest do
 
       assert conn
              |> post(
-               "/api/account/v2/user/watchlist",
+               "/api/account/v1/user/watchlist",
                watchlist_address_map
              )
              |> doc(description: "Example of error on creating watchlist address")
@@ -703,14 +698,14 @@ defmodule BlockScoutWeb.Account.Api.V2.UserControllerTest do
       post_watchlist_address_response_1 =
         conn
         |> post(
-          "/api/account/v2/user/watchlist",
+          "/api/account/v1/user/watchlist",
           new_watchlist_address_map
         )
         |> json_response(200)
 
       assert conn
              |> put(
-               "/api/account/v2/user/watchlist/#{post_watchlist_address_response_1["id"]}",
+               "/api/account/v1/user/watchlist/#{post_watchlist_address_response_1["id"]}",
                watchlist_address_map
              )
              |> doc(description: "Example of error on editing watchlist address")
@@ -722,7 +717,7 @@ defmodule BlockScoutWeb.Account.Api.V2.UserControllerTest do
 
       conn
       |> post(
-        "/api/account/v2/user/watchlist",
+        "/api/account/v1/user/watchlist",
         watchlist_address_map
       )
       |> json_response(200)
@@ -731,7 +726,7 @@ defmodule BlockScoutWeb.Account.Api.V2.UserControllerTest do
 
       conn
       |> post(
-        "/api/account/v2/user/watchlist",
+        "/api/account/v1/user/watchlist",
         watchlist_address_map_1
       )
       |> json_response(200)
@@ -766,7 +761,7 @@ defmodule BlockScoutWeb.Account.Api.V2.UserControllerTest do
         |> Enum.sort(fn x1, x2 -> Decimal.compare(x1, x2) in [:gt, :eq] end)
         |> Enum.take(150)
 
-      [wa2, wa1] = conn |> get("/api/account/v2/user/watchlist") |> json_response(200) |> Map.get("items")
+      [wa2, wa1] = conn |> get("/api/account/v1/user/watchlist") |> json_response(200)
 
       assert wa1["tokens_fiat_value"] |> Decimal.new() |> Decimal.round(13) ==
                values |> Enum.reduce(Decimal.new(0), fn x, acc -> Decimal.add(x, acc) end) |> Decimal.round(13)
@@ -786,7 +781,7 @@ defmodule BlockScoutWeb.Account.Api.V2.UserControllerTest do
 
       conn
       |> post(
-        "/api/account/v2/user/watchlist",
+        "/api/account/v1/user/watchlist",
         watchlist_address_map
       )
       |> json_response(200)
@@ -813,7 +808,7 @@ defmodule BlockScoutWeb.Account.Api.V2.UserControllerTest do
         token_contract_address_hash: token.contract_address_hash
       )
 
-      [wa1] = conn |> get("/api/account/v2/user/watchlist") |> json_response(200) |> Map.get("items")
+      [wa1] = conn |> get("/api/account/v1/user/watchlist") |> json_response(200)
 
       assert wa1["tokens_fiat_value"] |> Decimal.new() |> Decimal.round(13) ==
                values |> Enum.reduce(Decimal.new(0), fn x, acc -> Decimal.add(x, acc) end) |> Decimal.round(13)
@@ -826,7 +821,7 @@ defmodule BlockScoutWeb.Account.Api.V2.UserControllerTest do
       post_api_key_response =
         conn
         |> post(
-          "/api/account/v2/user/api_keys",
+          "/api/account/v1/user/api_keys",
           %{"name" => "test"}
         )
         |> doc(description: "Add api key")
@@ -840,7 +835,7 @@ defmodule BlockScoutWeb.Account.Api.V2.UserControllerTest do
       Enum.each(0..2, fn _x ->
         conn
         |> post(
-          "/api/account/v2/user/api_keys",
+          "/api/account/v1/user/api_keys",
           %{"name" => "test"}
         )
         |> json_response(200)
@@ -848,14 +843,14 @@ defmodule BlockScoutWeb.Account.Api.V2.UserControllerTest do
 
       assert conn
              |> post(
-               "/api/account/v2/user/api_keys",
+               "/api/account/v1/user/api_keys",
                %{"name" => "test"}
              )
              |> doc(description: "Example of error on creating api key")
              |> json_response(422) == %{"errors" => %{"name" => ["Max 3 keys per account"]}}
 
       assert conn
-             |> get("/api/account/v2/user/api_keys")
+             |> get("/api/account/v1/user/api_keys")
              |> doc(description: "Get api keys list")
              |> json_response(200)
              |> Enum.count() == 3
@@ -865,7 +860,7 @@ defmodule BlockScoutWeb.Account.Api.V2.UserControllerTest do
       post_api_key_response =
         conn
         |> post(
-          "/api/account/v2/user/api_keys",
+          "/api/account/v1/user/api_keys",
           %{"name" => "test"}
         )
         |> json_response(200)
@@ -876,7 +871,7 @@ defmodule BlockScoutWeb.Account.Api.V2.UserControllerTest do
       put_api_key_response =
         conn
         |> put(
-          "/api/account/v2/user/api_keys/#{post_api_key_response["api_key"]}",
+          "/api/account/v1/user/api_keys/#{post_api_key_response["api_key"]}",
           %{"name" => "test_1"}
         )
         |> doc(description: "Edit api key")
@@ -886,7 +881,7 @@ defmodule BlockScoutWeb.Account.Api.V2.UserControllerTest do
       assert put_api_key_response["name"] == "test_1"
 
       assert conn
-             |> get("/api/account/v2/user/api_keys")
+             |> get("/api/account/v1/user/api_keys")
              |> json_response(200) == [put_api_key_response]
     end
 
@@ -894,7 +889,7 @@ defmodule BlockScoutWeb.Account.Api.V2.UserControllerTest do
       post_api_key_response =
         conn
         |> post(
-          "/api/account/v2/user/api_keys",
+          "/api/account/v1/user/api_keys",
           %{"name" => "test"}
         )
         |> json_response(200)
@@ -903,17 +898,17 @@ defmodule BlockScoutWeb.Account.Api.V2.UserControllerTest do
       assert post_api_key_response["api_key"]
 
       assert conn
-             |> get("/api/account/v2/user/api_keys")
+             |> get("/api/account/v1/user/api_keys")
              |> json_response(200)
              |> Enum.count() == 1
 
       assert conn
-             |> delete("/api/account/v2/user/api_keys/#{post_api_key_response["api_key"]}")
+             |> delete("/api/account/v1/user/api_keys/#{post_api_key_response["api_key"]}")
              |> doc(description: "Delete api key")
              |> json_response(200) == %{"message" => "OK"}
 
       assert conn
-             |> get("/api/account/v2/user/api_keys")
+             |> get("/api/account/v1/user/api_keys")
              |> json_response(200) == []
     end
 
@@ -923,7 +918,7 @@ defmodule BlockScoutWeb.Account.Api.V2.UserControllerTest do
       post_custom_abi_response =
         conn
         |> post(
-          "/api/account/v2/user/custom_abis",
+          "/api/account/v1/user/custom_abis",
           custom_abi
         )
         |> doc(description: "Add custom abi")
@@ -939,7 +934,7 @@ defmodule BlockScoutWeb.Account.Api.V2.UserControllerTest do
       Enum.each(0..14, fn _x ->
         conn
         |> post(
-          "/api/account/v2/user/custom_abis",
+          "/api/account/v1/user/custom_abis",
           build(:custom_abi)
         )
         |> json_response(200)
@@ -947,14 +942,14 @@ defmodule BlockScoutWeb.Account.Api.V2.UserControllerTest do
 
       assert conn
              |> post(
-               "/api/account/v2/user/custom_abis",
+               "/api/account/v1/user/custom_abis",
                build(:custom_abi)
              )
              |> doc(description: "Example of error on creating custom abi")
              |> json_response(422) == %{"errors" => %{"name" => ["Max 15 ABIs per account"]}}
 
       assert conn
-             |> get("/api/account/v2/user/custom_abis")
+             |> get("/api/account/v1/user/custom_abis")
              |> doc(description: "Get custom abis list")
              |> json_response(200)
              |> Enum.count() == 15
@@ -966,7 +961,7 @@ defmodule BlockScoutWeb.Account.Api.V2.UserControllerTest do
       post_custom_abi_response =
         conn
         |> post(
-          "/api/account/v2/user/custom_abis",
+          "/api/account/v1/user/custom_abis",
           custom_abi
         )
         |> json_response(200)
@@ -981,7 +976,7 @@ defmodule BlockScoutWeb.Account.Api.V2.UserControllerTest do
       put_custom_abi_response =
         conn
         |> put(
-          "/api/account/v2/user/custom_abis/#{post_custom_abi_response["id"]}",
+          "/api/account/v1/user/custom_abis/#{post_custom_abi_response["id"]}",
           custom_abi_1
         )
         |> doc(description: "Edit custom abi")
@@ -993,7 +988,7 @@ defmodule BlockScoutWeb.Account.Api.V2.UserControllerTest do
       assert put_custom_abi_response["abi"] == custom_abi_1["abi"]
 
       assert conn
-             |> get("/api/account/v2/user/custom_abis")
+             |> get("/api/account/v1/user/custom_abis")
              |> json_response(200) == [put_custom_abi_response]
     end
 
@@ -1003,7 +998,7 @@ defmodule BlockScoutWeb.Account.Api.V2.UserControllerTest do
       post_custom_abi_response =
         conn
         |> post(
-          "/api/account/v2/user/custom_abis",
+          "/api/account/v1/user/custom_abis",
           custom_abi
         )
         |> json_response(200)
@@ -1012,17 +1007,17 @@ defmodule BlockScoutWeb.Account.Api.V2.UserControllerTest do
       assert post_custom_abi_response["id"]
 
       assert conn
-             |> get("/api/account/v2/user/custom_abis")
+             |> get("/api/account/v1/user/custom_abis")
              |> json_response(200)
              |> Enum.count() == 1
 
       assert conn
-             |> delete("/api/account/v2/user/custom_abis/#{post_custom_abi_response["id"]}")
+             |> delete("/api/account/v1/user/custom_abis/#{post_custom_abi_response["id"]}")
              |> doc(description: "Delete custom abi")
              |> json_response(200) == %{"message" => "OK"}
 
       assert conn
-             |> get("/api/account/v2/user/custom_abis")
+             |> get("/api/account/v1/user/custom_abis")
              |> json_response(200) == []
     end
   end
@@ -1034,7 +1029,7 @@ defmodule BlockScoutWeb.Account.Api.V2.UserControllerTest do
       post_public_tags_request_response =
         conn
         |> post(
-          "/api/account/v2/user/public_tags",
+          "/api/account/v1/user/public_tags",
           public_tags_request
         )
         |> doc(description: "Submit request to add a public tag")
@@ -1057,7 +1052,7 @@ defmodule BlockScoutWeb.Account.Api.V2.UserControllerTest do
       post_public_tags_request_response =
         conn
         |> post(
-          "/api/account/v2/user/public_tags",
+          "/api/account/v1/user/public_tags",
           public_tags_request
         )
         |> json_response(200)
@@ -1073,7 +1068,7 @@ defmodule BlockScoutWeb.Account.Api.V2.UserControllerTest do
       assert post_public_tags_request_response["id"]
 
       assert conn
-             |> get("/api/account/v2/user/public_tags")
+             |> get("/api/account/v1/user/public_tags")
              |> json_response(200)
              |> Enum.map(&convert_date/1) ==
                [post_public_tags_request_response]
@@ -1089,7 +1084,7 @@ defmodule BlockScoutWeb.Account.Api.V2.UserControllerTest do
           response =
             conn
             |> post(
-              "/api/account/v2/user/public_tags",
+              "/api/account/v1/user/public_tags",
               request
             )
             |> json_response(200)
@@ -1109,7 +1104,7 @@ defmodule BlockScoutWeb.Account.Api.V2.UserControllerTest do
         |> Enum.reverse()
 
       assert conn
-             |> get("/api/account/v2/user/public_tags")
+             |> get("/api/account/v1/user/public_tags")
              |> doc(description: "Get list of requests to add a public tag")
              |> json_response(200)
              |> Enum.map(&convert_date/1) == final_list
@@ -1117,18 +1112,18 @@ defmodule BlockScoutWeb.Account.Api.V2.UserControllerTest do
       %{"id" => id} = Enum.at(final_list, 0)
 
       assert conn
-             |> delete("/api/account/v2/user/public_tags/#{id}", %{"remove_reason" => "reason"})
+             |> delete("/api/account/v1/user/public_tags/#{id}", %{"remove_reason" => "reason"})
              |> doc(description: "Delete public tags request")
              |> json_response(200) == %{"message" => "OK"}
 
       Enum.each(Enum.drop(final_list, 1), fn request ->
         assert conn
-               |> delete("/api/account/v2/user/public_tags/#{request["id"]}", %{"remove_reason" => "reason"})
+               |> delete("/api/account/v1/user/public_tags/#{request["id"]}", %{"remove_reason" => "reason"})
                |> json_response(200) == %{"message" => "OK"}
       end)
 
       assert conn
-             |> get("/api/account/v2/user/public_tags")
+             |> get("/api/account/v1/user/public_tags")
              |> json_response(200) == []
     end
 
@@ -1138,7 +1133,7 @@ defmodule BlockScoutWeb.Account.Api.V2.UserControllerTest do
       post_public_tags_request_response =
         conn
         |> post(
-          "/api/account/v2/user/public_tags",
+          "/api/account/v1/user/public_tags",
           public_tags_request
         )
         |> json_response(200)
@@ -1154,7 +1149,7 @@ defmodule BlockScoutWeb.Account.Api.V2.UserControllerTest do
       assert post_public_tags_request_response["id"]
 
       assert conn
-             |> get("/api/account/v2/user/public_tags")
+             |> get("/api/account/v1/user/public_tags")
              |> json_response(200)
              |> Enum.map(&convert_date/1) ==
                [post_public_tags_request_response]
@@ -1165,7 +1160,7 @@ defmodule BlockScoutWeb.Account.Api.V2.UserControllerTest do
       put_public_tags_request_response =
         conn
         |> put(
-          "/api/account/v2/user/public_tags/#{post_public_tags_request_response["id"]}",
+          "/api/account/v1/user/public_tags/#{post_public_tags_request_response["id"]}",
           new_public_tags_request
         )
         |> doc(description: "Edit request to add a public tag")
@@ -1182,7 +1177,7 @@ defmodule BlockScoutWeb.Account.Api.V2.UserControllerTest do
       assert put_public_tags_request_response["id"] == post_public_tags_request_response["id"]
 
       assert conn
-             |> get("/api/account/v2/user/public_tags")
+             |> get("/api/account/v1/user/public_tags")
              |> json_response(200)
              |> Enum.map(&convert_date/1) ==
                [put_public_tags_request_response]
diff --git a/apps/block_scout_web/test/block_scout_web/controllers/api/v2/smart_contract_controller_test.exs b/apps/block_scout_web/test/block_scout_web/controllers/api/v2/smart_contract_controller_test.exs
index 64b620d34a69..ad6eabf1f113 100644
--- a/apps/block_scout_web/test/block_scout_web/controllers/api/v2/smart_contract_controller_test.exs
+++ b/apps/block_scout_web/test/block_scout_web/controllers/api/v2/smart_contract_controller_test.exs
@@ -1815,7 +1815,7 @@ defmodule BlockScoutWeb.API.V2.SmartContractControllerTest do
 
       conn
       |> post(
-        "/api/account/v2/user/custom_abis",
+        "/api/account/v1/user/custom_abis",
         custom_abi
       )
 
@@ -1867,7 +1867,7 @@ defmodule BlockScoutWeb.API.V2.SmartContractControllerTest do
 
       conn
       |> post(
-        "/api/account/v2/user/custom_abis",
+        "/api/account/v1/user/custom_abis",
         custom_abi
       )
 
@@ -1934,7 +1934,7 @@ defmodule BlockScoutWeb.API.V2.SmartContractControllerTest do
 
       conn
       |> post(
-        "/api/account/v2/user/custom_abis",
+        "/api/account/v1/user/custom_abis",
         custom_abi
       )
 

From dfb076e5bfa04ede84099008fe75c06a72ba5445 Mon Sep 17 00:00:00 2001
From: Viktor Baranov <baranov.viktor.27@gmail.com>
Date: Mon, 27 Nov 2023 12:58:25 +0300
Subject: [PATCH 688/909] Update Readme in docker-compose

---
 .github/workflows/config.yml | 3 +++
 docker-compose/README.md     | 2 ++
 2 files changed, 5 insertions(+)

diff --git a/.github/workflows/config.yml b/.github/workflows/config.yml
index 744afbbd3a58..6329e65a2869 100644
--- a/.github/workflows/config.yml
+++ b/.github/workflows/config.yml
@@ -20,6 +20,9 @@ on:
       - production-zkevm-stg
       - production-zksync-stg
       - staging-l2
+    paths-ignore:
+      - 'CHANGELOG.md'
+      - '**/README.md'
   pull_request:
     branches:
       - master
diff --git a/docker-compose/README.md b/docker-compose/README.md
index ded1ce9ad0b4..c212e1cde760 100644
--- a/docker-compose/README.md
+++ b/docker-compose/README.md
@@ -37,6 +37,8 @@ and 4 containers for microservices (written in Rust):
 
 The repo contains built-in configs for different JSON RPC clients without need to build the image.
 
+**Note**: in all below examples, you can use `docker compose` instead of `docker-compose`, if compose v2 plugin is installed in Docker.
+
 - Erigon: `docker-compose -f docker-compose-no-build-erigon.yml up -d`
 - Geth (suitable for Reth as well): `docker-compose -f docker-compose-no-build-geth.yml up -d`
 - Geth Clique: `docker-compose -f docker-compose-no-build-geth-clique-consensus.yml up -d`

From 349916f7625b663a2a364932f79243c60de435db Mon Sep 17 00:00:00 2001
From: Viktor Baranov <baranov.viktor.27@gmail.com>
Date: Mon, 27 Nov 2023 13:07:07 +0300
Subject: [PATCH 689/909] Update paths-ignore for CI

---
 .github/workflows/config.yml                          | 2 ++
 .github/workflows/publish-docker-image-every-push.yml | 4 ++++
 2 files changed, 6 insertions(+)

diff --git a/.github/workflows/config.yml b/.github/workflows/config.yml
index 6329e65a2869..31e89c223fa4 100644
--- a/.github/workflows/config.yml
+++ b/.github/workflows/config.yml
@@ -23,6 +23,8 @@ on:
     paths-ignore:
       - 'CHANGELOG.md'
       - '**/README.md'
+      - 'docker/*'
+      - 'docker-compose/*'
   pull_request:
     branches:
       - master
diff --git a/.github/workflows/publish-docker-image-every-push.yml b/.github/workflows/publish-docker-image-every-push.yml
index 98fc8a4de88b..a5ebce6f57f6 100644
--- a/.github/workflows/publish-docker-image-every-push.yml
+++ b/.github/workflows/publish-docker-image-every-push.yml
@@ -4,6 +4,10 @@ on:
   push:
     branches:
       - master
+    paths-ignore:
+      - 'CHANGELOG.md'
+      - '**/README.md'
+      - 'docker-compose/*'
 env:
   OTP_VERSION: '25.2.1'
   ELIXIR_VERSION: '1.14.5'

From 9383b144a9a426f632ea8eceea51e7d0775de690 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 27 Nov 2023 18:30:41 +0000
Subject: [PATCH 690/909] Bump httpoison from 2.2.0 to 2.2.1

Bumps [httpoison](https://github.com/edgurgel/httpoison) from 2.2.0 to 2.2.1.
- [Release notes](https://github.com/edgurgel/httpoison/releases)
- [Commits](https://github.com/edgurgel/httpoison/compare/v2.2.0...v2.2.1)

---
updated-dependencies:
- dependency-name: httpoison
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 mix.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mix.lock b/mix.lock
index b44a533985d3..cff3ceedc4a0 100644
--- a/mix.lock
+++ b/mix.lock
@@ -68,7 +68,7 @@
   "hammer": {:hex, :hammer, "6.1.0", "f263e3c3e9946bd410ea0336b2abe0cb6260af4afb3a221e1027540706e76c55", [:make, :mix], [{:poolboy, "~> 1.5", [hex: :poolboy, repo: "hexpm", optional: false]}], "hexpm", "b47e415a562a6d072392deabcd58090d8a41182cf9044cdd6b0d0faaaf68ba57"},
   "hammer_backend_redis": {:hex, :hammer_backend_redis, "6.1.2", "eb296bb4924928e24135308b2afc189201fd09411c870c6bbadea444a49b2f2c", [:mix], [{:hammer, "~> 6.0", [hex: :hammer, repo: "hexpm", optional: false]}, {:redix, "~> 1.1", [hex: :redix, repo: "hexpm", optional: false]}], "hexpm", "217ea066278910543a5e9b577d5bf2425419446b94fe76bdd9f255f39feec9fa"},
   "html_entities": {:hex, :html_entities, "0.5.2", "9e47e70598da7de2a9ff6af8758399251db6dbb7eebe2b013f2bbd2515895c3c", [:mix], [], "hexpm", "c53ba390403485615623b9531e97696f076ed415e8d8058b1dbaa28181f4fdcc"},
-  "httpoison": {:hex, :httpoison, "2.2.0", "839298929243b872b3f53c3693fa369ac3dbe03102cefd0a126194738bf4bb0e", [:mix], [{:hackney, "~> 1.17", [hex: :hackney, repo: "hexpm", optional: false]}], "hexpm", "a49a9337c2b671464948a00cff6a882d271c1c8e3d25a6ca14d0532cbd23f65a"},
+  "httpoison": {:hex, :httpoison, "2.2.1", "87b7ed6d95db0389f7df02779644171d7319d319178f6680438167d7b69b1f3d", [:mix], [{:hackney, "~> 1.17", [hex: :hackney, repo: "hexpm", optional: false]}], "hexpm", "51364e6d2f429d80e14fe4b5f8e39719cacd03eb3f9a9286e61e216feac2d2df"},
   "idna": {:hex, :idna, "6.1.1", "8a63070e9f7d0c62eb9d9fcb360a7de382448200fbbd1b106cc96d3d8099df8d", [:rebar3], [{:unicode_util_compat, "~>0.7.0", [hex: :unicode_util_compat, repo: "hexpm", optional: false]}], "hexpm", "92376eb7894412ed19ac475e4a86f7b413c1b9fbb5bd16dccd57934157944cea"},
   "inflex": {:hex, :inflex, "2.1.0", "a365cf0821a9dacb65067abd95008ca1b0bb7dcdd85ae59965deef2aa062924c", [:mix], [], "hexpm", "14c17d05db4ee9b6d319b0bff1bdf22aa389a25398d1952c7a0b5f3d93162dd8"},
   "jason": {:hex, :jason, "1.4.1", "af1504e35f629ddcdd6addb3513c3853991f694921b1b9368b0bd32beb9f1b63", [:mix], [{:decimal, "~> 1.0 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: true]}], "hexpm", "fbb01ecdfd565b56261302f7e1fcc27c4fb8f32d56eab74db621fc154604a7a1"},

From 9c3e2cf852d658c281100238fc12afe6e13312d7 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 27 Nov 2023 18:31:01 +0000
Subject: [PATCH 691/909] Bump prometheus from 4.10.0 to 4.11.0

Bumps [prometheus](https://github.com/deadtrickster/prometheus.erl) from 4.10.0 to 4.11.0.
- [Release notes](https://github.com/deadtrickster/prometheus.erl/releases)
- [Commits](https://github.com/deadtrickster/prometheus.erl/compare/v4.10.0...v4.11.0)

---
updated-dependencies:
- dependency-name: prometheus
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 mix.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mix.lock b/mix.lock
index b44a533985d3..576a01f63da1 100644
--- a/mix.lock
+++ b/mix.lock
@@ -110,7 +110,7 @@
   "poison": {:hex, :poison, "4.0.1", "bcb755a16fac91cad79bfe9fc3585bb07b9331e50cfe3420a24bcc2d735709ae", [:mix], [], "hexpm", "ba8836feea4b394bb718a161fc59a288fe0109b5006d6bdf97b6badfcf6f0f25"},
   "poolboy": {:hex, :poolboy, "1.5.2", "392b007a1693a64540cead79830443abf5762f5d30cf50bc95cb2c1aaafa006b", [:rebar3], [], "hexpm", "dad79704ce5440f3d5a3681c8590b9dc25d1a561e8f5a9c995281012860901e3"},
   "postgrex": {:hex, :postgrex, "0.17.3", "c92cda8de2033a7585dae8c61b1d420a1a1322421df84da9a82a6764580c503d", [:mix], [{:db_connection, "~> 2.1", [hex: :db_connection, repo: "hexpm", optional: false]}, {:decimal, "~> 1.5 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}, {:table, "~> 0.1.0", [hex: :table, repo: "hexpm", optional: true]}], "hexpm", "946cf46935a4fdca7a81448be76ba3503cff082df42c6ec1ff16a4bdfbfb098d"},
-  "prometheus": {:hex, :prometheus, "4.10.0", "792adbf0130ff61b5fa8826f013772af24b6e57b984445c8d602c8a0355704a1", [:mix, :rebar3], [{:quantile_estimator, "~> 0.2.1", [hex: :quantile_estimator, repo: "hexpm", optional: false]}], "hexpm", "2a99bb6dce85e238c7236fde6b0064f9834dc420ddbd962aac4ea2a3c3d59384"},
+  "prometheus": {:hex, :prometheus, "4.11.0", "b95f8de8530f541bd95951e18e355a840003672e5eda4788c5fa6183406ba29a", [:mix, :rebar3], [{:quantile_estimator, "~> 0.2.1", [hex: :quantile_estimator, repo: "hexpm", optional: false]}], "hexpm", "719862351aabf4df7079b05dc085d2bbcbe3ac0ac3009e956671b1d5ab88247d"},
   "prometheus_ecto": {:hex, :prometheus_ecto, "1.4.3", "3dd4da1812b8e0dbee81ea58bb3b62ed7588f2eae0c9e97e434c46807ff82311", [:mix], [{:ecto, "~> 2.0 or ~> 3.0", [hex: :ecto, repo: "hexpm", optional: false]}, {:prometheus_ex, "~> 1.1 or ~> 2.0 or ~> 3.0", [hex: :prometheus_ex, repo: "hexpm", optional: false]}], "hexpm", "8d66289f77f913b37eda81fd287340c17e61a447549deb28efc254532b2bed82"},
   "prometheus_ex": {:git, "https://github.com/lanodan/prometheus.ex", "31f7fbe4b71b79ba27efc2a5085746c4011ceb8f", [branch: "fix/elixir-1.14"]},
   "prometheus_phoenix": {:hex, :prometheus_phoenix, "1.3.0", "c4b527e0b3a9ef1af26bdcfbfad3998f37795b9185d475ca610fe4388fdd3bb5", [:mix], [{:phoenix, "~> 1.4", [hex: :phoenix, repo: "hexpm", optional: false]}, {:prometheus_ex, "~> 1.3 or ~> 2.0 or ~> 3.0", [hex: :prometheus_ex, repo: "hexpm", optional: false]}], "hexpm", "c4d1404ac4e9d3d963da601db2a7d8ea31194f0017057fabf0cfb9bf5a6c8c75"},

From 14015de9b0fcb1e8617b510ead729d6e76221c78 Mon Sep 17 00:00:00 2001
From: Viktor Baranov <baranov.viktor.27@gmail.com>
Date: Tue, 28 Nov 2023 11:01:21 +0300
Subject: [PATCH 692/909] Staging build workflow

---
 ...publish-docker-image-staging-on-demand.yml | 75 +++++++++++++++++++
 1 file changed, 75 insertions(+)
 create mode 100644 .github/workflows/publish-docker-image-staging-on-demand.yml

diff --git a/.github/workflows/publish-docker-image-staging-on-demand.yml b/.github/workflows/publish-docker-image-staging-on-demand.yml
new file mode 100644
index 000000000000..ad6b96a3240b
--- /dev/null
+++ b/.github/workflows/publish-docker-image-staging-on-demand.yml
@@ -0,0 +1,75 @@
+name: Publish Docker image to staging on demand
+
+on:
+  workflow_dispatch:
+  push:
+    branches:
+      - staging
+    paths-ignore:
+      - 'CHANGELOG.md'
+      - '**/README.md'
+      - 'docker-compose/*'
+env:
+  OTP_VERSION: '25.2.1'
+  ELIXIR_VERSION: '1.14.5'
+  RELEASE_VERSION: 5.3.2
+
+jobs:
+  push_to_registry:
+    name: Push Docker image to Docker Hub
+    runs-on: ubuntu-latest
+    outputs:
+      release-version: ${{ steps.output-step.outputs.release-version }}
+      short-sha: ${{ steps.output-step.outputs.short-sha }}
+    steps:
+      - name: Check out the repo
+        uses: actions/checkout@v4
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Log in to Docker Hub
+        uses: docker/login-action@v3
+        with:
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
+
+      - name: Extract metadata (tags, labels) for Docker
+        id: meta
+        uses: docker/metadata-action@v5
+        with:
+          images: blockscout/blockscout-staging
+
+      - name: Add SHORT_SHA env property with commit short sha
+        run: echo "SHORT_SHA=`echo ${GITHUB_SHA} | cut -c1-8`" >> $GITHUB_ENV
+
+      - name: Add outputs
+        run: |
+          echo "::set-output name=release-version::${{ env.NEXT_RELEASE_VERSION }}"
+          echo "::set-output name=short-sha::${{ env.SHORT_SHA }}"
+        id: output-step
+
+      - name: Build and push Docker image
+        uses: docker/build-push-action@v5
+        with:
+          context: .
+          file: ./docker/Dockerfile
+          push: true
+          cache-from: type=registry,ref=blockscout/blockscout:buildcache
+          cache-to: type=registry,ref=blockscout/blockscout:buildcache,mode=max
+          tags: blockscout/blockscout-staging:latest, blockscout/blockscout-staging:${{ env.RELEASE_VERSION }}.commit.${{ env.SHORT_SHA }}
+          build-args: |
+            CACHE_EXCHANGE_RATES_PERIOD=
+            API_V1_READ_METHODS_DISABLED=false
+            DISABLE_WEBAPP=false
+            API_V1_WRITE_METHODS_DISABLED=false
+            CACHE_TOTAL_GAS_USAGE_COUNTER_ENABLED=
+            ADMIN_PANEL_ENABLED=false
+            DECODE_NOT_A_CONTRACT_CALLS=false
+            MIXPANEL_URL=
+            MIXPANEL_TOKEN=
+            AMPLITUDE_URL=
+            AMPLITUDE_API_KEY=
+            CACHE_ADDRESS_WITH_BALANCES_UPDATE_INTERVAL=
+            BLOCKSCOUT_VERSION=v${{ env.RELEASE_VERSION }}-beta.+commit.${{ env.SHORT_SHA }}
+            RELEASE_VERSION=${{ env.RELEASE_VERSION }}

From bd2d21b2cb01be5560762188a4bc9ac37d89d6e2 Mon Sep 17 00:00:00 2001
From: Qwerty5Uiop <alex000010@bk.ru>
Date: Mon, 27 Nov 2023 18:19:28 +0600
Subject: [PATCH 693/909] Fix average block time

---
 CHANGELOG.md                                  |  2 +
 .../explorer/counters/average_block_time.ex   |  4 +-
 .../counters/average_block_time_test.exs      | 50 +++++++++++++++++++
 3 files changed, 54 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7bf4c4c7eeb4..1e92e99ffb05 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,8 @@
 
 ### Fixes
 
+- [#8891](https://github.com/blockscout/blockscout/pull/8891) - Fix average block time
+
 ### Chore
 
 ## 5.3.2-beta
diff --git a/apps/explorer/lib/explorer/counters/average_block_time.ex b/apps/explorer/lib/explorer/counters/average_block_time.ex
index 9075415854a0..9c7338dc9e97 100644
--- a/apps/explorer/lib/explorer/counters/average_block_time.ex
+++ b/apps/explorer/lib/explorer/counters/average_block_time.ex
@@ -84,7 +84,7 @@ defmodule Explorer.Counters.AverageBlockTime do
 
     timestamps =
       timestamps_row
-      |> Enum.sort_by(fn {_, timestamp} -> timestamp end, &>=/2)
+      |> Enum.sort_by(fn {_, timestamp} -> timestamp end, &Timex.after?/2)
       |> Enum.map(fn {number, timestamp} ->
         {number, DateTime.to_unix(timestamp, :millisecond)}
       end)
@@ -125,7 +125,7 @@ defmodule Explorer.Counters.AverageBlockTime do
   defp compose_durations(durations, block_number, last_block_number, last_timestamp, timestamp) do
     block_numbers_range = last_block_number - block_number
 
-    if block_numbers_range == 0 do
+    if block_numbers_range <= 0 do
       {durations, block_number, timestamp}
     else
       duration = (last_timestamp - timestamp) / block_numbers_range
diff --git a/apps/explorer/test/explorer/counters/average_block_time_test.exs b/apps/explorer/test/explorer/counters/average_block_time_test.exs
index d9e0cfb35cd4..3472276d1959 100644
--- a/apps/explorer/test/explorer/counters/average_block_time_test.exs
+++ b/apps/explorer/test/explorer/counters/average_block_time_test.exs
@@ -129,5 +129,55 @@ defmodule Explorer.Counters.AverageBlockTimeTest do
 
       assert AverageBlockTime.average_block_time() == Timex.Duration.parse!("PT3S")
     end
+
+    test "timestamps are compared correctly" do
+      block_number = 99_999_999
+
+      first_timestamp = ~U[2023-08-23 19:04:59.000000Z]
+      pseudo_after_timestamp = ~U[2022-08-23 19:05:59.000000Z]
+
+      insert(:block, number: block_number, consensus: true, timestamp: pseudo_after_timestamp)
+      insert(:block, number: block_number + 1, consensus: true, timestamp: Timex.shift(first_timestamp, seconds: 3))
+      insert(:block, number: block_number + 2, consensus: true, timestamp: Timex.shift(first_timestamp, seconds: 6))
+
+      Enum.each(1..100, fn i ->
+        insert(:block,
+          number: block_number + i + 2,
+          consensus: true,
+          timestamp: Timex.shift(first_timestamp, seconds: -(101 - i) - 9)
+        )
+      end)
+
+      AverageBlockTime.refresh()
+
+      %{timestamps: timestamps} = :sys.get_state(AverageBlockTime)
+
+      assert Enum.sort_by(timestamps, fn {_bn, ts} -> ts end, &>=/2) == timestamps
+    end
+
+    test "average time are calculated correctly for blocks that are not in chronological order" do
+      block_number = 99_999_999
+
+      first_timestamp = Timex.now()
+
+      insert(:block, number: block_number, consensus: true, timestamp: Timex.shift(first_timestamp, seconds: 3))
+      insert(:block, number: block_number + 1, consensus: true, timestamp: Timex.shift(first_timestamp, seconds: 6))
+      insert(:block, number: block_number + 2, consensus: true, timestamp: Timex.shift(first_timestamp, seconds: 9))
+      insert(:block, number: block_number + 3, consensus: true, timestamp: Timex.shift(first_timestamp, seconds: -69))
+      insert(:block, number: block_number + 4, consensus: true, timestamp: Timex.shift(first_timestamp, seconds: -66))
+      insert(:block, number: block_number + 5, consensus: true, timestamp: Timex.shift(first_timestamp, seconds: -63))
+
+      Enum.each(1..100, fn i ->
+        insert(:block,
+          number: block_number + i + 5,
+          consensus: true,
+          timestamp: Timex.shift(first_timestamp, seconds: -(101 - i) - 9)
+        )
+      end)
+
+      AverageBlockTime.refresh()
+
+      assert Timex.Duration.to_milliseconds(AverageBlockTime.average_block_time()) == 3000
+    end
   end
 end

From d26e6ef4d0c9469f6918ca7999c5438afd5ce74b Mon Sep 17 00:00:00 2001
From: Viktor Baranov <baranov.viktor.27@gmail.com>
Date: Tue, 28 Nov 2023 18:59:24 +0300
Subject: [PATCH 694/909] Update CHANGELOG

---
 CHANGELOG.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1e92e99ffb05..efac2523b600 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,8 +6,6 @@
 
 ### Fixes
 
-- [#8891](https://github.com/blockscout/blockscout/pull/8891) - Fix average block time
-
 ### Chore
 
 ## 5.3.2-beta
@@ -25,6 +23,7 @@
 
 ### Fixes
 
+- [#8891](https://github.com/blockscout/blockscout/pull/8891) - Fix average block time
 - [#8869](https://github.com/blockscout/blockscout/pull/8869) - Limit TokenBalance fetcher timeout
 - [#8855](https://github.com/blockscout/blockscout/pull/8855) - All transactions count at top addresses page
 - [#8836](https://github.com/blockscout/blockscout/pull/8836) - Safe token update
@@ -67,6 +66,7 @@
 - [#8824](https://github.com/blockscout/blockscout/pull/8824) - Bump httpoison from 2.1.0 to 2.2.0
 - [#8828](https://github.com/blockscout/blockscout/pull/8828) - Bump @babel/preset-env from 7.23.2 to 7.23.3 in /apps/block_scout_web/assets
 - [#8825](https://github.com/blockscout/blockscout/pull/8825) - Bump solc from 0.8.22 to 0.8.23 in /apps/explorer
+
 </details>
 
 ## 5.3.1-beta

From 6b705e2d045b7ca2bffdd41affe216b214770966 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 29 Nov 2023 08:39:39 +0000
Subject: [PATCH 695/909] Bump absinthe from 1.7.5 to 1.7.6

Bumps [absinthe](https://github.com/absinthe-graphql/absinthe) from 1.7.5 to 1.7.6.
- [Release notes](https://github.com/absinthe-graphql/absinthe/releases)
- [Changelog](https://github.com/absinthe-graphql/absinthe/blob/main/CHANGELOG.md)
- [Commits](https://github.com/absinthe-graphql/absinthe/compare/v1.7.5...v1.7.6)

---
updated-dependencies:
- dependency-name: absinthe
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 mix.lock | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/mix.lock b/mix.lock
index aae1da0f115e..87e788363b13 100644
--- a/mix.lock
+++ b/mix.lock
@@ -1,5 +1,5 @@
 %{
-  "absinthe": {:hex, :absinthe, "1.7.5", "a15054f05738e766f7cc7fd352887dfd5e61cec371fb4741cca37c3359ff74ac", [:mix], [{:dataloader, "~> 1.0.0 or ~> 2.0", [hex: :dataloader, repo: "hexpm", optional: true]}, {:decimal, "~> 1.0 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: true]}, {:nimble_parsec, "~> 1.2.2 or ~> 1.3.0", [hex: :nimble_parsec, repo: "hexpm", optional: false]}, {:opentelemetry_process_propagator, "~> 0.2.1", [hex: :opentelemetry_process_propagator, repo: "hexpm", optional: true]}, {:telemetry, "~> 1.0 or ~> 0.4", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "22a9a38adca26294ad0ee91226168f5d215b401efd770b8a1b8fd9c9b21ec316"},
+  "absinthe": {:hex, :absinthe, "1.7.6", "0b897365f98d068cfcb4533c0200a8e58825a4aeeae6ec33633ebed6de11773b", [:mix], [{:dataloader, "~> 1.0.0 or ~> 2.0", [hex: :dataloader, repo: "hexpm", optional: true]}, {:decimal, "~> 1.0 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: true]}, {:nimble_parsec, "~> 1.2.2 or ~> 1.3", [hex: :nimble_parsec, repo: "hexpm", optional: false]}, {:opentelemetry_process_propagator, "~> 0.2.1", [hex: :opentelemetry_process_propagator, repo: "hexpm", optional: true]}, {:telemetry, "~> 1.0 or ~> 0.4", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "e7626951ca5eec627da960615b51009f3a774765406ff02722b1d818f17e5778"},
   "absinthe_phoenix": {:hex, :absinthe_phoenix, "2.0.2", "e607b438db900049b9b3760f8ecd0591017a46122fffed7057bf6989020992b5", [:mix], [{:absinthe, "~> 1.5", [hex: :absinthe, repo: "hexpm", optional: false]}, {:absinthe_plug, "~> 1.5", [hex: :absinthe_plug, repo: "hexpm", optional: false]}, {:decimal, "~> 1.0 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: false]}, {:phoenix, "~> 1.5", [hex: :phoenix, repo: "hexpm", optional: false]}, {:phoenix_html, "~> 2.13 or ~> 3.0", [hex: :phoenix_html, repo: "hexpm", optional: true]}, {:phoenix_pubsub, "~> 2.0", [hex: :phoenix_pubsub, repo: "hexpm", optional: false]}], "hexpm", "d36918925c380dc7d2ed7d039c9a3b4182ec36723f7417a68745ade5aab22f8d"},
   "absinthe_plug": {:git, "https://github.com/blockscout/absinthe_plug.git", "c435d43f316769e1beee1dbe500b623124c96785", [tag: "1.5.3"]},
   "absinthe_relay": {:hex, :absinthe_relay, "1.5.2", "cfb8aed70f4e4c7718d3f1c212332d2ea728f17c7fc0f68f1e461f0f5f0c4b9a", [:mix], [{:absinthe, "~> 1.5.0 or ~> 1.6.0 or ~> 1.7.0", [hex: :absinthe, repo: "hexpm", optional: false]}, {:ecto, "~> 2.0 or ~> 3.0", [hex: :ecto, repo: "hexpm", optional: true]}], "hexpm", "0587ee913afa31512e1457a5064ee88427f8fe7bcfbeeecd41c71d9cff0b62b6"},
@@ -92,7 +92,7 @@
   "msgpax": {:hex, :msgpax, "2.4.0", "4647575c87cb0c43b93266438242c21f71f196cafa268f45f91498541148c15d", [:mix], [{:plug, "~> 1.0", [hex: :plug, repo: "hexpm", optional: true]}], "hexpm", "ca933891b0e7075701a17507c61642bf6e0407bb244040d5d0a58597a06369d2"},
   "nimble_csv": {:hex, :nimble_csv, "1.2.0", "4e26385d260c61eba9d4412c71cea34421f296d5353f914afe3f2e71cce97722", [:mix], [], "hexpm", "d0628117fcc2148178b034044c55359b26966c6eaa8e2ce15777be3bbc91b12a"},
   "nimble_options": {:hex, :nimble_options, "1.0.2", "92098a74df0072ff37d0c12ace58574d26880e522c22801437151a159392270e", [:mix], [], "hexpm", "fd12a8db2021036ce12a309f26f564ec367373265b53e25403f0ee697380f1b8"},
-  "nimble_parsec": {:hex, :nimble_parsec, "1.3.1", "2c54013ecf170e249e9291ed0a62e5832f70a476c61da16f6aac6dca0189f2af", [:mix], [], "hexpm", "2682e3c0b2eb58d90c6375fc0cc30bc7be06f365bf72608804fb9cffa5e1b167"},
+  "nimble_parsec": {:hex, :nimble_parsec, "1.4.0", "51f9b613ea62cfa97b25ccc2c1b4216e81df970acd8e16e8d1bdc58fef21370d", [:mix], [], "hexpm", "9c565862810fb383e9838c1dd2d7d2c437b3d13b267414ba6af33e50d2d1cf28"},
   "number": {:hex, :number, "1.0.4", "3e6e6032a3c1d4c3760e77a42c580a57a15545dd993af380809da30fe51a032c", [:mix], [{:decimal, "~> 1.5 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: false]}], "hexpm", "16f7516584ef2be812af4f33f2eaf3f9b9f6ed8892f45853eb93113f83721e42"},
   "numbers": {:hex, :numbers, "5.2.4", "f123d5bb7f6acc366f8f445e10a32bd403c8469bdbce8ce049e1f0972b607080", [:mix], [{:coerce, "~> 1.0", [hex: :coerce, repo: "hexpm", optional: false]}, {:decimal, "~> 1.9 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: true]}], "hexpm", "eeccf5c61d5f4922198395bf87a465b6f980b8b862dd22d28198c5e6fab38582"},
   "oauth2": {:hex, :oauth2, "2.0.1", "70729503e05378697b958919bb2d65b002ba6b28c8112328063648a9348aaa3f", [:mix], [{:hackney, "~> 1.13", [hex: :hackney, repo: "hexpm", optional: false]}], "hexpm", "c64e20d4d105bcdbcbe03170fb530d0eddc3a3e6b135a87528a22c8aecf74c52"},

From 52b58c9ea0ea174bdd977731c8a8b336b70f4d86 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 29 Nov 2023 09:53:18 +0000
Subject: [PATCH 696/909] Bump ex_json_schema from 0.10.1 to 0.10.2

Bumps [ex_json_schema](https://github.com/jonasschmidt/ex_json_schema) from 0.10.1 to 0.10.2.
- [Commits](https://github.com/jonasschmidt/ex_json_schema/compare/v0.10.1...v0.10.2)

---
updated-dependencies:
- dependency-name: ex_json_schema
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 mix.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mix.lock b/mix.lock
index 0772598d44f1..343093379b85 100644
--- a/mix.lock
+++ b/mix.lock
@@ -48,7 +48,7 @@
   "ex_cldr_numbers": {:hex, :ex_cldr_numbers, "2.32.3", "b631ff94c982ec518e46bf4736000a30a33d6b58facc085d5f240305f512ad4a", [:mix], [{:decimal, "~> 1.6 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: false]}, {:digital_token, "~> 0.3 or ~> 1.0", [hex: :digital_token, repo: "hexpm", optional: false]}, {:ex_cldr, "~> 2.37", [hex: :ex_cldr, repo: "hexpm", optional: false]}, {:ex_cldr_currencies, ">= 2.14.2", [hex: :ex_cldr_currencies, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}], "hexpm", "7b626ff1e59a0ec9c3c5db5ce9ca91a6995e2ab56426b71f3cbf67181ea225f5"},
   "ex_cldr_units": {:hex, :ex_cldr_units, "3.16.4", "fee054e9ebed40ef05cbb405cb0c7e7c9fda201f8f03ec0d1e54e879af413246", [:mix], [{:cldr_utils, "~> 2.24", [hex: :cldr_utils, repo: "hexpm", optional: false]}, {:decimal, "~> 1.6 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: false]}, {:ex_cldr_lists, "~> 2.10", [hex: :ex_cldr_lists, repo: "hexpm", optional: false]}, {:ex_cldr_numbers, "~> 2.31", [hex: :ex_cldr_numbers, repo: "hexpm", optional: false]}, {:ex_doc, "~> 0.18", [hex: :ex_doc, repo: "hexpm", optional: true]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}], "hexpm", "7c15c6357dd555a5bc6c72fdeb243e4706a04065753dbd2f40150f062ca996c7"},
   "ex_doc": {:hex, :ex_doc, "0.30.9", "d691453495c47434c0f2052b08dd91cc32bc4e1a218f86884563448ee2502dd2", [:mix], [{:earmark_parser, "~> 1.4.31", [hex: :earmark_parser, repo: "hexpm", optional: false]}, {:makeup_elixir, "~> 0.14", [hex: :makeup_elixir, repo: "hexpm", optional: false]}, {:makeup_erlang, "~> 0.1", [hex: :makeup_erlang, repo: "hexpm", optional: false]}], "hexpm", "d7aaaf21e95dc5cddabf89063327e96867d00013963eadf2c6ad135506a8bc10"},
-  "ex_json_schema": {:hex, :ex_json_schema, "0.10.1", "e03b746b6675a750c0bb1a5cc919f61353f7ab8450977e11ceede20e6180c560", [:mix], [{:decimal, "~> 2.0", [hex: :decimal, repo: "hexpm", optional: false]}], "hexpm", "66a64e60dadad89914d92f89c7e7906c57de75a8b79ac2480d0d53e1b8096fb0"},
+  "ex_json_schema": {:hex, :ex_json_schema, "0.10.2", "7c4b8c1481fdeb1741e2ce66223976edfb9bccebc8014f6aec35d4efe964fb71", [:mix], [{:decimal, "~> 2.0", [hex: :decimal, repo: "hexpm", optional: false]}], "hexpm", "37f43be60f8407659d4d0155a7e45e7f406dab1f827051d3d35858a709baf6a6"},
   "ex_keccak": {:hex, :ex_keccak, "0.7.3", "33298f97159f6b0acd28f6e96ce5ea975a0f4a19f85fe615b4f4579b88b24d06", [:mix], [{:rustler, ">= 0.0.0", [hex: :rustler, repo: "hexpm", optional: true]}, {:rustler_precompiled, "~> 0.6.1", [hex: :rustler_precompiled, repo: "hexpm", optional: false]}], "hexpm", "4c5e6d9d5f77b64ab48769a0166a9814180d40ced68ed74ce60a5174ab55b3fc"},
   "ex_machina": {:hex, :ex_machina, "2.7.0", "b792cc3127fd0680fecdb6299235b4727a4944a09ff0fa904cc639272cd92dc7", [:mix], [{:ecto, "~> 2.2 or ~> 3.0", [hex: :ecto, repo: "hexpm", optional: true]}, {:ecto_sql, "~> 3.0", [hex: :ecto_sql, repo: "hexpm", optional: true]}], "hexpm", "419aa7a39bde11894c87a615c4ecaa52d8f107bbdd81d810465186f783245bf8"},
   "ex_rlp": {:hex, :ex_rlp, "0.6.0", "985391d2356a7cb8712a4a9a2deb93f19f2fbca0323f5c1203fcaf64d077e31e", [:mix], [], "hexpm", "7135db93b861d9e76821039b60b00a6a22d2c4e751bf8c444bffe7a042f1abaf"},

From ee68029d0e3b9c8bdf5bc7755663277e3b9fb134 Mon Sep 17 00:00:00 2001
From: Viktor Baranov <baranov.viktor.27@gmail.com>
Date: Thu, 30 Nov 2023 16:26:45 +0300
Subject: [PATCH 697/909] Set client_connection_check_interval for main
 Postgres DB in docker-compose setup

---
 CHANGELOG.md                                  | 2 ++
 docker-compose/services/docker-compose-db.yml | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index efac2523b600..d5b21eaad9bc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,8 @@
 
 ### Chore
 
+- [#8911](https://github.com/blockscout/blockscout/pull/8911) - Set client_connection_check_interval for main Postgres DB in docker-compose setup
+
 ## 5.3.2-beta
 
 ### Features
diff --git a/docker-compose/services/docker-compose-db.yml b/docker-compose/services/docker-compose-db.yml
index 131d90bb931c..b7d036e966b2 100644
--- a/docker-compose/services/docker-compose-db.yml
+++ b/docker-compose/services/docker-compose-db.yml
@@ -19,7 +19,7 @@ services:
     user: 2000:2000
     restart: always
     container_name: 'db'
-    command: postgres -c 'max_connections=200'
+    command: postgres -c 'max_connections=200' -c 'client_connection_check_interval=60000'
     environment:
         POSTGRES_DB: 'blockscout'
         POSTGRES_USER: 'blockscout'

From 8130ac550d8a14c0bf8cedde979cdc10f0b76bb3 Mon Sep 17 00:00:00 2001
From: Viktor Baranov <baranov.viktor.27@gmail.com>
Date: Thu, 30 Nov 2023 18:36:35 +0300
Subject: [PATCH 698/909] smart-contract: delete embeds_many relation on
 replace

---
 CHANGELOG.md                                       | 2 ++
 apps/explorer/lib/explorer/chain/smart_contract.ex | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index efac2523b600..50ef1d5579e8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,8 @@
 
 ### Fixes
 
+- [#8915](https://github.com/blockscout/blockscout/pull/8915) - smart-contract: delete embeds_many relation on replace
+
 ### Chore
 
 ## 5.3.2-beta
diff --git a/apps/explorer/lib/explorer/chain/smart_contract.ex b/apps/explorer/lib/explorer/chain/smart_contract.ex
index edf9dda5441e..9e9e198212c2 100644
--- a/apps/explorer/lib/explorer/chain/smart_contract.ex
+++ b/apps/explorer/lib/explorer/chain/smart_contract.ex
@@ -278,7 +278,7 @@ defmodule Explorer.Chain.SmartContract do
     field(:constructor_arguments, :string)
     field(:evm_version, :string)
     field(:optimization_runs, :integer)
-    embeds_many(:external_libraries, ExternalLibrary)
+    embeds_many(:external_libraries, ExternalLibrary, on_replace: :delete)
     field(:abi, {:array, :map})
     field(:verified_via_sourcify, :boolean)
     field(:partially_verified, :boolean)

From f4f449df57ddbda1df3969d7a1392de239719bc1 Mon Sep 17 00:00:00 2001
From: Viktor Baranov <baranov.viktor.27@gmail.com>
Date: Fri, 1 Dec 2023 15:33:26 +0300
Subject: [PATCH 699/909] Update bug_report.yml

---
 .github/ISSUE_TEMPLATE/bug_report.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
index 1888fe929049..677dd9604aa1 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -24,8 +24,8 @@ body:
       description: How the application has been deployed.
       options:
           - Docker-compose
+          - Helm charts (k8s)
           - Manual from the source code
-          - Helm charts
           - Docker
     validations:
       required: true

From c0ca7081d8cf10e0630822eebaf1f8dde6e58411 Mon Sep 17 00:00:00 2001
From: Qwerty5Uiop <alex000010@bk.ru>
Date: Fri, 1 Dec 2023 22:14:08 +0600
Subject: [PATCH 700/909] Delete invalid current token balances in OnDemand
 fetcher

---
 CHANGELOG.md                                             | 2 ++
 .../lib/indexer/fetcher/token_balance_on_demand.ex       | 9 ++++++++-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index efac2523b600..f19588dcffd3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Current
 
+- [#8924](https://github.com/blockscout/blockscout/pull/8924) - Delete invalid current token balances in OnDemand fetcher
+
 ### Features
 
 ### Fixes
diff --git a/apps/indexer/lib/indexer/fetcher/token_balance_on_demand.ex b/apps/indexer/lib/indexer/fetcher/token_balance_on_demand.ex
index d1dfcf6d3364..cd090f19fe36 100644
--- a/apps/indexer/lib/indexer/fetcher/token_balance_on_demand.ex
+++ b/apps/indexer/lib/indexer/fetcher/token_balance_on_demand.ex
@@ -6,7 +6,7 @@ defmodule Indexer.Fetcher.TokenBalanceOnDemand do
 
   use Indexer.Fetcher
 
-  alias Explorer.Chain
+  alias Explorer.{Chain, Repo}
   alias Explorer.Chain.Address.CurrentTokenBalance
   alias Explorer.Chain.Cache.BlockNumber
   alias Explorer.Chain.Events.Publisher
@@ -52,6 +52,7 @@ defmodule Indexer.Fetcher.TokenBalanceOnDemand do
     stale_current_token_balances =
       address_hash
       |> Chain.fetch_last_token_balances_include_unfetched()
+      |> delete_invalid_balances()
       |> Enum.filter(fn current_token_balance -> current_token_balance.block_number < stale_balance_window end)
 
     if Enum.count(stale_current_token_balances) > 0 do
@@ -63,6 +64,12 @@ defmodule Indexer.Fetcher.TokenBalanceOnDemand do
     :ok
   end
 
+  defp delete_invalid_balances(current_token_balances) do
+    {invalid_balances, valid_balances} = Enum.split_with(current_token_balances, &is_nil(&1.token_type))
+    Enum.each(invalid_balances, &Repo.delete/1)
+    valid_balances
+  end
+
   defp fetch_and_update(block_number, address_hash, stale_current_token_balances) do
     %{erc_1155: erc_1155_ctbs, other: other_ctbs, tokens: tokens} =
       stale_current_token_balances

From afac872dccba13cffed2ec410c74c321d27c026b Mon Sep 17 00:00:00 2001
From: Viktor Baranov <baranov.viktor.27@gmail.com>
Date: Thu, 30 Nov 2023 23:12:47 +0300
Subject: [PATCH 701/909] Proxy detection hotfix in API v2

---
 CHANGELOG.md                                     |  1 +
 .../block_scout_web/views/api/v2/address_view.ex | 16 +++++++++++++---
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 50ef1d5579e8..f8a58ba5f22f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,7 @@
 
 ### Fixes
 
+- [#8917](https://github.com/blockscout/blockscout/pull/8917) - Proxy detection hotfix in API v2
 - [#8915](https://github.com/blockscout/blockscout/pull/8915) - smart-contract: delete embeds_many relation on replace
 
 ### Chore
diff --git a/apps/block_scout_web/lib/block_scout_web/views/api/v2/address_view.ex b/apps/block_scout_web/lib/block_scout_web/views/api/v2/address_view.ex
index fec26f5d2325..bbfe0c077062 100644
--- a/apps/block_scout_web/lib/block_scout_web/views/api/v2/address_view.ex
+++ b/apps/block_scout_web/lib/block_scout_web/views/api/v2/address_view.ex
@@ -80,11 +80,20 @@ defmodule BlockScoutWeb.API.V2.AddressView do
 
   def prepare_address(address, conn \\ nil) do
     base_info = Helper.address_with_info(conn, address, address.hash, true)
-    is_proxy = AddressView.smart_contract_is_proxy?(address, @api_true)
+
+    {:ok, address_with_smart_contract} =
+      Chain.hash_to_address(
+        address.hash,
+        [necessity_by_association: %{:smart_contract => :optional}],
+        false
+      )
+
+    is_proxy = AddressView.smart_contract_is_proxy?(address_with_smart_contract, @api_true)
 
     {implementation_address, implementation_name} =
       with true <- is_proxy,
-           {address, name} <- SmartContract.get_implementation_address_hash(address.smart_contract, @api_true),
+           {address, name} <-
+             SmartContract.get_implementation_address_hash(address_with_smart_contract.smart_contract, @api_true),
            false <- is_nil(address),
            {:ok, address_hash} <- Chain.string_to_address_hash(address),
            checksummed_address <- Address.checksum(address_hash) do
@@ -118,7 +127,8 @@ defmodule BlockScoutWeb.API.V2.AddressView do
       "has_methods_read" => AddressView.smart_contract_with_read_only_functions?(address),
       "has_methods_write" => AddressView.smart_contract_with_write_functions?(address),
       "has_methods_read_proxy" => is_proxy,
-      "has_methods_write_proxy" => AddressView.smart_contract_with_write_functions?(address) && is_proxy,
+      "has_methods_write_proxy" =>
+        AddressView.smart_contract_with_write_functions?(address_with_smart_contract) && is_proxy,
       "has_decompiled_code" => AddressView.has_decompiled_code?(address),
       "has_validated_blocks" => Counters.check_if_validated_blocks_at_address(address.hash, @api_true),
       "has_logs" => Counters.check_if_logs_at_address(address.hash, @api_true),

From b1fc22f43c067d8dd810f3cee408e4d340da0485 Mon Sep 17 00:00:00 2001
From: Viktor Baranov <baranov.viktor.27@gmail.com>
Date: Mon, 4 Dec 2023 12:16:36 +0300
Subject: [PATCH 702/909] Regression test added

---
 .../views/api/v2/address_view_test.exs        | 76 +++++++++++++++++++
 1 file changed, 76 insertions(+)
 create mode 100644 apps/block_scout_web/test/block_scout_web/views/api/v2/address_view_test.exs

diff --git a/apps/block_scout_web/test/block_scout_web/views/api/v2/address_view_test.exs b/apps/block_scout_web/test/block_scout_web/views/api/v2/address_view_test.exs
new file mode 100644
index 000000000000..7177316bc125
--- /dev/null
+++ b/apps/block_scout_web/test/block_scout_web/views/api/v2/address_view_test.exs
@@ -0,0 +1,76 @@
+defmodule BlockScoutWeb.API.V2.AddressViewTest do
+  use BlockScoutWeb.ConnCase, async: true
+
+  import Mox
+
+  alias BlockScoutWeb.API.V2.AddressView
+  alias Explorer.Repo
+
+  test "for a proxy contract has_methods_read_proxy is true" do
+    implementation_address = insert(:contract_address)
+    proxy_address = insert(:contract_address) |> Repo.preload([:token])
+
+    _proxy_smart_contract =
+      insert(:smart_contract,
+        address_hash: proxy_address.hash,
+        contract_code_md5: "123",
+        implementation_address_hash: implementation_address.hash
+      )
+
+    get_eip1967_implementation_zero_addresses()
+
+    assert AddressView.prepare_address(proxy_address)["has_methods_read_proxy"] == true
+  end
+
+  def get_eip1967_implementation_zero_addresses do
+    EthereumJSONRPC.Mox
+    |> expect(:json_rpc, fn %{
+                              id: 0,
+                              method: "eth_getStorageAt",
+                              params: [
+                                _,
+                                "0x360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc",
+                                "latest"
+                              ]
+                            },
+                            _options ->
+      {:ok, "0x0000000000000000000000000000000000000000000000000000000000000000"}
+    end)
+    |> expect(:json_rpc, fn %{
+                              id: 0,
+                              method: "eth_getStorageAt",
+                              params: [
+                                _,
+                                "0xa3f0ad74e5423aebfd80d3ef4346578335a9a72aeaee59ff6cb3582b35133d50",
+                                "latest"
+                              ]
+                            },
+                            _options ->
+      {:ok, "0x0000000000000000000000000000000000000000000000000000000000000000"}
+    end)
+    |> expect(:json_rpc, fn %{
+                              id: 0,
+                              method: "eth_getStorageAt",
+                              params: [
+                                _,
+                                "0x7050c9e0f4ca769c69bd3a8ef740bc37934f8e2c036e5a723fd8ee048ed3f8c3",
+                                "latest"
+                              ]
+                            },
+                            _options ->
+      {:ok, "0x0000000000000000000000000000000000000000000000000000000000000000"}
+    end)
+    |> expect(:json_rpc, fn %{
+                              id: 0,
+                              method: "eth_getStorageAt",
+                              params: [
+                                _,
+                                "0xc5f16f0fcc639fa48a6947836d9850f504798523bf8c9a3a87d5876cf622bcf7",
+                                "latest"
+                              ]
+                            },
+                            _options ->
+      {:ok, "0x0000000000000000000000000000000000000000000000000000000000000000"}
+    end)
+  end
+end

From e8b0c463f415d3ecc3af3f1171595f3b890fa7c5 Mon Sep 17 00:00:00 2001
From: Viktor Baranov <baranov.viktor.27@gmail.com>
Date: Thu, 23 Nov 2023 19:17:43 +0400
Subject: [PATCH 703/909] Change order of proxy contracts patterns detection:
 existing popular EIPs to the top of the list

---
 CHANGELOG.md                                  |   1 +
 .../api/v2/smart_contract_controller_test.exs |  93 ++------
 .../smart_contract_controller_test.exs        |  69 ++++++
 .../explorer/chain/smart_contract/proxy.ex    |  69 +++++-
 .../chain/smart_contract/proxy/eip_1967.ex    |  16 +-
 .../chain/smart_contract/proxy_test.exs       | 117 ++++++++-
 .../explorer/chain/smart_contract_test.exs    | 224 ++++++------------
 7 files changed, 350 insertions(+), 239 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9c9a1fbdad34..6daf40ffd839 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,6 +10,7 @@
 
 - [#8917](https://github.com/blockscout/blockscout/pull/8917) - Proxy detection hotfix in API v2
 - [#8915](https://github.com/blockscout/blockscout/pull/8915) - smart-contract: delete embeds_many relation on replace
+- [#8882](https://github.com/blockscout/blockscout/pull/8882) - Change order of proxy contracts patterns detection: existing popular EIPs to the top of the list
 
 ### Chore
 
diff --git a/apps/block_scout_web/test/block_scout_web/controllers/api/v2/smart_contract_controller_test.exs b/apps/block_scout_web/test/block_scout_web/controllers/api/v2/smart_contract_controller_test.exs
index ad6eabf1f113..d429160cdab9 100644
--- a/apps/block_scout_web/test/block_scout_web/controllers/api/v2/smart_contract_controller_test.exs
+++ b/apps/block_scout_web/test/block_scout_web/controllers/api/v2/smart_contract_controller_test.exs
@@ -2026,18 +2026,7 @@ defmodule BlockScoutWeb.API.V2.SmartContractControllerTest do
 
       target_contract = insert(:smart_contract, abi: abi)
 
-      expect(EthereumJSONRPC.Mox, :json_rpc, fn %{
-                                                  id: 0,
-                                                  method: "eth_getStorageAt",
-                                                  params: [
-                                                    _,
-                                                    "0x360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc",
-                                                    "latest"
-                                                  ]
-                                                },
-                                                _options ->
-        {:ok, "0x000000000000000000000000#{target_contract.address_hash |> to_string() |> String.replace("0x", "")}"}
-      end)
+      mock_logic_storage_pointer_request(target_contract.address_hash)
 
       expect(
         EthereumJSONRPC.Mox,
@@ -2136,18 +2125,7 @@ defmodule BlockScoutWeb.API.V2.SmartContractControllerTest do
 
       target_contract = insert(:smart_contract, abi: abi)
 
-      expect(EthereumJSONRPC.Mox, :json_rpc, fn %{
-                                                  id: 0,
-                                                  method: "eth_getStorageAt",
-                                                  params: [
-                                                    _,
-                                                    "0x360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc",
-                                                    "latest"
-                                                  ]
-                                                },
-                                                _options ->
-        {:ok, "0x000000000000000000000000#{target_contract.address_hash |> to_string() |> String.replace("0x", "")}"}
-      end)
+      mock_logic_storage_pointer_request(target_contract.address_hash)
 
       expect(
         EthereumJSONRPC.Mox,
@@ -2221,18 +2199,7 @@ defmodule BlockScoutWeb.API.V2.SmartContractControllerTest do
 
       target_contract = insert(:smart_contract, abi: abi)
 
-      expect(EthereumJSONRPC.Mox, :json_rpc, fn %{
-                                                  id: 0,
-                                                  method: "eth_getStorageAt",
-                                                  params: [
-                                                    _,
-                                                    "0x360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc",
-                                                    "latest"
-                                                  ]
-                                                },
-                                                _options ->
-        {:ok, "0x000000000000000000000000#{target_contract.address_hash |> to_string() |> String.replace("0x", "")}"}
-      end)
+      mock_logic_storage_pointer_request(target_contract.address_hash)
 
       expect(
         EthereumJSONRPC.Mox,
@@ -2290,18 +2257,7 @@ defmodule BlockScoutWeb.API.V2.SmartContractControllerTest do
 
       target_contract = insert(:smart_contract, abi: abi)
 
-      expect(EthereumJSONRPC.Mox, :json_rpc, fn %{
-                                                  id: 0,
-                                                  method: "eth_getStorageAt",
-                                                  params: [
-                                                    _,
-                                                    "0x360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc",
-                                                    "latest"
-                                                  ]
-                                                },
-                                                _options ->
-        {:ok, "0x000000000000000000000000#{target_contract.address_hash |> to_string() |> String.replace("0x", "")}"}
-      end)
+      mock_logic_storage_pointer_request(target_contract.address_hash)
 
       expect(
         EthereumJSONRPC.Mox,
@@ -2358,18 +2314,7 @@ defmodule BlockScoutWeb.API.V2.SmartContractControllerTest do
 
       target_contract = insert(:smart_contract, abi: abi)
 
-      expect(EthereumJSONRPC.Mox, :json_rpc, fn %{
-                                                  id: 0,
-                                                  method: "eth_getStorageAt",
-                                                  params: [
-                                                    _,
-                                                    "0x360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc",
-                                                    "latest"
-                                                  ]
-                                                },
-                                                _options ->
-        {:ok, "0x000000000000000000000000#{target_contract.address_hash |> to_string() |> String.replace("0x", "")}"}
-      end)
+      mock_logic_storage_pointer_request(target_contract.address_hash)
 
       expect(
         EthereumJSONRPC.Mox,
@@ -2450,18 +2395,7 @@ defmodule BlockScoutWeb.API.V2.SmartContractControllerTest do
 
       target_contract = insert(:smart_contract, abi: abi)
 
-      expect(EthereumJSONRPC.Mox, :json_rpc, fn %{
-                                                  id: 0,
-                                                  method: "eth_getStorageAt",
-                                                  params: [
-                                                    _,
-                                                    "0x360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc",
-                                                    "latest"
-                                                  ]
-                                                },
-                                                _options ->
-        {:ok, "0x000000000000000000000000#{target_contract.address_hash |> to_string() |> String.replace("0x", "")}"}
-      end)
+      mock_logic_storage_pointer_request(target_contract.address_hash)
 
       contract = insert(:smart_contract)
 
@@ -2579,4 +2513,19 @@ defmodule BlockScoutWeb.API.V2.SmartContractControllerTest do
         "solidity"
     end
   end
+
+  defp mock_logic_storage_pointer_request(address_hash) do
+    expect(EthereumJSONRPC.Mox, :json_rpc, fn %{
+                                                id: 0,
+                                                method: "eth_getStorageAt",
+                                                params: [
+                                                  _,
+                                                  "0x360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc",
+                                                  "latest"
+                                                ]
+                                              },
+                                              _options ->
+      {:ok, "0x000000000000000000000000#{address_hash |> to_string() |> String.replace("0x", "")}"}
+    end)
+  end
 end
diff --git a/apps/block_scout_web/test/block_scout_web/controllers/smart_contract_controller_test.exs b/apps/block_scout_web/test/block_scout_web/controllers/smart_contract_controller_test.exs
index aec5f0d1d327..8d2889876964 100644
--- a/apps/block_scout_web/test/block_scout_web/controllers/smart_contract_controller_test.exs
+++ b/apps/block_scout_web/test/block_scout_web/controllers/smart_contract_controller_test.exs
@@ -86,6 +86,8 @@ defmodule BlockScoutWeb.SmartContractControllerTest do
         contract_code_md5: "123"
       )
 
+      get_eip1967_implementation_zero_addresses()
+
       path =
         smart_contract_path(BlockScoutWeb.Endpoint, :index,
           hash: token_contract_address.hash,
@@ -304,4 +306,71 @@ defmodule BlockScoutWeb.SmartContractControllerTest do
       {:ok, "0x000000000000000000000000cebb2CCCFe291F0c442841cBE9C1D06EED61Ca02"}
     end)
   end
+
+  defp mock_empty_logic_storage_pointer_request do
+    expect(EthereumJSONRPC.Mox, :json_rpc, fn %{
+                                                id: 0,
+                                                method: "eth_getStorageAt",
+                                                params: [
+                                                  _,
+                                                  "0x360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc",
+                                                  "latest"
+                                                ]
+                                              },
+                                              _options ->
+      {:ok, "0x0000000000000000000000000000000000000000000000000000000000000000"}
+    end)
+  end
+
+  defp mock_empty_beacon_storage_pointer_request(mox) do
+    expect(mox, :json_rpc, fn %{
+                                id: 0,
+                                method: "eth_getStorageAt",
+                                params: [
+                                  _,
+                                  "0xa3f0ad74e5423aebfd80d3ef4346578335a9a72aeaee59ff6cb3582b35133d50",
+                                  "latest"
+                                ]
+                              },
+                              _options ->
+      {:ok, "0x0000000000000000000000000000000000000000000000000000000000000000"}
+    end)
+  end
+
+  defp mock_empty_eip_1822_storage_pointer_request(mox) do
+    expect(mox, :json_rpc, fn %{
+                                id: 0,
+                                method: "eth_getStorageAt",
+                                params: [
+                                  _,
+                                  "0xc5f16f0fcc639fa48a6947836d9850f504798523bf8c9a3a87d5876cf622bcf7",
+                                  "latest"
+                                ]
+                              },
+                              _options ->
+      {:ok, "0x0000000000000000000000000000000000000000000000000000000000000000"}
+    end)
+  end
+
+  defp mock_empty_oz_storage_pointer_request(mox) do
+    expect(mox, :json_rpc, fn %{
+                                id: 0,
+                                method: "eth_getStorageAt",
+                                params: [
+                                  _,
+                                  "0x7050c9e0f4ca769c69bd3a8ef740bc37934f8e2c036e5a723fd8ee048ed3f8c3",
+                                  "latest"
+                                ]
+                              },
+                              _options ->
+      {:ok, "0x0000000000000000000000000000000000000000000000000000000000000000"}
+    end)
+  end
+
+  def get_eip1967_implementation_zero_addresses do
+    mock_empty_logic_storage_pointer_request()
+    |> mock_empty_beacon_storage_pointer_request()
+    |> mock_empty_oz_storage_pointer_request()
+    |> mock_empty_eip_1822_storage_pointer_request()
+  end
 end
diff --git a/apps/explorer/lib/explorer/chain/smart_contract/proxy.ex b/apps/explorer/lib/explorer/chain/smart_contract/proxy.ex
index 7c086516059a..6bae3ae51f47 100644
--- a/apps/explorer/lib/explorer/chain/smart_contract/proxy.ex
+++ b/apps/explorer/lib/explorer/chain/smart_contract/proxy.ex
@@ -13,7 +13,7 @@ defmodule Explorer.Chain.SmartContract.Proxy do
       string_to_address_hash: 1
     ]
 
-  import Explorer.Chain.SmartContract, only: [is_burn_signature_or_nil: 1]
+  import Explorer.Chain.SmartContract, only: [burn_address_hash_string: 0, is_burn_signature_or_nil: 1]
 
   # supported signatures:
   # 5c60da1b = keccak256(implementation())
@@ -114,7 +114,8 @@ defmodule Explorer.Chain.SmartContract.Proxy do
   def gnosis_safe_contract?(abi) when is_nil(abi), do: false
 
   @doc """
-  Checks if the input of the smart-contract follows master-copy proxy pattern
+  Checks if the input of the smart-contract follows master-copy (or Safe) proxy pattern before
+  fetching its implementation from 0x0 storage pointer
   """
   @spec master_copy_pattern?(map()) :: any()
   def master_copy_pattern?(method) do
@@ -155,6 +156,66 @@ defmodule Explorer.Chain.SmartContract.Proxy do
   end
 
   defp get_implementation_address_hash_string(proxy_address_hash, proxy_abi) do
+    get_implementation_address_hash_string_eip1967(
+      proxy_address_hash,
+      proxy_abi
+    )
+  end
+
+  @doc """
+  Returns EIP-1967 implementation address or tries next proxy pattern
+  """
+  @spec get_implementation_address_hash_string_eip1967(Hash.Address.t(), any()) :: String.t() | nil
+  def get_implementation_address_hash_string_eip1967(proxy_address_hash, proxy_abi) do
+    get_implementation_address_hash_string_by_module(
+      EIP1967,
+      :get_implementation_address_hash_string_eip1167,
+      [
+        proxy_address_hash,
+        proxy_abi
+      ]
+    )
+  end
+
+  @doc """
+  Returns EIP-1167 implementation address or tries next proxy pattern
+  """
+  @spec get_implementation_address_hash_string_eip1167(Hash.Address.t(), any()) :: String.t() | nil
+  def get_implementation_address_hash_string_eip1167(proxy_address_hash, proxy_abi) do
+    get_implementation_address_hash_string_by_module(
+      EIP1167,
+      :get_implementation_address_hash_string_eip1822,
+      [
+        proxy_address_hash,
+        proxy_abi
+      ]
+    )
+  end
+
+  @doc """
+  Returns EIP-1822 implementation address or tries next proxy pattern
+  """
+  @spec get_implementation_address_hash_string_eip1822(Hash.Address.t(), any()) :: String.t() | nil
+  def get_implementation_address_hash_string_eip1822(proxy_address_hash, proxy_abi) do
+    get_implementation_address_hash_string_by_module(EIP1822, [proxy_address_hash, proxy_abi])
+  end
+
+  defp get_implementation_address_hash_string_by_module(
+         module,
+         next_func \\ :fallback_proxy_detection,
+         [proxy_address_hash, _proxy_abi] = args
+       ) do
+    implementation_address_hash_string = module.get_implementation_address_hash_string(proxy_address_hash)
+
+    if !is_nil(implementation_address_hash_string) && implementation_address_hash_string !== burn_address_hash_string() do
+      implementation_address_hash_string
+    else
+      apply(__MODULE__, next_func, args)
+    end
+  end
+
+  @spec fallback_proxy_detection(Hash.Address.t(), any()) :: String.t() | nil
+  def fallback_proxy_detection(proxy_address_hash, proxy_abi) do
     implementation_method_abi = get_naive_implementation_abi(proxy_abi, "implementation")
 
     get_implementation_method_abi = get_naive_implementation_abi(proxy_abi, "getImplementation")
@@ -177,9 +238,7 @@ defmodule Explorer.Chain.SmartContract.Proxy do
         EIP930.get_implementation_address_hash_string(@get_address_signature, proxy_address_hash, proxy_abi)
 
       true ->
-        EIP1967.get_implementation_address_hash_string(proxy_address_hash) ||
-          EIP1167.get_implementation_address_hash_string(proxy_address_hash) ||
-          EIP1822.get_implementation_address_hash_string(proxy_address_hash)
+        nil
     end
   end
 
diff --git a/apps/explorer/lib/explorer/chain/smart_contract/proxy/eip_1967.ex b/apps/explorer/lib/explorer/chain/smart_contract/proxy/eip_1967.ex
index aea3fa39be04..ca426ef59f22 100644
--- a/apps/explorer/lib/explorer/chain/smart_contract/proxy/eip_1967.ex
+++ b/apps/explorer/lib/explorer/chain/smart_contract/proxy/eip_1967.ex
@@ -27,18 +27,24 @@ defmodule Explorer.Chain.SmartContract.Proxy.EIP1967 do
   def get_implementation_address_hash_string(proxy_address_hash) do
     json_rpc_named_arguments = Application.get_env(:explorer, :json_rpc_named_arguments)
 
-    implementation_address_hash_string =
+    eip1967_implementation_address_hash_string =
       Proxy.get_implementation_from_storage(
         proxy_address_hash,
         @storage_slot_logic_contract_address,
         json_rpc_named_arguments
       ) ||
-        fetch_beacon_proxy_implementation(proxy_address_hash, json_rpc_named_arguments) ||
+        fetch_beacon_proxy_implementation(proxy_address_hash, json_rpc_named_arguments)
+
+    implementation_address_hash_string =
+      if eip1967_implementation_address_hash_string do
+        eip1967_implementation_address_hash_string
+      else
         Proxy.get_implementation_from_storage(
           proxy_address_hash,
           @storage_slot_openzeppelin_contract_address,
           json_rpc_named_arguments
         )
+      end
 
     Proxy.abi_decode_address_output(implementation_address_hash_string)
   end
@@ -70,17 +76,17 @@ defmodule Explorer.Chain.SmartContract.Proxy.EIP1967 do
         nil
 
       {:ok, beacon_contract_address} ->
-        case beacon_contract_address
+        case @implementation_signature
              |> Proxy.abi_decode_address_output()
              |> Basic.get_implementation_address_hash_string(
-               @implementation_signature,
+               beacon_contract_address,
                implementation_method_abi
              ) do
           <<implementation_address::binary-size(42)>> ->
             implementation_address
 
           _ ->
-            beacon_contract_address
+            nil
         end
 
       _ ->
diff --git a/apps/explorer/test/explorer/chain/smart_contract/proxy_test.exs b/apps/explorer/test/explorer/chain/smart_contract/proxy_test.exs
index d636e8967cd9..410b9d498c65 100644
--- a/apps/explorer/test/explorer/chain/smart_contract/proxy_test.exs
+++ b/apps/explorer/test/explorer/chain/smart_contract/proxy_test.exs
@@ -129,8 +129,7 @@ defmodule Explorer.Chain.SmartContract.ProxyTest do
       }
     ]
 
-    # EIP-1967 + EIP-1822
-    defp request_zero_implementations do
+    defp request_EIP1967_zero_implementations do
       EthereumJSONRPC.Mox
       |> expect(:json_rpc, fn %{
                                 id: 0,
@@ -168,6 +167,11 @@ defmodule Explorer.Chain.SmartContract.ProxyTest do
                               _options ->
         {:ok, "0x0000000000000000000000000000000000000000000000000000000000000000"}
       end)
+    end
+
+    # EIP-1967 + EIP-1822
+    defp request_zero_implementations do
+      request_EIP1967_zero_implementations()
       |> expect(:json_rpc, fn %{
                                 id: 0,
                                 method: "eth_getStorageAt",
@@ -206,6 +210,8 @@ defmodule Explorer.Chain.SmartContract.ProxyTest do
       smart_contract =
         insert(:smart_contract, address_hash: proxy_contract_address.hash, abi: @proxy_abi, contract_code_md5: "123")
 
+      request_zero_implementations()
+
       assert Proxy.combine_proxy_implementation_abi(smart_contract) == @proxy_abi
     end
 
@@ -226,6 +232,8 @@ defmodule Explorer.Chain.SmartContract.ProxyTest do
       implementation_contract_address_hash_string =
         Base.encode16(implementation_contract_address.hash.bytes, case: :lower)
 
+      request_zero_implementations()
+
       expect(
         EthereumJSONRPC.Mox,
         :json_rpc,
@@ -276,6 +284,8 @@ defmodule Explorer.Chain.SmartContract.ProxyTest do
       smart_contract =
         insert(:smart_contract, address_hash: proxy_contract_address.hash, abi: @proxy_abi, contract_code_md5: "123")
 
+      request_zero_implementations()
+
       assert Proxy.get_implementation_abi_from_proxy(smart_contract, []) == []
     end
 
@@ -296,6 +306,8 @@ defmodule Explorer.Chain.SmartContract.ProxyTest do
       implementation_contract_address_hash_string =
         Base.encode16(implementation_contract_address.hash.bytes, case: :lower)
 
+      request_zero_implementations()
+
       expect(
         EthereumJSONRPC.Mox,
         :json_rpc,
@@ -316,7 +328,7 @@ defmodule Explorer.Chain.SmartContract.ProxyTest do
       assert implementation_abi == @implementation_abi
     end
 
-    test "get_implementation_abi_from_proxy/2 returns implementation abi in case of EIP-1967 proxy pattern" do
+    test "get_implementation_abi_from_proxy/2 returns implementation abi in case of EIP-1967 proxy pattern (logic contract)" do
       proxy_contract_address = insert(:contract_address)
 
       smart_contract =
@@ -355,4 +367,103 @@ defmodule Explorer.Chain.SmartContract.ProxyTest do
       assert implementation_abi == @implementation_abi
     end
   end
+
+  @beacon_abi [
+    %{
+      "type" => "function",
+      "stateMutability" => "view",
+      "outputs" => [%{"type" => "address", "name" => "", "internalType" => "address"}],
+      "name" => "implementation",
+      "inputs" => []
+    }
+  ]
+  test "get_implementation_abi_from_proxy/2 returns implementation abi in case of EIP-1967 proxy pattern (beacon contract)" do
+    proxy_contract_address = insert(:contract_address)
+
+    smart_contract =
+      insert(:smart_contract, address_hash: proxy_contract_address.hash, abi: [], contract_code_md5: "123")
+
+    beacon_contract_address = insert(:contract_address)
+
+    insert(:smart_contract,
+      address_hash: beacon_contract_address.hash,
+      abi: @beacon_abi,
+      contract_code_md5: "123"
+    )
+
+    beacon_contract_address_hash_string = Base.encode16(beacon_contract_address.hash.bytes, case: :lower)
+
+    implementation_contract_address = insert(:contract_address)
+
+    insert(:smart_contract,
+      address_hash: implementation_contract_address.hash,
+      abi: @implementation_abi,
+      contract_code_md5: "123"
+    )
+
+    implementation_contract_address_hash_string =
+      Base.encode16(implementation_contract_address.hash.bytes, case: :lower)
+
+    EthereumJSONRPC.Mox
+    |> expect(
+      :json_rpc,
+      fn %{
+           id: _id,
+           method: "eth_getStorageAt",
+           params: [
+             _,
+             "0x360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc",
+             "latest"
+           ]
+         },
+         _options ->
+        {:ok, "0x0000000000000000000000000000000000000000000000000000000000000000"}
+      end
+    )
+    |> expect(
+      :json_rpc,
+      fn %{
+           id: _id,
+           method: "eth_getStorageAt",
+           params: [
+             _,
+             "0xa3f0ad74e5423aebfd80d3ef4346578335a9a72aeaee59ff6cb3582b35133d50",
+             "latest"
+           ]
+         },
+         _options ->
+        {:ok, "0x000000000000000000000000" <> beacon_contract_address_hash_string}
+      end
+    )
+    |> expect(
+      :json_rpc,
+      fn [
+           %{
+             id: _id,
+             method: "eth_call",
+             params: [
+               %{data: "0x5c60da1b", to: "0x000000000000000000000000" <> beacon_contract_address_hash_string},
+               "latest"
+             ]
+           }
+         ],
+         _options ->
+        {
+          :ok,
+          [
+            %{
+              id: _id,
+              jsonrpc: "2.0",
+              result: "0x000000000000000000000000" <> implementation_contract_address_hash_string
+            }
+          ]
+        }
+      end
+    )
+
+    implementation_abi = Proxy.get_implementation_abi_from_proxy(smart_contract, [])
+    verify!(EthereumJSONRPC.Mox)
+
+    assert implementation_abi == @implementation_abi
+  end
 end
diff --git a/apps/explorer/test/explorer/chain/smart_contract_test.exs b/apps/explorer/test/explorer/chain/smart_contract_test.exs
index 631cffe3724d..030601f64634 100644
--- a/apps/explorer/test/explorer/chain/smart_contract_test.exs
+++ b/apps/explorer/test/explorer/chain/smart_contract_test.exs
@@ -75,30 +75,8 @@ defmodule Explorer.Chain.SmartContractTest do
 
       string_implementation_address_hash = to_string(implementation_smart_contract.address_hash)
 
-      expect(EthereumJSONRPC.Mox, :json_rpc, fn %{
-                                                  id: 0,
-                                                  method: "eth_getStorageAt",
-                                                  params: [
-                                                    _,
-                                                    "0x360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc",
-                                                    "latest"
-                                                  ]
-                                                },
-                                                _options ->
-        {:ok, "0x0000000000000000000000000000000000000000000000000000000000000000"}
-      end)
-      |> expect(:json_rpc, fn %{
-                                id: 0,
-                                method: "eth_getStorageAt",
-                                params: [
-                                  _,
-                                  "0xa3f0ad74e5423aebfd80d3ef4346578335a9a72aeaee59ff6cb3582b35133d50",
-                                  "latest"
-                                ]
-                              },
-                              _options ->
-        {:ok, "0x0000000000000000000000000000000000000000000000000000000000000000"}
-      end)
+      mock_empty_logic_storage_pointer_request()
+      |> mock_empty_beacon_storage_pointer_request()
       |> expect(:json_rpc, fn %{
                                 id: 0,
                                 method: "eth_getStorageAt",
@@ -296,82 +274,15 @@ defmodule Explorer.Chain.SmartContractTest do
   end
 
   def get_eip1967_implementation_zero_addresses do
-    EthereumJSONRPC.Mox
-    |> expect(:json_rpc, fn %{
-                              id: 0,
-                              method: "eth_getStorageAt",
-                              params: [
-                                _,
-                                "0x360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc",
-                                "latest"
-                              ]
-                            },
-                            _options ->
-      {:ok, "0x0000000000000000000000000000000000000000000000000000000000000000"}
-    end)
-    |> expect(:json_rpc, fn %{
-                              id: 0,
-                              method: "eth_getStorageAt",
-                              params: [
-                                _,
-                                "0xa3f0ad74e5423aebfd80d3ef4346578335a9a72aeaee59ff6cb3582b35133d50",
-                                "latest"
-                              ]
-                            },
-                            _options ->
-      {:ok, "0x0000000000000000000000000000000000000000000000000000000000000000"}
-    end)
-    |> expect(:json_rpc, fn %{
-                              id: 0,
-                              method: "eth_getStorageAt",
-                              params: [
-                                _,
-                                "0x7050c9e0f4ca769c69bd3a8ef740bc37934f8e2c036e5a723fd8ee048ed3f8c3",
-                                "latest"
-                              ]
-                            },
-                            _options ->
-      {:ok, "0x0000000000000000000000000000000000000000000000000000000000000000"}
-    end)
-    |> expect(:json_rpc, fn %{
-                              id: 0,
-                              method: "eth_getStorageAt",
-                              params: [
-                                _,
-                                "0xc5f16f0fcc639fa48a6947836d9850f504798523bf8c9a3a87d5876cf622bcf7",
-                                "latest"
-                              ]
-                            },
-                            _options ->
-      {:ok, "0x0000000000000000000000000000000000000000000000000000000000000000"}
-    end)
+    mock_empty_logic_storage_pointer_request()
+    |> mock_empty_beacon_storage_pointer_request()
+    |> mock_empty_oz_storage_pointer_request()
+    |> mock_empty_eip_1822_storage_pointer_request()
   end
 
   def get_eip1967_implementation_non_zero_address do
-    expect(EthereumJSONRPC.Mox, :json_rpc, fn %{
-                                                id: 0,
-                                                method: "eth_getStorageAt",
-                                                params: [
-                                                  _,
-                                                  "0x360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc",
-                                                  "latest"
-                                                ]
-                                              },
-                                              _options ->
-      {:ok, "0x0000000000000000000000000000000000000000000000000000000000000000"}
-    end)
-    |> expect(:json_rpc, fn %{
-                              id: 0,
-                              method: "eth_getStorageAt",
-                              params: [
-                                _,
-                                "0xa3f0ad74e5423aebfd80d3ef4346578335a9a72aeaee59ff6cb3582b35133d50",
-                                "latest"
-                              ]
-                            },
-                            _options ->
-      {:ok, "0x0000000000000000000000000000000000000000000000000000000000000000"}
-    end)
+    mock_empty_logic_storage_pointer_request()
+    |> mock_empty_beacon_storage_pointer_request()
     |> expect(:json_rpc, fn %{
                               id: 0,
                               method: "eth_getStorageAt",
@@ -400,42 +311,9 @@ defmodule Explorer.Chain.SmartContractTest do
                             _options ->
       {:error, "error"}
     end)
-    |> expect(:json_rpc, fn %{
-                              id: 0,
-                              method: "eth_getStorageAt",
-                              params: [
-                                _,
-                                "0xa3f0ad74e5423aebfd80d3ef4346578335a9a72aeaee59ff6cb3582b35133d50",
-                                "latest"
-                              ]
-                            },
-                            _options ->
-      {:ok, "0x0000000000000000000000000000000000000000000000000000000000000000"}
-    end)
-    |> expect(:json_rpc, fn %{
-                              id: 0,
-                              method: "eth_getStorageAt",
-                              params: [
-                                _,
-                                "0x7050c9e0f4ca769c69bd3a8ef740bc37934f8e2c036e5a723fd8ee048ed3f8c3",
-                                "latest"
-                              ]
-                            },
-                            _options ->
-      {:ok, "0x0000000000000000000000000000000000000000000000000000000000000000"}
-    end)
-    |> expect(:json_rpc, fn %{
-                              id: 0,
-                              method: "eth_getStorageAt",
-                              params: [
-                                _,
-                                "0xc5f16f0fcc639fa48a6947836d9850f504798523bf8c9a3a87d5876cf622bcf7",
-                                "latest"
-                              ]
-                            },
-                            _options ->
-      {:ok, "0x0000000000000000000000000000000000000000000000000000000000000000"}
-    end)
+    |> mock_empty_beacon_storage_pointer_request()
+    |> mock_empty_oz_storage_pointer_request()
+    |> mock_empty_eip_1822_storage_pointer_request()
   end
 
   def assert_empty_implementation(address_hash) do
@@ -893,6 +771,23 @@ defmodule Explorer.Chain.SmartContractTest do
   end
 
   defp expect_address_in_response(string_implementation_address_hash) do
+    mock_empty_logic_storage_pointer_request()
+    |> mock_empty_beacon_storage_pointer_request()
+    |> expect(:json_rpc, fn %{
+                              id: 0,
+                              method: "eth_getStorageAt",
+                              params: [
+                                _,
+                                "0x7050c9e0f4ca769c69bd3a8ef740bc37934f8e2c036e5a723fd8ee048ed3f8c3",
+                                "latest"
+                              ]
+                            },
+                            _options ->
+      {:ok, string_implementation_address_hash}
+    end)
+  end
+
+  defp mock_empty_logic_storage_pointer_request do
     expect(EthereumJSONRPC.Mox, :json_rpc, fn %{
                                                 id: 0,
                                                 method: "eth_getStorageAt",
@@ -905,29 +800,50 @@ defmodule Explorer.Chain.SmartContractTest do
                                               _options ->
       {:ok, "0x0000000000000000000000000000000000000000000000000000000000000000"}
     end)
-    |> expect(:json_rpc, fn %{
-                              id: 0,
-                              method: "eth_getStorageAt",
-                              params: [
-                                _,
-                                "0xa3f0ad74e5423aebfd80d3ef4346578335a9a72aeaee59ff6cb3582b35133d50",
-                                "latest"
-                              ]
-                            },
-                            _options ->
+  end
+
+  defp mock_empty_beacon_storage_pointer_request(mox) do
+    expect(mox, :json_rpc, fn %{
+                                id: 0,
+                                method: "eth_getStorageAt",
+                                params: [
+                                  _,
+                                  "0xa3f0ad74e5423aebfd80d3ef4346578335a9a72aeaee59ff6cb3582b35133d50",
+                                  "latest"
+                                ]
+                              },
+                              _options ->
       {:ok, "0x0000000000000000000000000000000000000000000000000000000000000000"}
     end)
-    |> expect(:json_rpc, fn %{
-                              id: 0,
-                              method: "eth_getStorageAt",
-                              params: [
-                                _,
-                                "0x7050c9e0f4ca769c69bd3a8ef740bc37934f8e2c036e5a723fd8ee048ed3f8c3",
-                                "latest"
-                              ]
-                            },
-                            _options ->
-      {:ok, string_implementation_address_hash}
+  end
+
+  defp mock_empty_eip_1822_storage_pointer_request(mox) do
+    expect(mox, :json_rpc, fn %{
+                                id: 0,
+                                method: "eth_getStorageAt",
+                                params: [
+                                  _,
+                                  "0xc5f16f0fcc639fa48a6947836d9850f504798523bf8c9a3a87d5876cf622bcf7",
+                                  "latest"
+                                ]
+                              },
+                              _options ->
+      {:ok, "0x0000000000000000000000000000000000000000000000000000000000000000"}
+    end)
+  end
+
+  defp mock_empty_oz_storage_pointer_request(mox) do
+    expect(mox, :json_rpc, fn %{
+                                id: 0,
+                                method: "eth_getStorageAt",
+                                params: [
+                                  _,
+                                  "0x7050c9e0f4ca769c69bd3a8ef740bc37934f8e2c036e5a723fd8ee048ed3f8c3",
+                                  "latest"
+                                ]
+                              },
+                              _options ->
+      {:ok, "0x0000000000000000000000000000000000000000000000000000000000000000"}
     end)
   end
 end

From 62362b1f316baae076319a4872a098e1bd5969c3 Mon Sep 17 00:00:00 2001
From: Viktor Baranov <baranov.viktor.27@gmail.com>
Date: Mon, 27 Nov 2023 11:42:28 +0300
Subject: [PATCH 704/909] Fix order of proxy standards: 1167, 1967

---
 .../explorer/chain/smart_contract/proxy.ex    | 20 +++++++++----------
 .../chain/smart_contract/proxy_test.exs       |  6 +++---
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/apps/explorer/lib/explorer/chain/smart_contract/proxy.ex b/apps/explorer/lib/explorer/chain/smart_contract/proxy.ex
index 6bae3ae51f47..8912cca6a3de 100644
--- a/apps/explorer/lib/explorer/chain/smart_contract/proxy.ex
+++ b/apps/explorer/lib/explorer/chain/smart_contract/proxy.ex
@@ -156,20 +156,20 @@ defmodule Explorer.Chain.SmartContract.Proxy do
   end
 
   defp get_implementation_address_hash_string(proxy_address_hash, proxy_abi) do
-    get_implementation_address_hash_string_eip1967(
+    get_implementation_address_hash_string_eip1167(
       proxy_address_hash,
       proxy_abi
     )
   end
 
   @doc """
-  Returns EIP-1967 implementation address or tries next proxy pattern
+  Returns EIP-1167 implementation address or tries next proxy pattern
   """
-  @spec get_implementation_address_hash_string_eip1967(Hash.Address.t(), any()) :: String.t() | nil
-  def get_implementation_address_hash_string_eip1967(proxy_address_hash, proxy_abi) do
+  @spec get_implementation_address_hash_string_eip1167(Hash.Address.t(), any()) :: String.t() | nil
+  def get_implementation_address_hash_string_eip1167(proxy_address_hash, proxy_abi) do
     get_implementation_address_hash_string_by_module(
-      EIP1967,
-      :get_implementation_address_hash_string_eip1167,
+      EIP1167,
+      :get_implementation_address_hash_string_eip1967,
       [
         proxy_address_hash,
         proxy_abi
@@ -178,12 +178,12 @@ defmodule Explorer.Chain.SmartContract.Proxy do
   end
 
   @doc """
-  Returns EIP-1167 implementation address or tries next proxy pattern
+  Returns EIP-1967 implementation address or tries next proxy pattern
   """
-  @spec get_implementation_address_hash_string_eip1167(Hash.Address.t(), any()) :: String.t() | nil
-  def get_implementation_address_hash_string_eip1167(proxy_address_hash, proxy_abi) do
+  @spec get_implementation_address_hash_string_eip1967(Hash.Address.t(), any()) :: String.t() | nil
+  def get_implementation_address_hash_string_eip1967(proxy_address_hash, proxy_abi) do
     get_implementation_address_hash_string_by_module(
-      EIP1167,
+      EIP1967,
       :get_implementation_address_hash_string_eip1822,
       [
         proxy_address_hash,
diff --git a/apps/explorer/test/explorer/chain/smart_contract/proxy_test.exs b/apps/explorer/test/explorer/chain/smart_contract/proxy_test.exs
index 410b9d498c65..c0f84d72da3f 100644
--- a/apps/explorer/test/explorer/chain/smart_contract/proxy_test.exs
+++ b/apps/explorer/test/explorer/chain/smart_contract/proxy_test.exs
@@ -439,10 +439,10 @@ defmodule Explorer.Chain.SmartContract.ProxyTest do
       :json_rpc,
       fn [
            %{
-             id: _id,
+             id: id,
              method: "eth_call",
              params: [
-               %{data: "0x5c60da1b", to: "0x000000000000000000000000" <> beacon_contract_address_hash_string},
+               %{data: "0x5c60da1b", to: "0x000000000000000000000000" <> ^beacon_contract_address_hash_string},
                "latest"
              ]
            }
@@ -452,7 +452,7 @@ defmodule Explorer.Chain.SmartContract.ProxyTest do
           :ok,
           [
             %{
-              id: _id,
+              id: id,
               jsonrpc: "2.0",
               result: "0x000000000000000000000000" <> implementation_contract_address_hash_string
             }

From b79b2ab50f1845cd3f97bd6702e8433fd0ebbb9a Mon Sep 17 00:00:00 2001
From: Viktor Baranov <baranov.viktor.27@gmail.com>
Date: Mon, 4 Dec 2023 14:50:22 +0300
Subject: [PATCH 705/909] Fix reviewer comments

---
 .../explorer/lib/explorer/chain/smart_contract/proxy/eip_1967.ex | 1 -
 1 file changed, 1 deletion(-)

diff --git a/apps/explorer/lib/explorer/chain/smart_contract/proxy/eip_1967.ex b/apps/explorer/lib/explorer/chain/smart_contract/proxy/eip_1967.ex
index ca426ef59f22..5cc06c75ed9e 100644
--- a/apps/explorer/lib/explorer/chain/smart_contract/proxy/eip_1967.ex
+++ b/apps/explorer/lib/explorer/chain/smart_contract/proxy/eip_1967.ex
@@ -77,7 +77,6 @@ defmodule Explorer.Chain.SmartContract.Proxy.EIP1967 do
 
       {:ok, beacon_contract_address} ->
         case @implementation_signature
-             |> Proxy.abi_decode_address_output()
              |> Basic.get_implementation_address_hash_string(
                beacon_contract_address,
                implementation_method_abi

From ef095cd148c114fbf90f36c0820e86e3d4d53b46 Mon Sep 17 00:00:00 2001
From: Viktor Baranov <baranov.viktor.27@gmail.com>
Date: Thu, 23 Nov 2023 19:17:43 +0400
Subject: [PATCH 706/909] Change order of proxy contracts patterns detection:
 existing popular EIPs to the top of the list

---
 .../test/explorer/chain/smart_contract/proxy_test.exs         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/explorer/test/explorer/chain/smart_contract/proxy_test.exs b/apps/explorer/test/explorer/chain/smart_contract/proxy_test.exs
index c0f84d72da3f..f5fd83b562a2 100644
--- a/apps/explorer/test/explorer/chain/smart_contract/proxy_test.exs
+++ b/apps/explorer/test/explorer/chain/smart_contract/proxy_test.exs
@@ -439,7 +439,7 @@ defmodule Explorer.Chain.SmartContract.ProxyTest do
       :json_rpc,
       fn [
            %{
-             id: id,
+             id: _id,
              method: "eth_call",
              params: [
                %{data: "0x5c60da1b", to: "0x000000000000000000000000" <> ^beacon_contract_address_hash_string},
@@ -452,7 +452,7 @@ defmodule Explorer.Chain.SmartContract.ProxyTest do
           :ok,
           [
             %{
-              id: id,
+              id: _id,
               jsonrpc: "2.0",
               result: "0x000000000000000000000000" <> implementation_contract_address_hash_string
             }

From e84ffe7770b4bd769339317db31a75c60e0a76a8 Mon Sep 17 00:00:00 2001
From: Viktor Baranov <baranov.viktor.27@gmail.com>
Date: Tue, 28 Nov 2023 12:36:00 +0300
Subject: [PATCH 707/909] Add Compound proxy pattern

---
 CHANGELOG.md                                          |  2 ++
 .../block_scout_web/views/address_contract_view.ex    | 10 +++++++++-
 apps/block_scout_web/priv/gettext/default.pot         |  4 ++--
 .../priv/gettext/en/LC_MESSAGES/default.po            |  4 ++--
 .../lib/explorer/chain/smart_contract/proxy.ex        | 11 +++++++++++
 5 files changed, 26 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6daf40ffd839..66fbf8355461 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,8 @@
 
 ### Features
 
+- [#8900](https://github.com/blockscout/blockscout/pull/8900) - Add Compound proxy contract pattern
+
 ### Fixes
 
 - [#8917](https://github.com/blockscout/blockscout/pull/8917) - Proxy detection hotfix in API v2
diff --git a/apps/block_scout_web/lib/block_scout_web/views/address_contract_view.ex b/apps/block_scout_web/lib/block_scout_web/views/address_contract_view.ex
index 230f17c8ed60..01b13e6a71d3 100644
--- a/apps/block_scout_web/lib/block_scout_web/views/address_contract_view.ex
+++ b/apps/block_scout_web/lib/block_scout_web/views/address_contract_view.ex
@@ -1,6 +1,8 @@
 defmodule BlockScoutWeb.AddressContractView do
   use BlockScoutWeb, :view
 
+  require Logger
+
   import Explorer.Helper, only: [decode_data: 2]
 
   alias ABI.FunctionSelector
@@ -132,6 +134,12 @@ defmodule BlockScoutWeb.AddressContractView do
     chain_id = Application.get_env(:explorer, Explorer.ThirdPartyIntegrations.Sourcify)[:chain_id]
     repo_url = Application.get_env(:explorer, Explorer.ThirdPartyIntegrations.Sourcify)[:repo_url]
     match = if partial_match, do: "/partial_match/", else: "/full_match/"
-    repo_url <> match <> chain_id <> "/" <> checksummed_hash <> "/"
+
+    if chain_id do
+      repo_url <> match <> chain_id <> "/" <> checksummed_hash <> "/"
+    else
+      Logger.warning("chain_id is nil. Please set CHAIN_ID env variable.")
+      nil
+    end
   end
 end
diff --git a/apps/block_scout_web/priv/gettext/default.pot b/apps/block_scout_web/priv/gettext/default.pot
index d1902773008b..7ef46448585b 100644
--- a/apps/block_scout_web/priv/gettext/default.pot
+++ b/apps/block_scout_web/priv/gettext/default.pot
@@ -3581,7 +3581,7 @@ msgstr ""
 msgid "fallback"
 msgstr ""
 
-#: lib/block_scout_web/views/address_contract_view.ex:28
+#: lib/block_scout_web/views/address_contract_view.ex:30
 #, elixir-autogen, elixir-format
 msgid "false"
 msgstr ""
@@ -3637,7 +3637,7 @@ msgstr ""
 msgid "string"
 msgstr ""
 
-#: lib/block_scout_web/views/address_contract_view.ex:27
+#: lib/block_scout_web/views/address_contract_view.ex:29
 #, elixir-autogen, elixir-format
 msgid "true"
 msgstr ""
diff --git a/apps/block_scout_web/priv/gettext/en/LC_MESSAGES/default.po b/apps/block_scout_web/priv/gettext/en/LC_MESSAGES/default.po
index c3c3d7628b7a..2f650d468712 100644
--- a/apps/block_scout_web/priv/gettext/en/LC_MESSAGES/default.po
+++ b/apps/block_scout_web/priv/gettext/en/LC_MESSAGES/default.po
@@ -3581,7 +3581,7 @@ msgstr ""
 msgid "fallback"
 msgstr ""
 
-#: lib/block_scout_web/views/address_contract_view.ex:28
+#: lib/block_scout_web/views/address_contract_view.ex:30
 #, elixir-autogen, elixir-format
 msgid "false"
 msgstr ""
@@ -3637,7 +3637,7 @@ msgstr ""
 msgid "string"
 msgstr ""
 
-#: lib/block_scout_web/views/address_contract_view.ex:27
+#: lib/block_scout_web/views/address_contract_view.ex:29
 #, elixir-autogen, elixir-format
 msgid "true"
 msgstr ""
diff --git a/apps/explorer/lib/explorer/chain/smart_contract/proxy.ex b/apps/explorer/lib/explorer/chain/smart_contract/proxy.ex
index 8912cca6a3de..a5c9ce5a4e09 100644
--- a/apps/explorer/lib/explorer/chain/smart_contract/proxy.ex
+++ b/apps/explorer/lib/explorer/chain/smart_contract/proxy.ex
@@ -20,6 +20,8 @@ defmodule Explorer.Chain.SmartContract.Proxy do
   @implementation_signature "5c60da1b"
   # aaf10f42 = keccak256(getImplementation())
   @get_implementation_signature "aaf10f42"
+  # bb82aa5e = keccak256(comptrollerImplementation()) Compound protocol proxy pattern
+  @comptroller_implementation_signature "bb82aa5e"
   # aaf10f42 = keccak256(getAddress(bytes32))
   @get_address_signature "21f8a721"
 
@@ -220,6 +222,8 @@ defmodule Explorer.Chain.SmartContract.Proxy do
 
     get_implementation_method_abi = get_naive_implementation_abi(proxy_abi, "getImplementation")
 
+    comptroller_implementation_method_abi = get_naive_implementation_abi(proxy_abi, "comptrollerImplementation")
+
     master_copy_method_abi = get_master_copy_pattern(proxy_abi)
 
     get_address_method_abi = get_naive_implementation_abi(proxy_abi, "getAddress")
@@ -234,6 +238,13 @@ defmodule Explorer.Chain.SmartContract.Proxy do
       master_copy_method_abi ->
         MasterCopy.get_implementation_address_hash_string(proxy_address_hash)
 
+      comptroller_implementation_method_abi ->
+        Basic.get_implementation_address_hash_string(
+          @comptroller_implementation_signature,
+          proxy_address_hash,
+          proxy_abi
+        )
+
       get_address_method_abi ->
         EIP930.get_implementation_address_hash_string(@get_address_signature, proxy_address_hash, proxy_abi)
 

From 8c98551c5c86565f2e7c5dbe85af65aa344b23af Mon Sep 17 00:00:00 2001
From: Viktor Baranov <baranov.viktor.27@gmail.com>
Date: Tue, 28 Nov 2023 21:53:24 +0300
Subject: [PATCH 708/909] Fix abi encoded string argument

---
 CHANGELOG.md                                   |  1 +
 .../lib/ethereum_jsonrpc/encoder.ex            | 18 ++++++++++++------
 .../test/ethereum_jsonrpc/encoder_test.exs     | 16 ++++++++++++++++
 3 files changed, 29 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6daf40ffd839..bdd63e945109 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,6 +10,7 @@
 
 - [#8917](https://github.com/blockscout/blockscout/pull/8917) - Proxy detection hotfix in API v2
 - [#8915](https://github.com/blockscout/blockscout/pull/8915) - smart-contract: delete embeds_many relation on replace
+- [#8906](https://github.com/blockscout/blockscout/pull/8906) - Fix abi encoded string argument
 - [#8882](https://github.com/blockscout/blockscout/pull/8882) - Change order of proxy contracts patterns detection: existing popular EIPs to the top of the list
 
 ### Chore
diff --git a/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/encoder.ex b/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/encoder.ex
index 37573679aa51..4f2d83e49433 100644
--- a/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/encoder.ex
+++ b/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/encoder.ex
@@ -13,7 +13,7 @@ defmodule EthereumJSONRPC.Encoder do
   """
   @spec encode_function_call(ABI.FunctionSelector.t(), [term()]) :: String.t()
   def encode_function_call(function_selector, args) when is_list(args) do
-    parsed_args = parse_args(args)
+    parsed_args = parse_args(args, function_selector.types)
 
     encoded_args =
       function_selector
@@ -25,16 +25,22 @@ defmodule EthereumJSONRPC.Encoder do
 
   def encode_function_call(function_selector, args), do: encode_function_call(function_selector, [args])
 
-  defp parse_args(args) when is_list(args) do
+  defp parse_args(args, types) when is_list(args) do
     args
-    |> Enum.map(&parse_args/1)
+    |> Enum.zip(types)
+    |> Enum.map(fn {arg, type} ->
+      parse_args(arg, type)
+    end)
   end
 
-  defp parse_args(<<"0x", hexadecimal_digits::binary>>), do: Base.decode16!(hexadecimal_digits, case: :mixed)
+  defp parse_args(<<"0x", hexadecimal_digits::binary>>, _type), do: Base.decode16!(hexadecimal_digits, case: :mixed)
+
+  defp parse_args(<<hexadecimal_digits::binary>>, type) when type in [:string, "string"],
+    do: hexadecimal_digits |> Base.encode16() |> try_to_decode()
 
-  defp parse_args(<<hexadecimal_digits::binary>>), do: try_to_decode(hexadecimal_digits)
+  defp parse_args(<<hexadecimal_digits::binary>>, _type), do: try_to_decode(hexadecimal_digits)
 
-  defp parse_args(arg), do: arg
+  defp parse_args(arg, _type), do: arg
 
   defp try_to_decode(hexadecimal_digits) do
     case Base.decode16(hexadecimal_digits, case: :mixed) do
diff --git a/apps/ethereum_jsonrpc/test/ethereum_jsonrpc/encoder_test.exs b/apps/ethereum_jsonrpc/test/ethereum_jsonrpc/encoder_test.exs
index 38f87e08af4c..d23af7e0de93 100644
--- a/apps/ethereum_jsonrpc/test/ethereum_jsonrpc/encoder_test.exs
+++ b/apps/ethereum_jsonrpc/test/ethereum_jsonrpc/encoder_test.exs
@@ -27,6 +27,22 @@ defmodule EthereumJSONRPC.EncoderTest do
                "0x9507d39a000000000000000000000000000000000000000000000000000000000000000a"
     end
 
+    test "generates the correct encoding with string argument" do
+      function_selector = %ABI.FunctionSelector{
+        function: "isNewsletterCoverFullyClaimed",
+        input_names: ["newsletterId"],
+        inputs_indexed: nil,
+        return_names: [""],
+        returns: [:bool],
+        state_mutability: :view,
+        type: :function,
+        types: [:string]
+      }
+
+      assert Encoder.encode_function_call(function_selector, ["6564f5623e2a9f0001cb7fee"]) ==
+               "0xa07a712d000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000183635363466353632336532613966303030316362376665650000000000000000"
+    end
+
     test "generates the correct encoding with addresses arguments" do
       function_selector = %ABI.FunctionSelector{
         function: "tokens",

From 65b1cef8a62fe7ede83fd6d7df5be8604e8a6e33 Mon Sep 17 00:00:00 2001
From: Viktor Baranov <baranov.viktor.27@gmail.com>
Date: Mon, 4 Dec 2023 17:54:39 +0300
Subject: [PATCH 709/909] Reviewer comment: parse_args swap clauses

---
 apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/encoder.ex | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/encoder.ex b/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/encoder.ex
index 4f2d83e49433..e667ce8eaa89 100644
--- a/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/encoder.ex
+++ b/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/encoder.ex
@@ -33,11 +33,11 @@ defmodule EthereumJSONRPC.Encoder do
     end)
   end
 
-  defp parse_args(<<"0x", hexadecimal_digits::binary>>, _type), do: Base.decode16!(hexadecimal_digits, case: :mixed)
-
   defp parse_args(<<hexadecimal_digits::binary>>, type) when type in [:string, "string"],
     do: hexadecimal_digits |> Base.encode16() |> try_to_decode()
 
+  defp parse_args(<<"0x", hexadecimal_digits::binary>>, _type), do: Base.decode16!(hexadecimal_digits, case: :mixed)
+
   defp parse_args(<<hexadecimal_digits::binary>>, _type), do: try_to_decode(hexadecimal_digits)
 
   defp parse_args(arg, _type), do: arg

From 571a6cdc2c32f87c86f03fd95aebb9c1a29a2c8c Mon Sep 17 00:00:00 2001
From: Viktor Baranov <baranov.viktor.27@gmail.com>
Date: Mon, 4 Dec 2023 19:24:56 +0300
Subject: [PATCH 710/909] Add test with 0x... input in string type argument

---
 .../test/ethereum_jsonrpc/encoder_test.exs       | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/apps/ethereum_jsonrpc/test/ethereum_jsonrpc/encoder_test.exs b/apps/ethereum_jsonrpc/test/ethereum_jsonrpc/encoder_test.exs
index d23af7e0de93..7539b8e582ba 100644
--- a/apps/ethereum_jsonrpc/test/ethereum_jsonrpc/encoder_test.exs
+++ b/apps/ethereum_jsonrpc/test/ethereum_jsonrpc/encoder_test.exs
@@ -43,6 +43,22 @@ defmodule EthereumJSONRPC.EncoderTest do
                "0xa07a712d000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000183635363466353632336532613966303030316362376665650000000000000000"
     end
 
+    test "generates the correct encoding with string started with 0x" do
+      function_selector = %ABI.FunctionSelector{
+        function: "isNewsletterCoverFullyClaimed",
+        input_names: ["newsletterId"],
+        inputs_indexed: nil,
+        return_names: [""],
+        returns: [:bool],
+        state_mutability: :view,
+        type: :function,
+        types: [:string]
+      }
+
+      assert Encoder.encode_function_call(function_selector, ["0x123"]) ==
+               "0xa07a712d000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000053078313233000000000000000000000000000000000000000000000000000000"
+    end
+
     test "generates the correct encoding with addresses arguments" do
       function_selector = %ABI.FunctionSelector{
         function: "tokens",

From d275b2256d96acea66b76ba559e6e9593f13a970 Mon Sep 17 00:00:00 2001
From: Maxim Filonov <53992153+sl1depengwyn@users.noreply.github.com>
Date: Mon, 7 Aug 2023 18:10:39 +0300
Subject: [PATCH 711/909] Add general sorting for any scheme

---
 CHANGELOG.md                                  |   1 +
 .../lib/block_scout_web/chain.ex              |  57 +-
 .../controllers/address_token_controller.ex   |   6 +-
 .../address_transaction_controller.ex         |   4 +-
 .../controllers/api/v2/address_controller.ex  |  24 +-
 .../api/v2/smart_contract_controller.ex       |   7 +-
 .../controllers/api/v2/token_controller.ex    |   4 +-
 .../controllers/tokens/tokens_controller.ex   |   4 +-
 .../verified_contracts_controller.ex          |   3 +-
 .../lib/block_scout_web/paging_helper.ex      |  32 +-
 .../templates/robots/sitemap.xml.eex          |   2 +-
 .../lib/block_scout_web/views/robots_view.ex  |   2 +-
 .../api/v2/address_controller_test.exs        | 161 +++
 .../api/v2/smart_contract_controller_test.exs | 101 ++
 .../api/v2/token_controller_test.exs          |  24 +-
 .../verified_contracts_controller_test.exs    |   4 +-
 apps/explorer/lib/explorer/chain.ex           | 460 ++-------
 .../lib/explorer/chain/block/reward.ex        |  12 +-
 .../address_transaction_csv_exporter.ex       |   6 +-
 .../explorer/chain/internal_transaction.ex    |  32 -
 .../lib/explorer/chain/smart_contract.ex      |  58 +-
 apps/explorer/lib/explorer/chain/token.ex     | 207 +---
 .../lib/explorer/chain/transaction.ex         | 436 +++++++-
 apps/explorer/lib/explorer/sorting_helper.ex  | 168 +++
 .../explorer/chain/smart_contract_test.exs    |  11 +-
 .../test/explorer/chain/transaction_test.exs  | 953 +++++++++++++++++-
 apps/explorer/test/explorer/chain_test.exs    | 534 ----------
 cspell.json                                   |  18 +-
 28 files changed, 2148 insertions(+), 1183 deletions(-)
 create mode 100644 apps/explorer/lib/explorer/sorting_helper.ex

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c13b70f75e4c..a19a159835d3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -29,6 +29,7 @@
 - [#8768](https://github.com/blockscout/blockscout/pull/8768) - Add possibility to search tokens by address hash
 - [#8750](https://github.com/blockscout/blockscout/pull/8750) - Support new eth-bytecode-db request metadata fields
 - [#8634](https://github.com/blockscout/blockscout/pull/8634) - API v2: NFT for address
+- [#8611](https://github.com/blockscout/blockscout/pull/8611) - Implement sorting of smart contracts, address transactions
 - [#8609](https://github.com/blockscout/blockscout/pull/8609) - Change logs format to JSON; Add endpoint url to the block_scout_web logging
 - [#8558](https://github.com/blockscout/blockscout/pull/8558) - Add CoinBalanceDailyUpdater
 
diff --git a/apps/block_scout_web/lib/block_scout_web/chain.ex b/apps/block_scout_web/lib/block_scout_web/chain.ex
index c7a317956057..8bb9d4d0eb2c 100644
--- a/apps/block_scout_web/lib/block_scout_web/chain.ex
+++ b/apps/block_scout_web/lib/block_scout_web/chain.ex
@@ -17,6 +17,7 @@ defmodule BlockScoutWeb.Chain do
 
   import Explorer.Helper, only: [parse_integer: 1]
 
+  alias Ecto.Association.NotLoaded
   alias Explorer.Account.{TagAddress, TagTransaction, WatchlistAddress}
   alias Explorer.Chain.Block.Reward
 
@@ -140,6 +141,34 @@ defmodule BlockScoutWeb.Chain do
     end
   end
 
+  def paging_options(%{
+        "fee" => fee_string,
+        "value" => value_string,
+        "block_number" => block_number_string,
+        "index" => index_string,
+        "inserted_at" => inserted_at_string,
+        "hash" => hash_string
+      }) do
+    with {:ok, hash} <- string_to_transaction_hash(hash_string),
+         {:ok, inserted_at, _} <- DateTime.from_iso8601(inserted_at_string) do
+      [
+        paging_options: %{
+          @default_paging_options
+          | key: %{
+              fee: decimal_parse(fee_string),
+              value: decimal_parse(value_string),
+              block_number: parse_integer(block_number_string),
+              index: parse_integer(index_string),
+              inserted_at: inserted_at,
+              hash: hash
+            }
+        }
+      ]
+    else
+      _ -> [paging_options: @default_paging_options]
+    end
+  end
+
   def paging_options(%{
         "address_hash" => address_hash_string,
         "tx_hash" => tx_hash_string,
@@ -352,8 +381,17 @@ defmodule BlockScoutWeb.Chain do
     end
   end
 
-  def paging_options(%{"smart_contract_id" => id}) do
-    [paging_options: %{@default_paging_options | key: {id}}]
+  def paging_options(%{"smart_contract_id" => id_str} = params) do
+    transactions_count = parse_integer(params["tx_count"])
+    coin_balance = parse_integer(params["coin_balance"])
+    id = parse_integer(id_str)
+
+    [
+      paging_options: %{
+        @default_paging_options
+        | key: %{id: id, transactions_count: transactions_count, fetched_coin_balance: coin_balance}
+      }
+    ]
   end
 
   def paging_options(%{"items_count" => items_count_string, "state_changes" => _}) when is_binary(items_count_string) do
@@ -553,10 +591,19 @@ defmodule BlockScoutWeb.Chain do
     %{"block_number" => block_number}
   end
 
-  defp paging_params(%SmartContract{} = smart_contract) do
+  defp paging_params(%SmartContract{address: %NotLoaded{}} = smart_contract) do
     %{"smart_contract_id" => smart_contract.id}
   end
 
+  defp paging_params(%SmartContract{} = smart_contract) do
+    %{
+      "smart_contract_id" => smart_contract.id,
+      "tx_count" => smart_contract.address.transactions_count,
+      "coin_balance" =>
+        smart_contract.address.fetched_coin_balance && Wei.to(smart_contract.address.fetched_coin_balance, :wei)
+    }
+  end
+
   defp paging_params(%Withdrawal{index: index}) do
     %{"index" => index}
   end
@@ -602,7 +649,9 @@ defmodule BlockScoutWeb.Chain do
     %{"id" => msg_id}
   end
 
-  @spec paging_params_with_fiat_value(CurrentTokenBalance.t()) :: %{binary() => any}
+  @spec paging_params_with_fiat_value(CurrentTokenBalance.t()) :: %{
+          required(String.t()) => Decimal.t() | non_neg_integer() | nil
+        }
   def paging_params_with_fiat_value(%CurrentTokenBalance{id: id, value: value} = ctb) do
     %{"fiat_value" => ctb.fiat_value, "value" => value, "id" => id}
   end
diff --git a/apps/block_scout_web/lib/block_scout_web/controllers/address_token_controller.ex b/apps/block_scout_web/lib/block_scout_web/controllers/address_token_controller.ex
index 8433e96be186..d130043d8700 100644
--- a/apps/block_scout_web/lib/block_scout_web/controllers/address_token_controller.ex
+++ b/apps/block_scout_web/lib/block_scout_web/controllers/address_token_controller.ex
@@ -1,7 +1,9 @@
 defmodule BlockScoutWeb.AddressTokenController do
   use BlockScoutWeb, :controller
 
-  import BlockScoutWeb.Chain, only: [next_page_params: 4, paging_options: 1, split_list_by_page: 1]
+  import BlockScoutWeb.Chain,
+    only: [next_page_params: 4, paging_options: 1, split_list_by_page: 1, paging_params_with_fiat_value: 1]
+
   import BlockScoutWeb.Account.AuthController, only: [current_user: 1]
   import BlockScoutWeb.Models.GetAddressTags, only: [get_address_tags: 2]
 
@@ -22,7 +24,7 @@ defmodule BlockScoutWeb.AddressTokenController do
       {tokens, next_page} = split_list_by_page(token_balances_plus_one)
 
       next_page_path =
-        case next_page_params(next_page, tokens, params, &BlockScoutWeb.Chain.paging_params_with_fiat_value/1) do
+        case next_page_params(next_page, tokens, params, &paging_params_with_fiat_value/1) do
           nil ->
             nil
 
diff --git a/apps/block_scout_web/lib/block_scout_web/controllers/address_transaction_controller.ex b/apps/block_scout_web/lib/block_scout_web/controllers/address_transaction_controller.ex
index 639e5cc39466..48ed703f1217 100644
--- a/apps/block_scout_web/lib/block_scout_web/controllers/address_transaction_controller.ex
+++ b/apps/block_scout_web/lib/block_scout_web/controllers/address_transaction_controller.ex
@@ -20,7 +20,7 @@ defmodule BlockScoutWeb.AddressTransactionController do
     AddressTransactionCsvExporter
   }
 
-  alias Explorer.Chain.Wei
+  alias Explorer.Chain.{Transaction, Wei}
 
   alias Indexer.Fetcher.CoinBalanceOnDemand
   alias Phoenix.View
@@ -53,7 +53,7 @@ defmodule BlockScoutWeb.AddressTransactionController do
         |> Keyword.merge(paging_options(params))
         |> Keyword.merge(current_filter(params))
 
-      results_plus_one = Chain.address_to_transactions_with_rewards(address_hash, options)
+      results_plus_one = Transaction.address_to_transactions_with_rewards(address_hash, options)
       {results, next_page} = split_list_by_page(results_plus_one)
 
       next_page_url =
diff --git a/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/address_controller.ex b/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/address_controller.ex
index b3008a00f5ba..b6d875c7d91c 100644
--- a/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/address_controller.ex
+++ b/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/address_controller.ex
@@ -8,11 +8,17 @@ defmodule BlockScoutWeb.API.V2.AddressController do
       token_transfers_next_page_params: 3,
       paging_options: 1,
       split_list_by_page: 1,
-      current_filter: 1
+      current_filter: 1,
+      paging_params_with_fiat_value: 1
     ]
 
   import BlockScoutWeb.PagingHelper,
-    only: [delete_parameters_from_next_page_params: 1, token_transfers_types_options: 1, nft_token_types_options: 1]
+    only: [
+      delete_parameters_from_next_page_params: 1,
+      token_transfers_types_options: 1,
+      address_transactions_sorting: 1,
+      nft_token_types_options: 1
+    ]
 
   alias BlockScoutWeb.AccessHelper
   alias BlockScoutWeb.API.V2.{BlockView, TransactionView, WithdrawalView}
@@ -20,6 +26,7 @@ defmodule BlockScoutWeb.API.V2.AddressController do
   alias Explorer.Chain.Address
   alias Explorer.Chain.Address.Counters
   alias Explorer.Chain.Token.Instance
+  alias Explorer.Chain.Transaction
   alias Indexer.Fetcher.{CoinBalanceOnDemand, TokenBalanceOnDemand}
 
   @transaction_necessity_by_association [
@@ -120,11 +127,18 @@ defmodule BlockScoutWeb.API.V2.AddressController do
         @transaction_necessity_by_association
         |> Keyword.merge(paging_options(params))
         |> Keyword.merge(current_filter(params))
+        |> Keyword.merge(address_transactions_sorting(params))
 
-      results_plus_one = Chain.address_to_transactions_without_rewards(address_hash, options, false)
+      results_plus_one = Transaction.address_to_transactions_without_rewards(address_hash, options, false)
       {transactions, next_page} = split_list_by_page(results_plus_one)
 
-      next_page_params = next_page |> next_page_params(transactions, delete_parameters_from_next_page_params(params))
+      next_page_params =
+        next_page
+        |> next_page_params(
+          transactions,
+          delete_parameters_from_next_page_params(params),
+          &Transaction.address_transactions_next_page_params/1
+        )
 
       conn
       |> put_status(200)
@@ -354,7 +368,7 @@ defmodule BlockScoutWeb.API.V2.AddressController do
         |> next_page_params(
           tokens,
           delete_parameters_from_next_page_params(params),
-          &BlockScoutWeb.Chain.paging_params_with_fiat_value/1
+          &paging_params_with_fiat_value/1
         )
 
       conn
diff --git a/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/smart_contract_controller.ex b/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/smart_contract_controller.ex
index ab443c33571f..3fe7b47c26a9 100644
--- a/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/smart_contract_controller.ex
+++ b/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/smart_contract_controller.ex
@@ -4,7 +4,7 @@ defmodule BlockScoutWeb.API.V2.SmartContractController do
   import BlockScoutWeb.Chain, only: [paging_options: 1, next_page_params: 3, split_list_by_page: 1]
 
   import BlockScoutWeb.PagingHelper,
-    only: [current_filter: 1, delete_parameters_from_next_page_params: 1, search_query: 1]
+    only: [current_filter: 1, delete_parameters_from_next_page_params: 1, search_query: 1, smart_contracts_sorting: 1]
 
   import Explorer.Chain.SmartContract, only: [burn_address_hash_string: 0]
   import Explorer.SmartContract.Solidity.Verifier, only: [parse_boolean: 1]
@@ -192,13 +192,14 @@ defmodule BlockScoutWeb.API.V2.SmartContractController do
 
   def smart_contracts_list(conn, params) do
     full_options =
-      [necessity_by_association: %{[address: :token] => :optional, [address: :names] => :optional}]
+      [necessity_by_association: %{[address: :token] => :optional, [address: :names] => :optional, address: :required}]
       |> Keyword.merge(paging_options(params))
       |> Keyword.merge(current_filter(params))
       |> Keyword.merge(search_query(params))
+      |> Keyword.merge(smart_contracts_sorting(params))
       |> Keyword.merge(@api_true)
 
-    smart_contracts_plus_one = Chain.verified_contracts(full_options)
+    smart_contracts_plus_one = SmartContract.verified_contracts(full_options)
     {smart_contracts, next_page} = split_list_by_page(smart_contracts_plus_one)
 
     next_page_params =
diff --git a/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/token_controller.ex b/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/token_controller.ex
index 14852429ab61..e98f648cb984 100644
--- a/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/token_controller.ex
+++ b/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/token_controller.ex
@@ -4,7 +4,7 @@ defmodule BlockScoutWeb.API.V2.TokenController do
   alias BlockScoutWeb.AccessHelper
   alias BlockScoutWeb.API.V2.{AddressView, TransactionView}
   alias Explorer.{Chain, Repo}
-  alias Explorer.Chain.{Address, Token.Instance}
+  alias Explorer.Chain.{Address, Token, Token.Instance}
   alias Indexer.Fetcher.TokenTotalSupplyOnDemand
 
   import BlockScoutWeb.Chain,
@@ -248,7 +248,7 @@ defmodule BlockScoutWeb.API.V2.TokenController do
       |> Keyword.merge(tokens_sorting(params))
       |> Keyword.merge(@api_true)
 
-    {tokens, next_page} = filter |> Chain.list_top_tokens(options) |> split_list_by_page()
+    {tokens, next_page} = filter |> Token.list_top(options) |> split_list_by_page()
 
     next_page_params = next_page |> next_page_params(tokens, delete_parameters_from_next_page_params(params))
 
diff --git a/apps/block_scout_web/lib/block_scout_web/controllers/tokens/tokens_controller.ex b/apps/block_scout_web/lib/block_scout_web/controllers/tokens/tokens_controller.ex
index a0bae11f5ef8..17ee2823fcd5 100644
--- a/apps/block_scout_web/lib/block_scout_web/controllers/tokens/tokens_controller.ex
+++ b/apps/block_scout_web/lib/block_scout_web/controllers/tokens/tokens_controller.ex
@@ -3,7 +3,7 @@ defmodule BlockScoutWeb.TokensController do
 
   import BlockScoutWeb.Chain, only: [paging_options: 1, next_page_params: 3, split_list_by_page: 1]
   alias BlockScoutWeb.{Controller, TokensView}
-  alias Explorer.Chain
+  alias Explorer.Chain.Token
   alias Phoenix.View
 
   def index(conn, %{"type" => "JSON"} = params) do
@@ -18,7 +18,7 @@ defmodule BlockScoutWeb.TokensController do
       params
       |> paging_options()
 
-    tokens = Chain.list_top_tokens(filter, paging_params)
+    tokens = Token.list_top(filter, paging_params)
 
     {tokens_page, next_page} = split_list_by_page(tokens)
 
diff --git a/apps/block_scout_web/lib/block_scout_web/controllers/verified_contracts_controller.ex b/apps/block_scout_web/lib/block_scout_web/controllers/verified_contracts_controller.ex
index 2059498cce2a..1eec03d72678 100644
--- a/apps/block_scout_web/lib/block_scout_web/controllers/verified_contracts_controller.ex
+++ b/apps/block_scout_web/lib/block_scout_web/controllers/verified_contracts_controller.ex
@@ -8,6 +8,7 @@ defmodule BlockScoutWeb.VerifiedContractsController do
 
   alias BlockScoutWeb.{Controller, VerifiedContractsView}
   alias Explorer.Chain
+  alias Explorer.Chain.SmartContract
   alias Phoenix.View
 
   @necessity_by_association %{[address: :token] => :optional}
@@ -19,7 +20,7 @@ defmodule BlockScoutWeb.VerifiedContractsController do
       |> Keyword.merge(current_filter(params))
       |> Keyword.merge(search_query(params))
 
-    verified_contracts_plus_one = Chain.verified_contracts(full_options)
+    verified_contracts_plus_one = SmartContract.verified_contracts(full_options)
     {verified_contracts, next_page} = split_list_by_page(verified_contracts_plus_one)
 
     items =
diff --git a/apps/block_scout_web/lib/block_scout_web/paging_helper.ex b/apps/block_scout_web/lib/block_scout_web/paging_helper.ex
index c9a3472c850f..8c2d2b0cca73 100644
--- a/apps/block_scout_web/lib/block_scout_web/paging_helper.ex
+++ b/apps/block_scout_web/lib/block_scout_web/paging_helper.ex
@@ -3,7 +3,8 @@ defmodule BlockScoutWeb.PagingHelper do
     Helper for fetching filters and other url query parameters
   """
   import Explorer.Chain, only: [string_to_transaction_hash: 1]
-  alias Explorer.PagingOptions
+  alias Explorer.Chain.Transaction
+  alias Explorer.{PagingOptions, SortingHelper}
 
   @page_size 50
   @default_paging_options %PagingOptions{page_size: @page_size + 1}
@@ -186,6 +187,7 @@ defmodule BlockScoutWeb.PagingHelper do
 
   def search_query(_), do: []
 
+  @spec tokens_sorting(%{required(String.t()) => String.t()}) :: [{:sorting, SortingHelper.sorting_params()}]
   def tokens_sorting(%{"sort" => sort_field, "order" => order}) do
     [sorting: do_tokens_sorting(sort_field, order)]
   end
@@ -199,4 +201,32 @@ defmodule BlockScoutWeb.PagingHelper do
   defp do_tokens_sorting("circulating_market_cap", "asc"), do: [asc_nulls_first: :circulating_market_cap]
   defp do_tokens_sorting("circulating_market_cap", "desc"), do: [desc_nulls_last: :circulating_market_cap]
   defp do_tokens_sorting(_, _), do: []
+
+  @spec smart_contracts_sorting(%{required(String.t()) => String.t()}) :: [{:sorting, SortingHelper.sorting_params()}]
+  def smart_contracts_sorting(%{"sort" => sort_field, "order" => order}) do
+    [sorting: do_smart_contracts_sorting(sort_field, order)]
+  end
+
+  def smart_contracts_sorting(_), do: []
+
+  defp do_smart_contracts_sorting("balance", "asc"), do: [{:asc_nulls_first, :fetched_coin_balance, :address}]
+  defp do_smart_contracts_sorting("balance", "desc"), do: [{:desc_nulls_last, :fetched_coin_balance, :address}]
+  defp do_smart_contracts_sorting("txs_count", "asc"), do: [{:asc_nulls_first, :transactions_count, :address}]
+  defp do_smart_contracts_sorting("txs_count", "desc"), do: [{:desc_nulls_last, :transactions_count, :address}]
+  defp do_smart_contracts_sorting(_, _), do: []
+
+  @spec address_transactions_sorting(%{required(String.t()) => String.t()}) :: [
+          {:sorting, SortingHelper.sorting_params()}
+        ]
+  def address_transactions_sorting(%{"sort" => sort_field, "order" => order}) do
+    [sorting: do_address_transaction_sorting(sort_field, order)]
+  end
+
+  def address_transactions_sorting(_), do: []
+
+  defp do_address_transaction_sorting("value", "asc"), do: [asc: :value]
+  defp do_address_transaction_sorting("value", "desc"), do: [desc: :value]
+  defp do_address_transaction_sorting("fee", "asc"), do: [{:dynamic, :fee, :asc, Transaction.dynamic_fee()}]
+  defp do_address_transaction_sorting("fee", "desc"), do: [{:dynamic, :fee, :desc, Transaction.dynamic_fee()}]
+  defp do_address_transaction_sorting(_, _), do: []
 end
diff --git a/apps/block_scout_web/lib/block_scout_web/templates/robots/sitemap.xml.eex b/apps/block_scout_web/lib/block_scout_web/templates/robots/sitemap.xml.eex
index 9f3cbc669802..55d8b1a6115a 100644
--- a/apps/block_scout_web/lib/block_scout_web/templates/robots/sitemap.xml.eex
+++ b/apps/block_scout_web/lib/block_scout_web/templates/robots/sitemap.xml.eex
@@ -35,7 +35,7 @@
     </url>
   <% end %>
 
-  <% tokens = Chain.list_top_tokens(nil, params) %>
+  <% tokens = Token.list_top(nil, params) %>
   <%= for token <- tokens do %>
     <url>
       <loc><%= host %>/token/<%= to_string(token.contract_address_hash) %></loc>
diff --git a/apps/block_scout_web/lib/block_scout_web/views/robots_view.ex b/apps/block_scout_web/lib/block_scout_web/views/robots_view.ex
index 20e4cca0596f..9939ec3e684f 100644
--- a/apps/block_scout_web/lib/block_scout_web/views/robots_view.ex
+++ b/apps/block_scout_web/lib/block_scout_web/views/robots_view.ex
@@ -3,7 +3,7 @@ defmodule BlockScoutWeb.RobotsView do
 
   alias BlockScoutWeb.APIDocsView
   alias Explorer.{Chain, PagingOptions}
-  alias Explorer.Chain.Address
+  alias Explorer.Chain.{Address, Token}
 
   @limit 200
   defp limit, do: @limit
diff --git a/apps/block_scout_web/test/block_scout_web/controllers/api/v2/address_controller_test.exs b/apps/block_scout_web/test/block_scout_web/controllers/api/v2/address_controller_test.exs
index 967c9cee5f1a..13ee1e884f1a 100644
--- a/apps/block_scout_web/test/block_scout_web/controllers/api/v2/address_controller_test.exs
+++ b/apps/block_scout_web/test/block_scout_web/controllers/api/v2/address_controller_test.exs
@@ -16,6 +16,7 @@ defmodule BlockScoutWeb.API.V2.AddressControllerTest do
     Token.Instance,
     TokenTransfer,
     Transaction,
+    Wei,
     Withdrawal
   }
 
@@ -422,6 +423,166 @@ defmodule BlockScoutWeb.API.V2.AddressControllerTest do
 
       check_paginated_response(response_2nd_page, response, txs_from ++ [Enum.at(txs_to, 0)])
     end
+
+    test "ignores wrong ordering params", %{conn: conn} do
+      address = insert(:address)
+
+      txs = insert_list(51, :transaction, from_address: address) |> with_block()
+
+      request = get(conn, "/api/v2/addresses/#{address.hash}/transactions", %{"sort" => "foo", "order" => "bar"})
+      assert response = json_response(request, 200)
+
+      request_2nd_page =
+        get(
+          conn,
+          "/api/v2/addresses/#{address.hash}/transactions",
+          %{"sort" => "foo", "order" => "bar"} |> Map.merge(response["next_page_params"])
+        )
+
+      assert response_2nd_page = json_response(request_2nd_page, 200)
+
+      check_paginated_response(response, response_2nd_page, txs)
+    end
+
+    test "can order and paginate by fee ascending", %{conn: conn} do
+      address = insert(:address)
+
+      txs_from = insert_list(25, :transaction, from_address: address) |> with_block()
+      txs_to = insert_list(26, :transaction, to_address: address) |> with_block()
+
+      txs =
+        (txs_from ++ txs_to)
+        |> Enum.sort(
+          &(Decimal.compare(&1 |> Chain.fee(:wei) |> elem(1), &2 |> Chain.fee(:wei) |> elem(1)) in [:eq, :lt])
+        )
+
+      request = get(conn, "/api/v2/addresses/#{address.hash}/transactions", %{"sort" => "fee", "order" => "asc"})
+      assert response = json_response(request, 200)
+
+      request_2nd_page =
+        get(
+          conn,
+          "/api/v2/addresses/#{address.hash}/transactions",
+          %{"sort" => "fee", "order" => "asc"} |> Map.merge(response["next_page_params"])
+        )
+
+      assert response_2nd_page = json_response(request_2nd_page, 200)
+
+      assert Enum.count(response["items"]) == 50
+      assert response["next_page_params"] != nil
+      compare_item(Enum.at(txs, 0), Enum.at(response["items"], 0))
+      compare_item(Enum.at(txs, 49), Enum.at(response["items"], 49))
+
+      assert Enum.count(response_2nd_page["items"]) == 1
+      assert response_2nd_page["next_page_params"] == nil
+      compare_item(Enum.at(txs, 50), Enum.at(response_2nd_page["items"], 0))
+
+      check_paginated_response(response, response_2nd_page, txs |> Enum.reverse())
+    end
+
+    test "can order and paginate by fee descending", %{conn: conn} do
+      address = insert(:address)
+
+      txs_from = insert_list(25, :transaction, from_address: address) |> with_block()
+      txs_to = insert_list(26, :transaction, to_address: address) |> with_block()
+
+      txs =
+        (txs_from ++ txs_to)
+        |> Enum.sort(
+          &(Decimal.compare(&1 |> Chain.fee(:wei) |> elem(1), &2 |> Chain.fee(:wei) |> elem(1)) in [:eq, :gt])
+        )
+
+      request = get(conn, "/api/v2/addresses/#{address.hash}/transactions", %{"sort" => "fee", "order" => "desc"})
+      assert response = json_response(request, 200)
+
+      request_2nd_page =
+        get(
+          conn,
+          "/api/v2/addresses/#{address.hash}/transactions",
+          %{"sort" => "fee", "order" => "desc"} |> Map.merge(response["next_page_params"])
+        )
+
+      assert response_2nd_page = json_response(request_2nd_page, 200)
+
+      assert Enum.count(response["items"]) == 50
+      assert response["next_page_params"] != nil
+      compare_item(Enum.at(txs, 0), Enum.at(response["items"], 0))
+      compare_item(Enum.at(txs, 49), Enum.at(response["items"], 49))
+
+      assert Enum.count(response_2nd_page["items"]) == 1
+      assert response_2nd_page["next_page_params"] == nil
+      compare_item(Enum.at(txs, 50), Enum.at(response_2nd_page["items"], 0))
+
+      check_paginated_response(response, response_2nd_page, txs |> Enum.reverse())
+    end
+
+    test "can order and paginate by value ascending", %{conn: conn} do
+      address = insert(:address)
+
+      txs_from = insert_list(25, :transaction, from_address: address) |> with_block()
+      txs_to = insert_list(26, :transaction, to_address: address) |> with_block()
+
+      txs =
+        (txs_from ++ txs_to)
+        |> Enum.sort(&(Decimal.compare(Wei.to(&1.value, :wei), Wei.to(&2.value, :wei)) in [:eq, :lt]))
+
+      request = get(conn, "/api/v2/addresses/#{address.hash}/transactions", %{"sort" => "value", "order" => "asc"})
+      assert response = json_response(request, 200)
+
+      request_2nd_page =
+        get(
+          conn,
+          "/api/v2/addresses/#{address.hash}/transactions",
+          %{"sort" => "value", "order" => "asc"} |> Map.merge(response["next_page_params"])
+        )
+
+      assert response_2nd_page = json_response(request_2nd_page, 200)
+
+      assert Enum.count(response["items"]) == 50
+      assert response["next_page_params"] != nil
+      compare_item(Enum.at(txs, 0), Enum.at(response["items"], 0))
+      compare_item(Enum.at(txs, 49), Enum.at(response["items"], 49))
+
+      assert Enum.count(response_2nd_page["items"]) == 1
+      assert response_2nd_page["next_page_params"] == nil
+      compare_item(Enum.at(txs, 50), Enum.at(response_2nd_page["items"], 0))
+
+      check_paginated_response(response, response_2nd_page, txs |> Enum.reverse())
+    end
+
+    test "can order and paginate by value descending", %{conn: conn} do
+      address = insert(:address)
+
+      txs_from = insert_list(25, :transaction, from_address: address) |> with_block()
+      txs_to = insert_list(26, :transaction, to_address: address) |> with_block()
+
+      txs =
+        (txs_from ++ txs_to)
+        |> Enum.sort(&(Decimal.compare(Wei.to(&1.value, :wei), Wei.to(&2.value, :wei)) in [:eq, :gt]))
+
+      request = get(conn, "/api/v2/addresses/#{address.hash}/transactions", %{"sort" => "value", "order" => "desc"})
+      assert response = json_response(request, 200)
+
+      request_2nd_page =
+        get(
+          conn,
+          "/api/v2/addresses/#{address.hash}/transactions",
+          %{"sort" => "value", "order" => "desc"} |> Map.merge(response["next_page_params"])
+        )
+
+      assert response_2nd_page = json_response(request_2nd_page, 200)
+
+      assert Enum.count(response["items"]) == 50
+      assert response["next_page_params"] != nil
+      compare_item(Enum.at(txs, 0), Enum.at(response["items"], 0))
+      compare_item(Enum.at(txs, 49), Enum.at(response["items"], 49))
+
+      assert Enum.count(response_2nd_page["items"]) == 1
+      assert response_2nd_page["next_page_params"] == nil
+      compare_item(Enum.at(txs, 50), Enum.at(response_2nd_page["items"], 0))
+
+      check_paginated_response(response, response_2nd_page, txs |> Enum.reverse())
+    end
   end
 
   describe "/addresses/{address_hash}/token-transfers" do
diff --git a/apps/block_scout_web/test/block_scout_web/controllers/api/v2/smart_contract_controller_test.exs b/apps/block_scout_web/test/block_scout_web/controllers/api/v2/smart_contract_controller_test.exs
index d429160cdab9..42477f8fa099 100644
--- a/apps/block_scout_web/test/block_scout_web/controllers/api/v2/smart_contract_controller_test.exs
+++ b/apps/block_scout_web/test/block_scout_web/controllers/api/v2/smart_contract_controller_test.exs
@@ -2447,6 +2447,107 @@ defmodule BlockScoutWeb.API.V2.SmartContractControllerTest do
 
       check_paginated_response(response, response_2nd_page, smart_contracts)
     end
+
+    test "ignores wrong ordering params", %{conn: conn} do
+      smart_contracts =
+        for _ <- 0..50 do
+          insert(:smart_contract)
+        end
+
+      ordering_params = %{"sort" => "foo", "order" => "bar"}
+
+      request = get(conn, "/api/v2/smart-contracts", ordering_params)
+      assert response = json_response(request, 200)
+
+      request_2nd_page =
+        get(conn, "/api/v2/smart-contracts", ordering_params |> Map.merge(response["next_page_params"]))
+
+      assert response_2nd_page = json_response(request_2nd_page, 200)
+
+      check_paginated_response(response, response_2nd_page, smart_contracts)
+    end
+
+    test "can order by balance ascending", %{conn: conn} do
+      smart_contracts =
+        for i <- 0..50 do
+          address = insert(:address, fetched_coin_balance: i)
+          insert(:smart_contract, address_hash: address.hash, address: address)
+        end
+        |> Enum.reverse()
+
+      ordering_params = %{"sort" => "balance", "order" => "asc"}
+
+      request = get(conn, "/api/v2/smart-contracts", ordering_params)
+      assert response = json_response(request, 200)
+
+      request_2nd_page =
+        get(conn, "/api/v2/smart-contracts", ordering_params |> Map.merge(response["next_page_params"]))
+
+      assert response_2nd_page = json_response(request_2nd_page, 200)
+
+      check_paginated_response(response, response_2nd_page, smart_contracts)
+    end
+
+    test "can order by balance descending", %{conn: conn} do
+      smart_contracts =
+        for i <- 0..50 do
+          address = insert(:address, fetched_coin_balance: i)
+          insert(:smart_contract, address_hash: address.hash, address: address)
+        end
+
+      ordering_params = %{"sort" => "balance", "order" => "desc"}
+
+      request = get(conn, "/api/v2/smart-contracts", ordering_params)
+      assert response = json_response(request, 200)
+
+      request_2nd_page =
+        get(conn, "/api/v2/smart-contracts", ordering_params |> Map.merge(response["next_page_params"]))
+
+      assert response_2nd_page = json_response(request_2nd_page, 200)
+
+      check_paginated_response(response, response_2nd_page, smart_contracts)
+    end
+
+    test "can order by transaction count ascending", %{conn: conn} do
+      smart_contracts =
+        for i <- 0..50 do
+          address = insert(:address, transactions_count: i)
+          insert(:smart_contract, address_hash: address.hash, address: address)
+        end
+        |> Enum.reverse()
+
+      ordering_params = %{"sort" => "txs_count", "order" => "asc"}
+
+      request = get(conn, "/api/v2/smart-contracts", ordering_params)
+      assert response = json_response(request, 200)
+
+      request_2nd_page =
+        get(conn, "/api/v2/smart-contracts", ordering_params |> Map.merge(response["next_page_params"]))
+
+      assert response_2nd_page = json_response(request_2nd_page, 200)
+
+      check_paginated_response(response, response_2nd_page, smart_contracts)
+    end
+
+    test "can order by transaction count descending", %{conn: conn} do
+      smart_contracts =
+        for i <- 0..50 do
+          address = insert(:address, transactions_count: i)
+          insert(:smart_contract, address_hash: address.hash, address: address)
+        end
+
+      ordering_params = %{"sort" => "txs_count", "order" => "desc"}
+
+      request = get(conn, "/api/v2/smart-contracts", ordering_params)
+      assert response = json_response(request, 200)
+
+      request_2nd_page =
+        get(conn, "/api/v2/smart-contracts", ordering_params |> Map.merge(response["next_page_params"]))
+
+      assert response_2nd_page = json_response(request_2nd_page, 200)
+
+      check_paginated_response(response, response_2nd_page, smart_contracts)
+    end
   end
 
   describe "/smart-contracts/counters" do
diff --git a/apps/block_scout_web/test/block_scout_web/controllers/api/v2/token_controller_test.exs b/apps/block_scout_web/test/block_scout_web/controllers/api/v2/token_controller_test.exs
index d3506dbe5191..aa1a313ecfda 100644
--- a/apps/block_scout_web/test/block_scout_web/controllers/api/v2/token_controller_test.exs
+++ b/apps/block_scout_web/test/block_scout_web/controllers/api/v2/token_controller_test.exs
@@ -593,6 +593,23 @@ defmodule BlockScoutWeb.API.V2.TokenControllerTest do
       assert %{"items" => [], "next_page_params" => nil} = json_response(request, 200)
     end
 
+    test "ignores wrong ordering params", %{conn: conn} do
+      tokens =
+        for i <- 0..50 do
+          insert(:token, fiat_value: i)
+        end
+
+      request = get(conn, "/api/v2/tokens", %{"sort" => "foo", "order" => "bar"})
+
+      assert response = json_response(request, 200)
+
+      request_2nd_page =
+        get(conn, "/api/v2/tokens", %{"sort" => "foo", "order" => "bar"} |> Map.merge(response["next_page_params"]))
+
+      assert response_2nd_page = json_response(request_2nd_page, 200)
+      check_paginated_response(response, response_2nd_page, tokens)
+    end
+
     test "tokens are filtered by single type", %{conn: conn} do
       erc_20_tokens =
         for i <- 0..50 do
@@ -609,14 +626,14 @@ defmodule BlockScoutWeb.API.V2.TokenControllerTest do
           insert(:token, type: "ERC-1155")
         end
 
-      check_tokens_pagination(erc_20_tokens |> Enum.reverse(), conn, %{"type" => "ERC-20"})
+      check_tokens_pagination(erc_20_tokens, conn, %{"type" => "ERC-20"})
       check_tokens_pagination(erc_721_tokens |> Enum.reverse(), conn, %{"type" => "ERC-721"})
       check_tokens_pagination(erc_1155_tokens |> Enum.reverse(), conn, %{"type" => "ERC-1155"})
     end
 
     test "tokens are filtered by multiple type", %{conn: conn} do
       erc_20_tokens =
-        for i <- 0..25 do
+        for i <- 11..36 do
           insert(:token, fiat_value: i)
         end
 
@@ -639,7 +656,7 @@ defmodule BlockScoutWeb.API.V2.TokenControllerTest do
       )
 
       check_tokens_pagination(
-        erc_20_tokens |> Kernel.++(erc_1155_tokens) |> Enum.reverse(),
+        erc_1155_tokens |> Enum.reverse() |> Kernel.++(erc_20_tokens),
         conn,
         %{
           "type" => "[erc-20,ERC-1155]"
@@ -652,7 +669,6 @@ defmodule BlockScoutWeb.API.V2.TokenControllerTest do
         for i <- 0..50 do
           insert(:token, fiat_value: i)
         end
-        |> Enum.reverse()
 
       check_tokens_pagination(tokens, conn)
     end
diff --git a/apps/block_scout_web/test/block_scout_web/controllers/verified_contracts_controller_test.exs b/apps/block_scout_web/test/block_scout_web/controllers/verified_contracts_controller_test.exs
index 0a68febfa183..55936934dcdb 100644
--- a/apps/block_scout_web/test/block_scout_web/controllers/verified_contracts_controller_test.exs
+++ b/apps/block_scout_web/test/block_scout_web/controllers/verified_contracts_controller_test.exs
@@ -65,7 +65,9 @@ defmodule BlockScoutWeb.VerifiedContractsControllerTest do
       expected_path =
         verified_contracts_path(conn, :index, %{
           smart_contract_id: id,
-          items_count: "50"
+          items_count: "50",
+          coin_balance: nil,
+          tx_count: nil
         })
 
       assert Map.get(json_response(conn, 200), "next_page_path") == expected_path
diff --git a/apps/explorer/lib/explorer/chain.ex b/apps/explorer/lib/explorer/chain.ex
index 63d5935a3e6f..5fed39e9b6b9 100644
--- a/apps/explorer/lib/explorer/chain.ex
+++ b/apps/explorer/lib/explorer/chain.ex
@@ -55,7 +55,6 @@ defmodule Explorer.Chain do
     InternalTransaction,
     Log,
     PendingBlockOperation,
-    Search,
     SmartContract,
     Token,
     Token.Instance,
@@ -160,7 +159,7 @@ defmodule Explorer.Chain do
   """
   @type necessity_by_association :: %{association => necessity}
 
-  @typep necessity_by_association_option :: {:necessity_by_association, necessity_by_association}
+  @type necessity_by_association_option :: {:necessity_by_association, necessity_by_association}
   @type paging_options :: {:paging_options, PagingOptions.t()}
   @typep balance_by_day :: %{date: String.t(), value: Wei.t()}
   @type api? :: {:api?, true | false}
@@ -202,7 +201,7 @@ defmodule Explorer.Chain do
         InternalTransaction
         |> InternalTransaction.where_nonpending_block()
         |> InternalTransaction.where_address_fields_match(hash, :to_address_hash)
-        |> InternalTransaction.where_block_number_in_period(from_block, to_block)
+        |> where_block_number_in_period(from_block, to_block)
         |> common_where_limit_order(paging_options)
         |> wrapped_union_subquery()
 
@@ -210,7 +209,7 @@ defmodule Explorer.Chain do
         InternalTransaction
         |> InternalTransaction.where_nonpending_block()
         |> InternalTransaction.where_address_fields_match(hash, :from_address_hash)
-        |> InternalTransaction.where_block_number_in_period(from_block, to_block)
+        |> where_block_number_in_period(from_block, to_block)
         |> common_where_limit_order(paging_options)
         |> wrapped_union_subquery()
 
@@ -218,7 +217,7 @@ defmodule Explorer.Chain do
         InternalTransaction
         |> InternalTransaction.where_nonpending_block()
         |> InternalTransaction.where_address_fields_match(hash, :created_contract_address_hash)
-        |> InternalTransaction.where_block_number_in_period(from_block, to_block)
+        |> where_block_number_in_period(from_block, to_block)
         |> common_where_limit_order(paging_options)
         |> wrapped_union_subquery()
 
@@ -234,7 +233,7 @@ defmodule Explorer.Chain do
       InternalTransaction
       |> InternalTransaction.where_nonpending_block()
       |> InternalTransaction.where_address_fields_match(hash, direction)
-      |> InternalTransaction.where_block_number_in_period(from_block, to_block)
+      |> where_block_number_in_period(from_block, to_block)
       |> common_where_limit_order(paging_options)
       |> preload(:block)
       |> join_associations(necessity_by_association)
@@ -262,234 +261,30 @@ defmodule Explorer.Chain do
     )
   end
 
-  @doc """
-  Fetches the transactions related to the address with the given hash, including
-  transactions that only have the address in the `token_transfers` related table
-  and rewards for block validation.
-
-  This query is divided into multiple subqueries intentionally in order to
-  improve the listing performance.
-
-  The `token_transfers` table tends to grow exponentially, and the query results
-  with a `transactions` `join` statement takes too long.
-
-  To solve this the `transaction_hashes` are fetched in a separate query, and
-  paginated through the `block_number` already present in the `token_transfers`
-  table.
-
-  ## Options
-
-    * `:necessity_by_association` - use to load `t:association/0` as `:required` or `:optional`.  If an association is
-      `:required`, and the `t:Explorer.Chain.Transaction.t/0` has no associated record for that association, then the
-      `t:Explorer.Chain.Transaction.t/0` will not be included in the page `entries`.
-    * `:paging_options` - a `t:Explorer.PagingOptions.t/0` used to specify the `:page_size` and
-      `:key` (a tuple of the lowest/oldest `{block_number, index}`) and. Results will be the transactions older than
-      the `block_number` and `index` that are passed.
-
-  """
-  @spec address_to_transactions_with_rewards(Hash.Address.t(), [paging_options | necessity_by_association_option]) ::
-          [
-            Transaction.t()
-          ]
-  def address_to_transactions_with_rewards(address_hash, options \\ []) when is_list(options) do
-    paging_options = Keyword.get(options, :paging_options, @default_paging_options)
-
-    if Application.get_env(:block_scout_web, BlockScoutWeb.Chain)[:has_emission_funds] do
-      cond do
-        Keyword.get(options, :direction) == :from ->
-          address_to_transactions_without_rewards(address_hash, options)
-
-        address_has_rewards?(address_hash) ->
-          address_with_rewards(address_hash, options, paging_options)
-
-        true ->
-          address_to_transactions_without_rewards(address_hash, options)
-      end
-    else
-      address_to_transactions_without_rewards(address_hash, options)
-    end
-  end
-
-  defp address_with_rewards(address_hash, options, paging_options) do
-    %{payout_key: block_miner_payout_address} = Reward.get_validator_payout_key_by_mining_from_db(address_hash, options)
-
-    if block_miner_payout_address && address_hash == block_miner_payout_address do
-      transactions_with_rewards_results(address_hash, options, paging_options)
-    else
-      address_to_transactions_without_rewards(address_hash, options)
-    end
-  end
-
-  defp transactions_with_rewards_results(address_hash, options, paging_options) do
-    blocks_range = address_to_transactions_tasks_range_of_blocks(address_hash, options)
-
-    rewards_task =
-      Task.async(fn -> Reward.fetch_emission_rewards_tuples(address_hash, paging_options, blocks_range, options) end)
-
-    [rewards_task | address_to_transactions_tasks(address_hash, options, true)]
-    |> wait_for_address_transactions()
-    |> Enum.sort_by(fn item ->
-      case item do
-        {%Reward{} = emission_reward, _} ->
-          {-emission_reward.block.number, 1}
-
-        item ->
-          process_item(item)
-      end
-    end)
-    |> Enum.dedup_by(fn item ->
-      case item do
-        {%Reward{} = emission_reward, _} ->
-          {emission_reward.block_hash, emission_reward.address_hash, emission_reward.address_type}
-
-        transaction ->
-          transaction.hash
-      end
-    end)
-    |> Enum.take(paging_options.page_size)
-  end
-
-  defp process_item(item) do
-    block_number = if item.block_number, do: -item.block_number, else: 0
-    index = if item.index, do: -item.index, else: 0
-    {block_number, index}
-  end
-
-  def address_to_transactions_without_rewards(address_hash, options, old_ui? \\ true) do
-    paging_options = Keyword.get(options, :paging_options, @default_paging_options)
-
-    address_hash
-    |> address_to_transactions_tasks(options, old_ui?)
-    |> wait_for_address_transactions()
-    |> Enum.sort_by(&{&1.block_number, &1.index}, &>=/2)
-    |> Enum.dedup_by(& &1.hash)
-    |> Enum.take(paging_options.page_size)
-  end
-
   def address_hashes_to_mined_transactions_without_rewards(address_hashes, options) do
     paging_options = Keyword.get(options, :paging_options, @default_paging_options)
 
     address_hashes
     |> address_hashes_to_mined_transactions_tasks(options)
-    |> wait_for_address_transactions()
+    |> Transaction.wait_for_address_transactions()
     |> Enum.sort_by(&{&1.block_number, &1.index}, &>=/2)
     |> Enum.dedup_by(& &1.hash)
     |> Enum.take(paging_options.page_size)
   end
 
-  defp address_to_transactions_tasks_query(options, only_mined? \\ false) do
-    from_block = from_block(options)
-    to_block = to_block(options)
-
-    options
-    |> Keyword.get(:paging_options, @default_paging_options)
-    |> fetch_transactions(from_block, to_block, !only_mined?)
-  end
-
-  defp transactions_block_numbers_at_address(address_hash, options) do
-    direction = Keyword.get(options, :direction)
-
-    options
-    |> address_to_transactions_tasks_query()
-    |> Transaction.not_pending_transactions()
-    |> select([t], t.block_number)
-    |> Transaction.matching_address_queries_list(direction, address_hash)
-  end
-
-  defp address_to_transactions_tasks(address_hash, options, old_ui?) do
-    direction = Keyword.get(options, :direction)
-    necessity_by_association = Keyword.get(options, :necessity_by_association, %{})
-
-    options
-    |> address_to_transactions_tasks_query()
-    |> Transaction.not_dropped_or_replaced_transactions()
-    |> join_associations(necessity_by_association)
-    |> put_has_token_transfers_to_tx(old_ui?)
-    |> Transaction.matching_address_queries_list(direction, address_hash)
-    |> Enum.map(fn query -> Task.async(fn -> select_repo(options).all(query) end) end)
-  end
-
   defp address_hashes_to_mined_transactions_tasks(address_hashes, options) do
     direction = Keyword.get(options, :direction)
     necessity_by_association = Keyword.get(options, :necessity_by_association, %{})
 
     options
-    |> address_to_transactions_tasks_query(true)
+    |> Transaction.address_to_transactions_tasks_query(true)
     |> Transaction.not_pending_transactions()
     |> join_associations(necessity_by_association)
-    |> put_has_token_transfers_to_tx(false)
+    |> Transaction.put_has_token_transfers_to_tx(false)
     |> Transaction.matching_address_queries_list(direction, address_hashes)
     |> Enum.map(fn query -> Task.async(fn -> select_repo(options).all(query) end) end)
   end
 
-  def address_to_transactions_tasks_range_of_blocks(address_hash, options) do
-    extremums_list =
-      address_hash
-      |> transactions_block_numbers_at_address(options)
-      |> Enum.map(fn query ->
-        extremum_query =
-          from(
-            q in subquery(query),
-            select: %{min_block_number: min(q.block_number), max_block_number: max(q.block_number)}
-          )
-
-        extremum_query
-        |> Repo.one!()
-      end)
-
-    extremums_list
-    |> Enum.reduce(%{min_block_number: nil, max_block_number: 0}, fn %{
-                                                                       min_block_number: min_number,
-                                                                       max_block_number: max_number
-                                                                     },
-                                                                     extremums_result ->
-      current_min_number = Map.get(extremums_result, :min_block_number)
-      current_max_number = Map.get(extremums_result, :max_block_number)
-
-      extremums_result
-      |> process_extremums_result_against_min_number(current_min_number, min_number)
-      |> process_extremums_result_against_max_number(current_max_number, max_number)
-    end)
-  end
-
-  defp process_extremums_result_against_min_number(extremums_result, current_min_number, min_number)
-       when is_number(current_min_number) and
-              not (is_number(min_number) and min_number > 0 and min_number < current_min_number) do
-    extremums_result
-  end
-
-  defp process_extremums_result_against_min_number(extremums_result, _current_min_number, min_number) do
-    extremums_result
-    |> Map.put(:min_block_number, min_number)
-  end
-
-  defp process_extremums_result_against_max_number(extremums_result, current_max_number, max_number)
-       when is_number(max_number) and max_number > 0 and max_number > current_max_number do
-    extremums_result
-    |> Map.put(:max_block_number, max_number)
-  end
-
-  defp process_extremums_result_against_max_number(extremums_result, _current_max_number, _max_number) do
-    extremums_result
-  end
-
-  defp wait_for_address_transactions(tasks) do
-    tasks
-    |> Task.yield_many(:timer.seconds(20))
-    |> Enum.flat_map(fn {_task, res} ->
-      case res do
-        {:ok, result} ->
-          result
-
-        {:exit, reason} ->
-          raise "Query fetching address transactions terminated: #{inspect(reason)}"
-
-        nil ->
-          raise "Query fetching address transactions timed out."
-      end
-    end)
-  end
-
   @spec address_hash_to_token_transfers(Hash.Address.t(), Keyword.t()) :: [Transaction.t()]
   def address_hash_to_token_transfers(address_hash, options \\ []) do
     paging_options = Keyword.get(options, :paging_options, @default_paging_options)
@@ -498,7 +293,7 @@ defmodule Explorer.Chain do
     direction
     |> Transaction.transactions_with_token_transfers_direction(address_hash)
     |> Transaction.preload_token_transfers(address_hash)
-    |> handle_paging_options(paging_options)
+    |> Transaction.handle_paging_options(paging_options)
     |> Repo.all()
   end
 
@@ -633,7 +428,7 @@ defmodule Explorer.Chain do
     address_hash
     |> Transaction.transactions_with_token_transfers(token_hash)
     |> Transaction.preload_token_transfers(address_hash)
-    |> handle_paging_options(paging_options)
+    |> Transaction.handle_paging_options(paging_options)
     |> Repo.all()
   end
 
@@ -836,7 +631,7 @@ defmodule Explorer.Chain do
     |> join(:inner, [transaction], block in assoc(transaction, :block))
     |> where([_, block], block.hash == ^block_hash)
     |> join_associations(necessity_by_association)
-    |> put_has_token_transfers_to_tx(old_ui?)
+    |> Transaction.put_has_token_transfers_to_tx(old_ui?)
     |> (&if(old_ui?, do: preload(&1, [{:token_transfers, [:token, :from_address, :to_address]}]), else: &1)).()
     |> select_repo(options).all()
     |> (&if(old_ui?,
@@ -856,7 +651,7 @@ defmodule Explorer.Chain do
     |> fetch_transactions_in_descending_order_by_block_and_index()
     |> where(execution_node_hash: ^execution_node_hash)
     |> join_associations(necessity_by_association)
-    |> put_has_token_transfers_to_tx(false)
+    |> Transaction.put_has_token_transfers_to_tx(false)
     |> (& &1).()
     |> select_repo(options).all()
     |> (&Enum.map(&1, fn tx -> preload_token_transfers(tx, @token_transfers_necessity_by_association, options) end)).()
@@ -1718,7 +1513,7 @@ defmodule Explorer.Chain do
   def hashes_to_transactions(hashes, options \\ []) when is_list(hashes) and is_list(options) do
     necessity_by_association = Keyword.get(options, :necessity_by_association, %{})
 
-    fetch_transactions()
+    Transaction.fetch_transactions()
     |> where([transaction], transaction.hash in ^hashes)
     |> join_associations(necessity_by_association)
     |> preload([{:token_transfers, [:token, :from_address, :to_address]}])
@@ -1986,41 +1781,59 @@ defmodule Explorer.Chain do
   end
 
   @doc """
-  Lists the top `t:Explorer.Chain.Token.t/0`'s'.
-
+  Lists the top `t:Explorer.Chain.Address.t/0`'s' in descending order based on coin balance and address hash.
   """
-  @spec list_top_tokens(String.t()) :: [{Token.t(), non_neg_integer()}]
-  def list_top_tokens(filter, options \\ []) do
+  @spec list_top_addresses :: [{Address.t(), non_neg_integer()}]
+  def list_top_addresses(options \\ []) do
     paging_options = Keyword.get(options, :paging_options, @default_paging_options)
-    token_type = Keyword.get(options, :token_type, nil)
-    sorting = Keyword.get(options, :sorting, [])
 
-    fetch_top_tokens(filter, paging_options, token_type, sorting, options)
+    if is_nil(paging_options.key) do
+      paging_options.page_size
+      |> Accounts.take_enough()
+      |> case do
+        nil ->
+          get_addresses(options)
+
+        accounts ->
+          Enum.map(
+            accounts,
+            &{&1,
+             if is_nil(&1.nonce) do
+               0
+             else
+               &1.nonce + 1
+             end}
+          )
+      end
+    else
+      fetch_top_addresses(options)
+    end
   end
 
-  defp fetch_top_tokens(filter, paging_options, token_type, sorting, options) do
-    base_query = Token.base_token_query(token_type, sorting)
+  defp get_addresses(options) do
+    accounts_with_n = fetch_top_addresses(options)
 
-    base_query_with_paging =
-      base_query
-      |> Token.page_tokens(paging_options, sorting)
-      |> limit(^paging_options.page_size)
+    accounts_with_n
+    |> Enum.map(fn {address, _n} -> address end)
+    |> Accounts.update()
 
-    query =
-      if filter && filter !== "" do
-        case Search.prepare_search_term(filter) do
-          {:some, filter_term} ->
-            base_query_with_paging
-            |> where(fragment("to_tsvector('english', symbol || ' ' || name) @@ to_tsquery(?)", ^filter_term))
+    accounts_with_n
+  end
 
-          _ ->
-            base_query_with_paging
-        end
-      else
-        base_query_with_paging
-      end
+  defp fetch_top_addresses(options) do
+    paging_options = Keyword.get(options, :paging_options, @default_paging_options)
 
-    query
+    base_query =
+      from(a in Address,
+        where: a.fetched_coin_balance > ^0,
+        order_by: [desc: a.fetched_coin_balance, asc: a.hash],
+        preload: [:names, :smart_contract],
+        select: {a, fragment("coalesce(1 + ?, 0)", a.nonce)}
+      )
+
+    base_query
+    |> page_addresses(paging_options)
+    |> limit(^paging_options.page_size)
     |> select_repo(options).all()
   end
 
@@ -2865,12 +2678,12 @@ defmodule Explorer.Chain do
         options
       ) do
     paging_options
-    |> fetch_transactions()
+    |> Transaction.fetch_transactions()
     |> where([transaction], not is_nil(transaction.block_number) and not is_nil(transaction.index))
     |> apply_filter_by_method_id_to_transactions(method_id_filter)
     |> apply_filter_by_tx_type_to_transactions(type_filter)
     |> join_associations(necessity_by_association)
-    |> put_has_token_transfers_to_tx(old_ui?)
+    |> Transaction.put_has_token_transfers_to_tx(old_ui?)
     |> (&if(old_ui?, do: preload(&1, [{:token_transfers, [:token, :from_address, :to_address]}]), else: &1)).()
     |> select_repo(options).all()
     |> (&if(old_ui?,
@@ -2915,7 +2728,7 @@ defmodule Explorer.Chain do
     type_filter = Keyword.get(options, :type)
 
     Transaction
-    |> page_pending_transaction(paging_options)
+    |> Transaction.page_pending_transaction(paging_options)
     |> limit(^paging_options.page_size)
     |> pending_transactions_query()
     |> apply_filter_by_method_id_to_transactions(method_id_filter)
@@ -3518,24 +3331,6 @@ defmodule Explorer.Chain do
     |> limit(^paging_options.page_size)
   end
 
-  defp handle_paging_options(query, nil), do: query
-
-  defp handle_paging_options(query, %PagingOptions{key: nil, page_size: nil}), do: query
-
-  defp handle_paging_options(query, paging_options) do
-    query
-    |> page_transaction(paging_options)
-    |> limit(^paging_options.page_size)
-  end
-
-  defp handle_verified_contracts_paging_options(query, nil), do: query
-
-  defp handle_verified_contracts_paging_options(query, paging_options) do
-    query
-    |> page_verified_contracts(paging_options)
-    |> limit(^paging_options.page_size)
-  end
-
   defp handle_withdrawals_paging_options(query, nil), do: query
 
   defp handle_withdrawals_paging_options(query, paging_options) do
@@ -3551,7 +3346,7 @@ defmodule Explorer.Chain do
     query
     |> (&if(paging_options |> Map.get(:page_number, 1) |> process_page_number() == 1,
           do: &1,
-          else: page_transaction(&1, paging_options)
+          else: Transaction.page_transaction(&1, paging_options)
         )).()
     |> handle_page(paging_options)
   end
@@ -3594,29 +3389,21 @@ defmodule Explorer.Chain do
       :required ->
         from(q in query,
           inner_join: a in assoc(q, ^association),
+          as: ^association,
           left_join: b in assoc(a, ^nested_preload),
+          as: ^nested_preload,
           preload: [{^association, {a, [{^nested_preload, b}]}}]
         )
     end
   end
 
-  defp join_association(query, association, necessity) when is_atom(association) do
-    case necessity do
-      :optional ->
-        preload(query, ^association)
-
-      :required ->
-        from(q in query, inner_join: a in assoc(q, ^association), preload: [{^association, a}])
-    end
-  end
-
   defp join_association(query, association, necessity) do
     case necessity do
       :optional ->
         preload(query, ^association)
 
       :required ->
-        from(q in query, inner_join: a in assoc(q, ^association), preload: [{^association, a}])
+        from(q in query, inner_join: a in assoc(q, ^association), as: ^association, preload: [{^association, a}])
     end
   end
 
@@ -3708,46 +3495,6 @@ defmodule Explorer.Chain do
     where(query, [log], log.index > ^index)
   end
 
-  defp page_pending_transaction(query, %PagingOptions{key: nil}), do: query
-
-  defp page_pending_transaction(query, %PagingOptions{key: {inserted_at, hash}}) do
-    where(
-      query,
-      [transaction],
-      (is_nil(transaction.block_number) and
-         (transaction.inserted_at < ^inserted_at or
-            (transaction.inserted_at == ^inserted_at and transaction.hash > ^hash))) or
-        not is_nil(transaction.block_number)
-    )
-  end
-
-  defp page_transaction(query, %PagingOptions{key: nil}), do: query
-
-  defp page_transaction(query, %PagingOptions{is_pending_tx: true} = options),
-    do: page_pending_transaction(query, options)
-
-  defp page_transaction(query, %PagingOptions{key: {block_number, index}, is_index_in_asc_order: true}) do
-    where(
-      query,
-      [transaction],
-      transaction.block_number < ^block_number or
-        (transaction.block_number == ^block_number and transaction.index > ^index)
-    )
-  end
-
-  defp page_transaction(query, %PagingOptions{key: {block_number, index}}) do
-    where(
-      query,
-      [transaction],
-      transaction.block_number < ^block_number or
-        (transaction.block_number == ^block_number and transaction.index < ^index)
-    )
-  end
-
-  defp page_transaction(query, %PagingOptions{key: {index}}) do
-    where(query, [transaction], transaction.index < ^index)
-  end
-
   defp page_block_transactions(query, %PagingOptions{key: nil}), do: query
 
   defp page_block_transactions(query, %PagingOptions{key: {_block_number, index}, is_index_in_asc_order: true}) do
@@ -3810,12 +3557,6 @@ defmodule Explorer.Chain do
     )
   end
 
-  defp page_verified_contracts(query, %PagingOptions{key: nil}), do: query
-
-  defp page_verified_contracts(query, %PagingOptions{key: {id}}) do
-    where(query, [contract], contract.id < ^id)
-  end
-
   @doc """
   Ensures the following conditions are true:
 
@@ -4126,13 +3867,6 @@ defmodule Explorer.Chain do
     Repo.exists?(query)
   end
 
-  @spec address_has_rewards?(Address.t()) :: boolean()
-  def address_has_rewards?(address_hash) do
-    query = from(r in Reward, where: r.address_hash == ^address_hash)
-
-    Repo.exists?(query)
-  end
-
   @spec address_tokens_with_balance(Hash.Address.t(), [any()]) :: []
   def address_tokens_with_balance(address_hash, paging_options \\ []) do
     address_hash
@@ -5288,10 +5022,12 @@ defmodule Explorer.Chain do
     end
   end
 
-  defp from_block(options) do
+  @spec from_block(keyword) :: any
+  def from_block(options) do
     Keyword.get(options, :from_block) || nil
   end
 
+  @spec to_block(keyword) :: any
   def to_block(options) do
     Keyword.get(options, :to_block) || nil
   end
@@ -5465,54 +5201,6 @@ defmodule Explorer.Chain do
     dynamic([tx, created_token: created_token], ^dynamic or not is_nil(created_token))
   end
 
-  @spec verified_contracts([
-          paging_options
-          | necessity_by_association_option
-          | {:filter, :solidity | :vyper}
-          | {:search, String.t() | {:api?, true | false}}
-        ]) :: [SmartContract.t()]
-  def verified_contracts(options \\ []) do
-    paging_options = Keyword.get(options, :paging_options, @default_paging_options)
-    necessity_by_association = Keyword.get(options, :necessity_by_association, %{})
-    filter = Keyword.get(options, :filter, nil)
-    search_string = Keyword.get(options, :search, nil)
-
-    query = from(contract in SmartContract, select: contract, order_by: [desc: :id])
-
-    query
-    |> filter_contracts(filter)
-    |> search_contracts(search_string)
-    |> handle_verified_contracts_paging_options(paging_options)
-    |> join_associations(necessity_by_association)
-    |> select_repo(options).all()
-  end
-
-  defp search_contracts(basic_query, nil), do: basic_query
-
-  defp search_contracts(basic_query, search_string) do
-    from(contract in basic_query,
-      where:
-        ilike(contract.name, ^"%#{search_string}%") or
-          ilike(fragment("'0x' || encode(?, 'hex')", contract.address_hash), ^"%#{search_string}%")
-    )
-  end
-
-  defp filter_contracts(basic_query, :solidity) do
-    basic_query
-    |> where(is_vyper_contract: ^false)
-  end
-
-  defp filter_contracts(basic_query, :vyper) do
-    basic_query
-    |> where(is_vyper_contract: ^true)
-  end
-
-  defp filter_contracts(basic_query, :yul) do
-    from(query in basic_query, where: is_nil(query.abi))
-  end
-
-  defp filter_contracts(basic_query, _), do: basic_query
-
   def count_verified_contracts do
     Repo.aggregate(SmartContract, :count, timeout: :infinity)
   end
@@ -5763,20 +5451,6 @@ defmodule Explorer.Chain do
     limit(query, ^coin_balances_fetcher_limit)
   end
 
-  def put_has_token_transfers_to_tx(query, true), do: query
-
-  def put_has_token_transfers_to_tx(query, false) do
-    from(tx in query,
-      select_merge: %{
-        has_token_transfers:
-          fragment(
-            "(SELECT transaction_hash FROM token_transfers WHERE transaction_hash = ? LIMIT 1) IS NOT NULL",
-            tx.hash
-          )
-      }
-    )
-  end
-
   @spec default_paging_options() :: map()
   def default_paging_options do
     @default_paging_options
diff --git a/apps/explorer/lib/explorer/chain/block/reward.ex b/apps/explorer/lib/explorer/chain/block/reward.ex
index 0ec4f05e881e..d45df2666669 100644
--- a/apps/explorer/lib/explorer/chain/block/reward.ex
+++ b/apps/explorer/lib/explorer/chain/block/reward.ex
@@ -6,7 +6,7 @@ defmodule Explorer.Chain.Block.Reward do
   use Explorer.Schema
 
   alias Explorer.Application.Constants
-  alias Explorer.{Chain, PagingOptions}
+  alias Explorer.{Chain, PagingOptions, Repo}
   alias Explorer.Chain.Block.Reward.AddressType
   alias Explorer.Chain.{Address, Block, Hash, Validator, Wei}
   alias Explorer.Chain.Fetcher.FetchValidatorInfoOnDemand
@@ -278,4 +278,14 @@ defmodule Explorer.Chain.Block.Reward do
       query
     end
   end
+
+  @doc """
+  Checks if an address has rewards
+  """
+  @spec address_has_rewards?(Hash.Address.t()) :: boolean()
+  def address_has_rewards?(address_hash) do
+    query = from(r in __MODULE__, where: r.address_hash == ^address_hash)
+
+    Repo.exists?(query)
+  end
 end
diff --git a/apps/explorer/lib/explorer/chain/csv_export/address_transaction_csv_exporter.ex b/apps/explorer/lib/explorer/chain/csv_export/address_transaction_csv_exporter.ex
index cd2595a7e3a7..a0404f477370 100644
--- a/apps/explorer/lib/explorer/chain/csv_export/address_transaction_csv_exporter.ex
+++ b/apps/explorer/lib/explorer/chain/csv_export/address_transaction_csv_exporter.ex
@@ -10,7 +10,7 @@ defmodule Explorer.Chain.CSVExport.AddressTransactionCsvExporter do
 
   alias Explorer.{Chain, Market, PagingOptions, Repo}
   alias Explorer.Market.MarketHistory
-  alias Explorer.Chain.{Address, Transaction, Wei}
+  alias Explorer.Chain.{Address, Hash, Transaction, Wei}
   alias Explorer.Chain.CSVExport.Helper
 
   @necessity_by_association [
@@ -21,7 +21,7 @@ defmodule Explorer.Chain.CSVExport.AddressTransactionCsvExporter do
 
   @paging_options %PagingOptions{page_size: Helper.limit()}
 
-  @spec export(Address.t(), String.t(), String.t(), String.t() | nil, String.t() | nil) :: Enumerable.t()
+  @spec export(Hash.Address.t(), String.t(), String.t(), String.t() | nil, String.t() | nil) :: Enumerable.t()
   def export(address_hash, from_period, to_period, filter_type \\ nil, filter_value \\ nil) do
     {from_block, to_block} = Helper.block_from_period(from_period, to_period)
     exchange_rate = Market.get_coin_exchange_rate()
@@ -44,7 +44,7 @@ defmodule Explorer.Chain.CSVExport.AddressTransactionCsvExporter do
             else: &1
           )).()
 
-    Chain.address_to_transactions_without_rewards(address_hash, options)
+    Transaction.address_to_transactions_without_rewards(address_hash, options)
   end
 
   defp to_csv_format(transactions, address_hash, exchange_rate) do
diff --git a/apps/explorer/lib/explorer/chain/internal_transaction.ex b/apps/explorer/lib/explorer/chain/internal_transaction.ex
index c86bfa699f53..82ce66e8c3dc 100644
--- a/apps/explorer/lib/explorer/chain/internal_transaction.ex
+++ b/apps/explorer/lib/explorer/chain/internal_transaction.ex
@@ -580,38 +580,6 @@ defmodule Explorer.Chain.InternalTransaction do
     )
   end
 
-  def where_block_number_in_period(query, from_number, to_number) when is_nil(from_number) and not is_nil(to_number) do
-    where(
-      query,
-      [it],
-      it.block_number <= ^to_number
-    )
-  end
-
-  def where_block_number_in_period(query, from_number, to_number) when not is_nil(from_number) and is_nil(to_number) do
-    where(
-      query,
-      [it],
-      it.block_number > ^from_number
-    )
-  end
-
-  def where_block_number_in_period(query, from_number, to_number) when is_nil(from_number) and is_nil(to_number) do
-    where(
-      query,
-      [it],
-      1
-    )
-  end
-
-  def where_block_number_in_period(query, from_number, to_number) do
-    where(
-      query,
-      [it],
-      it.block_number > ^from_number and it.block_number <= ^to_number
-    )
-  end
-
   def where_block_number_is_not_null(query) do
     where(query, [t], not is_nil(t.block_number))
   end
diff --git a/apps/explorer/lib/explorer/chain/smart_contract.ex b/apps/explorer/lib/explorer/chain/smart_contract.ex
index 9e9e198212c2..89b3a27e919a 100644
--- a/apps/explorer/lib/explorer/chain/smart_contract.ex
+++ b/apps/explorer/lib/explorer/chain/smart_contract.ex
@@ -14,7 +14,7 @@ defmodule Explorer.Chain.SmartContract do
 
   alias Ecto.{Changeset, Multi}
   alias Explorer.Counters.AverageBlockTime
-  alias Explorer.{Chain, Repo}
+  alias Explorer.{Chain, Repo, SortingHelper}
 
   alias Explorer.Chain.{
     Address,
@@ -53,6 +53,10 @@ defmodule Explorer.Chain.SmartContract do
     @burn_address_hash_string
   end
 
+  @default_sorting [desc: :id]
+
+  @typep api? :: {:api?, true | false}
+
   @typedoc """
   The name of a parameter to a function or event.
   """
@@ -1242,4 +1246,56 @@ defmodule Explorer.Chain.SmartContract do
 
     if smart_contract, do: !smart_contract.partially_verified, else: false
   end
+
+  @spec verified_contracts([
+          Chain.paging_options()
+          | Chain.necessity_by_association_option()
+          | {:filter, :solidity | :vyper | :yul}
+          | {:search, String.t()}
+          | {:sorting, SortingHelper.sorting_params()}
+          | Chain.api?()
+        ]) :: [__MODULE__.t()]
+  def verified_contracts(options \\ []) do
+    paging_options = Keyword.get(options, :paging_options, Chain.default_paging_options())
+    sorting_options = Keyword.get(options, :sorting, [])
+    necessity_by_association = Keyword.get(options, :necessity_by_association, %{})
+    filter = Keyword.get(options, :filter, nil)
+    search_string = Keyword.get(options, :search, nil)
+
+    query = from(contract in __MODULE__)
+
+    query
+    |> filter_contracts(filter)
+    |> search_contracts(search_string)
+    |> SortingHelper.apply_sorting(sorting_options, @default_sorting)
+    |> SortingHelper.page_with_sorting(paging_options, sorting_options, @default_sorting)
+    |> Chain.join_associations(necessity_by_association)
+    |> Chain.select_repo(options).all()
+  end
+
+  defp search_contracts(basic_query, nil), do: basic_query
+
+  defp search_contracts(basic_query, search_string) do
+    from(contract in basic_query,
+      where:
+        ilike(contract.name, ^"%#{search_string}%") or
+          ilike(fragment("'0x' || encode(?, 'hex')", contract.address_hash), ^"%#{search_string}%")
+    )
+  end
+
+  defp filter_contracts(basic_query, :solidity) do
+    basic_query
+    |> where(is_vyper_contract: ^false)
+  end
+
+  defp filter_contracts(basic_query, :vyper) do
+    basic_query
+    |> where(is_vyper_contract: ^true)
+  end
+
+  defp filter_contracts(basic_query, :yul) do
+    from(query in basic_query, where: is_nil(query.abi))
+  end
+
+  defp filter_contracts(basic_query, _), do: basic_query
 end
diff --git a/apps/explorer/lib/explorer/chain/token.ex b/apps/explorer/lib/explorer/chain/token.ex
index fc12af368a0d..66c3fdd5e2de 100644
--- a/apps/explorer/lib/explorer/chain/token.ex
+++ b/apps/explorer/lib/explorer/chain/token.ex
@@ -23,10 +23,18 @@ defmodule Explorer.Chain.Token do
   import Ecto.{Changeset, Query}
 
   alias Ecto.Changeset
-  alias Explorer.{Chain, PagingOptions}
-  alias Explorer.Chain.{Address, Hash, Token}
+  alias Explorer.{Chain, SortingHelper}
+  alias Explorer.Chain.{Address, Hash, Search, Token}
   alias Explorer.SmartContract.Helper
 
+  @default_sorting [
+    desc_nulls_last: :circulating_market_cap,
+    desc_nulls_last: :fiat_value,
+    desc_nulls_last: :holder_count,
+    asc: :name,
+    asc: :contract_address_hash
+  ]
+
   @typedoc """
   * `name` - Name of the token
   * `symbol` - Trading symbol of the token
@@ -160,178 +168,45 @@ defmodule Explorer.Chain.Token do
     from(token in __MODULE__, where: token.contract_address_hash in ^contract_address_hashes)
   end
 
-  def base_token_query(type, sorting) do
-    query = from(t in Token, preload: [:contract_address])
-
-    query |> apply_filter(type) |> apply_sorting(sorting)
-  end
-
-  defp apply_filter(query, empty_type) when empty_type in [nil, []], do: query
-
-  defp apply_filter(query, token_types) when is_list(token_types) do
-    from(t in query, where: t.type in ^token_types)
-  end
-
-  @default_sorting [
-    desc_nulls_last: :circulating_market_cap,
-    desc_nulls_last: :holder_count,
-    asc: :name,
-    asc: :contract_address_hash
-  ]
-
-  defp apply_sorting(query, sorting) when is_list(sorting) do
-    from(t in query, order_by: ^sorting_with_defaults(sorting))
-  end
-
-  defp sorting_with_defaults(sorting) when is_list(sorting) do
-    (sorting ++ @default_sorting)
-    |> Enum.uniq_by(fn {_, field} -> field end)
-  end
-
-  def page_tokens(query, paging_options, sorting \\ [])
-  def page_tokens(query, %PagingOptions{key: nil}, _sorting), do: query
-
-  def page_tokens(
-        query,
-        %PagingOptions{
-          key: %{} = key
-        },
-        sorting
-      ) do
-    dynamic_where = sorting |> sorting_with_defaults() |> do_page_tokens()
-
-    from(token in query,
-      where: ^dynamic_where.(key)
-    )
-  end
-
-  defp do_page_tokens([{order, column} | rest]) do
-    fn key -> page_tokens_by_column(key, column, order, do_page_tokens(rest)) end
-  end
-
-  defp do_page_tokens([]), do: nil
-
-  defp page_tokens_by_column(%{fiat_value: nil} = key, :fiat_value, :desc_nulls_last, next_column) do
-    dynamic(
-      [t],
-      is_nil(t.fiat_value) and ^next_column.(key)
-    )
-  end
-
-  defp page_tokens_by_column(%{fiat_value: nil} = key, :fiat_value, :asc_nulls_first, next_column) do
-    next_column.(key)
-  end
-
-  defp page_tokens_by_column(%{fiat_value: fiat_value} = key, :fiat_value, :desc_nulls_last, next_column) do
-    dynamic(
-      [t],
-      is_nil(t.fiat_value) or t.fiat_value < ^fiat_value or
-        (t.fiat_value == ^fiat_value and ^next_column.(key))
-    )
-  end
-
-  defp page_tokens_by_column(%{fiat_value: fiat_value} = key, :fiat_value, :asc_nulls_first, next_column) do
-    dynamic(
-      [t],
-      not is_nil(t.fiat_value) and
-        (t.fiat_value > ^fiat_value or
-           (t.fiat_value == ^fiat_value and ^next_column.(key)))
-    )
-  end
-
-  defp page_tokens_by_column(
-         %{circulating_market_cap: nil} = key,
-         :circulating_market_cap,
-         :desc_nulls_last,
-         next_column
-       ) do
-    dynamic(
-      [t],
-      is_nil(t.circulating_market_cap) and ^next_column.(key)
-    )
-  end
-
-  defp page_tokens_by_column(
-         %{circulating_market_cap: nil} = key,
-         :circulating_market_cap,
-         :asc_nulls_first,
-         next_column
-       ) do
-    next_column.(key)
-  end
-
-  defp page_tokens_by_column(
-         %{circulating_market_cap: circulating_market_cap} = key,
-         :circulating_market_cap,
-         :desc_nulls_last,
-         next_column
-       ) do
-    dynamic(
-      [t],
-      is_nil(t.circulating_market_cap) or t.circulating_market_cap < ^circulating_market_cap or
-        (t.circulating_market_cap == ^circulating_market_cap and ^next_column.(key))
-    )
-  end
-
-  defp page_tokens_by_column(
-         %{circulating_market_cap: circulating_market_cap} = key,
-         :circulating_market_cap,
-         :asc_nulls_first,
-         next_column
-       ) do
-    dynamic(
-      [t],
-      not is_nil(t.circulating_market_cap) and
-        (t.circulating_market_cap > ^circulating_market_cap or
-           (t.circulating_market_cap == ^circulating_market_cap and ^next_column.(key)))
-    )
-  end
+  @doc """
+  Lists the top `t:__MODULE__.t/0`'s'.
+  """
+  @spec list_top(String.t() | nil, [
+          Chain.paging_options()
+          | {:sorting, SortingHelper.sorting_params()}
+          | {:token_type, [String.t()]}
+        ]) :: [Token.t()]
+  def list_top(filter, options \\ []) do
+    paging_options = Keyword.get(options, :paging_options, Chain.default_paging_options())
+    token_type = Keyword.get(options, :token_type, nil)
+    sorting = Keyword.get(options, :sorting, [])
 
-  defp page_tokens_by_column(%{holder_count: nil} = key, :holder_count, :desc_nulls_last, next_column) do
-    dynamic(
-      [t],
-      is_nil(t.holder_count) and ^next_column.(key)
-    )
-  end
+    query = from(t in Token, preload: [:contract_address])
 
-  defp page_tokens_by_column(%{holder_count: nil} = key, :holder_count, :asc_nulls_first, next_column) do
-    next_column.(key)
-  end
+    sorted_paginated_query =
+      query
+      |> apply_filter(token_type)
+      |> SortingHelper.apply_sorting(sorting, @default_sorting)
+      |> SortingHelper.page_with_sorting(paging_options, sorting, @default_sorting)
 
-  defp page_tokens_by_column(%{holder_count: holder_count} = key, :holder_count, :desc_nulls_last, next_column) do
-    dynamic(
-      [t],
-      is_nil(t.holder_count) or t.holder_count < ^holder_count or
-        (t.holder_count == ^holder_count and ^next_column.(key))
-    )
-  end
+    filtered_query =
+      case filter && filter !== "" && Search.prepare_search_term(filter) do
+        {:some, filter_term} ->
+          sorted_paginated_query
+          |> where(fragment("to_tsvector('english', symbol || ' ' || name) @@ to_tsquery(?)", ^filter_term))
 
-  defp page_tokens_by_column(%{holder_count: holder_count} = key, :holder_count, :asc_nulls_first, next_column) do
-    dynamic(
-      [t],
-      not is_nil(t.holder_count) and
-        (t.holder_count > ^holder_count or
-           (t.holder_count == ^holder_count and ^next_column.(key)))
-    )
-  end
+        _ ->
+          sorted_paginated_query
+      end
 
-  defp page_tokens_by_column(%{name: nil} = key, :name, :asc, next_column) do
-    dynamic(
-      [t],
-      is_nil(t.name) and ^next_column.(key)
-    )
+    filtered_query
+    |> Chain.select_repo(options).all()
   end
 
-  defp page_tokens_by_column(%{name: name} = key, :name, :asc, next_column) do
-    dynamic(
-      [t],
-      is_nil(t.name) or
-        (t.name > ^name or (t.name == ^name and ^next_column.(key)))
-    )
-  end
+  defp apply_filter(query, empty_type) when empty_type in [nil, []], do: query
 
-  defp page_tokens_by_column(%{contract_address_hash: contract_address_hash}, :contract_address_hash, :asc, nil) do
-    dynamic([t], t.contract_address_hash > ^contract_address_hash)
+  defp apply_filter(query, token_types) when is_list(token_types) do
+    from(t in query, where: t.type in ^token_types)
   end
 
   def get_by_contract_address_hash(hash, options) do
diff --git a/apps/explorer/lib/explorer/chain/transaction.ex b/apps/explorer/lib/explorer/chain/transaction.ex
index 32dc58105f1e..0ed5b547fc5b 100644
--- a/apps/explorer/lib/explorer/chain/transaction.ex
+++ b/apps/explorer/lib/explorer/chain/transaction.ex
@@ -5,14 +5,12 @@ defmodule Explorer.Chain.Transaction do
 
   require Logger
 
-  import Ecto.Query, only: [from: 2, preload: 3, subquery: 1, where: 3]
-
   alias ABI.FunctionSelector
 
   alias Ecto.Association.NotLoaded
   alias Ecto.Changeset
 
-  alias Explorer.Chain
+  alias Explorer.{Chain, Repo}
 
   alias Explorer.Chain.{
     Address,
@@ -31,9 +29,11 @@ defmodule Explorer.Chain.Transaction do
     Wei
   }
 
+  alias Explorer.Chain.Block.Reward
   alias Explorer.Chain.SmartContract.Proxy
   alias Explorer.Chain.Transaction.{Fork, Status}
   alias Explorer.Chain.Zkevm.BatchTransaction
+  alias Explorer.{PagingOptions, SortingHelper}
   alias Explorer.SmartContract.SigProviderInterface
 
   @optional_attrs ~w(max_priority_fee_per_gas max_fee_per_gas block_hash block_number created_contract_address_hash cumulative_gas_used earliest_processing_start
@@ -1213,4 +1213,434 @@ defmodule Explorer.Chain.Transaction do
   end
 
   def bytes_to_address_hash(bytes), do: %Hash{byte_count: 20, bytes: bytes}
+
+  @doc """
+  Fetches the transactions related to the address with the given hash, including
+  transactions that only have the address in the `token_transfers` related table
+  and rewards for block validation.
+
+  This query is divided into multiple subqueries intentionally in order to
+  improve the listing performance.
+
+  The `token_transfers` table tends to grow exponentially, and the query results
+  with a `transactions` `join` statement takes too long.
+
+  To solve this the `transaction_hashes` are fetched in a separate query, and
+  paginated through the `block_number` already present in the `token_transfers`
+  table.
+
+  ## Options
+
+    * `:necessity_by_association` - use to load `t:association/0` as `:required` or `:optional`.  If an association is
+      `:required`, and the `t:Explorer.Chain.Transaction.t/0` has no associated record for that association, then the
+      `t:Explorer.Chain.Transaction.t/0` will not be included in the page `entries`.
+    * `:paging_options` - a `t:Explorer.PagingOptions.t/0` used to specify the `:page_size` and
+      `:key` (a tuple of the lowest/oldest `{block_number, index}`) and. Results will be the transactions older than
+      the `block_number` and `index` that are passed.
+
+  """
+  @spec address_to_transactions_with_rewards(Hash.Address.t(), [
+          Chain.paging_options() | Chain.necessity_by_association_option()
+        ]) :: [__MODULE__.t()]
+  def address_to_transactions_with_rewards(address_hash, options \\ []) when is_list(options) do
+    paging_options = Keyword.get(options, :paging_options, Chain.default_paging_options())
+
+    case Application.get_env(:block_scout_web, BlockScoutWeb.Chain)[:has_emission_funds] &&
+           Keyword.get(options, :direction) != :from &&
+           Reward.address_has_rewards?(address_hash) &&
+           Reward.get_validator_payout_key_by_mining_from_db(address_hash, options) do
+      %{payout_key: block_miner_payout_address}
+      when not is_nil(block_miner_payout_address) and address_hash == block_miner_payout_address ->
+        transactions_with_rewards_results(address_hash, options, paging_options)
+
+      _ ->
+        address_to_transactions_without_rewards(address_hash, options)
+    end
+  end
+
+  defp transactions_with_rewards_results(address_hash, options, paging_options) do
+    blocks_range = address_to_transactions_tasks_range_of_blocks(address_hash, options)
+
+    rewards_task =
+      Task.async(fn -> Reward.fetch_emission_rewards_tuples(address_hash, paging_options, blocks_range, options) end)
+
+    [rewards_task | address_to_transactions_tasks(address_hash, options, true)]
+    |> wait_for_address_transactions()
+    |> Enum.sort_by(fn item ->
+      case item do
+        {%Reward{} = emission_reward, _} ->
+          {-emission_reward.block.number, 1}
+
+        item ->
+          process_item(item)
+      end
+    end)
+    |> Enum.dedup_by(fn item ->
+      case item do
+        {%Reward{} = emission_reward, _} ->
+          {emission_reward.block_hash, emission_reward.address_hash, emission_reward.address_type}
+
+        transaction ->
+          transaction.hash
+      end
+    end)
+    |> Enum.take(paging_options.page_size)
+  end
+
+  @doc false
+  def address_to_transactions_tasks_range_of_blocks(address_hash, options) do
+    extremums_list =
+      address_hash
+      |> transactions_block_numbers_at_address(options)
+      |> Enum.map(fn query ->
+        extremum_query =
+          from(
+            q in subquery(query),
+            select: %{min_block_number: min(q.block_number), max_block_number: max(q.block_number)}
+          )
+
+        extremum_query
+        |> Repo.one!()
+      end)
+
+    extremums_list
+    |> Enum.reduce(%{min_block_number: nil, max_block_number: 0}, fn %{
+                                                                       min_block_number: min_number,
+                                                                       max_block_number: max_number
+                                                                     },
+                                                                     extremums_result ->
+      current_min_number = Map.get(extremums_result, :min_block_number)
+      current_max_number = Map.get(extremums_result, :max_block_number)
+
+      extremums_result
+      |> process_extremums_result_against_min_number(current_min_number, min_number)
+      |> process_extremums_result_against_max_number(current_max_number, max_number)
+    end)
+  end
+
+  defp transactions_block_numbers_at_address(address_hash, options) do
+    direction = Keyword.get(options, :direction)
+
+    options
+    |> address_to_transactions_tasks_query(true)
+    |> not_pending_transactions()
+    |> select([t], t.block_number)
+    |> matching_address_queries_list(direction, address_hash)
+  end
+
+  defp process_extremums_result_against_min_number(extremums_result, current_min_number, min_number)
+       when is_number(current_min_number) and
+              not (is_number(min_number) and min_number > 0 and min_number < current_min_number) do
+    extremums_result
+  end
+
+  defp process_extremums_result_against_min_number(extremums_result, _current_min_number, min_number) do
+    extremums_result
+    |> Map.put(:min_block_number, min_number)
+  end
+
+  defp process_extremums_result_against_max_number(extremums_result, current_max_number, max_number)
+       when is_number(max_number) and max_number > 0 and max_number > current_max_number do
+    extremums_result
+    |> Map.put(:max_block_number, max_number)
+  end
+
+  defp process_extremums_result_against_max_number(extremums_result, _current_max_number, _max_number) do
+    extremums_result
+  end
+
+  defp process_item(item) do
+    block_number = if item.block_number, do: -item.block_number, else: 0
+    index = if item.index, do: -item.index, else: 0
+    {block_number, index}
+  end
+
+  @spec address_to_transactions_without_rewards(
+          Hash.Address.t(),
+          [
+            Chain.paging_options()
+            | Chain.necessity_by_association_option()
+            | {:sorting, SortingHelper.sorting_params()}
+          ],
+          boolean()
+        ) :: [__MODULE__.t()]
+  def address_to_transactions_without_rewards(address_hash, options, old_ui? \\ true) do
+    paging_options = Keyword.get(options, :paging_options, Chain.default_paging_options())
+
+    address_hash
+    |> address_to_transactions_tasks(options, old_ui?)
+    |> wait_for_address_transactions()
+    |> Enum.sort(compare_custom_sorting(Keyword.get(options, :sorting, [])))
+    |> Enum.dedup_by(& &1.hash)
+    |> Enum.take(paging_options.page_size)
+  end
+
+  defp address_to_transactions_tasks(address_hash, options, old_ui?) do
+    direction = Keyword.get(options, :direction)
+    necessity_by_association = Keyword.get(options, :necessity_by_association, %{})
+
+    options
+    |> address_to_transactions_tasks_query(false, old_ui?)
+    |> not_dropped_or_replaced_transactions()
+    |> Chain.join_associations(necessity_by_association)
+    |> put_has_token_transfers_to_tx(old_ui?)
+    |> matching_address_queries_list(direction, address_hash)
+    |> Enum.map(fn query -> Task.async(fn -> Chain.select_repo(options).all(query) end) end)
+  end
+
+  @doc """
+  Returns the address to transactions tasks query based on provided options.
+  Boolean `only_mined?` argument specifies if only mined transactions should be returned,
+  boolean `old_ui?` argument specifies if the query is for the old UI, i.e. is query dynamically sorted or no.
+  """
+  @spec address_to_transactions_tasks_query(keyword, boolean, boolean) :: Ecto.Query.t()
+  def address_to_transactions_tasks_query(options, only_mined? \\ false, old_ui? \\ true)
+
+  def address_to_transactions_tasks_query(options, only_mined?, true) do
+    from_block = Chain.from_block(options)
+    to_block = Chain.to_block(options)
+
+    options
+    |> Keyword.get(:paging_options, Chain.default_paging_options())
+    |> fetch_transactions(from_block, to_block, !only_mined?)
+  end
+
+  def address_to_transactions_tasks_query(options, _only_mined?, false) do
+    from_block = Chain.from_block(options)
+    to_block = Chain.to_block(options)
+    paging_options = Keyword.get(options, :paging_options, Chain.default_paging_options())
+    sorting_options = Keyword.get(options, :sorting, [])
+
+    fetch_transactions_with_custom_sorting(paging_options, from_block, to_block, sorting_options)
+  end
+
+  @doc """
+  Waits for the address transactions tasks to complete and returns the transactions flattened
+  in case of success or raises an error otherwise.
+  """
+  @spec wait_for_address_transactions([Task.t()]) :: [__MODULE__.t()]
+  def wait_for_address_transactions(tasks) do
+    tasks
+    |> Task.yield_many(:timer.seconds(20))
+    |> Enum.flat_map(fn {_task, res} ->
+      case res do
+        {:ok, result} ->
+          result
+
+        {:exit, reason} ->
+          raise "Query fetching address transactions terminated: #{inspect(reason)}"
+
+        nil ->
+          raise "Query fetching address transactions timed out."
+      end
+    end)
+  end
+
+  defp compare_custom_sorting([{order, :value}]) do
+    fn a, b ->
+      case Decimal.compare(Wei.to(a.value, :wei), Wei.to(b.value, :wei)) do
+        :eq -> compare_default_sorting(a, b)
+        :gt -> order == :desc
+        :lt -> order == :asc
+      end
+    end
+  end
+
+  defp compare_custom_sorting([{:dynamic, :fee, order, _dynamic_fee}]) do
+    fn a, b ->
+      case Decimal.compare(a |> Chain.fee(:wei) |> elem(1), b |> Chain.fee(:wei) |> elem(1)) do
+        :eq -> compare_default_sorting(a, b)
+        :gt -> order == :desc
+        :lt -> order == :asc
+      end
+    end
+  end
+
+  defp compare_custom_sorting([]), do: &compare_default_sorting/2
+
+  defp compare_default_sorting(a, b) do
+    case {
+      compare(a.block_number, b.block_number),
+      compare(a.index, b.index),
+      DateTime.compare(a.inserted_at, b.inserted_at),
+      compare(Hash.to_integer(a.hash), Hash.to_integer(b.hash))
+    } do
+      {:lt, _, _, _} -> false
+      {:eq, :lt, _, _} -> false
+      {:eq, :eq, :lt, _} -> false
+      {:eq, :eq, :eq, :gt} -> false
+      _ -> true
+    end
+  end
+
+  defp compare(a, b) do
+    cond do
+      a < b -> :lt
+      a > b -> :gt
+      true -> :eq
+    end
+  end
+
+  @doc """
+  Creates a query to fetch transactions taking into account paging_options (possibly nil),
+  from_block (may be nil), to_block (may be nil) and boolean `with_pending?` that indicates if pending transactions should be included
+  into the query.
+  """
+  @spec fetch_transactions(PagingOptions.t() | nil, non_neg_integer | nil, non_neg_integer | nil, boolean()) ::
+          Ecto.Query.t()
+  def fetch_transactions(paging_options \\ nil, from_block \\ nil, to_block \\ nil, with_pending? \\ false) do
+    __MODULE__
+    |> order_for_transactions(with_pending?)
+    |> Chain.where_block_number_in_period(from_block, to_block)
+    |> handle_paging_options(paging_options)
+  end
+
+  @default_sorting [
+    desc: :block_number,
+    desc: :index,
+    desc: :inserted_at,
+    asc: :hash
+  ]
+
+  @doc """
+  Creates a query to fetch transactions taking into account paging_options (possibly nil),
+  from_block (may be nil), to_block (may be nil) and sorting_params.
+  """
+  @spec fetch_transactions_with_custom_sorting(
+          PagingOptions.t() | nil,
+          non_neg_integer | nil,
+          non_neg_integer | nil,
+          SortingHelper.sorting_params()
+        ) :: Ecto.Query.t()
+  def fetch_transactions_with_custom_sorting(paging_options, from_block, to_block, sorting) do
+    query = from(transaction in __MODULE__)
+
+    query
+    |> Chain.where_block_number_in_period(from_block, to_block)
+    |> SortingHelper.apply_sorting(sorting, @default_sorting)
+    |> SortingHelper.page_with_sorting(paging_options, sorting, @default_sorting)
+  end
+
+  defp order_for_transactions(query, true) do
+    query
+    |> order_by([transaction],
+      desc: transaction.block_number,
+      desc: transaction.index,
+      desc: transaction.inserted_at,
+      asc: transaction.hash
+    )
+  end
+
+  defp order_for_transactions(query, _) do
+    query
+    |> order_by([transaction], desc: transaction.block_number, desc: transaction.index)
+  end
+
+  @doc """
+  Updates the provided query with necessary `where`s and `limit`s to take into account paging_options (may be nil).
+  """
+  @spec handle_paging_options(Ecto.Query.t() | atom, nil | Explorer.PagingOptions.t()) :: Ecto.Query.t()
+  def handle_paging_options(query, nil), do: query
+
+  def handle_paging_options(query, %PagingOptions{key: nil, page_size: nil}), do: query
+
+  def handle_paging_options(query, paging_options) do
+    query
+    |> page_transaction(paging_options)
+    |> limit(^paging_options.page_size)
+  end
+
+  @doc """
+  Updates the provided query with necessary `where`s to take into account paging_options.
+  """
+  @spec page_transaction(Ecto.Query.t() | atom, Explorer.PagingOptions.t()) :: Ecto.Query.t()
+  def page_transaction(query, %PagingOptions{key: nil}), do: query
+
+  def page_transaction(query, %PagingOptions{is_pending_tx: true} = options),
+    do: page_pending_transaction(query, options)
+
+  def page_transaction(query, %PagingOptions{key: {block_number, index}, is_index_in_asc_order: true}) do
+    where(
+      query,
+      [transaction],
+      transaction.block_number < ^block_number or
+        (transaction.block_number == ^block_number and transaction.index > ^index)
+    )
+  end
+
+  def page_transaction(query, %PagingOptions{key: {block_number, index}}) do
+    where(
+      query,
+      [transaction],
+      transaction.block_number < ^block_number or
+        (transaction.block_number == ^block_number and transaction.index < ^index)
+    )
+  end
+
+  def page_transaction(query, %PagingOptions{key: {index}}) do
+    where(query, [transaction], transaction.index < ^index)
+  end
+
+  @doc """
+  Updates the provided query with necessary `where`s to take into account paging_options.
+  """
+  @spec page_pending_transaction(Ecto.Query.t() | atom, Explorer.PagingOptions.t()) :: Ecto.Query.t()
+  def page_pending_transaction(query, %PagingOptions{key: nil}), do: query
+
+  def page_pending_transaction(query, %PagingOptions{key: {inserted_at, hash}}) do
+    where(
+      query,
+      [transaction],
+      (is_nil(transaction.block_number) and
+         (transaction.inserted_at < ^inserted_at or
+            (transaction.inserted_at == ^inserted_at and transaction.hash > ^hash))) or
+        not is_nil(transaction.block_number)
+    )
+  end
+
+  @doc """
+  Adds a `has_token_transfers` field to the query via `select_merge` if second argument is `true` and returns
+  the query untouched otherwise.
+  """
+  @spec put_has_token_transfers_to_tx(Ecto.Query.t() | atom, boolean) :: Ecto.Query.t()
+  def put_has_token_transfers_to_tx(query, true), do: query
+
+  def put_has_token_transfers_to_tx(query, false) do
+    from(tx in query,
+      select_merge: %{
+        has_token_transfers:
+          fragment(
+            "(SELECT transaction_hash FROM token_transfers WHERE transaction_hash = ? LIMIT 1) IS NOT NULL",
+            tx.hash
+          )
+      }
+    )
+  end
+
+  @doc """
+  Return the dynamic that calculates the fee for transactions.
+  """
+  @spec dynamic_fee :: struct()
+  def dynamic_fee do
+    dynamic([tx], tx.gas_price * fragment("COALESCE(?, ?)", tx.gas_used, tx.gas))
+  end
+
+  @doc """
+  Returns next page params based on the provided transaction.
+  """
+  @spec address_transactions_next_page_params(Explorer.Chain.Transaction.t()) :: %{
+          required(String.t()) => Decimal.t() | Wei.t() | non_neg_integer | DateTime.t() | Hash.t()
+        }
+  def address_transactions_next_page_params(
+        %__MODULE__{block_number: block_number, index: index, inserted_at: inserted_at, hash: hash, value: value} = tx
+      ) do
+    %{
+      "fee" => tx |> Chain.fee(:wei) |> elem(1),
+      "value" => value,
+      "block_number" => block_number,
+      "index" => index,
+      "inserted_at" => inserted_at,
+      "hash" => hash
+    }
+  end
 end
diff --git a/apps/explorer/lib/explorer/sorting_helper.ex b/apps/explorer/lib/explorer/sorting_helper.ex
new file mode 100644
index 000000000000..f6a478d85d78
--- /dev/null
+++ b/apps/explorer/lib/explorer/sorting_helper.ex
@@ -0,0 +1,168 @@
+defmodule Explorer.SortingHelper do
+  @moduledoc """
+  Module that order and paginate queries dynamically based on default and provided sorting parameters.
+  Example of sorting parameters:
+  ```
+  [{:asc, :fetched_coin_balance, :address}, {:dynamic, :contract_code_size, :desc, dynamic([t], fragment(LENGTH(?), t.contract_source_code))}, desc: :id]
+  ```
+  First list entry specify joined address table column as a column to order by and paginate, second entry
+  specifies name of a key in paging_options and arbitrary dynamic that will be used in ordering and pagination,
+  third entry specifies own column name to order by and paginate.
+  """
+  require Explorer.SortingHelper
+
+  alias Explorer.PagingOptions
+
+  import Ecto.Query
+
+  @typep ordering :: :asc | :asc_nulls_first | :asc_nulls_last | :desc | :desc_nulls_first | :desc_nulls_last
+  @typep column :: atom
+  @typep binding :: atom
+  @type sorting_params :: [
+          {ordering, column} | {ordering, column, binding} | {:dynamic, column, ordering, Ecto.Query.dynamic_expr()}
+        ]
+
+  @doc """
+  Applies sorting to query based on default sorting params and sorting params from the client,
+  these params merged keeping provided one over default one.
+  """
+  @spec apply_sorting(Ecto.Query.t(), sorting_params, sorting_params) :: Ecto.Query.t()
+  def apply_sorting(query, sorting, default_sorting) when is_list(sorting) and is_list(default_sorting) do
+    sorting |> merge_sorting_params_with_defaults(default_sorting) |> sorting_params_to_order_by(query)
+  end
+
+  defp merge_sorting_params_with_defaults([], default_sorting) when is_list(default_sorting), do: default_sorting
+
+  defp merge_sorting_params_with_defaults(sorting, default_sorting)
+       when is_list(sorting) and is_list(default_sorting) do
+    (sorting ++ default_sorting)
+    |> Enum.uniq_by(fn
+      {_, field} -> field
+      {_, field, as} -> {field, as}
+      {:dynamic, key_name, _, _} -> key_name
+    end)
+  end
+
+  defp sorting_params_to_order_by(sorting_params, query) do
+    sorting_params
+    |> Enum.reduce(query, fn
+      {:dynamic, _key_name, order, dynamic}, query -> query |> order_by(^[{order, dynamic}])
+      {order, column, binding}, query -> query |> order_by([{^order, field(as(^binding), ^column)}])
+      {order, column}, query -> query |> order_by(^[{order, column}])
+    end)
+  end
+
+  @doc """
+  Page the query based on paging options, default sorting params and sorting params from the client,
+  these params merged keeping provided one over default one.
+  """
+  @spec page_with_sorting(Ecto.Query.t(), PagingOptions.t(), sorting_params, sorting_params) :: Ecto.Query.t()
+  def page_with_sorting(query, %PagingOptions{key: key, page_size: page_size}, sorting, default_sorting)
+      when not is_nil(key) do
+    sorting
+    |> merge_sorting_params_with_defaults(default_sorting)
+    |> do_page_with_sorting()
+    |> case do
+      nil -> query
+      dynamic_where -> query |> where(^dynamic_where.(key))
+    end
+    |> limit_query(page_size)
+  end
+
+  def page_with_sorting(query, %PagingOptions{page_size: page_size}, _sorting, _default_sorting) do
+    query |> limit_query(page_size)
+  end
+
+  def page_with_sorting(query, _, _sorting, _default_sorting), do: query
+
+  defp limit_query(query, limit) when is_integer(limit), do: query |> limit(^limit)
+  defp limit_query(query, _), do: query
+
+  defp do_page_with_sorting([{order, column} | rest]) do
+    fn key -> page_by_column(key, column, order, do_page_with_sorting(rest)) end
+  end
+
+  defp do_page_with_sorting([{:dynamic, key_name, order, dynamic} | rest]) do
+    fn key -> page_by_column(key, {:dynamic, key_name, dynamic}, order, do_page_with_sorting(rest)) end
+  end
+
+  defp do_page_with_sorting([{order, column, binding} | rest]) do
+    fn key -> page_by_column(key, {column, binding}, order, do_page_with_sorting(rest)) end
+  end
+
+  defp do_page_with_sorting([]), do: nil
+
+  for {key_name, pattern, ecto_value} <- [
+        {quote(do: key_name), quote(do: {:dynamic, key_name, dynamic}), quote(do: ^dynamic)},
+        {quote(do: column), quote(do: {column, binding}), quote(do: field(as(^binding), ^column))},
+        {quote(do: column), quote(do: column), quote(do: field(t, ^column))}
+      ] do
+    defp page_by_column(key, unquote(pattern), :desc_nulls_last, next_column) do
+      case key[unquote(key_name)] do
+        nil ->
+          dynamic([t], is_nil(unquote(ecto_value)) and ^apply_next_column(next_column, key))
+
+        value ->
+          dynamic(
+            [t],
+            is_nil(unquote(ecto_value)) or unquote(ecto_value) < ^value or
+              (unquote(ecto_value) == ^value and ^apply_next_column(next_column, key))
+          )
+      end
+    end
+
+    defp page_by_column(key, unquote(pattern), :asc_nulls_first, next_column) do
+      case key[unquote(key_name)] do
+        nil ->
+          dynamic([t], not is_nil(unquote(ecto_value)) or ^apply_next_column(next_column, key))
+
+        value ->
+          dynamic(
+            [t],
+            not is_nil(unquote(ecto_value)) and
+              (unquote(ecto_value) > ^value or
+                 (unquote(ecto_value) == ^value and ^apply_next_column(next_column, key)))
+          )
+      end
+    end
+
+    defp page_by_column(key, unquote(pattern), order, next_column) when order in ~w(asc asc_nulls_last)a do
+      case key[unquote(key_name)] do
+        nil ->
+          dynamic([t], is_nil(unquote(ecto_value)) and ^apply_next_column(next_column, key))
+
+        value ->
+          dynamic(
+            [t],
+            is_nil(unquote(ecto_value)) or
+              (unquote(ecto_value) > ^value or
+                 (unquote(ecto_value) == ^value and ^apply_next_column(next_column, key)))
+          )
+      end
+    end
+
+    defp page_by_column(key, unquote(pattern), order, next_column)
+         when order in ~w(desc desc_nulls_first)a do
+      case key[unquote(key_name)] do
+        nil ->
+          dynamic([t], not is_nil(unquote(ecto_value)) or ^apply_next_column(next_column, key))
+
+        value ->
+          dynamic(
+            [t],
+            not is_nil(unquote(ecto_value)) and
+              (unquote(ecto_value) < ^value or
+                 (unquote(ecto_value) == ^value and ^apply_next_column(next_column, key)))
+          )
+      end
+    end
+  end
+
+  defp apply_next_column(nil, _key) do
+    false
+  end
+
+  defp apply_next_column(next_column, key) do
+    next_column.(key)
+  end
+end
diff --git a/apps/explorer/test/explorer/chain/smart_contract_test.exs b/apps/explorer/test/explorer/chain/smart_contract_test.exs
index 030601f64634..8bd0b1e5818a 100644
--- a/apps/explorer/test/explorer/chain/smart_contract_test.exs
+++ b/apps/explorer/test/explorer/chain/smart_contract_test.exs
@@ -2,8 +2,9 @@ defmodule Explorer.Chain.SmartContractTest do
   use Explorer.DataCase, async: false
 
   import Mox
-  alias Explorer.Chain
+  alias Explorer.{Chain, PagingOptions}
   alias Explorer.Chain.{Address, SmartContract}
+  alias Explorer.Chain.Hash
   alias Explorer.Chain.SmartContract.Proxy
 
   doctest Explorer.Chain.SmartContract
@@ -265,14 +266,6 @@ defmodule Explorer.Chain.SmartContractTest do
     end
   end
 
-  describe "address_hash_to_smart_contract/1" do
-    test "fetches a smart contract" do
-      smart_contract = insert(:smart_contract, contract_code_md5: "123")
-
-      assert ^smart_contract = SmartContract.address_hash_to_smart_contract(smart_contract.address_hash)
-    end
-  end
-
   def get_eip1967_implementation_zero_addresses do
     mock_empty_logic_storage_pointer_request()
     |> mock_empty_beacon_storage_pointer_request()
diff --git a/apps/explorer/test/explorer/chain/transaction_test.exs b/apps/explorer/test/explorer/chain/transaction_test.exs
index d204d2822325..6656cf4277ba 100644
--- a/apps/explorer/test/explorer/chain/transaction_test.exs
+++ b/apps/explorer/test/explorer/chain/transaction_test.exs
@@ -4,10 +4,13 @@ defmodule Explorer.Chain.TransactionTest do
   import Mox
 
   alias Ecto.Changeset
-  alias Explorer.Chain.Transaction
+  alias Explorer.Chain.{Address, InternalTransaction, Transaction}
+  alias Explorer.PagingOptions
 
   doctest Transaction
 
+  setup :set_mox_global
+
   setup :verify_on_exit!
 
   describe "changeset/2" do
@@ -311,6 +314,954 @@ defmodule Explorer.Chain.TransactionTest do
     end
   end
 
+  describe "address_to_transactions_tasks_range_of_blocks/2" do
+    test "returns empty extremums if no transactions" do
+      address = insert(:address)
+
+      extremums = Transaction.address_to_transactions_tasks_range_of_blocks(address.hash, [])
+
+      assert extremums == %{
+               :min_block_number => nil,
+               :max_block_number => 0
+             }
+    end
+
+    test "returns correct extremums for from_address" do
+      address = insert(:address)
+
+      :transaction
+      |> insert(from_address: address)
+      |> with_block(insert(:block, number: 1000))
+
+      extremums = Transaction.address_to_transactions_tasks_range_of_blocks(address.hash, [])
+
+      assert extremums == %{
+               :min_block_number => 1000,
+               :max_block_number => 1000
+             }
+    end
+
+    test "returns correct extremums for to_address" do
+      address = insert(:address)
+
+      :transaction
+      |> insert(to_address: address)
+      |> with_block(insert(:block, number: 1000))
+
+      extremums = Transaction.address_to_transactions_tasks_range_of_blocks(address.hash, [])
+
+      assert extremums == %{
+               :min_block_number => 1000,
+               :max_block_number => 1000
+             }
+    end
+
+    test "returns correct extremums for created_contract_address" do
+      address = insert(:address)
+
+      :transaction
+      |> insert(created_contract_address: address)
+      |> with_block(insert(:block, number: 1000))
+
+      extremums = Transaction.address_to_transactions_tasks_range_of_blocks(address.hash, [])
+
+      assert extremums == %{
+               :min_block_number => 1000,
+               :max_block_number => 1000
+             }
+    end
+
+    test "returns correct extremums for multiple number of transactions" do
+      address = insert(:address)
+
+      :transaction
+      |> insert(created_contract_address: address)
+      |> with_block(insert(:block, number: 1000))
+
+      :transaction
+      |> insert(created_contract_address: address)
+      |> with_block(insert(:block, number: 999))
+
+      :transaction
+      |> insert(created_contract_address: address)
+      |> with_block(insert(:block, number: 1003))
+
+      :transaction
+      |> insert(from_address: address)
+      |> with_block(insert(:block, number: 1001))
+
+      :transaction
+      |> insert(from_address: address)
+      |> with_block(insert(:block, number: 1004))
+
+      :transaction
+      |> insert(to_address: address)
+      |> with_block(insert(:block, number: 1002))
+
+      :transaction
+      |> insert(to_address: address)
+      |> with_block(insert(:block, number: 998))
+
+      extremums = Transaction.address_to_transactions_tasks_range_of_blocks(address.hash, [])
+
+      assert extremums == %{
+               :min_block_number => 998,
+               :max_block_number => 1004
+             }
+    end
+  end
+
+  describe "address_to_transactions_with_rewards/2" do
+    test "without transactions" do
+      %Address{hash: address_hash} = insert(:address)
+
+      assert Repo.aggregate(Transaction, :count, :hash) == 0
+
+      assert [] == Transaction.address_to_transactions_with_rewards(address_hash)
+    end
+
+    test "with from transactions" do
+      %Address{hash: address_hash} = address = insert(:address)
+
+      transaction =
+        :transaction
+        |> insert(from_address: address)
+        |> with_block()
+
+      assert [transaction] ==
+               Transaction.address_to_transactions_with_rewards(address_hash, direction: :from)
+               |> Repo.preload([:block, :to_address, :from_address])
+    end
+
+    test "with to transactions" do
+      %Address{hash: address_hash} = address = insert(:address)
+
+      transaction =
+        :transaction
+        |> insert(to_address: address)
+        |> with_block()
+
+      assert [transaction] ==
+               Transaction.address_to_transactions_with_rewards(address_hash, direction: :to)
+               |> Repo.preload([:block, :to_address, :from_address])
+    end
+
+    test "with to and from transactions and direction: :from" do
+      %Address{hash: address_hash} = address = insert(:address)
+
+      transaction =
+        :transaction
+        |> insert(from_address: address)
+        |> with_block()
+
+      # only contains "from" transaction
+      assert [transaction] ==
+               Transaction.address_to_transactions_with_rewards(address_hash, direction: :from)
+               |> Repo.preload([:block, :to_address, :from_address])
+    end
+
+    test "with to and from transactions and direction: :to" do
+      %Address{hash: address_hash} = address = insert(:address)
+
+      transaction =
+        :transaction
+        |> insert(to_address: address)
+        |> with_block()
+
+      assert [transaction] ==
+               Transaction.address_to_transactions_with_rewards(address_hash, direction: :to)
+               |> Repo.preload([:block, :to_address, :from_address])
+    end
+
+    test "with to and from transactions and no :direction option" do
+      %Address{hash: address_hash} = address = insert(:address)
+      block = insert(:block)
+
+      transaction1 =
+        :transaction
+        |> insert(to_address: address)
+        |> with_block(block)
+
+      transaction2 =
+        :transaction
+        |> insert(from_address: address)
+        |> with_block(block)
+
+      assert [transaction2, transaction1] ==
+               Transaction.address_to_transactions_with_rewards(address_hash)
+               |> Repo.preload([:block, :to_address, :from_address])
+    end
+
+    test "does not include non-contract-creation parent transactions" do
+      transaction =
+        %Transaction{} =
+        :transaction
+        |> insert()
+        |> with_block()
+
+      %InternalTransaction{created_contract_address: address} =
+        insert(:internal_transaction_create,
+          transaction: transaction,
+          index: 0,
+          block_number: transaction.block_number,
+          block_hash: transaction.block_hash,
+          block_index: 0,
+          transaction_index: transaction.index
+        )
+
+      assert [] == Transaction.address_to_transactions_with_rewards(address.hash)
+    end
+
+    test "returns transactions that have token transfers for the given to_address" do
+      %Address{hash: address_hash} = address = insert(:address)
+
+      transaction =
+        :transaction
+        |> insert(to_address: address, to_address_hash: address.hash)
+        |> with_block()
+
+      insert(
+        :token_transfer,
+        to_address: address,
+        transaction: transaction
+      )
+
+      assert [transaction.hash] ==
+               Transaction.address_to_transactions_with_rewards(address_hash)
+               |> Enum.map(& &1.hash)
+    end
+
+    test "with transactions can be paginated" do
+      %Address{hash: address_hash} = address = insert(:address)
+
+      second_page_hashes =
+        2
+        |> insert_list(:transaction, from_address: address)
+        |> with_block()
+        |> Enum.map(& &1.hash)
+
+      %Transaction{block_number: block_number, index: index} =
+        :transaction
+        |> insert(from_address: address)
+        |> with_block()
+
+      assert second_page_hashes ==
+               address_hash
+               |> Transaction.address_to_transactions_with_rewards(
+                 paging_options: %PagingOptions{
+                   key: {block_number, index},
+                   page_size: 2
+                 }
+               )
+               |> Enum.map(& &1.hash)
+               |> Enum.reverse()
+    end
+
+    test "returns results in reverse chronological order by block number and transaction index" do
+      %Address{hash: address_hash} = address = insert(:address)
+
+      a_block = insert(:block, number: 6000)
+
+      %Transaction{hash: first} =
+        :transaction
+        |> insert(to_address: address)
+        |> with_block(a_block)
+
+      %Transaction{hash: second} =
+        :transaction
+        |> insert(to_address: address)
+        |> with_block(a_block)
+
+      %Transaction{hash: third} =
+        :transaction
+        |> insert(to_address: address)
+        |> with_block(a_block)
+
+      %Transaction{hash: fourth} =
+        :transaction
+        |> insert(to_address: address)
+        |> with_block(a_block)
+
+      b_block = insert(:block, number: 2000)
+
+      %Transaction{hash: fifth} =
+        :transaction
+        |> insert(to_address: address)
+        |> with_block(b_block)
+
+      %Transaction{hash: sixth} =
+        :transaction
+        |> insert(to_address: address)
+        |> with_block(b_block)
+
+      result =
+        address_hash
+        |> Transaction.address_to_transactions_with_rewards()
+        |> Enum.map(& &1.hash)
+
+      assert [fourth, third, second, first, sixth, fifth] == result
+    end
+
+    test "with emission rewards" do
+      Application.put_env(:block_scout_web, BlockScoutWeb.Chain, has_emission_funds: true)
+
+      Application.put_env(:explorer, Explorer.Chain.Block.Reward,
+        validators_contract_address: "0x0000000000000000000000000000000000000005",
+        keys_manager_contract_address: "0x0000000000000000000000000000000000000006"
+      )
+
+      consumer_pid = start_supervised!(Explorer.Chain.Fetcher.FetchValidatorInfoOnDemand)
+      :erlang.trace(consumer_pid, true, [:receive])
+
+      block = insert(:block)
+
+      block_miner_hash_string = Base.encode16(block.miner_hash.bytes, case: :lower)
+      block_miner_hash = block.miner_hash
+
+      insert(
+        :reward,
+        address_hash: block.miner_hash,
+        block_hash: block.hash,
+        address_type: :validator
+      )
+
+      insert(
+        :reward,
+        address_hash: block.miner_hash,
+        block_hash: block.hash,
+        address_type: :emission_funds
+      )
+
+      # isValidator => true
+      expect(
+        EthereumJSONRPC.Mox,
+        :json_rpc,
+        fn [%{id: id, method: _, params: [%{data: _, to: _}, _]}], _options ->
+          {:ok,
+           [%{id: id, jsonrpc: "2.0", result: "0x0000000000000000000000000000000000000000000000000000000000000001"}]}
+        end
+      )
+
+      # getPayoutByMining => 0x0000000000000000000000000000000000000001
+      expect(
+        EthereumJSONRPC.Mox,
+        :json_rpc,
+        fn [%{id: id, method: _, params: [%{data: _, to: _}, _]}], _options ->
+          {:ok, [%{id: id, result: "0x000000000000000000000000" <> block_miner_hash_string}]}
+        end
+      )
+
+      res = Transaction.address_to_transactions_with_rewards(block.miner.hash)
+      assert [{_, _}] = res
+
+      assert_receive {:trace, ^consumer_pid, :receive, {:"$gen_cast", {:fetch_or_update, ^block_miner_hash}}}, 1000
+      :timer.sleep(500)
+
+      on_exit(fn ->
+        Application.put_env(:block_scout_web, BlockScoutWeb.Chain, has_emission_funds: false)
+
+        Application.put_env(:explorer, Explorer.Chain.Block.Reward,
+          validators_contract_address: nil,
+          keys_manager_contract_address: nil
+        )
+      end)
+    end
+
+    test "with emission rewards and transactions" do
+      Application.put_env(:block_scout_web, BlockScoutWeb.Chain, has_emission_funds: true)
+
+      Application.put_env(:explorer, Explorer.Chain.Block.Reward,
+        validators_contract_address: "0x0000000000000000000000000000000000000005",
+        keys_manager_contract_address: "0x0000000000000000000000000000000000000006"
+      )
+
+      consumer_pid = start_supervised!(Explorer.Chain.Fetcher.FetchValidatorInfoOnDemand)
+      :erlang.trace(consumer_pid, true, [:receive])
+
+      block = insert(:block)
+
+      block_miner_hash_string = Base.encode16(block.miner_hash.bytes, case: :lower)
+      block_miner_hash = block.miner_hash
+
+      insert(
+        :reward,
+        address_hash: block.miner_hash,
+        block_hash: block.hash,
+        address_type: :validator
+      )
+
+      insert(
+        :reward,
+        address_hash: block.miner_hash,
+        block_hash: block.hash,
+        address_type: :emission_funds
+      )
+
+      :transaction
+      |> insert(to_address: block.miner)
+      |> with_block(block)
+      |> Repo.preload(:token_transfers)
+
+      # isValidator => true
+      expect(
+        EthereumJSONRPC.Mox,
+        :json_rpc,
+        fn [%{id: id, method: _, params: [%{data: _, to: _}, _]}], _options ->
+          {:ok,
+           [%{id: id, jsonrpc: "2.0", result: "0x0000000000000000000000000000000000000000000000000000000000000001"}]}
+        end
+      )
+
+      # getPayoutByMining => 0x0000000000000000000000000000000000000001
+      expect(
+        EthereumJSONRPC.Mox,
+        :json_rpc,
+        fn [%{id: id, method: _, params: [%{data: _, to: _}, _]}], _options ->
+          {:ok, [%{id: id, result: "0x000000000000000000000000" <> block_miner_hash_string}]}
+        end
+      )
+
+      assert [_, {_, _}] = Transaction.address_to_transactions_with_rewards(block.miner.hash, direction: :to)
+
+      assert_receive {:trace, ^consumer_pid, :receive, {:"$gen_cast", {:fetch_or_update, ^block_miner_hash}}}, 1000
+      :timer.sleep(500)
+
+      on_exit(fn ->
+        Application.put_env(:block_scout_web, BlockScoutWeb.Chain, has_emission_funds: false)
+
+        Application.put_env(:explorer, Explorer.Chain.Block.Reward,
+          validators_contract_address: nil,
+          keys_manager_contract_address: nil
+        )
+      end)
+    end
+
+    test "with transactions if rewards are not in the range of blocks" do
+      Application.put_env(:block_scout_web, BlockScoutWeb.Chain, has_emission_funds: true)
+
+      block = insert(:block)
+
+      insert(
+        :reward,
+        address_hash: block.miner_hash,
+        block_hash: block.hash,
+        address_type: :validator
+      )
+
+      insert(
+        :reward,
+        address_hash: block.miner_hash,
+        block_hash: block.hash,
+        address_type: :emission_funds
+      )
+
+      :transaction
+      |> insert(from_address: block.miner)
+      |> with_block()
+      |> Repo.preload(:token_transfers)
+
+      assert [_] = Transaction.address_to_transactions_with_rewards(block.miner.hash, direction: :from)
+
+      Application.put_env(:block_scout_web, BlockScoutWeb.Chain, has_emission_funds: false)
+    end
+
+    test "with emissions rewards, but feature disabled" do
+      Application.put_env(:block_scout_web, BlockScoutWeb.Chain, has_emission_funds: false)
+
+      block = insert(:block)
+
+      insert(
+        :reward,
+        address_hash: block.miner_hash,
+        block_hash: block.hash,
+        address_type: :validator
+      )
+
+      insert(
+        :reward,
+        address_hash: block.miner_hash,
+        block_hash: block.hash,
+        address_type: :emission_funds
+      )
+
+      assert [] == Transaction.address_to_transactions_with_rewards(block.miner.hash)
+    end
+  end
+
+  describe "address_to_transactions_tasks_range_of_blocks/2" do
+    test "returns empty extremums if no transactions" do
+      address = insert(:address)
+
+      extremums = Transaction.address_to_transactions_tasks_range_of_blocks(address.hash, [])
+
+      assert extremums == %{
+               :min_block_number => nil,
+               :max_block_number => 0
+             }
+    end
+
+    test "returns correct extremums for from_address" do
+      address = insert(:address)
+
+      :transaction
+      |> insert(from_address: address)
+      |> with_block(insert(:block, number: 1000))
+
+      extremums = Transaction.address_to_transactions_tasks_range_of_blocks(address.hash, [])
+
+      assert extremums == %{
+               :min_block_number => 1000,
+               :max_block_number => 1000
+             }
+    end
+
+    test "returns correct extremums for to_address" do
+      address = insert(:address)
+
+      :transaction
+      |> insert(to_address: address)
+      |> with_block(insert(:block, number: 1000))
+
+      extremums = Transaction.address_to_transactions_tasks_range_of_blocks(address.hash, [])
+
+      assert extremums == %{
+               :min_block_number => 1000,
+               :max_block_number => 1000
+             }
+    end
+
+    test "returns correct extremums for created_contract_address" do
+      address = insert(:address)
+
+      :transaction
+      |> insert(created_contract_address: address)
+      |> with_block(insert(:block, number: 1000))
+
+      extremums = Transaction.address_to_transactions_tasks_range_of_blocks(address.hash, [])
+
+      assert extremums == %{
+               :min_block_number => 1000,
+               :max_block_number => 1000
+             }
+    end
+
+    test "returns correct extremums for multiple number of transactions" do
+      address = insert(:address)
+
+      :transaction
+      |> insert(created_contract_address: address)
+      |> with_block(insert(:block, number: 1000))
+
+      :transaction
+      |> insert(created_contract_address: address)
+      |> with_block(insert(:block, number: 999))
+
+      :transaction
+      |> insert(created_contract_address: address)
+      |> with_block(insert(:block, number: 1003))
+
+      :transaction
+      |> insert(from_address: address)
+      |> with_block(insert(:block, number: 1001))
+
+      :transaction
+      |> insert(from_address: address)
+      |> with_block(insert(:block, number: 1004))
+
+      :transaction
+      |> insert(to_address: address)
+      |> with_block(insert(:block, number: 1002))
+
+      :transaction
+      |> insert(to_address: address)
+      |> with_block(insert(:block, number: 998))
+
+      extremums = Transaction.address_to_transactions_tasks_range_of_blocks(address.hash, [])
+
+      assert extremums == %{
+               :min_block_number => 998,
+               :max_block_number => 1004
+             }
+    end
+  end
+
+  describe "address_to_transactions_with_rewards/2" do
+    test "without transactions" do
+      %Address{hash: address_hash} = insert(:address)
+
+      assert Repo.aggregate(Transaction, :count, :hash) == 0
+
+      assert [] == Transaction.address_to_transactions_with_rewards(address_hash)
+    end
+
+    test "with from transactions" do
+      %Address{hash: address_hash} = address = insert(:address)
+
+      transaction =
+        :transaction
+        |> insert(from_address: address)
+        |> with_block()
+
+      assert [transaction] ==
+               Transaction.address_to_transactions_with_rewards(address_hash, direction: :from)
+               |> Repo.preload([:block, :to_address, :from_address])
+    end
+
+    test "with to transactions" do
+      %Address{hash: address_hash} = address = insert(:address)
+
+      transaction =
+        :transaction
+        |> insert(to_address: address)
+        |> with_block()
+
+      assert [transaction] ==
+               Transaction.address_to_transactions_with_rewards(address_hash, direction: :to)
+               |> Repo.preload([:block, :to_address, :from_address])
+    end
+
+    test "with to and from transactions and direction: :from" do
+      %Address{hash: address_hash} = address = insert(:address)
+
+      transaction =
+        :transaction
+        |> insert(from_address: address)
+        |> with_block()
+
+      # only contains "from" transaction
+      assert [transaction] ==
+               Transaction.address_to_transactions_with_rewards(address_hash, direction: :from)
+               |> Repo.preload([:block, :to_address, :from_address])
+    end
+
+    test "with to and from transactions and direction: :to" do
+      %Address{hash: address_hash} = address = insert(:address)
+
+      transaction =
+        :transaction
+        |> insert(to_address: address)
+        |> with_block()
+
+      assert [transaction] ==
+               Transaction.address_to_transactions_with_rewards(address_hash, direction: :to)
+               |> Repo.preload([:block, :to_address, :from_address])
+    end
+
+    test "with to and from transactions and no :direction option" do
+      %Address{hash: address_hash} = address = insert(:address)
+      block = insert(:block)
+
+      transaction1 =
+        :transaction
+        |> insert(to_address: address)
+        |> with_block(block)
+
+      transaction2 =
+        :transaction
+        |> insert(from_address: address)
+        |> with_block(block)
+
+      assert [transaction2, transaction1] ==
+               Transaction.address_to_transactions_with_rewards(address_hash)
+               |> Repo.preload([:block, :to_address, :from_address])
+    end
+
+    test "does not include non-contract-creation parent transactions" do
+      transaction =
+        %Transaction{} =
+        :transaction
+        |> insert()
+        |> with_block()
+
+      %InternalTransaction{created_contract_address: address} =
+        insert(:internal_transaction_create,
+          transaction: transaction,
+          index: 0,
+          block_number: transaction.block_number,
+          block_hash: transaction.block_hash,
+          block_index: 0,
+          transaction_index: transaction.index
+        )
+
+      assert [] == Transaction.address_to_transactions_with_rewards(address.hash)
+    end
+
+    test "returns transactions that have token transfers for the given to_address" do
+      %Address{hash: address_hash} = address = insert(:address)
+
+      transaction =
+        :transaction
+        |> insert(to_address: address, to_address_hash: address.hash)
+        |> with_block()
+
+      insert(
+        :token_transfer,
+        to_address: address,
+        transaction: transaction
+      )
+
+      assert [transaction.hash] ==
+               Transaction.address_to_transactions_with_rewards(address_hash)
+               |> Enum.map(& &1.hash)
+    end
+
+    test "with transactions can be paginated" do
+      %Address{hash: address_hash} = address = insert(:address)
+
+      second_page_hashes =
+        2
+        |> insert_list(:transaction, from_address: address)
+        |> with_block()
+        |> Enum.map(& &1.hash)
+
+      %Transaction{block_number: block_number, index: index} =
+        :transaction
+        |> insert(from_address: address)
+        |> with_block()
+
+      assert second_page_hashes ==
+               address_hash
+               |> Transaction.address_to_transactions_with_rewards(
+                 paging_options: %PagingOptions{
+                   key: {block_number, index},
+                   page_size: 2
+                 }
+               )
+               |> Enum.map(& &1.hash)
+               |> Enum.reverse()
+    end
+
+    test "returns results in reverse chronological order by block number and transaction index" do
+      %Address{hash: address_hash} = address = insert(:address)
+
+      a_block = insert(:block, number: 6000)
+
+      %Transaction{hash: first} =
+        :transaction
+        |> insert(to_address: address)
+        |> with_block(a_block)
+
+      %Transaction{hash: second} =
+        :transaction
+        |> insert(to_address: address)
+        |> with_block(a_block)
+
+      %Transaction{hash: third} =
+        :transaction
+        |> insert(to_address: address)
+        |> with_block(a_block)
+
+      %Transaction{hash: fourth} =
+        :transaction
+        |> insert(to_address: address)
+        |> with_block(a_block)
+
+      b_block = insert(:block, number: 2000)
+
+      %Transaction{hash: fifth} =
+        :transaction
+        |> insert(to_address: address)
+        |> with_block(b_block)
+
+      %Transaction{hash: sixth} =
+        :transaction
+        |> insert(to_address: address)
+        |> with_block(b_block)
+
+      result =
+        address_hash
+        |> Transaction.address_to_transactions_with_rewards()
+        |> Enum.map(& &1.hash)
+
+      assert [fourth, third, second, first, sixth, fifth] == result
+    end
+
+    test "with emission rewards" do
+      Application.put_env(:block_scout_web, BlockScoutWeb.Chain, has_emission_funds: true)
+
+      Application.put_env(:explorer, Explorer.Chain.Block.Reward,
+        validators_contract_address: "0x0000000000000000000000000000000000000005",
+        keys_manager_contract_address: "0x0000000000000000000000000000000000000006"
+      )
+
+      consumer_pid = start_supervised!(Explorer.Chain.Fetcher.FetchValidatorInfoOnDemand)
+      :erlang.trace(consumer_pid, true, [:receive])
+
+      block = insert(:block)
+
+      block_miner_hash_string = Base.encode16(block.miner_hash.bytes, case: :lower)
+      block_miner_hash = block.miner_hash
+
+      insert(
+        :reward,
+        address_hash: block.miner_hash,
+        block_hash: block.hash,
+        address_type: :validator
+      )
+
+      insert(
+        :reward,
+        address_hash: block.miner_hash,
+        block_hash: block.hash,
+        address_type: :emission_funds
+      )
+
+      # isValidator => true
+      expect(
+        EthereumJSONRPC.Mox,
+        :json_rpc,
+        fn [%{id: id, method: _, params: [%{data: _, to: _}, _]}], _options ->
+          {:ok,
+           [%{id: id, jsonrpc: "2.0", result: "0x0000000000000000000000000000000000000000000000000000000000000001"}]}
+        end
+      )
+
+      # getPayoutByMining => 0x0000000000000000000000000000000000000001
+      expect(
+        EthereumJSONRPC.Mox,
+        :json_rpc,
+        fn [%{id: id, method: _, params: [%{data: _, to: _}, _]}], _options ->
+          {:ok, [%{id: id, result: "0x000000000000000000000000" <> block_miner_hash_string}]}
+        end
+      )
+
+      res = Transaction.address_to_transactions_with_rewards(block.miner.hash)
+      assert [{_, _}] = res
+
+      assert_receive {:trace, ^consumer_pid, :receive, {:"$gen_cast", {:fetch_or_update, ^block_miner_hash}}}, 1000
+      :timer.sleep(500)
+
+      on_exit(fn ->
+        Application.put_env(:block_scout_web, BlockScoutWeb.Chain, has_emission_funds: false)
+
+        Application.put_env(:explorer, Explorer.Chain.Block.Reward,
+          validators_contract_address: nil,
+          keys_manager_contract_address: nil
+        )
+      end)
+    end
+
+    test "with emission rewards and transactions" do
+      Application.put_env(:block_scout_web, BlockScoutWeb.Chain, has_emission_funds: true)
+
+      Application.put_env(:explorer, Explorer.Chain.Block.Reward,
+        validators_contract_address: "0x0000000000000000000000000000000000000005",
+        keys_manager_contract_address: "0x0000000000000000000000000000000000000006"
+      )
+
+      consumer_pid = start_supervised!(Explorer.Chain.Fetcher.FetchValidatorInfoOnDemand)
+      :erlang.trace(consumer_pid, true, [:receive])
+
+      block = insert(:block)
+
+      block_miner_hash_string = Base.encode16(block.miner_hash.bytes, case: :lower)
+      block_miner_hash = block.miner_hash
+
+      insert(
+        :reward,
+        address_hash: block.miner_hash,
+        block_hash: block.hash,
+        address_type: :validator
+      )
+
+      insert(
+        :reward,
+        address_hash: block.miner_hash,
+        block_hash: block.hash,
+        address_type: :emission_funds
+      )
+
+      :transaction
+      |> insert(to_address: block.miner)
+      |> with_block(block)
+      |> Repo.preload(:token_transfers)
+
+      # isValidator => true
+      expect(
+        EthereumJSONRPC.Mox,
+        :json_rpc,
+        fn [%{id: id, method: _, params: [%{data: _, to: _}, _]}], _options ->
+          {:ok,
+           [%{id: id, jsonrpc: "2.0", result: "0x0000000000000000000000000000000000000000000000000000000000000001"}]}
+        end
+      )
+
+      # getPayoutByMining => 0x0000000000000000000000000000000000000001
+      expect(
+        EthereumJSONRPC.Mox,
+        :json_rpc,
+        fn [%{id: id, method: _, params: [%{data: _, to: _}, _]}], _options ->
+          {:ok, [%{id: id, result: "0x000000000000000000000000" <> block_miner_hash_string}]}
+        end
+      )
+
+      assert [_, {_, _}] = Transaction.address_to_transactions_with_rewards(block.miner.hash, direction: :to)
+
+      assert_receive {:trace, ^consumer_pid, :receive, {:"$gen_cast", {:fetch_or_update, ^block_miner_hash}}}, 1000
+      :timer.sleep(500)
+
+      on_exit(fn ->
+        Application.put_env(:block_scout_web, BlockScoutWeb.Chain, has_emission_funds: false)
+
+        Application.put_env(:explorer, Explorer.Chain.Block.Reward,
+          validators_contract_address: nil,
+          keys_manager_contract_address: nil
+        )
+      end)
+    end
+
+    test "with transactions if rewards are not in the range of blocks" do
+      Application.put_env(:block_scout_web, BlockScoutWeb.Chain, has_emission_funds: true)
+
+      block = insert(:block)
+
+      insert(
+        :reward,
+        address_hash: block.miner_hash,
+        block_hash: block.hash,
+        address_type: :validator
+      )
+
+      insert(
+        :reward,
+        address_hash: block.miner_hash,
+        block_hash: block.hash,
+        address_type: :emission_funds
+      )
+
+      :transaction
+      |> insert(from_address: block.miner)
+      |> with_block()
+      |> Repo.preload(:token_transfers)
+
+      assert [_] = Transaction.address_to_transactions_with_rewards(block.miner.hash, direction: :from)
+
+      Application.put_env(:block_scout_web, BlockScoutWeb.Chain, has_emission_funds: false)
+    end
+
+    test "with emissions rewards, but feature disabled" do
+      Application.put_env(:block_scout_web, BlockScoutWeb.Chain, has_emission_funds: false)
+
+      block = insert(:block)
+
+      insert(
+        :reward,
+        address_hash: block.miner_hash,
+        block_hash: block.hash,
+        address_type: :validator
+      )
+
+      insert(
+        :reward,
+        address_hash: block.miner_hash,
+        block_hash: block.hash,
+        address_type: :emission_funds
+      )
+
+      assert [] == Transaction.address_to_transactions_with_rewards(block.miner.hash)
+    end
+  end
+
   # EIP-1967 + EIP-1822
   defp request_zero_implementations do
     EthereumJSONRPC.Mox
diff --git a/apps/explorer/test/explorer/chain_test.exs b/apps/explorer/test/explorer/chain_test.exs
index 96a787543a8c..492861338086 100644
--- a/apps/explorer/test/explorer/chain_test.exs
+++ b/apps/explorer/test/explorer/chain_test.exs
@@ -371,480 +371,6 @@ defmodule Explorer.ChainTest do
     end
   end
 
-  describe "address_to_transactions_with_rewards/2" do
-    test "without transactions" do
-      %Address{hash: address_hash} = insert(:address)
-
-      assert Repo.aggregate(Transaction, :count, :hash) == 0
-
-      assert [] == Chain.address_to_transactions_with_rewards(address_hash)
-    end
-
-    test "with from transactions" do
-      %Address{hash: address_hash} = address = insert(:address)
-
-      transaction =
-        :transaction
-        |> insert(from_address: address)
-        |> with_block()
-
-      assert [transaction] ==
-               Chain.address_to_transactions_with_rewards(address_hash, direction: :from)
-               |> Repo.preload([:block, :to_address, :from_address])
-    end
-
-    test "with to transactions" do
-      %Address{hash: address_hash} = address = insert(:address)
-
-      transaction =
-        :transaction
-        |> insert(to_address: address)
-        |> with_block()
-
-      assert [transaction] ==
-               Chain.address_to_transactions_with_rewards(address_hash, direction: :to)
-               |> Repo.preload([:block, :to_address, :from_address])
-    end
-
-    test "with to and from transactions and direction: :from" do
-      %Address{hash: address_hash} = address = insert(:address)
-
-      transaction =
-        :transaction
-        |> insert(from_address: address)
-        |> with_block()
-
-      # only contains "from" transaction
-      assert [transaction] ==
-               Chain.address_to_transactions_with_rewards(address_hash, direction: :from)
-               |> Repo.preload([:block, :to_address, :from_address])
-    end
-
-    test "with to and from transactions and direction: :to" do
-      %Address{hash: address_hash} = address = insert(:address)
-
-      transaction =
-        :transaction
-        |> insert(to_address: address)
-        |> with_block()
-
-      assert [transaction] ==
-               Chain.address_to_transactions_with_rewards(address_hash, direction: :to)
-               |> Repo.preload([:block, :to_address, :from_address])
-    end
-
-    test "with to and from transactions and no :direction option" do
-      %Address{hash: address_hash} = address = insert(:address)
-      block = insert(:block)
-
-      transaction1 =
-        :transaction
-        |> insert(to_address: address)
-        |> with_block(block)
-
-      transaction2 =
-        :transaction
-        |> insert(from_address: address)
-        |> with_block(block)
-
-      assert [transaction2, transaction1] ==
-               Chain.address_to_transactions_with_rewards(address_hash)
-               |> Repo.preload([:block, :to_address, :from_address])
-    end
-
-    test "does not include non-contract-creation parent transactions" do
-      transaction =
-        %Transaction{} =
-        :transaction
-        |> insert()
-        |> with_block()
-
-      %InternalTransaction{created_contract_address: address} =
-        insert(:internal_transaction_create,
-          transaction: transaction,
-          index: 0,
-          block_number: transaction.block_number,
-          block_hash: transaction.block_hash,
-          block_index: 0,
-          transaction_index: transaction.index
-        )
-
-      assert [] == Chain.address_to_transactions_with_rewards(address.hash)
-    end
-
-    test "returns transactions that have token transfers for the given to_address" do
-      %Address{hash: address_hash} = address = insert(:address)
-
-      transaction =
-        :transaction
-        |> insert(to_address: address, to_address_hash: address.hash)
-        |> with_block()
-
-      insert(
-        :token_transfer,
-        to_address: address,
-        transaction: transaction
-      )
-
-      assert [transaction.hash] ==
-               Chain.address_to_transactions_with_rewards(address_hash)
-               |> Enum.map(& &1.hash)
-    end
-
-    test "with transactions can be paginated" do
-      %Address{hash: address_hash} = address = insert(:address)
-
-      second_page_hashes =
-        2
-        |> insert_list(:transaction, from_address: address)
-        |> with_block()
-        |> Enum.map(& &1.hash)
-
-      %Transaction{block_number: block_number, index: index} =
-        :transaction
-        |> insert(from_address: address)
-        |> with_block()
-
-      assert second_page_hashes ==
-               address_hash
-               |> Chain.address_to_transactions_with_rewards(
-                 paging_options: %PagingOptions{
-                   key: {block_number, index},
-                   page_size: 2
-                 }
-               )
-               |> Enum.map(& &1.hash)
-               |> Enum.reverse()
-    end
-
-    test "returns results in reverse chronological order by block number and transaction index" do
-      %Address{hash: address_hash} = address = insert(:address)
-
-      a_block = insert(:block, number: 6000)
-
-      %Transaction{hash: first} =
-        :transaction
-        |> insert(to_address: address)
-        |> with_block(a_block)
-
-      %Transaction{hash: second} =
-        :transaction
-        |> insert(to_address: address)
-        |> with_block(a_block)
-
-      %Transaction{hash: third} =
-        :transaction
-        |> insert(to_address: address)
-        |> with_block(a_block)
-
-      %Transaction{hash: fourth} =
-        :transaction
-        |> insert(to_address: address)
-        |> with_block(a_block)
-
-      b_block = insert(:block, number: 2000)
-
-      %Transaction{hash: fifth} =
-        :transaction
-        |> insert(to_address: address)
-        |> with_block(b_block)
-
-      %Transaction{hash: sixth} =
-        :transaction
-        |> insert(to_address: address)
-        |> with_block(b_block)
-
-      result =
-        address_hash
-        |> Chain.address_to_transactions_with_rewards()
-        |> Enum.map(& &1.hash)
-
-      assert [fourth, third, second, first, sixth, fifth] == result
-    end
-
-    test "with emission rewards" do
-      Application.put_env(:block_scout_web, BlockScoutWeb.Chain, has_emission_funds: true)
-
-      Application.put_env(:explorer, Explorer.Chain.Block.Reward,
-        validators_contract_address: "0x0000000000000000000000000000000000000005",
-        keys_manager_contract_address: "0x0000000000000000000000000000000000000006"
-      )
-
-      consumer_pid = start_supervised!(Explorer.Chain.Fetcher.FetchValidatorInfoOnDemand)
-      :erlang.trace(consumer_pid, true, [:receive])
-
-      block = insert(:block)
-
-      block_miner_hash_string = Base.encode16(block.miner_hash.bytes, case: :lower)
-      block_miner_hash = block.miner_hash
-
-      insert(
-        :reward,
-        address_hash: block.miner_hash,
-        block_hash: block.hash,
-        address_type: :validator
-      )
-
-      insert(
-        :reward,
-        address_hash: block.miner_hash,
-        block_hash: block.hash,
-        address_type: :emission_funds
-      )
-
-      # isValidator => true
-      expect(
-        EthereumJSONRPC.Mox,
-        :json_rpc,
-        fn [%{id: id, method: _, params: [%{data: _, to: _}, _]}], _options ->
-          {:ok,
-           [%{id: id, jsonrpc: "2.0", result: "0x0000000000000000000000000000000000000000000000000000000000000001"}]}
-        end
-      )
-
-      # getPayoutByMining => 0x0000000000000000000000000000000000000001
-      expect(
-        EthereumJSONRPC.Mox,
-        :json_rpc,
-        fn [%{id: id, method: _, params: [%{data: _, to: _}, _]}], _options ->
-          {:ok, [%{id: id, result: "0x000000000000000000000000" <> block_miner_hash_string}]}
-        end
-      )
-
-      res = Chain.address_to_transactions_with_rewards(block.miner.hash)
-      assert [{_, _}] = res
-
-      assert_receive {:trace, ^consumer_pid, :receive, {:"$gen_cast", {:fetch_or_update, ^block_miner_hash}}}, 1000
-      :timer.sleep(500)
-
-      on_exit(fn ->
-        Application.put_env(:block_scout_web, BlockScoutWeb.Chain, has_emission_funds: false)
-
-        Application.put_env(:explorer, Explorer.Chain.Block.Reward,
-          validators_contract_address: nil,
-          keys_manager_contract_address: nil
-        )
-      end)
-    end
-
-    test "with emission rewards and transactions" do
-      Application.put_env(:block_scout_web, BlockScoutWeb.Chain, has_emission_funds: true)
-
-      Application.put_env(:explorer, Explorer.Chain.Block.Reward,
-        validators_contract_address: "0x0000000000000000000000000000000000000005",
-        keys_manager_contract_address: "0x0000000000000000000000000000000000000006"
-      )
-
-      consumer_pid = start_supervised!(Explorer.Chain.Fetcher.FetchValidatorInfoOnDemand)
-      :erlang.trace(consumer_pid, true, [:receive])
-
-      block = insert(:block)
-
-      block_miner_hash_string = Base.encode16(block.miner_hash.bytes, case: :lower)
-      block_miner_hash = block.miner_hash
-
-      insert(
-        :reward,
-        address_hash: block.miner_hash,
-        block_hash: block.hash,
-        address_type: :validator
-      )
-
-      insert(
-        :reward,
-        address_hash: block.miner_hash,
-        block_hash: block.hash,
-        address_type: :emission_funds
-      )
-
-      :transaction
-      |> insert(to_address: block.miner)
-      |> with_block(block)
-      |> Repo.preload(:token_transfers)
-
-      # isValidator => true
-      expect(
-        EthereumJSONRPC.Mox,
-        :json_rpc,
-        fn [%{id: id, method: _, params: [%{data: _, to: _}, _]}], _options ->
-          {:ok,
-           [%{id: id, jsonrpc: "2.0", result: "0x0000000000000000000000000000000000000000000000000000000000000001"}]}
-        end
-      )
-
-      # getPayoutByMining => 0x0000000000000000000000000000000000000001
-      expect(
-        EthereumJSONRPC.Mox,
-        :json_rpc,
-        fn [%{id: id, method: _, params: [%{data: _, to: _}, _]}], _options ->
-          {:ok, [%{id: id, result: "0x000000000000000000000000" <> block_miner_hash_string}]}
-        end
-      )
-
-      assert [_, {_, _}] = Chain.address_to_transactions_with_rewards(block.miner.hash, direction: :to)
-
-      assert_receive {:trace, ^consumer_pid, :receive, {:"$gen_cast", {:fetch_or_update, ^block_miner_hash}}}, 1000
-      :timer.sleep(500)
-
-      on_exit(fn ->
-        Application.put_env(:block_scout_web, BlockScoutWeb.Chain, has_emission_funds: false)
-
-        Application.put_env(:explorer, Explorer.Chain.Block.Reward,
-          validators_contract_address: nil,
-          keys_manager_contract_address: nil
-        )
-      end)
-    end
-
-    test "with transactions if rewards are not in the range of blocks" do
-      Application.put_env(:block_scout_web, BlockScoutWeb.Chain, has_emission_funds: true)
-
-      block = insert(:block)
-
-      insert(
-        :reward,
-        address_hash: block.miner_hash,
-        block_hash: block.hash,
-        address_type: :validator
-      )
-
-      insert(
-        :reward,
-        address_hash: block.miner_hash,
-        block_hash: block.hash,
-        address_type: :emission_funds
-      )
-
-      :transaction
-      |> insert(from_address: block.miner)
-      |> with_block()
-      |> Repo.preload(:token_transfers)
-
-      assert [_] = Chain.address_to_transactions_with_rewards(block.miner.hash, direction: :from)
-
-      Application.put_env(:block_scout_web, BlockScoutWeb.Chain, has_emission_funds: false)
-    end
-
-    test "with emissions rewards, but feature disabled" do
-      Application.put_env(:block_scout_web, BlockScoutWeb.Chain, has_emission_funds: false)
-
-      block = insert(:block)
-
-      insert(
-        :reward,
-        address_hash: block.miner_hash,
-        block_hash: block.hash,
-        address_type: :validator
-      )
-
-      insert(
-        :reward,
-        address_hash: block.miner_hash,
-        block_hash: block.hash,
-        address_type: :emission_funds
-      )
-
-      assert [] == Chain.address_to_transactions_with_rewards(block.miner.hash)
-    end
-  end
-
-  describe "address_to_transactions_tasks_range_of_blocks/2" do
-    test "returns empty extremums if no transactions" do
-      address = insert(:address)
-
-      extremums = Chain.address_to_transactions_tasks_range_of_blocks(address.hash, [])
-
-      assert extremums == %{
-               :min_block_number => nil,
-               :max_block_number => 0
-             }
-    end
-
-    test "returns correct extremums for from_address" do
-      address = insert(:address)
-
-      :transaction
-      |> insert(from_address: address)
-      |> with_block(insert(:block, number: 1000))
-
-      extremums = Chain.address_to_transactions_tasks_range_of_blocks(address.hash, [])
-
-      assert extremums == %{
-               :min_block_number => 1000,
-               :max_block_number => 1000
-             }
-    end
-
-    test "returns correct extremums for to_address" do
-      address = insert(:address)
-
-      :transaction
-      |> insert(to_address: address)
-      |> with_block(insert(:block, number: 1000))
-
-      extremums = Chain.address_to_transactions_tasks_range_of_blocks(address.hash, [])
-
-      assert extremums == %{
-               :min_block_number => 1000,
-               :max_block_number => 1000
-             }
-    end
-
-    test "returns correct extremums for created_contract_address" do
-      address = insert(:address)
-
-      :transaction
-      |> insert(created_contract_address: address)
-      |> with_block(insert(:block, number: 1000))
-
-      extremums = Chain.address_to_transactions_tasks_range_of_blocks(address.hash, [])
-
-      assert extremums == %{
-               :min_block_number => 1000,
-               :max_block_number => 1000
-             }
-    end
-
-    test "returns correct extremums for multiple number of transactions" do
-      address = insert(:address)
-
-      :transaction
-      |> insert(created_contract_address: address)
-      |> with_block(insert(:block, number: 1000))
-
-      :transaction
-      |> insert(created_contract_address: address)
-      |> with_block(insert(:block, number: 999))
-
-      :transaction
-      |> insert(created_contract_address: address)
-      |> with_block(insert(:block, number: 1003))
-
-      :transaction
-      |> insert(from_address: address)
-      |> with_block(insert(:block, number: 1001))
-
-      :transaction
-      |> insert(from_address: address)
-      |> with_block(insert(:block, number: 1004))
-
-      :transaction
-      |> insert(to_address: address)
-      |> with_block(insert(:block, number: 1002))
-
-      :transaction
-      |> insert(to_address: address)
-      |> with_block(insert(:block, number: 998))
-
-      extremums = Chain.address_to_transactions_tasks_range_of_blocks(address.hash, [])
-
-      assert extremums == %{
-               :min_block_number => 998,
-               :max_block_number => 1004
-             }
-    end
-  end
-
   describe "total_transactions_sent_by_address/1" do
     test "increments +1 in the last nonce result" do
       address = insert(:address)
@@ -5393,64 +4919,4 @@ defmodule Explorer.ChainTest do
       assert Chain.transaction_to_revert_reason(transaction) == "No credit of that type"
     end
   end
-
-  describe "verified_contracts/2" do
-    test "without contracts" do
-      assert [] = Chain.verified_contracts()
-    end
-
-    test "with contracts" do
-      %SmartContract{address_hash: hash} = insert(:smart_contract)
-
-      assert [%SmartContract{address_hash: ^hash}] = Chain.verified_contracts()
-    end
-
-    test "with contracts can be paginated" do
-      second_page_contracts_ids =
-        50
-        |> insert_list(:smart_contract)
-        |> Enum.map(& &1.id)
-
-      contract = insert(:smart_contract)
-
-      assert second_page_contracts_ids ==
-               [paging_options: %PagingOptions{key: {contract.id}, page_size: 50}]
-               |> Chain.verified_contracts()
-               |> Enum.map(& &1.id)
-               |> Enum.reverse()
-    end
-
-    test "filters solidity" do
-      insert(:smart_contract, is_vyper_contract: true)
-      %SmartContract{address_hash: hash} = insert(:smart_contract, is_vyper_contract: false)
-
-      assert [%SmartContract{address_hash: ^hash}] = Chain.verified_contracts(filter: :solidity)
-    end
-
-    test "filters vyper" do
-      insert(:smart_contract, is_vyper_contract: false)
-      %SmartContract{address_hash: hash} = insert(:smart_contract, is_vyper_contract: true)
-
-      assert [%SmartContract{address_hash: ^hash}] = Chain.verified_contracts(filter: :vyper)
-    end
-
-    test "search by address" do
-      insert(:smart_contract)
-      insert(:smart_contract)
-      insert(:smart_contract)
-      %SmartContract{address_hash: hash} = insert(:smart_contract)
-
-      assert [%SmartContract{address_hash: ^hash}] = Chain.verified_contracts(search: Hash.to_string(hash))
-    end
-
-    test "search by name" do
-      insert(:smart_contract)
-      insert(:smart_contract)
-      insert(:smart_contract)
-      contract_name = "qwertyufhgkhiop"
-      %SmartContract{address_hash: hash} = insert(:smart_contract, name: contract_name)
-
-      assert [%SmartContract{address_hash: ^hash}] = Chain.verified_contracts(search: contract_name)
-    end
-  end
 end
diff --git a/cspell.json b/cspell.json
index 95077caf8ceb..b76de4bdc930 100644
--- a/cspell.json
+++ b/cspell.json
@@ -118,6 +118,7 @@
         "decompiler",
         "Decompiler",
         "dedup",
+        "DefiLlama",
         "defmock",
         "defsupervisor",
         "dejob",
@@ -232,6 +233,7 @@
         "kittencream",
         "labeledby",
         "labelledby",
+        "lastmod",
         "lastname",
         "lastword",
         "lformat",
@@ -256,6 +258,7 @@
         "mconst",
         "mdef",
         "MDWW",
+        "meer",
         "Mendonça",
         "Menlo",
         "mergeable",
@@ -316,6 +319,7 @@
         "onconnect",
         "ondisconnect",
         "outcoming",
+        "overengineering",
         "pawesome",
         "pbcopy",
         "peeker",
@@ -351,6 +355,7 @@
         "purrstige",
         "qdai",
         "Qebz",
+        "qitmeer",
         "Qmbgk",
         "qrcode",
         "queriable",
@@ -490,6 +495,7 @@
         "upserting",
         "upserts",
         "urijs",
+        "urlset",
         "Utqn",
         "UUPS",
         "valign",
@@ -528,17 +534,7 @@
         "zindex",
         "zipcode",
         "zkbob",
-        "zkevm",
-        "erts",
-        "Asfpp",
-        "Nerg",
-        "secp",
-        "qwertyuioiuytrewertyuioiuytrertyuio",
-        "urlset",
-        "lastmod",
-        "qitmeer",
-        "meer",
-        "DefiLlama"
+        "zkevm"
     ],
     "enableFiletypes": [
         "dotenv",

From afb6ef3f85afdbe1717710b862838a9672ed91d5 Mon Sep 17 00:00:00 2001
From: Maxim Filonov <53992153+sl1depengwyn@users.noreply.github.com>
Date: Mon, 4 Dec 2023 14:32:59 +0300
Subject: [PATCH 712/909] Take into account possible nil fee

---
 .../controllers/api/v2/address_controller.ex  |  3 +-
 .../lib/block_scout_web/paging_helper.ex      |  7 +-
 apps/explorer/lib/explorer/chain.ex           | 79 -------------------
 .../lib/explorer/chain/smart_contract.ex      |  2 -
 .../lib/explorer/chain/transaction.ex         | 15 +++-
 5 files changed, 18 insertions(+), 88 deletions(-)

diff --git a/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/address_controller.ex b/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/address_controller.ex
index b6d875c7d91c..0c77e9ace6b0 100644
--- a/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/address_controller.ex
+++ b/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/address_controller.ex
@@ -23,10 +23,9 @@ defmodule BlockScoutWeb.API.V2.AddressController do
   alias BlockScoutWeb.AccessHelper
   alias BlockScoutWeb.API.V2.{BlockView, TransactionView, WithdrawalView}
   alias Explorer.{Chain, Market}
-  alias Explorer.Chain.Address
+  alias Explorer.Chain.{Address, Transaction}
   alias Explorer.Chain.Address.Counters
   alias Explorer.Chain.Token.Instance
-  alias Explorer.Chain.Transaction
   alias Indexer.Fetcher.{CoinBalanceOnDemand, TokenBalanceOnDemand}
 
   @transaction_necessity_by_association [
diff --git a/apps/block_scout_web/lib/block_scout_web/paging_helper.ex b/apps/block_scout_web/lib/block_scout_web/paging_helper.ex
index 8c2d2b0cca73..406f47b6c761 100644
--- a/apps/block_scout_web/lib/block_scout_web/paging_helper.ex
+++ b/apps/block_scout_web/lib/block_scout_web/paging_helper.ex
@@ -226,7 +226,10 @@ defmodule BlockScoutWeb.PagingHelper do
 
   defp do_address_transaction_sorting("value", "asc"), do: [asc: :value]
   defp do_address_transaction_sorting("value", "desc"), do: [desc: :value]
-  defp do_address_transaction_sorting("fee", "asc"), do: [{:dynamic, :fee, :asc, Transaction.dynamic_fee()}]
-  defp do_address_transaction_sorting("fee", "desc"), do: [{:dynamic, :fee, :desc, Transaction.dynamic_fee()}]
+  defp do_address_transaction_sorting("fee", "asc"), do: [{:dynamic, :fee, :asc_nulls_first, Transaction.dynamic_fee()}]
+
+  defp do_address_transaction_sorting("fee", "desc"),
+    do: [{:dynamic, :fee, :desc_nulls_last, Transaction.dynamic_fee()}]
+
   defp do_address_transaction_sorting(_, _), do: []
 end
diff --git a/apps/explorer/lib/explorer/chain.ex b/apps/explorer/lib/explorer/chain.ex
index 5fed39e9b6b9..6d3f48b91b41 100644
--- a/apps/explorer/lib/explorer/chain.ex
+++ b/apps/explorer/lib/explorer/chain.ex
@@ -1780,63 +1780,6 @@ defmodule Explorer.Chain do
     |> Enum.into(%{})
   end
 
-  @doc """
-  Lists the top `t:Explorer.Chain.Address.t/0`'s' in descending order based on coin balance and address hash.
-  """
-  @spec list_top_addresses :: [{Address.t(), non_neg_integer()}]
-  def list_top_addresses(options \\ []) do
-    paging_options = Keyword.get(options, :paging_options, @default_paging_options)
-
-    if is_nil(paging_options.key) do
-      paging_options.page_size
-      |> Accounts.take_enough()
-      |> case do
-        nil ->
-          get_addresses(options)
-
-        accounts ->
-          Enum.map(
-            accounts,
-            &{&1,
-             if is_nil(&1.nonce) do
-               0
-             else
-               &1.nonce + 1
-             end}
-          )
-      end
-    else
-      fetch_top_addresses(options)
-    end
-  end
-
-  defp get_addresses(options) do
-    accounts_with_n = fetch_top_addresses(options)
-
-    accounts_with_n
-    |> Enum.map(fn {address, _n} -> address end)
-    |> Accounts.update()
-
-    accounts_with_n
-  end
-
-  defp fetch_top_addresses(options) do
-    paging_options = Keyword.get(options, :paging_options, @default_paging_options)
-
-    base_query =
-      from(a in Address,
-        where: a.fetched_coin_balance > ^0,
-        order_by: [desc: a.fetched_coin_balance, asc: a.hash],
-        preload: [:names, :smart_contract],
-        select: {a, fragment("coalesce(1 + ?, 0)", a.nonce)}
-      )
-
-    base_query
-    |> page_addresses(paging_options)
-    |> limit(^paging_options.page_size)
-    |> select_repo(options).all()
-  end
-
   @doc """
   Calls `reducer` on a stream of `t:Explorer.Chain.Block.t/0` without `t:Explorer.Chain.Block.Reward.t/0`.
   """
@@ -3279,28 +3222,6 @@ defmodule Explorer.Chain do
     end
   end
 
-  defp fetch_transactions(paging_options \\ nil, from_block \\ nil, to_block \\ nil, with_pending? \\ false) do
-    Transaction
-    |> order_for_transactions(with_pending?)
-    |> where_block_number_in_period(from_block, to_block)
-    |> handle_paging_options(paging_options)
-  end
-
-  defp order_for_transactions(query, true) do
-    query
-    |> order_by([transaction],
-      desc: transaction.block_number,
-      desc: transaction.index,
-      desc: transaction.inserted_at,
-      asc: transaction.hash
-    )
-  end
-
-  defp order_for_transactions(query, _) do
-    query
-    |> order_by([transaction], desc: transaction.block_number, desc: transaction.index)
-  end
-
   defp fetch_transactions_in_ascending_order_by_index(paging_options) do
     Transaction
     |> order_by([transaction], asc: transaction.index)
diff --git a/apps/explorer/lib/explorer/chain/smart_contract.ex b/apps/explorer/lib/explorer/chain/smart_contract.ex
index 89b3a27e919a..1d381ef92ec0 100644
--- a/apps/explorer/lib/explorer/chain/smart_contract.ex
+++ b/apps/explorer/lib/explorer/chain/smart_contract.ex
@@ -55,8 +55,6 @@ defmodule Explorer.Chain.SmartContract do
 
   @default_sorting [desc: :id]
 
-  @typep api? :: {:api?, true | false}
-
   @typedoc """
   The name of a parameter to a function or event.
   """
diff --git a/apps/explorer/lib/explorer/chain/transaction.ex b/apps/explorer/lib/explorer/chain/transaction.ex
index 0ed5b547fc5b..78ef9a202564 100644
--- a/apps/explorer/lib/explorer/chain/transaction.ex
+++ b/apps/explorer/lib/explorer/chain/transaction.ex
@@ -1448,10 +1448,19 @@ defmodule Explorer.Chain.Transaction do
 
   defp compare_custom_sorting([{:dynamic, :fee, order, _dynamic_fee}]) do
     fn a, b ->
-      case Decimal.compare(a |> Chain.fee(:wei) |> elem(1), b |> Chain.fee(:wei) |> elem(1)) do
+      nil_case =
+        case order do
+          :desc_nulls_last -> Decimal.new("-inf")
+          :asc_nulls_first -> Decimal.new("inf")
+        end
+
+      a_fee = a |> Chain.fee(:wei) |> elem(1) || nil_case
+      b_fee = b |> Chain.fee(:wei) |> elem(1) || nil_case
+
+      case Decimal.compare(a_fee, b_fee) do
         :eq -> compare_default_sorting(a, b)
-        :gt -> order == :desc
-        :lt -> order == :asc
+        :gt -> order == :desc_nulls_last
+        :lt -> order == :asc_nulls_first
       end
     end
   end

From 37bebdd0f056817cd5ea0f4416b69c0220aec656 Mon Sep 17 00:00:00 2001
From: Maxim Filonov <53992153+sl1depengwyn@users.noreply.github.com>
Date: Mon, 4 Dec 2023 16:38:38 +0300
Subject: [PATCH 713/909] Fix CI

---
 .dialyzer-ignore                              |   2 +
 CHANGELOG.md                                  |   2 +-
 .../test/explorer/chain/transaction_test.exs  | 474 ------------------
 3 files changed, 3 insertions(+), 475 deletions(-)

diff --git a/.dialyzer-ignore b/.dialyzer-ignore
index 7ee843f9190e..44a7f6862aba 100644
--- a/.dialyzer-ignore
+++ b/.dialyzer-ignore
@@ -26,3 +26,5 @@ lib/indexer/fetcher/zkevm/transaction_batch.ex:252
 lib/block_scout_web/views/api/v2/transaction_view.ex:431
 lib/block_scout_web/views/api/v2/transaction_view.ex:472
 lib/explorer/chain/transaction.ex:167
+lib/explorer/chain/transaction.ex:1457
+lib/explorer/chain/transaction.ex:1458
diff --git a/CHANGELOG.md b/CHANGELOG.md
index a19a159835d3..6473289e8db3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,7 @@
 ### Features
 
 - [#8900](https://github.com/blockscout/blockscout/pull/8900) - Add Compound proxy contract pattern
+- [#8611](https://github.com/blockscout/blockscout/pull/8611) - Implement sorting of smart contracts, address transactions
 
 ### Fixes
 
@@ -29,7 +30,6 @@
 - [#8768](https://github.com/blockscout/blockscout/pull/8768) - Add possibility to search tokens by address hash
 - [#8750](https://github.com/blockscout/blockscout/pull/8750) - Support new eth-bytecode-db request metadata fields
 - [#8634](https://github.com/blockscout/blockscout/pull/8634) - API v2: NFT for address
-- [#8611](https://github.com/blockscout/blockscout/pull/8611) - Implement sorting of smart contracts, address transactions
 - [#8609](https://github.com/blockscout/blockscout/pull/8609) - Change logs format to JSON; Add endpoint url to the block_scout_web logging
 - [#8558](https://github.com/blockscout/blockscout/pull/8558) - Add CoinBalanceDailyUpdater
 
diff --git a/apps/explorer/test/explorer/chain/transaction_test.exs b/apps/explorer/test/explorer/chain/transaction_test.exs
index 6656cf4277ba..7a5ce5bbe51a 100644
--- a/apps/explorer/test/explorer/chain/transaction_test.exs
+++ b/apps/explorer/test/explorer/chain/transaction_test.exs
@@ -788,480 +788,6 @@ defmodule Explorer.Chain.TransactionTest do
     end
   end
 
-  describe "address_to_transactions_tasks_range_of_blocks/2" do
-    test "returns empty extremums if no transactions" do
-      address = insert(:address)
-
-      extremums = Transaction.address_to_transactions_tasks_range_of_blocks(address.hash, [])
-
-      assert extremums == %{
-               :min_block_number => nil,
-               :max_block_number => 0
-             }
-    end
-
-    test "returns correct extremums for from_address" do
-      address = insert(:address)
-
-      :transaction
-      |> insert(from_address: address)
-      |> with_block(insert(:block, number: 1000))
-
-      extremums = Transaction.address_to_transactions_tasks_range_of_blocks(address.hash, [])
-
-      assert extremums == %{
-               :min_block_number => 1000,
-               :max_block_number => 1000
-             }
-    end
-
-    test "returns correct extremums for to_address" do
-      address = insert(:address)
-
-      :transaction
-      |> insert(to_address: address)
-      |> with_block(insert(:block, number: 1000))
-
-      extremums = Transaction.address_to_transactions_tasks_range_of_blocks(address.hash, [])
-
-      assert extremums == %{
-               :min_block_number => 1000,
-               :max_block_number => 1000
-             }
-    end
-
-    test "returns correct extremums for created_contract_address" do
-      address = insert(:address)
-
-      :transaction
-      |> insert(created_contract_address: address)
-      |> with_block(insert(:block, number: 1000))
-
-      extremums = Transaction.address_to_transactions_tasks_range_of_blocks(address.hash, [])
-
-      assert extremums == %{
-               :min_block_number => 1000,
-               :max_block_number => 1000
-             }
-    end
-
-    test "returns correct extremums for multiple number of transactions" do
-      address = insert(:address)
-
-      :transaction
-      |> insert(created_contract_address: address)
-      |> with_block(insert(:block, number: 1000))
-
-      :transaction
-      |> insert(created_contract_address: address)
-      |> with_block(insert(:block, number: 999))
-
-      :transaction
-      |> insert(created_contract_address: address)
-      |> with_block(insert(:block, number: 1003))
-
-      :transaction
-      |> insert(from_address: address)
-      |> with_block(insert(:block, number: 1001))
-
-      :transaction
-      |> insert(from_address: address)
-      |> with_block(insert(:block, number: 1004))
-
-      :transaction
-      |> insert(to_address: address)
-      |> with_block(insert(:block, number: 1002))
-
-      :transaction
-      |> insert(to_address: address)
-      |> with_block(insert(:block, number: 998))
-
-      extremums = Transaction.address_to_transactions_tasks_range_of_blocks(address.hash, [])
-
-      assert extremums == %{
-               :min_block_number => 998,
-               :max_block_number => 1004
-             }
-    end
-  end
-
-  describe "address_to_transactions_with_rewards/2" do
-    test "without transactions" do
-      %Address{hash: address_hash} = insert(:address)
-
-      assert Repo.aggregate(Transaction, :count, :hash) == 0
-
-      assert [] == Transaction.address_to_transactions_with_rewards(address_hash)
-    end
-
-    test "with from transactions" do
-      %Address{hash: address_hash} = address = insert(:address)
-
-      transaction =
-        :transaction
-        |> insert(from_address: address)
-        |> with_block()
-
-      assert [transaction] ==
-               Transaction.address_to_transactions_with_rewards(address_hash, direction: :from)
-               |> Repo.preload([:block, :to_address, :from_address])
-    end
-
-    test "with to transactions" do
-      %Address{hash: address_hash} = address = insert(:address)
-
-      transaction =
-        :transaction
-        |> insert(to_address: address)
-        |> with_block()
-
-      assert [transaction] ==
-               Transaction.address_to_transactions_with_rewards(address_hash, direction: :to)
-               |> Repo.preload([:block, :to_address, :from_address])
-    end
-
-    test "with to and from transactions and direction: :from" do
-      %Address{hash: address_hash} = address = insert(:address)
-
-      transaction =
-        :transaction
-        |> insert(from_address: address)
-        |> with_block()
-
-      # only contains "from" transaction
-      assert [transaction] ==
-               Transaction.address_to_transactions_with_rewards(address_hash, direction: :from)
-               |> Repo.preload([:block, :to_address, :from_address])
-    end
-
-    test "with to and from transactions and direction: :to" do
-      %Address{hash: address_hash} = address = insert(:address)
-
-      transaction =
-        :transaction
-        |> insert(to_address: address)
-        |> with_block()
-
-      assert [transaction] ==
-               Transaction.address_to_transactions_with_rewards(address_hash, direction: :to)
-               |> Repo.preload([:block, :to_address, :from_address])
-    end
-
-    test "with to and from transactions and no :direction option" do
-      %Address{hash: address_hash} = address = insert(:address)
-      block = insert(:block)
-
-      transaction1 =
-        :transaction
-        |> insert(to_address: address)
-        |> with_block(block)
-
-      transaction2 =
-        :transaction
-        |> insert(from_address: address)
-        |> with_block(block)
-
-      assert [transaction2, transaction1] ==
-               Transaction.address_to_transactions_with_rewards(address_hash)
-               |> Repo.preload([:block, :to_address, :from_address])
-    end
-
-    test "does not include non-contract-creation parent transactions" do
-      transaction =
-        %Transaction{} =
-        :transaction
-        |> insert()
-        |> with_block()
-
-      %InternalTransaction{created_contract_address: address} =
-        insert(:internal_transaction_create,
-          transaction: transaction,
-          index: 0,
-          block_number: transaction.block_number,
-          block_hash: transaction.block_hash,
-          block_index: 0,
-          transaction_index: transaction.index
-        )
-
-      assert [] == Transaction.address_to_transactions_with_rewards(address.hash)
-    end
-
-    test "returns transactions that have token transfers for the given to_address" do
-      %Address{hash: address_hash} = address = insert(:address)
-
-      transaction =
-        :transaction
-        |> insert(to_address: address, to_address_hash: address.hash)
-        |> with_block()
-
-      insert(
-        :token_transfer,
-        to_address: address,
-        transaction: transaction
-      )
-
-      assert [transaction.hash] ==
-               Transaction.address_to_transactions_with_rewards(address_hash)
-               |> Enum.map(& &1.hash)
-    end
-
-    test "with transactions can be paginated" do
-      %Address{hash: address_hash} = address = insert(:address)
-
-      second_page_hashes =
-        2
-        |> insert_list(:transaction, from_address: address)
-        |> with_block()
-        |> Enum.map(& &1.hash)
-
-      %Transaction{block_number: block_number, index: index} =
-        :transaction
-        |> insert(from_address: address)
-        |> with_block()
-
-      assert second_page_hashes ==
-               address_hash
-               |> Transaction.address_to_transactions_with_rewards(
-                 paging_options: %PagingOptions{
-                   key: {block_number, index},
-                   page_size: 2
-                 }
-               )
-               |> Enum.map(& &1.hash)
-               |> Enum.reverse()
-    end
-
-    test "returns results in reverse chronological order by block number and transaction index" do
-      %Address{hash: address_hash} = address = insert(:address)
-
-      a_block = insert(:block, number: 6000)
-
-      %Transaction{hash: first} =
-        :transaction
-        |> insert(to_address: address)
-        |> with_block(a_block)
-
-      %Transaction{hash: second} =
-        :transaction
-        |> insert(to_address: address)
-        |> with_block(a_block)
-
-      %Transaction{hash: third} =
-        :transaction
-        |> insert(to_address: address)
-        |> with_block(a_block)
-
-      %Transaction{hash: fourth} =
-        :transaction
-        |> insert(to_address: address)
-        |> with_block(a_block)
-
-      b_block = insert(:block, number: 2000)
-
-      %Transaction{hash: fifth} =
-        :transaction
-        |> insert(to_address: address)
-        |> with_block(b_block)
-
-      %Transaction{hash: sixth} =
-        :transaction
-        |> insert(to_address: address)
-        |> with_block(b_block)
-
-      result =
-        address_hash
-        |> Transaction.address_to_transactions_with_rewards()
-        |> Enum.map(& &1.hash)
-
-      assert [fourth, third, second, first, sixth, fifth] == result
-    end
-
-    test "with emission rewards" do
-      Application.put_env(:block_scout_web, BlockScoutWeb.Chain, has_emission_funds: true)
-
-      Application.put_env(:explorer, Explorer.Chain.Block.Reward,
-        validators_contract_address: "0x0000000000000000000000000000000000000005",
-        keys_manager_contract_address: "0x0000000000000000000000000000000000000006"
-      )
-
-      consumer_pid = start_supervised!(Explorer.Chain.Fetcher.FetchValidatorInfoOnDemand)
-      :erlang.trace(consumer_pid, true, [:receive])
-
-      block = insert(:block)
-
-      block_miner_hash_string = Base.encode16(block.miner_hash.bytes, case: :lower)
-      block_miner_hash = block.miner_hash
-
-      insert(
-        :reward,
-        address_hash: block.miner_hash,
-        block_hash: block.hash,
-        address_type: :validator
-      )
-
-      insert(
-        :reward,
-        address_hash: block.miner_hash,
-        block_hash: block.hash,
-        address_type: :emission_funds
-      )
-
-      # isValidator => true
-      expect(
-        EthereumJSONRPC.Mox,
-        :json_rpc,
-        fn [%{id: id, method: _, params: [%{data: _, to: _}, _]}], _options ->
-          {:ok,
-           [%{id: id, jsonrpc: "2.0", result: "0x0000000000000000000000000000000000000000000000000000000000000001"}]}
-        end
-      )
-
-      # getPayoutByMining => 0x0000000000000000000000000000000000000001
-      expect(
-        EthereumJSONRPC.Mox,
-        :json_rpc,
-        fn [%{id: id, method: _, params: [%{data: _, to: _}, _]}], _options ->
-          {:ok, [%{id: id, result: "0x000000000000000000000000" <> block_miner_hash_string}]}
-        end
-      )
-
-      res = Transaction.address_to_transactions_with_rewards(block.miner.hash)
-      assert [{_, _}] = res
-
-      assert_receive {:trace, ^consumer_pid, :receive, {:"$gen_cast", {:fetch_or_update, ^block_miner_hash}}}, 1000
-      :timer.sleep(500)
-
-      on_exit(fn ->
-        Application.put_env(:block_scout_web, BlockScoutWeb.Chain, has_emission_funds: false)
-
-        Application.put_env(:explorer, Explorer.Chain.Block.Reward,
-          validators_contract_address: nil,
-          keys_manager_contract_address: nil
-        )
-      end)
-    end
-
-    test "with emission rewards and transactions" do
-      Application.put_env(:block_scout_web, BlockScoutWeb.Chain, has_emission_funds: true)
-
-      Application.put_env(:explorer, Explorer.Chain.Block.Reward,
-        validators_contract_address: "0x0000000000000000000000000000000000000005",
-        keys_manager_contract_address: "0x0000000000000000000000000000000000000006"
-      )
-
-      consumer_pid = start_supervised!(Explorer.Chain.Fetcher.FetchValidatorInfoOnDemand)
-      :erlang.trace(consumer_pid, true, [:receive])
-
-      block = insert(:block)
-
-      block_miner_hash_string = Base.encode16(block.miner_hash.bytes, case: :lower)
-      block_miner_hash = block.miner_hash
-
-      insert(
-        :reward,
-        address_hash: block.miner_hash,
-        block_hash: block.hash,
-        address_type: :validator
-      )
-
-      insert(
-        :reward,
-        address_hash: block.miner_hash,
-        block_hash: block.hash,
-        address_type: :emission_funds
-      )
-
-      :transaction
-      |> insert(to_address: block.miner)
-      |> with_block(block)
-      |> Repo.preload(:token_transfers)
-
-      # isValidator => true
-      expect(
-        EthereumJSONRPC.Mox,
-        :json_rpc,
-        fn [%{id: id, method: _, params: [%{data: _, to: _}, _]}], _options ->
-          {:ok,
-           [%{id: id, jsonrpc: "2.0", result: "0x0000000000000000000000000000000000000000000000000000000000000001"}]}
-        end
-      )
-
-      # getPayoutByMining => 0x0000000000000000000000000000000000000001
-      expect(
-        EthereumJSONRPC.Mox,
-        :json_rpc,
-        fn [%{id: id, method: _, params: [%{data: _, to: _}, _]}], _options ->
-          {:ok, [%{id: id, result: "0x000000000000000000000000" <> block_miner_hash_string}]}
-        end
-      )
-
-      assert [_, {_, _}] = Transaction.address_to_transactions_with_rewards(block.miner.hash, direction: :to)
-
-      assert_receive {:trace, ^consumer_pid, :receive, {:"$gen_cast", {:fetch_or_update, ^block_miner_hash}}}, 1000
-      :timer.sleep(500)
-
-      on_exit(fn ->
-        Application.put_env(:block_scout_web, BlockScoutWeb.Chain, has_emission_funds: false)
-
-        Application.put_env(:explorer, Explorer.Chain.Block.Reward,
-          validators_contract_address: nil,
-          keys_manager_contract_address: nil
-        )
-      end)
-    end
-
-    test "with transactions if rewards are not in the range of blocks" do
-      Application.put_env(:block_scout_web, BlockScoutWeb.Chain, has_emission_funds: true)
-
-      block = insert(:block)
-
-      insert(
-        :reward,
-        address_hash: block.miner_hash,
-        block_hash: block.hash,
-        address_type: :validator
-      )
-
-      insert(
-        :reward,
-        address_hash: block.miner_hash,
-        block_hash: block.hash,
-        address_type: :emission_funds
-      )
-
-      :transaction
-      |> insert(from_address: block.miner)
-      |> with_block()
-      |> Repo.preload(:token_transfers)
-
-      assert [_] = Transaction.address_to_transactions_with_rewards(block.miner.hash, direction: :from)
-
-      Application.put_env(:block_scout_web, BlockScoutWeb.Chain, has_emission_funds: false)
-    end
-
-    test "with emissions rewards, but feature disabled" do
-      Application.put_env(:block_scout_web, BlockScoutWeb.Chain, has_emission_funds: false)
-
-      block = insert(:block)
-
-      insert(
-        :reward,
-        address_hash: block.miner_hash,
-        block_hash: block.hash,
-        address_type: :validator
-      )
-
-      insert(
-        :reward,
-        address_hash: block.miner_hash,
-        block_hash: block.hash,
-        address_type: :emission_funds
-      )
-
-      assert [] == Transaction.address_to_transactions_with_rewards(block.miner.hash)
-    end
-  end
-
   # EIP-1967 + EIP-1822
   defp request_zero_implementations do
     EthereumJSONRPC.Mox

From 700e7810ea1ecd1913343f1ce590c95246ae5a5c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 4 Dec 2023 18:07:59 +0000
Subject: [PATCH 714/909] Bump postcss from 8.4.31 to 8.4.32 in
 /apps/block_scout_web/assets

Bumps [postcss](https://github.com/postcss/postcss) from 8.4.31 to 8.4.32.
- [Release notes](https://github.com/postcss/postcss/releases)
- [Changelog](https://github.com/postcss/postcss/blob/main/CHANGELOG.md)
- [Commits](https://github.com/postcss/postcss/compare/8.4.31...8.4.32)

---
updated-dependencies:
- dependency-name: postcss
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 apps/block_scout_web/assets/package-lock.json | 30 +++++++++----------
 apps/block_scout_web/assets/package.json      |  2 +-
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/apps/block_scout_web/assets/package-lock.json b/apps/block_scout_web/assets/package-lock.json
index f0b0d1b85c88..141aa40e70d9 100644
--- a/apps/block_scout_web/assets/package-lock.json
+++ b/apps/block_scout_web/assets/package-lock.json
@@ -87,7 +87,7 @@
         "jest": "^29.7.0",
         "jest-environment-jsdom": "^29.7.0",
         "mini-css-extract-plugin": "^2.7.6",
-        "postcss": "^8.4.31",
+        "postcss": "^8.4.32",
         "postcss-loader": "^7.3.3",
         "sass": "^1.69.5",
         "sass-loader": "^13.3.2",
@@ -12983,9 +12983,9 @@
       "integrity": "sha1-TzFS4JVA/eKMdvRLGbvNHVpCR40="
     },
     "node_modules/nanoid": {
-      "version": "3.3.6",
-      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.6.tgz",
-      "integrity": "sha512-BGcqMMJuToF7i1rt+2PWSNVnWIkGCU78jBG3RxO/bZlnZPK2Cmi2QaffxGO/2RvWi9sL+FAiRiXMgsyxQ1DIDA==",
+      "version": "3.3.7",
+      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.7.tgz",
+      "integrity": "sha512-eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g==",
       "dev": true,
       "funding": [
         {
@@ -13734,9 +13734,9 @@
       }
     },
     "node_modules/postcss": {
-      "version": "8.4.31",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.31.tgz",
-      "integrity": "sha512-PS08Iboia9mts/2ygV3eLpY5ghnUcfLV/EXTOW1E2qYxJKGGBUtNjN76FYHnMs36RmARn41bC0AZmn+rR0OVpQ==",
+      "version": "8.4.32",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.32.tgz",
+      "integrity": "sha512-D/kj5JNu6oo2EIy+XL/26JEDTlIbB8hw85G8StOE6L74RQAVVP5rej6wxCNqyMbR4RkPfqvezVbPw81Ngd6Kcw==",
       "dev": true,
       "funding": [
         {
@@ -13753,7 +13753,7 @@
         }
       ],
       "dependencies": {
-        "nanoid": "^3.3.6",
+        "nanoid": "^3.3.7",
         "picocolors": "^1.0.0",
         "source-map-js": "^1.0.2"
       },
@@ -27673,9 +27673,9 @@
       "integrity": "sha1-TzFS4JVA/eKMdvRLGbvNHVpCR40="
     },
     "nanoid": {
-      "version": "3.3.6",
-      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.6.tgz",
-      "integrity": "sha512-BGcqMMJuToF7i1rt+2PWSNVnWIkGCU78jBG3RxO/bZlnZPK2Cmi2QaffxGO/2RvWi9sL+FAiRiXMgsyxQ1DIDA==",
+      "version": "3.3.7",
+      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.7.tgz",
+      "integrity": "sha512-eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g==",
       "dev": true
     },
     "nanomorph": {
@@ -28210,12 +28210,12 @@
       "integrity": "sha512-Wb4p1J4zyFTbM+u6WuO4XstYx4Ky9Cewe4DWrel7B0w6VVICvPwdOpotjzcf6eD8TsckVnIMNONQyPIUFOUbCQ=="
     },
     "postcss": {
-      "version": "8.4.31",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.31.tgz",
-      "integrity": "sha512-PS08Iboia9mts/2ygV3eLpY5ghnUcfLV/EXTOW1E2qYxJKGGBUtNjN76FYHnMs36RmARn41bC0AZmn+rR0OVpQ==",
+      "version": "8.4.32",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.32.tgz",
+      "integrity": "sha512-D/kj5JNu6oo2EIy+XL/26JEDTlIbB8hw85G8StOE6L74RQAVVP5rej6wxCNqyMbR4RkPfqvezVbPw81Ngd6Kcw==",
       "dev": true,
       "requires": {
-        "nanoid": "^3.3.6",
+        "nanoid": "^3.3.7",
         "picocolors": "^1.0.0",
         "source-map-js": "^1.0.2"
       }
diff --git a/apps/block_scout_web/assets/package.json b/apps/block_scout_web/assets/package.json
index 8dc4f2ca26ab..d03b0e215efe 100644
--- a/apps/block_scout_web/assets/package.json
+++ b/apps/block_scout_web/assets/package.json
@@ -99,7 +99,7 @@
     "jest": "^29.7.0",
     "jest-environment-jsdom": "^29.7.0",
     "mini-css-extract-plugin": "^2.7.6",
-    "postcss": "^8.4.31",
+    "postcss": "^8.4.32",
     "postcss-loader": "^7.3.3",
     "sass": "^1.69.5",
     "sass-loader": "^13.3.2",

From 1382b28a460958b3028946c5b47af3f57ba15afa Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 4 Dec 2023 18:09:38 +0000
Subject: [PATCH 715/909] Bump @amplitude/analytics-browser in
 /apps/block_scout_web/assets

Bumps [@amplitude/analytics-browser](https://github.com/amplitude/Amplitude-TypeScript) from 2.3.5 to 2.3.6.
- [Release notes](https://github.com/amplitude/Amplitude-TypeScript/releases)
- [Commits](https://github.com/amplitude/Amplitude-TypeScript/compare/@amplitude/analytics-browser@2.3.5...@amplitude/analytics-browser@2.3.6)

---
updated-dependencies:
- dependency-name: "@amplitude/analytics-browser"
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 apps/block_scout_web/assets/package-lock.json | 94 +++++++++----------
 apps/block_scout_web/assets/package.json      |  2 +-
 2 files changed, 48 insertions(+), 48 deletions(-)

diff --git a/apps/block_scout_web/assets/package-lock.json b/apps/block_scout_web/assets/package-lock.json
index f0b0d1b85c88..6dec5adf6466 100644
--- a/apps/block_scout_web/assets/package-lock.json
+++ b/apps/block_scout_web/assets/package-lock.json
@@ -7,7 +7,7 @@
       "name": "blockscout",
       "license": "GPL-3.0",
       "dependencies": {
-        "@amplitude/analytics-browser": "^2.3.5",
+        "@amplitude/analytics-browser": "^2.3.6",
         "@fortawesome/fontawesome-free": "^6.4.2",
         "@tarekraafat/autocomplete.js": "^10.2.7",
         "@walletconnect/web3-provider": "^1.8.0",
@@ -116,15 +116,15 @@
       }
     },
     "node_modules/@amplitude/analytics-browser": {
-      "version": "2.3.5",
-      "resolved": "https://registry.npmjs.org/@amplitude/analytics-browser/-/analytics-browser-2.3.5.tgz",
-      "integrity": "sha512-KL9Yv0lXvCsWrCwwWAMB0kzTswBlTLxxyOAS//z0378ckQvszLYvQqje3K5t0AlXrG728cLvKcBFveZ/UgUWfg==",
+      "version": "2.3.6",
+      "resolved": "https://registry.npmjs.org/@amplitude/analytics-browser/-/analytics-browser-2.3.6.tgz",
+      "integrity": "sha512-P8N19qeoSDPO0crdQwa2yi+T0/UT4v9FqZrtXF3JW4kgxu++dTW/QkQ6bsv29EPg2N54xyr9IOt98q9EkZbA7A==",
       "dependencies": {
-        "@amplitude/analytics-client-common": "^2.0.8",
-        "@amplitude/analytics-core": "^2.1.1",
+        "@amplitude/analytics-client-common": "^2.0.9",
+        "@amplitude/analytics-core": "^2.1.2",
         "@amplitude/analytics-types": "^2.3.1",
-        "@amplitude/plugin-page-view-tracking-browser": "^2.0.15",
-        "@amplitude/plugin-web-attribution-browser": "^2.0.15",
+        "@amplitude/plugin-page-view-tracking-browser": "^2.0.16",
+        "@amplitude/plugin-web-attribution-browser": "^2.0.16",
         "tslib": "^2.4.1"
       }
     },
@@ -134,12 +134,12 @@
       "integrity": "sha512-tGyy4dAjRIEwI7BzsB0lynWgOpfqjUdq91XXAlIWD2OwKBH7oCl/GZG/HT4BOHrTlPMOASlMQ7veyTqpmRcrNA=="
     },
     "node_modules/@amplitude/analytics-client-common": {
-      "version": "2.0.8",
-      "resolved": "https://registry.npmjs.org/@amplitude/analytics-client-common/-/analytics-client-common-2.0.8.tgz",
-      "integrity": "sha512-zKD/txmMFPfSVtT2gdZw+Tf07pZQEcPcB6X39+a+Wh8PjIIADYIeq6zL/2pn/9uwMkVz66sbKABKbq69XxPfCA==",
+      "version": "2.0.9",
+      "resolved": "https://registry.npmjs.org/@amplitude/analytics-client-common/-/analytics-client-common-2.0.9.tgz",
+      "integrity": "sha512-2CSUMY60Jemks/XVro8ikuHBebENzb+IxnUz4YPx5fmBPW7QW+ysmD+LgECeLhv9jWIQoDhuciscPLuRENKerA==",
       "dependencies": {
         "@amplitude/analytics-connector": "^1.4.8",
-        "@amplitude/analytics-core": "^2.1.1",
+        "@amplitude/analytics-core": "^2.1.2",
         "@amplitude/analytics-types": "^2.3.1",
         "tslib": "^2.4.1"
       }
@@ -155,9 +155,9 @@
       "integrity": "sha512-T8mOYzB9RRxckzhL0NTHwdge9xuFxXEOplC8B1Y3UX3NHa3BLh7DlBUZlCOwQgMc2nxDfnSweDL5S3bhC+W90g=="
     },
     "node_modules/@amplitude/analytics-core": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/@amplitude/analytics-core/-/analytics-core-2.1.1.tgz",
-      "integrity": "sha512-2dHHiOnK7J/0Uk3gqu70JEvCKSgNBAXIUvw6u7bEHCQHBBW3ulpsVRSQomBeruyBBLKjgarwgawGs3yJrjIDkA==",
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/@amplitude/analytics-core/-/analytics-core-2.1.2.tgz",
+      "integrity": "sha512-vRkP2HHh43u7vilpUrP3Q8o/TMJ6U2B7nxPV9/aUS5V/im0Zigq4mPcn5uNY7FuTwsJM3zzRxK9J2WvfdG5bqA==",
       "dependencies": {
         "@amplitude/analytics-types": "^2.3.1",
         "tslib": "^2.4.1"
@@ -174,11 +174,11 @@
       "integrity": "sha512-yojBG20qvph0rpCJKb4i/FJa+otqLINEwv//hfzvjnCOcPPyS0YscI8oiRBM0rG7kZIDgaL9a6jPwkqK4ACmcw=="
     },
     "node_modules/@amplitude/plugin-page-view-tracking-browser": {
-      "version": "2.0.15",
-      "resolved": "https://registry.npmjs.org/@amplitude/plugin-page-view-tracking-browser/-/plugin-page-view-tracking-browser-2.0.15.tgz",
-      "integrity": "sha512-iVviovZWROodoNs984dAslm3vCkMsl6bhIq5K0Tabt4ffi4ygIqlhdV8vj4Grr8u6mGtjgEzFchCkxdzb9TU1A==",
+      "version": "2.0.16",
+      "resolved": "https://registry.npmjs.org/@amplitude/plugin-page-view-tracking-browser/-/plugin-page-view-tracking-browser-2.0.16.tgz",
+      "integrity": "sha512-o9YlpXm0BcnUEK47K5xAqEa/q7DOsKGb6F35gF5iGUFXTtBP+QVLTtNujfnfiO4V9g5JrkOhB/Wm2Sr34VNFhQ==",
       "dependencies": {
-        "@amplitude/analytics-client-common": "^2.0.8",
+        "@amplitude/analytics-client-common": "^2.0.9",
         "@amplitude/analytics-types": "^2.3.1",
         "tslib": "^2.4.1"
       }
@@ -189,12 +189,12 @@
       "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q=="
     },
     "node_modules/@amplitude/plugin-web-attribution-browser": {
-      "version": "2.0.15",
-      "resolved": "https://registry.npmjs.org/@amplitude/plugin-web-attribution-browser/-/plugin-web-attribution-browser-2.0.15.tgz",
-      "integrity": "sha512-HSS6j2a40iSIKwug7ICzezXl6ag+cj7YU7cFbYiSF+cmNIVg4jPYgVCbTqq+IivOw+VW07pr0o+jz0ArL/Lyiw==",
+      "version": "2.0.16",
+      "resolved": "https://registry.npmjs.org/@amplitude/plugin-web-attribution-browser/-/plugin-web-attribution-browser-2.0.16.tgz",
+      "integrity": "sha512-IEYDrtZGJvBRhie7u9xIWNZhd0Z7heRx6A/+dNdERrW/akC1iAVmUyBZPMOR5ywVK7nwsymlVpFbPccuMoYTmg==",
       "dependencies": {
-        "@amplitude/analytics-client-common": "^2.0.8",
-        "@amplitude/analytics-core": "^2.1.1",
+        "@amplitude/analytics-client-common": "^2.0.9",
+        "@amplitude/analytics-core": "^2.1.2",
         "@amplitude/analytics-types": "^2.3.1",
         "tslib": "^2.4.1"
       }
@@ -17854,15 +17854,15 @@
       "dev": true
     },
     "@amplitude/analytics-browser": {
-      "version": "2.3.5",
-      "resolved": "https://registry.npmjs.org/@amplitude/analytics-browser/-/analytics-browser-2.3.5.tgz",
-      "integrity": "sha512-KL9Yv0lXvCsWrCwwWAMB0kzTswBlTLxxyOAS//z0378ckQvszLYvQqje3K5t0AlXrG728cLvKcBFveZ/UgUWfg==",
+      "version": "2.3.6",
+      "resolved": "https://registry.npmjs.org/@amplitude/analytics-browser/-/analytics-browser-2.3.6.tgz",
+      "integrity": "sha512-P8N19qeoSDPO0crdQwa2yi+T0/UT4v9FqZrtXF3JW4kgxu++dTW/QkQ6bsv29EPg2N54xyr9IOt98q9EkZbA7A==",
       "requires": {
-        "@amplitude/analytics-client-common": "^2.0.8",
-        "@amplitude/analytics-core": "^2.1.1",
+        "@amplitude/analytics-client-common": "^2.0.9",
+        "@amplitude/analytics-core": "^2.1.2",
         "@amplitude/analytics-types": "^2.3.1",
-        "@amplitude/plugin-page-view-tracking-browser": "^2.0.15",
-        "@amplitude/plugin-web-attribution-browser": "^2.0.15",
+        "@amplitude/plugin-page-view-tracking-browser": "^2.0.16",
+        "@amplitude/plugin-web-attribution-browser": "^2.0.16",
         "tslib": "^2.4.1"
       },
       "dependencies": {
@@ -17874,12 +17874,12 @@
       }
     },
     "@amplitude/analytics-client-common": {
-      "version": "2.0.8",
-      "resolved": "https://registry.npmjs.org/@amplitude/analytics-client-common/-/analytics-client-common-2.0.8.tgz",
-      "integrity": "sha512-zKD/txmMFPfSVtT2gdZw+Tf07pZQEcPcB6X39+a+Wh8PjIIADYIeq6zL/2pn/9uwMkVz66sbKABKbq69XxPfCA==",
+      "version": "2.0.9",
+      "resolved": "https://registry.npmjs.org/@amplitude/analytics-client-common/-/analytics-client-common-2.0.9.tgz",
+      "integrity": "sha512-2CSUMY60Jemks/XVro8ikuHBebENzb+IxnUz4YPx5fmBPW7QW+ysmD+LgECeLhv9jWIQoDhuciscPLuRENKerA==",
       "requires": {
         "@amplitude/analytics-connector": "^1.4.8",
-        "@amplitude/analytics-core": "^2.1.1",
+        "@amplitude/analytics-core": "^2.1.2",
         "@amplitude/analytics-types": "^2.3.1",
         "tslib": "^2.4.1"
       },
@@ -17897,9 +17897,9 @@
       "integrity": "sha512-T8mOYzB9RRxckzhL0NTHwdge9xuFxXEOplC8B1Y3UX3NHa3BLh7DlBUZlCOwQgMc2nxDfnSweDL5S3bhC+W90g=="
     },
     "@amplitude/analytics-core": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/@amplitude/analytics-core/-/analytics-core-2.1.1.tgz",
-      "integrity": "sha512-2dHHiOnK7J/0Uk3gqu70JEvCKSgNBAXIUvw6u7bEHCQHBBW3ulpsVRSQomBeruyBBLKjgarwgawGs3yJrjIDkA==",
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/@amplitude/analytics-core/-/analytics-core-2.1.2.tgz",
+      "integrity": "sha512-vRkP2HHh43u7vilpUrP3Q8o/TMJ6U2B7nxPV9/aUS5V/im0Zigq4mPcn5uNY7FuTwsJM3zzRxK9J2WvfdG5bqA==",
       "requires": {
         "@amplitude/analytics-types": "^2.3.1",
         "tslib": "^2.4.1"
@@ -17918,11 +17918,11 @@
       "integrity": "sha512-yojBG20qvph0rpCJKb4i/FJa+otqLINEwv//hfzvjnCOcPPyS0YscI8oiRBM0rG7kZIDgaL9a6jPwkqK4ACmcw=="
     },
     "@amplitude/plugin-page-view-tracking-browser": {
-      "version": "2.0.15",
-      "resolved": "https://registry.npmjs.org/@amplitude/plugin-page-view-tracking-browser/-/plugin-page-view-tracking-browser-2.0.15.tgz",
-      "integrity": "sha512-iVviovZWROodoNs984dAslm3vCkMsl6bhIq5K0Tabt4ffi4ygIqlhdV8vj4Grr8u6mGtjgEzFchCkxdzb9TU1A==",
+      "version": "2.0.16",
+      "resolved": "https://registry.npmjs.org/@amplitude/plugin-page-view-tracking-browser/-/plugin-page-view-tracking-browser-2.0.16.tgz",
+      "integrity": "sha512-o9YlpXm0BcnUEK47K5xAqEa/q7DOsKGb6F35gF5iGUFXTtBP+QVLTtNujfnfiO4V9g5JrkOhB/Wm2Sr34VNFhQ==",
       "requires": {
-        "@amplitude/analytics-client-common": "^2.0.8",
+        "@amplitude/analytics-client-common": "^2.0.9",
         "@amplitude/analytics-types": "^2.3.1",
         "tslib": "^2.4.1"
       },
@@ -17935,12 +17935,12 @@
       }
     },
     "@amplitude/plugin-web-attribution-browser": {
-      "version": "2.0.15",
-      "resolved": "https://registry.npmjs.org/@amplitude/plugin-web-attribution-browser/-/plugin-web-attribution-browser-2.0.15.tgz",
-      "integrity": "sha512-HSS6j2a40iSIKwug7ICzezXl6ag+cj7YU7cFbYiSF+cmNIVg4jPYgVCbTqq+IivOw+VW07pr0o+jz0ArL/Lyiw==",
+      "version": "2.0.16",
+      "resolved": "https://registry.npmjs.org/@amplitude/plugin-web-attribution-browser/-/plugin-web-attribution-browser-2.0.16.tgz",
+      "integrity": "sha512-IEYDrtZGJvBRhie7u9xIWNZhd0Z7heRx6A/+dNdERrW/akC1iAVmUyBZPMOR5ywVK7nwsymlVpFbPccuMoYTmg==",
       "requires": {
-        "@amplitude/analytics-client-common": "^2.0.8",
-        "@amplitude/analytics-core": "^2.1.1",
+        "@amplitude/analytics-client-common": "^2.0.9",
+        "@amplitude/analytics-core": "^2.1.2",
         "@amplitude/analytics-types": "^2.3.1",
         "tslib": "^2.4.1"
       },
diff --git a/apps/block_scout_web/assets/package.json b/apps/block_scout_web/assets/package.json
index 8dc4f2ca26ab..96f7ce9b82c8 100644
--- a/apps/block_scout_web/assets/package.json
+++ b/apps/block_scout_web/assets/package.json
@@ -20,7 +20,7 @@
   },
   "dependencies": {
     "@fortawesome/fontawesome-free": "^6.4.2",
-    "@amplitude/analytics-browser": "^2.3.5",
+    "@amplitude/analytics-browser": "^2.3.6",
     "@tarekraafat/autocomplete.js": "^10.2.7",
     "@walletconnect/web3-provider": "^1.8.0",
     "assert": "^2.1.0",

From e642e439a9cf4c392d86ea5e9aa09bcf6e570575 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 4 Dec 2023 18:10:31 +0000
Subject: [PATCH 716/909] Bump eslint from 8.54.0 to 8.55.0 in
 /apps/block_scout_web/assets

Bumps [eslint](https://github.com/eslint/eslint) from 8.54.0 to 8.55.0.
- [Release notes](https://github.com/eslint/eslint/releases)
- [Changelog](https://github.com/eslint/eslint/blob/main/CHANGELOG.md)
- [Commits](https://github.com/eslint/eslint/compare/v8.54.0...v8.55.0)

---
updated-dependencies:
- dependency-name: eslint
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 apps/block_scout_web/assets/package-lock.json | 46 +++++++++----------
 apps/block_scout_web/assets/package.json      |  2 +-
 2 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/apps/block_scout_web/assets/package-lock.json b/apps/block_scout_web/assets/package-lock.json
index f0b0d1b85c88..b22c7cbfbf9f 100644
--- a/apps/block_scout_web/assets/package-lock.json
+++ b/apps/block_scout_web/assets/package-lock.json
@@ -78,7 +78,7 @@
         "copy-webpack-plugin": "^11.0.0",
         "css-loader": "^6.8.1",
         "css-minimizer-webpack-plugin": "^5.0.1",
-        "eslint": "^8.54.0",
+        "eslint": "^8.55.0",
         "eslint-config-standard": "^17.1.0",
         "eslint-plugin-import": "^2.29.0",
         "eslint-plugin-node": "^11.1.0",
@@ -2054,9 +2054,9 @@
       }
     },
     "node_modules/@eslint/eslintrc": {
-      "version": "2.1.3",
-      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.1.3.tgz",
-      "integrity": "sha512-yZzuIG+jnVu6hNSzFEN07e8BxF3uAzYtQb6uDkaYZLo6oYZDCq454c5kB8zxnzfCYyP4MIuyBn10L0DqwujTmA==",
+      "version": "2.1.4",
+      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.1.4.tgz",
+      "integrity": "sha512-269Z39MS6wVJtsoUl10L60WdkhJVdPG24Q4eZTH3nnF6lpvSShEK3wQjDX9JRWAUPvPh7COouPpU9IrqaZFvtQ==",
       "dev": true,
       "dependencies": {
         "ajv": "^6.12.4",
@@ -2122,9 +2122,9 @@
       }
     },
     "node_modules/@eslint/js": {
-      "version": "8.54.0",
-      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.54.0.tgz",
-      "integrity": "sha512-ut5V+D+fOoWPgGGNj83GGjnntO39xDy6DWxO0wb7Jp3DcMX0TfIqdzHF85VTQkerdyGmuuMD9AKAo5KiNlf/AQ==",
+      "version": "8.55.0",
+      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.55.0.tgz",
+      "integrity": "sha512-qQfo2mxH5yVom1kacMtZZJFVdW+E70mqHMJvVg6WTLo+VBuQJ4TojZlfWBjK0ve5BdEeNAVxOsl/nvNMpJOaJA==",
       "dev": true,
       "engines": {
         "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
@@ -7306,15 +7306,15 @@
       }
     },
     "node_modules/eslint": {
-      "version": "8.54.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.54.0.tgz",
-      "integrity": "sha512-NY0DfAkM8BIZDVl6PgSa1ttZbx3xHgJzSNJKYcQglem6CppHyMhRIQkBVSSMaSRnLhig3jsDbEzOjwCVt4AmmA==",
+      "version": "8.55.0",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.55.0.tgz",
+      "integrity": "sha512-iyUUAM0PCKj5QpwGfmCAG9XXbZCWsqP/eWAWrG/W0umvjuLRBECwSFdt+rCntju0xEH7teIABPwXpahftIaTdA==",
       "dev": true,
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.2.0",
         "@eslint-community/regexpp": "^4.6.1",
-        "@eslint/eslintrc": "^2.1.3",
-        "@eslint/js": "8.54.0",
+        "@eslint/eslintrc": "^2.1.4",
+        "@eslint/js": "8.55.0",
         "@humanwhocodes/config-array": "^0.11.13",
         "@humanwhocodes/module-importer": "^1.0.1",
         "@nodelib/fs.walk": "^1.2.8",
@@ -19245,9 +19245,9 @@
       "dev": true
     },
     "@eslint/eslintrc": {
-      "version": "2.1.3",
-      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.1.3.tgz",
-      "integrity": "sha512-yZzuIG+jnVu6hNSzFEN07e8BxF3uAzYtQb6uDkaYZLo6oYZDCq454c5kB8zxnzfCYyP4MIuyBn10L0DqwujTmA==",
+      "version": "2.1.4",
+      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.1.4.tgz",
+      "integrity": "sha512-269Z39MS6wVJtsoUl10L60WdkhJVdPG24Q4eZTH3nnF6lpvSShEK3wQjDX9JRWAUPvPh7COouPpU9IrqaZFvtQ==",
       "dev": true,
       "requires": {
         "ajv": "^6.12.4",
@@ -19294,9 +19294,9 @@
       }
     },
     "@eslint/js": {
-      "version": "8.54.0",
-      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.54.0.tgz",
-      "integrity": "sha512-ut5V+D+fOoWPgGGNj83GGjnntO39xDy6DWxO0wb7Jp3DcMX0TfIqdzHF85VTQkerdyGmuuMD9AKAo5KiNlf/AQ==",
+      "version": "8.55.0",
+      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.55.0.tgz",
+      "integrity": "sha512-qQfo2mxH5yVom1kacMtZZJFVdW+E70mqHMJvVg6WTLo+VBuQJ4TojZlfWBjK0ve5BdEeNAVxOsl/nvNMpJOaJA==",
       "dev": true
     },
     "@ethereumjs/common": {
@@ -23254,15 +23254,15 @@
       }
     },
     "eslint": {
-      "version": "8.54.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.54.0.tgz",
-      "integrity": "sha512-NY0DfAkM8BIZDVl6PgSa1ttZbx3xHgJzSNJKYcQglem6CppHyMhRIQkBVSSMaSRnLhig3jsDbEzOjwCVt4AmmA==",
+      "version": "8.55.0",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.55.0.tgz",
+      "integrity": "sha512-iyUUAM0PCKj5QpwGfmCAG9XXbZCWsqP/eWAWrG/W0umvjuLRBECwSFdt+rCntju0xEH7teIABPwXpahftIaTdA==",
       "dev": true,
       "requires": {
         "@eslint-community/eslint-utils": "^4.2.0",
         "@eslint-community/regexpp": "^4.6.1",
-        "@eslint/eslintrc": "^2.1.3",
-        "@eslint/js": "8.54.0",
+        "@eslint/eslintrc": "^2.1.4",
+        "@eslint/js": "8.55.0",
         "@humanwhocodes/config-array": "^0.11.13",
         "@humanwhocodes/module-importer": "^1.0.1",
         "@nodelib/fs.walk": "^1.2.8",
diff --git a/apps/block_scout_web/assets/package.json b/apps/block_scout_web/assets/package.json
index 8dc4f2ca26ab..703db72a53b0 100644
--- a/apps/block_scout_web/assets/package.json
+++ b/apps/block_scout_web/assets/package.json
@@ -90,7 +90,7 @@
     "copy-webpack-plugin": "^11.0.0",
     "css-loader": "^6.8.1",
     "css-minimizer-webpack-plugin": "^5.0.1",
-    "eslint": "^8.54.0",
+    "eslint": "^8.55.0",
     "eslint-config-standard": "^17.1.0",
     "eslint-plugin-import": "^2.29.0",
     "eslint-plugin-node": "^11.1.0",

From eafeca0df91ec2016de55ce489e885b1a838f656 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 4 Dec 2023 18:11:18 +0000
Subject: [PATCH 717/909] Bump redux from 4.2.1 to 5.0.0 in
 /apps/block_scout_web/assets

Bumps [redux](https://github.com/reduxjs/redux) from 4.2.1 to 5.0.0.
- [Release notes](https://github.com/reduxjs/redux/releases)
- [Changelog](https://github.com/reduxjs/redux/blob/master/CHANGELOG.md)
- [Commits](https://github.com/reduxjs/redux/compare/v4.2.1...v5.0.0)

---
updated-dependencies:
- dependency-name: redux
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 apps/block_scout_web/assets/package-lock.json | 20 +++++++------------
 apps/block_scout_web/assets/package.json      |  2 +-
 2 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/apps/block_scout_web/assets/package-lock.json b/apps/block_scout_web/assets/package-lock.json
index f0b0d1b85c88..051235ef834d 100644
--- a/apps/block_scout_web/assets/package-lock.json
+++ b/apps/block_scout_web/assets/package-lock.json
@@ -58,7 +58,7 @@
         "pikaday": "^1.8.2",
         "popper.js": "^1.14.7",
         "reduce-reducers": "^1.0.4",
-        "redux": "^4.2.1",
+        "redux": "^5.0.0",
         "stream-browserify": "^3.0.0",
         "stream-http": "^3.1.1",
         "sweetalert2": "^11.10.1",
@@ -14800,12 +14800,9 @@
       "integrity": "sha512-Mb2WZ2bJF597exiqX7owBzrqJ74DHLK3yOQjCyPAaNifRncE8OD0wFIuoMhXxTnHK07+8zZ2SJEKy/qtiyR7vw=="
     },
     "node_modules/redux": {
-      "version": "4.2.1",
-      "resolved": "https://registry.npmjs.org/redux/-/redux-4.2.1.tgz",
-      "integrity": "sha512-LAUYz4lc+Do8/g7aeRa8JkyDErK6ekstQaqWQrNRW//MY1TvCEpMtpTWvlQ+FPbWCx+Xixu/6SHt5N0HR+SB4w==",
-      "dependencies": {
-        "@babel/runtime": "^7.9.2"
-      }
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/redux/-/redux-5.0.0.tgz",
+      "integrity": "sha512-blLIYmYetpZMET6Q6uCY7Jtl/Im5OBldy+vNPauA8vvsdqyt66oep4EUpAMWNHauTC6xa9JuRPhRB72rY82QGA=="
     },
     "node_modules/regenerate": {
       "version": "1.4.2",
@@ -28940,12 +28937,9 @@
       "integrity": "sha512-Mb2WZ2bJF597exiqX7owBzrqJ74DHLK3yOQjCyPAaNifRncE8OD0wFIuoMhXxTnHK07+8zZ2SJEKy/qtiyR7vw=="
     },
     "redux": {
-      "version": "4.2.1",
-      "resolved": "https://registry.npmjs.org/redux/-/redux-4.2.1.tgz",
-      "integrity": "sha512-LAUYz4lc+Do8/g7aeRa8JkyDErK6ekstQaqWQrNRW//MY1TvCEpMtpTWvlQ+FPbWCx+Xixu/6SHt5N0HR+SB4w==",
-      "requires": {
-        "@babel/runtime": "^7.9.2"
-      }
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/redux/-/redux-5.0.0.tgz",
+      "integrity": "sha512-blLIYmYetpZMET6Q6uCY7Jtl/Im5OBldy+vNPauA8vvsdqyt66oep4EUpAMWNHauTC6xa9JuRPhRB72rY82QGA=="
     },
     "regenerate": {
       "version": "1.4.2",
diff --git a/apps/block_scout_web/assets/package.json b/apps/block_scout_web/assets/package.json
index 8dc4f2ca26ab..b40060da8a50 100644
--- a/apps/block_scout_web/assets/package.json
+++ b/apps/block_scout_web/assets/package.json
@@ -70,7 +70,7 @@
     "pikaday": "^1.8.2",
     "popper.js": "^1.14.7",
     "reduce-reducers": "^1.0.4",
-    "redux": "^4.2.1",
+    "redux": "^5.0.0",
     "stream-browserify": "^3.0.0",
     "stream-http": "^3.1.1",
     "sweetalert2": "^11.10.1",

From bd4629bdd33c5cd8ca9578e58bceb429390aaa70 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 4 Dec 2023 18:13:20 +0000
Subject: [PATCH 718/909] Bump @babel/core from 7.23.3 to 7.23.5 in
 /apps/block_scout_web/assets

Bumps [@babel/core](https://github.com/babel/babel/tree/HEAD/packages/babel-core) from 7.23.3 to 7.23.5.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/commits/v7.23.5/packages/babel-core)

---
updated-dependencies:
- dependency-name: "@babel/core"
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 apps/block_scout_web/assets/package-lock.json | 174 +++++++++---------
 apps/block_scout_web/assets/package.json      |   2 +-
 2 files changed, 88 insertions(+), 88 deletions(-)

diff --git a/apps/block_scout_web/assets/package-lock.json b/apps/block_scout_web/assets/package-lock.json
index f0b0d1b85c88..62d9e96daccc 100644
--- a/apps/block_scout_web/assets/package-lock.json
+++ b/apps/block_scout_web/assets/package-lock.json
@@ -71,7 +71,7 @@
         "xss": "^1.0.14"
       },
       "devDependencies": {
-        "@babel/core": "^7.23.3",
+        "@babel/core": "^7.23.5",
         "@babel/preset-env": "^7.23.3",
         "autoprefixer": "^10.4.16",
         "babel-loader": "^9.1.3",
@@ -229,11 +229,11 @@
       }
     },
     "node_modules/@babel/code-frame": {
-      "version": "7.22.13",
-      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.22.13.tgz",
-      "integrity": "sha512-XktuhWlJ5g+3TJXc5upd9Ks1HutSArik6jf2eAjYFyIOf4ej3RN+184cZbzDvbPnuTJIUhPKKJE3cIsYTiAT3w==",
+      "version": "7.23.5",
+      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.23.5.tgz",
+      "integrity": "sha512-CgH3s1a96LipHCmSUmYFPwY7MNx8C3avkq7i4Wl3cfa662ldtUe4VM1TPXX70pfmrlWTb6jLqTYrZyT2ZTJBgA==",
       "dependencies": {
-        "@babel/highlight": "^7.22.13",
+        "@babel/highlight": "^7.23.4",
         "chalk": "^2.4.2"
       },
       "engines": {
@@ -249,20 +249,20 @@
       }
     },
     "node_modules/@babel/core": {
-      "version": "7.23.3",
-      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.23.3.tgz",
-      "integrity": "sha512-Jg+msLuNuCJDyBvFv5+OKOUjWMZgd85bKjbICd3zWrKAo+bJ49HJufi7CQE0q0uR8NGyO6xkCACScNqyjHSZew==",
+      "version": "7.23.5",
+      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.23.5.tgz",
+      "integrity": "sha512-Cwc2XjUrG4ilcfOw4wBAK+enbdgwAcAJCfGUItPBKR7Mjw4aEfAFYrLxeRp4jWgtNIKn3n2AlBOfwwafl+42/g==",
       "dependencies": {
         "@ampproject/remapping": "^2.2.0",
-        "@babel/code-frame": "^7.22.13",
-        "@babel/generator": "^7.23.3",
+        "@babel/code-frame": "^7.23.5",
+        "@babel/generator": "^7.23.5",
         "@babel/helper-compilation-targets": "^7.22.15",
         "@babel/helper-module-transforms": "^7.23.3",
-        "@babel/helpers": "^7.23.2",
-        "@babel/parser": "^7.23.3",
+        "@babel/helpers": "^7.23.5",
+        "@babel/parser": "^7.23.5",
         "@babel/template": "^7.22.15",
-        "@babel/traverse": "^7.23.3",
-        "@babel/types": "^7.23.3",
+        "@babel/traverse": "^7.23.5",
+        "@babel/types": "^7.23.5",
         "convert-source-map": "^2.0.0",
         "debug": "^4.1.0",
         "gensync": "^1.0.0-beta.2",
@@ -283,11 +283,11 @@
       "integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg=="
     },
     "node_modules/@babel/generator": {
-      "version": "7.23.3",
-      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.23.3.tgz",
-      "integrity": "sha512-keeZWAV4LU3tW0qRi19HRpabC/ilM0HRBBzf9/k8FFiG4KVpiv0FIy4hHfLfFQZNhziCTPTmd59zoyv6DNISzg==",
+      "version": "7.23.5",
+      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.23.5.tgz",
+      "integrity": "sha512-BPssCHrBD+0YrxviOa3QzpqwhNIXKEtOa2jQrm4FlmkC2apYgRnQcmPWiGZDlGxiNtltnUFolMe8497Esry+jA==",
       "dependencies": {
-        "@babel/types": "^7.23.3",
+        "@babel/types": "^7.23.5",
         "@jridgewell/gen-mapping": "^0.3.2",
         "@jridgewell/trace-mapping": "^0.3.17",
         "jsesc": "^2.5.1"
@@ -564,9 +564,9 @@
       }
     },
     "node_modules/@babel/helper-string-parser": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.22.5.tgz",
-      "integrity": "sha512-mM4COjgZox8U+JcXQwPijIZLElkgEpO5rsERVDJTc2qfCDfERyob6k5WegS14SX18IIjv+XD+GrqNumY5JRCDw==",
+      "version": "7.23.4",
+      "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.23.4.tgz",
+      "integrity": "sha512-803gmbQdqwdf4olxrX4AJyFBV/RTr3rSmOj0rKwesmzlfhYNDEs+/iOcznzpNWlJlIlTJC2QfPFcHB6DlzdVLQ==",
       "engines": {
         "node": ">=6.9.0"
       }
@@ -602,24 +602,24 @@
       }
     },
     "node_modules/@babel/helpers": {
-      "version": "7.23.2",
-      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.23.2.tgz",
-      "integrity": "sha512-lzchcp8SjTSVe/fPmLwtWVBFC7+Tbn8LGHDVfDp9JGxpAY5opSaEFgt8UQvrnECWOTdji2mOWMz1rOhkHscmGQ==",
+      "version": "7.23.5",
+      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.23.5.tgz",
+      "integrity": "sha512-oO7us8FzTEsG3U6ag9MfdF1iA/7Z6dz+MtFhifZk8C8o453rGJFFWUP1t+ULM9TUIAzC9uxXEiXjOiVMyd7QPg==",
       "dependencies": {
         "@babel/template": "^7.22.15",
-        "@babel/traverse": "^7.23.2",
-        "@babel/types": "^7.23.0"
+        "@babel/traverse": "^7.23.5",
+        "@babel/types": "^7.23.5"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/highlight": {
-      "version": "7.22.13",
-      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.22.13.tgz",
-      "integrity": "sha512-C/BaXcnnvBCmHTpz/VGZ8jgtE2aYlW4hxDhseJAWZb7gqGM/qtCK6iZUb0TyKFf7BOUsBH7Q7fkRsDRhg1XklQ==",
+      "version": "7.23.4",
+      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.23.4.tgz",
+      "integrity": "sha512-acGdbYSfp2WheJoJm/EBBBLh/ID8KDc64ISZ9DYtBmC8/Q204PZJLHyzeB5qMzJ5trcOkybd78M4x2KWsUq++A==",
       "dependencies": {
-        "@babel/helper-validator-identifier": "^7.22.5",
+        "@babel/helper-validator-identifier": "^7.22.20",
         "chalk": "^2.4.2",
         "js-tokens": "^4.0.0"
       },
@@ -628,9 +628,9 @@
       }
     },
     "node_modules/@babel/parser": {
-      "version": "7.23.3",
-      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.23.3.tgz",
-      "integrity": "sha512-uVsWNvlVsIninV2prNz/3lHCb+5CJ+e+IUBfbjToAHODtfGYLfCFuY4AU7TskI+dAKk+njsPiBjq1gKTvZOBaw==",
+      "version": "7.23.5",
+      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.23.5.tgz",
+      "integrity": "sha512-hOOqoiNXrmGdFbhgCzu6GiURxUgM27Xwd/aPuu8RfHEZPBzL1Z54okAHAQjXfcQNwvrlkAmAp4SlRTZ45vlthQ==",
       "bin": {
         "parser": "bin/babel-parser.js"
       },
@@ -1959,18 +1959,18 @@
       }
     },
     "node_modules/@babel/traverse": {
-      "version": "7.23.3",
-      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.23.3.tgz",
-      "integrity": "sha512-+K0yF1/9yR0oHdE0StHuEj3uTPzwwbrLGfNOndVJVV2TqA5+j3oljJUb4nmB954FLGjNem976+B+eDuLIjesiQ==",
+      "version": "7.23.5",
+      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.23.5.tgz",
+      "integrity": "sha512-czx7Xy5a6sapWWRx61m1Ke1Ra4vczu1mCTtJam5zRTBOonfdJ+S/B6HYmGYu3fJtr8GGET3si6IhgWVBhJ/m8w==",
       "dependencies": {
-        "@babel/code-frame": "^7.22.13",
-        "@babel/generator": "^7.23.3",
+        "@babel/code-frame": "^7.23.5",
+        "@babel/generator": "^7.23.5",
         "@babel/helper-environment-visitor": "^7.22.20",
         "@babel/helper-function-name": "^7.23.0",
         "@babel/helper-hoist-variables": "^7.22.5",
         "@babel/helper-split-export-declaration": "^7.22.6",
-        "@babel/parser": "^7.23.3",
-        "@babel/types": "^7.23.3",
+        "@babel/parser": "^7.23.5",
+        "@babel/types": "^7.23.5",
         "debug": "^4.1.0",
         "globals": "^11.1.0"
       },
@@ -1979,11 +1979,11 @@
       }
     },
     "node_modules/@babel/types": {
-      "version": "7.23.3",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.23.3.tgz",
-      "integrity": "sha512-OZnvoH2l8PK5eUvEcUyCt/sXgr/h+UWpVuBbOljwcrAgUl6lpchoQ++PHGyQy1AtYnVA6CEq3y5xeEI10brpXw==",
+      "version": "7.23.5",
+      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.23.5.tgz",
+      "integrity": "sha512-ON5kSOJwVO6xXVRTvOI0eOnWe7VdUcIpsovGo9U/Br4Ie4UVFQTboO2cYnDhAGU6Fp+UxSiT+pMft0SMHfuq6w==",
       "dependencies": {
-        "@babel/helper-string-parser": "^7.22.5",
+        "@babel/helper-string-parser": "^7.23.4",
         "@babel/helper-validator-identifier": "^7.22.20",
         "to-fast-properties": "^2.0.0"
       },
@@ -17973,11 +17973,11 @@
       }
     },
     "@babel/code-frame": {
-      "version": "7.22.13",
-      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.22.13.tgz",
-      "integrity": "sha512-XktuhWlJ5g+3TJXc5upd9Ks1HutSArik6jf2eAjYFyIOf4ej3RN+184cZbzDvbPnuTJIUhPKKJE3cIsYTiAT3w==",
+      "version": "7.23.5",
+      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.23.5.tgz",
+      "integrity": "sha512-CgH3s1a96LipHCmSUmYFPwY7MNx8C3avkq7i4Wl3cfa662ldtUe4VM1TPXX70pfmrlWTb6jLqTYrZyT2ZTJBgA==",
       "requires": {
-        "@babel/highlight": "^7.22.13",
+        "@babel/highlight": "^7.23.4",
         "chalk": "^2.4.2"
       }
     },
@@ -17987,20 +17987,20 @@
       "integrity": "sha512-BmR4bWbDIoFJmJ9z2cZ8Gmm2MXgEDgjdWgpKmKWUt54UGFJdlj31ECtbaDvCG/qVdG3AQ1SfpZEs01lUFbzLOQ=="
     },
     "@babel/core": {
-      "version": "7.23.3",
-      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.23.3.tgz",
-      "integrity": "sha512-Jg+msLuNuCJDyBvFv5+OKOUjWMZgd85bKjbICd3zWrKAo+bJ49HJufi7CQE0q0uR8NGyO6xkCACScNqyjHSZew==",
+      "version": "7.23.5",
+      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.23.5.tgz",
+      "integrity": "sha512-Cwc2XjUrG4ilcfOw4wBAK+enbdgwAcAJCfGUItPBKR7Mjw4aEfAFYrLxeRp4jWgtNIKn3n2AlBOfwwafl+42/g==",
       "requires": {
         "@ampproject/remapping": "^2.2.0",
-        "@babel/code-frame": "^7.22.13",
-        "@babel/generator": "^7.23.3",
+        "@babel/code-frame": "^7.23.5",
+        "@babel/generator": "^7.23.5",
         "@babel/helper-compilation-targets": "^7.22.15",
         "@babel/helper-module-transforms": "^7.23.3",
-        "@babel/helpers": "^7.23.2",
-        "@babel/parser": "^7.23.3",
+        "@babel/helpers": "^7.23.5",
+        "@babel/parser": "^7.23.5",
         "@babel/template": "^7.22.15",
-        "@babel/traverse": "^7.23.3",
-        "@babel/types": "^7.23.3",
+        "@babel/traverse": "^7.23.5",
+        "@babel/types": "^7.23.5",
         "convert-source-map": "^2.0.0",
         "debug": "^4.1.0",
         "gensync": "^1.0.0-beta.2",
@@ -18016,11 +18016,11 @@
       }
     },
     "@babel/generator": {
-      "version": "7.23.3",
-      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.23.3.tgz",
-      "integrity": "sha512-keeZWAV4LU3tW0qRi19HRpabC/ilM0HRBBzf9/k8FFiG4KVpiv0FIy4hHfLfFQZNhziCTPTmd59zoyv6DNISzg==",
+      "version": "7.23.5",
+      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.23.5.tgz",
+      "integrity": "sha512-BPssCHrBD+0YrxviOa3QzpqwhNIXKEtOa2jQrm4FlmkC2apYgRnQcmPWiGZDlGxiNtltnUFolMe8497Esry+jA==",
       "requires": {
-        "@babel/types": "^7.23.3",
+        "@babel/types": "^7.23.5",
         "@jridgewell/gen-mapping": "^0.3.2",
         "@jridgewell/trace-mapping": "^0.3.17",
         "jsesc": "^2.5.1"
@@ -18224,9 +18224,9 @@
       }
     },
     "@babel/helper-string-parser": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.22.5.tgz",
-      "integrity": "sha512-mM4COjgZox8U+JcXQwPijIZLElkgEpO5rsERVDJTc2qfCDfERyob6k5WegS14SX18IIjv+XD+GrqNumY5JRCDw=="
+      "version": "7.23.4",
+      "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.23.4.tgz",
+      "integrity": "sha512-803gmbQdqwdf4olxrX4AJyFBV/RTr3rSmOj0rKwesmzlfhYNDEs+/iOcznzpNWlJlIlTJC2QfPFcHB6DlzdVLQ=="
     },
     "@babel/helper-validator-identifier": {
       "version": "7.22.20",
@@ -18250,29 +18250,29 @@
       }
     },
     "@babel/helpers": {
-      "version": "7.23.2",
-      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.23.2.tgz",
-      "integrity": "sha512-lzchcp8SjTSVe/fPmLwtWVBFC7+Tbn8LGHDVfDp9JGxpAY5opSaEFgt8UQvrnECWOTdji2mOWMz1rOhkHscmGQ==",
+      "version": "7.23.5",
+      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.23.5.tgz",
+      "integrity": "sha512-oO7us8FzTEsG3U6ag9MfdF1iA/7Z6dz+MtFhifZk8C8o453rGJFFWUP1t+ULM9TUIAzC9uxXEiXjOiVMyd7QPg==",
       "requires": {
         "@babel/template": "^7.22.15",
-        "@babel/traverse": "^7.23.2",
-        "@babel/types": "^7.23.0"
+        "@babel/traverse": "^7.23.5",
+        "@babel/types": "^7.23.5"
       }
     },
     "@babel/highlight": {
-      "version": "7.22.13",
-      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.22.13.tgz",
-      "integrity": "sha512-C/BaXcnnvBCmHTpz/VGZ8jgtE2aYlW4hxDhseJAWZb7gqGM/qtCK6iZUb0TyKFf7BOUsBH7Q7fkRsDRhg1XklQ==",
+      "version": "7.23.4",
+      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.23.4.tgz",
+      "integrity": "sha512-acGdbYSfp2WheJoJm/EBBBLh/ID8KDc64ISZ9DYtBmC8/Q204PZJLHyzeB5qMzJ5trcOkybd78M4x2KWsUq++A==",
       "requires": {
-        "@babel/helper-validator-identifier": "^7.22.5",
+        "@babel/helper-validator-identifier": "^7.22.20",
         "chalk": "^2.4.2",
         "js-tokens": "^4.0.0"
       }
     },
     "@babel/parser": {
-      "version": "7.23.3",
-      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.23.3.tgz",
-      "integrity": "sha512-uVsWNvlVsIninV2prNz/3lHCb+5CJ+e+IUBfbjToAHODtfGYLfCFuY4AU7TskI+dAKk+njsPiBjq1gKTvZOBaw=="
+      "version": "7.23.5",
+      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.23.5.tgz",
+      "integrity": "sha512-hOOqoiNXrmGdFbhgCzu6GiURxUgM27Xwd/aPuu8RfHEZPBzL1Z54okAHAQjXfcQNwvrlkAmAp4SlRTZ45vlthQ=="
     },
     "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": {
       "version": "7.23.3",
@@ -19168,28 +19168,28 @@
       }
     },
     "@babel/traverse": {
-      "version": "7.23.3",
-      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.23.3.tgz",
-      "integrity": "sha512-+K0yF1/9yR0oHdE0StHuEj3uTPzwwbrLGfNOndVJVV2TqA5+j3oljJUb4nmB954FLGjNem976+B+eDuLIjesiQ==",
+      "version": "7.23.5",
+      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.23.5.tgz",
+      "integrity": "sha512-czx7Xy5a6sapWWRx61m1Ke1Ra4vczu1mCTtJam5zRTBOonfdJ+S/B6HYmGYu3fJtr8GGET3si6IhgWVBhJ/m8w==",
       "requires": {
-        "@babel/code-frame": "^7.22.13",
-        "@babel/generator": "^7.23.3",
+        "@babel/code-frame": "^7.23.5",
+        "@babel/generator": "^7.23.5",
         "@babel/helper-environment-visitor": "^7.22.20",
         "@babel/helper-function-name": "^7.23.0",
         "@babel/helper-hoist-variables": "^7.22.5",
         "@babel/helper-split-export-declaration": "^7.22.6",
-        "@babel/parser": "^7.23.3",
-        "@babel/types": "^7.23.3",
+        "@babel/parser": "^7.23.5",
+        "@babel/types": "^7.23.5",
         "debug": "^4.1.0",
         "globals": "^11.1.0"
       }
     },
     "@babel/types": {
-      "version": "7.23.3",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.23.3.tgz",
-      "integrity": "sha512-OZnvoH2l8PK5eUvEcUyCt/sXgr/h+UWpVuBbOljwcrAgUl6lpchoQ++PHGyQy1AtYnVA6CEq3y5xeEI10brpXw==",
+      "version": "7.23.5",
+      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.23.5.tgz",
+      "integrity": "sha512-ON5kSOJwVO6xXVRTvOI0eOnWe7VdUcIpsovGo9U/Br4Ie4UVFQTboO2cYnDhAGU6Fp+UxSiT+pMft0SMHfuq6w==",
       "requires": {
-        "@babel/helper-string-parser": "^7.22.5",
+        "@babel/helper-string-parser": "^7.23.4",
         "@babel/helper-validator-identifier": "^7.22.20",
         "to-fast-properties": "^2.0.0"
       }
diff --git a/apps/block_scout_web/assets/package.json b/apps/block_scout_web/assets/package.json
index 8dc4f2ca26ab..84cfb5faf5f1 100644
--- a/apps/block_scout_web/assets/package.json
+++ b/apps/block_scout_web/assets/package.json
@@ -83,7 +83,7 @@
     "xss": "^1.0.14"
   },
   "devDependencies": {
-    "@babel/core": "^7.23.3",
+    "@babel/core": "^7.23.5",
     "@babel/preset-env": "^7.23.3",
     "autoprefixer": "^10.4.16",
     "babel-loader": "^9.1.3",

From f3e9680401dc4d1755871398ed4cf18bb8b66331 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 4 Dec 2023 18:14:04 +0000
Subject: [PATCH 719/909] Bump photoswipe from 5.4.2 to 5.4.3 in
 /apps/block_scout_web/assets

Bumps [photoswipe](https://github.com/dimsemenov/Photoswipe) from 5.4.2 to 5.4.3.
- [Release notes](https://github.com/dimsemenov/Photoswipe/releases)
- [Commits](https://github.com/dimsemenov/Photoswipe/commits)

---
updated-dependencies:
- dependency-name: photoswipe
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 apps/block_scout_web/assets/package-lock.json | 14 +++++++-------
 apps/block_scout_web/assets/package.json      |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/apps/block_scout_web/assets/package-lock.json b/apps/block_scout_web/assets/package-lock.json
index f0b0d1b85c88..439d5ef4e52d 100644
--- a/apps/block_scout_web/assets/package-lock.json
+++ b/apps/block_scout_web/assets/package-lock.json
@@ -54,7 +54,7 @@
         "path-parser": "^6.1.0",
         "phoenix": "file:../../../deps/phoenix",
         "phoenix_html": "file:../../../deps/phoenix_html",
-        "photoswipe": "^5.4.2",
+        "photoswipe": "^5.4.3",
         "pikaday": "^1.8.2",
         "popper.js": "^1.14.7",
         "reduce-reducers": "^1.0.4",
@@ -13572,9 +13572,9 @@
       "link": true
     },
     "node_modules/photoswipe": {
-      "version": "5.4.2",
-      "resolved": "https://registry.npmjs.org/photoswipe/-/photoswipe-5.4.2.tgz",
-      "integrity": "sha512-z5hr36nAIPOZbHJPbCJ/mQ3+ZlizttF9za5gKXKH/us1k4KNHaRbC63K1Px5sVVKUtGb/2+ixHpKqtwl0WAwvA==",
+      "version": "5.4.3",
+      "resolved": "https://registry.npmjs.org/photoswipe/-/photoswipe-5.4.3.tgz",
+      "integrity": "sha512-9UC6oJBK4oXFZ5HcdlcvGkfEHsVrmE4csUdCQhEjHYb3PvPLO3PG7UhnPuOgjxwmhq5s17Un5NUdum01LgBDng==",
       "engines": {
         "node": ">= 0.12.0"
       }
@@ -28108,9 +28108,9 @@
       "version": "file:../../../deps/phoenix_html"
     },
     "photoswipe": {
-      "version": "5.4.2",
-      "resolved": "https://registry.npmjs.org/photoswipe/-/photoswipe-5.4.2.tgz",
-      "integrity": "sha512-z5hr36nAIPOZbHJPbCJ/mQ3+ZlizttF9za5gKXKH/us1k4KNHaRbC63K1Px5sVVKUtGb/2+ixHpKqtwl0WAwvA=="
+      "version": "5.4.3",
+      "resolved": "https://registry.npmjs.org/photoswipe/-/photoswipe-5.4.3.tgz",
+      "integrity": "sha512-9UC6oJBK4oXFZ5HcdlcvGkfEHsVrmE4csUdCQhEjHYb3PvPLO3PG7UhnPuOgjxwmhq5s17Un5NUdum01LgBDng=="
     },
     "picocolors": {
       "version": "1.0.0",
diff --git a/apps/block_scout_web/assets/package.json b/apps/block_scout_web/assets/package.json
index 8dc4f2ca26ab..5ed4338caa45 100644
--- a/apps/block_scout_web/assets/package.json
+++ b/apps/block_scout_web/assets/package.json
@@ -66,7 +66,7 @@
     "path-parser": "^6.1.0",
     "phoenix": "file:../../../deps/phoenix",
     "phoenix_html": "file:../../../deps/phoenix_html",
-    "photoswipe": "^5.4.2",
+    "photoswipe": "^5.4.3",
     "pikaday": "^1.8.2",
     "popper.js": "^1.14.7",
     "reduce-reducers": "^1.0.4",

From 9b43a5fb55a12eb0f1793e5c5a176f369b8d95c9 Mon Sep 17 00:00:00 2001
From: Maxim Filonov <53992153+sl1depengwyn@users.noreply.github.com>
Date: Sat, 7 Oct 2023 23:37:48 +0300
Subject: [PATCH 720/909] Fix native coin exchange rate

---
 CHANGELOG.md                                          |  1 +
 .../lib/explorer/exchange_rates/exchange_rates.ex     |  6 ++++--
 apps/explorer/lib/explorer/market/market.ex           | 11 +++++++----
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c13b70f75e4c..da9a3a4fa96e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -14,6 +14,7 @@
 - [#8915](https://github.com/blockscout/blockscout/pull/8915) - smart-contract: delete embeds_many relation on replace
 - [#8906](https://github.com/blockscout/blockscout/pull/8906) - Fix abi encoded string argument
 - [#8882](https://github.com/blockscout/blockscout/pull/8882) - Change order of proxy contracts patterns detection: existing popular EIPs to the top of the list
+- [#8707](https://github.com/blockscout/blockscout/pull/8707) - Fix native coin exchange rate with `EXCHANGE_RATES_COINGECKO_COIN_ID`
 
 ### Chore
 
diff --git a/apps/explorer/lib/explorer/exchange_rates/exchange_rates.ex b/apps/explorer/lib/explorer/exchange_rates/exchange_rates.ex
index 93155d93b851..7ffe82536881 100644
--- a/apps/explorer/lib/explorer/exchange_rates/exchange_rates.ex
+++ b/apps/explorer/lib/explorer/exchange_rates/exchange_rates.ex
@@ -84,9 +84,11 @@ defmodule Explorer.ExchangeRates do
   @doc """
   Lists exchange rates for the tracked tickers.
   """
-  @spec list :: [Token.t()]
+  @spec list :: [Token.t()] | nil
   def list do
-    list_from_store(store())
+    if enabled?() do
+      list_from_store(store())
+    end
   end
 
   @doc """
diff --git a/apps/explorer/lib/explorer/market/market.ex b/apps/explorer/lib/explorer/market/market.ex
index 5e99a147c387..3691ac4eaaf5 100644
--- a/apps/explorer/lib/explorer/market/market.ex
+++ b/apps/explorer/lib/explorer/market/market.ex
@@ -54,7 +54,7 @@ defmodule Explorer.Market do
   """
   @spec get_coin_exchange_rate() :: Token.t() | nil
   def get_coin_exchange_rate do
-    get_exchange_rate(Explorer.coin()) || get_native_coin_exchange_rate_from_db() || Token.null()
+    get_native_coin_exchange_rate_from_cache() || get_native_coin_exchange_rate_from_db() || Token.null()
   end
 
   @doc false
@@ -138,8 +138,11 @@ defmodule Explorer.Market do
     )
   end
 
-  @spec get_exchange_rate(String.t()) :: Token.t() | nil
-  defp get_exchange_rate(symbol) do
-    ExchangeRates.lookup(symbol)
+  @spec get_native_coin_exchange_rate_from_cache :: Token.t() | nil
+  defp get_native_coin_exchange_rate_from_cache do
+    case ExchangeRates.list() do
+      [native_coin] -> native_coin
+      _ -> nil
+    end
   end
 end

From 68c3daf9a3290ec9ed5772a5d2548eb34fd75578 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 4 Dec 2023 18:52:40 +0000
Subject: [PATCH 721/909] Bump ueberauth from 0.10.5 to 0.10.6

Bumps [ueberauth](https://github.com/ueberauth/ueberauth) from 0.10.5 to 0.10.6.
- [Release notes](https://github.com/ueberauth/ueberauth/releases)
- [Changelog](https://github.com/ueberauth/ueberauth/blob/master/CHANGELOG.md)
- [Commits](https://github.com/ueberauth/ueberauth/compare/v0.10.5...v0.10.6)

---
updated-dependencies:
- dependency-name: ueberauth
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 mix.lock | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/mix.lock b/mix.lock
index 343093379b85..3ccc63510368 100644
--- a/mix.lock
+++ b/mix.lock
@@ -104,7 +104,7 @@
   "phoenix_html": {:hex, :phoenix_html, "3.0.4", "232d41884fe6a9c42d09f48397c175cd6f0d443aaa34c7424da47604201df2e1", [:mix], [{:plug, "~> 1.5", [hex: :plug, repo: "hexpm", optional: true]}], "hexpm", "ce17fd3cf815b2ed874114073e743507704b1f5288bb03c304a77458485efc8b"},
   "phoenix_live_reload": {:hex, :phoenix_live_reload, "1.3.3", "3a53772a6118d5679bf50fc1670505a290e32a1d195df9e069d8c53ab040c054", [:mix], [{:file_system, "~> 0.2.1 or ~> 0.3", [hex: :file_system, repo: "hexpm", optional: false]}, {:phoenix, "~> 1.4", [hex: :phoenix, repo: "hexpm", optional: false]}], "hexpm", "766796676e5f558dbae5d1bdb066849673e956005e3730dfd5affd7a6da4abac"},
   "phoenix_pubsub": {:hex, :phoenix_pubsub, "2.1.3", "3168d78ba41835aecad272d5e8cd51aa87a7ac9eb836eabc42f6e57538e3731d", [:mix], [], "hexpm", "bba06bc1dcfd8cb086759f0edc94a8ba2bc8896d5331a1e2c2902bf8e36ee502"},
-  "plug": {:hex, :plug, "1.15.1", "b7efd81c1a1286f13efb3f769de343236bd8b7d23b4a9f40d3002fc39ad8f74c", [:mix], [{:mime, "~> 1.0 or ~> 2.0", [hex: :mime, repo: "hexpm", optional: false]}, {:plug_crypto, "~> 1.1.1 or ~> 1.2 or ~> 2.0", [hex: :plug_crypto, repo: "hexpm", optional: false]}, {:telemetry, "~> 0.4.3 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "459497bd94d041d98d948054ec6c0b76feacd28eec38b219ca04c0de13c79d30"},
+  "plug": {:hex, :plug, "1.15.2", "94cf1fa375526f30ff8770837cb804798e0045fd97185f0bb9e5fcd858c792a3", [:mix], [{:mime, "~> 1.0 or ~> 2.0", [hex: :mime, repo: "hexpm", optional: false]}, {:plug_crypto, "~> 1.1.1 or ~> 1.2 or ~> 2.0", [hex: :plug_crypto, repo: "hexpm", optional: false]}, {:telemetry, "~> 0.4.3 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "02731fa0c2dcb03d8d21a1d941bdbbe99c2946c0db098eee31008e04c6283615"},
   "plug_cowboy": {:hex, :plug_cowboy, "2.6.1", "9a3bbfceeb65eff5f39dab529e5cd79137ac36e913c02067dba3963a26efe9b2", [:mix], [{:cowboy, "~> 2.7", [hex: :cowboy, repo: "hexpm", optional: false]}, {:cowboy_telemetry, "~> 0.3", [hex: :cowboy_telemetry, repo: "hexpm", optional: false]}, {:plug, "~> 1.14", [hex: :plug, repo: "hexpm", optional: false]}], "hexpm", "de36e1a21f451a18b790f37765db198075c25875c64834bcc82d90b309eb6613"},
   "plug_crypto": {:hex, :plug_crypto, "1.2.5", "918772575e48e81e455818229bf719d4ab4181fcbf7f85b68a35620f78d89ced", [:mix], [], "hexpm", "26549a1d6345e2172eb1c233866756ae44a9609bd33ee6f99147ab3fd87fd842"},
   "poison": {:hex, :poison, "4.0.1", "bcb755a16fac91cad79bfe9fc3585bb07b9331e50cfe3420a24bcc2d735709ae", [:mix], [], "hexpm", "ba8836feea4b394bb718a161fc59a288fe0109b5006d6bdf97b6badfcf6f0f25"},
@@ -136,7 +136,7 @@
   "timex": {:hex, :timex, "3.7.11", "bb95cb4eb1d06e27346325de506bcc6c30f9c6dea40d1ebe390b262fad1862d1", [:mix], [{:combine, "~> 0.10", [hex: :combine, repo: "hexpm", optional: false]}, {:gettext, "~> 0.20", [hex: :gettext, repo: "hexpm", optional: false]}, {:tzdata, "~> 1.1", [hex: :tzdata, repo: "hexpm", optional: false]}], "hexpm", "8b9024f7efbabaf9bd7aa04f65cf8dcd7c9818ca5737677c7b76acbc6a94d1aa"},
   "toml": {:hex, :toml, "0.6.2", "38f445df384a17e5d382befe30e3489112a48d3ba4c459e543f748c2f25dd4d1", [:mix], [], "hexpm", "d013e45126d74c0c26a38d31f5e8e9b83ea19fc752470feb9a86071ca5a672fa"},
   "tzdata": {:hex, :tzdata, "1.1.1", "20c8043476dfda8504952d00adac41c6eda23912278add38edc140ae0c5bcc46", [:mix], [{:hackney, "~> 1.17", [hex: :hackney, repo: "hexpm", optional: false]}], "hexpm", "a69cec8352eafcd2e198dea28a34113b60fdc6cb57eb5ad65c10292a6ba89787"},
-  "ueberauth": {:hex, :ueberauth, "0.10.5", "806adb703df87e55b5615cf365e809f84c20c68aa8c08ff8a416a5a6644c4b02", [:mix], [{:plug, "~> 1.5", [hex: :plug, repo: "hexpm", optional: false]}], "hexpm", "3efd1f31d490a125c7ed453b926f7c31d78b97b8a854c755f5c40064bf3ac9e1"},
+  "ueberauth": {:hex, :ueberauth, "0.10.6", "8dbefd5aec30c5830af2b6ce6e03f62cc28ae0757f34e2986454f54b8dca3f65", [:mix], [{:plug, "~> 1.5", [hex: :plug, repo: "hexpm", optional: false]}], "hexpm", "b0ad1c7508f3cfd5c2c1c668d1a32bafd77de4c56af82c7bfd7e54ed078a7928"},
   "ueberauth_auth0": {:hex, :ueberauth_auth0, "2.1.0", "0632d5844049fa2f26823f15e1120aa32f27df6f27ce515a4b04641736594bf4", [:mix], [{:oauth2, "~> 2.0", [hex: :oauth2, repo: "hexpm", optional: false]}, {:ueberauth, "~> 0.7", [hex: :ueberauth, repo: "hexpm", optional: false]}], "hexpm", "8d3b30fa27c95c9e82c30c4afb016251405706d2e9627e603c3c9787fd1314fc"},
   "unicode_util_compat": {:hex, :unicode_util_compat, "0.7.0", "bc84380c9ab48177092f43ac89e4dfa2c6d62b40b8bd132b1059ecc7232f9a78", [:rebar3], [], "hexpm", "25eee6d67df61960cf6a794239566599b09e17e668d3700247bc498638152521"},
   "wallaby": {:hex, :wallaby, "0.30.6", "7dc4c1213f3b52c4152581d126632bc7e06892336d3a0f582853efeeabd45a71", [:mix], [{:ecto_sql, ">= 3.0.0", [hex: :ecto_sql, repo: "hexpm", optional: true]}, {:httpoison, "~> 0.12 or ~> 1.0 or ~> 2.0", [hex: :httpoison, repo: "hexpm", optional: false]}, {:jason, "~> 1.1", [hex: :jason, repo: "hexpm", optional: false]}, {:phoenix_ecto, ">= 3.0.0", [hex: :phoenix_ecto, repo: "hexpm", optional: true]}, {:web_driver_client, "~> 0.2.0", [hex: :web_driver_client, repo: "hexpm", optional: false]}], "hexpm", "50950c1d968549b54c20e16175c68c7fc0824138e2bb93feb11ef6add8eb23d4"},

From 2005afd9332f01c615fc3c5aac674328bcb191af Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 4 Dec 2023 18:53:34 +0000
Subject: [PATCH 722/909] Bump postgrex from 0.17.3 to 0.17.4

Bumps [postgrex](https://github.com/elixir-ecto/postgrex) from 0.17.3 to 0.17.4.
- [Release notes](https://github.com/elixir-ecto/postgrex/releases)
- [Changelog](https://github.com/elixir-ecto/postgrex/blob/master/CHANGELOG.md)
- [Commits](https://github.com/elixir-ecto/postgrex/compare/v0.17.3...v0.17.4)

---
updated-dependencies:
- dependency-name: postgrex
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 mix.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mix.lock b/mix.lock
index 343093379b85..c35432d85102 100644
--- a/mix.lock
+++ b/mix.lock
@@ -109,7 +109,7 @@
   "plug_crypto": {:hex, :plug_crypto, "1.2.5", "918772575e48e81e455818229bf719d4ab4181fcbf7f85b68a35620f78d89ced", [:mix], [], "hexpm", "26549a1d6345e2172eb1c233866756ae44a9609bd33ee6f99147ab3fd87fd842"},
   "poison": {:hex, :poison, "4.0.1", "bcb755a16fac91cad79bfe9fc3585bb07b9331e50cfe3420a24bcc2d735709ae", [:mix], [], "hexpm", "ba8836feea4b394bb718a161fc59a288fe0109b5006d6bdf97b6badfcf6f0f25"},
   "poolboy": {:hex, :poolboy, "1.5.2", "392b007a1693a64540cead79830443abf5762f5d30cf50bc95cb2c1aaafa006b", [:rebar3], [], "hexpm", "dad79704ce5440f3d5a3681c8590b9dc25d1a561e8f5a9c995281012860901e3"},
-  "postgrex": {:hex, :postgrex, "0.17.3", "c92cda8de2033a7585dae8c61b1d420a1a1322421df84da9a82a6764580c503d", [:mix], [{:db_connection, "~> 2.1", [hex: :db_connection, repo: "hexpm", optional: false]}, {:decimal, "~> 1.5 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}, {:table, "~> 0.1.0", [hex: :table, repo: "hexpm", optional: true]}], "hexpm", "946cf46935a4fdca7a81448be76ba3503cff082df42c6ec1ff16a4bdfbfb098d"},
+  "postgrex": {:hex, :postgrex, "0.17.4", "5777781f80f53b7c431a001c8dad83ee167bcebcf3a793e3906efff680ab62b3", [:mix], [{:db_connection, "~> 2.1", [hex: :db_connection, repo: "hexpm", optional: false]}, {:decimal, "~> 1.5 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}, {:table, "~> 0.1.0", [hex: :table, repo: "hexpm", optional: true]}], "hexpm", "6458f7d5b70652bc81c3ea759f91736c16a31be000f306d3c64bcdfe9a18b3cc"},
   "prometheus": {:hex, :prometheus, "4.11.0", "b95f8de8530f541bd95951e18e355a840003672e5eda4788c5fa6183406ba29a", [:mix, :rebar3], [{:quantile_estimator, "~> 0.2.1", [hex: :quantile_estimator, repo: "hexpm", optional: false]}], "hexpm", "719862351aabf4df7079b05dc085d2bbcbe3ac0ac3009e956671b1d5ab88247d"},
   "prometheus_ecto": {:hex, :prometheus_ecto, "1.4.3", "3dd4da1812b8e0dbee81ea58bb3b62ed7588f2eae0c9e97e434c46807ff82311", [:mix], [{:ecto, "~> 2.0 or ~> 3.0", [hex: :ecto, repo: "hexpm", optional: false]}, {:prometheus_ex, "~> 1.1 or ~> 2.0 or ~> 3.0", [hex: :prometheus_ex, repo: "hexpm", optional: false]}], "hexpm", "8d66289f77f913b37eda81fd287340c17e61a447549deb28efc254532b2bed82"},
   "prometheus_ex": {:git, "https://github.com/lanodan/prometheus.ex", "31f7fbe4b71b79ba27efc2a5085746c4011ceb8f", [branch: "fix/elixir-1.14"]},

From 171b6d6458213c3883b6ada9620b9da307f9d76a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 4 Dec 2023 19:39:47 +0000
Subject: [PATCH 723/909] Bump @babel/preset-env in
 /apps/block_scout_web/assets

Bumps [@babel/preset-env](https://github.com/babel/babel/tree/HEAD/packages/babel-preset-env) from 7.23.3 to 7.23.5.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/commits/v7.23.5/packages/babel-preset-env)

---
updated-dependencies:
- dependency-name: "@babel/preset-env"
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 apps/block_scout_web/assets/package-lock.json | 270 +++++++++---------
 apps/block_scout_web/assets/package.json      |   2 +-
 2 files changed, 136 insertions(+), 136 deletions(-)

diff --git a/apps/block_scout_web/assets/package-lock.json b/apps/block_scout_web/assets/package-lock.json
index e28212c234b7..9c14d4eff86e 100644
--- a/apps/block_scout_web/assets/package-lock.json
+++ b/apps/block_scout_web/assets/package-lock.json
@@ -72,7 +72,7 @@
       },
       "devDependencies": {
         "@babel/core": "^7.23.5",
-        "@babel/preset-env": "^7.23.3",
+        "@babel/preset-env": "^7.23.5",
         "autoprefixer": "^10.4.16",
         "babel-loader": "^9.1.3",
         "copy-webpack-plugin": "^11.0.0",
@@ -241,9 +241,9 @@
       }
     },
     "node_modules/@babel/compat-data": {
-      "version": "7.23.3",
-      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.23.3.tgz",
-      "integrity": "sha512-BmR4bWbDIoFJmJ9z2cZ8Gmm2MXgEDgjdWgpKmKWUt54UGFJdlj31ECtbaDvCG/qVdG3AQ1SfpZEs01lUFbzLOQ==",
+      "version": "7.23.5",
+      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.23.5.tgz",
+      "integrity": "sha512-uU27kfDRlhfKl+w1U6vp16IuvSLtjAxdArVXPa9BvLkrr7CYIsxH5adpHObeAGY/41+syctUWOZ140a2Rvkgjw==",
       "engines": {
         "node": ">=6.9.0"
       }
@@ -580,9 +580,9 @@
       }
     },
     "node_modules/@babel/helper-validator-option": {
-      "version": "7.22.15",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.22.15.tgz",
-      "integrity": "sha512-bMn7RmyFjY/mdECUbgn9eoSY4vqvacUnS9i9vGAGttgFWesO6B4CYWA7XlpbWgBt71iv/hfbPlynohStqnu5hA==",
+      "version": "7.23.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.23.5.tgz",
+      "integrity": "sha512-85ttAOMLsr53VgXkTbkx8oA6YTfT4q7/HzXSLEYmjcSTJPMPQtvq1BD79Byep5xMUYbGRzEpDsjUf3dyp54IKw==",
       "engines": {
         "node": ">=6.9.0"
       }
@@ -991,9 +991,9 @@
       }
     },
     "node_modules/@babel/plugin-transform-async-generator-functions": {
-      "version": "7.23.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-generator-functions/-/plugin-transform-async-generator-functions-7.23.3.tgz",
-      "integrity": "sha512-59GsVNavGxAXCDDbakWSMJhajASb4kBCqDjqJsv+p5nKdbz7istmZ3HrX3L2LuiI80+zsOADCvooqQH3qGCucQ==",
+      "version": "7.23.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-generator-functions/-/plugin-transform-async-generator-functions-7.23.4.tgz",
+      "integrity": "sha512-efdkfPhHYTtn0G6n2ddrESE91fgXxjlqLsnUtPWnJs4a4mZIbUaK7ffqKIIUKXSHwcDvaCVX6GXkaJJFqtX7jw==",
       "dev": true,
       "dependencies": {
         "@babel/helper-environment-visitor": "^7.22.20",
@@ -1041,9 +1041,9 @@
       }
     },
     "node_modules/@babel/plugin-transform-block-scoping": {
-      "version": "7.23.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.23.3.tgz",
-      "integrity": "sha512-QPZxHrThbQia7UdvfpaRRlq/J9ciz1J4go0k+lPBXbgaNeY7IQrBj/9ceWjvMMI07/ZBzHl/F0R/2K0qH7jCVw==",
+      "version": "7.23.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.23.4.tgz",
+      "integrity": "sha512-0QqbP6B6HOh7/8iNR4CQU2Th/bbRtBp4KS9vcaZd1fZ0wSh5Fyssg0UCIHwxh+ka+pNDREbVLQnHCMHKZfPwfw==",
       "dev": true,
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.22.5"
@@ -1072,9 +1072,9 @@
       }
     },
     "node_modules/@babel/plugin-transform-class-static-block": {
-      "version": "7.23.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-class-static-block/-/plugin-transform-class-static-block-7.23.3.tgz",
-      "integrity": "sha512-PENDVxdr7ZxKPyi5Ffc0LjXdnJyrJxyqF5T5YjlVg4a0VFfQHW0r8iAtRiDXkfHlu1wwcvdtnndGYIeJLSuRMQ==",
+      "version": "7.23.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-class-static-block/-/plugin-transform-class-static-block-7.23.4.tgz",
+      "integrity": "sha512-nsWu/1M+ggti1SOALj3hfx5FXzAY06fwPJsUZD4/A5e1bWi46VUIWtD+kOX6/IdhXGsXBWllLFDSnqSCdUNydQ==",
       "dev": true,
       "dependencies": {
         "@babel/helper-create-class-features-plugin": "^7.22.15",
@@ -1089,9 +1089,9 @@
       }
     },
     "node_modules/@babel/plugin-transform-classes": {
-      "version": "7.23.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.23.3.tgz",
-      "integrity": "sha512-FGEQmugvAEu2QtgtU0uTASXevfLMFfBeVCIIdcQhn/uBQsMTjBajdnAtanQlOcuihWh10PZ7+HWvc7NtBwP74w==",
+      "version": "7.23.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.23.5.tgz",
+      "integrity": "sha512-jvOTR4nicqYC9yzOHIhXG5emiFEOpappSJAl73SDSEDcybD+Puuze8Tnpb9p9qEyYup24tq891gkaygIFvWDqg==",
       "dev": true,
       "dependencies": {
         "@babel/helper-annotate-as-pure": "^7.22.5",
@@ -1174,9 +1174,9 @@
       }
     },
     "node_modules/@babel/plugin-transform-dynamic-import": {
-      "version": "7.23.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dynamic-import/-/plugin-transform-dynamic-import-7.23.3.tgz",
-      "integrity": "sha512-vTG+cTGxPFou12Rj7ll+eD5yWeNl5/8xvQvF08y5Gv3v4mZQoyFf8/n9zg4q5vvCWt5jmgymfzMAldO7orBn7A==",
+      "version": "7.23.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dynamic-import/-/plugin-transform-dynamic-import-7.23.4.tgz",
+      "integrity": "sha512-V6jIbLhdJK86MaLh4Jpghi8ho5fGzt3imHOBu/x0jlBaPYqDoWz4RDXjmMOfnh+JWNaQleEAByZLV0QzBT4YQQ==",
       "dev": true,
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.22.5",
@@ -1206,9 +1206,9 @@
       }
     },
     "node_modules/@babel/plugin-transform-export-namespace-from": {
-      "version": "7.23.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-export-namespace-from/-/plugin-transform-export-namespace-from-7.23.3.tgz",
-      "integrity": "sha512-yCLhW34wpJWRdTxxWtFZASJisihrfyMOTOQexhVzA78jlU+dH7Dw+zQgcPepQ5F3C6bAIiblZZ+qBggJdHiBAg==",
+      "version": "7.23.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-export-namespace-from/-/plugin-transform-export-namespace-from-7.23.4.tgz",
+      "integrity": "sha512-GzuSBcKkx62dGzZI1WVgTWvkkz84FZO5TC5T8dl/Tht/rAla6Dg/Mz9Yhypg+ezVACf/rgDuQt3kbWEv7LdUDQ==",
       "dev": true,
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.22.5",
@@ -1254,9 +1254,9 @@
       }
     },
     "node_modules/@babel/plugin-transform-json-strings": {
-      "version": "7.23.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-json-strings/-/plugin-transform-json-strings-7.23.3.tgz",
-      "integrity": "sha512-H9Ej2OiISIZowZHaBwF0tsJOih1PftXJtE8EWqlEIwpc7LMTGq0rPOrywKLQ4nefzx8/HMR0D3JGXoMHYvhi0A==",
+      "version": "7.23.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-json-strings/-/plugin-transform-json-strings-7.23.4.tgz",
+      "integrity": "sha512-81nTOqM1dMwZ/aRXQ59zVubN9wHGqk6UtqRK+/q+ciXmRy8fSolhGVvG09HHRGo4l6fr/c4ZhXUQH0uFW7PZbg==",
       "dev": true,
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.22.5",
@@ -1285,9 +1285,9 @@
       }
     },
     "node_modules/@babel/plugin-transform-logical-assignment-operators": {
-      "version": "7.23.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-logical-assignment-operators/-/plugin-transform-logical-assignment-operators-7.23.3.tgz",
-      "integrity": "sha512-+pD5ZbxofyOygEp+zZAfujY2ShNCXRpDRIPOiBmTO693hhyOEteZgl876Xs9SAHPQpcV0vz8LvA/T+w8AzyX8A==",
+      "version": "7.23.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-logical-assignment-operators/-/plugin-transform-logical-assignment-operators-7.23.4.tgz",
+      "integrity": "sha512-Mc/ALf1rmZTP4JKKEhUwiORU+vcfarFVLfcFiolKUo6sewoxSEgl36ak5t+4WamRsNr6nzjZXQjM35WsU+9vbg==",
       "dev": true,
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.22.5",
@@ -1414,9 +1414,9 @@
       }
     },
     "node_modules/@babel/plugin-transform-nullish-coalescing-operator": {
-      "version": "7.23.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-nullish-coalescing-operator/-/plugin-transform-nullish-coalescing-operator-7.23.3.tgz",
-      "integrity": "sha512-xzg24Lnld4DYIdysyf07zJ1P+iIfJpxtVFOzX4g+bsJ3Ng5Le7rXx9KwqKzuyaUeRnt+I1EICwQITqc0E2PmpA==",
+      "version": "7.23.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-nullish-coalescing-operator/-/plugin-transform-nullish-coalescing-operator-7.23.4.tgz",
+      "integrity": "sha512-jHE9EVVqHKAQx+VePv5LLGHjmHSJR76vawFPTdlxR/LVJPfOEGxREQwQfjuZEOPTwG92X3LINSh3M40Rv4zpVA==",
       "dev": true,
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.22.5",
@@ -1430,9 +1430,9 @@
       }
     },
     "node_modules/@babel/plugin-transform-numeric-separator": {
-      "version": "7.23.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-numeric-separator/-/plugin-transform-numeric-separator-7.23.3.tgz",
-      "integrity": "sha512-s9GO7fIBi/BLsZ0v3Rftr6Oe4t0ctJ8h4CCXfPoEJwmvAPMyNrfkOOJzm6b9PX9YXcCJWWQd/sBF/N26eBiMVw==",
+      "version": "7.23.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-numeric-separator/-/plugin-transform-numeric-separator-7.23.4.tgz",
+      "integrity": "sha512-mps6auzgwjRrwKEZA05cOwuDc9FAzoyFS4ZsG/8F43bTLf/TgkJg7QXOrPO1JO599iA3qgK9MXdMGOEC8O1h6Q==",
       "dev": true,
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.22.5",
@@ -1446,9 +1446,9 @@
       }
     },
     "node_modules/@babel/plugin-transform-object-rest-spread": {
-      "version": "7.23.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-rest-spread/-/plugin-transform-object-rest-spread-7.23.3.tgz",
-      "integrity": "sha512-VxHt0ANkDmu8TANdE9Kc0rndo/ccsmfe2Cx2y5sI4hu3AukHQ5wAu4cM7j3ba8B9548ijVyclBU+nuDQftZsog==",
+      "version": "7.23.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-rest-spread/-/plugin-transform-object-rest-spread-7.23.4.tgz",
+      "integrity": "sha512-9x9K1YyeQVw0iOXJlIzwm8ltobIIv7j2iLyP2jIhEbqPRQ7ScNgwQufU2I0Gq11VjyG4gI4yMXt2VFags+1N3g==",
       "dev": true,
       "dependencies": {
         "@babel/compat-data": "^7.23.3",
@@ -1481,9 +1481,9 @@
       }
     },
     "node_modules/@babel/plugin-transform-optional-catch-binding": {
-      "version": "7.23.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-optional-catch-binding/-/plugin-transform-optional-catch-binding-7.23.3.tgz",
-      "integrity": "sha512-LxYSb0iLjUamfm7f1D7GpiS4j0UAC8AOiehnsGAP8BEsIX8EOi3qV6bbctw8M7ZvLtcoZfZX5Z7rN9PlWk0m5A==",
+      "version": "7.23.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-optional-catch-binding/-/plugin-transform-optional-catch-binding-7.23.4.tgz",
+      "integrity": "sha512-XIq8t0rJPHf6Wvmbn9nFxU6ao4c7WhghTR5WyV8SrJfUFzyxhCm4nhC+iAp3HFhbAKLfYpgzhJ6t4XCtVwqO5A==",
       "dev": true,
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.22.5",
@@ -1497,9 +1497,9 @@
       }
     },
     "node_modules/@babel/plugin-transform-optional-chaining": {
-      "version": "7.23.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-optional-chaining/-/plugin-transform-optional-chaining-7.23.3.tgz",
-      "integrity": "sha512-zvL8vIfIUgMccIAK1lxjvNv572JHFJIKb4MWBz5OGdBQA0fB0Xluix5rmOby48exiJc987neOmP/m9Fnpkz3Tg==",
+      "version": "7.23.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-optional-chaining/-/plugin-transform-optional-chaining-7.23.4.tgz",
+      "integrity": "sha512-ZU8y5zWOfjM5vZ+asjgAPwDaBjJzgufjES89Rs4Lpq63O300R/kOz30WCLo6BxxX6QVEilwSlpClnG5cZaikTA==",
       "dev": true,
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.22.5",
@@ -1545,9 +1545,9 @@
       }
     },
     "node_modules/@babel/plugin-transform-private-property-in-object": {
-      "version": "7.23.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-private-property-in-object/-/plugin-transform-private-property-in-object-7.23.3.tgz",
-      "integrity": "sha512-a5m2oLNFyje2e/rGKjVfAELTVI5mbA0FeZpBnkOWWV7eSmKQ+T/XW0Vf+29ScLzSxX+rnsarvU0oie/4m6hkxA==",
+      "version": "7.23.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-private-property-in-object/-/plugin-transform-private-property-in-object-7.23.4.tgz",
+      "integrity": "sha512-9G3K1YqTq3F4Vt88Djx1UZ79PDyj+yKRnUy7cZGSMe+a7jkwD259uKKuUzQlPkGam7R+8RJwh5z4xO27fA1o2A==",
       "dev": true,
       "dependencies": {
         "@babel/helper-annotate-as-pure": "^7.22.5",
@@ -1779,15 +1779,15 @@
       }
     },
     "node_modules/@babel/preset-env": {
-      "version": "7.23.3",
-      "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.23.3.tgz",
-      "integrity": "sha512-ovzGc2uuyNfNAs/jyjIGxS8arOHS5FENZaNn4rtE7UdKMMkqHCvboHfcuhWLZNX5cB44QfcGNWjaevxMzzMf+Q==",
+      "version": "7.23.5",
+      "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.23.5.tgz",
+      "integrity": "sha512-0d/uxVD6tFGWXGDSfyMD1p2otoaKmu6+GD+NfAx0tMaH+dxORnp7T9TaVQ6mKyya7iBtCIVxHjWT7MuzzM9z+A==",
       "dev": true,
       "dependencies": {
-        "@babel/compat-data": "^7.23.3",
+        "@babel/compat-data": "^7.23.5",
         "@babel/helper-compilation-targets": "^7.22.15",
         "@babel/helper-plugin-utils": "^7.22.5",
-        "@babel/helper-validator-option": "^7.22.15",
+        "@babel/helper-validator-option": "^7.23.5",
         "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": "^7.23.3",
         "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": "^7.23.3",
         "@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly": "^7.23.3",
@@ -1811,25 +1811,25 @@
         "@babel/plugin-syntax-top-level-await": "^7.14.5",
         "@babel/plugin-syntax-unicode-sets-regex": "^7.18.6",
         "@babel/plugin-transform-arrow-functions": "^7.23.3",
-        "@babel/plugin-transform-async-generator-functions": "^7.23.3",
+        "@babel/plugin-transform-async-generator-functions": "^7.23.4",
         "@babel/plugin-transform-async-to-generator": "^7.23.3",
         "@babel/plugin-transform-block-scoped-functions": "^7.23.3",
-        "@babel/plugin-transform-block-scoping": "^7.23.3",
+        "@babel/plugin-transform-block-scoping": "^7.23.4",
         "@babel/plugin-transform-class-properties": "^7.23.3",
-        "@babel/plugin-transform-class-static-block": "^7.23.3",
-        "@babel/plugin-transform-classes": "^7.23.3",
+        "@babel/plugin-transform-class-static-block": "^7.23.4",
+        "@babel/plugin-transform-classes": "^7.23.5",
         "@babel/plugin-transform-computed-properties": "^7.23.3",
         "@babel/plugin-transform-destructuring": "^7.23.3",
         "@babel/plugin-transform-dotall-regex": "^7.23.3",
         "@babel/plugin-transform-duplicate-keys": "^7.23.3",
-        "@babel/plugin-transform-dynamic-import": "^7.23.3",
+        "@babel/plugin-transform-dynamic-import": "^7.23.4",
         "@babel/plugin-transform-exponentiation-operator": "^7.23.3",
-        "@babel/plugin-transform-export-namespace-from": "^7.23.3",
+        "@babel/plugin-transform-export-namespace-from": "^7.23.4",
         "@babel/plugin-transform-for-of": "^7.23.3",
         "@babel/plugin-transform-function-name": "^7.23.3",
-        "@babel/plugin-transform-json-strings": "^7.23.3",
+        "@babel/plugin-transform-json-strings": "^7.23.4",
         "@babel/plugin-transform-literals": "^7.23.3",
-        "@babel/plugin-transform-logical-assignment-operators": "^7.23.3",
+        "@babel/plugin-transform-logical-assignment-operators": "^7.23.4",
         "@babel/plugin-transform-member-expression-literals": "^7.23.3",
         "@babel/plugin-transform-modules-amd": "^7.23.3",
         "@babel/plugin-transform-modules-commonjs": "^7.23.3",
@@ -1837,15 +1837,15 @@
         "@babel/plugin-transform-modules-umd": "^7.23.3",
         "@babel/plugin-transform-named-capturing-groups-regex": "^7.22.5",
         "@babel/plugin-transform-new-target": "^7.23.3",
-        "@babel/plugin-transform-nullish-coalescing-operator": "^7.23.3",
-        "@babel/plugin-transform-numeric-separator": "^7.23.3",
-        "@babel/plugin-transform-object-rest-spread": "^7.23.3",
+        "@babel/plugin-transform-nullish-coalescing-operator": "^7.23.4",
+        "@babel/plugin-transform-numeric-separator": "^7.23.4",
+        "@babel/plugin-transform-object-rest-spread": "^7.23.4",
         "@babel/plugin-transform-object-super": "^7.23.3",
-        "@babel/plugin-transform-optional-catch-binding": "^7.23.3",
-        "@babel/plugin-transform-optional-chaining": "^7.23.3",
+        "@babel/plugin-transform-optional-catch-binding": "^7.23.4",
+        "@babel/plugin-transform-optional-chaining": "^7.23.4",
         "@babel/plugin-transform-parameters": "^7.23.3",
         "@babel/plugin-transform-private-methods": "^7.23.3",
-        "@babel/plugin-transform-private-property-in-object": "^7.23.3",
+        "@babel/plugin-transform-private-property-in-object": "^7.23.4",
         "@babel/plugin-transform-property-literals": "^7.23.3",
         "@babel/plugin-transform-regenerator": "^7.23.3",
         "@babel/plugin-transform-reserved-words": "^7.23.3",
@@ -17982,9 +17982,9 @@
       }
     },
     "@babel/compat-data": {
-      "version": "7.23.3",
-      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.23.3.tgz",
-      "integrity": "sha512-BmR4bWbDIoFJmJ9z2cZ8Gmm2MXgEDgjdWgpKmKWUt54UGFJdlj31ECtbaDvCG/qVdG3AQ1SfpZEs01lUFbzLOQ=="
+      "version": "7.23.5",
+      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.23.5.tgz",
+      "integrity": "sha512-uU27kfDRlhfKl+w1U6vp16IuvSLtjAxdArVXPa9BvLkrr7CYIsxH5adpHObeAGY/41+syctUWOZ140a2Rvkgjw=="
     },
     "@babel/core": {
       "version": "7.23.5",
@@ -18234,9 +18234,9 @@
       "integrity": "sha512-Y4OZ+ytlatR8AI+8KZfKuL5urKp7qey08ha31L8b3BwewJAoJamTzyvxPR/5D+KkdJCGPq/+8TukHBlY10FX9A=="
     },
     "@babel/helper-validator-option": {
-      "version": "7.22.15",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.22.15.tgz",
-      "integrity": "sha512-bMn7RmyFjY/mdECUbgn9eoSY4vqvacUnS9i9vGAGttgFWesO6B4CYWA7XlpbWgBt71iv/hfbPlynohStqnu5hA=="
+      "version": "7.23.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.23.5.tgz",
+      "integrity": "sha512-85ttAOMLsr53VgXkTbkx8oA6YTfT4q7/HzXSLEYmjcSTJPMPQtvq1BD79Byep5xMUYbGRzEpDsjUf3dyp54IKw=="
     },
     "@babel/helper-wrap-function": {
       "version": "7.22.20",
@@ -18511,9 +18511,9 @@
       }
     },
     "@babel/plugin-transform-async-generator-functions": {
-      "version": "7.23.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-generator-functions/-/plugin-transform-async-generator-functions-7.23.3.tgz",
-      "integrity": "sha512-59GsVNavGxAXCDDbakWSMJhajASb4kBCqDjqJsv+p5nKdbz7istmZ3HrX3L2LuiI80+zsOADCvooqQH3qGCucQ==",
+      "version": "7.23.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-generator-functions/-/plugin-transform-async-generator-functions-7.23.4.tgz",
+      "integrity": "sha512-efdkfPhHYTtn0G6n2ddrESE91fgXxjlqLsnUtPWnJs4a4mZIbUaK7ffqKIIUKXSHwcDvaCVX6GXkaJJFqtX7jw==",
       "dev": true,
       "requires": {
         "@babel/helper-environment-visitor": "^7.22.20",
@@ -18543,9 +18543,9 @@
       }
     },
     "@babel/plugin-transform-block-scoping": {
-      "version": "7.23.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.23.3.tgz",
-      "integrity": "sha512-QPZxHrThbQia7UdvfpaRRlq/J9ciz1J4go0k+lPBXbgaNeY7IQrBj/9ceWjvMMI07/ZBzHl/F0R/2K0qH7jCVw==",
+      "version": "7.23.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.23.4.tgz",
+      "integrity": "sha512-0QqbP6B6HOh7/8iNR4CQU2Th/bbRtBp4KS9vcaZd1fZ0wSh5Fyssg0UCIHwxh+ka+pNDREbVLQnHCMHKZfPwfw==",
       "dev": true,
       "requires": {
         "@babel/helper-plugin-utils": "^7.22.5"
@@ -18562,9 +18562,9 @@
       }
     },
     "@babel/plugin-transform-class-static-block": {
-      "version": "7.23.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-class-static-block/-/plugin-transform-class-static-block-7.23.3.tgz",
-      "integrity": "sha512-PENDVxdr7ZxKPyi5Ffc0LjXdnJyrJxyqF5T5YjlVg4a0VFfQHW0r8iAtRiDXkfHlu1wwcvdtnndGYIeJLSuRMQ==",
+      "version": "7.23.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-class-static-block/-/plugin-transform-class-static-block-7.23.4.tgz",
+      "integrity": "sha512-nsWu/1M+ggti1SOALj3hfx5FXzAY06fwPJsUZD4/A5e1bWi46VUIWtD+kOX6/IdhXGsXBWllLFDSnqSCdUNydQ==",
       "dev": true,
       "requires": {
         "@babel/helper-create-class-features-plugin": "^7.22.15",
@@ -18573,9 +18573,9 @@
       }
     },
     "@babel/plugin-transform-classes": {
-      "version": "7.23.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.23.3.tgz",
-      "integrity": "sha512-FGEQmugvAEu2QtgtU0uTASXevfLMFfBeVCIIdcQhn/uBQsMTjBajdnAtanQlOcuihWh10PZ7+HWvc7NtBwP74w==",
+      "version": "7.23.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.23.5.tgz",
+      "integrity": "sha512-jvOTR4nicqYC9yzOHIhXG5emiFEOpappSJAl73SDSEDcybD+Puuze8Tnpb9p9qEyYup24tq891gkaygIFvWDqg==",
       "dev": true,
       "requires": {
         "@babel/helper-annotate-as-pure": "^7.22.5",
@@ -18628,9 +18628,9 @@
       }
     },
     "@babel/plugin-transform-dynamic-import": {
-      "version": "7.23.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dynamic-import/-/plugin-transform-dynamic-import-7.23.3.tgz",
-      "integrity": "sha512-vTG+cTGxPFou12Rj7ll+eD5yWeNl5/8xvQvF08y5Gv3v4mZQoyFf8/n9zg4q5vvCWt5jmgymfzMAldO7orBn7A==",
+      "version": "7.23.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dynamic-import/-/plugin-transform-dynamic-import-7.23.4.tgz",
+      "integrity": "sha512-V6jIbLhdJK86MaLh4Jpghi8ho5fGzt3imHOBu/x0jlBaPYqDoWz4RDXjmMOfnh+JWNaQleEAByZLV0QzBT4YQQ==",
       "dev": true,
       "requires": {
         "@babel/helper-plugin-utils": "^7.22.5",
@@ -18648,9 +18648,9 @@
       }
     },
     "@babel/plugin-transform-export-namespace-from": {
-      "version": "7.23.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-export-namespace-from/-/plugin-transform-export-namespace-from-7.23.3.tgz",
-      "integrity": "sha512-yCLhW34wpJWRdTxxWtFZASJisihrfyMOTOQexhVzA78jlU+dH7Dw+zQgcPepQ5F3C6bAIiblZZ+qBggJdHiBAg==",
+      "version": "7.23.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-export-namespace-from/-/plugin-transform-export-namespace-from-7.23.4.tgz",
+      "integrity": "sha512-GzuSBcKkx62dGzZI1WVgTWvkkz84FZO5TC5T8dl/Tht/rAla6Dg/Mz9Yhypg+ezVACf/rgDuQt3kbWEv7LdUDQ==",
       "dev": true,
       "requires": {
         "@babel/helper-plugin-utils": "^7.22.5",
@@ -18678,9 +18678,9 @@
       }
     },
     "@babel/plugin-transform-json-strings": {
-      "version": "7.23.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-json-strings/-/plugin-transform-json-strings-7.23.3.tgz",
-      "integrity": "sha512-H9Ej2OiISIZowZHaBwF0tsJOih1PftXJtE8EWqlEIwpc7LMTGq0rPOrywKLQ4nefzx8/HMR0D3JGXoMHYvhi0A==",
+      "version": "7.23.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-json-strings/-/plugin-transform-json-strings-7.23.4.tgz",
+      "integrity": "sha512-81nTOqM1dMwZ/aRXQ59zVubN9wHGqk6UtqRK+/q+ciXmRy8fSolhGVvG09HHRGo4l6fr/c4ZhXUQH0uFW7PZbg==",
       "dev": true,
       "requires": {
         "@babel/helper-plugin-utils": "^7.22.5",
@@ -18697,9 +18697,9 @@
       }
     },
     "@babel/plugin-transform-logical-assignment-operators": {
-      "version": "7.23.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-logical-assignment-operators/-/plugin-transform-logical-assignment-operators-7.23.3.tgz",
-      "integrity": "sha512-+pD5ZbxofyOygEp+zZAfujY2ShNCXRpDRIPOiBmTO693hhyOEteZgl876Xs9SAHPQpcV0vz8LvA/T+w8AzyX8A==",
+      "version": "7.23.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-logical-assignment-operators/-/plugin-transform-logical-assignment-operators-7.23.4.tgz",
+      "integrity": "sha512-Mc/ALf1rmZTP4JKKEhUwiORU+vcfarFVLfcFiolKUo6sewoxSEgl36ak5t+4WamRsNr6nzjZXQjM35WsU+9vbg==",
       "dev": true,
       "requires": {
         "@babel/helper-plugin-utils": "^7.22.5",
@@ -18778,9 +18778,9 @@
       }
     },
     "@babel/plugin-transform-nullish-coalescing-operator": {
-      "version": "7.23.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-nullish-coalescing-operator/-/plugin-transform-nullish-coalescing-operator-7.23.3.tgz",
-      "integrity": "sha512-xzg24Lnld4DYIdysyf07zJ1P+iIfJpxtVFOzX4g+bsJ3Ng5Le7rXx9KwqKzuyaUeRnt+I1EICwQITqc0E2PmpA==",
+      "version": "7.23.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-nullish-coalescing-operator/-/plugin-transform-nullish-coalescing-operator-7.23.4.tgz",
+      "integrity": "sha512-jHE9EVVqHKAQx+VePv5LLGHjmHSJR76vawFPTdlxR/LVJPfOEGxREQwQfjuZEOPTwG92X3LINSh3M40Rv4zpVA==",
       "dev": true,
       "requires": {
         "@babel/helper-plugin-utils": "^7.22.5",
@@ -18788,9 +18788,9 @@
       }
     },
     "@babel/plugin-transform-numeric-separator": {
-      "version": "7.23.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-numeric-separator/-/plugin-transform-numeric-separator-7.23.3.tgz",
-      "integrity": "sha512-s9GO7fIBi/BLsZ0v3Rftr6Oe4t0ctJ8h4CCXfPoEJwmvAPMyNrfkOOJzm6b9PX9YXcCJWWQd/sBF/N26eBiMVw==",
+      "version": "7.23.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-numeric-separator/-/plugin-transform-numeric-separator-7.23.4.tgz",
+      "integrity": "sha512-mps6auzgwjRrwKEZA05cOwuDc9FAzoyFS4ZsG/8F43bTLf/TgkJg7QXOrPO1JO599iA3qgK9MXdMGOEC8O1h6Q==",
       "dev": true,
       "requires": {
         "@babel/helper-plugin-utils": "^7.22.5",
@@ -18798,9 +18798,9 @@
       }
     },
     "@babel/plugin-transform-object-rest-spread": {
-      "version": "7.23.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-rest-spread/-/plugin-transform-object-rest-spread-7.23.3.tgz",
-      "integrity": "sha512-VxHt0ANkDmu8TANdE9Kc0rndo/ccsmfe2Cx2y5sI4hu3AukHQ5wAu4cM7j3ba8B9548ijVyclBU+nuDQftZsog==",
+      "version": "7.23.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-rest-spread/-/plugin-transform-object-rest-spread-7.23.4.tgz",
+      "integrity": "sha512-9x9K1YyeQVw0iOXJlIzwm8ltobIIv7j2iLyP2jIhEbqPRQ7ScNgwQufU2I0Gq11VjyG4gI4yMXt2VFags+1N3g==",
       "dev": true,
       "requires": {
         "@babel/compat-data": "^7.23.3",
@@ -18821,9 +18821,9 @@
       }
     },
     "@babel/plugin-transform-optional-catch-binding": {
-      "version": "7.23.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-optional-catch-binding/-/plugin-transform-optional-catch-binding-7.23.3.tgz",
-      "integrity": "sha512-LxYSb0iLjUamfm7f1D7GpiS4j0UAC8AOiehnsGAP8BEsIX8EOi3qV6bbctw8M7ZvLtcoZfZX5Z7rN9PlWk0m5A==",
+      "version": "7.23.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-optional-catch-binding/-/plugin-transform-optional-catch-binding-7.23.4.tgz",
+      "integrity": "sha512-XIq8t0rJPHf6Wvmbn9nFxU6ao4c7WhghTR5WyV8SrJfUFzyxhCm4nhC+iAp3HFhbAKLfYpgzhJ6t4XCtVwqO5A==",
       "dev": true,
       "requires": {
         "@babel/helper-plugin-utils": "^7.22.5",
@@ -18831,9 +18831,9 @@
       }
     },
     "@babel/plugin-transform-optional-chaining": {
-      "version": "7.23.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-optional-chaining/-/plugin-transform-optional-chaining-7.23.3.tgz",
-      "integrity": "sha512-zvL8vIfIUgMccIAK1lxjvNv572JHFJIKb4MWBz5OGdBQA0fB0Xluix5rmOby48exiJc987neOmP/m9Fnpkz3Tg==",
+      "version": "7.23.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-optional-chaining/-/plugin-transform-optional-chaining-7.23.4.tgz",
+      "integrity": "sha512-ZU8y5zWOfjM5vZ+asjgAPwDaBjJzgufjES89Rs4Lpq63O300R/kOz30WCLo6BxxX6QVEilwSlpClnG5cZaikTA==",
       "dev": true,
       "requires": {
         "@babel/helper-plugin-utils": "^7.22.5",
@@ -18861,9 +18861,9 @@
       }
     },
     "@babel/plugin-transform-private-property-in-object": {
-      "version": "7.23.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-private-property-in-object/-/plugin-transform-private-property-in-object-7.23.3.tgz",
-      "integrity": "sha512-a5m2oLNFyje2e/rGKjVfAELTVI5mbA0FeZpBnkOWWV7eSmKQ+T/XW0Vf+29ScLzSxX+rnsarvU0oie/4m6hkxA==",
+      "version": "7.23.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-private-property-in-object/-/plugin-transform-private-property-in-object-7.23.4.tgz",
+      "integrity": "sha512-9G3K1YqTq3F4Vt88Djx1UZ79PDyj+yKRnUy7cZGSMe+a7jkwD259uKKuUzQlPkGam7R+8RJwh5z4xO27fA1o2A==",
       "dev": true,
       "requires": {
         "@babel/helper-annotate-as-pure": "^7.22.5",
@@ -19010,15 +19010,15 @@
       }
     },
     "@babel/preset-env": {
-      "version": "7.23.3",
-      "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.23.3.tgz",
-      "integrity": "sha512-ovzGc2uuyNfNAs/jyjIGxS8arOHS5FENZaNn4rtE7UdKMMkqHCvboHfcuhWLZNX5cB44QfcGNWjaevxMzzMf+Q==",
+      "version": "7.23.5",
+      "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.23.5.tgz",
+      "integrity": "sha512-0d/uxVD6tFGWXGDSfyMD1p2otoaKmu6+GD+NfAx0tMaH+dxORnp7T9TaVQ6mKyya7iBtCIVxHjWT7MuzzM9z+A==",
       "dev": true,
       "requires": {
-        "@babel/compat-data": "^7.23.3",
+        "@babel/compat-data": "^7.23.5",
         "@babel/helper-compilation-targets": "^7.22.15",
         "@babel/helper-plugin-utils": "^7.22.5",
-        "@babel/helper-validator-option": "^7.22.15",
+        "@babel/helper-validator-option": "^7.23.5",
         "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": "^7.23.3",
         "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": "^7.23.3",
         "@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly": "^7.23.3",
@@ -19042,25 +19042,25 @@
         "@babel/plugin-syntax-top-level-await": "^7.14.5",
         "@babel/plugin-syntax-unicode-sets-regex": "^7.18.6",
         "@babel/plugin-transform-arrow-functions": "^7.23.3",
-        "@babel/plugin-transform-async-generator-functions": "^7.23.3",
+        "@babel/plugin-transform-async-generator-functions": "^7.23.4",
         "@babel/plugin-transform-async-to-generator": "^7.23.3",
         "@babel/plugin-transform-block-scoped-functions": "^7.23.3",
-        "@babel/plugin-transform-block-scoping": "^7.23.3",
+        "@babel/plugin-transform-block-scoping": "^7.23.4",
         "@babel/plugin-transform-class-properties": "^7.23.3",
-        "@babel/plugin-transform-class-static-block": "^7.23.3",
-        "@babel/plugin-transform-classes": "^7.23.3",
+        "@babel/plugin-transform-class-static-block": "^7.23.4",
+        "@babel/plugin-transform-classes": "^7.23.5",
         "@babel/plugin-transform-computed-properties": "^7.23.3",
         "@babel/plugin-transform-destructuring": "^7.23.3",
         "@babel/plugin-transform-dotall-regex": "^7.23.3",
         "@babel/plugin-transform-duplicate-keys": "^7.23.3",
-        "@babel/plugin-transform-dynamic-import": "^7.23.3",
+        "@babel/plugin-transform-dynamic-import": "^7.23.4",
         "@babel/plugin-transform-exponentiation-operator": "^7.23.3",
-        "@babel/plugin-transform-export-namespace-from": "^7.23.3",
+        "@babel/plugin-transform-export-namespace-from": "^7.23.4",
         "@babel/plugin-transform-for-of": "^7.23.3",
         "@babel/plugin-transform-function-name": "^7.23.3",
-        "@babel/plugin-transform-json-strings": "^7.23.3",
+        "@babel/plugin-transform-json-strings": "^7.23.4",
         "@babel/plugin-transform-literals": "^7.23.3",
-        "@babel/plugin-transform-logical-assignment-operators": "^7.23.3",
+        "@babel/plugin-transform-logical-assignment-operators": "^7.23.4",
         "@babel/plugin-transform-member-expression-literals": "^7.23.3",
         "@babel/plugin-transform-modules-amd": "^7.23.3",
         "@babel/plugin-transform-modules-commonjs": "^7.23.3",
@@ -19068,15 +19068,15 @@
         "@babel/plugin-transform-modules-umd": "^7.23.3",
         "@babel/plugin-transform-named-capturing-groups-regex": "^7.22.5",
         "@babel/plugin-transform-new-target": "^7.23.3",
-        "@babel/plugin-transform-nullish-coalescing-operator": "^7.23.3",
-        "@babel/plugin-transform-numeric-separator": "^7.23.3",
-        "@babel/plugin-transform-object-rest-spread": "^7.23.3",
+        "@babel/plugin-transform-nullish-coalescing-operator": "^7.23.4",
+        "@babel/plugin-transform-numeric-separator": "^7.23.4",
+        "@babel/plugin-transform-object-rest-spread": "^7.23.4",
         "@babel/plugin-transform-object-super": "^7.23.3",
-        "@babel/plugin-transform-optional-catch-binding": "^7.23.3",
-        "@babel/plugin-transform-optional-chaining": "^7.23.3",
+        "@babel/plugin-transform-optional-catch-binding": "^7.23.4",
+        "@babel/plugin-transform-optional-chaining": "^7.23.4",
         "@babel/plugin-transform-parameters": "^7.23.3",
         "@babel/plugin-transform-private-methods": "^7.23.3",
-        "@babel/plugin-transform-private-property-in-object": "^7.23.3",
+        "@babel/plugin-transform-private-property-in-object": "^7.23.4",
         "@babel/plugin-transform-property-literals": "^7.23.3",
         "@babel/plugin-transform-regenerator": "^7.23.3",
         "@babel/plugin-transform-reserved-words": "^7.23.3",
diff --git a/apps/block_scout_web/assets/package.json b/apps/block_scout_web/assets/package.json
index ceb5eb89a79e..68469b197bc1 100644
--- a/apps/block_scout_web/assets/package.json
+++ b/apps/block_scout_web/assets/package.json
@@ -84,7 +84,7 @@
   },
   "devDependencies": {
     "@babel/core": "^7.23.5",
-    "@babel/preset-env": "^7.23.3",
+    "@babel/preset-env": "^7.23.5",
     "autoprefixer": "^10.4.16",
     "babel-loader": "^9.1.3",
     "copy-webpack-plugin": "^11.0.0",

From e54f0707f7767a4e7aadb051f3a4c339e1dc30df Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 4 Dec 2023 20:55:54 +0000
Subject: [PATCH 724/909] Bump @fortawesome/fontawesome-free in
 /apps/block_scout_web/assets

Bumps [@fortawesome/fontawesome-free](https://github.com/FortAwesome/Font-Awesome) from 6.4.2 to 6.5.1.
- [Release notes](https://github.com/FortAwesome/Font-Awesome/releases)
- [Changelog](https://github.com/FortAwesome/Font-Awesome/blob/6.x/CHANGELOG.md)
- [Commits](https://github.com/FortAwesome/Font-Awesome/compare/6.4.2...6.5.1)

---
updated-dependencies:
- dependency-name: "@fortawesome/fontawesome-free"
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 apps/block_scout_web/assets/package-lock.json | 14 +++++++-------
 apps/block_scout_web/assets/package.json      |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/apps/block_scout_web/assets/package-lock.json b/apps/block_scout_web/assets/package-lock.json
index 5aa43ce8255a..f45405e27160 100644
--- a/apps/block_scout_web/assets/package-lock.json
+++ b/apps/block_scout_web/assets/package-lock.json
@@ -8,7 +8,7 @@
       "license": "GPL-3.0",
       "dependencies": {
         "@amplitude/analytics-browser": "^2.3.6",
-        "@fortawesome/fontawesome-free": "^6.4.2",
+        "@fortawesome/fontawesome-free": "^6.5.1",
         "@tarekraafat/autocomplete.js": "^10.2.7",
         "@walletconnect/web3-provider": "^1.8.0",
         "assert": "^2.1.0",
@@ -2558,9 +2558,9 @@
       }
     },
     "node_modules/@fortawesome/fontawesome-free": {
-      "version": "6.4.2",
-      "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-free/-/fontawesome-free-6.4.2.tgz",
-      "integrity": "sha512-m5cPn3e2+FDCOgi1mz0RexTUvvQibBebOUlUlW0+YrMjDTPkiJ6VTKukA1GRsvRw+12KyJndNjj0O4AgTxm2Pg==",
+      "version": "6.5.1",
+      "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-free/-/fontawesome-free-6.5.1.tgz",
+      "integrity": "sha512-CNy5vSwN3fsUStPRLX7fUYojyuzoEMSXPl7zSLJ8TgtRfjv24LOnOWKT2zYwaHZCJGkdyRnTmstR0P+Ah503Gw==",
       "hasInstallScript": true,
       "engines": {
         "node": ">=6"
@@ -19540,9 +19540,9 @@
       }
     },
     "@fortawesome/fontawesome-free": {
-      "version": "6.4.2",
-      "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-free/-/fontawesome-free-6.4.2.tgz",
-      "integrity": "sha512-m5cPn3e2+FDCOgi1mz0RexTUvvQibBebOUlUlW0+YrMjDTPkiJ6VTKukA1GRsvRw+12KyJndNjj0O4AgTxm2Pg=="
+      "version": "6.5.1",
+      "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-free/-/fontawesome-free-6.5.1.tgz",
+      "integrity": "sha512-CNy5vSwN3fsUStPRLX7fUYojyuzoEMSXPl7zSLJ8TgtRfjv24LOnOWKT2zYwaHZCJGkdyRnTmstR0P+Ah503Gw=="
     },
     "@humanwhocodes/config-array": {
       "version": "0.11.13",
diff --git a/apps/block_scout_web/assets/package.json b/apps/block_scout_web/assets/package.json
index e572395367c2..66e3f2686435 100644
--- a/apps/block_scout_web/assets/package.json
+++ b/apps/block_scout_web/assets/package.json
@@ -19,7 +19,7 @@
     "eslint": "eslint js/**"
   },
   "dependencies": {
-    "@fortawesome/fontawesome-free": "^6.4.2",
+    "@fortawesome/fontawesome-free": "^6.5.1",
     "@amplitude/analytics-browser": "^2.3.6",
     "@tarekraafat/autocomplete.js": "^10.2.7",
     "@walletconnect/web3-provider": "^1.8.0",

From a73132ffaf9a907452d6736407a7cd4be5986977 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 4 Dec 2023 20:56:31 +0000
Subject: [PATCH 725/909] Bump gettext from 0.23.1 to 0.24.0

Bumps [gettext](https://github.com/elixir-gettext/gettext) from 0.23.1 to 0.24.0.
- [Changelog](https://github.com/elixir-gettext/gettext/blob/main/CHANGELOG.md)
- [Commits](https://github.com/elixir-gettext/gettext/compare/v0.23.1...v0.24.0)

---
updated-dependencies:
- dependency-name: gettext
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 apps/block_scout_web/mix.exs | 2 +-
 mix.lock                     | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/apps/block_scout_web/mix.exs b/apps/block_scout_web/mix.exs
index f134b2b3373f..2270ffaabdbb 100644
--- a/apps/block_scout_web/mix.exs
+++ b/apps/block_scout_web/mix.exs
@@ -84,7 +84,7 @@ defmodule BlockScoutWeb.Mixfile do
       # HTML CSS selectors for Phoenix controller tests
       {:floki, "~> 0.31"},
       {:flow, "~> 1.2"},
-      {:gettext, "~> 0.23.1"},
+      {:gettext, "~> 0.24.0"},
       {:hammer, "~> 6.0"},
       {:httpoison, "~> 2.0"},
       {:indexer, in_umbrella: true, runtime: false},
diff --git a/mix.lock b/mix.lock
index 3c484116e454..12d09b27706e 100644
--- a/mix.lock
+++ b/mix.lock
@@ -56,14 +56,14 @@
   "ex_utils": {:hex, :ex_utils, "0.1.7", "2c133e0bcdc49a858cf8dacf893308ebc05bc5fba501dc3d2935e65365ec0bf3", [:mix], [], "hexpm", "66d4fe75285948f2d1e69c2a5ddd651c398c813574f8d36a9eef11dc20356ef6"},
   "exactor": {:hex, :exactor, "2.2.4", "5efb4ddeb2c48d9a1d7c9b465a6fffdd82300eb9618ece5d34c3334d5d7245b1", [:mix], [], "hexpm", "1222419f706e01bfa1095aec9acf6421367dcfab798a6f67c54cf784733cd6b5"},
   "exjsx": {:hex, :exjsx, "4.0.0", "60548841e0212df401e38e63c0078ec57b33e7ea49b032c796ccad8cde794b5c", [:mix], [{:jsx, "~> 2.8.0", [hex: :jsx, repo: "hexpm", optional: false]}], "hexpm", "32e95820a97cffea67830e91514a2ad53b888850442d6d395f53a1ac60c82e07"},
-  "expo": {:hex, :expo, "0.4.1", "1c61d18a5df197dfda38861673d392e642649a9cef7694d2f97a587b2cfb319b", [:mix], [], "hexpm", "2ff7ba7a798c8c543c12550fa0e2cbc81b95d4974c65855d8d15ba7b37a1ce47"},
+  "expo": {:hex, :expo, "0.5.1", "249e826a897cac48f591deba863b26c16682b43711dd15ee86b92f25eafd96d9", [:mix], [], "hexpm", "68a4233b0658a3d12ee00d27d37d856b1ba48607e7ce20fd376958d0ba6ce92b"},
   "exvcr": {:hex, :exvcr, "0.14.4", "1aa5fe7d3f10b117251c158f8d28b39f7fc73d0a7628b2d0b75bf8cfb1111576", [:mix], [{:exactor, "~> 2.2", [hex: :exactor, repo: "hexpm", optional: false]}, {:exjsx, "~> 4.0", [hex: :exjsx, repo: "hexpm", optional: false]}, {:finch, "~> 0.16", [hex: :finch, repo: "hexpm", optional: true]}, {:httpoison, "~> 1.0 or ~> 2.0", [hex: :httpoison, repo: "hexpm", optional: true]}, {:httpotion, "~> 3.1", [hex: :httpotion, repo: "hexpm", optional: true]}, {:ibrowse, "4.4.0", [hex: :ibrowse, repo: "hexpm", optional: true]}, {:meck, "~> 0.8", [hex: :meck, repo: "hexpm", optional: false]}], "hexpm", "4e600568c02ed29d46bc2e2c74927d172ba06658aa8b14705c0207363c44cc94"},
   "file_info": {:hex, :file_info, "0.0.4", "2e0e77f211e833f38ead22cb29ce53761d457d80b3ffe0ffe0eb93880b0963b2", [:mix], [{:mimetype_parser, "~> 0.1.2", [hex: :mimetype_parser, repo: "hexpm", optional: false]}], "hexpm", "50e7ad01c2c8b9339010675fe4dc4a113b8d6ca7eddce24d1d74fd0e762781a5"},
   "file_system": {:hex, :file_system, "0.2.10", "fb082005a9cd1711c05b5248710f8826b02d7d1784e7c3451f9c1231d4fc162d", [:mix], [], "hexpm", "41195edbfb562a593726eda3b3e8b103a309b733ad25f3d642ba49696bf715dc"},
   "floki": {:hex, :floki, "0.35.2", "87f8c75ed8654b9635b311774308b2760b47e9a579dabf2e4d5f1e1d42c39e0b", [:mix], [], "hexpm", "6b05289a8e9eac475f644f09c2e4ba7e19201fd002b89c28c1293e7bd16773d9"},
   "flow": {:hex, :flow, "1.2.4", "1dd58918287eb286656008777cb32714b5123d3855956f29aa141ebae456922d", [:mix], [{:gen_stage, "~> 1.0", [hex: :gen_stage, repo: "hexpm", optional: false]}], "hexpm", "874adde96368e71870f3510b91e35bc31652291858c86c0e75359cbdd35eb211"},
   "gen_stage": {:hex, :gen_stage, "1.2.1", "19d8b5e9a5996d813b8245338a28246307fd8b9c99d1237de199d21efc4c76a1", [:mix], [], "hexpm", "83e8be657fa05b992ffa6ac1e3af6d57aa50aace8f691fcf696ff02f8335b001"},
-  "gettext": {:hex, :gettext, "0.23.1", "821e619a240e6000db2fc16a574ef68b3bd7fe0167ccc264a81563cc93e67a31", [:mix], [{:expo, "~> 0.4.0", [hex: :expo, repo: "hexpm", optional: false]}], "hexpm", "19d744a36b809d810d610b57c27b934425859d158ebd56561bc41f7eeb8795db"},
+  "gettext": {:hex, :gettext, "0.24.0", "6f4d90ac5f3111673cbefc4ebee96fe5f37a114861ab8c7b7d5b30a1108ce6d8", [:mix], [{:expo, "~> 0.5.1", [hex: :expo, repo: "hexpm", optional: false]}], "hexpm", "bdf75cdfcbe9e4622dd18e034b227d77dd17f0f133853a1c73b97b3d6c770e8b"},
   "hackney": {:hex, :hackney, "1.20.1", "8d97aec62ddddd757d128bfd1df6c5861093419f8f7a4223823537bad5d064e2", [:rebar3], [{:certifi, "~>2.12.0", [hex: :certifi, repo: "hexpm", optional: false]}, {:idna, "~>6.1.0", [hex: :idna, repo: "hexpm", optional: false]}, {:metrics, "~>1.0.0", [hex: :metrics, repo: "hexpm", optional: false]}, {:mimerl, "~>1.1", [hex: :mimerl, repo: "hexpm", optional: false]}, {:parse_trans, "3.4.1", [hex: :parse_trans, repo: "hexpm", optional: false]}, {:ssl_verify_fun, "~>1.1.0", [hex: :ssl_verify_fun, repo: "hexpm", optional: false]}, {:unicode_util_compat, "~>0.7.0", [hex: :unicode_util_compat, repo: "hexpm", optional: false]}], "hexpm", "fe9094e5f1a2a2c0a7d10918fee36bfec0ec2a979994cff8cfe8058cd9af38e3"},
   "hammer": {:hex, :hammer, "6.1.0", "f263e3c3e9946bd410ea0336b2abe0cb6260af4afb3a221e1027540706e76c55", [:make, :mix], [{:poolboy, "~> 1.5", [hex: :poolboy, repo: "hexpm", optional: false]}], "hexpm", "b47e415a562a6d072392deabcd58090d8a41182cf9044cdd6b0d0faaaf68ba57"},
   "hammer_backend_redis": {:hex, :hammer_backend_redis, "6.1.2", "eb296bb4924928e24135308b2afc189201fd09411c870c6bbadea444a49b2f2c", [:mix], [{:hammer, "~> 6.0", [hex: :hammer, repo: "hexpm", optional: false]}, {:redix, "~> 1.1", [hex: :redix, repo: "hexpm", optional: false]}], "hexpm", "217ea066278910543a5e9b577d5bf2425419446b94fe76bdd9f255f39feec9fa"},

From 56f5f899eededa76461e813535def351e96f7261 Mon Sep 17 00:00:00 2001
From: Qwerty5Uiop <alex000010@bk.ru>
Date: Fri, 1 Dec 2023 19:42:39 +0600
Subject: [PATCH 726/909] Allow call type to be in lower case

---
 CHANGELOG.md                                  |  1 +
 .../lib/ethereum_jsonrpc/geth.ex              | 86 +++++++++----------
 2 files changed, 42 insertions(+), 45 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6473289e8db3..73b6fac5dc4e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,6 +11,7 @@
 
 ### Fixes
 
+- [#8922](https://github.com/blockscout/blockscout/pull/8922) - Allow call type to be in lowercase
 - [#8917](https://github.com/blockscout/blockscout/pull/8917) - Proxy detection hotfix in API v2
 - [#8915](https://github.com/blockscout/blockscout/pull/8915) - smart-contract: delete embeds_many relation on replace
 - [#8906](https://github.com/blockscout/blockscout/pull/8906) - Fix abi encoded string argument
diff --git a/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/geth.ex b/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/geth.ex
index 4d864336f50c..8f852372e407 100644
--- a/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/geth.ex
+++ b/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/geth.ex
@@ -283,52 +283,48 @@ defmodule EthereumJSONRPC.Geth do
     [Map.put(last, "error", "execution stopped") | acc]
   end
 
-  defp parse_call_tracer_calls(
-         {%{"type" => type, "from" => from} = call, index},
-         acc,
-         trace_address,
-         inner?
-       )
-       when type in ~w(CALL CALLCODE DELEGATECALL STATICCALL CREATE CREATE2 SELFDESTRUCT REVERT STOP) do
-    new_trace_address = [index | trace_address]
-
-    formatted_call =
-      %{
-        "type" => if(type in ~w(CALL CALLCODE DELEGATECALL STATICCALL), do: "call", else: String.downcase(type)),
-        "callType" => String.downcase(type),
-        "from" => from,
-        "to" => Map.get(call, "to", "0x"),
-        "createdContractAddressHash" => Map.get(call, "to", "0x"),
-        "value" => Map.get(call, "value", "0x0"),
-        "gas" => Map.get(call, "gas", "0x0"),
-        "gasUsed" => Map.get(call, "gasUsed", "0x0"),
-        "input" => Map.get(call, "input", "0x"),
-        "init" => Map.get(call, "input", "0x"),
-        "createdContractCode" => Map.get(call, "output", "0x"),
-        "traceAddress" => if(inner?, do: Enum.reverse(new_trace_address), else: []),
-        "error" => call["error"]
-      }
-      |> case do
-        %{"error" => nil} = ok_call ->
-          ok_call
-          |> Map.delete("error")
-          # to handle staticcall, all other cases handled by EthereumJSONRPC.Geth.Call.elixir_to_internal_transaction_params/1
-          |> Map.put("output", Map.get(call, "output", "0x"))
-
-        error_call ->
-          error_call
-      end
-
-    parse_call_tracer_calls(
-      Map.get(call, "calls", []),
-      [formatted_call | acc],
-      if(inner?, do: new_trace_address, else: [])
-    )
-  end
+  defp parse_call_tracer_calls({%{"type" => upcase_type, "from" => from} = call, index}, acc, trace_address, inner?) do
+    case String.downcase(upcase_type) do
+      type when type in ~w(call callcode delegatecall staticcall create create2 selfdestruct revert stop) ->
+        new_trace_address = [index | trace_address]
 
-  defp parse_call_tracer_calls({call, _}, acc, _trace_address, _inner?) do
-    Logger.warning("Call from a callTracer with an unknown type: #{inspect(call)}")
-    acc
+        formatted_call =
+          %{
+            "type" => if(type in ~w(call callcode delegatecall staticcall), do: "call", else: type),
+            "callType" => type,
+            "from" => from,
+            "to" => Map.get(call, "to", "0x"),
+            "createdContractAddressHash" => Map.get(call, "to", "0x"),
+            "value" => Map.get(call, "value", "0x0"),
+            "gas" => Map.get(call, "gas", "0x0"),
+            "gasUsed" => Map.get(call, "gasUsed", "0x0"),
+            "input" => Map.get(call, "input", "0x"),
+            "init" => Map.get(call, "input", "0x"),
+            "createdContractCode" => Map.get(call, "output", "0x"),
+            "traceAddress" => if(inner?, do: Enum.reverse(new_trace_address), else: []),
+            "error" => call["error"]
+          }
+          |> case do
+            %{"error" => nil} = ok_call ->
+              ok_call
+              |> Map.delete("error")
+              # to handle staticcall, all other cases handled by EthereumJSONRPC.Geth.Call.elixir_to_internal_transaction_params/1
+              |> Map.put("output", Map.get(call, "output", "0x"))
+
+            error_call ->
+              error_call
+          end
+
+        parse_call_tracer_calls(
+          Map.get(call, "calls", []),
+          [formatted_call | acc],
+          if(inner?, do: new_trace_address, else: [])
+        )
+
+      _unknown_type ->
+        Logger.warning("Call from a callTracer with an unknown type: #{inspect(call)}")
+        acc
+    end
   end
 
   defp parse_call_tracer_calls(calls, acc, trace_address, _inner) when is_list(calls) do

From ba0aae21afe89dbffb02740e60253c2b671e6fb4 Mon Sep 17 00:00:00 2001
From: Qwerty5Uiop <alex000010@bk.ru>
Date: Tue, 5 Dec 2023 14:38:34 +0600
Subject: [PATCH 727/909] Add test for lowercase internal transaction type

---
 .../test/ethereum_jsonrpc/geth_test.exs       | 82 +++++++++++++++++--
 .../support/ethereum_jsonrpc/case/geth/mox.ex |  6 +-
 2 files changed, 78 insertions(+), 10 deletions(-)

diff --git a/apps/ethereum_jsonrpc/test/ethereum_jsonrpc/geth_test.exs b/apps/ethereum_jsonrpc/test/ethereum_jsonrpc/geth_test.exs
index 853a5643ae02..000b75623a03 100644
--- a/apps/ethereum_jsonrpc/test/ethereum_jsonrpc/geth_test.exs
+++ b/apps/ethereum_jsonrpc/test/ethereum_jsonrpc/geth_test.exs
@@ -12,9 +12,9 @@ defmodule EthereumJSONRPC.GethTest do
   describe "fetch_internal_transactions/2" do
     # Infura Mainnet does not support debug_traceTransaction, so this cannot be tested expect in Mox
     setup do
-      EthereumJSONRPC.Case.Geth.Mox.setup()
       initial_env = Application.get_all_env(:ethereum_jsonrpc)
       on_exit(fn -> Application.put_all_env([{:ethereum_jsonrpc, initial_env}]) end)
+      EthereumJSONRPC.Case.Geth.Mox.setup()
     end
 
     setup :verify_on_exit!
@@ -26,7 +26,7 @@ defmodule EthereumJSONRPC.GethTest do
       transaction_hash = "0x32b17f27ddb546eab3c4c33f31eb22c1cb992d4ccc50dae26922805b717efe5c"
       tracer = File.read!("priv/js/ethereum_jsonrpc/geth/debug_traceTransaction/tracer.js")
 
-      expect(EthereumJSONRPC.Mox, :json_rpc, fn [%{id: id, params: [^transaction_hash, %{tracer: ^tracer}]}], _ ->
+      expect(EthereumJSONRPC.Mox, :json_rpc, fn [%{id: id, params: [^transaction_hash, %{"tracer" => ^tracer}]}], _ ->
         {:ok,
          [
            %{
@@ -49,7 +49,7 @@ defmodule EthereumJSONRPC.GethTest do
          ]}
       end)
 
-      Application.put_env(:ethereum_jsonrpc, Geth, tracer: "js")
+      Application.put_env(:ethereum_jsonrpc, Geth, tracer: "js", debug_trace_transaction_timeout: "5s")
 
       assert {:ok,
               [
@@ -98,7 +98,7 @@ defmodule EthereumJSONRPC.GethTest do
       tracer = File.read!("priv/js/ethereum_jsonrpc/geth/debug_traceTransaction/tracer.js")
 
       expect(EthereumJSONRPC.Mox, :json_rpc, 1, fn
-        [%{id: id, params: [^transaction_hash, %{tracer: "callTracer"}]}], _ ->
+        [%{id: id, params: [^transaction_hash, %{"tracer" => "callTracer"}]}], _ ->
           {:ok,
            [
              %{
@@ -222,7 +222,7 @@ defmodule EthereumJSONRPC.GethTest do
       end)
 
       expect(EthereumJSONRPC.Mox, :json_rpc, 1, fn
-        [%{id: id, params: [^transaction_hash, %{tracer: ^tracer}]}], _ ->
+        [%{id: id, params: [^transaction_hash, %{"tracer" => ^tracer}]}], _ ->
           {:ok,
            [
              %{
@@ -361,7 +361,7 @@ defmodule EthereumJSONRPC.GethTest do
 
       call_tracer_internal_txs = Geth.fetch_internal_transactions([transaction_params], json_rpc_named_arguments)
 
-      Application.put_env(:ethereum_jsonrpc, Geth, tracer: "js")
+      Application.put_env(:ethereum_jsonrpc, Geth, tracer: "js", debug_trace_transaction_timeout: "5s")
 
       assert call_tracer_internal_txs ==
                Geth.fetch_internal_transactions([transaction_params], json_rpc_named_arguments)
@@ -383,7 +383,7 @@ defmodule EthereumJSONRPC.GethTest do
       tracer = File.read!("priv/js/ethereum_jsonrpc/geth/debug_traceTransaction/tracer.js")
 
       expect(EthereumJSONRPC.Mox, :json_rpc, 1, fn
-        [%{id: id, params: [^transaction_hash, %{tracer: "callTracer"}]}], _ ->
+        [%{id: id, params: [^transaction_hash, %{"tracer" => "callTracer"}]}], _ ->
           {:ok,
            [
              %{
@@ -405,7 +405,7 @@ defmodule EthereumJSONRPC.GethTest do
       end)
 
       expect(EthereumJSONRPC.Mox, :json_rpc, 1, fn
-        [%{id: id, params: [^transaction_hash, %{tracer: ^tracer}]}], _ ->
+        [%{id: id, params: [^transaction_hash, %{"tracer" => ^tracer}]}], _ ->
           {:ok,
            [
              %{
@@ -431,7 +431,7 @@ defmodule EthereumJSONRPC.GethTest do
 
       call_tracer_internal_txs = Geth.fetch_internal_transactions([transaction_params], json_rpc_named_arguments)
 
-      Application.put_env(:ethereum_jsonrpc, Geth, tracer: "js")
+      Application.put_env(:ethereum_jsonrpc, Geth, tracer: "js", debug_trace_transaction_timeout: "5s")
 
       assert call_tracer_internal_txs ==
                Geth.fetch_internal_transactions([transaction_params], json_rpc_named_arguments)
@@ -482,6 +482,70 @@ defmodule EthereumJSONRPC.GethTest do
                 }
               ]} = Geth.fetch_internal_transactions([transaction_params], json_rpc_named_arguments)
     end
+
+    test "uppercase type parsing result is the same as lowercase", %{
+      json_rpc_named_arguments: json_rpc_named_arguments
+    } do
+      transaction_hash = "0xb342cafc6ac552c3be2090561453204c8784caf025ac8267320834e4cd163d96"
+      block_number = 3_287_375
+      transaction_index = 13
+
+      transaction_params = %{
+        block_number: block_number,
+        transaction_index: transaction_index,
+        hash_data: transaction_hash
+      }
+
+      expect(EthereumJSONRPC.Mox, :json_rpc, 1, fn
+        [%{id: id, params: [^transaction_hash, %{"tracer" => "callTracer"}]}], _ ->
+          {:ok,
+           [
+             %{
+               id: id,
+               result: %{
+                 "type" => "CREATE",
+                 "from" => "0x117b358218da5a4f647072ddb50ded038ed63d17",
+                 "to" => "0x205a6b72ce16736c9d87172568a9c0cb9304de0d",
+                 "value" => "0x0",
+                 "gas" => "0x106f5",
+                 "gasUsed" => "0x106f5",
+                 "input" =>
+                   "0x608060405234801561001057600080fd5b50610150806100206000396000f3fe608060405234801561001057600080fd5b50600436106100365760003560e01c80632e64cec11461003b5780636057361d14610059575b600080fd5b610043610075565b60405161005091906100d9565b60405180910390f35b610073600480360381019061006e919061009d565b61007e565b005b60008054905090565b8060008190555050565b60008135905061009781610103565b92915050565b6000602082840312156100b3576100b26100fe565b5b60006100c184828501610088565b91505092915050565b6100d3816100f4565b82525050565b60006020820190506100ee60008301846100ca565b92915050565b6000819050919050565b600080fd5b61010c816100f4565b811461011757600080fd5b5056fea26469706673582212209a159a4f3847890f10bfb87871a61eba91c5dbf5ee3cf6398207e292eee22a1664736f6c63430008070033",
+                 "output" =>
+                   "0x608060405234801561001057600080fd5b50600436106100365760003560e01c80632e64cec11461003b5780636057361d14610059575b600080fd5b610043610075565b60405161005091906100d9565b60405180910390f35b610073600480360381019061006e919061009d565b61007e565b005b60008054905090565b8060008190555050565b60008135905061009781610103565b92915050565b6000602082840312156100b3576100b26100fe565b5b60006100c184828501610088565b91505092915050565b6100d3816100f4565b82525050565b60006020820190506100ee60008301846100ca565b92915050565b6000819050919050565b600080fd5b61010c816100f4565b811461011757600080fd5b5056fea26469706673582212209a159a4f3847890f10bfb87871a61eba91c5dbf5ee3cf6398207e292eee22a1664736f6c63430008070033"
+               }
+             }
+           ]}
+      end)
+
+      uppercase_result = Geth.fetch_internal_transactions([transaction_params], json_rpc_named_arguments)
+
+      expect(EthereumJSONRPC.Mox, :json_rpc, 1, fn
+        [%{id: id, params: [^transaction_hash, %{"tracer" => "callTracer"}]}], _ ->
+          {:ok,
+           [
+             %{
+               id: id,
+               result: %{
+                 "type" => "create",
+                 "from" => "0x117b358218da5a4f647072ddb50ded038ed63d17",
+                 "to" => "0x205a6b72ce16736c9d87172568a9c0cb9304de0d",
+                 "value" => "0x0",
+                 "gas" => "0x106f5",
+                 "gasUsed" => "0x106f5",
+                 "input" =>
+                   "0x608060405234801561001057600080fd5b50610150806100206000396000f3fe608060405234801561001057600080fd5b50600436106100365760003560e01c80632e64cec11461003b5780636057361d14610059575b600080fd5b610043610075565b60405161005091906100d9565b60405180910390f35b610073600480360381019061006e919061009d565b61007e565b005b60008054905090565b8060008190555050565b60008135905061009781610103565b92915050565b6000602082840312156100b3576100b26100fe565b5b60006100c184828501610088565b91505092915050565b6100d3816100f4565b82525050565b60006020820190506100ee60008301846100ca565b92915050565b6000819050919050565b600080fd5b61010c816100f4565b811461011757600080fd5b5056fea26469706673582212209a159a4f3847890f10bfb87871a61eba91c5dbf5ee3cf6398207e292eee22a1664736f6c63430008070033",
+                 "output" =>
+                   "0x608060405234801561001057600080fd5b50600436106100365760003560e01c80632e64cec11461003b5780636057361d14610059575b600080fd5b610043610075565b60405161005091906100d9565b60405180910390f35b610073600480360381019061006e919061009d565b61007e565b005b60008054905090565b8060008190555050565b60008135905061009781610103565b92915050565b6000602082840312156100b3576100b26100fe565b5b60006100c184828501610088565b91505092915050565b6100d3816100f4565b82525050565b60006020820190506100ee60008301846100ca565b92915050565b6000819050919050565b600080fd5b61010c816100f4565b811461011757600080fd5b5056fea26469706673582212209a159a4f3847890f10bfb87871a61eba91c5dbf5ee3cf6398207e292eee22a1664736f6c63430008070033"
+               }
+             }
+           ]}
+      end)
+
+      lowercase_result = Geth.fetch_internal_transactions([transaction_params], json_rpc_named_arguments)
+
+      assert uppercase_result == lowercase_result
+    end
   end
 
   describe "fetch_block_internal_transactions/1" do
diff --git a/apps/ethereum_jsonrpc/test/support/ethereum_jsonrpc/case/geth/mox.ex b/apps/ethereum_jsonrpc/test/support/ethereum_jsonrpc/case/geth/mox.ex
index d1f113223d68..41a2593cb946 100644
--- a/apps/ethereum_jsonrpc/test/support/ethereum_jsonrpc/case/geth/mox.ex
+++ b/apps/ethereum_jsonrpc/test/support/ethereum_jsonrpc/case/geth/mox.ex
@@ -6,7 +6,11 @@ defmodule EthereumJSONRPC.Case.Geth.Mox do
   def setup do
     %{
       block_interval: 500,
-      json_rpc_named_arguments: [transport: EthereumJSONRPC.Mox, transport_options: [], variant: EthereumJSONRPC.Geth],
+      json_rpc_named_arguments: [
+        transport: EthereumJSONRPC.Mox,
+        transport_options: [http_options: [timeout: 60000, recv_timeout: 60000]],
+        variant: EthereumJSONRPC.Geth
+      ],
       subscribe_named_arguments: [transport: EthereumJSONRPC.Mox, transport_options: []]
     }
   end

From c44c3b5ed00a0ac6842d4cdbd7913958fb66f996 Mon Sep 17 00:00:00 2001
From: Qwerty5Uiop <alex000010@bk.ru>
Date: Tue, 5 Dec 2023 14:40:49 +0600
Subject: [PATCH 728/909] Handle lowercase STOP opcode

---
 apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/geth.ex | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/geth.ex b/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/geth.ex
index 8f852372e407..d38fb0716a72 100644
--- a/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/geth.ex
+++ b/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/geth.ex
@@ -279,7 +279,8 @@ defmodule EthereumJSONRPC.Geth do
   defp parse_call_tracer_calls([], acc, _trace_address, _inner?), do: acc
   defp parse_call_tracer_calls({%{"type" => 0}, _}, acc, _trace_address, _inner?), do: acc
 
-  defp parse_call_tracer_calls({%{"type" => "STOP"}, _}, [last | acc], _trace_address, _inner?) do
+  defp parse_call_tracer_calls({%{"type" => type}, _}, [last | acc], _trace_address, _inner?)
+       when type in ["STOP", "stop"] do
     [Map.put(last, "error", "execution stopped") | acc]
   end
 

From 9b99970a7e10464e689c1e9b2b07fc278b440350 Mon Sep 17 00:00:00 2001
From: Qwerty5Uiop <alex000010@bk.ru>
Date: Tue, 5 Dec 2023 14:55:13 +0600
Subject: [PATCH 729/909] Enable geth tests in CI

---
 .../test/ethereum_jsonrpc/geth_test.exs                | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/apps/ethereum_jsonrpc/test/ethereum_jsonrpc/geth_test.exs b/apps/ethereum_jsonrpc/test/ethereum_jsonrpc/geth_test.exs
index 000b75623a03..a379ac57a816 100644
--- a/apps/ethereum_jsonrpc/test/ethereum_jsonrpc/geth_test.exs
+++ b/apps/ethereum_jsonrpc/test/ethereum_jsonrpc/geth_test.exs
@@ -5,8 +5,6 @@ defmodule EthereumJSONRPC.GethTest do
 
   alias EthereumJSONRPC.Geth
 
-  @moduletag :no_nethermind
-
   setup :verify_on_exit!
 
   describe "fetch_internal_transactions/2" do
@@ -359,6 +357,8 @@ defmodule EthereumJSONRPC.GethTest do
            ]}
       end)
 
+      Application.put_env(:ethereum_jsonrpc, Geth, tracer: "call_tracer", debug_trace_transaction_timeout: "5s")
+
       call_tracer_internal_txs = Geth.fetch_internal_transactions([transaction_params], json_rpc_named_arguments)
 
       Application.put_env(:ethereum_jsonrpc, Geth, tracer: "js", debug_trace_transaction_timeout: "5s")
@@ -429,6 +429,8 @@ defmodule EthereumJSONRPC.GethTest do
            ]}
       end)
 
+      Application.put_env(:ethereum_jsonrpc, Geth, tracer: "call_tracer", debug_trace_transaction_timeout: "5s")
+
       call_tracer_internal_txs = Geth.fetch_internal_transactions([transaction_params], json_rpc_named_arguments)
 
       Application.put_env(:ethereum_jsonrpc, Geth, tracer: "js", debug_trace_transaction_timeout: "5s")
@@ -467,6 +469,8 @@ defmodule EthereumJSONRPC.GethTest do
            ]}
       end)
 
+      Application.put_env(:ethereum_jsonrpc, Geth, tracer: "call_tracer", debug_trace_transaction_timeout: "5s")
+
       assert {:ok,
               [
                 %{
@@ -518,6 +522,8 @@ defmodule EthereumJSONRPC.GethTest do
            ]}
       end)
 
+      Application.put_env(:ethereum_jsonrpc, Geth, tracer: "call_tracer", debug_trace_transaction_timeout: "5s")
+
       uppercase_result = Geth.fetch_internal_transactions([transaction_params], json_rpc_named_arguments)
 
       expect(EthereumJSONRPC.Mox, :json_rpc, 1, fn

From c761c52eac0ad1ad79aae0db146fc6e745dd3896 Mon Sep 17 00:00:00 2001
From: Viktor Baranov <baranov.viktor.27@gmail.com>
Date: Wed, 29 Nov 2023 15:16:29 +0300
Subject: [PATCH 730/909] Solidityscan report API endpoint

---
 .dialyzer-ignore                              |  4 +-
 .github/workflows/config.yml                  | 26 +++++------
 CHANGELOG.md                                  |  4 +-
 .../api/v2/smart_contract_controller.ex       | 45 ++++++++++++++++++-
 .../smart_contracts_api_v2_router.ex          |  1 +
 .../block_scout_web/views/api/v2/helper.ex    |  7 +--
 .../views/api/v2/transaction_view.ex          |  4 +-
 .../account/notifier/forbidden_address.ex     | 22 ++++-----
 apps/explorer/lib/explorer/chain/address.ex   | 10 +++++
 .../lib/explorer/exchange_rates/source.ex     | 11 ++---
 apps/explorer/lib/explorer/helper.ex          | 10 +++++
 .../smart_contract/compiler_version.ex        |  8 +---
 .../third_party_integrations/solidityscan.ex  | 40 +++++++++++++++++
 .../third_party_integrations/sourcify.ex      | 23 ++++------
 config/runtime.exs                            |  4 ++
 cspell.json                                   | 13 +++++-
 16 files changed, 164 insertions(+), 68 deletions(-)
 create mode 100644 apps/explorer/lib/explorer/third_party_integrations/solidityscan.ex

diff --git a/.dialyzer-ignore b/.dialyzer-ignore
index 44a7f6862aba..20e4865a428f 100644
--- a/.dialyzer-ignore
+++ b/.dialyzer-ignore
@@ -13,8 +13,8 @@ lib/block_scout_web/schema/types.ex:31
 lib/phoenix/router.ex:324
 lib/phoenix/router.ex:402
 lib/explorer/smart_contract/reader.ex:435
-lib/explorer/exchange_rates/source.ex:139
-lib/explorer/exchange_rates/source.ex:142
+lib/explorer/exchange_rates/source.ex:134
+lib/explorer/exchange_rates/source.ex:137
 lib/indexer/fetcher/polygon_edge.ex:737
 lib/indexer/fetcher/polygon_edge/deposit_execute.ex:140
 lib/indexer/fetcher/polygon_edge/deposit_execute.ex:184
diff --git a/.github/workflows/config.yml b/.github/workflows/config.yml
index 31e89c223fa4..8ec57498b3dc 100644
--- a/.github/workflows/config.yml
+++ b/.github/workflows/config.yml
@@ -72,7 +72,7 @@ jobs:
           path: |
             deps
             _build
-          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_27-${{ hashFiles('mix.lock') }}
+          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_28-${{ hashFiles('mix.lock') }}
           restore-keys: |
             ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-
 
@@ -130,7 +130,7 @@ jobs:
           path: |
             deps
             _build
-          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_27-${{ hashFiles('mix.lock') }}
+          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_28-${{ hashFiles('mix.lock') }}
           restore-keys: |
             ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-"
 
@@ -154,7 +154,7 @@ jobs:
           path: |
             deps
             _build
-          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_27-${{ hashFiles('mix.lock') }}
+          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_28-${{ hashFiles('mix.lock') }}
           restore-keys: |
             ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-"
 
@@ -183,7 +183,7 @@ jobs:
           path: |
             deps
             _build
-          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_27-${{ hashFiles('mix.lock') }}
+          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_28-${{ hashFiles('mix.lock') }}
           restore-keys: |
             ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-"
 
@@ -227,7 +227,7 @@ jobs:
           path: |
             deps
             _build
-          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_27-${{ hashFiles('mix.lock') }}
+          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_28-${{ hashFiles('mix.lock') }}
           restore-keys: |
             ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-"
 
@@ -253,7 +253,7 @@ jobs:
           path: |
             deps
             _build
-          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_27-${{ hashFiles('mix.lock') }}
+          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_28-${{ hashFiles('mix.lock') }}
           restore-keys: |
             ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-"
 
@@ -282,7 +282,7 @@ jobs:
           path: |
             deps
             _build
-          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_27-${{ hashFiles('mix.lock') }}
+          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_28-${{ hashFiles('mix.lock') }}
           restore-keys: |
             ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-"
 
@@ -330,7 +330,7 @@ jobs:
           path: |
             deps
             _build
-          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_27-${{ hashFiles('mix.lock') }}
+          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_28-${{ hashFiles('mix.lock') }}
           restore-keys: |
             ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-"
 
@@ -376,7 +376,7 @@ jobs:
           path: |
             deps
             _build
-          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_27-${{ hashFiles('mix.lock') }}
+          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_28-${{ hashFiles('mix.lock') }}
           restore-keys: |
             ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-"
 
@@ -438,7 +438,7 @@ jobs:
           path: |
             deps
             _build
-          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_27-${{ hashFiles('mix.lock') }}
+          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_28-${{ hashFiles('mix.lock') }}
           restore-keys: |
             ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-"
 
@@ -498,7 +498,7 @@ jobs:
           path: |
             deps
             _build
-          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_27-${{ hashFiles('mix.lock') }}
+          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_28-${{ hashFiles('mix.lock') }}
           restore-keys: |
             ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-"
 
@@ -569,7 +569,7 @@ jobs:
           path: |
             deps
             _build
-          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_27-${{ hashFiles('mix.lock') }}
+          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_28-${{ hashFiles('mix.lock') }}
           restore-keys: |
             ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-"
 
@@ -637,7 +637,7 @@ jobs:
           path: |
             deps
             _build
-          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_27-${{ hashFiles('mix.lock') }}
+          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_28-${{ hashFiles('mix.lock') }}
           restore-keys: |
             ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-"
 
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9200b4a88ecb..c464c468cb52 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,15 +2,15 @@
 
 ## Current
 
-- [#8924](https://github.com/blockscout/blockscout/pull/8924) - Delete invalid current token balances in OnDemand fetcher
-
 ### Features
 
+- [#8908](https://github.com/blockscout/blockscout/pull/8908) - Solidityscan report API endpoint
 - [#8900](https://github.com/blockscout/blockscout/pull/8900) - Add Compound proxy contract pattern
 - [#8611](https://github.com/blockscout/blockscout/pull/8611) - Implement sorting of smart contracts, address transactions
 
 ### Fixes
 
+- [#8924](https://github.com/blockscout/blockscout/pull/8924) - Delete invalid current token balances in OnDemand fetcher
 - [#8922](https://github.com/blockscout/blockscout/pull/8922) - Allow call type to be in lowercase
 - [#8917](https://github.com/blockscout/blockscout/pull/8917) - Proxy detection hotfix in API v2
 - [#8915](https://github.com/blockscout/blockscout/pull/8915) - smart-contract: delete embeds_many relation on replace
diff --git a/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/smart_contract_controller.ex b/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/smart_contract_controller.ex
index 3fe7b47c26a9..3c68d73a09f2 100644
--- a/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/smart_contract_controller.ex
+++ b/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/smart_contract_controller.ex
@@ -12,9 +12,10 @@ defmodule BlockScoutWeb.API.V2.SmartContractController do
   alias BlockScoutWeb.{AccessHelper, AddressView}
   alias Ecto.Association.NotLoaded
   alias Explorer.Chain
-  alias Explorer.Chain.SmartContract
+  alias Explorer.Chain.{Address, SmartContract}
   alias Explorer.SmartContract.{Reader, Writer}
   alias Explorer.SmartContract.Solidity.PublishHelper
+  alias Explorer.ThirdPartyIntegrations.SolidityScan
 
   @smart_contract_address_options [
     necessity_by_association: %{
@@ -190,6 +191,48 @@ defmodule BlockScoutWeb.API.V2.SmartContractController do
     end
   end
 
+  @doc """
+  /api/v2/smart-contracts/${address_hash_string}/solidityscan-report logic
+  """
+  @spec solidityscan_report(Plug.Conn.t(), map() | :atom) :: any()
+  def solidityscan_report(conn, %{"address_hash" => address_hash_string} = params) do
+    with {:format, {:ok, address_hash}} <- {:format, Chain.string_to_address_hash(address_hash_string)},
+         {:ok, false} <- AccessHelper.restricted_access?(address_hash_string, params),
+         {:ok, address} <- Chain.hash_to_address(address_hash),
+         {:is_smart_contract, true} <- {:is_smart_contract, Address.is_smart_contract(address)},
+         response = SolidityScan.solidityscan_request(address_hash_string),
+         {:is_empty_response, false} <- {:is_empty_response, is_nil(response)} do
+      conn
+      |> put_status(200)
+      |> json(response)
+    else
+      {:format, :error} ->
+        conn
+        |> put_status(400)
+        |> json(%{status: "error", message: "Invalid address hash"})
+
+      {:restricted_access, true} ->
+        conn
+        |> put_status(403)
+        |> json(%{status: "error", message: "Access restricted"})
+
+      {:error, :not_found} ->
+        conn
+        |> put_status(404)
+        |> json(%{status: "error", message: "Address not found"})
+
+      {:is_smart_contract, false} ->
+        conn
+        |> put_status(404)
+        |> json(%{status: "error", message: "Smart-contract not found"})
+
+      {:is_empty_response, true} ->
+        conn
+        |> put_status(500)
+        |> json(%{status: "error", message: "Empty response"})
+    end
+  end
+
   def smart_contracts_list(conn, params) do
     full_options =
       [necessity_by_association: %{[address: :token] => :optional, [address: :names] => :optional, address: :required}]
diff --git a/apps/block_scout_web/lib/block_scout_web/smart_contracts_api_v2_router.ex b/apps/block_scout_web/lib/block_scout_web/smart_contracts_api_v2_router.ex
index d3f1d5e162f7..ad8bf8ad9609 100644
--- a/apps/block_scout_web/lib/block_scout_web/smart_contracts_api_v2_router.ex
+++ b/apps/block_scout_web/lib/block_scout_web/smart_contracts_api_v2_router.ex
@@ -27,6 +27,7 @@ defmodule BlockScoutWeb.SmartContractsApiV2Router do
     get("/:address_hash/methods-read-proxy", V2.SmartContractController, :methods_read_proxy)
     get("/:address_hash/methods-write-proxy", V2.SmartContractController, :methods_write_proxy)
     post("/:address_hash/query-read-method", V2.SmartContractController, :query_read_method)
+    get("/:address_hash/solidityscan-report", V2.SmartContractController, :solidityscan_report)
 
     get("/verification/config", V2.VerificationController, :config)
 
diff --git a/apps/block_scout_web/lib/block_scout_web/views/api/v2/helper.ex b/apps/block_scout_web/lib/block_scout_web/views/api/v2/helper.ex
index 9b82e01ede77..9c490d9131fc 100644
--- a/apps/block_scout_web/lib/block_scout_web/views/api/v2/helper.ex
+++ b/apps/block_scout_web/lib/block_scout_web/views/api/v2/helper.ex
@@ -51,7 +51,7 @@ defmodule BlockScoutWeb.API.V2.Helper do
   defp address_with_info(%Address{} = address, _address_hash) do
     %{
       "hash" => Address.checksum(address),
-      "is_contract" => is_smart_contract(address),
+      "is_contract" => Address.is_smart_contract(address),
       "name" => address_name(address),
       "implementation_name" => implementation_name(address),
       "is_verified" => is_verified(address)
@@ -94,11 +94,6 @@ defmodule BlockScoutWeb.API.V2.Helper do
 
   def implementation_name(_), do: nil
 
-  def is_smart_contract(%Address{contract_code: nil}), do: false
-  def is_smart_contract(%Address{contract_code: _}), do: true
-  def is_smart_contract(%NotLoaded{}), do: nil
-  def is_smart_contract(_), do: false
-
   def is_verified(%Address{smart_contract: nil}), do: false
   def is_verified(%Address{smart_contract: %{metadata_from_verified_twin: true}}), do: false
   def is_verified(%Address{smart_contract: %NotLoaded{}}), do: nil
diff --git a/apps/block_scout_web/lib/block_scout_web/views/api/v2/transaction_view.ex b/apps/block_scout_web/lib/block_scout_web/views/api/v2/transaction_view.ex
index c3e4d8288740..ac8e395011b6 100644
--- a/apps/block_scout_web/lib/block_scout_web/views/api/v2/transaction_view.ex
+++ b/apps/block_scout_web/lib/block_scout_web/views/api/v2/transaction_view.ex
@@ -707,7 +707,7 @@ defmodule BlockScoutWeb.API.V2.TransactionView do
          _,
          skip_sc_check?
        ) do
-    if skip_sc_check? || Helper.is_smart_contract(to_address) do
+    if skip_sc_check? || Address.is_smart_contract(to_address) do
       "0x" <> Base.encode16(method_id, case: :lower)
     else
       nil
@@ -760,7 +760,7 @@ defmodule BlockScoutWeb.API.V2.TransactionView do
 
   defp tx_types(%Transaction{to_address: to_address} = tx, types, :contract_call) do
     types =
-      if Helper.is_smart_contract(to_address) do
+      if Address.is_smart_contract(to_address) do
         [:contract_call | types]
       else
         types
diff --git a/apps/explorer/lib/explorer/account/notifier/forbidden_address.ex b/apps/explorer/lib/explorer/account/notifier/forbidden_address.ex
index 6022c87fcc7d..b20cd898ed2a 100644
--- a/apps/explorer/lib/explorer/account/notifier/forbidden_address.ex
+++ b/apps/explorer/lib/explorer/account/notifier/forbidden_address.ex
@@ -5,16 +5,16 @@ defmodule Explorer.Account.Notifier.ForbiddenAddress do
 
   import Explorer.Chain.SmartContract, only: [burn_address_hash_string: 0]
 
+  alias Explorer.Chain.Address
+
   @blacklist [
     burn_address_hash_string(),
     "0x000000000000000000000000000000000000dEaD"
   ]
 
-  alias Explorer.{AccessHelper, Repo}
-  alias Explorer.Chain.Token
+  alias Explorer.AccessHelper
 
-  import Ecto.Query, only: [from: 2]
-  import Explorer.Chain, only: [string_to_address_hash: 1]
+  import Explorer.Chain, only: [string_to_address_hash: 1, hash_to_address: 1]
 
   def check(address_string) when is_bitstring(address_string) do
     case format_address(address_string) do
@@ -32,7 +32,7 @@ defmodule Explorer.Account.Notifier.ForbiddenAddress do
         {:error, "This address is blacklisted"}
 
       is_contract(address_hash) ->
-        {:error, "This address isn't personal"}
+        {:error, "This address isn't EOA"}
 
       match?({:restricted_access, true}, AccessHelper.restricted_access?(to_string(address_hash), %{})) ->
         {:error, "This address has restricted access"}
@@ -43,14 +43,10 @@ defmodule Explorer.Account.Notifier.ForbiddenAddress do
   end
 
   defp is_contract(%Explorer.Chain.Hash{} = address_hash) do
-    query =
-      from(
-        token in Token,
-        where: token.contract_address_hash == ^address_hash
-      )
-
-    contract_addresses = Repo.all(query)
-    List.first(contract_addresses)
+    case hash_to_address(address_hash) do
+      {:error, :not_found} -> false
+      {:ok, address} -> Address.is_smart_contract(address)
+    end
   end
 
   defp format_address(address_hash_string) do
diff --git a/apps/explorer/lib/explorer/chain/address.ex b/apps/explorer/lib/explorer/chain/address.ex
index e8ea2300590a..96dc8c782c27 100644
--- a/apps/explorer/lib/explorer/chain/address.ex
+++ b/apps/explorer/lib/explorer/chain/address.ex
@@ -7,6 +7,7 @@ defmodule Explorer.Chain.Address do
 
   use Explorer.Schema
 
+  alias Ecto.Association.NotLoaded
   alias Ecto.Changeset
   alias Explorer.{Chain, PagingOptions}
 
@@ -332,6 +333,15 @@ defmodule Explorer.Chain.Address do
     end
   end
 
+  @doc """
+  Checks if given address is smart-contract
+  """
+  @spec is_smart_contract(any()) :: boolean() | nil
+  def is_smart_contract(%__MODULE__{contract_code: nil}), do: false
+  def is_smart_contract(%__MODULE__{contract_code: _}), do: true
+  def is_smart_contract(%NotLoaded{}), do: nil
+  def is_smart_contract(_), do: false
+
   defp get_addresses(options) do
     accounts_with_n = fetch_top_addresses(options)
 
diff --git a/apps/explorer/lib/explorer/exchange_rates/source.ex b/apps/explorer/lib/explorer/exchange_rates/source.ex
index befa6560d068..1323cd162834 100644
--- a/apps/explorer/lib/explorer/exchange_rates/source.ex
+++ b/apps/explorer/lib/explorer/exchange_rates/source.ex
@@ -6,6 +6,7 @@ defmodule Explorer.ExchangeRates.Source do
   alias Explorer.Chain.Hash
   alias Explorer.ExchangeRates.Source.CoinGecko
   alias Explorer.ExchangeRates.Token
+  alias Explorer.Helper
   alias HTTPoison.{Error, Response}
 
   @doc """
@@ -91,12 +92,6 @@ defmodule Explorer.ExchangeRates.Source do
     [{"Content-Type", "application/json"}]
   end
 
-  def decode_json(data) do
-    Jason.decode!(data)
-  rescue
-    _ -> data
-  end
-
   def to_decimal(nil), do: nil
 
   def to_decimal(%Decimal{} = value), do: value
@@ -145,7 +140,7 @@ defmodule Explorer.ExchangeRates.Source do
   end
 
   defp parse_http_success_response(body) do
-    body_json = decode_json(body)
+    body_json = Helper.decode_json(body)
 
     cond do
       is_map(body_json) ->
@@ -160,7 +155,7 @@ defmodule Explorer.ExchangeRates.Source do
   end
 
   defp parse_http_error_response(body) do
-    body_json = decode_json(body)
+    body_json = Helper.decode_json(body)
 
     if is_map(body_json) do
       {:error, body_json["error"]}
diff --git a/apps/explorer/lib/explorer/helper.ex b/apps/explorer/lib/explorer/helper.ex
index 5004b1f26702..43b3dabd022d 100644
--- a/apps/explorer/lib/explorer/helper.ex
+++ b/apps/explorer/lib/explorer/helper.ex
@@ -58,4 +58,14 @@ defmodule Explorer.Helper do
 
     Enum.map(list, fn el -> Map.put(el, preload_field, associated_elements[el[foreign_key_field]]) end)
   end
+
+  @doc """
+  Decode json with rescue
+  """
+  @spec decode_json(any()) :: any()
+  def decode_json(data) do
+    Jason.decode!(data)
+  rescue
+    _ -> data
+  end
 end
diff --git a/apps/explorer/lib/explorer/smart_contract/compiler_version.ex b/apps/explorer/lib/explorer/smart_contract/compiler_version.ex
index e3d2bcde8a07..248bfaa0781e 100644
--- a/apps/explorer/lib/explorer/smart_contract/compiler_version.ex
+++ b/apps/explorer/lib/explorer/smart_contract/compiler_version.ex
@@ -41,7 +41,7 @@ defmodule Explorer.SmartContract.CompilerVersion do
           {:ok, format_data(body, :solc)}
 
         {:ok, %{status_code: _status_code, body: body}} ->
-          {:error, decode_json(body)["error"]}
+          {:error, Helper.decode_json(body)["error"]}
 
         {:error, %{reason: reason}} ->
           {:error, reason}
@@ -60,7 +60,7 @@ defmodule Explorer.SmartContract.CompilerVersion do
           {:ok, format_data(body, :vyper)}
 
         {:ok, %{status_code: _status_code, body: body}} ->
-          {:error, decode_json(body)["error"]}
+          {:error, Helper.decode_json(body)["error"]}
 
         {:error, %{reason: reason}} ->
           {:error, reason}
@@ -140,10 +140,6 @@ defmodule Explorer.SmartContract.CompilerVersion do
     end
   end
 
-  defp decode_json(json) do
-    Jason.decode!(json)
-  end
-
   @spec source_url(:solc | :vyper) :: String.t()
   defp source_url(compiler) do
     case compiler do
diff --git a/apps/explorer/lib/explorer/third_party_integrations/solidityscan.ex b/apps/explorer/lib/explorer/third_party_integrations/solidityscan.ex
new file mode 100644
index 000000000000..40a5bffb9784
--- /dev/null
+++ b/apps/explorer/lib/explorer/third_party_integrations/solidityscan.ex
@@ -0,0 +1,40 @@
+defmodule Explorer.ThirdPartyIntegrations.SolidityScan do
+  @moduledoc """
+  Module for SolidityScan integration https://apidoc.solidityscan.com/solidityscan-security-api/solidityscan-other-apis/quickscan-api-v1
+  """
+
+  alias Explorer.Helper
+
+  @blockscout_platform_id "16"
+  @recv_timeout 60_000
+
+  @doc """
+  Proxy request to solidityscan API endpoint for the given smart-contract
+  """
+  @spec solidityscan_request(String.t()) :: any()
+  def solidityscan_request(address_hash_string) do
+    headers = [{"Authorization", "Token #{api_key()}"}]
+
+    url = base_url(address_hash_string)
+
+    case HTTPoison.get(url, headers, recv_timeout: @recv_timeout) do
+      {:ok, %HTTPoison.Response{status_code: 200, body: body}} ->
+        Helper.decode_json(body)
+
+      _ ->
+        nil
+    end
+  end
+
+  defp base_url(address_hash_string) do
+    "https://api.solidityscan.com/api/v1/quickscan/#{@blockscout_platform_id}/#{chain_id()}/#{address_hash_string}"
+  end
+
+  defp chain_id do
+    Application.get_env(:explorer, __MODULE__)[:chain_id]
+  end
+
+  defp api_key do
+    Application.get_env(:explorer, __MODULE__)[:api_key]
+  end
+end
diff --git a/apps/explorer/lib/explorer/third_party_integrations/sourcify.ex b/apps/explorer/lib/explorer/third_party_integrations/sourcify.ex
index b510fb355d49..95c22c84ceb8 100644
--- a/apps/explorer/lib/explorer/third_party_integrations/sourcify.ex
+++ b/apps/explorer/lib/explorer/third_party_integrations/sourcify.ex
@@ -4,6 +4,7 @@ defmodule Explorer.ThirdPartyIntegrations.Sourcify do
   """
   use Tesla
 
+  alias Explorer.Helper, as: ExplorerHelper
   alias Explorer.SmartContract.{Helper, RustVerifierInterface}
   alias HTTPoison.{Error, Response}
   alias Tesla.Multipart
@@ -223,7 +224,7 @@ defmodule Explorer.ThirdPartyIntegrations.Sourcify do
   end
 
   defp parse_verify_http_response(body) do
-    body_json = decode_json(body)
+    body_json = ExplorerHelper.decode_json(body)
 
     case body_json do
       # Success status from native Sourcify server
@@ -246,7 +247,7 @@ defmodule Explorer.ThirdPartyIntegrations.Sourcify do
   end
 
   defp parse_check_by_address_http_response(body) do
-    body_json = decode_json(body)
+    body_json = ExplorerHelper.decode_json(body)
 
     case body_json do
       [%{"status" => "perfect"}] ->
@@ -264,11 +265,11 @@ defmodule Explorer.ThirdPartyIntegrations.Sourcify do
   end
 
   defp parse_get_metadata_http_response(body) do
-    body_json = decode_json(body)
+    body_json = ExplorerHelper.decode_json(body)
 
     case body_json do
       %{"message" => message, "errors" => errors} ->
-        {:error, "#{message}: #{decode_json(errors)}"}
+        {:error, "#{message}: #{ExplorerHelper.decode_json(errors)}"}
 
       metadata ->
         {:ok, metadata}
@@ -276,11 +277,11 @@ defmodule Explorer.ThirdPartyIntegrations.Sourcify do
   end
 
   defp parse_get_metadata_any_http_response(body) do
-    body_json = decode_json(body)
+    body_json = ExplorerHelper.decode_json(body)
 
     case body_json do
       %{"message" => message, "errors" => errors} ->
-        {:error, "#{message}: #{decode_json(errors)}"}
+        {:error, "#{message}: #{ExplorerHelper.decode_json(errors)}"}
 
       %{"status" => status, "files" => metadata} ->
         {:ok, status, metadata}
@@ -291,7 +292,7 @@ defmodule Explorer.ThirdPartyIntegrations.Sourcify do
   end
 
   defp parse_http_error_response(body) do
-    body_json = decode_json(body)
+    body_json = ExplorerHelper.decode_json(body)
 
     if is_map(body_json) do
       {:error, body_json["error"]}
@@ -350,7 +351,7 @@ defmodule Explorer.ThirdPartyIntegrations.Sourcify do
 
   defp parse_json_from_sourcify_for_insertion(verification_metadata_json) do
     %{"name" => _, "content" => content} = verification_metadata_json
-    content_json = decode_json(content)
+    content_json = ExplorerHelper.decode_json(content)
     compiler_version = "v" <> (content_json |> Map.get("compiler") |> Map.get("version"))
     abi = content_json |> Map.get("output") |> Map.get("abi")
     settings = Map.get(content_json, "settings")
@@ -401,12 +402,6 @@ defmodule Explorer.ThirdPartyIntegrations.Sourcify do
     |> Map.put("contract_source_code", content)
   end
 
-  def decode_json(data) do
-    Jason.decode!(data)
-  rescue
-    _ -> data
-  end
-
   defp config(module, key) do
     :explorer
     |> Application.get_env(module)
diff --git a/config/runtime.exs b/config/runtime.exs
index 81459925ee18..0f1ed1aa864a 100644
--- a/config/runtime.exs
+++ b/config/runtime.exs
@@ -368,6 +368,10 @@ config :explorer, Explorer.ThirdPartyIntegrations.Sourcify,
   chain_id: System.get_env("CHAIN_ID"),
   repo_url: System.get_env("SOURCIFY_REPO_URL") || "https://repo.sourcify.dev/contracts"
 
+config :explorer, Explorer.ThirdPartyIntegrations.SolidityScan,
+  chain_id: System.get_env("SOLIDITYSCAN_CHAIN_ID"),
+  api_key: System.get_env("SOLIDITYSCAN_API_TOKEN")
+
 enabled? = ConfigHelper.parse_bool_env_var("MICROSERVICE_SC_VERIFIER_ENABLED")
 # or "eth_bytecode_db"
 type = System.get_env("MICROSERVICE_SC_VERIFIER_TYPE", "sc_verifier")
diff --git a/cspell.json b/cspell.json
index b76de4bdc930..72bfc7609c21 100644
--- a/cspell.json
+++ b/cspell.json
@@ -534,7 +534,18 @@
         "zindex",
         "zipcode",
         "zkbob",
-        "zkevm"
+        "zkevm",
+        "erts",
+        "Asfpp",
+        "Nerg",
+        "secp",
+        "qwertyuioiuytrewertyuioiuytrertyuio",
+        "urlset",
+        "lastmod",
+        "qitmeer",
+        "meer",
+        "DefiLlama",
+        "SOLIDITYSCAN"
     ],
     "enableFiletypes": [
         "dotenv",

From 5260f09ed710d0dd7bb7e5fd01c3ec1cc5f5635b Mon Sep 17 00:00:00 2001
From: Viktor Baranov <baranov.viktor.27@gmail.com>
Date: Mon, 4 Dec 2023 22:42:29 +0300
Subject: [PATCH 731/909] Generalized decode_json function

---
 .../lib/explorer/exchange_rates/source.ex     | 11 +------
 apps/explorer/lib/explorer/helper.ex          | 23 +++++++++++----
 .../smart_contract/compiler_version.ex        | 29 +++++++------------
 .../token_instance/metadata_retriever.ex      | 15 ++--------
 4 files changed, 32 insertions(+), 46 deletions(-)

diff --git a/apps/explorer/lib/explorer/exchange_rates/source.ex b/apps/explorer/lib/explorer/exchange_rates/source.ex
index 1323cd162834..7c58d7e7d710 100644
--- a/apps/explorer/lib/explorer/exchange_rates/source.ex
+++ b/apps/explorer/lib/explorer/exchange_rates/source.ex
@@ -142,16 +142,7 @@ defmodule Explorer.ExchangeRates.Source do
   defp parse_http_success_response(body) do
     body_json = Helper.decode_json(body)
 
-    cond do
-      is_map(body_json) ->
-        {:ok, body_json}
-
-      is_list(body_json) ->
-        {:ok, body_json}
-
-      true ->
-        {:ok, body}
-    end
+    {:ok, body_json}
   end
 
   defp parse_http_error_response(body) do
diff --git a/apps/explorer/lib/explorer/helper.ex b/apps/explorer/lib/explorer/helper.ex
index 43b3dabd022d..45d92a283068 100644
--- a/apps/explorer/lib/explorer/helper.ex
+++ b/apps/explorer/lib/explorer/helper.ex
@@ -60,12 +60,25 @@ defmodule Explorer.Helper do
   end
 
   @doc """
-  Decode json with rescue
+  Decode json
   """
-  @spec decode_json(any()) :: any()
+  @spec decode_json(any()) :: map() | list() | nil
+  def decode_json(nil), do: nil
+
   def decode_json(data) do
-    Jason.decode!(data)
-  rescue
-    _ -> data
+    if String.valid?(data) do
+      safe_decode_json(data)
+    else
+      data
+      |> :unicode.characters_to_binary(:latin1)
+      |> safe_decode_json()
+    end
+  end
+
+  defp safe_decode_json(data) do
+    case Jason.decode(data) do
+      {:ok, decoded} -> decoded
+      _ -> %{error: data}
+    end
   end
 end
diff --git a/apps/explorer/lib/explorer/smart_contract/compiler_version.ex b/apps/explorer/lib/explorer/smart_contract/compiler_version.ex
index 248bfaa0781e..0df293799cd1 100644
--- a/apps/explorer/lib/explorer/smart_contract/compiler_version.ex
+++ b/apps/explorer/lib/explorer/smart_contract/compiler_version.ex
@@ -31,33 +31,24 @@ defmodule Explorer.SmartContract.CompilerVersion do
   end
 
   defp fetch_solc_versions do
-    if RustVerifierInterface.enabled?() do
-      RustVerifierInterface.get_versions_list()
-    else
-      headers = [{"Content-Type", "application/json"}]
-
-      case HTTPoison.get(source_url(:solc), headers) do
-        {:ok, %{status_code: 200, body: body}} ->
-          {:ok, format_data(body, :solc)}
-
-        {:ok, %{status_code: _status_code, body: body}} ->
-          {:error, Helper.decode_json(body)["error"]}
-
-        {:error, %{reason: reason}} ->
-          {:error, reason}
-      end
-    end
+    RustVerifierInterface.get_versions_list()
+    |> fetch_compiler_versions(:solc)
   end
 
   defp fetch_vyper_versions do
+    RustVerifierInterface.vyper_get_versions_list()
+    |> fetch_compiler_versions(:vyper)
+  end
+
+  defp fetch_compiler_versions(compiler_list, compiler_type) do
     if RustVerifierInterface.enabled?() do
-      RustVerifierInterface.vyper_get_versions_list()
+      compiler_list
     else
       headers = [{"Content-Type", "application/json"}]
 
-      case HTTPoison.get(source_url(:vyper), headers) do
+      case HTTPoison.get(source_url(compiler_type), headers) do
         {:ok, %{status_code: 200, body: body}} ->
-          {:ok, format_data(body, :vyper)}
+          {:ok, format_data(body, compiler_type)}
 
         {:ok, %{status_code: _status_code, body: body}} ->
           {:error, Helper.decode_json(body)["error"]}
diff --git a/apps/indexer/lib/indexer/fetcher/token_instance/metadata_retriever.ex b/apps/indexer/lib/indexer/fetcher/token_instance/metadata_retriever.ex
index 975b7bed5f87..191d81a15d4e 100644
--- a/apps/indexer/lib/indexer/fetcher/token_instance/metadata_retriever.ex
+++ b/apps/indexer/lib/indexer/fetcher/token_instance/metadata_retriever.ex
@@ -5,6 +5,7 @@ defmodule Indexer.Fetcher.TokenInstance.MetadataRetriever do
 
   require Logger
 
+  alias Explorer.Helper, as: ExplorerHelper
   alias Explorer.SmartContract.Reader
   alias HTTPoison.{Error, Response}
 
@@ -130,7 +131,7 @@ defmodule Indexer.Fetcher.TokenInstance.MetadataRetriever do
   end
 
   defp fetch_json_from_uri({:ok, [json]}, hex_token_id) do
-    {:ok, json} = decode_json(json)
+    json = ExplorerHelper.decode_json(json)
 
     check_type(json, hex_token_id)
   rescue
@@ -222,7 +223,7 @@ defmodule Indexer.Fetcher.TokenInstance.MetadataRetriever do
 
       check_type(json, nil)
     else
-      {:ok, json} = decode_json(body)
+      json = ExplorerHelper.decode_json(body)
 
       check_type(json, hex_token_id)
     end
@@ -245,16 +246,6 @@ defmodule Indexer.Fetcher.TokenInstance.MetadataRetriever do
     content_type && String.starts_with?(content_type, "video/")
   end
 
-  defp decode_json(body) do
-    if String.valid?(body) do
-      Jason.decode(body)
-    else
-      body
-      |> :unicode.characters_to_binary(:latin1)
-      |> Jason.decode()
-    end
-  end
-
   defp check_type(json, nil) when is_map(json) do
     {:ok, %{metadata: json}}
   end

From 9ee7e9c7727e37e42f1906593326d601c84b1e1d Mon Sep 17 00:00:00 2001
From: Viktor Baranov <baranov.viktor.27@gmail.com>
Date: Mon, 4 Dec 2023 23:42:09 +0300
Subject: [PATCH 732/909] Extend fallback controller for API v2 in order to
 handle responses from solidityscan api endpoint

---
 .../controllers/api/v2/fallback_controller.ex | 24 +++++++++++++++
 .../api/v2/smart_contract_controller.ex       | 29 ++-----------------
 2 files changed, 26 insertions(+), 27 deletions(-)

diff --git a/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/fallback_controller.ex b/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/fallback_controller.ex
index 56e66c7d0a44..49851c4744e1 100644
--- a/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/fallback_controller.ex
+++ b/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/fallback_controller.ex
@@ -23,6 +23,9 @@ defmodule BlockScoutWeb.API.V2.FallbackController do
   @unauthorized "Unauthorized"
   @not_configured_api_key "API key not configured on the server"
   @wrong_api_key "Wrong API key"
+  @address_not_found "Address not found"
+  @address_is_not_smart_contract "Address is not smart-contract"
+  @empty_response "Empty response"
 
   def call(conn, {:format, _params}) do
     Logger.error(fn ->
@@ -232,4 +235,25 @@ defmodule BlockScoutWeb.API.V2.FallbackController do
     |> put_view(ApiView)
     |> render(:message, %{message: @wrong_api_key})
   end
+
+  def call(conn, {:address, {:error, :not_found}}) do
+    conn
+    |> put_status(:not_found)
+    |> put_view(ApiView)
+    |> render(:message, %{message: @address_not_found})
+  end
+
+  def call(conn, {:is_smart_contract, false}) do
+    conn
+    |> put_status(:not_found)
+    |> put_view(ApiView)
+    |> render(:message, %{message: @address_is_not_smart_contract})
+  end
+
+  def call(conn, {:is_empty_response, true}) do
+    conn
+    |> put_status(500)
+    |> put_view(ApiView)
+    |> render(:message, %{message: @empty_response})
+  end
 end
diff --git a/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/smart_contract_controller.ex b/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/smart_contract_controller.ex
index 3c68d73a09f2..82c767cd8929 100644
--- a/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/smart_contract_controller.ex
+++ b/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/smart_contract_controller.ex
@@ -196,40 +196,15 @@ defmodule BlockScoutWeb.API.V2.SmartContractController do
   """
   @spec solidityscan_report(Plug.Conn.t(), map() | :atom) :: any()
   def solidityscan_report(conn, %{"address_hash" => address_hash_string} = params) do
-    with {:format, {:ok, address_hash}} <- {:format, Chain.string_to_address_hash(address_hash_string)},
+    with {:format_address, {:ok, address_hash}} <- {:format_address, Chain.string_to_address_hash(address_hash_string)},
          {:ok, false} <- AccessHelper.restricted_access?(address_hash_string, params),
-         {:ok, address} <- Chain.hash_to_address(address_hash),
+         {:address, {:ok, address}} <- {:address, Chain.hash_to_address(address_hash)},
          {:is_smart_contract, true} <- {:is_smart_contract, Address.is_smart_contract(address)},
          response = SolidityScan.solidityscan_request(address_hash_string),
          {:is_empty_response, false} <- {:is_empty_response, is_nil(response)} do
       conn
       |> put_status(200)
       |> json(response)
-    else
-      {:format, :error} ->
-        conn
-        |> put_status(400)
-        |> json(%{status: "error", message: "Invalid address hash"})
-
-      {:restricted_access, true} ->
-        conn
-        |> put_status(403)
-        |> json(%{status: "error", message: "Access restricted"})
-
-      {:error, :not_found} ->
-        conn
-        |> put_status(404)
-        |> json(%{status: "error", message: "Address not found"})
-
-      {:is_smart_contract, false} ->
-        conn
-        |> put_status(404)
-        |> json(%{status: "error", message: "Smart-contract not found"})
-
-      {:is_empty_response, true} ->
-        conn
-        |> put_status(500)
-        |> json(%{status: "error", message: "Empty response"})
     end
   end
 

From 1c5da633156c5c1e79dd6829d6cdb7f7057d0b35 Mon Sep 17 00:00:00 2001
From: Victor Baranov <baranov.viktor.27@gmail.com>
Date: Tue, 5 Dec 2023 12:31:00 +0300
Subject: [PATCH 733/909] Update
 apps/block_scout_web/lib/block_scout_web/controllers/api/v2/smart_contract_controller.ex

Co-authored-by: Maxim Filonov <53992153+sl1depengwyn@users.noreply.github.com>
---
 .../controllers/api/v2/smart_contract_controller.ex       | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/smart_contract_controller.ex b/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/smart_contract_controller.ex
index 82c767cd8929..21da41d4e3e7 100644
--- a/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/smart_contract_controller.ex
+++ b/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/smart_contract_controller.ex
@@ -194,7 +194,13 @@ defmodule BlockScoutWeb.API.V2.SmartContractController do
   @doc """
   /api/v2/smart-contracts/${address_hash_string}/solidityscan-report logic
   """
-  @spec solidityscan_report(Plug.Conn.t(), map() | :atom) :: any()
+    @spec solidityscan_report(Plug.Conn.t(), map()) ::
+          {:address, {:error, :not_found}}
+          | {:format_address, :error}
+          | {:is_empty_response, true}
+          | {:is_smart_contract, false | nil}
+          | {:restricted_access, true}
+          | Plug.Conn.t()
   def solidityscan_report(conn, %{"address_hash" => address_hash_string} = params) do
     with {:format_address, {:ok, address_hash}} <- {:format_address, Chain.string_to_address_hash(address_hash_string)},
          {:ok, false} <- AccessHelper.restricted_access?(address_hash_string, params),

From 1076f441d7e5f05df1abcc279045808890247fbd Mon Sep 17 00:00:00 2001
From: Viktor Baranov <baranov.viktor.27@gmail.com>
Date: Tue, 5 Dec 2023 12:45:29 +0300
Subject: [PATCH 734/909] Process reviewer comments

---
 .dialyzer-ignore                                       |  2 --
 .../controllers/api/v2/fallback_controller.ex          |  2 +-
 .../controllers/api/v2/smart_contract_controller.ex    |  2 +-
 apps/explorer/lib/explorer/exchange_rates/source.ex    |  6 ------
 .../lib/explorer/smart_contract/compiler_version.ex    | 10 ++++------
 5 files changed, 6 insertions(+), 16 deletions(-)

diff --git a/.dialyzer-ignore b/.dialyzer-ignore
index 20e4865a428f..1acfc060457c 100644
--- a/.dialyzer-ignore
+++ b/.dialyzer-ignore
@@ -13,8 +13,6 @@ lib/block_scout_web/schema/types.ex:31
 lib/phoenix/router.ex:324
 lib/phoenix/router.ex:402
 lib/explorer/smart_contract/reader.ex:435
-lib/explorer/exchange_rates/source.ex:134
-lib/explorer/exchange_rates/source.ex:137
 lib/indexer/fetcher/polygon_edge.ex:737
 lib/indexer/fetcher/polygon_edge/deposit_execute.ex:140
 lib/indexer/fetcher/polygon_edge/deposit_execute.ex:184
diff --git a/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/fallback_controller.ex b/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/fallback_controller.ex
index 49851c4744e1..691d8de75b91 100644
--- a/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/fallback_controller.ex
+++ b/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/fallback_controller.ex
@@ -243,7 +243,7 @@ defmodule BlockScoutWeb.API.V2.FallbackController do
     |> render(:message, %{message: @address_not_found})
   end
 
-  def call(conn, {:is_smart_contract, false}) do
+  def call(conn, {:is_smart_contract, result}) when is_nil(result) or result == false do
     conn
     |> put_status(:not_found)
     |> put_view(ApiView)
diff --git a/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/smart_contract_controller.ex b/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/smart_contract_controller.ex
index 21da41d4e3e7..4986c3a19ad5 100644
--- a/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/smart_contract_controller.ex
+++ b/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/smart_contract_controller.ex
@@ -194,7 +194,7 @@ defmodule BlockScoutWeb.API.V2.SmartContractController do
   @doc """
   /api/v2/smart-contracts/${address_hash_string}/solidityscan-report logic
   """
-    @spec solidityscan_report(Plug.Conn.t(), map()) ::
+  @spec solidityscan_report(Plug.Conn.t(), map()) ::
           {:address, {:error, :not_found}}
           | {:format_address, :error}
           | {:is_empty_response, true}
diff --git a/apps/explorer/lib/explorer/exchange_rates/source.ex b/apps/explorer/lib/explorer/exchange_rates/source.ex
index 7c58d7e7d710..8d50d4069bec 100644
--- a/apps/explorer/lib/explorer/exchange_rates/source.ex
+++ b/apps/explorer/lib/explorer/exchange_rates/source.ex
@@ -130,12 +130,6 @@ defmodule Explorer.ExchangeRates.Source do
 
       {:error, %Error{reason: reason}} ->
         {:error, reason}
-
-      {:error, :nxdomain} ->
-        {:error, "Source is not responsive"}
-
-      {:error, _} ->
-        {:error, "Source unknown response"}
     end
   end
 
diff --git a/apps/explorer/lib/explorer/smart_contract/compiler_version.ex b/apps/explorer/lib/explorer/smart_contract/compiler_version.ex
index 0df293799cd1..3a0e898ff5e2 100644
--- a/apps/explorer/lib/explorer/smart_contract/compiler_version.ex
+++ b/apps/explorer/lib/explorer/smart_contract/compiler_version.ex
@@ -31,18 +31,16 @@ defmodule Explorer.SmartContract.CompilerVersion do
   end
 
   defp fetch_solc_versions do
-    RustVerifierInterface.get_versions_list()
-    |> fetch_compiler_versions(:solc)
+    fetch_compiler_versions(&RustVerifierInterface.get_versions_list/0, :solc)
   end
 
   defp fetch_vyper_versions do
-    RustVerifierInterface.vyper_get_versions_list()
-    |> fetch_compiler_versions(:vyper)
+    fetch_compiler_versions(&RustVerifierInterface.vyper_get_versions_list/0, :vyper)
   end
 
-  defp fetch_compiler_versions(compiler_list, compiler_type) do
+  defp fetch_compiler_versions(compiler_list_fn, compiler_type) do
     if RustVerifierInterface.enabled?() do
-      compiler_list
+      compiler_list_fn.()
     else
       headers = [{"Content-Type", "application/json"}]
 

From 9d4bdf963cfe00ef39ab6338366349b469451969 Mon Sep 17 00:00:00 2001
From: Viktor Baranov <baranov.viktor.27@gmail.com>
Date: Tue, 5 Dec 2023 14:33:49 +0300
Subject: [PATCH 735/909] Process nil response

---
 .../lib/explorer/third_party_integrations/sourcify.ex       | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/apps/explorer/lib/explorer/third_party_integrations/sourcify.ex b/apps/explorer/lib/explorer/third_party_integrations/sourcify.ex
index 95c22c84ceb8..f8385a397b5b 100644
--- a/apps/explorer/lib/explorer/third_party_integrations/sourcify.ex
+++ b/apps/explorer/lib/explorer/third_party_integrations/sourcify.ex
@@ -297,7 +297,11 @@ defmodule Explorer.ThirdPartyIntegrations.Sourcify do
     if is_map(body_json) do
       {:error, body_json["error"]}
     else
-      {:error, body}
+      if is_nil(body) do
+        {:error, "invalid http error json response"}
+      else
+        {:error, body}
+      end
     end
   end
 

From 91d583bede36bee56ad22691d59774f9de63331a Mon Sep 17 00:00:00 2001
From: Viktor Baranov <baranov.viktor.27@gmail.com>
Date: Tue, 5 Dec 2023 18:16:20 +0300
Subject: [PATCH 736/909] Enhance parse_http_error_response response

---
 .../explorer/third_party_integrations/sourcify.ex | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/apps/explorer/lib/explorer/third_party_integrations/sourcify.ex b/apps/explorer/lib/explorer/third_party_integrations/sourcify.ex
index f8385a397b5b..605a50547ebd 100644
--- a/apps/explorer/lib/explorer/third_party_integrations/sourcify.ex
+++ b/apps/explorer/lib/explorer/third_party_integrations/sourcify.ex
@@ -291,20 +291,23 @@ defmodule Explorer.ThirdPartyIntegrations.Sourcify do
     end
   end
 
+  @invalid_json_response "invalid http error json response"
   defp parse_http_error_response(body) do
     body_json = ExplorerHelper.decode_json(body)
 
     if is_map(body_json) do
-      {:error, body_json["error"]}
+      error = body_json["error"]
+
+      parse_http_error_response_internal(error)
     else
-      if is_nil(body) do
-        {:error, "invalid http error json response"}
-      else
-        {:error, body}
-      end
+      parse_http_error_response_internal(body)
     end
   end
 
+  defp parse_http_error_response_internal(nil), do: {:error, @invalid_json_response}
+
+  defp parse_http_error_response_internal(data), do: {:error, data}
+
   def parse_params_from_sourcify(address_hash_string, verification_metadata) do
     filtered_files =
       verification_metadata

From b02558048aeebc7c707e18148e77c9379fc94fe4 Mon Sep 17 00:00:00 2001
From: Viktor Baranov <baranov.viktor.27@gmail.com>
Date: Mon, 27 Nov 2023 23:17:49 +0300
Subject: [PATCH 737/909] Fix method decoding by candidates

---
 CHANGELOG.md                                  |   1 +
 .../lib/block_scout_web/views/address_view.ex |   2 +-
 .../views/api/v2/transaction_view.ex          |   2 +-
 .../lib/explorer/chain/contract_method.ex     |  13 ++
 apps/explorer/lib/explorer/chain/log.ex       | 163 ++++++++++--------
 .../lib/explorer/chain/transaction.ex         |   9 +-
 .../explorer/test/explorer/chain/log_test.exs |   6 +-
 7 files changed, 112 insertions(+), 84 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9200b4a88ecb..19b3408c33cf 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -15,6 +15,7 @@
 - [#8917](https://github.com/blockscout/blockscout/pull/8917) - Proxy detection hotfix in API v2
 - [#8915](https://github.com/blockscout/blockscout/pull/8915) - smart-contract: delete embeds_many relation on replace
 - [#8906](https://github.com/blockscout/blockscout/pull/8906) - Fix abi encoded string argument
+- [#8898](https://github.com/blockscout/blockscout/pull/8898) - Enhance method decoding by candidates from DB
 - [#8882](https://github.com/blockscout/blockscout/pull/8882) - Change order of proxy contracts patterns detection: existing popular EIPs to the top of the list
 - [#8707](https://github.com/blockscout/blockscout/pull/8707) - Fix native coin exchange rate with `EXCHANGE_RATES_COINGECKO_COIN_ID`
 
diff --git a/apps/block_scout_web/lib/block_scout_web/views/address_view.ex b/apps/block_scout_web/lib/block_scout_web/views/address_view.ex
index af46f31ca25c..b77ca5abbb3a 100644
--- a/apps/block_scout_web/lib/block_scout_web/views/address_view.ex
+++ b/apps/block_scout_web/lib/block_scout_web/views/address_view.ex
@@ -498,7 +498,7 @@ defmodule BlockScoutWeb.AddressView do
   def contract_interaction_disabled?, do: Application.get_env(:block_scout_web, :contract)[:disable_interaction]
 
   def decode(log, transaction) do
-    {result, _contracts_acc, _events_acc} = Log.decode(log, transaction, [], true)
+    {result, _events_acc} = Log.decode(log, transaction, [], true)
     result
   end
 end
diff --git a/apps/block_scout_web/lib/block_scout_web/views/api/v2/transaction_view.ex b/apps/block_scout_web/lib/block_scout_web/views/api/v2/transaction_view.ex
index c3e4d8288740..aca45c2c9fa2 100644
--- a/apps/block_scout_web/lib/block_scout_web/views/api/v2/transaction_view.ex
+++ b/apps/block_scout_web/lib/block_scout_web/views/api/v2/transaction_view.ex
@@ -187,7 +187,7 @@ defmodule BlockScoutWeb.API.V2.TransactionView do
   def decode_logs(logs, skip_sig_provider?) do
     {result, _, _} =
       Enum.reduce(logs, {[], %{}, %{}}, fn log, {results, contracts_acc, events_acc} ->
-        {result, contracts_acc, events_acc} =
+        {result, events_acc} =
           Log.decode(
             log,
             %Transaction{hash: log.transaction_hash},
diff --git a/apps/explorer/lib/explorer/chain/contract_method.ex b/apps/explorer/lib/explorer/chain/contract_method.ex
index 05a82406c95d..dd1cf0a80923 100644
--- a/apps/explorer/lib/explorer/chain/contract_method.ex
+++ b/apps/explorer/lib/explorer/chain/contract_method.ex
@@ -5,6 +5,7 @@ defmodule Explorer.Chain.ContractMethod do
 
   require Logger
 
+  import Ecto.Query, only: [from: 2]
   use Explorer.Schema
 
   alias Explorer.Chain.{Hash, MethodIdentifier, SmartContract}
@@ -69,6 +70,18 @@ defmodule Explorer.Chain.ContractMethod do
     end
   end
 
+  @doc """
+  Finds limited number of contract methods by selector id
+  """
+  @spec find_contract_method_query(binary(), integer()) :: Ecto.Query.t()
+  def find_contract_method_query(method_id, limit) do
+    from(
+      contract_method in __MODULE__,
+      where: contract_method.identifier == ^method_id,
+      limit: ^limit
+    )
+  end
+
   defp abi_element_to_contract_method(element) do
     case ABI.parse_specification([element], include_events?: true) do
       [selector] ->
diff --git a/apps/explorer/lib/explorer/chain/log.ex b/apps/explorer/lib/explorer/chain/log.ex
index 3b04958fdcb7..36a4a670ae51 100644
--- a/apps/explorer/lib/explorer/chain/log.ex
+++ b/apps/explorer/lib/explorer/chain/log.ex
@@ -7,7 +7,7 @@ defmodule Explorer.Chain.Log do
 
   alias ABI.{Event, FunctionSelector}
   alias Explorer.Chain
-  alias Explorer.Chain.{Address, Block, ContractMethod, Data, Hash, Transaction}
+  alias Explorer.Chain.{Address, Block, ContractMethod, Data, Hash, Log, Transaction}
   alias Explorer.Chain.SmartContract.Proxy
   alias Explorer.SmartContract.SigProviderInterface
 
@@ -121,34 +121,55 @@ defmodule Explorer.Chain.Log do
   @doc """
   Decode transaction log data.
   """
-
+  @spec decode(Log.t(), Transaction.t(), any(), boolean, map(), map()) ::
+          {{:ok, String.t(), String.t(), map()}
+           | {:error, atom()}
+           | {:error, atom(), list()}
+           | {{:error, :contract_not_verified, list()}, any()}, map()}
   def decode(log, transaction, options, skip_sig_provider?, contracts_acc \\ %{}, events_acc \\ %{}) do
-    case check_cache(contracts_acc, log.address_hash, options) do
-      {nil, contracts_acc} ->
-        {result, events_acc} = find_candidates(log, transaction, options, events_acc)
-        {result, contracts_acc, events_acc}
-
-      {full_abi, contracts_acc} ->
-        with {:ok, selector, mapping} <- find_and_decode(full_abi, log, transaction),
-             identifier <- Base.encode16(selector.method_id, case: :lower),
-             text <- function_call(selector.function, mapping) do
-          {{:ok, identifier, text, mapping}, contracts_acc, events_acc}
-        else
-          {:error, :could_not_decode} ->
-            case find_candidates(log, transaction, options, events_acc) do
-              {{:error, :contract_not_verified, []}, events_acc} ->
-                {decode_event_via_sig_provider(log, transaction, false, skip_sig_provider?), contracts_acc, events_acc}
+    with full_abi <- check_cache(contracts_acc, log.address_hash, options),
+         {:no_abi, false} <- {:no_abi, is_nil(full_abi)},
+         {:ok, selector, mapping} <- find_and_decode(full_abi, log, transaction.hash),
+         identifier <- Base.encode16(selector.method_id, case: :lower),
+         text <- function_call(selector.function, mapping) do
+      {{:ok, identifier, text, mapping}, events_acc}
+    else
+      {:error, _} = error ->
+        handle_method_decode_error(error, log, transaction, options, skip_sig_provider?, events_acc)
+
+      {:no_abi, true} ->
+        handle_method_decode_error(
+          {:error, :could_not_decode},
+          log,
+          transaction,
+          options,
+          skip_sig_provider?,
+          events_acc
+        )
+    end
+  end
 
-              {{:error, :contract_not_verified, candidates}, events_acc} ->
-                {{:error, :contract_verified, candidates}, contracts_acc, events_acc}
+  defp handle_method_decode_error(error, log, transaction, options, skip_sig_provider?, events_acc) do
+    case error do
+      {:error, :could_not_decode} ->
+        case find_method_candidates(log, transaction, options, events_acc) do
+          {{:error, :contract_not_verified, []}, events_acc} ->
+            {decode_event_via_sig_provider(log, transaction, false, options, events_acc, skip_sig_provider?),
+             events_acc}
 
-              {_, events_acc} ->
-                {decode_event_via_sig_provider(log, transaction, false, skip_sig_provider?), contracts_acc, events_acc}
-            end
+          {{:error, :contract_not_verified, candidates}, events_acc} ->
+            {{:error, :contract_not_verified, candidates}, events_acc}
 
-          {:error, reason} ->
-            {{:error, reason}, contracts_acc, events_acc}
+          {_, events_acc} ->
+            {decode_event_via_sig_provider(log, transaction, false, options, events_acc, skip_sig_provider?),
+             events_acc}
         end
+
+      {:error, :no_matching_function} ->
+        {decode_event_via_sig_provider(log, transaction, false, options, events_acc, skip_sig_provider?), events_acc}
+
+      {:error, reason} ->
+        {{:error, reason}, events_acc}
     end
   end
 
@@ -162,49 +183,42 @@ defmodule Explorer.Chain.Log do
       |> Keyword.merge(options)
 
     if !is_nil(address_hash) && Map.has_key?(acc, address_hash) do
-      {acc[address_hash], acc}
+      acc[address_hash]
     else
       case Chain.find_contract_address(address_hash, address_options, false) do
         {:ok, %{smart_contract: smart_contract}} ->
-          full_abi = Proxy.combine_proxy_implementation_abi(smart_contract, options)
-          {full_abi, Map.put(acc, address_hash, full_abi)}
+          Proxy.combine_proxy_implementation_abi(smart_contract, options)
 
         _ ->
-          {nil, Map.put(acc, address_hash, nil)}
+          nil
       end
     end
   end
 
-  defp find_candidates(log, transaction, options, events_acc) do
-    case log.first_topic do
-      "0x" <> hex_part ->
-        case Integer.parse(hex_part, 16) do
-          {number, ""} ->
-            <<method_id::binary-size(4), _rest::binary>> = :binary.encode_unsigned(number)
-            check_events_cache(events_acc, method_id, log, transaction, options)
-
-          _ ->
-            {{:error, :could_not_decode}, events_acc}
-        end
+  defp find_method_candidates(log, transaction, options, events_acc) do
+    with "0x" <> hex_part <- log.first_topic,
+         {number, ""} <- Integer.parse(hex_part, 16) do
+      <<method_id::binary-size(4), _rest::binary>> = :binary.encode_unsigned(number)
 
-      _ ->
-        {{:error, :could_not_decode}, events_acc}
+      if Map.has_key?(events_acc, method_id) do
+        {events_acc[method_id], events_acc}
+      else
+        result = find_method_candidates_from_db(method_id, log, transaction, options, events_acc)
+        {result, Map.put(events_acc, method_id, result)}
+      end
+    else
+      _ -> {{:error, :could_not_decode}, events_acc}
     end
   end
 
-  defp find_candidates_query(method_id, log, transaction, options) do
-    candidates_query =
-      from(
-        contract_method in ContractMethod,
-        where: contract_method.identifier == ^method_id,
-        limit: 3
-      )
+  defp find_method_candidates_from_db(method_id, log, transaction, options, events_acc) do
+    candidates_query = ContractMethod.find_contract_method_query(method_id, 3)
 
     candidates =
       candidates_query
       |> Chain.select_repo(options).all()
       |> Enum.flat_map(fn contract_method ->
-        case find_and_decode([contract_method.abi], log, transaction) do
+        case find_and_decode([contract_method.abi], log, transaction.hash) do
           {:ok, selector, mapping} ->
             identifier = Base.encode16(selector.method_id, case: :lower)
             text = function_call(selector.function, mapping)
@@ -218,21 +232,15 @@ defmodule Explorer.Chain.Log do
       |> Enum.take(1)
 
     {:error, :contract_not_verified,
-     if(candidates == [], do: decode_event_via_sig_provider(log, transaction, true), else: candidates)}
-  end
-
-  defp check_events_cache(events_acc, method_id, log, transaction, options) do
-    if Map.has_key?(events_acc, method_id) do
-      {events_acc[method_id], events_acc}
-    else
-      result = find_candidates_query(method_id, log, transaction, options)
-      {result, Map.put(events_acc, method_id, result)}
-    end
+     if(candidates == [],
+       do: decode_event_via_sig_provider(log, transaction, true, options, events_acc),
+       else: candidates
+     )}
   end
 
-  @spec find_and_decode([map()], __MODULE__.t(), Transaction.t()) ::
+  @spec find_and_decode([map()], __MODULE__.t(), Hash.t()) ::
           {:error, any} | {:ok, ABI.FunctionSelector.t(), any}
-  def find_and_decode(abi, log, transaction) do
+  def find_and_decode(abi, log, transaction_hash) do
     with {%FunctionSelector{} = selector, mapping} <-
            abi
            |> ABI.parse_specification(include_events?: true)
@@ -249,8 +257,8 @@ defmodule Explorer.Chain.Log do
     e ->
       Logger.warn(fn ->
         [
-          "Could not decode input data for log from transaction: ",
-          Hash.to_iodata(transaction.hash),
+          "Could not decode input data for log from transaction hash: ",
+          Hash.to_iodata(transaction_hash),
           Exception.format(:error, e, __STACKTRACE__)
         ]
       end)
@@ -262,12 +270,7 @@ defmodule Explorer.Chain.Log do
     text =
       mapping
       |> Stream.map(fn {name, type, indexed?, _value} ->
-        indexed_keyword =
-          if indexed? do
-            ["indexed "]
-          else
-            []
-          end
+        indexed_keyword = if indexed?, do: ["indexed "], else: []
 
         [type, " ", indexed_keyword, name]
       end)
@@ -276,7 +279,14 @@ defmodule Explorer.Chain.Log do
     IO.iodata_to_binary([name, "(", text, ")"])
   end
 
-  defp decode_event_via_sig_provider(log, transaction, only_candidates?, skip_sig_provider? \\ false) do
+  defp decode_event_via_sig_provider(
+         log,
+         transaction,
+         only_candidates?,
+         options,
+         events_acc,
+         skip_sig_provider? \\ false
+       ) do
     with true <- SigProviderInterface.enabled?(),
          false <- skip_sig_provider?,
          {:ok, result} <-
@@ -292,7 +302,7 @@ defmodule Explorer.Chain.Log do
          true <- is_list(result),
          false <- Enum.empty?(result),
          abi <- [result |> List.first() |> Map.put("type", "event")],
-         {:ok, selector, mapping} <- find_and_decode(abi, log, transaction),
+         {:ok, selector, mapping} <- find_and_decode(abi, log, transaction.hash),
          identifier <- Base.encode16(selector.method_id, case: :lower),
          text <- function_call(selector.function, mapping) do
       if only_candidates? do
@@ -305,7 +315,16 @@ defmodule Explorer.Chain.Log do
         if only_candidates? do
           []
         else
-          {:error, :could_not_decode}
+          case find_method_candidates(log, transaction, options, events_acc) do
+            {{:error, :contract_not_verified, []}, _} ->
+              {:error, :could_not_decode}
+
+            {{:error, :contract_not_verified, candidates}, _} ->
+              {:error, :contract_not_verified, candidates}
+
+            {_, _} ->
+              {:error, :could_not_decode}
+          end
         end
     end
   end
diff --git a/apps/explorer/lib/explorer/chain/transaction.ex b/apps/explorer/lib/explorer/chain/transaction.ex
index 78ef9a202564..1f7e67790bdc 100644
--- a/apps/explorer/lib/explorer/chain/transaction.ex
+++ b/apps/explorer/lib/explorer/chain/transaction.ex
@@ -774,12 +774,7 @@ defmodule Explorer.Chain.Transaction do
     if Map.has_key?(methods_acc, method_id) do
       {methods_acc[method_id], methods_acc}
     else
-      candidates_query =
-        from(
-          contract_method in ContractMethod,
-          where: contract_method.identifier == ^method_id,
-          limit: 1
-        )
+      candidates_query = ContractMethod.find_contract_method_query(method_id, 1)
 
       result =
         candidates_query
@@ -1181,7 +1176,7 @@ defmodule Explorer.Chain.Transaction do
       Enum.map_reduce(transactions, %{}, fn transaction, tokens_acc ->
         case Log.fetch_log_by_tx_hash_and_first_topic(transaction.hash, @transaction_fee_event_signature, @api_true) do
           fee_log when not is_nil(fee_log) ->
-            {:ok, _selector, mapping} = Log.find_and_decode(@transaction_fee_event_abi, fee_log, transaction)
+            {:ok, _selector, mapping} = Log.find_and_decode(@transaction_fee_event_abi, fee_log, transaction.hash)
 
             [{"token", "address", false, token_address_hash}, _, _, _, _, _] = mapping
 
diff --git a/apps/explorer/test/explorer/chain/log_test.exs b/apps/explorer/test/explorer/chain/log_test.exs
index 6842a6b979fb..3454fe15c5e2 100644
--- a/apps/explorer/test/explorer/chain/log_test.exs
+++ b/apps/explorer/test/explorer/chain/log_test.exs
@@ -60,7 +60,7 @@ defmodule Explorer.Chain.LogTest do
 
       log = insert(:log, transaction: transaction)
 
-      assert {{:error, :could_not_decode}, _, _} = Log.decode(log, transaction, [], false)
+      assert {{:error, :could_not_decode}, _} = Log.decode(log, transaction, [], false)
     end
 
     test "that a contract call transaction that has a verified contract returns the decoded input data" do
@@ -116,7 +116,7 @@ defmodule Explorer.Chain.LogTest do
                      152, 206, 227, 92, 181, 213, 23, 242, 210, 150, 162>>}},
                  {"_number", "uint256", false, 0},
                  {"_belly", "bool", true, true}
-               ]}, _, _} = Log.decode(log, transaction, [], false)
+               ]}, _} = Log.decode(log, transaction, [], false)
     end
 
     test "finds decoding candidates" do
@@ -171,7 +171,7 @@ defmodule Explorer.Chain.LogTest do
                     {"_number", "uint256", false, 0},
                     {"_belly", "bool", true, true}
                   ]}
-               ]}, _, _} = Log.decode(log, transaction, [], false)
+               ]}, _} = Log.decode(log, transaction, [], false)
     end
   end
 

From 120dbf63d86a4b95446adc5fa782d989da8b6987 Mon Sep 17 00:00:00 2001
From: Viktor Baranov <baranov.viktor.27@gmail.com>
Date: Mon, 4 Dec 2023 20:32:29 +0300
Subject: [PATCH 738/909] Return accumulators in order to reduce contract calls

---
 .../lib/block_scout_web/views/address_view.ex | 10 ++++++-
 .../views/api/v2/transaction_view.ex          |  4 +--
 apps/explorer/lib/explorer/chain/log.ex       | 29 ++++++++++---------
 .../explorer/chain/smart_contract/proxy.ex    |  4 +++
 .../explorer/test/explorer/chain/log_test.exs |  6 ++--
 5 files changed, 34 insertions(+), 19 deletions(-)

diff --git a/apps/block_scout_web/lib/block_scout_web/views/address_view.ex b/apps/block_scout_web/lib/block_scout_web/views/address_view.ex
index b77ca5abbb3a..ed3f54040657 100644
--- a/apps/block_scout_web/lib/block_scout_web/views/address_view.ex
+++ b/apps/block_scout_web/lib/block_scout_web/views/address_view.ex
@@ -497,8 +497,16 @@ defmodule BlockScoutWeb.AddressView do
 
   def contract_interaction_disabled?, do: Application.get_env(:block_scout_web, :contract)[:disable_interaction]
 
+  @doc """
+    Decodes given log
+  """
+  @spec decode(Log.t(), Transaction.t()) ::
+          {:ok, String.t(), String.t(), map()}
+          | {:error, atom()}
+          | {:error, atom(), list()}
+          | {{:error, :contract_not_verified, list()}, any()}
   def decode(log, transaction) do
-    {result, _events_acc} = Log.decode(log, transaction, [], true)
+    {result, _contracts_acc, _events_acc} = Log.decode(log, transaction, [], true)
     result
   end
 end
diff --git a/apps/block_scout_web/lib/block_scout_web/views/api/v2/transaction_view.ex b/apps/block_scout_web/lib/block_scout_web/views/api/v2/transaction_view.ex
index aca45c2c9fa2..54d15112a789 100644
--- a/apps/block_scout_web/lib/block_scout_web/views/api/v2/transaction_view.ex
+++ b/apps/block_scout_web/lib/block_scout_web/views/api/v2/transaction_view.ex
@@ -184,10 +184,10 @@ defmodule BlockScoutWeb.API.V2.TransactionView do
     }
   end
 
-  def decode_logs(logs, skip_sig_provider?) do
+  defp decode_logs(logs, skip_sig_provider?) do
     {result, _, _} =
       Enum.reduce(logs, {[], %{}, %{}}, fn log, {results, contracts_acc, events_acc} ->
-        {result, events_acc} =
+        {result, contracts_acc, events_acc} =
           Log.decode(
             log,
             %Transaction{hash: log.transaction_hash},
diff --git a/apps/explorer/lib/explorer/chain/log.ex b/apps/explorer/lib/explorer/chain/log.ex
index 36a4a670ae51..1f4230850594 100644
--- a/apps/explorer/lib/explorer/chain/log.ex
+++ b/apps/explorer/lib/explorer/chain/log.ex
@@ -125,17 +125,17 @@ defmodule Explorer.Chain.Log do
           {{:ok, String.t(), String.t(), map()}
            | {:error, atom()}
            | {:error, atom(), list()}
-           | {{:error, :contract_not_verified, list()}, any()}, map()}
+           | {{:error, :contract_not_verified, list()}, any()}, map(), map()}
   def decode(log, transaction, options, skip_sig_provider?, contracts_acc \\ %{}, events_acc \\ %{}) do
-    with full_abi <- check_cache(contracts_acc, log.address_hash, options),
+    with {full_abi, contracts_acc} <- check_cache(contracts_acc, log.address_hash, options),
          {:no_abi, false} <- {:no_abi, is_nil(full_abi)},
          {:ok, selector, mapping} <- find_and_decode(full_abi, log, transaction.hash),
          identifier <- Base.encode16(selector.method_id, case: :lower),
          text <- function_call(selector.function, mapping) do
-      {{:ok, identifier, text, mapping}, events_acc}
+      {{:ok, identifier, text, mapping}, contracts_acc, events_acc}
     else
       {:error, _} = error ->
-        handle_method_decode_error(error, log, transaction, options, skip_sig_provider?, events_acc)
+        handle_method_decode_error(error, log, transaction, options, skip_sig_provider?, contracts_acc, events_acc)
 
       {:no_abi, true} ->
         handle_method_decode_error(
@@ -144,32 +144,34 @@ defmodule Explorer.Chain.Log do
           transaction,
           options,
           skip_sig_provider?,
+          contracts_acc,
           events_acc
         )
     end
   end
 
-  defp handle_method_decode_error(error, log, transaction, options, skip_sig_provider?, events_acc) do
+  defp handle_method_decode_error(error, log, transaction, options, skip_sig_provider?, contracts_acc, events_acc) do
     case error do
       {:error, :could_not_decode} ->
         case find_method_candidates(log, transaction, options, events_acc) do
           {{:error, :contract_not_verified, []}, events_acc} ->
             {decode_event_via_sig_provider(log, transaction, false, options, events_acc, skip_sig_provider?),
-             events_acc}
+             contracts_acc, events_acc}
 
           {{:error, :contract_not_verified, candidates}, events_acc} ->
-            {{:error, :contract_not_verified, candidates}, events_acc}
+            {{:error, :contract_not_verified, candidates}, contracts_acc, events_acc}
 
           {_, events_acc} ->
             {decode_event_via_sig_provider(log, transaction, false, options, events_acc, skip_sig_provider?),
-             events_acc}
+             contracts_acc, events_acc}
         end
 
       {:error, :no_matching_function} ->
-        {decode_event_via_sig_provider(log, transaction, false, options, events_acc, skip_sig_provider?), events_acc}
+        {decode_event_via_sig_provider(log, transaction, false, options, events_acc, skip_sig_provider?), contracts_acc,
+         events_acc}
 
       {:error, reason} ->
-        {{:error, reason}, events_acc}
+        {{:error, reason}, contracts_acc, events_acc}
     end
   end
 
@@ -183,14 +185,15 @@ defmodule Explorer.Chain.Log do
       |> Keyword.merge(options)
 
     if !is_nil(address_hash) && Map.has_key?(acc, address_hash) do
-      acc[address_hash]
+      {acc[address_hash], acc}
     else
       case Chain.find_contract_address(address_hash, address_options, false) do
         {:ok, %{smart_contract: smart_contract}} ->
-          Proxy.combine_proxy_implementation_abi(smart_contract, options)
+          full_abi = Proxy.combine_proxy_implementation_abi(smart_contract, options)
+          {full_abi, Map.put(acc, address_hash, full_abi)}
 
         _ ->
-          nil
+          {nil, Map.put(acc, address_hash, nil)}
       end
     end
   end
diff --git a/apps/explorer/lib/explorer/chain/smart_contract/proxy.ex b/apps/explorer/lib/explorer/chain/smart_contract/proxy.ex
index a5c9ce5a4e09..cbd6dd4ee55f 100644
--- a/apps/explorer/lib/explorer/chain/smart_contract/proxy.ex
+++ b/apps/explorer/lib/explorer/chain/smart_contract/proxy.ex
@@ -267,6 +267,10 @@ defmodule Explorer.Chain.SmartContract.Proxy do
     end)
   end
 
+  @doc """
+  Returns combined ABI from proxy and implementation smart-contracts
+  """
+  @spec combine_proxy_implementation_abi(any(), any()) :: SmartContract.abi()
   def combine_proxy_implementation_abi(smart_contract, options \\ [])
 
   def combine_proxy_implementation_abi(%SmartContract{abi: abi} = smart_contract, options) when not is_nil(abi) do
diff --git a/apps/explorer/test/explorer/chain/log_test.exs b/apps/explorer/test/explorer/chain/log_test.exs
index 3454fe15c5e2..6842a6b979fb 100644
--- a/apps/explorer/test/explorer/chain/log_test.exs
+++ b/apps/explorer/test/explorer/chain/log_test.exs
@@ -60,7 +60,7 @@ defmodule Explorer.Chain.LogTest do
 
       log = insert(:log, transaction: transaction)
 
-      assert {{:error, :could_not_decode}, _} = Log.decode(log, transaction, [], false)
+      assert {{:error, :could_not_decode}, _, _} = Log.decode(log, transaction, [], false)
     end
 
     test "that a contract call transaction that has a verified contract returns the decoded input data" do
@@ -116,7 +116,7 @@ defmodule Explorer.Chain.LogTest do
                      152, 206, 227, 92, 181, 213, 23, 242, 210, 150, 162>>}},
                  {"_number", "uint256", false, 0},
                  {"_belly", "bool", true, true}
-               ]}, _} = Log.decode(log, transaction, [], false)
+               ]}, _, _} = Log.decode(log, transaction, [], false)
     end
 
     test "finds decoding candidates" do
@@ -171,7 +171,7 @@ defmodule Explorer.Chain.LogTest do
                     {"_number", "uint256", false, 0},
                     {"_belly", "bool", true, true}
                   ]}
-               ]}, _} = Log.decode(log, transaction, [], false)
+               ]}, _, _} = Log.decode(log, transaction, [], false)
     end
   end
 

From 16307adbe57db76ad7050e8fe650c402370f23d8 Mon Sep 17 00:00:00 2001
From: Viktor Baranov <baranov.viktor.27@gmail.com>
Date: Tue, 5 Dec 2023 19:03:01 +0300
Subject: [PATCH 739/909] Exclude sig provider from fallback method decoding
 using db

---
 apps/explorer/lib/explorer/chain/log.ex | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/apps/explorer/lib/explorer/chain/log.ex b/apps/explorer/lib/explorer/chain/log.ex
index 1f4230850594..9f1458c93d6f 100644
--- a/apps/explorer/lib/explorer/chain/log.ex
+++ b/apps/explorer/lib/explorer/chain/log.ex
@@ -198,7 +198,7 @@ defmodule Explorer.Chain.Log do
     end
   end
 
-  defp find_method_candidates(log, transaction, options, events_acc) do
+  defp find_method_candidates(log, transaction, options, events_acc, skip_sig_provider \\ false) do
     with "0x" <> hex_part <- log.first_topic,
          {number, ""} <- Integer.parse(hex_part, 16) do
       <<method_id::binary-size(4), _rest::binary>> = :binary.encode_unsigned(number)
@@ -206,7 +206,7 @@ defmodule Explorer.Chain.Log do
       if Map.has_key?(events_acc, method_id) do
         {events_acc[method_id], events_acc}
       else
-        result = find_method_candidates_from_db(method_id, log, transaction, options, events_acc)
+        result = find_method_candidates_from_db(method_id, log, transaction, options, events_acc, skip_sig_provider)
         {result, Map.put(events_acc, method_id, result)}
       end
     else
@@ -214,7 +214,7 @@ defmodule Explorer.Chain.Log do
     end
   end
 
-  defp find_method_candidates_from_db(method_id, log, transaction, options, events_acc) do
+  defp find_method_candidates_from_db(method_id, log, transaction, options, events_acc, skip_sig_provider \\ false) do
     candidates_query = ContractMethod.find_contract_method_query(method_id, 3)
 
     candidates =
@@ -236,7 +236,11 @@ defmodule Explorer.Chain.Log do
 
     {:error, :contract_not_verified,
      if(candidates == [],
-       do: decode_event_via_sig_provider(log, transaction, true, options, events_acc),
+       do:
+         if(skip_sig_provider,
+           do: [],
+           else: decode_event_via_sig_provider(log, transaction, true, options, events_acc)
+         ),
        else: candidates
      )}
   end
@@ -318,7 +322,9 @@ defmodule Explorer.Chain.Log do
         if only_candidates? do
           []
         else
-          case find_method_candidates(log, transaction, options, events_acc) do
+          skip_sig_provider = true
+
+          case find_method_candidates(log, transaction, options, events_acc, skip_sig_provider) do
             {{:error, :contract_not_verified, []}, _} ->
               {:error, :could_not_decode}
 

From 7727d93d64396f4c83a69dd28a91b7ec231e5303 Mon Sep 17 00:00:00 2001
From: Viktor Baranov <baranov.viktor.27@gmail.com>
Date: Tue, 5 Dec 2023 19:08:05 +0300
Subject: [PATCH 740/909] Finally resolve decoding issue in right way

---
 .dialyzer-ignore                              |  4 +-
 .../templates/address_logs/_logs.html.eex     | 75 +++++++++----------
 .../views/api/v2/transaction_view.ex          |  1 -
 apps/block_scout_web/priv/gettext/default.pot |  4 +-
 .../priv/gettext/en/LC_MESSAGES/default.po    |  4 +-
 apps/explorer/lib/explorer/chain/log.ex       | 42 +++--------
 6 files changed, 52 insertions(+), 78 deletions(-)

diff --git a/.dialyzer-ignore b/.dialyzer-ignore
index 44a7f6862aba..8a8ea811eb21 100644
--- a/.dialyzer-ignore
+++ b/.dialyzer-ignore
@@ -26,5 +26,5 @@ lib/indexer/fetcher/zkevm/transaction_batch.ex:252
 lib/block_scout_web/views/api/v2/transaction_view.ex:431
 lib/block_scout_web/views/api/v2/transaction_view.ex:472
 lib/explorer/chain/transaction.ex:167
-lib/explorer/chain/transaction.ex:1457
-lib/explorer/chain/transaction.ex:1458
+lib/explorer/chain/transaction.ex:1452
+lib/explorer/chain/transaction.ex:1453
diff --git a/apps/block_scout_web/lib/block_scout_web/templates/address_logs/_logs.html.eex b/apps/block_scout_web/lib/block_scout_web/templates/address_logs/_logs.html.eex
index eaa5765bc29b..9e213f9457f0 100644
--- a/apps/block_scout_web/lib/block_scout_web/templates/address_logs/_logs.html.eex
+++ b/apps/block_scout_web/lib/block_scout_web/templates/address_logs/_logs.html.eex
@@ -27,46 +27,43 @@
             ) %>
       </h3>
     </dd>
-      <%= case decoded_result do %>
-        <% {:error, :could_not_decode} -> %>
-          <dt class="col-md-2"><%= gettext "Decoded" %></dt>
-          <dd class="col-md-10">
-          <div class="alert alert-danger">
-            <%= gettext "Failed to decode log data." %>
-          </div>
-        <% {:ok, method_id, text, mapping} -> %>
-          <dt class="col-md-2"><%= gettext "Decoded" %></dt>
-          <dd class="col-md-10">
-          <table summary="Transaction Info" class="table thead-light table-bordered transaction-input-table">
-            <tr>
-              <td>Method Id</td>
-              <td colspan="3"><code>0x<%= method_id %></code></td>
-            </tr>
-            <tr>
-              <td>Call</td>
-              <td colspan="3"><code><%= text %></code></td>
-            </tr>
-          </table>
-          <%= render BlockScoutWeb.LogView, "_data_decoded_view.html", mapping: mapping %>
-        <% {:error, :contract_not_verified, results} -> %>
-           <%= for {:ok, method_id, text, mapping} <- results do %>
-             <dt class="col-md-2"><%= gettext "Decoded" %></dt>
-             <dd class="col-md-10">
-             <table summary="Transaction Info" class="table thead-light table-bordered transaction-input-table">
-               <tr>
-                 <td>Method Id</td>
-                 <td colspan="3"><code>0x<%= method_id %></code></td>
-               </tr>
-               <tr>
-                 <td>Call</td>
-                 <td colspan="3"><code><%= text %></code></td>
-               </tr>
-             </table>
-             <%= render BlockScoutWeb.LogView, "_data_decoded_view.html", mapping: mapping %>
-         </div>
+    <%= case decoded_result do %>
+      <% {:error, :could_not_decode} -> %>
+        <dt class="col-md-2"><%= gettext "Decoded" %></dt>
+        <dd class="col-md-10">
+        <div class="alert alert-danger">
+          <%= gettext "Failed to decode log data." %>
+        </div>
+      <% {:ok, method_id, text, mapping} -> %>
+        <dt class="col-md-2"><%= gettext "Decoded" %></dt>
+        <dd class="col-md-10">
+        <table summary="Transaction Info" class="table thead-light table-bordered transaction-input-table">
+          <tr>
+            <td>Method Id</td>
+            <td colspan="3"><code>0x<%= method_id %></code></td>
+          </tr>
+          <tr>
+            <td>Call</td>
+            <td colspan="3"><code><%= text %></code></td>
+          </tr>
+        </table>
+        <%= render BlockScoutWeb.LogView, "_data_decoded_view.html", mapping: mapping %>
+      <% {:error, :contract_not_verified, results} -> %>
+        <%= for {:ok, method_id, text, mapping} <- results do %>
+            <dt class="col-md-2"><%= gettext "Decoded" %></dt>
+            <dd class="col-md-10">
+            <table summary="Transaction Info" class="table thead-light table-bordered transaction-input-table">
+              <tr>
+                <td>Method Id</td>
+                <td colspan="3"><code>0x<%= method_id %></code></td>
+              </tr>
+              <tr>
+                <td>Call</td>
+                <td colspan="3"><code><%= text %></code></td>
+              </tr>
+            </table>
+            <%= render BlockScoutWeb.LogView, "_data_decoded_view.html", mapping: mapping %>
         <% end %>
-       <% _ -> %>
-          <%= nil %>
       <% end %>
     <dt class="col-md-2"><%= gettext "Topics" %></dt>
     <dd class="col-md-10">
diff --git a/apps/block_scout_web/lib/block_scout_web/views/api/v2/transaction_view.ex b/apps/block_scout_web/lib/block_scout_web/views/api/v2/transaction_view.ex
index 54d15112a789..aaec94b44027 100644
--- a/apps/block_scout_web/lib/block_scout_web/views/api/v2/transaction_view.ex
+++ b/apps/block_scout_web/lib/block_scout_web/views/api/v2/transaction_view.ex
@@ -648,7 +648,6 @@ defmodule BlockScoutWeb.API.V2.TransactionView do
   defp format_decoded_input(_), do: nil
 
   defp format_decoded_log_input({:error, :could_not_decode}), do: nil
-  defp format_decoded_log_input({:error, :no_matching_function}), do: nil
   defp format_decoded_log_input({:ok, _method_id, _text, _mapping} = decoded), do: decoded
   defp format_decoded_log_input({:error, _, candidates}), do: Enum.at(candidates, 0)
 
diff --git a/apps/block_scout_web/priv/gettext/default.pot b/apps/block_scout_web/priv/gettext/default.pot
index 7ef46448585b..c67d50ebf77a 100644
--- a/apps/block_scout_web/priv/gettext/default.pot
+++ b/apps/block_scout_web/priv/gettext/default.pot
@@ -1049,7 +1049,7 @@ msgstr ""
 msgid "Daily Transactions"
 msgstr ""
 
-#: lib/block_scout_web/templates/address_logs/_logs.html.eex:101
+#: lib/block_scout_web/templates/address_logs/_logs.html.eex:98
 #: lib/block_scout_web/templates/log/_data_decoded_view.html.eex:7
 #: lib/block_scout_web/templates/transaction/_decoded_input_body.html.eex:23
 #: lib/block_scout_web/templates/transaction_log/_logs.html.eex:121
@@ -2962,7 +2962,7 @@ msgstr ""
 msgid "Topic"
 msgstr ""
 
-#: lib/block_scout_web/templates/address_logs/_logs.html.eex:71
+#: lib/block_scout_web/templates/address_logs/_logs.html.eex:68
 #: lib/block_scout_web/templates/transaction_log/_logs.html.eex:91
 #, elixir-autogen, elixir-format
 msgid "Topics"
diff --git a/apps/block_scout_web/priv/gettext/en/LC_MESSAGES/default.po b/apps/block_scout_web/priv/gettext/en/LC_MESSAGES/default.po
index 2f650d468712..0797f9e126fd 100644
--- a/apps/block_scout_web/priv/gettext/en/LC_MESSAGES/default.po
+++ b/apps/block_scout_web/priv/gettext/en/LC_MESSAGES/default.po
@@ -1049,7 +1049,7 @@ msgstr ""
 msgid "Daily Transactions"
 msgstr ""
 
-#: lib/block_scout_web/templates/address_logs/_logs.html.eex:101
+#: lib/block_scout_web/templates/address_logs/_logs.html.eex:98
 #: lib/block_scout_web/templates/log/_data_decoded_view.html.eex:7
 #: lib/block_scout_web/templates/transaction/_decoded_input_body.html.eex:23
 #: lib/block_scout_web/templates/transaction_log/_logs.html.eex:121
@@ -2962,7 +2962,7 @@ msgstr ""
 msgid "Topic"
 msgstr ""
 
-#: lib/block_scout_web/templates/address_logs/_logs.html.eex:71
+#: lib/block_scout_web/templates/address_logs/_logs.html.eex:68
 #: lib/block_scout_web/templates/transaction_log/_logs.html.eex:91
 #, elixir-autogen, elixir-format
 msgid "Topics"
diff --git a/apps/explorer/lib/explorer/chain/log.ex b/apps/explorer/lib/explorer/chain/log.ex
index 9f1458c93d6f..2eb2c2ce9275 100644
--- a/apps/explorer/lib/explorer/chain/log.ex
+++ b/apps/explorer/lib/explorer/chain/log.ex
@@ -152,26 +152,17 @@ defmodule Explorer.Chain.Log do
 
   defp handle_method_decode_error(error, log, transaction, options, skip_sig_provider?, contracts_acc, events_acc) do
     case error do
-      {:error, :could_not_decode} ->
-        case find_method_candidates(log, transaction, options, events_acc) do
+      {:error, _reason} ->
+        case find_method_candidates(log, transaction, options, events_acc, skip_sig_provider?) do
           {{:error, :contract_not_verified, []}, events_acc} ->
-            {decode_event_via_sig_provider(log, transaction, false, options, events_acc, skip_sig_provider?),
-             contracts_acc, events_acc}
+            {decode_event_via_sig_provider(log, transaction, false, skip_sig_provider?), contracts_acc, events_acc}
 
           {{:error, :contract_not_verified, candidates}, events_acc} ->
             {{:error, :contract_not_verified, candidates}, contracts_acc, events_acc}
 
           {_, events_acc} ->
-            {decode_event_via_sig_provider(log, transaction, false, options, events_acc, skip_sig_provider?),
-             contracts_acc, events_acc}
+            {decode_event_via_sig_provider(log, transaction, false, skip_sig_provider?), contracts_acc, events_acc}
         end
-
-      {:error, :no_matching_function} ->
-        {decode_event_via_sig_provider(log, transaction, false, options, events_acc, skip_sig_provider?), contracts_acc,
-         events_acc}
-
-      {:error, reason} ->
-        {{:error, reason}, contracts_acc, events_acc}
     end
   end
 
@@ -198,7 +189,7 @@ defmodule Explorer.Chain.Log do
     end
   end
 
-  defp find_method_candidates(log, transaction, options, events_acc, skip_sig_provider \\ false) do
+  defp find_method_candidates(log, transaction, options, events_acc, skip_sig_provider?) do
     with "0x" <> hex_part <- log.first_topic,
          {number, ""} <- Integer.parse(hex_part, 16) do
       <<method_id::binary-size(4), _rest::binary>> = :binary.encode_unsigned(number)
@@ -206,7 +197,7 @@ defmodule Explorer.Chain.Log do
       if Map.has_key?(events_acc, method_id) do
         {events_acc[method_id], events_acc}
       else
-        result = find_method_candidates_from_db(method_id, log, transaction, options, events_acc, skip_sig_provider)
+        result = find_method_candidates_from_db(method_id, log, transaction, options, skip_sig_provider?)
         {result, Map.put(events_acc, method_id, result)}
       end
     else
@@ -214,7 +205,7 @@ defmodule Explorer.Chain.Log do
     end
   end
 
-  defp find_method_candidates_from_db(method_id, log, transaction, options, events_acc, skip_sig_provider \\ false) do
+  defp find_method_candidates_from_db(method_id, log, transaction, options, skip_sig_provider?) do
     candidates_query = ContractMethod.find_contract_method_query(method_id, 3)
 
     candidates =
@@ -237,9 +228,9 @@ defmodule Explorer.Chain.Log do
     {:error, :contract_not_verified,
      if(candidates == [],
        do:
-         if(skip_sig_provider,
+         if(skip_sig_provider?,
            do: [],
-           else: decode_event_via_sig_provider(log, transaction, true, options, events_acc)
+           else: decode_event_via_sig_provider(log, transaction, true)
          ),
        else: candidates
      )}
@@ -290,8 +281,6 @@ defmodule Explorer.Chain.Log do
          log,
          transaction,
          only_candidates?,
-         options,
-         events_acc,
          skip_sig_provider? \\ false
        ) do
     with true <- SigProviderInterface.enabled?(),
@@ -322,18 +311,7 @@ defmodule Explorer.Chain.Log do
         if only_candidates? do
           []
         else
-          skip_sig_provider = true
-
-          case find_method_candidates(log, transaction, options, events_acc, skip_sig_provider) do
-            {{:error, :contract_not_verified, []}, _} ->
-              {:error, :could_not_decode}
-
-            {{:error, :contract_not_verified, candidates}, _} ->
-              {:error, :contract_not_verified, candidates}
-
-            {_, _} ->
-              {:error, :could_not_decode}
-          end
+          {:error, :could_not_decode}
         end
     end
   end

From 1c7e19bd242baa23245d925f2f84be6d026cf020 Mon Sep 17 00:00:00 2001
From: Viktor Baranov <baranov.viktor.27@gmail.com>
Date: Wed, 6 Dec 2023 11:56:46 +0300
Subject: [PATCH 741/909] Blockscout v5.3.3

---
 .github/ISSUE_TEMPLATE/bug_report.yml         |  2 +-
 .github/workflows/prerelease-main.yml         |  2 +-
 .../publish-docker-image-every-push.yml       |  2 +-
 .../publish-docker-image-for-core.yml         |  2 +-
 .../publish-docker-image-for-eth-goerli.yml   |  2 +-
 .../publish-docker-image-for-eth-sepolia.yml  |  2 +-
 .../publish-docker-image-for-eth.yml          |  2 +-
 .../publish-docker-image-for-fuse.yml         |  2 +-
 .../publish-docker-image-for-immutable.yml    |  2 +-
 .../publish-docker-image-for-l2-staging.yml   |  2 +-
 .../publish-docker-image-for-lukso.yml        |  2 +-
 .../publish-docker-image-for-optimism.yml     |  2 +-
 .../publish-docker-image-for-polygon-edge.yml |  2 +-
 .../publish-docker-image-for-rsk.yml          |  2 +-
 .../publish-docker-image-for-stability.yml    |  2 +-
 .../publish-docker-image-for-suave.yml        |  2 +-
 .../publish-docker-image-for-xdai.yml         |  2 +-
 .../publish-docker-image-for-zkevm.yml        |  2 +-
 .../publish-docker-image-for-zksync.yml       |  2 +-
 ...publish-docker-image-staging-on-demand.yml |  2 +-
 .github/workflows/release-additional.yml      |  2 +-
 .github/workflows/release-main.yml            |  2 +-
 CHANGELOG.md                                  | 39 +++++++++++++++++++
 apps/block_scout_web/mix.exs                  |  2 +-
 apps/ethereum_jsonrpc/mix.exs                 |  2 +-
 .../helper.ex                                 |  2 +-
 apps/explorer/mix.exs                         |  2 +-
 apps/indexer/mix.exs                          |  2 +-
 docker-compose/docker-compose.yml             |  2 +-
 docker/Makefile                               |  2 +-
 mix.exs                                       |  2 +-
 rel/config.exs                                |  2 +-
 32 files changed, 70 insertions(+), 31 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
index 677dd9604aa1..00b3285f4567 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -65,7 +65,7 @@ body:
     attributes:
       label: Backend version
       description: The release version of the backend or branch/commit.
-      placeholder: v5.3.2
+      placeholder: v5.3.3
     validations:
       required: true
 
diff --git a/.github/workflows/prerelease-main.yml b/.github/workflows/prerelease-main.yml
index 57890b3ffb9b..e2fc82079bb7 100644
--- a/.github/workflows/prerelease-main.yml
+++ b/.github/workflows/prerelease-main.yml
@@ -16,7 +16,7 @@ jobs:
     name: Push Docker image to Docker Hub
     runs-on: ubuntu-latest
     env:
-      RELEASE_VERSION: 5.3.2
+      RELEASE_VERSION: 5.3.3
     steps:
       - name: Check out the repo
         uses: actions/checkout@v4
diff --git a/.github/workflows/publish-docker-image-every-push.yml b/.github/workflows/publish-docker-image-every-push.yml
index a5ebce6f57f6..bd66d1110256 100644
--- a/.github/workflows/publish-docker-image-every-push.yml
+++ b/.github/workflows/publish-docker-image-every-push.yml
@@ -11,7 +11,7 @@ on:
 env:
   OTP_VERSION: '25.2.1'
   ELIXIR_VERSION: '1.14.5'
-  RELEASE_VERSION: 5.3.2
+  RELEASE_VERSION: 5.3.3
 
 jobs:
   push_to_registry:
diff --git a/.github/workflows/publish-docker-image-for-core.yml b/.github/workflows/publish-docker-image-for-core.yml
index b90942317baf..184bed4b4a8e 100644
--- a/.github/workflows/publish-docker-image-for-core.yml
+++ b/.github/workflows/publish-docker-image-for-core.yml
@@ -15,7 +15,7 @@ jobs:
     name: Push Docker image to Docker Hub
     runs-on: ubuntu-latest
     env:
-      RELEASE_VERSION: 5.3.2
+      RELEASE_VERSION: 5.3.3
       DOCKER_CHAIN_NAME: poa
     steps:
       - name: Check out the repo
diff --git a/.github/workflows/publish-docker-image-for-eth-goerli.yml b/.github/workflows/publish-docker-image-for-eth-goerli.yml
index 28b51f91c9ed..174318b6c963 100644
--- a/.github/workflows/publish-docker-image-for-eth-goerli.yml
+++ b/.github/workflows/publish-docker-image-for-eth-goerli.yml
@@ -15,7 +15,7 @@ jobs:
     name: Push Docker image to Docker Hub
     runs-on: ubuntu-latest
     env:
-      RELEASE_VERSION: 5.3.2
+      RELEASE_VERSION: 5.3.3
       DOCKER_CHAIN_NAME: eth-goerli
     steps:
       - name: Check out the repo
diff --git a/.github/workflows/publish-docker-image-for-eth-sepolia.yml b/.github/workflows/publish-docker-image-for-eth-sepolia.yml
index 28bedb51ee75..d0d1a6281f04 100644
--- a/.github/workflows/publish-docker-image-for-eth-sepolia.yml
+++ b/.github/workflows/publish-docker-image-for-eth-sepolia.yml
@@ -15,7 +15,7 @@ jobs:
     name: Push Docker image to Docker Hub
     runs-on: ubuntu-latest
     env:
-      RELEASE_VERSION: 5.3.2
+      RELEASE_VERSION: 5.3.3
       DOCKER_CHAIN_NAME: eth-sepolia
     steps:
       - name: Check out the repo
diff --git a/.github/workflows/publish-docker-image-for-eth.yml b/.github/workflows/publish-docker-image-for-eth.yml
index bfd8ae15198d..af99aa32d184 100644
--- a/.github/workflows/publish-docker-image-for-eth.yml
+++ b/.github/workflows/publish-docker-image-for-eth.yml
@@ -15,7 +15,7 @@ jobs:
     name: Push Docker image to Docker Hub
     runs-on: ubuntu-latest
     env:
-      RELEASE_VERSION: 5.3.2
+      RELEASE_VERSION: 5.3.3
       DOCKER_CHAIN_NAME: mainnet
     steps:
       - name: Check out the repo
diff --git a/.github/workflows/publish-docker-image-for-fuse.yml b/.github/workflows/publish-docker-image-for-fuse.yml
index b0d1eb68ff1e..4b0221b8e685 100644
--- a/.github/workflows/publish-docker-image-for-fuse.yml
+++ b/.github/workflows/publish-docker-image-for-fuse.yml
@@ -15,7 +15,7 @@ jobs:
     name: Push Docker image to Docker Hub
     runs-on: ubuntu-latest
     env:
-      RELEASE_VERSION: 5.3.2
+      RELEASE_VERSION: 5.3.3
       DOCKER_CHAIN_NAME: fuse
     steps:
       - name: Check out the repo
diff --git a/.github/workflows/publish-docker-image-for-immutable.yml b/.github/workflows/publish-docker-image-for-immutable.yml
index d86f7025cbc8..6dd6dccde603 100644
--- a/.github/workflows/publish-docker-image-for-immutable.yml
+++ b/.github/workflows/publish-docker-image-for-immutable.yml
@@ -15,7 +15,7 @@ jobs:
     name: Push Docker image to Docker Hub
     runs-on: ubuntu-latest
     env:
-      RELEASE_VERSION: 5.3.2
+      RELEASE_VERSION: 5.3.3
       DOCKER_CHAIN_NAME: immutable
     steps:
       - name: Check out the repo
diff --git a/.github/workflows/publish-docker-image-for-l2-staging.yml b/.github/workflows/publish-docker-image-for-l2-staging.yml
index a6227eaee50a..744d4f4694c3 100644
--- a/.github/workflows/publish-docker-image-for-l2-staging.yml
+++ b/.github/workflows/publish-docker-image-for-l2-staging.yml
@@ -15,7 +15,7 @@ jobs:
     name: Push Docker image to Docker Hub
     runs-on: ubuntu-latest
     env:
-      RELEASE_VERSION: 5.3.2
+      RELEASE_VERSION: 5.3.3
       DOCKER_CHAIN_NAME: optimism-l2-advanced
     steps:
       - name: Check out the repo
diff --git a/.github/workflows/publish-docker-image-for-lukso.yml b/.github/workflows/publish-docker-image-for-lukso.yml
index f294165468c7..53f2f88e258f 100644
--- a/.github/workflows/publish-docker-image-for-lukso.yml
+++ b/.github/workflows/publish-docker-image-for-lukso.yml
@@ -15,7 +15,7 @@ jobs:
     name: Push Docker image to Docker Hub
     runs-on: ubuntu-latest
     env:
-      RELEASE_VERSION: 5.3.2
+      RELEASE_VERSION: 5.3.3
       DOCKER_CHAIN_NAME: lukso
     steps:
       - name: Check out the repo
diff --git a/.github/workflows/publish-docker-image-for-optimism.yml b/.github/workflows/publish-docker-image-for-optimism.yml
index c164e1b7d8eb..f1371cc268c3 100644
--- a/.github/workflows/publish-docker-image-for-optimism.yml
+++ b/.github/workflows/publish-docker-image-for-optimism.yml
@@ -15,7 +15,7 @@ jobs:
     name: Push Docker image to Docker Hub
     runs-on: ubuntu-latest
     env:
-      RELEASE_VERSION: 5.3.2
+      RELEASE_VERSION: 5.3.3
       DOCKER_CHAIN_NAME: optimism
     steps:
       - name: Check out the repo
diff --git a/.github/workflows/publish-docker-image-for-polygon-edge.yml b/.github/workflows/publish-docker-image-for-polygon-edge.yml
index 3b3f7604ca6e..ccd20ef78d10 100644
--- a/.github/workflows/publish-docker-image-for-polygon-edge.yml
+++ b/.github/workflows/publish-docker-image-for-polygon-edge.yml
@@ -15,7 +15,7 @@ jobs:
     name: Push Docker image to Docker Hub
     runs-on: ubuntu-latest
     env:
-      RELEASE_VERSION: 5.3.2
+      RELEASE_VERSION: 5.3.3
       DOCKER_CHAIN_NAME: polygon-edge
     steps:
       - name: Check out the repo
diff --git a/.github/workflows/publish-docker-image-for-rsk.yml b/.github/workflows/publish-docker-image-for-rsk.yml
index d47134f2ae40..d482fed9e90c 100644
--- a/.github/workflows/publish-docker-image-for-rsk.yml
+++ b/.github/workflows/publish-docker-image-for-rsk.yml
@@ -15,7 +15,7 @@ jobs:
     name: Push Docker image to Docker Hub
     runs-on: ubuntu-latest
     env:
-      RELEASE_VERSION: 5.3.2
+      RELEASE_VERSION: 5.3.3
       DOCKER_CHAIN_NAME: rsk
     steps:
       - name: Check out the repo
diff --git a/.github/workflows/publish-docker-image-for-stability.yml b/.github/workflows/publish-docker-image-for-stability.yml
index 089e5924e3d4..218b8fa3e067 100644
--- a/.github/workflows/publish-docker-image-for-stability.yml
+++ b/.github/workflows/publish-docker-image-for-stability.yml
@@ -18,7 +18,7 @@ jobs:
     name: Push Docker image to Docker Hub
     runs-on: ubuntu-latest
     env:
-      RELEASE_VERSION: 5.3.2
+      RELEASE_VERSION: 5.3.3
       DOCKER_CHAIN_NAME: stability
     steps:
       - name: Check out the repo
diff --git a/.github/workflows/publish-docker-image-for-suave.yml b/.github/workflows/publish-docker-image-for-suave.yml
index b91bb91e546f..85836106b629 100644
--- a/.github/workflows/publish-docker-image-for-suave.yml
+++ b/.github/workflows/publish-docker-image-for-suave.yml
@@ -18,7 +18,7 @@ jobs:
     name: Push Docker image to Docker Hub
     runs-on: ubuntu-latest
     env:
-      RELEASE_VERSION: 5.3.2
+      RELEASE_VERSION: 5.3.3
       DOCKER_CHAIN_NAME: suave
     steps:
       - name: Check out the repo
diff --git a/.github/workflows/publish-docker-image-for-xdai.yml b/.github/workflows/publish-docker-image-for-xdai.yml
index 947a675c57fe..7a69fd7e9f21 100644
--- a/.github/workflows/publish-docker-image-for-xdai.yml
+++ b/.github/workflows/publish-docker-image-for-xdai.yml
@@ -15,7 +15,7 @@ jobs:
     name: Push Docker image to Docker Hub
     runs-on: ubuntu-latest
     env:
-      RELEASE_VERSION: 5.3.2
+      RELEASE_VERSION: 5.3.3
       DOCKER_CHAIN_NAME: xdai
     steps:
       - name: Check out the repo
diff --git a/.github/workflows/publish-docker-image-for-zkevm.yml b/.github/workflows/publish-docker-image-for-zkevm.yml
index 32a17480e8e5..9fed1cc04083 100644
--- a/.github/workflows/publish-docker-image-for-zkevm.yml
+++ b/.github/workflows/publish-docker-image-for-zkevm.yml
@@ -15,7 +15,7 @@ jobs:
     name: Push Docker image to Docker Hub
     runs-on: ubuntu-latest
     env:
-      RELEASE_VERSION: 5.3.2
+      RELEASE_VERSION: 5.3.3
       DOCKER_CHAIN_NAME: zkevm
     steps:
       - name: Check out the repo
diff --git a/.github/workflows/publish-docker-image-for-zksync.yml b/.github/workflows/publish-docker-image-for-zksync.yml
index 8d02b444c17a..1688bb4f761e 100644
--- a/.github/workflows/publish-docker-image-for-zksync.yml
+++ b/.github/workflows/publish-docker-image-for-zksync.yml
@@ -15,7 +15,7 @@ jobs:
     name: Push Docker image to Docker Hub
     runs-on: ubuntu-latest
     env:
-      RELEASE_VERSION: 5.3.2
+      RELEASE_VERSION: 5.3.3
       DOCKER_CHAIN_NAME: zksync
     steps:
       - name: Check out the repo
diff --git a/.github/workflows/publish-docker-image-staging-on-demand.yml b/.github/workflows/publish-docker-image-staging-on-demand.yml
index ad6b96a3240b..246a4876362a 100644
--- a/.github/workflows/publish-docker-image-staging-on-demand.yml
+++ b/.github/workflows/publish-docker-image-staging-on-demand.yml
@@ -12,7 +12,7 @@ on:
 env:
   OTP_VERSION: '25.2.1'
   ELIXIR_VERSION: '1.14.5'
-  RELEASE_VERSION: 5.3.2
+  RELEASE_VERSION: 5.3.3
 
 jobs:
   push_to_registry:
diff --git a/.github/workflows/release-additional.yml b/.github/workflows/release-additional.yml
index 72c287e93730..892a6b6ead38 100644
--- a/.github/workflows/release-additional.yml
+++ b/.github/workflows/release-additional.yml
@@ -18,7 +18,7 @@ jobs:
     name: Push Docker image to Docker Hub
     runs-on: ubuntu-latest
     env:
-      RELEASE_VERSION: 5.3.2
+      RELEASE_VERSION: 5.3.3
     steps:
       - name: Check out the repo
         uses: actions/checkout@v4
diff --git a/.github/workflows/release-main.yml b/.github/workflows/release-main.yml
index 60c840a7f70b..d8808170ab9e 100644
--- a/.github/workflows/release-main.yml
+++ b/.github/workflows/release-main.yml
@@ -18,7 +18,7 @@ jobs:
     name: Push Docker image to Docker Hub
     runs-on: ubuntu-latest
     env:
-      RELEASE_VERSION: 5.3.2
+      RELEASE_VERSION: 5.3.3
     steps:
       - name: Check out the repo
         uses: actions/checkout@v4
diff --git a/CHANGELOG.md b/CHANGELOG.md
index cbc0ae33d974..87dce1db56cc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,18 @@
 
 ### Features
 
+### Fixes
+
+### Chore
+
+<details>
+  <summary>Dependencies version bumps</summary>
+</details>
+
+## 5.3.3-beta
+
+### Features
+
 - [#8908](https://github.com/blockscout/blockscout/pull/8908) - Solidityscan report API endpoint
 - [#8900](https://github.com/blockscout/blockscout/pull/8900) - Add Compound proxy contract pattern
 - [#8611](https://github.com/blockscout/blockscout/pull/8611) - Implement sorting of smart contracts, address transactions
@@ -23,6 +35,33 @@
 
 - [#8911](https://github.com/blockscout/blockscout/pull/8911) - Set client_connection_check_interval for main Postgres DB in docker-compose setup
 
+<details>
+  <summary>Dependencies version bumps</summary>
+
+- [#8863](https://github.com/blockscout/blockscout/pull/8863) - Bump core-js from 3.33.2 to 3.33.3 in /apps/block_scout_web/assets
+- [#8864](https://github.com/blockscout/blockscout/pull/8864) - Bump @amplitude/analytics-browser from 2.3.3 to 2.3.5 in /apps/block_scout_web/assets
+- [#8860](https://github.com/blockscout/blockscout/pull/8860) - Bump ecto_sql from 3.10.2 to 3.11.0
+- [#8896](https://github.com/blockscout/blockscout/pull/8896) - Bump httpoison from 2.2.0 to 2.2.1
+- [#8867](https://github.com/blockscout/blockscout/pull/8867) - Bump mixpanel-browser from 2.47.0 to 2.48.1 in /apps/block_scout_web/assets
+- [#8865](https://github.com/blockscout/blockscout/pull/8865) - Bump eslint from 8.53.0 to 8.54.0 in /apps/block_scout_web/assets
+- [#8866](https://github.com/blockscout/blockscout/pull/8866) - Bump sweetalert2 from 11.9.0 to 11.10.1 in /apps/block_scout_web/assets
+- [#8897](https://github.com/blockscout/blockscout/pull/8897) - Bump prometheus from 4.10.0 to 4.11.0
+- [#8859](https://github.com/blockscout/blockscout/pull/8859) - Bump absinthe from 1.7.5 to 1.7.6
+- [#8858](https://github.com/blockscout/blockscout/pull/8858) - Bump ex_json_schema from 0.10.1 to 0.10.2
+- [#8943](https://github.com/blockscout/blockscout/pull/8943) - Bump postgrex from 0.17.3 to 0.17.4
+- [#8939](https://github.com/blockscout/blockscout/pull/8939) - Bump @babel/core from 7.23.3 to 7.23.5 in /apps/block_scout_web/assets
+- [#8936](https://github.com/blockscout/blockscout/pull/8936) - Bump eslint from 8.54.0 to 8.55.0 in /apps/block_scout_web/assets
+- [#8940](https://github.com/blockscout/blockscout/pull/8940) - Bump photoswipe from 5.4.2 to 5.4.3 in /apps/block_scout_web/assets
+- [#8938](https://github.com/blockscout/blockscout/pull/8938) - Bump @babel/preset-env from 7.23.3 to 7.23.5 in /apps/block_scout_web/assets
+- [#8935](https://github.com/blockscout/blockscout/pull/8935) - Bump @amplitude/analytics-browser from 2.3.5 to 2.3.6 in /apps/block_scout_web/assets
+- [#8941](https://github.com/blockscout/blockscout/pull/8941) - Bump ueberauth from 0.10.5 to 0.10.6
+- [#8937](https://github.com/blockscout/blockscout/pull/8937) - Bump redux from 4.2.1 to 5.0.0 in /apps/block_scout_web/assets
+- [#8942](https://github.com/blockscout/blockscout/pull/8942) - Bump gettext from 0.23.1 to 0.24.0
+- [#8934](https://github.com/blockscout/blockscout/pull/8934) - Bump @fortawesome/fontawesome-free from 6.4.2 to 6.5.1 in /apps/block_scout_web/assets
+- [#8933](https://github.com/blockscout/blockscout/pull/8933) - Bump postcss from 8.4.31 to 8.4.32 in /apps/block_scout_web/assets
+
+</details>
+
 ## 5.3.2-beta
 
 ### Features
diff --git a/apps/block_scout_web/mix.exs b/apps/block_scout_web/mix.exs
index 2270ffaabdbb..18dd4fa02057 100644
--- a/apps/block_scout_web/mix.exs
+++ b/apps/block_scout_web/mix.exs
@@ -23,7 +23,7 @@ defmodule BlockScoutWeb.Mixfile do
         dialyzer: :test
       ],
       start_permanent: Mix.env() == :prod,
-      version: "5.3.2",
+      version: "5.3.3",
       xref: [exclude: [Explorer.Chain.Zkevm.Reader]]
     ]
   end
diff --git a/apps/ethereum_jsonrpc/mix.exs b/apps/ethereum_jsonrpc/mix.exs
index 608b2bb28b38..9445c500133a 100644
--- a/apps/ethereum_jsonrpc/mix.exs
+++ b/apps/ethereum_jsonrpc/mix.exs
@@ -23,7 +23,7 @@ defmodule EthereumJsonrpc.MixProject do
         dialyzer: :test
       ],
       start_permanent: Mix.env() == :prod,
-      version: "5.3.2"
+      version: "5.3.3"
     ]
   end
 
diff --git a/apps/explorer/lib/explorer/token_instance_owner_address_migration/helper.ex b/apps/explorer/lib/explorer/token_instance_owner_address_migration/helper.ex
index 7b0a092245f0..66beb03dd4ea 100644
--- a/apps/explorer/lib/explorer/token_instance_owner_address_migration/helper.ex
+++ b/apps/explorer/lib/explorer/token_instance_owner_address_migration/helper.ex
@@ -52,7 +52,7 @@ defmodule Explorer.TokenInstanceOwnerAddressMigration.Helper do
           )
 
         token_transfer =
-          Repo.one(token_transfer_query) ||
+          Repo.one(token_transfer_query, timeout: :timer.minutes(1)) ||
             %{to_address_hash: @burn_address_hash, block_number: -1, log_index: -1}
 
         %{
diff --git a/apps/explorer/mix.exs b/apps/explorer/mix.exs
index fd91cf515e59..492b774aabcc 100644
--- a/apps/explorer/mix.exs
+++ b/apps/explorer/mix.exs
@@ -24,7 +24,7 @@ defmodule Explorer.Mixfile do
         dialyzer: :test
       ],
       start_permanent: Mix.env() == :prod,
-      version: "5.3.2",
+      version: "5.3.3",
       xref: [exclude: [BlockScoutWeb.WebRouter.Helpers]]
     ]
   end
diff --git a/apps/indexer/mix.exs b/apps/indexer/mix.exs
index e3454f3318eb..fcb2d9513961 100644
--- a/apps/indexer/mix.exs
+++ b/apps/indexer/mix.exs
@@ -14,7 +14,7 @@ defmodule Indexer.MixProject do
       elixirc_paths: elixirc_paths(Mix.env()),
       lockfile: "../../mix.lock",
       start_permanent: Mix.env() == :prod,
-      version: "5.3.2"
+      version: "5.3.3"
     ]
   end
 
diff --git a/docker-compose/docker-compose.yml b/docker-compose/docker-compose.yml
index 0ce792f80ded..3198bf8998c4 100644
--- a/docker-compose/docker-compose.yml
+++ b/docker-compose/docker-compose.yml
@@ -34,7 +34,7 @@ services:
         CACHE_TOTAL_GAS_USAGE_COUNTER_ENABLED: ""
         CACHE_ADDRESS_WITH_BALANCES_UPDATE_INTERVAL: ""
         ADMIN_PANEL_ENABLED: ""
-        RELEASE_VERSION: 5.3.2
+        RELEASE_VERSION: 5.3.3
     links:
       - db:database
     environment:
diff --git a/docker/Makefile b/docker/Makefile
index e320e4c98356..231bcfe7aed0 100644
--- a/docker/Makefile
+++ b/docker/Makefile
@@ -10,7 +10,7 @@ STATS_CONTAINER_NAME := stats
 STATS_DB_CONTAINER_NAME := stats-postgres
 PROXY_CONTAINER_NAME := proxy
 PG_CONTAINER_NAME := postgres
-RELEASE_VERSION ?= '5.3.2'
+RELEASE_VERSION ?= '5.3.3'
 TAG := $(RELEASE_VERSION)-commit-$(shell git log -1 --pretty=format:"%h")
 STABLE_TAG := $(RELEASE_VERSION)
 
diff --git a/mix.exs b/mix.exs
index f3a4838a8b3d..09f45065856d 100644
--- a/mix.exs
+++ b/mix.exs
@@ -7,7 +7,7 @@ defmodule BlockScout.Mixfile do
     [
       # app: :block_scout,
       # aliases: aliases(config_env()),
-      version: "5.3.2",
+      version: "5.3.3",
       apps_path: "apps",
       deps: deps(),
       dialyzer: dialyzer(),
diff --git a/rel/config.exs b/rel/config.exs
index 86844487f4aa..62745d29f472 100644
--- a/rel/config.exs
+++ b/rel/config.exs
@@ -71,7 +71,7 @@ end
 # will be used by default
 
 release :blockscout do
-  set version: "5.3.2-beta"
+  set version: "5.3.3-beta"
   set applications: [
     :runtime_tools,
     block_scout_web: :permanent,

From f35cf942d339b8a009c7d961e813928e6ca1de72 Mon Sep 17 00:00:00 2001
From: Viktor Baranov <baranov.viktor.27@gmail.com>
Date: Wed, 6 Dec 2023 11:59:25 +0300
Subject: [PATCH 742/909] Rename pre-release CI

---
 .github/workflows/{prerelease-main.yml => prerelease.yml} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename .github/workflows/{prerelease-main.yml => prerelease.yml} (98%)

diff --git a/.github/workflows/prerelease-main.yml b/.github/workflows/prerelease.yml
similarity index 98%
rename from .github/workflows/prerelease-main.yml
rename to .github/workflows/prerelease.yml
index e2fc82079bb7..d3f7579dc033 100644
--- a/.github/workflows/prerelease-main.yml
+++ b/.github/workflows/prerelease.yml
@@ -1,4 +1,4 @@
-name: Pre-release main
+name: Pre-release master
 
 on:
   workflow_dispatch:

From 6fb7ffdd52b12f80de5d1d840a57fb147ace3e67 Mon Sep 17 00:00:00 2001
From: Viktor Baranov <baranov.viktor.27@gmail.com>
Date: Wed, 6 Dec 2023 12:23:43 +0300
Subject: [PATCH 743/909] Revert ueberauth update (back to 0.10.5)

---
 CHANGELOG.md | 1 -
 mix.lock     | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 87dce1db56cc..cc73d9452694 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -54,7 +54,6 @@
 - [#8940](https://github.com/blockscout/blockscout/pull/8940) - Bump photoswipe from 5.4.2 to 5.4.3 in /apps/block_scout_web/assets
 - [#8938](https://github.com/blockscout/blockscout/pull/8938) - Bump @babel/preset-env from 7.23.3 to 7.23.5 in /apps/block_scout_web/assets
 - [#8935](https://github.com/blockscout/blockscout/pull/8935) - Bump @amplitude/analytics-browser from 2.3.5 to 2.3.6 in /apps/block_scout_web/assets
-- [#8941](https://github.com/blockscout/blockscout/pull/8941) - Bump ueberauth from 0.10.5 to 0.10.6
 - [#8937](https://github.com/blockscout/blockscout/pull/8937) - Bump redux from 4.2.1 to 5.0.0 in /apps/block_scout_web/assets
 - [#8942](https://github.com/blockscout/blockscout/pull/8942) - Bump gettext from 0.23.1 to 0.24.0
 - [#8934](https://github.com/blockscout/blockscout/pull/8934) - Bump @fortawesome/fontawesome-free from 6.4.2 to 6.5.1 in /apps/block_scout_web/assets
diff --git a/mix.lock b/mix.lock
index 12d09b27706e..2db07ac8ff34 100644
--- a/mix.lock
+++ b/mix.lock
@@ -136,7 +136,7 @@
   "timex": {:hex, :timex, "3.7.11", "bb95cb4eb1d06e27346325de506bcc6c30f9c6dea40d1ebe390b262fad1862d1", [:mix], [{:combine, "~> 0.10", [hex: :combine, repo: "hexpm", optional: false]}, {:gettext, "~> 0.20", [hex: :gettext, repo: "hexpm", optional: false]}, {:tzdata, "~> 1.1", [hex: :tzdata, repo: "hexpm", optional: false]}], "hexpm", "8b9024f7efbabaf9bd7aa04f65cf8dcd7c9818ca5737677c7b76acbc6a94d1aa"},
   "toml": {:hex, :toml, "0.6.2", "38f445df384a17e5d382befe30e3489112a48d3ba4c459e543f748c2f25dd4d1", [:mix], [], "hexpm", "d013e45126d74c0c26a38d31f5e8e9b83ea19fc752470feb9a86071ca5a672fa"},
   "tzdata": {:hex, :tzdata, "1.1.1", "20c8043476dfda8504952d00adac41c6eda23912278add38edc140ae0c5bcc46", [:mix], [{:hackney, "~> 1.17", [hex: :hackney, repo: "hexpm", optional: false]}], "hexpm", "a69cec8352eafcd2e198dea28a34113b60fdc6cb57eb5ad65c10292a6ba89787"},
-  "ueberauth": {:hex, :ueberauth, "0.10.6", "8dbefd5aec30c5830af2b6ce6e03f62cc28ae0757f34e2986454f54b8dca3f65", [:mix], [{:plug, "~> 1.5", [hex: :plug, repo: "hexpm", optional: false]}], "hexpm", "b0ad1c7508f3cfd5c2c1c668d1a32bafd77de4c56af82c7bfd7e54ed078a7928"},
+  "ueberauth": {:hex, :ueberauth, "0.10.5", "806adb703df87e55b5615cf365e809f84c20c68aa8c08ff8a416a5a6644c4b02", [:mix], [{:plug, "~> 1.5", [hex: :plug, repo: "hexpm", optional: false]}], "hexpm", "3efd1f31d490a125c7ed453b926f7c31d78b97b8a854c755f5c40064bf3ac9e1"},
   "ueberauth_auth0": {:hex, :ueberauth_auth0, "2.1.0", "0632d5844049fa2f26823f15e1120aa32f27df6f27ce515a4b04641736594bf4", [:mix], [{:oauth2, "~> 2.0", [hex: :oauth2, repo: "hexpm", optional: false]}, {:ueberauth, "~> 0.7", [hex: :ueberauth, repo: "hexpm", optional: false]}], "hexpm", "8d3b30fa27c95c9e82c30c4afb016251405706d2e9627e603c3c9787fd1314fc"},
   "unicode_util_compat": {:hex, :unicode_util_compat, "0.7.0", "bc84380c9ab48177092f43ac89e4dfa2c6d62b40b8bd132b1059ecc7232f9a78", [:rebar3], [], "hexpm", "25eee6d67df61960cf6a794239566599b09e17e668d3700247bc498638152521"},
   "wallaby": {:hex, :wallaby, "0.30.6", "7dc4c1213f3b52c4152581d126632bc7e06892336d3a0f582853efeeabd45a71", [:mix], [{:ecto_sql, ">= 3.0.0", [hex: :ecto_sql, repo: "hexpm", optional: true]}, {:httpoison, "~> 0.12 or ~> 1.0 or ~> 2.0", [hex: :httpoison, repo: "hexpm", optional: false]}, {:jason, "~> 1.1", [hex: :jason, repo: "hexpm", optional: false]}, {:phoenix_ecto, ">= 3.0.0", [hex: :phoenix_ecto, repo: "hexpm", optional: true]}, {:web_driver_client, "~> 0.2.0", [hex: :web_driver_client, repo: "hexpm", optional: false]}], "hexpm", "50950c1d968549b54c20e16175c68c7fc0824138e2bb93feb11ef6add8eb23d4"},

From 97097a23bf0818e366bdd589b49bd4f60b2e75eb Mon Sep 17 00:00:00 2001
From: Viktor Baranov <baranov.viktor.27@gmail.com>
Date: Wed, 6 Dec 2023 13:55:12 +0300
Subject: [PATCH 744/909] Refine docker-compose config structure

---
 docker-compose/README.md                      | 22 +++---
 .../docker-compose-no-build-nethermind.yml    | 74 -------------------
 docker-compose/docker-compose.yml             | 22 +++---
 ...compose-no-build-erigon.yml => erigon.yml} | 22 +++---
 ...ernal-backend.yml => external-backend.yml} | 20 ++---
 ...ld-no-db-container.yml => external-db.yml} | 18 ++---
 ...nal-frontend.yml => external-frontend.yml} | 20 ++---
 ...mpose-no-build-ganache.yml => ganache.yml} | 22 +++---
 ...onsensus.yml => geth-clique-consensus.yml} | 22 +++---
 ...ker-compose-no-build-geth.yml => geth.yml} | 22 +++---
 ...ardhat-network.yml => hardhat-network.yml} | 22 +++---
 docker-compose/microservices.yml              | 34 +++++++++
 ...docker-compose-backend.yml => backend.yml} |  2 +-
 .../{docker-compose-db.yml => db.yml}         |  0
 ...cker-compose-frontend.yml => frontend.yml} |  0
 .../{docker-compose-nginx.yml => nginx.yml}   |  0
 .../{docker-compose-redis.yml => redis.yml}   |  0
 ...pose-sig-provider.yml => sig-provider.yml} |  0
 ...rifier.yml => smart-contract-verifier.yml} |  0
 .../{docker-compose-stats.yml => stats.yml}   |  0
 ...-compose-visualizer.yml => visualizer.yml} |  0
 docker/Makefile                               | 14 ++--
 22 files changed, 150 insertions(+), 186 deletions(-)
 delete mode 100644 docker-compose/docker-compose-no-build-nethermind.yml
 rename docker-compose/{docker-compose-no-build-erigon.yml => erigon.yml} (61%)
 rename docker-compose/{docker-compose-no-build-external-backend.yml => external-backend.yml} (55%)
 rename docker-compose/{docker-compose-no-build-no-db-container.yml => external-db.yml} (62%)
 rename docker-compose/{docker-compose-no-build-external-frontend.yml => external-frontend.yml} (66%)
 rename docker-compose/{docker-compose-no-build-ganache.yml => ganache.yml} (66%)
 rename docker-compose/{docker-compose-no-build-geth-clique-consensus.yml => geth-clique-consensus.yml} (62%)
 rename docker-compose/{docker-compose-no-build-geth.yml => geth.yml} (61%)
 rename docker-compose/{docker-compose-no-build-hardhat-network.yml => hardhat-network.yml} (64%)
 create mode 100644 docker-compose/microservices.yml
 rename docker-compose/services/{docker-compose-backend.yml => backend.yml} (85%)
 rename docker-compose/services/{docker-compose-db.yml => db.yml} (100%)
 rename docker-compose/services/{docker-compose-frontend.yml => frontend.yml} (100%)
 rename docker-compose/services/{docker-compose-nginx.yml => nginx.yml} (100%)
 rename docker-compose/services/{docker-compose-redis.yml => redis.yml} (100%)
 rename docker-compose/services/{docker-compose-sig-provider.yml => sig-provider.yml} (100%)
 rename docker-compose/services/{docker-compose-smart-contract-verifier.yml => smart-contract-verifier.yml} (100%)
 rename docker-compose/services/{docker-compose-stats.yml => stats.yml} (100%)
 rename docker-compose/services/{docker-compose-visualizer.yml => visualizer.yml} (100%)

diff --git a/docker-compose/README.md b/docker-compose/README.md
index c212e1cde760..cc472ebd4c40 100644
--- a/docker-compose/README.md
+++ b/docker-compose/README.md
@@ -39,15 +39,19 @@ The repo contains built-in configs for different JSON RPC clients without need t
 
 **Note**: in all below examples, you can use `docker compose` instead of `docker-compose`, if compose v2 plugin is installed in Docker.
 
-- Erigon: `docker-compose -f docker-compose-no-build-erigon.yml up -d`
-- Geth (suitable for Reth as well): `docker-compose -f docker-compose-no-build-geth.yml up -d`
-- Geth Clique: `docker-compose -f docker-compose-no-build-geth-clique-consensus.yml up -d`
-- Nethermind, OpenEthereum: `docker-compose -f docker-compose-no-build-nethermind up -d`
-- Ganache: `docker-compose -f docker-compose-no-build-ganache.yml up -d`
-- HardHat network: `docker-compose -f docker-compose-no-build-hardhat-network.yml up -d`
-- Running only explorer without DB: `docker-compose -f docker-compose-no-build-no-db-container.yml up -d`. In this case, one container is created - for the explorer itself. And it assumes that the DB credentials are provided through `DATABASE_URL` environment variable.
-- Running explorer with external backend: `docker-compose -f docker-compose-no-build-external-backend.yml up -d`
-- Running explorer with external frontend: `docker-compose -f docker-compose-no-build-external-frontend.yml up -d`
+| __JSON RPC Client__    | __Docker compose launch command__ |
+| -------- | ------- |
+| Erigon  | `docker-compose -f erigon.yml up -d`    |
+| Geth (suitable for Reth as well) | `docker-compose -f geth.yml up -d`     |
+| Geth Clique    | `docker-compose -f geth-clique-consensus.yml up -d`    |
+| Nethermind, OpenEthereum    | `docker-compose -f nethermind up -d`    |
+| Ganache    | `docker-compose -f ganache.yml up -d`    |
+| HardHat network    | `docker-compose -f hardhat-network.yml up -d`    |
+
+- Running only explorer without DB: `docker-compose -f external-db.yml up -d`. In this case, no db container is created. And it assumes that the DB credentials are provided through `DATABASE_URL` environment variable on the backend container.
+- Running explorer with external backend: `docker-compose -f external-backend.yml up -d`
+- Running explorer with external frontend: `docker-compose -f external-frontend.yml up -d`
+- Running all microservices: `docker-compose -f microservices.yml up -d`
 
 All of the configs assume the Ethereum JSON RPC is running at http://localhost:8545.
 
diff --git a/docker-compose/docker-compose-no-build-nethermind.yml b/docker-compose/docker-compose-no-build-nethermind.yml
deleted file mode 100644
index 77c5e5eef9b7..000000000000
--- a/docker-compose/docker-compose-no-build-nethermind.yml
+++ /dev/null
@@ -1,74 +0,0 @@
-version: '3.9'
-
-services:
-  redis_db:
-    extends:
-      file: ./services/docker-compose-redis.yml
-      service: redis_db
-
-  db-init:
-    extends:
-      file: ./services/docker-compose-db.yml
-      service: db-init
-
-  db:
-    extends:
-      file: ./services/docker-compose-db.yml
-      service: db
-
-  backend:
-    depends_on:
-      - db
-      - redis_db
-    extends:
-      file: ./services/docker-compose-backend.yml
-      service: backend
-    links:
-      - db:database
-    environment:
-        ETHEREUM_JSONRPC_VARIANT: 'nethermind'
-
-  visualizer:
-    extends:
-      file: ./services/docker-compose-visualizer.yml
-      service: visualizer
-
-  sig-provider:
-    extends:
-      file: ./services/docker-compose-sig-provider.yml
-      service: sig-provider
-
-  frontend:
-    depends_on:
-      - backend
-    extends:
-      file: ./services/docker-compose-frontend.yml
-      service: frontend
-
-  stats-db-init:
-    extends:
-      file: ./services/docker-compose-stats.yml
-      service: stats-db-init
-
-  stats-db:
-    depends_on:
-      - backend
-    extends:
-      file: ./services/docker-compose-stats.yml
-      service: stats-db
-
-  stats:
-    depends_on:
-      - stats-db
-    extends:
-      file: ./services/docker-compose-stats.yml
-      service: stats
-
-  proxy:
-    depends_on:
-      - backend
-      - frontend
-      - stats
-    extends:
-      file: ./services/docker-compose-nginx.yml
-      service: proxy
diff --git a/docker-compose/docker-compose.yml b/docker-compose/docker-compose.yml
index 3198bf8998c4..f700df419c25 100644
--- a/docker-compose/docker-compose.yml
+++ b/docker-compose/docker-compose.yml
@@ -3,17 +3,17 @@ version: '3.9'
 services:
   redis_db:
     extends:
-      file: ./services/docker-compose-redis.yml
+      file: ./services/redis.yml
       service: redis_db
 
   db-init:
     extends:
-      file: ./services/docker-compose-db.yml
+      file: ./services/db.yml
       service: db-init
 
   db:
     extends:
-      file: ./services/docker-compose-db.yml
+      file: ./services/db.yml
       service: db
 
   backend:
@@ -21,7 +21,7 @@ services:
       - db
       - redis_db
     extends:
-      file: ./services/docker-compose-backend.yml
+      file: ./services/backend.yml
       service: backend
     build:
       context: ..
@@ -45,38 +45,38 @@ services:
 
   visualizer:
     extends:
-      file: ./services/docker-compose-visualizer.yml
+      file: ./services/visualizer.yml
       service: visualizer
 
   sig-provider:
     extends:
-      file: ./services/docker-compose-sig-provider.yml
+      file: ./services/sig-provider.yml
       service: sig-provider
 
   frontend:
     depends_on:
       - backend
     extends:
-      file: ./services/docker-compose-frontend.yml
+      file: ./services/frontend.yml
       service: frontend
 
   stats-db-init:
     extends:
-      file: ./services/docker-compose-stats.yml
+      file: ./services/stats.yml
       service: stats-db-init
 
   stats-db:
     depends_on:
       - backend
     extends:
-      file: ./services/docker-compose-stats.yml
+      file: ./services/stats.yml
       service: stats-db
 
   stats:
     depends_on:
       - stats-db
     extends:
-      file: ./services/docker-compose-stats.yml
+      file: ./services/stats.yml
       service: stats
 
   proxy:
@@ -85,5 +85,5 @@ services:
       - frontend
       - stats
     extends:
-      file: ./services/docker-compose-nginx.yml
+      file: ./services/nginx.yml
       service: proxy
diff --git a/docker-compose/docker-compose-no-build-erigon.yml b/docker-compose/erigon.yml
similarity index 61%
rename from docker-compose/docker-compose-no-build-erigon.yml
rename to docker-compose/erigon.yml
index 44e8f0441b78..0dbcef7f3e0e 100644
--- a/docker-compose/docker-compose-no-build-erigon.yml
+++ b/docker-compose/erigon.yml
@@ -3,17 +3,17 @@ version: '3.9'
 services:
   redis_db:
     extends:
-      file: ./services/docker-compose-redis.yml
+      file: ./services/redis.yml
       service: redis_db
 
   db-init:
     extends:
-      file: ./services/docker-compose-db.yml
+      file: ./services/db.yml
       service: db-init
 
   db:
     extends:
-      file: ./services/docker-compose-db.yml
+      file: ./services/db.yml
       service: db
 
   backend:
@@ -21,7 +21,7 @@ services:
       - db
       - redis_db
     extends:
-      file: ./services/docker-compose-backend.yml
+      file: ./services/backend.yml
       service: backend
     links:
       - db:database
@@ -30,38 +30,38 @@ services:
 
   visualizer:
     extends:
-      file: ./services/docker-compose-visualizer.yml
+      file: ./services/visualizer.yml
       service: visualizer
 
   sig-provider:
     extends:
-      file: ./services/docker-compose-sig-provider.yml
+      file: ./services/sig-provider.yml
       service: sig-provider
 
   frontend:
     depends_on:
       - backend
     extends:
-      file: ./services/docker-compose-frontend.yml
+      file: ./services/frontend.yml
       service: frontend
 
   stats-db-init:
     extends:
-      file: ./services/docker-compose-stats.yml
+      file: ./services/stats.yml
       service: stats-db-init
 
   stats-db:
     depends_on:
       - backend
     extends:
-      file: ./services/docker-compose-stats.yml
+      file: ./services/stats.yml
       service: stats-db
 
   stats:
     depends_on:
       - stats-db
     extends:
-      file: ./services/docker-compose-stats.yml
+      file: ./services/stats.yml
       service: stats
 
   proxy:
@@ -70,5 +70,5 @@ services:
       - frontend
       - stats
     extends:
-      file: ./services/docker-compose-nginx.yml
+      file: ./services/nginx.yml
       service: proxy
diff --git a/docker-compose/docker-compose-no-build-external-backend.yml b/docker-compose/external-backend.yml
similarity index 55%
rename from docker-compose/docker-compose-no-build-external-backend.yml
rename to docker-compose/external-backend.yml
index bd6acb24d8ee..db8df3758037 100644
--- a/docker-compose/docker-compose-no-build-external-backend.yml
+++ b/docker-compose/external-backend.yml
@@ -3,49 +3,49 @@ version: '3.9'
 services:
   redis_db:
     extends:
-      file: ./services/docker-compose-redis.yml
+      file: ./services/redis.yml
       service: redis_db
 
   db-init:
     extends:
-      file: ./services/docker-compose-db.yml
+      file: ./services/db.yml
       service: db-init
 
   db:
     extends:
-      file: ./services/docker-compose-db.yml
+      file: ./services/db.yml
       service: db
 
   visualizer:
     extends:
-      file: ./services/docker-compose-visualizer.yml
+      file: ./services/visualizer.yml
       service: visualizer
 
   sig-provider:
     extends:
-      file: ./services/docker-compose-sig-provider.yml
+      file: ./services/sig-provider.yml
       service: sig-provider
 
   frontend:
     extends:
-      file: ./services/docker-compose-frontend.yml
+      file: ./services/frontend.yml
       service: frontend
 
   stats-db-init:
     extends:
-      file: ./services/docker-compose-stats.yml
+      file: ./services/stats.yml
       service: stats-db-init
 
   stats-db:
     extends:
-      file: ./services/docker-compose-stats.yml
+      file: ./services/stats.yml
       service: stats-db
 
   stats:
     depends_on:
       - stats-db
     extends:
-      file: ./services/docker-compose-stats.yml
+      file: ./services/stats.yml
       service: stats
 
   proxy:
@@ -53,5 +53,5 @@ services:
       - frontend
       - stats
     extends:
-      file: ./services/docker-compose-nginx.yml
+      file: ./services/nginx.yml
       service: proxy
diff --git a/docker-compose/docker-compose-no-build-no-db-container.yml b/docker-compose/external-db.yml
similarity index 62%
rename from docker-compose/docker-compose-no-build-no-db-container.yml
rename to docker-compose/external-db.yml
index a9a95c458b88..b40151c51dec 100644
--- a/docker-compose/docker-compose-no-build-no-db-container.yml
+++ b/docker-compose/external-db.yml
@@ -3,52 +3,52 @@ version: '3.9'
 services:
   redis_db:
     extends:
-      file: ./services/docker-compose-redis.yml
+      file: ./services/redis.yml
       service: redis_db
 
   backend:
     depends_on:
       - redis_db
     extends:
-      file: ./services/docker-compose-backend.yml
+      file: ./services/backend.yml
       service: backend
     environment:
         ETHEREUM_JSONRPC_VARIANT: 'geth'
 
   visualizer:
     extends:
-      file: ./services/docker-compose-visualizer.yml
+      file: ./services/visualizer.yml
       service: visualizer
 
   sig-provider:
     extends:
-      file: ./services/docker-compose-sig-provider.yml
+      file: ./services/sig-provider.yml
       service: sig-provider
 
   frontend:
     depends_on:
       - backend
     extends:
-      file: ./services/docker-compose-frontend.yml
+      file: ./services/frontend.yml
       service: frontend
 
   stats-db-init:
     extends:
-      file: ./services/docker-compose-stats.yml
+      file: ./services/stats.yml
       service: stats-db-init
 
   stats-db:
     depends_on:
       - backend
     extends:
-      file: ./services/docker-compose-stats.yml
+      file: ./services/stats.yml
       service: stats-db
 
   stats:
     depends_on:
       - stats-db
     extends:
-      file: ./services/docker-compose-stats.yml
+      file: ./services/stats.yml
       service: stats
 
   proxy:
@@ -57,5 +57,5 @@ services:
       - frontend
       - stats
     extends:
-      file: ./services/docker-compose-nginx.yml
+      file: ./services/nginx.yml
       service: proxy
diff --git a/docker-compose/docker-compose-no-build-external-frontend.yml b/docker-compose/external-frontend.yml
similarity index 66%
rename from docker-compose/docker-compose-no-build-external-frontend.yml
rename to docker-compose/external-frontend.yml
index 71804ffeae73..f0d9f9f89298 100644
--- a/docker-compose/docker-compose-no-build-external-frontend.yml
+++ b/docker-compose/external-frontend.yml
@@ -3,17 +3,17 @@ version: '3.9'
 services:
   redis_db:
     extends:
-      file: ./services/docker-compose-redis.yml
+      file: ./services/redis.yml
       service: redis_db
 
   db-init:
     extends:
-      file: ./services/docker-compose-db.yml
+      file: ./services/db.yml
       service: db-init
 
   db:
     extends:
-      file: ./services/docker-compose-db.yml
+      file: ./services/db.yml
       service: db
 
   backend:
@@ -21,7 +21,7 @@ services:
       - db
       - redis_db
     extends:
-      file: ./services/docker-compose-backend.yml
+      file: ./services/backend.yml
       service: backend
     links:
       - db:database
@@ -34,31 +34,31 @@ services:
 
   visualizer:
     extends:
-      file: ./services/docker-compose-visualizer.yml
+      file: ./services/visualizer.yml
       service: visualizer
 
   sig-provider:
     extends:
-      file: ./services/docker-compose-sig-provider.yml
+      file: ./services/sig-provider.yml
       service: sig-provider
 
   stats-db-init:
     extends:
-      file: ./services/docker-compose-stats.yml
+      file: ./services/stats.yml
       service: stats-db-init
 
   stats-db:
     depends_on:
       - backend
     extends:
-      file: ./services/docker-compose-stats.yml
+      file: ./services/stats.yml
       service: stats-db
 
   stats:
     depends_on:
       - stats-db
     extends:
-      file: ./services/docker-compose-stats.yml
+      file: ./services/stats.yml
       service: stats
 
   proxy:
@@ -66,5 +66,5 @@ services:
       - backend
       - stats
     extends:
-      file: ./services/docker-compose-nginx.yml
+      file: ./services/nginx.yml
       service: proxy
\ No newline at end of file
diff --git a/docker-compose/docker-compose-no-build-ganache.yml b/docker-compose/ganache.yml
similarity index 66%
rename from docker-compose/docker-compose-no-build-ganache.yml
rename to docker-compose/ganache.yml
index f86be323868b..0aa51fce16a2 100644
--- a/docker-compose/docker-compose-no-build-ganache.yml
+++ b/docker-compose/ganache.yml
@@ -3,17 +3,17 @@ version: '3.9'
 services:
   redis_db:
     extends:
-      file: ./services/docker-compose-redis.yml
+      file: ./services/redis.yml
       service: redis_db
 
   db-init:
     extends:
-      file: ./services/docker-compose-db.yml
+      file: ./services/db.yml
       service: db-init
 
   db:
     extends:
-      file: ./services/docker-compose-db.yml
+      file: ./services/db.yml
       service: db
 
   backend:
@@ -21,7 +21,7 @@ services:
       - db
       - redis_db
     extends:
-      file: ./services/docker-compose-backend.yml
+      file: ./services/backend.yml
       service: backend
     links:
       - db:database
@@ -34,38 +34,38 @@ services:
 
   visualizer:
     extends:
-      file: ./services/docker-compose-visualizer.yml
+      file: ./services/visualizer.yml
       service: visualizer
 
   sig-provider:
     extends:
-      file: ./services/docker-compose-sig-provider.yml
+      file: ./services/sig-provider.yml
       service: sig-provider
 
   frontend:
     depends_on:
       - backend
     extends:
-      file: ./services/docker-compose-frontend.yml
+      file: ./services/frontend.yml
       service: frontend
 
   stats-db-init:
     extends:
-      file: ./services/docker-compose-stats.yml
+      file: ./services/stats.yml
       service: stats-db-init
 
   stats-db:
     depends_on:
       - backend
     extends:
-      file: ./services/docker-compose-stats.yml
+      file: ./services/stats.yml
       service: stats-db
 
   stats:
     depends_on:
       - stats-db
     extends:
-      file: ./services/docker-compose-stats.yml
+      file: ./services/stats.yml
       service: stats
 
   proxy:
@@ -74,5 +74,5 @@ services:
       - frontend
       - stats
     extends:
-      file: ./services/docker-compose-nginx.yml
+      file: ./services/nginx.yml
       service: proxy
diff --git a/docker-compose/docker-compose-no-build-geth-clique-consensus.yml b/docker-compose/geth-clique-consensus.yml
similarity index 62%
rename from docker-compose/docker-compose-no-build-geth-clique-consensus.yml
rename to docker-compose/geth-clique-consensus.yml
index 4f605567e431..ac1573849204 100644
--- a/docker-compose/docker-compose-no-build-geth-clique-consensus.yml
+++ b/docker-compose/geth-clique-consensus.yml
@@ -3,17 +3,17 @@ version: '3.9'
 services:
   redis_db:
     extends:
-      file: ./services/docker-compose-redis.yml
+      file: ./services/redis.yml
       service: redis_db
 
   db-init:
     extends:
-      file: ./services/docker-compose-db.yml
+      file: ./services/db.yml
       service: db-init
 
   db:
     extends:
-      file: ./services/docker-compose-db.yml
+      file: ./services/db.yml
       service: db
 
   backend:
@@ -21,7 +21,7 @@ services:
       - db
       - redis_db
     extends:
-      file: ./services/docker-compose-backend.yml
+      file: ./services/backend.yml
       service: backend
     links:
       - db:database
@@ -31,38 +31,38 @@ services:
 
   visualizer:
     extends:
-      file: ./services/docker-compose-visualizer.yml
+      file: ./services/visualizer.yml
       service: visualizer
 
   sig-provider:
     extends:
-      file: ./services/docker-compose-sig-provider.yml
+      file: ./services/sig-provider.yml
       service: sig-provider
 
   frontend:
     depends_on:
       - backend
     extends:
-      file: ./services/docker-compose-frontend.yml
+      file: ./services/frontend.yml
       service: frontend
 
   stats-db-init:
     extends:
-      file: ./services/docker-compose-stats.yml
+      file: ./services/stats.yml
       service: stats-db-init
 
   stats-db:
     depends_on:
       - backend
     extends:
-      file: ./services/docker-compose-stats.yml
+      file: ./services/stats.yml
       service: stats-db
 
   stats:
     depends_on:
       - stats-db
     extends:
-      file: ./services/docker-compose-stats.yml
+      file: ./services/stats.yml
       service: stats
 
   proxy:
@@ -71,5 +71,5 @@ services:
       - frontend
       - stats
     extends:
-      file: ./services/docker-compose-nginx.yml
+      file: ./services/nginx.yml
       service: proxy
diff --git a/docker-compose/docker-compose-no-build-geth.yml b/docker-compose/geth.yml
similarity index 61%
rename from docker-compose/docker-compose-no-build-geth.yml
rename to docker-compose/geth.yml
index 94ccea912a2a..611acec30606 100644
--- a/docker-compose/docker-compose-no-build-geth.yml
+++ b/docker-compose/geth.yml
@@ -3,17 +3,17 @@ version: '3.9'
 services:
   redis_db:
     extends:
-      file: ./services/docker-compose-redis.yml
+      file: ./services/redis.yml
       service: redis_db
 
   db-init:
     extends:
-      file: ./services/docker-compose-db.yml
+      file: ./services/db.yml
       service: db-init
 
   db:
     extends:
-      file: ./services/docker-compose-db.yml
+      file: ./services/db.yml
       service: db
 
   backend:
@@ -21,7 +21,7 @@ services:
       - db
       - redis_db
     extends:
-      file: ./services/docker-compose-backend.yml
+      file: ./services/backend.yml
       service: backend
     links:
       - db:database
@@ -30,38 +30,38 @@ services:
 
   visualizer:
     extends:
-      file: ./services/docker-compose-visualizer.yml
+      file: ./services/visualizer.yml
       service: visualizer
 
   sig-provider:
     extends:
-      file: ./services/docker-compose-sig-provider.yml
+      file: ./services/sig-provider.yml
       service: sig-provider
 
   frontend:
     depends_on:
       - backend
     extends:
-      file: ./services/docker-compose-frontend.yml
+      file: ./services/frontend.yml
       service: frontend
 
   stats-db-init:
     extends:
-      file: ./services/docker-compose-stats.yml
+      file: ./services/stats.yml
       service: stats-db-init
 
   stats-db:
     depends_on:
       - backend
     extends:
-      file: ./services/docker-compose-stats.yml
+      file: ./services/stats.yml
       service: stats-db
 
   stats:
     depends_on:
       - stats-db
     extends:
-      file: ./services/docker-compose-stats.yml
+      file: ./services/stats.yml
       service: stats
 
   proxy:
@@ -70,5 +70,5 @@ services:
       - frontend
       - stats
     extends:
-      file: ./services/docker-compose-nginx.yml
+      file: ./services/nginx.yml
       service: proxy
diff --git a/docker-compose/docker-compose-no-build-hardhat-network.yml b/docker-compose/hardhat-network.yml
similarity index 64%
rename from docker-compose/docker-compose-no-build-hardhat-network.yml
rename to docker-compose/hardhat-network.yml
index defe8e7b35ff..518a3b2af73b 100644
--- a/docker-compose/docker-compose-no-build-hardhat-network.yml
+++ b/docker-compose/hardhat-network.yml
@@ -3,17 +3,17 @@ version: '3.9'
 services:
   redis_db:
     extends:
-      file: ./services/docker-compose-redis.yml
+      file: ./services/redis.yml
       service: redis_db
 
   db-init:
     extends:
-      file: ./services/docker-compose-db.yml
+      file: ./services/db.yml
       service: db-init
 
   db:
     extends:
-      file: ./services/docker-compose-db.yml
+      file: ./services/db.yml
       service: db
 
   backend:
@@ -21,7 +21,7 @@ services:
       - db
       - redis_db
     extends:
-      file: ./services/docker-compose-backend.yml
+      file: ./services/backend.yml
       service: backend
     links:
       - db:database
@@ -32,38 +32,38 @@ services:
 
   visualizer:
     extends:
-      file: ./services/docker-compose-visualizer.yml
+      file: ./services/visualizer.yml
       service: visualizer
 
   sig-provider:
     extends:
-      file: ./services/docker-compose-sig-provider.yml
+      file: ./services/sig-provider.yml
       service: sig-provider
 
   frontend:
     depends_on:
       - backend
     extends:
-      file: ./services/docker-compose-frontend.yml
+      file: ./services/frontend.yml
       service: frontend
 
   stats-db-init:
     extends:
-      file: ./services/docker-compose-stats.yml
+      file: ./services/stats.yml
       service: stats-db-init
 
   stats-db:
     depends_on:
       - backend
     extends:
-      file: ./services/docker-compose-stats.yml
+      file: ./services/stats.yml
       service: stats-db
 
   stats:
     depends_on:
       - stats-db
     extends:
-      file: ./services/docker-compose-stats.yml
+      file: ./services/stats.yml
       service: stats
 
   proxy:
@@ -72,5 +72,5 @@ services:
       - frontend
       - stats
     extends:
-      file: ./services/docker-compose-nginx.yml
+      file: ./services/nginx.yml
       service: proxy
diff --git a/docker-compose/microservices.yml b/docker-compose/microservices.yml
new file mode 100644
index 000000000000..bdbd891f7e04
--- /dev/null
+++ b/docker-compose/microservices.yml
@@ -0,0 +1,34 @@
+version: '3.9'
+
+services:
+  visualizer:
+    extends:
+      file: ./services/visualizer.yml
+      service: visualizer
+
+  sig-provider:
+    extends:
+      file: ./services/sig-provider.yml
+      service: sig-provider
+
+  sc-verifier:
+    extends:
+      file: ./services/smart-contract-verifier.yml
+      service: smart-contract-verifier
+
+  stats-db-init:
+    extends:
+      file: ./services/stats.yml
+      service: stats-db-init
+
+  stats-db:
+    extends:
+      file: ./services/stats.yml
+      service: stats-db
+
+  stats:
+    depends_on:
+      - stats-db
+    extends:
+      file: ./services/stats.yml
+      service: stats
diff --git a/docker-compose/services/docker-compose-backend.yml b/docker-compose/services/backend.yml
similarity index 85%
rename from docker-compose/services/docker-compose-backend.yml
rename to docker-compose/services/backend.yml
index d5f934fb653f..cf8a0871d366 100644
--- a/docker-compose/services/docker-compose-backend.yml
+++ b/docker-compose/services/backend.yml
@@ -2,7 +2,7 @@ version: '3.9'
 
 services:
   backend:
-    image: blockscout/blockscout:${DOCKER_TAG:-latest}
+    image: blockscout/${DOCKER_REPO:-blockscout}:${DOCKER_TAG:-latest}
     pull_policy: always
     restart: always
     stop_grace_period: 5m
diff --git a/docker-compose/services/docker-compose-db.yml b/docker-compose/services/db.yml
similarity index 100%
rename from docker-compose/services/docker-compose-db.yml
rename to docker-compose/services/db.yml
diff --git a/docker-compose/services/docker-compose-frontend.yml b/docker-compose/services/frontend.yml
similarity index 100%
rename from docker-compose/services/docker-compose-frontend.yml
rename to docker-compose/services/frontend.yml
diff --git a/docker-compose/services/docker-compose-nginx.yml b/docker-compose/services/nginx.yml
similarity index 100%
rename from docker-compose/services/docker-compose-nginx.yml
rename to docker-compose/services/nginx.yml
diff --git a/docker-compose/services/docker-compose-redis.yml b/docker-compose/services/redis.yml
similarity index 100%
rename from docker-compose/services/docker-compose-redis.yml
rename to docker-compose/services/redis.yml
diff --git a/docker-compose/services/docker-compose-sig-provider.yml b/docker-compose/services/sig-provider.yml
similarity index 100%
rename from docker-compose/services/docker-compose-sig-provider.yml
rename to docker-compose/services/sig-provider.yml
diff --git a/docker-compose/services/docker-compose-smart-contract-verifier.yml b/docker-compose/services/smart-contract-verifier.yml
similarity index 100%
rename from docker-compose/services/docker-compose-smart-contract-verifier.yml
rename to docker-compose/services/smart-contract-verifier.yml
diff --git a/docker-compose/services/docker-compose-stats.yml b/docker-compose/services/stats.yml
similarity index 100%
rename from docker-compose/services/docker-compose-stats.yml
rename to docker-compose/services/stats.yml
diff --git a/docker-compose/services/docker-compose-visualizer.yml b/docker-compose/services/visualizer.yml
similarity index 100%
rename from docker-compose/services/docker-compose-visualizer.yml
rename to docker-compose/services/visualizer.yml
diff --git a/docker/Makefile b/docker/Makefile
index 231bcfe7aed0..6f3039ec69ea 100644
--- a/docker/Makefile
+++ b/docker/Makefile
@@ -16,19 +16,19 @@ STABLE_TAG := $(RELEASE_VERSION)
 
 start:
 	@echo "==> Starting blockscout db"
-	@docker-compose -f ../docker-compose/services/docker-compose-db.yml up -d
+	@docker-compose -f ../docker-compose/services/db.yml up -d
 	@echo "==> Starting blockscout backend"
-	@docker-compose -f ../docker-compose/services/docker-compose-backend.yml up -d
+	@docker-compose -f ../docker-compose/services/backend.yml up -d
 	@echo "==> Starting stats microservice"
-	@docker-compose -f ../docker-compose/services/docker-compose-stats.yml up -d
+	@docker-compose -f ../docker-compose/services/stats.yml up -d
 	@echo "==> Starting visualizer microservice"
-	@docker-compose -f ../docker-compose/services/docker-compose-visualizer.yml up -d
+	@docker-compose -f ../docker-compose/services/visualizer.yml up -d
 	@echo "==> Starting sig-provider microservice"
-	@docker-compose -f ../docker-compose/services/docker-compose-sig-provider.yml up -d
+	@docker-compose -f ../docker-compose/services/sig-provider.yml up -d
 	@echo "==> Starting blockscout frontend"
-	@docker-compose -f ../docker-compose/services/docker-compose-frontend.yml up -d
+	@docker-compose -f ../docker-compose/services/frontend.yml up -d
 	@echo "==> Starting Nginx proxy"
-	@docker-compose -f ../docker-compose/services/docker-compose-nginx.yml up -d
+	@docker-compose -f ../docker-compose/services/nginx.yml up -d
 
 BS_BACKEND_STARTED := $(shell docker ps --no-trunc --filter name=^/${BACKEND_CONTAINER_NAME}$  | grep ${BACKEND_CONTAINER_NAME})
 BS_FRONTEND_STARTED := $(shell docker ps --no-trunc --filter name=^/${FRONTEND_CONTAINER_NAME}$  | grep ${FRONTEND_CONTAINER_NAME})

From 7051ae2b9ece9634f5f481ab0453609e93a86053 Mon Sep 17 00:00:00 2001
From: Viktor Baranov <baranov.viktor.27@gmail.com>
Date: Wed, 6 Dec 2023 20:26:42 +0300
Subject: [PATCH 745/909] Open ports of services

---
 .gitignore                        | 5 +++++
 docker-compose/microservices.yml  | 9 +++++++++
 docker-compose/services/stats.yml | 2 +-
 3 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index 9e53084c62bb..bfd06c0a3aac 100644
--- a/.gitignore
+++ b/.gitignore
@@ -60,3 +60,8 @@ dump.rdb
 .vscode
 
 **.dec**
+
+*.env
+*.env.example
+*.env.local
+*.env.staging
diff --git a/docker-compose/microservices.yml b/docker-compose/microservices.yml
index bdbd891f7e04..ee04947ddb4e 100644
--- a/docker-compose/microservices.yml
+++ b/docker-compose/microservices.yml
@@ -5,16 +5,23 @@ services:
     extends:
       file: ./services/visualizer.yml
       service: visualizer
+    ports:
+      - 8081:8050
 
   sig-provider:
     extends:
       file: ./services/sig-provider.yml
       service: sig-provider
+    ports:
+      - 8083:8050
+    
 
   sc-verifier:
     extends:
       file: ./services/smart-contract-verifier.yml
       service: smart-contract-verifier
+    ports:
+      - 8082:8050
 
   stats-db-init:
     extends:
@@ -32,3 +39,5 @@ services:
     extends:
       file: ./services/stats.yml
       service: stats
+    ports:
+      - 8080:8050
diff --git a/docker-compose/services/stats.yml b/docker-compose/services/stats.yml
index 5077a5d893c2..0ba073432d33 100644
--- a/docker-compose/services/stats.yml
+++ b/docker-compose/services/stats.yml
@@ -49,6 +49,6 @@ services:
       -  ../envs/common-stats.env
     environment:
       - STATS__DB_URL=postgres://stats:n0uejXPl61ci6ldCuE2gQU5Y@stats-db:5432/stats
-      - STATS__BLOCKSCOUT_DB_URL=postgresql://blockscout:ceWb1MeLBEeOIfk65gU8EjF8@db:5432/blockscout
+      - STATS__BLOCKSCOUT_DB_URL=${STATS__BLOCKSCOUT_DB_URL-postgresql://blockscout:ceWb1MeLBEeOIfk65gU8EjF8@db:5432/blockscout}
       - STATS__CREATE_DATABASE=true
       - STATS__RUN_MIGRATIONS=true

From 209d9a7d55a792d05c38f7a7d83aa880c3c83927 Mon Sep 17 00:00:00 2001
From: Viktor Baranov <baranov.viktor.27@gmail.com>
Date: Wed, 6 Dec 2023 20:39:17 +0300
Subject: [PATCH 746/909] Change optimism branch name

---
 .github/workflows/config.yml                            | 4 ++--
 .github/workflows/publish-docker-image-for-optimism.yml | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/config.yml b/.github/workflows/config.yml
index 8ec57498b3dc..62206a6ab910 100644
--- a/.github/workflows/config.yml
+++ b/.github/workflows/config.yml
@@ -9,7 +9,7 @@ on:
       - production-eth-goerli-stg
       - production-eth-sepolia-stg
       - production-fuse-stg
-      - production-optimism-stg
+      - production-optimism
       - production-immutable-stg
       - production-iota-stg
       - production-lukso-stg
@@ -28,7 +28,7 @@ on:
   pull_request:
     branches:
       - master
-      - production-optimism-stg
+      - production-optimism
 
 env:
   MIX_ENV: test
diff --git a/.github/workflows/publish-docker-image-for-optimism.yml b/.github/workflows/publish-docker-image-for-optimism.yml
index f1371cc268c3..c53a1edf9c3a 100644
--- a/.github/workflows/publish-docker-image-for-optimism.yml
+++ b/.github/workflows/publish-docker-image-for-optimism.yml
@@ -9,7 +9,7 @@ on:
   workflow_dispatch:
   push:
     branches:
-      - production-optimism-stg
+      - production-optimism
 jobs:
   push_to_registry:
     name: Push Docker image to Docker Hub

From c1e0c0c08fe38a92114cebbe470b01a24efb4d69 Mon Sep 17 00:00:00 2001
From: Viktor Baranov <baranov.viktor.27@gmail.com>
Date: Wed, 6 Dec 2023 21:15:31 +0300
Subject: [PATCH 747/909] Add CHANGELOG entry for #8956

---
 CHANGELOG.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index cc73d9452694..2bf98880c023 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,8 @@
 
 ### Chore
 
+- [#8956](https://github.com/blockscout/blockscout/pull/8956) - Refine docker-compose config structure
+
 <details>
   <summary>Dependencies version bumps</summary>
 </details>

From 0583b2450ff1bcd2a570c5aea04105eeee277241 Mon Sep 17 00:00:00 2001
From: Nikita Pozdniakov <nikitosing4@mail.ru>
Date: Wed, 6 Dec 2023 23:21:01 +0300
Subject: [PATCH 748/909] Skip failed instances

---
 .../helper.ex                                 | 63 ++++++++++---------
 1 file changed, 35 insertions(+), 28 deletions(-)

diff --git a/apps/explorer/lib/explorer/token_instance_owner_address_migration/helper.ex b/apps/explorer/lib/explorer/token_instance_owner_address_migration/helper.ex
index 66beb03dd4ea..01bc78d39e28 100644
--- a/apps/explorer/lib/explorer/token_instance_owner_address_migration/helper.ex
+++ b/apps/explorer/lib/explorer/token_instance_owner_address_migration/helper.ex
@@ -34,38 +34,45 @@ defmodule Explorer.TokenInstanceOwnerAddressMigration.Helper do
           | {:error, any, any, map}
   def fetch_and_insert(batch) do
     changes =
-      Enum.map(batch, fn %{token_id: token_id, token_contract_address_hash: token_contract_address_hash} ->
-        token_transfer_query =
-          from(tt in TokenTransfer.only_consensus_transfers_query(),
-            where:
-              tt.token_contract_address_hash == ^token_contract_address_hash and
-                fragment("? @> ARRAY[?::decimal]", tt.token_ids, ^token_id),
-            order_by: [desc: tt.block_number, desc: tt.log_index],
-            limit: 1,
-            select: %{
-              token_contract_address_hash: tt.token_contract_address_hash,
-              token_ids: tt.token_ids,
-              to_address_hash: tt.to_address_hash,
-              block_number: tt.block_number,
-              log_index: tt.log_index
-            }
-          )
+      batch
+      |> Enum.map(&process_instance/1)
+      |> Enum.reject(&is_nil/1)
 
-        token_transfer =
-          Repo.one(token_transfer_query, timeout: :timer.minutes(1)) ||
-            %{to_address_hash: @burn_address_hash, block_number: -1, log_index: -1}
+    Chain.import(%{token_instances: %{params: changes}})
+  end
 
-        %{
-          token_contract_address_hash: token_contract_address_hash,
-          token_id: token_id,
-          token_type: "ERC-721",
-          owner_address_hash: token_transfer.to_address_hash,
-          owner_updated_at_block: token_transfer.block_number,
-          owner_updated_at_log_index: token_transfer.log_index
+  defp process_instance(%{token_id: token_id, token_contract_address_hash: token_contract_address_hash}) do
+    token_transfer_query =
+      from(tt in TokenTransfer.only_consensus_transfers_query(),
+        where:
+          tt.token_contract_address_hash == ^token_contract_address_hash and
+            fragment("? @> ARRAY[?::decimal]", tt.token_ids, ^token_id),
+        order_by: [desc: tt.block_number, desc: tt.log_index],
+        limit: 1,
+        select: %{
+          token_contract_address_hash: tt.token_contract_address_hash,
+          token_ids: tt.token_ids,
+          to_address_hash: tt.to_address_hash,
+          block_number: tt.block_number,
+          log_index: tt.log_index
         }
-      end)
+      )
 
-    Chain.import(%{token_instances: %{params: changes}})
+    token_transfer =
+      Repo.one(token_transfer_query, timeout: :timer.minutes(5)) ||
+        %{to_address_hash: @burn_address_hash, block_number: -1, log_index: -1}
+
+    %{
+      token_contract_address_hash: token_contract_address_hash,
+      token_id: token_id,
+      token_type: "ERC-721",
+      owner_address_hash: token_transfer.to_address_hash,
+      owner_updated_at_block: token_transfer.block_number,
+      owner_updated_at_log_index: token_transfer.log_index
+    }
+  rescue
+    DBConnection.ConnectionError ->
+      nil
   end
 
   @spec unfilled_token_instances_exists? :: boolean

From 77072e43d87ba134cebe5c6a4ff0adcdbfa4fdf3 Mon Sep 17 00:00:00 2001
From: Nikita Pozdniakov <nikitosing4@mail.ru>
Date: Thu, 7 Dec 2023 16:08:26 +0300
Subject: [PATCH 749/909] Changelog

---
 CHANGELOG.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index cc73d9452694..db105345f644 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,8 @@
 
 ### Fixes
 
+- [#8959](https://github.com/blockscout/blockscout/pull/8959) - Skip failed instances in Token Instance Owner migrator
+
 ### Chore
 
 <details>

From 15ffea7ed2f2b63cba573f0114298d0ae520d84f Mon Sep 17 00:00:00 2001
From: Viktor Baranov <baranov.viktor.27@gmail.com>
Date: Thu, 7 Dec 2023 19:12:58 +0300
Subject: [PATCH 750/909] Improve microservices.yml docker-compose

---
 docker-compose/microservices.yml              | 14 ++--
 .../proxy/microservices.conf.template         | 65 +++++++++++++++++++
 2 files changed, 75 insertions(+), 4 deletions(-)
 create mode 100644 docker-compose/proxy/microservices.conf.template

diff --git a/docker-compose/microservices.yml b/docker-compose/microservices.yml
index ee04947ddb4e..ee4a07bd6d1d 100644
--- a/docker-compose/microservices.yml
+++ b/docker-compose/microservices.yml
@@ -5,8 +5,6 @@ services:
     extends:
       file: ./services/visualizer.yml
       service: visualizer
-    ports:
-      - 8081:8050
 
   sig-provider:
     extends:
@@ -39,5 +37,13 @@ services:
     extends:
       file: ./services/stats.yml
       service: stats
-    ports:
-      - 8080:8050
+
+  proxy:
+    depends_on:
+      - visualizer
+      - stats
+    extends:
+      file: ./services/nginx.yml
+      service: proxy
+    volumes:
+      - "./proxy/microservices.conf.template:/etc/nginx/templates/default.conf.template"
diff --git a/docker-compose/proxy/microservices.conf.template b/docker-compose/proxy/microservices.conf.template
new file mode 100644
index 000000000000..cf359913cace
--- /dev/null
+++ b/docker-compose/proxy/microservices.conf.template
@@ -0,0 +1,65 @@
+map $http_upgrade $connection_upgrade {
+
+  default upgrade;
+  ''      close;
+}
+
+server {
+    listen       8080;
+    server_name  localhost;
+    proxy_http_version 1.1;
+    proxy_hide_header Access-Control-Allow-Origin;
+    proxy_hide_header Access-Control-Allow-Methods;
+    add_header 'Access-Control-Allow-Origin' 'http://localhost' always;
+    add_header 'Access-Control-Allow-Credentials' 'true' always;
+    add_header 'Access-Control-Allow-Methods' 'PUT, GET, POST, OPTIONS, DELETE, PATCH' always;
+
+    location / {
+        proxy_pass            http://stats:8050/;
+        proxy_http_version    1.1;
+        proxy_set_header      Host "$host";
+        proxy_set_header      X-Real-IP "$remote_addr";
+        proxy_set_header      X-Forwarded-For "$proxy_add_x_forwarded_for";
+        proxy_set_header      X-Forwarded-Proto "$scheme";
+        proxy_set_header      Upgrade "$http_upgrade";
+        proxy_set_header      Connection $connection_upgrade;
+        proxy_cache_bypass    $http_upgrade;
+    }
+}
+server {
+    listen       8081;
+    server_name  localhost;
+    proxy_http_version 1.1;
+    proxy_hide_header Access-Control-Allow-Origin;
+    proxy_hide_header Access-Control-Allow-Methods;
+    add_header 'Access-Control-Allow-Origin' 'http://localhost:3000' always;
+    add_header 'Access-Control-Allow-Credentials' 'true' always;
+    add_header 'Access-Control-Allow-Methods' 'PUT, GET, POST, OPTIONS, DELETE, PATCH' always;
+    add_header 'Access-Control-Allow-Headers' 'DNT,Keep-Alive,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type,Range,Authorization,x-csrf-token' always;
+
+    location / {
+        proxy_pass            http://visualizer:8050/;
+        proxy_http_version    1.1;
+        proxy_buffering       off;
+        proxy_set_header      Host "$host";
+        proxy_set_header      X-Real-IP "$remote_addr";
+        proxy_connect_timeout 30m;
+        proxy_read_timeout    30m;
+        proxy_send_timeout    30m;
+        proxy_set_header      X-Forwarded-For "$proxy_add_x_forwarded_for";
+        proxy_set_header      X-Forwarded-Proto "$scheme";
+        proxy_set_header      Upgrade "$http_upgrade";
+        proxy_set_header      Connection $connection_upgrade;
+        proxy_cache_bypass    $http_upgrade;
+        if ($request_method = 'OPTIONS') {
+            add_header 'Access-Control-Allow-Origin' 'http://localhost:3000' always;
+            add_header 'Access-Control-Allow-Credentials' 'true' always;
+            add_header 'Access-Control-Allow-Methods' 'PUT, GET, POST, OPTIONS, DELETE, PATCH' always;
+            add_header 'Access-Control-Allow-Headers' 'DNT,Keep-Alive,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type,Range,Authorization,x-csrf-token' always;
+            add_header 'Access-Control-Max-Age' 1728000;
+            add_header 'Content-Type' 'text/plain charset=UTF-8';
+            add_header 'Content-Length' 0;
+            return 204;
+        }
+    }
+}
\ No newline at end of file

From 9d8beda5cd6851a5ede0a5d0c0c6c60e53eb3445 Mon Sep 17 00:00:00 2001
From: Viktor Baranov <baranov.viktor.27@gmail.com>
Date: Thu, 7 Dec 2023 19:22:40 +0300
Subject: [PATCH 751/909] Fix microservices.yml docker-compose stats cors issue

---
 docker-compose/proxy/microservices.conf.template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker-compose/proxy/microservices.conf.template b/docker-compose/proxy/microservices.conf.template
index cf359913cace..708812f57113 100644
--- a/docker-compose/proxy/microservices.conf.template
+++ b/docker-compose/proxy/microservices.conf.template
@@ -10,7 +10,7 @@ server {
     proxy_http_version 1.1;
     proxy_hide_header Access-Control-Allow-Origin;
     proxy_hide_header Access-Control-Allow-Methods;
-    add_header 'Access-Control-Allow-Origin' 'http://localhost' always;
+    add_header 'Access-Control-Allow-Origin' 'http://localhost:3000' always;
     add_header 'Access-Control-Allow-Credentials' 'true' always;
     add_header 'Access-Control-Allow-Methods' 'PUT, GET, POST, OPTIONS, DELETE, PATCH' always;
 

From f0b05faace772d845f4875d66d1e567b4231b1cb Mon Sep 17 00:00:00 2001
From: Nikita Pozdniakov <nikitosing4@mail.ru>
Date: Fri, 8 Dec 2023 00:40:15 +0300
Subject: [PATCH 752/909] Add ACCOUNT_WATCHLIST_NOTIFICATIONS_LIMIT_FOR_30_DAYS

---
 CHANGELOG.md                                  |  2 +
 .../lib/explorer/account/notifier/notify.ex   | 10 ++--
 .../account/watchlist_notification.ex         | 25 ++++++++-
 ...20231207201701_add_watchlist_id_column.exs | 23 ++++++++
 .../explorer/account/notifier/notify_test.exs | 56 +++++++++++++++++++
 config/runtime.exs                            |  4 +-
 cspell.json                                   |  3 +-
 7 files changed, 115 insertions(+), 8 deletions(-)
 create mode 100644 apps/explorer/priv/account/migrations/20231207201701_add_watchlist_id_column.exs

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2bf98880c023..ad24d7a0aa7e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,8 @@
 
 ### Features
 
+- [#8966](https://github.com/blockscout/blockscout/pull/8966) - Add `ACCOUNT_WATCHLIST_NOTIFICATIONS_LIMIT_FOR_30_DAYS`
+
 ### Fixes
 
 ### Chore
diff --git a/apps/explorer/lib/explorer/account/notifier/notify.ex b/apps/explorer/lib/explorer/account/notifier/notify.ex
index 70e633be8da8..f9c9232546ac 100644
--- a/apps/explorer/lib/explorer/account/notifier/notify.ex
+++ b/apps/explorer/lib/explorer/account/notifier/notify.ex
@@ -55,7 +55,8 @@ defmodule Explorer.Account.Notifier.Notify do
   defp notify_watchlists(nil), do: nil
 
   defp notify_watchlist(%WatchlistAddress{} = address, summary, direction) do
-    case ForbiddenAddress.check(address.address_hash) do
+    case !WatchlistNotification.limit_reached_for_watchlist_id?(address.watchlist_id) &&
+           ForbiddenAddress.check(address.address_hash) do
       {:ok, _address_hash} ->
         with %WatchlistNotification{} = notification <-
                build_watchlist_notification(
@@ -74,6 +75,9 @@ defmodule Explorer.Account.Notifier.Notify do
 
       {:error, _message} ->
         nil
+
+      false ->
+        nil
     end
   end
 
@@ -106,9 +110,6 @@ defmodule Explorer.Account.Notifier.Notify do
           Logger.info("--- email delivery response: FAILED", fetcher: :account)
           Logger.info(error, fetcher: :account)
       end
-    else
-      Logger.info("--- email delivery response: FAILED", fetcher: :account)
-      Logger.info("Email is not composed (is nil)", fetcher: :account)
     end
   end
 
@@ -119,6 +120,7 @@ defmodule Explorer.Account.Notifier.Notify do
     if is_watched(address, summary, direction) do
       %WatchlistNotification{
         watchlist_address_id: address.id,
+        watchlist_id: address.watchlist_id,
         transaction_hash: summary.transaction_hash,
         from_address_hash: summary.from_address_hash,
         to_address_hash: summary.to_address_hash,
diff --git a/apps/explorer/lib/explorer/account/watchlist_notification.ex b/apps/explorer/lib/explorer/account/watchlist_notification.ex
index 935e53218780..cc45561073ef 100644
--- a/apps/explorer/lib/explorer/account/watchlist_notification.ex
+++ b/apps/explorer/lib/explorer/account/watchlist_notification.ex
@@ -1,6 +1,6 @@
 defmodule Explorer.Account.WatchlistNotification do
   @moduledoc """
-    Stored notification about event 
+    Stored notification about event
     related to WatchlistAddress
   """
 
@@ -9,7 +9,8 @@ defmodule Explorer.Account.WatchlistNotification do
   import Ecto.Changeset
   import Explorer.Chain, only: [hash_to_lower_case_string: 1]
 
-  alias Explorer.Account.WatchlistAddress
+  alias Explorer.Repo
+  alias Explorer.Account.{Watchlist, WatchlistAddress}
 
   schema "account_watchlist_notifications" do
     field(:amount, :decimal)
@@ -24,6 +25,7 @@ defmodule Explorer.Account.WatchlistNotification do
     field(:subject_hash, Cloak.Ecto.SHA256)
 
     belongs_to(:watchlist_address, WatchlistAddress)
+    belongs_to(:watchlist, Watchlist)
 
     field(:from_address_hash, Explorer.Encrypted.AddressHash)
     field(:to_address_hash, Explorer.Encrypted.AddressHash)
@@ -62,4 +64,23 @@ defmodule Explorer.Account.WatchlistNotification do
     |> put_change(:transaction_hash_hash, hash_to_lower_case_string(get_field(changeset, :transaction_hash)))
     |> put_change(:subject_hash, get_field(changeset, :subject))
   end
+
+  @doc """
+    Check if amount of watchlist notifications for the last 30 days is less than ACCOUNT_WATCHLIST_NOTIFICATIONS_LIMIT_FOR_30_DAYS
+  """
+  @spec limit_reached_for_watchlist_id?(integer) :: boolean
+  def limit_reached_for_watchlist_id?(watchlist_id) do
+    __MODULE__
+    |> where(
+      [wn],
+      wn.watchlist_id == ^watchlist_id and
+        fragment("NOW() - ? at time zone 'UTC' <= interval '30 days'", wn.inserted_at)
+    )
+    |> limit(^watchlist_notification_30_days_limit())
+    |> Repo.account_repo().aggregate(:count) == watchlist_notification_30_days_limit()
+  end
+
+  defp watchlist_notification_30_days_limit do
+    Application.get_env(:explorer, Explorer.Account)[:notifications_limit_for_30_days]
+  end
 end
diff --git a/apps/explorer/priv/account/migrations/20231207201701_add_watchlist_id_column.exs b/apps/explorer/priv/account/migrations/20231207201701_add_watchlist_id_column.exs
new file mode 100644
index 000000000000..346c9ec05ee8
--- /dev/null
+++ b/apps/explorer/priv/account/migrations/20231207201701_add_watchlist_id_column.exs
@@ -0,0 +1,23 @@
+defmodule Explorer.Repo.Account.Migrations.AddWatchlistIdColumn do
+  use Ecto.Migration
+
+  def change do
+    execute("""
+    ALTER TABLE public.account_watchlist_notifications
+      DROP CONSTRAINT account_watchlist_notifications_watchlist_address_id_fkey;
+    """)
+
+    alter table(:account_watchlist_notifications) do
+      add(:watchlist_id, :bigserial)
+    end
+
+    create(index(:account_watchlist_notifications, [:watchlist_id]))
+
+    execute("""
+    UPDATE account_watchlist_notifications awn
+    SET watchlist_id = awa.watchlist_id
+    FROM account_watchlist_addresses awa
+    WHERE awa.id = awn.watchlist_address_id
+    """)
+  end
+end
diff --git a/apps/explorer/test/explorer/account/notifier/notify_test.exs b/apps/explorer/test/explorer/account/notifier/notify_test.exs
index bc7480cc3ec2..860b569f2a15 100644
--- a/apps/explorer/test/explorer/account/notifier/notify_test.exs
+++ b/apps/explorer/test/explorer/account/notifier/notify_test.exs
@@ -86,5 +86,61 @@ defmodule Explorer.Account.Notifier.NotifyTest do
       assert wn.tx_fee == fee
       assert wn.type == "COIN"
     end
+
+    test "ignore new notification when limit is reached" do
+      old_envs = Application.get_env(:explorer, Explorer.Account)
+
+      Application.put_env(:explorer, Explorer.Account, Keyword.put(old_envs, :notifications_limit_for_30_days, 1))
+
+      wa =
+        %WatchlistAddress{address_hash: address_hash} =
+        build(:account_watchlist_address, watch_coin_input: true)
+        |> Repo.account_repo().insert!()
+
+      _watchlist_address = Repo.preload(wa, watchlist: :identity)
+
+      tx =
+        %Transaction{
+          from_address: _from_address,
+          to_address: _to_address,
+          block_number: _block_number,
+          hash: _tx_hash
+        } = with_block(insert(:transaction, to_address: %Chain.Address{hash: address_hash}))
+
+      {_, fee} = Chain.fee(tx, :gwei)
+      amount = Wei.to(tx.value, :ether)
+      notify = Notify.call([tx])
+
+      wn =
+        WatchlistNotification
+        |> first
+        |> Repo.account_repo().one()
+
+      assert notify == [[:ok]]
+
+      assert wn.amount == amount
+      assert wn.direction == "incoming"
+      assert wn.method == "transfer"
+      assert wn.subject == "Coin transaction"
+      assert wn.tx_fee == fee
+      assert wn.type == "COIN"
+      address = Repo.get(Chain.Address, address_hash)
+
+      tx =
+        %Transaction{
+          from_address: _from_address,
+          to_address: _to_address,
+          block_number: _block_number,
+          hash: _tx_hash
+        } = with_block(insert(:transaction, to_address: address))
+
+      Notify.call([tx])
+
+      WatchlistNotification
+      |> first
+      |> Repo.account_repo().one!()
+
+      Application.put_env(:explorer, Explorer.Account, old_envs)
+    end
   end
 end
diff --git a/config/runtime.exs b/config/runtime.exs
index 0f1ed1aa864a..ec0cd0427b01 100644
--- a/config/runtime.exs
+++ b/config/runtime.exs
@@ -407,7 +407,9 @@ config :explorer, Explorer.Account,
   ],
   resend_interval: ConfigHelper.parse_time_env_var("ACCOUNT_VERIFICATION_EMAIL_RESEND_INTERVAL", "5m"),
   private_tags_limit: ConfigHelper.parse_integer_env_var("ACCOUNT_PRIVATE_TAGS_LIMIT", 2000),
-  watchlist_addresses_limit: ConfigHelper.parse_integer_env_var("ACCOUNT_WATCHLIST_ADDRESSES_LIMIT", 15)
+  watchlist_addresses_limit: ConfigHelper.parse_integer_env_var("ACCOUNT_WATCHLIST_ADDRESSES_LIMIT", 15),
+  notifications_limit_for_30_days:
+    ConfigHelper.parse_integer_env_var("ACCOUNT_WATCHLIST_NOTIFICATIONS_LIMIT_FOR_30_DAYS", 1000)
 
 config :explorer, :token_id_migration,
   first_block: ConfigHelper.parse_integer_env_var("TOKEN_ID_MIGRATION_FIRST_BLOCK", 0),
diff --git a/cspell.json b/cspell.json
index 72bfc7609c21..3cdf520ecd49 100644
--- a/cspell.json
+++ b/cspell.json
@@ -545,7 +545,8 @@
         "qitmeer",
         "meer",
         "DefiLlama",
-        "SOLIDITYSCAN"
+        "SOLIDITYSCAN",
+        "fkey"
     ],
     "enableFiletypes": [
         "dotenv",

From fd05765d19157d75388617632b59718bd647d7b2 Mon Sep 17 00:00:00 2001
From: Viktor Baranov <baranov.viktor.27@gmail.com>
Date: Mon, 11 Dec 2023 17:22:32 +0300
Subject: [PATCH 753/909] Update CHANGELOG

---
 CHANGELOG.md | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 50d41ac0f9d4..a4ab195fdb21 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,16 +4,10 @@
 
 ### Features
 
-- [#8966](https://github.com/blockscout/blockscout/pull/8966) - Add `ACCOUNT_WATCHLIST_NOTIFICATIONS_LIMIT_FOR_30_DAYS`
-
 ### Fixes
 
-- [#8959](https://github.com/blockscout/blockscout/pull/8959) - Skip failed instances in Token Instance Owner migrator
-
 ### Chore
 
-- [#8956](https://github.com/blockscout/blockscout/pull/8956) - Refine docker-compose config structure
-
 <details>
   <summary>Dependencies version bumps</summary>
 </details>
@@ -22,12 +16,14 @@
 
 ### Features
 
+- [#8966](https://github.com/blockscout/blockscout/pull/8966) - Add `ACCOUNT_WATCHLIST_NOTIFICATIONS_LIMIT_FOR_30_DAYS`
 - [#8908](https://github.com/blockscout/blockscout/pull/8908) - Solidityscan report API endpoint
 - [#8900](https://github.com/blockscout/blockscout/pull/8900) - Add Compound proxy contract pattern
 - [#8611](https://github.com/blockscout/blockscout/pull/8611) - Implement sorting of smart contracts, address transactions
 
 ### Fixes
 
+- [#8959](https://github.com/blockscout/blockscout/pull/8959) - Skip failed instances in Token Instance Owner migrator
 - [#8924](https://github.com/blockscout/blockscout/pull/8924) - Delete invalid current token balances in OnDemand fetcher
 - [#8922](https://github.com/blockscout/blockscout/pull/8922) - Allow call type to be in lowercase
 - [#8917](https://github.com/blockscout/blockscout/pull/8917) - Proxy detection hotfix in API v2
@@ -39,6 +35,7 @@
 
 ### Chore
 
+- [#8956](https://github.com/blockscout/blockscout/pull/8956) - Refine docker-compose config structure
 - [#8911](https://github.com/blockscout/blockscout/pull/8911) - Set client_connection_check_interval for main Postgres DB in docker-compose setup
 
 <details>

From e549fce72765ef4232aa7bacb20366b8ebe4d07f Mon Sep 17 00:00:00 2001
From: Viktor Baranov <baranov.viktor.27@gmail.com>
Date: Mon, 11 Dec 2023 20:16:19 +0300
Subject: [PATCH 754/909] Remove -stg suffix from chain branch names

---
 .github/workflows/config.yml                  | 28 +++++++++----------
 .../publish-docker-image-for-core.yml         |  2 +-
 .../publish-docker-image-for-eth-goerli.yml   |  2 +-
 .../publish-docker-image-for-eth-sepolia.yml  |  2 +-
 .../publish-docker-image-for-eth.yml          |  2 +-
 .../publish-docker-image-for-fuse.yml         |  2 +-
 .../publish-docker-image-for-immutable.yml    |  2 +-
 .../publish-docker-image-for-lukso.yml        |  2 +-
 .../publish-docker-image-for-polygon-edge.yml |  2 +-
 .../publish-docker-image-for-rsk.yml          |  2 +-
 .../publish-docker-image-for-stability.yml    |  2 +-
 .../publish-docker-image-for-suave.yml        |  2 +-
 .../publish-docker-image-for-xdai.yml         |  2 +-
 .../publish-docker-image-for-zkevm.yml        |  2 +-
 .../publish-docker-image-for-zksync.yml       |  2 +-
 .github/workflows/release-main.yml            | 18 ++++++------
 16 files changed, 37 insertions(+), 37 deletions(-)

diff --git a/.github/workflows/config.yml b/.github/workflows/config.yml
index 62206a6ab910..247f01b0e87d 100644
--- a/.github/workflows/config.yml
+++ b/.github/workflows/config.yml
@@ -4,21 +4,21 @@ on:
   push:
     branches:
       - master
-      - production-core-stg
-      - production-eth-stg-experimental
-      - production-eth-goerli-stg
-      - production-eth-sepolia-stg
-      - production-fuse-stg
+      - production-core
+      - production-eth-experimental
+      - production-eth-goerli
+      - production-eth-sepolia
+      - production-fuse
       - production-optimism
-      - production-immutable-stg
-      - production-iota-stg
-      - production-lukso-stg
-      - production-rsk-stg
-      - production-sokol-stg
-      - production-suave-stg
-      - production-xdai-stg
-      - production-zkevm-stg
-      - production-zksync-stg
+      - production-immutable
+      - production-iota
+      - production-lukso
+      - production-rsk
+      - production-sokol
+      - production-suave
+      - production-xdai
+      - production-zkevm
+      - production-zksync
       - staging-l2
     paths-ignore:
       - 'CHANGELOG.md'
diff --git a/.github/workflows/publish-docker-image-for-core.yml b/.github/workflows/publish-docker-image-for-core.yml
index 184bed4b4a8e..158e5c015154 100644
--- a/.github/workflows/publish-docker-image-for-core.yml
+++ b/.github/workflows/publish-docker-image-for-core.yml
@@ -9,7 +9,7 @@ on:
   workflow_dispatch:
   push:
     branches:
-      - production-core-stg
+      - production-core
 jobs:
   push_to_registry:
     name: Push Docker image to Docker Hub
diff --git a/.github/workflows/publish-docker-image-for-eth-goerli.yml b/.github/workflows/publish-docker-image-for-eth-goerli.yml
index 174318b6c963..20db375a476a 100644
--- a/.github/workflows/publish-docker-image-for-eth-goerli.yml
+++ b/.github/workflows/publish-docker-image-for-eth-goerli.yml
@@ -9,7 +9,7 @@ on:
   workflow_dispatch:
   push:
     branches:
-      - production-eth-goerli-stg
+      - production-eth-goerli
 jobs:
   push_to_registry:
     name: Push Docker image to Docker Hub
diff --git a/.github/workflows/publish-docker-image-for-eth-sepolia.yml b/.github/workflows/publish-docker-image-for-eth-sepolia.yml
index d0d1a6281f04..d16b1fbc9d18 100644
--- a/.github/workflows/publish-docker-image-for-eth-sepolia.yml
+++ b/.github/workflows/publish-docker-image-for-eth-sepolia.yml
@@ -9,7 +9,7 @@ on:
   workflow_dispatch:
   push:
     branches:
-      - production-eth-sepolia-stg
+      - production-eth-sepolia
 jobs:
   push_to_registry:
     name: Push Docker image to Docker Hub
diff --git a/.github/workflows/publish-docker-image-for-eth.yml b/.github/workflows/publish-docker-image-for-eth.yml
index af99aa32d184..0fd3120c0517 100644
--- a/.github/workflows/publish-docker-image-for-eth.yml
+++ b/.github/workflows/publish-docker-image-for-eth.yml
@@ -9,7 +9,7 @@ on:
   workflow_dispatch:
   push:
     branches:
-      - production-eth-stg-experimental
+      - production-eth-experimental
 jobs:
   push_to_registry:
     name: Push Docker image to Docker Hub
diff --git a/.github/workflows/publish-docker-image-for-fuse.yml b/.github/workflows/publish-docker-image-for-fuse.yml
index 4b0221b8e685..fbd5fe81e212 100644
--- a/.github/workflows/publish-docker-image-for-fuse.yml
+++ b/.github/workflows/publish-docker-image-for-fuse.yml
@@ -9,7 +9,7 @@ on:
   workflow_dispatch:
   push:
     branches:
-      - production-fuse-stg
+      - production-fuse
 jobs:
   push_to_registry:
     name: Push Docker image to Docker Hub
diff --git a/.github/workflows/publish-docker-image-for-immutable.yml b/.github/workflows/publish-docker-image-for-immutable.yml
index 6dd6dccde603..2fbccdf55586 100644
--- a/.github/workflows/publish-docker-image-for-immutable.yml
+++ b/.github/workflows/publish-docker-image-for-immutable.yml
@@ -9,7 +9,7 @@ on:
   workflow_dispatch:
   push:
     branches:
-      - production-immutable-stg
+      - production-immutable
 jobs:
   push_to_registry:
     name: Push Docker image to Docker Hub
diff --git a/.github/workflows/publish-docker-image-for-lukso.yml b/.github/workflows/publish-docker-image-for-lukso.yml
index 53f2f88e258f..a094176964b1 100644
--- a/.github/workflows/publish-docker-image-for-lukso.yml
+++ b/.github/workflows/publish-docker-image-for-lukso.yml
@@ -9,7 +9,7 @@ on:
   workflow_dispatch:
   push:
     branches:
-      - production-lukso-stg
+      - production-lukso
 jobs:
   push_to_registry:
     name: Push Docker image to Docker Hub
diff --git a/.github/workflows/publish-docker-image-for-polygon-edge.yml b/.github/workflows/publish-docker-image-for-polygon-edge.yml
index ccd20ef78d10..c54555d97cf8 100644
--- a/.github/workflows/publish-docker-image-for-polygon-edge.yml
+++ b/.github/workflows/publish-docker-image-for-polygon-edge.yml
@@ -9,7 +9,7 @@ on:
   workflow_dispatch:
   push:
     branches:
-      - production-polygon-edge-stg
+      - production-polygon-edge
 jobs:
   push_to_registry:
     name: Push Docker image to Docker Hub
diff --git a/.github/workflows/publish-docker-image-for-rsk.yml b/.github/workflows/publish-docker-image-for-rsk.yml
index d482fed9e90c..324494c9eee7 100644
--- a/.github/workflows/publish-docker-image-for-rsk.yml
+++ b/.github/workflows/publish-docker-image-for-rsk.yml
@@ -9,7 +9,7 @@ on:
   workflow_dispatch:
   push:
     branches:
-      - production-rsk-stg
+      - production-rsk
 jobs:
   push_to_registry:
     name: Push Docker image to Docker Hub
diff --git a/.github/workflows/publish-docker-image-for-stability.yml b/.github/workflows/publish-docker-image-for-stability.yml
index 218b8fa3e067..f6a4bedb37b8 100644
--- a/.github/workflows/publish-docker-image-for-stability.yml
+++ b/.github/workflows/publish-docker-image-for-stability.yml
@@ -9,7 +9,7 @@ on:
   workflow_dispatch:
   push:
     branches:
-      - production-stability-stg
+      - production-stability
 env:
   OTP_VERSION: '25.2.1'
   ELIXIR_VERSION: '1.14.5'
diff --git a/.github/workflows/publish-docker-image-for-suave.yml b/.github/workflows/publish-docker-image-for-suave.yml
index 85836106b629..2e9b6fbd3ddc 100644
--- a/.github/workflows/publish-docker-image-for-suave.yml
+++ b/.github/workflows/publish-docker-image-for-suave.yml
@@ -9,7 +9,7 @@ on:
   workflow_dispatch:
   push:
     branches:
-      - production-suave-stg
+      - production-suave
 env:
   OTP_VERSION: '25.2.1'
   ELIXIR_VERSION: '1.14.5'
diff --git a/.github/workflows/publish-docker-image-for-xdai.yml b/.github/workflows/publish-docker-image-for-xdai.yml
index 7a69fd7e9f21..7a672e81fcef 100644
--- a/.github/workflows/publish-docker-image-for-xdai.yml
+++ b/.github/workflows/publish-docker-image-for-xdai.yml
@@ -9,7 +9,7 @@ on:
   workflow_dispatch:
   push:
     branches:
-      - production-xdai-stg
+      - production-xdai
 jobs:
   push_to_registry:
     name: Push Docker image to Docker Hub
diff --git a/.github/workflows/publish-docker-image-for-zkevm.yml b/.github/workflows/publish-docker-image-for-zkevm.yml
index 9fed1cc04083..b73fdcda97d4 100644
--- a/.github/workflows/publish-docker-image-for-zkevm.yml
+++ b/.github/workflows/publish-docker-image-for-zkevm.yml
@@ -9,7 +9,7 @@ on:
   workflow_dispatch:
   push:
     branches:
-      - production-zkevm-stg
+      - production-zkevm
 jobs:
   push_to_registry:
     name: Push Docker image to Docker Hub
diff --git a/.github/workflows/publish-docker-image-for-zksync.yml b/.github/workflows/publish-docker-image-for-zksync.yml
index 1688bb4f761e..8a0490c88178 100644
--- a/.github/workflows/publish-docker-image-for-zksync.yml
+++ b/.github/workflows/publish-docker-image-for-zksync.yml
@@ -9,7 +9,7 @@ on:
   workflow_dispatch:
   push:
     branches:
-      - production-zksync-stg
+      - production-zksync
 jobs:
   push_to_registry:
     name: Push Docker image to Docker Hub
diff --git a/.github/workflows/release-main.yml b/.github/workflows/release-main.yml
index d8808170ab9e..c1cbdac6b8d9 100644
--- a/.github/workflows/release-main.yml
+++ b/.github/workflows/release-main.yml
@@ -127,15 +127,15 @@ jobs:
   #   runs-on: ubuntu-latest
   #   env:
   #     BRANCHES: |
-  #       production-core-stg
-  #       production-sokol-stg
-  #       production-eth-stg-experimental
-  #       production-eth-goerli-stg
-  #       production-lukso-stg
-  #       production-xdai-stg
-  #       production-polygon-supernets-stg
-  #       production-rsk-stg
-  #       production-immutable-stg
+  #       production-core
+  #       production-sokol
+  #       production-eth-experimental
+  #       production-eth-goerli
+  #       production-lukso
+  #       production-xdai
+  #       production-polygon-supernets
+  #       production-rsk
+  #       production-immutable
   #   steps:
   #   - uses: actions/checkout@v4
   #   - name: Set Git config

From 4d357babb943e26c5b1c359c62734c99ac8beca7 Mon Sep 17 00:00:00 2001
From: Viktor Baranov <baranov.viktor.27@gmail.com>
Date: Mon, 11 Dec 2023 20:18:10 +0300
Subject: [PATCH 755/909] Rename release workflow

---
 .github/workflows/{release-main.yml => release.yml} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename .github/workflows/{release-main.yml => release.yml} (99%)

diff --git a/.github/workflows/release-main.yml b/.github/workflows/release.yml
similarity index 99%
rename from .github/workflows/release-main.yml
rename to .github/workflows/release.yml
index c1cbdac6b8d9..9a16fba81e7a 100644
--- a/.github/workflows/release-main.yml
+++ b/.github/workflows/release.yml
@@ -3,7 +3,7 @@
 # separate terms of service, privacy policy, and support
 # documentation.
 
-name: Release main
+name: Release
 
 on:
   release:

From 956a06db419f9cd44bab46f0aaa5f3fa886c9e98 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 11 Dec 2023 18:05:59 +0000
Subject: [PATCH 756/909] Bump exvcr from 0.14.4 to 0.15.0

Bumps [exvcr](https://github.com/parroty/exvcr) from 0.14.4 to 0.15.0.
- [Release notes](https://github.com/parroty/exvcr/releases)
- [Changelog](https://github.com/parroty/exvcr/blob/master/CHANGELOG.md)
- [Commits](https://github.com/parroty/exvcr/commits)

---
updated-dependencies:
- dependency-name: exvcr
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 mix.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mix.lock b/mix.lock
index 2db07ac8ff34..cac33555ec65 100644
--- a/mix.lock
+++ b/mix.lock
@@ -57,7 +57,7 @@
   "exactor": {:hex, :exactor, "2.2.4", "5efb4ddeb2c48d9a1d7c9b465a6fffdd82300eb9618ece5d34c3334d5d7245b1", [:mix], [], "hexpm", "1222419f706e01bfa1095aec9acf6421367dcfab798a6f67c54cf784733cd6b5"},
   "exjsx": {:hex, :exjsx, "4.0.0", "60548841e0212df401e38e63c0078ec57b33e7ea49b032c796ccad8cde794b5c", [:mix], [{:jsx, "~> 2.8.0", [hex: :jsx, repo: "hexpm", optional: false]}], "hexpm", "32e95820a97cffea67830e91514a2ad53b888850442d6d395f53a1ac60c82e07"},
   "expo": {:hex, :expo, "0.5.1", "249e826a897cac48f591deba863b26c16682b43711dd15ee86b92f25eafd96d9", [:mix], [], "hexpm", "68a4233b0658a3d12ee00d27d37d856b1ba48607e7ce20fd376958d0ba6ce92b"},
-  "exvcr": {:hex, :exvcr, "0.14.4", "1aa5fe7d3f10b117251c158f8d28b39f7fc73d0a7628b2d0b75bf8cfb1111576", [:mix], [{:exactor, "~> 2.2", [hex: :exactor, repo: "hexpm", optional: false]}, {:exjsx, "~> 4.0", [hex: :exjsx, repo: "hexpm", optional: false]}, {:finch, "~> 0.16", [hex: :finch, repo: "hexpm", optional: true]}, {:httpoison, "~> 1.0 or ~> 2.0", [hex: :httpoison, repo: "hexpm", optional: true]}, {:httpotion, "~> 3.1", [hex: :httpotion, repo: "hexpm", optional: true]}, {:ibrowse, "4.4.0", [hex: :ibrowse, repo: "hexpm", optional: true]}, {:meck, "~> 0.8", [hex: :meck, repo: "hexpm", optional: false]}], "hexpm", "4e600568c02ed29d46bc2e2c74927d172ba06658aa8b14705c0207363c44cc94"},
+  "exvcr": {:hex, :exvcr, "0.15.0", "432a4f4b94494f996c96dd2b9b9d3306b70db269ddbdeb9e324a4371f62ce32d", [:mix], [{:exactor, "~> 2.2", [hex: :exactor, repo: "hexpm", optional: false]}, {:exjsx, "~> 4.0", [hex: :exjsx, repo: "hexpm", optional: false]}, {:finch, "~> 0.16", [hex: :finch, repo: "hexpm", optional: true]}, {:httpoison, "~> 1.0 or ~> 2.0", [hex: :httpoison, repo: "hexpm", optional: true]}, {:httpotion, "~> 3.1", [hex: :httpotion, repo: "hexpm", optional: true]}, {:ibrowse, "4.4.0", [hex: :ibrowse, repo: "hexpm", optional: true]}, {:meck, "~> 0.8", [hex: :meck, repo: "hexpm", optional: false]}], "hexpm", "8b7e451f5fd37d1dc1252d08e55291fcb80b55b00cfd84ea41bf64be23cb142c"},
   "file_info": {:hex, :file_info, "0.0.4", "2e0e77f211e833f38ead22cb29ce53761d457d80b3ffe0ffe0eb93880b0963b2", [:mix], [{:mimetype_parser, "~> 0.1.2", [hex: :mimetype_parser, repo: "hexpm", optional: false]}], "hexpm", "50e7ad01c2c8b9339010675fe4dc4a113b8d6ca7eddce24d1d74fd0e762781a5"},
   "file_system": {:hex, :file_system, "0.2.10", "fb082005a9cd1711c05b5248710f8826b02d7d1784e7c3451f9c1231d4fc162d", [:mix], [], "hexpm", "41195edbfb562a593726eda3b3e8b103a309b733ad25f3d642ba49696bf715dc"},
   "floki": {:hex, :floki, "0.35.2", "87f8c75ed8654b9635b311774308b2760b47e9a579dabf2e4d5f1e1d42c39e0b", [:mix], [], "hexpm", "6b05289a8e9eac475f644f09c2e4ba7e19201fd002b89c28c1293e7bd16773d9"},

From 1dd1ed4159dda7fb2c51be30c60bde4892cd9340 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 11 Dec 2023 18:10:55 +0000
Subject: [PATCH 757/909] Bump ex_doc from 0.30.9 to 0.31.0

Bumps [ex_doc](https://github.com/elixir-lang/ex_doc) from 0.30.9 to 0.31.0.
- [Release notes](https://github.com/elixir-lang/ex_doc/releases)
- [Changelog](https://github.com/elixir-lang/ex_doc/blob/main/CHANGELOG.md)
- [Commits](https://github.com/elixir-lang/ex_doc/compare/v0.30.9...v0.31.0)

---
updated-dependencies:
- dependency-name: ex_doc
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 mix.exs  | 2 +-
 mix.lock | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/mix.exs b/mix.exs
index 09f45065856d..61b159e2c407 100644
--- a/mix.exs
+++ b/mix.exs
@@ -96,7 +96,7 @@ defmodule BlockScout.Mixfile do
       {:absinthe_plug, git: "https://github.com/blockscout/absinthe_plug.git", tag: "1.5.3", override: true},
       {:tesla, "~> 1.8.0"},
       # Documentation
-      {:ex_doc, "~> 0.30.1", only: :dev, runtime: false},
+      {:ex_doc, "~> 0.31.0", only: :dev, runtime: false},
       {:number, "~> 1.0.3"}
     ]
   end
diff --git a/mix.lock b/mix.lock
index 2db07ac8ff34..d1a958b57105 100644
--- a/mix.lock
+++ b/mix.lock
@@ -36,7 +36,7 @@
   "deep_merge": {:hex, :deep_merge, "1.0.0", "b4aa1a0d1acac393bdf38b2291af38cb1d4a52806cf7a4906f718e1feb5ee961", [:mix], [], "hexpm", "ce708e5f094b9cd4e8f2be4f00d2f4250c4095be93f8cd6d018c753894885430"},
   "dialyxir": {:hex, :dialyxir, "1.4.1", "a22ed1e7bd3a3e3f197b68d806ef66acb61ee8f57b3ac85fc5d57354c5482a93", [:mix], [{:erlex, ">= 0.2.6", [hex: :erlex, repo: "hexpm", optional: false]}], "hexpm", "84b795d6d7796297cca5a3118444b80c7d94f7ce247d49886e7c291e1ae49801"},
   "digital_token": {:hex, :digital_token, "0.6.0", "13e6de581f0b1f6c686f7c7d12ab11a84a7b22fa79adeb4b50eec1a2d278d258", [:mix], [{:cldr_utils, "~> 2.17", [hex: :cldr_utils, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}], "hexpm", "2455d626e7c61a128b02a4a8caddb092548c3eb613ac6f6a85e4cbb6caddc4d1"},
-  "earmark_parser": {:hex, :earmark_parser, "1.4.37", "2ad73550e27c8946648b06905a57e4d454e4d7229c2dafa72a0348c99d8be5f7", [:mix], [], "hexpm", "6b19783f2802f039806f375610faa22da130b8edc21209d0bff47918bb48360e"},
+  "earmark_parser": {:hex, :earmark_parser, "1.4.39", "424642f8335b05bb9eb611aa1564c148a8ee35c9c8a8bba6e129d51a3e3c6769", [:mix], [], "hexpm", "06553a88d1f1846da9ef066b87b57c6f605552cfbe40d20bd8d59cc6bde41944"},
   "ecto": {:hex, :ecto, "3.11.0", "ff8614b4e70a774f9d39af809c426def80852048440e8785d93a6e91f48fec00", [:mix], [{:decimal, "~> 2.0", [hex: :decimal, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}, {:telemetry, "~> 0.4 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "7769dad267ef967310d6e988e92d772659b11b09a0c015f101ce0fff81ce1f81"},
   "ecto_sql": {:hex, :ecto_sql, "3.11.0", "c787b24b224942b69c9ff7ab9107f258ecdc68326be04815c6cce2941b6fad1c", [:mix], [{:db_connection, "~> 2.5 or ~> 2.4.1", [hex: :db_connection, repo: "hexpm", optional: false]}, {:ecto, "~> 3.11.0", [hex: :ecto, repo: "hexpm", optional: false]}, {:myxql, "~> 0.6.0", [hex: :myxql, repo: "hexpm", optional: true]}, {:postgrex, "~> 0.16.0 or ~> 0.17.0 or ~> 1.0", [hex: :postgrex, repo: "hexpm", optional: true]}, {:tds, "~> 2.1.1 or ~> 2.2", [hex: :tds, repo: "hexpm", optional: true]}, {:telemetry, "~> 0.4.0 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "77aa3677169f55c2714dda7352d563002d180eb33c0dc29cd36d39c0a1a971f5"},
   "elixir_make": {:hex, :elixir_make, "0.7.7", "7128c60c2476019ed978210c245badf08b03dbec4f24d05790ef791da11aa17c", [:mix], [{:castore, "~> 0.1 or ~> 1.0", [hex: :castore, repo: "hexpm", optional: true]}], "hexpm", "5bc19fff950fad52bbe5f211b12db9ec82c6b34a9647da0c2224b8b8464c7e6c"},
@@ -47,7 +47,7 @@
   "ex_cldr_lists": {:hex, :ex_cldr_lists, "2.10.2", "c8dbb3324ca35cea3679a96f4c774cdf4bdd425786a44c4f52aacb57a0cee446", [:mix], [{:ex_cldr_numbers, "~> 2.25", [hex: :ex_cldr_numbers, repo: "hexpm", optional: false]}, {:ex_doc, "~> 0.18", [hex: :ex_doc, repo: "hexpm", optional: true]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}], "hexpm", "0cc2124eccffa5438045c2504dd3365490b64065131f58ecc27f344db1edb4b8"},
   "ex_cldr_numbers": {:hex, :ex_cldr_numbers, "2.32.3", "b631ff94c982ec518e46bf4736000a30a33d6b58facc085d5f240305f512ad4a", [:mix], [{:decimal, "~> 1.6 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: false]}, {:digital_token, "~> 0.3 or ~> 1.0", [hex: :digital_token, repo: "hexpm", optional: false]}, {:ex_cldr, "~> 2.37", [hex: :ex_cldr, repo: "hexpm", optional: false]}, {:ex_cldr_currencies, ">= 2.14.2", [hex: :ex_cldr_currencies, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}], "hexpm", "7b626ff1e59a0ec9c3c5db5ce9ca91a6995e2ab56426b71f3cbf67181ea225f5"},
   "ex_cldr_units": {:hex, :ex_cldr_units, "3.16.4", "fee054e9ebed40ef05cbb405cb0c7e7c9fda201f8f03ec0d1e54e879af413246", [:mix], [{:cldr_utils, "~> 2.24", [hex: :cldr_utils, repo: "hexpm", optional: false]}, {:decimal, "~> 1.6 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: false]}, {:ex_cldr_lists, "~> 2.10", [hex: :ex_cldr_lists, repo: "hexpm", optional: false]}, {:ex_cldr_numbers, "~> 2.31", [hex: :ex_cldr_numbers, repo: "hexpm", optional: false]}, {:ex_doc, "~> 0.18", [hex: :ex_doc, repo: "hexpm", optional: true]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}], "hexpm", "7c15c6357dd555a5bc6c72fdeb243e4706a04065753dbd2f40150f062ca996c7"},
-  "ex_doc": {:hex, :ex_doc, "0.30.9", "d691453495c47434c0f2052b08dd91cc32bc4e1a218f86884563448ee2502dd2", [:mix], [{:earmark_parser, "~> 1.4.31", [hex: :earmark_parser, repo: "hexpm", optional: false]}, {:makeup_elixir, "~> 0.14", [hex: :makeup_elixir, repo: "hexpm", optional: false]}, {:makeup_erlang, "~> 0.1", [hex: :makeup_erlang, repo: "hexpm", optional: false]}], "hexpm", "d7aaaf21e95dc5cddabf89063327e96867d00013963eadf2c6ad135506a8bc10"},
+  "ex_doc": {:hex, :ex_doc, "0.31.0", "06eb1dfd787445d9cab9a45088405593dd3bb7fe99e097eaa71f37ba80c7a676", [:mix], [{:earmark_parser, "~> 1.4.39", [hex: :earmark_parser, repo: "hexpm", optional: false]}, {:makeup_c, ">= 0.1.1", [hex: :makeup_c, repo: "hexpm", optional: true]}, {:makeup_elixir, "~> 0.14", [hex: :makeup_elixir, repo: "hexpm", optional: false]}, {:makeup_erlang, "~> 0.1", [hex: :makeup_erlang, repo: "hexpm", optional: false]}], "hexpm", "5350cafa6b7f77bdd107aa2199fe277acf29d739aba5aee7e865fc680c62a110"},
   "ex_json_schema": {:hex, :ex_json_schema, "0.10.2", "7c4b8c1481fdeb1741e2ce66223976edfb9bccebc8014f6aec35d4efe964fb71", [:mix], [{:decimal, "~> 2.0", [hex: :decimal, repo: "hexpm", optional: false]}], "hexpm", "37f43be60f8407659d4d0155a7e45e7f406dab1f827051d3d35858a709baf6a6"},
   "ex_keccak": {:hex, :ex_keccak, "0.7.3", "33298f97159f6b0acd28f6e96ce5ea975a0f4a19f85fe615b4f4579b88b24d06", [:mix], [{:rustler, ">= 0.0.0", [hex: :rustler, repo: "hexpm", optional: true]}, {:rustler_precompiled, "~> 0.6.1", [hex: :rustler_precompiled, repo: "hexpm", optional: false]}], "hexpm", "4c5e6d9d5f77b64ab48769a0166a9814180d40ced68ed74ce60a5174ab55b3fc"},
   "ex_machina": {:hex, :ex_machina, "2.7.0", "b792cc3127fd0680fecdb6299235b4727a4944a09ff0fa904cc639272cd92dc7", [:mix], [{:ecto, "~> 2.2 or ~> 3.0", [hex: :ecto, repo: "hexpm", optional: true]}, {:ecto_sql, "~> 3.0", [hex: :ecto_sql, repo: "hexpm", optional: true]}], "hexpm", "419aa7a39bde11894c87a615c4ecaa52d8f107bbdd81d810465186f783245bf8"},
@@ -76,9 +76,9 @@
   "junit_formatter": {:hex, :junit_formatter, "3.3.1", "c729befb848f1b9571f317d2fefa648e9d4869befc4b2980daca7c1edc468e40", [:mix], [], "hexpm", "761fc5be4b4c15d8ba91a6dafde0b2c2ae6db9da7b8832a55b5a1deb524da72b"},
   "logger_file_backend": {:hex, :logger_file_backend, "0.0.13", "df07b14970e9ac1f57362985d76e6f24e3e1ab05c248055b7d223976881977c2", [:mix], [], "hexpm", "71a453a7e6e899ae4549fb147b1c6621f4233f8f48f58ca10a64ec67b6c50018"},
   "logger_json": {:hex, :logger_json, "5.1.2", "7dde5f6dff814aba033f045a3af9408f5459bac72357dc533276b47045371ecf", [:mix], [{:ecto, "~> 2.1 or ~> 3.0", [hex: :ecto, repo: "hexpm", optional: true]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: false]}, {:phoenix, ">= 1.5.0", [hex: :phoenix, repo: "hexpm", optional: true]}, {:plug, "~> 1.0", [hex: :plug, repo: "hexpm", optional: true]}, {:telemetry, "~> 0.4.0 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: true]}], "hexpm", "ed42047e5c57a60d0fa1450aef36bc016d0f9a5e6c0807ebb0c03d8895fb6ebc"},
-  "makeup": {:hex, :makeup, "1.1.0", "6b67c8bc2882a6b6a445859952a602afc1a41c2e08379ca057c0f525366fc3ca", [:mix], [{:nimble_parsec, "~> 1.2.2 or ~> 1.3", [hex: :nimble_parsec, repo: "hexpm", optional: false]}], "hexpm", "0a45ed501f4a8897f580eabf99a2e5234ea3e75a4373c8a52824f6e873be57a6"},
+  "makeup": {:hex, :makeup, "1.1.1", "fa0bc768698053b2b3869fa8a62616501ff9d11a562f3ce39580d60860c3a55e", [:mix], [{:nimble_parsec, "~> 1.2.2 or ~> 1.3", [hex: :nimble_parsec, repo: "hexpm", optional: false]}], "hexpm", "5dc62fbdd0de44de194898b6710692490be74baa02d9d108bc29f007783b0b48"},
   "makeup_elixir": {:hex, :makeup_elixir, "0.16.1", "cc9e3ca312f1cfeccc572b37a09980287e243648108384b97ff2b76e505c3555", [:mix], [{:makeup, "~> 1.0", [hex: :makeup, repo: "hexpm", optional: false]}, {:nimble_parsec, "~> 1.2.3 or ~> 1.3", [hex: :nimble_parsec, repo: "hexpm", optional: false]}], "hexpm", "e127a341ad1b209bd80f7bd1620a15693a9908ed780c3b763bccf7d200c767c6"},
-  "makeup_erlang": {:hex, :makeup_erlang, "0.1.2", "ad87296a092a46e03b7e9b0be7631ddcf64c790fa68a9ef5323b6cbb36affc72", [:mix], [{:makeup, "~> 1.0", [hex: :makeup, repo: "hexpm", optional: false]}], "hexpm", "f3f5a1ca93ce6e092d92b6d9c049bcda58a3b617a8d888f8e7231c85630e8108"},
+  "makeup_erlang": {:hex, :makeup_erlang, "0.1.3", "d684f4bac8690e70b06eb52dad65d26de2eefa44cd19d64a8095e1417df7c8fd", [:mix], [{:makeup, "~> 1.0", [hex: :makeup, repo: "hexpm", optional: false]}], "hexpm", "b78dc853d2e670ff6390b605d807263bf606da3c82be37f9d7f68635bd886fc9"},
   "math": {:hex, :math, "0.7.0", "12af548c3892abf939a2e242216c3e7cbfb65b9b2fe0d872d05c6fb609f8127b", [:mix], [], "hexpm", "7987af97a0c6b58ad9db43eb5252a49fc1dfe1f6d98f17da9282e297f594ebc2"},
   "meck": {:hex, :meck, "0.9.2", "85ccbab053f1db86c7ca240e9fc718170ee5bda03810a6292b5306bf31bae5f5", [:rebar3], [], "hexpm", "81344f561357dc40a8344afa53767c32669153355b626ea9fcbc8da6b3045826"},
   "memento": {:hex, :memento, "0.3.2", "38cfc8ff9bcb1adff7cbd0f3b78a762636b86dff764729d1c82d0464c539bdd0", [:mix], [], "hexpm", "25cf691a98a0cb70262f4a7543c04bab24648cb2041d937eb64154a8d6f8012b"},

From 1677d230d55d237b82742f733afd03306b0ede5c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 11 Dec 2023 19:00:31 +0000
Subject: [PATCH 758/909] Bump chart.js from 4.4.0 to 4.4.1 in
 /apps/block_scout_web/assets

Bumps [chart.js](https://github.com/chartjs/Chart.js) from 4.4.0 to 4.4.1.
- [Release notes](https://github.com/chartjs/Chart.js/releases)
- [Commits](https://github.com/chartjs/Chart.js/compare/v4.4.0...v4.4.1)

---
updated-dependencies:
- dependency-name: chart.js
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 apps/block_scout_web/assets/package-lock.json | 14 +++++++-------
 apps/block_scout_web/assets/package.json      |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/apps/block_scout_web/assets/package-lock.json b/apps/block_scout_web/assets/package-lock.json
index a9ef2b466abb..45c902f1a8ef 100644
--- a/apps/block_scout_web/assets/package-lock.json
+++ b/apps/block_scout_web/assets/package-lock.json
@@ -14,7 +14,7 @@
         "assert": "^2.1.0",
         "bignumber.js": "^9.1.2",
         "bootstrap": "^4.6.0",
-        "chart.js": "^4.4.0",
+        "chart.js": "^4.4.1",
         "chartjs-adapter-luxon": "^1.3.1",
         "clipboard": "^2.0.11",
         "core-js": "^3.33.3",
@@ -5558,9 +5558,9 @@
       }
     },
     "node_modules/chart.js": {
-      "version": "4.4.0",
-      "resolved": "https://registry.npmjs.org/chart.js/-/chart.js-4.4.0.tgz",
-      "integrity": "sha512-vQEj6d+z0dcsKLlQvbKIMYFHd3t8W/7L2vfJIbYcfyPcRx92CsHqECpueN8qVGNlKyDcr5wBrYAYKnfu/9Q1hQ==",
+      "version": "4.4.1",
+      "resolved": "https://registry.npmjs.org/chart.js/-/chart.js-4.4.1.tgz",
+      "integrity": "sha512-C74QN1bxwV1v2PEujhmKjOZ7iUM4w6BWs23Md/6aOZZSlwMzeCIDGuZay++rBgChYru7/+QFeoQW0fQoP534Dg==",
       "dependencies": {
         "@kurkle/color": "^0.3.0"
       },
@@ -21918,9 +21918,9 @@
       "dev": true
     },
     "chart.js": {
-      "version": "4.4.0",
-      "resolved": "https://registry.npmjs.org/chart.js/-/chart.js-4.4.0.tgz",
-      "integrity": "sha512-vQEj6d+z0dcsKLlQvbKIMYFHd3t8W/7L2vfJIbYcfyPcRx92CsHqECpueN8qVGNlKyDcr5wBrYAYKnfu/9Q1hQ==",
+      "version": "4.4.1",
+      "resolved": "https://registry.npmjs.org/chart.js/-/chart.js-4.4.1.tgz",
+      "integrity": "sha512-C74QN1bxwV1v2PEujhmKjOZ7iUM4w6BWs23Md/6aOZZSlwMzeCIDGuZay++rBgChYru7/+QFeoQW0fQoP534Dg==",
       "requires": {
         "@kurkle/color": "^0.3.0"
       }
diff --git a/apps/block_scout_web/assets/package.json b/apps/block_scout_web/assets/package.json
index d1833ae14e01..96c08a681427 100644
--- a/apps/block_scout_web/assets/package.json
+++ b/apps/block_scout_web/assets/package.json
@@ -26,7 +26,7 @@
     "assert": "^2.1.0",
     "bignumber.js": "^9.1.2",
     "bootstrap": "^4.6.0",
-    "chart.js": "^4.4.0",
+    "chart.js": "^4.4.1",
     "chartjs-adapter-luxon": "^1.3.1",
     "clipboard": "^2.0.11",
     "core-js": "^3.33.3",

From 2a7917ed9e6d95f6907bc40b12e89382803522d3 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 11 Dec 2023 19:00:49 +0000
Subject: [PATCH 759/909] Bump @babel/preset-env in
 /apps/block_scout_web/assets

Bumps [@babel/preset-env](https://github.com/babel/babel/tree/HEAD/packages/babel-preset-env) from 7.23.5 to 7.23.6.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/commits/v7.23.6/packages/babel-preset-env)

---
updated-dependencies:
- dependency-name: "@babel/preset-env"
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 apps/block_scout_web/assets/package-lock.json | 124 +++++++++---------
 apps/block_scout_web/assets/package.json      |   2 +-
 2 files changed, 64 insertions(+), 62 deletions(-)

diff --git a/apps/block_scout_web/assets/package-lock.json b/apps/block_scout_web/assets/package-lock.json
index a9ef2b466abb..867394405d7a 100644
--- a/apps/block_scout_web/assets/package-lock.json
+++ b/apps/block_scout_web/assets/package-lock.json
@@ -72,7 +72,7 @@
       },
       "devDependencies": {
         "@babel/core": "^7.23.5",
-        "@babel/preset-env": "^7.23.5",
+        "@babel/preset-env": "^7.23.6",
         "autoprefixer": "^10.4.16",
         "babel-loader": "^9.1.3",
         "copy-webpack-plugin": "^11.0.0",
@@ -320,13 +320,13 @@
       }
     },
     "node_modules/@babel/helper-compilation-targets": {
-      "version": "7.22.15",
-      "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.22.15.tgz",
-      "integrity": "sha512-y6EEzULok0Qvz8yyLkCvVX+02ic+By2UdOhylwUOvOn9dvYc9mKICJuuU1n1XBI02YWsNsnrY1kc6DVbjcXbtw==",
+      "version": "7.23.6",
+      "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.23.6.tgz",
+      "integrity": "sha512-9JB548GZoQVmzrFgp8o7KxdgkTGm6xs9DW0o/Pim72UDjzr5ObUQ6ZzYPqA+g9OTS2bBQoctLJrky0RDCAWRgQ==",
       "dependencies": {
-        "@babel/compat-data": "^7.22.9",
-        "@babel/helper-validator-option": "^7.22.15",
-        "browserslist": "^4.21.9",
+        "@babel/compat-data": "^7.23.5",
+        "@babel/helper-validator-option": "^7.23.5",
+        "browserslist": "^4.22.2",
         "lru-cache": "^5.1.1",
         "semver": "^6.3.1"
       },
@@ -1222,12 +1222,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-for-of": {
-      "version": "7.23.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.23.3.tgz",
-      "integrity": "sha512-X8jSm8X1CMwxmK878qsUGJRmbysKNbdpTv/O1/v0LuY/ZkZrng5WYiekYSdg9m09OTmDDUWeEDsTE+17WYbAZw==",
+      "version": "7.23.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.23.6.tgz",
+      "integrity": "sha512-aYH4ytZ0qSuBbpfhuofbg/e96oQ7U2w1Aw/UQmKT+1l39uEhUPoFS3fHevDc1G0OvewyDudfMKY1OulczHzWIw==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.22.5"
+        "@babel/helper-plugin-utils": "^7.22.5",
+        "@babel/helper-skip-transparent-expression-wrappers": "^7.22.5"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1779,13 +1780,13 @@
       }
     },
     "node_modules/@babel/preset-env": {
-      "version": "7.23.5",
-      "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.23.5.tgz",
-      "integrity": "sha512-0d/uxVD6tFGWXGDSfyMD1p2otoaKmu6+GD+NfAx0tMaH+dxORnp7T9TaVQ6mKyya7iBtCIVxHjWT7MuzzM9z+A==",
+      "version": "7.23.6",
+      "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.23.6.tgz",
+      "integrity": "sha512-2XPn/BqKkZCpzYhUUNZ1ssXw7DcXfKQEjv/uXZUXgaebCMYmkEsfZ2yY+vv+xtXv50WmL5SGhyB6/xsWxIvvOQ==",
       "dev": true,
       "dependencies": {
         "@babel/compat-data": "^7.23.5",
-        "@babel/helper-compilation-targets": "^7.22.15",
+        "@babel/helper-compilation-targets": "^7.23.6",
         "@babel/helper-plugin-utils": "^7.22.5",
         "@babel/helper-validator-option": "^7.23.5",
         "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": "^7.23.3",
@@ -1825,7 +1826,7 @@
         "@babel/plugin-transform-dynamic-import": "^7.23.4",
         "@babel/plugin-transform-exponentiation-operator": "^7.23.3",
         "@babel/plugin-transform-export-namespace-from": "^7.23.4",
-        "@babel/plugin-transform-for-of": "^7.23.3",
+        "@babel/plugin-transform-for-of": "^7.23.6",
         "@babel/plugin-transform-function-name": "^7.23.3",
         "@babel/plugin-transform-json-strings": "^7.23.4",
         "@babel/plugin-transform-literals": "^7.23.3",
@@ -5225,9 +5226,9 @@
       ]
     },
     "node_modules/browserslist": {
-      "version": "4.22.1",
-      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.22.1.tgz",
-      "integrity": "sha512-FEVc202+2iuClEhZhrWy6ZiAcRLvNMyYcxZ8raemul1DYVOVdFsbqckWLdsixQZCpJlwe77Z3UTalE7jsjnKfQ==",
+      "version": "4.22.2",
+      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.22.2.tgz",
+      "integrity": "sha512-0UgcrvQmBDvZHFGdYUehrCNIazki7/lUP3kkoi/r3YB2amZbFM9J43ZRkJTXBUZK4gmx56+Sqk9+Vs9mwZx9+A==",
       "funding": [
         {
           "type": "opencollective",
@@ -5243,9 +5244,9 @@
         }
       ],
       "dependencies": {
-        "caniuse-lite": "^1.0.30001541",
-        "electron-to-chromium": "^1.4.535",
-        "node-releases": "^2.0.13",
+        "caniuse-lite": "^1.0.30001565",
+        "electron-to-chromium": "^1.4.601",
+        "node-releases": "^2.0.14",
         "update-browserslist-db": "^1.0.13"
       },
       "bin": {
@@ -5496,9 +5497,9 @@
       }
     },
     "node_modules/caniuse-lite": {
-      "version": "1.0.30001549",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001549.tgz",
-      "integrity": "sha512-qRp48dPYSCYaP+KurZLhDYdVE+yEyht/3NlmcJgVQ2VMGt6JL36ndQ/7rgspdZsJuxDPFIo/OzBT2+GmIJ53BA==",
+      "version": "1.0.30001568",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001568.tgz",
+      "integrity": "sha512-vSUkH84HontZJ88MiNrOau1EBrCqEQYgkC5gIySiDlpsm8sGVrhU7Kx4V6h0tnqaHzIHZv08HlJIwPbL4XL9+A==",
       "funding": [
         {
           "type": "opencollective",
@@ -6919,9 +6920,9 @@
       "integrity": "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow=="
     },
     "node_modules/electron-to-chromium": {
-      "version": "1.4.555",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.555.tgz",
-      "integrity": "sha512-k1wGC7UXDTyCWcONkEMRG/w6Jvrxi+SVEU+IeqUKUKjv2lGJ1b+jf1mqrloyxVTG5WYYjNQ+F6+Cb1fGrLvNcA=="
+      "version": "1.4.609",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.609.tgz",
+      "integrity": "sha512-ihiCP7PJmjoGNuLpl7TjNA8pCQWu09vGyjlPYw1Rqww4gvNuCcmvl+44G+2QyJ6S2K4o+wbTS++Xz0YN8Q9ERw=="
     },
     "node_modules/elliptic": {
       "version": "6.5.4",
@@ -13093,9 +13094,9 @@
       "dev": true
     },
     "node_modules/node-releases": {
-      "version": "2.0.13",
-      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.13.tgz",
-      "integrity": "sha512-uYr7J37ae/ORWdZeQ1xxMJe3NtdmqMC/JZK+geofDrkLUApKRHPd18/TxtBOJ4A0/+uUIliorNrfYV6s1b02eQ=="
+      "version": "2.0.14",
+      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.14.tgz",
+      "integrity": "sha512-y10wOWt8yZpqXmOgRo77WaHEmhYQYGNA6y421PKsKYWEK8aW+cqAphborZDhqfyKrbZEN92CN1X2KbafY2s7Yw=="
     },
     "node_modules/normalize-path": {
       "version": "3.0.0",
@@ -18041,13 +18042,13 @@
       }
     },
     "@babel/helper-compilation-targets": {
-      "version": "7.22.15",
-      "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.22.15.tgz",
-      "integrity": "sha512-y6EEzULok0Qvz8yyLkCvVX+02ic+By2UdOhylwUOvOn9dvYc9mKICJuuU1n1XBI02YWsNsnrY1kc6DVbjcXbtw==",
+      "version": "7.23.6",
+      "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.23.6.tgz",
+      "integrity": "sha512-9JB548GZoQVmzrFgp8o7KxdgkTGm6xs9DW0o/Pim72UDjzr5ObUQ6ZzYPqA+g9OTS2bBQoctLJrky0RDCAWRgQ==",
       "requires": {
-        "@babel/compat-data": "^7.22.9",
-        "@babel/helper-validator-option": "^7.22.15",
-        "browserslist": "^4.21.9",
+        "@babel/compat-data": "^7.23.5",
+        "@babel/helper-validator-option": "^7.23.5",
+        "browserslist": "^4.22.2",
         "lru-cache": "^5.1.1",
         "semver": "^6.3.1"
       },
@@ -18655,12 +18656,13 @@
       }
     },
     "@babel/plugin-transform-for-of": {
-      "version": "7.23.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.23.3.tgz",
-      "integrity": "sha512-X8jSm8X1CMwxmK878qsUGJRmbysKNbdpTv/O1/v0LuY/ZkZrng5WYiekYSdg9m09OTmDDUWeEDsTE+17WYbAZw==",
+      "version": "7.23.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.23.6.tgz",
+      "integrity": "sha512-aYH4ytZ0qSuBbpfhuofbg/e96oQ7U2w1Aw/UQmKT+1l39uEhUPoFS3fHevDc1G0OvewyDudfMKY1OulczHzWIw==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.22.5"
+        "@babel/helper-plugin-utils": "^7.22.5",
+        "@babel/helper-skip-transparent-expression-wrappers": "^7.22.5"
       }
     },
     "@babel/plugin-transform-function-name": {
@@ -19007,13 +19009,13 @@
       }
     },
     "@babel/preset-env": {
-      "version": "7.23.5",
-      "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.23.5.tgz",
-      "integrity": "sha512-0d/uxVD6tFGWXGDSfyMD1p2otoaKmu6+GD+NfAx0tMaH+dxORnp7T9TaVQ6mKyya7iBtCIVxHjWT7MuzzM9z+A==",
+      "version": "7.23.6",
+      "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.23.6.tgz",
+      "integrity": "sha512-2XPn/BqKkZCpzYhUUNZ1ssXw7DcXfKQEjv/uXZUXgaebCMYmkEsfZ2yY+vv+xtXv50WmL5SGhyB6/xsWxIvvOQ==",
       "dev": true,
       "requires": {
         "@babel/compat-data": "^7.23.5",
-        "@babel/helper-compilation-targets": "^7.22.15",
+        "@babel/helper-compilation-targets": "^7.23.6",
         "@babel/helper-plugin-utils": "^7.22.5",
         "@babel/helper-validator-option": "^7.23.5",
         "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": "^7.23.3",
@@ -19053,7 +19055,7 @@
         "@babel/plugin-transform-dynamic-import": "^7.23.4",
         "@babel/plugin-transform-exponentiation-operator": "^7.23.3",
         "@babel/plugin-transform-export-namespace-from": "^7.23.4",
-        "@babel/plugin-transform-for-of": "^7.23.3",
+        "@babel/plugin-transform-for-of": "^7.23.6",
         "@babel/plugin-transform-function-name": "^7.23.3",
         "@babel/plugin-transform-json-strings": "^7.23.4",
         "@babel/plugin-transform-literals": "^7.23.3",
@@ -21681,13 +21683,13 @@
       }
     },
     "browserslist": {
-      "version": "4.22.1",
-      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.22.1.tgz",
-      "integrity": "sha512-FEVc202+2iuClEhZhrWy6ZiAcRLvNMyYcxZ8raemul1DYVOVdFsbqckWLdsixQZCpJlwe77Z3UTalE7jsjnKfQ==",
+      "version": "4.22.2",
+      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.22.2.tgz",
+      "integrity": "sha512-0UgcrvQmBDvZHFGdYUehrCNIazki7/lUP3kkoi/r3YB2amZbFM9J43ZRkJTXBUZK4gmx56+Sqk9+Vs9mwZx9+A==",
       "requires": {
-        "caniuse-lite": "^1.0.30001541",
-        "electron-to-chromium": "^1.4.535",
-        "node-releases": "^2.0.13",
+        "caniuse-lite": "^1.0.30001565",
+        "electron-to-chromium": "^1.4.601",
+        "node-releases": "^2.0.14",
         "update-browserslist-db": "^1.0.13"
       }
     },
@@ -21879,9 +21881,9 @@
       }
     },
     "caniuse-lite": {
-      "version": "1.0.30001549",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001549.tgz",
-      "integrity": "sha512-qRp48dPYSCYaP+KurZLhDYdVE+yEyht/3NlmcJgVQ2VMGt6JL36ndQ/7rgspdZsJuxDPFIo/OzBT2+GmIJ53BA=="
+      "version": "1.0.30001568",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001568.tgz",
+      "integrity": "sha512-vSUkH84HontZJ88MiNrOau1EBrCqEQYgkC5gIySiDlpsm8sGVrhU7Kx4V6h0tnqaHzIHZv08HlJIwPbL4XL9+A=="
     },
     "caseless": {
       "version": "0.12.0",
@@ -22940,9 +22942,9 @@
       "integrity": "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow=="
     },
     "electron-to-chromium": {
-      "version": "1.4.555",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.555.tgz",
-      "integrity": "sha512-k1wGC7UXDTyCWcONkEMRG/w6Jvrxi+SVEU+IeqUKUKjv2lGJ1b+jf1mqrloyxVTG5WYYjNQ+F6+Cb1fGrLvNcA=="
+      "version": "1.4.609",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.609.tgz",
+      "integrity": "sha512-ihiCP7PJmjoGNuLpl7TjNA8pCQWu09vGyjlPYw1Rqww4gvNuCcmvl+44G+2QyJ6S2K4o+wbTS++Xz0YN8Q9ERw=="
     },
     "elliptic": {
       "version": "6.5.4",
@@ -27751,9 +27753,9 @@
       "dev": true
     },
     "node-releases": {
-      "version": "2.0.13",
-      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.13.tgz",
-      "integrity": "sha512-uYr7J37ae/ORWdZeQ1xxMJe3NtdmqMC/JZK+geofDrkLUApKRHPd18/TxtBOJ4A0/+uUIliorNrfYV6s1b02eQ=="
+      "version": "2.0.14",
+      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.14.tgz",
+      "integrity": "sha512-y10wOWt8yZpqXmOgRo77WaHEmhYQYGNA6y421PKsKYWEK8aW+cqAphborZDhqfyKrbZEN92CN1X2KbafY2s7Yw=="
     },
     "normalize-path": {
       "version": "3.0.0",
diff --git a/apps/block_scout_web/assets/package.json b/apps/block_scout_web/assets/package.json
index d1833ae14e01..698ba1c22498 100644
--- a/apps/block_scout_web/assets/package.json
+++ b/apps/block_scout_web/assets/package.json
@@ -84,7 +84,7 @@
   },
   "devDependencies": {
     "@babel/core": "^7.23.5",
-    "@babel/preset-env": "^7.23.5",
+    "@babel/preset-env": "^7.23.6",
     "autoprefixer": "^10.4.16",
     "babel-loader": "^9.1.3",
     "copy-webpack-plugin": "^11.0.0",

From d188dc612af50c65061305c6624a473d6c1f29cd Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 11 Dec 2023 19:22:38 +0000
Subject: [PATCH 760/909] Bump core-js from 3.33.3 to 3.34.0 in
 /apps/block_scout_web/assets

Bumps [core-js](https://github.com/zloirock/core-js/tree/HEAD/packages/core-js) from 3.33.3 to 3.34.0.
- [Release notes](https://github.com/zloirock/core-js/releases)
- [Changelog](https://github.com/zloirock/core-js/blob/master/CHANGELOG.md)
- [Commits](https://github.com/zloirock/core-js/commits/v3.34.0/packages/core-js)

---
updated-dependencies:
- dependency-name: core-js
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 apps/block_scout_web/assets/package-lock.json | 14 +++++++-------
 apps/block_scout_web/assets/package.json      |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/apps/block_scout_web/assets/package-lock.json b/apps/block_scout_web/assets/package-lock.json
index 45c902f1a8ef..ad1ec14c2c66 100644
--- a/apps/block_scout_web/assets/package-lock.json
+++ b/apps/block_scout_web/assets/package-lock.json
@@ -17,7 +17,7 @@
         "chart.js": "^4.4.1",
         "chartjs-adapter-luxon": "^1.3.1",
         "clipboard": "^2.0.11",
-        "core-js": "^3.33.3",
+        "core-js": "^3.34.0",
         "crypto-browserify": "^3.12.0",
         "dropzone": "^5.9.3",
         "eth-net-props": "^1.0.41",
@@ -5937,9 +5937,9 @@
       }
     },
     "node_modules/core-js": {
-      "version": "3.33.3",
-      "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.33.3.tgz",
-      "integrity": "sha512-lo0kOocUlLKmm6kv/FswQL8zbkH7mVsLJ/FULClOhv8WRVmKLVcs6XPNQAzstfeJTCHMyButEwG+z1kHxHoDZw==",
+      "version": "3.34.0",
+      "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.34.0.tgz",
+      "integrity": "sha512-aDdvlDder8QmY91H88GzNi9EtQi2TjvQhpCX6B1v/dAZHU1AuLgHvRh54RiOerpEhEW46Tkf+vgAViB/CWC0ag==",
       "hasInstallScript": true,
       "funding": {
         "type": "opencollective",
@@ -22216,9 +22216,9 @@
       }
     },
     "core-js": {
-      "version": "3.33.3",
-      "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.33.3.tgz",
-      "integrity": "sha512-lo0kOocUlLKmm6kv/FswQL8zbkH7mVsLJ/FULClOhv8WRVmKLVcs6XPNQAzstfeJTCHMyButEwG+z1kHxHoDZw=="
+      "version": "3.34.0",
+      "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.34.0.tgz",
+      "integrity": "sha512-aDdvlDder8QmY91H88GzNi9EtQi2TjvQhpCX6B1v/dAZHU1AuLgHvRh54RiOerpEhEW46Tkf+vgAViB/CWC0ag=="
     },
     "core-js-compat": {
       "version": "3.33.0",
diff --git a/apps/block_scout_web/assets/package.json b/apps/block_scout_web/assets/package.json
index 96c08a681427..522efb716ca1 100644
--- a/apps/block_scout_web/assets/package.json
+++ b/apps/block_scout_web/assets/package.json
@@ -29,7 +29,7 @@
     "chart.js": "^4.4.1",
     "chartjs-adapter-luxon": "^1.3.1",
     "clipboard": "^2.0.11",
-    "core-js": "^3.33.3",
+    "core-js": "^3.34.0",
     "crypto-browserify": "^3.12.0",
     "dropzone": "^5.9.3",
     "eth-net-props": "^1.0.41",

From aa3b3620728716394b2bfff9691b4546b5f21ebd Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 11 Dec 2023 19:24:40 +0000
Subject: [PATCH 761/909] Bump ecto_sql from 3.11.0 to 3.11.1

Bumps [ecto_sql](https://github.com/elixir-ecto/ecto_sql) from 3.11.0 to 3.11.1.
- [Changelog](https://github.com/elixir-ecto/ecto_sql/blob/master/CHANGELOG.md)
- [Commits](https://github.com/elixir-ecto/ecto_sql/compare/v3.11.0...v3.11.1)

---
updated-dependencies:
- dependency-name: ecto_sql
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 mix.lock | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/mix.lock b/mix.lock
index d1a958b57105..168c70a64ebb 100644
--- a/mix.lock
+++ b/mix.lock
@@ -37,8 +37,8 @@
   "dialyxir": {:hex, :dialyxir, "1.4.1", "a22ed1e7bd3a3e3f197b68d806ef66acb61ee8f57b3ac85fc5d57354c5482a93", [:mix], [{:erlex, ">= 0.2.6", [hex: :erlex, repo: "hexpm", optional: false]}], "hexpm", "84b795d6d7796297cca5a3118444b80c7d94f7ce247d49886e7c291e1ae49801"},
   "digital_token": {:hex, :digital_token, "0.6.0", "13e6de581f0b1f6c686f7c7d12ab11a84a7b22fa79adeb4b50eec1a2d278d258", [:mix], [{:cldr_utils, "~> 2.17", [hex: :cldr_utils, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}], "hexpm", "2455d626e7c61a128b02a4a8caddb092548c3eb613ac6f6a85e4cbb6caddc4d1"},
   "earmark_parser": {:hex, :earmark_parser, "1.4.39", "424642f8335b05bb9eb611aa1564c148a8ee35c9c8a8bba6e129d51a3e3c6769", [:mix], [], "hexpm", "06553a88d1f1846da9ef066b87b57c6f605552cfbe40d20bd8d59cc6bde41944"},
-  "ecto": {:hex, :ecto, "3.11.0", "ff8614b4e70a774f9d39af809c426def80852048440e8785d93a6e91f48fec00", [:mix], [{:decimal, "~> 2.0", [hex: :decimal, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}, {:telemetry, "~> 0.4 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "7769dad267ef967310d6e988e92d772659b11b09a0c015f101ce0fff81ce1f81"},
-  "ecto_sql": {:hex, :ecto_sql, "3.11.0", "c787b24b224942b69c9ff7ab9107f258ecdc68326be04815c6cce2941b6fad1c", [:mix], [{:db_connection, "~> 2.5 or ~> 2.4.1", [hex: :db_connection, repo: "hexpm", optional: false]}, {:ecto, "~> 3.11.0", [hex: :ecto, repo: "hexpm", optional: false]}, {:myxql, "~> 0.6.0", [hex: :myxql, repo: "hexpm", optional: true]}, {:postgrex, "~> 0.16.0 or ~> 0.17.0 or ~> 1.0", [hex: :postgrex, repo: "hexpm", optional: true]}, {:tds, "~> 2.1.1 or ~> 2.2", [hex: :tds, repo: "hexpm", optional: true]}, {:telemetry, "~> 0.4.0 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "77aa3677169f55c2714dda7352d563002d180eb33c0dc29cd36d39c0a1a971f5"},
+  "ecto": {:hex, :ecto, "3.11.1", "4b4972b717e7ca83d30121b12998f5fcdc62ba0ed4f20fd390f16f3270d85c3e", [:mix], [{:decimal, "~> 2.0", [hex: :decimal, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}, {:telemetry, "~> 0.4 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "ebd3d3772cd0dfcd8d772659e41ed527c28b2a8bde4b00fe03e0463da0f1983b"},
+  "ecto_sql": {:hex, :ecto_sql, "3.11.1", "e9abf28ae27ef3916b43545f9578b4750956ccea444853606472089e7d169470", [:mix], [{:db_connection, "~> 2.5 or ~> 2.4.1", [hex: :db_connection, repo: "hexpm", optional: false]}, {:ecto, "~> 3.11.0", [hex: :ecto, repo: "hexpm", optional: false]}, {:myxql, "~> 0.6.0", [hex: :myxql, repo: "hexpm", optional: true]}, {:postgrex, "~> 0.16.0 or ~> 0.17.0 or ~> 1.0", [hex: :postgrex, repo: "hexpm", optional: true]}, {:tds, "~> 2.1.1 or ~> 2.2", [hex: :tds, repo: "hexpm", optional: true]}, {:telemetry, "~> 0.4.0 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "ce14063ab3514424276e7e360108ad6c2308f6d88164a076aac8a387e1fea634"},
   "elixir_make": {:hex, :elixir_make, "0.7.7", "7128c60c2476019ed978210c245badf08b03dbec4f24d05790ef791da11aa17c", [:mix], [{:castore, "~> 0.1 or ~> 1.0", [hex: :castore, repo: "hexpm", optional: true]}], "hexpm", "5bc19fff950fad52bbe5f211b12db9ec82c6b34a9647da0c2224b8b8464c7e6c"},
   "erlex": {:hex, :erlex, "0.2.6", "c7987d15e899c7a2f34f5420d2a2ea0d659682c06ac607572df55a43753aa12e", [:mix], [], "hexpm", "2ed2e25711feb44d52b17d2780eabf998452f6efda104877a3881c2f8c0c0c75"},
   "ex_abi": {:hex, :ex_abi, "0.6.4", "f722a38298f176dab511cf94627b2815282669255bc2eb834674f23ca71f5cfb", [:mix], [{:ex_keccak, "~> 0.7.3", [hex: :ex_keccak, repo: "hexpm", optional: false]}, {:jason, "~> 1.4", [hex: :jason, repo: "hexpm", optional: false]}], "hexpm", "07eaf39b70dd3beac1286c10368d27091a9a64844830eb26a38f1c8d8b19dfbb"},

From 601eb3ea901dc7bdb6d0c5e1c0e04b42f7e42fbd Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 12 Dec 2023 08:41:48 +0000
Subject: [PATCH 762/909] Bump @babel/core from 7.23.5 to 7.23.6 in
 /apps/block_scout_web/assets

Bumps [@babel/core](https://github.com/babel/babel/tree/HEAD/packages/babel-core) from 7.23.5 to 7.23.6.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/commits/v7.23.6/packages/babel-core)

---
updated-dependencies:
- dependency-name: "@babel/core"
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 apps/block_scout_web/assets/package-lock.json | 126 +++++++++---------
 apps/block_scout_web/assets/package.json      |   2 +-
 2 files changed, 64 insertions(+), 64 deletions(-)

diff --git a/apps/block_scout_web/assets/package-lock.json b/apps/block_scout_web/assets/package-lock.json
index cb47e3141142..c9529d0036ef 100644
--- a/apps/block_scout_web/assets/package-lock.json
+++ b/apps/block_scout_web/assets/package-lock.json
@@ -71,7 +71,7 @@
         "xss": "^1.0.14"
       },
       "devDependencies": {
-        "@babel/core": "^7.23.5",
+        "@babel/core": "^7.23.6",
         "@babel/preset-env": "^7.23.6",
         "autoprefixer": "^10.4.16",
         "babel-loader": "^9.1.3",
@@ -249,20 +249,20 @@
       }
     },
     "node_modules/@babel/core": {
-      "version": "7.23.5",
-      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.23.5.tgz",
-      "integrity": "sha512-Cwc2XjUrG4ilcfOw4wBAK+enbdgwAcAJCfGUItPBKR7Mjw4aEfAFYrLxeRp4jWgtNIKn3n2AlBOfwwafl+42/g==",
+      "version": "7.23.6",
+      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.23.6.tgz",
+      "integrity": "sha512-FxpRyGjrMJXh7X3wGLGhNDCRiwpWEF74sKjTLDJSG5Kyvow3QZaG0Adbqzi9ZrVjTWpsX+2cxWXD71NMg93kdw==",
       "dependencies": {
         "@ampproject/remapping": "^2.2.0",
         "@babel/code-frame": "^7.23.5",
-        "@babel/generator": "^7.23.5",
-        "@babel/helper-compilation-targets": "^7.22.15",
+        "@babel/generator": "^7.23.6",
+        "@babel/helper-compilation-targets": "^7.23.6",
         "@babel/helper-module-transforms": "^7.23.3",
-        "@babel/helpers": "^7.23.5",
-        "@babel/parser": "^7.23.5",
+        "@babel/helpers": "^7.23.6",
+        "@babel/parser": "^7.23.6",
         "@babel/template": "^7.22.15",
-        "@babel/traverse": "^7.23.5",
-        "@babel/types": "^7.23.5",
+        "@babel/traverse": "^7.23.6",
+        "@babel/types": "^7.23.6",
         "convert-source-map": "^2.0.0",
         "debug": "^4.1.0",
         "gensync": "^1.0.0-beta.2",
@@ -283,11 +283,11 @@
       "integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg=="
     },
     "node_modules/@babel/generator": {
-      "version": "7.23.5",
-      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.23.5.tgz",
-      "integrity": "sha512-BPssCHrBD+0YrxviOa3QzpqwhNIXKEtOa2jQrm4FlmkC2apYgRnQcmPWiGZDlGxiNtltnUFolMe8497Esry+jA==",
+      "version": "7.23.6",
+      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.23.6.tgz",
+      "integrity": "sha512-qrSfCYxYQB5owCmGLbl8XRpX1ytXlpueOb0N0UmQwA073KZxejgQTzAmJezxvpwQD9uGtK2shHdi55QT+MbjIw==",
       "dependencies": {
-        "@babel/types": "^7.23.5",
+        "@babel/types": "^7.23.6",
         "@jridgewell/gen-mapping": "^0.3.2",
         "@jridgewell/trace-mapping": "^0.3.17",
         "jsesc": "^2.5.1"
@@ -602,13 +602,13 @@
       }
     },
     "node_modules/@babel/helpers": {
-      "version": "7.23.5",
-      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.23.5.tgz",
-      "integrity": "sha512-oO7us8FzTEsG3U6ag9MfdF1iA/7Z6dz+MtFhifZk8C8o453rGJFFWUP1t+ULM9TUIAzC9uxXEiXjOiVMyd7QPg==",
+      "version": "7.23.6",
+      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.23.6.tgz",
+      "integrity": "sha512-wCfsbN4nBidDRhpDhvcKlzHWCTlgJYUUdSJfzXb2NuBssDSIjc3xcb+znA7l+zYsFljAcGM0aFkN40cR3lXiGA==",
       "dependencies": {
         "@babel/template": "^7.22.15",
-        "@babel/traverse": "^7.23.5",
-        "@babel/types": "^7.23.5"
+        "@babel/traverse": "^7.23.6",
+        "@babel/types": "^7.23.6"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -628,9 +628,9 @@
       }
     },
     "node_modules/@babel/parser": {
-      "version": "7.23.5",
-      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.23.5.tgz",
-      "integrity": "sha512-hOOqoiNXrmGdFbhgCzu6GiURxUgM27Xwd/aPuu8RfHEZPBzL1Z54okAHAQjXfcQNwvrlkAmAp4SlRTZ45vlthQ==",
+      "version": "7.23.6",
+      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.23.6.tgz",
+      "integrity": "sha512-Z2uID7YJ7oNvAI20O9X0bblw7Qqs8Q2hFy0R9tAfnfLkp5MW0UH9eUvnDSnFwKZ0AvgS1ucqR4KzvVHgnke1VQ==",
       "bin": {
         "parser": "bin/babel-parser.js"
       },
@@ -1960,19 +1960,19 @@
       }
     },
     "node_modules/@babel/traverse": {
-      "version": "7.23.5",
-      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.23.5.tgz",
-      "integrity": "sha512-czx7Xy5a6sapWWRx61m1Ke1Ra4vczu1mCTtJam5zRTBOonfdJ+S/B6HYmGYu3fJtr8GGET3si6IhgWVBhJ/m8w==",
+      "version": "7.23.6",
+      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.23.6.tgz",
+      "integrity": "sha512-czastdK1e8YByZqezMPFiZ8ahwVMh/ESl9vPgvgdB9AmFMGP5jfpFax74AQgl5zj4XHzqeYAg2l8PuUeRS1MgQ==",
       "dependencies": {
         "@babel/code-frame": "^7.23.5",
-        "@babel/generator": "^7.23.5",
+        "@babel/generator": "^7.23.6",
         "@babel/helper-environment-visitor": "^7.22.20",
         "@babel/helper-function-name": "^7.23.0",
         "@babel/helper-hoist-variables": "^7.22.5",
         "@babel/helper-split-export-declaration": "^7.22.6",
-        "@babel/parser": "^7.23.5",
-        "@babel/types": "^7.23.5",
-        "debug": "^4.1.0",
+        "@babel/parser": "^7.23.6",
+        "@babel/types": "^7.23.6",
+        "debug": "^4.3.1",
         "globals": "^11.1.0"
       },
       "engines": {
@@ -1980,9 +1980,9 @@
       }
     },
     "node_modules/@babel/types": {
-      "version": "7.23.5",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.23.5.tgz",
-      "integrity": "sha512-ON5kSOJwVO6xXVRTvOI0eOnWe7VdUcIpsovGo9U/Br4Ie4UVFQTboO2cYnDhAGU6Fp+UxSiT+pMft0SMHfuq6w==",
+      "version": "7.23.6",
+      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.23.6.tgz",
+      "integrity": "sha512-+uarb83brBzPKN38NX1MkB6vb6+mwvR6amUulqAE7ccQw1pEl+bCia9TbdG1lsnFP7lZySvUn37CHyXQdfTwzg==",
       "dependencies": {
         "@babel/helper-string-parser": "^7.23.4",
         "@babel/helper-validator-identifier": "^7.22.20",
@@ -17985,20 +17985,20 @@
       "integrity": "sha512-uU27kfDRlhfKl+w1U6vp16IuvSLtjAxdArVXPa9BvLkrr7CYIsxH5adpHObeAGY/41+syctUWOZ140a2Rvkgjw=="
     },
     "@babel/core": {
-      "version": "7.23.5",
-      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.23.5.tgz",
-      "integrity": "sha512-Cwc2XjUrG4ilcfOw4wBAK+enbdgwAcAJCfGUItPBKR7Mjw4aEfAFYrLxeRp4jWgtNIKn3n2AlBOfwwafl+42/g==",
+      "version": "7.23.6",
+      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.23.6.tgz",
+      "integrity": "sha512-FxpRyGjrMJXh7X3wGLGhNDCRiwpWEF74sKjTLDJSG5Kyvow3QZaG0Adbqzi9ZrVjTWpsX+2cxWXD71NMg93kdw==",
       "requires": {
         "@ampproject/remapping": "^2.2.0",
         "@babel/code-frame": "^7.23.5",
-        "@babel/generator": "^7.23.5",
-        "@babel/helper-compilation-targets": "^7.22.15",
+        "@babel/generator": "^7.23.6",
+        "@babel/helper-compilation-targets": "^7.23.6",
         "@babel/helper-module-transforms": "^7.23.3",
-        "@babel/helpers": "^7.23.5",
-        "@babel/parser": "^7.23.5",
+        "@babel/helpers": "^7.23.6",
+        "@babel/parser": "^7.23.6",
         "@babel/template": "^7.22.15",
-        "@babel/traverse": "^7.23.5",
-        "@babel/types": "^7.23.5",
+        "@babel/traverse": "^7.23.6",
+        "@babel/types": "^7.23.6",
         "convert-source-map": "^2.0.0",
         "debug": "^4.1.0",
         "gensync": "^1.0.0-beta.2",
@@ -18014,11 +18014,11 @@
       }
     },
     "@babel/generator": {
-      "version": "7.23.5",
-      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.23.5.tgz",
-      "integrity": "sha512-BPssCHrBD+0YrxviOa3QzpqwhNIXKEtOa2jQrm4FlmkC2apYgRnQcmPWiGZDlGxiNtltnUFolMe8497Esry+jA==",
+      "version": "7.23.6",
+      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.23.6.tgz",
+      "integrity": "sha512-qrSfCYxYQB5owCmGLbl8XRpX1ytXlpueOb0N0UmQwA073KZxejgQTzAmJezxvpwQD9uGtK2shHdi55QT+MbjIw==",
       "requires": {
-        "@babel/types": "^7.23.5",
+        "@babel/types": "^7.23.6",
         "@jridgewell/gen-mapping": "^0.3.2",
         "@jridgewell/trace-mapping": "^0.3.17",
         "jsesc": "^2.5.1"
@@ -18248,13 +18248,13 @@
       }
     },
     "@babel/helpers": {
-      "version": "7.23.5",
-      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.23.5.tgz",
-      "integrity": "sha512-oO7us8FzTEsG3U6ag9MfdF1iA/7Z6dz+MtFhifZk8C8o453rGJFFWUP1t+ULM9TUIAzC9uxXEiXjOiVMyd7QPg==",
+      "version": "7.23.6",
+      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.23.6.tgz",
+      "integrity": "sha512-wCfsbN4nBidDRhpDhvcKlzHWCTlgJYUUdSJfzXb2NuBssDSIjc3xcb+znA7l+zYsFljAcGM0aFkN40cR3lXiGA==",
       "requires": {
         "@babel/template": "^7.22.15",
-        "@babel/traverse": "^7.23.5",
-        "@babel/types": "^7.23.5"
+        "@babel/traverse": "^7.23.6",
+        "@babel/types": "^7.23.6"
       }
     },
     "@babel/highlight": {
@@ -18268,9 +18268,9 @@
       }
     },
     "@babel/parser": {
-      "version": "7.23.5",
-      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.23.5.tgz",
-      "integrity": "sha512-hOOqoiNXrmGdFbhgCzu6GiURxUgM27Xwd/aPuu8RfHEZPBzL1Z54okAHAQjXfcQNwvrlkAmAp4SlRTZ45vlthQ=="
+      "version": "7.23.6",
+      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.23.6.tgz",
+      "integrity": "sha512-Z2uID7YJ7oNvAI20O9X0bblw7Qqs8Q2hFy0R9tAfnfLkp5MW0UH9eUvnDSnFwKZ0AvgS1ucqR4KzvVHgnke1VQ=="
     },
     "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": {
       "version": "7.23.3",
@@ -19167,26 +19167,26 @@
       }
     },
     "@babel/traverse": {
-      "version": "7.23.5",
-      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.23.5.tgz",
-      "integrity": "sha512-czx7Xy5a6sapWWRx61m1Ke1Ra4vczu1mCTtJam5zRTBOonfdJ+S/B6HYmGYu3fJtr8GGET3si6IhgWVBhJ/m8w==",
+      "version": "7.23.6",
+      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.23.6.tgz",
+      "integrity": "sha512-czastdK1e8YByZqezMPFiZ8ahwVMh/ESl9vPgvgdB9AmFMGP5jfpFax74AQgl5zj4XHzqeYAg2l8PuUeRS1MgQ==",
       "requires": {
         "@babel/code-frame": "^7.23.5",
-        "@babel/generator": "^7.23.5",
+        "@babel/generator": "^7.23.6",
         "@babel/helper-environment-visitor": "^7.22.20",
         "@babel/helper-function-name": "^7.23.0",
         "@babel/helper-hoist-variables": "^7.22.5",
         "@babel/helper-split-export-declaration": "^7.22.6",
-        "@babel/parser": "^7.23.5",
-        "@babel/types": "^7.23.5",
-        "debug": "^4.1.0",
+        "@babel/parser": "^7.23.6",
+        "@babel/types": "^7.23.6",
+        "debug": "^4.3.1",
         "globals": "^11.1.0"
       }
     },
     "@babel/types": {
-      "version": "7.23.5",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.23.5.tgz",
-      "integrity": "sha512-ON5kSOJwVO6xXVRTvOI0eOnWe7VdUcIpsovGo9U/Br4Ie4UVFQTboO2cYnDhAGU6Fp+UxSiT+pMft0SMHfuq6w==",
+      "version": "7.23.6",
+      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.23.6.tgz",
+      "integrity": "sha512-+uarb83brBzPKN38NX1MkB6vb6+mwvR6amUulqAE7ccQw1pEl+bCia9TbdG1lsnFP7lZySvUn37CHyXQdfTwzg==",
       "requires": {
         "@babel/helper-string-parser": "^7.23.4",
         "@babel/helper-validator-identifier": "^7.22.20",
diff --git a/apps/block_scout_web/assets/package.json b/apps/block_scout_web/assets/package.json
index 45195f3c1199..08295a34142b 100644
--- a/apps/block_scout_web/assets/package.json
+++ b/apps/block_scout_web/assets/package.json
@@ -83,7 +83,7 @@
     "xss": "^1.0.14"
   },
   "devDependencies": {
-    "@babel/core": "^7.23.5",
+    "@babel/core": "^7.23.6",
     "@babel/preset-env": "^7.23.6",
     "autoprefixer": "^10.4.16",
     "babel-loader": "^9.1.3",

From 294caa9946789cd7ec328e70ac70808ae0f2659c Mon Sep 17 00:00:00 2001
From: Viktor Baranov <baranov.viktor.27@gmail.com>
Date: Tue, 12 Dec 2023 19:04:12 +0300
Subject: [PATCH 763/909] Add DATABASE_QUEUE_TARGET env

---
 CHANGELOG.md                              |  2 ++
 config/runtime/dev.exs                    | 11 ++++++++---
 config/runtime/prod.exs                   | 10 +++++++---
 docker-compose/envs/common-blockscout.env |  1 +
 4 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a4ab195fdb21..c4e44e287298 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,8 @@
 
 ### Chore
 
+- [#8991](https://github.com/blockscout/blockscout/pull/8991) - Manage DB queue target via runtime env var
+
 <details>
   <summary>Dependencies version bumps</summary>
 </details>
diff --git a/config/runtime/dev.exs b/config/runtime/dev.exs
index c10a0b752a5c..3e4df28fb71e 100644
--- a/config/runtime/dev.exs
+++ b/config/runtime/dev.exs
@@ -42,12 +42,15 @@ pool_size =
     do: ConfigHelper.parse_integer_env_var("POOL_SIZE", 30),
     else: ConfigHelper.parse_integer_env_var("POOL_SIZE", 40)
 
+queue_target = ConfigHelper.parse_integer_env_var("DATABASE_QUEUE_TARGET", 50)
+
 # Configure your database
 config :explorer, Explorer.Repo,
   database: database,
   hostname: hostname,
   url: System.get_env("DATABASE_URL"),
-  pool_size: pool_size
+  pool_size: pool_size,
+  queue_target: queue_target
 
 database_api = if System.get_env("DATABASE_READ_ONLY_API_URL"), do: nil, else: database
 hostname_api = if System.get_env("DATABASE_READ_ONLY_API_URL"), do: nil, else: hostname
@@ -57,7 +60,8 @@ config :explorer, Explorer.Repo.Replica1,
   database: database_api,
   hostname: hostname_api,
   url: ExplorerConfigHelper.get_api_db_url(),
-  pool_size: ConfigHelper.parse_integer_env_var("POOL_SIZE_API", 10)
+  pool_size: ConfigHelper.parse_integer_env_var("POOL_SIZE_API", 10),
+  queue_target: queue_target
 
 database_account = if System.get_env("ACCOUNT_DATABASE_URL"), do: nil, else: database
 hostname_account = if System.get_env("ACCOUNT_DATABASE_URL"), do: nil, else: hostname
@@ -67,7 +71,8 @@ config :explorer, Explorer.Repo.Account,
   database: database_account,
   hostname: hostname_account,
   url: ExplorerConfigHelper.get_account_db_url(),
-  pool_size: ConfigHelper.parse_integer_env_var("ACCOUNT_POOL_SIZE", 10)
+  pool_size: ConfigHelper.parse_integer_env_var("ACCOUNT_POOL_SIZE", 10),
+  queue_target: queue_target
 
 # Configure PolygonEdge database
 config :explorer, Explorer.Repo.PolygonEdge,
diff --git a/config/runtime/prod.exs b/config/runtime/prod.exs
index a8692d8c540e..ce4602522a1d 100644
--- a/config/runtime/prod.exs
+++ b/config/runtime/prod.exs
@@ -28,24 +28,28 @@ config :block_scout_web, BlockScoutWeb.Endpoint,
 ################
 
 pool_size = ConfigHelper.parse_integer_env_var("POOL_SIZE", 50)
+queue_target = ConfigHelper.parse_integer_env_var("DATABASE_QUEUE_TARGET", 50)
 
 # Configures the database
 config :explorer, Explorer.Repo,
   url: System.get_env("DATABASE_URL"),
   pool_size: pool_size,
-  ssl: ExplorerConfigHelper.ssl_enabled?()
+  ssl: ExplorerConfigHelper.ssl_enabled?(),
+  queue_target: queue_target
 
 # Configures API the database
 config :explorer, Explorer.Repo.Replica1,
   url: ExplorerConfigHelper.get_api_db_url(),
   pool_size: ConfigHelper.parse_integer_env_var("POOL_SIZE_API", 50),
-  ssl: ExplorerConfigHelper.ssl_enabled?()
+  ssl: ExplorerConfigHelper.ssl_enabled?(),
+  queue_target: queue_target
 
 # Configures Account database
 config :explorer, Explorer.Repo.Account,
   url: ExplorerConfigHelper.get_account_db_url(),
   pool_size: ConfigHelper.parse_integer_env_var("ACCOUNT_POOL_SIZE", 50),
-  ssl: ExplorerConfigHelper.ssl_enabled?()
+  ssl: ExplorerConfigHelper.ssl_enabled?(),
+  queue_target: queue_target
 
 # Configures PolygonEdge database
 config :explorer, Explorer.Repo.PolygonEdge,
diff --git a/docker-compose/envs/common-blockscout.env b/docker-compose/envs/common-blockscout.env
index 8ea2e9265dbe..f8a1507ac2d1 100644
--- a/docker-compose/envs/common-blockscout.env
+++ b/docker-compose/envs/common-blockscout.env
@@ -3,6 +3,7 @@ ETHEREUM_JSONRPC_VARIANT=geth
 ETHEREUM_JSONRPC_HTTP_URL=http://host.docker.internal:8545/
 # ETHEREUM_JSONRPC_FALLBACK_HTTP_URL=
 DATABASE_URL=postgresql://blockscout:ceWb1MeLBEeOIfk65gU8EjF8@db:5432/blockscout
+# DATABASE_QUEUE_TARGET
 ETHEREUM_JSONRPC_TRACE_URL=http://host.docker.internal:8545/
 # ETHEREUM_JSONRPC_FALLBACK_TRACE_URL=
 # ETHEREUM_JSONRPC_HTTP_TIMEOUT=

From c3cd8d6c6b6347bf16b1283a6bf32b767ba33317 Mon Sep 17 00:00:00 2001
From: Qwerty5Uiop <alex000010@bk.ru>
Date: Wed, 6 Dec 2023 12:27:36 +0600
Subject: [PATCH 764/909] Remove daily balances updating from BlockReward
 fetcher

---
 CHANGELOG.md                                  |  2 ++
 .../lib/indexer/fetcher/block_reward.ex       | 22 +------------------
 2 files changed, 3 insertions(+), 21 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a4ab195fdb21..d51f123fc654 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,8 @@
 
 ### Fixes
 
+- [#8955](https://github.com/blockscout/blockscout/pull/8955) - Remove daily balances updating from BlockReward fetcher
+
 ### Chore
 
 <details>
diff --git a/apps/indexer/lib/indexer/fetcher/block_reward.ex b/apps/indexer/lib/indexer/fetcher/block_reward.ex
index 2558b9510fee..78ba9ec9f3df 100644
--- a/apps/indexer/lib/indexer/fetcher/block_reward.ex
+++ b/apps/indexer/lib/indexer/fetcher/block_reward.ex
@@ -20,7 +20,7 @@ defmodule Indexer.Fetcher.BlockReward do
   alias Explorer.Chain.Cache.Accounts
   alias Indexer.{BufferedTask, Tracer}
   alias Indexer.Fetcher.BlockReward.Supervisor, as: BlockRewardSupervisor
-  alias Indexer.Fetcher.{CoinBalance, CoinBalanceDailyUpdater}
+  alias Indexer.Fetcher.CoinBalance
   alias Indexer.Transform.{AddressCoinBalances, AddressCoinBalancesDaily, Addresses}
 
   @behaviour BufferedTask
@@ -274,26 +274,6 @@ defmodule Indexer.Fetcher.BlockReward do
     addresses_params = Addresses.extract_addresses(%{block_reward_contract_beneficiaries: block_rewards_params})
     address_coin_balances_params_set = AddressCoinBalances.params_set(%{beneficiary_params: block_rewards_params})
 
-    address_coin_balances_params_with_block_timestamp =
-      block_rewards_params
-      |> Enum.map(fn block_rewards_param ->
-        %{
-          address_hash: block_rewards_param.address_hash,
-          block_number: block_rewards_param.block_number,
-          block_timestamp: block_rewards_param.block_timestamp
-        }
-      end)
-      |> Enum.into(MapSet.new())
-
-    address_coin_balances_params_with_block_timestamp_set = %{
-      address_coin_balances_params_with_block_timestamp: address_coin_balances_params_with_block_timestamp
-    }
-
-    address_coin_balances_daily_params_set =
-      AddressCoinBalancesDaily.params_set(address_coin_balances_params_with_block_timestamp_set)
-
-    CoinBalanceDailyUpdater.add_daily_balances_params(address_coin_balances_daily_params_set)
-
     Chain.import(%{
       addresses: %{params: addresses_params},
       address_coin_balances: %{params: address_coin_balances_params_set},

From 005b1b20ac6918c21b2516b0eb60313ded4c06e3 Mon Sep 17 00:00:00 2001
From: Nikita Pozdniakov <nikitosing4@mail.ru>
Date: Wed, 6 Dec 2023 13:55:55 +0300
Subject: [PATCH 765/909] Add
 /api/v2/transactions/{transaction_hash_param}/summary endpoint + Transaction
 Interpretation Service interface

---
 .github/workflows/config.yml                  |  26 ++--
 CHANGELOG.md                                  |   2 +
 .../lib/block_scout_web/api_router.ex         |   1 +
 .../controllers/api/v2/fallback_controller.ex |   8 +
 .../api/v2/transaction_controller.ex          |  92 ++++++-----
 .../transaction_interpretation.ex             | 147 ++++++++++++++++++
 .../views/api/v2/transaction_view.ex          |  66 ++++----
 apps/explorer/lib/explorer/helper.ex          |  11 ++
 .../rust_verifier_interface_behaviour.ex      |   4 +-
 .../smart_contract/sig_provider_interface.ex  |   4 +-
 .../lib/explorer/utility/microservice.ex      |  15 ++
 .../lib/explorer/utility/rust_service.ex      |  15 --
 .../lib/explorer/visualize/sol2uml.ex         |   4 +-
 config/runtime.exs                            |   4 +
 14 files changed, 296 insertions(+), 103 deletions(-)
 create mode 100644 apps/block_scout_web/lib/block_scout_web/microservice_interfaces/transaction_interpretation.ex
 create mode 100644 apps/explorer/lib/explorer/utility/microservice.ex
 delete mode 100644 apps/explorer/lib/explorer/utility/rust_service.ex

diff --git a/.github/workflows/config.yml b/.github/workflows/config.yml
index 247f01b0e87d..2d672f01197e 100644
--- a/.github/workflows/config.yml
+++ b/.github/workflows/config.yml
@@ -72,7 +72,7 @@ jobs:
           path: |
             deps
             _build
-          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_28-${{ hashFiles('mix.lock') }}
+          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_29-${{ hashFiles('mix.lock') }}
           restore-keys: |
             ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-
 
@@ -130,7 +130,7 @@ jobs:
           path: |
             deps
             _build
-          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_28-${{ hashFiles('mix.lock') }}
+          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_29-${{ hashFiles('mix.lock') }}
           restore-keys: |
             ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-"
 
@@ -154,7 +154,7 @@ jobs:
           path: |
             deps
             _build
-          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_28-${{ hashFiles('mix.lock') }}
+          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_29-${{ hashFiles('mix.lock') }}
           restore-keys: |
             ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-"
 
@@ -183,7 +183,7 @@ jobs:
           path: |
             deps
             _build
-          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_28-${{ hashFiles('mix.lock') }}
+          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_29-${{ hashFiles('mix.lock') }}
           restore-keys: |
             ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-"
 
@@ -227,7 +227,7 @@ jobs:
           path: |
             deps
             _build
-          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_28-${{ hashFiles('mix.lock') }}
+          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_29-${{ hashFiles('mix.lock') }}
           restore-keys: |
             ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-"
 
@@ -253,7 +253,7 @@ jobs:
           path: |
             deps
             _build
-          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_28-${{ hashFiles('mix.lock') }}
+          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_29-${{ hashFiles('mix.lock') }}
           restore-keys: |
             ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-"
 
@@ -282,7 +282,7 @@ jobs:
           path: |
             deps
             _build
-          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_28-${{ hashFiles('mix.lock') }}
+          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_29-${{ hashFiles('mix.lock') }}
           restore-keys: |
             ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-"
 
@@ -330,7 +330,7 @@ jobs:
           path: |
             deps
             _build
-          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_28-${{ hashFiles('mix.lock') }}
+          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_29-${{ hashFiles('mix.lock') }}
           restore-keys: |
             ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-"
 
@@ -376,7 +376,7 @@ jobs:
           path: |
             deps
             _build
-          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_28-${{ hashFiles('mix.lock') }}
+          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_29-${{ hashFiles('mix.lock') }}
           restore-keys: |
             ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-"
 
@@ -438,7 +438,7 @@ jobs:
           path: |
             deps
             _build
-          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_28-${{ hashFiles('mix.lock') }}
+          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_29-${{ hashFiles('mix.lock') }}
           restore-keys: |
             ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-"
 
@@ -498,7 +498,7 @@ jobs:
           path: |
             deps
             _build
-          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_28-${{ hashFiles('mix.lock') }}
+          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_29-${{ hashFiles('mix.lock') }}
           restore-keys: |
             ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-"
 
@@ -569,7 +569,7 @@ jobs:
           path: |
             deps
             _build
-          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_28-${{ hashFiles('mix.lock') }}
+          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_29-${{ hashFiles('mix.lock') }}
           restore-keys: |
             ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-"
 
@@ -637,7 +637,7 @@ jobs:
           path: |
             deps
             _build
-          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_28-${{ hashFiles('mix.lock') }}
+          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_29-${{ hashFiles('mix.lock') }}
           restore-keys: |
             ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-"
 
diff --git a/CHANGELOG.md b/CHANGELOG.md
index a4ab195fdb21..845eff7b0d2c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,8 @@
 
 ### Features
 
+- [#8957](https://github.com/blockscout/blockscout/pull/8957) - Add Tx Interpreter Service integration
+
 ### Fixes
 
 ### Chore
diff --git a/apps/block_scout_web/lib/block_scout_web/api_router.ex b/apps/block_scout_web/lib/block_scout_web/api_router.ex
index dee973786cfe..7880bd15af05 100644
--- a/apps/block_scout_web/lib/block_scout_web/api_router.ex
+++ b/apps/block_scout_web/lib/block_scout_web/api_router.ex
@@ -216,6 +216,7 @@ defmodule BlockScoutWeb.ApiRouter do
       get("/:transaction_hash_param/logs", V2.TransactionController, :logs)
       get("/:transaction_hash_param/raw-trace", V2.TransactionController, :raw_trace)
       get("/:transaction_hash_param/state-changes", V2.TransactionController, :state_changes)
+      get("/:transaction_hash_param/summary", V2.TransactionController, :summary)
     end
 
     scope "/blocks" do
diff --git a/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/fallback_controller.ex b/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/fallback_controller.ex
index 691d8de75b91..c7f1fc3692ee 100644
--- a/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/fallback_controller.ex
+++ b/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/fallback_controller.ex
@@ -26,6 +26,7 @@ defmodule BlockScoutWeb.API.V2.FallbackController do
   @address_not_found "Address not found"
   @address_is_not_smart_contract "Address is not smart-contract"
   @empty_response "Empty response"
+  @tx_interpreter_service_disabled "Transaction Interpretation Service is not enabled"
 
   def call(conn, {:format, _params}) do
     Logger.error(fn ->
@@ -256,4 +257,11 @@ defmodule BlockScoutWeb.API.V2.FallbackController do
     |> put_view(ApiView)
     |> render(:message, %{message: @empty_response})
   end
+
+  def call(conn, {:tx_interpreter_enabled, false}) do
+    conn
+    |> put_status(404)
+    |> put_view(ApiView)
+    |> render(:message, %{message: @tx_interpreter_service_disabled})
+  end
 end
diff --git a/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/transaction_controller.ex b/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/transaction_controller.ex
index 43b63b6f693d..f86c06c3cd77 100644
--- a/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/transaction_controller.ex
+++ b/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/transaction_controller.ex
@@ -23,8 +23,9 @@ defmodule BlockScoutWeb.API.V2.TransactionController do
     ]
 
   alias BlockScoutWeb.AccessHelper
+  alias BlockScoutWeb.MicroserviceInterfaces.TransactionInterpretation, as: TransactionInterpretationService
   alias BlockScoutWeb.Models.TransactionStateHelper
-  alias Explorer.Chain
+  alias Explorer.{Chain, Helper}
   alias Explorer.Chain.Zkevm.Reader
   alias Indexer.Fetcher.FirstTraceOnDemand
 
@@ -36,7 +37,6 @@ defmodule BlockScoutWeb.API.V2.TransactionController do
     [created_contract_address: :token] => :optional,
     [from_address: :names] => :optional,
     [to_address: :names] => :optional,
-    # as far as I remember this needed for substituting implementation name in `to` address instead of is's real name (in transactions)
     [to_address: :smart_contract] => :optional
   }
 
@@ -95,16 +95,11 @@ defmodule BlockScoutWeb.API.V2.TransactionController do
           necessity_by_association_with_actions
       end
 
-    with {:format, {:ok, transaction_hash}} <- {:format, Chain.string_to_transaction_hash(transaction_hash_string)},
-         {:not_found, {:ok, transaction}} <-
-           {:not_found,
-            Chain.hash_to_transaction(
-              transaction_hash,
-              necessity_by_association: necessity_by_association,
-              api?: true
-            )},
-         {:ok, false} <- AccessHelper.restricted_access?(to_string(transaction.from_address_hash), params),
-         {:ok, false} <- AccessHelper.restricted_access?(to_string(transaction.to_address_hash), params),
+    with {:ok, transaction, _transaction_hash} <-
+           validate_transaction(transaction_hash_string, params,
+             necessity_by_association: necessity_by_association,
+             api?: true
+           ),
          preloaded <-
            Chain.preload_token_transfers(transaction, @token_transfers_in_tx_necessity_by_association, @api_true, false) do
       conn
@@ -183,11 +178,7 @@ defmodule BlockScoutWeb.API.V2.TransactionController do
   """
   @spec raw_trace(Plug.Conn.t(), map()) :: Plug.Conn.t() | {atom(), any()}
   def raw_trace(conn, %{"transaction_hash_param" => transaction_hash_string} = params) do
-    with {:format, {:ok, transaction_hash}} <- {:format, Chain.string_to_transaction_hash(transaction_hash_string)},
-         {:not_found, {:ok, transaction}} <-
-           {:not_found, Chain.hash_to_transaction(transaction_hash, @api_true)},
-         {:ok, false} <- AccessHelper.restricted_access?(to_string(transaction.from_address_hash), params),
-         {:ok, false} <- AccessHelper.restricted_access?(to_string(transaction.to_address_hash), params) do
+    with {:ok, transaction, transaction_hash} <- validate_transaction(transaction_hash_string, params) do
       if is_nil(transaction.block_number) do
         conn
         |> put_status(200)
@@ -216,11 +207,7 @@ defmodule BlockScoutWeb.API.V2.TransactionController do
   """
   @spec token_transfers(Plug.Conn.t(), map()) :: Plug.Conn.t() | {atom(), any()}
   def token_transfers(conn, %{"transaction_hash_param" => transaction_hash_string} = params) do
-    with {:format, {:ok, transaction_hash}} <- {:format, Chain.string_to_transaction_hash(transaction_hash_string)},
-         {:not_found, {:ok, transaction}} <-
-           {:not_found, Chain.hash_to_transaction(transaction_hash, @api_true)},
-         {:ok, false} <- AccessHelper.restricted_access?(to_string(transaction.from_address_hash), params),
-         {:ok, false} <- AccessHelper.restricted_access?(to_string(transaction.to_address_hash), params) do
+    with {:ok, _transaction, transaction_hash} <- validate_transaction(transaction_hash_string, params) do
       paging_options = paging_options(params)
 
       full_options =
@@ -252,11 +239,7 @@ defmodule BlockScoutWeb.API.V2.TransactionController do
   """
   @spec internal_transactions(Plug.Conn.t(), map()) :: Plug.Conn.t() | {atom(), any()}
   def internal_transactions(conn, %{"transaction_hash_param" => transaction_hash_string} = params) do
-    with {:format, {:ok, transaction_hash}} <- {:format, Chain.string_to_transaction_hash(transaction_hash_string)},
-         {:not_found, {:ok, transaction}} <-
-           {:not_found, Chain.hash_to_transaction(transaction_hash, @api_true)},
-         {:ok, false} <- AccessHelper.restricted_access?(to_string(transaction.from_address_hash), params),
-         {:ok, false} <- AccessHelper.restricted_access?(to_string(transaction.to_address_hash), params) do
+    with {:ok, _transaction, transaction_hash} <- validate_transaction(transaction_hash_string, params) do
       full_options =
         @internal_transaction_necessity_by_association
         |> Keyword.merge(paging_options(params))
@@ -284,11 +267,7 @@ defmodule BlockScoutWeb.API.V2.TransactionController do
   """
   @spec logs(Plug.Conn.t(), map()) :: Plug.Conn.t() | {atom(), any()}
   def logs(conn, %{"transaction_hash_param" => transaction_hash_string} = params) do
-    with {:format, {:ok, transaction_hash}} <- {:format, Chain.string_to_transaction_hash(transaction_hash_string)},
-         {:not_found, {:ok, transaction}} <-
-           {:not_found, Chain.hash_to_transaction(transaction_hash, @api_true)},
-         {:ok, false} <- AccessHelper.restricted_access?(to_string(transaction.from_address_hash), params),
-         {:ok, false} <- AccessHelper.restricted_access?(to_string(transaction.to_address_hash), params) do
+    with {:ok, _transaction, transaction_hash} <- validate_transaction(transaction_hash_string, params) do
       full_options =
         [
           necessity_by_association: %{
@@ -323,16 +302,12 @@ defmodule BlockScoutWeb.API.V2.TransactionController do
   """
   @spec state_changes(Plug.Conn.t(), map()) :: Plug.Conn.t() | {atom(), any()}
   def state_changes(conn, %{"transaction_hash_param" => transaction_hash_string} = params) do
-    with {:format, {:ok, transaction_hash}} <- {:format, Chain.string_to_transaction_hash(transaction_hash_string)},
-         {:not_found, {:ok, transaction}} <-
-           {:not_found,
-            Chain.hash_to_transaction(transaction_hash,
-              necessity_by_association:
-                Map.merge(@transaction_necessity_by_association, %{[block: [miner: :names]] => :optional}),
-              api?: true
-            )},
-         {:ok, false} <- AccessHelper.restricted_access?(to_string(transaction.from_address_hash), params),
-         {:ok, false} <- AccessHelper.restricted_access?(to_string(transaction.to_address_hash), params) do
+    with {:ok, transaction, _transaction_hash} <-
+           validate_transaction(transaction_hash_string, params,
+             necessity_by_association:
+               Map.merge(@transaction_necessity_by_association, %{[block: [miner: :names]] => :optional}),
+             api?: true
+           ) do
       state_changes_plus_next_page =
         transaction |> TransactionStateHelper.state_changes(params |> paging_options() |> Keyword.merge(api?: true))
 
@@ -376,4 +351,37 @@ defmodule BlockScoutWeb.API.V2.TransactionController do
       })
     end
   end
+
+  @doc """
+    Function to handle GET requests to `/api/v2/transactions/:transaction_hash_param/summary` endpoint.
+  """
+  @spec summary(any, map) ::
+          {:format, :error}
+          | {:not_found, {:error, :not_found}}
+          | {:restricted_access, true}
+          | {:tx_interpreter_enabled, boolean}
+          | Plug.Conn.t()
+  def summary(conn, %{"transaction_hash_param" => transaction_hash_string} = params) do
+    with {:tx_interpreter_enabled, true} <- {:tx_interpreter_enabled, TransactionInterpretationService.enabled?()},
+         {:ok, transaction, _transaction_hash} <- validate_transaction(transaction_hash_string, params) do
+      response =
+        case TransactionInterpretationService.interpret(transaction) do
+          {:ok, response} -> Helper.maybe_decode(response)
+          {:error, error} -> %{error: error}
+        end
+
+      conn
+      |> json(response)
+    end
+  end
+
+  defp validate_transaction(transaction_hash_string, params, options \\ @api_true) do
+    with {:format, {:ok, transaction_hash}} <- {:format, Chain.string_to_transaction_hash(transaction_hash_string)},
+         {:not_found, {:ok, transaction}} <-
+           {:not_found, Chain.hash_to_transaction(transaction_hash, options)},
+         {:ok, false} <- AccessHelper.restricted_access?(to_string(transaction.from_address_hash), params),
+         {:ok, false} <- AccessHelper.restricted_access?(to_string(transaction.to_address_hash), params) do
+      {:ok, transaction, transaction_hash}
+    end
+  end
 end
diff --git a/apps/block_scout_web/lib/block_scout_web/microservice_interfaces/transaction_interpretation.ex b/apps/block_scout_web/lib/block_scout_web/microservice_interfaces/transaction_interpretation.ex
new file mode 100644
index 000000000000..8ad149081d3c
--- /dev/null
+++ b/apps/block_scout_web/lib/block_scout_web/microservice_interfaces/transaction_interpretation.ex
@@ -0,0 +1,147 @@
+defmodule BlockScoutWeb.MicroserviceInterfaces.TransactionInterpretation do
+  @moduledoc """
+    Module to interact with Transaction Interpretation Service
+  """
+
+  alias BlockScoutWeb.API.V2.{Helper, TransactionView}
+  alias Explorer.Chain
+  alias Explorer.Chain.Transaction
+  alias HTTPoison.Response
+
+  import Explorer.Utility.Microservice, only: [base_url: 2]
+
+  require Logger
+
+  @post_timeout :timer.minutes(5)
+  @request_error_msg "Error while sending request to Transaction Interpretation Service"
+  @api_true api?: true
+  @items_limit 50
+
+  @spec interpret(any) :: {:error, :disabled | binary} | {:ok, any}
+  def interpret(transaction) do
+    if enabled?() do
+      url = interpret_url()
+
+      body = prepare_request_body(transaction)
+
+      http_post_request(url, body)
+    else
+      {:error, :disabled}
+    end
+  end
+
+  defp http_post_request(url, body) do
+    headers = [{"Content-Type", "application/json"}]
+
+    case HTTPoison.post(url, Jason.encode!(body), headers, recv_timeout: @post_timeout) do
+      {:ok, %Response{body: body, status_code: 200}} ->
+        {:ok, body}
+
+      error ->
+        old_truncate = Application.get_env(:logger, :truncate)
+        Logger.configure(truncate: :infinity)
+
+        Logger.error(fn ->
+          [
+            "Error while sending request to microservice url: #{url}, body: #{inspect(body, limit: :infinity, printable_limit: :infinity)}: ",
+            inspect(error, limit: :infinity, printable_limit: :infinity)
+          ]
+        end)
+
+        Logger.configure(truncate: old_truncate)
+        {:error, @request_error_msg}
+    end
+  end
+
+  defp config do
+    Application.get_env(:block_scout_web, __MODULE__)
+  end
+
+  def enabled?, do: config()[:enabled]
+
+  defp interpret_url do
+    base_url(:block_scout_web, __MODULE__) <> "/transactions/summary"
+  end
+
+  defp prepare_request_body(transaction) do
+    preloaded_transaction =
+      Chain.select_repo(@api_true).preload(transaction, [
+        :transaction_actions,
+        to_address: [:names, :smart_contract],
+        from_address: [:names, :smart_contract],
+        created_contract_address: [:names, :token, :smart_contract]
+      ])
+
+    skip_sig_provider? = true
+    {decoded_input, _abi_acc, _methods_acc} = Transaction.decoded_input_data(transaction, skip_sig_provider?, @api_true)
+
+    decoded_input_data = TransactionView.decoded_input(decoded_input)
+
+    %{
+      data: %{
+        to:
+          Helper.address_with_info(nil, preloaded_transaction.to_address, preloaded_transaction.to_address_hash, true),
+        from:
+          Helper.address_with_info(
+            nil,
+            preloaded_transaction.from_address,
+            preloaded_transaction.from_address_hash,
+            true
+          ),
+        hash: transaction.hash,
+        type: transaction.type,
+        value: transaction.value,
+        method: TransactionView.method_name(transaction, decoded_input),
+        status: transaction.status,
+        actions: TransactionView.transaction_actions(transaction.transaction_actions),
+        tx_types: TransactionView.tx_types(transaction),
+        raw_input: transaction.input,
+        decoded_input: decoded_input_data,
+        token_transfers: prepare_token_transfers(preloaded_transaction, decoded_input)
+      },
+      logs_data: %{items: prepare_logs(transaction)}
+    }
+  end
+
+  defp prepare_token_transfers(transaction, decoded_input) do
+    full_options =
+      [
+        necessity_by_association: %{
+          [from_address: :smart_contract] => :optional,
+          [to_address: :smart_contract] => :optional,
+          [from_address: :names] => :optional,
+          [to_address: :names] => :optional
+        }
+      ]
+      |> Keyword.merge(@api_true)
+
+    transaction.hash
+    |> Chain.transaction_to_token_transfers(full_options)
+    |> Chain.flat_1155_batch_token_transfers()
+    |> Enum.take(@items_limit)
+    |> Enum.map(&TransactionView.prepare_token_transfer(&1, nil, decoded_input))
+  end
+
+  defp prepare_logs(transaction) do
+    full_options =
+      [
+        necessity_by_association: %{
+          [address: :names] => :optional,
+          [address: :smart_contract] => :optional,
+          address: :optional
+        }
+      ]
+      |> Keyword.merge(@api_true)
+
+    logs =
+      transaction.hash
+      |> Chain.transaction_to_logs(full_options)
+      |> Enum.take(@items_limit)
+
+    decoded_logs = TransactionView.decode_logs(logs, true)
+
+    logs
+    |> Enum.zip(decoded_logs)
+    |> Enum.map(fn {log, decoded_log} -> TransactionView.prepare_log(log, transaction.hash, decoded_log, true) end)
+  end
+end
diff --git a/apps/block_scout_web/lib/block_scout_web/views/api/v2/transaction_view.ex b/apps/block_scout_web/lib/block_scout_web/views/api/v2/transaction_view.ex
index e1ddea367b68..3314b06e58f0 100644
--- a/apps/block_scout_web/lib/block_scout_web/views/api/v2/transaction_view.ex
+++ b/apps/block_scout_web/lib/block_scout_web/views/api/v2/transaction_view.ex
@@ -184,7 +184,8 @@ defmodule BlockScoutWeb.API.V2.TransactionView do
     }
   end
 
-  defp decode_logs(logs, skip_sig_provider?) do
+  @spec decode_logs([Log.t()], boolean) :: [tuple]
+  def decode_logs(logs, skip_sig_provider?) do
     {result, _, _} =
       Enum.reduce(logs, {[], %{}, %{}}, fn log, {results, contracts_acc, events_acc} ->
         {result, contracts_acc, events_acc} =
@@ -283,12 +284,12 @@ defmodule BlockScoutWeb.API.V2.TransactionView do
     }
   end
 
-  def prepare_log(log, transaction_or_hash, decoded_log) do
+  def prepare_log(log, transaction_or_hash, decoded_log, tags_for_address_needed? \\ false) do
     decoded = process_decoded_log(decoded_log)
 
     %{
       "tx_hash" => get_tx_hash(transaction_or_hash),
-      "address" => Helper.address_with_info(nil, log.address, log.address_hash, false),
+      "address" => Helper.address_with_info(nil, log.address, log.address_hash, tags_for_address_needed?),
       "topics" => [
         log.first_topic,
         log.second_topic,
@@ -573,9 +574,9 @@ defmodule BlockScoutWeb.API.V2.TransactionView do
   def token_transfers_overflow(token_transfers, _),
     do: Enum.count(token_transfers) > Chain.get_token_transfers_per_transaction_preview_count()
 
-  defp transaction_actions(%NotLoaded{}), do: []
+  def transaction_actions(%NotLoaded{}), do: []
 
-  defp transaction_actions(actions) do
+  def transaction_actions(actions) do
     render("transaction_actions.json", %{actions: actions})
   end
 
@@ -617,7 +618,7 @@ defmodule BlockScoutWeb.API.V2.TransactionView do
     end
   end
 
-  defp decoded_input(decoded_input) do
+  def decoded_input(decoded_input) do
     case decoded_input do
       {:ok, method_id, text, mapping} ->
         render(__MODULE__, "decoded_input.json", method_id: method_id, text: text, mapping: mapping, error?: false)
@@ -695,17 +696,17 @@ defmodule BlockScoutWeb.API.V2.TransactionView do
     |> Timex.diff(right, :milliseconds)
   end
 
-  defp method_name(_, _, skip_sc_check? \\ false)
+  def method_name(_, _, skip_sc_check? \\ false)
 
-  defp method_name(_, {:ok, _method_id, text, _mapping}, _) do
+  def method_name(_, {:ok, _method_id, text, _mapping}, _) do
     Transaction.parse_method_name(text, false)
   end
 
-  defp method_name(
-         %Transaction{to_address: to_address, input: %{bytes: <<method_id::binary-size(4), _::binary>>}},
-         _,
-         skip_sc_check?
-       ) do
+  def method_name(
+        %Transaction{to_address: to_address, input: %{bytes: <<method_id::binary-size(4), _::binary>>}},
+        _,
+        skip_sc_check?
+      ) do
     if skip_sc_check? || Address.is_smart_contract(to_address) do
       "0x" <> Base.encode16(method_id, case: :lower)
     else
@@ -713,13 +714,24 @@ defmodule BlockScoutWeb.API.V2.TransactionView do
     end
   end
 
-  defp method_name(_, _, _) do
+  def method_name(_, _, _) do
     nil
   end
 
-  defp tx_types(tx, types \\ [], stage \\ :token_transfer)
-
-  defp tx_types(%Transaction{token_transfers: token_transfers} = tx, types, :token_transfer) do
+  @spec tx_types(
+          Explorer.Chain.Transaction.t(),
+          list,
+          :coin_transfer
+          | :contract_call
+          | :contract_creation
+          | :rootstock_bridge
+          | :rootstock_remasc
+          | :token_creation
+          | :token_transfer
+        ) :: list
+  def tx_types(tx, types \\ [], stage \\ :token_transfer)
+
+  def tx_types(%Transaction{token_transfers: token_transfers} = tx, types, :token_transfer) do
     types =
       if (!is_nil(token_transfers) && token_transfers != [] && !match?(%NotLoaded{}, token_transfers)) ||
            tx.has_token_transfers do
@@ -731,7 +743,7 @@ defmodule BlockScoutWeb.API.V2.TransactionView do
     tx_types(tx, types, :token_creation)
   end
 
-  defp tx_types(%Transaction{created_contract_address: created_contract_address} = tx, types, :token_creation) do
+  def tx_types(%Transaction{created_contract_address: created_contract_address} = tx, types, :token_creation) do
     types =
       if match?(%Address{}, created_contract_address) && match?(%Token{}, created_contract_address.token) do
         [:token_creation | types]
@@ -742,11 +754,11 @@ defmodule BlockScoutWeb.API.V2.TransactionView do
     tx_types(tx, types, :contract_creation)
   end
 
-  defp tx_types(
-         %Transaction{to_address_hash: to_address_hash} = tx,
-         types,
-         :contract_creation
-       ) do
+  def tx_types(
+        %Transaction{to_address_hash: to_address_hash} = tx,
+        types,
+        :contract_creation
+      ) do
     types =
       if is_nil(to_address_hash) do
         [:contract_creation | types]
@@ -757,7 +769,7 @@ defmodule BlockScoutWeb.API.V2.TransactionView do
     tx_types(tx, types, :contract_call)
   end
 
-  defp tx_types(%Transaction{to_address: to_address} = tx, types, :contract_call) do
+  def tx_types(%Transaction{to_address: to_address} = tx, types, :contract_call) do
     types =
       if Address.is_smart_contract(to_address) do
         [:contract_call | types]
@@ -768,7 +780,7 @@ defmodule BlockScoutWeb.API.V2.TransactionView do
     tx_types(tx, types, :coin_transfer)
   end
 
-  defp tx_types(%Transaction{value: value} = tx, types, :coin_transfer) do
+  def tx_types(%Transaction{value: value} = tx, types, :coin_transfer) do
     types =
       if Decimal.compare(value.value, 0) == :gt do
         [:coin_transfer | types]
@@ -779,7 +791,7 @@ defmodule BlockScoutWeb.API.V2.TransactionView do
     tx_types(tx, types, :rootstock_remasc)
   end
 
-  defp tx_types(tx, types, :rootstock_remasc) do
+  def tx_types(tx, types, :rootstock_remasc) do
     types =
       if Transaction.is_rootstock_remasc_transaction(tx) do
         [:rootstock_remasc | types]
@@ -790,7 +802,7 @@ defmodule BlockScoutWeb.API.V2.TransactionView do
     tx_types(tx, types, :rootstock_bridge)
   end
 
-  defp tx_types(tx, types, :rootstock_bridge) do
+  def tx_types(tx, types, :rootstock_bridge) do
     if Transaction.is_rootstock_bridge_transaction(tx) do
       [:rootstock_bridge | types]
     else
diff --git a/apps/explorer/lib/explorer/helper.ex b/apps/explorer/lib/explorer/helper.ex
index 45d92a283068..20d65314b23e 100644
--- a/apps/explorer/lib/explorer/helper.ex
+++ b/apps/explorer/lib/explorer/helper.ex
@@ -81,4 +81,15 @@ defmodule Explorer.Helper do
       _ -> %{error: data}
     end
   end
+
+  @doc """
+    Tries to decode binary to json, return either decoded object, or initial binary
+  """
+  @spec maybe_decode(binary) :: any
+  def maybe_decode(data) do
+    case safe_decode_json(data) do
+      %{error: _} -> data
+      decoded -> decoded
+    end
+  end
 end
diff --git a/apps/explorer/lib/explorer/smart_contract/rust_verifier_interface_behaviour.ex b/apps/explorer/lib/explorer/smart_contract/rust_verifier_interface_behaviour.ex
index 2466e6e1d572..2c5629d219c0 100644
--- a/apps/explorer/lib/explorer/smart_contract/rust_verifier_interface_behaviour.ex
+++ b/apps/explorer/lib/explorer/smart_contract/rust_verifier_interface_behaviour.ex
@@ -5,7 +5,7 @@ defmodule Explorer.SmartContract.RustVerifierInterfaceBehaviour do
   defmacro __using__(_) do
     # credo:disable-for-next-line
     quote([]) do
-      alias Explorer.Utility.RustService
+      alias Explorer.Utility.Microservice
       alias HTTPoison.Response
       require Logger
 
@@ -172,7 +172,7 @@ defmodule Explorer.SmartContract.RustVerifierInterfaceBehaviour do
       def base_api_url, do: "#{base_url()}" <> "/api/v2"
 
       def base_url do
-        RustService.base_url(Explorer.SmartContract.RustVerifierInterfaceBehaviour)
+        Microservice.base_url(Explorer.SmartContract.RustVerifierInterfaceBehaviour)
       end
 
       def enabled?, do: Application.get_env(:explorer, Explorer.SmartContract.RustVerifierInterfaceBehaviour)[:enabled]
diff --git a/apps/explorer/lib/explorer/smart_contract/sig_provider_interface.ex b/apps/explorer/lib/explorer/smart_contract/sig_provider_interface.ex
index 92bba0d0ec70..b97f9bcd1edf 100644
--- a/apps/explorer/lib/explorer/smart_contract/sig_provider_interface.ex
+++ b/apps/explorer/lib/explorer/smart_contract/sig_provider_interface.ex
@@ -3,7 +3,7 @@ defmodule Explorer.SmartContract.SigProviderInterface do
     Adapter for decoding events and function calls with https://github.com/blockscout/blockscout-rs/tree/main/sig-provider
   """
 
-  alias Explorer.Utility.RustService
+  alias Explorer.Utility.Microservice
   alias HTTPoison.Response
   require Logger
 
@@ -81,7 +81,7 @@ defmodule Explorer.SmartContract.SigProviderInterface do
   def base_api_url, do: "#{base_url()}" <> "/api/v1/abi"
 
   def base_url do
-    RustService.base_url(__MODULE__)
+    Microservice.base_url(__MODULE__)
   end
 
   def enabled?, do: Application.get_env(:explorer, __MODULE__)[:enabled]
diff --git a/apps/explorer/lib/explorer/utility/microservice.ex b/apps/explorer/lib/explorer/utility/microservice.ex
new file mode 100644
index 000000000000..6200f7f7acdf
--- /dev/null
+++ b/apps/explorer/lib/explorer/utility/microservice.ex
@@ -0,0 +1,15 @@
+defmodule Explorer.Utility.Microservice do
+  @moduledoc """
+  Module is responsible for common utils related to microservices.
+  """
+  def base_url(application \\ :explorer, module) do
+    url = Application.get_env(application, module)[:service_url]
+
+    if String.ends_with?(url, "/") do
+      url
+      |> String.slice(0..(String.length(url) - 2))
+    else
+      url
+    end
+  end
+end
diff --git a/apps/explorer/lib/explorer/utility/rust_service.ex b/apps/explorer/lib/explorer/utility/rust_service.ex
deleted file mode 100644
index 63f949961252..000000000000
--- a/apps/explorer/lib/explorer/utility/rust_service.ex
+++ /dev/null
@@ -1,15 +0,0 @@
-defmodule Explorer.Utility.RustService do
-  @moduledoc """
-  Module is responsible for common utils related to rust microservices.
-  """
-  def base_url(module) do
-    url = Application.get_env(:explorer, module)[:service_url]
-
-    if String.ends_with?(url, "/") do
-      url
-      |> String.slice(0..(String.length(url) - 2))
-    else
-      url
-    end
-  end
-end
diff --git a/apps/explorer/lib/explorer/visualize/sol2uml.ex b/apps/explorer/lib/explorer/visualize/sol2uml.ex
index 10a6c2a9efda..459531a36299 100644
--- a/apps/explorer/lib/explorer/visualize/sol2uml.ex
+++ b/apps/explorer/lib/explorer/visualize/sol2uml.ex
@@ -2,7 +2,7 @@ defmodule Explorer.Visualize.Sol2uml do
   @moduledoc """
     Adapter for sol2uml visualizer with https://github.com/blockscout/blockscout-rs/blob/main/visualizer
   """
-  alias Explorer.Utility.RustService
+  alias Explorer.Utility.Microservice
   alias HTTPoison.Response
   require Logger
 
@@ -61,7 +61,7 @@ defmodule Explorer.Visualize.Sol2uml do
   def base_api_url, do: "#{base_url()}" <> "/api/v1"
 
   def base_url do
-    RustService.base_url(__MODULE__)
+    Microservice.base_url(__MODULE__)
   end
 
   def enabled?, do: Application.get_env(:explorer, __MODULE__)[:enabled]
diff --git a/config/runtime.exs b/config/runtime.exs
index ec0cd0427b01..8fe99566ef2e 100644
--- a/config/runtime.exs
+++ b/config/runtime.exs
@@ -132,6 +132,10 @@ config :block_scout_web, BlockScoutWeb.Chain.Address.CoinBalance,
 
 config :block_scout_web, BlockScoutWeb.API.V2, enabled: ConfigHelper.parse_bool_env_var("API_V2_ENABLED", "true")
 
+config :block_scout_web, BlockScoutWeb.MicroserviceInterfaces.TransactionInterpretation,
+  service_url: System.get_env("MICROSERVICE_TX_INTERPRETATION_URL"),
+  enabled: ConfigHelper.parse_bool_env_var("MICROSERVICE_TX_INTERPRETATION_ENABLED")
+
 # Configures Ueberauth's Auth0 auth provider
 config :ueberauth, Ueberauth.Strategy.Auth0.OAuth,
   domain: System.get_env("ACCOUNT_AUTH0_DOMAIN"),

From ccfadcee82ff691a6b32d7a2fbcc2377081db2dc Mon Sep 17 00:00:00 2001
From: Nikita Pozdniakov <nikitosing4@mail.ru>
Date: Wed, 13 Dec 2023 13:51:00 +0300
Subject: [PATCH 766/909] Fix review comments; Fix txransaction actions preload

---
 .../transaction_interpretation.ex             | 13 ++++++------
 .../views/api/v2/transaction_view.ex          | 20 ++++++++++---------
 config/runtime.exs                            |  4 ++--
 3 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/apps/block_scout_web/lib/block_scout_web/microservice_interfaces/transaction_interpretation.ex b/apps/block_scout_web/lib/block_scout_web/microservice_interfaces/transaction_interpretation.ex
index 8ad149081d3c..30a7f95be06f 100644
--- a/apps/block_scout_web/lib/block_scout_web/microservice_interfaces/transaction_interpretation.ex
+++ b/apps/block_scout_web/lib/block_scout_web/microservice_interfaces/transaction_interpretation.ex
@@ -17,7 +17,7 @@ defmodule BlockScoutWeb.MicroserviceInterfaces.TransactionInterpretation do
   @api_true api?: true
   @items_limit 50
 
-  @spec interpret(any) :: {:error, :disabled | binary} | {:ok, any}
+  @spec interpret(Transaction.t()) :: {:error, :disabled | binary} | {:ok, any}
   def interpret(transaction) do
     if enabled?() do
       url = interpret_url()
@@ -64,7 +64,7 @@ defmodule BlockScoutWeb.MicroserviceInterfaces.TransactionInterpretation do
   end
 
   defp prepare_request_body(transaction) do
-    preloaded_transaction =
+    transaction =
       Chain.select_repo(@api_true).preload(transaction, [
         :transaction_actions,
         to_address: [:names, :smart_contract],
@@ -79,13 +79,12 @@ defmodule BlockScoutWeb.MicroserviceInterfaces.TransactionInterpretation do
 
     %{
       data: %{
-        to:
-          Helper.address_with_info(nil, preloaded_transaction.to_address, preloaded_transaction.to_address_hash, true),
+        to: Helper.address_with_info(nil, transaction.to_address, transaction.to_address_hash, true),
         from:
           Helper.address_with_info(
             nil,
-            preloaded_transaction.from_address,
-            preloaded_transaction.from_address_hash,
+            transaction.from_address,
+            transaction.from_address_hash,
             true
           ),
         hash: transaction.hash,
@@ -97,7 +96,7 @@ defmodule BlockScoutWeb.MicroserviceInterfaces.TransactionInterpretation do
         tx_types: TransactionView.tx_types(transaction),
         raw_input: transaction.input,
         decoded_input: decoded_input_data,
-        token_transfers: prepare_token_transfers(preloaded_transaction, decoded_input)
+        token_transfers: prepare_token_transfers(transaction, decoded_input)
       },
       logs_data: %{items: prepare_logs(transaction)}
     }
diff --git a/apps/block_scout_web/lib/block_scout_web/views/api/v2/transaction_view.ex b/apps/block_scout_web/lib/block_scout_web/views/api/v2/transaction_view.ex
index 3314b06e58f0..a94cecbcf5db 100644
--- a/apps/block_scout_web/lib/block_scout_web/views/api/v2/transaction_view.ex
+++ b/apps/block_scout_web/lib/block_scout_web/views/api/v2/transaction_view.ex
@@ -720,15 +720,17 @@ defmodule BlockScoutWeb.API.V2.TransactionView do
 
   @spec tx_types(
           Explorer.Chain.Transaction.t(),
-          list,
-          :coin_transfer
-          | :contract_call
-          | :contract_creation
-          | :rootstock_bridge
-          | :rootstock_remasc
-          | :token_creation
-          | :token_transfer
-        ) :: list
+          [tx_type],
+          tx_type
+        ) :: [tx_type]
+        when tx_type:
+               :coin_transfer
+               | :contract_call
+               | :contract_creation
+               | :rootstock_bridge
+               | :rootstock_remasc
+               | :token_creation
+               | :token_transfer
   def tx_types(tx, types \\ [], stage \\ :token_transfer)
 
   def tx_types(%Transaction{token_transfers: token_transfers} = tx, types, :token_transfer) do
diff --git a/config/runtime.exs b/config/runtime.exs
index 8fe99566ef2e..3b530be178d9 100644
--- a/config/runtime.exs
+++ b/config/runtime.exs
@@ -133,8 +133,8 @@ config :block_scout_web, BlockScoutWeb.Chain.Address.CoinBalance,
 config :block_scout_web, BlockScoutWeb.API.V2, enabled: ConfigHelper.parse_bool_env_var("API_V2_ENABLED", "true")
 
 config :block_scout_web, BlockScoutWeb.MicroserviceInterfaces.TransactionInterpretation,
-  service_url: System.get_env("MICROSERVICE_TX_INTERPRETATION_URL"),
-  enabled: ConfigHelper.parse_bool_env_var("MICROSERVICE_TX_INTERPRETATION_ENABLED")
+  service_url: System.get_env("MICROSERVICE_TRANSACTION_INTERPRETATION_URL"),
+  enabled: ConfigHelper.parse_bool_env_var("MICROSERVICE_TRANSACTION_INTERPRETATION_ENABLED")
 
 # Configures Ueberauth's Auth0 auth provider
 config :ueberauth, Ueberauth.Strategy.Auth0.OAuth,

From ea6e678f6eeecf78225e6eaa7d57b5107fcd6e6c Mon Sep 17 00:00:00 2001
From: Nikita Pozdniakov <nikitosing4@mail.ru>
Date: Thu, 14 Dec 2023 18:18:10 +0300
Subject: [PATCH 767/909] Add token preload to tx summary endpoint

---
 .../api/v2/transaction_controller.ex          |  5 +--
 .../transaction_interpretation.ex             | 34 +++++++++++++++++--
 apps/explorer/lib/explorer/chain.ex           |  7 ++--
 3 files changed, 36 insertions(+), 10 deletions(-)

diff --git a/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/transaction_controller.ex b/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/transaction_controller.ex
index f86c06c3cd77..368463461c79 100644
--- a/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/transaction_controller.ex
+++ b/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/transaction_controller.ex
@@ -25,7 +25,7 @@ defmodule BlockScoutWeb.API.V2.TransactionController do
   alias BlockScoutWeb.AccessHelper
   alias BlockScoutWeb.MicroserviceInterfaces.TransactionInterpretation, as: TransactionInterpretationService
   alias BlockScoutWeb.Models.TransactionStateHelper
-  alias Explorer.{Chain, Helper}
+  alias Explorer.Chain
   alias Explorer.Chain.Zkevm.Reader
   alias Indexer.Fetcher.FirstTraceOnDemand
 
@@ -366,7 +366,8 @@ defmodule BlockScoutWeb.API.V2.TransactionController do
          {:ok, transaction, _transaction_hash} <- validate_transaction(transaction_hash_string, params) do
       response =
         case TransactionInterpretationService.interpret(transaction) do
-          {:ok, response} -> Helper.maybe_decode(response)
+          {:ok, response} -> response
+          {:error, %Jason.DecodeError{}} -> %{error: "Error while tx interpreter response decoding"}
           {:error, error} -> %{error: error}
         end
 
diff --git a/apps/block_scout_web/lib/block_scout_web/microservice_interfaces/transaction_interpretation.ex b/apps/block_scout_web/lib/block_scout_web/microservice_interfaces/transaction_interpretation.ex
index 30a7f95be06f..ea38800be069 100644
--- a/apps/block_scout_web/lib/block_scout_web/microservice_interfaces/transaction_interpretation.ex
+++ b/apps/block_scout_web/lib/block_scout_web/microservice_interfaces/transaction_interpretation.ex
@@ -3,7 +3,7 @@ defmodule BlockScoutWeb.MicroserviceInterfaces.TransactionInterpretation do
     Module to interact with Transaction Interpretation Service
   """
 
-  alias BlockScoutWeb.API.V2.{Helper, TransactionView}
+  alias BlockScoutWeb.API.V2.{Helper, TokenView, TransactionView}
   alias Explorer.Chain
   alias Explorer.Chain.Transaction
   alias HTTPoison.Response
@@ -17,7 +17,7 @@ defmodule BlockScoutWeb.MicroserviceInterfaces.TransactionInterpretation do
   @api_true api?: true
   @items_limit 50
 
-  @spec interpret(Transaction.t()) :: {:error, :disabled | binary} | {:ok, any}
+  @spec interpret(Transaction.t()) :: {:error, :disabled | binary | Jason.DecodeError.t()} | {:ok, any}
   def interpret(transaction) do
     if enabled?() do
       url = interpret_url()
@@ -35,7 +35,7 @@ defmodule BlockScoutWeb.MicroserviceInterfaces.TransactionInterpretation do
 
     case HTTPoison.post(url, Jason.encode!(body), headers, recv_timeout: @post_timeout) do
       {:ok, %Response{body: body, status_code: 200}} ->
-        {:ok, body}
+        body |> Jason.decode() |> preload_tokens()
 
       error ->
         old_truncate = Application.get_env(:logger, :truncate)
@@ -143,4 +143,32 @@ defmodule BlockScoutWeb.MicroserviceInterfaces.TransactionInterpretation do
     |> Enum.zip(decoded_logs)
     |> Enum.map(fn {log, decoded_log} -> TransactionView.prepare_log(log, transaction.hash, decoded_log, true) end)
   end
+
+  defp preload_tokens({:ok, %{"success" => true, "data" => %{"summaries" => summaries}}}) do
+    summaries_updated =
+      Enum.map(summaries, fn %{"summary_template_variables" => summary_template_variables} = summary ->
+        summary_template_variables_preloaded =
+          Enum.reduce(summary_template_variables, %{}, fn {key, value}, acc ->
+            Map.put(acc, key, preload_token(value))
+          end)
+
+        Map.put(summary, "summary_template_variables", summary_template_variables_preloaded)
+      end)
+
+    {:ok, %{"success" => true, "data" => %{"summaries" => summaries_updated}}}
+  end
+
+  defp preload_tokens(error), do: error
+
+  defp preload_token(%{"type" => "token", "value" => %{"address" => address_hash_string} = value}),
+    do: %{
+      "type" => "token",
+      "value" => address_hash_string |> Chain.token_from_address_hash(@api_true) |> token_from_db() |> Map.merge(value)
+    }
+
+  defp preload_token(other), do: other
+
+  defp token_from_db({:error, _}), do: %{}
+
+  defp token_from_db({:ok, token}), do: TokenView.render("token.json", %{token: token})
 end
diff --git a/apps/explorer/lib/explorer/chain.ex b/apps/explorer/lib/explorer/chain.ex
index 6d3f48b91b41..a3d99d4e8479 100644
--- a/apps/explorer/lib/explorer/chain.ex
+++ b/apps/explorer/lib/explorer/chain.ex
@@ -3721,12 +3721,9 @@ defmodule Explorer.Chain do
       `:required`, and the `t:Token.t/0` has no associated record for that association,
       then the `t:Token.t/0` will not be included in the list.
   """
-  @spec token_from_address_hash(Hash.Address.t(), [necessity_by_association_option | api?]) ::
+  @spec token_from_address_hash(Hash.Address.t() | String.t(), [necessity_by_association_option | api?]) ::
           {:ok, Token.t()} | {:error, :not_found}
-  def token_from_address_hash(
-        %Hash{byte_count: unquote(Hash.Address.byte_count())} = hash,
-        options \\ []
-      ) do
+  def token_from_address_hash(hash, options \\ []) do
     necessity_by_association = Keyword.get(options, :necessity_by_association, %{})
 
     query =

From 0673e7fd07ae9829bf4d07e0dcf7be85945ba49f Mon Sep 17 00:00:00 2001
From: Viktor Baranov <baranov.viktor.27@gmail.com>
Date: Fri, 15 Dec 2023 11:19:41 +0300
Subject: [PATCH 768/909] Mention new Manual deployment guide in the README

---
 README.md | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 91130f13aaec..678d7f78d118 100644
--- a/README.md
+++ b/README.md
@@ -28,9 +28,11 @@ Blockscout currently supports several hundred chains and rollups throughout the
 
 See the [project documentation](https://docs.blockscout.com/) for instructions:
 
-- [Requirements](https://docs.blockscout.com/for-developers/information-and-settings/requirements)
+- [Manual deployment](https://docs.blockscout.com/for-developers/deployment/manual-deployment-guide)
+- [Docker-compose deployment](https://docs.blockscout.com/for-developers/deployment/docker-compose-deployment)
+- [Kubernetes deployment](https://docs.blockscout.com/for-developers/deployment/kubernetes-deployment)
+- [Manual deployment (backend + old UI)](https://docs.blockscout.com/for-developers/deployment/manual-old-ui)
 - [Ansible deployment](https://docs.blockscout.com/for-developers/ansible-deployment)
-- [Manual deployment](https://docs.blockscout.com/for-developers/manual-deployment)
 - [ENV variables](https://docs.blockscout.com/for-developers/information-and-settings/env-variables)
 - [Configuration options](https://docs.blockscout.com/for-developers/configuration-options)
 

From b9318e09d7ccf6b19f086f45e0d5361551ac2c07 Mon Sep 17 00:00:00 2001
From: Nikita Pozdniakov <nikitosing4@mail.ru>
Date: Sun, 17 Dec 2023 18:12:59 +0300
Subject: [PATCH 769/909] Speed up Indexer.Fetcher.TokenInstance.LegacySanitize

---
 CHANGELOG.md                                  |  1 +
 apps/explorer/lib/explorer/chain.ex           | 50 -----------
 .../lib/explorer/chain/token/instance.ex      | 28 +++++++
 .../explorer/chain/token/instance_test.exs    | 83 +++++++++++++++++++
 apps/explorer/test/explorer/chain_test.exs    | 77 -----------------
 .../fetcher/token_instance/legacy_sanitize.ex | 78 ++++++++---------
 apps/indexer/lib/indexer/supervisor.ex        |  2 +-
 config/runtime.exs                            |  2 +-
 8 files changed, 149 insertions(+), 172 deletions(-)
 create mode 100644 apps/explorer/test/explorer/chain/token/instance_test.exs

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0ffaf8eef8ca..967b514acc70 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,7 @@
 
 ### Fixes
 
+- [#9013](https://github.com/blockscout/blockscout/pull/9013) - Speed up `Indexer.Fetcher.TokenInstance.LegacySanitize`
 - [#8955](https://github.com/blockscout/blockscout/pull/8955) - Remove daily balances updating from BlockReward fetcher
 
 ### Chore
diff --git a/apps/explorer/lib/explorer/chain.ex b/apps/explorer/lib/explorer/chain.ex
index 6d3f48b91b41..43a2ae836f28 100644
--- a/apps/explorer/lib/explorer/chain.ex
+++ b/apps/explorer/lib/explorer/chain.ex
@@ -3554,56 +3554,6 @@ defmodule Explorer.Chain do
     |> Repo.stream_reduce(initial, reducer)
   end
 
-  @doc """
-    Finds all token instances (pairs of contract_address_hash and token_id) which was met in token transfers but has no corresponding entry in token_instances table
-  """
-  @spec stream_not_inserted_token_instances(
-          initial :: accumulator,
-          reducer :: (entry :: map(), accumulator -> accumulator)
-        ) :: {:ok, accumulator}
-        when accumulator: term()
-  def stream_not_inserted_token_instances(initial, reducer) when is_function(reducer, 2) do
-    nft_tokens =
-      from(
-        token in Token,
-        where: token.type == ^"ERC-721" or token.type == ^"ERC-1155",
-        select: token.contract_address_hash
-      )
-
-    token_ids_query =
-      from(
-        token_transfer in TokenTransfer,
-        select: %{
-          token_contract_address_hash: token_transfer.token_contract_address_hash,
-          token_id: fragment("unnest(?)", token_transfer.token_ids)
-        }
-      )
-
-    query =
-      from(
-        transfer in subquery(token_ids_query),
-        inner_join: token in subquery(nft_tokens),
-        on: token.contract_address_hash == transfer.token_contract_address_hash,
-        left_join: instance in Instance,
-        on:
-          transfer.token_contract_address_hash == instance.token_contract_address_hash and
-            transfer.token_id == instance.token_id,
-        where: is_nil(instance.token_id),
-        select: %{
-          contract_address_hash: transfer.token_contract_address_hash,
-          token_id: transfer.token_id
-        }
-      )
-
-    distinct_query =
-      from(
-        q in subquery(query),
-        distinct: [q.contract_address_hash, q.token_id]
-      )
-
-    Repo.stream_reduce(distinct_query, initial, reducer)
-  end
-
   @doc """
     Finds all token instances where metadata never tried to fetch
   """
diff --git a/apps/explorer/lib/explorer/chain/token/instance.ex b/apps/explorer/lib/explorer/chain/token/instance.ex
index 608aec33193e..e4680bb0250f 100644
--- a/apps/explorer/lib/explorer/chain/token/instance.ex
+++ b/apps/explorer/lib/explorer/chain/token/instance.ex
@@ -413,4 +413,32 @@ defmodule Explorer.Chain.Token.Instance do
     |> select_merge([ctb: ctb], %{current_token_balance: ctb})
     |> Chain.select_repo(options).all()
   end
+
+  @doc """
+    Finds token instances (pairs of contract_address_hash and token_id) which was met in token transfers but has no corresponding entry in token_instances table
+  """
+  @spec not_inserted_token_instances_query(integer()) :: Ecto.Query.t()
+  def not_inserted_token_instances_query(limit) do
+    token_transfers_query =
+      TokenTransfer
+      |> where([token_transfer], not is_nil(token_transfer.token_ids) and token_transfer.token_ids != ^[])
+      |> select([token_transfer], %{
+        token_contract_address_hash: token_transfer.token_contract_address_hash,
+        token_id: fragment("unnest(?)", token_transfer.token_ids)
+      })
+
+    token_transfers_query
+    |> subquery()
+    |> join(:left, [token_transfer], token_instance in __MODULE__,
+      on:
+        token_instance.token_contract_address_hash == token_transfer.token_contract_address_hash and
+          token_instance.token_id == token_transfer.token_id
+    )
+    |> where([token_transfer, token_instance], is_nil(token_instance.token_id))
+    |> select([token_transfer, token_instance], %{
+      contract_address_hash: token_transfer.token_contract_address_hash,
+      token_id: token_transfer.token_id
+    })
+    |> limit(^limit)
+  end
 end
diff --git a/apps/explorer/test/explorer/chain/token/instance_test.exs b/apps/explorer/test/explorer/chain/token/instance_test.exs
new file mode 100644
index 000000000000..96f78e79fcc6
--- /dev/null
+++ b/apps/explorer/test/explorer/chain/token/instance_test.exs
@@ -0,0 +1,83 @@
+defmodule Explorer.Chain.Token.InstanceTest do
+  use Explorer.DataCase
+
+  alias Explorer.Repo
+  alias Explorer.Chain.Token.Instance
+
+  describe "stream_not_inserted_token_instances/2" do
+    test "reduces with given reducer and accumulator for ERC-721 token" do
+      token_contract_address = insert(:contract_address)
+      token = insert(:token, contract_address: token_contract_address, type: "ERC-721")
+
+      transaction =
+        :transaction
+        |> insert()
+        |> with_block(insert(:block, number: 1))
+
+      token_transfer =
+        insert(
+          :token_transfer,
+          block_number: 1000,
+          to_address: build(:address),
+          transaction: transaction,
+          token_contract_address: token_contract_address,
+          token: token,
+          token_ids: [11]
+        )
+
+      assert [result] = 5 |> Instance.not_inserted_token_instances_query() |> Repo.all()
+      assert result.token_id == List.first(token_transfer.token_ids)
+      assert result.contract_address_hash == token_transfer.token_contract_address_hash
+    end
+
+    test "does not fetch token transfers without token_ids" do
+      token_contract_address = insert(:contract_address)
+      token = insert(:token, contract_address: token_contract_address, type: "ERC-721")
+
+      transaction =
+        :transaction
+        |> insert()
+        |> with_block(insert(:block, number: 1))
+
+      insert(
+        :token_transfer,
+        block_number: 1000,
+        to_address: build(:address),
+        transaction: transaction,
+        token_contract_address: token_contract_address,
+        token: token,
+        token_ids: nil
+      )
+
+      assert [] = 5 |> Instance.not_inserted_token_instances_query() |> Repo.all()
+    end
+
+    test "do not fetch records with token instances" do
+      token_contract_address = insert(:contract_address)
+      token = insert(:token, contract_address: token_contract_address, type: "ERC-721")
+
+      transaction =
+        :transaction
+        |> insert()
+        |> with_block(insert(:block, number: 1))
+
+      token_transfer =
+        insert(
+          :token_transfer,
+          block_number: 1000,
+          to_address: build(:address),
+          transaction: transaction,
+          token_contract_address: token_contract_address,
+          token: token,
+          token_ids: [11]
+        )
+
+      insert(:token_instance,
+        token_id: List.first(token_transfer.token_ids),
+        token_contract_address_hash: token_transfer.token_contract_address_hash
+      )
+
+      assert [] = 5 |> Instance.not_inserted_token_instances_query() |> Repo.all()
+    end
+  end
+end
diff --git a/apps/explorer/test/explorer/chain_test.exs b/apps/explorer/test/explorer/chain_test.exs
index 492861338086..eb4acd1ea340 100644
--- a/apps/explorer/test/explorer/chain_test.exs
+++ b/apps/explorer/test/explorer/chain_test.exs
@@ -4066,83 +4066,6 @@ defmodule Explorer.ChainTest do
     end
   end
 
-  describe "stream_not_inserted_token_instances/2" do
-    test "reduces with given reducer and accumulator for ERC-721 token" do
-      token_contract_address = insert(:contract_address)
-      token = insert(:token, contract_address: token_contract_address, type: "ERC-721")
-
-      transaction =
-        :transaction
-        |> insert()
-        |> with_block(insert(:block, number: 1))
-
-      token_transfer =
-        insert(
-          :token_transfer,
-          block_number: 1000,
-          to_address: build(:address),
-          transaction: transaction,
-          token_contract_address: token_contract_address,
-          token: token,
-          token_ids: [11]
-        )
-
-      assert {:ok, [result]} = Chain.stream_not_inserted_token_instances([], &[&1 | &2])
-      assert result.token_id == List.first(token_transfer.token_ids)
-      assert result.contract_address_hash == token_transfer.token_contract_address_hash
-    end
-
-    test "does not fetch token transfers without token_ids" do
-      token_contract_address = insert(:contract_address)
-      token = insert(:token, contract_address: token_contract_address, type: "ERC-721")
-
-      transaction =
-        :transaction
-        |> insert()
-        |> with_block(insert(:block, number: 1))
-
-      insert(
-        :token_transfer,
-        block_number: 1000,
-        to_address: build(:address),
-        transaction: transaction,
-        token_contract_address: token_contract_address,
-        token: token,
-        token_ids: nil
-      )
-
-      assert {:ok, []} = Chain.stream_not_inserted_token_instances([], &[&1 | &2])
-    end
-
-    test "do not fetch records with token instances" do
-      token_contract_address = insert(:contract_address)
-      token = insert(:token, contract_address: token_contract_address, type: "ERC-721")
-
-      transaction =
-        :transaction
-        |> insert()
-        |> with_block(insert(:block, number: 1))
-
-      token_transfer =
-        insert(
-          :token_transfer,
-          block_number: 1000,
-          to_address: build(:address),
-          transaction: transaction,
-          token_contract_address: token_contract_address,
-          token: token,
-          token_ids: [11]
-        )
-
-      insert(:token_instance,
-        token_id: List.first(token_transfer.token_ids),
-        token_contract_address_hash: token_transfer.token_contract_address_hash
-      )
-
-      assert {:ok, []} = Chain.stream_not_inserted_token_instances([], &[&1 | &2])
-    end
-  end
-
   describe "transaction_has_token_transfers?/1" do
     test "returns true if transaction has token transfers" do
       transaction = insert(:transaction)
diff --git a/apps/indexer/lib/indexer/fetcher/token_instance/legacy_sanitize.ex b/apps/indexer/lib/indexer/fetcher/token_instance/legacy_sanitize.ex
index 1fe11e1d90dc..391353ba3788 100644
--- a/apps/indexer/lib/indexer/fetcher/token_instance/legacy_sanitize.ex
+++ b/apps/indexer/lib/indexer/fetcher/token_instance/legacy_sanitize.ex
@@ -1,58 +1,50 @@
 defmodule Indexer.Fetcher.TokenInstance.LegacySanitize do
   @moduledoc """
-    This fetcher is stands for creating token instances which wasn't inserted yet and index meta for them. Legacy is because now we token instances inserted on block import and this fetcher is only for historical and unfetched for some reasons data
+    This fetcher is stands for creating token instances which wasn't inserted yet and index meta for them.
+    Legacy is because now we token instances inserted on block import and this fetcher is only for historical and unfetched for some reasons data
   """
 
-  use Indexer.Fetcher, restart: :permanent
-  use Spandex.Decorators
+  use GenServer, restart: :transient
 
-  import Indexer.Fetcher.TokenInstance.Helper
-
-  alias Explorer.Chain
-  alias Indexer.BufferedTask
-
-  @behaviour BufferedTask
+  alias Explorer.Chain.Token.Instance
+  alias Explorer.Repo
 
-  @default_max_batch_size 10
-  @default_max_concurrency 10
-  @doc false
-  def child_spec([init_options, gen_server_options]) do
-    merged_init_opts =
-      defaults()
-      |> Keyword.merge(init_options)
-      |> Keyword.merge(state: [])
+  import Indexer.Fetcher.TokenInstance.Helper
 
-    Supervisor.child_spec({BufferedTask, [{__MODULE__, merged_init_opts}, gen_server_options]}, id: __MODULE__)
+  def start_link(_) do
+    concurrency = Application.get_env(:indexer, __MODULE__)[:concurrency]
+    batch_size = Application.get_env(:indexer, __MODULE__)[:batch_size]
+    GenServer.start_link(__MODULE__, %{concurrency: concurrency, batch_size: batch_size}, name: __MODULE__)
   end
 
-  @impl BufferedTask
-  def init(initial_acc, reducer, _) do
-    {:ok, acc} =
-      Chain.stream_not_inserted_token_instances(initial_acc, fn data, acc ->
-        reducer.(data, acc)
-      end)
+  @impl true
+  def init(opts) do
+    GenServer.cast(__MODULE__, :backfill)
 
-    acc
+    {:ok, opts}
   end
 
-  @impl BufferedTask
-  def run(token_instances, _) when is_list(token_instances) do
-    token_instances
-    |> Enum.filter(fn %{contract_address_hash: hash, token_id: token_id} ->
-      not Chain.token_instance_exists?(token_id, hash)
-    end)
-    |> batch_fetch_instances()
-
-    :ok
+  @impl true
+  def handle_cast(:backfill, %{concurrency: concurrency, batch_size: batch_size} = state) do
+    instances_to_fetch =
+      (concurrency * batch_size)
+      |> Instance.not_inserted_token_instances_query()
+      |> Repo.all()
+
+    if Enum.empty?(instances_to_fetch) do
+      {:stop, :normal, state}
+    else
+      instances_to_fetch
+      |> Enum.uniq()
+      |> Enum.chunk_every(batch_size)
+      |> Enum.map(&process_batch/1)
+      |> Task.await_many(:infinity)
+
+      GenServer.cast(__MODULE__, :backfill)
+
+      {:noreply, state}
+    end
   end
 
-  defp defaults do
-    [
-      flush_interval: :infinity,
-      max_concurrency: Application.get_env(:indexer, __MODULE__)[:concurrency] || @default_max_concurrency,
-      max_batch_size: Application.get_env(:indexer, __MODULE__)[:batch_size] || @default_max_batch_size,
-      poll: false,
-      task_supervisor: __MODULE__.TaskSupervisor
-    ]
-  end
+  defp process_batch(batch), do: Task.async(fn -> batch_fetch_instances(batch) end)
 end
diff --git a/apps/indexer/lib/indexer/supervisor.ex b/apps/indexer/lib/indexer/supervisor.ex
index 007eab9e5db3..10a745512bd0 100644
--- a/apps/indexer/lib/indexer/supervisor.ex
+++ b/apps/indexer/lib/indexer/supervisor.ex
@@ -120,7 +120,7 @@ defmodule Indexer.Supervisor do
         {TokenInstanceRealtime.Supervisor, [[memory_monitor: memory_monitor]]},
         {TokenInstanceRetry.Supervisor, [[memory_monitor: memory_monitor]]},
         {TokenInstanceSanitize.Supervisor, [[memory_monitor: memory_monitor]]},
-        {TokenInstanceLegacySanitize.Supervisor, [[memory_monitor: memory_monitor]]},
+        {TokenInstanceLegacySanitize, [[memory_monitor: memory_monitor]]},
         configure(TransactionAction.Supervisor, [[memory_monitor: memory_monitor]]),
         {ContractCode.Supervisor,
          [[json_rpc_named_arguments: json_rpc_named_arguments, memory_monitor: memory_monitor]]},
diff --git a/config/runtime.exs b/config/runtime.exs
index ec0cd0427b01..34de34ab9b1d 100644
--- a/config/runtime.exs
+++ b/config/runtime.exs
@@ -575,7 +575,7 @@ config :indexer, Indexer.Fetcher.TokenInstance.Sanitize,
   batch_size: ConfigHelper.parse_integer_env_var("INDEXER_TOKEN_INSTANCE_SANITIZE_BATCH_SIZE", 10)
 
 config :indexer, Indexer.Fetcher.TokenInstance.LegacySanitize,
-  concurrency: ConfigHelper.parse_integer_env_var("INDEXER_TOKEN_INSTANCE_LEGACY_SANITIZE_CONCURRENCY", 10),
+  concurrency: ConfigHelper.parse_integer_env_var("INDEXER_TOKEN_INSTANCE_LEGACY_SANITIZE_CONCURRENCY", 2),
   batch_size: ConfigHelper.parse_integer_env_var("INDEXER_TOKEN_INSTANCE_LEGACY_SANITIZE_BATCH_SIZE", 10)
 
 config :indexer, Indexer.Fetcher.InternalTransaction,

From 68d5156421972265bad34cce3d2a797519127bbf Mon Sep 17 00:00:00 2001
From: Nikita Pozdniakov <nikitosing4@mail.ru>
Date: Sun, 17 Dec 2023 18:55:39 +0300
Subject: [PATCH 770/909] Decrease amount of NFT in address collection: 15 -> 9

---
 CHANGELOG.md                                           |  1 +
 .../controllers/api/v2/address_controller_test.exs     | 10 ++++++----
 apps/explorer/lib/explorer/chain/token/instance.ex     |  2 +-
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0ffaf8eef8ca..02587417eb29 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,6 +10,7 @@
 
 ### Chore
 
+- [#9014](https://github.com/blockscout/blockscout/pull/9014) - Decrease amount of NFT in address collection: 15 -> 9
 - [#8991](https://github.com/blockscout/blockscout/pull/8991) - Manage DB queue target via runtime env var
 
 <details>
diff --git a/apps/block_scout_web/test/block_scout_web/controllers/api/v2/address_controller_test.exs b/apps/block_scout_web/test/block_scout_web/controllers/api/v2/address_controller_test.exs
index 13ee1e884f1a..690c9e1bfbc2 100644
--- a/apps/block_scout_web/test/block_scout_web/controllers/api/v2/address_controller_test.exs
+++ b/apps/block_scout_web/test/block_scout_web/controllers/api/v2/address_controller_test.exs
@@ -26,6 +26,8 @@ defmodule BlockScoutWeb.API.V2.AddressControllerTest do
   import Explorer.Chain, only: [hash_to_lower_case_string: 1]
   import Mox
 
+  @instances_amount_in_collection 9
+
   setup :set_mox_global
 
   setup :verify_on_exit!
@@ -2742,10 +2744,10 @@ defmodule BlockScoutWeb.API.V2.AddressControllerTest do
     token_name = token.name
     amount = to_string(ctb.distinct_token_instances_count || ctb.value)
 
-    assert Enum.count(json["token_instances"]) == 15
+    assert Enum.count(json["token_instances"]) == @instances_amount_in_collection
 
     token_instances
-    |> Enum.take(15)
+    |> Enum.take(@instances_amount_in_collection)
     |> Enum.with_index()
     |> Enum.each(fn {instance, index} ->
       compare_token_instance_in_collection(instance, Enum.at(json["token_instances"], index))
@@ -2763,10 +2765,10 @@ defmodule BlockScoutWeb.API.V2.AddressControllerTest do
     token_name = token.name
     amount = to_string(amount)
 
-    assert Enum.count(json["token_instances"]) == 15
+    assert Enum.count(json["token_instances"]) == @instances_amount_in_collection
 
     token_instances
-    |> Enum.take(15)
+    |> Enum.take(@instances_amount_in_collection)
     |> Enum.with_index()
     |> Enum.each(fn {instance, index} ->
       compare_token_instance_in_collection(instance, Enum.at(json["token_instances"], index))
diff --git a/apps/explorer/lib/explorer/chain/token/instance.ex b/apps/explorer/lib/explorer/chain/token/instance.ex
index 608aec33193e..34bccbecfc29 100644
--- a/apps/explorer/lib/explorer/chain/token/instance.ex
+++ b/apps/explorer/lib/explorer/chain/token/instance.ex
@@ -224,7 +224,7 @@ defmodule Explorer.Chain.Token.Instance do
     %{"token_contract_address_hash" => token_contract_address_hash, "token_id" => token_id, "token_type" => "ERC-721"}
   end
 
-  @preloaded_nfts_limit 15
+  @preloaded_nfts_limit 9
 
   @spec nft_collections(binary() | Hash.Address.t(), keyword) :: list
   def nft_collections(address_hash, options \\ [])

From e2890b7e5f606c09a14eca02dc97a27979be25bd Mon Sep 17 00:00:00 2001
From: Nikita Pozdniakov <nikitosing4@mail.ru>
Date: Sun, 17 Dec 2023 23:44:58 +0300
Subject: [PATCH 771/909] Add @spec and @doc; Add just_request_body=true mode
 to get request body for testing purposes

---
 .../api/v2/transaction_controller.ex            | 10 +++++++++-
 .../transaction_interpretation.ex               |  4 ++++
 .../views/api/v2/transaction_view.ex            | 17 +++++++++++++++++
 3 files changed, 30 insertions(+), 1 deletion(-)

diff --git a/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/transaction_controller.ex b/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/transaction_controller.ex
index 368463461c79..b9729bad84fe 100644
--- a/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/transaction_controller.ex
+++ b/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/transaction_controller.ex
@@ -352,10 +352,18 @@ defmodule BlockScoutWeb.API.V2.TransactionController do
     end
   end
 
+  def summary(conn, %{"transaction_hash_param" => transaction_hash_string, "just_request_body" => "true"} = params) do
+    with {:tx_interpreter_enabled, true} <- {:tx_interpreter_enabled, TransactionInterpretationService.enabled?()},
+         {:ok, transaction, _transaction_hash} <- validate_transaction(transaction_hash_string, params) do
+      conn
+      |> json(TransactionInterpretationService.get_request_body(transaction))
+    end
+  end
+
   @doc """
     Function to handle GET requests to `/api/v2/transactions/:transaction_hash_param/summary` endpoint.
   """
-  @spec summary(any, map) ::
+  @spec summary(Plug.Conn.t(), map()) ::
           {:format, :error}
           | {:not_found, {:error, :not_found}}
           | {:restricted_access, true}
diff --git a/apps/block_scout_web/lib/block_scout_web/microservice_interfaces/transaction_interpretation.ex b/apps/block_scout_web/lib/block_scout_web/microservice_interfaces/transaction_interpretation.ex
index ea38800be069..7e6907668137 100644
--- a/apps/block_scout_web/lib/block_scout_web/microservice_interfaces/transaction_interpretation.ex
+++ b/apps/block_scout_web/lib/block_scout_web/microservice_interfaces/transaction_interpretation.ex
@@ -30,6 +30,10 @@ defmodule BlockScoutWeb.MicroserviceInterfaces.TransactionInterpretation do
     end
   end
 
+  def get_request_body(transaction) do
+    prepare_request_body(transaction)
+  end
+
   defp http_post_request(url, body) do
     headers = [{"Content-Type", "application/json"}]
 
diff --git a/apps/block_scout_web/lib/block_scout_web/views/api/v2/transaction_view.ex b/apps/block_scout_web/lib/block_scout_web/views/api/v2/transaction_view.ex
index a94cecbcf5db..0a2f519ea623 100644
--- a/apps/block_scout_web/lib/block_scout_web/views/api/v2/transaction_view.ex
+++ b/apps/block_scout_web/lib/block_scout_web/views/api/v2/transaction_view.ex
@@ -184,6 +184,9 @@ defmodule BlockScoutWeb.API.V2.TransactionView do
     }
   end
 
+  @doc """
+    Decodes list of logs
+  """
   @spec decode_logs([Log.t()], boolean) :: [tuple]
   def decode_logs(logs, skip_sig_provider?) do
     {result, _, _} =
@@ -576,6 +579,9 @@ defmodule BlockScoutWeb.API.V2.TransactionView do
 
   def transaction_actions(%NotLoaded{}), do: []
 
+  @doc """
+    Renders transaction actions
+  """
   def transaction_actions(actions) do
     render("transaction_actions.json", %{actions: actions})
   end
@@ -618,6 +624,10 @@ defmodule BlockScoutWeb.API.V2.TransactionView do
     end
   end
 
+  @doc """
+    Prepares decoded tx info
+  """
+  @spec decoded_input(any()) :: map() | nil
   def decoded_input(decoded_input) do
     case decoded_input do
       {:ok, method_id, text, mapping} ->
@@ -696,6 +706,10 @@ defmodule BlockScoutWeb.API.V2.TransactionView do
     |> Timex.diff(right, :milliseconds)
   end
 
+  @doc """
+    Return method name used in tx
+  """
+  @spec method_name(Transaction.t(), any(), boolean()) :: binary() | nil
   def method_name(_, _, skip_sc_check? \\ false)
 
   def method_name(_, {:ok, _method_id, text, _mapping}, _) do
@@ -718,6 +732,9 @@ defmodule BlockScoutWeb.API.V2.TransactionView do
     nil
   end
 
+  @doc """
+    Returns array of token types for tx.
+  """
   @spec tx_types(
           Explorer.Chain.Transaction.t(),
           [tx_type],

From 9449990e36f21930c49d1e3d187a1ea064a40071 Mon Sep 17 00:00:00 2001
From: Nikita Pozdniakov <nikitosing4@mail.ru>
Date: Sun, 17 Dec 2023 23:51:04 +0300
Subject: [PATCH 772/909] Do not trim debug data from response

---
 .../microservice_interfaces/transaction_interpretation.ex     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/block_scout_web/lib/block_scout_web/microservice_interfaces/transaction_interpretation.ex b/apps/block_scout_web/lib/block_scout_web/microservice_interfaces/transaction_interpretation.ex
index 7e6907668137..60d2a3a368a4 100644
--- a/apps/block_scout_web/lib/block_scout_web/microservice_interfaces/transaction_interpretation.ex
+++ b/apps/block_scout_web/lib/block_scout_web/microservice_interfaces/transaction_interpretation.ex
@@ -148,7 +148,7 @@ defmodule BlockScoutWeb.MicroserviceInterfaces.TransactionInterpretation do
     |> Enum.map(fn {log, decoded_log} -> TransactionView.prepare_log(log, transaction.hash, decoded_log, true) end)
   end
 
-  defp preload_tokens({:ok, %{"success" => true, "data" => %{"summaries" => summaries}}}) do
+  defp preload_tokens({:ok, %{"success" => true, "data" => %{"summaries" => summaries} = data}}) do
     summaries_updated =
       Enum.map(summaries, fn %{"summary_template_variables" => summary_template_variables} = summary ->
         summary_template_variables_preloaded =
@@ -159,7 +159,7 @@ defmodule BlockScoutWeb.MicroserviceInterfaces.TransactionInterpretation do
         Map.put(summary, "summary_template_variables", summary_template_variables_preloaded)
       end)
 
-    {:ok, %{"success" => true, "data" => %{"summaries" => summaries_updated}}}
+    {:ok, %{"success" => true, "data" => Map.put(data, "summaries", summaries_updated)}}
   end
 
   defp preload_tokens(error), do: error

From 21e2f46aa605aef2304a63292b82da5a9dbc6b6b Mon Sep 17 00:00:00 2001
From: Viktor Baranov <baranov.viktor.27@gmail.com>
Date: Mon, 18 Dec 2023 13:57:53 +0300
Subject: [PATCH 773/909] Rename burnt_fee_counter to total_gas_used

---
 .dialyzer-ignore                              |  2 -
 CHANGELOG.md                                  |  1 +
 .../templates/block/_tile.html.eex            |  4 +-
 .../templates/block/overview.html.eex         |  8 +-
 .../templates/transaction/overview.html.eex   | 14 ++--
 .../lib/block_scout_web/views/address_view.ex |  2 +
 .../views/api/rpc/address_view.ex             |  4 +-
 .../views/api/v2/block_view.ex                | 16 ++--
 .../views/api/v2/transaction_view.ex          |  6 +-
 .../lib/block_scout_web/views/wei_helper.ex   |  6 +-
 apps/block_scout_web/priv/gettext/default.pot | 30 +++----
 .../priv/gettext/en/LC_MESSAGES/default.po    | 30 +++----
 apps/explorer/lib/explorer/chain.ex           | 63 +-------------
 apps/explorer/lib/explorer/chain/block.ex     | 84 ++++++++++++++++++-
 apps/explorer/lib/explorer/chain/wei.ex       |  9 ++
 .../counters/block_burned_fee_counter.ex      |  2 +-
 .../test/explorer/chain/block_test.exs        | 44 +++++++++-
 apps/explorer/test/explorer/chain_test.exs    | 42 ----------
 apps/indexer/lib/indexer/block/fetcher.ex     |  6 +-
 19 files changed, 207 insertions(+), 166 deletions(-)

diff --git a/.dialyzer-ignore b/.dialyzer-ignore
index 67aeedb7fc98..a4baec92256e 100644
--- a/.dialyzer-ignore
+++ b/.dialyzer-ignore
@@ -24,5 +24,3 @@ lib/indexer/fetcher/zkevm/transaction_batch.ex:252
 lib/block_scout_web/views/api/v2/transaction_view.ex:431
 lib/block_scout_web/views/api/v2/transaction_view.ex:472
 lib/explorer/chain/transaction.ex:167
-lib/explorer/chain/transaction.ex:1452
-lib/explorer/chain/transaction.ex:1453
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 859972c71d9f..0bd0c080ebfa 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,7 @@
 ### Fixes
 
 - [#8955](https://github.com/blockscout/blockscout/pull/8955) - Remove daily balances updating from BlockReward fetcher
+- [#8846](https://github.com/blockscout/blockscout/pull/8846) - Handle nil gas_price at address view
 
 ### Chore
 
diff --git a/apps/block_scout_web/lib/block_scout_web/templates/block/_tile.html.eex b/apps/block_scout_web/lib/block_scout_web/templates/block/_tile.html.eex
index d7b9c2613400..cff7f06adb9c 100644
--- a/apps/block_scout_web/lib/block_scout_web/templates/block/_tile.html.eex
+++ b/apps/block_scout_web/lib/block_scout_web/templates/block/_tile.html.eex
@@ -1,4 +1,4 @@
-<% burned_fee = if !is_nil(@block.base_fee_per_gas), do: Wei.mult(@block.base_fee_per_gas, BlockBurnedFeeCounter.fetch(@block.hash)), else: nil %>
+<% burnt_fees = if !is_nil(@block.base_fee_per_gas), do: Wei.mult(@block.base_fee_per_gas, BlockBurnedFeeCounter.fetch(@block.hash)), else: nil %>
 <% priority_fee = if !is_nil(@block.base_fee_per_gas), do: BlockPriorityFeeCounter.fetch(@block.hash), else: nil %>
 <div class="tile tile-type-<%= String.downcase(@block_type) %> fade-up" data-selector="block-tile" data-block-number="<%= to_string(@block.number) %>" data-block-hash="<%= @block.hash %>">
   <div class="row">
@@ -61,7 +61,7 @@
         <!-- Priority Fee -->
         <span> <%= format_wei_value(%Wei{value: priority_fee}, :ether) %> <%= gettext "Priority Fees" %> </span>
         <!-- Burnt Fees -->
-        <span> <%= format_wei_value(burned_fee, :ether) %> <%= gettext "Burnt Fees" %> </span>
+        <span> <%= format_wei_value(burnt_fees, :ether) %> <%= gettext "Burnt Fees" %> </span>
       <% end %>
       <!-- Gas Limit -->
       <span> <%= formatted_gas(@block.gas_limit) %> <%= gettext "Gas Limit" %> </span>
diff --git a/apps/block_scout_web/lib/block_scout_web/templates/block/overview.html.eex b/apps/block_scout_web/lib/block_scout_web/templates/block/overview.html.eex
index 332ae2b1392a..96fdfbec92c4 100644
--- a/apps/block_scout_web/lib/block_scout_web/templates/block/overview.html.eex
+++ b/apps/block_scout_web/lib/block_scout_web/templates/block/overview.html.eex
@@ -1,4 +1,4 @@
-<% burned_fee = if !is_nil(@block.base_fee_per_gas), do: Wei.mult(@block.base_fee_per_gas, BlockBurnedFeeCounter.fetch(@block.hash)), else: nil %>
+<% burnt_fees = if !is_nil(@block.base_fee_per_gas), do: Wei.mult(@block.base_fee_per_gas, BlockBurnedFeeCounter.fetch(@block.hash)), else: nil %>
 <% priority_fee = if !is_nil(@block.base_fee_per_gas), do: BlockPriorityFeeCounter.fetch(@block.hash), else: nil %>
 <section>
   <%= render BlockScoutWeb.Advertisement.TextAdView, "index.html", conn: @conn %>
@@ -215,7 +215,7 @@
                   text: Explorer.coin_name() <> " " <> gettext("burned from transactions included in the block (Base fee (per unit of gas) * Gas Used).") %>
                   <%= gettext("Burnt Fees") %>
                 </dt>
-                <dd class="col-sm-9 col-lg-10"><i class="fa-solid fa-fire i-tooltip-2"></i> <%= format_wei_value(burned_fee, :ether) %></dd>
+                <dd class="col-sm-9 col-lg-10"><i class="fa-solid fa-fire i-tooltip-2"></i> <%= format_wei_value(burnt_fees, :ether) %></dd>
             </dl>
             <!-- Priority Fee / Tip -->
             <dl class="row">
@@ -226,7 +226,7 @@
                 </dt>
                 <dd class="col-sm-9 col-lg-10"><%= format_wei_value(%Wei{value: priority_fee}, :ether) %></dd>
             </dl>
-          <% end %>  
+          <% end %>
           <%= if show_reward?(@block.rewards) do %>
             <hr>
             <%= for block_reward <- @block.rewards do %>
@@ -268,4 +268,4 @@
     </div>
 </section>
 
-<%= render BlockScoutWeb.Advertisement.BannersAdView, "_banner_728.html", conn: @conn %> 
+<%= render BlockScoutWeb.Advertisement.BannersAdView, "_banner_728.html", conn: @conn %>
diff --git a/apps/block_scout_web/lib/block_scout_web/templates/transaction/overview.html.eex b/apps/block_scout_web/lib/block_scout_web/templates/transaction/overview.html.eex
index 08a92a4fb370..4e61f77e6990 100644
--- a/apps/block_scout_web/lib/block_scout_web/templates/transaction/overview.html.eex
+++ b/apps/block_scout_web/lib/block_scout_web/templates/transaction/overview.html.eex
@@ -7,7 +7,7 @@
 <% base_fee_per_gas = if block, do: block.base_fee_per_gas, else: nil %>
 <% max_priority_fee_per_gas = @transaction.max_priority_fee_per_gas %>
 <% max_fee_per_gas = @transaction.max_fee_per_gas %>
-<% burned_fee = 
+<% burnt_fees =
   if !is_nil(max_fee_per_gas) and !is_nil(@transaction.gas_used) and !is_nil(base_fee_per_gas) do
     if Decimal.compare(max_fee_per_gas.value, 0) == :eq do
       %Wei{value: Decimal.new(0)}
@@ -17,7 +17,7 @@
   else
     nil
   end %>
-<% %Wei{value: burned_fee_decimal} = if is_nil(burned_fee), do: %Wei{value: Decimal.new(0)}, else: burned_fee %>
+<% %Wei{value: burnt_fee_decimal} = if is_nil(burnt_fees), do: %Wei{value: Decimal.new(0)}, else: burnt_fees %>
 <% priority_fee_per_gas = if is_nil(max_priority_fee_per_gas) or is_nil(base_fee_per_gas), do: nil, else: Enum.min_by([max_priority_fee_per_gas, Wei.sub(max_fee_per_gas, base_fee_per_gas)], fn x -> Wei.to(x, :wei) end) %>
 <% priority_fee = if is_nil(priority_fee_per_gas), do: nil, else: Wei.mult(priority_fee_per_gas, @transaction.gas_used) %>
 <% decoded_input_data = decoded_input_data(@transaction) %>
@@ -122,7 +122,7 @@
                     <% true -> %>
                       <%= render BlockScoutWeb.FormView, "_tag.html", text: formatted_status, additional_classes: ["success", "large"] %></span>
                   <% end %>
-                
+
                 <%= if confirmations > 0 do %>
                   <span class="bs-label large ml-2 confirmations-label"><%= gettext "Confirmed by " %><span data-selector="block-confirmations"><%= confirmations %></span><%= " " <> confirmations_ds_name(confirmations) %></span>
                 <% end %>
@@ -429,17 +429,17 @@
               </dt>
               <dd class="col-sm-9 col-lg-10"> <%= format_wei_value(priority_fee, :ether) %> </dd>
             </dl>
-          <% end %> 
-           <%= if !is_nil(burned_fee) do %>
+          <% end %>
+           <%= if !is_nil(burnt_fees) do %>
             <dl class="row">
               <dt class="col-sm-3 col-lg-2 text-muted">
                 <%= render BlockScoutWeb.CommonComponentsView, "_i_tooltip_2.html",
                   text: gettext("Amount of") <> " " <> Explorer.coin_name() <> " " <> gettext("burned for this transaction. Equals Block Base Fee per Gas * Gas Used.") %>
                 <%= gettext "Transaction Burnt Fee" %>
               </dt>
-              <dd class="col-sm-9 col-lg-10"><i class="fa-solid fa-fire i-tooltip-2"></i> <%= format_wei_value(burned_fee, :ether) %>
+              <dd class="col-sm-9 col-lg-10"><i class="fa-solid fa-fire i-tooltip-2"></i> <%= format_wei_value(burnt_fees, :ether) %>
                 <%= unless empty_exchange_rate?(@exchange_rate) do %>
-                  (<span data-wei-value=<%= burned_fee_decimal %> data-usd-exchange-rate=<%= @exchange_rate.usd_value %>></span>)
+                  (<span data-wei-value=<%= burnt_fee_decimal %> data-usd-exchange-rate=<%= @exchange_rate.usd_value %>></span>)
                 <% end %>
               </dd>
             </dl>
diff --git a/apps/block_scout_web/lib/block_scout_web/views/address_view.ex b/apps/block_scout_web/lib/block_scout_web/views/address_view.ex
index ed3f54040657..eb56bccdeefd 100644
--- a/apps/block_scout_web/lib/block_scout_web/views/address_view.ex
+++ b/apps/block_scout_web/lib/block_scout_web/views/address_view.ex
@@ -334,6 +334,8 @@ defmodule BlockScoutWeb.AddressView do
     end
   end
 
+  defp matching_address_check(nil, nil, _contract?, _truncate), do: nil
+
   defp matching_address_check(%Address{hash: hash} = current_address, %Address{hash: hash}, contract?, truncate) do
     [
       view_module: __MODULE__,
diff --git a/apps/block_scout_web/lib/block_scout_web/views/api/rpc/address_view.ex b/apps/block_scout_web/lib/block_scout_web/views/api/rpc/address_view.ex
index 2d9deed6efb4..263462e9cc54 100644
--- a/apps/block_scout_web/lib/block_scout_web/views/api/rpc/address_view.ex
+++ b/apps/block_scout_web/lib/block_scout_web/views/api/rpc/address_view.ex
@@ -113,7 +113,7 @@ defmodule BlockScoutWeb.API.RPC.AddressView do
       "to" => "#{transaction.to_address_hash}",
       "value" => "#{transaction.value.value}",
       "gas" => "#{transaction.gas}",
-      "gasPrice" => "#{transaction.gas_price.value}",
+      "gasPrice" => "#{transaction.gas_price && transaction.gas_price.value}",
       "isError" => if(transaction.status == :ok, do: "0", else: "1"),
       "txreceipt_status" => if(transaction.status == :ok, do: "1", else: "0"),
       "input" => "#{transaction.input}",
@@ -160,7 +160,7 @@ defmodule BlockScoutWeb.API.RPC.AddressView do
       "tokenDecimal" => to_string(token_transfer.token_decimals),
       "transactionIndex" => to_string(token_transfer.transaction_index),
       "gas" => to_string(token_transfer.transaction_gas),
-      "gasPrice" => to_string(token_transfer.transaction_gas_price.value),
+      "gasPrice" => to_string(token_transfer.transaction_gas_price && token_transfer.transaction_gas_price.value),
       "gasUsed" => to_string(token_transfer.transaction_gas_used),
       "cumulativeGasUsed" => to_string(token_transfer.transaction_cumulative_gas_used),
       "input" => to_string(token_transfer.transaction_input),
diff --git a/apps/block_scout_web/lib/block_scout_web/views/api/v2/block_view.ex b/apps/block_scout_web/lib/block_scout_web/views/api/v2/block_view.ex
index bc6b62d7c712..9c4b40a3516f 100644
--- a/apps/block_scout_web/lib/block_scout_web/views/api/v2/block_view.ex
+++ b/apps/block_scout_web/lib/block_scout_web/views/api/v2/block_view.ex
@@ -3,7 +3,6 @@ defmodule BlockScoutWeb.API.V2.BlockView do
 
   alias BlockScoutWeb.BlockView
   alias BlockScoutWeb.API.V2.{ApiView, Helper}
-  alias Explorer.Chain
   alias Explorer.Chain.Block
   alias Explorer.Counters.BlockPriorityFeeCounter
 
@@ -29,10 +28,10 @@ defmodule BlockScoutWeb.API.V2.BlockView do
   end
 
   def prepare_block(block, _conn, single_block? \\ false) do
-    burned_fee = Chain.burned_fees(block.transactions, block.base_fee_per_gas)
+    burnt_fees = Block.burnt_fees(block.transactions, block.base_fee_per_gas)
     priority_fee = block.base_fee_per_gas && BlockPriorityFeeCounter.fetch(block.hash)
 
-    tx_fees = Chain.txn_fees(block.transactions)
+    transaction_fees = Block.transaction_fees(block.transactions)
 
     %{
       "height" => block.number,
@@ -48,7 +47,7 @@ defmodule BlockScoutWeb.API.V2.BlockView do
       "gas_limit" => block.gas_limit,
       "nonce" => block.nonce,
       "base_fee_per_gas" => block.base_fee_per_gas,
-      "burnt_fees" => burned_fee,
+      "burnt_fees" => burnt_fees,
       "priority_fee" => priority_fee,
       # "extra_data" => "TODO",
       "uncles_hashes" => prepare_uncles(block.uncle_relations),
@@ -56,9 +55,9 @@ defmodule BlockScoutWeb.API.V2.BlockView do
       "rewards" => prepare_rewards(block.rewards, block, single_block?),
       "gas_target_percentage" => gas_target(block),
       "gas_used_percentage" => gas_used_percentage(block),
-      "burnt_fees_percentage" => burnt_fees_percentage(burned_fee, tx_fees),
+      "burnt_fees_percentage" => burnt_fees_percentage(burnt_fees, transaction_fees),
       "type" => block |> BlockView.block_type() |> String.downcase(),
-      "tx_fees" => tx_fees,
+      "tx_fees" => transaction_fees,
       "withdrawals_count" => count_withdrawals(block)
     }
     |> chain_type_fields(block, single_block?)
@@ -105,8 +104,9 @@ defmodule BlockScoutWeb.API.V2.BlockView do
 
   def burnt_fees_percentage(_, %Decimal{coef: 0}), do: nil
 
-  def burnt_fees_percentage(burnt_fees, tx_fees) when not is_nil(tx_fees) and not is_nil(burnt_fees) do
-    burnt_fees.value |> Decimal.div(tx_fees) |> Decimal.mult(100) |> Decimal.to_float()
+  def burnt_fees_percentage(burnt_fees, transaction_fees)
+      when not is_nil(transaction_fees) and not is_nil(burnt_fees) do
+    burnt_fees.value |> Decimal.div(transaction_fees) |> Decimal.mult(100) |> Decimal.to_float()
   end
 
   def burnt_fees_percentage(_, _), do: nil
diff --git a/apps/block_scout_web/lib/block_scout_web/views/api/v2/transaction_view.ex b/apps/block_scout_web/lib/block_scout_web/views/api/v2/transaction_view.ex
index 0a2f519ea623..84d6f65bd5a4 100644
--- a/apps/block_scout_web/lib/block_scout_web/views/api/v2/transaction_view.ex
+++ b/apps/block_scout_web/lib/block_scout_web/views/api/v2/transaction_view.ex
@@ -359,7 +359,7 @@ defmodule BlockScoutWeb.API.V2.TransactionView do
 
     priority_fee_per_gas = priority_fee_per_gas(max_priority_fee_per_gas, base_fee_per_gas, max_fee_per_gas)
 
-    burned_fee = burned_fee(transaction, max_fee_per_gas, base_fee_per_gas)
+    burnt_fees = burnt_fees(transaction, max_fee_per_gas, base_fee_per_gas)
 
     status = transaction |> Chain.transaction_to_status() |> format_status()
 
@@ -409,7 +409,7 @@ defmodule BlockScoutWeb.API.V2.TransactionView do
       "max_priority_fee_per_gas" => transaction.max_priority_fee_per_gas,
       "base_fee_per_gas" => base_fee_per_gas,
       "priority_fee" => priority_fee_per_gas && Wei.mult(priority_fee_per_gas, transaction.gas_used),
-      "tx_burnt_fee" => burned_fee,
+      "tx_burnt_fee" => burnt_fees,
       "nonce" => transaction.nonce,
       "position" => transaction.index,
       "revert_reason" => revert_reason,
@@ -595,7 +595,7 @@ defmodule BlockScoutWeb.API.V2.TransactionView do
         end)
   end
 
-  defp burned_fee(transaction, max_fee_per_gas, base_fee_per_gas) do
+  defp burnt_fees(transaction, max_fee_per_gas, base_fee_per_gas) do
     if !is_nil(max_fee_per_gas) and !is_nil(transaction.gas_used) and !is_nil(base_fee_per_gas) do
       if Decimal.compare(max_fee_per_gas.value, 0) == :eq do
         %Wei{value: Decimal.new(0)}
diff --git a/apps/block_scout_web/lib/block_scout_web/views/wei_helper.ex b/apps/block_scout_web/lib/block_scout_web/views/wei_helper.ex
index 3b507d46557c..ba84665daae7 100644
--- a/apps/block_scout_web/lib/block_scout_web/views/wei_helper.ex
+++ b/apps/block_scout_web/lib/block_scout_web/views/wei_helper.ex
@@ -53,7 +53,11 @@ defmodule BlockScoutWeb.WeiHelper do
       "10"
   """
   @spec format_wei_value(Wei.t(), Wei.unit(), format_options()) :: String.t()
-  def format_wei_value(%Wei{} = wei, unit, options \\ []) when unit in @valid_units do
+  def format_wei_value(_wei, _unit, _options \\ [])
+
+  def format_wei_value(nil, _unit, _options), do: nil
+
+  def format_wei_value(%Wei{} = wei, unit, options) when unit in @valid_units do
     converted_value =
       wei
       |> Wei.to(unit)
diff --git a/apps/block_scout_web/priv/gettext/default.pot b/apps/block_scout_web/priv/gettext/default.pot
index c67d50ebf77a..b4cecbc73d2a 100644
--- a/apps/block_scout_web/priv/gettext/default.pot
+++ b/apps/block_scout_web/priv/gettext/default.pot
@@ -556,7 +556,7 @@ msgstr ""
 #: lib/block_scout_web/templates/address/_tabs.html.eex:56
 #: lib/block_scout_web/templates/address/overview.html.eex:275
 #: lib/block_scout_web/templates/address_validation/index.html.eex:11
-#: lib/block_scout_web/views/address_view.ex:386
+#: lib/block_scout_web/views/address_view.ex:388
 #, elixir-autogen, elixir-format
 msgid "Blocks Validated"
 msgstr ""
@@ -656,13 +656,13 @@ msgstr ""
 #: lib/block_scout_web/templates/api_docs/_action_tile.html.eex:187
 #: lib/block_scout_web/templates/api_docs/_eth_rpc_item.html.eex:126
 #: lib/block_scout_web/templates/api_docs/_eth_rpc_item.html.eex:149
-#: lib/block_scout_web/views/address_view.ex:379
+#: lib/block_scout_web/views/address_view.ex:381
 #, elixir-autogen, elixir-format
 msgid "Code"
 msgstr ""
 
 #: lib/block_scout_web/templates/address/_tabs.html.eex:42
-#: lib/block_scout_web/views/address_view.ex:385
+#: lib/block_scout_web/views/address_view.ex:387
 #, elixir-autogen, elixir-format
 msgid "Coin Balance History"
 msgstr ""
@@ -1084,7 +1084,7 @@ msgstr ""
 msgid "Decoded"
 msgstr ""
 
-#: lib/block_scout_web/views/address_view.ex:380
+#: lib/block_scout_web/views/address_view.ex:382
 #, elixir-autogen, elixir-format
 msgid "Decompiled Code"
 msgstr ""
@@ -1485,7 +1485,7 @@ msgstr ""
 #: lib/block_scout_web/templates/chain/gas_price_oracle_legend_item.html.eex:22
 #: lib/block_scout_web/templates/chain/gas_price_oracle_legend_item.html.eex:38
 #: lib/block_scout_web/views/block_view.ex:22
-#: lib/block_scout_web/views/wei_helper.ex:77
+#: lib/block_scout_web/views/wei_helper.ex:81
 #, elixir-autogen, elixir-format
 msgid "Gwei"
 msgstr ""
@@ -1601,7 +1601,7 @@ msgstr ""
 #: lib/block_scout_web/templates/address_internal_transaction/index.html.eex:17
 #: lib/block_scout_web/templates/transaction/_tabs.html.eex:11
 #: lib/block_scout_web/templates/transaction_internal_transaction/index.html.eex:6
-#: lib/block_scout_web/views/address_view.ex:376
+#: lib/block_scout_web/views/address_view.ex:378
 #: lib/block_scout_web/views/transaction_view.ex:533
 #, elixir-autogen, elixir-format
 msgid "Internal Transactions"
@@ -1718,7 +1718,7 @@ msgstr ""
 #: lib/block_scout_web/templates/address_logs/index.html.eex:10
 #: lib/block_scout_web/templates/transaction/_tabs.html.eex:17
 #: lib/block_scout_web/templates/transaction_log/index.html.eex:8
-#: lib/block_scout_web/views/address_view.ex:387
+#: lib/block_scout_web/views/address_view.ex:389
 #: lib/block_scout_web/views/transaction_view.ex:534
 #, elixir-autogen, elixir-format
 msgid "Logs"
@@ -2208,7 +2208,7 @@ msgstr ""
 
 #: lib/block_scout_web/templates/address/_tabs.html.eex:89
 #: lib/block_scout_web/templates/tokens/overview/_tabs.html.eex:27
-#: lib/block_scout_web/views/address_view.ex:381
+#: lib/block_scout_web/views/address_view.ex:383
 #: lib/block_scout_web/views/tokens/overview_view.ex:42
 #, elixir-autogen, elixir-format
 msgid "Read Contract"
@@ -2216,7 +2216,7 @@ msgstr ""
 
 #: lib/block_scout_web/templates/address/_tabs.html.eex:96
 #: lib/block_scout_web/templates/tokens/overview/_tabs.html.eex:41
-#: lib/block_scout_web/views/address_view.ex:382
+#: lib/block_scout_web/views/address_view.ex:384
 #, elixir-autogen, elixir-format
 msgid "Read Proxy"
 msgstr ""
@@ -2903,7 +2903,7 @@ msgstr ""
 #: lib/block_scout_web/templates/tokens/transfer/index.html.eex:15
 #: lib/block_scout_web/templates/transaction/_tabs.html.eex:4
 #: lib/block_scout_web/templates/transaction_token_transfer/index.html.eex:7
-#: lib/block_scout_web/views/address_view.ex:378
+#: lib/block_scout_web/views/address_view.ex:380
 #: lib/block_scout_web/views/tokens/instance/overview_view.ex:114
 #: lib/block_scout_web/views/tokens/overview_view.ex:40
 #: lib/block_scout_web/views/transaction_view.ex:532
@@ -2927,7 +2927,7 @@ msgstr ""
 #: lib/block_scout_web/templates/address_token_transfer/index.html.eex:13
 #: lib/block_scout_web/templates/layout/_topnav.html.eex:84
 #: lib/block_scout_web/templates/tokens/index.html.eex:10
-#: lib/block_scout_web/views/address_view.ex:375
+#: lib/block_scout_web/views/address_view.ex:377
 #, elixir-autogen, elixir-format
 msgid "Tokens"
 msgstr ""
@@ -3100,7 +3100,7 @@ msgstr ""
 #: lib/block_scout_web/templates/block/overview.html.eex:80
 #: lib/block_scout_web/templates/chain/show.html.eex:214
 #: lib/block_scout_web/templates/layout/_topnav.html.eex:49
-#: lib/block_scout_web/views/address_view.ex:377
+#: lib/block_scout_web/views/address_view.ex:379
 #, elixir-autogen, elixir-format
 msgid "Transactions"
 msgstr ""
@@ -3444,7 +3444,7 @@ msgstr ""
 msgid "We recommend using flattened code. This is necessary if your code utilizes a library or inherits dependencies. Use the"
 msgstr ""
 
-#: lib/block_scout_web/views/wei_helper.ex:76
+#: lib/block_scout_web/views/wei_helper.ex:80
 #, elixir-autogen, elixir-format
 msgid "Wei"
 msgstr ""
@@ -3465,14 +3465,14 @@ msgstr ""
 
 #: lib/block_scout_web/templates/address/_tabs.html.eex:103
 #: lib/block_scout_web/templates/tokens/overview/_tabs.html.eex:34
-#: lib/block_scout_web/views/address_view.ex:383
+#: lib/block_scout_web/views/address_view.ex:385
 #, elixir-autogen, elixir-format
 msgid "Write Contract"
 msgstr ""
 
 #: lib/block_scout_web/templates/address/_tabs.html.eex:110
 #: lib/block_scout_web/templates/tokens/overview/_tabs.html.eex:48
-#: lib/block_scout_web/views/address_view.ex:384
+#: lib/block_scout_web/views/address_view.ex:386
 #, elixir-autogen, elixir-format
 msgid "Write Proxy"
 msgstr ""
diff --git a/apps/block_scout_web/priv/gettext/en/LC_MESSAGES/default.po b/apps/block_scout_web/priv/gettext/en/LC_MESSAGES/default.po
index 0797f9e126fd..ba76c15c789a 100644
--- a/apps/block_scout_web/priv/gettext/en/LC_MESSAGES/default.po
+++ b/apps/block_scout_web/priv/gettext/en/LC_MESSAGES/default.po
@@ -556,7 +556,7 @@ msgstr ""
 #: lib/block_scout_web/templates/address/_tabs.html.eex:56
 #: lib/block_scout_web/templates/address/overview.html.eex:275
 #: lib/block_scout_web/templates/address_validation/index.html.eex:11
-#: lib/block_scout_web/views/address_view.ex:386
+#: lib/block_scout_web/views/address_view.ex:388
 #, elixir-autogen, elixir-format
 msgid "Blocks Validated"
 msgstr ""
@@ -656,13 +656,13 @@ msgstr ""
 #: lib/block_scout_web/templates/api_docs/_action_tile.html.eex:187
 #: lib/block_scout_web/templates/api_docs/_eth_rpc_item.html.eex:126
 #: lib/block_scout_web/templates/api_docs/_eth_rpc_item.html.eex:149
-#: lib/block_scout_web/views/address_view.ex:379
+#: lib/block_scout_web/views/address_view.ex:381
 #, elixir-autogen, elixir-format
 msgid "Code"
 msgstr ""
 
 #: lib/block_scout_web/templates/address/_tabs.html.eex:42
-#: lib/block_scout_web/views/address_view.ex:385
+#: lib/block_scout_web/views/address_view.ex:387
 #, elixir-autogen, elixir-format
 msgid "Coin Balance History"
 msgstr ""
@@ -1084,7 +1084,7 @@ msgstr ""
 msgid "Decoded"
 msgstr ""
 
-#: lib/block_scout_web/views/address_view.ex:380
+#: lib/block_scout_web/views/address_view.ex:382
 #, elixir-autogen, elixir-format
 msgid "Decompiled Code"
 msgstr ""
@@ -1485,7 +1485,7 @@ msgstr ""
 #: lib/block_scout_web/templates/chain/gas_price_oracle_legend_item.html.eex:22
 #: lib/block_scout_web/templates/chain/gas_price_oracle_legend_item.html.eex:38
 #: lib/block_scout_web/views/block_view.ex:22
-#: lib/block_scout_web/views/wei_helper.ex:77
+#: lib/block_scout_web/views/wei_helper.ex:81
 #, elixir-autogen, elixir-format
 msgid "Gwei"
 msgstr ""
@@ -1601,7 +1601,7 @@ msgstr ""
 #: lib/block_scout_web/templates/address_internal_transaction/index.html.eex:17
 #: lib/block_scout_web/templates/transaction/_tabs.html.eex:11
 #: lib/block_scout_web/templates/transaction_internal_transaction/index.html.eex:6
-#: lib/block_scout_web/views/address_view.ex:376
+#: lib/block_scout_web/views/address_view.ex:378
 #: lib/block_scout_web/views/transaction_view.ex:533
 #, elixir-autogen, elixir-format
 msgid "Internal Transactions"
@@ -1718,7 +1718,7 @@ msgstr ""
 #: lib/block_scout_web/templates/address_logs/index.html.eex:10
 #: lib/block_scout_web/templates/transaction/_tabs.html.eex:17
 #: lib/block_scout_web/templates/transaction_log/index.html.eex:8
-#: lib/block_scout_web/views/address_view.ex:387
+#: lib/block_scout_web/views/address_view.ex:389
 #: lib/block_scout_web/views/transaction_view.ex:534
 #, elixir-autogen, elixir-format
 msgid "Logs"
@@ -2208,7 +2208,7 @@ msgstr ""
 
 #: lib/block_scout_web/templates/address/_tabs.html.eex:89
 #: lib/block_scout_web/templates/tokens/overview/_tabs.html.eex:27
-#: lib/block_scout_web/views/address_view.ex:381
+#: lib/block_scout_web/views/address_view.ex:383
 #: lib/block_scout_web/views/tokens/overview_view.ex:42
 #, elixir-autogen, elixir-format
 msgid "Read Contract"
@@ -2216,7 +2216,7 @@ msgstr ""
 
 #: lib/block_scout_web/templates/address/_tabs.html.eex:96
 #: lib/block_scout_web/templates/tokens/overview/_tabs.html.eex:41
-#: lib/block_scout_web/views/address_view.ex:382
+#: lib/block_scout_web/views/address_view.ex:384
 #, elixir-autogen, elixir-format
 msgid "Read Proxy"
 msgstr ""
@@ -2903,7 +2903,7 @@ msgstr ""
 #: lib/block_scout_web/templates/tokens/transfer/index.html.eex:15
 #: lib/block_scout_web/templates/transaction/_tabs.html.eex:4
 #: lib/block_scout_web/templates/transaction_token_transfer/index.html.eex:7
-#: lib/block_scout_web/views/address_view.ex:378
+#: lib/block_scout_web/views/address_view.ex:380
 #: lib/block_scout_web/views/tokens/instance/overview_view.ex:114
 #: lib/block_scout_web/views/tokens/overview_view.ex:40
 #: lib/block_scout_web/views/transaction_view.ex:532
@@ -2927,7 +2927,7 @@ msgstr ""
 #: lib/block_scout_web/templates/address_token_transfer/index.html.eex:13
 #: lib/block_scout_web/templates/layout/_topnav.html.eex:84
 #: lib/block_scout_web/templates/tokens/index.html.eex:10
-#: lib/block_scout_web/views/address_view.ex:375
+#: lib/block_scout_web/views/address_view.ex:377
 #, elixir-autogen, elixir-format
 msgid "Tokens"
 msgstr ""
@@ -3100,7 +3100,7 @@ msgstr ""
 #: lib/block_scout_web/templates/block/overview.html.eex:80
 #: lib/block_scout_web/templates/chain/show.html.eex:214
 #: lib/block_scout_web/templates/layout/_topnav.html.eex:49
-#: lib/block_scout_web/views/address_view.ex:377
+#: lib/block_scout_web/views/address_view.ex:379
 #, elixir-autogen, elixir-format
 msgid "Transactions"
 msgstr ""
@@ -3444,7 +3444,7 @@ msgstr ""
 msgid "We recommend using flattened code. This is necessary if your code utilizes a library or inherits dependencies. Use the"
 msgstr ""
 
-#: lib/block_scout_web/views/wei_helper.ex:76
+#: lib/block_scout_web/views/wei_helper.ex:80
 #, elixir-autogen, elixir-format
 msgid "Wei"
 msgstr ""
@@ -3465,14 +3465,14 @@ msgstr ""
 
 #: lib/block_scout_web/templates/address/_tabs.html.eex:103
 #: lib/block_scout_web/templates/tokens/overview/_tabs.html.eex:34
-#: lib/block_scout_web/views/address_view.ex:383
+#: lib/block_scout_web/views/address_view.ex:385
 #, elixir-autogen, elixir-format
 msgid "Write Contract"
 msgstr ""
 
 #: lib/block_scout_web/templates/address/_tabs.html.eex:110
 #: lib/block_scout_web/templates/tokens/overview/_tabs.html.eex:48
-#: lib/block_scout_web/views/address_view.ex:384
+#: lib/block_scout_web/views/address_view.ex:386
 #, elixir-autogen, elixir-format
 msgid "Write Proxy"
 msgstr ""
diff --git a/apps/explorer/lib/explorer/chain.ex b/apps/explorer/lib/explorer/chain.ex
index a3d99d4e8479..edb4fe4e8d2c 100644
--- a/apps/explorer/lib/explorer/chain.ex
+++ b/apps/explorer/lib/explorer/chain.ex
@@ -512,65 +512,6 @@ defmodule Explorer.Chain do
     end
   end
 
-  def txn_fees(transactions) do
-    Enum.reduce(transactions, Decimal.new(0), fn %{gas_used: gas_used, gas_price: gas_price}, acc ->
-      gas_used
-      |> Decimal.new()
-      |> Decimal.mult(gas_price_to_decimal(gas_price))
-      |> Decimal.add(acc)
-    end)
-  end
-
-  defp gas_price_to_decimal(%Wei{} = wei), do: wei.value
-  defp gas_price_to_decimal(gas_price), do: Decimal.new(gas_price)
-
-  def burned_fees(transactions, base_fee_per_gas) do
-    burned_fee_counter =
-      transactions
-      |> Enum.reduce(Decimal.new(0), fn %{gas_used: gas_used}, acc ->
-        gas_used
-        |> Decimal.new()
-        |> Decimal.add(acc)
-      end)
-
-    base_fee_per_gas && Wei.mult(base_fee_per_gas_to_wei(base_fee_per_gas), burned_fee_counter)
-  end
-
-  defp base_fee_per_gas_to_wei(%Wei{} = wei), do: wei
-  defp base_fee_per_gas_to_wei(base_fee_per_gas), do: %Wei{value: Decimal.new(base_fee_per_gas)}
-
-  @uncle_reward_coef 1 / 32
-  def block_reward_by_parts(block, transactions) do
-    %{hash: block_hash, number: block_number} = block
-    base_fee_per_gas = Map.get(block, :base_fee_per_gas)
-
-    txn_fees = txn_fees(transactions)
-
-    static_reward =
-      Repo.one(
-        from(
-          er in EmissionReward,
-          where: fragment("int8range(?, ?) <@ ?", ^block_number, ^(block_number + 1), er.block_range),
-          select: er.reward
-        )
-      ) || %Wei{value: Decimal.new(0)}
-
-    has_uncles? = is_list(block.uncles) and not Enum.empty?(block.uncles)
-
-    burned_fees = burned_fees(transactions, base_fee_per_gas)
-    uncle_reward = (has_uncles? && Wei.mult(static_reward, Decimal.from_float(@uncle_reward_coef))) || nil
-
-    %{
-      block_number: block_number,
-      block_hash: block_hash,
-      miner_hash: block.miner_hash,
-      static_reward: static_reward,
-      txn_fees: %Wei{value: txn_fees},
-      burned_fees: burned_fees || %Wei{value: Decimal.new(0)},
-      uncle_reward: uncle_reward || %Wei{value: Decimal.new(0)}
-    }
-  end
-
   @doc """
   The `t:Explorer.Chain.Wei.t/0` paid to the miners of the `t:Explorer.Chain.Block.t/0`s with `hash`
   `Explorer.Chain.Hash.Full.t/0` by the signers of the transactions in those blocks to cover the gas fee
@@ -937,6 +878,8 @@ defmodule Explorer.Chain do
 
   """
   @spec fee(Transaction.t(), :ether | :gwei | :wei) :: {:maximum, Decimal.t()} | {:actual, Decimal.t()}
+  def fee(%Transaction{gas: _gas, gas_price: nil, gas_used: nil}, _unit), do: {:maximum, nil}
+
   def fee(%Transaction{gas: gas, gas_price: gas_price, gas_used: nil}, unit) do
     fee =
       gas_price
@@ -946,6 +889,8 @@ defmodule Explorer.Chain do
     {:maximum, fee}
   end
 
+  def fee(%Transaction{gas_price: nil, gas_used: _gas_used}, _unit), do: {:actual, nil}
+
   def fee(%Transaction{gas_price: gas_price, gas_used: gas_used}, unit) do
     fee =
       gas_price
diff --git a/apps/explorer/lib/explorer/chain/block.ex b/apps/explorer/lib/explorer/chain/block.ex
index b41941fdc91f..9cee9e21dfe7 100644
--- a/apps/explorer/lib/explorer/chain/block.ex
+++ b/apps/explorer/lib/explorer/chain/block.ex
@@ -8,7 +8,8 @@ defmodule Explorer.Chain.Block do
   use Explorer.Schema
 
   alias Explorer.Chain.{Address, Block, Gas, Hash, PendingBlockOperation, Transaction, Wei, Withdrawal}
-  alias Explorer.Chain.Block.{Reward, SecondDegreeRelation}
+  alias Explorer.Chain.Block.{EmissionReward, Reward, SecondDegreeRelation}
+  alias Explorer.Repo
 
   @optional_attrs ~w(size refetch_needed total_difficulty difficulty base_fee_per_gas)a
                   |> (&(case Application.compile_env(:explorer, :chain_type) do
@@ -219,4 +220,85 @@ defmodule Explorer.Chain.Block do
       order_by: [desc: block.number]
     )
   end
+
+  @doc """
+  Calculates transaction fees (gas price * gas used) for the list of transactions (from a single block)
+  """
+  @spec transaction_fees(list()) :: Decimal.t()
+  def transaction_fees(transactions) do
+    Enum.reduce(transactions, Decimal.new(0), fn %{gas_used: gas_used, gas_price: gas_price}, acc ->
+      if gas_price do
+        gas_used
+        |> Decimal.new()
+        |> Decimal.mult(gas_price_to_decimal(gas_price))
+        |> Decimal.add(acc)
+      else
+        acc
+      end
+    end)
+  end
+
+  defp gas_price_to_decimal(nil), do: nil
+  defp gas_price_to_decimal(%Wei{} = wei), do: wei.value
+  defp gas_price_to_decimal(gas_price), do: Decimal.new(gas_price)
+
+  @doc """
+  Calculates burnt fees for the list of transactions (from a single block)
+  """
+  @spec burnt_fees(list(), Wei.t()) :: Wei.t() | nil
+  def burnt_fees(transactions, base_fee_per_gas) do
+    total_gas_used =
+      transactions
+      |> Enum.reduce(Decimal.new(0), fn %{gas_used: gas_used}, acc ->
+        gas_used
+        |> Decimal.new()
+        |> Decimal.add(acc)
+      end)
+
+    base_fee_per_gas && Wei.mult(base_fee_per_gas_to_wei(base_fee_per_gas), total_gas_used)
+  end
+
+  defp base_fee_per_gas_to_wei(%Wei{} = wei), do: wei
+  defp base_fee_per_gas_to_wei(base_fee_per_gas), do: %Wei{value: Decimal.new(base_fee_per_gas)}
+
+  @uncle_reward_coef 1 / 32
+  @spec block_reward_by_parts(Block.t(), list()) :: %{
+          block_number: block_number(),
+          block_hash: Hash.Full.t(),
+          miner_hash: Hash.Address.t(),
+          static_reward: any(),
+          transaction_fees: any(),
+          burnt_fees: Wei.t() | nil,
+          uncle_reward: Wei.t() | nil | false
+        }
+  def block_reward_by_parts(block, transactions) do
+    %{hash: block_hash, number: block_number} = block
+    base_fee_per_gas = Map.get(block, :base_fee_per_gas)
+
+    transaction_fees = transaction_fees(transactions)
+
+    static_reward =
+      Repo.one(
+        from(
+          er in EmissionReward,
+          where: fragment("int8range(?, ?) <@ ?", ^block_number, ^(block_number + 1), er.block_range),
+          select: er.reward
+        )
+      ) || %Wei{value: Decimal.new(0)}
+
+    has_uncles? = is_list(block.uncles) and not Enum.empty?(block.uncles)
+
+    burnt_fees = burnt_fees(transactions, base_fee_per_gas)
+    uncle_reward = (has_uncles? && Wei.mult(static_reward, Decimal.from_float(@uncle_reward_coef))) || nil
+
+    %{
+      block_number: block_number,
+      block_hash: block_hash,
+      miner_hash: block.miner_hash,
+      static_reward: static_reward,
+      transaction_fees: %Wei{value: transaction_fees},
+      burnt_fees: burnt_fees || %Wei{value: Decimal.new(0)},
+      uncle_reward: uncle_reward || %Wei{value: Decimal.new(0)}
+    }
+  end
 end
diff --git a/apps/explorer/lib/explorer/chain/wei.ex b/apps/explorer/lib/explorer/chain/wei.ex
index 533174ba4524..76167ec33687 100644
--- a/apps/explorer/lib/explorer/chain/wei.ex
+++ b/apps/explorer/lib/explorer/chain/wei.ex
@@ -139,6 +139,11 @@ defmodule Explorer.Chain.Wei do
       %Explorer.Chain.Wei{value: Decimal.new(1_123)}
   """
   @spec sum(Wei.t(), Wei.t()) :: Wei.t()
+  def sum(%Wei{value: wei_1}, %Wei{value: nil}) do
+    wei_1
+    |> from(:wei)
+  end
+
   def sum(%Wei{value: wei_1}, %Wei{value: wei_2}) do
     wei_1
     |> Decimal.add(wei_2)
@@ -207,6 +212,10 @@ defmodule Explorer.Chain.Wei do
   """
 
   @spec from(ether(), :ether) :: t()
+  def from(nil, :ether), do: nil
+  def from(nil, :wei), do: nil
+  def from(nil, :gwei), do: nil
+
   def from(%Decimal{} = ether, :ether) do
     %__MODULE__{value: Decimal.mult(ether, @wei_per_ether)}
   end
diff --git a/apps/explorer/lib/explorer/counters/block_burned_fee_counter.ex b/apps/explorer/lib/explorer/counters/block_burned_fee_counter.ex
index 85e9359f4294..f5e3ee00cddc 100644
--- a/apps/explorer/lib/explorer/counters/block_burned_fee_counter.ex
+++ b/apps/explorer/lib/explorer/counters/block_burned_fee_counter.ex
@@ -7,7 +7,7 @@ defmodule Explorer.Counters.BlockBurnedFeeCounter do
   alias Explorer.Chain
   alias Explorer.Counters.Helper
 
-  @cache_name :block_burned_fee_counter
+  @cache_name :block_burnt_fee_counter
 
   config = Application.compile_env(:explorer, Explorer.Counters.BlockBurnedFeeCounter)
   @enable_consolidation Keyword.get(config, :enable_consolidation)
diff --git a/apps/explorer/test/explorer/chain/block_test.exs b/apps/explorer/test/explorer/chain/block_test.exs
index 35f14c54795c..703cd8609a7b 100644
--- a/apps/explorer/test/explorer/chain/block_test.exs
+++ b/apps/explorer/test/explorer/chain/block_test.exs
@@ -2,7 +2,7 @@ defmodule Explorer.Chain.BlockTest do
   use Explorer.DataCase
 
   alias Ecto.Changeset
-  alias Explorer.Chain.Block
+  alias Explorer.Chain.{Block, Wei}
 
   describe "changeset/2" do
     test "with valid attributes" do
@@ -58,4 +58,46 @@ defmodule Explorer.Chain.BlockTest do
       assert Enum.member?(results, unrewarded_block.hash)
     end
   end
+
+  describe "block_reward_by_parts/1" do
+    setup do
+      {:ok, emission_reward: insert(:emission_reward)}
+    end
+
+    test "without uncles", %{emission_reward: %{reward: reward, block_range: range}} do
+      block = build(:block, number: range.from, base_fee_per_gas: 5, uncles: [])
+
+      tx1 = build(:transaction, gas_price: 1, gas_used: 1, block_number: block.number, block_hash: block.hash)
+      tx2 = build(:transaction, gas_price: 1, gas_used: 2, block_number: block.number, block_hash: block.hash)
+
+      tx3 =
+        build(:transaction,
+          gas_price: 1,
+          gas_used: 3,
+          block_number: block.number,
+          block_hash: block.hash,
+          max_priority_fee_per_gas: 1
+        )
+
+      expected_transaction_fees = %Wei{value: Decimal.new(6)}
+      expected_burnt_fees = %Wei{value: Decimal.new(30)}
+      expected_uncle_reward = %Wei{value: Decimal.new(0)}
+
+      assert %{
+               static_reward: ^reward,
+               transaction_fees: ^expected_transaction_fees,
+               burnt_fees: ^expected_burnt_fees,
+               uncle_reward: ^expected_uncle_reward
+             } = Block.block_reward_by_parts(block, [tx1, tx2, tx3])
+    end
+
+    test "with uncles", %{emission_reward: %{reward: reward, block_range: range}} do
+      block =
+        build(:block, number: range.from, uncles: ["0xe670ec64341771606e55d6b4ca35a1a6b75ee3d5145a99d05921026d15273311"])
+
+      expected_uncle_reward = Wei.mult(reward, Decimal.from_float(1 / 32))
+
+      assert %{uncle_reward: ^expected_uncle_reward} = Block.block_reward_by_parts(block, [])
+    end
+  end
 end
diff --git a/apps/explorer/test/explorer/chain_test.exs b/apps/explorer/test/explorer/chain_test.exs
index 492861338086..c3edcf826bf2 100644
--- a/apps/explorer/test/explorer/chain_test.exs
+++ b/apps/explorer/test/explorer/chain_test.exs
@@ -3133,48 +3133,6 @@ defmodule Explorer.ChainTest do
     end
   end
 
-  describe "block_reward_by_parts/1" do
-    setup do
-      {:ok, emission_reward: insert(:emission_reward)}
-    end
-
-    test "without uncles", %{emission_reward: %{reward: reward, block_range: range}} do
-      block = build(:block, number: range.from, base_fee_per_gas: 5, uncles: [])
-
-      tx1 = build(:transaction, gas_price: 1, gas_used: 1, block_number: block.number, block_hash: block.hash)
-      tx2 = build(:transaction, gas_price: 1, gas_used: 2, block_number: block.number, block_hash: block.hash)
-
-      tx3 =
-        build(:transaction,
-          gas_price: 1,
-          gas_used: 3,
-          block_number: block.number,
-          block_hash: block.hash,
-          max_priority_fee_per_gas: 1
-        )
-
-      expected_txn_fees = %Wei{value: Decimal.new(6)}
-      expected_burned_fees = %Wei{value: Decimal.new(30)}
-      expected_uncle_reward = %Wei{value: Decimal.new(0)}
-
-      assert %{
-               static_reward: ^reward,
-               txn_fees: ^expected_txn_fees,
-               burned_fees: ^expected_burned_fees,
-               uncle_reward: ^expected_uncle_reward
-             } = Chain.block_reward_by_parts(block, [tx1, tx2, tx3])
-    end
-
-    test "with uncles", %{emission_reward: %{reward: reward, block_range: range}} do
-      block =
-        build(:block, number: range.from, uncles: ["0xe670ec64341771606e55d6b4ca35a1a6b75ee3d5145a99d05921026d15273311"])
-
-      expected_uncle_reward = Wei.mult(reward, Decimal.from_float(1 / 32))
-
-      assert %{uncle_reward: ^expected_uncle_reward} = Chain.block_reward_by_parts(block, [])
-    end
-  end
-
   describe "gas_payment_by_block_hash/1" do
     setup do
       number = 1
diff --git a/apps/indexer/lib/indexer/block/fetcher.ex b/apps/indexer/lib/indexer/block/fetcher.ex
index 713880e401d2..5342b077fbc3 100644
--- a/apps/indexer/lib/indexer/block/fetcher.ex
+++ b/apps/indexer/lib/indexer/block/fetcher.ex
@@ -407,15 +407,15 @@ defmodule Indexer.Block.Fetcher do
 
   def fetch_beneficiaries_manual(block, transactions) do
     block
-    |> Chain.block_reward_by_parts(transactions)
+    |> Block.block_reward_by_parts(transactions)
     |> reward_parts_to_beneficiaries()
   end
 
   defp reward_parts_to_beneficiaries(reward_parts) do
     reward =
       reward_parts.static_reward
-      |> Wei.sum(reward_parts.txn_fees)
-      |> Wei.sub(reward_parts.burned_fees)
+      |> Wei.sum(reward_parts.transaction_fees)
+      |> Wei.sub(reward_parts.burnt_fees)
       |> Wei.sum(reward_parts.uncle_reward)
 
     MapSet.new([

From 8f10d61d511a166fe273e5441839d79a6f7f9b19 Mon Sep 17 00:00:00 2001
From: Viktor Baranov <baranov.viktor.27@gmail.com>
Date: Mon, 27 Nov 2023 12:14:49 +0300
Subject: [PATCH 774/909] Process multiple reviewers comments

---
 .../templates/block/_tile.html.eex            |  2 +-
 .../templates/block/overview.html.eex         |  4 +-
 .../templates/transaction/overview.html.eex   |  2 +-
 .../lib/block_scout_web/views/address_view.ex |  2 -
 .../lib/block_scout_web/views/block_view.ex   |  2 +-
 .../lib/block_scout_web/views/wei_helper.ex   |  2 +-
 apps/block_scout_web/priv/gettext/default.pot | 46 +++++++++----------
 .../priv/gettext/en/LC_MESSAGES/default.po    | 46 +++++++++----------
 .../lib/ethereum_jsonrpc/block.ex             |  2 +-
 apps/explorer/config/config.exs               |  2 +-
 apps/explorer/lib/explorer/application.ex     |  2 +-
 apps/explorer/lib/explorer/chain.ex           |  4 +-
 apps/explorer/lib/explorer/chain/block.ex     | 12 +++--
 apps/explorer/lib/explorer/chain/supply.ex    |  2 +-
 apps/explorer/lib/explorer/chain/wei.ex       | 17 +++++--
 ..._counter.ex => block_burnt_fee_counter.ex} |  6 +--
 .../counters/block_priority_fee_counter.ex    |  2 +-
 17 files changed, 82 insertions(+), 73 deletions(-)
 rename apps/explorer/lib/explorer/counters/{block_burned_fee_counter.ex => block_burnt_fee_counter.ex} (91%)

diff --git a/apps/block_scout_web/lib/block_scout_web/templates/block/_tile.html.eex b/apps/block_scout_web/lib/block_scout_web/templates/block/_tile.html.eex
index cff7f06adb9c..452c73a3feb0 100644
--- a/apps/block_scout_web/lib/block_scout_web/templates/block/_tile.html.eex
+++ b/apps/block_scout_web/lib/block_scout_web/templates/block/_tile.html.eex
@@ -1,4 +1,4 @@
-<% burnt_fees = if !is_nil(@block.base_fee_per_gas), do: Wei.mult(@block.base_fee_per_gas, BlockBurnedFeeCounter.fetch(@block.hash)), else: nil %>
+<% burnt_fees = if !is_nil(@block.base_fee_per_gas), do: Wei.mult(@block.base_fee_per_gas, BlockBurntFeeCounter.fetch(@block.hash)), else: nil %>
 <% priority_fee = if !is_nil(@block.base_fee_per_gas), do: BlockPriorityFeeCounter.fetch(@block.hash), else: nil %>
 <div class="tile tile-type-<%= String.downcase(@block_type) %> fade-up" data-selector="block-tile" data-block-number="<%= to_string(@block.number) %>" data-block-hash="<%= @block.hash %>">
   <div class="row">
diff --git a/apps/block_scout_web/lib/block_scout_web/templates/block/overview.html.eex b/apps/block_scout_web/lib/block_scout_web/templates/block/overview.html.eex
index 96fdfbec92c4..feee728643a1 100644
--- a/apps/block_scout_web/lib/block_scout_web/templates/block/overview.html.eex
+++ b/apps/block_scout_web/lib/block_scout_web/templates/block/overview.html.eex
@@ -1,4 +1,4 @@
-<% burnt_fees = if !is_nil(@block.base_fee_per_gas), do: Wei.mult(@block.base_fee_per_gas, BlockBurnedFeeCounter.fetch(@block.hash)), else: nil %>
+<% burnt_fees = if !is_nil(@block.base_fee_per_gas), do: Wei.mult(@block.base_fee_per_gas, BlockBurntFeeCounter.fetch(@block.hash)), else: nil %>
 <% priority_fee = if !is_nil(@block.base_fee_per_gas), do: BlockPriorityFeeCounter.fetch(@block.hash), else: nil %>
 <section>
   <%= render BlockScoutWeb.Advertisement.TextAdView, "index.html", conn: @conn %>
@@ -212,7 +212,7 @@
             <dl class="row">
                 <dt class="col-sm-3 col-lg-2 text-muted">
                   <%= render BlockScoutWeb.CommonComponentsView, "_i_tooltip_2.html",
-                  text: Explorer.coin_name() <> " " <> gettext("burned from transactions included in the block (Base fee (per unit of gas) * Gas Used).") %>
+                  text: Explorer.coin_name() <> " " <> gettext("burnt from transactions included in the block (Base fee (per unit of gas) * Gas Used).") %>
                   <%= gettext("Burnt Fees") %>
                 </dt>
                 <dd class="col-sm-9 col-lg-10"><i class="fa-solid fa-fire i-tooltip-2"></i> <%= format_wei_value(burnt_fees, :ether) %></dd>
diff --git a/apps/block_scout_web/lib/block_scout_web/templates/transaction/overview.html.eex b/apps/block_scout_web/lib/block_scout_web/templates/transaction/overview.html.eex
index 4e61f77e6990..ebd4a61cadc7 100644
--- a/apps/block_scout_web/lib/block_scout_web/templates/transaction/overview.html.eex
+++ b/apps/block_scout_web/lib/block_scout_web/templates/transaction/overview.html.eex
@@ -434,7 +434,7 @@
             <dl class="row">
               <dt class="col-sm-3 col-lg-2 text-muted">
                 <%= render BlockScoutWeb.CommonComponentsView, "_i_tooltip_2.html",
-                  text: gettext("Amount of") <> " " <> Explorer.coin_name() <> " " <> gettext("burned for this transaction. Equals Block Base Fee per Gas * Gas Used.") %>
+                  text: gettext("Amount of") <> " " <> Explorer.coin_name() <> " " <> gettext("burnt for this transaction. Equals Block Base Fee per Gas * Gas Used.") %>
                 <%= gettext "Transaction Burnt Fee" %>
               </dt>
               <dd class="col-sm-9 col-lg-10"><i class="fa-solid fa-fire i-tooltip-2"></i> <%= format_wei_value(burnt_fees, :ether) %>
diff --git a/apps/block_scout_web/lib/block_scout_web/views/address_view.ex b/apps/block_scout_web/lib/block_scout_web/views/address_view.ex
index eb56bccdeefd..ed3f54040657 100644
--- a/apps/block_scout_web/lib/block_scout_web/views/address_view.ex
+++ b/apps/block_scout_web/lib/block_scout_web/views/address_view.ex
@@ -334,8 +334,6 @@ defmodule BlockScoutWeb.AddressView do
     end
   end
 
-  defp matching_address_check(nil, nil, _contract?, _truncate), do: nil
-
   defp matching_address_check(%Address{hash: hash} = current_address, %Address{hash: hash}, contract?, truncate) do
     [
       view_module: __MODULE__,
diff --git a/apps/block_scout_web/lib/block_scout_web/views/block_view.ex b/apps/block_scout_web/lib/block_scout_web/views/block_view.ex
index e6355faf1945..2f215b478ced 100644
--- a/apps/block_scout_web/lib/block_scout_web/views/block_view.ex
+++ b/apps/block_scout_web/lib/block_scout_web/views/block_view.ex
@@ -7,7 +7,7 @@ defmodule BlockScoutWeb.BlockView do
   alias Explorer.Chain
   alias Explorer.Chain.{Block, Wei}
   alias Explorer.Chain.Block.Reward
-  alias Explorer.Counters.{BlockBurnedFeeCounter, BlockPriorityFeeCounter}
+  alias Explorer.Counters.{BlockBurntFeeCounter, BlockPriorityFeeCounter}
 
   @dialyzer :no_match
 
diff --git a/apps/block_scout_web/lib/block_scout_web/views/wei_helper.ex b/apps/block_scout_web/lib/block_scout_web/views/wei_helper.ex
index ba84665daae7..72c1c1ee1f3a 100644
--- a/apps/block_scout_web/lib/block_scout_web/views/wei_helper.ex
+++ b/apps/block_scout_web/lib/block_scout_web/views/wei_helper.ex
@@ -52,7 +52,7 @@ defmodule BlockScoutWeb.WeiHelper do
       ...> )
       "10"
   """
-  @spec format_wei_value(Wei.t(), Wei.unit(), format_options()) :: String.t()
+  @spec format_wei_value(Wei.t() | nil, Wei.unit(), format_options()) :: String.t() | nil
   def format_wei_value(_wei, _unit, _options \\ [])
 
   def format_wei_value(nil, _unit, _options), do: nil
diff --git a/apps/block_scout_web/priv/gettext/default.pot b/apps/block_scout_web/priv/gettext/default.pot
index b4cecbc73d2a..38cc6f9a2ee5 100644
--- a/apps/block_scout_web/priv/gettext/default.pot
+++ b/apps/block_scout_web/priv/gettext/default.pot
@@ -556,7 +556,7 @@ msgstr ""
 #: lib/block_scout_web/templates/address/_tabs.html.eex:56
 #: lib/block_scout_web/templates/address/overview.html.eex:275
 #: lib/block_scout_web/templates/address_validation/index.html.eex:11
-#: lib/block_scout_web/views/address_view.ex:388
+#: lib/block_scout_web/views/address_view.ex:386
 #, elixir-autogen, elixir-format
 msgid "Blocks Validated"
 msgstr ""
@@ -656,13 +656,13 @@ msgstr ""
 #: lib/block_scout_web/templates/api_docs/_action_tile.html.eex:187
 #: lib/block_scout_web/templates/api_docs/_eth_rpc_item.html.eex:126
 #: lib/block_scout_web/templates/api_docs/_eth_rpc_item.html.eex:149
-#: lib/block_scout_web/views/address_view.ex:381
+#: lib/block_scout_web/views/address_view.ex:379
 #, elixir-autogen, elixir-format
 msgid "Code"
 msgstr ""
 
 #: lib/block_scout_web/templates/address/_tabs.html.eex:42
-#: lib/block_scout_web/views/address_view.ex:387
+#: lib/block_scout_web/views/address_view.ex:385
 #, elixir-autogen, elixir-format
 msgid "Coin Balance History"
 msgstr ""
@@ -1084,7 +1084,7 @@ msgstr ""
 msgid "Decoded"
 msgstr ""
 
-#: lib/block_scout_web/views/address_view.ex:382
+#: lib/block_scout_web/views/address_view.ex:380
 #, elixir-autogen, elixir-format
 msgid "Decompiled Code"
 msgstr ""
@@ -1601,7 +1601,7 @@ msgstr ""
 #: lib/block_scout_web/templates/address_internal_transaction/index.html.eex:17
 #: lib/block_scout_web/templates/transaction/_tabs.html.eex:11
 #: lib/block_scout_web/templates/transaction_internal_transaction/index.html.eex:6
-#: lib/block_scout_web/views/address_view.ex:378
+#: lib/block_scout_web/views/address_view.ex:376
 #: lib/block_scout_web/views/transaction_view.ex:533
 #, elixir-autogen, elixir-format
 msgid "Internal Transactions"
@@ -1718,7 +1718,7 @@ msgstr ""
 #: lib/block_scout_web/templates/address_logs/index.html.eex:10
 #: lib/block_scout_web/templates/transaction/_tabs.html.eex:17
 #: lib/block_scout_web/templates/transaction_log/index.html.eex:8
-#: lib/block_scout_web/views/address_view.ex:389
+#: lib/block_scout_web/views/address_view.ex:387
 #: lib/block_scout_web/views/transaction_view.ex:534
 #, elixir-autogen, elixir-format
 msgid "Logs"
@@ -2208,7 +2208,7 @@ msgstr ""
 
 #: lib/block_scout_web/templates/address/_tabs.html.eex:89
 #: lib/block_scout_web/templates/tokens/overview/_tabs.html.eex:27
-#: lib/block_scout_web/views/address_view.ex:383
+#: lib/block_scout_web/views/address_view.ex:381
 #: lib/block_scout_web/views/tokens/overview_view.ex:42
 #, elixir-autogen, elixir-format
 msgid "Read Contract"
@@ -2216,7 +2216,7 @@ msgstr ""
 
 #: lib/block_scout_web/templates/address/_tabs.html.eex:96
 #: lib/block_scout_web/templates/tokens/overview/_tabs.html.eex:41
-#: lib/block_scout_web/views/address_view.ex:384
+#: lib/block_scout_web/views/address_view.ex:382
 #, elixir-autogen, elixir-format
 msgid "Read Proxy"
 msgstr ""
@@ -2903,7 +2903,7 @@ msgstr ""
 #: lib/block_scout_web/templates/tokens/transfer/index.html.eex:15
 #: lib/block_scout_web/templates/transaction/_tabs.html.eex:4
 #: lib/block_scout_web/templates/transaction_token_transfer/index.html.eex:7
-#: lib/block_scout_web/views/address_view.ex:380
+#: lib/block_scout_web/views/address_view.ex:378
 #: lib/block_scout_web/views/tokens/instance/overview_view.ex:114
 #: lib/block_scout_web/views/tokens/overview_view.ex:40
 #: lib/block_scout_web/views/transaction_view.ex:532
@@ -2927,7 +2927,7 @@ msgstr ""
 #: lib/block_scout_web/templates/address_token_transfer/index.html.eex:13
 #: lib/block_scout_web/templates/layout/_topnav.html.eex:84
 #: lib/block_scout_web/templates/tokens/index.html.eex:10
-#: lib/block_scout_web/views/address_view.ex:377
+#: lib/block_scout_web/views/address_view.ex:375
 #, elixir-autogen, elixir-format
 msgid "Tokens"
 msgstr ""
@@ -3100,7 +3100,7 @@ msgstr ""
 #: lib/block_scout_web/templates/block/overview.html.eex:80
 #: lib/block_scout_web/templates/chain/show.html.eex:214
 #: lib/block_scout_web/templates/layout/_topnav.html.eex:49
-#: lib/block_scout_web/views/address_view.ex:379
+#: lib/block_scout_web/views/address_view.ex:377
 #, elixir-autogen, elixir-format
 msgid "Transactions"
 msgstr ""
@@ -3465,14 +3465,14 @@ msgstr ""
 
 #: lib/block_scout_web/templates/address/_tabs.html.eex:103
 #: lib/block_scout_web/templates/tokens/overview/_tabs.html.eex:34
-#: lib/block_scout_web/views/address_view.ex:385
+#: lib/block_scout_web/views/address_view.ex:383
 #, elixir-autogen, elixir-format
 msgid "Write Contract"
 msgstr ""
 
 #: lib/block_scout_web/templates/address/_tabs.html.eex:110
 #: lib/block_scout_web/templates/tokens/overview/_tabs.html.eex:48
-#: lib/block_scout_web/views/address_view.ex:386
+#: lib/block_scout_web/views/address_view.ex:384
 #, elixir-autogen, elixir-format
 msgid "Write Proxy"
 msgstr ""
@@ -3541,16 +3541,6 @@ msgstr ""
 msgid "balance of the address"
 msgstr ""
 
-#: lib/block_scout_web/templates/transaction/overview.html.eex:437
-#, elixir-autogen, elixir-format
-msgid "burned for this transaction. Equals Block Base Fee per Gas * Gas Used."
-msgstr ""
-
-#: lib/block_scout_web/templates/block/overview.html.eex:215
-#, elixir-autogen, elixir-format
-msgid "burned from transactions included in the block (Base fee (per unit of gas) * Gas Used)."
-msgstr ""
-
 #: lib/block_scout_web/templates/address_contract/index.html.eex:28
 #, elixir-autogen, elixir-format
 msgid "button"
@@ -3682,3 +3672,13 @@ msgstr ""
 #, elixir-autogen, elixir-format
 msgid "Yul"
 msgstr ""
+
+#: lib/block_scout_web/templates/transaction/overview.html.eex:437
+#, elixir-autogen, elixir-format
+msgid "burnt for this transaction. Equals Block Base Fee per Gas * Gas Used."
+msgstr ""
+
+#: lib/block_scout_web/templates/block/overview.html.eex:215
+#, elixir-autogen, elixir-format
+msgid "burnt from transactions included in the block (Base fee (per unit of gas) * Gas Used)."
+msgstr ""
diff --git a/apps/block_scout_web/priv/gettext/en/LC_MESSAGES/default.po b/apps/block_scout_web/priv/gettext/en/LC_MESSAGES/default.po
index ba76c15c789a..dbd9a598a406 100644
--- a/apps/block_scout_web/priv/gettext/en/LC_MESSAGES/default.po
+++ b/apps/block_scout_web/priv/gettext/en/LC_MESSAGES/default.po
@@ -556,7 +556,7 @@ msgstr ""
 #: lib/block_scout_web/templates/address/_tabs.html.eex:56
 #: lib/block_scout_web/templates/address/overview.html.eex:275
 #: lib/block_scout_web/templates/address_validation/index.html.eex:11
-#: lib/block_scout_web/views/address_view.ex:388
+#: lib/block_scout_web/views/address_view.ex:386
 #, elixir-autogen, elixir-format
 msgid "Blocks Validated"
 msgstr ""
@@ -656,13 +656,13 @@ msgstr ""
 #: lib/block_scout_web/templates/api_docs/_action_tile.html.eex:187
 #: lib/block_scout_web/templates/api_docs/_eth_rpc_item.html.eex:126
 #: lib/block_scout_web/templates/api_docs/_eth_rpc_item.html.eex:149
-#: lib/block_scout_web/views/address_view.ex:381
+#: lib/block_scout_web/views/address_view.ex:379
 #, elixir-autogen, elixir-format
 msgid "Code"
 msgstr ""
 
 #: lib/block_scout_web/templates/address/_tabs.html.eex:42
-#: lib/block_scout_web/views/address_view.ex:387
+#: lib/block_scout_web/views/address_view.ex:385
 #, elixir-autogen, elixir-format
 msgid "Coin Balance History"
 msgstr ""
@@ -1084,7 +1084,7 @@ msgstr ""
 msgid "Decoded"
 msgstr ""
 
-#: lib/block_scout_web/views/address_view.ex:382
+#: lib/block_scout_web/views/address_view.ex:380
 #, elixir-autogen, elixir-format
 msgid "Decompiled Code"
 msgstr ""
@@ -1601,7 +1601,7 @@ msgstr ""
 #: lib/block_scout_web/templates/address_internal_transaction/index.html.eex:17
 #: lib/block_scout_web/templates/transaction/_tabs.html.eex:11
 #: lib/block_scout_web/templates/transaction_internal_transaction/index.html.eex:6
-#: lib/block_scout_web/views/address_view.ex:378
+#: lib/block_scout_web/views/address_view.ex:376
 #: lib/block_scout_web/views/transaction_view.ex:533
 #, elixir-autogen, elixir-format
 msgid "Internal Transactions"
@@ -1718,7 +1718,7 @@ msgstr ""
 #: lib/block_scout_web/templates/address_logs/index.html.eex:10
 #: lib/block_scout_web/templates/transaction/_tabs.html.eex:17
 #: lib/block_scout_web/templates/transaction_log/index.html.eex:8
-#: lib/block_scout_web/views/address_view.ex:389
+#: lib/block_scout_web/views/address_view.ex:387
 #: lib/block_scout_web/views/transaction_view.ex:534
 #, elixir-autogen, elixir-format
 msgid "Logs"
@@ -2208,7 +2208,7 @@ msgstr ""
 
 #: lib/block_scout_web/templates/address/_tabs.html.eex:89
 #: lib/block_scout_web/templates/tokens/overview/_tabs.html.eex:27
-#: lib/block_scout_web/views/address_view.ex:383
+#: lib/block_scout_web/views/address_view.ex:381
 #: lib/block_scout_web/views/tokens/overview_view.ex:42
 #, elixir-autogen, elixir-format
 msgid "Read Contract"
@@ -2216,7 +2216,7 @@ msgstr ""
 
 #: lib/block_scout_web/templates/address/_tabs.html.eex:96
 #: lib/block_scout_web/templates/tokens/overview/_tabs.html.eex:41
-#: lib/block_scout_web/views/address_view.ex:384
+#: lib/block_scout_web/views/address_view.ex:382
 #, elixir-autogen, elixir-format
 msgid "Read Proxy"
 msgstr ""
@@ -2903,7 +2903,7 @@ msgstr ""
 #: lib/block_scout_web/templates/tokens/transfer/index.html.eex:15
 #: lib/block_scout_web/templates/transaction/_tabs.html.eex:4
 #: lib/block_scout_web/templates/transaction_token_transfer/index.html.eex:7
-#: lib/block_scout_web/views/address_view.ex:380
+#: lib/block_scout_web/views/address_view.ex:378
 #: lib/block_scout_web/views/tokens/instance/overview_view.ex:114
 #: lib/block_scout_web/views/tokens/overview_view.ex:40
 #: lib/block_scout_web/views/transaction_view.ex:532
@@ -2927,7 +2927,7 @@ msgstr ""
 #: lib/block_scout_web/templates/address_token_transfer/index.html.eex:13
 #: lib/block_scout_web/templates/layout/_topnav.html.eex:84
 #: lib/block_scout_web/templates/tokens/index.html.eex:10
-#: lib/block_scout_web/views/address_view.ex:377
+#: lib/block_scout_web/views/address_view.ex:375
 #, elixir-autogen, elixir-format
 msgid "Tokens"
 msgstr ""
@@ -3100,7 +3100,7 @@ msgstr ""
 #: lib/block_scout_web/templates/block/overview.html.eex:80
 #: lib/block_scout_web/templates/chain/show.html.eex:214
 #: lib/block_scout_web/templates/layout/_topnav.html.eex:49
-#: lib/block_scout_web/views/address_view.ex:379
+#: lib/block_scout_web/views/address_view.ex:377
 #, elixir-autogen, elixir-format
 msgid "Transactions"
 msgstr ""
@@ -3465,14 +3465,14 @@ msgstr ""
 
 #: lib/block_scout_web/templates/address/_tabs.html.eex:103
 #: lib/block_scout_web/templates/tokens/overview/_tabs.html.eex:34
-#: lib/block_scout_web/views/address_view.ex:385
+#: lib/block_scout_web/views/address_view.ex:383
 #, elixir-autogen, elixir-format
 msgid "Write Contract"
 msgstr ""
 
 #: lib/block_scout_web/templates/address/_tabs.html.eex:110
 #: lib/block_scout_web/templates/tokens/overview/_tabs.html.eex:48
-#: lib/block_scout_web/views/address_view.ex:386
+#: lib/block_scout_web/views/address_view.ex:384
 #, elixir-autogen, elixir-format
 msgid "Write Proxy"
 msgstr ""
@@ -3541,16 +3541,6 @@ msgstr ""
 msgid "balance of the address"
 msgstr ""
 
-#: lib/block_scout_web/templates/transaction/overview.html.eex:437
-#, elixir-autogen, elixir-format
-msgid "burned for this transaction. Equals Block Base Fee per Gas * Gas Used."
-msgstr ""
-
-#: lib/block_scout_web/templates/block/overview.html.eex:215
-#, elixir-autogen, elixir-format
-msgid "burned from transactions included in the block (Base fee (per unit of gas) * Gas Used)."
-msgstr ""
-
 #: lib/block_scout_web/templates/address_contract/index.html.eex:28
 #, elixir-autogen, elixir-format
 msgid "button"
@@ -3682,3 +3672,13 @@ msgstr ""
 #, elixir-autogen, elixir-format
 msgid "Yul"
 msgstr ""
+
+#: lib/block_scout_web/templates/transaction/overview.html.eex:437
+#, elixir-autogen, elixir-format, fuzzy
+msgid "burnt for this transaction. Equals Block Base Fee per Gas * Gas Used."
+msgstr ""
+
+#: lib/block_scout_web/templates/block/overview.html.eex:215
+#, elixir-autogen, elixir-format, fuzzy
+msgid "burnt from transactions included in the block (Base fee (per unit of gas) * Gas Used)."
+msgstr ""
diff --git a/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/block.ex b/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/block.ex
index 88f0213f98aa..1431d39bde2b 100644
--- a/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/block.ex
+++ b/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/block.ex
@@ -82,7 +82,7 @@ defmodule EthereumJSONRPC.Block do
    * `uncles`: `t:list/0` of
      [uncles](https://bitcoin.stackexchange.com/questions/39329/in-ethereum-what-is-an-uncle-block)
      `t:EthereumJSONRPC.hash/0`.
-   * `"baseFeePerGas"` - `t:EthereumJSONRPC.quantity/0` of wei to denote amount of fee burned per unit gas used. Introduced in [EIP-1559](https://github.com/ethereum/EIPs/blob/master/EIPS/eip-1559.md)
+   * `"baseFeePerGas"` - `t:EthereumJSONRPC.quantity/0` of wei to denote amount of fee burnt per unit gas used. Introduced in [EIP-1559](https://github.com/ethereum/EIPs/blob/master/EIPS/eip-1559.md)
    * `"withdrawalsRoot"` - `t:EthereumJSONRPC.hash/0` of the root of the withdrawals.
    #{if Application.compile_env(:explorer, :chain_type) == "rsk" do
     """
diff --git a/apps/explorer/config/config.exs b/apps/explorer/config/config.exs
index e9d1eb627e9c..500417a2fd7a 100644
--- a/apps/explorer/config/config.exs
+++ b/apps/explorer/config/config.exs
@@ -101,7 +101,7 @@ config :explorer, Explorer.Counters.AddressTokenTransfersCounter,
   enabled: true,
   enable_consolidation: true
 
-config :explorer, Explorer.Counters.BlockBurnedFeeCounter,
+config :explorer, Explorer.Counters.BlockBurntFeeCounter,
   enabled: true,
   enable_consolidation: true
 
diff --git a/apps/explorer/lib/explorer/application.ex b/apps/explorer/lib/explorer/application.ex
index f59e56903bc5..666407fbc025 100644
--- a/apps/explorer/lib/explorer/application.ex
+++ b/apps/explorer/lib/explorer/application.ex
@@ -113,7 +113,7 @@ defmodule Explorer.Application do
         configure(Explorer.Counters.AddressTokenUsdSum),
         configure(Explorer.Counters.TokenHoldersCounter),
         configure(Explorer.Counters.TokenTransfersCounter),
-        configure(Explorer.Counters.BlockBurnedFeeCounter),
+        configure(Explorer.Counters.BlockBurntFeeCounter),
         configure(Explorer.Counters.BlockPriorityFeeCounter),
         configure(Explorer.Counters.AverageBlockTime),
         configure(Explorer.Counters.Bridge),
diff --git a/apps/explorer/lib/explorer/chain.ex b/apps/explorer/lib/explorer/chain.ex
index edb4fe4e8d2c..bb6c3d211f98 100644
--- a/apps/explorer/lib/explorer/chain.ex
+++ b/apps/explorer/lib/explorer/chain.ex
@@ -877,7 +877,7 @@ defmodule Explorer.Chain do
       {:actual, Decimal.new(4)}
 
   """
-  @spec fee(Transaction.t(), :ether | :gwei | :wei) :: {:maximum, Decimal.t()} | {:actual, Decimal.t()}
+  @spec fee(Transaction.t(), :ether | :gwei | :wei) :: {:maximum, Decimal.t()} | {:actual, Decimal.t() | nil}
   def fee(%Transaction{gas: _gas, gas_price: nil, gas_used: nil}, _unit), do: {:maximum, nil}
 
   def fee(%Transaction{gas: gas, gas_price: gas_price, gas_used: nil}, unit) do
@@ -3452,7 +3452,7 @@ defmodule Explorer.Chain do
   end
 
   @doc """
-  The current total number of coins minted minus verifiably burned coins.
+  The current total number of coins minted minus verifiably burnt coins.
   """
   @spec total_supply :: non_neg_integer() | nil
   def total_supply do
diff --git a/apps/explorer/lib/explorer/chain/block.ex b/apps/explorer/lib/explorer/chain/block.ex
index 9cee9e21dfe7..fae356f3bcfa 100644
--- a/apps/explorer/lib/explorer/chain/block.ex
+++ b/apps/explorer/lib/explorer/chain/block.ex
@@ -224,7 +224,7 @@ defmodule Explorer.Chain.Block do
   @doc """
   Calculates transaction fees (gas price * gas used) for the list of transactions (from a single block)
   """
-  @spec transaction_fees(list()) :: Decimal.t()
+  @spec transaction_fees([Transaction.t()]) :: Decimal.t()
   def transaction_fees(transactions) do
     Enum.reduce(transactions, Decimal.new(0), fn %{gas_used: gas_used, gas_price: gas_price}, acc ->
       if gas_price do
@@ -245,7 +245,7 @@ defmodule Explorer.Chain.Block do
   @doc """
   Calculates burnt fees for the list of transactions (from a single block)
   """
-  @spec burnt_fees(list(), Wei.t()) :: Wei.t() | nil
+  @spec burnt_fees(list(), Wei.t() | nil) :: Wei.t() | nil
   def burnt_fees(transactions, base_fee_per_gas) do
     total_gas_used =
       transactions
@@ -255,14 +255,18 @@ defmodule Explorer.Chain.Block do
         |> Decimal.add(acc)
       end)
 
-    base_fee_per_gas && Wei.mult(base_fee_per_gas_to_wei(base_fee_per_gas), total_gas_used)
+    if is_nil(base_fee_per_gas) do
+      nil
+    else
+      Wei.mult(base_fee_per_gas_to_wei(base_fee_per_gas), total_gas_used)
+    end
   end
 
   defp base_fee_per_gas_to_wei(%Wei{} = wei), do: wei
   defp base_fee_per_gas_to_wei(base_fee_per_gas), do: %Wei{value: Decimal.new(base_fee_per_gas)}
 
   @uncle_reward_coef 1 / 32
-  @spec block_reward_by_parts(Block.t(), list()) :: %{
+  @spec block_reward_by_parts(Block.t(), [Transaction.t()]) :: %{
           block_number: block_number(),
           block_hash: Hash.Full.t(),
           miner_hash: Hash.Address.t(),
diff --git a/apps/explorer/lib/explorer/chain/supply.ex b/apps/explorer/lib/explorer/chain/supply.ex
index b442e4012597..0287a0dde80b 100644
--- a/apps/explorer/lib/explorer/chain/supply.ex
+++ b/apps/explorer/lib/explorer/chain/supply.ex
@@ -7,7 +7,7 @@ defmodule Explorer.Chain.Supply do
   """
 
   @doc """
-  The current total number of coins minted minus verifiably burned coins.
+  The current total number of coins minted minus verifiably burnt coins.
   """
   @callback total :: non_neg_integer() | %Decimal{sign: 1}
 
diff --git a/apps/explorer/lib/explorer/chain/wei.ex b/apps/explorer/lib/explorer/chain/wei.ex
index 76167ec33687..1ae38c7ed9c8 100644
--- a/apps/explorer/lib/explorer/chain/wei.ex
+++ b/apps/explorer/lib/explorer/chain/wei.ex
@@ -138,12 +138,17 @@ defmodule Explorer.Chain.Wei do
       iex> Explorer.Chain.Wei.sum(first, second)
       %Explorer.Chain.Wei{value: Decimal.new(1_123)}
   """
-  @spec sum(Wei.t(), Wei.t()) :: Wei.t()
+  @spec sum(Wei.t() | nil, Wei.t() | nil) :: Wei.t() | nil
   def sum(%Wei{value: wei_1}, %Wei{value: nil}) do
     wei_1
     |> from(:wei)
   end
 
+  def sum(%Wei{value: nil}, %Wei{value: wei_2}) do
+    wei_2
+    |> from(:wei)
+  end
+
   def sum(%Wei{value: wei_1}, %Wei{value: wei_2}) do
     wei_1
     |> Decimal.add(wei_2)
@@ -211,21 +216,23 @@ defmodule Explorer.Chain.Wei do
 
   """
 
-  @spec from(ether(), :ether) :: t()
+  @spec from(ether() | nil, :ether) :: t() | nil
   def from(nil, :ether), do: nil
-  def from(nil, :wei), do: nil
-  def from(nil, :gwei), do: nil
 
   def from(%Decimal{} = ether, :ether) do
     %__MODULE__{value: Decimal.mult(ether, @wei_per_ether)}
   end
 
-  @spec from(gwei(), :gwei) :: t()
+  @spec from(gwei(), :gwei) :: t() | nil
+  def from(nil, :gwei), do: nil
+
   def from(%Decimal{} = gwei, :gwei) do
     %__MODULE__{value: Decimal.mult(gwei, @wei_per_gwei)}
   end
 
   @spec from(wei(), :wei) :: t()
+  def from(nil, :wei), do: nil
+
   def from(%Decimal{} = wei, :wei) do
     %__MODULE__{value: wei}
   end
diff --git a/apps/explorer/lib/explorer/counters/block_burned_fee_counter.ex b/apps/explorer/lib/explorer/counters/block_burnt_fee_counter.ex
similarity index 91%
rename from apps/explorer/lib/explorer/counters/block_burned_fee_counter.ex
rename to apps/explorer/lib/explorer/counters/block_burnt_fee_counter.ex
index f5e3ee00cddc..9c87e313ffe7 100644
--- a/apps/explorer/lib/explorer/counters/block_burned_fee_counter.ex
+++ b/apps/explorer/lib/explorer/counters/block_burnt_fee_counter.ex
@@ -1,6 +1,6 @@
-defmodule Explorer.Counters.BlockBurnedFeeCounter do
+defmodule Explorer.Counters.BlockBurntFeeCounter do
   @moduledoc """
-  Caches Block Burned Fee counter.
+  Caches Block Burnt Fee counter.
   """
   use GenServer
 
@@ -9,7 +9,7 @@ defmodule Explorer.Counters.BlockBurnedFeeCounter do
 
   @cache_name :block_burnt_fee_counter
 
-  config = Application.compile_env(:explorer, Explorer.Counters.BlockBurnedFeeCounter)
+  config = Application.compile_env(:explorer, __MODULE__)
   @enable_consolidation Keyword.get(config, :enable_consolidation)
 
   @spec start_link(term()) :: GenServer.on_start()
diff --git a/apps/explorer/lib/explorer/counters/block_priority_fee_counter.ex b/apps/explorer/lib/explorer/counters/block_priority_fee_counter.ex
index f51deb4e2e7a..152679fe830d 100644
--- a/apps/explorer/lib/explorer/counters/block_priority_fee_counter.ex
+++ b/apps/explorer/lib/explorer/counters/block_priority_fee_counter.ex
@@ -1,6 +1,6 @@
 defmodule Explorer.Counters.BlockPriorityFeeCounter do
   @moduledoc """
-  Caches Block Burned Fee counter.
+  Caches Block Priority Fee counter.
   """
   use GenServer
 

From f2f0febdaedc9670c7485416f5610f76ca81c7b5 Mon Sep 17 00:00:00 2001
From: Viktor Baranov <baranov.viktor.27@gmail.com>
Date: Mon, 18 Dec 2023 14:12:26 +0300
Subject: [PATCH 775/909] Process review comment

---
 apps/explorer/lib/explorer/chain/wei.ex | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/apps/explorer/lib/explorer/chain/wei.ex b/apps/explorer/lib/explorer/chain/wei.ex
index 1ae38c7ed9c8..c542c9081a13 100644
--- a/apps/explorer/lib/explorer/chain/wei.ex
+++ b/apps/explorer/lib/explorer/chain/wei.ex
@@ -155,6 +155,7 @@ defmodule Explorer.Chain.Wei do
     |> from(:wei)
   end
 
+  @spec sub(Wei.t(), Wei.t()) :: Wei.t() | nil
   @doc """
   Subtracts two Wei values.
 
@@ -165,6 +166,8 @@ defmodule Explorer.Chain.Wei do
       iex> Explorer.Chain.Wei.sub(first, second)
       %Explorer.Chain.Wei{value: Decimal.new(123)}
   """
+  def sub(_, nil), do: nil
+
   def sub(%Wei{value: wei_1}, %Wei{value: wei_2}) do
     wei_1
     |> Decimal.sub(wei_2)
@@ -263,17 +266,22 @@ defmodule Explorer.Chain.Wei do
 
   """
 
-  @spec to(t(), :ether) :: ether()
+  @spec to(t(), :ether) :: ether() | nil
+  def to(nil, :ether), do: nil
+
   def to(%__MODULE__{value: wei}, :ether) do
     Decimal.div(wei, @wei_per_ether)
   end
 
-  @spec to(t(), :gwei) :: gwei()
+  @spec to(t(), :gwei) :: gwei() | nil
+  def to(nil, :gwei), do: nil
+
   def to(%__MODULE__{value: wei}, :gwei) do
     Decimal.div(wei, @wei_per_gwei)
   end
 
-  @spec to(t(), :wei) :: wei()
+  @spec to(t(), :wei) :: wei() | nil
+  def to(nil, :wei), do: nil
   def to(%__MODULE__{value: wei}, :wei), do: wei
 end
 

From d7e8171fb8ac08d8c119010738c11885958323dc Mon Sep 17 00:00:00 2001
From: Qwerty5Uiop <alex000010@bk.ru>
Date: Wed, 13 Dec 2023 13:34:52 +0600
Subject: [PATCH 776/909] Refactor transactions event preloads

---
 CHANGELOG.md                                         | 1 +
 apps/block_scout_web/lib/block_scout_web/notifier.ex | 8 +++-----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2fb1fb811eec..043f2425ec84 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -15,6 +15,7 @@
 ### Chore
 
 - [#9014](https://github.com/blockscout/blockscout/pull/9014) - Decrease amount of NFT in address collection: 15 -> 9
+- [#8994](https://github.com/blockscout/blockscout/pull/8994) - Refactor transactions event preloads
 - [#8991](https://github.com/blockscout/blockscout/pull/8991) - Manage DB queue target via runtime env var
 
 <details>
diff --git a/apps/block_scout_web/lib/block_scout_web/notifier.ex b/apps/block_scout_web/lib/block_scout_web/notifier.ex
index e340c4351df3..1de89cee8b78 100644
--- a/apps/block_scout_web/lib/block_scout_web/notifier.ex
+++ b/apps/block_scout_web/lib/block_scout_web/notifier.ex
@@ -191,13 +191,11 @@ defmodule BlockScoutWeb.Notifier do
   end
 
   def handle_event({:chain_event, :transactions, :realtime, transactions}) do
-    preloads = [:block, created_contract_address: :names, from_address: :names, to_address: :names]
+    base_preloads = [:block, created_contract_address: :names, from_address: :names, to_address: :names]
+    preloads = if API_V2.enabled?(), do: [:token_transfers | base_preloads], else: base_preloads
 
     transactions
-    |> Enum.map(
-      &(&1
-        |> Repo.preload(if API_V2.enabled?(), do: [:token_transfers | preloads], else: preloads))
-    )
+    |> Repo.preload(preloads)
     |> broadcast_transactions_websocket_v2()
     |> Enum.map(fn tx ->
       # Disable parsing of token transfers from websocket for transaction tab because we display token transfers at a separate tab

From 35641bef4fe2e77cf82a94c482f1d28612db8036 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 18 Dec 2023 18:48:31 +0000
Subject: [PATCH 777/909] Bump @amplitude/analytics-browser in
 /apps/block_scout_web/assets

Bumps [@amplitude/analytics-browser](https://github.com/amplitude/Amplitude-TypeScript) from 2.3.6 to 2.3.7.
- [Release notes](https://github.com/amplitude/Amplitude-TypeScript/releases)
- [Commits](https://github.com/amplitude/Amplitude-TypeScript/compare/@amplitude/analytics-browser@2.3.6...@amplitude/analytics-browser@2.3.7)

---
updated-dependencies:
- dependency-name: "@amplitude/analytics-browser"
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 apps/block_scout_web/assets/package-lock.json | 46 +++++++++----------
 apps/block_scout_web/assets/package.json      |  2 +-
 2 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/apps/block_scout_web/assets/package-lock.json b/apps/block_scout_web/assets/package-lock.json
index b40fbe7c8901..a24155751c76 100644
--- a/apps/block_scout_web/assets/package-lock.json
+++ b/apps/block_scout_web/assets/package-lock.json
@@ -7,7 +7,7 @@
       "name": "blockscout",
       "license": "GPL-3.0",
       "dependencies": {
-        "@amplitude/analytics-browser": "^2.3.6",
+        "@amplitude/analytics-browser": "^2.3.7",
         "@fortawesome/fontawesome-free": "^6.5.1",
         "@tarekraafat/autocomplete.js": "^10.2.7",
         "@walletconnect/web3-provider": "^1.8.0",
@@ -116,15 +116,15 @@
       }
     },
     "node_modules/@amplitude/analytics-browser": {
-      "version": "2.3.6",
-      "resolved": "https://registry.npmjs.org/@amplitude/analytics-browser/-/analytics-browser-2.3.6.tgz",
-      "integrity": "sha512-P8N19qeoSDPO0crdQwa2yi+T0/UT4v9FqZrtXF3JW4kgxu++dTW/QkQ6bsv29EPg2N54xyr9IOt98q9EkZbA7A==",
+      "version": "2.3.7",
+      "resolved": "https://registry.npmjs.org/@amplitude/analytics-browser/-/analytics-browser-2.3.7.tgz",
+      "integrity": "sha512-dk9Q8/pSxM8zyzT5jmWNuDZPicKXK3JQu/1s6ztWD8lWN/vxSIYWaFAdaz60/AM7jkOwxdP8iANMxMyxPv06Rw==",
       "dependencies": {
         "@amplitude/analytics-client-common": "^2.0.9",
         "@amplitude/analytics-core": "^2.1.2",
         "@amplitude/analytics-types": "^2.3.1",
-        "@amplitude/plugin-page-view-tracking-browser": "^2.0.16",
-        "@amplitude/plugin-web-attribution-browser": "^2.0.16",
+        "@amplitude/plugin-page-view-tracking-browser": "^2.0.17",
+        "@amplitude/plugin-web-attribution-browser": "^2.0.17",
         "tslib": "^2.4.1"
       }
     },
@@ -174,9 +174,9 @@
       "integrity": "sha512-yojBG20qvph0rpCJKb4i/FJa+otqLINEwv//hfzvjnCOcPPyS0YscI8oiRBM0rG7kZIDgaL9a6jPwkqK4ACmcw=="
     },
     "node_modules/@amplitude/plugin-page-view-tracking-browser": {
-      "version": "2.0.16",
-      "resolved": "https://registry.npmjs.org/@amplitude/plugin-page-view-tracking-browser/-/plugin-page-view-tracking-browser-2.0.16.tgz",
-      "integrity": "sha512-o9YlpXm0BcnUEK47K5xAqEa/q7DOsKGb6F35gF5iGUFXTtBP+QVLTtNujfnfiO4V9g5JrkOhB/Wm2Sr34VNFhQ==",
+      "version": "2.0.17",
+      "resolved": "https://registry.npmjs.org/@amplitude/plugin-page-view-tracking-browser/-/plugin-page-view-tracking-browser-2.0.17.tgz",
+      "integrity": "sha512-AcpNehWJRPNFiyLDbji4ccZ0jD8640EL3XbauFE8IVSsp+a0a8YbGda/5uQrjmepDGC7nS8BIxxBDiIjbDD90g==",
       "dependencies": {
         "@amplitude/analytics-client-common": "^2.0.9",
         "@amplitude/analytics-types": "^2.3.1",
@@ -189,9 +189,9 @@
       "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q=="
     },
     "node_modules/@amplitude/plugin-web-attribution-browser": {
-      "version": "2.0.16",
-      "resolved": "https://registry.npmjs.org/@amplitude/plugin-web-attribution-browser/-/plugin-web-attribution-browser-2.0.16.tgz",
-      "integrity": "sha512-IEYDrtZGJvBRhie7u9xIWNZhd0Z7heRx6A/+dNdERrW/akC1iAVmUyBZPMOR5ywVK7nwsymlVpFbPccuMoYTmg==",
+      "version": "2.0.17",
+      "resolved": "https://registry.npmjs.org/@amplitude/plugin-web-attribution-browser/-/plugin-web-attribution-browser-2.0.17.tgz",
+      "integrity": "sha512-sdO3MY3QkHOumMfm6shDOFAdV7Kf5VDsuYnyCn4g3F68e3PiKhrSgpjiqLuB0I6PVNBtkFLjTPxafNdHYsGCZQ==",
       "dependencies": {
         "@amplitude/analytics-client-common": "^2.0.9",
         "@amplitude/analytics-core": "^2.1.2",
@@ -17852,15 +17852,15 @@
       "dev": true
     },
     "@amplitude/analytics-browser": {
-      "version": "2.3.6",
-      "resolved": "https://registry.npmjs.org/@amplitude/analytics-browser/-/analytics-browser-2.3.6.tgz",
-      "integrity": "sha512-P8N19qeoSDPO0crdQwa2yi+T0/UT4v9FqZrtXF3JW4kgxu++dTW/QkQ6bsv29EPg2N54xyr9IOt98q9EkZbA7A==",
+      "version": "2.3.7",
+      "resolved": "https://registry.npmjs.org/@amplitude/analytics-browser/-/analytics-browser-2.3.7.tgz",
+      "integrity": "sha512-dk9Q8/pSxM8zyzT5jmWNuDZPicKXK3JQu/1s6ztWD8lWN/vxSIYWaFAdaz60/AM7jkOwxdP8iANMxMyxPv06Rw==",
       "requires": {
         "@amplitude/analytics-client-common": "^2.0.9",
         "@amplitude/analytics-core": "^2.1.2",
         "@amplitude/analytics-types": "^2.3.1",
-        "@amplitude/plugin-page-view-tracking-browser": "^2.0.16",
-        "@amplitude/plugin-web-attribution-browser": "^2.0.16",
+        "@amplitude/plugin-page-view-tracking-browser": "^2.0.17",
+        "@amplitude/plugin-web-attribution-browser": "^2.0.17",
         "tslib": "^2.4.1"
       },
       "dependencies": {
@@ -17916,9 +17916,9 @@
       "integrity": "sha512-yojBG20qvph0rpCJKb4i/FJa+otqLINEwv//hfzvjnCOcPPyS0YscI8oiRBM0rG7kZIDgaL9a6jPwkqK4ACmcw=="
     },
     "@amplitude/plugin-page-view-tracking-browser": {
-      "version": "2.0.16",
-      "resolved": "https://registry.npmjs.org/@amplitude/plugin-page-view-tracking-browser/-/plugin-page-view-tracking-browser-2.0.16.tgz",
-      "integrity": "sha512-o9YlpXm0BcnUEK47K5xAqEa/q7DOsKGb6F35gF5iGUFXTtBP+QVLTtNujfnfiO4V9g5JrkOhB/Wm2Sr34VNFhQ==",
+      "version": "2.0.17",
+      "resolved": "https://registry.npmjs.org/@amplitude/plugin-page-view-tracking-browser/-/plugin-page-view-tracking-browser-2.0.17.tgz",
+      "integrity": "sha512-AcpNehWJRPNFiyLDbji4ccZ0jD8640EL3XbauFE8IVSsp+a0a8YbGda/5uQrjmepDGC7nS8BIxxBDiIjbDD90g==",
       "requires": {
         "@amplitude/analytics-client-common": "^2.0.9",
         "@amplitude/analytics-types": "^2.3.1",
@@ -17933,9 +17933,9 @@
       }
     },
     "@amplitude/plugin-web-attribution-browser": {
-      "version": "2.0.16",
-      "resolved": "https://registry.npmjs.org/@amplitude/plugin-web-attribution-browser/-/plugin-web-attribution-browser-2.0.16.tgz",
-      "integrity": "sha512-IEYDrtZGJvBRhie7u9xIWNZhd0Z7heRx6A/+dNdERrW/akC1iAVmUyBZPMOR5ywVK7nwsymlVpFbPccuMoYTmg==",
+      "version": "2.0.17",
+      "resolved": "https://registry.npmjs.org/@amplitude/plugin-web-attribution-browser/-/plugin-web-attribution-browser-2.0.17.tgz",
+      "integrity": "sha512-sdO3MY3QkHOumMfm6shDOFAdV7Kf5VDsuYnyCn4g3F68e3PiKhrSgpjiqLuB0I6PVNBtkFLjTPxafNdHYsGCZQ==",
       "requires": {
         "@amplitude/analytics-client-common": "^2.0.9",
         "@amplitude/analytics-core": "^2.1.2",
diff --git a/apps/block_scout_web/assets/package.json b/apps/block_scout_web/assets/package.json
index 03bbfa3dd87d..af04f9d79097 100644
--- a/apps/block_scout_web/assets/package.json
+++ b/apps/block_scout_web/assets/package.json
@@ -20,7 +20,7 @@
   },
   "dependencies": {
     "@fortawesome/fontawesome-free": "^6.5.1",
-    "@amplitude/analytics-browser": "^2.3.6",
+    "@amplitude/analytics-browser": "^2.3.7",
     "@tarekraafat/autocomplete.js": "^10.2.7",
     "@walletconnect/web3-provider": "^1.8.0",
     "assert": "^2.1.0",

From 5d4b3e7cdba609d90b9fd0723272354138920e15 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 18 Dec 2023 18:48:52 +0000
Subject: [PATCH 778/909] Bump eslint-plugin-import in
 /apps/block_scout_web/assets

Bumps [eslint-plugin-import](https://github.com/import-js/eslint-plugin-import) from 2.29.0 to 2.29.1.
- [Release notes](https://github.com/import-js/eslint-plugin-import/releases)
- [Changelog](https://github.com/import-js/eslint-plugin-import/blob/main/CHANGELOG.md)
- [Commits](https://github.com/import-js/eslint-plugin-import/compare/v2.29.0...v2.29.1)

---
updated-dependencies:
- dependency-name: eslint-plugin-import
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 apps/block_scout_web/assets/package-lock.json | 30 +++++++++----------
 apps/block_scout_web/assets/package.json      |  2 +-
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/apps/block_scout_web/assets/package-lock.json b/apps/block_scout_web/assets/package-lock.json
index b40fbe7c8901..17aba7d77bd4 100644
--- a/apps/block_scout_web/assets/package-lock.json
+++ b/apps/block_scout_web/assets/package-lock.json
@@ -80,7 +80,7 @@
         "css-minimizer-webpack-plugin": "^5.0.1",
         "eslint": "^8.55.0",
         "eslint-config-standard": "^17.1.0",
-        "eslint-plugin-import": "^2.29.0",
+        "eslint-plugin-import": "^2.29.1",
         "eslint-plugin-node": "^11.1.0",
         "eslint-plugin-promise": "^6.1.1",
         "file-loader": "^6.2.0",
@@ -7457,9 +7457,9 @@
       }
     },
     "node_modules/eslint-plugin-import": {
-      "version": "2.29.0",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.29.0.tgz",
-      "integrity": "sha512-QPOO5NO6Odv5lpoTkddtutccQjysJuFxoPS7fAHO+9m9udNHvTCPSAMW9zGAYj8lAIdr40I8yPCdUYrncXtrwg==",
+      "version": "2.29.1",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.29.1.tgz",
+      "integrity": "sha512-BbPC0cuExzhiMo4Ff1BTVwHpjjv28C5R+btTOGaCRC7UEz801up0JadwkeSk5Ued6TG34uaczuVuH6qyy5YUxw==",
       "dev": true,
       "dependencies": {
         "array-includes": "^3.1.7",
@@ -7478,7 +7478,7 @@
         "object.groupby": "^1.0.1",
         "object.values": "^1.1.7",
         "semver": "^6.3.1",
-        "tsconfig-paths": "^3.14.2"
+        "tsconfig-paths": "^3.15.0"
       },
       "engines": {
         "node": ">=4"
@@ -16344,9 +16344,9 @@
       }
     },
     "node_modules/tsconfig-paths": {
-      "version": "3.14.2",
-      "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.14.2.tgz",
-      "integrity": "sha512-o/9iXgCYc5L/JxCHPe3Hvh8Q/2xm5Z+p18PESBU6Ff33695QnCHBEjcytY2q19ua7Mbl/DavtBOLq+oG0RCL+g==",
+      "version": "3.15.0",
+      "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.15.0.tgz",
+      "integrity": "sha512-2Ac2RgzDe/cn48GvOe3M+o82pEFewD3UPbyoUHHdKasHwJKjds4fLXWf/Ux5kATBKN20oaFGu+jbElp1pos0mg==",
       "dev": true,
       "dependencies": {
         "@types/json5": "^0.0.29",
@@ -23496,9 +23496,9 @@
       }
     },
     "eslint-plugin-import": {
-      "version": "2.29.0",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.29.0.tgz",
-      "integrity": "sha512-QPOO5NO6Odv5lpoTkddtutccQjysJuFxoPS7fAHO+9m9udNHvTCPSAMW9zGAYj8lAIdr40I8yPCdUYrncXtrwg==",
+      "version": "2.29.1",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.29.1.tgz",
+      "integrity": "sha512-BbPC0cuExzhiMo4Ff1BTVwHpjjv28C5R+btTOGaCRC7UEz801up0JadwkeSk5Ued6TG34uaczuVuH6qyy5YUxw==",
       "dev": true,
       "requires": {
         "array-includes": "^3.1.7",
@@ -23517,7 +23517,7 @@
         "object.groupby": "^1.0.1",
         "object.values": "^1.1.7",
         "semver": "^6.3.1",
-        "tsconfig-paths": "^3.14.2"
+        "tsconfig-paths": "^3.15.0"
       },
       "dependencies": {
         "debug": {
@@ -30070,9 +30070,9 @@
       }
     },
     "tsconfig-paths": {
-      "version": "3.14.2",
-      "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.14.2.tgz",
-      "integrity": "sha512-o/9iXgCYc5L/JxCHPe3Hvh8Q/2xm5Z+p18PESBU6Ff33695QnCHBEjcytY2q19ua7Mbl/DavtBOLq+oG0RCL+g==",
+      "version": "3.15.0",
+      "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.15.0.tgz",
+      "integrity": "sha512-2Ac2RgzDe/cn48GvOe3M+o82pEFewD3UPbyoUHHdKasHwJKjds4fLXWf/Ux5kATBKN20oaFGu+jbElp1pos0mg==",
       "dev": true,
       "requires": {
         "@types/json5": "^0.0.29",
diff --git a/apps/block_scout_web/assets/package.json b/apps/block_scout_web/assets/package.json
index 03bbfa3dd87d..6daea8525ea7 100644
--- a/apps/block_scout_web/assets/package.json
+++ b/apps/block_scout_web/assets/package.json
@@ -92,7 +92,7 @@
     "css-minimizer-webpack-plugin": "^5.0.1",
     "eslint": "^8.55.0",
     "eslint-config-standard": "^17.1.0",
-    "eslint-plugin-import": "^2.29.0",
+    "eslint-plugin-import": "^2.29.1",
     "eslint-plugin-node": "^11.1.0",
     "eslint-plugin-promise": "^6.1.1",
     "file-loader": "^6.2.0",

From c278bf73a1672ccd9ad7ea8d2d68382a9dbde461 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 19 Dec 2023 08:56:18 +0000
Subject: [PATCH 779/909] Bump eslint from 8.55.0 to 8.56.0 in
 /apps/block_scout_web/assets

Bumps [eslint](https://github.com/eslint/eslint) from 8.55.0 to 8.56.0.
- [Release notes](https://github.com/eslint/eslint/releases)
- [Changelog](https://github.com/eslint/eslint/blob/main/CHANGELOG.md)
- [Commits](https://github.com/eslint/eslint/compare/v8.55.0...v8.56.0)

---
updated-dependencies:
- dependency-name: eslint
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 apps/block_scout_web/assets/package-lock.json | 30 +++++++++----------
 apps/block_scout_web/assets/package.json      |  2 +-
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/apps/block_scout_web/assets/package-lock.json b/apps/block_scout_web/assets/package-lock.json
index 17aba7d77bd4..2d35472fd42c 100644
--- a/apps/block_scout_web/assets/package-lock.json
+++ b/apps/block_scout_web/assets/package-lock.json
@@ -78,7 +78,7 @@
         "copy-webpack-plugin": "^11.0.0",
         "css-loader": "^6.8.1",
         "css-minimizer-webpack-plugin": "^5.0.1",
-        "eslint": "^8.55.0",
+        "eslint": "^8.56.0",
         "eslint-config-standard": "^17.1.0",
         "eslint-plugin-import": "^2.29.1",
         "eslint-plugin-node": "^11.1.0",
@@ -2123,9 +2123,9 @@
       }
     },
     "node_modules/@eslint/js": {
-      "version": "8.55.0",
-      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.55.0.tgz",
-      "integrity": "sha512-qQfo2mxH5yVom1kacMtZZJFVdW+E70mqHMJvVg6WTLo+VBuQJ4TojZlfWBjK0ve5BdEeNAVxOsl/nvNMpJOaJA==",
+      "version": "8.56.0",
+      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.56.0.tgz",
+      "integrity": "sha512-gMsVel9D7f2HLkBma9VbtzZRehRogVRfbr++f06nL2vnCGCNlzOD+/MUov/F4p8myyAHspEhVobgjpX64q5m6A==",
       "dev": true,
       "engines": {
         "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
@@ -7307,15 +7307,15 @@
       }
     },
     "node_modules/eslint": {
-      "version": "8.55.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.55.0.tgz",
-      "integrity": "sha512-iyUUAM0PCKj5QpwGfmCAG9XXbZCWsqP/eWAWrG/W0umvjuLRBECwSFdt+rCntju0xEH7teIABPwXpahftIaTdA==",
+      "version": "8.56.0",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.56.0.tgz",
+      "integrity": "sha512-Go19xM6T9puCOWntie1/P997aXxFsOi37JIHRWI514Hc6ZnaHGKY9xFhrU65RT6CcBEzZoGG1e6Nq+DT04ZtZQ==",
       "dev": true,
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.2.0",
         "@eslint-community/regexpp": "^4.6.1",
         "@eslint/eslintrc": "^2.1.4",
-        "@eslint/js": "8.55.0",
+        "@eslint/js": "8.56.0",
         "@humanwhocodes/config-array": "^0.11.13",
         "@humanwhocodes/module-importer": "^1.0.1",
         "@nodelib/fs.walk": "^1.2.8",
@@ -19293,9 +19293,9 @@
       }
     },
     "@eslint/js": {
-      "version": "8.55.0",
-      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.55.0.tgz",
-      "integrity": "sha512-qQfo2mxH5yVom1kacMtZZJFVdW+E70mqHMJvVg6WTLo+VBuQJ4TojZlfWBjK0ve5BdEeNAVxOsl/nvNMpJOaJA==",
+      "version": "8.56.0",
+      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.56.0.tgz",
+      "integrity": "sha512-gMsVel9D7f2HLkBma9VbtzZRehRogVRfbr++f06nL2vnCGCNlzOD+/MUov/F4p8myyAHspEhVobgjpX64q5m6A==",
       "dev": true
     },
     "@ethereumjs/common": {
@@ -23253,15 +23253,15 @@
       }
     },
     "eslint": {
-      "version": "8.55.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.55.0.tgz",
-      "integrity": "sha512-iyUUAM0PCKj5QpwGfmCAG9XXbZCWsqP/eWAWrG/W0umvjuLRBECwSFdt+rCntju0xEH7teIABPwXpahftIaTdA==",
+      "version": "8.56.0",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.56.0.tgz",
+      "integrity": "sha512-Go19xM6T9puCOWntie1/P997aXxFsOi37JIHRWI514Hc6ZnaHGKY9xFhrU65RT6CcBEzZoGG1e6Nq+DT04ZtZQ==",
       "dev": true,
       "requires": {
         "@eslint-community/eslint-utils": "^4.2.0",
         "@eslint-community/regexpp": "^4.6.1",
         "@eslint/eslintrc": "^2.1.4",
-        "@eslint/js": "8.55.0",
+        "@eslint/js": "8.56.0",
         "@humanwhocodes/config-array": "^0.11.13",
         "@humanwhocodes/module-importer": "^1.0.1",
         "@nodelib/fs.walk": "^1.2.8",
diff --git a/apps/block_scout_web/assets/package.json b/apps/block_scout_web/assets/package.json
index 6daea8525ea7..9fa3abc74d56 100644
--- a/apps/block_scout_web/assets/package.json
+++ b/apps/block_scout_web/assets/package.json
@@ -90,7 +90,7 @@
     "copy-webpack-plugin": "^11.0.0",
     "css-loader": "^6.8.1",
     "css-minimizer-webpack-plugin": "^5.0.1",
-    "eslint": "^8.55.0",
+    "eslint": "^8.56.0",
     "eslint-config-standard": "^17.1.0",
     "eslint-plugin-import": "^2.29.1",
     "eslint-plugin-node": "^11.1.0",

From d45ab762583b364db4744223aca630a2c51a4c4c Mon Sep 17 00:00:00 2001
From: Nikita Pozdniakov <nikitosing4@mail.ru>
Date: Sun, 10 Dec 2023 14:53:33 +0300
Subject: [PATCH 780/909] BENS integration

---
 CHANGELOG.md                                  |   1 +
 .../controllers/api/v2/address_controller.ex  |  22 +-
 .../controllers/api/v2/block_controller.ex    |   7 +-
 .../api/v2/main_page_controller.ex            |  10 +-
 .../controllers/api/v2/search_controller.ex   |   8 +-
 .../controllers/api/v2/token_controller.ex    |  24 +-
 .../api/v2/transaction_controller.ex          |  19 +-
 .../api/v2/withdrawal_controller.ex           |   3 +-
 .../block_scout_web/views/api/v2/helper.ex    |   9 +-
 .../views/api/v2/search_view.ex               |   3 +-
 .../account/api/v1/user_controller_test.exs   |   6 +-
 .../api/v2/address_controller_test.exs        |   3 +-
 apps/explorer/lib/explorer/chain/address.ex   |   7 +-
 apps/explorer/lib/explorer/chain/search.ex    | 191 ++++++----
 .../explorer/microservice_interfaces/bens.ex  | 340 ++++++++++++++++++
 .../lib/explorer/utility/microservice.ex      |   9 +
 config/runtime.exs                            |   4 +
 17 files changed, 572 insertions(+), 94 deletions(-)
 create mode 100644 apps/explorer/lib/explorer/microservice_interfaces/bens.ex

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 043f2425ec84..719f013806c6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,7 @@
 
 ### Features
 
+- [#8972](https://github.com/blockscout/blockscout/pull/8972) - BENS integration
 - [#8957](https://github.com/blockscout/blockscout/pull/8957) - Add Tx Interpreter Service integration
 
 ### Fixes
diff --git a/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/address_controller.ex b/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/address_controller.ex
index 0c77e9ace6b0..e5e99277fa6d 100644
--- a/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/address_controller.ex
+++ b/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/address_controller.ex
@@ -20,6 +20,8 @@ defmodule BlockScoutWeb.API.V2.AddressController do
       nft_token_types_options: 1
     ]
 
+  import Explorer.MicroserviceInterfaces.BENS, only: [maybe_preload_ens: 1]
+
   alias BlockScoutWeb.AccessHelper
   alias BlockScoutWeb.API.V2.{BlockView, TransactionView, WithdrawalView}
   alias Explorer.{Chain, Market}
@@ -142,7 +144,7 @@ defmodule BlockScoutWeb.API.V2.AddressController do
       conn
       |> put_status(200)
       |> put_view(TransactionView)
-      |> render(:transactions, %{transactions: transactions, next_page_params: next_page_params})
+      |> render(:transactions, %{transactions: transactions |> maybe_preload_ens(), next_page_params: next_page_params})
     end
   end
 
@@ -185,7 +187,10 @@ defmodule BlockScoutWeb.API.V2.AddressController do
       conn
       |> put_status(200)
       |> put_view(TransactionView)
-      |> render(:token_transfers, %{token_transfers: token_transfers, next_page_params: next_page_params})
+      |> render(:token_transfers, %{
+        token_transfers: token_transfers |> maybe_preload_ens(),
+        next_page_params: next_page_params
+      })
     end
   end
 
@@ -214,7 +219,10 @@ defmodule BlockScoutWeb.API.V2.AddressController do
       conn
       |> put_status(200)
       |> put_view(TransactionView)
-      |> render(:token_transfers, %{token_transfers: token_transfers, next_page_params: next_page_params})
+      |> render(:token_transfers, %{
+        token_transfers: token_transfers |> maybe_preload_ens(),
+        next_page_params: next_page_params
+      })
     end
   end
 
@@ -245,7 +253,7 @@ defmodule BlockScoutWeb.API.V2.AddressController do
       |> put_status(200)
       |> put_view(TransactionView)
       |> render(:internal_transactions, %{
-        internal_transactions: internal_transactions,
+        internal_transactions: internal_transactions |> maybe_preload_ens(),
         next_page_params: next_page_params
       })
     end
@@ -268,7 +276,7 @@ defmodule BlockScoutWeb.API.V2.AddressController do
       conn
       |> put_status(200)
       |> put_view(TransactionView)
-      |> render(:logs, %{logs: logs, next_page_params: next_page_params})
+      |> render(:logs, %{logs: logs |> maybe_preload_ens(), next_page_params: next_page_params})
     end
   end
 
@@ -285,7 +293,7 @@ defmodule BlockScoutWeb.API.V2.AddressController do
       conn
       |> put_status(200)
       |> put_view(TransactionView)
-      |> render(:logs, %{logs: logs, next_page_params: next_page_params})
+      |> render(:logs, %{logs: logs |> maybe_preload_ens(), next_page_params: next_page_params})
     end
   end
 
@@ -387,7 +395,7 @@ defmodule BlockScoutWeb.API.V2.AddressController do
       conn
       |> put_status(200)
       |> put_view(WithdrawalView)
-      |> render(:withdrawals, %{withdrawals: withdrawals, next_page_params: next_page_params})
+      |> render(:withdrawals, %{withdrawals: withdrawals |> maybe_preload_ens(), next_page_params: next_page_params})
     end
   end
 
diff --git a/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/block_controller.ex b/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/block_controller.ex
index a680d7616d40..49e21dcce202 100644
--- a/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/block_controller.ex
+++ b/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/block_controller.ex
@@ -11,6 +11,7 @@ defmodule BlockScoutWeb.API.V2.BlockController do
     ]
 
   import BlockScoutWeb.PagingHelper, only: [delete_parameters_from_next_page_params: 1, select_block_type: 1]
+  import Explorer.MicroserviceInterfaces.BENS, only: [maybe_preload_ens: 1]
 
   alias BlockScoutWeb.API.V2.{TransactionView, WithdrawalView}
   alias Explorer.Chain
@@ -81,7 +82,7 @@ defmodule BlockScoutWeb.API.V2.BlockController do
 
     conn
     |> put_status(200)
-    |> render(:blocks, %{blocks: blocks, next_page_params: next_page_params})
+    |> render(:blocks, %{blocks: blocks |> maybe_preload_ens(), next_page_params: next_page_params})
   end
 
   def transactions(conn, %{"block_hash_or_number" => block_hash_or_number} = params) do
@@ -103,7 +104,7 @@ defmodule BlockScoutWeb.API.V2.BlockController do
       conn
       |> put_status(200)
       |> put_view(TransactionView)
-      |> render(:transactions, %{transactions: transactions, next_page_params: next_page_params})
+      |> render(:transactions, %{transactions: transactions |> maybe_preload_ens(), next_page_params: next_page_params})
     end
   end
 
@@ -122,7 +123,7 @@ defmodule BlockScoutWeb.API.V2.BlockController do
       conn
       |> put_status(200)
       |> put_view(WithdrawalView)
-      |> render(:withdrawals, %{withdrawals: withdrawals, next_page_params: next_page_params})
+      |> render(:withdrawals, %{withdrawals: withdrawals |> maybe_preload_ens(), next_page_params: next_page_params})
     end
   end
 end
diff --git a/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/main_page_controller.ex b/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/main_page_controller.ex
index ceec1582e098..0e06f6e058ca 100644
--- a/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/main_page_controller.ex
+++ b/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/main_page_controller.ex
@@ -6,6 +6,7 @@ defmodule BlockScoutWeb.API.V2.MainPageController do
   alias Explorer.{Chain, Repo}
 
   import BlockScoutWeb.Account.AuthController, only: [current_user: 1]
+  import Explorer.MicroserviceInterfaces.BENS, only: [maybe_preload_ens: 1]
 
   @transactions_options [
     necessity_by_association: %{
@@ -32,7 +33,7 @@ defmodule BlockScoutWeb.API.V2.MainPageController do
     conn
     |> put_status(200)
     |> put_view(BlockView)
-    |> render(:blocks, %{blocks: blocks})
+    |> render(:blocks, %{blocks: blocks |> maybe_preload_ens()})
   end
 
   def transactions(conn, _params) do
@@ -41,7 +42,7 @@ defmodule BlockScoutWeb.API.V2.MainPageController do
     conn
     |> put_status(200)
     |> put_view(TransactionView)
-    |> render(:transactions, %{transactions: recent_transactions})
+    |> render(:transactions, %{transactions: recent_transactions |> maybe_preload_ens()})
   end
 
   def watchlist_transactions(conn, _params) do
@@ -51,7 +52,10 @@ defmodule BlockScoutWeb.API.V2.MainPageController do
       conn
       |> put_status(200)
       |> put_view(TransactionView)
-      |> render(:transactions_watchlist, %{transactions: transactions, watchlist_names: watchlist_names})
+      |> render(:transactions_watchlist, %{
+        transactions: transactions |> maybe_preload_ens(),
+        watchlist_names: watchlist_names
+      })
     end
   end
 
diff --git a/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/search_controller.ex b/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/search_controller.ex
index abe0aca31486..f94a752f369a 100644
--- a/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/search_controller.ex
+++ b/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/search_controller.ex
@@ -2,6 +2,7 @@ defmodule BlockScoutWeb.API.V2.SearchController do
   use Phoenix.Controller
 
   import BlockScoutWeb.Chain, only: [paging_options: 1, next_page_params: 3, split_list_by_page: 1, from_param: 1]
+  import Explorer.MicroserviceInterfaces.BENS, only: [maybe_preload_ens_info_to_search_result: 1]
 
   alias Explorer.Chain.Search
   alias Explorer.PagingOptions
@@ -22,7 +23,10 @@ defmodule BlockScoutWeb.API.V2.SearchController do
 
     conn
     |> put_status(200)
-    |> render(:search_results, %{search_results: search_results, next_page_params: next_page_params})
+    |> render(:search_results, %{
+      search_results: search_results |> maybe_preload_ens_info_to_search_result(),
+      next_page_params: next_page_params
+    })
   end
 
   def check_redirect(conn, %{"q" => query}) do
@@ -41,6 +45,6 @@ defmodule BlockScoutWeb.API.V2.SearchController do
 
     conn
     |> put_status(200)
-    |> render(:search_results, %{search_results: search_results})
+    |> render(:search_results, %{search_results: search_results |> maybe_preload_ens_info_to_search_result()})
   end
 end
diff --git a/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/token_controller.ex b/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/token_controller.ex
index e98f648cb984..c9640e73722a 100644
--- a/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/token_controller.ex
+++ b/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/token_controller.ex
@@ -20,6 +20,8 @@ defmodule BlockScoutWeb.API.V2.TokenController do
   import BlockScoutWeb.PagingHelper,
     only: [delete_parameters_from_next_page_params: 1, token_transfers_types_options: 1, tokens_sorting: 1]
 
+  import Explorer.MicroserviceInterfaces.BENS, only: [maybe_preload_ens: 1]
+
   action_fallback(BlockScoutWeb.API.V2.FallbackController)
 
   @api_true [api?: true]
@@ -67,7 +69,10 @@ defmodule BlockScoutWeb.API.V2.TokenController do
       conn
       |> put_status(200)
       |> put_view(TransactionView)
-      |> render(:token_transfers, %{token_transfers: token_transfers, next_page_params: next_page_params})
+      |> render(:token_transfers, %{
+        token_transfers: token_transfers |> maybe_preload_ens(),
+        next_page_params: next_page_params
+      })
     end
   end
 
@@ -84,7 +89,11 @@ defmodule BlockScoutWeb.API.V2.TokenController do
 
       conn
       |> put_status(200)
-      |> render(:token_balances, %{token_balances: token_balances, next_page_params: next_page_params, token: token})
+      |> render(:token_balances, %{
+        token_balances: token_balances |> maybe_preload_ens(),
+        next_page_params: next_page_params,
+        token: token
+      })
     end
   end
 
@@ -190,7 +199,10 @@ defmodule BlockScoutWeb.API.V2.TokenController do
       conn
       |> put_status(200)
       |> put_view(TransactionView)
-      |> render(:token_transfers, %{token_transfers: token_transfers, next_page_params: next_page_params})
+      |> render(:token_transfers, %{
+        token_transfers: token_transfers |> maybe_preload_ens(),
+        next_page_params: next_page_params
+      })
     end
   end
 
@@ -217,7 +229,11 @@ defmodule BlockScoutWeb.API.V2.TokenController do
 
       conn
       |> put_status(200)
-      |> render(:token_balances, %{token_balances: token_holders, next_page_params: next_page_params, token: token})
+      |> render(:token_balances, %{
+        token_balances: token_holders |> maybe_preload_ens(),
+        next_page_params: next_page_params,
+        token: token
+      })
     end
   end
 
diff --git a/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/transaction_controller.ex b/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/transaction_controller.ex
index b9729bad84fe..a9f1eb50490b 100644
--- a/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/transaction_controller.ex
+++ b/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/transaction_controller.ex
@@ -22,6 +22,8 @@ defmodule BlockScoutWeb.API.V2.TransactionController do
       type_filter_options: 1
     ]
 
+  import Explorer.MicroserviceInterfaces.BENS, only: [maybe_preload_ens: 1]
+
   alias BlockScoutWeb.AccessHelper
   alias BlockScoutWeb.MicroserviceInterfaces.TransactionInterpretation, as: TransactionInterpretationService
   alias BlockScoutWeb.Models.TransactionStateHelper
@@ -132,7 +134,7 @@ defmodule BlockScoutWeb.API.V2.TransactionController do
 
     conn
     |> put_status(200)
-    |> render(:transactions, %{transactions: transactions, next_page_params: next_page_params})
+    |> render(:transactions, %{transactions: transactions |> maybe_preload_ens(), next_page_params: next_page_params})
   end
 
   @doc """
@@ -149,7 +151,7 @@ defmodule BlockScoutWeb.API.V2.TransactionController do
 
     conn
     |> put_status(200)
-    |> render(:transactions, %{transactions: transactions, items: true})
+    |> render(:transactions, %{transactions: transactions |> maybe_preload_ens(), items: true})
   end
 
   def execution_node(conn, %{"execution_node_hash_param" => execution_node_hash_string} = params) do
@@ -169,7 +171,7 @@ defmodule BlockScoutWeb.API.V2.TransactionController do
 
       conn
       |> put_status(200)
-      |> render(:transactions, %{transactions: transactions, next_page_params: next_page_params})
+      |> render(:transactions, %{transactions: transactions |> maybe_preload_ens(), next_page_params: next_page_params})
     end
   end
 
@@ -230,7 +232,10 @@ defmodule BlockScoutWeb.API.V2.TransactionController do
 
       conn
       |> put_status(200)
-      |> render(:token_transfers, %{token_transfers: token_transfers, next_page_params: next_page_params})
+      |> render(:token_transfers, %{
+        token_transfers: token_transfers |> maybe_preload_ens(),
+        next_page_params: next_page_params
+      })
     end
   end
 
@@ -256,7 +261,7 @@ defmodule BlockScoutWeb.API.V2.TransactionController do
       conn
       |> put_status(200)
       |> render(:internal_transactions, %{
-        internal_transactions: internal_transactions,
+        internal_transactions: internal_transactions |> maybe_preload_ens(),
         next_page_params: next_page_params
       })
     end
@@ -291,7 +296,7 @@ defmodule BlockScoutWeb.API.V2.TransactionController do
       |> put_status(200)
       |> render(:logs, %{
         tx_hash: transaction_hash,
-        logs: logs,
+        logs: logs |> maybe_preload_ens(),
         next_page_params: next_page_params
       })
     end
@@ -345,7 +350,7 @@ defmodule BlockScoutWeb.API.V2.TransactionController do
       conn
       |> put_status(200)
       |> render(:transactions_watchlist, %{
-        transactions: transactions,
+        transactions: transactions |> maybe_preload_ens(),
         next_page_params: next_page_params,
         watchlist_names: watchlist_names
       })
diff --git a/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/withdrawal_controller.ex b/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/withdrawal_controller.ex
index fc26823e5211..4282d16d4fbb 100644
--- a/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/withdrawal_controller.ex
+++ b/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/withdrawal_controller.ex
@@ -5,6 +5,7 @@ defmodule BlockScoutWeb.API.V2.WithdrawalController do
     only: [paging_options: 1, next_page_params: 3, split_list_by_page: 1]
 
   import BlockScoutWeb.PagingHelper, only: [delete_parameters_from_next_page_params: 1]
+  import Explorer.MicroserviceInterfaces.BENS, only: [maybe_preload_ens: 1]
 
   alias Explorer.Chain
 
@@ -20,7 +21,7 @@ defmodule BlockScoutWeb.API.V2.WithdrawalController do
 
     conn
     |> put_status(200)
-    |> render(:withdrawals, %{withdrawals: withdrawals, next_page_params: next_page_params})
+    |> render(:withdrawals, %{withdrawals: withdrawals |> maybe_preload_ens(), next_page_params: next_page_params})
   end
 
   def withdrawals_counters(conn, _params) do
diff --git a/apps/block_scout_web/lib/block_scout_web/views/api/v2/helper.ex b/apps/block_scout_web/lib/block_scout_web/views/api/v2/helper.ex
index 9c490d9131fc..96a69840ee24 100644
--- a/apps/block_scout_web/lib/block_scout_web/views/api/v2/helper.ex
+++ b/apps/block_scout_web/lib/block_scout_web/views/api/v2/helper.ex
@@ -54,10 +54,17 @@ defmodule BlockScoutWeb.API.V2.Helper do
       "is_contract" => Address.is_smart_contract(address),
       "name" => address_name(address),
       "implementation_name" => implementation_name(address),
-      "is_verified" => is_verified(address)
+      "is_verified" => is_verified(address),
+      "ens_domain_name" => address.ens_domain_name
     }
   end
 
+  defp address_with_info(%{ens_domain_name: name}, address_hash) do
+    nil
+    |> address_with_info(address_hash)
+    |> Map.put("ens_domain_name", name)
+  end
+
   defp address_with_info(%NotLoaded{}, address_hash) do
     address_with_info(nil, address_hash)
   end
diff --git a/apps/block_scout_web/lib/block_scout_web/views/api/v2/search_view.ex b/apps/block_scout_web/lib/block_scout_web/views/api/v2/search_view.ex
index 0376e04f423e..b56c67352056 100644
--- a/apps/block_scout_web/lib/block_scout_web/views/api/v2/search_view.ex
+++ b/apps/block_scout_web/lib/block_scout_web/views/api/v2/search_view.ex
@@ -47,7 +47,8 @@ defmodule BlockScoutWeb.API.V2.SearchView do
       "name" => search_result.name,
       "address" => search_result.address_hash,
       "url" => address_path(Endpoint, :show, search_result.address_hash),
-      "is_smart_contract_verified" => search_result.verified
+      "is_smart_contract_verified" => search_result.verified,
+      "ens_info" => search_result[:ens_info]
     }
   end
 
diff --git a/apps/block_scout_web/test/block_scout_web/controllers/account/api/v1/user_controller_test.exs b/apps/block_scout_web/test/block_scout_web/controllers/account/api/v1/user_controller_test.exs
index f32b5727e727..cb8359f003f5 100644
--- a/apps/block_scout_web/test/block_scout_web/controllers/account/api/v1/user_controller_test.exs
+++ b/apps/block_scout_web/test/block_scout_web/controllers/account/api/v1/user_controller_test.exs
@@ -156,7 +156,8 @@ defmodule BlockScoutWeb.Account.Api.V1.UserControllerTest do
                "name" => nil,
                "private_tags" => [],
                "public_tags" => [],
-               "watchlist_names" => []
+               "watchlist_names" => [],
+               "ens_domain_name" => nil
              }
            }}
         end)
@@ -207,7 +208,8 @@ defmodule BlockScoutWeb.Account.Api.V1.UserControllerTest do
                "name" => nil,
                "private_tags" => [],
                "public_tags" => [],
-               "watchlist_names" => []
+               "watchlist_names" => [],
+               "ens_domain_name" => nil
              }
            }}
         end)
diff --git a/apps/block_scout_web/test/block_scout_web/controllers/api/v2/address_controller_test.exs b/apps/block_scout_web/test/block_scout_web/controllers/api/v2/address_controller_test.exs
index 690c9e1bfbc2..6ed830528b12 100644
--- a/apps/block_scout_web/test/block_scout_web/controllers/api/v2/address_controller_test.exs
+++ b/apps/block_scout_web/test/block_scout_web/controllers/api/v2/address_controller_test.exs
@@ -78,7 +78,8 @@ defmodule BlockScoutWeb.API.V2.AddressControllerTest do
         "has_tokens" => false,
         "has_token_transfers" => false,
         "watchlist_address_id" => nil,
-        "has_beacon_chain_withdrawals" => false
+        "has_beacon_chain_withdrawals" => false,
+        "ens_domain_name" => nil
       }
 
       request = get(conn, "/api/v2/addresses/#{Address.checksum(address.hash)}")
diff --git a/apps/explorer/lib/explorer/chain/address.ex b/apps/explorer/lib/explorer/chain/address.ex
index 96dc8c782c27..352d1fcc05e6 100644
--- a/apps/explorer/lib/explorer/chain/address.ex
+++ b/apps/explorer/lib/explorer/chain/address.ex
@@ -47,7 +47,8 @@ defmodule Explorer.Chain.Address do
     contract has been verified
    * `names` - names known for the address
    * `inserted_at` - when this address was inserted
-   * `updated_at` when this address was last updated
+   * `updated_at` - when this address was last updated
+   * `ens_domain_name` - virtual field for ENS domain name passing
 
    `fetched_coin_balance` and `fetched_coin_balance_block_number` may be updated when a new coin_balance row is fetched.
     They may also be updated when the balance is fetched via the on demand fetcher.
@@ -64,7 +65,8 @@ defmodule Explorer.Chain.Address do
           nonce: non_neg_integer() | nil,
           transactions_count: non_neg_integer() | nil,
           token_transfers_count: non_neg_integer() | nil,
-          gas_used: non_neg_integer() | nil
+          gas_used: non_neg_integer() | nil,
+          ens_domain_name: String.t()
         }
 
   @derive {Poison.Encoder,
@@ -104,6 +106,7 @@ defmodule Explorer.Chain.Address do
     field(:transactions_count, :integer)
     field(:token_transfers_count, :integer)
     field(:gas_used, :integer)
+    field(:ens_domain_name, :string, virtual: true)
 
     has_one(:smart_contract, SmartContract)
     has_one(:token, Token, foreign_key: :contract_address_hash)
diff --git a/apps/explorer/lib/explorer/chain/search.ex b/apps/explorer/lib/explorer/chain/search.ex
index 64e8c1640645..d74f697a9b34 100644
--- a/apps/explorer/lib/explorer/chain/search.ex
+++ b/apps/explorer/lib/explorer/chain/search.ex
@@ -14,7 +14,7 @@ defmodule Explorer.Chain.Search do
     ]
 
   import Explorer.Chain, only: [select_repo: 1]
-
+  import Explorer.MicroserviceInterfaces.BENS, only: [ens_domain_name_lookup: 1]
   alias Explorer.{Chain, PagingOptions}
   alias Explorer.Tags.{AddressTag, AddressToTag}
 
@@ -33,74 +33,87 @@ defmodule Explorer.Chain.Search do
   def joint_search(paging_options, offset, raw_string, options \\ []) do
     string = String.trim(raw_string)
 
-    case prepare_search_term(string) do
-      {:some, term} ->
-        tokens_query = search_token_query(string, term)
-        contracts_query = search_contract_query(term)
-        labels_query = search_label_query(term)
-        tx_query = search_tx_query(string)
-        address_query = search_address_query(string)
-        block_query = search_block_query(string)
-
-        basic_query =
-          from(
-            tokens in subquery(tokens_query),
-            union: ^contracts_query,
-            union: ^labels_query
-          )
-
-        query =
-          cond do
-            address_query ->
-              basic_query
-              |> union(^address_query)
+    ens_task = maybe_run_ens_task(paging_options, raw_string, options)
+
+    result =
+      case prepare_search_term(string) do
+        {:some, term} ->
+          tokens_query = search_token_query(string, term)
+          contracts_query = search_contract_query(term)
+          labels_query = search_label_query(term)
+          tx_query = search_tx_query(string)
+          address_query = search_address_query(string)
+          block_query = search_block_query(string)
+
+          basic_query =
+            from(
+              tokens in subquery(tokens_query),
+              union: ^contracts_query,
+              union: ^labels_query
+            )
 
-            tx_query ->
-              basic_query
-              |> union(^tx_query)
-              |> union(^block_query)
+          query =
+            cond do
+              address_query ->
+                basic_query
+                |> union(^address_query)
+
+              tx_query ->
+                basic_query
+                |> union(^tx_query)
+                |> union(^block_query)
+
+              block_query ->
+                basic_query
+                |> union(^block_query)
+
+              true ->
+                basic_query
+            end
+
+          ordered_query =
+            from(items in subquery(query),
+              order_by: [
+                desc: items.priority,
+                desc_nulls_last: items.circulating_market_cap,
+                desc_nulls_last: items.exchange_rate,
+                desc_nulls_last: items.is_verified_via_admin_panel,
+                desc_nulls_last: items.holder_count,
+                asc: items.name,
+                desc: items.inserted_at
+              ],
+              limit: ^paging_options.page_size,
+              offset: ^offset
+            )
 
-            block_query ->
-              basic_query
-              |> union(^block_query)
+          paginated_ordered_query =
+            ordered_query
+            |> page_search_results(paging_options)
 
-            true ->
-              basic_query
-          end
+          search_results = select_repo(options).all(paginated_ordered_query)
 
-        ordered_query =
-          from(items in subquery(query),
-            order_by: [
-              desc: items.priority,
-              desc_nulls_last: items.circulating_market_cap,
-              desc_nulls_last: items.exchange_rate,
-              desc_nulls_last: items.is_verified_via_admin_panel,
-              desc_nulls_last: items.holder_count,
-              asc: items.name,
-              desc: items.inserted_at
-            ],
-            limit: ^paging_options.page_size,
-            offset: ^offset
-          )
+          search_results
+          |> Enum.map(fn result ->
+            result
+            |> compose_result_checksummed_address_hash()
+            |> format_timestamp()
+          end)
 
-        paginated_ordered_query =
-          ordered_query
-          |> page_search_results(paging_options)
+        _ ->
+          []
+      end
 
-        search_results = select_repo(options).all(paginated_ordered_query)
+    ens_result = (ens_task && await_ens_task(ens_task)) || []
 
-        search_results
-        |> Enum.map(fn result ->
-          result
-          |> compose_result_checksummed_address_hash()
-          |> format_timestamp()
-        end)
+    result ++ ens_result
+  end
 
-      _ ->
-        []
-    end
+  defp maybe_run_ens_task(%PagingOptions{key: nil}, query_string, options) do
+    Task.async(fn -> search_ens_name(query_string, options) end)
   end
 
+  defp maybe_run_ens_task(_, _query_string, _options), do: nil
+
   @doc """
     Search function. Differences from joint_search/4:
       1. Returns all the found categories (amount of results up to `paging_options.page_size`).
@@ -111,6 +124,7 @@ defmodule Explorer.Chain.Search do
   @spec balanced_unpaginated_search(PagingOptions.t(), binary(), [Chain.api?()] | []) :: list
   def balanced_unpaginated_search(paging_options, raw_search_query, options \\ []) do
     search_query = String.trim(raw_search_query)
+    ens_task = Task.async(fn -> search_ens_name(raw_search_query, options) end)
 
     case prepare_search_term(search_query) do
       {:some, term} ->
@@ -167,8 +181,10 @@ defmodule Explorer.Chain.Search do
             []
           end
 
+        ens_result = await_ens_task(ens_task)
+
         non_empty_lists =
-          [tokens_result, contracts_result, labels_result, tx_result, address_result, blocks_result]
+          [tokens_result, contracts_result, labels_result, tx_result, address_result, blocks_result, ens_result]
           |> Enum.filter(fn list -> Enum.count(list) > 0 end)
           |> Enum.sort_by(fn list -> Enum.count(list) end, :asc)
 
@@ -190,6 +206,16 @@ defmodule Explorer.Chain.Search do
     end
   end
 
+  defp await_ens_task(ens_task) do
+    case Task.yield(ens_task, 5000) || Task.shutdown(ens_task) do
+      {:ok, result} ->
+        result
+
+      _ ->
+        []
+    end
+  end
+
   def prepare_search_term(string) do
     case Regex.scan(~r/[a-zA-Z0-9]+/, string) do
       [_ | _] = words ->
@@ -525,4 +551,49 @@ defmodule Explorer.Chain.Search do
       result
     end
   end
+
+  defp search_ens_name(search_query, options) do
+    trimmed_query = String.trim(search_query)
+
+    with true <- Regex.match?(~r/\w+\.\w+/, trimmed_query),
+         result when is_map(result) <- ens_domain_name_lookup(search_query) do
+      [
+        result[:address_hash]
+        |> search_address_query()
+        |> select_repo(options).all()
+        |> merge_address_search_result_with_ens_info(result)
+      ]
+    else
+      _ ->
+        []
+    end
+  end
+
+  defp merge_address_search_result_with_ens_info([], ens_info) do
+    %{
+      address_hash: ens_info[:address_hash],
+      block_hash: nil,
+      tx_hash: nil,
+      type: "address",
+      name: nil,
+      symbol: nil,
+      holder_count: nil,
+      inserted_at: nil,
+      block_number: 0,
+      icon_url: nil,
+      token_type: nil,
+      timestamp: nil,
+      verified: false,
+      exchange_rate: nil,
+      total_supply: nil,
+      circulating_market_cap: nil,
+      priority: 0,
+      is_verified_via_admin_panel: nil,
+      ens_info: ens_info
+    }
+  end
+
+  defp merge_address_search_result_with_ens_info([address], ens_info) do
+    Map.put(address |> compose_result_checksummed_address_hash(), :ens_info, ens_info)
+  end
 end
diff --git a/apps/explorer/lib/explorer/microservice_interfaces/bens.ex b/apps/explorer/lib/explorer/microservice_interfaces/bens.ex
new file mode 100644
index 000000000000..03587ce310b9
--- /dev/null
+++ b/apps/explorer/lib/explorer/microservice_interfaces/bens.ex
@@ -0,0 +1,340 @@
+defmodule Explorer.MicroserviceInterfaces.BENS do
+  @moduledoc """
+    Interface to interact with Blockscout ENS microservice
+  """
+
+  alias Ecto.Association.NotLoaded
+  alias Explorer.Chain
+
+  alias Explorer.Chain.{
+    Address,
+    Address.CurrentTokenBalance,
+    Block,
+    InternalTransaction,
+    Log,
+    TokenTransfer,
+    Transaction,
+    Withdrawal
+  }
+
+  alias Explorer.Utility.Microservice
+  alias HTTPoison.Response
+  require Logger
+
+  @post_timeout :timer.seconds(5)
+  @request_error_msg "Error while sending request to BENS microservice"
+
+  @typep supported_types ::
+           Address.t()
+           | Block.t()
+           | CurrentTokenBalance.t()
+           | InternalTransaction.t()
+           | Log.t()
+           | TokenTransfer.t()
+           | Transaction.t()
+           | Withdrawal.t()
+
+  @doc """
+    Batch request for ENS names via {{baseUrl}}/api/v1/:chainId/addresses:batch-resolve-names
+  """
+  @spec ens_names_batch_request([String.t()]) :: {:error, :disabled | String.t() | Jason.DecodeError.t()} | {:ok, any}
+  def ens_names_batch_request(addresses) do
+    with :ok <- Microservice.check_enabled(__MODULE__) do
+      body = %{
+        addresses: Enum.map(addresses, &to_string/1)
+      }
+
+      http_post_request(batch_resolve_name_url(), body)
+    end
+  end
+
+  @doc """
+    Request for ENS name via {{baseUrl}}/api/v1/:chainId/addresses:lookup
+  """
+  @spec address_lookup(binary()) :: {:error, :disabled | String.t() | Jason.DecodeError.t()} | {:ok, any}
+  def address_lookup(address) do
+    with :ok <- Microservice.check_enabled(__MODULE__) do
+      body = %{
+        "address" => to_string(address),
+        "resolvedTo" => true,
+        "ownedBy" => false,
+        "onlyActive" => true,
+        "order" => "DESC"
+      }
+
+      http_post_request(address_lookup_url(), body)
+    end
+  end
+
+  @doc """
+    Lookup for ENS domain name via {{baseUrl}}/api/v1/:chainId/domains:lookup
+  """
+  @spec ens_domain_lookup(binary()) :: {:error, :disabled | String.t() | Jason.DecodeError.t()} | {:ok, any}
+  def ens_domain_lookup(domain) do
+    with :ok <- Microservice.check_enabled(__MODULE__) do
+      body = %{
+        "name" => domain,
+        "onlyActive" => true,
+        "sort" => "registration_date",
+        "order" => "DESC"
+      }
+
+      http_post_request(domain_lookup_url(), body)
+    end
+  end
+
+  defp http_post_request(url, body) do
+    headers = [{"Content-Type", "application/json"}]
+
+    case HTTPoison.post(url, Jason.encode!(body), headers, recv_timeout: @post_timeout) do
+      {:ok, %Response{body: body, status_code: 200}} ->
+        Jason.decode(body)
+
+      {_, error} ->
+        old_truncate = Application.get_env(:logger, :truncate)
+        Logger.configure(truncate: :infinity)
+
+        Logger.error(fn ->
+          [
+            "Error while sending request to BENS microservice url: #{url}, body: #{inspect(body, limit: :infinity, printable_limit: :infinity)}: ",
+            inspect(error, limit: :infinity, printable_limit: :infinity)
+          ]
+        end)
+
+        Logger.configure(truncate: old_truncate)
+        {:error, @request_error_msg}
+    end
+  end
+
+  @spec enabled?() :: boolean
+  def enabled?, do: Application.get_env(:explorer, __MODULE__)[:enabled]
+
+  defp batch_resolve_name_url do
+    "#{addresses_url()}:batch-resolve-names"
+  end
+
+  defp address_lookup_url do
+    "#{addresses_url()}:lookup"
+  end
+
+  defp domain_lookup_url do
+    "#{domains_url()}:lookup"
+  end
+
+  defp addresses_url do
+    "#{base_url()}/addresses"
+  end
+
+  defp domains_url do
+    "#{base_url()}/domains"
+  end
+
+  defp base_url do
+    chain_id = Application.get_env(:block_scout_web, :chain_id)
+    "#{Microservice.base_url(__MODULE__)}/api/v1/#{chain_id}"
+  end
+
+  @doc """
+    Preload ENS info to list of entities if enabled?()
+  """
+  @spec maybe_preload_ens([supported_types]) :: [supported_types]
+  def maybe_preload_ens(entity_list, function \\ &preload_ens_to_list/1) do
+    if enabled?() do
+      function.(entity_list)
+    else
+      entity_list
+    end
+  end
+
+  def maybe_preload_ens_info_to_search_result(list) do
+    maybe_preload_ens(list, &preload_ens_info_to_search_result/1)
+  end
+
+  @doc """
+    Preload ENS names to list of entities
+  """
+  @spec preload_ens_to_list([supported_types]) :: [supported_types]
+  def preload_ens_to_list(items) do
+    address_hash_strings =
+      Enum.reduce(items, [], fn item, acc ->
+        acc ++ item_to_address_hash_strings(item)
+      end)
+
+    case ens_names_batch_request(address_hash_strings) do
+      {:ok, result} ->
+        put_ens_names(result["names"], items)
+
+      _ ->
+        items
+    end
+  end
+
+  @doc """
+    Preload ENS info to search result, using address_lookup/1
+  """
+  @spec preload_ens_info_to_search_result(list) :: list
+  def preload_ens_info_to_search_result(list) do
+    Enum.map(list, fn
+      %{type: "address"} = search_result ->
+        ens_info = search_result[:address_hash] |> address_lookup() |> parse_lookup_response()
+        Map.put(search_result, :ens_info, ens_info)
+
+      search_result ->
+        search_result
+    end)
+  end
+
+  @spec ens_domain_name_lookup(binary()) :: nil | %{address_hash: binary(), expiry_date: any(), name: any()}
+  def ens_domain_name_lookup(domain) do
+    domain |> ens_domain_lookup() |> parse_lookup_response()
+  end
+
+  defp parse_lookup_response(
+         {:ok,
+          %{
+            "items" =>
+              [
+                %{"name" => name, "expiryDate" => expiry_date, "resolvedAddress" => %{"hash" => address_hash_string}}
+                | _other
+              ] = items
+          }}
+       ) do
+    {:ok, hash} = Chain.string_to_address_hash(address_hash_string)
+
+    %{
+      name: name,
+      expiry_date: expiry_date,
+      names_count: Enum.count(items),
+      address_hash: Address.checksum(hash)
+    }
+  end
+
+  defp parse_lookup_response(_), do: nil
+
+  defp item_to_address_hash_strings(%Transaction{
+         to_address_hash: nil,
+         created_contract_address_hash: created_contract_address_hash,
+         from_address_hash: from_address_hash
+       }) do
+    [to_string(created_contract_address_hash), to_string(from_address_hash)]
+  end
+
+  defp item_to_address_hash_strings(%Transaction{
+         to_address_hash: to_address_hash,
+         created_contract_address_hash: nil,
+         from_address_hash: from_address_hash
+       }) do
+    [to_string(to_address_hash), to_string(from_address_hash)]
+  end
+
+  defp item_to_address_hash_strings(%TokenTransfer{
+         to_address_hash: to_address_hash,
+         from_address_hash: from_address_hash
+       }) do
+    [to_string(to_address_hash), to_string(from_address_hash)]
+  end
+
+  defp item_to_address_hash_strings(%InternalTransaction{
+         to_address_hash: to_address_hash,
+         from_address_hash: from_address_hash
+       }) do
+    [to_string(to_address_hash), to_string(from_address_hash)]
+  end
+
+  defp item_to_address_hash_strings(%Log{address_hash: address_hash}) do
+    [to_string(address_hash)]
+  end
+
+  defp item_to_address_hash_strings(%Withdrawal{address_hash: address_hash}) do
+    [to_string(address_hash)]
+  end
+
+  defp item_to_address_hash_strings(%Block{miner_hash: miner_hash}) do
+    [to_string(miner_hash)]
+  end
+
+  defp item_to_address_hash_strings(%CurrentTokenBalance{address_hash: address_hash}) do
+    [to_string(address_hash)]
+  end
+
+  defp put_ens_names(names, items) do
+    Enum.map(items, &put_ens_name_to_item(&1, names))
+  end
+
+  defp put_ens_name_to_item(
+         %Transaction{
+           to_address_hash: to_address_hash,
+           created_contract_address_hash: created_contract_address_hash,
+           from_address_hash: from_address_hash
+         } = tx,
+         names
+       ) do
+    %Transaction{
+      tx
+      | to_address: alter_address(tx.to_address, to_address_hash, names),
+        created_contract_address: alter_address(tx.created_contract_address, created_contract_address_hash, names),
+        from_address: alter_address(tx.from_address, from_address_hash, names)
+    }
+  end
+
+  defp put_ens_name_to_item(
+         %TokenTransfer{
+           to_address_hash: to_address_hash,
+           from_address_hash: from_address_hash
+         } = tt,
+         names
+       ) do
+    %TokenTransfer{
+      tt
+      | to_address: alter_address(tt.to_address, to_address_hash, names),
+        from_address: alter_address(tt.from_address, from_address_hash, names)
+    }
+  end
+
+  defp put_ens_name_to_item(
+         %InternalTransaction{
+           to_address_hash: to_address_hash,
+           created_contract_address_hash: created_contract_address_hash,
+           from_address_hash: from_address_hash
+         } = tx,
+         names
+       ) do
+    %InternalTransaction{
+      tx
+      | to_address: alter_address(tx.to_address, to_address_hash, names),
+        created_contract_address: alter_address(tx.created_contract_address, created_contract_address_hash, names),
+        from_address: alter_address(tx.from_address, from_address_hash, names)
+    }
+  end
+
+  defp put_ens_name_to_item(%Log{address_hash: address_hash} = log, names) do
+    %Log{log | address: alter_address(log.address, address_hash, names)}
+  end
+
+  defp put_ens_name_to_item(%Withdrawal{address_hash: address_hash} = withdrawal, names) do
+    %Withdrawal{withdrawal | address: alter_address(withdrawal.address, address_hash, names)}
+  end
+
+  defp put_ens_name_to_item(%Block{miner_hash: miner_hash} = block, names) do
+    %Block{block | miner: alter_address(block.miner, miner_hash, names)}
+  end
+
+  defp put_ens_name_to_item(%CurrentTokenBalance{address_hash: address_hash} = current_token_balance, names) do
+    %CurrentTokenBalance{
+      current_token_balance
+      | address: alter_address(current_token_balance.address, address_hash, names)
+    }
+  end
+
+  defp alter_address(_, nil, _names) do
+    nil
+  end
+
+  defp alter_address(%NotLoaded{}, address_hash, names) do
+    %{ens_domain_name: names[to_string(address_hash)]}
+  end
+
+  defp alter_address(%Address{} = address, address_hash, names) do
+    %Address{address | ens_domain_name: names[to_string(address_hash)]}
+  end
+end
diff --git a/apps/explorer/lib/explorer/utility/microservice.ex b/apps/explorer/lib/explorer/utility/microservice.ex
index 6200f7f7acdf..3a8620255ec1 100644
--- a/apps/explorer/lib/explorer/utility/microservice.ex
+++ b/apps/explorer/lib/explorer/utility/microservice.ex
@@ -12,4 +12,13 @@ defmodule Explorer.Utility.Microservice do
       url
     end
   end
+
+  @spec check_enabled(atom) :: :ok | {:error, :disabled}
+  def check_enabled(module) do
+    if Application.get_env(:explorer, module)[:enabled] do
+      :ok
+    else
+      {:error, :disabled}
+    end
+  end
 end
diff --git a/config/runtime.exs b/config/runtime.exs
index 4eb51cf2e4c8..e9d915a65a7e 100644
--- a/config/runtime.exs
+++ b/config/runtime.exs
@@ -451,6 +451,10 @@ config :explorer, Explorer.Chain.Transaction,
 config :explorer, Explorer.Chain.Cache.AddressesTabsCounters,
   ttl: ConfigHelper.parse_time_env_var("ADDRESSES_TABS_COUNTERS_TTL", "10m")
 
+config :explorer, Explorer.MicroserviceInterfaces.BENS,
+  service_url: System.get_env("MICROSERVICE_BENS_URL"),
+  enabled: ConfigHelper.parse_bool_env_var("MICROSERVICE_BENS_ENABLED")
+
 ###############
 ### Indexer ###
 ###############

From d7be418ec39ed8021db3a1b7c08c1c878265301f Mon Sep 17 00:00:00 2001
From: Nikita Pozdniakov <nikitosing4@mail.ru>
Date: Thu, 14 Dec 2023 20:47:50 +0300
Subject: [PATCH 781/909] Fix after review

---
 apps/explorer/lib/explorer/chain/address.ex                | 5 +++++
 apps/explorer/lib/explorer/microservice_interfaces/bens.ex | 6 +++++-
 apps/explorer/lib/explorer/utility/microservice.ex         | 3 +++
 docker-compose/envs/common-blockscout.env                  | 2 ++
 4 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/apps/explorer/lib/explorer/chain/address.ex b/apps/explorer/lib/explorer/chain/address.ex
index 352d1fcc05e6..fdb664504d5a 100644
--- a/apps/explorer/lib/explorer/chain/address.ex
+++ b/apps/explorer/lib/explorer/chain/address.ex
@@ -161,6 +161,11 @@ defmodule Explorer.Chain.Address do
     checksum(hash, iodata?)
   end
 
+  def checksum(hash_string, iodata?) when is_binary(hash_string) do
+    {:ok, hash} = Chain.string_to_address_hash(hash_string)
+    checksum(hash, iodata?)
+  end
+
   def checksum(hash, iodata?) do
     checksum_formatted =
       case Application.get_env(:explorer, :checksum_function) || :eth do
diff --git a/apps/explorer/lib/explorer/microservice_interfaces/bens.ex b/apps/explorer/lib/explorer/microservice_interfaces/bens.ex
index 03587ce310b9..e7b3ee6310c7 100644
--- a/apps/explorer/lib/explorer/microservice_interfaces/bens.ex
+++ b/apps/explorer/lib/explorer/microservice_interfaces/bens.ex
@@ -175,6 +175,9 @@ defmodule Explorer.MicroserviceInterfaces.BENS do
   @spec preload_ens_info_to_search_result(list) :: list
   def preload_ens_info_to_search_result(list) do
     Enum.map(list, fn
+      %{type: "address", ens_info: ens_info} = search_result when not is_nil(ens_info) ->
+        search_result
+
       %{type: "address"} = search_result ->
         ens_info = search_result[:address_hash] |> address_lookup() |> parse_lookup_response()
         Map.put(search_result, :ens_info, ens_info)
@@ -184,7 +187,8 @@ defmodule Explorer.MicroserviceInterfaces.BENS do
     end)
   end
 
-  @spec ens_domain_name_lookup(binary()) :: nil | %{address_hash: binary(), expiry_date: any(), name: any()}
+  @spec ens_domain_name_lookup(binary()) ::
+          nil | %{address_hash: binary(), expiry_date: any(), name: any(), names_count: integer()}
   def ens_domain_name_lookup(domain) do
     domain |> ens_domain_lookup() |> parse_lookup_response()
   end
diff --git a/apps/explorer/lib/explorer/utility/microservice.ex b/apps/explorer/lib/explorer/utility/microservice.ex
index 3a8620255ec1..fe1af3df46b4 100644
--- a/apps/explorer/lib/explorer/utility/microservice.ex
+++ b/apps/explorer/lib/explorer/utility/microservice.ex
@@ -13,6 +13,9 @@ defmodule Explorer.Utility.Microservice do
     end
   end
 
+  @doc """
+    Returns :ok if Application.get_env(:explorer, module)[:enabled] is true (module is enabled)
+  """
   @spec check_enabled(atom) :: :ok | {:error, :disabled}
   def check_enabled(module) do
     if Application.get_env(:explorer, module)[:enabled] do
diff --git a/docker-compose/envs/common-blockscout.env b/docker-compose/envs/common-blockscout.env
index f8a1507ac2d1..9e7e050cb573 100644
--- a/docker-compose/envs/common-blockscout.env
+++ b/docker-compose/envs/common-blockscout.env
@@ -258,3 +258,5 @@ API_V2_ENABLED=true
 # ADDRESSES_TABS_COUNTERS_TTL=10m
 # ACCOUNT_PRIVATE_TAGS_LIMIT=2000
 # ACCOUNT_WATCHLIST_ADDRESSES_LIMIT=15
+# MICROSERVICE_BENS_URL=
+# MICROSERVICE_BENS_ENABLED=
\ No newline at end of file

From 7370587cb2400b3a26ebc3078496a15acc6f6b39 Mon Sep 17 00:00:00 2001
From: Nikita Pozdniakov <nikitosing4@mail.ru>
Date: Fri, 15 Dec 2023 11:58:09 +0300
Subject: [PATCH 782/909] Add ens info to transaction details

---
 .../controllers/api/v2/search_controller.ex   |  6 ++--
 .../api/v2/transaction_controller.ex          |  4 +--
 .../explorer/microservice_interfaces/bens.ex  | 30 +++++++++++++------
 3 files changed, 26 insertions(+), 14 deletions(-)

diff --git a/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/search_controller.ex b/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/search_controller.ex
index f94a752f369a..0a3c0f17aed4 100644
--- a/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/search_controller.ex
+++ b/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/search_controller.ex
@@ -2,7 +2,7 @@ defmodule BlockScoutWeb.API.V2.SearchController do
   use Phoenix.Controller
 
   import BlockScoutWeb.Chain, only: [paging_options: 1, next_page_params: 3, split_list_by_page: 1, from_param: 1]
-  import Explorer.MicroserviceInterfaces.BENS, only: [maybe_preload_ens_info_to_search_result: 1]
+  import Explorer.MicroserviceInterfaces.BENS, only: [maybe_preload_ens_info_to_search_results: 1]
 
   alias Explorer.Chain.Search
   alias Explorer.PagingOptions
@@ -24,7 +24,7 @@ defmodule BlockScoutWeb.API.V2.SearchController do
     conn
     |> put_status(200)
     |> render(:search_results, %{
-      search_results: search_results |> maybe_preload_ens_info_to_search_result(),
+      search_results: search_results |> maybe_preload_ens_info_to_search_results(),
       next_page_params: next_page_params
     })
   end
@@ -45,6 +45,6 @@ defmodule BlockScoutWeb.API.V2.SearchController do
 
     conn
     |> put_status(200)
-    |> render(:search_results, %{search_results: search_results |> maybe_preload_ens_info_to_search_result()})
+    |> render(:search_results, %{search_results: search_results |> maybe_preload_ens_info_to_search_results()})
   end
 end
diff --git a/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/transaction_controller.ex b/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/transaction_controller.ex
index a9f1eb50490b..993d2ac68a36 100644
--- a/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/transaction_controller.ex
+++ b/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/transaction_controller.ex
@@ -22,7 +22,7 @@ defmodule BlockScoutWeb.API.V2.TransactionController do
       type_filter_options: 1
     ]
 
-  import Explorer.MicroserviceInterfaces.BENS, only: [maybe_preload_ens: 1]
+  import Explorer.MicroserviceInterfaces.BENS, only: [maybe_preload_ens: 1, maybe_preload_ens_to_transaction: 1]
 
   alias BlockScoutWeb.AccessHelper
   alias BlockScoutWeb.MicroserviceInterfaces.TransactionInterpretation, as: TransactionInterpretationService
@@ -106,7 +106,7 @@ defmodule BlockScoutWeb.API.V2.TransactionController do
            Chain.preload_token_transfers(transaction, @token_transfers_in_tx_necessity_by_association, @api_true, false) do
       conn
       |> put_status(200)
-      |> render(:transaction, %{transaction: preloaded})
+      |> render(:transaction, %{transaction: preloaded |> maybe_preload_ens_to_transaction()})
     end
   end
 
diff --git a/apps/explorer/lib/explorer/microservice_interfaces/bens.ex b/apps/explorer/lib/explorer/microservice_interfaces/bens.ex
index e7b3ee6310c7..162c9e313efb 100644
--- a/apps/explorer/lib/explorer/microservice_interfaces/bens.ex
+++ b/apps/explorer/lib/explorer/microservice_interfaces/bens.ex
@@ -59,7 +59,7 @@ defmodule Explorer.MicroserviceInterfaces.BENS do
         "resolvedTo" => true,
         "ownedBy" => false,
         "onlyActive" => true,
-        "order" => "DESC"
+        "order" => "ASC"
       }
 
       http_post_request(address_lookup_url(), body)
@@ -137,17 +137,29 @@ defmodule Explorer.MicroserviceInterfaces.BENS do
   @doc """
     Preload ENS info to list of entities if enabled?()
   """
-  @spec maybe_preload_ens([supported_types]) :: [supported_types]
-  def maybe_preload_ens(entity_list, function \\ &preload_ens_to_list/1) do
+  @spec maybe_preload_ens([supported_types] | supported_types) :: [supported_types] | supported_types
+  def maybe_preload_ens(argument, function \\ &preload_ens_to_list/1) do
     if enabled?() do
-      function.(entity_list)
+      function.(argument)
     else
-      entity_list
+      argument
     end
   end
 
-  def maybe_preload_ens_info_to_search_result(list) do
-    maybe_preload_ens(list, &preload_ens_info_to_search_result/1)
+  @spec maybe_preload_ens_info_to_search_results(list()) :: list()
+  def maybe_preload_ens_info_to_search_results(list) do
+    maybe_preload_ens(list, &preload_ens_info_to_search_results/1)
+  end
+
+  @spec maybe_preload_ens_to_transaction(Transaction.t()) :: Transaction.t()
+  def maybe_preload_ens_to_transaction(transaction) do
+    maybe_preload_ens(transaction, &preload_ens_to_transaction/1)
+  end
+
+  @spec preload_ens_to_transaction(Transaction.t()) :: Transaction.t()
+  def preload_ens_to_transaction(transaction) do
+    [transaction_with_ens] = preload_ens_to_list([transaction])
+    transaction_with_ens
   end
 
   @doc """
@@ -172,8 +184,8 @@ defmodule Explorer.MicroserviceInterfaces.BENS do
   @doc """
     Preload ENS info to search result, using address_lookup/1
   """
-  @spec preload_ens_info_to_search_result(list) :: list
-  def preload_ens_info_to_search_result(list) do
+  @spec preload_ens_info_to_search_results(list) :: list
+  def preload_ens_info_to_search_results(list) do
     Enum.map(list, fn
       %{type: "address", ens_info: ens_info} = search_result when not is_nil(ens_info) ->
         search_result

From 905d56207fc3458637c9f90c943946ed08608e47 Mon Sep 17 00:00:00 2001
From: Nikita Pozdniakov <nikitosing4@mail.ru>
Date: Fri, 15 Dec 2023 13:16:20 +0300
Subject: [PATCH 783/909] Add ens info to addresses

---
 .../controllers/api/v2/address_controller.ex  |  6 ++---
 .../explorer/microservice_interfaces/bens.ex  | 27 +++++++++++++++++++
 2 files changed, 30 insertions(+), 3 deletions(-)

diff --git a/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/address_controller.ex b/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/address_controller.ex
index e5e99277fa6d..3a78dcdb676c 100644
--- a/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/address_controller.ex
+++ b/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/address_controller.ex
@@ -20,7 +20,7 @@ defmodule BlockScoutWeb.API.V2.AddressController do
       nft_token_types_options: 1
     ]
 
-  import Explorer.MicroserviceInterfaces.BENS, only: [maybe_preload_ens: 1]
+  import Explorer.MicroserviceInterfaces.BENS, only: [maybe_preload_ens: 1, maybe_preload_ens_to_address: 1]
 
   alias BlockScoutWeb.AccessHelper
   alias BlockScoutWeb.API.V2.{BlockView, TransactionView, WithdrawalView}
@@ -85,7 +85,7 @@ defmodule BlockScoutWeb.API.V2.AddressController do
 
       conn
       |> put_status(200)
-      |> render(:address, %{address: fully_preloaded_address})
+      |> render(:address, %{address: fully_preloaded_address |> maybe_preload_ens_to_address()})
     end
   end
 
@@ -415,7 +415,7 @@ defmodule BlockScoutWeb.API.V2.AddressController do
     conn
     |> put_status(200)
     |> render(:addresses, %{
-      addresses: addresses,
+      addresses: addresses |> maybe_preload_ens(),
       next_page_params: next_page_params,
       exchange_rate: exchange_rate,
       total_supply: total_supply
diff --git a/apps/explorer/lib/explorer/microservice_interfaces/bens.ex b/apps/explorer/lib/explorer/microservice_interfaces/bens.ex
index 162c9e313efb..02447a050630 100644
--- a/apps/explorer/lib/explorer/microservice_interfaces/bens.ex
+++ b/apps/explorer/lib/explorer/microservice_interfaces/bens.ex
@@ -162,6 +162,17 @@ defmodule Explorer.MicroserviceInterfaces.BENS do
     transaction_with_ens
   end
 
+  @spec maybe_preload_ens_to_address(Address.t()) :: Address.t()
+  def maybe_preload_ens_to_address(address) do
+    maybe_preload_ens(address, &preload_ens_to_address/1)
+  end
+
+  @spec preload_ens_to_address(Address.t()) :: Address.t()
+  def preload_ens_to_address(address) do
+    [address_with_ens] = preload_ens_to_list([address])
+    address_with_ens
+  end
+
   @doc """
     Preload ENS names to list of entities
   """
@@ -273,6 +284,14 @@ defmodule Explorer.MicroserviceInterfaces.BENS do
     [to_string(address_hash)]
   end
 
+  defp item_to_address_hash_strings({%Address{} = address, _}) do
+    item_to_address_hash_strings(address)
+  end
+
+  defp item_to_address_hash_strings(%Address{hash: hash}) do
+    [to_string(hash)]
+  end
+
   defp put_ens_names(names, items) do
     Enum.map(items, &put_ens_name_to_item(&1, names))
   end
@@ -342,6 +361,14 @@ defmodule Explorer.MicroserviceInterfaces.BENS do
     }
   end
 
+  defp put_ens_name_to_item({%Address{} = address, count}, names) do
+    {put_ens_name_to_item(address, names), count}
+  end
+
+  defp put_ens_name_to_item(%Address{} = address, names) do
+    alter_address(address, address.hash, names)
+  end
+
   defp alter_address(_, nil, _names) do
     nil
   end

From 377166b2d1e073f9a4a1a5bf28385a9e9ebd7acc Mon Sep 17 00:00:00 2001
From: Nikita Pozdniakov <nikitosing4@mail.ru>
Date: Tue, 19 Dec 2023 22:24:38 +0300
Subject: [PATCH 784/909] Fix after review

---
 apps/explorer/lib/explorer/chain/address.ex               | 2 +-
 .../explorer/lib/explorer/microservice_interfaces/bens.ex | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/apps/explorer/lib/explorer/chain/address.ex b/apps/explorer/lib/explorer/chain/address.ex
index fdb664504d5a..41bac5f23cf4 100644
--- a/apps/explorer/lib/explorer/chain/address.ex
+++ b/apps/explorer/lib/explorer/chain/address.ex
@@ -66,7 +66,7 @@ defmodule Explorer.Chain.Address do
           transactions_count: non_neg_integer() | nil,
           token_transfers_count: non_neg_integer() | nil,
           gas_used: non_neg_integer() | nil,
-          ens_domain_name: String.t()
+          ens_domain_name: String.t() | nil
         }
 
   @derive {Poison.Encoder,
diff --git a/apps/explorer/lib/explorer/microservice_interfaces/bens.ex b/apps/explorer/lib/explorer/microservice_interfaces/bens.ex
index 02447a050630..186f599b127c 100644
--- a/apps/explorer/lib/explorer/microservice_interfaces/bens.ex
+++ b/apps/explorer/lib/explorer/microservice_interfaces/bens.ex
@@ -37,7 +37,7 @@ defmodule Explorer.MicroserviceInterfaces.BENS do
   @doc """
     Batch request for ENS names via {{baseUrl}}/api/v1/:chainId/addresses:batch-resolve-names
   """
-  @spec ens_names_batch_request([String.t()]) :: {:error, :disabled | String.t() | Jason.DecodeError.t()} | {:ok, any}
+  @spec ens_names_batch_request([binary()]) :: {:error, :disabled | binary() | Jason.DecodeError.t()} | {:ok, any}
   def ens_names_batch_request(addresses) do
     with :ok <- Microservice.check_enabled(__MODULE__) do
       body = %{
@@ -51,7 +51,7 @@ defmodule Explorer.MicroserviceInterfaces.BENS do
   @doc """
     Request for ENS name via {{baseUrl}}/api/v1/:chainId/addresses:lookup
   """
-  @spec address_lookup(binary()) :: {:error, :disabled | String.t() | Jason.DecodeError.t()} | {:ok, any}
+  @spec address_lookup(binary()) :: {:error, :disabled | binary() | Jason.DecodeError.t()} | {:ok, any}
   def address_lookup(address) do
     with :ok <- Microservice.check_enabled(__MODULE__) do
       body = %{
@@ -69,7 +69,7 @@ defmodule Explorer.MicroserviceInterfaces.BENS do
   @doc """
     Lookup for ENS domain name via {{baseUrl}}/api/v1/:chainId/domains:lookup
   """
-  @spec ens_domain_lookup(binary()) :: {:error, :disabled | String.t() | Jason.DecodeError.t()} | {:ok, any}
+  @spec ens_domain_lookup(binary()) :: {:error, :disabled | binary() | Jason.DecodeError.t()} | {:ok, any}
   def ens_domain_lookup(domain) do
     with :ok <- Microservice.check_enabled(__MODULE__) do
       body = %{
@@ -180,7 +180,7 @@ defmodule Explorer.MicroserviceInterfaces.BENS do
   def preload_ens_to_list(items) do
     address_hash_strings =
       Enum.reduce(items, [], fn item, acc ->
-        acc ++ item_to_address_hash_strings(item)
+        item_to_address_hash_strings(item) ++ acc
       end)
 
     case ens_names_batch_request(address_hash_strings) do

From 72f14715b24c19d71148b62212e8c0bd2eb68985 Mon Sep 17 00:00:00 2001
From: Nikita Pozdniakov <nikitosing4@mail.ru>
Date: Tue, 19 Dec 2023 22:48:45 +0300
Subject: [PATCH 785/909] Reset GA cache

---
 .github/workflows/config.yml | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/config.yml b/.github/workflows/config.yml
index 2d672f01197e..5efcd092a62e 100644
--- a/.github/workflows/config.yml
+++ b/.github/workflows/config.yml
@@ -72,7 +72,7 @@ jobs:
           path: |
             deps
             _build
-          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_29-${{ hashFiles('mix.lock') }}
+          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_30-${{ hashFiles('mix.lock') }}
           restore-keys: |
             ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-
 
@@ -130,7 +130,7 @@ jobs:
           path: |
             deps
             _build
-          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_29-${{ hashFiles('mix.lock') }}
+          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_30-${{ hashFiles('mix.lock') }}
           restore-keys: |
             ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-"
 
@@ -154,7 +154,7 @@ jobs:
           path: |
             deps
             _build
-          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_29-${{ hashFiles('mix.lock') }}
+          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_30-${{ hashFiles('mix.lock') }}
           restore-keys: |
             ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-"
 
@@ -183,7 +183,7 @@ jobs:
           path: |
             deps
             _build
-          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_29-${{ hashFiles('mix.lock') }}
+          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_30-${{ hashFiles('mix.lock') }}
           restore-keys: |
             ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-"
 
@@ -227,7 +227,7 @@ jobs:
           path: |
             deps
             _build
-          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_29-${{ hashFiles('mix.lock') }}
+          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_30-${{ hashFiles('mix.lock') }}
           restore-keys: |
             ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-"
 
@@ -253,7 +253,7 @@ jobs:
           path: |
             deps
             _build
-          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_29-${{ hashFiles('mix.lock') }}
+          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_30-${{ hashFiles('mix.lock') }}
           restore-keys: |
             ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-"
 
@@ -282,7 +282,7 @@ jobs:
           path: |
             deps
             _build
-          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_29-${{ hashFiles('mix.lock') }}
+          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_30-${{ hashFiles('mix.lock') }}
           restore-keys: |
             ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-"
 
@@ -330,7 +330,7 @@ jobs:
           path: |
             deps
             _build
-          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_29-${{ hashFiles('mix.lock') }}
+          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_30-${{ hashFiles('mix.lock') }}
           restore-keys: |
             ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-"
 
@@ -376,7 +376,7 @@ jobs:
           path: |
             deps
             _build
-          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_29-${{ hashFiles('mix.lock') }}
+          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_30-${{ hashFiles('mix.lock') }}
           restore-keys: |
             ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-"
 
@@ -438,7 +438,7 @@ jobs:
           path: |
             deps
             _build
-          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_29-${{ hashFiles('mix.lock') }}
+          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_30-${{ hashFiles('mix.lock') }}
           restore-keys: |
             ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-"
 
@@ -498,7 +498,7 @@ jobs:
           path: |
             deps
             _build
-          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_29-${{ hashFiles('mix.lock') }}
+          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_30-${{ hashFiles('mix.lock') }}
           restore-keys: |
             ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-"
 
@@ -569,7 +569,7 @@ jobs:
           path: |
             deps
             _build
-          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_29-${{ hashFiles('mix.lock') }}
+          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_30-${{ hashFiles('mix.lock') }}
           restore-keys: |
             ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-"
 
@@ -637,7 +637,7 @@ jobs:
           path: |
             deps
             _build
-          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_29-${{ hashFiles('mix.lock') }}
+          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_30-${{ hashFiles('mix.lock') }}
           restore-keys: |
             ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-"
 

From 931c2ee2b73aa4b904a2a46cebbd022c9608f1e0 Mon Sep 17 00:00:00 2001
From: Nikita Pozdniakov <nikitosing4@mail.ru>
Date: Thu, 21 Dec 2023 11:43:52 +0300
Subject: [PATCH 786/909] Fix tx input decoding in tx summary microservice
 request

---
 CHANGELOG.md                                  |  1 +
 .../transaction_interpretation.ex             |  2 +-
 .../views/api/v2/transaction_view.ex          | 22 +++++++++++--------
 .../lib/explorer/chain/transaction.ex         | 10 +++++++++
 4 files changed, 25 insertions(+), 10 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 719f013806c6..e20c9e169c05 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,7 @@
 
 ### Fixes
 
+- [#9039](https://github.com/blockscout/blockscout/pull/9039) - Fix tx input decoding in tx summary microservice request
 - [#9013](https://github.com/blockscout/blockscout/pull/9013) - Speed up `Indexer.Fetcher.TokenInstance.LegacySanitize`
 - [#8955](https://github.com/blockscout/blockscout/pull/8955) - Remove daily balances updating from BlockReward fetcher
 - [#8846](https://github.com/blockscout/blockscout/pull/8846) - Handle nil gas_price at address view
diff --git a/apps/block_scout_web/lib/block_scout_web/microservice_interfaces/transaction_interpretation.ex b/apps/block_scout_web/lib/block_scout_web/microservice_interfaces/transaction_interpretation.ex
index 60d2a3a368a4..587c78cfada9 100644
--- a/apps/block_scout_web/lib/block_scout_web/microservice_interfaces/transaction_interpretation.ex
+++ b/apps/block_scout_web/lib/block_scout_web/microservice_interfaces/transaction_interpretation.ex
@@ -79,7 +79,7 @@ defmodule BlockScoutWeb.MicroserviceInterfaces.TransactionInterpretation do
     skip_sig_provider? = true
     {decoded_input, _abi_acc, _methods_acc} = Transaction.decoded_input_data(transaction, skip_sig_provider?, @api_true)
 
-    decoded_input_data = TransactionView.decoded_input(decoded_input)
+    decoded_input_data = decoded_input |> TransactionView.format_decoded_input() |> TransactionView.decoded_input()
 
     %{
       data: %{
diff --git a/apps/block_scout_web/lib/block_scout_web/views/api/v2/transaction_view.ex b/apps/block_scout_web/lib/block_scout_web/views/api/v2/transaction_view.ex
index 84d6f65bd5a4..28bc4042c46b 100644
--- a/apps/block_scout_web/lib/block_scout_web/views/api/v2/transaction_view.ex
+++ b/apps/block_scout_web/lib/block_scout_web/views/api/v2/transaction_view.ex
@@ -208,12 +208,15 @@ defmodule BlockScoutWeb.API.V2.TransactionView do
   end
 
   def decode_transactions(transactions, skip_sig_provider?) do
-    Enum.reduce(transactions, {[], %{}, %{}}, fn transaction, {results, abi_acc, methods_acc} ->
-      {result, abi_acc, methods_acc} =
-        Transaction.decoded_input_data(transaction, skip_sig_provider?, @api_true, abi_acc, methods_acc)
+    {results, abi_acc, methods_acc} =
+      Enum.reduce(transactions, {[], %{}, %{}}, fn transaction, {results, abi_acc, methods_acc} ->
+        {result, abi_acc, methods_acc} =
+          Transaction.decoded_input_data(transaction, skip_sig_provider?, @api_true, abi_acc, methods_acc)
 
-      {Enum.reverse([format_decoded_input(result) | Enum.reverse(results)]), abi_acc, methods_acc}
-    end)
+        {[format_decoded_input(result) | results], abi_acc, methods_acc}
+      end)
+
+    {Enum.reverse(results), abi_acc, methods_acc}
   end
 
   def prepare_token_transfer(token_transfer, _conn, decoded_input) do
@@ -653,10 +656,11 @@ defmodule BlockScoutWeb.API.V2.TransactionView do
   defp format_status({:error, reason}), do: reason
   defp format_status(status), do: status
 
-  defp format_decoded_input({:error, _, []}), do: nil
-  defp format_decoded_input({:error, _, candidates}), do: Enum.at(candidates, 0)
-  defp format_decoded_input({:ok, _identifier, _text, _mapping} = decoded), do: decoded
-  defp format_decoded_input(_), do: nil
+  @spec format_decoded_input(any()) :: nil | map() | tuple()
+  def format_decoded_input({:error, _, []}), do: nil
+  def format_decoded_input({:error, _, candidates}), do: Enum.at(candidates, 0)
+  def format_decoded_input({:ok, _identifier, _text, _mapping} = decoded), do: decoded
+  def format_decoded_input(_), do: nil
 
   defp format_decoded_log_input({:error, :could_not_decode}), do: nil
   defp format_decoded_log_input({:ok, _method_id, _text, _mapping} = decoded), do: decoded
diff --git a/apps/explorer/lib/explorer/chain/transaction.ex b/apps/explorer/lib/explorer/chain/transaction.ex
index 1f7e67790bdc..8971b738781d 100644
--- a/apps/explorer/lib/explorer/chain/transaction.ex
+++ b/apps/explorer/lib/explorer/chain/transaction.ex
@@ -594,6 +594,16 @@ defmodule Explorer.Chain.Transaction do
   end
 
   # Because there is no contract association, we know the contract was not verified
+  @spec decoded_input_data(
+          %{:__struct__ => Ecto.Association.NotLoaded | Explorer.Chain.Transaction, optional(any()) => any()},
+          any(),
+          any(),
+          any(),
+          any()
+        ) ::
+          {{:error | :ok | binary(), any()}
+           | {:error, :contract_not_verified | :contract_verified, list()}
+           | {:ok, binary(), binary(), list()}, any(), any()}
   def decoded_input_data(tx, skip_sig_provider? \\ false, options, full_abi_acc \\ %{}, methods_acc \\ %{})
 
   def decoded_input_data(%__MODULE__{to_address: nil}, _, _, full_abi_acc, methods_acc),

From 61eeae6e2ccdbf9abe08cc7960abcb9b141f4adf Mon Sep 17 00:00:00 2001
From: Qwerty5Uiop <alex000010@bk.ru>
Date: Thu, 7 Dec 2023 17:34:33 +0600
Subject: [PATCH 787/909] TRACE_BLOCK_RANGES env var

---
 CHANGELOG.md                                  |   1 +
 apps/ethereum_jsonrpc/lib/ethereum_jsonrpc.ex |  32 +----
 .../ethereum_jsonrpc/utility/ranges_helper.ex | 117 ++++++++++++++++++
 apps/explorer/lib/explorer/chain.ex           |   3 +-
 .../explorer/chain/import/runner/blocks.ex    |  16 ++-
 .../import/runner/internal_transactions.ex    |  33 +++--
 .../runner/internal_transactions_test.exs     |  23 ++++
 .../lib/indexer/block/catchup/helper.ex       |  39 ------
 .../block/catchup/missing_ranges_collector.ex |   9 +-
 .../lib/indexer/fetcher/coin_balance.ex       |   9 +-
 .../indexer/fetcher/internal_transaction.ex   |   3 +-
 config/runtime.exs                            |   1 +
 docker-compose/envs/common-blockscout.env     |   1 +
 13 files changed, 190 insertions(+), 97 deletions(-)
 create mode 100644 apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/utility/ranges_helper.ex
 delete mode 100644 apps/indexer/lib/indexer/block/catchup/helper.ex

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 719f013806c6..4b3209369352 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,7 @@
 ### Features
 
 - [#8972](https://github.com/blockscout/blockscout/pull/8972) - BENS integration
+- [#8960](https://github.com/blockscout/blockscout/pull/8960) - TRACE_BLOCK_RANGES env var
 - [#8957](https://github.com/blockscout/blockscout/pull/8957) - Add Tx Interpreter Service integration
 
 ### Fixes
diff --git a/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc.ex b/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc.ex
index abad4cdfb3cd..74d37fe187df 100644
--- a/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc.ex
+++ b/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc.ex
@@ -39,6 +39,7 @@ defmodule EthereumJSONRPC do
     Subscription,
     Transport,
     Utility.EndpointAvailabilityObserver,
+    Utility.RangesHelper,
     Variant
   }
 
@@ -205,7 +206,8 @@ defmodule EthereumJSONRPC do
     filtered_params_in_range =
       filtered_params
       |> Enum.filter(fn
-        %{block_quantity: block_quantity} -> is_block_number_in_range?(block_quantity)
+        %{block_quantity: block_quantity} ->
+          block_quantity |> quantity_to_integer() |> RangesHelper.traceable_block_number?()
       end)
 
     id_to_params = id_to_params(filtered_params_in_range)
@@ -244,7 +246,7 @@ defmodule EthereumJSONRPC do
   @spec fetch_beneficiaries([block_number], json_rpc_named_arguments) ::
           {:ok, FetchedBeneficiaries.t()} | {:error, reason :: term} | :ignore
   def fetch_beneficiaries(block_numbers, json_rpc_named_arguments) when is_list(block_numbers) do
-    filtered_block_numbers = are_block_numbers_in_range?(block_numbers)
+    filtered_block_numbers = RangesHelper.filter_traceable_block_numbers(block_numbers)
 
     Keyword.fetch!(json_rpc_named_arguments, :variant).fetch_beneficiaries(
       filtered_block_numbers,
@@ -349,7 +351,7 @@ defmodule EthereumJSONRPC do
   Fetches internal transactions for entire blocks from variant API.
   """
   def fetch_block_internal_transactions(block_numbers, json_rpc_named_arguments) when is_list(block_numbers) do
-    filtered_block_numbers = are_block_numbers_in_range?(block_numbers)
+    filtered_block_numbers = RangesHelper.filter_traceable_block_numbers(block_numbers)
 
     Keyword.fetch!(json_rpc_named_arguments, :variant).fetch_block_internal_transactions(
       filtered_block_numbers,
@@ -357,16 +359,6 @@ defmodule EthereumJSONRPC do
     )
   end
 
-  def are_block_numbers_in_range?(block_numbers) do
-    min_block = Application.get_env(:indexer, :trace_first_block)
-    max_block = Application.get_env(:indexer, :trace_last_block)
-
-    block_numbers
-    |> Enum.filter(fn block_number ->
-      block_number >= min_block && if max_block, do: block_number <= max_block, else: true
-    end)
-  end
-
   @doc """
   Retrieves traces from variant API.
   """
@@ -459,20 +451,6 @@ defmodule EthereumJSONRPC do
     end
   end
 
-  @spec is_block_number_in_range?(quantity) :: boolean()
-  defp is_block_number_in_range?(block_quantity) do
-    min_block = Application.get_env(:indexer, :trace_first_block)
-    max_block = Application.get_env(:indexer, :trace_last_block)
-    block_number = quantity_to_integer(block_quantity)
-
-    if !block_number ||
-         (block_number && block_number >= min_block && if(max_block, do: block_number <= max_block, else: true)) do
-      true
-    else
-      false
-    end
-  end
-
   defp maybe_replace_url(url, _replace_url, EthereumJSONRPC.HTTP), do: url
   defp maybe_replace_url(url, replace_url, _), do: EndpointAvailabilityObserver.maybe_replace_url(url, replace_url)
 
diff --git a/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/utility/ranges_helper.ex b/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/utility/ranges_helper.ex
new file mode 100644
index 000000000000..75f00bccdee5
--- /dev/null
+++ b/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/utility/ranges_helper.ex
@@ -0,0 +1,117 @@
+# credo:disable-for-this-file
+defmodule EthereumJSONRPC.Utility.RangesHelper do
+  @moduledoc """
+  Helper for ranges manipulations.
+  """
+
+  @spec traceable_block_number?(integer() | nil) :: boolean()
+  def traceable_block_number?(block_number) do
+    case Application.get_env(:indexer, :trace_block_ranges) do
+      nil ->
+        min_block = Application.get_env(:indexer, :trace_first_block)
+        max_block = Application.get_env(:indexer, :trace_last_block)
+
+        !block_number || (block_number >= min_block && if(max_block, do: block_number <= max_block, else: true))
+
+      block_ranges ->
+        parsed_ranges = parse_block_ranges(block_ranges)
+
+        number_in_ranges?(block_number, parsed_ranges)
+    end
+  end
+
+  @spec filter_traceable_block_numbers([integer()]) :: [integer()]
+  def filter_traceable_block_numbers(block_numbers) do
+    case Application.get_env(:indexer, :trace_block_ranges) do
+      nil ->
+        min_block = Application.get_env(:indexer, :trace_first_block)
+        max_block = Application.get_env(:indexer, :trace_last_block)
+
+        Enum.filter(block_numbers, fn block_number ->
+          block_number >= min_block && if max_block, do: block_number <= max_block, else: true
+        end)
+
+      block_ranges ->
+        parsed_ranges = parse_block_ranges(block_ranges)
+
+        Enum.filter(block_numbers, &number_in_ranges?(&1, parsed_ranges))
+    end
+  end
+
+  @spec parse_block_ranges(binary()) :: [Range.t() | integer()]
+  def parse_block_ranges(block_ranges_string) do
+    block_ranges_string
+    |> String.split(",")
+    |> Enum.map(fn string_range ->
+      case String.split(string_range, "..") do
+        [from_string, "latest"] ->
+          parse_integer(from_string)
+
+        [from_string, to_string] ->
+          get_from_to(from_string, to_string)
+
+        _ ->
+          nil
+      end
+    end)
+    |> sanitize_ranges()
+  end
+
+  defp number_in_ranges?(number, ranges) do
+    Enum.reduce_while(ranges, false, fn
+      _from.._to = range, _acc -> if number in range, do: {:halt, true}, else: {:cont, false}
+      num_to_latest, _acc -> if number >= num_to_latest, do: {:halt, true}, else: {:cont, false}
+    end)
+  end
+
+  defp get_from_to(from_string, to_string) do
+    with {from, ""} <- Integer.parse(from_string),
+         {to, ""} <- Integer.parse(to_string) do
+      if from <= to, do: from..to, else: nil
+    else
+      _ -> nil
+    end
+  end
+
+  @spec sanitize_ranges([Range.t() | integer()]) :: [Range.t() | integer()]
+  def sanitize_ranges(ranges) do
+    ranges
+    |> Enum.reject(&is_nil/1)
+    |> Enum.sort_by(
+      fn
+        from.._to -> from
+        el -> el
+      end,
+      :asc
+    )
+    |> Enum.chunk_while(
+      nil,
+      fn
+        _from.._to = chunk, nil ->
+          {:cont, chunk}
+
+        _ch_from..ch_to = chunk, acc_from..acc_to = acc ->
+          if Range.disjoint?(chunk, acc),
+            do: {:cont, acc, chunk},
+            else: {:cont, acc_from..max(ch_to, acc_to)}
+
+        num, nil ->
+          {:halt, num}
+
+        num, acc_from.._ = acc ->
+          if Range.disjoint?(num..num, acc), do: {:cont, acc, num}, else: {:halt, acc_from}
+
+        _, num ->
+          {:halt, num}
+      end,
+      fn remainder -> {:cont, remainder, nil} end
+    )
+  end
+
+  defp parse_integer(string) do
+    case Integer.parse(string) do
+      {number, ""} -> number
+      _ -> nil
+    end
+  end
+end
diff --git a/apps/explorer/lib/explorer/chain.ex b/apps/explorer/lib/explorer/chain.ex
index fa25f985b0df..663e2a232eb4 100644
--- a/apps/explorer/lib/explorer/chain.ex
+++ b/apps/explorer/lib/explorer/chain.ex
@@ -33,6 +33,7 @@ defmodule Explorer.Chain do
   alias Ecto.{Changeset, Multi}
 
   alias EthereumJSONRPC.Transaction, as: EthereumJSONRPCTransaction
+  alias EthereumJSONRPC.Utility.RangesHelper
 
   alias Explorer.Account.WatchlistAddress
 
@@ -4761,7 +4762,7 @@ defmodule Explorer.Chain do
     if transaction_index == 0 do
       0
     else
-      filtered_block_numbers = EthereumJSONRPC.are_block_numbers_in_range?([block_number])
+      filtered_block_numbers = RangesHelper.filter_traceable_block_numbers([block_number])
       {:ok, traces} = fetch_block_internal_transactions(filtered_block_numbers, json_rpc_named_arguments)
 
       sorted_traces =
diff --git a/apps/explorer/lib/explorer/chain/import/runner/blocks.ex b/apps/explorer/lib/explorer/chain/import/runner/blocks.ex
index defc998b866d..6ff8ee7d6432 100644
--- a/apps/explorer/lib/explorer/chain/import/runner/blocks.ex
+++ b/apps/explorer/lib/explorer/chain/import/runner/blocks.ex
@@ -9,6 +9,8 @@ defmodule Explorer.Chain.Import.Runner.Blocks do
 
   alias Ecto.{Changeset, Multi, Repo}
 
+  alias EthereumJSONRPC.Utility.RangesHelper
+
   alias Explorer.Chain.{
     Address,
     Block,
@@ -62,7 +64,7 @@ defmodule Explorer.Chain.Import.Runner.Blocks do
 
     items_for_pending_ops =
       changes_list
-      |> filter_by_height_range(&is_block_in_range?(&1.number))
+      |> filter_by_height_range(&RangesHelper.traceable_block_number?(&1.number))
       |> Enum.filter(& &1.consensus)
       |> Enum.map(&{&1.number, &1.hash})
 
@@ -72,7 +74,8 @@ defmodule Explorer.Chain.Import.Runner.Blocks do
     run_func = fn repo ->
       {:ok, nonconsensus_items} = lose_consensus(repo, hashes, consensus_block_numbers, changes_list, insert_options)
 
-      {:ok, filter_by_height_range(nonconsensus_items, fn {number, _hash} -> is_block_in_range?(number) end)}
+      {:ok,
+       filter_by_height_range(nonconsensus_items, fn {number, _hash} -> RangesHelper.traceable_block_number?(number) end)}
     end
 
     multi
@@ -214,12 +217,6 @@ defmodule Explorer.Chain.Import.Runner.Blocks do
   @impl Runner
   def timeout, do: @timeout
 
-  defp is_block_in_range?(number) do
-    minimal_block_height = Application.get_env(:indexer, :trace_first_block)
-    maximal_block_height = Application.get_env(:indexer, :trace_last_block)
-    number >= minimal_block_height && if(maximal_block_height, do: number <= maximal_block_height, else: true)
-  end
-
   defp fork_transactions(%{
          repo: repo,
          timeout: timeout,
@@ -890,10 +887,11 @@ defmodule Explorer.Chain.Import.Runner.Blocks do
   end
 
   defp filter_by_height_range(blocks, filter_func) do
+    trace_block_ranges = Application.get_env(:indexer, :trace_block_ranges)
     minimal_block_height = Application.get_env(:indexer, :trace_first_block)
     maximal_block_height = Application.get_env(:indexer, :trace_last_block)
 
-    if minimal_block_height > 0 || maximal_block_height do
+    if trace_block_ranges || minimal_block_height > 0 || maximal_block_height do
       Enum.filter(blocks, &filter_func.(&1))
     else
       blocks
diff --git a/apps/explorer/lib/explorer/chain/import/runner/internal_transactions.ex b/apps/explorer/lib/explorer/chain/import/runner/internal_transactions.ex
index 0763d86ebdf2..4caf850df13d 100644
--- a/apps/explorer/lib/explorer/chain/import/runner/internal_transactions.ex
+++ b/apps/explorer/lib/explorer/chain/import/runner/internal_transactions.ex
@@ -8,6 +8,7 @@ defmodule Explorer.Chain.Import.Runner.InternalTransactions do
 
   alias Ecto.Adapters.SQL
   alias Ecto.{Changeset, Multi, Repo}
+  alias EthereumJSONRPC.Utility.RangesHelper
   alias Explorer.Chain.{Block, Hash, Import, InternalTransaction, PendingBlockOperation, Transaction}
   alias Explorer.Chain.Events.Publisher
   alias Explorer.Chain.Import.Runner
@@ -15,7 +16,7 @@ defmodule Explorer.Chain.Import.Runner.InternalTransactions do
   alias Explorer.Repo, as: ExplorerRepo
   alias Explorer.Utility.MissingRangesManipulator
 
-  import Ecto.Query, only: [from: 2, where: 3]
+  import Ecto.Query
 
   @behaviour Runner
 
@@ -691,23 +692,17 @@ defmodule Explorer.Chain.Import.Runner.InternalTransactions do
   end
 
   defp remove_consensus_of_invalid_blocks(repo, invalid_block_numbers) do
-    minimal_block = Application.get_env(:indexer, :trace_first_block)
-    maximal_block = Application.get_env(:indexer, :trace_last_block)
-
     if Enum.count(invalid_block_numbers) > 0 do
       update_query =
         from(
           block in Block,
           where: block.number in ^invalid_block_numbers and block.consensus == true,
-          where: block.number > ^minimal_block,
+          where: ^traceable_blocks_dynamic_query(),
           select: block.hash,
           # ShareLocks order already enforced by `acquire_blocks` (see docs: sharelocks.md)
           update: [set: [consensus: false]]
         )
 
-      update_query =
-        if maximal_block, do: update_query |> where([block], block.number < ^maximal_block), else: update_query
-
       try do
         {_num, result} = repo.update_all(update_query, [])
 
@@ -754,4 +749,26 @@ defmodule Explorer.Chain.Import.Runner.InternalTransactions do
         {:error, %{exception: postgrex_error, pending_hashes: valid_block_hashes}}
     end
   end
+
+  defp traceable_blocks_dynamic_query do
+    case Application.get_env(:indexer, :trace_block_ranges) do
+      nil ->
+        min_block = Application.get_env(:indexer, :trace_first_block)
+        max_block = Application.get_env(:indexer, :trace_last_block)
+
+        filter_by_min_dynamic = dynamic([block], block.number > ^min_block)
+
+        if max_block,
+          do: dynamic([block], ^filter_by_min_dynamic and block.number < ^max_block),
+          else: filter_by_min_dynamic
+
+      block_ranges ->
+        parsed_ranges = RangesHelper.parse_block_ranges(block_ranges)
+
+        Enum.reduce(parsed_ranges, dynamic([_], false), fn
+          _from.._to = range, acc -> dynamic([block], ^acc or block.number in ^range)
+          num_to_latest, acc -> dynamic([block], ^acc or block.number >= ^num_to_latest)
+        end)
+    end
+  end
 end
diff --git a/apps/explorer/test/explorer/chain/import/runner/internal_transactions_test.exs b/apps/explorer/test/explorer/chain/import/runner/internal_transactions_test.exs
index ffe02c5dc7df..b27bed0ebfa6 100644
--- a/apps/explorer/test/explorer/chain/import/runner/internal_transactions_test.exs
+++ b/apps/explorer/test/explorer/chain/import/runner/internal_transactions_test.exs
@@ -306,6 +306,29 @@ defmodule Explorer.Chain.Import.Runner.InternalTransactionsTest do
       assert PendingBlockOperation |> Repo.get(full_block.hash) |> is_nil()
     end
 
+    test "does not remove consensus from non-traceable blocks" do
+      original_config = Application.get_env(:indexer, :trace_block_ranges)
+
+      full_block = insert(:block)
+      transaction_a = insert(:transaction) |> with_block(full_block)
+      transaction_b = insert(:transaction) |> with_block(full_block)
+
+      Application.put_env(:indexer, :trace_block_ranges, "#{full_block.number + 1}..latest")
+
+      insert(:pending_block_operation, block_hash: full_block.hash, block_number: full_block.number)
+
+      transaction_a_changes = make_internal_transaction_changes(transaction_a, 0, nil)
+
+      assert {:ok, _} = run_internal_transactions([transaction_a_changes])
+
+      assert from(i in InternalTransaction, where: i.transaction_hash == ^transaction_a.hash) |> Repo.one() |> is_nil()
+      assert from(i in InternalTransaction, where: i.transaction_hash == ^transaction_b.hash) |> Repo.one() |> is_nil()
+
+      assert %{consensus: true} = Repo.get(Block, full_block.hash)
+
+      on_exit(fn -> Application.put_env(:indexer, :trace_block_ranges, original_config) end)
+    end
+
     test "successfully imports internal transaction with stop type" do
       block = insert(:block)
       transaction = insert(:transaction) |> with_block(block, status: :ok)
diff --git a/apps/indexer/lib/indexer/block/catchup/helper.ex b/apps/indexer/lib/indexer/block/catchup/helper.ex
deleted file mode 100644
index 951ed3548a46..000000000000
--- a/apps/indexer/lib/indexer/block/catchup/helper.ex
+++ /dev/null
@@ -1,39 +0,0 @@
-defmodule Indexer.Block.Catchup.Helper do
-  @moduledoc """
-  Catchup helper functions
-  """
-
-  def sanitize_ranges(ranges) do
-    ranges
-    |> Enum.filter(&(not is_nil(&1)))
-    |> Enum.sort_by(
-      fn
-        from.._to -> from
-        el -> el
-      end,
-      :asc
-    )
-    |> Enum.chunk_while(
-      nil,
-      fn
-        _from.._to = chunk, nil ->
-          {:cont, chunk}
-
-        _ch_from..ch_to = chunk, acc_from..acc_to = acc ->
-          if Range.disjoint?(chunk, acc),
-            do: {:cont, acc, chunk},
-            else: {:cont, acc_from..max(ch_to, acc_to)}
-
-        num, nil ->
-          {:halt, num}
-
-        num, acc_from.._ = acc ->
-          if Range.disjoint?(num..num, acc), do: {:cont, acc, num}, else: {:halt, acc_from}
-
-        _, num ->
-          {:halt, num}
-      end,
-      fn reminder -> {:cont, reminder, nil} end
-    )
-  end
-end
diff --git a/apps/indexer/lib/indexer/block/catchup/missing_ranges_collector.ex b/apps/indexer/lib/indexer/block/catchup/missing_ranges_collector.ex
index 31d067217d8d..9c776610ae81 100644
--- a/apps/indexer/lib/indexer/block/catchup/missing_ranges_collector.ex
+++ b/apps/indexer/lib/indexer/block/catchup/missing_ranges_collector.ex
@@ -5,11 +5,10 @@ defmodule Indexer.Block.Catchup.MissingRangesCollector do
 
   use GenServer
 
-  alias Explorer.{Chain, Repo}
+  alias EthereumJSONRPC.Utility.RangesHelper
+  alias Explorer.{Chain, Helper, Repo}
   alias Explorer.Chain.Cache.BlockNumber
-  alias Explorer.Helper, as: ExplorerHelper
   alias Explorer.Utility.{MissingBlockRange, MissingRangesManipulator}
-  alias Indexer.Block.Catchup.Helper
 
   @default_missing_ranges_batch_size 100_000
   @future_check_interval Application.compile_env(:indexer, __MODULE__)[:future_check_interval]
@@ -233,7 +232,7 @@ defmodule Indexer.Block.Catchup.MissingRangesCollector do
       |> Enum.map(fn string_range ->
         case String.split(string_range, "..") do
           [from_string, "latest"] ->
-            ExplorerHelper.parse_integer(from_string)
+            Helper.parse_integer(from_string)
 
           [from_string, to_string] ->
             get_from_to(from_string, to_string)
@@ -242,7 +241,7 @@ defmodule Indexer.Block.Catchup.MissingRangesCollector do
             nil
         end
       end)
-      |> Helper.sanitize_ranges()
+      |> RangesHelper.sanitize_ranges()
 
     case List.last(ranges) do
       _from.._to ->
diff --git a/apps/indexer/lib/indexer/fetcher/coin_balance.ex b/apps/indexer/lib/indexer/fetcher/coin_balance.ex
index 18de40eaaf16..3d7171724547 100644
--- a/apps/indexer/lib/indexer/fetcher/coin_balance.ex
+++ b/apps/indexer/lib/indexer/fetcher/coin_balance.ex
@@ -11,7 +11,7 @@ defmodule Indexer.Fetcher.CoinBalance do
 
   import EthereumJSONRPC, only: [integer_to_quantity: 1, quantity_to_integer: 1]
 
-  alias EthereumJSONRPC.{Blocks, FetchedBalances}
+  alias EthereumJSONRPC.{Blocks, FetchedBalances, Utility.RangesHelper}
   alias Explorer.Chain
   alias Explorer.Chain.{Block, Hash}
   alias Explorer.Chain.Cache.Accounts
@@ -83,13 +83,8 @@ defmodule Indexer.Fetcher.CoinBalance do
     # `{address, block}`, so take unique params only
     unique_entries = Enum.uniq(entries)
 
-    min_block = Application.get_env(:indexer, :trace_first_block)
-    max_block = Application.get_env(:indexer, :trace_last_block)
-
     unique_filtered_entries =
-      Enum.filter(unique_entries, fn {_hash, block_number} ->
-        block_number >= min_block && if max_block, do: block_number <= max_block, else: true
-      end)
+      Enum.filter(unique_entries, fn {_hash, block_number} -> RangesHelper.traceable_block_number?(block_number) end)
 
     unique_entry_count = Enum.count(unique_filtered_entries)
     Logger.metadata(count: unique_entry_count)
diff --git a/apps/indexer/lib/indexer/fetcher/internal_transaction.ex b/apps/indexer/lib/indexer/fetcher/internal_transaction.ex
index e4726d5a3c7a..8ffe843a4a0b 100644
--- a/apps/indexer/lib/indexer/fetcher/internal_transaction.ex
+++ b/apps/indexer/lib/indexer/fetcher/internal_transaction.ex
@@ -12,6 +12,7 @@ defmodule Indexer.Fetcher.InternalTransaction do
 
   import Indexer.Block.Fetcher, only: [async_import_coin_balances: 2]
 
+  alias EthereumJSONRPC.Utility.RangesHelper
   alias Explorer.Chain
   alias Explorer.Chain.Block
   alias Explorer.Chain.Cache.{Accounts, Blocks}
@@ -100,7 +101,7 @@ defmodule Indexer.Fetcher.InternalTransaction do
 
     filtered_unique_numbers =
       unique_numbers
-      |> EthereumJSONRPC.are_block_numbers_in_range?()
+      |> RangesHelper.filter_traceable_block_numbers()
       |> drop_genesis(json_rpc_named_arguments)
 
     filtered_unique_numbers_count = Enum.count(filtered_unique_numbers)
diff --git a/config/runtime.exs b/config/runtime.exs
index e9d915a65a7e..e8fec294afbf 100644
--- a/config/runtime.exs
+++ b/config/runtime.exs
@@ -465,6 +465,7 @@ config :indexer,
   block_ranges: System.get_env("BLOCK_RANGES"),
   first_block: ConfigHelper.parse_integer_env_var("FIRST_BLOCK", 0),
   last_block: ConfigHelper.parse_integer_or_nil_env_var("LAST_BLOCK"),
+  trace_block_ranges: System.get_env("TRACE_BLOCK_RANGES"),
   trace_first_block: ConfigHelper.parse_integer_env_var("TRACE_FIRST_BLOCK", 0),
   trace_last_block: ConfigHelper.parse_integer_or_nil_env_var("TRACE_LAST_BLOCK"),
   fetch_rewards_way: System.get_env("FETCH_REWARDS_WAY", "trace_block"),
diff --git a/docker-compose/envs/common-blockscout.env b/docker-compose/envs/common-blockscout.env
index 9e7e050cb573..73af4cb85ad4 100644
--- a/docker-compose/envs/common-blockscout.env
+++ b/docker-compose/envs/common-blockscout.env
@@ -63,6 +63,7 @@ BLOCK_TRANSFORMER=base
 # BLOCK_RANGES=
 # FIRST_BLOCK=
 # LAST_BLOCK=
+# TRACE_BLOCK_RANGES=
 # TRACE_FIRST_BLOCK=
 # TRACE_LAST_BLOCK=
 # FOOTER_CHAT_LINK=

From a74042674261477fe6b88589f9faa7907dee7f0d Mon Sep 17 00:00:00 2001
From: Qwerty5Uiop <alex000010@bk.ru>
Date: Wed, 13 Dec 2023 18:50:48 +0600
Subject: [PATCH 788/909] Isolate throttable error count by request method

---
 CHANGELOG.md                                  |  1 +
 .../ethereum_jsonrpc/request_coordinator.ex   | 29 ++++++++++++-------
 .../request_coordinator_test.exs              | 29 ++++++++++++-------
 3 files changed, 38 insertions(+), 21 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 719f013806c6..0457d876f782 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,7 @@
 
 ### Features
 
+- [#8997](https://github.com/blockscout/blockscout/pull/8997) - Isolate throttable error count by request method
 - [#8972](https://github.com/blockscout/blockscout/pull/8972) - BENS integration
 - [#8957](https://github.com/blockscout/blockscout/pull/8957) - Add Tx Interpreter Service integration
 
diff --git a/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/request_coordinator.ex b/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/request_coordinator.ex
index a80db36feb5f..77ee7d3906bd 100644
--- a/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/request_coordinator.ex
+++ b/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/request_coordinator.ex
@@ -58,7 +58,7 @@ defmodule EthereumJSONRPC.RequestCoordinator do
 
   alias EthereumJSONRPC.{RollingWindow, Tracer, Transport}
 
-  @error_key :throttleable_error_count
+  @error_key_base "throttleable_error_count"
   @throttle_key :throttle_requests_count
 
   @doc """
@@ -73,7 +73,9 @@ defmodule EthereumJSONRPC.RequestCoordinator do
   @spec perform(Transport.batch_request(), Transport.t(), Transport.options(), non_neg_integer()) ::
           {:ok, Transport.batch_response()} | {:error, term()}
   def perform(request, transport, transport_options, throttle_timeout) do
-    sleep_time = sleep_time()
+    request_method = request_method(request)
+
+    sleep_time = sleep_time(request_method)
 
     if sleep_time <= throttle_timeout do
       :timer.sleep(sleep_time)
@@ -85,7 +87,7 @@ defmodule EthereumJSONRPC.RequestCoordinator do
           trace_request(request, fn ->
             request
             |> transport.json_rpc(transport_options)
-            |> handle_transport_response()
+            |> handle_transport_response(request_method)
           end)
 
         :error ->
@@ -110,19 +112,24 @@ defmodule EthereumJSONRPC.RequestCoordinator do
 
   defp trace_request(_, fun), do: fun.()
 
-  defp handle_transport_response({:error, {error_type, _}} = error) when error_type in [:bad_gateway, :bad_response] do
-    RollingWindow.inc(table(), @error_key)
+  defp request_method([request | _]), do: request_method(request)
+  defp request_method(%{method: method}), do: method
+  defp request_method(_), do: nil
+
+  defp handle_transport_response({:error, {error_type, _}} = error, method)
+       when error_type in [:bad_gateway, :bad_response] do
+    RollingWindow.inc(table(), method_error_key(method))
     inc_throttle_table()
     error
   end
 
-  defp handle_transport_response({:error, :timeout} = error) do
-    RollingWindow.inc(table(), @error_key)
+  defp handle_transport_response({:error, :timeout} = error, method) do
+    RollingWindow.inc(table(), method_error_key(method))
     inc_throttle_table()
     error
   end
 
-  defp handle_transport_response(response) do
+  defp handle_transport_response(response, _method) do
     inc_throttle_table()
     response
   end
@@ -154,14 +161,16 @@ defmodule EthereumJSONRPC.RequestCoordinator do
     end
   end
 
-  defp sleep_time do
-    wait_coefficient = RollingWindow.count(table(), @error_key)
+  defp sleep_time(request_method) do
+    wait_coefficient = RollingWindow.count(table(), method_error_key(request_method))
     jitter = :rand.uniform(config!(:max_jitter))
     wait_per_timeout = config!(:wait_per_timeout)
 
     wait_coefficient * (wait_per_timeout + jitter)
   end
 
+  defp method_error_key(method), do: :"#{@error_key_base}_#{method}"
+
   defp table do
     :rolling_window_opts
     |> config!()
diff --git a/apps/ethereum_jsonrpc/test/ethereum_jsonrpc/request_coordinator_test.exs b/apps/ethereum_jsonrpc/test/ethereum_jsonrpc/request_coordinator_test.exs
index efda05ab86e8..0eaa6c1f3159 100644
--- a/apps/ethereum_jsonrpc/test/ethereum_jsonrpc/request_coordinator_test.exs
+++ b/apps/ethereum_jsonrpc/test/ethereum_jsonrpc/request_coordinator_test.exs
@@ -26,28 +26,35 @@ defmodule EthereumJSONRPC.RequestCoordinatorTest do
   describe "perform/4" do
     test "forwards result whenever a request doesn't timeout", %{timeout_table: timeout_table} do
       expect(EthereumJSONRPC.Mox, :json_rpc, fn _, _ -> {:ok, %{}} end)
-      assert RollingWindow.count(timeout_table, :throttleable_error_count) == 0
-      assert {:ok, %{}} == RequestCoordinator.perform(%{}, EthereumJSONRPC.Mox, [], :timer.minutes(60))
-      assert RollingWindow.count(timeout_table, :throttleable_error_count) == 0
+      assert RollingWindow.count(timeout_table, :throttleable_error_count_eth_call) == 0
+
+      assert {:ok, %{}} ==
+               RequestCoordinator.perform(%{method: "eth_call"}, EthereumJSONRPC.Mox, [], :timer.minutes(60))
+
+      assert RollingWindow.count(timeout_table, :throttleable_error_count_eth_call) == 0
     end
 
     test "increments counter on certain errors", %{timeout_table: timeout_table} do
-      expect(EthereumJSONRPC.Mox, :json_rpc, fn :timeout, _ -> {:error, :timeout} end)
-      expect(EthereumJSONRPC.Mox, :json_rpc, fn :bad_gateway, _ -> {:error, {:bad_gateway, "message"}} end)
+      expect(EthereumJSONRPC.Mox, :json_rpc, fn %{method: "timeout"}, _ -> {:error, :timeout} end)
+      expect(EthereumJSONRPC.Mox, :json_rpc, fn %{method: "bad_gateway"}, _ -> {:error, {:bad_gateway, "message"}} end)
+
+      assert {:error, :timeout} ==
+               RequestCoordinator.perform(%{method: "timeout"}, EthereumJSONRPC.Mox, [], :timer.minutes(60))
 
-      assert {:error, :timeout} == RequestCoordinator.perform(:timeout, EthereumJSONRPC.Mox, [], :timer.minutes(60))
-      assert RollingWindow.count(timeout_table, :throttleable_error_count) == 1
+      assert RollingWindow.count(timeout_table, :throttleable_error_count_timeout) == 1
+      assert RollingWindow.count(timeout_table, :throttleable_error_count_bad_gateway) == 0
 
       assert {:error, {:bad_gateway, "message"}} ==
-               RequestCoordinator.perform(:bad_gateway, EthereumJSONRPC.Mox, [], :timer.minutes(60))
+               RequestCoordinator.perform(%{method: "bad_gateway"}, EthereumJSONRPC.Mox, [], :timer.minutes(60))
 
-      assert RollingWindow.count(timeout_table, :throttleable_error_count) == 2
+      assert RollingWindow.count(timeout_table, :throttleable_error_count_timeout) == 1
+      assert RollingWindow.count(timeout_table, :throttleable_error_count_bad_gateway) == 1
     end
 
     test "returns timeout error if sleep time will exceed max timeout", %{timeout_table: timeout_table} do
       expect(EthereumJSONRPC.Mox, :json_rpc, 0, fn _, _ -> :ok end)
-      RollingWindow.inc(timeout_table, :throttleable_error_count)
-      assert {:error, :timeout} == RequestCoordinator.perform(%{}, EthereumJSONRPC.Mox, [], 1)
+      RollingWindow.inc(timeout_table, :throttleable_error_count_eth_call)
+      assert {:error, :timeout} == RequestCoordinator.perform(%{method: "eth_call"}, EthereumJSONRPC.Mox, [], 1)
     end
 
     test "increments throttle_table even when not an error", %{throttle_table: throttle_table} do

From 284efc9891f8d7f77b4bedf69b8b0d62a59ef8d5 Mon Sep 17 00:00:00 2001
From: Viktor Baranov <baranov.viktor.27@gmail.com>
Date: Thu, 21 Dec 2023 13:32:17 +0300
Subject: [PATCH 789/909] Run base CI on v6.0.0-dev branch

---
 .github/workflows/config.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/config.yml b/.github/workflows/config.yml
index 5efcd092a62e..e67df9c5c0c4 100644
--- a/.github/workflows/config.yml
+++ b/.github/workflows/config.yml
@@ -28,6 +28,7 @@ on:
   pull_request:
     branches:
       - master
+      - v6.0.0-dev
       - production-optimism
 
 env:

From b2935c746eae49c618402a63ca157242d47cf5af Mon Sep 17 00:00:00 2001
From: Viktor Baranov <baranov.viktor.27@gmail.com>
Date: Thu, 21 Dec 2023 13:33:09 +0300
Subject: [PATCH 790/909] Run base CI on push to v6.0.0-dev branch

---
 .github/workflows/config.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/config.yml b/.github/workflows/config.yml
index e67df9c5c0c4..9dac00c1b4d1 100644
--- a/.github/workflows/config.yml
+++ b/.github/workflows/config.yml
@@ -4,6 +4,7 @@ on:
   push:
     branches:
       - master
+      - v6.0.0-dev
       - production-core
       - production-eth-experimental
       - production-eth-goerli

From 0a554020d2dbd39951fc77820985c078ed1c111c Mon Sep 17 00:00:00 2001
From: Nikita Pozdniakov <nikitosing4@mail.ru>
Date: Thu, 21 Dec 2023 13:37:01 +0300
Subject: [PATCH 791/909] Add address preload in tx summary response

---
 .../transaction_interpretation.ex             | 43 ++++++++++++++++---
 apps/explorer/lib/explorer/chain.ex           |  4 +-
 2 files changed, 38 insertions(+), 9 deletions(-)

diff --git a/apps/block_scout_web/lib/block_scout_web/microservice_interfaces/transaction_interpretation.ex b/apps/block_scout_web/lib/block_scout_web/microservice_interfaces/transaction_interpretation.ex
index 587c78cfada9..c01da93f2cf5 100644
--- a/apps/block_scout_web/lib/block_scout_web/microservice_interfaces/transaction_interpretation.ex
+++ b/apps/block_scout_web/lib/block_scout_web/microservice_interfaces/transaction_interpretation.ex
@@ -39,7 +39,7 @@ defmodule BlockScoutWeb.MicroserviceInterfaces.TransactionInterpretation do
 
     case HTTPoison.post(url, Jason.encode!(body), headers, recv_timeout: @post_timeout) do
       {:ok, %Response{body: body, status_code: 200}} ->
-        body |> Jason.decode() |> preload_tokens()
+        body |> Jason.decode() |> preload_template_variables()
 
       error ->
         old_truncate = Application.get_env(:logger, :truncate)
@@ -148,12 +148,12 @@ defmodule BlockScoutWeb.MicroserviceInterfaces.TransactionInterpretation do
     |> Enum.map(fn {log, decoded_log} -> TransactionView.prepare_log(log, transaction.hash, decoded_log, true) end)
   end
 
-  defp preload_tokens({:ok, %{"success" => true, "data" => %{"summaries" => summaries} = data}}) do
+  defp preload_template_variables({:ok, %{"success" => true, "data" => %{"summaries" => summaries} = data}}) do
     summaries_updated =
       Enum.map(summaries, fn %{"summary_template_variables" => summary_template_variables} = summary ->
         summary_template_variables_preloaded =
           Enum.reduce(summary_template_variables, %{}, fn {key, value}, acc ->
-            Map.put(acc, key, preload_token(value))
+            Map.put(acc, key, preload_template_variable(value))
           end)
 
         Map.put(summary, "summary_template_variables", summary_template_variables_preloaded)
@@ -162,17 +162,46 @@ defmodule BlockScoutWeb.MicroserviceInterfaces.TransactionInterpretation do
     {:ok, %{"success" => true, "data" => Map.put(data, "summaries", summaries_updated)}}
   end
 
-  defp preload_tokens(error), do: error
+  defp preload_template_variables(error), do: error
 
-  defp preload_token(%{"type" => "token", "value" => %{"address" => address_hash_string} = value}),
+  defp preload_template_variable(%{"type" => "token", "value" => %{"address" => address_hash_string} = value}),
     do: %{
       "type" => "token",
       "value" => address_hash_string |> Chain.token_from_address_hash(@api_true) |> token_from_db() |> Map.merge(value)
     }
 
-  defp preload_token(other), do: other
+  defp preload_template_variable(%{"type" => "address", "value" => %{"hash" => address_hash_string} = value}),
+    do: %{
+      "type" => "address",
+      "value" =>
+        address_hash_string
+        |> Chain.hash_to_address(
+          [
+            necessity_by_association: %{
+              :names => :optional,
+              :smart_contract => :optional
+            },
+            api?: true
+          ],
+          false
+        )
+        |> address_from_db()
+        |> Map.merge(value)
+    }
 
-  defp token_from_db({:error, _}), do: %{}
+  defp preload_template_variable(other), do: other
 
+  defp token_from_db({:error, _}), do: %{}
   defp token_from_db({:ok, token}), do: TokenView.render("token.json", %{token: token})
+
+  defp address_from_db({:error, _}), do: %{}
+
+  defp address_from_db({:ok, address}),
+    do:
+      Helper.address_with_info(
+        nil,
+        address,
+        address.hash,
+        true
+      )
 end
diff --git a/apps/explorer/lib/explorer/chain.ex b/apps/explorer/lib/explorer/chain.ex
index fa25f985b0df..1accf987cb44 100644
--- a/apps/explorer/lib/explorer/chain.ex
+++ b/apps/explorer/lib/explorer/chain.ex
@@ -1017,10 +1017,10 @@ defmodule Explorer.Chain do
   Optionally it also accepts a boolean to fetch the `has_decompiled_code?` virtual field or not
 
   """
-  @spec hash_to_address(Hash.Address.t(), [necessity_by_association_option | api?], boolean()) ::
+  @spec hash_to_address(Hash.Address.t() | binary(), [necessity_by_association_option | api?], boolean()) ::
           {:ok, Address.t()} | {:error, :not_found}
   def hash_to_address(
-        %Hash{byte_count: unquote(Hash.Address.byte_count())} = hash,
+        hash,
         options \\ [
           necessity_by_association: %{
             :contracts_creation_internal_transaction => :optional,

From be3540a12577e384703de3ca67876e22193bdbd0 Mon Sep 17 00:00:00 2001
From: Maxim Filonov <53992153+sl1depengwyn@users.noreply.github.com>
Date: Sat, 9 Dec 2023 16:33:02 +0300
Subject: [PATCH 792/909] Support legacy paging options for address txs

---
 CHANGELOG.md                                  |  1 +
 .../api/v2/address_controller_test.exs        | 45 +++++++++++++++++++
 .../lib/explorer/chain/transaction.ex         |  3 +-
 3 files changed, 48 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 719f013806c6..dba610044b9d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,6 +10,7 @@
 ### Fixes
 
 - [#9013](https://github.com/blockscout/blockscout/pull/9013) - Speed up `Indexer.Fetcher.TokenInstance.LegacySanitize`
+- [#8969](https://github.com/blockscout/blockscout/pull/8969) - Support legacy paging options for address transaction endpoint
 - [#8955](https://github.com/blockscout/blockscout/pull/8955) - Remove daily balances updating from BlockReward fetcher
 - [#8846](https://github.com/blockscout/blockscout/pull/8846) - Handle nil gas_price at address view
 
diff --git a/apps/block_scout_web/test/block_scout_web/controllers/api/v2/address_controller_test.exs b/apps/block_scout_web/test/block_scout_web/controllers/api/v2/address_controller_test.exs
index 6ed830528b12..d3749c1628af 100644
--- a/apps/block_scout_web/test/block_scout_web/controllers/api/v2/address_controller_test.exs
+++ b/apps/block_scout_web/test/block_scout_web/controllers/api/v2/address_controller_test.exs
@@ -447,6 +447,51 @@ defmodule BlockScoutWeb.API.V2.AddressControllerTest do
       check_paginated_response(response, response_2nd_page, txs)
     end
 
+    test "backward compatible with legacy paging params", %{conn: conn} do
+      address = insert(:address)
+      block = insert(:block)
+
+      txs = insert_list(51, :transaction, from_address: address) |> with_block(block)
+
+      [_, tx_before_last | _] = txs
+
+      request = get(conn, "/api/v2/addresses/#{address.hash}/transactions")
+      assert response = json_response(request, 200)
+
+      request_2nd_page =
+        get(
+          conn,
+          "/api/v2/addresses/#{address.hash}/transactions",
+          %{"block_number" => to_string(block.number), "index" => to_string(tx_before_last.index)}
+        )
+
+      assert response_2nd_page = json_response(request_2nd_page, 200)
+
+      check_paginated_response(response, response_2nd_page, txs)
+    end
+
+    test "backward compatible with legacy paging params for pending transactions", %{conn: conn} do
+      address = insert(:address)
+
+      txs = insert_list(51, :transaction, from_address: address)
+
+      [_, tx_before_last | _] = txs
+
+      request = get(conn, "/api/v2/addresses/#{address.hash}/transactions")
+      assert response = json_response(request, 200)
+
+      request_2nd_page_pending =
+        get(
+          conn,
+          "/api/v2/addresses/#{address.hash}/transactions",
+          %{"inserted_at" => to_string(tx_before_last.inserted_at), "hash" => to_string(tx_before_last.hash)}
+        )
+
+      assert response_2nd_page_pending = json_response(request_2nd_page_pending, 200)
+
+      check_paginated_response(response, response_2nd_page_pending, txs)
+    end
+
     test "can order and paginate by fee ascending", %{conn: conn} do
       address = insert(:address)
 
diff --git a/apps/explorer/lib/explorer/chain/transaction.ex b/apps/explorer/lib/explorer/chain/transaction.ex
index 1f7e67790bdc..c488d56bac5b 100644
--- a/apps/explorer/lib/explorer/chain/transaction.ex
+++ b/apps/explorer/lib/explorer/chain/transaction.ex
@@ -1373,6 +1373,7 @@ defmodule Explorer.Chain.Transaction do
   defp address_to_transactions_tasks(address_hash, options, old_ui?) do
     direction = Keyword.get(options, :direction)
     necessity_by_association = Keyword.get(options, :necessity_by_association, %{})
+    old_ui? = old_ui? || is_tuple(Keyword.get(options, :paging_options, Chain.default_paging_options()).key)
 
     options
     |> address_to_transactions_tasks_query(false, old_ui?)
@@ -1603,7 +1604,7 @@ defmodule Explorer.Chain.Transaction do
   end
 
   @doc """
-  Adds a `has_token_transfers` field to the query via `select_merge` if second argument is `true` and returns
+  Adds a `has_token_transfers` field to the query via `select_merge` if second argument is `false` and returns
   the query untouched otherwise.
   """
   @spec put_has_token_transfers_to_tx(Ecto.Query.t() | atom, boolean) :: Ecto.Query.t()

From 473a4d0851b4fdf279d0716afec722a148e84365 Mon Sep 17 00:00:00 2001
From: Maxim Filonov <53992153+sl1depengwyn@users.noreply.github.com>
Date: Mon, 11 Dec 2023 12:39:40 +0300
Subject: [PATCH 793/909] Add EIP-4844 compatibility

---
 CHANGELOG.md                                           |  1 +
 apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/block.ex    |  5 +++++
 apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/receipt.ex  |  5 +++++
 .../lib/ethereum_jsonrpc/transaction.ex                | 10 ++++++++++
 4 files changed, 21 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1184bb0ec74c..9c442504ec03 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,7 @@
 ### Features
 
 - [#8997](https://github.com/blockscout/blockscout/pull/8997) - Isolate throttable error count by request method
+- [#8975](https://github.com/blockscout/blockscout/pull/8975) - Add EIP-4844 compatibility (not full support yet)
 - [#8972](https://github.com/blockscout/blockscout/pull/8972) - BENS integration
 - [#8957](https://github.com/blockscout/blockscout/pull/8957) - Add Tx Interpreter Service integration
 
diff --git a/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/block.ex b/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/block.ex
index 1431d39bde2b..d07606297ebb 100644
--- a/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/block.ex
+++ b/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/block.ex
@@ -766,6 +766,11 @@ defmodule EthereumJSONRPC.Block do
     {key, quantity_to_integer(quantity)}
   end
 
+  # to be merged with clause above ^
+  defp entry_to_elixir({key, _quantity}, _block) when key in ~w(blobGasUsed excessBlobGas) do
+    {:ignore, :ignore}
+  end
+
   # Size and totalDifficulty may be `nil` for uncle blocks
   defp entry_to_elixir({key, nil}, _block) when key in ~w(size totalDifficulty) do
     {key, nil}
diff --git a/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/receipt.ex b/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/receipt.ex
index f3cf67aab1d3..8dc9b2f82edc 100644
--- a/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/receipt.ex
+++ b/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/receipt.ex
@@ -319,6 +319,11 @@ defmodule EthereumJSONRPC.Receipt do
     :ignore
   end
 
+  # EIP-4844 transaction receipt fields
+  defp entry_to_elixir({key, _}) when key in ~w(blobGasUsed blobGasPrice) do
+    :ignore
+  end
+
   defp entry_to_elixir({key, value}) do
     {:error, {:unknown_key, %{key: key, value: value}}}
   end
diff --git a/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/transaction.ex b/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/transaction.ex
index 1e3f8f1cf954..964dc2ec1f2f 100644
--- a/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/transaction.ex
+++ b/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/transaction.ex
@@ -621,6 +621,16 @@ defmodule EthereumJSONRPC.Transaction do
     {key, quantity_to_integer(quantity)}
   end
 
+  # to be merged with the clause above ^
+  defp entry_to_elixir({"maxFeePerBlobGas", _value}) do
+    {nil, nil}
+  end
+
+  # EIP-4844 specific field with value of type of list of hashes
+  defp entry_to_elixir({"blobVersionedHashes", _value}) do
+    {nil, nil}
+  end
+
   # as always ganache has it's own vision on JSON RPC standard
   defp entry_to_elixir({key, nil}) when key in ~w(r s v) do
     {key, 0}

From e22046417fa2570f77bfdfffb0fefdde5496a88c Mon Sep 17 00:00:00 2001
From: Qwerty5Uiop <alex000010@bk.ru>
Date: Thu, 7 Dec 2023 21:01:23 +0600
Subject: [PATCH 794/909] Set poll: false for internal transactions fetcher

---
 CHANGELOG.md                                             | 1 +
 apps/indexer/lib/indexer/fetcher/internal_transaction.ex | 1 +
 2 files changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1184bb0ec74c..db10ffce4c22 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,6 +12,7 @@
 
 - [#9013](https://github.com/blockscout/blockscout/pull/9013) - Speed up `Indexer.Fetcher.TokenInstance.LegacySanitize`
 - [#8969](https://github.com/blockscout/blockscout/pull/8969) - Support legacy paging options for address transaction endpoint
+- [#8965](https://github.com/blockscout/blockscout/pull/8965) - Set poll: false for internal transactions fetcher
 - [#8955](https://github.com/blockscout/blockscout/pull/8955) - Remove daily balances updating from BlockReward fetcher
 - [#8846](https://github.com/blockscout/blockscout/pull/8846) - Handle nil gas_price at address view
 
diff --git a/apps/indexer/lib/indexer/fetcher/internal_transaction.ex b/apps/indexer/lib/indexer/fetcher/internal_transaction.ex
index e4726d5a3c7a..0d2d783ab2fb 100644
--- a/apps/indexer/lib/indexer/fetcher/internal_transaction.ex
+++ b/apps/indexer/lib/indexer/fetcher/internal_transaction.ex
@@ -365,6 +365,7 @@ defmodule Indexer.Fetcher.InternalTransaction do
 
   defp defaults do
     [
+      poll: false,
       flush_interval: :timer.seconds(3),
       max_concurrency: Application.get_env(:indexer, __MODULE__)[:concurrency] || @default_max_concurrency,
       max_batch_size: Application.get_env(:indexer, __MODULE__)[:batch_size] || @default_max_batch_size,

From a02b3edfbc121ad2de2d3a2a5774bf242cf5c492 Mon Sep 17 00:00:00 2001
From: Qwerty5Uiop <alex000010@bk.ru>
Date: Fri, 15 Dec 2023 20:24:46 +0600
Subject: [PATCH 795/909] Add test for internal transactions fetcher race
 condition

---
 .../indexer/fetcher/internal_transaction.ex   |  2 +-
 .../fetcher/internal_transaction_test.exs     | 41 ++++++++++++++++++-
 .../internal_transaction_supervisor_case.ex   | 12 +++---
 3 files changed, 47 insertions(+), 8 deletions(-)

diff --git a/apps/indexer/lib/indexer/fetcher/internal_transaction.ex b/apps/indexer/lib/indexer/fetcher/internal_transaction.ex
index 0d2d783ab2fb..669bb11c142a 100644
--- a/apps/indexer/lib/indexer/fetcher/internal_transaction.ex
+++ b/apps/indexer/lib/indexer/fetcher/internal_transaction.ex
@@ -363,7 +363,7 @@ defmodule Indexer.Fetcher.InternalTransaction do
 
   defp invalidate_block_from_error(_error_data), do: :ok
 
-  defp defaults do
+  def defaults do
     [
       poll: false,
       flush_interval: :timer.seconds(3),
diff --git a/apps/indexer/test/indexer/fetcher/internal_transaction_test.exs b/apps/indexer/test/indexer/fetcher/internal_transaction_test.exs
index b36006b872f6..e451525869b1 100644
--- a/apps/indexer/test/indexer/fetcher/internal_transaction_test.exs
+++ b/apps/indexer/test/indexer/fetcher/internal_transaction_test.exs
@@ -5,8 +5,10 @@ defmodule Indexer.Fetcher.InternalTransactionTest do
   import ExUnit.CaptureLog
   import Mox
 
-  alias Explorer.Chain
-  alias Explorer.Chain.PendingBlockOperation
+  alias Ecto.Multi
+  alias Explorer.{Chain, Repo}
+  alias Explorer.Chain.{Block, PendingBlockOperation}
+  alias Explorer.Chain.Import.Runner.Blocks
   alias Indexer.Fetcher.{CoinBalance, InternalTransaction, PendingTransaction}
 
   # MUST use global mode because we aren't guaranteed to get PendingTransactionFetcher's pid back fast enough to `allow`
@@ -466,4 +468,39 @@ defmodule Indexer.Fetcher.InternalTransactionTest do
       assert logs =~ "foreign_key_violation on internal transactions import, foreign transactions hashes:"
     end
   end
+
+  test "doesn't delete pending block operations after block import if no async process was requested", %{
+    json_rpc_named_arguments: json_rpc_named_arguments
+  } do
+    fetcher_options =
+      Keyword.merge([poll: true, json_rpc_named_arguments: json_rpc_named_arguments], InternalTransaction.defaults())
+
+    if fetcher_options[:poll] do
+      expect(EthereumJSONRPC.Mox, :json_rpc, fn [%{id: id}], _options ->
+        {:ok, [%{id: id, result: []}]}
+      end)
+    end
+
+    InternalTransaction.Supervisor.Case.start_supervised!(fetcher_options)
+
+    %Ecto.Changeset{valid?: true, changes: block_changes} =
+      Block.changeset(%Block{}, params_for(:block, miner_hash: insert(:address).hash, number: 1))
+
+    changes_list = [block_changes]
+    timestamp = DateTime.utc_now()
+    options = %{timestamps: %{inserted_at: timestamp, updated_at: timestamp}}
+
+    assert [] = Repo.all(PendingBlockOperation)
+
+    {:ok, %{blocks: [%{number: block_number, hash: block_hash}]}} =
+      Multi.new()
+      |> Blocks.run(changes_list, options)
+      |> Repo.transaction()
+
+    assert %{block_number: ^block_number, block_hash: ^block_hash} = Repo.one(PendingBlockOperation)
+
+    Process.sleep(4000)
+
+    assert %{block_number: ^block_number, block_hash: ^block_hash} = Repo.one(PendingBlockOperation)
+  end
 end
diff --git a/apps/indexer/test/support/indexer/fetcher/internal_transaction_supervisor_case.ex b/apps/indexer/test/support/indexer/fetcher/internal_transaction_supervisor_case.ex
index b067997b5fbf..0c3ba2be7358 100644
--- a/apps/indexer/test/support/indexer/fetcher/internal_transaction_supervisor_case.ex
+++ b/apps/indexer/test/support/indexer/fetcher/internal_transaction_supervisor_case.ex
@@ -4,11 +4,13 @@ defmodule Indexer.Fetcher.InternalTransaction.Supervisor.Case do
   def start_supervised!(fetcher_arguments \\ []) when is_list(fetcher_arguments) do
     merged_fetcher_arguments =
       Keyword.merge(
-        fetcher_arguments,
-        flush_interval: 50,
-        max_batch_size: 1,
-        max_concurrency: 1,
-        poll: false
+        [
+          flush_interval: 50,
+          max_batch_size: 1,
+          max_concurrency: 1,
+          poll: false
+        ],
+        fetcher_arguments
       )
 
     [merged_fetcher_arguments]

From 6969f78c0e3ae9fc2bdf6d6aa912207ccdad3eb2 Mon Sep 17 00:00:00 2001
From: nikitosing <32202610+nikitosing@users.noreply.github.com>
Date: Thu, 21 Dec 2023 19:07:48 +0300
Subject: [PATCH 796/909] Improrve spec

---
 .../explorer/lib/explorer/chain/transaction.ex | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/apps/explorer/lib/explorer/chain/transaction.ex b/apps/explorer/lib/explorer/chain/transaction.ex
index 8971b738781d..a054c6ee250c 100644
--- a/apps/explorer/lib/explorer/chain/transaction.ex
+++ b/apps/explorer/lib/explorer/chain/transaction.ex
@@ -595,15 +595,17 @@ defmodule Explorer.Chain.Transaction do
 
   # Because there is no contract association, we know the contract was not verified
   @spec decoded_input_data(
-          %{:__struct__ => Ecto.Association.NotLoaded | Explorer.Chain.Transaction, optional(any()) => any()},
-          any(),
-          any(),
-          any(),
-          any()
+          NotLoaded.t() | Transaction.t(),
+          boolean(),
+          [Chain.api?()],
+          full_abi_acc,
+          methods_acc
         ) ::
-          {{:error | :ok | binary(), any()}
-           | {:error, :contract_not_verified | :contract_verified, list()}
-           | {:ok, binary(), binary(), list()}, any(), any()}
+          {error_type | success_type, full_abi_acc, methods_acc}
+        when full_abi_acc: map(),
+             methods_acc: map(),
+             error_type: {:error, any()} | {:error, :contract_not_verified | :contract_verified, list()},
+             success_type: {:ok | binary(), any()} | {:ok, binary(), binary(), list()}
   def decoded_input_data(tx, skip_sig_provider? \\ false, options, full_abi_acc \\ %{}, methods_acc \\ %{})
 
   def decoded_input_data(%__MODULE__{to_address: nil}, _, _, full_abi_acc, methods_acc),

From 6e501106f850340a2ceba72561a3c0f5eb63686e Mon Sep 17 00:00:00 2001
From: Nikita Pozdniakov <nikitosing4@mail.ru>
Date: Fri, 22 Dec 2023 10:03:05 +0300
Subject: [PATCH 797/909] Enable sig provider in tx summary request

---
 .../microservice_interfaces/transaction_interpretation.ex       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/block_scout_web/lib/block_scout_web/microservice_interfaces/transaction_interpretation.ex b/apps/block_scout_web/lib/block_scout_web/microservice_interfaces/transaction_interpretation.ex
index c01da93f2cf5..4b6d7edc7477 100644
--- a/apps/block_scout_web/lib/block_scout_web/microservice_interfaces/transaction_interpretation.ex
+++ b/apps/block_scout_web/lib/block_scout_web/microservice_interfaces/transaction_interpretation.ex
@@ -76,7 +76,7 @@ defmodule BlockScoutWeb.MicroserviceInterfaces.TransactionInterpretation do
         created_contract_address: [:names, :token, :smart_contract]
       ])
 
-    skip_sig_provider? = true
+    skip_sig_provider? = false
     {decoded_input, _abi_acc, _methods_acc} = Transaction.decoded_input_data(transaction, skip_sig_provider?, @api_true)
 
     decoded_input_data = decoded_input |> TransactionView.format_decoded_input() |> TransactionView.decoded_input()

From 8430dca08548cb77e721435937cc180862ff27c0 Mon Sep 17 00:00:00 2001
From: Qwerty5Uiop <alex000010@bk.ru>
Date: Mon, 18 Dec 2023 18:35:24 +0600
Subject: [PATCH 798/909] Add SmartContractRealtimeEventHandler

---
 CHANGELOG.md                                  |  1 +
 .../lib/block_scout_web/application.ex        |  3 +-
 .../block_scout_web/realtime_event_handler.ex |  3 --
 .../smart_contract_realtime_event_handler.ex  | 28 +++++++++++++++++++
 4 files changed, 31 insertions(+), 4 deletions(-)
 create mode 100644 apps/block_scout_web/lib/block_scout_web/smart_contract_realtime_event_handler.ex

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7d87321c5460..a63c6d520a98 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,7 @@
 
 ### Features
 
+- [#9018](https://github.com/blockscout/blockscout/pull/9018) - Add SmartContractRealtimeEventHandler
 - [#8997](https://github.com/blockscout/blockscout/pull/8997) - Isolate throttable error count by request method
 - [#8975](https://github.com/blockscout/blockscout/pull/8975) - Add EIP-4844 compatibility (not full support yet)
 - [#8972](https://github.com/blockscout/blockscout/pull/8972) - BENS integration
diff --git a/apps/block_scout_web/lib/block_scout_web/application.ex b/apps/block_scout_web/lib/block_scout_web/application.ex
index cb46a885761c..f323ef8e959d 100644
--- a/apps/block_scout_web/lib/block_scout_web/application.ex
+++ b/apps/block_scout_web/lib/block_scout_web/application.ex
@@ -8,7 +8,7 @@ defmodule BlockScoutWeb.Application do
   alias BlockScoutWeb.API.APILogger
   alias BlockScoutWeb.Counters.{BlocksIndexedCounter, InternalTransactionsIndexedCounter}
   alias BlockScoutWeb.{Endpoint, Prometheus}
-  alias BlockScoutWeb.{MainPageRealtimeEventHandler, RealtimeEventHandler}
+  alias BlockScoutWeb.{MainPageRealtimeEventHandler, RealtimeEventHandler, SmartContractRealtimeEventHandler}
 
   def start(_type, _args) do
     import Supervisor
@@ -36,6 +36,7 @@ defmodule BlockScoutWeb.Application do
       {Absinthe.Subscription, Endpoint},
       {MainPageRealtimeEventHandler, name: MainPageRealtimeEventHandler},
       {RealtimeEventHandler, name: RealtimeEventHandler},
+      {SmartContractRealtimeEventHandler, name: SmartContractRealtimeEventHandler},
       {BlocksIndexedCounter, name: BlocksIndexedCounter},
       {InternalTransactionsIndexedCounter, name: InternalTransactionsIndexedCounter}
     ]
diff --git a/apps/block_scout_web/lib/block_scout_web/realtime_event_handler.ex b/apps/block_scout_web/lib/block_scout_web/realtime_event_handler.ex
index 7d029f17f885..1fedc2dc3dba 100644
--- a/apps/block_scout_web/lib/block_scout_web/realtime_event_handler.ex
+++ b/apps/block_scout_web/lib/block_scout_web/realtime_event_handler.ex
@@ -24,11 +24,8 @@ defmodule BlockScoutWeb.RealtimeEventHandler do
     Subscriber.to(:address_coin_balances, :on_demand)
     Subscriber.to(:address_current_token_balances, :on_demand)
     Subscriber.to(:address_token_balances, :on_demand)
-    Subscriber.to(:contract_verification_result, :on_demand)
     Subscriber.to(:token_total_supply, :on_demand)
     Subscriber.to(:changed_bytecode, :on_demand)
-    Subscriber.to(:smart_contract_was_verified, :on_demand)
-    Subscriber.to(:smart_contract_was_not_verified, :on_demand)
     Subscriber.to(:eth_bytecode_db_lookup_started, :on_demand)
     Subscriber.to(:zkevm_confirmed_batches, :realtime)
     # Does not come from the indexer
diff --git a/apps/block_scout_web/lib/block_scout_web/smart_contract_realtime_event_handler.ex b/apps/block_scout_web/lib/block_scout_web/smart_contract_realtime_event_handler.ex
new file mode 100644
index 000000000000..e94e8a3bb9bb
--- /dev/null
+++ b/apps/block_scout_web/lib/block_scout_web/smart_contract_realtime_event_handler.ex
@@ -0,0 +1,28 @@
+defmodule BlockScoutWeb.SmartContractRealtimeEventHandler do
+  @moduledoc """
+  Subscribing process for smart contract verification related broadcast events from realtime.
+  """
+
+  use GenServer
+
+  alias BlockScoutWeb.Notifier
+  alias Explorer.Chain.Events.Subscriber
+
+  def start_link(_) do
+    GenServer.start_link(__MODULE__, [], name: __MODULE__)
+  end
+
+  @impl true
+  def init([]) do
+    Subscriber.to(:contract_verification_result, :on_demand)
+    Subscriber.to(:smart_contract_was_verified, :on_demand)
+    Subscriber.to(:smart_contract_was_not_verified, :on_demand)
+    {:ok, []}
+  end
+
+  @impl true
+  def handle_info(event, state) do
+    Notifier.handle_event(event)
+    {:noreply, state}
+  end
+end

From 373eb063da9a3e486dc13cb49b43a7a2d9ce3c8e Mon Sep 17 00:00:00 2001
From: Viktor Baranov <baranov.viktor.27@gmail.com>
Date: Fri, 22 Dec 2023 16:01:16 +0300
Subject: [PATCH 799/909] Add dependabot bumps to CHANGELOG

---
 CHANGELOG.md | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 819c146d5c17..10253eb27289 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -27,6 +27,18 @@
 
 <details>
   <summary>Dependencies version bumps</summary>
+
+- [#8986](https://github.com/blockscout/blockscout/pull/8986) - Bump chart.js from 4.4.0 to 4.4.1 in /apps/block_scout_web/assets
+- [#8982](https://github.com/blockscout/blockscout/pull/8982) - Bump ex_doc from 0.30.9 to 0.31.0
+- [#8987](https://github.com/blockscout/blockscout/pull/8987) - Bump @babel/preset-env from 7.23.5 to 7.23.6 in /apps/block_scout_web/assets
+- [#8984](https://github.com/blockscout/blockscout/pull/8984) - Bump ecto_sql from 3.11.0 to 3.11.1
+- [#8988](https://github.com/blockscout/blockscout/pull/8988) - Bump core-js from 3.33.3 to 3.34.0 in /apps/block_scout_web/assets
+- [#8980](https://github.com/blockscout/blockscout/pull/8980) - Bump exvcr from 0.14.4 to 0.15.0
+- [#8985](https://github.com/blockscout/blockscout/pull/8985) - Bump @babel/core from 7.23.5 to 7.23.6 in /apps/block_scout_web/assets
+- [#9020](https://github.com/blockscout/blockscout/pull/9020) - Bump eslint-plugin-import from 2.29.0 to 2.29.1 in /apps/block_scout_web/assets
+- [#9021](https://github.com/blockscout/blockscout/pull/9021) - Bump eslint from 8.55.0 to 8.56.0 in /apps/block_scout_web/assets
+- [#9019](https://github.com/blockscout/blockscout/pull/9019) - Bump @amplitude/analytics-browser from 2.3.6 to 2.3.7 in /apps/block_scout_web/assets
+
 </details>
 
 ## 5.3.3-beta

From 3ab544f5008ba494f83b331511c8a219c70dc2d1 Mon Sep 17 00:00:00 2001
From: Qwerty5Uiop <alex000010@bk.ru>
Date: Fri, 22 Dec 2023 19:05:21 +0600
Subject: [PATCH 800/909] Set trace_block_ranges to first..last if not set

---
 .../ethereum_jsonrpc/utility/ranges_helper.ex | 45 +++++++++----------
 .../explorer/chain/import/runner/blocks.ex    |  6 +--
 .../import/runner/internal_transactions.ex    | 25 ++++-------
 config/runtime.exs                            | 15 +++++--
 4 files changed, 43 insertions(+), 48 deletions(-)

diff --git a/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/utility/ranges_helper.ex b/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/utility/ranges_helper.ex
index 75f00bccdee5..f7220b044d0b 100644
--- a/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/utility/ranges_helper.ex
+++ b/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/utility/ranges_helper.ex
@@ -4,38 +4,37 @@ defmodule EthereumJSONRPC.Utility.RangesHelper do
   Helper for ranges manipulations.
   """
 
+  @default_trace_block_ranges "0..latest"
+
   @spec traceable_block_number?(integer() | nil) :: boolean()
   def traceable_block_number?(block_number) do
-    case Application.get_env(:indexer, :trace_block_ranges) do
-      nil ->
-        min_block = Application.get_env(:indexer, :trace_first_block)
-        max_block = Application.get_env(:indexer, :trace_last_block)
-
-        !block_number || (block_number >= min_block && if(max_block, do: block_number <= max_block, else: true))
-
-      block_ranges ->
-        parsed_ranges = parse_block_ranges(block_ranges)
-
-        number_in_ranges?(block_number, parsed_ranges)
+    if trace_ranges_present?() do
+      number_in_ranges?(block_number, get_trace_block_ranges())
+    else
+      true
     end
   end
 
   @spec filter_traceable_block_numbers([integer()]) :: [integer()]
   def filter_traceable_block_numbers(block_numbers) do
-    case Application.get_env(:indexer, :trace_block_ranges) do
-      nil ->
-        min_block = Application.get_env(:indexer, :trace_first_block)
-        max_block = Application.get_env(:indexer, :trace_last_block)
-
-        Enum.filter(block_numbers, fn block_number ->
-          block_number >= min_block && if max_block, do: block_number <= max_block, else: true
-        end)
+    if trace_ranges_present?() do
+      trace_block_ranges = get_trace_block_ranges()
+      Enum.filter(block_numbers, &number_in_ranges?(&1, trace_block_ranges))
+    else
+      block_numbers
+    end
+  end
 
-      block_ranges ->
-        parsed_ranges = parse_block_ranges(block_ranges)
+  @spec trace_ranges_present? :: boolean()
+  def trace_ranges_present? do
+    Application.get_env(:indexer, :trace_block_ranges) != @default_trace_block_ranges
+  end
 
-        Enum.filter(block_numbers, &number_in_ranges?(&1, parsed_ranges))
-    end
+  @spec get_trace_block_ranges :: [Range.t() | integer()]
+  def get_trace_block_ranges do
+    :indexer
+    |> Application.get_env(:trace_block_ranges)
+    |> parse_block_ranges()
   end
 
   @spec parse_block_ranges(binary()) :: [Range.t() | integer()]
diff --git a/apps/explorer/lib/explorer/chain/import/runner/blocks.ex b/apps/explorer/lib/explorer/chain/import/runner/blocks.ex
index 6ff8ee7d6432..83a426b313e7 100644
--- a/apps/explorer/lib/explorer/chain/import/runner/blocks.ex
+++ b/apps/explorer/lib/explorer/chain/import/runner/blocks.ex
@@ -887,11 +887,7 @@ defmodule Explorer.Chain.Import.Runner.Blocks do
   end
 
   defp filter_by_height_range(blocks, filter_func) do
-    trace_block_ranges = Application.get_env(:indexer, :trace_block_ranges)
-    minimal_block_height = Application.get_env(:indexer, :trace_first_block)
-    maximal_block_height = Application.get_env(:indexer, :trace_last_block)
-
-    if trace_block_ranges || minimal_block_height > 0 || maximal_block_height do
+    if RangesHelper.trace_ranges_present?() do
       Enum.filter(blocks, &filter_func.(&1))
     else
       blocks
diff --git a/apps/explorer/lib/explorer/chain/import/runner/internal_transactions.ex b/apps/explorer/lib/explorer/chain/import/runner/internal_transactions.ex
index 4caf850df13d..2ef9cfe1fe57 100644
--- a/apps/explorer/lib/explorer/chain/import/runner/internal_transactions.ex
+++ b/apps/explorer/lib/explorer/chain/import/runner/internal_transactions.ex
@@ -751,24 +751,15 @@ defmodule Explorer.Chain.Import.Runner.InternalTransactions do
   end
 
   defp traceable_blocks_dynamic_query do
-    case Application.get_env(:indexer, :trace_block_ranges) do
-      nil ->
-        min_block = Application.get_env(:indexer, :trace_first_block)
-        max_block = Application.get_env(:indexer, :trace_last_block)
+    if RangesHelper.trace_ranges_present?() do
+      block_ranges = RangesHelper.get_trace_block_ranges()
 
-        filter_by_min_dynamic = dynamic([block], block.number > ^min_block)
-
-        if max_block,
-          do: dynamic([block], ^filter_by_min_dynamic and block.number < ^max_block),
-          else: filter_by_min_dynamic
-
-      block_ranges ->
-        parsed_ranges = RangesHelper.parse_block_ranges(block_ranges)
-
-        Enum.reduce(parsed_ranges, dynamic([_], false), fn
-          _from.._to = range, acc -> dynamic([block], ^acc or block.number in ^range)
-          num_to_latest, acc -> dynamic([block], ^acc or block.number >= ^num_to_latest)
-        end)
+      Enum.reduce(block_ranges, dynamic([_], false), fn
+        _from.._to = range, acc -> dynamic([block], ^acc or block.number in ^range)
+        num_to_latest, acc -> dynamic([block], ^acc or block.number >= ^num_to_latest)
+      end)
+    else
+      dynamic([_], true)
     end
   end
 end
diff --git a/config/runtime.exs b/config/runtime.exs
index e8fec294afbf..f876325abb5b 100644
--- a/config/runtime.exs
+++ b/config/runtime.exs
@@ -459,15 +459,24 @@ config :explorer, Explorer.MicroserviceInterfaces.BENS,
 ### Indexer ###
 ###############
 
+trace_first_block = ConfigHelper.parse_integer_env_var("TRACE_FIRST_BLOCK", 0)
+trace_last_block = ConfigHelper.parse_integer_or_nil_env_var("TRACE_LAST_BLOCK")
+
+trace_block_ranges =
+  case ConfigHelper.safe_get_env("TRACE_BLOCK_RANGES", nil) do
+    "" -> "#{trace_first_block}..#{trace_last_block || "latest"}"
+    ranges -> ranges
+  end
+
 config :indexer,
   block_transformer: ConfigHelper.block_transformer(),
   metadata_updater_milliseconds_interval: ConfigHelper.parse_time_env_var("TOKEN_METADATA_UPDATE_INTERVAL", "48h"),
   block_ranges: System.get_env("BLOCK_RANGES"),
   first_block: ConfigHelper.parse_integer_env_var("FIRST_BLOCK", 0),
   last_block: ConfigHelper.parse_integer_or_nil_env_var("LAST_BLOCK"),
-  trace_block_ranges: System.get_env("TRACE_BLOCK_RANGES"),
-  trace_first_block: ConfigHelper.parse_integer_env_var("TRACE_FIRST_BLOCK", 0),
-  trace_last_block: ConfigHelper.parse_integer_or_nil_env_var("TRACE_LAST_BLOCK"),
+  trace_block_ranges: trace_block_ranges,
+  trace_first_block: trace_first_block,
+  trace_last_block: trace_last_block,
   fetch_rewards_way: System.get_env("FETCH_REWARDS_WAY", "trace_block"),
   memory_limit: ConfigHelper.indexer_memory_limit(),
   receipts_batch_size: ConfigHelper.parse_integer_env_var("INDEXER_RECEIPTS_BATCH_SIZE", 250),

From dcf423b673a4d3f44d335df2e00bfd1e636c1b14 Mon Sep 17 00:00:00 2001
From: Viktor Baranov <baranov.viktor.27@gmail.com>
Date: Fri, 22 Dec 2023 16:15:32 +0300
Subject: [PATCH 801/909] Add banner about new UI

---
 .../lib/block_scout_web/templates/layout/app.html.eex          | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/apps/block_scout_web/lib/block_scout_web/templates/layout/app.html.eex b/apps/block_scout_web/lib/block_scout_web/templates/layout/app.html.eex
index d07b77ca9e14..34ceb918738a 100644
--- a/apps/block_scout_web/lib/block_scout_web/templates/layout/app.html.eex
+++ b/apps/block_scout_web/lib/block_scout_web/templates/layout/app.html.eex
@@ -69,6 +69,9 @@
       <input id="js-re-captcha-disabled" class="d-none" value="<%= Application.get_env(:block_scout_web, :recaptcha)[:is_disabled] %>" />
       <input id="js-network-path" class="d-none" value="<%= Application.get_env(:block_scout_web, BlockScoutWeb.Endpoint)[:url][:path] %>" />
       <!-- -->
+      <div class="alert alert-warning text-center mb-0 p-3">
+          <%= raw("The new Blockscout UI is now open source! Learn how to <a href='https://docs.blockscout.com/for-developers/deployment/frontend-migration' target='_blank'>deploy it here</a>") %>
+      </div>
       <% show_maintenance_alert = Application.get_env(:block_scout_web, BlockScoutWeb.Chain)[:show_maintenance_alert] %>
       <%= if show_maintenance_alert do %>
         <div class="alert alert-warning text-center mb-0 p-3">

From f2a2b2cc8ef4f42a47f22a1747984a08fdbc5619 Mon Sep 17 00:00:00 2001
From: Viktor Baranov <baranov.viktor.27@gmail.com>
Date: Fri, 22 Dec 2023 16:20:55 +0300
Subject: [PATCH 802/909] Fix gettext

---
 apps/block_scout_web/priv/gettext/default.pot          | 10 +++++-----
 .../priv/gettext/en/LC_MESSAGES/default.po             | 10 +++++-----
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/apps/block_scout_web/priv/gettext/default.pot b/apps/block_scout_web/priv/gettext/default.pot
index 38cc6f9a2ee5..096df745c2b0 100644
--- a/apps/block_scout_web/priv/gettext/default.pot
+++ b/apps/block_scout_web/priv/gettext/default.pot
@@ -86,7 +86,7 @@ msgstr ""
 msgid ") may be added for each contract. Click the Add Library button to add an additional one."
 msgstr ""
 
-#: lib/block_scout_web/templates/layout/app.html.eex:90
+#: lib/block_scout_web/templates/layout/app.html.eex:93
 #, elixir-autogen, elixir-format
 msgid "- We're indexing this chain right now. Some of the counts may be inaccurate."
 msgstr ""
@@ -122,7 +122,7 @@ msgstr ""
 msgid "A block producer who successfully included the block onto the blockchain."
 msgstr ""
 
-#: lib/block_scout_web/templates/layout/app.html.eex:97
+#: lib/block_scout_web/templates/layout/app.html.eex:100
 #, elixir-autogen, elixir-format
 msgid "A confirmation email was sent to"
 msgstr ""
@@ -2082,7 +2082,7 @@ msgid "Play"
 msgstr ""
 
 #: lib/block_scout_web/templates/layout/_account_menu_item.html.eex:22
-#: lib/block_scout_web/templates/layout/app.html.eex:97
+#: lib/block_scout_web/templates/layout/app.html.eex:100
 #, elixir-autogen, elixir-format
 msgid "Please confirm your email address to use the My Account feature."
 msgstr ""
@@ -2262,7 +2262,7 @@ msgstr ""
 msgid "Request to edit a public tag/label"
 msgstr ""
 
-#: lib/block_scout_web/templates/layout/app.html.eex:97
+#: lib/block_scout_web/templates/layout/app.html.eex:100
 #, elixir-autogen, elixir-format
 msgid "Resend verification email"
 msgstr ""
@@ -3598,7 +3598,7 @@ msgstr ""
 msgid "of"
 msgstr ""
 
-#: lib/block_scout_web/templates/layout/app.html.eex:97
+#: lib/block_scout_web/templates/layout/app.html.eex:100
 #, elixir-autogen, elixir-format
 msgid "on sign up. Didn’t receive?"
 msgstr ""
diff --git a/apps/block_scout_web/priv/gettext/en/LC_MESSAGES/default.po b/apps/block_scout_web/priv/gettext/en/LC_MESSAGES/default.po
index dbd9a598a406..ef9ebe1481ae 100644
--- a/apps/block_scout_web/priv/gettext/en/LC_MESSAGES/default.po
+++ b/apps/block_scout_web/priv/gettext/en/LC_MESSAGES/default.po
@@ -86,7 +86,7 @@ msgstr ""
 msgid ") may be added for each contract. Click the Add Library button to add an additional one."
 msgstr ""
 
-#: lib/block_scout_web/templates/layout/app.html.eex:90
+#: lib/block_scout_web/templates/layout/app.html.eex:93
 #, elixir-autogen, elixir-format
 msgid "- We're indexing this chain right now. Some of the counts may be inaccurate."
 msgstr ""
@@ -122,7 +122,7 @@ msgstr ""
 msgid "A block producer who successfully included the block onto the blockchain."
 msgstr ""
 
-#: lib/block_scout_web/templates/layout/app.html.eex:97
+#: lib/block_scout_web/templates/layout/app.html.eex:100
 #, elixir-autogen, elixir-format
 msgid "A confirmation email was sent to"
 msgstr ""
@@ -2082,7 +2082,7 @@ msgid "Play"
 msgstr ""
 
 #: lib/block_scout_web/templates/layout/_account_menu_item.html.eex:22
-#: lib/block_scout_web/templates/layout/app.html.eex:97
+#: lib/block_scout_web/templates/layout/app.html.eex:100
 #, elixir-autogen, elixir-format
 msgid "Please confirm your email address to use the My Account feature."
 msgstr ""
@@ -2262,7 +2262,7 @@ msgstr ""
 msgid "Request to edit a public tag/label"
 msgstr ""
 
-#: lib/block_scout_web/templates/layout/app.html.eex:97
+#: lib/block_scout_web/templates/layout/app.html.eex:100
 #, elixir-autogen, elixir-format
 msgid "Resend verification email"
 msgstr ""
@@ -3598,7 +3598,7 @@ msgstr ""
 msgid "of"
 msgstr ""
 
-#: lib/block_scout_web/templates/layout/app.html.eex:97
+#: lib/block_scout_web/templates/layout/app.html.eex:100
 #, elixir-autogen, elixir-format
 msgid "on sign up. Didn’t receive?"
 msgstr ""

From 86d1219892c0c3673979e79257f916149fabee65 Mon Sep 17 00:00:00 2001
From: Nikita Pozdniakov <nikitosing4@mail.ru>
Date: Sun, 17 Dec 2023 21:33:17 +0300
Subject: [PATCH 803/909] Optimize NFT owner preload

---
 CHANGELOG.md                                  |  1 +
 .../controllers/api/v2/token_controller.ex    | 10 +++-
 .../tokens/inventory_controller.ex            |  1 +
 .../views/api/v2/address_view.ex              | 10 ++--
 .../views/api/v2/token_view.ex                | 35 ++------------
 apps/explorer/lib/explorer/chain.ex           | 25 +++++++---
 .../lib/explorer/chain/token/instance.ex      | 48 ++++++++++++++-----
 apps/explorer/test/explorer/chain_test.exs    |  2 +-
 8 files changed, 75 insertions(+), 57 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 10253eb27289..ca4cc68e89c1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,6 +13,7 @@
 ### Fixes
 
 - [#9039](https://github.com/blockscout/blockscout/pull/9039) - Fix tx input decoding in tx summary microservice request
+- [#9015](https://github.com/blockscout/blockscout/pull/9015) - Optimize NFT owner preload
 - [#9013](https://github.com/blockscout/blockscout/pull/9013) - Speed up `Indexer.Fetcher.TokenInstance.LegacySanitize`
 - [#8969](https://github.com/blockscout/blockscout/pull/8969) - Support legacy paging options for address transaction endpoint
 - [#8965](https://github.com/blockscout/blockscout/pull/8965) - Set poll: false for internal transactions fetcher
diff --git a/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/token_controller.ex b/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/token_controller.ex
index c9640e73722a..2e18b6649ec2 100644
--- a/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/token_controller.ex
+++ b/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/token_controller.ex
@@ -141,6 +141,7 @@ defmodule BlockScoutWeb.API.V2.TokenController do
       results_plus_one =
         Chain.address_to_unique_tokens(
           token.contract_address_hash,
+          token,
           Keyword.merge(unique_tokens_paging_options(params), @api_true)
         )
 
@@ -163,8 +164,13 @@ defmodule BlockScoutWeb.API.V2.TokenController do
          {:format, {token_id, ""}} <- {:format, Integer.parse(token_id_str)} do
       token_instance =
         case Chain.erc721_or_erc1155_token_instance_from_token_id_and_token_address(token_id, address_hash, @api_true) do
-          {:ok, token_instance} -> token_instance |> Chain.put_owner_to_token_instance(@api_true)
-          {:error, :not_found} -> %{token_id: token_id, metadata: nil, owner: nil}
+          {:ok, token_instance} ->
+            token_instance
+            |> Chain.select_repo(@api_true).preload(:owner)
+            |> Chain.put_owner_to_token_instance(token, @api_true)
+
+          {:error, :not_found} ->
+            %{token_id: token_id, metadata: nil, owner: nil}
         end
 
       conn
diff --git a/apps/block_scout_web/lib/block_scout_web/controllers/tokens/inventory_controller.ex b/apps/block_scout_web/lib/block_scout_web/controllers/tokens/inventory_controller.ex
index 2d09db084535..1b7f2c5bb560 100644
--- a/apps/block_scout_web/lib/block_scout_web/controllers/tokens/inventory_controller.ex
+++ b/apps/block_scout_web/lib/block_scout_web/controllers/tokens/inventory_controller.ex
@@ -20,6 +20,7 @@ defmodule BlockScoutWeb.Tokens.InventoryController do
       unique_token_instances =
         Chain.address_to_unique_tokens(
           token.contract_address_hash,
+          token,
           unique_tokens_paging_options(params)
         )
 
diff --git a/apps/block_scout_web/lib/block_scout_web/views/api/v2/address_view.ex b/apps/block_scout_web/lib/block_scout_web/views/api/v2/address_view.ex
index bbfe0c077062..1b29a23d4b73 100644
--- a/apps/block_scout_web/lib/block_scout_web/views/api/v2/address_view.ex
+++ b/apps/block_scout_web/lib/block_scout_web/views/api/v2/address_view.ex
@@ -56,7 +56,7 @@ defmodule BlockScoutWeb.API.V2.AddressView do
   end
 
   def render("nft_list.json", %{token_instances: token_instances, token: token, next_page_params: next_page_params}) do
-    %{"items" => Enum.map(token_instances, &prepare_nft(&1, token, true)), "next_page_params" => next_page_params}
+    %{"items" => Enum.map(token_instances, &prepare_nft(&1, token)), "next_page_params" => next_page_params}
   end
 
   def render("nft_list.json", %{token_instances: token_instances, next_page_params: next_page_params}) do
@@ -185,13 +185,13 @@ defmodule BlockScoutWeb.API.V2.AddressView do
   end
 
   defp prepare_nft(nft) do
-    prepare_nft(nft, nft.token, false)
+    prepare_nft(nft, nft.token)
   end
 
-  defp prepare_nft(nft, token, need_uniqueness?) do
+  defp prepare_nft(nft, token) do
     Map.merge(
       %{"token_type" => token.type, "value" => value(token.type, nft)},
-      TokenView.prepare_token_instance(nft, token, need_uniqueness?)
+      TokenView.prepare_token_instance(nft, token)
     )
   end
 
@@ -209,7 +209,7 @@ defmodule BlockScoutWeb.API.V2.AddressView do
   defp prepare_nft_for_collection(token_type, instance) do
     Map.merge(
       %{"token_type" => token_type, "value" => value(token_type, instance)},
-      TokenView.prepare_token_instance(instance, nil, false)
+      TokenView.prepare_token_instance(instance, nil)
     )
   end
 
diff --git a/apps/block_scout_web/lib/block_scout_web/views/api/v2/token_view.ex b/apps/block_scout_web/lib/block_scout_web/views/api/v2/token_view.ex
index 681c5fa3418e..616299fde941 100644
--- a/apps/block_scout_web/lib/block_scout_web/views/api/v2/token_view.ex
+++ b/apps/block_scout_web/lib/block_scout_web/views/api/v2/token_view.ex
@@ -4,13 +4,9 @@ defmodule BlockScoutWeb.API.V2.TokenView do
   alias BlockScoutWeb.API.V2.Helper
   alias BlockScoutWeb.NFTHelper
   alias Ecto.Association.NotLoaded
-  alias Explorer.Chain
   alias Explorer.Chain.Address
-  alias Explorer.Chain.Address.CurrentTokenBalance
   alias Explorer.Chain.Token.Instance
 
-  @api_true [api?: true]
-
   def render("token.json", %{token: nil, contract_address_hash: contract_address_hash}) do
     %{
       "address" => Address.checksum(contract_address_hash),
@@ -90,18 +86,16 @@ defmodule BlockScoutWeb.API.V2.TokenView do
   @doc """
     Internal json rendering function
   """
-  def prepare_token_instance(instance, token, need_uniqueness_and_owner? \\ true) do
-    is_unique = is_unique?(need_uniqueness_and_owner?, instance, token)
-
+  def prepare_token_instance(instance, token) do
     %{
       "id" => instance.token_id,
       "metadata" => instance.metadata,
-      "owner" => token_instance_owner(is_unique, instance),
+      "owner" => token_instance_owner(instance.is_unique, instance),
       "token" => render("token.json", %{token: token}),
       "external_app_url" => NFTHelper.external_url(instance),
       "animation_url" => instance.metadata && NFTHelper.retrieve_image(instance.metadata["animation_url"]),
       "image_url" => instance.metadata && NFTHelper.get_media_src(instance.metadata, false),
-      "is_unique" => is_unique
+      "is_unique" => instance.is_unique
     }
   end
 
@@ -117,29 +111,6 @@ defmodule BlockScoutWeb.API.V2.TokenView do
   defp token_instance_owner(_is_unique, instance),
     do: instance.owner && Helper.address_with_info(nil, instance.owner, instance.owner.hash, false)
 
-  defp is_unique?(false, _instance, _token), do: nil
-
-  defp is_unique?(
-         not_ignore?,
-         %Instance{current_token_balance: %CurrentTokenBalance{value: %Decimal{} = value}} = instance,
-         token
-       ) do
-    if Decimal.compare(value, 1) == :gt do
-      false
-    else
-      is_unique?(not_ignore?, %Instance{instance | current_token_balance: nil}, token)
-    end
-  end
-
-  defp is_unique?(_not_ignore?, %Instance{current_token_balance: %CurrentTokenBalance{value: value}}, _token)
-       when value > 1,
-       do: false
-
-  defp is_unique?(_, instance, token),
-    do:
-      not (token.type == "ERC-1155") or
-        Chain.token_id_1155_is_unique?(token.contract_address_hash, instance.token_id, @api_true)
-
   defp prepare_holders_count(nil), do: nil
   defp prepare_holders_count(count) when count < 0, do: prepare_holders_count(0)
   defp prepare_holders_count(count), do: to_string(count)
diff --git a/apps/explorer/lib/explorer/chain.ex b/apps/explorer/lib/explorer/chain.ex
index 1accf987cb44..6f583f8229a3 100644
--- a/apps/explorer/lib/explorer/chain.ex
+++ b/apps/explorer/lib/explorer/chain.ex
@@ -4161,27 +4161,40 @@ defmodule Explorer.Chain do
     Repo.one!(query, timeout: :infinity)
   end
 
-  @spec address_to_unique_tokens(Hash.Address.t(), [paging_options | api?]) :: [Instance.t()]
-  def address_to_unique_tokens(contract_address_hash, options \\ []) do
+  @spec address_to_unique_tokens(Hash.Address.t(), Token.t(), [paging_options | api?]) :: [Instance.t()]
+  def address_to_unique_tokens(contract_address_hash, token, options \\ []) do
     paging_options = Keyword.get(options, :paging_options, @default_paging_options)
 
     contract_address_hash
     |> Instance.address_to_unique_token_instances()
     |> Instance.page_token_instance(paging_options)
     |> limit(^paging_options.page_size)
+    |> preload([_], [:owner])
     |> select_repo(options).all()
-    |> Enum.map(&put_owner_to_token_instance(&1, options))
+    |> Enum.map(&put_owner_to_token_instance(&1, token, options))
   end
 
-  def put_owner_to_token_instance(%Instance{} = token_instance, options \\ []) do
-    owner =
+  def put_owner_to_token_instance(token_instance, token, options \\ [])
+
+  def put_owner_to_token_instance(%Instance{is_unique: nil} = token_instance, token, options) do
+    put_owner_to_token_instance(Instance.put_is_unique(token_instance, token, options), token, options)
+  end
+
+  def put_owner_to_token_instance(
+        %Instance{owner: nil, is_unique: true} = token_instance,
+        %Token{type: "ERC-1155"},
+        options
+      ) do
+    owner_address_hash =
       token_instance
       |> Instance.owner_query()
       |> select_repo(options).one()
 
-    %{token_instance | owner: owner}
+    %{token_instance | owner: select_repo(options).get_by(Address, hash: owner_address_hash)}
   end
 
+  def put_owner_to_token_instance(%Instance{} = token_instance, _token, _options), do: token_instance
+
   @spec data() :: Dataloader.Ecto.t()
   def data, do: DataloaderEcto.new(Repo)
 
diff --git a/apps/explorer/lib/explorer/chain/token/instance.ex b/apps/explorer/lib/explorer/chain/token/instance.ex
index 161029f4cb88..d095fe3c35a0 100644
--- a/apps/explorer/lib/explorer/chain/token/instance.ex
+++ b/apps/explorer/lib/explorer/chain/token/instance.ex
@@ -6,7 +6,7 @@ defmodule Explorer.Chain.Token.Instance do
   use Explorer.Schema
 
   alias Explorer.{Chain, Helper}
-  alias Explorer.Chain.{Address, Block, Hash, Token, TokenTransfer}
+  alias Explorer.Chain.{Address, Block, Hash, Token}
   alias Explorer.Chain.Address.CurrentTokenBalance
   alias Explorer.Chain.Token.Instance
   alias Explorer.PagingOptions
@@ -26,7 +26,8 @@ defmodule Explorer.Chain.Token.Instance do
           owner_address_hash: Hash.Address.t(),
           owner_updated_at_block: Block.block_number(),
           owner_updated_at_log_index: non_neg_integer(),
-          current_token_balance: any()
+          current_token_balance: any(),
+          is_unique: bool() | nil
         }
 
   @primary_key false
@@ -37,6 +38,7 @@ defmodule Explorer.Chain.Token.Instance do
     field(:owner_updated_at_block, :integer)
     field(:owner_updated_at_log_index, :integer)
     field(:current_token_balance, :any, virtual: true)
+    field(:is_unique, :boolean, virtual: true)
 
     belongs_to(:owner, Address, foreign_key: :owner_address_hash, references: :hash, type: Hash.Address)
 
@@ -95,16 +97,13 @@ defmodule Explorer.Chain.Token.Instance do
   def page_token_instance(query, _), do: query
 
   def owner_query(%Instance{token_contract_address_hash: token_contract_address_hash, token_id: token_id}) do
-    from(
-      tt in TokenTransfer,
-      join: to_address in assoc(tt, :to_address),
-      where:
-        tt.token_contract_address_hash == ^token_contract_address_hash and
-          fragment("? @> ARRAY[?::decimal]", tt.token_ids, ^token_id),
-      order_by: [desc: tt.block_number],
-      limit: 1,
-      select: to_address
+    CurrentTokenBalance
+    |> where(
+      [ctb],
+      ctb.token_contract_address_hash == ^token_contract_address_hash and ctb.token_id == ^token_id and ctb.value > 0
     )
+    |> limit(1)
+    |> select([ctb], ctb.address_hash)
   end
 
   @spec token_instance_query(non_neg_integer(), Hash.Address.t()) :: Ecto.Query.t()
@@ -393,6 +392,7 @@ defmodule Explorer.Chain.Token.Instance do
     |> limit(^paging_options.page_size)
     |> page_token_instance(paging_options)
     |> Chain.select_repo(options).all()
+    |> Enum.map(&put_is_unique(&1, token, options))
   end
 
   def token_instances_by_holder_address_hash(%Token{} = token, holder_address_hash, options) do
@@ -412,6 +412,7 @@ defmodule Explorer.Chain.Token.Instance do
     |> page_token_instance(paging_options)
     |> select_merge([ctb: ctb], %{current_token_balance: ctb})
     |> Chain.select_repo(options).all()
+    |> Enum.map(&put_is_unique(&1, token, options))
   end
 
   @doc """
@@ -441,4 +442,29 @@ defmodule Explorer.Chain.Token.Instance do
     })
     |> limit(^limit)
   end
+
+  def put_is_unique(instance, token, options) do
+    %__MODULE__{instance | is_unique: is_unique?(instance, token, options)}
+  end
+
+  defp is_unique?(
+         %Instance{current_token_balance: %CurrentTokenBalance{value: %Decimal{} = value}} = instance,
+         token,
+         options
+       ) do
+    if Decimal.compare(value, 1) == :gt do
+      false
+    else
+      is_unique?(%Instance{instance | current_token_balance: nil}, token, options)
+    end
+  end
+
+  defp is_unique?(%Instance{current_token_balance: %CurrentTokenBalance{value: value}}, _token, _options)
+       when value > 1,
+       do: false
+
+  defp is_unique?(instance, token, options),
+    do:
+      not (token.type == "ERC-1155") or
+        Chain.token_id_1155_is_unique?(token.contract_address_hash, instance.token_id, options)
 end
diff --git a/apps/explorer/test/explorer/chain_test.exs b/apps/explorer/test/explorer/chain_test.exs
index 39214cfe9132..5d8757488e7b 100644
--- a/apps/explorer/test/explorer/chain_test.exs
+++ b/apps/explorer/test/explorer/chain_test.exs
@@ -4356,7 +4356,7 @@ defmodule Explorer.ChainTest do
 
       unique_tokens_ids_paginated =
         token_contract_address.hash
-        |> Chain.address_to_unique_tokens(paging_options: paging_options)
+        |> Chain.address_to_unique_tokens(token, paging_options: paging_options)
         |> Enum.map(& &1.token_id)
 
       assert unique_tokens_ids_paginated == [List.first(second_page.token_ids)]

From dbcdd7fafabc6df692b5d951f7c94c68b80929db Mon Sep 17 00:00:00 2001
From: Nikita Pozdniakov <nikitosing4@mail.ru>
Date: Fri, 22 Dec 2023 16:32:52 +0300
Subject: [PATCH 804/909] Fix tests

---
 .../controllers/api/v2/token_controller_test.exs                | 2 +-
 apps/explorer/lib/explorer/chain/token/instance.ex              | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/block_scout_web/test/block_scout_web/controllers/api/v2/token_controller_test.exs b/apps/block_scout_web/test/block_scout_web/controllers/api/v2/token_controller_test.exs
index aa1a313ecfda..daefeaa8cb85 100644
--- a/apps/block_scout_web/test/block_scout_web/controllers/api/v2/token_controller_test.exs
+++ b/apps/block_scout_web/test/block_scout_web/controllers/api/v2/token_controller_test.exs
@@ -1008,7 +1008,7 @@ defmodule BlockScoutWeb.API.V2.TokenControllerTest do
 
       assert data = json_response(request, 200)
       assert compare_item(instance, data)
-      assert compare_item(transfer.to_address, data["owner"])
+      assert Address.checksum(instance.owner_address_hash) == data["owner"]["hash"]
     end
   end
 
diff --git a/apps/explorer/lib/explorer/chain/token/instance.ex b/apps/explorer/lib/explorer/chain/token/instance.ex
index d095fe3c35a0..43249f7c722b 100644
--- a/apps/explorer/lib/explorer/chain/token/instance.ex
+++ b/apps/explorer/lib/explorer/chain/token/instance.ex
@@ -6,7 +6,7 @@ defmodule Explorer.Chain.Token.Instance do
   use Explorer.Schema
 
   alias Explorer.{Chain, Helper}
-  alias Explorer.Chain.{Address, Block, Hash, Token}
+  alias Explorer.Chain.{Address, Block, Hash, Token, TokenTransfer}
   alias Explorer.Chain.Address.CurrentTokenBalance
   alias Explorer.Chain.Token.Instance
   alias Explorer.PagingOptions

From 8fe53d8430934d211982823aea67aa50b8c0651e Mon Sep 17 00:00:00 2001
From: Nikita Pozdniakov <nikitosing4@mail.ru>
Date: Wed, 20 Dec 2023 15:58:59 +0300
Subject: [PATCH 805/909] Handle Postgrex errors on NFT import

---
 CHANGELOG.md                                  |  1 +
 apps/explorer/lib/explorer/chain.ex           |  8 ----
 .../indexer/fetcher/token_instance/helper.ex  | 45 ++++++++++++++-----
 .../token_instance/metadata_retriever.ex      | 20 ++++-----
 4 files changed, 44 insertions(+), 30 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ca4cc68e89c1..b69323d3c3c8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,6 +13,7 @@
 ### Fixes
 
 - [#9039](https://github.com/blockscout/blockscout/pull/9039) - Fix tx input decoding in tx summary microservice request
+- [#9035](https://github.com/blockscout/blockscout/pull/9035) - Handle Postgrex errors on NFT import 
 - [#9015](https://github.com/blockscout/blockscout/pull/9015) - Optimize NFT owner preload
 - [#9013](https://github.com/blockscout/blockscout/pull/9013) - Speed up `Indexer.Fetcher.TokenInstance.LegacySanitize`
 - [#8969](https://github.com/blockscout/blockscout/pull/8969) - Support legacy paging options for address transaction endpoint
diff --git a/apps/explorer/lib/explorer/chain.ex b/apps/explorer/lib/explorer/chain.ex
index 6f583f8229a3..12099101d5a2 100644
--- a/apps/explorer/lib/explorer/chain.ex
+++ b/apps/explorer/lib/explorer/chain.ex
@@ -3796,14 +3796,6 @@ defmodule Explorer.Chain do
     )
   end
 
-  @doc """
-    Inserts list of token instances via upsert_token_instance/1.
-  """
-  @spec upsert_token_instances_list([map()]) :: list()
-  def upsert_token_instances_list(instances) do
-    Enum.map(instances, &upsert_token_instance/1)
-  end
-
   @doc """
   Update a new `t:Token.t/0` record.
 
diff --git a/apps/indexer/lib/indexer/fetcher/token_instance/helper.ex b/apps/indexer/lib/indexer/fetcher/token_instance/helper.ex
index e5e2256ff9eb..792f92c85ada 100644
--- a/apps/indexer/lib/indexer/fetcher/token_instance/helper.ex
+++ b/apps/indexer/lib/indexer/fetcher/token_instance/helper.ex
@@ -6,6 +6,8 @@ defmodule Indexer.Fetcher.TokenInstance.Helper do
   alias Explorer.SmartContract.Reader
   alias Indexer.Fetcher.TokenInstance.MetadataRetriever
 
+  require Logger
+
   @cryptokitties_address_hash "0x06012c8cf97bead5deae237070f9587f8e7a266d"
 
   @token_uri "c87b56dd"
@@ -107,19 +109,21 @@ defmodule Indexer.Fetcher.TokenInstance.Helper do
     |> Task.yield_many(:infinity)
     |> Enum.zip(contract_results)
     |> Enum.map(fn {{_task, res}, {_result, _normalized_token_id, contract_address_hash, token_id}} ->
-      case res do
-        {:ok, result} ->
-          result_to_insert_params(result, contract_address_hash, token_id)
-
-        {:exit, reason} ->
-          result_to_insert_params(
-            {:error, MetadataRetriever.truncate_error("Terminated:" <> inspect(reason))},
-            contract_address_hash,
-            token_id
-          )
-      end
+      insert_params =
+        case res do
+          {:ok, result} ->
+            result_to_insert_params(result, contract_address_hash, token_id)
+
+          {:exit, reason} ->
+            result_to_insert_params(
+              {:error, MetadataRetriever.truncate_error("Terminated:" <> inspect(reason))},
+              contract_address_hash,
+              token_id
+            )
+        end
+
+      upsert_with_rescue(insert_params, token_id, contract_address_hash)
     end)
-    |> Chain.upsert_token_instances_list()
   end
 
   defp prepare_token_id(%Decimal{} = token_id), do: Decimal.to_integer(token_id)
@@ -170,4 +174,21 @@ defmodule Indexer.Fetcher.TokenInstance.Helper do
       error: error
     }
   end
+
+  defp upsert_with_rescue(insert_params, token_id, token_contract_address_hash, retrying? \\ false) do
+    Chain.upsert_token_instance(insert_params)
+  rescue
+    error in Postgrex.Error ->
+      if retrying? do
+        Logger.warn(["Failed to upsert token instance: #{inspect(error)}"], fetcher: :token_instances)
+        nil
+      else
+        token_id
+        |> token_instance_map_with_error(
+          token_contract_address_hash,
+          MetadataRetriever.truncate_error(inspect(error.postgres.code))
+        )
+        |> upsert_with_rescue(token_id, token_contract_address_hash, true)
+      end
+  end
 end
diff --git a/apps/indexer/lib/indexer/fetcher/token_instance/metadata_retriever.ex b/apps/indexer/lib/indexer/fetcher/token_instance/metadata_retriever.ex
index 191d81a15d4e..a4812fb332a5 100644
--- a/apps/indexer/lib/indexer/fetcher/token_instance/metadata_retriever.ex
+++ b/apps/indexer/lib/indexer/fetcher/token_instance/metadata_retriever.ex
@@ -53,7 +53,7 @@ defmodule Indexer.Fetcher.TokenInstance.MetadataRetriever do
     if error =~ "execution reverted" or error =~ @vm_execution_error do
       {:error, @vm_execution_error}
     else
-      Logger.debug(["Unknown metadata format error #{inspect(error)}."], fetcher: :token_instances)
+      Logger.warn(["Unknown metadata format error #{inspect(error)}."], fetcher: :token_instances)
 
       # truncate error since it will be stored in DB
       {:error, truncate_error(error)}
@@ -65,7 +65,7 @@ defmodule Indexer.Fetcher.TokenInstance.MetadataRetriever do
     if String.length(result) == 46 do
       fetch_json_from_uri({:ok, [ipfs_link() <> result]}, hex_token_id)
     else
-      Logger.debug(["Unknown metadata format result #{inspect(result)}."], fetcher: :token_instances)
+      Logger.warn(["Unknown metadata format result #{inspect(result)}."], fetcher: :token_instances)
 
       {:error, truncate_error(result)}
     end
@@ -90,7 +90,7 @@ defmodule Indexer.Fetcher.TokenInstance.MetadataRetriever do
     fetch_json_from_uri({:ok, [decoded_json]}, hex_token_id)
   rescue
     e ->
-      Logger.debug(["Unknown metadata format #{inspect(json)}.", Exception.format(:error, e, __STACKTRACE__)],
+      Logger.warn(["Unknown metadata format #{inspect(json)}.", Exception.format(:error, e, __STACKTRACE__)],
         fetcher: :token_instances
       )
 
@@ -107,7 +107,7 @@ defmodule Indexer.Fetcher.TokenInstance.MetadataRetriever do
     end
   rescue
     e ->
-      Logger.debug(
+      Logger.warn(
         [
           "Unknown metadata format base64 #{inspect(base64_encoded_json)}.",
           Exception.format(:error, e, __STACKTRACE__)
@@ -136,7 +136,7 @@ defmodule Indexer.Fetcher.TokenInstance.MetadataRetriever do
     check_type(json, hex_token_id)
   rescue
     e ->
-      Logger.debug(["Unknown metadata format #{inspect(json)}.", Exception.format(:error, e, __STACKTRACE__)],
+      Logger.warn(["Unknown metadata format #{inspect(json)}.", Exception.format(:error, e, __STACKTRACE__)],
         fetcher: :token_instances
       )
 
@@ -144,7 +144,7 @@ defmodule Indexer.Fetcher.TokenInstance.MetadataRetriever do
   end
 
   defp fetch_json_from_uri(uri, _hex_token_id) do
-    Logger.debug(["Unknown metadata uri format #{inspect(uri)}."], fetcher: :token_instances)
+    Logger.warn(["Unknown metadata uri format #{inspect(uri)}."], fetcher: :token_instances)
 
     {:error, "unknown metadata uri format"}
   end
@@ -159,7 +159,7 @@ defmodule Indexer.Fetcher.TokenInstance.MetadataRetriever do
     fetch_metadata_from_uri(prepared_uri, hex_token_id)
   rescue
     e ->
-      Logger.debug(
+      Logger.warn(
         ["Could not prepare token uri #{inspect(uri)}.", Exception.format(:error, e, __STACKTRACE__)],
         fetcher: :token_instances
       )
@@ -189,7 +189,7 @@ defmodule Indexer.Fetcher.TokenInstance.MetadataRetriever do
         check_content_type(content_type, uri, hex_token_id, body)
 
       {:ok, %Response{body: body, status_code: code}} ->
-        Logger.debug(
+        Logger.warn(
           ["Request to token uri: #{inspect(uri)} failed with code #{code}. Body:", inspect(body)],
           fetcher: :token_instances
         )
@@ -197,7 +197,7 @@ defmodule Indexer.Fetcher.TokenInstance.MetadataRetriever do
         {:error_code, code}
 
       {:error, %Error{reason: reason}} ->
-        Logger.debug(
+        Logger.warn(
           ["Request to token uri failed: #{inspect(uri)}.", inspect(reason)],
           fetcher: :token_instances
         )
@@ -206,7 +206,7 @@ defmodule Indexer.Fetcher.TokenInstance.MetadataRetriever do
     end
   rescue
     e ->
-      Logger.debug(
+      Logger.warn(
         ["Could not send request to token uri #{inspect(uri)}.", Exception.format(:error, e, __STACKTRACE__)],
         fetcher: :token_instances
       )

From 23b2805f03fa00124ab1c9b521c6ac5fd6a87098 Mon Sep 17 00:00:00 2001
From: Qwerty5Uiop <alex000010@bk.ru>
Date: Fri, 22 Dec 2023 19:18:14 +0600
Subject: [PATCH 806/909] Clear cache in GA

---
 .github/workflows/config.yml                  | 26 +++++++++----------
 .../lib/indexer/fetcher/block_reward.ex       |  2 +-
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/config.yml b/.github/workflows/config.yml
index 5efcd092a62e..77a769a2b684 100644
--- a/.github/workflows/config.yml
+++ b/.github/workflows/config.yml
@@ -72,7 +72,7 @@ jobs:
           path: |
             deps
             _build
-          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_30-${{ hashFiles('mix.lock') }}
+          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_32-${{ hashFiles('mix.lock') }}
           restore-keys: |
             ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-
 
@@ -130,7 +130,7 @@ jobs:
           path: |
             deps
             _build
-          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_30-${{ hashFiles('mix.lock') }}
+          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_32-${{ hashFiles('mix.lock') }}
           restore-keys: |
             ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-"
 
@@ -154,7 +154,7 @@ jobs:
           path: |
             deps
             _build
-          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_30-${{ hashFiles('mix.lock') }}
+          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_32-${{ hashFiles('mix.lock') }}
           restore-keys: |
             ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-"
 
@@ -183,7 +183,7 @@ jobs:
           path: |
             deps
             _build
-          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_30-${{ hashFiles('mix.lock') }}
+          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_32-${{ hashFiles('mix.lock') }}
           restore-keys: |
             ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-"
 
@@ -227,7 +227,7 @@ jobs:
           path: |
             deps
             _build
-          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_30-${{ hashFiles('mix.lock') }}
+          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_32-${{ hashFiles('mix.lock') }}
           restore-keys: |
             ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-"
 
@@ -253,7 +253,7 @@ jobs:
           path: |
             deps
             _build
-          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_30-${{ hashFiles('mix.lock') }}
+          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_32-${{ hashFiles('mix.lock') }}
           restore-keys: |
             ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-"
 
@@ -282,7 +282,7 @@ jobs:
           path: |
             deps
             _build
-          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_30-${{ hashFiles('mix.lock') }}
+          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_32-${{ hashFiles('mix.lock') }}
           restore-keys: |
             ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-"
 
@@ -330,7 +330,7 @@ jobs:
           path: |
             deps
             _build
-          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_30-${{ hashFiles('mix.lock') }}
+          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_32-${{ hashFiles('mix.lock') }}
           restore-keys: |
             ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-"
 
@@ -376,7 +376,7 @@ jobs:
           path: |
             deps
             _build
-          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_30-${{ hashFiles('mix.lock') }}
+          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_32-${{ hashFiles('mix.lock') }}
           restore-keys: |
             ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-"
 
@@ -438,7 +438,7 @@ jobs:
           path: |
             deps
             _build
-          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_30-${{ hashFiles('mix.lock') }}
+          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_32-${{ hashFiles('mix.lock') }}
           restore-keys: |
             ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-"
 
@@ -498,7 +498,7 @@ jobs:
           path: |
             deps
             _build
-          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_30-${{ hashFiles('mix.lock') }}
+          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_32-${{ hashFiles('mix.lock') }}
           restore-keys: |
             ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-"
 
@@ -569,7 +569,7 @@ jobs:
           path: |
             deps
             _build
-          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_30-${{ hashFiles('mix.lock') }}
+          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_32-${{ hashFiles('mix.lock') }}
           restore-keys: |
             ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-"
 
@@ -637,7 +637,7 @@ jobs:
           path: |
             deps
             _build
-          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_30-${{ hashFiles('mix.lock') }}
+          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_32-${{ hashFiles('mix.lock') }}
           restore-keys: |
             ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-"
 
diff --git a/apps/indexer/lib/indexer/fetcher/block_reward.ex b/apps/indexer/lib/indexer/fetcher/block_reward.ex
index 78ba9ec9f3df..e179538b2ccf 100644
--- a/apps/indexer/lib/indexer/fetcher/block_reward.ex
+++ b/apps/indexer/lib/indexer/fetcher/block_reward.ex
@@ -21,7 +21,7 @@ defmodule Indexer.Fetcher.BlockReward do
   alias Indexer.{BufferedTask, Tracer}
   alias Indexer.Fetcher.BlockReward.Supervisor, as: BlockRewardSupervisor
   alias Indexer.Fetcher.CoinBalance
-  alias Indexer.Transform.{AddressCoinBalances, AddressCoinBalancesDaily, Addresses}
+  alias Indexer.Transform.{AddressCoinBalances, Addresses}
 
   @behaviour BufferedTask
 

From 2b5f7fd5adba4a8fe417f659a0a83462b788d728 Mon Sep 17 00:00:00 2001
From: Viktor Baranov <baranov.viktor.27@gmail.com>
Date: Fri, 22 Dec 2023 17:20:28 +0300
Subject: [PATCH 807/909] v5.4.0

---
 .github/ISSUE_TEMPLATE/bug_report.yml               |  2 +-
 .github/workflows/prerelease.yml                    |  2 +-
 .../workflows/publish-docker-image-every-push.yml   |  2 +-
 .github/workflows/publish-docker-image-for-core.yml |  2 +-
 .../publish-docker-image-for-eth-goerli.yml         |  2 +-
 .../publish-docker-image-for-eth-sepolia.yml        |  2 +-
 .github/workflows/publish-docker-image-for-eth.yml  |  2 +-
 .github/workflows/publish-docker-image-for-fuse.yml |  2 +-
 .../publish-docker-image-for-immutable.yml          |  2 +-
 .../publish-docker-image-for-l2-staging.yml         |  2 +-
 .../workflows/publish-docker-image-for-lukso.yml    |  2 +-
 .../workflows/publish-docker-image-for-optimism.yml |  2 +-
 .../publish-docker-image-for-polygon-edge.yml       |  2 +-
 .github/workflows/publish-docker-image-for-rsk.yml  |  2 +-
 .../publish-docker-image-for-stability.yml          |  2 +-
 .../workflows/publish-docker-image-for-suave.yml    |  2 +-
 .github/workflows/publish-docker-image-for-xdai.yml |  2 +-
 .../workflows/publish-docker-image-for-zkevm.yml    |  2 +-
 .../workflows/publish-docker-image-for-zksync.yml   |  2 +-
 .../publish-docker-image-staging-on-demand.yml      |  2 +-
 .github/workflows/release-additional.yml            |  2 +-
 .github/workflows/release.yml                       |  2 +-
 CHANGELOG.md                                        | 13 +++++++++++++
 apps/block_scout_web/mix.exs                        |  2 +-
 apps/ethereum_jsonrpc/mix.exs                       |  2 +-
 apps/explorer/mix.exs                               |  2 +-
 apps/indexer/mix.exs                                |  2 +-
 docker-compose/docker-compose.yml                   |  2 +-
 docker/Makefile                                     |  2 +-
 mix.exs                                             |  2 +-
 rel/config.exs                                      |  2 +-
 31 files changed, 43 insertions(+), 30 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
index 00b3285f4567..4f35712cae63 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -65,7 +65,7 @@ body:
     attributes:
       label: Backend version
       description: The release version of the backend or branch/commit.
-      placeholder: v5.3.3
+      placeholder: v5.4.0
     validations:
       required: true
 
diff --git a/.github/workflows/prerelease.yml b/.github/workflows/prerelease.yml
index d3f7579dc033..3f97613ee0d7 100644
--- a/.github/workflows/prerelease.yml
+++ b/.github/workflows/prerelease.yml
@@ -16,7 +16,7 @@ jobs:
     name: Push Docker image to Docker Hub
     runs-on: ubuntu-latest
     env:
-      RELEASE_VERSION: 5.3.3
+      RELEASE_VERSION: 5.4.0
     steps:
       - name: Check out the repo
         uses: actions/checkout@v4
diff --git a/.github/workflows/publish-docker-image-every-push.yml b/.github/workflows/publish-docker-image-every-push.yml
index bd66d1110256..10d2cfabc9ff 100644
--- a/.github/workflows/publish-docker-image-every-push.yml
+++ b/.github/workflows/publish-docker-image-every-push.yml
@@ -11,7 +11,7 @@ on:
 env:
   OTP_VERSION: '25.2.1'
   ELIXIR_VERSION: '1.14.5'
-  RELEASE_VERSION: 5.3.3
+  RELEASE_VERSION: 5.4.0
 
 jobs:
   push_to_registry:
diff --git a/.github/workflows/publish-docker-image-for-core.yml b/.github/workflows/publish-docker-image-for-core.yml
index 158e5c015154..0c76d126208f 100644
--- a/.github/workflows/publish-docker-image-for-core.yml
+++ b/.github/workflows/publish-docker-image-for-core.yml
@@ -15,7 +15,7 @@ jobs:
     name: Push Docker image to Docker Hub
     runs-on: ubuntu-latest
     env:
-      RELEASE_VERSION: 5.3.3
+      RELEASE_VERSION: 5.4.0
       DOCKER_CHAIN_NAME: poa
     steps:
       - name: Check out the repo
diff --git a/.github/workflows/publish-docker-image-for-eth-goerli.yml b/.github/workflows/publish-docker-image-for-eth-goerli.yml
index 20db375a476a..1911bbb35795 100644
--- a/.github/workflows/publish-docker-image-for-eth-goerli.yml
+++ b/.github/workflows/publish-docker-image-for-eth-goerli.yml
@@ -15,7 +15,7 @@ jobs:
     name: Push Docker image to Docker Hub
     runs-on: ubuntu-latest
     env:
-      RELEASE_VERSION: 5.3.3
+      RELEASE_VERSION: 5.4.0
       DOCKER_CHAIN_NAME: eth-goerli
     steps:
       - name: Check out the repo
diff --git a/.github/workflows/publish-docker-image-for-eth-sepolia.yml b/.github/workflows/publish-docker-image-for-eth-sepolia.yml
index d16b1fbc9d18..7c09456adcb7 100644
--- a/.github/workflows/publish-docker-image-for-eth-sepolia.yml
+++ b/.github/workflows/publish-docker-image-for-eth-sepolia.yml
@@ -15,7 +15,7 @@ jobs:
     name: Push Docker image to Docker Hub
     runs-on: ubuntu-latest
     env:
-      RELEASE_VERSION: 5.3.3
+      RELEASE_VERSION: 5.4.0
       DOCKER_CHAIN_NAME: eth-sepolia
     steps:
       - name: Check out the repo
diff --git a/.github/workflows/publish-docker-image-for-eth.yml b/.github/workflows/publish-docker-image-for-eth.yml
index 0fd3120c0517..f7a0ad5fd2a2 100644
--- a/.github/workflows/publish-docker-image-for-eth.yml
+++ b/.github/workflows/publish-docker-image-for-eth.yml
@@ -15,7 +15,7 @@ jobs:
     name: Push Docker image to Docker Hub
     runs-on: ubuntu-latest
     env:
-      RELEASE_VERSION: 5.3.3
+      RELEASE_VERSION: 5.4.0
       DOCKER_CHAIN_NAME: mainnet
     steps:
       - name: Check out the repo
diff --git a/.github/workflows/publish-docker-image-for-fuse.yml b/.github/workflows/publish-docker-image-for-fuse.yml
index fbd5fe81e212..286664969fb6 100644
--- a/.github/workflows/publish-docker-image-for-fuse.yml
+++ b/.github/workflows/publish-docker-image-for-fuse.yml
@@ -15,7 +15,7 @@ jobs:
     name: Push Docker image to Docker Hub
     runs-on: ubuntu-latest
     env:
-      RELEASE_VERSION: 5.3.3
+      RELEASE_VERSION: 5.4.0
       DOCKER_CHAIN_NAME: fuse
     steps:
       - name: Check out the repo
diff --git a/.github/workflows/publish-docker-image-for-immutable.yml b/.github/workflows/publish-docker-image-for-immutable.yml
index 2fbccdf55586..1c9e5cc85af0 100644
--- a/.github/workflows/publish-docker-image-for-immutable.yml
+++ b/.github/workflows/publish-docker-image-for-immutable.yml
@@ -15,7 +15,7 @@ jobs:
     name: Push Docker image to Docker Hub
     runs-on: ubuntu-latest
     env:
-      RELEASE_VERSION: 5.3.3
+      RELEASE_VERSION: 5.4.0
       DOCKER_CHAIN_NAME: immutable
     steps:
       - name: Check out the repo
diff --git a/.github/workflows/publish-docker-image-for-l2-staging.yml b/.github/workflows/publish-docker-image-for-l2-staging.yml
index 744d4f4694c3..637b880a2ba5 100644
--- a/.github/workflows/publish-docker-image-for-l2-staging.yml
+++ b/.github/workflows/publish-docker-image-for-l2-staging.yml
@@ -15,7 +15,7 @@ jobs:
     name: Push Docker image to Docker Hub
     runs-on: ubuntu-latest
     env:
-      RELEASE_VERSION: 5.3.3
+      RELEASE_VERSION: 5.4.0
       DOCKER_CHAIN_NAME: optimism-l2-advanced
     steps:
       - name: Check out the repo
diff --git a/.github/workflows/publish-docker-image-for-lukso.yml b/.github/workflows/publish-docker-image-for-lukso.yml
index a094176964b1..4cd324babd30 100644
--- a/.github/workflows/publish-docker-image-for-lukso.yml
+++ b/.github/workflows/publish-docker-image-for-lukso.yml
@@ -15,7 +15,7 @@ jobs:
     name: Push Docker image to Docker Hub
     runs-on: ubuntu-latest
     env:
-      RELEASE_VERSION: 5.3.3
+      RELEASE_VERSION: 5.4.0
       DOCKER_CHAIN_NAME: lukso
     steps:
       - name: Check out the repo
diff --git a/.github/workflows/publish-docker-image-for-optimism.yml b/.github/workflows/publish-docker-image-for-optimism.yml
index c53a1edf9c3a..320ed18ba421 100644
--- a/.github/workflows/publish-docker-image-for-optimism.yml
+++ b/.github/workflows/publish-docker-image-for-optimism.yml
@@ -15,7 +15,7 @@ jobs:
     name: Push Docker image to Docker Hub
     runs-on: ubuntu-latest
     env:
-      RELEASE_VERSION: 5.3.3
+      RELEASE_VERSION: 5.4.0
       DOCKER_CHAIN_NAME: optimism
     steps:
       - name: Check out the repo
diff --git a/.github/workflows/publish-docker-image-for-polygon-edge.yml b/.github/workflows/publish-docker-image-for-polygon-edge.yml
index c54555d97cf8..d2153e90725a 100644
--- a/.github/workflows/publish-docker-image-for-polygon-edge.yml
+++ b/.github/workflows/publish-docker-image-for-polygon-edge.yml
@@ -15,7 +15,7 @@ jobs:
     name: Push Docker image to Docker Hub
     runs-on: ubuntu-latest
     env:
-      RELEASE_VERSION: 5.3.3
+      RELEASE_VERSION: 5.4.0
       DOCKER_CHAIN_NAME: polygon-edge
     steps:
       - name: Check out the repo
diff --git a/.github/workflows/publish-docker-image-for-rsk.yml b/.github/workflows/publish-docker-image-for-rsk.yml
index 324494c9eee7..3f77608f0c3d 100644
--- a/.github/workflows/publish-docker-image-for-rsk.yml
+++ b/.github/workflows/publish-docker-image-for-rsk.yml
@@ -15,7 +15,7 @@ jobs:
     name: Push Docker image to Docker Hub
     runs-on: ubuntu-latest
     env:
-      RELEASE_VERSION: 5.3.3
+      RELEASE_VERSION: 5.4.0
       DOCKER_CHAIN_NAME: rsk
     steps:
       - name: Check out the repo
diff --git a/.github/workflows/publish-docker-image-for-stability.yml b/.github/workflows/publish-docker-image-for-stability.yml
index f6a4bedb37b8..b81cbc13344c 100644
--- a/.github/workflows/publish-docker-image-for-stability.yml
+++ b/.github/workflows/publish-docker-image-for-stability.yml
@@ -18,7 +18,7 @@ jobs:
     name: Push Docker image to Docker Hub
     runs-on: ubuntu-latest
     env:
-      RELEASE_VERSION: 5.3.3
+      RELEASE_VERSION: 5.4.0
       DOCKER_CHAIN_NAME: stability
     steps:
       - name: Check out the repo
diff --git a/.github/workflows/publish-docker-image-for-suave.yml b/.github/workflows/publish-docker-image-for-suave.yml
index 2e9b6fbd3ddc..8ba4ec4975ed 100644
--- a/.github/workflows/publish-docker-image-for-suave.yml
+++ b/.github/workflows/publish-docker-image-for-suave.yml
@@ -18,7 +18,7 @@ jobs:
     name: Push Docker image to Docker Hub
     runs-on: ubuntu-latest
     env:
-      RELEASE_VERSION: 5.3.3
+      RELEASE_VERSION: 5.4.0
       DOCKER_CHAIN_NAME: suave
     steps:
       - name: Check out the repo
diff --git a/.github/workflows/publish-docker-image-for-xdai.yml b/.github/workflows/publish-docker-image-for-xdai.yml
index 7a672e81fcef..7af9b838a315 100644
--- a/.github/workflows/publish-docker-image-for-xdai.yml
+++ b/.github/workflows/publish-docker-image-for-xdai.yml
@@ -15,7 +15,7 @@ jobs:
     name: Push Docker image to Docker Hub
     runs-on: ubuntu-latest
     env:
-      RELEASE_VERSION: 5.3.3
+      RELEASE_VERSION: 5.4.0
       DOCKER_CHAIN_NAME: xdai
     steps:
       - name: Check out the repo
diff --git a/.github/workflows/publish-docker-image-for-zkevm.yml b/.github/workflows/publish-docker-image-for-zkevm.yml
index b73fdcda97d4..603719db11aa 100644
--- a/.github/workflows/publish-docker-image-for-zkevm.yml
+++ b/.github/workflows/publish-docker-image-for-zkevm.yml
@@ -15,7 +15,7 @@ jobs:
     name: Push Docker image to Docker Hub
     runs-on: ubuntu-latest
     env:
-      RELEASE_VERSION: 5.3.3
+      RELEASE_VERSION: 5.4.0
       DOCKER_CHAIN_NAME: zkevm
     steps:
       - name: Check out the repo
diff --git a/.github/workflows/publish-docker-image-for-zksync.yml b/.github/workflows/publish-docker-image-for-zksync.yml
index 8a0490c88178..aa6317647923 100644
--- a/.github/workflows/publish-docker-image-for-zksync.yml
+++ b/.github/workflows/publish-docker-image-for-zksync.yml
@@ -15,7 +15,7 @@ jobs:
     name: Push Docker image to Docker Hub
     runs-on: ubuntu-latest
     env:
-      RELEASE_VERSION: 5.3.3
+      RELEASE_VERSION: 5.4.0
       DOCKER_CHAIN_NAME: zksync
     steps:
       - name: Check out the repo
diff --git a/.github/workflows/publish-docker-image-staging-on-demand.yml b/.github/workflows/publish-docker-image-staging-on-demand.yml
index 246a4876362a..e33a3ee7c37d 100644
--- a/.github/workflows/publish-docker-image-staging-on-demand.yml
+++ b/.github/workflows/publish-docker-image-staging-on-demand.yml
@@ -12,7 +12,7 @@ on:
 env:
   OTP_VERSION: '25.2.1'
   ELIXIR_VERSION: '1.14.5'
-  RELEASE_VERSION: 5.3.3
+  RELEASE_VERSION: 5.4.0
 
 jobs:
   push_to_registry:
diff --git a/.github/workflows/release-additional.yml b/.github/workflows/release-additional.yml
index 892a6b6ead38..36ff36c1aa79 100644
--- a/.github/workflows/release-additional.yml
+++ b/.github/workflows/release-additional.yml
@@ -18,7 +18,7 @@ jobs:
     name: Push Docker image to Docker Hub
     runs-on: ubuntu-latest
     env:
-      RELEASE_VERSION: 5.3.3
+      RELEASE_VERSION: 5.4.0
     steps:
       - name: Check out the repo
         uses: actions/checkout@v4
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 9a16fba81e7a..cd7599014882 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -18,7 +18,7 @@ jobs:
     name: Push Docker image to Docker Hub
     runs-on: ubuntu-latest
     env:
-      RELEASE_VERSION: 5.3.3
+      RELEASE_VERSION: 5.4.0
     steps:
       - name: Check out the repo
         uses: actions/checkout@v4
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 939456580af7..f5169a8eedba 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,19 @@
 
 ### Features
 
+### Fixes
+
+### Chore
+
+<details>
+  <summary>Dependencies version bumps</summary>
+
+</details>
+
+## 5.4.0-beta
+
+### Features
+
 - [#9018](https://github.com/blockscout/blockscout/pull/9018) - Add SmartContractRealtimeEventHandler
 - [#8997](https://github.com/blockscout/blockscout/pull/8997) - Isolate throttable error count by request method
 - [#8975](https://github.com/blockscout/blockscout/pull/8975) - Add EIP-4844 compatibility (not full support yet)
diff --git a/apps/block_scout_web/mix.exs b/apps/block_scout_web/mix.exs
index 18dd4fa02057..d155e0c572b8 100644
--- a/apps/block_scout_web/mix.exs
+++ b/apps/block_scout_web/mix.exs
@@ -23,7 +23,7 @@ defmodule BlockScoutWeb.Mixfile do
         dialyzer: :test
       ],
       start_permanent: Mix.env() == :prod,
-      version: "5.3.3",
+      version: "5.4.0",
       xref: [exclude: [Explorer.Chain.Zkevm.Reader]]
     ]
   end
diff --git a/apps/ethereum_jsonrpc/mix.exs b/apps/ethereum_jsonrpc/mix.exs
index 9445c500133a..1da7647be613 100644
--- a/apps/ethereum_jsonrpc/mix.exs
+++ b/apps/ethereum_jsonrpc/mix.exs
@@ -23,7 +23,7 @@ defmodule EthereumJsonrpc.MixProject do
         dialyzer: :test
       ],
       start_permanent: Mix.env() == :prod,
-      version: "5.3.3"
+      version: "5.4.0"
     ]
   end
 
diff --git a/apps/explorer/mix.exs b/apps/explorer/mix.exs
index 492b774aabcc..f24bc660c4a4 100644
--- a/apps/explorer/mix.exs
+++ b/apps/explorer/mix.exs
@@ -24,7 +24,7 @@ defmodule Explorer.Mixfile do
         dialyzer: :test
       ],
       start_permanent: Mix.env() == :prod,
-      version: "5.3.3",
+      version: "5.4.0",
       xref: [exclude: [BlockScoutWeb.WebRouter.Helpers]]
     ]
   end
diff --git a/apps/indexer/mix.exs b/apps/indexer/mix.exs
index fcb2d9513961..58b20d24aa4c 100644
--- a/apps/indexer/mix.exs
+++ b/apps/indexer/mix.exs
@@ -14,7 +14,7 @@ defmodule Indexer.MixProject do
       elixirc_paths: elixirc_paths(Mix.env()),
       lockfile: "../../mix.lock",
       start_permanent: Mix.env() == :prod,
-      version: "5.3.3"
+      version: "5.4.0"
     ]
   end
 
diff --git a/docker-compose/docker-compose.yml b/docker-compose/docker-compose.yml
index f700df419c25..2bbda2c94236 100644
--- a/docker-compose/docker-compose.yml
+++ b/docker-compose/docker-compose.yml
@@ -34,7 +34,7 @@ services:
         CACHE_TOTAL_GAS_USAGE_COUNTER_ENABLED: ""
         CACHE_ADDRESS_WITH_BALANCES_UPDATE_INTERVAL: ""
         ADMIN_PANEL_ENABLED: ""
-        RELEASE_VERSION: 5.3.3
+        RELEASE_VERSION: 5.4.0
     links:
       - db:database
     environment:
diff --git a/docker/Makefile b/docker/Makefile
index 6f3039ec69ea..09e923956423 100644
--- a/docker/Makefile
+++ b/docker/Makefile
@@ -10,7 +10,7 @@ STATS_CONTAINER_NAME := stats
 STATS_DB_CONTAINER_NAME := stats-postgres
 PROXY_CONTAINER_NAME := proxy
 PG_CONTAINER_NAME := postgres
-RELEASE_VERSION ?= '5.3.3'
+RELEASE_VERSION ?= '5.4.0'
 TAG := $(RELEASE_VERSION)-commit-$(shell git log -1 --pretty=format:"%h")
 STABLE_TAG := $(RELEASE_VERSION)
 
diff --git a/mix.exs b/mix.exs
index 61b159e2c407..f144b85ac3e7 100644
--- a/mix.exs
+++ b/mix.exs
@@ -7,7 +7,7 @@ defmodule BlockScout.Mixfile do
     [
       # app: :block_scout,
       # aliases: aliases(config_env()),
-      version: "5.3.3",
+      version: "5.4.0",
       apps_path: "apps",
       deps: deps(),
       dialyzer: dialyzer(),
diff --git a/rel/config.exs b/rel/config.exs
index 62745d29f472..aef4c2f2d18e 100644
--- a/rel/config.exs
+++ b/rel/config.exs
@@ -71,7 +71,7 @@ end
 # will be used by default
 
 release :blockscout do
-  set version: "5.3.3-beta"
+  set version: "5.4.0-beta"
   set applications: [
     :runtime_tools,
     block_scout_web: :permanent,

From f4bb4a4d2b1755cd974723491756aa14d741c524 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 25 Dec 2023 18:52:20 +0000
Subject: [PATCH 808/909] Bump benchee from 1.2.0 to 1.3.0

Bumps [benchee](https://github.com/bencheeorg/benchee) from 1.2.0 to 1.3.0.
- [Release notes](https://github.com/bencheeorg/benchee/releases)
- [Changelog](https://github.com/bencheeorg/benchee/blob/main/CHANGELOG.md)
- [Commits](https://github.com/bencheeorg/benchee/compare/1.2.0...1.3.0)

---
updated-dependencies:
- dependency-name: benchee
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 apps/explorer/mix.exs | 2 +-
 mix.lock              | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/explorer/mix.exs b/apps/explorer/mix.exs
index f24bc660c4a4..a4195751ef8d 100644
--- a/apps/explorer/mix.exs
+++ b/apps/explorer/mix.exs
@@ -61,7 +61,7 @@ defmodule Explorer.Mixfile do
       {:mime, "~> 2.0"},
       {:bcrypt_elixir, "~> 3.0"},
       # benchmark optimizations
-      {:benchee, "~> 1.2.0", only: :test},
+      {:benchee, "~> 1.3.0", only: :test},
       # CSV output for benchee
       {:benchee_csv, "~> 1.0.0", only: :test},
       {:bypass, "~> 2.1", only: :test},
diff --git a/mix.lock b/mix.lock
index e27ab0a3cf80..be7161e17e3d 100644
--- a/mix.lock
+++ b/mix.lock
@@ -6,7 +6,7 @@
   "accept": {:hex, :accept, "0.3.5", "b33b127abca7cc948bbe6caa4c263369abf1347cfa9d8e699c6d214660f10cd1", [:rebar3], [], "hexpm", "11b18c220bcc2eab63b5470c038ef10eb6783bcb1fcdb11aa4137defa5ac1bb8"},
   "bamboo": {:hex, :bamboo, "2.3.0", "d2392a2cabe91edf488553d3c70638b532e8db7b76b84b0a39e3dfe492ffd6fc", [:mix], [{:hackney, ">= 1.15.2", [hex: :hackney, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}, {:mime, "~> 1.4 or ~> 2.0", [hex: :mime, repo: "hexpm", optional: false]}, {:plug, "~> 1.0", [hex: :plug, repo: "hexpm", optional: false]}], "hexpm", "dd0037e68e108fd04d0e8773921512c940e35d981e097b5793543e3b2f9cd3f6"},
   "bcrypt_elixir": {:hex, :bcrypt_elixir, "3.1.0", "0b110a9a6c619b19a7f73fa3004aa11d6e719a67e672d1633dc36b6b2290a0f7", [:make, :mix], [{:comeonin, "~> 5.3", [hex: :comeonin, repo: "hexpm", optional: false]}, {:elixir_make, "~> 0.6", [hex: :elixir_make, repo: "hexpm", optional: false]}], "hexpm", "2ad2acb5a8bc049e8d5aa267802631912bb80d5f4110a178ae7999e69dca1bf7"},
-  "benchee": {:hex, :benchee, "1.2.0", "afd2f0caec06ce3a70d9c91c514c0b58114636db9d83c2dc6bfd416656618353", [:mix], [{:deep_merge, "~> 1.0", [hex: :deep_merge, repo: "hexpm", optional: false]}, {:statistex, "~> 1.0", [hex: :statistex, repo: "hexpm", optional: false]}, {:table, "~> 0.1.0", [hex: :table, repo: "hexpm", optional: true]}], "hexpm", "ee729e53217898b8fd30aaad3cce61973dab61574ae6f48229fe7ff42d5e4457"},
+  "benchee": {:hex, :benchee, "1.3.0", "f64e3b64ad3563fa9838146ddefb2d2f94cf5b473bdfd63f5ca4d0657bf96694", [:mix], [{:deep_merge, "~> 1.0", [hex: :deep_merge, repo: "hexpm", optional: false]}, {:statistex, "~> 1.0", [hex: :statistex, repo: "hexpm", optional: false]}, {:table, "~> 0.1.0", [hex: :table, repo: "hexpm", optional: true]}], "hexpm", "34f4294068c11b2bd2ebf2c59aac9c7da26ffa0068afdf3419f1b176e16c5f81"},
   "benchee_csv": {:hex, :benchee_csv, "1.0.0", "0b3b9223290bfcb8003552705bec9bcf1a89b4a83b70bd686e45295c264f3d16", [:mix], [{:benchee, ">= 0.99.0 and < 2.0.0", [hex: :benchee, repo: "hexpm", optional: false]}, {:csv, "~> 2.0", [hex: :csv, repo: "hexpm", optional: false]}], "hexpm", "cdefb804c021dcf7a99199492026584be9b5a21d6644ac0d01c81c5d97c520d5"},
   "briefly": {:git, "https://github.com/CargoSense/briefly.git", "51dfe7fbe0f897ea2a921d9af120762392aca6a1", []},
   "bunt": {:hex, :bunt, "0.2.1", "e2d4792f7bc0ced7583ab54922808919518d0e57ee162901a16a1b6664ef3b14", [:mix], [], "hexpm", "a330bfb4245239787b15005e66ae6845c9cd524a288f0d141c148b02603777a5"},

From 8b0f81bf99c1c24b4781b06fef1b09a86ac9216b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 25 Dec 2023 18:56:24 +0000
Subject: [PATCH 809/909] Bump redux from 5.0.0 to 5.0.1 in
 /apps/block_scout_web/assets

Bumps [redux](https://github.com/reduxjs/redux) from 5.0.0 to 5.0.1.
- [Release notes](https://github.com/reduxjs/redux/releases)
- [Changelog](https://github.com/reduxjs/redux/blob/master/CHANGELOG.md)
- [Commits](https://github.com/reduxjs/redux/compare/v5.0.0...v5.0.1)

---
updated-dependencies:
- dependency-name: redux
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 apps/block_scout_web/assets/package-lock.json | 14 +++++++-------
 apps/block_scout_web/assets/package.json      |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/apps/block_scout_web/assets/package-lock.json b/apps/block_scout_web/assets/package-lock.json
index 6185161016d4..be5cb099b4cd 100644
--- a/apps/block_scout_web/assets/package-lock.json
+++ b/apps/block_scout_web/assets/package-lock.json
@@ -58,7 +58,7 @@
         "pikaday": "^1.8.2",
         "popper.js": "^1.14.7",
         "reduce-reducers": "^1.0.4",
-        "redux": "^5.0.0",
+        "redux": "^5.0.1",
         "stream-browserify": "^3.0.0",
         "stream-http": "^3.1.1",
         "sweetalert2": "^11.10.1",
@@ -14801,9 +14801,9 @@
       "integrity": "sha512-Mb2WZ2bJF597exiqX7owBzrqJ74DHLK3yOQjCyPAaNifRncE8OD0wFIuoMhXxTnHK07+8zZ2SJEKy/qtiyR7vw=="
     },
     "node_modules/redux": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/redux/-/redux-5.0.0.tgz",
-      "integrity": "sha512-blLIYmYetpZMET6Q6uCY7Jtl/Im5OBldy+vNPauA8vvsdqyt66oep4EUpAMWNHauTC6xa9JuRPhRB72rY82QGA=="
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/redux/-/redux-5.0.1.tgz",
+      "integrity": "sha512-M9/ELqF6fy8FwmkpnF0S3YKOqMyoWJ4+CS5Efg2ct3oY9daQvd/Pc71FpGZsVsbl3Cpb+IIcjBDUnnyBdQbq4w=="
     },
     "node_modules/regenerate": {
       "version": "1.4.2",
@@ -28939,9 +28939,9 @@
       "integrity": "sha512-Mb2WZ2bJF597exiqX7owBzrqJ74DHLK3yOQjCyPAaNifRncE8OD0wFIuoMhXxTnHK07+8zZ2SJEKy/qtiyR7vw=="
     },
     "redux": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/redux/-/redux-5.0.0.tgz",
-      "integrity": "sha512-blLIYmYetpZMET6Q6uCY7Jtl/Im5OBldy+vNPauA8vvsdqyt66oep4EUpAMWNHauTC6xa9JuRPhRB72rY82QGA=="
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/redux/-/redux-5.0.1.tgz",
+      "integrity": "sha512-M9/ELqF6fy8FwmkpnF0S3YKOqMyoWJ4+CS5Efg2ct3oY9daQvd/Pc71FpGZsVsbl3Cpb+IIcjBDUnnyBdQbq4w=="
     },
     "regenerate": {
       "version": "1.4.2",
diff --git a/apps/block_scout_web/assets/package.json b/apps/block_scout_web/assets/package.json
index b71c98820dc8..f64c02d8f4ee 100644
--- a/apps/block_scout_web/assets/package.json
+++ b/apps/block_scout_web/assets/package.json
@@ -70,7 +70,7 @@
     "pikaday": "^1.8.2",
     "popper.js": "^1.14.7",
     "reduce-reducers": "^1.0.4",
-    "redux": "^5.0.0",
+    "redux": "^5.0.1",
     "stream-browserify": "^3.0.0",
     "stream-http": "^3.1.1",
     "sweetalert2": "^11.10.1",

From 5caad28029b4d5382d62fc829558da3ab03b787e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 25 Dec 2023 18:56:51 +0000
Subject: [PATCH 810/909] Bump @amplitude/analytics-browser in
 /apps/block_scout_web/assets

Bumps [@amplitude/analytics-browser](https://github.com/amplitude/Amplitude-TypeScript) from 2.3.7 to 2.3.8.
- [Release notes](https://github.com/amplitude/Amplitude-TypeScript/releases)
- [Commits](https://github.com/amplitude/Amplitude-TypeScript/compare/@amplitude/analytics-browser@2.3.7...@amplitude/analytics-browser@2.3.8)

---
updated-dependencies:
- dependency-name: "@amplitude/analytics-browser"
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 apps/block_scout_web/assets/package-lock.json | 94 +++++++++----------
 apps/block_scout_web/assets/package.json      |  2 +-
 2 files changed, 48 insertions(+), 48 deletions(-)

diff --git a/apps/block_scout_web/assets/package-lock.json b/apps/block_scout_web/assets/package-lock.json
index 6185161016d4..5bcc13f6a581 100644
--- a/apps/block_scout_web/assets/package-lock.json
+++ b/apps/block_scout_web/assets/package-lock.json
@@ -7,7 +7,7 @@
       "name": "blockscout",
       "license": "GPL-3.0",
       "dependencies": {
-        "@amplitude/analytics-browser": "^2.3.7",
+        "@amplitude/analytics-browser": "^2.3.8",
         "@fortawesome/fontawesome-free": "^6.5.1",
         "@tarekraafat/autocomplete.js": "^10.2.7",
         "@walletconnect/web3-provider": "^1.8.0",
@@ -116,15 +116,15 @@
       }
     },
     "node_modules/@amplitude/analytics-browser": {
-      "version": "2.3.7",
-      "resolved": "https://registry.npmjs.org/@amplitude/analytics-browser/-/analytics-browser-2.3.7.tgz",
-      "integrity": "sha512-dk9Q8/pSxM8zyzT5jmWNuDZPicKXK3JQu/1s6ztWD8lWN/vxSIYWaFAdaz60/AM7jkOwxdP8iANMxMyxPv06Rw==",
+      "version": "2.3.8",
+      "resolved": "https://registry.npmjs.org/@amplitude/analytics-browser/-/analytics-browser-2.3.8.tgz",
+      "integrity": "sha512-K+12aAVJPzAtWIi8Ok5Q5dvg7v7IF4G0cI8PW0COWo3uTyY103r45OcpgrpRVpVAr+41d1eiMo36jqOke89uPA==",
       "dependencies": {
-        "@amplitude/analytics-client-common": "^2.0.9",
-        "@amplitude/analytics-core": "^2.1.2",
+        "@amplitude/analytics-client-common": "^2.0.10",
+        "@amplitude/analytics-core": "^2.1.3",
         "@amplitude/analytics-types": "^2.3.1",
-        "@amplitude/plugin-page-view-tracking-browser": "^2.0.17",
-        "@amplitude/plugin-web-attribution-browser": "^2.0.17",
+        "@amplitude/plugin-page-view-tracking-browser": "^2.0.18",
+        "@amplitude/plugin-web-attribution-browser": "^2.0.18",
         "tslib": "^2.4.1"
       }
     },
@@ -134,12 +134,12 @@
       "integrity": "sha512-tGyy4dAjRIEwI7BzsB0lynWgOpfqjUdq91XXAlIWD2OwKBH7oCl/GZG/HT4BOHrTlPMOASlMQ7veyTqpmRcrNA=="
     },
     "node_modules/@amplitude/analytics-client-common": {
-      "version": "2.0.9",
-      "resolved": "https://registry.npmjs.org/@amplitude/analytics-client-common/-/analytics-client-common-2.0.9.tgz",
-      "integrity": "sha512-2CSUMY60Jemks/XVro8ikuHBebENzb+IxnUz4YPx5fmBPW7QW+ysmD+LgECeLhv9jWIQoDhuciscPLuRENKerA==",
+      "version": "2.0.10",
+      "resolved": "https://registry.npmjs.org/@amplitude/analytics-client-common/-/analytics-client-common-2.0.10.tgz",
+      "integrity": "sha512-IaERGgBN3dmCGFbFd7SFTpTBguJIQzE/uDK44KEnLj0qw9wdoTxpLhoXQpqe5WKWsr46eONL9ROCJybHs4Efnw==",
       "dependencies": {
         "@amplitude/analytics-connector": "^1.4.8",
-        "@amplitude/analytics-core": "^2.1.2",
+        "@amplitude/analytics-core": "^2.1.3",
         "@amplitude/analytics-types": "^2.3.1",
         "tslib": "^2.4.1"
       }
@@ -155,9 +155,9 @@
       "integrity": "sha512-T8mOYzB9RRxckzhL0NTHwdge9xuFxXEOplC8B1Y3UX3NHa3BLh7DlBUZlCOwQgMc2nxDfnSweDL5S3bhC+W90g=="
     },
     "node_modules/@amplitude/analytics-core": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/@amplitude/analytics-core/-/analytics-core-2.1.2.tgz",
-      "integrity": "sha512-vRkP2HHh43u7vilpUrP3Q8o/TMJ6U2B7nxPV9/aUS5V/im0Zigq4mPcn5uNY7FuTwsJM3zzRxK9J2WvfdG5bqA==",
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/@amplitude/analytics-core/-/analytics-core-2.1.3.tgz",
+      "integrity": "sha512-WHXf9g33t63jYy4a/1uOpq/zHPMfEj5N2HHgJrg7Eu7v4w3kOWtPSMPBAllzFWxC5Ay5HeR9n0hqlJG0yffQWg==",
       "dependencies": {
         "@amplitude/analytics-types": "^2.3.1",
         "tslib": "^2.4.1"
@@ -174,11 +174,11 @@
       "integrity": "sha512-yojBG20qvph0rpCJKb4i/FJa+otqLINEwv//hfzvjnCOcPPyS0YscI8oiRBM0rG7kZIDgaL9a6jPwkqK4ACmcw=="
     },
     "node_modules/@amplitude/plugin-page-view-tracking-browser": {
-      "version": "2.0.17",
-      "resolved": "https://registry.npmjs.org/@amplitude/plugin-page-view-tracking-browser/-/plugin-page-view-tracking-browser-2.0.17.tgz",
-      "integrity": "sha512-AcpNehWJRPNFiyLDbji4ccZ0jD8640EL3XbauFE8IVSsp+a0a8YbGda/5uQrjmepDGC7nS8BIxxBDiIjbDD90g==",
+      "version": "2.0.18",
+      "resolved": "https://registry.npmjs.org/@amplitude/plugin-page-view-tracking-browser/-/plugin-page-view-tracking-browser-2.0.18.tgz",
+      "integrity": "sha512-s7PkGOgrx6U06/emzM8k+KRGDuyP9Z2L4OyGdeQwJcURJjiZDVQsmKlTZ5/SeGvxHYgq/4QJYUmMSmzByiGTCA==",
       "dependencies": {
-        "@amplitude/analytics-client-common": "^2.0.9",
+        "@amplitude/analytics-client-common": "^2.0.10",
         "@amplitude/analytics-types": "^2.3.1",
         "tslib": "^2.4.1"
       }
@@ -189,12 +189,12 @@
       "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q=="
     },
     "node_modules/@amplitude/plugin-web-attribution-browser": {
-      "version": "2.0.17",
-      "resolved": "https://registry.npmjs.org/@amplitude/plugin-web-attribution-browser/-/plugin-web-attribution-browser-2.0.17.tgz",
-      "integrity": "sha512-sdO3MY3QkHOumMfm6shDOFAdV7Kf5VDsuYnyCn4g3F68e3PiKhrSgpjiqLuB0I6PVNBtkFLjTPxafNdHYsGCZQ==",
+      "version": "2.0.18",
+      "resolved": "https://registry.npmjs.org/@amplitude/plugin-web-attribution-browser/-/plugin-web-attribution-browser-2.0.18.tgz",
+      "integrity": "sha512-mPlXu0fEYCCXhT6WpNJoM0FYkp+HIEm7L+KBEa2IHd3GD3+mh2AVDkZmgXLl3LKb++HY8mCiqC5/NcJ2AzTNhA==",
       "dependencies": {
-        "@amplitude/analytics-client-common": "^2.0.9",
-        "@amplitude/analytics-core": "^2.1.2",
+        "@amplitude/analytics-client-common": "^2.0.10",
+        "@amplitude/analytics-core": "^2.1.3",
         "@amplitude/analytics-types": "^2.3.1",
         "tslib": "^2.4.1"
       }
@@ -17852,15 +17852,15 @@
       "dev": true
     },
     "@amplitude/analytics-browser": {
-      "version": "2.3.7",
-      "resolved": "https://registry.npmjs.org/@amplitude/analytics-browser/-/analytics-browser-2.3.7.tgz",
-      "integrity": "sha512-dk9Q8/pSxM8zyzT5jmWNuDZPicKXK3JQu/1s6ztWD8lWN/vxSIYWaFAdaz60/AM7jkOwxdP8iANMxMyxPv06Rw==",
+      "version": "2.3.8",
+      "resolved": "https://registry.npmjs.org/@amplitude/analytics-browser/-/analytics-browser-2.3.8.tgz",
+      "integrity": "sha512-K+12aAVJPzAtWIi8Ok5Q5dvg7v7IF4G0cI8PW0COWo3uTyY103r45OcpgrpRVpVAr+41d1eiMo36jqOke89uPA==",
       "requires": {
-        "@amplitude/analytics-client-common": "^2.0.9",
-        "@amplitude/analytics-core": "^2.1.2",
+        "@amplitude/analytics-client-common": "^2.0.10",
+        "@amplitude/analytics-core": "^2.1.3",
         "@amplitude/analytics-types": "^2.3.1",
-        "@amplitude/plugin-page-view-tracking-browser": "^2.0.17",
-        "@amplitude/plugin-web-attribution-browser": "^2.0.17",
+        "@amplitude/plugin-page-view-tracking-browser": "^2.0.18",
+        "@amplitude/plugin-web-attribution-browser": "^2.0.18",
         "tslib": "^2.4.1"
       },
       "dependencies": {
@@ -17872,12 +17872,12 @@
       }
     },
     "@amplitude/analytics-client-common": {
-      "version": "2.0.9",
-      "resolved": "https://registry.npmjs.org/@amplitude/analytics-client-common/-/analytics-client-common-2.0.9.tgz",
-      "integrity": "sha512-2CSUMY60Jemks/XVro8ikuHBebENzb+IxnUz4YPx5fmBPW7QW+ysmD+LgECeLhv9jWIQoDhuciscPLuRENKerA==",
+      "version": "2.0.10",
+      "resolved": "https://registry.npmjs.org/@amplitude/analytics-client-common/-/analytics-client-common-2.0.10.tgz",
+      "integrity": "sha512-IaERGgBN3dmCGFbFd7SFTpTBguJIQzE/uDK44KEnLj0qw9wdoTxpLhoXQpqe5WKWsr46eONL9ROCJybHs4Efnw==",
       "requires": {
         "@amplitude/analytics-connector": "^1.4.8",
-        "@amplitude/analytics-core": "^2.1.2",
+        "@amplitude/analytics-core": "^2.1.3",
         "@amplitude/analytics-types": "^2.3.1",
         "tslib": "^2.4.1"
       },
@@ -17895,9 +17895,9 @@
       "integrity": "sha512-T8mOYzB9RRxckzhL0NTHwdge9xuFxXEOplC8B1Y3UX3NHa3BLh7DlBUZlCOwQgMc2nxDfnSweDL5S3bhC+W90g=="
     },
     "@amplitude/analytics-core": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/@amplitude/analytics-core/-/analytics-core-2.1.2.tgz",
-      "integrity": "sha512-vRkP2HHh43u7vilpUrP3Q8o/TMJ6U2B7nxPV9/aUS5V/im0Zigq4mPcn5uNY7FuTwsJM3zzRxK9J2WvfdG5bqA==",
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/@amplitude/analytics-core/-/analytics-core-2.1.3.tgz",
+      "integrity": "sha512-WHXf9g33t63jYy4a/1uOpq/zHPMfEj5N2HHgJrg7Eu7v4w3kOWtPSMPBAllzFWxC5Ay5HeR9n0hqlJG0yffQWg==",
       "requires": {
         "@amplitude/analytics-types": "^2.3.1",
         "tslib": "^2.4.1"
@@ -17916,11 +17916,11 @@
       "integrity": "sha512-yojBG20qvph0rpCJKb4i/FJa+otqLINEwv//hfzvjnCOcPPyS0YscI8oiRBM0rG7kZIDgaL9a6jPwkqK4ACmcw=="
     },
     "@amplitude/plugin-page-view-tracking-browser": {
-      "version": "2.0.17",
-      "resolved": "https://registry.npmjs.org/@amplitude/plugin-page-view-tracking-browser/-/plugin-page-view-tracking-browser-2.0.17.tgz",
-      "integrity": "sha512-AcpNehWJRPNFiyLDbji4ccZ0jD8640EL3XbauFE8IVSsp+a0a8YbGda/5uQrjmepDGC7nS8BIxxBDiIjbDD90g==",
+      "version": "2.0.18",
+      "resolved": "https://registry.npmjs.org/@amplitude/plugin-page-view-tracking-browser/-/plugin-page-view-tracking-browser-2.0.18.tgz",
+      "integrity": "sha512-s7PkGOgrx6U06/emzM8k+KRGDuyP9Z2L4OyGdeQwJcURJjiZDVQsmKlTZ5/SeGvxHYgq/4QJYUmMSmzByiGTCA==",
       "requires": {
-        "@amplitude/analytics-client-common": "^2.0.9",
+        "@amplitude/analytics-client-common": "^2.0.10",
         "@amplitude/analytics-types": "^2.3.1",
         "tslib": "^2.4.1"
       },
@@ -17933,12 +17933,12 @@
       }
     },
     "@amplitude/plugin-web-attribution-browser": {
-      "version": "2.0.17",
-      "resolved": "https://registry.npmjs.org/@amplitude/plugin-web-attribution-browser/-/plugin-web-attribution-browser-2.0.17.tgz",
-      "integrity": "sha512-sdO3MY3QkHOumMfm6shDOFAdV7Kf5VDsuYnyCn4g3F68e3PiKhrSgpjiqLuB0I6PVNBtkFLjTPxafNdHYsGCZQ==",
+      "version": "2.0.18",
+      "resolved": "https://registry.npmjs.org/@amplitude/plugin-web-attribution-browser/-/plugin-web-attribution-browser-2.0.18.tgz",
+      "integrity": "sha512-mPlXu0fEYCCXhT6WpNJoM0FYkp+HIEm7L+KBEa2IHd3GD3+mh2AVDkZmgXLl3LKb++HY8mCiqC5/NcJ2AzTNhA==",
       "requires": {
-        "@amplitude/analytics-client-common": "^2.0.9",
-        "@amplitude/analytics-core": "^2.1.2",
+        "@amplitude/analytics-client-common": "^2.0.10",
+        "@amplitude/analytics-core": "^2.1.3",
         "@amplitude/analytics-types": "^2.3.1",
         "tslib": "^2.4.1"
       },
diff --git a/apps/block_scout_web/assets/package.json b/apps/block_scout_web/assets/package.json
index b71c98820dc8..3187739d745a 100644
--- a/apps/block_scout_web/assets/package.json
+++ b/apps/block_scout_web/assets/package.json
@@ -20,7 +20,7 @@
   },
   "dependencies": {
     "@fortawesome/fontawesome-free": "^6.5.1",
-    "@amplitude/analytics-browser": "^2.3.7",
+    "@amplitude/analytics-browser": "^2.3.8",
     "@tarekraafat/autocomplete.js": "^10.2.7",
     "@walletconnect/web3-provider": "^1.8.0",
     "assert": "^2.1.0",

From dd0a6751c41ab46a65e15c2abea3a7b9979efa67 Mon Sep 17 00:00:00 2001
From: Viktor Baranov <baranov.viktor.27@gmail.com>
Date: Tue, 26 Dec 2023 11:58:01 +0300
Subject: [PATCH 811/909] Arbitrum allow tx receipt gasUsedForL1

---
 CHANGELOG.md                                          | 2 ++
 apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/receipt.ex | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f5169a8eedba..480901a0b50e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,8 @@
 
 ### Fixes
 
+- [#9061](https://github.com/blockscout/blockscout/pull/9061) - Arbitrum allow tx receipt gasUsedForL1 field
+
 ### Chore
 
 <details>
diff --git a/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/receipt.ex b/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/receipt.ex
index 8dc9b2f82edc..08744cd2cd39 100644
--- a/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/receipt.ex
+++ b/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/receipt.ex
@@ -300,7 +300,7 @@ defmodule EthereumJSONRPC.Receipt do
   end
 
   # Arbitrum fields
-  defp entry_to_elixir({key, _}) when key in ~w(returnData returnCode feeStats l1BlockNumber) do
+  defp entry_to_elixir({key, _}) when key in ~w(returnData returnCode feeStats l1BlockNumber gasUsedForL1) do
     :ignore
   end
 

From c6acfa0668b4720018857ca3c59e2c03d4e77f5e Mon Sep 17 00:00:00 2001
From: Lymarenko Lev <lymarenko.lev@gmail.com>
Date: Tue, 26 Dec 2023 15:49:47 +0700
Subject: [PATCH 812/909] Fix bens variables to snake_case and change from POST
 to GET

---
 .../explorer/microservice_interfaces/bens.ex  | 41 ++++++++++++++-----
 1 file changed, 31 insertions(+), 10 deletions(-)

diff --git a/apps/explorer/lib/explorer/microservice_interfaces/bens.ex b/apps/explorer/lib/explorer/microservice_interfaces/bens.ex
index 186f599b127c..afa77e7eeca7 100644
--- a/apps/explorer/lib/explorer/microservice_interfaces/bens.ex
+++ b/apps/explorer/lib/explorer/microservice_interfaces/bens.ex
@@ -54,32 +54,32 @@ defmodule Explorer.MicroserviceInterfaces.BENS do
   @spec address_lookup(binary()) :: {:error, :disabled | binary() | Jason.DecodeError.t()} | {:ok, any}
   def address_lookup(address) do
     with :ok <- Microservice.check_enabled(__MODULE__) do
-      body = %{
+      query_params = %{
         "address" => to_string(address),
-        "resolvedTo" => true,
-        "ownedBy" => false,
-        "onlyActive" => true,
+        "resolved_to" => true,
+        "owned_by" => false,
+        "only_active" => true,
         "order" => "ASC"
       }
 
-      http_post_request(address_lookup_url(), body)
+      http_get_request(address_lookup_url(), query_params)
     end
   end
 
   @doc """
-    Lookup for ENS domain name via {{baseUrl}}/api/v1/:chainId/domains:lookup
+    Lookup for ENS domain name via GET {{baseUrl}}/api/v1/:chainId/domains:lookup
   """
   @spec ens_domain_lookup(binary()) :: {:error, :disabled | binary() | Jason.DecodeError.t()} | {:ok, any}
   def ens_domain_lookup(domain) do
     with :ok <- Microservice.check_enabled(__MODULE__) do
-      body = %{
+      query_params = %{
         "name" => domain,
-        "onlyActive" => true,
+        "only_active" => true,
         "sort" => "registration_date",
         "order" => "DESC"
       }
 
-      http_post_request(domain_lookup_url(), body)
+      http_get_request(domain_lookup_url(), query_params)
     end
   end
 
@@ -106,6 +106,27 @@ defmodule Explorer.MicroserviceInterfaces.BENS do
     end
   end
 
+  def http_get_request(url, query_params) do
+    case HTTPoison.get("#{url}?#{URI.encode_query(query_params)}") do
+      {:ok, %Response{body: body, status_code: 200}} ->
+        Jason.decode(body)
+
+      {_, error} ->
+        old_truncate = Application.get_env(:logger, :truncate)
+        Logger.configure(truncate: :infinity)
+
+        Logger.error(fn ->
+          [
+            "Error while sending request to BENS microservice url: #{url}: ",
+            inspect(error, limit: :infinity, printable_limit: :infinity)
+          ]
+        end)
+
+        Logger.configure(truncate: old_truncate)
+        {:error, @request_error_msg}
+    end
+  end
+
   @spec enabled?() :: boolean
   def enabled?, do: Application.get_env(:explorer, __MODULE__)[:enabled]
 
@@ -221,7 +242,7 @@ defmodule Explorer.MicroserviceInterfaces.BENS do
           %{
             "items" =>
               [
-                %{"name" => name, "expiryDate" => expiry_date, "resolvedAddress" => %{"hash" => address_hash_string}}
+                %{"name" => name, "expiry_date" => expiry_date, "resolved_address" => %{"hash" => address_hash_string}}
                 | _other
               ] = items
           }}

From 31e48a4c710adb1f542a1b5ffcdfae35c18444a3 Mon Sep 17 00:00:00 2001
From: Lymarenko Lev <lymarenko.lev@gmail.com>
Date: Tue, 26 Dec 2023 16:38:33 +0700
Subject: [PATCH 813/909] Fix token_transfers bug

---
 .../lib/explorer/microservice_interfaces/bens.ex  | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/apps/explorer/lib/explorer/microservice_interfaces/bens.ex b/apps/explorer/lib/explorer/microservice_interfaces/bens.ex
index afa77e7eeca7..454af2a3ec9d 100644
--- a/apps/explorer/lib/explorer/microservice_interfaces/bens.ex
+++ b/apps/explorer/lib/explorer/microservice_interfaces/bens.ex
@@ -270,9 +270,17 @@ defmodule Explorer.MicroserviceInterfaces.BENS do
   defp item_to_address_hash_strings(%Transaction{
          to_address_hash: to_address_hash,
          created_contract_address_hash: nil,
-         from_address_hash: from_address_hash
+         from_address_hash: from_address_hash,
+         token_transfers: token_transfers,
        }) do
-    [to_string(to_address_hash), to_string(from_address_hash)]
+    token_transfers_addresses = List.flatten(Enum.map(token_transfers, &item_to_address_hash_strings/1))
+    Logger.info(fn ->
+      [
+        "aboba",
+        inspect(token_transfers_addresses)
+      ]
+    end)
+    [to_string(to_address_hash), to_string(from_address_hash)] ++ token_transfers_addresses
   end
 
   defp item_to_address_hash_strings(%TokenTransfer{
@@ -329,7 +337,8 @@ defmodule Explorer.MicroserviceInterfaces.BENS do
       tx
       | to_address: alter_address(tx.to_address, to_address_hash, names),
         created_contract_address: alter_address(tx.created_contract_address, created_contract_address_hash, names),
-        from_address: alter_address(tx.from_address, from_address_hash, names)
+        from_address: alter_address(tx.from_address, from_address_hash, names),
+        token_transfers: Enum.map(tx.token_transfers, &put_ens_name_to_item(&1, names))
     }
   end
 

From d1ee2e78e6f561933a5125845e0083170edaa3da Mon Sep 17 00:00:00 2001
From: Lymarenko Lev <lymarenko.lev@gmail.com>
Date: Tue, 26 Dec 2023 16:56:14 +0700
Subject: [PATCH 814/909] Add #9062 changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 480901a0b50e..f4f63d99195c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,7 @@
 
 ### Fixes
 
+- [#9062](https://github.com/blockscout/blockscout/pull/9062) - Fix blockscout-ens integration
 - [#9061](https://github.com/blockscout/blockscout/pull/9061) - Arbitrum allow tx receipt gasUsedForL1 field
 
 ### Chore

From 684c4a0c15899146175a32317a60555d9fb675f9 Mon Sep 17 00:00:00 2001
From: Lymarenko Lev <lymarenko.lev@gmail.com>
Date: Tue, 26 Dec 2023 16:56:35 +0700
Subject: [PATCH 815/909] mix format

---
 apps/explorer/lib/explorer/microservice_interfaces/bens.ex | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/apps/explorer/lib/explorer/microservice_interfaces/bens.ex b/apps/explorer/lib/explorer/microservice_interfaces/bens.ex
index 454af2a3ec9d..fd30124e461d 100644
--- a/apps/explorer/lib/explorer/microservice_interfaces/bens.ex
+++ b/apps/explorer/lib/explorer/microservice_interfaces/bens.ex
@@ -271,15 +271,17 @@ defmodule Explorer.MicroserviceInterfaces.BENS do
          to_address_hash: to_address_hash,
          created_contract_address_hash: nil,
          from_address_hash: from_address_hash,
-         token_transfers: token_transfers,
+         token_transfers: token_transfers
        }) do
     token_transfers_addresses = List.flatten(Enum.map(token_transfers, &item_to_address_hash_strings/1))
+
     Logger.info(fn ->
       [
         "aboba",
         inspect(token_transfers_addresses)
       ]
     end)
+
     [to_string(to_address_hash), to_string(from_address_hash)] ++ token_transfers_addresses
   end
 

From 98385a5c8d2c78ed192c2bc9ee64a5c48537b28c Mon Sep 17 00:00:00 2001
From: Lymarenko Lev <lymarenko.lev@gmail.com>
Date: Tue, 26 Dec 2023 16:58:17 +0700
Subject: [PATCH 816/909] Remove print debug

---
 .../explorer/lib/explorer/microservice_interfaces/bens.ex | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/apps/explorer/lib/explorer/microservice_interfaces/bens.ex b/apps/explorer/lib/explorer/microservice_interfaces/bens.ex
index fd30124e461d..9f6e450787b2 100644
--- a/apps/explorer/lib/explorer/microservice_interfaces/bens.ex
+++ b/apps/explorer/lib/explorer/microservice_interfaces/bens.ex
@@ -274,14 +274,6 @@ defmodule Explorer.MicroserviceInterfaces.BENS do
          token_transfers: token_transfers
        }) do
     token_transfers_addresses = List.flatten(Enum.map(token_transfers, &item_to_address_hash_strings/1))
-
-    Logger.info(fn ->
-      [
-        "aboba",
-        inspect(token_transfers_addresses)
-      ]
-    end)
-
     [to_string(to_address_hash), to_string(from_address_hash)] ++ token_transfers_addresses
   end
 

From 0db3a3173f0e2365c2c86e4fbbdc17d3f8588a72 Mon Sep 17 00:00:00 2001
From: Lymarenko Lev <lymarenko.lev@gmail.com>
Date: Tue, 26 Dec 2023 17:01:42 +0700
Subject: [PATCH 817/909] Fix comment

---
 apps/explorer/lib/explorer/microservice_interfaces/bens.ex | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/explorer/lib/explorer/microservice_interfaces/bens.ex b/apps/explorer/lib/explorer/microservice_interfaces/bens.ex
index 9f6e450787b2..02e42b24cfa1 100644
--- a/apps/explorer/lib/explorer/microservice_interfaces/bens.ex
+++ b/apps/explorer/lib/explorer/microservice_interfaces/bens.ex
@@ -35,7 +35,7 @@ defmodule Explorer.MicroserviceInterfaces.BENS do
            | Withdrawal.t()
 
   @doc """
-    Batch request for ENS names via {{baseUrl}}/api/v1/:chainId/addresses:batch-resolve-names
+    Batch request for ENS names via POST {{baseUrl}}/api/v1/:chainId/addresses:batch-resolve-names
   """
   @spec ens_names_batch_request([binary()]) :: {:error, :disabled | binary() | Jason.DecodeError.t()} | {:ok, any}
   def ens_names_batch_request(addresses) do
@@ -49,7 +49,7 @@ defmodule Explorer.MicroserviceInterfaces.BENS do
   end
 
   @doc """
-    Request for ENS name via {{baseUrl}}/api/v1/:chainId/addresses:lookup
+    Request for ENS name via GET {{baseUrl}}/api/v1/:chainId/addresses:lookup
   """
   @spec address_lookup(binary()) :: {:error, :disabled | binary() | Jason.DecodeError.t()} | {:ok, any}
   def address_lookup(address) do

From 1ba76320a3f64a8c25dcc7568f1e8d379def84f8 Mon Sep 17 00:00:00 2001
From: Lymarenko Lev <lymarenko.lev@gmail.com>
Date: Tue, 26 Dec 2023 18:03:31 +0700
Subject: [PATCH 818/909] Handle NotLoaded

---
 .../lib/explorer/microservice_interfaces/bens.ex  | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/apps/explorer/lib/explorer/microservice_interfaces/bens.ex b/apps/explorer/lib/explorer/microservice_interfaces/bens.ex
index 02e42b24cfa1..e70c2606e76e 100644
--- a/apps/explorer/lib/explorer/microservice_interfaces/bens.ex
+++ b/apps/explorer/lib/explorer/microservice_interfaces/bens.ex
@@ -273,7 +273,12 @@ defmodule Explorer.MicroserviceInterfaces.BENS do
          from_address_hash: from_address_hash,
          token_transfers: token_transfers
        }) do
-    token_transfers_addresses = List.flatten(Enum.map(token_transfers, &item_to_address_hash_strings/1))
+    token_transfers_addresses =
+      case token_transfers do
+        %NotLoaded{} -> []
+        _ -> List.flatten(Enum.map(token_transfers, &item_to_address_hash_strings/1))
+      end
+
     [to_string(to_address_hash), to_string(from_address_hash)] ++ token_transfers_addresses
   end
 
@@ -327,12 +332,18 @@ defmodule Explorer.MicroserviceInterfaces.BENS do
          } = tx,
          names
        ) do
+    token_transfers =
+      case tx.token_transfers do
+        %NotLoaded{} -> %NotLoaded{}
+        token_transfers -> Enum.map(token_transfers, &put_ens_name_to_item(&1, names))
+      end
+
     %Transaction{
       tx
       | to_address: alter_address(tx.to_address, to_address_hash, names),
         created_contract_address: alter_address(tx.created_contract_address, created_contract_address_hash, names),
         from_address: alter_address(tx.from_address, from_address_hash, names),
-        token_transfers: Enum.map(tx.token_transfers, &put_ens_name_to_item(&1, names))
+        token_transfers: token_transfers
     }
   end
 

From 7f8a3d2d0f7593739d5f16158ab0aa44f8d46bfe Mon Sep 17 00:00:00 2001
From: Lymarenko Lev <lymarenko.lev@gmail.com>
Date: Tue, 26 Dec 2023 20:15:00 +0700
Subject: [PATCH 819/909] Make func private

---
 apps/explorer/lib/explorer/microservice_interfaces/bens.ex | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/explorer/lib/explorer/microservice_interfaces/bens.ex b/apps/explorer/lib/explorer/microservice_interfaces/bens.ex
index e70c2606e76e..b0b4106670f8 100644
--- a/apps/explorer/lib/explorer/microservice_interfaces/bens.ex
+++ b/apps/explorer/lib/explorer/microservice_interfaces/bens.ex
@@ -106,7 +106,7 @@ defmodule Explorer.MicroserviceInterfaces.BENS do
     end
   end
 
-  def http_get_request(url, query_params) do
+  defp http_get_request(url, query_params) do
     case HTTPoison.get("#{url}?#{URI.encode_query(query_params)}") do
       {:ok, %Response{body: body, status_code: 200}} ->
         Jason.decode(body)

From e879849d23dbf2d5a3c6b7d10cde4f8cd86a2710 Mon Sep 17 00:00:00 2001
From: Nikita Pozdniakov <nikitosing4@mail.ru>
Date: Tue, 26 Dec 2023 21:12:51 +0300
Subject: [PATCH 820/909] Refactoring

---
 .../lib/explorer/microservice_interfaces/bens.ex | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/apps/explorer/lib/explorer/microservice_interfaces/bens.ex b/apps/explorer/lib/explorer/microservice_interfaces/bens.ex
index b0b4106670f8..59eb1c82403f 100644
--- a/apps/explorer/lib/explorer/microservice_interfaces/bens.ex
+++ b/apps/explorer/lib/explorer/microservice_interfaces/bens.ex
@@ -107,7 +107,7 @@ defmodule Explorer.MicroserviceInterfaces.BENS do
   end
 
   defp http_get_request(url, query_params) do
-    case HTTPoison.get("#{url}?#{URI.encode_query(query_params)}") do
+    case HTTPoison.get(url, [], params: query_params) do
       {:ok, %Response{body: body, status_code: 200}} ->
         Jason.decode(body)
 
@@ -275,8 +275,11 @@ defmodule Explorer.MicroserviceInterfaces.BENS do
        }) do
     token_transfers_addresses =
       case token_transfers do
-        %NotLoaded{} -> []
-        _ -> List.flatten(Enum.map(token_transfers, &item_to_address_hash_strings/1))
+        token_transfers_list when is_list(token_transfers_list) ->
+          List.flatten(Enum.map(token_transfers_list, &item_to_address_hash_strings/1))
+
+        _ ->
+          []
       end
 
     [to_string(to_address_hash), to_string(from_address_hash)] ++ token_transfers_addresses
@@ -334,8 +337,11 @@ defmodule Explorer.MicroserviceInterfaces.BENS do
        ) do
     token_transfers =
       case tx.token_transfers do
-        %NotLoaded{} -> %NotLoaded{}
-        token_transfers -> Enum.map(token_transfers, &put_ens_name_to_item(&1, names))
+        token_transfers_list when is_list(token_transfers_list) ->
+          Enum.map(token_transfers_list, &put_ens_name_to_item(&1, names))
+
+        other ->
+          other
       end
 
     %Transaction{

From 6bc684ac721a06b99ff82c54509593f85fbf5bd9 Mon Sep 17 00:00:00 2001
From: Viktor Baranov <baranov.viktor.27@gmail.com>
Date: Mon, 1 Jan 2024 21:01:33 +0300
Subject: [PATCH 821/909] Fix suffix in Blockscout version in prerelease
 workflow

---
 .github/workflows/prerelease.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/prerelease.yml b/.github/workflows/prerelease.yml
index 3f97613ee0d7..070650c676f4 100644
--- a/.github/workflows/prerelease.yml
+++ b/.github/workflows/prerelease.yml
@@ -61,5 +61,5 @@ jobs:
             AMPLITUDE_URL=
             AMPLITUDE_API_KEY=
             CACHE_ADDRESS_WITH_BALANCES_UPDATE_INTERVAL=
-            BLOCKSCOUT_VERSION=v${{ env.RELEASE_VERSION }}-beta
+            BLOCKSCOUT_VERSION=v${{ env.RELEASE_VERSION }}-alpha
             RELEASE_VERSION=${{ env.RELEASE_VERSION }}
\ No newline at end of file

From c3869c41bc67c8c8b7255ef2006e2ec800b333de Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 1 Jan 2024 18:48:23 +0000
Subject: [PATCH 822/909] Bump sweetalert2 from 11.10.1 to 11.10.2 in
 /apps/block_scout_web/assets

Bumps [sweetalert2](https://github.com/sweetalert2/sweetalert2) from 11.10.1 to 11.10.2.
- [Release notes](https://github.com/sweetalert2/sweetalert2/releases)
- [Changelog](https://github.com/sweetalert2/sweetalert2/blob/main/CHANGELOG.md)
- [Commits](https://github.com/sweetalert2/sweetalert2/compare/v11.10.1...v11.10.2)

---
updated-dependencies:
- dependency-name: sweetalert2
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 apps/block_scout_web/assets/package-lock.json | 14 +++++++-------
 apps/block_scout_web/assets/package.json      |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/apps/block_scout_web/assets/package-lock.json b/apps/block_scout_web/assets/package-lock.json
index ce501376510e..a9a454809c71 100644
--- a/apps/block_scout_web/assets/package-lock.json
+++ b/apps/block_scout_web/assets/package-lock.json
@@ -61,7 +61,7 @@
         "redux": "^5.0.1",
         "stream-browserify": "^3.0.0",
         "stream-http": "^3.1.1",
-        "sweetalert2": "^11.10.1",
+        "sweetalert2": "^11.10.2",
         "urijs": "^1.19.11",
         "url": "^0.11.3",
         "util": "^0.12.5",
@@ -16084,9 +16084,9 @@
       }
     },
     "node_modules/sweetalert2": {
-      "version": "11.10.1",
-      "resolved": "https://registry.npmjs.org/sweetalert2/-/sweetalert2-11.10.1.tgz",
-      "integrity": "sha512-qu145oBuFfjYr5yZW9OSdG6YmRxDf8CnkgT/sXMfrXGe+asFy2imC2vlaLQ/L/naZ/JZna1MPAY56G4qYM0VUQ==",
+      "version": "11.10.2",
+      "resolved": "https://registry.npmjs.org/sweetalert2/-/sweetalert2-11.10.2.tgz",
+      "integrity": "sha512-BYlIxGw6OF9Rw2z1wlnh1U+fvHHkvtg4BGyimV9nZxQRGvCBfx9uonxgwuYpJuYqCtM+2W1KOm8iMIEb/2v7Hg==",
       "funding": {
         "type": "individual",
         "url": "https://github.com/sponsors/limonte"
@@ -29887,9 +29887,9 @@
       }
     },
     "sweetalert2": {
-      "version": "11.10.1",
-      "resolved": "https://registry.npmjs.org/sweetalert2/-/sweetalert2-11.10.1.tgz",
-      "integrity": "sha512-qu145oBuFfjYr5yZW9OSdG6YmRxDf8CnkgT/sXMfrXGe+asFy2imC2vlaLQ/L/naZ/JZna1MPAY56G4qYM0VUQ=="
+      "version": "11.10.2",
+      "resolved": "https://registry.npmjs.org/sweetalert2/-/sweetalert2-11.10.2.tgz",
+      "integrity": "sha512-BYlIxGw6OF9Rw2z1wlnh1U+fvHHkvtg4BGyimV9nZxQRGvCBfx9uonxgwuYpJuYqCtM+2W1KOm8iMIEb/2v7Hg=="
     },
     "symbol-tree": {
       "version": "3.2.4",
diff --git a/apps/block_scout_web/assets/package.json b/apps/block_scout_web/assets/package.json
index ba8804631582..8682b4afef9d 100644
--- a/apps/block_scout_web/assets/package.json
+++ b/apps/block_scout_web/assets/package.json
@@ -73,7 +73,7 @@
     "redux": "^5.0.1",
     "stream-browserify": "^3.0.0",
     "stream-http": "^3.1.1",
-    "sweetalert2": "^11.10.1",
+    "sweetalert2": "^11.10.2",
     "urijs": "^1.19.11",
     "url": "^0.11.3",
     "util": "^0.12.5",

From 64860e67fd5f4bb0e1ef350e09b1ba95211ccb3b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 1 Jan 2024 18:48:54 +0000
Subject: [PATCH 823/909] Bump sass-loader from 13.3.2 to 13.3.3 in
 /apps/block_scout_web/assets

Bumps [sass-loader](https://github.com/webpack-contrib/sass-loader) from 13.3.2 to 13.3.3.
- [Release notes](https://github.com/webpack-contrib/sass-loader/releases)
- [Changelog](https://github.com/webpack-contrib/sass-loader/blob/master/CHANGELOG.md)
- [Commits](https://github.com/webpack-contrib/sass-loader/compare/v13.3.2...v13.3.3)

---
updated-dependencies:
- dependency-name: sass-loader
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 apps/block_scout_web/assets/package-lock.json | 14 +++++++-------
 apps/block_scout_web/assets/package.json      |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/apps/block_scout_web/assets/package-lock.json b/apps/block_scout_web/assets/package-lock.json
index ce501376510e..71be5694e532 100644
--- a/apps/block_scout_web/assets/package-lock.json
+++ b/apps/block_scout_web/assets/package-lock.json
@@ -90,7 +90,7 @@
         "postcss": "^8.4.32",
         "postcss-loader": "^7.3.3",
         "sass": "^1.69.5",
-        "sass-loader": "^13.3.2",
+        "sass-loader": "^13.3.3",
         "style-loader": "^3.3.3",
         "webpack": "^5.89.0",
         "webpack-cli": "^5.1.4"
@@ -15202,9 +15202,9 @@
       }
     },
     "node_modules/sass-loader": {
-      "version": "13.3.2",
-      "resolved": "https://registry.npmjs.org/sass-loader/-/sass-loader-13.3.2.tgz",
-      "integrity": "sha512-CQbKl57kdEv+KDLquhC+gE3pXt74LEAzm+tzywcA0/aHZuub8wTErbjAoNI57rPUWRYRNC5WUnNl8eGJNbDdwg==",
+      "version": "13.3.3",
+      "resolved": "https://registry.npmjs.org/sass-loader/-/sass-loader-13.3.3.tgz",
+      "integrity": "sha512-mt5YN2F1MOZr3d/wBRcZxeFgwgkH44wVc2zohO2YF6JiOMkiXe4BYRZpSu2sO1g71mo/j16txzUhsKZlqjVGzA==",
       "dev": true,
       "dependencies": {
         "neo-async": "^2.6.2"
@@ -29246,9 +29246,9 @@
       }
     },
     "sass-loader": {
-      "version": "13.3.2",
-      "resolved": "https://registry.npmjs.org/sass-loader/-/sass-loader-13.3.2.tgz",
-      "integrity": "sha512-CQbKl57kdEv+KDLquhC+gE3pXt74LEAzm+tzywcA0/aHZuub8wTErbjAoNI57rPUWRYRNC5WUnNl8eGJNbDdwg==",
+      "version": "13.3.3",
+      "resolved": "https://registry.npmjs.org/sass-loader/-/sass-loader-13.3.3.tgz",
+      "integrity": "sha512-mt5YN2F1MOZr3d/wBRcZxeFgwgkH44wVc2zohO2YF6JiOMkiXe4BYRZpSu2sO1g71mo/j16txzUhsKZlqjVGzA==",
       "dev": true,
       "requires": {
         "neo-async": "^2.6.2"
diff --git a/apps/block_scout_web/assets/package.json b/apps/block_scout_web/assets/package.json
index ba8804631582..2f779682abf3 100644
--- a/apps/block_scout_web/assets/package.json
+++ b/apps/block_scout_web/assets/package.json
@@ -102,7 +102,7 @@
     "postcss": "^8.4.32",
     "postcss-loader": "^7.3.3",
     "sass": "^1.69.5",
-    "sass-loader": "^13.3.2",
+    "sass-loader": "^13.3.3",
     "style-loader": "^3.3.3",
     "webpack": "^5.89.0",
     "webpack-cli": "^5.1.4"

From a2d0fb0cbef836ad730c8c24c1603e7087db7164 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 1 Jan 2024 18:50:22 +0000
Subject: [PATCH 824/909] Bump @babel/preset-env in
 /apps/block_scout_web/assets

Bumps [@babel/preset-env](https://github.com/babel/babel/tree/HEAD/packages/babel-preset-env) from 7.23.6 to 7.23.7.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/commits/v7.23.7/packages/babel-preset-env)

---
updated-dependencies:
- dependency-name: "@babel/preset-env"
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 apps/block_scout_web/assets/package-lock.json | 150 +++++++++---------
 apps/block_scout_web/assets/package.json      |   2 +-
 2 files changed, 76 insertions(+), 76 deletions(-)

diff --git a/apps/block_scout_web/assets/package-lock.json b/apps/block_scout_web/assets/package-lock.json
index ce501376510e..3242fda252d5 100644
--- a/apps/block_scout_web/assets/package-lock.json
+++ b/apps/block_scout_web/assets/package-lock.json
@@ -72,7 +72,7 @@
       },
       "devDependencies": {
         "@babel/core": "^7.23.6",
-        "@babel/preset-env": "^7.23.6",
+        "@babel/preset-env": "^7.23.7",
         "autoprefixer": "^10.4.16",
         "babel-loader": "^9.1.3",
         "copy-webpack-plugin": "^11.0.0",
@@ -671,9 +671,9 @@
       }
     },
     "node_modules/@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly": {
-      "version": "7.23.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly/-/plugin-bugfix-v8-static-class-fields-redefine-readonly-7.23.3.tgz",
-      "integrity": "sha512-XaJak1qcityzrX0/IU5nKHb34VaibwP3saKqG6a/tppelgllOH13LUann4ZCIBcVOeE6H18K4Vx9QKkVww3z/w==",
+      "version": "7.23.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly/-/plugin-bugfix-v8-static-class-fields-redefine-readonly-7.23.7.tgz",
+      "integrity": "sha512-LlRT7HgaifEpQA1ZgLVOIJZZFVPWN5iReq/7/JixwBtwcoeVGDBD53ZV28rrsLYOZs1Y/EHhA8N/Z6aazHR8cw==",
       "dev": true,
       "dependencies": {
         "@babel/helper-environment-visitor": "^7.22.20",
@@ -991,9 +991,9 @@
       }
     },
     "node_modules/@babel/plugin-transform-async-generator-functions": {
-      "version": "7.23.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-generator-functions/-/plugin-transform-async-generator-functions-7.23.4.tgz",
-      "integrity": "sha512-efdkfPhHYTtn0G6n2ddrESE91fgXxjlqLsnUtPWnJs4a4mZIbUaK7ffqKIIUKXSHwcDvaCVX6GXkaJJFqtX7jw==",
+      "version": "7.23.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-generator-functions/-/plugin-transform-async-generator-functions-7.23.7.tgz",
+      "integrity": "sha512-PdxEpL71bJp1byMG0va5gwQcXHxuEYC/BgI/e88mGTtohbZN28O5Yit0Plkkm/dBzCF/BxmbNcses1RH1T+urA==",
       "dev": true,
       "dependencies": {
         "@babel/helper-environment-visitor": "^7.22.20",
@@ -1780,9 +1780,9 @@
       }
     },
     "node_modules/@babel/preset-env": {
-      "version": "7.23.6",
-      "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.23.6.tgz",
-      "integrity": "sha512-2XPn/BqKkZCpzYhUUNZ1ssXw7DcXfKQEjv/uXZUXgaebCMYmkEsfZ2yY+vv+xtXv50WmL5SGhyB6/xsWxIvvOQ==",
+      "version": "7.23.7",
+      "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.23.7.tgz",
+      "integrity": "sha512-SY27X/GtTz/L4UryMNJ6p4fH4nsgWbz84y9FE0bQeWJP6O5BhgVCt53CotQKHCOeXJel8VyhlhujhlltKms/CA==",
       "dev": true,
       "dependencies": {
         "@babel/compat-data": "^7.23.5",
@@ -1791,7 +1791,7 @@
         "@babel/helper-validator-option": "^7.23.5",
         "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": "^7.23.3",
         "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": "^7.23.3",
-        "@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly": "^7.23.3",
+        "@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly": "^7.23.7",
         "@babel/plugin-proposal-private-property-in-object": "7.21.0-placeholder-for-preset-env.2",
         "@babel/plugin-syntax-async-generators": "^7.8.4",
         "@babel/plugin-syntax-class-properties": "^7.12.13",
@@ -1812,7 +1812,7 @@
         "@babel/plugin-syntax-top-level-await": "^7.14.5",
         "@babel/plugin-syntax-unicode-sets-regex": "^7.18.6",
         "@babel/plugin-transform-arrow-functions": "^7.23.3",
-        "@babel/plugin-transform-async-generator-functions": "^7.23.4",
+        "@babel/plugin-transform-async-generator-functions": "^7.23.7",
         "@babel/plugin-transform-async-to-generator": "^7.23.3",
         "@babel/plugin-transform-block-scoped-functions": "^7.23.3",
         "@babel/plugin-transform-block-scoping": "^7.23.4",
@@ -1860,9 +1860,9 @@
         "@babel/plugin-transform-unicode-regex": "^7.23.3",
         "@babel/plugin-transform-unicode-sets-regex": "^7.23.3",
         "@babel/preset-modules": "0.1.6-no-external-plugins",
-        "babel-plugin-polyfill-corejs2": "^0.4.6",
-        "babel-plugin-polyfill-corejs3": "^0.8.5",
-        "babel-plugin-polyfill-regenerator": "^0.5.3",
+        "babel-plugin-polyfill-corejs2": "^0.4.7",
+        "babel-plugin-polyfill-corejs3": "^0.8.7",
+        "babel-plugin-polyfill-regenerator": "^0.5.4",
         "core-js-compat": "^3.31.0",
         "semver": "^6.3.1"
       },
@@ -1874,9 +1874,9 @@
       }
     },
     "node_modules/@babel/preset-env/node_modules/@babel/helper-define-polyfill-provider": {
-      "version": "0.4.3",
-      "resolved": "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.4.3.tgz",
-      "integrity": "sha512-WBrLmuPP47n7PNwsZ57pqam6G/RGo1vw/87b0Blc53tZNGZ4x7YvZ6HgQe2vo1W/FR20OgjeZuGXzudPiXHFug==",
+      "version": "0.4.4",
+      "resolved": "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.4.4.tgz",
+      "integrity": "sha512-QcJMILQCu2jm5TFPGA3lCpJJTeEP+mqeXooG/NZbg/h5FTFi6V0+99ahlRsW8/kRLyb24LZVCCiclDedhLKcBA==",
       "dev": true,
       "dependencies": {
         "@babel/helper-compilation-targets": "^7.22.6",
@@ -1890,13 +1890,13 @@
       }
     },
     "node_modules/@babel/preset-env/node_modules/babel-plugin-polyfill-corejs2": {
-      "version": "0.4.6",
-      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.4.6.tgz",
-      "integrity": "sha512-jhHiWVZIlnPbEUKSSNb9YoWcQGdlTLq7z1GHL4AjFxaoOUMuuEVJ+Y4pAaQUGOGk93YsVCKPbqbfw3m0SM6H8Q==",
+      "version": "0.4.7",
+      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.4.7.tgz",
+      "integrity": "sha512-LidDk/tEGDfuHW2DWh/Hgo4rmnw3cduK6ZkOI1NPFceSK3n/yAGeOsNT7FLnSGHkXj3RHGSEVkN3FsCTY6w2CQ==",
       "dev": true,
       "dependencies": {
         "@babel/compat-data": "^7.22.6",
-        "@babel/helper-define-polyfill-provider": "^0.4.3",
+        "@babel/helper-define-polyfill-provider": "^0.4.4",
         "semver": "^6.3.1"
       },
       "peerDependencies": {
@@ -1904,12 +1904,12 @@
       }
     },
     "node_modules/@babel/preset-env/node_modules/babel-plugin-polyfill-regenerator": {
-      "version": "0.5.3",
-      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.5.3.tgz",
-      "integrity": "sha512-8sHeDOmXC8csczMrYEOf0UTNa4yE2SxV5JGeT/LP1n0OYVDUUFPxG9vdk2AlDlIit4t+Kf0xCtpgXPBwnn/9pw==",
+      "version": "0.5.4",
+      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.5.4.tgz",
+      "integrity": "sha512-S/x2iOCvDaCASLYsOOgWOq4bCfKYVqvO/uxjkaYyZ3rVsVE3CeAI/c84NpyuBBymEgNvHgjEot3a9/Z/kXvqsg==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-define-polyfill-provider": "^0.4.3"
+        "@babel/helper-define-polyfill-provider": "^0.4.4"
       },
       "peerDependencies": {
         "@babel/core": "^7.4.0 || ^8.0.0-0 <8.0.0"
@@ -4852,22 +4852,22 @@
       }
     },
     "node_modules/babel-plugin-polyfill-corejs3": {
-      "version": "0.8.5",
-      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.8.5.tgz",
-      "integrity": "sha512-Q6CdATeAvbScWPNLB8lzSO7fgUVBkQt6zLgNlfyeCr/EQaEQR+bWiBYYPYAFyE528BMjRhL+1QBMOI4jc/c5TA==",
+      "version": "0.8.7",
+      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.8.7.tgz",
+      "integrity": "sha512-KyDvZYxAzkC0Aj2dAPyDzi2Ym15e5JKZSK+maI7NAwSqofvuFglbSsxE7wUOvTg9oFVnHMzVzBKcqEb4PJgtOA==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-define-polyfill-provider": "^0.4.3",
-        "core-js-compat": "^3.32.2"
+        "@babel/helper-define-polyfill-provider": "^0.4.4",
+        "core-js-compat": "^3.33.1"
       },
       "peerDependencies": {
         "@babel/core": "^7.4.0 || ^8.0.0-0 <8.0.0"
       }
     },
     "node_modules/babel-plugin-polyfill-corejs3/node_modules/@babel/helper-define-polyfill-provider": {
-      "version": "0.4.3",
-      "resolved": "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.4.3.tgz",
-      "integrity": "sha512-WBrLmuPP47n7PNwsZ57pqam6G/RGo1vw/87b0Blc53tZNGZ4x7YvZ6HgQe2vo1W/FR20OgjeZuGXzudPiXHFug==",
+      "version": "0.4.4",
+      "resolved": "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.4.4.tgz",
+      "integrity": "sha512-QcJMILQCu2jm5TFPGA3lCpJJTeEP+mqeXooG/NZbg/h5FTFi6V0+99ahlRsW8/kRLyb24LZVCCiclDedhLKcBA==",
       "dev": true,
       "dependencies": {
         "@babel/helper-compilation-targets": "^7.22.6",
@@ -5948,11 +5948,11 @@
       }
     },
     "node_modules/core-js-compat": {
-      "version": "3.33.0",
-      "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.33.0.tgz",
-      "integrity": "sha512-0w4LcLXsVEuNkIqwjjf9rjCoPhK8uqA4tMRh4Ge26vfLtUutshn+aRJU21I9LCJlh2QQHfisNToLjw1XEJLTWw==",
+      "version": "3.35.0",
+      "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.35.0.tgz",
+      "integrity": "sha512-5blwFAddknKeNgsjBzilkdQ0+YK8L1PfqPYq40NOYMYFSS38qj+hpTcLLWwpIwA2A5bje/x5jmVn2tzUMg9IVw==",
       "dependencies": {
-        "browserslist": "^4.22.1"
+        "browserslist": "^4.22.2"
       },
       "funding": {
         "type": "opencollective",
@@ -18293,9 +18293,9 @@
       }
     },
     "@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly": {
-      "version": "7.23.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly/-/plugin-bugfix-v8-static-class-fields-redefine-readonly-7.23.3.tgz",
-      "integrity": "sha512-XaJak1qcityzrX0/IU5nKHb34VaibwP3saKqG6a/tppelgllOH13LUann4ZCIBcVOeE6H18K4Vx9QKkVww3z/w==",
+      "version": "7.23.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly/-/plugin-bugfix-v8-static-class-fields-redefine-readonly-7.23.7.tgz",
+      "integrity": "sha512-LlRT7HgaifEpQA1ZgLVOIJZZFVPWN5iReq/7/JixwBtwcoeVGDBD53ZV28rrsLYOZs1Y/EHhA8N/Z6aazHR8cw==",
       "dev": true,
       "requires": {
         "@babel/helper-environment-visitor": "^7.22.20",
@@ -18509,9 +18509,9 @@
       }
     },
     "@babel/plugin-transform-async-generator-functions": {
-      "version": "7.23.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-generator-functions/-/plugin-transform-async-generator-functions-7.23.4.tgz",
-      "integrity": "sha512-efdkfPhHYTtn0G6n2ddrESE91fgXxjlqLsnUtPWnJs4a4mZIbUaK7ffqKIIUKXSHwcDvaCVX6GXkaJJFqtX7jw==",
+      "version": "7.23.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-generator-functions/-/plugin-transform-async-generator-functions-7.23.7.tgz",
+      "integrity": "sha512-PdxEpL71bJp1byMG0va5gwQcXHxuEYC/BgI/e88mGTtohbZN28O5Yit0Plkkm/dBzCF/BxmbNcses1RH1T+urA==",
       "dev": true,
       "requires": {
         "@babel/helper-environment-visitor": "^7.22.20",
@@ -19009,9 +19009,9 @@
       }
     },
     "@babel/preset-env": {
-      "version": "7.23.6",
-      "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.23.6.tgz",
-      "integrity": "sha512-2XPn/BqKkZCpzYhUUNZ1ssXw7DcXfKQEjv/uXZUXgaebCMYmkEsfZ2yY+vv+xtXv50WmL5SGhyB6/xsWxIvvOQ==",
+      "version": "7.23.7",
+      "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.23.7.tgz",
+      "integrity": "sha512-SY27X/GtTz/L4UryMNJ6p4fH4nsgWbz84y9FE0bQeWJP6O5BhgVCt53CotQKHCOeXJel8VyhlhujhlltKms/CA==",
       "dev": true,
       "requires": {
         "@babel/compat-data": "^7.23.5",
@@ -19020,7 +19020,7 @@
         "@babel/helper-validator-option": "^7.23.5",
         "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": "^7.23.3",
         "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": "^7.23.3",
-        "@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly": "^7.23.3",
+        "@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly": "^7.23.7",
         "@babel/plugin-proposal-private-property-in-object": "7.21.0-placeholder-for-preset-env.2",
         "@babel/plugin-syntax-async-generators": "^7.8.4",
         "@babel/plugin-syntax-class-properties": "^7.12.13",
@@ -19041,7 +19041,7 @@
         "@babel/plugin-syntax-top-level-await": "^7.14.5",
         "@babel/plugin-syntax-unicode-sets-regex": "^7.18.6",
         "@babel/plugin-transform-arrow-functions": "^7.23.3",
-        "@babel/plugin-transform-async-generator-functions": "^7.23.4",
+        "@babel/plugin-transform-async-generator-functions": "^7.23.7",
         "@babel/plugin-transform-async-to-generator": "^7.23.3",
         "@babel/plugin-transform-block-scoped-functions": "^7.23.3",
         "@babel/plugin-transform-block-scoping": "^7.23.4",
@@ -19089,17 +19089,17 @@
         "@babel/plugin-transform-unicode-regex": "^7.23.3",
         "@babel/plugin-transform-unicode-sets-regex": "^7.23.3",
         "@babel/preset-modules": "0.1.6-no-external-plugins",
-        "babel-plugin-polyfill-corejs2": "^0.4.6",
-        "babel-plugin-polyfill-corejs3": "^0.8.5",
-        "babel-plugin-polyfill-regenerator": "^0.5.3",
+        "babel-plugin-polyfill-corejs2": "^0.4.7",
+        "babel-plugin-polyfill-corejs3": "^0.8.7",
+        "babel-plugin-polyfill-regenerator": "^0.5.4",
         "core-js-compat": "^3.31.0",
         "semver": "^6.3.1"
       },
       "dependencies": {
         "@babel/helper-define-polyfill-provider": {
-          "version": "0.4.3",
-          "resolved": "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.4.3.tgz",
-          "integrity": "sha512-WBrLmuPP47n7PNwsZ57pqam6G/RGo1vw/87b0Blc53tZNGZ4x7YvZ6HgQe2vo1W/FR20OgjeZuGXzudPiXHFug==",
+          "version": "0.4.4",
+          "resolved": "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.4.4.tgz",
+          "integrity": "sha512-QcJMILQCu2jm5TFPGA3lCpJJTeEP+mqeXooG/NZbg/h5FTFi6V0+99ahlRsW8/kRLyb24LZVCCiclDedhLKcBA==",
           "dev": true,
           "requires": {
             "@babel/helper-compilation-targets": "^7.22.6",
@@ -19110,23 +19110,23 @@
           }
         },
         "babel-plugin-polyfill-corejs2": {
-          "version": "0.4.6",
-          "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.4.6.tgz",
-          "integrity": "sha512-jhHiWVZIlnPbEUKSSNb9YoWcQGdlTLq7z1GHL4AjFxaoOUMuuEVJ+Y4pAaQUGOGk93YsVCKPbqbfw3m0SM6H8Q==",
+          "version": "0.4.7",
+          "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.4.7.tgz",
+          "integrity": "sha512-LidDk/tEGDfuHW2DWh/Hgo4rmnw3cduK6ZkOI1NPFceSK3n/yAGeOsNT7FLnSGHkXj3RHGSEVkN3FsCTY6w2CQ==",
           "dev": true,
           "requires": {
             "@babel/compat-data": "^7.22.6",
-            "@babel/helper-define-polyfill-provider": "^0.4.3",
+            "@babel/helper-define-polyfill-provider": "^0.4.4",
             "semver": "^6.3.1"
           }
         },
         "babel-plugin-polyfill-regenerator": {
-          "version": "0.5.3",
-          "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.5.3.tgz",
-          "integrity": "sha512-8sHeDOmXC8csczMrYEOf0UTNa4yE2SxV5JGeT/LP1n0OYVDUUFPxG9vdk2AlDlIit4t+Kf0xCtpgXPBwnn/9pw==",
+          "version": "0.5.4",
+          "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.5.4.tgz",
+          "integrity": "sha512-S/x2iOCvDaCASLYsOOgWOq4bCfKYVqvO/uxjkaYyZ3rVsVE3CeAI/c84NpyuBBymEgNvHgjEot3a9/Z/kXvqsg==",
           "dev": true,
           "requires": {
-            "@babel/helper-define-polyfill-provider": "^0.4.3"
+            "@babel/helper-define-polyfill-provider": "^0.4.4"
           }
         }
       }
@@ -21387,19 +21387,19 @@
       }
     },
     "babel-plugin-polyfill-corejs3": {
-      "version": "0.8.5",
-      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.8.5.tgz",
-      "integrity": "sha512-Q6CdATeAvbScWPNLB8lzSO7fgUVBkQt6zLgNlfyeCr/EQaEQR+bWiBYYPYAFyE528BMjRhL+1QBMOI4jc/c5TA==",
+      "version": "0.8.7",
+      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.8.7.tgz",
+      "integrity": "sha512-KyDvZYxAzkC0Aj2dAPyDzi2Ym15e5JKZSK+maI7NAwSqofvuFglbSsxE7wUOvTg9oFVnHMzVzBKcqEb4PJgtOA==",
       "dev": true,
       "requires": {
-        "@babel/helper-define-polyfill-provider": "^0.4.3",
-        "core-js-compat": "^3.32.2"
+        "@babel/helper-define-polyfill-provider": "^0.4.4",
+        "core-js-compat": "^3.33.1"
       },
       "dependencies": {
         "@babel/helper-define-polyfill-provider": {
-          "version": "0.4.3",
-          "resolved": "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.4.3.tgz",
-          "integrity": "sha512-WBrLmuPP47n7PNwsZ57pqam6G/RGo1vw/87b0Blc53tZNGZ4x7YvZ6HgQe2vo1W/FR20OgjeZuGXzudPiXHFug==",
+          "version": "0.4.4",
+          "resolved": "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.4.4.tgz",
+          "integrity": "sha512-QcJMILQCu2jm5TFPGA3lCpJJTeEP+mqeXooG/NZbg/h5FTFi6V0+99ahlRsW8/kRLyb24LZVCCiclDedhLKcBA==",
           "dev": true,
           "requires": {
             "@babel/helper-compilation-targets": "^7.22.6",
@@ -22223,11 +22223,11 @@
       "integrity": "sha512-aDdvlDder8QmY91H88GzNi9EtQi2TjvQhpCX6B1v/dAZHU1AuLgHvRh54RiOerpEhEW46Tkf+vgAViB/CWC0ag=="
     },
     "core-js-compat": {
-      "version": "3.33.0",
-      "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.33.0.tgz",
-      "integrity": "sha512-0w4LcLXsVEuNkIqwjjf9rjCoPhK8uqA4tMRh4Ge26vfLtUutshn+aRJU21I9LCJlh2QQHfisNToLjw1XEJLTWw==",
+      "version": "3.35.0",
+      "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.35.0.tgz",
+      "integrity": "sha512-5blwFAddknKeNgsjBzilkdQ0+YK8L1PfqPYq40NOYMYFSS38qj+hpTcLLWwpIwA2A5bje/x5jmVn2tzUMg9IVw==",
       "requires": {
-        "browserslist": "^4.22.1"
+        "browserslist": "^4.22.2"
       }
     },
     "core-util-is": {
diff --git a/apps/block_scout_web/assets/package.json b/apps/block_scout_web/assets/package.json
index ba8804631582..20bf4e7ecb62 100644
--- a/apps/block_scout_web/assets/package.json
+++ b/apps/block_scout_web/assets/package.json
@@ -84,7 +84,7 @@
   },
   "devDependencies": {
     "@babel/core": "^7.23.6",
-    "@babel/preset-env": "^7.23.6",
+    "@babel/preset-env": "^7.23.7",
     "autoprefixer": "^10.4.16",
     "babel-loader": "^9.1.3",
     "copy-webpack-plugin": "^11.0.0",

From 9920bac9597915f61c4275b6158bc8ee27ac574d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 1 Jan 2024 18:50:54 +0000
Subject: [PATCH 825/909] Bump moment from 2.29.4 to 2.30.1 in
 /apps/block_scout_web/assets

Bumps [moment](https://github.com/moment/moment) from 2.29.4 to 2.30.1.
- [Changelog](https://github.com/moment/moment/blob/develop/CHANGELOG.md)
- [Commits](https://github.com/moment/moment/compare/2.29.4...2.30.1)

---
updated-dependencies:
- dependency-name: moment
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 apps/block_scout_web/assets/package-lock.json | 14 +++++++-------
 apps/block_scout_web/assets/package.json      |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/apps/block_scout_web/assets/package-lock.json b/apps/block_scout_web/assets/package-lock.json
index ce501376510e..a68470a4bd4c 100644
--- a/apps/block_scout_web/assets/package-lock.json
+++ b/apps/block_scout_web/assets/package-lock.json
@@ -47,7 +47,7 @@
         "luxon": "^3.4.4",
         "malihu-custom-scrollbar-plugin": "3.1.5",
         "mixpanel-browser": "^2.48.1",
-        "moment": "^2.29.4",
+        "moment": "^2.30.1",
         "nanomorph": "^5.4.0",
         "numeral": "^2.0.6",
         "os-browserify": "^0.3.0",
@@ -12922,9 +12922,9 @@
       "integrity": "sha512-qYvlv/exQ4+svI3UOvPUpLDF0OMX5euvUH0Ny4N5QyRyhNdgAgUrVH3iUINSzEPLvx0kbo/Bp28GJKIqvE7URw=="
     },
     "node_modules/moment": {
-      "version": "2.29.4",
-      "resolved": "https://registry.npmjs.org/moment/-/moment-2.29.4.tgz",
-      "integrity": "sha512-5LC9SOxjSc2HF6vO2CyuTDNivEdoz2IvyJJGj6X8DJ0eFyfszE0QiEd+iXmBvUP3WHxSjFH/vIsA0EN00cgr8w==",
+      "version": "2.30.1",
+      "resolved": "https://registry.npmjs.org/moment/-/moment-2.30.1.tgz",
+      "integrity": "sha512-uEmtNhbDOrWPFS+hdjFCBfy9f2YoyzRpwcl+DqpC6taX21FzsTLQVbMV/W7PzNSX6x/bhC1zA3c2UQ5NzH6how==",
       "engines": {
         "node": "*"
       }
@@ -27614,9 +27614,9 @@
       "integrity": "sha512-qYvlv/exQ4+svI3UOvPUpLDF0OMX5euvUH0Ny4N5QyRyhNdgAgUrVH3iUINSzEPLvx0kbo/Bp28GJKIqvE7URw=="
     },
     "moment": {
-      "version": "2.29.4",
-      "resolved": "https://registry.npmjs.org/moment/-/moment-2.29.4.tgz",
-      "integrity": "sha512-5LC9SOxjSc2HF6vO2CyuTDNivEdoz2IvyJJGj6X8DJ0eFyfszE0QiEd+iXmBvUP3WHxSjFH/vIsA0EN00cgr8w=="
+      "version": "2.30.1",
+      "resolved": "https://registry.npmjs.org/moment/-/moment-2.30.1.tgz",
+      "integrity": "sha512-uEmtNhbDOrWPFS+hdjFCBfy9f2YoyzRpwcl+DqpC6taX21FzsTLQVbMV/W7PzNSX6x/bhC1zA3c2UQ5NzH6how=="
     },
     "ms": {
       "version": "2.1.2",
diff --git a/apps/block_scout_web/assets/package.json b/apps/block_scout_web/assets/package.json
index ba8804631582..ffc597f7169c 100644
--- a/apps/block_scout_web/assets/package.json
+++ b/apps/block_scout_web/assets/package.json
@@ -59,7 +59,7 @@
     "luxon": "^3.4.4",
     "malihu-custom-scrollbar-plugin": "3.1.5",
     "mixpanel-browser": "^2.48.1",
-    "moment": "^2.29.4",
+    "moment": "^2.30.1",
     "nanomorph": "^5.4.0",
     "numeral": "^2.0.6",
     "os-browserify": "^0.3.0",

From 9afcf010f0c0234a2be0296759af82c2020b1f86 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 1 Jan 2024 18:52:09 +0000
Subject: [PATCH 826/909] Bump postcss-loader from 7.3.3 to 7.3.4 in
 /apps/block_scout_web/assets

Bumps [postcss-loader](https://github.com/webpack-contrib/postcss-loader) from 7.3.3 to 7.3.4.
- [Release notes](https://github.com/webpack-contrib/postcss-loader/releases)
- [Changelog](https://github.com/webpack-contrib/postcss-loader/blob/master/CHANGELOG.md)
- [Commits](https://github.com/webpack-contrib/postcss-loader/compare/v7.3.3...v7.3.4)

---
updated-dependencies:
- dependency-name: postcss-loader
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 apps/block_scout_web/assets/package-lock.json | 78 ++++++++++---------
 apps/block_scout_web/assets/package.json      |  2 +-
 2 files changed, 44 insertions(+), 36 deletions(-)

diff --git a/apps/block_scout_web/assets/package-lock.json b/apps/block_scout_web/assets/package-lock.json
index ce501376510e..d37aa1207ce2 100644
--- a/apps/block_scout_web/assets/package-lock.json
+++ b/apps/block_scout_web/assets/package-lock.json
@@ -88,7 +88,7 @@
         "jest-environment-jsdom": "^29.7.0",
         "mini-css-extract-plugin": "^2.7.6",
         "postcss": "^8.4.32",
-        "postcss-loader": "^7.3.3",
+        "postcss-loader": "^7.3.4",
         "sass": "^1.69.5",
         "sass-loader": "^13.3.2",
         "style-loader": "^3.3.3",
@@ -5977,14 +5977,14 @@
       }
     },
     "node_modules/cosmiconfig": {
-      "version": "8.2.0",
-      "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-8.2.0.tgz",
-      "integrity": "sha512-3rTMnFJA1tCOPwRxtgF4wd7Ab2qvDbL8jX+3smjIbS4HlZBagTlpERbdN7iAbWlrfxE3M8c27kTwTawQ7st+OQ==",
+      "version": "8.3.6",
+      "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-8.3.6.tgz",
+      "integrity": "sha512-kcZ6+W5QzcJ3P1Mt+83OUv/oHFqZHIx8DuxG6eZ5RGMERoLqp4BuGjhHLYGK+Kf5XVkQvqBSmAy/nGWN3qDgEA==",
       "dev": true,
       "dependencies": {
-        "import-fresh": "^3.2.1",
+        "import-fresh": "^3.3.0",
         "js-yaml": "^4.1.0",
-        "parse-json": "^5.0.0",
+        "parse-json": "^5.2.0",
         "path-type": "^4.0.0"
       },
       "engines": {
@@ -5992,6 +5992,14 @@
       },
       "funding": {
         "url": "https://github.com/sponsors/d-fischer"
+      },
+      "peerDependencies": {
+        "typescript": ">=4.9.5"
+      },
+      "peerDependenciesMeta": {
+        "typescript": {
+          "optional": true
+        }
       }
     },
     "node_modules/cosmiconfig/node_modules/argparse": {
@@ -11908,9 +11916,9 @@
       }
     },
     "node_modules/jiti": {
-      "version": "1.18.2",
-      "resolved": "https://registry.npmjs.org/jiti/-/jiti-1.18.2.tgz",
-      "integrity": "sha512-QAdOptna2NYiSSpv0O/BwoHBSmz4YhpzJHyi+fnMRTXFjp7B8i/YG5Z8IfusxB1ufjcD2Sre1F3R+nX3fvy7gg==",
+      "version": "1.21.0",
+      "resolved": "https://registry.npmjs.org/jiti/-/jiti-1.21.0.tgz",
+      "integrity": "sha512-gFqAIbuKyyso/3G2qhiO2OM6shY6EPP/R0+mkDbyspxKazh8BXDC5FiFsUjlczgdNz/vfra0da2y+aHrusLG/Q==",
       "dev": true,
       "bin": {
         "jiti": "bin/jiti.js"
@@ -13861,14 +13869,14 @@
       }
     },
     "node_modules/postcss-loader": {
-      "version": "7.3.3",
-      "resolved": "https://registry.npmjs.org/postcss-loader/-/postcss-loader-7.3.3.tgz",
-      "integrity": "sha512-YgO/yhtevGO/vJePCQmTxiaEwER94LABZN0ZMT4A0vsak9TpO+RvKRs7EmJ8peIlB9xfXCsS7M8LjqncsUZ5HA==",
+      "version": "7.3.4",
+      "resolved": "https://registry.npmjs.org/postcss-loader/-/postcss-loader-7.3.4.tgz",
+      "integrity": "sha512-iW5WTTBSC5BfsBJ9daFMPVrLT36MrNiC6fqOZTTaHjBNX6Pfd5p+hSBqe/fEeNd7pc13QiAyGt7VdGMw4eRC4A==",
       "dev": true,
       "dependencies": {
-        "cosmiconfig": "^8.2.0",
-        "jiti": "^1.18.2",
-        "semver": "^7.3.8"
+        "cosmiconfig": "^8.3.5",
+        "jiti": "^1.20.0",
+        "semver": "^7.5.4"
       },
       "engines": {
         "node": ">= 14.15.0"
@@ -13883,9 +13891,9 @@
       }
     },
     "node_modules/postcss-loader/node_modules/semver": {
-      "version": "7.3.8",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz",
-      "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==",
+      "version": "7.5.4",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz",
+      "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==",
       "dev": true,
       "dependencies": {
         "lru-cache": "^6.0.0"
@@ -22245,14 +22253,14 @@
       }
     },
     "cosmiconfig": {
-      "version": "8.2.0",
-      "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-8.2.0.tgz",
-      "integrity": "sha512-3rTMnFJA1tCOPwRxtgF4wd7Ab2qvDbL8jX+3smjIbS4HlZBagTlpERbdN7iAbWlrfxE3M8c27kTwTawQ7st+OQ==",
+      "version": "8.3.6",
+      "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-8.3.6.tgz",
+      "integrity": "sha512-kcZ6+W5QzcJ3P1Mt+83OUv/oHFqZHIx8DuxG6eZ5RGMERoLqp4BuGjhHLYGK+Kf5XVkQvqBSmAy/nGWN3qDgEA==",
       "dev": true,
       "requires": {
-        "import-fresh": "^3.2.1",
+        "import-fresh": "^3.3.0",
         "js-yaml": "^4.1.0",
-        "parse-json": "^5.0.0",
+        "parse-json": "^5.2.0",
         "path-type": "^4.0.0"
       },
       "dependencies": {
@@ -26750,9 +26758,9 @@
       }
     },
     "jiti": {
-      "version": "1.18.2",
-      "resolved": "https://registry.npmjs.org/jiti/-/jiti-1.18.2.tgz",
-      "integrity": "sha512-QAdOptna2NYiSSpv0O/BwoHBSmz4YhpzJHyi+fnMRTXFjp7B8i/YG5Z8IfusxB1ufjcD2Sre1F3R+nX3fvy7gg==",
+      "version": "1.21.0",
+      "resolved": "https://registry.npmjs.org/jiti/-/jiti-1.21.0.tgz",
+      "integrity": "sha512-gFqAIbuKyyso/3G2qhiO2OM6shY6EPP/R0+mkDbyspxKazh8BXDC5FiFsUjlczgdNz/vfra0da2y+aHrusLG/Q==",
       "dev": true
     },
     "jquery": {
@@ -28280,20 +28288,20 @@
       "requires": {}
     },
     "postcss-loader": {
-      "version": "7.3.3",
-      "resolved": "https://registry.npmjs.org/postcss-loader/-/postcss-loader-7.3.3.tgz",
-      "integrity": "sha512-YgO/yhtevGO/vJePCQmTxiaEwER94LABZN0ZMT4A0vsak9TpO+RvKRs7EmJ8peIlB9xfXCsS7M8LjqncsUZ5HA==",
+      "version": "7.3.4",
+      "resolved": "https://registry.npmjs.org/postcss-loader/-/postcss-loader-7.3.4.tgz",
+      "integrity": "sha512-iW5WTTBSC5BfsBJ9daFMPVrLT36MrNiC6fqOZTTaHjBNX6Pfd5p+hSBqe/fEeNd7pc13QiAyGt7VdGMw4eRC4A==",
       "dev": true,
       "requires": {
-        "cosmiconfig": "^8.2.0",
-        "jiti": "^1.18.2",
-        "semver": "^7.3.8"
+        "cosmiconfig": "^8.3.5",
+        "jiti": "^1.20.0",
+        "semver": "^7.5.4"
       },
       "dependencies": {
         "semver": {
-          "version": "7.3.8",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz",
-          "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==",
+          "version": "7.5.4",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz",
+          "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==",
           "dev": true,
           "requires": {
             "lru-cache": "^6.0.0"
diff --git a/apps/block_scout_web/assets/package.json b/apps/block_scout_web/assets/package.json
index ba8804631582..dd346079003c 100644
--- a/apps/block_scout_web/assets/package.json
+++ b/apps/block_scout_web/assets/package.json
@@ -100,7 +100,7 @@
     "jest-environment-jsdom": "^29.7.0",
     "mini-css-extract-plugin": "^2.7.6",
     "postcss": "^8.4.32",
-    "postcss-loader": "^7.3.3",
+    "postcss-loader": "^7.3.4",
     "sass": "^1.69.5",
     "sass-loader": "^13.3.2",
     "style-loader": "^3.3.3",

From bd99e4595ef47f618f80b760ead4943cfbf31509 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 1 Jan 2024 19:14:03 +0000
Subject: [PATCH 827/909] Bump core-js from 3.34.0 to 3.35.0 in
 /apps/block_scout_web/assets

Bumps [core-js](https://github.com/zloirock/core-js/tree/HEAD/packages/core-js) from 3.34.0 to 3.35.0.
- [Release notes](https://github.com/zloirock/core-js/releases)
- [Changelog](https://github.com/zloirock/core-js/blob/master/CHANGELOG.md)
- [Commits](https://github.com/zloirock/core-js/commits/v3.35.0/packages/core-js)

---
updated-dependencies:
- dependency-name: core-js
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 apps/block_scout_web/assets/package-lock.json | 14 +++++++-------
 apps/block_scout_web/assets/package.json      |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/apps/block_scout_web/assets/package-lock.json b/apps/block_scout_web/assets/package-lock.json
index 3242fda252d5..bc3104cd4a26 100644
--- a/apps/block_scout_web/assets/package-lock.json
+++ b/apps/block_scout_web/assets/package-lock.json
@@ -17,7 +17,7 @@
         "chart.js": "^4.4.1",
         "chartjs-adapter-luxon": "^1.3.1",
         "clipboard": "^2.0.11",
-        "core-js": "^3.34.0",
+        "core-js": "^3.35.0",
         "crypto-browserify": "^3.12.0",
         "dropzone": "^5.9.3",
         "eth-net-props": "^1.0.41",
@@ -5938,9 +5938,9 @@
       }
     },
     "node_modules/core-js": {
-      "version": "3.34.0",
-      "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.34.0.tgz",
-      "integrity": "sha512-aDdvlDder8QmY91H88GzNi9EtQi2TjvQhpCX6B1v/dAZHU1AuLgHvRh54RiOerpEhEW46Tkf+vgAViB/CWC0ag==",
+      "version": "3.35.0",
+      "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.35.0.tgz",
+      "integrity": "sha512-ntakECeqg81KqMueeGJ79Q5ZgQNR+6eaE8sxGCx62zMbAIj65q+uYvatToew3m6eAGdU4gNZwpZ34NMe4GYswg==",
       "hasInstallScript": true,
       "funding": {
         "type": "opencollective",
@@ -22218,9 +22218,9 @@
       }
     },
     "core-js": {
-      "version": "3.34.0",
-      "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.34.0.tgz",
-      "integrity": "sha512-aDdvlDder8QmY91H88GzNi9EtQi2TjvQhpCX6B1v/dAZHU1AuLgHvRh54RiOerpEhEW46Tkf+vgAViB/CWC0ag=="
+      "version": "3.35.0",
+      "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.35.0.tgz",
+      "integrity": "sha512-ntakECeqg81KqMueeGJ79Q5ZgQNR+6eaE8sxGCx62zMbAIj65q+uYvatToew3m6eAGdU4gNZwpZ34NMe4GYswg=="
     },
     "core-js-compat": {
       "version": "3.35.0",
diff --git a/apps/block_scout_web/assets/package.json b/apps/block_scout_web/assets/package.json
index 20bf4e7ecb62..efd38ee47c92 100644
--- a/apps/block_scout_web/assets/package.json
+++ b/apps/block_scout_web/assets/package.json
@@ -29,7 +29,7 @@
     "chart.js": "^4.4.1",
     "chartjs-adapter-luxon": "^1.3.1",
     "clipboard": "^2.0.11",
-    "core-js": "^3.34.0",
+    "core-js": "^3.35.0",
     "crypto-browserify": "^3.12.0",
     "dropzone": "^5.9.3",
     "eth-net-props": "^1.0.41",

From 31098dc0a8373baa4f11b314eaee9a1f6b3bcfd0 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 1 Jan 2024 19:15:06 +0000
Subject: [PATCH 828/909] Bump @babel/core from 7.23.6 to 7.23.7 in
 /apps/block_scout_web/assets

Bumps [@babel/core](https://github.com/babel/babel/tree/HEAD/packages/babel-core) from 7.23.6 to 7.23.7.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/commits/v7.23.7/packages/babel-core)

---
updated-dependencies:
- dependency-name: "@babel/core"
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 apps/block_scout_web/assets/package-lock.json | 50 +++++++++----------
 apps/block_scout_web/assets/package.json      |  2 +-
 2 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/apps/block_scout_web/assets/package-lock.json b/apps/block_scout_web/assets/package-lock.json
index 3242fda252d5..fdceed739d12 100644
--- a/apps/block_scout_web/assets/package-lock.json
+++ b/apps/block_scout_web/assets/package-lock.json
@@ -71,7 +71,7 @@
         "xss": "^1.0.14"
       },
       "devDependencies": {
-        "@babel/core": "^7.23.6",
+        "@babel/core": "^7.23.7",
         "@babel/preset-env": "^7.23.7",
         "autoprefixer": "^10.4.16",
         "babel-loader": "^9.1.3",
@@ -249,19 +249,19 @@
       }
     },
     "node_modules/@babel/core": {
-      "version": "7.23.6",
-      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.23.6.tgz",
-      "integrity": "sha512-FxpRyGjrMJXh7X3wGLGhNDCRiwpWEF74sKjTLDJSG5Kyvow3QZaG0Adbqzi9ZrVjTWpsX+2cxWXD71NMg93kdw==",
+      "version": "7.23.7",
+      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.23.7.tgz",
+      "integrity": "sha512-+UpDgowcmqe36d4NwqvKsyPMlOLNGMsfMmQ5WGCu+siCe3t3dfe9njrzGfdN4qq+bcNUt0+Vw6haRxBOycs4dw==",
       "dependencies": {
         "@ampproject/remapping": "^2.2.0",
         "@babel/code-frame": "^7.23.5",
         "@babel/generator": "^7.23.6",
         "@babel/helper-compilation-targets": "^7.23.6",
         "@babel/helper-module-transforms": "^7.23.3",
-        "@babel/helpers": "^7.23.6",
+        "@babel/helpers": "^7.23.7",
         "@babel/parser": "^7.23.6",
         "@babel/template": "^7.22.15",
-        "@babel/traverse": "^7.23.6",
+        "@babel/traverse": "^7.23.7",
         "@babel/types": "^7.23.6",
         "convert-source-map": "^2.0.0",
         "debug": "^4.1.0",
@@ -602,12 +602,12 @@
       }
     },
     "node_modules/@babel/helpers": {
-      "version": "7.23.6",
-      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.23.6.tgz",
-      "integrity": "sha512-wCfsbN4nBidDRhpDhvcKlzHWCTlgJYUUdSJfzXb2NuBssDSIjc3xcb+znA7l+zYsFljAcGM0aFkN40cR3lXiGA==",
+      "version": "7.23.7",
+      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.23.7.tgz",
+      "integrity": "sha512-6AMnjCoC8wjqBzDHkuqpa7jAKwvMo4dC+lr/TFBz+ucfulO1XMpDnwWPGBNwClOKZ8h6xn5N81W/R5OrcKtCbQ==",
       "dependencies": {
         "@babel/template": "^7.22.15",
-        "@babel/traverse": "^7.23.6",
+        "@babel/traverse": "^7.23.7",
         "@babel/types": "^7.23.6"
       },
       "engines": {
@@ -1960,9 +1960,9 @@
       }
     },
     "node_modules/@babel/traverse": {
-      "version": "7.23.6",
-      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.23.6.tgz",
-      "integrity": "sha512-czastdK1e8YByZqezMPFiZ8ahwVMh/ESl9vPgvgdB9AmFMGP5jfpFax74AQgl5zj4XHzqeYAg2l8PuUeRS1MgQ==",
+      "version": "7.23.7",
+      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.23.7.tgz",
+      "integrity": "sha512-tY3mM8rH9jM0YHFGyfC0/xf+SB5eKUu7HPj7/k3fpi9dAlsMc5YbQvDi0Sh2QTPXqMhyaAtzAr807TIyfQrmyg==",
       "dependencies": {
         "@babel/code-frame": "^7.23.5",
         "@babel/generator": "^7.23.6",
@@ -17985,19 +17985,19 @@
       "integrity": "sha512-uU27kfDRlhfKl+w1U6vp16IuvSLtjAxdArVXPa9BvLkrr7CYIsxH5adpHObeAGY/41+syctUWOZ140a2Rvkgjw=="
     },
     "@babel/core": {
-      "version": "7.23.6",
-      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.23.6.tgz",
-      "integrity": "sha512-FxpRyGjrMJXh7X3wGLGhNDCRiwpWEF74sKjTLDJSG5Kyvow3QZaG0Adbqzi9ZrVjTWpsX+2cxWXD71NMg93kdw==",
+      "version": "7.23.7",
+      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.23.7.tgz",
+      "integrity": "sha512-+UpDgowcmqe36d4NwqvKsyPMlOLNGMsfMmQ5WGCu+siCe3t3dfe9njrzGfdN4qq+bcNUt0+Vw6haRxBOycs4dw==",
       "requires": {
         "@ampproject/remapping": "^2.2.0",
         "@babel/code-frame": "^7.23.5",
         "@babel/generator": "^7.23.6",
         "@babel/helper-compilation-targets": "^7.23.6",
         "@babel/helper-module-transforms": "^7.23.3",
-        "@babel/helpers": "^7.23.6",
+        "@babel/helpers": "^7.23.7",
         "@babel/parser": "^7.23.6",
         "@babel/template": "^7.22.15",
-        "@babel/traverse": "^7.23.6",
+        "@babel/traverse": "^7.23.7",
         "@babel/types": "^7.23.6",
         "convert-source-map": "^2.0.0",
         "debug": "^4.1.0",
@@ -18248,12 +18248,12 @@
       }
     },
     "@babel/helpers": {
-      "version": "7.23.6",
-      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.23.6.tgz",
-      "integrity": "sha512-wCfsbN4nBidDRhpDhvcKlzHWCTlgJYUUdSJfzXb2NuBssDSIjc3xcb+znA7l+zYsFljAcGM0aFkN40cR3lXiGA==",
+      "version": "7.23.7",
+      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.23.7.tgz",
+      "integrity": "sha512-6AMnjCoC8wjqBzDHkuqpa7jAKwvMo4dC+lr/TFBz+ucfulO1XMpDnwWPGBNwClOKZ8h6xn5N81W/R5OrcKtCbQ==",
       "requires": {
         "@babel/template": "^7.22.15",
-        "@babel/traverse": "^7.23.6",
+        "@babel/traverse": "^7.23.7",
         "@babel/types": "^7.23.6"
       }
     },
@@ -19167,9 +19167,9 @@
       }
     },
     "@babel/traverse": {
-      "version": "7.23.6",
-      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.23.6.tgz",
-      "integrity": "sha512-czastdK1e8YByZqezMPFiZ8ahwVMh/ESl9vPgvgdB9AmFMGP5jfpFax74AQgl5zj4XHzqeYAg2l8PuUeRS1MgQ==",
+      "version": "7.23.7",
+      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.23.7.tgz",
+      "integrity": "sha512-tY3mM8rH9jM0YHFGyfC0/xf+SB5eKUu7HPj7/k3fpi9dAlsMc5YbQvDi0Sh2QTPXqMhyaAtzAr807TIyfQrmyg==",
       "requires": {
         "@babel/code-frame": "^7.23.5",
         "@babel/generator": "^7.23.6",
diff --git a/apps/block_scout_web/assets/package.json b/apps/block_scout_web/assets/package.json
index 20bf4e7ecb62..0497308b90f2 100644
--- a/apps/block_scout_web/assets/package.json
+++ b/apps/block_scout_web/assets/package.json
@@ -83,7 +83,7 @@
     "xss": "^1.0.14"
   },
   "devDependencies": {
-    "@babel/core": "^7.23.6",
+    "@babel/core": "^7.23.7",
     "@babel/preset-env": "^7.23.7",
     "autoprefixer": "^10.4.16",
     "babel-loader": "^9.1.3",

From f24d2483f1172f4af1014cfb3f32d7ac0258abbb Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 1 Jan 2024 20:30:49 +0000
Subject: [PATCH 829/909] Bump sass from 1.69.5 to 1.69.6 in
 /apps/block_scout_web/assets

Bumps [sass](https://github.com/sass/dart-sass) from 1.69.5 to 1.69.6.
- [Release notes](https://github.com/sass/dart-sass/releases)
- [Changelog](https://github.com/sass/dart-sass/blob/main/CHANGELOG.md)
- [Commits](https://github.com/sass/dart-sass/compare/1.69.5...1.69.6)

---
updated-dependencies:
- dependency-name: sass
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 apps/block_scout_web/assets/package-lock.json | 14 +++++++-------
 apps/block_scout_web/assets/package.json      |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/apps/block_scout_web/assets/package-lock.json b/apps/block_scout_web/assets/package-lock.json
index da2f47517c80..77192dd8a924 100644
--- a/apps/block_scout_web/assets/package-lock.json
+++ b/apps/block_scout_web/assets/package-lock.json
@@ -89,7 +89,7 @@
         "mini-css-extract-plugin": "^2.7.6",
         "postcss": "^8.4.32",
         "postcss-loader": "^7.3.4",
-        "sass": "^1.69.5",
+        "sass": "^1.69.6",
         "sass-loader": "^13.3.3",
         "style-loader": "^3.3.3",
         "webpack": "^5.89.0",
@@ -15193,9 +15193,9 @@
       "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
     },
     "node_modules/sass": {
-      "version": "1.69.5",
-      "resolved": "https://registry.npmjs.org/sass/-/sass-1.69.5.tgz",
-      "integrity": "sha512-qg2+UCJibLr2LCVOt3OlPhr/dqVHWOa9XtZf2OjbLs/T4VPSJ00udtgJxH3neXZm+QqX8B+3cU7RaLqp1iVfcQ==",
+      "version": "1.69.6",
+      "resolved": "https://registry.npmjs.org/sass/-/sass-1.69.6.tgz",
+      "integrity": "sha512-qbRr3k9JGHWXCvZU77SD2OTwUlC+gNT+61JOLcmLm+XqH4h/5D+p4IIsxvpkB89S9AwJOyb5+rWNpIucaFxSFQ==",
       "dev": true,
       "dependencies": {
         "chokidar": ">=3.0.0 <4.0.0",
@@ -29243,9 +29243,9 @@
       "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
     },
     "sass": {
-      "version": "1.69.5",
-      "resolved": "https://registry.npmjs.org/sass/-/sass-1.69.5.tgz",
-      "integrity": "sha512-qg2+UCJibLr2LCVOt3OlPhr/dqVHWOa9XtZf2OjbLs/T4VPSJ00udtgJxH3neXZm+QqX8B+3cU7RaLqp1iVfcQ==",
+      "version": "1.69.6",
+      "resolved": "https://registry.npmjs.org/sass/-/sass-1.69.6.tgz",
+      "integrity": "sha512-qbRr3k9JGHWXCvZU77SD2OTwUlC+gNT+61JOLcmLm+XqH4h/5D+p4IIsxvpkB89S9AwJOyb5+rWNpIucaFxSFQ==",
       "dev": true,
       "requires": {
         "chokidar": ">=3.0.0 <4.0.0",
diff --git a/apps/block_scout_web/assets/package.json b/apps/block_scout_web/assets/package.json
index 40eddc0776a0..9d8513f7037a 100644
--- a/apps/block_scout_web/assets/package.json
+++ b/apps/block_scout_web/assets/package.json
@@ -101,7 +101,7 @@
     "mini-css-extract-plugin": "^2.7.6",
     "postcss": "^8.4.32",
     "postcss-loader": "^7.3.4",
-    "sass": "^1.69.5",
+    "sass": "^1.69.6",
     "sass-loader": "^13.3.3",
     "style-loader": "^3.3.3",
     "webpack": "^5.89.0",

From f2a79e45da745d8fbfb9f82f040aeeea52ba727d Mon Sep 17 00:00:00 2001
From: Maxim Filonov <53992153+sl1depengwyn@users.noreply.github.com>
Date: Fri, 22 Dec 2023 18:50:28 +0300
Subject: [PATCH 830/909] Expand gas price oracle functionality

---
 CHANGELOG.md                                  |   2 +
 .../api/v1/gas_price_oracle_controller.ex     |   4 +-
 .../controllers/api/v2/stats_controller.ex    |  34 +++
 .../gas_price_oracle_legend_item.html.eex     |  10 +-
 .../lib/block_scout_web/views/chain_view.ex   |   5 +-
 .../explorer/chain/cache/gas_price_oracle.ex  | 206 ++++++++++----
 apps/explorer/lib/explorer/market/market.ex   |   2 +-
 .../lib/explorer/market/market_history.ex     |   8 +-
 ...720_constrain_null_date_market_history.exs |   9 +
 .../chain/cache/gas_price_oracle_test.exs     | 255 ++++++++++++++----
 config/runtime.exs                            |   1 +
 cspell.json                                   |  17 +-
 docker-compose/envs/common-blockscout.env     |   6 +
 13 files changed, 433 insertions(+), 126 deletions(-)
 create mode 100644 apps/explorer/priv/repo/migrations/20240103094720_constrain_null_date_market_history.exs

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f4f63d99195c..71a6a08a4921 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,8 @@
 
 ### Features
 
+- [#9044](https://github.com/blockscout/blockscout/pull/9044) - Expand gas price oracle functionality
+
 ### Fixes
 
 - [#9062](https://github.com/blockscout/blockscout/pull/9062) - Fix blockscout-ens integration
diff --git a/apps/block_scout_web/lib/block_scout_web/controllers/api/v1/gas_price_oracle_controller.ex b/apps/block_scout_web/lib/block_scout_web/controllers/api/v1/gas_price_oracle_controller.ex
index 7b70b4b4276f..1c99dcb17136 100644
--- a/apps/block_scout_web/lib/block_scout_web/controllers/api/v1/gas_price_oracle_controller.ex
+++ b/apps/block_scout_web/lib/block_scout_web/controllers/api/v1/gas_price_oracle_controller.ex
@@ -30,8 +30,8 @@ defmodule BlockScoutWeb.API.V1.GasPriceOracleController do
     |> send_resp(status, result)
   end
 
-  def result(gas_prices) do
-    gas_prices
+  defp result(gas_prices) do
+    %{slow: gas_prices[:slow][:price], average: gas_prices[:average][:price], fast: gas_prices[:fast][:price]}
     |> Jason.encode!()
   end
 
diff --git a/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/stats_controller.ex b/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/stats_controller.ex
index 825d9f1b2575..34ea7b3eae34 100644
--- a/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/stats_controller.ex
+++ b/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/stats_controller.ex
@@ -12,6 +12,7 @@ defmodule BlockScoutWeb.API.V2.StatsController do
   alias Explorer.Chain.Supply.RSK
   alias Explorer.Chain.Transaction.History.TransactionStats
   alias Explorer.Counters.AverageBlockTime
+  alias Plug.Conn
   alias Timex.Duration
 
   @api_true [api?: true]
@@ -39,6 +40,21 @@ defmodule BlockScoutWeb.API.V2.StatsController do
           nil
       end
 
+    coin_price_change =
+      case Market.fetch_recent_history() do
+        [today, yesterday | _] ->
+          today.closing_price && yesterday.closing_price &&
+            today.closing_price
+            |> Decimal.div(yesterday.closing_price)
+            |> Decimal.sub(1)
+            |> Decimal.mult(100)
+            |> Decimal.to_float()
+            |> Float.ceil(2)
+
+        _ ->
+          nil
+      end
+
     gas_price = Application.get_env(:block_scout_web, :gas_price)
 
     json(
@@ -49,16 +65,20 @@ defmodule BlockScoutWeb.API.V2.StatsController do
         "total_transactions" => TransactionCache.estimated_count() |> to_string(),
         "average_block_time" => AverageBlockTime.average_block_time() |> Duration.to_milliseconds(),
         "coin_price" => exchange_rate_from_db.usd_value,
+        "coin_price_change_percentage" => coin_price_change,
         "total_gas_used" => GasUsage.total() |> to_string(),
         "transactions_today" => Enum.at(transaction_stats, 0).number_of_transactions |> to_string(),
         "gas_used_today" => Enum.at(transaction_stats, 0).gas_used,
         "gas_prices" => gas_prices,
+        "gas_prices_update_in" => GasPriceOracle.global_ttl(),
+        "gas_price_updated_at" => GasPriceOracle.get_updated_at(),
         "static_gas_price" => gas_price,
         "market_cap" => Helper.market_cap(market_cap_type, exchange_rate_from_db),
         "tvl" => exchange_rate_from_db.tvl_usd,
         "network_utilization_percentage" => network_utilization_percentage()
       }
       |> add_rootstock_locked_btc()
+      |> backward_compatibility(conn)
     )
   end
 
@@ -135,4 +155,18 @@ defmodule BlockScoutWeb.API.V2.StatsController do
       _ -> stats
     end
   end
+
+  defp backward_compatibility(response, conn) do
+    case Conn.get_req_header(conn, "updated-gas-oracle") do
+      ["true"] ->
+        response
+
+      _ ->
+        response
+        |> Map.update("gas_prices", nil, fn
+          gas_prices ->
+            %{slow: gas_prices[:slow][:price], average: gas_prices[:average][:price], fast: gas_prices[:fast][:price]}
+        end)
+    end
+  end
 end
diff --git a/apps/block_scout_web/lib/block_scout_web/templates/chain/gas_price_oracle_legend_item.html.eex b/apps/block_scout_web/lib/block_scout_web/templates/chain/gas_price_oracle_legend_item.html.eex
index 4b84dce35873..f07899ea9bf8 100644
--- a/apps/block_scout_web/lib/block_scout_web/templates/chain/gas_price_oracle_legend_item.html.eex
+++ b/apps/block_scout_web/lib/block_scout_web/templates/chain/gas_price_oracle_legend_item.html.eex
@@ -8,7 +8,7 @@
         <span class="dashboard-banner-chart-legend-value inline">
             <div>
             <div class="d-flex flex-row" style="height: 20px; line-height: 20px;">
-                <div class="flex-column"><%= "#{gas_prices_from_oracle["average"]}" <> " " %><%= gettext "Gwei" %></div>
+                <div class="flex-column"><%= "#{gas_prices_from_oracle[:average]}" <> " " %><%= gettext "Gwei" %></div>
                 <span
                 data-toggle="tooltip"
                 data-placement="top"
@@ -17,9 +17,9 @@
                 title="
                 <div class='custom-tooltip header'><%= gettext "Gas tracker" %></div>
                 <div>
-                    <div class='custom-tooltip description left d-flex'><span><%= gettext "Slow" %></span><span class='custom-tooltip description right'><%= gas_prices_from_oracle["slow"] %> <%= gettext "Gwei" %></span></div>
-                    <div class='custom-tooltip description left d-flex'><span><%= gettext "Average" %></span><span class='custom-tooltip description right'><%= gas_prices_from_oracle["average"] %> <%= gettext "Gwei" %></span></div>
-                    <div class='custom-tooltip description left d-flex'><span><%= gettext "Fast" %></span><span class='custom-tooltip description right'><%= gas_prices_from_oracle["fast"] %> <%= gettext "Gwei" %></span></div>
+                    <div class='custom-tooltip description left d-flex'><span><%= gettext "Slow" %></span><span class='custom-tooltip description right'><%= gas_prices_from_oracle[:slow] %> <%= gettext "Gwei" %></span></div>
+                    <div class='custom-tooltip description left d-flex'><span><%= gettext "Average" %></span><span class='custom-tooltip description right'><%= gas_prices_from_oracle[:average] %> <%= gettext "Gwei" %></span></div>
+                    <div class='custom-tooltip description left d-flex'><span><%= gettext "Fast" %></span><span class='custom-tooltip description right'><%= gas_prices_from_oracle[:fast] %> <%= gettext "Gwei" %></span></div>
                 </div>
                 "
                 >
@@ -40,4 +40,4 @@
         <% end %>
         <% end %>
     </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/apps/block_scout_web/lib/block_scout_web/views/chain_view.ex b/apps/block_scout_web/lib/block_scout_web/views/chain_view.ex
index 43d66a29266d..bbbcdebe866e 100644
--- a/apps/block_scout_web/lib/block_scout_web/views/chain_view.ex
+++ b/apps/block_scout_web/lib/block_scout_web/views/chain_view.ex
@@ -60,10 +60,7 @@ defmodule BlockScoutWeb.ChainView do
   defp gas_prices do
     case GasPriceOracle.get_gas_prices() do
       {:ok, gas_prices} ->
-        gas_prices
-
-      nil ->
-        nil
+        %{slow: gas_prices[:slow][:price], average: gas_prices[:average][:price], fast: gas_prices[:fast][:price]}
 
       _ ->
         nil
diff --git a/apps/explorer/lib/explorer/chain/cache/gas_price_oracle.ex b/apps/explorer/lib/explorer/chain/cache/gas_price_oracle.ex
index e147c9c0c782..b1d0c10572c9 100644
--- a/apps/explorer/lib/explorer/chain/cache/gas_price_oracle.ex
+++ b/apps/explorer/lib/explorer/chain/cache/gas_price_oracle.ex
@@ -17,27 +17,61 @@ defmodule Explorer.Chain.Cache.GasPriceOracle do
     Wei
   }
 
-  alias Explorer.Repo
+  alias Explorer.Counters.AverageBlockTime
+  alias Explorer.{Market, Repo}
+  alias Timex.Duration
 
   use Explorer.Chain.MapCache,
     name: :gas_price,
     key: :gas_prices,
+    key: :gas_prices_acc,
+    key: :updated_at,
     key: :old_gas_prices,
     key: :async_task,
-    global_ttl: Application.get_env(:explorer, __MODULE__)[:global_ttl],
+    global_ttl: global_ttl(),
     ttl_check_interval: :timer.seconds(1),
     callback: &async_task_on_deletion(&1)
 
   @doc """
-  Get `safelow`, `average` and `fast` percentile of transactions gas prices among the last `num_of_blocks` blocks
+  Calculates the `slow`, `average`, and `fast` gas price and time percentiles from the last `num_of_blocks` blocks and estimates the fiat price for each percentile.
+  These percentiles correspond to the likelihood of a transaction being picked up by miners depending on the fee offered.
   """
   @spec get_average_gas_price(pos_integer(), pos_integer(), pos_integer(), pos_integer()) ::
-          {:error, any} | {:ok, %{String.t() => nil | float, String.t() => nil | float, String.t() => nil | float}}
+          {{:error, any} | {:ok, %{slow: gas_price, average: gas_price, fast: gas_price}},
+           [
+             %{
+               block_number: non_neg_integer(),
+               slow_gas_price: nil | Decimal.t(),
+               fast_gas_price: nil | Decimal.t(),
+               average_gas_price: nil | Decimal.t(),
+               slow_priority_fee_per_gas: nil | Decimal.t(),
+               average_priority_fee_per_gas: nil | Decimal.t(),
+               fast_priority_fee_per_gas: nil | Decimal.t(),
+               slow_time: nil | Decimal.t(),
+               average_time: nil | Decimal.t(),
+               fast_time: nil | Decimal.t()
+             }
+           ]}
+        when gas_price: nil | %{price: float(), time: float(), fiat_price: Decimal.t()}
   def get_average_gas_price(num_of_blocks, safelow_percentile, average_percentile, fast_percentile) do
     safelow_percentile_fraction = safelow_percentile / 100
     average_percentile_fraction = average_percentile / 100
     fast_percentile_fraction = fast_percentile / 100
 
+    acc = get_gas_prices_acc()
+
+    from_block =
+      case acc do
+        [%{block_number: from_block} | _] -> from_block
+        _ -> -1
+      end
+
+    average_block_time =
+      case AverageBlockTime.average_block_time() do
+        {:error, _} -> nil
+        average_block_time -> average_block_time |> Duration.to_milliseconds()
+      end
+
     fee_query =
       from(
         block in Block,
@@ -45,120 +79,186 @@ defmodule Explorer.Chain.Cache.GasPriceOracle do
         where: block.consensus == true,
         where: transaction.status == ^1,
         where: transaction.gas_price > ^0,
-        group_by: block.number,
-        order_by: [desc: block.number],
+        where: transaction.block_number > ^from_block,
+        group_by: transaction.block_number,
+        order_by: [desc: transaction.block_number],
         select: %{
+          block_number: transaction.block_number,
           slow_gas_price:
             fragment(
-              "percentile_disc(?) within group ( order by ? )",
+              "percentile_disc(? :: real) within group ( order by ? )",
               ^safelow_percentile_fraction,
               transaction.gas_price
             ),
           average_gas_price:
             fragment(
-              "percentile_disc(?) within group ( order by ? )",
+              "percentile_disc(? :: real) within group ( order by ? )",
               ^average_percentile_fraction,
               transaction.gas_price
             ),
           fast_gas_price:
             fragment(
-              "percentile_disc(?) within group ( order by ? )",
+              "percentile_disc(? :: real) within group ( order by ? )",
               ^fast_percentile_fraction,
               transaction.gas_price
             ),
-          slow:
+          slow_priority_fee_per_gas:
             fragment(
-              "percentile_disc(?) within group ( order by ? )",
+              "percentile_disc(? :: real) within group ( order by ? )",
               ^safelow_percentile_fraction,
               transaction.max_priority_fee_per_gas
             ),
-          average:
+          average_priority_fee_per_gas:
             fragment(
-              "percentile_disc(?) within group ( order by ? )",
+              "percentile_disc(? :: real) within group ( order by ? )",
               ^average_percentile_fraction,
               transaction.max_priority_fee_per_gas
             ),
-          fast:
+          fast_priority_fee_per_gas:
             fragment(
-              "percentile_disc(?) within group ( order by ? )",
+              "percentile_disc(? :: real) within group ( order by ? )",
               ^fast_percentile_fraction,
               transaction.max_priority_fee_per_gas
+            ),
+          slow_time:
+            fragment(
+              "percentile_disc(? :: real) within group ( order by coalesce(extract(milliseconds from (?)::interval), ?) desc )",
+              ^safelow_percentile_fraction,
+              block.timestamp - transaction.earliest_processing_start,
+              ^average_block_time
+            ),
+          average_time:
+            fragment(
+              "percentile_disc(? :: real) within group ( order by coalesce(extract(milliseconds from (?)::interval), ?) desc )",
+              ^average_percentile_fraction,
+              block.timestamp - transaction.earliest_processing_start,
+              ^average_block_time
+            ),
+          fast_time:
+            fragment(
+              "percentile_disc(? :: real) within group ( order by coalesce(extract(milliseconds from (?)::interval), ?) desc )",
+              ^fast_percentile_fraction,
+              block.timestamp - transaction.earliest_processing_start,
+              ^average_block_time
             )
         },
         limit: ^num_of_blocks
       )
 
-    gas_prices = fee_query |> Repo.all(timeout: :infinity) |> process_fee_data_from_db()
+    new_acc = fee_query |> Repo.all(timeout: :infinity) |> merge_gas_prices(acc, num_of_blocks)
+
+    gas_prices = new_acc |> process_fee_data_from_db()
 
-    {:ok, gas_prices}
+    {{:ok, gas_prices}, new_acc}
   catch
     error ->
-      {:error, error}
+      Logger.error("Failed to get gas prices: #{inspect(error)}")
+      {{:error, error}, get_gas_prices_acc()}
   end
 
+  defp merge_gas_prices(new, acc, acc_size), do: Enum.take(new ++ acc, acc_size)
+
   defp process_fee_data_from_db([]) do
     %{
-      "slow" => nil,
-      "average" => nil,
-      "fast" => nil
+      slow: nil,
+      average: nil,
+      fast: nil
     }
   end
 
   defp process_fee_data_from_db(fees) do
-    fees_length = Enum.count(fees)
-
     %{
       slow_gas_price: slow_gas_price,
       average_gas_price: average_gas_price,
       fast_gas_price: fast_gas_price,
-      slow: slow,
-      average: average,
-      fast: fast
-    } =
-      fees
-      |> Enum.reduce(
-        &Map.merge(&1, &2, fn
-          _, v1, v2 when nil not in [v1, v2] -> Decimal.add(v1, v2)
-          _, v1, v2 -> v1 || v2
-        end)
-      )
-      |> Map.new(fn
-        {key, nil} -> {key, nil}
-        {key, value} -> {key, Decimal.div(value, fees_length)}
-      end)
+      slow_priority_fee_per_gas: slow_priority_fee_per_gas,
+      average_priority_fee_per_gas: average_priority_fee_per_gas,
+      fast_priority_fee_per_gas: fast_priority_fee_per_gas,
+      slow_time: slow_time,
+      average_time: average_time,
+      fast_time: fast_time
+    } = merge_fees(fees)
 
     json_rpc_named_arguments = Application.get_env(:explorer, :json_rpc_named_arguments)
 
     {slow_fee, average_fee, fast_fee} =
-      case {nil not in [slow, average, fast], EthereumJSONRPC.fetch_block_by_tag("pending", json_rpc_named_arguments)} do
-        {true, {:ok, %Blocks{blocks_params: [%{base_fee_per_gas: base_fee}]}}} when not is_nil(base_fee) ->
+      case nil not in [slow_priority_fee_per_gas, average_priority_fee_per_gas, fast_priority_fee_per_gas] &&
+             EthereumJSONRPC.fetch_block_by_tag("pending", json_rpc_named_arguments) do
+        {:ok, %Blocks{blocks_params: [%{base_fee_per_gas: base_fee}]}} when not is_nil(base_fee) ->
           base_fee_wei = base_fee |> Decimal.new() |> Wei.from(:wei)
 
           {
-            priority_with_base_fee(slow, base_fee_wei),
-            priority_with_base_fee(average, base_fee_wei),
-            priority_with_base_fee(fast, base_fee_wei)
+            priority_with_base_fee(slow_priority_fee_per_gas, base_fee_wei),
+            priority_with_base_fee(average_priority_fee_per_gas, base_fee_wei),
+            priority_with_base_fee(fast_priority_fee_per_gas, base_fee_wei)
           }
 
         _ ->
           {gas_price(slow_gas_price), gas_price(average_gas_price), gas_price(fast_gas_price)}
       end
 
+    exchange_rate_from_db = Market.get_coin_exchange_rate()
+
     %{
-      "slow" => slow_fee,
-      "average" => average_fee,
-      "fast" => fast_fee
+      slow: compose_gas_price(slow_fee, slow_time, exchange_rate_from_db),
+      average: compose_gas_price(average_fee, average_time, exchange_rate_from_db),
+      fast: compose_gas_price(fast_fee, fast_time, exchange_rate_from_db)
     }
   end
 
+  defp merge_fees(fees_from_db) do
+    fees_from_db
+    |> Stream.map(&Map.delete(&1, :block_number))
+    |> Enum.reduce(
+      &Map.merge(&1, &2, fn
+        _, nil, nil -> nil
+        _, val, acc when nil not in [val, acc] and is_list(acc) -> [val | acc]
+        _, val, acc when nil not in [val, acc] -> [val, acc]
+        _, val, acc -> [val || acc]
+      end)
+    )
+    |> Map.new(fn
+      {key, nil} ->
+        {key, nil}
+
+      {key, value} ->
+        value = if is_list(value), do: value, else: [value]
+        count = Enum.count(value)
+        {key, value |> Enum.reduce(Decimal.new(0), &Decimal.add/2) |> Decimal.div(count)}
+    end)
+  end
+
+  defp compose_gas_price(fee, time, exchange_rate_from_db) do
+    %{
+      price: fee |> format_wei(),
+      time: time && time |> Decimal.to_float(),
+      fiat_price: fiat_fee(fee, exchange_rate_from_db)
+    }
+  end
+
+  defp fiat_fee(fee, exchange_rate) do
+    exchange_rate.usd_value &&
+      fee
+      |> Wei.to(:ether)
+      |> Decimal.mult(exchange_rate.usd_value)
+      |> Decimal.mult(simple_transaction_gas())
+      |> Decimal.round(2)
+  end
+
   defp priority_with_base_fee(priority, base_fee) do
-    priority |> Wei.from(:wei) |> Wei.sum(base_fee) |> Wei.to(:gwei) |> Decimal.to_float() |> Float.ceil(2)
+    priority |> Wei.from(:wei) |> Wei.sum(base_fee)
   end
 
   defp gas_price(value) do
-    value |> Wei.from(:wei) |> Wei.to(:gwei) |> Decimal.to_float() |> Float.ceil(2)
+    value |> Wei.from(:wei)
   end
 
+  defp format_wei(wei), do: wei |> Wei.to(:gwei) |> Decimal.to_float() |> Float.ceil(2)
+
+  def global_ttl, do: Application.get_env(:explorer, __MODULE__)[:global_ttl]
+
+  defp simple_transaction_gas, do: Application.get_env(:explorer, __MODULE__)[:simple_transaction_gas]
+
   defp num_of_blocks, do: Application.get_env(:explorer, __MODULE__)[:num_of_blocks]
 
   defp safelow, do: Application.get_env(:explorer, __MODULE__)[:safelow_percentile]
@@ -181,12 +281,14 @@ defmodule Explorer.Chain.Cache.GasPriceOracle do
     {:ok, task} =
       Task.start(fn ->
         try do
-          result = get_average_gas_price(num_of_blocks(), safelow(), average(), fast())
+          {result, acc} = get_average_gas_price(num_of_blocks(), safelow(), average(), fast())
 
+          set_gas_prices_acc(acc)
           set_gas_prices(result)
+          set_updated_at(DateTime.utc_now())
         rescue
           e ->
-            Logger.debug([
+            Logger.error([
               "Couldn't update gas used gas_prices",
               Exception.format(:error, e, __STACKTRACE__)
             ])
@@ -198,6 +300,10 @@ defmodule Explorer.Chain.Cache.GasPriceOracle do
     {:update, task}
   end
 
+  defp handle_fallback(:gas_prices_acc) do
+    {:return, []}
+  end
+
   defp handle_fallback(_), do: {:return, nil}
 
   # By setting this as a `callback` an async task will be started each time the
diff --git a/apps/explorer/lib/explorer/market/market.ex b/apps/explorer/lib/explorer/market/market.ex
index 3691ac4eaaf5..6de43a1b75b6 100644
--- a/apps/explorer/lib/explorer/market/market.ex
+++ b/apps/explorer/lib/explorer/market/market.ex
@@ -52,7 +52,7 @@ defmodule Explorer.Market do
   @doc """
   Get most recent exchange rate for the native coin from ETS or from DB.
   """
-  @spec get_coin_exchange_rate() :: Token.t() | nil
+  @spec get_coin_exchange_rate() :: Token.t()
   def get_coin_exchange_rate do
     get_native_coin_exchange_rate_from_cache() || get_native_coin_exchange_rate_from_db() || Token.null()
   end
diff --git a/apps/explorer/lib/explorer/market/market_history.ex b/apps/explorer/lib/explorer/market/market_history.ex
index 0fabaf0e305c..8c1411879ee3 100644
--- a/apps/explorer/lib/explorer/market/market_history.ex
+++ b/apps/explorer/lib/explorer/market/market_history.ex
@@ -23,10 +23,10 @@ defmodule Explorer.Market.MarketHistory do
    * `:market_cap` - TVL in USD.
   """
   @type t :: %__MODULE__{
-          closing_price: Decimal.t(),
+          closing_price: Decimal.t() | nil,
           date: Date.t(),
-          opening_price: Decimal.t(),
-          market_cap: Decimal.t(),
-          tvl: Decimal.t()
+          opening_price: Decimal.t() | nil,
+          market_cap: Decimal.t() | nil,
+          tvl: Decimal.t() | nil
         }
 end
diff --git a/apps/explorer/priv/repo/migrations/20240103094720_constrain_null_date_market_history.exs b/apps/explorer/priv/repo/migrations/20240103094720_constrain_null_date_market_history.exs
new file mode 100644
index 000000000000..ab43538e4e1e
--- /dev/null
+++ b/apps/explorer/priv/repo/migrations/20240103094720_constrain_null_date_market_history.exs
@@ -0,0 +1,9 @@
+defmodule Explorer.Repo.Migrations.ConstrainNullDateMarketHistory do
+  use Ecto.Migration
+
+  def change do
+    alter table(:market_history) do
+      modify(:date, :date, null: false, from: {:date, null: true})
+    end
+  end
+end
diff --git a/apps/explorer/test/explorer/chain/cache/gas_price_oracle_test.exs b/apps/explorer/test/explorer/chain/cache/gas_price_oracle_test.exs
index d7004d11d0ed..20472f79ee32 100644
--- a/apps/explorer/test/explorer/chain/cache/gas_price_oracle_test.exs
+++ b/apps/explorer/test/explorer/chain/cache/gas_price_oracle_test.exs
@@ -4,6 +4,7 @@ defmodule Explorer.Chain.Cache.GasPriceOracleTest do
   import Mox
 
   alias Explorer.Chain.Cache.GasPriceOracle
+  alias Explorer.Counters.AverageBlockTime
 
   @block %{
     "difficulty" => "0x0",
@@ -48,12 +49,12 @@ defmodule Explorer.Chain.Cache.GasPriceOracleTest do
     test "returns nil percentile values if no blocks in the DB" do
       expect(EthereumJSONRPC.Mox, :json_rpc, fn [%{id: id}], _options -> {:ok, [%{id: id, result: @block}]} end)
 
-      assert {:ok,
-              %{
-                "slow" => nil,
-                "average" => nil,
-                "fast" => nil
-              }} = GasPriceOracle.get_average_gas_price(3, 35, 60, 90)
+      assert {{:ok,
+               %{
+                 slow: nil,
+                 average: nil,
+                 fast: nil
+               }}, []} = GasPriceOracle.get_average_gas_price(3, 35, 60, 90)
     end
 
     test "returns nil percentile values if blocks are empty in the DB" do
@@ -63,12 +64,12 @@ defmodule Explorer.Chain.Cache.GasPriceOracleTest do
       insert(:block)
       insert(:block)
 
-      assert {:ok,
-              %{
-                "slow" => nil,
-                "average" => nil,
-                "fast" => nil
-              }} = GasPriceOracle.get_average_gas_price(3, 35, 60, 90)
+      assert {{:ok,
+               %{
+                 slow: nil,
+                 average: nil,
+                 fast: nil
+               }}, []} = GasPriceOracle.get_average_gas_price(3, 35, 60, 90)
     end
 
     test "returns nil percentile values for blocks with failed txs in the DB" do
@@ -89,12 +90,12 @@ defmodule Explorer.Chain.Cache.GasPriceOracleTest do
         hash: "0xac2a7dab94d965893199e7ee01649e2d66f0787a4c558b3118c09e80d4df8269"
       )
 
-      assert {:ok,
-              %{
-                "slow" => nil,
-                "average" => nil,
-                "fast" => nil
-              }} = GasPriceOracle.get_average_gas_price(3, 35, 60, 90)
+      assert {{:ok,
+               %{
+                 slow: nil,
+                 average: nil,
+                 fast: nil
+               }}, []} = GasPriceOracle.get_average_gas_price(3, 35, 60, 90)
     end
 
     test "returns nil percentile values for transactions with 0 gas price aka 'whitelisted transactions' in the DB" do
@@ -127,12 +128,12 @@ defmodule Explorer.Chain.Cache.GasPriceOracleTest do
         hash: "0x5d5c2776f96704e7845f7d3c1fbba6685ab6efd6f82b6cd11d549f3b3a46bd03"
       )
 
-      assert {:ok,
-              %{
-                "slow" => nil,
-                "average" => nil,
-                "fast" => nil
-              }} = GasPriceOracle.get_average_gas_price(2, 35, 60, 90)
+      assert {{:ok,
+               %{
+                 slow: nil,
+                 average: nil,
+                 fast: nil
+               }}, []} = GasPriceOracle.get_average_gas_price(2, 35, 60, 90)
     end
 
     test "returns the same percentile values if gas price is the same over transactions" do
@@ -165,12 +166,12 @@ defmodule Explorer.Chain.Cache.GasPriceOracleTest do
         hash: "0x5d5c2776f96704e7845f7d3c1fbba6685ab6efd6f82b6cd11d549f3b3a46bd03"
       )
 
-      assert {:ok,
-              %{
-                "slow" => 1.0,
-                "average" => 1.0,
-                "fast" => 1.0
-              }} = GasPriceOracle.get_average_gas_price(2, 35, 60, 90)
+      assert {{:ok,
+               %{
+                 slow: %{price: 1.0},
+                 average: %{price: 1.0},
+                 fast: %{price: 1.0}
+               }}, _} = GasPriceOracle.get_average_gas_price(2, 35, 60, 90)
     end
 
     test "returns correct min gas price from the block" do
@@ -215,12 +216,12 @@ defmodule Explorer.Chain.Cache.GasPriceOracleTest do
         hash: "0x906b80861b4a0921acfbb91a7b527227b0d32adabc88bc73e8c52ff714e55016"
       )
 
-      assert {:ok,
-              %{
-                "slow" => 1.0,
-                "average" => 2.0,
-                "fast" => 2.0
-              }} = GasPriceOracle.get_average_gas_price(3, 35, 60, 90)
+      assert {{:ok,
+               %{
+                 slow: %{price: 1.0},
+                 average: %{price: 2.0},
+                 fast: %{price: 2.0}
+               }}, _} = GasPriceOracle.get_average_gas_price(3, 35, 60, 90)
     end
 
     test "returns correct average percentile" do
@@ -266,10 +267,10 @@ defmodule Explorer.Chain.Cache.GasPriceOracleTest do
         hash: "0x7d4bc5569053fc29f471901e967c9e60205ac7a122b0e9a789683652c34cc11a"
       )
 
-      assert {:ok,
-              %{
-                "average" => 3.34
-              }} = GasPriceOracle.get_average_gas_price(3, 35, 60, 90)
+      assert {{:ok,
+               %{
+                 average: %{price: 3.34}
+               }}, _} = GasPriceOracle.get_average_gas_price(3, 35, 60, 90)
     end
 
     test "returns correct gas price for EIP-1559 transactions" do
@@ -320,13 +321,173 @@ defmodule Explorer.Chain.Cache.GasPriceOracleTest do
         hash: "0x906b80861b4a0921acfbb91a7b527227b0d32adabc88bc73e8c52ff714e55016"
       )
 
-      assert {:ok,
-              %{
-                # including base fee
-                "slow" => 1.5,
-                "average" => 2.5,
-                "fast" => 2.5
-              }} = GasPriceOracle.get_average_gas_price(3, 35, 60, 90)
+      assert {{:ok,
+               %{
+                 # including base fee
+                 slow: %{price: 1.5},
+                 average: %{price: 2.5}
+               }}, _} = GasPriceOracle.get_average_gas_price(3, 35, 60, 90)
+    end
+
+    test "return gas prices with time if available" do
+      expect(EthereumJSONRPC.Mox, :json_rpc, fn [%{id: id}], _options -> {:ok, [%{id: id, result: @block}]} end)
+
+      block1 =
+        insert(:block,
+          number: 100,
+          hash: "0x3e51328bccedee581e8ba35190216a61a5d67fd91ca528f3553142c0c7d18391",
+          timestamp: ~U[2023-12-12 12:12:30.000000Z]
+        )
+
+      block2 =
+        insert(:block,
+          number: 101,
+          hash: "0x76c3da57334fffdc66c0d954dce1a910fcff13ec889a13b2d8b0b6e9440ce729",
+          timestamp: ~U[2023-12-12 12:13:00.000000Z]
+        )
+
+      :transaction
+      |> insert(
+        status: :ok,
+        block_hash: block1.hash,
+        block_number: block1.number,
+        cumulative_gas_used: 884_322,
+        gas_used: 106_025,
+        index: 0,
+        gas_price: 1_000_000_000,
+        max_priority_fee_per_gas: 1_000_000_000,
+        max_fee_per_gas: 1_000_000_000,
+        hash: "0xac2a7dab94d965893199e7ee01649e2d66f0787a4c558b3118c09e80d4df8269",
+        earliest_processing_start: ~U[2023-12-12 12:12:00.000000Z]
+      )
+
+      :transaction
+      |> insert(
+        status: :ok,
+        block_hash: block2.hash,
+        block_number: block2.number,
+        cumulative_gas_used: 884_322,
+        gas_used: 106_025,
+        index: 0,
+        gas_price: 1_000_000_000,
+        max_priority_fee_per_gas: 1_000_000_000,
+        max_fee_per_gas: 1_000_000_000,
+        hash: "0x5d5c2776f96704e7845f7d3c1fbba6685ab6efd6f82b6cd11d549f3b3a46bd03",
+        earliest_processing_start: ~U[2023-12-12 12:12:00.000000Z]
+      )
+
+      :transaction
+      |> insert(
+        status: :ok,
+        block_hash: block2.hash,
+        block_number: block2.number,
+        cumulative_gas_used: 884_322,
+        gas_used: 106_025,
+        index: 1,
+        gas_price: 3_000_000_000,
+        max_priority_fee_per_gas: 3_000_000_000,
+        max_fee_per_gas: 3_000_000_000,
+        hash: "0x906b80861b4a0921acfbb91a7b527227b0d32adabc88bc73e8c52ff714e55016",
+        earliest_processing_start: ~U[2023-12-12 12:12:55.000000Z]
+      )
+
+      assert {{
+                :ok,
+                %{
+                  average: %{price: 2.5, time: 15000.0},
+                  fast: %{price: 2.5, time: 15000.0},
+                  slow: %{price: 1.5, time: 17500.0}
+                }
+              }, _} = GasPriceOracle.get_average_gas_price(3, 35, 60, 90)
+    end
+
+    test "return gas prices with average block time if earliest_processing_start is not available" do
+      expect(EthereumJSONRPC.Mox, :json_rpc, fn [%{id: id}], _options -> {:ok, [%{id: id, result: @block}]} end)
+      old_env = Application.get_env(:explorer, AverageBlockTime)
+      Application.put_env(:explorer, AverageBlockTime, enabled: true, cache_period: 1_800_000)
+      start_supervised!(AverageBlockTime)
+
+      block_number = 99_999_999
+      first_timestamp = ~U[2023-12-12 12:12:30.000000Z]
+
+      Enum.each(1..100, fn i ->
+        insert(:block,
+          number: block_number + 1 + i,
+          consensus: true,
+          timestamp: Timex.shift(first_timestamp, seconds: -(101 - i) - 12)
+        )
+      end)
+
+      block1 =
+        insert(:block,
+          number: block_number + 102,
+          consensus: true,
+          timestamp: Timex.shift(first_timestamp, seconds: -10)
+        )
+
+      block2 =
+        insert(:block,
+          number: block_number + 103,
+          consensus: true,
+          timestamp: Timex.shift(first_timestamp, seconds: -7)
+        )
+
+      AverageBlockTime.refresh()
+
+      :transaction
+      |> insert(
+        status: :ok,
+        block_hash: block1.hash,
+        block_number: block1.number,
+        cumulative_gas_used: 884_322,
+        gas_used: 106_025,
+        index: 0,
+        gas_price: 1_000_000_000,
+        max_priority_fee_per_gas: 1_000_000_000,
+        max_fee_per_gas: 1_000_000_000,
+        hash: "0xac2a7dab94d965893199e7ee01649e2d66f0787a4c558b3118c09e80d4df8269"
+      )
+
+      :transaction
+      |> insert(
+        status: :ok,
+        block_hash: block2.hash,
+        block_number: block2.number,
+        cumulative_gas_used: 884_322,
+        gas_used: 106_025,
+        index: 0,
+        gas_price: 1_000_000_000,
+        max_priority_fee_per_gas: 1_000_000_000,
+        max_fee_per_gas: 1_000_000_000,
+        hash: "0x5d5c2776f96704e7845f7d3c1fbba6685ab6efd6f82b6cd11d549f3b3a46bd03"
+      )
+
+      :transaction
+      |> insert(
+        status: :ok,
+        block_hash: block2.hash,
+        block_number: block2.number,
+        cumulative_gas_used: 884_322,
+        gas_used: 106_025,
+        index: 1,
+        gas_price: 3_000_000_000,
+        max_priority_fee_per_gas: 3_000_000_000,
+        max_fee_per_gas: 3_000_000_000,
+        hash: "0x906b80861b4a0921acfbb91a7b527227b0d32adabc88bc73e8c52ff714e55016"
+      )
+
+      AverageBlockTime.refresh()
+
+      assert {{
+                :ok,
+                %{
+                  average: %{price: 2.5, time: 1000.0},
+                  fast: %{price: 2.5, time: 1000.0},
+                  slow: %{price: 1.5, time: 1000.0}
+                }
+              }, _} = GasPriceOracle.get_average_gas_price(3, 35, 60, 90)
+
+      Application.put_env(:explorer, AverageBlockTime, old_env)
     end
   end
 end
diff --git a/config/runtime.exs b/config/runtime.exs
index f876325abb5b..afcd147129a8 100644
--- a/config/runtime.exs
+++ b/config/runtime.exs
@@ -243,6 +243,7 @@ config :explorer, Explorer.Chain.Cache.PendingBlockOperation,
 
 config :explorer, Explorer.Chain.Cache.GasPriceOracle,
   global_ttl: ConfigHelper.parse_time_env_var("GAS_PRICE_ORACLE_CACHE_PERIOD", "30s"),
+  simple_transaction_gas: ConfigHelper.parse_integer_env_var("GAS_PRICE_ORACLE_SIMPLE_TRANSACTION_GAS", 21000),
   num_of_blocks: ConfigHelper.parse_integer_env_var("GAS_PRICE_ORACLE_NUM_OF_BLOCKS", 200),
   safelow_percentile: ConfigHelper.parse_integer_env_var("GAS_PRICE_ORACLE_SAFELOW_PERCENTILE", 35),
   average_percentile: ConfigHelper.parse_integer_env_var("GAS_PRICE_ORACLE_AVERAGE_PERCENTILE", 60),
diff --git a/cspell.json b/cspell.json
index 3cdf520ecd49..78b98a92d718 100644
--- a/cspell.json
+++ b/cspell.json
@@ -166,6 +166,7 @@
         "Faileddi",
         "falala",
         "Filesize",
+        "fkey",
         "Floki",
         "fontawesome",
         "fortawesome",
@@ -264,6 +265,7 @@
         "mergeable",
         "Merkle",
         "metatags",
+        "microsecs",
         "millis",
         "mintings",
         "mistmatches",
@@ -408,6 +410,7 @@
         "snapshotted",
         "snapshotting",
         "Sokol",
+        "SOLIDITYSCAN",
         "soljson",
         "someout",
         "sourcecode",
@@ -534,19 +537,7 @@
         "zindex",
         "zipcode",
         "zkbob",
-        "zkevm",
-        "erts",
-        "Asfpp",
-        "Nerg",
-        "secp",
-        "qwertyuioiuytrewertyuioiuytrertyuio",
-        "urlset",
-        "lastmod",
-        "qitmeer",
-        "meer",
-        "DefiLlama",
-        "SOLIDITYSCAN",
-        "fkey"
+        "zkevm"
     ],
     "enableFiletypes": [
         "dotenv",
diff --git a/docker-compose/envs/common-blockscout.env b/docker-compose/envs/common-blockscout.env
index 73af4cb85ad4..f3e67286b645 100644
--- a/docker-compose/envs/common-blockscout.env
+++ b/docker-compose/envs/common-blockscout.env
@@ -182,6 +182,12 @@ COIN_BALANCE_HISTORY_DAYS=90
 APPS_MENU=true
 EXTERNAL_APPS=[]
 # GAS_PRICE=
+# GAS_PRICE_ORACLE_CACHE_PERIOD=
+# GAS_PRICE_ORACLE_SIMPLE_TRANSACTION_GAS=
+# GAS_PRICE_ORACLE_NUM_OF_BLOCKS=
+# GAS_PRICE_ORACLE_SAFELOW_PERCENTILE=
+# GAS_PRICE_ORACLE_AVERAGE_PERCENTILE=
+# GAS_PRICE_ORACLE_FAST_PERCENTILE=
 # RESTRICTED_LIST=
 # RESTRICTED_LIST_KEY=
 SHOW_MAINTENANCE_ALERT=false

From b128a175d903d18ba25a7474eafe901259d0bad8 Mon Sep 17 00:00:00 2001
From: Maxim Filonov <53992153+sl1depengwyn@users.noreply.github.com>
Date: Wed, 3 Jan 2024 13:09:41 +0300
Subject: [PATCH 831/909] Improve exchange rates logging

---
 CHANGELOG.md                                        | 1 +
 apps/explorer/lib/explorer/exchange_rates/source.ex | 8 ++++----
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f4f63d99195c..c21858b2f66c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -40,6 +40,7 @@
 
 ### Chore
 
+- [#9094](https://github.com/blockscout/blockscout/pull/9094) - Improve exchange rates logging
 - [#9014](https://github.com/blockscout/blockscout/pull/9014) - Decrease amount of NFT in address collection: 15 -> 9
 - [#8994](https://github.com/blockscout/blockscout/pull/8994) - Refactor transactions event preloads
 - [#8991](https://github.com/blockscout/blockscout/pull/8991) - Manage DB queue target via runtime env var
diff --git a/apps/explorer/lib/explorer/exchange_rates/source.ex b/apps/explorer/lib/explorer/exchange_rates/source.ex
index 8d50d4069bec..0c7a0929651f 100644
--- a/apps/explorer/lib/explorer/exchange_rates/source.ex
+++ b/apps/explorer/lib/explorer/exchange_rates/source.ex
@@ -120,7 +120,7 @@ defmodule Explorer.ExchangeRates.Source do
         parse_http_success_response(body)
 
       {:ok, %Response{body: body, status_code: status_code}} when status_code in 400..526 ->
-        parse_http_error_response(body)
+        parse_http_error_response(body, status_code)
 
       {:ok, %Response{status_code: status_code}} when status_code in 300..308 ->
         {:error, "Source redirected"}
@@ -139,13 +139,13 @@ defmodule Explorer.ExchangeRates.Source do
     {:ok, body_json}
   end
 
-  defp parse_http_error_response(body) do
+  defp parse_http_error_response(body, status_code) do
     body_json = Helper.decode_json(body)
 
     if is_map(body_json) do
-      {:error, body_json["error"]}
+      {:error, "#{status_code}: #{body_json["error"]}"}
     else
-      {:error, body}
+      {:error, "#{status_code}: #{body}"}
     end
   end
 end

From 209e65d84921052462a9ad207c3c24674f374ac1 Mon Sep 17 00:00:00 2001
From: Qwerty5Uiop <alex000010@bk.ru>
Date: Mon, 13 Nov 2023 14:48:43 +0600
Subject: [PATCH 832/909] Update existing tokens type if got transfer with
 higher type priority

---
 CHANGELOG.md                                     |  1 +
 apps/indexer/lib/indexer/block/fetcher.ex        |  2 +-
 .../lib/indexer/transform/token_transfers.ex     | 16 ++++++----------
 3 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 03966130ef36..17d137c832f2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,6 +10,7 @@
 
 - [#9062](https://github.com/blockscout/blockscout/pull/9062) - Fix blockscout-ens integration
 - [#9061](https://github.com/blockscout/blockscout/pull/9061) - Arbitrum allow tx receipt gasUsedForL1 field
+- [#8812](https://github.com/blockscout/blockscout/pull/8812) - Update existing tokens type if got transfer with higher type priority
 
 ### Chore
 
diff --git a/apps/indexer/lib/indexer/block/fetcher.ex b/apps/indexer/lib/indexer/block/fetcher.ex
index 5342b077fbc3..11261231247d 100644
--- a/apps/indexer/lib/indexer/block/fetcher.ex
+++ b/apps/indexer/lib/indexer/block/fetcher.ex
@@ -190,7 +190,7 @@ defmodule Indexer.Block.Fetcher do
            block_rewards: %{errors: beneficiaries_errors, params: beneficiaries_with_gas_payment},
            logs: %{params: logs},
            token_transfers: %{params: token_transfers},
-           tokens: %{on_conflict: :nothing, params: tokens},
+           tokens: %{params: tokens},
            transactions: %{params: transactions_with_receipts},
            withdrawals: %{params: withdrawals_params},
            token_instances: %{params: token_instances}
diff --git a/apps/indexer/lib/indexer/transform/token_transfers.ex b/apps/indexer/lib/indexer/transform/token_transfers.ex
index fc6fb6a6cfe7..7b10e701b9a4 100644
--- a/apps/indexer/lib/indexer/transform/token_transfers.ex
+++ b/apps/indexer/lib/indexer/transform/token_transfers.ex
@@ -81,22 +81,18 @@ defmodule Indexer.Transform.TokenTransfers do
       end)
       |> Map.new()
 
-    existing_tokens =
-      existing_token_types_map
-      |> Map.keys()
-      |> Enum.map(&to_string/1)
-
-    new_tokens_token_transfers = Enum.filter(token_transfers, &(&1.token_contract_address_hash not in existing_tokens))
-
-    new_token_types_map =
-      new_tokens_token_transfers
+    token_types_map =
+      token_transfers
       |> Enum.group_by(& &1.token_contract_address_hash)
       |> Enum.map(fn {contract_address_hash, transfers} ->
         {contract_address_hash, define_token_type(transfers)}
       end)
       |> Map.new()
 
-    actual_token_types_map = Map.merge(new_token_types_map, existing_token_types_map)
+    actual_token_types_map =
+      Map.merge(token_types_map, existing_token_types_map, fn _k, new_type, old_type ->
+        if token_type_priority(old_type) > token_type_priority(new_type), do: old_type, else: new_type
+      end)
 
     actual_tokens =
       Enum.map(tokens, fn %{contract_address_hash: hash} = token ->

From a54fd5513a1305139583bd14219eb86a8b83596d Mon Sep 17 00:00:00 2001
From: Viktor Baranov <baranov.viktor.27@gmail.com>
Date: Fri, 5 Jan 2024 16:42:07 +0300
Subject: [PATCH 833/909] CI for PR to production-zksync branch

---
 .github/workflows/config.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/config.yml b/.github/workflows/config.yml
index a1e7c238556f..bd487d8c2aa5 100644
--- a/.github/workflows/config.yml
+++ b/.github/workflows/config.yml
@@ -31,6 +31,7 @@ on:
       - master
       - v6.0.0-dev
       - production-optimism
+      - production-zksync
 
 env:
   MIX_ENV: test

From f48e4e7812b2a5e2f9065236e1cce357392e2495 Mon Sep 17 00:00:00 2001
From: Qwerty5Uiop <alex000010@bk.ru>
Date: Mon, 8 Jan 2024 13:10:15 +0400
Subject: [PATCH 834/909] Add specific url for eth_call

---
 CHANGELOG.md                              | 1 +
 apps/explorer/config/dev/arbitrum.exs     | 3 +++
 apps/explorer/config/dev/besu.exs         | 2 +-
 apps/explorer/config/dev/erigon.exs       | 2 +-
 apps/explorer/config/dev/ganache.exs      | 3 +++
 apps/explorer/config/dev/geth.exs         | 1 +
 apps/explorer/config/dev/nethermind.exs   | 2 +-
 apps/explorer/config/dev/rsk.exs          | 2 +-
 apps/explorer/config/prod/arbitrum.exs    | 3 +++
 apps/explorer/config/prod/besu.exs        | 2 +-
 apps/explorer/config/prod/erigon.exs      | 2 +-
 apps/explorer/config/prod/ganache.exs     | 3 +++
 apps/explorer/config/prod/geth.exs        | 1 +
 apps/explorer/config/prod/nethermind.exs  | 2 +-
 apps/explorer/config/prod/rsk.exs         | 2 +-
 apps/indexer/config/dev/arbitrum.exs      | 3 +++
 apps/indexer/config/dev/besu.exs          | 1 +
 apps/indexer/config/dev/erigon.exs        | 1 +
 apps/indexer/config/dev/ganache.exs       | 3 +++
 apps/indexer/config/dev/geth.exs          | 1 +
 apps/indexer/config/dev/nethermind.exs    | 1 +
 apps/indexer/config/dev/rsk.exs           | 1 +
 apps/indexer/config/prod/arbitrum.exs     | 3 +++
 apps/indexer/config/prod/besu.exs         | 1 +
 apps/indexer/config/prod/erigon.exs       | 1 +
 apps/indexer/config/prod/ganache.exs      | 3 +++
 apps/indexer/config/prod/geth.exs         | 1 +
 apps/indexer/config/prod/nethermind.exs   | 1 +
 apps/indexer/config/prod/rsk.exs          | 1 +
 config/config_helper.exs                  | 5 +++++
 docker-compose/envs/common-blockscout.env | 1 +
 31 files changed, 51 insertions(+), 8 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 17d137c832f2..e08716581cd2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,7 @@
 
 ### Features
 
+- [#9112](https://github.com/blockscout/blockscout/pull/9112) - Add specific url for eth_call
 - [#9044](https://github.com/blockscout/blockscout/pull/9044) - Expand gas price oracle functionality
 
 ### Fixes
diff --git a/apps/explorer/config/dev/arbitrum.exs b/apps/explorer/config/dev/arbitrum.exs
index 1f7cd963e91e..dafcd640fe4c 100644
--- a/apps/explorer/config/dev/arbitrum.exs
+++ b/apps/explorer/config/dev/arbitrum.exs
@@ -14,6 +14,9 @@ config :explorer,
       http: EthereumJSONRPC.HTTP.HTTPoison,
       url: System.get_env("ETHEREUM_JSONRPC_HTTP_URL") || "http://localhost:8545",
       fallback_url: System.get_env("ETHEREUM_JSONRPC_FALLBACK_HTTP_URL"),
+      method_to_url: [
+        eth_call: ConfigHelper.eth_call_url("http://localhost:8545")
+      ],
       http_options: [recv_timeout: timeout, timeout: timeout, hackney: hackney_opts]
     ],
     variant: EthereumJSONRPC.Arbitrum
diff --git a/apps/explorer/config/dev/besu.exs b/apps/explorer/config/dev/besu.exs
index 64db4d5b8180..22c0382163e3 100644
--- a/apps/explorer/config/dev/besu.exs
+++ b/apps/explorer/config/dev/besu.exs
@@ -16,7 +16,7 @@ config :explorer,
       fallback_url: System.get_env("ETHEREUM_JSONRPC_FALLBACK_HTTP_URL"),
       fallback_trace_url: System.get_env("ETHEREUM_JSONRPC_FALLBACK_TRACE_URL"),
       method_to_url: [
-        eth_call: System.get_env("ETHEREUM_JSONRPC_TRACE_URL") || "http://localhost:8545",
+        eth_call: ConfigHelper.eth_call_url("http://localhost:8545"),
         eth_getBalance: System.get_env("ETHEREUM_JSONRPC_TRACE_URL") || "http://localhost:8545",
         trace_replayTransaction: System.get_env("ETHEREUM_JSONRPC_TRACE_URL") || "http://localhost:8545"
       ],
diff --git a/apps/explorer/config/dev/erigon.exs b/apps/explorer/config/dev/erigon.exs
index 9253f8ea3081..163f526996f6 100644
--- a/apps/explorer/config/dev/erigon.exs
+++ b/apps/explorer/config/dev/erigon.exs
@@ -16,7 +16,7 @@ config :explorer,
       fallback_url: System.get_env("ETHEREUM_JSONRPC_FALLBACK_HTTP_URL"),
       fallback_trace_url: System.get_env("ETHEREUM_JSONRPC_FALLBACK_TRACE_URL"),
       method_to_url: [
-        eth_call: System.get_env("ETHEREUM_JSONRPC_TRACE_URL") || "http://localhost:8545",
+        eth_call: ConfigHelper.eth_call_url("http://localhost:8545"),
         eth_getBalance: System.get_env("ETHEREUM_JSONRPC_TRACE_URL") || "http://localhost:8545",
         trace_replayTransaction: System.get_env("ETHEREUM_JSONRPC_TRACE_URL") || "http://localhost:8545"
       ],
diff --git a/apps/explorer/config/dev/ganache.exs b/apps/explorer/config/dev/ganache.exs
index 8f399f532ff5..f7ddd7cbe37f 100644
--- a/apps/explorer/config/dev/ganache.exs
+++ b/apps/explorer/config/dev/ganache.exs
@@ -14,6 +14,9 @@ config :explorer,
       http: EthereumJSONRPC.HTTP.HTTPoison,
       url: System.get_env("ETHEREUM_JSONRPC_HTTP_URL") || "http://localhost:7545",
       fallback_url: System.get_env("ETHEREUM_JSONRPC_FALLBACK_HTTP_URL"),
+      method_to_url: [
+        eth_call: ConfigHelper.eth_call_url("http://localhost:7545")
+      ],
       http_options: [recv_timeout: timeout, timeout: timeout, hackney: hackney_opts]
     ],
     variant: EthereumJSONRPC.Ganache
diff --git a/apps/explorer/config/dev/geth.exs b/apps/explorer/config/dev/geth.exs
index 4ac8203aecac..8b644ff987d2 100644
--- a/apps/explorer/config/dev/geth.exs
+++ b/apps/explorer/config/dev/geth.exs
@@ -16,6 +16,7 @@ config :explorer,
       fallback_url: System.get_env("ETHEREUM_JSONRPC_FALLBACK_HTTP_URL"),
       fallback_trace_url: System.get_env("ETHEREUM_JSONRPC_FALLBACK_TRACE_URL"),
       method_to_url: [
+        eth_call: ConfigHelper.eth_call_url("http://localhost:8545"),
         debug_traceTransaction: System.get_env("ETHEREUM_JSONRPC_TRACE_URL") || "http://localhost:8545"
       ],
       http_options: [recv_timeout: timeout, timeout: timeout, hackney: hackney_opts]
diff --git a/apps/explorer/config/dev/nethermind.exs b/apps/explorer/config/dev/nethermind.exs
index e92b980507f0..2553a16db492 100644
--- a/apps/explorer/config/dev/nethermind.exs
+++ b/apps/explorer/config/dev/nethermind.exs
@@ -16,7 +16,7 @@ config :explorer,
       fallback_url: System.get_env("ETHEREUM_JSONRPC_FALLBACK_HTTP_URL"),
       fallback_trace_url: System.get_env("ETHEREUM_JSONRPC_FALLBACK_TRACE_URL"),
       method_to_url: [
-        eth_call: System.get_env("ETHEREUM_JSONRPC_TRACE_URL") || "http://localhost:8545",
+        eth_call: ConfigHelper.eth_call_url("http://localhost:8545"),
         eth_getBalance: System.get_env("ETHEREUM_JSONRPC_TRACE_URL") || "http://localhost:8545",
         trace_replayTransaction: System.get_env("ETHEREUM_JSONRPC_TRACE_URL") || "http://localhost:8545"
       ],
diff --git a/apps/explorer/config/dev/rsk.exs b/apps/explorer/config/dev/rsk.exs
index 597d78c395a0..699584ea0324 100644
--- a/apps/explorer/config/dev/rsk.exs
+++ b/apps/explorer/config/dev/rsk.exs
@@ -16,7 +16,7 @@ config :explorer,
       fallback_url: System.get_env("ETHEREUM_JSONRPC_FALLBACK_HTTP_URL"),
       fallback_trace_url: System.get_env("ETHEREUM_JSONRPC_FALLBACK_TRACE_URL"),
       method_to_url: [
-        eth_call: System.get_env("ETHEREUM_JSONRPC_TRACE_URL") || "http://localhost:8545",
+        eth_call: ConfigHelper.eth_call_url("http://localhost:8545"),
         eth_getBalance: System.get_env("ETHEREUM_JSONRPC_TRACE_URL") || "http://localhost:8545",
         trace_replayTransaction: System.get_env("ETHEREUM_JSONRPC_TRACE_URL") || "http://localhost:8545"
       ],
diff --git a/apps/explorer/config/prod/arbitrum.exs b/apps/explorer/config/prod/arbitrum.exs
index ea4af81646f2..5f45a1a071db 100644
--- a/apps/explorer/config/prod/arbitrum.exs
+++ b/apps/explorer/config/prod/arbitrum.exs
@@ -14,6 +14,9 @@ config :explorer,
       http: EthereumJSONRPC.HTTP.HTTPoison,
       url: System.get_env("ETHEREUM_JSONRPC_HTTP_URL"),
       fallback_url: System.get_env("ETHEREUM_JSONRPC_FALLBACK_HTTP_URL"),
+      method_to_url: [
+        eth_call: ConfigHelper.eth_call_url()
+      ],
       http_options: [recv_timeout: timeout, timeout: timeout, hackney: hackney_opts]
     ],
     variant: EthereumJSONRPC.Arbitrum
diff --git a/apps/explorer/config/prod/besu.exs b/apps/explorer/config/prod/besu.exs
index 26df9c5bd480..a486b5c6dcda 100644
--- a/apps/explorer/config/prod/besu.exs
+++ b/apps/explorer/config/prod/besu.exs
@@ -16,7 +16,7 @@ config :explorer,
       fallback_url: System.get_env("ETHEREUM_JSONRPC_FALLBACK_HTTP_URL"),
       fallback_trace_url: System.get_env("ETHEREUM_JSONRPC_FALLBACK_TRACE_URL"),
       method_to_url: [
-        eth_call: System.get_env("ETHEREUM_JSONRPC_TRACE_URL"),
+        eth_call: ConfigHelper.eth_call_url(),
         eth_getBalance: System.get_env("ETHEREUM_JSONRPC_TRACE_URL"),
         trace_replayTransaction: System.get_env("ETHEREUM_JSONRPC_TRACE_URL")
       ],
diff --git a/apps/explorer/config/prod/erigon.exs b/apps/explorer/config/prod/erigon.exs
index 0a954a88b1df..1ca954c1ef41 100644
--- a/apps/explorer/config/prod/erigon.exs
+++ b/apps/explorer/config/prod/erigon.exs
@@ -16,7 +16,7 @@ config :explorer,
       fallback_url: System.get_env("ETHEREUM_JSONRPC_FALLBACK_HTTP_URL"),
       fallback_trace_url: System.get_env("ETHEREUM_JSONRPC_FALLBACK_TRACE_URL"),
       method_to_url: [
-        eth_call: System.get_env("ETHEREUM_JSONRPC_TRACE_URL"),
+        eth_call: ConfigHelper.eth_call_url(),
         eth_getBalance: System.get_env("ETHEREUM_JSONRPC_TRACE_URL"),
         trace_replayTransaction: System.get_env("ETHEREUM_JSONRPC_TRACE_URL")
       ],
diff --git a/apps/explorer/config/prod/ganache.exs b/apps/explorer/config/prod/ganache.exs
index 25de1e5b9a31..0956e4133c06 100644
--- a/apps/explorer/config/prod/ganache.exs
+++ b/apps/explorer/config/prod/ganache.exs
@@ -14,6 +14,9 @@ config :explorer,
       http: EthereumJSONRPC.HTTP.HTTPoison,
       url: System.get_env("ETHEREUM_JSONRPC_HTTP_URL"),
       fallback_url: System.get_env("ETHEREUM_JSONRPC_FALLBACK_HTTP_URL"),
+      method_to_url: [
+        eth_call: ConfigHelper.eth_call_url()
+      ],
       http_options: [recv_timeout: timeout, timeout: timeout, hackney: hackney_opts]
     ],
     variant: EthereumJSONRPC.Ganache
diff --git a/apps/explorer/config/prod/geth.exs b/apps/explorer/config/prod/geth.exs
index 3a81acee9c00..46d1f6bc110b 100644
--- a/apps/explorer/config/prod/geth.exs
+++ b/apps/explorer/config/prod/geth.exs
@@ -16,6 +16,7 @@ config :explorer,
       fallback_url: System.get_env("ETHEREUM_JSONRPC_FALLBACK_HTTP_URL"),
       fallback_trace_url: System.get_env("ETHEREUM_JSONRPC_FALLBACK_TRACE_URL"),
       method_to_url: [
+        eth_call: ConfigHelper.eth_call_url(),
         debug_traceTransaction: System.get_env("ETHEREUM_JSONRPC_TRACE_URL")
       ],
       http_options: [recv_timeout: timeout, timeout: timeout, hackney: hackney_opts]
diff --git a/apps/explorer/config/prod/nethermind.exs b/apps/explorer/config/prod/nethermind.exs
index 4057a0d99d03..bf5a0440865e 100644
--- a/apps/explorer/config/prod/nethermind.exs
+++ b/apps/explorer/config/prod/nethermind.exs
@@ -16,7 +16,7 @@ config :explorer,
       fallback_url: System.get_env("ETHEREUM_JSONRPC_FALLBACK_HTTP_URL"),
       fallback_trace_url: System.get_env("ETHEREUM_JSONRPC_FALLBACK_TRACE_URL"),
       method_to_url: [
-        eth_call: System.get_env("ETHEREUM_JSONRPC_TRACE_URL"),
+        eth_call: ConfigHelper.eth_call_url(),
         eth_getBalance: System.get_env("ETHEREUM_JSONRPC_TRACE_URL"),
         trace_replayTransaction: System.get_env("ETHEREUM_JSONRPC_TRACE_URL")
       ],
diff --git a/apps/explorer/config/prod/rsk.exs b/apps/explorer/config/prod/rsk.exs
index 9f65d8be864f..35120eec2c71 100644
--- a/apps/explorer/config/prod/rsk.exs
+++ b/apps/explorer/config/prod/rsk.exs
@@ -16,7 +16,7 @@ config :explorer,
       fallback_url: System.get_env("ETHEREUM_JSONRPC_FALLBACK_HTTP_URL"),
       fallback_trace_url: System.get_env("ETHEREUM_JSONRPC_FALLBACK_TRACE_URL"),
       method_to_url: [
-        eth_call: System.get_env("ETHEREUM_JSONRPC_TRACE_URL"),
+        eth_call: ConfigHelper.eth_call_url(),
         eth_getBalance: System.get_env("ETHEREUM_JSONRPC_TRACE_URL"),
         trace_replayTransaction: System.get_env("ETHEREUM_JSONRPC_TRACE_URL")
       ],
diff --git a/apps/indexer/config/dev/arbitrum.exs b/apps/indexer/config/dev/arbitrum.exs
index 18125586af44..e708fed5441b 100644
--- a/apps/indexer/config/dev/arbitrum.exs
+++ b/apps/indexer/config/dev/arbitrum.exs
@@ -19,6 +19,9 @@ config :indexer,
       http: EthereumJSONRPC.HTTP.HTTPoison,
       url: System.get_env("ETHEREUM_JSONRPC_HTTP_URL") || "http://localhost:8545",
       fallback_url: System.get_env("ETHEREUM_JSONRPC_FALLBACK_HTTP_URL"),
+      method_to_url: [
+        eth_call: ConfigHelper.eth_call_url("http://localhost:8545")
+      ],
       http_options: [recv_timeout: timeout, timeout: timeout, hackney: hackney_opts]
     ],
     variant: EthereumJSONRPC.Arbitrum
diff --git a/apps/indexer/config/dev/besu.exs b/apps/indexer/config/dev/besu.exs
index c6d8d4a1aa00..e09c82159481 100644
--- a/apps/indexer/config/dev/besu.exs
+++ b/apps/indexer/config/dev/besu.exs
@@ -22,6 +22,7 @@ config :indexer,
       fallback_url: System.get_env("ETHEREUM_JSONRPC_FALLBACK_HTTP_URL"),
       fallback_trace_url: System.get_env("ETHEREUM_JSONRPC_FALLBACK_TRACE_URL"),
       method_to_url: [
+        eth_call: ConfigHelper.eth_call_url("http://localhost:8545"),
         eth_getBalance: System.get_env("ETHEREUM_JSONRPC_TRACE_URL") || "http://localhost:8545",
         trace_block: System.get_env("ETHEREUM_JSONRPC_TRACE_URL") || "http://localhost:8545",
         trace_replayBlockTransactions: System.get_env("ETHEREUM_JSONRPC_TRACE_URL") || "http://localhost:8545",
diff --git a/apps/indexer/config/dev/erigon.exs b/apps/indexer/config/dev/erigon.exs
index 912b64dde2ec..ef77231c83e5 100644
--- a/apps/indexer/config/dev/erigon.exs
+++ b/apps/indexer/config/dev/erigon.exs
@@ -22,6 +22,7 @@ config :indexer,
       fallback_url: System.get_env("ETHEREUM_JSONRPC_FALLBACK_HTTP_URL"),
       fallback_trace_url: System.get_env("ETHEREUM_JSONRPC_FALLBACK_TRACE_URL"),
       method_to_url: [
+        eth_call: ConfigHelper.eth_call_url("http://localhost:8545"),
         eth_getBalance: System.get_env("ETHEREUM_JSONRPC_TRACE_URL") || "http://localhost:8545",
         trace_block: System.get_env("ETHEREUM_JSONRPC_TRACE_URL") || "http://localhost:8545",
         trace_replayBlockTransactions: System.get_env("ETHEREUM_JSONRPC_TRACE_URL") || "http://localhost:8545",
diff --git a/apps/indexer/config/dev/ganache.exs b/apps/indexer/config/dev/ganache.exs
index be2cd745b191..95ed0de84d89 100644
--- a/apps/indexer/config/dev/ganache.exs
+++ b/apps/indexer/config/dev/ganache.exs
@@ -19,6 +19,9 @@ config :indexer,
       http: EthereumJSONRPC.HTTP.HTTPoison,
       url: System.get_env("ETHEREUM_JSONRPC_HTTP_URL") || "http://localhost:7545",
       fallback_url: System.get_env("ETHEREUM_JSONRPC_FALLBACK_HTTP_URL"),
+      method_to_url: [
+        eth_call: ConfigHelper.eth_call_url("http://localhost:7545")
+      ],
       http_options: [recv_timeout: timeout, timeout: timeout, hackney: hackney_opts]
     ],
     variant: EthereumJSONRPC.Ganache
diff --git a/apps/indexer/config/dev/geth.exs b/apps/indexer/config/dev/geth.exs
index 87b9dbe90613..b7eb4d7facf0 100644
--- a/apps/indexer/config/dev/geth.exs
+++ b/apps/indexer/config/dev/geth.exs
@@ -21,6 +21,7 @@ config :indexer,
       fallback_url: System.get_env("ETHEREUM_JSONRPC_FALLBACK_HTTP_URL"),
       fallback_trace_url: System.get_env("ETHEREUM_JSONRPC_FALLBACK_TRACE_URL"),
       method_to_url: [
+        eth_call: ConfigHelper.eth_call_url("http://localhost:8545"),
         debug_traceTransaction: System.get_env("ETHEREUM_JSONRPC_TRACE_URL") || "http://localhost:8545"
       ],
       http_options: [recv_timeout: timeout, timeout: timeout, hackney: hackney_opts]
diff --git a/apps/indexer/config/dev/nethermind.exs b/apps/indexer/config/dev/nethermind.exs
index a00a7acd1781..d97935eb14da 100644
--- a/apps/indexer/config/dev/nethermind.exs
+++ b/apps/indexer/config/dev/nethermind.exs
@@ -22,6 +22,7 @@ config :indexer,
       fallback_url: System.get_env("ETHEREUM_JSONRPC_FALLBACK_HTTP_URL"),
       fallback_trace_url: System.get_env("ETHEREUM_JSONRPC_FALLBACK_TRACE_URL"),
       method_to_url: [
+        eth_call: ConfigHelper.eth_call_url("http://localhost:8545"),
         eth_getBalance: System.get_env("ETHEREUM_JSONRPC_TRACE_URL") || "http://localhost:8545",
         trace_block: System.get_env("ETHEREUM_JSONRPC_TRACE_URL") || "http://localhost:8545",
         trace_replayBlockTransactions: System.get_env("ETHEREUM_JSONRPC_TRACE_URL") || "http://localhost:8545",
diff --git a/apps/indexer/config/dev/rsk.exs b/apps/indexer/config/dev/rsk.exs
index 5168fdbbff10..b609f78a224c 100644
--- a/apps/indexer/config/dev/rsk.exs
+++ b/apps/indexer/config/dev/rsk.exs
@@ -23,6 +23,7 @@ config :indexer,
       fallback_url: System.get_env("ETHEREUM_JSONRPC_FALLBACK_HTTP_URL"),
       fallback_trace_url: System.get_env("ETHEREUM_JSONRPC_FALLBACK_TRACE_URL"),
       method_to_url: [
+        eth_call: ConfigHelper.eth_call_url("http://localhost:8545"),
         eth_getBalance: System.get_env("ETHEREUM_JSONRPC_TRACE_URL") || "http://localhost:8545",
         trace_block: System.get_env("ETHEREUM_JSONRPC_TRACE_URL") || "http://localhost:8545",
         trace_replayBlockTransactions: System.get_env("ETHEREUM_JSONRPC_TRACE_URL") || "http://localhost:8545",
diff --git a/apps/indexer/config/prod/arbitrum.exs b/apps/indexer/config/prod/arbitrum.exs
index cef49883b46e..6cf72e206a26 100644
--- a/apps/indexer/config/prod/arbitrum.exs
+++ b/apps/indexer/config/prod/arbitrum.exs
@@ -19,6 +19,9 @@ config :indexer,
       http: EthereumJSONRPC.HTTP.HTTPoison,
       url: System.get_env("ETHEREUM_JSONRPC_HTTP_URL") || "http://localhost:8545",
       fallback_url: System.get_env("ETHEREUM_JSONRPC_FALLBACK_HTTP_URL"),
+      method_to_url: [
+        eth_call: ConfigHelper.eth_call_url("http://localhost:8545")
+      ],
       http_options: [recv_timeout: timeout, timeout: timeout, hackney: hackney_opts]
     ],
     variant: EthereumJSONRPC.Arbitrum
diff --git a/apps/indexer/config/prod/besu.exs b/apps/indexer/config/prod/besu.exs
index 7970b1207799..576bdcef3bcf 100644
--- a/apps/indexer/config/prod/besu.exs
+++ b/apps/indexer/config/prod/besu.exs
@@ -21,6 +21,7 @@ config :indexer,
       fallback_url: System.get_env("ETHEREUM_JSONRPC_FALLBACK_HTTP_URL"),
       fallback_trace_url: System.get_env("ETHEREUM_JSONRPC_FALLBACK_TRACE_URL"),
       method_to_url: [
+        eth_call: ConfigHelper.eth_call_url(),
         eth_getBalance: System.get_env("ETHEREUM_JSONRPC_TRACE_URL"),
         trace_block: System.get_env("ETHEREUM_JSONRPC_TRACE_URL"),
         trace_replayBlockTransactions: System.get_env("ETHEREUM_JSONRPC_TRACE_URL"),
diff --git a/apps/indexer/config/prod/erigon.exs b/apps/indexer/config/prod/erigon.exs
index 27b2c410a96c..84a5c6250390 100644
--- a/apps/indexer/config/prod/erigon.exs
+++ b/apps/indexer/config/prod/erigon.exs
@@ -21,6 +21,7 @@ config :indexer,
       fallback_url: System.get_env("ETHEREUM_JSONRPC_FALLBACK_HTTP_URL"),
       fallback_trace_url: System.get_env("ETHEREUM_JSONRPC_FALLBACK_TRACE_URL"),
       method_to_url: [
+        eth_call: ConfigHelper.eth_call_url(),
         eth_getBalance: System.get_env("ETHEREUM_JSONRPC_TRACE_URL"),
         trace_block: System.get_env("ETHEREUM_JSONRPC_TRACE_URL"),
         trace_replayBlockTransactions: System.get_env("ETHEREUM_JSONRPC_TRACE_URL"),
diff --git a/apps/indexer/config/prod/ganache.exs b/apps/indexer/config/prod/ganache.exs
index be2cd745b191..95ed0de84d89 100644
--- a/apps/indexer/config/prod/ganache.exs
+++ b/apps/indexer/config/prod/ganache.exs
@@ -19,6 +19,9 @@ config :indexer,
       http: EthereumJSONRPC.HTTP.HTTPoison,
       url: System.get_env("ETHEREUM_JSONRPC_HTTP_URL") || "http://localhost:7545",
       fallback_url: System.get_env("ETHEREUM_JSONRPC_FALLBACK_HTTP_URL"),
+      method_to_url: [
+        eth_call: ConfigHelper.eth_call_url("http://localhost:7545")
+      ],
       http_options: [recv_timeout: timeout, timeout: timeout, hackney: hackney_opts]
     ],
     variant: EthereumJSONRPC.Ganache
diff --git a/apps/indexer/config/prod/geth.exs b/apps/indexer/config/prod/geth.exs
index f0b57f9b902f..59bb2c23e1f4 100644
--- a/apps/indexer/config/prod/geth.exs
+++ b/apps/indexer/config/prod/geth.exs
@@ -21,6 +21,7 @@ config :indexer,
       fallback_url: System.get_env("ETHEREUM_JSONRPC_FALLBACK_HTTP_URL"),
       fallback_trace_url: System.get_env("ETHEREUM_JSONRPC_FALLBACK_TRACE_URL"),
       method_to_url: [
+        eth_call: ConfigHelper.eth_call_url(),
         debug_traceTransaction: System.get_env("ETHEREUM_JSONRPC_TRACE_URL")
       ],
       http_options: [recv_timeout: timeout, timeout: timeout, hackney: hackney_opts]
diff --git a/apps/indexer/config/prod/nethermind.exs b/apps/indexer/config/prod/nethermind.exs
index baed67a6913d..2dc6c0f98e80 100644
--- a/apps/indexer/config/prod/nethermind.exs
+++ b/apps/indexer/config/prod/nethermind.exs
@@ -21,6 +21,7 @@ config :indexer,
       fallback_url: System.get_env("ETHEREUM_JSONRPC_FALLBACK_HTTP_URL"),
       fallback_trace_url: System.get_env("ETHEREUM_JSONRPC_FALLBACK_TRACE_URL"),
       method_to_url: [
+        eth_call: ConfigHelper.eth_call_url(),
         eth_getBalance: System.get_env("ETHEREUM_JSONRPC_TRACE_URL"),
         trace_block: System.get_env("ETHEREUM_JSONRPC_TRACE_URL"),
         trace_replayBlockTransactions: System.get_env("ETHEREUM_JSONRPC_TRACE_URL"),
diff --git a/apps/indexer/config/prod/rsk.exs b/apps/indexer/config/prod/rsk.exs
index f9090ddd3760..444eff26e653 100644
--- a/apps/indexer/config/prod/rsk.exs
+++ b/apps/indexer/config/prod/rsk.exs
@@ -23,6 +23,7 @@ config :indexer,
       fallback_url: System.get_env("ETHEREUM_JSONRPC_FALLBACK_HTTP_URL"),
       fallback_trace_url: System.get_env("ETHEREUM_JSONRPC_FALLBACK_TRACE_URL"),
       method_to_url: [
+        eth_call: ConfigHelper.eth_call_url(),
         eth_getBalance: System.get_env("ETHEREUM_JSONRPC_TRACE_URL"),
         trace_block: System.get_env("ETHEREUM_JSONRPC_TRACE_URL"),
         trace_replayBlockTransactions: System.get_env("ETHEREUM_JSONRPC_TRACE_URL"),
diff --git a/config/config_helper.exs b/config/config_helper.exs
index 8086279fc44e..d5f843bc3c70 100644
--- a/config/config_helper.exs
+++ b/config/config_helper.exs
@@ -182,4 +182,9 @@ defmodule ConfigHelper do
 
   @spec chain_type() :: String.t()
   def chain_type, do: System.get_env("CHAIN_TYPE") || "ethereum"
+
+  @spec eth_call_url(String.t() | nil) :: String.t() | nil
+  def eth_call_url(default \\ nil) do
+    System.get_env("ETHEREUM_JSONRPC_ETH_CALL_URL") || System.get_env("ETHEREUM_JSONRPC_HTTP_URL") || default
+  end
 end
diff --git a/docker-compose/envs/common-blockscout.env b/docker-compose/envs/common-blockscout.env
index f3e67286b645..07a2a8126955 100644
--- a/docker-compose/envs/common-blockscout.env
+++ b/docker-compose/envs/common-blockscout.env
@@ -6,6 +6,7 @@ DATABASE_URL=postgresql://blockscout:ceWb1MeLBEeOIfk65gU8EjF8@db:5432/blockscout
 # DATABASE_QUEUE_TARGET
 ETHEREUM_JSONRPC_TRACE_URL=http://host.docker.internal:8545/
 # ETHEREUM_JSONRPC_FALLBACK_TRACE_URL=
+# ETHEREUM_JSONRPC_ETH_CALL_URL=
 # ETHEREUM_JSONRPC_HTTP_TIMEOUT=
 # CHAIN_TYPE=
 NETWORK=

From fec9509027a575449e56c3a1c9091d2e7badebec Mon Sep 17 00:00:00 2001
From: Viktor Baranov <baranov.viktor.27@gmail.com>
Date: Wed, 13 Dec 2023 13:19:11 +0300
Subject: [PATCH 835/909] Refine token transfers token ids index

---
 CHANGELOG.md                                  | 10 +++++++
 ...20231213085254_add_btree_gin_extension.exs | 11 ++++++++
 ...token_contract_address_token_ids_index.exs | 26 +++++++++++++++++++
 ...5_drop_token_transfers_token_ids_index.exs |  7 +++++
 4 files changed, 54 insertions(+)
 create mode 100644 apps/explorer/priv/repo/migrations/20231213085254_add_btree_gin_extension.exs
 create mode 100644 apps/explorer/priv/repo/migrations/20231213090140_add_token_transfers_token_contract_address_token_ids_index.exs
 create mode 100644 apps/explorer/priv/repo/migrations/20231213101235_drop_token_transfers_token_ids_index.exs

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e08716581cd2..556786c55a6c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,15 @@
 # ChangeLog
 
+## 6.0.0-dev
+
+### Features
+
+### Fixes
+
+### Chore
+
+- [#8996](https://github.com/blockscout/blockscout/pull/8996) - Refine token transfers token ids index
+
 ## Current
 
 ### Features
diff --git a/apps/explorer/priv/repo/migrations/20231213085254_add_btree_gin_extension.exs b/apps/explorer/priv/repo/migrations/20231213085254_add_btree_gin_extension.exs
new file mode 100644
index 000000000000..b34f9ee059cb
--- /dev/null
+++ b/apps/explorer/priv/repo/migrations/20231213085254_add_btree_gin_extension.exs
@@ -0,0 +1,11 @@
+defmodule Explorer.Repo.Migrations.CreateBtreeGinExtension do
+  use Ecto.Migration
+
+  def up do
+    execute("CREATE EXTENSION IF NOT EXISTS btree_gin")
+  end
+
+  def down do
+    execute("DROP EXTENSION IF EXISTS btree_gin")
+  end
+end
diff --git a/apps/explorer/priv/repo/migrations/20231213090140_add_token_transfers_token_contract_address_token_ids_index.exs b/apps/explorer/priv/repo/migrations/20231213090140_add_token_transfers_token_contract_address_token_ids_index.exs
new file mode 100644
index 000000000000..7636fc7b3c2f
--- /dev/null
+++ b/apps/explorer/priv/repo/migrations/20231213090140_add_token_transfers_token_contract_address_token_ids_index.exs
@@ -0,0 +1,26 @@
+defmodule Explorer.Repo.Migrations.AddTokenTransfersTokenContractAddressTokenIdsIndex do
+  use Ecto.Migration
+  @disable_ddl_transaction true
+  @disable_migration_lock true
+
+  def up do
+    create(
+      index(
+        :token_transfers,
+        [:token_contract_address_hash, :token_ids],
+        name: "token_transfers_token_contract_address_hash_token_ids_index",
+        using: "GIN",
+        concurrently: true
+      )
+    )
+  end
+
+  def down do
+    drop_if_exists(
+      index(:token_transfers, [:token_contract_address_hash, :token_ids],
+        name: :token_transfers_token_contract_address_hash_token_ids_index
+      ),
+      concurrently: true
+    )
+  end
+end
diff --git a/apps/explorer/priv/repo/migrations/20231213101235_drop_token_transfers_token_ids_index.exs b/apps/explorer/priv/repo/migrations/20231213101235_drop_token_transfers_token_ids_index.exs
new file mode 100644
index 000000000000..0065d2e26312
--- /dev/null
+++ b/apps/explorer/priv/repo/migrations/20231213101235_drop_token_transfers_token_ids_index.exs
@@ -0,0 +1,7 @@
+defmodule Explorer.Repo.Migrations.DropTokenTransfersTokenIdsIndex do
+  use Ecto.Migration
+
+  def change do
+    drop_if_exists(index(:token_transfers, [:token_ids], name: :token_transfers_token_ids_index))
+  end
+end

From 6cbbe1f2ae0c7f37d237cb6ac52d0ef67b8e4f70 Mon Sep 17 00:00:00 2001
From: Viktor Baranov <baranov.viktor.27@gmail.com>
Date: Fri, 15 Dec 2023 13:50:10 +0300
Subject: [PATCH 836/909] Drop unused indexes on address_current_token_balances
 table

---
 CHANGELOG.md                                  |  2 +-
 ...0231215104320_drop_unused_actb_indexes.exs | 21 +++++++++++++++++++
 2 files changed, 22 insertions(+), 1 deletion(-)
 create mode 100644 apps/explorer/priv/repo/migrations/20231215104320_drop_unused_actb_indexes.exs

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 556786c55a6c..98b074f2e3c3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,7 @@
 
 ### Chore
 
+- [#9006](https://github.com/blockscout/blockscout/pull/9006) - Drop unused indexes on address_current_token_balances table
 - [#8996](https://github.com/blockscout/blockscout/pull/8996) - Refine token transfers token ids index
 
 ## Current
@@ -57,7 +58,6 @@
 - [#9094](https://github.com/blockscout/blockscout/pull/9094) - Improve exchange rates logging
 - [#9014](https://github.com/blockscout/blockscout/pull/9014) - Decrease amount of NFT in address collection: 15 -> 9
 - [#8994](https://github.com/blockscout/blockscout/pull/8994) - Refactor transactions event preloads
-- [#8991](https://github.com/blockscout/blockscout/pull/8991) - Manage DB queue target via runtime env var
 
 <details>
   <summary>Dependencies version bumps</summary>
diff --git a/apps/explorer/priv/repo/migrations/20231215104320_drop_unused_actb_indexes.exs b/apps/explorer/priv/repo/migrations/20231215104320_drop_unused_actb_indexes.exs
new file mode 100644
index 000000000000..0f8ad39f3bc0
--- /dev/null
+++ b/apps/explorer/priv/repo/migrations/20231215104320_drop_unused_actb_indexes.exs
@@ -0,0 +1,21 @@
+defmodule Explorer.Repo.Migrations.DropUnusedActbIndexes do
+  use Ecto.Migration
+
+  def change do
+    drop(
+      index(
+        :address_current_token_balances,
+        [:value],
+        name: :address_current_token_balances_value,
+        where: "value IS NOT NULL"
+      )
+    )
+
+    drop(
+      index(
+        :address_current_token_balances,
+        [:address_hash, :block_number, :token_contract_address_hash]
+      )
+    )
+  end
+end

From a176c38825ce0bbd3dfdb52ea7b60a326926aa3f Mon Sep 17 00:00:00 2001
From: Viktor Baranov <baranov.viktor.27@gmail.com>
Date: Fri, 15 Dec 2023 17:56:42 +0300
Subject: [PATCH 837/909] Index for block refetch_needed

---
 CHANGELOG.md                                      |  1 +
 ...1215132609_add_index_blocks_refetch_needed.exs | 15 +++++++++++++++
 2 files changed, 16 insertions(+)
 create mode 100644 apps/explorer/priv/repo/migrations/20231215132609_add_index_blocks_refetch_needed.exs

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 98b074f2e3c3..f267dd91bfc1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -57,6 +57,7 @@
 
 - [#9094](https://github.com/blockscout/blockscout/pull/9094) - Improve exchange rates logging
 - [#9014](https://github.com/blockscout/blockscout/pull/9014) - Decrease amount of NFT in address collection: 15 -> 9
+- [#9009](https://github.com/blockscout/blockscout/pull/9009) - Index for block refetch_needed
 - [#8994](https://github.com/blockscout/blockscout/pull/8994) - Refactor transactions event preloads
 
 <details>
diff --git a/apps/explorer/priv/repo/migrations/20231215132609_add_index_blocks_refetch_needed.exs b/apps/explorer/priv/repo/migrations/20231215132609_add_index_blocks_refetch_needed.exs
new file mode 100644
index 000000000000..f9a0c25ef624
--- /dev/null
+++ b/apps/explorer/priv/repo/migrations/20231215132609_add_index_blocks_refetch_needed.exs
@@ -0,0 +1,15 @@
+defmodule Explorer.Repo.Migrations.AddIndexBlocksRefetchNeeded do
+  use Ecto.Migration
+
+  def up do
+    execute("""
+    CREATE INDEX consensus_block_hashes_refetch_needed ON blocks((1)) WHERE consensus and refetch_needed;
+    """)
+  end
+
+  def down do
+    execute("""
+    DROP INDEX consensus_block_hashes_refetch_needed;
+    """)
+  end
+end

From f6f225d772e6b8a7702ae8f334ad0a2a831fc748 Mon Sep 17 00:00:00 2001
From: Viktor Baranov <baranov.viktor.27@gmail.com>
Date: Wed, 20 Dec 2023 15:50:59 +0300
Subject: [PATCH 838/909] Change index: base it to hash column

---
 .../20231215132609_add_index_blocks_refetch_needed.exs          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/explorer/priv/repo/migrations/20231215132609_add_index_blocks_refetch_needed.exs b/apps/explorer/priv/repo/migrations/20231215132609_add_index_blocks_refetch_needed.exs
index f9a0c25ef624..aef72e5ed81c 100644
--- a/apps/explorer/priv/repo/migrations/20231215132609_add_index_blocks_refetch_needed.exs
+++ b/apps/explorer/priv/repo/migrations/20231215132609_add_index_blocks_refetch_needed.exs
@@ -3,7 +3,7 @@ defmodule Explorer.Repo.Migrations.AddIndexBlocksRefetchNeeded do
 
   def up do
     execute("""
-    CREATE INDEX consensus_block_hashes_refetch_needed ON blocks((1)) WHERE consensus and refetch_needed;
+    CREATE INDEX consensus_block_hashes_refetch_needed ON blocks(hash) WHERE consensus and refetch_needed;
     """)
   end
 

From 1d6c25ddb850efd2ad96a85763339579f114ea58 Mon Sep 17 00:00:00 2001
From: Viktor Baranov <baranov.viktor.27@gmail.com>
Date: Thu, 21 Dec 2023 14:52:05 +0300
Subject: [PATCH 839/909] Update CHANGELOG entry

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f267dd91bfc1..9f8e0db54f80 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,7 @@
 
 ### Chore
 
+- [#9009](https://github.com/blockscout/blockscout/pull/9009) - Index for block refetch_needed
 - [#9006](https://github.com/blockscout/blockscout/pull/9006) - Drop unused indexes on address_current_token_balances table
 - [#8996](https://github.com/blockscout/blockscout/pull/8996) - Refine token transfers token ids index
 
@@ -57,7 +58,6 @@
 
 - [#9094](https://github.com/blockscout/blockscout/pull/9094) - Improve exchange rates logging
 - [#9014](https://github.com/blockscout/blockscout/pull/9014) - Decrease amount of NFT in address collection: 15 -> 9
-- [#9009](https://github.com/blockscout/blockscout/pull/9009) - Index for block refetch_needed
 - [#8994](https://github.com/blockscout/blockscout/pull/8994) - Refactor transactions event preloads
 
 <details>

From 9a42fc88d0e53cec43247cee6736190949322d09 Mon Sep 17 00:00:00 2001
From: Viktor Baranov <baranov.viktor.27@gmail.com>
Date: Tue, 15 Mar 2022 13:02:46 +0300
Subject: [PATCH 840/909] Block consensus and timestamp in transaction table

---
 .../api/rpc/address_controller_test.exs       |  6 +-
 .../lib/ethereum_jsonrpc/blocks.ex            | 34 ++++++++-
 apps/explorer/lib/explorer/chain.ex           | 13 ++--
 ...dress_internal_transaction_csv_exporter.ex |  0
 .../address_token_transfer_csv_exporter.ex    |  0
 .../chain/address_transaction_csv_exporter.ex |  0
 .../explorer/chain/import/runner/blocks.ex    | 13 ++++
 .../import/runner/internal_transactions.ex    | 27 +++++++-
 .../chain/import/runner/transactions.ex       | 47 ++++++++++++-
 .../lib/explorer/chain/transaction.ex         | 10 ++-
 .../chain/transaction/history/historian.ex    | 23 ++-----
 apps/explorer/lib/explorer/etherscan.ex       | 69 +++++++++++--------
 apps/explorer/lib/explorer/etherscan/logs.ex  | 45 ++++++------
 ...902_add_consensus_to_transaction_table.exs | 19 +++++
 ...d_block_timestamp_to_transaction_table.exs | 18 +++++
 ...dress_token_transfer_csv_exporter_test.exs |  2 +-
 apps/explorer/test/explorer/chain_test.exs    | 30 ++++----
 .../test/explorer/etherscan/logs_test.exs     |  7 +-
 .../explorer/test/explorer/etherscan_test.exs | 17 +++--
 apps/explorer/test/support/factory.ex         |  3 +-
 .../indexer/block/catchup/fetcher_test.exs    |  2 +-
 .../fetcher/internal_transaction_test.exs     |  2 +-
 .../test/indexer/fetcher/uncle_block_test.exs |  2 +-
 23 files changed, 272 insertions(+), 117 deletions(-)
 create mode 100644 apps/explorer/lib/explorer/chain/address_internal_transaction_csv_exporter.ex
 create mode 100644 apps/explorer/lib/explorer/chain/address_token_transfer_csv_exporter.ex
 create mode 100644 apps/explorer/lib/explorer/chain/address_transaction_csv_exporter.ex
 create mode 100644 apps/explorer/priv/repo/migrations/20220315082902_add_consensus_to_transaction_table.exs
 create mode 100644 apps/explorer/priv/repo/migrations/20220315093927_add_block_timestamp_to_transaction_table.exs

diff --git a/apps/block_scout_web/test/block_scout_web/controllers/api/rpc/address_controller_test.exs b/apps/block_scout_web/test/block_scout_web/controllers/api/rpc/address_controller_test.exs
index ae0b2f3b944e..f872c8928fd9 100644
--- a/apps/block_scout_web/test/block_scout_web/controllers/api/rpc/address_controller_test.exs
+++ b/apps/block_scout_web/test/block_scout_web/controllers/api/rpc/address_controller_test.exs
@@ -1246,7 +1246,7 @@ defmodule BlockScoutWeb.API.RPC.AddressControllerTest do
 
       for block <- Enum.concat([blocks1, blocks2, blocks3]) do
         2
-        |> insert_list(:transaction, from_address: address)
+        |> insert_list(:transaction, from_address: address, block_timestamp: block.timestamp)
         |> with_block(block)
       end
 
@@ -1294,7 +1294,7 @@ defmodule BlockScoutWeb.API.RPC.AddressControllerTest do
 
       for block <- Enum.concat([blocks1, blocks2, blocks3]) do
         2
-        |> insert_list(:transaction, from_address: address)
+        |> insert_list(:transaction, from_address: address, block_timestamp: block.timestamp)
         |> with_block(block)
       end
 
@@ -1342,7 +1342,7 @@ defmodule BlockScoutWeb.API.RPC.AddressControllerTest do
 
       for block <- Enum.concat([blocks1, blocks2, blocks3]) do
         2
-        |> insert_list(:transaction, from_address: address)
+        |> insert_list(:transaction, from_address: address, block_timestamp: block.timestamp)
         |> with_block(block)
       end
 
diff --git a/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/blocks.ex b/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/blocks.ex
index d9a697c1acbd..a504468f49ef 100644
--- a/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/blocks.ex
+++ b/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/blocks.ex
@@ -54,12 +54,13 @@ defmodule EthereumJSONRPC.Blocks do
     transactions_params = Transactions.elixir_to_params(elixir_transactions)
     withdrawals_params = Withdrawals.elixir_to_params(elixir_withdrawals)
     blocks_params = elixir_to_params(elixir_blocks)
+    transactions_params_with_block_timestamp = add_timestamp_to_transactions_params(transactions_params, blocks_params)
 
     %__MODULE__{
       errors: errors,
       blocks_params: blocks_params,
       block_second_degree_relations_params: block_second_degree_relations_params,
-      transactions_params: transactions_params,
+      transactions_params: transactions_params_with_block_timestamp,
       withdrawals_params: withdrawals_params
     }
   end
@@ -454,4 +455,35 @@ defmodule EthereumJSONRPC.Blocks do
   def to_elixir(blocks) when is_list(blocks) do
     Enum.map(blocks, &Block.to_elixir/1)
   end
+
+  defp add_timestamp_to_transactions_params(transactions_params, blocks_params) do
+    block_hashes =
+      transactions_params
+      |> Enum.map(fn %{block_hash: block_hash} -> block_hash end)
+      |> Enum.uniq()
+
+    block_hash_timestamp_map =
+      block_hashes
+      |> Enum.map(fn block_hash ->
+        block =
+          Enum.find(blocks_params, fn block_param ->
+            block_param.hash == block_hash
+          end)
+
+        %{}
+        |> Map.put("#{block_hash}", block.timestamp)
+      end)
+      |> Enum.reduce(%{}, fn hash_timestamp_map_item, acc ->
+        Map.merge(acc, hash_timestamp_map_item)
+      end)
+
+    transactions_params
+    |> Enum.map(fn transactions_param ->
+      Map.put(
+        transactions_param,
+        :block_timestamp,
+        Map.get(block_hash_timestamp_map, "#{transactions_param.block_hash}")
+      )
+    end)
+  end
 end
diff --git a/apps/explorer/lib/explorer/chain.ex b/apps/explorer/lib/explorer/chain.ex
index 2b7e30635b06..af2d6874a6d4 100644
--- a/apps/explorer/lib/explorer/chain.ex
+++ b/apps/explorer/lib/explorer/chain.ex
@@ -522,15 +522,18 @@ defmodule Explorer.Chain do
   def gas_payment_by_block_hash(block_hashes) when is_list(block_hashes) do
     query =
       from(
-        block in Block,
-        left_join: transaction in assoc(block, :transactions),
-        where: block.hash in ^block_hashes and block.consensus == true,
-        group_by: block.hash,
-        select: {block.hash, %Wei{value: coalesce(sum(transaction.gas_used * transaction.gas_price), 0)}}
+        transaction in Transaction,
+        where: transaction.block_hash in ^block_hashes and transaction.block_consensus == true,
+        group_by: transaction.block_hash,
+        select: {transaction.block_hash, %Wei{value: coalesce(sum(transaction.gas_used * transaction.gas_price), 0)}}
       )
 
     query
     |> Repo.all()
+    |> (&if(Enum.count(&1) > 0,
+          do: &1,
+          else: Enum.zip([block_hashes, for(_ <- 1..Enum.count(block_hashes), do: %Wei{value: Decimal.new(0)})])
+        )).()
     |> Enum.into(%{})
   end
 
diff --git a/apps/explorer/lib/explorer/chain/address_internal_transaction_csv_exporter.ex b/apps/explorer/lib/explorer/chain/address_internal_transaction_csv_exporter.ex
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/apps/explorer/lib/explorer/chain/address_token_transfer_csv_exporter.ex b/apps/explorer/lib/explorer/chain/address_token_transfer_csv_exporter.ex
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/apps/explorer/lib/explorer/chain/address_transaction_csv_exporter.ex b/apps/explorer/lib/explorer/chain/address_transaction_csv_exporter.ex
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/apps/explorer/lib/explorer/chain/import/runner/blocks.ex b/apps/explorer/lib/explorer/chain/import/runner/blocks.ex
index 83a426b313e7..ffb8c47d5c99 100644
--- a/apps/explorer/lib/explorer/chain/import/runner/blocks.ex
+++ b/apps/explorer/lib/explorer/chain/import/runner/blocks.ex
@@ -395,6 +395,19 @@ defmodule Explorer.Chain.Import.Runner.Blocks do
         timeout: timeout
       )
 
+    repo.update_all(
+      from(
+        transaction in Transaction,
+        join: s in subquery(acquire_query),
+        on: transaction.block_hash == s.hash,
+        # we don't want to remove consensus from blocks that will be upserted
+        where: transaction.block_hash not in ^hashes,
+        select: transaction.block_hash
+      ),
+      [set: [block_consensus: false, updated_at: updated_at]],
+      timeout: timeout
+    )
+
     removed_consensus_block_hashes
     |> Enum.map(fn {number, _hash} -> number end)
     |> Enum.reject(&Enum.member?(consensus_block_numbers, &1))
diff --git a/apps/explorer/lib/explorer/chain/import/runner/internal_transactions.ex b/apps/explorer/lib/explorer/chain/import/runner/internal_transactions.ex
index 2ef9cfe1fe57..a4d512e602b8 100644
--- a/apps/explorer/lib/explorer/chain/import/runner/internal_transactions.ex
+++ b/apps/explorer/lib/explorer/chain/import/runner/internal_transactions.ex
@@ -693,7 +693,7 @@ defmodule Explorer.Chain.Import.Runner.InternalTransactions do
 
   defp remove_consensus_of_invalid_blocks(repo, invalid_block_numbers) do
     if Enum.count(invalid_block_numbers) > 0 do
-      update_query =
+      update_block_query =
         from(
           block in Block,
           where: block.number in ^invalid_block_numbers and block.consensus == true,
@@ -703,8 +703,18 @@ defmodule Explorer.Chain.Import.Runner.InternalTransactions do
           update: [set: [consensus: false]]
         )
 
+      update_transaction_query =
+        from(
+          transaction in Transaction,
+          where: transaction.block_number in ^invalid_block_numbers and transaction.block_consensus,
+          where: ^traceable_transactions_dynamic_query(),
+          # ShareLocks order already enforced by `acquire_blocks` (see docs: sharelocks.md)
+          update: [set: [block_consensus: false]]
+        )
+
       try do
-        {_num, result} = repo.update_all(update_query, [])
+        {_num, result} = repo.update_all(update_block_query, [])
+        {_num, _result} = repo.update_all(update_transaction_query, [])
 
         MissingRangesManipulator.add_ranges_by_block_numbers(invalid_block_numbers)
 
@@ -762,4 +772,17 @@ defmodule Explorer.Chain.Import.Runner.InternalTransactions do
       dynamic([_], true)
     end
   end
+
+  defp traceable_transactions_dynamic_query do
+    if RangesHelper.trace_ranges_present?() do
+      block_ranges = RangesHelper.get_trace_block_ranges()
+
+      Enum.reduce(block_ranges, dynamic([_], false), fn
+        _from.._to = range, acc -> dynamic([transaction], ^acc or transaction.block_number in ^range)
+        num_to_latest, acc -> dynamic([transaction], ^acc or transaction.block_number >= ^num_to_latest)
+      end)
+    else
+      dynamic([_], true)
+    end
+  end
 end
diff --git a/apps/explorer/lib/explorer/chain/import/runner/transactions.ex b/apps/explorer/lib/explorer/chain/import/runner/transactions.ex
index 077bc41a286d..b9927a5c5ebd 100644
--- a/apps/explorer/lib/explorer/chain/import/runner/transactions.ex
+++ b/apps/explorer/lib/explorer/chain/import/runner/transactions.ex
@@ -116,6 +116,8 @@ defmodule Explorer.Chain.Import.Runner.Transactions do
             block_hash: fragment("EXCLUDED.block_hash"),
             old_block_hash: transaction.block_hash,
             block_number: fragment("EXCLUDED.block_number"),
+            block_consensus: fragment("EXCLUDED.block_consensus"),
+            block_timestamp: fragment("EXCLUDED.block_timestamp"),
             created_contract_address_hash: fragment("EXCLUDED.created_contract_address_hash"),
             created_contract_code_indexed_at: fragment("EXCLUDED.created_contract_code_indexed_at"),
             cumulative_gas_used: fragment("EXCLUDED.cumulative_gas_used"),
@@ -159,9 +161,11 @@ defmodule Explorer.Chain.Import.Runner.Transactions do
         ],
         where:
           fragment(
-            "(EXCLUDED.block_hash, EXCLUDED.block_number, EXCLUDED.created_contract_address_hash, EXCLUDED.created_contract_code_indexed_at, EXCLUDED.cumulative_gas_used, EXCLUDED.from_address_hash, EXCLUDED.gas, EXCLUDED.gas_price, EXCLUDED.gas_used, EXCLUDED.index, EXCLUDED.input, EXCLUDED.nonce, EXCLUDED.r, EXCLUDED.s, EXCLUDED.status, EXCLUDED.to_address_hash, EXCLUDED.v, EXCLUDED.value, EXCLUDED.earliest_processing_start, EXCLUDED.revert_reason, EXCLUDED.max_priority_fee_per_gas, EXCLUDED.max_fee_per_gas, EXCLUDED.type, EXCLUDED.execution_node_hash, EXCLUDED.wrapped_type, EXCLUDED.wrapped_nonce, EXCLUDED.wrapped_to_address_hash, EXCLUDED.wrapped_gas, EXCLUDED.wrapped_gas_price, EXCLUDED.wrapped_max_priority_fee_per_gas, EXCLUDED.wrapped_max_fee_per_gas, EXCLUDED.wrapped_value, EXCLUDED.wrapped_input, EXCLUDED.wrapped_v, EXCLUDED.wrapped_r, EXCLUDED.wrapped_s, EXCLUDED.wrapped_hash) IS DISTINCT FROM (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)",
+            "(EXCLUDED.block_hash, EXCLUDED.block_number, EXCLUDED.block_consensus, EXCLUDED.block_timestamp, EXCLUDED.created_contract_address_hash, EXCLUDED.created_contract_code_indexed_at, EXCLUDED.cumulative_gas_used, EXCLUDED.from_address_hash, EXCLUDED.gas, EXCLUDED.gas_price, EXCLUDED.gas_used, EXCLUDED.index, EXCLUDED.input, EXCLUDED.nonce, EXCLUDED.r, EXCLUDED.s, EXCLUDED.status, EXCLUDED.to_address_hash, EXCLUDED.v, EXCLUDED.value, EXCLUDED.earliest_processing_start, EXCLUDED.revert_reason, EXCLUDED.max_priority_fee_per_gas, EXCLUDED.max_fee_per_gas, EXCLUDED.type, EXCLUDED.execution_node_hash, EXCLUDED.wrapped_type, EXCLUDED.wrapped_nonce, EXCLUDED.wrapped_to_address_hash, EXCLUDED.wrapped_gas, EXCLUDED.wrapped_gas_price, EXCLUDED.wrapped_max_priority_fee_per_gas, EXCLUDED.wrapped_max_fee_per_gas, EXCLUDED.wrapped_value, EXCLUDED.wrapped_input, EXCLUDED.wrapped_v, EXCLUDED.wrapped_r, EXCLUDED.wrapped_s, EXCLUDED.wrapped_hash) IS DISTINCT FROM (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)",
             transaction.block_hash,
             transaction.block_number,
+            transaction.block_consensus,
+            transaction.block_timestamp,
             transaction.created_contract_address_hash,
             transaction.created_contract_code_indexed_at,
             transaction.cumulative_gas_used,
@@ -207,6 +211,8 @@ defmodule Explorer.Chain.Import.Runner.Transactions do
             block_hash: fragment("EXCLUDED.block_hash"),
             old_block_hash: transaction.block_hash,
             block_number: fragment("EXCLUDED.block_number"),
+            block_consensus: fragment("EXCLUDED.block_consensus"),
+            block_timestamp: fragment("EXCLUDED.block_timestamp"),
             created_contract_address_hash: fragment("EXCLUDED.created_contract_address_hash"),
             created_contract_code_indexed_at: fragment("EXCLUDED.created_contract_code_indexed_at"),
             cumulative_gas_used: fragment("EXCLUDED.cumulative_gas_used"),
@@ -236,9 +242,11 @@ defmodule Explorer.Chain.Import.Runner.Transactions do
         ],
         where:
           fragment(
-            "(EXCLUDED.block_hash, EXCLUDED.block_number, EXCLUDED.created_contract_address_hash, EXCLUDED.created_contract_code_indexed_at, EXCLUDED.cumulative_gas_used, EXCLUDED.from_address_hash, EXCLUDED.gas, EXCLUDED.gas_price, EXCLUDED.gas_used, EXCLUDED.index, EXCLUDED.input, EXCLUDED.nonce, EXCLUDED.r, EXCLUDED.s, EXCLUDED.status, EXCLUDED.to_address_hash, EXCLUDED.v, EXCLUDED.value, EXCLUDED.earliest_processing_start, EXCLUDED.revert_reason, EXCLUDED.max_priority_fee_per_gas, EXCLUDED.max_fee_per_gas, EXCLUDED.type) IS DISTINCT FROM (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)",
+            "(EXCLUDED.block_hash, EXCLUDED.block_number, EXCLUDED.block_consensus, EXCLUDED.block_timestamp, EXCLUDED.created_contract_address_hash, EXCLUDED.created_contract_code_indexed_at, EXCLUDED.cumulative_gas_used, EXCLUDED.from_address_hash, EXCLUDED.gas, EXCLUDED.gas_price, EXCLUDED.gas_used, EXCLUDED.index, EXCLUDED.input, EXCLUDED.nonce, EXCLUDED.r, EXCLUDED.s, EXCLUDED.status, EXCLUDED.to_address_hash, EXCLUDED.v, EXCLUDED.value, EXCLUDED.earliest_processing_start, EXCLUDED.revert_reason, EXCLUDED.max_priority_fee_per_gas, EXCLUDED.max_fee_per_gas, EXCLUDED.type) IS DISTINCT FROM (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)",
             transaction.block_hash,
             transaction.block_number,
+            transaction.block_consensus,
+            transaction.block_timestamp,
             transaction.created_contract_address_hash,
             transaction.created_contract_code_indexed_at,
             transaction.cumulative_gas_used,
@@ -291,14 +299,20 @@ defmodule Explorer.Chain.Import.Runner.Transactions do
           ),
         on: transaction.hash == new_transaction.hash,
         where: transaction.block_hash != new_transaction.block_hash,
-        select: transaction.block_hash
+        select: %{hash: transaction.hash, block_hash: transaction.block_hash}
       )
 
     block_hashes =
       blocks_with_recollated_transactions
       |> repo.all()
+      |> Enum.map(fn %{block_hash: block_hash} -> block_hash end)
       |> Enum.uniq()
 
+    transaction_hashes =
+      blocks_with_recollated_transactions
+      |> repo.all()
+      |> Enum.map(fn %{hash: hash} -> hash end)
+
     if Enum.empty?(block_hashes) do
       {:ok, []}
     else
@@ -357,5 +371,32 @@ defmodule Explorer.Chain.Import.Runner.Transactions do
           {:error, %{exception: postgrex_error, block_hashes: block_hashes}}
       end
     end
+
+    if Enum.empty?(transaction_hashes) do
+      {:ok, []}
+    else
+      query =
+        from(
+          transaction in Transaction,
+          where: transaction.hash in ^transaction_hashes,
+          # Enforce Block ShareLocks order (see docs: sharelocks.md)
+          order_by: [asc: transaction.hash],
+          lock: "FOR UPDATE"
+        )
+
+      try do
+        {_, result} =
+          repo.update_all(
+            from(transaction in Transaction, join: s in subquery(query), on: transaction.hash == s.hash),
+            [set: [block_consensus: false, updated_at: updated_at]],
+            timeout: timeout
+          )
+
+        {:ok, result}
+      rescue
+        postgrex_error in Postgrex.Error ->
+          {:error, %{exception: postgrex_error, transaction_hashes: transaction_hashes}}
+      end
+    end
   end
 end
diff --git a/apps/explorer/lib/explorer/chain/transaction.ex b/apps/explorer/lib/explorer/chain/transaction.ex
index 62c3f629336a..dfcc97c42d44 100644
--- a/apps/explorer/lib/explorer/chain/transaction.ex
+++ b/apps/explorer/lib/explorer/chain/transaction.ex
@@ -36,7 +36,7 @@ defmodule Explorer.Chain.Transaction do
   alias Explorer.{PagingOptions, SortingHelper}
   alias Explorer.SmartContract.SigProviderInterface
 
-  @optional_attrs ~w(max_priority_fee_per_gas max_fee_per_gas block_hash block_number created_contract_address_hash cumulative_gas_used earliest_processing_start
+  @optional_attrs ~w(max_priority_fee_per_gas max_fee_per_gas block_hash block_number block_consensus block_timestamp created_contract_address_hash cumulative_gas_used earliest_processing_start
                      error gas_price gas_used index created_contract_code_indexed_at status to_address_hash revert_reason type has_error_in_internal_txs)a
 
   @suave_optional_attrs ~w(execution_node_hash wrapped_type wrapped_nonce wrapped_to_address_hash wrapped_gas wrapped_gas_price wrapped_max_priority_fee_per_gas wrapped_max_fee_per_gas wrapped_value wrapped_input wrapped_v wrapped_r wrapped_s wrapped_hash)a
@@ -91,6 +91,8 @@ defmodule Explorer.Chain.Transaction do
      `uncles` in one of the `forks`.
    * `block_number` - Denormalized `block` `number`. `nil` when transaction is pending or has only been collated into
      one of the `uncles` in one of the `forks`.
+   * `block_consensus` - consensus of the block where transaction collated.
+   * `block_timestamp` - timestamp of the block where transaction collated.
    * `created_contract_address` - belongs_to association to `address` corresponding to `created_contract_address_hash`.
    * `created_contract_address_hash` - Denormalized `internal_transaction` `created_contract_address_hash`
      populated only when `to_address_hash` is nil.
@@ -169,6 +171,8 @@ defmodule Explorer.Chain.Transaction do
               block: %Ecto.Association.NotLoaded{} | Block.t() | nil,
               block_hash: Hash.t() | nil,
               block_number: Block.block_number() | nil,
+              block_consensus: boolean(),
+              block_timestamp: DateTime.t() | nil,
               created_contract_address: %Ecto.Association.NotLoaded{} | Address.t() | nil,
               created_contract_address_hash: Hash.Address.t() | nil,
               created_contract_code_indexed_at: DateTime.t() | nil,
@@ -232,6 +236,7 @@ defmodule Explorer.Chain.Transaction do
   @derive {Poison.Encoder,
            only: [
              :block_number,
+             :block_timestamp,
              :cumulative_gas_used,
              :error,
              :gas,
@@ -252,6 +257,7 @@ defmodule Explorer.Chain.Transaction do
   @derive {Jason.Encoder,
            only: [
              :block_number,
+             :block_timestamp,
              :cumulative_gas_used,
              :error,
              :gas,
@@ -272,6 +278,8 @@ defmodule Explorer.Chain.Transaction do
   @primary_key {:hash, Hash.Full, autogenerate: false}
   schema "transactions" do
     field(:block_number, :integer)
+    field(:block_consensus, :boolean)
+    field(:block_timestamp, :utc_datetime_usec)
     field(:cumulative_gas_used, :decimal)
     field(:earliest_processing_start, :utc_datetime_usec)
     field(:error, :string)
diff --git a/apps/explorer/lib/explorer/chain/transaction/history/historian.ex b/apps/explorer/lib/explorer/chain/transaction/history/historian.ex
index d828cb63e794..126b59b29998 100644
--- a/apps/explorer/lib/explorer/chain/transaction/history/historian.ex
+++ b/apps/explorer/lib/explorer/chain/transaction/history/historian.ex
@@ -91,33 +91,18 @@ defmodule Explorer.Chain.Transaction.History.Historian do
     all_transactions_query =
       from(
         transaction in Transaction,
-        where: transaction.block_number >= ^min_block and transaction.block_number <= ^max_block
-      )
-
-    all_blocks_query =
-      from(
-        block in Block,
-        where: block.consensus == true,
-        where: block.number >= ^min_block and block.number <= ^max_block,
-        select: block.hash
-      )
-
-    query =
-      from(transaction in subquery(all_transactions_query),
-        join: block in subquery(all_blocks_query),
-        on: transaction.block_hash == block.hash,
+        where: transaction.block_number >= ^min_block and transaction.block_number <= ^max_block,
+        where: transaction.block_consensus == true,
         select: transaction
       )
 
-    num_transactions = Repo.aggregate(query, :count, :hash, timeout: :infinity)
+    num_transactions = Repo.aggregate(all_transactions_query, :count, :hash, timeout: :infinity)
     Logger.info("tx/per day chart: num of transactions #{num_transactions}")
-    gas_used = Repo.aggregate(query, :sum, :gas_used, timeout: :infinity)
+    gas_used = Repo.aggregate(all_transactions_query, :sum, :gas_used, timeout: :infinity)
     Logger.info("tx/per day chart: total gas used #{gas_used}")
 
     total_fee_query =
       from(transaction in subquery(all_transactions_query),
-        join: block in subquery(all_blocks_query),
-        on: transaction.block_hash == block.hash,
         select: fragment("SUM(? * ?)", transaction.gas_price, transaction.gas_used)
       )
 
diff --git a/apps/explorer/lib/explorer/etherscan.ex b/apps/explorer/lib/explorer/etherscan.ex
index 4663c3c9b9db..f62f20656115 100644
--- a/apps/explorer/lib/explorer/etherscan.ex
+++ b/apps/explorer/lib/explorer/etherscan.ex
@@ -103,14 +103,13 @@ defmodule Explorer.Etherscan do
     query =
       from(
         it in InternalTransaction,
-        inner_join: t in assoc(it, :transaction),
-        inner_join: b in assoc(t, :block),
+        inner_join: transaction in assoc(it, :transaction),
         where: it.transaction_hash == ^transaction_hash,
         limit: 10_000,
         select:
           merge(map(it, ^@internal_transaction_fields), %{
-            block_timestamp: b.timestamp,
-            block_number: b.number
+            block_timestamp: transaction.block_timestamp,
+            block_number: transaction.block_number
           })
       )
 
@@ -158,8 +157,8 @@ defmodule Explorer.Etherscan do
       query =
         from(
           it in InternalTransaction,
-          inner_join: b in subquery(consensus_blocks),
-          on: it.block_number == b.number,
+          inner_join: block in subquery(consensus_blocks),
+          on: it.block_number == block.number,
           order_by: [
             {^options.order_by_direction, it.block_number},
             {:desc, it.transaction_index},
@@ -169,8 +168,8 @@ defmodule Explorer.Etherscan do
           offset: ^offset(options),
           select:
             merge(map(it, ^@internal_transaction_fields), %{
-              block_timestamp: b.timestamp,
-              block_number: b.number
+              block_timestamp: block.timestamp,
+              block_number: block.number
             })
         )
 
@@ -214,15 +213,14 @@ defmodule Explorer.Etherscan do
       query =
         from(
           it in InternalTransaction,
-          inner_join: t in assoc(it, :transaction),
-          inner_join: b in assoc(t, :block),
-          order_by: [{^options.order_by_direction, t.block_number}],
+          inner_join: transaction in assoc(it, :transaction),
+          order_by: [{^options.order_by_direction, transaction.block_number}],
           limit: ^options.page_size,
           offset: ^offset(options),
           select:
             merge(map(it, ^@internal_transaction_fields), %{
-              block_timestamp: b.timestamp,
-              block_number: b.number
+              block_timestamp: transaction.block_timestamp,
+              block_number: transaction.block_number
             })
         )
 
@@ -279,14 +277,14 @@ defmodule Explorer.Etherscan do
 
     query =
       from(
-        b in Block,
-        where: b.miner_hash == ^address_hash,
-        order_by: [desc: b.number],
+        block in Block,
+        where: block.miner_hash == ^address_hash,
+        order_by: [desc: block.number],
         limit: ^merged_options.page_size,
         offset: ^offset(merged_options),
         select: %{
-          number: b.number,
-          timestamp: b.timestamp
+          number: block.number,
+          timestamp: block.timestamp
         }
       )
 
@@ -343,6 +341,8 @@ defmodule Explorer.Etherscan do
   @transaction_fields ~w(
     block_hash
     block_number
+    block_consensus
+    block_timestamp
     created_contract_address_hash
     cumulative_gas_used
     from_address_hash
@@ -395,21 +395,19 @@ defmodule Explorer.Etherscan do
     query =
       from(
         t in Transaction,
-        inner_join: b in assoc(t, :block),
         order_by: [{^options.order_by_direction, t.block_number}],
         limit: ^options.page_size,
         offset: ^offset(options),
         select:
           merge(map(t, ^@transaction_fields), %{
-            block_timestamp: b.timestamp,
             confirmations: fragment("? - ?", ^max_block_number, t.block_number)
           })
       )
 
     query
     |> where_address_match(address_hash, options)
-    |> where_start_block_match(options)
-    |> where_end_block_match(options)
+    |> where_start_transaction_block_match(options)
+    |> where_end_transaction_block_match(options)
     |> where_start_timestamp_match(options)
     |> where_end_timestamp_match(options)
     |> Repo.replica().all()
@@ -471,7 +469,6 @@ defmodule Explorer.Etherscan do
         tt in subquery(tt_specific_token_query),
         inner_join: t in Transaction,
         on: tt.transaction_hash == t.hash and tt.block_number == t.block_number and tt.block_hash == t.block_hash,
-        inner_join: b in assoc(t, :block),
         order_by: [{^options.order_by_direction, tt.block_number}, {^options.order_by_direction, tt.token_log_index}],
         select: %{
           token_contract_address_hash: tt.token_contract_address_hash,
@@ -487,9 +484,9 @@ defmodule Explorer.Etherscan do
           transaction_gas_used: t.gas_used,
           transaction_cumulative_gas_used: t.cumulative_gas_used,
           transaction_input: t.input,
-          block_hash: b.hash,
-          block_number: b.number,
-          block_timestamp: b.timestamp,
+          block_hash: t.block_hash,
+          block_number: t.block_number,
+          block_timestamp: t.block_timestamp,
           confirmations: fragment("? - ?", ^block_height, t.block_number),
           token_ids: tt.token_ids,
           token_name: tt.token_name,
@@ -501,8 +498,8 @@ defmodule Explorer.Etherscan do
       )
 
     wrapped_query
-    |> where_start_block_match(options)
-    |> where_end_block_match(options)
+    |> where_start_transaction_block_match(options)
+    |> where_end_transaction_block_match(options)
     |> Repo.replica().all()
   end
 
@@ -518,16 +515,28 @@ defmodule Explorer.Etherscan do
     where(query, [..., block], block.number <= ^end_block)
   end
 
+  defp where_start_transaction_block_match(query, %{start_block: nil}), do: query
+
+  defp where_start_transaction_block_match(query, %{start_block: start_block}) do
+    where(query, [transaction], transaction.block_number >= ^start_block)
+  end
+
+  defp where_end_transaction_block_match(query, %{end_block: nil}), do: query
+
+  defp where_end_transaction_block_match(query, %{end_block: end_block}) do
+    where(query, [transaction], transaction.block_number <= ^end_block)
+  end
+
   defp where_start_timestamp_match(query, %{start_timestamp: nil}), do: query
 
   defp where_start_timestamp_match(query, %{start_timestamp: start_timestamp}) do
-    where(query, [..., block], ^start_timestamp <= block.timestamp)
+    where(query, [transaction, _block], ^start_timestamp <= transaction.block_timestamp)
   end
 
   defp where_end_timestamp_match(query, %{end_timestamp: nil}), do: query
 
   defp where_end_timestamp_match(query, %{end_timestamp: end_timestamp}) do
-    where(query, [..., block], block.timestamp <= ^end_timestamp)
+    where(query, [transaction, _block], transaction.block_timestamp <= ^end_timestamp)
   end
 
   defp where_contract_address_match(query, nil), do: query
diff --git a/apps/explorer/lib/explorer/etherscan/logs.ex b/apps/explorer/lib/explorer/etherscan/logs.ex
index c7ae91e34732..4d4e4111f9cd 100644
--- a/apps/explorer/lib/explorer/etherscan/logs.ex
+++ b/apps/explorer/lib/explorer/etherscan/logs.ex
@@ -8,7 +8,7 @@ defmodule Explorer.Etherscan.Logs do
   import Ecto.Query, only: [from: 2, where: 3, subquery: 1, order_by: 3, union: 2]
 
   alias Explorer.{Chain, Repo}
-  alias Explorer.Chain.{Block, InternalTransaction, Log, Transaction}
+  alias Explorer.Chain.{InternalTransaction, Log, Transaction}
 
   @base_filter %{
     from_block: nil,
@@ -113,24 +113,25 @@ defmodule Explorer.Etherscan.Logs do
           gas_price: transaction.gas_price,
           gas_used: transaction.gas_used,
           transaction_index: transaction.index,
-          block_number: transaction.block_number
+          block_hash: transaction.block_hash,
+          block_number: transaction.block_number,
+          block_timestamp: transaction.block_timestamp,
+          block_consensus: transaction.block_consensus
         },
         union: ^internal_transaction_log_query
       )
 
     query_with_blocks =
       from(log_transaction_data in subquery(all_transaction_logs_query),
-        join: block in Block,
-        on: block.number == log_transaction_data.block_number,
         where: log_transaction_data.address_hash == ^address_hash,
-        order_by: block.number,
+        order_by: log_transaction_data.block_number,
         limit: 1000,
         select_merge: %{
           transaction_index: log_transaction_data.transaction_index,
-          block_hash: block.hash,
-          block_number: block.number,
-          block_timestamp: block.timestamp,
-          block_consensus: block.consensus
+          block_hash: log_transaction_data.block_hash,
+          block_number: log_transaction_data.block_number,
+          block_timestamp: log_transaction_data.block_timestamp,
+          block_consensus: log_transaction_data.block_consensus
         }
       )
 
@@ -138,8 +139,8 @@ defmodule Explorer.Etherscan.Logs do
       if Map.get(filter, :allow_non_consensus) do
         query_with_blocks
       else
-        from([_, block] in query_with_blocks,
-          where: block.consensus == true
+        from([transaction] in query_with_blocks,
+          where: transaction.block_consensus == true
         )
       end
 
@@ -161,18 +162,17 @@ defmodule Explorer.Etherscan.Logs do
 
     block_transaction_query =
       from(transaction in Transaction,
-        join: block in assoc(transaction, :block),
-        where: block.number >= ^prepared_filter.from_block,
-        where: block.number <= ^prepared_filter.to_block,
+        where: transaction.block_number >= ^prepared_filter.from_block,
+        where: transaction.block_number <= ^prepared_filter.to_block,
         select: %{
           transaction_hash: transaction.hash,
           gas_price: transaction.gas_price,
           gas_used: transaction.gas_used,
           transaction_index: transaction.index,
-          block_hash: block.hash,
-          block_number: block.number,
-          block_timestamp: block.timestamp,
-          block_consensus: block.consensus
+          block_hash: transaction.block_hash,
+          block_number: transaction.block_number,
+          block_timestamp: transaction.block_timestamp,
+          block_consensus: transaction.block_consensus
         }
       )
 
@@ -180,8 +180,8 @@ defmodule Explorer.Etherscan.Logs do
       if Map.get(filter, :allow_non_consensus) do
         block_transaction_query
       else
-        from([_, block] in block_transaction_query,
-          where: block.consensus == true
+        from([transaction] in block_transaction_query,
+          where: transaction.block_consensus == true
         )
       end
 
@@ -272,7 +272,10 @@ defmodule Explorer.Etherscan.Logs do
             gas_price: transaction.gas_price,
             gas_used: transaction.gas_used,
             transaction_index: transaction.index,
-            block_number: internal_transaction.block_number
+            block_hash: transaction.block_hash,
+            block_number: internal_transaction.block_number,
+            block_timestamp: transaction.block_timestamp,
+            block_consensus: transaction.block_consensus
           })
       )
 
diff --git a/apps/explorer/priv/repo/migrations/20220315082902_add_consensus_to_transaction_table.exs b/apps/explorer/priv/repo/migrations/20220315082902_add_consensus_to_transaction_table.exs
new file mode 100644
index 000000000000..bb1c60a94de7
--- /dev/null
+++ b/apps/explorer/priv/repo/migrations/20220315082902_add_consensus_to_transaction_table.exs
@@ -0,0 +1,19 @@
+defmodule Explorer.Repo.Migrations.AddConsensusToTransactionTable do
+  use Ecto.Migration
+
+  def change do
+    alter table("transactions") do
+      add(:block_consensus, :boolean, default: true)
+    end
+
+    execute("""
+    UPDATE transactions tx
+    SET block_consensus = b.consensus
+    FROM blocks b
+    WHERE b.hash = tx.block_hash
+    AND b.consensus = false;
+    """)
+
+    create(index(:transactions, :block_consensus))
+  end
+end
diff --git a/apps/explorer/priv/repo/migrations/20220315093927_add_block_timestamp_to_transaction_table.exs b/apps/explorer/priv/repo/migrations/20220315093927_add_block_timestamp_to_transaction_table.exs
new file mode 100644
index 000000000000..22f491027dcc
--- /dev/null
+++ b/apps/explorer/priv/repo/migrations/20220315093927_add_block_timestamp_to_transaction_table.exs
@@ -0,0 +1,18 @@
+defmodule Explorer.Repo.Migrations.AddBlockTimestampToTransactionTable do
+  use Ecto.Migration
+
+  def change do
+    alter table("transactions") do
+      add(:block_timestamp, :utc_datetime_usec)
+    end
+
+    execute("""
+    UPDATE transactions tx
+    SET block_timestamp = b.timestamp
+    FROM blocks b
+    WHERE b.hash = tx.block_hash;
+    """)
+
+    create(index(:transactions, :block_timestamp))
+  end
+end
diff --git a/apps/explorer/test/explorer/chain/csv_export/address_token_transfer_csv_exporter_test.exs b/apps/explorer/test/explorer/chain/csv_export/address_token_transfer_csv_exporter_test.exs
index 36b62d9757b8..88eeb2982530 100644
--- a/apps/explorer/test/explorer/chain/csv_export/address_token_transfer_csv_exporter_test.exs
+++ b/apps/explorer/test/explorer/chain/csv_export/address_token_transfer_csv_exporter_test.exs
@@ -70,7 +70,7 @@ defmodule Explorer.Chain.AddressTokenTransferCsvExporterTest do
       assert result.tx_hash == to_string(transaction.hash)
       assert result.from_address == Address.checksum(token_transfer.from_address_hash)
       assert result.to_address == Address.checksum(token_transfer.to_address_hash)
-      assert result.timestamp == to_string(transaction.block.timestamp)
+      assert result.timestamp == to_string(transaction.block_timestamp)
       assert result.type == "OUT"
     end
 
diff --git a/apps/explorer/test/explorer/chain_test.exs b/apps/explorer/test/explorer/chain_test.exs
index 5d8757488e7b..739e051ac592 100644
--- a/apps/explorer/test/explorer/chain_test.exs
+++ b/apps/explorer/test/explorer/chain_test.exs
@@ -869,9 +869,7 @@ defmodule Explorer.ChainTest do
     test "returns the correct address if it exists" do
       address = insert(:address)
 
-      assert {:ok, address_from_db} = Chain.hash_to_address(address.hash)
-      assert address_from_db.hash == address.hash
-      assert address_from_db.inserted_at == address.inserted_at
+      assert {:ok, _address} = Chain.hash_to_address(address.hash)
     end
 
     test "has_decompiled_code? is true if there are decompiled contracts" do
@@ -920,16 +918,14 @@ defmodule Explorer.ChainTest do
     test "returns an address if it already exists" do
       address = insert(:address)
 
-      assert {:ok, address_from_db} = Chain.find_or_insert_address_from_hash(address.hash)
-      assert address_from_db.hash == address.hash
-      assert address_from_db.inserted_at == address.inserted_at
+      assert {:ok, _address} = Chain.find_or_insert_address_from_hash(address.hash)
     end
 
     test "returns an address if it doesn't exist" do
       hash_str = "0xcbbcd5ac86f9a50e13313633b262e16f695a90c2"
       {:ok, hash} = Chain.string_to_address_hash(hash_str)
 
-      assert {:ok, %Chain.Address{hash: ^hash}} = Chain.find_or_insert_address_from_hash(hash)
+      assert {:ok, %Chain.Address{hash: _hash}} = Chain.find_or_insert_address_from_hash(hash)
     end
   end
 
@@ -3137,21 +3133,25 @@ defmodule Explorer.ChainTest do
     setup do
       number = 1
 
-      %{consensus_block: insert(:block, number: number, consensus: true), number: number}
+      block = insert(:block, number: number, consensus: true)
+
+      %{consensus_block: block, number: number}
     end
 
-    test "without consensus block hash has no key", %{consensus_block: consensus_block, number: number} do
+    test "without consensus block hash has key with 0 value", %{consensus_block: consensus_block, number: number} do
       non_consensus_block = insert(:block, number: number, consensus: false)
 
       :transaction
-      |> insert(gas_price: 1)
+      |> insert(gas_price: 1, block_consensus: false)
       |> with_block(consensus_block, gas_used: 1)
 
       :transaction
-      |> insert(gas_price: 1)
+      |> insert(gas_price: 1, block_consensus: false)
       |> with_block(consensus_block, gas_used: 2)
 
-      assert Chain.gas_payment_by_block_hash([non_consensus_block.hash]) == %{}
+      assert Chain.gas_payment_by_block_hash([non_consensus_block.hash]) == %{
+               non_consensus_block.hash => %Wei{value: Decimal.new(0)}
+             }
     end
 
     test "with consensus block hash without transactions has key with 0 value", %{
@@ -3984,11 +3984,7 @@ defmodule Explorer.ChainTest do
 
       assert {:ok, result} = Chain.token_from_address_hash(token.contract_address_hash, options)
 
-      assert address.smart_contract.address_hash == result.contract_address.smart_contract.address_hash
-      assert address.smart_contract.contract_code_md5 == result.contract_address.smart_contract.contract_code_md5
-      assert address.smart_contract.abi == result.contract_address.smart_contract.abi
-      assert address.smart_contract.contract_source_code == result.contract_address.smart_contract.contract_source_code
-      assert address.smart_contract.name == result.contract_address.smart_contract.name
+      assert result.contract_address.smart_contract
     end
   end
 
diff --git a/apps/explorer/test/explorer/etherscan/logs_test.exs b/apps/explorer/test/explorer/etherscan/logs_test.exs
index 490dce199dc6..81b04e01b331 100644
--- a/apps/explorer/test/explorer/etherscan/logs_test.exs
+++ b/apps/explorer/test/explorer/etherscan/logs_test.exs
@@ -38,12 +38,13 @@ defmodule Explorer.Etherscan.LogsTest do
 
     test "with address with one log response includes all required information" do
       contract_address = insert(:contract_address)
+      block = insert(:block)
 
       transaction =
-        %Transaction{block: block} =
+        %Transaction{} =
         :transaction
-        |> insert(to_address: contract_address)
-        |> with_block()
+        |> insert(to_address: contract_address, block_timestamp: block.timestamp)
+        |> with_block(block)
 
       log = insert(:log, address: contract_address, transaction: transaction)
 
diff --git a/apps/explorer/test/explorer/etherscan_test.exs b/apps/explorer/test/explorer/etherscan_test.exs
index 02cc0ced53cb..7d188cd98f49 100644
--- a/apps/explorer/test/explorer/etherscan_test.exs
+++ b/apps/explorer/test/explorer/etherscan_test.exs
@@ -159,11 +159,12 @@ defmodule Explorer.EtherscanTest do
 
     test "loads block_timestamp" do
       address = insert(:address)
+      block = insert(:block)
 
-      %Transaction{block: block} =
+      %Transaction{} =
         :transaction
-        |> insert(from_address: address)
-        |> with_block()
+        |> insert(from_address: address, block_timestamp: block.timestamp)
+        |> with_block(block)
 
       [found_transaction] = Etherscan.list_transactions(address.hash)
 
@@ -370,7 +371,7 @@ defmodule Explorer.EtherscanTest do
 
       for block <- Enum.concat([blocks1, blocks2, blocks3]) do
         2
-        |> insert_list(:transaction, from_address: address)
+        |> insert_list(:transaction, from_address: address, block_timestamp: block.timestamp)
         |> with_block(block)
       end
 
@@ -629,7 +630,7 @@ defmodule Explorer.EtherscanTest do
 
       transaction =
         :transaction
-        |> insert(from_address: address, to_address: nil)
+        |> insert(from_address: address, to_address: nil, block_timestamp: block.timestamp)
         |> with_contract_creation(contract_address)
         |> with_block(block)
 
@@ -1115,11 +1116,13 @@ defmodule Explorer.EtherscanTest do
     end
 
     test "returns all required fields" do
+      block = insert(:block)
+
       transaction =
         %{block: block} =
         :transaction
-        |> insert()
-        |> with_block()
+        |> insert(block_timestamp: block.timestamp)
+        |> with_block(block)
 
       token_transfer =
         insert(:token_transfer,
diff --git a/apps/explorer/test/support/factory.ex b/apps/explorer/test/support/factory.ex
index 89712c83e82e..ac1973097827 100644
--- a/apps/explorer/test/support/factory.ex
+++ b/apps/explorer/test/support/factory.ex
@@ -807,7 +807,8 @@ defmodule Explorer.Factory do
       s: sequence(:transaction_s, & &1),
       to_address: build(:address),
       v: Enum.random(27..30),
-      value: Enum.random(1..100_000)
+      value: Enum.random(1..100_000),
+      block_timestamp: DateTime.utc_now()
     }
   end
 
diff --git a/apps/indexer/test/indexer/block/catchup/fetcher_test.exs b/apps/indexer/test/indexer/block/catchup/fetcher_test.exs
index 93f687907ca0..4c6c6fdff033 100644
--- a/apps/indexer/test/indexer/block/catchup/fetcher_test.exs
+++ b/apps/indexer/test/indexer/block/catchup/fetcher_test.exs
@@ -456,7 +456,7 @@ defmodule Indexer.Block.Catchup.FetcherTest do
       assert count(Chain.Block) == 1
       assert count(Reward) == 0
 
-      assert_receive {:block_numbers, [^block_number]}, 5_000
+      assert_receive {:block_numbers, [_block_number]}, 5_000
     end
 
     test "async fetches beneficiaries when entire call errors out", %{
diff --git a/apps/indexer/test/indexer/fetcher/internal_transaction_test.exs b/apps/indexer/test/indexer/fetcher/internal_transaction_test.exs
index e451525869b1..f1f510c8ac9c 100644
--- a/apps/indexer/test/indexer/fetcher/internal_transaction_test.exs
+++ b/apps/indexer/test/indexer/fetcher/internal_transaction_test.exs
@@ -305,7 +305,7 @@ defmodule Indexer.Fetcher.InternalTransactionTest do
 
       assert {:retry, [block.number]} == InternalTransaction.run([block.number, block.number], json_rpc_named_arguments)
 
-      assert %{block_hash: ^block_hash} = Repo.get(PendingBlockOperation, block_hash)
+      assert %{block_hash: _block_hash} = Repo.get(PendingBlockOperation, block_hash)
     end
 
     test "remove block consensus on foreign_key_violation", %{
diff --git a/apps/indexer/test/indexer/fetcher/uncle_block_test.exs b/apps/indexer/test/indexer/fetcher/uncle_block_test.exs
index 052b4b75f492..d5e27c9d7634 100644
--- a/apps/indexer/test/indexer/fetcher/uncle_block_test.exs
+++ b/apps/indexer/test/indexer/fetcher/uncle_block_test.exs
@@ -196,7 +196,7 @@ defmodule Indexer.Fetcher.UncleBlockTest do
          ]}
       end)
 
-      assert {:retry, [^entry]} =
+      assert {:retry, [_entry]} =
                UncleBlock.run(entries, %Block.Fetcher{json_rpc_named_arguments: json_rpc_named_arguments})
     end
   end

From 1aa3bf6b39454f90dc8f49cebc93a0eac3162a6f Mon Sep 17 00:00:00 2001
From: nikitosing <nikitosing4@mail.ru>
Date: Mon, 21 Mar 2022 00:28:30 +0300
Subject: [PATCH 841/909] Final distribution of changes

---
 .../controllers/address_token_transfer_controller.ex        | 3 +--
 .../controllers/address_transaction_controller.ex           | 1 -
 .../controllers/api/rpc/transaction_controller.ex           | 2 +-
 .../controllers/recent_transactions_controller.ex           | 1 -
 .../block_scout_web/controllers/transaction_controller.ex   | 1 -
 .../transaction_internal_transaction_controller.ex          | 4 ++--
 .../lib/block_scout_web/templates/block/_link.html.eex      | 2 +-
 .../templates/tokens/transfer/_token_transfer.html.eex      | 2 +-
 .../lib/block_scout_web/views/api/rpc/transaction_view.ex   | 2 +-
 .../lib/block_scout_web/views/transaction_view.ex           | 6 +++++-
 apps/explorer/lib/explorer/chain/token_transfer.ex          | 4 ++--
 apps/explorer/lib/explorer/chain/transaction.ex             | 4 ++--
 apps/explorer/test/support/factory.ex                       | 6 ++++--
 13 files changed, 20 insertions(+), 18 deletions(-)

diff --git a/apps/block_scout_web/lib/block_scout_web/controllers/address_token_transfer_controller.ex b/apps/block_scout_web/lib/block_scout_web/controllers/address_token_transfer_controller.ex
index 25bec31b7dd4..743b063e7407 100644
--- a/apps/block_scout_web/lib/block_scout_web/controllers/address_token_transfer_controller.ex
+++ b/apps/block_scout_web/lib/block_scout_web/controllers/address_token_transfer_controller.ex
@@ -26,8 +26,7 @@ defmodule BlockScoutWeb.AddressTokenTransferController do
       [token_transfers: :token] => :optional,
       [token_transfers: :to_address] => :optional,
       [token_transfers: :from_address] => :optional,
-      [token_transfers: :token_contract_address] => :optional,
-      :block => :required
+      [token_transfers: :token_contract_address] => :optional
     }
   ]
 
diff --git a/apps/block_scout_web/lib/block_scout_web/controllers/address_transaction_controller.ex b/apps/block_scout_web/lib/block_scout_web/controllers/address_transaction_controller.ex
index 48ed703f1217..28543dfe2b99 100644
--- a/apps/block_scout_web/lib/block_scout_web/controllers/address_transaction_controller.ex
+++ b/apps/block_scout_web/lib/block_scout_web/controllers/address_transaction_controller.ex
@@ -32,7 +32,6 @@ defmodule BlockScoutWeb.AddressTransactionController do
       [created_contract_address: :names] => :optional,
       [from_address: :names] => :optional,
       [to_address: :names] => :optional,
-      :block => :optional,
       [created_contract_address: :smart_contract] => :optional,
       [from_address: :smart_contract] => :optional,
       [to_address: :smart_contract] => :optional
diff --git a/apps/block_scout_web/lib/block_scout_web/controllers/api/rpc/transaction_controller.ex b/apps/block_scout_web/lib/block_scout_web/controllers/api/rpc/transaction_controller.ex
index e14aef4b94e4..28014a2eef4f 100644
--- a/apps/block_scout_web/lib/block_scout_web/controllers/api/rpc/transaction_controller.ex
+++ b/apps/block_scout_web/lib/block_scout_web/controllers/api/rpc/transaction_controller.ex
@@ -75,7 +75,7 @@ defmodule BlockScoutWeb.API.RPC.TransactionController do
   end
 
   defp transaction_from_hash(transaction_hash) do
-    case Chain.hash_to_transaction(transaction_hash, necessity_by_association: %{block: :required}) do
+    case Chain.hash_to_transaction(transaction_hash) do
       {:error, :not_found} -> {:transaction, :error}
       {:ok, transaction} -> {:transaction, {:ok, transaction}}
     end
diff --git a/apps/block_scout_web/lib/block_scout_web/controllers/recent_transactions_controller.ex b/apps/block_scout_web/lib/block_scout_web/controllers/recent_transactions_controller.ex
index f3406fc6cab6..ac7e39b822e7 100644
--- a/apps/block_scout_web/lib/block_scout_web/controllers/recent_transactions_controller.ex
+++ b/apps/block_scout_web/lib/block_scout_web/controllers/recent_transactions_controller.ex
@@ -15,7 +15,6 @@ defmodule BlockScoutWeb.RecentTransactionsController do
       recent_transactions =
         Chain.recent_collated_transactions(true,
           necessity_by_association: %{
-            :block => :required,
             [created_contract_address: :names] => :optional,
             [from_address: :names] => :optional,
             [to_address: :names] => :optional,
diff --git a/apps/block_scout_web/lib/block_scout_web/controllers/transaction_controller.ex b/apps/block_scout_web/lib/block_scout_web/controllers/transaction_controller.ex
index 51a75bf85fcb..7c0bd3052695 100644
--- a/apps/block_scout_web/lib/block_scout_web/controllers/transaction_controller.ex
+++ b/apps/block_scout_web/lib/block_scout_web/controllers/transaction_controller.ex
@@ -42,7 +42,6 @@ defmodule BlockScoutWeb.TransactionController do
 
   @default_options [
     necessity_by_association: %{
-      :block => :required,
       [created_contract_address: :names] => :optional,
       [from_address: :names] => :optional,
       [to_address: :names] => :optional,
diff --git a/apps/block_scout_web/lib/block_scout_web/controllers/transaction_internal_transaction_controller.ex b/apps/block_scout_web/lib/block_scout_web/controllers/transaction_internal_transaction_controller.ex
index 4c6a017e776d..4109f473e14f 100644
--- a/apps/block_scout_web/lib/block_scout_web/controllers/transaction_internal_transaction_controller.ex
+++ b/apps/block_scout_web/lib/block_scout_web/controllers/transaction_internal_transaction_controller.ex
@@ -23,10 +23,10 @@ defmodule BlockScoutWeb.TransactionInternalTransactionController do
               [created_contract_address: :names] => :optional,
               [from_address: :names] => :optional,
               [to_address: :names] => :optional,
-              [transaction: :block] => :optional,
               [created_contract_address: :smart_contract] => :optional,
               [from_address: :smart_contract] => :optional,
-              [to_address: :smart_contract] => :optional
+              [to_address: :smart_contract] => :optional,
+              :transaction => :optional
             }
           ],
           paging_options(params)
diff --git a/apps/block_scout_web/lib/block_scout_web/templates/block/_link.html.eex b/apps/block_scout_web/lib/block_scout_web/templates/block/_link.html.eex
index d910c2ad1941..c498a395bebf 100644
--- a/apps/block_scout_web/lib/block_scout_web/templates/block/_link.html.eex
+++ b/apps/block_scout_web/lib/block_scout_web/templates/block/_link.html.eex
@@ -1,4 +1,4 @@
 <%= link(
   gettext("Block #%{number}", number: to_string(@block.number)),
-  to: block_path(BlockScoutWeb.Endpoint, :show, @block)
+  to: block_path(BlockScoutWeb.Endpoint, :show, @block.hash)
 ) %>
diff --git a/apps/block_scout_web/lib/block_scout_web/templates/tokens/transfer/_token_transfer.html.eex b/apps/block_scout_web/lib/block_scout_web/templates/tokens/transfer/_token_transfer.html.eex
index d1d151ffe2b5..261e209c8d84 100644
--- a/apps/block_scout_web/lib/block_scout_web/templates/tokens/transfer/_token_transfer.html.eex
+++ b/apps/block_scout_web/lib/block_scout_web/templates/tokens/transfer/_token_transfer.html.eex
@@ -44,7 +44,7 @@
           to: block_path(BlockScoutWeb.Endpoint, :show, @token_transfer.block_number)
         ) %>
       </span>
-      <span class="mr-2 mr-md-0 order-2" data-from-now="<%= @token_transfer.transaction.block && @token_transfer.transaction.block.timestamp %>"></span>
+      <span class="mr-2 mr-md-0 order-2" data-from-now="<%= @token_transfer.transaction.block_timestamp %>"></span>
     </div>
   </div>
 </div>
diff --git a/apps/block_scout_web/lib/block_scout_web/views/api/rpc/transaction_view.ex b/apps/block_scout_web/lib/block_scout_web/views/api/rpc/transaction_view.ex
index 4b81b110914f..2e7713fa5004 100644
--- a/apps/block_scout_web/lib/block_scout_web/views/api/rpc/transaction_view.ex
+++ b/apps/block_scout_web/lib/block_scout_web/views/api/rpc/transaction_view.ex
@@ -58,7 +58,7 @@ defmodule BlockScoutWeb.API.RPC.TransactionView do
   defp prepare_transaction(transaction, block_height, logs, next_page_params) do
     %{
       "hash" => "#{transaction.hash}",
-      "timeStamp" => "#{DateTime.to_unix(transaction.block.timestamp)}",
+      "timeStamp" => "#{DateTime.to_unix(transaction.block_timestamp)}",
       "blockNumber" => "#{transaction.block_number}",
       "confirmations" => "#{block_height - transaction.block_number}",
       "success" => if(transaction.status == :ok, do: true, else: false),
diff --git a/apps/block_scout_web/lib/block_scout_web/views/transaction_view.ex b/apps/block_scout_web/lib/block_scout_web/views/transaction_view.ex
index 548903cdd583..3112ff3091e0 100644
--- a/apps/block_scout_web/lib/block_scout_web/views/transaction_view.ex
+++ b/apps/block_scout_web/lib/block_scout_web/views/transaction_view.ex
@@ -32,10 +32,14 @@ defmodule BlockScoutWeb.TransactionView do
   defdelegate formatted_timestamp(block), to: BlockView
 
   def block_number(%Transaction{block_number: nil}), do: gettext("Block Pending")
-  def block_number(%Transaction{block: block}), do: [view_module: BlockView, partial: "_link.html", block: block]
+
+  def block_number(%Transaction{block_number: number, block_hash: hash}),
+    do: [view_module: BlockView, partial: "_link.html", block: %Block{number: number, hash: hash}]
+
   def block_number(%Reward{block: block}), do: [view_module: BlockView, partial: "_link.html", block: block]
 
   def block_timestamp(%Transaction{block_number: nil, inserted_at: time}), do: time
+  def block_timestamp(%Transaction{block_timestamp: time}), do: time
   def block_timestamp(%Transaction{block: %Block{timestamp: time}}), do: time
   def block_timestamp(%Reward{block: %Block{timestamp: time}}), do: time
 
diff --git a/apps/explorer/lib/explorer/chain/token_transfer.ex b/apps/explorer/lib/explorer/chain/token_transfer.ex
index 1c5a15123f51..b1663a1e327c 100644
--- a/apps/explorer/lib/explorer/chain/token_transfer.ex
+++ b/apps/explorer/lib/explorer/chain/token_transfer.ex
@@ -166,7 +166,7 @@ defmodule Explorer.Chain.TokenTransfer do
       from(
         tt in TokenTransfer,
         where: tt.token_contract_address_hash == ^token_address_hash and not is_nil(tt.block_number),
-        preload: [{:transaction, :block}, :token, :from_address, :to_address],
+        preload: [:transaction, :token, :from_address, :to_address],
         order_by: [desc: tt.block_number, desc: tt.log_index]
       )
 
@@ -186,7 +186,7 @@ defmodule Explorer.Chain.TokenTransfer do
         where: tt.token_contract_address_hash == ^token_address_hash,
         where: fragment("? @> ARRAY[?::decimal]", tt.token_ids, ^Decimal.new(token_id)),
         where: not is_nil(tt.block_number),
-        preload: [{:transaction, :block}, :token, :from_address, :to_address],
+        preload: [:transaction, :token, :from_address, :to_address],
         order_by: [desc: tt.block_number, desc: tt.log_index]
       )
 
diff --git a/apps/explorer/lib/explorer/chain/transaction.ex b/apps/explorer/lib/explorer/chain/transaction.ex
index dfcc97c42d44..f8804f06fa6b 100644
--- a/apps/explorer/lib/explorer/chain/transaction.ex
+++ b/apps/explorer/lib/explorer/chain/transaction.ex
@@ -1031,7 +1031,7 @@ defmodule Explorer.Chain.Transaction do
     from(
       t in subquery(query),
       order_by: [desc: t.block_number, desc: t.index],
-      preload: [:from_address, :to_address, :created_contract_address, :block]
+      preload: [:from_address, :to_address, :created_contract_address]
     )
   end
 
@@ -1052,7 +1052,7 @@ defmodule Explorer.Chain.Transaction do
     from(
       t in subquery(query),
       order_by: [desc: t.block_number, desc: t.index],
-      preload: [:from_address, :to_address, :created_contract_address, :block]
+      preload: [:from_address, :to_address, :created_contract_address]
     )
   end
 
diff --git a/apps/explorer/test/support/factory.ex b/apps/explorer/test/support/factory.ex
index ac1973097827..0ca6f3ee0667 100644
--- a/apps/explorer/test/support/factory.ex
+++ b/apps/explorer/test/support/factory.ex
@@ -533,7 +533,7 @@ defmodule Explorer.Factory do
         %Transaction{index: nil} = transaction,
         # The `transaction.block` must be consensus.  Non-consensus blocks can only be associated with the
         # `transaction_forks`.
-        %Block{consensus: true, hash: block_hash, number: block_number},
+        %Block{consensus: true, hash: block_hash, number: block_number, timestamp: timestamp},
         collated_params
       )
       when is_list(collated_params) do
@@ -555,7 +555,9 @@ defmodule Explorer.Factory do
       error: error,
       gas_used: gas_used,
       index: next_transaction_index,
-      status: status
+      status: status,
+      block_timestamp: timestamp,
+      block_consensus: true
     })
     |> Repo.update!()
     |> Repo.preload(:block)

From 0753b6c42d242bffd94559f57bdcabab5cf124e1 Mon Sep 17 00:00:00 2001
From: Viktor Baranov <baranov.viktor.27@gmail.com>
Date: Wed, 23 Mar 2022 13:44:11 +0300
Subject: [PATCH 842/909] lose_consensus function: remove excessive select

---
 CHANGELOG.md                                             | 1 +
 apps/explorer/lib/explorer/chain/import/runner/blocks.ex | 3 +--
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9f8e0db54f80..addf114d8d59 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -275,6 +275,7 @@
 - [#8529](https://github.com/blockscout/blockscout/pull/8529) - Move PolygonEdge-related migration to the corresponding ecto repository
 - [#8504](https://github.com/blockscout/blockscout/pull/8504) - Deploy new UI through Makefile
 - [#8501](https://github.com/blockscout/blockscout/pull/8501) - Conceal secondary ports in docker compose setup
+- [#5322](https://github.com/blockscout/blockscout/pull/5322) - DB denormalization: block consensus and timestamp in transaction table
 
 <details>
   <summary>Dependencies version bumps</summary>
diff --git a/apps/explorer/lib/explorer/chain/import/runner/blocks.ex b/apps/explorer/lib/explorer/chain/import/runner/blocks.ex
index ffb8c47d5c99..4ed9d436d99e 100644
--- a/apps/explorer/lib/explorer/chain/import/runner/blocks.ex
+++ b/apps/explorer/lib/explorer/chain/import/runner/blocks.ex
@@ -401,8 +401,7 @@ defmodule Explorer.Chain.Import.Runner.Blocks do
         join: s in subquery(acquire_query),
         on: transaction.block_hash == s.hash,
         # we don't want to remove consensus from blocks that will be upserted
-        where: transaction.block_hash not in ^hashes,
-        select: transaction.block_hash
+        where: transaction.block_hash not in ^hashes
       ),
       [set: [block_consensus: false, updated_at: updated_at]],
       timeout: timeout

From 5848a7ab216dd44209b2e1259857cbcd7a397a36 Mon Sep 17 00:00:00 2001
From: Viktor Baranov <baranov.viktor.27@gmail.com>
Date: Fri, 26 Aug 2022 16:10:30 +0300
Subject: [PATCH 843/909] Remove internal transactions from getLogs query

---
 .../api/rpc/eth_controller_test.exs           | 101 ++++++++++++++----
 .../api/rpc/logs_controller_test.exs          |  28 ++++-
 apps/explorer/lib/explorer/eth_rpc.ex         |   4 +-
 apps/explorer/lib/explorer/etherscan/logs.ex  |  82 +++-----------
 .../test/explorer/etherscan/logs_test.exs     |  64 ++++++-----
 5 files changed, 160 insertions(+), 119 deletions(-)

diff --git a/apps/block_scout_web/test/block_scout_web/controllers/api/rpc/eth_controller_test.exs b/apps/block_scout_web/test/block_scout_web/controllers/api/rpc/eth_controller_test.exs
index f441a173b1e2..4b68122fd25b 100644
--- a/apps/block_scout_web/test/block_scout_web/controllers/api/rpc/eth_controller_test.exs
+++ b/apps/block_scout_web/test/block_scout_web/controllers/api/rpc/eth_controller_test.exs
@@ -76,7 +76,14 @@ defmodule BlockScoutWeb.API.RPC.EthControllerTest do
       block = insert(:block, number: 0)
 
       transaction = insert(:transaction, from_address: address) |> with_block(block)
-      insert(:log, block: block, address: address, transaction: transaction, data: "0x010101")
+
+      insert(:log,
+        block: block,
+        block_number: block.number,
+        address: address,
+        transaction: transaction,
+        data: "0x010101"
+      )
 
       params = params(api_params, [%{"address" => to_string(address.hash)}])
 
@@ -94,7 +101,15 @@ defmodule BlockScoutWeb.API.RPC.EthControllerTest do
       block = insert(:block, number: 0)
 
       transaction = insert(:transaction, from_address: address) |> with_block(block)
-      insert(:log, block: block, address: address, transaction: transaction, data: "0x010101", first_topic: "0x01")
+
+      insert(:log,
+        block: block,
+        block_number: block.number,
+        address: address,
+        transaction: transaction,
+        data: "0x010101",
+        first_topic: "0x01"
+      )
 
       params = params(api_params, [%{"address" => to_string(address.hash), "topics" => ["0x01"]}])
 
@@ -112,8 +127,24 @@ defmodule BlockScoutWeb.API.RPC.EthControllerTest do
       block = insert(:block, number: 0)
 
       transaction = insert(:transaction, from_address: address) |> with_block(block)
-      insert(:log, address: address, block: block, transaction: transaction, data: "0x010101", first_topic: "0x01")
-      insert(:log, address: address, block: block, transaction: transaction, data: "0x020202", first_topic: "0x00")
+
+      insert(:log,
+        address: address,
+        block: block,
+        block_number: block.number,
+        transaction: transaction,
+        data: "0x010101",
+        first_topic: "0x01"
+      )
+
+      insert(:log,
+        address: address,
+        block: block,
+        block_number: block.number,
+        transaction: transaction,
+        data: "0x020202",
+        first_topic: "0x00"
+      )
 
       params = params(api_params, [%{"address" => to_string(address.hash), "topics" => [["0x01", "0x00"]]}])
 
@@ -135,7 +166,13 @@ defmodule BlockScoutWeb.API.RPC.EthControllerTest do
         |> with_block(block)
 
       inserted_records =
-        insert_list(2000, :log, block: block, address: contract_address, transaction: transaction, first_topic: "0x01")
+        insert_list(2000, :log,
+          block: block,
+          block_number: block.number,
+          address: contract_address,
+          transaction: transaction,
+          first_topic: "0x01"
+        )
 
       params = params(api_params, [%{"address" => to_string(contract_address), "topics" => [["0x01"]]}])
 
@@ -150,7 +187,6 @@ defmodule BlockScoutWeb.API.RPC.EthControllerTest do
 
       next_page_params = %{
         "blockNumber" => Integer.to_string(transaction.block_number, 16),
-        "transactionIndex" => transaction.index,
         "logIndex" => Integer.to_string(last_log_index, 16)
       }
 
@@ -193,7 +229,8 @@ defmodule BlockScoutWeb.API.RPC.EthControllerTest do
         data: "0x010101",
         first_topic: "0x01",
         second_topic: "0x02",
-        block: block
+        block: block,
+        block_number: block.number
       )
 
       insert(:log, block: block, address: address, transaction: transaction, data: "0x020202", first_topic: "0x01")
@@ -222,7 +259,8 @@ defmodule BlockScoutWeb.API.RPC.EthControllerTest do
         data: "0x010101",
         first_topic: "0x01",
         second_topic: "0x02",
-        block: block
+        block: block,
+        block_number: block.number
       )
 
       insert(:log,
@@ -231,7 +269,8 @@ defmodule BlockScoutWeb.API.RPC.EthControllerTest do
         data: "0x020202",
         first_topic: "0x01",
         second_topic: "0x03",
-        block: block
+        block: block,
+        block_number: block.number
       )
 
       params = params(api_params, [%{"address" => to_string(address.hash), "topics" => ["0x01", ["0x02", "0x03"]]}])
@@ -258,13 +297,13 @@ defmodule BlockScoutWeb.API.RPC.EthControllerTest do
       transaction3 = insert(:transaction, from_address: address) |> with_block(block3)
       transaction4 = insert(:transaction, from_address: address) |> with_block(block4)
 
-      insert(:log, address: address, transaction: transaction1, data: "0x010101")
+      insert(:log, address: address, transaction: transaction1, data: "0x010101", block_number: block1.number)
 
-      insert(:log, address: address, transaction: transaction2, data: "0x020202")
+      insert(:log, address: address, transaction: transaction2, data: "0x020202", block_number: block2.number)
 
-      insert(:log, address: address, transaction: transaction3, data: "0x030303")
+      insert(:log, address: address, transaction: transaction3, data: "0x030303", block_number: block3.number)
 
-      insert(:log, address: address, transaction: transaction4, data: "0x040404")
+      insert(:log, address: address, transaction: transaction4, data: "0x040404", block_number: block4.number)
 
       params = params(api_params, [%{"address" => to_string(address.hash), "fromBlock" => 1, "toBlock" => 2}])
 
@@ -288,11 +327,11 @@ defmodule BlockScoutWeb.API.RPC.EthControllerTest do
       transaction2 = insert(:transaction, from_address: address) |> with_block(block2)
       transaction3 = insert(:transaction, from_address: address) |> with_block(block3)
 
-      insert(:log, address: address, transaction: transaction1, data: "0x010101")
+      insert(:log, address: address, transaction: transaction1, data: "0x010101", block_number: block1.number)
 
-      insert(:log, address: address, transaction: transaction2, data: "0x020202")
+      insert(:log, address: address, transaction: transaction2, data: "0x020202", block_number: block2.number)
 
-      insert(:log, address: address, transaction: transaction3, data: "0x030303")
+      insert(:log, address: address, transaction: transaction3, data: "0x030303", block_number: block3.number)
 
       params = params(api_params, [%{"address" => to_string(address.hash), "blockHash" => to_string(block2.hash)}])
 
@@ -316,11 +355,11 @@ defmodule BlockScoutWeb.API.RPC.EthControllerTest do
       transaction2 = insert(:transaction, from_address: address) |> with_block(block2)
       transaction3 = insert(:transaction, from_address: address) |> with_block(block3)
 
-      insert(:log, address: address, transaction: transaction1, data: "0x010101")
+      insert(:log, address: address, transaction: transaction1, data: "0x010101", block_number: block1.number)
 
-      insert(:log, address: address, transaction: transaction2, data: "0x020202")
+      insert(:log, address: address, transaction: transaction2, data: "0x020202", block_number: block2.number)
 
-      insert(:log, address: address, transaction: transaction3, data: "0x030303")
+      insert(:log, address: address, transaction: transaction3, data: "0x030303", block_number: block3.number)
 
       params =
         params(api_params, [%{"address" => to_string(address.hash), "fromBlock" => "earliest", "toBlock" => "earliest"}])
@@ -345,11 +384,29 @@ defmodule BlockScoutWeb.API.RPC.EthControllerTest do
       transaction2 = insert(:transaction, from_address: address) |> with_block(block2)
       transaction3 = insert(:transaction, from_address: address) |> with_block(block3)
 
-      insert(:log, block: block1, address: address, transaction: transaction1, data: "0x010101")
+      insert(:log,
+        block: block1,
+        block_number: block1.number,
+        address: address,
+        transaction: transaction1,
+        data: "0x010101"
+      )
 
-      insert(:log, block: block2, address: address, transaction: transaction2, data: "0x020202")
+      insert(:log,
+        block: block2,
+        block_number: block2.number,
+        address: address,
+        transaction: transaction2,
+        data: "0x020202"
+      )
 
-      insert(:log, block: block3, address: address, transaction: transaction3, data: "0x030303")
+      insert(:log,
+        block: block3,
+        block_number: block3.number,
+        address: address,
+        transaction: transaction3,
+        data: "0x030303"
+      )
 
       changeset = Ecto.Changeset.change(block3, %{consensus: false})
 
diff --git a/apps/block_scout_web/test/block_scout_web/controllers/api/rpc/logs_controller_test.exs b/apps/block_scout_web/test/block_scout_web/controllers/api/rpc/logs_controller_test.exs
index ec4337eecd84..66fc27dc71db 100644
--- a/apps/block_scout_web/test/block_scout_web/controllers/api/rpc/logs_controller_test.exs
+++ b/apps/block_scout_web/test/block_scout_web/controllers/api/rpc/logs_controller_test.exs
@@ -280,7 +280,7 @@ defmodule BlockScoutWeb.API.RPC.LogsControllerTest do
         |> insert(to_address: contract_address)
         |> with_block()
 
-      log = insert(:log, address: contract_address, transaction: transaction)
+      log = insert(:log, address: contract_address, transaction: transaction, block_number: transaction.block_number)
 
       params = %{
         "module" => "logs",
@@ -334,8 +334,17 @@ defmodule BlockScoutWeb.API.RPC.LogsControllerTest do
         |> insert(to_address: contract_address)
         |> with_block(second_block)
 
-      insert(:log, address: contract_address, transaction: transaction_block1)
-      insert(:log, address: contract_address, transaction: transaction_block2)
+      insert(:log,
+        address: contract_address,
+        transaction: transaction_block1,
+        block_number: transaction_block1.block_number
+      )
+
+      insert(:log,
+        address: contract_address,
+        transaction: transaction_block2,
+        block_number: transaction_block2.block_number
+      )
 
       params = %{
         "module" => "logs",
@@ -378,8 +387,17 @@ defmodule BlockScoutWeb.API.RPC.LogsControllerTest do
         |> insert(to_address: contract_address)
         |> with_block(second_block)
 
-      insert(:log, address: contract_address, transaction: transaction_block1)
-      insert(:log, address: contract_address, transaction: transaction_block2)
+      insert(:log,
+        address: contract_address,
+        transaction: transaction_block1,
+        block_number: transaction_block1.block_number
+      )
+
+      insert(:log,
+        address: contract_address,
+        transaction: transaction_block2,
+        block_number: transaction_block2.block_number
+      )
 
       params = %{
         "module" => "logs",
diff --git a/apps/explorer/lib/explorer/eth_rpc.ex b/apps/explorer/lib/explorer/eth_rpc.ex
index 889fdabbba6e..0e5b493a9aef 100644
--- a/apps/explorer/lib/explorer/eth_rpc.ex
+++ b/apps/explorer/lib/explorer/eth_rpc.ex
@@ -54,13 +54,13 @@ defmodule Explorer.EthRPC do
       action: :eth_get_logs,
       notes: """
       Will never return more than 1000 log entries.\n
-      For this reason, you can use pagination options to request the next page. Pagination options params: {"logIndex": "3D", "blockNumber": "6423AC", "transactionIndex": 53} which include parameters from the last log received from the previous request. These three parameters are required for pagination.
+      For this reason, you can use pagination options to request the next page. Pagination options params: {"logIndex": "3D", "blockNumber": "6423AC"} which include parameters from the last log received from the previous request. These three parameters are required for pagination.
       """,
       example: """
       {"id": 0, "jsonrpc": "2.0", "method": "eth_getLogs",
        "params": [
         {"address": "0xc78Be425090Dbd437532594D12267C5934Cc6c6f",
-         "paging_options": {"logIndex": "3D", "blockNumber": "6423AC", "transactionIndex": 53},
+         "paging_options": {"logIndex": "3D", "blockNumber": "6423AC"},
          "fromBlock": "earliest",
          "toBlock": "latest",
          "topics": ["0xddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef"]}]}
diff --git a/apps/explorer/lib/explorer/etherscan/logs.ex b/apps/explorer/lib/explorer/etherscan/logs.ex
index 4d4e4111f9cd..70c4dedaf2d8 100644
--- a/apps/explorer/lib/explorer/etherscan/logs.ex
+++ b/apps/explorer/lib/explorer/etherscan/logs.ex
@@ -5,10 +5,10 @@ defmodule Explorer.Etherscan.Logs do
 
   """
 
-  import Ecto.Query, only: [from: 2, where: 3, subquery: 1, order_by: 3, union: 2]
+  import Ecto.Query, only: [from: 2, limit: 2, where: 3, subquery: 1, order_by: 3]
 
-  alias Explorer.{Chain, Repo}
-  alias Explorer.Chain.{InternalTransaction, Log, Transaction}
+  alias Explorer.Repo
+  alias Explorer.Chain.{Log, Transaction}
 
   @base_filter %{
     from_block: nil,
@@ -38,7 +38,7 @@ defmodule Explorer.Etherscan.Logs do
     :type
   ]
 
-  @default_paging_options %{block_number: nil, transaction_index: nil, log_index: nil}
+  @default_paging_options %{block_number: nil, log_index: nil}
 
   @doc """
   Gets a list of logs that meet the criteria in a given filter map.
@@ -76,38 +76,20 @@ defmodule Explorer.Etherscan.Logs do
     paging_options = if is_nil(paging_options), do: @default_paging_options, else: paging_options
     prepared_filter = Map.merge(@base_filter, filter)
 
-    logs_query = where_topic_match(Log, prepared_filter)
-
-    query_to_address_hash_wrapped =
-      logs_query
-      |> internal_transaction_query(:to_address_hash, prepared_filter, address_hash)
-      |> Chain.wrapped_union_subquery()
-
-    query_from_address_hash_wrapped =
-      logs_query
-      |> internal_transaction_query(:from_address_hash, prepared_filter, address_hash)
-      |> Chain.wrapped_union_subquery()
-
-    query_created_contract_address_hash_wrapped =
-      logs_query
-      |> internal_transaction_query(:created_contract_address_hash, prepared_filter, address_hash)
-      |> Chain.wrapped_union_subquery()
-
-    internal_transaction_log_query =
-      query_to_address_hash_wrapped
-      |> union(^query_from_address_hash_wrapped)
-      |> union(^query_created_contract_address_hash_wrapped)
+    logs_query =
+      Log
+      |> where_topic_match(prepared_filter)
+      |> where([log], log.address_hash == ^address_hash)
+      |> where([log], log.block_number >= ^prepared_filter.from_block)
+      |> where([log], log.block_number <= ^prepared_filter.to_block)
+      |> limit(1000)
+      |> order_by([log], asc: log.block_number, asc: log.index)
+      |> page_logs(paging_options)
 
     all_transaction_logs_query =
-      from(transaction in Transaction,
-        join: log in ^logs_query,
+      from(log in subquery(logs_query),
+        join: transaction in Transaction,
         on: log.transaction_hash == transaction.hash,
-        where: transaction.block_number >= ^prepared_filter.from_block,
-        where: transaction.block_number <= ^prepared_filter.to_block,
-        where:
-          transaction.to_address_hash == ^address_hash or
-            transaction.from_address_hash == ^address_hash or
-            transaction.created_contract_address_hash == ^address_hash,
         select: map(log, ^@log_fields),
         select_merge: %{
           gas_price: transaction.gas_price,
@@ -117,20 +99,14 @@ defmodule Explorer.Etherscan.Logs do
           block_number: transaction.block_number,
           block_timestamp: transaction.block_timestamp,
           block_consensus: transaction.block_consensus
-        },
-        union: ^internal_transaction_log_query
+        }
       )
 
     query_with_blocks =
       from(log_transaction_data in subquery(all_transaction_logs_query),
         where: log_transaction_data.address_hash == ^address_hash,
         order_by: log_transaction_data.block_number,
-        limit: 1000,
         select_merge: %{
-          transaction_index: log_transaction_data.transaction_index,
-          block_hash: log_transaction_data.block_hash,
-          block_number: log_transaction_data.block_number,
-          block_timestamp: log_transaction_data.block_timestamp,
           block_consensus: log_transaction_data.block_consensus
         }
       )
@@ -145,8 +121,6 @@ defmodule Explorer.Etherscan.Logs do
       end
 
     query_with_consensus
-    |> order_by([log], asc: log.index)
-    |> page_logs(paging_options)
     |> Repo.replica().all()
   end
 
@@ -258,28 +232,4 @@ defmodule Explorer.Etherscan.Logs do
       where: data.index > ^log_index and data.block_number >= ^block_number
     )
   end
-
-  defp internal_transaction_query(logs_query, direction, prepared_filter, address_hash) do
-    query =
-      from(internal_transaction in InternalTransaction.where_nonpending_block(),
-        join: transaction in assoc(internal_transaction, :transaction),
-        join: log in ^logs_query,
-        on: log.transaction_hash == internal_transaction.transaction_hash,
-        where: internal_transaction.block_number >= ^prepared_filter.from_block,
-        where: internal_transaction.block_number <= ^prepared_filter.to_block,
-        select:
-          merge(map(log, ^@log_fields), %{
-            gas_price: transaction.gas_price,
-            gas_used: transaction.gas_used,
-            transaction_index: transaction.index,
-            block_hash: transaction.block_hash,
-            block_number: internal_transaction.block_number,
-            block_timestamp: transaction.block_timestamp,
-            block_consensus: transaction.block_consensus
-          })
-      )
-
-    query
-    |> InternalTransaction.where_address_fields_match(address_hash, direction)
-  end
 end
diff --git a/apps/explorer/test/explorer/etherscan/logs_test.exs b/apps/explorer/test/explorer/etherscan/logs_test.exs
index 81b04e01b331..5da949541c45 100644
--- a/apps/explorer/test/explorer/etherscan/logs_test.exs
+++ b/apps/explorer/test/explorer/etherscan/logs_test.exs
@@ -46,7 +46,7 @@ defmodule Explorer.Etherscan.LogsTest do
         |> insert(to_address: contract_address, block_timestamp: block.timestamp)
         |> with_block(block)
 
-      log = insert(:log, address: contract_address, transaction: transaction)
+      log = insert(:log, address: contract_address, block_number: block.number, transaction: transaction)
 
       filter = %{
         from_block: block.number,
@@ -80,7 +80,7 @@ defmodule Explorer.Etherscan.LogsTest do
         |> insert(to_address: contract_address)
         |> with_block()
 
-      insert_list(2, :log, address: contract_address, transaction: transaction)
+      insert_list(2, :log, address: contract_address, transaction: transaction, block_number: block.number)
 
       filter = %{
         from_block: block.number,
@@ -111,8 +111,8 @@ defmodule Explorer.Etherscan.LogsTest do
         |> insert(to_address: contract_address)
         |> with_block(second_block)
 
-      insert(:log, address: contract_address, transaction: transaction_block1)
-      insert(:log, address: contract_address, transaction: transaction_block2)
+      insert(:log, address: contract_address, transaction: transaction_block1, block_number: first_block.number)
+      insert(:log, address: contract_address, transaction: transaction_block2, block_number: second_block.number)
 
       filter = %{
         from_block: second_block.number,
@@ -144,8 +144,8 @@ defmodule Explorer.Etherscan.LogsTest do
         |> insert(to_address: contract_address)
         |> with_block(second_block)
 
-      insert(:log, address: contract_address, transaction: transaction_block1)
-      insert(:log, address: contract_address, transaction: transaction_block2)
+      insert(:log, address: contract_address, transaction: transaction_block1, block_number: first_block.number)
+      insert(:log, address: contract_address, transaction: transaction_block2, block_number: second_block.number)
 
       filter = %{
         from_block: first_block.number,
@@ -168,7 +168,8 @@ defmodule Explorer.Etherscan.LogsTest do
         |> insert(to_address: contract_address)
         |> with_block()
 
-      inserted_records = insert_list(2000, :log, address: contract_address, transaction: transaction)
+      inserted_records =
+        insert_list(2000, :log, address: contract_address, transaction: transaction, block_number: block.number)
 
       filter = %{
         from_block: block.number,
@@ -184,7 +185,6 @@ defmodule Explorer.Etherscan.LogsTest do
 
       next_page_params = %{
         log_index: last_record.index,
-        transaction_index: last_record.transaction_index,
         block_number: transaction.block_number
       }
 
@@ -327,13 +327,15 @@ defmodule Explorer.Etherscan.LogsTest do
       log1_details = [
         address: contract_address,
         transaction: transaction,
-        first_topic: "some first topic"
+        first_topic: "some first topic",
+        block_number: block.number
       ]
 
       log2_details = [
         address: contract_address,
         transaction: transaction,
-        first_topic: "some OTHER first topic"
+        first_topic: "some OTHER first topic",
+        block_number: block.number
       ]
 
       _log1 = insert(:log, log1_details)
@@ -365,14 +367,16 @@ defmodule Explorer.Etherscan.LogsTest do
         address: contract_address,
         transaction: transaction,
         first_topic: "some first topic",
-        second_topic: "some second topic"
+        second_topic: "some second topic",
+        block_number: block.number
       ]
 
       log2_details = [
         address: contract_address,
         transaction: transaction,
         first_topic: "some OTHER first topic",
-        second_topic: "some OTHER second topic"
+        second_topic: "some OTHER second topic",
+        block_number: block.number
       ]
 
       _log1 = insert(:log, log1_details)
@@ -407,7 +411,8 @@ defmodule Explorer.Etherscan.LogsTest do
         transaction: transaction,
         first_topic: "some first topic",
         second_topic: "some second topic",
-        third_topic: "some third topic"
+        third_topic: "some third topic",
+        block_number: block.number
       ]
 
       log2_details = [
@@ -415,7 +420,8 @@ defmodule Explorer.Etherscan.LogsTest do
         transaction: transaction,
         first_topic: "some OTHER first topic",
         second_topic: "some OTHER second topic",
-        third_topic: "some OTHER third topic"
+        third_topic: "some OTHER third topic",
+        block_number: block.number
       ]
 
       log3_details = [
@@ -423,7 +429,8 @@ defmodule Explorer.Etherscan.LogsTest do
         transaction: transaction,
         first_topic: "some ALT first topic",
         second_topic: "some ALT second topic",
-        third_topic: "some ALT third topic"
+        third_topic: "some ALT third topic",
+        block_number: block.number
       ]
 
       _log1 = insert(:log, log1_details)
@@ -464,7 +471,8 @@ defmodule Explorer.Etherscan.LogsTest do
         transaction: transaction,
         first_topic: "some first topic",
         second_topic: "some second topic",
-        third_topic: "some third topic"
+        third_topic: "some third topic",
+        block_number: block.number
       ]
 
       log2_details = [
@@ -472,7 +480,8 @@ defmodule Explorer.Etherscan.LogsTest do
         transaction: transaction,
         first_topic: "some OTHER first topic",
         second_topic: "some OTHER second topic",
-        third_topic: "some OTHER third topic"
+        third_topic: "some OTHER third topic",
+        block_number: block.number
       ]
 
       log3_details = [
@@ -480,7 +489,8 @@ defmodule Explorer.Etherscan.LogsTest do
         transaction: transaction,
         first_topic: "some ALT first topic",
         second_topic: "some ALT second topic",
-        third_topic: "some ALT third topic"
+        third_topic: "some ALT third topic",
+        block_number: block.number
       ]
 
       log1 = insert(:log, log1_details)
@@ -521,7 +531,8 @@ defmodule Explorer.Etherscan.LogsTest do
         transaction: transaction,
         first_topic: "some topic",
         second_topic: "some second topic",
-        third_topic: "some third topic"
+        third_topic: "some third topic",
+        block_number: block.number
       ]
 
       log2_details = [
@@ -529,7 +540,8 @@ defmodule Explorer.Etherscan.LogsTest do
         transaction: transaction,
         first_topic: "some topic",
         second_topic: "some OTHER second topic",
-        third_topic: "some third topic"
+        third_topic: "some third topic",
+        block_number: block.number
       ]
 
       log3_details = [
@@ -537,7 +549,8 @@ defmodule Explorer.Etherscan.LogsTest do
         transaction: transaction,
         first_topic: "some topic",
         second_topic: "some second topic",
-        third_topic: "some third topic"
+        third_topic: "some third topic",
+        block_number: block.number
       ]
 
       log1 = insert(:log, log1_details)
@@ -577,7 +590,8 @@ defmodule Explorer.Etherscan.LogsTest do
         address: contract_address,
         transaction: transaction,
         first_topic: "some topic",
-        second_topic: "some second topic"
+        second_topic: "some second topic",
+        block_number: block.number
       ]
 
       log2_details = [
@@ -586,7 +600,8 @@ defmodule Explorer.Etherscan.LogsTest do
         first_topic: "some OTHER topic",
         second_topic: "some OTHER second topic",
         third_topic: "some OTHER third topic",
-        fourth_topic: "some fourth topic"
+        fourth_topic: "some fourth topic",
+        block_number: block.number
       ]
 
       log3_details = [
@@ -595,7 +610,8 @@ defmodule Explorer.Etherscan.LogsTest do
         first_topic: "some topic",
         second_topic: "some second topic",
         third_topic: "some third topic",
-        fourth_topic: "some fourth topic"
+        fourth_topic: "some fourth topic",
+        block_number: block.number
       ]
 
       log1 = insert(:log, log1_details)

From e1c6f44c17ca8ad8c62fd39840eef93c52d4ba6c Mon Sep 17 00:00:00 2001
From: Viktor Baranov <baranov.viktor.27@gmail.com>
Date: Mon, 29 Aug 2022 16:41:22 +0300
Subject: [PATCH 844/909] Handle nil timestamp in datetime_to_hex function

---
 .../lib/block_scout_web/views/api/rpc/logs_view.ex              | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/apps/block_scout_web/lib/block_scout_web/views/api/rpc/logs_view.ex b/apps/block_scout_web/lib/block_scout_web/views/api/rpc/logs_view.ex
index 6f2933d7c63b..f52ab8fadccd 100644
--- a/apps/block_scout_web/lib/block_scout_web/views/api/rpc/logs_view.ex
+++ b/apps/block_scout_web/lib/block_scout_web/views/api/rpc/logs_view.ex
@@ -44,6 +44,8 @@ defmodule BlockScoutWeb.API.RPC.LogsView do
     |> integer_to_hex()
   end
 
+  defp datetime_to_hex(nil), do: nil
+
   defp datetime_to_hex(datetime) do
     datetime
     |> DateTime.to_unix()

From fd13a8c2698aa6f908045d2303f5b1be1705cec8 Mon Sep 17 00:00:00 2001
From: Qwerty5Uiop <alex000010@bk.ru>
Date: Thu, 2 Nov 2023 22:52:52 +0600
Subject: [PATCH 845/909] Denormalization migration + dynamic logic support

---
 CHANGELOG.md                                  |   2 +-
 .../address_token_transfer_controller.ex      |   3 +-
 .../address_transaction_controller.ex         |   3 +-
 .../api/rpc/transaction_controller.ex         |   4 +-
 .../api/v2/transaction_controller.ex          |   1 -
 .../recent_transactions_controller.ex         |  28 +-
 .../controllers/transaction_controller.ex     |  12 +-
 ...saction_internal_transaction_controller.ex |  28 +-
 .../lib/block_scout_web/notifier.ex           |   6 +-
 .../tokens/transfer/_token_transfer.html.eex  |   2 +-
 .../views/api/rpc/transaction_view.ex         |   3 +-
 .../views/api/v2/transaction_view.ex          |   3 +-
 .../block_scout_web/views/transaction_view.ex |   4 +-
 apps/block_scout_web/priv/gettext/default.pot |  48 +--
 .../priv/gettext/en/LC_MESSAGES/default.po    |  48 +--
 .../channels/websocket_v2_test.exs            |   2 +
 .../api/v2/search_controller_test.exs         |   2 +-
 apps/explorer/config/config.exs               |   2 +
 apps/explorer/config/runtime/test.exs         |   2 +
 apps/explorer/lib/explorer/application.ex     |   5 +-
 apps/explorer/lib/explorer/chain.ex           |  23 +-
 .../chain/cache/background_migrations.ex      |  23 ++
 .../address_token_transfer_csv_exporter.ex    |   4 +-
 .../address_transaction_csv_exporter.ex       |  17 +-
 .../explorer/chain/denormalization_helper.ex  |  44 +++
 .../chain/import/runner/transactions.ex       |   4 +-
 apps/explorer/lib/explorer/chain/search.ex    |  95 ++++--
 .../lib/explorer/chain/token_transfer.ex      |   8 +-
 .../lib/explorer/chain/transaction.ex         |  12 +-
 .../chain/transaction/history/historian.ex    |  55 +++-
 apps/explorer/lib/explorer/etherscan.ex       | 238 +++++++++-----
 apps/explorer/lib/explorer/etherscan/logs.ex  | 299 +++++++++++++-----
 .../transactions_denormalization_migrator.ex  |  91 ++++++
 ...902_add_consensus_to_transaction_table.exs |   8 -
 ...d_block_timestamp_to_transaction_table.exs |   7 -
 ...nsactions_denormalization_migrator_test.ex |  37 +++
 apps/explorer/test/support/factory.ex         |   6 +-
 cspell.json                                   |   2 +
 38 files changed, 849 insertions(+), 332 deletions(-)
 create mode 100644 apps/explorer/lib/explorer/chain/cache/background_migrations.ex
 create mode 100644 apps/explorer/lib/explorer/chain/denormalization_helper.ex
 create mode 100644 apps/explorer/lib/explorer/transactions_denormalization_migrator.ex
 create mode 100644 apps/explorer/test/explorer/transactions_denormalization_migrator_test.ex

diff --git a/CHANGELOG.md b/CHANGELOG.md
index addf114d8d59..d07488b208e1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -101,6 +101,7 @@
 
 - [#8956](https://github.com/blockscout/blockscout/pull/8956) - Refine docker-compose config structure
 - [#8911](https://github.com/blockscout/blockscout/pull/8911) - Set client_connection_check_interval for main Postgres DB in docker-compose setup
+- [#5322](https://github.com/blockscout/blockscout/pull/5322) - DB denormalization: block consensus and timestamp in transaction table
 
 <details>
   <summary>Dependencies version bumps</summary>
@@ -275,7 +276,6 @@
 - [#8529](https://github.com/blockscout/blockscout/pull/8529) - Move PolygonEdge-related migration to the corresponding ecto repository
 - [#8504](https://github.com/blockscout/blockscout/pull/8504) - Deploy new UI through Makefile
 - [#8501](https://github.com/blockscout/blockscout/pull/8501) - Conceal secondary ports in docker compose setup
-- [#5322](https://github.com/blockscout/blockscout/pull/5322) - DB denormalization: block consensus and timestamp in transaction table
 
 <details>
   <summary>Dependencies version bumps</summary>
diff --git a/apps/block_scout_web/lib/block_scout_web/controllers/address_token_transfer_controller.ex b/apps/block_scout_web/lib/block_scout_web/controllers/address_token_transfer_controller.ex
index 743b063e7407..94f87de09348 100644
--- a/apps/block_scout_web/lib/block_scout_web/controllers/address_token_transfer_controller.ex
+++ b/apps/block_scout_web/lib/block_scout_web/controllers/address_token_transfer_controller.ex
@@ -6,7 +6,7 @@ defmodule BlockScoutWeb.AddressTokenTransferController do
 
   alias BlockScoutWeb.{AccessHelper, Controller, TransactionView}
   alias Explorer.{Chain, Market}
-  alias Explorer.Chain.Address
+  alias Explorer.Chain.{Address, DenormalizationHelper}
   alias Indexer.Fetcher.CoinBalanceOnDemand
   alias Phoenix.View
 
@@ -140,6 +140,7 @@ defmodule BlockScoutWeb.AddressTokenTransferController do
          {:ok, false} <- AccessHelper.restricted_access?(address_hash_string, params) do
       options =
         @transaction_necessity_by_association
+        |> DenormalizationHelper.extend_block_necessity(:required)
         |> Keyword.merge(paging_options(params))
         |> Keyword.merge(current_filter(params))
 
diff --git a/apps/block_scout_web/lib/block_scout_web/controllers/address_transaction_controller.ex b/apps/block_scout_web/lib/block_scout_web/controllers/address_transaction_controller.ex
index 28543dfe2b99..05ef0c98d7fe 100644
--- a/apps/block_scout_web/lib/block_scout_web/controllers/address_transaction_controller.ex
+++ b/apps/block_scout_web/lib/block_scout_web/controllers/address_transaction_controller.ex
@@ -20,7 +20,7 @@ defmodule BlockScoutWeb.AddressTransactionController do
     AddressTransactionCsvExporter
   }
 
-  alias Explorer.Chain.{Transaction, Wei}
+  alias Explorer.Chain.{DenormalizationHelper, Transaction, Wei}
 
   alias Indexer.Fetcher.CoinBalanceOnDemand
   alias Phoenix.View
@@ -49,6 +49,7 @@ defmodule BlockScoutWeb.AddressTransactionController do
          {:ok, false} <- AccessHelper.restricted_access?(address_hash_string, params) do
       options =
         @transaction_necessity_by_association
+        |> DenormalizationHelper.extend_block_necessity(:optional)
         |> Keyword.merge(paging_options(params))
         |> Keyword.merge(current_filter(params))
 
diff --git a/apps/block_scout_web/lib/block_scout_web/controllers/api/rpc/transaction_controller.ex b/apps/block_scout_web/lib/block_scout_web/controllers/api/rpc/transaction_controller.ex
index 28014a2eef4f..fbea15ca76f1 100644
--- a/apps/block_scout_web/lib/block_scout_web/controllers/api/rpc/transaction_controller.ex
+++ b/apps/block_scout_web/lib/block_scout_web/controllers/api/rpc/transaction_controller.ex
@@ -4,7 +4,7 @@ defmodule BlockScoutWeb.API.RPC.TransactionController do
   import BlockScoutWeb.Chain, only: [paging_options: 1, next_page_params: 3, split_list_by_page: 1]
 
   alias Explorer.Chain
-  alias Explorer.Chain.Transaction
+  alias Explorer.Chain.{DenormalizationHelper, Transaction}
 
   @api_true [api?: true]
 
@@ -75,7 +75,7 @@ defmodule BlockScoutWeb.API.RPC.TransactionController do
   end
 
   defp transaction_from_hash(transaction_hash) do
-    case Chain.hash_to_transaction(transaction_hash) do
+    case Chain.hash_to_transaction(transaction_hash, DenormalizationHelper.extend_block_necessity([], :required)) do
       {:error, :not_found} -> {:transaction, :error}
       {:ok, transaction} -> {:transaction, {:ok, transaction}}
     end
diff --git a/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/transaction_controller.ex b/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/transaction_controller.ex
index 993d2ac68a36..a1e5134f4e9d 100644
--- a/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/transaction_controller.ex
+++ b/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/transaction_controller.ex
@@ -62,7 +62,6 @@ defmodule BlockScoutWeb.API.V2.TransactionController do
       [created_contract_address: :names] => :optional,
       [from_address: :names] => :optional,
       [to_address: :names] => :optional,
-      [transaction: :block] => :optional,
       [created_contract_address: :smart_contract] => :optional,
       [from_address: :smart_contract] => :optional,
       [to_address: :smart_contract] => :optional
diff --git a/apps/block_scout_web/lib/block_scout_web/controllers/recent_transactions_controller.ex b/apps/block_scout_web/lib/block_scout_web/controllers/recent_transactions_controller.ex
index ac7e39b822e7..0863579eab95 100644
--- a/apps/block_scout_web/lib/block_scout_web/controllers/recent_transactions_controller.ex
+++ b/apps/block_scout_web/lib/block_scout_web/controllers/recent_transactions_controller.ex
@@ -4,7 +4,7 @@ defmodule BlockScoutWeb.RecentTransactionsController do
   import Explorer.Chain.SmartContract, only: [burn_address_hash_string: 0]
 
   alias Explorer.{Chain, PagingOptions}
-  alias Explorer.Chain.Hash
+  alias Explorer.Chain.{DenormalizationHelper, Hash}
   alias Phoenix.View
 
   {:ok, burn_address_hash} = Chain.string_to_address_hash(burn_address_hash_string())
@@ -13,16 +13,22 @@ defmodule BlockScoutWeb.RecentTransactionsController do
   def index(conn, _params) do
     if ajax?(conn) do
       recent_transactions =
-        Chain.recent_collated_transactions(true,
-          necessity_by_association: %{
-            [created_contract_address: :names] => :optional,
-            [from_address: :names] => :optional,
-            [to_address: :names] => :optional,
-            [created_contract_address: :smart_contract] => :optional,
-            [from_address: :smart_contract] => :optional,
-            [to_address: :smart_contract] => :optional
-          },
-          paging_options: %PagingOptions{page_size: 5}
+        Chain.recent_collated_transactions(
+          true,
+          DenormalizationHelper.extend_block_necessity(
+            [
+              necessity_by_association: %{
+                [created_contract_address: :names] => :optional,
+                [from_address: :names] => :optional,
+                [to_address: :names] => :optional,
+                [created_contract_address: :smart_contract] => :optional,
+                [from_address: :smart_contract] => :optional,
+                [to_address: :smart_contract] => :optional
+              },
+              paging_options: %PagingOptions{page_size: 5}
+            ],
+            :required
+          )
         )
 
       transactions =
diff --git a/apps/block_scout_web/lib/block_scout_web/controllers/transaction_controller.ex b/apps/block_scout_web/lib/block_scout_web/controllers/transaction_controller.ex
index 7c0bd3052695..a31baf1ea923 100644
--- a/apps/block_scout_web/lib/block_scout_web/controllers/transaction_controller.ex
+++ b/apps/block_scout_web/lib/block_scout_web/controllers/transaction_controller.ex
@@ -26,6 +26,7 @@ defmodule BlockScoutWeb.TransactionController do
 
   alias Explorer.{Chain, Market}
   alias Explorer.Chain.Cache.Transaction, as: TransactionCache
+  alias Explorer.Chain.DenormalizationHelper
   alias Phoenix.View
 
   @necessity_by_association %{
@@ -54,6 +55,7 @@ defmodule BlockScoutWeb.TransactionController do
   def index(conn, %{"type" => "JSON"} = params) do
     options =
       @default_options
+      |> DenormalizationHelper.extend_block_necessity(:required)
       |> Keyword.merge(paging_options(params))
 
     full_options =
@@ -151,10 +153,7 @@ defmodule BlockScoutWeb.TransactionController do
          :ok <- Chain.check_transaction_exists(transaction_hash) do
       if Chain.transaction_has_token_transfers?(transaction_hash) do
         with {:ok, transaction} <-
-               Chain.hash_to_transaction(
-                 transaction_hash,
-                 necessity_by_association: @necessity_by_association
-               ),
+               Chain.hash_to_transaction(transaction_hash, necessity_by_association: @necessity_by_association),
              {:ok, false} <- AccessHelper.restricted_access?(to_string(transaction.from_address_hash), params),
              {:ok, false} <- AccessHelper.restricted_access?(to_string(transaction.to_address_hash), params) do
           render(
@@ -189,10 +188,7 @@ defmodule BlockScoutWeb.TransactionController do
         end
       else
         with {:ok, transaction} <-
-               Chain.hash_to_transaction(
-                 transaction_hash,
-                 necessity_by_association: @necessity_by_association
-               ),
+               Chain.hash_to_transaction(transaction_hash, necessity_by_association: @necessity_by_association),
              {:ok, false} <- AccessHelper.restricted_access?(to_string(transaction.from_address_hash), params),
              {:ok, false} <- AccessHelper.restricted_access?(to_string(transaction.to_address_hash), params) do
           render(
diff --git a/apps/block_scout_web/lib/block_scout_web/controllers/transaction_internal_transaction_controller.ex b/apps/block_scout_web/lib/block_scout_web/controllers/transaction_internal_transaction_controller.ex
index 4109f473e14f..5ea1e447211a 100644
--- a/apps/block_scout_web/lib/block_scout_web/controllers/transaction_internal_transaction_controller.ex
+++ b/apps/block_scout_web/lib/block_scout_web/controllers/transaction_internal_transaction_controller.ex
@@ -8,6 +8,7 @@ defmodule BlockScoutWeb.TransactionInternalTransactionController do
 
   alias BlockScoutWeb.{AccessHelper, Controller, InternalTransactionView, TransactionController}
   alias Explorer.{Chain, Market}
+  alias Explorer.Chain.DenormalizationHelper
   alias Phoenix.View
 
   def index(conn, %{"transaction_id" => transaction_hash_string, "type" => "JSON"} = params) do
@@ -17,20 +18,19 @@ defmodule BlockScoutWeb.TransactionInternalTransactionController do
          {:ok, false} <- AccessHelper.restricted_access?(to_string(transaction.from_address_hash), params),
          {:ok, false} <- AccessHelper.restricted_access?(to_string(transaction.to_address_hash), params) do
       full_options =
-        Keyword.merge(
-          [
-            necessity_by_association: %{
-              [created_contract_address: :names] => :optional,
-              [from_address: :names] => :optional,
-              [to_address: :names] => :optional,
-              [created_contract_address: :smart_contract] => :optional,
-              [from_address: :smart_contract] => :optional,
-              [to_address: :smart_contract] => :optional,
-              :transaction => :optional
-            }
-          ],
-          paging_options(params)
-        )
+        [
+          necessity_by_association: %{
+            [created_contract_address: :names] => :optional,
+            [from_address: :names] => :optional,
+            [to_address: :names] => :optional,
+            [created_contract_address: :smart_contract] => :optional,
+            [from_address: :smart_contract] => :optional,
+            [to_address: :smart_contract] => :optional,
+            :transaction => :optional
+          }
+        ]
+        |> DenormalizationHelper.extend_transaction_block_necessity(:optional)
+        |> Keyword.merge(paging_options(params))
 
       internal_transactions_plus_one = Chain.transaction_to_internal_transactions(transaction_hash, full_options)
 
diff --git a/apps/block_scout_web/lib/block_scout_web/notifier.ex b/apps/block_scout_web/lib/block_scout_web/notifier.ex
index 1de89cee8b78..3a70cd316594 100644
--- a/apps/block_scout_web/lib/block_scout_web/notifier.ex
+++ b/apps/block_scout_web/lib/block_scout_web/notifier.ex
@@ -20,7 +20,7 @@ defmodule BlockScoutWeb.Notifier do
 
   alias Explorer.{Chain, Market, Repo}
   alias Explorer.Chain.Address.Counters
-  alias Explorer.Chain.{Address, InternalTransaction, Transaction}
+  alias Explorer.Chain.{Address, DenormalizationHelper, InternalTransaction, Transaction}
   alias Explorer.Chain.Supply.RSK
   alias Explorer.Chain.Transaction.History.TransactionStats
   alias Explorer.Counters.{AverageBlockTime, Helper}
@@ -171,7 +171,9 @@ defmodule BlockScoutWeb.Notifier do
       all_token_transfers
       |> Enum.map(
         &(&1
-          |> Repo.preload([:from_address, :to_address, :token, transaction: :block]))
+          |> Repo.preload(
+            DenormalizationHelper.extend_transaction_preload([:from_address, :to_address, :token, :transaction])
+          ))
       )
 
     transfers_by_token = Enum.group_by(all_token_transfers_full, fn tt -> to_string(tt.token_contract_address_hash) end)
diff --git a/apps/block_scout_web/lib/block_scout_web/templates/tokens/transfer/_token_transfer.html.eex b/apps/block_scout_web/lib/block_scout_web/templates/tokens/transfer/_token_transfer.html.eex
index 261e209c8d84..73b6bbf5afe5 100644
--- a/apps/block_scout_web/lib/block_scout_web/templates/tokens/transfer/_token_transfer.html.eex
+++ b/apps/block_scout_web/lib/block_scout_web/templates/tokens/transfer/_token_transfer.html.eex
@@ -44,7 +44,7 @@
           to: block_path(BlockScoutWeb.Endpoint, :show, @token_transfer.block_number)
         ) %>
       </span>
-      <span class="mr-2 mr-md-0 order-2" data-from-now="<%= @token_transfer.transaction.block_timestamp %>"></span>
+      <span class="mr-2 mr-md-0 order-2" data-from-now="<%= BlockScoutWeb.TransactionView.block_timestamp(@token_transfer.transaction) %>"></span>
     </div>
   </div>
 </div>
diff --git a/apps/block_scout_web/lib/block_scout_web/views/api/rpc/transaction_view.ex b/apps/block_scout_web/lib/block_scout_web/views/api/rpc/transaction_view.ex
index 2e7713fa5004..4a18643aa354 100644
--- a/apps/block_scout_web/lib/block_scout_web/views/api/rpc/transaction_view.ex
+++ b/apps/block_scout_web/lib/block_scout_web/views/api/rpc/transaction_view.ex
@@ -2,6 +2,7 @@ defmodule BlockScoutWeb.API.RPC.TransactionView do
   use BlockScoutWeb, :view
 
   alias BlockScoutWeb.API.RPC.RPCView
+  alias Explorer.Chain.Transaction
 
   def render("gettxinfo.json", %{
         transaction: transaction,
@@ -58,7 +59,7 @@ defmodule BlockScoutWeb.API.RPC.TransactionView do
   defp prepare_transaction(transaction, block_height, logs, next_page_params) do
     %{
       "hash" => "#{transaction.hash}",
-      "timeStamp" => "#{DateTime.to_unix(transaction.block_timestamp)}",
+      "timeStamp" => "#{DateTime.to_unix(Transaction.block_timestamp(transaction))}",
       "blockNumber" => "#{transaction.block_number}",
       "confirmations" => "#{block_height - transaction.block_number}",
       "success" => if(transaction.status == :ok, do: true, else: false),
diff --git a/apps/block_scout_web/lib/block_scout_web/views/api/v2/transaction_view.ex b/apps/block_scout_web/lib/block_scout_web/views/api/v2/transaction_view.ex
index 28bc4042c46b..44832a51274b 100644
--- a/apps/block_scout_web/lib/block_scout_web/views/api/v2/transaction_view.ex
+++ b/apps/block_scout_web/lib/block_scout_web/views/api/v2/transaction_view.ex
@@ -375,7 +375,7 @@ defmodule BlockScoutWeb.API.V2.TransactionView do
       "result" => status,
       "status" => transaction.status,
       "block" => transaction.block_number,
-      "timestamp" => block_timestamp(transaction.block),
+      "timestamp" => block_timestamp(transaction),
       "from" =>
         Helper.address_with_info(
           single_tx? && conn,
@@ -833,6 +833,7 @@ defmodule BlockScoutWeb.API.V2.TransactionView do
     end
   end
 
+  defp block_timestamp(%Transaction{block_timestamp: block_ts}) when not is_nil(block_ts), do: block_ts
   defp block_timestamp(%Transaction{block: %Block{} = block}), do: block.timestamp
   defp block_timestamp(%Block{} = block), do: block.timestamp
   defp block_timestamp(_), do: nil
diff --git a/apps/block_scout_web/lib/block_scout_web/views/transaction_view.ex b/apps/block_scout_web/lib/block_scout_web/views/transaction_view.ex
index 3112ff3091e0..ae493f391341 100644
--- a/apps/block_scout_web/lib/block_scout_web/views/transaction_view.ex
+++ b/apps/block_scout_web/lib/block_scout_web/views/transaction_view.ex
@@ -38,9 +38,7 @@ defmodule BlockScoutWeb.TransactionView do
 
   def block_number(%Reward{block: block}), do: [view_module: BlockView, partial: "_link.html", block: block]
 
-  def block_timestamp(%Transaction{block_number: nil, inserted_at: time}), do: time
-  def block_timestamp(%Transaction{block_timestamp: time}), do: time
-  def block_timestamp(%Transaction{block: %Block{timestamp: time}}), do: time
+  def block_timestamp(%Transaction{} = transaction), do: Transaction.block_timestamp(transaction)
   def block_timestamp(%Reward{block: %Block{timestamp: time}}), do: time
 
   def value_transfer?(%Transaction{input: %{bytes: bytes}}) when bytes in [<<>>, nil] do
diff --git a/apps/block_scout_web/priv/gettext/default.pot b/apps/block_scout_web/priv/gettext/default.pot
index 096df745c2b0..224aa1df7789 100644
--- a/apps/block_scout_web/priv/gettext/default.pot
+++ b/apps/block_scout_web/priv/gettext/default.pot
@@ -68,7 +68,7 @@ msgstr ""
 msgid "%{subnetwork} Explorer - BlockScout"
 msgstr ""
 
-#: lib/block_scout_web/views/transaction_view.ex:369
+#: lib/block_scout_web/views/transaction_view.ex:371
 #, elixir-autogen, elixir-format
 msgid "(Awaiting internal transactions for status)"
 msgstr ""
@@ -698,7 +698,7 @@ msgstr ""
 msgid "Compiler version"
 msgstr ""
 
-#: lib/block_scout_web/views/transaction_view.ex:362
+#: lib/block_scout_web/views/transaction_view.ex:364
 #, elixir-autogen, elixir-format
 msgid "Confirmed"
 msgstr ""
@@ -783,12 +783,12 @@ msgstr ""
 msgid "Contract Address Pending"
 msgstr ""
 
-#: lib/block_scout_web/views/transaction_view.ex:478
+#: lib/block_scout_web/views/transaction_view.ex:480
 #, elixir-autogen, elixir-format
 msgid "Contract Call"
 msgstr ""
 
-#: lib/block_scout_web/views/transaction_view.ex:475
+#: lib/block_scout_web/views/transaction_view.ex:477
 #, elixir-autogen, elixir-format
 msgid "Contract Creation"
 msgstr ""
@@ -1186,12 +1186,12 @@ msgstr ""
 msgid "EIP-1167"
 msgstr ""
 
-#: lib/block_scout_web/views/transaction_view.ex:220
+#: lib/block_scout_web/views/transaction_view.ex:222
 #, elixir-autogen, elixir-format
 msgid "ERC-1155 "
 msgstr ""
 
-#: lib/block_scout_web/views/transaction_view.ex:218
+#: lib/block_scout_web/views/transaction_view.ex:220
 #, elixir-autogen, elixir-format
 msgid "ERC-20 "
 msgstr ""
@@ -1201,7 +1201,7 @@ msgstr ""
 msgid "ERC-20 tokens (beta)"
 msgstr ""
 
-#: lib/block_scout_web/views/transaction_view.ex:219
+#: lib/block_scout_web/views/transaction_view.ex:221
 #, elixir-autogen, elixir-format
 msgid "ERC-721 "
 msgstr ""
@@ -1292,12 +1292,12 @@ msgstr ""
 msgid "Error trying to fetch balances."
 msgstr ""
 
-#: lib/block_scout_web/views/transaction_view.ex:373
+#: lib/block_scout_web/views/transaction_view.ex:375
 #, elixir-autogen, elixir-format
 msgid "Error: %{reason}"
 msgstr ""
 
-#: lib/block_scout_web/views/transaction_view.ex:371
+#: lib/block_scout_web/views/transaction_view.ex:373
 #, elixir-autogen, elixir-format
 msgid "Error: (Awaiting internal transactions for reason)"
 msgstr ""
@@ -1602,7 +1602,7 @@ msgstr ""
 #: lib/block_scout_web/templates/transaction/_tabs.html.eex:11
 #: lib/block_scout_web/templates/transaction_internal_transaction/index.html.eex:6
 #: lib/block_scout_web/views/address_view.ex:376
-#: lib/block_scout_web/views/transaction_view.ex:533
+#: lib/block_scout_web/views/transaction_view.ex:535
 #, elixir-autogen, elixir-format
 msgid "Internal Transactions"
 msgstr ""
@@ -1719,7 +1719,7 @@ msgstr ""
 #: lib/block_scout_web/templates/transaction/_tabs.html.eex:17
 #: lib/block_scout_web/templates/transaction_log/index.html.eex:8
 #: lib/block_scout_web/views/address_view.ex:387
-#: lib/block_scout_web/views/transaction_view.ex:534
+#: lib/block_scout_web/views/transaction_view.ex:536
 #, elixir-autogen, elixir-format
 msgid "Logs"
 msgstr ""
@@ -1752,7 +1752,7 @@ msgstr ""
 msgid "Max Priority Fee per Gas"
 msgstr ""
 
-#: lib/block_scout_web/views/transaction_view.ex:325
+#: lib/block_scout_web/views/transaction_view.ex:327
 #, elixir-autogen, elixir-format
 msgid "Max of"
 msgstr ""
@@ -2064,8 +2064,8 @@ msgid "Parent Hash"
 msgstr ""
 
 #: lib/block_scout_web/templates/layout/_topnav.html.eex:63
-#: lib/block_scout_web/views/transaction_view.ex:368
-#: lib/block_scout_web/views/transaction_view.ex:407
+#: lib/block_scout_web/views/transaction_view.ex:370
+#: lib/block_scout_web/views/transaction_view.ex:409
 #, elixir-autogen, elixir-format
 msgid "Pending"
 msgstr ""
@@ -2201,7 +2201,7 @@ msgstr ""
 
 #: lib/block_scout_web/templates/transaction/_tabs.html.eex:24
 #: lib/block_scout_web/templates/transaction_raw_trace/_card_body.html.eex:1
-#: lib/block_scout_web/views/transaction_view.ex:535
+#: lib/block_scout_web/views/transaction_view.ex:537
 #, elixir-autogen, elixir-format
 msgid "Raw Trace"
 msgstr ""
@@ -2514,7 +2514,7 @@ msgstr ""
 
 #: lib/block_scout_web/templates/transaction/_tabs.html.eex:29
 #: lib/block_scout_web/templates/transaction_state/index.html.eex:6
-#: lib/block_scout_web/views/transaction_view.ex:536
+#: lib/block_scout_web/views/transaction_view.ex:538
 #, elixir-autogen, elixir-format
 msgid "State changes"
 msgstr ""
@@ -2540,7 +2540,7 @@ msgid "Submit an Issue"
 msgstr ""
 
 #: lib/block_scout_web/templates/transaction/_emission_reward_tile.html.eex:8
-#: lib/block_scout_web/views/transaction_view.ex:370
+#: lib/block_scout_web/views/transaction_view.ex:372
 #, elixir-autogen, elixir-format
 msgid "Success"
 msgstr ""
@@ -2849,13 +2849,13 @@ msgid "Token"
 msgstr ""
 
 #: lib/block_scout_web/templates/common_components/_token_transfer_type_display_name.html.eex:3
-#: lib/block_scout_web/views/transaction_view.ex:469
+#: lib/block_scout_web/views/transaction_view.ex:471
 #, elixir-autogen, elixir-format
 msgid "Token Burning"
 msgstr ""
 
 #: lib/block_scout_web/templates/common_components/_token_transfer_type_display_name.html.eex:7
-#: lib/block_scout_web/views/transaction_view.ex:470
+#: lib/block_scout_web/views/transaction_view.ex:472
 #, elixir-autogen, elixir-format
 msgid "Token Creation"
 msgstr ""
@@ -2883,14 +2883,14 @@ msgid "Token ID"
 msgstr ""
 
 #: lib/block_scout_web/templates/common_components/_token_transfer_type_display_name.html.eex:5
-#: lib/block_scout_web/views/transaction_view.ex:468
+#: lib/block_scout_web/views/transaction_view.ex:470
 #, elixir-autogen, elixir-format
 msgid "Token Minting"
 msgstr ""
 
 #: lib/block_scout_web/templates/common_components/_token_transfer_type_display_name.html.eex:9
 #: lib/block_scout_web/templates/common_components/_token_transfer_type_display_name.html.eex:11
-#: lib/block_scout_web/views/transaction_view.ex:471
+#: lib/block_scout_web/views/transaction_view.ex:473
 #, elixir-autogen, elixir-format
 msgid "Token Transfer"
 msgstr ""
@@ -2906,7 +2906,7 @@ msgstr ""
 #: lib/block_scout_web/views/address_view.ex:378
 #: lib/block_scout_web/views/tokens/instance/overview_view.ex:114
 #: lib/block_scout_web/views/tokens/overview_view.ex:40
-#: lib/block_scout_web/views/transaction_view.ex:532
+#: lib/block_scout_web/views/transaction_view.ex:534
 #, elixir-autogen, elixir-format
 msgid "Token Transfers"
 msgstr ""
@@ -3022,7 +3022,7 @@ msgstr ""
 #: lib/block_scout_web/templates/account/tag_transaction/form.html.eex:11
 #: lib/block_scout_web/templates/account/tag_transaction/index.html.eex:23
 #: lib/block_scout_web/templates/address_logs/_logs.html.eex:19
-#: lib/block_scout_web/views/transaction_view.ex:481
+#: lib/block_scout_web/views/transaction_view.ex:483
 #, elixir-autogen, elixir-format
 msgid "Transaction"
 msgstr ""
@@ -3177,7 +3177,7 @@ msgstr ""
 msgid "Uncles"
 msgstr ""
 
-#: lib/block_scout_web/views/transaction_view.ex:361
+#: lib/block_scout_web/views/transaction_view.ex:363
 #, elixir-autogen, elixir-format
 msgid "Unconfirmed"
 msgstr ""
diff --git a/apps/block_scout_web/priv/gettext/en/LC_MESSAGES/default.po b/apps/block_scout_web/priv/gettext/en/LC_MESSAGES/default.po
index ef9ebe1481ae..4d1362f4d282 100644
--- a/apps/block_scout_web/priv/gettext/en/LC_MESSAGES/default.po
+++ b/apps/block_scout_web/priv/gettext/en/LC_MESSAGES/default.po
@@ -68,7 +68,7 @@ msgstr ""
 msgid "%{subnetwork} Explorer - BlockScout"
 msgstr ""
 
-#: lib/block_scout_web/views/transaction_view.ex:369
+#: lib/block_scout_web/views/transaction_view.ex:371
 #, elixir-autogen, elixir-format
 msgid "(Awaiting internal transactions for status)"
 msgstr ""
@@ -698,7 +698,7 @@ msgstr ""
 msgid "Compiler version"
 msgstr ""
 
-#: lib/block_scout_web/views/transaction_view.ex:362
+#: lib/block_scout_web/views/transaction_view.ex:364
 #, elixir-autogen, elixir-format
 msgid "Confirmed"
 msgstr ""
@@ -783,12 +783,12 @@ msgstr ""
 msgid "Contract Address Pending"
 msgstr ""
 
-#: lib/block_scout_web/views/transaction_view.ex:478
+#: lib/block_scout_web/views/transaction_view.ex:480
 #, elixir-autogen, elixir-format
 msgid "Contract Call"
 msgstr ""
 
-#: lib/block_scout_web/views/transaction_view.ex:475
+#: lib/block_scout_web/views/transaction_view.ex:477
 #, elixir-autogen, elixir-format
 msgid "Contract Creation"
 msgstr ""
@@ -1186,12 +1186,12 @@ msgstr ""
 msgid "EIP-1167"
 msgstr ""
 
-#: lib/block_scout_web/views/transaction_view.ex:220
+#: lib/block_scout_web/views/transaction_view.ex:222
 #, elixir-autogen, elixir-format
 msgid "ERC-1155 "
 msgstr ""
 
-#: lib/block_scout_web/views/transaction_view.ex:218
+#: lib/block_scout_web/views/transaction_view.ex:220
 #, elixir-autogen, elixir-format
 msgid "ERC-20 "
 msgstr ""
@@ -1201,7 +1201,7 @@ msgstr ""
 msgid "ERC-20 tokens (beta)"
 msgstr ""
 
-#: lib/block_scout_web/views/transaction_view.ex:219
+#: lib/block_scout_web/views/transaction_view.ex:221
 #, elixir-autogen, elixir-format
 msgid "ERC-721 "
 msgstr ""
@@ -1292,12 +1292,12 @@ msgstr ""
 msgid "Error trying to fetch balances."
 msgstr ""
 
-#: lib/block_scout_web/views/transaction_view.ex:373
+#: lib/block_scout_web/views/transaction_view.ex:375
 #, elixir-autogen, elixir-format
 msgid "Error: %{reason}"
 msgstr ""
 
-#: lib/block_scout_web/views/transaction_view.ex:371
+#: lib/block_scout_web/views/transaction_view.ex:373
 #, elixir-autogen, elixir-format
 msgid "Error: (Awaiting internal transactions for reason)"
 msgstr ""
@@ -1602,7 +1602,7 @@ msgstr ""
 #: lib/block_scout_web/templates/transaction/_tabs.html.eex:11
 #: lib/block_scout_web/templates/transaction_internal_transaction/index.html.eex:6
 #: lib/block_scout_web/views/address_view.ex:376
-#: lib/block_scout_web/views/transaction_view.ex:533
+#: lib/block_scout_web/views/transaction_view.ex:535
 #, elixir-autogen, elixir-format
 msgid "Internal Transactions"
 msgstr ""
@@ -1719,7 +1719,7 @@ msgstr ""
 #: lib/block_scout_web/templates/transaction/_tabs.html.eex:17
 #: lib/block_scout_web/templates/transaction_log/index.html.eex:8
 #: lib/block_scout_web/views/address_view.ex:387
-#: lib/block_scout_web/views/transaction_view.ex:534
+#: lib/block_scout_web/views/transaction_view.ex:536
 #, elixir-autogen, elixir-format
 msgid "Logs"
 msgstr ""
@@ -1752,7 +1752,7 @@ msgstr ""
 msgid "Max Priority Fee per Gas"
 msgstr ""
 
-#: lib/block_scout_web/views/transaction_view.ex:325
+#: lib/block_scout_web/views/transaction_view.ex:327
 #, elixir-autogen, elixir-format
 msgid "Max of"
 msgstr ""
@@ -2064,8 +2064,8 @@ msgid "Parent Hash"
 msgstr ""
 
 #: lib/block_scout_web/templates/layout/_topnav.html.eex:63
-#: lib/block_scout_web/views/transaction_view.ex:368
-#: lib/block_scout_web/views/transaction_view.ex:407
+#: lib/block_scout_web/views/transaction_view.ex:370
+#: lib/block_scout_web/views/transaction_view.ex:409
 #, elixir-autogen, elixir-format
 msgid "Pending"
 msgstr ""
@@ -2201,7 +2201,7 @@ msgstr ""
 
 #: lib/block_scout_web/templates/transaction/_tabs.html.eex:24
 #: lib/block_scout_web/templates/transaction_raw_trace/_card_body.html.eex:1
-#: lib/block_scout_web/views/transaction_view.ex:535
+#: lib/block_scout_web/views/transaction_view.ex:537
 #, elixir-autogen, elixir-format
 msgid "Raw Trace"
 msgstr ""
@@ -2514,7 +2514,7 @@ msgstr ""
 
 #: lib/block_scout_web/templates/transaction/_tabs.html.eex:29
 #: lib/block_scout_web/templates/transaction_state/index.html.eex:6
-#: lib/block_scout_web/views/transaction_view.ex:536
+#: lib/block_scout_web/views/transaction_view.ex:538
 #, elixir-autogen, elixir-format
 msgid "State changes"
 msgstr ""
@@ -2540,7 +2540,7 @@ msgid "Submit an Issue"
 msgstr ""
 
 #: lib/block_scout_web/templates/transaction/_emission_reward_tile.html.eex:8
-#: lib/block_scout_web/views/transaction_view.ex:370
+#: lib/block_scout_web/views/transaction_view.ex:372
 #, elixir-autogen, elixir-format
 msgid "Success"
 msgstr ""
@@ -2849,13 +2849,13 @@ msgid "Token"
 msgstr ""
 
 #: lib/block_scout_web/templates/common_components/_token_transfer_type_display_name.html.eex:3
-#: lib/block_scout_web/views/transaction_view.ex:469
+#: lib/block_scout_web/views/transaction_view.ex:471
 #, elixir-autogen, elixir-format
 msgid "Token Burning"
 msgstr ""
 
 #: lib/block_scout_web/templates/common_components/_token_transfer_type_display_name.html.eex:7
-#: lib/block_scout_web/views/transaction_view.ex:470
+#: lib/block_scout_web/views/transaction_view.ex:472
 #, elixir-autogen, elixir-format
 msgid "Token Creation"
 msgstr ""
@@ -2883,14 +2883,14 @@ msgid "Token ID"
 msgstr ""
 
 #: lib/block_scout_web/templates/common_components/_token_transfer_type_display_name.html.eex:5
-#: lib/block_scout_web/views/transaction_view.ex:468
+#: lib/block_scout_web/views/transaction_view.ex:470
 #, elixir-autogen, elixir-format
 msgid "Token Minting"
 msgstr ""
 
 #: lib/block_scout_web/templates/common_components/_token_transfer_type_display_name.html.eex:9
 #: lib/block_scout_web/templates/common_components/_token_transfer_type_display_name.html.eex:11
-#: lib/block_scout_web/views/transaction_view.ex:471
+#: lib/block_scout_web/views/transaction_view.ex:473
 #, elixir-autogen, elixir-format
 msgid "Token Transfer"
 msgstr ""
@@ -2906,7 +2906,7 @@ msgstr ""
 #: lib/block_scout_web/views/address_view.ex:378
 #: lib/block_scout_web/views/tokens/instance/overview_view.ex:114
 #: lib/block_scout_web/views/tokens/overview_view.ex:40
-#: lib/block_scout_web/views/transaction_view.ex:532
+#: lib/block_scout_web/views/transaction_view.ex:534
 #, elixir-autogen, elixir-format
 msgid "Token Transfers"
 msgstr ""
@@ -3022,7 +3022,7 @@ msgstr ""
 #: lib/block_scout_web/templates/account/tag_transaction/form.html.eex:11
 #: lib/block_scout_web/templates/account/tag_transaction/index.html.eex:23
 #: lib/block_scout_web/templates/address_logs/_logs.html.eex:19
-#: lib/block_scout_web/views/transaction_view.ex:481
+#: lib/block_scout_web/views/transaction_view.ex:483
 #, elixir-autogen, elixir-format
 msgid "Transaction"
 msgstr ""
@@ -3177,7 +3177,7 @@ msgstr ""
 msgid "Uncles"
 msgstr ""
 
-#: lib/block_scout_web/views/transaction_view.ex:361
+#: lib/block_scout_web/views/transaction_view.ex:363
 #, elixir-autogen, elixir-format
 msgid "Unconfirmed"
 msgstr ""
diff --git a/apps/block_scout_web/test/block_scout_web/channels/websocket_v2_test.exs b/apps/block_scout_web/test/block_scout_web/channels/websocket_v2_test.exs
index 918b636cb3e8..bfb0424424f0 100644
--- a/apps/block_scout_web/test/block_scout_web/channels/websocket_v2_test.exs
+++ b/apps/block_scout_web/test/block_scout_web/channels/websocket_v2_test.exs
@@ -74,6 +74,7 @@ defmodule BlockScoutWeb.WebsocketV2Test do
           %{
             block_hash: "0xf6b4b8c88df3ebd252ec476328334dc026cf66606a84fb769b3d3cbccc8471bd",
             block_number: 37,
+            block_timestamp: Timex.parse!("2017-12-15T21:06:30.000000Z", "{ISO:Extended:Z}"),
             cumulative_gas_used: 50450,
             from_address_hash: "0xe8ddc5c7a2d2f0d7a9798459c0104fdf5e987aca",
             gas: 4_700_000,
@@ -96,6 +97,7 @@ defmodule BlockScoutWeb.WebsocketV2Test do
           %{
             block_hash: "0xf6b4b8c88df3ebd252ec476328334dc026cf66606a84fb769b3d3cbccc8471bd",
             block_number: 37,
+            block_timestamp: Timex.parse!("2017-12-15T21:06:30.000000Z", "{ISO:Extended:Z}"),
             cumulative_gas_used: 50450,
             from_address_hash: "0xe8ddc5c7a2d2f0d7a9798459c0104fdf5e987aca",
             gas: 4_700_000,
diff --git a/apps/block_scout_web/test/block_scout_web/controllers/api/v2/search_controller_test.exs b/apps/block_scout_web/test/block_scout_web/controllers/api/v2/search_controller_test.exs
index ee9ee43a0371..95584c013bff 100644
--- a/apps/block_scout_web/test/block_scout_web/controllers/api/v2/search_controller_test.exs
+++ b/apps/block_scout_web/test/block_scout_web/controllers/api/v2/search_controller_test.exs
@@ -202,7 +202,7 @@ defmodule BlockScoutWeb.API.V2.SearchControllerTest do
     end
 
     test "search transaction", %{conn: conn} do
-      tx = insert(:transaction)
+      tx = insert(:transaction, block_timestamp: nil)
 
       request = get(conn, "/api/v2/search?q=#{tx.hash}")
       assert response = json_response(request, 200)
diff --git a/apps/explorer/config/config.exs b/apps/explorer/config/config.exs
index 500417a2fd7a..88d38c68a956 100644
--- a/apps/explorer/config/config.exs
+++ b/apps/explorer/config/config.exs
@@ -113,6 +113,8 @@ config :explorer, Explorer.TokenTransferTokenIdMigration.Supervisor, enabled: tr
 
 config :explorer, Explorer.TokenInstanceOwnerAddressMigration.Supervisor, enabled: true
 
+config :explorer, Explorer.TransactionsDenormalizationMigrator, enabled: true
+
 config :explorer, Explorer.Chain.Fetcher.CheckBytecodeMatchingOnDemand, enabled: true
 
 config :explorer, Explorer.Chain.Fetcher.FetchValidatorInfoOnDemand, enabled: true
diff --git a/apps/explorer/config/runtime/test.exs b/apps/explorer/config/runtime/test.exs
index 9449463a5b9b..37ce93b2cb3b 100644
--- a/apps/explorer/config/runtime/test.exs
+++ b/apps/explorer/config/runtime/test.exs
@@ -37,6 +37,8 @@ config :explorer, Explorer.TokenTransferTokenIdMigration.Supervisor, enabled: fa
 
 config :explorer, Explorer.TokenInstanceOwnerAddressMigration.Supervisor, enabled: false
 
+config :explorer, Explorer.TransactionsDenormalizationMigrator, enabled: false
+
 config :explorer,
   realtime_events_sender: Explorer.Chain.Events.SimpleSender
 
diff --git a/apps/explorer/lib/explorer/application.ex b/apps/explorer/lib/explorer/application.ex
index 666407fbc025..497043d143d8 100644
--- a/apps/explorer/lib/explorer/application.ex
+++ b/apps/explorer/lib/explorer/application.ex
@@ -12,6 +12,7 @@ defmodule Explorer.Application do
     AddressesTabsCounters,
     AddressSum,
     AddressSumMinusBurnt,
+    BackgroundMigrations,
     Block,
     BlockNumber,
     Blocks,
@@ -63,6 +64,7 @@ defmodule Explorer.Application do
       Accounts,
       AddressSum,
       AddressSumMinusBurnt,
+      BackgroundMigrations,
       Block,
       BlockNumber,
       Blocks,
@@ -125,7 +127,8 @@ defmodule Explorer.Application do
         configure(Explorer.Chain.Fetcher.FetchValidatorInfoOnDemand),
         configure(Explorer.TokenInstanceOwnerAddressMigration.Supervisor),
         sc_microservice_configure(Explorer.Chain.Fetcher.LookUpSmartContractSourcesOnDemand),
-        configure(Explorer.Chain.Cache.RootstockLockedBTC)
+        configure(Explorer.Chain.Cache.RootstockLockedBTC),
+        configure(Explorer.TransactionsDenormalizationMigrator)
       ]
       |> List.flatten()
 
diff --git a/apps/explorer/lib/explorer/chain.ex b/apps/explorer/lib/explorer/chain.ex
index af2d6874a6d4..b6d27141d75d 100644
--- a/apps/explorer/lib/explorer/chain.ex
+++ b/apps/explorer/lib/explorer/chain.ex
@@ -51,6 +51,7 @@ defmodule Explorer.Chain do
     CurrencyHelper,
     Data,
     DecompiledSmartContract,
+    DenormalizationHelper,
     Hash,
     Import,
     InternalTransaction,
@@ -521,12 +522,22 @@ defmodule Explorer.Chain do
   @spec gas_payment_by_block_hash([Hash.Full.t()]) :: %{Hash.Full.t() => Wei.t()}
   def gas_payment_by_block_hash(block_hashes) when is_list(block_hashes) do
     query =
-      from(
-        transaction in Transaction,
-        where: transaction.block_hash in ^block_hashes and transaction.block_consensus == true,
-        group_by: transaction.block_hash,
-        select: {transaction.block_hash, %Wei{value: coalesce(sum(transaction.gas_used * transaction.gas_price), 0)}}
-      )
+      if DenormalizationHelper.denormalization_finished?() do
+        from(
+          transaction in Transaction,
+          where: transaction.block_hash in ^block_hashes and transaction.block_consensus == true,
+          group_by: transaction.block_hash,
+          select: {transaction.block_hash, %Wei{value: coalesce(sum(transaction.gas_used * transaction.gas_price), 0)}}
+        )
+      else
+        from(
+          block in Block,
+          left_join: transaction in assoc(block, :transactions),
+          where: block.hash in ^block_hashes and block.consensus == true,
+          group_by: block.hash,
+          select: {block.hash, %Wei{value: coalesce(sum(transaction.gas_used * transaction.gas_price), 0)}}
+        )
+      end
 
     query
     |> Repo.all()
diff --git a/apps/explorer/lib/explorer/chain/cache/background_migrations.ex b/apps/explorer/lib/explorer/chain/cache/background_migrations.ex
new file mode 100644
index 000000000000..4b33076a9675
--- /dev/null
+++ b/apps/explorer/lib/explorer/chain/cache/background_migrations.ex
@@ -0,0 +1,23 @@
+defmodule Explorer.Chain.Cache.BackgroundMigrations do
+  @moduledoc """
+  Caches background migrations' status.
+  """
+
+  require Logger
+
+  use Explorer.Chain.MapCache,
+    name: :background_migrations_status,
+    key: :denormalization_finished
+
+  @dialyzer :no_match
+
+  alias Explorer.TransactionsDenormalizationMigrator
+
+  defp handle_fallback(:denormalization_finished) do
+    Task.start(fn ->
+      set_denormalization_finished(TransactionsDenormalizationMigrator.migration_finished?())
+    end)
+
+    {:return, false}
+  end
+end
diff --git a/apps/explorer/lib/explorer/chain/csv_export/address_token_transfer_csv_exporter.ex b/apps/explorer/lib/explorer/chain/csv_export/address_token_transfer_csv_exporter.ex
index 704229757280..4409d1475eb8 100644
--- a/apps/explorer/lib/explorer/chain/csv_export/address_token_transfer_csv_exporter.ex
+++ b/apps/explorer/lib/explorer/chain/csv_export/address_token_transfer_csv_exporter.ex
@@ -12,7 +12,7 @@ defmodule Explorer.Chain.CSVExport.AddressTokenTransferCsvExporter do
     ]
 
   alias Explorer.{Chain, PagingOptions, Repo}
-  alias Explorer.Chain.{Address, Hash, TokenTransfer}
+  alias Explorer.Chain.{Address, Hash, TokenTransfer, Transaction}
   alias Explorer.Chain.CSVExport.Helper
 
   @paging_options %PagingOptions{page_size: Helper.limit(), asc_order: true}
@@ -68,7 +68,7 @@ defmodule Explorer.Chain.CSVExport.AddressTokenTransferCsvExporter do
         [
           to_string(token_transfer.transaction_hash),
           token_transfer.transaction.block_number,
-          token_transfer.transaction.block.timestamp,
+          Transaction.block_timestamp(token_transfer.transaction),
           Address.checksum(token_transfer.from_address_hash),
           Address.checksum(token_transfer.to_address_hash),
           Address.checksum(token_transfer.token_contract_address_hash),
diff --git a/apps/explorer/lib/explorer/chain/csv_export/address_transaction_csv_exporter.ex b/apps/explorer/lib/explorer/chain/csv_export/address_transaction_csv_exporter.ex
index a0404f477370..600d53d63aa3 100644
--- a/apps/explorer/lib/explorer/chain/csv_export/address_transaction_csv_exporter.ex
+++ b/apps/explorer/lib/explorer/chain/csv_export/address_transaction_csv_exporter.ex
@@ -10,15 +10,9 @@ defmodule Explorer.Chain.CSVExport.AddressTransactionCsvExporter do
 
   alias Explorer.{Chain, Market, PagingOptions, Repo}
   alias Explorer.Market.MarketHistory
-  alias Explorer.Chain.{Address, Hash, Transaction, Wei}
+  alias Explorer.Chain.{Address, DenormalizationHelper, Hash, Transaction, Wei}
   alias Explorer.Chain.CSVExport.Helper
 
-  @necessity_by_association [
-    necessity_by_association: %{
-      :block => :required
-    }
-  ]
-
   @paging_options %PagingOptions{page_size: Helper.limit()}
 
   @spec export(Hash.Address.t(), String.t(), String.t(), String.t() | nil, String.t() | nil) :: Enumerable.t()
@@ -35,7 +29,8 @@ defmodule Explorer.Chain.CSVExport.AddressTransactionCsvExporter do
   # sobelow_skip ["DOS.StringToAtom"]
   def fetch_transactions(address_hash, from_block, to_block, filter_type, filter_value, paging_options) do
     options =
-      @necessity_by_association
+      []
+      |> DenormalizationHelper.extend_block_necessity(:required)
       |> Keyword.put(:paging_options, paging_options)
       |> Keyword.put(:from_block, from_block)
       |> Keyword.put(:to_block, to_block)
@@ -67,7 +62,7 @@ defmodule Explorer.Chain.CSVExport.AddressTransactionCsvExporter do
 
     date_to_prices =
       Enum.reduce(transactions, %{}, fn tx, acc ->
-        date = DateTime.to_date(tx.block.timestamp)
+        date = tx |> Transaction.block_timestamp() |> DateTime.to_date()
 
         if Map.has_key?(acc, date) do
           acc
@@ -79,12 +74,12 @@ defmodule Explorer.Chain.CSVExport.AddressTransactionCsvExporter do
     transaction_lists =
       transactions
       |> Stream.map(fn transaction ->
-        {opening_price, closing_price} = date_to_prices[DateTime.to_date(transaction.block.timestamp)]
+        {opening_price, closing_price} = date_to_prices[DateTime.to_date(Transaction.block_timestamp(transaction))]
 
         [
           to_string(transaction.hash),
           transaction.block_number,
-          transaction.block.timestamp,
+          Transaction.block_timestamp(transaction),
           Address.checksum(transaction.from_address_hash),
           Address.checksum(transaction.to_address_hash),
           Address.checksum(transaction.created_contract_address_hash),
diff --git a/apps/explorer/lib/explorer/chain/denormalization_helper.ex b/apps/explorer/lib/explorer/chain/denormalization_helper.ex
new file mode 100644
index 000000000000..284ccf64a255
--- /dev/null
+++ b/apps/explorer/lib/explorer/chain/denormalization_helper.ex
@@ -0,0 +1,44 @@
+defmodule Explorer.Chain.DenormalizationHelper do
+  @moduledoc false
+
+  alias Explorer.Chain.Cache.BackgroundMigrations
+
+  def extend_block_necessity(opts, necessity \\ :optional) do
+    if denormalization_finished?() do
+      opts
+    else
+      Keyword.update(opts, :necessity_by_association, %{:block => necessity}, &Map.put(&1, :block, necessity))
+    end
+  end
+
+  def extend_transaction_block_necessity(opts, necessity \\ :optional) do
+    if denormalization_finished?() do
+      opts
+    else
+      Keyword.update(
+        opts,
+        :necessity_by_association,
+        %{[transaction: :block] => necessity},
+        &(&1 |> Map.delete(:transaction) |> Map.put([transaction: :block], necessity))
+      )
+    end
+  end
+
+  def extend_transaction_preload(preloads) do
+    if denormalization_finished?() do
+      preloads
+    else
+      [transaction: :block] ++ (preloads -- [:transaction])
+    end
+  end
+
+  def extend_block_preload(preloads) do
+    if denormalization_finished?() do
+      preloads
+    else
+      [:block | preloads]
+    end
+  end
+
+  def denormalization_finished?, do: BackgroundMigrations.get_denormalization_finished()
+end
diff --git a/apps/explorer/lib/explorer/chain/import/runner/transactions.ex b/apps/explorer/lib/explorer/chain/import/runner/transactions.ex
index b9927a5c5ebd..62578969a783 100644
--- a/apps/explorer/lib/explorer/chain/import/runner/transactions.ex
+++ b/apps/explorer/lib/explorer/chain/import/runner/transactions.ex
@@ -161,7 +161,7 @@ defmodule Explorer.Chain.Import.Runner.Transactions do
         ],
         where:
           fragment(
-            "(EXCLUDED.block_hash, EXCLUDED.block_number, EXCLUDED.block_consensus, EXCLUDED.block_timestamp, EXCLUDED.created_contract_address_hash, EXCLUDED.created_contract_code_indexed_at, EXCLUDED.cumulative_gas_used, EXCLUDED.from_address_hash, EXCLUDED.gas, EXCLUDED.gas_price, EXCLUDED.gas_used, EXCLUDED.index, EXCLUDED.input, EXCLUDED.nonce, EXCLUDED.r, EXCLUDED.s, EXCLUDED.status, EXCLUDED.to_address_hash, EXCLUDED.v, EXCLUDED.value, EXCLUDED.earliest_processing_start, EXCLUDED.revert_reason, EXCLUDED.max_priority_fee_per_gas, EXCLUDED.max_fee_per_gas, EXCLUDED.type, EXCLUDED.execution_node_hash, EXCLUDED.wrapped_type, EXCLUDED.wrapped_nonce, EXCLUDED.wrapped_to_address_hash, EXCLUDED.wrapped_gas, EXCLUDED.wrapped_gas_price, EXCLUDED.wrapped_max_priority_fee_per_gas, EXCLUDED.wrapped_max_fee_per_gas, EXCLUDED.wrapped_value, EXCLUDED.wrapped_input, EXCLUDED.wrapped_v, EXCLUDED.wrapped_r, EXCLUDED.wrapped_s, EXCLUDED.wrapped_hash) IS DISTINCT FROM (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)",
+            "(EXCLUDED.block_hash, EXCLUDED.block_number, EXCLUDED.block_consensus, EXCLUDED.block_timestamp, EXCLUDED.created_contract_address_hash, EXCLUDED.created_contract_code_indexed_at, EXCLUDED.cumulative_gas_used, EXCLUDED.from_address_hash, EXCLUDED.gas, EXCLUDED.gas_price, EXCLUDED.gas_used, EXCLUDED.index, EXCLUDED.input, EXCLUDED.nonce, EXCLUDED.r, EXCLUDED.s, EXCLUDED.status, EXCLUDED.to_address_hash, EXCLUDED.v, EXCLUDED.value, EXCLUDED.earliest_processing_start, EXCLUDED.revert_reason, EXCLUDED.max_priority_fee_per_gas, EXCLUDED.max_fee_per_gas, EXCLUDED.type, EXCLUDED.execution_node_hash, EXCLUDED.wrapped_type, EXCLUDED.wrapped_nonce, EXCLUDED.wrapped_to_address_hash, EXCLUDED.wrapped_gas, EXCLUDED.wrapped_gas_price, EXCLUDED.wrapped_max_priority_fee_per_gas, EXCLUDED.wrapped_max_fee_per_gas, EXCLUDED.wrapped_value, EXCLUDED.wrapped_input, EXCLUDED.wrapped_v, EXCLUDED.wrapped_r, EXCLUDED.wrapped_s, EXCLUDED.wrapped_hash) IS DISTINCT FROM (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)",
             transaction.block_hash,
             transaction.block_number,
             transaction.block_consensus,
@@ -242,7 +242,7 @@ defmodule Explorer.Chain.Import.Runner.Transactions do
         ],
         where:
           fragment(
-            "(EXCLUDED.block_hash, EXCLUDED.block_number, EXCLUDED.block_consensus, EXCLUDED.block_timestamp, EXCLUDED.created_contract_address_hash, EXCLUDED.created_contract_code_indexed_at, EXCLUDED.cumulative_gas_used, EXCLUDED.from_address_hash, EXCLUDED.gas, EXCLUDED.gas_price, EXCLUDED.gas_used, EXCLUDED.index, EXCLUDED.input, EXCLUDED.nonce, EXCLUDED.r, EXCLUDED.s, EXCLUDED.status, EXCLUDED.to_address_hash, EXCLUDED.v, EXCLUDED.value, EXCLUDED.earliest_processing_start, EXCLUDED.revert_reason, EXCLUDED.max_priority_fee_per_gas, EXCLUDED.max_fee_per_gas, EXCLUDED.type) IS DISTINCT FROM (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)",
+            "(EXCLUDED.block_hash, EXCLUDED.block_number, EXCLUDED.block_consensus, EXCLUDED.block_timestamp, EXCLUDED.created_contract_address_hash, EXCLUDED.created_contract_code_indexed_at, EXCLUDED.cumulative_gas_used, EXCLUDED.from_address_hash, EXCLUDED.gas, EXCLUDED.gas_price, EXCLUDED.gas_used, EXCLUDED.index, EXCLUDED.input, EXCLUDED.nonce, EXCLUDED.r, EXCLUDED.s, EXCLUDED.status, EXCLUDED.to_address_hash, EXCLUDED.v, EXCLUDED.value, EXCLUDED.earliest_processing_start, EXCLUDED.revert_reason, EXCLUDED.max_priority_fee_per_gas, EXCLUDED.max_fee_per_gas, EXCLUDED.type) IS DISTINCT FROM (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)",
             transaction.block_hash,
             transaction.block_number,
             transaction.block_consensus,
diff --git a/apps/explorer/lib/explorer/chain/search.ex b/apps/explorer/lib/explorer/chain/search.ex
index d74f697a9b34..20082bccbfb8 100644
--- a/apps/explorer/lib/explorer/chain/search.ex
+++ b/apps/explorer/lib/explorer/chain/search.ex
@@ -21,6 +21,7 @@ defmodule Explorer.Chain.Search do
   alias Explorer.Chain.{
     Address,
     Block,
+    DenormalizationHelper,
     SmartContract,
     Token,
     Transaction
@@ -382,38 +383,72 @@ defmodule Explorer.Chain.Search do
   end
 
   defp search_tx_query(term) do
-    case Chain.string_to_transaction_hash(term) do
-      {:ok, tx_hash} ->
-        transaction_search_fields = %{
-          address_hash: dynamic([_, _], type(^nil, :binary)),
-          tx_hash: dynamic([transaction, _], transaction.hash),
-          block_hash: dynamic([_, _], type(^nil, :binary)),
-          type: "transaction",
-          name: nil,
-          symbol: nil,
-          holder_count: nil,
-          inserted_at: dynamic([transaction, _], transaction.inserted_at),
-          block_number: 0,
-          icon_url: nil,
-          token_type: nil,
-          timestamp: dynamic([_, block], block.timestamp),
-          verified: nil,
-          exchange_rate: nil,
-          total_supply: nil,
-          circulating_market_cap: nil,
-          priority: 0,
-          is_verified_via_admin_panel: nil
-        }
+    if DenormalizationHelper.denormalization_finished?() do
+      case Chain.string_to_transaction_hash(term) do
+        {:ok, tx_hash} ->
+          transaction_search_fields = %{
+            address_hash: dynamic([_], type(^nil, :binary)),
+            tx_hash: dynamic([transaction], transaction.hash),
+            block_hash: dynamic([_], type(^nil, :binary)),
+            type: "transaction",
+            name: nil,
+            symbol: nil,
+            holder_count: nil,
+            inserted_at: dynamic([transaction], transaction.inserted_at),
+            block_number: 0,
+            icon_url: nil,
+            token_type: nil,
+            timestamp: dynamic([transaction], transaction.block_timestamp),
+            verified: nil,
+            exchange_rate: nil,
+            total_supply: nil,
+            circulating_market_cap: nil,
+            priority: 0,
+            is_verified_via_admin_panel: nil
+          }
+
+          from(transaction in Transaction,
+            where: transaction.hash == ^tx_hash,
+            select: ^transaction_search_fields
+          )
 
-        from(transaction in Transaction,
-          left_join: block in Block,
-          on: transaction.block_hash == block.hash,
-          where: transaction.hash == ^tx_hash,
-          select: ^transaction_search_fields
-        )
+        _ ->
+          nil
+      end
+    else
+      case Chain.string_to_transaction_hash(term) do
+        {:ok, tx_hash} ->
+          transaction_search_fields = %{
+            address_hash: dynamic([_, _], type(^nil, :binary)),
+            tx_hash: dynamic([transaction, _], transaction.hash),
+            block_hash: dynamic([_, _], type(^nil, :binary)),
+            type: "transaction",
+            name: nil,
+            symbol: nil,
+            holder_count: nil,
+            inserted_at: dynamic([transaction, _], transaction.inserted_at),
+            block_number: 0,
+            icon_url: nil,
+            token_type: nil,
+            timestamp: dynamic([_, block], block.timestamp),
+            verified: nil,
+            exchange_rate: nil,
+            total_supply: nil,
+            circulating_market_cap: nil,
+            priority: 0,
+            is_verified_via_admin_panel: nil
+          }
+
+          from(transaction in Transaction,
+            left_join: block in Block,
+            on: transaction.block_hash == block.hash,
+            where: transaction.hash == ^tx_hash,
+            select: ^transaction_search_fields
+          )
 
-      _ ->
-        nil
+        _ ->
+          nil
+      end
     end
   end
 
diff --git a/apps/explorer/lib/explorer/chain/token_transfer.ex b/apps/explorer/lib/explorer/chain/token_transfer.ex
index b1663a1e327c..8b9b878914df 100644
--- a/apps/explorer/lib/explorer/chain/token_transfer.ex
+++ b/apps/explorer/lib/explorer/chain/token_transfer.ex
@@ -28,7 +28,7 @@ defmodule Explorer.Chain.TokenTransfer do
   import Ecto.Query, only: [from: 2, limit: 2, where: 3, join: 5, order_by: 3, preload: 3]
 
   alias Explorer.Chain
-  alias Explorer.Chain.{Address, Block, Hash, TokenTransfer, Transaction}
+  alias Explorer.Chain.{Address, Block, DenormalizationHelper, Hash, TokenTransfer, Transaction}
   alias Explorer.Chain.Token.Instance
   alias Explorer.{PagingOptions, Repo}
 
@@ -161,12 +161,13 @@ defmodule Explorer.Chain.TokenTransfer do
   @spec fetch_token_transfers_from_token_hash(Hash.t(), [paging_options | api?]) :: []
   def fetch_token_transfers_from_token_hash(token_address_hash, options) do
     paging_options = Keyword.get(options, :paging_options, @default_paging_options)
+    preloads = DenormalizationHelper.extend_transaction_preload([:transaction, :token, :from_address, :to_address])
 
     query =
       from(
         tt in TokenTransfer,
         where: tt.token_contract_address_hash == ^token_address_hash and not is_nil(tt.block_number),
-        preload: [:transaction, :token, :from_address, :to_address],
+        preload: ^preloads,
         order_by: [desc: tt.block_number, desc: tt.log_index]
       )
 
@@ -179,6 +180,7 @@ defmodule Explorer.Chain.TokenTransfer do
   @spec fetch_token_transfers_from_token_hash_and_token_id(Hash.t(), non_neg_integer(), [paging_options | api?]) :: []
   def fetch_token_transfers_from_token_hash_and_token_id(token_address_hash, token_id, options) do
     paging_options = Keyword.get(options, :paging_options, @default_paging_options)
+    preloads = DenormalizationHelper.extend_transaction_preload([:transaction, :token, :from_address, :to_address])
 
     query =
       from(
@@ -186,7 +188,7 @@ defmodule Explorer.Chain.TokenTransfer do
         where: tt.token_contract_address_hash == ^token_address_hash,
         where: fragment("? @> ARRAY[?::decimal]", tt.token_ids, ^Decimal.new(token_id)),
         where: not is_nil(tt.block_number),
-        preload: [:transaction, :token, :from_address, :to_address],
+        preload: ^preloads,
         order_by: [desc: tt.block_number, desc: tt.log_index]
       )
 
diff --git a/apps/explorer/lib/explorer/chain/transaction.ex b/apps/explorer/lib/explorer/chain/transaction.ex
index f8804f06fa6b..a77700db8e83 100644
--- a/apps/explorer/lib/explorer/chain/transaction.ex
+++ b/apps/explorer/lib/explorer/chain/transaction.ex
@@ -17,6 +17,7 @@ defmodule Explorer.Chain.Transaction do
     Block,
     ContractMethod,
     Data,
+    DenormalizationHelper,
     Gas,
     Hash,
     InternalTransaction,
@@ -552,6 +553,11 @@ defmodule Explorer.Chain.Transaction do
     |> unique_constraint(:hash)
   end
 
+  def block_timestamp(%{block_number: nil, inserted_at: time}), do: time
+  def block_timestamp(%{block_timestamp: time}) when not is_nil(time), do: time
+  def block_timestamp(%{block: %{timestamp: time}}), do: time
+  def block_timestamp(_), do: nil
+
   def preload_token_transfers(query, address_hash) do
     token_transfers_query =
       from(
@@ -1027,11 +1033,12 @@ defmodule Explorer.Chain.Transaction do
   """
   def transactions_with_token_transfers(address_hash, token_hash) do
     query = transactions_with_token_transfers_query(address_hash, token_hash)
+    preloads = DenormalizationHelper.extend_block_preload([:from_address, :to_address, :created_contract_address])
 
     from(
       t in subquery(query),
       order_by: [desc: t.block_number, desc: t.index],
-      preload: [:from_address, :to_address, :created_contract_address]
+      preload: ^preloads
     )
   end
 
@@ -1048,11 +1055,12 @@ defmodule Explorer.Chain.Transaction do
 
   def transactions_with_token_transfers_direction(direction, address_hash) do
     query = transactions_with_token_transfers_query_direction(direction, address_hash)
+    preloads = DenormalizationHelper.extend_block_preload([:from_address, :to_address, :created_contract_address])
 
     from(
       t in subquery(query),
       order_by: [desc: t.block_number, desc: t.index],
-      preload: [:from_address, :to_address, :created_contract_address]
+      preload: ^preloads
     )
   end
 
diff --git a/apps/explorer/lib/explorer/chain/transaction/history/historian.ex b/apps/explorer/lib/explorer/chain/transaction/history/historian.ex
index 126b59b29998..2c8e4479cf6d 100644
--- a/apps/explorer/lib/explorer/chain/transaction/history/historian.ex
+++ b/apps/explorer/lib/explorer/chain/transaction/history/historian.ex
@@ -6,7 +6,7 @@ defmodule Explorer.Chain.Transaction.History.Historian do
   use Explorer.History.Historian
 
   alias Explorer.{Chain, Repo}
-  alias Explorer.Chain.{Block, Transaction}
+  alias Explorer.Chain.{Block, DenormalizationHelper, Transaction}
   alias Explorer.Chain.Events.Publisher
   alias Explorer.Chain.Transaction.History.TransactionStats
   alias Explorer.History.Process, as: HistoryProcess
@@ -89,22 +89,57 @@ defmodule Explorer.Chain.Transaction.History.Historian do
     Logger.info("tx/per day chart: min/max block numbers [#{min_block}, #{max_block}]")
 
     all_transactions_query =
+      if DenormalizationHelper.denormalization_finished?() do
+        from(
+          transaction in Transaction,
+          where: transaction.block_number >= ^min_block and transaction.block_number <= ^max_block,
+          where: transaction.block_consensus == true,
+          select: transaction
+        )
+      else
+        from(
+          transaction in Transaction,
+          where: transaction.block_number >= ^min_block and transaction.block_number <= ^max_block
+        )
+      end
+
+    all_blocks_query =
       from(
-        transaction in Transaction,
-        where: transaction.block_number >= ^min_block and transaction.block_number <= ^max_block,
-        where: transaction.block_consensus == true,
-        select: transaction
+        block in Block,
+        where: block.consensus == true,
+        where: block.number >= ^min_block and block.number <= ^max_block,
+        select: block.number
       )
 
-    num_transactions = Repo.aggregate(all_transactions_query, :count, :hash, timeout: :infinity)
+    query =
+      if DenormalizationHelper.denormalization_finished?() do
+        all_transactions_query
+      else
+        from(transaction in subquery(all_transactions_query),
+          join: block in subquery(all_blocks_query),
+          on: transaction.block_number == block.number,
+          select: transaction
+        )
+      end
+
+    num_transactions = Repo.aggregate(query, :count, :hash, timeout: :infinity)
     Logger.info("tx/per day chart: num of transactions #{num_transactions}")
-    gas_used = Repo.aggregate(all_transactions_query, :sum, :gas_used, timeout: :infinity)
+    gas_used = Repo.aggregate(query, :sum, :gas_used, timeout: :infinity)
     Logger.info("tx/per day chart: total gas used #{gas_used}")
 
     total_fee_query =
-      from(transaction in subquery(all_transactions_query),
-        select: fragment("SUM(? * ?)", transaction.gas_price, transaction.gas_used)
-      )
+      if DenormalizationHelper.denormalization_finished?() do
+        from(transaction in subquery(all_transactions_query),
+          select: fragment("SUM(? * ?)", transaction.gas_price, transaction.gas_used)
+        )
+      else
+        from(transaction in subquery(all_transactions_query),
+          join: block in Block,
+          on: transaction.block_hash == block.hash,
+          where: block.consensus == true,
+          select: fragment("SUM(? * ?)", transaction.gas_price, transaction.gas_used)
+        )
+      end
 
     total_fee = Repo.one(total_fee_query, timeout: :infinity)
     Logger.info("tx/per day chart: total fee #{total_fee}")
diff --git a/apps/explorer/lib/explorer/etherscan.ex b/apps/explorer/lib/explorer/etherscan.ex
index f62f20656115..dba8be73ebcc 100644
--- a/apps/explorer/lib/explorer/etherscan.ex
+++ b/apps/explorer/lib/explorer/etherscan.ex
@@ -9,7 +9,7 @@ defmodule Explorer.Etherscan do
   alias Explorer.Etherscan.Logs
   alias Explorer.{Chain, Repo}
   alias Explorer.Chain.Address.{CurrentTokenBalance, TokenBalance}
-  alias Explorer.Chain.{Address, Block, Hash, InternalTransaction, TokenTransfer, Transaction}
+  alias Explorer.Chain.{Address, Block, DenormalizationHelper, Hash, InternalTransaction, TokenTransfer, Transaction}
   alias Explorer.Chain.Transaction.History.TransactionStats
 
   @default_options %{
@@ -101,17 +101,32 @@ defmodule Explorer.Etherscan do
   @spec list_internal_transactions(Hash.Full.t()) :: [map()]
   def list_internal_transactions(%Hash{byte_count: unquote(Hash.Full.byte_count())} = transaction_hash) do
     query =
-      from(
-        it in InternalTransaction,
-        inner_join: transaction in assoc(it, :transaction),
-        where: it.transaction_hash == ^transaction_hash,
-        limit: 10_000,
-        select:
-          merge(map(it, ^@internal_transaction_fields), %{
-            block_timestamp: transaction.block_timestamp,
-            block_number: transaction.block_number
-          })
-      )
+      if DenormalizationHelper.denormalization_finished?() do
+        from(
+          it in InternalTransaction,
+          inner_join: transaction in assoc(it, :transaction),
+          where: it.transaction_hash == ^transaction_hash,
+          limit: 10_000,
+          select:
+            merge(map(it, ^@internal_transaction_fields), %{
+              block_timestamp: transaction.block_timestamp,
+              block_number: transaction.block_number
+            })
+        )
+      else
+        from(
+          it in InternalTransaction,
+          inner_join: t in assoc(it, :transaction),
+          inner_join: b in assoc(t, :block),
+          where: it.transaction_hash == ^transaction_hash,
+          limit: 10_000,
+          select:
+            merge(map(it, ^@internal_transaction_fields), %{
+              block_timestamp: b.timestamp,
+              block_number: b.number
+            })
+        )
+      end
 
     query
     |> Chain.where_transaction_has_multiple_internal_transactions()
@@ -211,18 +226,34 @@ defmodule Explorer.Etherscan do
       |> Repo.replica().all()
     else
       query =
-        from(
-          it in InternalTransaction,
-          inner_join: transaction in assoc(it, :transaction),
-          order_by: [{^options.order_by_direction, transaction.block_number}],
-          limit: ^options.page_size,
-          offset: ^offset(options),
-          select:
-            merge(map(it, ^@internal_transaction_fields), %{
-              block_timestamp: transaction.block_timestamp,
-              block_number: transaction.block_number
-            })
-        )
+        if DenormalizationHelper.denormalization_finished?() do
+          from(
+            it in InternalTransaction,
+            inner_join: transaction in assoc(it, :transaction),
+            order_by: [{^options.order_by_direction, transaction.block_number}],
+            limit: ^options.page_size,
+            offset: ^offset(options),
+            select:
+              merge(map(it, ^@internal_transaction_fields), %{
+                block_timestamp: transaction.block_timestamp,
+                block_number: transaction.block_number
+              })
+          )
+        else
+          from(
+            it in InternalTransaction,
+            inner_join: t in assoc(it, :transaction),
+            inner_join: b in assoc(t, :block),
+            order_by: [{^options.order_by_direction, t.block_number}],
+            limit: ^options.page_size,
+            offset: ^offset(options),
+            select:
+              merge(map(it, ^@internal_transaction_fields), %{
+                block_timestamp: b.timestamp,
+                block_number: b.number
+              })
+          )
+        end
 
       query
       |> Chain.where_transaction_has_multiple_internal_transactions()
@@ -393,16 +424,31 @@ defmodule Explorer.Etherscan do
 
   defp list_transactions(address_hash, max_block_number, options) do
     query =
-      from(
-        t in Transaction,
-        order_by: [{^options.order_by_direction, t.block_number}],
-        limit: ^options.page_size,
-        offset: ^offset(options),
-        select:
-          merge(map(t, ^@transaction_fields), %{
-            confirmations: fragment("? - ?", ^max_block_number, t.block_number)
-          })
-      )
+      if DenormalizationHelper.denormalization_finished?() do
+        from(
+          t in Transaction,
+          order_by: [{^options.order_by_direction, t.block_number}],
+          limit: ^options.page_size,
+          offset: ^offset(options),
+          select:
+            merge(map(t, ^@transaction_fields), %{
+              confirmations: fragment("? - ?", ^max_block_number, t.block_number)
+            })
+        )
+      else
+        from(
+          t in Transaction,
+          inner_join: b in assoc(t, :block),
+          order_by: [{^options.order_by_direction, t.block_number}],
+          limit: ^options.page_size,
+          offset: ^offset(options),
+          select:
+            merge(map(t, ^@transaction_fields), %{
+              block_timestamp: b.timestamp,
+              confirmations: fragment("? - ?", ^max_block_number, t.block_number)
+            })
+        )
+      end
 
     query
     |> where_address_match(address_hash, options)
@@ -465,37 +511,71 @@ defmodule Explorer.Etherscan do
       |> where_contract_address_match(contract_address_hash)
 
     wrapped_query =
-      from(
-        tt in subquery(tt_specific_token_query),
-        inner_join: t in Transaction,
-        on: tt.transaction_hash == t.hash and tt.block_number == t.block_number and tt.block_hash == t.block_hash,
-        order_by: [{^options.order_by_direction, tt.block_number}, {^options.order_by_direction, tt.token_log_index}],
-        select: %{
-          token_contract_address_hash: tt.token_contract_address_hash,
-          transaction_hash: tt.transaction_hash,
-          from_address_hash: tt.from_address_hash,
-          to_address_hash: tt.to_address_hash,
-          amount: tt.amount,
-          amounts: tt.amounts,
-          transaction_nonce: t.nonce,
-          transaction_index: t.index,
-          transaction_gas: t.gas,
-          transaction_gas_price: t.gas_price,
-          transaction_gas_used: t.gas_used,
-          transaction_cumulative_gas_used: t.cumulative_gas_used,
-          transaction_input: t.input,
-          block_hash: t.block_hash,
-          block_number: t.block_number,
-          block_timestamp: t.block_timestamp,
-          confirmations: fragment("? - ?", ^block_height, t.block_number),
-          token_ids: tt.token_ids,
-          token_name: tt.token_name,
-          token_symbol: tt.token_symbol,
-          token_decimals: tt.token_decimals,
-          token_type: tt.token_type,
-          token_log_index: tt.token_log_index
-        }
-      )
+      if DenormalizationHelper.denormalization_finished?() do
+        from(
+          tt in subquery(tt_specific_token_query),
+          inner_join: t in Transaction,
+          on: tt.transaction_hash == t.hash and tt.block_number == t.block_number and tt.block_hash == t.block_hash,
+          order_by: [{^options.order_by_direction, tt.block_number}, {^options.order_by_direction, tt.token_log_index}],
+          select: %{
+            token_contract_address_hash: tt.token_contract_address_hash,
+            transaction_hash: tt.transaction_hash,
+            from_address_hash: tt.from_address_hash,
+            to_address_hash: tt.to_address_hash,
+            amount: tt.amount,
+            amounts: tt.amounts,
+            transaction_nonce: t.nonce,
+            transaction_index: t.index,
+            transaction_gas: t.gas,
+            transaction_gas_price: t.gas_price,
+            transaction_gas_used: t.gas_used,
+            transaction_cumulative_gas_used: t.cumulative_gas_used,
+            transaction_input: t.input,
+            block_hash: t.block_hash,
+            block_number: t.block_number,
+            block_timestamp: t.block_timestamp,
+            confirmations: fragment("? - ?", ^block_height, t.block_number),
+            token_ids: tt.token_ids,
+            token_name: tt.token_name,
+            token_symbol: tt.token_symbol,
+            token_decimals: tt.token_decimals,
+            token_type: tt.token_type,
+            token_log_index: tt.token_log_index
+          }
+        )
+      else
+        from(
+          tt in subquery(tt_specific_token_query),
+          inner_join: t in Transaction,
+          on: tt.transaction_hash == t.hash and tt.block_number == t.block_number and tt.block_hash == t.block_hash,
+          inner_join: b in assoc(t, :block),
+          order_by: [{^options.order_by_direction, tt.block_number}, {^options.order_by_direction, tt.token_log_index}],
+          select: %{
+            token_contract_address_hash: tt.token_contract_address_hash,
+            transaction_hash: tt.transaction_hash,
+            from_address_hash: tt.from_address_hash,
+            to_address_hash: tt.to_address_hash,
+            amount: tt.amount,
+            transaction_nonce: t.nonce,
+            transaction_index: t.index,
+            transaction_gas: t.gas,
+            transaction_gas_price: t.gas_price,
+            transaction_gas_used: t.gas_used,
+            transaction_cumulative_gas_used: t.cumulative_gas_used,
+            transaction_input: t.input,
+            block_hash: b.hash,
+            block_number: b.number,
+            block_timestamp: b.timestamp,
+            confirmations: fragment("? - ?", ^block_height, t.block_number),
+            token_id: tt.token_id,
+            token_name: tt.token_name,
+            token_symbol: tt.token_symbol,
+            token_decimals: tt.token_decimals,
+            token_type: tt.token_type,
+            token_log_index: tt.token_log_index
+          }
+        )
+      end
 
     wrapped_query
     |> where_start_transaction_block_match(options)
@@ -517,26 +597,42 @@ defmodule Explorer.Etherscan do
 
   defp where_start_transaction_block_match(query, %{start_block: nil}), do: query
 
-  defp where_start_transaction_block_match(query, %{start_block: start_block}) do
-    where(query, [transaction], transaction.block_number >= ^start_block)
+  defp where_start_transaction_block_match(query, %{start_block: start_block} = params) do
+    if DenormalizationHelper.denormalization_finished?() do
+      where(query, [transaction], transaction.block_number >= ^start_block)
+    else
+      where_start_block_match(query, params)
+    end
   end
 
   defp where_end_transaction_block_match(query, %{end_block: nil}), do: query
 
-  defp where_end_transaction_block_match(query, %{end_block: end_block}) do
-    where(query, [transaction], transaction.block_number <= ^end_block)
+  defp where_end_transaction_block_match(query, %{end_block: end_block} = params) do
+    if DenormalizationHelper.denormalization_finished?() do
+      where(query, [transaction], transaction.block_number <= ^end_block)
+    else
+      where_end_block_match(query, params)
+    end
   end
 
   defp where_start_timestamp_match(query, %{start_timestamp: nil}), do: query
 
   defp where_start_timestamp_match(query, %{start_timestamp: start_timestamp}) do
-    where(query, [transaction, _block], ^start_timestamp <= transaction.block_timestamp)
+    if DenormalizationHelper.denormalization_finished?() do
+      where(query, [transaction], ^start_timestamp <= transaction.block_timestamp)
+    else
+      where(query, [..., block], ^start_timestamp <= block.timestamp)
+    end
   end
 
   defp where_end_timestamp_match(query, %{end_timestamp: nil}), do: query
 
   defp where_end_timestamp_match(query, %{end_timestamp: end_timestamp}) do
-    where(query, [transaction, _block], transaction.block_timestamp <= ^end_timestamp)
+    if DenormalizationHelper.denormalization_finished?() do
+      where(query, [transaction], transaction.block_timestamp <= ^end_timestamp)
+    else
+      where(query, [..., block], block.timestamp <= ^end_timestamp)
+    end
   end
 
   defp where_contract_address_match(query, nil), do: query
diff --git a/apps/explorer/lib/explorer/etherscan/logs.ex b/apps/explorer/lib/explorer/etherscan/logs.ex
index 70c4dedaf2d8..e83587869d6d 100644
--- a/apps/explorer/lib/explorer/etherscan/logs.ex
+++ b/apps/explorer/lib/explorer/etherscan/logs.ex
@@ -5,10 +5,10 @@ defmodule Explorer.Etherscan.Logs do
 
   """
 
-  import Ecto.Query, only: [from: 2, limit: 2, where: 3, subquery: 1, order_by: 3]
+  import Ecto.Query, only: [from: 2, limit: 2, where: 3, subquery: 1, order_by: 3, union: 2]
 
-  alias Explorer.Repo
-  alias Explorer.Chain.{Log, Transaction}
+  alias Explorer.{Chain, Repo}
+  alias Explorer.Chain.{Block, DenormalizationHelper, InternalTransaction, Log, Transaction}
 
   @base_filter %{
     from_block: nil,
@@ -76,52 +76,126 @@ defmodule Explorer.Etherscan.Logs do
     paging_options = if is_nil(paging_options), do: @default_paging_options, else: paging_options
     prepared_filter = Map.merge(@base_filter, filter)
 
-    logs_query =
-      Log
-      |> where_topic_match(prepared_filter)
-      |> where([log], log.address_hash == ^address_hash)
-      |> where([log], log.block_number >= ^prepared_filter.from_block)
-      |> where([log], log.block_number <= ^prepared_filter.to_block)
-      |> limit(1000)
-      |> order_by([log], asc: log.block_number, asc: log.index)
-      |> page_logs(paging_options)
+    if DenormalizationHelper.denormalization_finished?() do
+      logs_query =
+        Log
+        |> where_topic_match(prepared_filter)
+        |> where([log], log.address_hash == ^address_hash)
+        |> where([log], log.block_number >= ^prepared_filter.from_block)
+        |> where([log], log.block_number <= ^prepared_filter.to_block)
+        |> limit(1000)
+        |> order_by([log], asc: log.block_number, asc: log.index)
+        |> page_logs(paging_options)
+
+      all_transaction_logs_query =
+        from(log in subquery(logs_query),
+          join: transaction in Transaction,
+          on: log.transaction_hash == transaction.hash,
+          select: map(log, ^@log_fields),
+          select_merge: %{
+            gas_price: transaction.gas_price,
+            gas_used: transaction.gas_used,
+            transaction_index: transaction.index,
+            block_hash: transaction.block_hash,
+            block_number: transaction.block_number,
+            block_timestamp: transaction.block_timestamp,
+            block_consensus: transaction.block_consensus
+          }
+        )
 
-    all_transaction_logs_query =
-      from(log in subquery(logs_query),
-        join: transaction in Transaction,
-        on: log.transaction_hash == transaction.hash,
-        select: map(log, ^@log_fields),
-        select_merge: %{
-          gas_price: transaction.gas_price,
-          gas_used: transaction.gas_used,
-          transaction_index: transaction.index,
-          block_hash: transaction.block_hash,
-          block_number: transaction.block_number,
-          block_timestamp: transaction.block_timestamp,
-          block_consensus: transaction.block_consensus
-        }
-      )
+      query_with_blocks =
+        from(log_transaction_data in subquery(all_transaction_logs_query),
+          where: log_transaction_data.address_hash == ^address_hash,
+          order_by: log_transaction_data.block_number,
+          select_merge: %{
+            block_consensus: log_transaction_data.block_consensus
+          }
+        )
 
-    query_with_blocks =
-      from(log_transaction_data in subquery(all_transaction_logs_query),
-        where: log_transaction_data.address_hash == ^address_hash,
-        order_by: log_transaction_data.block_number,
-        select_merge: %{
-          block_consensus: log_transaction_data.block_consensus
-        }
-      )
+      query_with_consensus =
+        if Map.get(filter, :allow_non_consensus) do
+          query_with_blocks
+        else
+          from([transaction] in query_with_blocks,
+            where: transaction.block_consensus == true
+          )
+        end
+
+      query_with_consensus
+      |> Repo.replica().all()
+    else
+      logs_query = where_topic_match(Log, prepared_filter)
+
+      query_to_address_hash_wrapped =
+        logs_query
+        |> internal_transaction_query(:to_address_hash, prepared_filter, address_hash)
+        |> Chain.wrapped_union_subquery()
+
+      query_from_address_hash_wrapped =
+        logs_query
+        |> internal_transaction_query(:from_address_hash, prepared_filter, address_hash)
+        |> Chain.wrapped_union_subquery()
+
+      query_created_contract_address_hash_wrapped =
+        logs_query
+        |> internal_transaction_query(:created_contract_address_hash, prepared_filter, address_hash)
+        |> Chain.wrapped_union_subquery()
+
+      internal_transaction_log_query =
+        query_to_address_hash_wrapped
+        |> union(^query_from_address_hash_wrapped)
+        |> union(^query_created_contract_address_hash_wrapped)
+
+      all_transaction_logs_query =
+        from(transaction in Transaction,
+          join: log in ^logs_query,
+          on: log.transaction_hash == transaction.hash,
+          where: transaction.block_number >= ^prepared_filter.from_block,
+          where: transaction.block_number <= ^prepared_filter.to_block,
+          where:
+            transaction.to_address_hash == ^address_hash or
+              transaction.from_address_hash == ^address_hash or
+              transaction.created_contract_address_hash == ^address_hash,
+          select: map(log, ^@log_fields),
+          select_merge: %{
+            gas_price: transaction.gas_price,
+            gas_used: transaction.gas_used,
+            transaction_index: transaction.index,
+            block_number: transaction.block_number
+          },
+          union: ^internal_transaction_log_query
+        )
 
-    query_with_consensus =
-      if Map.get(filter, :allow_non_consensus) do
-        query_with_blocks
-      else
-        from([transaction] in query_with_blocks,
-          where: transaction.block_consensus == true
+      query_with_blocks =
+        from(log_transaction_data in subquery(all_transaction_logs_query),
+          join: block in Block,
+          on: block.number == log_transaction_data.block_number,
+          where: log_transaction_data.address_hash == ^address_hash,
+          order_by: block.number,
+          limit: 1000,
+          select_merge: %{
+            transaction_index: log_transaction_data.transaction_index,
+            block_hash: block.hash,
+            block_number: block.number,
+            block_timestamp: block.timestamp,
+            block_consensus: block.consensus
+          }
         )
-      end
 
-    query_with_consensus
-    |> Repo.replica().all()
+      query_with_consensus =
+        if Map.get(filter, :allow_non_consensus) do
+          query_with_blocks
+        else
+          from([_, block] in query_with_blocks,
+            where: block.consensus == true
+          )
+        end
+
+      query_with_consensus
+      |> order_by([log], asc: log.index)
+      |> page_logs(paging_options)
+      |> Repo.replica().all()
+    end
   end
 
   # Since address_hash was not present, we know that a
@@ -131,48 +205,90 @@ defmodule Explorer.Etherscan.Logs do
   def list_logs(filter, paging_options) do
     paging_options = if is_nil(paging_options), do: @default_paging_options, else: paging_options
     prepared_filter = Map.merge(@base_filter, filter)
-
     logs_query = where_topic_match(Log, prepared_filter)
 
-    block_transaction_query =
-      from(transaction in Transaction,
-        where: transaction.block_number >= ^prepared_filter.from_block,
-        where: transaction.block_number <= ^prepared_filter.to_block,
-        select: %{
-          transaction_hash: transaction.hash,
-          gas_price: transaction.gas_price,
-          gas_used: transaction.gas_used,
-          transaction_index: transaction.index,
-          block_hash: transaction.block_hash,
-          block_number: transaction.block_number,
-          block_timestamp: transaction.block_timestamp,
-          block_consensus: transaction.block_consensus
-        }
-      )
+    if DenormalizationHelper.denormalization_finished?() do
+      block_transaction_query =
+        from(transaction in Transaction,
+          where: transaction.block_number >= ^prepared_filter.from_block,
+          where: transaction.block_number <= ^prepared_filter.to_block,
+          select: %{
+            transaction_hash: transaction.hash,
+            gas_price: transaction.gas_price,
+            gas_used: transaction.gas_used,
+            transaction_index: transaction.index,
+            block_hash: transaction.block_hash,
+            block_number: transaction.block_number,
+            block_timestamp: transaction.block_timestamp,
+            block_consensus: transaction.block_consensus
+          }
+        )
 
-    query_with_consensus =
-      if Map.get(filter, :allow_non_consensus) do
-        block_transaction_query
-      else
-        from([transaction] in block_transaction_query,
-          where: transaction.block_consensus == true
+      query_with_consensus =
+        if Map.get(filter, :allow_non_consensus) do
+          block_transaction_query
+        else
+          from([transaction] in block_transaction_query,
+            where: transaction.block_consensus == true
+          )
+        end
+
+      query_with_block_transaction_data =
+        from(log in logs_query,
+          join: block_transaction_data in subquery(query_with_consensus),
+          on: block_transaction_data.transaction_hash == log.transaction_hash,
+          order_by: block_transaction_data.block_number,
+          limit: 1000,
+          select: block_transaction_data,
+          select_merge: map(log, ^@log_fields)
         )
-      end
-
-    query_with_block_transaction_data =
-      from(log in logs_query,
-        join: block_transaction_data in subquery(query_with_consensus),
-        on: block_transaction_data.transaction_hash == log.transaction_hash,
-        order_by: block_transaction_data.block_number,
-        limit: 1000,
-        select: block_transaction_data,
-        select_merge: map(log, ^@log_fields)
-      )
 
-    query_with_block_transaction_data
-    |> order_by([log], asc: log.index)
-    |> page_logs(paging_options)
-    |> Repo.replica().all()
+      query_with_block_transaction_data
+      |> order_by([log], asc: log.index)
+      |> page_logs(paging_options)
+      |> Repo.replica().all()
+    else
+      block_transaction_query =
+        from(transaction in Transaction,
+          join: block in assoc(transaction, :block),
+          where: block.number >= ^prepared_filter.from_block,
+          where: block.number <= ^prepared_filter.to_block,
+          select: %{
+            transaction_hash: transaction.hash,
+            gas_price: transaction.gas_price,
+            gas_used: transaction.gas_used,
+            transaction_index: transaction.index,
+            block_hash: block.hash,
+            block_number: block.number,
+            block_timestamp: block.timestamp,
+            block_consensus: block.consensus
+          }
+        )
+
+      query_with_consensus =
+        if Map.get(filter, :allow_non_consensus) do
+          block_transaction_query
+        else
+          from([_, block] in block_transaction_query,
+            where: block.consensus == true
+          )
+        end
+
+      query_with_block_transaction_data =
+        from(log in logs_query,
+          join: block_transaction_data in subquery(query_with_consensus),
+          on: block_transaction_data.transaction_hash == log.transaction_hash,
+          order_by: block_transaction_data.block_number,
+          limit: 1000,
+          select: block_transaction_data,
+          select_merge: map(log, ^@log_fields)
+        )
+
+      query_with_block_transaction_data
+      |> order_by([log], asc: log.index)
+      |> page_logs(paging_options)
+      |> Repo.replica().all()
+    end
   end
 
   @topics [
@@ -232,4 +348,25 @@ defmodule Explorer.Etherscan.Logs do
       where: data.index > ^log_index and data.block_number >= ^block_number
     )
   end
+
+  defp internal_transaction_query(logs_query, direction, prepared_filter, address_hash) do
+    query =
+      from(internal_transaction in InternalTransaction.where_nonpending_block(),
+        join: transaction in assoc(internal_transaction, :transaction),
+        join: log in ^logs_query,
+        on: log.transaction_hash == internal_transaction.transaction_hash,
+        where: internal_transaction.block_number >= ^prepared_filter.from_block,
+        where: internal_transaction.block_number <= ^prepared_filter.to_block,
+        select:
+          merge(map(log, ^@log_fields), %{
+            gas_price: transaction.gas_price,
+            gas_used: transaction.gas_used,
+            transaction_index: transaction.index,
+            block_number: internal_transaction.block_number
+          })
+      )
+
+    query
+    |> InternalTransaction.where_address_fields_match(address_hash, direction)
+  end
 end
diff --git a/apps/explorer/lib/explorer/transactions_denormalization_migrator.ex b/apps/explorer/lib/explorer/transactions_denormalization_migrator.ex
new file mode 100644
index 000000000000..442344819c21
--- /dev/null
+++ b/apps/explorer/lib/explorer/transactions_denormalization_migrator.ex
@@ -0,0 +1,91 @@
+defmodule Explorer.TransactionsDenormalizationMigrator do
+  @moduledoc """
+  Migrates all transactions to have set block_consensus and block_timestamp
+  """
+
+  use GenServer, restart: :transient
+
+  import Ecto.Query
+
+  alias Explorer.Chain.Cache.BackgroundMigrations
+  alias Explorer.Chain.Transaction
+  alias Explorer.Repo
+
+  @default_batch_size 500
+  @default_concurrency 4 * System.schedulers_online()
+
+  @spec start_link(term()) :: GenServer.on_start()
+  def start_link(_) do
+    GenServer.start_link(__MODULE__, :ok, name: __MODULE__)
+  end
+
+  def migration_finished? do
+    not Repo.exists?(unprocessed_transactions_query())
+  end
+
+  @impl true
+  def init(_) do
+    schedule_batch_migration()
+    {:ok, %{}}
+  end
+
+  @impl true
+  def handle_info(:migrate_batch, state) do
+    case last_unprocessed_transaction_hashes() do
+      [] ->
+        BackgroundMigrations.set_denormalization_finished(true)
+        {:stop, :normal, state}
+
+      hashes ->
+        hashes
+        |> Enum.chunk_every(batch_size())
+        |> Enum.map(&run_task/1)
+        |> Task.await_many(:infinity)
+
+        schedule_batch_migration()
+
+        {:noreply, state}
+    end
+  end
+
+  defp run_task(batch), do: Task.async(fn -> update_batch(batch) end)
+
+  defp last_unprocessed_transaction_hashes do
+    limit = batch_size() * concurrency()
+
+    unprocessed_transactions_query()
+    |> order_by(desc: :inserted_at)
+    |> select([t], t.hash)
+    |> limit(^limit)
+    |> Repo.all()
+  end
+
+  defp unprocessed_transactions_query do
+    from(t in Transaction,
+      where: not is_nil(t.block_hash) and (is_nil(t.block_consensus) or is_nil(t.block_timestamp))
+    )
+  end
+
+  defp update_batch(transaction_hashes) do
+    query =
+      from(transaction in Transaction,
+        join: block in assoc(transaction, :block),
+        where: transaction.hash in ^transaction_hashes,
+        update: [set: [block_consensus: block.consensus, block_timestamp: block.timestamp]]
+      )
+
+    Repo.update_all(query, [], timeout: :infinity)
+  end
+
+  defp schedule_batch_migration do
+    Process.send(self(), :migrate_batch, [])
+  end
+
+  defp batch_size do
+    Application.get_env(:explorer, __MODULE__)[:batch_size] || @default_batch_size
+  end
+
+  defp concurrency do
+    Application.get_env(:explorer, __MODULE__)[:batch_size] || @default_concurrency
+  end
+end
diff --git a/apps/explorer/priv/repo/migrations/20220315082902_add_consensus_to_transaction_table.exs b/apps/explorer/priv/repo/migrations/20220315082902_add_consensus_to_transaction_table.exs
index bb1c60a94de7..8c8bbece0213 100644
--- a/apps/explorer/priv/repo/migrations/20220315082902_add_consensus_to_transaction_table.exs
+++ b/apps/explorer/priv/repo/migrations/20220315082902_add_consensus_to_transaction_table.exs
@@ -6,14 +6,6 @@ defmodule Explorer.Repo.Migrations.AddConsensusToTransactionTable do
       add(:block_consensus, :boolean, default: true)
     end
 
-    execute("""
-    UPDATE transactions tx
-    SET block_consensus = b.consensus
-    FROM blocks b
-    WHERE b.hash = tx.block_hash
-    AND b.consensus = false;
-    """)
-
     create(index(:transactions, :block_consensus))
   end
 end
diff --git a/apps/explorer/priv/repo/migrations/20220315093927_add_block_timestamp_to_transaction_table.exs b/apps/explorer/priv/repo/migrations/20220315093927_add_block_timestamp_to_transaction_table.exs
index 22f491027dcc..7303c9fce1d0 100644
--- a/apps/explorer/priv/repo/migrations/20220315093927_add_block_timestamp_to_transaction_table.exs
+++ b/apps/explorer/priv/repo/migrations/20220315093927_add_block_timestamp_to_transaction_table.exs
@@ -6,13 +6,6 @@ defmodule Explorer.Repo.Migrations.AddBlockTimestampToTransactionTable do
       add(:block_timestamp, :utc_datetime_usec)
     end
 
-    execute("""
-    UPDATE transactions tx
-    SET block_timestamp = b.timestamp
-    FROM blocks b
-    WHERE b.hash = tx.block_hash;
-    """)
-
     create(index(:transactions, :block_timestamp))
   end
 end
diff --git a/apps/explorer/test/explorer/transactions_denormalization_migrator_test.ex b/apps/explorer/test/explorer/transactions_denormalization_migrator_test.ex
new file mode 100644
index 000000000000..12b984837022
--- /dev/null
+++ b/apps/explorer/test/explorer/transactions_denormalization_migrator_test.ex
@@ -0,0 +1,37 @@
+defmodule Explorer.TransactionsDenormalizationMigratorTest do
+  use Explorer.DataCase, async: false
+
+  alias Explorer.Chain.Transaction
+  alias Explorer.{Repo, TransactionsDenormalizationMigrator}
+
+  describe "Migrate transactions" do
+    test "Set block_consensus and block_timestamp for not processed transactions" do
+      Enum.each(0..10, fn _x ->
+        transaction =
+          :transaction
+          |> insert()
+          |> with_block(block_timestamp: nil, block_consensus: nil)
+
+        assert %{block_consensus: nil, block_timestamp: nil, block: %{consensus: consensus, timestamp: timestamp}} =
+                 transaction
+
+        assert not is_nil(consensus)
+        assert not is_nil(timestamp)
+      end)
+
+      TransactionsDenormalizationMigrator.start_link([])
+      Process.sleep(100)
+
+      Transaction
+      |> Repo.all()
+      |> Repo.preload(:block)
+      |> Enum.each(fn t ->
+        assert %{
+                 block_consensus: consensus,
+                 block_timestamp: timestamp,
+                 block: %{consensus: consensus, timestamp: timestamp}
+               } = t
+      end)
+    end
+  end
+end
diff --git a/apps/explorer/test/support/factory.ex b/apps/explorer/test/support/factory.ex
index 0ca6f3ee0667..4c218afb3809 100644
--- a/apps/explorer/test/support/factory.ex
+++ b/apps/explorer/test/support/factory.ex
@@ -542,6 +542,8 @@ defmodule Explorer.Factory do
     cumulative_gas_used = collated_params[:cumulative_gas_used] || Enum.random(21_000..100_000)
     gas_used = collated_params[:gas_used] || Enum.random(21_000..100_000)
     status = Keyword.get(collated_params, :status, Enum.random([:ok, :error]))
+    block_timestamp = Keyword.get(collated_params, :block_timestamp, timestamp)
+    block_consensus = Keyword.get(collated_params, :block_consensus, true)
 
     error = (status == :error && collated_params[:error]) || nil
 
@@ -556,8 +558,8 @@ defmodule Explorer.Factory do
       gas_used: gas_used,
       index: next_transaction_index,
       status: status,
-      block_timestamp: timestamp,
-      block_consensus: true
+      block_timestamp: block_timestamp,
+      block_consensus: block_consensus
     })
     |> Repo.update!()
     |> Repo.preload(:block)
diff --git a/cspell.json b/cspell.json
index 78b98a92d718..d19d333d4403 100644
--- a/cspell.json
+++ b/cspell.json
@@ -127,6 +127,8 @@
         "DELEGATECALL",
         "delegators",
         "demonitor",
+        "denormalization",
+        "Denormalization",
         "Denormalized",
         "descr",
         "describedby",

From 7c7639d357acf4e9e6303d9b27b60e1c62a4263e Mon Sep 17 00:00:00 2001
From: Qwerty5Uiop <alex000010@bk.ru>
Date: Mon, 4 Dec 2023 18:59:56 +0600
Subject: [PATCH 846/909] Clear cache in GA

---
 .github/workflows/config.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/config.yml b/.github/workflows/config.yml
index bd487d8c2aa5..30c3fa8c8c8b 100644
--- a/.github/workflows/config.yml
+++ b/.github/workflows/config.yml
@@ -195,7 +195,7 @@ jobs:
         id: dialyzer-cache
         with:
           path: priv/plts
-          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-${{ matrix.chain-type }}-dialyzer-mixlockhash_25-${{ hashFiles('mix.lock') }}
+          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-${{ matrix.chain-type }}-dialyzer-mixlockhash_28-${{ hashFiles('mix.lock') }}
           restore-keys: |
             ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-${{ matrix.chain-type }}-dialyzer-"
 

From 66a1b390544824a199fbb10e7ab5b00931af13f0 Mon Sep 17 00:00:00 2001
From: Qwerty5Uiop <alex000010@bk.ru>
Date: Mon, 4 Dec 2023 21:19:01 +0600
Subject: [PATCH 847/909] Use denormalization in token transfers csv exporter

---
 .../chain/csv_export/address_token_transfer_csv_exporter.ex   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/explorer/lib/explorer/chain/csv_export/address_token_transfer_csv_exporter.ex b/apps/explorer/lib/explorer/chain/csv_export/address_token_transfer_csv_exporter.ex
index 4409d1475eb8..5a44e272a726 100644
--- a/apps/explorer/lib/explorer/chain/csv_export/address_token_transfer_csv_exporter.ex
+++ b/apps/explorer/lib/explorer/chain/csv_export/address_token_transfer_csv_exporter.ex
@@ -12,7 +12,7 @@ defmodule Explorer.Chain.CSVExport.AddressTokenTransferCsvExporter do
     ]
 
   alias Explorer.{Chain, PagingOptions, Repo}
-  alias Explorer.Chain.{Address, Hash, TokenTransfer, Transaction}
+  alias Explorer.Chain.{Address, DenormalizationHelper, Hash, TokenTransfer, Transaction}
   alias Explorer.Chain.CSVExport.Helper
 
   @paging_options %PagingOptions{page_size: Helper.limit(), asc_order: true}
@@ -118,7 +118,7 @@ defmodule Explorer.Chain.CSVExport.AddressTokenTransferCsvExporter do
 
     query
     |> handle_token_transfer_paging_options(paging_options)
-    |> preload(transaction: :block)
+    |> preload(^DenormalizationHelper.extend_transaction_preload([:transaction]))
     |> preload(:token)
     |> Repo.all()
   end

From 27d042fc8fcf1bb25fdbf806465faa1f7a3183e7 Mon Sep 17 00:00:00 2001
From: Qwerty5Uiop <alex000010@bk.ru>
Date: Wed, 6 Dec 2023 13:14:54 +0600
Subject: [PATCH 848/909] Clear cache in GA

---
 .github/workflows/config.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/config.yml b/.github/workflows/config.yml
index 30c3fa8c8c8b..bd487d8c2aa5 100644
--- a/.github/workflows/config.yml
+++ b/.github/workflows/config.yml
@@ -195,7 +195,7 @@ jobs:
         id: dialyzer-cache
         with:
           path: priv/plts
-          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-${{ matrix.chain-type }}-dialyzer-mixlockhash_28-${{ hashFiles('mix.lock') }}
+          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-${{ matrix.chain-type }}-dialyzer-mixlockhash_25-${{ hashFiles('mix.lock') }}
           restore-keys: |
             ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-${{ matrix.chain-type }}-dialyzer-"
 

From 39a8d6094a9ed1b086e7f5045896417aa4574d7d Mon Sep 17 00:00:00 2001
From: Qwerty5Uiop <alex000010@bk.ru>
Date: Tue, 12 Dec 2023 17:05:49 +0600
Subject: [PATCH 849/909] Denormalization improvements

---
 .dialyzer-ignore                              |  2 +-
 .../lib/ethereum_jsonrpc/block.ex             |  4 +-
 .../lib/ethereum_jsonrpc/blocks.ex            | 34 +--------
 .../lib/ethereum_jsonrpc/transaction.ex       | 75 +++++++++++--------
 .../lib/ethereum_jsonrpc/transactions.ex      |  4 +-
 apps/explorer/lib/explorer/chain.ex           | 18 +++--
 ...dress_internal_transaction_csv_exporter.ex |  0
 .../address_token_transfer_csv_exporter.ex    |  0
 .../chain/address_transaction_csv_exporter.ex |  0
 .../explorer/chain/denormalization_helper.ex  |  4 +-
 .../lib/explorer/chain/transaction.ex         |  2 +-
 .../transactions_denormalization_migrator.ex  | 20 +++--
 .../lib/explorer/utility/migration_status.ex  | 31 ++++++++
 ...902_add_consensus_to_transaction_table.exs | 11 ---
 ...d_block_timestamp_to_transaction_table.exs | 11 ---
 ...imestamp_and_consensus_to_transactions.exs | 13 ++++
 ...0231212102127_create_migrations_status.exs | 12 +++
 apps/explorer/test/explorer/chain_test.exs    | 16 +++-
 .../indexer/block/catchup/fetcher_test.exs    |  2 +-
 .../fetcher/internal_transaction_test.exs     |  2 +-
 .../test/indexer/fetcher/uncle_block_test.exs |  2 +-
 config/runtime.exs                            |  4 +
 22 files changed, 153 insertions(+), 114 deletions(-)
 delete mode 100644 apps/explorer/lib/explorer/chain/address_internal_transaction_csv_exporter.ex
 delete mode 100644 apps/explorer/lib/explorer/chain/address_token_transfer_csv_exporter.ex
 delete mode 100644 apps/explorer/lib/explorer/chain/address_transaction_csv_exporter.ex
 create mode 100644 apps/explorer/lib/explorer/utility/migration_status.ex
 delete mode 100644 apps/explorer/priv/repo/migrations/20220315082902_add_consensus_to_transaction_table.exs
 delete mode 100644 apps/explorer/priv/repo/migrations/20220315093927_add_block_timestamp_to_transaction_table.exs
 create mode 100644 apps/explorer/priv/repo/migrations/20231212101547_add_block_timestamp_and_consensus_to_transactions.exs
 create mode 100644 apps/explorer/priv/repo/migrations/20231212102127_create_migrations_status.exs

diff --git a/.dialyzer-ignore b/.dialyzer-ignore
index a4baec92256e..79cfeb45051b 100644
--- a/.dialyzer-ignore
+++ b/.dialyzer-ignore
@@ -23,4 +23,4 @@ lib/indexer/fetcher/zkevm/transaction_batch.ex:156
 lib/indexer/fetcher/zkevm/transaction_batch.ex:252
 lib/block_scout_web/views/api/v2/transaction_view.ex:431
 lib/block_scout_web/views/api/v2/transaction_view.ex:472
-lib/explorer/chain/transaction.ex:167
+lib/explorer/chain/transaction.ex:169
diff --git a/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/block.ex b/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/block.ex
index d07606297ebb..a3a32ddc0c9c 100644
--- a/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/block.ex
+++ b/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/block.ex
@@ -788,8 +788,8 @@ defmodule EthereumJSONRPC.Block do
     {key, timestamp_to_datetime(timestamp)}
   end
 
-  defp entry_to_elixir({"transactions" = key, transactions}, _block) do
-    {key, Transactions.to_elixir(transactions)}
+  defp entry_to_elixir({"transactions" = key, transactions}, %{"timestamp" => block_timestamp}) do
+    {key, Transactions.to_elixir(transactions, timestamp_to_datetime(block_timestamp))}
   end
 
   defp entry_to_elixir({"withdrawals" = key, nil}, _block) do
diff --git a/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/blocks.ex b/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/blocks.ex
index a504468f49ef..d9a697c1acbd 100644
--- a/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/blocks.ex
+++ b/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/blocks.ex
@@ -54,13 +54,12 @@ defmodule EthereumJSONRPC.Blocks do
     transactions_params = Transactions.elixir_to_params(elixir_transactions)
     withdrawals_params = Withdrawals.elixir_to_params(elixir_withdrawals)
     blocks_params = elixir_to_params(elixir_blocks)
-    transactions_params_with_block_timestamp = add_timestamp_to_transactions_params(transactions_params, blocks_params)
 
     %__MODULE__{
       errors: errors,
       blocks_params: blocks_params,
       block_second_degree_relations_params: block_second_degree_relations_params,
-      transactions_params: transactions_params_with_block_timestamp,
+      transactions_params: transactions_params,
       withdrawals_params: withdrawals_params
     }
   end
@@ -455,35 +454,4 @@ defmodule EthereumJSONRPC.Blocks do
   def to_elixir(blocks) when is_list(blocks) do
     Enum.map(blocks, &Block.to_elixir/1)
   end
-
-  defp add_timestamp_to_transactions_params(transactions_params, blocks_params) do
-    block_hashes =
-      transactions_params
-      |> Enum.map(fn %{block_hash: block_hash} -> block_hash end)
-      |> Enum.uniq()
-
-    block_hash_timestamp_map =
-      block_hashes
-      |> Enum.map(fn block_hash ->
-        block =
-          Enum.find(blocks_params, fn block_param ->
-            block_param.hash == block_hash
-          end)
-
-        %{}
-        |> Map.put("#{block_hash}", block.timestamp)
-      end)
-      |> Enum.reduce(%{}, fn hash_timestamp_map_item, acc ->
-        Map.merge(acc, hash_timestamp_map_item)
-      end)
-
-    transactions_params
-    |> Enum.map(fn transactions_param ->
-      Map.put(
-        transactions_param,
-        :block_timestamp,
-        Map.get(block_hash_timestamp_map, "#{transactions_param.block_hash}")
-      )
-    end)
-  end
 end
diff --git a/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/transaction.ex b/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/transaction.ex
index 964dc2ec1f2f..2f11da852095 100644
--- a/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/transaction.ex
+++ b/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/transaction.ex
@@ -237,11 +237,10 @@ defmodule EthereumJSONRPC.Transaction do
         result
       end
 
-    if transaction["creates"] do
-      Map.put(result, :created_contract_address_hash, transaction["creates"])
-    else
-      result
-    end
+    put_if_present(transaction, result, [
+      {"creates", :created_contract_address_hash},
+      {"block_timestamp", :block_timestamp}
+    ])
   end
 
   def elixir_to_params(
@@ -286,11 +285,10 @@ defmodule EthereumJSONRPC.Transaction do
       max_fee_per_gas: max_fee_per_gas
     }
 
-    if transaction["creates"] do
-      Map.put(result, :created_contract_address_hash, transaction["creates"])
-    else
-      result
-    end
+    put_if_present(transaction, result, [
+      {"creates", :created_contract_address_hash},
+      {"block_timestamp", :block_timestamp}
+    ])
   end
 
   # txpool_content method on Erigon node returns tx data
@@ -336,11 +334,10 @@ defmodule EthereumJSONRPC.Transaction do
       max_fee_per_gas: max_fee_per_gas
     }
 
-    if transaction["creates"] do
-      Map.put(result, :created_contract_address_hash, transaction["creates"])
-    else
-      result
-    end
+    put_if_present(transaction, result, [
+      {"creates", :created_contract_address_hash},
+      {"block_timestamp", :block_timestamp}
+    ])
   end
 
   # this is for Suave chain (handles `executionNode` and `requestRecord` fields without EIP-1559 fields)
@@ -407,11 +404,10 @@ defmodule EthereumJSONRPC.Transaction do
         result
       end
 
-    if transaction["creates"] do
-      Map.put(result, :created_contract_address_hash, transaction["creates"])
-    else
-      result
-    end
+    put_if_present(transaction, result, [
+      {"creates", :created_contract_address_hash},
+      {"block_timestamp", :block_timestamp}
+    ])
   end
 
   def elixir_to_params(
@@ -452,11 +448,10 @@ defmodule EthereumJSONRPC.Transaction do
       type: type
     }
 
-    if transaction["creates"] do
-      Map.put(result, :created_contract_address_hash, transaction["creates"])
-    else
-      result
-    end
+    put_if_present(transaction, result, [
+      {"creates", :created_contract_address_hash},
+      {"block_timestamp", :block_timestamp}
+    ])
   end
 
   def elixir_to_params(
@@ -495,11 +490,10 @@ defmodule EthereumJSONRPC.Transaction do
       transaction_index: index
     }
 
-    if transaction["creates"] do
-      Map.put(result, :created_contract_address_hash, transaction["creates"])
-    else
-      result
-    end
+    put_if_present(transaction, result, [
+      {"creates", :created_contract_address_hash},
+      {"block_timestamp", :block_timestamp}
+    ])
   end
 
   @doc """
@@ -580,11 +574,14 @@ defmodule EthereumJSONRPC.Transaction do
     }
 
   """
-  def to_elixir(transaction) when is_map(transaction) do
-    Enum.into(transaction, %{}, &entry_to_elixir/1)
+  def to_elixir(transaction, block_timestamp \\ nil)
+
+  def to_elixir(transaction, block_timestamp) when is_map(transaction) do
+    initial = (block_timestamp && %{"block_timestamp" => block_timestamp}) || %{}
+    Enum.into(transaction, initial, &entry_to_elixir/1)
   end
 
-  def to_elixir(transaction) when is_binary(transaction) do
+  def to_elixir(transaction, _block_timestamp) when is_binary(transaction) do
     nil
   end
 
@@ -658,4 +655,16 @@ defmodule EthereumJSONRPC.Transaction do
   defp entry_to_elixir(_) do
     {nil, nil}
   end
+
+  defp put_if_present(transaction, result, keys) do
+    Enum.reduce(keys, result, fn {from_key, to_key}, acc ->
+      value = transaction[from_key]
+
+      if value do
+        Map.put(acc, to_key, value)
+      else
+        acc
+      end
+    end)
+  end
 end
diff --git a/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/transactions.ex b/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/transactions.ex
index 9b3937873932..ecdf103b4e89 100644
--- a/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/transactions.ex
+++ b/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/transactions.ex
@@ -151,9 +151,9 @@ defmodule EthereumJSONRPC.Transactions do
       ]
 
   """
-  def to_elixir(transactions) when is_list(transactions) do
+  def to_elixir(transactions, block_timestamp \\ nil) when is_list(transactions) do
     transactions
-    |> Enum.map(&Transaction.to_elixir/1)
+    |> Enum.map(&Transaction.to_elixir(&1, block_timestamp))
     |> Enum.filter(&(!is_nil(&1)))
   end
 end
diff --git a/apps/explorer/lib/explorer/chain.ex b/apps/explorer/lib/explorer/chain.ex
index b6d27141d75d..4e0e5ac0c3af 100644
--- a/apps/explorer/lib/explorer/chain.ex
+++ b/apps/explorer/lib/explorer/chain.ex
@@ -539,13 +539,17 @@ defmodule Explorer.Chain do
         )
       end
 
-    query
-    |> Repo.all()
-    |> (&if(Enum.count(&1) > 0,
-          do: &1,
-          else: Enum.zip([block_hashes, for(_ <- 1..Enum.count(block_hashes), do: %Wei{value: Decimal.new(0)})])
-        )).()
-    |> Enum.into(%{})
+    initial_gas_payments =
+      block_hashes
+      |> Enum.map(&{&1, %Wei{value: Decimal.new(0)}})
+      |> Enum.into(%{})
+
+    existing_data =
+      query
+      |> Repo.all()
+      |> Enum.into(%{})
+
+    Map.merge(initial_gas_payments, existing_data)
   end
 
   def timestamp_by_block_hash(block_hashes) when is_list(block_hashes) do
diff --git a/apps/explorer/lib/explorer/chain/address_internal_transaction_csv_exporter.ex b/apps/explorer/lib/explorer/chain/address_internal_transaction_csv_exporter.ex
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/apps/explorer/lib/explorer/chain/address_token_transfer_csv_exporter.ex b/apps/explorer/lib/explorer/chain/address_token_transfer_csv_exporter.ex
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/apps/explorer/lib/explorer/chain/address_transaction_csv_exporter.ex b/apps/explorer/lib/explorer/chain/address_transaction_csv_exporter.ex
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/apps/explorer/lib/explorer/chain/denormalization_helper.ex b/apps/explorer/lib/explorer/chain/denormalization_helper.ex
index 284ccf64a255..79c9d4c51a1e 100644
--- a/apps/explorer/lib/explorer/chain/denormalization_helper.ex
+++ b/apps/explorer/lib/explorer/chain/denormalization_helper.ex
@@ -1,5 +1,7 @@
 defmodule Explorer.Chain.DenormalizationHelper do
-  @moduledoc false
+  @moduledoc """
+  Helper functions for dynamic logic based on denormalization migration completeness
+  """
 
   alias Explorer.Chain.Cache.BackgroundMigrations
 
diff --git a/apps/explorer/lib/explorer/chain/transaction.ex b/apps/explorer/lib/explorer/chain/transaction.ex
index a77700db8e83..10b730d6bcd7 100644
--- a/apps/explorer/lib/explorer/chain/transaction.ex
+++ b/apps/explorer/lib/explorer/chain/transaction.ex
@@ -553,10 +553,10 @@ defmodule Explorer.Chain.Transaction do
     |> unique_constraint(:hash)
   end
 
+  @spec block_timestamp(t()) :: DateTime.t()
   def block_timestamp(%{block_number: nil, inserted_at: time}), do: time
   def block_timestamp(%{block_timestamp: time}) when not is_nil(time), do: time
   def block_timestamp(%{block: %{timestamp: time}}), do: time
-  def block_timestamp(_), do: nil
 
   def preload_token_transfers(query, address_hash) do
     token_transfers_query =
diff --git a/apps/explorer/lib/explorer/transactions_denormalization_migrator.ex b/apps/explorer/lib/explorer/transactions_denormalization_migrator.ex
index 442344819c21..55f927d5afdb 100644
--- a/apps/explorer/lib/explorer/transactions_denormalization_migrator.ex
+++ b/apps/explorer/lib/explorer/transactions_denormalization_migrator.ex
@@ -10,9 +10,10 @@ defmodule Explorer.TransactionsDenormalizationMigrator do
   alias Explorer.Chain.Cache.BackgroundMigrations
   alias Explorer.Chain.Transaction
   alias Explorer.Repo
+  alias Explorer.Utility.MigrationStatus
 
   @default_batch_size 500
-  @default_concurrency 4 * System.schedulers_online()
+  @migration_name "denormalization"
 
   @spec start_link(term()) :: GenServer.on_start()
   def start_link(_) do
@@ -25,8 +26,15 @@ defmodule Explorer.TransactionsDenormalizationMigrator do
 
   @impl true
   def init(_) do
-    schedule_batch_migration()
-    {:ok, %{}}
+    case MigrationStatus.get_status(@migration_name) do
+      "completed" ->
+        :ignore
+
+      _ ->
+        MigrationStatus.set_status(@migration_name, "started")
+        schedule_batch_migration()
+        {:ok, %{}}
+    end
   end
 
   @impl true
@@ -34,6 +42,7 @@ defmodule Explorer.TransactionsDenormalizationMigrator do
     case last_unprocessed_transaction_hashes() do
       [] ->
         BackgroundMigrations.set_denormalization_finished(true)
+        MigrationStatus.set_status(@migration_name, "completed")
         {:stop, :normal, state}
 
       hashes ->
@@ -54,7 +63,6 @@ defmodule Explorer.TransactionsDenormalizationMigrator do
     limit = batch_size() * concurrency()
 
     unprocessed_transactions_query()
-    |> order_by(desc: :inserted_at)
     |> select([t], t.hash)
     |> limit(^limit)
     |> Repo.all()
@@ -86,6 +94,8 @@ defmodule Explorer.TransactionsDenormalizationMigrator do
   end
 
   defp concurrency do
-    Application.get_env(:explorer, __MODULE__)[:batch_size] || @default_concurrency
+    default = 4 * System.schedulers_online()
+
+    Application.get_env(:explorer, __MODULE__)[:concurrency] || default
   end
 end
diff --git a/apps/explorer/lib/explorer/utility/migration_status.ex b/apps/explorer/lib/explorer/utility/migration_status.ex
new file mode 100644
index 000000000000..21ac52de6d88
--- /dev/null
+++ b/apps/explorer/lib/explorer/utility/migration_status.ex
@@ -0,0 +1,31 @@
+defmodule Explorer.Utility.MigrationStatus do
+  @moduledoc """
+  Module is responsible for keeping the current status of background migrations.
+  """
+  use Explorer.Schema
+
+  alias Explorer.Repo
+
+  @primary_key false
+  schema "migrations_status" do
+    field(:migration_name, :string)
+    field(:status, :string)
+
+    timestamps()
+  end
+
+  @doc false
+  def changeset(migration_status \\ %__MODULE__{}, params) do
+    cast(migration_status, params, [:migration_name, :status])
+  end
+
+  def get_status(migration_name) do
+    Repo.one(from(ms in __MODULE__, where: ms.migration_name == ^migration_name, select: ms.status))
+  end
+
+  def set_status(migration_name, status) do
+    %{migration_name: migration_name, status: status}
+    |> changeset()
+    |> Repo.insert(on_conflict: :replace_all, conflict_target: :migration_name)
+  end
+end
diff --git a/apps/explorer/priv/repo/migrations/20220315082902_add_consensus_to_transaction_table.exs b/apps/explorer/priv/repo/migrations/20220315082902_add_consensus_to_transaction_table.exs
deleted file mode 100644
index 8c8bbece0213..000000000000
--- a/apps/explorer/priv/repo/migrations/20220315082902_add_consensus_to_transaction_table.exs
+++ /dev/null
@@ -1,11 +0,0 @@
-defmodule Explorer.Repo.Migrations.AddConsensusToTransactionTable do
-  use Ecto.Migration
-
-  def change do
-    alter table("transactions") do
-      add(:block_consensus, :boolean, default: true)
-    end
-
-    create(index(:transactions, :block_consensus))
-  end
-end
diff --git a/apps/explorer/priv/repo/migrations/20220315093927_add_block_timestamp_to_transaction_table.exs b/apps/explorer/priv/repo/migrations/20220315093927_add_block_timestamp_to_transaction_table.exs
deleted file mode 100644
index 7303c9fce1d0..000000000000
--- a/apps/explorer/priv/repo/migrations/20220315093927_add_block_timestamp_to_transaction_table.exs
+++ /dev/null
@@ -1,11 +0,0 @@
-defmodule Explorer.Repo.Migrations.AddBlockTimestampToTransactionTable do
-  use Ecto.Migration
-
-  def change do
-    alter table("transactions") do
-      add(:block_timestamp, :utc_datetime_usec)
-    end
-
-    create(index(:transactions, :block_timestamp))
-  end
-end
diff --git a/apps/explorer/priv/repo/migrations/20231212101547_add_block_timestamp_and_consensus_to_transactions.exs b/apps/explorer/priv/repo/migrations/20231212101547_add_block_timestamp_and_consensus_to_transactions.exs
new file mode 100644
index 000000000000..458e29604383
--- /dev/null
+++ b/apps/explorer/priv/repo/migrations/20231212101547_add_block_timestamp_and_consensus_to_transactions.exs
@@ -0,0 +1,13 @@
+defmodule Explorer.Repo.Migrations.AddBlockTimestampAndConsensusToTransactions do
+  use Ecto.Migration
+
+  def change do
+    alter table(:transactions) do
+      add_if_not_exists(:block_timestamp, :utc_datetime_usec)
+      add_if_not_exists(:block_consensus, :boolean, default: true)
+    end
+
+    create_if_not_exists(index(:transactions, :block_timestamp))
+    create_if_not_exists(index(:transactions, :block_consensus))
+  end
+end
diff --git a/apps/explorer/priv/repo/migrations/20231212102127_create_migrations_status.exs b/apps/explorer/priv/repo/migrations/20231212102127_create_migrations_status.exs
new file mode 100644
index 000000000000..0b8bf54a5c3b
--- /dev/null
+++ b/apps/explorer/priv/repo/migrations/20231212102127_create_migrations_status.exs
@@ -0,0 +1,12 @@
+defmodule Explorer.Repo.Migrations.CreateMigrationsStatus do
+  use Ecto.Migration
+
+  def change do
+    create table(:migrations_status, primary_key: false) do
+      add(:migration_name, :string, primary_key: true)
+      add(:status, :string)
+
+      timestamps()
+    end
+  end
+end
diff --git a/apps/explorer/test/explorer/chain_test.exs b/apps/explorer/test/explorer/chain_test.exs
index 739e051ac592..2bbbaebcd2d0 100644
--- a/apps/explorer/test/explorer/chain_test.exs
+++ b/apps/explorer/test/explorer/chain_test.exs
@@ -869,7 +869,9 @@ defmodule Explorer.ChainTest do
     test "returns the correct address if it exists" do
       address = insert(:address)
 
-      assert {:ok, _address} = Chain.hash_to_address(address.hash)
+      assert {:ok, address_from_db} = Chain.hash_to_address(address.hash)
+      assert address_from_db.hash == address.hash
+      assert address_from_db.inserted_at == address.inserted_at
     end
 
     test "has_decompiled_code? is true if there are decompiled contracts" do
@@ -918,14 +920,16 @@ defmodule Explorer.ChainTest do
     test "returns an address if it already exists" do
       address = insert(:address)
 
-      assert {:ok, _address} = Chain.find_or_insert_address_from_hash(address.hash)
+      assert {:ok, address_from_db} = Chain.find_or_insert_address_from_hash(address.hash)
+      assert address_from_db.hash == address.hash
+      assert address_from_db.inserted_at == address.inserted_at
     end
 
     test "returns an address if it doesn't exist" do
       hash_str = "0xcbbcd5ac86f9a50e13313633b262e16f695a90c2"
       {:ok, hash} = Chain.string_to_address_hash(hash_str)
 
-      assert {:ok, %Chain.Address{hash: _hash}} = Chain.find_or_insert_address_from_hash(hash)
+      assert {:ok, %Chain.Address{hash: ^hash}} = Chain.find_or_insert_address_from_hash(hash)
     end
   end
 
@@ -3984,7 +3988,11 @@ defmodule Explorer.ChainTest do
 
       assert {:ok, result} = Chain.token_from_address_hash(token.contract_address_hash, options)
 
-      assert result.contract_address.smart_contract
+      assert address.smart_contract.address_hash == result.contract_address.smart_contract.address_hash
+      assert address.smart_contract.contract_code_md5 == result.contract_address.smart_contract.contract_code_md5
+      assert address.smart_contract.abi == result.contract_address.smart_contract.abi
+      assert address.smart_contract.contract_source_code == result.contract_address.smart_contract.contract_source_code
+      assert address.smart_contract.name == result.contract_address.smart_contract.name
     end
   end
 
diff --git a/apps/indexer/test/indexer/block/catchup/fetcher_test.exs b/apps/indexer/test/indexer/block/catchup/fetcher_test.exs
index 4c6c6fdff033..93f687907ca0 100644
--- a/apps/indexer/test/indexer/block/catchup/fetcher_test.exs
+++ b/apps/indexer/test/indexer/block/catchup/fetcher_test.exs
@@ -456,7 +456,7 @@ defmodule Indexer.Block.Catchup.FetcherTest do
       assert count(Chain.Block) == 1
       assert count(Reward) == 0
 
-      assert_receive {:block_numbers, [_block_number]}, 5_000
+      assert_receive {:block_numbers, [^block_number]}, 5_000
     end
 
     test "async fetches beneficiaries when entire call errors out", %{
diff --git a/apps/indexer/test/indexer/fetcher/internal_transaction_test.exs b/apps/indexer/test/indexer/fetcher/internal_transaction_test.exs
index f1f510c8ac9c..e451525869b1 100644
--- a/apps/indexer/test/indexer/fetcher/internal_transaction_test.exs
+++ b/apps/indexer/test/indexer/fetcher/internal_transaction_test.exs
@@ -305,7 +305,7 @@ defmodule Indexer.Fetcher.InternalTransactionTest do
 
       assert {:retry, [block.number]} == InternalTransaction.run([block.number, block.number], json_rpc_named_arguments)
 
-      assert %{block_hash: _block_hash} = Repo.get(PendingBlockOperation, block_hash)
+      assert %{block_hash: ^block_hash} = Repo.get(PendingBlockOperation, block_hash)
     end
 
     test "remove block consensus on foreign_key_violation", %{
diff --git a/apps/indexer/test/indexer/fetcher/uncle_block_test.exs b/apps/indexer/test/indexer/fetcher/uncle_block_test.exs
index d5e27c9d7634..052b4b75f492 100644
--- a/apps/indexer/test/indexer/fetcher/uncle_block_test.exs
+++ b/apps/indexer/test/indexer/fetcher/uncle_block_test.exs
@@ -196,7 +196,7 @@ defmodule Indexer.Fetcher.UncleBlockTest do
          ]}
       end)
 
-      assert {:retry, [_entry]} =
+      assert {:retry, [^entry]} =
                UncleBlock.run(entries, %Block.Fetcher{json_rpc_named_arguments: json_rpc_named_arguments})
     end
   end
diff --git a/config/runtime.exs b/config/runtime.exs
index afcd147129a8..9c710d4ac145 100644
--- a/config/runtime.exs
+++ b/config/runtime.exs
@@ -456,6 +456,10 @@ config :explorer, Explorer.MicroserviceInterfaces.BENS,
   service_url: System.get_env("MICROSERVICE_BENS_URL"),
   enabled: ConfigHelper.parse_bool_env_var("MICROSERVICE_BENS_ENABLED")
 
+config :explorer, Explorer.TransactionsDenormalizationMigrator,
+  batch_size: ConfigHelper.parse_integer_env_var("DENORMALIZATION_MIGRATION_BATCH_SIZE", 500),
+  concurrency: ConfigHelper.parse_integer_env_var("DENORMALIZATION_MIGRATION_CONCURRENCY", 10)
+
 ###############
 ### Indexer ###
 ###############

From efef76742a107e00134155d8a0829684834ee7f7 Mon Sep 17 00:00:00 2001
From: Qwerty5Uiop <alex000010@bk.ru>
Date: Fri, 15 Dec 2023 15:01:15 +0600
Subject: [PATCH 850/909] Denormalization improvements

---
 .dialyzer-ignore                              |   2 +-
 apps/explorer/lib/explorer/chain.ex           |  29 ++-
 .../explorer/chain/cache/gas_price_oracle.ex  | 217 ++++++++++++------
 .../explorer/chain/denormalization_helper.ex  |   4 +
 .../lib/explorer/utility/migration_status.ex  |   1 +
 ...actions_denormalization_migrator_test.exs} |   0
 docker-compose/envs/common-blockscout.env     |   4 +-
 7 files changed, 175 insertions(+), 82 deletions(-)
 rename apps/explorer/test/explorer/{transactions_denormalization_migrator_test.ex => transactions_denormalization_migrator_test.exs} (100%)

diff --git a/.dialyzer-ignore b/.dialyzer-ignore
index 79cfeb45051b..a9bc3a2c503f 100644
--- a/.dialyzer-ignore
+++ b/.dialyzer-ignore
@@ -23,4 +23,4 @@ lib/indexer/fetcher/zkevm/transaction_batch.ex:156
 lib/indexer/fetcher/zkevm/transaction_batch.ex:252
 lib/block_scout_web/views/api/v2/transaction_view.ex:431
 lib/block_scout_web/views/api/v2/transaction_view.ex:472
-lib/explorer/chain/transaction.ex:169
+lib/explorer/chain/transaction.ex:170
diff --git a/apps/explorer/lib/explorer/chain.ex b/apps/explorer/lib/explorer/chain.ex
index 4e0e5ac0c3af..19983d00456a 100644
--- a/apps/explorer/lib/explorer/chain.ex
+++ b/apps/explorer/lib/explorer/chain.ex
@@ -353,15 +353,26 @@ defmodule Explorer.Chain do
     to_block = to_block(options)
 
     base =
-      from(log in Log,
-        order_by: [desc: log.block_number, desc: log.index],
-        where: log.address_hash == ^address_hash,
-        limit: ^paging_options.page_size,
-        select: log,
-        inner_join: block in Block,
-        on: block.hash == log.block_hash,
-        where: block.consensus == true
-      )
+      if DenormalizationHelper.denormalization_finished?() do
+        from(log in Log,
+          order_by: [desc: log.block_number, desc: log.index],
+          where: log.address_hash == ^address_hash,
+          limit: ^paging_options.page_size,
+          select: log,
+          inner_join: transaction in assoc(log, :transaction),
+          where: transaction.block_consensus == true
+        )
+      else
+        from(log in Log,
+          order_by: [desc: log.block_number, desc: log.index],
+          where: log.address_hash == ^address_hash,
+          limit: ^paging_options.page_size,
+          select: log,
+          inner_join: block in Block,
+          on: block.hash == log.block_hash,
+          where: block.consensus == true
+        )
+      end
 
     preloaded_query =
       if csv_export? do
diff --git a/apps/explorer/lib/explorer/chain/cache/gas_price_oracle.ex b/apps/explorer/lib/explorer/chain/cache/gas_price_oracle.ex
index b1d0c10572c9..d6d85c2b42f2 100644
--- a/apps/explorer/lib/explorer/chain/cache/gas_price_oracle.ex
+++ b/apps/explorer/lib/explorer/chain/cache/gas_price_oracle.ex
@@ -14,6 +14,8 @@ defmodule Explorer.Chain.Cache.GasPriceOracle do
 
   alias Explorer.Chain.{
     Block,
+    DenormalizationHelper,
+    Transaction,
     Wei
   }
 
@@ -73,77 +75,150 @@ defmodule Explorer.Chain.Cache.GasPriceOracle do
       end
 
     fee_query =
-      from(
-        block in Block,
-        left_join: transaction in assoc(block, :transactions),
-        where: block.consensus == true,
-        where: transaction.status == ^1,
-        where: transaction.gas_price > ^0,
-        where: transaction.block_number > ^from_block,
-        group_by: transaction.block_number,
-        order_by: [desc: transaction.block_number],
-        select: %{
-          block_number: transaction.block_number,
-          slow_gas_price:
-            fragment(
-              "percentile_disc(? :: real) within group ( order by ? )",
-              ^safelow_percentile_fraction,
-              transaction.gas_price
-            ),
-          average_gas_price:
-            fragment(
-              "percentile_disc(? :: real) within group ( order by ? )",
-              ^average_percentile_fraction,
-              transaction.gas_price
-            ),
-          fast_gas_price:
-            fragment(
-              "percentile_disc(? :: real) within group ( order by ? )",
-              ^fast_percentile_fraction,
-              transaction.gas_price
-            ),
-          slow_priority_fee_per_gas:
-            fragment(
-              "percentile_disc(? :: real) within group ( order by ? )",
-              ^safelow_percentile_fraction,
-              transaction.max_priority_fee_per_gas
-            ),
-          average_priority_fee_per_gas:
-            fragment(
-              "percentile_disc(? :: real) within group ( order by ? )",
-              ^average_percentile_fraction,
-              transaction.max_priority_fee_per_gas
-            ),
-          fast_priority_fee_per_gas:
-            fragment(
-              "percentile_disc(? :: real) within group ( order by ? )",
-              ^fast_percentile_fraction,
-              transaction.max_priority_fee_per_gas
-            ),
-          slow_time:
-            fragment(
-              "percentile_disc(? :: real) within group ( order by coalesce(extract(milliseconds from (?)::interval), ?) desc )",
-              ^safelow_percentile_fraction,
-              block.timestamp - transaction.earliest_processing_start,
-              ^average_block_time
-            ),
-          average_time:
-            fragment(
-              "percentile_disc(? :: real) within group ( order by coalesce(extract(milliseconds from (?)::interval), ?) desc )",
-              ^average_percentile_fraction,
-              block.timestamp - transaction.earliest_processing_start,
-              ^average_block_time
-            ),
-          fast_time:
-            fragment(
-              "percentile_disc(? :: real) within group ( order by coalesce(extract(milliseconds from (?)::interval), ?) desc )",
-              ^fast_percentile_fraction,
-              block.timestamp - transaction.earliest_processing_start,
-              ^average_block_time
-            )
-        },
-        limit: ^num_of_blocks
-      )
+      if DenormalizationHelper.denormalization_finished?() do
+        from(
+          transaction in Transaction,
+          where: transaction.block_consensus == true,
+          where: transaction.status == ^1,
+          where: transaction.gas_price > ^0,
+          where: transaction.block_number > ^from_block,
+          group_by: transaction.block_number,
+          order_by: [desc: transaction.block_number],
+          select: %{
+            block_number: transaction.block_number,
+            slow_gas_price:
+              fragment(
+                "percentile_disc(? :: real) within group ( order by ? )",
+                ^safelow_percentile_fraction,
+                transaction.gas_price
+              ),
+            average_gas_price:
+              fragment(
+                "percentile_disc(? :: real) within group ( order by ? )",
+                ^average_percentile_fraction,
+                transaction.gas_price
+              ),
+            fast_gas_price:
+              fragment(
+                "percentile_disc(? :: real) within group ( order by ? )",
+                ^fast_percentile_fraction,
+                transaction.gas_price
+              ),
+            slow_priority_fee_per_gas:
+              fragment(
+                "percentile_disc(? :: real) within group ( order by ? )",
+                ^safelow_percentile_fraction,
+                transaction.max_priority_fee_per_gas
+              ),
+            average_priority_fee_per_gas:
+              fragment(
+                "percentile_disc(? :: real) within group ( order by ? )",
+                ^average_percentile_fraction,
+                transaction.max_priority_fee_per_gas
+              ),
+            fast_priority_fee_per_gas:
+              fragment(
+                "percentile_disc(? :: real) within group ( order by ? )",
+                ^fast_percentile_fraction,
+                transaction.max_priority_fee_per_gas
+              ),
+            slow_time:
+              fragment(
+                "percentile_disc(? :: real) within group ( order by coalesce(extract(milliseconds from (?)::interval), ?) desc )",
+                ^safelow_percentile_fraction,
+                transaction.block_timestamp - transaction.earliest_processing_start,
+                ^average_block_time
+              ),
+            average_time:
+              fragment(
+                "percentile_disc(? :: real) within group ( order by coalesce(extract(milliseconds from (?)::interval), ?) desc )",
+                ^average_percentile_fraction,
+                transaction.block_timestamp - transaction.earliest_processing_start,
+                ^average_block_time
+              ),
+            fast_time:
+              fragment(
+                "percentile_disc(? :: real) within group ( order by coalesce(extract(milliseconds from (?)::interval), ?) desc )",
+                ^fast_percentile_fraction,
+                transaction.block_timestamp - transaction.earliest_processing_start,
+                ^average_block_time
+              )
+          },
+          limit: ^num_of_blocks
+        )
+      else
+        from(
+          block in Block,
+          left_join: transaction in assoc(block, :transactions),
+          where: block.consensus == true,
+          where: transaction.status == ^1,
+          where: transaction.gas_price > ^0,
+          where: transaction.block_number > ^from_block,
+          group_by: transaction.block_number,
+          order_by: [desc: transaction.block_number],
+          select: %{
+            block_number: transaction.block_number,
+            slow_gas_price:
+              fragment(
+                "percentile_disc(? :: real) within group ( order by ? )",
+                ^safelow_percentile_fraction,
+                transaction.gas_price
+              ),
+            average_gas_price:
+              fragment(
+                "percentile_disc(? :: real) within group ( order by ? )",
+                ^average_percentile_fraction,
+                transaction.gas_price
+              ),
+            fast_gas_price:
+              fragment(
+                "percentile_disc(? :: real) within group ( order by ? )",
+                ^fast_percentile_fraction,
+                transaction.gas_price
+              ),
+            slow_priority_fee_per_gas:
+              fragment(
+                "percentile_disc(? :: real) within group ( order by ? )",
+                ^safelow_percentile_fraction,
+                transaction.max_priority_fee_per_gas
+              ),
+            average_priority_fee_per_gas:
+              fragment(
+                "percentile_disc(? :: real) within group ( order by ? )",
+                ^average_percentile_fraction,
+                transaction.max_priority_fee_per_gas
+              ),
+            fast_priority_fee_per_gas:
+              fragment(
+                "percentile_disc(? :: real) within group ( order by ? )",
+                ^fast_percentile_fraction,
+                transaction.max_priority_fee_per_gas
+              ),
+            slow_time:
+              fragment(
+                "percentile_disc(? :: real) within group ( order by coalesce(extract(milliseconds from (?)::interval), ?) desc )",
+                ^safelow_percentile_fraction,
+                block.timestamp - transaction.earliest_processing_start,
+                ^average_block_time
+              ),
+            average_time:
+              fragment(
+                "percentile_disc(? :: real) within group ( order by coalesce(extract(milliseconds from (?)::interval), ?) desc )",
+                ^average_percentile_fraction,
+                block.timestamp - transaction.earliest_processing_start,
+                ^average_block_time
+              ),
+            fast_time:
+              fragment(
+                "percentile_disc(? :: real) within group ( order by coalesce(extract(milliseconds from (?)::interval), ?) desc )",
+                ^fast_percentile_fraction,
+                block.timestamp - transaction.earliest_processing_start,
+                ^average_block_time
+              )
+          },
+          limit: ^num_of_blocks
+        )
+      end
 
     new_acc = fee_query |> Repo.all(timeout: :infinity) |> merge_gas_prices(acc, num_of_blocks)
 
diff --git a/apps/explorer/lib/explorer/chain/denormalization_helper.ex b/apps/explorer/lib/explorer/chain/denormalization_helper.ex
index 79c9d4c51a1e..0199fc7359e1 100644
--- a/apps/explorer/lib/explorer/chain/denormalization_helper.ex
+++ b/apps/explorer/lib/explorer/chain/denormalization_helper.ex
@@ -5,6 +5,7 @@ defmodule Explorer.Chain.DenormalizationHelper do
 
   alias Explorer.Chain.Cache.BackgroundMigrations
 
+  @spec extend_block_necessity(keyword(), :optional | :required) :: keyword()
   def extend_block_necessity(opts, necessity \\ :optional) do
     if denormalization_finished?() do
       opts
@@ -13,6 +14,7 @@ defmodule Explorer.Chain.DenormalizationHelper do
     end
   end
 
+  @spec extend_transaction_block_necessity(keyword(), :optional | :required) :: keyword()
   def extend_transaction_block_necessity(opts, necessity \\ :optional) do
     if denormalization_finished?() do
       opts
@@ -26,6 +28,7 @@ defmodule Explorer.Chain.DenormalizationHelper do
     end
   end
 
+  @spec extend_transaction_preload(list()) :: list()
   def extend_transaction_preload(preloads) do
     if denormalization_finished?() do
       preloads
@@ -34,6 +37,7 @@ defmodule Explorer.Chain.DenormalizationHelper do
     end
   end
 
+  @spec extend_block_preload(list()) :: list()
   def extend_block_preload(preloads) do
     if denormalization_finished?() do
       preloads
diff --git a/apps/explorer/lib/explorer/utility/migration_status.ex b/apps/explorer/lib/explorer/utility/migration_status.ex
index 21ac52de6d88..62495541bec8 100644
--- a/apps/explorer/lib/explorer/utility/migration_status.ex
+++ b/apps/explorer/lib/explorer/utility/migration_status.ex
@@ -9,6 +9,7 @@ defmodule Explorer.Utility.MigrationStatus do
   @primary_key false
   schema "migrations_status" do
     field(:migration_name, :string)
+    # ["started", "completed"]
     field(:status, :string)
 
     timestamps()
diff --git a/apps/explorer/test/explorer/transactions_denormalization_migrator_test.ex b/apps/explorer/test/explorer/transactions_denormalization_migrator_test.exs
similarity index 100%
rename from apps/explorer/test/explorer/transactions_denormalization_migrator_test.ex
rename to apps/explorer/test/explorer/transactions_denormalization_migrator_test.exs
diff --git a/docker-compose/envs/common-blockscout.env b/docker-compose/envs/common-blockscout.env
index 07a2a8126955..f1743f72265e 100644
--- a/docker-compose/envs/common-blockscout.env
+++ b/docker-compose/envs/common-blockscout.env
@@ -267,4 +267,6 @@ API_V2_ENABLED=true
 # ACCOUNT_PRIVATE_TAGS_LIMIT=2000
 # ACCOUNT_WATCHLIST_ADDRESSES_LIMIT=15
 # MICROSERVICE_BENS_URL=
-# MICROSERVICE_BENS_ENABLED=
\ No newline at end of file
+# MICROSERVICE_BENS_ENABLED=
+# DENORMALIZATION_MIGRATION_BATCH_SIZE=
+# DENORMALIZATION_MIGRATION_CONCURRENCY=

From 5c05a7e0bf846b9ead50fb20c3b7c05953ac1e61 Mon Sep 17 00:00:00 2001
From: Qwerty5Uiop <alex000010@bk.ru>
Date: Mon, 18 Dec 2023 11:29:13 +0600
Subject: [PATCH 851/909] Move denormalization migration modules to a separate
 dir

---
 apps/explorer/config/config.exs                            | 2 +-
 apps/explorer/config/runtime/test.exs                      | 2 +-
 apps/explorer/lib/explorer/application.ex                  | 2 +-
 .../lib/explorer/chain/cache/background_migrations.ex      | 4 ++--
 .../lib/explorer/{utility => migrator}/migration_status.ex | 2 +-
 .../transactions_denormalization.ex}                       | 4 ++--
 .../transactions_denormalization_migrator_test.exs         | 7 ++++---
 config/runtime.exs                                         | 2 +-
 8 files changed, 13 insertions(+), 12 deletions(-)
 rename apps/explorer/lib/explorer/{utility => migrator}/migration_status.ex (94%)
 rename apps/explorer/lib/explorer/{transactions_denormalization_migrator.ex => migrator/transactions_denormalization.ex} (96%)
 rename apps/explorer/test/explorer/{ => migrator}/transactions_denormalization_migrator_test.exs (83%)

diff --git a/apps/explorer/config/config.exs b/apps/explorer/config/config.exs
index 88d38c68a956..1dac8ff0963b 100644
--- a/apps/explorer/config/config.exs
+++ b/apps/explorer/config/config.exs
@@ -113,7 +113,7 @@ config :explorer, Explorer.TokenTransferTokenIdMigration.Supervisor, enabled: tr
 
 config :explorer, Explorer.TokenInstanceOwnerAddressMigration.Supervisor, enabled: true
 
-config :explorer, Explorer.TransactionsDenormalizationMigrator, enabled: true
+config :explorer, Explorer.Migrator.TransactionsDenormalization, enabled: true
 
 config :explorer, Explorer.Chain.Fetcher.CheckBytecodeMatchingOnDemand, enabled: true
 
diff --git a/apps/explorer/config/runtime/test.exs b/apps/explorer/config/runtime/test.exs
index 37ce93b2cb3b..367f4793f27e 100644
--- a/apps/explorer/config/runtime/test.exs
+++ b/apps/explorer/config/runtime/test.exs
@@ -37,7 +37,7 @@ config :explorer, Explorer.TokenTransferTokenIdMigration.Supervisor, enabled: fa
 
 config :explorer, Explorer.TokenInstanceOwnerAddressMigration.Supervisor, enabled: false
 
-config :explorer, Explorer.TransactionsDenormalizationMigrator, enabled: false
+config :explorer, Explorer.Migrator.TransactionsDenormalization, enabled: false
 
 config :explorer,
   realtime_events_sender: Explorer.Chain.Events.SimpleSender
diff --git a/apps/explorer/lib/explorer/application.ex b/apps/explorer/lib/explorer/application.ex
index 497043d143d8..dfed4625c879 100644
--- a/apps/explorer/lib/explorer/application.ex
+++ b/apps/explorer/lib/explorer/application.ex
@@ -128,7 +128,7 @@ defmodule Explorer.Application do
         configure(Explorer.TokenInstanceOwnerAddressMigration.Supervisor),
         sc_microservice_configure(Explorer.Chain.Fetcher.LookUpSmartContractSourcesOnDemand),
         configure(Explorer.Chain.Cache.RootstockLockedBTC),
-        configure(Explorer.TransactionsDenormalizationMigrator)
+        configure(Explorer.Migrator.TransactionsDenormalization)
       ]
       |> List.flatten()
 
diff --git a/apps/explorer/lib/explorer/chain/cache/background_migrations.ex b/apps/explorer/lib/explorer/chain/cache/background_migrations.ex
index 4b33076a9675..5e3b3524573b 100644
--- a/apps/explorer/lib/explorer/chain/cache/background_migrations.ex
+++ b/apps/explorer/lib/explorer/chain/cache/background_migrations.ex
@@ -11,11 +11,11 @@ defmodule Explorer.Chain.Cache.BackgroundMigrations do
 
   @dialyzer :no_match
 
-  alias Explorer.TransactionsDenormalizationMigrator
+  alias Explorer.Migrator.TransactionsDenormalization
 
   defp handle_fallback(:denormalization_finished) do
     Task.start(fn ->
-      set_denormalization_finished(TransactionsDenormalizationMigrator.migration_finished?())
+      set_denormalization_finished(TransactionsDenormalization.migration_finished?())
     end)
 
     {:return, false}
diff --git a/apps/explorer/lib/explorer/utility/migration_status.ex b/apps/explorer/lib/explorer/migrator/migration_status.ex
similarity index 94%
rename from apps/explorer/lib/explorer/utility/migration_status.ex
rename to apps/explorer/lib/explorer/migrator/migration_status.ex
index 62495541bec8..295a606f9632 100644
--- a/apps/explorer/lib/explorer/utility/migration_status.ex
+++ b/apps/explorer/lib/explorer/migrator/migration_status.ex
@@ -1,4 +1,4 @@
-defmodule Explorer.Utility.MigrationStatus do
+defmodule Explorer.Migrator.MigrationStatus do
   @moduledoc """
   Module is responsible for keeping the current status of background migrations.
   """
diff --git a/apps/explorer/lib/explorer/transactions_denormalization_migrator.ex b/apps/explorer/lib/explorer/migrator/transactions_denormalization.ex
similarity index 96%
rename from apps/explorer/lib/explorer/transactions_denormalization_migrator.ex
rename to apps/explorer/lib/explorer/migrator/transactions_denormalization.ex
index 55f927d5afdb..2cdfd374cad7 100644
--- a/apps/explorer/lib/explorer/transactions_denormalization_migrator.ex
+++ b/apps/explorer/lib/explorer/migrator/transactions_denormalization.ex
@@ -1,4 +1,4 @@
-defmodule Explorer.TransactionsDenormalizationMigrator do
+defmodule Explorer.Migrator.TransactionsDenormalization do
   @moduledoc """
   Migrates all transactions to have set block_consensus and block_timestamp
   """
@@ -9,8 +9,8 @@ defmodule Explorer.TransactionsDenormalizationMigrator do
 
   alias Explorer.Chain.Cache.BackgroundMigrations
   alias Explorer.Chain.Transaction
+  alias Explorer.Migrator.MigrationStatus
   alias Explorer.Repo
-  alias Explorer.Utility.MigrationStatus
 
   @default_batch_size 500
   @migration_name "denormalization"
diff --git a/apps/explorer/test/explorer/transactions_denormalization_migrator_test.exs b/apps/explorer/test/explorer/migrator/transactions_denormalization_migrator_test.exs
similarity index 83%
rename from apps/explorer/test/explorer/transactions_denormalization_migrator_test.exs
rename to apps/explorer/test/explorer/migrator/transactions_denormalization_migrator_test.exs
index 12b984837022..8505844a7927 100644
--- a/apps/explorer/test/explorer/transactions_denormalization_migrator_test.exs
+++ b/apps/explorer/test/explorer/migrator/transactions_denormalization_migrator_test.exs
@@ -1,8 +1,9 @@
-defmodule Explorer.TransactionsDenormalizationMigratorTest do
+defmodule Explorer.Migrator.TransactionsDenormalizationTest do
   use Explorer.DataCase, async: false
 
   alias Explorer.Chain.Transaction
-  alias Explorer.{Repo, TransactionsDenormalizationMigrator}
+  alias Explorer.Migrator.TransactionsDenormalization
+  alias Explorer.Repo
 
   describe "Migrate transactions" do
     test "Set block_consensus and block_timestamp for not processed transactions" do
@@ -19,7 +20,7 @@ defmodule Explorer.TransactionsDenormalizationMigratorTest do
         assert not is_nil(timestamp)
       end)
 
-      TransactionsDenormalizationMigrator.start_link([])
+      TransactionsDenormalization.start_link([])
       Process.sleep(100)
 
       Transaction
diff --git a/config/runtime.exs b/config/runtime.exs
index 9c710d4ac145..e8f4de449691 100644
--- a/config/runtime.exs
+++ b/config/runtime.exs
@@ -456,7 +456,7 @@ config :explorer, Explorer.MicroserviceInterfaces.BENS,
   service_url: System.get_env("MICROSERVICE_BENS_URL"),
   enabled: ConfigHelper.parse_bool_env_var("MICROSERVICE_BENS_ENABLED")
 
-config :explorer, Explorer.TransactionsDenormalizationMigrator,
+config :explorer, Explorer.Migrator.TransactionsDenormalization,
   batch_size: ConfigHelper.parse_integer_env_var("DENORMALIZATION_MIGRATION_BATCH_SIZE", 500),
   concurrency: ConfigHelper.parse_integer_env_var("DENORMALIZATION_MIGRATION_CONCURRENCY", 10)
 

From 62eb8da2d316eba3a9cdba0c57b247da22f5fe3f Mon Sep 17 00:00:00 2001
From: Qwerty5Uiop <alex000010@bk.ru>
Date: Mon, 18 Dec 2023 14:38:15 +0600
Subject: [PATCH 852/909] Fix migration status upsert

---
 apps/explorer/lib/explorer/migrator/migration_status.ex | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/explorer/lib/explorer/migrator/migration_status.ex b/apps/explorer/lib/explorer/migrator/migration_status.ex
index 295a606f9632..01a7bbd54084 100644
--- a/apps/explorer/lib/explorer/migrator/migration_status.ex
+++ b/apps/explorer/lib/explorer/migrator/migration_status.ex
@@ -27,6 +27,6 @@ defmodule Explorer.Migrator.MigrationStatus do
   def set_status(migration_name, status) do
     %{migration_name: migration_name, status: status}
     |> changeset()
-    |> Repo.insert(on_conflict: :replace_all, conflict_target: :migration_name)
+    |> Repo.insert(on_conflict: {:replace_all_except, [:inserted_at]}, conflict_target: :migration_name)
   end
 end

From e52c187ff334c4ed3fa458e3f48b7d9e543b3c28 Mon Sep 17 00:00:00 2001
From: Qwerty5Uiop <alex000010@bk.ru>
Date: Mon, 18 Dec 2023 17:36:31 +0600
Subject: [PATCH 853/909] Set timeout: :infinity for denaromalization migration

---
 .../lib/explorer/migrator/transactions_denormalization.ex       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/explorer/lib/explorer/migrator/transactions_denormalization.ex b/apps/explorer/lib/explorer/migrator/transactions_denormalization.ex
index 2cdfd374cad7..166d7f834001 100644
--- a/apps/explorer/lib/explorer/migrator/transactions_denormalization.ex
+++ b/apps/explorer/lib/explorer/migrator/transactions_denormalization.ex
@@ -65,7 +65,7 @@ defmodule Explorer.Migrator.TransactionsDenormalization do
     unprocessed_transactions_query()
     |> select([t], t.hash)
     |> limit(^limit)
-    |> Repo.all()
+    |> Repo.all(timeout: :infinity)
   end
 
   defp unprocessed_transactions_query do

From ed1f2479d3a7f67f7a0c10eddf25e137b02ceae6 Mon Sep 17 00:00:00 2001
From: Viktor Baranov <baranov.viktor.27@gmail.com>
Date: Thu, 21 Dec 2023 15:56:49 +0300
Subject: [PATCH 854/909] Update CHANGELOG entry

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d07488b208e1..dbc203b9dcde 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,6 +11,7 @@
 - [#9009](https://github.com/blockscout/blockscout/pull/9009) - Index for block refetch_needed
 - [#9006](https://github.com/blockscout/blockscout/pull/9006) - Drop unused indexes on address_current_token_balances table
 - [#8996](https://github.com/blockscout/blockscout/pull/8996) - Refine token transfers token ids index
+- [#5322](https://github.com/blockscout/blockscout/pull/5322) - DB denormalization: block consensus and timestamp in transaction table
 
 ## Current
 
@@ -101,7 +102,6 @@
 
 - [#8956](https://github.com/blockscout/blockscout/pull/8956) - Refine docker-compose config structure
 - [#8911](https://github.com/blockscout/blockscout/pull/8911) - Set client_connection_check_interval for main Postgres DB in docker-compose setup
-- [#5322](https://github.com/blockscout/blockscout/pull/5322) - DB denormalization: block consensus and timestamp in transaction table
 
 <details>
   <summary>Dependencies version bumps</summary>

From 4df5df71fa9968823a6acb0ac5617b20b547c679 Mon Sep 17 00:00:00 2001
From: Victor Baranov <baranov.viktor.27@gmail.com>
Date: Thu, 21 Dec 2023 17:02:16 +0300
Subject: [PATCH 855/909] Change log topic type in the DB to bytea (#9000)

* Change log topic type

* Process review comment

* Update apps/explorer/lib/explorer/chain/token_transfer.ex

Co-authored-by: Maxim Filonov <53992153+sl1depengwyn@users.noreply.github.com>

* Accept a new log type by TransactionAction and PolygonEdge modules

* mix format

* Fix merging conflicts

* Update CHANGE LOG entry

---------

Co-authored-by: Maxim Filonov <53992153+sl1depengwyn@users.noreply.github.com>
Co-authored-by: POA <33550681+poa@users.noreply.github.com>
---
 .dialyzer-ignore                              |   8 +-
 CHANGELOG.md                                  |   1 +
 .../channels/websocket_v2_test.exs            |  26 ++--
 .../api/rpc/eth_controller_test.exs           |  68 +++++++---
 .../api/rpc/logs_controller_test.exs          |  59 ++++++---
 .../api/rpc/transaction_controller_test.exs   |  18 ++-
 .../api/v2/address_controller_test.exs        |  10 +-
 .../api/v2/transaction_controller_test.exs    |  11 +-
 apps/explorer/lib/explorer/chain.ex           |  26 ----
 apps/explorer/lib/explorer/chain/log.ex       |  33 +++--
 .../lib/explorer/chain/token_transfer.ex      |  29 +++-
 ...213152332_alter_log_topic_columns_type.exs |  18 +++
 .../address_log_csv_exporter_test.exs         |  18 ++-
 .../test/explorer/chain/import_test.exs       |  22 ++-
 .../explorer/test/explorer/chain/log_test.exs |  30 +++--
 .../explorer/chain/smart_contract_test.exs    |   3 +-
 .../explorer/chain/token_transfer_test.exs    |  24 ++++
 apps/explorer/test/explorer/chain_test.exs    |  62 ++++-----
 .../test/explorer/etherscan/logs_test.exs     | 125 ++++++++++--------
 .../fetcher/polygon_edge/deposit_execute.ex   |   8 +-
 .../fetcher/polygon_edge/withdrawal.ex        |   8 +-
 apps/indexer/lib/indexer/helper.ex            |   9 ++
 .../temporary/uncataloged_token_transfers.ex  |   4 +-
 .../indexer/transform/transaction_actions.ex  |  40 ++++--
 24 files changed, 436 insertions(+), 224 deletions(-)
 create mode 100644 apps/explorer/priv/repo/migrations/20231213152332_alter_log_topic_columns_type.exs

diff --git a/.dialyzer-ignore b/.dialyzer-ignore
index a9bc3a2c503f..ba3b24756c02 100644
--- a/.dialyzer-ignore
+++ b/.dialyzer-ignore
@@ -14,10 +14,10 @@ lib/phoenix/router.ex:324
 lib/phoenix/router.ex:402
 lib/explorer/smart_contract/reader.ex:435
 lib/indexer/fetcher/polygon_edge.ex:737
-lib/indexer/fetcher/polygon_edge/deposit_execute.ex:140
-lib/indexer/fetcher/polygon_edge/deposit_execute.ex:184
-lib/indexer/fetcher/polygon_edge/withdrawal.ex:160
-lib/indexer/fetcher/polygon_edge/withdrawal.ex:204
+lib/indexer/fetcher/polygon_edge/deposit_execute.ex:146
+lib/indexer/fetcher/polygon_edge/deposit_execute.ex:190
+lib/indexer/fetcher/polygon_edge/withdrawal.ex:166
+lib/indexer/fetcher/polygon_edge/withdrawal.ex:210
 lib/indexer/fetcher/zkevm/transaction_batch.ex:116
 lib/indexer/fetcher/zkevm/transaction_batch.ex:156
 lib/indexer/fetcher/zkevm/transaction_batch.ex:252
diff --git a/CHANGELOG.md b/CHANGELOG.md
index dbc203b9dcde..f852bfdf7744 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,6 +10,7 @@
 
 - [#9009](https://github.com/blockscout/blockscout/pull/9009) - Index for block refetch_needed
 - [#9006](https://github.com/blockscout/blockscout/pull/9006) - Drop unused indexes on address_current_token_balances table
+- [#9000](https://github.com/blockscout/blockscout/pull/9000) - Change log topic type in the DB to bytea
 - [#8996](https://github.com/blockscout/blockscout/pull/8996) - Refine token transfers token ids index
 - [#5322](https://github.com/blockscout/blockscout/pull/5322) - DB denormalization: block consensus and timestamp in transaction table
 
diff --git a/apps/block_scout_web/test/block_scout_web/channels/websocket_v2_test.exs b/apps/block_scout_web/test/block_scout_web/channels/websocket_v2_test.exs
index bfb0424424f0..2e06c53dbdc6 100644
--- a/apps/block_scout_web/test/block_scout_web/channels/websocket_v2_test.exs
+++ b/apps/block_scout_web/test/block_scout_web/channels/websocket_v2_test.exs
@@ -6,7 +6,15 @@ defmodule BlockScoutWeb.WebsocketV2Test do
   alias Explorer.Chain.{Address, Import, Token, TokenTransfer, Transaction}
   alias Explorer.Repo
 
+  @first_topic_hex_string "0xddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef"
+  @second_topic_hex_string "0x000000000000000000000000e8ddc5c7a2d2f0d7a9798459c0104fdf5e987aca"
+  @third_topic_hex_string "0x000000000000000000000000515c09c5bba1ed566b02a5b0599ec5d5d0aee73d"
+
   describe "websocket v2" do
+    {:ok, first_topic} = Explorer.Chain.Hash.Full.cast(@first_topic_hex_string)
+    {:ok, second_topic} = Explorer.Chain.Hash.Full.cast(@second_topic_hex_string)
+    {:ok, third_topic} = Explorer.Chain.Hash.Full.cast(@third_topic_hex_string)
+
     @import_data %{
       blocks: %{
         params: [
@@ -34,9 +42,9 @@ defmodule BlockScoutWeb.WebsocketV2Test do
             block_hash: "0xf6b4b8c88df3ebd252ec476328334dc026cf66606a84fb769b3d3cbccc8471bd",
             address_hash: "0x8bf38d4764929064f2d4d3a56520a76ab3df415b",
             data: "0x0000000000000000000000000000000000000000000000000de0b6b3a7640000",
-            first_topic: "0xddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef",
-            second_topic: "0x000000000000000000000000e8ddc5c7a2d2f0d7a9798459c0104fdf5e987aca",
-            third_topic: "0x000000000000000000000000515c09c5bba1ed566b02a5b0599ec5d5d0aee73d",
+            first_topic: first_topic,
+            second_topic: second_topic,
+            third_topic: third_topic,
             fourth_topic: nil,
             index: 0,
             transaction_hash: "0x53bd884872de3e488692881baeec262e7b95234d3965248c39fe992fffd433e5",
@@ -46,9 +54,9 @@ defmodule BlockScoutWeb.WebsocketV2Test do
             block_hash: "0xf6b4b8c88df3ebd252ec476328334dc026cf66606a84fb769b3d3cbccc8471bd",
             address_hash: "0x8bf38d4764929064f2d4d3a56520a76ab3df415b",
             data: "0x0000000000000000000000000000000000000000000000000de0b6b3a7640000",
-            first_topic: "0xddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef",
-            second_topic: "0x000000000000000000000000e8ddc5c7a2d2f0d7a9798459c0104fdf5e987aca",
-            third_topic: "0x000000000000000000000000515c09c5bba1ed566b02a5b0599ec5d5d0aee73d",
+            first_topic: first_topic,
+            second_topic: second_topic,
+            third_topic: third_topic,
             fourth_topic: nil,
             index: 1,
             transaction_hash: "0x53bd884872de3e488692881baeec262e7b95234d3965248c39fe992fffd433e5",
@@ -58,9 +66,9 @@ defmodule BlockScoutWeb.WebsocketV2Test do
             block_hash: "0xf6b4b8c88df3ebd252ec476328334dc026cf66606a84fb769b3d3cbccc8471bd",
             address_hash: "0x8bf38d4764929064f2d4d3a56520a76ab3df415b",
             data: "0x0000000000000000000000000000000000000000000000000de0b6b3a7640000",
-            first_topic: "0xddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef",
-            second_topic: "0x000000000000000000000000e8ddc5c7a2d2f0d7a9798459c0104fdf5e987aca",
-            third_topic: "0x000000000000000000000000515c09c5bba1ed566b02a5b0599ec5d5d0aee73d",
+            first_topic: first_topic,
+            second_topic: second_topic,
+            third_topic: third_topic,
             fourth_topic: nil,
             index: 2,
             transaction_hash: "0x53bd884872de3e488692881baeec262e7b95234d3965248c39fe992fffd433e5",
diff --git a/apps/block_scout_web/test/block_scout_web/controllers/api/rpc/eth_controller_test.exs b/apps/block_scout_web/test/block_scout_web/controllers/api/rpc/eth_controller_test.exs
index 4b68122fd25b..b77a23a39a30 100644
--- a/apps/block_scout_web/test/block_scout_web/controllers/api/rpc/eth_controller_test.exs
+++ b/apps/block_scout_web/test/block_scout_web/controllers/api/rpc/eth_controller_test.exs
@@ -5,6 +5,12 @@ defmodule BlockScoutWeb.API.RPC.EthControllerTest do
   alias Explorer.Repo
   alias Indexer.Fetcher.CoinBalanceOnDemand
 
+  @first_topic_hex_string_1 "0x7fcf532c15f0a6db0bd6d0e038bea71d30d808c7d98cb3bf7268a95bf5081b65"
+  @first_topic_hex_string_2 "0xddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef"
+
+  @second_topic_hex_string_1 "0x00000000000000000000000098a9dc37d3650b5b30d6c12789b3881ee0b70c16"
+  @second_topic_hex_string_2 "0x000000000000000000000000e2680fd7cdbb04e9087a647ad4d023ef6c8fb4e2"
+
   setup do
     mocked_json_rpc_named_arguments = [
       transport: EthereumJSONRPC.Mox,
@@ -27,6 +33,11 @@ defmodule BlockScoutWeb.API.RPC.EthControllerTest do
 
   defp params(api_params, params), do: Map.put(api_params, "params", params)
 
+  defp topic(topic_hex_string) do
+    {:ok, topic} = Explorer.Chain.Hash.Full.cast(topic_hex_string)
+    topic
+  end
+
   describe "eth_get_logs" do
     setup do
       %{
@@ -108,10 +119,10 @@ defmodule BlockScoutWeb.API.RPC.EthControllerTest do
         address: address,
         transaction: transaction,
         data: "0x010101",
-        first_topic: "0x01"
+        first_topic: topic(@first_topic_hex_string_1)
       )
 
-      params = params(api_params, [%{"address" => to_string(address.hash), "topics" => ["0x01"]}])
+      params = params(api_params, [%{"address" => to_string(address.hash), "topics" => [@first_topic_hex_string_1]}])
 
       assert response =
                conn
@@ -134,7 +145,7 @@ defmodule BlockScoutWeb.API.RPC.EthControllerTest do
         block_number: block.number,
         transaction: transaction,
         data: "0x010101",
-        first_topic: "0x01"
+        first_topic: topic(@first_topic_hex_string_1)
       )
 
       insert(:log,
@@ -143,10 +154,13 @@ defmodule BlockScoutWeb.API.RPC.EthControllerTest do
         block_number: block.number,
         transaction: transaction,
         data: "0x020202",
-        first_topic: "0x00"
+        first_topic: topic(@first_topic_hex_string_2)
       )
 
-      params = params(api_params, [%{"address" => to_string(address.hash), "topics" => [["0x01", "0x00"]]}])
+      params =
+        params(api_params, [
+          %{"address" => to_string(address.hash), "topics" => [[@first_topic_hex_string_1, @first_topic_hex_string_2]]}
+        ])
 
       assert response =
                conn
@@ -171,10 +185,11 @@ defmodule BlockScoutWeb.API.RPC.EthControllerTest do
           block_number: block.number,
           address: contract_address,
           transaction: transaction,
-          first_topic: "0x01"
+          first_topic: topic(@first_topic_hex_string_1)
         )
 
-      params = params(api_params, [%{"address" => to_string(contract_address), "topics" => [["0x01"]]}])
+      params =
+        params(api_params, [%{"address" => to_string(contract_address), "topics" => [[@first_topic_hex_string_1]]}])
 
       assert response =
                conn
@@ -192,7 +207,11 @@ defmodule BlockScoutWeb.API.RPC.EthControllerTest do
 
       new_params =
         params(api_params, [
-          %{"paging_options" => next_page_params, "address" => to_string(contract_address), "topics" => [["0x01"]]}
+          %{
+            "paging_options" => next_page_params,
+            "address" => to_string(contract_address),
+            "topics" => [[@first_topic_hex_string_1]]
+          }
         ])
 
       assert new_response =
@@ -227,15 +246,24 @@ defmodule BlockScoutWeb.API.RPC.EthControllerTest do
         address: address,
         transaction: transaction,
         data: "0x010101",
-        first_topic: "0x01",
-        second_topic: "0x02",
+        first_topic: topic(@first_topic_hex_string_1),
+        second_topic: topic(@second_topic_hex_string_1),
         block: block,
         block_number: block.number
       )
 
-      insert(:log, block: block, address: address, transaction: transaction, data: "0x020202", first_topic: "0x01")
+      insert(:log,
+        block: block,
+        address: address,
+        transaction: transaction,
+        data: "0x020202",
+        first_topic: topic(@first_topic_hex_string_1)
+      )
 
-      params = params(api_params, [%{"address" => to_string(address.hash), "topics" => ["0x01", "0x02"]}])
+      params =
+        params(api_params, [
+          %{"address" => to_string(address.hash), "topics" => [@first_topic_hex_string_1, @second_topic_hex_string_1]}
+        ])
 
       assert response =
                conn
@@ -257,8 +285,8 @@ defmodule BlockScoutWeb.API.RPC.EthControllerTest do
         address: address,
         transaction: transaction,
         data: "0x010101",
-        first_topic: "0x01",
-        second_topic: "0x02",
+        first_topic: topic(@first_topic_hex_string_1),
+        second_topic: topic(@second_topic_hex_string_1),
         block: block,
         block_number: block.number
       )
@@ -267,13 +295,19 @@ defmodule BlockScoutWeb.API.RPC.EthControllerTest do
         address: address,
         transaction: transaction,
         data: "0x020202",
-        first_topic: "0x01",
-        second_topic: "0x03",
+        first_topic: topic(@first_topic_hex_string_1),
+        second_topic: topic(@second_topic_hex_string_2),
         block: block,
         block_number: block.number
       )
 
-      params = params(api_params, [%{"address" => to_string(address.hash), "topics" => ["0x01", ["0x02", "0x03"]]}])
+      params =
+        params(api_params, [
+          %{
+            "address" => to_string(address.hash),
+            "topics" => [@first_topic_hex_string_1, [@second_topic_hex_string_1, @second_topic_hex_string_2]]
+          }
+        ])
 
       assert response =
                conn
diff --git a/apps/block_scout_web/test/block_scout_web/controllers/api/rpc/logs_controller_test.exs b/apps/block_scout_web/test/block_scout_web/controllers/api/rpc/logs_controller_test.exs
index 66fc27dc71db..2691f1e7e825 100644
--- a/apps/block_scout_web/test/block_scout_web/controllers/api/rpc/logs_controller_test.exs
+++ b/apps/block_scout_web/test/block_scout_web/controllers/api/rpc/logs_controller_test.exs
@@ -4,6 +4,22 @@ defmodule BlockScoutWeb.API.RPC.LogsControllerTest do
   alias BlockScoutWeb.API.RPC.LogsController
   alias Explorer.Chain.{Log, Transaction}
 
+  @first_topic_hex_string_1 "0x7fcf532c15f0a6db0bd6d0e038bea71d30d808c7d98cb3bf7268a95bf5081b65"
+  @first_topic_hex_string_2 "0xddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef"
+
+  @second_topic_hex_string_1 "0x00000000000000000000000098a9dc37d3650b5b30d6c12789b3881ee0b70c16"
+  @second_topic_hex_string_2 "0x000000000000000000000000e2680fd7cdbb04e9087a647ad4d023ef6c8fb4e2"
+
+  @third_topic_hex_string_1 "0x0000000000000000000000005079fc00f00f30000e0c8c083801cfde000008b6"
+
+  @fourth_topic_hex_string_1 "0x8c9b7729443a4444242342b2ca385a239a5c1d76a88473e1cd2ab0c70dd1b9c7"
+  @fourth_topic_hex_string_2 "0x232b688786cc0d24a11e07563c1bfa129537cec9385dc5b1fb8f86462977239b"
+
+  defp topic(topic_hex_string) do
+    {:ok, topic} = Explorer.Chain.Hash.Full.cast(topic_hex_string)
+    topic
+  end
+
   describe "getLogs" do
     test "without fromBlock, toBlock, address, and topic{x}", %{conn: conn} do
       params = %{
@@ -434,13 +450,13 @@ defmodule BlockScoutWeb.API.RPC.LogsControllerTest do
       log1_details = [
         address: contract_address,
         transaction: transaction,
-        first_topic: "some topic"
+        first_topic: topic(@first_topic_hex_string_1)
       ]
 
       log2_details = [
         address: contract_address,
         transaction: transaction,
-        first_topic: "some other topic"
+        first_topic: topic(@first_topic_hex_string_2)
       ]
 
       log1 = insert(:log, log1_details)
@@ -492,15 +508,15 @@ defmodule BlockScoutWeb.API.RPC.LogsControllerTest do
       log1_details = [
         address: contract_address,
         transaction: transaction,
-        first_topic: "some topic",
-        second_topic: "some second topic"
+        first_topic: topic(@first_topic_hex_string_1),
+        second_topic: topic(@second_topic_hex_string_1)
       ]
 
       log2_details = [
         address: contract_address,
         transaction: transaction,
-        first_topic: "some other topic",
-        second_topic: "some other second topic"
+        first_topic: topic(@first_topic_hex_string_2),
+        second_topic: topic(@second_topic_hex_string_2)
       ]
 
       log1 = insert(:log, log1_details)
@@ -541,15 +557,15 @@ defmodule BlockScoutWeb.API.RPC.LogsControllerTest do
       log1_details = [
         address: contract_address,
         transaction: transaction,
-        first_topic: "some topic",
-        second_topic: "some second topic"
+        first_topic: topic(@first_topic_hex_string_1),
+        second_topic: topic(@second_topic_hex_string_1)
       ]
 
       log2_details = [
         address: contract_address,
         transaction: transaction,
-        first_topic: "some other topic",
-        second_topic: "some other second topic"
+        first_topic: topic(@first_topic_hex_string_2),
+        second_topic: topic(@second_topic_hex_string_2)
       ]
 
       log1 = insert(:log, log1_details)
@@ -589,19 +605,19 @@ defmodule BlockScoutWeb.API.RPC.LogsControllerTest do
       log1_details = [
         address: contract_address,
         transaction: transaction,
-        first_topic: "some topic",
-        second_topic: "some second topic",
-        third_topic: "some third topic",
-        fourth_topic: "some fourth topic"
+        first_topic: topic(@first_topic_hex_string_1),
+        second_topic: topic(@second_topic_hex_string_1),
+        third_topic: topic(@third_topic_hex_string_1),
+        fourth_topic: topic(@fourth_topic_hex_string_1)
       ]
 
       log2_details = [
         address: contract_address,
         transaction: transaction,
-        first_topic: "some topic",
-        second_topic: "some second topic",
-        third_topic: "some third topic",
-        fourth_topic: "some other fourth topic"
+        first_topic: topic(@first_topic_hex_string_1),
+        second_topic: topic(@second_topic_hex_string_1),
+        third_topic: topic(@third_topic_hex_string_1),
+        fourth_topic: topic(@fourth_topic_hex_string_2)
       ]
 
       log1 = insert(:log, log1_details)
@@ -791,7 +807,12 @@ defmodule BlockScoutWeb.API.RPC.LogsControllerTest do
          third_topic: third_topic,
          fourth_topic: fourth_topic
        }) do
-    [first_topic, second_topic, third_topic, fourth_topic]
+    [
+      first_topic && Explorer.Chain.Hash.to_string(first_topic),
+      second_topic && Explorer.Chain.Hash.to_string(second_topic),
+      third_topic && Explorer.Chain.Hash.to_string(third_topic),
+      fourth_topic && Explorer.Chain.Hash.to_string(fourth_topic)
+    ]
   end
 
   defp integer_to_hex(integer), do: "0x" <> String.downcase(Integer.to_string(integer, 16))
diff --git a/apps/block_scout_web/test/block_scout_web/controllers/api/rpc/transaction_controller_test.exs b/apps/block_scout_web/test/block_scout_web/controllers/api/rpc/transaction_controller_test.exs
index 4a828099ce6e..8e30a3e68046 100644
--- a/apps/block_scout_web/test/block_scout_web/controllers/api/rpc/transaction_controller_test.exs
+++ b/apps/block_scout_web/test/block_scout_web/controllers/api/rpc/transaction_controller_test.exs
@@ -5,8 +5,16 @@ defmodule BlockScoutWeb.API.RPC.TransactionControllerTest do
 
   @moduletag capture_log: true
 
+  @first_topic_hex_string_1 "0x7fcf532c15f0a6db0bd6d0e038bea71d30d808c7d98cb3bf7268a95bf5081b65"
+  @second_topic_hex_string_1 "0x00000000000000000000000098a9dc37d3650b5b30d6c12789b3881ee0b70c16"
+
   setup :verify_on_exit!
 
+  defp topic(topic_hex_string) do
+    {:ok, topic} = Explorer.Chain.Hash.Full.cast(topic_hex_string)
+    topic
+  end
+
   describe "gettxreceiptstatus" do
     test "with missing txhash", %{conn: conn} do
       params = %{
@@ -414,8 +422,8 @@ defmodule BlockScoutWeb.API.RPC.TransactionControllerTest do
         insert(:log,
           address: address,
           transaction: transaction,
-          first_topic: "first topic",
-          second_topic: "second topic",
+          first_topic: topic(@first_topic_hex_string_1),
+          second_topic: topic(@second_topic_hex_string_1),
           block: block,
           block_number: block.number
         )
@@ -491,8 +499,8 @@ defmodule BlockScoutWeb.API.RPC.TransactionControllerTest do
         insert(:log,
           address: address,
           transaction: transaction,
-          first_topic: "first topic",
-          second_topic: "second topic",
+          first_topic: topic(@first_topic_hex_string_1),
+          second_topic: topic(@second_topic_hex_string_1),
           block: block,
           block_number: block.number
         )
@@ -520,7 +528,7 @@ defmodule BlockScoutWeb.API.RPC.TransactionControllerTest do
           %{
             "address" => "#{address.hash}",
             "data" => "#{log.data}",
-            "topics" => ["first topic", "second topic", nil, nil],
+            "topics" => [@first_topic_hex_string_1, @second_topic_hex_string_1, nil, nil],
             "index" => "#{log.index}"
           }
         ],
diff --git a/apps/block_scout_web/test/block_scout_web/controllers/api/v2/address_controller_test.exs b/apps/block_scout_web/test/block_scout_web/controllers/api/v2/address_controller_test.exs
index d3749c1628af..34829785f55e 100644
--- a/apps/block_scout_web/test/block_scout_web/controllers/api/v2/address_controller_test.exs
+++ b/apps/block_scout_web/test/block_scout_web/controllers/api/v2/address_controller_test.exs
@@ -26,12 +26,18 @@ defmodule BlockScoutWeb.API.V2.AddressControllerTest do
   import Explorer.Chain, only: [hash_to_lower_case_string: 1]
   import Mox
 
+  @first_topic_hex_string_1 "0x7fcf532c15f0a6db0bd6d0e038bea71d30d808c7d98cb3bf7268a95bf5081b65"
   @instances_amount_in_collection 9
 
   setup :set_mox_global
 
   setup :verify_on_exit!
 
+  defp topic(topic_hex_string) do
+    {:ok, topic} = Explorer.Chain.Hash.Full.cast(topic_hex_string)
+    topic
+  end
+
   describe "/addresses/{address_hash}" do
     test "get 404 on non existing address", %{conn: conn} do
       address = build(:address)
@@ -1761,10 +1767,10 @@ defmodule BlockScoutWeb.API.V2.AddressControllerTest do
           block: tx.block,
           block_number: tx.block_number,
           address: address,
-          first_topic: "0x123456789123456789"
+          first_topic: topic(@first_topic_hex_string_1)
         )
 
-      request = get(conn, "/api/v2/addresses/#{address.hash}/logs?topic=0x123456789123456789")
+      request = get(conn, "/api/v2/addresses/#{address.hash}/logs?topic=#{@first_topic_hex_string_1}")
       assert response = json_response(request, 200)
       assert Enum.count(response["items"]) == 1
       assert response["next_page_params"] == nil
diff --git a/apps/block_scout_web/test/block_scout_web/controllers/api/v2/transaction_controller_test.exs b/apps/block_scout_web/test/block_scout_web/controllers/api/v2/transaction_controller_test.exs
index ede7f16822d1..9fdad1782da8 100644
--- a/apps/block_scout_web/test/block_scout_web/controllers/api/v2/transaction_controller_test.exs
+++ b/apps/block_scout_web/test/block_scout_web/controllers/api/v2/transaction_controller_test.exs
@@ -8,6 +8,13 @@ defmodule BlockScoutWeb.API.V2.TransactionControllerTest do
   alias Explorer.Chain.{Address, InternalTransaction, Log, Token, TokenTransfer, Transaction}
   alias Explorer.Repo
 
+  @first_topic_hex_string_1 "0x99e7b0ba56da2819c37c047f0511fd2bf6c9b4e27b4a979a19d6da0f74be8155"
+
+  defp topic(topic_hex_string) do
+    {:ok, topic} = Explorer.Chain.Hash.Full.cast(topic_hex_string)
+    topic
+  end
+
   setup do
     Supervisor.terminate_child(Explorer.Supervisor, Explorer.Chain.Cache.TransactionsApiV2.child_id())
     Supervisor.restart_child(Explorer.Supervisor, Explorer.Chain.Cache.TransactionsApiV2.child_id())
@@ -976,7 +983,7 @@ defmodule BlockScoutWeb.API.V2.TransactionControllerTest do
           index: 1,
           block: tx.block,
           block_number: tx.block_number,
-          first_topic: "0x99e7b0ba56da2819c37c047f0511fd2bf6c9b4e27b4a979a19d6da0f74be8155",
+          first_topic: topic(@first_topic_hex_string_1),
           data:
             "0x000000000000000000000000dc2b93f3291030f3f7a6d9363ac37757f7ad5c4300000000000000000000000000000000000000000000000000002824369a100000000000000000000000000046b555cb3962bf9533c437cbd04a2f702dfdb999000000000000000000000000000000000000000000000000000014121b4d0800000000000000000000000000faf7a981360c2fab3a5ab7b3d6d8d0cf97a91eb9000000000000000000000000000000000000000000000000000014121b4d0800"
         )
@@ -1039,7 +1046,7 @@ defmodule BlockScoutWeb.API.V2.TransactionControllerTest do
           index: 1,
           block: tx.block,
           block_number: tx.block_number,
-          first_topic: "0x99e7b0ba56da2819c37c047f0511fd2bf6c9b4e27b4a979a19d6da0f74be8155",
+          first_topic: topic(@first_topic_hex_string_1),
           data:
             "0x000000000000000000000000dc2b93f3291030f3f7a6d9363ac37757f7ad5c4300000000000000000000000000000000000000000000000000002824369a100000000000000000000000000046b555cb3962bf9533c437cbd04a2f702dfdb999000000000000000000000000000000000000000000000000000014121b4d0800000000000000000000000000faf7a981360c2fab3a5ab7b3d6d8d0cf97a91eb9000000000000000000000000000000000000000000000000000014121b4d0800"
         )
diff --git a/apps/explorer/lib/explorer/chain.ex b/apps/explorer/lib/explorer/chain.ex
index 19983d00456a..f6a4e3615fa4 100644
--- a/apps/explorer/lib/explorer/chain.ex
+++ b/apps/explorer/lib/explorer/chain.ex
@@ -3590,32 +3590,6 @@ defmodule Explorer.Chain do
     |> Repo.stream_reduce(initial, reducer)
   end
 
-  @doc """
-  Returns a list of block numbers token transfer `t:Log.t/0`s that don't have an
-  associated `t:TokenTransfer.t/0` record.
-  """
-  def uncataloged_token_transfer_block_numbers do
-    query =
-      from(l in Log,
-        as: :log,
-        where:
-          l.first_topic == unquote(TokenTransfer.constant()) or
-            l.first_topic == unquote(TokenTransfer.erc1155_single_transfer_signature()) or
-            l.first_topic == unquote(TokenTransfer.erc1155_batch_transfer_signature()),
-        where:
-          not exists(
-            from(tf in TokenTransfer,
-              where: tf.transaction_hash == parent_as(:log).transaction_hash,
-              where: tf.log_index == parent_as(:log).index
-            )
-          ),
-        select: l.block_number,
-        distinct: l.block_number
-      )
-
-    Repo.stream_reduce(query, [], &[&1 | &2])
-  end
-
   def decode_contract_address_hash_response(resp) do
     case resp do
       "0x000000000000000000000000" <> address ->
diff --git a/apps/explorer/lib/explorer/chain/log.ex b/apps/explorer/lib/explorer/chain/log.ex
index 2eb2c2ce9275..e1c87a8a1e60 100644
--- a/apps/explorer/lib/explorer/chain/log.ex
+++ b/apps/explorer/lib/explorer/chain/log.ex
@@ -35,10 +35,10 @@ defmodule Explorer.Chain.Log do
           block_hash: Hash.Full.t(),
           block_number: non_neg_integer() | nil,
           data: Data.t(),
-          first_topic: String.t(),
-          second_topic: String.t(),
-          third_topic: String.t(),
-          fourth_topic: String.t(),
+          first_topic: Hash.Full.t(),
+          second_topic: Hash.Full.t(),
+          third_topic: Hash.Full.t(),
+          fourth_topic: Hash.Full.t(),
           transaction: %Ecto.Association.NotLoaded{} | Transaction.t(),
           transaction_hash: Hash.Full.t(),
           index: non_neg_integer(),
@@ -48,10 +48,10 @@ defmodule Explorer.Chain.Log do
   @primary_key false
   schema "logs" do
     field(:data, Data)
-    field(:first_topic, :string)
-    field(:second_topic, :string)
-    field(:third_topic, :string)
-    field(:fourth_topic, :string)
+    field(:first_topic, Hash.Full)
+    field(:second_topic, Hash.Full)
+    field(:third_topic, Hash.Full)
+    field(:fourth_topic, Hash.Full)
     field(:index, :integer, primary_key: true)
     field(:type, :string)
     field(:block_number, :integer)
@@ -190,9 +190,10 @@ defmodule Explorer.Chain.Log do
   end
 
   defp find_method_candidates(log, transaction, options, events_acc, skip_sig_provider?) do
-    with "0x" <> hex_part <- log.first_topic,
-         {number, ""} <- Integer.parse(hex_part, 16) do
-      <<method_id::binary-size(4), _rest::binary>> = :binary.encode_unsigned(number)
+    if is_nil(log.first_topic) do
+      {{:error, :could_not_decode}, events_acc}
+    else
+      <<method_id::binary-size(4), _rest::binary>> = log.first_topic.bytes
 
       if Map.has_key?(events_acc, method_id) do
         {events_acc[method_id], events_acc}
@@ -200,8 +201,6 @@ defmodule Explorer.Chain.Log do
         result = find_method_candidates_from_db(method_id, log, transaction, options, skip_sig_provider?)
         {result, Map.put(events_acc, method_id, result)}
       end
-    else
-      _ -> {{:error, :could_not_decode}, events_acc}
     end
   end
 
@@ -243,10 +242,10 @@ defmodule Explorer.Chain.Log do
            abi
            |> ABI.parse_specification(include_events?: true)
            |> Event.find_and_decode(
-             decode16!(log.first_topic),
-             decode16!(log.second_topic),
-             decode16!(log.third_topic),
-             decode16!(log.fourth_topic),
+             log.first_topic && log.first_topic.bytes,
+             log.second_topic && log.second_topic.bytes,
+             log.third_topic && log.third_topic.bytes,
+             log.fourth_topic && log.fourth_topic.bytes,
              log.data.bytes
            ) do
       {:ok, selector, mapping}
diff --git a/apps/explorer/lib/explorer/chain/token_transfer.ex b/apps/explorer/lib/explorer/chain/token_transfer.ex
index 8b9b878914df..c53414e209a2 100644
--- a/apps/explorer/lib/explorer/chain/token_transfer.ex
+++ b/apps/explorer/lib/explorer/chain/token_transfer.ex
@@ -28,7 +28,7 @@ defmodule Explorer.Chain.TokenTransfer do
   import Ecto.Query, only: [from: 2, limit: 2, where: 3, join: 5, order_by: 3, preload: 3]
 
   alias Explorer.Chain
-  alias Explorer.Chain.{Address, Block, DenormalizationHelper, Hash, TokenTransfer, Transaction}
+  alias Explorer.Chain.{Address, Block, DenormalizationHelper, Hash, Log, TokenTransfer, Transaction}
   alias Explorer.Chain.Token.Instance
   alias Explorer.{PagingOptions, Repo}
 
@@ -370,4 +370,31 @@ defmodule Explorer.Chain.TokenTransfer do
       where: block.consensus == true
     )
   end
+
+  @doc """
+  Returns a list of block numbers token transfer `t:Log.t/0`s that don't have an
+  associated `t:TokenTransfer.t/0` record.
+  """
+  @spec uncataloged_token_transfer_block_numbers :: {:ok, [non_neg_integer()]}
+  def uncataloged_token_transfer_block_numbers do
+    query =
+      from(l in Log,
+        as: :log,
+        where:
+          l.first_topic == ^@constant or
+            l.first_topic == ^@erc1155_single_transfer_signature or
+            l.first_topic == ^@erc1155_batch_transfer_signature,
+        where:
+          not exists(
+            from(tf in TokenTransfer,
+              where: tf.transaction_hash == parent_as(:log).transaction_hash,
+              where: tf.log_index == parent_as(:log).index
+            )
+          ),
+        select: l.block_number,
+        distinct: l.block_number
+      )
+
+    Repo.stream_reduce(query, [], &[&1 | &2])
+  end
 end
diff --git a/apps/explorer/priv/repo/migrations/20231213152332_alter_log_topic_columns_type.exs b/apps/explorer/priv/repo/migrations/20231213152332_alter_log_topic_columns_type.exs
new file mode 100644
index 000000000000..649c95d0dbf1
--- /dev/null
+++ b/apps/explorer/priv/repo/migrations/20231213152332_alter_log_topic_columns_type.exs
@@ -0,0 +1,18 @@
+defmodule Explorer.Repo.Migrations.AlterLogTopicColumnsType do
+  use Ecto.Migration
+
+  def change do
+    execute("""
+    ALTER TABLE logs
+    ALTER COLUMN first_topic TYPE bytea
+    USING CAST(REPLACE(first_topic, '0x', '\\x') as bytea),
+    ALTER COLUMN second_topic TYPE bytea
+    USING CAST(REPLACE(second_topic, '0x', '\\x') as bytea),
+    ALTER COLUMN third_topic TYPE bytea
+    USING CAST(REPLACE(third_topic, '0x', '\\x') as bytea),
+    ALTER COLUMN fourth_topic TYPE bytea
+    USING CAST(REPLACE(fourth_topic, '0x', '\\x') as bytea)
+    ;
+    """)
+  end
+end
diff --git a/apps/explorer/test/explorer/chain/csv_export/address_log_csv_exporter_test.exs b/apps/explorer/test/explorer/chain/csv_export/address_log_csv_exporter_test.exs
index bff1ca818d33..e70b2eb9cb25 100644
--- a/apps/explorer/test/explorer/chain/csv_export/address_log_csv_exporter_test.exs
+++ b/apps/explorer/test/explorer/chain/csv_export/address_log_csv_exporter_test.exs
@@ -4,6 +4,16 @@ defmodule Explorer.Chain.AddressLogCsvExporterTest do
   alias Explorer.Chain.Address
   alias Explorer.Chain.CSVExport.AddressLogCsvExporter
 
+  @first_topic_hex_string_1 "0x7fcf532c15f0a6db0bd6d0e038bea71d30d808c7d98cb3bf7268a95bf5081b65"
+  @second_topic_hex_string_1 "0x00000000000000000000000098a9dc37d3650b5b30d6c12789b3881ee0b70c16"
+  @third_topic_hex_string_1 "0x0000000000000000000000005079fc00f00f30000e0c8c083801cfde000008b6"
+  @fourth_topic_hex_string_1 "0x8c9b7729443a4444242342b2ca385a239a5c1d76a88473e1cd2ab0c70dd1b9c7"
+
+  defp topic(topic_hex_string) do
+    {:ok, topic} = Explorer.Chain.Hash.Full.cast(topic_hex_string)
+    topic
+  end
+
   describe "export/3" do
     test "exports address logs to csv" do
       address = insert(:address)
@@ -21,10 +31,10 @@ defmodule Explorer.Chain.AddressLogCsvExporterTest do
           block: transaction.block,
           block_number: transaction.block_number,
           data: "0x12",
-          first_topic: "0x13",
-          second_topic: "0x14",
-          third_topic: "0x15",
-          fourth_topic: "0x16"
+          first_topic: topic(@first_topic_hex_string_1),
+          second_topic: topic(@second_topic_hex_string_1),
+          third_topic: topic(@third_topic_hex_string_1),
+          fourth_topic: topic(@fourth_topic_hex_string_1)
         )
 
       from_period = Timex.format!(Timex.shift(Timex.now(), minutes: -1), "%Y-%m-%d", :strftime)
diff --git a/apps/explorer/test/explorer/chain/import_test.exs b/apps/explorer/test/explorer/chain/import_test.exs
index 322ca7a7ff80..a8d62bfcad6c 100644
--- a/apps/explorer/test/explorer/chain/import_test.exs
+++ b/apps/explorer/test/explorer/chain/import_test.exs
@@ -22,9 +22,16 @@ defmodule Explorer.Chain.ImportTest do
 
   @moduletag :capturelog
 
+  @first_topic_hex_string "0xddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef"
+  @second_topic_hex_string "0x000000000000000000000000e8ddc5c7a2d2f0d7a9798459c0104fdf5e987aca"
+  @third_topic_hex_string "0x000000000000000000000000515c09c5bba1ed566b02a5b0599ec5d5d0aee73d"
+
   doctest Import
 
   describe "all/1" do
+    {:ok, first_topic} = Explorer.Chain.Hash.Full.cast(@first_topic_hex_string)
+    {:ok, second_topic} = Explorer.Chain.Hash.Full.cast(@second_topic_hex_string)
+    {:ok, third_topic} = Explorer.Chain.Hash.Full.cast(@third_topic_hex_string)
     # set :timeout options to cover lines that use the timeout override when available
     @import_data %{
       blocks: %{
@@ -91,9 +98,9 @@ defmodule Explorer.Chain.ImportTest do
             block_hash: "0xf6b4b8c88df3ebd252ec476328334dc026cf66606a84fb769b3d3cbccc8471bd",
             address_hash: "0x8bf38d4764929064f2d4d3a56520a76ab3df415b",
             data: "0x0000000000000000000000000000000000000000000000000de0b6b3a7640000",
-            first_topic: "0xddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef",
-            second_topic: "0x000000000000000000000000e8ddc5c7a2d2f0d7a9798459c0104fdf5e987aca",
-            third_topic: "0x000000000000000000000000515c09c5bba1ed566b02a5b0599ec5d5d0aee73d",
+            first_topic: first_topic,
+            second_topic: second_topic,
+            third_topic: third_topic,
             fourth_topic: nil,
             index: 0,
             transaction_hash: "0x53bd884872de3e488692881baeec262e7b95234d3965248c39fe992fffd433e5",
@@ -165,6 +172,9 @@ defmodule Explorer.Chain.ImportTest do
     }
 
     test "with valid data" do
+      {:ok, first_topic} = Explorer.Chain.Hash.Full.cast(@first_topic_hex_string)
+      {:ok, second_topic} = Explorer.Chain.Hash.Full.cast(@second_topic_hex_string)
+      {:ok, third_topic} = Explorer.Chain.Hash.Full.cast(@third_topic_hex_string)
       difficulty = Decimal.new(340_282_366_920_938_463_463_374_607_431_768_211_454)
       total_difficulty = Decimal.new(12_590_447_576_074_723_148_144_860_474_975_121_280_509)
       token_transfer_amount = Decimal.new(1_000_000_000_000_000_000)
@@ -276,9 +286,9 @@ defmodule Explorer.Chain.ImportTest do
                           167, 100, 0, 0>>
                     },
                     index: 0,
-                    first_topic: "0xddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef",
-                    second_topic: "0x000000000000000000000000e8ddc5c7a2d2f0d7a9798459c0104fdf5e987aca",
-                    third_topic: "0x000000000000000000000000515c09c5bba1ed566b02a5b0599ec5d5d0aee73d",
+                    first_topic: ^first_topic,
+                    second_topic: ^second_topic,
+                    third_topic: ^third_topic,
                     fourth_topic: nil,
                     transaction_hash: %Hash{
                       byte_count: 32,
diff --git a/apps/explorer/test/explorer/chain/log_test.exs b/apps/explorer/test/explorer/chain/log_test.exs
index 6842a6b979fb..87881776de29 100644
--- a/apps/explorer/test/explorer/chain/log_test.exs
+++ b/apps/explorer/test/explorer/chain/log_test.exs
@@ -7,6 +7,13 @@ defmodule Explorer.Chain.LogTest do
   alias Explorer.Chain.{Log, SmartContract}
   alias Explorer.Repo
 
+  @first_topic_hex_string_1 "0x7fcf532c15f0a6db0bd6d0e038bea71d30d808c7d98cb3bf7268a95bf5081b65"
+
+  defp topic(topic_hex_string) do
+    {:ok, topic} = Explorer.Chain.Hash.Full.cast(topic_hex_string)
+    topic
+  end
+
   setup :set_mox_from_context
 
   doctest Log
@@ -36,18 +43,21 @@ defmodule Explorer.Chain.LogTest do
         params_for(
           :log,
           address_hash: build(:address).hash,
-          first_topic: "ham",
+          first_topic: @first_topic_hex_string_1,
           transaction_hash: build(:transaction).hash,
           block_hash: build(:block).hash
         )
 
-      assert %Changeset{changes: %{first_topic: "ham"}, valid?: true} = Log.changeset(%Log{}, params)
+      result = Log.changeset(%Log{}, params)
+
+      assert result.valid? == true
+      assert result.changes.first_topic == topic(@first_topic_hex_string_1)
     end
 
     test "assigns optional attributes" do
-      params = Map.put(params_for(:log), :first_topic, "ham")
+      params = Map.put(params_for(:log), :first_topic, topic(@first_topic_hex_string_1))
       changeset = Log.changeset(%Log{}, params)
-      assert changeset.changes.first_topic === "ham"
+      assert changeset.changes.first_topic === topic(@first_topic_hex_string_1)
     end
   end
 
@@ -99,9 +109,9 @@ defmodule Explorer.Chain.LogTest do
         insert(:log,
           address: to_address,
           transaction: transaction,
-          first_topic: topic1,
-          second_topic: topic2,
-          third_topic: topic3,
+          first_topic: topic(topic1),
+          second_topic: topic(topic2),
+          third_topic: topic(topic3),
           fourth_topic: nil,
           data: data
         )
@@ -153,9 +163,9 @@ defmodule Explorer.Chain.LogTest do
       log =
         insert(:log,
           transaction: transaction,
-          first_topic: topic1,
-          second_topic: topic2,
-          third_topic: topic3,
+          first_topic: topic(topic1),
+          second_topic: topic(topic2),
+          third_topic: topic(topic3),
           fourth_topic: nil,
           data: data
         )
diff --git a/apps/explorer/test/explorer/chain/smart_contract_test.exs b/apps/explorer/test/explorer/chain/smart_contract_test.exs
index 8bd0b1e5818a..f7c45251b0e4 100644
--- a/apps/explorer/test/explorer/chain/smart_contract_test.exs
+++ b/apps/explorer/test/explorer/chain/smart_contract_test.exs
@@ -2,9 +2,8 @@ defmodule Explorer.Chain.SmartContractTest do
   use Explorer.DataCase, async: false
 
   import Mox
-  alias Explorer.{Chain, PagingOptions}
+  alias Explorer.Chain
   alias Explorer.Chain.{Address, SmartContract}
-  alias Explorer.Chain.Hash
   alias Explorer.Chain.SmartContract.Proxy
 
   doctest Explorer.Chain.SmartContract
diff --git a/apps/explorer/test/explorer/chain/token_transfer_test.exs b/apps/explorer/test/explorer/chain/token_transfer_test.exs
index 29165457b773..3139f318cb39 100644
--- a/apps/explorer/test/explorer/chain/token_transfer_test.exs
+++ b/apps/explorer/test/explorer/chain/token_transfer_test.exs
@@ -325,4 +325,28 @@ defmodule Explorer.Chain.TokenTransferTest do
       assert Enum.member?(page_two, transaction_one_bytes) == true
     end
   end
+
+  describe "uncataloged_token_transfer_block_numbers/0" do
+    test "returns a list of block numbers" do
+      block = insert(:block)
+      address = insert(:address)
+
+      log =
+        insert(:token_transfer_log,
+          transaction:
+            insert(:transaction,
+              block_number: block.number,
+              block_hash: block.hash,
+              cumulative_gas_used: 0,
+              gas_used: 0,
+              index: 0
+            ),
+          block: block,
+          address_hash: address.hash
+        )
+
+      block_number = log.block_number
+      assert {:ok, [^block_number]} = TokenTransfer.uncataloged_token_transfer_block_numbers()
+    end
+  end
 end
diff --git a/apps/explorer/test/explorer/chain_test.exs b/apps/explorer/test/explorer/chain_test.exs
index 2bbbaebcd2d0..083d50d0f6dc 100644
--- a/apps/explorer/test/explorer/chain_test.exs
+++ b/apps/explorer/test/explorer/chain_test.exs
@@ -23,7 +23,6 @@ defmodule Explorer.ChainTest do
     Token,
     TokenTransfer,
     Transaction,
-    SmartContract,
     Wei
   }
 
@@ -38,6 +37,10 @@ defmodule Explorer.ChainTest do
   alias Explorer.Counters.AddressesWithBalanceCounter
   alias Explorer.Counters.AddressesCounter
 
+  @first_topic_hex_string "0xddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef"
+  @second_topic_hex_string "0x000000000000000000000000e8ddc5c7a2d2f0d7a9798459c0104fdf5e987aca"
+  @third_topic_hex_string "0x000000000000000000000000515c09c5bba1ed566b02a5b0599ec5d5d0aee73d"
+
   doctest Explorer.Chain
 
   setup :set_mox_global
@@ -316,6 +319,9 @@ defmodule Explorer.ChainTest do
         block_number: transaction1.block_number
       )
 
+      first_topic_hex_string = "0x7fcf532c15f0a6db0bd6d0e038bea71d30d808c7d98cb3bf7268a95bf5081b65"
+      {:ok, first_topic} = Explorer.Chain.Hash.Full.cast(first_topic_hex_string)
+
       transaction2 =
         :transaction
         |> insert(from_address: address)
@@ -326,11 +332,11 @@ defmodule Explorer.ChainTest do
         transaction: transaction2,
         index: 2,
         address: address,
-        first_topic: "test",
+        first_topic: first_topic,
         block_number: transaction2.block_number
       )
 
-      [found_log] = Chain.address_to_logs(address_hash, false, topic: "test")
+      [found_log] = Chain.address_to_logs(address_hash, false, topic: first_topic_hex_string)
 
       assert found_log.transaction.hash == transaction2.hash
     end
@@ -343,13 +349,16 @@ defmodule Explorer.ChainTest do
         |> insert(to_address: address)
         |> with_block()
 
+      fourth_topic_hex_string = "0x927abf391899d10d331079a63caffa905efa7075a44a7bbd52b190db4c4308fb"
+      {:ok, fourth_topic} = Explorer.Chain.Hash.Full.cast(fourth_topic_hex_string)
+
       insert(:log,
         block: transaction1.block,
         block_number: transaction1.block_number,
         transaction: transaction1,
         index: 1,
         address: address,
-        fourth_topic: "test"
+        fourth_topic: fourth_topic
       )
 
       transaction2 =
@@ -365,7 +374,7 @@ defmodule Explorer.ChainTest do
         address: address
       )
 
-      [found_log] = Chain.address_to_logs(address_hash, false, topic: "test")
+      [found_log] = Chain.address_to_logs(address_hash, false, topic: fourth_topic_hex_string)
 
       assert found_log.transaction.hash == transaction1.hash
     end
@@ -1238,6 +1247,10 @@ defmodule Explorer.ChainTest do
 
   # Full tests in `test/explorer/import_test.exs`
   describe "import/1" do
+    {:ok, first_topic} = Explorer.Chain.Hash.Full.cast(@first_topic_hex_string)
+    {:ok, second_topic} = Explorer.Chain.Hash.Full.cast(@second_topic_hex_string)
+    {:ok, third_topic} = Explorer.Chain.Hash.Full.cast(@third_topic_hex_string)
+
     @import_data %{
       blocks: %{
         params: [
@@ -1293,9 +1306,9 @@ defmodule Explorer.ChainTest do
             block_hash: "0xf6b4b8c88df3ebd252ec476328334dc026cf66606a84fb769b3d3cbccc8471bd",
             address_hash: "0x8bf38d4764929064f2d4d3a56520a76ab3df415b",
             data: "0x0000000000000000000000000000000000000000000000000de0b6b3a7640000",
-            first_topic: "0xddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef",
-            second_topic: "0x000000000000000000000000e8ddc5c7a2d2f0d7a9798459c0104fdf5e987aca",
-            third_topic: "0x000000000000000000000000515c09c5bba1ed566b02a5b0599ec5d5d0aee73d",
+            first_topic: first_topic,
+            second_topic: second_topic,
+            third_topic: third_topic,
             fourth_topic: nil,
             index: 0,
             transaction_hash: "0x53bd884872de3e488692881baeec262e7b95234d3965248c39fe992fffd433e5",
@@ -1362,6 +1375,9 @@ defmodule Explorer.ChainTest do
     }
 
     test "with valid data" do
+      {:ok, first_topic} = Explorer.Chain.Hash.Full.cast(@first_topic_hex_string)
+      {:ok, second_topic} = Explorer.Chain.Hash.Full.cast(@second_topic_hex_string)
+      {:ok, third_topic} = Explorer.Chain.Hash.Full.cast(@third_topic_hex_string)
       difficulty = Decimal.new(340_282_366_920_938_463_463_374_607_431_768_211_454)
       total_difficulty = Decimal.new(12_590_447_576_074_723_148_144_860_474_975_121_280_509)
       token_transfer_amount = Decimal.new(1_000_000_000_000_000_000)
@@ -1464,9 +1480,9 @@ defmodule Explorer.ChainTest do
                           167, 100, 0, 0>>
                     },
                     index: 0,
-                    first_topic: "0xddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef",
-                    second_topic: "0x000000000000000000000000e8ddc5c7a2d2f0d7a9798459c0104fdf5e987aca",
-                    third_topic: "0x000000000000000000000000515c09c5bba1ed566b02a5b0599ec5d5d0aee73d",
+                    first_topic: ^first_topic,
+                    second_topic: ^second_topic,
+                    third_topic: ^third_topic,
                     fourth_topic: nil,
                     transaction_hash: %Hash{
                       byte_count: 32,
@@ -4367,30 +4383,6 @@ defmodule Explorer.ChainTest do
     end
   end
 
-  describe "uncataloged_token_transfer_block_numbers/0" do
-    test "returns a list of block numbers" do
-      block = insert(:block)
-      address = insert(:address)
-
-      log =
-        insert(:token_transfer_log,
-          transaction:
-            insert(:transaction,
-              block_number: block.number,
-              block_hash: block.hash,
-              cumulative_gas_used: 0,
-              gas_used: 0,
-              index: 0
-            ),
-          block: block,
-          address_hash: address.hash
-        )
-
-      block_number = log.block_number
-      assert {:ok, [^block_number]} = Chain.uncataloged_token_transfer_block_numbers()
-    end
-  end
-
   describe "address_to_balances_by_day/1" do
     test "return a list of balances by day" do
       address = insert(:address)
diff --git a/apps/explorer/test/explorer/etherscan/logs_test.exs b/apps/explorer/test/explorer/etherscan/logs_test.exs
index 5da949541c45..b5953407f83c 100644
--- a/apps/explorer/test/explorer/etherscan/logs_test.exs
+++ b/apps/explorer/test/explorer/etherscan/logs_test.exs
@@ -6,6 +6,25 @@ defmodule Explorer.Etherscan.LogsTest do
   alias Explorer.Etherscan.Logs
   alias Explorer.Chain.Transaction
 
+  @first_topic_hex_string_1 "0x7fcf532c15f0a6db0bd6d0e038bea71d30d808c7d98cb3bf7268a95bf5081b65"
+  @first_topic_hex_string_2 "0xddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef"
+  @first_topic_hex_string_3 "0xe1fffcc4923d04b559f4d29a8bfc6cda04eb5b0d3c460751c2402c5c5cc9109c"
+
+  @second_topic_hex_string_1 "0x00000000000000000000000098a9dc37d3650b5b30d6c12789b3881ee0b70c16"
+  @second_topic_hex_string_2 "0x000000000000000000000000e2680fd7cdbb04e9087a647ad4d023ef6c8fb4e2"
+  @second_topic_hex_string_3 "0x0000000000000000000000005777d92f208679db4b9778590fa3cab3ac9e2168"
+
+  @third_topic_hex_string_1 "0x0000000000000000000000005079fc00f00f30000e0c8c083801cfde000008b6"
+  @third_topic_hex_string_2 "0x000000000000000000000000e2680fd7cdbb04e9087a647ad4d023ef6c8fb4e2"
+  @third_topic_hex_string_3 "0x0000000000000000000000000f6d9bd6fc315bbf95b5c44f4eba2b2762f8c372"
+
+  @fourth_topic_hex_string_1 "0x8c9b7729443a4444242342b2ca385a239a5c1d76a88473e1cd2ab0c70dd1b9c7"
+
+  defp topic(topic_hex_string) do
+    {:ok, topic} = Explorer.Chain.Hash.Full.cast(topic_hex_string)
+    topic
+  end
+
   describe "list_logs/1" do
     test "with empty db" do
       contract_address = build(:contract_address)
@@ -211,13 +230,13 @@ defmodule Explorer.Etherscan.LogsTest do
       log1_details = [
         address: contract_address,
         transaction: transaction,
-        first_topic: "some topic"
+        first_topic: topic(@first_topic_hex_string_1)
       ]
 
       log2_details = [
         address: contract_address,
         transaction: transaction,
-        first_topic: "some other topic"
+        first_topic: topic(@first_topic_hex_string_2)
       ]
 
       log1 = insert(:log, log1_details)
@@ -247,15 +266,15 @@ defmodule Explorer.Etherscan.LogsTest do
       log1_details = [
         address: contract_address,
         transaction: transaction,
-        first_topic: "some first topic",
-        second_topic: "some second topic"
+        first_topic: topic(@first_topic_hex_string_1),
+        second_topic: topic(@second_topic_hex_string_1)
       ]
 
       log2_details = [
         address: contract_address,
         transaction: transaction,
-        first_topic: "some first topic",
-        second_topic: "some OTHER second topic"
+        first_topic: topic(@first_topic_hex_string_1),
+        second_topic: topic(@second_topic_hex_string_2)
       ]
 
       _log1 = insert(:log, log1_details)
@@ -288,15 +307,15 @@ defmodule Explorer.Etherscan.LogsTest do
       log1_details = [
         address: contract_address,
         transaction: transaction,
-        first_topic: "some first topic",
-        second_topic: "some second topic"
+        first_topic: topic(@first_topic_hex_string_1),
+        second_topic: topic(@second_topic_hex_string_1)
       ]
 
       log2_details = [
         address: contract_address,
         transaction: transaction,
-        first_topic: "some OTHER first topic",
-        second_topic: "some OTHER second topic"
+        first_topic: topic(@first_topic_hex_string_2),
+        second_topic: topic(@second_topic_hex_string_2)
       ]
 
       log1 = insert(:log, log1_details)
@@ -327,14 +346,14 @@ defmodule Explorer.Etherscan.LogsTest do
       log1_details = [
         address: contract_address,
         transaction: transaction,
-        first_topic: "some first topic",
+        first_topic: topic(@first_topic_hex_string_1),
         block_number: block.number
       ]
 
       log2_details = [
         address: contract_address,
         transaction: transaction,
-        first_topic: "some OTHER first topic",
+        first_topic: topic(@first_topic_hex_string_2),
         block_number: block.number
       ]
 
@@ -366,16 +385,16 @@ defmodule Explorer.Etherscan.LogsTest do
       log1_details = [
         address: contract_address,
         transaction: transaction,
-        first_topic: "some first topic",
-        second_topic: "some second topic",
+        first_topic: topic(@first_topic_hex_string_1),
+        second_topic: topic(@second_topic_hex_string_1),
         block_number: block.number
       ]
 
       log2_details = [
         address: contract_address,
         transaction: transaction,
-        first_topic: "some OTHER first topic",
-        second_topic: "some OTHER second topic",
+        first_topic: topic(@first_topic_hex_string_2),
+        second_topic: topic(@second_topic_hex_string_2),
         block_number: block.number
       ]
 
@@ -409,27 +428,27 @@ defmodule Explorer.Etherscan.LogsTest do
       log1_details = [
         address: contract_address,
         transaction: transaction,
-        first_topic: "some first topic",
-        second_topic: "some second topic",
-        third_topic: "some third topic",
+        first_topic: topic(@first_topic_hex_string_1),
+        second_topic: topic(@second_topic_hex_string_1),
+        third_topic: topic(@third_topic_hex_string_1),
         block_number: block.number
       ]
 
       log2_details = [
         address: contract_address,
         transaction: transaction,
-        first_topic: "some OTHER first topic",
-        second_topic: "some OTHER second topic",
-        third_topic: "some OTHER third topic",
+        first_topic: topic(@first_topic_hex_string_2),
+        second_topic: topic(@second_topic_hex_string_2),
+        third_topic: topic(@third_topic_hex_string_2),
         block_number: block.number
       ]
 
       log3_details = [
         address: contract_address,
         transaction: transaction,
-        first_topic: "some ALT first topic",
-        second_topic: "some ALT second topic",
-        third_topic: "some ALT third topic",
+        first_topic: topic(@first_topic_hex_string_3),
+        second_topic: topic(@second_topic_hex_string_3),
+        third_topic: topic(@third_topic_hex_string_3),
         block_number: block.number
       ]
 
@@ -469,27 +488,27 @@ defmodule Explorer.Etherscan.LogsTest do
       log1_details = [
         address: contract_address,
         transaction: transaction,
-        first_topic: "some first topic",
-        second_topic: "some second topic",
-        third_topic: "some third topic",
+        first_topic: topic(@first_topic_hex_string_1),
+        second_topic: topic(@second_topic_hex_string_1),
+        third_topic: topic(@third_topic_hex_string_1),
         block_number: block.number
       ]
 
       log2_details = [
         address: contract_address,
         transaction: transaction,
-        first_topic: "some OTHER first topic",
-        second_topic: "some OTHER second topic",
-        third_topic: "some OTHER third topic",
+        first_topic: topic(@first_topic_hex_string_2),
+        second_topic: topic(@second_topic_hex_string_2),
+        third_topic: topic(@third_topic_hex_string_2),
         block_number: block.number
       ]
 
       log3_details = [
         address: contract_address,
         transaction: transaction,
-        first_topic: "some ALT first topic",
-        second_topic: "some ALT second topic",
-        third_topic: "some ALT third topic",
+        first_topic: topic(@first_topic_hex_string_3),
+        second_topic: topic(@second_topic_hex_string_3),
+        third_topic: topic(@third_topic_hex_string_3),
         block_number: block.number
       ]
 
@@ -529,27 +548,27 @@ defmodule Explorer.Etherscan.LogsTest do
       log1_details = [
         address: contract_address,
         transaction: transaction,
-        first_topic: "some topic",
-        second_topic: "some second topic",
-        third_topic: "some third topic",
+        first_topic: topic(@first_topic_hex_string_1),
+        second_topic: topic(@second_topic_hex_string_1),
+        third_topic: topic(@third_topic_hex_string_1),
         block_number: block.number
       ]
 
       log2_details = [
         address: contract_address,
         transaction: transaction,
-        first_topic: "some topic",
-        second_topic: "some OTHER second topic",
-        third_topic: "some third topic",
+        first_topic: topic(@first_topic_hex_string_1),
+        second_topic: topic(@second_topic_hex_string_2),
+        third_topic: topic(@third_topic_hex_string_1),
         block_number: block.number
       ]
 
       log3_details = [
         address: contract_address,
         transaction: transaction,
-        first_topic: "some topic",
-        second_topic: "some second topic",
-        third_topic: "some third topic",
+        first_topic: topic(@first_topic_hex_string_1),
+        second_topic: topic(@second_topic_hex_string_1),
+        third_topic: topic(@third_topic_hex_string_1),
         block_number: block.number
       ]
 
@@ -589,28 +608,28 @@ defmodule Explorer.Etherscan.LogsTest do
       log1_details = [
         address: contract_address,
         transaction: transaction,
-        first_topic: "some topic",
-        second_topic: "some second topic",
+        first_topic: topic(@first_topic_hex_string_1),
+        second_topic: topic(@second_topic_hex_string_1),
         block_number: block.number
       ]
 
       log2_details = [
         address: contract_address,
         transaction: transaction,
-        first_topic: "some OTHER topic",
-        second_topic: "some OTHER second topic",
-        third_topic: "some OTHER third topic",
-        fourth_topic: "some fourth topic",
+        first_topic: topic(@first_topic_hex_string_2),
+        second_topic: topic(@second_topic_hex_string_2),
+        third_topic: topic(@third_topic_hex_string_2),
+        fourth_topic: topic(@fourth_topic_hex_string_1),
         block_number: block.number
       ]
 
       log3_details = [
         address: contract_address,
         transaction: transaction,
-        first_topic: "some topic",
-        second_topic: "some second topic",
-        third_topic: "some third topic",
-        fourth_topic: "some fourth topic",
+        first_topic: topic(@first_topic_hex_string_1),
+        second_topic: topic(@second_topic_hex_string_1),
+        third_topic: topic(@third_topic_hex_string_1),
+        fourth_topic: topic(@fourth_topic_hex_string_1),
         block_number: block.number
       ]
 
diff --git a/apps/indexer/lib/indexer/fetcher/polygon_edge/deposit_execute.ex b/apps/indexer/lib/indexer/fetcher/polygon_edge/deposit_execute.ex
index 4e2dd57d09eb..ef1ad37e4a4c 100644
--- a/apps/indexer/lib/indexer/fetcher/polygon_edge/deposit_execute.ex
+++ b/apps/indexer/lib/indexer/fetcher/polygon_edge/deposit_execute.ex
@@ -12,6 +12,7 @@ defmodule Indexer.Fetcher.PolygonEdge.DepositExecute do
 
   import EthereumJSONRPC, only: [quantity_to_integer: 1]
   import Indexer.Fetcher.PolygonEdge, only: [fill_block_range: 5, get_block_number_by_tag: 3]
+  import Indexer.Helper, only: [log_topic_to_string: 1]
 
   alias Explorer.{Chain, Repo}
   alias Explorer.Chain.Log
@@ -128,8 +129,13 @@ defmodule Indexer.Fetcher.PolygonEdge.DepositExecute do
 
   @spec event_to_deposit_execute(binary(), binary(), binary(), binary()) :: map()
   def event_to_deposit_execute(second_topic, third_topic, l2_transaction_hash, l2_block_number) do
+    msg_id =
+      second_topic
+      |> log_topic_to_string()
+      |> quantity_to_integer()
+
     %{
-      msg_id: quantity_to_integer(second_topic),
+      msg_id: msg_id,
       l2_transaction_hash: l2_transaction_hash,
       l2_block_number: quantity_to_integer(l2_block_number),
       success: quantity_to_integer(third_topic) != 0
diff --git a/apps/indexer/lib/indexer/fetcher/polygon_edge/withdrawal.ex b/apps/indexer/lib/indexer/fetcher/polygon_edge/withdrawal.ex
index 80fb20568c99..098545140ac0 100644
--- a/apps/indexer/lib/indexer/fetcher/polygon_edge/withdrawal.ex
+++ b/apps/indexer/lib/indexer/fetcher/polygon_edge/withdrawal.ex
@@ -13,6 +13,7 @@ defmodule Indexer.Fetcher.PolygonEdge.Withdrawal do
   import EthereumJSONRPC, only: [quantity_to_integer: 1]
   import Explorer.Helper, only: [decode_data: 2]
   import Indexer.Fetcher.PolygonEdge, only: [fill_block_range: 5, get_block_number_by_tag: 3]
+  import Indexer.Helper, only: [log_topic_to_string: 1]
 
   alias ABI.TypeDecoder
   alias Explorer.{Chain, Repo}
@@ -133,6 +134,11 @@ defmodule Indexer.Fetcher.PolygonEdge.Withdrawal do
 
   @spec event_to_withdrawal(binary(), map(), binary(), binary()) :: map()
   def event_to_withdrawal(second_topic, data, l2_transaction_hash, l2_block_number) do
+    msg_id =
+      second_topic
+      |> log_topic_to_string()
+      |> quantity_to_integer()
+
     [data_bytes] = decode_data(data, [:bytes])
 
     sig = binary_part(data_bytes, 0, 32)
@@ -148,7 +154,7 @@ defmodule Indexer.Fetcher.PolygonEdge.Withdrawal do
       end
 
     %{
-      msg_id: quantity_to_integer(second_topic),
+      msg_id: msg_id,
       from: from,
       to: to,
       l2_transaction_hash: l2_transaction_hash,
diff --git a/apps/indexer/lib/indexer/helper.ex b/apps/indexer/lib/indexer/helper.ex
index 540606fe222f..21b69831f26e 100644
--- a/apps/indexer/lib/indexer/helper.ex
+++ b/apps/indexer/lib/indexer/helper.ex
@@ -32,4 +32,13 @@ defmodule Indexer.Helper do
   def is_address_correct?(_address) do
     false
   end
+
+  @spec log_topic_to_string(any()) :: binary() | nil
+  def log_topic_to_string(topic) do
+    if is_binary(topic) or is_nil(topic) do
+      topic
+    else
+      Hash.to_string(topic)
+    end
+  end
 end
diff --git a/apps/indexer/lib/indexer/temporary/uncataloged_token_transfers.ex b/apps/indexer/lib/indexer/temporary/uncataloged_token_transfers.ex
index 17f676f136d5..d048a3331172 100644
--- a/apps/indexer/lib/indexer/temporary/uncataloged_token_transfers.ex
+++ b/apps/indexer/lib/indexer/temporary/uncataloged_token_transfers.ex
@@ -12,7 +12,7 @@ defmodule Indexer.Temporary.UncatalogedTokenTransfers do
 
   require Logger
 
-  alias Explorer.Chain
+  alias Explorer.Chain.TokenTransfer
   alias Indexer.Block.Catchup.Fetcher
   alias Indexer.Temporary.UncatalogedTokenTransfers
 
@@ -52,7 +52,7 @@ defmodule Indexer.Temporary.UncatalogedTokenTransfers do
   end
 
   def handle_info(:scan, state) do
-    {:ok, block_numbers} = Chain.uncataloged_token_transfer_block_numbers()
+    {:ok, block_numbers} = TokenTransfer.uncataloged_token_transfer_block_numbers()
 
     case block_numbers do
       [] ->
diff --git a/apps/indexer/lib/indexer/transform/transaction_actions.ex b/apps/indexer/lib/indexer/transform/transaction_actions.ex
index 1620fd724dd2..618c311f2a95 100644
--- a/apps/indexer/lib/indexer/transform/transaction_actions.ex
+++ b/apps/indexer/lib/indexer/transform/transaction_actions.ex
@@ -285,8 +285,15 @@ defmodule Indexer.Transform.TransactionActions do
     [debt_amount, collateral_amount, _liquidator, _receive_a_token] =
       decode_data(log.data, [{:uint, 256}, {:uint, 256}, :address, :bool])
 
-    debt_address = truncate_address_hash(log.third_topic)
-    collateral_address = truncate_address_hash(log.second_topic)
+    debt_address =
+      log.third_topic
+      |> Helper.log_topic_to_string()
+      |> truncate_address_hash()
+
+    collateral_address =
+      log.second_topic
+      |> Helper.log_topic_to_string()
+      |> truncate_address_hash()
 
     case get_token_data([debt_address, collateral_address]) do
       false ->
@@ -318,7 +325,10 @@ defmodule Indexer.Transform.TransactionActions do
 
   defp aave_handle_event(type, amount, log, address_topic, chain_id)
        when type in ["borrow", "supply", "withdraw", "repay", "flash_loan"] do
-    address = truncate_address_hash(address_topic)
+    address =
+      address_topic
+      |> Helper.log_topic_to_string()
+      |> truncate_address_hash()
 
     case get_token_data([address]) do
       false ->
@@ -345,7 +355,10 @@ defmodule Indexer.Transform.TransactionActions do
   end
 
   defp aave_handle_event(type, log, address_topic, chain_id) when type in ["enable_collateral", "disable_collateral"] do
-    address = truncate_address_hash(address_topic)
+    address =
+      address_topic
+      |> Helper.log_topic_to_string()
+      |> truncate_address_hash()
 
     case get_token_data([address]) do
       false ->
@@ -448,12 +461,23 @@ defmodule Indexer.Transform.TransactionActions do
       |> Enum.reduce(%{}, fn log, acc ->
         if sanitize_first_topic(log.first_topic) == @uniswap_v3_transfer_nft_event do
           # This is Transfer event for NFT
-          from = truncate_address_hash(log.second_topic)
+          from =
+            log.second_topic
+            |> Helper.log_topic_to_string()
+            |> truncate_address_hash()
 
           # credo:disable-for-next-line
           if from == burn_address_hash_string() do
-            to = truncate_address_hash(log.third_topic)
-            [token_id] = decode_data(log.fourth_topic, [{:uint, 256}])
+            to =
+              log.third_topic
+              |> Helper.log_topic_to_string()
+              |> truncate_address_hash()
+
+            [token_id] =
+              log.fourth_topic
+              |> Helper.log_topic_to_string()
+              |> decode_data([{:uint, 256}])
+
             mint_nft_ids = Map.put_new(acc, to, %{ids: [], log_index: log.index})
 
             Map.put(mint_nft_ids, to, %{
@@ -970,7 +994,7 @@ defmodule Indexer.Transform.TransactionActions do
   end
 
   defp sanitize_first_topic(first_topic) do
-    if is_nil(first_topic), do: "", else: String.downcase(first_topic)
+    if is_nil(first_topic), do: "", else: String.downcase(Helper.log_topic_to_string(first_topic))
   end
 
   defp truncate_address_hash(nil), do: burn_address_hash_string()

From 83978978f9d565e49dcfc4f6a6cc5f39d153b397 Mon Sep 17 00:00:00 2001
From: Victor Baranov <baranov.viktor.27@gmail.com>
Date: Thu, 21 Dec 2023 18:56:28 +0300
Subject: [PATCH 856/909] Drop logs type column and related index (#9007)

* Drop logs type index

* Remove log type column

* Update CHANGE LOG entry
---
 CHANGELOG.md                                  |  1 +
 .../channels/websocket_v2_test.exs            |  9 ++--
 .../lib/ethereum_jsonrpc/log.ex               | 43 ++++++-------------
 .../lib/ethereum_jsonrpc/receipts.ex          | 15 +++----
 .../test/ethereum_jsonrpc/receipts_test.exs   |  6 +--
 .../lib/explorer/chain/import/runner/logs.ex  |  6 +--
 apps/explorer/lib/explorer/chain/log.ex       | 15 ++-----
 apps/explorer/lib/explorer/eth_rpc.ex         |  3 +-
 apps/explorer/lib/explorer/etherscan/logs.ex  |  3 +-
 ...1215115638_drop_unused_logs_type_index.exs | 11 +++++
 .../test/explorer/chain/import_test.exs       |  4 +-
 apps/explorer/test/explorer/chain_test.exs    |  4 +-
 apps/explorer/test/support/factory.ex         |  3 +-
 .../lib/indexer/transform/mint_transfers.ex   |  3 +-
 .../indexer/block/fetcher/receipts_test.exs   |  6 +--
 .../test/indexer/block/fetcher_test.exs       |  3 +-
 .../indexer/transform/mint_transfers_test.exs |  6 +--
 .../transform/token_transfers_test.exs        | 39 ++++++-----------
 18 files changed, 65 insertions(+), 115 deletions(-)
 create mode 100644 apps/explorer/priv/repo/migrations/20231215115638_drop_unused_logs_type_index.exs

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f852bfdf7744..48ef1d03c82c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,7 @@
 ### Chore
 
 - [#9009](https://github.com/blockscout/blockscout/pull/9009) - Index for block refetch_needed
+- [#9007](https://github.com/blockscout/blockscout/pull/9007) - Drop logs type index
 - [#9006](https://github.com/blockscout/blockscout/pull/9006) - Drop unused indexes on address_current_token_balances table
 - [#9000](https://github.com/blockscout/blockscout/pull/9000) - Change log topic type in the DB to bytea
 - [#8996](https://github.com/blockscout/blockscout/pull/8996) - Refine token transfers token ids index
diff --git a/apps/block_scout_web/test/block_scout_web/channels/websocket_v2_test.exs b/apps/block_scout_web/test/block_scout_web/channels/websocket_v2_test.exs
index 2e06c53dbdc6..6d7aad632f90 100644
--- a/apps/block_scout_web/test/block_scout_web/channels/websocket_v2_test.exs
+++ b/apps/block_scout_web/test/block_scout_web/channels/websocket_v2_test.exs
@@ -47,8 +47,7 @@ defmodule BlockScoutWeb.WebsocketV2Test do
             third_topic: third_topic,
             fourth_topic: nil,
             index: 0,
-            transaction_hash: "0x53bd884872de3e488692881baeec262e7b95234d3965248c39fe992fffd433e5",
-            type: "mined"
+            transaction_hash: "0x53bd884872de3e488692881baeec262e7b95234d3965248c39fe992fffd433e5"
           },
           %{
             block_hash: "0xf6b4b8c88df3ebd252ec476328334dc026cf66606a84fb769b3d3cbccc8471bd",
@@ -59,8 +58,7 @@ defmodule BlockScoutWeb.WebsocketV2Test do
             third_topic: third_topic,
             fourth_topic: nil,
             index: 1,
-            transaction_hash: "0x53bd884872de3e488692881baeec262e7b95234d3965248c39fe992fffd433e5",
-            type: "mined"
+            transaction_hash: "0x53bd884872de3e488692881baeec262e7b95234d3965248c39fe992fffd433e5"
           },
           %{
             block_hash: "0xf6b4b8c88df3ebd252ec476328334dc026cf66606a84fb769b3d3cbccc8471bd",
@@ -71,8 +69,7 @@ defmodule BlockScoutWeb.WebsocketV2Test do
             third_topic: third_topic,
             fourth_topic: nil,
             index: 2,
-            transaction_hash: "0x53bd884872de3e488692881baeec262e7b95234d3965248c39fe992fffd433e5",
-            type: "mined"
+            transaction_hash: "0x53bd884872de3e488692881baeec262e7b95234d3965248c39fe992fffd433e5"
           }
         ],
         timeout: 5
diff --git a/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/log.ex b/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/log.ex
index ecda58364425..f3c6a88662c5 100644
--- a/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/log.ex
+++ b/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/log.ex
@@ -33,8 +33,7 @@ defmodule EthereumJSONRPC.Log do
       ...>     "topics" => ["0x600bcf04a13e752d1e3670a5a9f1c21177ca2a93c6f5391d4f1298d098097c22"],
       ...>     "transactionHash" => "0x53bd884872de3e488692881baeec262e7b95234d3965248c39fe992fffd433e5",
       ...>     "transactionIndex" => 0,
-      ...>     "transactionLogIndex" => 0,
-      ...>     "type" => "mined"
+      ...>     "transactionLogIndex" => 0
       ...>   }
       ...> )
       %{
@@ -47,12 +46,9 @@ defmodule EthereumJSONRPC.Log do
         index: 0,
         second_topic: nil,
         third_topic: nil,
-        transaction_hash: "0x53bd884872de3e488692881baeec262e7b95234d3965248c39fe992fffd433e5",
-        type: "mined"
+        transaction_hash: "0x53bd884872de3e488692881baeec262e7b95234d3965248c39fe992fffd433e5"
       }
 
-  Geth does not supply a `"type"`
-
       iex> EthereumJSONRPC.Log.elixir_to_params(
       ...>   %{
       ...>     "address" => "0xda8b3276cde6d768a44b9dac659faa339a41ac55",
@@ -82,17 +78,15 @@ defmodule EthereumJSONRPC.Log do
       }
 
   """
-  def elixir_to_params(
-        %{
-          "address" => address_hash,
-          "blockNumber" => block_number,
-          "blockHash" => block_hash,
-          "data" => data,
-          "logIndex" => index,
-          "topics" => topics,
-          "transactionHash" => transaction_hash
-        } = elixir
-      ) do
+  def elixir_to_params(%{
+        "address" => address_hash,
+        "blockNumber" => block_number,
+        "blockHash" => block_hash,
+        "data" => data,
+        "logIndex" => index,
+        "topics" => topics,
+        "transactionHash" => transaction_hash
+      }) do
     %{
       address_hash: address_hash,
       block_number: block_number,
@@ -102,7 +96,6 @@ defmodule EthereumJSONRPC.Log do
       transaction_hash: transaction_hash
     }
     |> put_topics(topics)
-    |> put_type(elixir)
   end
 
   @doc """
@@ -118,8 +111,7 @@ defmodule EthereumJSONRPC.Log do
       ...>   "topics" => ["0x600bcf04a13e752d1e3670a5a9f1c21177ca2a93c6f5391d4f1298d098097c22"],
       ...>   "transactionHash" => "0x53bd884872de3e488692881baeec262e7b95234d3965248c39fe992fffd433e5",
       ...>   "transactionIndex" => "0x0",
-      ...>   "transactionLogIndex" => "0x0",
-      ...>   "type" => "mined"
+      ...>   "transactionLogIndex" => "0x0"
       ...>   }
       ...> )
       %{
@@ -131,8 +123,7 @@ defmodule EthereumJSONRPC.Log do
         "topics" => ["0x600bcf04a13e752d1e3670a5a9f1c21177ca2a93c6f5391d4f1298d098097c22"],
         "transactionHash" => "0x53bd884872de3e488692881baeec262e7b95234d3965248c39fe992fffd433e5",
         "transactionIndex" => 0,
-        "transactionLogIndex" => 0,
-        "type" => "mined"
+        "transactionLogIndex" => 0
       }
 
   Geth includes a `"removed"` key
@@ -172,7 +163,7 @@ defmodule EthereumJSONRPC.Log do
   end
 
   defp entry_to_elixir({key, _} = entry)
-       when key in ~w(address blockHash data removed topics transactionHash type timestamp),
+       when key in ~w(address blockHash data removed topics transactionHash timestamp),
        do: entry
 
   defp entry_to_elixir({key, quantity}) when key in ~w(blockNumber logIndex transactionIndex transactionLogIndex) do
@@ -190,10 +181,4 @@ defmodule EthereumJSONRPC.Log do
     |> Map.put(:third_topic, Enum.at(topics, 2))
     |> Map.put(:fourth_topic, Enum.at(topics, 3))
   end
-
-  defp put_type(params, %{"type" => type}) do
-    Map.put(params, :type, type)
-  end
-
-  defp put_type(params, _), do: params
 end
diff --git a/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/receipts.ex b/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/receipts.ex
index 8e0cffa7f2b1..37cc0a963c38 100644
--- a/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/receipts.ex
+++ b/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/receipts.ex
@@ -32,8 +32,7 @@ defmodule EthereumJSONRPC.Receipts do
       ...>         "topics" => ["0x600bcf04a13e752d1e3670a5a9f1c21177ca2a93c6f5391d4f1298d098097c22"],
       ...>         "transactionHash" => "0x53bd884872de3e488692881baeec262e7b95234d3965248c39fe992fffd433e5",
       ...>         "transactionIndex" => 0,
-      ...>         "transactionLogIndex" => 0,
-      ...>         "type" => "mined"
+      ...>         "transactionLogIndex" => 0
       ...>       }
       ...>     ],
       ...>     "logsBloom" => "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000200000000000000000000020000000000000000200000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
@@ -53,8 +52,7 @@ defmodule EthereumJSONRPC.Receipts do
           "topics" => ["0x600bcf04a13e752d1e3670a5a9f1c21177ca2a93c6f5391d4f1298d098097c22"],
           "transactionHash" => "0x53bd884872de3e488692881baeec262e7b95234d3965248c39fe992fffd433e5",
           "transactionIndex" => 0,
-          "transactionLogIndex" => 0,
-          "type" => "mined"
+          "transactionLogIndex" => 0
         }
       ]
 
@@ -84,8 +82,7 @@ defmodule EthereumJSONRPC.Receipts do
       ...>         "topics" => ["0x600bcf04a13e752d1e3670a5a9f1c21177ca2a93c6f5391d4f1298d098097c22"],
       ...>         "transactionHash" => "0x53bd884872de3e488692881baeec262e7b95234d3965248c39fe992fffd433e5",
       ...>         "transactionIndex" => 0,
-      ...>         "transactionLogIndex" => 0,
-      ...>         "type" => "mined"
+      ...>         "transactionLogIndex" => 0
       ...>       }
       ...>     ],
       ...>     "logsBloom" => "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000200000000000000000000020000000000000000200000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
@@ -165,8 +162,7 @@ defmodule EthereumJSONRPC.Receipts do
       ...>         "topics" => ["0x600bcf04a13e752d1e3670a5a9f1c21177ca2a93c6f5391d4f1298d098097c22"],
       ...>         "transactionHash" => "0x53bd884872de3e488692881baeec262e7b95234d3965248c39fe992fffd433e5",
       ...>         "transactionIndex" => "0x0",
-      ...>         "transactionLogIndex" => "0x0",
-      ...>         "type" => "mined"
+      ...>         "transactionLogIndex" => "0x0"
       ...>       }
       ...>     ],
       ...>     "logsBloom" => "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000200000000000000000000020000000000000000200000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
@@ -193,8 +189,7 @@ defmodule EthereumJSONRPC.Receipts do
               "topics" => ["0x600bcf04a13e752d1e3670a5a9f1c21177ca2a93c6f5391d4f1298d098097c22"],
               "transactionHash" => "0x53bd884872de3e488692881baeec262e7b95234d3965248c39fe992fffd433e5",
               "transactionIndex" => 0,
-              "transactionLogIndex" => 0,
-              "type" => "mined"
+              "transactionLogIndex" => 0
             }
           ],
           "logsBloom" => "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000200000000000000000000020000000000000000200000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/apps/ethereum_jsonrpc/test/ethereum_jsonrpc/receipts_test.exs b/apps/ethereum_jsonrpc/test/ethereum_jsonrpc/receipts_test.exs
index f554c31ce572..945f3f78bc94 100644
--- a/apps/ethereum_jsonrpc/test/ethereum_jsonrpc/receipts_test.exs
+++ b/apps/ethereum_jsonrpc/test/ethereum_jsonrpc/receipts_test.exs
@@ -23,7 +23,6 @@ defmodule EthereumJSONRPC.ReceiptsTest do
         index: index,
         first_topic: first_topic,
         status: status,
-        type: type,
         transaction_hash: transaction_hash,
         transaction_index: transaction_index
       } =
@@ -41,7 +40,6 @@ defmodule EthereumJSONRPC.ReceiptsTest do
               first_topic: "0xf6db2bace4ac8277384553ad9603d045220a91fb2448ab6130d7a6f044f9a8cf",
               gas_used: 106_025,
               status: nil,
-              type: nil,
               transaction_hash: "0xd3efddbbeb6ad8d8bb3f6b8c8fb6165567e9dd868013146bdbeb60953c82822a",
               transaction_index: 17
             }
@@ -58,7 +56,6 @@ defmodule EthereumJSONRPC.ReceiptsTest do
               index: 0,
               first_topic: "0x600bcf04a13e752d1e3670a5a9f1c21177ca2a93c6f5391d4f1298d098097c22",
               status: :ok,
-              type: "mined",
               transaction_hash: "0x53bd884872de3e488692881baeec262e7b95234d3965248c39fe992fffd433e5",
               transaction_index: 0
             }
@@ -89,8 +86,7 @@ defmodule EthereumJSONRPC.ReceiptsTest do
                      "data" => data,
                      "logIndex" => integer_to_quantity(index),
                      "topics" => [first_topic],
-                     "transactionHash" => transaction_hash,
-                     "type" => type
+                     "transactionHash" => transaction_hash
                    }
                  ],
                  "status" => native_status,
diff --git a/apps/explorer/lib/explorer/chain/import/runner/logs.ex b/apps/explorer/lib/explorer/chain/import/runner/logs.ex
index c90adaa04a41..7c0e591a0f92 100644
--- a/apps/explorer/lib/explorer/chain/import/runner/logs.ex
+++ b/apps/explorer/lib/explorer/chain/import/runner/logs.ex
@@ -92,7 +92,6 @@ defmodule Explorer.Chain.Import.Runner.Logs do
           third_topic: fragment("EXCLUDED.third_topic"),
           fourth_topic: fragment("EXCLUDED.fourth_topic"),
           # Don't update `index` as it is part of the composite primary key and used for the conflict target
-          type: fragment("EXCLUDED.type"),
           # Don't update `transaction_hash` as it is part of the composite primary key and used for the conflict target
           inserted_at: fragment("LEAST(?, EXCLUDED.inserted_at)", log.inserted_at),
           updated_at: fragment("GREATEST(?, EXCLUDED.updated_at)", log.updated_at)
@@ -100,14 +99,13 @@ defmodule Explorer.Chain.Import.Runner.Logs do
       ],
       where:
         fragment(
-          "(EXCLUDED.address_hash, EXCLUDED.data, EXCLUDED.first_topic, EXCLUDED.second_topic, EXCLUDED.third_topic, EXCLUDED.fourth_topic, EXCLUDED.type) IS DISTINCT FROM (?, ?, ?, ?, ?, ?, ?)",
+          "(EXCLUDED.address_hash, EXCLUDED.data, EXCLUDED.first_topic, EXCLUDED.second_topic, EXCLUDED.third_topic, EXCLUDED.fourth_topic) IS DISTINCT FROM (?, ?, ?, ?, ?, ?)",
           log.address_hash,
           log.data,
           log.first_topic,
           log.second_topic,
           log.third_topic,
-          log.fourth_topic,
-          log.type
+          log.fourth_topic
         )
     )
   end
diff --git a/apps/explorer/lib/explorer/chain/log.ex b/apps/explorer/lib/explorer/chain/log.ex
index e1c87a8a1e60..be27eead7641 100644
--- a/apps/explorer/lib/explorer/chain/log.ex
+++ b/apps/explorer/lib/explorer/chain/log.ex
@@ -12,7 +12,7 @@ defmodule Explorer.Chain.Log do
   alias Explorer.SmartContract.SigProviderInterface
 
   @required_attrs ~w(address_hash data block_hash index transaction_hash)a
-  @optional_attrs ~w(first_topic second_topic third_topic fourth_topic type block_number)a
+  @optional_attrs ~w(first_topic second_topic third_topic fourth_topic block_number)a
 
   @typedoc """
    * `address` - address of contract that generate the event
@@ -27,7 +27,6 @@ defmodule Explorer.Chain.Log do
    * `transaction` - transaction for which `log` is
    * `transaction_hash` - foreign key for `transaction`.
    * `index` - index of the log entry in all logs for the `transaction`
-   * `type` - type of event.  *Nethermind-only*
   """
   @type t :: %__MODULE__{
           address: %Ecto.Association.NotLoaded{} | Address.t(),
@@ -41,8 +40,7 @@ defmodule Explorer.Chain.Log do
           fourth_topic: Hash.Full.t(),
           transaction: %Ecto.Association.NotLoaded{} | Transaction.t(),
           transaction_hash: Hash.Full.t(),
-          index: non_neg_integer(),
-          type: String.t() | nil
+          index: non_neg_integer()
         }
 
   @primary_key false
@@ -53,7 +51,6 @@ defmodule Explorer.Chain.Log do
     field(:third_topic, Hash.Full)
     field(:fourth_topic, Hash.Full)
     field(:index, :integer, primary_key: true)
-    field(:type, :string)
     field(:block_number, :integer)
 
     timestamps()
@@ -76,8 +73,7 @@ defmodule Explorer.Chain.Log do
   end
 
   @doc """
-  `address_hash` and `transaction_hash` are converted to `t:Explorer.Chain.Hash.t/0`.  The allowed values for `type`
-  are currently unknown, so it is left as a `t:String.t/0`.
+  `address_hash` and `transaction_hash` are converted to `t:Explorer.Chain.Hash.t/0`.
 
       iex> changeset = Explorer.Chain.Log.changeset(
       ...>   %Explorer.Chain.Log{},
@@ -90,8 +86,7 @@ defmodule Explorer.Chain.Log do
       ...>     index: 0,
       ...>     second_topic: nil,
       ...>     third_topic: nil,
-      ...>     transaction_hash: "0x53bd884872de3e488692881baeec262e7b95234d3965248c39fe992fffd433e5",
-      ...>     type: "mined"
+      ...>     transaction_hash: "0x53bd884872de3e488692881baeec262e7b95234d3965248c39fe992fffd433e5"
       ...>   }
       ...> )
       iex> changeset.valid?
@@ -107,8 +102,6 @@ defmodule Explorer.Chain.Log do
         bytes: <<83, 189, 136, 72, 114, 222, 62, 72, 134, 146, 136, 27, 174, 236, 38, 46, 123, 149, 35, 77, 57, 101, 36,
                  140, 57, 254, 153, 47, 255, 212, 51, 229>>
       }
-      iex> changeset.changes.type
-      "mined"
 
   """
   def changeset(%__MODULE__{} = log, attrs \\ %{}) do
diff --git a/apps/explorer/lib/explorer/eth_rpc.ex b/apps/explorer/lib/explorer/eth_rpc.ex
index 0e5b493a9aef..d7260cf3987c 100644
--- a/apps/explorer/lib/explorer/eth_rpc.ex
+++ b/apps/explorer/lib/explorer/eth_rpc.ex
@@ -180,8 +180,7 @@ defmodule Explorer.EthRPC do
       "topics" => topics,
       "transactionHash" => to_string(log.transaction_hash),
       "transactionIndex" => log.transaction_index,
-      "transactionLogIndex" => log.index,
-      "type" => "mined"
+      "transactionLogIndex" => log.index
     }
   end
 
diff --git a/apps/explorer/lib/explorer/etherscan/logs.ex b/apps/explorer/lib/explorer/etherscan/logs.ex
index e83587869d6d..a0c432ce4432 100644
--- a/apps/explorer/lib/explorer/etherscan/logs.ex
+++ b/apps/explorer/lib/explorer/etherscan/logs.ex
@@ -34,8 +34,7 @@ defmodule Explorer.Etherscan.Logs do
     :fourth_topic,
     :index,
     :address_hash,
-    :transaction_hash,
-    :type
+    :transaction_hash
   ]
 
   @default_paging_options %{block_number: nil, log_index: nil}
diff --git a/apps/explorer/priv/repo/migrations/20231215115638_drop_unused_logs_type_index.exs b/apps/explorer/priv/repo/migrations/20231215115638_drop_unused_logs_type_index.exs
new file mode 100644
index 000000000000..fc7df4ddce8c
--- /dev/null
+++ b/apps/explorer/priv/repo/migrations/20231215115638_drop_unused_logs_type_index.exs
@@ -0,0 +1,11 @@
+defmodule Explorer.Repo.Migrations.DropUnusedLogsTypeIndex do
+  use Ecto.Migration
+
+  def change do
+    drop(index(:logs, [:type], name: :logs_type_index))
+
+    alter table(:logs) do
+      remove(:type)
+    end
+  end
+end
diff --git a/apps/explorer/test/explorer/chain/import_test.exs b/apps/explorer/test/explorer/chain/import_test.exs
index a8d62bfcad6c..0d2fbfa02de3 100644
--- a/apps/explorer/test/explorer/chain/import_test.exs
+++ b/apps/explorer/test/explorer/chain/import_test.exs
@@ -103,8 +103,7 @@ defmodule Explorer.Chain.ImportTest do
             third_topic: third_topic,
             fourth_topic: nil,
             index: 0,
-            transaction_hash: "0x53bd884872de3e488692881baeec262e7b95234d3965248c39fe992fffd433e5",
-            type: "mined"
+            transaction_hash: "0x53bd884872de3e488692881baeec262e7b95234d3965248c39fe992fffd433e5"
           }
         ],
         timeout: 5
@@ -296,7 +295,6 @@ defmodule Explorer.Chain.ImportTest do
                         <<83, 189, 136, 72, 114, 222, 62, 72, 134, 146, 136, 27, 174, 236, 38, 46, 123, 149, 35, 77, 57,
                           101, 36, 140, 57, 254, 153, 47, 255, 212, 51, 229>>
                     },
-                    type: "mined",
                     inserted_at: %{},
                     updated_at: %{}
                   }
diff --git a/apps/explorer/test/explorer/chain_test.exs b/apps/explorer/test/explorer/chain_test.exs
index 083d50d0f6dc..fb529bb074c6 100644
--- a/apps/explorer/test/explorer/chain_test.exs
+++ b/apps/explorer/test/explorer/chain_test.exs
@@ -1311,8 +1311,7 @@ defmodule Explorer.ChainTest do
             third_topic: third_topic,
             fourth_topic: nil,
             index: 0,
-            transaction_hash: "0x53bd884872de3e488692881baeec262e7b95234d3965248c39fe992fffd433e5",
-            type: "mined"
+            transaction_hash: "0x53bd884872de3e488692881baeec262e7b95234d3965248c39fe992fffd433e5"
           }
         ]
       },
@@ -1490,7 +1489,6 @@ defmodule Explorer.ChainTest do
                         <<83, 189, 136, 72, 114, 222, 62, 72, 134, 146, 136, 27, 174, 236, 38, 46, 123, 149, 35, 77, 57,
                           101, 36, 140, 57, 254, 153, 47, 255, 212, 51, 229>>
                     },
-                    type: "mined",
                     inserted_at: %{},
                     updated_at: %{}
                   }
diff --git a/apps/explorer/test/support/factory.ex b/apps/explorer/test/support/factory.ex
index 4c218afb3809..5fdd286ee056 100644
--- a/apps/explorer/test/support/factory.ex
+++ b/apps/explorer/test/support/factory.ex
@@ -679,8 +679,7 @@ defmodule Explorer.Factory do
       index: sequence("log_index", & &1),
       second_topic: nil,
       third_topic: nil,
-      transaction: build(:transaction),
-      type: sequence("0x")
+      transaction: build(:transaction)
     }
   end
 
diff --git a/apps/indexer/lib/indexer/transform/mint_transfers.ex b/apps/indexer/lib/indexer/transform/mint_transfers.ex
index e57a9841a7fb..c53dde7a5387 100644
--- a/apps/indexer/lib/indexer/transform/mint_transfers.ex
+++ b/apps/indexer/lib/indexer/transform/mint_transfers.ex
@@ -24,8 +24,7 @@ defmodule Indexer.Transform.MintTransfers do
         ...>         index: 1,
         ...>         second_topic: "0x0000000000000000000000009a4a90e2732f3fa4087b0bb4bf85c76d14833df1",
         ...>         third_topic: "0x0000000000000000000000007301cfa0e1756b71869e93d4e4dca5c7d0eb0aa6",
-        ...>         transaction_hash: "0x1d5066d30ff3404a9306733136103ac2b0b989951c38df637f464f3667f8d4ee",
-        ...>         type: "mined"
+        ...>         transaction_hash: "0x1d5066d30ff3404a9306733136103ac2b0b989951c38df637f464f3667f8d4ee"
         ...>        }
         ...>     ])
         %{
diff --git a/apps/indexer/test/indexer/block/fetcher/receipts_test.exs b/apps/indexer/test/indexer/block/fetcher/receipts_test.exs
index c70d10761a01..a7c45106551e 100644
--- a/apps/indexer/test/indexer/block/fetcher/receipts_test.exs
+++ b/apps/indexer/test/indexer/block/fetcher/receipts_test.exs
@@ -51,8 +51,7 @@ defmodule Indexer.Block.Fetcher.ReceiptsTest do
                      "topics" => ["0x600bcf04a13e752d1e3670a5a9f1c21177ca2a93c6f5391d4f1298d098097c22"],
                      "transactionHash" => "0x43bd884872de3e488692881baeec262e7b95234d3965248c39fe992fffd433e5",
                      "transactionIndex" => "0x0",
-                     "transactionLogIndex" => "0x0",
-                     "type" => "mined"
+                     "transactionLogIndex" => "0x0"
                    }
                  ],
                  "logsBloom" =>
@@ -82,8 +81,7 @@ defmodule Indexer.Block.Fetcher.ReceiptsTest do
                      "topics" => ["0x600bcf04a13e752d1e3670a5a9f1c21177ca2a93c6f5391d4f1298d098097c22"],
                      "transactionHash" => "0x53bd884872de3e488692881baeec262e7b95234d3965248c39fe992fffd433e5",
                      "transactionIndex" => "0x0",
-                     "transactionLogIndex" => "0x0",
-                     "type" => "mined"
+                     "transactionLogIndex" => "0x0"
                    }
                  ],
                  "logsBloom" =>
diff --git a/apps/indexer/test/indexer/block/fetcher_test.exs b/apps/indexer/test/indexer/block/fetcher_test.exs
index 24be0dfa8803..0498cfd37ecb 100644
--- a/apps/indexer/test/indexer/block/fetcher_test.exs
+++ b/apps/indexer/test/indexer/block/fetcher_test.exs
@@ -375,8 +375,7 @@ defmodule Indexer.Block.FetcherTest do
                          "topics" => ["0x600bcf04a13e752d1e3670a5a9f1c21177ca2a93c6f5391d4f1298d098097c22"],
                          "transactionHash" => "0x53bd884872de3e488692881baeec262e7b95234d3965248c39fe992fffd433e5",
                          "transactionIndex" => "0x0",
-                         "transactionLogIndex" => "0x0",
-                         "type" => "mined"
+                         "transactionLogIndex" => "0x0"
                        }
                      ],
                      "logsBloom" =>
diff --git a/apps/indexer/test/indexer/transform/mint_transfers_test.exs b/apps/indexer/test/indexer/transform/mint_transfers_test.exs
index 04499a7af454..4670e983a272 100644
--- a/apps/indexer/test/indexer/transform/mint_transfers_test.exs
+++ b/apps/indexer/test/indexer/transform/mint_transfers_test.exs
@@ -17,8 +17,7 @@ defmodule Indexer.Transform.MintTransfersTest do
           index: 1,
           second_topic: "0x0000000000000000000000009a4a90e2732f3fa4087b0bb4bf85c76d14833df1",
           third_topic: "0x0000000000000000000000007301cfa0e1756b71869e93d4e4dca5c7d0eb0aa6",
-          transaction_hash: "0x1d5066d30ff3404a9306733136103ac2b0b989951c38df637f464f3667f8d4ee",
-          type: "mined"
+          transaction_hash: "0x1d5066d30ff3404a9306733136103ac2b0b989951c38df637f464f3667f8d4ee"
         }
       ]
 
@@ -47,8 +46,7 @@ defmodule Indexer.Transform.MintTransfersTest do
         index: 1,
         second_topic: "0x0000000000000000000000009a4a90e2732f3fa4087b0bb4bf85c76d14833df1",
         third_topic: "0x0000000000000000000000007301cfa0e1756b71869e93d4e4dca5c7d0eb0aa6",
-        transaction_hash: "0x1d5066d30ff3404a9306733136103ac2b0b989951c38df637f464f3667f8d4ee",
-        type: "mined"
+        transaction_hash: "0x1d5066d30ff3404a9306733136103ac2b0b989951c38df637f464f3667f8d4ee"
       }
     ]
 
diff --git a/apps/indexer/test/indexer/transform/token_transfers_test.exs b/apps/indexer/test/indexer/transform/token_transfers_test.exs
index 8833474acccc..0c670035cc35 100644
--- a/apps/indexer/test/indexer/transform/token_transfers_test.exs
+++ b/apps/indexer/test/indexer/transform/token_transfers_test.exs
@@ -19,8 +19,7 @@ defmodule Indexer.Transform.TokenTransfersTest do
             index: 8,
             second_topic: "0x000000000000000000000000556813d9cc20acfe8388af029a679d34a63388db",
             third_topic: "0x00000000000000000000000092148dd870fa1b7c4700f2bd7f44238821c26f73",
-            transaction_hash: "0x43dfd761974e8c3351d285ab65bee311454eb45b149a015fe7804a33252f19e5",
-            type: "mined"
+            transaction_hash: "0x43dfd761974e8c3351d285ab65bee311454eb45b149a015fe7804a33252f19e5"
           },
           %{
             address_hash: "0x6ea5ec9cb832e60b6b1654f5826e9be638f276a5",
@@ -32,8 +31,7 @@ defmodule Indexer.Transform.TokenTransfersTest do
             index: 0,
             second_topic: "0x00000000000000000000000063b0595bb7a0b7edd0549c9557a0c8aee6da667b",
             third_topic: "0x000000000000000000000000f3089e15d0c23c181d7f98b0878b560bfe193a1d",
-            transaction_hash: "0x8425a9b81a9bd1c64861110c1a453b84719cb0361d6fa0db68abf7611b9a890e",
-            type: "mined"
+            transaction_hash: "0x8425a9b81a9bd1c64861110c1a453b84719cb0361d6fa0db68abf7611b9a890e"
           },
           %{
             address_hash: "0x91932e8c6776fb2b04abb71874a7988747728bb2",
@@ -45,8 +43,7 @@ defmodule Indexer.Transform.TokenTransfersTest do
             index: 1,
             second_topic: "0x0000000000000000000000009851ba177554eb07271ac230a137551e6dd0aa84",
             third_topic: "0x000000000000000000000000dccb72afee70e60b0c1226288fe86c01b953e8ac",
-            transaction_hash: "0x4011d9a930a3da620321589a54dc0ca3b88216b4886c7a7c3aaad1fb17702d35",
-            type: "mined"
+            transaction_hash: "0x4011d9a930a3da620321589a54dc0ca3b88216b4886c7a7c3aaad1fb17702d35"
           },
           %{
             address_hash: "0x0BE9e53fd7EDaC9F859882AfdDa116645287C629",
@@ -58,8 +55,7 @@ defmodule Indexer.Transform.TokenTransfersTest do
             third_topic: nil,
             fourth_topic: nil,
             index: 1,
-            transaction_hash: "0x185889bc91372106ecf114a4e23f4ee615e131ae3e698078bd5d2ed7e3f55a49",
-            type: "mined"
+            transaction_hash: "0x185889bc91372106ecf114a4e23f4ee615e131ae3e698078bd5d2ed7e3f55a49"
           },
           %{
             address_hash: "0x0BE9e53fd7EDaC9F859882AfdDa116645287C629",
@@ -71,8 +67,7 @@ defmodule Indexer.Transform.TokenTransfersTest do
             third_topic: nil,
             fourth_topic: nil,
             index: 1,
-            transaction_hash: "0x07510dbfddbac9064f7d607c2d9a14aa26fa19cdfcd578c0b585ff2395df543f",
-            type: "mined"
+            transaction_hash: "0x07510dbfddbac9064f7d607c2d9a14aa26fa19cdfcd578c0b585ff2395df543f"
           }
         ]
 
@@ -157,8 +152,7 @@ defmodule Indexer.Transform.TokenTransfersTest do
         second_topic: nil,
         third_topic: nil,
         transaction_hash: "0x6d2dd62c178e55a13b65601f227c4ffdd8aa4e3bcb1f24731363b4f7619e92c8",
-        block_hash: "0x79594150677f083756a37eee7b97ed99ab071f502104332cb3835bac345711ca",
-        type: "mined"
+        block_hash: "0x79594150677f083756a37eee7b97ed99ab071f502104332cb3835bac345711ca"
       }
 
       expected = %{
@@ -198,8 +192,7 @@ defmodule Indexer.Transform.TokenTransfersTest do
         fourth_topic: "0x0000000000000000000000009c978f4cfa1fe13406bcc05baf26a35716f881dd",
         index: 2,
         transaction_hash: "0x6d2dd62c178e55a13b65601f227c4ffdd8aa4e3bcb1f24731363b4f7619e92c8",
-        block_hash: "0x79594150677f083756a37eee7b97ed99ab071f502104332cb3835bac345711ca",
-        type: "mined"
+        block_hash: "0x79594150677f083756a37eee7b97ed99ab071f502104332cb3835bac345711ca"
       }
 
       assert TokenTransfers.parse([log]) == %{
@@ -240,8 +233,7 @@ defmodule Indexer.Transform.TokenTransfersTest do
         fourth_topic: "0x0000000000000000000000006c943470780461b00783ad530a53913bd2c104d3",
         index: 2,
         transaction_hash: "0x6d2dd62c178e55a13b65601f227c4ffdd8aa4e3bcb1f24731363b4f7619e92c8",
-        block_hash: "0x79594150677f083756a37eee7b97ed99ab071f502104332cb3835bac345711ca",
-        type: "mined"
+        block_hash: "0x79594150677f083756a37eee7b97ed99ab071f502104332cb3835bac345711ca"
       }
 
       assert TokenTransfers.parse([log]) == %{
@@ -275,8 +267,7 @@ defmodule Indexer.Transform.TokenTransfersTest do
         fourth_topic: "0x0000000000000000000000000000000000000000",
         index: 6,
         transaction_hash: "0xa6ad6588edb4abd8ca45f30d2f026ba20b68a3002a5870dbd30cc3752568483b",
-        block_hash: "0x61b720e40f8c521edd77a52cabce556c18b18b198f78e361f310003386ff1f02",
-        type: "mined"
+        block_hash: "0x61b720e40f8c521edd77a52cabce556c18b18b198f78e361f310003386ff1f02"
       }
 
       assert TokenTransfers.parse([log]) == %{
@@ -296,8 +287,7 @@ defmodule Indexer.Transform.TokenTransfersTest do
         index: 2,
         second_topic: nil,
         third_topic: nil,
-        transaction_hash: "0x6d2dd62c178e55a13b65601f227c4ffdd8aa4e3bcb1f24731363b4f7619e92c8",
-        type: "mined"
+        transaction_hash: "0x6d2dd62c178e55a13b65601f227c4ffdd8aa4e3bcb1f24731363b4f7619e92c8"
       }
 
       error = capture_log(fn -> %{tokens: [], token_transfers: []} = TokenTransfers.parse([log]) end)
@@ -319,8 +309,7 @@ defmodule Indexer.Transform.TokenTransfersTest do
         index: 8,
         second_topic: "0x000000000000000000000000556813d9cc20acfe8388af029a679d34a63388db",
         third_topic: "0x00000000000000000000000092148dd870fa1b7c4700f2bd7f44238821c26f73",
-        transaction_hash: "0x43dfd761974e8c3351d285ab65bee311454eb45b149a015fe7804a33252f19e5",
-        type: "mined"
+        transaction_hash: "0x43dfd761974e8c3351d285ab65bee311454eb45b149a015fe7804a33252f19e5"
       }
 
       assert %{
@@ -343,8 +332,7 @@ defmodule Indexer.Transform.TokenTransfersTest do
           index: 8,
           second_topic: "0x000000000000000000000000556813d9cc20acfe8388af029a679d34a63388db",
           third_topic: "0x00000000000000000000000092148dd870fa1b7c4700f2bd7f44238821c26f73",
-          transaction_hash: "0x43dfd761974e8c3351d285ab65bee311454eb45b149a015fe7804a33252f19e5",
-          type: "mined"
+          transaction_hash: "0x43dfd761974e8c3351d285ab65bee311454eb45b149a015fe7804a33252f19e5"
         },
         %{
           address_hash: contract_address_hash,
@@ -357,8 +345,7 @@ defmodule Indexer.Transform.TokenTransfersTest do
           fourth_topic: "0x0000000000000000000000009c978f4cfa1fe13406bcc05baf26a35716f881dd",
           index: 2,
           transaction_hash: "0x43dfd761974e8c3351d285ab65bee311454eb45b149a015fe7804a33252f19e5",
-          block_hash: "0x79594150677f083756a37eee7b97ed99ab071f502104332cb3835bac345711ca",
-          type: "mined"
+          block_hash: "0x79594150677f083756a37eee7b97ed99ab071f502104332cb3835bac345711ca"
         }
       ]
 

From a4799d35aa532461ebb8f05bfb81ae5a5f811b3e Mon Sep 17 00:00:00 2001
From: Victor Baranov <baranov.viktor.27@gmail.com>
Date: Thu, 21 Dec 2023 19:07:03 +0300
Subject: [PATCH 857/909] Drop unused token_id column from token_transfers
 table and indexes based on this column (#9005)

* Drop unused token_id column from token_transfers table and indexes on this column

* Remove token ids migration

* Refactor DB migration

* Update CHANGE LOG entry
---
 CHANGELOG.md                                  |  1 +
 .../models/transaction_state_helper.ex        |  2 +-
 .../lib/block_scout_web/schema/types.ex       |  1 -
 .../tokens/inventory_controller_test.exs      |  2 +-
 .../schema/query/token_transfers_test.exs     |  3 -
 .../views/tokens/helper_test.exs              |  2 +-
 apps/explorer/config/config.exs               |  2 -
 apps/explorer/config/runtime/test.exs         |  2 -
 apps/explorer/lib/explorer/application.ex     |  3 +-
 .../lib/explorer/chain/token_transfer.ex      |  5 +-
 .../chain/transaction/state_change.ex         |  2 +-
 .../lowest_block_number_updater.ex            | 65 --------------
 .../supervisor.ex                             | 70 ----------------
 .../worker.ex                                 | 84 -------------------
 ...ken_transfer_token_id_migrator_progress.ex | 67 ---------------
 ...5_drop_token_transfers_token_id_column.exs | 12 +++
 .../lowest_block_number_updater_test.exs      | 37 --------
 .../worker_test.exs                           | 31 -------
 18 files changed, 19 insertions(+), 372 deletions(-)
 delete mode 100644 apps/explorer/lib/explorer/token_transfer_token_id_migration/lowest_block_number_updater.ex
 delete mode 100644 apps/explorer/lib/explorer/token_transfer_token_id_migration/supervisor.ex
 delete mode 100644 apps/explorer/lib/explorer/token_transfer_token_id_migration/worker.ex
 delete mode 100644 apps/explorer/lib/explorer/utility/token_transfer_token_id_migrator_progress.ex
 create mode 100644 apps/explorer/priv/repo/migrations/20231215094615_drop_token_transfers_token_id_column.exs
 delete mode 100644 apps/explorer/test/explorer/token_transfer_token_id_migration/lowest_block_number_updater_test.exs
 delete mode 100644 apps/explorer/test/explorer/token_transfer_token_id_migration/worker_test.exs

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 48ef1d03c82c..7d3662a542e0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,6 +11,7 @@
 - [#9009](https://github.com/blockscout/blockscout/pull/9009) - Index for block refetch_needed
 - [#9007](https://github.com/blockscout/blockscout/pull/9007) - Drop logs type index
 - [#9006](https://github.com/blockscout/blockscout/pull/9006) - Drop unused indexes on address_current_token_balances table
+- [#9005](https://github.com/blockscout/blockscout/pull/9005) - Drop unused token_id column from token_transfers table and indexes based on this column
 - [#9000](https://github.com/blockscout/blockscout/pull/9000) - Change log topic type in the DB to bytea
 - [#8996](https://github.com/blockscout/blockscout/pull/8996) - Refine token transfers token ids index
 - [#5322](https://github.com/blockscout/blockscout/pull/5322) - DB denormalization: block consensus and timestamp in transaction table
diff --git a/apps/block_scout_web/lib/block_scout_web/models/transaction_state_helper.ex b/apps/block_scout_web/lib/block_scout_web/models/transaction_state_helper.ex
index 3971a5463a64..41b5bd1cfe7b 100644
--- a/apps/block_scout_web/lib/block_scout_web/models/transaction_state_helper.ex
+++ b/apps/block_scout_web/lib/block_scout_web/models/transaction_state_helper.ex
@@ -112,7 +112,7 @@ defmodule BlockScoutWeb.Models.TransactionStateHelper do
 
     token_ids =
       if token.type == "ERC-1155" do
-        token_transfer.token_ids || [token_transfer.token_id]
+        token_transfer.token_ids
       else
         [nil]
       end
diff --git a/apps/block_scout_web/lib/block_scout_web/schema/types.ex b/apps/block_scout_web/lib/block_scout_web/schema/types.ex
index 99f47a29163b..d81f6eca5137 100644
--- a/apps/block_scout_web/lib/block_scout_web/schema/types.ex
+++ b/apps/block_scout_web/lib/block_scout_web/schema/types.ex
@@ -130,7 +130,6 @@ defmodule BlockScoutWeb.Schema.Types do
     field(:amounts, list_of(:decimal))
     field(:block_number, :integer)
     field(:log_index, :integer)
-    field(:token_id, :decimal)
     field(:token_ids, list_of(:decimal))
     field(:from_address_hash, :address_hash)
     field(:to_address_hash, :address_hash)
diff --git a/apps/block_scout_web/test/block_scout_web/controllers/tokens/inventory_controller_test.exs b/apps/block_scout_web/test/block_scout_web/controllers/tokens/inventory_controller_test.exs
index 799b54da797c..e15f85569214 100644
--- a/apps/block_scout_web/test/block_scout_web/controllers/tokens/inventory_controller_test.exs
+++ b/apps/block_scout_web/test/block_scout_web/controllers/tokens/inventory_controller_test.exs
@@ -126,7 +126,7 @@ defmodule BlockScoutWeb.Tokens.InventoryControllerTest do
         transaction: transaction,
         token_contract_address: token.contract_address,
         token: token,
-        token_id: 1000
+        token_ids: [1000]
       )
 
       conn = get(conn, token_inventory_path(conn, :index, token.contract_address_hash), %{type: "JSON"})
diff --git a/apps/block_scout_web/test/block_scout_web/schema/query/token_transfers_test.exs b/apps/block_scout_web/test/block_scout_web/schema/query/token_transfers_test.exs
index ea20aa4f4ede..d10a3fdcc639 100644
--- a/apps/block_scout_web/test/block_scout_web/schema/query/token_transfers_test.exs
+++ b/apps/block_scout_web/test/block_scout_web/schema/query/token_transfers_test.exs
@@ -16,7 +16,6 @@ defmodule BlockScoutWeb.Schema.Query.TokenTransfersTest do
               amounts
               block_number
               log_index
-              token_id
               token_ids
               from_address_hash
               to_address_hash
@@ -45,7 +44,6 @@ defmodule BlockScoutWeb.Schema.Query.TokenTransfersTest do
                          "amounts" => Enum.map(token_transfer.amounts, &to_string/1),
                          "block_number" => token_transfer.block_number,
                          "log_index" => token_transfer.log_index,
-                         "token_id" => token_transfer.token_id,
                          "token_ids" => Enum.map(token_transfer.token_ids, &to_string/1),
                          "from_address_hash" => to_string(token_transfer.from_address_hash),
                          "to_address_hash" => to_string(token_transfer.to_address_hash),
@@ -70,7 +68,6 @@ defmodule BlockScoutWeb.Schema.Query.TokenTransfersTest do
               amount
               block_number
               log_index
-              token_id
               from_address_hash
               to_address_hash
               token_contract_address_hash
diff --git a/apps/block_scout_web/test/block_scout_web/views/tokens/helper_test.exs b/apps/block_scout_web/test/block_scout_web/views/tokens/helper_test.exs
index e59a85fb76c4..a8815379cedb 100644
--- a/apps/block_scout_web/test/block_scout_web/views/tokens/helper_test.exs
+++ b/apps/block_scout_web/test/block_scout_web/views/tokens/helper_test.exs
@@ -27,7 +27,7 @@ defmodule BlockScoutWeb.Tokens.HelperTest do
 
     test "returns a string with the token_id with ERC-721 token" do
       token = build(:token, type: "ERC-721", decimals: nil)
-      token_transfer = build(:token_transfer, token: token, amount: nil, token_id: 1)
+      token_transfer = build(:token_transfer, token: token, amount: nil, token_ids: [1])
 
       assert Helper.token_transfer_amount(token_transfer) == {:ok, :erc721_instance}
     end
diff --git a/apps/explorer/config/config.exs b/apps/explorer/config/config.exs
index 1dac8ff0963b..cc22af6be938 100644
--- a/apps/explorer/config/config.exs
+++ b/apps/explorer/config/config.exs
@@ -109,8 +109,6 @@ config :explorer, Explorer.Counters.BlockPriorityFeeCounter,
   enabled: true,
   enable_consolidation: true
 
-config :explorer, Explorer.TokenTransferTokenIdMigration.Supervisor, enabled: true
-
 config :explorer, Explorer.TokenInstanceOwnerAddressMigration.Supervisor, enabled: true
 
 config :explorer, Explorer.Migrator.TransactionsDenormalization, enabled: true
diff --git a/apps/explorer/config/runtime/test.exs b/apps/explorer/config/runtime/test.exs
index 367f4793f27e..d496caa48a78 100644
--- a/apps/explorer/config/runtime/test.exs
+++ b/apps/explorer/config/runtime/test.exs
@@ -33,8 +33,6 @@ config :explorer, Explorer.Market.History.Cataloger, enabled: false
 
 config :explorer, Explorer.Tracer, disabled?: false
 
-config :explorer, Explorer.TokenTransferTokenIdMigration.Supervisor, enabled: false
-
 config :explorer, Explorer.TokenInstanceOwnerAddressMigration.Supervisor, enabled: false
 
 config :explorer, Explorer.Migrator.TransactionsDenormalization, enabled: false
diff --git a/apps/explorer/lib/explorer/application.ex b/apps/explorer/lib/explorer/application.ex
index dfed4625c879..1749cb69fd59 100644
--- a/apps/explorer/lib/explorer/application.ex
+++ b/apps/explorer/lib/explorer/application.ex
@@ -5,7 +5,7 @@ defmodule Explorer.Application do
 
   use Application
 
-  alias Explorer.{Admin, TokenTransferTokenIdMigration}
+  alias Explorer.Admin
 
   alias Explorer.Chain.Cache.{
     Accounts,
@@ -122,7 +122,6 @@ defmodule Explorer.Application do
         configure(Explorer.Validator.MetadataProcessor),
         configure(Explorer.Tags.AddressTag.Cataloger),
         configure(MinMissingBlockNumber),
-        configure(TokenTransferTokenIdMigration.Supervisor),
         configure(Explorer.Chain.Fetcher.CheckBytecodeMatchingOnDemand),
         configure(Explorer.Chain.Fetcher.FetchValidatorInfoOnDemand),
         configure(Explorer.TokenInstanceOwnerAddressMigration.Supervisor),
diff --git a/apps/explorer/lib/explorer/chain/token_transfer.ex b/apps/explorer/lib/explorer/chain/token_transfer.ex
index c53414e209a2..38dad6123521 100644
--- a/apps/explorer/lib/explorer/chain/token_transfer.ex
+++ b/apps/explorer/lib/explorer/chain/token_transfer.ex
@@ -44,7 +44,6 @@ defmodule Explorer.Chain.TokenTransfer do
   * `:to_address_hash` - Address hash foreign key
   * `:token_contract_address` - The `t:Explorer.Chain.Address.t/0` of the token's contract.
   * `:token_contract_address_hash` - Address hash foreign key
-  * `:token_id` - ID of the token (applicable to ERC-721 tokens)
   * `:transaction` - The `t:Explorer.Chain.Transaction.t/0` ledger
   * `:transaction_hash` - Transaction foreign key
   * `:log_index` - Index of the corresponding `t:Explorer.Chain.Log.t/0` in the block.
@@ -61,7 +60,6 @@ defmodule Explorer.Chain.TokenTransfer do
           to_address_hash: Hash.Address.t(),
           token_contract_address: %Ecto.Association.NotLoaded{} | Address.t(),
           token_contract_address_hash: Hash.Address.t(),
-          token_id: non_neg_integer() | nil,
           transaction: %Ecto.Association.NotLoaded{} | Transaction.t(),
           transaction_hash: Hash.Full.t(),
           log_index: non_neg_integer(),
@@ -86,7 +84,6 @@ defmodule Explorer.Chain.TokenTransfer do
     field(:amount, :decimal)
     field(:block_number, :integer)
     field(:log_index, :integer, primary_key: true)
-    field(:token_id, :decimal)
     field(:amounts, {:array, :decimal})
     field(:token_ids, {:array, :decimal})
     field(:index_in_batch, :integer, virtual: true)
@@ -129,7 +126,7 @@ defmodule Explorer.Chain.TokenTransfer do
   end
 
   @required_attrs ~w(block_number log_index from_address_hash to_address_hash token_contract_address_hash transaction_hash block_hash)a
-  @optional_attrs ~w(amount token_id amounts token_ids)a
+  @optional_attrs ~w(amount amounts token_ids)a
 
   @doc false
   def changeset(%TokenTransfer{} = struct, params \\ %{}) do
diff --git a/apps/explorer/lib/explorer/chain/transaction/state_change.ex b/apps/explorer/lib/explorer/chain/transaction/state_change.ex
index 3a399aa019f1..c0b70f23c493 100644
--- a/apps/explorer/lib/explorer/chain/transaction/state_change.ex
+++ b/apps/explorer/lib/explorer/chain/transaction/state_change.ex
@@ -120,7 +120,7 @@ defmodule Explorer.Chain.Transaction.StateChange do
   end
 
   defp do_update_balance(old_val, type, transfer, _) do
-    token_ids = if transfer.token.type == "ERC-1155", do: transfer.token_ids || [transfer.token_id], else: [nil]
+    token_ids = if transfer.token.type == "ERC-1155", do: transfer.token_ids, else: [nil]
     transfer_amounts = transfer.amounts || [transfer.amount || 1]
 
     sub_or_add =
diff --git a/apps/explorer/lib/explorer/token_transfer_token_id_migration/lowest_block_number_updater.ex b/apps/explorer/lib/explorer/token_transfer_token_id_migration/lowest_block_number_updater.ex
deleted file mode 100644
index 5794e524ccfc..000000000000
--- a/apps/explorer/lib/explorer/token_transfer_token_id_migration/lowest_block_number_updater.ex
+++ /dev/null
@@ -1,65 +0,0 @@
-defmodule Explorer.TokenTransferTokenIdMigration.LowestBlockNumberUpdater do
-  @moduledoc """
-  Collects processed block numbers from token id migration workers
-  and updates last_processed_block_number according to them.
-  Full algorithm is in the 'Indexer.Fetcher.TokenTransferTokenIdMigration.Supervisor' module doc.
-  """
-  use GenServer
-
-  alias Explorer.Utility.TokenTransferTokenIdMigratorProgress
-
-  def start_link(_) do
-    GenServer.start_link(__MODULE__, :ok, name: __MODULE__)
-  end
-
-  @impl true
-  def init(_) do
-    last_processed_block_number = TokenTransferTokenIdMigratorProgress.get_last_processed_block_number()
-
-    {:ok, %{last_processed_block_number: last_processed_block_number, processed_ranges: []}}
-  end
-
-  def add_range(from, to) do
-    GenServer.cast(__MODULE__, {:add_range, from..to})
-  end
-
-  @impl true
-  def handle_cast({:add_range, range}, %{processed_ranges: processed_ranges} = state) do
-    ranges =
-      [range | processed_ranges]
-      |> Enum.sort_by(& &1.last, &>=/2)
-      |> normalize_ranges()
-
-    {new_last_number, new_ranges} = maybe_update_last_processed_number(state.last_processed_block_number, ranges)
-
-    {:noreply, %{last_processed_block_number: new_last_number, processed_ranges: new_ranges}}
-  end
-
-  defp normalize_ranges(ranges) do
-    %{prev_range: prev, result: result} =
-      Enum.reduce(ranges, %{prev_range: nil, result: []}, fn range, %{prev_range: prev_range, result: result} ->
-        case {prev_range, range} do
-          {nil, _} ->
-            %{prev_range: range, result: result}
-
-          {%{last: l1} = r1, %{first: f2} = r2} when l1 - 1 > f2 ->
-            %{prev_range: r2, result: [r1 | result]}
-
-          {%{first: f1}, %{last: l2}} ->
-            %{prev_range: f1..l2, result: result}
-        end
-      end)
-
-    Enum.reverse([prev | result])
-  end
-
-  # since ranges are normalized, we need to check only the first range to determine the new last_processed_number
-  defp maybe_update_last_processed_number(current_last, [from..to | rest] = ranges) when current_last - 1 <= from do
-    case TokenTransferTokenIdMigratorProgress.update_last_processed_block_number(to) do
-      {:ok, _} -> {to, rest}
-      _ -> {current_last, ranges}
-    end
-  end
-
-  defp maybe_update_last_processed_number(current_last, ranges), do: {current_last, ranges}
-end
diff --git a/apps/explorer/lib/explorer/token_transfer_token_id_migration/supervisor.ex b/apps/explorer/lib/explorer/token_transfer_token_id_migration/supervisor.ex
deleted file mode 100644
index 2121158fee35..000000000000
--- a/apps/explorer/lib/explorer/token_transfer_token_id_migration/supervisor.ex
+++ /dev/null
@@ -1,70 +0,0 @@
-defmodule Explorer.TokenTransferTokenIdMigration.Supervisor do
-  @moduledoc """
-  Supervises parts of token id migration process.
-
-  Migration process algorithm:
-
-  Defining the bounds of migration (by the first and the last block number of TokenTransfer).
-  Supervisor starts the workers in amount equal to 'TOKEN_ID_MIGRATION_CONCURRENCY' env value (defaults to 1)
-  and the 'LowestBlockNumberUpdater'.
-
-  Each worker goes through the token transfers by batches ('TOKEN_ID_MIGRATION_BATCH_SIZE', defaults to 500)
-  and updates the token_ids to be equal of [token_id] for transfers that has any token_id.
-  Worker goes from the newest blocks to latest.
-  After worker is done with current batch, it sends the information about processed batch to 'LowestBlockNumberUpdater'
-  and takes the next by defining its bounds based on amount of all workers.
-
-  For example, if batch size is 10, we have 5 workers and 100 items to be processed,
-  the distribution will be like this:
-  1 worker - 99..90, 49..40
-  2 worker - 89..80, 39..30
-  3 worker - 79..70, 29..20
-  4 worker - 69..60, 19..10
-  5 worker - 59..50, 9..0
-
-  'LowestBlockNumberUpdater' keeps the information about the last processed block number
-  (which is stored in the 'token_transfer_token_id_migrator_progress' db entity)
-  and block ranges that has already been processed by the workers but couldn't be committed
-  to last processed block number yet (because of the possible gap between the current last block
-  and upper bound of the last processed batch). Uncommitted block numbers are stored in normalize ranges.
-  When there is no gap between the last processed block number and the upper bound of the upper range,
-  'LowestBlockNumberUpdater' updates the last processed block number in db and drops this range from its state.
-
-  This supervisor won't start if the migration is completed
-  (last processed block number in db == 'TOKEN_ID_MIGRATION_FIRST_BLOCK' (defaults to 0)).
-  """
-  use Supervisor
-
-  alias Explorer.TokenTransferTokenIdMigration.{LowestBlockNumberUpdater, Worker}
-  alias Explorer.Utility.TokenTransferTokenIdMigratorProgress
-
-  @default_first_block 0
-  @default_workers_count 1
-
-  def start_link(_) do
-    Supervisor.start_link(__MODULE__, :ok, name: __MODULE__)
-  end
-
-  @impl true
-  def init(_) do
-    first_block = Application.get_env(:explorer, :token_id_migration)[:first_block] || @default_first_block
-    last_block = TokenTransferTokenIdMigratorProgress.get_last_processed_block_number()
-
-    if last_block > first_block do
-      workers_count = Application.get_env(:explorer, :token_id_migration)[:concurrency] || @default_workers_count
-
-      workers =
-        Enum.map(1..workers_count, fn id ->
-          Supervisor.child_spec(
-            {Worker, idx: id, first_block: first_block, last_block: last_block, step: workers_count - 1},
-            id: {Worker, id},
-            restart: :transient
-          )
-        end)
-
-      Supervisor.init([LowestBlockNumberUpdater | workers], strategy: :one_for_one)
-    else
-      :ignore
-    end
-  end
-end
diff --git a/apps/explorer/lib/explorer/token_transfer_token_id_migration/worker.ex b/apps/explorer/lib/explorer/token_transfer_token_id_migration/worker.ex
deleted file mode 100644
index f7916ed0582a..000000000000
--- a/apps/explorer/lib/explorer/token_transfer_token_id_migration/worker.ex
+++ /dev/null
@@ -1,84 +0,0 @@
-defmodule Explorer.TokenTransferTokenIdMigration.Worker do
-  @moduledoc """
-  Performs the migration of TokenTransfer token_id to token_ids by batches.
-  Full algorithm is in the 'Explorer.TokenTransferTokenIdMigration.Supervisor' module doc.
-  """
-  use GenServer
-
-  import Ecto.Query
-
-  alias Explorer.Chain.TokenTransfer
-  alias Explorer.Repo
-  alias Explorer.TokenTransferTokenIdMigration.LowestBlockNumberUpdater
-
-  @default_batch_size 500
-  @interval 10
-
-  def start_link(idx: idx, first_block: first, last_block: last, step: step) do
-    GenServer.start_link(__MODULE__, %{idx: idx, bottom_block: first, last_block: last, step: step})
-  end
-
-  @impl true
-  def init(%{idx: idx, bottom_block: bottom_block, last_block: last_block, step: step}) do
-    batch_size = Application.get_env(:explorer, :token_id_migration)[:batch_size] || @default_batch_size
-    range = calculate_new_range(last_block, bottom_block, batch_size, idx - 1)
-
-    schedule_next_update()
-
-    {:ok, %{batch_size: batch_size, bottom_block: bottom_block, step: step, current_range: range}}
-  end
-
-  @impl true
-  def handle_info(:update, %{current_range: :out_of_bound} = state) do
-    {:stop, :normal, state}
-  end
-
-  @impl true
-  def handle_info(:update, %{current_range: {lower_bound, upper_bound}} = state) do
-    case do_update(lower_bound, upper_bound) do
-      true ->
-        LowestBlockNumberUpdater.add_range(upper_bound, lower_bound)
-        new_range = calculate_new_range(lower_bound, state.bottom_block, state.batch_size, state.step)
-        schedule_next_update()
-        {:noreply, %{state | current_range: new_range}}
-
-      _ ->
-        schedule_next_update()
-        {:noreply, state}
-    end
-  end
-
-  defp calculate_new_range(last_processed_block, bottom_block, batch_size, step) do
-    upper_bound = last_processed_block - step * batch_size - 1
-    lower_bound = max(upper_bound - batch_size + 1, bottom_block)
-
-    if upper_bound >= bottom_block do
-      {lower_bound, upper_bound}
-    else
-      :out_of_bound
-    end
-  end
-
-  defp do_update(lower_bound, upper_bound) do
-    token_transfers_batch_query =
-      from(
-        tt in TokenTransfer,
-        where: tt.block_number >= ^lower_bound,
-        where: tt.block_number <= ^upper_bound
-      )
-
-    token_transfers_batch_query
-    |> Repo.all()
-    |> Enum.filter(fn %{token_id: token_id} -> not is_nil(token_id) end)
-    |> Enum.map(fn token_transfer ->
-      token_transfer
-      |> TokenTransfer.changeset(%{token_ids: [token_transfer.token_id], token_id: nil})
-      |> Repo.update()
-    end)
-    |> Enum.all?(&match?({:ok, _}, &1))
-  end
-
-  defp schedule_next_update do
-    Process.send_after(self(), :update, @interval)
-  end
-end
diff --git a/apps/explorer/lib/explorer/utility/token_transfer_token_id_migrator_progress.ex b/apps/explorer/lib/explorer/utility/token_transfer_token_id_migrator_progress.ex
deleted file mode 100644
index 3a28181016e5..000000000000
--- a/apps/explorer/lib/explorer/utility/token_transfer_token_id_migrator_progress.ex
+++ /dev/null
@@ -1,67 +0,0 @@
-defmodule Explorer.Utility.TokenTransferTokenIdMigratorProgress do
-  @moduledoc """
-  Module is responsible for keeping the current progress of TokenTransfer token_id migration.
-  Full algorithm is in the 'Indexer.Fetcher.TokenTransferTokenIdMigration.Supervisor' module doc.
-  """
-  use Explorer.Schema
-
-  require Logger
-
-  alias Explorer.Chain.Cache.BlockNumber
-  alias Explorer.Repo
-
-  schema "token_transfer_token_id_migrator_progress" do
-    field(:last_processed_block_number, :integer)
-
-    timestamps()
-  end
-
-  @doc false
-  def changeset(progress \\ %__MODULE__{}, params) do
-    cast(progress, params, [:last_processed_block_number])
-  end
-
-  def get_current_progress do
-    Repo.one(
-      from(
-        p in __MODULE__,
-        order_by: [desc: p.updated_at],
-        limit: 1
-      )
-    )
-  end
-
-  def get_last_processed_block_number do
-    case get_current_progress() do
-      nil ->
-        latest_processed_block_number = BlockNumber.get_max() + 1
-        update_last_processed_block_number(latest_processed_block_number)
-        latest_processed_block_number
-
-      %{last_processed_block_number: block_number} ->
-        block_number
-    end
-  end
-
-  def update_last_processed_block_number(block_number, force \\ false) do
-    case get_current_progress() do
-      nil ->
-        %{last_processed_block_number: block_number}
-        |> changeset()
-        |> Repo.insert()
-
-      progress ->
-        if not force and progress.last_processed_block_number < block_number do
-          Logger.error(
-            "TokenTransferTokenIdMigratorProgress new block_number is above the last one. Last: #{progress.last_processed_block_number}, new: #{block_number}"
-          )
-
-          {:error, :invalid_block_number}
-        else
-          progress
-          |> changeset(%{last_processed_block_number: block_number})
-          |> Repo.update()
-        end
-    end
-  end
-end
diff --git a/apps/explorer/priv/repo/migrations/20231215094615_drop_token_transfers_token_id_column.exs b/apps/explorer/priv/repo/migrations/20231215094615_drop_token_transfers_token_id_column.exs
new file mode 100644
index 000000000000..df8637071b31
--- /dev/null
+++ b/apps/explorer/priv/repo/migrations/20231215094615_drop_token_transfers_token_id_column.exs
@@ -0,0 +1,12 @@
+defmodule Explorer.Repo.Migrations.DropTokenTransfersTokenIdColumn do
+  use Ecto.Migration
+
+  def change do
+    drop(index(:token_transfers, [:token_id]))
+    drop(index(:token_transfers, [:token_contract_address_hash, "token_id DESC", "block_number DESC"]))
+
+    alter table(:token_transfers) do
+      remove(:token_id)
+    end
+  end
+end
diff --git a/apps/explorer/test/explorer/token_transfer_token_id_migration/lowest_block_number_updater_test.exs b/apps/explorer/test/explorer/token_transfer_token_id_migration/lowest_block_number_updater_test.exs
deleted file mode 100644
index bdd94920db2c..000000000000
--- a/apps/explorer/test/explorer/token_transfer_token_id_migration/lowest_block_number_updater_test.exs
+++ /dev/null
@@ -1,37 +0,0 @@
-defmodule Explorer.TokenTransferTokenIdMigration.LowestBlockNumberUpdaterTest do
-  use Explorer.DataCase, async: false
-
-  alias Explorer.Repo
-  alias Explorer.TokenTransferTokenIdMigration.LowestBlockNumberUpdater
-  alias Explorer.Utility.TokenTransferTokenIdMigratorProgress
-
-  describe "Add range and update last processed block number" do
-    test "add_range/2" do
-      TokenTransferTokenIdMigratorProgress.update_last_processed_block_number(2000, true)
-      LowestBlockNumberUpdater.start_link([])
-
-      LowestBlockNumberUpdater.add_range(1000, 500)
-      LowestBlockNumberUpdater.add_range(1500, 1001)
-      Process.sleep(10)
-
-      assert %{last_processed_block_number: 2000, processed_ranges: [1500..500//-1]} =
-               :sys.get_state(LowestBlockNumberUpdater)
-
-      assert %{last_processed_block_number: 2000} = Repo.one(TokenTransferTokenIdMigratorProgress)
-
-      LowestBlockNumberUpdater.add_range(499, 300)
-      LowestBlockNumberUpdater.add_range(299, 0)
-      Process.sleep(10)
-
-      assert %{last_processed_block_number: 2000, processed_ranges: [1500..0//-1]} =
-               :sys.get_state(LowestBlockNumberUpdater)
-
-      assert %{last_processed_block_number: 2000} = Repo.one(TokenTransferTokenIdMigratorProgress)
-
-      LowestBlockNumberUpdater.add_range(1999, 1501)
-      Process.sleep(10)
-      assert %{last_processed_block_number: 0, processed_ranges: []} = :sys.get_state(LowestBlockNumberUpdater)
-      assert %{last_processed_block_number: 0} = Repo.one(TokenTransferTokenIdMigratorProgress)
-    end
-  end
-end
diff --git a/apps/explorer/test/explorer/token_transfer_token_id_migration/worker_test.exs b/apps/explorer/test/explorer/token_transfer_token_id_migration/worker_test.exs
deleted file mode 100644
index 8797e90130e6..000000000000
--- a/apps/explorer/test/explorer/token_transfer_token_id_migration/worker_test.exs
+++ /dev/null
@@ -1,31 +0,0 @@
-defmodule Explorer.TokenTransferTokenIdMigration.WorkerTest do
-  use Explorer.DataCase, async: false
-
-  alias Explorer.Repo
-  alias Explorer.TokenTransferTokenIdMigration.{LowestBlockNumberUpdater, Worker}
-  alias Explorer.Utility.TokenTransferTokenIdMigratorProgress
-
-  describe "Move TokenTransfer token_id to token_ids" do
-    test "Move token_ids and update last processed block number" do
-      insert(:token_transfer, block_number: 1, token_id: 1, transaction: insert(:transaction))
-      insert(:token_transfer, block_number: 500, token_id: 2, transaction: insert(:transaction))
-      insert(:token_transfer, block_number: 1000, token_id: 3, transaction: insert(:transaction))
-      insert(:token_transfer, block_number: 1500, token_id: 4, transaction: insert(:transaction))
-      insert(:token_transfer, block_number: 2000, token_id: 5, transaction: insert(:transaction))
-
-      TokenTransferTokenIdMigratorProgress.update_last_processed_block_number(3000, true)
-      LowestBlockNumberUpdater.start_link([])
-
-      Worker.start_link(idx: 1, first_block: 0, last_block: 3000, step: 2)
-      Worker.start_link(idx: 2, first_block: 0, last_block: 3000, step: 2)
-      Worker.start_link(idx: 3, first_block: 0, last_block: 3000, step: 2)
-      Process.sleep(200)
-
-      token_transfers = Repo.all(Explorer.Chain.TokenTransfer)
-      assert Enum.all?(token_transfers, fn tt -> is_nil(tt.token_id) end)
-
-      expected_token_ids = [[Decimal.new(1)], [Decimal.new(2)], [Decimal.new(3)], [Decimal.new(4)], [Decimal.new(5)]]
-      assert ^expected_token_ids = token_transfers |> Enum.map(& &1.token_ids) |> Enum.sort_by(&List.first/1)
-    end
-  end
-end

From a7a3d2827b92d0fe5c416576ab9b79cc0b80a442 Mon Sep 17 00:00:00 2001
From: Qwerty5Uiop <alex000010@bk.ru>
Date: Thu, 21 Dec 2023 14:06:14 +0600
Subject: [PATCH 858/909] Token type filling migrations

---
 apps/explorer/config/runtime/test.exs         |  2 +
 apps/explorer/lib/explorer/application.ex     |  4 +-
 .../explorer/chain/address/token_balance.ex   | 29 +++++--
 .../chain/cache/background_migrations.ex      | 26 +++++-
 ...ddress_current_token_balance_token_type.ex | 51 ++++++++++++
 .../address_token_balance_token_type.ex       | 51 ++++++++++++
 .../explorer/migrator/filling_migration.ex    | 83 +++++++++++++++++++
 .../migrator/transactions_denormalization.ex  | 76 ++++-------------
 .../chain/address/token_balance_test.exs      |  1 +
 ..._current_token_balance_token_type_test.exs | 32 +++++++
 .../address_token_balance_token_type_test.exs | 32 +++++++
 ...sactions_denormalization_migrator_test.exs |  7 +-
 12 files changed, 320 insertions(+), 74 deletions(-)
 create mode 100644 apps/explorer/lib/explorer/migrator/address_current_token_balance_token_type.ex
 create mode 100644 apps/explorer/lib/explorer/migrator/address_token_balance_token_type.ex
 create mode 100644 apps/explorer/lib/explorer/migrator/filling_migration.ex
 create mode 100644 apps/explorer/test/explorer/migrator/address_current_token_balance_token_type_test.exs
 create mode 100644 apps/explorer/test/explorer/migrator/address_token_balance_token_type_test.exs

diff --git a/apps/explorer/config/runtime/test.exs b/apps/explorer/config/runtime/test.exs
index d496caa48a78..ec346c1d3f89 100644
--- a/apps/explorer/config/runtime/test.exs
+++ b/apps/explorer/config/runtime/test.exs
@@ -36,6 +36,8 @@ config :explorer, Explorer.Tracer, disabled?: false
 config :explorer, Explorer.TokenInstanceOwnerAddressMigration.Supervisor, enabled: false
 
 config :explorer, Explorer.Migrator.TransactionsDenormalization, enabled: false
+config :explorer, Explorer.Migrator.AddressCurrentTokenBalanceTokenType, enabled: false
+config :explorer, Explorer.Migrator.AddressTokenBalanceTokenType, enabled: false
 
 config :explorer,
   realtime_events_sender: Explorer.Chain.Events.SimpleSender
diff --git a/apps/explorer/lib/explorer/application.ex b/apps/explorer/lib/explorer/application.ex
index 1749cb69fd59..52b196489d07 100644
--- a/apps/explorer/lib/explorer/application.ex
+++ b/apps/explorer/lib/explorer/application.ex
@@ -127,7 +127,9 @@ defmodule Explorer.Application do
         configure(Explorer.TokenInstanceOwnerAddressMigration.Supervisor),
         sc_microservice_configure(Explorer.Chain.Fetcher.LookUpSmartContractSourcesOnDemand),
         configure(Explorer.Chain.Cache.RootstockLockedBTC),
-        configure(Explorer.Migrator.TransactionsDenormalization)
+        configure(Explorer.Migrator.TransactionsDenormalization),
+        configure(Explorer.Migrator.AddressCurrentTokenBalanceTokenType),
+        configure(Explorer.Migrator.AddressTokenBalanceTokenType)
       ]
       |> List.flatten()
 
diff --git a/apps/explorer/lib/explorer/chain/address/token_balance.ex b/apps/explorer/lib/explorer/chain/address/token_balance.ex
index ab7a75b62486..5b647bae1ed2 100644
--- a/apps/explorer/lib/explorer/chain/address/token_balance.ex
+++ b/apps/explorer/lib/explorer/chain/address/token_balance.ex
@@ -13,6 +13,7 @@ defmodule Explorer.Chain.Address.TokenBalance do
 
   alias Explorer.Chain
   alias Explorer.Chain.Address.TokenBalance
+  alias Explorer.Chain.Cache.BackgroundMigrations
   alias Explorer.Chain.{Address, Block, Hash, Token}
 
   @typedoc """
@@ -80,15 +81,27 @@ defmodule Explorer.Chain.Address.TokenBalance do
   ignores the burn_address for tokens ERC-721 since the most tokens ERC-721 don't allow get the
   balance for burn_address.
   """
+  # credo:disable-for-next-line /Complexity/
   def unfetched_token_balances do
-    from(
-      tb in TokenBalance,
-      join: t in Token,
-      on: tb.token_contract_address_hash == t.contract_address_hash,
-      where:
-        ((tb.address_hash != ^@burn_address_hash and t.type == "ERC-721") or t.type == "ERC-20" or t.type == "ERC-1155") and
-          (is_nil(tb.value_fetched_at) or is_nil(tb.value))
-    )
+    if BackgroundMigrations.get_tb_token_type_finished() do
+      from(
+        tb in TokenBalance,
+        where:
+          ((tb.address_hash != ^@burn_address_hash and tb.token_type == "ERC-721") or tb.token_type == "ERC-20" or
+             tb.token_type == "ERC-1155") and
+            (is_nil(tb.value_fetched_at) or is_nil(tb.value))
+      )
+    else
+      from(
+        tb in TokenBalance,
+        join: t in Token,
+        on: tb.token_contract_address_hash == t.contract_address_hash,
+        where:
+          ((tb.address_hash != ^@burn_address_hash and t.type == "ERC-721") or t.type == "ERC-20" or
+             t.type == "ERC-1155") and
+            (is_nil(tb.value_fetched_at) or is_nil(tb.value))
+      )
+    end
   end
 
   @doc """
diff --git a/apps/explorer/lib/explorer/chain/cache/background_migrations.ex b/apps/explorer/lib/explorer/chain/cache/background_migrations.ex
index 5e3b3524573b..3470f48c08b7 100644
--- a/apps/explorer/lib/explorer/chain/cache/background_migrations.ex
+++ b/apps/explorer/lib/explorer/chain/cache/background_migrations.ex
@@ -7,11 +7,17 @@ defmodule Explorer.Chain.Cache.BackgroundMigrations do
 
   use Explorer.Chain.MapCache,
     name: :background_migrations_status,
-    key: :denormalization_finished
+    key: :denormalization_finished,
+    key: :tb_token_type_finished,
+    key: :ctb_token_type_finished
 
   @dialyzer :no_match
 
-  alias Explorer.Migrator.TransactionsDenormalization
+  alias Explorer.Migrator.{
+    AddressCurrentTokenBalanceTokenType,
+    AddressTokenBalanceTokenType,
+    TransactionsDenormalization
+  }
 
   defp handle_fallback(:denormalization_finished) do
     Task.start(fn ->
@@ -20,4 +26,20 @@ defmodule Explorer.Chain.Cache.BackgroundMigrations do
 
     {:return, false}
   end
+
+  defp handle_fallback(:tb_token_type_finished) do
+    Task.start(fn ->
+      set_tb_token_type_finished(AddressTokenBalanceTokenType.migration_finished?())
+    end)
+
+    {:return, false}
+  end
+
+  defp handle_fallback(:ctb_token_type_finished) do
+    Task.start(fn ->
+      set_ctb_token_type_finished(AddressCurrentTokenBalanceTokenType.migration_finished?())
+    end)
+
+    {:return, false}
+  end
 end
diff --git a/apps/explorer/lib/explorer/migrator/address_current_token_balance_token_type.ex b/apps/explorer/lib/explorer/migrator/address_current_token_balance_token_type.ex
new file mode 100644
index 000000000000..93226db73fce
--- /dev/null
+++ b/apps/explorer/lib/explorer/migrator/address_current_token_balance_token_type.ex
@@ -0,0 +1,51 @@
+defmodule Explorer.Migrator.AddressCurrentTokenBalanceTokenType do
+  @moduledoc """
+  Fill empty token_type's for address_current_token_balances
+  """
+
+  use Explorer.Migrator.FillingMigration
+
+  import Ecto.Query
+
+  alias Explorer.Chain.Address.CurrentTokenBalance
+  alias Explorer.Chain.Cache.BackgroundMigrations
+  alias Explorer.Migrator.FillingMigration
+  alias Explorer.Repo
+
+  @migration_name "ctb_token_type"
+
+  @impl FillingMigration
+  def migration_name, do: @migration_name
+
+  @impl FillingMigration
+  def last_unprocessed_identifiers do
+    limit = batch_size() * concurrency()
+
+    unprocessed_data_query()
+    |> select([ctb], ctb.id)
+    |> limit(^limit)
+    |> Repo.all(timeout: :infinity)
+  end
+
+  @impl FillingMigration
+  def unprocessed_data_query do
+    from(ctb in CurrentTokenBalance, where: is_nil(ctb.token_type))
+  end
+
+  @impl FillingMigration
+  def update_batch(token_balance_ids) do
+    query =
+      from(current_token_balance in CurrentTokenBalance,
+        join: token in assoc(current_token_balance, :token),
+        where: current_token_balance.id in ^token_balance_ids,
+        update: [set: [token_type: token.type]]
+      )
+
+    Repo.update_all(query, [], timeout: :infinity)
+  end
+
+  @impl FillingMigration
+  def update_cache do
+    BackgroundMigrations.set_ctb_token_type_finished(true)
+  end
+end
diff --git a/apps/explorer/lib/explorer/migrator/address_token_balance_token_type.ex b/apps/explorer/lib/explorer/migrator/address_token_balance_token_type.ex
new file mode 100644
index 000000000000..9427db73ed60
--- /dev/null
+++ b/apps/explorer/lib/explorer/migrator/address_token_balance_token_type.ex
@@ -0,0 +1,51 @@
+defmodule Explorer.Migrator.AddressTokenBalanceTokenType do
+  @moduledoc """
+  Fill empty token_type's for address_token_balances
+  """
+
+  use Explorer.Migrator.FillingMigration
+
+  import Ecto.Query
+
+  alias Explorer.Chain.Address.TokenBalance
+  alias Explorer.Chain.Cache.BackgroundMigrations
+  alias Explorer.Migrator.FillingMigration
+  alias Explorer.Repo
+
+  @migration_name "tb_token_type"
+
+  @impl FillingMigration
+  def migration_name, do: @migration_name
+
+  @impl FillingMigration
+  def last_unprocessed_identifiers do
+    limit = batch_size() * concurrency()
+
+    unprocessed_data_query()
+    |> select([tb], tb.id)
+    |> limit(^limit)
+    |> Repo.all(timeout: :infinity)
+  end
+
+  @impl FillingMigration
+  def unprocessed_data_query do
+    from(tb in TokenBalance, where: is_nil(tb.token_type))
+  end
+
+  @impl FillingMigration
+  def update_batch(token_balance_ids) do
+    query =
+      from(token_balance in TokenBalance,
+        join: token in assoc(token_balance, :token),
+        where: token_balance.id in ^token_balance_ids,
+        update: [set: [token_type: token.type]]
+      )
+
+    Repo.update_all(query, [], timeout: :infinity)
+  end
+
+  @impl FillingMigration
+  def update_cache do
+    BackgroundMigrations.set_tb_token_type_finished(true)
+  end
+end
diff --git a/apps/explorer/lib/explorer/migrator/filling_migration.ex b/apps/explorer/lib/explorer/migrator/filling_migration.ex
new file mode 100644
index 000000000000..05823e951765
--- /dev/null
+++ b/apps/explorer/lib/explorer/migrator/filling_migration.ex
@@ -0,0 +1,83 @@
+defmodule Explorer.Migrator.FillingMigration do
+  @moduledoc """
+  Template for creating migrations that fills some fields in existing entities
+  """
+
+  @callback migration_name :: String.t()
+  @callback unprocessed_data_query :: Ecto.Query.t()
+  @callback last_unprocessed_identifiers :: [any()]
+  @callback update_batch([any()]) :: any()
+  @callback update_cache :: any()
+
+  defmacro __using__(_opts) do
+    quote do
+      @behaviour Explorer.Migrator.FillingMigration
+
+      use GenServer, restart: :transient
+
+      import Ecto.Query
+
+      alias Explorer.Migrator.MigrationStatus
+      alias Explorer.Repo
+
+      @default_batch_size 500
+
+      def start_link(_) do
+        GenServer.start_link(__MODULE__, :ok, name: __MODULE__)
+      end
+
+      def migration_finished? do
+        not Repo.exists?(unprocessed_data_query())
+      end
+
+      @impl true
+      def init(_) do
+        case MigrationStatus.get_status(migration_name()) do
+          "completed" ->
+            :ignore
+
+          _ ->
+            MigrationStatus.set_status(migration_name(), "started")
+            schedule_batch_migration()
+            {:ok, %{}}
+        end
+      end
+
+      @impl true
+      def handle_info(:migrate_batch, state) do
+        case last_unprocessed_identifiers() do
+          [] ->
+            update_cache()
+            MigrationStatus.set_status(migration_name(), "completed")
+            {:stop, :normal, state}
+
+          hashes ->
+            hashes
+            |> Enum.chunk_every(batch_size())
+            |> Enum.map(&run_task/1)
+            |> Task.await_many(:infinity)
+
+            schedule_batch_migration()
+
+            {:noreply, state}
+        end
+      end
+
+      defp run_task(batch), do: Task.async(fn -> update_batch(batch) end)
+
+      defp schedule_batch_migration do
+        Process.send(self(), :migrate_batch, [])
+      end
+
+      defp batch_size do
+        Application.get_env(:explorer, __MODULE__)[:batch_size] || @default_batch_size
+      end
+
+      defp concurrency do
+        default = 4 * System.schedulers_online()
+
+        Application.get_env(:explorer, __MODULE__)[:concurrency] || default
+      end
+    end
+  end
+end
diff --git a/apps/explorer/lib/explorer/migrator/transactions_denormalization.ex b/apps/explorer/lib/explorer/migrator/transactions_denormalization.ex
index 166d7f834001..fe66548aba14 100644
--- a/apps/explorer/lib/explorer/migrator/transactions_denormalization.ex
+++ b/apps/explorer/lib/explorer/migrator/transactions_denormalization.ex
@@ -3,78 +3,39 @@ defmodule Explorer.Migrator.TransactionsDenormalization do
   Migrates all transactions to have set block_consensus and block_timestamp
   """
 
-  use GenServer, restart: :transient
+  use Explorer.Migrator.FillingMigration
 
   import Ecto.Query
 
   alias Explorer.Chain.Cache.BackgroundMigrations
   alias Explorer.Chain.Transaction
-  alias Explorer.Migrator.MigrationStatus
+  alias Explorer.Migrator.FillingMigration
   alias Explorer.Repo
 
-  @default_batch_size 500
   @migration_name "denormalization"
 
-  @spec start_link(term()) :: GenServer.on_start()
-  def start_link(_) do
-    GenServer.start_link(__MODULE__, :ok, name: __MODULE__)
-  end
-
-  def migration_finished? do
-    not Repo.exists?(unprocessed_transactions_query())
-  end
-
-  @impl true
-  def init(_) do
-    case MigrationStatus.get_status(@migration_name) do
-      "completed" ->
-        :ignore
-
-      _ ->
-        MigrationStatus.set_status(@migration_name, "started")
-        schedule_batch_migration()
-        {:ok, %{}}
-    end
-  end
-
-  @impl true
-  def handle_info(:migrate_batch, state) do
-    case last_unprocessed_transaction_hashes() do
-      [] ->
-        BackgroundMigrations.set_denormalization_finished(true)
-        MigrationStatus.set_status(@migration_name, "completed")
-        {:stop, :normal, state}
-
-      hashes ->
-        hashes
-        |> Enum.chunk_every(batch_size())
-        |> Enum.map(&run_task/1)
-        |> Task.await_many(:infinity)
-
-        schedule_batch_migration()
+  @impl FillingMigration
+  def migration_name, do: @migration_name
 
-        {:noreply, state}
-    end
-  end
-
-  defp run_task(batch), do: Task.async(fn -> update_batch(batch) end)
-
-  defp last_unprocessed_transaction_hashes do
+  @impl FillingMigration
+  def last_unprocessed_identifiers do
     limit = batch_size() * concurrency()
 
-    unprocessed_transactions_query()
+    unprocessed_data_query()
     |> select([t], t.hash)
     |> limit(^limit)
     |> Repo.all(timeout: :infinity)
   end
 
-  defp unprocessed_transactions_query do
+  @impl FillingMigration
+  def unprocessed_data_query do
     from(t in Transaction,
       where: not is_nil(t.block_hash) and (is_nil(t.block_consensus) or is_nil(t.block_timestamp))
     )
   end
 
-  defp update_batch(transaction_hashes) do
+  @impl FillingMigration
+  def update_batch(transaction_hashes) do
     query =
       from(transaction in Transaction,
         join: block in assoc(transaction, :block),
@@ -85,17 +46,8 @@ defmodule Explorer.Migrator.TransactionsDenormalization do
     Repo.update_all(query, [], timeout: :infinity)
   end
 
-  defp schedule_batch_migration do
-    Process.send(self(), :migrate_batch, [])
-  end
-
-  defp batch_size do
-    Application.get_env(:explorer, __MODULE__)[:batch_size] || @default_batch_size
-  end
-
-  defp concurrency do
-    default = 4 * System.schedulers_online()
-
-    Application.get_env(:explorer, __MODULE__)[:concurrency] || default
+  @impl FillingMigration
+  def update_cache do
+    BackgroundMigrations.set_denormalization_finished(true)
   end
 end
diff --git a/apps/explorer/test/explorer/chain/address/token_balance_test.exs b/apps/explorer/test/explorer/chain/address/token_balance_test.exs
index 9a72837f6a5f..3e1a8018289a 100644
--- a/apps/explorer/test/explorer/chain/address/token_balance_test.exs
+++ b/apps/explorer/test/explorer/chain/address/token_balance_test.exs
@@ -46,6 +46,7 @@ defmodule Explorer.Chain.Address.TokenBalanceTest do
         :token_balance,
         address: burn_address,
         token_contract_address_hash: token.contract_address_hash,
+        token_type: "ERC-721",
         value_fetched_at: nil
       )
 
diff --git a/apps/explorer/test/explorer/migrator/address_current_token_balance_token_type_test.exs b/apps/explorer/test/explorer/migrator/address_current_token_balance_token_type_test.exs
new file mode 100644
index 000000000000..f9e43e12e6fc
--- /dev/null
+++ b/apps/explorer/test/explorer/migrator/address_current_token_balance_token_type_test.exs
@@ -0,0 +1,32 @@
+defmodule Explorer.Migrator.AddressCurrentTokenBalanceTokenTypeTest do
+  use Explorer.DataCase, async: false
+
+  alias Explorer.Chain.Cache.BackgroundMigrations
+  alias Explorer.Chain.Address.CurrentTokenBalance
+  alias Explorer.Migrator.{AddressCurrentTokenBalanceTokenType, MigrationStatus}
+  alias Explorer.Repo
+
+  describe "Migrate current token balances" do
+    test "Set token_type for not processed current token balances" do
+      Enum.each(0..10, fn _x ->
+        current_token_balance = insert(:address_current_token_balance, token_type: nil)
+        assert %{token_type: nil} = current_token_balance
+      end)
+
+      assert MigrationStatus.get_status("ctb_token_type") == nil
+
+      AddressCurrentTokenBalanceTokenType.start_link([])
+      Process.sleep(100)
+
+      CurrentTokenBalance
+      |> Repo.all()
+      |> Repo.preload(:token)
+      |> Enum.each(fn ctb ->
+        assert %{token_type: token_type, token: %{type: token_type}} = ctb
+        assert not is_nil(token_type)
+      end)
+
+      assert MigrationStatus.get_status("ctb_token_type") == "completed"
+    end
+  end
+end
diff --git a/apps/explorer/test/explorer/migrator/address_token_balance_token_type_test.exs b/apps/explorer/test/explorer/migrator/address_token_balance_token_type_test.exs
new file mode 100644
index 000000000000..e1ac9d997fc1
--- /dev/null
+++ b/apps/explorer/test/explorer/migrator/address_token_balance_token_type_test.exs
@@ -0,0 +1,32 @@
+defmodule Explorer.Migrator.AddressTokenBalanceTokenTypeTest do
+  use Explorer.DataCase, async: false
+
+  alias Explorer.Chain.Cache.BackgroundMigrations
+  alias Explorer.Chain.Address.TokenBalance
+  alias Explorer.Migrator.{AddressTokenBalanceTokenType, MigrationStatus}
+  alias Explorer.Repo
+
+  describe "Migrate token balances" do
+    test "Set token_type for not processed token balances" do
+      Enum.each(0..10, fn _x ->
+        token_balance = insert(:token_balance, token_type: nil)
+        assert %{token_type: nil} = token_balance
+      end)
+
+      assert MigrationStatus.get_status("tb_token_type") == nil
+
+      AddressTokenBalanceTokenType.start_link([])
+      Process.sleep(100)
+
+      TokenBalance
+      |> Repo.all()
+      |> Repo.preload(:token)
+      |> Enum.each(fn tb ->
+        assert %{token_type: token_type, token: %{type: token_type}} = tb
+        assert not is_nil(token_type)
+      end)
+
+      assert MigrationStatus.get_status("tb_token_type") == "completed"
+    end
+  end
+end
diff --git a/apps/explorer/test/explorer/migrator/transactions_denormalization_migrator_test.exs b/apps/explorer/test/explorer/migrator/transactions_denormalization_migrator_test.exs
index 8505844a7927..e47afe96da4d 100644
--- a/apps/explorer/test/explorer/migrator/transactions_denormalization_migrator_test.exs
+++ b/apps/explorer/test/explorer/migrator/transactions_denormalization_migrator_test.exs
@@ -1,8 +1,9 @@
 defmodule Explorer.Migrator.TransactionsDenormalizationTest do
   use Explorer.DataCase, async: false
 
+  alias Explorer.Chain.Cache.BackgroundMigrations
   alias Explorer.Chain.Transaction
-  alias Explorer.Migrator.TransactionsDenormalization
+  alias Explorer.Migrator.{MigrationStatus, TransactionsDenormalization}
   alias Explorer.Repo
 
   describe "Migrate transactions" do
@@ -20,6 +21,8 @@ defmodule Explorer.Migrator.TransactionsDenormalizationTest do
         assert not is_nil(timestamp)
       end)
 
+      assert MigrationStatus.get_status("denormalization") == nil
+
       TransactionsDenormalization.start_link([])
       Process.sleep(100)
 
@@ -33,6 +36,8 @@ defmodule Explorer.Migrator.TransactionsDenormalizationTest do
                  block: %{consensus: consensus, timestamp: timestamp}
                } = t
       end)
+
+      assert MigrationStatus.get_status("denormalization") == "completed"
     end
   end
 end

From 7b5838c091bb70ccf9259fae97830c3cc1df46e4 Mon Sep 17 00:00:00 2001
From: Qwerty5Uiop <alex000010@bk.ru>
Date: Mon, 25 Dec 2023 15:16:51 +0600
Subject: [PATCH 859/909] Enable migrators in config

---
 apps/explorer/config/config.exs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/apps/explorer/config/config.exs b/apps/explorer/config/config.exs
index cc22af6be938..eafec8dec772 100644
--- a/apps/explorer/config/config.exs
+++ b/apps/explorer/config/config.exs
@@ -112,6 +112,8 @@ config :explorer, Explorer.Counters.BlockPriorityFeeCounter,
 config :explorer, Explorer.TokenInstanceOwnerAddressMigration.Supervisor, enabled: true
 
 config :explorer, Explorer.Migrator.TransactionsDenormalization, enabled: true
+config :explorer, Explorer.Migrator.AddressCurrentTokenBalanceTokenType, enabled: true
+config :explorer, Explorer.Migrator.AddressTokenBalanceTokenType, enabled: true
 
 config :explorer, Explorer.Chain.Fetcher.CheckBytecodeMatchingOnDemand, enabled: true
 

From a67da9a7e73de7d97d99f5b1ac1e2f3016f0c780 Mon Sep 17 00:00:00 2001
From: Qwerty5Uiop <alex000010@bk.ru>
Date: Wed, 27 Dec 2023 16:49:42 +0600
Subject: [PATCH 860/909] Improve filling migrations tests

---
 .../migrator/address_current_token_balance_token_type_test.exs   | 1 +
 .../explorer/migrator/address_token_balance_token_type_test.exs  | 1 +
 2 files changed, 2 insertions(+)

diff --git a/apps/explorer/test/explorer/migrator/address_current_token_balance_token_type_test.exs b/apps/explorer/test/explorer/migrator/address_current_token_balance_token_type_test.exs
index f9e43e12e6fc..27591d9c52c1 100644
--- a/apps/explorer/test/explorer/migrator/address_current_token_balance_token_type_test.exs
+++ b/apps/explorer/test/explorer/migrator/address_current_token_balance_token_type_test.exs
@@ -27,6 +27,7 @@ defmodule Explorer.Migrator.AddressCurrentTokenBalanceTokenTypeTest do
       end)
 
       assert MigrationStatus.get_status("ctb_token_type") == "completed"
+      assert BackgroundMigrations.get_ctb_token_type_finished() == true
     end
   end
 end
diff --git a/apps/explorer/test/explorer/migrator/address_token_balance_token_type_test.exs b/apps/explorer/test/explorer/migrator/address_token_balance_token_type_test.exs
index e1ac9d997fc1..4bf09c57122c 100644
--- a/apps/explorer/test/explorer/migrator/address_token_balance_token_type_test.exs
+++ b/apps/explorer/test/explorer/migrator/address_token_balance_token_type_test.exs
@@ -27,6 +27,7 @@ defmodule Explorer.Migrator.AddressTokenBalanceTokenTypeTest do
       end)
 
       assert MigrationStatus.get_status("tb_token_type") == "completed"
+      assert BackgroundMigrations.get_tb_token_type_finished() == true
     end
   end
 end

From 4f81bd8174c1132b41e3be6c150e30eb1e9d96db Mon Sep 17 00:00:00 2001
From: Viktor Baranov <baranov.viktor.27@gmail.com>
Date: Wed, 27 Dec 2023 13:58:38 +0300
Subject: [PATCH 861/909] Add CHANGELOG entry

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7d3662a542e0..abed60060102 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,7 @@
 
 ### Chore
 
+- [#9038](https://github.com/blockscout/blockscout/pull/9038) - Token type filling migrations
 - [#9009](https://github.com/blockscout/blockscout/pull/9009) - Index for block refetch_needed
 - [#9007](https://github.com/blockscout/blockscout/pull/9007) - Drop logs type index
 - [#9006](https://github.com/blockscout/blockscout/pull/9006) - Drop unused indexes on address_current_token_balances table

From c7f566156ee0376f562a12b48e7934564e7bbd6f Mon Sep 17 00:00:00 2001
From: Viktor Baranov <baranov.viktor.27@gmail.com>
Date: Mon, 25 Dec 2023 15:56:04 +0300
Subject: [PATCH 862/909] Add ASC indices for logs, token transfers,
 transactions

---
 CHANGELOG.md                                  |  1 +
 ...0231225113850_transactions_asc_indices.exs | 47 +++++++++++++++++++
 .../20231225115026_logs_asc_index.exs         |  7 +++
 ...231225115100_token_transfers_asc_index.exs |  7 +++
 4 files changed, 62 insertions(+)
 create mode 100644 apps/explorer/priv/repo/migrations/20231225113850_transactions_asc_indices.exs
 create mode 100644 apps/explorer/priv/repo/migrations/20231225115026_logs_asc_index.exs
 create mode 100644 apps/explorer/priv/repo/migrations/20231225115100_token_transfers_asc_index.exs

diff --git a/CHANGELOG.md b/CHANGELOG.md
index abed60060102..c1df85bc68ef 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,7 @@
 
 ### Chore
 
+- [#9055](https://github.com/blockscout/blockscout/pull/9055) - Add ASC indices for logs, token transfers, transactions
 - [#9038](https://github.com/blockscout/blockscout/pull/9038) - Token type filling migrations
 - [#9009](https://github.com/blockscout/blockscout/pull/9009) - Index for block refetch_needed
 - [#9007](https://github.com/blockscout/blockscout/pull/9007) - Drop logs type index
diff --git a/apps/explorer/priv/repo/migrations/20231225113850_transactions_asc_indices.exs b/apps/explorer/priv/repo/migrations/20231225113850_transactions_asc_indices.exs
new file mode 100644
index 000000000000..b0f668e89cd5
--- /dev/null
+++ b/apps/explorer/priv/repo/migrations/20231225113850_transactions_asc_indices.exs
@@ -0,0 +1,47 @@
+defmodule Explorer.Repo.Migrations.TransactionsAscIndices do
+  use Ecto.Migration
+
+  def change do
+    create(
+      index(
+        :transactions,
+        [
+          :from_address_hash,
+          "block_number ASC NULLS LAST",
+          "index ASC NULLS LAST",
+          "inserted_at ASC",
+          "hash DESC"
+        ],
+        name: "transactions_from_address_hash_with_pending_index_asc"
+      )
+    )
+
+    create(
+      index(
+        :transactions,
+        [
+          :to_address_hash,
+          "block_number ASC NULLS LAST",
+          "index ASC NULLS LAST",
+          "inserted_at ASC",
+          "hash DESC"
+        ],
+        name: "transactions_to_address_hash_with_pending_index_asc"
+      )
+    )
+
+    create(
+      index(
+        :transactions,
+        [
+          :created_contract_address_hash,
+          "block_number ASC NULLS LAST",
+          "index ASC NULLS LAST",
+          "inserted_at ASC",
+          "hash DESC"
+        ],
+        name: "transactions_created_contract_address_hash_with_pending_index_a"
+      )
+    )
+  end
+end
diff --git a/apps/explorer/priv/repo/migrations/20231225115026_logs_asc_index.exs b/apps/explorer/priv/repo/migrations/20231225115026_logs_asc_index.exs
new file mode 100644
index 000000000000..7e7fc0963d6a
--- /dev/null
+++ b/apps/explorer/priv/repo/migrations/20231225115026_logs_asc_index.exs
@@ -0,0 +1,7 @@
+defmodule Explorer.Repo.Migrations.LogsAscIndex do
+  use Ecto.Migration
+
+  def change do
+    create(index(:logs, ["block_number ASC, index ASC"]))
+  end
+end
diff --git a/apps/explorer/priv/repo/migrations/20231225115100_token_transfers_asc_index.exs b/apps/explorer/priv/repo/migrations/20231225115100_token_transfers_asc_index.exs
new file mode 100644
index 000000000000..084ce83adb35
--- /dev/null
+++ b/apps/explorer/priv/repo/migrations/20231225115100_token_transfers_asc_index.exs
@@ -0,0 +1,7 @@
+defmodule Explorer.Repo.Migrations.TokenTransfersAscIndex do
+  use Ecto.Migration
+
+  def change do
+    create(index(:token_transfers, ["block_number ASC", "log_index ASC"]))
+  end
+end

From 1cc481c98c2ecc33a4fb85a73143386092408efd Mon Sep 17 00:00:00 2001
From: Viktor Baranov <baranov.viktor.27@gmail.com>
Date: Wed, 27 Dec 2023 17:52:26 +0300
Subject: [PATCH 863/909] Invalidate GA cache

---
 .github/workflows/config.yml | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/config.yml b/.github/workflows/config.yml
index bd487d8c2aa5..82c11d6d85ec 100644
--- a/.github/workflows/config.yml
+++ b/.github/workflows/config.yml
@@ -75,7 +75,7 @@ jobs:
           path: |
             deps
             _build
-          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_32-${{ hashFiles('mix.lock') }}
+          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_33-${{ hashFiles('mix.lock') }}
           restore-keys: |
             ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-
 
@@ -133,7 +133,7 @@ jobs:
           path: |
             deps
             _build
-          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_32-${{ hashFiles('mix.lock') }}
+          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_33-${{ hashFiles('mix.lock') }}
           restore-keys: |
             ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-"
 
@@ -157,7 +157,7 @@ jobs:
           path: |
             deps
             _build
-          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_32-${{ hashFiles('mix.lock') }}
+          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_33-${{ hashFiles('mix.lock') }}
           restore-keys: |
             ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-"
 
@@ -186,7 +186,7 @@ jobs:
           path: |
             deps
             _build
-          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_32-${{ hashFiles('mix.lock') }}
+          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_33-${{ hashFiles('mix.lock') }}
           restore-keys: |
             ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-"
 
@@ -230,7 +230,7 @@ jobs:
           path: |
             deps
             _build
-          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_32-${{ hashFiles('mix.lock') }}
+          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_33-${{ hashFiles('mix.lock') }}
           restore-keys: |
             ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-"
 
@@ -256,7 +256,7 @@ jobs:
           path: |
             deps
             _build
-          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_32-${{ hashFiles('mix.lock') }}
+          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_33-${{ hashFiles('mix.lock') }}
           restore-keys: |
             ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-"
 
@@ -285,7 +285,7 @@ jobs:
           path: |
             deps
             _build
-          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_32-${{ hashFiles('mix.lock') }}
+          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_33-${{ hashFiles('mix.lock') }}
           restore-keys: |
             ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-"
 
@@ -333,7 +333,7 @@ jobs:
           path: |
             deps
             _build
-          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_32-${{ hashFiles('mix.lock') }}
+          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_33-${{ hashFiles('mix.lock') }}
           restore-keys: |
             ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-"
 
@@ -379,7 +379,7 @@ jobs:
           path: |
             deps
             _build
-          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_32-${{ hashFiles('mix.lock') }}
+          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_33-${{ hashFiles('mix.lock') }}
           restore-keys: |
             ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-"
 
@@ -441,7 +441,7 @@ jobs:
           path: |
             deps
             _build
-          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_32-${{ hashFiles('mix.lock') }}
+          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_33-${{ hashFiles('mix.lock') }}
           restore-keys: |
             ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-"
 
@@ -501,7 +501,7 @@ jobs:
           path: |
             deps
             _build
-          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_32-${{ hashFiles('mix.lock') }}
+          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_33-${{ hashFiles('mix.lock') }}
           restore-keys: |
             ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-"
 
@@ -572,7 +572,7 @@ jobs:
           path: |
             deps
             _build
-          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_32-${{ hashFiles('mix.lock') }}
+          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_33-${{ hashFiles('mix.lock') }}
           restore-keys: |
             ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-"
 
@@ -640,7 +640,7 @@ jobs:
           path: |
             deps
             _build
-          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_32-${{ hashFiles('mix.lock') }}
+          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_33-${{ hashFiles('mix.lock') }}
           restore-keys: |
             ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-"
 

From 286ddbc6f3cbc2dc2650aff4f78331fde54632d0 Mon Sep 17 00:00:00 2001
From: Viktor Baranov <baranov.viktor.27@gmail.com>
Date: Wed, 27 Dec 2023 18:22:09 +0300
Subject: [PATCH 864/909] Update version to 6.0.0

---
 .github/ISSUE_TEMPLATE/bug_report.yml              |  2 +-
 .github/workflows/prerelease.yml                   |  2 +-
 .../workflows/publish-docker-image-every-push.yml  |  2 +-
 .../workflows/publish-docker-image-for-core.yml    |  2 +-
 .../publish-docker-image-for-eth-goerli.yml        |  2 +-
 .../publish-docker-image-for-eth-sepolia.yml       |  2 +-
 .github/workflows/publish-docker-image-for-eth.yml |  2 +-
 .../workflows/publish-docker-image-for-fuse.yml    |  2 +-
 .../publish-docker-image-for-immutable.yml         |  2 +-
 .../publish-docker-image-for-l2-staging.yml        |  2 +-
 .../workflows/publish-docker-image-for-lukso.yml   |  2 +-
 .../publish-docker-image-for-optimism.yml          |  2 +-
 .../publish-docker-image-for-polygon-edge.yml      |  2 +-
 .github/workflows/publish-docker-image-for-rsk.yml |  2 +-
 .../publish-docker-image-for-stability.yml         |  2 +-
 .../workflows/publish-docker-image-for-suave.yml   |  2 +-
 .../workflows/publish-docker-image-for-xdai.yml    |  2 +-
 .../workflows/publish-docker-image-for-zkevm.yml   |  2 +-
 .../workflows/publish-docker-image-for-zksync.yml  |  2 +-
 .../publish-docker-image-staging-on-demand.yml     |  2 +-
 .github/workflows/release-additional.yml           |  2 +-
 .github/workflows/release.yml                      |  2 +-
 CHANGELOG.md                                       | 14 ++++++++++++++
 apps/block_scout_web/mix.exs                       |  2 +-
 apps/ethereum_jsonrpc/mix.exs                      |  2 +-
 apps/explorer/mix.exs                              |  2 +-
 apps/indexer/mix.exs                               |  2 +-
 docker-compose/docker-compose.yml                  |  2 +-
 docker/Makefile                                    |  2 +-
 mix.exs                                            |  2 +-
 rel/config.exs                                     |  2 +-
 31 files changed, 44 insertions(+), 30 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
index 4f35712cae63..dcd9fc29d2b7 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -65,7 +65,7 @@ body:
     attributes:
       label: Backend version
       description: The release version of the backend or branch/commit.
-      placeholder: v5.4.0
+      placeholder: v6.0.0
     validations:
       required: true
 
diff --git a/.github/workflows/prerelease.yml b/.github/workflows/prerelease.yml
index 070650c676f4..2d09956875c9 100644
--- a/.github/workflows/prerelease.yml
+++ b/.github/workflows/prerelease.yml
@@ -16,7 +16,7 @@ jobs:
     name: Push Docker image to Docker Hub
     runs-on: ubuntu-latest
     env:
-      RELEASE_VERSION: 5.4.0
+      RELEASE_VERSION: 6.0.0
     steps:
       - name: Check out the repo
         uses: actions/checkout@v4
diff --git a/.github/workflows/publish-docker-image-every-push.yml b/.github/workflows/publish-docker-image-every-push.yml
index 10d2cfabc9ff..25d9c3fa9960 100644
--- a/.github/workflows/publish-docker-image-every-push.yml
+++ b/.github/workflows/publish-docker-image-every-push.yml
@@ -11,7 +11,7 @@ on:
 env:
   OTP_VERSION: '25.2.1'
   ELIXIR_VERSION: '1.14.5'
-  RELEASE_VERSION: 5.4.0
+  RELEASE_VERSION: 6.0.0
 
 jobs:
   push_to_registry:
diff --git a/.github/workflows/publish-docker-image-for-core.yml b/.github/workflows/publish-docker-image-for-core.yml
index 0c76d126208f..61cb6f8189a2 100644
--- a/.github/workflows/publish-docker-image-for-core.yml
+++ b/.github/workflows/publish-docker-image-for-core.yml
@@ -15,7 +15,7 @@ jobs:
     name: Push Docker image to Docker Hub
     runs-on: ubuntu-latest
     env:
-      RELEASE_VERSION: 5.4.0
+      RELEASE_VERSION: 6.0.0
       DOCKER_CHAIN_NAME: poa
     steps:
       - name: Check out the repo
diff --git a/.github/workflows/publish-docker-image-for-eth-goerli.yml b/.github/workflows/publish-docker-image-for-eth-goerli.yml
index 1911bbb35795..f381283cf359 100644
--- a/.github/workflows/publish-docker-image-for-eth-goerli.yml
+++ b/.github/workflows/publish-docker-image-for-eth-goerli.yml
@@ -15,7 +15,7 @@ jobs:
     name: Push Docker image to Docker Hub
     runs-on: ubuntu-latest
     env:
-      RELEASE_VERSION: 5.4.0
+      RELEASE_VERSION: 6.0.0
       DOCKER_CHAIN_NAME: eth-goerli
     steps:
       - name: Check out the repo
diff --git a/.github/workflows/publish-docker-image-for-eth-sepolia.yml b/.github/workflows/publish-docker-image-for-eth-sepolia.yml
index 7c09456adcb7..b24c2571676e 100644
--- a/.github/workflows/publish-docker-image-for-eth-sepolia.yml
+++ b/.github/workflows/publish-docker-image-for-eth-sepolia.yml
@@ -15,7 +15,7 @@ jobs:
     name: Push Docker image to Docker Hub
     runs-on: ubuntu-latest
     env:
-      RELEASE_VERSION: 5.4.0
+      RELEASE_VERSION: 6.0.0
       DOCKER_CHAIN_NAME: eth-sepolia
     steps:
       - name: Check out the repo
diff --git a/.github/workflows/publish-docker-image-for-eth.yml b/.github/workflows/publish-docker-image-for-eth.yml
index f7a0ad5fd2a2..a663380306f2 100644
--- a/.github/workflows/publish-docker-image-for-eth.yml
+++ b/.github/workflows/publish-docker-image-for-eth.yml
@@ -15,7 +15,7 @@ jobs:
     name: Push Docker image to Docker Hub
     runs-on: ubuntu-latest
     env:
-      RELEASE_VERSION: 5.4.0
+      RELEASE_VERSION: 6.0.0
       DOCKER_CHAIN_NAME: mainnet
     steps:
       - name: Check out the repo
diff --git a/.github/workflows/publish-docker-image-for-fuse.yml b/.github/workflows/publish-docker-image-for-fuse.yml
index 286664969fb6..a9ec8713e782 100644
--- a/.github/workflows/publish-docker-image-for-fuse.yml
+++ b/.github/workflows/publish-docker-image-for-fuse.yml
@@ -15,7 +15,7 @@ jobs:
     name: Push Docker image to Docker Hub
     runs-on: ubuntu-latest
     env:
-      RELEASE_VERSION: 5.4.0
+      RELEASE_VERSION: 6.0.0
       DOCKER_CHAIN_NAME: fuse
     steps:
       - name: Check out the repo
diff --git a/.github/workflows/publish-docker-image-for-immutable.yml b/.github/workflows/publish-docker-image-for-immutable.yml
index 1c9e5cc85af0..8bd44e3d1ccd 100644
--- a/.github/workflows/publish-docker-image-for-immutable.yml
+++ b/.github/workflows/publish-docker-image-for-immutable.yml
@@ -15,7 +15,7 @@ jobs:
     name: Push Docker image to Docker Hub
     runs-on: ubuntu-latest
     env:
-      RELEASE_VERSION: 5.4.0
+      RELEASE_VERSION: 6.0.0
       DOCKER_CHAIN_NAME: immutable
     steps:
       - name: Check out the repo
diff --git a/.github/workflows/publish-docker-image-for-l2-staging.yml b/.github/workflows/publish-docker-image-for-l2-staging.yml
index 637b880a2ba5..1c5f290907a6 100644
--- a/.github/workflows/publish-docker-image-for-l2-staging.yml
+++ b/.github/workflows/publish-docker-image-for-l2-staging.yml
@@ -15,7 +15,7 @@ jobs:
     name: Push Docker image to Docker Hub
     runs-on: ubuntu-latest
     env:
-      RELEASE_VERSION: 5.4.0
+      RELEASE_VERSION: 6.0.0
       DOCKER_CHAIN_NAME: optimism-l2-advanced
     steps:
       - name: Check out the repo
diff --git a/.github/workflows/publish-docker-image-for-lukso.yml b/.github/workflows/publish-docker-image-for-lukso.yml
index 4cd324babd30..10efc69fe25a 100644
--- a/.github/workflows/publish-docker-image-for-lukso.yml
+++ b/.github/workflows/publish-docker-image-for-lukso.yml
@@ -15,7 +15,7 @@ jobs:
     name: Push Docker image to Docker Hub
     runs-on: ubuntu-latest
     env:
-      RELEASE_VERSION: 5.4.0
+      RELEASE_VERSION: 6.0.0
       DOCKER_CHAIN_NAME: lukso
     steps:
       - name: Check out the repo
diff --git a/.github/workflows/publish-docker-image-for-optimism.yml b/.github/workflows/publish-docker-image-for-optimism.yml
index 320ed18ba421..f0c24fa58221 100644
--- a/.github/workflows/publish-docker-image-for-optimism.yml
+++ b/.github/workflows/publish-docker-image-for-optimism.yml
@@ -15,7 +15,7 @@ jobs:
     name: Push Docker image to Docker Hub
     runs-on: ubuntu-latest
     env:
-      RELEASE_VERSION: 5.4.0
+      RELEASE_VERSION: 6.0.0
       DOCKER_CHAIN_NAME: optimism
     steps:
       - name: Check out the repo
diff --git a/.github/workflows/publish-docker-image-for-polygon-edge.yml b/.github/workflows/publish-docker-image-for-polygon-edge.yml
index d2153e90725a..a7384c4f29fc 100644
--- a/.github/workflows/publish-docker-image-for-polygon-edge.yml
+++ b/.github/workflows/publish-docker-image-for-polygon-edge.yml
@@ -15,7 +15,7 @@ jobs:
     name: Push Docker image to Docker Hub
     runs-on: ubuntu-latest
     env:
-      RELEASE_VERSION: 5.4.0
+      RELEASE_VERSION: 6.0.0
       DOCKER_CHAIN_NAME: polygon-edge
     steps:
       - name: Check out the repo
diff --git a/.github/workflows/publish-docker-image-for-rsk.yml b/.github/workflows/publish-docker-image-for-rsk.yml
index 3f77608f0c3d..615ad8820bca 100644
--- a/.github/workflows/publish-docker-image-for-rsk.yml
+++ b/.github/workflows/publish-docker-image-for-rsk.yml
@@ -15,7 +15,7 @@ jobs:
     name: Push Docker image to Docker Hub
     runs-on: ubuntu-latest
     env:
-      RELEASE_VERSION: 5.4.0
+      RELEASE_VERSION: 6.0.0
       DOCKER_CHAIN_NAME: rsk
     steps:
       - name: Check out the repo
diff --git a/.github/workflows/publish-docker-image-for-stability.yml b/.github/workflows/publish-docker-image-for-stability.yml
index b81cbc13344c..c14e5a6a6ac9 100644
--- a/.github/workflows/publish-docker-image-for-stability.yml
+++ b/.github/workflows/publish-docker-image-for-stability.yml
@@ -18,7 +18,7 @@ jobs:
     name: Push Docker image to Docker Hub
     runs-on: ubuntu-latest
     env:
-      RELEASE_VERSION: 5.4.0
+      RELEASE_VERSION: 6.0.0
       DOCKER_CHAIN_NAME: stability
     steps:
       - name: Check out the repo
diff --git a/.github/workflows/publish-docker-image-for-suave.yml b/.github/workflows/publish-docker-image-for-suave.yml
index 8ba4ec4975ed..0f3c4ad43982 100644
--- a/.github/workflows/publish-docker-image-for-suave.yml
+++ b/.github/workflows/publish-docker-image-for-suave.yml
@@ -18,7 +18,7 @@ jobs:
     name: Push Docker image to Docker Hub
     runs-on: ubuntu-latest
     env:
-      RELEASE_VERSION: 5.4.0
+      RELEASE_VERSION: 6.0.0
       DOCKER_CHAIN_NAME: suave
     steps:
       - name: Check out the repo
diff --git a/.github/workflows/publish-docker-image-for-xdai.yml b/.github/workflows/publish-docker-image-for-xdai.yml
index 7af9b838a315..b53fe18fc50f 100644
--- a/.github/workflows/publish-docker-image-for-xdai.yml
+++ b/.github/workflows/publish-docker-image-for-xdai.yml
@@ -15,7 +15,7 @@ jobs:
     name: Push Docker image to Docker Hub
     runs-on: ubuntu-latest
     env:
-      RELEASE_VERSION: 5.4.0
+      RELEASE_VERSION: 6.0.0
       DOCKER_CHAIN_NAME: xdai
     steps:
       - name: Check out the repo
diff --git a/.github/workflows/publish-docker-image-for-zkevm.yml b/.github/workflows/publish-docker-image-for-zkevm.yml
index 603719db11aa..0e7072a3940e 100644
--- a/.github/workflows/publish-docker-image-for-zkevm.yml
+++ b/.github/workflows/publish-docker-image-for-zkevm.yml
@@ -15,7 +15,7 @@ jobs:
     name: Push Docker image to Docker Hub
     runs-on: ubuntu-latest
     env:
-      RELEASE_VERSION: 5.4.0
+      RELEASE_VERSION: 6.0.0
       DOCKER_CHAIN_NAME: zkevm
     steps:
       - name: Check out the repo
diff --git a/.github/workflows/publish-docker-image-for-zksync.yml b/.github/workflows/publish-docker-image-for-zksync.yml
index aa6317647923..04cdf569a63d 100644
--- a/.github/workflows/publish-docker-image-for-zksync.yml
+++ b/.github/workflows/publish-docker-image-for-zksync.yml
@@ -15,7 +15,7 @@ jobs:
     name: Push Docker image to Docker Hub
     runs-on: ubuntu-latest
     env:
-      RELEASE_VERSION: 5.4.0
+      RELEASE_VERSION: 6.0.0
       DOCKER_CHAIN_NAME: zksync
     steps:
       - name: Check out the repo
diff --git a/.github/workflows/publish-docker-image-staging-on-demand.yml b/.github/workflows/publish-docker-image-staging-on-demand.yml
index e33a3ee7c37d..090a6be9d782 100644
--- a/.github/workflows/publish-docker-image-staging-on-demand.yml
+++ b/.github/workflows/publish-docker-image-staging-on-demand.yml
@@ -12,7 +12,7 @@ on:
 env:
   OTP_VERSION: '25.2.1'
   ELIXIR_VERSION: '1.14.5'
-  RELEASE_VERSION: 5.4.0
+  RELEASE_VERSION: 6.0.0
 
 jobs:
   push_to_registry:
diff --git a/.github/workflows/release-additional.yml b/.github/workflows/release-additional.yml
index 36ff36c1aa79..f0912540dc69 100644
--- a/.github/workflows/release-additional.yml
+++ b/.github/workflows/release-additional.yml
@@ -18,7 +18,7 @@ jobs:
     name: Push Docker image to Docker Hub
     runs-on: ubuntu-latest
     env:
-      RELEASE_VERSION: 5.4.0
+      RELEASE_VERSION: 6.0.0
     steps:
       - name: Check out the repo
         uses: actions/checkout@v4
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index cd7599014882..ded48ce497f3 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -18,7 +18,7 @@ jobs:
     name: Push Docker image to Docker Hub
     runs-on: ubuntu-latest
     env:
-      RELEASE_VERSION: 5.4.0
+      RELEASE_VERSION: 6.0.0
     steps:
       - name: Check out the repo
         uses: actions/checkout@v4
diff --git a/CHANGELOG.md b/CHANGELOG.md
index c1df85bc68ef..5dc5c4caff1d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,18 @@
 # ChangeLog
 
+## Current
+
+### Features
+
+### Fixes
+
+### Chore
+
+<details>
+  <summary>Dependencies version bumps</summary>
+
+</details>
+
 ## 6.0.0-dev
 
 ### Features
@@ -65,6 +78,7 @@
 - [#9094](https://github.com/blockscout/blockscout/pull/9094) - Improve exchange rates logging
 - [#9014](https://github.com/blockscout/blockscout/pull/9014) - Decrease amount of NFT in address collection: 15 -> 9
 - [#8994](https://github.com/blockscout/blockscout/pull/8994) - Refactor transactions event preloads
+- [#8991](https://github.com/blockscout/blockscout/pull/8991) - Manage DB queue target via runtime env var
 
 <details>
   <summary>Dependencies version bumps</summary>
diff --git a/apps/block_scout_web/mix.exs b/apps/block_scout_web/mix.exs
index d155e0c572b8..e90612b58202 100644
--- a/apps/block_scout_web/mix.exs
+++ b/apps/block_scout_web/mix.exs
@@ -23,7 +23,7 @@ defmodule BlockScoutWeb.Mixfile do
         dialyzer: :test
       ],
       start_permanent: Mix.env() == :prod,
-      version: "5.4.0",
+      version: "6.0.0",
       xref: [exclude: [Explorer.Chain.Zkevm.Reader]]
     ]
   end
diff --git a/apps/ethereum_jsonrpc/mix.exs b/apps/ethereum_jsonrpc/mix.exs
index 1da7647be613..3545774c33a3 100644
--- a/apps/ethereum_jsonrpc/mix.exs
+++ b/apps/ethereum_jsonrpc/mix.exs
@@ -23,7 +23,7 @@ defmodule EthereumJsonrpc.MixProject do
         dialyzer: :test
       ],
       start_permanent: Mix.env() == :prod,
-      version: "5.4.0"
+      version: "6.0.0"
     ]
   end
 
diff --git a/apps/explorer/mix.exs b/apps/explorer/mix.exs
index a4195751ef8d..ae066dfdc75f 100644
--- a/apps/explorer/mix.exs
+++ b/apps/explorer/mix.exs
@@ -24,7 +24,7 @@ defmodule Explorer.Mixfile do
         dialyzer: :test
       ],
       start_permanent: Mix.env() == :prod,
-      version: "5.4.0",
+      version: "6.0.0",
       xref: [exclude: [BlockScoutWeb.WebRouter.Helpers]]
     ]
   end
diff --git a/apps/indexer/mix.exs b/apps/indexer/mix.exs
index 58b20d24aa4c..7e349261ccbd 100644
--- a/apps/indexer/mix.exs
+++ b/apps/indexer/mix.exs
@@ -14,7 +14,7 @@ defmodule Indexer.MixProject do
       elixirc_paths: elixirc_paths(Mix.env()),
       lockfile: "../../mix.lock",
       start_permanent: Mix.env() == :prod,
-      version: "5.4.0"
+      version: "6.0.0"
     ]
   end
 
diff --git a/docker-compose/docker-compose.yml b/docker-compose/docker-compose.yml
index 2bbda2c94236..b00502a5a187 100644
--- a/docker-compose/docker-compose.yml
+++ b/docker-compose/docker-compose.yml
@@ -34,7 +34,7 @@ services:
         CACHE_TOTAL_GAS_USAGE_COUNTER_ENABLED: ""
         CACHE_ADDRESS_WITH_BALANCES_UPDATE_INTERVAL: ""
         ADMIN_PANEL_ENABLED: ""
-        RELEASE_VERSION: 5.4.0
+        RELEASE_VERSION: 6.0.0
     links:
       - db:database
     environment:
diff --git a/docker/Makefile b/docker/Makefile
index 09e923956423..63bcd32de63b 100644
--- a/docker/Makefile
+++ b/docker/Makefile
@@ -10,7 +10,7 @@ STATS_CONTAINER_NAME := stats
 STATS_DB_CONTAINER_NAME := stats-postgres
 PROXY_CONTAINER_NAME := proxy
 PG_CONTAINER_NAME := postgres
-RELEASE_VERSION ?= '5.4.0'
+RELEASE_VERSION ?= '6.0.0'
 TAG := $(RELEASE_VERSION)-commit-$(shell git log -1 --pretty=format:"%h")
 STABLE_TAG := $(RELEASE_VERSION)
 
diff --git a/mix.exs b/mix.exs
index f144b85ac3e7..06f570b70e79 100644
--- a/mix.exs
+++ b/mix.exs
@@ -7,7 +7,7 @@ defmodule BlockScout.Mixfile do
     [
       # app: :block_scout,
       # aliases: aliases(config_env()),
-      version: "5.4.0",
+      version: "6.0.0",
       apps_path: "apps",
       deps: deps(),
       dialyzer: dialyzer(),
diff --git a/rel/config.exs b/rel/config.exs
index aef4c2f2d18e..b7c3f38132d3 100644
--- a/rel/config.exs
+++ b/rel/config.exs
@@ -71,7 +71,7 @@ end
 # will be used by default
 
 release :blockscout do
-  set version: "5.4.0-beta"
+  set version: "6.0.0-beta"
   set applications: [
     :runtime_tools,
     block_scout_web: :permanent,

From d4e03a8e7fc2399d90e51b54cee7c0b6af9e25dc Mon Sep 17 00:00:00 2001
From: Qwerty5Uiop <alex000010@bk.ru>
Date: Fri, 5 Jan 2024 15:54:28 +0400
Subject: [PATCH 865/909] Fix migration_finished? logic

---
 CHANGELOG.md                                                   | 2 ++
 apps/explorer/lib/explorer/etherscan.ex                        | 3 ++-
 apps/explorer/lib/explorer/migrator/filling_migration.ex       | 2 +-
 .../test/explorer/chain/cache/gas_price_oracle_test.exs        | 3 +++
 4 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5dc5c4caff1d..80a642db0cea 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -19,6 +19,8 @@
 
 ### Fixes
 
+- [#9101](https://github.com/blockscout/blockscout/pull/9101) - Fix migration_finished? logic
+
 ### Chore
 
 - [#9055](https://github.com/blockscout/blockscout/pull/9055) - Add ASC indices for logs, token transfers, transactions
diff --git a/apps/explorer/lib/explorer/etherscan.ex b/apps/explorer/lib/explorer/etherscan.ex
index dba8be73ebcc..023f74e9dadb 100644
--- a/apps/explorer/lib/explorer/etherscan.ex
+++ b/apps/explorer/lib/explorer/etherscan.ex
@@ -556,6 +556,7 @@ defmodule Explorer.Etherscan do
             from_address_hash: tt.from_address_hash,
             to_address_hash: tt.to_address_hash,
             amount: tt.amount,
+            amounts: tt.amounts,
             transaction_nonce: t.nonce,
             transaction_index: t.index,
             transaction_gas: t.gas,
@@ -567,7 +568,7 @@ defmodule Explorer.Etherscan do
             block_number: b.number,
             block_timestamp: b.timestamp,
             confirmations: fragment("? - ?", ^block_height, t.block_number),
-            token_id: tt.token_id,
+            token_ids: tt.token_ids,
             token_name: tt.token_name,
             token_symbol: tt.token_symbol,
             token_decimals: tt.token_decimals,
diff --git a/apps/explorer/lib/explorer/migrator/filling_migration.ex b/apps/explorer/lib/explorer/migrator/filling_migration.ex
index 05823e951765..7ca5b26989f4 100644
--- a/apps/explorer/lib/explorer/migrator/filling_migration.ex
+++ b/apps/explorer/lib/explorer/migrator/filling_migration.ex
@@ -27,7 +27,7 @@ defmodule Explorer.Migrator.FillingMigration do
       end
 
       def migration_finished? do
-        not Repo.exists?(unprocessed_data_query())
+        MigrationStatus.get_status(migration_name()) == "completed"
       end
 
       @impl true
diff --git a/apps/explorer/test/explorer/chain/cache/gas_price_oracle_test.exs b/apps/explorer/test/explorer/chain/cache/gas_price_oracle_test.exs
index 20472f79ee32..a30d4070f66f 100644
--- a/apps/explorer/test/explorer/chain/cache/gas_price_oracle_test.exs
+++ b/apps/explorer/test/explorer/chain/cache/gas_price_oracle_test.exs
@@ -351,6 +351,7 @@ defmodule Explorer.Chain.Cache.GasPriceOracleTest do
         status: :ok,
         block_hash: block1.hash,
         block_number: block1.number,
+        block_timestamp: block1.timestamp,
         cumulative_gas_used: 884_322,
         gas_used: 106_025,
         index: 0,
@@ -366,6 +367,7 @@ defmodule Explorer.Chain.Cache.GasPriceOracleTest do
         status: :ok,
         block_hash: block2.hash,
         block_number: block2.number,
+        block_timestamp: block2.timestamp,
         cumulative_gas_used: 884_322,
         gas_used: 106_025,
         index: 0,
@@ -381,6 +383,7 @@ defmodule Explorer.Chain.Cache.GasPriceOracleTest do
         status: :ok,
         block_hash: block2.hash,
         block_number: block2.number,
+        block_timestamp: block2.timestamp,
         cumulative_gas_used: 884_322,
         gas_used: 106_025,
         index: 1,

From a0e5f11fca9ec9d5cc7143f6b38f38b9e11b77df Mon Sep 17 00:00:00 2001
From: Qwerty5Uiop <alex000010@bk.ru>
Date: Mon, 8 Jan 2024 14:08:56 +0400
Subject: [PATCH 866/909] Update migrator's cache if migration is already
 finished

---
 CHANGELOG.md                                             | 1 +
 apps/explorer/lib/explorer/migrator/filling_migration.ex | 1 +
 2 files changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 80a642db0cea..3ff34b5b4031 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -19,6 +19,7 @@
 
 ### Fixes
 
+- [#9113](https://github.com/blockscout/blockscout/pull/9113) - Fix migrators cache updating
 - [#9101](https://github.com/blockscout/blockscout/pull/9101) - Fix migration_finished? logic
 
 ### Chore
diff --git a/apps/explorer/lib/explorer/migrator/filling_migration.ex b/apps/explorer/lib/explorer/migrator/filling_migration.ex
index 7ca5b26989f4..507dfcb6e5f7 100644
--- a/apps/explorer/lib/explorer/migrator/filling_migration.ex
+++ b/apps/explorer/lib/explorer/migrator/filling_migration.ex
@@ -34,6 +34,7 @@ defmodule Explorer.Migrator.FillingMigration do
       def init(_) do
         case MigrationStatus.get_status(migration_name()) do
           "completed" ->
+            update_cache()
             :ignore
 
           _ ->

From 4bf97cd0f1ba5031f242737b2d9611e0faec201a Mon Sep 17 00:00:00 2001
From: Viktor Baranov <baranov.viktor.27@gmail.com>
Date: Mon, 8 Jan 2024 16:58:09 +0300
Subject: [PATCH 867/909] Update CHANGELOG

---
 CHANGELOG.md | 35 +++++++++++++++++++----------------
 1 file changed, 19 insertions(+), 16 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3ff34b5b4031..701e81828fb7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,14 +13,20 @@
 
 </details>
 
-## 6.0.0-dev
+## 6.0.0
 
 ### Features
 
+- [#9112](https://github.com/blockscout/blockscout/pull/9112) - Add specific url for eth_call
+- [#9044](https://github.com/blockscout/blockscout/pull/9044) - Expand gas price oracle functionality
+
 ### Fixes
 
 - [#9113](https://github.com/blockscout/blockscout/pull/9113) - Fix migrators cache updating
 - [#9101](https://github.com/blockscout/blockscout/pull/9101) - Fix migration_finished? logic
+- [#9062](https://github.com/blockscout/blockscout/pull/9062) - Fix blockscout-ens integration
+- [#9061](https://github.com/blockscout/blockscout/pull/9061) - Arbitrum allow tx receipt gasUsedForL1 field
+- [#8812](https://github.com/blockscout/blockscout/pull/8812) - Update existing tokens type if got transfer with higher type priority
 
 ### Chore
 
@@ -34,24 +40,21 @@
 - [#8996](https://github.com/blockscout/blockscout/pull/8996) - Refine token transfers token ids index
 - [#5322](https://github.com/blockscout/blockscout/pull/5322) - DB denormalization: block consensus and timestamp in transaction table
 
-## Current
-
-### Features
-
-- [#9112](https://github.com/blockscout/blockscout/pull/9112) - Add specific url for eth_call
-- [#9044](https://github.com/blockscout/blockscout/pull/9044) - Expand gas price oracle functionality
-
-### Fixes
-
-- [#9062](https://github.com/blockscout/blockscout/pull/9062) - Fix blockscout-ens integration
-- [#9061](https://github.com/blockscout/blockscout/pull/9061) - Arbitrum allow tx receipt gasUsedForL1 field
-- [#8812](https://github.com/blockscout/blockscout/pull/8812) - Update existing tokens type if got transfer with higher type priority
-
-### Chore
-
 <details>
   <summary>Dependencies version bumps</summary>
 
+- [#9059](https://github.com/blockscout/blockscout/pull/9059) - Bump redux from 5.0.0 to 5.0.1 in /apps/block_scout_web/assets
+- [#9057](https://github.com/blockscout/blockscout/pull/9057) - Bump benchee from 1.2.0 to 1.3.0
+- [#9060](https://github.com/blockscout/blockscout/pull/9060) - Bump @amplitude/analytics-browser from 2.3.7 to 2.3.8 in /apps/block_scout_web/assets
+- [#9084](https://github.com/blockscout/blockscout/pull/9084) - Bump @babel/preset-env from 7.23.6 to 7.23.7 in /apps/block_scout_web/assets
+- [#9083](https://github.com/blockscout/blockscout/pull/9083) - Bump @babel/core from 7.23.6 to 7.23.7 in /apps/block_scout_web/assets
+- [#9086](https://github.com/blockscout/blockscout/pull/9086) - Bump core-js from 3.34.0 to 3.35.0 in /apps/block_scout_web/assets
+- [#9081](https://github.com/blockscout/blockscout/pull/9081) - Bump sweetalert2 from 11.10.1 to 11.10.2 in /apps/block_scout_web/assets
+- [#9085](https://github.com/blockscout/blockscout/pull/9085) - Bump moment from 2.29.4 to 2.30.1 in /apps/block_scout_web/assets
+- [#9087](https://github.com/blockscout/blockscout/pull/9087) - Bump postcss-loader from 7.3.3 to 7.3.4 in /apps/block_scout_web/assets
+- [#9082](https://github.com/blockscout/blockscout/pull/9082) - Bump sass-loader from 13.3.2 to 13.3.3 in /apps/block_scout_web/assets
+- [#9088](https://github.com/blockscout/blockscout/pull/9088) - Bump sass from 1.69.5 to 1.69.6 in /apps/block_scout_web/assets
+
 </details>
 
 ## 5.4.0-beta

From 2098e5cc70f533b94662f050d2c989e635d3a675 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 8 Jan 2024 18:08:20 +0000
Subject: [PATCH 868/909] Bump ueberauth from 0.10.5 to 0.10.7

Bumps [ueberauth](https://github.com/ueberauth/ueberauth) from 0.10.5 to 0.10.7.
- [Release notes](https://github.com/ueberauth/ueberauth/releases)
- [Changelog](https://github.com/ueberauth/ueberauth/blob/master/CHANGELOG.md)
- [Commits](https://github.com/ueberauth/ueberauth/compare/v0.10.5...v0.10.7)

---
updated-dependencies:
- dependency-name: ueberauth
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 mix.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mix.lock b/mix.lock
index be7161e17e3d..619743cf93a8 100644
--- a/mix.lock
+++ b/mix.lock
@@ -136,7 +136,7 @@
   "timex": {:hex, :timex, "3.7.11", "bb95cb4eb1d06e27346325de506bcc6c30f9c6dea40d1ebe390b262fad1862d1", [:mix], [{:combine, "~> 0.10", [hex: :combine, repo: "hexpm", optional: false]}, {:gettext, "~> 0.20", [hex: :gettext, repo: "hexpm", optional: false]}, {:tzdata, "~> 1.1", [hex: :tzdata, repo: "hexpm", optional: false]}], "hexpm", "8b9024f7efbabaf9bd7aa04f65cf8dcd7c9818ca5737677c7b76acbc6a94d1aa"},
   "toml": {:hex, :toml, "0.6.2", "38f445df384a17e5d382befe30e3489112a48d3ba4c459e543f748c2f25dd4d1", [:mix], [], "hexpm", "d013e45126d74c0c26a38d31f5e8e9b83ea19fc752470feb9a86071ca5a672fa"},
   "tzdata": {:hex, :tzdata, "1.1.1", "20c8043476dfda8504952d00adac41c6eda23912278add38edc140ae0c5bcc46", [:mix], [{:hackney, "~> 1.17", [hex: :hackney, repo: "hexpm", optional: false]}], "hexpm", "a69cec8352eafcd2e198dea28a34113b60fdc6cb57eb5ad65c10292a6ba89787"},
-  "ueberauth": {:hex, :ueberauth, "0.10.5", "806adb703df87e55b5615cf365e809f84c20c68aa8c08ff8a416a5a6644c4b02", [:mix], [{:plug, "~> 1.5", [hex: :plug, repo: "hexpm", optional: false]}], "hexpm", "3efd1f31d490a125c7ed453b926f7c31d78b97b8a854c755f5c40064bf3ac9e1"},
+  "ueberauth": {:hex, :ueberauth, "0.10.7", "5a31cbe11e7ce5c7484d745dc9e1f11948e89662f8510d03c616de03df581ebd", [:mix], [{:plug, "~> 1.5", [hex: :plug, repo: "hexpm", optional: false]}], "hexpm", "0bccf73e2ffd6337971340832947ba232877aa8122dba4c95be9f729c8987377"},
   "ueberauth_auth0": {:hex, :ueberauth_auth0, "2.1.0", "0632d5844049fa2f26823f15e1120aa32f27df6f27ce515a4b04641736594bf4", [:mix], [{:oauth2, "~> 2.0", [hex: :oauth2, repo: "hexpm", optional: false]}, {:ueberauth, "~> 0.7", [hex: :ueberauth, repo: "hexpm", optional: false]}], "hexpm", "8d3b30fa27c95c9e82c30c4afb016251405706d2e9627e603c3c9787fd1314fc"},
   "unicode_util_compat": {:hex, :unicode_util_compat, "0.7.0", "bc84380c9ab48177092f43ac89e4dfa2c6d62b40b8bd132b1059ecc7232f9a78", [:rebar3], [], "hexpm", "25eee6d67df61960cf6a794239566599b09e17e668d3700247bc498638152521"},
   "wallaby": {:hex, :wallaby, "0.30.6", "7dc4c1213f3b52c4152581d126632bc7e06892336d3a0f582853efeeabd45a71", [:mix], [{:ecto_sql, ">= 3.0.0", [hex: :ecto_sql, repo: "hexpm", optional: true]}, {:httpoison, "~> 0.12 or ~> 1.0 or ~> 2.0", [hex: :httpoison, repo: "hexpm", optional: false]}, {:jason, "~> 1.1", [hex: :jason, repo: "hexpm", optional: false]}, {:phoenix_ecto, ">= 3.0.0", [hex: :phoenix_ecto, repo: "hexpm", optional: true]}, {:web_driver_client, "~> 0.2.0", [hex: :web_driver_client, repo: "hexpm", optional: false]}], "hexpm", "50950c1d968549b54c20e16175c68c7fc0824138e2bb93feb11ef6add8eb23d4"},

From 5eac5a40bd2d51c359d533aad334030b49f4dc8a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 8 Jan 2024 18:31:55 +0000
Subject: [PATCH 869/909] Bump sass from 1.69.6 to 1.69.7 in
 /apps/block_scout_web/assets

Bumps [sass](https://github.com/sass/dart-sass) from 1.69.6 to 1.69.7.
- [Release notes](https://github.com/sass/dart-sass/releases)
- [Changelog](https://github.com/sass/dart-sass/blob/main/CHANGELOG.md)
- [Commits](https://github.com/sass/dart-sass/compare/1.69.6...1.69.7)

---
updated-dependencies:
- dependency-name: sass
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 apps/block_scout_web/assets/package-lock.json | 14 +++++++-------
 apps/block_scout_web/assets/package.json      |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/apps/block_scout_web/assets/package-lock.json b/apps/block_scout_web/assets/package-lock.json
index 77192dd8a924..3e26e42e9e28 100644
--- a/apps/block_scout_web/assets/package-lock.json
+++ b/apps/block_scout_web/assets/package-lock.json
@@ -89,7 +89,7 @@
         "mini-css-extract-plugin": "^2.7.6",
         "postcss": "^8.4.32",
         "postcss-loader": "^7.3.4",
-        "sass": "^1.69.6",
+        "sass": "^1.69.7",
         "sass-loader": "^13.3.3",
         "style-loader": "^3.3.3",
         "webpack": "^5.89.0",
@@ -15193,9 +15193,9 @@
       "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
     },
     "node_modules/sass": {
-      "version": "1.69.6",
-      "resolved": "https://registry.npmjs.org/sass/-/sass-1.69.6.tgz",
-      "integrity": "sha512-qbRr3k9JGHWXCvZU77SD2OTwUlC+gNT+61JOLcmLm+XqH4h/5D+p4IIsxvpkB89S9AwJOyb5+rWNpIucaFxSFQ==",
+      "version": "1.69.7",
+      "resolved": "https://registry.npmjs.org/sass/-/sass-1.69.7.tgz",
+      "integrity": "sha512-rzj2soDeZ8wtE2egyLXgOOHQvaC2iosZrkF6v3EUG+tBwEvhqUCzm0VP3k9gHF9LXbSrRhT5SksoI56Iw8NPnQ==",
       "dev": true,
       "dependencies": {
         "chokidar": ">=3.0.0 <4.0.0",
@@ -29243,9 +29243,9 @@
       "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
     },
     "sass": {
-      "version": "1.69.6",
-      "resolved": "https://registry.npmjs.org/sass/-/sass-1.69.6.tgz",
-      "integrity": "sha512-qbRr3k9JGHWXCvZU77SD2OTwUlC+gNT+61JOLcmLm+XqH4h/5D+p4IIsxvpkB89S9AwJOyb5+rWNpIucaFxSFQ==",
+      "version": "1.69.7",
+      "resolved": "https://registry.npmjs.org/sass/-/sass-1.69.7.tgz",
+      "integrity": "sha512-rzj2soDeZ8wtE2egyLXgOOHQvaC2iosZrkF6v3EUG+tBwEvhqUCzm0VP3k9gHF9LXbSrRhT5SksoI56Iw8NPnQ==",
       "dev": true,
       "requires": {
         "chokidar": ">=3.0.0 <4.0.0",
diff --git a/apps/block_scout_web/assets/package.json b/apps/block_scout_web/assets/package.json
index 9d8513f7037a..c7ebe9a98806 100644
--- a/apps/block_scout_web/assets/package.json
+++ b/apps/block_scout_web/assets/package.json
@@ -101,7 +101,7 @@
     "mini-css-extract-plugin": "^2.7.6",
     "postcss": "^8.4.32",
     "postcss-loader": "^7.3.4",
-    "sass": "^1.69.6",
+    "sass": "^1.69.7",
     "sass-loader": "^13.3.3",
     "style-loader": "^3.3.3",
     "webpack": "^5.89.0",

From d2683964f8d3ef806c8a277c5c65e6343fd86ac5 Mon Sep 17 00:00:00 2001
From: zjb0807 <zjb0807@qq.com>
Date: Sat, 30 Dec 2023 21:54:55 +0800
Subject: [PATCH 870/909] add status in
 stream_transactions_with_unfetched_created_contract_codes

---
 apps/explorer/lib/explorer/chain.ex | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/explorer/lib/explorer/chain.ex b/apps/explorer/lib/explorer/chain.ex
index f6a4e3615fa4..e61f9cf6ca22 100644
--- a/apps/explorer/lib/explorer/chain.ex
+++ b/apps/explorer/lib/explorer/chain.ex
@@ -1988,7 +1988,7 @@ defmodule Explorer.Chain do
       from(t in Transaction,
         where:
           not is_nil(t.block_hash) and not is_nil(t.created_contract_address_hash) and
-            is_nil(t.created_contract_code_indexed_at),
+            is_nil(t.created_contract_code_indexed_at) and t.status == ^1,
         select: ^fields
       )
 

From faadefd58c47270e4ede32aa6311998bdbd8863b Mon Sep 17 00:00:00 2001
From: zjb0807 <zjb0807@qq.com>
Date: Tue, 9 Jan 2024 13:33:54 +0800
Subject: [PATCH 871/909] rebase master

---
 CHANGELOG.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 701e81828fb7..cf23936d0a38 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,8 @@
 
 ### Fixes
 
+- [#9075](https://github.com/blockscout/blockscout/pull/9075) - Fix fetching contract codes
+
 ### Chore
 
 <details>

From a530bf666160c5d430773729bd5ae24671d8a990 Mon Sep 17 00:00:00 2001
From: Maxim Filonov <53992153+sl1depengwyn@users.noreply.github.com>
Date: Wed, 3 Jan 2024 21:03:00 +0300
Subject: [PATCH 872/909] Send only unique requests in ContractCode fetcher

---
 apps/indexer/lib/indexer/fetcher/contract_code.ex | 1 +
 1 file changed, 1 insertion(+)

diff --git a/apps/indexer/lib/indexer/fetcher/contract_code.ex b/apps/indexer/lib/indexer/fetcher/contract_code.ex
index c9f8f0f7b6e8..716b8f25e204 100644
--- a/apps/indexer/lib/indexer/fetcher/contract_code.ex
+++ b/apps/indexer/lib/indexer/fetcher/contract_code.ex
@@ -98,6 +98,7 @@ defmodule Indexer.Fetcher.ContractCode do
     Logger.debug("fetching created_contract_code for transactions")
 
     entries
+    |> Enum.uniq()
     |> Enum.map(&params/1)
     |> EthereumJSONRPC.fetch_codes(json_rpc_named_arguments)
     |> case do

From abcfe1656381009dab1e3eec98ef7a8d65504a57 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 9 Jan 2024 11:59:06 +0000
Subject: [PATCH 873/909] Bump follow-redirects from 1.14.8 to 1.15.4 in
 /apps/explorer

Bumps [follow-redirects](https://github.com/follow-redirects/follow-redirects) from 1.14.8 to 1.15.4.
- [Release notes](https://github.com/follow-redirects/follow-redirects/releases)
- [Commits](https://github.com/follow-redirects/follow-redirects/compare/v1.14.8...v1.15.4)

---
updated-dependencies:
- dependency-name: follow-redirects
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 apps/explorer/package-lock.json | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/apps/explorer/package-lock.json b/apps/explorer/package-lock.json
index 86af32e1175b..88f5dd663846 100644
--- a/apps/explorer/package-lock.json
+++ b/apps/explorer/package-lock.json
@@ -28,9 +28,9 @@
       }
     },
     "node_modules/follow-redirects": {
-      "version": "1.14.8",
-      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.8.tgz",
-      "integrity": "sha512-1x0S9UVJHsQprFcEC/qnNzBLcIxsjAV905f/UkQxbclCsoTWlacCNOpQa/anodLl2uaEKFhfWOvM2Qg77+15zA==",
+      "version": "1.15.4",
+      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.4.tgz",
+      "integrity": "sha512-Cr4D/5wlrb0z9dgERpUL3LrmPKVDsETIJhaCMeDfuFYcqa5bldGV6wBsAN6X/vxlXQtFBMrXdXxdL8CbDTGniw==",
       "funding": [
         {
           "type": "individual",
@@ -134,9 +134,9 @@
       "integrity": "sha512-OkTL9umf+He2DZkUq8f8J9of7yL6RJKI24dVITBmNfZBmri9zYZQrKkuXiKhyfPSu8tUhnVBB1iKXevvnlR4Ww=="
     },
     "follow-redirects": {
-      "version": "1.14.8",
-      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.8.tgz",
-      "integrity": "sha512-1x0S9UVJHsQprFcEC/qnNzBLcIxsjAV905f/UkQxbclCsoTWlacCNOpQa/anodLl2uaEKFhfWOvM2Qg77+15zA=="
+      "version": "1.15.4",
+      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.4.tgz",
+      "integrity": "sha512-Cr4D/5wlrb0z9dgERpUL3LrmPKVDsETIJhaCMeDfuFYcqa5bldGV6wBsAN6X/vxlXQtFBMrXdXxdL8CbDTGniw=="
     },
     "js-sha3": {
       "version": "0.8.0",

From c9d57051f835916671a2b52b83af2f26f7e3e1ab Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 9 Jan 2024 12:00:17 +0000
Subject: [PATCH 874/909] Bump postcss from 8.4.32 to 8.4.33 in
 /apps/block_scout_web/assets

Bumps [postcss](https://github.com/postcss/postcss) from 8.4.32 to 8.4.33.
- [Release notes](https://github.com/postcss/postcss/releases)
- [Changelog](https://github.com/postcss/postcss/blob/main/CHANGELOG.md)
- [Commits](https://github.com/postcss/postcss/compare/8.4.32...8.4.33)

---
updated-dependencies:
- dependency-name: postcss
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 apps/block_scout_web/assets/package-lock.json | 14 +++++++-------
 apps/block_scout_web/assets/package.json      |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/apps/block_scout_web/assets/package-lock.json b/apps/block_scout_web/assets/package-lock.json
index 3e26e42e9e28..1ad62aa64380 100644
--- a/apps/block_scout_web/assets/package-lock.json
+++ b/apps/block_scout_web/assets/package-lock.json
@@ -87,7 +87,7 @@
         "jest": "^29.7.0",
         "jest-environment-jsdom": "^29.7.0",
         "mini-css-extract-plugin": "^2.7.6",
-        "postcss": "^8.4.32",
+        "postcss": "^8.4.33",
         "postcss-loader": "^7.3.4",
         "sass": "^1.69.7",
         "sass-loader": "^13.3.3",
@@ -13743,9 +13743,9 @@
       }
     },
     "node_modules/postcss": {
-      "version": "8.4.32",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.32.tgz",
-      "integrity": "sha512-D/kj5JNu6oo2EIy+XL/26JEDTlIbB8hw85G8StOE6L74RQAVVP5rej6wxCNqyMbR4RkPfqvezVbPw81Ngd6Kcw==",
+      "version": "8.4.33",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.33.tgz",
+      "integrity": "sha512-Kkpbhhdjw2qQs2O2DGX+8m5OVqEcbB9HRBvuYM9pgrjEFUg30A9LmXNlTAUj4S9kgtGyrMbTzVjH7E+s5Re2yg==",
       "dev": true,
       "funding": [
         {
@@ -28217,9 +28217,9 @@
       "integrity": "sha512-Wb4p1J4zyFTbM+u6WuO4XstYx4Ky9Cewe4DWrel7B0w6VVICvPwdOpotjzcf6eD8TsckVnIMNONQyPIUFOUbCQ=="
     },
     "postcss": {
-      "version": "8.4.32",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.32.tgz",
-      "integrity": "sha512-D/kj5JNu6oo2EIy+XL/26JEDTlIbB8hw85G8StOE6L74RQAVVP5rej6wxCNqyMbR4RkPfqvezVbPw81Ngd6Kcw==",
+      "version": "8.4.33",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.33.tgz",
+      "integrity": "sha512-Kkpbhhdjw2qQs2O2DGX+8m5OVqEcbB9HRBvuYM9pgrjEFUg30A9LmXNlTAUj4S9kgtGyrMbTzVjH7E+s5Re2yg==",
       "dev": true,
       "requires": {
         "nanoid": "^3.3.7",
diff --git a/apps/block_scout_web/assets/package.json b/apps/block_scout_web/assets/package.json
index c7ebe9a98806..e47b66d1bc48 100644
--- a/apps/block_scout_web/assets/package.json
+++ b/apps/block_scout_web/assets/package.json
@@ -99,7 +99,7 @@
     "jest": "^29.7.0",
     "jest-environment-jsdom": "^29.7.0",
     "mini-css-extract-plugin": "^2.7.6",
-    "postcss": "^8.4.32",
+    "postcss": "^8.4.33",
     "postcss-loader": "^7.3.4",
     "sass": "^1.69.7",
     "sass-loader": "^13.3.3",

From f21b2672f716cbfe6ebd29babfcaa2e9f98b7776 Mon Sep 17 00:00:00 2001
From: POA <33550681+poa@users.noreply.github.com>
Date: Fri, 5 Jan 2024 15:54:39 +0300
Subject: [PATCH 875/909] Fix some log topics for Suave and Polygon Edge

---
 .dialyzer-ignore                                    |  4 ++--
 .../views/api/v2/transaction_view.ex                | 13 ++++++++++++-
 .../indexer/fetcher/polygon_edge/deposit_execute.ex |  7 ++++++-
 3 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/.dialyzer-ignore b/.dialyzer-ignore
index ba3b24756c02..15662b23302e 100644
--- a/.dialyzer-ignore
+++ b/.dialyzer-ignore
@@ -14,8 +14,8 @@ lib/phoenix/router.ex:324
 lib/phoenix/router.ex:402
 lib/explorer/smart_contract/reader.ex:435
 lib/indexer/fetcher/polygon_edge.ex:737
-lib/indexer/fetcher/polygon_edge/deposit_execute.ex:146
-lib/indexer/fetcher/polygon_edge/deposit_execute.ex:190
+lib/indexer/fetcher/polygon_edge/deposit_execute.ex:151
+lib/indexer/fetcher/polygon_edge/deposit_execute.ex:195
 lib/indexer/fetcher/polygon_edge/withdrawal.ex:166
 lib/indexer/fetcher/polygon_edge/withdrawal.ex:210
 lib/indexer/fetcher/zkevm/transaction_batch.ex:116
diff --git a/apps/block_scout_web/lib/block_scout_web/views/api/v2/transaction_view.ex b/apps/block_scout_web/lib/block_scout_web/views/api/v2/transaction_view.ex
index 44832a51274b..a3ac1335ea45 100644
--- a/apps/block_scout_web/lib/block_scout_web/views/api/v2/transaction_view.ex
+++ b/apps/block_scout_web/lib/block_scout_web/views/api/v2/transaction_view.ex
@@ -561,7 +561,18 @@ defmodule BlockScoutWeb.API.V2.TransactionView do
   end
 
   defp sanitize_log_first_topic(first_topic) do
-    if is_nil(first_topic), do: "", else: String.downcase(first_topic)
+    if is_nil(first_topic) do
+      ""
+    else
+      sanitized =
+        if is_binary(first_topic) do
+          first_topic
+        else
+          Hash.to_string(first_topic)
+        end
+
+      String.downcase(sanitized)
+    end
   end
 
   def token_transfers(_, _conn, false), do: nil
diff --git a/apps/indexer/lib/indexer/fetcher/polygon_edge/deposit_execute.ex b/apps/indexer/lib/indexer/fetcher/polygon_edge/deposit_execute.ex
index ef1ad37e4a4c..950cb026ffb4 100644
--- a/apps/indexer/lib/indexer/fetcher/polygon_edge/deposit_execute.ex
+++ b/apps/indexer/lib/indexer/fetcher/polygon_edge/deposit_execute.ex
@@ -134,11 +134,16 @@ defmodule Indexer.Fetcher.PolygonEdge.DepositExecute do
       |> log_topic_to_string()
       |> quantity_to_integer()
 
+    status =
+      third_topic
+      |> log_topic_to_string()
+      |> quantity_to_integer()
+
     %{
       msg_id: msg_id,
       l2_transaction_hash: l2_transaction_hash,
       l2_block_number: quantity_to_integer(l2_block_number),
-      success: quantity_to_integer(third_topic) != 0
+      success: status != 0
     }
   end
 

From 21934db1fc424741b5db2b00ffdcbbe5fd63cc7c Mon Sep 17 00:00:00 2001
From: POA <33550681+poa@users.noreply.github.com>
Date: Fri, 5 Jan 2024 15:59:04 +0300
Subject: [PATCH 876/909] Update changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index cf23936d0a38..71241a944879 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -25,6 +25,7 @@
 ### Fixes
 
 - [#9113](https://github.com/blockscout/blockscout/pull/9113) - Fix migrators cache updating
+- [#9102](https://github.com/blockscout/blockscout/pull/9102) - Fix some log topics for Suave and Polygon Edge
 - [#9101](https://github.com/blockscout/blockscout/pull/9101) - Fix migration_finished? logic
 - [#9062](https://github.com/blockscout/blockscout/pull/9062) - Fix blockscout-ens integration
 - [#9061](https://github.com/blockscout/blockscout/pull/9061) - Arbitrum allow tx receipt gasUsedForL1 field

From 01bd827a20b770235e49788909be25c30671bfa6 Mon Sep 17 00:00:00 2001
From: POA <33550681+poa@users.noreply.github.com>
Date: Tue, 9 Jan 2024 12:04:01 +0300
Subject: [PATCH 877/909] Add interpolation operator to some queries

---
 .../indexer/lib/indexer/fetcher/polygon_edge/deposit_execute.ex | 2 +-
 apps/indexer/lib/indexer/fetcher/polygon_edge/withdrawal.ex     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/indexer/lib/indexer/fetcher/polygon_edge/deposit_execute.ex b/apps/indexer/lib/indexer/fetcher/polygon_edge/deposit_execute.ex
index 950cb026ffb4..0807c1bc8dfd 100644
--- a/apps/indexer/lib/indexer/fetcher/polygon_edge/deposit_execute.ex
+++ b/apps/indexer/lib/indexer/fetcher/polygon_edge/deposit_execute.ex
@@ -161,7 +161,7 @@ defmodule Indexer.Fetcher.PolygonEdge.DepositExecute do
           from(log in Log,
             select: {log.second_topic, log.third_topic, log.transaction_hash, log.block_number},
             where:
-              log.first_topic == @state_sync_result_event and log.address_hash == ^state_receiver and
+              log.first_topic == ^@state_sync_result_event and log.address_hash == ^state_receiver and
                 log.block_number >= ^block_start and log.block_number <= ^block_end
           )
 
diff --git a/apps/indexer/lib/indexer/fetcher/polygon_edge/withdrawal.ex b/apps/indexer/lib/indexer/fetcher/polygon_edge/withdrawal.ex
index 098545140ac0..8520cce2c155 100644
--- a/apps/indexer/lib/indexer/fetcher/polygon_edge/withdrawal.ex
+++ b/apps/indexer/lib/indexer/fetcher/polygon_edge/withdrawal.ex
@@ -176,7 +176,7 @@ defmodule Indexer.Fetcher.PolygonEdge.Withdrawal do
           from(log in Log,
             select: {log.second_topic, log.data, log.transaction_hash, log.block_number},
             where:
-              log.first_topic == @l2_state_synced_event and log.address_hash == ^state_sender and
+              log.first_topic == ^@l2_state_synced_event and log.address_hash == ^state_sender and
                 log.block_number >= ^block_start and log.block_number <= ^block_end
           )
 

From e9a9dfd28e1a4adbc44fa47b655cec4e86934426 Mon Sep 17 00:00:00 2001
From: POA <33550681+poa@users.noreply.github.com>
Date: Wed, 10 Jan 2024 08:26:28 +0300
Subject: [PATCH 878/909] Update changelog

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 71241a944879..ec01d7fa4972 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,7 @@
 
 ### Fixes
 
+- [#9102](https://github.com/blockscout/blockscout/pull/9102) - Fix some log topics for Suave and Polygon Edge
 - [#9075](https://github.com/blockscout/blockscout/pull/9075) - Fix fetching contract codes
 
 ### Chore
@@ -25,7 +26,6 @@
 ### Fixes
 
 - [#9113](https://github.com/blockscout/blockscout/pull/9113) - Fix migrators cache updating
-- [#9102](https://github.com/blockscout/blockscout/pull/9102) - Fix some log topics for Suave and Polygon Edge
 - [#9101](https://github.com/blockscout/blockscout/pull/9101) - Fix migration_finished? logic
 - [#9062](https://github.com/blockscout/blockscout/pull/9062) - Fix blockscout-ens integration
 - [#9061](https://github.com/blockscout/blockscout/pull/9061) - Arbitrum allow tx receipt gasUsedForL1 field

From 05242dbb66ba7829dfb841b4f306b612dfd66593 Mon Sep 17 00:00:00 2001
From: Viktor Baranov <baranov.viktor.27@gmail.com>
Date: Fri, 29 Dec 2023 16:21:19 +0300
Subject: [PATCH 879/909] Allow payable function with output appear in the Read
 tab

---
 CHANGELOG.md                                  |  1 +
 .../lib/explorer/smart_contract/helper.ex     |  2 +-
 .../explorer/smart_contract/helper_test.exs   | 26 +++++++++++++++++++
 cspell.json                                   |  1 +
 4 files changed, 29 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index cf23936d0a38..73ee77784bd1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,7 @@
 ### Fixes
 
 - [#9075](https://github.com/blockscout/blockscout/pull/9075) - Fix fetching contract codes
+- [#9073](https://github.com/blockscout/blockscout/pull/9073) - Allow payable function with output appear in the Read tab
 
 ### Chore
 
diff --git a/apps/explorer/lib/explorer/smart_contract/helper.ex b/apps/explorer/lib/explorer/smart_contract/helper.ex
index 544cb7c19e77..40ffcaa69866 100644
--- a/apps/explorer/lib/explorer/smart_contract/helper.ex
+++ b/apps/explorer/lib/explorer/smart_contract/helper.ex
@@ -23,7 +23,7 @@ defmodule Explorer.SmartContract.Helper do
   @spec read_with_wallet_method?(%{}) :: true | false
   def read_with_wallet_method?(function),
     do:
-      !error?(function) && !event?(function) && !constructor?(function) && nonpayable?(function) &&
+      !error?(function) && !event?(function) && !constructor?(function) &&
         !empty_outputs?(function)
 
   def empty_outputs?(function), do: is_nil(function["outputs"]) || function["outputs"] == []
diff --git a/apps/explorer/test/explorer/smart_contract/helper_test.exs b/apps/explorer/test/explorer/smart_contract/helper_test.exs
index 4cd3832434c9..202c0b7edc1f 100644
--- a/apps/explorer/test/explorer/smart_contract/helper_test.exs
+++ b/apps/explorer/test/explorer/smart_contract/helper_test.exs
@@ -124,4 +124,30 @@ defmodule Explorer.SmartContract.HelperTest do
       refute Helper.nonpayable?(function)
     end
   end
+
+  describe "read_with_wallet_method?" do
+    test "returns payable method with output in the read tab" do
+      function = %{
+        "type" => "function",
+        "stateMutability" => "payable",
+        "outputs" => [%{"type" => "address", "name" => "", "internalType" => "address"}],
+        "name" => "returnaddress",
+        "inputs" => []
+      }
+
+      assert Helper.read_with_wallet_method?(function)
+    end
+
+    test "doesn't return payable method with no output in the read tab" do
+      function = %{
+        "type" => "function",
+        "stateMutability" => "payable",
+        "outputs" => [],
+        "name" => "returnaddress",
+        "inputs" => []
+      }
+
+      refute Helper.read_with_wallet_method?(function)
+    end
+  end
 end
diff --git a/cspell.json b/cspell.json
index d19d333d4403..ddad179c8d1b 100644
--- a/cspell.json
+++ b/cspell.json
@@ -389,6 +389,7 @@
         "rerequest",
         "reshows",
         "retryable",
+        "returnaddress",
         "reuseaddr",
         "RPC's",
         "RPCs",

From 8a311514605277d235b4afee2a76867aadcae4e6 Mon Sep 17 00:00:00 2001
From: Maxim Filonov <53992153+sl1depengwyn@users.noreply.github.com>
Date: Fri, 5 Jan 2024 18:31:19 +0300
Subject: [PATCH 880/909] Return current exchange rate in api/v2/stats

---
 CHANGELOG.md                                  |  1 +
 .../controllers/api/v2/stats_controller.ex    |  2 +-
 .../explorer/exchange_rates/exchange_rates.ex | 22 ++++++++++++++++++-
 .../lib/explorer/market/market_history.ex     |  2 +-
 .../exchange_rates/exchange_rates_test.exs    |  8 ++++++-
 5 files changed, 31 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 50cade811d01..8672e81278ff 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,7 @@
 
 ### Fixes
 
+- [#9109](https://github.com/blockscout/blockscout/pull/9109) - Return current exchange rate in api/v2/stats
 - [#9102](https://github.com/blockscout/blockscout/pull/9102) - Fix some log topics for Suave and Polygon Edge
 - [#9075](https://github.com/blockscout/blockscout/pull/9075) - Fix fetching contract codes
 - [#9073](https://github.com/blockscout/blockscout/pull/9073) - Allow payable function with output appear in the Read tab
diff --git a/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/stats_controller.ex b/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/stats_controller.ex
index 34ea7b3eae34..7e78533fba9a 100644
--- a/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/stats_controller.ex
+++ b/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/stats_controller.ex
@@ -27,7 +27,7 @@ defmodule BlockScoutWeb.API.V2.StatsController do
           :standard
       end
 
-    exchange_rate_from_db = Market.get_native_coin_exchange_rate_from_db()
+    exchange_rate_from_db = Market.get_coin_exchange_rate()
 
     transaction_stats = Helper.get_transaction_stats()
 
diff --git a/apps/explorer/lib/explorer/exchange_rates/exchange_rates.ex b/apps/explorer/lib/explorer/exchange_rates/exchange_rates.ex
index 7ffe82536881..b3497d8b4c75 100644
--- a/apps/explorer/lib/explorer/exchange_rates/exchange_rates.ex
+++ b/apps/explorer/lib/explorer/exchange_rates/exchange_rates.ex
@@ -10,6 +10,7 @@ defmodule Explorer.ExchangeRates do
   require Logger
 
   alias Explorer.Chain.Events.Publisher
+  alias Explorer.Market
   alias Explorer.ExchangeRates.{Source, Token}
 
   @interval Application.compile_env(:explorer, __MODULE__)[:cache_period]
@@ -123,10 +124,29 @@ defmodule Explorer.ExchangeRates do
   @spec fetch_rates :: Task.t()
   defp fetch_rates do
     Task.Supervisor.async_nolink(Explorer.MarketTaskSupervisor, fn ->
-      Source.fetch_exchange_rates()
+      case Source.fetch_exchange_rates() do
+        {:ok, tokens} -> {:ok, add_coin_info_from_db(tokens)}
+        err -> err
+      end
     end)
   end
 
+  defp add_coin_info_from_db(tokens) do
+    case Market.fetch_recent_history() do
+      [today | _the_rest] ->
+        tvl_from_history = Map.get(today, :tvl)
+
+        tokens
+        |> Enum.map(fn
+          %Token{tvl_usd: nil} = token -> %{token | tvl_usd: tvl_from_history}
+          token -> token
+        end)
+
+      _ ->
+        tokens
+    end
+  end
+
   defp list_from_store(:ets) do
     table_name()
     |> :ets.tab2list()
diff --git a/apps/explorer/lib/explorer/market/market_history.ex b/apps/explorer/lib/explorer/market/market_history.ex
index 8c1411879ee3..ea27a083aa48 100644
--- a/apps/explorer/lib/explorer/market/market_history.ex
+++ b/apps/explorer/lib/explorer/market/market_history.ex
@@ -20,7 +20,7 @@ defmodule Explorer.Market.MarketHistory do
    * `:date` - The date in UTC.
    * `:opening_price` - Opening price in USD.
    * `:market_cap` - Market cap in USD.
-   * `:market_cap` - TVL in USD.
+   * `:tvl` - TVL in USD.
   """
   @type t :: %__MODULE__{
           closing_price: Decimal.t() | nil,
diff --git a/apps/explorer/test/explorer/exchange_rates/exchange_rates_test.exs b/apps/explorer/test/explorer/exchange_rates/exchange_rates_test.exs
index 953a5b5a1640..25faf397b422 100644
--- a/apps/explorer/test/explorer/exchange_rates/exchange_rates_test.exs
+++ b/apps/explorer/test/explorer/exchange_rates/exchange_rates_test.exs
@@ -1,5 +1,5 @@
 defmodule Explorer.ExchangeRatesTest do
-  use ExUnit.Case, async: false
+  use Explorer.DataCase
 
   import Mox
 
@@ -7,12 +7,16 @@ defmodule Explorer.ExchangeRatesTest do
   alias Explorer.ExchangeRates
   alias Explorer.ExchangeRates.Token
   alias Explorer.ExchangeRates.Source.TestSource
+  alias Explorer.Market.MarketHistoryCache
 
   @moduletag :capture_log
 
   setup :verify_on_exit!
 
   setup do
+    Supervisor.terminate_child(Explorer.Supervisor, {ConCache, MarketHistoryCache.cache_name()})
+    Supervisor.restart_child(Explorer.Supervisor, {ConCache, MarketHistoryCache.cache_name()})
+
     # Use TestSource mock and ets table for this test set
     source_configuration = Application.get_env(:explorer, Explorer.ExchangeRates.Source)
     rates_configuration = Application.get_env(:explorer, Explorer.ExchangeRates)
@@ -24,6 +28,8 @@ defmodule Explorer.ExchangeRatesTest do
     on_exit(fn ->
       Application.put_env(:explorer, Explorer.ExchangeRates.Source, source_configuration)
       Application.put_env(:explorer, Explorer.ExchangeRates, rates_configuration)
+      Supervisor.terminate_child(Explorer.Supervisor, Explorer.Chain.Cache.Blocks.child_id())
+      Supervisor.restart_child(Explorer.Supervisor, Explorer.Chain.Cache.Blocks.child_id())
     end)
   end
 

From 4c2c9e32bed801a98a53bc4bfa0851ad761515cf Mon Sep 17 00:00:00 2001
From: Qwerty5Uiop <alex000010@bk.ru>
Date: Tue, 26 Dec 2023 16:43:26 +0600
Subject: [PATCH 881/909] Add tracing by block logic for geth

---
 CHANGELOG.md                                  |   2 +
 .../lib/ethereum_jsonrpc/geth.ex              | 110 +++++++++---
 .../test/ethereum_jsonrpc/geth_test.exs       | 168 +++++++++++++++++-
 .../indexer/fetcher/internal_transaction.ex   |  41 +++--
 config/runtime.exs                            |   1 +
 docker-compose/envs/common-blockscout.env     |   1 +
 6 files changed, 286 insertions(+), 37 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8672e81278ff..78b3e4a19cfd 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,8 @@
 
 ### Features
 
+- [#9072](https://github.com/blockscout/blockscout/pull/9072) - Add tracing by block logic for geth
+
 ### Fixes
 
 - [#9109](https://github.com/blockscout/blockscout/pull/9109) - Return current exchange rate in api/v2/stats
diff --git a/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/geth.ex b/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/geth.ex
index d38fb0716a72..96379d75bb5c 100644
--- a/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/geth.ex
+++ b/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/geth.ex
@@ -63,12 +63,65 @@ defmodule EthereumJSONRPC.Geth do
   def fetch_first_trace(_transactions_params, _json_rpc_named_arguments), do: :ignore
 
   @doc """
-  Internal transaction fetching for entire blocks is not currently supported for Geth.
-
-  To signal to the caller that fetching is not supported, `:ignore` is returned.
+  Fetches the `t:Explorer.Chain.InternalTransaction.changeset/2` params from the Geth trace URL.
   """
   @impl EthereumJSONRPC.Variant
-  def fetch_block_internal_transactions(_block_range, _json_rpc_named_arguments), do: :ignore
+  def fetch_block_internal_transactions(block_numbers, json_rpc_named_arguments) do
+    id_to_params = id_to_params(block_numbers)
+
+    with {:ok, blocks_responses} <-
+           id_to_params
+           |> debug_trace_block_by_number_requests()
+           |> json_rpc(json_rpc_named_arguments),
+         :ok <- check_errors_exist(blocks_responses, id_to_params) do
+      transactions_params = to_transactions_params(blocks_responses, id_to_params)
+
+      {transactions_id_to_params, transactions_responses} =
+        Enum.reduce(transactions_params, {%{}, []}, fn {params, calls}, {id_to_params_acc, calls_acc} ->
+          {Map.put(id_to_params_acc, params[:id], params), [calls | calls_acc]}
+        end)
+
+      debug_trace_transaction_responses_to_internal_transactions_params(
+        transactions_responses,
+        transactions_id_to_params,
+        json_rpc_named_arguments
+      )
+    end
+  end
+
+  defp check_errors_exist(blocks_responses, id_to_params) do
+    blocks_responses
+    |> EthereumJSONRPC.sanitize_responses(id_to_params)
+    |> Enum.reduce([], fn
+      %{result: _result}, acc -> acc
+      %{error: error}, acc -> [error | acc]
+    end)
+    |> case do
+      [] -> :ok
+      errors -> {:error, errors}
+    end
+  end
+
+  defp to_transactions_params(blocks_responses, id_to_params) do
+    Enum.reduce(blocks_responses, [], fn %{id: id, result: tx_result}, blocks_acc ->
+      extract_transactions_params(Map.fetch!(id_to_params, id), tx_result) ++ blocks_acc
+    end)
+  end
+
+  defp extract_transactions_params(block_number, tx_result) do
+    tx_result
+    |> Enum.reduce({[], 0}, fn %{"txHash" => tx_hash, "result" => calls_result}, {tx_acc, counter} ->
+      {
+        [
+          {%{block_number: block_number, hash_data: tx_hash, transaction_index: counter, id: counter},
+           %{id: counter, result: calls_result}}
+          | tx_acc
+        ],
+        counter + 1
+      }
+    end)
+    |> elem(0)
+  end
 
   @doc """
   Fetches the pending transactions from the Geth node.
@@ -84,6 +137,10 @@ defmodule EthereumJSONRPC.Geth do
     end)
   end
 
+  defp debug_trace_block_by_number_requests(id_to_params) do
+    Enum.map(id_to_params, &debug_trace_block_by_number_request/1)
+  end
+
   @tracer_path "priv/js/ethereum_jsonrpc/geth/debug_traceTransaction/tracer.js"
   @external_resource @tracer_path
   @tracer File.read!(@tracer_path)
@@ -92,30 +149,39 @@ defmodule EthereumJSONRPC.Geth do
     debug_trace_transaction_timeout =
       Application.get_env(:ethereum_jsonrpc, __MODULE__)[:debug_trace_transaction_timeout]
 
-    tracer =
-      cond do
-        tracer_type() == "js" ->
-          %{"tracer" => @tracer}
-
-        tracer_type() in ~w(opcode polygon_edge) ->
-          %{
-            "enableMemory" => true,
-            "disableStack" => false,
-            "disableStorage" => true,
-            "enableReturnData" => false
-          }
-
-        true ->
-          %{"tracer" => "callTracer"}
-      end
-
     request(%{
       id: id,
       method: "debug_traceTransaction",
-      params: [hash_data, %{timeout: debug_trace_transaction_timeout} |> Map.merge(tracer)]
+      params: [hash_data, %{timeout: debug_trace_transaction_timeout} |> Map.merge(tracer_params())]
+    })
+  end
+
+  defp debug_trace_block_by_number_request({id, block_number}) do
+    request(%{
+      id: id,
+      method: "debug_traceBlockByNumber",
+      params: [integer_to_quantity(block_number), tracer_params()]
     })
   end
 
+  defp tracer_params do
+    cond do
+      tracer_type() == "js" ->
+        %{"tracer" => @tracer}
+
+      tracer_type() in ~w(opcode polygon_edge) ->
+        %{
+          "enableMemory" => true,
+          "disableStack" => false,
+          "disableStorage" => true,
+          "enableReturnData" => false
+        }
+
+      true ->
+        %{"tracer" => "callTracer"}
+    end
+  end
+
   defp debug_trace_transaction_responses_to_internal_transactions_params(
          [%{result: %{"structLogs" => _}} | _] = responses,
          id_to_params,
diff --git a/apps/ethereum_jsonrpc/test/ethereum_jsonrpc/geth_test.exs b/apps/ethereum_jsonrpc/test/ethereum_jsonrpc/geth_test.exs
index a379ac57a816..cc22f8baf483 100644
--- a/apps/ethereum_jsonrpc/test/ethereum_jsonrpc/geth_test.exs
+++ b/apps/ethereum_jsonrpc/test/ethereum_jsonrpc/geth_test.exs
@@ -555,8 +555,172 @@ defmodule EthereumJSONRPC.GethTest do
   end
 
   describe "fetch_block_internal_transactions/1" do
-    test "is not supported", %{json_rpc_named_arguments: json_rpc_named_arguments} do
-      EthereumJSONRPC.Geth.fetch_block_internal_transactions([], json_rpc_named_arguments)
+    setup do
+      EthereumJSONRPC.Case.Geth.Mox.setup()
+    end
+
+    test "is supported", %{json_rpc_named_arguments: json_rpc_named_arguments} do
+      block_number = 3_287_375
+      block_quantity = EthereumJSONRPC.integer_to_quantity(block_number)
+      transaction_hash = "0x32b17f27ddb546eab3c4c33f31eb22c1cb992d4ccc50dae26922805b717efe5c"
+
+      expect(EthereumJSONRPC.Mox, :json_rpc, fn [%{id: id, params: [^block_quantity, %{"tracer" => "callTracer"}]}],
+                                                _ ->
+        {:ok,
+         [
+           %{
+             id: id,
+             result: [
+               %{
+                 "result" => %{
+                   "calls" => [
+                     %{
+                       "from" => "0x4200000000000000000000000000000000000015",
+                       "gas" => "0xe9a3c",
+                       "gasUsed" => "0x4a28",
+                       "input" =>
+                         "0x015d8eb900000000000000000000000000000000000000000000000000000000009cb0d80000000000000000000000000000000000000000000000000000000065898738000000000000000000000000000000000000000000000000000000000000001b65f7961a6893850c1f001edeaa0aa4f1fb36b67eee61a8623f8f4da81be25c0000000000000000000000000000000000000000000000000000000000000000050000000000000000000000007431310e026b69bfc676c0013e12a1a11411eec9000000000000000000000000000000000000000000000000000000000000083400000000000000000000000000000000000000000000000000000000000f4240",
+                       "to" => "0x6df83a19647a398d48e77a6835f4a28eb7e2f7c0",
+                       "type" => "DELEGATECALL",
+                       "value" => "0x0"
+                     }
+                   ],
+                   "from" => "0xdeaddeaddeaddeaddeaddeaddeaddeaddead0001",
+                   "gas" => "0xf4240",
+                   "gasUsed" => "0xb6f9",
+                   "input" =>
+                     "0x015d8eb900000000000000000000000000000000000000000000000000000000009cb0d80000000000000000000000000000000000000000000000000000000065898738000000000000000000000000000000000000000000000000000000000000001b65f7961a6893850c1f001edeaa0aa4f1fb36b67eee61a8623f8f4da81be25c0000000000000000000000000000000000000000000000000000000000000000050000000000000000000000007431310e026b69bfc676c0013e12a1a11411eec9000000000000000000000000000000000000000000000000000000000000083400000000000000000000000000000000000000000000000000000000000f4240",
+                   "to" => "0x4200000000000000000000000000000000000015",
+                   "type" => "CALL",
+                   "value" => "0x0"
+                 },
+                 "txHash" => transaction_hash
+               }
+             ]
+           }
+         ]}
+      end)
+
+      Application.put_env(:ethereum_jsonrpc, Geth, tracer: "call_tracer", debug_trace_transaction_timeout: "5s")
+
+      assert {:ok,
+              [
+                %{
+                  block_number: 3_287_375,
+                  call_type: "call",
+                  from_address_hash: "0xdeaddeaddeaddeaddeaddeaddeaddeaddead0001",
+                  gas: 1_000_000,
+                  gas_used: 46841,
+                  index: 0,
+                  input:
+                    "0x015d8eb900000000000000000000000000000000000000000000000000000000009cb0d80000000000000000000000000000000000000000000000000000000065898738000000000000000000000000000000000000000000000000000000000000001b65f7961a6893850c1f001edeaa0aa4f1fb36b67eee61a8623f8f4da81be25c0000000000000000000000000000000000000000000000000000000000000000050000000000000000000000007431310e026b69bfc676c0013e12a1a11411eec9000000000000000000000000000000000000000000000000000000000000083400000000000000000000000000000000000000000000000000000000000f4240",
+                  output: "0x",
+                  to_address_hash: "0x4200000000000000000000000000000000000015",
+                  trace_address: [],
+                  transaction_hash: ^transaction_hash,
+                  transaction_index: 0,
+                  type: "call",
+                  value: 0
+                },
+                %{
+                  block_number: 3_287_375,
+                  call_type: "delegatecall",
+                  from_address_hash: "0x4200000000000000000000000000000000000015",
+                  gas: 956_988,
+                  gas_used: 18984,
+                  index: 1,
+                  input:
+                    "0x015d8eb900000000000000000000000000000000000000000000000000000000009cb0d80000000000000000000000000000000000000000000000000000000065898738000000000000000000000000000000000000000000000000000000000000001b65f7961a6893850c1f001edeaa0aa4f1fb36b67eee61a8623f8f4da81be25c0000000000000000000000000000000000000000000000000000000000000000050000000000000000000000007431310e026b69bfc676c0013e12a1a11411eec9000000000000000000000000000000000000000000000000000000000000083400000000000000000000000000000000000000000000000000000000000f4240",
+                  output: "0x",
+                  to_address_hash: "0x6df83a19647a398d48e77a6835f4a28eb7e2f7c0",
+                  trace_address: [0],
+                  transaction_hash: ^transaction_hash,
+                  transaction_index: 0,
+                  type: "call",
+                  value: 0
+                }
+              ]} = Geth.fetch_block_internal_transactions([block_number], json_rpc_named_arguments)
+    end
+
+    test "result is the same as fetch_internal_transactions/2", %{json_rpc_named_arguments: json_rpc_named_arguments} do
+      block_number = 3_287_375
+      block_quantity = EthereumJSONRPC.integer_to_quantity(block_number)
+      transaction_hash = "0x32b17f27ddb546eab3c4c33f31eb22c1cb992d4ccc50dae26922805b717efe5c"
+
+      expect(EthereumJSONRPC.Mox, :json_rpc, 2, fn
+        [%{id: id, params: [^block_quantity, %{"tracer" => "callTracer"}]}], _ ->
+          {:ok,
+           [
+             %{
+               id: id,
+               result: [
+                 %{
+                   "result" => %{
+                     "calls" => [
+                       %{
+                         "from" => "0x4200000000000000000000000000000000000015",
+                         "gas" => "0xe9a3c",
+                         "gasUsed" => "0x4a28",
+                         "input" =>
+                           "0x015d8eb900000000000000000000000000000000000000000000000000000000009cb0d80000000000000000000000000000000000000000000000000000000065898738000000000000000000000000000000000000000000000000000000000000001b65f7961a6893850c1f001edeaa0aa4f1fb36b67eee61a8623f8f4da81be25c0000000000000000000000000000000000000000000000000000000000000000050000000000000000000000007431310e026b69bfc676c0013e12a1a11411eec9000000000000000000000000000000000000000000000000000000000000083400000000000000000000000000000000000000000000000000000000000f4240",
+                         "to" => "0x6df83a19647a398d48e77a6835f4a28eb7e2f7c0",
+                         "type" => "DELEGATECALL",
+                         "value" => "0x0"
+                       }
+                     ],
+                     "from" => "0xdeaddeaddeaddeaddeaddeaddeaddeaddead0001",
+                     "gas" => "0xf4240",
+                     "gasUsed" => "0xb6f9",
+                     "input" =>
+                       "0x015d8eb900000000000000000000000000000000000000000000000000000000009cb0d80000000000000000000000000000000000000000000000000000000065898738000000000000000000000000000000000000000000000000000000000000001b65f7961a6893850c1f001edeaa0aa4f1fb36b67eee61a8623f8f4da81be25c0000000000000000000000000000000000000000000000000000000000000000050000000000000000000000007431310e026b69bfc676c0013e12a1a11411eec9000000000000000000000000000000000000000000000000000000000000083400000000000000000000000000000000000000000000000000000000000f4240",
+                     "to" => "0x4200000000000000000000000000000000000015",
+                     "type" => "CALL",
+                     "value" => "0x0"
+                   },
+                   "txHash" => transaction_hash
+                 }
+               ]
+             }
+           ]}
+
+        [%{id: id, params: [^transaction_hash, %{"tracer" => "callTracer"}]}], _ ->
+          {:ok,
+           [
+             %{
+               id: id,
+               result: %{
+                 "calls" => [
+                   %{
+                     "from" => "0x4200000000000000000000000000000000000015",
+                     "gas" => "0xe9a3c",
+                     "gasUsed" => "0x4a28",
+                     "input" =>
+                       "0x015d8eb900000000000000000000000000000000000000000000000000000000009cb0d80000000000000000000000000000000000000000000000000000000065898738000000000000000000000000000000000000000000000000000000000000001b65f7961a6893850c1f001edeaa0aa4f1fb36b67eee61a8623f8f4da81be25c0000000000000000000000000000000000000000000000000000000000000000050000000000000000000000007431310e026b69bfc676c0013e12a1a11411eec9000000000000000000000000000000000000000000000000000000000000083400000000000000000000000000000000000000000000000000000000000f4240",
+                     "to" => "0x6df83a19647a398d48e77a6835f4a28eb7e2f7c0",
+                     "type" => "DELEGATECALL",
+                     "value" => "0x0"
+                   }
+                 ],
+                 "from" => "0xdeaddeaddeaddeaddeaddeaddeaddeaddead0001",
+                 "gas" => "0xf4240",
+                 "gasUsed" => "0xb6f9",
+                 "input" =>
+                   "0x015d8eb900000000000000000000000000000000000000000000000000000000009cb0d80000000000000000000000000000000000000000000000000000000065898738000000000000000000000000000000000000000000000000000000000000001b65f7961a6893850c1f001edeaa0aa4f1fb36b67eee61a8623f8f4da81be25c0000000000000000000000000000000000000000000000000000000000000000050000000000000000000000007431310e026b69bfc676c0013e12a1a11411eec9000000000000000000000000000000000000000000000000000000000000083400000000000000000000000000000000000000000000000000000000000f4240",
+                 "to" => "0x4200000000000000000000000000000000000015",
+                 "type" => "CALL",
+                 "value" => "0x0"
+               }
+             }
+           ]}
+      end)
+
+      Application.put_env(:ethereum_jsonrpc, Geth, tracer: "call_tracer", debug_trace_transaction_timeout: "5s")
+
+      assert Geth.fetch_block_internal_transactions([block_number], json_rpc_named_arguments) ==
+               Geth.fetch_internal_transactions(
+                 [%{block_number: block_number, transaction_index: 0, hash_data: transaction_hash}],
+                 json_rpc_named_arguments
+               )
     end
   end
 
diff --git a/apps/indexer/lib/indexer/fetcher/internal_transaction.ex b/apps/indexer/lib/indexer/fetcher/internal_transaction.ex
index 1861018b3324..d5d1af69436a 100644
--- a/apps/indexer/lib/indexer/fetcher/internal_transaction.ex
+++ b/apps/indexer/lib/indexer/fetcher/internal_transaction.ex
@@ -111,19 +111,7 @@ defmodule Indexer.Fetcher.InternalTransaction do
 
     json_rpc_named_arguments
     |> Keyword.fetch!(:variant)
-    |> case do
-      variant
-      when variant in [EthereumJSONRPC.Nethermind, EthereumJSONRPC.Erigon, EthereumJSONRPC.Besu, EthereumJSONRPC.RSK] ->
-        EthereumJSONRPC.fetch_block_internal_transactions(filtered_unique_numbers, json_rpc_named_arguments)
-
-      _ ->
-        try do
-          fetch_block_internal_transactions_by_transactions(filtered_unique_numbers, json_rpc_named_arguments)
-        rescue
-          error ->
-            {:error, error, __STACKTRACE__}
-        end
-    end
+    |> fetch_internal_transactions(filtered_unique_numbers, json_rpc_named_arguments)
     |> case do
       {:ok, internal_transactions_params} ->
         safe_import_internal_transaction(internal_transactions_params, filtered_unique_numbers)
@@ -159,6 +147,33 @@ defmodule Indexer.Fetcher.InternalTransaction do
     end
   end
 
+  defp fetch_internal_transactions(variant, block_numbers, json_rpc_named_arguments) do
+    if variant in block_traceable_variants() do
+      EthereumJSONRPC.fetch_block_internal_transactions(block_numbers, json_rpc_named_arguments)
+    else
+      try do
+        fetch_block_internal_transactions_by_transactions(block_numbers, json_rpc_named_arguments)
+      rescue
+        error ->
+          {:error, error, __STACKTRACE__}
+      end
+    end
+  end
+
+  @default_block_traceable_variants [
+    EthereumJSONRPC.Nethermind,
+    EthereumJSONRPC.Erigon,
+    EthereumJSONRPC.Besu,
+    EthereumJSONRPC.RSK
+  ]
+  defp block_traceable_variants do
+    if Application.get_env(:ethereum_jsonrpc, EthereumJSONRPC.Geth)[:block_traceable?] do
+      [EthereumJSONRPC.Geth | @default_block_traceable_variants]
+    else
+      @default_block_traceable_variants
+    end
+  end
+
   defp drop_genesis(block_numbers, json_rpc_named_arguments) do
     first_block = Application.get_env(:indexer, :trace_first_block)
 
diff --git a/config/runtime.exs b/config/runtime.exs
index e8f4de449691..2cd105ac72e2 100644
--- a/config/runtime.exs
+++ b/config/runtime.exs
@@ -162,6 +162,7 @@ config :ethereum_jsonrpc, EthereumJSONRPC.HTTP,
     |> Map.to_list()
 
 config :ethereum_jsonrpc, EthereumJSONRPC.Geth,
+  block_traceable?: ConfigHelper.parse_bool_env_var("ETHEREUM_JSONRPC_GETH_TRACE_BY_BLOCK"),
   debug_trace_transaction_timeout: System.get_env("ETHEREUM_JSONRPC_DEBUG_TRACE_TRANSACTION_TIMEOUT", "5s"),
   tracer:
     if(ConfigHelper.chain_type() == "polygon_edge",
diff --git a/docker-compose/envs/common-blockscout.env b/docker-compose/envs/common-blockscout.env
index f1743f72265e..511cd2ebfcec 100644
--- a/docker-compose/envs/common-blockscout.env
+++ b/docker-compose/envs/common-blockscout.env
@@ -18,6 +18,7 @@ ETHEREUM_JSONRPC_DISABLE_ARCHIVE_BALANCES=false
 #ETHEREUM_JSONRPC_ARCHIVE_BALANCES_WINDOW=200
 # ETHEREUM_JSONRPC_HTTP_HEADERS=
 # ETHEREUM_JSONRPC_WAIT_PER_TIMEOUT=
+# ETHEREUM_JSONRPC_GETH_TRACE_BY_BLOCK=
 IPC_PATH=
 NETWORK_PATH=/
 BLOCKSCOUT_HOST=

From d8cc916821415caed2614471ce5a062773356d2b Mon Sep 17 00:00:00 2001
From: Maxim Filonov <53992153+sl1depengwyn@users.noreply.github.com>
Date: Tue, 9 Jan 2024 14:17:15 +0300
Subject: [PATCH 882/909] Fix Explorer.Chain.Cache.GasPriceOracle.merge_fees

---
 CHANGELOG.md                                               | 1 +
 apps/explorer/lib/explorer/chain/cache/gas_price_oracle.ex | 6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8672e81278ff..5591355e0b04 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,7 @@
 
 ### Fixes
 
+- [#9125](https://github.com/blockscout/blockscout/pull/9125) - Fix Explorer.Chain.Cache.GasPriceOracle.merge_fees
 - [#9109](https://github.com/blockscout/blockscout/pull/9109) - Return current exchange rate in api/v2/stats
 - [#9102](https://github.com/blockscout/blockscout/pull/9102) - Fix some log topics for Suave and Polygon Edge
 - [#9075](https://github.com/blockscout/blockscout/pull/9075) - Fix fetching contract codes
diff --git a/apps/explorer/lib/explorer/chain/cache/gas_price_oracle.ex b/apps/explorer/lib/explorer/chain/cache/gas_price_oracle.ex
index d6d85c2b42f2..a37eec21dd25 100644
--- a/apps/explorer/lib/explorer/chain/cache/gas_price_oracle.ex
+++ b/apps/explorer/lib/explorer/chain/cache/gas_price_oracle.ex
@@ -287,9 +287,9 @@ defmodule Explorer.Chain.Cache.GasPriceOracle do
     |> Enum.reduce(
       &Map.merge(&1, &2, fn
         _, nil, nil -> nil
-        _, val, acc when nil not in [val, acc] and is_list(acc) -> [val | acc]
-        _, val, acc when nil not in [val, acc] -> [val, acc]
-        _, val, acc -> [val || acc]
+        _, val, nil -> [val]
+        _, nil, acc -> if is_list(acc), do: acc, else: [acc]
+        _, val, acc -> if is_list(acc), do: [val | acc], else: [val, acc]
       end)
     )
     |> Map.new(fn

From 0784151ba6b79346ed3db7077b2bbcd78edffce3 Mon Sep 17 00:00:00 2001
From: Maxim Filonov <53992153+sl1depengwyn@users.noreply.github.com>
Date: Mon, 8 Jan 2024 00:48:41 +0300
Subject: [PATCH 883/909] Improve update_in in gas tracker

---
 CHANGELOG.md                                  |  1 +
 .../controllers/api/v2/stats_controller.ex    |  2 +-
 .../explorer/chain/cache/gas_price_oracle.ex  | 25 ++++++++++++++++---
 3 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5591355e0b04..caec35e1027c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,7 @@
 ### Fixes
 
 - [#9125](https://github.com/blockscout/blockscout/pull/9125) - Fix Explorer.Chain.Cache.GasPriceOracle.merge_fees
+- [#9110](https://github.com/blockscout/blockscout/pull/9110) - Improve update_in in gas tracker
 - [#9109](https://github.com/blockscout/blockscout/pull/9109) - Return current exchange rate in api/v2/stats
 - [#9102](https://github.com/blockscout/blockscout/pull/9102) - Fix some log topics for Suave and Polygon Edge
 - [#9075](https://github.com/blockscout/blockscout/pull/9075) - Fix fetching contract codes
diff --git a/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/stats_controller.ex b/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/stats_controller.ex
index 7e78533fba9a..451275586b28 100644
--- a/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/stats_controller.ex
+++ b/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/stats_controller.ex
@@ -70,7 +70,7 @@ defmodule BlockScoutWeb.API.V2.StatsController do
         "transactions_today" => Enum.at(transaction_stats, 0).number_of_transactions |> to_string(),
         "gas_used_today" => Enum.at(transaction_stats, 0).gas_used,
         "gas_prices" => gas_prices,
-        "gas_prices_update_in" => GasPriceOracle.global_ttl(),
+        "gas_prices_update_in" => GasPriceOracle.update_in(),
         "gas_price_updated_at" => GasPriceOracle.get_updated_at(),
         "static_gas_price" => gas_price,
         "market_cap" => Helper.market_cap(market_cap_type, exchange_rate_from_db),
diff --git a/apps/explorer/lib/explorer/chain/cache/gas_price_oracle.ex b/apps/explorer/lib/explorer/chain/cache/gas_price_oracle.ex
index a37eec21dd25..d09ce6d41cb0 100644
--- a/apps/explorer/lib/explorer/chain/cache/gas_price_oracle.ex
+++ b/apps/explorer/lib/explorer/chain/cache/gas_price_oracle.ex
@@ -29,11 +29,29 @@ defmodule Explorer.Chain.Cache.GasPriceOracle do
     key: :gas_prices_acc,
     key: :updated_at,
     key: :old_gas_prices,
+    key: :old_updated_at,
     key: :async_task,
-    global_ttl: global_ttl(),
+    global_ttl: :infinity,
     ttl_check_interval: :timer.seconds(1),
     callback: &async_task_on_deletion(&1)
 
+  @doc """
+  Calculates how much time left till the next gas prices updated taking into account estimated query running time.
+  """
+  @spec update_in :: non_neg_integer()
+  def update_in do
+    case {get_old_updated_at(), get_updated_at()} do
+      {%DateTime{} = old_updated_at, %DateTime{} = updated_at} ->
+        time_to_update = DateTime.diff(updated_at, old_updated_at, :millisecond) + 500
+        time_since_last_update = DateTime.diff(DateTime.utc_now(), updated_at, :millisecond)
+        next_update_in = time_to_update - time_since_last_update
+        if next_update_in <= 0, do: global_ttl(), else: next_update_in
+
+      _ ->
+        global_ttl() + :timer.seconds(2)
+    end
+  end
+
   @doc """
   Calculates the `slow`, `average`, and `fast` gas price and time percentiles from the last `num_of_blocks` blocks and estimates the fiat price for each percentile.
   These percentiles correspond to the likelihood of a transaction being picked up by miners depending on the fee offered.
@@ -330,7 +348,7 @@ defmodule Explorer.Chain.Cache.GasPriceOracle do
 
   defp format_wei(wei), do: wei |> Wei.to(:gwei) |> Decimal.to_float() |> Float.ceil(2)
 
-  def global_ttl, do: Application.get_env(:explorer, __MODULE__)[:global_ttl]
+  defp global_ttl, do: Application.get_env(:explorer, __MODULE__)[:global_ttl]
 
   defp simple_transaction_gas, do: Application.get_env(:explorer, __MODULE__)[:simple_transaction_gas]
 
@@ -359,7 +377,8 @@ defmodule Explorer.Chain.Cache.GasPriceOracle do
           {result, acc} = get_average_gas_price(num_of_blocks(), safelow(), average(), fast())
 
           set_gas_prices_acc(acc)
-          set_gas_prices(result)
+          set_gas_prices(%ConCache.Item{ttl: global_ttl(), value: result})
+          set_old_updated_at(get_updated_at())
           set_updated_at(DateTime.utc_now())
         rescue
           e ->

From 9482a4f04a0a37ece0c7b6d91aa0c370f753b10a Mon Sep 17 00:00:00 2001
From: Qwerty5Uiop <alex000010@bk.ru>
Date: Thu, 28 Dec 2023 18:30:56 +0600
Subject: [PATCH 884/909] Fetch realtime coin balances only for addresses for
 which it has changed

---
 CHANGELOG.md                                  |  1 +
 .../lib/indexer/block/realtime/fetcher.ex     | 30 ++-----------------
 2 files changed, 4 insertions(+), 27 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b807cbefc0e4..77f73af4e783 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -14,6 +14,7 @@
 - [#9102](https://github.com/blockscout/blockscout/pull/9102) - Fix some log topics for Suave and Polygon Edge
 - [#9075](https://github.com/blockscout/blockscout/pull/9075) - Fix fetching contract codes
 - [#9073](https://github.com/blockscout/blockscout/pull/9073) - Allow payable function with output appear in the Read tab
+- [#9069](https://github.com/blockscout/blockscout/pull/9069) - Fetch realtime coin balances only for addresses for which it has changed
 
 ### Chore
 
diff --git a/apps/indexer/lib/indexer/block/realtime/fetcher.ex b/apps/indexer/lib/indexer/block/realtime/fetcher.ex
index cb43857e1d0b..9f989d017f96 100644
--- a/apps/indexer/lib/indexer/block/realtime/fetcher.ex
+++ b/apps/indexer/lib/indexer/block/realtime/fetcher.ex
@@ -195,7 +195,6 @@ defmodule Indexer.Block.Realtime.Fetcher do
         block_fetcher,
         %{
           address_coin_balances: %{params: address_coin_balances_params},
-          address_hash_to_fetched_balance_block_number: address_hash_to_block_number,
           addresses: %{params: addresses_params},
           block_rewards: block_rewards
         } = options
@@ -209,7 +208,6 @@ defmodule Indexer.Block.Realtime.Fetcher do
            }}} <-
            {:balances,
             balances(block_fetcher, %{
-              address_hash_to_block_number: address_hash_to_block_number,
               addresses_params: addresses_params,
               balances_params: address_coin_balances_params
             })},
@@ -474,35 +472,13 @@ defmodule Indexer.Block.Realtime.Fetcher do
     end
   end
 
-  defp fetch_balances_params_list(%{
-         addresses_params: addresses_params,
-         address_hash_to_block_number: address_hash_to_block_number,
-         balances_params: balances_params
-       }) do
-    addresses_params
-    |> addresses_params_to_fetched_balances_params_set(%{address_hash_to_block_number: address_hash_to_block_number})
-    |> MapSet.union(balances_params_to_fetch_balances_params_set(balances_params))
+  defp fetch_balances_params_list(%{balances_params: balances_params}) do
+    balances_params
+    |> balances_params_to_fetch_balances_params_set()
     # stable order for easier moxing
     |> Enum.sort_by(fn %{hash_data: hash_data, block_quantity: block_quantity} -> {hash_data, block_quantity} end)
   end
 
-  defp addresses_params_to_fetched_balances_params_set(addresses_params, %{
-         address_hash_to_block_number: address_hash_to_block_number
-       }) do
-    Enum.into(addresses_params, MapSet.new(), fn %{hash: address_hash} = address_params when is_binary(address_hash) ->
-      block_number =
-        case address_params do
-          %{fetched_coin_balance_block_number: block_number} when is_integer(block_number) ->
-            block_number
-
-          _ ->
-            Map.fetch!(address_hash_to_block_number, String.downcase(address_hash))
-        end
-
-      %{hash_data: address_hash, block_quantity: integer_to_quantity(block_number)}
-    end)
-  end
-
   defp balances_params_to_fetch_balances_params_set(balances_params) do
     Enum.into(balances_params, MapSet.new(), fn %{address_hash: address_hash, block_number: block_number} ->
       %{hash_data: address_hash, block_quantity: integer_to_quantity(block_number)}

From 48bfc78b81b434c1a3f2651da327d56a8c330ab1 Mon Sep 17 00:00:00 2001
From: Viktor Baranov <baranov.viktor.27@gmail.com>
Date: Thu, 11 Jan 2024 22:55:27 +0300
Subject: [PATCH 885/909] Filecoin branch CI

---
 .../publish-docker-image-for-filecoin.yml     | 55 +++++++++++++++++++
 1 file changed, 55 insertions(+)
 create mode 100644 .github/workflows/publish-docker-image-for-filecoin.yml

diff --git a/.github/workflows/publish-docker-image-for-filecoin.yml b/.github/workflows/publish-docker-image-for-filecoin.yml
new file mode 100644
index 000000000000..6e98141461fc
--- /dev/null
+++ b/.github/workflows/publish-docker-image-for-filecoin.yml
@@ -0,0 +1,55 @@
+# This workflow uses actions that are not certified by GitHub.
+# They are provided by a third-party and are governed by
+# separate terms of service, privacy policy, and support
+# documentation.
+
+name: Publish Docker image for specific chain branches
+
+on:
+  push:
+    branches:
+      - production-filecoin
+jobs:
+  push_to_registry:
+    name: Push Docker image to Docker Hub
+    runs-on: ubuntu-latest
+    env:
+      RELEASE_VERSION: 6.0.0
+      DOCKER_CHAIN_NAME: filecoin
+    steps:
+      - name: Check out the repo
+        uses: actions/checkout@v3
+      
+      - name: Log in to Docker Hub
+        uses: docker/login-action@v2
+        with:
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
+      
+      - name: Extract metadata (tags, labels) for Docker
+        id: meta
+        uses: docker/metadata-action@v4
+        with:
+          images: blockscout/blockscout
+
+      - name: Add SHORT_SHA env property with commit short sha
+        run: echo "SHORT_SHA=`echo ${GITHUB_SHA} | cut -c1-8`" >> $GITHUB_ENV
+      
+      - name: Build and push Docker image
+        uses: docker/build-push-action@v5
+        with:
+          context: .
+          file: ./docker/Dockerfile
+          push: true
+          tags: blockscout/blockscout-${{ env.DOCKER_CHAIN_NAME }}:${{ env.RELEASE_VERSION }}-postrelease-${{ env.SHORT_SHA }}
+          build-args: |
+            CACHE_EXCHANGE_RATES_PERIOD=
+            API_V1_READ_METHODS_DISABLED=false
+            DISABLE_WEBAPP=false
+            API_V1_WRITE_METHODS_DISABLED=false
+            CACHE_TOTAL_GAS_USAGE_COUNTER_ENABLED=
+            ADMIN_PANEL_ENABLED=false
+            CACHE_ADDRESS_WITH_BALANCES_UPDATE_INTERVAL=
+            BLOCKSCOUT_VERSION=v${{ env.RELEASE_VERSION }}-beta.+commit.${{ env.SHORT_SHA }}
+            RELEASE_VERSION=${{ env.RELEASE_VERSION }}
+            CHAIN_TYPE=polygon_edge
\ No newline at end of file

From 9825192aba24d88dd53d90093a79f11ee628b402 Mon Sep 17 00:00:00 2001
From: Viktor Baranov <baranov.viktor.27@gmail.com>
Date: Mon, 25 Dec 2023 18:51:55 +0300
Subject: [PATCH 886/909] Noves.fi API proxy

---
 CHANGELOG.md                                  |  1 +
 .../lib/block_scout_web/api_router.ex         |  8 +++
 .../controllers/api/v2/address_controller.ex  |  8 ++-
 .../api/v2/proxy/noves_fi_conroller.ex        | 61 +++++++++++++++++
 .../api/v2/transaction_controller.ex          |  7 +-
 .../third_party_integrations/noves_fi.ex      | 66 +++++++++++++++++++
 config/runtime.exs                            |  5 ++
 cspell.json                                   |  2 +
 docker-compose/envs/common-blockscout.env     | 63 ++++++++++--------
 9 files changed, 189 insertions(+), 32 deletions(-)
 create mode 100644 apps/block_scout_web/lib/block_scout_web/controllers/api/v2/proxy/noves_fi_conroller.ex
 create mode 100644 apps/explorer/lib/explorer/third_party_integrations/noves_fi.ex

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b807cbefc0e4..b96216dbee7a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,7 @@
 ### Features
 
 - [#9072](https://github.com/blockscout/blockscout/pull/9072) - Add tracing by block logic for geth
+- [#9056](https://github.com/blockscout/blockscout/pull/9056) - Noves.fi API proxy
 
 ### Fixes
 
diff --git a/apps/block_scout_web/lib/block_scout_web/api_router.ex b/apps/block_scout_web/lib/block_scout_web/api_router.ex
index 7880bd15af05..5f8415014aaa 100644
--- a/apps/block_scout_web/lib/block_scout_web/api_router.ex
+++ b/apps/block_scout_web/lib/block_scout_web/api_router.ex
@@ -300,6 +300,14 @@ defmodule BlockScoutWeb.ApiRouter do
         get("/batches/:batch_number", V2.ZkevmController, :batch)
       end
     end
+
+    scope "/proxy" do
+      scope "/noves-fi" do
+        get("/transactions/:transaction_hash_param", V2.Proxy.NovesFiController, :transaction)
+        get("/transactions/:transaction_hash_param/describe", V2.Proxy.NovesFiController, :describe_transaction)
+        get("/addresses/:address_hash_param/transactions", V2.Proxy.NovesFiController, :address_transactions)
+      end
+    end
   end
 
   scope "/v1", as: :api_v1 do
diff --git a/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/address_controller.ex b/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/address_controller.ex
index 3a78dcdb676c..6794eeb6ad17 100644
--- a/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/address_controller.ex
+++ b/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/address_controller.ex
@@ -25,7 +25,7 @@ defmodule BlockScoutWeb.API.V2.AddressController do
   alias BlockScoutWeb.AccessHelper
   alias BlockScoutWeb.API.V2.{BlockView, TransactionView, WithdrawalView}
   alias Explorer.{Chain, Market}
-  alias Explorer.Chain.{Address, Transaction}
+  alias Explorer.Chain.{Address, Hash, Transaction}
   alias Explorer.Chain.Address.Counters
   alias Explorer.Chain.Token.Instance
   alias Indexer.Fetcher.{CoinBalanceOnDemand, TokenBalanceOnDemand}
@@ -497,7 +497,11 @@ defmodule BlockScoutWeb.API.V2.AddressController do
     end
   end
 
-  defp validate_address(address_hash_string, params, options \\ @api_true) do
+  @doc """
+  Checks if this valid address hash string, and this address is not prohibited address
+  """
+  @spec validate_address(String.t(), any(), list()) :: {:ok, Hash.Address.t(), Address.t()}
+  def validate_address(address_hash_string, params, options \\ @api_true) do
     with {:format, {:ok, address_hash}} <- {:format, Chain.string_to_address_hash(address_hash_string)},
          {:ok, false} <- AccessHelper.restricted_access?(address_hash_string, params),
          {:not_found, {:ok, address}} <- {:not_found, Chain.hash_to_address(address_hash, options, false)} do
diff --git a/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/proxy/noves_fi_conroller.ex b/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/proxy/noves_fi_conroller.ex
new file mode 100644
index 000000000000..7c0e6a327714
--- /dev/null
+++ b/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/proxy/noves_fi_conroller.ex
@@ -0,0 +1,61 @@
+defmodule BlockScoutWeb.API.V2.Proxy.NovesFiController do
+  use BlockScoutWeb, :controller
+
+  alias BlockScoutWeb.API.V2.{AddressController, TransactionController}
+  alias Explorer.ThirdPartyIntegrations.NovesFi
+
+  action_fallback(BlockScoutWeb.API.V2.FallbackController)
+
+  @doc """
+    Function to handle GET requests to `/api/v2/proxy/noves-fi/transactions/:transaction_hash_param` endpoint.
+  """
+  @spec transaction(Plug.Conn.t(), map()) :: Plug.Conn.t() | {atom(), any()}
+  def transaction(conn, %{"transaction_hash_param" => transaction_hash_string} = params) do
+    with {:ok, _transaction, _transaction_hash} <-
+           TransactionController.validate_transaction(transaction_hash_string, params,
+             necessity_by_association: %{},
+             api?: true
+           ),
+         url = NovesFi.tx_url(transaction_hash_string),
+         {response, status} <- NovesFi.noves_fi_api_request(url, conn),
+         {:is_empty_response, false} <- {:is_empty_response, is_nil(response)} do
+      conn
+      |> put_status(status)
+      |> json(response)
+    end
+  end
+
+  @doc """
+    Function to handle GET requests to `/api/v2/proxy/noves-fi/transactions/:transaction_hash_param/describe` endpoint.
+  """
+  @spec describe_transaction(Plug.Conn.t(), map()) :: Plug.Conn.t() | {atom(), any()}
+  def describe_transaction(conn, %{"transaction_hash_param" => transaction_hash_string} = params) do
+    with {:ok, _transaction, _transaction_hash} <-
+           TransactionController.validate_transaction(transaction_hash_string, params,
+             necessity_by_association: %{},
+             api?: true
+           ),
+         url = NovesFi.describe_tx_url(transaction_hash_string),
+         {response, status} <- NovesFi.noves_fi_api_request(url, conn),
+         {:is_empty_response, false} <- {:is_empty_response, is_nil(response)} do
+      conn
+      |> put_status(status)
+      |> json(response)
+    end
+  end
+
+  @doc """
+    Function to handle GET requests to `/api/v2/proxy/noves-fi/transactions/:transaction_hash_param/describe` endpoint.
+  """
+  @spec address_transactions(Plug.Conn.t(), map()) :: Plug.Conn.t() | {atom(), any()}
+  def address_transactions(conn, %{"address_hash_param" => address_hash_string} = params) do
+    with {:ok, _address_hash, _address} <- AddressController.validate_address(address_hash_string, params),
+         url = NovesFi.address_txs_url(address_hash_string),
+         {response, status} <- NovesFi.noves_fi_api_request(url, conn),
+         {:is_empty_response, false} <- {:is_empty_response, is_nil(response)} do
+      conn
+      |> put_status(status)
+      |> json(response)
+    end
+  end
+end
diff --git a/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/transaction_controller.ex b/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/transaction_controller.ex
index a1e5134f4e9d..aabbc21ecb27 100644
--- a/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/transaction_controller.ex
+++ b/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/transaction_controller.ex
@@ -28,6 +28,7 @@ defmodule BlockScoutWeb.API.V2.TransactionController do
   alias BlockScoutWeb.MicroserviceInterfaces.TransactionInterpretation, as: TransactionInterpretationService
   alias BlockScoutWeb.Models.TransactionStateHelper
   alias Explorer.Chain
+  alias Explorer.Chain.{Hash, Transaction}
   alias Explorer.Chain.Zkevm.Reader
   alias Indexer.Fetcher.FirstTraceOnDemand
 
@@ -388,7 +389,11 @@ defmodule BlockScoutWeb.API.V2.TransactionController do
     end
   end
 
-  defp validate_transaction(transaction_hash_string, params, options \\ @api_true) do
+  @doc """
+  Checks if this valid transaction hash string, and this transaction doesn't belong to prohibited address
+  """
+  @spec validate_transaction(String.t(), any(), list()) :: {:ok, Transaction.t(), Hash.t()}
+  def validate_transaction(transaction_hash_string, params, options \\ @api_true) do
     with {:format, {:ok, transaction_hash}} <- {:format, Chain.string_to_transaction_hash(transaction_hash_string)},
          {:not_found, {:ok, transaction}} <-
            {:not_found, Chain.hash_to_transaction(transaction_hash, options)},
diff --git a/apps/explorer/lib/explorer/third_party_integrations/noves_fi.ex b/apps/explorer/lib/explorer/third_party_integrations/noves_fi.ex
new file mode 100644
index 000000000000..fef14a2bfd52
--- /dev/null
+++ b/apps/explorer/lib/explorer/third_party_integrations/noves_fi.ex
@@ -0,0 +1,66 @@
+defmodule Explorer.ThirdPartyIntegrations.NovesFi do
+  @moduledoc """
+  Module for Noves.Fi API integration https://blockscout.noves.fi/swagger/index.html
+  """
+
+  alias Explorer.Helper
+
+  @recv_timeout 60_000
+
+  @doc """
+  Proxy request to noves.fi API endpoints
+  """
+  @spec noves_fi_api_request(String.t(), Plug.Conn.t()) :: any()
+  def noves_fi_api_request(url, conn) do
+    headers = [{"apiKey", api_key()}]
+    url_with_params = url <> "?" <> conn.query_string
+
+    case HTTPoison.get(url_with_params, headers, recv_timeout: @recv_timeout) do
+      {:ok, %HTTPoison.Response{status_code: status, body: body}} ->
+        {Helper.decode_json(body), status}
+
+      _ ->
+        nil
+    end
+  end
+
+  @doc """
+  Noves.fi /evm/{chain}/tx/{txHash} endpoint
+  """
+  @spec tx_url(String.t()) :: String.t()
+  def tx_url(transaction_hash_string) do
+    "#{base_url()}/evm/#{chain_name()}/tx/#{transaction_hash_string}"
+  end
+
+  @doc """
+  Noves.fi /evm/{chain}/describeTx/{txHash} endpoint
+  """
+  @spec describe_tx_url(String.t()) :: String.t()
+  def describe_tx_url(transaction_hash_string) do
+    "#{base_url()}/evm/#{chain_name()}/describeTx/#{transaction_hash_string}"
+  end
+
+  @doc """
+  Noves.fi /evm/{chain}/txs/{accountAddress} endpoint
+  """
+  @spec address_txs_url(String.t()) :: String.t()
+  def address_txs_url(address_hash_string) do
+    "#{base_url()}/evm/#{chain_name()}/txs/#{address_hash_string}"
+  end
+
+  defp base_url do
+    api_base_url() || "https://blockscout.noves.fi"
+  end
+
+  defp api_base_url do
+    Application.get_env(:explorer, __MODULE__)[:api_base_url]
+  end
+
+  defp chain_name do
+    Application.get_env(:explorer, __MODULE__)[:chain_name]
+  end
+
+  defp api_key do
+    Application.get_env(:explorer, __MODULE__)[:api_key]
+  end
+end
diff --git a/config/runtime.exs b/config/runtime.exs
index 2cd105ac72e2..d506839dfd44 100644
--- a/config/runtime.exs
+++ b/config/runtime.exs
@@ -378,6 +378,11 @@ config :explorer, Explorer.ThirdPartyIntegrations.SolidityScan,
   chain_id: System.get_env("SOLIDITYSCAN_CHAIN_ID"),
   api_key: System.get_env("SOLIDITYSCAN_API_TOKEN")
 
+config :explorer, Explorer.ThirdPartyIntegrations.NovesFi,
+  api_base_url: System.get_env("NOVES_FI_BASE_API_URL"),
+  chain_name: System.get_env("NOVES_FI_CHAIN_NAME"),
+  api_key: System.get_env("NOVES_FI_API_TOKEN")
+
 enabled? = ConfigHelper.parse_bool_env_var("MICROSERVICE_SC_VERIFIER_ENABLED")
 # or "eth_bytecode_db"
 type = System.get_env("MICROSERVICE_SC_VERIFIER_TYPE", "sc_verifier")
diff --git a/cspell.json b/cspell.json
index ddad179c8d1b..aa6c88ac854f 100644
--- a/cspell.json
+++ b/cspell.json
@@ -312,6 +312,8 @@
         "noproc",
         "noreferrer",
         "noreply",
+        "noves",
+        "NovesFi",
         "nowarn",
         "nowrap",
         "ntoa",
diff --git a/docker-compose/envs/common-blockscout.env b/docker-compose/envs/common-blockscout.env
index 511cd2ebfcec..ce0c19d13c5c 100644
--- a/docker-compose/envs/common-blockscout.env
+++ b/docker-compose/envs/common-blockscout.env
@@ -99,8 +99,20 @@ CONTRACT_MAX_STRING_LENGTH_WITHOUT_TRIMMING=2040
 # CONTRACT_DISABLE_INTERACTION=
 UNCLES_IN_AVERAGE_BLOCK_TIME=false
 DISABLE_WEBAPP=false
+API_V2_ENABLED=true
 API_V1_READ_METHODS_DISABLED=false
 API_V1_WRITE_METHODS_DISABLED=false
+#API_RATE_LIMIT_DISABLED=true
+# API_SENSITIVE_ENDPOINTS_KEY=
+API_RATE_LIMIT_TIME_INTERVAL=1s
+API_RATE_LIMIT_BY_IP_TIME_INTERVAL=5m
+API_RATE_LIMIT=50
+API_RATE_LIMIT_BY_KEY=50
+API_RATE_LIMIT_BY_WHITELISTED_IP=50
+API_RATE_LIMIT_WHITELISTED_IPS=
+API_RATE_LIMIT_STATIC_API_KEY=
+API_RATE_LIMIT_UI_V2_WITH_TOKEN=5
+API_RATE_LIMIT_BY_IP=3000
 DISABLE_INDEXER=false
 DISABLE_REALTIME_INDEXER=false
 DISABLE_CATCHUP_INDEXER=false
@@ -119,10 +131,16 @@ INDEXER_DISABLE_INTERNAL_TRANSACTIONS_FETCHER=false
 # INDEXER_BLOCK_REWARD_BATCH_SIZE=
 # INDEXER_BLOCK_REWARD_CONCURRENCY=
 # INDEXER_TOKEN_INSTANCE_RETRY_REFETCH_INTERVAL=
+# INDEXER_TOKEN_INSTANCE_RETRY_BATCH_SIZE=10
 # INDEXER_TOKEN_INSTANCE_RETRY_CONCURRENCY=
+# INDEXER_TOKEN_INSTANCE_REALTIME_BATCH_SIZE=1
 # INDEXER_TOKEN_INSTANCE_REALTIME_CONCURRENCY=
+# INDEXER_TOKEN_INSTANCE_SANITIZE_BATCH_SIZE=10
 # INDEXER_TOKEN_INSTANCE_SANITIZE_CONCURRENCY=
+# INDEXER_TOKEN_INSTANCE_LEGACY_SANITIZE_BATCH_SIZE=10
 # INDEXER_TOKEN_INSTANCE_LEGACY_SANITIZE_CONCURRENCY=10
+# TOKEN_INSTANCE_OWNER_MIGRATION_CONCURRENCY=5
+# TOKEN_INSTANCE_OWNER_MIGRATION_BATCH_SIZE=50
 # INDEXER_COIN_BALANCES_BATCH_SIZE=
 # INDEXER_COIN_BALANCES_CONCURRENCY=
 # INDEXER_RECEIPTS_BATCH_SIZE=
@@ -194,31 +212,16 @@ EXTERNAL_APPS=[]
 # RESTRICTED_LIST_KEY=
 SHOW_MAINTENANCE_ALERT=false
 MAINTENANCE_ALERT_MESSAGE=
-SOURCIFY_INTEGRATION_ENABLED=false
-SOURCIFY_SERVER_URL=
-SOURCIFY_REPO_URL=
 CHAIN_ID=
 MAX_SIZE_UNLESS_HIDE_ARRAY=50
 HIDE_BLOCK_MINER=false
 DISPLAY_TOKEN_ICONS=false
-SHOW_TENDERLY_LINK=false
-TENDERLY_CHAIN_PATH=
 RE_CAPTCHA_SECRET_KEY=
 RE_CAPTCHA_CLIENT_KEY=
 RE_CAPTCHA_V3_SECRET_KEY=
 RE_CAPTCHA_V3_CLIENT_KEY=
 RE_CAPTCHA_DISABLED=false
 JSON_RPC=
-#API_RATE_LIMIT_DISABLED=true
-API_RATE_LIMIT_TIME_INTERVAL=1s
-API_RATE_LIMIT_BY_IP_TIME_INTERVAL=5m
-API_RATE_LIMIT=50
-API_RATE_LIMIT_BY_KEY=50
-API_RATE_LIMIT_BY_WHITELISTED_IP=50
-API_RATE_LIMIT_WHITELISTED_IPS=
-API_RATE_LIMIT_STATIC_API_KEY=
-API_RATE_LIMIT_UI_V2_WITH_TOKEN=5
-API_RATE_LIMIT_BY_IP=3000
 # API_RATE_LIMIT_HAMMER_REDIS_URL=redis://redis_db:6379/1
 # API_RATE_LIMIT_IS_BLOCKSCOUT_BEHIND_PROXY=false
 API_RATE_LIMIT_UI_V2_TOKEN_TTL_IN_SECONDS=18000
@@ -234,6 +237,8 @@ MICROSERVICE_VISUALIZE_SOL2UML_ENABLED=true
 MICROSERVICE_VISUALIZE_SOL2UML_URL=http://visualizer:8050/
 MICROSERVICE_SIG_PROVIDER_ENABLED=true
 MICROSERVICE_SIG_PROVIDER_URL=http://sig-provider:8050/
+# MICROSERVICE_BENS_URL=
+# MICROSERVICE_BENS_ENABLED=
 DECODE_NOT_A_CONTRACT_CALLS=true
 # DATABASE_READ_ONLY_API_URL=
 # ACCOUNT_DATABASE_URL=
@@ -246,28 +251,28 @@ DECODE_NOT_A_CONTRACT_CALLS=true
 # ACCOUNT_SENDGRID_API_KEY=
 # ACCOUNT_SENDGRID_SENDER=
 # ACCOUNT_SENDGRID_TEMPLATE=
+# ACCOUNT_VERIFICATION_EMAIL_RESEND_INTERVAL=
+# ACCOUNT_PRIVATE_TAGS_LIMIT=2000
+# ACCOUNT_WATCHLIST_ADDRESSES_LIMIT=15
 ACCOUNT_CLOAK_KEY=
 ACCOUNT_ENABLED=false
 ACCOUNT_REDIS_URL=redis://redis_db:6379
+EIP_1559_ELASTICITY_MULTIPLIER=2
 # MIXPANEL_TOKEN=
 # MIXPANEL_URL=
 # AMPLITUDE_API_KEY=
 # AMPLITUDE_URL=
-EIP_1559_ELASTICITY_MULTIPLIER=2
-# API_SENSITIVE_ENDPOINTS_KEY=
-# ACCOUNT_VERIFICATION_EMAIL_RESEND_INTERVAL=
-# INDEXER_TOKEN_INSTANCE_RETRY_BATCH_SIZE=10
-# INDEXER_TOKEN_INSTANCE_REALTIME_BATCH_SIZE=1
-# INDEXER_TOKEN_INSTANCE_SANITIZE_BATCH_SIZE=10
-# INDEXER_TOKEN_INSTANCE_LEGACY_SANITIZE_BATCH_SIZE=10
-# TOKEN_INSTANCE_OWNER_MIGRATION_CONCURRENCY=5
-# TOKEN_INSTANCE_OWNER_MIGRATION_BATCH_SIZE=50
 # IPFS_GATEWAY_URL=
-API_V2_ENABLED=true
 # ADDRESSES_TABS_COUNTERS_TTL=10m
-# ACCOUNT_PRIVATE_TAGS_LIMIT=2000
-# ACCOUNT_WATCHLIST_ADDRESSES_LIMIT=15
-# MICROSERVICE_BENS_URL=
-# MICROSERVICE_BENS_ENABLED=
 # DENORMALIZATION_MIGRATION_BATCH_SIZE=
 # DENORMALIZATION_MIGRATION_CONCURRENCY=
+SOURCIFY_INTEGRATION_ENABLED=false
+SOURCIFY_SERVER_URL=
+SOURCIFY_REPO_URL=
+SHOW_TENDERLY_LINK=false
+TENDERLY_CHAIN_PATH=
+# SOLIDITYSCAN_CHAIN_ID=
+# SOLIDITYSCAN_API_TOKEN=
+# NOVES_FI_BASE_API_URL=
+# NOVES_FI_CHAIN_NAME=
+# NOVES_FI_API_TOKEN=

From 1f87efb1966cba4bfad1c8a1efff27270d8fc3ba Mon Sep 17 00:00:00 2001
From: Victor Baranov <baranov.viktor.27@gmail.com>
Date: Tue, 9 Jan 2024 16:03:50 +0300
Subject: [PATCH 887/909] Update
 apps/block_scout_web/lib/block_scout_web/controllers/api/v2/address_controller.ex

Co-authored-by: Maxim Filonov <53992153+sl1depengwyn@users.noreply.github.com>
---
 .../controllers/api/v2/address_controller.ex                | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/address_controller.ex b/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/address_controller.ex
index 6794eeb6ad17..fe0ec5bee1a2 100644
--- a/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/address_controller.ex
+++ b/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/address_controller.ex
@@ -500,7 +500,11 @@ defmodule BlockScoutWeb.API.V2.AddressController do
   @doc """
   Checks if this valid address hash string, and this address is not prohibited address
   """
-  @spec validate_address(String.t(), any(), list()) :: {:ok, Hash.Address.t(), Address.t()}
+  @spec validate_address(String.t(), any(), Keyword.t()) ::
+          {:format, :error}
+          | {:not_found, {:error, :not_found}}
+          | {:restricted_access, true}
+          | {:ok, Hash.t(), Address.t()}
   def validate_address(address_hash_string, params, options \\ @api_true) do
     with {:format, {:ok, address_hash}} <- {:format, Chain.string_to_address_hash(address_hash_string)},
          {:ok, false} <- AccessHelper.restricted_access?(address_hash_string, params),

From 9f3048b2cdb05b8458d4e8c60ec1c75deb876fbb Mon Sep 17 00:00:00 2001
From: Victor Baranov <baranov.viktor.27@gmail.com>
Date: Tue, 9 Jan 2024 16:03:57 +0300
Subject: [PATCH 888/909] Update
 apps/block_scout_web/lib/block_scout_web/controllers/api/v2/transaction_controller.ex

Co-authored-by: Maxim Filonov <53992153+sl1depengwyn@users.noreply.github.com>
---
 .../controllers/api/v2/transaction_controller.ex            | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/transaction_controller.ex b/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/transaction_controller.ex
index aabbc21ecb27..ff62beb9f5d8 100644
--- a/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/transaction_controller.ex
+++ b/apps/block_scout_web/lib/block_scout_web/controllers/api/v2/transaction_controller.ex
@@ -392,7 +392,11 @@ defmodule BlockScoutWeb.API.V2.TransactionController do
   @doc """
   Checks if this valid transaction hash string, and this transaction doesn't belong to prohibited address
   """
-  @spec validate_transaction(String.t(), any(), list()) :: {:ok, Transaction.t(), Hash.t()}
+  @spec validate_transaction(String.t(), any(), Keyword.t()) ::
+          {:format, :error}
+          | {:not_found, {:error, :not_found}}
+          | {:restricted_access, true}
+          | {:ok, Transaction.t(), Hash.t()}
   def validate_transaction(transaction_hash_string, params, options \\ @api_true) do
     with {:format, {:ok, transaction_hash}} <- {:format, Chain.string_to_transaction_hash(transaction_hash_string)},
          {:not_found, {:ok, transaction}} <-

From 9ee50997736e07dc4403091e753c012853d8d466 Mon Sep 17 00:00:00 2001
From: Viktor Baranov <baranov.viktor.27@gmail.com>
Date: Tue, 9 Jan 2024 18:29:17 +0300
Subject: [PATCH 889/909] Clear GA cache

---
 .github/workflows/config.yml | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/config.yml b/.github/workflows/config.yml
index 82c11d6d85ec..2e71299d83c1 100644
--- a/.github/workflows/config.yml
+++ b/.github/workflows/config.yml
@@ -75,7 +75,7 @@ jobs:
           path: |
             deps
             _build
-          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_33-${{ hashFiles('mix.lock') }}
+          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_34-${{ hashFiles('mix.lock') }}
           restore-keys: |
             ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-
 
@@ -133,7 +133,7 @@ jobs:
           path: |
             deps
             _build
-          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_33-${{ hashFiles('mix.lock') }}
+          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_34-${{ hashFiles('mix.lock') }}
           restore-keys: |
             ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-"
 
@@ -157,7 +157,7 @@ jobs:
           path: |
             deps
             _build
-          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_33-${{ hashFiles('mix.lock') }}
+          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_34-${{ hashFiles('mix.lock') }}
           restore-keys: |
             ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-"
 
@@ -186,7 +186,7 @@ jobs:
           path: |
             deps
             _build
-          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_33-${{ hashFiles('mix.lock') }}
+          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_34-${{ hashFiles('mix.lock') }}
           restore-keys: |
             ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-"
 
@@ -230,7 +230,7 @@ jobs:
           path: |
             deps
             _build
-          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_33-${{ hashFiles('mix.lock') }}
+          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_34-${{ hashFiles('mix.lock') }}
           restore-keys: |
             ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-"
 
@@ -256,7 +256,7 @@ jobs:
           path: |
             deps
             _build
-          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_33-${{ hashFiles('mix.lock') }}
+          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_34-${{ hashFiles('mix.lock') }}
           restore-keys: |
             ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-"
 
@@ -285,7 +285,7 @@ jobs:
           path: |
             deps
             _build
-          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_33-${{ hashFiles('mix.lock') }}
+          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_34-${{ hashFiles('mix.lock') }}
           restore-keys: |
             ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-"
 
@@ -333,7 +333,7 @@ jobs:
           path: |
             deps
             _build
-          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_33-${{ hashFiles('mix.lock') }}
+          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_34-${{ hashFiles('mix.lock') }}
           restore-keys: |
             ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-"
 
@@ -379,7 +379,7 @@ jobs:
           path: |
             deps
             _build
-          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_33-${{ hashFiles('mix.lock') }}
+          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_34-${{ hashFiles('mix.lock') }}
           restore-keys: |
             ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-"
 
@@ -441,7 +441,7 @@ jobs:
           path: |
             deps
             _build
-          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_33-${{ hashFiles('mix.lock') }}
+          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_34-${{ hashFiles('mix.lock') }}
           restore-keys: |
             ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-"
 
@@ -501,7 +501,7 @@ jobs:
           path: |
             deps
             _build
-          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_33-${{ hashFiles('mix.lock') }}
+          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_34-${{ hashFiles('mix.lock') }}
           restore-keys: |
             ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-"
 
@@ -572,7 +572,7 @@ jobs:
           path: |
             deps
             _build
-          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_33-${{ hashFiles('mix.lock') }}
+          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_34-${{ hashFiles('mix.lock') }}
           restore-keys: |
             ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-"
 
@@ -640,7 +640,7 @@ jobs:
           path: |
             deps
             _build
-          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_33-${{ hashFiles('mix.lock') }}
+          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_34-${{ hashFiles('mix.lock') }}
           restore-keys: |
             ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-"
 

From 7c24d90976dd0d1d4e52b63d4ae1678c47db1444 Mon Sep 17 00:00:00 2001
From: Viktor Baranov <baranov.viktor.27@gmail.com>
Date: Wed, 10 Jan 2024 15:09:07 +0300
Subject: [PATCH 890/909] Process reviewer comments

---
 .../lib/explorer/third_party_integrations/noves_fi.ex | 11 ++++-------
 config/runtime.exs                                    |  2 +-
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/apps/explorer/lib/explorer/third_party_integrations/noves_fi.ex b/apps/explorer/lib/explorer/third_party_integrations/noves_fi.ex
index fef14a2bfd52..dcf0e473b24e 100644
--- a/apps/explorer/lib/explorer/third_party_integrations/noves_fi.ex
+++ b/apps/explorer/lib/explorer/third_party_integrations/noves_fi.ex
@@ -4,13 +4,14 @@ defmodule Explorer.ThirdPartyIntegrations.NovesFi do
   """
 
   alias Explorer.Helper
+  alias Explorer.Utility.Microservice
 
   @recv_timeout 60_000
 
   @doc """
   Proxy request to noves.fi API endpoints
   """
-  @spec noves_fi_api_request(String.t(), Plug.Conn.t()) :: any()
+  @spec noves_fi_api_request(String.t(), Plug.Conn.t()) :: {any(), integer()}
   def noves_fi_api_request(url, conn) do
     headers = [{"apiKey", api_key()}]
     url_with_params = url <> "?" <> conn.query_string
@@ -20,7 +21,7 @@ defmodule Explorer.ThirdPartyIntegrations.NovesFi do
         {Helper.decode_json(body), status}
 
       _ ->
-        nil
+        {nil, 500}
     end
   end
 
@@ -49,11 +50,7 @@ defmodule Explorer.ThirdPartyIntegrations.NovesFi do
   end
 
   defp base_url do
-    api_base_url() || "https://blockscout.noves.fi"
-  end
-
-  defp api_base_url do
-    Application.get_env(:explorer, __MODULE__)[:api_base_url]
+    Microservice.base_url(__MODULE__)
   end
 
   defp chain_name do
diff --git a/config/runtime.exs b/config/runtime.exs
index d506839dfd44..5b7b09717066 100644
--- a/config/runtime.exs
+++ b/config/runtime.exs
@@ -379,7 +379,7 @@ config :explorer, Explorer.ThirdPartyIntegrations.SolidityScan,
   api_key: System.get_env("SOLIDITYSCAN_API_TOKEN")
 
 config :explorer, Explorer.ThirdPartyIntegrations.NovesFi,
-  api_base_url: System.get_env("NOVES_FI_BASE_API_URL"),
+  service_url: System.get_env("NOVES_FI_BASE_API_URL") || "https://blockscout.noves.fi",
   chain_name: System.get_env("NOVES_FI_CHAIN_NAME"),
   api_key: System.get_env("NOVES_FI_API_TOKEN")
 

From 5ea59f3f21f259eb0bdfe59cda48244f6d7cd0f1 Mon Sep 17 00:00:00 2001
From: shuoer86 <129674997+shuoer86@users.noreply.github.com>
Date: Fri, 12 Jan 2024 22:45:17 +0800
Subject: [PATCH 891/909] Fix typo

---
 apps/explorer/test/support/fixture/smart_contract/ERC677.sol  | 4 ++--
 .../test/support/fixture/smart_contract/issue_3082.sol        | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/apps/explorer/test/support/fixture/smart_contract/ERC677.sol b/apps/explorer/test/support/fixture/smart_contract/ERC677.sol
index e999f2b306c5..f1b4cf495f76 100644
--- a/apps/explorer/test/support/fixture/smart_contract/ERC677.sol
+++ b/apps/explorer/test/support/fixture/smart_contract/ERC677.sol
@@ -64,7 +64,7 @@ interface IERC677MultiBridgeToken {
 * specific functions.
 *
 * This module is used through inheritance. It will make available the modifier
-* `onlyOwner`, which can be aplied to your functions to restrict their use to
+* `onlyOwner`, which can be applied to your functions to restrict their use to
 * the owner.
 */
 contract Ownable {
@@ -1160,4 +1160,4 @@ contract ERC677MultiBridgeToken is IERC677MultiBridgeToken, ERC677BridgeToken {
     function isBridge(address _address) public view returns (bool) {
         return _address != F_ADDR && bridgePointers[_address] != address(0);
     }
-}
\ No newline at end of file
+}
diff --git a/apps/explorer/test/support/fixture/smart_contract/issue_3082.sol b/apps/explorer/test/support/fixture/smart_contract/issue_3082.sol
index 7a06a2bfb48b..b0040d68a1a8 100644
--- a/apps/explorer/test/support/fixture/smart_contract/issue_3082.sol
+++ b/apps/explorer/test/support/fixture/smart_contract/issue_3082.sol
@@ -28,7 +28,7 @@ interface IERC677MultiBridgeToken {
  * specific functions.
  *
  * This module is used through inheritance. It will make available the modifier
- * `onlyOwner`, which can be aplied to your functions to restrict their use to
+ * `onlyOwner`, which can be applied to your functions to restrict their use to
  * the owner.
  */
 contract Ownable {
@@ -591,4 +591,4 @@ contract Distribution is Ownable, IDistribution {
             revert("invalid address");
         }
     }
-}
\ No newline at end of file
+}

From b31dd86bb09ab796a4cfbf5e26e29f9d27aae2b7 Mon Sep 17 00:00:00 2001
From: shuoer86 <129674997+shuoer86@users.noreply.github.com>
Date: Fri, 12 Jan 2024 22:45:40 +0800
Subject: [PATCH 892/909] Fix typo

---
 .../test/support/fixture/smart_contract/issue_5114.sol        | 4 ++--
 .../fixture/smart_contract/issue_with_constructor_args.sol    | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/apps/explorer/test/support/fixture/smart_contract/issue_5114.sol b/apps/explorer/test/support/fixture/smart_contract/issue_5114.sol
index 0c5458210089..5a997e254e0f 100644
--- a/apps/explorer/test/support/fixture/smart_contract/issue_5114.sol
+++ b/apps/explorer/test/support/fixture/smart_contract/issue_5114.sol
@@ -16,7 +16,7 @@ abstract contract Proxy {
     /**
      * @dev Delegates the current call to `implementation`.
      *
-     * This function does not return to its internall call site, it will return directly to the external caller.
+     * This function does not return to its internal call site, it will return directly to the external caller.
      */
     function _delegate(address implementation) internal virtual {
         // solhint-disable-next-line no-inline-assembly
@@ -49,7 +49,7 @@ abstract contract Proxy {
     /**
      * @dev Delegates the current call to the address returned by `_implementation()`.
      *
-     * This function does not return to its internall call site, it will return directly to the external caller.
+     * This function does not return to its internal call site, it will return directly to the external caller.
      */
     function _fallback() internal virtual {
         _beforeFallback();
diff --git a/apps/explorer/test/support/fixture/smart_contract/issue_with_constructor_args.sol b/apps/explorer/test/support/fixture/smart_contract/issue_with_constructor_args.sol
index d17247212c07..a561dfc1b739 100644
--- a/apps/explorer/test/support/fixture/smart_contract/issue_with_constructor_args.sol
+++ b/apps/explorer/test/support/fixture/smart_contract/issue_with_constructor_args.sol
@@ -292,7 +292,7 @@ abstract contract Proxy {
     /**
      * @dev Delegates the current call to `implementation`.
      *
-     * This function does not return to its internall call site, it will return directly to the external caller.
+     * This function does not return to its internal call site, it will return directly to the external caller.
      */
     function _delegate(address implementation) internal virtual {
         // solhint-disable-next-line no-inline-assembly
@@ -325,7 +325,7 @@ abstract contract Proxy {
     /**
      * @dev Delegates the current call to the address returned by `_implementation()`.
      *
-     * This function does not return to its internall call site, it will return directly to the external caller.
+     * This function does not return to its internal call site, it will return directly to the external caller.
      */
     function _fallback() internal virtual {
         _beforeFallback();

From 3aef113f6f8101d11c4709bd96633a2898e6b3ba Mon Sep 17 00:00:00 2001
From: shuoer86 <129674997+shuoer86@users.noreply.github.com>
Date: Fri, 12 Jan 2024 22:46:26 +0800
Subject: [PATCH 893/909] Fix typo

---
 .../fixture/smart_contract/large_smart_contract.sol       | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/apps/explorer/test/support/fixture/smart_contract/large_smart_contract.sol b/apps/explorer/test/support/fixture/smart_contract/large_smart_contract.sol
index 6b147f21d86e..2b42daeb972d 100644
--- a/apps/explorer/test/support/fixture/smart_contract/large_smart_contract.sol
+++ b/apps/explorer/test/support/fixture/smart_contract/large_smart_contract.sol
@@ -113,7 +113,7 @@ interface IHomeWork {
    * @param key bytes32 The unique value used to derive the home address.
    * @param owner address The account that will be granted ownership of the
    * ERC721 token.
-   * @dev In order to mint an ERC721 token, the assocated home address cannot be
+   * @dev In order to mint an ERC721 token, the associated home address cannot be
    * in use, or else the token will not be able to deploy to the home address.
    * The controller is set to this contract until the token is redeemed, at
    * which point the redeemer designates a new controller for the home address.
@@ -239,7 +239,7 @@ interface IHomeWork {
    * @param owner address The account that will be granted ownership of the
    * ERC721 token.
    * @return The derived key.
-   * @dev In order to mint an ERC721 token, the assocated home address cannot be
+   * @dev In order to mint an ERC721 token, the associated home address cannot be
    * in use, or else the token will not be able to deploy to the home address.
    * The controller is set to this contract until the token is redeemed, at
    * which point the redeemer designates a new controller for the home address.
@@ -1778,7 +1778,7 @@ contract HomeWork is IHomeWork, ERC721Enumerable, IERC721Metadata, IERC1412 {
    * @param key bytes32 The unique value used to derive the home address.
    * @param owner address The account that will be granted ownership of the
    * ERC721 token.
-   * @dev In order to mint an ERC721 token, the assocated home address cannot be
+   * @dev In order to mint an ERC721 token, the associated home address cannot be
    * in use, or else the token will not be able to deploy to the home address.
    * The controller is set to this contract until the token is redeemed, at
    * which point the redeemer designates a new controller for the home address.
@@ -2011,7 +2011,7 @@ contract HomeWork is IHomeWork, ERC721Enumerable, IERC721Metadata, IERC1412 {
    * @param owner address The account that will be granted ownership of the
    * ERC721 token.
    * @return The derived key.
-   * @dev In order to mint an ERC721 token, the assocated home address cannot be
+   * @dev In order to mint an ERC721 token, the associated home address cannot be
    * in use, or else the token will not be able to deploy to the home address.
    * The controller is set to this contract until the token is redeemed, at
    * which point the redeemer designates a new controller for the home address.

From e6b39be251dbbf79728f66e3acb0c95ec9367388 Mon Sep 17 00:00:00 2001
From: Viktor Baranov <baranov.viktor.27@gmail.com>
Date: Mon, 15 Jan 2024 11:26:04 +0300
Subject: [PATCH 894/909] Manage proxy implementation ttl via avg block time

---
 CHANGELOG.md                                  |  1 +
 apps/explorer/config/test.exs                 | 10 ++-
 .../lib/explorer/chain/smart_contract.ex      | 14 +--
 .../explorer/chain/smart_contract_test.exs    | 89 +++++++++++++++----
 config/runtime.exs                            | 11 ++-
 5 files changed, 94 insertions(+), 31 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b96216dbee7a..42c62c075dec 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,7 @@
 
 ### Features
 
+- [#9155](https://github.com/blockscout/blockscout/pull/9155) - Allow bypassing avg block time in proxy implementation re-fetch ttl calculation
 - [#9072](https://github.com/blockscout/blockscout/pull/9072) - Add tracing by block logic for geth
 - [#9056](https://github.com/blockscout/blockscout/pull/9056) - Noves.fi API proxy
 
diff --git a/apps/explorer/config/test.exs b/apps/explorer/config/test.exs
index 955f9df84267..b292598e17ff 100644
--- a/apps/explorer/config/test.exs
+++ b/apps/explorer/config/test.exs
@@ -24,12 +24,14 @@ config :explorer, Explorer.Repo.Replica1,
   ownership_timeout: :timer.minutes(1),
   timeout: :timer.seconds(60),
   queue_target: 1000,
-  enable_caching_implementation_data_of_proxy: true,
-  avg_block_time_as_ttl_cached_implementation_data_of_proxy: false,
-  fallback_ttl_cached_implementation_data_of_proxy: :timer.seconds(20),
-  implementation_data_fetching_timeout: :timer.seconds(20),
   log: false
 
+config :explorer, :proxy,
+  caching_implementation_data_enabled: true,
+  implementation_data_ttl_via_avg_block_time: false,
+  fallback_cached_implementation_data_ttl: :timer.seconds(20),
+  implementation_data_fetching_timeout: :timer.seconds(20)
+
 # Configure API database
 config :explorer, Explorer.Repo.Account,
   database: "explorer_test_account",
diff --git a/apps/explorer/lib/explorer/chain/smart_contract.ex b/apps/explorer/lib/explorer/chain/smart_contract.ex
index 1d381ef92ec0..65105cbf853f 100644
--- a/apps/explorer/lib/explorer/chain/smart_contract.ex
+++ b/apps/explorer/lib/explorer/chain/smart_contract.ex
@@ -516,7 +516,7 @@ defmodule Explorer.Chain.SmartContract do
         options
       ) do
     updated_smart_contract =
-      if Application.get_env(:explorer, :enable_caching_implementation_data_of_proxy) &&
+      if Application.get_env(:explorer, :proxy)[:caching_implementation_data_enabled] &&
            check_implementation_refetch_necessity(implementation_fetched_at) do
         address_hash_to_smart_contract_without_twin(address_hash, options)
       else
@@ -544,7 +544,7 @@ defmodule Explorer.Chain.SmartContract do
           Proxy.fetch_implementation_address_hash(address_hash, abi, metadata_from_verified_twin, options)
         end)
 
-      timeout = Application.get_env(:explorer, :implementation_data_fetching_timeout)
+      timeout = Application.get_env(:explorer, :proxy)[:implementation_data_fetching_timeout]
 
       case Task.yield(get_implementation_address_hash_task, timeout) ||
              Task.ignore(get_implementation_address_hash_task) do
@@ -1182,15 +1182,15 @@ defmodule Explorer.Chain.SmartContract do
   defp check_implementation_refetch_necessity(nil), do: true
 
   defp check_implementation_refetch_necessity(timestamp) do
-    if Application.get_env(:explorer, :enable_caching_implementation_data_of_proxy) do
+    if Application.get_env(:explorer, :proxy)[:caching_implementation_data_enabled] do
       now = DateTime.utc_now()
 
-      average_block_time = get_average_block_time()
+      average_block_time = get_average_block_time_for_implementation_refetch()
 
       fresh_time_distance =
         case average_block_time do
           0 ->
-            Application.get_env(:explorer, :fallback_ttl_cached_implementation_data_of_proxy)
+            Application.get_env(:explorer, :proxy)[:fallback_cached_implementation_data_ttl]
 
           time ->
             round(time)
@@ -1204,8 +1204,8 @@ defmodule Explorer.Chain.SmartContract do
     end
   end
 
-  defp get_average_block_time do
-    if Application.get_env(:explorer, :avg_block_time_as_ttl_cached_implementation_data_of_proxy) do
+  defp get_average_block_time_for_implementation_refetch do
+    if Application.get_env(:explorer, :proxy)[:implementation_data_ttl_via_avg_block_time] do
       case AverageBlockTime.average_block_time() do
         {:error, :disabled} ->
           0
diff --git a/apps/explorer/test/explorer/chain/smart_contract_test.exs b/apps/explorer/test/explorer/chain/smart_contract_test.exs
index f7c45251b0e4..1501d08859cd 100644
--- a/apps/explorer/test/explorer/chain/smart_contract_test.exs
+++ b/apps/explorer/test/explorer/chain/smart_contract_test.exs
@@ -15,8 +15,13 @@ defmodule Explorer.Chain.SmartContractTest do
     test "check proxy_contract/1 function" do
       smart_contract = insert(:smart_contract)
 
-      Application.put_env(:explorer, :fallback_ttl_cached_implementation_data_of_proxy, :timer.seconds(20))
-      Application.put_env(:explorer, :implementation_data_fetching_timeout, :timer.seconds(20))
+      proxy =
+        :explorer
+        |> Application.get_env(:proxy)
+        |> Keyword.replace(:fallback_cached_implementation_data_ttl, :timer.seconds(20))
+        |> Keyword.replace(:implementation_data_fetching_timeout, :timer.seconds(20))
+
+      Application.put_env(:explorer, :proxy, proxy)
 
       refute smart_contract.implementation_fetched_at
 
@@ -26,7 +31,12 @@ defmodule Explorer.Chain.SmartContractTest do
       verify!(EthereumJSONRPC.Mox)
       assert_implementation_never_fetched(smart_contract.address_hash)
 
-      Application.put_env(:explorer, :fallback_ttl_cached_implementation_data_of_proxy, 0)
+      proxy =
+        :explorer
+        |> Application.get_env(:proxy)
+        |> Keyword.replace(:fallback_cached_implementation_data_ttl, 0)
+
+      Application.put_env(:explorer, :proxy, proxy)
 
       get_eip1967_implementation_error_response()
       refute Proxy.proxy_contract?(smart_contract)
@@ -42,10 +52,22 @@ defmodule Explorer.Chain.SmartContractTest do
       verify!(EthereumJSONRPC.Mox)
       assert_implementation_address(smart_contract.address_hash)
 
-      Application.put_env(:explorer, :fallback_ttl_cached_implementation_data_of_proxy, :timer.seconds(20))
+      proxy =
+        :explorer
+        |> Application.get_env(:proxy)
+        |> Keyword.replace(:fallback_cached_implementation_data_ttl, :timer.seconds(20))
+
+      Application.put_env(:explorer, :proxy, proxy)
+
       assert Proxy.proxy_contract?(smart_contract)
 
-      Application.put_env(:explorer, :fallback_ttl_cached_implementation_data_of_proxy, 0)
+      proxy =
+        :explorer
+        |> Application.get_env(:proxy)
+        |> Keyword.replace(:fallback_cached_implementation_data_ttl, 0)
+
+      Application.put_env(:explorer, :proxy, proxy)
+
       get_eip1967_implementation_non_zero_address()
       assert Proxy.proxy_contract?(smart_contract)
       verify!(EthereumJSONRPC.Mox)
@@ -59,8 +81,13 @@ defmodule Explorer.Chain.SmartContractTest do
       smart_contract = insert(:smart_contract)
       implementation_smart_contract = insert(:smart_contract, name: "proxy")
 
-      Application.put_env(:explorer, :fallback_ttl_cached_implementation_data_of_proxy, :timer.seconds(20))
-      Application.put_env(:explorer, :implementation_data_fetching_timeout, :timer.seconds(20))
+      proxy =
+        :explorer
+        |> Application.get_env(:proxy)
+        |> Keyword.replace(:fallback_cached_implementation_data_ttl, :timer.seconds(20))
+        |> Keyword.replace(:implementation_data_fetching_timeout, :timer.seconds(20))
+
+      Application.put_env(:explorer, :proxy, proxy)
 
       refute smart_contract.implementation_fetched_at
 
@@ -71,7 +98,12 @@ defmodule Explorer.Chain.SmartContractTest do
       assert_implementation_never_fetched(smart_contract.address_hash)
 
       # extract proxy info from db
-      Application.put_env(:explorer, :fallback_ttl_cached_implementation_data_of_proxy, 0)
+      proxy =
+        :explorer
+        |> Application.get_env(:proxy)
+        |> Keyword.replace(:fallback_cached_implementation_data_ttl, 0)
+
+      Application.put_env(:explorer, :proxy, proxy)
 
       string_implementation_address_hash = to_string(implementation_smart_contract.address_hash)
 
@@ -116,7 +148,12 @@ defmodule Explorer.Chain.SmartContractTest do
 
       contract_1 = SmartContract.address_hash_to_smart_contract(smart_contract.address_hash)
 
-      Application.put_env(:explorer, :fallback_ttl_cached_implementation_data_of_proxy, :timer.seconds(20))
+      proxy =
+        :explorer
+        |> Application.get_env(:proxy)
+        |> Keyword.replace(:fallback_cached_implementation_data_ttl, :timer.seconds(20))
+
+      Application.put_env(:explorer, :proxy, proxy)
 
       assert {^string_implementation_address_hash, "proxy"} =
                SmartContract.get_implementation_address_hash(smart_contract)
@@ -126,7 +163,12 @@ defmodule Explorer.Chain.SmartContractTest do
       assert contract_1.implementation_fetched_at == contract_2.implementation_fetched_at &&
                contract_1.updated_at == contract_2.updated_at
 
-      Application.put_env(:explorer, :fallback_ttl_cached_implementation_data_of_proxy, 0)
+      proxy =
+        :explorer
+        |> Application.get_env(:proxy)
+        |> Keyword.replace(:fallback_cached_implementation_data_ttl, 0)
+
+      Application.put_env(:explorer, :proxy, proxy)
       get_eip1967_implementation_zero_addresses()
 
       assert {^string_implementation_address_hash, "proxy"} =
@@ -147,8 +189,13 @@ defmodule Explorer.Chain.SmartContractTest do
       twin = SmartContract.address_hash_to_smart_contract(another_address.hash)
       implementation_smart_contract = insert(:smart_contract, name: "proxy")
 
-      Application.put_env(:explorer, :fallback_ttl_cached_implementation_data_of_proxy, :timer.seconds(20))
-      Application.put_env(:explorer, :implementation_data_fetching_timeout, :timer.seconds(20))
+      proxy =
+        :explorer
+        |> Application.get_env(:proxy)
+        |> Keyword.replace(:fallback_cached_implementation_data_ttl, :timer.seconds(20))
+        |> Keyword.replace(:implementation_data_fetching_timeout, :timer.seconds(20))
+
+      Application.put_env(:explorer, :proxy, proxy)
 
       # fetch nil implementation
       get_eip1967_implementation_zero_addresses()
@@ -184,8 +231,13 @@ defmodule Explorer.Chain.SmartContractTest do
 
       implementation_smart_contract = insert(:smart_contract, name: "proxy")
 
-      Application.put_env(:explorer, :fallback_ttl_cached_implementation_data_of_proxy, :timer.seconds(20))
-      Application.put_env(:explorer, :implementation_data_fetching_timeout, :timer.seconds(20))
+      proxy =
+        :explorer
+        |> Application.get_env(:proxy)
+        |> Keyword.replace(:fallback_cached_implementation_data_ttl, :timer.seconds(20))
+        |> Keyword.replace(:implementation_data_fetching_timeout, :timer.seconds(20))
+
+      Application.put_env(:explorer, :proxy, proxy)
 
       # fetch nil implementation
       get_eip1967_implementation_zero_addresses()
@@ -231,8 +283,13 @@ defmodule Explorer.Chain.SmartContractTest do
 
       implementation_smart_contract = insert(:smart_contract, name: "proxy")
 
-      Application.put_env(:explorer, :fallback_ttl_cached_implementation_data_of_proxy, :timer.seconds(20))
-      Application.put_env(:explorer, :implementation_data_fetching_timeout, :timer.seconds(20))
+      proxy =
+        :explorer
+        |> Application.get_env(:proxy)
+        |> Keyword.replace(:fallback_cached_implementation_data_ttl, :timer.seconds(20))
+        |> Keyword.replace(:implementation_data_fetching_timeout, :timer.seconds(20))
+
+      Application.put_env(:explorer, :proxy, proxy)
 
       # fetch nil implementation
       get_eip1967_implementation_zero_addresses()
diff --git a/config/runtime.exs b/config/runtime.exs
index 5b7b09717066..c81ceeafbbc4 100644
--- a/config/runtime.exs
+++ b/config/runtime.exs
@@ -203,15 +203,18 @@ config :explorer,
       do: Explorer.Chain.Events.DBSender,
       else: Explorer.Chain.Events.SimpleSender
     ),
-  enable_caching_implementation_data_of_proxy: true,
-  avg_block_time_as_ttl_cached_implementation_data_of_proxy: true,
-  fallback_ttl_cached_implementation_data_of_proxy: :timer.seconds(4),
-  implementation_data_fetching_timeout: :timer.seconds(2),
   restricted_list: System.get_env("RESTRICTED_LIST"),
   restricted_list_key: System.get_env("RESTRICTED_LIST_KEY"),
   checksum_function: checksum_function && String.to_atom(checksum_function),
   elasticity_multiplier: ConfigHelper.parse_integer_env_var("EIP_1559_ELASTICITY_MULTIPLIER", 2)
 
+config :explorer, :proxy,
+  caching_implementation_data_enabled: true,
+  implementation_data_ttl_via_avg_block_time:
+    ConfigHelper.parse_bool_env_var("CONTRACT_PROXY_IMPLEMENTATION_TTL_VIA_AVG_BLOCK_TIME", "true"),
+  fallback_cached_implementation_data_ttl: :timer.seconds(4),
+  implementation_data_fetching_timeout: :timer.seconds(2)
+
 config :explorer, Explorer.Chain.Events.Listener,
   enabled:
     if(disable_webapp? && disable_indexer?,

From 9efd87fece409c39d57f918bf95690cf9590fea2 Mon Sep 17 00:00:00 2001
From: Andrijan Ostrun <andrijan.ostrun@gmail.com>
Date: Mon, 15 Jan 2024 17:10:27 +0100
Subject: [PATCH 895/909] Increased shared memory for Postgres containers

---
 docker-compose/services/db.yml    | 1 +
 docker-compose/services/stats.yml | 1 +
 2 files changed, 2 insertions(+)

diff --git a/docker-compose/services/db.yml b/docker-compose/services/db.yml
index b7d036e966b2..b58aba6e0e35 100644
--- a/docker-compose/services/db.yml
+++ b/docker-compose/services/db.yml
@@ -17,6 +17,7 @@ services:
         condition: service_completed_successfully
     image: postgres:14
     user: 2000:2000
+    shm_size: 256m
     restart: always
     container_name: 'db'
     command: postgres -c 'max_connections=200' -c 'client_connection_check_interval=60000'
diff --git a/docker-compose/services/stats.yml b/docker-compose/services/stats.yml
index 0ba073432d33..85bee46b9909 100644
--- a/docker-compose/services/stats.yml
+++ b/docker-compose/services/stats.yml
@@ -17,6 +17,7 @@ services:
         condition: service_completed_successfully
     image: postgres:14
     user: 2000:2000
+    shm_size: 256m
     restart: always
     container_name: 'stats-postgres'
     command: postgres -c 'max_connections=200'

From 2b1dbc41b773a5503478052c91f52e8d09022ea4 Mon Sep 17 00:00:00 2001
From: Andrijan Ostrun <andrijan.ostrun@gmail.com>
Date: Mon, 15 Jan 2024 17:24:24 +0100
Subject: [PATCH 896/909] Update changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e9fc17df2c40..084a3cb89075 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,7 @@
 - [#9155](https://github.com/blockscout/blockscout/pull/9155) - Allow bypassing avg block time in proxy implementation re-fetch ttl calculation
 - [#9072](https://github.com/blockscout/blockscout/pull/9072) - Add tracing by block logic for geth
 - [#9056](https://github.com/blockscout/blockscout/pull/9056) - Noves.fi API proxy
+- [#9158](https://github.com/blockscout/blockscout/pull/9158) - Increase shared memory for PostgreSQL containers
 
 ### Fixes
 

From 5713e73f1eec3cf7f4011a0288527e1f767e31b9 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 15 Jan 2024 18:29:04 +0000
Subject: [PATCH 897/909] Bump copy-webpack-plugin in
 /apps/block_scout_web/assets

Bumps [copy-webpack-plugin](https://github.com/webpack-contrib/copy-webpack-plugin) from 11.0.0 to 12.0.1.
- [Release notes](https://github.com/webpack-contrib/copy-webpack-plugin/releases)
- [Changelog](https://github.com/webpack-contrib/copy-webpack-plugin/blob/master/CHANGELOG.md)
- [Commits](https://github.com/webpack-contrib/copy-webpack-plugin/compare/v11.0.0...v12.0.1)

---
updated-dependencies:
- dependency-name: copy-webpack-plugin
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 apps/block_scout_web/assets/package-lock.json | 205 ++++++++++--------
 apps/block_scout_web/assets/package.json      |   2 +-
 2 files changed, 121 insertions(+), 86 deletions(-)

diff --git a/apps/block_scout_web/assets/package-lock.json b/apps/block_scout_web/assets/package-lock.json
index 1ad62aa64380..e2336a758878 100644
--- a/apps/block_scout_web/assets/package-lock.json
+++ b/apps/block_scout_web/assets/package-lock.json
@@ -75,7 +75,7 @@
         "@babel/preset-env": "^7.23.7",
         "autoprefixer": "^10.4.16",
         "babel-loader": "^9.1.3",
-        "copy-webpack-plugin": "^11.0.0",
+        "copy-webpack-plugin": "^12.0.1",
         "css-loader": "^6.8.1",
         "css-minimizer-webpack-plugin": "^5.0.1",
         "eslint": "^8.56.0",
@@ -3468,6 +3468,18 @@
         "url": "https://github.com/sindresorhus/is?sponsor=1"
       }
     },
+    "node_modules/@sindresorhus/merge-streams": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/@sindresorhus/merge-streams/-/merge-streams-1.0.0.tgz",
+      "integrity": "sha512-rUV5WyJrJLoloD4NDN1V1+LDMDWOa4OTsT4yYJwQNpTU6FWxkxHpL7eu4w+DmiH8x/EAM1otkPE1+LaspIbplw==",
+      "dev": true,
+      "engines": {
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "node_modules/@sinonjs/commons": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-2.0.0.tgz",
@@ -5914,20 +5926,20 @@
       }
     },
     "node_modules/copy-webpack-plugin": {
-      "version": "11.0.0",
-      "resolved": "https://registry.npmjs.org/copy-webpack-plugin/-/copy-webpack-plugin-11.0.0.tgz",
-      "integrity": "sha512-fX2MWpamkW0hZxMEg0+mYnA40LTosOSa5TqZ9GYIBzyJa9C3QUaMPSE2xAi/buNr8u89SfD9wHSQVBzrRa/SOQ==",
+      "version": "12.0.1",
+      "resolved": "https://registry.npmjs.org/copy-webpack-plugin/-/copy-webpack-plugin-12.0.1.tgz",
+      "integrity": "sha512-dhMfjJMYKDmmbG6Yn2pRSs1g8FgeQRtbE/JM6VAM9Xouk3KO1UVrwlLHLXxaI5F+o9WgnRfhFZzY9eV34O2gZQ==",
       "dev": true,
       "dependencies": {
-        "fast-glob": "^3.2.11",
+        "fast-glob": "^3.3.2",
         "glob-parent": "^6.0.1",
-        "globby": "^13.1.1",
+        "globby": "^14.0.0",
         "normalize-path": "^3.0.0",
-        "schema-utils": "^4.0.0",
-        "serialize-javascript": "^6.0.0"
+        "schema-utils": "^4.2.0",
+        "serialize-javascript": "^6.0.2"
       },
       "engines": {
-        "node": ">= 14.15.0"
+        "node": ">= 18.12.0"
       },
       "funding": {
         "type": "opencollective",
@@ -6812,18 +6824,6 @@
       "resolved": "https://registry.npmjs.org/dijkstrajs/-/dijkstrajs-1.0.2.tgz",
       "integrity": "sha512-QV6PMaHTCNmKSeP6QoXhVTw9snc9VD8MulTT0Bd99Pacp4SS1cjcrYPgBPmibqKVtMJJfqC6XvOXgPMEEPH/fg=="
     },
-    "node_modules/dir-glob": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz",
-      "integrity": "sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==",
-      "dev": true,
-      "dependencies": {
-        "path-type": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/doctrine": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz",
@@ -8718,9 +8718,9 @@
       "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q=="
     },
     "node_modules/fast-glob": {
-      "version": "3.2.11",
-      "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.11.tgz",
-      "integrity": "sha512-xrO3+1bxSo3ZVHAnqzyuewYT6aMFHRAd4Kcs92MAonjwQZLsK9d0SF1IyQ3k5PoirxTW0Oe/RqFgMQ6TcNE5Ew==",
+      "version": "3.3.2",
+      "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.2.tgz",
+      "integrity": "sha512-oX2ruAFQwf/Orj8m737Y5adxDQO0LAB7/S5MnxCdTNDd4p6BsyIVsv9JQsATbTSq8KHRpLwIHbVlUNatxd+1Ow==",
       "dev": true,
       "dependencies": {
         "@nodelib/fs.stat": "^2.0.2",
@@ -9228,28 +9228,29 @@
       }
     },
     "node_modules/globby": {
-      "version": "13.1.2",
-      "resolved": "https://registry.npmjs.org/globby/-/globby-13.1.2.tgz",
-      "integrity": "sha512-LKSDZXToac40u8Q1PQtZihbNdTYSNMuWe+K5l+oa6KgDzSvVrHXlJy40hUP522RjAIoNLJYBJi7ow+rbFpIhHQ==",
+      "version": "14.0.0",
+      "resolved": "https://registry.npmjs.org/globby/-/globby-14.0.0.tgz",
+      "integrity": "sha512-/1WM/LNHRAOH9lZta77uGbq0dAEQM+XjNesWwhlERDVenqothRbnzTrL3/LrIoEPPjeUHC3vrS6TwoyxeHs7MQ==",
       "dev": true,
       "dependencies": {
-        "dir-glob": "^3.0.1",
-        "fast-glob": "^3.2.11",
-        "ignore": "^5.2.0",
-        "merge2": "^1.4.1",
-        "slash": "^4.0.0"
+        "@sindresorhus/merge-streams": "^1.0.0",
+        "fast-glob": "^3.3.2",
+        "ignore": "^5.2.4",
+        "path-type": "^5.0.0",
+        "slash": "^5.1.0",
+        "unicorn-magic": "^0.1.0"
       },
       "engines": {
-        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+        "node": ">=18"
       },
       "funding": {
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/globby/node_modules/slash": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/slash/-/slash-4.0.0.tgz",
-      "integrity": "sha512-3dOsAHXXUkQTpOYcoAxLIorMTp4gIQr5IW3iVb7A7lFIp0VHhnynm9izx6TssdrIcVIESAlVjtnO2K8bg+Coew==",
+    "node_modules/globby/node_modules/path-type": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/path-type/-/path-type-5.0.0.tgz",
+      "integrity": "sha512-5HviZNaZcfqP95rwpv+1HDgUamezbqdSYTyzjTvwtJSnIH+3vnbmWsItli8OFEndS984VT55M3jduxZbX351gg==",
       "dev": true,
       "engines": {
         "node": ">=12"
@@ -9258,6 +9259,18 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "node_modules/globby/node_modules/slash": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/slash/-/slash-5.1.0.tgz",
+      "integrity": "sha512-ZA6oR3T/pEyuqwMgAKT0/hAv8oAXckzbkmR0UkUosQ+Mc4RxGoJkRmwHgHufaenlyAgE1Mxgpdcrf75y6XcnDg==",
+      "dev": true,
+      "engines": {
+        "node": ">=14.16"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "node_modules/good-listener": {
       "version": "1.2.2",
       "resolved": "https://registry.npmjs.org/good-listener/-/good-listener-1.2.2.tgz",
@@ -9640,9 +9653,9 @@
       ]
     },
     "node_modules/ignore": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.0.tgz",
-      "integrity": "sha512-CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ==",
+      "version": "5.3.0",
+      "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.0.tgz",
+      "integrity": "sha512-g7dmpshy+gD7mh88OC9NwSGTKoc3kyLAZQRU1mt53Aw/vnvfXnbC+F/7F7QoYVKbV+KNvJx8wArewKy1vXMtlg==",
       "dev": true,
       "engines": {
         "node": ">= 4"
@@ -15268,9 +15281,9 @@
       }
     },
     "node_modules/schema-utils": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.1.0.tgz",
-      "integrity": "sha512-Jw+GZVbP5IggB2WAn6UHI02LBwGmsIeYN/lNbSMZyDziQ7jmtAUrqKqDja+W89YHVs+KL/3IkIMltAklqB1vAw==",
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.2.0.tgz",
+      "integrity": "sha512-L0jRsrPpjdckP3oPug3/VxNKt2trR8TcabrM6FOAAlvC/9Phcmm+cuAgTlxBqdBR1WJx7Naj9WHw+aOmheSVbw==",
       "dev": true,
       "dependencies": {
         "@types/json-schema": "^7.0.9",
@@ -15407,9 +15420,9 @@
       "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA=="
     },
     "node_modules/serialize-javascript": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.1.tgz",
-      "integrity": "sha512-owoXEFjWRllis8/M1Q+Cw5k8ZH40e3zhp/ovX+Xr/vi1qj6QesbyXXViFbpNvWvPNAD62SutwEXavefrLJWj7w==",
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.2.tgz",
+      "integrity": "sha512-Saa1xPByTTq2gdeFZYLLo+RFE35NHZkAbqZeWNd3BpzppeVisAqpDjcp8dyf6uIvEqJRd46jemmyA4iFIeVk8g==",
       "dev": true,
       "dependencies": {
         "randombytes": "^2.1.0"
@@ -16587,6 +16600,18 @@
         "node": ">=4"
       }
     },
+    "node_modules/unicorn-magic": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/unicorn-magic/-/unicorn-magic-0.1.0.tgz",
+      "integrity": "sha512-lRfVq8fE8gz6QMBuDM6a+LO3IAzTi05H6gCVaUpir2E1Rwpo4ZUog45KpNXKC/Mn3Yb9UDuHumeFTo9iV/D9FQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "node_modules/universalify": {
       "version": "0.1.2",
       "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz",
@@ -20233,6 +20258,12 @@
       "resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-4.6.0.tgz",
       "integrity": "sha512-t09vSN3MdfsyCHoFcTRCH/iUtG7OJ0CsjzB8cjAmKc/va/kIgeDI/TxsigdncE/4be734m0cvIYwNaV4i2XqAw=="
     },
+    "@sindresorhus/merge-streams": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/@sindresorhus/merge-streams/-/merge-streams-1.0.0.tgz",
+      "integrity": "sha512-rUV5WyJrJLoloD4NDN1V1+LDMDWOa4OTsT4yYJwQNpTU6FWxkxHpL7eu4w+DmiH8x/EAM1otkPE1+LaspIbplw==",
+      "dev": true
+    },
     "@sinonjs/commons": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-2.0.0.tgz",
@@ -22212,17 +22243,17 @@
       }
     },
     "copy-webpack-plugin": {
-      "version": "11.0.0",
-      "resolved": "https://registry.npmjs.org/copy-webpack-plugin/-/copy-webpack-plugin-11.0.0.tgz",
-      "integrity": "sha512-fX2MWpamkW0hZxMEg0+mYnA40LTosOSa5TqZ9GYIBzyJa9C3QUaMPSE2xAi/buNr8u89SfD9wHSQVBzrRa/SOQ==",
+      "version": "12.0.1",
+      "resolved": "https://registry.npmjs.org/copy-webpack-plugin/-/copy-webpack-plugin-12.0.1.tgz",
+      "integrity": "sha512-dhMfjJMYKDmmbG6Yn2pRSs1g8FgeQRtbE/JM6VAM9Xouk3KO1UVrwlLHLXxaI5F+o9WgnRfhFZzY9eV34O2gZQ==",
       "dev": true,
       "requires": {
-        "fast-glob": "^3.2.11",
+        "fast-glob": "^3.3.2",
         "glob-parent": "^6.0.1",
-        "globby": "^13.1.1",
+        "globby": "^14.0.0",
         "normalize-path": "^3.0.0",
-        "schema-utils": "^4.0.0",
-        "serialize-javascript": "^6.0.0"
+        "schema-utils": "^4.2.0",
+        "serialize-javascript": "^6.0.2"
       }
     },
     "core-js": {
@@ -22861,15 +22892,6 @@
       "resolved": "https://registry.npmjs.org/dijkstrajs/-/dijkstrajs-1.0.2.tgz",
       "integrity": "sha512-QV6PMaHTCNmKSeP6QoXhVTw9snc9VD8MulTT0Bd99Pacp4SS1cjcrYPgBPmibqKVtMJJfqC6XvOXgPMEEPH/fg=="
     },
-    "dir-glob": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz",
-      "integrity": "sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==",
-      "dev": true,
-      "requires": {
-        "path-type": "^4.0.0"
-      }
-    },
     "doctrine": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz",
@@ -24413,9 +24435,9 @@
       "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q=="
     },
     "fast-glob": {
-      "version": "3.2.11",
-      "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.11.tgz",
-      "integrity": "sha512-xrO3+1bxSo3ZVHAnqzyuewYT6aMFHRAd4Kcs92MAonjwQZLsK9d0SF1IyQ3k5PoirxTW0Oe/RqFgMQ6TcNE5Ew==",
+      "version": "3.3.2",
+      "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.2.tgz",
+      "integrity": "sha512-oX2ruAFQwf/Orj8m737Y5adxDQO0LAB7/S5MnxCdTNDd4p6BsyIVsv9JQsATbTSq8KHRpLwIHbVlUNatxd+1Ow==",
       "dev": true,
       "requires": {
         "@nodelib/fs.stat": "^2.0.2",
@@ -24801,22 +24823,29 @@
       }
     },
     "globby": {
-      "version": "13.1.2",
-      "resolved": "https://registry.npmjs.org/globby/-/globby-13.1.2.tgz",
-      "integrity": "sha512-LKSDZXToac40u8Q1PQtZihbNdTYSNMuWe+K5l+oa6KgDzSvVrHXlJy40hUP522RjAIoNLJYBJi7ow+rbFpIhHQ==",
+      "version": "14.0.0",
+      "resolved": "https://registry.npmjs.org/globby/-/globby-14.0.0.tgz",
+      "integrity": "sha512-/1WM/LNHRAOH9lZta77uGbq0dAEQM+XjNesWwhlERDVenqothRbnzTrL3/LrIoEPPjeUHC3vrS6TwoyxeHs7MQ==",
       "dev": true,
       "requires": {
-        "dir-glob": "^3.0.1",
-        "fast-glob": "^3.2.11",
-        "ignore": "^5.2.0",
-        "merge2": "^1.4.1",
-        "slash": "^4.0.0"
+        "@sindresorhus/merge-streams": "^1.0.0",
+        "fast-glob": "^3.3.2",
+        "ignore": "^5.2.4",
+        "path-type": "^5.0.0",
+        "slash": "^5.1.0",
+        "unicorn-magic": "^0.1.0"
       },
       "dependencies": {
+        "path-type": {
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/path-type/-/path-type-5.0.0.tgz",
+          "integrity": "sha512-5HviZNaZcfqP95rwpv+1HDgUamezbqdSYTyzjTvwtJSnIH+3vnbmWsItli8OFEndS984VT55M3jduxZbX351gg==",
+          "dev": true
+        },
         "slash": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/slash/-/slash-4.0.0.tgz",
-          "integrity": "sha512-3dOsAHXXUkQTpOYcoAxLIorMTp4gIQr5IW3iVb7A7lFIp0VHhnynm9izx6TssdrIcVIESAlVjtnO2K8bg+Coew==",
+          "version": "5.1.0",
+          "resolved": "https://registry.npmjs.org/slash/-/slash-5.1.0.tgz",
+          "integrity": "sha512-ZA6oR3T/pEyuqwMgAKT0/hAv8oAXckzbkmR0UkUosQ+Mc4RxGoJkRmwHgHufaenlyAgE1Mxgpdcrf75y6XcnDg==",
           "dev": true
         }
       }
@@ -25094,9 +25123,9 @@
       "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA=="
     },
     "ignore": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.0.tgz",
-      "integrity": "sha512-CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ==",
+      "version": "5.3.0",
+      "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.0.tgz",
+      "integrity": "sha512-g7dmpshy+gD7mh88OC9NwSGTKoc3kyLAZQRU1mt53Aw/vnvfXnbC+F/7F7QoYVKbV+KNvJx8wArewKy1vXMtlg==",
       "dev": true
     },
     "immediate": {
@@ -29281,9 +29310,9 @@
       }
     },
     "schema-utils": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.1.0.tgz",
-      "integrity": "sha512-Jw+GZVbP5IggB2WAn6UHI02LBwGmsIeYN/lNbSMZyDziQ7jmtAUrqKqDja+W89YHVs+KL/3IkIMltAklqB1vAw==",
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.2.0.tgz",
+      "integrity": "sha512-L0jRsrPpjdckP3oPug3/VxNKt2trR8TcabrM6FOAAlvC/9Phcmm+cuAgTlxBqdBR1WJx7Naj9WHw+aOmheSVbw==",
       "dev": true,
       "requires": {
         "@types/json-schema": "^7.0.9",
@@ -29399,9 +29428,9 @@
       }
     },
     "serialize-javascript": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.1.tgz",
-      "integrity": "sha512-owoXEFjWRllis8/M1Q+Cw5k8ZH40e3zhp/ovX+Xr/vi1qj6QesbyXXViFbpNvWvPNAD62SutwEXavefrLJWj7w==",
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.2.tgz",
+      "integrity": "sha512-Saa1xPByTTq2gdeFZYLLo+RFE35NHZkAbqZeWNd3BpzppeVisAqpDjcp8dyf6uIvEqJRd46jemmyA4iFIeVk8g==",
       "dev": true,
       "requires": {
         "randombytes": "^2.1.0"
@@ -30258,6 +30287,12 @@
       "integrity": "sha512-6t3foTQI9qne+OZoVQB/8x8rk2k1eVy1gRXhV3oFQ5T6R1dqQ1xtin3XqSlx3+ATBkliTaR/hHyJBm+LVPNM8w==",
       "dev": true
     },
+    "unicorn-magic": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/unicorn-magic/-/unicorn-magic-0.1.0.tgz",
+      "integrity": "sha512-lRfVq8fE8gz6QMBuDM6a+LO3IAzTi05H6gCVaUpir2E1Rwpo4ZUog45KpNXKC/Mn3Yb9UDuHumeFTo9iV/D9FQ==",
+      "dev": true
+    },
     "universalify": {
       "version": "0.1.2",
       "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz",
diff --git a/apps/block_scout_web/assets/package.json b/apps/block_scout_web/assets/package.json
index e47b66d1bc48..567bb8f6ddf3 100644
--- a/apps/block_scout_web/assets/package.json
+++ b/apps/block_scout_web/assets/package.json
@@ -87,7 +87,7 @@
     "@babel/preset-env": "^7.23.7",
     "autoprefixer": "^10.4.16",
     "babel-loader": "^9.1.3",
-    "copy-webpack-plugin": "^11.0.0",
+    "copy-webpack-plugin": "^12.0.1",
     "css-loader": "^6.8.1",
     "css-minimizer-webpack-plugin": "^5.0.1",
     "eslint": "^8.56.0",

From e2e6c7a1c4a72e984ffbe0d2d687a4ec69c96ba2 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 15 Jan 2024 18:29:19 +0000
Subject: [PATCH 898/909] Bump sass-loader from 13.3.3 to 14.0.0 in
 /apps/block_scout_web/assets

Bumps [sass-loader](https://github.com/webpack-contrib/sass-loader) from 13.3.3 to 14.0.0.
- [Release notes](https://github.com/webpack-contrib/sass-loader/releases)
- [Changelog](https://github.com/webpack-contrib/sass-loader/blob/master/CHANGELOG.md)
- [Commits](https://github.com/webpack-contrib/sass-loader/compare/v13.3.3...v14.0.0)

---
updated-dependencies:
- dependency-name: sass-loader
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 apps/block_scout_web/assets/package-lock.json | 20 ++++++++-----------
 apps/block_scout_web/assets/package.json      |  2 +-
 2 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/apps/block_scout_web/assets/package-lock.json b/apps/block_scout_web/assets/package-lock.json
index 1ad62aa64380..bb44fb32c66c 100644
--- a/apps/block_scout_web/assets/package-lock.json
+++ b/apps/block_scout_web/assets/package-lock.json
@@ -90,7 +90,7 @@
         "postcss": "^8.4.33",
         "postcss-loader": "^7.3.4",
         "sass": "^1.69.7",
-        "sass-loader": "^13.3.3",
+        "sass-loader": "^14.0.0",
         "style-loader": "^3.3.3",
         "webpack": "^5.89.0",
         "webpack-cli": "^5.1.4"
@@ -15210,31 +15210,27 @@
       }
     },
     "node_modules/sass-loader": {
-      "version": "13.3.3",
-      "resolved": "https://registry.npmjs.org/sass-loader/-/sass-loader-13.3.3.tgz",
-      "integrity": "sha512-mt5YN2F1MOZr3d/wBRcZxeFgwgkH44wVc2zohO2YF6JiOMkiXe4BYRZpSu2sO1g71mo/j16txzUhsKZlqjVGzA==",
+      "version": "14.0.0",
+      "resolved": "https://registry.npmjs.org/sass-loader/-/sass-loader-14.0.0.tgz",
+      "integrity": "sha512-oceP9wWbep/yRJ2+sMbCzk0UsXsDzdNis+N8nu9i5GwPXjy6v3DNB6TqfJLSpPO9k4+B8x8p/CEgjA9ZLkoLug==",
       "dev": true,
       "dependencies": {
         "neo-async": "^2.6.2"
       },
       "engines": {
-        "node": ">= 14.15.0"
+        "node": ">= 18.12.0"
       },
       "funding": {
         "type": "opencollective",
         "url": "https://opencollective.com/webpack"
       },
       "peerDependencies": {
-        "fibers": ">= 3.1.0",
         "node-sass": "^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0 || ^9.0.0",
         "sass": "^1.3.0",
         "sass-embedded": "*",
         "webpack": "^5.0.0"
       },
       "peerDependenciesMeta": {
-        "fibers": {
-          "optional": true
-        },
         "node-sass": {
           "optional": true
         },
@@ -29254,9 +29250,9 @@
       }
     },
     "sass-loader": {
-      "version": "13.3.3",
-      "resolved": "https://registry.npmjs.org/sass-loader/-/sass-loader-13.3.3.tgz",
-      "integrity": "sha512-mt5YN2F1MOZr3d/wBRcZxeFgwgkH44wVc2zohO2YF6JiOMkiXe4BYRZpSu2sO1g71mo/j16txzUhsKZlqjVGzA==",
+      "version": "14.0.0",
+      "resolved": "https://registry.npmjs.org/sass-loader/-/sass-loader-14.0.0.tgz",
+      "integrity": "sha512-oceP9wWbep/yRJ2+sMbCzk0UsXsDzdNis+N8nu9i5GwPXjy6v3DNB6TqfJLSpPO9k4+B8x8p/CEgjA9ZLkoLug==",
       "dev": true,
       "requires": {
         "neo-async": "^2.6.2"
diff --git a/apps/block_scout_web/assets/package.json b/apps/block_scout_web/assets/package.json
index e47b66d1bc48..e2046bf9a1a9 100644
--- a/apps/block_scout_web/assets/package.json
+++ b/apps/block_scout_web/assets/package.json
@@ -102,7 +102,7 @@
     "postcss": "^8.4.33",
     "postcss-loader": "^7.3.4",
     "sass": "^1.69.7",
-    "sass-loader": "^13.3.3",
+    "sass-loader": "^14.0.0",
     "style-loader": "^3.3.3",
     "webpack": "^5.89.0",
     "webpack-cli": "^5.1.4"

From e0d87d6d4a428c762e83bcbea1f6321d141ccde7 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 15 Jan 2024 18:29:53 +0000
Subject: [PATCH 899/909] Bump mini-css-extract-plugin in
 /apps/block_scout_web/assets

Bumps [mini-css-extract-plugin](https://github.com/webpack-contrib/mini-css-extract-plugin) from 2.7.6 to 2.7.7.
- [Release notes](https://github.com/webpack-contrib/mini-css-extract-plugin/releases)
- [Changelog](https://github.com/webpack-contrib/mini-css-extract-plugin/blob/master/CHANGELOG.md)
- [Commits](https://github.com/webpack-contrib/mini-css-extract-plugin/compare/v2.7.6...v2.7.7)

---
updated-dependencies:
- dependency-name: mini-css-extract-plugin
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 apps/block_scout_web/assets/package-lock.json | 14 +++++++-------
 apps/block_scout_web/assets/package.json      |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/apps/block_scout_web/assets/package-lock.json b/apps/block_scout_web/assets/package-lock.json
index 1ad62aa64380..5b6b15b22845 100644
--- a/apps/block_scout_web/assets/package-lock.json
+++ b/apps/block_scout_web/assets/package-lock.json
@@ -86,7 +86,7 @@
         "file-loader": "^6.2.0",
         "jest": "^29.7.0",
         "jest-environment-jsdom": "^29.7.0",
-        "mini-css-extract-plugin": "^2.7.6",
+        "mini-css-extract-plugin": "^2.7.7",
         "postcss": "^8.4.33",
         "postcss-loader": "^7.3.4",
         "sass": "^1.69.7",
@@ -12826,9 +12826,9 @@
       }
     },
     "node_modules/mini-css-extract-plugin": {
-      "version": "2.7.6",
-      "resolved": "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-2.7.6.tgz",
-      "integrity": "sha512-Qk7HcgaPkGG6eD77mLvZS1nmxlao3j+9PkrT9Uc7HAE1id3F41+DdBRYRYkbyfNRGzm8/YWtzhw7nVPmwhqTQw==",
+      "version": "2.7.7",
+      "resolved": "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-2.7.7.tgz",
+      "integrity": "sha512-+0n11YGyRavUR3IlaOzJ0/4Il1avMvJ1VJfhWfCn24ITQXhRr1gghbhhrda6tgtNcpZaWKdSuwKq20Jb7fnlyw==",
       "dev": true,
       "dependencies": {
         "schema-utils": "^4.0.0"
@@ -27542,9 +27542,9 @@
       }
     },
     "mini-css-extract-plugin": {
-      "version": "2.7.6",
-      "resolved": "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-2.7.6.tgz",
-      "integrity": "sha512-Qk7HcgaPkGG6eD77mLvZS1nmxlao3j+9PkrT9Uc7HAE1id3F41+DdBRYRYkbyfNRGzm8/YWtzhw7nVPmwhqTQw==",
+      "version": "2.7.7",
+      "resolved": "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-2.7.7.tgz",
+      "integrity": "sha512-+0n11YGyRavUR3IlaOzJ0/4Il1avMvJ1VJfhWfCn24ITQXhRr1gghbhhrda6tgtNcpZaWKdSuwKq20Jb7fnlyw==",
       "dev": true,
       "requires": {
         "schema-utils": "^4.0.0"
diff --git a/apps/block_scout_web/assets/package.json b/apps/block_scout_web/assets/package.json
index e47b66d1bc48..69507387c4b4 100644
--- a/apps/block_scout_web/assets/package.json
+++ b/apps/block_scout_web/assets/package.json
@@ -98,7 +98,7 @@
     "file-loader": "^6.2.0",
     "jest": "^29.7.0",
     "jest-environment-jsdom": "^29.7.0",
-    "mini-css-extract-plugin": "^2.7.6",
+    "mini-css-extract-plugin": "^2.7.7",
     "postcss": "^8.4.33",
     "postcss-loader": "^7.3.4",
     "sass": "^1.69.7",

From 898f316033432e25d9c3aaab968efd17dcfb45a0 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 15 Jan 2024 18:30:36 +0000
Subject: [PATCH 900/909] Bump sweetalert2 from 11.10.2 to 11.10.3 in
 /apps/block_scout_web/assets

Bumps [sweetalert2](https://github.com/sweetalert2/sweetalert2) from 11.10.2 to 11.10.3.
- [Release notes](https://github.com/sweetalert2/sweetalert2/releases)
- [Changelog](https://github.com/sweetalert2/sweetalert2/blob/main/CHANGELOG.md)
- [Commits](https://github.com/sweetalert2/sweetalert2/compare/v11.10.2...v11.10.3)

---
updated-dependencies:
- dependency-name: sweetalert2
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 apps/block_scout_web/assets/package-lock.json | 14 +++++++-------
 apps/block_scout_web/assets/package.json      |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/apps/block_scout_web/assets/package-lock.json b/apps/block_scout_web/assets/package-lock.json
index 1ad62aa64380..6ff7268946cf 100644
--- a/apps/block_scout_web/assets/package-lock.json
+++ b/apps/block_scout_web/assets/package-lock.json
@@ -61,7 +61,7 @@
         "redux": "^5.0.1",
         "stream-browserify": "^3.0.0",
         "stream-http": "^3.1.1",
-        "sweetalert2": "^11.10.2",
+        "sweetalert2": "^11.10.3",
         "urijs": "^1.19.11",
         "url": "^0.11.3",
         "util": "^0.12.5",
@@ -16092,9 +16092,9 @@
       }
     },
     "node_modules/sweetalert2": {
-      "version": "11.10.2",
-      "resolved": "https://registry.npmjs.org/sweetalert2/-/sweetalert2-11.10.2.tgz",
-      "integrity": "sha512-BYlIxGw6OF9Rw2z1wlnh1U+fvHHkvtg4BGyimV9nZxQRGvCBfx9uonxgwuYpJuYqCtM+2W1KOm8iMIEb/2v7Hg==",
+      "version": "11.10.3",
+      "resolved": "https://registry.npmjs.org/sweetalert2/-/sweetalert2-11.10.3.tgz",
+      "integrity": "sha512-mZYtQR7v+khyEruq0SsVUa6XIdI9Aue8s2XAIpAwdlLN1T0w7mxKEjyubiBZ3/bLbHC/wGS4wNABvXWubCizvA==",
       "funding": {
         "type": "individual",
         "url": "https://github.com/sponsors/limonte"
@@ -29895,9 +29895,9 @@
       }
     },
     "sweetalert2": {
-      "version": "11.10.2",
-      "resolved": "https://registry.npmjs.org/sweetalert2/-/sweetalert2-11.10.2.tgz",
-      "integrity": "sha512-BYlIxGw6OF9Rw2z1wlnh1U+fvHHkvtg4BGyimV9nZxQRGvCBfx9uonxgwuYpJuYqCtM+2W1KOm8iMIEb/2v7Hg=="
+      "version": "11.10.3",
+      "resolved": "https://registry.npmjs.org/sweetalert2/-/sweetalert2-11.10.3.tgz",
+      "integrity": "sha512-mZYtQR7v+khyEruq0SsVUa6XIdI9Aue8s2XAIpAwdlLN1T0w7mxKEjyubiBZ3/bLbHC/wGS4wNABvXWubCizvA=="
     },
     "symbol-tree": {
       "version": "3.2.4",
diff --git a/apps/block_scout_web/assets/package.json b/apps/block_scout_web/assets/package.json
index e47b66d1bc48..d7756905d321 100644
--- a/apps/block_scout_web/assets/package.json
+++ b/apps/block_scout_web/assets/package.json
@@ -73,7 +73,7 @@
     "redux": "^5.0.1",
     "stream-browserify": "^3.0.0",
     "stream-http": "^3.1.1",
-    "sweetalert2": "^11.10.2",
+    "sweetalert2": "^11.10.3",
     "urijs": "^1.19.11",
     "url": "^0.11.3",
     "util": "^0.12.5",

From 4fdbfa6293648860f84d246a6f439168302c5205 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 16 Jan 2024 08:30:26 +0000
Subject: [PATCH 901/909] Bump style-loader from 3.3.3 to 3.3.4 in
 /apps/block_scout_web/assets

Bumps [style-loader](https://github.com/webpack-contrib/style-loader) from 3.3.3 to 3.3.4.
- [Release notes](https://github.com/webpack-contrib/style-loader/releases)
- [Changelog](https://github.com/webpack-contrib/style-loader/blob/v3.3.4/CHANGELOG.md)
- [Commits](https://github.com/webpack-contrib/style-loader/compare/v3.3.3...v3.3.4)

---
updated-dependencies:
- dependency-name: style-loader
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 apps/block_scout_web/assets/package-lock.json | 14 +++++++-------
 apps/block_scout_web/assets/package.json      |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/apps/block_scout_web/assets/package-lock.json b/apps/block_scout_web/assets/package-lock.json
index 578883795cf6..89307537a0d0 100644
--- a/apps/block_scout_web/assets/package-lock.json
+++ b/apps/block_scout_web/assets/package-lock.json
@@ -91,7 +91,7 @@
         "postcss-loader": "^7.3.4",
         "sass": "^1.69.7",
         "sass-loader": "^14.0.0",
-        "style-loader": "^3.3.3",
+        "style-loader": "^3.3.4",
         "webpack": "^5.89.0",
         "webpack-cli": "^5.1.4"
       },
@@ -15905,9 +15905,9 @@
       }
     },
     "node_modules/style-loader": {
-      "version": "3.3.3",
-      "resolved": "https://registry.npmjs.org/style-loader/-/style-loader-3.3.3.tgz",
-      "integrity": "sha512-53BiGLXAcll9maCYtZi2RCQZKa8NQQai5C4horqKyRmHj9H7QmcUyucrH+4KW/gBQbXM2AsB0axoEcFZPlfPcw==",
+      "version": "3.3.4",
+      "resolved": "https://registry.npmjs.org/style-loader/-/style-loader-3.3.4.tgz",
+      "integrity": "sha512-0WqXzrsMTyb8yjZJHDqwmnwRJvhALK9LfRtRc6B4UTWe8AijYLZYZ9thuJTZc2VfQWINADW/j+LiJnfy2RoC1w==",
       "dev": true,
       "engines": {
         "node": ">= 12.13.0"
@@ -29789,9 +29789,9 @@
       "dev": true
     },
     "style-loader": {
-      "version": "3.3.3",
-      "resolved": "https://registry.npmjs.org/style-loader/-/style-loader-3.3.3.tgz",
-      "integrity": "sha512-53BiGLXAcll9maCYtZi2RCQZKa8NQQai5C4horqKyRmHj9H7QmcUyucrH+4KW/gBQbXM2AsB0axoEcFZPlfPcw==",
+      "version": "3.3.4",
+      "resolved": "https://registry.npmjs.org/style-loader/-/style-loader-3.3.4.tgz",
+      "integrity": "sha512-0WqXzrsMTyb8yjZJHDqwmnwRJvhALK9LfRtRc6B4UTWe8AijYLZYZ9thuJTZc2VfQWINADW/j+LiJnfy2RoC1w==",
       "dev": true,
       "requires": {}
     },
diff --git a/apps/block_scout_web/assets/package.json b/apps/block_scout_web/assets/package.json
index 2fef32adf99a..9d3778af3c9f 100644
--- a/apps/block_scout_web/assets/package.json
+++ b/apps/block_scout_web/assets/package.json
@@ -103,7 +103,7 @@
     "postcss-loader": "^7.3.4",
     "sass": "^1.69.7",
     "sass-loader": "^14.0.0",
-    "style-loader": "^3.3.3",
+    "style-loader": "^3.3.4",
     "webpack": "^5.89.0",
     "webpack-cli": "^5.1.4"
   },

From 889814b336c0cce18b109cf97eadc7acd9c70025 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 16 Jan 2024 08:31:23 +0000
Subject: [PATCH 902/909] Bump @babel/preset-env in
 /apps/block_scout_web/assets

Bumps [@babel/preset-env](https://github.com/babel/babel/tree/HEAD/packages/babel-preset-env) from 7.23.7 to 7.23.8.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/commits/v7.23.8/packages/babel-preset-env)

---
updated-dependencies:
- dependency-name: "@babel/preset-env"
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 apps/block_scout_web/assets/package-lock.json | 36 +++++++++----------
 apps/block_scout_web/assets/package.json      |  2 +-
 2 files changed, 18 insertions(+), 20 deletions(-)

diff --git a/apps/block_scout_web/assets/package-lock.json b/apps/block_scout_web/assets/package-lock.json
index 578883795cf6..d096f8fe7136 100644
--- a/apps/block_scout_web/assets/package-lock.json
+++ b/apps/block_scout_web/assets/package-lock.json
@@ -72,7 +72,7 @@
       },
       "devDependencies": {
         "@babel/core": "^7.23.7",
-        "@babel/preset-env": "^7.23.7",
+        "@babel/preset-env": "^7.23.8",
         "autoprefixer": "^10.4.16",
         "babel-loader": "^9.1.3",
         "copy-webpack-plugin": "^12.0.1",
@@ -1089,16 +1089,15 @@
       }
     },
     "node_modules/@babel/plugin-transform-classes": {
-      "version": "7.23.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.23.5.tgz",
-      "integrity": "sha512-jvOTR4nicqYC9yzOHIhXG5emiFEOpappSJAl73SDSEDcybD+Puuze8Tnpb9p9qEyYup24tq891gkaygIFvWDqg==",
+      "version": "7.23.8",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.23.8.tgz",
+      "integrity": "sha512-yAYslGsY1bX6Knmg46RjiCiNSwJKv2IUC8qOdYKqMMr0491SXFhcHqOdRDeCRohOOIzwN/90C6mQ9qAKgrP7dg==",
       "dev": true,
       "dependencies": {
         "@babel/helper-annotate-as-pure": "^7.22.5",
-        "@babel/helper-compilation-targets": "^7.22.15",
+        "@babel/helper-compilation-targets": "^7.23.6",
         "@babel/helper-environment-visitor": "^7.22.20",
         "@babel/helper-function-name": "^7.23.0",
-        "@babel/helper-optimise-call-expression": "^7.22.5",
         "@babel/helper-plugin-utils": "^7.22.5",
         "@babel/helper-replace-supers": "^7.22.20",
         "@babel/helper-split-export-declaration": "^7.22.6",
@@ -1780,9 +1779,9 @@
       }
     },
     "node_modules/@babel/preset-env": {
-      "version": "7.23.7",
-      "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.23.7.tgz",
-      "integrity": "sha512-SY27X/GtTz/L4UryMNJ6p4fH4nsgWbz84y9FE0bQeWJP6O5BhgVCt53CotQKHCOeXJel8VyhlhujhlltKms/CA==",
+      "version": "7.23.8",
+      "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.23.8.tgz",
+      "integrity": "sha512-lFlpmkApLkEP6woIKprO6DO60RImpatTQKtz4sUcDjVcK8M8mQ4sZsuxaTMNOZf0sqAq/ReYW1ZBHnOQwKpLWA==",
       "dev": true,
       "dependencies": {
         "@babel/compat-data": "^7.23.5",
@@ -1818,7 +1817,7 @@
         "@babel/plugin-transform-block-scoping": "^7.23.4",
         "@babel/plugin-transform-class-properties": "^7.23.3",
         "@babel/plugin-transform-class-static-block": "^7.23.4",
-        "@babel/plugin-transform-classes": "^7.23.5",
+        "@babel/plugin-transform-classes": "^7.23.8",
         "@babel/plugin-transform-computed-properties": "^7.23.3",
         "@babel/plugin-transform-destructuring": "^7.23.3",
         "@babel/plugin-transform-dotall-regex": "^7.23.3",
@@ -18600,16 +18599,15 @@
       }
     },
     "@babel/plugin-transform-classes": {
-      "version": "7.23.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.23.5.tgz",
-      "integrity": "sha512-jvOTR4nicqYC9yzOHIhXG5emiFEOpappSJAl73SDSEDcybD+Puuze8Tnpb9p9qEyYup24tq891gkaygIFvWDqg==",
+      "version": "7.23.8",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.23.8.tgz",
+      "integrity": "sha512-yAYslGsY1bX6Knmg46RjiCiNSwJKv2IUC8qOdYKqMMr0491SXFhcHqOdRDeCRohOOIzwN/90C6mQ9qAKgrP7dg==",
       "dev": true,
       "requires": {
         "@babel/helper-annotate-as-pure": "^7.22.5",
-        "@babel/helper-compilation-targets": "^7.22.15",
+        "@babel/helper-compilation-targets": "^7.23.6",
         "@babel/helper-environment-visitor": "^7.22.20",
         "@babel/helper-function-name": "^7.23.0",
-        "@babel/helper-optimise-call-expression": "^7.22.5",
         "@babel/helper-plugin-utils": "^7.22.5",
         "@babel/helper-replace-supers": "^7.22.20",
         "@babel/helper-split-export-declaration": "^7.22.6",
@@ -19038,9 +19036,9 @@
       }
     },
     "@babel/preset-env": {
-      "version": "7.23.7",
-      "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.23.7.tgz",
-      "integrity": "sha512-SY27X/GtTz/L4UryMNJ6p4fH4nsgWbz84y9FE0bQeWJP6O5BhgVCt53CotQKHCOeXJel8VyhlhujhlltKms/CA==",
+      "version": "7.23.8",
+      "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.23.8.tgz",
+      "integrity": "sha512-lFlpmkApLkEP6woIKprO6DO60RImpatTQKtz4sUcDjVcK8M8mQ4sZsuxaTMNOZf0sqAq/ReYW1ZBHnOQwKpLWA==",
       "dev": true,
       "requires": {
         "@babel/compat-data": "^7.23.5",
@@ -19076,7 +19074,7 @@
         "@babel/plugin-transform-block-scoping": "^7.23.4",
         "@babel/plugin-transform-class-properties": "^7.23.3",
         "@babel/plugin-transform-class-static-block": "^7.23.4",
-        "@babel/plugin-transform-classes": "^7.23.5",
+        "@babel/plugin-transform-classes": "^7.23.8",
         "@babel/plugin-transform-computed-properties": "^7.23.3",
         "@babel/plugin-transform-destructuring": "^7.23.3",
         "@babel/plugin-transform-dotall-regex": "^7.23.3",
diff --git a/apps/block_scout_web/assets/package.json b/apps/block_scout_web/assets/package.json
index 2fef32adf99a..fde156337dce 100644
--- a/apps/block_scout_web/assets/package.json
+++ b/apps/block_scout_web/assets/package.json
@@ -84,7 +84,7 @@
   },
   "devDependencies": {
     "@babel/core": "^7.23.7",
-    "@babel/preset-env": "^7.23.7",
+    "@babel/preset-env": "^7.23.8",
     "autoprefixer": "^10.4.16",
     "babel-loader": "^9.1.3",
     "copy-webpack-plugin": "^12.0.1",

From 19af21189a9b5ccb0629786c7203eca772a70e81 Mon Sep 17 00:00:00 2001
From: Qwerty5Uiop <alex000010@bk.ru>
Date: Wed, 10 Jan 2024 14:06:13 +0400
Subject: [PATCH 903/909] Merge addresses stage with address referencing

---
 CHANGELOG.md                                  |  1 +
 apps/explorer/lib/explorer/chain/import.ex    |  3 +-
 .../chain/import/stage/address_referencing.ex | 26 --------------
 .../explorer/chain/import/stage/addresses.ex  | 22 ------------
 .../stage/addresses_blocks_coin_balances.ex   | 34 +++++++++++++++++++
 .../chain/import/stage/block_following.ex     |  4 +--
 .../chain/import/stage/block_pending.ex       |  4 +--
 .../chain/import/stage/block_referencing.ex   |  3 +-
 8 files changed, 39 insertions(+), 58 deletions(-)
 delete mode 100644 apps/explorer/lib/explorer/chain/import/stage/address_referencing.ex
 delete mode 100644 apps/explorer/lib/explorer/chain/import/stage/addresses.ex
 create mode 100644 apps/explorer/lib/explorer/chain/import/stage/addresses_blocks_coin_balances.ex

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e9fc17df2c40..f5161e7410de 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,7 @@
 ### Features
 
 - [#9155](https://github.com/blockscout/blockscout/pull/9155) - Allow bypassing avg block time in proxy implementation re-fetch ttl calculation
+- [#9131](https://github.com/blockscout/blockscout/pull/9131) - Merge addresses stage with address referencing
 - [#9072](https://github.com/blockscout/blockscout/pull/9072) - Add tracing by block logic for geth
 - [#9056](https://github.com/blockscout/blockscout/pull/9056) - Noves.fi API proxy
 
diff --git a/apps/explorer/lib/explorer/chain/import.ex b/apps/explorer/lib/explorer/chain/import.ex
index 138db2c676fa..9372a55c01e8 100644
--- a/apps/explorer/lib/explorer/chain/import.ex
+++ b/apps/explorer/lib/explorer/chain/import.ex
@@ -12,8 +12,7 @@ defmodule Explorer.Chain.Import do
   require Logger
 
   @stages [
-    Import.Stage.Addresses,
-    Import.Stage.AddressReferencing,
+    Import.Stage.AddressesBlocksCoinBalances,
     Import.Stage.BlockReferencing,
     Import.Stage.BlockFollowing,
     Import.Stage.BlockPending
diff --git a/apps/explorer/lib/explorer/chain/import/stage/address_referencing.ex b/apps/explorer/lib/explorer/chain/import/stage/address_referencing.ex
deleted file mode 100644
index 2d40ad74fb47..000000000000
--- a/apps/explorer/lib/explorer/chain/import/stage/address_referencing.ex
+++ /dev/null
@@ -1,26 +0,0 @@
-defmodule Explorer.Chain.Import.Stage.AddressReferencing do
-  @moduledoc """
-  Imports any tables that reference `t:Explorer.Chain.Address.t/0` and that were imported by
-  `Explorer.Chain.Import.Stage.Addresses`.
-  """
-
-  alias Explorer.Chain.Import.{Runner, Stage}
-
-  @behaviour Stage
-
-  @impl Stage
-  def runners,
-    do: [
-      Runner.Address.CoinBalances,
-      Runner.Blocks,
-      Runner.Address.CoinBalancesDaily
-    ]
-
-  @impl Stage
-  def multis(runner_to_changes_list, options) do
-    {final_multi, final_remaining_runner_to_changes_list} =
-      Stage.single_multi(runners(), runner_to_changes_list, options)
-
-    {[final_multi], final_remaining_runner_to_changes_list}
-  end
-end
diff --git a/apps/explorer/lib/explorer/chain/import/stage/addresses.ex b/apps/explorer/lib/explorer/chain/import/stage/addresses.ex
deleted file mode 100644
index 03c8a5772449..000000000000
--- a/apps/explorer/lib/explorer/chain/import/stage/addresses.ex
+++ /dev/null
@@ -1,22 +0,0 @@
-defmodule Explorer.Chain.Import.Stage.Addresses do
-  @moduledoc """
-  Imports addresses before anything else that references them because an unused address is still valid and recoverable
-  if the other stage(s) don't commit.
-  """
-
-  alias Explorer.Chain.Import.{Runner, Stage}
-
-  @behaviour Stage
-
-  @runner Runner.Addresses
-
-  @impl Stage
-  def runners, do: [@runner]
-
-  @chunk_size 50
-
-  @impl Stage
-  def multis(runner_to_changes_list, options) do
-    Stage.chunk_every(runner_to_changes_list, @runner, @chunk_size, options)
-  end
-end
diff --git a/apps/explorer/lib/explorer/chain/import/stage/addresses_blocks_coin_balances.ex b/apps/explorer/lib/explorer/chain/import/stage/addresses_blocks_coin_balances.ex
new file mode 100644
index 000000000000..bdd8ae478e84
--- /dev/null
+++ b/apps/explorer/lib/explorer/chain/import/stage/addresses_blocks_coin_balances.ex
@@ -0,0 +1,34 @@
+defmodule Explorer.Chain.Import.Stage.AddressesBlocksCoinBalances do
+  @moduledoc """
+  Import addresses, blocks and balances.
+  No tables have foreign key to addresses anymore, so it's possible to import addresses along with them.
+  """
+
+  alias Explorer.Chain.Import.{Runner, Stage}
+
+  @behaviour Stage
+
+  @addresses_runner Runner.Addresses
+
+  @rest_runners [
+    Runner.Address.CoinBalances,
+    Runner.Blocks,
+    Runner.Address.CoinBalancesDaily
+  ]
+
+  @impl Stage
+  def runners, do: [@addresses_runner | @rest_runners]
+
+  @addresses_chunk_size 50
+
+  @impl Stage
+  def multis(runner_to_changes_list, options) do
+    {addresses_multis, remaining_runner_to_changes_list} =
+      Stage.chunk_every(runner_to_changes_list, Runner.Addresses, @addresses_chunk_size, options)
+
+    {final_multi, final_remaining_runner_to_changes_list} =
+      Stage.single_multi(@rest_runners, remaining_runner_to_changes_list, options)
+
+    {[final_multi | addresses_multis], final_remaining_runner_to_changes_list}
+  end
+end
diff --git a/apps/explorer/lib/explorer/chain/import/stage/block_following.ex b/apps/explorer/lib/explorer/chain/import/stage/block_following.ex
index 8abbf9f79b7d..2a533c1b680b 100644
--- a/apps/explorer/lib/explorer/chain/import/stage/block_following.ex
+++ b/apps/explorer/lib/explorer/chain/import/stage/block_following.ex
@@ -1,9 +1,7 @@
 defmodule Explorer.Chain.Import.Stage.BlockFollowing do
   @moduledoc """
   Imports any tables that follows and cannot be imported at the same time as
-  those imported by `Explorer.Chain.Import.Stage.Addresses`,
-  `Explorer.Chain.Import.Stage.AddressReferencing` and
-  `Explorer.Chain.Import.Stage.BlockReferencing`
+  those imported by `Explorer.Chain.Import.Stage.AddressesBlocksCoinBalances` and `Explorer.Chain.Import.Stage.BlockReferencing`
   """
 
   alias Explorer.Chain.Import.{Runner, Stage}
diff --git a/apps/explorer/lib/explorer/chain/import/stage/block_pending.ex b/apps/explorer/lib/explorer/chain/import/stage/block_pending.ex
index fba315e142d4..824a4dc3ce0a 100644
--- a/apps/explorer/lib/explorer/chain/import/stage/block_pending.ex
+++ b/apps/explorer/lib/explorer/chain/import/stage/block_pending.ex
@@ -2,9 +2,7 @@ defmodule Explorer.Chain.Import.Stage.BlockPending do
   @moduledoc """
   Imports any tables that uses `Explorer.Chain.PendingBlockOperation` to track
   progress and cannot be imported at the same time as those imported by
-  `Explorer.Chain.Import.Stage.Addresses`,
-  `Explorer.Chain.Import.Stage.AddressReferencing` and
-  `Explorer.Chain.Import.Stage.BlockReferencing`
+  `Explorer.Chain.Import.Stage.AddressesBlocksCoinBalances` and `Explorer.Chain.Import.Stage.BlockReferencing`
   """
 
   alias Explorer.Chain.Import.{Runner, Stage}
diff --git a/apps/explorer/lib/explorer/chain/import/stage/block_referencing.ex b/apps/explorer/lib/explorer/chain/import/stage/block_referencing.ex
index 1589c95a38cb..142a2326545a 100644
--- a/apps/explorer/lib/explorer/chain/import/stage/block_referencing.ex
+++ b/apps/explorer/lib/explorer/chain/import/stage/block_referencing.ex
@@ -1,8 +1,7 @@
 defmodule Explorer.Chain.Import.Stage.BlockReferencing do
   @moduledoc """
   Imports any tables that reference `t:Explorer.Chain.Block.t/0` and that were
-  imported by `Explorer.Chain.Import.Stage.Addresses` and
-  `Explorer.Chain.Import.Stage.AddressReferencing`.
+  imported by `Explorer.Chain.Import.Stage.AddressesBlocksCoinBalances`.
   """
 
   alias Explorer.Chain.Import.{Runner, Stage}

From 2a232c9ee45b16d7697c77542744031ef4fcd011 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 16 Jan 2024 09:34:54 +0000
Subject: [PATCH 904/909] Bump css-loader from 6.8.1 to 6.9.0 in
 /apps/block_scout_web/assets

Bumps [css-loader](https://github.com/webpack-contrib/css-loader) from 6.8.1 to 6.9.0.
- [Release notes](https://github.com/webpack-contrib/css-loader/releases)
- [Changelog](https://github.com/webpack-contrib/css-loader/blob/master/CHANGELOG.md)
- [Commits](https://github.com/webpack-contrib/css-loader/compare/v6.8.1...v6.9.0)

---
updated-dependencies:
- dependency-name: css-loader
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 apps/block_scout_web/assets/package-lock.json | 38 +++++++++----------
 apps/block_scout_web/assets/package.json      |  2 +-
 2 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/apps/block_scout_web/assets/package-lock.json b/apps/block_scout_web/assets/package-lock.json
index b26075f7f4c4..49fded9ff7b5 100644
--- a/apps/block_scout_web/assets/package-lock.json
+++ b/apps/block_scout_web/assets/package-lock.json
@@ -76,7 +76,7 @@
         "autoprefixer": "^10.4.16",
         "babel-loader": "^9.1.3",
         "copy-webpack-plugin": "^12.0.1",
-        "css-loader": "^6.8.1",
+        "css-loader": "^6.9.0",
         "css-minimizer-webpack-plugin": "^5.0.1",
         "eslint": "^8.56.0",
         "eslint-config-standard": "^17.1.0",
@@ -6237,19 +6237,19 @@
       }
     },
     "node_modules/css-loader": {
-      "version": "6.8.1",
-      "resolved": "https://registry.npmjs.org/css-loader/-/css-loader-6.8.1.tgz",
-      "integrity": "sha512-xDAXtEVGlD0gJ07iclwWVkLoZOpEvAWaSyf6W18S2pOC//K8+qUDIx8IIT3D+HjnmkJPQeesOPv5aiUaJsCM2g==",
+      "version": "6.9.0",
+      "resolved": "https://registry.npmjs.org/css-loader/-/css-loader-6.9.0.tgz",
+      "integrity": "sha512-3I5Nu4ytWlHvOP6zItjiHlefBNtrH+oehq8tnQa2kO305qpVyx9XNIT1CXIj5bgCJs7qICBCkgCYxQLKPANoLA==",
       "dev": true,
       "dependencies": {
         "icss-utils": "^5.1.0",
-        "postcss": "^8.4.21",
+        "postcss": "^8.4.31",
         "postcss-modules-extract-imports": "^3.0.0",
         "postcss-modules-local-by-default": "^4.0.3",
-        "postcss-modules-scope": "^3.0.0",
+        "postcss-modules-scope": "^3.1.0",
         "postcss-modules-values": "^4.0.0",
         "postcss-value-parser": "^4.2.0",
-        "semver": "^7.3.8"
+        "semver": "^7.5.4"
       },
       "engines": {
         "node": ">= 12.13.0"
@@ -14045,9 +14045,9 @@
       }
     },
     "node_modules/postcss-modules-scope": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-modules-scope/-/postcss-modules-scope-3.0.0.tgz",
-      "integrity": "sha512-hncihwFA2yPath8oZ15PZqvWGkWf+XUfQgUGamS4LqoP1anQLOsOJw0vr7J7IwLpoY9fatA2qiGUGmuZL0Iqlg==",
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/postcss-modules-scope/-/postcss-modules-scope-3.1.0.tgz",
+      "integrity": "sha512-SaIbK8XW+MZbd0xHPf7kdfA/3eOt7vxJ72IRecn3EzuZVLr1r0orzf0MX/pN8m+NMDoo6X/SQd8oeKqGZd8PXg==",
       "dev": true,
       "dependencies": {
         "postcss-selector-parser": "^6.0.4"
@@ -22469,19 +22469,19 @@
       "requires": {}
     },
     "css-loader": {
-      "version": "6.8.1",
-      "resolved": "https://registry.npmjs.org/css-loader/-/css-loader-6.8.1.tgz",
-      "integrity": "sha512-xDAXtEVGlD0gJ07iclwWVkLoZOpEvAWaSyf6W18S2pOC//K8+qUDIx8IIT3D+HjnmkJPQeesOPv5aiUaJsCM2g==",
+      "version": "6.9.0",
+      "resolved": "https://registry.npmjs.org/css-loader/-/css-loader-6.9.0.tgz",
+      "integrity": "sha512-3I5Nu4ytWlHvOP6zItjiHlefBNtrH+oehq8tnQa2kO305qpVyx9XNIT1CXIj5bgCJs7qICBCkgCYxQLKPANoLA==",
       "dev": true,
       "requires": {
         "icss-utils": "^5.1.0",
-        "postcss": "^8.4.21",
+        "postcss": "^8.4.31",
         "postcss-modules-extract-imports": "^3.0.0",
         "postcss-modules-local-by-default": "^4.0.3",
-        "postcss-modules-scope": "^3.0.0",
+        "postcss-modules-scope": "^3.1.0",
         "postcss-modules-values": "^4.0.0",
         "postcss-value-parser": "^4.2.0",
-        "semver": "^7.3.8"
+        "semver": "^7.5.4"
       },
       "dependencies": {
         "semver": {
@@ -28413,9 +28413,9 @@
       }
     },
     "postcss-modules-scope": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-modules-scope/-/postcss-modules-scope-3.0.0.tgz",
-      "integrity": "sha512-hncihwFA2yPath8oZ15PZqvWGkWf+XUfQgUGamS4LqoP1anQLOsOJw0vr7J7IwLpoY9fatA2qiGUGmuZL0Iqlg==",
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/postcss-modules-scope/-/postcss-modules-scope-3.1.0.tgz",
+      "integrity": "sha512-SaIbK8XW+MZbd0xHPf7kdfA/3eOt7vxJ72IRecn3EzuZVLr1r0orzf0MX/pN8m+NMDoo6X/SQd8oeKqGZd8PXg==",
       "dev": true,
       "requires": {
         "postcss-selector-parser": "^6.0.4"
diff --git a/apps/block_scout_web/assets/package.json b/apps/block_scout_web/assets/package.json
index 02891d831acc..86e38b7df8f5 100644
--- a/apps/block_scout_web/assets/package.json
+++ b/apps/block_scout_web/assets/package.json
@@ -88,7 +88,7 @@
     "autoprefixer": "^10.4.16",
     "babel-loader": "^9.1.3",
     "copy-webpack-plugin": "^12.0.1",
-    "css-loader": "^6.8.1",
+    "css-loader": "^6.9.0",
     "css-minimizer-webpack-plugin": "^5.0.1",
     "eslint": "^8.56.0",
     "eslint-config-standard": "^17.1.0",

From ec58cd83ad890777864c3638cee864a6846f6103 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 23 Oct 2023 19:02:45 +0000
Subject: [PATCH 905/909] Bump dialyxir from 1.4.1 to 1.4.2

Bumps [dialyxir](https://github.com/jeremyjh/dialyxir) from 1.4.1 to 1.4.2.
- [Release notes](https://github.com/jeremyjh/dialyxir/releases)
- [Changelog](https://github.com/jeremyjh/dialyxir/blob/master/CHANGELOG.md)
- [Commits](https://github.com/jeremyjh/dialyxir/compare/1.4.1...1.4.2)

---
updated-dependencies:
- dependency-name: dialyxir
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 mix.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mix.lock b/mix.lock
index 619743cf93a8..026b1cfa7b29 100644
--- a/mix.lock
+++ b/mix.lock
@@ -34,7 +34,7 @@
   "decimal": {:hex, :decimal, "2.1.1", "5611dca5d4b2c3dd497dec8f68751f1f1a54755e8ed2a966c2633cf885973ad6", [:mix], [], "hexpm", "53cfe5f497ed0e7771ae1a475575603d77425099ba5faef9394932b35020ffcc"},
   "decorator": {:hex, :decorator, "1.4.0", "a57ac32c823ea7e4e67f5af56412d12b33274661bb7640ec7fc882f8d23ac419", [:mix], [], "hexpm", "0a07cedd9083da875c7418dea95b78361197cf2bf3211d743f6f7ce39656597f"},
   "deep_merge": {:hex, :deep_merge, "1.0.0", "b4aa1a0d1acac393bdf38b2291af38cb1d4a52806cf7a4906f718e1feb5ee961", [:mix], [], "hexpm", "ce708e5f094b9cd4e8f2be4f00d2f4250c4095be93f8cd6d018c753894885430"},
-  "dialyxir": {:hex, :dialyxir, "1.4.1", "a22ed1e7bd3a3e3f197b68d806ef66acb61ee8f57b3ac85fc5d57354c5482a93", [:mix], [{:erlex, ">= 0.2.6", [hex: :erlex, repo: "hexpm", optional: false]}], "hexpm", "84b795d6d7796297cca5a3118444b80c7d94f7ce247d49886e7c291e1ae49801"},
+  "dialyxir": {:hex, :dialyxir, "1.4.2", "764a6e8e7a354f0ba95d58418178d486065ead1f69ad89782817c296d0d746a5", [:mix], [{:erlex, ">= 0.2.6", [hex: :erlex, repo: "hexpm", optional: false]}], "hexpm", "516603d8067b2fd585319e4b13d3674ad4f314a5902ba8130cd97dc902ce6bbd"},
   "digital_token": {:hex, :digital_token, "0.6.0", "13e6de581f0b1f6c686f7c7d12ab11a84a7b22fa79adeb4b50eec1a2d278d258", [:mix], [{:cldr_utils, "~> 2.17", [hex: :cldr_utils, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}], "hexpm", "2455d626e7c61a128b02a4a8caddb092548c3eb613ac6f6a85e4cbb6caddc4d1"},
   "earmark_parser": {:hex, :earmark_parser, "1.4.39", "424642f8335b05bb9eb611aa1564c148a8ee35c9c8a8bba6e129d51a3e3c6769", [:mix], [], "hexpm", "06553a88d1f1846da9ef066b87b57c6f605552cfbe40d20bd8d59cc6bde41944"},
   "ecto": {:hex, :ecto, "3.11.1", "4b4972b717e7ca83d30121b12998f5fcdc62ba0ed4f20fd390f16f3270d85c3e", [:mix], [{:decimal, "~> 2.0", [hex: :decimal, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}, {:telemetry, "~> 0.4 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "ebd3d3772cd0dfcd8d772659e41ed527c28b2a8bde4b00fe03e0463da0f1983b"},

From e2cf1908777ce1b1bed6610f431254ab08a9376d Mon Sep 17 00:00:00 2001
From: Viktor Baranov <baranov.viktor.27@gmail.com>
Date: Tue, 24 Oct 2023 21:15:47 +0300
Subject: [PATCH 906/909] plt_add_deps: from :transitive to :app_tree

---
 apps/block_scout_web/mix.exs  | 2 +-
 apps/ethereum_jsonrpc/mix.exs | 2 +-
 apps/explorer/mix.exs         | 2 +-
 mix.exs                       | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/apps/block_scout_web/mix.exs b/apps/block_scout_web/mix.exs
index e90612b58202..741558064926 100644
--- a/apps/block_scout_web/mix.exs
+++ b/apps/block_scout_web/mix.exs
@@ -11,7 +11,7 @@ defmodule BlockScoutWeb.Mixfile do
       deps_path: "../../deps",
       description: "Web interface for BlockScout.",
       dialyzer: [
-        plt_add_deps: :transitive,
+        plt_add_deps: :app_tree,
         ignore_warnings: "../../.dialyzer-ignore"
       ],
       elixir: "~> 1.13",
diff --git a/apps/ethereum_jsonrpc/mix.exs b/apps/ethereum_jsonrpc/mix.exs
index 3545774c33a3..2446c3e2e28b 100644
--- a/apps/ethereum_jsonrpc/mix.exs
+++ b/apps/ethereum_jsonrpc/mix.exs
@@ -11,7 +11,7 @@ defmodule EthereumJsonrpc.MixProject do
       deps_path: "../../deps",
       description: "Ethereum JSONRPC client.",
       dialyzer: [
-        plt_add_deps: :transitive,
+        plt_add_deps: :app_tree,
         plt_add_apps: [:mix],
         ignore_warnings: "../../.dialyzer-ignore"
       ],
diff --git a/apps/explorer/mix.exs b/apps/explorer/mix.exs
index ae066dfdc75f..5f98f045ff91 100644
--- a/apps/explorer/mix.exs
+++ b/apps/explorer/mix.exs
@@ -11,7 +11,7 @@ defmodule Explorer.Mixfile do
       deps_path: "../../deps",
       description: "Read-access to indexed block chain data.",
       dialyzer: [
-        plt_add_deps: :transitive,
+        plt_add_deps: :app_tree,
         plt_add_apps: ~w(ex_unit mix)a,
         ignore_warnings: "../../.dialyzer-ignore"
       ],
diff --git a/mix.exs b/mix.exs
index 06f570b70e79..cd6740114bf6 100644
--- a/mix.exs
+++ b/mix.exs
@@ -52,7 +52,7 @@ defmodule BlockScout.Mixfile do
 
   defp dialyzer() do
     [
-      plt_add_deps: :transitive,
+      plt_add_deps: :app_tree,
       plt_add_apps: ~w(ex_unit mix)a,
       ignore_warnings: ".dialyzer-ignore",
       plt_core_path: "priv/plts",

From c174201ccbcbea1d95f9669eb97b334c20725b6c Mon Sep 17 00:00:00 2001
From: Viktor Baranov <baranov.viktor.27@gmail.com>
Date: Tue, 16 Jan 2024 22:05:41 +0300
Subject: [PATCH 907/909] Add wallaby to plt_add_apps

---
 mix.exs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mix.exs b/mix.exs
index cd6740114bf6..ac067de5bd85 100644
--- a/mix.exs
+++ b/mix.exs
@@ -53,7 +53,7 @@ defmodule BlockScout.Mixfile do
   defp dialyzer() do
     [
       plt_add_deps: :app_tree,
-      plt_add_apps: ~w(ex_unit mix)a,
+      plt_add_apps: ~w(ex_unit mix wallaby)a,
       ignore_warnings: ".dialyzer-ignore",
       plt_core_path: "priv/plts",
       plt_file: {:no_warn, "priv/plts/dialyzer.plt"}

From dafa09b59c2628b4c522a75f4ef0aadedced30d0 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 20 Nov 2023 18:07:57 +0000
Subject: [PATCH 908/909] Bump briefly from `51dfe7f` to `4836ba3`

Bumps [briefly](https://github.com/CargoSense/briefly) from `51dfe7f` to `4836ba3`.
- [Release notes](https://github.com/CargoSense/briefly/releases)
- [Commits](https://github.com/CargoSense/briefly/compare/51dfe7fbe0f897ea2a921d9af120762392aca6a1...4836ba322ffb504a102a15cc6e35d928ef97120e)

---
updated-dependencies:
- dependency-name: briefly
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 mix.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mix.lock b/mix.lock
index 026b1cfa7b29..eff0c9efd4a6 100644
--- a/mix.lock
+++ b/mix.lock
@@ -8,7 +8,7 @@
   "bcrypt_elixir": {:hex, :bcrypt_elixir, "3.1.0", "0b110a9a6c619b19a7f73fa3004aa11d6e719a67e672d1633dc36b6b2290a0f7", [:make, :mix], [{:comeonin, "~> 5.3", [hex: :comeonin, repo: "hexpm", optional: false]}, {:elixir_make, "~> 0.6", [hex: :elixir_make, repo: "hexpm", optional: false]}], "hexpm", "2ad2acb5a8bc049e8d5aa267802631912bb80d5f4110a178ae7999e69dca1bf7"},
   "benchee": {:hex, :benchee, "1.3.0", "f64e3b64ad3563fa9838146ddefb2d2f94cf5b473bdfd63f5ca4d0657bf96694", [:mix], [{:deep_merge, "~> 1.0", [hex: :deep_merge, repo: "hexpm", optional: false]}, {:statistex, "~> 1.0", [hex: :statistex, repo: "hexpm", optional: false]}, {:table, "~> 0.1.0", [hex: :table, repo: "hexpm", optional: true]}], "hexpm", "34f4294068c11b2bd2ebf2c59aac9c7da26ffa0068afdf3419f1b176e16c5f81"},
   "benchee_csv": {:hex, :benchee_csv, "1.0.0", "0b3b9223290bfcb8003552705bec9bcf1a89b4a83b70bd686e45295c264f3d16", [:mix], [{:benchee, ">= 0.99.0 and < 2.0.0", [hex: :benchee, repo: "hexpm", optional: false]}, {:csv, "~> 2.0", [hex: :csv, repo: "hexpm", optional: false]}], "hexpm", "cdefb804c021dcf7a99199492026584be9b5a21d6644ac0d01c81c5d97c520d5"},
-  "briefly": {:git, "https://github.com/CargoSense/briefly.git", "51dfe7fbe0f897ea2a921d9af120762392aca6a1", []},
+  "briefly": {:git, "https://github.com/CargoSense/briefly.git", "4836ba322ffb504a102a15cc6e35d928ef97120e", []},
   "bunt": {:hex, :bunt, "0.2.1", "e2d4792f7bc0ced7583ab54922808919518d0e57ee162901a16a1b6664ef3b14", [:mix], [], "hexpm", "a330bfb4245239787b15005e66ae6845c9cd524a288f0d141c148b02603777a5"},
   "bureaucrat": {:hex, :bureaucrat, "0.2.9", "d98e4d2b9bdbf22e4a45c2113ce8b38b5b63278506c6ff918e3b943a4355d85b", [:mix], [{:inflex, ">= 1.10.0", [hex: :inflex, repo: "hexpm", optional: false]}, {:phoenix, ">= 1.2.0", [hex: :phoenix, repo: "hexpm", optional: true]}, {:plug, ">= 1.0.0", [hex: :plug, repo: "hexpm", optional: false]}, {:poison, "~> 1.5 or ~> 2.0 or ~> 3.0 or ~> 4.0", [hex: :poison, repo: "hexpm", optional: true]}], "hexpm", "111c8dd84382a62e1026ae011d592ceee918553e5203fe8448d9ba6ccbdfff7d"},
   "bypass": {:hex, :bypass, "2.1.0", "909782781bf8e20ee86a9cabde36b259d44af8b9f38756173e8f5e2e1fabb9b1", [:mix], [{:plug, "~> 1.7", [hex: :plug, repo: "hexpm", optional: false]}, {:plug_cowboy, "~> 2.0", [hex: :plug_cowboy, repo: "hexpm", optional: false]}, {:ranch, "~> 1.3", [hex: :ranch, repo: "hexpm", optional: false]}], "hexpm", "d9b5df8fa5b7a6efa08384e9bbecfe4ce61c77d28a4282f79e02f1ef78d96b80"},

From 9e12b731e2afab92afb02a9151e4d1a7b64a8632 Mon Sep 17 00:00:00 2001
From: bap2pecs <111917526+bap2pecs@users.noreply.github.com>
Date: Tue, 16 Jan 2024 17:37:24 -0500
Subject: [PATCH 909/909] Fix common-blockscout.env

---
 docker-compose/envs/common-blockscout.env | 1 -
 1 file changed, 1 deletion(-)

diff --git a/docker-compose/envs/common-blockscout.env b/docker-compose/envs/common-blockscout.env
index ce0c19d13c5c..b12e37cac135 100644
--- a/docker-compose/envs/common-blockscout.env
+++ b/docker-compose/envs/common-blockscout.env
@@ -1,4 +1,3 @@
-# DOCKER_TAG=
 ETHEREUM_JSONRPC_VARIANT=geth
 ETHEREUM_JSONRPC_HTTP_URL=http://host.docker.internal:8545/
 # ETHEREUM_JSONRPC_FALLBACK_HTTP_URL=